diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 34d314c55e..dcf2761983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,9 +48,11 @@ jobs:
 
           cd $SOURCE_DIR
 
+          BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
+
           export APP_VERSION=$(cat versions.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["app"]);')
           export COMMIT_COUNT=$(git rev-list --count HEAD)
-          export COMMIT_COUNT="$(($COMMIT_COUNT+2000))"
+          export COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))"
           export BUILD_NUMBER="$COMMIT_COUNT"
           echo "BUILD_NUMBER=$(echo $BUILD_NUMBER)" >> $GITHUB_ENV
           echo "APP_VERSION=$(echo $APP_VERSION)" >> $GITHUB_ENV
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8cad4dbc1..153e1667a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -70,6 +70,7 @@ beta_testflight:
   stage: build
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -87,6 +88,7 @@ deploy_beta_testflight:
   stage: deploy
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -100,6 +102,7 @@ verifysanity_beta_testflight:
   stage: verifysanity
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
@@ -118,6 +121,7 @@ verify_beta_testflight:
   stage: verify
   only:
     - beta
+    - hotfix
   except:
     - tags
   script:
diff --git a/Random.txt b/Random.txt
index 3e815e3094..86eb369131 100644
--- a/Random.txt
+++ b/Random.txt
@@ -1 +1 @@
-E65Wt9QZyVD8tvGhCJD3My6x57eDORYaiYh6HR7T3fK=
+4f0d2d13a70664d3029d9b97935089df0426fe53745965d175408752838b80dd
\ No newline at end of file
diff --git a/Telegram/BUILD b/Telegram/BUILD
index 5fabcd142c..5c375fe768 100644
--- a/Telegram/BUILD
+++ b/Telegram/BUILD
@@ -277,6 +277,9 @@ official_apple_pay_merchants = [
     "merchant.sberbank.test.ph.telegra.Telegraph",
     "merchant.privatbank.test.telergramios",
     "merchant.privatbank.prod.telergram",
+    "merchant.paymaster.test.telegramios",
+    "merchant.smartglocal.prod.telegramios",
+    "merchant.smartglocal.test.telegramios",
 ]
 
 official_bundle_ids = [
@@ -1430,6 +1433,96 @@ ios_extension(
     ],
 )
 
+plist_fragment(
+    name = "BroadcastUploadInfoPlist",
+    extension = "plist",
+    template = 
+    """
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleIdentifier</key>
+    <string>{telegram_bundle_id}.BroadcastUpload</string>
+    <key>CFBundleName</key>
+    <string>Telegram</string>
+    <key>CFBundlePackageType</key>
+    <string>XPC!</string>
+    <key>NSExtension</key>
+    <dict>
+        <key>NSExtensionPointIdentifier</key>
+        <string>com.apple.broadcast-services-upload</string>
+        <key>NSExtensionPrincipalClass</key>
+        <string>BroadcastUploadSampleHandler</string>
+        <key>RPBroadcastProcessMode</key>
+        <string>RPBroadcastProcessModeSampleBuffer</string>
+    </dict>
+    """.format(
+        telegram_bundle_id = telegram_bundle_id,
+    )
+)
+
+swift_library(
+    name = "BroadcastUploadExtensionLib",
+    module_name = "BroadcastUploadExtensionLib",
+    srcs = glob([
+        "BroadcastUpload/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/TelegramUI:TelegramUI",
+        "//submodules/TelegramVoip:TelegramVoip",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/BuildConfig:BuildConfig",
+        "//submodules/WidgetItems:WidgetItems",
+        "//submodules/BroadcastUploadHelpers:BroadcastUploadHelpers",
+    ],
+)
+
+genrule(
+    name = "SetMinOsVersionBroadcastUploadExtension",
+    cmd_bash =
+"""
+    name=BroadcastUploadExtension.appex
+    cat $(location PatchMinOSVersion.source.sh) | sed -e "s/<<<MIN_OS_VERSION>>>/11\\.0/g" | sed -e "s/<<<NAME>>>/$$name/g" > $(location SetMinOsVersionBroadcastUploadExtension.sh)
+""",
+    srcs = [
+        "PatchMinOSVersion.source.sh",
+    ],
+    outs = [
+        "SetMinOsVersionBroadcastUploadExtension.sh",
+    ],
+    executable = True,
+    visibility = [
+        "//visibility:public",
+    ]
+)
+
+ios_extension(
+    name = "BroadcastUploadExtension",
+    bundle_id = "{telegram_bundle_id}.BroadcastUpload".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = [
+        "iphone",
+        "ipad",
+    ],
+    infoplists = [
+        ":BroadcastUploadInfoPlist",
+        ":VersionInfoPlist",
+        ":BuildNumberInfoPlist",
+        ":AppNameInfoPlist",
+    ],
+    minimum_os_version = "9.0", # maintain the same minimum OS version across extensions
+    ipa_post_processor = ":SetMinOsVersionBroadcastUploadExtension",
+    provisioning_profile = select({
+        ":disableProvisioningProfilesSetting": None,
+        "//conditions:default": "@build_configuration//provisioning:BroadcastUpload.mobileprovision",
+    }),
+    deps = [":BroadcastUploadExtensionLib"],
+    frameworks = [
+        ":TelegramUIFramework",
+        ":SwiftSignalKitFramework",
+    ],
+)
+
 plist_fragment(
     name = "NotificationServiceInfoPlist",
     extension = "plist",
@@ -1718,6 +1811,7 @@ ios_application(
             ":NotificationServiceExtension",
             ":IntentsExtension",
             ":WidgetExtension",
+            ":BroadcastUploadExtension",
         ],
     }),
     watch_application = select({
@@ -1729,3 +1823,51 @@ ios_application(
         ":Lib",
     ],
 )
+
+# Temporary targets used to simplify webrtc build tests
+
+ios_application(
+    name = "webrtc_build_test",
+    bundle_id = "{telegram_bundle_id}".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = ["iphone", "ipad"],
+    minimum_os_version = "9.0",
+    provisioning_profile = select({
+        ":disableProvisioningProfilesSetting": None,
+        "//conditions:default": "@build_configuration//provisioning:Telegram.mobileprovision",
+    }),
+    entitlements = ":TelegramEntitlements.entitlements",
+    infoplists = [
+        ":TelegramInfoPlist",
+        ":BuildNumberInfoPlist",
+        ":VersionInfoPlist",
+        ":UrlTypesInfoPlist",
+    ],
+    deps = [
+        "//third-party/webrtc:webrtc_lib",
+    ],
+)
+
+ios_application(
+    name = "libvpx_build_test",
+    bundle_id = "{telegram_bundle_id}".format(
+        telegram_bundle_id = telegram_bundle_id,
+    ),
+    families = ["iphone", "ipad"],
+    minimum_os_version = "9.0",
+    provisioning_profile = select({
+        ":disableProvisioningProfilesSetting": None,
+        "//conditions:default": "@build_configuration//provisioning:Telegram.mobileprovision",
+    }),
+    entitlements = ":TelegramEntitlements.entitlements",
+    infoplists = [
+        ":TelegramInfoPlist",
+        ":BuildNumberInfoPlist",
+        ":VersionInfoPlist",
+        ":UrlTypesInfoPlist",
+    ],
+    deps = [
+        "//third-party/libvpx:vpx",
+    ],
+)
diff --git a/Telegram/BroadcastUpload/BroadcastUploadExtension.swift b/Telegram/BroadcastUpload/BroadcastUploadExtension.swift
new file mode 100644
index 0000000000..d1c0696c6a
--- /dev/null
+++ b/Telegram/BroadcastUpload/BroadcastUploadExtension.swift
@@ -0,0 +1,282 @@
+import Foundation
+import ReplayKit
+import CoreVideo
+import TelegramVoip
+import SwiftSignalKit
+import BuildConfig
+import BroadcastUploadHelpers
+import AudioToolbox
+
+private func rootPathForBasePath(_ appGroupPath: String) -> String {
+    return appGroupPath + "/telegram-data"
+}
+
+@available(iOS 10.0, *)
+@objc(BroadcastUploadSampleHandler) class BroadcastUploadSampleHandler: RPBroadcastSampleHandler {
+    private var screencastBufferClientContext: IpcGroupCallBufferBroadcastContext?
+    private var statusDisposable: Disposable?
+    private var audioConverter: CustomAudioConverter?
+
+    deinit {
+        self.statusDisposable?.dispose()
+    }
+
+    public override func beginRequest(with context: NSExtensionContext) {
+        super.beginRequest(with: context)
+    }
+
+    private func finish(with reason: IpcGroupCallBufferBroadcastContext.Status.FinishReason) {
+        var errorString: String?
+        switch reason {
+            case .callEnded:
+                errorString = "You're not in a voice chat"
+            case .error:
+                errorString = "Finished"
+            case .screencastEnded:
+                break
+        }
+        if let errorString = errorString {
+            let error = NSError(domain: "BroadcastUploadExtension", code: 1, userInfo: [
+                NSLocalizedDescriptionKey: errorString
+            ])
+            finishBroadcastWithError(error)
+        } else {
+            finishBroadcastGracefully(self)
+        }
+    }
+
+
+    override public func broadcastStarted(withSetupInfo setupInfo: [String : NSObject]?) {
+        guard let appBundleIdentifier = Bundle.main.bundleIdentifier, let lastDotRange = appBundleIdentifier.range(of: ".", options: [.backwards]) else {
+            self.finish(with: .error)
+            return
+        }
+
+        let baseAppBundleId = String(appBundleIdentifier[..<lastDotRange.lowerBound])
+
+        let appGroupName = "group.\(baseAppBundleId)"
+        let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName)
+
+        guard let appGroupUrl = maybeAppGroupUrl else {
+            self.finish(with: .error)
+            return
+        }
+
+        let rootPath = rootPathForBasePath(appGroupUrl.path)
+
+        let logsPath = rootPath + "/broadcast-logs"
+        let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
+
+        let screencastBufferClientContext = IpcGroupCallBufferBroadcastContext(basePath: rootPath + "/broadcast-coordination")
+        self.screencastBufferClientContext = screencastBufferClientContext
+
+        self.statusDisposable = (screencastBufferClientContext.status
+        |> deliverOnMainQueue).start(next: { [weak self] status in
+            guard let strongSelf = self else {
+                return
+            }
+            switch status {
+                case let .finished(reason):
+                    strongSelf.finish(with: reason)
+            }
+        })
+    }
+
+    override public func broadcastPaused() {
+    }
+
+    override public func broadcastResumed() {
+    }
+
+    override public func broadcastFinished() {
+    }
+
+    override public func processSampleBuffer(_ sampleBuffer: CMSampleBuffer, with sampleBufferType: RPSampleBufferType) {
+        switch sampleBufferType {
+        case RPSampleBufferType.video:
+            processVideoSampleBuffer(sampleBuffer: sampleBuffer)
+        case RPSampleBufferType.audioApp:
+            processAudioSampleBuffer(sampleBuffer: sampleBuffer)
+        case RPSampleBufferType.audioMic:
+            break
+        @unknown default:
+            break
+        }
+    }
+
+    private func processVideoSampleBuffer(sampleBuffer: CMSampleBuffer) {
+        guard let pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer) else {
+            return
+        }
+        var orientation = CGImagePropertyOrientation.up
+        if #available(iOS 11.0, *) {
+            if let orientationAttachment = CMGetAttachment(sampleBuffer, key: RPVideoSampleOrientationKey as CFString, attachmentModeOut: nil) as? NSNumber {
+                orientation = CGImagePropertyOrientation(rawValue: orientationAttachment.uint32Value) ?? .up
+            }
+        }
+        if let data = serializePixelBuffer(buffer: pixelBuffer) {
+            self.screencastBufferClientContext?.setCurrentFrame(data: data, orientation: orientation)
+        }
+    }
+
+    private func processAudioSampleBuffer(sampleBuffer: CMSampleBuffer) {
+        guard let formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer) else {
+            return
+        }
+        guard let asbd = CMAudioFormatDescriptionGetStreamBasicDescription(formatDescription) else {
+            return
+        }
+        /*guard let blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer) else {
+            return
+        }*/
+
+        let format = CustomAudioConverter.Format(
+            numChannels: Int(asbd.pointee.mChannelsPerFrame),
+            sampleRate: Int(asbd.pointee.mSampleRate)
+        )
+        if self.audioConverter?.format != format {
+            self.audioConverter = CustomAudioConverter(asbd: asbd)
+        }
+        if let audioConverter = self.audioConverter {
+            if let data = audioConverter.convert(sampleBuffer: sampleBuffer), !data.isEmpty {
+                self.screencastBufferClientContext?.writeAudioData(data: data)
+            }
+        }
+    }
+}
+
+private final class CustomAudioConverter {
+    struct Format: Equatable {
+        let numChannels: Int
+        let sampleRate: Int
+    }
+
+    let format: Format
+
+    var currentInputDescription: UnsafePointer<AudioStreamBasicDescription>?
+    var currentBuffer: AudioBuffer?
+    var currentBufferOffset: UInt32 = 0
+
+    init(asbd: UnsafePointer<AudioStreamBasicDescription>) {
+        self.format = Format(
+            numChannels: Int(asbd.pointee.mChannelsPerFrame),
+            sampleRate: Int(asbd.pointee.mSampleRate)
+        )
+    }
+
+    func convert(sampleBuffer: CMSampleBuffer) -> Data? {
+        guard let formatDescription = CMSampleBufferGetFormatDescription(sampleBuffer) else {
+            return nil
+        }
+        guard let asbd = CMAudioFormatDescriptionGetStreamBasicDescription(formatDescription) else {
+            return nil
+        }
+
+        var bufferList = AudioBufferList()
+        var blockBuffer: CMBlockBuffer? = nil
+        CMSampleBufferGetAudioBufferListWithRetainedBlockBuffer(
+            sampleBuffer,
+            bufferListSizeNeededOut: nil,
+            bufferListOut: &bufferList,
+            bufferListSize: MemoryLayout<AudioBufferList>.size,
+            blockBufferAllocator: nil,
+            blockBufferMemoryAllocator: nil,
+            flags: kCMSampleBufferFlag_AudioBufferList_Assure16ByteAlignment,
+            blockBufferOut: &blockBuffer
+        )
+        let size = bufferList.mBuffers.mDataByteSize
+        guard size != 0, let mData = bufferList.mBuffers.mData else {
+            return nil
+        }
+
+        var outputDescription = AudioStreamBasicDescription(
+            mSampleRate: 48000.0,
+            mFormatID: kAudioFormatLinearPCM,
+            mFormatFlags: kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked,
+            mBytesPerPacket: 2,
+            mFramesPerPacket: 1,
+            mBytesPerFrame: 2,
+            mChannelsPerFrame: 1,
+            mBitsPerChannel: 16,
+            mReserved: 0
+        )
+        var maybeAudioConverter: AudioConverterRef?
+        let _ = AudioConverterNew(asbd, &outputDescription, &maybeAudioConverter)
+        guard let audioConverter = maybeAudioConverter else {
+            return nil
+        }
+
+        self.currentBuffer = AudioBuffer(
+            mNumberChannels: asbd.pointee.mChannelsPerFrame,
+            mDataByteSize: UInt32(size),
+            mData: mData
+        )
+        self.currentBufferOffset = 0
+        self.currentInputDescription = asbd
+
+        var numPackets: UInt32?
+        let outputSize = 32768 * 2
+        var outputBuffer = Data(count: outputSize)
+        outputBuffer.withUnsafeMutableBytes { (outputBytes: UnsafeMutableRawBufferPointer) -> Void in
+            var outputBufferList = AudioBufferList()
+            outputBufferList.mNumberBuffers = 1
+            outputBufferList.mBuffers.mNumberChannels = outputDescription.mChannelsPerFrame
+            outputBufferList.mBuffers.mDataByteSize = UInt32(outputSize)
+            outputBufferList.mBuffers.mData = outputBytes.baseAddress!
+
+            var outputDataPacketSize = UInt32(outputSize) / outputDescription.mBytesPerPacket
+
+            let result = AudioConverterFillComplexBuffer(
+                audioConverter,
+                converterComplexInputDataProc,
+                Unmanaged.passUnretained(self).toOpaque(),
+                &outputDataPacketSize,
+                &outputBufferList,
+                nil
+            )
+            if result == noErr {
+                numPackets = outputDataPacketSize
+            }
+        }
+
+        AudioConverterDispose(audioConverter)
+
+        if let numPackets = numPackets {
+            outputBuffer.count = Int(numPackets * outputDescription.mBytesPerPacket)
+            return outputBuffer
+        } else {
+            return nil
+        }
+    }
+}
+
+private func converterComplexInputDataProc(inAudioConverter: AudioConverterRef, ioNumberDataPackets: UnsafeMutablePointer<UInt32>, ioData: UnsafeMutablePointer<AudioBufferList>, ioDataPacketDescription: UnsafeMutablePointer<UnsafeMutablePointer<AudioStreamPacketDescription>?>?, inUserData: UnsafeMutableRawPointer?) -> Int32 {
+    guard let inUserData = inUserData else {
+        ioNumberDataPackets.pointee = 0
+        return 0
+    }
+    let instance = Unmanaged<CustomAudioConverter>.fromOpaque(inUserData).takeUnretainedValue()
+    guard let currentBuffer = instance.currentBuffer else {
+        ioNumberDataPackets.pointee = 0
+        return 0
+    }
+    guard let currentInputDescription = instance.currentInputDescription else {
+        ioNumberDataPackets.pointee = 0
+        return 0
+    }
+
+    let numPacketsInBuffer = currentBuffer.mDataByteSize / currentInputDescription.pointee.mBytesPerPacket
+    let numPacketsAvailable = numPacketsInBuffer - instance.currentBufferOffset / currentInputDescription.pointee.mBytesPerPacket
+
+    let numPacketsToRead = min(ioNumberDataPackets.pointee, numPacketsAvailable)
+    ioNumberDataPackets.pointee = numPacketsToRead
+
+    ioData.pointee.mNumberBuffers = 1
+    ioData.pointee.mBuffers.mData = currentBuffer.mData?.advanced(by: Int(instance.currentBufferOffset))
+    ioData.pointee.mBuffers.mDataByteSize = currentBuffer.mDataByteSize - instance.currentBufferOffset
+    ioData.pointee.mBuffers.mNumberChannels = currentBuffer.mNumberChannels
+
+    instance.currentBufferOffset += numPacketsToRead * currentInputDescription.pointee.mBytesPerPacket
+
+    return 0
+}
diff --git a/Telegram/NotificationContent/NotificationViewController.swift b/Telegram/NotificationContent/NotificationViewController.swift
index d61ef5ffa2..56301732f9 100644
--- a/Telegram/NotificationContent/NotificationViewController.swift
+++ b/Telegram/NotificationContent/NotificationViewController.swift
@@ -38,7 +38,7 @@ class NotificationViewController: UIViewController, UNNotificationContentExtensi
             
             let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown"
             
-            self.impl = NotificationViewControllerImpl(initializationData: NotificationViewControllerInitializationData(appGroupPath: appGroupUrl.path, apiId: buildConfig.apiId, apiHash: buildConfig.apiHash, languagesCategory: languagesCategory, encryptionParameters: encryptionParameters, appVersion: appVersion, bundleData: buildConfig.bundleData(withAppToken: nil, signatureDict: nil)), setPreferredContentSize: { [weak self] size in
+            self.impl = NotificationViewControllerImpl(initializationData: NotificationViewControllerInitializationData(appBundleId: baseAppBundleId, appGroupPath: appGroupUrl.path, apiId: buildConfig.apiId, apiHash: buildConfig.apiHash, languagesCategory: languagesCategory, encryptionParameters: encryptionParameters, appVersion: appVersion, bundleData: buildConfig.bundleData(withAppToken: nil, signatureDict: nil)), setPreferredContentSize: { [weak self] size in
                 self?.preferredContentSize = size
             })
         }
diff --git a/Telegram/NotificationService/NotificationServiceObjC/Sources/Serialization.m b/Telegram/NotificationService/NotificationServiceObjC/Sources/Serialization.m
index 4b9dce740b..05d22b5f91 100644
--- a/Telegram/NotificationService/NotificationServiceObjC/Sources/Serialization.m
+++ b/Telegram/NotificationService/NotificationServiceObjC/Sources/Serialization.m
@@ -3,7 +3,7 @@
 @implementation Serialization
 
 - (NSUInteger)currentLayer {
-    return 125;
+    return 131;
 }
 
 - (id _Nullable)parseMessage:(NSData * _Nullable)data {
diff --git a/Telegram/Share/ShareRootController.swift b/Telegram/Share/ShareRootController.swift
index c0da95155d..1c53d48b3e 100644
--- a/Telegram/Share/ShareRootController.swift
+++ b/Telegram/Share/ShareRootController.swift
@@ -45,7 +45,7 @@ class ShareRootController: UIViewController {
             
             let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown"
             
-            self.impl = ShareRootControllerImpl(initializationData: ShareRootControllerInitializationData(appGroupPath: appGroupUrl.path, apiId: buildConfig.apiId, apiHash: buildConfig.apiHash, languagesCategory: languagesCategory, encryptionParameters: encryptionParameters, appVersion: appVersion, bundleData: buildConfig.bundleData(withAppToken: nil, signatureDict: nil)), getExtensionContext: { [weak self] in
+            self.impl = ShareRootControllerImpl(initializationData: ShareRootControllerInitializationData(appBundleId: baseAppBundleId, appGroupPath: appGroupUrl.path, apiId: buildConfig.apiId, apiHash: buildConfig.apiHash, languagesCategory: languagesCategory, encryptionParameters: encryptionParameters, appVersion: appVersion, bundleData: buildConfig.bundleData(withAppToken: nil, signatureDict: nil)), getExtensionContext: { [weak self] in
                 return self?.extensionContext
             })
         }
diff --git a/Telegram/SiriIntents/Info.plist b/Telegram/SiriIntents/Info.plist
deleted file mode 100644
index d77820f815..0000000000
--- a/Telegram/SiriIntents/Info.plist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${APP_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(PRODUCT_BUNDLE_SHORT_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>${BUILD_NUMBER}</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionAttributes</key>
-		<dict>
-			<key>IntentsRestrictedWhileLocked</key>
-			<array/>
-			<key>IntentsRestrictedWhileProtectedDataUnavailable</key>
-			<array/>
-			<key>IntentsSupported</key>
-			<array>
-				<string>INSendMessageIntent</string>
-				<string>INStartAudioCallIntent</string>
-				<string>INSearchForMessagesIntent</string>
-				<string>INSetMessageAttributeIntent</string>
-				<string>INSearchCallHistoryIntent</string>
-			</array>
-		</dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.intents-service</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>IntentHandler</string>
-	</dict>
-</dict>
-</plist>
diff --git a/Telegram/SiriIntents/IntentContacts.swift b/Telegram/SiriIntents/IntentContacts.swift
index 836fc29984..cb0fca310e 100644
--- a/Telegram/SiriIntents/IntentContacts.swift
+++ b/Telegram/SiriIntents/IntentContacts.swift
@@ -35,7 +35,7 @@ private func parseAppSpecificContactReference(_ value: String) -> PeerId? {
     }
     let idString = String(value[value.index(value.startIndex, offsetBy: phonebookUsernamePrefix.count)...])
     if let id = Int32(idString) {
-        return PeerId(namespace: Namespaces.Peer.CloudUser, id: id)
+        return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))
     }
     return nil
 }
diff --git a/Telegram/SiriIntents/IntentHandler.swift b/Telegram/SiriIntents/IntentHandler.swift
index 2d833a6c71..9429b3d762 100644
--- a/Telegram/SiriIntents/IntentHandler.swift
+++ b/Telegram/SiriIntents/IntentHandler.swift
@@ -114,7 +114,7 @@ class DefaultIntentHandler: INExtension, INSendMessageIntentHandling, INSearchFo
         
         self.rootPath = rootPath
         
-        TempBox.initializeShared(basePath: rootPath, processType: "siri", launchSpecificId: arc4random64())
+        TempBox.initializeShared(basePath: rootPath, processType: "siri", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
         
         let logsPath = rootPath + "/siri-logs"
         let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
@@ -619,7 +619,7 @@ class DefaultIntentHandler: INExtension, INSendMessageIntentHandling, INSearchFo
             }
             
             for (_, messageId) in maxMessageIdsToApply {
-                signals.append(applyMaxReadIndexInteractively(postbox: account.postbox, stateManager: account.stateManager, index: MessageIndex(id: messageId, timestamp: 0))
+                signals.append(TelegramEngine(account: account).messages.applyMaxReadIndexInteractively(index: MessageIndex(id: messageId, timestamp: 0))
                 |> castError(IntentHandlingError.self))
             }
             
@@ -793,7 +793,7 @@ class DefaultIntentHandler: INExtension, INSendMessageIntentHandling, INSearchFo
             var accountResults: [Signal<INObjectSection<Friend>, Error>] = []
             
             for (accountId, accountPeerId, _) in accounts {
-                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: true, transaction: { postbox, transaction -> INObjectSection<Friend> in
+                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: false, transaction: { postbox, transaction -> INObjectSection<Friend> in
                     var accountTitle: String = ""
                     if let peer = transaction.getPeer(accountPeerId) as? TelegramUser {
                         if let username = peer.username, !username.isEmpty {
@@ -884,7 +884,7 @@ private final class WidgetIntentHandler {
         
         self.rootPath = rootPath
         
-        TempBox.initializeShared(basePath: rootPath, processType: "siri", launchSpecificId: arc4random64())
+        TempBox.initializeShared(basePath: rootPath, processType: "siri", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
         
         let logsPath = rootPath + "/siri-logs"
         let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
@@ -962,7 +962,7 @@ private final class WidgetIntentHandler {
             var accountResults: [Signal<INObjectSection<Friend>, Error>] = []
             
             for (accountId, accountPeerId, _) in accounts {
-                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: true, transaction: { postbox, transaction -> INObjectSection<Friend> in
+                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: false, transaction: { postbox, transaction -> INObjectSection<Friend> in
                     var accountTitle: String = ""
                     if let peer = transaction.getPeer(accountPeerId) as? TelegramUser {
                         if let username = peer.username, !username.isEmpty {
@@ -1045,10 +1045,10 @@ private final class WidgetIntentHandler {
                 if !isActive {
                     continue
                 }
-                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: true, transaction: { postbox, transaction -> [Friend] in
+                accountResults.append(accountTransaction(rootPath: rootPath, id: accountId, encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: false, transaction: { postbox, transaction -> [Friend] in
                     var peers: [Peer] = []
                     
-                    for id in getRecentPeers(transaction: transaction) {
+                    for id in _internal_getRecentPeers(transaction: transaction) {
                         if let peer = transaction.getPeer(id), !(peer is TelegramSecretChat), !peer.isDeleted {
                             peers.append(peer)
                         }
diff --git a/Telegram/SiriIntents/IntentMessages.swift b/Telegram/SiriIntents/IntentMessages.swift
index 9661264889..1fddc10935 100644
--- a/Telegram/SiriIntents/IntentMessages.swift
+++ b/Telegram/SiriIntents/IntentMessages.swift
@@ -166,7 +166,7 @@ private func callWithTelegramMessage(_ telegramMessage: Message, account: Accoun
 
 @available(iOSApplicationExtension 10.0, iOS 10.0, *)
 private func messageWithTelegramMessage(_ telegramMessage: Message) -> INMessage? {
-    guard let author = telegramMessage.author, let user = telegramMessage.peers[author.id] as? TelegramUser, user.id.id != 777000 else {
+    guard let author = telegramMessage.author, let user = telegramMessage.peers[author.id] as? TelegramUser, user.id.id._internalGetInt32Value() != 777000 else {
         return nil
     }
     
diff --git a/Telegram/Telegram-iOS/AlternateIcons-iPad.plist b/Telegram/Telegram-iOS/AlternateIcons-iPad.plist
index 2d3b5e8409..a9ebd9173d 100644
--- a/Telegram/Telegram-iOS/AlternateIcons-iPad.plist
+++ b/Telegram/Telegram-iOS/AlternateIcons-iPad.plist
@@ -72,4 +72,44 @@
         <key>UIPrerenderedIcon</key>
         <true/>
     </dict>
+        <key>New1</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>New1_20x20</string>
+            <string>New1_29x29</string>
+            <string>New1_40x40</string>
+            <string>New1_58x58</string>
+            <string>New1_60x60</string>
+            <string>New1_76x76</string>
+            <string>New1_80x80</string>
+            <string>New1_87x87</string>
+            <string>New1_120x120</string>
+            <string>New1_152x152</string>
+            <string>New1_167x167</string>
+            <string>New1_180x180</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>New2</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>New2_20x20</string>
+            <string>New2_29x29</string>
+            <string>New2_40x40</string>
+            <string>New2_58x58</string>
+            <string>New2_60x60</string>
+            <string>New2_76x76</string>
+            <string>New2_80x80</string>
+            <string>New2_87x87</string>
+            <string>New2_120x120</string>
+            <string>New2_152x152</string>
+            <string>New2_167x167</string>
+            <string>New2_180x180</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
 </dict>
\ No newline at end of file
diff --git a/Telegram/Telegram-iOS/AlternateIcons.plist b/Telegram/Telegram-iOS/AlternateIcons.plist
index 99a0e7039a..d97e8c714a 100644
--- a/Telegram/Telegram-iOS/AlternateIcons.plist
+++ b/Telegram/Telegram-iOS/AlternateIcons.plist
@@ -66,4 +66,44 @@
         <key>UIPrerenderedIcon</key>
         <true/>
     </dict>
+    <key>New1</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>New1_20x20</string>
+            <string>New1_29x29</string>
+            <string>New1_40x40</string>
+            <string>New1_58x58</string>
+            <string>New1_60x60</string>
+            <string>New1_76x76</string>
+            <string>New1_80x80</string>
+            <string>New1_87x87</string>
+            <string>New1_120x120</string>
+            <string>New1_152x152</string>
+            <string>New1_167x167</string>
+            <string>New1_180x180</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
+    <key>New2</key>
+    <dict>
+        <key>CFBundleIconFiles</key>
+        <array>
+            <string>New2_20x20</string>
+            <string>New2_29x29</string>
+            <string>New2_40x40</string>
+            <string>New2_58x58</string>
+            <string>New2_60x60</string>
+            <string>New2_76x76</string>
+            <string>New2_80x80</string>
+            <string>New2_87x87</string>
+            <string>New2_120x120</string>
+            <string>New2_152x152</string>
+            <string>New2_167x167</string>
+            <string>New2_180x180</string>
+        </array>
+        <key>UIPrerenderedIcon</key>
+        <true/>
+    </dict>
 </dict>
\ No newline at end of file
diff --git a/Telegram/Telegram-iOS/New1_120x120.png b/Telegram/Telegram-iOS/New1_120x120.png
new file mode 100644
index 0000000000..70ddc32cbe
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_120x120.png differ
diff --git a/Telegram/Telegram-iOS/New1_152x152.png b/Telegram/Telegram-iOS/New1_152x152.png
new file mode 100644
index 0000000000..32adc011d1
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_152x152.png differ
diff --git a/Telegram/Telegram-iOS/New1_167x167.png b/Telegram/Telegram-iOS/New1_167x167.png
new file mode 100644
index 0000000000..93238e0c7f
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_167x167.png differ
diff --git a/Telegram/Telegram-iOS/New1_180x180.png b/Telegram/Telegram-iOS/New1_180x180.png
new file mode 100644
index 0000000000..ced492fd40
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_180x180.png differ
diff --git a/Telegram/Telegram-iOS/New1_20x20.png b/Telegram/Telegram-iOS/New1_20x20.png
new file mode 100644
index 0000000000..34afc4fbec
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_20x20.png differ
diff --git a/Telegram/Telegram-iOS/New1_29x29.png b/Telegram/Telegram-iOS/New1_29x29.png
new file mode 100644
index 0000000000..6387cb01bd
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_29x29.png differ
diff --git a/Telegram/Telegram-iOS/New1_40x40.png b/Telegram/Telegram-iOS/New1_40x40.png
new file mode 100644
index 0000000000..e29005ac4e
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_40x40.png differ
diff --git a/Telegram/Telegram-iOS/New1_58x58.png b/Telegram/Telegram-iOS/New1_58x58.png
new file mode 100644
index 0000000000..93c34d10c7
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_58x58.png differ
diff --git a/Telegram/Telegram-iOS/New1_60x60.png b/Telegram/Telegram-iOS/New1_60x60.png
new file mode 100644
index 0000000000..54a04f2c27
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_60x60.png differ
diff --git a/Telegram/Telegram-iOS/New1_76x76.png b/Telegram/Telegram-iOS/New1_76x76.png
new file mode 100644
index 0000000000..c85f9bc45a
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_76x76.png differ
diff --git a/Telegram/Telegram-iOS/New1_80x80.png b/Telegram/Telegram-iOS/New1_80x80.png
new file mode 100644
index 0000000000..fb4f4a6122
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_80x80.png differ
diff --git a/Telegram/Telegram-iOS/New1_87x87.png b/Telegram/Telegram-iOS/New1_87x87.png
new file mode 100644
index 0000000000..1b3e74dfa6
Binary files /dev/null and b/Telegram/Telegram-iOS/New1_87x87.png differ
diff --git a/Telegram/Telegram-iOS/New2_120x120.png b/Telegram/Telegram-iOS/New2_120x120.png
new file mode 100644
index 0000000000..85de9e3fab
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_120x120.png differ
diff --git a/Telegram/Telegram-iOS/New2_152x152.png b/Telegram/Telegram-iOS/New2_152x152.png
new file mode 100644
index 0000000000..d94dc86c61
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_152x152.png differ
diff --git a/Telegram/Telegram-iOS/New2_167x167.png b/Telegram/Telegram-iOS/New2_167x167.png
new file mode 100644
index 0000000000..813a39a5bd
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_167x167.png differ
diff --git a/Telegram/Telegram-iOS/New2_180x180.png b/Telegram/Telegram-iOS/New2_180x180.png
new file mode 100644
index 0000000000..a083c562d4
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_180x180.png differ
diff --git a/Telegram/Telegram-iOS/New2_20x20.png b/Telegram/Telegram-iOS/New2_20x20.png
new file mode 100644
index 0000000000..d2d9d52e92
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_20x20.png differ
diff --git a/Telegram/Telegram-iOS/New2_29x29.png b/Telegram/Telegram-iOS/New2_29x29.png
new file mode 100644
index 0000000000..4e0265fa69
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_29x29.png differ
diff --git a/Telegram/Telegram-iOS/New2_40x40.png b/Telegram/Telegram-iOS/New2_40x40.png
new file mode 100644
index 0000000000..fe2d70eada
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_40x40.png differ
diff --git a/Telegram/Telegram-iOS/New2_58x58.png b/Telegram/Telegram-iOS/New2_58x58.png
new file mode 100644
index 0000000000..37e2e15d18
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_58x58.png differ
diff --git a/Telegram/Telegram-iOS/New2_60x60.png b/Telegram/Telegram-iOS/New2_60x60.png
new file mode 100644
index 0000000000..caab8e9d8a
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_60x60.png differ
diff --git a/Telegram/Telegram-iOS/New2_76x76.png b/Telegram/Telegram-iOS/New2_76x76.png
new file mode 100644
index 0000000000..ca043ed339
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_76x76.png differ
diff --git a/Telegram/Telegram-iOS/New2_80x80.png b/Telegram/Telegram-iOS/New2_80x80.png
new file mode 100644
index 0000000000..6750299df3
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_80x80.png differ
diff --git a/Telegram/Telegram-iOS/New2_87x87.png b/Telegram/Telegram-iOS/New2_87x87.png
new file mode 100644
index 0000000000..1815681047
Binary files /dev/null and b/Telegram/Telegram-iOS/New2_87x87.png differ
diff --git a/Telegram/Telegram-iOS/Resources/Channel.tgs b/Telegram/Telegram-iOS/Resources/Channel.tgs
index db71858d35..be8dd016f4 100644
Binary files a/Telegram/Telegram-iOS/Resources/Channel.tgs and b/Telegram/Telegram-iOS/Resources/Channel.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs
new file mode 100644
index 0000000000..133d47e1e1
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminder.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs
new file mode 100644
index 0000000000..dbd7cd7e93
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToMute.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs
new file mode 100644
index 0000000000..bc8c45ab81
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceCancelReminderToRaiseHand.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs
deleted file mode 100644
index 3e20f03395..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOff.tgs and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs
deleted file mode 100644
index ed44efc0ba..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOff2.tgs and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs b/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs
deleted file mode 100644
index f0db083d4f..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHandOn.tgs and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs
index 09612a30a1..8a7845594e 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_1.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs
new file mode 100644
index 0000000000..f49670a841
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_10.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs
index 5664e4df5b..0fd6090d7d 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_2.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs
index ea6710d819..3ef3620507 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_3.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs
index 49e54790cf..0c20c2a4e8 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_4.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs
index 396e572397..0675d255d6 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_5.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs
index 04a797f9b4..fdadd74a8e 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_6.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs
index dd03e566ba..74a6db1b1f 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs and b/Telegram/Telegram-iOS/Resources/VoiceHand_7.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs
new file mode 100644
index 0000000000..b4ef9e3e02
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_8.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs b/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs
new file mode 100644
index 0000000000..e1d4e9965b
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceHand_9.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceMute.tgs
index a6d20bddcc..533a7a6a2e 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceMute.tgs and b/Telegram/Telegram-iOS/Resources/VoiceMute.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs
new file mode 100644
index 0000000000..6424171527
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceMuteToRaiseHand.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs
new file mode 100644
index 0000000000..ac08b6eb7f
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceRaiseHandToMute.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs
new file mode 100644
index 0000000000..fe22c2c4ea
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminder.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs
new file mode 100644
index 0000000000..6edae3e5c2
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToMute.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs
new file mode 100644
index 0000000000..802ca82bde
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceSetReminderToRaiseHand.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceStart.tgs b/Telegram/Telegram-iOS/Resources/VoiceStart.tgs
new file mode 100644
index 0000000000..de31e33e5b
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceStart.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs b/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs
index 2f38fb678f..57d546d4d2 100644
Binary files a/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs and b/Telegram/Telegram-iOS/Resources/VoiceUnmute.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs b/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs
new file mode 100644
index 0000000000..0c0d781c7b
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/VoiceUnmuteToRaiseHand.tgs differ
diff --git a/Telegram/Telegram-iOS/Resources/begin_record.caf b/Telegram/Telegram-iOS/Resources/begin_record.caf
deleted file mode 100644
index 3d2e9c4813..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/begin_record.caf and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/begin_record.mp3 b/Telegram/Telegram-iOS/Resources/begin_record.mp3
new file mode 100644
index 0000000000..8a5cf9fb82
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/begin_record.mp3 differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_busy.caf b/Telegram/Telegram-iOS/Resources/voip_busy.caf
deleted file mode 100644
index 7a6d839506..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/voip_busy.caf and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_busy.mp3 b/Telegram/Telegram-iOS/Resources/voip_busy.mp3
new file mode 100644
index 0000000000..08f9897a25
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/voip_busy.mp3 differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_end.caf b/Telegram/Telegram-iOS/Resources/voip_end.caf
deleted file mode 100644
index c0a22b1389..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/voip_end.caf and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_end.mp3 b/Telegram/Telegram-iOS/Resources/voip_end.mp3
new file mode 100644
index 0000000000..2bf50b2f22
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/voip_end.mp3 differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_fail.caf b/Telegram/Telegram-iOS/Resources/voip_fail.caf
deleted file mode 100644
index 17e0da3de4..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/voip_fail.caf and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_fail.mp3 b/Telegram/Telegram-iOS/Resources/voip_fail.mp3
new file mode 100644
index 0000000000..fc87e864a0
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/voip_fail.mp3 differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_ringback.caf b/Telegram/Telegram-iOS/Resources/voip_ringback.caf
deleted file mode 100644
index af7253776c..0000000000
Binary files a/Telegram/Telegram-iOS/Resources/voip_ringback.caf and /dev/null differ
diff --git a/Telegram/Telegram-iOS/Resources/voip_ringback.mp3 b/Telegram/Telegram-iOS/Resources/voip_ringback.mp3
new file mode 100644
index 0000000000..ff955a38a6
Binary files /dev/null and b/Telegram/Telegram-iOS/Resources/voip_ringback.mp3 differ
diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
index 38f0ddf643..1192cce349 100644
--- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings
+++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings
@@ -104,9 +104,8 @@
 "PUSH_MESSAGES_1" = "%1$@|sent you a message";
 "PUSH_MESSAGES_any" = "%1$@|sent you %2$d messages";
 "PUSH_ALBUM" = "%1$@|sent you an album";
-"PUSH_MESSAGE_DOCS" = "%1$@|sent you %2$d files";
-"PUSH_MESSAGE_DOCS_1" = "%1$@|sent you a file";
-"PUSH_MESSAGE_DOCS_any" = "%1$@|sent you %2$d files";
+"PUSH_MESSAGE_FILES_1" = "%1$@|sent you a file";
+"PUSH_MESSAGE_FILES_any" = "%1$@|sent you %2$d files";
 
 
 "PUSH_CHANNEL_MESSAGE_TEXT" = "%1$@|%2$@";
@@ -2552,7 +2551,6 @@ Unused sets are archived when you add more.";
 "Message.ForwardedMessageShort" = "Forwarded From\n%@";
 
 "Checkout.LiabilityAlertTitle" = "Warning";
-"Checkout.LiabilityAlert" = "Neither Telegram, nor %1$@ will have access to your credit card information. Credit card details will be handled only by the payment system, %2$@.\n\nPayments will go directly to the developer of %1$@. Telegram cannot provide any guarantees, so proceed at your own risk. In case of problems, please contact the developer of %1$@ or your bank.";
 
 "Settings.AppLanguage" = "Language";
 "Settings.AppLanguage.Unofficial" = "UNOFFICIAL";
@@ -3950,6 +3948,7 @@ Unused sets are archived when you add more.";
 "WallpaperPreview.Title" = "Background Preview";
 "WallpaperPreview.PreviewTopText" = "Press Set to apply the background";
 "WallpaperPreview.PreviewBottomText" = "Enjoy the view";
+
 "WallpaperPreview.SwipeTopText" = "Swipe left or right to preview more backgrounds";
 "WallpaperPreview.SwipeBottomText" = "Backgrounds for the god of backgrounds!";
 "WallpaperPreview.SwipeColorsTopText" = "Swipe left or right to see more colors";
@@ -4430,6 +4429,8 @@ Sorry for the inconvenience.";
 "Appearance.AppIconClassicX" = "Classic X";
 "Appearance.AppIconFilled" = "Filled";
 "Appearance.AppIconFilledX" = "Filled X";
+"Appearance.AppIconNew1" = "Sunset";
+"Appearance.AppIconNew2" = "Aqua";
 
 "Appearance.ThemeCarouselClassic" = "Classic";
 "Appearance.ThemeCarouselDay" = "Day";
@@ -5742,6 +5743,7 @@ Sorry for the inconvenience.";
 
 "Notification.VoiceChatStarted" = "%1$@ started a voice chat";
 "Notification.VoiceChatEnded" = "Voice chat ended (%@)";
+"Notification.VoiceChatEndedGroup" = "%1$@ ended the voice chat (%2$@)";
 
 "VoiceChat.Panel.TapToJoin" = "Tap to join";
 "VoiceChat.Panel.Members_0" = "%@ participants";
@@ -5774,10 +5776,13 @@ Sorry for the inconvenience.";
 
 "VoiceChat.CreateNewVoiceChatText" = "Voice chat ended. Start a new one?";
 "VoiceChat.CreateNewVoiceChatStart" = "Start";
+"VoiceChat.CreateNewVoiceChatStartNow" = "Start Now";
+"VoiceChat.CreateNewVoiceChatSchedule" = "Schedule";
 
 "PUSH_CHAT_VOICECHAT_START" = "%2$@|%1$@ started a voice chat";
 "PUSH_CHAT_VOICECHAT_INVITE" = "%2$@|%1$@ invited %3$@ to the voice chat";
-"PUSH_CHAT_VOICECHAT_INVITE_YOU" = "%2$|@%1$@ invited you to the voice chat";
+"PUSH_CHAT_VOICECHAT_INVITE_YOU" = "%2$@|%1$@ invited you to the voice chat";
+"PUSH_CHAT_VOICECHAT_END" = "%2$@|%1$@ has ended the voice chat";
 
 "Call.VoiceChatInProgressTitle" = "Voice Chat in Progress";
 "Call.VoiceChatInProgressMessageCall" = "Leave voice chat in %1$@ and start a call with %2$@?";
@@ -6037,7 +6042,6 @@ Sorry for the inconvenience.";
 "Conversation.ForwardTooltip.TwoChats.Many" = "Messages forwarded to **%@** and **%@**";
 "Conversation.ForwardTooltip.ManyChats.One" = "Message forwarded to **%@** and %@ others";
 "Conversation.ForwardTooltip.ManyChats.Many" = "Messages forwarded to **%@** and %@ others";
-
 "Conversation.ForwardTooltip.SavedMessages.One" = "Message forwarded to **Saved Messages**";
 "Conversation.ForwardTooltip.SavedMessages.Many" = "Messages forwarded to **Saved Messages**";
 
@@ -6255,6 +6259,7 @@ Sorry for the inconvenience.";
 
 "VoiceChat.YouCanNowSpeak" = "You can now speak";
 "VoiceChat.YouCanNowSpeakIn" = "You can now speak in **%@**";
+"VoiceChat.UserCanNowSpeak" = "**%@** can now speak";
 
 "VoiceChat.MutedByAdmin" = "Muted by Admin";
 "VoiceChat.MutedByAdminHelp" = "Tap if you want to speak";
@@ -6292,7 +6297,277 @@ Sorry for the inconvenience.";
 "VoiceChat.LeaveConfirmation" = "Are you sure you want to leave this voice chat?";
 "VoiceChat.LeaveVoiceChat" = "Leave Voice Chat";
 "VoiceChat.LeaveAndEndVoiceChat" = "End Voice Chat";
+"VoiceChat.LeaveAndCancelVoiceChat" = "Abort Voice Chat";
 
 "VoiceChat.ForwardTooltip.Chat" = "Invite link forwarded to **%@**";
 "VoiceChat.ForwardTooltip.TwoChats" = "Invite link forwarded to **%@** and **%@**";
 "VoiceChat.ForwardTooltip.ManyChats" = "Invite link forwarded to **%@** and %@ others";
+
+"GroupRemoved.ViewChannelInfo" = "View Channel";
+
+"UserInfo.ContactForwardTooltip.Chat.One" = "Contact forwarded to **%@**";
+"UserInfo.ContactForwardTooltip.TwoChats.One" = "Contact forwarded to **%@** and **%@**";
+"UserInfo.ContactForwardTooltip.ManyChats.One" = "Contact forwarded to **%@** and %@ others";
+"UserInfo.ContactForwardTooltip.SavedMessages.One" = "Contact forwarded to **Saved Messages**";
+
+"UserInfo.LinkForwardTooltip.Chat.One" = "Link forwarded to **%@**";
+"UserInfo.LinkForwardTooltip.TwoChats.One" = "Link forwarded to **%@** and **%@**";
+"UserInfo.LinkForwardTooltip.ManyChats.One" = "Link forwarded to **%@** and %@ others";
+"UserInfo.LinkForwardTooltip.SavedMessages.One" = "Link forwarded to **Saved Messages**";
+
+"VoiceChat.You" = "this is you";
+"VoiceChat.ChangePhoto" = "Change Photo";
+"VoiceChat.EditBio" = "Edit Bio";
+"VoiceChat.EditBioTitle" = "Bio";
+"VoiceChat.EditBioText" = "Any details such as age, occupation or city.";
+"VoiceChat.EditBioPlaceholder" = "Bio";
+"VoiceChat.EditBioSave" = "Save";
+"VoiceChat.EditBioSuccess" = "Your bio is changed.";
+
+"VoiceChat.EditDescription" = "Edit Description";
+"VoiceChat.EditDescriptionTitle" = "Description";
+"VoiceChat.EditDescriptionText" = "Any details such as age, occupation or city.";
+"VoiceChat.EditDescriptionPlaceholder" = "Description";
+"VoiceChat.EditDescriptionSave" = "Save";
+"VoiceChat.EditDescriptionSuccess" = "Description is changed.";
+
+"VoiceChat.SendPublicLinkText" = "%1$@ isn't a member of \"%2$@\" yet. Send them a public invite link instead?";
+"VoiceChat.SendPublicLinkSend" = "Send";
+
+"VoiceChat.TapToAddPhotoOrBio" = "tap to add photo or bio";
+"VoiceChat.TapToAddPhoto" = "tap to add photo";
+"VoiceChat.TapToAddBio" = "tap to add bio";
+"VoiceChat.ImproveYourProfileText" = "You can improve your profile by adding missing information.";
+
+"VoiceChat.AddPhoto" = "Add Photo";
+"VoiceChat.AddBio" = "Add Bio";
+"VoiceChat.ChangeName" = "Change Name";
+"VoiceChat.ChangeNameTitle" = "Change Name";
+"VoiceChat.EditNameSuccess" = "Your name is changed.";
+
+"VoiceChat.Video" = "video";
+
+"VoiceChat.PinVideo" = "Pin Video";
+"VoiceChat.UnpinVideo" = "Unpin Video";
+
+"Notification.VoiceChatScheduledChannel" = "Voice chat scheduled for %@";
+"Notification.VoiceChatScheduled" = "%1$@ scheduled a voice chat for %2$@";
+
+"Notification.VoiceChatScheduledTodayChannel" = "Voice chat scheduled for today at %@";
+"Notification.VoiceChatScheduledToday" = "%1$@ scheduled a voice chat for today at %2$@";
+
+"Notification.VoiceChatScheduledTomorrowChannel" = "Voice chat scheduled for tomorrow at %@";
+"Notification.VoiceChatScheduledTomorrow" = "%1$@ scheduled a voice chat for tomorrow at %2$@";
+
+"VoiceChat.StartsIn" = "Starts in";
+"VoiceChat.LateBy" = "Late by";
+
+"VoiceChat.StatusStartsIn" = "starts in %@";
+"VoiceChat.StatusLateBy" = "late by %@";
+
+"VoiceChat.Scheduled" = "Scheduled";
+
+"VoiceChat.StartNow" = "Start Now";
+"VoiceChat.SetReminder" = "Set Reminder";
+"VoiceChat.CancelReminder" = "Cancel Reminder";
+
+"VoiceChat.ShareShort" = "share";
+"VoiceChat.TapToEditTitle" = "Tap to edit title";
+
+"ChannelInfo.ScheduleVoiceChat" = "Schedule Voice Chat";
+
+"ScheduleVoiceChat.Title" = "Schedule Voice Chat";
+"ScheduleVoiceChat.GroupText" = "The members of the group will be notified that the voice chat will start in %@.";
+"ScheduleVoiceChat.ChannelText" = "The members of the channel will be notified that the voice chat will start in %@.";
+
+"ScheduleVoiceChat.ScheduleToday" = "Start today at %@";
+"ScheduleVoiceChat.ScheduleTomorrow" = "Start tomorrow at %@";
+"ScheduleVoiceChat.ScheduleOn" = "Start on %@ at %@";
+
+"Conversation.ScheduledVoiceChat" = "Scheduled Voice Chat";
+
+"Conversation.ScheduledVoiceChatStartsOn" = "Voice chat starts on %@";
+"Conversation.ScheduledVoiceChatStartsOnShort" = "Starts on %@";
+"Conversation.ScheduledVoiceChatStartsToday" = "Voice chat starts today at %@";
+"Conversation.ScheduledVoiceChatStartsTodayShort" = "Starts today at %@";
+"Conversation.ScheduledVoiceChatStartsTomorrow" = "Voice chat starts tomorrow at %@";
+"Conversation.ScheduledVoiceChatStartsTomorrowShort" = "Starts tomorrow at %@";
+
+"VoiceChat.CancelVoiceChat" = "Abort Voice Chat";
+"VoiceChat.CancelConfirmationTitle" = "Abort Voice Chat";
+"VoiceChat.CancelConfirmationText" = "Do you want to abort the scheduled voice chat?";
+"VoiceChat.CancelConfirmationEnd" = "Abort";
+
+"ScheduledIn.Seconds_1" = "%@ second";
+"ScheduledIn.Seconds_2" = "%@ seconds";
+"ScheduledIn.Seconds_3_10" = "%@ seconds";
+"ScheduledIn.Seconds_any" = "%@ seconds";
+"ScheduledIn.Seconds_many" = "%@ seconds";
+"ScheduledIn.Seconds_0" = "%@ seconds";
+"ScheduledIn.Minutes_1" = "%@ minute";
+"ScheduledIn.Minutes_2" = "%@ minutes";
+"ScheduledIn.Minutes_3_10" = "%@ minutes";
+"ScheduledIn.Minutes_any" = "%@ minutes";
+"ScheduledIn.Minutes_many" = "%@ minutes";
+"ScheduledIn.Minutes_0" = "%@ minutes";
+"ScheduledIn.Hours_1" = "%@ hour";
+"ScheduledIn.Hours_2" = "%@ hours";
+"ScheduledIn.Hours_3_10" = "%@ hours";
+"ScheduledIn.Hours_any" = "%@ hours";
+"ScheduledIn.Hours_many" = "%@ hours";
+"ScheduledIn.Hours_0" = "%@ hours";
+"ScheduledIn.Days_1" = "%@ day";
+"ScheduledIn.Days_2" = "%@ days";
+"ScheduledIn.Days_3_10" = "%@ days";
+"ScheduledIn.Days_any" = "%@ days";
+"ScheduledIn.Days_many" = "%@ days";
+"ScheduledIn.Days_0" = "%@ days";
+"ScheduledIn.Weeks_1" = "%@ week";
+"ScheduledIn.Weeks_2" = "%@ weeks";
+"ScheduledIn.Weeks_3_10" = "%@ weeks";
+"ScheduledIn.Weeks_any" = "%@ weeks";
+"ScheduledIn.Weeks_many" = "%@ weeks";
+"ScheduledIn.Weeks_0" = "%@ weeks";
+"ScheduledIn.Months_1" = "%@ month";
+"ScheduledIn.Months_2" = "%@ months";
+"ScheduledIn.Months_3_10" = "%@ months";
+"ScheduledIn.Months_any" = "%@ months";
+"ScheduledIn.Months_many" = "%@ months";
+"ScheduledIn.Months_0" = "%@ months";
+"ScheduledIn.Years_1" = "%@ year";
+"ScheduledIn.Years_2" = "%@ years";
+"ScheduledIn.Years_3_10" = "%@ years";
+"ScheduledIn.Years_any" = "%@ years";
+"ScheduledIn.Months_many" = "%@ years";
+
+"Checkout.PaymentLiabilityAlert" = "Neither Telegram, nor {target} will have access to your credit card information. Credit card details will be handled only by the payment system, {payment_system}.\n\nPayments will go directly to the developer of {target}. Telegram cannot provide any guarantees, so proceed at your own risk. In case of problems, please contact the developer of {target} or your bank.";
+
+"Checkout.OptionalTipItem" = "Tip (Optional)";
+"Checkout.TipItem" = "Tip";
+"Checkout.OptionalTipItemPlaceholder" = "Enter Custom";
+
+"VoiceChat.ReminderNotify" = "We will notify you when it starts.";
+
+"Checkout.SuccessfulTooltip" = "You paid %1$@ for %2$@.";
+
+"Privacy.ContactsReset.ContactsDeleted" = "All synced contacts deleted.";
+
+"Privacy.DeleteDrafts.DraftsDeleted" = "All cloud drafts deleted.";
+
+"Privacy.PaymentsClear.PaymentInfoCleared" = "Payment info cleared.";
+"Privacy.PaymentsClear.ShippingInfoCleared" = "Shipping info cleared.";
+"Privacy.PaymentsClear.AllInfoCleared" = "Payment and shipping info cleared.";
+
+"Settings.Tips" = "Telegram Features";
+"Settings.TipsUsername" = "TelegramTips";
+
+"Calls.NoVoiceAndVideoCallsPlaceholder" = "Your recent voice and video calls will appear here.";
+"Calls.StartNewCall" = "Start New Call";
+
+"VoiceChat.VideoPreviewTitle" = "Video Preview";
+"VoiceChat.VideoPreviewDescription" = "Are you sure you want to share your video?";
+"VoiceChat.VideoPreviewShareCamera" = "Share Camera Video";
+"VoiceChat.VideoPreviewShareScreen" = "Share Screen";
+"VoiceChat.VideoPreviewStopScreenSharing" = "Stop Screen Sharing";
+
+"VoiceChat.TapToViewCameraVideo" = "Tap to view camera video";
+"VoiceChat.TapToViewScreenVideo" = "Tap to view screen sharing";
+
+"VoiceChat.ShareScreen" = "Share Screen";
+"VoiceChat.StopScreenSharing" = "Stop Screen Sharing";
+"VoiceChat.ParticipantIsSpeaking" = "%1$@ is speaking";
+
+"WallpaperPreview.WallpaperColors" = "Colors";
+
+"VoiceChat.UnmuteSuggestion" = "You are on mute. Tap here to speak.";
+
+"VoiceChat.ContextAudio" = "Audio";
+
+"VoiceChat.VideoPaused" = "Video is paused";
+"VoiceChat.YouAreSharingScreen" = "You are sharing your screen";
+"VoiceChat.StopScreenSharingShort" = "Stop Sharing";
+
+"VoiceChat.OpenGroup" = "Open Group";
+
+"VoiceChat.NoiseSuppression" = "Noise Suppression";
+"VoiceChat.NoiseSuppressionEnabled" = "Enabled";
+"VoiceChat.NoiseSuppressionDisabled" = "Disabled";
+
+"VoiceChat.Unpin" = "Unpin";
+
+"VoiceChat.VideoParticipantsLimitExceeded" = "Video is only available\nfor the first %@ members";
+
+"ImportStickerPack.StickerCount_1" = "1 Sticker";
+"ImportStickerPack.StickerCount_2" = "2 Stickers";
+"ImportStickerPack.StickerCount_3_10" = "%@ Stickers";
+"ImportStickerPack.StickerCount_any" = "%@ Stickers";
+"ImportStickerPack.StickerCount_many" = "%@ Stickers";
+"ImportStickerPack.StickerCount_0" = "%@ Stickers";
+"ImportStickerPack.CreateStickerSet" = "Create Sticker Set";
+"ImportStickerPack.CreateNewStickerSet" = "Create a New Sticker Set";
+"ImportStickerPack.AddToExistingStickerSet" = "Add to an Existing Sticker Set";
+"ImportStickerPack.ChooseStickerSet" = "Choose Sticker Set";
+"ImportStickerPack.RemoveFromImport" = "Remove From Import";
+"ImportStickerPack.ChooseName" = "Choose Name";
+"ImportStickerPack.ChooseNameDescription" = "Please choose a name for your set.";
+"ImportStickerPack.NamePlaceholder" = "Name";
+"ImportStickerPack.GeneratingLink" = "generating link...";
+"ImportStickerPack.CheckingLink" = "checking availability...";
+"ImportStickerPack.ChooseLink" = "Choose Link";
+"ImportStickerPack.ChooseLinkDescription" = "You can use a-z, 0-9 and underscores.";
+"ImportStickerPack.LinkTaken" = "Sorry, this link is already taken.";
+"ImportStickerPack.LinkAvailable" = "Link is available.";
+"ImportStickerPack.ImportingStickers" = "Importing Stickers";
+"ImportStickerPack.Of" = "%1$@ of %2$@ Imported";
+"ImportStickerPack.InProgress" = "Please keep this window open\nuntil the import is completed.";
+"ImportStickerPack.Create" = "Create";
+
+"WallpaperPreview.PreviewBottomTextAnimatable" = "Tap the play button to view the background animation.";
+
+"Conversation.InputMenu" = "Menu";
+"Conversation.MessageDoesntExist" = "Message doesn't exist";
+
+"Settings.CheckPasswordTitle" = "Your Password";
+"Settings.CheckPasswordText" = "Your account is protected by 2-Step Verification. Do you still remember your password?";
+"Settings.KeepPassword" = "Yes, definitely";
+"Settings.TryEnterPassword" = "Not sure, let me try";
+
+"TwoFactorSetup.PasswordRecovery.Title" = "Create New Password";
+"TwoFactorSetup.PasswordRecovery.Text" = "You can now set a new password that will be used to log into your account.";
+"TwoFactorSetup.PasswordRecovery.PlaceholderPassword" = "New Password";
+"TwoFactorSetup.PasswordRecovery.PlaceholderConfirmPassword" = "Re-enter New Password";
+"TwoFactorSetup.PasswordRecovery.Action" = "Continue";
+"TwoFactorSetup.PasswordRecovery.Skip" = "Skip";
+"TwoFactorSetup.PasswordRecovery.SkipAlertTitle" = "Attention!";
+"TwoFactorSetup.PasswordRecovery.SkipAlertText" = "Skipping this step will disable 2-step verification for your account. Are you sure you want to skip?";
+"TwoFactorSetup.PasswordRecovery.SkipAlertAction" = "Skip";
+
+"TwoStepAuth.RecoveryUnavailableResetTitle" = "Reset Password";
+"TwoStepAuth.RecoveryUnavailableResetText" = "Since you didn’t provide a recovery email when setting up your password, your remaining options are either to remember your password or wait 7 days until your password is reset.";
+"TwoStepAuth.RecoveryEmailResetText" = "If you don't have access to your recovery email, your remaining options are either to remember your password or wait 7 days until your password resets.";
+"TwoStepAuth.RecoveryUnavailableResetAction" = "Reset";
+"TwoStepAuth.ResetPendingText" = "You can reset your password in %@.";
+"TwoStepAuth.CancelResetTitle" = "Cancel Reset";
+"TwoStepAuth.ResetAction" = "Reset Password";
+"TwoStepAuth.CancelResetText" = "Cancel the password reset process? If you request a new reset later, it will take another 7 days.";
+"TwoStepAuth.RecoveryEmailResetNoAccess" = "Can’t access your email?";
+
+"TwoFactorSetup.ResetDone.Title" = "New Password Set!";
+"TwoFactorSetup.ResetDone.Text" = "This password will be required when you log in on a new device in addition to the code you get via SMS.";
+"TwoFactorSetup.ResetDone.Action" = "Continue";
+
+"TwoFactorSetup.ResetDone.TitleNoPassword" = "Password Removed";
+"TwoFactorSetup.ResetDone.TextNoPassword" = "You can always set a new password in\n\n\nSettings>Privacy & Security>Two-Step Verification";
+
+"TwoFactorSetup.ResetFloodWait" = "You recently requested a password reset that was cancelled. Please wait %@ before making a new request.";
+"TwoFactorSetup.ResetFloodWait" = "You have recently requested a password reset that was canceled. Please wait for %@ before making a new request.";
+
+"TwoFactorRemember.Title" = "Enter Your Password";
+"TwoFactorRemember.Text" = "Do you still remeber your password?";
+"TwoFactorRemember.Placeholder" = "Password";
+"TwoFactorRemember.Forgot" = "Forgot Password?";
+"TwoFactorRemember.CheckPassword" = "Check Password";
+"TwoFactorRemember.WrongPassword" = "This password is incorrect.";
+"TwoFactorRemember.Done.Title" = "Perfect!";
+"TwoFactorRemember.Done.Text" = "You still remember your password.";
+"TwoFactorRemember.Done.Action" = "Back to Settings";
diff --git a/Telegram/Widget/Info.plist b/Telegram/Widget/Info.plist
deleted file mode 100644
index 6917b6ac76..0000000000
--- a/Telegram/Widget/Info.plist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleDisplayName</key>
-	<string>${APP_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>XPC!</string>
-	<key>CFBundleShortVersionString</key>
-	<string>$(PRODUCT_BUNDLE_SHORT_VERSION)</string>
-	<key>CFBundleVersion</key>
-	<string>${BUILD_NUMBER}</string>
-	<key>NSExtension</key>
-	<dict>
-		<key>NSExtensionPointIdentifier</key>
-		<string>com.apple.widget-extension</string>
-		<key>NSExtensionPrincipalClass</key>
-		<string>TodayViewController</string>
-	</dict>
-</dict>
-</plist>
diff --git a/Telegram/Widget/PeerNode.swift b/Telegram/Widget/PeerNode.swift
deleted file mode 100644
index b89deba9e6..0000000000
--- a/Telegram/Widget/PeerNode.swift
+++ /dev/null
@@ -1,172 +0,0 @@
-import Foundation
-import UIKit
-import WidgetItems
-
-private extension UIColor {
-    convenience init(rgb: UInt32) {
-        self.init(red: CGFloat((rgb >> 16) & 0xff) / 255.0, green: CGFloat((rgb >> 8) & 0xff) / 255.0, blue: CGFloat(rgb & 0xff) / 255.0, alpha: 1.0)
-    }
-}
-
-private let UIScreenScale = UIScreen.main.scale
-private func floorToScreenPixels(_ value: CGFloat) -> CGFloat {
-    return floor(value * UIScreenScale) / UIScreenScale
-}
-
-private let gradientColors: [NSArray] = [
-    [UIColor(rgb: 0xff516a).cgColor, UIColor(rgb: 0xff885e).cgColor],
-    [UIColor(rgb: 0xffa85c).cgColor, UIColor(rgb: 0xffcd6a).cgColor],
-    [UIColor(rgb: 0x665fff).cgColor, UIColor(rgb: 0x82b1ff).cgColor],
-    [UIColor(rgb: 0x54cb68).cgColor, UIColor(rgb: 0xa0de7e).cgColor],
-    [UIColor(rgb: 0x4acccd).cgColor, UIColor(rgb: 0x00fcfd).cgColor],
-    [UIColor(rgb: 0x2a9ef1).cgColor, UIColor(rgb: 0x72d5fd).cgColor],
-    [UIColor(rgb: 0xd669ed).cgColor, UIColor(rgb: 0xe0a2f3).cgColor],
-]
-
-private func avatarRoundImage(size: CGSize, source: UIImage) -> UIImage? {
-    UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
-    let context = UIGraphicsGetCurrentContext()
-    
-    context?.beginPath()
-    context?.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height))
-    context?.clip()
-    
-    source.draw(in: CGRect(origin: CGPoint(), size: size))
-    
-    let image = UIGraphicsGetImageFromCurrentImageContext()
-    UIGraphicsEndImageContext()
-    return image
-}
-
-private let deviceColorSpace: CGColorSpace = {
-    if #available(iOSApplicationExtension 9.3, *) {
-        if let colorSpace = CGColorSpace(name: CGColorSpace.displayP3) {
-            return colorSpace
-        } else {
-            return CGColorSpaceCreateDeviceRGB()
-        }
-    } else {
-        return CGColorSpaceCreateDeviceRGB()
-    }
-}()
-
-private func avatarViewLettersImage(size: CGSize, peerId: Int64, accountPeerId: Int64, letters: [String]) -> UIImage? {
-    UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
-    let context = UIGraphicsGetCurrentContext()
-    
-    context?.beginPath()
-    context?.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height))
-    context?.clip()
-    
-    let colorIndex = abs(Int(accountPeerId + peerId))
-    
-    let colorsArray = gradientColors[colorIndex % gradientColors.count]
-    var locations: [CGFloat] = [1.0, 0.0]
-    let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
-    
-    context?.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
-    
-    context?.setBlendMode(.normal)
-    
-    let string = letters.count == 0 ? "" : (letters[0] + (letters.count == 1 ? "" : letters[1]))
-    let attributedString = NSAttributedString(string: string, attributes: [NSAttributedString.Key.font: UIFont.systemFont(ofSize: 20.0), NSAttributedString.Key.foregroundColor: UIColor.white])
-    
-    let line = CTLineCreateWithAttributedString(attributedString)
-    let lineBounds = CTLineGetBoundsWithOptions(line, .useGlyphPathBounds)
-    
-    let lineOffset = CGPoint(x: string == "B" ? 1.0 : 0.0, y: 0.0)
-    let lineOrigin = CGPoint(x: floorToScreenPixels(-lineBounds.origin.x + (size.width - lineBounds.size.width) / 2.0) + lineOffset.x, y: floorToScreenPixels(-lineBounds.origin.y + (size.height - lineBounds.size.height) / 2.0))
-    
-    context?.translateBy(x: size.width / 2.0, y: size.height / 2.0)
-    context?.scaleBy(x: 1.0, y: -1.0)
-    context?.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
-    
-    context?.translateBy(x: lineOrigin.x, y: lineOrigin.y)
-    if let context = context {
-        CTLineDraw(line, context)
-    }
-    context?.translateBy(x: -lineOrigin.x, y: -lineOrigin.y)
-    
-    let image = UIGraphicsGetImageFromCurrentImageContext()
-    UIGraphicsEndImageContext()
-    return image
-}
-
-private let avatarSize = CGSize(width: 50.0, height: 50.0)
-
-private final class AvatarView: UIImageView {
-    init(accountPeerId: Int64, peer: WidgetDataPeer, size: CGSize) {
-        super.init(frame: CGRect())
-        
-        if let path = peer.avatarPath, let image = UIImage(contentsOfFile: path), let roundImage = avatarRoundImage(size: size, source: image) {
-            self.image = roundImage
-        } else {
-            self.image = avatarViewLettersImage(size: size, peerId: peer.id, accountPeerId: accountPeerId, letters: peer.letters)
-        }
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-}
-
-final class PeerView: UIView {
-    let peer: WidgetDataPeer
-    private let avatarView: AvatarView
-    private let titleLabel: UILabel
-    
-    private let tapped: () -> Void
-    
-    init(primaryColor: UIColor, accountPeerId: Int64, peer: WidgetDataPeer, tapped: @escaping () -> Void) {
-        self.peer = peer
-        self.tapped = tapped
-        self.avatarView = AvatarView(accountPeerId: accountPeerId, peer: peer, size: avatarSize)
-        
-        self.titleLabel = UILabel()
-        var title = peer.name
-        if let lastName = peer.lastName, !lastName.isEmpty {
-            title.append("\n")
-            title.append(lastName)
-        }
-        
-        let systemFontSize = UIFont.preferredFont(forTextStyle: .body).pointSize
-        let fontSize = floor(systemFontSize * 11.0 / 17.0)
-        
-        self.titleLabel.text = title
-        if #available(iOSApplicationExtension 13.0, *) {
-            self.titleLabel.textColor = UIColor.label
-        } else {
-            self.titleLabel.textColor = primaryColor
-        }
-        self.titleLabel.font = UIFont.systemFont(ofSize: fontSize)
-        self.titleLabel.lineBreakMode = .byTruncatingTail
-        self.titleLabel.numberOfLines = 2
-        self.titleLabel.textAlignment = .center
-        
-        super.init(frame: CGRect())
-        
-        self.addSubview(self.avatarView)
-        self.addSubview(self.titleLabel)
-        
-        self.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    func updateLayout(size: CGSize) {
-        self.avatarView.frame = CGRect(origin: CGPoint(x: floor((size.width - avatarSize.width) / 2.0), y: 0.0), size: avatarSize)
-        
-        var titleSize = self.titleLabel.sizeThatFits(size)
-        titleSize.width = min(size.width - 6.0, ceil(titleSize.width))
-        titleSize.height = ceil(titleSize.height)
-        self.titleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: avatarSize.height + 5.0), size: titleSize)
-    }
-    
-    @objc func tapGesture(_ recognizer: UITapGestureRecognizer) {
-        if case .ended = recognizer.state {
-            self.tapped()
-        }
-    }
-}
diff --git a/Telegram/Widget/TodayViewController.swift b/Telegram/Widget/TodayViewController.swift
deleted file mode 100644
index 454691e89d..0000000000
--- a/Telegram/Widget/TodayViewController.swift
+++ /dev/null
@@ -1,171 +0,0 @@
-import UIKit
-import NotificationCenter
-import BuildConfig
-import WidgetItems
-import AppLockState
-
-private func rootPathForBasePath(_ appGroupPath: String) -> String {
-    return appGroupPath + "/telegram-data"
-}
-
-@objc(TodayViewController)
-class TodayViewController: UIViewController, NCWidgetProviding {
-    private var initializedInterface = false
-    
-    private var buildConfig: BuildConfig?
-    
-    private var primaryColor: UIColor = .black
-    private var placeholderLabel: UILabel?
-    
-    override func viewDidLoad() {
-        super.viewDidLoad()
-        
-        let appBundleIdentifier = Bundle.main.bundleIdentifier!
-        guard let lastDotRange = appBundleIdentifier.range(of: ".", options: [.backwards]) else {
-            return
-        }
-        let baseAppBundleId = String(appBundleIdentifier[..<lastDotRange.lowerBound])
-        
-        let buildConfig = BuildConfig(baseAppBundleId: baseAppBundleId)
-        self.buildConfig = buildConfig
-        
-        let appGroupName = "group.\(baseAppBundleId)"
-        let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName)
-        
-        guard let appGroupUrl = maybeAppGroupUrl else {
-            return
-        }
-        
-        let rootPath = rootPathForBasePath(appGroupUrl.path)
-        
-        let presentationData: WidgetPresentationData
-        if let data = try? Data(contentsOf: URL(fileURLWithPath: widgetPresentationDataPath(rootPath: rootPath))), let value = try? JSONDecoder().decode(WidgetPresentationData.self, from: data) {
-            presentationData = value
-        } else {
-            presentationData = WidgetPresentationData(applicationLockedString: "Unlock the app to use the widget", applicationStartRequiredString: "Open the app to use the widget", widgetGalleryTitle: "", widgetGalleryDescription: "")
-        }
-        
-        if let data = try? Data(contentsOf: URL(fileURLWithPath: appLockStatePath(rootPath: rootPath))), let state = try? JSONDecoder().decode(LockState.self, from: data), isAppLocked(state: state) {
-            self.setPlaceholderText(presentationData.applicationLockedString)
-            return
-        }
-        
-        if self.initializedInterface {
-            return
-        }
-        self.initializedInterface = true
-        
-        let dataPath = rootPath + "/widget-data"
-        
-        if let data = try? Data(contentsOf: URL(fileURLWithPath: dataPath)), let widgetData = try? JSONDecoder().decode(WidgetData.self, from: data) {
-            self.setWidgetData(widgetData: widgetData, presentationData: presentationData)
-        }
-    }
-    
-    private func setPlaceholderText(_ text: String) {
-        let fontSize = UIFont.preferredFont(forTextStyle: .body).pointSize
-        let placeholderLabel = UILabel()
-        if #available(iOSApplicationExtension 13.0, *) {
-            placeholderLabel.textColor = UIColor.label
-        } else {
-            placeholderLabel.textColor = self.primaryColor
-        }
-        placeholderLabel.font = UIFont.systemFont(ofSize: fontSize)
-        placeholderLabel.text = text
-        placeholderLabel.sizeToFit()
-        self.placeholderLabel = placeholderLabel
-        self.view.addSubview(placeholderLabel)
-    }
-    
-    func widgetPerformUpdate(completionHandler: (@escaping (NCUpdateResult) -> Void)) {
-        completionHandler(.newData)
-    }
-    
-    @available(iOSApplicationExtension 10.0, *)
-    func widgetActiveDisplayModeDidChange(_ activeDisplayMode: NCWidgetDisplayMode, withMaximumSize maxSize: CGSize) {
-        
-    }
-    
-    private var widgetData: WidgetData?
-    
-    private func setWidgetData(widgetData: WidgetData, presentationData: WidgetPresentationData) {
-        self.widgetData = widgetData
-        self.peerViews.forEach {
-            $0.removeFromSuperview()
-        }
-        self.peerViews = []
-        switch widgetData {
-        case .notAuthorized, .disabled:
-            break
-        case let .peers(peers):
-            for peer in peers.peers {
-                let peerView = PeerView(primaryColor: self.primaryColor, accountPeerId: peers.accountPeerId, peer: peer, tapped: { [weak self] in
-                    if let strongSelf = self, let buildConfig = strongSelf.buildConfig {
-                        if let url = URL(string: "\(buildConfig.appSpecificUrlScheme)://localpeer?id=\(peer.id)") {
-                            strongSelf.extensionContext?.open(url, completionHandler: nil)
-                        }
-                    }
-                })
-                self.view.addSubview(peerView)
-                self.peerViews.append(peerView)
-            }
-        }
-        
-        if self.peerViews.isEmpty {
-            self.setPlaceholderText(presentationData.applicationStartRequiredString)
-        } else {
-            self.placeholderLabel?.removeFromSuperview()
-            self.placeholderLabel = nil
-        }
-        
-        if let size = self.validLayout {
-            self.updateLayout(size: size)
-        }
-    }
-    
-    private var validLayout: CGSize?
-    
-    private var peerViews: [PeerView] = []
-    
-    override func viewDidLayoutSubviews() {
-        super.viewDidLayoutSubviews()
-        
-        self.updateLayout(size: self.view.bounds.size)
-    }
-    
-    private func updateLayout(size: CGSize) {
-        self.validLayout = size
-        
-        if let placeholderLabel = self.placeholderLabel {
-            placeholderLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - placeholderLabel.bounds.width) / 2.0), y: floor((size.height - placeholderLabel.bounds.height) / 2.0)), size: placeholderLabel.bounds.size)
-        }
-        
-        let peerSize = CGSize(width: 70.0, height: 100.0)
-        
-        var peerFrames: [CGRect] = []
-        
-        var offset: CGFloat = 0.0
-        for _ in self.peerViews {
-            let peerFrame = CGRect(origin: CGPoint(x: offset, y: 10.0), size: peerSize)
-            offset += peerFrame.size.width
-            if peerFrame.maxX > size.width {
-                break
-            }
-            peerFrames.append(peerFrame)
-        }
-        
-        var totalSize: CGFloat = 0.0
-        for i in 0 ..< peerFrames.count {
-            totalSize += peerFrames[i].width
-        }
-        
-        let spacing: CGFloat = floor((size.width - totalSize) /   CGFloat(peerFrames.count))
-        offset = floor(spacing / 2.0)
-        for i in 0 ..< peerFrames.count {
-            let peerView = self.peerViews[i]
-            peerView.frame = CGRect(origin: CGPoint(x: offset, y: 16.0), size: peerFrames[i].size)
-            peerView.updateLayout(size: peerFrames[i].size)
-            offset += peerFrames[i].width + spacing
-        }
-    }
-}
diff --git a/Telegram/Widget/Widget-Bridging-Header.h b/Telegram/Widget/Widget-Bridging-Header.h
deleted file mode 100644
index 16747def3f..0000000000
--- a/Telegram/Widget/Widget-Bridging-Header.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef Widget_Bridging_Header_h
-#define Widget_Bridging_Header_h
-
-#endif
diff --git a/Telegram/Widget/ar.lproj/InfoPlist.strings b/Telegram/Widget/ar.lproj/InfoPlist.strings
deleted file mode 100644
index 07394dd6c9..0000000000
--- a/Telegram/Widget/ar.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "الأشخاص";
diff --git a/Telegram/Widget/de.lproj/InfoPlist.strings b/Telegram/Widget/de.lproj/InfoPlist.strings
deleted file mode 100644
index 1ad24433c2..0000000000
--- a/Telegram/Widget/de.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Leute";
diff --git a/Telegram/Widget/en.lproj/InfoPlist.strings b/Telegram/Widget/en.lproj/InfoPlist.strings
deleted file mode 100644
index b1ddd1ac39..0000000000
--- a/Telegram/Widget/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "People";
diff --git a/Telegram/Widget/en.lproj/Localizable.strings b/Telegram/Widget/en.lproj/Localizable.strings
deleted file mode 100644
index c90696d0fb..0000000000
--- a/Telegram/Widget/en.lproj/Localizable.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-"Widget.NoUsers" = "No users here yet...";
-"Widget.AuthRequired" = "Open Telegram and log in.";
diff --git a/Telegram/Widget/es.lproj/InfoPlist.strings b/Telegram/Widget/es.lproj/InfoPlist.strings
deleted file mode 100644
index 3d5094963a..0000000000
--- a/Telegram/Widget/es.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Personas";
diff --git a/Telegram/Widget/it.lproj/InfoPlist.strings b/Telegram/Widget/it.lproj/InfoPlist.strings
deleted file mode 100644
index f118d25a4d..0000000000
--- a/Telegram/Widget/it.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Persone";
diff --git a/Telegram/Widget/ko.lproj/InfoPlist.strings b/Telegram/Widget/ko.lproj/InfoPlist.strings
deleted file mode 100644
index e1bc831c53..0000000000
--- a/Telegram/Widget/ko.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "사람";
diff --git a/Telegram/Widget/nl.lproj/InfoPlist.strings b/Telegram/Widget/nl.lproj/InfoPlist.strings
deleted file mode 100644
index a23cbfc4a2..0000000000
--- a/Telegram/Widget/nl.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Mensen";
diff --git a/Telegram/Widget/pt.lproj/InfoPlist.strings b/Telegram/Widget/pt.lproj/InfoPlist.strings
deleted file mode 100644
index a6c032d0ed..0000000000
--- a/Telegram/Widget/pt.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Pessoas";
diff --git a/Telegram/Widget/ru.lproj/InfoPlist.strings b/Telegram/Widget/ru.lproj/InfoPlist.strings
deleted file mode 100644
index 689e714f47..0000000000
--- a/Telegram/Widget/ru.lproj/InfoPlist.strings
+++ /dev/null
@@ -1 +0,0 @@
-"CFBundleDisplayName" = "Люди";
diff --git a/Telegram/WidgetKitWidget/TodayViewController.swift b/Telegram/WidgetKitWidget/TodayViewController.swift
index efa8b4798f..943953cce4 100644
--- a/Telegram/WidgetKitWidget/TodayViewController.swift
+++ b/Telegram/WidgetKitWidget/TodayViewController.swift
@@ -92,7 +92,7 @@ private func getCommonTimeline(friends: [Friend]?, in context: TimelineProviderC
     
     let rootPath = rootPathForBasePath(appGroupUrl.path)
     
-    TempBox.initializeShared(basePath: rootPath, processType: "widget", launchSpecificId: arc4random64())
+    TempBox.initializeShared(basePath: rootPath, processType: "widget", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
     
     let logsPath = rootPath + "/widget-logs"
     let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
@@ -130,7 +130,7 @@ private func getCommonTimeline(friends: [Friend]?, in context: TimelineProviderC
     
     var friendsByAccount: [Signal<[ParsedPeer], NoError>] = []
     for (accountId, items) in itemsByAccount {
-        friendsByAccount.append(accountTransaction(rootPath: rootPath, id: AccountRecordId(rawValue: accountId), encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: true, transaction: { postbox, transaction -> [ParsedPeer] in
+        friendsByAccount.append(accountTransaction(rootPath: rootPath, id: AccountRecordId(rawValue: accountId), encryptionParameters: encryptionParameters, isReadOnly: true, useCopy: false, transaction: { postbox, transaction -> [ParsedPeer] in
             guard let state = transaction.getState() as? AuthorizedAccountState else {
                 return []
             }
diff --git a/WORKSPACE b/WORKSPACE
index a270359be7..a41ed5cce6 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -56,3 +56,10 @@ http_file(
     urls = ["https://github.com/Kitware/CMake/releases/download/v3.19.2/cmake-3.19.2-macos-universal.tar.gz"],
     sha256 = "50afa2cb66bea6a0314ef28034f3ff1647325e30cf5940f97906a56fd9640bd8",
 )
+
+http_archive(
+    name = "appcenter_sdk",
+    urls = ["https://github.com/microsoft/appcenter-sdk-apple/releases/download/4.1.1/AppCenter-SDK-Apple-4.1.1.zip"],
+    sha256 = "032907801dc7784744a1ca8fd40d3eecc34a2e27a93a4b3993f617cca204a9f3",
+    build_file = "@//third-party/AppCenter:AppCenter.BUILD",
+)
diff --git a/build-system/Make/Make.py b/build-system/Make/Make.py
index 20ad3024c3..1ab6a9176e 100644
--- a/build-system/Make/Make.py
+++ b/build-system/Make/Make.py
@@ -106,6 +106,15 @@ class BazelCommandLine:
     def set_build_number(self, build_number):
         self.build_number = build_number
 
+    def set_custom_target(self, target_name):
+        self.custom_target = target_name
+
+    def set_continue_on_error(self, continue_on_error):
+        self.continue_on_error = continue_on_error
+
+    def set_enable_sandbox(self, enable_sandbox):
+        self.enable_sandbox = enable_sandbox
+
     def set_split_swiftmodules(self, value):
         self.split_submodules = value
 
@@ -260,10 +269,18 @@ class BazelCommandLine:
             self.build_environment.bazel_path
         ]
         combined_arguments += self.get_startup_bazel_arguments()
-        combined_arguments += [
-            'build',
-            'Telegram/Telegram'
-        ]
+        combined_arguments += ['build']
+
+        if self.custom_target is not None:
+            combined_arguments += [self.custom_target]
+        else:
+            combined_arguments += ['Telegram/Telegram']
+
+        if self.continue_on_error:
+            combined_arguments += ['--keep_going']
+
+        if self.enable_sandbox:
+            combined_arguments += ['--spawn_strategy=sandboxed']
 
         if self.configuration_path is None:
             raise Exception('configuration_path is not defined')
@@ -353,10 +370,15 @@ def generate_project(arguments):
     bazel_command_line.set_build_number(arguments.buildNumber)
 
     disable_extensions = False
+    disable_provisioning_profiles = False
+    generate_dsym = False
+
     if arguments.disableExtensions is not None:
         disable_extensions = arguments.disableExtensions
     if arguments.disableProvisioningProfiles is not None:
         disable_provisioning_profiles = arguments.disableProvisioningProfiles
+    if arguments.generateDsym is not None:
+        generate_dsym = arguments.generateDsym
     
     call_executable(['killall', 'Xcode'], check_result=False)
 
@@ -364,6 +386,7 @@ def generate_project(arguments):
         build_environment=bazel_command_line.build_environment,
         disable_extensions=disable_extensions,
         disable_provisioning_profiles=disable_provisioning_profiles,
+        generate_dsym=generate_dsym,
         configuration_path=bazel_command_line.configuration_path,
         bazel_app_arguments=bazel_command_line.get_project_generation_arguments()
     )
@@ -386,6 +409,9 @@ def build(arguments):
 
     bazel_command_line.set_configuration(arguments.configuration)
     bazel_command_line.set_build_number(arguments.buildNumber)
+    bazel_command_line.set_custom_target(arguments.target)
+    bazel_command_line.set_continue_on_error(arguments.continueOnError)
+    bazel_command_line.set_enable_sandbox(arguments.sandbox)
 
     bazel_command_line.set_split_swiftmodules(not arguments.disableParallelSwiftmoduleGeneration)
 
@@ -512,6 +538,15 @@ if __name__ == '__main__':
             '''
     )
 
+    generateProjectParser.add_argument(
+        '--generateDsym',
+        action='store_true',
+        default=False,
+        help='''
+            This improves profiling experinence by generating DSYM files. Keep disabled for better build performance.
+            '''
+    )
+
     buildParser = subparsers.add_parser('build', help='Build the app')
     buildParser.add_argument(
         '--buildNumber',
@@ -540,6 +575,24 @@ if __name__ == '__main__':
         default=False,
         help='Generate .swiftmodule files in parallel to building modules, can speed up compilation on multi-core systems.'
     )
+    buildParser.add_argument(
+        '--target',
+        type=str,
+        help='A custom bazel target name to build.',
+        metavar='target_name'
+    )
+    buildParser.add_argument(
+        '--continueOnError',
+        action='store_true',
+        default=False,
+        help='Continue build process after an error.',
+    )
+    buildParser.add_argument(
+        '--sandbox',
+        action='store_true',
+        default=False,
+        help='Enable sandbox.',
+    )
 
     if len(sys.argv) < 2:
         parser.print_help()
diff --git a/build-system/Make/ProjectGeneration.py b/build-system/Make/ProjectGeneration.py
index 44629edbfb..8c8fab3ba8 100644
--- a/build-system/Make/ProjectGeneration.py
+++ b/build-system/Make/ProjectGeneration.py
@@ -10,7 +10,7 @@ def remove_directory(path):
         shutil.rmtree(path)
 
 
-def generate(build_environment: BuildEnvironment, disable_extensions, disable_provisioning_profiles, configuration_path, bazel_app_arguments):
+def generate(build_environment: BuildEnvironment, disable_extensions, disable_provisioning_profiles, generate_dsym, configuration_path, bazel_app_arguments):
     project_path = os.path.join(build_environment.base_path, 'build-input/gen/project')
     app_target = 'Telegram'
 
@@ -81,6 +81,8 @@ def generate(build_environment: BuildEnvironment, disable_extensions, disable_pr
         bazel_build_arguments += ['--//Telegram:disableExtensions']
     if disable_provisioning_profiles:
         bazel_build_arguments += ['--//Telegram:disableProvisioningProfiles']
+    if generate_dsym:
+        bazel_build_arguments += ['--apple_generate_dsym']
 
     call_executable([
         tulsi_path,
diff --git a/build-system/example-configuration/provisioning/BUILD b/build-system/example-configuration/provisioning/BUILD
index 9abb88a19d..8da09832d1 100644
--- a/build-system/example-configuration/provisioning/BUILD
+++ b/build-system/example-configuration/provisioning/BUILD
@@ -8,4 +8,5 @@ exports_files([
 	"WatchApp.mobileprovision",
 	"WatchExtension.mobileprovision",
 	"Widget.mobileprovision",
+	"BroadcastUpload.mobileprovision",
 ])
diff --git a/build-system/example-configuration/provisioning/BroadcastUpload.mobileprovision b/build-system/example-configuration/provisioning/BroadcastUpload.mobileprovision
new file mode 100644
index 0000000000..1d29a80307
Binary files /dev/null and b/build-system/example-configuration/provisioning/BroadcastUpload.mobileprovision differ
diff --git a/build-system/fake-codesigning/profiles/appstore/AppStore_ph.telegra.Telegraph.BroadcastUpload.mobileprovision b/build-system/fake-codesigning/profiles/appstore/AppStore_ph.telegra.Telegraph.BroadcastUpload.mobileprovision
new file mode 100644
index 0000000000..1d29a80307
Binary files /dev/null and b/build-system/fake-codesigning/profiles/appstore/AppStore_ph.telegra.Telegraph.BroadcastUpload.mobileprovision differ
diff --git a/build_number_offset b/build_number_offset
new file mode 100644
index 0000000000..0c80f59274
--- /dev/null
+++ b/build_number_offset
@@ -0,0 +1 @@
+2300
diff --git a/buildbox/build-telegram.sh b/buildbox/build-telegram.sh
index 70b300f4ae..f2bc29956c 100644
--- a/buildbox/build-telegram.sh
+++ b/buildbox/build-telegram.sh
@@ -79,7 +79,8 @@ COMMIT_ID="$(git rev-parse HEAD)"
 COMMIT_AUTHOR=$(git log -1 --pretty=format:'%an')
 if [ -z "$2" ]; then
 	COMMIT_COUNT=$(git rev-list --count HEAD)
-	COMMIT_COUNT="$(($COMMIT_COUNT+2000))"
+	BUILD_NUMBER_OFFSET="$(cat build_number_offset)"
+	COMMIT_COUNT="$(($COMMIT_COUNT+$BUILD_NUMBER_OFFSET))"
 	BUILD_NUMBER="$COMMIT_COUNT"
 else
 	BUILD_NUMBER="$2"
diff --git a/buildbox/deploy-appcenter.sh b/buildbox/deploy-appcenter.sh
index 7519ef5b18..141a43bf48 100644
--- a/buildbox/deploy-appcenter.sh
+++ b/buildbox/deploy-appcenter.sh
@@ -3,84 +3,11 @@
 set -e
 set -x
 
-API_HOST="https://api.appcenter.ms"
 IPA_PATH="build/artifacts/Telegram.ipa"
 DSYM_PATH="build/artifacts/Telegram.DSYMs.zip"
 
-upload_ipa() {
-    GROUP_DATA=$(curl \
-	    -X GET \
-	    --header "X-API-Token: $API_TOKEN" \
-	    "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/distribution_groups/Internal" \
-    )
-
-    GROUP_ID=$(echo "$GROUP_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["id"];')
-
-    UPLOAD_TOKEN=$(curl \
-        -X POST \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "X-API-Token: $API_TOKEN" \
-        "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/release_uploads" \
-      )
-
-
-    UPLOAD_URL=$(echo "$UPLOAD_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_url"];') 
-    UPLOAD_ID=$(echo "$UPLOAD_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_id"];')
-
-    curl --progress-bar -F "ipa=@${IPA_PATH}" "$UPLOAD_URL"
-
-    RELEASE_TOKEN=$(curl \
-        -X PATCH \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "X-API-Token: $API_TOKEN" \
-        -d '{ "status": "committed" }' \
-        "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/release_uploads/$UPLOAD_ID" \
-    )
-
-
-    RELEASE_URL=$(echo "$RELEASE_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["release_url"];')
-    RELEASE_ID=$(echo "$RELEASE_TOKEN" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["release_id"];')
-
-    curl \
-        -X POST \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "X-API-Token: $API_TOKEN" \
-        -d "{ \"id\": \"$GROUP_ID\", \"mandatory_update\": false, \"notify_testers\": false }" \
-        "$API_HOST/$RELEASE_URL/groups"
-}
-
-upload_dsym() {
-    UPLOAD_DSYM_DATA=$(curl \
-        -X POST \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "X-API-Token: $API_TOKEN" \
-        -d "{ \"symbol_type\": \"Apple\"}" \
-        "$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/symbol_uploads" \
-    )
-
-    DSYM_UPLOAD_URL=$(echo "$UPLOAD_DSYM_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["upload_url"];')
-    DSYM_UPLOAD_ID=$(echo "$UPLOAD_DSYM_DATA" | python -c 'import json,sys; obj=json.load(sys.stdin); print obj["symbol_upload_id"];')
-
-    curl \
-        --progress-bar \
-        --header "x-ms-blob-type: BlockBlob" \
-        --upload-file "${DSYM_PATH}" \
-        "$DSYM_UPLOAD_URL"
-
-    curl \
-        -X PATCH \
-        --header "Content-Type: application/json" \
-        --header "Accept: application/json" \
-        --header "X-API-Token: $API_TOKEN" \
-        -d '{ "status": "committed" }' \
-    	"$API_HOST/v0.1/apps/$API_USER_NAME/$API_APP_NAME/symbol_uploads/$DSYM_UPLOAD_ID"
-}
-
 APPCENTER="/usr/local/bin/appcenter"
 
 $APPCENTER login --token "$API_TOKEN"
 $APPCENTER distribute release --app "$API_USER_NAME/$API_APP_NAME" -f "$IPA_PATH" -g Internal
+$APPCENTER crashes upload-symbols --app "$API_USER_NAME/$API_APP_NAME" --symbol "$DSYM_PATH"
diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift
index ec99a82e9a..abbaafa7c3 100644
--- a/submodules/AccountContext/Sources/AccountContext.swift
+++ b/submodules/AccountContext/Sources/AccountContext.swift
@@ -30,6 +30,7 @@ public enum AccessType {
 
 public final class TelegramApplicationBindings {
     public let isMainApp: Bool
+    public let appBundleId: String
     public let containerPath: String
     public let appSpecificScheme: String
     public let openUrl: (String) -> Void
@@ -52,9 +53,11 @@ public final class TelegramApplicationBindings {
     public let getAvailableAlternateIcons: () -> [PresentationAppIcon]
     public let getAlternateIconName: () -> String?
     public let requestSetAlternateIconName: (String?, @escaping (Bool) -> Void) -> Void
+    public let forceOrientation: (UIInterfaceOrientation) -> Void
     
-    public init(isMainApp: Bool, containerPath: String, appSpecificScheme: String, openUrl: @escaping (String) -> Void, openUniversalUrl: @escaping (String, TelegramApplicationOpenUrlCompletion) -> Void, canOpenUrl: @escaping (String) -> Bool, getTopWindow: @escaping () -> UIWindow?, displayNotification: @escaping (String) -> Void, applicationInForeground: Signal<Bool, NoError>, applicationIsActive: Signal<Bool, NoError>, clearMessageNotifications: @escaping ([MessageId]) -> Void, pushIdleTimerExtension: @escaping () -> Disposable, openSettings: @escaping () -> Void, openAppStorePage: @escaping () -> Void, registerForNotifications: @escaping (@escaping (Bool) -> Void) -> Void, requestSiriAuthorization: @escaping (@escaping (Bool) -> Void) -> Void, siriAuthorization: @escaping () -> AccessType, getWindowHost: @escaping () -> WindowHost?, presentNativeController: @escaping (UIViewController) -> Void, dismissNativeController: @escaping () -> Void, getAvailableAlternateIcons: @escaping () -> [PresentationAppIcon], getAlternateIconName: @escaping () -> String?, requestSetAlternateIconName: @escaping (String?, @escaping (Bool) -> Void) -> Void) {
+    public init(isMainApp: Bool, appBundleId: String, containerPath: String, appSpecificScheme: String, openUrl: @escaping (String) -> Void, openUniversalUrl: @escaping (String, TelegramApplicationOpenUrlCompletion) -> Void, canOpenUrl: @escaping (String) -> Bool, getTopWindow: @escaping () -> UIWindow?, displayNotification: @escaping (String) -> Void, applicationInForeground: Signal<Bool, NoError>, applicationIsActive: Signal<Bool, NoError>, clearMessageNotifications: @escaping ([MessageId]) -> Void, pushIdleTimerExtension: @escaping () -> Disposable, openSettings: @escaping () -> Void, openAppStorePage: @escaping () -> Void, registerForNotifications: @escaping (@escaping (Bool) -> Void) -> Void, requestSiriAuthorization: @escaping (@escaping (Bool) -> Void) -> Void, siriAuthorization: @escaping () -> AccessType, getWindowHost: @escaping () -> WindowHost?, presentNativeController: @escaping (UIViewController) -> Void, dismissNativeController: @escaping () -> Void, getAvailableAlternateIcons: @escaping () -> [PresentationAppIcon], getAlternateIconName: @escaping () -> String?, requestSetAlternateIconName: @escaping (String?, @escaping (Bool) -> Void) -> Void, forceOrientation: @escaping (UIInterfaceOrientation) -> Void) {
         self.isMainApp = isMainApp
+        self.appBundleId = appBundleId
         self.containerPath = containerPath
         self.appSpecificScheme = appSpecificScheme
         self.openUrl = openUrl
@@ -77,6 +80,7 @@ public final class TelegramApplicationBindings {
         self.getAvailableAlternateIcons = getAvailableAlternateIcons
         self.getAlternateIconName = getAlternateIconName
         self.requestSetAlternateIconName = requestSetAlternateIconName
+        self.forceOrientation = forceOrientation
     }
 }
 
@@ -150,9 +154,9 @@ public struct ChatAvailableMessageActions {
 }
 
 public enum WallpaperUrlParameter {
-    case slug(String, WallpaperPresentationOptions, UIColor?, UIColor?, Int32?, Int32?)
+    case slug(String, WallpaperPresentationOptions, [UInt32], Int32?, Int32?)
     case color(UIColor)
-    case gradient(UIColor, UIColor, Int32?)
+    case gradient([UInt32], Int32?)
 }
 
 public enum ResolvedUrlSettingsSection {
@@ -167,7 +171,7 @@ public enum ResolvedUrl {
     case inaccessiblePeer
     case botStart(peerId: PeerId, payload: String)
     case groupBotStart(peerId: PeerId, payload: String)
-    case channelMessage(peerId: PeerId, messageId: MessageId)
+    case channelMessage(peerId: PeerId, messageId: MessageId, timecode: Double?)
     case replyThreadMessage(replyThreadMessage: ChatReplyThreadMessage, messageId: MessageId)
     case stickerPack(name: String)
     case instantView(TelegramMediaWebpage, String?)
@@ -184,6 +188,7 @@ public enum ResolvedUrl {
     #endif
     case settings(ResolvedUrlSettingsSection)
     case joinVoiceChat(PeerId, String?)
+    case importStickers
 }
 
 public enum NavigateToChatKeepStack {
@@ -216,17 +221,14 @@ public final class ChatPeerNearbyData: Equatable {
 
 public final class ChatGreetingData: Equatable {
     public static func == (lhs: ChatGreetingData, rhs: ChatGreetingData) -> Bool {
-        if let lhsSticker = lhs.sticker, let rhsSticker = rhs.sticker, !lhsSticker.isEqual(to: rhsSticker) {
-            return false
-        } else if (lhs.sticker == nil) != (rhs.sticker == nil) {
-            return false
-        }
-        return true
+        return lhs.uuid == rhs.uuid
     }
     
-    public let sticker: TelegramMediaFile?
+    public let uuid: UUID
+    public let sticker: Signal<TelegramMediaFile?, NoError>
     
-    public init(sticker: TelegramMediaFile?) {
+    public init(uuid: UUID, sticker: Signal<TelegramMediaFile?, NoError>) {
+        self.uuid = uuid
         self.sticker = sticker
     }
 }
@@ -282,14 +284,13 @@ public final class NavigateToChatControllerParams {
     public let activateMessageSearch: (ChatSearchDomain, String)?
     public let peekData: ChatPeekTimeout?
     public let peerNearbyData: ChatPeerNearbyData?
-    public let greetingData: ChatGreetingData?
     public let reportReason: ReportReason?
     public let animated: Bool
     public let options: NavigationAnimationOptions
     public let parentGroupId: PeerGroupId?
     public let completion: (ChatController) -> Void
     
-    public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: (ChatSearchDomain, String)? = nil, peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, greetingData: ChatGreetingData? = nil, reportReason: ReportReason? = nil, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping (ChatController) -> Void = { _ in }) {
+    public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: (ChatSearchDomain, String)? = nil, peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, reportReason: ReportReason? = nil, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping (ChatController) -> Void = { _ in }) {
         self.navigationController = navigationController
         self.chatController = chatController
         self.chatLocationContextHolder = chatLocationContextHolder
@@ -306,7 +307,6 @@ public final class NavigateToChatControllerParams {
         self.activateMessageSearch = activateMessageSearch
         self.peekData = peekData
         self.peerNearbyData = peerNearbyData
-        self.greetingData = greetingData
         self.reportReason = reportReason
         self.animated = animated
         self.options = options
@@ -471,15 +471,17 @@ public final class ContactSelectionControllerParams {
     public let options: [ContactListAdditionalOption]
     public let displayDeviceContacts: Bool
     public let displayCallIcons: Bool
+    public let multipleSelection: Bool
     public let confirmation: (ContactListPeer) -> Signal<Bool, NoError>
     
-    public init(context: AccountContext, autoDismiss: Bool = true, title: @escaping (PresentationStrings) -> String, options: [ContactListAdditionalOption] = [], displayDeviceContacts: Bool = false, displayCallIcons: Bool = false, confirmation: @escaping (ContactListPeer) -> Signal<Bool, NoError> = { _ in .single(true) }) {
+    public init(context: AccountContext, autoDismiss: Bool = true, title: @escaping (PresentationStrings) -> String, options: [ContactListAdditionalOption] = [], displayDeviceContacts: Bool = false, displayCallIcons: Bool = false, multipleSelection: Bool = false, confirmation: @escaping (ContactListPeer) -> Signal<Bool, NoError> = { _ in .single(true) }) {
         self.context = context
         self.autoDismiss = autoDismiss
         self.title = title
         self.options = options
         self.displayDeviceContacts = displayDeviceContacts
         self.displayCallIcons = displayCallIcons
+        self.multipleSelection = multipleSelection
         self.confirmation = confirmation
     }
 }
@@ -509,7 +511,7 @@ public enum ChatListSearchFilter: Equatable {
             case .voice:
                 return 5
             case let .peer(peerId, _, _, _):
-                return peerId.id
+                return peerId.id._internalGetInt32Value()
             case let .date(_, date, _):
                 return date
         }
@@ -544,6 +546,7 @@ public protocol RecentSessionsController: class {
 }
 
 public protocol SharedAccountContext: class {
+    var sharedContainerPath: String { get }
     var basePath: String { get }
     var mainWindow: Window1? { get }
     var accountManager: AccountManager { get }
@@ -588,7 +591,7 @@ public protocol SharedAccountContext: class {
     func makeComposeController(context: AccountContext) -> ViewController
     func makeChatListController(context: AccountContext, groupId: PeerGroupId, controlsHistoryPreload: Bool, hideNetworkActivityStatus: Bool, previewing: Bool, enableDebugActions: Bool) -> ChatListController
     func makeChatController(context: AccountContext, chatLocation: ChatLocation, subject: ChatControllerSubject?, botStart: ChatControllerInitialBotStart?, mode: ChatControllerPresentationMode) -> ChatController
-    func makeChatMessagePreviewItem(context: AccountContext, messages: [Message], theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?) -> ListViewItem
+    func makeChatMessagePreviewItem(context: AccountContext, messages: [Message], theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)?, clickThroughMessage: (() -> Void)?, backgroundNode: ASDisplayNode?) -> ListViewItem
     func makeChatMessageDateHeaderItem(context: AccountContext, timestamp: Int32, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder) -> ListViewItemHeader
     func makePeerSharedMediaController(context: AccountContext, peerId: PeerId) -> ViewController?
     func makeContactSelectionController(_ params: ContactSelectionControllerParams) -> ContactSelectionController
@@ -604,7 +607,7 @@ public protocol SharedAccountContext: class {
     func openExternalUrl(context: AccountContext, urlContext: OpenURLContext, url: String, forceExternal: Bool, presentationData: PresentationData, navigationController: NavigationController?, dismissInput: @escaping () -> Void)
     func chatAvailableMessageActions(postbox: Postbox, accountPeerId: PeerId, messageIds: Set<MessageId>) -> Signal<ChatAvailableMessageActions, NoError>
     func chatAvailableMessageActions(postbox: Postbox, accountPeerId: PeerId, messageIds: Set<MessageId>, messages: [MessageId: Message], peers: [PeerId: Peer]) -> Signal<ChatAvailableMessageActions, NoError>
-    func resolveUrl(account: Account, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError>
+    func resolveUrl(context: AccountContext, peerId: PeerId?, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError>
     func openResolvedUrl(_ resolvedUrl: ResolvedUrl, context: AccountContext, urlContext: OpenURLContext, navigationController: NavigationController?, openPeer: @escaping (PeerId, ChatControllerInteractionNavigateToPeer) -> Void, sendFile: ((FileMediaReference) -> Void)?, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?, requestMessageActionUrlAuth: ((MessageActionUrlSubject) -> Void)?, joinVoiceChat: ((PeerId, String?, CachedChannelData.ActiveCall) -> Void)?, present: @escaping (ViewController, Any?) -> Void, dismissInput: @escaping () -> Void, contentContext: Any?)
     func openAddContact(context: AccountContext, firstName: String, lastName: String, phoneNumber: String, label: String, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, completed: @escaping () -> Void)
     func openAddPersonContact(context: AccountContext, peerId: PeerId, pushController: @escaping (ViewController) -> Void, present: @escaping (ViewController, Any?) -> Void)
@@ -709,10 +712,12 @@ public protocol AccountGroupCallContextCache: class {
 public protocol AccountContext: class {
     var sharedContext: SharedAccountContext { get }
     var account: Account { get }
+    var engine: TelegramEngine { get }
     
     var liveLocationManager: LiveLocationManager? { get }
     var peersNearbyManager: PeersNearbyManager? { get }
     var fetchManager: FetchManager { get }
+    var prefetchManager: PrefetchManager? { get }
     var downloadedMediaStoreManager: DownloadedMediaStoreManager { get }
     var peerChannelMemberCategoriesContextsManager: PeerChannelMemberCategoriesContextsManager { get }
     var wallpaperUploadManager: WallpaperUploadManager? { get }
@@ -731,6 +736,7 @@ public protocol AccountContext: class {
     func chatLocationOutgoingReadState(for location: ChatLocation, contextHolder: Atomic<ChatLocationContextHolder?>) -> Signal<MessageId?, NoError>
     func applyMaxReadIndex(for location: ChatLocation, contextHolder: Atomic<ChatLocationContextHolder?>, messageIndex: MessageIndex)
     
+    func scheduleGroupCall(peerId: PeerId)
     func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: CachedChannelData.ActiveCall)
     func requestCall(peerId: PeerId, isVideo: Bool, completion: @escaping () -> Void)
 }
diff --git a/submodules/AccountContext/Sources/ChatController.swift b/submodules/AccountContext/Sources/ChatController.swift
index 1ddd5bbe7f..d0cf354fd6 100644
--- a/submodules/AccountContext/Sources/ChatController.swift
+++ b/submodules/AccountContext/Sources/ChatController.swift
@@ -24,8 +24,9 @@ public final class ChatMessageItemAssociatedData: Equatable {
     public let channelDiscussionGroup: ChannelDiscussionGroupStatus
     public let animatedEmojiStickers: [String: [StickerPackItem]]
     public let forcedResourceStatus: FileMediaResourceStatus?
+    public let currentlyPlayingMessageId: MessageIndex?
     
-    public init(automaticDownloadPeerType: MediaAutoDownloadPeerType, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, isRecentActions: Bool = false, subject: ChatControllerSubject? = nil, contactsPeerIds: Set<PeerId> = Set(), channelDiscussionGroup: ChannelDiscussionGroupStatus = .unknown, animatedEmojiStickers: [String: [StickerPackItem]] = [:], forcedResourceStatus: FileMediaResourceStatus? = nil) {
+    public init(automaticDownloadPeerType: MediaAutoDownloadPeerType, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, isRecentActions: Bool = false, subject: ChatControllerSubject? = nil, contactsPeerIds: Set<PeerId> = Set(), channelDiscussionGroup: ChannelDiscussionGroupStatus = .unknown, animatedEmojiStickers: [String: [StickerPackItem]] = [:], forcedResourceStatus: FileMediaResourceStatus? = nil, currentlyPlayingMessageId: MessageIndex? = nil) {
         self.automaticDownloadPeerType = automaticDownloadPeerType
         self.automaticDownloadNetworkType = automaticDownloadNetworkType
         self.isRecentActions = isRecentActions
@@ -34,6 +35,7 @@ public final class ChatMessageItemAssociatedData: Equatable {
         self.channelDiscussionGroup = channelDiscussionGroup
         self.animatedEmojiStickers = animatedEmojiStickers
         self.forcedResourceStatus = forcedResourceStatus
+        self.currentlyPlayingMessageId = currentlyPlayingMessageId
     }
     
     public static func == (lhs: ChatMessageItemAssociatedData, rhs: ChatMessageItemAssociatedData) -> Bool {
@@ -339,7 +341,7 @@ public struct ChatTextInputStateText: PostboxCoding, Equatable {
 }
 
 public enum ChatControllerSubject: Equatable {
-    case message(id: MessageId, highlight: Bool)
+    case message(id: MessageId, highlight: Bool, timecode: Double?)
     case scheduledMessages
     case pinnedMessages(id: MessageId?)
 }
diff --git a/submodules/AccountContext/Sources/ContactSelectionController.swift b/submodules/AccountContext/Sources/ContactSelectionController.swift
index b99e4c7252..1e5e694f28 100644
--- a/submodules/AccountContext/Sources/ContactSelectionController.swift
+++ b/submodules/AccountContext/Sources/ContactSelectionController.swift
@@ -3,7 +3,7 @@ import Display
 import SwiftSignalKit
 
 public protocol ContactSelectionController: ViewController {
-    var result: Signal<(ContactListPeer, ContactListAction)?, NoError> { get }
+    var result: Signal<([ContactListPeer], ContactListAction)?, NoError> { get }
     var displayProgress: Bool { get set }
     var dismissed: (() -> Void)? { get set }
     
diff --git a/submodules/AccountContext/Sources/DeviceContactData.swift b/submodules/AccountContext/Sources/DeviceContactData.swift
index 674b035809..3111c3bd5a 100644
--- a/submodules/AccountContext/Sources/DeviceContactData.swift
+++ b/submodules/AccountContext/Sources/DeviceContactData.swift
@@ -202,7 +202,7 @@ public func parseAppSpecificContactReference(_ value: String) -> PeerId? {
     }
     let idString = String(value[value.index(value.startIndex, offsetBy: phonebookUsernamePrefix.count)...])
     if let id = Int32(idString) {
-        return PeerId(namespace: Namespaces.Peer.CloudUser, id: id)
+        return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))
     }
     return nil
 }
diff --git a/submodules/AccountContext/Sources/FetchManager.swift b/submodules/AccountContext/Sources/FetchManager.swift
index c70576facd..ad4db3b593 100644
--- a/submodules/AccountContext/Sources/FetchManager.swift
+++ b/submodules/AccountContext/Sources/FetchManager.swift
@@ -158,3 +158,8 @@ public protocol FetchManager {
     func cancelInteractiveFetches(category: FetchManagerCategory, location: FetchManagerLocation, locationKey: FetchManagerLocationKey, resource: MediaResource)
     func fetchStatus(category: FetchManagerCategory, location: FetchManagerLocation, locationKey: FetchManagerLocationKey, resource: MediaResource) -> Signal<MediaResourceStatus, NoError>
 }
+
+public protocol PrefetchManager {
+    var preloadedGreetingSticker: ChatGreetingData { get }
+    func prepareNextGreetingSticker()
+}
diff --git a/submodules/AccountContext/Sources/FetchMediaUtils.swift b/submodules/AccountContext/Sources/FetchMediaUtils.swift
index 52b7487363..f3dc6c4eee 100644
--- a/submodules/AccountContext/Sources/FetchMediaUtils.swift
+++ b/submodules/AccountContext/Sources/FetchMediaUtils.swift
@@ -13,7 +13,7 @@ public func freeMediaFileInteractiveFetched(account: Account, fileReference: Fil
 public func freeMediaFileInteractiveFetched(fetchManager: FetchManager, fileReference: FileMediaReference, priority: FetchManagerPriority) -> Signal<Void, NoError> {
     let file = fileReference.media
     let mediaReference = AnyMediaReference.standalone(media: fileReference.media)
-    return fetchManager.interactivelyFetched(category: fetchCategoryForFile(file), location: .chat(PeerId(namespace: 0, id: 0)), locationKey: .free, mediaReference: mediaReference, resourceReference: mediaReference.resourceReference(file.resource), ranges: IndexSet(integersIn: 0 ..< Int(Int32.max) as Range<Int>), statsCategory: statsCategoryForFileWithAttributes(file.attributes), elevatedPriority: false, userInitiated: false, priority: priority, storeToDownloadsPeerType: nil)
+    return fetchManager.interactivelyFetched(category: fetchCategoryForFile(file), location: .chat(PeerId(0)), locationKey: .free, mediaReference: mediaReference, resourceReference: mediaReference.resourceReference(file.resource), ranges: IndexSet(integersIn: 0 ..< Int(Int32.max) as Range<Int>), statsCategory: statsCategoryForFileWithAttributes(file.attributes), elevatedPriority: false, userInitiated: false, priority: priority, storeToDownloadsPeerType: nil)
 }
 
 public func freeMediaFileResourceInteractiveFetched(account: Account, fileReference: FileMediaReference, resource: MediaResource) -> Signal<FetchResourceSourceType, FetchResourceError> {
diff --git a/submodules/AccountContext/Sources/MediaManager.swift b/submodules/AccountContext/Sources/MediaManager.swift
index b9c754ec2f..7f5ef063b0 100644
--- a/submodules/AccountContext/Sources/MediaManager.swift
+++ b/submodules/AccountContext/Sources/MediaManager.swift
@@ -119,11 +119,11 @@ public func peerMessageMediaPlayerType(_ message: Message) -> MediaManagerPlayer
     
 public func peerMessagesMediaPlaylistAndItemId(_ message: Message, isRecentActions: Bool, isGlobalSearch: Bool) -> (SharedMediaPlaylistId, SharedMediaPlaylistItemId)? {
     if isGlobalSearch {
-        return (PeerMessagesMediaPlaylistId.custom, PeerMessagesMediaPlaylistItemId(messageId: message.id))
+        return (PeerMessagesMediaPlaylistId.custom, PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))
     } else if isRecentActions {
-        return (PeerMessagesMediaPlaylistId.recentActions(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id))
+        return (PeerMessagesMediaPlaylistId.recentActions(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))
     } else {
-        return (PeerMessagesMediaPlaylistId.peer(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id))
+        return (PeerMessagesMediaPlaylistId.peer(message.id.peerId), PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index))
     }
 }
 
diff --git a/submodules/AccountContext/Sources/OpenChatMessage.swift b/submodules/AccountContext/Sources/OpenChatMessage.swift
index be3fcfd330..58b24cd349 100644
--- a/submodules/AccountContext/Sources/OpenChatMessage.swift
+++ b/submodules/AccountContext/Sources/OpenChatMessage.swift
@@ -41,6 +41,7 @@ public final class OpenChatMessageParams {
     public let actionInteraction: GalleryControllerActionInteraction?
     public let playlistLocation: PeerMessagesPlaylistLocation?
     public let gallerySource: GalleryControllerItemSource?
+    public let centralItemUpdated: ((MessageId) -> Void)?
     
     public init(
         context: AccountContext,
@@ -65,7 +66,8 @@ public final class OpenChatMessageParams {
         chatAvatarHiddenMedia: @escaping (Signal<MessageId?, NoError>, Media) -> Void,
         actionInteraction: GalleryControllerActionInteraction? = nil,
         playlistLocation: PeerMessagesPlaylistLocation? = nil,
-        gallerySource: GalleryControllerItemSource? = nil
+        gallerySource: GalleryControllerItemSource? = nil,
+        centralItemUpdated: ((MessageId) -> Void)? = nil
     ) {
         self.context = context
         self.chatLocation = chatLocation
@@ -90,5 +92,6 @@ public final class OpenChatMessageParams {
         self.actionInteraction = actionInteraction
         self.playlistLocation = playlistLocation
         self.gallerySource = gallerySource
+        self.centralItemUpdated = centralItemUpdated
     }
 }
diff --git a/submodules/AccountContext/Sources/PeerSelectionController.swift b/submodules/AccountContext/Sources/PeerSelectionController.swift
index 3c6686a600..90794e83dd 100644
--- a/submodules/AccountContext/Sources/PeerSelectionController.swift
+++ b/submodules/AccountContext/Sources/PeerSelectionController.swift
@@ -39,8 +39,9 @@ public final class PeerSelectionControllerParams {
     public let attemptSelection: ((Peer) -> Void)?
     public let createNewGroup: (() -> Void)?
     public let pretendPresentedInModal: Bool
+    public let multipleSelection: Bool
     
-    public init(context: AccountContext, filter: ChatListNodePeersFilter = [.onlyWriteable], hasChatListSelector: Bool = true, hasContactSelector: Bool = true, hasGlobalSearch: Bool = true, title: String? = nil, attemptSelection: ((Peer) -> Void)? = nil, createNewGroup: (() -> Void)? = nil, pretendPresentedInModal: Bool = false) {
+    public init(context: AccountContext, filter: ChatListNodePeersFilter = [.onlyWriteable], hasChatListSelector: Bool = true, hasContactSelector: Bool = true, hasGlobalSearch: Bool = true, title: String? = nil, attemptSelection: ((Peer) -> Void)? = nil, createNewGroup: (() -> Void)? = nil, pretendPresentedInModal: Bool = false, multipleSelection: Bool = false) {
         self.context = context
         self.filter = filter
         self.hasChatListSelector = hasChatListSelector
@@ -50,11 +51,13 @@ public final class PeerSelectionControllerParams {
         self.attemptSelection = attemptSelection
         self.createNewGroup = createNewGroup
         self.pretendPresentedInModal = pretendPresentedInModal
+        self.multipleSelection = multipleSelection
     }
 }
 
 public protocol PeerSelectionController: ViewController {
     var peerSelected: ((Peer) -> Void)? { get set }
+    var multiplePeersSelected: (([Peer], NSAttributedString) -> Void)? { get set }
     var inProgress: Bool { get set }
     var customDismiss: (() -> Void)? { get set }
 }
diff --git a/submodules/AccountContext/Sources/PresentationCallManager.swift b/submodules/AccountContext/Sources/PresentationCallManager.swift
index 44602ffedb..d954c7b175 100644
--- a/submodules/AccountContext/Sources/PresentationCallManager.swift
+++ b/submodules/AccountContext/Sources/PresentationCallManager.swift
@@ -17,6 +17,11 @@ public enum JoinGroupCallManagerResult {
     case alreadyInProgress(PeerId?)
 }
 
+public enum RequestScheduleGroupCallResult {
+    case success
+    case alreadyInProgress(PeerId?)
+}
+
 public struct CallAuxiliaryServer {
     public enum Connection {
         case stun
@@ -104,6 +109,7 @@ public final class PresentationCallVideoView {
     public let getAspect: () -> CGFloat
     public let setOnOrientationUpdated: (((Orientation, CGFloat) -> Void)?) -> Void
     public let setOnIsMirroredUpdated: (((Bool) -> Void)?) -> Void
+    public let updateIsEnabled: (Bool) -> Void
     
     public init(
         holder: AnyObject,
@@ -112,7 +118,8 @@ public final class PresentationCallVideoView {
         getOrientation: @escaping () -> Orientation,
         getAspect: @escaping () -> CGFloat,
         setOnOrientationUpdated: @escaping (((Orientation, CGFloat) -> Void)?) -> Void,
-        setOnIsMirroredUpdated: @escaping (((Bool) -> Void)?) -> Void
+        setOnIsMirroredUpdated: @escaping (((Bool) -> Void)?) -> Void,
+        updateIsEnabled: @escaping (Bool) -> Void
     ) {
         self.holder = holder
         self.view = view
@@ -121,6 +128,7 @@ public final class PresentationCallVideoView {
         self.getAspect = getAspect
         self.setOnOrientationUpdated = setOnOrientationUpdated
         self.setOnIsMirroredUpdated = setOnIsMirroredUpdated
+        self.updateIsEnabled = updateIsEnabled
     }
 }
 
@@ -181,6 +189,9 @@ public struct PresentationGroupCallState: Equatable {
     public var recordingStartTimestamp: Int32?
     public var title: String?
     public var raisedHand: Bool
+    public var scheduleTimestamp: Int32?
+    public var subscribedToScheduled: Bool
+    public var isVideoEnabled: Bool
     
     public init(
         myPeerId: PeerId,
@@ -191,7 +202,10 @@ public struct PresentationGroupCallState: Equatable {
         defaultParticipantMuteState: DefaultParticipantMuteState?,
         recordingStartTimestamp: Int32?,
         title: String?,
-        raisedHand: Bool
+        raisedHand: Bool,
+        scheduleTimestamp: Int32?,
+        subscribedToScheduled: Bool,
+        isVideoEnabled: Bool
     ) {
         self.myPeerId = myPeerId
         self.networkState = networkState
@@ -202,6 +216,9 @@ public struct PresentationGroupCallState: Equatable {
         self.recordingStartTimestamp = recordingStartTimestamp
         self.title = title
         self.raisedHand = raisedHand
+        self.scheduleTimestamp = scheduleTimestamp
+        self.subscribedToScheduled = subscribedToScheduled
+        self.isVideoEnabled = isVideoEnabled
     }
 }
 
@@ -278,10 +295,16 @@ public struct PresentationGroupCallMembers: Equatable {
 
 public final class PresentationGroupCallMemberEvent {
     public let peer: Peer
+    public let isContact: Bool
+    public let isInChatList: Bool
+    public let canUnmute: Bool
     public let joined: Bool
     
-    public init(peer: Peer, joined: Bool) {
+    public init(peer: Peer, isContact: Bool, isInChatList: Bool, canUnmute: Bool, joined: Bool) {
         self.peer = peer
+        self.isContact = isContact
+        self.isInChatList = isInChatList
+        self.canUnmute = canUnmute
         self.joined = joined
     }
 }
@@ -291,40 +314,108 @@ public enum PresentationGroupCallTone {
     case recordingStarted
 }
 
+public struct PresentationGroupCallRequestedVideo {
+    public enum Quality {
+        case thumbnail
+        case medium
+        case full
+    }
+
+    public struct SsrcGroup {
+        public var semantics: String
+        public var ssrcs: [UInt32]
+    }
+
+    public var audioSsrc: UInt32
+    public var endpointId: String
+    public var ssrcGroups: [SsrcGroup]
+    public var minQuality: Quality
+    public var maxQuality: Quality
+}
+
+public extension GroupCallParticipantsContext.Participant {
+    var videoEndpointId: String? {
+        return self.videoDescription?.endpointId
+    }
+
+    var presentationEndpointId: String? {
+        return self.presentationDescription?.endpointId
+    }
+}
+
+public extension GroupCallParticipantsContext.Participant {
+    func requestedVideoChannel(minQuality: PresentationGroupCallRequestedVideo.Quality, maxQuality: PresentationGroupCallRequestedVideo.Quality) -> PresentationGroupCallRequestedVideo? {
+        guard let audioSsrc = self.ssrc else {
+            return nil
+        }
+        guard let videoDescription = self.videoDescription else {
+            return nil
+        }
+        return PresentationGroupCallRequestedVideo(audioSsrc: audioSsrc, endpointId: videoDescription.endpointId, ssrcGroups: videoDescription.ssrcGroups.map { group in
+            PresentationGroupCallRequestedVideo.SsrcGroup(semantics: group.semantics, ssrcs: group.ssrcs)
+        }, minQuality: minQuality, maxQuality: maxQuality)
+    }
+
+    func requestedPresentationVideoChannel(minQuality: PresentationGroupCallRequestedVideo.Quality, maxQuality: PresentationGroupCallRequestedVideo.Quality) -> PresentationGroupCallRequestedVideo? {
+        guard let audioSsrc = self.ssrc else {
+            return nil
+        }
+        guard let presentationDescription = self.presentationDescription else {
+            return nil
+        }
+        return PresentationGroupCallRequestedVideo(audioSsrc: audioSsrc, endpointId: presentationDescription.endpointId, ssrcGroups: presentationDescription.ssrcGroups.map { group in
+            PresentationGroupCallRequestedVideo.SsrcGroup(semantics: group.semantics, ssrcs: group.ssrcs)
+        }, minQuality: minQuality, maxQuality: maxQuality)
+    }
+}
+
 public protocol PresentationGroupCall: class {
     var account: Account { get }
     var accountContext: AccountContext { get }
     var internalId: CallSessionInternalId { get }
     var peerId: PeerId { get }
     
-    var isVideo: Bool { get }
+    var hasVideo: Bool { get }
+    var hasScreencast: Bool { get }
+    
+    var schedulePending: Bool { get }
     
     var audioOutputState: Signal<([AudioSessionOutput], AudioSessionOutput?), NoError> { get }
     
+    var isSpeaking: Signal<Bool, NoError> { get }
     var canBeRemoved: Signal<Bool, NoError> { get }
     var state: Signal<PresentationGroupCallState, NoError> { get }
+    var stateVersion: Signal<Int, NoError> { get }
     var summaryState: Signal<PresentationGroupCallSummaryState?, NoError> { get }
     var members: Signal<PresentationGroupCallMembers?, NoError> { get }
     var audioLevels: Signal<[(PeerId, UInt32, Float, Bool)], NoError> { get }
     var myAudioLevel: Signal<Float, NoError> { get }
     var isMuted: Signal<Bool, NoError> { get }
+    var isNoiseSuppressionEnabled: Signal<Bool, NoError> { get }
     
     var memberEvents: Signal<PresentationGroupCallMemberEvent, NoError> { get }
     var reconnectedAsEvents: Signal<Peer, NoError> { get }
     
+    func toggleScheduledSubscription(_ subscribe: Bool)
+    func schedule(timestamp: Int32)
+    func startScheduled()
+    
     func reconnect(with invite: String)
     func reconnect(as peerId: PeerId)
     func leave(terminateIfPossible: Bool) -> Signal<Bool, NoError>
     
     func toggleIsMuted()
     func setIsMuted(action: PresentationGroupCallMuteAction)
+    func setIsNoiseSuppressionEnabled(_ isNoiseSuppressionEnabled: Bool)
     func raiseHand()
     func lowerHand()
     func requestVideo()
     func disableVideo()
+    func disableScreencast()
+    func switchVideoCamera()
     func updateDefaultParticipantsAreMuted(isMuted: Bool)
     func setVolume(peerId: PeerId, volume: Int32, sync: Bool)
-    func setFullSizeVideo(peerId: PeerId?)
+    func setRequestedVideoList(items: [PresentationGroupCallRequestedVideo])
     func setCurrentAudioOutput(_ output: AudioSessionOutput)
 
     func playTone(_ tone: PresentationGroupCallTone)
@@ -340,9 +431,8 @@ public protocol PresentationGroupCall: class {
     
     var inviteLinks: Signal<GroupCallInviteLinks?, NoError> { get }
     
-    var incomingVideoSources: Signal<[PeerId: UInt32], NoError> { get }
-    
-    func makeIncomingVideoView(source: UInt32, completion: @escaping (PresentationCallVideoView?) -> Void)
+    func makeIncomingVideoView(endpointId: String, requestClone: Bool, completion: @escaping (PresentationCallVideoView?, PresentationCallVideoView?) -> Void)
+    func makeOutgoingVideoView(requestClone: Bool, completion: @escaping (PresentationCallVideoView?, PresentationCallVideoView?) -> Void)
     
     func loadMoreMembers(token: String)
 }
@@ -353,4 +443,5 @@ public protocol PresentationCallManager: class {
     
     func requestCall(context: AccountContext, peerId: PeerId, isVideo: Bool, endCurrentIfAny: Bool) -> RequestCallResult
     func joinGroupCall(context: AccountContext, peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, initialCall: CachedChannelData.ActiveCall, endCurrentIfAny: Bool) -> JoinGroupCallManagerResult
+    func scheduleGroupCall(context: AccountContext, peerId: PeerId, endCurrentIfAny: Bool) -> RequestScheduleGroupCallResult
 }
diff --git a/submodules/AccountContext/Sources/SharedMediaPlayer.swift b/submodules/AccountContext/Sources/SharedMediaPlayer.swift
index 4140e3345d..e71f6843b1 100644
--- a/submodules/AccountContext/Sources/SharedMediaPlayer.swift
+++ b/submodules/AccountContext/Sources/SharedMediaPlayer.swift
@@ -135,14 +135,16 @@ public func areSharedMediaPlaylistItemIdsEqual(_ lhs: SharedMediaPlaylistItemId?
 
 public struct PeerMessagesMediaPlaylistItemId: SharedMediaPlaylistItemId {
     public let messageId: MessageId
+    public let messageIndex: MessageIndex
     
-    public init(messageId: MessageId) {
+    public init(messageId: MessageId, messageIndex: MessageIndex) {
         self.messageId = messageId
+        self.messageIndex = messageIndex
     }
     
     public func isEqual(to: SharedMediaPlaylistItemId) -> Bool {
         if let to = to as? PeerMessagesMediaPlaylistItemId {
-            if self.messageId != to.messageId {
+            if self.messageId != to.messageId || self.messageIndex != to.messageIndex {
                 return false
             }
             return true
diff --git a/submodules/AnimatedNavigationStripeNode/Sources/AnimatedNavigationStripeNode.swift b/submodules/AnimatedNavigationStripeNode/Sources/AnimatedNavigationStripeNode.swift
index c95452e7e4..be5b3498a8 100644
--- a/submodules/AnimatedNavigationStripeNode/Sources/AnimatedNavigationStripeNode.swift
+++ b/submodules/AnimatedNavigationStripeNode/Sources/AnimatedNavigationStripeNode.swift
@@ -61,26 +61,35 @@ public final class AnimatedNavigationStripeNode: ASDisplayNode {
     private let foregroundLineNode: ASImageNode
     private var backgroundLineNodes: [Int: BackgroundLineNode] = [:]
     private var removingBackgroundLineNodes: [BackgroundLineNode] = []
-    
+
+    private let maskContainerNode: ASDisplayNode
     private let topShadowNode: ASImageNode
     private let bottomShadowNode: ASImageNode
+    private let middleShadowNode: ASDisplayNode
     
     private var currentForegroundImage: UIImage?
     private var currentBackgroundImage: UIImage?
     private var currentClearBackgroundImage: UIImage?
     
     override public init() {
+        self.maskContainerNode = ASDisplayNode()
+
         self.foregroundLineNode = ASImageNode()
         self.topShadowNode = ASImageNode()
         self.bottomShadowNode = ASImageNode()
+        self.middleShadowNode = ASDisplayNode()
+        self.middleShadowNode.backgroundColor = .white
         
         super.init()
         
         self.clipsToBounds = true
-        
+
+        self.addSubnode(self.maskContainerNode)
         self.addSubnode(self.foregroundLineNode)
-        self.addSubnode(self.topShadowNode)
-        self.addSubnode(self.bottomShadowNode)
+        self.maskContainerNode.addSubnode(self.topShadowNode)
+        self.maskContainerNode.addSubnode(self.bottomShadowNode)
+        self.maskContainerNode.addSubnode(self.middleShadowNode)
+        self.layer.mask = self.maskContainerNode.layer
     }
     
     public func update(colors: Colors, configuration: Configuration, transition: ContainedViewLayoutTransition) {
@@ -123,7 +132,7 @@ public final class AnimatedNavigationStripeNode: ASDisplayNode {
                 context.clear(CGRect(origin: CGPoint(), size: size))
                 
                 var locations: [CGFloat] = [1.0, 0.0]
-                let colors: [CGColor] = [colors.clearBackground.cgColor, colors.clearBackground.withAlphaComponent(0.0).cgColor]
+                let colors: [CGColor] = [UIColor.white.withAlphaComponent(0.0).cgColor, UIColor.white.cgColor]
                 
                 let colorSpace = CGColorSpaceCreateDeviceRGB()
                 let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
@@ -135,7 +144,7 @@ public final class AnimatedNavigationStripeNode: ASDisplayNode {
                 context.clear(CGRect(origin: CGPoint(), size: size))
                 
                 var locations: [CGFloat] = [1.0, 0.0]
-                let colors: [CGColor] = [colors.clearBackground.cgColor, colors.clearBackground.withAlphaComponent(0.0).cgColor]
+                let colors: [CGColor] = [UIColor.white.withAlphaComponent(0.0).cgColor, UIColor.white.cgColor]
                 
                 let colorSpace = CGColorSpaceCreateDeviceRGB()
                 let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
@@ -161,6 +170,8 @@ public final class AnimatedNavigationStripeNode: ASDisplayNode {
             
             transition.updateFrame(node: self.topShadowNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: 2.0, height: defaultVerticalInset)))
             transition.updateFrame(node: self.bottomShadowNode, frame: CGRect(origin: CGPoint(x: 0.0, y: configuration.height - defaultVerticalInset), size: CGSize(width: 2.0, height: defaultVerticalInset)))
+            transition.updateFrame(node: self.middleShadowNode, frame: CGRect(origin: CGPoint(x: 0.0, y: defaultVerticalInset), size: CGSize(width: 2.0, height: configuration.height - defaultVerticalInset * 2.0)))
+            transition.updateFrame(node: self.maskContainerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: 2.0, height: configuration.height)))
             
             let availableVerticalHeight: CGFloat = configuration.height - defaultVerticalInset * 2.0
             
@@ -214,7 +225,7 @@ public final class AnimatedNavigationStripeNode: ASDisplayNode {
                     itemNode.overlayNode.image = self.currentClearBackgroundImage
                     self.backgroundLineNodes[index] = itemNode
                     self.insertSubnode(itemNode.lineNode, belowSubnode: self.foregroundLineNode)
-                    self.insertSubnode(itemNode.overlayNode, belowSubnode: self.topShadowNode)
+                    self.topShadowNode.supernode?.insertSubnode(itemNode.overlayNode, belowSubnode: self.topShadowNode)
                     backgroundItemNodesToOffset.append(itemNode)
                 }
                 itemNodeTransition.updateFrame(node: itemNode.lineNode, frame: itemFrame, beginWithCurrentState: true)
diff --git a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
index 889af3cae8..9606e718e1 100644
--- a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
+++ b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
@@ -56,6 +56,7 @@ public enum AnimatedStickerPlaybackPosition {
     case start
     case end
     case timestamp(Double)
+    case frameIndex(Int)
 }
 
 public enum AnimatedStickerPlaybackMode {
@@ -94,6 +95,7 @@ public protocol AnimatedStickerFrameSource: class {
     
     func takeFrame(draw: Bool) -> AnimatedStickerFrame?
     func skipToEnd()
+    func skipToFrameIndex(_ index: Int)
 }
 
 private final class AnimatedStickerFrameSourceWrapper {
@@ -271,6 +273,9 @@ public final class AnimatedStickerCachedFrameSource: AnimatedStickerFrameSource
     
     public func skipToEnd() {
     }
+
+    public func skipToFrameIndex(_ index: Int) {
+    }
 }
 
 private func wrappedWrite(_ fd: Int32, _ data: UnsafeRawPointer, _ count: Int) -> Int {
@@ -609,7 +614,7 @@ private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource
         self.data = data
         self.width = width
         self.height = height
-        self.bytesPerRow = (4 * Int(width) + 15) & (~15)
+        self.bytesPerRow = DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(width))
         self.currentFrame = 0
         let rawData = TGGUnzipData(data, 8 * 1024 * 1024) ?? data
         let decompressedData = transformedWithFitzModifier(data: rawData, fitzModifier: fitzModifier)
@@ -656,6 +661,10 @@ private final class AnimatedStickerDirectFrameSource: AnimatedStickerFrameSource
     func skipToEnd() {
         self.currentFrame = self.frameCount - 1
     }
+
+    func skipToFrameIndex(_ index: Int) {
+        self.currentFrame = index
+    }
 }
 
 public final class AnimatedStickerFrameQueue {
@@ -748,6 +757,8 @@ public final class AnimatedStickerNode: ASDisplayNode {
     
     public var completed: (Bool) -> Void = { _ in }
     public var frameUpdated: (Int, Int) -> Void = { _, _ in }
+    public private(set) var currentFrameIndex: Int = 0
+    private var playFromIndex: Int?
     
     private let timer = Atomic<SwiftSignalKit.Timer?>(value: nil)
     private let frameSource = Atomic<QueueLocalObject<AnimatedStickerFrameSourceWrapper>?>(value: nil)
@@ -842,7 +853,9 @@ public final class AnimatedStickerNode: ASDisplayNode {
                         strongSelf.isSetUpForPlayback = false
                         strongSelf.isPlaying = true
                     }
-                    strongSelf.play()
+                    var fromIndex = strongSelf.playFromIndex
+                    strongSelf.playFromIndex = nil
+                    strongSelf.play(fromIndex: fromIndex)
                 } else if strongSelf.canDisplayFirstFrame {
                     strongSelf.play(firstFrame: true)
                 }
@@ -911,7 +924,7 @@ public final class AnimatedStickerNode: ASDisplayNode {
     
     private var isSetUpForPlayback = false
     
-    public func play(firstFrame: Bool = false) {
+    public func play(firstFrame: Bool = false, fromIndex: Int? = nil) {
         switch self.playbackMode {
         case .once:
             self.isPlaying = true
@@ -949,6 +962,9 @@ public final class AnimatedStickerNode: ASDisplayNode {
                 guard let frameSource = maybeFrameSource else {
                     return
                 }
+                if let fromIndex = fromIndex {
+                    frameSource.skipToFrameIndex(fromIndex)
+                }
                 let frameQueue = QueueLocalObject<AnimatedStickerFrameQueue>(queue: queue, generate: {
                     return AnimatedStickerFrameQueue(queue: queue, length: 1, source: frameSource)
                 })
@@ -978,6 +994,7 @@ public final class AnimatedStickerNode: ASDisplayNode {
                             })
                             
                             strongSelf.frameUpdated(frame.index, frame.totalFrames)
+                            strongSelf.currentFrameIndex = frame.index
                             
                             if frame.isLastFrame {
                                 var stopped = false
@@ -1016,6 +1033,9 @@ public final class AnimatedStickerNode: ASDisplayNode {
             self.isSetUpForPlayback = true
             let directData = self.directData
             let cachedData = self.cachedData
+            if directData == nil && cachedData == nil {
+                self.playFromIndex = fromIndex
+            }
             let queue = self.queue
             let timerHolder = self.timer
             let frameSourceHolder = self.frameSource
@@ -1039,6 +1059,9 @@ public final class AnimatedStickerNode: ASDisplayNode {
                 guard let frameSource = maybeFrameSource else {
                     return
                 }
+                if let fromIndex = fromIndex {
+                    frameSource.skipToFrameIndex(fromIndex)
+                }
                 let frameQueue = QueueLocalObject<AnimatedStickerFrameQueue>(queue: queue, generate: {
                     return AnimatedStickerFrameQueue(queue: queue, length: 1, source: frameSource)
                 })
@@ -1068,6 +1091,7 @@ public final class AnimatedStickerNode: ASDisplayNode {
                             })
                             
                             strongSelf.frameUpdated(frame.index, frame.totalFrames)
+                            strongSelf.currentFrameIndex = frame.index
                             
                             if frame.isLastFrame {
                                 var stopped = false
@@ -1163,6 +1187,21 @@ public final class AnimatedStickerNode: ASDisplayNode {
                     return
                 }
                 
+                var delta = targetFrame - frameSource.frameIndex
+                if delta < 0 {
+                    delta = frameSource.frameCount + delta
+                }
+                for i in 0 ..< delta {
+                    maybeFrame = frameQueue.syncWith { frameQueue in
+                        return frameQueue.take(draw: i == delta - 1)
+                    }
+                }
+            } else if case let .frameIndex(frameIndex) = position {
+                let targetFrame = frameIndex
+                if targetFrame == frameSource.frameIndex {
+                    return
+                }
+
                 var delta = targetFrame - frameSource.frameIndex
                 if delta < 0 {
                     delta = frameSource.frameCount + delta
diff --git a/submodules/AnimatedStickerNode/Sources/SoftwareAnimationRenderer.swift b/submodules/AnimatedStickerNode/Sources/SoftwareAnimationRenderer.swift
index 6dffe0ed40..5b23eb8b1d 100644
--- a/submodules/AnimatedStickerNode/Sources/SoftwareAnimationRenderer.swift
+++ b/submodules/AnimatedStickerNode/Sources/SoftwareAnimationRenderer.swift
@@ -13,7 +13,7 @@ final class SoftwareAnimationRenderer: ASDisplayNode, AnimationRenderer {
         queue.async { [weak self] in
             switch type {
             case .argb:
-                let calculatedBytesPerRow = (4 * Int(width) + 15) & (~15)
+                let calculatedBytesPerRow =  DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(width))
                 assert(bytesPerRow == calculatedBytesPerRow)
             case .yuva:
                 break
diff --git a/submodules/AnimationUI/Sources/AnimationNode.swift b/submodules/AnimationUI/Sources/AnimationNode.swift
index edc556d626..a034b855d5 100644
--- a/submodules/AnimationUI/Sources/AnimationNode.swift
+++ b/submodules/AnimationUI/Sources/AnimationNode.swift
@@ -18,6 +18,7 @@ public final class AnimationNode : ASDisplayNode {
     
     public var didPlay = false
     public var completion: (() -> Void)?
+    private var internalCompletion: (() -> Void)?
     
     public var isPlaying: Bool {
         return self.animationView()?.isAnimationPlaying ?? false
@@ -79,10 +80,22 @@ public final class AnimationNode : ASDisplayNode {
         })
     }
     
-    public func setAnimation(name: String) {
+    public func seekToEnd() {
+        self.animationView()?.animationProgress = 1.0
+    }
+    
+    public func setAnimation(name: String, colors: [String: UIColor]? = nil) {
         if let url = getAppBundle().url(forResource: name, withExtension: "json"), let composition = LOTComposition(filePath: url.path) {
             self.didPlay = false
             self.animationView()?.sceneModel = composition
+            
+            if let colors = colors {
+                for (key, value) in colors {
+                    let colorCallback = LOTColorValueCallback(color: value.cgColor)
+                    self.colorCallbacks.append(colorCallback)
+                    self.animationView()?.setValueDelegate(colorCallback, for: LOTKeypath(string: "\(key).Color"))
+                }
+            }
         }
     }
     
@@ -95,6 +108,7 @@ public final class AnimationNode : ASDisplayNode {
     }
     
     public func setAnimation(json: [AnyHashable: Any]) {
+        self.didPlay = false
         self.animationView()?.setAnimation(json: json)
     }
     
@@ -103,7 +117,7 @@ public final class AnimationNode : ASDisplayNode {
     }
     
     public func play() {
-        if let animationView = animationView(), !animationView.isAnimationPlaying && !self.didPlay {
+        if let animationView = self.animationView(), !animationView.isAnimationPlaying && !self.didPlay {
             self.didPlay = true
             animationView.play { [weak self] _ in
                 self?.completion?()
@@ -111,8 +125,20 @@ public final class AnimationNode : ASDisplayNode {
         }
     }
     
+    public func playOnce() {
+        if let animationView = self.animationView(), !animationView.isAnimationPlaying && !self.didPlay {
+            self.didPlay = true
+            self.internalCompletion = { [weak self] in
+                self?.didPlay = false
+            }
+            animationView.play { [weak self] _ in
+                self?.internalCompletion?()
+            }
+        }
+    }
+    
     public func loop() {
-        if let animationView = animationView() {
+        if let animationView = self.animationView() {
             animationView.loopAnimation = true
             animationView.play()
         }
diff --git a/submodules/AppLock/Sources/AppLock.swift b/submodules/AppLock/Sources/AppLock.swift
index b771fc82de..993663bce7 100644
--- a/submodules/AppLock/Sources/AppLock.swift
+++ b/submodules/AppLock/Sources/AppLock.swift
@@ -184,7 +184,7 @@ public final class AppLockContextImpl: AppLockContext {
                         }
                         passcodeController.ensureInputFocused()
                     } else {
-                        let passcodeController = PasscodeEntryController(applicationBindings: strongSelf.applicationBindings, accountManager: strongSelf.accountManager, appLockContext: strongSelf, presentationData: presentationData, presentationDataSignal: strongSelf.presentationDataSignal, challengeData: accessChallengeData.data, biometrics: biometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: !becameActiveRecently, lockIconInitialFrame: { [weak self] in
+                        let passcodeController = PasscodeEntryController(applicationBindings: strongSelf.applicationBindings, accountManager: strongSelf.accountManager, appLockContext: strongSelf, presentationData: presentationData, presentationDataSignal: strongSelf.presentationDataSignal, statusBarHost: window?.statusBarHost, challengeData: accessChallengeData.data, biometrics: biometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: !becameActiveRecently, lockIconInitialFrame: { [weak self] in
                             if let lockViewFrame = lockIconInitialFrame() {
                                 return lockViewFrame
                             } else {
diff --git a/submodules/AsyncDisplayKit/Source/ASCGImageBuffer.mm b/submodules/AsyncDisplayKit/Source/ASCGImageBuffer.mm
index 6f05300e23..24ab628d1b 100644
--- a/submodules/AsyncDisplayKit/Source/ASCGImageBuffer.mm
+++ b/submodules/AsyncDisplayKit/Source/ASCGImageBuffer.mm
@@ -6,7 +6,7 @@
 //  Licensed under Apache 2.0: http://www.apache.org/licenses/LICENSE-2.0
 //
 
-#import "ASCGImageBuffer.h"
+#import <AsyncDisplayKit/ASCGImageBuffer.h>
 
 #import <sys/mman.h>
 #import <mach/mach_init.h>
@@ -32,7 +32,7 @@
 {
   if (self = [super init]) {
     _length = length;
-    _isVM = (length >= vm_page_size);
+    _isVM = false;//(length >= vm_page_size);
     if (_isVM) {
       _mutableBytes = mmap(NULL, length, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, VM_MAKE_TAG(VM_MEMORY_COREGRAPHICS_DATA), 0);
       if (_mutableBytes == MAP_FAILED) {
@@ -43,7 +43,7 @@
     
     // Check the VM flag again because we may have failed above.
     if (!_isVM) {
-      _mutableBytes = calloc(1, length);
+      _mutableBytes = malloc(length);
     }
   }
   return self;
diff --git a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
index 87baeb09ac..fdd08f0929 100644
--- a/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
+++ b/submodules/AsyncDisplayKit/Source/ASEditableTextNode.mm
@@ -733,9 +733,6 @@
   range.location = range.location + range.length - 1;
   range.length = 1;
   [self.textView scrollRangeToVisible:range];
-  
-  CGPoint bottomOffset = CGPointMake(0, self.textView.contentSize.height - self.textView.bounds.size.height);
-  //[self.textView setContentOffset:bottomOffset animated:NO];
 }
 
 #pragma mark - Keyboard
@@ -1045,7 +1042,7 @@
   CGFloat baselineNudge = (lineHeight - fontLineHeight) * 0.6f;
   
   CGRect rect = *lineFragmentRect;
-  rect.size.height = lineHeight;
+  rect.size.height = lineHeight + 2.0f;
   
   CGRect usedRect = *lineFragmentUsedRect;
   usedRect.size.height = MAX(lineHeight, usedRect.size.height);
diff --git a/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
index b181ee2728..b950613d0d 100644
--- a/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
+++ b/submodules/AsyncDisplayKit/Source/ASGraphicsContext.mm
@@ -7,7 +7,7 @@
 //
 
 #import <AsyncDisplayKit/ASGraphicsContext.h>
-#import "ASCGImageBuffer.h"
+#import <AsyncDisplayKit/ASCGImageBuffer.h>
 #import <AsyncDisplayKit/ASAssert.h>
 #import <AsyncDisplayKit/ASConfigurationInternal.h>
 #import <AsyncDisplayKit/ASInternalHelpers.h>
diff --git a/submodules/AsyncDisplayKit/Source/ASCGImageBuffer.h b/submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASCGImageBuffer.h
similarity index 100%
rename from submodules/AsyncDisplayKit/Source/ASCGImageBuffer.h
rename to submodules/AsyncDisplayKit/Source/PublicHeaders/AsyncDisplayKit/ASCGImageBuffer.h
diff --git a/submodules/AudioBlob/Sources/BlobView.swift b/submodules/AudioBlob/Sources/BlobView.swift
index dc7e9823c3..64ade477e5 100644
--- a/submodules/AudioBlob/Sources/BlobView.swift
+++ b/submodules/AudioBlob/Sources/BlobView.swift
@@ -1,19 +1,51 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import LegacyComponents
 
+public final class VoiceBlobNode: ASDisplayNode {
+    public init(
+        maxLevel: CGFloat,
+        smallBlobRange: VoiceBlobView.BlobRange,
+        mediumBlobRange: VoiceBlobView.BlobRange,
+        bigBlobRange: VoiceBlobView.BlobRange
+    ) {
+        super.init()
+        
+        self.setViewBlock({
+            return VoiceBlobView(frame: CGRect(), maxLevel: maxLevel, smallBlobRange: smallBlobRange, mediumBlobRange: mediumBlobRange, bigBlobRange: bigBlobRange)
+        })
+    }
+    
+    public func startAnimating(immediately: Bool = false) {
+        (self.view as? VoiceBlobView)?.startAnimating(immediately: immediately)
+    }
+    
+    public func stopAnimating(duration: Double = 0.15) {
+        (self.view as? VoiceBlobView)?.stopAnimating(duration: duration)
+    }
+    
+    public func setColor(_ color: UIColor, animated: Bool = false) {
+        (self.view as? VoiceBlobView)?.setColor(color, animated: animated)
+    }
+    
+    public func updateLevel(_ level: CGFloat, immediately: Bool = false) {
+        (self.view as? VoiceBlobView)?.updateLevel(level, immediately: immediately)
+    }
+}
+
 public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDecoration {
-    private let smallBlob: BlobView
-    private let mediumBlob: BlobView
-    private let bigBlob: BlobView
+    private let smallBlob: BlobNode
+    private let mediumBlob: BlobNode
+    private let bigBlob: BlobNode
     
     private let maxLevel: CGFloat
     
     private var displayLinkAnimator: ConstantDisplayLinkAnimator?
     
     private var audioLevel: CGFloat = 0
-    private var presentationAudioLevel: CGFloat = 0
+    public var presentationAudioLevel: CGFloat = 0
     
     private(set) var isAnimating = false
     
@@ -28,7 +60,7 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
     ) {
         self.maxLevel = maxLevel
         
-        self.smallBlob = BlobView(
+        self.smallBlob = BlobNode(
             pointsCount: 8,
             minRandomness: 0.1,
             maxRandomness: 0.5,
@@ -39,23 +71,23 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
             scaleSpeed: 0.2,
             isCircle: true
         )
-        self.mediumBlob = BlobView(
+        self.mediumBlob = BlobNode(
             pointsCount: 8,
             minRandomness: 1,
             maxRandomness: 1,
-            minSpeed: 1.5,
-            maxSpeed: 7,
+            minSpeed: 0.9,
+            maxSpeed: 4,
             minScale: mediumBlobRange.min,
             maxScale: mediumBlobRange.max,
             scaleSpeed: 0.2,
             isCircle: false
         )
-        self.bigBlob = BlobView(
+        self.bigBlob = BlobNode(
             pointsCount: 8,
             minRandomness: 1,
             maxRandomness: 1,
-            minSpeed: 1.5,
-            maxSpeed: 7,
+            minSpeed: 0.9,
+            maxSpeed: 4,
             minScale: bigBlobRange.min,
             maxScale: bigBlobRange.max,
             scaleSpeed: 0.2,
@@ -64,9 +96,9 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
         
         super.init(frame: frame)
         
-        addSubview(bigBlob)
-        addSubview(mediumBlob)
-        addSubview(smallBlob)
+        self.addSubnode(self.bigBlob)
+        self.addSubnode(self.mediumBlob)
+        self.addSubnode(self.smallBlob)
         
         displayLinkAnimator = ConstantDisplayLinkAnimator() { [weak self] in
             guard let strongSelf = self else { return }
@@ -94,6 +126,10 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
     }
     
     public func updateLevel(_ level: CGFloat) {
+        self.updateLevel(level, immediately: false)
+    }
+    
+    public func updateLevel(_ level: CGFloat, immediately: Bool = false) {
         let normalizedLevel = min(1, max(level / maxLevel, 0))
         
         smallBlob.updateSpeedLevel(to: normalizedLevel)
@@ -101,14 +137,26 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
         bigBlob.updateSpeedLevel(to: normalizedLevel)
         
         audioLevel = normalizedLevel
+        if immediately {
+            presentationAudioLevel = normalizedLevel
+        }
     }
     
     public func startAnimating() {
+        self.startAnimating(immediately: false)
+    }
+    
+    public func startAnimating(immediately: Bool = false) {
         guard !isAnimating else { return }
         isAnimating = true
         
-        mediumBlob.layer.animateScale(from: 0.5, to: 1, duration: 0.15, removeOnCompletion: false)
-        bigBlob.layer.animateScale(from: 0.5, to: 1, duration: 0.15, removeOnCompletion: false)
+        if !immediately {
+            mediumBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false)
+            bigBlob.layer.animateScale(from: 0.75, to: 1, duration: 0.35, removeOnCompletion: false)
+        } else {
+            mediumBlob.layer.removeAllAnimations()
+            bigBlob.layer.removeAllAnimations()
+        }
         
         updateBlobsState()
         
@@ -123,8 +171,8 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
         guard isAnimating else { return }
         isAnimating = false
         
-        mediumBlob.layer.animateScale(from: 1.0, to: 0.5, duration: duration, removeOnCompletion: false)
-        bigBlob.layer.animateScale(from: 1.0, to: 0.5, duration: duration, removeOnCompletion: false)
+        mediumBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false)
+        bigBlob.layer.animateScale(from: 1.0, to: 0.75, duration: duration, removeOnCompletion: false)
         
         updateBlobsState()
         
@@ -132,8 +180,8 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
     }
     
     private func updateBlobsState() {
-        if isAnimating {
-            if smallBlob.frame.size != .zero {
+        if self.isAnimating {
+            if self.smallBlob.frame.size != .zero {
                 smallBlob.startAnimating()
                 mediumBlob.startAnimating()
                 bigBlob.startAnimating()
@@ -148,15 +196,15 @@ public final class VoiceBlobView: UIView, TGModernConversationInputMicButtonDeco
     override public func layoutSubviews() {
         super.layoutSubviews()
         
-        smallBlob.frame = bounds
-        mediumBlob.frame = bounds
-        bigBlob.frame = bounds
+        self.smallBlob.frame = bounds
+        self.mediumBlob.frame = bounds
+        self.bigBlob.frame = bounds
         
-        updateBlobsState()
+        self.updateBlobsState()
     }
 }
 
-final class BlobView: UIView {
+final class BlobNode: ASDisplayNode {
     let pointsCount: Int
     let smoothness: CGFloat
     
@@ -170,17 +218,17 @@ final class BlobView: UIView {
     let maxScale: CGFloat
     let scaleSpeed: CGFloat
     
-    var scaleLevelsToBalance = [CGFloat]()
-    
     let isCircle: Bool
     
     var level: CGFloat = 0 {
         didSet {
-            CATransaction.begin()
-            CATransaction.setDisableActions(true)
-            let lv = minScale + (maxScale - minScale) * level
-            shapeLayer.transform = CATransform3DMakeScale(lv, lv, 1)
-            CATransaction.commit()
+            if abs(self.level - oldValue) > 0.01 {
+                CATransaction.begin()
+                CATransaction.setDisableActions(true)
+                let lv = self.minScale + (self.maxScale - self.minScale) * self.level
+                self.shapeLayer.transform = CATransform3DMakeScale(lv, lv, 1)
+                CATransaction.commit()
+            }
         }
     }
     
@@ -243,11 +291,11 @@ final class BlobView: UIView {
         let angle = (CGFloat.pi * 2) / CGFloat(pointsCount)
         self.smoothness = ((4 / 3) * tan(angle / 4)) / sin(angle / 2) / 2
         
-        super.init(frame: .zero)
+        super.init()
         
-        layer.addSublayer(shapeLayer)
+        self.layer.addSublayer(self.shapeLayer)
         
-        shapeLayer.transform = CATransform3DMakeScale(minScale, minScale, 1)
+        self.shapeLayer.transform = CATransform3DMakeScale(minScale, minScale, 1)
     }
     
     required init?(coder: NSCoder) {
@@ -255,75 +303,55 @@ final class BlobView: UIView {
     }
     
     func setColor(_ color: UIColor, animated: Bool) {
-        let previousColor = shapeLayer.fillColor
-        shapeLayer.fillColor = color.cgColor
+        let previousColor = self.shapeLayer.fillColor
+        self.shapeLayer.fillColor = color.cgColor
         if animated, let previousColor = previousColor {
-            shapeLayer.animate(from: previousColor, to: color.cgColor, keyPath: "fillColor", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+            self.shapeLayer.animate(from: previousColor, to: color.cgColor, keyPath: "fillColor", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
         }
     }
     
     func updateSpeedLevel(to newSpeedLevel: CGFloat) {
-        speedLevel = max(speedLevel, newSpeedLevel)
-        
-        if abs(lastSpeedLevel - newSpeedLevel) > 0.5 {
-            animateToNewShape()
-        }
+        self.speedLevel = max(self.speedLevel, newSpeedLevel)
     }
     
     func startAnimating() {
-        animateToNewShape()
+        self.animateToNewShape()
     }
     
     func stopAnimating() {
-        fromPoints = currentPoints
-        toPoints = nil
-        pop_removeAnimation(forKey: "blob")
+        self.shapeLayer.removeAnimation(forKey: "path")
     }
     
     private func animateToNewShape() {
         guard !isCircle else { return }
         
-        if pop_animation(forKey: "blob") != nil {
-            fromPoints = currentPoints
-            toPoints = nil
-            pop_removeAnimation(forKey: "blob")
+        if self.shapeLayer.path == nil {
+            let points = generateNextBlob(for: self.bounds.size)
+            self.shapeLayer.path = UIBezierPath.smoothCurve(through: points, length: bounds.width, smoothness: smoothness).cgPath
         }
         
-        if fromPoints == nil {
-            fromPoints = generateNextBlob(for: bounds.size)
-        }
-        if toPoints == nil {
-            toPoints = generateNextBlob(for: bounds.size)
-        }
+        let nextPoints = generateNextBlob(for: self.bounds.size)
+        let nextPath = UIBezierPath.smoothCurve(through: nextPoints, length: bounds.width, smoothness: smoothness).cgPath
         
-        let animation = POPBasicAnimation()
-        animation.property = POPAnimatableProperty.property(withName: "blob.transition", initializer: { property in
-            property?.readBlock = { blobView, values in
-                guard let blobView = blobView as? BlobView, let values = values else { return }
-                
-                values.pointee = blobView.transition
-            }
-            property?.writeBlock = { blobView, values in
-                guard let blobView = blobView as? BlobView, let values = values else { return }
-                
-                blobView.transition = values.pointee
-            }
-        })  as? POPAnimatableProperty
-        animation.completionBlock = { [weak self] animation, finished in
+        let animation = CABasicAnimation(keyPath: "path")
+        let previousPath = self.shapeLayer.path
+        self.shapeLayer.path = nextPath
+        animation.duration = CFTimeInterval(1 / (self.minSpeed + (self.maxSpeed - self.minSpeed) * self.speedLevel))
+        animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+        animation.fromValue = previousPath
+        animation.toValue = nextPath
+        animation.isRemovedOnCompletion = false
+        animation.fillMode = .forwards
+        animation.completion = { [weak self] finished in
             if finished {
-                self?.fromPoints = self?.currentPoints
-                self?.toPoints = nil
                 self?.animateToNewShape()
             }
         }
-        animation.duration = CFTimeInterval(1 / (minSpeed + (maxSpeed - minSpeed) * speedLevel))
-        animation.timingFunction = CAMediaTimingFunction(name: .linear)
-        animation.fromValue = 0
-        animation.toValue = 1
-        pop_add(animation, forKey: "blob")
-        
-        lastSpeedLevel = speedLevel
-        speedLevel = 0
+
+        self.shapeLayer.add(animation, forKey: "path")
+
+        self.lastSpeedLevel = self.speedLevel
+        self.speedLevel = 0
     }
     
     // MARK: Helpers
@@ -366,16 +394,16 @@ final class BlobView: UIView {
         return points
     }
     
-    override func layoutSubviews() {
-        super.layoutSubviews()
+    override func layout() {
+        super.layout()
         
         CATransaction.begin()
         CATransaction.setDisableActions(true)
-        shapeLayer.position = CGPoint(x: bounds.midX, y: bounds.midY)
-        if isCircle {
-            let halfWidth = bounds.width * 0.5
-            shapeLayer.path = UIBezierPath(
-                roundedRect: bounds.offsetBy(dx: -halfWidth, dy: -halfWidth),
+        self.shapeLayer.position = CGPoint(x: bounds.midX, y: bounds.midY)
+        if self.isCircle {
+            let halfWidth = self.bounds.width * 0.5
+            self.shapeLayer.path = UIBezierPath(
+                roundedRect: self.bounds.offsetBy(dx: -halfWidth, dy: -halfWidth),
                 cornerRadius: halfWidth
             ).cgPath
         }
@@ -384,7 +412,6 @@ final class BlobView: UIView {
 }
 
 private extension UIBezierPath {
-    
     static func smoothCurve(
         through points: [CGPoint],
         length: CGFloat,
@@ -437,7 +464,6 @@ private extension UIBezierPath {
     }
     
     struct SmoothPoint {
-        
         let point: CGPoint
         
         let inAngle: CGFloat
@@ -462,4 +488,3 @@ private extension UIBezierPath {
         }
     }
 }
-
diff --git a/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift b/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift
index 284622fae1..d5b76addce 100644
--- a/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift
+++ b/submodules/AuthTransferUI/Sources/AuthTransferConfirmationScreen.swift
@@ -30,7 +30,7 @@ public final class AuthDataTransferSplashScreen: ViewController {
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
         let defaultTheme = NavigationBarTheme(rootControllerTheme: self.presentationData.theme)
-        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
+        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
         
         super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: navigationBarTheme, strings: NavigationBarStrings(back: self.presentationData.strings.Common_Back, close: self.presentationData.strings.Common_Close)))
         
@@ -80,7 +80,7 @@ public final class AuthDataTransferSplashScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        (self.displayNode as! AuthDataTransferSplashScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition)
+        (self.displayNode as! AuthDataTransferSplashScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
@@ -118,7 +118,7 @@ private final class AuthDataTransferSplashScreenNode: ViewControllerTracingNode
         
         let buttonText: String
         
-        let badgeFont = Font.with(size: 13.0, design: .round, traits: [.bold])
+        let badgeFont = Font.with(size: 13.0, design: .round, weight: .bold)
         let textFont = Font.regular(16.0)
         let textColor = self.presentationData.theme.list.itemPrimaryTextColor
         
diff --git a/submodules/AuthTransferUI/Sources/AuthTransferScanScreen.swift b/submodules/AuthTransferUI/Sources/AuthTransferScanScreen.swift
index c06059be3f..5fbd877788 100644
--- a/submodules/AuthTransferUI/Sources/AuthTransferScanScreen.swift
+++ b/submodules/AuthTransferUI/Sources/AuthTransferScanScreen.swift
@@ -90,7 +90,7 @@ public final class AuthTransferScanScreen: ViewController {
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
-        let navigationBarTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: .white, primaryTextColor: .white, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
+        let navigationBarTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: .white, primaryTextColor: .white, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
         
         super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: navigationBarTheme, strings: NavigationBarStrings(back: self.presentationData.strings.Common_Back, close: self.presentationData.strings.Common_Close)))
         
@@ -205,7 +205,7 @@ public final class AuthTransferScanScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        (self.displayNode as! AuthTransferScanScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition)
+        (self.displayNode as! AuthTransferScanScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
diff --git a/submodules/AvatarNode/BUILD b/submodules/AvatarNode/BUILD
index 2afd25db42..d601aef087 100644
--- a/submodules/AvatarNode/BUILD
+++ b/submodules/AvatarNode/BUILD
@@ -16,6 +16,8 @@ swift_library(
         "//submodules/AppBundle:AppBundle",
         "//submodules/AccountContext:AccountContext",
         "//submodules/Emoji:Emoji",
+        "//submodules/TinyThumbnail:TinyThumbnail",
+        "//submodules/FastBlur:FastBlur",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/AvatarNode/Sources/AvatarNode.swift b/submodules/AvatarNode/Sources/AvatarNode.swift
index c874fa9ea9..22b15b4753 100644
--- a/submodules/AvatarNode/Sources/AvatarNode.swift
+++ b/submodules/AvatarNode/Sources/AvatarNode.swift
@@ -19,7 +19,7 @@ private let archivedChatsIcon = UIImage(bundleImageName: "Avatar/ArchiveAvatarIc
 private let repliesIcon = generateTintedImage(image: UIImage(bundleImageName: "Avatar/RepliesMessagesIcon"), color: .white)
 
 public func avatarPlaceholderFont(size: CGFloat) -> UIFont {
-    return Font.with(size: size, design: .round, traits: [.bold])
+    return Font.with(size: size, design: .round, weight: .bold)
 }
 
 public enum AvatarNodeClipStyle {
@@ -224,7 +224,7 @@ public final class AvatarNode: ASDisplayNode {
     
     public init(font: UIFont) {
         self.font = font
-        self.imageNode = ImageNode(enableHasImage: true)
+        self.imageNode = ImageNode(enableHasImage: true, enableAnimatedTransition: true)
         
         super.init()
         
@@ -337,7 +337,7 @@ public final class AvatarNode: ASDisplayNode {
         } else if peer?.restrictionText(platform: "ios", contentSettings: context.currentContentSettings.with { $0 }) == nil {
             representation = peer?.smallProfileImage
         }
-        let updatedState: AvatarNodeState = .peerAvatar(peer?.id ?? PeerId(namespace: 0, id: 0), peer?.displayLetters ?? [], representation)
+        let updatedState: AvatarNodeState = .peerAvatar(peer?.id ?? PeerId(0), peer?.displayLetters ?? [], representation)
         if updatedState != self.state || overrideImage != self.overrideImage || theme !== self.theme {
             self.state = updatedState
             self.overrideImage = overrideImage
@@ -381,7 +381,7 @@ public final class AvatarNode: ASDisplayNode {
                 }
                 
                 self.editOverlayNode?.isHidden = true
-                parameters = AvatarNodeParameters(theme: theme, accountPeerId: context.account.peerId, peerId: peer?.id ?? PeerId(namespace: 0, id: 0), letters: peer?.displayLetters ?? [], font: self.font, icon: icon, explicitColorIndex: nil, hasImage: false, clipStyle: clipStyle)
+                parameters = AvatarNodeParameters(theme: theme, accountPeerId: context.account.peerId, peerId: peer?.id ?? PeerId(0), letters: peer?.displayLetters ?? [], font: self.font, icon: icon, explicitColorIndex: nil, hasImage: false, clipStyle: clipStyle)
             }
             if self.parameters == nil || self.parameters != parameters {
                 self.parameters = parameters
@@ -453,10 +453,10 @@ public final class AvatarNode: ASDisplayNode {
                 colorIndex = explicitColorIndex
             } else {
                 if let peerId = parameters.peerId {
-                    if peerId.namespace == -1 {
+                    if peerId.namespace == .max {
                         colorIndex = -1
                     } else {
-                        colorIndex = abs(Int(clamping: peerId.id))
+                        colorIndex = abs(Int(clamping: peerId.id._internalGetInt32Value()))
                     }
                 } else {
                     colorIndex = -1
@@ -623,17 +623,19 @@ public final class AvatarNode: ASDisplayNode {
     }
 }
 
-public func drawPeerAvatarLetters(context: CGContext, size: CGSize, font: UIFont, letters: [String], peerId: PeerId) {
-    context.beginPath()
-    context.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height:
-        size.height))
-    context.clip()
+public func drawPeerAvatarLetters(context: CGContext, size: CGSize, round: Bool = true, font: UIFont, letters: [String], peerId: PeerId) {
+    if round {
+        context.beginPath()
+        context.addEllipse(in: CGRect(x: 0.0, y: 0.0, width: size.width, height:
+            size.height))
+        context.clip()
+    }
     
     let colorIndex: Int
-    if peerId.namespace == -1 {
+    if peerId.namespace == .max {
         colorIndex = -1
     } else {
-        colorIndex = Int(abs(peerId.id))
+        colorIndex = Int(abs(peerId.id._internalGetInt32Value()))
     }
     
     let colorsArray: NSArray
diff --git a/submodules/AvatarNode/Sources/PeerAvatar.swift b/submodules/AvatarNode/Sources/PeerAvatar.swift
index 9fa6c87d07..e58b3ab6fc 100644
--- a/submodules/AvatarNode/Sources/PeerAvatar.swift
+++ b/submodules/AvatarNode/Sources/PeerAvatar.swift
@@ -6,6 +6,8 @@ import Display
 import ImageIO
 import TelegramCore
 import SyncCore
+import TinyThumbnail
+import FastBlur
 
 private let roundCorners = { () -> UIImage in
     let diameter: CGFloat = 60.0
@@ -21,22 +23,43 @@ private let roundCorners = { () -> UIImage in
     return image
 }()
 
-public func peerAvatarImageData(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, synchronousLoad: Bool) -> Signal<Data?, NoError>? {
+public enum PeerAvatarImageType {
+    case blurred
+    case complete
+}
+
+public func peerAvatarImageData(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, synchronousLoad: Bool) -> Signal<(Data, PeerAvatarImageType)?, NoError>? {
     if let smallProfileImage = representation {
         let resourceData = account.postbox.mediaBox.resourceData(smallProfileImage.resource, attemptSynchronously: synchronousLoad)
         let imageData = resourceData
         |> take(1)
-        |> mapToSignal { maybeData -> Signal<Data?, NoError> in
+        |> mapToSignal { maybeData -> Signal<(Data, PeerAvatarImageType)?, NoError> in
             if maybeData.complete {
-                return .single(try? Data(contentsOf: URL(fileURLWithPath: maybeData.path)))
+                if let data = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path)) {
+                    return .single((data, .complete))
+                } else {
+                    return .single(nil)
+                }
             } else {
                 return Signal { subscriber in
+                    var emittedFirstData = false
+                    if let miniData = representation?.immediateThumbnailData, let decodedData = decodeTinyThumbnail(data: miniData) {
+                        emittedFirstData = true
+                        subscriber.putNext((decodedData, .blurred))
+                    }
+
                     let resourceDataDisposable = resourceData.start(next: { data in
                         if data.complete {
-                            subscriber.putNext(try? Data(contentsOf: URL(fileURLWithPath: maybeData.path)))
+                            if let dataValue = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path)) {
+                                subscriber.putNext((dataValue, .complete))
+                            } else {
+                                subscriber.putNext(nil)
+                            }
                             subscriber.putCompletion()
                         } else {
-                            subscriber.putNext(nil)
+                            if !emittedFirstData {
+                                subscriber.putNext(nil)
+                            }
                         }
                     }, error: { error in
                         subscriber.putError(error)
@@ -64,12 +87,25 @@ public func peerAvatarImageData(account: Account, peerReference: PeerReference?,
     }
 }
 
-public func peerAvatarCompleteImage(account: Account, peer: Peer, size: CGSize) -> Signal<UIImage?, NoError> {
+public func peerAvatarCompleteImage(account: Account, peer: Peer, size: CGSize, round: Bool = true, font: UIFont = avatarPlaceholderFont(size: 13.0), drawLetters: Bool = true, fullSize: Bool = false, blurred: Bool = false) -> Signal<UIImage?, NoError> {
     let iconSignal: Signal<UIImage?, NoError>
-    if let signal = peerAvatarImage(account: account, peerReference: PeerReference(peer), authorOfMessage: nil, representation: peer.profileImageRepresentations.first, displayDimensions: size, inset: 0.0, emptyColor: nil, synchronousLoad: false) {
-        iconSignal = signal
+    if let signal = peerAvatarImage(account: account, peerReference: PeerReference(peer), authorOfMessage: nil, representation: peer.profileImageRepresentations.first, displayDimensions: size, round: round, blurred: blurred, inset: 0.0, emptyColor: nil, synchronousLoad: fullSize) {
+        if fullSize, let fullSizeSignal = peerAvatarImage(account: account, peerReference: PeerReference(peer), authorOfMessage: nil, representation: peer.profileImageRepresentations.last, displayDimensions: size, emptyColor: nil, synchronousLoad: true) {
+            iconSignal = combineLatest(.single(nil) |> then(signal), .single(nil) |> then(fullSizeSignal))
+            |> mapToSignal { thumbnailImage, fullSizeImage -> Signal<UIImage?, NoError> in
+                if let fullSizeImage = fullSizeImage {
+                    return .single(fullSizeImage.0)
+                } else if let thumbnailImage = thumbnailImage {
+                    return .single(thumbnailImage.0)
+                } else {
+                    return .complete()
+                }
+            }
+        } else {
+            iconSignal = signal
             |> map { imageVersions -> UIImage? in
                 return imageVersions?.0
+            }
         }
     } else {
         let peerId = peer.id
@@ -77,10 +113,17 @@ public func peerAvatarCompleteImage(account: Account, peer: Peer, size: CGSize)
         if displayLetters.count == 2 && displayLetters[0].isSingleEmoji && displayLetters[1].isSingleEmoji {
             displayLetters = [displayLetters[0]]
         }
+        if !drawLetters {
+            displayLetters = []
+        }
         iconSignal = Signal { subscriber in
             let image = generateImage(size, rotatedContext: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
-                drawPeerAvatarLetters(context: context, size: CGSize(width: size.width, height: size.height), font: avatarPlaceholderFont(size: 13.0), letters: displayLetters, peerId: peerId)
+                drawPeerAvatarLetters(context: context, size: CGSize(width: size.width, height: size.height), round: round, font: font, letters: displayLetters, peerId: peerId)
+                if blurred {
+                    context.setFillColor(UIColor(rgb: 0x000000, alpha: 0.5).cgColor)
+                    context.fill(CGRect(origin: CGPoint(), size: size))
+                }
             })?.withRenderingMode(.alwaysOriginal)
             
             subscriber.putNext(image)
@@ -91,7 +134,7 @@ public func peerAvatarCompleteImage(account: Account, peer: Peer, size: CGSize)
     return iconSignal
 }
 
-public func peerAvatarImage(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0), round: Bool = true, inset: CGFloat = 0.0, emptyColor: UIColor? = nil, synchronousLoad: Bool = false, provideUnrounded: Bool = false) -> Signal<(UIImage, UIImage)?, NoError>? {
+public func peerAvatarImage(account: Account, peerReference: PeerReference?, authorOfMessage: MessageReference?, representation: TelegramMediaImageRepresentation?, displayDimensions: CGSize = CGSize(width: 60.0, height: 60.0), round: Bool = true, blurred: Bool = false, inset: CGFloat = 0.0, emptyColor: UIColor? = nil, synchronousLoad: Bool = false, provideUnrounded: Bool = false) -> Signal<(UIImage, UIImage)?, NoError>? {
     if let imageData = peerAvatarImageData(account: account, peerReference: peerReference, authorOfMessage: authorOfMessage, representation: representation, synchronousLoad: synchronousLoad) {
         return imageData
         |> mapToSignal { data -> Signal<(UIImage, UIImage)?, NoError> in
@@ -100,8 +143,8 @@ public func peerAvatarImage(account: Account, peerReference: PeerReference?, aut
                     return .single(nil)
                 }
                 let roundedImage = generateImage(displayDimensions, contextGenerator: { size, context -> Void in
-                    if let data = data {
-                        if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
+                    if let (data, dataType) = data {
+                        if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), var dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
                             context.clear(CGRect(origin: CGPoint(), size: displayDimensions))
                             context.setBlendMode(.copy)
                             
@@ -109,8 +152,43 @@ public func peerAvatarImage(account: Account, peerReference: PeerReference?, aut
                                 context.addEllipse(in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset))
                                 context.clip()
                             }
+
+                            var shouldBlur = false
+                            if case .blurred = dataType {
+                                shouldBlur = true
+                            } else if blurred {
+                                shouldBlur = true
+                            }
+                            if shouldBlur {
+                                let imageContextSize = size.width > 200.0 ? CGSize(width: 192.0, height: 192.0) : CGSize(width: 64.0, height: 64.0)
+                                let imageContext = DrawingContext(size: imageContextSize, scale: 1.0, clear: true)
+                                imageContext.withFlippedContext { c in
+                                    c.draw(dataImage, in: CGRect(origin: CGPoint(), size: imageContextSize))
+                                    
+                                    context.setBlendMode(.saturation)
+                                    context.setFillColor(UIColor(rgb: 0xffffff, alpha: 1.0).cgColor)
+                                    context.fill(CGRect(origin: CGPoint(), size: size))
+                                    context.setBlendMode(.copy)
+                                }
+
+                                telegramFastBlurMore(Int32(imageContext.size.width * imageContext.scale), Int32(imageContext.size.height * imageContext.scale), Int32(imageContext.bytesPerRow), imageContext.bytes)
+                                if size.width > 200.0 {
+                                    telegramFastBlurMore(Int32(imageContext.size.width * imageContext.scale), Int32(imageContext.size.height * imageContext.scale), Int32(imageContext.bytesPerRow), imageContext.bytes)
+                                    telegramFastBlurMore(Int32(imageContext.size.width * imageContext.scale), Int32(imageContext.size.height * imageContext.scale), Int32(imageContext.bytesPerRow), imageContext.bytes)
+                                    telegramFastBlurMore(Int32(imageContext.size.width * imageContext.scale), Int32(imageContext.size.height * imageContext.scale), Int32(imageContext.bytesPerRow), imageContext.bytes)
+                                    telegramFastBlurMore(Int32(imageContext.size.width * imageContext.scale), Int32(imageContext.size.height * imageContext.scale), Int32(imageContext.bytesPerRow), imageContext.bytes)
+                                }
+                                
+                                dataImage = imageContext.generateImage()!.cgImage!
+                            }
                             
                             context.draw(dataImage, in: CGRect(origin: CGPoint(), size: displayDimensions).insetBy(dx: inset, dy: inset))
+                            if blurred {
+                                context.setBlendMode(.normal)
+                                context.setFillColor(UIColor(rgb: 0x000000, alpha: 0.45).cgColor)
+                                context.fill(CGRect(origin: CGPoint(), size: size))
+                                context.setBlendMode(.copy)
+                            }
                             if round {
                                 if displayDimensions.width == 60.0 {
                                     context.setBlendMode(.destinationOut)
@@ -141,7 +219,7 @@ public func peerAvatarImage(account: Account, peerReference: PeerReference?, aut
                 let unroundedImage: UIImage?
                 if provideUnrounded {
                     unroundedImage = generateImage(displayDimensions, contextGenerator: { size, context -> Void in
-                        if let data = data {
+                        if let (data, _) = data {
                             if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
                                 context.clear(CGRect(origin: CGPoint(), size: displayDimensions))
                                 context.setBlendMode(.copy)
diff --git a/submodules/BotPaymentsUI/BUILD b/submodules/BotPaymentsUI/BUILD
index f7213427bf..d917b67fe4 100644
--- a/submodules/BotPaymentsUI/BUILD
+++ b/submodules/BotPaymentsUI/BUILD
@@ -22,6 +22,8 @@ swift_library(
         "//submodules/CountrySelectionUI:CountrySelectionUI",
         "//submodules/AppBundle:AppBundle",
         "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/ShimmerEffect:ShimmerEffect",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift
index 70ccb3b58e..e784f933b6 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutActionButton.swift
@@ -3,103 +3,49 @@ import UIKit
 import AsyncDisplayKit
 import Display
 import PassKit
+import ShimmerEffect
 
 enum BotCheckoutActionButtonState: Equatable {
-    case loading
     case active(String)
-    case inactive(String)
     case applePay
-    
-    static func ==(lhs: BotCheckoutActionButtonState, rhs: BotCheckoutActionButtonState) -> Bool {
-        switch lhs {
-            case .loading:
-                if case .loading = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case let .active(title):
-                if case .active(title) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case let .inactive(title):
-                if case .inactive(title) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case .applePay:
-                if case .applePay = rhs {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
+    case placeholder
 }
 
 private let titleFont = Font.semibold(17.0)
 
 final class BotCheckoutActionButton: HighlightableButtonNode {
-    static var diameter: CGFloat = 48.0
-    
-    private var inactiveFillColor: UIColor
+    static var height: CGFloat = 52.0
+
     private var activeFillColor: UIColor
     private var foregroundColor: UIColor
-    
-    private let progressBackgroundNode: ASImageNode
-    private let inactiveBackgroundNode: ASImageNode
+
     private let activeBackgroundNode: ASImageNode
     private var applePayButton: UIButton?
     private let labelNode: TextNode
     
     private var state: BotCheckoutActionButtonState?
-    private var validLayout: CGSize?
+    private var validLayout: (CGRect, CGSize)?
+
+    private var placeholderNode: ShimmerEffectNode?
     
-    init(inactiveFillColor: UIColor, activeFillColor: UIColor, foregroundColor: UIColor) {
-        self.inactiveFillColor = inactiveFillColor
+    init(activeFillColor: UIColor, foregroundColor: UIColor) {
         self.activeFillColor = activeFillColor
         self.foregroundColor = foregroundColor
-        
-        self.progressBackgroundNode = ASImageNode()
-        self.progressBackgroundNode.displaysAsynchronously = false
-        self.progressBackgroundNode.displayWithoutProcessing = true
-        self.progressBackgroundNode.isLayerBacked = true
-        self.progressBackgroundNode.image = generateImage(CGSize(width: BotCheckoutActionButton.diameter, height: BotCheckoutActionButton.diameter), rotatedContext: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            let strokeWidth: CGFloat = 2.0
-            context.setFillColor(activeFillColor.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
-            
-            context.setFillColor(inactiveFillColor.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: strokeWidth, y: strokeWidth), size: CGSize(width: size.width - strokeWidth * 2.0, height: size.height - strokeWidth * 2.0)))
-            let cutout: CGFloat = 10.0
-            context.fill(CGRect(origin: CGPoint(x: floor((size.width - cutout) / 2.0), y: 0.0), size: CGSize(width: cutout, height: cutout)))
-        })
-        
-        self.inactiveBackgroundNode = ASImageNode()
-        self.inactiveBackgroundNode.displaysAsynchronously = false
-        self.inactiveBackgroundNode.displayWithoutProcessing = true
-        self.inactiveBackgroundNode.isLayerBacked = true
-        self.inactiveBackgroundNode.image = generateStretchableFilledCircleImage(diameter: BotCheckoutActionButton.diameter, color: self.foregroundColor, strokeColor: activeFillColor, strokeWidth: 2.0)
-        self.inactiveBackgroundNode.alpha = 0.0
+
+        let diameter: CGFloat = 20.0
         
         self.activeBackgroundNode = ASImageNode()
         self.activeBackgroundNode.displaysAsynchronously = false
         self.activeBackgroundNode.displayWithoutProcessing = true
         self.activeBackgroundNode.isLayerBacked = true
-        self.activeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: BotCheckoutActionButton.diameter, color: activeFillColor)
+        self.activeBackgroundNode.image = generateStretchableFilledCircleImage(diameter: diameter, color: activeFillColor)
         
         self.labelNode = TextNode()
         self.labelNode.displaysAsynchronously = false
         self.labelNode.isUserInteractionEnabled = false
         
         super.init()
-        
-        self.addSubnode(self.progressBackgroundNode)
-        self.addSubnode(self.inactiveBackgroundNode)
+
         self.addSubnode(self.activeBackgroundNode)
         self.addSubnode(self.labelNode)
     }
@@ -109,151 +55,91 @@ final class BotCheckoutActionButton: HighlightableButtonNode {
             let previousState = self.state
             self.state = state
             
-            if let validLayout = self.validLayout, let previousState = previousState {
-                switch state {
-                    case .loading:
-                        self.inactiveBackgroundNode.layer.animateFrame(from: self.inactiveBackgroundNode.frame, to: self.progressBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                        if !self.inactiveBackgroundNode.alpha.isZero {
-                            self.inactiveBackgroundNode.alpha = 0.0
-                            self.inactiveBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                        }
-                        self.activeBackgroundNode.layer.animateFrame(from: self.activeBackgroundNode.frame, to: self.progressBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                        self.activeBackgroundNode.alpha = 0.0
-                        self.activeBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                        self.labelNode.alpha = 0.0
-                        self.labelNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                        
-                        self.progressBackgroundNode.alpha = 1.0
-                        self.progressBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-                    
-                        let basicAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
-                        basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
-                        basicAnimation.duration = 0.8
-                        basicAnimation.fromValue = NSNumber(value: Float(0.0))
-                        basicAnimation.toValue = NSNumber(value: Float.pi * 2.0)
-                        basicAnimation.repeatCount = Float.infinity
-                        basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
-                        
-                        self.progressBackgroundNode.layer.add(basicAnimation, forKey: "progressRotation")
-                    case let .active(title):
-                        if case .active = previousState {
-                            let makeLayout = TextNode.asyncLayout(self.labelNode)
-                            let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                            self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
-                            let _ = labelApply()
-                        } else {
-                            self.inactiveBackgroundNode.layer.animateFrame(from: self.progressBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                            self.inactiveBackgroundNode.alpha = 1.0
-                            self.progressBackgroundNode.alpha = 0.0
-                            
-                            self.activeBackgroundNode.layer.animateFrame(from: self.progressBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                            self.activeBackgroundNode.alpha = 1.0
-                            self.activeBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-                        
-                            let makeLayout = TextNode.asyncLayout(self.labelNode)
-                            let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                            self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
-                            let _ = labelApply()
-                            self.labelNode.alpha = 1.0
-                            self.labelNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-                        }
-                    case let .inactive(title):
-                        if case .inactive = previousState {
-                            let makeLayout = TextNode.asyncLayout(self.labelNode)
-                            let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.activeFillColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                            self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
-                            let _ = labelApply()
-                        } else {
-                            self.inactiveBackgroundNode.layer.animateFrame(from: self.inactiveBackgroundNode.frame, to: self.activeBackgroundNode.frame, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                            self.inactiveBackgroundNode.alpha = 1.0
-                            self.progressBackgroundNode.alpha = 0.0
-                            
-                            self.activeBackgroundNode.alpha = 0.0
-                            
-                            let makeLayout = TextNode.asyncLayout(self.labelNode)
-                            let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: validLayout, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                            self.labelNode.frame = CGRect(origin: CGPoint(x: floor((validLayout.width - labelLayout.size.width) / 2.0), y: floor((validLayout.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
-                            let _ = labelApply()
-                            self.labelNode.alpha = 1.0
-                            self.labelNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-                        }
-                    case .applePay:
-                        if case .applePay = previousState {
-                            
-                        } else {
-                            
-                        }
-                }
-            } else {
-                switch state {
-                    case .loading:
-                        self.labelNode.alpha = 0.0
-                        self.progressBackgroundNode.alpha = 1.0
-                        self.activeBackgroundNode.alpha = 0.0
-                    
-                        let basicAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
-                        basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
-                        basicAnimation.duration = 0.8
-                        basicAnimation.fromValue = NSNumber(value: Float(0.0))
-                        basicAnimation.toValue = NSNumber(value: Float.pi * 2.0)
-                        basicAnimation.repeatCount = Float.infinity
-                        basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear)
-                        
-                        self.progressBackgroundNode.layer.add(basicAnimation, forKey: "progressRotation")
-                    case .active:
-                        self.labelNode.alpha = 1.0
-                        self.progressBackgroundNode.alpha = 0.0
-                        self.inactiveBackgroundNode.alpha = 0.0
-                        self.activeBackgroundNode.alpha = 1.0
-                    case .inactive:
-                        self.labelNode.alpha = 1.0
-                        self.progressBackgroundNode.alpha = 0.0
-                        self.inactiveBackgroundNode.alpha = 1.0
-                        self.activeBackgroundNode.alpha = 0.0
-                    case .applePay:
-                        self.labelNode.alpha = 0.0
-                        self.progressBackgroundNode.alpha = 0.0
-                        self.inactiveBackgroundNode.alpha = 0.0
-                        self.activeBackgroundNode.alpha = 0.0
-                        if self.applePayButton == nil {
-                            if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
-                                let applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black)
-                                self.view.addSubview(applePayButton)
-                                self.applePayButton = applePayButton
-                            }
-                        }
-                }
+            if let (absoluteRect, containerSize) = self.validLayout, let previousState = previousState {
+                self.updateLayout(absoluteRect: absoluteRect, containerSize: containerSize, transition: .immediate)
             }
         }
     }
+
+    @objc private func applePayButtonPressed() {
+        self.sendActions(forControlEvents: .touchUpInside, with: nil)
+    }
     
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
-        self.validLayout = size
-        
-        transition.updateFrame(node: self.progressBackgroundNode, frame: CGRect(origin: CGPoint(x: floor((size.width - BotCheckoutActionButton.diameter) / 2.0), y: 0.0), size: CGSize(width: BotCheckoutActionButton.diameter, height: BotCheckoutActionButton.diameter)))
-        transition.updateFrame(node: self.inactiveBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter)))
-        transition.updateFrame(node: self.activeBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter)))
-        if let applePayButton = self.applePayButton {
-            applePayButton.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.diameter))
-        }
+    func updateLayout(absoluteRect: CGRect, containerSize: CGSize, transition: ContainedViewLayoutTransition) {
+        let size = absoluteRect.size
+
+        self.validLayout = (absoluteRect, containerSize)
+
+        transition.updateFrame(node: self.activeBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.height)))
         
         var labelSize = self.labelNode.bounds.size
         if let state = self.state {
             switch state {
-                case let .active(title):
-                    let makeLayout = TextNode.asyncLayout(self.labelNode)
-                    let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                    let _ = labelApply()
-                    labelSize = labelLayout.size
-                case let .inactive(title):
-                    let makeLayout = TextNode.asyncLayout(self.labelNode)
-                    let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.activeFillColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-                    let _ = labelApply()
-                    labelSize = labelLayout.size
-                default:
-                    break
+            case let .active(title):
+                if let applePayButton = self.applePayButton {
+                    self.applePayButton = nil
+                    applePayButton.removeFromSuperview()
+                }
+
+                if let placeholderNode = self.placeholderNode {
+                    self.placeholderNode = nil
+                    placeholderNode.removeFromSupernode()
+                }
+
+                let makeLayout = TextNode.asyncLayout(self.labelNode)
+                let (labelLayout, labelApply) = makeLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor: self.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: size, alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+                let _ = labelApply()
+                labelSize = labelLayout.size
+            case .applePay:
+                if self.applePayButton == nil {
+                    if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
+                        let applePayButton: PKPaymentButton
+                        if #available(iOS 14.0, *) {
+                            applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black)
+                        } else {
+                            applePayButton = PKPaymentButton(paymentButtonType: .buy, paymentButtonStyle: .black)
+                        }
+                        applePayButton.addTarget(self, action: #selector(self.applePayButtonPressed), for: .touchUpInside)
+                        self.view.addSubview(applePayButton)
+                        self.applePayButton = applePayButton
+                    }
+                }
+
+                if let placeholderNode = self.placeholderNode {
+                    self.placeholderNode = nil
+                    placeholderNode.removeFromSupernode()
+                }
+
+                if let applePayButton = self.applePayButton {
+                    applePayButton.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: BotCheckoutActionButton.height))
+                }
+            case .placeholder:
+                if let applePayButton = self.applePayButton {
+                    self.applePayButton = nil
+                    applePayButton.removeFromSuperview()
+                }
+
+                let contentSize = CGSize(width: 80.0, height: 8.0)
+
+                let shimmerNode: ShimmerEffectNode
+                if let current = self.placeholderNode {
+                    shimmerNode = current
+                } else {
+                    shimmerNode = ShimmerEffectNode()
+                    self.placeholderNode = shimmerNode
+                    self.addSubnode(shimmerNode)
+                }
+                shimmerNode.frame = CGRect(origin: CGPoint(x: floor((size.width - contentSize.width) / 2.0), y: floor((size.height - contentSize.height) / 2.0)), size: contentSize)
+                shimmerNode.updateAbsoluteRect(CGRect(origin: CGPoint(x: absoluteRect.minX + shimmerNode.frame.minX, y: absoluteRect.minY + shimmerNode.frame.minY), size: contentSize), within: containerSize)
+
+                var shapes: [ShimmerEffectNode.Shape] = []
+
+                shapes.append(.roundedRectLine(startPoint: CGPoint(x: 0.0, y: 0.0), width: contentSize.width, diameter: contentSize.height))
+
+                shimmerNode.update(backgroundColor: self.activeFillColor, foregroundColor: self.activeFillColor.mixedWith(UIColor.white, alpha: 0.25), shimmeringColor: self.activeFillColor.mixedWith(UIColor.white, alpha: 0.15), shapes: shapes, size: contentSize)
             }
         }
+        
         transition.updateFrame(node: self.labelNode, frame: CGRect(origin: CGPoint(x: floor((size.width - labelSize.width) / 2.0), y: floor((size.height - labelSize.height) / 2.0)), size: labelSize))
     }
 }
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift
index c79efa6d0a..0c67b6e05c 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutController.swift
@@ -10,6 +10,64 @@ import TelegramPresentationData
 import AccountContext
 
 public final class BotCheckoutController: ViewController {
+    public final class InputData {
+        public enum FetchError {
+            case generic
+        }
+
+        let form: BotPaymentForm
+        let validatedFormInfo: BotPaymentValidatedFormInfo?
+
+        private init(
+            form: BotPaymentForm,
+            validatedFormInfo: BotPaymentValidatedFormInfo?
+        ) {
+            self.form = form
+            self.validatedFormInfo = validatedFormInfo
+        }
+
+        public static func fetch(context: AccountContext, messageId: MessageId) -> Signal<InputData, FetchError> {
+            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+            let themeParams: [String: Any] = [
+                "bg_color": Int32(bitPattern: presentationData.theme.list.plainBackgroundColor.argb),
+                "text_color": Int32(bitPattern: presentationData.theme.list.itemPrimaryTextColor.argb),
+                "link_color": Int32(bitPattern: presentationData.theme.list.itemAccentColor.argb),
+                "button_color": Int32(bitPattern: presentationData.theme.list.itemCheckColors.fillColor.argb),
+                "button_text_color": Int32(bitPattern: presentationData.theme.list.itemCheckColors.foregroundColor.argb)
+            ]
+
+            return context.engine.payments.fetchBotPaymentForm(messageId: messageId, themeParams: themeParams)
+            |> mapError { _ -> FetchError in
+                return .generic
+            }
+            |> mapToSignal { paymentForm -> Signal<InputData, FetchError> in
+                if let current = paymentForm.savedInfo {
+                    return context.engine.payments.validateBotPaymentForm(saveInfo: true, messageId: messageId, formInfo: current)
+                    |> mapError { _ -> FetchError in
+                        return .generic
+                    }
+                    |> map { result -> InputData in
+                        return InputData(
+                            form: paymentForm,
+                            validatedFormInfo: result
+                        )
+                    }
+                    |> `catch` { _ -> Signal<InputData, FetchError> in
+                        return .single(InputData(
+                            form: paymentForm,
+                            validatedFormInfo: nil
+                        ))
+                    }
+                } else {
+                    return .single(InputData(
+                        form: paymentForm,
+                        validatedFormInfo: nil
+                    ))
+                }
+            }
+        }
+    }
+
     private var controllerNode: BotCheckoutControllerNode {
         return self.displayNode as! BotCheckoutControllerNode
     }
@@ -22,15 +80,20 @@ public final class BotCheckoutController: ViewController {
     private let context: AccountContext
     private let invoice: TelegramMediaInvoice
     private let messageId: MessageId
+    private let completed: (String, MessageId?) -> Void
     
     private var presentationData: PresentationData
     
     private var didPlayPresentationAnimation = false
+
+    private let inputData: Promise<BotCheckoutController.InputData?>
     
-    public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId) {
+    public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, inputData: Promise<BotCheckoutController.InputData?>, completed: @escaping (String, MessageId?) -> Void) {
         self.context = context
         self.invoice = invoice
         self.messageId = messageId
+        self.inputData = inputData
+        self.completed = completed
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
@@ -52,15 +115,11 @@ public final class BotCheckoutController: ViewController {
     }
     
     override public func loadDisplayNode() {
-        let displayNode = BotCheckoutControllerNode(controller: nil, navigationBar: self.navigationBar!, updateNavigationOffset: { [weak self] offset in
-            if let strongSelf = self {
-                strongSelf.navigationOffset = offset
-            }
-        }, context: self.context, invoice: self.invoice, messageId: self.messageId, present: { [weak self] c, a in
+        let displayNode = BotCheckoutControllerNode(controller: self, navigationBar: self.navigationBar!, context: self.context, invoice: self.invoice, messageId: self.messageId, inputData: self.inputData, present: { [weak self] c, a in
             self?.present(c, in: .window(.root), with: a)
         }, dismissAnimated: { [weak self] in
             self?.dismiss()
-        })
+        }, completed: self.completed)
         
         //displayNode.enableInteractiveDismiss = true
         
@@ -87,7 +146,7 @@ public final class BotCheckoutController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition, additionalInsets: UIEdgeInsets())
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition, additionalInsets: UIEdgeInsets())
     }
     
     @objc private func cancelPressed() {
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift
index c8b6f77fa2..2f44761fc7 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutControllerNode.swift
@@ -18,18 +18,23 @@ import TelegramStringFormatting
 import PasswordSetupUI
 import Stripe
 import LocalAuth
+import OverlayStatusController
 
 final class BotCheckoutControllerArguments {
     fileprivate let account: Account
     fileprivate let openInfo: (BotCheckoutInfoControllerFocus) -> Void
     fileprivate let openPaymentMethod: () -> Void
     fileprivate let openShippingMethod: () -> Void
+    fileprivate let updateTip: (Int64) -> Void
+    fileprivate let ensureTipInputVisible: () -> Void
     
-    fileprivate init(account: Account, openInfo: @escaping (BotCheckoutInfoControllerFocus) -> Void, openPaymentMethod: @escaping () -> Void, openShippingMethod: @escaping () -> Void) {
+    fileprivate init(account: Account, openInfo: @escaping (BotCheckoutInfoControllerFocus) -> Void, openPaymentMethod: @escaping () -> Void, openShippingMethod: @escaping () -> Void, updateTip: @escaping (Int64) -> Void, ensureTipInputVisible: @escaping () -> Void) {
         self.account = account
         self.openInfo = openInfo
         self.openPaymentMethod = openPaymentMethod
         self.openShippingMethod = openShippingMethod
+        self.updateTip = updateTip
+        self.ensureTipInputVisible = ensureTipInputVisible
     }
 }
 
@@ -40,44 +45,88 @@ private enum BotCheckoutSection: Int32 {
 }
 
 enum BotCheckoutEntry: ItemListNodeEntry {
+    enum StableId: Hashable {
+        case header
+        case price(Int)
+        case actionPlaceholder(Int)
+        case tip
+        case paymentMethod
+        case shippingInfo
+        case shippingMethod
+        case nameInfo
+        case emailInfo
+        case phoneInfo
+    }
+
     case header(PresentationTheme, TelegramMediaInvoice, String)
-    case price(Int, PresentationTheme, String, String, Bool)
+    case price(Int, PresentationTheme, String, String, Bool, Bool, Int?)
+    case tip(Int, PresentationTheme, String, String, String, Int64, Int64, [(String, Int64)])
     case paymentMethod(PresentationTheme, String, String)
     case shippingInfo(PresentationTheme, String, String)
     case shippingMethod(PresentationTheme, String, String)
     case nameInfo(PresentationTheme, String, String)
     case emailInfo(PresentationTheme, String, String)
     case phoneInfo(PresentationTheme, String, String)
+    case actionPlaceholder(Int, Int)
     
     var section: ItemListSectionId {
         switch self {
             case .header:
-                return BotCheckoutSection.header.rawValue
-            case .price:
+                return BotCheckoutSection.prices.rawValue
+            case .price, .tip:
                 return BotCheckoutSection.prices.rawValue
             default:
                 return BotCheckoutSection.info.rawValue
         }
     }
     
-    var stableId: Int32 {
+    var sortId: Int32 {
         switch self {
             case .header:
                 return 0
-            case let .price(index, _, _, _, _):
+            case let .price(index, _, _, _, _, _, _):
+                return 1 + Int32(index)
+            case let .tip(index, _, _, _, _, _, _, _):
+                return 1 + Int32(index)
+            case let .actionPlaceholder(index, _):
                 return 1 + Int32(index)
             case .paymentMethod:
-                return 10000 + 0
-            case .shippingInfo:
-                return 10000 + 1
-            case .shippingMethod:
                 return 10000 + 2
-            case .nameInfo:
+            case .shippingInfo:
                 return 10000 + 3
-            case .emailInfo:
+            case .shippingMethod:
                 return 10000 + 4
-            case .phoneInfo:
+            case .nameInfo:
                 return 10000 + 5
+            case .emailInfo:
+                return 10000 + 6
+            case .phoneInfo:
+                return 10000 + 7
+        }
+    }
+
+    var stableId: StableId {
+        switch self {
+            case .header:
+                return .header
+            case let .price(index, _, _, _, _, _, _):
+                return .price(index)
+            case .tip:
+                return .tip
+            case let .actionPlaceholder(index, _):
+                return .actionPlaceholder(index)
+            case .paymentMethod:
+                return .paymentMethod
+            case .shippingInfo:
+                return .shippingInfo
+            case .shippingMethod:
+                return .shippingMethod
+            case .nameInfo:
+                return .nameInfo
+            case .emailInfo:
+                return .emailInfo
+            case .phoneInfo:
+                return .phoneInfo
         }
     }
     
@@ -98,8 +147,8 @@ enum BotCheckoutEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal):
-                if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal) = rhs {
+            case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal, lhsHasSeparator, lhsShimmeringIndex):
+                if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal, rhsHasSeparator, rhsShimmeringIndex) = rhs {
                     if lhsIndex != rhsIndex {
                         return false
                     }
@@ -115,6 +164,29 @@ enum BotCheckoutEntry: ItemListNodeEntry {
                     if lhsFinal != rhsFinal {
                         return false
                     }
+                    if lhsHasSeparator != rhsHasSeparator {
+                        return false
+                    }
+                    if lhsShimmeringIndex != rhsShimmeringIndex {
+                        return false
+                    }
+                    return true
+                } else {
+                    return false
+                }
+            case let .tip(lhsIndex, lhsTheme, lhsText, lhsCurrency, lhsValue, lhsNumericValue, lhsMaxValue, lhsVariants):
+                if case let .tip(rhsIndex, rhsTheme, rhsText, rhsCurrency, rhsValue, rhsNumericValue, rhsMaxValue, rhsVariants) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsText == rhsText, lhsCurrency == rhsCurrency, lhsValue == rhsValue, lhsNumericValue == rhsNumericValue, lhsMaxValue == rhsMaxValue {
+                    if lhsVariants.count != rhsVariants.count {
+                        return false
+                    }
+                    for i in 0 ..< lhsVariants.count {
+                        if lhsVariants[i].0 != rhsVariants[i].0 {
+                            return false
+                        }
+                        if lhsVariants[i].1 != rhsVariants[i].1 {
+                            return false
+                        }
+                    }
                     return true
                 } else {
                     return false
@@ -155,11 +227,17 @@ enum BotCheckoutEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
+            case let .actionPlaceholder(index, shimmeringIndex):
+                if case .actionPlaceholder(index, shimmeringIndex) = rhs {
+                    return true
+                } else {
+                    return false
+                }
         }
     }
     
     static func <(lhs: BotCheckoutEntry, rhs: BotCheckoutEntry) -> Bool {
-        return lhs.stableId < rhs.stableId
+        return lhs.sortId < rhs.sortId
     }
     
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
@@ -167,32 +245,43 @@ enum BotCheckoutEntry: ItemListNodeEntry {
         switch self {
             case let .header(theme, invoice, botName):
                 return BotCheckoutHeaderItem(account: arguments.account, theme: theme, invoice: invoice, botName: botName, sectionId: self.section)
-            case let .price(_, theme, text, value, isFinal):
-                return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, sectionId: self.section)
-            case let .paymentMethod(theme, text, value):
+            case let .price(_, theme, text, value, isFinal, hasSeparator, shimmeringIndex):
+                return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, hasSeparator: hasSeparator, shimmeringIndex: shimmeringIndex, sectionId: self.section)
+            case let .tip(_, _, text, currency, value, numericValue, maxValue, variants):
+                return BotCheckoutTipItem(theme: presentationData.theme, strings: presentationData.strings, title: text, currency: currency, value: value, numericValue: numericValue, maxValue: maxValue, availableVariants: variants, sectionId: self.section, updateValue: { value in
+                    arguments.updateTip(value)
+                }, updatedFocus: { isFocused in
+                    if isFocused {
+                        arguments.ensureTipInputVisible()
+                    }
+                })
+            case let .paymentMethod(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openPaymentMethod()
                 })
-            case let .shippingInfo(theme, text, value):
+            case let .shippingInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openInfo(.address(.street1))
                 })
-            case let .shippingMethod(theme, text, value):
+            case let .shippingMethod(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openShippingMethod()
                 })
-            case let .nameInfo(theme, text, value):
+            case let .nameInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openInfo(.name)
                 })
-            case let .emailInfo(theme, text, value):
+            case let .emailInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openInfo(.email)
                 })
-            case let .phoneInfo(theme, text, value):
+            case let .phoneInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .arrow, action: {
                     arguments.openInfo(.phone)
                 })
+            case let .actionPlaceholder(_, shimmeringIndex):
+                return ItemListDisclosureItem(presentationData: presentationData, title: " ", label: " ", sectionId: self.section, style: .blocks, disclosureStyle: .none, action: {
+                }, shimmeringIndex: shimmeringIndex)
         }
     }
 }
@@ -206,12 +295,16 @@ private struct BotCheckoutControllerState: Equatable {
     }
 }
 
-private func currentTotalPrice(paymentForm: BotPaymentForm?, validatedFormInfo: BotPaymentValidatedFormInfo?, currentShippingOptionId: String?) -> Int64 {
+private func currentTotalPrice(paymentForm: BotPaymentForm?, validatedFormInfo: BotPaymentValidatedFormInfo?, currentShippingOptionId: String?, currentTip: Int64?) -> Int64 {
     guard let paymentForm = paymentForm else {
         return 0
     }
     
     var totalPrice: Int64 = 0
+
+    if let currentTip = currentTip {
+        totalPrice += currentTip
+    }
     
     var index = 0
     for price in paymentForm.invoice.prices {
@@ -235,7 +328,7 @@ private func currentTotalPrice(paymentForm: BotPaymentForm?, validatedFormInfo:
     return totalPrice
 }
 
-private func botCheckoutControllerEntries(presentationData: PresentationData, state: BotCheckoutControllerState, invoice: TelegramMediaInvoice, paymentForm: BotPaymentForm?, formInfo: BotPaymentRequestedInfo?, validatedFormInfo: BotPaymentValidatedFormInfo?, currentShippingOptionId: String?, currentPaymentMethod: BotCheckoutPaymentMethod?, botPeer: Peer?) -> [BotCheckoutEntry] {
+private func botCheckoutControllerEntries(presentationData: PresentationData, state: BotCheckoutControllerState, invoice: TelegramMediaInvoice, paymentForm: BotPaymentForm?, formInfo: BotPaymentRequestedInfo?, validatedFormInfo: BotPaymentValidatedFormInfo?, currentShippingOptionId: String?, currentPaymentMethod: BotCheckoutPaymentMethod?, currentTip: Int64?, botPeer: Peer?) -> [BotCheckoutEntry] {
     var entries: [BotCheckoutEntry] = []
     
     var botName = ""
@@ -246,10 +339,14 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st
     
     if let paymentForm = paymentForm {
         var totalPrice: Int64 = 0
+
+        if let currentTip = currentTip {
+            totalPrice += currentTip
+        }
         
         var index = 0
         for price in paymentForm.invoice.prices {
-            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false))
+            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false, index == 0, nil))
             totalPrice += price.amount
             index += 1
         }
@@ -263,7 +360,7 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st
                         shippingOptionString = option.title
                         
                         for price in option.prices {
-                            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false))
+                            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: paymentForm.invoice.currency), false, false, nil))
                             totalPrice += price.amount
                             index += 1
                         }
@@ -273,8 +370,26 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st
                 }
             }
         }
+
+        if !entries.isEmpty {
+            switch entries[entries.count - 1] {
+            case let .price(index, theme, title, value, _, _, _):
+                entries[entries.count - 1] = .price(index, theme, title, value, false, index == 0, nil)
+            default:
+                break
+            }
+        }
+
+        if let tip = paymentForm.invoice.tip {
+            let tipTitle: String
+            tipTitle = presentationData.strings.Checkout_OptionalTipItem
+            entries.append(.tip(index, presentationData.theme, tipTitle, paymentForm.invoice.currency, "\(formatCurrencyAmount(currentTip ?? 0, currency: paymentForm.invoice.currency))", currentTip ?? 0, tip.max, tip.suggested.map { item -> (String, Int64) in
+                return ("\(formatCurrencyAmount(item, currency: paymentForm.invoice.currency))", item)
+            }))
+            index += 1
+        }
         
-        entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: paymentForm.invoice.currency), true))
+        entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: paymentForm.invoice.currency), true, true, nil))
         
         var paymentMethodTitle = ""
         if let currentPaymentMethod = currentPaymentMethod {
@@ -317,6 +432,15 @@ private func botCheckoutControllerEntries(presentationData: PresentationData, st
         if paymentForm.invoice.requestedFields.contains(.phone) {
             entries.append(.phoneInfo(presentationData.theme, presentationData.strings.Checkout_Phone, formInfo?.phone ?? ""))
         }
+    } else {
+        let numItems = 4
+        for index in 0 ..< numItems {
+            entries.append(.price(index, presentationData.theme, " ", " ", false, index == 0, index))
+        }
+
+        for index in numItems ..< numItems + 2 {
+            entries.append(.actionPlaceholder(index, index - numItems))
+        }
     }
     
     return entries
@@ -336,7 +460,8 @@ private func formSupportApplePay(_ paymentForm: BotPaymentForm) -> Bool {
         "sberbank",
         "yandex",
         "privatbank",
-        "tranzzo"
+        "tranzzo",
+        "paymaster"
     ])
     if !applePayProviders.contains(nativeProvider.name) {
         return false
@@ -368,14 +493,21 @@ private func availablePaymentMethods(form: BotPaymentForm, current: BotCheckoutP
             methods.append(current)
         }
     }
+    if let savedCredentials = form.savedCredentials {
+        if !methods.contains(.savedCredentials(savedCredentials)) {
+            methods.append(.savedCredentials(savedCredentials))
+        }
+    }
     return methods
 }
 
 final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthorizationViewControllerDelegate {
+    private weak var controller: BotCheckoutController?
     private let context: AccountContext
     private let messageId: MessageId
     private let present: (ViewController, Any?) -> Void
     private let dismissAnimated: () -> Void
+    private let completed: (String, MessageId?) -> Void
     
     private var stateValue = BotCheckoutControllerState()
     private let state = ValuePromise(BotCheckoutControllerState(), ignoreRepeated: true)
@@ -383,33 +515,44 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
     
     private var presentationData: PresentationData
     
-    private let paymentFormAndInfo = Promise<(BotPaymentForm, BotPaymentRequestedInfo, BotPaymentValidatedFormInfo?, String?, BotCheckoutPaymentMethod?)?>(nil)
+    private let paymentFormAndInfo = Promise<(BotPaymentForm, BotPaymentRequestedInfo, BotPaymentValidatedFormInfo?, String?, BotCheckoutPaymentMethod?, Int64?)?>(nil)
     private var paymentFormValue: BotPaymentForm?
     private var currentFormInfo: BotPaymentRequestedInfo?
     private var currentValidatedFormInfo: BotPaymentValidatedFormInfo?
     private var currentShippingOptionId: String?
     private var currentPaymentMethod: BotCheckoutPaymentMethod?
+    private var currentTipAmount: Int64?
     private var formRequestDisposable: Disposable?
-    
+
+    private let actionButtonPanelNode: ASDisplayNode
+    private let actionButtonPanelSeparator: ASDisplayNode
     private let actionButton: BotCheckoutActionButton
     private let inProgressDimNode: ASDisplayNode
+    private var statusController: ViewController?
     
     private let payDisposable = MetaDisposable()
     private let paymentAuthDisposable = MetaDisposable()
     private var applePayAuthrorizationCompletion: ((PKPaymentAuthorizationStatus) -> Void)?
     private var applePayController: PKPaymentAuthorizationViewController?
+
+    private var passwordTip: String?
+    private var passwordTipDisposable: Disposable?
     
-    init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, present: @escaping (ViewController, Any?) -> Void, dismissAnimated: @escaping () -> Void) {
+    init(controller: BotCheckoutController?, navigationBar: NavigationBar, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, inputData: Promise<BotCheckoutController.InputData?>, present: @escaping (ViewController, Any?) -> Void, dismissAnimated: @escaping () -> Void, completed: @escaping (String, MessageId?) -> Void) {
+        self.controller = controller
         self.context = context
         self.messageId = messageId
         self.present = present
         self.dismissAnimated = dismissAnimated
+        self.completed = completed
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
         var openInfoImpl: ((BotCheckoutInfoControllerFocus) -> Void)?
+        var updateTipImpl: ((Int64) -> Void)?
         var openPaymentMethodImpl: (() -> Void)?
         var openShippingMethodImpl: (() -> Void)?
+        var ensureTipInputVisibleImpl: (() -> Void)?
         
         let arguments = BotCheckoutControllerArguments(account: context.account, openInfo: { item in
             openInfoImpl?(item)
@@ -417,29 +560,51 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
             openPaymentMethodImpl?()
         }, openShippingMethod: {
             openShippingMethodImpl?()
+        }, updateTip: { value in
+            updateTipImpl?(value)
+        }, ensureTipInputVisible: {
+            ensureTipInputVisibleImpl?()
         })
-        
-        let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(context.sharedContext.presentationData, self.state.get(), paymentFormAndInfo.get(), context.account.postbox.loadedPeerWithId(messageId.peerId))
-            |> map { presentationData, state, paymentFormAndInfo, botPeer -> (ItemListPresentationData, (ItemListNodeState, Any)) in
-            let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botCheckoutControllerEntries(presentationData: presentationData, state: state, invoice: invoice, paymentForm: paymentFormAndInfo?.0, formInfo: paymentFormAndInfo?.1, validatedFormInfo: paymentFormAndInfo?.2, currentShippingOptionId: paymentFormAndInfo?.3, currentPaymentMethod: paymentFormAndInfo?.4, botPeer: botPeer), style: .plain, focusItemTag: nil, emptyStateItem: nil, animateChanges: false)
-            
-            return (ItemListPresentationData(presentationData), (nodeState, arguments))
+
+        let paymentBotPeer = paymentFormAndInfo.get()
+        |> map { paymentFormAndInfo -> PeerId? in
+            return paymentFormAndInfo?.0.paymentBotId
+        }
+        |> distinctUntilChanged
+        |> mapToSignal { peerId -> Signal<Peer?, NoError> in
+            return context.account.postbox.transaction { transaction -> Peer? in
+                return peerId.flatMap(transaction.getPeer)
+            }
         }
         
-        self.actionButton = BotCheckoutActionButton(inactiveFillColor: self.presentationData.theme.list.plainBackgroundColor, activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.itemCheckColors.foregroundColor)
-        self.actionButton.setState(.loading)
+        let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, self.state.get(), paymentFormAndInfo.get(), paymentBotPeer)
+        |> map { presentationData, state, paymentFormAndInfo, botPeer -> (ItemListPresentationData, (ItemListNodeState, Any)) in
+            let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botCheckoutControllerEntries(presentationData: presentationData, state: state, invoice: invoice, paymentForm: paymentFormAndInfo?.0, formInfo: paymentFormAndInfo?.1, validatedFormInfo: paymentFormAndInfo?.2, currentShippingOptionId: paymentFormAndInfo?.3, currentPaymentMethod: paymentFormAndInfo?.4, currentTip: paymentFormAndInfo?.5, botPeer: botPeer), style: .blocks, focusItemTag: nil, emptyStateItem: nil, animateChanges: false)
+
+            return (ItemListPresentationData(presentationData), (nodeState, arguments))
+        }
+
+        self.actionButtonPanelNode = ASDisplayNode()
+        self.actionButtonPanelNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
+
+        self.actionButtonPanelSeparator = ASDisplayNode()
+        self.actionButtonPanelSeparator.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
+        
+        self.actionButton = BotCheckoutActionButton(activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.itemCheckColors.foregroundColor)
+        self.actionButton.setState(.placeholder)
         
         self.inProgressDimNode = ASDisplayNode()
         self.inProgressDimNode.alpha = 0.0
         self.inProgressDimNode.isUserInteractionEnabled = false
         self.inProgressDimNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor.withAlphaComponent(0.5)
         
-        super.init(controller: controller, navigationBar: navigationBar, updateNavigationOffset: updateNavigationOffset, state: signal)
+        super.init(controller: nil, navigationBar: navigationBar, state: signal)
         
         self.arguments = arguments
         
         openInfoImpl = { [weak self] focus in
             if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo {
+                strongSelf.controller?.view.endEditing(true)
                 strongSelf.present(BotCheckoutInfoController(context: context, invoice: paymentFormValue.invoice, messageId: messageId, initialFormInfo: currentFormInfo, focus: focus, formInfoUpdated: { formInfo, validatedInfo in
                     if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue {
                         strongSelf.currentFormInfo = formInfo
@@ -450,8 +615,9 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                                 updatedCurrentShippingOptionId = currentShippingOptionId
                             }
                         }
-                        strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, formInfo, validatedInfo, updatedCurrentShippingOptionId, strongSelf.currentPaymentMethod)))
-                        
+
+                        strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, formInfo, validatedInfo, updatedCurrentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount)))
+
                         strongSelf.updateActionButton()
                     }
                 }), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
@@ -461,7 +627,8 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
         let applyPaymentMethod: (BotCheckoutPaymentMethod) -> Void = { [weak self] method in
             if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo {
                 strongSelf.currentPaymentMethod = method
-                strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod)))
+                strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount)))
+                strongSelf.updateActionButton()
             }
         }
         
@@ -491,7 +658,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                     
                     var dismissImpl: (() -> Void)?
                     let canSave = paymentForm.canSaveCredentials || paymentForm.passwordMissing
-                    let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, additionalFields: additionalFields, publishableKey: publishableKey, completion: { method in
+                    let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, provider: .stripe(additionalFields: additionalFields, publishableKey: publishableKey), completion: { method in
                         guard let strongSelf = self else {
                             return
                         }
@@ -519,7 +686,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                                                     controller.dismiss()
                                                 }
                                                 switch update {
-                                                    case .noPassword, .awaitingEmailConfirmation:
+                                                    case .noPassword, .awaitingEmailConfirmation, .pendingPasswordReset:
                                                         break
                                                     case .passwordSet:
                                                         var updatedToken = webToken
@@ -535,7 +702,75 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                                         }
                                     })]), nil)
                                 default:
-                                    break
+                                    applyPaymentMethod(method)
+                            }
+                        } else {
+                            applyPaymentMethod(method)
+                        }
+                        dismissImpl?()
+                    })
+                    dismissImpl = { [weak controller] in
+                        controller?.dismiss()
+                    }
+                    strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                } else if let nativeProvider = paymentForm.nativeProvider, nativeProvider.name == "smartglocal" {
+                    guard let paramsData = nativeProvider.params.data(using: .utf8) else {
+                        return
+                    }
+                    guard let nativeParams = (try? JSONSerialization.jsonObject(with: paramsData)) as? [String: Any] else {
+                        return
+                    }
+                    guard let publicToken = nativeParams["public_token"] as? String else {
+                        return
+                    }
+
+                    var dismissImpl: (() -> Void)?
+                    let canSave = paymentForm.canSaveCredentials || paymentForm.passwordMissing
+                    let controller = BotCheckoutNativeCardEntryController(context: strongSelf.context, provider: .smartglobal(isTesting: paymentForm.invoice.isTest, publicToken: publicToken), completion: { method in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        if canSave && paymentForm.passwordMissing {
+                            switch method {
+                                case let .webToken(webToken) where webToken.saveOnServer:
+                                    var text = strongSelf.presentationData.strings.Checkout_NewCard_SaveInfoEnableHelp
+                                    text = text.replacingOccurrences(of: "[", with: "")
+                                    text = text.replacingOccurrences(of: "]", with: "")
+                                    present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_NotNow, action: {
+                                        var updatedToken = webToken
+                                        updatedToken.saveOnServer = false
+                                        applyPaymentMethod(.webToken(updatedToken))
+                                    }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Yes, action: {
+                                        guard let strongSelf = self else {
+                                            return
+                                        }
+                                        if paymentForm.passwordMissing {
+                                            var updatedToken = webToken
+                                            updatedToken.saveOnServer = false
+                                            applyPaymentMethod(.webToken(updatedToken))
+
+                                            let controller = SetupTwoStepVerificationController(context: strongSelf.context, initialState: .automatic, stateUpdated: { update, shouldDismiss, controller in
+                                                if shouldDismiss {
+                                                    controller.dismiss()
+                                                }
+                                                switch update {
+                                                    case .noPassword, .awaitingEmailConfirmation, .pendingPasswordReset:
+                                                        break
+                                                    case .passwordSet:
+                                                        var updatedToken = webToken
+                                                        updatedToken.saveOnServer = true
+                                                        applyPaymentMethod(.webToken(updatedToken))
+                                                }
+                                            })
+                                            strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                        } else {
+                                            var updatedToken = webToken
+                                            updatedToken.saveOnServer = true
+                                            applyPaymentMethod(.webToken(updatedToken))
+                                        }
+                                    })]), nil)
+                                default:
+                                    applyPaymentMethod(method)
                             }
                         } else {
                             applyPaymentMethod(method)
@@ -575,7 +810,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                                             controller.dismiss()
                                         }
                                         switch update {
-                                            case .noPassword, .awaitingEmailConfirmation:
+                                            case .noPassword, .awaitingEmailConfirmation, .pendingPasswordReset:
                                                 break
                                             case .passwordSet:
                                                 var updatedToken = token
@@ -608,9 +843,43 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                 }
             }
         }
+
+        updateTipImpl = { [weak self] value in
+            guard let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo else {
+                return
+            }
+
+            if strongSelf.currentTipAmount == value {
+                return
+            }
+            
+            strongSelf.currentTipAmount = value
+
+            strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount)))
+
+            strongSelf.updateActionButton()
+        }
+
+        ensureTipInputVisibleImpl = { [weak self] in
+            self?.afterLayout({
+                guard let strongSelf = self else {
+                    return
+                }
+                var selectedItemNode: ListViewItemNode?
+                strongSelf.listNode.forEachItemNode { itemNode in
+                    if let itemNode = itemNode as? BotCheckoutTipItemNode {
+                        selectedItemNode = itemNode
+                    }
+                }
+                if let selectedItemNode = selectedItemNode {
+                    strongSelf.listNode.ensureItemNodeVisible(selectedItemNode, atTop: true)
+                }
+            })
+        }
         
         openPaymentMethodImpl = { [weak self] in
             if let strongSelf = self, let paymentForm = strongSelf.paymentFormValue {
+                strongSelf.controller?.view.endEditing(true)
                 let methods = availablePaymentMethods(form: paymentForm, current: strongSelf.currentPaymentMethod)
                 if methods.isEmpty {
                     openNewCard()
@@ -626,10 +895,11 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
         
         openShippingMethodImpl = { [weak self] in
             if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let shippingOptions = strongSelf.currentValidatedFormInfo?.shippingOptions, !shippingOptions.isEmpty {
+                strongSelf.controller?.view.endEditing(true)
                 strongSelf.present(BotCheckoutPaymentShippingOptionSheetController(context: strongSelf.context, currency: paymentFormValue.invoice.currency, options: shippingOptions, currentId: strongSelf.currentShippingOptionId, applyValue: { id in
                     if let strongSelf = self, let paymentFormValue = strongSelf.paymentFormValue, let currentFormInfo = strongSelf.currentFormInfo {
                         strongSelf.currentShippingOptionId = id
-                        strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod)))
+                        strongSelf.paymentFormAndInfo.set(.single((paymentFormValue, currentFormInfo, strongSelf.currentValidatedFormInfo, strongSelf.currentShippingOptionId, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount)))
                         
                         strongSelf.updateActionButton()
                     }
@@ -637,83 +907,117 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
             }
         }
         
-        let formAndMaybeValidatedInfo = fetchBotPaymentForm(postbox: context.account.postbox, network: context.account.network, messageId: messageId)
-            |> mapToSignal { paymentForm -> Signal<(BotPaymentForm, BotPaymentValidatedFormInfo?), BotPaymentFormRequestError> in
-                if let current = paymentForm.savedInfo {
-                    return validateBotPaymentForm(network: context.account.network, saveInfo: true, messageId: messageId, formInfo: current)
-                        |> mapError { _ -> BotPaymentFormRequestError in
-                            return .generic
-                        }
-                        |> map { result -> (BotPaymentForm, BotPaymentValidatedFormInfo?) in
-                            return (paymentForm, result)
-                        }
-                        |> `catch` { _ -> Signal<(BotPaymentForm, BotPaymentValidatedFormInfo?), BotPaymentFormRequestError> in
-                            return .single((paymentForm, nil))
-                        }
-                } else {
-                    return .single((paymentForm, nil))
-                }
-            }
-        
-        self.formRequestDisposable = (formAndMaybeValidatedInfo |> deliverOnMainQueue).start(next: { [weak self] form, validatedInfo in
+        self.formRequestDisposable = (inputData.get() |> deliverOnMainQueue).start(next: { [weak self] formAndValidatedInfo in
             if let strongSelf = self {
+                guard let formAndValidatedInfo = formAndValidatedInfo else {
+                    strongSelf.controller?.dismiss()
+                    return
+                }
+                UIView.transition(with: strongSelf.view, duration: 0.25, options: UIView.AnimationOptions.transitionCrossDissolve, animations: {
+                }, completion: nil)
+
                 let savedInfo: BotPaymentRequestedInfo
-                if let current = form.savedInfo {
+                if let current = formAndValidatedInfo.form.savedInfo {
                     savedInfo = current
                 } else {
                     savedInfo = BotPaymentRequestedInfo(name: nil, phone: nil, email: nil, shippingAddress: nil)
                 }
-                strongSelf.paymentFormValue = form
+                strongSelf.paymentFormValue = formAndValidatedInfo.form
                 strongSelf.currentFormInfo = savedInfo
-                strongSelf.currentValidatedFormInfo = validatedInfo
-                if let savedCredentials = form.savedCredentials {
+                strongSelf.currentValidatedFormInfo = formAndValidatedInfo.validatedFormInfo
+                if let savedCredentials = formAndValidatedInfo.form.savedCredentials {
                     strongSelf.currentPaymentMethod = .savedCredentials(savedCredentials)
                 }
                 strongSelf.actionButton.isEnabled = true
-                strongSelf.paymentFormAndInfo.set(.single((form, savedInfo, validatedInfo, nil, strongSelf.currentPaymentMethod)))
+                strongSelf.paymentFormAndInfo.set(.single((formAndValidatedInfo.form, savedInfo, formAndValidatedInfo.validatedFormInfo, nil, strongSelf.currentPaymentMethod, strongSelf.currentTipAmount)))
                 
                 strongSelf.updateActionButton()
             }
-        }, error: { _ in
-            
         })
+
+        self.addSubnode(self.actionButtonPanelNode)
+        self.actionButtonPanelNode.addSubnode(self.actionButtonPanelSeparator)
+        self.actionButtonPanelNode.addSubnode(self.actionButton)
         
         self.actionButton.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside)
         self.actionButton.isEnabled = false
-        self.addSubnode(self.actionButton)
         
         self.listNode.supernode?.insertSubnode(self.inProgressDimNode, aboveSubnode: self.listNode)
+
+        self.passwordTipDisposable = (self.context.engine.auth.twoStepVerificationConfiguration()
+        |> deliverOnMainQueue).start(next: { [weak self] value in
+            guard let strongSelf = self else {
+                return
+            }
+            switch value {
+            case .notSet:
+                break
+            case let .set(hint, _, _, _, _):
+                if !hint.isEmpty {
+                    strongSelf.passwordTip = hint
+                }
+            }
+        })
     }
     
     deinit {
         self.formRequestDisposable?.dispose()
         self.payDisposable.dispose()
         self.paymentAuthDisposable.dispose()
+        self.passwordTipDisposable?.dispose()
     }
     
     private func updateActionButton() {
-        let totalAmount = currentTotalPrice(paymentForm: self.paymentFormValue, validatedFormInfo: self.currentValidatedFormInfo, currentShippingOptionId: self.currentShippingOptionId)
+        let totalAmount = currentTotalPrice(paymentForm: self.paymentFormValue, validatedFormInfo: self.currentValidatedFormInfo, currentShippingOptionId: self.currentShippingOptionId, currentTip: self.currentTipAmount)
         let payString: String
         if let paymentForm = self.paymentFormValue, totalAmount > 0 {
             payString = self.presentationData.strings.Checkout_PayPrice(formatCurrencyAmount(totalAmount, currency: paymentForm.invoice.currency)).0
         } else {
             payString = self.presentationData.strings.CheckoutInfo_Pay
         }
-        if self.actionButton.isEnabled {
-            self.actionButton.setState(.active(payString))
+        if let currentPaymentMethod = self.currentPaymentMethod {
+            switch currentPaymentMethod {
+            case .applePay:
+                self.actionButton.setState(.applePay)
+            default:
+                self.actionButton.setState(.active(payString))
+            }
         } else {
-            self.actionButton.setState(.loading)
+            self.actionButton.setState(.active(payString))
+        }
+        self.actionButtonPanelNode.isHidden = false
+    }
+
+    private func updateIsInProgress(_ value: Bool) {
+        if value {
+            if self.statusController == nil {
+                let statusController = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
+                self.statusController = statusController
+                self.controller?.present(statusController, in: .window(.root))
+            }
+        } else if let statusController = self.statusController {
+            self.statusController = nil
+            statusController.dismiss()
         }
     }
     
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition, additionalInsets: UIEdgeInsets) {
         var updatedInsets = layout.intrinsicInsets
-        updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0
-        super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets)
-        
-        let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter))
+
+        let bottomPanelHorizontalInset: CGFloat = 16.0
+        let bottomPanelVerticalInset: CGFloat = 16.0
+        let bottomPanelHeight = max(updatedInsets.bottom, layout.inputHeight ?? 0.0) + bottomPanelVerticalInset * 2.0 + BotCheckoutActionButton.height
+
+        transition.updateFrame(node: self.actionButtonPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelHeight), size: CGSize(width: layout.size.width, height: bottomPanelHeight)))
+        transition.updateFrame(node: self.actionButtonPanelSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
+
+        let actionButtonFrame = CGRect(origin: CGPoint(x: bottomPanelHorizontalInset, y: bottomPanelVerticalInset), size: CGSize(width: layout.size.width - bottomPanelHorizontalInset * 2.0, height: BotCheckoutActionButton.height))
         transition.updateFrame(node: self.actionButton, frame: actionButtonFrame)
-        self.actionButton.updateLayout(size: actionButtonFrame.size, transition: transition)
+        self.actionButton.updateLayout(absoluteRect: actionButtonFrame.offsetBy(dx: self.actionButtonPanelNode.frame.minX, dy: self.actionButtonPanelNode.frame.minY), containerSize: layout.size, transition: transition)
+
+        updatedInsets.bottom = bottomPanelHeight
+
+        super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets)
         
         transition.updateFrame(node: self.inProgressDimNode, frame: self.listNode.frame)
     }
@@ -765,7 +1069,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                             if let savedCredentialsToken = savedCredentialsToken {
                                 credentials = .saved(id: id, tempPassword: savedCredentialsToken.token)
                             } else {
-                                let _ = (cachedTwoStepPasswordToken(postbox: self.context.account.postbox)
+                                let _ = (self.context.engine.auth.cachedTwoStepPasswordToken()
                                 |> deliverOnMainQueue).start(next: { [weak self] token in
                                     if let strongSelf = self {
                                         let timestamp = strongSelf.context.account.network.getApproximateRemoteTimestamp()
@@ -835,11 +1139,14 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                             var items: [PKPaymentSummaryItem] = []
                             
                             var totalAmount: Int64 = 0
+
                             for price in paymentForm.invoice.prices {
                                 totalAmount += price.amount
-                                
-                                let amount = NSDecimalNumber(value: Double(price.amount) * 0.01)
-                                items.append(PKPaymentSummaryItem(label: price.label, amount: amount))
+
+                                if let fractional = currencyToFractionalAmount(value: price.amount, currency: paymentForm.invoice.currency) {
+                                    let amount = NSDecimalNumber(value: fractional)
+                                    items.append(PKPaymentSummaryItem(label: price.label, amount: amount))
+                                }
                             }
                             
                             if let shippingOptions = strongSelf.currentValidatedFormInfo?.shippingOptions, let shippingOptionId = strongSelf.currentShippingOptionId {
@@ -852,9 +1159,20 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                                     }
                                 }
                             }
-                            
-                            let amount = NSDecimalNumber(value: Double(totalAmount) * 0.01)
-                            items.append(PKPaymentSummaryItem(label: botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), amount: amount))
+
+                            if let tipAmount = strongSelf.currentTipAmount {
+                                totalAmount += tipAmount
+
+                                if let fractional = currencyToFractionalAmount(value: tipAmount, currency: paymentForm.invoice.currency) {
+                                    let amount = NSDecimalNumber(value: fractional)
+                                    items.append(PKPaymentSummaryItem(label: strongSelf.presentationData.strings.Checkout_TipItem, amount: amount))
+                                }
+                            }
+
+                            if let fractionalTotal = currencyToFractionalAmount(value: totalAmount, currency: paymentForm.invoice.currency) {
+                                let amount = NSDecimalNumber(value: fractionalTotal)
+                                items.append(PKPaymentSummaryItem(label: botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), amount: amount))
+                            }
                             
                             request.paymentSummaryItems = items
                             
@@ -874,20 +1192,20 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
         }
         
         if !liabilityNoticeAccepted {
-            let messageId = self.messageId
             let botPeer: Signal<Peer?, NoError> = self.context.account.postbox.transaction { transaction -> Peer? in
-                if let message = transaction.getMessage(messageId) {
-                    return message.author
-                }
-                return nil
+                return transaction.getPeer(paymentForm.paymentBotId)
             }
-            let _ = (combineLatest(ApplicationSpecificNotice.getBotPaymentLiability(accountManager: self.context.sharedContext.accountManager, peerId: self.messageId.peerId), botPeer, self.context.account.postbox.loadedPeerWithId(paymentForm.providerId))
+            let _ = (combineLatest(ApplicationSpecificNotice.getBotPaymentLiability(accountManager: self.context.sharedContext.accountManager, peerId: paymentForm.paymentBotId), botPeer, self.context.account.postbox.loadedPeerWithId(paymentForm.providerId))
             |> deliverOnMainQueue).start(next: { [weak self] value, botPeer, providerPeer in
                 if let strongSelf = self, let botPeer = botPeer {
                     if value {
                         strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true)
                     } else {
-                        strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: strongSelf.presentationData.strings.Checkout_LiabilityAlert(botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), providerPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {
+                        let paymentText = strongSelf.presentationData.strings.Checkout_PaymentLiabilityAlert
+                            .replacingOccurrences(of: "{target}", with: botPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
+                            .replacingOccurrences(of: "{payment_system}", with: providerPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder))
+
+                        strongSelf.present(textAlertController(context: strongSelf.context, title: strongSelf.presentationData.strings.Checkout_LiabilityAlertTitle, text: paymentText, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: { }), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {
                             if let strongSelf = self {
                                 let _ = ApplicationSpecificNotice.setBotPaymentLiability(accountManager: strongSelf.context.sharedContext.accountManager, peerId: strongSelf.messageId.peerId).start()
                                 strongSelf.pay(savedCredentialsToken: savedCredentialsToken, liabilityNoticeAccepted: true)
@@ -901,11 +1219,22 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
             self.inProgressDimNode.alpha = 1.0
             self.actionButton.isEnabled = false
             self.updateActionButton()
-            self.payDisposable.set((sendBotPaymentForm(account: self.context.account, messageId: self.messageId, validatedInfoId: self.currentValidatedFormInfo?.id, shippingOptionId: self.currentShippingOptionId, credentials: credentials) |> deliverOnMainQueue).start(next: { [weak self] result in
+            self.updateIsInProgress(true)
+
+            var tipAmount = self.currentTipAmount
+            if tipAmount == nil, let _ = paymentForm.invoice.tip {
+                tipAmount = 0
+            }
+
+            let totalAmount = currentTotalPrice(paymentForm: paymentForm, validatedFormInfo: self.currentValidatedFormInfo, currentShippingOptionId: self.currentShippingOptionId, currentTip: self.currentTipAmount)
+            let currencyValue = formatCurrencyAmount(totalAmount, currency: paymentForm.invoice.currency)
+
+            self.payDisposable.set((self.context.engine.payments.sendBotPaymentForm(messageId: self.messageId, formId: paymentForm.id, validatedInfoId: self.currentValidatedFormInfo?.id, shippingOptionId: self.currentShippingOptionId, tipAmount: tipAmount, credentials: credentials) |> deliverOnMainQueue).start(next: { [weak self] result in
                 if let strongSelf = self {
                     strongSelf.inProgressDimNode.isUserInteractionEnabled = false
                     strongSelf.inProgressDimNode.alpha = 0.0
                     strongSelf.actionButton.isEnabled = true
+                    strongSelf.updateIsInProgress(false)
                     if let applePayAuthrorizationCompletion = strongSelf.applePayAuthrorizationCompletion {
                         strongSelf.applePayAuthrorizationCompletion = nil
                         applePayAuthrorizationCompletion(.success)
@@ -914,19 +1243,32 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                         strongSelf.applePayController = nil
                         applePayController.presentingViewController?.dismiss(animated: true, completion: nil)
                     }
+
+                    let proceedWithCompletion: (Bool, MessageId?) -> Void = { success, receiptMessageId in
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        if success {
+                            strongSelf.dismissAnimated()
+                            strongSelf.completed(currencyValue, receiptMessageId)
+                        } else {
+                            strongSelf.dismissAnimated()
+                        }
+                    }
                     
                     switch result {
-                        case .done:
-                            strongSelf.dismissAnimated()
+                        case let .done(receiptMessageId):
+                            proceedWithCompletion(true, receiptMessageId)
                         case let .externalVerificationRequired(url):
                             strongSelf.updateActionButton()
-                            var dismissImpl: (() -> Void)?
-                            let controller = BotCheckoutWebInteractionController(context: strongSelf.context, url: url, intent: .externalVerification({ _ in
-                                dismissImpl?()
+                            var dismissImpl: ((Bool) -> Void)?
+                            let controller = BotCheckoutWebInteractionController(context: strongSelf.context, url: url, intent: .externalVerification({ success in
+                                dismissImpl?(success)
                             }))
-                            dismissImpl = { [weak controller] in
+                            dismissImpl = { [weak controller] success in
                                 controller?.dismiss()
-                                self?.dismissAnimated()
+                                proceedWithCompletion(success, nil)
                             }
                             strongSelf.present(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
                     }
@@ -937,6 +1279,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                     strongSelf.inProgressDimNode.alpha = 0.0
                     strongSelf.actionButton.isEnabled = true
                     strongSelf.updateActionButton()
+                    strongSelf.updateIsInProgress(false)
                     if let applePayAuthrorizationCompletion = strongSelf.applePayAuthrorizationCompletion {
                         strongSelf.applePayAuthrorizationCompletion = nil
                         applePayAuthrorizationCompletion(.failure)
@@ -974,7 +1317,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
             period = 1 * 60 * 60
             requiresBiometrics = false
         }
-        self.present(botCheckoutPasswordEntryController(context: self.context, strings: self.presentationData.strings, cartTitle: cardTitle, period: period, requiresBiometrics: requiresBiometrics, completion: { [weak self] token in
+        self.present(botCheckoutPasswordEntryController(context: self.context, strings: self.presentationData.strings, passwordTip: self.passwordTip, cartTitle: cardTitle, period: period, requiresBiometrics: requiresBiometrics, completion: { [weak self] token in
             if let strongSelf = self {
                 let durationString = timeIntervalString(strings: strongSelf.presentationData.strings, value: period)
                 
@@ -997,7 +1340,7 @@ final class BotCheckoutControllerNode: ItemListControllerNode, PKPaymentAuthoriz
                     }),
                     TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Yes, action: {
                         if let strongSelf = self {
-                            let _ = cacheTwoStepPasswordToken(postbox: strongSelf.context.account.postbox, token: token).start()
+                            let _ = strongSelf.context.engine.auth.cacheTwoStepPasswordToken(token: token).start()
                             strongSelf.pay(savedCredentialsToken: token)
                         }
                     })
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift
index ada9ca2d90..2946d5ca0b 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift
@@ -80,7 +80,6 @@ class BotCheckoutHeaderItemNode: ListViewItemNode {
     init() {
         self.backgroundNode = ASDisplayNode()
         self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.backgroundColor = .white
         
         self.topStripeNode = ASDisplayNode()
         self.topStripeNode.isLayerBacked = true
@@ -109,7 +108,8 @@ class BotCheckoutHeaderItemNode: ListViewItemNode {
         self.highlightedBackgroundNode.isLayerBacked = true
         
         super.init(layerBacked: false, dynamicBounce: false)
-        
+
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.imageNode)
         self.addSubnode(self.titleNode)
         self.addSubnode(self.textNode)
@@ -209,9 +209,9 @@ class BotCheckoutHeaderItemNode: ListViewItemNode {
                     }
                     strongSelf.imageNode.frame = CGRect(origin: CGPoint(x: contentInsets.left, y: contentInsets.top), size: imageSize)
                     
-                    if strongSelf.backgroundNode.supernode != nil {
+                    /*if strongSelf.backgroundNode.supernode != nil {
                         strongSelf.backgroundNode.removeFromSupernode()
-                    }
+                    }*/
                     if strongSelf.topStripeNode.supernode != nil {
                         strongSelf.topStripeNode.removeFromSupernode()
                     }
@@ -231,7 +231,8 @@ class BotCheckoutHeaderItemNode: ListViewItemNode {
                     strongSelf.textNode.frame = textFrame
                     
                     strongSelf.botNameNode.frame = CGRect(origin: CGPoint(x: textFrame.minX, y: textFrame.maxY + textBotNameSpacing), size: botNameLayout.size)
-                    
+
+                    strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -1000.0), size: CGSize(width: params.width, height: contentSize.height + 1000.0))
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: 44.0 + UIScreenPixel + UIScreenPixel))
                 }
             })
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoController.swift
index 64d7b0cf5f..a1f316815e 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoController.swift
@@ -144,7 +144,7 @@ final class BotCheckoutInfoController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func cancelPressed() {
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift
index 03df37910f..034628432e 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutInfoControllerNode.swift
@@ -338,7 +338,7 @@ final class BotCheckoutInfoControllerNode: ViewControllerTracingNode, UIScrollVi
     func verify() {
         self.isVerifying = true
         let formInfo = self.collectFormInfo()
-        self.verifyDisposable.set((validateBotPaymentForm(network: self.context.account.network, saveInfo: self.saveInfoItem.isOn, messageId: self.messageId, formInfo: formInfo) |> deliverOnMainQueue).start(next: { [weak self] result in
+        self.verifyDisposable.set((self.context.engine.payments.validateBotPaymentForm(saveInfo: self.saveInfoItem.isOn, messageId: self.messageId, formInfo: formInfo) |> deliverOnMainQueue).start(next: { [weak self] result in
             if let strongSelf = self {
                 strongSelf.formInfoUpdated(formInfo, result)
             }
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift
index c0449e73e2..a5d7cb506d 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryController.swift
@@ -30,13 +30,17 @@ struct BotCheckoutNativeCardEntryAdditionalFields: OptionSet {
 }
 
 final class BotCheckoutNativeCardEntryController: ViewController {
+    enum Provider {
+        case stripe(additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String)
+        case smartglobal(isTesting: Bool, publicToken: String)
+    }
+
     private var controllerNode: BotCheckoutNativeCardEntryControllerNode {
         return super.displayNode as! BotCheckoutNativeCardEntryControllerNode
     }
     
     private let context: AccountContext
-    private let additionalFields: BotCheckoutNativeCardEntryAdditionalFields
-    private let publishableKey: String
+    private let provider: Provider
     private let completion: (BotCheckoutPaymentMethod) -> Void
     
     private var presentationData: PresentationData
@@ -46,10 +50,9 @@ final class BotCheckoutNativeCardEntryController: ViewController {
     private var doneItem: UIBarButtonItem?
     private var activityItem: UIBarButtonItem?
     
-    public init(context: AccountContext, additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String, completion: @escaping (BotCheckoutPaymentMethod) -> Void) {
+    public init(context: AccountContext, provider: Provider, completion: @escaping (BotCheckoutPaymentMethod) -> Void) {
         self.context = context
-        self.additionalFields = additionalFields
-        self.publishableKey = publishableKey
+        self.provider = provider
         self.completion = completion
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -71,7 +74,7 @@ final class BotCheckoutNativeCardEntryController: ViewController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = BotCheckoutNativeCardEntryControllerNode(additionalFields: self.additionalFields, publishableKey: self.publishableKey, theme: self.presentationData.theme, strings: self.presentationData.strings, present: { [weak self] c, a in
+        self.displayNode = BotCheckoutNativeCardEntryControllerNode(context: self.context, provider: self.provider, theme: self.presentationData.theme, strings: self.presentationData.strings, present: { [weak self] c, a in
             self?.present(c, in: .window(.root), with: a)
         }, dismiss: { [weak self] in
             self?.presentingViewController?.dismiss(animated: false, completion: nil)
@@ -139,7 +142,7 @@ final class BotCheckoutNativeCardEntryController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func cancelPressed() {
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift
index d0b2b3e9d5..0072d16381 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutNativeCardEntryControllerNode.swift
@@ -9,6 +9,8 @@ import SwiftSignalKit
 import TelegramPresentationData
 import Stripe
 import CountrySelectionUI
+import PresentationDataUtils
+import AccountContext
 
 private final class BotCheckoutNativeCardEntryScrollerNodeView: UIScrollView {
     var ignoreUpdateBounds = false
@@ -42,7 +44,8 @@ private final class BotCheckoutNativeCardEntryScrollerNode: ASDisplayNode {
 }
 
 final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode, UIScrollViewDelegate {
-    private let publishableKey: String
+    private let context: AccountContext
+    private let provider: BotCheckoutNativeCardEntryController.Provider
     
     private let present: (ViewController, Any?) -> Void
     private let dismiss: () -> Void
@@ -70,9 +73,12 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
     
     private var currentCardData: BotPaymentCardInputData?
     private var currentCountryIso2: String?
+
+    private var dataTask: URLSessionDataTask?
     
-    init(additionalFields: BotCheckoutNativeCardEntryAdditionalFields, publishableKey: String, theme: PresentationTheme, strings: PresentationStrings, present: @escaping (ViewController, Any?) -> Void, dismiss: @escaping () -> Void, openCountrySelection: @escaping () -> Void, updateStatus: @escaping (BotCheckoutNativeCardEntryStatus) -> Void, completion: @escaping (BotCheckoutPaymentMethod) -> Void) {
-        self.publishableKey = publishableKey
+    init(context: AccountContext, provider: BotCheckoutNativeCardEntryController.Provider, theme: PresentationTheme, strings: PresentationStrings, present: @escaping (ViewController, Any?) -> Void, dismiss: @escaping () -> Void, openCountrySelection: @escaping () -> Void, updateStatus: @escaping (BotCheckoutNativeCardEntryStatus) -> Void, completion: @escaping (BotCheckoutPaymentMethod) -> Void) {
+        self.context = context
+        self.provider = provider
         
         self.present = present
         self.dismiss = dismiss
@@ -95,46 +101,53 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
             cardUpdatedImpl?(data)
         }
         itemNodes.append([BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PaymentCard), self.cardItem])
-        
-        if additionalFields.contains(.cardholderName) {
-            var sectionItems: [BotPaymentItemNode] = []
-            
-            sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_CardholderNameTitle))
-            
-            let cardholderItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_CardholderNamePlaceholder, contentType: .name)
-            self.cardholderItem = cardholderItem
-            sectionItems.append(cardholderItem)
-            
-            itemNodes.append(sectionItems)
-        } else {
-            self.cardholderItem = nil
-        }
-        
-        if additionalFields.contains(.country) || additionalFields.contains(.zipCode) {
-            var sectionItems: [BotPaymentItemNode] = []
-            
-            sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PostcodeTitle))
-            
-            if additionalFields.contains(.country) {
-                let countryItem = BotPaymentDisclosureItemNode(title: "", placeholder: strings.CheckoutInfo_ShippingInfoCountryPlaceholder, text: "")
-                countryItem.action = {
-                    openCountrySelectionImpl?()
+
+        switch provider {
+        case let .stripe(additionalFields, _):
+            if additionalFields.contains(.cardholderName) {
+                var sectionItems: [BotPaymentItemNode] = []
+
+                sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_CardholderNameTitle))
+
+                let cardholderItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_CardholderNamePlaceholder, contentType: .name)
+                self.cardholderItem = cardholderItem
+                sectionItems.append(cardholderItem)
+
+                itemNodes.append(sectionItems)
+            } else {
+                self.cardholderItem = nil
+            }
+
+            if additionalFields.contains(.country) || additionalFields.contains(.zipCode) {
+                var sectionItems: [BotPaymentItemNode] = []
+
+                sectionItems.append(BotPaymentHeaderItemNode(text: strings.Checkout_NewCard_PostcodeTitle))
+
+                if additionalFields.contains(.country) {
+                    let countryItem = BotPaymentDisclosureItemNode(title: "", placeholder: strings.CheckoutInfo_ShippingInfoCountryPlaceholder, text: "")
+                    countryItem.action = {
+                        openCountrySelectionImpl?()
+                    }
+                    self.countryItem = countryItem
+                    sectionItems.append(countryItem)
+                } else {
+                    self.countryItem = nil
                 }
-                self.countryItem = countryItem
-                sectionItems.append(countryItem)
+                if additionalFields.contains(.zipCode) {
+                    let zipCodeItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_PostcodePlaceholder, contentType: .address)
+                    self.zipCodeItem = zipCodeItem
+                    sectionItems.append(zipCodeItem)
+                } else {
+                    self.zipCodeItem = nil
+                }
+
+                itemNodes.append(sectionItems)
             } else {
                 self.countryItem = nil
-            }
-            if additionalFields.contains(.zipCode) {
-                let zipCodeItem = BotPaymentFieldItemNode(title: "", placeholder: strings.Checkout_NewCard_PostcodePlaceholder, contentType: .address)
-                self.zipCodeItem = zipCodeItem
-                sectionItems.append(zipCodeItem)
-            } else {
                 self.zipCodeItem = nil
             }
-            
-            itemNodes.append(sectionItems)
-        } else {
+        case .smartglobal:
+            self.cardholderItem = nil
             self.countryItem = nil
             self.zipCodeItem = nil
         }
@@ -214,6 +227,7 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
     
     deinit {
         self.verifyDisposable.dispose()
+        self.dataTask?.cancel()
     }
     
     func updateCountry(_ iso2: String) {
@@ -232,53 +246,163 @@ final class BotCheckoutNativeCardEntryControllerNode: ViewControllerTracingNode,
         guard let cardData = self.currentCardData else {
             return
         }
-        
-        let configuration = STPPaymentConfiguration.shared().copy() as! STPPaymentConfiguration
-        configuration.smsAutofillDisabled = true
-        configuration.publishableKey = self.publishableKey
-        configuration.appleMerchantIdentifier = "merchant.ph.telegra.Telegraph"
-        
-        let apiClient = STPAPIClient(configuration: configuration)
-        
-        let card = STPCardParams()
-        card.number = cardData.number
-        card.cvc = cardData.code
-        card.expYear = cardData.year
-        card.expMonth = cardData.month
-        card.name = self.cardholderItem?.text
-        card.addressCountry = self.currentCountryIso2
-        card.addressZip = self.zipCodeItem?.text
-        
-        let createToken: Signal<STPToken, Error> = Signal { subscriber in
-            apiClient.createToken(withCard: card, completion: { token, error in
-                if let error = error {
-                    subscriber.putError(error)
-                } else if let token = token {
-                    subscriber.putNext(token)
-                    subscriber.putCompletion()
+
+        switch self.provider {
+        case let .stripe(_, publishableKey):
+            let configuration = STPPaymentConfiguration.shared().copy() as! STPPaymentConfiguration
+            configuration.smsAutofillDisabled = true
+            configuration.publishableKey = publishableKey
+            configuration.appleMerchantIdentifier = "merchant.ph.telegra.Telegraph"
+
+            let apiClient = STPAPIClient(configuration: configuration)
+
+            let card = STPCardParams()
+            card.number = cardData.number
+            card.cvc = cardData.code
+            card.expYear = cardData.year
+            card.expMonth = cardData.month
+            card.name = self.cardholderItem?.text
+            card.addressCountry = self.currentCountryIso2
+            card.addressZip = self.zipCodeItem?.text
+
+            let createToken: Signal<STPToken, Error> = Signal { subscriber in
+                apiClient.createToken(withCard: card, completion: { token, error in
+                    if let error = error {
+                        subscriber.putError(error)
+                    } else if let token = token {
+                        subscriber.putNext(token)
+                        subscriber.putCompletion()
+                    }
+                })
+
+                return ActionDisposable {
+                    let _ = apiClient.publishableKey
+                }
+            }
+
+            self.isVerifying = true
+            self.verifyDisposable.set((createToken |> deliverOnMainQueue).start(next: { [weak self] token in
+                if let strongSelf = self, let card = token.card {
+                    let last4 = card.last4()
+                    let brand = STPAPIClient.string(with: card.brand)
+                    strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(title: "\(brand)*\(last4)", data: "{\"type\": \"card\", \"id\": \"\(token.tokenId)\"}", saveOnServer: strongSelf.saveInfoItem.isOn)))
+                }
+            }, error: { [weak self] error in
+                if let strongSelf = self {
+                    strongSelf.isVerifying = false
+                    strongSelf.updateDone()
+                }
+            }))
+
+            self.updateDone()
+        case let .smartglobal(isTesting, publicToken):
+            let url: String
+            if isTesting {
+                url = "https://tgb-playground.smart-glocal.com/cds/v1/tokenize/card"
+            } else {
+                url = "https://tgb.smart-glocal.com/cds/v1/tokenize/card"
+            }
+
+            let jsonPayload: [String: Any] = [
+                "card": [
+                    "number": cardData.number,
+                    "expiration_month": String(format: "%02d", cardData.month),
+                    "expiration_year": String(format: "%02d", cardData.year),
+                    "security_code": "\(cardData.code)"
+                ] as [String: Any]
+            ]
+
+            guard let parsedUrl = URL(string: url) else {
+                return
+            }
+
+            var request = URLRequest(url: parsedUrl)
+            request.httpMethod = "POST"
+            request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+            request.setValue(publicToken, forHTTPHeaderField: "X-PUBLIC-TOKEN")
+            guard let requestBody = try? JSONSerialization.data(withJSONObject: jsonPayload, options: []) else {
+                return
+            }
+            request.httpBody = requestBody
+
+            let session = URLSession.shared
+            let dataTask = session.dataTask(with: request, completionHandler: { [weak self] data, response, error in
+                Queue.mainQueue().async {
+                    guard let strongSelf = self else {
+                        return
+                    }
+
+                    enum ReponseError: Error {
+                        case generic
+                    }
+
+                    do {
+                        guard let data = data else {
+                            throw ReponseError.generic
+                        }
+
+                        let jsonRaw = try JSONSerialization.jsonObject(with: data, options: [])
+                        guard let json = jsonRaw as? [String: Any] else {
+                            throw ReponseError.generic
+                        }
+                        guard let resultData = json["data"] as? [String: Any] else {
+                            throw ReponseError.generic
+                        }
+                        guard let resultInfo = resultData["info"] as? [String: Any] else {
+                            throw ReponseError.generic
+                        }
+                        guard let token = resultData["token"] as? String else {
+                            throw ReponseError.generic
+                        }
+                        guard let maskedCardNumber = resultInfo["masked_card_number"] as? String else {
+                            throw ReponseError.generic
+                        }
+                        guard let cardType = resultInfo["card_type"] as? String else {
+                            throw ReponseError.generic
+                        }
+
+                        var last4 = maskedCardNumber
+                        if last4.count > 4 {
+                            let lastDigits = String(maskedCardNumber[maskedCardNumber.index(maskedCardNumber.endIndex, offsetBy: -4)...])
+                            if lastDigits.allSatisfy(\.isNumber) {
+                                last4 = "\(cardType) *\(lastDigits)"
+                            }
+                        }
+
+                        let responseJson: [String: Any] = [
+                            "type": "card",
+                            "token": "\(token)"
+                        ]
+
+                        let serializedResponseJson = try JSONSerialization.data(withJSONObject: responseJson, options: [])
+
+                        guard let serializedResponseString = String(data: serializedResponseJson, encoding: .utf8) else {
+                            throw ReponseError.generic
+                        }
+
+                        strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(
+                            title: last4,
+                            data: serializedResponseString,
+                            saveOnServer: strongSelf.saveInfoItem.isOn
+                        )))
+                    } catch {
+                        strongSelf.isVerifying = false
+                        strongSelf.updateDone()
+
+                        strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.strings.Common_OK, action: {
+                        })]), nil)
+                    }
                 }
             })
-            
-            return ActionDisposable {
-                let _ = apiClient.publishableKey
-            }
+            self.dataTask = dataTask
+
+            self.isVerifying = true
+            self.updateDone()
+
+            dataTask.resume()
+
+            break
         }
-        
-        self.isVerifying = true
-        self.verifyDisposable.set((createToken |> deliverOnMainQueue).start(next: { [weak self] token in
-            if let strongSelf = self, let card = token.card {
-                let last4 = card.last4()
-                let brand = STPAPIClient.string(with: card.brand)
-                strongSelf.completion(.webToken(BotCheckoutPaymentWebToken(title: "\(brand)*\(last4)", data: "{\"type\": \"card\", \"id\": \"\(token.tokenId)\"}", saveOnServer: strongSelf.saveInfoItem.isOn)))
-            }
-        }, error: { [weak self] error in
-            if let strongSelf = self {
-                strongSelf.isVerifying = false
-                strongSelf.updateDone()
-            }
-        }))
-        
-        self.updateDone()
     }
     
     private func updateDone() {
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift
index 13f395f368..c2c0a5733e 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPasswordEntryController.swift
@@ -94,7 +94,7 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode {
     
     private let hapticFeedback = HapticFeedback()
     
-    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, cardTitle: String, period: Int32, requiresBiometrics: Bool, cancel: @escaping () -> Void, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) {
+    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, passwordTip: String?, cardTitle: String, period: Int32, requiresBiometrics: Bool, cancel: @escaping () -> Void, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) {
         self.context = context
         self.period = period
         self.requiresBiometrics = requiresBiometrics
@@ -156,6 +156,8 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode {
         self.textFieldNode.textField.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance
         self.textFieldNode.textField.isSecureTextEntry = true
         self.textFieldNode.textField.tintColor = theme.list.itemAccentColor
+        self.textFieldNode.textField.placeholder = passwordTip
+
         
         super.init()
         
@@ -218,7 +220,7 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode {
         
         let textFieldBackgroundFrame = CGRect(origin: CGPoint(x: insets.left, y: resultSize.height - inputHeight + 12.0 - actionsHeight - insets.bottom), size: CGSize(width: resultSize.width - insets.left - insets.right, height: 25.0))
         self.textFieldNodeBackground.frame = textFieldBackgroundFrame
-        self.textFieldNode.frame = textFieldBackgroundFrame.offsetBy(dx: 0.0, dy: 1.0).insetBy(dx: 4.0, dy: 0.0)
+        self.textFieldNode.frame = textFieldBackgroundFrame.offsetBy(dx: 0.0, dy: 0.0).insetBy(dx: 4.0, dy: 0.0)
         
         self.actionNodesSeparator.frame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel))
         
@@ -283,7 +285,7 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode {
         }
         
         self.isVerifying = true
-        self.disposable.set((requestTemporaryTwoStepPasswordToken(account: self.context.account, password: text, period: self.period, requiresBiometrics: self.requiresBiometrics) |> deliverOnMainQueue).start(next: { [weak self] token in
+        self.disposable.set((self.context.engine.auth.requestTemporaryTwoStepPasswordToken(password: text, period: self.period, requiresBiometrics: self.requiresBiometrics) |> deliverOnMainQueue).start(next: { [weak self] token in
             if let strongSelf = self {
                 strongSelf.completion(token)
             }
@@ -300,10 +302,10 @@ private final class BotCheckoutPasswordAlertContentNode: AlertContentNode {
     }
 }
 
-func botCheckoutPasswordEntryController(context: AccountContext, strings: PresentationStrings, cartTitle: String, period: Int32, requiresBiometrics: Bool, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) -> AlertController {
+func botCheckoutPasswordEntryController(context: AccountContext, strings: PresentationStrings, passwordTip: String?, cartTitle: String, period: Int32, requiresBiometrics: Bool, completion: @escaping (TemporaryTwoStepPasswordToken) -> Void) -> AlertController {
     var dismissImpl: (() -> Void)?
     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: BotCheckoutPasswordAlertContentNode(context: context, theme: presentationData.theme, strings: strings, cardTitle: cartTitle, period: period, requiresBiometrics: requiresBiometrics, cancel: {
+    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: BotCheckoutPasswordAlertContentNode(context: context, theme: presentationData.theme, strings: strings, passwordTip: passwordTip, cardTitle: cartTitle, period: period, requiresBiometrics: requiresBiometrics, cancel: {
         dismissImpl?()
     }, completion: { token in
         completion(token)
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift
index 46df1456df..2e33d49e95 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutPriceItem.swift
@@ -6,28 +6,33 @@ import SwiftSignalKit
 import TelegramPresentationData
 import ItemListUI
 import PresentationDataUtils
+import ShimmerEffect
 
 class BotCheckoutPriceItem: ListViewItem, ItemListItem {
     let theme: PresentationTheme
     let title: String
     let label: String
     let isFinal: Bool
+    let hasSeparator: Bool
+    let shimmeringIndex: Int?
     let sectionId: ItemListSectionId
     
     let requestsNoInset: Bool = true
     
-    init(theme: PresentationTheme, title: String, label: String, isFinal: Bool, sectionId: ItemListSectionId) {
+    init(theme: PresentationTheme, title: String, label: String, isFinal: Bool, hasSeparator: Bool, shimmeringIndex: Int?, sectionId: ItemListSectionId) {
         self.theme = theme
         self.title = title
         self.label = label
         self.isFinal = isFinal
+        self.hasSeparator = hasSeparator
+        self.shimmeringIndex = shimmeringIndex
         self.sectionId = sectionId
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = BotCheckoutPriceItemNode()
-            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), previousItem, nextItem)
             
             node.contentSize = layout.contentSize
             node.insets = layout.insets
@@ -46,7 +51,7 @@ class BotCheckoutPriceItem: ListViewItem, ItemListItem {
                 let makeLayout = nodeValue.asyncLayout()
                 
                 async {
-                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem), previousItem, nextItem)
                     Queue.mainQueue().async {
                         completion(layout, { _ in
                             apply()
@@ -67,13 +72,13 @@ private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets {
     var insets = UIEdgeInsets()
     switch neighbors.top {
         case .otherSection:
-            insets.top += 8.0
+            insets.top += 24.0
         case .none, .sameSection:
             break
     }
     switch neighbors.bottom {
         case .none, .otherSection:
-            insets.bottom += 8.0
+            insets.bottom += 24.0
         case .sameSection:
             break
     }
@@ -83,6 +88,13 @@ private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets {
 class BotCheckoutPriceItemNode: ListViewItemNode {
     let titleNode: TextNode
     let labelNode: TextNode
+
+    let backgroundNode: ASDisplayNode
+    let separatorNode: ASDisplayNode
+    let bottomSeparatorNode: ASDisplayNode
+
+    private var placeholderNode: ShimmerEffectNode?
+    private var absoluteLocation: (CGRect, CGSize)?
     
     private var item: BotCheckoutPriceItem?
     
@@ -92,21 +104,58 @@ class BotCheckoutPriceItemNode: ListViewItemNode {
         
         self.labelNode = TextNode()
         self.labelNode.isUserInteractionEnabled = false
+
+        self.backgroundNode = ASDisplayNode()
+        self.separatorNode = ASDisplayNode()
+        self.bottomSeparatorNode = ASDisplayNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
-        
+
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.titleNode)
         self.addSubnode(self.labelNode)
+        self.addSubnode(self.separatorNode)
+        self.addSubnode(self.bottomSeparatorNode)
+    }
+
+    override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y += self.insets.top
+        self.absoluteLocation = (rect, containerSize)
+        if let shimmerNode = self.placeholderNode {
+            shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+        }
     }
     
-    func asyncLayout() -> (_ item: BotCheckoutPriceItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+    func asyncLayout() -> (_ item: BotCheckoutPriceItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors, _ previousItem: ListViewItem?, _ nextItem: ListViewItem?) -> (ListViewItemNodeLayout, () -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
         let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
         
-        return { item, params, neighbors in
+        return { item, params, neighbors, previousItem, nextItem in
             let rightInset: CGFloat = 16.0 + params.rightInset
+
+            let naturalContentHeight: CGFloat
+            var verticalOffset: CGFloat = 0.0
+            if item.isFinal {
+                naturalContentHeight = 44.0
+            } else {
+                switch neighbors.bottom {
+                case .otherSection, .none:
+                    naturalContentHeight = 44.0
+                default:
+                    naturalContentHeight = 34.0
+                }
+            }
+            if let _ = previousItem as? BotCheckoutHeaderItem {
+                verticalOffset += 8.0
+            }
             
-            let contentSize = CGSize(width: params.width, height: 34.0)
+            var contentSize = CGSize(width: params.width, height: naturalContentHeight + verticalOffset)
+            if let nextItem = nextItem as? BotCheckoutPriceItem {
+                if nextItem.isFinal {
+                    contentSize.height += 8.0
+                }
+            }
             let insets = priceItemInsets(neighbors)
             
             let textFont: UIFont
@@ -130,9 +179,58 @@ class BotCheckoutPriceItemNode: ListViewItemNode {
                     let _ = labelApply()
                     
                     let leftInset: CGFloat = 16.0 + params.leftInset
+
+                    strongSelf.separatorNode.isHidden = !item.hasSeparator
+                    strongSelf.separatorNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+                    strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: params.width - leftInset, height: UIScreenPixel))
+
+                    switch neighbors.bottom {
+                    case .otherSection, .none:
+                        strongSelf.bottomSeparatorNode.isHidden = false
+                    default:
+                        strongSelf.bottomSeparatorNode.isHidden = !item.isFinal
+                    }
+
+                    strongSelf.bottomSeparatorNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
+                    strongSelf.bottomSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: contentSize.height), size: CGSize(width: params.width, height: UIScreenPixel))
+
+                    strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+                    strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: contentSize.height))
                     
-                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size)
-                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - rightInset - labelLayout.size.width, y: floor((contentSize.height - labelLayout.size.height) / 2.0)), size: labelLayout.size)
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: verticalOffset + floor((naturalContentHeight - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - rightInset - labelLayout.size.width, y: verticalOffset + floor((naturalContentHeight - labelLayout.size.height) / 2.0)), size: labelLayout.size)
+
+                    if let shimmeringIndex = item.shimmeringIndex {
+                        let shimmerNode: ShimmerEffectNode
+                        if let current = strongSelf.placeholderNode {
+                            shimmerNode = current
+                        } else {
+                            shimmerNode = ShimmerEffectNode()
+                            strongSelf.placeholderNode = shimmerNode
+                            if strongSelf.separatorNode.supernode != nil {
+                                strongSelf.insertSubnode(shimmerNode, belowSubnode: strongSelf.separatorNode)
+                            } else {
+                                strongSelf.addSubnode(shimmerNode)
+                            }
+                        }
+                        shimmerNode.frame = CGRect(origin: CGPoint(), size: contentSize)
+                        if let (rect, size) = strongSelf.absoluteLocation {
+                            shimmerNode.updateAbsoluteRect(rect, within: size)
+                        }
+
+                        var shapes: [ShimmerEffectNode.Shape] = []
+
+                        let titleLineWidth: CGFloat = (shimmeringIndex % 2 == 0) ? 120.0 : 80.0
+                        let lineDiameter: CGFloat = 8.0
+
+                        let titleFrame = strongSelf.titleNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter))
+
+                        shimmerNode.update(backgroundColor: item.theme.list.itemBlocksBackgroundColor, foregroundColor: item.theme.list.mediaPlaceholderColor, shimmeringColor: item.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: contentSize)
+                    } else if let shimmerNode = strongSelf.placeholderNode {
+                        strongSelf.placeholderNode = nil
+                        shimmerNode.removeFromSupernode()
+                    }
                 }
             })
         }
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift
new file mode 100644
index 0000000000..5c8a7c620a
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutTipItem.swift
@@ -0,0 +1,782 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramPresentationData
+import ItemListUI
+import PresentationDataUtils
+import TelegramStringFormatting
+
+class BotCheckoutTipItem: ListViewItem, ItemListItem {
+    let theme: PresentationTheme
+    let strings: PresentationStrings
+    let title: String
+    let currency: String
+    let value: String
+    let numericValue: Int64
+    let maxValue: Int64
+    let availableVariants: [(String, Int64)]
+    let updateValue: (Int64) -> Void
+    let updatedFocus: (Bool) -> Void
+
+    let sectionId: ItemListSectionId
+    
+    let requestsNoInset: Bool = true
+    
+    init(theme: PresentationTheme, strings: PresentationStrings, title: String, currency: String, value: String, numericValue: Int64, maxValue: Int64, availableVariants: [(String, Int64)], sectionId: ItemListSectionId, updateValue: @escaping (Int64) -> Void, updatedFocus: @escaping (Bool) -> Void) {
+        self.theme = theme
+        self.strings = strings
+        self.title = title
+        self.currency = currency
+        self.value = value
+        self.numericValue = numericValue
+        self.maxValue = maxValue
+        self.availableVariants = availableVariants
+        self.updateValue = updateValue
+        self.updatedFocus = updatedFocus
+        self.sectionId = sectionId
+    }
+    
+    func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = BotCheckoutTipItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply() })
+                })
+            }
+        }
+    }
+    
+    func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? BotCheckoutTipItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params, itemListNeighbors(item: self, topItem: previousItem as? ItemListItem, bottomItem: nextItem as? ItemListItem))
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply()
+                        })
+                    }
+                }
+            }
+        }
+    }
+    
+    let selectable: Bool = false
+}
+
+private let titleFont = Font.regular(17.0)
+private let finalFont = Font.semibold(17.0)
+
+private func priceItemInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets {
+    var insets = UIEdgeInsets()
+    switch neighbors.top {
+        case .otherSection:
+            insets.top += 8.0
+        case .none, .sameSection:
+            break
+    }
+    switch neighbors.bottom {
+        case .none, .otherSection:
+            insets.bottom += 8.0
+        case .sameSection:
+            break
+    }
+    return insets
+}
+
+private final class TipValueNode: ASDisplayNode {
+    private let backgroundNode: ASImageNode
+    private let titleNode: ImmediateTextNode
+
+    private let button: HighlightTrackingButtonNode
+
+    private var currentBackgroundColor: UIColor?
+
+    var action: (() -> Void)?
+
+    override init() {
+        self.backgroundNode = ASImageNode()
+        self.titleNode = ImmediateTextNode()
+
+        self.button = HighlightTrackingButtonNode()
+
+        super.init()
+
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.button)
+        self.button.addTarget(self, action:  #selector(self.buttonPressed), forControlEvents: .touchUpInside)
+    }
+
+    @objc private func buttonPressed() {
+        self.action?()
+    }
+
+    func update(theme: PresentationTheme, text: String, isHighlighted: Bool, height: CGFloat) -> (CGFloat, (CGFloat) -> Void) {
+        var updateBackground = false
+        let backgroundColor = isHighlighted ? theme.list.paymentOption.activeFillColor : theme.list.paymentOption.inactiveFillColor
+        if let currentBackgroundColor = self.currentBackgroundColor {
+            if !currentBackgroundColor.isEqual(backgroundColor) {
+                updateBackground = true
+            }
+        } else {
+            updateBackground = true
+        }
+        if updateBackground {
+            self.currentBackgroundColor = backgroundColor
+            self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 20.0, color: backgroundColor)
+        }
+
+        self.titleNode.attributedText = NSAttributedString(string: text, font: Font.semibold(15.0), textColor: isHighlighted ? theme.list.paymentOption.activeForegroundColor : theme.list.paymentOption.inactiveForegroundColor)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: 200.0, height: height))
+
+        let minWidth: CGFloat = 80.0
+
+        let calculatedWidth = max(titleSize.width + 16.0 * 2.0, minWidth)
+
+        return (calculatedWidth, { calculatedWidth in
+            self.titleNode.frame = CGRect(origin: CGPoint(x: floor((calculatedWidth - titleSize.width) / 2.0), y: floor((height - titleSize.height) / 2.0)), size: titleSize)
+
+            let size = CGSize(width: calculatedWidth, height: height)
+            self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
+
+            self.button.frame = CGRect(origin: CGPoint(), size: size)
+        })
+    }
+}
+
+private final class FormatterImpl: NSObject, UITextFieldDelegate {
+    private struct Representation {
+        private let format: CurrencyFormat
+        private var caretIndex: Int = 0
+        private var wholePart: [Int] = []
+        private var decimalPart: [Int] = []
+
+        init(string: String, format: CurrencyFormat) {
+            self.format = format
+
+            var isDecimalPart = false
+            for c in string {
+                if c.isNumber {
+                    if let value = Int(String(c)) {
+                        if isDecimalPart {
+                            self.decimalPart.append(value)
+                        } else {
+                            self.wholePart.append(value)
+                        }
+                    }
+                } else if String(c) == format.decimalSeparator {
+                    isDecimalPart = true
+                }
+            }
+
+            while self.wholePart.count > 1 {
+                if self.wholePart[0] != 0 {
+                    break
+                } else {
+                    self.wholePart.removeFirst()
+                }
+            }
+            if self.wholePart.isEmpty {
+                self.wholePart = [0]
+            }
+
+            while self.decimalPart.count > 1 {
+                if self.decimalPart[self.decimalPart.count - 1] != 0 {
+                    break
+                } else {
+                    self.decimalPart.removeLast()
+                }
+            }
+            while self.decimalPart.count < format.decimalDigits {
+                self.decimalPart.append(0)
+            }
+
+            self.caretIndex = self.wholePart.count
+        }
+
+        var minCaretIndex: Int {
+            for i in 0 ..< self.wholePart.count {
+                if self.wholePart[i] != 0 {
+                    return i
+                }
+            }
+            return self.wholePart.count
+        }
+
+        mutating func moveCaret(offset: Int) {
+            self.caretIndex = max(self.minCaretIndex, min(self.caretIndex + offset, self.wholePart.count + self.decimalPart.count))
+        }
+
+        mutating func normalize() {
+            while self.wholePart.count > 1 {
+                if self.wholePart[0] != 0 {
+                    break
+                } else {
+                    self.wholePart.removeFirst()
+                    self.moveCaret(offset: -1)
+                }
+            }
+            if self.wholePart.isEmpty {
+                self.wholePart = [0]
+            }
+
+            while self.decimalPart.count < format.decimalDigits {
+                self.decimalPart.append(0)
+            }
+            while self.decimalPart.count > format.decimalDigits {
+                self.decimalPart.removeLast()
+            }
+
+            self.caretIndex = max(self.minCaretIndex, min(self.caretIndex, self.wholePart.count + self.decimalPart.count))
+        }
+
+        mutating func backspace() {
+            if self.caretIndex > self.wholePart.count {
+                let decimalIndex = self.caretIndex - self.wholePart.count
+                if decimalIndex > 0 {
+                    self.decimalPart.remove(at: decimalIndex - 1)
+
+                    self.moveCaret(offset: -1)
+                    self.normalize()
+                }
+            } else {
+                if self.caretIndex > 0 {
+                    self.wholePart.remove(at: self.caretIndex - 1)
+
+                    self.moveCaret(offset: -1)
+                    self.normalize()
+                }
+            }
+        }
+
+        mutating func insert(letter: String) {
+            if letter == "." || letter == "," {
+                if self.caretIndex == self.wholePart.count {
+                    return
+                } else if self.caretIndex < self.wholePart.count {
+                    for i in (self.caretIndex ..< self.wholePart.count).reversed() {
+                        self.decimalPart.insert(self.wholePart[i], at: 0)
+                        self.wholePart.remove(at: i)
+                    }
+                }
+
+                self.normalize()
+            } else if letter.count == 1 && letter[letter.startIndex].isNumber {
+                if let value = Int(letter) {
+                    if self.caretIndex <= self.wholePart.count {
+                        self.wholePart.insert(value, at: self.caretIndex)
+                    } else {
+                        let decimalIndex = self.caretIndex - self.wholePart.count
+                        self.decimalPart.insert(value, at: decimalIndex)
+                    }
+                    self.moveCaret(offset: 1)
+                    self.normalize()
+                }
+            }
+        }
+
+        var string: String {
+            var result = ""
+
+            for digit in self.wholePart {
+                result.append("\(digit)")
+            }
+            result.append(self.format.decimalSeparator)
+            for digit in self.decimalPart {
+                result.append("\(digit)")
+            }
+
+            return result
+        }
+
+        var stringCaretIndex: Int {
+            var logicalIndex = 0
+            var resolvedIndex = 0
+
+            if logicalIndex == self.caretIndex {
+                return resolvedIndex
+            }
+
+            for _ in self.wholePart {
+                logicalIndex += 1
+                resolvedIndex += 1
+
+                if logicalIndex == self.caretIndex {
+                    return resolvedIndex
+                }
+            }
+
+            resolvedIndex += 1
+
+            for _ in self.decimalPart {
+                logicalIndex += 1
+                resolvedIndex += 1
+
+                if logicalIndex == self.caretIndex {
+                    return resolvedIndex
+                }
+            }
+
+            return resolvedIndex
+        }
+
+        var numericalValue: Int64 {
+            var result: Int64 = 0
+
+            for digit in self.wholePart {
+                result *= 10
+                result += Int64(digit)
+            }
+            for digit in self.decimalPart {
+                result *= 10
+                result += Int64(digit)
+            }
+
+            return result
+        }
+    }
+
+    private let format: CurrencyFormat
+    private let currency: String
+    private let maxNumericalValue: Int64
+    private let updated: (Int64) -> Void
+    private let focusUpdated: (Bool) -> Void
+
+    private var representation: Representation
+
+    private var previousResolvedCaretIndex: Int = 0
+    private var ignoreTextSelection: Bool = false
+    private var enableTextSelectionProcessing: Bool = false
+
+    init?(textField: UITextField, currency: String, maxNumericalValue: Int64, initialValue: String, updated: @escaping (Int64) -> Void, focusUpdated: @escaping (Bool) -> Void) {
+        guard let format = CurrencyFormat(currency: currency) else {
+            return nil
+        }
+        self.format = format
+        self.currency = currency
+        self.maxNumericalValue = maxNumericalValue
+        self.updated = updated
+        self.focusUpdated = focusUpdated
+
+        self.representation = Representation(string: initialValue, format: format)
+
+        super.init()
+
+        textField.text = self.representation.string
+        self.previousResolvedCaretIndex = self.representation.stringCaretIndex
+    }
+
+    func reset(textField: UITextField, initialValue: String) {
+        self.representation = Representation(string: initialValue, format: self.format)
+        self.resetFromRepresentation(textField: textField, notifyUpdated: false)
+    }
+
+    private func resetFromRepresentation(textField: UITextField, notifyUpdated: Bool) {
+        self.ignoreTextSelection = true
+
+        if self.representation.numericalValue > self.maxNumericalValue {
+            self.representation = Representation(string: formatCurrencyAmountCustom(self.maxNumericalValue, currency: self.currency).0, format: self.format)
+        }
+
+        textField.text = self.representation.string
+        self.previousResolvedCaretIndex = self.representation.stringCaretIndex
+
+        if self.enableTextSelectionProcessing {
+            let stringCaretIndex = self.representation.stringCaretIndex
+            if let caretPosition = textField.position(from: textField.beginningOfDocument, offset: stringCaretIndex) {
+                textField.selectedTextRange = textField.textRange(from: caretPosition, to: caretPosition)
+            }
+        }
+        self.ignoreTextSelection = false
+
+        if notifyUpdated {
+            self.updated(self.representation.numericalValue)
+        }
+    }
+
+    @objc public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if string.count == 1 {
+            self.representation.insert(letter: string)
+            self.resetFromRepresentation(textField: textField, notifyUpdated: true)
+        } else if string.count == 0 {
+            self.representation.backspace()
+            self.resetFromRepresentation(textField: textField, notifyUpdated: true)
+        }
+
+        return false
+    }
+
+    @objc public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        return false
+    }
+
+    @objc public func textFieldDidBeginEditing(_ textField: UITextField) {
+        self.enableTextSelectionProcessing = true
+        self.focusUpdated(true)
+
+        let stringCaretIndex = self.representation.stringCaretIndex
+        self.previousResolvedCaretIndex = stringCaretIndex
+        if let caretPosition = textField.position(from: textField.beginningOfDocument, offset: stringCaretIndex) {
+            self.ignoreTextSelection = true
+            textField.selectedTextRange = textField.textRange(from: caretPosition, to: caretPosition)
+            DispatchQueue.main.async {
+                textField.selectedTextRange = textField.textRange(from: caretPosition, to: caretPosition)
+                self.ignoreTextSelection = false
+            }
+        }
+    }
+
+    @objc public func textFieldDidChangeSelection(_ textField: UITextField) {
+        if self.ignoreTextSelection {
+            return
+        }
+        if !self.enableTextSelectionProcessing {
+            return
+        }
+
+        if let selectedTextRange = textField.selectedTextRange {
+            let index = textField.offset(from: textField.beginningOfDocument, to: selectedTextRange.end)
+            if self.previousResolvedCaretIndex != index {
+                self.representation.moveCaret(offset: self.previousResolvedCaretIndex < index ? 1 : -1)
+
+                let stringCaretIndex = self.representation.stringCaretIndex
+                self.previousResolvedCaretIndex = stringCaretIndex
+                if let caretPosition = textField.position(from: textField.beginningOfDocument, offset: stringCaretIndex) {
+                        textField.selectedTextRange = textField.textRange(from: caretPosition, to: caretPosition)
+                }
+            }
+        }
+    }
+
+    @objc public func textFieldDidEndEditing(_ textField: UITextField) {
+        self.enableTextSelectionProcessing = false
+        self.focusUpdated(false)
+    }
+}
+
+class BotCheckoutTipItemNode: ListViewItemNode, UITextFieldDelegate {
+    private let backgroundNode: ASDisplayNode
+    let titleNode: TextNode
+    let labelNode: TextNode
+    let tipMeasurementNode: ImmediateTextNode
+    let tipCurrencyNode: ImmediateTextNode
+    private let textNode: TextFieldNode
+
+    private let scrollNode: ASScrollNode
+    private var valueNodes: [TipValueNode] = []
+    
+    private var item: BotCheckoutTipItem?
+    private var formatter: FormatterImpl?
+    
+    init() {
+        self.backgroundNode = ASDisplayNode()
+
+        self.titleNode = TextNode()
+        self.titleNode.isUserInteractionEnabled = false
+
+        self.labelNode = TextNode()
+        self.labelNode.isUserInteractionEnabled = false
+        self.labelNode.isHidden = true
+
+        self.tipMeasurementNode = ImmediateTextNode()
+        self.tipCurrencyNode = ImmediateTextNode()
+
+        self.textNode = TextFieldNode()
+
+        self.scrollNode = ASScrollNode()
+        self.scrollNode.view.disablesInteractiveTransitionGestureRecognizer = true
+        self.scrollNode.view.showsVerticalScrollIndicator = false
+        self.scrollNode.view.showsHorizontalScrollIndicator = false
+        self.scrollNode.view.scrollsToTop = false
+        self.scrollNode.view.delaysContentTouches = false
+        self.scrollNode.view.canCancelContentTouches = true
+        if #available(iOS 11.0, *) {
+            self.scrollNode.view.contentInsetAdjustmentBehavior = .never
+        }
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+
+        self.addSubnode(self.backgroundNode)
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.labelNode)
+        self.addSubnode(self.textNode)
+        self.addSubnode(self.tipCurrencyNode)
+        self.addSubnode(self.scrollNode)
+
+        self.textNode.clipsToBounds = true
+        self.textNode.textField.addTarget(self, action: #selector(self.textFieldTextChanged(_:)), for: .editingChanged)
+        self.textNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
+    }
+    
+    func asyncLayout() -> (_ item: BotCheckoutTipItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
+        
+        return { item, params, neighbors in
+            //let rightInset: CGFloat = 16.0 + params.rightInset
+
+            let labelsContentHeight: CGFloat = 34.0
+            
+            var contentSize = CGSize(width: params.width, height: labelsContentHeight)
+            if !item.availableVariants.isEmpty {
+                contentSize.height += 75.0
+            }
+
+            let insets = priceItemInsets(neighbors)
+            
+            let textFont: UIFont
+            let textColor: UIColor
+
+            textFont = titleFont
+            textColor = item.theme.list.itemSecondaryTextColor
+            
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: textFont, textColor: textColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+
+            let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.strings.Checkout_OptionalTipItemPlaceholder, font: textFont, textColor: textColor.withMultipliedAlpha(0.8)), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 20.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    
+                    let _ = titleApply()
+                    let _ = labelApply()
+                    
+                    let leftInset: CGFloat = 16.0 + params.leftInset
+                    
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((labelsContentHeight - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: params.width - leftInset - labelLayout.size.width, y: floor((labelsContentHeight - labelLayout.size.height) / 2.0)), size: labelLayout.size)
+
+                    if strongSelf.formatter == nil {
+                        strongSelf.formatter = FormatterImpl(textField: strongSelf.textNode.textField, currency: item.currency, maxNumericalValue: item.maxValue, initialValue: item.value, updated: { value in
+                            guard let strongSelf = self, let item = strongSelf.item else {
+                                return
+                            }
+                            if item.numericValue != value {
+                                item.updateValue(value)
+                            }
+                        }, focusUpdated: { value in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            if value {
+                                strongSelf.item?.updatedFocus(true)
+                            }
+                        })
+                        strongSelf.textNode.textField.delegate = strongSelf.formatter
+
+                        /*strongSelf.formatterDelegate = CurrencyUITextFieldDelegate(formatter: CurrencyFormatter(currency: item.currency, { formatter in
+                            formatter.maxValue = currencyToFractionalAmount(value: item.maxValue, currency: item.currency) ?? 10000.0
+                            formatter.minValue = 0.0
+                            formatter.hasDecimals = true
+                        }))
+                        strongSelf.formatterDelegate?.passthroughDelegate = strongSelf
+
+                        strongSelf.formatterDelegate?.textUpdated = {
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.textFieldTextChanged(strongSelf.textNode.textField)
+                        }
+
+                        strongSelf.textNode.textField.delegate = strongSelf.formatterDelegate*/
+
+                        strongSelf.textNode.clipsToBounds = true
+                        //strongSelf.textNode.textField.delegate = strongSelf
+                    }
+
+                    strongSelf.textNode.textField.typingAttributes = [NSAttributedString.Key.font: titleFont]
+                    strongSelf.textNode.textField.font = titleFont
+
+                    strongSelf.textNode.textField.textColor = textColor
+                    strongSelf.textNode.textField.textAlignment = .right
+                    strongSelf.textNode.textField.keyboardAppearance = item.theme.rootController.keyboardColor.keyboardAppearance
+                    strongSelf.textNode.textField.keyboardType = .decimalPad
+                    strongSelf.textNode.textField.returnKeyType = .next
+                    strongSelf.textNode.textField.tintColor = item.theme.list.itemAccentColor
+
+                    var textInputFrame = CGRect(origin: CGPoint(x: params.width - leftInset - 150.0, y: -2.0), size: CGSize(width: 150.0, height: labelsContentHeight))
+
+                    let currencyText: (String, String, Bool) = formatCurrencyAmountCustom(item.numericValue, currency: item.currency)
+
+                    let currencySymbolOnTheLeft = currencyText.2
+                    //let currencySymbolOnTheLeft = true
+
+                    if strongSelf.textNode.textField.text ?? "" != currencyText.0 {
+                        strongSelf.formatter?.reset(textField: strongSelf.textNode.textField, initialValue: currencyText.0)
+                    }
+
+                    strongSelf.tipMeasurementNode.attributedText = NSAttributedString(string: currencyText.0, font: titleFont, textColor: textColor)
+                    let inputTextSize = strongSelf.tipMeasurementNode.updateLayout(textInputFrame.size)
+
+                    let spaceRect = NSAttributedString(string: " ", font: titleFont, textColor: textColor).boundingRect(with: CGSize(width: 100.0, height: 100.0), options: .usesLineFragmentOrigin, context: nil)
+
+                    strongSelf.tipCurrencyNode.attributedText = NSAttributedString(string: "\(currencyText.1)", font: titleFont, textColor: textColor)
+                    let currencySize = strongSelf.tipCurrencyNode.updateLayout(CGSize(width: 100.0, height: .greatestFiniteMagnitude))
+                    if currencySymbolOnTheLeft {
+                        strongSelf.tipCurrencyNode.frame = CGRect(origin: CGPoint(x: textInputFrame.maxX - currencySize.width - inputTextSize.width - spaceRect.width, y: floor((labelsContentHeight - currencySize.height) / 2.0) - 1.0), size: currencySize)
+                    } else {
+                        strongSelf.tipCurrencyNode.frame = CGRect(origin: CGPoint(x: textInputFrame.maxX - currencySize.width, y: floor((labelsContentHeight - currencySize.height) / 2.0) - 1.0), size: currencySize)
+                        textInputFrame.origin.x -= currencySize.width + spaceRect.width
+                    }
+
+                    strongSelf.textNode.frame = textInputFrame
+
+                    let valueHeight: CGFloat = 52.0
+                    let valueY: CGFloat = labelsContentHeight + 9.0
+
+                    var index = 0
+                    var variantLayouts: [(CGFloat, (CGFloat) -> Void)] = []
+                    var totalMinWidth: CGFloat = 0.0
+                    for (variantText, variantValue) in item.availableVariants {
+                        let valueNode: TipValueNode
+                        if strongSelf.valueNodes.count > index {
+                            valueNode = strongSelf.valueNodes[index]
+                        } else {
+                            valueNode = TipValueNode()
+                            strongSelf.valueNodes.append(valueNode)
+                            strongSelf.scrollNode.addSubnode(valueNode)
+                        }
+                        let (nodeMinWidth, nodeApply) = valueNode.update(theme: item.theme, text: variantText, isHighlighted: item.value == variantText, height: valueHeight)
+                        valueNode.action = {
+                            guard let strongSelf = self, let item = strongSelf.item else {
+                                return
+                            }
+                            if item.numericValue == variantValue {
+                                item.updateValue(0)
+                            } else {
+                                item.updateValue(variantValue)
+                            }
+                        }
+                        totalMinWidth += nodeMinWidth
+                        variantLayouts.append((nodeMinWidth, nodeApply))
+                        index += 1
+                    }
+
+                    let sideInset: CGFloat = params.leftInset + 16.0
+                    var scaleFactor: CGFloat = 1.0
+                    let availableWidth = params.width - sideInset * 2.0 - CGFloat(max(0, item.availableVariants.count - 1)) * 12.0
+                    if totalMinWidth < availableWidth {
+                        scaleFactor = availableWidth / totalMinWidth
+                    }
+
+                    var variantsOffset: CGFloat = sideInset
+                    for index in 0 ..< item.availableVariants.count {
+                        if index != 0 {
+                            variantsOffset += 12.0
+                        }
+
+                        let valueNode: TipValueNode = strongSelf.valueNodes[index]
+                        let (minWidth, nodeApply) = variantLayouts[index]
+
+                        let nodeWidth = floor(scaleFactor * minWidth)
+
+                        var valueFrame = CGRect(origin: CGPoint(x: variantsOffset, y: 0.0), size: CGSize(width: nodeWidth, height: valueHeight))
+                        if scaleFactor > 1.0 && index == item.availableVariants.count - 1 {
+                            valueFrame.size.width = params.width - sideInset - valueFrame.minX
+                        }
+
+                        valueNode.frame = valueFrame
+                        nodeApply(nodeWidth)
+                        variantsOffset += nodeWidth
+                    }
+
+                    variantsOffset += 16.0
+
+                    strongSelf.scrollNode.frame = CGRect(origin: CGPoint(x: 0.0, y: valueY), size: CGSize(width: params.width, height: max(0.0, contentSize.height - valueY)))
+                    strongSelf.scrollNode.view.contentSize = CGSize(width: variantsOffset, height: strongSelf.scrollNode.frame.height)
+
+                    strongSelf.backgroundNode.backgroundColor = item.theme.list.itemBlocksBackgroundColor
+                    strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: contentSize.height))
+                }
+            })
+        }
+    }
+
+    @objc private func dismissKeyboard() {
+        self.textNode.textField.resignFirstResponder()
+    }
+
+    @objc private func textFieldTextChanged(_ textField: UITextField) {
+        let text = textField.text ?? ""
+        //self.labelNode.isHidden = !text.isEmpty
+
+        guard let item = self.item else {
+            return
+        }
+
+        if text.isEmpty {
+            item.updateValue(0)
+            return
+        }
+
+        /*var cleanText = ""
+        for c in text {
+            if c.isNumber {
+                cleanText.append(c)
+            } else if c == "," {
+                cleanText.append(".")
+            }
+        }
+
+        guard let doubleValue = Double(cleanText) else {
+            return
+        }
+
+        if var value = fractionalToCurrencyAmount(value: doubleValue, currency: item.currency) {
+            if value > item.maxValue {
+                value = item.maxValue
+
+                let currencyText = formatCurrencyAmountCustom(value, currency: item.currency)
+                if self.textNode.textField.text ?? "" != currencyText.0 {
+                    self.textNode.textField.text = currencyText.0
+                }
+            }
+            item.updateValue(value)
+        }*/
+    }
+
+    @objc public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        return true
+    }
+
+    @objc public func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        return false
+    }
+
+    @objc public func textFieldDidBeginEditing(_ textField: UITextField) {
+        textField.selectedTextRange = textField.textRange(from: textField.endOfDocument, to: textField.endOfDocument)
+
+        self.item?.updatedFocus(true)
+    }
+
+    @objc public func textFieldDidChangeSelection(_ textField: UITextField) {
+        textField.selectedTextRange = textField.textRange(from: textField.endOfDocument, to: textField.endOfDocument)
+    }
+
+    @objc public func textFieldDidEndEditing(_ textField: UITextField) {
+    }
+    
+    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override func animateAdded(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+    }
+    
+    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+}
diff --git a/submodules/BotPaymentsUI/Sources/BotCheckoutWebInteractionController.swift b/submodules/BotPaymentsUI/Sources/BotCheckoutWebInteractionController.swift
index 6a0fcc693b..8f555ac9ac 100644
--- a/submodules/BotPaymentsUI/Sources/BotCheckoutWebInteractionController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotCheckoutWebInteractionController.swift
@@ -75,7 +75,7 @@ final class BotCheckoutWebInteractionController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override var presentationController: UIPresentationController? {
diff --git a/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift b/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift
index 615488fc73..947331fc9c 100644
--- a/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift
+++ b/submodules/BotPaymentsUI/Sources/BotPaymentFieldItemNode.swift
@@ -117,7 +117,7 @@ final class BotPaymentFieldItemNode: BotPaymentItemNode, UITextFieldDelegate {
         
         textInset = max(measuredInset, textInset)
         
-        transition.updateFrame(node: self.textField, frame: CGRect(origin: CGPoint(x: textInset, y: 3.0), size: CGSize(width: max(1.0, width - textInset - 8.0), height: 40.0)))
+        transition.updateFrame(node: self.textField, frame: CGRect(origin: CGPoint(x: textInset, y: 0.0), size: CGSize(width: max(1.0, width - textInset - 8.0), height: 40.0)))
         
         return 44.0
     }
diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptController.swift b/submodules/BotPaymentsUI/Sources/BotReceiptController.swift
index 35522c55cb..b8b2036b2b 100644
--- a/submodules/BotPaymentsUI/Sources/BotReceiptController.swift
+++ b/submodules/BotPaymentsUI/Sources/BotReceiptController.swift
@@ -20,16 +20,14 @@ public final class BotReceiptController: ViewController {
     }
     
     private let context: AccountContext
-    private let invoice: TelegramMediaInvoice
     private let messageId: MessageId
     
     private var presentationData: PresentationData
     
     private var didPlayPresentationAnimation = false
     
-    public init(context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId) {
+    public init(context: AccountContext, messageId: MessageId) {
         self.context = context
-        self.invoice = invoice
         self.messageId = messageId
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -38,10 +36,10 @@ public final class BotReceiptController: ViewController {
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         
-        var title = self.presentationData.strings.Checkout_Receipt_Title
-        if invoice.flags.contains(.isTest) {
+        let title = self.presentationData.strings.Checkout_Receipt_Title
+        /*if invoice.flags.contains(.isTest) {
             title += " (Test)"
-        }
+        }*/
         self.title = title
     }
     
@@ -50,11 +48,7 @@ public final class BotReceiptController: ViewController {
     }
     
     override public func loadDisplayNode() {
-        let displayNode = BotReceiptControllerNode(controller: nil, navigationBar: self.navigationBar!, updateNavigationOffset: { [weak self] offset in
-            if let strongSelf = self {
-                strongSelf.navigationOffset = offset
-            }
-        }, context: self.context, invoice: self.invoice, messageId: self.messageId, dismissAnimated: { [weak self] in
+        let displayNode = BotReceiptControllerNode(controller: nil, navigationBar: self.navigationBar!, context: self.context, messageId: self.messageId, dismissAnimated: { [weak self] in
             self?.dismiss()
         })
         
@@ -81,7 +75,7 @@ public final class BotReceiptController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition, additionalInsets: UIEdgeInsets())
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition, additionalInsets: UIEdgeInsets())
     }
     
     @objc private func cancelPressed() {
diff --git a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift
index 22cf99bc09..5a038bfb0c 100644
--- a/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift
+++ b/submodules/BotPaymentsUI/Sources/BotReceiptControllerNode.swift
@@ -28,7 +28,7 @@ private enum BotReceiptSection: Int32 {
 
 enum BotReceiptEntry: ItemListNodeEntry {
     case header(PresentationTheme, TelegramMediaInvoice, String)
-    case price(Int, PresentationTheme, String, String, Bool)
+    case price(Int, PresentationTheme, String, String, Bool, Bool)
     case paymentMethod(PresentationTheme, String, String)
     case shippingInfo(PresentationTheme, String, String)
     case shippingMethod(PresentationTheme, String, String)
@@ -39,7 +39,7 @@ enum BotReceiptEntry: ItemListNodeEntry {
     var section: ItemListSectionId {
         switch self {
             case .header:
-                return BotReceiptSection.header.rawValue
+                return BotReceiptSection.prices.rawValue
             case .price:
                 return BotReceiptSection.prices.rawValue
             default:
@@ -51,7 +51,7 @@ enum BotReceiptEntry: ItemListNodeEntry {
         switch self {
             case .header:
                 return 0
-            case let .price(index, _, _, _, _):
+            case let .price(index, _, _, _, _, _):
                 return 1 + Int32(index)
             case .paymentMethod:
                 return 10000 + 0
@@ -85,8 +85,8 @@ enum BotReceiptEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsFinal):
-                if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsFinal) = rhs {
+            case let .price(lhsIndex, lhsTheme, lhsText, lhsValue, lhsHasSeparator, lhsFinal):
+                if case let .price(rhsIndex, rhsTheme, rhsText, rhsValue, rhsHasSeparator, rhsFinal) = rhs {
                     if lhsIndex != rhsIndex {
                         return false
                     }
@@ -99,6 +99,9 @@ enum BotReceiptEntry: ItemListNodeEntry {
                     if lhsValue != rhsValue {
                         return false
                     }
+                    if lhsHasSeparator != rhsHasSeparator {
+                        return false
+                    }
                     if lhsFinal != rhsFinal {
                         return false
                     }
@@ -154,39 +157,41 @@ enum BotReceiptEntry: ItemListNodeEntry {
         switch self {
             case let .header(theme, invoice, botName):
                 return BotCheckoutHeaderItem(account: arguments.account, theme: theme, invoice: invoice, botName: botName, sectionId: self.section)
-            case let .price(_, theme, text, value, isFinal):
-                return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, sectionId: self.section)
-            case let .paymentMethod(theme, text, value):
+            case let .price(_, theme, text, value, hasSeparator, isFinal):
+                return BotCheckoutPriceItem(theme: theme, title: text, label: value, isFinal: isFinal, hasSeparator: hasSeparator, shimmeringIndex: nil, sectionId: self.section)
+            case let .paymentMethod(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
-            case let .shippingInfo(theme, text, value):
+            case let .shippingInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
-            case let .shippingMethod(theme, text, value):
+            case let .shippingMethod(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
-            case let .nameInfo(theme, text, value):
+            case let .nameInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
-            case let .emailInfo(theme, text, value):
+            case let .emailInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
-            case let .phoneInfo(theme, text, value):
+            case let .phoneInfo(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none, action: nil)
         }
     }
 }
 
-private func botReceiptControllerEntries(presentationData: PresentationData, invoice: TelegramMediaInvoice, formInvoice: BotPaymentInvoice?, formInfo: BotPaymentRequestedInfo?, shippingOption: BotPaymentShippingOption?, paymentMethodTitle: String?, botPeer: Peer?) -> [BotReceiptEntry] {
+private func botReceiptControllerEntries(presentationData: PresentationData, invoice: TelegramMediaInvoice?, formInvoice: BotPaymentInvoice?, formInfo: BotPaymentRequestedInfo?, shippingOption: BotPaymentShippingOption?, paymentMethodTitle: String?, botPeer: Peer?, tipAmount: Int64?) -> [BotReceiptEntry] {
     var entries: [BotReceiptEntry] = []
     
     var botName = ""
     if let botPeer = botPeer {
         botName = botPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
     }
-    entries.append(.header(presentationData.theme, invoice, botName))
+    if let invoice = invoice {
+        entries.append(.header(presentationData.theme, invoice, botName))
+    }
     
     if let formInvoice = formInvoice {
         var totalPrice: Int64 = 0
         
         var index = 0
         for price in formInvoice.prices {
-            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), false))
+            entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), index == 0, false))
             totalPrice += price.amount
             index += 1
         }
@@ -196,13 +201,19 @@ private func botReceiptControllerEntries(presentationData: PresentationData, inv
             shippingOptionString = shippingOption.title
             
             for price in shippingOption.prices {
-                entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), false))
+                entries.append(.price(index, presentationData.theme, price.label, formatCurrencyAmount(price.amount, currency: formInvoice.currency), index == 0, false))
                 totalPrice += price.amount
                 index += 1
             }
         }
+
+        if let tipAmount = tipAmount, tipAmount != 0 {
+            entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TipItem, formatCurrencyAmount(tipAmount, currency: formInvoice.currency), index == 0, false))
+            totalPrice += tipAmount
+            index += 1
+        }
         
-        entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: formInvoice.currency), true))
+        entries.append(.price(index, presentationData.theme, presentationData.strings.Checkout_TotalAmount, formatCurrencyAmount(totalPrice, currency: formInvoice.currency), true, true))
         
         if let paymentMethodTitle = paymentMethodTitle {
             entries.append(.paymentMethod(presentationData.theme, presentationData.strings.Checkout_PaymentMethod, paymentMethodTitle))
@@ -262,12 +273,14 @@ final class BotReceiptControllerNode: ItemListControllerNode {
     
     private var presentationData: PresentationData
     
-    private let receiptData = Promise<(BotPaymentInvoice, BotPaymentRequestedInfo?, BotPaymentShippingOption?, String?)?>(nil)
+    private let receiptData = Promise<(BotPaymentInvoice, BotPaymentRequestedInfo?, BotPaymentShippingOption?, String?, TelegramMediaInvoice, Int64?)?>(nil)
     private var dataRequestDisposable: Disposable?
-    
+
+    private let actionButtonPanelNode: ASDisplayNode
+    private let actionButtonPanelSeparator: ASDisplayNode
     private let actionButton: BotCheckoutActionButton
     
-    init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, context: AccountContext, invoice: TelegramMediaInvoice, messageId: MessageId, dismissAnimated: @escaping () -> Void) {
+    init(controller: ItemListController?, navigationBar: NavigationBar, context: AccountContext, messageId: MessageId, dismissAnimated: @escaping () -> Void) {
         self.context = context
         self.dismissAnimated = dismissAnimated
         
@@ -277,24 +290,36 @@ final class BotReceiptControllerNode: ItemListControllerNode {
         
         let signal: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError> = combineLatest(context.sharedContext.presentationData, receiptData.get(), context.account.postbox.loadedPeerWithId(messageId.peerId))
         |> map { presentationData, receiptData, botPeer -> (ItemListPresentationData, (ItemListNodeState, Any)) in
-            let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botReceiptControllerEntries(presentationData: presentationData, invoice: invoice, formInvoice: receiptData?.0, formInfo: receiptData?.1, shippingOption: receiptData?.2, paymentMethodTitle: receiptData?.3, botPeer: botPeer), style: .plain, focusItemTag: nil, emptyStateItem: nil, animateChanges: false)
+            let nodeState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: botReceiptControllerEntries(presentationData: presentationData, invoice: receiptData?.4, formInvoice: receiptData?.0, formInfo: receiptData?.1, shippingOption: receiptData?.2, paymentMethodTitle: receiptData?.3, botPeer: botPeer, tipAmount: receiptData?.5), style: .blocks, focusItemTag: nil, emptyStateItem: nil, animateChanges: false)
             
             return (ItemListPresentationData(presentationData), (nodeState, arguments))
         }
+
+        self.actionButtonPanelNode = ASDisplayNode()
+        self.actionButtonPanelNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
+
+        self.actionButtonPanelSeparator = ASDisplayNode()
+        self.actionButtonPanelSeparator.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
         
-        self.actionButton = BotCheckoutActionButton(inactiveFillColor: self.presentationData.theme.list.plainBackgroundColor, activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.plainBackgroundColor)
-        self.actionButton.setState(.inactive(self.presentationData.strings.Common_Done))
+        self.actionButton = BotCheckoutActionButton(activeFillColor: self.presentationData.theme.list.itemAccentColor, foregroundColor: self.presentationData.theme.list.plainBackgroundColor)
+        self.actionButton.setState(.active(self.presentationData.strings.Common_Done))
         
-        super.init(controller: controller, navigationBar: navigationBar, updateNavigationOffset: updateNavigationOffset, state: signal)
+        super.init(controller: controller, navigationBar: navigationBar, state: signal)
         
-        self.dataRequestDisposable = (requestBotPaymentReceipt(network: context.account.network, messageId: messageId) |> deliverOnMainQueue).start(next: { [weak self] receipt in
+        self.dataRequestDisposable = (context.engine.payments.requestBotPaymentReceipt(messageId: messageId) |> deliverOnMainQueue).start(next: { [weak self] receipt in
             if let strongSelf = self {
-                strongSelf.receiptData.set(.single((receipt.invoice, receipt.info, receipt.shippingOption, receipt.credentialsTitle)))
+                UIView.transition(with: strongSelf.view, duration: 0.25, options: UIView.AnimationOptions.transitionCrossDissolve, animations: {
+                }, completion: nil)
+                
+                strongSelf.receiptData.set(.single((receipt.invoice, receipt.info, receipt.shippingOption, receipt.credentialsTitle, receipt.invoiceMedia, receipt.tipAmount)))
             }
         })
         
         self.actionButton.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside)
-        self.addSubnode(self.actionButton)
+
+        self.addSubnode(self.actionButtonPanelNode)
+        self.actionButtonPanelNode.addSubnode(self.actionButtonPanelSeparator)
+        self.actionButtonPanelNode.addSubnode(self.actionButton)
     }
     
     deinit {
@@ -303,12 +328,21 @@ final class BotReceiptControllerNode: ItemListControllerNode {
     
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition, additionalInsets: UIEdgeInsets) {
         var updatedInsets = layout.intrinsicInsets
-        updatedInsets.bottom += BotCheckoutActionButton.diameter + 20.0
-        super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets)
-        
-        let actionButtonFrame = CGRect(origin: CGPoint(x: 10.0, y: layout.size.height - 10.0 - BotCheckoutActionButton.diameter - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width - 20.0, height: BotCheckoutActionButton.diameter))
+
+        let bottomPanelHorizontalInset: CGFloat = 16.0
+        let bottomPanelVerticalInset: CGFloat = 16.0
+        let bottomPanelHeight = max(updatedInsets.bottom, layout.inputHeight ?? 0.0) + bottomPanelVerticalInset * 2.0 + BotCheckoutActionButton.height
+
+        transition.updateFrame(node: self.actionButtonPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelHeight), size: CGSize(width: layout.size.width, height: bottomPanelHeight)))
+        transition.updateFrame(node: self.actionButtonPanelSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
+
+        let actionButtonFrame = CGRect(origin: CGPoint(x: bottomPanelHorizontalInset, y: bottomPanelVerticalInset), size: CGSize(width: layout.size.width - bottomPanelHorizontalInset * 2.0, height: BotCheckoutActionButton.height))
         transition.updateFrame(node: self.actionButton, frame: actionButtonFrame)
-        self.actionButton.updateLayout(size: actionButtonFrame.size, transition: transition)
+        self.actionButton.updateLayout(absoluteRect: actionButtonFrame.offsetBy(dx: self.actionButtonPanelNode.frame.minX, dy: self.actionButtonPanelNode.frame.minY), containerSize: layout.size, transition: transition)
+
+        updatedInsets.bottom = bottomPanelHeight
+
+        super.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: updatedInsets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), navigationBarHeight: navigationBarHeight, transition: transition, additionalInsets: additionalInsets)
     }
     
     @objc func actionButtonPressed() {
diff --git a/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift b/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift
new file mode 100644
index 0000000000..de6e7c03d2
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/Formatter/Currency.swift
@@ -0,0 +1,178 @@
+//
+//  CurrencyCode.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 1/26/19.
+//
+
+import Foundation
+
+/// Currency wraps all availabe currencies that can represented as formatted monetary values
+/// A currency code is a three-letter code that is, in most cases,
+/// composed of a country’s two-character Internet country code plus an extra character
+/// to denote the currency unit. For example, the currency code for the Australian
+/// dollar is “AUD”. Currency codes are based on the ISO 4217 standard
+public enum Currency: String {
+    case afghani = "AFN",
+    algerianDinar = "DZD",
+    argentinePeso = "ARS",
+    armenianDram = "AMD",
+    arubanFlorin = "AWG",
+    australianDollar = "AUD",
+    azerbaijanManat = "AZN",
+    bahamianDollar = "BSD",
+    bahrainiDinar = "BHD",
+    baht = "THB",
+    balboa = "PAB",
+    barbadosDollar = "BBD",
+    belarusianRuble = "BYN",
+    belizeDollar = "BZD",
+    bermudianDollar = "BMD",
+    boliviano = "BOB",
+    bolívar = "VEF",
+    brazilianReal = "BRL",
+    bruneiDollar = "BND",
+    bulgarianLev = "BGN",
+    burundiFranc = "BIF",
+    caboVerdeEscudo = "CVE",
+    canadianDollar = "CAD",
+    caymanIslandsDollar = "KYD",
+    chileanPeso = "CLP",
+    colombianPeso = "COP",
+    comorianFranc  = "KMF",
+    congoleseFranc = "CDF",
+    convertibleMark = "BAM",
+    cordobaOro = "NIO",
+    costaRicanColon = "CRC",
+    cubanPeso = "CUP",
+    czechKoruna = "CZK",
+    dalasi = "GMD",
+    danishKrone = "DKK",
+    denar = "MKD",
+    djiboutiFranc = "DJF",
+    dobra = "STN",
+    dollar = "USD",
+    dominicanPeso = "DOP",
+    dong = "VND",
+    eastCaribbeanDollar = "XCD",
+    egyptianPound = "EGP",
+    elSalvadorColon = "SVC",
+    ethiopianBirr = "ETB",
+    euro = "EUR",
+    falklandIslandsPound = "FKP",
+    fijiDollar = "FJD",
+    forint = "HUF",
+    ghanaCedi = "GHS",
+    gibraltarPound = "GIP",
+    gourde = "HTG",
+    guarani = "PYG",
+    guineanFranc = "GNF",
+    guyanaDollar = "GYD",
+    hongKongDollar = "HKD",
+    hryvnia = "UAH",
+    icelandKrona = "ISK",
+    indianRupee = "INR",
+    iranianRial = "IRR",
+    iraqiDinar = "IQD",
+    jamaicanDollar = "JMD",
+    jordanianDinar = "JOD",
+    kenyanShilling = "KES",
+    kina = "PGK",
+    kuna = "HRK",
+    kuwaitiDinar = "KWD",
+    kwanza = "AOA",
+    kyat = "MMK",
+    laoKip = "LAK",
+    lari = "GEL",
+    lebanesePound = "LBP",
+    lek = "ALL",
+    lempira = "HNL",
+    leone = "SLL",
+    liberianDollar = "LRD",
+    libyanDinar = "LYD",
+    lilangeni = "SZL",
+    loti = "LSL",
+    malagasyAriary = "MGA",
+    malawiKwacha = "MWK",
+    malaysianRinggit = "MYR",
+    mauritiusRupee = "MUR",
+    mexicanPeso = "MXN",
+    mexicanUnidadDeInversion = "MXV",
+    moldovanLeu = "MDL",
+    moroccanDirham = "MAD",
+    mozambiqueMetical = "MZN",
+    mvdol = "BOV",
+    naira = "NGN",
+    nakfa = "ERN",
+    namibiaDollar = "NAD",
+    nepaleseRupee = "NPR",
+    netherlandsAntilleanGuilder = "ANG",
+    newIsraeliSheqel = "ILS",
+    newTaiwanDollar = "TWD",
+    newZealandDollar = "NZD",
+    ngultrum =  "BTN",
+    northKoreanWon = "KPW",
+    norwegianKrone = "NOK",
+    ouguiya = "MRU",
+    paanga = "TOP",
+    pakistanRupee = "PKR",
+    pataca = "MOP",
+    pesoConvertible = "CUC",
+    pesoUruguayo = "UYU",
+    philippinePiso = "PHP",
+    poundSterling = "GBP",
+    pula = "BWP",
+    qatariRial = "QAR",
+    quetzal = "GTQ",
+    rand = "ZAR",
+    rialOmani = "OMR",
+    riel = "KHR",
+    romanianLeu = "RON",
+    rufiyaa = "MVR",
+    rupiah = "IDR",
+    russianRuble = "RUB",
+    rwandaFranc = "RWF",
+    saintHelenaPound = "SHP",
+    saudiRiyal = "SAR",
+    serbianDinar = "RSD",
+    seychellesRupee = "SCR",
+    singaporeDollar = "SGD",
+    sol = "PEN",
+    solomonIslandsDollar = "SBD",
+    som = "KGS",
+    somaliShilling = "SOS",
+    somoni = "TJS",
+    southSudanesePound = "SSP",
+    sriLankaRupee = "LKR",
+    sudanesePound = "SDG",
+    surinamDollar = "SRD",
+    swedishKrona = "SEK",
+    swissFranc = "CHF",
+    syrianPound = "SYP",
+    taka = "BDT",
+    tala = "WST",
+    tanzanianShilling = "TZS",
+    tenge = "KZT",
+    trinidadAndTobagoDollar = "TTD",
+    tugrik = "MNT",
+    tunisianDinar = "TND",
+    turkishLira = "TRY",
+    turkmenistanNewManat = "TMT",
+    uaeDirham = "AED",
+    ugandaShilling = "UGX",
+    unidadDeFomento = "CLF",
+    unidadDeValorReal = "COU",
+    uruguayPesoEnUnidadesIndexadas = "UYI",
+    uzbekistanSum = "UZS",
+    vatu = "VUV",
+    wirEuro = "CHE",
+    wirFranc = "CHW",
+    won = "KRW",
+    yemeniRial = "YER",
+    yen = "JPY",
+    yuanRenminbi = "CNY",
+    zambianKwacha = "ZMW",
+    zimbabweDollar = "ZWL",
+    zloty = "PLN",
+    none
+}
diff --git a/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift
new file mode 100644
index 0000000000..ef732a1874
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyFormatter.swift
@@ -0,0 +1,345 @@
+//
+//  CurrencyFormatter.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 1/27/19.
+//
+
+import Foundation
+
+import TelegramStringFormatting
+
+// MARK: - Currency protocols
+
+public protocol CurrencyFormatting {
+    var maxDigitsCount: Int { get }
+    var decimalDigits: Int { get set }
+    var maxValue: Double? { get set }
+    var minValue: Double? { get set }
+    var initialText: String { get }
+    var currencySymbol: String { get set }
+    
+    func string(from double: Double) -> String?
+    func unformatted(string: String) -> String?
+    func double(from string: String) -> Double?
+}
+
+public protocol CurrencyAdjusting {
+    func formattedStringWithAdjustedDecimalSeparator(from string: String) -> String?
+    func formattedStringAdjustedToFitAllowedValues(from string: String) -> String?
+}
+
+// MARK: - Currency formatter
+
+public class CurrencyFormatter: CurrencyFormatting {
+    
+    /// Set the locale to retrieve the currency from
+    /// You can pass a Swift type Locale or one of the
+    /// Locales enum options - that encapsulates all available locales.
+    public var locale: LocaleConvertible {
+        set { self.numberFormatter.locale = newValue.locale }
+        get { self.numberFormatter.locale }
+    }
+    
+    /// Set the desired currency type
+    /// * Note: The currency take effetcs above the displayed currency symbol,
+    /// however details such as decimal separators, grouping separators and others
+    /// will be set based on the defined locale. So for a precise experience, please
+    /// preferarbly setup both, when you are setting a currency that does not match the
+    /// default/current user locale.
+    public var currency: Currency {
+        set { numberFormatter.currencyCode = newValue.rawValue }
+        get { Currency(rawValue: numberFormatter.currencyCode) ?? .dollar }
+    }
+    
+    /// Define if currency symbol should be presented or not.
+    /// Note: when set to false the current currency symbol is removed
+    public var showCurrencySymbol: Bool = true {
+        didSet {
+            numberFormatter.currencySymbol = showCurrencySymbol ? numberFormatter.currencySymbol : ""
+        }
+    }
+    
+    /// The currency's symbol.
+    /// Can be used to read or set a custom symbol.
+    /// Note: showCurrencySymbol must be set to true for
+    /// the currencySymbol to be correctly changed.
+    public var currencySymbol: String {
+        set {
+            guard showCurrencySymbol else { return }
+            numberFormatter.currencySymbol = newValue
+        }
+        get { numberFormatter.currencySymbol }
+    }
+    
+    /// The lowest number allowed as input.
+    /// This value is initially set to the text field text
+    /// when defined.
+    public var minValue: Double? {
+        set {
+            guard let newValue = newValue else { return }
+            numberFormatter.minimum = NSNumber(value: newValue)
+        }
+        get {
+            if let minValue = numberFormatter.minimum {
+                return Double(truncating: minValue)
+            }
+            return nil
+        }
+    }
+    
+    /// The highest number allowed as input.
+    /// The text field will not allow the user to increase the input
+    /// value beyond it, when defined.
+    public var maxValue: Double? {
+        set {
+            guard let newValue = newValue else { return }
+            numberFormatter.maximum = NSNumber(value: newValue)
+        }
+        get {
+            if let maxValue = numberFormatter.maximum {
+                return Double(truncating: maxValue)
+            }
+            return nil
+        }
+    }
+    
+    /// The number of decimal digits shown.
+    /// default is set to zero.
+    /// * Example: With decimal digits set to 3, if the value to represent is "1",
+    /// the formatted text in the fractions will be ",001".
+    /// Other than that with the value as 1, the formatted text fractions will be ",1".
+    public var decimalDigits: Int {
+        set {
+            numberFormatter.minimumFractionDigits = newValue
+            numberFormatter.maximumFractionDigits = newValue
+        }
+        get { numberFormatter.minimumFractionDigits }
+    }
+    
+    /// Set decimal numbers behavior.
+    /// When set to true decimalDigits are automatically set to 2 (most currencies pattern),
+    /// and the decimal separator is presented. Otherwise decimal digits are not shown and
+    /// the separator gets hidden as well
+    /// When reading it returns the current pattern based on the setup.
+    /// Note: Setting decimal digits after, or alwaysShowsDecimalSeparator can overlap this definitios,
+    /// and should be only done if you need specific cases
+    public var hasDecimals: Bool {
+        set {
+            self.decimalDigits = newValue ? 2 : 0
+            self.numberFormatter.alwaysShowsDecimalSeparator = newValue ? true : false
+        }
+        get { decimalDigits != 0 }
+    }
+    
+    /// Defines the string that is the decimal separator
+    /// Note: only presented when hasDecimals is true OR decimalDigits
+    /// is greater than 0.
+    public var decimalSeparator: String {
+        set { self.numberFormatter.currencyDecimalSeparator = newValue }
+        get { numberFormatter.currencyDecimalSeparator }
+    }
+    
+    /// Can be used to set a custom currency code string
+    public var currencyCode: String {
+        set { self.numberFormatter.currencyCode = newValue }
+        get { numberFormatter.currencyCode }
+    }
+    
+    /// Sets if decimal separator should always be presented,
+    /// even when decimal digits are disabled
+    public var alwaysShowsDecimalSeparator: Bool {
+        set { self.numberFormatter.alwaysShowsDecimalSeparator = newValue }
+        get { numberFormatter.alwaysShowsDecimalSeparator }
+    }
+    
+    /// The amount of grouped numbers. This definition is fixed for at least
+    /// the first non-decimal group of numbers, and is applied to all other
+    /// groups if secondaryGroupingSize does not have another value.
+    public var groupingSize: Int {
+        set { self.numberFormatter.groupingSize = newValue }
+        get { numberFormatter.groupingSize }
+    }
+    
+    /// The amount of grouped numbers after the first group.
+    /// Example: for the given value of 99999999999, when grouping size
+    /// is set to 3 and secondaryGroupingSize has 4 as value,
+    /// the number is represented as: (9999) (9999) [999].
+    /// Beign [] grouping size and () secondary grouping size.
+    public var secondaryGroupingSize: Int {
+        set { self.numberFormatter.secondaryGroupingSize = newValue }
+        get { numberFormatter.secondaryGroupingSize }
+    }
+    
+    /// Defines the string that is shown between groups of numbers
+    /// * Example: a monetary value of a thousand (1000) with a grouping
+    /// separator == "." is represented as `1.000` *.
+    /// Note: It automatically sets hasGroupingSeparator to true.
+    public var groupingSeparator: String {
+        set {
+            self.numberFormatter.currencyGroupingSeparator = newValue
+            self.numberFormatter.usesGroupingSeparator = true
+        }
+        get { self.numberFormatter.currencyGroupingSeparator }
+    }
+    
+    /// Sets if has separator between all group of numbers.
+    /// * Example: when set to false, a bug number such as a million
+    /// is represented by tight numbers "1000000". Otherwise if set
+    /// to true each group is separated by the defined `groupingSeparator`. *
+    /// Note: When set to true only works by defining a grouping separator.
+    public var hasGroupingSeparator: Bool {
+        set { self.numberFormatter.usesGroupingSeparator = newValue }
+        get { self.numberFormatter.usesGroupingSeparator }
+    }
+    
+    /// Value that will be presented when the text field
+    /// text values matches zero (0)
+    public var zeroSymbol: String? {
+        set { numberFormatter.zeroSymbol = newValue }
+        get { numberFormatter.zeroSymbol }
+    }
+    
+    /// Value that will be presented when the text field
+    /// is empty. The default is "" - empty string
+    public var nilSymbol: String {
+        set { numberFormatter.nilSymbol = newValue }
+        get { return numberFormatter.nilSymbol }
+    }
+    
+    /// Encapsulated Number formatter
+    let numberFormatter: NumberFormatter
+    
+    /// Maximum allowed number of integers
+    public var maxIntegers: Int? {
+        set {
+            guard let maxIntegers = newValue else { return }
+            numberFormatter.maximumIntegerDigits = maxIntegers
+        }
+        get { return numberFormatter.maximumIntegerDigits }
+    }
+    
+    /// Returns the maximum allowed number of numerical characters
+    public var maxDigitsCount: Int {
+        numberFormatter.maximumIntegerDigits + numberFormatter.maximumFractionDigits
+    }
+    
+    /// The value zero formatted to serve as initial text.
+    public var initialText: String {
+        numberFormatter.string(from: 0) ?? "0.0"
+    }
+    
+    //MARK: - INIT
+    
+    /// Handler to initialize a new style.
+    public typealias InitHandler = ((CurrencyFormatter) -> (Void))
+    
+    /// Initialize a new currency formatter with optional configuration handler callback.
+    ///
+    /// - Parameter handler: configuration handler callback.
+
+    public init(currency: String, _ handler: InitHandler? = nil) {
+        numberFormatter = setupCurrencyNumberFormatter(currency: currency)
+
+        numberFormatter.alwaysShowsDecimalSeparator = false
+        /*numberFormatter.numberStyle = .currency
+        
+        numberFormatter.minimumFractionDigits = 2
+        numberFormatter.maximumFractionDigits = 2
+        numberFormatter.minimumIntegerDigits = 1*/
+        
+        handler?(self)
+    }
+}
+
+// MARK: Format
+extension CurrencyFormatter {
+    
+    /// Returns a currency string from a given double value.
+    ///
+    /// - Parameter double: the monetary amount.
+    /// - Returns: formatted currency string.
+    public func string(from double: Double) -> String? {
+        let validValue = valueAdjustedToFitAllowedValues(from: double)
+        return numberFormatter.string(from: validValue)
+    }
+    
+    /// Returns a double from a string that represents a numerical value.
+    ///
+    /// - Parameter string: string that describes the numerical value.
+    /// - Returns: the value as a Double.
+    public func double(from string: String) -> Double? {
+        Double(string)
+    }
+    
+    /// Receives a currency formatted string and returns its
+    /// numerical/unformatted representation.
+    ///
+    /// - Parameter string: currency formatted string
+    /// - Returns: numerical representation
+    public func unformatted(string: String) -> String? {
+        string.numeralFormat()
+    }
+}
+
+// MARK: - Currency adjusting conformance
+
+extension CurrencyFormatter: CurrencyAdjusting {
+
+    /// Receives a currency formatted String, and returns it with its decimal separator adjusted.
+    ///
+    /// _Note_: Useful when appending values to a currency formatted String.
+    /// E.g. "$ 23.24" after users taps an additional number, is equal = "$ 23.247".
+    /// Which gets updated to "$ 232.47".
+    ///
+    /// - Parameter string: The currency formatted String
+    /// - Returns: The currency formatted received String with its decimal separator adjusted
+    public func formattedStringWithAdjustedDecimalSeparator(from string: String) -> String? {
+        let adjustedString = numeralStringWithAdjustedDecimalSeparator(from: string)
+        guard let value = double(from: adjustedString) else { return nil }
+
+        return self.numberFormatter.string(from: value)
+    }
+
+    /// Receives a currency formatted String, and returns it to fit the formatter's min and max values, when needed.
+    ///
+    /// - Parameter string: The currency formatted String
+    /// - Returns: The currency formatted String, or the formatted version of its closes allowed value, min or max, depending on the closest boundary.
+    public func formattedStringAdjustedToFitAllowedValues(from string: String) -> String? {
+        let adjustedString = numeralStringWithAdjustedDecimalSeparator(from: string)
+        guard let originalValue = double(from: adjustedString) else { return nil }
+
+        return self.string(from: originalValue)
+    }
+
+    /// Receives a currency formatted String, and returns a numeral version of it with its decimal separator adjusted.
+    ///
+    /// E.g. "$ 23.24", after users taps an additional number, get equal as "$ 23.247". The returned value would be "232.47".
+    ///
+    /// - Parameter string: The currency formatted String
+    /// - Returns: The received String with numeral format and with its decimal separator adjusted
+    private func numeralStringWithAdjustedDecimalSeparator(from string: String) -> String {
+        var updatedString = string.numeralFormat()
+        let isNegative: Bool = string.contains(String.negativeSymbol)
+
+        updatedString = isNegative ? .negativeSymbol + updatedString : updatedString
+        updatedString.updateDecimalSeparator(decimalDigits: decimalDigits)
+
+        return updatedString
+    }
+
+    /// Receives a Double value, and returns it adjusted to fit min and max allowed values, when needed.
+    /// If the value respect number formatter's min and max, it will be returned without changes.
+    ///
+    /// - Parameter value: The value to be adjusted if needed
+    /// - Returns: The value updated or not, depending on the formatter's settings
+    private func valueAdjustedToFitAllowedValues(from value: Double) -> Double {
+        if let minValue = minValue, value < minValue {
+            return minValue
+        } else if let maxValue = maxValue, value > maxValue {
+            return maxValue
+        }
+
+        return value
+    }
+}
diff --git a/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift
new file mode 100644
index 0000000000..e9af7b2f76
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/Formatter/CurrencyLocale.swift
@@ -0,0 +1,755 @@
+//
+//  CurrencyLocale.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 1/26/19.
+//
+
+import Foundation
+
+/// All locales were extracted from:
+/// jacobbubu/ioslocaleidentifiers.csv - https://gist.github.com/jacobbubu/1836273
+
+/// The LocaleConvertible pattern is inspired in SwiftDate by malcommac
+/// https://github.com/malcommac/SwiftDate
+
+/// LocaleConvertible defines the behavior to convert locale info to system Locale type
+public protocol LocaleConvertible {
+    var locale: Locale { get }
+}
+
+extension Locale: LocaleConvertible {
+    public var locale: Locale { return self }
+}
+
+/// Defines locales available in system
+public enum CurrencyLocale: String, LocaleConvertible {
+    
+    case current = "current"
+    case autoUpdating = "currentAutoUpdating"
+    
+    case afrikaans = "af"
+    case afrikaansNamibia = "af_NA"
+    case afrikaansSouthAfrica = "af_ZA"
+    case aghem = "agq"
+    case aghemCameroon = "agq_CM"
+    case akan = "ak"
+    case akanGhana = "ak_GH"
+    case albanian = "sq"
+    case albanianAlbania = "sq_AL"
+    case albanianKosovo = "sq_XK"
+    case albanianMacedonia = "sq_MK"
+    case amharic = "am"
+    case amharicEthiopia = "am_ET"
+    case arabic = "ar"
+    case arabicAlgeria = "ar_DZ"
+    case arabicBahrain = "ar_BH"
+    case arabicChad = "ar_TD"
+    case arabicComoros = "ar_KM"
+    case arabicDjibouti = "ar_DJ"
+    case arabicEgypt = "ar_EG"
+    case arabicEritrea = "ar_ER"
+    case arabicIraq = "ar_IQ"
+    case arabicIsrael = "ar_IL"
+    case arabicJordan = "ar_JO"
+    case arabicKuwait = "ar_KW"
+    case arabicLebanon = "ar_LB"
+    case arabicLibya = "ar_LY"
+    case arabicMauritania = "ar_MR"
+    case arabicMorocco = "ar_MA"
+    case arabicOman = "ar_OM"
+    case arabicPalestinianTerritories = "ar_PS"
+    case arabicQatar = "ar_QA"
+    case arabicSaudiArabia = "ar_SA"
+    case arabicSomalia = "ar_SO"
+    case arabicSouthSudan = "ar_SS"
+    case arabicSudan = "ar_SD"
+    case arabicSyria = "ar_SY"
+    case arabicTunisia = "ar_TN"
+    case arabicUnitedArabEmirates = "ar_AE"
+    case arabicWesternSahara = "ar_EH"
+    case arabicWorld = "ar_001"
+    case arabicYemen = "ar_YE"
+    case armenian = "hy"
+    case armenianArmenia = "hy_AM"
+    case assamese = "as"
+    case assameseIndia = "as_IN"
+    case asu = "asa"
+    case asuTanzania = "asa_TZ"
+    case azerbaijani = "az_Latn"
+    case azerbaijaniAzerbaijan = "az_Latn_AZ"
+    case azerbaijaniCyrillic = "az_Cyrl"
+    case azerbaijaniCyrillicAzerbaijan = "az_Cyrl_AZ"
+    case bafia = "ksf"
+    case bafiaCameroon = "ksf_CM"
+    case bambara = "bm_Latn"
+    case bambaraMali = "bm_Latn_ML"
+    case basaa = "bas"
+    case basaaCameroon = "bas_CM"
+    case basque = "eu"
+    case basqueSpain = "eu_ES"
+    case belarusian = "be"
+    case belarusianBelarus = "be_BY"
+    case bemba = "bem"
+    case bembaZambia = "bem_ZM"
+    case bena = "bez"
+    case benaTanzania = "bez_TZ"
+    case bengali = "bn"
+    case bengaliBangladesh = "bn_BD"
+    case engaliIndia = "bn_IN"
+    case bodo = "brx"
+    case bodoIndia = "brx_IN"
+    case bosnian = "bs_Latn"
+    case bosnianBosniaHerzegovina = "bs_Latn_BA"
+    case bosnianCyrillic = "bs_Cyrl"
+    case bosnianCyrillicBosniaHerzegovina = "bs_Cyrl_BA"
+    case breton = "br"
+    case bretonFrance = "br_FR"
+    case bulgarian = "bg"
+    case bulgarianBulgaria = "bg_BG"
+    case burmese = "my"
+    case burmeseMyanmarBurma = "my_MM"
+    case catalan = "ca"
+    case catalanAndorra = "ca_AD"
+    case catalanFrance = "ca_FR"
+    case catalanItaly = "ca_IT"
+    case catalanSpain = "ca_ES"
+    case centralAtlasTamazight = "tzm_Latn"
+    case centralAtlasTamazightMorocco = "tzm_Latn_MA"
+    case centralKurdish = "ckb"
+    case centralKurdishIran = "ckb_IR"
+    case centralKurdishIraq = "ckb_IQ"
+    case cherokee = "chr"
+    case cherokeeUnitedStates = "chr_US"
+    case chiga = "cgg"
+    case chigaUganda = "cgg_UG"
+    case chinese = "zh"
+    case chineseChina = "zh_Hans_CN"
+    case chineseHongKongSarChina = "zh_Hant_HK"
+    case chineseMacauSarChina = "zh_Hant_MO"
+    case chineseSimplified = "zh_Hans"
+    case chineseSimplifiedHongKongSarChina = "zh_Hans_HK"
+    case chineseSimplifiedMacauSarChina = "zh_Hans_MO"
+    case chineseSingapore = "zh_Hans_SG"
+    case chineseTaiwan = "zh_Hant_TW"
+    case chineseTraditional = "zh_Hant"
+    case colognian = "ksh"
+    case colognianGermany = "ksh_DE"
+    case cornish = "kw"
+    case cornishUnitedKingdom = "kw_GB"
+    case croatian = "hr"
+    case croatianBosniaHerzegovina = "hr_BA"
+    case croatianCroatia = "hr_HR"
+    case czech = "cs"
+    case czechCzechRepublic = "cs_CZ"
+    case danish = "da"
+    case danishDenmark = "da_DK"
+    case danishGreenland = "da_GL"
+    case duala = "dua"
+    case dualaCameroon = "dua_CM"
+    case dutch = "nl"
+    case dutchAruba = "nl_AW"
+    case dutchBelgium = "nl_BE"
+    case dutchCaribbeanNetherlands = "nl_BQ"
+    case dutchCuraao = "nl_CW"
+    case dutchNetherlands = "nl_NL"
+    case dutchSintMaarten = "nl_SX"
+    case dutchSuriname = "nl_SR"
+    case dzongkha = "dz"
+    case dzongkhaBhutan = "dz_BT"
+    case embu = "ebu"
+    case embuKenya = "ebu_KE"
+    case english = "en"
+    case englishAlbania = "en_AL"
+    case englishAmericanSamoa = "en_AS"
+    case englishAndorra = "en_AD"
+    case englishAnguilla = "en_AI"
+    case englishAntiguaBarbuda = "en_AG"
+    case englishAustralia = "en_AU"
+    case englishAustria = "en_AT"
+    case englishBahamas = "en_BS"
+    case englishBarbados = "en_BB"
+    case englishBelgium = "en_BE"
+    case englishBelize = "en_BZ"
+    case englishBermuda = "en_BM"
+    case englishBosniaHerzegovina = "en_BA"
+    case englishBotswana = "en_BW"
+    case englishBritishIndianOceanTerritory = "en_IO"
+    case englishBritishVirginIslands = "en_VG"
+    case englishCameroon = "en_CM"
+    case englishCanada = "en_CA"
+    case englishCaymanIslands = "en_KY"
+    case englishChristmasIsland = "en_CX"
+    case englishCocosKeelingIslands = "en_CC"
+    case englishCookIslands = "en_CK"
+    case englishCroatia = "en_HR"
+    case englishCyprus = "en_CY"
+    case englishCzechRepublic = "en_CZ"
+    case englishDenmark = "en_DK"
+    case englishDiegoGarcia = "en_DG"
+    case englishDominica = "en_DM"
+    case englishEritrea = "en_ER"
+    case englishEstonia = "en_EE"
+    case englishEurope = "en_150"
+    case englishFalklandIslands = "en_FK"
+    case englishFiji = "en_FJ"
+    case englishFinland = "en_FI"
+    case englishFrance = "en_FR"
+    case englishGambia = "en_GM"
+    case englishGermany = "en_DE"
+    case englishGhana = "en_GH"
+    case englishGibraltar = "en_GI"
+    case englishGreece = "en_GR"
+    case englishGrenada = "en_GD"
+    case englishGuam = "en_GU"
+    case englishGuernsey = "en_GG"
+    case englishGuyana = "en_GY"
+    case englishHongKongSarChina = "en_HK"
+    case englishHungary = "en_HU"
+    case englishIceland = "en_IS"
+    case englishIndia = "en_IN"
+    case englishIreland = "en_IE"
+    case englishIsleOfMan = "en_IM"
+    case englishIsrael = "en_IL"
+    case englishItaly = "en_IT"
+    case englishJamaica = "en_JM"
+    case englishJersey = "en_JE"
+    case englishKenya = "en_KE"
+    case englishKiribati = "en_KI"
+    case englishLatvia = "en_LV"
+    case englishLesotho = "en_LS"
+    case englishLiberia = "en_LR"
+    case englishLithuania = "en_LT"
+    case englishLuxembourg = "en_LU"
+    case englishMacauSarChina = "en_MO"
+    case englishMadagascar = "en_MG"
+    case englishMalawi = "en_MW"
+    case englishMalaysia = "en_MY"
+    case englishMalta = "en_MT"
+    case englishMarshallIslands = "en_MH"
+    case englishMauritius = "en_MU"
+    case englishMicronesia = "en_FM"
+    case englishMontenegro = "en_ME"
+    case englishMontserrat = "en_MS"
+    case englishNamibia = "en_NA"
+    case englishNauru = "en_NR"
+    case englishNetherlands = "en_NL"
+    case englishNewZealand = "en_NZ"
+    case englishNigeria = "en_NG"
+    case englishNiue = "en_NU"
+    case englishNorfolkIsland = "en_NF"
+    case englishNorthernMarianaIslands = "en_MP"
+    case englishNorway = "en_NO"
+    case englishPakistan = "en_PK"
+    case englishPalau = "en_PW"
+    case englishPapuaNewGuinea = "en_PG"
+    case englishPhilippines = "en_PH"
+    case englishPitcairnIslands = "en_PN"
+    case englishPoland = "en_PL"
+    case englishPortugal = "en_PT"
+    case englishPuertoRico = "en_PR"
+    case englishRomania = "en_RO"
+    case englishRussia = "en_RU"
+    case englishRwanda = "en_RW"
+    case englishSamoa = "en_WS"
+    case englishSeychelles = "en_SC"
+    case englishSierraLeone = "en_SL"
+    case englishSingapore = "en_SG"
+    case englishSintMaarten = "en_SX"
+    case englishSlovakia = "en_SK"
+    case englishSlovenia = "en_SI"
+    case englishSolomonIslands = "en_SB"
+    case englishSouthAfrica = "en_ZA"
+    case englishSouthSudan = "en_SS"
+    case englishSpain = "en_ES"
+    case englishStHelena = "en_SH"
+    case englishStKittsNevis = "en_KN"
+    case englishStLucia = "en_LC"
+    case englishStVincentGrenadines = "en_VC"
+    case englishSudan = "en_SD"
+    case englishSwaziland = "en_SZ"
+    case englishSweden = "en_SE"
+    case englishSwitzerland = "en_CH"
+    case englishTanzania = "en_TZ"
+    case englishTokelau = "en_TK"
+    case englishTonga = "en_TO"
+    case englishTrinidadTobago = "en_TT"
+    case englishTurkey = "en_TR"
+    case englishTurksCaicosIslands = "en_TC"
+    case englishTuvalu = "en_TV"
+    case englishUSOutlyingIslands = "en_UM"
+    case englishUSVirginIslands = "en_VI"
+    case englishUganda = "en_UG"
+    case englishUnitedKingdom = "en_GB"
+    case englishUnitedStates = "en_US"
+    case englishUnitedStatesComputer = "en_US_POSIX"
+    case englishVanuatu = "en_VU"
+    case englishWorld = "en_001"
+    case englishZambia = "en_ZM"
+    case englishZimbabwe = "en_ZW"
+    case esperanto = "eo"
+    case estonian = "et"
+    case estonianEstonia = "et_EE"
+    case ewe = "ee"
+    case eweGhana = "ee_GH"
+    case eweTogo = "ee_TG"
+    case ewondo = "ewo"
+    case ewondoCameroon = "ewo_CM"
+    case faroese = "fo"
+    case faroeseFaroeIslands = "fo_FO"
+    case filipino = "fil"
+    case filipinoPhilippines = "fil_PH"
+    case finnish = "fi"
+    case finnishFinland = "fi_FI"
+    case french = "fr"
+    case frenchAlgeria = "fr_DZ"
+    case frenchBelgium = "fr_BE"
+    case frenchBenin = "fr_BJ"
+    case frenchBurkinaFaso = "fr_BF"
+    case frenchBurundi = "fr_BI"
+    case frenchCameroon = "fr_CM"
+    case frenchCanada = "fr_CA"
+    case frenchCentralAfricanRepublic = "fr_CF"
+    case frenchChad = "fr_TD"
+    case frenchComoros = "fr_KM"
+    case frenchCongoBrazzaville = "fr_CG"
+    case frenchCongoKinshasa = "fr_CD"
+    case frenchCteDivoire = "fr_CI"
+    case frenchDjibouti = "fr_DJ"
+    case frenchEquatorialGuinea = "fr_GQ"
+    case frenchFrance = "fr_FR"
+    case frenchFrenchGuiana = "fr_GF"
+    case frenchFrenchPolynesia = "fr_PF"
+    case frenchGabon = "fr_GA"
+    case frenchGuadeloupe = "fr_GP"
+    case frenchGuinea = "fr_GN"
+    case frenchHaiti = "fr_HT"
+    case frenchLuxembourg = "fr_LU"
+    case frenchMadagascar = "fr_MG"
+    case frenchMali = "fr_ML"
+    case frenchMartinique = "fr_MQ"
+    case frenchMauritania = "fr_MR"
+    case frenchMauritius = "fr_MU"
+    case frenchMayotte = "fr_YT"
+    case frenchMonaco = "fr_MC"
+    case frenchMorocco = "fr_MA"
+    case frenchNewCaledonia = "fr_NC"
+    case frenchNiger = "fr_NE"
+    case frenchRunion = "fr_RE"
+    case frenchRwanda = "fr_RW"
+    case frenchSenegal = "fr_SN"
+    case frenchSeychelles = "fr_SC"
+    case frenchStBarthlemy = "fr_BL"
+    case frenchStMartin = "fr_MF"
+    case frenchStPierreMiquelon = "fr_PM"
+    case frenchSwitzerland = "fr_CH"
+    case frenchSyria = "fr_SY"
+    case frenchTogo = "fr_TG"
+    case frenchTunisia = "fr_TN"
+    case frenchVanuatu = "fr_VU"
+    case frenchWallisFutuna = "fr_WF"
+    case friulian = "fur"
+    case friulianItaly = "fur_IT"
+    case fulah = "ff"
+    case fulahCameroon = "ff_CM"
+    case fulahGuinea = "ff_GN"
+    case fulahMauritania = "ff_MR"
+    case fulahSenegal = "ff_SN"
+    case galician = "gl"
+    case galicianSpain = "gl_ES"
+    case ganda = "lg"
+    case gandaUganda = "lg_UG"
+    case georgian = "ka"
+    case georgianGeorgia = "ka_GE"
+    case german = "de"
+    case germanAustria = "de_AT"
+    case germanBelgium = "de_BE"
+    case germanGermany = "de_DE"
+    case germanLiechtenstein = "de_LI"
+    case germanLuxembourg = "de_LU"
+    case germanSwitzerland = "de_CH"
+    case greek = "el"
+    case greekCyprus = "el_CY"
+    case greekGreece = "el_GR"
+    case gujarati = "gu"
+    case gujaratiIndia = "gu_IN"
+    case gusii = "guz"
+    case gusiiKenya = "guz_KE"
+    case hausa = "ha_Latn"
+    case hausaGhana = "ha_Latn_GH"
+    case hausaNiger = "ha_Latn_NE"
+    case hausaNigeria = "ha_Latn_NG"
+    case hawaiian = "haw"
+    case hawaiianUnitedStates = "haw_US"
+    case hebrew = "he"
+    case hebrewIsrael = "he_IL"
+    case hindi = "hi"
+    case hindiIndia = "hi_IN"
+    case hungarian = "hu"
+    case hungarianHungary = "hu_HU"
+    case icelandic = "is"
+    case icelandicIceland = "is_IS"
+    case igbo = "ig"
+    case igboNigeria = "ig_NG"
+    case inariSami = "smn"
+    case inariSamiFinland = "smn_FI"
+    case indonesian = "id"
+    case indonesianIndonesia = "id_ID"
+    case inuktitut = "iu"
+    case inuktitutUnifiedCanadianAboriginalSyllabics = "iu_Cans"
+    case inuktitutUnifiedCanadianAboriginalSyllabicsCanada = "iu_Cans_CA"
+    case irish = "ga"
+    case irishIreland = "ga_IE"
+    case italian = "it"
+    case italianItaly = "it_IT"
+    case italianSanMarino = "it_SM"
+    case italianSwitzerland = "it_CH"
+    case japanese = "ja"
+    case japaneseJapan = "ja_JP"
+    case jolaFonyi = "dyo"
+    case jolaFonyiSenegal = "dyo_SN"
+    case kabuverdianu = "kea"
+    case kabuverdianuCapeVerde = "kea_CV"
+    case kabyle = "kab"
+    case kabyleAlgeria = "kab_DZ"
+    case kako = "kkj"
+    case kakoCameroon = "kkj_CM"
+    case kalaallisut = "kl"
+    case kalaallisutGreenland = "kl_GL"
+    case kalenjin = "kln"
+    case kalenjinKenya = "kln_KE"
+    case kamba = "kam"
+    case kambaKenya = "kam_KE"
+    case kannada = "kn"
+    case kannadaIndia = "kn_IN"
+    case kashmiri = "ks"
+    case kashmiriArabic = "ks_Arab"
+    case kashmiriArabicIndia = "ks_Arab_IN"
+    case kazakh = "kk_Cyrl"
+    case kazakhKazakhstan = "kk_Cyrl_KZ"
+    case khmer = "km"
+    case khmerCambodia = "km_KH"
+    case kikuyu = "ki"
+    case kikuyuKenya = "ki_KE"
+    case kinyarwanda = "rw"
+    case kinyarwandaRwanda = "rw_RW"
+    case konkani = "kok"
+    case konkaniIndia = "kok_IN"
+    case korean = "ko"
+    case koreanNorthKorea = "ko_KP"
+    case koreanSouthKorea = "ko_KR"
+    case koyraChiini = "khq"
+    case koyraChiiniMali = "khq_ML"
+    case koyraboroSenni = "ses"
+    case koyraboroSenniMali = "ses_ML"
+    case kwasio = "nmg"
+    case kwasioCameroon = "nmg_CM"
+    case kyrgyz = "ky_Cyrl"
+    case kyrgyzKyrgyzstan = "ky_Cyrl_KG"
+    case lakota = "lkt"
+    case lakotaUnitedStates = "lkt_US"
+    case langi = "lag"
+    case langiTanzania = "lag_TZ"
+    case lao = "lo"
+    case laoLaos = "lo_LA"
+    case latvian = "lv"
+    case latvianLatvia = "lv_LV"
+    case lingala = "ln"
+    case lingalaAngola = "ln_AO"
+    case lingalaCentralAfricanRepublic = "ln_CF"
+    case lingalaCongoBrazzaville = "ln_CG"
+    case lingalaCongoKinshasa = "ln_CD"
+    case lithuanian = "lt"
+    case lithuanianLithuania = "lt_LT"
+    case lowerSorbian = "dsb"
+    case lowerSorbianGermany = "dsb_DE"
+    case lubaKatanga = "lu"
+    case lubaKatangaCongoKinshasa = "lu_CD"
+    case luo = "luo"
+    case luoKenya = "luo_KE"
+    case luxembourgish = "lb"
+    case luxembourgishLuxembourg = "lb_LU"
+    case luyia = "luy"
+    case luyiaKenya = "luy_KE"
+    case macedonian = "mk"
+    case macedonianMacedonia = "mk_MK"
+    case machame = "jmc"
+    case machameTanzania = "jmc_TZ"
+    case makhuwaMeetto = "mgh"
+    case makhuwaMeettoMozambique = "mgh_MZ"
+    case makonde = "kde"
+    case makondeTanzania = "kde_TZ"
+    case malagasy = "mg"
+    case malagasyMadagascar = "mg_MG"
+    case malay = "ms_Latn"
+    case malayArabic = "ms_Arab"
+    case malayArabicBrunei = "ms_Arab_BN"
+    case malayArabicMalaysia = "ms_Arab_MY"
+    case malayBrunei = "ms_Latn_BN"
+    case malayMalaysia = "ms_Latn_MY"
+    case malaySingapore = "ms_Latn_SG"
+    case malayalam = "ml"
+    case malayalamIndia = "ml_IN"
+    case maltese = "mt"
+    case malteseMalta = "mt_MT"
+    case manx = "gv"
+    case manxIsleOfMan = "gv_IM"
+    case marathi = "mr"
+    case marathiIndia = "mr_IN"
+    case masai = "mas"
+    case masaiKenya = "mas_KE"
+    case masaiTanzania = "mas_TZ"
+    case meru = "mer"
+    case meruKenya = "mer_KE"
+    case meta = "mgo"
+    case metaCameroon = "mgo_CM"
+    case mongolian = "mn_Cyrl"
+    case mongolianMongolia = "mn_Cyrl_MN"
+    case morisyen = "mfe"
+    case morisyenMauritius = "mfe_MU"
+    case mundang = "mua"
+    case mundangCameroon = "mua_CM"
+    case nama = "naq"
+    case namaNamibia = "naq_NA"
+    case nepali = "ne"
+    case nepaliIndia = "ne_IN"
+    case nepaliNepal = "ne_NP"
+    case ngiemboon = "nnh"
+    case ngiemboonCameroon = "nnh_CM"
+    case ngomba = "jgo"
+    case ngombaCameroon = "jgo_CM"
+    case northNdebele = "nd"
+    case northNdebeleZimbabwe = "nd_ZW"
+    case northernSami = "se"
+    case northernSamiFinland = "se_FI"
+    case northernSamiNorway = "se_NO"
+    case northernSamiSweden = "se_SE"
+    case norwegianBokml = "nb"
+    case norwegianBokmlNorway = "nb_NO"
+    case norwegianBokmlSvalbardJanMayen = "nb_SJ"
+    case norwegianNynorsk = "nn"
+    case norwegianNynorskNorway = "nn_NO"
+    case nuer = "nus"
+    case nuerSudan = "nus_SD"
+    case nyankole = "nyn"
+    case nyankoleUganda = "nyn_UG"
+    case oriya = "or"
+    case oriyaIndia = "or_IN"
+    case oromo = "om"
+    case oromoEthiopia = "om_ET"
+    case oromoKenya = "om_KE"
+    case ossetic = "os"
+    case osseticGeorgia = "os_GE"
+    case osseticRussia = "os_RU"
+    case pashto = "ps"
+    case pashtoAfghanistan = "ps_AF"
+    case persian = "fa"
+    case persianAfghanistan = "fa_AF"
+    case persianIran = "fa_IR"
+    case polish = "pl"
+    case polishPoland = "pl_PL"
+    case portuguese = "pt"
+    case portugueseAngola = "pt_AO"
+    case portugueseBrazil = "pt_BR"
+    case portugueseCapeVerde = "pt_CV"
+    case portugueseGuineaBissau = "pt_GW"
+    case portugueseMacauSarChina = "pt_MO"
+    case portugueseMozambique = "pt_MZ"
+    case portuguesePortugal = "pt_PT"
+    case portugueseSoTomPrncipe = "pt_ST"
+    case portugueseTimorLeste = "pt_TL"
+    case punjabi = "pa_Guru"
+    case punjabiArabic = "pa_Arab"
+    case punjabiArabicPakistan = "pa_Arab_PK"
+    case punjabiIndia = "pa_Guru_IN"
+    case quechua = "qu"
+    case quechuaBolivia = "qu_BO"
+    case quechuaEcuador = "qu_EC"
+    case quechuaPeru = "qu_PE"
+    case romanian = "ro"
+    case romanianMoldova = "ro_MD"
+    case romanianRomania = "ro_RO"
+    case romansh = "rm"
+    case romanshSwitzerland = "rm_CH"
+    case rombo = "rof"
+    case romboTanzania = "rof_TZ"
+    case rundi = "rn"
+    case rundiBurundi = "rn_BI"
+    case russian = "ru"
+    case russianBelarus = "ru_BY"
+    case russianKazakhstan = "ru_KZ"
+    case russianKyrgyzstan = "ru_KG"
+    case russianMoldova = "ru_MD"
+    case russianRussia = "ru_RU"
+    case russianUkraine = "ru_UA"
+    case rwa = "rwk"
+    case rwaTanzania = "rwk_TZ"
+    case sakha = "sah"
+    case sakhaRussia = "sah_RU"
+    case samburu = "saq"
+    case samburuKenya = "saq_KE"
+    case sango = "sg"
+    case sangoCentralAfricanRepublic = "sg_CF"
+    case sangu = "sbp"
+    case sanguTanzania = "sbp_TZ"
+    case scottishGaelic = "gd"
+    case scottishGaelicUnitedKingdom = "gd_GB"
+    case sena = "seh"
+    case senaMozambique = "seh_MZ"
+    case serbian = "sr_Cyrl"
+    case serbianBosniaHerzegovina = "sr_Cyrl_BA"
+    case serbianKosovo = "sr_Cyrl_XK"
+    case serbianLatin = "sr_Latn"
+    case serbianLatinBosniaHerzegovina = "sr_Latn_BA"
+    case serbianLatinKosovo = "sr_Latn_XK"
+    case serbianLatinMontenegro = "sr_Latn_ME"
+    case serbianLatinSerbia = "sr_Latn_RS"
+    case serbianMontenegro = "sr_Cyrl_ME"
+    case serbianSerbia = "sr_Cyrl_RS"
+    case shambala = "ksb"
+    case shambalaTanzania = "ksb_TZ"
+    case shona = "sn"
+    case shonaZimbabwe = "sn_ZW"
+    case sichuanYi = "ii"
+    case sichuanYiChina = "ii_CN"
+    case sinhala = "si"
+    case sinhalaSriLanka = "si_LK"
+    case slovak = "sk"
+    case slovakSlovakia = "sk_SK"
+    case slovenian = "sl"
+    case slovenianSlovenia = "sl_SI"
+    case soga = "xog"
+    case sogaUganda = "xog_UG"
+    case somali = "so"
+    case somaliDjibouti = "so_DJ"
+    case somaliEthiopia = "so_ET"
+    case somaliKenya = "so_KE"
+    case somaliSomalia = "so_SO"
+    case spanish = "es"
+    case spanishArgentina = "es_AR"
+    case spanishBolivia = "es_BO"
+    case spanishCanaryIslands = "es_IC"
+    case spanishCeutaMelilla = "es_EA"
+    case spanishChile = "es_CL"
+    case spanishColombia = "es_CO"
+    case spanishCostaRica = "es_CR"
+    case spanishCuba = "es_CU"
+    case spanishDominicanRepublic = "es_DO"
+    case spanishEcuador = "es_EC"
+    case spanishElSalvador = "es_SV"
+    case spanishEquatorialGuinea = "es_GQ"
+    case spanishGuatemala = "es_GT"
+    case spanishHonduras = "es_HN"
+    case spanishLatinAmerica = "es_419"
+    case spanishMexico = "es_MX"
+    case spanishNicaragua = "es_NI"
+    case spanishPanama = "es_PA"
+    case spanishParaguay = "es_PY"
+    case spanishPeru = "es_PE"
+    case spanishPhilippines = "es_PH"
+    case spanishPuertoRico = "es_PR"
+    case spanishSpain = "es_ES"
+    case spanishUnitedStates = "es_US"
+    case spanishUruguay = "es_UY"
+    case spanishVenezuela = "es_VE"
+    case standardMoroccanTamazight = "zgh"
+    case standardMoroccanTamazightMorocco = "zgh_MA"
+    case swahili = "sw"
+    case swahiliCongoKinshasa = "sw_CD"
+    case swahiliKenya = "sw_KE"
+    case swahiliTanzania = "sw_TZ"
+    case swahiliUganda = "sw_UG"
+    case swedish = "sv"
+    case swedishlandIslands = "sv_AX"
+    case swedishFinland = "sv_FI"
+    case swedishSweden = "sv_SE"
+    case swissGerman = "gsw"
+    case swissGermanFrance = "gsw_FR"
+    case swissGermanLiechtenstein = "gsw_LI"
+    case swissGermanSwitzerland = "gsw_CH"
+    case tachelhit = "shi_Latn"
+    case tachelhitMorocco = "shi_Latn_MA"
+    case tachelhitTifinagh = "shi_Tfng"
+    case tachelhitTifinaghMorocco = "shi_Tfng_MA"
+    case taita = "dav"
+    case taitaKenya = "dav_KE"
+    case tajik = "tg_Cyrl"
+    case tajikTajikistan = "tg_Cyrl_TJ"
+    case tamil = "ta"
+    case tamilIndia = "ta_IN"
+    case tamilMalaysia = "ta_MY"
+    case tamilSingapore = "ta_SG"
+    case tamilSriLanka = "ta_LK"
+    case tasawaq = "twq"
+    case tasawaqNiger = "twq_NE"
+    case telugu = "te"
+    case teluguIndia = "te_IN"
+    case teso = "teo"
+    case tesoKenya = "teo_KE"
+    case tesoUganda = "teo_UG"
+    case thai = "th"
+    case thaiThailand = "th_TH"
+    case tibetan = "bo"
+    case tibetanChina = "bo_CN"
+    case tibetanIndia = "bo_IN"
+    case tigrinya = "ti"
+    case tigrinyaEritrea = "ti_ER"
+    case tigrinyaEthiopia = "ti_ET"
+    case tongan = "to"
+    case tonganTonga = "to_TO"
+    case turkish = "tr"
+    case turkishCyprus = "tr_CY"
+    case turkishTurkey = "tr_TR"
+    case turkmen = "tk_Latn"
+    case turkmenTurkmenistan = "tk_Latn_TM"
+    case ukrainian = "uk"
+    case ukrainianUkraine = "uk_UA"
+    case upperSorbian = "hsb"
+    case upperSorbianGermany = "hsb_DE"
+    case urdu = "ur"
+    case urduIndia = "ur_IN"
+    case urduPakistan = "ur_PK"
+    case uyghur = "ug"
+    case uyghurArabic = "ug_Arab"
+    case uyghurArabicChina = "ug_Arab_CN"
+    case uzbek = "uz_Cyrl"
+    case uzbekArabic = "uz_Arab"
+    case uzbekArabicAfghanistan = "uz_Arab_AF"
+    case uzbekLatin = "uz_Latn"
+    case uzbekLatinUzbekistan = "uz_Latn_UZ"
+    case uzbekUzbekistan = "uz_Cyrl_UZ"
+    case vai = "vai_Vaii"
+    case vaiLatin = "vai_Latn"
+    case vaiLatinLiberia = "vai_Latn_LR"
+    case vaiLiberia = "vai_Vaii_LR"
+    case vietnamese = "vi"
+    case vietnameseVietnam = "vi_VN"
+    case vunjo = "vun"
+    case vunjoTanzania = "vun_TZ"
+    case walser = "wae"
+    case walserSwitzerland = "wae_CH"
+    case welsh = "cy"
+    case welshUnitedKingdom = "cy_GB"
+    case westernFrisian = "fy"
+    case westernFrisianNetherlands = "fy_NL"
+    case yangben = "yav"
+    case yangbenCameroon = "yav_CM"
+    case yiddish = "yi"
+    case yiddishWorld = "yi_001"
+    case yoruba = "yo"
+    case yorubaBenin = "yo_BJ"
+    case yorubaNigeria = "yo_NG"
+    case zarma = "dje"
+    case zarmaNiger = "dje_NE"
+    case zulu = "zu"
+    case zuluSouthAfrica = "zu_ZA"
+    
+    /// Return a valid `Locale` instance from currency locale enum
+    public var locale: Locale {
+        switch self {
+        case .current:          return Locale.current
+        case .autoUpdating:     return Locale.autoupdatingCurrent
+        default:                return Locale(identifier: rawValue)
+        }
+    }
+}
diff --git a/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift b/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift
new file mode 100644
index 0000000000..0103b6989b
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/Formatter/NumberFormatter.swift
@@ -0,0 +1,18 @@
+//
+//  NumberFormatter.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 12/27/18.
+//
+
+import Foundation
+
+public extension NumberFormatter {
+    
+    func string(from doubleValue: Double?) -> String? {
+        if let doubleValue = doubleValue {
+            return string(from: NSNumber(value: doubleValue))
+        }
+        return nil
+    }
+}
diff --git a/submodules/BotPaymentsUI/Sources/Formatter/String.swift b/submodules/BotPaymentsUI/Sources/Formatter/String.swift
new file mode 100644
index 0000000000..eabb906e25
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/Formatter/String.swift
@@ -0,0 +1,69 @@
+//
+//  String.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 4/3/18.
+//  Copyright © 2018 Felipe Lefèvre Marino. All rights reserved.
+//
+
+import Foundation
+
+public protocol CurrencyString {
+    var representsZero: Bool { get }
+    var hasNumbers: Bool { get }
+    var lastNumberOffsetFromEnd: Int? { get }
+    func numeralFormat() -> String
+    mutating func updateDecimalSeparator(decimalDigits: Int)
+}
+
+//Currency String Extension
+extension String: CurrencyString {
+
+    // MARK: Properties
+    
+    /// Informs with the string represents the value of zero
+    public var representsZero: Bool {
+        return numeralFormat().replacingOccurrences(of: "0", with: "").count == 0
+    }
+    
+    /// Returns if the string does have any character that represents numbers
+    public var hasNumbers: Bool {
+        return numeralFormat().count > 0
+    }
+
+    /// The offset from end index to the index _right after_ the last number in the String.
+    /// e.g. For the String "123some", the last number position is 4, because from the _end index_ to the index of _3_
+    /// there is an offset of 4, "e, m, o and s".
+    public var lastNumberOffsetFromEnd: Int? {
+        guard let indexOfLastNumber = lastIndex(where: { $0.isNumber }) else { return nil }
+        let indexAfterLastNumber = index(after: indexOfLastNumber)
+        return distance(from: endIndex, to: indexAfterLastNumber)
+    }
+
+    // MARK: Functions
+    
+    /// Updates a currency string decimal separator position based on
+    /// the amount of decimal digits desired
+    ///
+    /// - Parameter decimalDigits: The amount of decimal digits of the currency formatted string
+    public mutating func updateDecimalSeparator(decimalDigits: Int) {
+        guard decimalDigits != 0 && count >= decimalDigits else { return }
+        let decimalsRange = index(endIndex, offsetBy: -decimalDigits)..<endIndex
+        
+        let decimalChars = self[decimalsRange]
+        replaceSubrange(decimalsRange, with: "." + decimalChars)
+    }
+    
+    /// The numeral format of a string - remove all non numerical ocurrences
+    ///
+    /// - Returns: itself without the non numerical characters ocurrences
+    public func numeralFormat() -> String {
+        return replacingOccurrences(of:"[^0-9]", with: "", options: .regularExpression)
+    }
+}
+
+// MARK: - Static constants
+
+extension String {
+    public static let negativeSymbol = "-"
+}
diff --git a/submodules/BotPaymentsUI/Sources/TipEditController.swift b/submodules/BotPaymentsUI/Sources/TipEditController.swift
new file mode 100644
index 0000000000..d785c6d17e
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/TipEditController.swift
@@ -0,0 +1,461 @@
+import Foundation
+import UIKit
+import SwiftSignalKit
+import AsyncDisplayKit
+import Display
+import Postbox
+import TelegramCore
+import SyncCore
+import TelegramPresentationData
+import AccountContext
+
+private final class TipEditInputFieldNode: ASDisplayNode, ASEditableTextNodeDelegate {
+    private var theme: PresentationTheme
+    private let backgroundNode: ASImageNode
+    private let textInputNode: EditableTextNode
+    private let placeholderNode: ASTextNode
+    private let clearButton: HighlightableButtonNode
+    
+    var updateHeight: (() -> Void)?
+    var complete: (() -> Void)?
+    var textChanged: ((String) -> Void)?
+    
+    private let backgroundInsets = UIEdgeInsets(top: 8.0, left: 16.0, bottom: 15.0, right: 16.0)
+    private let inputInsets = UIEdgeInsets(top: 5.0, left: 12.0, bottom: 5.0, right: 12.0)
+    
+    var text: String {
+        get {
+            return self.textInputNode.attributedText?.string ?? ""
+        }
+        set {
+            self.textInputNode.attributedText = NSAttributedString(string: newValue, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputTextColor)
+            self.placeholderNode.isHidden = !newValue.isEmpty
+            self.clearButton.isHidden = newValue.isEmpty
+        }
+    }
+    
+    var placeholder: String = "" {
+        didSet {
+            self.placeholderNode.attributedText = NSAttributedString(string: self.placeholder, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
+        }
+    }
+    
+    init(theme: PresentationTheme, placeholder: String) {
+        self.theme = theme
+        
+        self.backgroundNode = ASImageNode()
+        self.backgroundNode.isLayerBacked = true
+        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode.displayWithoutProcessing = true
+        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: theme.actionSheet.inputHollowBackgroundColor, strokeColor: theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
+        
+        self.textInputNode = EditableTextNode()
+        self.textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(17.0), NSAttributedString.Key.foregroundColor.rawValue: theme.actionSheet.inputTextColor]
+        self.textInputNode.clipsToBounds = true
+        self.textInputNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
+        self.textInputNode.textContainerInset = UIEdgeInsets(top: self.inputInsets.top, left: 0.0, bottom: self.inputInsets.bottom, right: 0.0)
+        self.textInputNode.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance
+        self.textInputNode.keyboardType = .default
+        self.textInputNode.autocapitalizationType = .sentences
+        self.textInputNode.returnKeyType = .done
+        self.textInputNode.autocorrectionType = .default
+        self.textInputNode.tintColor = theme.actionSheet.controlAccentColor
+        
+        self.placeholderNode = ASTextNode()
+        self.placeholderNode.isUserInteractionEnabled = false
+        self.placeholderNode.displaysAsynchronously = false
+        self.placeholderNode.attributedText = NSAttributedString(string: placeholder, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
+        
+        self.clearButton = HighlightableButtonNode()
+        self.clearButton.imageNode.displaysAsynchronously = false
+        self.clearButton.imageNode.displayWithoutProcessing = true
+        self.clearButton.displaysAsynchronously = false
+        self.clearButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: theme.actionSheet.inputClearButtonColor), for: [])
+        self.clearButton.isHidden = true
+        
+        super.init()
+        
+        self.textInputNode.delegate = self
+        
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.textInputNode)
+        self.addSubnode(self.placeholderNode)
+        self.addSubnode(self.clearButton)
+        
+        self.clearButton.addTarget(self, action: #selector(self.clearPressed), forControlEvents: .touchUpInside)
+    }
+    
+    func updateTheme(_ theme: PresentationTheme) {
+        self.theme = theme
+        
+        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: self.theme.actionSheet.inputHollowBackgroundColor, strokeColor: self.theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
+        self.textInputNode.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance
+        self.placeholderNode.attributedText = NSAttributedString(string: self.placeholderNode.attributedText?.string ?? "", font: Font.regular(17.0), textColor: self.theme.actionSheet.inputPlaceholderColor)
+        self.textInputNode.tintColor = self.theme.actionSheet.controlAccentColor
+        self.clearButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: theme.actionSheet.inputClearButtonColor), for: [])
+    }
+    
+    func updateLayout(width: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
+        let backgroundInsets = self.backgroundInsets
+        let inputInsets = self.inputInsets
+        
+        let textFieldHeight = self.calculateTextFieldMetrics(width: width)
+        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
+        
+        let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top), size: CGSize(width: width - backgroundInsets.left - backgroundInsets.right, height: panelHeight - backgroundInsets.top - backgroundInsets.bottom))
+        transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+        
+        let placeholderSize = self.placeholderNode.measure(backgroundFrame.size)
+        transition.updateFrame(node: self.placeholderNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX + inputInsets.left, y: backgroundFrame.minY + floor((backgroundFrame.size.height - placeholderSize.height) / 2.0)), size: placeholderSize))
+        
+        transition.updateFrame(node: self.textInputNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX + inputInsets.left, y: backgroundFrame.minY), size: CGSize(width: backgroundFrame.size.width - inputInsets.left - inputInsets.right - 20.0, height: backgroundFrame.size.height)))
+        
+        if let image = self.clearButton.image(for: []) {
+            transition.updateFrame(node: self.clearButton, frame: CGRect(origin: CGPoint(x: backgroundFrame.maxX - 8.0 - image.size.width, y: backgroundFrame.minY + floor((backgroundFrame.size.height - image.size.height) / 2.0)), size: image.size))
+        }
+        
+        return panelHeight
+    }
+    
+    func activateInput() {
+        self.textInputNode.becomeFirstResponder()
+    }
+    
+    func deactivateInput() {
+        self.textInputNode.resignFirstResponder()
+    }
+    
+    @objc func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) {
+        self.updateTextNodeText(animated: true)
+        self.textChanged?(editableTextNode.textView.text)
+        self.placeholderNode.isHidden = !(editableTextNode.textView.text ?? "").isEmpty
+        self.clearButton.isHidden = !self.placeholderNode.isHidden
+    }
+    
+    func editableTextNode(_ editableTextNode: ASEditableTextNode, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        let updatedText = (editableTextNode.textView.text as NSString).replacingCharacters(in: range, with: text)
+        if updatedText.count > 40 {
+            self.textInputNode.layer.addShakeAnimation()
+            return false
+        }
+        if text == "\n" {
+            self.complete?()
+            return false
+        }
+        return true
+    }
+    
+    private func calculateTextFieldMetrics(width: CGFloat) -> CGFloat {
+        let backgroundInsets = self.backgroundInsets
+        let inputInsets = self.inputInsets
+        
+        let unboundTextFieldHeight = max(33.0, ceil(self.textInputNode.measure(CGSize(width: width - backgroundInsets.left - backgroundInsets.right - inputInsets.left - inputInsets.right - 20.0, height: CGFloat.greatestFiniteMagnitude)).height))
+        
+        return min(61.0, max(33.0, unboundTextFieldHeight))
+    }
+    
+    private func updateTextNodeText(animated: Bool) {
+        let backgroundInsets = self.backgroundInsets
+        
+        let textFieldHeight = self.calculateTextFieldMetrics(width: self.bounds.size.width)
+        
+        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
+        if !self.bounds.size.height.isEqual(to: panelHeight) {
+            self.updateHeight?()
+        }
+    }
+    
+    @objc func clearPressed() {
+        self.placeholderNode.isHidden = false
+        self.clearButton.isHidden = true
+        
+        self.textInputNode.attributedText = nil
+        self.deactivateInput()
+        self.updateHeight?()
+    }
+}
+
+private final class TipEditAlertContentNode: AlertContentNode {
+    private let strings: PresentationStrings
+    private let title: String
+    private let text: String
+    
+    private let titleNode: ASTextNode
+    private let textNode: ASTextNode
+    let inputFieldNode: TipEditInputFieldNode
+    
+    private let actionNodesSeparator: ASDisplayNode
+    private let actionNodes: [TextAlertContentActionNode]
+    private let actionVerticalSeparators: [ASDisplayNode]
+    
+    private let disposable = MetaDisposable()
+    
+    private var validLayout: CGSize?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    var complete: (() -> Void)? {
+        didSet {
+            self.inputFieldNode.complete = self.complete
+        }
+    }
+    
+    override var dismissOnOutsideTap: Bool {
+        return self.isUserInteractionEnabled
+    }
+    
+    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction], title: String, text: String, placeholder: String, value: String?) {
+        self.strings = strings
+        self.title = title
+        self.text = text
+        
+        self.titleNode = ASTextNode()
+        self.titleNode.maximumNumberOfLines = 2
+        self.textNode = ASTextNode()
+        self.textNode.maximumNumberOfLines = 8
+        
+        self.inputFieldNode = TipEditInputFieldNode(theme: ptheme, placeholder: placeholder)
+        self.inputFieldNode.text = value ?? ""
+        
+        self.actionNodesSeparator = ASDisplayNode()
+        self.actionNodesSeparator.isLayerBacked = true
+        
+        self.actionNodes = actions.map { action -> TextAlertContentActionNode in
+            return TextAlertContentActionNode(theme: theme, action: action)
+        }
+        
+        var actionVerticalSeparators: [ASDisplayNode] = []
+        if actions.count > 1 {
+            for _ in 0 ..< actions.count - 1 {
+                let separatorNode = ASDisplayNode()
+                separatorNode.isLayerBacked = true
+                actionVerticalSeparators.append(separatorNode)
+            }
+        }
+        self.actionVerticalSeparators = actionVerticalSeparators
+        
+        super.init()
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.textNode)
+        
+        self.addSubnode(self.inputFieldNode)
+
+        self.addSubnode(self.actionNodesSeparator)
+        
+        for actionNode in self.actionNodes {
+            self.addSubnode(actionNode)
+        }
+        
+        for separatorNode in self.actionVerticalSeparators {
+            self.addSubnode(separatorNode)
+        }
+        
+        self.inputFieldNode.updateHeight = { [weak self] in
+            if let strongSelf = self {
+                if let _ = strongSelf.validLayout {
+                    strongSelf.requestLayout?(.animated(duration: 0.15, curve: .spring))
+                }
+            }
+        }
+        
+        self.updateTheme(theme)
+    }
+    
+    deinit {
+        self.disposable.dispose()
+    }
+    
+    var value: String {
+        return self.inputFieldNode.text
+    }
+
+    override func updateTheme(_ theme: AlertControllerTheme) {
+        self.titleNode.attributedText = NSAttributedString(string: self.title, font: Font.bold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center)
+        self.textNode.attributedText = NSAttributedString(string: self.text, font: Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center)
+
+        self.actionNodesSeparator.backgroundColor = theme.separatorColor
+        for actionNode in self.actionNodes {
+            actionNode.updateTheme(theme)
+        }
+        for separatorNode in self.actionVerticalSeparators {
+            separatorNode.backgroundColor = theme.separatorColor
+        }
+        
+        if let size = self.validLayout {
+            _ = self.updateLayout(size: size, transition: .immediate)
+        }
+    }
+    
+    override func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+        var size = size
+        size.width = min(size.width, 270.0)
+        let measureSize = CGSize(width: size.width - 16.0 * 2.0, height: CGFloat.greatestFiniteMagnitude)
+        
+        let hadValidLayout = self.validLayout != nil
+        
+        self.validLayout = size
+        
+        var origin: CGPoint = CGPoint(x: 0.0, y: 20.0)
+        let spacing: CGFloat = 5.0
+        
+        let titleSize = self.titleNode.measure(measureSize)
+        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - titleSize.width) / 2.0), y: origin.y), size: titleSize))
+        origin.y += titleSize.height + 4.0
+        
+        let textSize = self.textNode.measure(measureSize)
+        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - textSize.width) / 2.0), y: origin.y), size: textSize))
+        origin.y += textSize.height + 6.0 + spacing
+        
+        let actionButtonHeight: CGFloat = 44.0
+        var minActionsWidth: CGFloat = 0.0
+        let maxActionWidth: CGFloat = floor(size.width / CGFloat(self.actionNodes.count))
+        let actionTitleInsets: CGFloat = 8.0
+        
+        var effectiveActionLayout = TextAlertContentActionLayout.horizontal
+        for actionNode in self.actionNodes {
+            let actionTitleSize = actionNode.titleNode.updateLayout(CGSize(width: maxActionWidth, height: actionButtonHeight))
+            if case .horizontal = effectiveActionLayout, actionTitleSize.height > actionButtonHeight * 0.6667 {
+                effectiveActionLayout = .vertical
+            }
+            switch effectiveActionLayout {
+                case .horizontal:
+                    minActionsWidth += actionTitleSize.width + actionTitleInsets
+                case .vertical:
+                    minActionsWidth = max(minActionsWidth, actionTitleSize.width + actionTitleInsets)
+            }
+        }
+        
+        let insets = UIEdgeInsets(top: 18.0, left: 18.0, bottom: 9.0, right: 18.0)
+        
+        var contentWidth = max(titleSize.width, minActionsWidth)
+        contentWidth = max(contentWidth, 234.0)
+        
+        var actionsHeight: CGFloat = 0.0
+        switch effectiveActionLayout {
+            case .horizontal:
+                actionsHeight = actionButtonHeight
+            case .vertical:
+                actionsHeight = actionButtonHeight * CGFloat(self.actionNodes.count)
+        }
+        
+        let resultWidth = contentWidth + insets.left + insets.right
+        
+        let inputFieldWidth = resultWidth
+        let inputFieldHeight = self.inputFieldNode.updateLayout(width: inputFieldWidth, transition: transition)
+        let inputHeight = inputFieldHeight
+        transition.updateFrame(node: self.inputFieldNode, frame: CGRect(x: 0.0, y: origin.y, width: resultWidth, height: inputFieldHeight))
+        transition.updateAlpha(node: self.inputFieldNode, alpha: inputHeight > 0.0 ? 1.0 : 0.0)
+        
+        let resultSize = CGSize(width: resultWidth, height: titleSize.height + textSize.height + spacing + inputHeight + actionsHeight  + insets.top + insets.bottom)
+        
+        transition.updateFrame(node: self.actionNodesSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+        
+        var actionOffset: CGFloat = 0.0
+        let actionWidth: CGFloat = floor(resultSize.width / CGFloat(self.actionNodes.count))
+        var separatorIndex = -1
+        var nodeIndex = 0
+        for actionNode in self.actionNodes {
+            if separatorIndex >= 0 {
+                let separatorNode = self.actionVerticalSeparators[separatorIndex]
+                switch effectiveActionLayout {
+                    case .horizontal:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: actionOffset - UIScreenPixel, y: resultSize.height - actionsHeight), size: CGSize(width: UIScreenPixel, height: actionsHeight - UIScreenPixel)))
+                    case .vertical:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+                }
+            }
+            separatorIndex += 1
+            
+            let currentActionWidth: CGFloat
+            switch effectiveActionLayout {
+                case .horizontal:
+                    if nodeIndex == self.actionNodes.count - 1 {
+                        currentActionWidth = resultSize.width - actionOffset
+                    } else {
+                        currentActionWidth = actionWidth
+                    }
+                case .vertical:
+                    currentActionWidth = resultSize.width
+            }
+            
+            let actionNodeFrame: CGRect
+            switch effectiveActionLayout {
+                case .horizontal:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: actionOffset, y: resultSize.height - actionsHeight), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += currentActionWidth
+                case .vertical:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += actionButtonHeight
+            }
+            
+            transition.updateFrame(node: actionNode, frame: actionNodeFrame)
+            
+            nodeIndex += 1
+        }
+        
+        if !hadValidLayout {
+            self.inputFieldNode.activateInput()
+        }
+        
+        return resultSize
+    }
+    
+    func animateError() {
+        self.inputFieldNode.layer.addShakeAnimation()
+        self.hapticFeedback.error()
+    }
+}
+
+func tipEditController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, text: String, placeholder: String, doneButtonTitle: String? = nil, value: String?, apply: @escaping (String?) -> Void) -> AlertController {
+    var presentationData = sharedContext.currentPresentationData.with { $0 }
+    if let forceTheme = forceTheme {
+        presentationData = presentationData.withUpdated(theme: forceTheme)
+    }
+    
+    var dismissImpl: ((Bool) -> Void)?
+    var applyImpl: (() -> Void)?
+    
+    let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
+        dismissImpl?(true)
+    }), TextAlertAction(type: .defaultAction, title: doneButtonTitle ?? presentationData.strings.Common_Done, action: {
+        applyImpl?()
+    })]
+    
+    let contentNode = TipEditAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, text: text, placeholder: placeholder, value: value)
+    contentNode.complete = {
+        applyImpl?()
+    }
+    applyImpl = { [weak contentNode] in
+        guard let contentNode = contentNode else {
+            return
+        }
+        dismissImpl?(true)
+        
+        let previousValue = value ?? ""
+        let newValue = contentNode.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        apply(previousValue != newValue || value == nil ? newValue : nil)
+    }
+    
+    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode)
+    let presentationDataDisposable = sharedContext.presentationData.start(next: { [weak controller, weak contentNode] presentationData in
+        var presentationData = presentationData
+        if let forceTheme = forceTheme {
+            presentationData = presentationData.withUpdated(theme: forceTheme)
+        }
+        controller?.theme = AlertControllerTheme(presentationData: presentationData)
+        contentNode?.inputFieldNode.updateTheme(presentationData.theme)
+    })
+    controller.dismissed = {
+        presentationDataDisposable.dispose()
+    }
+    dismissImpl = { [weak controller] animated in
+        contentNode.inputFieldNode.deactivateInput()
+        if animated {
+            controller?.dismissAnimated()
+        } else {
+            controller?.dismiss()
+        }
+    }
+    return controller
+}
diff --git a/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift
new file mode 100644
index 0000000000..5eeb602a6e
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/CurrencyUITextFieldDelegate.swift
@@ -0,0 +1,188 @@
+//
+//  CurrencyUITextFieldDelegate.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 12/26/18.
+//  Copyright © 2018 Felipe Lefèvre Marino. All rights reserved.
+//
+
+import UIKit
+
+/// Custom text field delegate, that formats user inputs based on a given currency formatter.
+public class CurrencyUITextFieldDelegate: NSObject {
+
+    public var formatter: (CurrencyFormatting & CurrencyAdjusting)!
+
+    public var textUpdated: (() -> Void)?
+
+    /// Text field clears its text when value value is equal to zero.
+    public var clearsWhenValueIsZero: Bool = false
+
+    /// A delegate object to receive and potentially handle `UITextFieldDelegate events` that are sent to `CurrencyUITextFieldDelegate`.
+    ///
+    /// Note: Make sure the implementation of this object does not wrongly interfere with currency formatting.
+    ///
+    /// By returning `false` on`textField(textField:shouldChangeCharactersIn:replacementString:)` no currency formatting is done.
+    public var passthroughDelegate: UITextFieldDelegate? {
+        get { return _passthroughDelegate }
+        set {
+            guard newValue !== self else { return }
+            _passthroughDelegate = newValue
+        }
+    }
+    weak private(set) var _passthroughDelegate: UITextFieldDelegate?
+    
+    public init(formatter: CurrencyFormatter) {
+        self.formatter = formatter
+    }
+}
+
+// MARK: - UITextFieldDelegate
+
+extension CurrencyUITextFieldDelegate: UITextFieldDelegate {
+    
+    @discardableResult
+    open func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
+        return passthroughDelegate?.textFieldShouldBeginEditing?(textField) ?? true
+    }
+    
+    public func textFieldDidBeginEditing(_ textField: UITextField) {
+        textField.setInitialSelectedTextRange()
+        passthroughDelegate?.textFieldDidBeginEditing?(textField)
+    }
+    
+    @discardableResult
+    public func textFieldShouldEndEditing(_ textField: UITextField) -> Bool {
+        if let text = textField.text, text.representsZero && clearsWhenValueIsZero {
+            textField.text = ""
+        }
+        else if let text = textField.text, let updated = formatter.formattedStringAdjustedToFitAllowedValues(from: text), updated != text {
+            textField.text = updated
+        }
+        return passthroughDelegate?.textFieldShouldEndEditing?(textField) ?? true
+    }
+    
+    open func textFieldDidEndEditing(_ textField: UITextField) {
+        passthroughDelegate?.textFieldDidEndEditing?(textField)
+    }
+    
+    @discardableResult
+    open func textFieldShouldClear(_ textField: UITextField) -> Bool {
+        return passthroughDelegate?.textFieldShouldClear?(textField) ?? true
+    }
+    
+    @discardableResult
+    open func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        return passthroughDelegate?.textFieldShouldReturn?(textField) ?? true
+    }
+    
+    @discardableResult
+    public func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        let shouldChangeCharactersInRange = passthroughDelegate?.textField?(textField,
+                                                                            shouldChangeCharactersIn: range,
+                                                                            replacementString: string) ?? true
+        guard shouldChangeCharactersInRange else {
+            return false
+        }
+
+        // Store selected text range offset from end, before updating and reformatting the currency string.
+        let lastSelectedTextRangeOffsetFromEnd = textField.selectedTextRangeOffsetFromEnd
+
+        // Before leaving the scope, update selected text range,
+        // respecting previous selected text range offset from end.
+        defer {
+            textField.updateSelectedTextRange(lastOffsetFromEnd: lastSelectedTextRangeOffsetFromEnd)
+            textUpdated?()
+        }
+        
+        guard !string.isEmpty else {
+            handleDeletion(in: textField, at: range)
+            return false
+        }
+        guard string.hasNumbers else {
+            addNegativeSymbolIfNeeded(in: textField, at: range, replacementString: string)
+            return false
+        }
+        
+        setFormattedText(in: textField, inputString: string, range: range)
+        
+        return false
+    }
+
+    public func textFieldDidChangeSelection(_ textField: UITextField) {
+        if #available(iOSApplicationExtension 13.0, iOS 13.0, *) {
+            passthroughDelegate?.textFieldDidChangeSelection?(textField)
+        }
+    }
+}
+
+// MARK: - Private
+
+extension CurrencyUITextFieldDelegate {
+
+    /// Verifies if user inputed a negative symbol at the first lowest
+    /// bound of the text field and add it.
+    ///
+    /// - Parameters:
+    ///   - textField: text field that user interacted with
+    ///   - range: user input range
+    ///   - string: user input string
+    private func addNegativeSymbolIfNeeded(in textField: UITextField, at range: NSRange, replacementString string: String) {
+        guard textField.keyboardType == .numbersAndPunctuation else { return }
+        
+        if string == .negativeSymbol && textField.text?.isEmpty == true {
+            textField.text = .negativeSymbol
+        } else if range.lowerBound == 0 && string == .negativeSymbol &&
+            textField.text?.contains(String.negativeSymbol) == false {
+            
+            textField.text = .negativeSymbol + (textField.text ?? "")
+        }
+    }
+    
+    /// Correctly delete characters when user taps remove key.
+    ///
+    /// - Parameters:
+    ///   - textField: text field that user interacted with
+    ///   - range: range to be removed
+    private func handleDeletion(in textField: UITextField, at range: NSRange) {
+        if var text = textField.text {
+            if let textRange = Range(range, in: text) {
+                text.removeSubrange(textRange)
+            } else {
+                text.removeLast()
+            }
+            
+            if text.isEmpty {
+                textField.text = text
+            } else {
+                textField.text = formatter.formattedStringWithAdjustedDecimalSeparator(from: text)
+            }
+        }
+    }
+    
+    /// Formats text field's text with new input string and changed range
+    ///
+    /// - Parameters:
+    ///   - textField: text field that user interacted with
+    ///   - inputString: typed string
+    ///   - range: range where the string should be added
+    private func setFormattedText(in textField: UITextField, inputString: String, range: NSRange) {
+        var updatedText = ""
+        
+        if let text = textField.text {
+            if text.isEmpty {
+                updatedText = formatter.initialText + inputString
+            } else if let range = Range(range, in: text) {
+                updatedText = text.replacingCharacters(in: range, with: inputString)
+            } else {
+                updatedText = text.appending(inputString)
+            }
+        }
+        
+        if updatedText.numeralFormat().count > formatter.maxDigitsCount {
+            updatedText.removeLast()
+        }
+        
+        textField.text = formatter.formattedStringWithAdjustedDecimalSeparator(from: updatedText)
+    }
+}
diff --git a/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift
new file mode 100644
index 0000000000..cabd313e2f
--- /dev/null
+++ b/submodules/BotPaymentsUI/Sources/UITextFieldDelegate/UITextField.swift
@@ -0,0 +1,61 @@
+//
+//  UITextField.swift
+//  CurrencyText
+//
+//  Created by Felipe Lefèvre Marino on 12/26/18.
+//
+
+import UIKit
+
+public extension UITextField {
+
+    // MARK: Public
+
+    var selectedTextRangeOffsetFromEnd: Int {
+        return offset(from: endOfDocument, to: selectedTextRange?.end ?? endOfDocument)
+    }
+
+    /// Sets the selected text range when the text field is starting to be edited.
+    /// _Should_ be called when text field start to be the first responder.
+    func setInitialSelectedTextRange() {
+        // update selected text range if needed
+        adjustSelectedTextRange(lastOffsetFromEnd: 0) // at the end when first selected
+    }
+
+    /// Interface to update the selected text range as expected.
+    /// - Parameter lastOffsetFromEnd: The last stored selected text range offset from end. Used to keep it concise with pre-formatting.
+    func updateSelectedTextRange(lastOffsetFromEnd: Int) {
+        adjustSelectedTextRange(lastOffsetFromEnd: lastOffsetFromEnd)
+    }
+
+    // MARK: Private
+
+    /// Adjust the selected text range to match the best position.
+    private func adjustSelectedTextRange(lastOffsetFromEnd: Int) {
+        /// If text is empty the offset is set to zero, the selected text range does need to be changed.
+        if let text = text, text.isEmpty {
+            return
+        }
+
+        var offsetFromEnd = lastOffsetFromEnd
+
+        /// Adjust offset if needed. When the last number character offset from end is less than the current offset,
+        /// or in other words, is more distant to the end of the string, the offset is readjusted to it,
+        /// so the selected text range is correctly set to the last index with a number.
+        if let lastNumberOffsetFromEnd = text?.lastNumberOffsetFromEnd,
+            case let shouldOffsetBeAdjusted = lastNumberOffsetFromEnd < offsetFromEnd,
+            shouldOffsetBeAdjusted {
+
+            offsetFromEnd = lastNumberOffsetFromEnd
+        }
+
+        updateSelectedTextRange(offsetFromEnd: offsetFromEnd)
+    }
+
+    /// Update the selected text range with given offset from end.
+    private func updateSelectedTextRange(offsetFromEnd: Int) {
+        if let updatedCursorPosition = position(from: endOfDocument, offset: offsetFromEnd) {
+            selectedTextRange = textRange(from: updatedCursorPosition, to: updatedCursorPosition)
+        }
+    }
+}
diff --git a/submodules/BroadcastUploadHelpers/BUILD b/submodules/BroadcastUploadHelpers/BUILD
new file mode 100644
index 0000000000..276b7c9756
--- /dev/null
+++ b/submodules/BroadcastUploadHelpers/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "BroadcastUploadHelpers",
+    enable_modules = True,
+    module_name = "BroadcastUploadHelpers",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/BroadcastUploadHelpers/PublicHeaders/BroadcastUploadHelpers/BroadcastUploadHelpers.h b/submodules/BroadcastUploadHelpers/PublicHeaders/BroadcastUploadHelpers/BroadcastUploadHelpers.h
new file mode 100755
index 0000000000..a1b5fe7b6e
--- /dev/null
+++ b/submodules/BroadcastUploadHelpers/PublicHeaders/BroadcastUploadHelpers/BroadcastUploadHelpers.h
@@ -0,0 +1,8 @@
+#ifndef BroadcastUploadHelpers_h
+#define BroadcastUploadHelpers_h
+
+#import <ReplayKit/ReplayKit.h>
+
+void finishBroadcastGracefully(RPBroadcastSampleHandler * _Nonnull broadcastSampleHandler);
+
+#endif /* BroadcastUploadHelpers_h */
diff --git a/submodules/BroadcastUploadHelpers/Sources/BroadcastUploadHelpers.m b/submodules/BroadcastUploadHelpers/Sources/BroadcastUploadHelpers.m
new file mode 100755
index 0000000000..fbb5705b47
--- /dev/null
+++ b/submodules/BroadcastUploadHelpers/Sources/BroadcastUploadHelpers.m
@@ -0,0 +1,8 @@
+#import <BroadcastUploadHelpers/BroadcastUploadHelpers.h>
+
+void finishBroadcastGracefully(RPBroadcastSampleHandler * _Nonnull broadcastSampleHandler) {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+    [broadcastSampleHandler finishBroadcastWithError:nil];
+#pragma clang diagnostic pop
+}
diff --git a/submodules/CallListUI/BUILD b/submodules/CallListUI/BUILD
index b10f67b243..65d5b40bb9 100644
--- a/submodules/CallListUI/BUILD
+++ b/submodules/CallListUI/BUILD
@@ -26,6 +26,8 @@ swift_library(
         "//submodules/ChatListSearchItemHeader:ChatListSearchItemHeader",
         "//submodules/PeerOnlineMarkerNode:PeerOnlineMarkerNode",
         "//submodules/ContextUI:ContextUI",
+        "//submodules/TelegramBaseController:TelegramBaseController",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/CallListUI/Sources/CallListCallItem.swift b/submodules/CallListUI/Sources/CallListCallItem.swift
index 1394f62608..72ad5c7f11 100644
--- a/submodules/CallListUI/Sources/CallListCallItem.swift
+++ b/submodules/CallListUI/Sources/CallListCallItem.swift
@@ -650,9 +650,9 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.3, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let (item, _, _, _, _) = self.layoutParams {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/CallListUI/Sources/CallListController.swift b/submodules/CallListUI/Sources/CallListController.swift
index fec07a9481..2f9faa7e85 100644
--- a/submodules/CallListUI/Sources/CallListController.swift
+++ b/submodules/CallListUI/Sources/CallListController.swift
@@ -14,6 +14,7 @@ import AlertUI
 import AppBundle
 import LocalizedPeerData
 import ContextUI
+import TelegramBaseController
 
 public enum CallListControllerMode {
     case tab
@@ -65,7 +66,7 @@ private final class DeleteAllButtonNode: ASDisplayNode {
     }
 }
 
-public final class CallListController: ViewController {
+public final class CallListController: TelegramBaseController {
     private var controllerNode: CallListControllerNode {
         return self.displayNode as! CallListControllerNode
     }
@@ -98,7 +99,7 @@ public final class CallListController: ViewController {
         
         self.segmentedTitleView = ItemListControllerSegmentedTitleView(theme: self.presentationData.theme, segments: [self.presentationData.strings.Calls_All, self.presentationData.strings.Calls_Missed], selectedIndex: 0)
         
-        super.init(navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData))
+        super.init(context: context, navigationBarPresentationData: NavigationBarPresentationData(presentationData: self.presentationData), mediaAccessoryPanelVisibility: .none, locationBroadcastPanelSource: .none, groupCallPanelSource: .none)
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         
@@ -199,6 +200,10 @@ public final class CallListController: ViewController {
             if let strongSelf = self {
                 strongSelf.call(peerId, isVideo: isVideo)
             }
+        }, joinGroupCall: { [weak self] peerId, activeCall in
+            if let strongSelf = self {
+                strongSelf.joinGroupCall(peerId: peerId, invite: nil, activeCall: activeCall)
+            }
         }, openInfo: { [weak self] peerId, messages in
             if let strongSelf = self {
                 let _ = (strongSelf.context.account.postbox.loadedPeerWithId(peerId)
@@ -226,12 +231,12 @@ public final class CallListController: ViewController {
                         switch strongSelf.mode {
                             case .tab:
                                 if strongSelf.editingMode {
-                                    strongSelf.navigationItem.leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed))
+                                    strongSelf.navigationItem.setLeftBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed)), animated: true)
                                     var pressedImpl: (() -> Void)?
                                     let buttonNode = DeleteAllButtonNode(presentationData: strongSelf.presentationData, pressed: {
                                         pressedImpl?()
                                     })
-                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(customDisplayNode: buttonNode)
+                                    strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(customDisplayNode: buttonNode), animated: true)
                                     strongSelf.navigationItem.rightBarButtonItem?.setCustomAction({
                                         pressedImpl?()
                                     })
@@ -244,20 +249,23 @@ public final class CallListController: ViewController {
                                     
                                     //strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Notification_Exceptions_DeleteAll, style: .plain, target: strongSelf, action: #selector(strongSelf.deleteAllPressed))
                                 } else {
-                                    strongSelf.navigationItem.leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed))
-                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(strongSelf.presentationData.theme), style: .plain, target: self, action: #selector(strongSelf.callPressed))
+                                    strongSelf.navigationItem.setLeftBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed)), animated: true)
+                                    strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(strongSelf.presentationData.theme), style: .plain, target: self, action: #selector(strongSelf.callPressed)), animated: true)
                                 }
                             case .navigation:
                                 if strongSelf.editingMode {
-                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed))
+                                    strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.donePressed)), animated: true)
                                 } else {
-                                    strongSelf.navigationItem.rightBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed))
+                                    strongSelf.navigationItem.setRightBarButton(UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: strongSelf, action: #selector(strongSelf.editPressed)), animated: true)
                                 }
                         }
                     }
                 }
             }
         })
+        self.controllerNode.startNewCall = { [weak self] in
+            self?.beginCallImpl()
+        }
         self._ready.set(self.controllerNode.ready)
         self.displayNodeDidLoad()
     }
@@ -265,7 +273,7 @@ public final class CallListController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func callPressed() {
@@ -280,7 +288,7 @@ public final class CallListController: ViewController {
                 return
             }
             
-            var signal = clearCallHistory(account: strongSelf.context.account, forEveryone: forEveryone)
+            var signal = strongSelf.context.engine.messages.clearCallHistory(forEveryone: forEveryone)
             
             var cancelImpl: (() -> Void)?
             let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
@@ -360,9 +368,9 @@ public final class CallListController: ViewController {
         controller.navigationPresentation = .modal
         self.createActionDisposable.set((controller.result
         |> take(1)
-        |> deliverOnMainQueue).start(next: { [weak controller, weak self] peer in
+        |> deliverOnMainQueue).start(next: { [weak controller, weak self] result in
             controller?.dismissSearch()
-            if let strongSelf = self, let (contactPeer, action) = peer, case let .peer(peer, _, _) = contactPeer {
+            if let strongSelf = self, let (contactPeers, action) = result, let contactPeer = contactPeers.first,  case let .peer(peer, _, _) = contactPeer {
                 strongSelf.call(peer.id, isVideo: action == .videoCall, began: {
                     if let strongSelf = self {
                         let _ = (strongSelf.context.sharedContext.hasOngoingCall.get()
@@ -389,12 +397,12 @@ public final class CallListController: ViewController {
         
         switch self.mode {
             case .tab:
-                self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
+                self.navigationItem.setLeftBarButton(UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed)), animated: true)
                 var pressedImpl: (() -> Void)?
                 let buttonNode = DeleteAllButtonNode(presentationData: self.presentationData, pressed: {
                     pressedImpl?()
                 })
-                self.navigationItem.rightBarButtonItem = UIBarButtonItem(customDisplayNode: buttonNode)
+                self.navigationItem.setRightBarButton(UIBarButtonItem(customDisplayNode: buttonNode), animated: true)
                 self.navigationItem.rightBarButtonItem?.setCustomAction({
                     pressedImpl?()
                 })
@@ -406,7 +414,7 @@ public final class CallListController: ViewController {
                 }
                 //self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Notification_Exceptions_DeleteAll, style: .plain, target: self, action: #selector(self.deleteAllPressed))
             case .navigation:
-                self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
+                self.navigationItem.setRightBarButton(UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed)), animated: true)
         }
         
         self.controllerNode.updateState { state in
@@ -418,10 +426,10 @@ public final class CallListController: ViewController {
         self.editingMode = false
         switch self.mode {
             case .tab:
-                self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
-                self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.callPressed))
+                self.navigationItem.setLeftBarButton(UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)), animated: true)
+                self.navigationItem.setRightBarButton(UIBarButtonItem(image: PresentationResourcesRootController.navigationCallIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.callPressed)), animated: true)
             case .navigation:
-                self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
+                self.navigationItem.setRightBarButton(UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed)), animated: true)
         }
         
         self.controllerNode.updateState { state in
diff --git a/submodules/CallListUI/Sources/CallListControllerNode.swift b/submodules/CallListUI/Sources/CallListControllerNode.swift
index 6b93e23a68..88354bfed8 100644
--- a/submodules/CallListUI/Sources/CallListControllerNode.swift
+++ b/submodules/CallListUI/Sources/CallListControllerNode.swift
@@ -13,6 +13,8 @@ import PresentationDataUtils
 import AccountContext
 import TelegramNotices
 import ChatListSearchItemHeader
+import AnimatedStickerNode
+import AppBundle
 
 private struct CallListNodeListViewTransition {
     let callListView: CallListNodeView
@@ -179,6 +181,7 @@ final class CallListControllerNode: ASDisplayNode {
     var peerSelected: ((PeerId) -> Void)?
     var activateSearch: (() -> Void)?
     var deletePeerChat: ((PeerId) -> Void)?
+    var startNewCall: (() -> Void)?
     
     private let viewProcessingQueue = Queue()
     private var callListView: CallListNodeView?
@@ -196,9 +199,15 @@ final class CallListControllerNode: ASDisplayNode {
     private let listNode: ListView
     private let leftOverlayNode: ASDisplayNode
     private let rightOverlayNode: ASDisplayNode
-    private let emptyTextNode: ASTextNode
+    private let emptyTextNode: ImmediateTextNode
+    private let emptyAnimationNode: AnimatedStickerNode
+    private var emptyAnimationSize = CGSize()
+    private let emptyButtonNode: HighlightTrackingButtonNode
+    private let emptyButtonIconNode: ASImageNode
+    private let emptyButtonTextNode: ImmediateTextNode
     
     private let call: (PeerId, Bool) -> Void
+    private let joinGroupCall: (PeerId, CachedChannelData.ActiveCall) -> Void
     private let openInfo: (PeerId, [Message]) -> Void
     private let emptyStateUpdated: (Bool) -> Void
     
@@ -207,16 +216,17 @@ final class CallListControllerNode: ASDisplayNode {
     
     private let openGroupCallDisposable = MetaDisposable()
     
-    init(controller: CallListController, context: AccountContext, mode: CallListControllerMode, presentationData: PresentationData, call: @escaping (PeerId, Bool) -> Void, openInfo: @escaping (PeerId, [Message]) -> Void, emptyStateUpdated: @escaping (Bool) -> Void) {
+    init(controller: CallListController, context: AccountContext, mode: CallListControllerMode, presentationData: PresentationData, call: @escaping (PeerId, Bool) -> Void, joinGroupCall: @escaping (PeerId, CachedChannelData.ActiveCall) -> Void, openInfo: @escaping (PeerId, [Message]) -> Void, emptyStateUpdated: @escaping (Bool) -> Void) {
         self.controller = controller
         self.context = context
         self.mode = mode
         self.presentationData = presentationData
         self.call = call
+        self.joinGroupCall = joinGroupCall
         self.openInfo = openInfo
         self.emptyStateUpdated = emptyStateUpdated
         
-        self.currentState = CallListNodeState(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, disableAnimations: presentationData.disableAnimations, editing: false, messageIdWithRevealedOptions: nil)
+        self.currentState = CallListNodeState(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, disableAnimations: true, editing: false, messageIdWithRevealedOptions: nil)
         self.statePromise = ValuePromise(self.currentState, ignoreRepeated: true)
         
         self.listNode = ListView()
@@ -230,10 +240,26 @@ final class CallListControllerNode: ASDisplayNode {
         self.rightOverlayNode = ASDisplayNode()
         self.rightOverlayNode.backgroundColor = self.presentationData.theme.list.blocksBackgroundColor
         
-        self.emptyTextNode = ASTextNode()
+        self.emptyTextNode = ImmediateTextNode()
         self.emptyTextNode.alpha = 0.0
         self.emptyTextNode.isUserInteractionEnabled = false
         self.emptyTextNode.displaysAsynchronously = false
+        self.emptyTextNode.textAlignment = .center
+        self.emptyTextNode.maximumNumberOfLines = 3
+        
+        self.emptyAnimationNode = AnimatedStickerNode()
+        self.emptyAnimationNode.alpha = 0.0
+        self.emptyAnimationNode.isUserInteractionEnabled = false
+        
+        self.emptyButtonNode = HighlightTrackingButtonNode()
+        self.emptyButtonNode.isUserInteractionEnabled = false
+        
+        self.emptyButtonTextNode = ImmediateTextNode()
+        self.emptyButtonTextNode.isUserInteractionEnabled = false
+        
+        self.emptyButtonIconNode = ASImageNode()
+        self.emptyButtonIconNode.displaysAsynchronously = false
+        self.emptyButtonIconNode.isUserInteractionEnabled = false
         
         super.init()
         
@@ -243,6 +269,10 @@ final class CallListControllerNode: ASDisplayNode {
         
         self.addSubnode(self.listNode)
         self.addSubnode(self.emptyTextNode)
+        self.addSubnode(self.emptyAnimationNode)
+        self.addSubnode(self.emptyButtonTextNode)
+        self.addSubnode(self.emptyButtonIconNode)
+        self.addSubnode(self.emptyButtonNode)
         
         switch self.mode {
             case .tab:
@@ -253,6 +283,31 @@ final class CallListControllerNode: ASDisplayNode {
                 self.listNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor
         }
         
+        
+        if let path = getAppBundle().path(forResource: "CallsPlaceholder", ofType: "tgs") {
+            self.emptyAnimationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 256, height: 256, playbackMode: .loop, mode: .direct(cachePathPrefix: nil))
+            self.emptyAnimationSize = CGSize(width: 148.0, height: 148.0)
+        }
+        
+        self.emptyButtonIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call List/CallIcon"), color: presentationData.theme.list.itemAccentColor)
+        
+        self.emptyButtonNode.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.emptyButtonIconNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.emptyButtonIconNode.alpha = 0.4
+                    strongSelf.emptyButtonTextNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.emptyButtonTextNode.alpha = 0.4
+                } else {
+                    strongSelf.emptyButtonIconNode.alpha = 1.0
+                    strongSelf.emptyButtonIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    strongSelf.emptyButtonTextNode.alpha = 1.0
+                    strongSelf.emptyButtonTextNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                }
+            }
+        }
+        self.emptyButtonNode.addTarget(self, action: #selector(self.emptyButtonPressed), forControlEvents: .touchUpInside)
+        
         let nodeInteraction = CallListNodeInteraction(setMessageIdWithRevealedOptions: { [weak self] messageId, fromMessageId in
             if let strongSelf = self {
                 strongSelf.updateState { state in
@@ -288,7 +343,7 @@ final class CallListControllerNode: ASDisplayNode {
                     guard let strongSelf = self else {
                         return
                     }
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: messageIds, type: .forEveryone).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: messageIds, type: .forEveryone).start()
                 }))
                 
                 items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_DeleteMessagesForMe, color: .destructive, action: { [weak actionSheet] in
@@ -298,7 +353,7 @@ final class CallListControllerNode: ASDisplayNode {
                         return
                     }
                     
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: messageIds, type: .forLocalPeer).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: messageIds, type: .forLocalPeer).start()
                 }))
                     
                 actionSheet.setItemGroups([
@@ -329,14 +384,21 @@ final class CallListControllerNode: ASDisplayNode {
             let disposable = strongSelf.openGroupCallDisposable
             
             let account = strongSelf.context.account
+            let engine = strongSelf.context.engine
             var signal: Signal<CachedChannelData.ActiveCall?, NoError> = strongSelf.context.account.postbox.transaction { transaction -> CachedChannelData.ActiveCall? in
-                return (transaction.getPeerCachedData(peerId: peerId) as? CachedChannelData)?.activeCall
+                let cachedData = transaction.getPeerCachedData(peerId: peerId)
+                if let cachedData = cachedData as? CachedChannelData {
+                    return cachedData.activeCall
+                } else if let cachedData = cachedData as? CachedGroupData {
+                    return cachedData.activeCall
+                }
+                return nil
             }
             |> mapToSignal { activeCall -> Signal<CachedChannelData.ActiveCall?, NoError> in
                 if let activeCall = activeCall {
                     return .single(activeCall)
                 } else {
-                    return updatedCurrentPeerGroupCall(account: account, peerId: peerId)
+                    return engine.calls.updatedCurrentPeerGroupCall(peerId: peerId)
                 }
             }
             
@@ -375,7 +437,7 @@ final class CallListControllerNode: ASDisplayNode {
                 }
                 
                 if let activeCall = activeCall {
-                    strongSelf.context.joinGroupCall(peerId: peerId, invite: nil, requestJoinAsPeerId: nil, activeCall: activeCall)
+                    strongSelf.joinGroupCall(peerId, activeCall)
                 }
             }))
         })
@@ -560,7 +622,7 @@ final class CallListControllerNode: ASDisplayNode {
         
         self.emptyStateDisposable.set((combineLatest(emptySignal, typeSignal, self.statePromise.get()) |> deliverOnMainQueue).start(next: { [weak self] isEmpty, type, state in
             if let strongSelf = self {
-                strongSelf.updateEmptyPlaceholder(theme: state.presentationData.theme, strings: state.presentationData.strings, type: type, hidden: !isEmpty)
+                strongSelf.updateEmptyPlaceholder(theme: state.presentationData.theme, strings: state.presentationData.strings, type: type, isHidden: !isEmpty)
             }
         }))
     }
@@ -572,7 +634,7 @@ final class CallListControllerNode: ASDisplayNode {
     }
     
     func updateThemeAndStrings(presentationData: PresentationData) {
-        if presentationData.theme !== self.currentState.presentationData.theme || presentationData.strings !== self.currentState.presentationData.strings || presentationData.disableAnimations != self.currentState.disableAnimations {
+        if presentationData.theme !== self.currentState.presentationData.theme || presentationData.strings !== self.currentState.presentationData.strings {
             self.presentationData = presentationData
             
             self.leftOverlayNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor
@@ -586,10 +648,12 @@ final class CallListControllerNode: ASDisplayNode {
                     self.listNode.backgroundColor = presentationData.theme.list.blocksBackgroundColor
             }
             
-            self.updateEmptyPlaceholder(theme: presentationData.theme, strings: presentationData.strings, type: self.currentLocationAndType.type, hidden: self.emptyTextNode.isHidden)
+            self.emptyButtonIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call List/CallIcon"), color: presentationData.theme.list.itemAccentColor)
+            
+            self.updateEmptyPlaceholder(theme: presentationData.theme, strings: presentationData.strings, type: self.currentLocationAndType.type, isHidden: self.emptyTextNode.alpha.isZero)
             
             self.updateState {
-                return $0.withUpdatedPresentationData(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, disableAnimations: presentationData.disableAnimations)
+                return $0.withUpdatedPresentationData(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, disableAnimations: true)
             }
             
             self.listNode.forEachItemHeaderNode({ itemHeaderNode in
@@ -601,20 +665,40 @@ final class CallListControllerNode: ASDisplayNode {
     }
     
     private let textFont = Font.regular(16.0)
+    private let buttonFont = Font.regular(17.0)
     
-    func updateEmptyPlaceholder(theme: PresentationTheme, strings: PresentationStrings, type: CallListViewType, hidden: Bool) {
-        let alpha: CGFloat = hidden ? 0.0 : 1.0
+    func updateEmptyPlaceholder(theme: PresentationTheme, strings: PresentationStrings, type: CallListViewType, isHidden: Bool) {
+        let alpha: CGFloat = isHidden ? 0.0 : 1.0
         let previousAlpha = self.emptyTextNode.alpha
         self.emptyTextNode.alpha = alpha
         self.emptyTextNode.layer.animateAlpha(from: previousAlpha, to: alpha, duration: 0.2)
         
-        if !hidden {
+        if previousAlpha.isZero && !alpha.isZero {
+            self.emptyAnimationNode.visibility = true
+        }
+        self.emptyAnimationNode.alpha = alpha
+        self.emptyAnimationNode.layer.animateAlpha(from: previousAlpha, to: alpha, duration: 0.2, completion: { [weak self] _ in
+            if let strongSelf = self {
+                if !previousAlpha.isZero && strongSelf.emptyAnimationNode.alpha.isZero {
+                    strongSelf.emptyAnimationNode.visibility = false
+                }
+            }
+        })
+        
+        self.emptyButtonIconNode.alpha = alpha
+        self.emptyButtonIconNode.layer.animateAlpha(from: previousAlpha, to: alpha, duration: 0.2)
+        self.emptyButtonTextNode.alpha = alpha
+        self.emptyButtonTextNode.layer.animateAlpha(from: previousAlpha, to: alpha, duration: 0.2)
+        self.emptyButtonNode.isUserInteractionEnabled = !isHidden
+        
+        if !isHidden {
             let type = self.currentLocationAndType.type
-            let string: String
+            let emptyText: String
+            let buttonText = strings.Calls_StartNewCall
             if type == .missed {
-                string = strings.Calls_NoMissedCallsPlacehoder
+                emptyText = strings.Calls_NoMissedCallsPlacehoder
             } else {
-                string = strings.Calls_NoCallsPlaceholder
+                emptyText = strings.Calls_NoVoiceAndVideoCallsPlaceholder
             }
             let color: UIColor
             
@@ -629,7 +713,10 @@ final class CallListControllerNode: ASDisplayNode {
                 color = theme.list.freeTextColor
             }
             
-            self.emptyTextNode.attributedText = NSAttributedString(string: string, font: textFont, textColor: color, paragraphAlignment: .center)
+            self.emptyTextNode.attributedText = NSAttributedString(string: emptyText, font: textFont, textColor: color, paragraphAlignment: .center)
+            
+            self.emptyButtonTextNode.attributedText = NSAttributedString(string: buttonText, font: buttonFont, textColor: theme.list.itemAccentColor, paragraphAlignment: .center)
+            
             if let layout = self.containerLayout {
                 self.updateLayout(layout.0, navigationBarHeight: layout.1, transition: .immediate)
             }
@@ -722,6 +809,10 @@ final class CallListControllerNode: ASDisplayNode {
         }
     }
     
+    @objc private func emptyButtonPressed() {
+        self.startNewCall?()
+    }
+    
     func updateLayout(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
         var insets = layout.insets(options: [.input])
         insets.top += max(navigationBarHeight, layout.insets(options: [.statusBar]).top)
@@ -734,8 +825,30 @@ final class CallListControllerNode: ASDisplayNode {
         let size = layout.size
         let contentRect = CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: size.width, height: size.height - insets.top - insets.bottom))
 
-        let textSize = self.emptyTextNode.measure(CGSize(width: size.width - 20.0, height: size.height))
-        transition.updateFrame(node: self.emptyTextNode, frame: CGRect(origin: CGPoint(x: contentRect.minX + floor((contentRect.width - textSize.width) / 2.0), y: contentRect.minY + floor((contentRect.height - textSize.height) / 2.0)), size: textSize))
+        let sideInset: CGFloat = 64.0
+        
+        let emptyAnimationHeight = self.emptyAnimationSize.height
+        let emptyAnimationSpacing: CGFloat = 13.0
+        let emptyTextSpacing: CGFloat = 23.0
+        let emptyTextSize = self.emptyTextNode.updateLayout(CGSize(width: contentRect.width - sideInset * 2.0, height: size.height))
+        let emptyButtonSize = self.emptyButtonTextNode.updateLayout(CGSize(width: contentRect.width - sideInset * 2.0, height: size.height))
+        let emptyTotalHeight = emptyAnimationHeight + emptyAnimationSpacing + emptyTextSize.height + emptyTextSpacing + emptyButtonSize.height
+        let emptyAnimationY = contentRect.minY + floorToScreenPixels((contentRect.height - emptyTotalHeight) / 2.0)
+        
+        let textTransition = ContainedViewLayoutTransition.immediate
+        textTransition.updateFrame(node: self.emptyAnimationNode, frame: CGRect(origin: CGPoint(x: contentRect.minX + (contentRect.width - self.emptyAnimationSize.width) / 2.0, y: emptyAnimationY), size: self.emptyAnimationSize))
+        textTransition.updateFrame(node: self.emptyTextNode, frame: CGRect(origin: CGPoint(x: contentRect.minX + (contentRect.width - emptyTextSize.width) / 2.0, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing), size: emptyTextSize))
+        
+        let emptyButtonSpacing: CGFloat = 14.0
+        let emptyButtonIconSize = (self.emptyButtonIconNode.image?.size ?? CGSize())
+        let emptyButtonWidth = emptyButtonIconSize.width + emptyButtonSpacing + emptyButtonSize.width
+        let emptyButtonX = floor(contentRect.width - emptyButtonWidth) / 2.0
+        textTransition.updateFrame(node: self.emptyButtonIconNode, frame: CGRect(origin: CGPoint(x: emptyButtonX, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing + emptyTextSize.height + emptyTextSpacing), size: emptyButtonIconSize))
+        textTransition.updateFrame(node: self.emptyButtonTextNode, frame: CGRect(origin: CGPoint(x: emptyButtonX + emptyButtonIconSize.width + emptyButtonSpacing, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing + emptyTextSize.height + emptyTextSpacing + 4.0), size: emptyButtonSize))
+        
+        textTransition.updateFrame(node: self.emptyButtonNode, frame: CGRect(origin: CGPoint(x: emptyButtonX, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing + emptyTextSize.height + emptyTextSpacing), size: CGSize(width: emptyButtonWidth, height: 44.0)))
+        
+        self.emptyAnimationNode.updateLayout(size: self.emptyAnimationSize)
     }
     
     func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
diff --git a/submodules/CallListUI/Sources/CallListGroupCallItem.swift b/submodules/CallListUI/Sources/CallListGroupCallItem.swift
index 88c0d17abb..6d1af1b65d 100644
--- a/submodules/CallListUI/Sources/CallListGroupCallItem.swift
+++ b/submodules/CallListUI/Sources/CallListGroupCallItem.swift
@@ -467,9 +467,9 @@ class CallListGroupCallItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.3, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let (item, _, _, _, _) = self.layoutParams {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ChatImportUI/Sources/ChatImportActivityScreen.swift b/submodules/ChatImportUI/Sources/ChatImportActivityScreen.swift
index 794d0c709d..5cefdf43e0 100644
--- a/submodules/ChatImportUI/Sources/ChatImportActivityScreen.swift
+++ b/submodules/ChatImportUI/Sources/ChatImportActivityScreen.swift
@@ -68,16 +68,16 @@ private final class ImportManager {
     
     private let account: Account
     private let archivePath: String?
-    private let entries: [(SSZipEntry, String, ChatHistoryImport.MediaType)]
+    private let entries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)]
     
-    private var session: ChatHistoryImport.Session?
+    private var session: TelegramEngine.HistoryImport.Session?
     
     private let disposable = MetaDisposable()
     
     private let totalBytes: Int
     private let totalMediaBytes: Int
     private let mainFileSize: Int
-    private var pendingEntries: [(SSZipEntry, String, ChatHistoryImport.MediaType)]
+    private var pendingEntries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)]
     private var entryProgress: [String: (Int, Int)] = [:]
     private var activeEntries: [String: Disposable] = [:]
     
@@ -91,7 +91,7 @@ private final class ImportManager {
         return self.statePromise.get()
     }
     
-    init(account: Account, peerId: PeerId, mainFile: TempBoxFile, archivePath: String?, entries: [(SSZipEntry, String, ChatHistoryImport.MediaType)]) {
+    init(account: Account, peerId: PeerId, mainFile: TempBoxFile, archivePath: String?, entries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)]) {
         self.account = account
         self.archivePath = archivePath
         self.entries = entries
@@ -114,7 +114,7 @@ private final class ImportManager {
             Logger.shared.log("ChatImportScreen", "    \(entry.1)")
         }
         
-        self.disposable.set((ChatHistoryImport.initSession(account: self.account, peerId: peerId, file: mainFile, mediaCount: Int32(entries.count))
+        self.disposable.set((TelegramEngine(account: self.account).historyImport.initSession(peerId: peerId, file: mainFile, mediaCount: Int32(entries.count))
         |> mapError { error -> ImportError in
             switch error {
             case .chatAdminRequired:
@@ -180,7 +180,7 @@ private final class ImportManager {
             self.failWithError(.generic)
             return
         }
-        self.disposable.set((ChatHistoryImport.startImport(account: self.account, session: session)
+        self.disposable.set((TelegramEngine(account: self.account).historyImport.startImport(session: session)
         |> deliverOnMainQueue).start(error: { [weak self] _ in
             guard let strongSelf = self else {
                 return
@@ -258,7 +258,7 @@ private final class ImportManager {
                 if !pathExtension.isEmpty, let value = TGMimeTypeMap.mimeType(forExtension: pathExtension) {
                     mimeType = value
                 }
-                return ChatHistoryImport.uploadMedia(account: account, session: session, file: tempFile, disposeFileAfterDone: true, fileName: entry.0.path, mimeType: mimeType, type: entry.2)
+                return TelegramEngine(account: account).historyImport.uploadMedia(session: session, file: tempFile, disposeFileAfterDone: true, fileName: entry.0.path, mimeType: mimeType, type: entry.2)
                 |> mapError { error -> ImportError in
                     switch error {
                     case .chatAdminRequired:
@@ -534,7 +534,7 @@ public final class ChatImportActivityScreen: ViewController {
             self.radialStatusText.attributedText = NSAttributedString(string: "\(Int(effectiveProgress * 100.0))%", font: Font.with(size: floor(36.0 * maxK), design: .round, weight: .semibold), textColor: self.presentationData.theme.list.itemPrimaryTextColor)
             let radialStatusTextSize = self.radialStatusText.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
             
-            self.progressText.attributedText = NSAttributedString(string: "\(dataSizeString(Int(effectiveProgress * CGFloat(self.totalBytes)))) of \(dataSizeString(Int(1.0 * CGFloat(self.totalBytes))))", font: Font.semibold(17.0), textColor: self.presentationData.theme.list.itemPrimaryTextColor)
+            self.progressText.attributedText = NSAttributedString(string: "\(dataSizeString(Int(effectiveProgress * CGFloat(self.totalBytes)), formatting: DataSizeStringFormatting(presentationData: self.presentationData))) of \(dataSizeString(Int(1.0 * CGFloat(self.totalBytes)), formatting: DataSizeStringFormatting(presentationData: self.presentationData)))", font: Font.semibold(17.0), textColor: self.presentationData.theme.list.itemPrimaryTextColor)
             let progressTextSize = self.progressText.updateLayout(CGSize(width: layout.size.width - 16.0 * 2.0, height: .greatestFiniteMagnitude))
             
             switch self.state {
@@ -732,7 +732,7 @@ public final class ChatImportActivityScreen: ViewController {
     private let mainEntry: TempBoxFile
     private let totalBytes: Int
     private let totalMediaBytes: Int
-    private let otherEntries: [(SSZipEntry, String, ChatHistoryImport.MediaType)]
+    private let otherEntries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)]
     
     private var importManager: ImportManager?
     private var progressEstimator: ProgressEstimator?
@@ -749,14 +749,14 @@ public final class ChatImportActivityScreen: ViewController {
         }
     }
     
-    public init(context: AccountContext, cancel: @escaping () -> Void, peerId: PeerId, archivePath: String?, mainEntry: TempBoxFile, otherEntries: [(SSZipEntry, String, ChatHistoryImport.MediaType)]) {
+    public init(context: AccountContext, cancel: @escaping () -> Void, peerId: PeerId, archivePath: String?, mainEntry: TempBoxFile, otherEntries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)]) {
         self.context = context
         self.cancel = cancel
         self.peerId = peerId
         self.archivePath = archivePath
         self.mainEntry = mainEntry
         
-        self.otherEntries = otherEntries.map { entry -> (SSZipEntry, String, ChatHistoryImport.MediaType) in
+        self.otherEntries = otherEntries.map { entry -> (SSZipEntry, String, TelegramEngine.HistoryImport.MediaType) in
             return (entry.0, entry.1, entry.2)
         }
         
@@ -814,7 +814,7 @@ public final class ChatImportActivityScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func beginImport() {
@@ -823,7 +823,7 @@ public final class ChatImportActivityScreen: ViewController {
         
         let resolvedPeerId: Signal<PeerId, ImportManager.ImportError>
         if self.peerId.namespace == Namespaces.Peer.CloudGroup {
-            resolvedPeerId = convertGroupToSupergroup(account: self.context.account, peerId: self.peerId)
+            resolvedPeerId = self.context.engine.peers.convertGroupToSupergroup(peerId: self.peerId)
             |> mapError { _ -> ImportManager.ImportError in
                 return .generic
             }
diff --git a/submodules/ChatInterfaceState/Sources/ChatInterfaceState.swift b/submodules/ChatInterfaceState/Sources/ChatInterfaceState.swift
index bcc798afd9..830419853e 100644
--- a/submodules/ChatInterfaceState/Sources/ChatInterfaceState.swift
+++ b/submodules/ChatInterfaceState/Sources/ChatInterfaceState.swift
@@ -93,25 +93,28 @@ public struct ChatEditMessageState: PostboxCoding, Equatable {
 
 public struct ChatInterfaceMessageActionsState: PostboxCoding, Equatable {
     public var closedButtonKeyboardMessageId: MessageId?
+    public var dismissedButtonKeyboardMessageId: MessageId?
     public var processedSetupReplyMessageId: MessageId?
     public var closedPinnedMessageId: MessageId?
     public var closedPeerSpecificPackSetup: Bool = false
     public var dismissedAddContactPhoneNumber: String?
     
     public var isEmpty: Bool {
-        return self.closedButtonKeyboardMessageId == nil && self.processedSetupReplyMessageId == nil && self.closedPinnedMessageId == nil && self.closedPeerSpecificPackSetup == false && self.dismissedAddContactPhoneNumber == nil
+        return self.closedButtonKeyboardMessageId == nil && self.dismissedButtonKeyboardMessageId == nil && self.processedSetupReplyMessageId == nil && self.closedPinnedMessageId == nil && self.closedPeerSpecificPackSetup == false && self.dismissedAddContactPhoneNumber == nil
     }
     
     public init() {
         self.closedButtonKeyboardMessageId = nil
+        self.dismissedButtonKeyboardMessageId = nil
         self.processedSetupReplyMessageId = nil
         self.closedPinnedMessageId = nil
         self.closedPeerSpecificPackSetup = false
         self.dismissedAddContactPhoneNumber = nil
     }
     
-    public init(closedButtonKeyboardMessageId: MessageId?, processedSetupReplyMessageId: MessageId?, closedPinnedMessageId: MessageId?, closedPeerSpecificPackSetup: Bool, dismissedAddContactPhoneNumber: String?) {
+    public init(closedButtonKeyboardMessageId: MessageId?, dismissedButtonKeyboardMessageId: MessageId?, processedSetupReplyMessageId: MessageId?, closedPinnedMessageId: MessageId?, closedPeerSpecificPackSetup: Bool, dismissedAddContactPhoneNumber: String?) {
         self.closedButtonKeyboardMessageId = closedButtonKeyboardMessageId
+        self.dismissedButtonKeyboardMessageId = dismissedButtonKeyboardMessageId
         self.processedSetupReplyMessageId = processedSetupReplyMessageId
         self.closedPinnedMessageId = closedPinnedMessageId
         self.closedPeerSpecificPackSetup = closedPeerSpecificPackSetup
@@ -124,6 +127,12 @@ public struct ChatInterfaceMessageActionsState: PostboxCoding, Equatable {
         } else {
             self.closedButtonKeyboardMessageId = nil
         }
+
+        if let messageIdPeerId = decoder.decodeOptionalInt64ForKey("dismissedbuttons.p"), let messageIdNamespace = decoder.decodeOptionalInt32ForKey("dismissedbuttons.n"), let messageIdId = decoder.decodeOptionalInt32ForKey("dismissedbuttons.i") {
+            self.dismissedButtonKeyboardMessageId = MessageId(peerId: PeerId(messageIdPeerId), namespace: messageIdNamespace, id: messageIdId)
+        } else {
+            self.dismissedButtonKeyboardMessageId = nil
+        }
         
         if let processedMessageIdPeerId = decoder.decodeOptionalInt64ForKey("pb.p"), let processedMessageIdNamespace = decoder.decodeOptionalInt32ForKey("pb.n"), let processedMessageIdId = decoder.decodeOptionalInt32ForKey("pb.i") {
             self.processedSetupReplyMessageId = MessageId(peerId: PeerId(processedMessageIdPeerId), namespace: processedMessageIdNamespace, id: processedMessageIdId)
@@ -150,6 +159,16 @@ public struct ChatInterfaceMessageActionsState: PostboxCoding, Equatable {
             encoder.encodeNil(forKey: "cb.n")
             encoder.encodeNil(forKey: "cb.i")
         }
+
+        if let dismissedButtonKeyboardMessageId = self.dismissedButtonKeyboardMessageId {
+            encoder.encodeInt64(dismissedButtonKeyboardMessageId.peerId.toInt64(), forKey: "dismissedbuttons.p")
+            encoder.encodeInt32(dismissedButtonKeyboardMessageId.namespace, forKey: "dismissedbuttons.n")
+            encoder.encodeInt32(dismissedButtonKeyboardMessageId.id, forKey: "dismissedbuttons.i")
+        } else {
+            encoder.encodeNil(forKey: "dismissedbuttons.p")
+            encoder.encodeNil(forKey: "dismissedbuttons.n")
+            encoder.encodeNil(forKey: "dismissedbuttons.i")
+        }
         
         if let processedSetupReplyMessageId = self.processedSetupReplyMessageId {
             encoder.encodeInt64(processedSetupReplyMessageId.peerId.toInt64(), forKey: "pb.p")
diff --git a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
index 966fd6fa88..ab2515d3ed 100644
--- a/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
+++ b/submodules/ChatListSearchItemHeader/Sources/ChatListSearchItemHeader.swift
@@ -151,9 +151,10 @@ private enum ChatListSearchItemHeaderId: Int32 {
 }
 
 public final class ChatListSearchItemHeader: ListViewItemHeader {
-    public let id: Int64
+    public let id: ListViewItemNode.HeaderId
     public let type: ChatListSearchItemHeaderType
     public let stickDirection: ListViewItemHeaderStickDirection = .top
+    public let stickOverInsets: Bool = true
     public let theme: PresentationTheme
     public let strings: PresentationStrings
     public let actionTitle: String?
@@ -163,14 +164,14 @@ public final class ChatListSearchItemHeader: ListViewItemHeader {
     
     public init(type: ChatListSearchItemHeaderType, theme: PresentationTheme, strings: PresentationStrings, actionTitle: String? = nil, action: (() -> Void)? = nil) {
         self.type = type
-        self.id = Int64(self.type.id.rawValue)
+        self.id = ListViewItemNode.HeaderId(space: 0, id: Int64(self.type.id.rawValue))
         self.theme = theme
         self.strings = strings
         self.actionTitle = actionTitle
         self.action = action
     }
     
-    public func node() -> ListViewItemHeaderNode {
+    public func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
         return ChatListSearchItemHeaderNode(type: self.type, theme: self.theme, strings: self.strings, actionTitle: self.actionTitle, action: self.action)
     }
     
diff --git a/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.swift b/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.swift
index eef6e3b9ab..5cc3470630 100644
--- a/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.swift
+++ b/submodules/ChatListSearchRecentPeersNode/Sources/ChatListSearchRecentPeersNode.swift
@@ -150,7 +150,7 @@ public final class ChatListSearchRecentPeersNode: ASDisplayNode {
         
         let peersDisposable = DisposableSet()
         
-        let recent: Signal<([Peer], [PeerId: (Int32, Bool)], [PeerId : PeerPresence]), NoError> = recentPeers(account: context.account)
+        let recent: Signal<([Peer], [PeerId: (Int32, Bool)], [PeerId : PeerPresence]), NoError> = context.engine.peers.recentPeers()
         |> filter { value -> Bool in
             switch value {
                 case .disabled:
@@ -224,7 +224,7 @@ public final class ChatListSearchRecentPeersNode: ASDisplayNode {
             }
         }))
         if case .actionSheet = mode {
-            peersDisposable.add(managedUpdatedRecentPeers(accountPeerId: context.account.peerId, postbox: context.account.postbox, network: context.account.network).start())
+            peersDisposable.add(context.engine.peers.managedUpdatedRecentPeers().start())
         }
         self.disposable.set(peersDisposable)
     }
diff --git a/submodules/ChatListUI/Sources/ChatContextMenus.swift b/submodules/ChatListUI/Sources/ChatContextMenus.swift
index f2c4bee0a4..8c353d57e2 100644
--- a/submodules/ChatListUI/Sources/ChatContextMenus.swift
+++ b/submodules/ChatListUI/Sources/ChatContextMenus.swift
@@ -49,141 +49,162 @@ enum ChatContextMenuSource {
 func chatContextMenuItems(context: AccountContext, peerId: PeerId, promoInfo: ChatListNodeEntryPromoInfo?, source: ChatContextMenuSource, chatListController: ChatListControllerImpl?, joined: Bool) -> Signal<[ContextMenuItem], NoError> {
     let presentationData = context.sharedContext.currentPresentationData.with({ $0 })
     let strings = presentationData.strings
-    return context.account.postbox.transaction { [weak chatListController] transaction -> [ContextMenuItem] in
-        if promoInfo != nil {
-            return []
-        }
-        
-        var items: [ContextMenuItem] = []
-        
-        if case let .search(search) = source {
-            switch search {
-            case .recentPeers:
-                items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromRecents, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
-                    let _ = (removeRecentPeer(account: context.account, peerId: peerId)
-                    |> deliverOnMainQueue).start(completed: {
-                        f(.default)
-                    })
-                })))
-                items.append(.separator)
-            case .recentSearch:
-                items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromRecents, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
-                    let _ = (removeRecentlySearchedPeer(postbox: context.account.postbox, peerId: peerId)
-                    |> deliverOnMainQueue).start(completed: {
-                        f(.default)
-                    })
-                })))
-                items.append(.separator)
-            case .search:
-                break
-            }
-        }
-        
-        let isSavedMessages = peerId == context.account.peerId
-        
-        let chatPeer = transaction.getPeer(peerId)
-        var maybePeer: Peer?
-        if let chatPeer = chatPeer {
-            if let chatPeer = chatPeer as? TelegramSecretChat {
-                maybePeer = transaction.getPeer(chatPeer.regularPeerId)
+
+    return context.account.postbox.transaction { transaction -> (PeerGroupId, ChatListIndex)? in
+        transaction.getPeerChatListIndex(peerId)
+    }
+    |> mapToSignal { groupAndIndex -> Signal<[ContextMenuItem], NoError> in
+        let location: TogglePeerChatPinnedLocation
+        var chatListFilter: ChatListFilter?
+        if case let .chatList(filter) = source, let chatFilter = filter {
+            chatListFilter = chatFilter
+            location = .filter(chatFilter.id)
+        } else {
+            if let (group, _) = groupAndIndex {
+                location = .group(group)
             } else {
-                maybePeer = chatPeer
-            }
-        }
-        
-        guard let peer = maybePeer else {
-            return []
-        }
-        
-        if !isSavedMessages, let peer = peer as? TelegramUser, !peer.flags.contains(.isSupport) && peer.botInfo == nil && !peer.isDeleted {
-            if !transaction.isPeerContact(peerId: peer.id) {
-                items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_AddToContacts, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                    context.sharedContext.openAddPersonContact(context: context, peerId: peerId, pushController: { controller in
-                        if let navigationController = chatListController?.navigationController as? NavigationController {
-                            navigationController.pushViewController(controller)
-                        }
-                    }, present: { c, a in
-                        if let chatListController = chatListController {
-                            chatListController.present(c, in: .window(.root), with: a)
-                        }
-                    })
-                    f(.default)
-                })))
-                items.append(.separator)
-            }
-        }
-        
-        var isMuted = false
-        if let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
-            if case .muted = notificationSettings.muteState {
-                isMuted = true
+                location = .group(.root)
             }
         }
 
-        var isUnread = false
-        if let readState = transaction.getCombinedPeerReadState(peerId), readState.isUnread {
-            isUnread = true
-        }
-        
-        let isContact = transaction.isPeerContact(peerId: peerId)
-        
-        if case let .chatList(currentFilter) = source {
-            if let currentFilter = currentFilter {
-                items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromFolder, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/RemoveFromFolder"), color: theme.contextMenu.primaryColor) }, action: { c, _ in
-                    let _ = (context.account.postbox.transaction { transaction -> Void in
-                        updateChatListFiltersInteractively(transaction: transaction, { filters in
-                            var filters = filters
-                            for i in 0 ..< filters.count {
-                                if filters[i].id == currentFilter.id {
-                                    let _ = filters[i].data.addExcludePeer(peerId: peer.id)
-                                    break
+        return combineLatest(
+            context.engine.peers.updatedChatListFilters()
+            |> take(1),
+            context.engine.peers.getPinnedItemIds(location: location)
+        )
+        |> mapToSignal { filters, pinnedItemIds -> Signal<[ContextMenuItem], NoError> in
+            let isPinned = pinnedItemIds.contains(.peer(peerId))
+
+            return context.account.postbox.transaction { [weak chatListController] transaction -> [ContextMenuItem] in
+                if promoInfo != nil {
+                    return []
+                }
+
+                var items: [ContextMenuItem] = []
+
+                if case let .search(search) = source {
+                    switch search {
+                    case .recentPeers:
+                        items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromRecents, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
+                            let _ = (context.engine.peers.removeRecentPeer(peerId: peerId)
+                            |> deliverOnMainQueue).start(completed: {
+                                f(.default)
+                            })
+                        })))
+                        items.append(.separator)
+                    case .recentSearch:
+                        items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromRecents, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
+                            let _ = (context.engine.peers.removeRecentlySearchedPeer(peerId: peerId)
+                            |> deliverOnMainQueue).start(completed: {
+                                f(.default)
+                            })
+                        })))
+                        items.append(.separator)
+                    case .search:
+                        break
+                    }
+                }
+
+                let isSavedMessages = peerId == context.account.peerId
+
+                let chatPeer = transaction.getPeer(peerId)
+                var maybePeer: Peer?
+                if let chatPeer = chatPeer {
+                    if let chatPeer = chatPeer as? TelegramSecretChat {
+                        maybePeer = transaction.getPeer(chatPeer.regularPeerId)
+                    } else {
+                        maybePeer = chatPeer
+                    }
+                }
+
+                guard let peer = maybePeer else {
+                    return []
+                }
+
+                if !isSavedMessages, let peer = peer as? TelegramUser, !peer.flags.contains(.isSupport) && peer.botInfo == nil && !peer.isDeleted {
+                    if !transaction.isPeerContact(peerId: peer.id) {
+                        items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_AddToContacts, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                            context.sharedContext.openAddPersonContact(context: context, peerId: peerId, pushController: { controller in
+                                if let navigationController = chatListController?.navigationController as? NavigationController {
+                                    navigationController.pushViewController(controller)
                                 }
+                            }, present: { c, a in
+                                if let chatListController = chatListController {
+                                    chatListController.present(c, in: .window(.root), with: a)
+                                }
+                            })
+                            f(.default)
+                        })))
+                        items.append(.separator)
+                    }
+                }
+
+                var isMuted = false
+                if let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
+                    if case .muted = notificationSettings.muteState {
+                        isMuted = true
+                    }
+                }
+
+                var isUnread = false
+                if let readState = transaction.getCombinedPeerReadState(peerId), readState.isUnread {
+                    isUnread = true
+                }
+
+                let isContact = transaction.isPeerContact(peerId: peerId)
+
+                if case let .chatList(currentFilter) = source {
+                    if let currentFilter = currentFilter {
+                        items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_RemoveFromFolder, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/RemoveFromFolder"), color: theme.contextMenu.primaryColor) }, action: { c, _ in
+                            let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
+                                var filters = filters
+                                for i in 0 ..< filters.count {
+                                    if filters[i].id == currentFilter.id {
+                                        let _ = filters[i].data.addExcludePeer(peerId: peer.id)
+                                        break
+                                    }
+                                }
+                                return filters
+                            }
+                            |> deliverOnMainQueue).start(completed: {
+                                c.dismiss(completion: {
+                                    chatListController?.present(UndoOverlayController(presentationData: presentationData, content: .chatRemovedFromFolder(chatTitle: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), folderTitle: currentFilter.title), elevatedLayout: false, animateInAsReplacement: true, action: { _ in
+                                        return false
+                                    }), in: .current)
+                                })
+                            })
+                        })))
+                    } else {
+                        var hasFolders = false
+
+                        for filter in filters {
+                            let predicate = chatListFilterPredicate(filter: filter.data)
+                            if predicate.includes(peer: peer, groupId: .root, isRemovedFromTotalUnreadCount: isMuted, isUnread: isUnread, isContact: isContact, messageTagSummaryResult: false) {
+                                continue
+                            }
+
+                            var data = filter.data
+                            if data.addIncludePeer(peerId: peer.id) {
+                                hasFolders = true
+                                break
                             }
-                            return filters
-                        })
-                    }
-                    |> deliverOnMainQueue).start(completed: {
-                        c.dismiss(completion: {
-                            chatListController?.present(UndoOverlayController(presentationData: presentationData, content: .chatRemovedFromFolder(chatTitle: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), folderTitle: currentFilter.title), elevatedLayout: false, animateInAsReplacement: true, action: { _ in
-                                return false
-                            }), in: .current)
-                        })
-                    })
-                })))
-            } else {
-                var hasFolders = false
-                updateChatListFiltersInteractively(transaction: transaction, { filters in
-                    for filter in filters {
-                        let predicate = chatListFilterPredicate(filter: filter.data)
-                        if predicate.includes(peer: peer, groupId: .root, isRemovedFromTotalUnreadCount: isMuted, isUnread: isUnread, isContact: isContact, messageTagSummaryResult: false) {
-                            continue
                         }
-                        
-                        var data = filter.data
-                        if data.addIncludePeer(peerId: peer.id) {
-                            hasFolders = true
-                            break
-                        }
-                    }
-                    return filters
-                })
-                
-                if hasFolders {
-                    items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_AddToFolder, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Folder"), color: theme.contextMenu.primaryColor) }, action: { c, _ in
-                        let _ = (context.account.postbox.transaction { transaction -> [ContextMenuItem] in
-                            var updatedItems: [ContextMenuItem] = []
-                            updateChatListFiltersInteractively(transaction: transaction, { filters in
+
+                        if hasFolders {
+                            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_AddToFolder, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Folder"), color: theme.contextMenu.primaryColor) }, action: { c, _ in
+                                var updatedItems: [ContextMenuItem] = []
+
                                 for filter in filters {
                                     let predicate = chatListFilterPredicate(filter: filter.data)
                                     if predicate.includes(peer: peer, groupId: .root, isRemovedFromTotalUnreadCount: isMuted, isUnread: isUnread, isContact: isContact, messageTagSummaryResult: false) {
                                         continue
                                     }
-                                    
+
                                     var data = filter.data
                                     if !data.addIncludePeer(peerId: peer.id) {
                                         continue
                                     }
-                                    
+
                                     let filterType = chatListFilterType(filter)
                                     updatedItems.append(.action(ContextMenuActionItem(text: filter.title, icon: { theme in
                                         let imageName: String
@@ -208,7 +229,7 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, promoInfo: Ch
                                         return generateTintedImage(image: UIImage(bundleImageName: imageName), color: theme.contextMenu.primaryColor)
                                     }, action: { c, f in
                                         c.dismiss(completion: {
-                                            let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                                            let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
                                                 var filters = filters
                                                 for i in 0 ..< filters.count {
                                                     if filters[i].id == filter.id {
@@ -217,180 +238,160 @@ func chatContextMenuItems(context: AccountContext, peerId: PeerId, promoInfo: Ch
                                                     }
                                                 }
                                                 return filters
-                                            })).start()
-                                            
+                                            }).start()
+
                                             chatListController?.present(UndoOverlayController(presentationData: presentationData, content: .chatAddedToFolder(chatTitle: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), folderTitle: filter.title), elevatedLayout: false, animateInAsReplacement: true, action: { _ in
                                                 return false
                                             }), in: .current)
                                         })
                                     })))
                                 }
-                                
-                                return filters
-                            })
-                            
-                            updatedItems.append(.separator)
-                            updatedItems.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_Back, icon: { theme in
-                                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.contextMenu.primaryColor)
-                            }, action: { c, _ in
-                                c.setItems(chatContextMenuItems(context: context, peerId: peerId, promoInfo: promoInfo, source: source, chatListController: chatListController, joined: joined))
+
+                                updatedItems.append(.separator)
+                                updatedItems.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_Back, icon: { theme in
+                                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.contextMenu.primaryColor)
+                                }, action: { c, _ in
+                                    c.setItems(chatContextMenuItems(context: context, peerId: peerId, promoInfo: promoInfo, source: source, chatListController: chatListController, joined: joined))
+                                })))
+
+                                c.setItems(.single(updatedItems))
                             })))
-                            
-                            return updatedItems
                         }
-                        |> deliverOnMainQueue).start(next: { updatedItems in
-                            c.setItems(.single(updatedItems))
-                        })
+                    }
+                }
+
+                if isUnread {
+                    items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAsRead, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsRead"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                        let _ = togglePeerUnreadMarkInteractively(postbox: context.account.postbox, viewTracker: context.account.viewTracker, peerId: peerId).start()
+                        f(.default)
+                    })))
+                } else {
+                    items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAsUnread, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsUnread"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                        let _ = togglePeerUnreadMarkInteractively(postbox: context.account.postbox, viewTracker: context.account.viewTracker, peerId: peerId).start()
+                        f(.default)
                     })))
                 }
-            }
-        }
-        
-        if isUnread {
-            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAsRead, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsRead"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                let _ = togglePeerUnreadMarkInteractively(postbox: context.account.postbox, viewTracker: context.account.viewTracker, peerId: peerId).start()
-                f(.default)
-            })))
-        } else {
-            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_MarkAsUnread, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/MarkAsUnread"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                let _ = togglePeerUnreadMarkInteractively(postbox: context.account.postbox, viewTracker: context.account.viewTracker, peerId: peerId).start()
-                f(.default)
-            })))
-        }
-        
-        let groupAndIndex = transaction.getPeerChatListIndex(peerId)
-        
-        let archiveEnabled = !isSavedMessages && peerId != PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000) && peerId == context.account.peerId
-        if let (group, index) = groupAndIndex {
-            if archiveEnabled {
-                let isArchived = group == Namespaces.PeerGroup.archive
-                items.append(.action(ContextMenuActionItem(text: isArchived ? strings.ChatList_Context_Unarchive : strings.ChatList_Context_Archive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isArchived ? "Chat/Context Menu/Unarchive" : "Chat/Context Menu/Archive"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                    if isArchived {
-                        let _ = (context.account.postbox.transaction { transaction -> Void in
-                            updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: .root)
-                            }
-                        |> deliverOnMainQueue).start(completed: {
-                            f(.default)
-                        })
-                    } else {
-                        if let chatListController = chatListController {
-                            chatListController.archiveChats(peerIds: [peerId])
-                            f(.default)
-                        } else {
-                            let _ = (context.account.postbox.transaction { transaction -> Void in
-                                updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: Namespaces.PeerGroup.archive)
+
+                let archiveEnabled = !isSavedMessages && peerId != PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000)) && peerId == context.account.peerId
+                if let (group, index) = groupAndIndex {
+                    if archiveEnabled {
+                        let isArchived = group == Namespaces.PeerGroup.archive
+                        items.append(.action(ContextMenuActionItem(text: isArchived ? strings.ChatList_Context_Unarchive : strings.ChatList_Context_Archive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isArchived ? "Chat/Context Menu/Unarchive" : "Chat/Context Menu/Archive"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                            if isArchived {
+                                let _ = (context.account.postbox.transaction { transaction -> Void in
+                                    updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: .root)
+                                    }
+                                |> deliverOnMainQueue).start(completed: {
+                                    f(.default)
+                                })
+                            } else {
+                                if let chatListController = chatListController {
+                                    chatListController.archiveChats(peerIds: [peerId])
+                                    f(.default)
+                                } else {
+                                    let _ = (context.account.postbox.transaction { transaction -> Void in
+                                        updatePeerGroupIdInteractively(transaction: transaction, peerId: peerId, groupId: Namespaces.PeerGroup.archive)
+                                    }
+                                    |> deliverOnMainQueue).start(completed: {
+                                        f(.default)
+                                    })
+                                }
                             }
+                        })))
+                    }
+
+                    if isPinned || chatListFilter == nil || peerId.namespace != Namespaces.Peer.SecretChat {
+                        items.append(.action(ContextMenuActionItem(text: isPinned ? strings.ChatList_Context_Unpin : strings.ChatList_Context_Pin, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isPinned ? "Chat/Context Menu/Unpin" : "Chat/Context Menu/Pin"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                            let _ = (context.engine.peers.toggleItemPinned(location: location, itemId: .peer(peerId))
+                            |> deliverOnMainQueue).start(next: { result in
+                                switch result {
+                                case .done:
+                                    break
+                                case .limitExceeded:
+                                    break
+                                }
+                                f(.default)
+                            })
+                        })))
+                    }
+
+                    if !isSavedMessages, let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
+                        var isMuted = false
+                        if case .muted = notificationSettings.muteState {
+                            isMuted = true
+                        }
+                        items.append(.action(ContextMenuActionItem(text: isMuted ? strings.ChatList_Context_Unmute : strings.ChatList_Context_Mute, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isMuted ? "Chat/Context Menu/Unmute" : "Chat/Context Menu/Muted"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                            let _ = (context.engine.peers.togglePeerMuted(peerId: peerId)
                             |> deliverOnMainQueue).start(completed: {
                                 f(.default)
                             })
+                        })))
+                    }
+                } else {
+                    if case .search = source {
+                        if let _ = peer as? TelegramChannel {
+                            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_JoinChannel, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                var createSignal = context.peerChannelMemberCategoriesContextsManager.join(engine: context.engine, peerId: peerId, hash: nil)
+                                var cancelImpl: (() -> Void)?
+                                let progressSignal = Signal<Never, NoError> { subscriber in
+                                    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                                    let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                                        cancelImpl?()
+                                    }))
+                                    chatListController?.present(controller, in: .window(.root))
+                                    return ActionDisposable { [weak controller] in
+                                        Queue.mainQueue().async() {
+                                            controller?.dismiss()
+                                        }
+                                    }
+                                }
+                                |> runOn(Queue.mainQueue())
+                                |> delay(0.15, queue: Queue.mainQueue())
+                                let progressDisposable = progressSignal.start()
+
+                                createSignal = createSignal
+                                |> afterDisposed {
+                                    Queue.mainQueue().async {
+                                        progressDisposable.dispose()
+                                    }
+                                }
+                                let joinChannelDisposable = MetaDisposable()
+                                cancelImpl = {
+                                    joinChannelDisposable.set(nil)
+                                }
+
+                                joinChannelDisposable.set((createSignal
+                                |> deliverOnMainQueue).start(next: { _ in
+                                    if let navigationController = (chatListController?.navigationController as? NavigationController) {
+                                        context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
+                                    }
+                                }, error: { _ in
+                                    if let chatListController = chatListController {
+                                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                                        chatListController.present(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                    }
+                                }))
+                                f(.default)
+                            })))
                         }
                     }
-                })))
-            }
-            
-//            if  {
-                let location: TogglePeerChatPinnedLocation
-                var chatListFilter: ChatListFilter?
-                if case let .chatList(filter) = source, let chatFilter = filter {
-                    chatListFilter = chatFilter
-                    location = .filter(chatFilter.id)
-                } else {
-                    location = .group(group)
                 }
-                
-                let isPinned = getPinnedItemIds(transaction: transaction, location: location).contains(.peer(peerId))
-                
-                if isPinned || chatListFilter == nil || peerId.namespace != Namespaces.Peer.SecretChat {
-                    items.append(.action(ContextMenuActionItem(text: isPinned ? strings.ChatList_Context_Unpin : strings.ChatList_Context_Pin, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isPinned ? "Chat/Context Menu/Unpin" : "Chat/Context Menu/Pin"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                        let _ = (toggleItemPinned(postbox: context.account.postbox, location: location, itemId: .peer(peerId))
-                        |> deliverOnMainQueue).start(next: { result in
-                            switch result {
-                            case .done:
-                                break
-                            case .limitExceeded:
-                                break
-                            }
-                            f(.default)
-                        })
-                    })))
-                }
-//            }
-        
-            if !isSavedMessages, let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
-                var isMuted = false
-                if case .muted = notificationSettings.muteState {
-                    isMuted = true
-                }
-                items.append(.action(ContextMenuActionItem(text: isMuted ? strings.ChatList_Context_Unmute : strings.ChatList_Context_Mute, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: isMuted ? "Chat/Context Menu/Unmute" : "Chat/Context Menu/Muted"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                    let _ = (togglePeerMuted(account: context.account, peerId: peerId)
-                    |> deliverOnMainQueue).start(completed: {
-                        f(.default)
-                    })
-                })))
-            }
-        } else {
-            if case .search = source {
-                if let _ = peer as? TelegramChannel {
-                    items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_JoinChannel, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Add"), color: theme.contextMenu.primaryColor) }, action: { _, f in
-                        var createSignal = context.peerChannelMemberCategoriesContextsManager.join(account: context.account, peerId: peerId, hash: nil)
-                        var cancelImpl: (() -> Void)?
-                        let progressSignal = Signal<Never, NoError> { subscriber in
-                            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                            let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                                cancelImpl?()
-                            }))
-                            chatListController?.present(controller, in: .window(.root))
-                            return ActionDisposable { [weak controller] in
-                                Queue.mainQueue().async() {
-                                    controller?.dismiss()
-                                }
-                            }
+
+                if case .chatList = source, groupAndIndex != nil {
+                    items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_Delete, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
+                        if let chatListController = chatListController {
+                            chatListController.deletePeerChat(peerId: peerId, joined: joined)
                         }
-                        |> runOn(Queue.mainQueue())
-                        |> delay(0.15, queue: Queue.mainQueue())
-                        let progressDisposable = progressSignal.start()
-                        
-                        createSignal = createSignal
-                        |> afterDisposed {
-                            Queue.mainQueue().async {
-                                progressDisposable.dispose()
-                            }
-                        }
-                        let joinChannelDisposable = MetaDisposable()
-                        cancelImpl = {
-                            joinChannelDisposable.set(nil)
-                        }
-                        
-                        joinChannelDisposable.set((createSignal
-                        |> deliverOnMainQueue).start(next: { _ in
-                            if let navigationController = (chatListController?.navigationController as? NavigationController) {
-                                context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
-                            }
-                        }, error: { _ in
-                            if let chatListController = chatListController {
-                                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                                chatListController.present(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                            }
-                        }))
                         f(.default)
                     })))
                 }
+
+                if let item = items.last, case .separator = item {
+                    items.removeLast()
+                }
+
+                return items
             }
         }
-        
-        if case .chatList = source, groupAndIndex != nil {
-            items.append(.action(ContextMenuActionItem(text: strings.ChatList_Context_Delete, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) }, action: { _, f in
-                if let chatListController = chatListController {
-                    chatListController.deletePeerChat(peerId: peerId, joined: joined)
-                }
-                f(.default)
-            })))
-        }
-        
-        if let item = items.last, case .separator = item {
-            items.removeLast()
-        }
-        
-        return items
     }
 }
diff --git a/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift b/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift
index d8912b3ab7..c55120dd20 100644
--- a/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift
+++ b/submodules/ChatListUI/Sources/ChatListAdditionalCategoryItem.swift
@@ -363,9 +363,9 @@ public class ChatListAdditionalCategoryItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ChatListUI/Sources/ChatListController.swift b/submodules/ChatListUI/Sources/ChatListController.swift
index ac1af87bd4..6baa6ea005 100644
--- a/submodules/ChatListUI/Sources/ChatListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListController.swift
@@ -144,9 +144,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     private let featuredFiltersDisposable = MetaDisposable()
     private var processedFeaturedFilters = false
     
-    private let preloadedSticker = Promise<TelegramMediaFile?>(nil)
-    private let preloadStickerDisposable = MetaDisposable()
-    
     private let isReorderingTabsValue = ValuePromise<Bool>(false)
     
     private var searchContentNode: NavigationBarSearchContentNode?
@@ -154,6 +151,8 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     private let tabContainerNode: ChatListFilterTabContainerNode
     private var tabContainerData: ([ChatListFilterTabEntry], Bool)?
     
+    private var didSetupTabs = false
+    
     public override func updateNavigationCustomData(_ data: Any?, progress: CGFloat, transition: ContainedViewLayoutTransition) {
         if self.isNodeLoaded {
             self.chatListDisplayNode.containerNode.updateSelectedChatLocation(data: data as? ChatLocation, progress: progress, transition: transition)
@@ -187,7 +186,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             title = filter.title
         } else if self.groupId == .root {
             title = self.presentationData.strings.DialogList_Title
-            self.navigationBar?.item = nil
         } else {
             title = self.presentationData.strings.ChatList_ArchivedChatsTitle
         }
@@ -281,6 +279,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             return (data.isLockable, false)
         }
         
+        let previousEditingAndNetworkStateValue = Atomic<(Bool, AccountNetworkState)?>(value: nil)
         if !self.hideNetworkActivityStatus {
             self.titleDisposable = combineLatest(queue: .mainQueue(),
                 context.account.networkState,
@@ -296,19 +295,26 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     } else {
                         defaultTitle = strongSelf.presentationData.strings.ChatList_ArchivedChatsTitle
                     }
+                    let previousEditingAndNetworkState = previousEditingAndNetworkStateValue.swap((stateAndFilterId.state.editing, networkState))
                     if stateAndFilterId.state.editing {
                         if strongSelf.groupId == .root {
-                            strongSelf.navigationItem.rightBarButtonItem = nil
+                            strongSelf.navigationItem.setRightBarButton(nil, animated: true)
                         }
-                        
                         let title = !stateAndFilterId.state.selectedPeerIds.isEmpty ? strongSelf.presentationData.strings.ChatList_SelectedChats(Int32(stateAndFilterId.state.selectedPeerIds.count)) : defaultTitle
-                        strongSelf.titleView.title = NetworkStatusTitle(text: title, activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false)
+                        
+                        var animated = false
+                        if let (previousEditing, previousNetworkState) = previousEditingAndNetworkState {
+                            if previousEditing != stateAndFilterId.state.editing, previousNetworkState == networkState, case .online = networkState {
+                                animated = true
+                            }
+                        }
+                        strongSelf.titleView.setTitle(NetworkStatusTitle(text: title, activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false), animated: animated)
                     } else if isReorderingTabs {
                         if strongSelf.groupId == .root {
-                            strongSelf.navigationItem.rightBarButtonItem = nil
+                            strongSelf.navigationItem.setRightBarButton(nil, animated: true)
                         }
                         let leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.reorderingDonePressed))
-                        strongSelf.navigationItem.leftBarButtonItem = leftBarButtonItem
+                        strongSelf.navigationItem.setLeftBarButton(leftBarButtonItem, animated: true)
                         
                         let (_, connectsViaProxy) = proxy
                         switch networkState {
@@ -331,16 +337,21 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             isRoot = true
                             
                             if isReorderingTabs {
-                                strongSelf.navigationItem.rightBarButtonItem = nil
+                                strongSelf.navigationItem.setRightBarButton(nil, animated: true)
                             } else {
                                 let rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationComposeIcon(strongSelf.presentationData.theme), style: .plain, target: strongSelf, action: #selector(strongSelf.composePressed))
                                 rightBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.VoiceOver_Navigation_Compose
-                                strongSelf.navigationItem.rightBarButtonItem = rightBarButtonItem
+                                if strongSelf.navigationItem.rightBarButtonItem?.accessibilityLabel != rightBarButtonItem.accessibilityLabel {
+                                    strongSelf.navigationItem.setRightBarButton(rightBarButtonItem, animated: true)
+                                }
                             }
                             
                             if isReorderingTabs {
                                 let leftBarButtonItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Done, style: .done, target: strongSelf, action: #selector(strongSelf.reorderingDonePressed))
-                                strongSelf.navigationItem.leftBarButtonItem = leftBarButtonItem
+                                leftBarButtonItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Done
+                                if strongSelf.navigationItem.leftBarButtonItem?.accessibilityLabel != leftBarButtonItem.accessibilityLabel {
+                                    strongSelf.navigationItem.setLeftBarButton(leftBarButtonItem, animated: true)
+                                }
                             } else {
                                 let editItem: UIBarButtonItem
                                 if stateAndFilterId.state.editing {
@@ -350,8 +361,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                                     editItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(strongSelf.editPressed))
                                     editItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Edit
                                 }
-                                strongSelf.navigationItem.leftBarButtonItem = editItem
+                                if strongSelf.navigationItem.leftBarButtonItem?.accessibilityLabel != editItem.accessibilityLabel {
+                                    strongSelf.navigationItem.setLeftBarButton(editItem, animated: true)
+                                }
                             }
+                        } else {
+                            let editItem = UIBarButtonItem(title: strongSelf.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(strongSelf.editPressed))
+                            editItem.accessibilityLabel = strongSelf.presentationData.strings.Common_Edit
+                            strongSelf.navigationItem.setRightBarButton(editItem, animated: true)
                         }
                         
                         let (hasProxy, connectsViaProxy) = proxy
@@ -372,7 +389,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             case .updating:
                                 strongSelf.titleView.title = NetworkStatusTitle(text: strongSelf.presentationData.strings.State_Updating, activity: true, hasProxy: isRoot && hasProxy, connectsViaProxy: connectsViaProxy, isPasscodeSet: isRoot && isPasscodeSet, isManuallyLocked: isRoot && isManuallyLocked)
                             case .online:
-                                strongSelf.titleView.title = NetworkStatusTitle(text: defaultTitle, activity: false, hasProxy: isRoot && hasProxy, connectsViaProxy: connectsViaProxy, isPasscodeSet: isRoot && isPasscodeSet, isManuallyLocked: isRoot && isManuallyLocked)
+                                strongSelf.titleView.setTitle(NetworkStatusTitle(text: defaultTitle, activity: false, hasProxy: isRoot && hasProxy, connectsViaProxy: connectsViaProxy, isPasscodeSet: isRoot && isPasscodeSet, isManuallyLocked: isRoot && isManuallyLocked), animated: (previousEditingAndNetworkState?.0 ?? false) != stateAndFilterId.state.editing)
                         }
                         if groupId == .root && filter == nil && checkProxy {
                             if strongSelf.proxyUnavailableTooltipController == nil && !strongSelf.didShowProxyUnavailableTooltipController && strongSelf.isNodeLoaded && strongSelf.displayNode.view.window != nil && strongSelf.navigationController?.topViewController === self {
@@ -596,53 +613,43 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                         scrollToEndIfExists = true
                     }
                     
-                    let _ = (strongSelf.preloadedSticker.get()
-                    |> take(1)
-                    |> deliverOnMainQueue).start(next: { [weak self] greetingSticker in
-                        if let strongSelf = self {
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), activateInput: activateInput && !peer.isDeleted, scrollToEndIfExists: scrollToEndIfExists, greetingData: greetingSticker.flatMap({ ChatGreetingData(sticker: $0) }), animated: !scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] controller in
-                                self?.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
-                                if let promoInfo = promoInfo {
-                                    switch promoInfo {
-                                    case .proxy:
-                                        let _ = (ApplicationSpecificNotice.getProxyAdsAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager)
-                                        |> deliverOnMainQueue).start(next: { value in
-                                            guard let strongSelf = self else {
-                                                return
-                                            }
-                                            if !value {
-                                                controller.displayPromoAnnouncement(text: strongSelf.presentationData.strings.DialogList_AdNoticeAlert)
-                                                let _ = ApplicationSpecificNotice.setProxyAdsAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager).start()
-                                            }
-                                        })
-                                    case let .psa(type, _):
-                                        let _ = (ApplicationSpecificNotice.getPsaAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager, peerId: peer.id)
-                                        |> deliverOnMainQueue).start(next: { value in
-                                            guard let strongSelf = self else {
-                                                return
-                                            }
-                                            if !value {
-                                                var text = strongSelf.presentationData.strings.ChatList_GenericPsaAlert
-                                                let key = "ChatList.PsaAlert.\(type)"
-                                                if let string = strongSelf.presentationData.strings.primaryComponent.dict[key] {
-                                                    text = string
-                                                } else if let string = strongSelf.presentationData.strings.secondaryComponent?.dict[key] {
-                                                    text = string
-                                                }
-                                                
-                                                controller.displayPromoAnnouncement(text: text)
-                                                let _ = ApplicationSpecificNotice.setPsaAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager, peerId: peer.id).start()
-                                            }
-                                        })
+                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), activateInput: activateInput && !peer.isDeleted, scrollToEndIfExists: scrollToEndIfExists, animated: !scrollToEndIfExists, options: strongSelf.groupId == PeerGroupId.root ? [.removeOnMasterDetails] : [], parentGroupId: strongSelf.groupId, completion: { [weak self] controller in
+                        self?.chatListDisplayNode.containerNode.currentItemNode.clearHighlightAnimated(true)
+                        if let promoInfo = promoInfo {
+                            switch promoInfo {
+                            case .proxy:
+                                let _ = (ApplicationSpecificNotice.getProxyAdsAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager)
+                                |> deliverOnMainQueue).start(next: { value in
+                                    guard let strongSelf = self else {
+                                        return
                                     }
-                                }
-                            }))
-                            
-                            if activateInput {
-                                strongSelf.prepareRandomGreetingSticker()
+                                    if !value {
+                                        controller.displayPromoAnnouncement(text: strongSelf.presentationData.strings.DialogList_AdNoticeAlert)
+                                        let _ = ApplicationSpecificNotice.setProxyAdsAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager).start()
+                                    }
+                                })
+                            case let .psa(type, _):
+                                let _ = (ApplicationSpecificNotice.getPsaAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager, peerId: peer.id)
+                                |> deliverOnMainQueue).start(next: { value in
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    if !value {
+                                        var text = strongSelf.presentationData.strings.ChatList_GenericPsaAlert
+                                        let key = "ChatList.PsaAlert.\(type)"
+                                        if let string = strongSelf.presentationData.strings.primaryComponent.dict[key] {
+                                            text = string
+                                        } else if let string = strongSelf.presentationData.strings.secondaryComponent?.dict[key] {
+                                            text = string
+                                        }
+                                        
+                                        controller.displayPromoAnnouncement(text: text)
+                                        let _ = ApplicationSpecificNotice.setPsaAcknowledgment(accountManager: strongSelf.context.sharedContext.accountManager, peerId: peer.id).start()
+                                    }
+                                })
                             }
                         }
-                    })
+                    }))
                 }
             }
         }
@@ -685,7 +692,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             if let layout = strongSelf.validLayout, case .regular = layout.metrics.widthClass {
                                 scrollToEndIfExists = true
                             }
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(actualPeerId), subject: .message(id: messageId, highlight: true), purposefulAction: {
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(actualPeerId), subject: .message(id: messageId, highlight: true, timecode: nil), purposefulAction: {
                                 if deactivateOnAction {
                                     self?.deactivateSearch(animated: false)
                                 }
@@ -737,7 +744,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             actionSheet?.dismissAnimated()
                             
                             if let strongSelf = self {
-                                let _ = removeRecentPeer(account: strongSelf.context.account, peerId: peer.id).start()
+                                let _ = strongSelf.context.engine.peers.removeRecentPeer(peerId: peer.id).start()
                             }
                         })
                     ]),
@@ -855,7 +862,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             } else {
                 var subject: ChatControllerSubject?
                 if case let .search(messageId) = source, let id = messageId {
-                    subject = .message(id: id, highlight: false)
+                    subject = .message(id: id, highlight: false, timecode: nil)
                 }
                 let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.id), subject: subject, botStart: nil, mode: .standard(previewing: true))
                 chatController.canReadHistory.set(false)
@@ -885,7 +892,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         })
         |> mapToSignal { selectedPeerIdsAndFilterId -> Signal<(ChatListSelectionOptions, Set<PeerId>)?, NoError> in
             if let (selectedPeerIds, filterId) = selectedPeerIdsAndFilterId {
-                return chatListSelectionOptions(postbox: context.account.postbox, peerIds: selectedPeerIds, filterId: filterId)
+                return chatListSelectionOptions(context: context, peerIds: selectedPeerIds, filterId: filterId)
                 |> map { options -> (ChatListSelectionOptions, Set<PeerId>)? in
                     return (options, selectedPeerIds)
                 }
@@ -894,6 +901,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             }
         }
         
+        let previousToolbarValue = Atomic<Toolbar?>(value: nil)
         self.stateDisposable.set(combineLatest(queue: .mainQueue(),
             self.presentationDataValue.get(),
             peerIdsAndOptions
@@ -920,7 +928,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     }
                     if archiveEnabled {
                         for peerId in peerIds {
-                            if peerId == PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000) {
+                            if peerId == PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000)) {
                                 archiveEnabled = false
                                 break
                             } else if peerId == strongSelf.context.account.peerId {
@@ -944,7 +952,12 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     toolbar = Toolbar(leftAction: leftAction, rightAction: ToolbarAction(title: presentationData.strings.Common_Delete, isEnabled: options.delete), middleAction: middleAction)
                 }
             }
-            strongSelf.setToolbar(toolbar, transition: .animated(duration: 0.3, curve: .easeInOut))
+            var transition: ContainedViewLayoutTransition = .immediate
+            let previousToolbar = previousToolbarValue.swap(toolbar)
+            if (previousToolbar == nil) != (toolbar == nil) {
+                transition = .animated(duration: 0.3, curve: .easeInOut)
+            }
+            strongSelf.setToolbar(toolbar, transition: transition)
         }))
         
         self.tabContainerNode.tabSelected = { [weak self] id in
@@ -969,7 +982,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             guard let strongSelf = self else {
                 return
             }
-            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+            let _ = (strongSelf.context.engine.peers.currentChatListFilters()
             |> deliverOnMainQueue).start(next: { [weak self] filters in
                 guard let strongSelf = self else {
                     return
@@ -983,7 +996,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             guard let strongSelf = self else {
                                 return
                             }
-                            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                            let _ = (strongSelf.context.engine.peers.currentChatListFilters()
                             |> deliverOnMainQueue).start(next: { presetList in
                                 guard let strongSelf = self else {
                                     return
@@ -1011,7 +1024,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                                 guard let strongSelf = self else {
                                     return
                                 }
-                                let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                                let _ = (strongSelf.context.engine.peers.currentChatListFilters()
                                 |> deliverOnMainQueue).start(next: { presetList in
                                     guard let strongSelf = self else {
                                         return
@@ -1019,7 +1032,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                                     var found = false
                                     for filter in presetList {
                                         if filter.id == id {
-                                            let _ = (currentChatListFilters(postbox: strongSelf.context.account.postbox)
+                                            let _ = (strongSelf.context.engine.peers.currentChatListFilters()
                                             |> deliverOnMainQueue).start(next: { filters in
                                                 guard let strongSelf = self else {
                                                     return
@@ -1103,7 +1116,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         super.displayNodeDidLoad()
         
         Queue.mainQueue().after(1.0) {
-            self.prepareRandomGreetingSticker()
+            self.context.prefetchManager?.prepareNextGreetingSticker()
         }
     }
     
@@ -1124,7 +1137,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 return
             }
             let count = ChatControllerCount.with({ $0 })
-            if count != 0 {
+            if count > 1 {
                 strongSelf.present(textAlertController(context: strongSelf.context, title: "", text: "ChatControllerCount \(count)", actions: [TextAlertAction(type: .defaultAction, title: "OK", action: {})]), in: .window(.root))
             }
         })
@@ -1157,7 +1170,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         if !self.didSuggestLocalization {
             self.didSuggestLocalization = true
             
-            let network = self.context.account.network
+            let context = self.context
             let signal = combineLatest(self.context.sharedContext.accountManager.transaction { transaction -> String in
                 let languageCode: String
                 if let current = transaction.getSharedData(SharedDataKeys.localizationSettings) as? LocalizationSettings {
@@ -1183,7 +1196,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 guard let suggestedLocalization = value.1, !suggestedLocalization.isSeen && suggestedLocalization.languageCode != "en" && suggestedLocalization.languageCode != value.0 else {
                     return .single(nil)
                 }
-                return suggestedLocalizationInfo(network: network, languageCode: suggestedLocalization.languageCode, extractKeys: LanguageSuggestionControllerStrings.keys)
+                return context.engine.localization.suggestedLocalizationInfo(languageCode: suggestedLocalization.languageCode, extractKeys: LanguageSuggestionControllerStrings.keys)
                 |> map({ suggestedLocalization -> (String, SuggestedLocalizationInfo)? in
                     return (value.0, suggestedLocalization)
                 })
@@ -1200,11 +1213,11 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     }
                 }) {
                     strongSelf.present(controller, in: .window(.root))
-                    _ = markSuggestedLocalizationAsSeenInteractively(postbox: strongSelf.context.account.postbox, languageCode: suggestedLocalization.languageCode).start()
+                    _ = strongSelf.context.engine.localization.markSuggestedLocalizationAsSeenInteractively(languageCode: suggestedLocalization.languageCode).start()
                 }
             }))
             
-            self.suggestAutoarchiveDisposable.set((getServerProvidedSuggestions(postbox: self.context.account.postbox)
+            self.suggestAutoarchiveDisposable.set((getServerProvidedSuggestions(account: self.context.account)
             |> deliverOnMainQueue).start(next: { [weak self] values in
                 guard let strongSelf = self else {
                     return
@@ -1259,6 +1272,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 return
             }
             if !strongSelf.chatListDisplayNode.didBeginSelectingChatsWhileEditing {
+                var isEditing = false
+                strongSelf.chatListDisplayNode.containerNode.updateState { state in
+                    isEditing = state.editing
+                    return state
+                }
+                if !isEditing {
+                    strongSelf.editPressed()
+                }
                 strongSelf.chatListDisplayNode.didBeginSelectingChatsWhileEditing = true
                 if let layout = strongSelf.validLayout {
                     strongSelf.updateLayout(layout: layout, transition: .animated(duration: 0.2, curve: .easeInOut))
@@ -1279,7 +1300,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             }
             |> take(1)
             
-            let initializedFilters = updatedChatListFiltersInfo(postbox: self.context.account.postbox)
+            let initializedFilters = self.context.engine.peers.updatedChatListFiltersInfo()
             |> mapToSignal { (filters, isInitialized) -> Signal<Bool, NoError> in
                 if isInitialized {
                     return .single(!filters.isEmpty)
@@ -1315,7 +1336,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             let text: String
                             if hasFilters {
                                 text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipNonEmptyFolders
-                                let _ = markChatListFeaturedFiltersAsSeen(postbox: strongSelf.context.account.postbox).start()
+                                let _ = strongSelf.context.engine.peers.markChatListFeaturedFiltersAsSeen().start()
                                 return
                             } else {
                                 text = strongSelf.presentationData.strings.ChatList_TabIconFoldersTooltipEmptyFolders
@@ -1390,8 +1411,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             tabContainerOffset += layout.statusBarHeight ?? 0.0
             tabContainerOffset += 44.0 + 20.0
         }
+
+        let navigationBarHeight = self.navigationBar?.frame.maxY ?? 0.0
         
-        transition.updateFrame(node: self.tabContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: self.visualNavigationInsetHeight - self.additionalHeight - 46.0 + tabContainerOffset), size: CGSize(width: layout.size.width, height: 46.0)))
+        transition.updateFrame(node: self.tabContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: navigationBarHeight - self.additionalNavigationBarHeight - 46.0 + tabContainerOffset), size: CGSize(width: layout.size.width, height: 46.0)))
         self.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: self.tabContainerData?.0 ?? [], selectedFilter: self.chatListDisplayNode.containerNode.currentItemFilter, isReordering: self.chatListDisplayNode.isReorderingFilters || (self.chatListDisplayNode.containerNode.currentItemNode.currentState.editing && !self.chatListDisplayNode.didBeginSelectingChatsWhileEditing), isEditing: false, transitionFraction: self.chatListDisplayNode.containerNode.transitionFraction, presentationData: self.presentationData, transition: .animated(duration: 0.4, curve: .spring))
         if let tabContainerData = self.tabContainerData {
             self.chatListDisplayNode.inlineTabContainerNode.isHidden = !tabContainerData.1 || tabContainerData.0.count <= 1
@@ -1400,7 +1423,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
         self.chatListDisplayNode.inlineTabContainerNode.update(size: CGSize(width: layout.size.width, height: 40.0), sideInset: layout.safeInsets.left, filters: self.tabContainerData?.0 ?? [], selectedFilter: self.chatListDisplayNode.containerNode.currentItemFilter, isReordering: self.chatListDisplayNode.isReorderingFilters || (self.chatListDisplayNode.containerNode.currentItemNode.currentState.editing && !self.chatListDisplayNode.didBeginSelectingChatsWhileEditing), isEditing: false, transitionFraction: self.chatListDisplayNode.containerNode.transitionFraction, presentationData: self.presentationData, transition: .animated(duration: 0.4, curve: .spring))
         
-        self.chatListDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, visualNavigationHeight: self.visualNavigationInsetHeight, cleanNavigationBarHeight: self.cleanNavigationHeight, transition: transition)
+        self.chatListDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, visualNavigationHeight: navigationBarHeight, cleanNavigationBarHeight: self.cleanNavigationHeight, transition: transition)
     }
     
     override public func navigationStackConfigurationUpdated(next: [ViewController]) {
@@ -1411,10 +1434,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         let editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
         editItem.accessibilityLabel = self.presentationData.strings.Common_Done
         if case .root = self.groupId, self.filter == nil {
-            self.navigationItem.leftBarButtonItem = editItem
+            self.navigationItem.setLeftBarButton(editItem, animated: true)
             (self.navigationController as? NavigationController)?.updateMasterDetailsBlackout(.details, transition: .animated(duration: 0.5, curve: .spring))
         } else {
-            self.navigationItem.rightBarButtonItem = editItem
+            self.navigationItem.setRightBarButton(editItem, animated: true)
             (self.navigationController as? NavigationController)?.updateMasterDetailsBlackout(.master, transition: .animated(duration: 0.5, curve: .spring))
         }
         self.searchContentNode?.setIsEnabled(false, animated: true)
@@ -1435,13 +1458,6 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
     @objc private func donePressed() {
         self.reorderingDonePressed()
         
-        let editItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
-        editItem.accessibilityLabel = self.presentationData.strings.Common_Edit
-        if case .root = self.groupId, self.filter == nil {
-            self.navigationItem.leftBarButtonItem = editItem
-        } else {
-            self.navigationItem.rightBarButtonItem = editItem
-        }
         (self.navigationController as? NavigationController)?.updateMasterDetailsBlackout(nil, transition: .animated(duration: 0.4, curve: .spring))
         self.searchContentNode?.setIsEnabled(true, animated: true)
         self.chatListDisplayNode.didBeginSelectingChatsWhileEditing = false
@@ -1479,7 +1495,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
         
         if let reorderedFilterIds = reorderedFilterIdsValue {
-            let _ = (updateChatListFiltersInteractively(postbox: self.context.account.postbox, { stateFilters in
+            let _ = (self.context.engine.peers.updateChatListFiltersInteractively { stateFilters in
                 var updatedFilters: [ChatListFilter] = []
                 for id in reorderedFilterIds {
                     if let index = stateFilters.firstIndex(where: { $0.id == id }) {
@@ -1494,7 +1510,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                     }
                 })
                 return updatedFilters
-            })
+            }
             |> deliverOnMainQueue).start(completed: { [weak self] in
                 guard let strongSelf = self else {
                     return
@@ -1527,7 +1543,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
         |> distinctUntilChanged
         
-        let filterItems = chatListFilterItems(postbox: self.context.account.postbox)
+        let filterItems = chatListFilterItems(context: self.context)
         var notifiedFirstUpdate = false
         self.filterDisposable.set((combineLatest(queue: .mainQueue(),
                 context.account.postbox.combinedView(keys: [
@@ -1590,17 +1606,21 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             
             let isEmpty = resolvedItems.count <= 1 || displayTabsAtBottom
             
+            let animated = strongSelf.didSetupTabs
+            strongSelf.didSetupTabs = true
+
             if wasEmpty != isEmpty, strongSelf.displayNavigationBar {
-                strongSelf.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
+                strongSelf.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode, animated: false)
                 if let parentController = strongSelf.parent as? TabBarController {
-                    parentController.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode)
+                    parentController.navigationBar?.setSecondaryContentNode(isEmpty ? nil : strongSelf.tabContainerNode, animated: animated)
                 }
             }
             
             if let layout = strongSelf.validLayout {
                 if wasEmpty != isEmpty {
-                    strongSelf.containerLayoutUpdated(layout, transition: .immediate)
-                    (strongSelf.parent as? TabBarController)?.updateLayout()
+                    let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+                    strongSelf.containerLayoutUpdated(layout, transition: transition)
+                    (strongSelf.parent as? TabBarController)?.updateLayout(transition: transition)
                 } else {
                     strongSelf.tabContainerNode.update(size: CGSize(width: layout.size.width, height: 46.0), sideInset: layout.safeInsets.left, filters: resolvedItems, selectedFilter: selectedEntryId, isReordering: strongSelf.chatListDisplayNode.isReorderingFilters || (strongSelf.chatListDisplayNode.containerNode.currentItemNode.currentState.editing && !strongSelf.chatListDisplayNode.didBeginSelectingChatsWhileEditing), isEditing: false, transitionFraction: strongSelf.chatListDisplayNode.containerNode.transitionFraction, presentationData: strongSelf.presentationData, transition: .animated(duration: 0.4, curve: .spring))
                     strongSelf.chatListDisplayNode.inlineTabContainerNode.update(size: CGSize(width: layout.size.width, height: 40.0), sideInset: layout.safeInsets.left, filters: resolvedItems, selectedFilter: selectedEntryId, isReordering: strongSelf.chatListDisplayNode.isReorderingFilters || (strongSelf.chatListDisplayNode.containerNode.currentItemNode.currentState.editing && !strongSelf.chatListDisplayNode.didBeginSelectingChatsWhileEditing), isEditing: false, transitionFraction: strongSelf.chatListDisplayNode.containerNode.transitionFraction, presentationData: strongSelf.presentationData, transition: .animated(duration: 0.4, curve: .spring))
@@ -1632,7 +1652,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
             }
         }
         
-        let _ = (currentChatListFilters(postbox: self.context.account.postbox)
+        let _ = (self.context.engine.peers.currentChatListFilters()
         |> deliverOnMainQueue).start(next: { [weak self] filters in
             guard let strongSelf = self else {
                 return
@@ -1689,7 +1709,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                             }
                         }
                         
-                        let _ = updateChatListFiltersInteractively(postbox: strongSelf.context.account.postbox, { filters in
+                        let _ = (strongSelf.context.engine.peers.updateChatListFiltersInteractively { filters in
                             return filters.filter({ $0.id != id })
                         }).start()
                     }
@@ -1992,11 +2012,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                         |> delay(0.8, queue: Queue.mainQueue())
                         let progressDisposable = progressSignal.start()
                         
-                        let signal: Signal<Void, NoError> = strongSelf.context.account.postbox.transaction { transaction -> Void in
-                            for peerId in peerIds {
-                                removePeerChat(account: context.account, transaction: transaction, mediaBox: context.account.postbox.mediaBox, peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: peerId.namespace == Namespaces.Peer.SecretChat)
-                            }
-                        }
+                        let signal: Signal<Never, NoError> = strongSelf.context.engine.peers.removePeerChats(peerIds: Array(peerIds))
                         |> afterDisposed {
                             Queue.mainQueue().async {
                                 progressDisposable.dispose()
@@ -2275,7 +2291,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                                     return false
                                 }
                                 if value == .commit {
-                                    let _ = clearHistoryInteractively(postbox: strongSelf.context.account.postbox, peerId: peerId, type: type).start(completed: {
+                                    let _ = strongSelf.context.engine.messages.clearHistoryInteractively(peerId: peerId, type: type).start(completed: {
                                         guard let strongSelf = self else {
                                             return
                                         }
@@ -2436,7 +2452,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                                 guard let strongSelf = self else {
                                     return
                                 }
-                                let _ = requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.peerId, isBlocked: true).start()
+                                let _ = strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.peerId, isBlocked: true).start()
                             })
                         }
                     }))
@@ -2681,7 +2697,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 if let channel = chatPeer as? TelegramChannel {
                     strongSelf.context.peerChannelMemberCategoriesContextsManager.externallyRemoved(peerId: channel.id, memberId: strongSelf.context.account.peerId)
                 }
-                let _ = removePeerChat(account: strongSelf.context.account, peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: deleteGloballyIfPossible).start(completed: {
+                let _ = strongSelf.context.engine.peers.removePeerChat(peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: deleteGloballyIfPossible).start(completed: {
                     guard let strongSelf = self else {
                         return
                     }
@@ -2743,36 +2759,14 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
         }
     }
     
-    private func prepareRandomGreetingSticker() {
-        let context = self.context
-        self.preloadedSticker.set(.single(nil)
-        |> then(randomGreetingSticker(account: context.account)
-        |> map { item in
-            return item?.file
-        }))
-        
-        self.preloadStickerDisposable.set((self.preloadedSticker.get()
-        |> mapToSignal { sticker -> Signal<Void, NoError> in
-            if let sticker = sticker {
-                let _ = freeMediaFileInteractiveFetched(account: context.account, fileReference: .standalone(media: sticker)).start()
-                return chatMessageAnimationData(postbox: context.account.postbox, resource: sticker.resource, fitzModifier: nil, width: 384, height: 384, synchronousLoad: false)
-                |> mapToSignal { _ -> Signal<Void, NoError> in
-                    return .complete()
-                }
-            } else {
-                return .complete()
-            }
-        }).start())
-    }
-    
     override public func tabBarDisabledAction() {
         self.donePressed()
     }
     
     override public func tabBarItemContextAction(sourceNode: ContextExtractedContentContainingNode, gesture: ContextGesture) {
         let _ = (combineLatest(queue: .mainQueue(),
-            currentChatListFilters(postbox: self.context.account.postbox),
-            chatListFilterItems(postbox: self.context.account.postbox)
+            self.context.engine.peers.currentChatListFilters(),
+            chatListFilterItems(context: self.context)
             |> take(1)
         )
         |> deliverOnMainQueue).start(next: { [weak self] presetList, filterItemsAndTotalCount in
@@ -2780,7 +2774,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 return
             }
             
-            let _ = markChatListFeaturedFiltersAsSeen(postbox: strongSelf.context.account.postbox).start()
+            let _ = strongSelf.context.engine.peers.markChatListFeaturedFiltersAsSeen().start()
             
             let (_, filterItems) = filterItemsAndTotalCount
             
diff --git a/submodules/ChatListUI/Sources/ChatListControllerNode.swift b/submodules/ChatListUI/Sources/ChatListControllerNode.swift
index e12e902723..ae585ccff7 100644
--- a/submodules/ChatListUI/Sources/ChatListControllerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListControllerNode.swift
@@ -179,10 +179,10 @@ private final class ChatListShimmerNode: ASDisplayNode {
                         
             let chatListPresentationData = ChatListPresentationData(theme: presentationData.theme, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
             
-            let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: "FirstName", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+            let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: "FirstName", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
             let timestamp1: Int32 = 100000
             let peers = SimpleDictionary<PeerId, Peer>()
-            let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+            let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
             }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, hidePsa: { _ in }, activateChatPreview: { _, _, gesture in
                 gesture?.cancel()
             }, present: { _ in })
@@ -275,7 +275,7 @@ private final class ChatListContainerItemNode: ASDisplayNode {
         self.becameEmpty = becameEmpty
         self.emptyAction = emptyAction
         
-        self.listNode = ChatListNode(context: context, groupId: groupId, chatListFilter: filter, previewing: previewing, fillPreloadItems: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        self.listNode = ChatListNode(context: context, groupId: groupId, chatListFilter: filter, previewing: previewing, fillPreloadItems: controlsHistoryPreload, mode: .chatList, theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
         
         super.init()
         
@@ -372,7 +372,7 @@ private final class ChatListContainerItemNode: ASDisplayNode {
             return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
         }
         
-        self.listNode.updateThemeAndStrings(theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        self.listNode.updateThemeAndStrings(theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
         
         self.emptyNode?.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings)
     }
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
index 52751ffef9..95eafaf35f 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
@@ -465,7 +465,7 @@ class ChatListFilterPresetCategoryItemNode: ItemListRevealOptionsItemNode, ItemL
         }
     }
     
-    override func header() -> ListViewItemHeader? {
+    override func headers() -> [ListViewItemHeader]? {
         return nil
     }
 }
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
index 1a4932dd6b..aedd7d3f15 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetController.swift
@@ -624,7 +624,7 @@ private func internalChatListFilterAddChatsController(context: AccountContext, f
         }
         
         if applyAutomatically {
-            let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+            let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
                 var filters = filters
                 for i in 0 ..< filters.count {
                     if filters[i].id == filter.id {
@@ -634,7 +634,7 @@ private func internalChatListFilterAddChatsController(context: AccountContext, f
                     }
                 }
                 return filters
-            })
+            }
             |> deliverOnMainQueue).start(next: { _ in
                 controller?.dismiss()
             })
@@ -702,7 +702,7 @@ private func internalChatListFilterExcludeChatsController(context: AccountContex
         excludePeers.sort()
         
         if applyAutomatically {
-            let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+            let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
                 var filters = filters
                 for i in 0 ..< filters.count {
                     if filters[i].id == filter.id {
@@ -714,7 +714,7 @@ private func internalChatListFilterExcludeChatsController(context: AccountContex
                     }
                 }
                 return filters
-            })
+            }
             |> deliverOnMainQueue).start(next: { _ in
                 controller?.dismiss()
             })
@@ -835,7 +835,7 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
             includePeers.setPeers(state.additionallyIncludePeers)
             let filter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, emoticon: currentPreset?.emoticon, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: includePeers, excludePeers: state.additionallyExcludePeers))
             
-            let _ = (currentChatListFilters(postbox: context.account.postbox)
+            let _ = (context.engine.peers.currentChatListFilters()
             |> deliverOnMainQueue).start(next: { filters in
                 let controller = internalChatListFilterAddChatsController(context: context, filter: filter, allFilters: filters, applyAutomatically: false, updated: { filter in
                     skipStateAnimation = true
@@ -856,7 +856,7 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
             includePeers.setPeers(state.additionallyIncludePeers)
             let filter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, emoticon: currentPreset?.emoticon, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: includePeers, excludePeers: state.additionallyExcludePeers))
             
-            let _ = (currentChatListFilters(postbox: context.account.postbox)
+            let _ = (context.engine.peers.currentChatListFilters()
             |> deliverOnMainQueue).start(next: { filters in
                 let controller = internalChatListFilterExcludeChatsController(context: context, filter: filter, allFilters: filters, applyAutomatically: false, updated: { filter in
                     skipStateAnimation = true
@@ -985,12 +985,12 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
     var attemptNavigationImpl: (() -> Bool)?
     let applyImpl: (() -> Void)? = {
         let state = stateValue.with { $0 }
-        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+        let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
             var includePeers = ChatListFilterIncludePeers()
             includePeers.setPeers(state.additionallyIncludePeers)
             var updatedFilter = ChatListFilter(id: currentPreset?.id ?? -1, title: state.name, emoticon: currentPreset?.emoticon, data: ChatListFilterData(categories: state.includeCategories, excludeMuted: state.excludeMuted, excludeRead: state.excludeRead, excludeArchived: state.excludeArchived, includePeers: includePeers, excludePeers: state.additionallyExcludePeers))
             if currentPreset == nil {
-                updatedFilter.id = generateNewChatListFilterId(filters: filters)
+                updatedFilter.id = context.engine.peers.generateNewChatListFilterId(filters: filters)
             }
             var filters = filters
             if let _ = currentPreset {
@@ -1017,7 +1017,7 @@ func chatListFilterPresetController(context: AccountContext, currentPreset: Chat
                 filters.append(updatedFilter)
             }
             return filters
-        })
+        }
         |> deliverOnMainQueue).start(next: { filters in
             updated(filters)
             dismissImpl?()
diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
index 9142a50166..75cb00bd1f 100644
--- a/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
+++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListController.swift
@@ -249,12 +249,12 @@ public func chatListFilterPresetListController(context: AccountContext, mode: Ch
     
     let arguments = ChatListFilterPresetListControllerArguments(context: context,
     addSuggestedPresed: { title, data in
-        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+        let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
             var filters = filters
-            let id = generateNewChatListFilterId(filters: filters)
+            let id = context.engine.peers.generateNewChatListFilterId(filters: filters)
             filters.insert(ChatListFilter(id: id, title: title, emoticon: nil, data: data), at: 0)
             return filters
-        })
+        }
         |> deliverOnMainQueue).start(next: { _ in
         })
     }, openPreset: { preset in
@@ -279,13 +279,13 @@ public func chatListFilterPresetListController(context: AccountContext, mode: Ch
                 ActionSheetButtonItem(title: presentationData.strings.ChatList_RemoveFolderAction, color: .destructive, action: { [weak actionSheet] in
                     actionSheet?.dismissAnimated()
                     
-                    let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                    let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
                         var filters = filters
                         if let index = filters.firstIndex(where: { $0.id == id }) {
                             filters.remove(at: index)
                         }
                         return filters
-                    })
+                    }
                     |> deliverOnMainQueue).start()
                 })
             ]),
@@ -300,30 +300,12 @@ public func chatListFilterPresetListController(context: AccountContext, mode: Ch
     
     let chatCountCache = Atomic<[ChatListFilterData: Int]>(value: [:])
     
-    let filtersWithCountsSignal = updatedChatListFilters(postbox: context.account.postbox)
+    let filtersWithCountsSignal = context.engine.peers.updatedChatListFilters()
     |> distinctUntilChanged
     |> mapToSignal { filters -> Signal<[(ChatListFilter, Int)], NoError> in
         return .single(filters.map { filter -> (ChatListFilter, Int) in
             return (filter, 0)
         })
-        /*return context.account.postbox.transaction { transaction -> [(ChatListFilter, Int)] in
-            return filters.map { filter -> (ChatListFilter, Int) in
-                let count: Int
-                if let cachedValue = chatCountCache.with({ dict -> Int? in
-                    return dict[filter.data]
-                }) {
-                    count = cachedValue
-                } else {
-                    count = transaction.getChatCountMatchingPredicate(chatListFilterPredicate(filter: filter.data))
-                    let _ = chatCountCache.modify { dict in
-                        var dict = dict
-                        dict[filter.data] = count
-                        return dict
-                    }
-                }
-                return (filter, count)
-            }
-        }*/
     }
     
     let featuredFilters = context.account.postbox.preferencesView(keys: [PreferencesKeys.chatListFiltersFeaturedState])
@@ -368,7 +350,7 @@ public func chatListFilterPresetListController(context: AccountContext, mode: Ch
                 |> take(1)
                 |> deliverOnMainQueue).start(next: { [weak updatedFilterOrder] updatedFilterOrderValue in
                     if let updatedFilterOrderValue = updatedFilterOrderValue {
-                        let _ = (updateChatListFiltersInteractively(postbox: context.account.postbox, { filters in
+                        let _ = (context.engine.peers.updateChatListFiltersInteractively { filters in
                             var updatedFilters: [ChatListFilter] = []
                             for id in updatedFilterOrderValue {
                                 if let index = filters.firstIndex(where: { $0.id == id }) {
@@ -382,7 +364,7 @@ public func chatListFilterPresetListController(context: AccountContext, mode: Ch
                             }
                             
                             return updatedFilters
-                        })
+                        }
                         |> deliverOnMainQueue).start(next: { _ in
                             filtersWithCounts.set(filtersWithCountsSignal)
                             let _ = (filtersWithCounts.get()
diff --git a/submodules/ChatListUI/Sources/ChatListRecentPeersListItem.swift b/submodules/ChatListUI/Sources/ChatListRecentPeersListItem.swift
index 175f6f607d..aceec993d0 100644
--- a/submodules/ChatListUI/Sources/ChatListRecentPeersListItem.swift
+++ b/submodules/ChatListUI/Sources/ChatListRecentPeersListItem.swift
@@ -154,9 +154,9 @@ class ChatListRecentPeersListItemNode: ListViewItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
index 05631316a2..041708249f 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchContainerNode.swift
@@ -30,6 +30,7 @@ import InstantPageUI
 import ChatInterfaceState
 import ShareController
 import UndoUI
+import TextFormat
 
 private enum ChatListTokenId: Int32 {
     case filter
@@ -107,6 +108,8 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
     private var suggestedFilters: [ChatListSearchFilter]?
     private let suggestedFiltersDisposable = MetaDisposable()
     
+    private var shareStatusDisposable: MetaDisposable?
+    
     private var stateValue = ChatListSearchContainerNodeSearchState()
     private let statePromise = ValuePromise<ChatListSearchContainerNodeSearchState>()
     
@@ -160,11 +163,11 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                 addAppLogEvent(postbox: context.account.postbox, type: "search_global_open_message", peerId: peer.id, data: .dictionary(["msg_id": .number(Double(messageId.id))]))
             }
         }, openUrl: { [weak self] url in
-            openUserGeneratedUrl(context: context, url: url, concealed: false, present: { c in
+            openUserGeneratedUrl(context: context, peerId: nil, url: url, concealed: false, present: { c in
                 present(c, nil)
             }, openResolved: { [weak self] resolved in
                 context.sharedContext.openResolvedUrl(resolved, context: context, urlContext: .generic, navigationController: navigationController, openPeer: { peerId, navigation in
-                    //                            self?.openPeer(peerId: peerId, navigation: navigation)
+                    
                 }, sendFile: nil,
                 sendSticker: nil,
                 requestMessageActionUrlAuth: nil,
@@ -188,7 +191,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                     guard let strongSelf = self else {
                         return
                     }
-                    let _ = (clearRecentlySearchedPeers(postbox: strongSelf.context.account.postbox)
+                    let _ = (strongSelf.context.engine.peers.clearRecentlySearchedPeers()
                     |> deliverOnMainQueue).start()
                 })
             ]), ActionSheetItemGroup(items: [
@@ -415,6 +418,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
         self.activeActionDisposable.dispose()
         self.presentationDataDisposable?.dispose()
         self.suggestedFiltersDisposable.dispose()
+        self.shareStatusDisposable?.dispose()
     }
     
     private func updateState(_ f: (ChatListSearchContainerNodeSearchState) -> ChatListSearchContainerNodeSearchState) {
@@ -844,7 +848,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                         items.append(ActionSheetButtonItem(title: globalTitle, color: .destructive, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
                             if let strongSelf = self {
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                                 
                                 strongSelf.updateState { state in
                                     return state.withUpdatedSelectedMessageIds(nil)
@@ -867,7 +871,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                         items.append(ActionSheetButtonItem(title: localOptionText, color: .destructive, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
                             if let strongSelf = self {
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forLocalPeer).start()
                                 
                                 strongSelf.updateState { state in
                                     return state.withUpdatedSelectedMessageIds(nil)
@@ -902,7 +906,83 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                 }
             }).start()
             
-            let peerSelectionController = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: [.onlyWriteable, .excludeDisabled]))
+            let peerSelectionController = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: [.onlyWriteable, .excludeDisabled], multipleSelection: true))
+            peerSelectionController.multiplePeersSelected = { [weak self, weak peerSelectionController] peers, messageText in
+                guard let strongSelf = self, let strongController = peerSelectionController else {
+                    return
+                }
+                strongController.dismiss()
+                
+                for peer in peers {
+                    var result: [EnqueueMessage] = []
+                    if messageText.string.count > 0 {
+                        let inputText = convertMarkdownToAttributes(messageText)
+                        for text in breakChatInputText(trimChatInputText(inputText)) {
+                            if text.length != 0 {
+                                var attributes: [MessageAttribute] = []
+                                let entities = generateTextEntities(text.string, enabledTypes: .all, currentEntities: generateChatInputTextEntities(text))
+                                if !entities.isEmpty {
+                                    attributes.append(TextEntitiesMessageAttribute(entities: entities))
+                                }
+                                result.append(.message(text: text.string, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
+                            }
+                        }
+                    }
+                    
+                    result.append(contentsOf: messageIds.map { messageId -> EnqueueMessage in
+                        return .forward(source: messageId, grouping: .auto, attributes: [], correlationId: nil)
+                    })
+                    
+                    let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: result)
+                    |> deliverOnMainQueue).start(next: { messageIds in
+                        if let strongSelf = self {
+                            let signals: [Signal<Bool, NoError>] = messageIds.compactMap({ id -> Signal<Bool, NoError>? in
+                                guard let id = id else {
+                                    return nil
+                                }
+                                return strongSelf.context.account.pendingMessageManager.pendingMessageStatus(id)
+                                |> mapToSignal { status, _ -> Signal<Bool, NoError> in
+                                    if status != nil {
+                                        return .never()
+                                    } else {
+                                        return .single(true)
+                                    }
+                                }
+                                |> take(1)
+                            })
+                            if strongSelf.shareStatusDisposable == nil {
+                                strongSelf.shareStatusDisposable = MetaDisposable()
+                            }
+                            strongSelf.shareStatusDisposable?.set((combineLatest(signals)
+                            |> deliverOnMainQueue).start())
+                        }
+                    })
+                    
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    let text: String
+                    var savedMessages = false
+                    if peers.count == 1, let peerId = peers.first?.id, peerId == strongSelf.context.account.peerId {
+                        text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many
+                        savedMessages = true
+                    } else {
+                        if peers.count == 1, let peer = peers.first {
+                            let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).0 : presentationData.strings.Conversation_ForwardTooltip_Chat_Many(peerName).0
+                        } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                            let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0 : presentationData.strings.Conversation_ForwardTooltip_TwoChats_Many(firstPeerName, secondPeerName).0
+                        } else if let peer = peers.first {
+                            let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0 : presentationData.strings.Conversation_ForwardTooltip_ManyChats_Many(peerName, "\(peers.count - 1)").0
+                        } else {
+                            text = ""
+                        }
+                    }
+                    
+                    (strongSelf.navigationController?.topViewController as? ViewController)?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .current)
+                }
+            }
             peerSelectionController.peerSelected = { [weak self, weak peerSelectionController] peer in
                 let peerId = peer.id
                 if let strongSelf = self, let _ = peerSelectionController {
@@ -911,7 +991,7 @@ public final class ChatListSearchContainerNode: SearchDisplayControllerContentNo
                         (strongSelf.navigationController?.topViewController as? ViewController)?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: true, text: messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
                         
                         let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messageIds.map { id -> EnqueueMessage in
-                            return .forward(source: id, grouping: .auto, attributes: [])
+                            return .forward(source: id, grouping: .auto, attributes: [], correlationId: nil)
                         })
                         |> deliverOnMainQueue).start(next: { [weak self] messageIds in
                             if let strongSelf = self {
diff --git a/submodules/ChatListUI/Sources/ChatListSearchFiltersContainerNode.swift b/submodules/ChatListUI/Sources/ChatListSearchFiltersContainerNode.swift
index 2224d24af0..fe11a7cf60 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchFiltersContainerNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchFiltersContainerNode.swift
@@ -211,7 +211,7 @@ final class ChatListSearchFiltersContainerNode: ASDisplayNode {
         let previousContentWidth = self.scrollNode.view.contentSize.width
         
         if self.currentParams?.presentationData.theme !== presentationData.theme {
-            self.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+            //self.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
             self.selectedLineNode.image = generateImage(CGSize(width: 5.0, height: 3.0), rotatedContext: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
                 context.setFillColor(presentationData.theme.list.itemAccentColor.cgColor)
diff --git a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
index ef8bf065b5..969b115076 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift
@@ -515,7 +515,7 @@ public enum ChatListSearchEntry: Comparable, Identifiable {
                 let header = ChatListSearchItemHeader(type: .messages, theme: presentationData.theme, strings: presentationData.strings, actionTitle: nil, action: nil)
                 let selection: ChatHistoryMessageSelection = selected.flatMap { .selectable(selected: $0) } ?? .none
                 if let tagMask = tagMask, tagMask != .photoOrVideo {
-                    return ListMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: .builtin(WallpaperSettings())), fontSize: presentationData.fontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: false, chatBubbleCorners: PresentationChatBubbleCorners(mainRadius: 0.0, auxiliaryRadius: 0.0, mergeBubbleCorners: false)), context: context, chatLocation: .peer(peer.peerId), interaction: listInteraction, message: message, selection: selection, displayHeader: enableHeaders && !displayCustomHeader, customHeader: nil, hintIsLink: tagMask == .webPage, isGlobalSearchResult: true)
+                    return ListMessageItem(presentationData: ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: .builtin(WallpaperSettings())), fontSize: presentationData.fontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: false, chatBubbleCorners: PresentationChatBubbleCorners(mainRadius: 0.0, auxiliaryRadius: 0.0, mergeBubbleCorners: false)), context: context, chatLocation: .peer(peer.peerId), interaction: listInteraction, message: message, selection: selection, displayHeader: enableHeaders && !displayCustomHeader, customHeader: nil, hintIsLink: tagMask == .webPage, isGlobalSearchResult: true)
                 } else {
                     return ChatListItem(presentationData: presentationData, context: context, peerGroupId: .root, filterData: nil, index: ChatListIndex(pinningIndex: nil, messageIndex: message.index), content: .peer(messages: [message], peer: peer, combinedReadState: readState, isRemovedFromTotalUnreadCount: false, presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), embeddedState: nil, inputActivities: nil, promoInfo: nil, ignoreUnreadBadge: true, displayAsMessage: false, hasFailedMessages: false), editing: false, hasActiveRevealControls: false, selected: false, header: tagMask == nil ? header : nil, enableContextActions: false, hiddenOffset: false, interaction: interaction)
                 }
@@ -689,7 +689,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
     private let emptyResultsTitleNode: ImmediateTextNode
     private let emptyResultsTextNode: ImmediateTextNode
     private let emptyResultsAnimationNode: AnimatedStickerNode
-    private var animationSize: CGSize = CGSize()
+    private var emptyResultsAnimationSize: CGSize = CGSize()
     
     private var currentParams: (size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, visibleHeight: CGFloat, presentationData: PresentationData)?
     
@@ -737,7 +737,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.presentationData = presentationData
-        self.presentationDataPromise.set(.single(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations)))
+        self.presentationDataPromise.set(.single(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)))
         
         self.searchStatePromise.set(self.searchStateValue)
         self.selectedMessages = interaction.getSelectedMessageIds()
@@ -792,8 +792,8 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         super.init()
                 
         if let path = getAppBundle().path(forResource: "ChatListNoResults", ofType: "tgs") {
-            self.emptyResultsAnimationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 248, height: 248, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
-            self.animationSize = CGSize(width: 124.0, height: 124.0)
+            self.emptyResultsAnimationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 256, height: 256, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
+            self.emptyResultsAnimationSize = CGSize(width: 148.0, height: 148.0)
         }
         
         self.addSubnode(self.recentListNode)
@@ -841,9 +841,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
             }
             
             let accountPeer = context.account.postbox.loadedPeerWithId(context.account.peerId) |> take(1)
-
             let foundLocalPeers: Signal<(peers: [RenderedPeer], unread: [PeerId: (Int32, Bool)]), NoError>
-
             if let query = query {
                 foundLocalPeers = context.account.postbox.searchPeers(query: query.lowercased())
                 |> mapToSignal { local -> Signal<([PeerView], [RenderedPeer]), NoError> in
@@ -883,7 +881,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 foundRemotePeers = (
                     .single((currentRemotePeersValue.0, currentRemotePeersValue.1, true))
                     |> then(
-                        searchPeers(account: context.account, query: query)
+                        context.engine.peers.searchPeers(query: query)
                         |> map { ($0.0, $0.1, false) }
                         |> delay(0.2, queue: Queue.concurrentDefaultQueue())
                     )
@@ -922,7 +920,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                     addAppLogEvent(postbox: context.account.postbox, type: "search_global_query")
                 }
                 
-                let searchSignal = searchMessages(account: context.account, location: location, query: finalQuery, state: nil, limit: 50)
+                let searchSignal = context.engine.messages.searchMessages(location: location, query: finalQuery, state: nil, limit: 50)
                 |> map { result, updatedState -> ChatListSearchMessagesResult in
                     return ChatListSearchMessagesResult(query: finalQuery, messages: result.messages.sorted(by: { $0.index > $1.index }), readStates: result.readStates, hasMore: !result.completed, totalCount: result.totalCount, state: updatedState)
                 }
@@ -931,7 +929,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 |> mapToSignal { searchContext -> Signal<(([Message], [PeerId: CombinedPeerReadState], Int32), Bool), NoError> in
                     if let searchContext = searchContext, searchContext.result.hasMore {
                         if let _ = searchContext.loadMoreIndex {
-                            return searchMessages(account: context.account, location: location, query: finalQuery, state: searchContext.result.state, limit: 80)
+                            return context.engine.messages.searchMessages(location: location, query: finalQuery, state: searchContext.result.state, limit: 80)
                             |> map { result, updatedState -> ChatListSearchMessagesResult in
                                 return ChatListSearchMessagesResult(query: finalQuery, messages: result.messages.sorted(by: { $0.index > $1.index }), readStates: result.readStates, hasMore: !result.completed, totalCount: result.totalCount, state: updatedState)
                             }
@@ -965,10 +963,10 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
             }
             
             let resolvedMessage = .single(nil)
-                |> then(context.sharedContext.resolveUrl(account: context.account, url: finalQuery, skipUrlAuth: true)
+            |> then(context.sharedContext.resolveUrl(context: context, peerId: nil, url: finalQuery, skipUrlAuth: true)
             |> mapToSignal { resolvedUrl -> Signal<Message?, NoError> in
-                if case let .channelMessage(_, messageId) = resolvedUrl {
-                    return downloadMessage(postbox: context.account.postbox, network: context.account.network, messageId: messageId)
+                if case let .channelMessage(_, messageId, _) = resolvedUrl {
+                    return context.engine.messages.downloadMessage(messageId: messageId)
                 } else {
                     return .single(nil)
                 }
@@ -1215,10 +1213,11 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         }, peerSelected: { [weak self] peer, _ in
             interaction.dismissInput()
             interaction.openPeer(peer, false)
-            let _ = addRecentlySearchedPeer(postbox: context.account.postbox, peerId: peer.id).start()
+            let _ = context.engine.peers.addRecentlySearchedPeer(peerId: peer.id).start()
             self?.listNode.clearHighlightAnimated(true)
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, togglePeersSelection: { _, _ in
         }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             interaction.dismissInput()
@@ -1279,7 +1278,6 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
             }, openUrl: { url in
                 interaction.openUrl(url)
             }, openPeer: { peer, navigation in
-//                interaction.openPeer(peer.id, navigation)
             }, callPeer: { _, _ in
             }, enqueueMessage: { _ in
             }, sendSticker: nil, setupTemporaryHiddenMedia: { _, _, _ in }, chatAvatarHiddenMedia: { _, _ in }, playlistLocation: .custom(messages: foundMessages, at: message.id, loadMore: {
@@ -1398,7 +1396,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         }))
         
         let previousRecentItems = Atomic<[ChatListRecentEntry]?>(value: nil)
-        let hasRecentPeers = recentPeers(account: context.account)
+        let hasRecentPeers = context.engine.peers.recentPeers()
         |> map { value -> Bool in
             switch value {
                 case let .peers(peers):
@@ -1410,7 +1408,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         |> distinctUntilChanged
         
         let previousRecentlySearchedPeerOrder = Atomic<[PeerId]>(value: [])
-        let fixedRecentlySearchedPeers = recentlySearchedPeers(postbox: context.account.postbox)
+        let fixedRecentlySearchedPeers = context.engine.peers.recentlySearchedPeers()
         |> map { peers -> [RecentlySearchedPeer] in
             var result: [RecentlySearchedPeer] = []
             let _ = previousRecentlySearchedPeerOrder.modify { current in
@@ -1468,7 +1466,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         }
         
         if tagMask == nil && !peersFilter.contains(.excludeRecent) {
-            self.updatedRecentPeersDisposable.set(managedUpdatedRecentPeers(accountPeerId: context.account.peerId, postbox: context.account.postbox, network: context.account.network).start())
+            self.updatedRecentPeersDisposable.set(context.engine.peers.managedUpdatedRecentPeers().start())
         }
         
         self.recentDisposable.set((combineLatest(queue: .mainQueue(),
@@ -1482,7 +1480,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 let firstTime = previousEntries == nil
                 let transition = chatListSearchContainerPreparedRecentTransition(from: previousEntries ?? [], to: entries, context: context, presentationData: presentationData, filter: peersFilter, peerSelected: { peer in
                     interaction.openPeer(peer, true)
-                    let _ = addRecentlySearchedPeer(postbox: context.account.postbox, peerId: peer.id).start()
+                    let _ = context.engine.peers.addRecentlySearchedPeer(peerId: peer.id).start()
                     self?.recentListNode.clearHighlightAnimated(true)
                 }, disabledPeerSelected: { peer in
                     interaction.openDisabledPeer(peer)
@@ -1495,7 +1493,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                 }, clearRecentlySearchedPeers: {
                     interaction.clearRecentSearch()
                 }, deletePeer: { peerId in
-                    let _ = removeRecentlySearchedPeer(postbox: context.account.postbox, peerId: peerId).start()
+                    let _ = context.engine.peers.removeRecentlySearchedPeer(peerId: peerId).start()
                 })
                 strongSelf.enqueueRecentTransition(transition, firstTime: firstTime)
             }
@@ -1505,7 +1503,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         |> deliverOnMainQueue).start(next: { [weak self] presentationData in
             if let strongSelf = self {
                 strongSelf.presentationData = presentationData
-                strongSelf.presentationDataPromise.set(.single(ChatListPresentationData(theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)))
+                strongSelf.presentationDataPromise.set(.single(ChatListPresentationData(theme: presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)))
                 
                 strongSelf.listNode.forEachItemHeaderNode({ itemHeaderNode in
                     if let itemHeaderNode = itemHeaderNode as? ChatListSearchItemHeaderNode {
@@ -1521,11 +1519,11 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
             }
         })
                         
-        self.recentListNode.beganInteractiveDragging = {
+        self.recentListNode.beganInteractiveDragging = { _ in
             interaction.dismissInput()
         }
         
-        self.listNode.beganInteractiveDragging = {
+        self.listNode.beganInteractiveDragging = { _ in
             interaction.dismissInput()
         }
         
@@ -1724,7 +1722,7 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                     })
                 }
                 
-                let mediaAccessoryPanel = MediaNavigationAccessoryPanel(context: self.context)
+                let mediaAccessoryPanel = MediaNavigationAccessoryPanel(context: self.context, displayBackground: true)
                 mediaAccessoryPanel.containerNode.headerNode.displayScrubber = item.playbackData?.type != .instantVideo
                 mediaAccessoryPanel.close = { [weak self] in
                     if let strongSelf = self, let (_, _, _, _, type, _) = strongSelf.playlistStateAndType {
@@ -1938,21 +1936,17 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
         let emptyTitleSize = self.emptyResultsTitleNode.updateLayout(CGSize(width: size.width - sideInset * 2.0 - padding * 2.0, height: CGFloat.greatestFiniteMagnitude))
         let emptyTextSize = self.emptyResultsTextNode.updateLayout(CGSize(width: size.width - sideInset * 2.0 - padding * 2.0, height: CGFloat.greatestFiniteMagnitude))
         
-        let emptyAnimationHeight = self.animationSize.height
+        let emptyAnimationHeight = self.emptyResultsAnimationSize.height
         let emptyAnimationSpacing: CGFloat = 8.0
-//        if case .landscape = layout.orientation, case .compact = layout.metrics.widthClass {
-//            emptyAnimationHeight = 0.0
-//            emptyAnimationSpacing = 0.0
-//        }
         let emptyTextSpacing: CGFloat = 8.0
         let emptyTotalHeight = emptyAnimationHeight + emptyAnimationSpacing + emptyTitleSize.height + emptyTextSize.height + emptyTextSpacing
         let emptyAnimationY = topInset + floorToScreenPixels((visibleHeight - topInset - bottomInset - emptyTotalHeight) / 2.0)
         
         let textTransition = ContainedViewLayoutTransition.immediate
-        textTransition.updateFrame(node: self.emptyResultsAnimationNode, frame: CGRect(origin: CGPoint(x: sideInset + padding + (size.width - sideInset * 2.0 - padding * 2.0 - self.animationSize.width) / 2.0, y: emptyAnimationY), size: self.animationSize))
+        textTransition.updateFrame(node: self.emptyResultsAnimationNode, frame: CGRect(origin: CGPoint(x: sideInset + padding + (size.width - sideInset * 2.0 - padding * 2.0 - self.emptyResultsAnimationSize.width) / 2.0, y: emptyAnimationY), size: self.emptyResultsAnimationSize))
         textTransition.updateFrame(node: self.emptyResultsTitleNode, frame: CGRect(origin: CGPoint(x: sideInset + padding + (size.width - sideInset * 2.0 - padding * 2.0 - emptyTitleSize.width) / 2.0, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing), size: emptyTitleSize))
         textTransition.updateFrame(node: self.emptyResultsTextNode, frame: CGRect(origin: CGPoint(x: sideInset + padding + (size.width - sideInset * 2.0 - padding * 2.0 - emptyTextSize.width) / 2.0, y: emptyAnimationY + emptyAnimationHeight + emptyAnimationSpacing + emptyTitleSize.height + emptyTextSpacing), size: emptyTextSize))
-        self.emptyResultsAnimationNode.updateLayout(size: self.animationSize)
+        self.emptyResultsAnimationNode.updateLayout(size: self.emptyResultsAnimationSize)
         
         if !hadValidLayout {
             while !self.enqueuedRecentTransitions.isEmpty {
@@ -2327,11 +2321,11 @@ private final class ChatListSearchShimmerNode: ASDisplayNode {
             
             let chatListPresentationData = ChatListPresentationData(theme: presentationData.theme, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
             
-            let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: "FirstName", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+            let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: "FirstName", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
             let timestamp1: Int32 = 100000
             var peers = SimpleDictionary<PeerId, Peer>()
             peers[peer1.id] = peer1
-            let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+            let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
             }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, hidePsa: { _ in }, activateChatPreview: { _, _, gesture in
                 gesture?.cancel()
             }, present: { _ in })
diff --git a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift
index d74c1208e9..7979476472 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchMediaNode.swift
@@ -320,21 +320,6 @@ private final class VisualMediaItemNode: ASDisplayNode {
     
     func updateIsVisible(_ isVisible: Bool) {
         self.hasVisibility = isVisible
-//        if let _ = self.videoLayerFrameManager {
-//            let displayLink: ConstantDisplayLinkAnimator
-//            if let current = self.displayLink {
-//                displayLink = current
-//            } else {
-//                displayLink = ConstantDisplayLinkAnimator { [weak self] in
-//                    guard let strongSelf = self else {
-//                        return
-//                    }
-//                    strongSelf.displayLinkTimestamp += 1.0 / 30.0
-//                }
-//                displayLink.frameInterval = 2
-//                self.displayLink = displayLink
-//            }
-//        }
         self.displayLink?.isPaused = !self.hasVisibility || self.isHidden
     }
     
@@ -422,8 +407,8 @@ private final class VisualMediaItem {
     let dimensions: CGSize
     let aspectRatio: CGFloat
     
-    init(message: Message) {
-        self.index = nil
+    init(message: Message, index: UInt32?) {
+        self.index = index
         self.message = message
         
         var aspectRatio: CGFloat = 1.0
@@ -441,10 +426,10 @@ private final class VisualMediaItem {
     }
     
     var stableId: UInt32 {
-        if let message = self.message {
-            return message.stableId
-        } else if let index = self.index {
+        if let index = self.index {
             return index
+        } else if let message = self.message {
+            return message.stableId
         } else {
             return 0
         }
@@ -708,7 +693,6 @@ final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate {
         self.animationTimer?.invalidate()
     }
     
-    
     func updateHistory(entries: [ChatListSearchEntry]?, totalCount: Int32, updateType: ViewUpdateType) {
         switch updateType {
         case .FillHole:
@@ -716,11 +700,13 @@ final class ChatListSearchMediaNode: ASDisplayNode, UIScrollViewDelegate {
         default:
             self.mediaItems.removeAll()
             
+            var index: UInt32 = 0
             if let entries = entries {   
                 for entry in entries {
                     if case let .message(message, _, _, _, _, _, _) = entry {
-                        self.mediaItems.append(VisualMediaItem(message: message))
+                        self.mediaItems.append(VisualMediaItem(message: message, index: nil))
                     }
+                    index += 1
                 }
             }
             self.itemsLayout = nil
diff --git a/submodules/ChatListUI/Sources/ChatListSearchMessageSelectionPanelNode.swift b/submodules/ChatListUI/Sources/ChatListSearchMessageSelectionPanelNode.swift
index d126d37553..765d79ab65 100644
--- a/submodules/ChatListUI/Sources/ChatListSearchMessageSelectionPanelNode.swift
+++ b/submodules/ChatListUI/Sources/ChatListSearchMessageSelectionPanelNode.swift
@@ -121,7 +121,7 @@ final class ChatListSearchMessageSelectionPanelNode: ASDisplayNode {
         if presentationData.theme !== self.theme {
             self.theme = presentationData.theme
             
-            self.backgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+            self.backgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
             self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
             
             self.deleteButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: presentationData.theme.chat.inputPanel.panelControlAccentColor), for: [.normal])
diff --git a/submodules/ChatListUI/Sources/ChatListSelection.swift b/submodules/ChatListUI/Sources/ChatListSelection.swift
index 869a2fae27..3c0c533c59 100644
--- a/submodules/ChatListUI/Sources/ChatListSelection.swift
+++ b/submodules/ChatListUI/Sources/ChatListSelection.swift
@@ -4,6 +4,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
+import AccountContext
 
 enum ChatListSelectionReadOption: Equatable {
     case all(enabled: Bool)
@@ -15,10 +16,10 @@ struct ChatListSelectionOptions: Equatable {
     let delete: Bool
 }
 
-func chatListSelectionOptions(postbox: Postbox, peerIds: Set<PeerId>, filterId: Int32?) -> Signal<ChatListSelectionOptions, NoError> {
+func chatListSelectionOptions(context: AccountContext, peerIds: Set<PeerId>, filterId: Int32?) -> Signal<ChatListSelectionOptions, NoError> {
     if peerIds.isEmpty {
         if let filterId = filterId {
-            return chatListFilterItems(postbox: postbox)
+            return chatListFilterItems(context: context)
             |> map { filterItems -> ChatListSelectionOptions in
                 for (filter, unreadCount, _) in filterItems.1 {
                     if filter.id == filterId {
@@ -30,7 +31,7 @@ func chatListSelectionOptions(postbox: Postbox, peerIds: Set<PeerId>, filterId:
             |> distinctUntilChanged
         } else {
             let key = PostboxViewKey.unreadCounts(items: [.total(nil)])
-            return postbox.combinedView(keys: [key])
+            return context.account.postbox.combinedView(keys: [key])
             |> map { view -> ChatListSelectionOptions in
                 var hasUnread = false
                 if let unreadCounts = view.views[key] as? UnreadMessageCountsView, let total = unreadCounts.total() {
@@ -48,7 +49,7 @@ func chatListSelectionOptions(postbox: Postbox, peerIds: Set<PeerId>, filterId:
     } else {
         let items: [UnreadMessageCountsItem] = peerIds.map(UnreadMessageCountsItem.peer)
         let key = PostboxViewKey.unreadCounts(items: items)
-        return postbox.combinedView(keys: [key])
+        return context.account.postbox.combinedView(keys: [key])
         |> map { view -> ChatListSelectionOptions in
             var hasUnread = false
             if let unreadCounts = view.views[key] as? UnreadMessageCountsView {
diff --git a/submodules/ChatListUI/Sources/ChatListTitleView.swift b/submodules/ChatListUI/Sources/ChatListTitleView.swift
index b2fac18119..4de4c02f1d 100644
--- a/submodules/ChatListUI/Sources/ChatListTitleView.swift
+++ b/submodules/ChatListUI/Sources/ChatListTitleView.swift
@@ -5,6 +5,8 @@ import Display
 import TelegramPresentationData
 import ActivityIndicator
 
+private let titleFont = Font.with(size: 17.0, design: .regular, weight: .semibold, traits: [.monospacedNumbers])
+
 struct NetworkStatusTitle: Equatable {
     let text: String
     let activity: Bool
@@ -17,6 +19,7 @@ struct NetworkStatusTitle: Equatable {
 final class ChatListTitleView: UIView, NavigationBarTitleView, NavigationBarTitleTransitionNode {
     private let titleNode: ImmediateTextNode
     private let lockView: ChatListTitleLockView
+    private weak var lockSnapshotView: UIView?
     private let activityIndicator: ActivityIndicator
     private let buttonView: HighlightTrackingButton
     private let proxyNode: ChatTitleProxyNode
@@ -24,30 +27,71 @@ final class ChatListTitleView: UIView, NavigationBarTitleView, NavigationBarTitl
     
     private var validLayout: (CGSize, CGRect)?
     
-    var title: NetworkStatusTitle = NetworkStatusTitle(text: "", activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false) {
-        didSet {
-            if self.title != oldValue {
-                self.titleNode.attributedText = NSAttributedString(string: self.title.text, font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
-                self.buttonView.accessibilityLabel = self.title.text
-                self.activityIndicator.isHidden = !self.title.activity
-                if self.title.connectsViaProxy {
-                    self.proxyNode.status = self.title.activity ? .connecting : .connected
-                } else {
-                    self.proxyNode.status = .available
-                }
-                self.proxyNode.isHidden = !self.title.hasProxy
-                self.proxyButton.isHidden = !self.title.hasProxy
-                
-                self.buttonView.isHidden = !self.title.isPasscodeSet
-                if self.title.isPasscodeSet && !self.title.activity {
-                    self.lockView.isHidden = false
-                } else {
-                    self.lockView.isHidden = true
-                }
-                self.lockView.updateTheme(self.theme)
-                
-                self.setNeedsLayout()
+    private var _title: NetworkStatusTitle = NetworkStatusTitle(text: "", activity: false, hasProxy: false, connectsViaProxy: false, isPasscodeSet: false, isManuallyLocked: false)
+    var title: NetworkStatusTitle {
+        get {
+            return self._title
+        }
+        set {
+            self.setTitle(newValue, animated: false)
+        }
+    }
+    
+    func setTitle(_ title: NetworkStatusTitle, animated: Bool) {
+        let oldValue = self._title
+        self._title = title
+        
+        if self._title != oldValue {
+            self.titleNode.attributedText = NSAttributedString(string: self.title.text, font: titleFont, textColor: self.theme.rootController.navigationBar.primaryTextColor)
+            self.buttonView.accessibilityLabel = self.title.text
+            self.activityIndicator.isHidden = !self.title.activity
+           
+            self.proxyButton.isHidden = !self.title.hasProxy
+            if self.title.connectsViaProxy {
+                self.proxyNode.status = self.title.activity ? .connecting : .connected
+            } else {
+                self.proxyNode.status = .available
             }
+            
+            let proxyIsHidden = !self.title.hasProxy
+            let previousProxyIsHidden = self.proxyNode.isHidden
+            if proxyIsHidden != previousProxyIsHidden {
+                if proxyIsHidden {
+                    if let snapshotView = self.proxyNode.view.snapshotContentTree() {
+                        snapshotView.frame = self.proxyNode.frame
+                        self.proxyNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.proxyNode.view)
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                    }
+                } else {
+                    self.proxyNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+                }
+            }
+            self.proxyNode.isHidden = !self.title.hasProxy
+            
+            self.buttonView.isHidden = !self.title.isPasscodeSet
+            if self.title.isPasscodeSet && !self.title.activity {
+                if self.lockView.isHidden && animated {
+                    self.lockView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+                }
+                self.lockView.isHidden = false
+            } else {
+                if !self.lockView.isHidden && animated {
+                    if let snapshotView = self.lockView.snapshotContentTree() {
+                        self.lockSnapshotView = snapshotView
+                        snapshotView.frame = self.lockView.frame
+                        self.lockView.superview?.insertSubview(snapshotView, aboveSubview: self.lockView)
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                    }
+                }
+                self.lockView.isHidden = true
+            }
+            self.lockView.updateTheme(self.theme)
+            
+            self.setNeedsLayout()
         }
     }
     
@@ -59,7 +103,7 @@ final class ChatListTitleView: UIView, NavigationBarTitleView, NavigationBarTitl
     
     var theme: PresentationTheme {
         didSet {
-            self.titleNode.attributedText = NSAttributedString(string: self.title.text, font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
+            self.titleNode.attributedText = NSAttributedString(string: self.title.text, font: titleFont, textColor: self.theme.rootController.navigationBar.primaryTextColor)
             
             self.lockView.updateTheme(self.theme)
             
@@ -178,11 +222,9 @@ final class ChatListTitleView: UIView, NavigationBarTitleView, NavigationBarTitl
             indicatorPadding = indicatorSize.width + 6.0
         }
         var maxTitleWidth = clearBounds.size.width - indicatorPadding
-        var alignedTitleWidth = size.width - indicatorPadding
         var proxyPadding: CGFloat = 0.0
         if !self.proxyNode.isHidden {
             maxTitleWidth -= 25.0
-            alignedTitleWidth -= 20.0
             proxyPadding += 39.0
         }
         if !self.lockView.isHidden {
@@ -197,18 +239,24 @@ final class ChatListTitleView: UIView, NavigationBarTitleView, NavigationBarTitl
         titleContentRect.origin.x = min(titleContentRect.origin.x, clearBounds.maxX - proxyPadding - titleContentRect.width)
         
         let titleFrame = titleContentRect
-        self.titleNode.frame = titleFrame
+        transition.updateFrame(node: self.titleNode, frame: titleFrame)
         
-        let proxyFrame = CGRect(origin: CGPoint(x: clearBounds.maxX - 9.0 - self.proxyNode.bounds.width, y: floor((size.height - proxyNode.bounds.height) / 2.0)), size: proxyNode.bounds.size)
+        let proxyFrame = CGRect(origin: CGPoint(x: clearBounds.maxX - 9.0 - self.proxyNode.bounds.width, y: floor((size.height - self.proxyNode.bounds.height) / 2.0)), size: self.proxyNode.bounds.size)
         self.proxyNode.frame = proxyFrame
+        
         self.proxyButton.frame = proxyFrame.insetBy(dx: -2.0, dy: -2.0)
         
         let buttonX = max(0.0, titleFrame.minX - 10.0)
         self.buttonView.frame = CGRect(origin: CGPoint(x: buttonX, y: 0.0), size: CGSize(width: min(titleFrame.maxX + 28.0, size.width) - buttonX, height: size.height))
         
-        self.lockView.frame = CGRect(x: titleFrame.maxX + 6.0, y: titleFrame.minY + 2.0, width: 2.0, height: 2.0)
+        let lockFrame = CGRect(x: titleFrame.maxX + 6.0, y: titleFrame.minY + 2.0, width: 2.0, height: 2.0)
+        transition.updateFrame(view: self.lockView, frame: lockFrame)
+        if let lockSnapshotView = self.lockSnapshotView {
+            transition.updateFrame(view: lockSnapshotView, frame: lockFrame)
+        }
         
-        self.activityIndicator.frame = CGRect(origin: CGPoint(x: titleFrame.minX - indicatorSize.width - 4.0, y: titleFrame.minY - 1.0), size: indicatorSize)
+        let activityIndicatorFrame = CGRect(origin: CGPoint(x: titleFrame.minX - indicatorSize.width - 4.0, y: titleFrame.minY - 1.0), size: indicatorSize)
+        transition.updateFrame(node: self.activityIndicator, frame: activityIndicatorFrame)
     }
     
     @objc private func buttonPressed() {
diff --git a/submodules/ChatListUI/Sources/Node/ChatListItem.swift b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
index 9f429feaec..c4f36a0073 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItem.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItem.swift
@@ -196,7 +196,7 @@ private enum RevealOptionKey: Int32 {
 }
 
 private func canArchivePeer(id: PeerId, accountPeerId: PeerId) -> Bool {
-    if id.namespace == Namespaces.Peer.CloudUser && id.id == 777000 {
+    if id.namespace == Namespaces.Peer.CloudUser && id.id._internalGetInt32Value() == 777000 {
         return false
     }
     if id == accountPeerId {
@@ -518,7 +518,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                         } else {
                             result += item.presentationData.strings.VoiceOver_ChatList_OutgoingMessage
                         }
-                        let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false)
+                        let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false)
                         if message.flags.contains(.Incoming), !initialHideAuthor, let author = message.author, author is TelegramUser {
                             result += "\n\(item.presentationData.strings.VoiceOver_ChatList_MessageFrom(author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)).0)"
                         }
@@ -552,7 +552,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                         } else {
                             result += item.presentationData.strings.VoiceOver_ChatList_OutgoingMessage
                         }
-                        let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false)
+                        let (_, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: peer, accountPeerId: item.context.account.peerId, isPeerGroup: false)
                         if message.flags.contains(.Incoming), !initialHideAuthor, let author = message.author, author is TelegramUser {
                             result += "\n\(item.presentationData.strings.VoiceOver_ChatList_MessageFrom(author.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)).0)"
                         }
@@ -696,7 +696,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
             self.avatarNode.setPeer(context: item.context, theme: item.presentationData.theme, peer: peer, overrideImage: overrideImage, emptyColor: item.presentationData.theme.list.mediaPlaceholderColor, synchronousLoad: synchronousLoads, displayDimensions: CGSize(width: 60.0, height: 60.0))
         }
         
-        self.contextContainer.isGestureEnabled = enablePreview
+        self.contextContainer.isGestureEnabled = enablePreview && !item.editing
     }
     
     override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
@@ -773,9 +773,9 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
         guard let item = self.item, item.editing else {
             return
         }
-        if case let .peer(_, _, _, _, _, _, _, _, promoInfo, _, _, _) = item.content {
-            if promoInfo == nil {
-                item.interaction.togglePeerSelected(item.index.messageIndex.id.peerId)
+        if case let .peer(_, peer, _, _, _, _, _, _, promoInfo, _, _, _) = item.content {
+            if promoInfo == nil, let mainPeer = peer.chatMainPeer {
+                item.interaction.togglePeerSelected(mainPeer)
             }
         }
     }
@@ -801,7 +801,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
             let titleFont = Font.medium(floor(item.presentationData.fontSize.itemListBaseFontSize * 16.0 / 17.0))
             let textFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 15.0 / 17.0))
             let dateFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 14.0 / 17.0))
-            let badgeFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 14.0 / 17.0))
+            let badgeFont = Font.with(size: floor(item.presentationData.fontSize.itemListBaseFontSize * 14.0 / 17.0), design: .regular, weight: .regular, traits: [.monospacedNumbers])
             
             let account = item.context.account
             var messages: [Message]
@@ -958,7 +958,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
             var hideAuthor = false
             switch contentPeer {
                 case let .chat(itemPeer):
-                    var (peer, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: messages, chatPeer: itemPeer, accountPeerId: item.context.account.peerId, enableMediaEmoji: !enableChatListPhotos, isPeerGroup: isPeerGroup)
+                    var (peer, initialHideAuthor, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: messages, chatPeer: itemPeer, accountPeerId: item.context.account.peerId, enableMediaEmoji: !enableChatListPhotos, isPeerGroup: isPeerGroup)
                     
                     if case let .psa(_, maybePsaText) = promoInfo, let psaText = maybePsaText {
                         initialHideAuthor = true
@@ -1509,7 +1509,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                     strongSelf.onlineIsVoiceChat = onlineIsVoiceChat
                     
                     strongSelf.contextContainer.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
-                    
+                   
                     if case .groupReference = item.content {
                         strongSelf.layer.sublayerTransform = CATransform3DMakeTranslation(0.0, layout.contentSize.height - itemHeight, 0.0)
                     }
@@ -1853,7 +1853,7 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: layoutOffset - separatorHeight - topNegativeInset), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height + separatorHeight + topNegativeInset))
                     
                     if let peerPresence = peerPresence as? TelegramUserPresence {
-                        strongSelf.peerPresenceManager?.reset(presence: TelegramUserPresence(status: peerPresence.status, lastActivity: 0))
+                        strongSelf.peerPresenceManager?.reset(presence: TelegramUserPresence(status: peerPresence.status, lastActivity: 0), isOnline: online)
                     }
                     
                     strongSelf.updateLayout(size: layout.contentSize, leftInset: params.leftInset, rightInset: params.rightInset)
@@ -1893,9 +1893,9 @@ class ChatListItemNode: ItemListRevealOptionsItemNode {
         }
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.layoutParams?.0 {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift
index f30ee72089..c7e3c3b503 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListItemStrings.swift
@@ -46,7 +46,7 @@ private func messageGroupType(messages: [Message]) -> MessageGroupType {
     return currentType
 }
 
-public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], chatPeer: RenderedPeer, accountPeerId: PeerId, enableMediaEmoji: Bool = true, isPeerGroup: Bool = false) -> (peer: Peer?, hideAuthor: Bool, messageText: String) {
+public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, messages: [Message], chatPeer: RenderedPeer, accountPeerId: PeerId, enableMediaEmoji: Bool = true, isPeerGroup: Bool = false) -> (peer: Peer?, hideAuthor: Bool, messageText: String) {
     let peer: Peer?
     
     let message = messages.last
@@ -262,12 +262,12 @@ public func chatListItemStrings(strings: PresentationStrings, nameDisplayOrder:
                                 }
                             default:
                                 hideAuthor = true
-                                if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: true) {
+                                if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: true) {
                                     messageText = text
                                 }
                         }
                     case _ as TelegramMediaExpiredContent:
-                        if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: true) {
+                        if let text = plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: true) {
                             messageText = text
                         }
                     case let poll as TelegramMediaPoll:
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
index f86624bf5b..8f430c32b2 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNode.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -48,10 +48,16 @@ final class ChatListHighlightedLocation {
 }
 
 public final class ChatListNodeInteraction {
+    public enum PeerEntry {
+        case peerId(PeerId)
+        case peer(Peer)
+    }
+    
     let activateSearch: () -> Void
     let peerSelected: (Peer, ChatListNodeEntryPromoInfo?) -> Void
     let disabledPeerSelected: (Peer) -> Void
-    let togglePeerSelected: (PeerId) -> Void
+    let togglePeerSelected: (Peer) -> Void
+    let togglePeersSelection: ([PeerEntry], Bool) -> Void
     let additionalCategorySelected: (Int) -> Void
     let messageSelected: (Peer, Message, ChatListNodeEntryPromoInfo?) -> Void
     let groupSelected: (PeerGroupId) -> Void
@@ -70,11 +76,12 @@ public final class ChatListNodeInteraction {
     public var searchTextHighightState: String?
     var highlightedChatLocation: ChatListHighlightedLocation?
     
-    public init(activateSearch: @escaping () -> Void, peerSelected: @escaping (Peer, ChatListNodeEntryPromoInfo?) -> Void, disabledPeerSelected: @escaping (Peer) -> Void, togglePeerSelected: @escaping (PeerId) -> Void, additionalCategorySelected: @escaping (Int) -> Void, messageSelected: @escaping (Peer, Message, ChatListNodeEntryPromoInfo?) -> Void, groupSelected: @escaping (PeerGroupId) -> Void, addContact: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, setItemPinned: @escaping (PinnedItemId, Bool) -> Void, setPeerMuted: @escaping (PeerId, Bool) -> Void, deletePeer: @escaping (PeerId, Bool) -> Void, updatePeerGrouping: @escaping (PeerId, Bool) -> Void, togglePeerMarkedUnread: @escaping (PeerId, Bool) -> Void, toggleArchivedFolderHiddenByDefault: @escaping () -> Void, hidePsa: @escaping (PeerId) -> Void, activateChatPreview: @escaping (ChatListItem, ASDisplayNode, ContextGesture?) -> Void, present: @escaping (ViewController) -> Void) {
+    public init(activateSearch: @escaping () -> Void, peerSelected: @escaping (Peer, ChatListNodeEntryPromoInfo?) -> Void, disabledPeerSelected: @escaping (Peer) -> Void, togglePeerSelected: @escaping (Peer) -> Void, togglePeersSelection: @escaping ([PeerEntry], Bool) -> Void, additionalCategorySelected: @escaping (Int) -> Void, messageSelected: @escaping (Peer, Message, ChatListNodeEntryPromoInfo?) -> Void, groupSelected: @escaping (PeerGroupId) -> Void, addContact: @escaping (String) -> Void, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, setItemPinned: @escaping (PinnedItemId, Bool) -> Void, setPeerMuted: @escaping (PeerId, Bool) -> Void, deletePeer: @escaping (PeerId, Bool) -> Void, updatePeerGrouping: @escaping (PeerId, Bool) -> Void, togglePeerMarkedUnread: @escaping (PeerId, Bool) -> Void, toggleArchivedFolderHiddenByDefault: @escaping () -> Void, hidePsa: @escaping (PeerId) -> Void, activateChatPreview: @escaping (ChatListItem, ASDisplayNode, ContextGesture?) -> Void, present: @escaping (ViewController) -> Void) {
         self.activateSearch = activateSearch
         self.peerSelected = peerSelected
         self.disabledPeerSelected = disabledPeerSelected
         self.togglePeerSelected = togglePeerSelected
+        self.togglePeersSelection = togglePeersSelection
         self.additionalCategorySelected = additionalCategorySelected
         self.messageSelected = messageSelected
         self.groupSelected = groupSelected
@@ -111,13 +118,17 @@ public struct ChatListNodeState: Equatable {
     public var archiveShouldBeTemporaryRevealed: Bool
     public var selectedAdditionalCategoryIds: Set<Int>
     public var hiddenPsaPeerId: PeerId?
+    public var foundPeers: [Peer]
+    public var selectedPeerMap: [PeerId: Peer]
     
-    public init(presentationData: ChatListPresentationData, editing: Bool, peerIdWithRevealedOptions: PeerId?, selectedPeerIds: Set<PeerId>, selectedAdditionalCategoryIds: Set<Int>, peerInputActivities: ChatListNodePeerInputActivities?, pendingRemovalPeerIds: Set<PeerId>, pendingClearHistoryPeerIds: Set<PeerId>, archiveShouldBeTemporaryRevealed: Bool, hiddenPsaPeerId: PeerId?) {
+    public init(presentationData: ChatListPresentationData, editing: Bool, peerIdWithRevealedOptions: PeerId?, selectedPeerIds: Set<PeerId>, foundPeers: [Peer], selectedPeerMap: [PeerId: Peer], selectedAdditionalCategoryIds: Set<Int>, peerInputActivities: ChatListNodePeerInputActivities?, pendingRemovalPeerIds: Set<PeerId>, pendingClearHistoryPeerIds: Set<PeerId>, archiveShouldBeTemporaryRevealed: Bool, hiddenPsaPeerId: PeerId?) {
         self.presentationData = presentationData
         self.editing = editing
         self.peerIdWithRevealedOptions = peerIdWithRevealedOptions
         self.selectedPeerIds = selectedPeerIds
         self.selectedAdditionalCategoryIds = selectedAdditionalCategoryIds
+        self.foundPeers = foundPeers
+        self.selectedPeerMap = selectedPeerMap
         self.peerInputActivities = peerInputActivities
         self.pendingRemovalPeerIds = pendingRemovalPeerIds
         self.pendingClearHistoryPeerIds = pendingClearHistoryPeerIds
@@ -138,6 +149,12 @@ public struct ChatListNodeState: Equatable {
         if lhs.selectedPeerIds != rhs.selectedPeerIds {
             return false
         }
+        if arePeerArraysEqual(lhs.foundPeers, rhs.foundPeers) {
+            return false
+        }
+        if arePeerDictionariesEqual(lhs.selectedPeerMap, rhs.selectedPeerMap) {
+            return false
+        }
         if lhs.selectedAdditionalCategoryIds != rhs.selectedAdditionalCategoryIds {
             return false
         }
@@ -283,7 +300,11 @@ private func mappedInsertEntries(context: AccountContext, nodeInteraction: ChatL
 
                         return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: status, enabled: enabled, selection: editing ? .selectable(selected: selected) : .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
                             if let chatPeer = chatPeer {
-                                nodeInteraction.peerSelected(chatPeer, nil)
+                                if editing {
+                                    nodeInteraction.togglePeerSelected(chatPeer)
+                                } else {
+                                    nodeInteraction.peerSelected(chatPeer, nil)
+                                }
                             }
                         }, disabledAction: { _ in
                             if let chatPeer = chatPeer {
@@ -360,7 +381,11 @@ private func mappedUpdateEntries(context: AccountContext, nodeInteraction: ChatL
                         
                         return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ContactsPeerItem(presentationData: ItemListPresentationData(theme: presentationData.theme, fontSize: presentationData.fontSize, strings: presentationData.strings), sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, context: context, peerMode: .generalSearch, peer: .peer(peer: itemPeer, chatPeer: chatPeer), status: status, enabled: enabled, selection: editing ? .selectable(selected: selected) : .none, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: header, action: { _ in
                             if let chatPeer = chatPeer {
-                                nodeInteraction.peerSelected(chatPeer, nil)
+                                if editing {
+                                    nodeInteraction.togglePeerSelected(chatPeer)
+                                } else {
+                                    nodeInteraction.peerSelected(chatPeer, nil)
+                                }
                             }
                         }, disabledAction: { _ in
                             if let chatPeer = chatPeer {
@@ -545,6 +570,9 @@ public final class ChatListNode: ListView {
     let preloadItems = Promise<[ChatHistoryPreloadItem]>([])
     
     var didBeginSelectingChats: (() -> Void)?
+    public var selectionCountChanged: ((Int) -> Void)?
+    
+    var isSelectionGestureEnabled = true
     
     public init(context: AccountContext, groupId: PeerGroupId, chatListFilter: ChatListFilter? = nil, previewing: Bool, fillPreloadItems: Bool, mode: ChatListNodeMode, theme: PresentationTheme, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool) {
         self.context = context
@@ -559,7 +587,7 @@ public final class ChatListNode: ListView {
             isSelecting = true
         }
         
-        self.currentState = ChatListNodeState(presentationData: ChatListPresentationData(theme: theme, fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, disableAnimations: disableAnimations), editing: isSelecting, peerIdWithRevealedOptions: nil, selectedPeerIds: Set(), selectedAdditionalCategoryIds: Set(), peerInputActivities: nil, pendingRemovalPeerIds: Set(), pendingClearHistoryPeerIds: Set(), archiveShouldBeTemporaryRevealed: false, hiddenPsaPeerId: nil)
+        self.currentState = ChatListNodeState(presentationData: ChatListPresentationData(theme: theme, fontSize: fontSize, strings: strings, dateTimeFormat: dateTimeFormat, nameSortOrder: nameSortOrder, nameDisplayOrder: nameDisplayOrder, disableAnimations: disableAnimations), editing: isSelecting, peerIdWithRevealedOptions: nil, selectedPeerIds: Set(), foundPeers: [], selectedPeerMap: [:], selectedAdditionalCategoryIds: Set(), peerInputActivities: nil, pendingRemovalPeerIds: Set(), pendingClearHistoryPeerIds: Set(), archiveShouldBeTemporaryRevealed: false, hiddenPsaPeerId: nil)
         self.statePromise = ValuePromise(self.currentState, ignoreRepeated: true)
         
         self.theme = theme
@@ -583,23 +611,55 @@ public final class ChatListNode: ListView {
             if let strongSelf = self, let disabledPeerSelected = strongSelf.disabledPeerSelected {
                 disabledPeerSelected(peer)
             }
-        }, togglePeerSelected: { [weak self] peerId in
+        }, togglePeerSelected: { [weak self] peer in
             var didBeginSelecting = false
+            var count = 0
             self?.updateState { state in
                 var state = state
-                if state.selectedPeerIds.contains(peerId) {
-                    state.selectedPeerIds.remove(peerId)
+                if state.selectedPeerIds.contains(peer.id) {
+                    state.selectedPeerIds.remove(peer.id)
                 } else {
                     if state.selectedPeerIds.count < 100 {
                         if state.selectedPeerIds.isEmpty {
                             didBeginSelecting = true
                         }
-                        state.selectedPeerIds.insert(peerId)
+                        state.selectedPeerIds.insert(peer.id)
+                        state.selectedPeerMap[peer.id] = peer
+                    }
+                }
+                count = state.selectedPeerIds.count
+                return state
+            }
+            self?.selectionCountChanged?(count)
+            if didBeginSelecting {
+                self?.didBeginSelectingChats?()
+            }
+        }, togglePeersSelection: { [weak self] peers, selected in
+            self?.updateState { state in
+                var state = state
+                if selected {
+                    for peerEntry in peers {
+                        switch peerEntry {
+                            case let .peer(peer):
+                                state.selectedPeerIds.insert(peer.id)
+                                state.selectedPeerMap[peer.id] = peer
+                            case let .peerId(peerId):
+                                state.selectedPeerIds.insert(peerId)
+                        }
+                    }
+                } else {
+                    for peerEntry in peers {
+                        switch peerEntry {
+                            case let .peer(peer):
+                                state.selectedPeerIds.remove(peer.id)
+                            case let .peerId(peerId):
+                                state.selectedPeerIds.remove(peerId)
+                        }
                     }
                 }
                 return state
             }
-            if didBeginSelecting {
+            if selected && !peers.isEmpty {
                 self?.didBeginSelectingChats?()
             }
         }, additionalCategorySelected: { [weak self] id in
@@ -643,7 +703,7 @@ public final class ChatListNode: ListView {
             } else {
                 location = .group(groupId)
             }
-            let _ = (toggleItemPinned(postbox: context.account.postbox, location: location, itemId: itemId)
+            let _ = (context.engine.peers.toggleItemPinned(location: location, itemId: itemId)
             |> deliverOnMainQueue).start(next: { result in
                 if let strongSelf = self {
                     switch result {
@@ -665,7 +725,7 @@ public final class ChatListNode: ListView {
                 return
             }
             strongSelf.setCurrentRemovingPeerId(peerId)
-            let _ = (togglePeerMuted(account: context.account, peerId: peerId)
+            let _ = (context.engine.peers.togglePeerMuted(peerId: peerId)
             |> deliverOnMainQueue).start(completed: {
                 self?.updateState { state in
                     var state = state
@@ -772,7 +832,7 @@ public final class ChatListNode: ListView {
             
             let previousHideArchivedFolderByDefaultValue = previousHideArchivedFolderByDefault.swap(hideArchivedFolderByDefault)
             
-            let (rawEntries, isLoading) = chatListNodeEntriesForView(update.view, state: state, savedMessagesPeer: savedMessagesPeer, hideArchivedFolderByDefault: hideArchivedFolderByDefault, displayArchiveIntro: displayArchiveIntro, mode: mode)
+            let (rawEntries, isLoading) = chatListNodeEntriesForView(update.view, state: state, savedMessagesPeer: savedMessagesPeer, foundPeers: state.foundPeers, hideArchivedFolderByDefault: hideArchivedFolderByDefault, displayArchiveIntro: displayArchiveIntro, mode: mode)
             let entries = rawEntries.filter { entry in
                 switch entry {
                 case let .PeerEntry(_, _, _, _, _, _, peer, _, _, _, _, _, _, _, _, _):
@@ -875,7 +935,7 @@ public final class ChatListNode: ListView {
             
             let removingPeerId = currentRemovingPeerId.with { $0 }
             
-            var disableAnimations = state.presentationData.disableAnimations
+            var disableAnimations = true
             if previousState.editing != state.editing {
                 disableAnimations = false
             } else {
@@ -1144,16 +1204,18 @@ public final class ChatListNode: ListView {
                     }
                     
                     if case let .index(index) = fromEntry.sortIndex, let _ = index.pinningIndex {
-                        return strongSelf.context.account.postbox.transaction { transaction -> Bool in
-                            let location: TogglePeerChatPinnedLocation
-                            if let chatListFilter = chatListFilter {
-                                location = .filter(chatListFilter.id)
-                            } else {
-                                location = .group(groupId)
-                            }
-                            
-                            var itemIds = getPinnedItemIds(transaction: transaction, location: location)
-                            
+                        let location: TogglePeerChatPinnedLocation
+                        if let chatListFilter = chatListFilter {
+                            location = .filter(chatListFilter.id)
+                        } else {
+                            location = .group(groupId)
+                        }
+
+                        let engine = strongSelf.context.engine
+                        return engine.peers.getPinnedItemIds(location: location)
+                        |> mapToSignal { itemIds -> Signal<Bool, NoError> in
+                            var itemIds = itemIds
+
                             var itemId: PinnedItemId?
                             switch fromEntry {
                             case let .PeerEntry(index, _, _, _, _, _, _, _, _, _, _, _, _, _, _, _):
@@ -1161,7 +1223,7 @@ public final class ChatListNode: ListView {
                             default:
                                 break
                             }
-                            
+
                             if let itemId = itemId {
                                 itemIds = itemIds.filter({ $0 != itemId })
                                 if let referenceId = referenceId {
@@ -1185,9 +1247,9 @@ public final class ChatListNode: ListView {
                                 } else {
                                     itemIds.append(itemId)
                                 }
-                                return reorderPinnedItemIds(transaction: transaction, location: location, itemIds: itemIds)
+                                return engine.peers.reorderPinnedItemIds(location: location, itemIds: itemIds)
                             } else {
-                                return false
+                                return .single(false)
                             }
                         }
                     }
@@ -1197,7 +1259,7 @@ public final class ChatListNode: ListView {
         }
         var startedScrollingAtUpperBound = false
         
-        self.beganInteractiveDragging = { [weak self] in
+        self.beganInteractiveDragging = { [weak self] _ in
             guard let strongSelf = self else {
                 return
             }
@@ -1292,6 +1354,15 @@ public final class ChatListNode: ListView {
         }
         
         self.resetFilter()
+        
+        let selectionRecognizer = ChatHistoryListSelectionRecognizer(target: self, action: #selector(self.selectionPanGesture(_:)))
+        selectionRecognizer.shouldBegin = { [weak self] in
+            guard let strongSelf = self else {
+                return false
+            }
+            return strongSelf.isSelectionGestureEnabled
+        }
+        self.view.addGestureRecognizer(selectionRecognizer)
     }
     
     deinit {
@@ -1309,7 +1380,7 @@ public final class ChatListNode: ListView {
     
     private func resetFilter() {
         if let chatListFilter = self.chatListFilter {
-            self.updatedFilterDisposable.set((updatedChatListFilters(postbox: self.context.account.postbox)
+            self.updatedFilterDisposable.set((self.context.engine.peers.updatedChatListFilters()
             |> map { filters -> ChatListFilter? in
                 for filter in filters {
                     if filter.id == chatListFilter.id {
@@ -1332,7 +1403,7 @@ public final class ChatListNode: ListView {
     }
     
     public func updateThemeAndStrings(theme: PresentationTheme, fontSize: PresentationFontSize, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameSortOrder: PresentationPersonNameOrder, nameDisplayOrder: PresentationPersonNameOrder, disableAnimations: Bool) {
-        if theme !== self.currentState.presentationData.theme || strings !== self.currentState.presentationData.strings || dateTimeFormat != self.currentState.presentationData.dateTimeFormat || disableAnimations != self.currentState.presentationData.disableAnimations {
+        if theme !== self.currentState.presentationData.theme || strings !== self.currentState.presentationData.strings || dateTimeFormat != self.currentState.presentationData.dateTimeFormat {
             self.theme = theme
             if self.keepTopItemOverscrollBackground != nil {
                 self.keepTopItemOverscrollBackground = ListViewKeepTopItemOverscrollBackground(color:  theme.chatList.pinnedItemBackgroundColor, direction: true)
@@ -1875,6 +1946,140 @@ public final class ChatListNode: ListView {
         }
         return nil
     }
+    
+    private func peerAtPoint(_ point: CGPoint) -> Peer? {
+        var resultPeer: Peer?
+        self.forEachVisibleItemNode { itemNode in
+            if resultPeer == nil, let itemNode = itemNode as? ListViewItemNode, itemNode.frame.contains(point) {
+                if let itemNode = itemNode as? ChatListItemNode, let item = itemNode.item {
+                    switch item.content {
+                        case let .peer(_, peer, _, _, _, _, _, _, _, _, _, _):
+                            resultPeer = peer.peer
+                        default:
+                            break
+                    }
+                }
+            }
+        }
+        return resultPeer
+    }
+    
+    private var selectionPanState: (selecting: Bool, initialPeerId: PeerId, toggledPeerIds: [[PeerId]])?
+    private var selectionScrollActivationTimer: SwiftSignalKit.Timer?
+    private var selectionScrollDisplayLink: ConstantDisplayLinkAnimator?
+    private var selectionScrollDelta: CGFloat?
+    private var selectionLastLocation: CGPoint?
+    
+    @objc private func selectionPanGesture(_ recognizer: UIGestureRecognizer) -> Void {
+        let location = recognizer.location(in: self.view)
+        switch recognizer.state {
+            case .began:
+                if let peer = self.peerAtPoint(location) {
+                    let selecting = !self.currentState.selectedPeerIds.contains(peer.id)
+                    self.selectionPanState = (selecting, peer.id, [])
+                    self.interaction?.togglePeersSelection([.peer(peer)], selecting)
+                }
+            case .changed:
+                self.handlePanSelection(location: location)
+                self.selectionLastLocation = location
+            case .ended, .failed, .cancelled:
+                self.selectionPanState = nil
+                self.selectionScrollDisplayLink = nil
+                self.selectionScrollActivationTimer?.invalidate()
+                self.selectionScrollActivationTimer = nil
+                self.selectionScrollDelta = nil
+                self.selectionLastLocation = nil
+                self.selectionScrollSkipUpdate = false
+            case .possible:
+                break
+            @unknown default:
+                fatalError()
+        }
+    }
+    
+    private func handlePanSelection(location: CGPoint) {
+        if let state = self.selectionPanState {
+            if let peer = self.peerAtPoint(location) {
+                if peer.id == state.initialPeerId {
+                    if !state.toggledPeerIds.isEmpty {
+                        self.interaction?.togglePeersSelection(state.toggledPeerIds.flatMap { $0.compactMap({ .peerId($0) }) }, !state.selecting)
+                        self.selectionPanState = (state.selecting, state.initialPeerId, [])
+                    }
+                } else if state.toggledPeerIds.last?.first != peer.id {
+                    var updatedToggledPeerIds: [[PeerId]] = []
+                    var previouslyToggled = false
+                    for i in (0 ..< state.toggledPeerIds.count) {
+                        if let peerId = state.toggledPeerIds[i].first {
+                            if peerId == peer.id {
+                                previouslyToggled = true
+                                updatedToggledPeerIds = Array(state.toggledPeerIds.prefix(i + 1))
+                                
+                                let peerIdsToToggle = Array(state.toggledPeerIds.suffix(state.toggledPeerIds.count - i - 1)).flatMap { $0 }
+                                self.interaction?.togglePeersSelection(peerIdsToToggle.compactMap { .peerId($0) }, !state.selecting)
+                                break
+                            }
+                        }
+                    }
+                    
+                    if !previouslyToggled {
+                        updatedToggledPeerIds = state.toggledPeerIds
+                        let isSelected = self.currentState.selectedPeerIds.contains(peer.id)
+                        if state.selecting != isSelected {
+                            updatedToggledPeerIds.append([peer.id])
+                            self.interaction?.togglePeersSelection([.peer(peer)], state.selecting)
+                        }
+                    }
+                    
+                    self.selectionPanState = (state.selecting, state.initialPeerId, updatedToggledPeerIds)
+                }
+            }
+        
+            let scrollingAreaHeight: CGFloat = 50.0
+            if location.y < scrollingAreaHeight + self.insets.top || location.y > self.frame.height - scrollingAreaHeight - self.insets.bottom {
+                if location.y < self.frame.height / 2.0 {
+                    self.selectionScrollDelta = (scrollingAreaHeight - (location.y - self.insets.top)) / scrollingAreaHeight
+                } else {
+                    self.selectionScrollDelta = -(scrollingAreaHeight - min(scrollingAreaHeight, max(0.0, (self.frame.height - self.insets.bottom - location.y)))) / scrollingAreaHeight
+                }
+                if let displayLink = self.selectionScrollDisplayLink {
+                    displayLink.isPaused = false
+                } else {
+                    if let _ = self.selectionScrollActivationTimer {
+                    } else {
+                        let timer = SwiftSignalKit.Timer(timeout: 0.45, repeat: false, completion: { [weak self] in
+                            self?.setupSelectionScrolling()
+                        }, queue: .mainQueue())
+                        timer.start()
+                        self.selectionScrollActivationTimer = timer
+                    }
+                }
+            } else {
+                self.selectionScrollDisplayLink?.isPaused = true
+                self.selectionScrollActivationTimer?.invalidate()
+                self.selectionScrollActivationTimer = nil
+            }
+        }
+    }
+    
+    private var selectionScrollSkipUpdate = false
+    private func setupSelectionScrolling() {
+        self.selectionScrollDisplayLink = ConstantDisplayLinkAnimator(update: { [weak self] in
+            self?.selectionScrollActivationTimer = nil
+            if let strongSelf = self, let delta = strongSelf.selectionScrollDelta {
+                let distance: CGFloat = 15.0 * min(1.0, 0.15 + abs(delta * delta))
+                let direction: ListViewScrollDirection = delta > 0.0 ? .up : .down
+                let _ = strongSelf.scrollWithDirection(direction, distance: distance)
+                
+                if let location = strongSelf.selectionLastLocation {
+                    if !strongSelf.selectionScrollSkipUpdate {
+                        strongSelf.handlePanSelection(location: location)
+                    }
+                    strongSelf.selectionScrollSkipUpdate = !strongSelf.selectionScrollSkipUpdate
+                }
+            }
+        })
+        self.selectionScrollDisplayLink?.isPaused = false
+    }
 }
 
 private func statusStringForPeerType(accountPeerId: PeerId, strings: PresentationStrings, peer: Peer, isMuted: Bool, isUnread: Bool, isContact: Bool, hasUnseenMentions: Bool, chatListFilters: [ChatListFilter]?) -> (String, Bool)? {
@@ -1928,3 +2133,65 @@ private func statusStringForPeerType(accountPeerId: PeerId, strings: Presentatio
     }
     return (strings.ChatList_PeerTypeNonContact, false)
 }
+
+public class ChatHistoryListSelectionRecognizer: UIPanGestureRecognizer {
+    private let selectionGestureActivationThreshold: CGFloat = 5.0
+    
+    var recognized: Bool? = nil
+    var initialLocation: CGPoint = CGPoint()
+    
+    public var shouldBegin: (() -> Bool)?
+    
+    public override init(target: Any?, action: Selector?) {
+        super.init(target: target, action: action)
+        
+        self.minimumNumberOfTouches = 2
+        self.maximumNumberOfTouches = 2
+    }
+    
+    public override func reset() {
+        super.reset()
+        
+        self.recognized = nil
+    }
+    
+    public override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesBegan(touches, with: event)
+        
+        if let shouldBegin = self.shouldBegin, !shouldBegin() {
+            self.state = .failed
+        } else {
+            let touch = touches.first!
+            self.initialLocation = touch.location(in: self.view)
+        }
+    }
+    
+    public override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
+        let location = touches.first!.location(in: self.view)
+        let translation = location.offsetBy(dx: -self.initialLocation.x, dy: -self.initialLocation.y)
+        
+        let touchesArray = Array(touches)
+        if self.recognized == nil, touchesArray.count == 2 {
+            if let firstTouch = touchesArray.first, let secondTouch = touchesArray.last {
+                let firstLocation = firstTouch.location(in: self.view)
+                let secondLocation = secondTouch.location(in: self.view)
+                
+                func distance(_ v1: CGPoint, _ v2: CGPoint) -> CGFloat {
+                    let dx = v1.x - v2.x
+                    let dy = v1.y - v2.y
+                    return sqrt(dx * dx + dy * dy)
+                }
+                if distance(firstLocation, secondLocation) > 200.0 {
+                    self.state = .failed
+                }
+            }
+            if self.state != .failed && (abs(translation.y) >= selectionGestureActivationThreshold) {
+                self.recognized = true
+            }
+        }
+        
+        if let recognized = self.recognized, recognized {
+            super.touchesMoved(touches, with: event)
+        }
+    }
+}
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
index 7004665711..96eb178e95 100644
--- a/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
+++ b/submodules/ChatListUI/Sources/Node/ChatListNodeEntries.swift
@@ -282,7 +282,7 @@ private func offsetPinnedIndex(_ index: ChatListIndex, offset: UInt16) -> ChatLi
     }
 }
 
-func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, savedMessagesPeer: Peer?, hideArchivedFolderByDefault: Bool, displayArchiveIntro: Bool, mode: ChatListNodeMode) -> (entries: [ChatListNodeEntry], loading: Bool) {
+func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState, savedMessagesPeer: Peer?, foundPeers: [Peer], hideArchivedFolderByDefault: Bool, displayArchiveIntro: Bool, mode: ChatListNodeMode) -> (entries: [ChatListNodeEntry], loading: Bool) {
     var result: [ChatListNodeEntry] = []
     
     var pinnedIndexOffset: UInt16 = 0
@@ -299,6 +299,11 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
         return item.info.peerId != state.hiddenPsaPeerId
     }
     
+    var foundPeerIds = Set<PeerId>()
+    for peer in foundPeers {
+        foundPeerIds.insert(peer.id)
+    }
+    
     if view.laterIndex == nil && savedMessagesPeer == nil {
         pinnedIndexOffset += UInt16(filteredAdditionalItemEntries.count)
     }
@@ -306,7 +311,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
     loop: for entry in view.entries {
         switch entry {
             case let .MessageEntry(index, messages, combinedReadState, isRemovedFromTotalUnreadCount, embeddedState, peer, peerPresence, summaryInfo, hasFailed, isContact):
-                if let savedMessagesPeer = savedMessagesPeer, savedMessagesPeer.id == index.messageIndex.id.peerId {
+                if let savedMessagesPeer = savedMessagesPeer, savedMessagesPeer.id == index.messageIndex.id.peerId || foundPeerIds.contains(index.messageIndex.id.peerId) {
                     continue loop
                 }
                 if state.pendingRemovalPeerIds.contains(index.messageIndex.id.peerId) {
@@ -331,6 +336,17 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
         var pinningIndex: UInt16 = UInt16(pinnedIndexOffset == 0 ? 0 : (pinnedIndexOffset - 1))
         
         if let savedMessagesPeer = savedMessagesPeer {
+            if !foundPeers.isEmpty {
+                var foundPinningIndex: UInt16 = UInt16(foundPeers.count)
+                for peer in foundPeers.reversed() {
+                    let messageIndex = MessageIndex(id: MessageId(peerId: peer.id, namespace: 0, id: 0), timestamp: 1)
+                    result.append(.PeerEntry(index: ChatListIndex(pinningIndex: foundPinningIndex, messageIndex: messageIndex), presentationData: state.presentationData, messages: [], readState: nil, isRemovedFromTotalUnreadCount: false, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: peer.id, peers: SimpleDictionary([peer.id: peer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: state.selectedPeerIds.contains(peer.id), inputActivities: nil, promoInfo: nil, hasFailedMessages: false, isContact: false))
+                    if foundPinningIndex != 0 {
+                        foundPinningIndex -= 1
+                    }
+                }
+            }
+            
             result.append(.PeerEntry(index: ChatListIndex.absoluteUpperBound.predecessor, presentationData: state.presentationData, messages: [], readState: nil, isRemovedFromTotalUnreadCount: false, embeddedInterfaceState: nil, peer: RenderedPeer(peerId: savedMessagesPeer.id, peers: SimpleDictionary([savedMessagesPeer.id: savedMessagesPeer])), presence: nil, summaryInfo: ChatListMessageTagSummaryInfo(), editing: state.editing, hasActiveRevealControls: false, selected: false, inputActivities: nil, promoInfo: nil, hasFailedMessages: false, isContact: false))
         } else {
             if !filteredAdditionalItemEntries.isEmpty {
@@ -360,7 +376,7 @@ func chatListNodeEntriesForView(_ view: ChatListView, state: ChatListNodeState,
         
         if view.laterIndex == nil, case .chatList = mode {
             for groupReference in view.groupEntries {
-                let messageIndex = MessageIndex(id: MessageId(peerId: PeerId(namespace: 0, id: 0), namespace: 0, id: 0), timestamp: 1)
+                let messageIndex = MessageIndex(id: MessageId(peerId: PeerId(0), namespace: 0, id: 0), timestamp: 1)
                 result.append(.GroupReferenceEntry(index: ChatListIndex(pinningIndex: pinningIndex, messageIndex: messageIndex), presentationData: state.presentationData, groupId: groupReference.groupId, peers: groupReference.renderedPeers, message: groupReference.message, editing: state.editing, unreadState: groupReference.unreadState, revealed: state.archiveShouldBeTemporaryRevealed, hiddenByDefault: hideArchivedFolderByDefault))
                 if pinningIndex != 0 {
                     pinningIndex -= 1
diff --git a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
index ab390011a9..e930adb883 100644
--- a/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
+++ b/submodules/ChatListUI/Sources/TabBarChatListFilterController.swift
@@ -10,8 +10,8 @@ import Postbox
 import TelegramUIPreferences
 import TelegramCore
 
-func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int, Bool)]), NoError> {
-    return updatedChatListFilters(postbox: postbox)
+func chatListFilterItems(context: AccountContext) -> Signal<(Int, [(ChatListFilter, Int, Bool)]), NoError> {
+    return context.engine.peers.updatedChatListFilters()
     |> distinctUntilChanged
     |> mapToSignal { filters -> Signal<(Int, [(ChatListFilter, Int, Bool)]), NoError> in
         var unreadCountItems: [UnreadMessageCountsItem] = []
@@ -40,8 +40,8 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
             keys.append(.basicPeer(peerId))
         }
         
-        return combineLatest(queue: postbox.queue,
-            postbox.combinedView(keys: keys),
+        return combineLatest(queue: context.account.postbox.queue,
+            context.account.postbox.combinedView(keys: keys),
             Signal<Bool, NoError>.single(true)
         )
         |> map { view, _ -> (Int, [(ChatListFilter, Int, Bool)]) in
@@ -63,7 +63,7 @@ func chatListFilterItems(postbox: Postbox) -> Signal<(Int, [(ChatListFilter, Int
                 case let .peer(peerId, state):
                     if let state = state, state.isUnread {
                         if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer {
-                            let tag = postbox.seedConfiguration.peerSummaryCounterTags(peer, peerView.isContact)
+                            let tag = context.account.postbox.seedConfiguration.peerSummaryCounterTags(peer, peerView.isContact)
                             
                             var peerCount = Int(state.count)
                             if state.isUnread {
diff --git a/submodules/ChatMessageInteractiveMediaBadge/Sources/ChatMessageInteractiveMediaBadge.swift b/submodules/ChatMessageInteractiveMediaBadge/Sources/ChatMessageInteractiveMediaBadge.swift
index eb0d2b272e..417499b57e 100644
--- a/submodules/ChatMessageInteractiveMediaBadge/Sources/ChatMessageInteractiveMediaBadge.swift
+++ b/submodules/ChatMessageInteractiveMediaBadge/Sources/ChatMessageInteractiveMediaBadge.swift
@@ -7,8 +7,8 @@ import TextFormat
 import RadialStatusNode
 import AppBundle
 
-private let font = Font.regular(11.0)
-private let boldFont = Font.semibold(11.0)
+private let font = Font.with(size: 11.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
+private let boldFont = Font.with(size: 11.0, design: .regular, weight: .semibold, traits: [.monospacedNumbers])
 
 public enum ChatMessageInteractiveMediaDownloadState: Equatable {
     case remote
@@ -188,7 +188,7 @@ public final class ChatMessageInteractiveMediaBadge: ASDisplayNode {
                             transition.updateAlpha(node: statusNode, alpha: active ? 1.0 : 0.0)
                         }
                         
-                        let durationFrame = CGRect(x: active ? 42.0 : 7.0, y: active ? 6.0 : 3.0, width: durationSize.width, height: durationSize.height)
+                        let durationFrame = CGRect(x: active ? 42.0 : 7.0, y: active ? 6.0 : 2.0 + UIScreenPixel, width: durationSize.width, height: durationSize.height)
                         self.durationNode.bounds = CGRect(origin: CGPoint(), size: durationFrame.size)
                         textTransition.updatePosition(node: self.durationNode, position: durationFrame.center)
                         
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatPlayingActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatPlayingActivityContentNode.swift
index d2d707ed8e..4dea30d2bf 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatPlayingActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatPlayingActivityContentNode.swift
@@ -100,7 +100,7 @@ class ChatPlayingActivityContentNode: ChatTitleActivityContentNode {
         self.addSubnode(self.indicatorNode)
     }
     
-    override func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    override func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let size = self.textNode.updateLayout(constrainedSize)
         let indicatorSize = CGSize(width: 24.0, height: 16.0)
         let originX: CGFloat
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatRecordingVideoActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatRecordingVideoActivityContentNode.swift
index 6fc499972a..1ff4e9a4c9 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatRecordingVideoActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatRecordingVideoActivityContentNode.swift
@@ -72,7 +72,7 @@ class ChatRecordingVideoActivityContentNode: ChatTitleActivityContentNode {
         self.addSubnode(self.indicatorNode)
     }
     
-    override func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    override func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let size = self.textNode.updateLayout(constrainedSize)
         let indicatorSize = CGSize(width: 24.0, height: 16.0)
         let originX: CGFloat
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatRecordingVoiceActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatRecordingVoiceActivityContentNode.swift
index 768d827f63..a5d1d03a12 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatRecordingVoiceActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatRecordingVoiceActivityContentNode.swift
@@ -90,7 +90,7 @@ class ChatRecordingVoiceActivityContentNode: ChatTitleActivityContentNode {
         self.addSubnode(self.indicatorNode)
     }
     
-    override func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    override func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let size = self.textNode.updateLayout(constrainedSize)
         let indicatorSize = CGSize(width: 24.0, height: 16.0)
         let originX: CGFloat
@@ -99,7 +99,7 @@ class ChatRecordingVoiceActivityContentNode: ChatTitleActivityContentNode {
         } else {
             originX = indicatorSize.width
         }
-        self.textNode.frame = CGRect(origin: CGPoint(x: originX, y: 0.0), size: size)
+        self.textNode.frame = CGRect(origin: CGPoint(x: originX, y: offset), size: size)
         self.indicatorNode.frame = CGRect(origin: CGPoint(x: self.textNode.frame.minX - indicatorSize.width, y: 0.0), size: indicatorSize)
         return CGSize(width: size.width + indicatorSize.width, height: size.height)
     }
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift
index 3578b12212..7bef4a850c 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityContentNode.swift
@@ -122,13 +122,13 @@ public class ChatTitleActivityContentNode: ASDisplayNode {
         }
     }
     
-    public func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    public func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let size = self.textNode.updateLayout(constrainedSize)
         self.textNode.bounds = CGRect(origin: CGPoint(), size: size)
         if case .center = alignment {
-            self.textNode.position = CGPoint(x: 0.0, y: size.height / 2.0)
+            self.textNode.position = CGPoint(x: 0.0, y: size.height / 2.0 + offset)
         } else {
-            self.textNode.position = CGPoint(x: size.width / 2.0, y: size.height / 2.0)
+            self.textNode.position = CGPoint(x: size.width / 2.0, y: size.height / 2.0 + offset)
         }
         return size
     }
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift
index 2ccf9a29f5..d07bd226a4 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatTitleActivityNode.swift
@@ -123,7 +123,7 @@ public class ChatTitleActivityNode: ASDisplayNode {
         }
     }
     
-    public func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
-        return CGSize(width: 0.0, height: self.contentNode?.updateLayout(constrainedSize, alignment: alignment).height ?? 0.0)
+    public func updateLayout(_ constrainedSize: CGSize, offset: CGFloat = 0.0, alignment: NSTextAlignment) -> CGSize {
+        return CGSize(width: 0.0, height: self.contentNode?.updateLayout(constrainedSize, offset: offset, alignment: alignment).height ?? 0.0)
     }
 }
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatTypingActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatTypingActivityContentNode.swift
index 40ce563d6e..0581cf999c 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatTypingActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatTypingActivityContentNode.swift
@@ -108,7 +108,7 @@ class ChatTypingActivityContentNode: ChatTitleActivityContentNode {
         self.addSubnode(self.indicatorNode)
     }
     
-    override func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    override func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let indicatorSize = CGSize(width: 24.0, height: 16.0)
         let size = self.textNode.updateLayout(CGSize(width: constrainedSize.width - indicatorSize.width, height: constrainedSize.height))
         var originX: CGFloat
diff --git a/submodules/ChatTitleActivityNode/Sources/ChatUploadingActivityContentNode.swift b/submodules/ChatTitleActivityNode/Sources/ChatUploadingActivityContentNode.swift
index a5cebb8109..829ff60db5 100644
--- a/submodules/ChatTitleActivityNode/Sources/ChatUploadingActivityContentNode.swift
+++ b/submodules/ChatTitleActivityNode/Sources/ChatUploadingActivityContentNode.swift
@@ -80,7 +80,7 @@ class ChatUploadingActivityContentNode: ChatTitleActivityContentNode {
         self.addSubnode(self.indicatorNode)
     }
     
-    override func updateLayout(_ constrainedSize: CGSize, alignment: NSTextAlignment) -> CGSize {
+    override func updateLayout(_ constrainedSize: CGSize, offset: CGFloat, alignment: NSTextAlignment) -> CGSize {
         let size = self.textNode.updateLayout(constrainedSize)
         let indicatorSize = CGSize(width: 24.0, height: 16.0)
         let originX: CGFloat
diff --git a/submodules/ComposePollUI/Sources/CreatePollController.swift b/submodules/ComposePollUI/Sources/CreatePollController.swift
index 1ea4d85aa7..4c93ee41c6 100644
--- a/submodules/ComposePollUI/Sources/CreatePollController.swift
+++ b/submodules/ComposePollUI/Sources/CreatePollController.swift
@@ -825,7 +825,7 @@ public func createPollController(context: AccountContext, peer: Peer, isQuiz: Bo
             
             dismissImpl?()
             
-            completion(.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaPoll(pollId: MediaId(namespace: Namespaces.Media.LocalPoll, id: arc4random64()), publicity: publicity, kind: kind, text: processPollText(state.text), options: options, correctAnswers: correctAnswers, results: TelegramMediaPollResults(voters: nil, totalVoters: nil, recentVoters: [], solution: resolvedSolution), isClosed: false, deadlineTimeout: deadlineTimeout)), replyToMessageId: nil, localGroupingKey: nil))
+            completion(.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaPoll(pollId: MediaId(namespace: Namespaces.Media.LocalPoll, id: Int64.random(in: Int64.min ... Int64.max)), publicity: publicity, kind: kind, text: processPollText(state.text), options: options, correctAnswers: correctAnswers, results: TelegramMediaPollResults(voters: nil, totalVoters: nil, recentVoters: [], solution: resolvedSolution), isClosed: false, deadlineTimeout: deadlineTimeout)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
         })
         
         let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
diff --git a/submodules/ContactListUI/Sources/ContactAddItem.swift b/submodules/ContactListUI/Sources/ContactAddItem.swift
index 7a8699cefc..f3c9093614 100644
--- a/submodules/ContactListUI/Sources/ContactAddItem.swift
+++ b/submodules/ContactListUI/Sources/ContactAddItem.swift
@@ -245,9 +245,9 @@ class ContactsAddItemNode: ListViewItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let (item, _, _, _, _) = self.layoutParams {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ContactListUI/Sources/ContactContextMenus.swift b/submodules/ContactListUI/Sources/ContactContextMenus.swift
index 2a525d8e60..17dbcc8682 100644
--- a/submodules/ContactListUI/Sources/ContactContextMenus.swift
+++ b/submodules/ContactListUI/Sources/ContactContextMenus.swift
@@ -61,7 +61,7 @@ func contactContextMenuItems(context: AccountContext, peerId: PeerId, contactsCo
                             context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(currentPeerId), peekData: nil))
                         }
                     } else {
-                        var createSignal = createSecretChat(account: context.account, peerId: peerId)
+                        var createSignal = context.engine.peers.createSecretChat(peerId: peerId)
                         var cancelImpl: (() -> Void)?
                         let progressSignal = Signal<Never, NoError> { subscriber in
                             let presentationData = context.sharedContext.currentPresentationData.with { $0 }
diff --git a/submodules/ContactListUI/Sources/ContactListActionItem.swift b/submodules/ContactListUI/Sources/ContactListActionItem.swift
index f0e708ef16..f27118bdab 100644
--- a/submodules/ContactListUI/Sources/ContactListActionItem.swift
+++ b/submodules/ContactListUI/Sources/ContactListActionItem.swift
@@ -20,16 +20,18 @@ public class ContactListActionItem: ListViewItem, ListViewItemWithHeader {
     let icon: ContactListActionItemIcon
     let highlight: ContactListActionItemHighlight
     let clearHighlightAutomatically: Bool
+    let accessible: Bool
     let action: () -> Void
     public let header: ListViewItemHeader?
     
-    public init(presentationData: ItemListPresentationData, title: String, icon: ContactListActionItemIcon, highlight: ContactListActionItemHighlight = .cell, clearHighlightAutomatically: Bool = true, header: ListViewItemHeader?, action: @escaping () -> Void) {
+    public init(presentationData: ItemListPresentationData, title: String, icon: ContactListActionItemIcon, highlight: ContactListActionItemHighlight = .cell, clearHighlightAutomatically: Bool = true, accessible: Bool = true, header: ListViewItemHeader?, action: @escaping () -> Void) {
         self.presentationData = presentationData
         self.title = title
         self.icon = icon
         self.highlight = highlight
         self.header = header
         self.clearHighlightAutomatically = clearHighlightAutomatically
+        self.accessible = accessible
         self.action = action
     }
     
@@ -205,6 +207,14 @@ class ContactListActionItemNode: ListViewItemNode {
                         strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: item.presentationData.theme.list.itemAccentColor)
                     }
                     
+                    if item.accessible && strongSelf.activateArea.supernode == nil {
+                        strongSelf.view.accessibilityElementsHidden = false
+                        strongSelf.addSubnode(strongSelf.activateArea)
+                    } else if !item.accessible && strongSelf.activateArea.supernode != nil {
+                        strongSelf.view.accessibilityElementsHidden = true
+                        strongSelf.activateArea.removeFromSupernode()
+                    }
+                    
                     let _ = titleApply()
 
                     var titleOffset = leftInset
@@ -315,9 +325,9 @@ class ContactListActionItemNode: ListViewItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ContactListUI/Sources/ContactListNameIndexHeader.swift b/submodules/ContactListUI/Sources/ContactListNameIndexHeader.swift
index 788c81b52d..7390365843 100644
--- a/submodules/ContactListUI/Sources/ContactListNameIndexHeader.swift
+++ b/submodules/ContactListUI/Sources/ContactListNameIndexHeader.swift
@@ -5,20 +5,21 @@ import TelegramPresentationData
 import ListSectionHeaderNode
 
 final class ContactListNameIndexHeader: Equatable, ListViewItemHeader {
-    let id: Int64
+    let id: ListViewItemNode.HeaderId
     let theme: PresentationTheme
     let letter: unichar
     let stickDirection: ListViewItemHeaderStickDirection = .top
+    public let stickOverInsets: Bool = true
     
     let height: CGFloat = 29.0
     
     init(theme: PresentationTheme, letter: unichar) {
         self.theme = theme
         self.letter = letter
-        self.id = Int64(letter)
+        self.id = ListViewItemNode.HeaderId(space: 0, id: Int64(letter))
     }
     
-    func node() -> ListViewItemHeaderNode {
+    func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
         return ContactListNameIndexHeaderNode(theme: self.theme, letter: self.letter)
     }
     
diff --git a/submodules/ContactListUI/Sources/ContactListNode.swift b/submodules/ContactListUI/Sources/ContactListNode.swift
index da49058cd0..0149b4b795 100644
--- a/submodules/ContactListUI/Sources/ContactListNode.swift
+++ b/submodules/ContactListUI/Sources/ContactListNode.swift
@@ -163,7 +163,7 @@ private enum ContactListNodeEntry: Comparable, Identifiable {
                 if case .presence = sortOrder {
                     text = strings.Contacts_SortedByPresence
                 }
-                return ContactListActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .inline(dropDownIcon, .right), highlight: .alpha, header: nil, action: {
+                return ContactListActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .inline(dropDownIcon, .right), highlight: .alpha, accessible: false, header: nil, action: {
                     interaction.openSortMenu()
             })
             case let .permissionInfo(_, title, text, suppressed):
@@ -240,7 +240,7 @@ private enum ContactListNodeEntry: Comparable, Identifiable {
                     })]
                 }
                 
-                return ContactsPeerItem(presentationData: ItemListPresentationData(presentationData), sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, context: context, peerMode: isSearch ? .generalSearch : .peer, peer: itemPeer, status: status, enabled: enabled, selection: selection, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), additionalActions: additionalActions, index: nil, header: header, action: { _ in
+                return ContactsPeerItem(presentationData: ItemListPresentationData(presentationData), sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, context: context, peerMode: isSearch ? .generalSearch : .peer, peer: itemPeer, status: status, enabled: enabled, selection: selection, selectionPosition: .left, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), additionalActions: additionalActions, index: nil, header: header, action: { _ in
                     interaction.openPeer(peer, .generic)
                 }, itemHighlighting: interaction.itemHighlighting, contextAction: itemContextAction)
         }
@@ -594,10 +594,46 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer]
         }
     }
     
+    
+    var index: Int = 0
+    
+    var existingPeerIds = Set<ContactListPeerId>()
+    if let selectionState = selectionState {
+        for peer in selectionState.foundPeers {
+            if existingPeerIds.contains(peer.id) {
+                continue
+            }
+            existingPeerIds.insert(peer.id)
+            
+            let selection: ContactsPeerItemSelection = .selectable(selected: selectionState.selectedPeerIndices[peer.id] != nil)
+            
+            var presence: PeerPresence?
+            if case let .peer(peer, _, _) = peer {
+                presence = presences[peer.id]
+            }
+            let enabled: Bool
+            switch peer {
+                case let .peer(peer, _, _):
+                    enabled = !disabledPeerIds.contains(peer.id)
+                default:
+                    enabled = true
+            }
+            
+            entries.append(.peer(index, peer, presence, nil, selection, theme, strings, dateTimeFormat, sortOrder, displayOrder, displayCallIcons, enabled))
+            index += 1
+        }
+    }
+    
     for i in 0 ..< orderedPeers.count {
+        let peer = orderedPeers[i]
+        if existingPeerIds.contains(peer.id) {
+            continue
+        }
+        existingPeerIds.insert(peer.id)
+        
         let selection: ContactsPeerItemSelection
         if let selectionState = selectionState {
-            selection = .selectable(selected: selectionState.selectedPeerIndices[orderedPeers[i].id] != nil)
+            selection = .selectable(selected: selectionState.selectedPeerIndices[peer.id] != nil)
         } else {
             selection = .none
         }
@@ -606,20 +642,21 @@ private func contactListNodeEntries(accountPeer: Peer?, peers: [ContactListPeer]
             case .orderedByPresence:
                 header = commonHeader
             default:
-                header = headers[orderedPeers[i].id]
+                header = headers[peer.id]
         }
         var presence: PeerPresence?
-        if case let .peer(peer, _, _) = orderedPeers[i] {
+        if case let .peer(peer, _, _) = peer {
             presence = presences[peer.id]
         }
         let enabled: Bool
-        switch orderedPeers[i] {
+        switch peer {
             case let .peer(peer, _, _):
                 enabled = !disabledPeerIds.contains(peer.id)
             default:
                 enabled = true
         }
-        entries.append(.peer(i, orderedPeers[i], presence, header, selection, theme, strings, dateTimeFormat, sortOrder, displayOrder, displayCallIcons, enabled))
+        entries.append(.peer(index, peer, presence, header, selection, theme, strings, dateTimeFormat, sortOrder, displayOrder, displayCallIcons, enabled))
+        index += 1
     }
     return entries
 }
@@ -706,15 +743,21 @@ public enum ContactListPresentation {
 
 public struct ContactListNodeGroupSelectionState: Equatable {
     public let selectedPeerIndices: [ContactListPeerId: Int]
+    public let foundPeers: [ContactListPeer]
+    public let selectedPeerMap: [ContactListPeerId: ContactListPeer]
     public let nextSelectionIndex: Int
     
-    private init(selectedPeerIndices: [ContactListPeerId: Int], nextSelectionIndex: Int) {
+    private init(selectedPeerIndices: [ContactListPeerId: Int], foundPeers: [ContactListPeer], selectedPeerMap: [ContactListPeerId: ContactListPeer], nextSelectionIndex: Int) {
         self.selectedPeerIndices = selectedPeerIndices
+        self.foundPeers = foundPeers
+        self.selectedPeerMap = selectedPeerMap
         self.nextSelectionIndex = nextSelectionIndex
     }
     
     public init() {
         self.selectedPeerIndices = [:]
+        self.foundPeers = []
+        self.selectedPeerMap = [:]
         self.nextSelectionIndex = 0
     }
     
@@ -722,13 +765,21 @@ public struct ContactListNodeGroupSelectionState: Equatable {
         var updatedIndices = self.selectedPeerIndices
         if let _ = updatedIndices[peerId] {
             updatedIndices.removeValue(forKey: peerId)
-            return ContactListNodeGroupSelectionState(selectedPeerIndices: updatedIndices, nextSelectionIndex: self.nextSelectionIndex)
+            return ContactListNodeGroupSelectionState(selectedPeerIndices: updatedIndices, foundPeers: self.foundPeers, selectedPeerMap: self.selectedPeerMap, nextSelectionIndex: self.nextSelectionIndex)
         } else {
             updatedIndices[peerId] = self.nextSelectionIndex
-            return ContactListNodeGroupSelectionState(selectedPeerIndices: updatedIndices, nextSelectionIndex: self.nextSelectionIndex + 1)
+            return ContactListNodeGroupSelectionState(selectedPeerIndices: updatedIndices, foundPeers: self.foundPeers, selectedPeerMap: self.selectedPeerMap, nextSelectionIndex: self.nextSelectionIndex + 1)
         }
     }
-}
+    
+    public func withFoundPeers(_ foundPeers: [ContactListPeer]) -> ContactListNodeGroupSelectionState {
+        return ContactListNodeGroupSelectionState(selectedPeerIndices: self.selectedPeerIndices, foundPeers: foundPeers, selectedPeerMap: self.selectedPeerMap, nextSelectionIndex: self.nextSelectionIndex)
+    }
+    
+    public func withSelectedPeerMap(_ selectedPeerMap: [ContactListPeerId: ContactListPeer]) -> ContactListNodeGroupSelectionState {
+        return ContactListNodeGroupSelectionState(selectedPeerIndices: self.selectedPeerIndices, foundPeers: self.foundPeers, selectedPeerMap: selectedPeerMap, nextSelectionIndex: self.nextSelectionIndex)
+    }
+ }
 
 public final class ContactListNode: ASDisplayNode {
     private let context: AccountContext
@@ -754,11 +805,35 @@ public final class ContactListNode: ASDisplayNode {
     private var selectionStateValue: ContactListNodeGroupSelectionState? {
         didSet {
             self.selectionStatePromise.set(.single(self.selectionStateValue))
+            self.selectionStateUpdated?(self.selectionStateValue)
         }
     }
     public var selectionState: ContactListNodeGroupSelectionState? {
         return self.selectionStateValue
     }
+    public var selectionStateUpdated: ((ContactListNodeGroupSelectionState?) -> Void)?
+    
+    public var selectedPeers: [ContactListPeer] {
+        if let selectionState = self.selectionState {
+            var selectedPeers: [ContactListPeer] = []
+            var selectedIndices: [(Int, ContactListPeerId)] = []
+            for (id, index) in selectionState.selectedPeerIndices {
+                selectedIndices.append((index, id))
+            }
+            selectedIndices.sort(by: { lhs, rhs in
+                return lhs.0 < rhs.0
+            })
+            for (_, id) in selectedIndices {
+                if let peer = selectionState.selectedPeerMap[id] {
+                    selectedPeers.append(peer)
+                }
+            }
+            return selectedPeers
+        } else {
+            return []
+        }
+    }
+    
     private var interaction: ContactListNodeInteraction?
     
     private var enableUpdatesValue = false
@@ -799,17 +874,20 @@ public final class ContactListNode: ASDisplayNode {
     private var authorizationNode: PermissionContentNode
     private let displayPermissionPlaceholder: Bool
     
-    public init(context: AccountContext, presentation: Signal<ContactListPresentation, NoError>, filters: [ContactListFilter] = [.excludeSelf], selectionState: ContactListNodeGroupSelectionState? = nil, displayPermissionPlaceholder: Bool = true, displaySortOptions: Bool = false, displayCallIcons: Bool = false, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)? = nil, isSearch: Bool = false) {
+    public var multipleSelection = false
+    
+    public init(context: AccountContext, presentation: Signal<ContactListPresentation, NoError>, filters: [ContactListFilter] = [.excludeSelf], selectionState: ContactListNodeGroupSelectionState? = nil, displayPermissionPlaceholder: Bool = true, displaySortOptions: Bool = false, displayCallIcons: Bool = false, contextAction: ((Peer, ASDisplayNode, ContextGesture?) -> Void)? = nil, isSearch: Bool = false, multipleSelection: Bool = false) {
         self.context = context
         self.filters = filters
         self.displayPermissionPlaceholder = displayPermissionPlaceholder
         self.contextAction = contextAction
+        self.multipleSelection = multipleSelection
         
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.presentationData = presentationData
         
         self.listNode = ListView()
-        self.listNode.dynamicBounceEnabled = !self.presentationData.disableAnimations
+        self.listNode.dynamicBounceEnabled = false
         self.listNode.accessibilityPageScrolledString = { row, count in
             return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
         }
@@ -864,6 +942,7 @@ public final class ContactListNode: ASDisplayNode {
         
         let processingQueue = Queue()
         let previousEntries = Atomic<[ContactListNodeEntry]?>(value: nil)
+        let previousSelectionState = Atomic<ContactListNodeGroupSelectionState?>(value: nil)
         
         let interaction = ContactListNodeInteraction(activateSearch: { [weak self] in
             self?.activateSearch?()
@@ -874,7 +953,26 @@ public final class ContactListNode: ASDisplayNode {
         }, suppressWarning: { [weak self] in
             self?.suppressPermissionWarning?()
         }, openPeer: { [weak self] peer, action in
-            self?.openPeer?(peer, action)
+            if let strongSelf = self {
+                if multipleSelection {
+                    var updated = false
+                    strongSelf.updateSelectionState({ state in
+                        if let state = state {
+                            updated = true
+                            var selectedPeerMap = state.selectedPeerMap
+                            selectedPeerMap[peer.id] = peer
+                            return state.withToggledPeerId(peer.id).withSelectedPeerMap(selectedPeerMap)
+                        } else {
+                            return nil
+                        }
+                    })
+                    if !updated {
+                        strongSelf.openPeer?(peer, action)
+                    }
+                } else {
+                    strongSelf.openPeer?(peer, action)
+                }
+            }
         }, contextAction: contextAction)
         
         self.indexNode.indexSelected = { [weak self] section in
@@ -1000,7 +1098,7 @@ public final class ContactListNode: ASDisplayNode {
                     if globalSearch {
                         foundRemoteContacts = foundRemoteContacts
                         |> then(
-                            searchPeers(account: context.account, query: query)
+                            context.engine.peers.searchPeers(query: query)
                             |> map { ($0.0, $0.1) }
                             |> delay(0.2, queue: Queue.concurrentDefaultQueue())
                         )
@@ -1037,6 +1135,15 @@ public final class ContactListNode: ASDisplayNode {
                             
                             var peers: [ContactListPeer] = []
                             
+                            if let selectionState = selectionState {
+                                for peer in selectionState.foundPeers {
+                                    if case let .peer(peer, _, _) = peer {
+                                        existingPeerIds.insert(peer.id)
+                                    }
+                                    peers.append(peer)
+                                }
+                            }
+                            
                             if !excludeSelf && !existingPeerIds.contains(accountPeer.id) {
                                 let lowercasedQuery = query.lowercased()
                                 if presentationData.strings.DialogList_SavedMessages.lowercased().hasPrefix(lowercasedQuery) || "saved messages".hasPrefix(lowercasedQuery) {
@@ -1210,6 +1317,7 @@ public final class ContactListNode: ASDisplayNode {
                         }
                         let entries = contactListNodeEntries(accountPeer: view.accountPeer, peers: peers, presences: view.peerPresences, presentation: presentation, selectionState: selectionState, theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, sortOrder: presentationData.nameSortOrder, displayOrder: presentationData.nameDisplayOrder, disabledPeerIds: disabledPeerIds, authorizationStatus: authorizationStatus, warningSuppressed: warningSuppressed, displaySortOptions: displaySortOptions, displayCallIcons: displayCallIcons)
                         let previous = previousEntries.swap(entries)
+                        let previousSelection = previousSelectionState.swap(selectionState)
                         
                         var hadPermissionInfo = false
                         if let previous = previous {
@@ -1229,11 +1337,10 @@ public final class ContactListNode: ASDisplayNode {
                         }
                         
                         let animation: ContactListAnimation
-                        if hadPermissionInfo != hasPermissionInfo {
+                        if (previousSelection == nil) != (selectionState == nil) {
+                            animation = .insertion
+                        } else if hadPermissionInfo != hasPermissionInfo {
                             animation = .insertion
-                        }
-                        else if let previous = previous, !presentationData.disableAnimations, (entries.count - previous.count) < 20 {
-                            animation = .default
                         } else {
                             animation = .none
                         }
@@ -1260,11 +1367,10 @@ public final class ContactListNode: ASDisplayNode {
             if let strongSelf = self {
                 let previousTheme = strongSelf.presentationData.theme
                 let previousStrings = strongSelf.presentationData.strings
-                let previousDisableAnimations = strongSelf.presentationData.disableAnimations
                 
                 strongSelf.presentationData = presentationData
                 
-                if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings || previousDisableAnimations != presentationData.disableAnimations {
+                if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings {
                     strongSelf.backgroundColor = presentationData.theme.chatList.backgroundColor
                     strongSelf.listNode.verticalScrollIndicatorColor = presentationData.theme.list.scrollIndicatorColor
                     strongSelf.presentationDataPromise.set(.single(presentationData))
@@ -1279,7 +1385,7 @@ public final class ContactListNode: ASDisplayNode {
                     strongSelf.authorizationNode.isHidden = authorizationPreviousHidden
                     strongSelf.addSubnode(strongSelf.authorizationNode)
                     
-                    strongSelf.listNode.dynamicBounceEnabled = !presentationData.disableAnimations
+                    strongSelf.listNode.dynamicBounceEnabled = false
                     
                     strongSelf.listNode.forEachAccessoryItemNode({ accessoryItemNode in
                         if let accessoryItemNode = accessoryItemNode as? ContactsSectionHeaderAccessoryItemNode {
@@ -1337,7 +1443,6 @@ public final class ContactListNode: ASDisplayNode {
     }
     
     public func updateSelectedChatLocation(_ chatLocation: ChatLocation?, progress: CGFloat, transition: ContainedViewLayoutTransition) {
-        
         self.interaction?.itemHighlighting.chatLocation = chatLocation
         self.interaction?.itemHighlighting.progress = progress
         
@@ -1352,7 +1457,7 @@ public final class ContactListNode: ASDisplayNode {
         self.disposable.dispose()
         self.presentationDataDisposable?.dispose()
     }
-    
+        
     public func updateSelectionState(_ f: (ContactListNodeGroupSelectionState?) -> ContactListNodeGroupSelectionState?) {
         let updatedSelectionState = f(self.selectionStateValue)
         if updatedSelectionState != self.selectionStateValue {
diff --git a/submodules/ContactListUI/Sources/ContactsController.swift b/submodules/ContactListUI/Sources/ContactsController.swift
index 1ec9005311..df4c849526 100644
--- a/submodules/ContactListUI/Sources/ContactsController.swift
+++ b/submodules/ContactListUI/Sources/ContactsController.swift
@@ -89,9 +89,6 @@ public class ContactsController: ViewController {
     
     public var switchToChatsController: (() -> Void)?
     
-    private let preloadedSticker = Promise<TelegramMediaFile?>(nil)
-    private let preloadStickerDisposable = MetaDisposable()
-    
     public override func updateNavigationCustomData(_ data: Any?, progress: CGFloat, transition: ContainedViewLayoutTransition) {
         if self.isNodeLoaded {
             self.contactsNode.contactListNode.updateSelectedChatLocation(data as? ChatLocation, progress: progress, transition: transition)
@@ -235,24 +232,16 @@ public class ContactsController: ViewController {
                                 scrollToEndIfExists = true
                             }
                             
-                            let _ = (strongSelf.preloadedSticker.get()
-                            |> take(1)
-                            |> deliverOnMainQueue).start(next: { [weak self] greetingSticker in
-                                if let strongSelf = self {
-                                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), purposefulAction: { [weak self] in
-                                        if fromSearch {
-                                            self?.deactivateSearch(animated: false)
-                                            self?.switchToChatsController?()
-                                        }
-                                        }, scrollToEndIfExists: scrollToEndIfExists, greetingData: greetingSticker.flatMap({ ChatGreetingData(sticker: $0) }), options: [.removeOnMasterDetails], completion: { [weak self] _ in
-                                        if let strongSelf = self {
-                                            strongSelf.contactsNode.contactListNode.listNode.clearHighlightAnimated(true)
-                                        }
-                                    }))
-                                    
-                                    strongSelf.prepareRandomGreetingSticker()
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id), purposefulAction: { [weak self] in
+                                if fromSearch {
+                                    self?.deactivateSearch(animated: false)
+                                    self?.switchToChatsController?()
                                 }
-                            })
+                                }, scrollToEndIfExists: scrollToEndIfExists, options: [.removeOnMasterDetails], completion: { [weak self] _ in
+                                if let strongSelf = self {
+                                    strongSelf.contactsNode.contactListNode.listNode.clearHighlightAnimated(true)
+                                }
+                            }))
                         }
                     case let .deviceContact(id, _):
                         let _ = ((strongSelf.context.sharedContext.contactDataManager?.extendedData(stableId: id) ?? .single(nil))
@@ -423,14 +412,6 @@ public class ContactsController: ViewController {
         self.contactsNode.contactListNode.enableUpdates = false
     }
     
-    public override func displayNodeDidLoad() {
-        super.displayNodeDidLoad()
-        
-        Queue.mainQueue().after(1.0) {
-            self.prepareRandomGreetingSticker()
-        }
-    }
-    
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
@@ -438,7 +419,7 @@ public class ContactsController: ViewController {
         
         self.validLayout = layout
         
-        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func activateSearch() {
@@ -525,27 +506,4 @@ public class ContactsController: ViewController {
             }
         })
     }
-    
-    
-    private func prepareRandomGreetingSticker() {
-        let context = self.context
-        self.preloadedSticker.set(.single(nil)
-        |> then(randomGreetingSticker(account: context.account)
-        |> map { item in
-            return item?.file
-        }))
-        
-        self.preloadStickerDisposable.set((self.preloadedSticker.get()
-        |> mapToSignal { sticker -> Signal<Void, NoError> in
-            if let sticker = sticker {
-                let _ = freeMediaFileInteractiveFetched(account: context.account, fileReference: .standalone(media: sticker)).start()
-                return chatMessageAnimationData(postbox: context.account.postbox, resource: sticker.resource, fitzModifier: nil, width: 384, height: 384, synchronousLoad: false)
-                |> mapToSignal { _ -> Signal<Void, NoError> in
-                    return .complete()
-                }
-            } else {
-                return .complete()
-            }
-        }).start())
-    }
 }
diff --git a/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift b/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift
index 0c727b739b..d337d880b6 100644
--- a/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift
+++ b/submodules/ContactListUI/Sources/ContactsSearchContainerNode.swift
@@ -269,7 +269,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
                 if categories.contains(.global) {
                     foundRemoteContacts = .single(previousFoundRemoteContacts.with({ $0 }))
                     |> then(
-                        searchPeers(account: context.account, query: query)
+                        context.engine.peers.searchPeers(query: query)
                         |> map { ($0.0, $0.1) }
                         |> delay(0.2, queue: Queue.concurrentDefaultQueue())
                     )
@@ -414,7 +414,7 @@ public final class ContactsSearchContainerNode: SearchDisplayControllerContentNo
             }
         }))
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/ContactListUI/Sources/InviteContactsController.swift b/submodules/ContactListUI/Sources/InviteContactsController.swift
index bf20344656..4a62814ed5 100644
--- a/submodules/ContactListUI/Sources/InviteContactsController.swift
+++ b/submodules/ContactListUI/Sources/InviteContactsController.swift
@@ -199,7 +199,7 @@ public class InviteContactsController: ViewController, MFMessageComposeViewContr
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func activateSearch() {
diff --git a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift
index 0523dd25e8..13e4f3283a 100644
--- a/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift
+++ b/submodules/ContactListUI/Sources/InviteContactsControllerNode.swift
@@ -58,7 +58,7 @@ private enum InviteContactsEntry: Comparable, Identifiable {
                 } else {
                     status = .none
                 }
-                let peer = TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: contact.firstName, lastName: contact.lastName, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+                let peer = TelegramUser(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: contact.firstName, lastName: contact.lastName, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
                 return ContactsPeerItem(presentationData: ItemListPresentationData(presentationData), sortOrder: nameSortOrder, displayOrder: nameDisplayOrder, context: context, peerMode: .peer, peer: .peer(peer: peer, chatPeer: peer), status: status, enabled: true, selection: selection, editing: ContactsPeerItemEditing(editable: false, editing: false, revealed: false), index: nil, header: ChatListSearchItemHeader(type: .contacts, theme: theme, strings: strings, actionTitle: nil, action: nil), action: { _ in
                     interaction.toggleContact(id)
                 })
@@ -365,7 +365,7 @@ final class InviteContactsControllerNode: ASDisplayNode {
                     return DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phoneNumber.value))
                 })))
             }
-            return deviceContactsImportedByCount(postbox: context.account.postbox, contacts: mappedContacts)
+            return context.engine.contacts.deviceContactsImportedByCount(contacts: mappedContacts)
             |> map { counts -> [(DeviceContactStableId, DeviceContactBasicData, Int32)]? in
                 var result: [(DeviceContactStableId, DeviceContactBasicData, Int32)] = []
                 var contactValues: [DeviceContactStableId: DeviceContactBasicData] = [:]
diff --git a/submodules/ContactListUI/Sources/InviteContactsCountPanelNode.swift b/submodules/ContactListUI/Sources/InviteContactsCountPanelNode.swift
index 47d68ed1af..2abe674765 100644
--- a/submodules/ContactListUI/Sources/InviteContactsCountPanelNode.swift
+++ b/submodules/ContactListUI/Sources/InviteContactsCountPanelNode.swift
@@ -37,7 +37,7 @@ final class InviteContactsCountPanelNode: ASDisplayNode {
         
         super.init()
         
-        self.backgroundColor = theme.rootController.navigationBar.backgroundColor
+        self.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor
         
         self.addSubnode(self.button)
         self.addSubnode(self.separatorNode)
diff --git a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
index 5db2eab9ea..1d5c1f259e 100644
--- a/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
+++ b/submodules/ContactsPeerItem/Sources/ContactsPeerItem.swift
@@ -40,6 +40,11 @@ public enum ContactsPeerItemSelection: Equatable {
     case selectable(selected: Bool)
 }
 
+public enum ContactsPeerItemSelectionPosition: Equatable {
+    case left
+    case right
+}
+
 public struct ContactsPeerItemEditing: Equatable {
     public var editable: Bool
     public var editing: Bool
@@ -130,6 +135,7 @@ public class ContactsPeerItem: ItemListItem, ListViewItemWithHeader {
     let badge: ContactsPeerItemBadge?
     let enabled: Bool
     let selection: ContactsPeerItemSelection
+    let selectionPosition: ContactsPeerItemSelectionPosition
     let editing: ContactsPeerItemEditing
     let options: [ItemListPeerItemRevealOption]
     let additionalActions: [ContactsPeerItemAction]
@@ -148,7 +154,7 @@ public class ContactsPeerItem: ItemListItem, ListViewItemWithHeader {
     
     public let header: ListViewItemHeader?
     
-    public init(presentationData: ItemListPresentationData, style: ItemListStyle = .plain, sectionId: ItemListSectionId = 0, sortOrder: PresentationPersonNameOrder, displayOrder: PresentationPersonNameOrder, context: AccountContext, peerMode: ContactsPeerItemPeerMode, peer: ContactsPeerItemPeer, status: ContactsPeerItemStatus, badge: ContactsPeerItemBadge? = nil, enabled: Bool, selection: ContactsPeerItemSelection, editing: ContactsPeerItemEditing, options: [ItemListPeerItemRevealOption] = [], additionalActions: [ContactsPeerItemAction] = [], actionIcon: ContactsPeerItemActionIcon = .none, index: PeerNameIndex?, header: ListViewItemHeader?, action: @escaping (ContactsPeerItemPeer) -> Void, disabledAction: ((ContactsPeerItemPeer) -> Void)? = nil, setPeerIdWithRevealedOptions: ((PeerId?, PeerId?) -> Void)? = nil, deletePeer: ((PeerId) -> Void)? = nil, itemHighlighting: ContactItemHighlighting? = nil, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, arrowAction: (() -> Void)? = nil) {
+    public init(presentationData: ItemListPresentationData, style: ItemListStyle = .plain, sectionId: ItemListSectionId = 0, sortOrder: PresentationPersonNameOrder, displayOrder: PresentationPersonNameOrder, context: AccountContext, peerMode: ContactsPeerItemPeerMode, peer: ContactsPeerItemPeer, status: ContactsPeerItemStatus, badge: ContactsPeerItemBadge? = nil, enabled: Bool, selection: ContactsPeerItemSelection, selectionPosition: ContactsPeerItemSelectionPosition = .right, editing: ContactsPeerItemEditing, options: [ItemListPeerItemRevealOption] = [], additionalActions: [ContactsPeerItemAction] = [], actionIcon: ContactsPeerItemActionIcon = .none, index: PeerNameIndex?, header: ListViewItemHeader?, action: @escaping (ContactsPeerItemPeer) -> Void, disabledAction: ((ContactsPeerItemPeer) -> Void)? = nil, setPeerIdWithRevealedOptions: ((PeerId?, PeerId?) -> Void)? = nil, deletePeer: ((PeerId) -> Void)? = nil, itemHighlighting: ContactItemHighlighting? = nil, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, arrowAction: (() -> Void)? = nil) {
         self.presentationData = presentationData
         self.style = style
         self.sectionId = sectionId
@@ -161,6 +167,7 @@ public class ContactsPeerItem: ItemListItem, ListViewItemWithHeader {
         self.badge = badge
         self.enabled = enabled
         self.selection = selection
+        self.selectionPosition = selectionPosition
         self.editing = editing
         self.options = options
         self.additionalActions = additionalActions
@@ -518,7 +525,7 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
             if currentItem?.presentationData.theme !== item.presentationData.theme {
                 updatedTheme = item.presentationData.theme
             }
-            let leftInset: CGFloat = 65.0 + params.leftInset
+            var leftInset: CGFloat = 65.0 + params.leftInset
             var rightInset: CGFloat = 10.0 + params.rightInset
             
             let updatedSelectionNode: CheckNode?
@@ -527,7 +534,12 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
             case .none:
                 updatedSelectionNode = nil
             case let .selectable(selected):
-                rightInset += 38.0
+                switch item.selectionPosition {
+                    case .left:
+                        leftInset += 38.0
+                    case .right:
+                        rightInset += 38.0
+                }
                 isSelected = selected
                 
                 let selectionNode: CheckNode
@@ -999,14 +1011,29 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
                             }
                             
                             if let updatedSelectionNode = updatedSelectionNode {
+                                let hadSelectionNode = strongSelf.selectionNode != nil
                                 if strongSelf.selectionNode !== updatedSelectionNode {
                                     strongSelf.selectionNode?.removeFromSupernode()
                                     strongSelf.selectionNode = updatedSelectionNode
                                     strongSelf.addSubnode(updatedSelectionNode)
                                 }
-                                updatedSelectionNode.setSelected(isSelected, animated: animated)
+                                updatedSelectionNode.setSelected(isSelected, animated: true)
                                 
-                                updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 22.0 - 17.0, y: floor((nodeLayout.contentSize.height - 22.0) / 2.0)), size: CGSize(width: 22.0, height: 22.0))
+                                switch item.selectionPosition {
+                                    case .left:
+                                        updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.leftInset + 17.0, y: floor((nodeLayout.contentSize.height - 22.0) / 2.0)), size: CGSize(width: 22.0, height: 22.0))
+                                    case .right:
+                                        updatedSelectionNode.frame = CGRect(origin: CGPoint(x: params.width - params.rightInset - 22.0 - 17.0, y: floor((nodeLayout.contentSize.height - 22.0) / 2.0)), size: CGSize(width: 22.0, height: 22.0))
+                                }
+                                
+                                if !hadSelectionNode {
+                                    switch item.selectionPosition {
+                                        case .left:
+                                            transition.animateFrame(node: updatedSelectionNode, from: updatedSelectionNode.frame.offsetBy(dx: -38.0, dy: 0.0))
+                                        case .right:
+                                            transition.animateFrame(node: updatedSelectionNode, from: updatedSelectionNode.frame.offsetBy(dx: 38.0, dy: 0.0))
+                                    }
+                                }
                             } else if let selectionNode = strongSelf.selectionNode {
                                 selectionNode.removeFromSupernode()
                                 strongSelf.selectionNode = nil
@@ -1155,9 +1182,9 @@ public class ContactsPeerItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let (item, _, _, _, _, _) = self.layoutParams {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ContextUI/Sources/ContextActionNode.swift b/submodules/ContextUI/Sources/ContextActionNode.swift
index 03bcaea17c..cafd458e1c 100644
--- a/submodules/ContextUI/Sources/ContextActionNode.swift
+++ b/submodules/ContextUI/Sources/ContextActionNode.swift
@@ -17,7 +17,7 @@ public protocol ContextActionNodeProtocol: ASDisplayNode {
 
 final class ContextActionNode: ASDisplayNode, ContextActionNodeProtocol {
     private let action: ContextMenuActionItem
-    private let getController: () -> ContextController?
+    private let getController: () -> ContextControllerProtocol?
     private let actionSelected: (ContextMenuActionResult) -> Void
     
     private let backgroundNode: ASDisplayNode
@@ -33,7 +33,7 @@ final class ContextActionNode: ASDisplayNode, ContextActionNodeProtocol {
     
     private var pointerInteraction: PointerInteraction?
     
-    init(presentationData: PresentationData, action: ContextMenuActionItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
+    init(presentationData: PresentationData, action: ContextMenuActionItem, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
         self.action = action
         self.getController = getController
         self.actionSelected = actionSelected
diff --git a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift
index 70837d63f4..2325b2bd92 100644
--- a/submodules/ContextUI/Sources/ContextActionsContainerNode.swift
+++ b/submodules/ContextUI/Sources/ContextActionsContainerNode.swift
@@ -69,7 +69,7 @@ private final class InnerActionsContainerNode: ASDisplayNode {
         }
     }
     
-    init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void, blurBackground: Bool) {
+    init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void, blurBackground: Bool) {
         self.presentationData = presentationData
         self.feedbackTap = feedbackTap
         self.blurBackground = blurBackground
@@ -165,8 +165,11 @@ private final class InnerActionsContainerNode: ASDisplayNode {
         gesture.isEnabled = self.panSelectionGestureEnabled
     }
     
-    func updateLayout(widthClass: ContainerViewLayoutSizeClass, constrainedWidth: CGFloat, transition: ContainedViewLayoutTransition) -> CGSize {
+    func updateLayout(widthClass: ContainerViewLayoutSizeClass, constrainedWidth: CGFloat, minimalWidth: CGFloat?, transition: ContainedViewLayoutTransition) -> CGSize {
         var minActionsWidth: CGFloat = 250.0
+        if let minimalWidth = minimalWidth, minimalWidth > minActionsWidth {
+            minActionsWidth = minimalWidth
+        }
         
         switch widthClass {
         case .compact:
@@ -457,7 +460,7 @@ final class ContextActionsContainerNode: ASDisplayNode {
         return self.additionalActionsNode != nil
     }
     
-    init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void, displayTextSelectionTip: Bool, blurBackground: Bool) {
+    init(presentationData: PresentationData, items: [ContextMenuItem], getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void, feedbackTap: @escaping () -> Void, displayTextSelectionTip: Bool, blurBackground: Bool) {
         self.blurBackground = blurBackground
         self.shadowNode = ASImageNode()
         self.shadowNode.displaysAsynchronously = false
@@ -517,10 +520,10 @@ final class ContextActionsContainerNode: ASDisplayNode {
         }
         
         var contentSize = CGSize()
-        let actionsSize = self.actionsNode.updateLayout(widthClass: widthClass, constrainedWidth: constrainedWidth, transition: transition)
+        let actionsSize = self.actionsNode.updateLayout(widthClass: widthClass, constrainedWidth: constrainedWidth, minimalWidth: nil, transition: transition)
             
         if let additionalActionsNode = self.additionalActionsNode, let additionalShadowNode = self.additionalShadowNode {
-            let additionalActionsSize = additionalActionsNode.updateLayout(widthClass: widthClass, constrainedWidth: actionsSize.width, transition: transition)
+            let additionalActionsSize = additionalActionsNode.updateLayout(widthClass: widthClass, constrainedWidth: actionsSize.width, minimalWidth: actionsSize.width, transition: transition)
             contentSize = additionalActionsSize
             
             let bounds = CGRect(origin: CGPoint(), size: additionalActionsSize)
@@ -569,12 +572,15 @@ final class ContextActionsContainerNode: ASDisplayNode {
     }
     
     func animateOut(offset: CGFloat, transition: ContainedViewLayoutTransition) {
-        guard let additionalActionsNode = self.additionalActionsNode else {
+        guard let additionalActionsNode = self.additionalActionsNode, let additionalShadowNode = self.additionalShadowNode else {
             return
         }
         
         transition.animatePosition(node: additionalActionsNode, to: CGPoint(x: 0.0, y: offset / 2.0), additive: true)
+        transition.animatePosition(node: additionalShadowNode, to: CGPoint(x: 0.0, y: offset / 2.0), additive: true)
         additionalActionsNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+        additionalShadowNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
         additionalActionsNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.15, removeOnCompletion: false)
+        additionalShadowNode.layer.animateScale(from: 1.0, to: 0.75, duration: 0.15, removeOnCompletion: false)
     }
 }
diff --git a/submodules/ContextUI/Sources/ContextController.swift b/submodules/ContextUI/Sources/ContextController.swift
index cf9037222a..95b1ebabd7 100644
--- a/submodules/ContextUI/Sources/ContextController.swift
+++ b/submodules/ContextUI/Sources/ContextController.swift
@@ -11,6 +11,13 @@ import SwiftSignalKit
 
 private let animationDurationFactor: Double = 1.0
 
+public protocol ContextControllerProtocol {
+    var useComplexItemsTransitionAnimation: Bool { get set }
+    
+    func setItems(_ items: Signal<[ContextMenuItem], NoError>)
+    func dismiss(completion: (() -> Void)?)
+}
+
 public enum ContextMenuActionItemTextLayout {
     case singleLine
     case twoLinesMax
@@ -66,9 +73,9 @@ public final class ContextMenuActionItem {
     public let badge: ContextMenuActionBadge?
     public let icon: (PresentationTheme) -> UIImage?
     public let iconSource: ContextMenuActionItemIconSource?
-    public let action: (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void
+    public let action: (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void
     
-    public init(text: String, textColor: ContextMenuActionItemTextColor = .primary, textLayout: ContextMenuActionItemTextLayout = .twoLinesMax, textFont: ContextMenuActionItemFont = .regular, badge: ContextMenuActionBadge? = nil, icon: @escaping (PresentationTheme) -> UIImage?, iconSource: ContextMenuActionItemIconSource? = nil, action: @escaping (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void) {
+    public init(text: String, textColor: ContextMenuActionItemTextColor = .primary, textLayout: ContextMenuActionItemTextLayout = .twoLinesMax, textFont: ContextMenuActionItemFont = .regular, badge: ContextMenuActionBadge? = nil, icon: @escaping (PresentationTheme) -> UIImage?, iconSource: ContextMenuActionItemIconSource? = nil, action: @escaping (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void) {
         self.text = text
         self.textColor = textColor
         self.textFont = textFont
@@ -86,7 +93,7 @@ public protocol ContextMenuCustomNode: ASDisplayNode {
 }
 
 public protocol ContextMenuCustomItem {
-    func node(presentationData: PresentationData, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode
+    func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode
 }
 
 public enum ContextMenuItem {
@@ -113,7 +120,7 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
     private let reactionSelected: (ReactionContextItem.Reaction) -> Void
     private let beganAnimatingOut: () -> Void
     private let attemptTransitionControllerIntoNavigation: () -> Void
-    private let getController: () -> ContextController?
+    private let getController: () -> ContextControllerProtocol?
     private weak var gesture: ContextGesture?
     private var displayTextSelectionTip: Bool
     
@@ -490,7 +497,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
             
             if let takenViewInfo = takenViewInfo, let parentSupernode = takenViewInfo.contentContainingNode.supernode {
                 self.contentContainerNode.contentNode = .extracted(node: takenViewInfo.contentContainingNode, keepInPlace: source.keepInPlace)
-                if source.keepInPlace {
+                if source.keepInPlace || takenViewInfo.maskView != nil {
+                    self.clippingNode.view.mask = takenViewInfo.maskView
                     self.clippingNode.addSubnode(self.contentContainerNode)
                 } else {
                     self.scrollNode.addSubnode(self.contentContainerNode)
@@ -646,14 +654,26 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                 }
             case let .extracted(extracted, keepInPlace):
                 let springDuration: Double = 0.42 * animationDurationFactor
-                let springDamping: CGFloat = 104.0
+                var springDamping: CGFloat = 104.0
+                if case let .extracted(source) = self.source, source.centerVertically {
+                    springDamping = 124.0
+                }
                 
                 self.actionsContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2 * animationDurationFactor)
                 self.actionsContainerNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
-                
+                 
                 if let originalProjectedContentViewFrame = self.originalProjectedContentViewFrame {
                     let contentParentNode = extracted
                     let localSourceFrame = self.view.convert(originalProjectedContentViewFrame.1, to: self.scrollNode.view)
+                   
+                    var actionsDuration = springDuration
+                    var actionsOffset: CGFloat = 0.0
+                    var contentDuration = springDuration
+                    if case let .extracted(source) = self.source, source.centerVertically {
+                        actionsOffset = -(originalProjectedContentViewFrame.1.height - originalProjectedContentViewFrame.0.height) * 0.57
+                        actionsDuration *= 1.0
+                        contentDuration *= 0.9
+                    }
                     
                     let localContentSourceFrame: CGRect
                     if keepInPlace {
@@ -666,9 +686,11 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                         reactionContextNode.animateIn(from: CGRect(origin: CGPoint(x: originalProjectedContentViewFrame.1.minX, y: originalProjectedContentViewFrame.1.minY), size: contentParentNode.contentRect.size))
                     }
                     
-                    self.actionsContainerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint(x: localSourceFrame.center.x - self.actionsContainerNode.position.x, y: localSourceFrame.center.y - self.actionsContainerNode.position.y)), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, additive: true)
+                    self.actionsContainerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint(x: localSourceFrame.center.x - self.actionsContainerNode.position.x, y: localSourceFrame.center.y - self.actionsContainerNode.position.y + actionsOffset)), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: actionsDuration, initialVelocity: 0.0, damping: springDamping, additive: true)
                     let contentContainerOffset = CGPoint(x: localContentSourceFrame.center.x - self.contentContainerNode.frame.center.x - contentParentNode.contentRect.minX, y: localContentSourceFrame.center.y - self.contentContainerNode.frame.center.y - contentParentNode.contentRect.minY)
-                    self.contentContainerNode.layer.animateSpring(from: NSValue(cgPoint: contentContainerOffset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, additive: true)
+                    self.contentContainerNode.layer.animateSpring(from: NSValue(cgPoint: contentContainerOffset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: contentDuration, initialVelocity: 0.0, damping: springDamping, additive: true, completion: { [weak self] _ in
+                        self?.clippingNode.view.mask = nil
+                    })
                     contentParentNode.applyAbsoluteOffsetSpring?(-contentContainerOffset.y, springDuration, springDamping)
                 }
                 
@@ -718,6 +740,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
     }
     
     func animateOut(result initialResult: ContextMenuActionResult, completion: @escaping () -> Void) {
+        self.isUserInteractionEnabled = false
+        
         self.beganAnimatingOut()
         
         var transitionDuration: Double = 0.2
@@ -828,11 +852,12 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                 updatedContentAreaInScreenSpace.origin.x = 0.0
                 updatedContentAreaInScreenSpace.size.width = self.bounds.width
                 
+                self.clippingNode.view.mask = putBackInfo.maskView
                 self.clippingNode.layer.animateFrame(from: self.clippingNode.frame, to: updatedContentAreaInScreenSpace, duration: transitionDuration * animationDurationFactor, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false)
                 self.clippingNode.layer.animateBoundsOriginYAdditive(from: 0.0, to: updatedContentAreaInScreenSpace.minY, duration: transitionDuration * animationDurationFactor, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false)
             }
             
-            let intermediateCompletion: () -> Void = { [weak contentParentNode] in
+            let intermediateCompletion: () -> Void = { [weak self, weak contentParentNode] in
                 if completedEffect && completedContentNode && completedActionsNode {
                     switch result {
                     case .default, .custom:
@@ -845,6 +870,8 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                         break
                     }
                     
+                    self?.clippingNode.view.mask = nil
+                    
                     completion()
                 }
             }
@@ -911,14 +938,19 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     localContentSourceFrame = localSourceFrame
                 }
                 
-                self.actionsContainerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: localSourceFrame.center.x - self.actionsContainerNode.position.x, y: localSourceFrame.center.y - self.actionsContainerNode.position.y), duration: transitionDuration * animationDurationFactor, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false, additive: true)
+                var actionsOffset: CGFloat = 0.0
+                if case let .extracted(source) = self.source, source.centerVertically {
+                    actionsOffset = -localSourceFrame.width * 0.6
+                }
+                
+                self.actionsContainerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: localSourceFrame.center.x - self.actionsContainerNode.position.x, y: localSourceFrame.center.y - self.actionsContainerNode.position.y + actionsOffset), duration: transitionDuration * animationDurationFactor, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false, additive: true)
                 let contentContainerOffset = CGPoint(x: localContentSourceFrame.center.x - self.contentContainerNode.frame.center.x - contentParentNode.contentRect.minX, y: localContentSourceFrame.center.y - self.contentContainerNode.frame.center.y - contentParentNode.contentRect.minY)
                 self.contentContainerNode.layer.animatePosition(from: CGPoint(), to: contentContainerOffset, duration: transitionDuration * animationDurationFactor, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false, additive: true, completion: { _ in
                     completedContentNode = true
                     intermediateCompletion()
                 })
                 contentParentNode.updateAbsoluteRect?(self.contentContainerNode.frame.offsetBy(dx: 0.0, dy: -self.scrollNode.view.contentOffset.y + contentContainerOffset.y), self.bounds.size)
-                contentParentNode.applyAbsoluteOffset?(-contentContainerOffset.y, transitionCurve, transitionDuration)
+                contentParentNode.applyAbsoluteOffset?(CGPoint(x: 0.0, y: -contentContainerOffset.y), transitionCurve, transitionDuration)
                 
                 if let reactionContextNode = self.reactionContextNode {
                     reactionContextNode.animateOut(to: CGRect(origin: CGPoint(x: originalProjectedContentViewFrame.1.minX, y: originalProjectedContentViewFrame.1.minY), size: contentParentNode.contentRect.size), animatingOutToReaction: self.reactionContextNodeIsAnimatingOut)
@@ -1157,7 +1189,6 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
         
         if let layout = self.validLayout {
             self.updateLayout(layout: layout, transition: .animated(duration: 0.3, curve: .spring), previousActionsContainerNode: previousActionsContainerNode)
-            
         } else {
             previousActionsContainerNode.removeFromSupernode()
         }
@@ -1271,33 +1302,29 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     
                     var overflowOffset: CGFloat
                     var contentContainerFrame: CGRect
-//                    if keepInPlace {
-                        overflowOffset = min(0.0, originalActionsFrame.minY - contentTopInset)
+
+                    overflowOffset = min(0.0, originalActionsFrame.minY - contentTopInset)
                     let contentParentNode = referenceNode
-                        contentContainerFrame = originalContentFrame
-                        if !overflowOffset.isZero {
-                            let offsetDelta = contentParentNode.frame.height + 4.0
-                            overflowOffset += offsetDelta
-                            overflowOffset = min(0.0, overflowOffset)
-                            
-                            originalActionsFrame.origin.x -= contentParentNode.frame.width + 14.0
-                            originalActionsFrame.origin.x = max(actionsSideInset, originalActionsFrame.origin.x)
-                            //originalActionsFrame.origin.y += contentParentNode.contentRect.height
-                            if originalActionsFrame.minX < contentContainerFrame.minX {
-                                contentContainerFrame.origin.x = min(originalActionsFrame.maxX + 14.0, layout.size.width - actionsSideInset)
-                            }
-                            originalActionsFrame.origin.y += offsetDelta
-                            if originalActionsFrame.maxY < originalContentFrame.maxY {
-                                originalActionsFrame.origin.y += contentParentNode.frame.height
-                                originalActionsFrame.origin.y = min(originalActionsFrame.origin.y, layout.size.height - originalActionsFrame.height - actionsBottomInset)
-                            }
-                            contentHeight -= offsetDelta
+                    contentContainerFrame = originalContentFrame
+                    if !overflowOffset.isZero {
+                        let offsetDelta = contentParentNode.frame.height + 4.0
+                        overflowOffset += offsetDelta
+                        overflowOffset = min(0.0, overflowOffset)
+                        
+                        originalActionsFrame.origin.x -= contentParentNode.frame.width + 14.0
+                        originalActionsFrame.origin.x = max(actionsSideInset, originalActionsFrame.origin.x)
+                        
+                        if originalActionsFrame.minX < contentContainerFrame.minX {
+                            contentContainerFrame.origin.x = min(originalActionsFrame.maxX + 14.0, layout.size.width - actionsSideInset)
                         }
-//                    } else {
-//                        overflowOffset = min(0.0, originalContentFrame.minY - contentTopInset)
-//                        contentContainerFrame = originalContentFrame.offsetBy(dx: -contentParentNode.contentRect.minX, dy: -overflowOffset - contentParentNode.contentRect.minY)
-//                    }
-                    
+                        originalActionsFrame.origin.y += offsetDelta
+                        if originalActionsFrame.maxY < originalContentFrame.maxY {
+                            originalActionsFrame.origin.y += contentParentNode.frame.height
+                            originalActionsFrame.origin.y = min(originalActionsFrame.origin.y, layout.size.height - originalActionsFrame.height - actionsBottomInset)
+                        }
+                        contentHeight -= offsetDelta
+                    }
+
                     let scrollContentSize = CGSize(width: layout.size.width, height: contentHeight)
                     if self.scrollNode.view.contentSize != scrollContentSize {
                         self.scrollNode.view.contentSize = scrollContentSize
@@ -1315,6 +1342,10 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     }
                 }
             case let .extracted(contentParentNode, keepInPlace):
+                var centerVertically = false
+                if case let .extracted(source) = self.source, source.centerVertically {
+                    centerVertically = true
+                }
                 let contentActionsSpacing: CGFloat = keepInPlace ? 16.0 : 8.0
                 if let originalProjectedContentViewFrame = self.originalProjectedContentViewFrame {
                     let isInitialLayout = self.actionsContainerNode.frame.size.width.isZero
@@ -1328,13 +1359,17 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     let maximumActionsFrameOrigin = max(60.0, layout.size.height - layout.intrinsicInsets.bottom - actionsBottomInset - actionsSize.height)
                     let preferredActionsX: CGFloat
                     let originalActionsY: CGFloat
-                    if keepInPlace {
+                    if centerVertically {
+                        originalActionsY = min(originalProjectedContentViewFrame.1.maxY + contentActionsSpacing, maximumActionsFrameOrigin)
+                        preferredActionsX = originalProjectedContentViewFrame.1.maxX - actionsSize.width
+                    } else if keepInPlace {
                         originalActionsY = originalProjectedContentViewFrame.1.minY - contentActionsSpacing - actionsSize.height
                         preferredActionsX = max(actionsSideInset, originalProjectedContentViewFrame.1.maxX - actionsSize.width)
                     } else {
                         originalActionsY = min(originalProjectedContentViewFrame.1.maxY + contentActionsSpacing, maximumActionsFrameOrigin)
                         preferredActionsX = originalProjectedContentViewFrame.1.minX
                     }
+
                     var originalActionsFrame = CGRect(origin: CGPoint(x: max(actionsSideInset, min(layout.size.width - actionsSize.width - actionsSideInset, preferredActionsX)), y: originalActionsY), size: actionsSize)
                     let originalContentX: CGFloat = originalProjectedContentViewFrame.1.minX
                     let originalContentY: CGFloat
@@ -1362,7 +1397,20 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     
                     var overflowOffset: CGFloat
                     var contentContainerFrame: CGRect
-                    if keepInPlace {
+                    if centerVertically {
+                        overflowOffset = 0.0
+                        if layout.size.width > layout.size.height, case .compact = layout.metrics.widthClass {
+                            let totalWidth = originalContentFrame.width + originalActionsFrame.width + contentActionsSpacing
+                            contentContainerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - totalWidth) / 2.0 + originalContentFrame.width * 0.1), y: floor((layout.size.height - originalContentFrame.height) / 2.0)), size: originalContentFrame.size)
+                            originalActionsFrame.origin.x = contentContainerFrame.maxX + contentActionsSpacing + 14.0
+                            originalActionsFrame.origin.y = contentContainerFrame.origin.y
+                            contentHeight = layout.size.height
+                        } else {
+                            let totalHeight = originalContentFrame.height + originalActionsFrame.height
+                            contentContainerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - originalContentFrame.width) / 2.0), y: floor((layout.size.height - totalHeight) / 2.0)), size: originalContentFrame.size)
+                            originalActionsFrame.origin.y = contentContainerFrame.maxY + contentActionsSpacing
+                        }
+                    } else if keepInPlace {
                         overflowOffset = min(0.0, originalActionsFrame.minY - contentTopInset)
                         contentContainerFrame = originalContentFrame.offsetBy(dx: -contentParentNode.contentRect.minX, dy: -contentParentNode.contentRect.minY)
                         if !overflowOffset.isZero {
@@ -1386,6 +1434,10 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                     } else {
                         overflowOffset = min(0.0, originalContentFrame.minY - contentTopInset)
                         contentContainerFrame = originalContentFrame.offsetBy(dx: -contentParentNode.contentRect.minX, dy: -overflowOffset - contentParentNode.contentRect.minY)
+                        
+                        if contentContainerFrame.maxX > layout.size.width {
+                            contentContainerFrame = CGRect(origin: CGPoint(x: layout.size.width - contentContainerFrame.width - 11.0, y: contentContainerFrame.minY), size: contentContainerFrame.size)
+                        }
                     }
                     
                     let scrollContentSize = CGSize(width: layout.size.width, height: contentHeight)
@@ -1557,11 +1609,10 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                 }
             }
         }
-        
-    
+            
         if let previousActionsContainerNode = previousActionsContainerNode {
             if transition.isAnimated {
-                if previousActionsContainerNode.hasAdditionalActions && !self.actionsContainerNode.hasAdditionalActions {
+                if previousActionsContainerNode.hasAdditionalActions && !self.actionsContainerNode.hasAdditionalActions && self.getController()?.useComplexItemsTransitionAnimation == true {
                     var initialFrame = self.actionsContainerNode.frame
                     let delta = (previousActionsContainerNode.frame.height - self.actionsContainerNode.frame.height)
                     initialFrame.origin.y = self.actionsContainerNode.frame.minY + previousActionsContainerNode.frame.height - self.actionsContainerNode.frame.height
@@ -1625,7 +1676,9 @@ private final class ContextControllerNode: ViewControllerTracingNode, UIScrollVi
                 if case let .extracted(source) = self.source {
                     if !source.ignoreContentTouches {
                         let contentPoint = self.view.convert(point, to: contentParentNode.contentNode.view)
-                        if let result = contentParentNode.contentNode.hitTest(contentPoint, with: event) {
+                        if let result = contentParentNode.contentNode.customHitTest?(contentPoint) {
+                            return result
+                        } else if let result = contentParentNode.contentNode.hitTest(contentPoint, with: event) {
                             if result is TextSelectionNodeView {
                                 return result
                             } else if contentParentNode.contentRect.contains(contentPoint) {
@@ -1679,22 +1732,27 @@ public protocol ContextReferenceContentSource: class {
 public final class ContextControllerTakeViewInfo {
     public let contentContainingNode: ContextExtractedContentContainingNode
     public let contentAreaInScreenSpace: CGRect
+    public let maskView: UIView?
     
-    public init(contentContainingNode: ContextExtractedContentContainingNode, contentAreaInScreenSpace: CGRect) {
+    public init(contentContainingNode: ContextExtractedContentContainingNode, contentAreaInScreenSpace: CGRect, maskView: UIView? = nil) {
         self.contentContainingNode = contentContainingNode
         self.contentAreaInScreenSpace = contentAreaInScreenSpace
+        self.maskView = maskView
     }
 }
 
 public final class ContextControllerPutBackViewInfo {
     public let contentAreaInScreenSpace: CGRect
+    public let maskView: UIView?
     
-    public init(contentAreaInScreenSpace: CGRect) {
+    public init(contentAreaInScreenSpace: CGRect, maskView: UIView? = nil) {
         self.contentAreaInScreenSpace = contentAreaInScreenSpace
+        self.maskView = maskView
     }
 }
 
 public protocol ContextExtractedContentSource: class {
+    var centerVertically: Bool { get }
     var keepInPlace: Bool { get }
     var ignoreContentTouches: Bool { get }
     var blurBackground: Bool { get }
@@ -1705,6 +1763,10 @@ public protocol ContextExtractedContentSource: class {
 }
 
 public extension ContextExtractedContentSource {
+    var centerVertically: Bool {
+        return false
+    }
+
     var shouldBeDismissed: Signal<Bool, NoError> {
         return .single(false)
     }
@@ -1736,7 +1798,7 @@ public enum ContextContentSource {
     case controller(ContextControllerContentSource)
 }
 
-public final class ContextController: ViewController, StandalonePresentableController {
+public final class ContextController: ViewController, StandalonePresentableController, ContextControllerProtocol {
     private let account: Account
     private var presentationData: PresentationData
     private let source: ContextContentSource
@@ -1762,6 +1824,8 @@ public final class ContextController: ViewController, StandalonePresentableContr
     public var reactionSelected: ((ReactionContextItem.Reaction) -> Void)?
     public var dismissed: (() -> Void)?
     
+    public var useComplexItemsTransitionAnimation = false
+    
     private var shouldBeDismissedDisposable: Disposable?
     
     public init(account: Account, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], recognizer: TapLongTapOrDoubleTapGestureRecognizer? = nil, gesture: ContextGesture? = nil, displayTextSelectionTip: Bool = false) {
diff --git a/submodules/Display/Source/PeekController.swift b/submodules/ContextUI/Sources/PeekController.swift
similarity index 68%
rename from submodules/Display/Source/PeekController.swift
rename to submodules/ContextUI/Sources/PeekController.swift
index 69af3b1505..43d8c9f45f 100644
--- a/submodules/Display/Source/PeekController.swift
+++ b/submodules/ContextUI/Sources/PeekController.swift
@@ -1,6 +1,9 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import TelegramPresentationData
 
 public final class PeekControllerTheme {
     public let isDark: Bool
@@ -20,12 +23,29 @@ public final class PeekControllerTheme {
     }
 }
 
-public final class PeekController: ViewController {
+extension PeekControllerTheme {
+    convenience public init(presentationTheme: PresentationTheme) {
+        let actionSheet = presentationTheme.actionSheet
+        self.init(isDark: actionSheet.backgroundType == .dark, menuBackgroundColor: actionSheet.opaqueItemBackgroundColor, menuItemHighligtedColor: actionSheet.opaqueItemHighlightedBackgroundColor, menuItemSeparatorColor: actionSheet.opaqueItemSeparatorColor, accentColor: actionSheet.controlAccentColor, destructiveColor: actionSheet.destructiveActionTextColor)
+    }
+}
+
+public final class PeekController: ViewController, ContextControllerProtocol {
+    public var useComplexItemsTransitionAnimation: Bool = false
+    
+    public func setItems(_ items: Signal<[ContextMenuItem], NoError>) {
+        
+    }
+    
     private var controllerNode: PeekControllerNode {
         return self.displayNode as! PeekControllerNode
     }
     
-    private let theme: PeekControllerTheme
+    public var contentNode: PeekControllerContentNode & ASDisplayNode {
+        return self.controllerNode.contentNode
+    }
+    
+    private let presentationData: PresentationData
     private let content: PeekControllerContent
     var sourceNode: () -> ASDisplayNode?
     
@@ -33,8 +53,8 @@ public final class PeekController: ViewController {
     
     private var animatedIn = false
     
-    public init(theme: PeekControllerTheme, content: PeekControllerContent, sourceNode: @escaping () -> ASDisplayNode?) {
-        self.theme = theme
+    public init(presentationData: PresentationData, content: PeekControllerContent, sourceNode: @escaping () -> ASDisplayNode?) {
+        self.presentationData = presentationData
         self.content = content
         self.sourceNode = sourceNode
         
@@ -48,7 +68,7 @@ public final class PeekController: ViewController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = PeekControllerNode(theme: self.theme, content: self.content, requestDismiss: { [weak self] in
+        self.displayNode = PeekControllerNode(presentationData: self.presentationData, controller: self, content: self.content, requestDismiss: { [weak self] in
             self?.dismiss()
         })
         self.displayNodeDidLoad()
diff --git a/submodules/Display/Source/PeekControllerContent.swift b/submodules/ContextUI/Sources/PeekControllerContent.swift
similarity index 78%
rename from submodules/Display/Source/PeekControllerContent.swift
rename to submodules/ContextUI/Sources/PeekControllerContent.swift
index c2767e87c6..e1be451d53 100644
--- a/submodules/Display/Source/PeekControllerContent.swift
+++ b/submodules/ContextUI/Sources/PeekControllerContent.swift
@@ -1,21 +1,22 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import Display
 
 public enum PeekControllerContentPresentation {
     case contained
     case freeform
 }
 
-public enum PeerkControllerMenuActivation {
+public enum PeerControllerMenuActivation {
     case drag
     case press
 }
 
 public protocol PeekControllerContent {
     func presentation() -> PeekControllerContentPresentation
-    func menuActivation() -> PeerkControllerMenuActivation
-    func menuItems() -> [PeekControllerMenuItem]
+    func menuActivation() -> PeerControllerMenuActivation
+    func menuItems() -> [ContextMenuItem]
     func node() -> PeekControllerContentNode & ASDisplayNode
     
     func topAccessoryNode() -> ASDisplayNode?
diff --git a/submodules/Display/Source/PeekControllerGestureRecognizer.swift b/submodules/ContextUI/Sources/PeekControllerGestureRecognizer.swift
similarity index 93%
rename from submodules/Display/Source/PeekControllerGestureRecognizer.swift
rename to submodules/ContextUI/Sources/PeekControllerGestureRecognizer.swift
index abaa6c0201..ab4a8a323f 100644
--- a/submodules/Display/Source/PeekControllerGestureRecognizer.swift
+++ b/submodules/ContextUI/Sources/PeekControllerGestureRecognizer.swift
@@ -2,6 +2,7 @@ import Foundation
 import UIKit
 import SwiftSignalKit
 import AsyncDisplayKit
+import Display
 
 private func traceDeceleratingScrollView(_ view: UIView, at point: CGPoint) -> Bool {
     if view.bounds.contains(point), let view = view as? UIScrollView, view.isDecelerating {
@@ -33,7 +34,7 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer {
         }
     }
     
-    private var menuActivation: PeerkControllerMenuActivation?
+    private var menuActivation: PeerControllerMenuActivation?
     private weak var presentedController: PeekController?
     
     public init(contentAtPoint: @escaping (CGPoint) -> Signal<(ASDisplayNode, PeekControllerContent)?, NoError>?, present: @escaping (PeekControllerContent, ASDisplayNode) -> ViewController?, updateContent: @escaping (PeekControllerContent?) -> Void = { _ in }, activateBySingleTap: Bool = false) {
@@ -105,8 +106,8 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer {
                     (presentedController.displayNode as? PeekControllerNode)?.activateMenu()
                 }
                 self.menuActivation = nil
-                self.presentedController = nil
-                self.state = .ended
+//                self.presentedController = nil
+//                self.state = .ended
             }
         }
     }
@@ -136,10 +137,8 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer {
             }
             self.state = .ended
         } else {
-            let velocity = self.velocity(in: self.view)
-            
-            if let presentedController = self.presentedController, presentedController.isNodeLoaded {
-                (presentedController.displayNode as? PeekControllerNode)?.endDraggingWithVelocity(velocity.y)
+            if let presentedController = self.presentedController, presentedController.isNodeLoaded, let location = touches.first?.location(in: presentedController.view) {
+                (presentedController.displayNode as? PeekControllerNode)?.endDragging(location)
                 self.presentedController = nil
                 self.menuActivation = nil
             }
@@ -172,7 +171,12 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer {
         
         if let touch = touches.first, let initialTapLocation = self.tapLocation {
             let touchLocation = touch.location(in: self.view)
-            if let menuActivation = self.menuActivation, let presentedController = self.presentedController {
+            if let presentedController = self.presentedController, self.menuActivation == nil {
+                if presentedController.isNodeLoaded {
+                    let touchLocation = touch.location(in: presentedController.view)
+                    (presentedController.displayNode as? PeekControllerNode)?.applyDraggingOffset(touchLocation)
+                }
+            } else if let menuActivation = self.menuActivation, let presentedController = self.presentedController {
                 switch menuActivation {
                     case .drag:
                         var offset = touchLocation.y - initialTapLocation.y
@@ -181,7 +185,7 @@ public final class PeekControllerGestureRecognizer: UIPanGestureRecognizer {
                         offset = (-((1.0 - (1.0 / (((delta) * 0.55 / (factor)) + 1.0))) * factor)) * (offset < 0.0 ? 1.0 : -1.0)
                         
                         if presentedController.isNodeLoaded {
-                            (presentedController.displayNode as? PeekControllerNode)?.applyDraggingOffset(offset)
+//                            (presentedController.displayNode as? PeekControllerNode)?.applyDraggingOffset(offset)
                         }
                     case .press:
                         if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
diff --git a/submodules/ContextUI/Sources/PeekControllerNode.swift b/submodules/ContextUI/Sources/PeekControllerNode.swift
new file mode 100644
index 0000000000..6ad81cb574
--- /dev/null
+++ b/submodules/ContextUI/Sources/PeekControllerNode.swift
@@ -0,0 +1,351 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramPresentationData
+
+private let animationDurationFactor: Double = 1.0
+
+final class PeekControllerNode: ViewControllerTracingNode {
+    private let requestDismiss: () -> Void
+    
+    private let presentationData: PresentationData
+    private let theme: PeekControllerTheme
+    
+    private weak var controller: PeekController?
+    
+    private let blurView: UIView
+    private let dimNode: ASDisplayNode
+    private let containerBackgroundNode: ASImageNode
+    private let containerNode: ASDisplayNode
+    private let darkDimNode: ASDisplayNode
+    
+    private var validLayout: ContainerViewLayout?
+    
+    private var content: PeekControllerContent
+    var contentNode: PeekControllerContentNode & ASDisplayNode
+    private var contentNodeHasValidLayout = false
+    
+    private var topAccessoryNode: ASDisplayNode?
+
+    private var actionsContainerNode: ContextActionsContainerNode
+    
+    private var hapticFeedback = HapticFeedback()
+
+    private var initialContinueGesturePoint: CGPoint?
+    private var didMoveFromInitialGesturePoint = false
+    private var highlightedActionNode: ContextActionNodeProtocol?
+    
+    init(presentationData: PresentationData, controller: PeekController, content: PeekControllerContent, requestDismiss: @escaping () -> Void) {
+        self.presentationData = presentationData
+        self.requestDismiss = requestDismiss
+        self.theme = PeekControllerTheme(presentationTheme: presentationData.theme)
+        self.controller = controller
+        
+        self.dimNode = ASDisplayNode()
+        self.blurView = UIVisualEffectView(effect: UIBlurEffect(style: self.theme.isDark ? .dark : .light))
+        self.blurView.isUserInteractionEnabled = false
+        
+        self.darkDimNode = ASDisplayNode()
+        self.darkDimNode.alpha = 0.0
+        self.darkDimNode.backgroundColor = presentationData.theme.contextMenu.dimColor
+        self.darkDimNode.isUserInteractionEnabled = false
+        
+        switch content.menuActivation() {
+            case .drag:
+                self.dimNode.backgroundColor = nil
+                self.blurView.alpha = 1.0
+            case .press:
+                self.dimNode.backgroundColor = UIColor(white: self.theme.isDark ? 0.0 : 1.0, alpha: 0.5)
+                self.blurView.alpha = 0.0
+        }
+        
+        self.containerBackgroundNode = ASImageNode()
+        self.containerBackgroundNode.isLayerBacked = true
+        self.containerBackgroundNode.displaysAsynchronously = false
+        
+        self.containerNode = ASDisplayNode()
+        
+        self.content = content
+        self.contentNode = content.node()
+        self.topAccessoryNode = content.topAccessoryNode()
+        
+        var feedbackTapImpl: (() -> Void)?
+        var activatedActionImpl: (() -> Void)?
+        self.actionsContainerNode = ContextActionsContainerNode(presentationData: presentationData, items: content.menuItems(), getController: { [weak controller] in
+            return controller
+        }, actionSelected: { result in
+            activatedActionImpl?()
+        }, feedbackTap: {
+            feedbackTapImpl?()
+        }, displayTextSelectionTip: false, blurBackground: true)
+        self.actionsContainerNode.alpha = 0.0
+
+        super.init()
+        
+        feedbackTapImpl = { [weak self] in
+            self?.hapticFeedback.tap()
+        }
+        
+        if content.presentation() == .freeform {
+            self.containerNode.isUserInteractionEnabled = false
+        } else {
+            self.containerNode.clipsToBounds = true
+            self.containerNode.cornerRadius = 16.0
+        }
+        
+        self.addSubnode(self.dimNode)
+        self.view.addSubview(self.blurView)
+        self.addSubnode(self.darkDimNode)
+        self.containerNode.addSubnode(self.contentNode)
+        
+        self.addSubnode(self.actionsContainerNode)
+        self.addSubnode(self.containerNode)
+        
+        activatedActionImpl = { [weak self] in
+            self?.requestDismiss()
+        }
+        
+        self.hapticFeedback.prepareTap()
+    }
+    
+    deinit {
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimNodeTap(_:))))
+        self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))))
+    }
+    
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.validLayout = layout
+        
+        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        transition.updateFrame(node: self.darkDimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        transition.updateFrame(view: self.blurView, frame: CGRect(origin: CGPoint(), size: layout.size))
+        
+        var layoutInsets = layout.insets(options: [])
+        let containerWidth = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: layout.safeInsets.left)
+       
+        layoutInsets.left = floor((layout.size.width - containerWidth) / 2.0)
+        layoutInsets.right = layoutInsets.left
+        if !layoutInsets.bottom.isZero {
+            layoutInsets.bottom -= 12.0
+        }
+        
+        let maxContainerSize = CGSize(width: layout.size.width - 14.0 * 2.0, height: layout.size.height - layoutInsets.top - layoutInsets.bottom - 90.0)
+        
+        let contentSize = self.contentNode.updateLayout(size: maxContainerSize, transition: self.contentNodeHasValidLayout ? transition : .immediate)
+        if self.contentNodeHasValidLayout {
+            transition.updateFrame(node: self.contentNode, frame: CGRect(origin: CGPoint(), size: contentSize))
+        } else {
+            self.contentNode.frame = CGRect(origin: CGPoint(), size: contentSize)
+        }
+        
+        let actionsSideInset: CGFloat = layout.safeInsets.left + 11.0
+        let actionsSize = self.actionsContainerNode.updateLayout(widthClass: layout.metrics.widthClass, constrainedWidth: layout.size.width - actionsSideInset * 2.0, transition: .immediate)
+        
+        let containerFrame: CGRect
+        let actionsFrame: CGRect
+        if layout.size.width > layout.size.height {
+            if self.actionsContainerNode.alpha.isZero {
+                containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 2.0)), size: contentSize)
+            } else {
+                containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 3.0), y: floor((layout.size.height - contentSize.height) / 2.0)), size: contentSize)
+            }
+            actionsFrame = CGRect(origin: CGPoint(x: containerFrame.maxX + 32.0, y: floor((layout.size.height - actionsSize.height) / 2.0)), size: actionsSize)
+        } else {
+            switch self.content.presentation() {
+                case .contained:
+                    containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 2.0)), size: contentSize)
+                case .freeform:
+                    containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 3.0)), size: contentSize)
+            }
+            actionsFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - actionsSize.width) / 2.0), y: containerFrame.maxY + 32.0), size: actionsSize)
+        }
+        transition.updateFrame(node: self.containerNode, frame: containerFrame)
+        
+        self.actionsContainerNode.updateSize(containerSize: actionsSize, contentSize: actionsSize)
+        transition.updateFrame(node: self.actionsContainerNode, frame: actionsFrame)
+        
+        self.contentNodeHasValidLayout = true
+    }
+    
+    func animateIn(from rect: CGRect) {
+        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+        self.blurView.layer.animateAlpha(from: 0.0, to: self.blurView.alpha, duration: 0.3)
+        
+        let offset = CGPoint(x: rect.midX - self.containerNode.position.x, y: rect.midY - self.containerNode.position.y)
+        self.containerNode.layer.animateSpring(from: NSValue(cgPoint: offset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: 0.4, initialVelocity: 0.0, damping: 110.0, additive: true)
+        self.containerNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.4, initialVelocity: 0.0, damping: 110.0)
+        self.containerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+        
+        if let topAccessoryNode = self.topAccessoryNode {
+            topAccessoryNode.layer.animateSpring(from: NSValue(cgPoint: offset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: 0.4, initialVelocity: 0.0, damping: 110.0, additive: true)
+            topAccessoryNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.4, initialVelocity: 0.0, damping: 110.0)
+            topAccessoryNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+        }
+        
+        if case .press = self.content.menuActivation() {
+            self.hapticFeedback.tap()
+        } else {
+            self.hapticFeedback.impact()
+        }
+    }
+    
+    func animateOut(to rect: CGRect, completion: @escaping () -> Void) {
+        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+        self.blurView.layer.animateAlpha(from: self.blurView.alpha, to: 0.0, duration: 0.25, removeOnCompletion: false)
+        self.darkDimNode.layer.animateAlpha(from: self.darkDimNode.alpha, to: 0.0, duration: 0.2, removeOnCompletion: false)
+        
+        let springDuration: Double = 0.42 * animationDurationFactor
+        let springDamping: CGFloat = 104.0
+        
+        let offset = CGPoint(x: rect.midX - self.containerNode.position.x, y: rect.midY - self.containerNode.position.y)
+        self.containerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint()), to: NSValue(cgPoint: offset), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, additive: true, completion: { _ in
+            completion()
+        })
+        self.containerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+        self.containerNode.layer.animateScale(from: 1.0, to: 0.1, duration: 0.25, removeOnCompletion: false)
+           
+        if !self.actionsContainerNode.alpha.isZero {
+            let actionsOffset = CGPoint(x: rect.midX - self.actionsContainerNode.position.x, y: rect.midY - self.actionsContainerNode.position.y)
+            self.actionsContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2 * animationDurationFactor, removeOnCompletion: false)
+            self.actionsContainerNode.layer.animateSpring(from: 1.0 as NSNumber, to: 0.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping, removeOnCompletion: false)
+            self.actionsContainerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint()), to: NSValue(cgPoint: actionsOffset), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, additive: true)
+        }
+    }
+    
+    @objc func dimNodeTap(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.requestDismiss()
+        }
+    }
+    
+    @objc func panGesture(_ recognizer: UIPanGestureRecognizer) {
+        guard case .drag = self.content.menuActivation() else {
+            return
+        }
+        
+        let location = recognizer.location(in: self.view)
+        switch recognizer.state {
+            case .began:
+                break
+            case .changed:
+                self.applyDraggingOffset(location)
+            case .cancelled, .ended:
+                self.endDragging(location)
+            default:
+                break
+        }
+    }
+    
+    func applyDraggingOffset(_ offset: CGPoint) {
+        let localPoint = offset
+        let initialPoint: CGPoint
+        if let current = self.initialContinueGesturePoint {
+            initialPoint = current
+        } else {
+            initialPoint = localPoint
+            self.initialContinueGesturePoint = localPoint
+        }
+        if !self.actionsContainerNode.alpha.isZero {
+            if !self.didMoveFromInitialGesturePoint {
+                let distance = abs(localPoint.y - initialPoint.y)
+                if distance > 12.0 {
+                    self.didMoveFromInitialGesturePoint = true
+                }
+            }
+            if self.didMoveFromInitialGesturePoint {
+                let actionPoint = self.view.convert(localPoint, to: self.actionsContainerNode.view)
+                let actionNode = self.actionsContainerNode.actionNode(at: actionPoint)
+                if self.highlightedActionNode !== actionNode {
+                    self.highlightedActionNode?.setIsHighlighted(false)
+                    self.highlightedActionNode = actionNode
+                    if let actionNode = actionNode {
+                        actionNode.setIsHighlighted(true)
+                        self.hapticFeedback.tap()
+                    }
+                }
+            }
+        }
+    }
+    
+    func activateMenu() {
+        if self.content.menuItems().isEmpty {
+            return
+        }
+        if case .press = self.content.menuActivation() {
+            self.hapticFeedback.impact()
+        }
+        
+        let springDuration: Double = 0.42 * animationDurationFactor
+        let springDamping: CGFloat = 104.0
+        
+        let previousBlurAlpha = self.blurView.alpha
+        self.blurView.alpha = 1.0
+        self.blurView.layer.animateAlpha(from: previousBlurAlpha, to: self.blurView.alpha, duration: 0.3)
+        
+        let previousDarkDimAlpha = self.darkDimNode.alpha
+        self.darkDimNode.alpha = 1.0
+        self.darkDimNode.layer.animateAlpha(from: previousDarkDimAlpha, to: 1.0, duration: 0.3)
+        
+        self.actionsContainerNode.alpha = 1.0
+        self.actionsContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2 * animationDurationFactor)
+        self.actionsContainerNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+        
+        let localContentSourceFrame = self.containerNode.frame
+        self.actionsContainerNode.layer.animateSpring(from: NSValue(cgPoint: CGPoint(x: localContentSourceFrame.center.x - self.actionsContainerNode.position.x, y: localContentSourceFrame.center.y - self.actionsContainerNode.position.y)), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, additive: true)
+        
+        if let layout = self.validLayout {
+            self.containerLayoutUpdated(layout, transition: .animated(duration: springDuration, curve: .spring))
+        }
+    }
+    
+    func endDragging(_ location: CGPoint) {
+        if self.didMoveFromInitialGesturePoint {
+            if let highlightedActionNode = self.highlightedActionNode {
+                self.highlightedActionNode = nil
+                highlightedActionNode.performAction()
+            }
+        } else if self.actionsContainerNode.alpha.isZero {
+            self.requestDismiss()
+        }
+    }
+    
+    func updateContent(content: PeekControllerContent) {
+        let contentNode = self.contentNode
+        contentNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak contentNode] _ in
+            contentNode?.removeFromSupernode()
+        })
+        contentNode.layer.animateScale(from: 1.0, to: 0.2, duration: 0.15, removeOnCompletion: false)
+        
+        self.content = content
+        self.contentNode = content.node()
+        self.containerNode.addSubnode(self.contentNode)
+        self.contentNodeHasValidLayout = false
+        
+        let previousActionsContainerNode = self.actionsContainerNode
+        self.actionsContainerNode = ContextActionsContainerNode(presentationData: self.presentationData, items: content.menuItems(), getController: { [weak self] in
+            return self?.controller
+        }, actionSelected: { [weak self] result in
+            self?.requestDismiss()
+        }, feedbackTap: { [weak self] in
+            self?.hapticFeedback.tap()
+        }, displayTextSelectionTip: false, blurBackground: true)
+        self.actionsContainerNode.alpha = 0.0
+        self.insertSubnode(self.actionsContainerNode, aboveSubnode: previousActionsContainerNode)
+        previousActionsContainerNode.removeFromSupernode()
+        
+        self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+        self.contentNode.layer.animateSpring(from: 0.35 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.5)
+        
+        if let layout = self.validLayout {
+            self.containerLayoutUpdated(layout, transition: .animated(duration: 0.15, curve: .easeInOut))
+        }
+        
+        self.hapticFeedback.tap()
+    }
+}
diff --git a/submodules/ContextUI/Sources/PinchController.swift b/submodules/ContextUI/Sources/PinchController.swift
new file mode 100644
index 0000000000..473031f90a
--- /dev/null
+++ b/submodules/ContextUI/Sources/PinchController.swift
@@ -0,0 +1,489 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramPresentationData
+import TextSelectionNode
+import ReactionSelectionNode
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+
+private func convertFrame(_ frame: CGRect, from fromView: UIView, to toView: UIView) -> CGRect {
+    let sourceWindowFrame = fromView.convert(frame, to: nil)
+    var targetWindowFrame = toView.convert(sourceWindowFrame, from: nil)
+
+    if let fromWindow = fromView.window, let toWindow = toView.window {
+        targetWindowFrame.origin.x += toWindow.bounds.width - fromWindow.bounds.width
+    }
+    return targetWindowFrame
+}
+
+final class PinchSourceGesture: UIPinchGestureRecognizer {
+    private final class Target {
+        var updated: (() -> Void)?
+
+        @objc func onGesture(_ gesture: UIPinchGestureRecognizer) {
+            self.updated?()
+        }
+    }
+
+    private let target: Target
+
+    private(set) var currentTransform: (CGFloat, CGPoint, CGPoint)?
+
+    var began: (() -> Void)?
+    var updated: ((CGFloat, CGPoint, CGPoint) -> Void)?
+    var ended: (() -> Void)?
+
+    private var initialLocation: CGPoint?
+    private var pinchLocation = CGPoint()
+    private var currentOffset = CGPoint()
+
+    private var currentNumberOfTouches = 0
+
+    init() {
+        self.target = Target()
+
+        super.init(target: self.target, action: #selector(self.target.onGesture(_:)))
+
+        self.target.updated = { [weak self] in
+            self?.gestureUpdated()
+        }
+    }
+
+    override func reset() {
+        super.reset()
+
+        self.currentNumberOfTouches = 0
+        self.initialLocation = nil
+    }
+
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesBegan(touches, with: event)
+
+        //self.currentTouches.formUnion(touches)
+    }
+
+    override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesEnded(touches, with: event)
+    }
+
+    override func touchesCancelled(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesCancelled(touches, with: event)
+    }
+
+    override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
+        super.touchesMoved(touches, with: event)
+    }
+
+    private func gestureUpdated() {
+        switch self.state {
+        case .began:
+            self.currentOffset = CGPoint()
+
+            let pinchLocation = self.location(in: self.view)
+            self.pinchLocation = pinchLocation
+            self.initialLocation = pinchLocation
+            let scale = max(1.0, self.scale)
+            self.currentTransform = (scale, self.pinchLocation, self.currentOffset)
+
+            self.currentNumberOfTouches = self.numberOfTouches
+
+            self.began?()
+        case .changed:
+            let locationSum = self.location(in: self.view)
+
+            if self.numberOfTouches < 2 && self.currentNumberOfTouches >= 2 {
+                self.initialLocation = CGPoint(x: locationSum.x - self.currentOffset.x, y: locationSum.y - self.currentOffset.y)
+            }
+            self.currentNumberOfTouches = self.numberOfTouches
+
+            if let initialLocation = self.initialLocation {
+                self.currentOffset = CGPoint(x: locationSum.x - initialLocation.x, y: locationSum.y - initialLocation.y)
+            }
+            if let (scale, pinchLocation, _) = self.currentTransform {
+                self.currentTransform = (scale, pinchLocation, self.currentOffset)
+                self.updated?(scale, pinchLocation, self.currentOffset)
+            }
+
+            let scale = max(1.0, self.scale)
+            self.currentTransform = (scale, self.pinchLocation, self.currentOffset)
+            self.updated?(scale, self.pinchLocation, self.currentOffset)
+        case .ended, .cancelled:
+            self.ended?()
+        default:
+            break
+        }
+    }
+}
+
+private func cancelContextGestures(node: ASDisplayNode) {
+    if let node = node as? ContextControllerSourceNode {
+        node.cancelGesture()
+    }
+
+    if let supernode = node.supernode {
+        cancelContextGestures(node: supernode)
+    }
+}
+
+private func cancelContextGestures(view: UIView) {
+    if let gestureRecognizers = view.gestureRecognizers {
+        for recognizer in gestureRecognizers {
+            if let recognizer = recognizer as? InteractiveTransitionGestureRecognizer {
+                recognizer.cancel()
+            } else if let recognizer = recognizer as? WindowPanRecognizer {
+                recognizer.cancel()
+            }
+        }
+    }
+
+    if let superview = view.superview {
+        cancelContextGestures(view: superview)
+    }
+}
+
+public final class PinchSourceContainerNode: ASDisplayNode, UIGestureRecognizerDelegate {
+    public let contentNode: ASDisplayNode
+    public var contentRect: CGRect = CGRect()
+    private(set) var naturalContentFrame: CGRect?
+
+    fileprivate let gesture: PinchSourceGesture
+    fileprivate var panGesture: UIPanGestureRecognizer?
+
+    public var isPinchGestureEnabled: Bool = true {
+        didSet {
+            if self.isPinchGestureEnabled != oldValue {
+                self.gesture.isEnabled = self.isPinchGestureEnabled
+            }
+        }
+    }
+
+    public var maxPinchScale: CGFloat = 10.0
+
+    private var isActive: Bool = false
+
+    public var activate: ((PinchSourceContainerNode) -> Void)?
+    public var scaleUpdated: ((CGFloat, ContainedViewLayoutTransition) -> Void)?
+    public var animatedOut: (() -> Void)?
+    var deactivate: (() -> Void)?
+    public var deactivated: (() -> Void)?
+    var updated: ((CGFloat, CGPoint, CGPoint) -> Void)?
+
+    override public init() {
+        self.gesture = PinchSourceGesture()
+        self.contentNode = ASDisplayNode()
+
+        super.init()
+
+        self.addSubnode(self.contentNode)
+
+        self.gesture.began = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            cancelContextGestures(node: strongSelf)
+            cancelContextGestures(view: strongSelf.view)
+            strongSelf.isActive = true
+
+            strongSelf.activate?(strongSelf)
+        }
+
+        self.gesture.ended = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+
+            strongSelf.isActive = false
+            strongSelf.deactivate?()
+            strongSelf.deactivated?()
+        }
+
+        self.gesture.updated = { [weak self] scale, pinchLocation, offset in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.updated?(min(scale, strongSelf.maxPinchScale), pinchLocation, offset)
+            strongSelf.scaleUpdated?(min(scale, strongSelf.maxPinchScale), .immediate)
+        }
+    }
+
+    override public func didLoad() {
+        super.didLoad()
+
+        self.view.addGestureRecognizer(self.gesture)
+        self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in
+            guard let strongSelf = self else {
+                return false
+            }
+            return strongSelf.isActive
+        }
+    }
+
+    @objc private func panGestureRecognized(_ recognizer: UIPanGestureRecognizer) {
+    }
+
+    public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return false
+    }
+
+    public func update(size: CGSize, transition: ContainedViewLayoutTransition) {
+        let contentFrame = CGRect(origin: CGPoint(), size: size)
+        self.naturalContentFrame = contentFrame
+        if !self.isActive {
+            transition.updateFrame(node: self.contentNode, frame: contentFrame)
+        }
+    }
+
+    func restoreToNaturalSize() {
+        guard let naturalContentFrame = self.naturalContentFrame else {
+            return
+        }
+        self.contentNode.frame = naturalContentFrame
+    }
+}
+
+private final class PinchControllerNode: ViewControllerTracingNode {
+    private weak var controller: PinchController?
+
+    private var initialSourceFrame: CGRect?
+
+    private let clippingNode: ASDisplayNode
+    private let scrollingContainer: ASDisplayNode
+
+    private let sourceNode: PinchSourceContainerNode
+    private let getContentAreaInScreenSpace: () -> CGRect
+
+    private let dimNode: ASDisplayNode
+
+    private var validLayout: ContainerViewLayout?
+    private var isAnimatingOut: Bool = false
+
+    private var hapticFeedback: HapticFeedback?
+
+    init(controller: PinchController, sourceNode: PinchSourceContainerNode, getContentAreaInScreenSpace: @escaping () -> CGRect) {
+        self.controller = controller
+        self.sourceNode = sourceNode
+        self.getContentAreaInScreenSpace = getContentAreaInScreenSpace
+
+        self.dimNode = ASDisplayNode()
+        self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
+        self.dimNode.alpha = 0.0
+
+        self.clippingNode = ASDisplayNode()
+        self.clippingNode.clipsToBounds = true
+
+        self.scrollingContainer = ASDisplayNode()
+
+        super.init()
+
+        self.addSubnode(self.dimNode)
+        self.addSubnode(self.clippingNode)
+        self.clippingNode.addSubnode(self.scrollingContainer)
+
+        self.sourceNode.deactivate = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.controller?.dismiss()
+        }
+
+        self.sourceNode.updated = { [weak self] scale, pinchLocation, offset in
+            guard let strongSelf = self, let initialSourceFrame = strongSelf.initialSourceFrame else {
+                return
+            }
+            strongSelf.dimNode.alpha = max(0.0, min(1.0, scale - 1.0))
+
+            let pinchOffset = CGPoint(
+                x: pinchLocation.x - initialSourceFrame.width / 2.0,
+                y: pinchLocation.y - initialSourceFrame.height / 2.0
+            )
+
+            var transform = CATransform3DIdentity
+            transform = CATransform3DTranslate(transform, offset.x - pinchOffset.x * (scale - 1.0), offset.y - pinchOffset.y * (scale - 1.0), 0.0)
+            transform = CATransform3DScale(transform, scale, scale, 0.0)
+
+            strongSelf.sourceNode.contentNode.transform = transform
+        }
+    }
+
+    deinit {
+    }
+
+    override func didLoad() {
+        super.didLoad()
+    }
+
+    func updateLayout(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition, previousActionsContainerNode: ContextActionsContainerNode?) {
+        if self.isAnimatingOut {
+            return
+        }
+
+        self.validLayout = layout
+
+        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        transition.updateFrame(node: self.clippingNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+    }
+
+    func animateIn() {
+        let convertedFrame = convertFrame(self.sourceNode.bounds, from: self.sourceNode.view, to: self.view)
+        self.sourceNode.contentNode.frame = convertedFrame
+        self.initialSourceFrame = convertedFrame
+        self.scrollingContainer.addSubnode(self.sourceNode.contentNode)
+
+        var updatedContentAreaInScreenSpace = self.getContentAreaInScreenSpace()
+        updatedContentAreaInScreenSpace.origin.x = 0.0
+        updatedContentAreaInScreenSpace.size.width = self.bounds.width
+
+        self.clippingNode.layer.animateFrame(from: updatedContentAreaInScreenSpace, to: self.clippingNode.frame, duration: 0.18 * 1.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue)
+        self.clippingNode.layer.animateBoundsOriginYAdditive(from: updatedContentAreaInScreenSpace.minY, to: 0.0, duration: 0.18 * 1.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue)
+    }
+
+    func animateOut(completion: @escaping () -> Void) {
+        self.isAnimatingOut = true
+
+        let performCompletion: () -> Void = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+
+            strongSelf.isAnimatingOut = false
+
+            strongSelf.sourceNode.restoreToNaturalSize()
+            strongSelf.sourceNode.addSubnode(strongSelf.sourceNode.contentNode)
+
+            strongSelf.sourceNode.animatedOut?()
+
+            completion()
+        }
+
+        let convertedFrame = convertFrame(self.sourceNode.bounds, from: self.sourceNode.view, to: self.view)
+        self.sourceNode.contentNode.frame = convertedFrame
+        self.initialSourceFrame = convertedFrame
+
+        if let (scale, pinchLocation, offset) = self.sourceNode.gesture.currentTransform, let initialSourceFrame = self.initialSourceFrame {
+            let duration = 0.3
+            let transitionCurve: ContainedViewLayoutTransitionCurve = .easeInOut
+
+            var updatedContentAreaInScreenSpace = self.getContentAreaInScreenSpace()
+            updatedContentAreaInScreenSpace.origin.x = 0.0
+            updatedContentAreaInScreenSpace.size.width = self.bounds.width
+
+            self.clippingNode.layer.animateFrame(from: self.clippingNode.frame, to: updatedContentAreaInScreenSpace, duration: duration * 1.0, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false)
+            self.clippingNode.layer.animateBoundsOriginYAdditive(from: 0.0, to: updatedContentAreaInScreenSpace.minY, duration: duration * 1.0, timingFunction: transitionCurve.timingFunction, removeOnCompletion: false)
+
+            let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: .spring)
+            if self.hapticFeedback == nil {
+                self.hapticFeedback = HapticFeedback()
+            }
+            self.hapticFeedback?.prepareImpact(.light)
+            self.hapticFeedback?.impact(.light)
+
+            self.sourceNode.scaleUpdated?(1.0, transition)
+
+            let pinchOffset = CGPoint(
+                x: pinchLocation.x - initialSourceFrame.width / 2.0,
+                y: pinchLocation.y - initialSourceFrame.height / 2.0
+            )
+
+            var transform = CATransform3DIdentity
+            transform = CATransform3DScale(transform, scale, scale, 0.0)
+
+            self.sourceNode.contentNode.transform = CATransform3DIdentity
+            self.sourceNode.contentNode.position = CGPoint(x: initialSourceFrame.midX, y: initialSourceFrame.midY)
+            self.sourceNode.contentNode.layer.animateSpring(from: scale as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: duration * 1.2, damping: 110.0)
+            self.sourceNode.contentNode.layer.animatePosition(from: CGPoint(x: offset.x - pinchOffset.x * (scale - 1.0), y: offset.y - pinchOffset.y * (scale - 1.0)), to: CGPoint(), duration: duration, timingFunction: kCAMediaTimingFunctionSpring, additive: true, force: true, completion: { _ in
+                performCompletion()
+            })
+
+            let dimNodeTransition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: transitionCurve)
+            dimNodeTransition.updateAlpha(node: self.dimNode, alpha: 0.0)
+        } else {
+            performCompletion()
+        }
+    }
+
+    func addRelativeContentOffset(_ offset: CGPoint, transition: ContainedViewLayoutTransition) {
+        if self.isAnimatingOut {
+            self.scrollingContainer.bounds = self.scrollingContainer.bounds.offsetBy(dx: 0.0, dy: offset.y)
+            transition.animateOffsetAdditive(node: self.scrollingContainer, offset: -offset.y)
+        }
+    }
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return nil
+    }
+}
+
+public final class PinchController: ViewController, StandalonePresentableController {
+    private let _ready = Promise<Bool>()
+    override public var ready: Promise<Bool> {
+        return self._ready
+    }
+
+    private let sourceNode: PinchSourceContainerNode
+    private let getContentAreaInScreenSpace: () -> CGRect
+
+    private var wasDismissed = false
+
+    private var controllerNode: PinchControllerNode {
+        return self.displayNode as! PinchControllerNode
+    }
+
+    public init(sourceNode: PinchSourceContainerNode, getContentAreaInScreenSpace: @escaping () -> CGRect) {
+        self.sourceNode = sourceNode
+        self.getContentAreaInScreenSpace = getContentAreaInScreenSpace
+
+        super.init(navigationBarPresentationData: nil)
+
+        self.statusBar.statusBarStyle = .Ignore
+
+        self.lockOrientation = true
+        self.blocksBackgroundWhenInOverlay = true
+    }
+
+    required init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+    }
+
+    override public func loadDisplayNode() {
+        self.displayNode = PinchControllerNode(controller: self, sourceNode: self.sourceNode, getContentAreaInScreenSpace: self.getContentAreaInScreenSpace)
+
+        self.displayNodeDidLoad()
+
+        self._ready.set(.single(true))
+    }
+
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        super.containerLayoutUpdated(layout, transition: transition)
+
+        self.controllerNode.updateLayout(layout: layout, transition: transition, previousActionsContainerNode: nil)
+    }
+
+    override public func viewDidAppear(_ animated: Bool) {
+        if self.ignoreAppearanceMethodInvocations() {
+            return
+        }
+        super.viewDidAppear(animated)
+
+        self.controllerNode.animateIn()
+    }
+
+    override public func dismiss(completion: (() -> Void)? = nil) {
+        if !self.wasDismissed {
+            self.wasDismissed = true
+            self.controllerNode.animateOut(completion: { [weak self] in
+                self?.presentingViewController?.dismiss(animated: false, completion: nil)
+                completion?()
+            })
+        }
+    }
+
+    public func addRelativeContentOffset(_ offset: CGPoint, transition: ContainedViewLayoutTransition) {
+        self.controllerNode.addRelativeContentOffset(offset, transition: transition)
+    }
+}
diff --git a/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.swift b/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.swift
index 2fd165435e..3e6872815e 100644
--- a/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.swift
+++ b/submodules/CounterContollerTitleView/Sources/CounterContollerTitleView.swift
@@ -22,7 +22,7 @@ public final class CounterContollerTitleView: UIView {
     public var title: CounterContollerTitle = CounterContollerTitle(title: "", counter: "") {
         didSet {
             if self.title != oldValue {
-                self.titleNode.attributedText = NSAttributedString(string: self.title.title, font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
+                self.titleNode.attributedText = NSAttributedString(string: self.title.title, font: Font.semibold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
                 self.subtitleNode.attributedText = NSAttributedString(string: self.title.counter, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)
                 
                 self.accessibilityLabel = self.title.title
diff --git a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift
index 653cf32759..a71f96627e 100644
--- a/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift
+++ b/submodules/CountrySelectionUI/Sources/AuthorizationSequenceCountrySelectionController.swift
@@ -69,8 +69,8 @@ private func loadCountryCodes() -> [Country] {
 private var countryCodes: [Country] = loadCountryCodes()
 private var countryCodesByPrefix: [String: (Country, Country.CountryCode)] = [:]
 
-public func loadServerCountryCodes(accountManager: AccountManager, network: Network, completion: @escaping () -> Void) {
-    let _ = (getCountriesList(accountManager: accountManager, network: network, langCode: nil)
+public func loadServerCountryCodes(accountManager: AccountManager, engine: TelegramEngineUnauthorized, completion: @escaping () -> Void) {
+    let _ = (engine.localization.getCountriesList(accountManager: accountManager, langCode: nil)
     |> deliverOnMainQueue).start(next: { countries in
         countryCodes = countries
         
@@ -93,6 +93,30 @@ public func loadServerCountryCodes(accountManager: AccountManager, network: Netw
     })
 }
 
+public func loadServerCountryCodes(accountManager: AccountManager, engine: TelegramEngine, completion: @escaping () -> Void) {
+    let _ = (engine.localization.getCountriesList(accountManager: accountManager, langCode: nil)
+    |> deliverOnMainQueue).start(next: { countries in
+        countryCodes = countries
+
+        var countriesByPrefix: [String: (Country, Country.CountryCode)] = [:]
+        for country in countries {
+            for code in country.countryCodes {
+                if !code.prefixes.isEmpty {
+                    for prefix in code.prefixes {
+                        countriesByPrefix["\(code.code)\(prefix)"] = (country, code)
+                    }
+                } else {
+                    countriesByPrefix[code.code] = (country, code)
+                }
+            }
+        }
+        countryCodesByPrefix = countriesByPrefix
+        Queue.mainQueue().async {
+            completion()
+        }
+    })
+}
+
 private final class AuthorizationSequenceCountrySelectionNavigationContentNode: NavigationBarContentNode {
     private let theme: PresentationTheme
     private let strings: PresentationStrings
@@ -315,7 +339,7 @@ public final class AuthorizationSequenceCountrySelectionController: ViewControll
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func cancelPressed() {
diff --git a/submodules/DatePickerNode/Sources/DatePickerNode.swift b/submodules/DatePickerNode/Sources/DatePickerNode.swift
index 9f1c168462..6e9a596c78 100644
--- a/submodules/DatePickerNode/Sources/DatePickerNode.swift
+++ b/submodules/DatePickerNode/Sources/DatePickerNode.swift
@@ -68,7 +68,7 @@ private let upperLimitDate = Date(timeIntervalSince1970: Double(Int32.max - 1))
 private let controlFont = Font.regular(17.0)
 private let dayFont = Font.regular(13.0)
 private let dateFont = Font.with(size: 17.0, design: .regular, traits: .monospacedNumbers)
-private let selectedDateFont = Font.with(size: 17.0, design: .regular, traits: [.bold, .monospacedNumbers])
+private let selectedDateFont = Font.with(size: 17.0, design: .regular, weight: .bold, traits: .monospacedNumbers)
 
 private var calendar: Calendar = {
     var calendar = Calendar(identifier: .gregorian)
diff --git a/submodules/DebugSettingsUI/BUILD b/submodules/DebugSettingsUI/BUILD
new file mode 100644
index 0000000000..21c301e2de
--- /dev/null
+++ b/submodules/DebugSettingsUI/BUILD
@@ -0,0 +1,27 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "DebugSettingsUI",
+    module_name = "DebugSettingsUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/MtProtoKit:MtProtoKit",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/OverlayStatusController:OverlayStatusController",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SettingsUI/Sources/DebugAccountsController.swift b/submodules/DebugSettingsUI/Sources/DebugAccountsController.swift
similarity index 100%
rename from submodules/SettingsUI/Sources/DebugAccountsController.swift
rename to submodules/DebugSettingsUI/Sources/DebugAccountsController.swift
diff --git a/submodules/SettingsUI/Sources/DebugController.swift b/submodules/DebugSettingsUI/Sources/DebugController.swift
similarity index 86%
rename from submodules/SettingsUI/Sources/DebugController.swift
rename to submodules/DebugSettingsUI/Sources/DebugController.swift
index 9882fcd31b..8a796df36a 100644
--- a/submodules/SettingsUI/Sources/DebugController.swift
+++ b/submodules/DebugSettingsUI/Sources/DebugController.swift
@@ -13,7 +13,7 @@ import ItemListUI
 import PresentationDataUtils
 import OverlayStatusController
 import AccountContext
-import TelegramCallsUI
+import AppBundle
 
 @objc private final class DebugControllerMailComposeDelegate: NSObject, MFMailComposeViewControllerDelegate {
     public func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
@@ -28,18 +28,21 @@ private final class DebugControllerArguments {
     let presentController: (ViewController, ViewControllerPresentationArguments?) -> Void
     let pushController: (ViewController) -> Void
     let getRootController: () -> UIViewController?
+    let getNavigationController: () -> NavigationController?
     
-    init(sharedContext: SharedAccountContext, context: AccountContext?, mailComposeDelegate: DebugControllerMailComposeDelegate, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping (ViewController) -> Void, getRootController: @escaping () -> UIViewController?) {
+    init(sharedContext: SharedAccountContext, context: AccountContext?, mailComposeDelegate: DebugControllerMailComposeDelegate, presentController: @escaping (ViewController, ViewControllerPresentationArguments?) -> Void, pushController: @escaping (ViewController) -> Void, getRootController: @escaping () -> UIViewController?, getNavigationController: @escaping () -> NavigationController?) {
         self.sharedContext = sharedContext
         self.context = context
         self.mailComposeDelegate = mailComposeDelegate
         self.presentController = presentController
         self.pushController = pushController
         self.getRootController = getRootController
+        self.getNavigationController = getNavigationController
     }
 }
 
 private enum DebugControllerSection: Int32 {
+    case sticker
     case logs
     case logging
     case experiments
@@ -49,6 +52,7 @@ private enum DebugControllerSection: Int32 {
 }
 
 private enum DebugControllerEntry: ItemListNodeEntry {
+    case testStickerImport(PresentationTheme)
     case sendLogs(PresentationTheme)
     case sendOneLog(PresentationTheme)
     case sendShareLogs
@@ -63,7 +67,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     case skipReadHistory(PresentationTheme, Bool)
     case crashOnSlowQueries(PresentationTheme, Bool)
     case clearTips(PresentationTheme)
-    case reimport(PresentationTheme)
+    case crash(PresentationTheme)
     case resetData(PresentationTheme)
     case resetDatabase(PresentationTheme)
     case resetDatabaseAndCache(PresentationTheme)
@@ -73,8 +77,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     case optimizeDatabase(PresentationTheme)
     case photoPreview(PresentationTheme, Bool)
     case knockoutWallpaper(PresentationTheme, Bool)
-    case demoAudioStream(Bool)
-    case snapPinListToTop(Bool)
+    case demoVideoChats(Bool)
+    case experimentalCompatibility(Bool)
+    case enableNoiseSuppression(Bool)
     case playerEmbedding(Bool)
     case playlistPlayback(Bool)
     case voiceConference
@@ -86,6 +91,8 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     
     var section: ItemListSectionId {
         switch self {
+        case .testStickerImport:
+            return DebugControllerSection.sticker.rawValue
         case .sendLogs, .sendOneLog, .sendShareLogs, .sendNotificationLogs, .sendCriticalLogs:
             return DebugControllerSection.logs.rawValue
         case .accounts:
@@ -94,7 +101,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
             return DebugControllerSection.logging.rawValue
         case .enableRaiseToSpeak, .keepChatNavigationStack, .skipReadHistory, .crashOnSlowQueries:
             return DebugControllerSection.experiments.rawValue
-        case .clearTips, .reimport, .resetData, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .reindexUnread, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .demoAudioStream, .snapPinListToTop, .playerEmbedding, .playlistPlayback, .voiceConference:
+        case .clearTips, .crash, .resetData, .resetDatabase, .resetDatabaseAndCache, .resetHoles, .reindexUnread, .resetBiometricsData, .optimizeDatabase, .photoPreview, .knockoutWallpaper, .demoVideoChats, .playerEmbedding, .playlistPlayback, .voiceConference, .experimentalCompatibility, .enableNoiseSuppression:
             return DebugControllerSection.experiments.rawValue
         case .preferredVideoCodec:
             return DebugControllerSection.videoExperiments.rawValue
@@ -107,66 +114,70 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     
     var stableId: Int {
         switch self {
-        case .sendLogs:
+        case .testStickerImport:
             return 0
-        case .sendOneLog:
+        case .sendLogs:
             return 1
-        case .sendShareLogs:
+        case .sendOneLog:
             return 2
-        case .sendNotificationLogs:
+        case .sendShareLogs:
             return 3
-        case .sendCriticalLogs:
+        case .sendNotificationLogs:
             return 4
-        case .accounts:
+        case .sendCriticalLogs:
             return 5
-        case .logToFile:
+        case .accounts:
             return 6
-        case .logToConsole:
+        case .logToFile:
             return 7
-        case .redactSensitiveData:
+        case .logToConsole:
             return 8
-        case .enableRaiseToSpeak:
+        case .redactSensitiveData:
             return 9
-        case .keepChatNavigationStack:
+        case .enableRaiseToSpeak:
             return 10
-        case .skipReadHistory:
+        case .keepChatNavigationStack:
             return 11
-        case .crashOnSlowQueries:
+        case .skipReadHistory:
             return 12
-        case .clearTips:
+        case .crashOnSlowQueries:
             return 13
-        case .reimport:
+        case .clearTips:
             return 14
-        case .resetData:
+        case .crash:
             return 15
-        case .resetDatabase:
+        case .resetData:
             return 16
-        case .resetDatabaseAndCache:
+        case .resetDatabase:
             return 17
-        case .resetHoles:
+        case .resetDatabaseAndCache:
             return 18
-        case .reindexUnread:
+        case .resetHoles:
             return 19
-        case .resetBiometricsData:
+        case .reindexUnread:
             return 20
-        case .optimizeDatabase:
+        case .resetBiometricsData:
             return 21
-        case .photoPreview:
+        case .optimizeDatabase:
             return 22
-        case .knockoutWallpaper:
+        case .photoPreview:
             return 23
-        case .demoAudioStream:
+        case .knockoutWallpaper:
             return 24
-        case .snapPinListToTop:
+        case .demoVideoChats:
             return 25
-        case .playerEmbedding:
+        case .experimentalCompatibility:
             return 26
-        case .playlistPlayback:
+        case .enableNoiseSuppression:
             return 27
-        case .voiceConference:
+        case .playerEmbedding:
             return 28
+        case .playlistPlayback:
+            return 29
+        case .voiceConference:
+            return 30
         case let .preferredVideoCodec(index, _, _, _):
-            return 29 + index
+            return 31 + index
         case .disableVideoAspectScaling:
             return 100
         case .enableVoipTcp:
@@ -185,7 +196,22 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! DebugControllerArguments
         switch self {
-        case let .sendLogs(theme):
+        case .testStickerImport:
+            return ItemListActionItem(presentationData: presentationData, title: "Simulate Stickers Import", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
+                guard let context = arguments.context else {
+                    return
+                }
+                if let url = getAppBundle().url(forResource: "importstickers", withExtension: "json"), let data = try? Data(contentsOf: url) {
+                    let dataType = "org.telegram.third-party.stickerset"
+                    if #available(iOS 10.0, *) {
+                        UIPasteboard.general.setItems([[dataType: data]], options: [UIPasteboard.OptionsKey.localOnly: true, UIPasteboard.OptionsKey.expirationDate: NSDate(timeIntervalSinceNow: 60)])
+                    } else {
+                        UIPasteboard.general.setData(data, forPasteboardType: dataType)
+                    }
+                    context.sharedContext.openResolvedUrl(.importStickers, context: context, urlContext: .generic, navigationController: arguments.getNavigationController(), openPeer: { _, _ in }, sendFile: nil, sendSticker: nil, requestMessageActionUrlAuth: nil, joinVoiceChat: nil, present: { c, a in arguments.presentController(c, a as? ViewControllerPresentationArguments) }, dismissInput: {}, contentContext: nil)
+                }
+            })
+        case .sendLogs:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Send Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: {
                 let _ = (Logger.shared.collectLogs()
                 |> deliverOnMainQueue).start(next: { logs in
@@ -194,7 +220,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     
                     var items: [ActionSheetButtonItem] = []
                     
-                    if let context = arguments.context {
+                    if let context = arguments.context, context.sharedContext.applicationBindings.isMainApp {
                         items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
                             
@@ -220,12 +246,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                         }
                                     }
                                     
-                                    let id = arc4random64()
+                                    let id = Int64.random(in: Int64.min ... Int64.max)
                                     let fileResource = LocalFileMediaResource(fileId: id, size: logData.count, isSecretRelated: false)
                                     context.account.postbox.mediaBox.storeResourceData(fileResource.id, data: logData)
                                     
                                     let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: fileResource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: logData.count, attributes: [.FileName(fileName: "Log-iOS-Full.txt")])
-                                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                     
                                     let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [message]).start()
                                 }
@@ -255,7 +281,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     arguments.presentController(actionSheet, nil)
                 })
             })
-        case let .sendOneLog(theme):
+        case .sendOneLog:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Send Latest Logs (Up to 4 MB)", label: "", sectionId: self.section, style: .blocks, action: {
                 let _ = (Logger.shared.collectLogs()
                     |> deliverOnMainQueue).start(next: { logs in
@@ -264,7 +290,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         
                         var items: [ActionSheetButtonItem] = []
                         
-                        if let context = arguments.context {
+                        if let context = arguments.context, context.sharedContext.applicationBindings.isMainApp {
                             items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                                 
@@ -300,12 +326,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                             }
                                         }
                                         
-                                        let id = arc4random64()
+                                        let id = Int64.random(in: Int64.min ... Int64.max)
                                         let fileResource = LocalFileMediaResource(fileId: id, size: logData.count, isSecretRelated: false)
                                         context.account.postbox.mediaBox.storeResourceData(fileResource.id, data: logData)
                                         
                                         let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: fileResource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: logData.count, attributes: [.FileName(fileName: "Log-iOS-Short.txt")])
-                                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                         
                                         let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [message]).start()
                                     }
@@ -337,7 +363,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         arguments.presentController(actionSheet, nil)
                     })
             })
-        case let .sendShareLogs:
+        case .sendShareLogs:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Send Share Logs (Up to 40 MB)", label: "", sectionId: self.section, style: .blocks, action: {
                 let _ = (Logger.shared.collectLogs(prefix: "/share-logs")
                 |> deliverOnMainQueue).start(next: { logs in
@@ -346,7 +372,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     
                     var items: [ActionSheetButtonItem] = []
                     
-                    if let context = arguments.context {
+                    if let context = arguments.context, context.sharedContext.applicationBindings.isMainApp {
                         items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
                             
@@ -372,12 +398,12 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                         }
                                     }
                                     
-                                    let id = arc4random64()
+                                    let id = Int64.random(in: Int64.min ... Int64.max)
                                     let fileResource = LocalFileMediaResource(fileId: id, size: logData.count, isSecretRelated: false)
                                     context.account.postbox.mediaBox.storeResourceData(fileResource.id, data: logData)
                                     
                                     let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: fileResource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: logData.count, attributes: [.FileName(fileName: "Log-iOS-Full.txt")])
-                                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                     
                                     let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [message]).start()
                                 }
@@ -407,7 +433,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     arguments.presentController(actionSheet, nil)
                 })
             })
-        case let .sendNotificationLogs(theme):
+        case .sendNotificationLogs:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Send Notification Logs", label: "", sectionId: self.section, style: .blocks, action: {
                 let _ = (Logger(rootPath: arguments.sharedContext.basePath, basePath: arguments.sharedContext.basePath + "/notificationServiceLogs").collectLogs()
                     |> deliverOnMainQueue).start(next: { logs in
@@ -422,9 +448,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                 strongController.dismiss()
                                 
                                 let messages = logs.map { (name, path) -> EnqueueMessage in
-                                    let id = arc4random64()
+                                    let id = Int64.random(in: Int64.min ... Int64.max)
                                     let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)])
-                                    return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                    return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                 }
                                 let _ = enqueueMessages(account: context.account, peerId: peerId, messages: messages).start()
                             }
@@ -432,7 +458,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         arguments.pushController(controller)
                     })
             })
-        case let .sendCriticalLogs(theme):
+        case .sendCriticalLogs:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Send Critical Logs", label: "", sectionId: self.section, style: .blocks, action: {
                 let _ = (Logger.shared.collectShortLogFiles()
                     |> deliverOnMainQueue).start(next: { logs in
@@ -441,7 +467,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         
                         var items: [ActionSheetButtonItem] = []
                         
-                        if let context = arguments.context {
+                        if let context = arguments.context, context.sharedContext.applicationBindings.isMainApp {
                             items.append(ActionSheetButtonItem(title: "Via Telegram", color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                                 
@@ -453,9 +479,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                                         strongController.dismiss()
                                         
                                         let messages = logs.map { (name, path) -> EnqueueMessage in
-                                            let id = arc4random64()
+                                            let id = Int64.random(in: Int64.min ... Int64.max)
                                             let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)])
-                                            return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                            return .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                         }
                                         let _ = enqueueMessages(account: context.account, peerId: peerId, messages: messages).start()
                                     }
@@ -485,38 +511,38 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         arguments.presentController(actionSheet, nil)
                     })
             })
-        case let .accounts(theme):
+        case .accounts:
             return ItemListDisclosureItem(presentationData: presentationData, title: "Accounts", label: "", sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
                 }
                 arguments.pushController(debugAccountsController(context: context, accountManager: arguments.sharedContext.accountManager))
             })
-        case let .logToFile(theme, value):
+        case let .logToFile(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Log to File", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
                     $0.withUpdatedLogToFile(value)
                 }).start()
             })
-        case let .logToConsole(theme, value):
+        case let .logToConsole(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Log to Console", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
                     $0.withUpdatedLogToConsole(value)
                 }).start()
             })
-        case let .redactSensitiveData(theme, value):
+        case let .redactSensitiveData(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Remove Sensitive Data", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateLoggingSettings(accountManager: arguments.sharedContext.accountManager, {
                     $0.withUpdatedRedactSensitiveData(value)
                 }).start()
             })
-        case let .enableRaiseToSpeak(theme, value):
+        case let .enableRaiseToSpeak(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Enable Raise to Speak", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateMediaInputSettingsInteractively(accountManager: arguments.sharedContext.accountManager, {
                     $0.withUpdatedEnableRaiseToSpeak(value)
                 }).start()
             })
-        case let .keepChatNavigationStack(theme, value):
+        case let .keepChatNavigationStack(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Keep Chat Stack", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
                     var settings = settings
@@ -524,7 +550,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     return settings
                 }).start()
             })
-        case let .skipReadHistory(theme, value):
+        case let .skipReadHistory(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Skip read history", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
                     var settings = settings
@@ -532,7 +558,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     return settings
                 }).start()
             })
-        case let .crashOnSlowQueries(theme, value):
+        case let .crashOnSlowQueries(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Crash when slow", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = updateExperimentalUISettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
                     var settings = settings
@@ -540,7 +566,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     return settings
                 }).start()
             })
-        case let .clearTips(theme):
+        case .clearTips:
             return ItemListActionItem(presentationData: presentationData, title: "Clear Tips", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 let _ = (arguments.sharedContext.accountManager.transaction { transaction -> Void in
                     transaction.clearNotices()
@@ -548,28 +574,18 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                 if let context = arguments.context {
                     let _ = (context.account.postbox.transaction { transaction -> Void in
                         transaction.clearItemCacheCollection(collectionId: Namespaces.CachedItemCollection.cachedPollResults)
-                        unmarkChatListFeaturedFiltersAsSeen(transaction: transaction)
                         
                         transaction.clearItemCacheCollection(collectionId: Namespaces.CachedItemCollection.cachedStickerPacks)
                     }).start()
+
+                    let _ = context.engine.peers.unmarkChatListFeaturedFiltersAsSeen()
                 }
             })
-        case let .reimport(theme):
-            return ItemListActionItem(presentationData: presentationData, title: "Reimport Application Data", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
-                let appGroupName = "group.\(Bundle.main.bundleIdentifier!)"
-                let maybeAppGroupUrl = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: appGroupName)
-                
-                guard let appGroupUrl = maybeAppGroupUrl else {
-                    return
-                }
-                
-                let statusPath = appGroupUrl.path + "/Documents/importcompleted"
-                if FileManager.default.fileExists(atPath: statusPath) {
-                    let _ = try? FileManager.default.removeItem(at: URL(fileURLWithPath: statusPath))
-                    exit(0)
-                }
+        case .crash:
+            return ItemListActionItem(presentationData: presentationData, title: "Crash", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
+                preconditionFailure()
             })
-        case let .resetData(theme):
+        case .resetData:
             return ItemListActionItem(presentationData: presentationData, title: "Reset Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 let presentationData = arguments.sharedContext.currentPresentationData.with { $0 }
                 let actionSheet = ActionSheetController(presentationData: presentationData)
@@ -588,7 +604,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         ])])
                 arguments.presentController(actionSheet, nil)
             })
-        case let .resetDatabase(theme):
+        case .resetDatabase:
             return ItemListActionItem(presentationData: presentationData, title: "Clear Database", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
@@ -611,7 +627,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     ])])
                 arguments.presentController(actionSheet, nil)
             })
-        case let .resetDatabaseAndCache(theme):
+        case .resetDatabaseAndCache:
             return ItemListActionItem(presentationData: presentationData, title: "Clear Database and Cache", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
@@ -634,7 +650,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     ])])
                 arguments.presentController(actionSheet, nil)
             })
-        case let .resetHoles(theme):
+        case .resetHoles:
             return ItemListActionItem(presentationData: presentationData, title: "Reset Holes", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
@@ -649,7 +665,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         controller.dismiss()
                     })
             })
-        case let .reindexUnread(theme):
+        case .reindexUnread:
             return ItemListActionItem(presentationData: presentationData, title: "Reindex Unread Counters", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
@@ -664,13 +680,13 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     controller.dismiss()
                 })
             })
-        case let .resetBiometricsData(theme):
+        case .resetBiometricsData:
             return ItemListActionItem(presentationData: presentationData, title: "Reset Biometrics Data", kind: .destructive, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 let _ = updatePresentationPasscodeSettingsInteractively(accountManager: arguments.sharedContext.accountManager, { settings in
                     return settings.withUpdatedBiometricsDomainState(nil).withUpdatedShareBiometricsDomainState(nil)
                 }).start()
             })
-        case let .optimizeDatabase(theme):
+        case .optimizeDatabase:
             return ItemListActionItem(presentationData: presentationData, title: "Optimize Database", kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                 guard let context = arguments.context else {
                     return
@@ -686,7 +702,7 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                         arguments.presentController(controller, nil)
                     })
             })
-        case let .photoPreview(theme, value):
+        case let .photoPreview(_, value):
             return ItemListSwitchItem(presentationData: presentationData, title: "Media Preview (Updated)", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
                     transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
@@ -706,22 +722,32 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     })
                 }).start()
             })
-        case let .demoAudioStream(value):
-            return ItemListSwitchItem(presentationData: presentationData, title: "Demo Audio Stream", value: value, sectionId: self.section, style: .blocks, updated: { value in
+        case let .demoVideoChats(value):
+            return ItemListSwitchItem(presentationData: presentationData, title: "Demo Video", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
                     transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
                         var settings = settings as? ExperimentalUISettings ?? ExperimentalUISettings.defaultSettings
-                        settings.demoAudioStream = value
+                        settings.demoVideoChats = value
                         return settings
                     })
                 }).start()
             })
-        case let .snapPinListToTop(value):
-            return ItemListSwitchItem(presentationData: presentationData, title: "Pin List Top Edge", value: value, sectionId: self.section, style: .blocks, updated: { value in
+        case let .experimentalCompatibility(value):
+            return ItemListSwitchItem(presentationData: presentationData, title: "Experimental Compatibility", value: value, sectionId: self.section, style: .blocks, updated: { value in
                 let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
                     transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
                         var settings = settings as? ExperimentalUISettings ?? ExperimentalUISettings.defaultSettings
-                        settings.snapPinListToTop = value
+                        settings.experimentalCompatibility = value
+                        return settings
+                    })
+                }).start()
+            })
+        case let .enableNoiseSuppression(value):
+            return ItemListSwitchItem(presentationData: presentationData, title: "Noise Suppression", value: value, sectionId: self.section, style: .blocks, updated: { value in
+                let _ = arguments.sharedContext.accountManager.transaction ({ transaction in
+                    transaction.updateSharedData(ApplicationSpecificSharedDataKeys.experimentalUISettings, { settings in
+                        var settings = settings as? ExperimentalUISettings ?? ExperimentalUISettings.defaultSettings
+                        settings.enableNoiseSuppression = value
                         return settings
                     })
                 }).start()
@@ -782,9 +808,9 @@ private enum DebugControllerEntry: ItemListNodeEntry {
                     })
                 }).start()
             })
-        case let .hostInfo(theme, string):
+        case let .hostInfo(_, string):
             return ItemListTextItem(presentationData: presentationData, text: .plain(string), sectionId: self.section)
-        case let .versionInfo(theme):
+        case .versionInfo:
             let bundle = Bundle.main
             let bundleId = bundle.bundleIdentifier ?? ""
             let bundleVersion = bundle.infoDictionary?["CFBundleShortVersionString"] ?? ""
@@ -794,44 +820,53 @@ private enum DebugControllerEntry: ItemListNodeEntry {
     }
 }
 
-private func debugControllerEntries(presentationData: PresentationData, loggingSettings: LoggingSettings, mediaInputSettings: MediaInputSettings, experimentalSettings: ExperimentalUISettings, networkSettings: NetworkSettings?, hasLegacyAppData: Bool) -> [DebugControllerEntry] {
+private func debugControllerEntries(sharedContext: SharedAccountContext, presentationData: PresentationData, loggingSettings: LoggingSettings, mediaInputSettings: MediaInputSettings, experimentalSettings: ExperimentalUISettings, networkSettings: NetworkSettings?, hasLegacyAppData: Bool) -> [DebugControllerEntry] {
     var entries: [DebugControllerEntry] = []
+
+    let isMainApp = sharedContext.applicationBindings.isMainApp
     
+//    entries.append(.testStickerImport(presentationData.theme))
     entries.append(.sendLogs(presentationData.theme))
     entries.append(.sendOneLog(presentationData.theme))
     entries.append(.sendShareLogs)
     entries.append(.sendNotificationLogs(presentationData.theme))
     entries.append(.sendCriticalLogs(presentationData.theme))
-    entries.append(.accounts(presentationData.theme))
+    if isMainApp {
+        entries.append(.accounts(presentationData.theme))
+    }
     
     entries.append(.logToFile(presentationData.theme, loggingSettings.logToFile))
     entries.append(.logToConsole(presentationData.theme, loggingSettings.logToConsole))
     entries.append(.redactSensitiveData(presentationData.theme, loggingSettings.redactSensitiveData))
-    
-    entries.append(.enableRaiseToSpeak(presentationData.theme, mediaInputSettings.enableRaiseToSpeak))
-    entries.append(.keepChatNavigationStack(presentationData.theme, experimentalSettings.keepChatNavigationStack))
-    #if DEBUG
-    entries.append(.skipReadHistory(presentationData.theme, experimentalSettings.skipReadHistory))
-    #endif
-    entries.append(.crashOnSlowQueries(presentationData.theme, experimentalSettings.crashOnLongQueries))
-    entries.append(.clearTips(presentationData.theme))
-    if hasLegacyAppData {
-        entries.append(.reimport(presentationData.theme))
+
+    if isMainApp {
+        entries.append(.enableRaiseToSpeak(presentationData.theme, mediaInputSettings.enableRaiseToSpeak))
+        entries.append(.keepChatNavigationStack(presentationData.theme, experimentalSettings.keepChatNavigationStack))
+        #if DEBUG
+        entries.append(.skipReadHistory(presentationData.theme, experimentalSettings.skipReadHistory))
+        #endif
     }
+    entries.append(.crashOnSlowQueries(presentationData.theme, experimentalSettings.crashOnLongQueries))
+    if isMainApp {
+        entries.append(.clearTips(presentationData.theme))
+    }
+    entries.append(.crash(presentationData.theme))
     entries.append(.resetData(presentationData.theme))
     entries.append(.resetDatabase(presentationData.theme))
     entries.append(.resetDatabaseAndCache(presentationData.theme))
     entries.append(.resetHoles(presentationData.theme))
-    entries.append(.reindexUnread(presentationData.theme))
+    if isMainApp {
+        entries.append(.reindexUnread(presentationData.theme))
+    }
     entries.append(.optimizeDatabase(presentationData.theme))
-    //entries.append(.photoPreview(presentationData.theme, experimentalSettings.chatListPhotos))
-    entries.append(.knockoutWallpaper(presentationData.theme, experimentalSettings.knockoutWallpaper))
-    entries.append(.demoAudioStream(experimentalSettings.demoAudioStream))
-    entries.append(.snapPinListToTop(experimentalSettings.snapPinListToTop))
-    entries.append(.playerEmbedding(experimentalSettings.playerEmbedding))
-    entries.append(.playlistPlayback(experimentalSettings.playlistPlayback))
-    
-    entries.append(.voiceConference)
+    if isMainApp {
+        entries.append(.knockoutWallpaper(presentationData.theme, experimentalSettings.knockoutWallpaper))
+        entries.append(.demoVideoChats(experimentalSettings.demoVideoChats))
+        entries.append(.experimentalCompatibility(experimentalSettings.experimentalCompatibility))
+        entries.append(.enableNoiseSuppression(experimentalSettings.enableNoiseSuppression))
+        entries.append(.playerEmbedding(experimentalSettings.playerEmbedding))
+        entries.append(.playlistPlayback(experimentalSettings.playlistPlayback))
+    }
     
     let codecs: [(String, String?)] = [
         ("No Preference", nil),
@@ -844,9 +879,11 @@ private func debugControllerEntries(presentationData: PresentationData, loggingS
     for i in 0 ..< codecs.count {
         entries.append(.preferredVideoCodec(i, codecs[i].0, codecs[i].1, experimentalSettings.preferredVideoCodec == codecs[i].1))
     }
-    
-    entries.append(.disableVideoAspectScaling(experimentalSettings.disableVideoAspectScaling))
-    entries.append(.enableVoipTcp(experimentalSettings.enableVoipTcp))
+
+    if isMainApp {
+        entries.append(.disableVideoAspectScaling(experimentalSettings.disableVideoAspectScaling))
+        entries.append(.enableVoipTcp(experimentalSettings.enableVoipTcp))
+    }
 
     if let backupHostOverride = networkSettings?.backupHostOverride {
         entries.append(.hostInfo(presentationData.theme, "Host: \(backupHostOverride)"))
@@ -861,6 +898,7 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
     var pushControllerImpl: ((ViewController) -> Void)?
     var dismissImpl: (() -> Void)?
     var getRootControllerImpl: (() -> UIViewController?)?
+    var getNavigationControllerImpl: (() -> NavigationController?)?
     
     let arguments = DebugControllerArguments(sharedContext: sharedContext, context: context, mailComposeDelegate: DebugControllerMailComposeDelegate(), presentController: { controller, arguments in
         presentControllerImpl?(controller, arguments)
@@ -868,6 +906,8 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
         pushControllerImpl?(controller)
     }, getRootController: {
         return getRootControllerImpl?()
+    }, getNavigationController: {
+        return getNavigationControllerImpl?()
     })
     
     let appGroupName = "group.\(Bundle.main.bundleIdentifier!)"
@@ -915,7 +955,7 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
         }
         
         let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text("Debug"), leftNavigationButton: leftNavigationButton, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back))
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: debugControllerEntries(presentationData: presentationData, loggingSettings: loggingSettings, mediaInputSettings: mediaInputSettings, experimentalSettings: experimentalSettings, networkSettings: networkSettings, hasLegacyAppData: hasLegacyAppData), style: .blocks)
+        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: debugControllerEntries(sharedContext: sharedContext, presentationData: presentationData, loggingSettings: loggingSettings, mediaInputSettings: mediaInputSettings, experimentalSettings: experimentalSettings, networkSettings: networkSettings, hasLegacyAppData: hasLegacyAppData), style: .blocks)
         
         return (controllerState, (listState, arguments))
     }
@@ -934,5 +974,8 @@ public func debugController(sharedContext: SharedAccountContext, context: Accoun
     getRootControllerImpl = { [weak controller] in
         return controller?.view.window?.rootViewController
     }
+    getNavigationControllerImpl = { [weak controller] in
+        return controller?.navigationController as? NavigationController
+    }
     return controller
 }
diff --git a/submodules/DeviceAccess/Sources/DeviceAccess.swift b/submodules/DeviceAccess/Sources/DeviceAccess.swift
index d598849965..9c67ad7c0c 100644
--- a/submodules/DeviceAccess/Sources/DeviceAccess.swift
+++ b/submodules/DeviceAccess/Sources/DeviceAccess.swift
@@ -87,6 +87,10 @@ public final class DeviceAccess {
         return AVAudioSession.sharedInstance().recordPermission == .granted
     }
     
+    public static func isCameraAccessAuthorized() -> Bool {
+        return PGCamera.cameraAuthorizationStatus() == PGCameraAuthorizationStatusAuthorized
+    }
+    
     public static func authorizationStatus(applicationInForeground: Signal<Bool, NoError>? = nil, siriAuthorization: (() -> AccessType)? = nil, subject: DeviceAccessSubject) -> Signal<AccessType, NoError> {
         switch subject {
             case .notifications:
@@ -250,27 +254,31 @@ public final class DeviceAccess {
         }
     }
     
-    public static func authorizeAccess(to subject: DeviceAccessSubject, registerForNotifications: ((@escaping (Bool) -> Void) -> Void)? = nil, requestSiriAuthorization: ((@escaping (Bool) -> Void) -> Void)? = nil, locationManager: LocationManager? = nil, presentationData: PresentationData? = nil, present: @escaping (ViewController, Any?) -> Void = { _, _ in }, openSettings: @escaping () -> Void = { }, displayNotificationFromBackground: @escaping (String) -> Void = { _ in }, _ completion: @escaping (Bool) -> Void = { _ in }) {
+    public static func authorizeAccess(to subject: DeviceAccessSubject, onlyCheck: Bool = false, registerForNotifications: ((@escaping (Bool) -> Void) -> Void)? = nil, requestSiriAuthorization: ((@escaping (Bool) -> Void) -> Void)? = nil, locationManager: LocationManager? = nil, presentationData: PresentationData? = nil, present: @escaping (ViewController, Any?) -> Void = { _, _ in }, openSettings: @escaping () -> Void = { }, displayNotificationFromBackground: @escaping (String) -> Void = { _ in }, _ completion: @escaping (Bool) -> Void = { _ in }) {
             switch subject {
                 case let .camera(cameraSubject):
                     let status = PGCamera.cameraAuthorizationStatus()
                     if status == PGCameraAuthorizationStatusNotDetermined {
-                        AVCaptureDevice.requestAccess(for: AVMediaType.video) { response in
-                            Queue.mainQueue().async {
-                                completion(response)
-                                if !response, let presentationData = presentationData {
-                                    let text: String
-                                    switch cameraSubject {
-                                        case .video:
-                                            text = presentationData.strings.AccessDenied_Camera
-                                        case .videoCall:
-                                            text = presentationData.strings.AccessDenied_VideoCallCamera
+                        if !onlyCheck {
+                            AVCaptureDevice.requestAccess(for: AVMediaType.video) { response in
+                                Queue.mainQueue().async {
+                                    completion(response)
+                                    if !response, let presentationData = presentationData {
+                                        let text: String
+                                        switch cameraSubject {
+                                            case .video:
+                                                text = presentationData.strings.AccessDenied_Camera
+                                            case .videoCall:
+                                                text = presentationData.strings.AccessDenied_VideoCallCamera
+                                        }
+                                        present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: presentationData.strings.AccessDenied_Title, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_NotNow, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.AccessDenied_Settings, action: {
+                                            openSettings()
+                                        })]), nil)
                                     }
-                                    present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: presentationData.strings.AccessDenied_Title, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_NotNow, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.AccessDenied_Settings, action: {
-                                        openSettings()
-                                    })]), nil)
                                 }
                             }
+                        } else {
+                            completion(true)
                         }
                     } else if status == PGCameraAuthorizationStatusRestricted || status == PGCameraAuthorizationStatusDenied, let presentationData = presentationData {
                         let text: String
@@ -353,7 +361,7 @@ public final class DeviceAccess {
                             switch status {
                                 case .restricted, .denied, .notDetermined:
                                     value = false
-                                case .authorized:
+                                case .authorized, .limited:
                                     value = true
                                 @unknown default:
                                     fatalError()
@@ -408,8 +416,6 @@ public final class DeviceAccess {
                                     locationManager?.requestAlwaysAuthorization(completion: { status in
                                         completion(status == .authorizedAlways)
                                     })
-                                default:
-                                    break
                             }
                         @unknown default:
                             fatalError()
diff --git a/submodules/Display/Source/AlertController.swift b/submodules/Display/Source/AlertController.swift
index 7179032570..f57b2359ec 100644
--- a/submodules/Display/Source/AlertController.swift
+++ b/submodules/Display/Source/AlertController.swift
@@ -86,11 +86,15 @@ open class AlertController: ViewController, StandalonePresentableController {
     private let contentNode: AlertContentNode
     private let allowInputInset: Bool
     
+    private weak var existingAlertController: AlertController?
+    
+    public var willDismiss: (() -> Void)?
     public var dismissed: (() -> Void)?
     
-    public init(theme: AlertControllerTheme, contentNode: AlertContentNode, allowInputInset: Bool = true) {
+    public init(theme: AlertControllerTheme, contentNode: AlertContentNode, existingAlertController: AlertController? = nil, allowInputInset: Bool = true) {
         self.theme = theme
         self.contentNode = contentNode
+        self.existingAlertController = existingAlertController
         self.allowInputInset = allowInputInset
         
         super.init(navigationBarPresentationData: nil)
@@ -108,8 +112,11 @@ open class AlertController: ViewController, StandalonePresentableController {
         self.displayNode = AlertControllerNode(contentNode: self.contentNode, theme: self.theme, allowInputInset: self.allowInputInset)
         self.displayNodeDidLoad()
         
+        self.controllerNode.existingAlertControllerNode = self.existingAlertController?.controllerNode
+        
         self.controllerNode.dismiss = { [weak self] in
             if let strongSelf = self, strongSelf.contentNode.dismissOnOutsideTap {
+                strongSelf.willDismiss?()
                 strongSelf.controllerNode.animateOut {
                     self?.dismiss()
                 }
@@ -120,6 +127,9 @@ open class AlertController: ViewController, StandalonePresentableController {
     override open func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
         
+        self.existingAlertController?.dismiss(completion: nil)
+        self.existingAlertController = nil
+        
         self.controllerNode.animateIn()
     }
     
diff --git a/submodules/Display/Source/AlertControllerNode.swift b/submodules/Display/Source/AlertControllerNode.swift
index e532753a68..e2973469aa 100644
--- a/submodules/Display/Source/AlertControllerNode.swift
+++ b/submodules/Display/Source/AlertControllerNode.swift
@@ -3,6 +3,8 @@ import UIKit
 import AsyncDisplayKit
 
 final class AlertControllerNode: ASDisplayNode {
+    var existingAlertControllerNode: AlertControllerNode?
+    
     private let centerDimView: UIImageView
     private let topDimView: UIView
     private let bottomDimView: UIView
@@ -90,18 +92,35 @@ final class AlertControllerNode: ASDisplayNode {
     }
     
     func animateIn() {
-        self.centerDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.topDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.bottomDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.leftDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.rightDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.containerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25, completion: { [weak self] finished in
-            if finished {
-                self?.centerDimView.backgroundColor = nil
-                self?.centerDimView.image = generateStretchableFilledCircleImage(radius: 16.0, color: nil, backgroundColor: UIColor(white: 0.0, alpha: 0.5))
+        if let previousNode = self.existingAlertControllerNode {
+            let transition =  ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring)
+            
+            previousNode.position = previousNode.position.offsetBy(dx: -previousNode.frame.width, dy: 0.0)
+            self.addSubnode(previousNode)
+        
+            let position = self.position
+            self.position = position.offsetBy(dx: self.frame.width, dy: 0.0)
+            transition.animateView {
+                self.position = position
+            } completion: { _ in
+                previousNode.removeFromSupernode()
             }
-        })
-        self.containerNode.layer.animateSpring(from: 0.8 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.5, initialVelocity: 0.0, removeOnCompletion: true, additive: false, completion: nil)
+
+            self.existingAlertControllerNode = nil
+        } else {
+            self.centerDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.topDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.bottomDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.leftDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.rightDimView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.containerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25, completion: { [weak self] finished in
+                if finished {
+                    self?.centerDimView.backgroundColor = nil
+                    self?.centerDimView.image = generateStretchableFilledCircleImage(radius: 16.0, color: nil, backgroundColor: UIColor(white: 0.0, alpha: 0.5))
+                }
+            })
+            self.containerNode.layer.animateSpring(from: 0.8 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.5, initialVelocity: 0.0, removeOnCompletion: true, additive: false, completion: nil)
+        }
     }
     
     func animateOut(completion: @escaping () -> Void) {
diff --git a/submodules/Display/Source/CAAnimationUtils.swift b/submodules/Display/Source/CAAnimationUtils.swift
index 4aecee5b73..9c51d016d1 100644
--- a/submodules/Display/Source/CAAnimationUtils.swift
+++ b/submodules/Display/Source/CAAnimationUtils.swift
@@ -31,6 +31,7 @@ import UIKitRuntimeUtils
 private let completionKey = "CAAnimationUtils_completion"
 
 public let kCAMediaTimingFunctionSpring = "CAAnimationUtilsSpringCurve"
+public let kCAMediaTimingFunctionCustomSpringPrefix = "CAAnimationUtilsSpringCustomCurve"
 
 public extension CAAnimation {
     var completion: ((Bool) -> Void)? {
@@ -52,7 +53,38 @@ public extension CAAnimation {
 
 public extension CALayer {
     func makeAnimation(from: AnyObject, to: AnyObject, keyPath: String, timingFunction: String, duration: Double, delay: Double = 0.0, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) -> CAAnimation {
-        if timingFunction == kCAMediaTimingFunctionSpring {
+        if timingFunction.hasPrefix(kCAMediaTimingFunctionCustomSpringPrefix) {
+            let components = timingFunction.components(separatedBy: "_")
+            let damping = Float(components[1]) ?? 100.0
+            let initialVelocity = Float(components[2]) ?? 0.0
+            
+            let animation = CASpringAnimation(keyPath: keyPath)
+            animation.fromValue = from
+            animation.toValue = to
+            animation.isRemovedOnCompletion = removeOnCompletion
+            animation.fillMode = .forwards
+            if let completion = completion {
+                animation.delegate = CALayerAnimationDelegate(animation: animation, completion: completion)
+            }
+            animation.damping = CGFloat(damping)
+            animation.initialVelocity = CGFloat(initialVelocity)
+            animation.mass = 5.0
+            animation.stiffness = 900.0
+            animation.duration = animation.settlingDuration
+            animation.timingFunction = CAMediaTimingFunction.init(name: .linear)
+            let k = Float(UIView.animationDurationFactor())
+            var speed: Float = 1.0
+            if k != 0 && k != 1 {
+                speed = Float(1.0) / k
+            }
+            animation.speed = speed * Float(animation.duration / duration)
+            animation.isAdditive = additive
+            if !delay.isZero {
+                animation.beginTime = self.convertTime(CACurrentMediaTime(), from: nil) + delay * UIView.animationDurationFactor()
+                animation.fillMode = .both
+            }
+            return animation
+        } else if timingFunction == kCAMediaTimingFunctionSpring {
             let animation = makeSpringAnimation(keyPath)
             animation.fromValue = from
             animation.toValue = to
@@ -72,7 +104,7 @@ public extension CALayer {
             animation.isAdditive = additive
             
             if !delay.isZero {
-                animation.beginTime = CACurrentMediaTime() + delay * UIView.animationDurationFactor()
+                animation.beginTime = self.convertTime(CACurrentMediaTime(), from: nil) + delay * UIView.animationDurationFactor()
                 animation.fillMode = .both
             }
             
@@ -102,7 +134,7 @@ public extension CALayer {
             }
             
             if !delay.isZero {
-                animation.beginTime = CACurrentMediaTime() + delay * UIView.animationDurationFactor()
+                animation.beginTime = self.convertTime(CACurrentMediaTime(), from: nil) + delay * UIView.animationDurationFactor()
                 animation.fillMode = .both
             }
             
@@ -229,6 +261,10 @@ public extension CALayer {
     func animateScale(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) {
         self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "transform.scale", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion)
     }
+
+    func animateScaleX(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "transform.scale.x", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, completion: completion)
+    }
     
     func animateScaleY(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
         self.animate(from: NSNumber(value: Float(from)), to: NSNumber(value: Float(to)), keyPath: "transform.scale.y", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, completion: completion)
@@ -257,6 +293,26 @@ public extension CALayer {
         }
         self.animate(from: NSValue(cgRect: from), to: NSValue(cgRect: to), keyPath: "bounds", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion)
     }
+
+    func animateWidth(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
+        if from == to && !force {
+            if let completion = completion {
+                completion(true)
+            }
+            return
+        }
+        self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.size.width", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion)
+    }
+
+    func animateHeight(from: CGFloat, to: CGFloat, duration: Double, delay: Double = 0.0, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
+        if from == to && !force {
+            if let completion = completion {
+                completion(true)
+            }
+            return
+        }
+        self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.size.height", timingFunction: timingFunction, duration: duration, delay: delay, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: completion)
+    }
     
     func animateBoundsOriginXAdditive(from: CGFloat, to: CGFloat, duration: Double, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
         self.animate(from: from as NSNumber, to: to as NSNumber, keyPath: "bounds.origin.x", timingFunction: timingFunction, duration: duration, mediaTimingFunction: mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion)
@@ -278,7 +334,7 @@ public extension CALayer {
         self.animateKeyframes(values: values.map { NSValue(cgPoint: $0) }, duration: duration, keyPath: "position")
     }
     
-    func animateFrame(from: CGRect, to: CGRect, duration: Double, delay: Double = 0.0, timingFunction: String, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
+    func animateFrame(from: CGRect, to: CGRect, duration: Double, delay: Double = 0.0, timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue, mediaTimingFunction: CAMediaTimingFunction? = nil, removeOnCompletion: Bool = true, additive: Bool = false, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
         if from == to && !force {
             if let completion = completion {
                 completion(true)
diff --git a/submodules/Display/Source/ContainedViewLayoutTransition.swift b/submodules/Display/Source/ContainedViewLayoutTransition.swift
index bfdcc179a1..019a41615b 100644
--- a/submodules/Display/Source/ContainedViewLayoutTransition.swift
+++ b/submodules/Display/Source/ContainedViewLayoutTransition.swift
@@ -2,10 +2,11 @@ import Foundation
 import UIKit
 import AsyncDisplayKit
 
-public enum ContainedViewLayoutTransitionCurve {
+public enum ContainedViewLayoutTransitionCurve: Equatable, Hashable {
     case linear
     case easeInOut
     case spring
+    case customSpring(damping: CGFloat, initialVelocity: CGFloat)
     case custom(Float, Float, Float, Float)
     
     public static var slide: ContainedViewLayoutTransitionCurve {
@@ -13,6 +14,23 @@ public enum ContainedViewLayoutTransitionCurve {
     }
 }
 
+public extension ContainedViewLayoutTransitionCurve {
+    func solve(at offset: CGFloat) -> CGFloat {
+        switch self {
+        case .linear:
+            return offset
+        case .easeInOut:
+            return listViewAnimationCurveEaseInOut(offset)
+        case .spring:
+            return listViewAnimationCurveSystem(offset)
+        case .customSpring:
+            return listViewAnimationCurveSystem(offset)
+        case let .custom(c1x, c1y, c2x, c2y):
+            return bezierPoint(CGFloat(c1x), CGFloat(c1y), CGFloat(c2x), CGFloat(c2y), offset)
+        }
+    }
+}
+
 public extension ContainedViewLayoutTransitionCurve {
     var timingFunction: String {
         switch self {
@@ -22,6 +40,8 @@ public extension ContainedViewLayoutTransitionCurve {
                 return CAMediaTimingFunctionName.easeInEaseOut.rawValue
             case .spring:
                 return kCAMediaTimingFunctionSpring
+            case let .customSpring(damping, initialVelocity):
+                return "\(kCAMediaTimingFunctionCustomSpringPrefix)_\(damping)_\(initialVelocity)"
             case .custom:
                 return CAMediaTimingFunctionName.easeInEaseOut.rawValue
         }
@@ -35,6 +55,8 @@ public extension ContainedViewLayoutTransitionCurve {
                 return nil
             case .spring:
                 return nil
+            case .customSpring:
+                return nil
             case let .custom(p1, p2, p3, p4):
                 return CAMediaTimingFunction(controlPoints: p1, p2, p3, p4)
         }
@@ -49,6 +71,8 @@ public extension ContainedViewLayoutTransitionCurve {
                 return [.curveEaseInOut]
             case .spring:
                 return UIView.AnimationOptions(rawValue: 7 << 16)
+            case .customSpring:
+                return UIView.AnimationOptions(rawValue: 7 << 16)
             case .custom:
                 return []
         }
@@ -167,6 +191,39 @@ public extension ContainedViewLayoutTransition {
         }
     }
     
+    func updateFrameAsPositionAndBounds(layer: CALayer, frame: CGRect, force: Bool = false, beginWithCurrentState: Bool = false, completion: ((Bool) -> Void)? = nil) {
+        if layer.frame.equalTo(frame) && !force {
+            completion?(true)
+        } else {
+            switch self {
+            case .immediate:
+                layer.position = frame.center
+                layer.bounds = CGRect(origin: CGPoint(), size: frame.size)
+                if let completion = completion {
+                    completion(true)
+                }
+            case let .animated(duration, curve):
+                let previousPosition: CGPoint
+                let previousBounds: CGRect
+                if beginWithCurrentState, let presentation = layer.presentation() {
+                    previousPosition = presentation.position
+                    previousBounds = presentation.bounds
+                } else {
+                    previousPosition = layer.position
+                    previousBounds = layer.bounds
+                }
+                layer.position = frame.center
+                layer.bounds = CGRect(origin: CGPoint(), size: frame.size)
+                layer.animateFrame(from:
+                    CGRect(origin: CGPoint(x: previousPosition.x - previousBounds.width / 2.0, y: previousPosition.y - previousBounds.height / 2.0), size: previousBounds.size), to: frame, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, force: force, completion: { result in
+                    if let completion = completion {
+                        completion(result)
+                    }
+                })
+            }
+        }
+    }
+    
     func updateFrameAdditive(node: ASDisplayNode, frame: CGRect, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
         if node.frame.equalTo(frame) && !force {
             completion?(true)
@@ -276,8 +333,8 @@ public extension ContainedViewLayoutTransition {
         }
     }
     
-    func updatePosition(layer: CALayer, position: CGPoint, completion: ((Bool) -> Void)? = nil) {
-        if layer.position.equalTo(position) {
+    func updatePosition(layer: CALayer, position: CGPoint, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
+        if layer.position.equalTo(position) && !force {
             completion?(true)
         } else {
             switch self {
@@ -346,6 +403,21 @@ public extension ContainedViewLayoutTransition {
                 })
         }
     }
+
+    func animateFrame(layer: CALayer, from frame: CGRect, to toFrame: CGRect? = nil, removeOnCompletion: Bool = true, additive: Bool = false, completion: ((Bool) -> Void)? = nil) {
+        switch self {
+            case .immediate:
+                if let completion = completion {
+                    completion(true)
+                }
+            case let .animated(duration, curve):
+                layer.animateFrame(from: frame, to: toFrame ?? layer.frame, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: additive, completion: { result in
+                    if let completion = completion {
+                        completion(result)
+                    }
+                })
+        }
+    }
     
     func animateBounds(layer: CALayer, from bounds: CGRect, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
         switch self {
@@ -361,6 +433,36 @@ public extension ContainedViewLayoutTransition {
                 })
         }
     }
+
+    func animateWidthAdditive(layer: CALayer, value: CGFloat, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        switch self {
+        case .immediate:
+            if let completion = completion {
+                completion(true)
+            }
+        case let .animated(duration, curve):
+            layer.animateWidth(from: value, to: 0.0, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { result in
+                if let completion = completion {
+                    completion(result)
+                }
+            })
+        }
+    }
+
+    func animateHeightAdditive(layer: CALayer, value: CGFloat, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        switch self {
+        case .immediate:
+            if let completion = completion {
+                completion(true)
+            }
+        case let .animated(duration, curve):
+            layer.animateHeight(from: value, to: 0.0, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { result in
+                if let completion = completion {
+                    completion(result)
+                }
+            })
+        }
+    }
     
     func animateOffsetAdditive(node: ASDisplayNode, offset: CGFloat) {
         switch self {
@@ -381,6 +483,17 @@ public extension ContainedViewLayoutTransition {
                 })
         }
     }
+
+    func animateHorizontalOffsetAdditive(layer: CALayer, offset: CGFloat, completion: (() -> Void)? = nil) {
+        switch self {
+            case .immediate:
+                break
+            case let .animated(duration, curve):
+                layer.animateBoundsOriginXAdditive(from: offset, to: 0.0, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, completion: { _ in
+                    completion?()
+                })
+        }
+    }
     
     func animateOffsetAdditive(layer: CALayer, offset: CGFloat, completion: (() -> Void)? = nil) {
         switch self {
@@ -422,18 +535,52 @@ public extension ContainedViewLayoutTransition {
         }
     }
     
-    func animatePositionAdditive(layer: CALayer, offset: CGPoint, to toOffset: CGPoint = CGPoint(), removeOnCompletion: Bool = true, completion: (() -> Void)? = nil) {
+    func animatePositionAdditive(layer: CALayer, offset: CGPoint, to toOffset: CGPoint = CGPoint(), removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
         switch self {
             case .immediate:
-                completion?()
+                completion?(true)
             case let .animated(duration, curve):
-                layer.animatePosition(from: offset, to: toOffset, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { _ in
-                    completion?()
+                layer.animatePosition(from: offset, to: toOffset, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: { result in
+                    completion?(result)
                 })
         }
     }
+
+    func animateContentsRectPositionAdditive(layer: CALayer, offset: CGPoint, removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        switch self {
+        case .immediate:
+            completion?(true)
+        case let .animated(duration, curve):
+            layer.animate(from: NSValue(cgPoint: offset), to: NSValue(cgPoint: CGPoint()), keyPath: "contentsRect.origin", timingFunction: curve.timingFunction, duration: duration, delay: 0.0, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: removeOnCompletion, additive: true, completion: completion)
+        }
+    }
     
-    func updateFrame(view: UIView, frame: CGRect, force: Bool = false, completion: ((Bool) -> Void)? = nil) {
+    func updateFrame(view: UIView, frame: CGRect, force: Bool = false, beginWithCurrentState: Bool = false, delay: Double = 0.0, completion: ((Bool) -> Void)? = nil) {
+        if frame.origin.x.isNaN {
+            return
+        }
+        if frame.origin.y.isNaN {
+            return
+        }
+        if frame.size.width.isNaN {
+            return
+        }
+        if frame.size.width < 0.0 {
+            return
+        }
+        if frame.size.height.isNaN {
+            return
+        }
+        if frame.size.height < 0.0 {
+            return
+        }
+        if !ASIsCGRectValidForLayout(CGRect(origin: CGPoint(), size: frame.size)) {
+            return
+        }
+        if !ASIsCGPositionValidForLayout(frame.origin) {
+            return
+        }
+        
         if view.frame.equalTo(frame) && !force {
             completion?(true)
         } else {
@@ -444,9 +591,14 @@ public extension ContainedViewLayoutTransition {
                     completion(true)
                 }
             case let .animated(duration, curve):
-                let previousFrame = view.frame
+                let previousFrame: CGRect
+                if beginWithCurrentState, let presentation = view.layer.presentation() {
+                    previousFrame = presentation.frame
+                } else {
+                    previousFrame = view.frame
+                }
                 view.frame = frame
-                view.layer.animateFrame(from: previousFrame, to: frame, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, force: force, completion: { result in
+                view.layer.animateFrame(from: previousFrame, to: frame, duration: duration, delay: delay, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, force: force, completion: { result in
                     if let completion = completion {
                         completion(result)
                     }
@@ -454,7 +606,7 @@ public extension ContainedViewLayoutTransition {
             }
         }
     }
-    
+
     func updateFrame(layer: CALayer, frame: CGRect, completion: ((Bool) -> Void)? = nil) {
         if layer.frame.equalTo(frame) {
             completion?(true)
@@ -645,6 +797,52 @@ public extension ContainedViewLayoutTransition {
             })
         }
     }
+
+    func animateTransformScale(node: ASDisplayNode, from fromScale: CGPoint, completion: ((Bool) -> Void)? = nil) {
+        let t = node.layer.transform
+
+        switch self {
+        case .immediate:
+            if let completion = completion {
+                completion(true)
+            }
+        case let .animated(duration, curve):
+            let calculatedFrom: CGPoint
+            let calculatedTo: CGPoint
+
+            calculatedFrom = fromScale
+            calculatedTo = CGPoint(x: 1.0, y: 1.0)
+
+            node.layer.animateScaleX(from: calculatedFrom.x, to: calculatedTo.x, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, completion: { result in
+                if let completion = completion {
+                    completion(result)
+                }
+            })
+            node.layer.animateScaleY(from: calculatedFrom.y, to: calculatedTo.y, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction)
+        }
+    }
+
+    func animateTransformScale(layer: CALayer, from fromScale: CGPoint, completion: ((Bool) -> Void)? = nil) {
+        switch self {
+        case .immediate:
+            if let completion = completion {
+                completion(true)
+            }
+        case let .animated(duration, curve):
+            let calculatedFrom: CGPoint
+            let calculatedTo: CGPoint
+
+            calculatedFrom = fromScale
+            calculatedTo = CGPoint(x: 1.0, y: 1.0)
+
+            layer.animateScaleX(from: calculatedFrom.x, to: calculatedTo.x, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction, completion: { result in
+                if let completion = completion {
+                    completion(result)
+                }
+            })
+            layer.animateScaleY(from: calculatedFrom.y, to: calculatedTo.y, duration: duration, timingFunction: curve.timingFunction, mediaTimingFunction: curve.mediaTimingFunction)
+        }
+    }
     
     func animateTransformScale(view: UIView, from fromScale: CGFloat, completion: ((Bool) -> Void)? = nil) {
         let t = view.layer.transform
@@ -890,7 +1088,12 @@ public extension ContainedViewLayoutTransition {
             completion?(true)
             return
         }
-        let t = node.layer.transform
+
+        self.updateTransformScale(layer: node.layer, scale: scale, completion: completion)
+    }
+
+    func updateTransformScale(layer: CALayer, scale: CGPoint, completion: ((Bool) -> Void)? = nil) {
+        let t = layer.transform
         let currentScaleX = sqrt((t.m11 * t.m11) + (t.m12 * t.m12) + (t.m13 * t.m13))
         var currentScaleY = sqrt((t.m21 * t.m21) + (t.m22 * t.m22) + (t.m23 * t.m23))
         if t.m22 < 0.0 {
@@ -902,16 +1105,16 @@ public extension ContainedViewLayoutTransition {
             }
             return
         }
-        
+
         switch self {
             case .immediate:
-                node.layer.transform = CATransform3DMakeScale(scale.x, scale.y, 1.0)
+                layer.transform = CATransform3DMakeScale(scale.x, scale.y, 1.0)
                 if let completion = completion {
                     completion(true)
                 }
             case let .animated(duration, curve):
-                node.layer.transform = CATransform3DMakeScale(scale.x, scale.y, 1.0)
-                node.layer.animate(from: NSValue(caTransform3D: t), to: NSValue(caTransform3D: node.layer.transform), keyPath: "transform", timingFunction: curve.timingFunction, duration: duration, delay: 0.0, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: true, additive: false, completion: {
+                layer.transform = CATransform3DMakeScale(scale.x, scale.y, 1.0)
+                layer.animate(from: NSValue(caTransform3D: t), to: NSValue(caTransform3D: layer.transform), keyPath: "transform", timingFunction: curve.timingFunction, duration: duration, delay: 0.0, mediaTimingFunction: curve.mediaTimingFunction, removeOnCompletion: true, additive: false, completion: {
                     result in
                     if let completion = completion {
                         completion(result)
@@ -1048,7 +1251,119 @@ public extension ContainedViewLayoutTransition {
     }
 }
 
-#if os(iOS)
+public struct CombinedTransition {
+    public var horizontal: ContainedViewLayoutTransition
+    public var vertical: ContainedViewLayoutTransition
+
+    public var isAnimated: Bool {
+        return self.horizontal.isAnimated || self.vertical.isAnimated
+    }
+
+    public init(horizontal: ContainedViewLayoutTransition, vertical: ContainedViewLayoutTransition) {
+        self.horizontal = horizontal
+        self.vertical = vertical
+    }
+
+    public func animateFrame(layer: CALayer, from fromFrame: CGRect, completion: ((Bool) -> Void)? = nil) {
+        //self.horizontal.animateFrame(layer: layer, from: fromFrame, completion: completion)
+        //return;
+
+        let toFrame = layer.frame
+
+        enum Keys: CaseIterable {
+            case positionX, positionY
+            case sizeWidth, sizeHeight
+        }
+        var remainingKeys = Keys.allCases
+        var completedValue = true
+        let completeKey: (Keys, Bool) -> Void = { key, completed in
+            remainingKeys.removeAll(where: { $0 == key })
+            if !completed {
+                completedValue = false
+            }
+            if remainingKeys.isEmpty {
+                completion?(completedValue)
+            }
+        }
+
+        self.horizontal.animatePositionAdditive(layer: layer, offset: CGPoint(x: fromFrame.midX - toFrame.midX, y: 0.0), completion: { result in
+            completeKey(.positionX, result)
+        })
+        self.vertical.animatePositionAdditive(layer: layer, offset: CGPoint(x: 0.0, y: fromFrame.midY - toFrame.midY), completion: { result in
+            completeKey(.positionY, result)
+        })
+
+        self.horizontal.animateWidthAdditive(layer: layer, value: fromFrame.width - toFrame.width, completion: { result in
+            completeKey(.sizeWidth, result)
+        })
+        self.vertical.animateHeightAdditive(layer: layer, value: fromFrame.height - toFrame.height, completion: { result in
+            completeKey(.sizeHeight, result)
+        })
+    }
+
+    public func updateFrame(layer: CALayer, frame: CGRect, completion: ((Bool) -> Void)? = nil) {
+        let fromFrame = layer.frame
+        layer.frame = frame
+        self.animateFrame(layer: layer, from: fromFrame, completion: completion)
+    }
+
+    public func updateFrame(node: ASDisplayNode, frame: CGRect, completion: ((Bool) -> Void)? = nil) {
+        let fromFrame = node.frame
+        node.frame = frame
+        self.animateFrame(layer: node.layer, from: fromFrame, completion: completion)
+    }
+
+    public func updatePosition(layer: CALayer, position: CGPoint, completion: ((Bool) -> Void)? = nil) {
+        let fromPosition = layer.position
+        layer.position = position
+
+        enum Keys: CaseIterable {
+            case positionX, positionY
+        }
+        var remainingKeys = Keys.allCases
+        var completedValue = true
+        let completeKey: (Keys, Bool) -> Void = { key, completed in
+            remainingKeys.removeAll(where: { $0 == key })
+            if !completed {
+                completedValue = false
+            }
+            if remainingKeys.isEmpty {
+                completion?(completedValue)
+            }
+        }
+
+        self.horizontal.animatePositionAdditive(layer: layer, offset: CGPoint(x: fromPosition.x - position.x, y: 0.0), completion: { result in
+            completeKey(.positionX, result)
+        })
+        self.vertical.animatePositionAdditive(layer: layer, offset: CGPoint(x: 0.0, y: fromPosition.y - position.y), completion: { result in
+            completeKey(.positionY, result)
+        })
+    }
+
+    public func animatePositionAdditive(layer: CALayer, offset: CGPoint, to toOffset: CGPoint = CGPoint(), removeOnCompletion: Bool = true, completion: ((Bool) -> Void)? = nil) {
+        enum Keys: CaseIterable {
+            case positionX, positionY
+        }
+        var remainingKeys = Keys.allCases
+        var completedValue = true
+        let completeKey: (Keys, Bool) -> Void = { key, completed in
+            remainingKeys.removeAll(where: { $0 == key })
+            if !completed {
+                completedValue = false
+            }
+            if remainingKeys.isEmpty {
+                completion?(completedValue)
+            }
+        }
+
+        self.horizontal.animatePositionAdditive(layer: layer, offset: CGPoint(x: offset.x, y: 0.0), to: CGPoint(x: toOffset.x, y: 0.0), completion: { result in
+            completeKey(.positionX, result)
+        })
+        self.vertical.animatePositionAdditive(layer: layer, offset: CGPoint(x: 0.0, y: offset.y), to: CGPoint(x: 0.0, y: toOffset.y), completion: { result in
+            completeKey(.positionY, result)
+        })
+    }
+}
     
 public extension ContainedViewLayoutTransition {
     func animateView(_ f: @escaping () -> Void, completion: ((Bool) -> Void)? = nil) {
@@ -1063,5 +1378,3 @@ public extension ContainedViewLayoutTransition {
         }
     }
 }
-    
-#endif
diff --git a/submodules/Display/Source/ContextContentSourceNode.swift b/submodules/Display/Source/ContextContentSourceNode.swift
index 9553404a3e..5eb8d82223 100644
--- a/submodules/Display/Source/ContextContentSourceNode.swift
+++ b/submodules/Display/Source/ContextContentSourceNode.swift
@@ -11,10 +11,11 @@ public final class ContextExtractedContentContainingNode: ASDisplayNode {
     public var willUpdateIsExtractedToContextPreview: ((Bool, ContainedViewLayoutTransition) -> Void)?
     public var isExtractedToContextPreviewUpdated: ((Bool) -> Void)?
     public var updateAbsoluteRect: ((CGRect, CGSize) -> Void)?
-    public var applyAbsoluteOffset: ((CGFloat, ContainedViewLayoutTransitionCurve, Double) -> Void)?
+    public var applyAbsoluteOffset: ((CGPoint, ContainedViewLayoutTransitionCurve, Double) -> Void)?
     public var applyAbsoluteOffsetSpring: ((CGFloat, Double, CGFloat) -> Void)?
     public var layoutUpdated: ((CGSize) -> Void)?
     public var updateDistractionFreeMode: ((Bool) -> Void)?
+    public var requestDismiss: (() -> Void)?
     
     public override init() {
         self.contentNode = ContextExtractedContentNode()
@@ -23,9 +24,27 @@ public final class ContextExtractedContentContainingNode: ASDisplayNode {
         
         self.addSubnode(self.contentNode)
     }
+
+    public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if self.contentNode.supernode === self {
+            return self.contentNode.hitTest(self.view.convert(point, to: self.contentNode.view), with: event)
+        } else {
+            return nil
+        }
+    }
 }
 
 public final class ContextExtractedContentNode: ASDisplayNode {
+    public var customHitTest: ((CGPoint) -> UIView?)?
+
+    public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let result = self.view.hitTest(point, with: event)
+        if result === self.view {
+            return nil
+        } else {
+            return result
+        }
+    }
 }
 
 public final class ContextControllerContentNode: ASDisplayNode {
diff --git a/submodules/Display/Source/ContextGesture.swift b/submodules/Display/Source/ContextGesture.swift
index 79a767a1a6..542cfeba7f 100644
--- a/submodules/Display/Source/ContextGesture.swift
+++ b/submodules/Display/Source/ContextGesture.swift
@@ -41,6 +41,8 @@ private func cancelOtherGestures(gesture: ContextGesture, view: UIView) {
         for recognizer in gestureRecognizers {
             if let recognizer = recognizer as? ContextGesture, recognizer !== gesture {
                 recognizer.cancel()
+            } else if let recognizer = recognizer as? ListViewTapGestureRecognizer {
+                recognizer.cancel()
             }
         }
     }
diff --git a/submodules/Display/Source/Font.swift b/submodules/Display/Source/Font.swift
index 46787501bf..873a367e5d 100644
--- a/submodules/Display/Source/Font.swift
+++ b/submodules/Display/Source/Font.swift
@@ -20,9 +20,8 @@ public struct Font {
             self.rawValue = 0
         }
         
-        public static let bold = Traits(rawValue: 1 << 0)
-        public static let italic = Traits(rawValue: 1 << 1)
-        public static let monospacedNumbers = Traits(rawValue: 1 << 2)
+        public static let italic = Traits(rawValue: 1 << 0)
+        public static let monospacedNumbers = Traits(rawValue: 1 << 1)
     }
     
     public enum Weight {
@@ -31,15 +30,42 @@ public struct Font {
         case medium
         case semibold
         case bold
+        
+        var isBold: Bool {
+            switch self {
+                case .medium, .semibold, .bold:
+                    return true
+                default:
+                    return false
+            }
+        }
+        
+        var weight: UIFont.Weight {
+            switch self {
+                case .light:
+                    return .light
+                case .medium:
+                    return .medium
+                case .semibold:
+                    return .semibold
+                case .bold:
+                    return .bold
+                default:
+                    return .regular
+            }
+        }
     }
     
     public static func with(size: CGFloat, design: Design = .regular, weight: Weight = .regular, traits: Traits = []) -> UIFont {
         if #available(iOS 13.0, *) {
-            let descriptor = UIFont.systemFont(ofSize: size).fontDescriptor
-            var symbolicTraits = descriptor.symbolicTraits
-            if traits.contains(.bold) {
-                symbolicTraits.insert(.traitBold)
+            let descriptor: UIFontDescriptor
+            if #available(iOS 14.0, *) {
+                descriptor = UIFont.systemFont(ofSize: size).fontDescriptor
+            } else {
+                descriptor = UIFont.systemFont(ofSize: size, weight: weight.weight).fontDescriptor
             }
+
+            var symbolicTraits = descriptor.symbolicTraits
             if traits.contains(.italic) {
                 symbolicTraits.insert(.traitItalic)
             }
@@ -63,23 +89,12 @@ public struct Font {
                 default:
                     updatedDescriptor = updatedDescriptor?.withDesign(.default)
             }
-            if weight != .regular {
-                let fontWeight: UIFont.Weight
-                switch weight {
-                    case .light:
-                        fontWeight = .light
-                    case .medium:
-                        fontWeight = .medium
-                    case .semibold:
-                        fontWeight = .semibold
-                    case .bold:
-                        fontWeight = .bold
-                    default:
-                        fontWeight = .regular
+            if #available(iOS 14.0, *) {
+                if weight != .regular {
+                    updatedDescriptor = updatedDescriptor?.addingAttributes([
+                        UIFontDescriptor.AttributeName.traits: [UIFontDescriptor.TraitKey.weight: weight.weight]
+                    ])
                 }
-                updatedDescriptor = updatedDescriptor?.addingAttributes([
-                    UIFontDescriptor.AttributeName.traits: [UIFontDescriptor.TraitKey.weight: fontWeight]
-                ])
             }
          
             if let updatedDescriptor = updatedDescriptor {
@@ -90,27 +105,19 @@ public struct Font {
         } else {
             switch design {
                 case .regular:
-                    if traits.contains(.bold) && traits.contains(.italic) {
-                        if let descriptor = UIFont.systemFont(ofSize: size).fontDescriptor.withSymbolicTraits([.traitBold, .traitItalic]) {
+                    if traits.contains(.italic) {
+                        if let descriptor = UIFont.systemFont(ofSize: size, weight: weight.weight).fontDescriptor.withSymbolicTraits([.traitItalic]) {
                             return UIFont(descriptor: descriptor, size: size)
                         } else {
                             return UIFont.italicSystemFont(ofSize: size)
                         }
-                    } else if traits.contains(.bold) {
-                        if #available(iOS 8.2, *) {
-                            return UIFont.boldSystemFont(ofSize: size)
-                        } else {
-                            return CTFontCreateWithName("HelveticaNeue-Bold" as CFString, size, nil)
-                        }
-                    } else if traits.contains(.italic) {
-                        return UIFont.italicSystemFont(ofSize: size)
                     } else {
-                        return UIFont.systemFont(ofSize: size)
+                        return UIFont.systemFont(ofSize: size, weight: weight.weight)
                     }
                 case .serif:
-                    if traits.contains(.bold) && traits.contains(.italic) {
+                    if weight.isBold && traits.contains(.italic) {
                         return UIFont(name: "Georgia-BoldItalic", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
-                    } else if traits.contains(.bold) {
+                    } else if weight.isBold {
                         return UIFont(name: "Georgia-Bold", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
                     } else if traits.contains(.italic) {
                         return UIFont(name: "Georgia-Italic", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
@@ -118,9 +125,9 @@ public struct Font {
                         return UIFont(name: "Georgia", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
                     }
                 case .monospace:
-                    if traits.contains(.bold) && traits.contains(.italic) {
+                    if weight.isBold && traits.contains(.italic) {
                         return UIFont(name: "Menlo-BoldItalic", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
-                    } else if traits.contains(.bold) {
+                    } else if weight.isBold {
                         return UIFont(name: "Menlo-Bold", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
                     } else if traits.contains(.italic) {
                         return UIFont(name: "Menlo-Italic", size: size - 1.0) ?? UIFont.systemFont(ofSize: size)
diff --git a/submodules/Display/Source/GenerateImage.swift b/submodules/Display/Source/GenerateImage.swift
index e2d8433351..0606e987ef 100644
--- a/submodules/Display/Source/GenerateImage.swift
+++ b/submodules/Display/Source/GenerateImage.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import Accelerate
+import AsyncDisplayKit
 
 public let deviceColorSpace: CGColorSpace = {
     if #available(iOSApplicationExtension 9.3, iOS 9.3, *) {
@@ -19,38 +20,20 @@ private let grayscaleColorSpace = CGColorSpaceCreateDeviceGray()
 let deviceScale = UIScreen.main.scale
 
 public func generateImagePixel(_ size: CGSize, scale: CGFloat, pixelGenerator: (CGSize, UnsafeMutablePointer<UInt8>, Int) -> Void) -> UIImage? {
-    let scaledSize = CGSize(width: size.width * scale, height: size.height * scale)
-    let bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
-    let length = bytesPerRow * Int(scaledSize.height)
-    let bytes = malloc(length)!.assumingMemoryBound(to: UInt8.self)
-    guard let provider = CGDataProvider(dataInfo: bytes, data: bytes, size: length, releaseData: { bytes, _, _ in
-        free(bytes)
-    })
-    else {
-        return nil
-    }
-    
-    pixelGenerator(scaledSize, bytes, bytesPerRow)
-    
-    let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.premultipliedFirst.rawValue)
-    
-    guard let image = CGImage(width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bitsPerPixel: 32, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo, provider: provider, decode: nil, shouldInterpolate: false, intent: .defaultIntent)
-    else {
-        return nil
-    }
-    
-    return UIImage(cgImage: image, scale: scale, orientation: .up)
+    let context = DrawingContext(size: size, scale: scale, opaque: false, clear: false)
+    pixelGenerator(CGSize(width: size.width * scale, height: size.height * scale), context.bytes.assumingMemoryBound(to: UInt8.self), context.bytesPerRow)
+    return context.generateImage()
 }
 
 private func withImageBytes(image: UIImage, _ f: (UnsafePointer<UInt8>, Int, Int, Int) -> Void) {
     let selectedScale = image.scale
     let scaledSize = CGSize(width: image.size.width * selectedScale, height: image.size.height * selectedScale)
-    let bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
+    let bytesPerRow = DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(scaledSize.width))
     let length = bytesPerRow * Int(scaledSize.height)
     let bytes = malloc(length)!.assumingMemoryBound(to: UInt8.self)
     memset(bytes, 0, length)
     
-    let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.premultipliedFirst.rawValue)
+    let bitmapInfo = DeviceGraphicsContextSettings.shared.transparentBitmapInfo
     
     guard let context = CGContext(data: bytes, width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo.rawValue) else {
         return
@@ -65,7 +48,7 @@ private func withImageBytes(image: UIImage, _ f: (UnsafePointer<UInt8>, Int, Int
 public func generateGrayscaleAlphaMaskImage(image: UIImage) -> UIImage? {
     let selectedScale = image.scale
     let scaledSize = CGSize(width: image.size.width * selectedScale, height: image.size.height * selectedScale)
-    let bytesPerRow = (1 * Int(scaledSize.width) + 15) & (~15)
+    let bytesPerRow = (1 * Int(scaledSize.width) + 31) & (~31)
     let length = bytesPerRow * Int(scaledSize.height)
     let bytes = malloc(length)!.assumingMemoryBound(to: UInt8.self)
     memset(bytes, 0, length)
@@ -111,69 +94,25 @@ public func generateGrayscaleAlphaMaskImage(image: UIImage) -> UIImage? {
 }
 
 public func generateImage(_ size: CGSize, contextGenerator: (CGSize, CGContext) -> Void, opaque: Bool = false, scale: CGFloat? = nil) -> UIImage? {
-    let selectedScale = scale ?? deviceScale
-    let scaledSize = CGSize(width: size.width * selectedScale, height: size.height * selectedScale)
-    let bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
-    let length = bytesPerRow * Int(scaledSize.height)
-    let bytes = malloc(length)!.assumingMemoryBound(to: Int8.self)
-    
-    guard let provider = CGDataProvider(dataInfo: bytes, data: bytes, size: length, releaseData: { bytes, _, _ in
-        free(bytes)
-    })
-    else {
+    if size.width.isZero || size.height.isZero {
         return nil
     }
-    
-    let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | (opaque ? CGImageAlphaInfo.noneSkipFirst.rawValue : CGImageAlphaInfo.premultipliedFirst.rawValue))
-    
-    guard let context = CGContext(data: bytes, width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo.rawValue) else {
-        return nil
+    let context = DrawingContext(size: size, scale: scale ?? 0.0, opaque: opaque, clear: false)
+    context.withFlippedContext { c in
+        contextGenerator(context.size, c)
     }
-    
-    context.scaleBy(x: selectedScale, y: selectedScale)
-    
-    contextGenerator(size, context)
-    
-    guard let image = CGImage(width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bitsPerPixel: 32, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo, provider: provider, decode: nil, shouldInterpolate: false, intent: .defaultIntent)
-    else {
-        return nil
-    }
-    
-    return UIImage(cgImage: image, scale: selectedScale, orientation: .up)
+    return context.generateImage()
 }
 
 public func generateImage(_ size: CGSize, opaque: Bool = false, scale: CGFloat? = nil, rotatedContext: (CGSize, CGContext) -> Void) -> UIImage? {
-    let selectedScale = scale ?? deviceScale
-    let scaledSize = CGSize(width: size.width * selectedScale, height: size.height * selectedScale)
-    let bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
-    let length = bytesPerRow * Int(scaledSize.height)
-    let bytes = malloc(length)!.assumingMemoryBound(to: Int8.self)
-    
-    guard let provider = CGDataProvider(dataInfo: bytes, data: bytes, size: length, releaseData: { bytes, _, _ in
-        free(bytes)
-    }) else {
+    if size.width.isZero || size.height.isZero {
         return nil
     }
-    
-    let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | (opaque ? CGImageAlphaInfo.noneSkipFirst.rawValue : CGImageAlphaInfo.premultipliedFirst.rawValue))
-    
-    guard let context = CGContext(data: bytes, width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo.rawValue) else {
-        return nil
+    let context = DrawingContext(size: size, scale: scale ?? 0.0, opaque: opaque, clear: false)
+    context.withContext { c in
+        rotatedContext(context.size, c)
     }
-    
-    context.scaleBy(x: selectedScale, y: selectedScale)
-    context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
-    context.scaleBy(x: 1.0, y: -1.0)
-    context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
-    
-    rotatedContext(size, context)
-    
-    guard let image = CGImage(width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bitsPerPixel: 32, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo, provider: provider, decode: nil, shouldInterpolate: false, intent: .defaultIntent)
-        else {
-            return nil
-    }
-    
-    return UIImage(cgImage: image, scale: selectedScale, orientation: .up)
+    return context.generateImage()
 }
 
 public func generateFilledCircleImage(diameter: CGFloat, color: UIColor?, strokeColor: UIColor? = nil, strokeWidth: CGFloat? = nil, backgroundColor: UIColor? = nil) -> UIImage? {
@@ -383,7 +322,12 @@ public func generateGradientTintedImage(image: UIImage?, colors: [UIColor]) -> U
     return tintedImage
 }
 
-public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [CGFloat]) -> UIImage? {
+public enum GradientImageDirection {
+    case vertical
+    case horizontal
+}
+
+public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [CGFloat], direction: GradientImageDirection = .vertical) -> UIImage? {
     guard colors.count == locations.count else {
         return nil
     }
@@ -395,7 +339,7 @@ public func generateGradientImage(size: CGSize, colors: [UIColor], locations: [C
         var locations = locations
         let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
         
-        context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+        context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: direction == .horizontal ? CGPoint(x: size.width, y: 0.0) : CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
     }
     
     let image = UIGraphicsGetImageFromCurrentImageContext()!
@@ -428,6 +372,102 @@ public enum DrawingContextBltMode {
     case Alpha
 }
 
+public func getSharedDevideGraphicsContextSettings() -> DeviceGraphicsContextSettings {
+    struct OpaqueSettings {
+        let rowAlignment: Int
+        let bitsPerPixel: Int
+        let bitsPerComponent: Int
+        let opaqueBitmapInfo: CGBitmapInfo
+        let colorSpace: CGColorSpace
+
+        init(context: CGContext) {
+            self.rowAlignment = context.bytesPerRow
+            self.bitsPerPixel = context.bitsPerPixel
+            self.bitsPerComponent = context.bitsPerComponent
+            self.opaqueBitmapInfo = context.bitmapInfo
+            if #available(iOS 10.0, *) {
+                if UIScreen.main.traitCollection.displayGamut == .P3 {
+                    self.colorSpace = CGColorSpace(name: CGColorSpace.displayP3) ?? context.colorSpace!
+                } else {
+                    self.colorSpace = context.colorSpace!
+                }
+            } else {
+                self.colorSpace = context.colorSpace!
+            }
+            assert(self.rowAlignment == 32)
+            assert(self.bitsPerPixel == 32)
+            assert(self.bitsPerComponent == 8)
+        }
+    }
+
+    struct TransparentSettings {
+        let transparentBitmapInfo: CGBitmapInfo
+
+        init(context: CGContext) {
+            self.transparentBitmapInfo = context.bitmapInfo
+        }
+    }
+
+    var opaqueSettings: OpaqueSettings?
+    var transparentSettings: TransparentSettings?
+
+    if #available(iOS 10.0, *) {
+        let opaqueFormat = UIGraphicsImageRendererFormat()
+        let transparentFormat = UIGraphicsImageRendererFormat()
+        if #available(iOS 12.0, *) {
+            opaqueFormat.preferredRange = .standard
+            transparentFormat.preferredRange = .standard
+        }
+        opaqueFormat.opaque = true
+        transparentFormat.opaque = false
+
+        let opaqueRenderer = UIGraphicsImageRenderer(bounds: CGRect(origin: CGPoint(), size: CGSize(width: 1.0, height: 1.0)), format: opaqueFormat)
+        let _ = opaqueRenderer.image(actions: { context in
+            opaqueSettings = OpaqueSettings(context: context.cgContext)
+        })
+
+        let transparentRenderer = UIGraphicsImageRenderer(bounds: CGRect(origin: CGPoint(), size: CGSize(width: 1.0, height: 1.0)), format: transparentFormat)
+        let _ = transparentRenderer.image(actions: { context in
+            transparentSettings = TransparentSettings(context: context.cgContext)
+        })
+    } else {
+        UIGraphicsBeginImageContextWithOptions(CGSize(width: 1.0, height: 1.0), true, 1.0)
+        let refContext = UIGraphicsGetCurrentContext()!
+        opaqueSettings = OpaqueSettings(context: refContext)
+        UIGraphicsEndImageContext()
+
+        UIGraphicsBeginImageContextWithOptions(CGSize(width: 1.0, height: 1.0), false, 1.0)
+        let refCtxTransparent = UIGraphicsGetCurrentContext()!
+        transparentSettings = TransparentSettings(context: refCtxTransparent)
+        UIGraphicsEndImageContext()
+    }
+
+    return DeviceGraphicsContextSettings(
+        rowAlignment: opaqueSettings!.rowAlignment,
+        bitsPerPixel: opaqueSettings!.bitsPerPixel,
+        bitsPerComponent: opaqueSettings!.bitsPerComponent,
+        opaqueBitmapInfo: opaqueSettings!.opaqueBitmapInfo,
+        transparentBitmapInfo: transparentSettings!.transparentBitmapInfo,
+        colorSpace: opaqueSettings!.colorSpace
+    )
+}
+
+public struct DeviceGraphicsContextSettings {
+    public static let shared: DeviceGraphicsContextSettings = getSharedDevideGraphicsContextSettings()
+
+    public let rowAlignment: Int
+    public let bitsPerPixel: Int
+    public let bitsPerComponent: Int
+    public let opaqueBitmapInfo: CGBitmapInfo
+    public let transparentBitmapInfo: CGBitmapInfo
+    public let colorSpace: CGColorSpace
+
+    public func bytesPerRow(forWidth width: Int) -> Int {
+        let baseValue = self.bitsPerPixel * width / 8
+        return (baseValue + 31) & ~0x1F
+    }
+}
+
 public class DrawingContext {
     public let size: CGSize
     public let scale: CGFloat
@@ -435,46 +475,39 @@ public class DrawingContext {
     public let bytesPerRow: Int
     private let bitmapInfo: CGBitmapInfo
     public let length: Int
-    public let bytes: UnsafeMutableRawPointer
-    let provider: CGDataProvider?
-    
-    private var _context: CGContext?
+    private let imageBuffer: ASCGImageBuffer
+    public var bytes: UnsafeMutableRawPointer {
+        if self.hasGeneratedImage {
+            preconditionFailure()
+        }
+        return self.imageBuffer.mutableBytes
+    }
+    private let context: CGContext
+
+    private var hasGeneratedImage = false
     
     public func withContext(_ f: (CGContext) -> ()) {
-        if self._context == nil {
-            if let c = CGContext(data: bytes, width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: self.bitmapInfo.rawValue) {
-                c.scaleBy(x: scale, y: scale)
-                self._context = c
-            }
-        }
-        
-        if let _context = self._context {
-            _context.translateBy(x: self.size.width / 2.0, y: self.size.height / 2.0)
-            _context.scaleBy(x: 1.0, y: -1.0)
-            _context.translateBy(x: -self.size.width / 2.0, y: -self.size.height / 2.0)
-            
-            f(_context)
-            
-            _context.translateBy(x: self.size.width / 2.0, y: self.size.height / 2.0)
-            _context.scaleBy(x: 1.0, y: -1.0)
-            _context.translateBy(x: -self.size.width / 2.0, y: -self.size.height / 2.0)
-        }
+        let context = self.context
+
+        context.translateBy(x: self.size.width / 2.0, y: self.size.height / 2.0)
+        context.scaleBy(x: 1.0, y: -1.0)
+        context.translateBy(x: -self.size.width / 2.0, y: -self.size.height / 2.0)
+
+        f(context)
+
+        context.translateBy(x: self.size.width / 2.0, y: self.size.height / 2.0)
+        context.scaleBy(x: 1.0, y: -1.0)
+        context.translateBy(x: -self.size.width / 2.0, y: -self.size.height / 2.0)
     }
     
     public func withFlippedContext(_ f: (CGContext) -> ()) {
-        if self._context == nil {
-            if let c = CGContext(data: bytes, width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: self.bitmapInfo.rawValue) {
-                c.scaleBy(x: scale, y: scale)
-                self._context = c
-            }
-        }
-        
-        if let _context = self._context {
-            f(_context)
-        }
+        f(self.context)
     }
     
-    public init(size: CGSize, scale: CGFloat = 0.0, premultiplied: Bool = true, clear: Bool = false) {
+    public init(size: CGSize, scale: CGFloat = 0.0, opaque: Bool = false, clear: Bool = false) {
+        assert(!size.width.isZero && !size.height.isZero)
+        let size: CGSize = CGSize(width: max(1.0, size.width), height: max(1.0, size.height))
+
         let actualScale: CGFloat
         if scale.isZero {
             actualScale = deviceScale
@@ -485,33 +518,61 @@ public class DrawingContext {
         self.scale = actualScale
         self.scaledSize = CGSize(width: size.width * actualScale, height: size.height * actualScale)
         
-        self.bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
+        self.bytesPerRow = DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(scaledSize.width))
         self.length = bytesPerRow * Int(scaledSize.height)
-        
-        if premultiplied {
-            self.bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.premultipliedFirst.rawValue)
+
+        self.imageBuffer = ASCGImageBuffer(length: UInt(self.length))
+
+        if opaque {
+            self.bitmapInfo = DeviceGraphicsContextSettings.shared.opaqueBitmapInfo
         } else {
-            self.bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.first.rawValue)
+            self.bitmapInfo = DeviceGraphicsContextSettings.shared.transparentBitmapInfo
         }
-        
-        self.bytes = malloc(length)!
+
+        self.context = CGContext(
+            data: self.imageBuffer.mutableBytes,
+            width: Int(self.scaledSize.width),
+            height: Int(self.scaledSize.height),
+            bitsPerComponent: DeviceGraphicsContextSettings.shared.bitsPerComponent,
+            bytesPerRow: self.bytesPerRow,
+            space: DeviceGraphicsContextSettings.shared.colorSpace,
+            bitmapInfo: self.bitmapInfo.rawValue,
+            releaseCallback: nil,
+            releaseInfo: nil
+        )!
+        self.context.scaleBy(x: self.scale, y: self.scale)
+
         if clear {
             memset(self.bytes, 0, self.length)
         }
-        self.provider = CGDataProvider(dataInfo: bytes, data: bytes, size: length, releaseData: { bytes, _, _ in
-            free(bytes)
-        })
-        
-        assert(self.bytesPerRow % 16 == 0)
-        assert(Int64(Int(bitPattern: self.bytes)) % 16 == 0)
     }
     
     public func generateImage() -> UIImage? {
         if self.scaledSize.width.isZero || self.scaledSize.height.isZero {
             return nil
         }
-        if let image = CGImage(width: Int(scaledSize.width), height: Int(scaledSize.height), bitsPerComponent: 8, bitsPerPixel: 32, bytesPerRow: bytesPerRow, space: deviceColorSpace, bitmapInfo: bitmapInfo, provider: provider!, decode: nil, shouldInterpolate: false, intent: .defaultIntent) {
-            return UIImage(cgImage: image, scale: scale, orientation: .up)
+        if self.hasGeneratedImage {
+            preconditionFailure()
+            return nil
+        }
+        self.hasGeneratedImage = true
+
+        let dataProvider = self.imageBuffer.createDataProviderAndInvalidate()
+
+        if let image = CGImage(
+            width: Int(self.scaledSize.width),
+            height: Int(self.scaledSize.height),
+            bitsPerComponent: self.context.bitsPerComponent,
+            bitsPerPixel: self.context.bitsPerPixel,
+            bytesPerRow: self.context.bytesPerRow,
+            space: DeviceGraphicsContextSettings.shared.colorSpace,
+            bitmapInfo: self.context.bitmapInfo,
+            provider: dataProvider,
+            decode: nil,
+            shouldInterpolate: true,
+            intent: .defaultIntent
+        ) {
+            return UIImage(cgImage: image, scale: self.scale, orientation: .up)
         } else {
             return nil
         }
diff --git a/submodules/Display/Source/ImageNode.swift b/submodules/Display/Source/ImageNode.swift
index 3522fad829..ecf6f87aea 100644
--- a/submodules/Display/Source/ImageNode.swift
+++ b/submodules/Display/Source/ImageNode.swift
@@ -126,6 +126,7 @@ public class ImageNode: ASDisplayNode {
     private let hasImage: ValuePromise<Bool>?
     private var first = true
     private let enableEmpty: Bool
+    public var enableAnimatedTransition: Bool
     
     private let _contentReady = Promise<Bool>()
     private var didSetReady: Bool = false
@@ -141,13 +142,14 @@ public class ImageNode: ASDisplayNode {
         }
     }
     
-    public init(enableHasImage: Bool = false, enableEmpty: Bool = false) {
+    public init(enableHasImage: Bool = false, enableEmpty: Bool = false, enableAnimatedTransition: Bool = false) {
         if enableHasImage {
             self.hasImage = ValuePromise(false, ignoreRepeated: true)
         } else {
             self.hasImage = nil
         }
         self.enableEmpty = enableEmpty
+        self.enableAnimatedTransition = enableAnimatedTransition
         super.init()
     }
     
@@ -160,17 +162,33 @@ public class ImageNode: ASDisplayNode {
         self.disposable.set((signal |> deliverOnMainQueue).start(next: {[weak self] next in
             dispatcher.dispatch {
                 if let strongSelf = self {
-                    if let image = next?.cgImage {
-                        strongSelf.contents = image
-                    } else if strongSelf.enableEmpty {
-                        strongSelf.contents = nil
-                    }
+                    var animate = strongSelf.enableAnimatedTransition
                     if strongSelf.first && next != nil {
                         strongSelf.first = false
+                        animate = false
                         if strongSelf.isNodeLoaded {
                             strongSelf.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.18)
                         }
                     }
+                    if let image = next?.cgImage {
+                        if animate, let previousContents = strongSelf.contents {
+                            strongSelf.contents = image
+                            let tempLayer = CALayer()
+                            tempLayer.contents = previousContents
+                            tempLayer.frame = strongSelf.layer.bounds
+                            strongSelf.layer.addSublayer(tempLayer)
+                            tempLayer.opacity = 0.0
+                            tempLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: true, completion: { [weak tempLayer] _ in
+                                tempLayer?.removeFromSuperlayer()
+                            })
+
+                            //strongSelf.layer.animate(from: previousContents as! CGImage, to: image, keyPath: "contents", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        } else {
+                            strongSelf.contents = image
+                        }
+                    } else if strongSelf.enableEmpty {
+                        strongSelf.contents = nil
+                    }
                     if !reportedHasImage {
                         if let hasImage = strongSelf.hasImage {
                             reportedHasImage = true
diff --git a/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift
index 48761f12a1..e0b2655301 100644
--- a/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift
+++ b/submodules/Display/Source/InteractiveTransitionGestureRecognizer.swift
@@ -82,6 +82,10 @@ public class InteractiveTransitionGestureRecognizer: UIPanGestureRecognizer {
         self.validatedGesture = false
         self.currentAllowedDirections = []
     }
+
+    public func cancel() {
+        self.state = .cancelled
+    }
     
     override public func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
         let touch = touches.first!
diff --git a/submodules/Display/Source/Keyboard.swift b/submodules/Display/Source/Keyboard.swift
index 53c3b5d048..d2699a42e6 100644
--- a/submodules/Display/Source/Keyboard.swift
+++ b/submodules/Display/Source/Keyboard.swift
@@ -2,7 +2,7 @@ import Foundation
 import UIKitRuntimeUtils
 
 public enum Keyboard {
-    public static func applyAutocorrection() {
-        applyKeyboardAutocorrection()
+    public static func applyAutocorrection(textView: UITextView) {
+        applyKeyboardAutocorrection(textView)
     }
 }
diff --git a/submodules/Display/Source/LegacyPresentedController.swift b/submodules/Display/Source/LegacyPresentedController.swift
index 6403a8088a..9d81b122c0 100644
--- a/submodules/Display/Source/LegacyPresentedController.swift
+++ b/submodules/Display/Source/LegacyPresentedController.swift
@@ -122,7 +122,7 @@ open class LegacyPresentedController: ViewController {
     override open func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override open func dismiss(completion: (() -> Void)? = nil) {
diff --git a/submodules/Display/Source/LinkHighlightingNode.swift b/submodules/Display/Source/LinkHighlightingNode.swift
index 26efc7afff..ac51ca4afe 100644
--- a/submodules/Display/Source/LinkHighlightingNode.swift
+++ b/submodules/Display/Source/LinkHighlightingNode.swift
@@ -157,7 +157,7 @@ private func generateRectsImage(color: UIColor, rects: [CGRect], inset: CGFloat,
 
 public final class LinkHighlightingNode: ASDisplayNode {
     private var rects: [CGRect] = []
-    private let imageNode: ASImageNode
+    public let imageNode: ASImageNode
     
     public var innerRadius: CGFloat = 4.0
     public var outerRadius: CGFloat = 4.0
@@ -196,7 +196,7 @@ public final class LinkHighlightingNode: ASDisplayNode {
     }
     
     private func updateImage() {
-        if rects.isEmpty {
+        if self.rects.isEmpty {
             self.imageNode.image = nil
         }
         let (offset, image) = generateRectsImage(color: self.color, rects: self.rects, inset: self.inset, outerRadius: self.outerRadius, innerRadius: self.innerRadius)
@@ -206,6 +206,19 @@ public final class LinkHighlightingNode: ASDisplayNode {
             self.imageNode.frame = CGRect(origin: offset, size: image.size)
         }
     }
+
+    public static func generateImage(color: UIColor, inset: CGFloat, innerRadius: CGFloat, outerRadius: CGFloat, rects: [CGRect]) -> (CGPoint, UIImage)? {
+        if rects.isEmpty {
+           return nil
+        }
+        let (offset, image) = generateRectsImage(color: color, rects: rects, inset: inset, outerRadius: outerRadius, innerRadius: innerRadius)
+
+        if let image = image {
+            return (offset, image)
+        } else {
+            return nil
+        }
+    }
     
     public func asyncLayout() -> (UIColor, [CGRect], CGFloat, CGFloat, CGFloat) -> () -> Void {
         let currentRects = self.rects
diff --git a/submodules/Display/Source/ListView.swift b/submodules/Display/Source/ListView.swift
index 5b28121d9b..7221fe1e86 100644
--- a/submodules/Display/Source/ListView.swift
+++ b/submodules/Display/Source/ListView.swift
@@ -6,6 +6,11 @@ import UIKitRuntimeUtils
 private let infiniteScrollSize: CGFloat = 10000.0
 private let insertionAnimationDuration: Double = 0.4
 
+private struct VisibleHeaderNodeId: Hashable {
+    var id: ListViewItemNode.HeaderId
+    var affinity: Int
+}
+
 private final class ListViewBackingLayer: CALayer {
     override func setNeedsLayout() {
     }
@@ -214,6 +219,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
     }
     
     public final var didScrollWithOffset: ((CGFloat, ContainedViewLayoutTransition, ListViewItemNode?) -> Void)?
+    public final var addContentOffset: ((CGFloat, ListViewItemNode?) -> Void)?
     
     private var topItemOverscrollBackground: ListViewOverscrollBackgroundNode?
     private var bottomItemOverscrollBackground: ASDisplayNode?
@@ -274,7 +280,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
     
     private final var items: [ListViewItem] = []
     private final var itemNodes: [ListViewItemNode] = []
-    private final var itemHeaderNodes: [Int64: ListViewItemHeaderNode] = [:]
+    private final var itemHeaderNodes: [VisibleHeaderNodeId: ListViewItemHeaderNode] = [:]
     
     public final var itemHeaderNodesAlpha: CGFloat = 1.0
     
@@ -285,7 +291,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
     
     public final var visibleContentOffsetChanged: (ListViewVisibleContentOffset) -> Void = { _ in }
     public final var visibleBottomContentOffsetChanged: (ListViewVisibleContentOffset) -> Void = { _ in }
-    public final var beganInteractiveDragging: () -> Void = { }
+    public final var beganInteractiveDragging: (CGPoint) -> Void = { _ in }
     public final var endedInteractiveDragging: () -> Void = { }
     public final var didEndScrolling: (() -> Void)?
     
@@ -682,7 +688,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         }
         self.scrolledToItem = nil
         
-        self.beganInteractiveDragging()
+        self.beganInteractiveDragging(self.touchesPosition)
         
         for itemNode in self.itemNodes {
             if !itemNode.isLayerBacked {
@@ -845,7 +851,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         }
         self.updateScroller(transition: .immediate)
         
-        self.updateItemHeaders(leftInset: self.insets.left, rightInset: self.insets.right)
+        self.updateItemHeaders(leftInset: self.insets.left, rightInset: self.insets.right, synchronousLoad: false)
         
         for (_, headerNode) in self.itemHeaderNodes {
             if self.dynamicBounceEnabled && headerNode.wantsScrollDynamics {
@@ -1027,6 +1033,8 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         transition = .animated(duration: duration, curve: .spring)
                     case let .Default(duration):
                         transition = .animated(duration: max(updateSizeAndInsets.duration, duration ?? 0.3), curve: .easeInOut)
+                    case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                        transition = .animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y))
                 }
             }
         } else if let scrollToItem = scrollToItem {
@@ -1040,6 +1048,8 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         } else {
                             transition = .animated(duration: duration ?? 0.3, curve: .easeInOut)
                         }
+                    case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                        transition = .animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y))
                 }
             }
         }
@@ -1361,13 +1371,6 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
             }
         } else if let itemHighlightOverlayBackground = self.itemHighlightOverlayBackground {
             self.itemHighlightOverlayBackground = nil
-            for (_, _) in self.itemHeaderNodes {
-                //self.view.bringSubview(toFront: headerNode.view)
-            }
-            //self.view.bringSubview(toFront: itemHighlightOverlayBackground.view)
-            for _ in self.itemNodes {
-                //self.view.bringSubview(toFront: itemNode.view)
-            }
             transition.updateAlpha(node: itemHighlightOverlayBackground, alpha: 0.0, completion: { [weak itemHighlightOverlayBackground] _ in
                 itemHighlightOverlayBackground?.removeFromSupernode()
             })
@@ -1864,7 +1867,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                             
                             let beginReplay = { [weak self] in
                                 if let strongSelf = self {
-                                    strongSelf.replayOperations(animated: animated, animateAlpha: options.contains(.AnimateAlpha), animateCrossfade: options.contains(.AnimateCrossfade), synchronous: options.contains(.Synchronous), animateTopItemVerticalOrigin: options.contains(.AnimateTopItemPosition), operations: updatedOperations, requestItemInsertionAnimationsIndices: options.contains(.RequestItemInsertionAnimations) ? insertedIndexSet : Set(), scrollToItem: scrollToItem, additionalScrollDistance: additionalScrollDistance, updateSizeAndInsets: updateSizeAndInsets, stationaryItemIndex: stationaryItemIndex, updateOpaqueState: updateOpaqueState, completion: {
+                                    strongSelf.replayOperations(animated: animated, animateAlpha: options.contains(.AnimateAlpha), animateCrossfade: options.contains(.AnimateCrossfade), synchronous: options.contains(.Synchronous), synchronousLoads: options.contains(.PreferSynchronousResourceLoading), animateTopItemVerticalOrigin: options.contains(.AnimateTopItemPosition), operations: updatedOperations, requestItemInsertionAnimationsIndices: options.contains(.RequestItemInsertionAnimations) ? insertedIndexSet : Set(), scrollToItem: scrollToItem, additionalScrollDistance: additionalScrollDistance, updateSizeAndInsets: updateSizeAndInsets, stationaryItemIndex: stationaryItemIndex, updateOpaqueState: updateOpaqueState, completion: {
                                         if options.contains(.PreferSynchronousDrawing) {
                                             self?.recursivelyEnsureDisplaySynchronously(true)
                                         }
@@ -2125,6 +2128,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         offsetHeight = 0.0
                         
                         nextNode.updateFrame(nextNode.frame.offsetBy(dx: 0.0, dy: nextHeight), within: self.visibleSize)
+                        self.didScrollWithOffset?(nextHeight, .immediate, nextNode)
                         
                         nextNode.apparentHeight = 0.0
                         
@@ -2234,6 +2238,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                     var frame = self.itemNodes[i].frame
                     frame.origin.y -= offsetHeight
                     self.itemNodes[i].updateFrame(frame, within: self.visibleSize)
+                    //self.didScrollWithOffset?(offsetHeight, .immediate, self.itemNodes[i])
                     if let accessoryItemNode = self.itemNodes[i].accessoryItemNode {
                         self.itemNodes[i].layoutAccessoryItemNode(accessoryItemNode, leftInset: listInsets.left, rightInset: listInsets.right)
                     }
@@ -2245,6 +2250,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                     var frame = self.itemNodes[i].frame
                     frame.origin.y += offsetHeight
                     self.itemNodes[i].updateFrame(frame, within: self.visibleSize)
+                    //self.didScrollWithOffset?(-offsetHeight, .immediate, self.itemNodes[i])
                     if let accessoryItemNode = self.itemNodes[i].accessoryItemNode {
                         self.itemNodes[i].layoutAccessoryItemNode(accessoryItemNode, leftInset: listInsets.left, rightInset: listInsets.right)
                     }
@@ -2310,7 +2316,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         }
     }
     
-    private func replayOperations(animated: Bool, animateAlpha: Bool, animateCrossfade: Bool, synchronous: Bool, animateTopItemVerticalOrigin: Bool, operations: [ListViewStateOperation], requestItemInsertionAnimationsIndices: Set<Int>, scrollToItem originalScrollToItem: ListViewScrollToItem?, additionalScrollDistance: CGFloat, updateSizeAndInsets: ListViewUpdateSizeAndInsets?, stationaryItemIndex: Int?, updateOpaqueState: Any?, completion: () -> Void) {
+    private func replayOperations(animated: Bool, animateAlpha: Bool, animateCrossfade: Bool, synchronous: Bool, synchronousLoads: Bool, animateTopItemVerticalOrigin: Bool, operations: [ListViewStateOperation], requestItemInsertionAnimationsIndices: Set<Int>, scrollToItem originalScrollToItem: ListViewScrollToItem?, additionalScrollDistance: CGFloat, updateSizeAndInsets: ListViewUpdateSizeAndInsets?, stationaryItemIndex: Int?, updateOpaqueState: Any?, completion: () -> Void) {
         var scrollToItem: ListViewScrollToItem?
         var isExperimentalSnapToScrollToItem = false
         if let originalScrollToItem = originalScrollToItem {
@@ -2665,10 +2671,12 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                                 scrollToItemTransition = .animated(duration: duration, curve: .spring)
                             case let .Default(duration):
                                 scrollToItemTransition = .animated(duration: duration ?? 0.3, curve: .easeInOut)
+                            case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                                scrollToItemTransition = .animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y))
                             }
                         }
                         
-                        self.didScrollWithOffset?(-offset, scrollToItemTransition, nil)
+                        //self.didScrollWithOffset?(-offset, scrollToItemTransition, nil)
                     }
                     
                     for itemNode in self.itemNodes {
@@ -2751,10 +2759,14 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         updateSizeAndInsetsTransition = .animated(duration: duration, curve: .spring)
                     case let .Default(duration):
                         updateSizeAndInsetsTransition = .animated(duration: duration ?? 0.3, curve: .easeInOut)
+                    case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                        updateSizeAndInsetsTransition = .animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y))
                     }
                 }
-                
-                self.didScrollWithOffset?(-offsetFix, updateSizeAndInsetsTransition, nil)
+
+                if !offsetFix.isZero {
+                    //self.didScrollWithOffset?(-offsetFix, updateSizeAndInsetsTransition, nil)
+                }
                 
                 for itemNode in self.itemNodes {
                     itemNode.updateFrame(itemNode.frame.offsetBy(dx: 0.0, dy: offsetFix), within: self.visibleSize)
@@ -2765,7 +2777,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                 if !snappedTopInset.isZero && (previousVisibleSize.height.isZero || previousApparentFrames.isEmpty) {
                     offsetFix += snappedTopInset
                     
-                    self.didScrollWithOffset?(-offsetFix, .immediate, nil)
+                    //self.didScrollWithOffset?(-snappedTopInset, .immediate, nil)
                     
                     for itemNode in self.itemNodes {
                         itemNode.updateFrame(itemNode.frame.offsetBy(dx: 0.0, dy: snappedTopInset), within: self.visibleSize)
@@ -2804,6 +2816,20 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                             }
                             animationDuration = duration
                             
+                            springAnimation.isAdditive = true
+                            animation = springAnimation
+                        case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                            headerNodesTransition = (.animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y)), false, -completeOffset)
+                            animationCurve = .custom(cp1x, cp1y, cp2x, cp2y)
+                            let springAnimation = CABasicAnimation(keyPath: "sublayerTransform")
+                            springAnimation.timingFunction = CAMediaTimingFunction(controlPoints: cp1x, cp1y, cp2x, cp2y)
+                            springAnimation.duration = duration * UIView.animationDurationFactor()
+                            springAnimation.fromValue = NSValue(caTransform3D: CATransform3DMakeTranslation(0.0, -completeOffset, 0.0))
+                            springAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
+                            springAnimation.isRemovedOnCompletion = true
+
+                            animationDuration = duration
+
                             springAnimation.isAdditive = true
                             animation = springAnimation
                         case let .Default(duration):
@@ -2825,9 +2851,14 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         self?.updateItemNodesVisibilities(onlyPositive: false)
                     }
                     self.layer.add(animation, forKey: nil)
-                    for itemNode in self.itemNodes {
-                        itemNode.applyAbsoluteOffset(value: -completeOffset, animationCurve: animationCurve, duration: animationDuration)
+                    if !completeOffset.isZero {
+                        for itemNode in self.itemNodes {
+                            itemNode.applyAbsoluteOffset(value: CGPoint(x: 0.0, y: -completeOffset), animationCurve: animationCurve, duration: animationDuration)
+                        }
+                        self.didScrollWithOffset?(-completeOffset, ContainedViewLayoutTransition.animated(duration: animationDuration, curve: animationCurve), nil)
                     }
+                } else {
+                    self.didScrollWithOffset?(-completeOffset, .immediate, nil)
                 }
             } else {
                 self.visibleSize = updateSizeAndInsets.size
@@ -2865,8 +2896,12 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                 
                 springAnimation.isAdditive = true
                 self.layer.add(springAnimation, forKey: nil)
-                for itemNode in self.itemNodes {
-                    itemNode.applyAbsoluteOffset(value: -completeOffset, animationCurve: .spring, duration: duration)
+
+                if !completeOffset.isZero {
+                    for itemNode in self.itemNodes {
+                        itemNode.applyAbsoluteOffset(value: CGPoint(x: 0.0, y: -completeOffset), animationCurve: .spring, duration: duration)
+                    }
+                    self.didScrollWithOffset?(-completeOffset, .animated(duration: duration, curve: .spring), nil)
                 }
             } else {
                 if let snapshotView = snapshotView {
@@ -2975,7 +3010,9 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         
                         switch scrollToItem.directionHint {
                             case .Up:
-                                offset = updatedLowerBound - (previousUpperBound ?? 0.0)
+                                if let previousUpperBound = previousUpperBound {
+                                    offset = updatedLowerBound - previousUpperBound
+                                }
                             case .Down:
                                 offset = updatedUpperBound - (previousLowerBound ?? self.visibleSize.height)
                         }
@@ -2993,15 +3030,17 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         headerNodesTransition = (.animated(duration: duration, curve: .spring), headerNodesTransition.1, headerNodesTransition.2 - offsetOrZero)
                     case let .Default(duration):
                         headerNodesTransition = (.animated(duration: duration ?? 0.3, curve: .easeInOut), true, headerNodesTransition.2 - offsetOrZero)
+                    case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                        headerNodesTransition = (.animated(duration: duration, curve: .custom(cp1x, cp1y, cp2x, cp2y)), headerNodesTransition.1, headerNodesTransition.2 - offsetOrZero)
                 }
                 for (_, headerNode) in self.itemHeaderNodes {
                     previousItemHeaderNodes.append(headerNode)
                 }
                 
-                self.updateItemHeaders(leftInset: listInsets.left, rightInset: listInsets.right, transition: headerNodesTransition, animateInsertion: animated || !requestItemInsertionAnimationsIndices.isEmpty)
+                self.updateItemHeaders(leftInset: listInsets.left, rightInset: listInsets.right, synchronousLoad: synchronousLoads, transition: headerNodesTransition, animateInsertion: animated || !requestItemInsertionAnimationsIndices.isEmpty)
                 
                 if let offset = offset, !offset.isZero {
-                    self.didScrollWithOffset?(-offset, headerNodesTransition.0, nil)
+                    //self.didScrollWithOffset?(-offset, headerNodesTransition.0, nil)
                     let lowestNodeToInsertBelow = self.lowestNodeToInsertBelow()
                     for itemNode in temporaryPreviousNodes {
                         itemNode.updateFrame(itemNode.frame.offsetBy(dx: 0.0, dy: offset), within: self.visibleSize)
@@ -3065,6 +3104,27 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                             
                             animation = springAnimation
                             reverseAnimation = reverseSpringAnimation
+                        case let .Custom(duration, cp1x, cp1y, cp2x, cp2y):
+                            animationCurve = .custom(cp1x, cp1y, cp2x, cp2y)
+                            animationDuration = duration
+                            let basicAnimation = CABasicAnimation(keyPath: "sublayerTransform")
+                            basicAnimation.timingFunction = CAMediaTimingFunction(controlPoints: cp1x, cp1y, cp2x, cp2y)
+                            basicAnimation.duration = duration * UIView.animationDurationFactor()
+                            basicAnimation.fromValue = NSValue(caTransform3D: CATransform3DMakeTranslation(0.0, -offset, 0.0))
+                            basicAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
+                            basicAnimation.isRemovedOnCompletion = true
+                            basicAnimation.isAdditive = true
+
+                            let reverseBasicAnimation = CABasicAnimation(keyPath: "sublayerTransform")
+                            reverseBasicAnimation.timingFunction = CAMediaTimingFunction(controlPoints: cp1x, cp1y, cp2x, cp2y)
+                            reverseBasicAnimation.duration = duration * UIView.animationDurationFactor()
+                            reverseBasicAnimation.fromValue = NSValue(caTransform3D: CATransform3DMakeTranslation(0.0, offset, 0.0))
+                            reverseBasicAnimation.toValue = NSValue(caTransform3D: CATransform3DIdentity)
+                            reverseBasicAnimation.isRemovedOnCompletion = true
+                            reverseBasicAnimation.isAdditive = true
+
+                            animation = basicAnimation
+                            reverseAnimation = reverseBasicAnimation
                         case let .Default(duration):
                             if let duration = duration {
                                 animationCurve = .easeInOut
@@ -3122,11 +3182,12 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                     }
                     self.layer.add(animation, forKey: nil)
                     for itemNode in self.itemNodes {
-                        itemNode.applyAbsoluteOffset(value: -offset, animationCurve: animationCurve, duration: animationDuration)
+                        itemNode.applyAbsoluteOffset(value: CGPoint(x: 0.0, y: -offset), animationCurve: animationCurve, duration: animationDuration)
                     }
                     for itemNode in temporaryPreviousNodes {
-                        itemNode.applyAbsoluteOffset(value: -offset, animationCurve: animationCurve, duration: animationDuration)
+                        itemNode.applyAbsoluteOffset(value: CGPoint(x: 0.0, y: -offset), animationCurve: animationCurve, duration: animationDuration)
                     }
+                    self.didScrollWithOffset?(-offset, .animated(duration: animationDuration, curve: animationCurve), nil)
                     if let verticalScrollIndicator = self.verticalScrollIndicator {
                         verticalScrollIndicator.layer.add(reverseAnimation, forKey: nil)
                     }
@@ -3152,7 +3213,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
             
             completion()
         } else {
-            self.updateItemHeaders(leftInset: listInsets.left, rightInset: listInsets.right, transition: headerNodesTransition, animateInsertion: animated || !requestItemInsertionAnimationsIndices.isEmpty)
+            self.updateItemHeaders(leftInset: listInsets.left, rightInset: listInsets.right, synchronousLoad: synchronousLoads, transition: headerNodesTransition, animateInsertion: animated || !requestItemInsertionAnimationsIndices.isEmpty)
             self.updateItemNodesVisibilities(onlyPositive: deferredUpdateVisible)
             
             if animated {
@@ -3199,15 +3260,88 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         node.headerAccessoryItemNode?.removeFromSupernode()
         node.headerAccessoryItemNode = nil
     }
+
+    private var nextHeaderSpaceAffinity: Int = 0
+
+    private func assignHeaderSpaceAffinities() {
+        var nextTempAffinity = 0
+
+        var existingAffinityIdByAffinity: [Int: Int] = [:]
+
+        for i in 0 ..< self.itemNodes.count {
+            let currentItemNode = self.itemNodes[i]
+
+            if let currentItemHeaders = currentItemNode.headers() {
+                currentHeadersLoop: for currentHeader in currentItemHeaders {
+                    let currentId = currentHeader.id
+                    if let currentAffinity = currentItemNode.tempHeaderSpaceAffinities[currentId] {
+                        if let existingAffinity = currentItemNode.headerSpaceAffinities[currentId] {
+                            existingAffinityIdByAffinity[currentAffinity] = existingAffinity
+                        }
+
+                        continue currentHeadersLoop
+                    }
+
+                    let currentAffinity = nextTempAffinity
+                    nextTempAffinity += 1
+
+                    currentItemNode.tempHeaderSpaceAffinities[currentId] = currentAffinity
+
+                    if let existingAffinity = currentItemNode.headerSpaceAffinities[currentId] {
+                        existingAffinityIdByAffinity[currentAffinity] = existingAffinity
+                    }
+
+                    groupSearch: for nextIndex in (i + 1) ..< self.itemNodes.count {
+                        let nextItemNode = self.itemNodes[nextIndex]
+
+                        var containsSameHeader = false
+                        if let nextHeaders = nextItemNode.headers() {
+                            nextHeaderSearch: for nextHeader in nextHeaders {
+                                if nextHeader.id == currentId {
+                                    containsSameHeader = true
+                                    break nextHeaderSearch
+                                }
+                            }
+                        }
+
+                        if containsSameHeader {
+                            nextItemNode.tempHeaderSpaceAffinities[currentId] = currentAffinity
+                        } else {
+                            break groupSearch
+                        }
+                    }
+                }
+            }
+        }
+
+        for i in 0 ..< self.itemNodes.count {
+            let itemNode = self.itemNodes[i]
+            for (headerId, tempAffinity) in itemNode.tempHeaderSpaceAffinities {
+                let affinity: Int
+                if let existing = existingAffinityIdByAffinity[tempAffinity] {
+                    affinity = existing
+                } else {
+                    affinity = self.nextHeaderSpaceAffinity
+                    existingAffinityIdByAffinity[tempAffinity] = affinity
+                    self.nextHeaderSpaceAffinity += 1
+                }
+
+                itemNode.headerSpaceAffinities[headerId] = affinity
+                itemNode.tempHeaderSpaceAffinities = [:]
+            }
+        }
+    }
     
-    private func updateItemHeaders(leftInset: CGFloat, rightInset: CGFloat, transition: (ContainedViewLayoutTransition, Bool, CGFloat) = (.immediate, false, 0.0), animateInsertion: Bool = false) {
+    private func updateItemHeaders(leftInset: CGFloat, rightInset: CGFloat, synchronousLoad: Bool, transition: (ContainedViewLayoutTransition, Bool, CGFloat) = (.immediate, false, 0.0), animateInsertion: Bool = false) {
+        self.assignHeaderSpaceAffinities()
+
         let upperDisplayBound = self.headerInsets.top
         let lowerDisplayBound = self.visibleSize.height - self.insets.bottom
-        var visibleHeaderNodes = Set<Int64>()
+        var visibleHeaderNodes = Set<VisibleHeaderNodeId>()
         
         let flashing = self.headerItemsAreFlashing()
         
-        func addHeader(id: Int64, upperBound: CGFloat, upperBoundEdge: CGFloat, lowerBound: CGFloat, item: ListViewItemHeader, hasValidNodes: Bool) {
+        func addHeader(id: VisibleHeaderNodeId, upperBound: CGFloat, upperBoundEdge: CGFloat, lowerBound: CGFloat, item: ListViewItemHeader, hasValidNodes: Bool) {
             let itemHeaderHeight: CGFloat = item.height
             
             let headerFrame: CGRect
@@ -3244,7 +3378,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                         switch curve {
                             case .linear:
                                  headerNode.layer.animateBoundsOriginYAdditive(from: offset, to: 0.0, duration: duration, mediaTimingFunction: CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear))
-                            case .spring:
+                            case .spring, .customSpring:
                                 transition.0.animateOffsetAdditive(node: headerNode, offset: offset)
                             case let .custom(p1, p2, p3, p4):
                                 headerNode.layer.animateBoundsOriginYAdditive(from: offset, to: 0.0, duration: duration, mediaTimingFunction: CAMediaTimingFunction(controlPoints: p1, p2, p3, p4))
@@ -3271,13 +3405,12 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                 } else if hasValidNodes && headerNode.alpha.isZero {
                     headerNode.alpha = initialHeaderNodeAlpha
                     if animateInsertion {
-                        headerNode.layer.animateAlpha(from: 0.0, to: initialHeaderNodeAlpha, duration: 0.2)
-                        headerNode.layer.animateScale(from: 0.2, to: 1.0, duration: 0.2)
+                        headerNode.animateAdded(duration: 0.2)
                     }
                 }
                 headerNode.updateStickDistanceFactor(stickLocationDistanceFactor, transition: transition.0)
             } else {
-                let headerNode = item.node()
+                let headerNode = item.node(synchronousLoad: synchronousLoad)
                 headerNode.alpha = initialHeaderNodeAlpha
                 if headerNode.item !== item {
                     item.updateNode(headerNode, previous: nil, next: nil)
@@ -3294,39 +3427,70 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                     self.addSubnode(headerNode)
                 }
                 if animateInsertion {
-                    headerNode.layer.animateAlpha(from: 0.0, to: initialHeaderNodeAlpha, duration: 0.3)
-                    headerNode.layer.animateScale(from: 0.2, to: 1.0, duration: 0.3)
+                    headerNode.alpha = initialHeaderNodeAlpha
+                    headerNode.animateAdded(duration: 0.2)
                 }
                 headerNode.updateStickDistanceFactor(stickLocationDistanceFactor, transition: .immediate)
             }
         }
+
+        var previousHeaderBySpace: [AnyHashable: (id: VisibleHeaderNodeId, upperBound: CGFloat, upperBoundEdge: CGFloat, lowerBound: CGFloat, item: ListViewItemHeader, hasValidNodes: Bool)] = [:]
         
-        var previousHeader: (id: Int64, upperBound: CGFloat, upperBoundEdge: CGFloat, lowerBound: CGFloat, item: ListViewItemHeader, hasValidNodes: Bool)?
         for itemNode in self.itemNodes {
             let itemFrame = itemNode.apparentFrame
             let itemTopInset = itemNode.insets.top
-            if let itemHeader = itemNode.header() {
-                if let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeader {
-                    if previousHeaderId == itemHeader.id {
-                        previousHeader = (previousHeaderId, previousUpperBound, previousUpperBoundEdge, itemFrame.maxY, previousHeaderItem, hasValidNodes || itemNode.index != nil)
-                    } else {
-                        addHeader(id: previousHeaderId, upperBound: previousUpperBound, upperBoundEdge: previousUpperBoundEdge, lowerBound: previousLowerBound, item: previousHeaderItem, hasValidNodes: hasValidNodes)
-                        
-                        previousHeader = (itemHeader.id, itemFrame.minY, itemFrame.minY + itemTopInset, itemFrame.maxY, itemHeader, itemNode.index != nil)
+            var validItemHeaderSpaces: [AnyHashable] = []
+            if let itemHeaders = itemNode.headers() {
+                for itemHeader in itemHeaders {
+                    guard let affinity = itemNode.headerSpaceAffinities[itemHeader.id] else {
+                        assertionFailure()
+                        continue
+                    }
+
+                    let headerId = VisibleHeaderNodeId(id: itemHeader.id, affinity: affinity)
+
+                    validItemHeaderSpaces.append(itemHeader.id.space)
+
+                    let itemMaxY: CGFloat
+                    if itemHeader.stickOverInsets {
+                        itemMaxY = itemFrame.maxY
+                    } else {
+                        itemMaxY = itemFrame.maxY - (self.rotated ? itemNode.insets.top : itemNode.insets.bottom)
+                    }
+
+                    if let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeaderBySpace[itemHeader.id.space] {
+                        if previousHeaderId == headerId {
+                            previousHeaderBySpace[itemHeader.id.space] = (previousHeaderId, previousUpperBound, previousUpperBoundEdge, itemMaxY, previousHeaderItem, hasValidNodes || itemNode.index != nil)
+                        } else {
+                            addHeader(id: previousHeaderId, upperBound: previousUpperBound, upperBoundEdge: previousUpperBoundEdge, lowerBound: previousLowerBound, item: previousHeaderItem, hasValidNodes: hasValidNodes)
+
+                            previousHeaderBySpace[itemHeader.id.space] = (headerId, itemFrame.minY, itemFrame.minY + itemTopInset, itemMaxY, itemHeader, itemNode.index != nil)
+                        }
+                    } else {
+                        previousHeaderBySpace[itemHeader.id.space] = (headerId, itemFrame.minY, itemFrame.minY + itemTopInset, itemMaxY, itemHeader, itemNode.index != nil)
                     }
-                } else {
-                    previousHeader = (itemHeader.id, itemFrame.minY, itemFrame.minY + itemTopInset, itemFrame.maxY, itemHeader, itemNode.index != nil)
                 }
-            } else {
-                if let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeader {
-                    addHeader(id: previousHeaderId, upperBound: previousUpperBound, upperBoundEdge: previousUpperBoundEdge, lowerBound: previousLowerBound, item: previousHeaderItem, hasValidNodes: hasValidNodes)
+            }
+
+            for (space, previousHeader) in previousHeaderBySpace {
+                if validItemHeaderSpaces.contains(space) {
+                    continue
                 }
-                previousHeader = nil
+
+                let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeader
+
+                addHeader(id: previousHeaderId, upperBound: previousUpperBound, upperBoundEdge: previousUpperBoundEdge, lowerBound: previousLowerBound, item: previousHeaderItem, hasValidNodes: hasValidNodes)
+
+                previousHeaderBySpace.removeValue(forKey: space)
             }
         }
-        
-        if let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeader {
+
+        for (space, previousHeader) in previousHeaderBySpace {
+            let (previousHeaderId, previousUpperBound, previousUpperBoundEdge, previousLowerBound, previousHeaderItem, hasValidNodes) = previousHeader
+
             addHeader(id: previousHeaderId, upperBound: previousUpperBound, upperBoundEdge: previousUpperBoundEdge, lowerBound: previousLowerBound, item: previousHeaderItem, hasValidNodes: hasValidNodes)
+
+            previousHeaderBySpace.removeValue(forKey: space)
         }
         
         let currentIds = Set(self.itemHeaderNodes.keys)
@@ -3646,10 +3810,10 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
                 var updatedOperations = operations
                 updatedState.removeInvisibleNodes(&updatedOperations)
                 if synchronous {
-                    self.replayOperations(animated: false, animateAlpha: false, animateCrossfade: false, synchronous: false, animateTopItemVerticalOrigin: false, operations: updatedOperations, requestItemInsertionAnimationsIndices: Set(), scrollToItem: nil, additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemIndex: nil, updateOpaqueState: nil, completion: completion)
+                    self.replayOperations(animated: false, animateAlpha: false, animateCrossfade: false, synchronous: false, synchronousLoads: false, animateTopItemVerticalOrigin: false, operations: updatedOperations, requestItemInsertionAnimationsIndices: Set(), scrollToItem: nil, additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemIndex: nil, updateOpaqueState: nil, completion: completion)
                 } else {
                     self.dispatchOnVSync {
-                        self.replayOperations(animated: false, animateAlpha: false, animateCrossfade: false, synchronous: false, animateTopItemVerticalOrigin: false, operations: updatedOperations, requestItemInsertionAnimationsIndices: Set(), scrollToItem: nil, additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemIndex: nil, updateOpaqueState: nil, completion: completion)
+                        self.replayOperations(animated: false, animateAlpha: false, animateCrossfade: false, synchronous: false, synchronousLoads: false, animateTopItemVerticalOrigin: false, operations: updatedOperations, requestItemInsertionAnimationsIndices: Set(), scrollToItem: nil, additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemIndex: nil, updateOpaqueState: nil, completion: completion)
                     }
                 }
             }
@@ -3976,7 +4140,7 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         self.updateOverlayHighlight(transition: transition)
     }
     
-    private func itemIndexAtPoint(_ point: CGPoint) -> Int? {
+    public func itemIndexAtPoint(_ point: CGPoint) -> Int? {
         for itemNode in self.itemNodes {
             if itemNode.apparentContentFrame.contains(point) {
                 return itemNode.index
@@ -3994,6 +4158,15 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         return nil
     }
     
+    public func indexOf(itemNode: ListViewItemNode) -> Int? {
+        for listItemNode in self.itemNodes {
+            if itemNode === listItemNode {
+                return listItemNode.index
+            }
+        }
+        return nil
+    }
+    
     public func forEachItemNode(_ f: (ASDisplayNode) -> Void) {
         for itemNode in self.itemNodes {
             if itemNode.index != nil {
@@ -4024,13 +4197,21 @@ open class ListView: ASDisplayNode, UIScrollViewAccessibilityDelegate, UIGesture
         }
     }
     
-    public func ensureItemNodeVisible(_ node: ListViewItemNode, animated: Bool = true, overflow: CGFloat = 0.0, allowIntersection: Bool = false, curve: ListViewAnimationCurve = .Default(duration: 0.25)) {
+    public func ensureItemNodeVisible(_ node: ListViewItemNode, animated: Bool = true, overflow: CGFloat = 0.0, allowIntersection: Bool = false, atTop: Bool = false, curve: ListViewAnimationCurve = .Default(duration: 0.25)) {
         if let index = node.index {
             if node.apparentHeight > self.visibleSize.height - self.insets.top - self.insets.bottom {
-                if node.frame.maxY > self.visibleSize.height - self.insets.bottom {
-                    self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.bottom(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
-                } else if node.frame.minY < self.insets.top && overflow > 0.0 {
-                    self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                if atTop {
+                    if node.frame.maxY > self.visibleSize.height - self.insets.bottom {
+                        self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                    } else if node.frame.minY < self.insets.top && overflow > 0.0 {
+                        self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                    }
+                } else {
+                    if node.frame.maxY > self.visibleSize.height - self.insets.bottom {
+                        self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.bottom(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Down), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                    } else if node.frame.minY < self.insets.top && overflow > 0.0 {
+                        self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: ListViewDeleteAndInsertOptions(), scrollToItem: ListViewScrollToItem(index: index, position: ListViewScrollPosition.top(-overflow), animated: animated, curve: curve, directionHint: ListViewScrollToItemDirectionHint.Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                    }
                 }
             } else {
                 if self.experimentalSnapScrollToItem {
diff --git a/submodules/Display/Source/ListViewAnimation.swift b/submodules/Display/Source/ListViewAnimation.swift
index aed2d242c3..482f466d3d 100644
--- a/submodules/Display/Source/ListViewAnimation.swift
+++ b/submodules/Display/Source/ListViewAnimation.swift
@@ -183,27 +183,19 @@ public final class ListViewAnimation {
 }
 
 public func listViewAnimationDurationAndCurve(transition: ContainedViewLayoutTransition) -> (Double, ListViewAnimationCurve) {
-    var duration: Double = 0.0
-    var curve: UInt = 0
     switch transition {
         case .immediate:
-            break
+            return (0.0, .Default(duration: 0.0))
         case let .animated(animationDuration, animationCurve):
-            duration = animationDuration
             switch animationCurve {
-                case .linear, .easeInOut, .custom:
-                    break
-                case .spring:
-                    curve = 7
+            case .linear:
+                return (animationDuration, .Default(duration: animationDuration))
+            case .easeInOut:
+                return (animationDuration, .Default(duration: animationDuration))
+            case .spring, .customSpring:
+                return (animationDuration, .Spring(duration: animationDuration))
+            case let .custom(c1x, c1y, c2x, c2y):
+                return (animationDuration, .Custom(duration: animationDuration, c1x, c1y, c2x, c2y))
             }
     }
-    
-    let listViewCurve: ListViewAnimationCurve
-    if curve == 7 {
-        listViewCurve = .Spring(duration: duration)
-    } else {
-        listViewCurve = .Default(duration: duration)
-    }
-    
-    return (duration, listViewCurve)
 }
diff --git a/submodules/Display/Source/ListViewIntermediateState.swift b/submodules/Display/Source/ListViewIntermediateState.swift
index ccc1344711..56d0e73bec 100644
--- a/submodules/Display/Source/ListViewIntermediateState.swift
+++ b/submodules/Display/Source/ListViewIntermediateState.swift
@@ -22,6 +22,7 @@ public enum ListViewScrollToItemDirectionHint {
 public enum ListViewAnimationCurve {
     case Spring(duration: Double)
     case Default(duration: Double?)
+    case Custom(duration: Double, Float, Float, Float, Float)
 }
 
 public struct ListViewScrollToItem {
diff --git a/submodules/Display/Source/ListViewItemHeader.swift b/submodules/Display/Source/ListViewItemHeader.swift
index e81635ae8f..dcbbffb286 100644
--- a/submodules/Display/Source/ListViewItemHeader.swift
+++ b/submodules/Display/Source/ListViewItemHeader.swift
@@ -8,14 +8,13 @@ public enum ListViewItemHeaderStickDirection {
     case bottom
 }
 
-public typealias ListViewItemHeaderId = Int64
-
-public protocol ListViewItemHeader: class {
-    var id: ListViewItemHeaderId { get }
+public protocol ListViewItemHeader: AnyObject {
+    var id: ListViewItemNode.HeaderId { get }
     var stickDirection: ListViewItemHeaderStickDirection { get }
     var height: CGFloat { get }
+    var stickOverInsets: Bool { get }
     
-    func node() -> ListViewItemHeaderNode
+    func node(synchronousLoad: Bool) -> ListViewItemHeaderNode
     func updateNode(_ node: ListViewItemHeaderNode, previous: ListViewItemHeader?, next: ListViewItemHeader?)
 }
 
@@ -114,6 +113,11 @@ open class ListViewItemHeaderNode: ASDisplayNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration, removeOnCompletion: false)
         self.layer.animateScale(from: 1.0, to: 0.2, duration: duration, removeOnCompletion: false)
     }
+
+    open func animateAdded(duration: Double) {
+        self.layer.animateAlpha(from: 0.0, to: self.alpha, duration: 0.2)
+        self.layer.animateScale(from: 0.2, to: 1.0, duration: 0.2)
+    }
     
     private var cachedLayout: (CGSize, CGFloat, CGFloat)?
     
diff --git a/submodules/Display/Source/ListViewItemNode.swift b/submodules/Display/Source/ListViewItemNode.swift
index d57694a912..0322282174 100644
--- a/submodules/Display/Source/ListViewItemNode.swift
+++ b/submodules/Display/Source/ListViewItemNode.swift
@@ -84,6 +84,16 @@ public struct ListViewItemLayoutParams {
 }
 
 open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
+    public struct HeaderId: Hashable {
+        public var space: AnyHashable
+        public var id: AnyHashable
+
+        public init(space: AnyHashable, id: AnyHashable) {
+            self.space = space
+            self.id = id
+        }
+    }
+
     let rotated: Bool
     final var index: Int?
     
@@ -116,6 +126,9 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
     
     private final var spring: ListViewItemSpring?
     private final var animations: [(String, ListViewAnimation)] = []
+
+    final var tempHeaderSpaceAffinities: [ListViewItemNode.HeaderId: Int] = [:]
+    final var headerSpaceAffinities: [ListViewItemNode.HeaderId: Int] = [:]
     
     final let wantsScrollDynamics: Bool
     
@@ -221,6 +234,7 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
     }
     
     var apparentHeight: CGFloat = 0.0
+    public private(set) var apparentHeightTransition: (CGFloat, CGFloat)?
     private var _bounds: CGRect = CGRect()
     private var _position: CGPoint = CGPoint()
     
@@ -465,6 +479,7 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
     }
     
     public func addApparentHeightAnimation(_ value: CGFloat, duration: Double, beginAt: Double, update: ((CGFloat, CGFloat) -> Void)? = nil) {
+        self.apparentHeightTransition = (self.apparentHeight, value)
         let animation = ListViewAnimation(from: self.apparentHeight, to: value, duration: duration, curve: self.preferredAnimationCurve, beginAt: beginAt, update: { [weak self] progress, currentValue in
             if let strongSelf = self {
                 strongSelf.apparentHeight = currentValue
@@ -533,7 +548,7 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
         return false
     }
     
-    open func header() -> ListViewItemHeader? {
+    open func headers() -> [ListViewItemHeader]? {
         return nil
     }
     
@@ -547,7 +562,10 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
     
     public func updateFrame(_ frame: CGRect, within containerSize: CGSize) {
         self.frame = frame
-        self.updateAbsoluteRect(frame, within: containerSize)
+        if frame.maxY < 0.0 || frame.minY > containerSize.height {
+        } else {
+            self.updateAbsoluteRect(frame, within: containerSize)
+        }
         if let extractedBackgroundNode = self.extractedBackgroundNode {
             extractedBackgroundNode.frame = frame.offsetBy(dx: 0.0, dy: -self.insets.top)
         }
@@ -556,10 +574,10 @@ open class ListViewItemNode: ASDisplayNode, AccessibilityFocusableNode {
     open func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
     }
     
-    open func applyAbsoluteOffset(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+    open func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
         if let extractedBackgroundNode = self.extractedBackgroundNode {
             let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: animationCurve)
-            transition.animatePositionAdditive(node: extractedBackgroundNode, offset: CGPoint(x: 0.0, y: -value))
+            transition.animatePositionAdditive(node: extractedBackgroundNode, offset: CGPoint(x: -value.x, y: -value.y))
         }
     }
     
diff --git a/submodules/Display/Source/ListViewTapGestureRecognizer.swift b/submodules/Display/Source/ListViewTapGestureRecognizer.swift
index f5090f99d6..2501325652 100644
--- a/submodules/Display/Source/ListViewTapGestureRecognizer.swift
+++ b/submodules/Display/Source/ListViewTapGestureRecognizer.swift
@@ -2,5 +2,7 @@ import Foundation
 import UIKit
 
 public final class ListViewTapGestureRecognizer: UITapGestureRecognizer {
-    
+    public func cancel() {
+        self.state = .failed
+    }
 }
diff --git a/submodules/Display/Source/ListViewTransactionQueue.swift b/submodules/Display/Source/ListViewTransactionQueue.swift
index a790dc1e82..af78b3f10e 100644
--- a/submodules/Display/Source/ListViewTransactionQueue.swift
+++ b/submodules/Display/Source/ListViewTransactionQueue.swift
@@ -32,6 +32,8 @@ public final class ListViewTransactionQueue {
                     }
                 }
             })
+        } else {
+            assert(true)
         }
     }
     
diff --git a/submodules/Display/Source/NavigationBar.swift b/submodules/Display/Source/NavigationBar.swift
index 7308bd7c54..8f677e6c73 100644
--- a/submodules/Display/Source/NavigationBar.swift
+++ b/submodules/Display/Source/NavigationBar.swift
@@ -1,10 +1,18 @@
 import UIKit
 import AsyncDisplayKit
 
+private let titleFont = Font.with(size: 17.0, design: .regular, weight: .semibold, traits: [.monospacedNumbers])
+
 private var backArrowImageCache: [Int32: UIImage] = [:]
 
-class SparseNode: ASDisplayNode {
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+public final class SparseNode: ASDisplayNode {
+    override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        for view in self.view.subviews {
+            if let result = view.hitTest(self.view.convert(point, to: view), with: event) {
+                return result
+            }
+        }
+        
         let result = super.hitTest(point, with: event)
         if result != self.view {
             return result
@@ -30,16 +38,18 @@ public final class NavigationBarTheme {
     public let disabledButtonColor: UIColor
     public let primaryTextColor: UIColor
     public let backgroundColor: UIColor
+    public let enableBackgroundBlur: Bool
     public let separatorColor: UIColor
     public let badgeBackgroundColor: UIColor
     public let badgeStrokeColor: UIColor
     public let badgeTextColor: UIColor
     
-    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, backgroundColor: UIColor, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor) {
+    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, backgroundColor: UIColor, enableBackgroundBlur: Bool, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor) {
         self.buttonColor = buttonColor
         self.disabledButtonColor = disabledButtonColor
         self.primaryTextColor = primaryTextColor
         self.backgroundColor = backgroundColor
+        self.enableBackgroundBlur = enableBackgroundBlur
         self.separatorColor = separatorColor
         self.badgeBackgroundColor = badgeBackgroundColor
         self.badgeStrokeColor = badgeStrokeColor
@@ -47,7 +57,7 @@ public final class NavigationBarTheme {
     }
     
     public func withUpdatedSeparatorColor(_ color: UIColor) -> NavigationBarTheme {
-        return NavigationBarTheme(buttonColor: self.buttonColor, disabledButtonColor: self.disabledButtonColor, primaryTextColor: self.primaryTextColor, backgroundColor: self.backgroundColor, separatorColor: color, badgeBackgroundColor: self.badgeBackgroundColor, badgeStrokeColor: self.badgeStrokeColor, badgeTextColor: self.badgeTextColor)
+        return NavigationBarTheme(buttonColor: self.buttonColor, disabledButtonColor: self.disabledButtonColor, primaryTextColor: self.primaryTextColor, backgroundColor: self.backgroundColor, enableBackgroundBlur: self.enableBackgroundBlur, separatorColor: color, badgeBackgroundColor: self.badgeBackgroundColor, badgeStrokeColor: self.badgeStrokeColor, badgeTextColor: self.badgeTextColor)
     }
 }
 
@@ -113,6 +123,115 @@ enum NavigationPreviousAction: Equatable {
     }
 }
 
+private var sharedIsReduceTransparencyEnabled = UIAccessibility.isReduceTransparencyEnabled
+
+public final class NavigationBackgroundNode: ASDisplayNode {
+    private var _color: UIColor
+
+    private var enableBlur: Bool
+
+    private var effectView: UIVisualEffectView?
+    private let backgroundNode: ASDisplayNode
+
+    private var validLayout: (CGSize, CGFloat)?
+
+    public init(color: UIColor, enableBlur: Bool = true) {
+        self._color = .clear
+        self.enableBlur = enableBlur
+
+        self.backgroundNode = ASDisplayNode()
+
+        super.init()
+
+        self.addSubnode(self.backgroundNode)
+
+        self.updateColor(color: color, transition: .immediate)
+    }
+
+    private func updateBackgroundBlur(forceKeepBlur: Bool) {
+        if self.enableBlur && !sharedIsReduceTransparencyEnabled && ((self._color.alpha > .ulpOfOne && self._color.alpha < 0.95) || forceKeepBlur) {
+            if self.effectView == nil {
+                let effectView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
+
+                for subview in effectView.subviews {
+                    if subview.description.contains("VisualEffectSubview") {
+                        subview.isHidden = true
+                    }
+                }
+
+                if let sublayer = effectView.layer.sublayers?[0], let filters = sublayer.filters {
+                    sublayer.backgroundColor = nil
+                    sublayer.isOpaque = false
+                    let allowedKeys: [String] = [
+                        "colorSaturate",
+                        "gaussianBlur"
+                    ]
+                    sublayer.filters = filters.filter { filter in
+                        guard let filter = filter as? NSObject else {
+                            return true
+                        }
+                        let filterName = String(describing: filter)
+                        if !allowedKeys.contains(filterName) {
+                            return false
+                        }
+                        return true
+                    }
+                }
+
+                if let (size, cornerRadius) = self.validLayout {
+                    effectView.frame = CGRect(origin: CGPoint(), size: size)
+                    ContainedViewLayoutTransition.immediate.updateCornerRadius(layer: effectView.layer, cornerRadius: cornerRadius)
+                    effectView.clipsToBounds = !cornerRadius.isZero
+                }
+                self.effectView = effectView
+                self.view.insertSubview(effectView, at: 0)
+            }
+        } else if let effectView = self.effectView {
+            self.effectView = nil
+            effectView.removeFromSuperview()
+        }
+    }
+
+    public func updateColor(color: UIColor, enableBlur: Bool? = nil, forceKeepBlur: Bool = false, transition: ContainedViewLayoutTransition) {
+        let effectiveEnableBlur = enableBlur ?? self.enableBlur
+
+        if self._color.isEqual(color) && self.enableBlur == effectiveEnableBlur {
+            return
+        }
+        self._color = color
+        self.enableBlur = effectiveEnableBlur
+
+        if sharedIsReduceTransparencyEnabled {
+            transition.updateBackgroundColor(node: self.backgroundNode, color: self._color.withAlphaComponent(1.0))
+        } else {
+            transition.updateBackgroundColor(node: self.backgroundNode, color: self._color)
+        }
+
+        self.updateBackgroundBlur(forceKeepBlur: forceKeepBlur)
+    }
+
+    public func update(size: CGSize, cornerRadius: CGFloat = 0.0, transition: ContainedViewLayoutTransition) {
+        self.validLayout = (size, cornerRadius)
+
+        let contentFrame = CGRect(origin: CGPoint(), size: size)
+        transition.updateFrame(node: self.backgroundNode, frame: contentFrame)
+        if let effectView = self.effectView, effectView.frame != contentFrame {
+            transition.updateFrame(layer: effectView.layer, frame: contentFrame)
+            if let sublayers = effectView.layer.sublayers {
+                for sublayer in sublayers {
+                    transition.updateFrame(layer: sublayer, frame: contentFrame)
+                }
+            }
+        }
+
+        transition.updateCornerRadius(node: self.backgroundNode, cornerRadius: cornerRadius)
+        if let effectView = self.effectView {
+            transition.updateCornerRadius(layer: effectView.layer, cornerRadius: cornerRadius)
+            effectView.clipsToBounds = !cornerRadius.isZero
+        }
+    }
+}
+
 open class NavigationBar: ASDisplayNode {
     public static var defaultSecondaryContentHeight: CGFloat {
         return 38.0
@@ -120,7 +239,7 @@ open class NavigationBar: ASDisplayNode {
     
     var presentationData: NavigationBarPresentationData
     
-    private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat, CGFloat, Bool)?
+    private var validLayout: (size: CGSize, defaultHeight: CGFloat, additionalTopHeight: CGFloat, additionalContentHeight: CGFloat, additionalBackgroundHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, appearsHidden: Bool)?
     private var requestedLayout: Bool = false
     var requestContainerLayout: (ContainedViewLayoutTransition) -> Void = { _ in }
     
@@ -269,7 +388,7 @@ open class NavigationBar: ASDisplayNode {
     private var title: String? {
         didSet {
             if let title = self.title {
-                self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.presentationData.theme.primaryTextColor)
+                self.titleNode.attributedText = NSAttributedString(string: title, font: titleFont, textColor: self.presentationData.theme.primaryTextColor)
                 self.titleNode.accessibilityLabel = title
                 if self.titleNode.supernode == nil {
                     self.buttonsContainerNode.addSubnode(self.titleNode)
@@ -307,40 +426,6 @@ open class NavigationBar: ASDisplayNode {
     var previousItemBackListenerKey: Int?
     
     private func updateAccessibilityElements() {
-        /*if !self.isNodeLoaded {
-            return
-        }
-        var accessibilityElements: [AnyObject] = []
-        
-        if self.leftButtonNode.supernode != nil {
-            accessibilityElements.append(self.leftButtonNode)
-        }
-        if self.titleNode.supernode != nil {
-            accessibilityElements.append(self.titleNode)
-        }
-        if let titleView = self.titleView, titleView.superview != nil {
-            accessibilityElements.append(titleView)
-        }
-        if self.rightButtonNode.supernode != nil {
-            accessibilityElements.append(self.rightButtonNode)
-        }
-        
-        var updated = false
-        if let currentAccessibilityElements = self.accessibilityElements {
-            if currentAccessibilityElements.count != accessibilityElements.count {
-                updated = true
-            } else {
-                for i in 0 ..< accessibilityElements.count {
-                    let element = currentAccessibilityElements[i] as AnyObject
-                    if element !== accessibilityElements[i] {
-                        updated = true
-                    }
-                }
-            }
-        }
-        if updated {
-            self.accessibilityElements = accessibilityElements
-        }*/
     }
     
     override open var accessibilityElements: [Any]? {
@@ -518,15 +603,13 @@ open class NavigationBar: ASDisplayNode {
                     self.leftButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
                 }
             } else {
-                if animated {
-                    if self.leftButtonNode.view.superview != nil {
-                        if let snapshotView = self.leftButtonNode.view.snapshotContentTree() {
-                            snapshotView.frame = self.leftButtonNode.frame
-                            self.leftButtonNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.leftButtonNode.view)
-                            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                                snapshotView?.removeFromSuperview()
-                            })
-                        }
+                if animated, self.leftButtonNode.view.superview != nil {
+                    if let snapshotView = self.leftButtonNode.view.snapshotContentTree() {
+                        snapshotView.frame = self.leftButtonNode.frame
+                        self.leftButtonNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.leftButtonNode.view)
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
                     }
                 }
                 self.leftButtonNode.removeFromSupernode()
@@ -606,9 +689,27 @@ open class NavigationBar: ASDisplayNode {
                     self.rightButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
                 }
             } else {
+                if animated, self.rightButtonNode.view.superview != nil {
+                    if let snapshotView = self.rightButtonNode.view.snapshotContentTree() {
+                        snapshotView.frame = self.rightButtonNode.frame
+                        self.rightButtonNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.rightButtonNode.view)
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                    }
+                }
                 self.rightButtonNode.removeFromSupernode()
             }
         } else {
+            if animated, self.rightButtonNode.view.superview != nil {
+                if let snapshotView = self.rightButtonNode.view.snapshotContentTree() {
+                    snapshotView.frame = self.rightButtonNode.frame
+                    self.rightButtonNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.rightButtonNode.view)
+                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                        snapshotView?.removeFromSuperview()
+                    })
+                }
+            }
             self.rightButtonNode.removeFromSupernode()
         }
         
@@ -617,12 +718,20 @@ open class NavigationBar: ASDisplayNode {
         }
         self.updateAccessibilityElements()
     }
-    
+
+    public let backgroundNode: NavigationBackgroundNode
     public let backButtonNode: NavigationButtonNode
     public let badgeNode: NavigationBarBadgeNode
     public let backButtonArrow: ASImageNode
     public let leftButtonNode: NavigationButtonNode
     public let rightButtonNode: NavigationButtonNode
+    public let additionalContentNode: SparseNode
+
+    public func reattachAdditionalContentNode() {
+        if self.additionalContentNode.supernode !== self {
+            self.insertSubnode(self.additionalContentNode, aboveSubnode: self.clippingNode)
+        }
+    }
     
     private var _transitionState: NavigationBarTransitionState?
     var transitionState: NavigationBarTransitionState? {
@@ -728,17 +837,23 @@ open class NavigationBar: ASDisplayNode {
         self.rightButtonNode.rippleColor = self.presentationData.theme.primaryTextColor.withAlphaComponent(0.05)
         self.backButtonArrow.image = backArrowImage(color: self.presentationData.theme.buttonColor)
         if let title = self.title {
-            self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.presentationData.theme.primaryTextColor)
+            self.titleNode.attributedText = NSAttributedString(string: title, font: titleFont, textColor: self.presentationData.theme.primaryTextColor)
             self.titleNode.accessibilityLabel = title
         }
         self.stripeNode.backgroundColor = self.presentationData.theme.separatorColor
+
+        self.backgroundNode = NavigationBackgroundNode(color: self.presentationData.theme.backgroundColor, enableBlur: self.presentationData.theme.enableBackgroundBlur)
+        self.additionalContentNode = SparseNode()
         
         super.init()
-        
+
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.buttonsContainerNode)
         self.addSubnode(self.clippingNode)
-        
-        self.backgroundColor = self.presentationData.theme.backgroundColor
+        self.addSubnode(self.additionalContentNode)
+
+        self.backgroundColor = nil
+        self.isOpaque = false
         
         self.stripeNode.isLayerBacked = true
         self.stripeNode.displaysAsynchronously = false
@@ -793,7 +908,7 @@ open class NavigationBar: ASDisplayNode {
         if presentationData.theme !== self.presentationData.theme || presentationData.strings !== self.presentationData.strings {
             self.presentationData = presentationData
             
-            self.backgroundColor = self.presentationData.theme.backgroundColor
+            self.backgroundNode.updateColor(color: self.presentationData.theme.backgroundColor, transition: .immediate)
             
             self.backButtonNode.color = self.presentationData.theme.buttonColor
             self.backButtonNode.disabledColor = self.presentationData.theme.disabledButtonColor
@@ -804,7 +919,7 @@ open class NavigationBar: ASDisplayNode {
             self.rightButtonNode.rippleColor = self.presentationData.theme.primaryTextColor.withAlphaComponent(0.05)
             self.backButtonArrow.image = backArrowImage(color: self.presentationData.theme.buttonColor)
             if let title = self.title {
-                self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.presentationData.theme.primaryTextColor)
+                self.titleNode.attributedText = NSAttributedString(string: title, font: titleFont, textColor: self.presentationData.theme.primaryTextColor)
                 self.titleNode.accessibilityLabel = title
             }
             self.stripeNode.backgroundColor = self.presentationData.theme.separatorColor
@@ -825,16 +940,22 @@ open class NavigationBar: ASDisplayNode {
         
         if let validLayout = self.validLayout, self.requestedLayout {
             self.requestedLayout = false
-            self.updateLayout(size: validLayout.0, defaultHeight: validLayout.1, additionalHeight: validLayout.2, leftInset: validLayout.3, rightInset: validLayout.4, appearsHidden: validLayout.5, transition: .immediate)
+            self.updateLayout(size: validLayout.size, defaultHeight: validLayout.defaultHeight, additionalTopHeight: validLayout.additionalTopHeight, additionalContentHeight: validLayout.additionalContentHeight, additionalBackgroundHeight: validLayout.additionalBackgroundHeight, leftInset: validLayout.leftInset, rightInset: validLayout.rightInset, appearsHidden: validLayout.appearsHidden, transition: .immediate)
         }
     }
     
-    func updateLayout(size: CGSize, defaultHeight: CGFloat, additionalHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, appearsHidden: Bool, transition: ContainedViewLayoutTransition) {
+    func updateLayout(size: CGSize, defaultHeight: CGFloat, additionalTopHeight: CGFloat, additionalContentHeight: CGFloat, additionalBackgroundHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, appearsHidden: Bool, transition: ContainedViewLayoutTransition) {
         if self.layoutSuspended {
             return
         }
         
-        self.validLayout = (size, defaultHeight, additionalHeight, leftInset, rightInset, appearsHidden)
+        self.validLayout = (size, defaultHeight, additionalTopHeight, additionalContentHeight, additionalBackgroundHeight, leftInset, rightInset, appearsHidden)
+
+        let backgroundFrame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height + additionalBackgroundHeight))
+        if self.backgroundNode.frame != backgroundFrame {
+            transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+            self.backgroundNode.update(size: backgroundFrame.size, transition: transition)
+        }
         
         let apparentAdditionalHeight: CGFloat = self.secondaryContentNode != nil ? NavigationBar.defaultSecondaryContentHeight : 0.0
         
@@ -842,6 +963,7 @@ open class NavigationBar: ASDisplayNode {
         let backButtonInset: CGFloat = leftInset + 27.0
         
         transition.updateFrame(node: self.clippingNode, frame: CGRect(origin: CGPoint(), size: size))
+        transition.updateFrame(node: self.additionalContentNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height + additionalBackgroundHeight)))
         transition.updateFrame(node: self.buttonsContainerNode, frame: CGRect(origin: CGPoint(), size: size))
         var expansionHeight: CGFloat = 0.0
         if let contentNode = self.contentNode {
@@ -849,12 +971,12 @@ open class NavigationBar: ASDisplayNode {
             switch contentNode.mode {
             case .replacement:
                 expansionHeight = contentNode.height - defaultHeight
-                contentNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: size.height))
+                contentNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: size.height - additionalContentHeight))
             case .expansion:
                 expansionHeight = contentNode.height
                 
                 let additionalExpansionHeight: CGFloat = self.secondaryContentNode != nil && appearsHidden ? NavigationBar.defaultSecondaryContentHeight : 0.0
-                contentNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: size.height - expansionHeight - apparentAdditionalHeight - additionalExpansionHeight), size: CGSize(width: size.width, height: expansionHeight))
+                contentNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: size.height - (appearsHidden ? 0.0 : additionalContentHeight) - expansionHeight - apparentAdditionalHeight - additionalExpansionHeight), size: CGSize(width: size.width, height: expansionHeight))
                 if appearsHidden {
                     if self.secondaryContentNode != nil {
                         contentNodeFrame.origin.y += NavigationBar.defaultSecondaryContentHeight
@@ -865,10 +987,10 @@ open class NavigationBar: ASDisplayNode {
             contentNode.updateLayout(size: contentNodeFrame.size, leftInset: leftInset, rightInset: rightInset, transition: transition)
         }
         
-        transition.updateFrame(node: self.stripeNode, frame: CGRect(x: 0.0, y: size.height, width: size.width, height: UIScreenPixel))
+        transition.updateFrame(node: self.stripeNode, frame: CGRect(x: 0.0, y: size.height + additionalBackgroundHeight, width: size.width, height: UIScreenPixel))
         
-        let nominalHeight: CGFloat = defaultHeight - additionalHeight
-        let contentVerticalOrigin = size.height - nominalHeight - expansionHeight - additionalHeight - apparentAdditionalHeight
+        let nominalHeight: CGFloat = defaultHeight
+        let contentVerticalOrigin = additionalTopHeight
         
         var leftTitleInset: CGFloat = leftInset + 1.0
         var rightTitleInset: CGFloat = rightInset + 1.0
@@ -1012,12 +1134,18 @@ open class NavigationBar: ASDisplayNode {
         if let titleView = self.titleView {
             let titleSize = CGSize(width: max(1.0, size.width - max(leftTitleInset, rightTitleInset) * 2.0), height: nominalHeight)
             let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: contentVerticalOrigin + floorToScreenPixels((nominalHeight - titleSize.height) / 2.0)), size: titleSize)
-            transition.updateFrame(view: titleView, frame: titleFrame)
+            var titleViewTransition = transition
+            if titleView.frame.isEmpty {
+                titleViewTransition = .immediate
+                titleView.frame = titleFrame
+            }
+
+            titleViewTransition.updateFrame(view: titleView, frame: titleFrame)
             
             if let titleView = titleView as? NavigationBarTitleView {
                 let titleWidth = size.width - (leftTitleInset > 0.0 ? leftTitleInset : rightTitleInset) - (rightTitleInset > 0.0 ? rightTitleInset : leftTitleInset)
                 
-                titleView.updateLayout(size: titleFrame.size, clearBounds: CGRect(origin: CGPoint(x: leftTitleInset - titleFrame.minX, y: 0.0), size: CGSize(width: titleWidth, height: titleFrame.height)), transition: transition)
+                titleView.updateLayout(size: titleFrame.size, clearBounds: CGRect(origin: CGPoint(x: leftTitleInset - titleFrame.minX, y: 0.0), size: CGSize(width: titleWidth, height: titleFrame.height)), transition: titleViewTransition)
             }
             
             if let transitionState = self.transitionState, let otherNavigationBar = transitionState.navigationBar {
@@ -1063,7 +1191,7 @@ open class NavigationBar: ASDisplayNode {
             }
         } else if let title = self.title {
             let node = ImmediateTextNode()
-            node.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: foregroundColor)
+            node.attributedText = NSAttributedString(string: title, font: titleFont, textColor: foregroundColor)
             return node
         } else {
             return nil
@@ -1075,8 +1203,8 @@ open class NavigationBar: ASDisplayNode {
             let node = NavigationButtonNode()
             node.updateManualText(self.backButtonNode.manualText)
             node.color = accentColor
-            if let (size, defaultHeight, _, _, _, _) = self.validLayout {
-                let _ = node.updateLayout(constrainedSize: CGSize(width: size.width, height: defaultHeight))
+            if let validLayout = self.validLayout {
+                let _ = node.updateLayout(constrainedSize: CGSize(width: validLayout.size.width, height: validLayout.defaultHeight))
                 node.frame = self.backButtonNode.frame
             }
             return node
@@ -1098,8 +1226,8 @@ open class NavigationBar: ASDisplayNode {
             }
             node.updateItems(items)
             node.color = accentColor
-            if let (size, defaultHeight, _, _, _, _) = self.validLayout {
-                let _ = node.updateLayout(constrainedSize: CGSize(width: size.width, height: defaultHeight))
+            if let validLayout = self.validLayout {
+                let _ = node.updateLayout(constrainedSize: CGSize(width: validLayout.size.width, height: validLayout.defaultHeight))
                 node.frame = self.backButtonNode.frame
             }
             return node
@@ -1263,15 +1391,10 @@ open class NavigationBar: ASDisplayNode {
     }
     
     override open func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        /*if self.bounds.contains(point) {
-            if self.backButtonNode.supernode != nil && !self.backButtonNode.isHidden {
-                let effectiveBackButtonRect = CGRect(origin: CGPoint(), size: CGSize(width: self.backButtonNode.frame.maxX + 20.0, height: self.bounds.height))
-                if effectiveBackButtonRect.contains(point) {
-                    return self.backButtonNode.internalHitTest(self.view.convert(point, to: self.backButtonNode.view), with: event)
-                }
-            }
-        }*/
-        
+        if let result = self.additionalContentNode.view.hitTest(self.view.convert(point, to: self.additionalContentNode.view), with: event) {
+            return result
+        }
+
         guard let result = super.hitTest(point, with: event) else {
             return nil
         }
diff --git a/submodules/Display/Source/NavigationButtonNode.swift b/submodules/Display/Source/NavigationButtonNode.swift
index 43b7f473c2..4ad1cd4318 100644
--- a/submodules/Display/Source/NavigationButtonNode.swift
+++ b/submodules/Display/Source/NavigationButtonNode.swift
@@ -225,7 +225,7 @@ private final class NavigationButtonItemNode: ImmediateTextNode {
             return size
         } else if let imageNode = self.imageNode {
             let nodeSize = imageNode.image?.size ?? CGSize()
-            let size = CGSize(width: max(nodeSize.width, superSize.width), height: max(nodeSize.height, superSize.height))
+            let size = CGSize(width: max(nodeSize.width, superSize.width), height: max(44.0, max(nodeSize.height, superSize.height)))
             let imageFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - nodeSize.width) / 2.0) + 5.0, y: floorToScreenPixels((size.height - nodeSize.height) / 2.0)), size: nodeSize)
             imageNode.frame = imageFrame
             self.imageRippleNode.frame = imageFrame
@@ -266,7 +266,11 @@ private final class NavigationButtonItemNode: ImmediateTextNode {
         let previousTouchCount = self.touchCount
         self.touchCount = max(0, self.touchCount - touches.count)
         
-        if previousTouchCount != 0 && self.touchCount == 0 && self.isEnabled {
+        var touchInside = true
+        if let touch = touches.first {
+            touchInside = self.touchInsideApparentBounds(touch)
+        }
+        if previousTouchCount != 0 && self.touchCount == 0 && self.isEnabled && touchInside {
             self.pressed()
         }
     }
diff --git a/submodules/Display/Source/PeekControllerMenuItemNode.swift b/submodules/Display/Source/PeekControllerMenuItemNode.swift
deleted file mode 100644
index c1c872986e..0000000000
--- a/submodules/Display/Source/PeekControllerMenuItemNode.swift
+++ /dev/null
@@ -1,108 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-
-public enum PeekControllerMenuItemColor {
-    case accent
-    case destructive
-}
-
-public enum PeekControllerMenuItemFont {
-    case `default`
-    case bold
-}
-
-public struct PeekControllerMenuItem {
-    public let title: String
-    public let color: PeekControllerMenuItemColor
-    public let font: PeekControllerMenuItemFont
-    public let action: (ASDisplayNode, CGRect) -> Bool
-    
-    public init(title: String, color: PeekControllerMenuItemColor, font: PeekControllerMenuItemFont = .default, action: @escaping (ASDisplayNode, CGRect) -> Bool) {
-        self.title = title
-        self.color = color
-        self.font = font
-        self.action = action
-    }
-}
-
-final class PeekControllerMenuItemNode: HighlightTrackingButtonNode {
-    private let item: PeekControllerMenuItem
-    private let activatedAction: () -> Void
-    
-    private let separatorNode: ASDisplayNode
-    private let highlightedBackgroundNode: ASDisplayNode
-    private let textNode: ImmediateTextNode
-    
-    init(theme: PeekControllerTheme, item: PeekControllerMenuItem, activatedAction: @escaping () -> Void) {
-        self.item = item
-        self.activatedAction = activatedAction
-        
-        self.separatorNode = ASDisplayNode()
-        self.separatorNode.isLayerBacked = true
-        self.separatorNode.backgroundColor = theme.menuItemSeparatorColor
-        
-        self.highlightedBackgroundNode = ASDisplayNode()
-        self.highlightedBackgroundNode.isLayerBacked = true
-        self.highlightedBackgroundNode.backgroundColor = theme.menuItemHighligtedColor
-        self.highlightedBackgroundNode.alpha = 0.0
-        
-        self.textNode = ImmediateTextNode()
-        self.textNode.isUserInteractionEnabled = false
-        self.textNode.displaysAsynchronously = false
-        
-        let textColor: UIColor
-        let textFont: UIFont
-        switch item.color {
-            case .accent:
-                textColor = theme.accentColor
-            case .destructive:
-                textColor = theme.destructiveColor
-        }
-        switch item.font {
-            case .default:
-                textFont = Font.regular(20.0)
-            case .bold:
-                textFont = Font.medium(20.0)
-        }
-        self.textNode.attributedText = NSAttributedString(string: item.title, font: textFont, textColor: textColor)
-        
-        super.init()
-        
-        self.addSubnode(self.separatorNode)
-        self.addSubnode(self.highlightedBackgroundNode)
-        self.addSubnode(self.textNode)
-        
-        self.highligthedChanged = { [weak self] highlighted in
-            if let strongSelf = self {
-                if highlighted {
-                    strongSelf.view.superview?.bringSubviewToFront(strongSelf.view)
-                    strongSelf.highlightedBackgroundNode.alpha = 1.0
-                } else {
-                    strongSelf.highlightedBackgroundNode.alpha = 0.0
-                    strongSelf.highlightedBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
-                }
-            }
-        }
-        
-        self.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
-    }
-    
-    func updateLayout(width: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
-        let height: CGFloat = 57.0
-        transition.updateFrame(node: self.highlightedBackgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: height)))
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: height), size: CGSize(width: width, height: UIScreenPixel)))
-        
-        let textSize = self.textNode.updateLayout(CGSize(width: width - 10.0, height: height))
-        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floor((width - textSize.width) / 2.0), y: floor((height - textSize.height) / 2.0)), size: textSize))
-        
-        return height
-    }
-    
-    @objc func buttonPressed() {
-        self.activatedAction()
-        if self.item.action(self, self.bounds) {
-            
-        }
-    }
-}
diff --git a/submodules/Display/Source/PeekControllerMenuNode.swift b/submodules/Display/Source/PeekControllerMenuNode.swift
deleted file mode 100644
index 6b7e5c4fdb..0000000000
--- a/submodules/Display/Source/PeekControllerMenuNode.swift
+++ /dev/null
@@ -1,31 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-
-final class PeekControllerMenuNode: ASDisplayNode {
-    private let itemNodes: [PeekControllerMenuItemNode]
-    
-    init(theme: PeekControllerTheme, items: [PeekControllerMenuItem], activatedAction: @escaping () -> Void) {
-        self.itemNodes = items.map { PeekControllerMenuItemNode(theme: theme, item: $0, activatedAction: activatedAction) }
-        
-        super.init()
-        
-        self.backgroundColor = theme.menuBackgroundColor
-        self.cornerRadius = 16.0
-        self.clipsToBounds = true
-        
-        for itemNode in self.itemNodes {
-            self.addSubnode(itemNode)
-        }
-    }
-    
-    func updateLayout(width: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
-        var verticalOffset: CGFloat = 0.0
-        for itemNode in self.itemNodes {
-            let itemHeight = itemNode.updateLayout(width: width, transition: transition)
-            transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: verticalOffset), size: CGSize(width: width, height: itemHeight)))
-            verticalOffset += itemHeight
-        }
-        return verticalOffset - UIScreenPixel
-    }
-}
diff --git a/submodules/Display/Source/PeekControllerNode.swift b/submodules/Display/Source/PeekControllerNode.swift
deleted file mode 100644
index fabe9c53b9..0000000000
--- a/submodules/Display/Source/PeekControllerNode.swift
+++ /dev/null
@@ -1,357 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-
-final class PeekControllerNode: ViewControllerTracingNode {
-    private let requestDismiss: () -> Void
-    
-    private let theme: PeekControllerTheme
-    
-    private let blurView: UIView
-    private let dimNode: ASDisplayNode
-    private let containerBackgroundNode: ASImageNode
-    private let containerNode: ASDisplayNode
-    
-    private var validLayout: ContainerViewLayout?
-    private var containerOffset: CGFloat = 0.0
-    private var panInitialContainerOffset: CGFloat?
-    
-    private var content: PeekControllerContent
-    private var contentNode: PeekControllerContentNode & ASDisplayNode
-    private var contentNodeHasValidLayout = false
-    
-    private var topAccessoryNode: ASDisplayNode?
-    
-    private var menuNode: PeekControllerMenuNode?
-    private var displayingMenu = false
-    
-    private var hapticFeedback: HapticFeedback?
-    
-    init(theme: PeekControllerTheme, content: PeekControllerContent, requestDismiss: @escaping () -> Void) {
-        self.theme = theme
-        self.requestDismiss = requestDismiss
-        
-        self.dimNode = ASDisplayNode()
-        self.blurView = UIVisualEffectView(effect: UIBlurEffect(style: theme.isDark ? .dark : .light))
-        self.blurView.isUserInteractionEnabled = false
-        
-        switch content.menuActivation() {
-            case .drag:
-                self.dimNode.backgroundColor = nil
-                self.blurView.alpha = 1.0
-            case .press:
-                self.dimNode.backgroundColor = UIColor(white: theme.isDark ? 0.0 : 1.0, alpha: 0.5)
-                self.blurView.alpha = 0.0
-        }
-        
-        self.containerBackgroundNode = ASImageNode()
-        self.containerBackgroundNode.isLayerBacked = true
-        self.containerBackgroundNode.displaysAsynchronously = false
-        
-        self.containerNode = ASDisplayNode()
-        
-        self.content = content
-        self.contentNode = content.node()
-        self.topAccessoryNode = content.topAccessoryNode()
-        
-        var activatedActionImpl: (() -> Void)?
-        let menuItems = content.menuItems()
-        if menuItems.isEmpty {
-            self.menuNode = nil
-        } else {
-            self.menuNode = PeekControllerMenuNode(theme: theme, items: menuItems, activatedAction: {
-                activatedActionImpl?()
-            })
-        }
-        
-        super.init()
-        
-        if content.presentation() == .freeform {
-            self.containerNode.isUserInteractionEnabled = false
-        } else {
-            self.containerNode.clipsToBounds = true
-            self.containerNode.cornerRadius = 16.0
-        }
-        
-        self.addSubnode(self.dimNode)
-        self.view.addSubview(self.blurView)
-        self.containerNode.addSubnode(self.contentNode)
-        self.addSubnode(self.containerNode)
-        
-        if let topAccessoryNode = self.topAccessoryNode {
-            self.addSubnode(topAccessoryNode)
-        }
-        
-        if let menuNode = self.menuNode {
-            self.addSubnode(menuNode)
-        }
-        
-        activatedActionImpl = { [weak self] in
-            self?.requestDismiss()
-        }
-        
-        self.hapticFeedback = HapticFeedback()
-        self.hapticFeedback?.prepareTap()
-    }
-    
-    deinit {
-    }
-    
-    override func didLoad() {
-        super.didLoad()
-        
-        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimNodeTap(_:))))
-        self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))))
-    }
-    
-    func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        self.validLayout = layout
-        
-        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
-        transition.updateFrame(view: self.blurView, frame: CGRect(origin: CGPoint(), size: layout.size))
-        
-        var layoutInsets = layout.insets(options: [])
-        let containerWidth = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: layout.safeInsets.left)
-       
-        layoutInsets.left = floor((layout.size.width - containerWidth) / 2.0)
-        layoutInsets.right = layoutInsets.left
-        if !layoutInsets.bottom.isZero {
-            layoutInsets.bottom -= 12.0
-        }
-        
-        let maxContainerSize = CGSize(width: layout.size.width - 14.0 * 2.0, height: layout.size.height - layoutInsets.top - layoutInsets.bottom - 90.0)
-        
-        var menuSize: CGSize?
-        
-        let contentSize = self.contentNode.updateLayout(size: maxContainerSize, transition: self.contentNodeHasValidLayout ? transition : .immediate)
-        if self.contentNodeHasValidLayout {
-            transition.updateFrame(node: self.contentNode, frame: CGRect(origin: CGPoint(), size: contentSize))
-        } else {
-            self.contentNode.frame = CGRect(origin: CGPoint(), size: contentSize)
-        }
-        
-        var containerFrame: CGRect
-        switch self.content.presentation() {
-            case .contained:
-                containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 2.0)), size: contentSize)
-            case .freeform:
-                containerFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - contentSize.width) / 2.0), y: floor((layout.size.height - contentSize.height) / 4.0)), size: contentSize)
-        }
-        
-        if let menuNode = self.menuNode {
-            let menuWidth = layout.size.width - layoutInsets.left - layoutInsets.right - 14.0 * 2.0
-            let menuHeight = menuNode.updateLayout(width: menuWidth, transition: transition)
-            menuSize = CGSize(width: menuWidth, height: menuHeight)
-            
-            if self.displayingMenu {
-                let upperBound = layout.size.height - layoutInsets.bottom - menuHeight - 14.0 * 2.0 - containerFrame.height
-                if containerFrame.origin.y > upperBound {
-                    containerFrame.origin.y = upperBound
-                }
-                
-                transition.updateAlpha(layer: self.blurView.layer, alpha: 1.0)
-            }
-        }
-        
-        if self.displayingMenu {
-            var offset = self.containerOffset
-            let delta = abs(offset)
-            let factor: CGFloat = 60.0
-            offset = (-((1.0 - (1.0 / (((delta) * 0.55 / (factor)) + 1.0))) * factor)) * (offset < 0.0 ? 1.0 : -1.0)
-            containerFrame = containerFrame.offsetBy(dx: 0.0, dy: offset)
-        } else {
-            containerFrame = containerFrame.offsetBy(dx: 0.0, dy: self.containerOffset)
-        }
-        
-        transition.updateFrame(node: self.containerNode, frame: containerFrame)
-        
-        if let topAccessoryNode = self.topAccessoryNode {
-            let accessorySize = topAccessoryNode.frame.size
-            let accessoryFrame = CGRect(origin: CGPoint(x: floorToScreenPixels(containerFrame.midX - accessorySize.width / 2.0), y: containerFrame.minY - accessorySize.height - 16.0), size: accessorySize)
-            transition.updateFrame(node: topAccessoryNode, frame: accessoryFrame)
-            transition.updateAlpha(node: topAccessoryNode, alpha: self.displayingMenu ? 0.0 : 1.0)
-        }
-        
-        if let menuNode = self.menuNode, let menuSize = menuSize {
-            let menuY: CGFloat
-            if self.displayingMenu {
-                menuY = max(containerFrame.maxY + 14.0, layout.size.height - layoutInsets.bottom - 14.0 - menuSize.height)
-            } else {
-                menuY = layout.size.height + 14.0
-            }
-            
-            let menuFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - menuSize.width) / 2.0), y: menuY), size: menuSize)
-            
-            if self.contentNodeHasValidLayout {
-                transition.updateFrame(node: menuNode, frame: menuFrame)
-            } else {
-                menuNode.frame = menuFrame
-            }
-        }
-        
-        self.contentNodeHasValidLayout = true
-    }
-    
-    func animateIn(from rect: CGRect) {
-        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.blurView.layer.animateAlpha(from: 0.0, to: self.blurView.alpha, duration: 0.3)
-        
-        let offset = CGPoint(x: rect.midX - self.containerNode.position.x, y: rect.midY - self.containerNode.position.y)
-        self.containerNode.layer.animateSpring(from: NSValue(cgPoint: offset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: 0.4, initialVelocity: 0.0, damping: 110.0, additive: true)
-        self.containerNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.4, initialVelocity: 0.0, damping: 110.0)
-        self.containerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
-        
-        if let topAccessoryNode = self.topAccessoryNode {
-            topAccessoryNode.layer.animateSpring(from: NSValue(cgPoint: offset), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: 0.4, initialVelocity: 0.0, damping: 110.0, additive: true)
-            topAccessoryNode.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.4, initialVelocity: 0.0, damping: 110.0)
-            topAccessoryNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
-        }
-        
-        if case .press = self.content.menuActivation() {
-            self.hapticFeedback?.tap()
-        } else {
-            self.hapticFeedback?.impact()
-        }
-    }
-    
-    func animateOut(to rect: CGRect, completion: @escaping () -> Void) {
-        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-        self.blurView.layer.animateAlpha(from: self.blurView.alpha, to: 0.0, duration: 0.25, removeOnCompletion: false)
-        
-        let offset = CGPoint(x: rect.midX - self.containerNode.position.x, y: rect.midY - self.containerNode.position.y)
-        self.containerNode.layer.animatePosition(from: CGPoint(), to: offset, duration: 0.25, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true, force: true, completion: { _ in
-            completion()
-        })
-        self.containerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-        self.containerNode.layer.animateScale(from: 1.0, to: 0.1, duration: 0.25, removeOnCompletion: false)
-        
-        if let topAccessoryNode = self.topAccessoryNode {
-            topAccessoryNode.layer.animatePosition(from: CGPoint(), to: offset, duration: 0.25, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true, force: true, completion: { _ in
-                completion()
-            })
-            topAccessoryNode.layer.animateAlpha(from: topAccessoryNode.alpha, to: 0.0, duration: 0.2, removeOnCompletion: false)
-            topAccessoryNode.layer.animateScale(from: 1.0, to: 0.1, duration: 0.25, removeOnCompletion: false)
-        }
-        
-        if let menuNode = self.menuNode {
-            menuNode.layer.animatePosition(from: menuNode.position, to: CGPoint(x: menuNode.position.x, y: self.bounds.size.height + menuNode.bounds.size.height / 2.0), duration: 0.25, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false)
-        }
-    }
-    
-    @objc func dimNodeTap(_ recognizer: UITapGestureRecognizer) {
-        if case .ended = recognizer.state {
-            self.requestDismiss()
-        }
-    }
-    
-    @objc func panGesture(_ recognizer: UIPanGestureRecognizer) {
-        guard case .drag = self.content.menuActivation() else {
-            return
-        }
-        
-        switch recognizer.state {
-            case .began:
-                self.panInitialContainerOffset = self.containerOffset
-            case .changed:
-                if let panInitialContainerOffset = self.panInitialContainerOffset {
-                    let translation = recognizer.translation(in: self.view)
-                    var offset = panInitialContainerOffset + translation.y
-                    if offset < 0.0 {
-                        let delta = abs(offset)
-                        let factor: CGFloat = 60.0
-                        offset = (-((1.0 - (1.0 / (((delta) * 0.55 / (factor)) + 1.0))) * factor)) * (offset < 0.0 ? 1.0 : -1.0)
-                    }
-                    self.applyDraggingOffset(offset)
-                }
-            case .cancelled, .ended:
-                if let _ = self.panInitialContainerOffset {
-                    self.panInitialContainerOffset = nil
-                    if self.containerOffset < 0.0 {
-                        self.activateMenu()
-                    } else {
-                        self.requestDismiss()
-                    }
-                }
-            default:
-                break
-        }
-    }
-    
-    func applyDraggingOffset(_ offset: CGFloat) {
-        self.containerOffset = offset
-        if self.containerOffset < -25.0 {
-            //self.displayingMenu = true
-        } else {
-            //self.displayingMenu = false
-        }
-        if let layout = self.validLayout {
-            self.containerLayoutUpdated(layout, transition: .immediate)
-        }
-    }
-    
-    func activateMenu() {
-        if case .press = self.content.menuActivation() {
-            self.hapticFeedback?.impact()
-        }
-        if let layout = self.validLayout {
-            self.displayingMenu = true
-            self.containerOffset = 0.0
-            self.containerLayoutUpdated(layout, transition: .animated(duration: 0.18, curve: .spring))
-        }
-    }
-    
-    func endDraggingWithVelocity(_ velocity: CGFloat) {
-        if let _ = self.menuNode, velocity < -600.0 || self.containerOffset < -38.0 {
-            if let layout = self.validLayout {
-                self.displayingMenu = true
-                self.containerOffset = 0.0
-                self.containerLayoutUpdated(layout, transition: .animated(duration: 0.18, curve: .spring))
-            }
-        } else {
-            self.requestDismiss()
-        }
-    }
-    
-    func updateContent(content: PeekControllerContent) {
-        let contentNode = self.contentNode
-        contentNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak contentNode] _ in
-            contentNode?.removeFromSupernode()
-        })
-        contentNode.layer.animateScale(from: 1.0, to: 0.2, duration: 0.15, removeOnCompletion: false)
-        
-        self.menuNode?.removeFromSupernode()
-        self.menuNode = nil
-        
-        self.content = content
-        self.contentNode = content.node()
-        self.containerNode.addSubnode(self.contentNode)
-        self.contentNodeHasValidLayout = false
-        
-        var activatedActionImpl: (() -> Void)?
-        let menuItems = content.menuItems()
-        if menuItems.isEmpty {
-            self.menuNode = nil
-        } else {
-            self.menuNode = PeekControllerMenuNode(theme: self.theme, items: menuItems, activatedAction: {
-                activatedActionImpl?()
-            })
-        }
-        
-        if let menuNode = self.menuNode {
-            self.addSubnode(menuNode)
-        }
-        
-        activatedActionImpl = { [weak self] in
-            self?.requestDismiss()
-        }
-        
-        self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
-        self.contentNode.layer.animateSpring(from: 0.35 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.5)
-        
-        if let layout = self.validLayout {
-            self.containerLayoutUpdated(layout, transition: .animated(duration: 0.15, curve: .easeInOut))
-        }
-        
-        self.hapticFeedback?.tap()
-    }
-}
diff --git a/submodules/Display/Source/StatusBarHost.swift b/submodules/Display/Source/StatusBarHost.swift
index be038af9fb..8c34f16999 100644
--- a/submodules/Display/Source/StatusBarHost.swift
+++ b/submodules/Display/Source/StatusBarHost.swift
@@ -12,4 +12,6 @@ public protocol StatusBarHost {
     
     func setStatusBarStyle(_ style: UIStatusBarStyle, animated: Bool)
     func setStatusBarHidden(_ value: Bool, animated: Bool)
+    
+    var shouldChangeStatusBarStyle: ((UIStatusBarStyle) -> Bool)? { get set }
 }
diff --git a/submodules/Display/Source/TabBarContollerNode.swift b/submodules/Display/Source/TabBarContollerNode.swift
index 50757aa762..93bf14dac1 100644
--- a/submodules/Display/Source/TabBarContollerNode.swift
+++ b/submodules/Display/Source/TabBarContollerNode.swift
@@ -12,7 +12,6 @@ final class TabBarControllerNode: ASDisplayNode {
     private var theme: TabBarControllerTheme
     let tabBarNode: TabBarNode
     private let disabledOverlayNode: ASDisplayNode
-    private let navigationBar: NavigationBar?
     private var toolbarNode: ToolbarNode?
     private let toolbarActionSelected: (ToolbarActionOption) -> Void
     private let disabledPressed: () -> Void
@@ -27,9 +26,8 @@ final class TabBarControllerNode: ASDisplayNode {
         }
     }
     
-    init(theme: TabBarControllerTheme, navigationBar: NavigationBar?, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void, swipeAction: @escaping (Int, TabBarItemSwipeDirection) -> Void, toolbarActionSelected: @escaping (ToolbarActionOption) -> Void, disabledPressed: @escaping () -> Void) {
+    init(theme: TabBarControllerTheme, itemSelected: @escaping (Int, Bool, [ASDisplayNode]) -> Void, contextAction: @escaping (Int, ContextExtractedContentContainingNode, ContextGesture) -> Void, swipeAction: @escaping (Int, TabBarItemSwipeDirection) -> Void, toolbarActionSelected: @escaping (ToolbarActionOption) -> Void, disabledPressed: @escaping () -> Void) {
         self.theme = theme
-        self.navigationBar = navigationBar
         self.tabBarNode = TabBarNode(theme: theme, itemSelected: itemSelected, contextAction: contextAction, swipeAction: swipeAction)
         self.disabledOverlayNode = ASDisplayNode()
         self.disabledOverlayNode.backgroundColor = theme.backgroundColor.withAlphaComponent(0.5)
diff --git a/submodules/Display/Source/TabBarController.swift b/submodules/Display/Source/TabBarController.swift
index 6adad68208..64665cd01b 100644
--- a/submodules/Display/Source/TabBarController.swift
+++ b/submodules/Display/Source/TabBarController.swift
@@ -87,7 +87,6 @@ open class TabBarController: ViewController {
         }
     }
     
-    
     public private(set) var controllers: [ViewController] = []
     
     private let _ready = Promise<Bool>()
@@ -115,14 +114,6 @@ open class TabBarController: ViewController {
     
     var currentController: ViewController?
     
-    open override var navigationBarRequiresEntireLayoutUpdate: Bool {
-        if let currentController = currentController {
-            return currentController.navigationBarRequiresEntireLayoutUpdate
-        } else {
-            return false
-        }
-    }
-    
     private let pendingControllerDisposable = MetaDisposable()
     
     private var theme: TabBarControllerTheme
@@ -130,7 +121,7 @@ open class TabBarController: ViewController {
     public init(navigationBarPresentationData: NavigationBarPresentationData, theme: TabBarControllerTheme) {
         self.theme = theme
         
-        super.init(navigationBarPresentationData: navigationBarPresentationData)
+        super.init(navigationBarPresentationData: nil)
         
         self.scrollToTop = { [weak self] in
             guard let strongSelf = self else {
@@ -151,7 +142,6 @@ open class TabBarController: ViewController {
     }
     
     public func updateTheme(navigationBarPresentationData: NavigationBarPresentationData, theme: TabBarControllerTheme) {
-        self.navigationBar?.updatePresentationData(navigationBarPresentationData)
         if self.theme !== theme {
             self.theme = theme
             if self.isNodeLoaded {
@@ -193,7 +183,7 @@ open class TabBarController: ViewController {
     }
     
     override open func loadDisplayNode() {
-        self.displayNode = TabBarControllerNode(theme: self.theme, navigationBar: self.navigationBar, itemSelected: { [weak self] index, longTap, itemNodes in
+        self.displayNode = TabBarControllerNode(theme: self.theme, itemSelected: { [weak self] index, longTap, itemNodes in
             if let strongSelf = self {
                 if longTap, let controller = strongSelf.controllers[index] as? TabBarContainedController {
                     controller.presentTabBarPreviewingController(sourceNodes: itemNodes)
@@ -302,37 +292,16 @@ open class TabBarController: ViewController {
         if let _selectedIndex = self._selectedIndex, _selectedIndex < self.controllers.count {
             self.currentController = self.controllers[_selectedIndex]
         }
-        
-        var displayNavigationBar = false
+
         if let currentController = self.currentController {
             currentController.willMove(toParent: self)
             self.tabBarControllerNode.currentControllerNode = currentController.displayNode
-            currentController.navigationBar?.isHidden = true
             self.addChild(currentController)
             currentController.didMove(toParent: self)
-            
-            currentController.navigationBar?.layoutSuspended = true
-            currentController.navigationItem.setTarget(self.navigationItem)
-            displayNavigationBar = currentController.displayNavigationBar
-            self.navigationBar?.setContentNode(currentController.navigationBar?.contentNode, animated: false)
-            self.navigationBar?.setSecondaryContentNode(currentController.navigationBar?.secondaryContentNode)
+
             currentController.displayNode.recursivelyEnsureDisplaySynchronously(true)
             self.statusBar.statusBarStyle = currentController.statusBar.statusBarStyle
-            if let navigationBarPresentationData = currentController.navigationBar?.presentationData {
-                self.navigationBar?.updatePresentationData(navigationBarPresentationData)
-            }
         } else {
-            self.navigationItem.title = nil
-            self.navigationItem.leftBarButtonItem = nil
-            self.navigationItem.rightBarButtonItem = nil
-            self.navigationItem.titleView = nil
-            self.navigationItem.backBarButtonItem = nil
-            self.navigationBar?.setContentNode(nil, animated: false)
-            self.navigationBar?.setSecondaryContentNode(nil)
-            displayNavigationBar = false
-        }
-        if self.displayNavigationBar != displayNavigationBar {
-            self.setDisplayNavigationBar(displayNavigationBar)
         }
         
         if let layout = self.validLayout {
diff --git a/submodules/Display/Source/TabBarNode.swift b/submodules/Display/Source/TabBarNode.swift
index 5e6372d208..291333a8e4 100644
--- a/submodules/Display/Source/TabBarNode.swift
+++ b/submodules/Display/Source/TabBarNode.swift
@@ -331,7 +331,8 @@ class TabBarNode: ASDisplayNode {
     private var centered: Bool = false
     
     private var badgeImage: UIImage
-    
+
+    let backgroundNode: NavigationBackgroundNode
     let separatorNode: ASDisplayNode
     private var tabBarNodeContainers: [TabBarNodeContainer] = []
     
@@ -342,6 +343,8 @@ class TabBarNode: ASDisplayNode {
         self.contextAction = contextAction
         self.swipeAction = swipeAction
         self.theme = theme
+
+        self.backgroundNode = NavigationBackgroundNode(color: theme.tabBarBackgroundColor)
         
         self.separatorNode = ASDisplayNode()
         self.separatorNode.backgroundColor = theme.tabBarSeparatorColor
@@ -354,9 +357,10 @@ class TabBarNode: ASDisplayNode {
         
         self.isAccessibilityContainer = false
         
-        self.isOpaque = true
-        self.backgroundColor = theme.tabBarBackgroundColor
-        
+        self.isOpaque = false
+        self.backgroundColor = nil
+
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.separatorNode)
     }
     
@@ -389,7 +393,7 @@ class TabBarNode: ASDisplayNode {
             self.theme = theme
             
             self.separatorNode.backgroundColor = theme.tabBarSeparatorColor
-            self.backgroundColor = theme.tabBarBackgroundColor
+            self.backgroundNode.updateColor(color: theme.tabBarBackgroundColor, transition: .immediate)
             
             self.badgeImage = generateStretchableFilledCircleImage(diameter: 18.0, color: theme.tabBarBadgeBackgroundColor, strokeColor: theme.tabBarBadgeStrokeColor, strokeWidth: 1.0, backgroundColor: nil)!
             for container in self.tabBarNodeContainers {
@@ -539,6 +543,9 @@ class TabBarNode: ASDisplayNode {
     
     func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) {
         self.validLayout = (size, leftInset, rightInset, additionalSideInsets, bottomInset)
+
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size))
+        self.backgroundNode.update(size: size, transition: transition)
         
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -separatorHeight), size: CGSize(width: size.width, height: separatorHeight)))
         
diff --git a/submodules/Display/Source/TextNode.swift b/submodules/Display/Source/TextNode.swift
index e010783205..3d36be6ece 100644
--- a/submodules/Display/Source/TextNode.swift
+++ b/submodules/Display/Source/TextNode.swift
@@ -242,6 +242,14 @@ public final class TextNodeLayout: NSObject {
             return 0.0
         }
     }
+
+    public var trailingLineIsRTL: Bool {
+        if let lastLine = self.lines.last {
+            return lastLine.isRTL
+        } else {
+            return false
+        }
+    }
     
     public func attributesAtPoint(_ point: CGPoint, orNearest: Bool) -> (Int, [NSAttributedString.Key: Any])? {
         if let attributedString = self.attributedString {
@@ -1017,7 +1025,14 @@ public class TextNode: ASDisplayNode {
                             layoutSize.height += fontLineSpacing
                         }
                         
-                        let lineRange = CFRangeMake(lastLineCharacterIndex, lineCharacterCount)
+                        var lineRange = CFRangeMake(lastLineCharacterIndex, lineCharacterCount)
+                        if lineRange.location + lineRange.length > attributedString.length {
+                            lineRange.length = attributedString.length - lineRange.location
+                        }
+                        if lineRange.length < 0 {
+                            break
+                        }
+
                         let coreTextLine = CTTypesetterCreateLineWithOffset(typesetter, lineRange, 100.0)
                         lastLineCharacterIndex += lineCharacterCount
                         
diff --git a/submodules/Display/Source/ToolbarNode.swift b/submodules/Display/Source/ToolbarNode.swift
index fa4dda6a2c..775fe381bd 100644
--- a/submodules/Display/Source/ToolbarNode.swift
+++ b/submodules/Display/Source/ToolbarNode.swift
@@ -8,7 +8,8 @@ public final class ToolbarNode: ASDisplayNode {
     public var left: () -> Void
     public var right: () -> Void
     public var middle: () -> Void
-    
+
+    private let backgroundNode: NavigationBackgroundNode
     private let separatorNode: ASDisplayNode
     private let leftTitle: ImmediateTextNode
     private let leftButton: HighlightTrackingButtonNode
@@ -23,6 +24,8 @@ public final class ToolbarNode: ASDisplayNode {
         self.left = left
         self.right = right
         self.middle = middle
+
+        self.backgroundNode = NavigationBackgroundNode(color: theme.tabBarBackgroundColor)
         
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
@@ -40,6 +43,8 @@ public final class ToolbarNode: ASDisplayNode {
         super.init()
         
         self.isAccessibilityContainer = false
+
+        self.addSubnode(self.backgroundNode)
         
         self.addSubnode(self.leftTitle)
         self.addSubnode(self.leftButton)
@@ -47,6 +52,7 @@ public final class ToolbarNode: ASDisplayNode {
         self.addSubnode(self.rightButton)
         self.addSubnode(self.middleTitle)
         self.addSubnode(self.middleButton)
+
         if self.displaySeparator {
             self.addSubnode(self.separatorNode)
         }
@@ -96,10 +102,12 @@ public final class ToolbarNode: ASDisplayNode {
     
     public func updateTheme(_ theme: TabBarControllerTheme) {
         self.separatorNode.backgroundColor = theme.tabBarSeparatorColor
-        self.backgroundColor = theme.tabBarBackgroundColor
+        self.backgroundNode.updateColor(color: theme.tabBarBackgroundColor, transition: .immediate)
     }
     
     public func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, bottomInset: CGFloat, toolbar: Toolbar, transition: ContainedViewLayoutTransition) {
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size))
+        self.backgroundNode.update(size: size, transition: transition)
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: UIScreenPixel)))
         
         var sideInset: CGFloat = 16.0
diff --git a/submodules/Display/Source/TransformImageArguments.swift b/submodules/Display/Source/TransformImageArguments.swift
index fd3b359d7e..d874eb56de 100644
--- a/submodules/Display/Source/TransformImageArguments.swift
+++ b/submodules/Display/Source/TransformImageArguments.swift
@@ -12,15 +12,15 @@ public protocol TransformImageCustomArguments {
 }
 
 public struct TransformImageArguments: Equatable {
-    public let corners: ImageCorners
+    public var corners: ImageCorners
     
-    public let imageSize: CGSize
-    public let boundingSize: CGSize
-    public let intrinsicInsets: UIEdgeInsets
-    public let resizeMode: TransformImageResizeMode
-    public let emptyColor: UIColor?
-    public let custom: TransformImageCustomArguments?
-    public let scale: CGFloat?
+    public var imageSize: CGSize
+    public var boundingSize: CGSize
+    public var intrinsicInsets: UIEdgeInsets
+    public var resizeMode: TransformImageResizeMode
+    public var emptyColor: UIColor?
+    public var custom: TransformImageCustomArguments?
+    public var scale: CGFloat?
     
     public init(corners: ImageCorners, imageSize: CGSize, boundingSize: CGSize, intrinsicInsets: UIEdgeInsets, resizeMode: TransformImageResizeMode = .fill(.black), emptyColor: UIColor? = nil, custom: TransformImageCustomArguments? = nil, scale: CGFloat? = nil) {
         self.corners = corners
diff --git a/submodules/Display/Source/UIKitUtils.swift b/submodules/Display/Source/UIKitUtils.swift
index bc40ac4391..bb2f3d0333 100644
--- a/submodules/Display/Source/UIKitUtils.swift
+++ b/submodules/Display/Source/UIKitUtils.swift
@@ -133,7 +133,7 @@ public extension UIColor {
         }
     }
     
-    var hsb: (CGFloat, CGFloat, CGFloat) {
+    var hsb: (h: CGFloat, s: CGFloat, b: CGFloat) {
         var hue: CGFloat = 0.0
         var saturation: CGFloat = 0.0
         var brightness: CGFloat = 0.0
@@ -203,7 +203,6 @@ public extension UIColor {
     
     func blitOver(_ other: UIColor, alpha: CGFloat) -> UIColor {
         let alpha = min(1.0, max(0.0, alpha))
-        let oneMinusAlpha = 1.0 - alpha
         
         var r1: CGFloat = 0.0
         var r2: CGFloat = 0.0
@@ -284,6 +283,27 @@ public extension UIColor {
         let b = e1.b - e2.b
         return ((512 + rMean) * r * r) >> 8 + 4 * g * g + ((767 - rMean) * b * b) >> 8
     }
+
+    static func average(of colors: [UIColor]) -> UIColor {
+        var sr: CGFloat = 0.0
+        var sg: CGFloat = 0.0
+        var sb: CGFloat = 0.0
+        var sa: CGFloat = 0.0
+
+        for color in colors {
+            var r: CGFloat = 0.0
+            var g: CGFloat = 0.0
+            var b: CGFloat = 0.0
+            var a: CGFloat = 0.0
+            color.getRed(&r, green: &g, blue: &b, alpha: &a)
+            sr += r
+            sg += g
+            sb += b
+            sa += a
+        }
+
+        return UIColor(red: sr / CGFloat(colors.count), green: sg / CGFloat(colors.count), blue: sb / CGFloat(colors.count), alpha: sa / CGFloat(colors.count))
+    }
 }
 
 public extension CGSize {
diff --git a/submodules/Display/Source/ViewController.swift b/submodules/Display/Source/ViewController.swift
index d4e36bbd54..924cd07fe6 100644
--- a/submodules/Display/Source/ViewController.swift
+++ b/submodules/Display/Source/ViewController.swift
@@ -74,6 +74,16 @@ public enum TabBarItemContextActionType {
 }
 
 @objc open class ViewController: UIViewController, ContainableController {
+    public struct NavigationLayout {
+        public var navigationFrame: CGRect
+        public var defaultContentHeight: CGFloat
+
+        public init(navigationFrame: CGRect, defaultContentHeight: CGFloat) {
+            self.navigationFrame = navigationFrame
+            self.defaultContentHeight = defaultContentHeight
+        }
+    }
+
     private var validLayout: ContainerViewLayout?
     public var currentlyAppliedLayout: ContainerViewLayout? {
         return self.validLayout
@@ -183,8 +193,6 @@ public enum TabBarItemContextActionType {
     public let navigationBar: NavigationBar?
     private(set) var toolbar: Toolbar?
     
-    private var previewingContext: Any?
-    
     public var displayNavigationBar = true
     open var navigationBarRequiresEntireLayoutUpdate: Bool {
         return true
@@ -196,35 +204,28 @@ public enum TabBarItemContextActionType {
     open var hasActiveInput: Bool = false
     
     private var navigationBarOrigin: CGFloat = 0.0
-    
-    public var navigationOffset: CGFloat = 0.0 {
-        didSet {
-            if let navigationBar = self.navigationBar {
-                var navigationBarFrame = navigationBar.frame
-                navigationBarFrame.origin.y = self.navigationBarOrigin + self.navigationOffset
-                navigationBar.frame = navigationBarFrame
-            }
-        }
-    }
-    
-    open var navigationHeight: CGFloat {
-        if let navigationBar = self.navigationBar {
-            return navigationBar.frame.maxY
+
+    open func navigationLayout(layout: ContainerViewLayout) -> NavigationLayout {
+        let statusBarHeight: CGFloat = layout.statusBarHeight ?? 0.0
+        var defaultNavigationBarHeight: CGFloat
+        if self._presentedInModal {
+            defaultNavigationBarHeight = 56.0
         } else {
-            return 0.0
+            defaultNavigationBarHeight = 44.0
         }
-    }
-    
-    open var navigationInsetHeight: CGFloat {
-        if let navigationBar = self.navigationBar {
-            var height = navigationBar.frame.maxY
-            if let contentNode = navigationBar.contentNode, case .expansion = contentNode.mode {
-                height += contentNode.nominalHeight - contentNode.height
-            }
-            return height
-        } else {
-            return 0.0
+        let navigationBarHeight: CGFloat = statusBarHeight + (self.navigationBar?.contentHeight(defaultHeight: defaultNavigationBarHeight) ?? defaultNavigationBarHeight)
+
+        var navigationBarFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: navigationBarHeight))
+
+        navigationBarFrame.size.height += self.additionalNavigationBarHeight
+
+        if !self.displayNavigationBar {
+            navigationBarFrame.origin.y = -navigationBarFrame.size.height
         }
+
+        self.navigationBarOrigin = navigationBarFrame.origin.y
+
+        return NavigationLayout(navigationFrame: navigationBarFrame, defaultContentHeight: defaultNavigationBarHeight)
     }
     
     open var cleanNavigationHeight: CGFloat {
@@ -238,21 +239,11 @@ public enum TabBarItemContextActionType {
             return 0.0
         }
     }
-    
-    open var visualNavigationInsetHeight: CGFloat {
-        if let navigationBar = self.navigationBar {
-            let height = navigationBar.frame.maxY
-            if let contentNode = navigationBar.contentNode, case .expansion = contentNode.mode {
-                //height += contentNode.height
-            }
-            return height
-        } else {
-            return 0.0
-        }
+
+    open var additionalNavigationBarHeight: CGFloat {
+        return 0.0
     }
     
-    public var additionalNavigationBarHeight: CGFloat = 0.0
-    
     public var additionalSideInsets: UIEdgeInsets = UIEdgeInsets()
     
     private let _ready = Promise<Bool>(true)
@@ -375,40 +366,33 @@ public enum TabBarItemContextActionType {
     deinit {
         
     }
-    
-    private func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        let statusBarHeight: CGFloat = layout.statusBarHeight ?? 0.0
-        var defaultNavigationBarHeight: CGFloat
-        if self._presentedInModal {
-            defaultNavigationBarHeight = 56.0
-        } else {
-            defaultNavigationBarHeight = 44.0
-        }
-        let navigationBarHeight: CGFloat = statusBarHeight + (self.navigationBar?.contentHeight(defaultHeight: defaultNavigationBarHeight) ?? defaultNavigationBarHeight)
 
-        let navigationBarOffset: CGFloat
-        if statusBarHeight.isZero {
-            navigationBarOffset = 0.0
-        } else {
-            navigationBarOffset = 0.0
-        }
-        var navigationBarFrame = CGRect(origin: CGPoint(x: 0.0, y: navigationBarOffset), size: CGSize(width: layout.size.width, height: navigationBarHeight))
+    open func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.applyNavigationBarLayout(layout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: 0.0, transition: transition)
+    }
+    
+    public func applyNavigationBarLayout(_ layout: ContainerViewLayout, navigationLayout: NavigationLayout, additionalBackgroundHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+        let statusBarHeight: CGFloat = layout.statusBarHeight ?? 0.0
+
+        var navigationBarFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: navigationLayout.navigationFrame.maxY))
         
         if !self.displayNavigationBar {
             navigationBarFrame.origin.y = -navigationBarFrame.size.height
         }
         
         self.navigationBarOrigin = navigationBarFrame.origin.y
-        navigationBarFrame.origin.y += self.navigationOffset
         
         if let navigationBar = self.navigationBar {
             if let contentNode = navigationBar.contentNode, case .expansion = contentNode.mode, !self.displayNavigationBar {
-                navigationBarFrame.origin.y += contentNode.height + statusBarHeight
+                navigationBarFrame.origin.y -= navigationLayout.defaultContentHeight
+                navigationBarFrame.size.height += contentNode.height + navigationLayout.defaultContentHeight + statusBarHeight
+                //navigationBarFrame.origin.y += contentNode.height + statusBarHeight
             }
             if let _ = navigationBar.contentNode, let _ = navigationBar.secondaryContentNode, !self.displayNavigationBar {
-                navigationBarFrame.origin.y += NavigationBar.defaultSecondaryContentHeight
+                navigationBarFrame.size.height += NavigationBar.defaultSecondaryContentHeight
+                //navigationBarFrame.origin.y += NavigationBar.defaultSecondaryContentHeight
             }
-            navigationBar.updateLayout(size: navigationBarFrame.size, defaultHeight: defaultNavigationBarHeight, additionalHeight: 0.0, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, appearsHidden: !self.displayNavigationBar, transition: transition)
+            navigationBar.updateLayout(size: navigationBarFrame.size, defaultHeight: navigationLayout.defaultContentHeight, additionalTopHeight: statusBarHeight, additionalContentHeight: self.additionalNavigationBarHeight, additionalBackgroundHeight: additionalBackgroundHeight, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, appearsHidden: !self.displayNavigationBar, transition: transition)
             if !transition.isAnimated {
                 navigationBar.layer.cancelAnimationsRecursive(key: "bounds")
                 navigationBar.layer.cancelAnimationsRecursive(key: "position")
@@ -612,33 +596,6 @@ public enum TabBarItemContextActionType {
         }
     }
     
-    @available(iOSApplicationExtension 9.0, iOS 9.0, *)
-    open func registerForPreviewing(with delegate: UIViewControllerPreviewingDelegate, sourceView: UIView, theme: PeekControllerTheme, onlyNative: Bool) {
-    }
-    
-    @available(iOSApplicationExtension 9.0, iOS 9.0, *)
-    public func registerForPreviewingNonNative(with delegate: UIViewControllerPreviewingDelegate, sourceView: UIView, theme: PeekControllerTheme) {
-        if true || self.traitCollection.forceTouchCapability != .available {
-            if self.previewingContext == nil {
-                let previewingContext = SimulatedViewControllerPreviewing(theme: theme, delegate: delegate, sourceView: sourceView, node: self.displayNode, present: { [weak self] c, a in
-                    self?.presentInGlobalOverlay(c, with: a)
-                }, customPresent: { [weak self] c, n in
-                    return self?.customPresentPreviewingController?(c, n)
-                })
-                self.previewingContext = previewingContext
-            }
-        }
-    }
-    
-    @available(iOSApplicationExtension 9.0, iOS 9.0, *)
-    open override func unregisterForPreviewing(withContext previewing: UIViewControllerPreviewing) {
-        if self.previewingContext != nil {
-            self.previewingContext = nil
-        } else {
-            super.unregisterForPreviewing(withContext: previewing)
-        }
-    }
-    
     public final func navigationNextSibling() -> UIViewController? {
         if let navigationController = self.navigationController as? NavigationController {
             if let index = navigationController.viewControllers.firstIndex(where: { $0 === self }) {
diff --git a/submodules/Display/Source/ViewControllerPreviewing.swift b/submodules/Display/Source/ViewControllerPreviewing.swift
deleted file mode 100644
index f9f8072015..0000000000
--- a/submodules/Display/Source/ViewControllerPreviewing.swift
+++ /dev/null
@@ -1,137 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-import SwiftSignalKit
-
-@available(iOSApplicationExtension 9.0, iOS 9.0, *)
-private final class ViewControllerPeekContent: PeekControllerContent {
-    let controller: ViewController
-    private let menu: [PeekControllerMenuItem]
-    
-    init(controller: ViewController) {
-        self.controller = controller
-        var menu: [PeekControllerMenuItem] = []
-        for item in controller.previewActionItems {
-            menu.append(PeekControllerMenuItem(title: item.title, color: .accent, action: { [weak controller] _, _ in
-                if let controller = controller, let item = item as? UIPreviewAction {
-                    item.handler(item, controller)
-                }
-                return true
-            }))
-        }
-        self.menu = menu
-    }
-    
-    func presentation() -> PeekControllerContentPresentation {
-        return .contained
-    }
-    
-    func menuActivation() -> PeerkControllerMenuActivation {
-        return .drag
-    }
-    
-    func menuItems() -> [PeekControllerMenuItem] {
-        return self.menu
-    }
-    
-    func node() -> PeekControllerContentNode & ASDisplayNode {
-        return ViewControllerPeekContentNode(controller: self.controller)
-    }
-    
-    func topAccessoryNode() -> ASDisplayNode? {
-        return nil
-    }
-    
-    func isEqual(to: PeekControllerContent) -> Bool {
-        if let to = to as? ViewControllerPeekContent {
-            return self.controller === to.controller
-        } else {
-            return false
-        }
-    }
-}
-
-private final class ViewControllerPeekContentNode: ASDisplayNode, PeekControllerContentNode {
-    private let controller: ViewController
-    private var hasValidLayout = false
-    
-    init(controller: ViewController) {
-        self.controller = controller
-        
-        super.init()
-    }
-    
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
-        if !self.hasValidLayout {
-            self.hasValidLayout = true
-            self.controller.view.frame = CGRect(origin: CGPoint(), size: size)
-            self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), deviceMetrics: .unknown(screenSize: size, statusBarHeight: 20.0, onScreenNavigationHeight: nil), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), additionalInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: .immediate)
-            self.controller.setIgnoreAppearanceMethodInvocations(true)
-            self.view.addSubview(self.controller.view)
-            self.controller.setIgnoreAppearanceMethodInvocations(false)
-            self.controller.viewWillAppear(false)
-            self.controller.viewDidAppear(false)
-        } else {
-            self.controller.containerLayoutUpdated(ContainerViewLayout(size: size, metrics: LayoutMetrics(), deviceMetrics: .unknown(screenSize: size, statusBarHeight: 20.0, onScreenNavigationHeight: nil), intrinsicInsets: UIEdgeInsets(), safeInsets: UIEdgeInsets(), additionalInsets: UIEdgeInsets(), statusBarHeight: nil, inputHeight: nil, inputHeightIsInteractivellyChanging: false, inVoiceOver: false), transition: transition)
-        }
-        
-        return size
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        if self.bounds.contains(point) {
-            return self.view
-        }
-        return nil
-    }
-}
-
-@available(iOSApplicationExtension 9.0, iOS 9.0, *)
-final class SimulatedViewControllerPreviewing: NSObject, UIViewControllerPreviewing {
-    weak var delegateImpl: UIViewControllerPreviewingDelegate?
-    var delegate: UIViewControllerPreviewingDelegate {
-        return self.delegateImpl!
-    }
-    let recognizer: PeekControllerGestureRecognizer
-    var previewingGestureRecognizerForFailureRelationship: UIGestureRecognizer {
-        return self.recognizer
-    }
-    let sourceView: UIView
-    let node: ASDisplayNode
-    
-    var sourceRect: CGRect = CGRect()
-    
-    init(theme: PeekControllerTheme, delegate: UIViewControllerPreviewingDelegate, sourceView: UIView, node: ASDisplayNode, present: @escaping (ViewController, Any?) -> Void, customPresent: ((ViewController, ASDisplayNode) -> ViewController?)?) {
-        self.delegateImpl = delegate
-        self.sourceView = sourceView
-        self.node = node
-        var contentAtPointImpl: ((CGPoint) -> Signal<(ASDisplayNode, PeekControllerContent)?, NoError>?)?
-        self.recognizer = PeekControllerGestureRecognizer(contentAtPoint: { point in
-            return contentAtPointImpl?(point)
-        }, present: { content, sourceNode in
-            if let content = content as? ViewControllerPeekContent, let controller = customPresent?(content.controller, sourceNode) {
-                present(controller, nil)
-                return controller
-            } else {
-                let controller = PeekController(theme: theme, content: content, sourceNode: {
-                    return sourceNode
-                })
-                present(controller, nil)
-                return controller
-            }
-        })
-        
-        node.view.addGestureRecognizer(self.recognizer)
-        
-        super.init()
-        
-        contentAtPointImpl = { [weak self] point in
-            if let strongSelf = self, let delegate = strongSelf.delegateImpl {
-                if let controller = delegate.previewingContext(strongSelf, viewControllerForLocation: point) as? ViewController {
-                    return .single((strongSelf.node, ViewControllerPeekContent(controller: controller)))
-                }
-            }
-            return nil
-        }
-    }
-}
diff --git a/submodules/Display/Source/WallpaperBackgroundNode.swift b/submodules/Display/Source/WallpaperBackgroundNode.swift
deleted file mode 100644
index 65de835a13..0000000000
--- a/submodules/Display/Source/WallpaperBackgroundNode.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-
-private let motionAmount: CGFloat = 32.0
-
-public final class WallpaperBackgroundNode: ASDisplayNode {
-    let contentNode: ASDisplayNode
-    
-    public var motionEnabled: Bool = false {
-        didSet {
-            if oldValue != self.motionEnabled {
-                if self.motionEnabled {
-                    let horizontal = UIInterpolatingMotionEffect(keyPath: "center.x", type: .tiltAlongHorizontalAxis)
-                    horizontal.minimumRelativeValue = motionAmount
-                    horizontal.maximumRelativeValue = -motionAmount
-                    
-                    let vertical = UIInterpolatingMotionEffect(keyPath: "center.y", type: .tiltAlongVerticalAxis)
-                    vertical.minimumRelativeValue = motionAmount
-                    vertical.maximumRelativeValue = -motionAmount
-                    
-                    let group = UIMotionEffectGroup()
-                    group.motionEffects = [horizontal, vertical]
-                    self.contentNode.view.addMotionEffect(group)
-                } else {
-                    for effect in self.contentNode.view.motionEffects {
-                        self.contentNode.view.removeMotionEffect(effect)
-                    }
-                }
-                if !self.frame.isEmpty {
-                    self.updateScale()
-                }
-            }
-        }
-    }
-        
-    public var image: UIImage? {
-        didSet {
-            self.contentNode.contents = self.image?.cgImage
-        }
-    }
-    
-    public var rotation: CGFloat = 0.0 {
-        didSet {
-            var fromValue: CGFloat = 0.0
-            if let value = (self.layer.value(forKeyPath: "transform.rotation.z") as? NSNumber)?.floatValue {
-                fromValue = CGFloat(value)
-            }
-            self.contentNode.layer.transform = CATransform3DMakeRotation(self.rotation, 0.0, 0.0, 1.0)
-            self.contentNode.layer.animateRotation(from: fromValue, to: self.rotation, duration: 0.3)
-        }
-    }
-    
-    public var imageContentMode: UIView.ContentMode {
-        didSet {
-            self.contentNode.contentMode = self.imageContentMode
-        }
-    }
-    
-    func updateScale() {
-        if self.motionEnabled {
-            let scale = (self.frame.width + motionAmount * 2.0) / self.frame.width
-            self.contentNode.transform = CATransform3DMakeScale(scale, scale, 1.0)
-        } else {
-            self.contentNode.transform = CATransform3DIdentity
-        }
-    }
-    
-    public override init() {
-        self.imageContentMode = .scaleAspectFill
-        
-        self.contentNode = ASDisplayNode()
-        self.contentNode.contentMode = self.imageContentMode
-        
-        super.init()
-        
-        self.clipsToBounds = true
-        self.contentNode.frame = self.bounds
-        self.addSubnode(self.contentNode)
-    }
-    
-    public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
-        let isFirstLayout = self.contentNode.frame.isEmpty
-        transition.updatePosition(node: self.contentNode, position: CGPoint(x: size.width / 2.0, y: size.height / 2.0))
-        transition.updateBounds(node: self.contentNode, bounds: CGRect(origin: CGPoint(), size: size))
-        
-        if isFirstLayout && !self.frame.isEmpty {
-            self.updateScale()
-        }
-    }
-}
diff --git a/submodules/Display/Source/WindowContent.swift b/submodules/Display/Source/WindowContent.swift
index df3eec9703..34f98e1b9b 100644
--- a/submodules/Display/Source/WindowContent.swift
+++ b/submodules/Display/Source/WindowContent.swift
@@ -117,14 +117,6 @@ private func containedLayoutForWindowLayout(_ layout: WindowLayout, deviceMetric
     return ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: deviceMetrics, intrinsicInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.onScreenNavigationHeight ?? 0.0, right: 0.0), safeInsets: resolvedSafeInsets, additionalInsets: UIEdgeInsets(), statusBarHeight: resolvedStatusBarHeight, inputHeight: updatedInputHeight, inputHeightIsInteractivellyChanging: layout.upperKeyboardInputPositionBound != nil && layout.upperKeyboardInputPositionBound != layout.size.height && layout.inputHeight != nil, inVoiceOver: layout.inVoiceOver)
 }
 
-private func encodeText(_ string: String, _ key: Int) -> String {
-    var result = ""
-    for c in string.unicodeScalars {
-        result.append(Character(UnicodeScalar(UInt32(Int(c.value) + key))!))
-    }
-    return result
-}
-
 public func doesViewTreeDisableInteractiveTransitionGestureRecognizer(_ view: UIView, keyboardOnly: Bool = false) -> Bool {
     if view.disablesInteractiveTransitionGestureRecognizer && !keyboardOnly {
         return true
@@ -237,7 +229,7 @@ public class Window1 {
     
     private var deviceMetrics: DeviceMetrics
     
-    private let statusBarHost: StatusBarHost?
+    public let statusBarHost: StatusBarHost?
     private let keyboardManager: KeyboardManager?
     private let keyboardViewManager: KeyboardViewManager?
     private var statusBarChangeObserver: AnyObject?
@@ -270,8 +262,42 @@ public class Window1 {
     private var shouldNotAnimateLikelyKeyboardAutocorrectionSwitch: Bool = false
     
     public private(set) var forceInCallStatusBarText: String? = nil
-    public var inCallNavigate: (() -> Void)? {
+    public var inCallNavigate: (() -> Void)?
+
+    private var debugTapCounter: (Double, Int) = (0.0, 0)
+    private var debugTapRecognizer: UITapGestureRecognizer?
+    public var debugAction: (() -> Void)? {
         didSet {
+            if self.debugAction != nil {
+                if self.debugTapRecognizer == nil {
+                    let debugTapRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.debugTapGesture(_:)))
+                    self.debugTapRecognizer = debugTapRecognizer
+                    self.hostView.containerView.addGestureRecognizer(debugTapRecognizer)
+                }
+            } else if let debugTapRecognizer = self.debugTapRecognizer {
+                self.debugTapRecognizer = nil
+                self.hostView.containerView.removeGestureRecognizer(debugTapRecognizer)
+            }
+        }
+    }
+    @objc private func debugTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            let timestamp = CACurrentMediaTime()
+            if self.debugTapCounter.0 < timestamp - 0.4 {
+                self.debugTapCounter.0 = timestamp
+                self.debugTapCounter.1 = 0
+            }
+
+            if self.debugTapCounter.0 >= timestamp - 0.4 {
+                self.debugTapCounter.0 = timestamp
+                self.debugTapCounter.1 += 1
+            }
+
+            if self.debugTapCounter.1 >= 10 {
+                self.debugTapCounter.1 = 0
+
+                self.debugAction?()
+            }
         }
     }
     
@@ -750,12 +776,11 @@ public class Window1 {
                         self?.inCallNavigate?()
                     }
                 }
+                self.hostView.containerView.insertSubview(rootController.view, at: 0)
                 if !self.windowLayout.size.width.isZero && !self.windowLayout.size.height.isZero {
                     rootController.displayNode.frame = CGRect(origin: CGPoint(), size: self.windowLayout.size)
                     rootController.containerLayoutUpdated(containedLayoutForWindowLayout(self.windowLayout, deviceMetrics: self.deviceMetrics), transition: .immediate)
                 }
-                
-                self.hostView.containerView.insertSubview(rootController.view, at: 0)
             }
             
             self.hostView.eventView.setNeedsLayout()
diff --git a/submodules/Display/Source/WindowPanRecognizer.swift b/submodules/Display/Source/WindowPanRecognizer.swift
index d9180edbaa..53ed394912 100644
--- a/submodules/Display/Source/WindowPanRecognizer.swift
+++ b/submodules/Display/Source/WindowPanRecognizer.swift
@@ -13,6 +13,10 @@ public final class WindowPanRecognizer: UIGestureRecognizer {
         
         self.previousPoints.removeAll()
     }
+
+    public func cancel() {
+        self.state = .cancelled
+    }
     
     private func addPoint(_ point: CGPoint) {
         self.previousPoints.append((point, CACurrentMediaTime()))
diff --git a/submodules/FFMpegBinding/Sources/FFMpegSWResample.m b/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
index fbecf0555b..16c2a888dc 100644
--- a/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
@@ -6,6 +6,7 @@
 #import "libswresample/swresample.h"
 
 @interface FFMpegSWResample () {
+    int _sourceChannelCount;
     SwrContext *_context;
     NSUInteger _ratio;
     NSInteger _destinationChannelCount;
@@ -21,6 +22,7 @@
 - (instancetype)initWithSourceChannelCount:(NSInteger)sourceChannelCount sourceSampleRate:(NSInteger)sourceSampleRate sourceSampleFormat:(enum FFMpegAVSampleFormat)sourceSampleFormat destinationChannelCount:(NSInteger)destinationChannelCount destinationSampleRate:(NSInteger)destinationSampleRate destinationSampleFormat:(enum FFMpegAVSampleFormat)destinationSampleFormat {
     self = [super init];
     if (self != nil) {
+        _sourceChannelCount = sourceChannelCount;
         _destinationChannelCount = destinationChannelCount;
         _destinationSampleFormat = destinationSampleFormat;
         _context = swr_alloc_set_opts(NULL,
@@ -47,6 +49,12 @@
 
 - (NSData * _Nullable)resample:(FFMpegAVFrame *)frame {
     AVFrame *frameImpl = (AVFrame *)[frame impl];
+
+    int numChannels = frameImpl->channels;
+    if (numChannels != _sourceChannelCount) {
+        return nil;
+    }
+
     int bufSize = av_samples_get_buffer_size(NULL,
                                              (int)_destinationChannelCount,
                                              frameImpl->nb_samples * (int)_ratio,
diff --git a/submodules/GalleryUI/BUILD b/submodules/GalleryUI/BUILD
index 06170f2d03..6a06062b21 100644
--- a/submodules/GalleryUI/BUILD
+++ b/submodules/GalleryUI/BUILD
@@ -28,6 +28,7 @@ swift_library(
         "//submodules/OverlayStatusController:OverlayStatusController",
         "//submodules/PresentationDataUtils:PresentationDataUtils",
         "//submodules/UrlEscaping:UrlEscaping",
+        "//submodules/ManagedAnimationNode:ManagedAnimationNode"
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift
index 3eca056b51..d099fe3d7b 100644
--- a/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift
+++ b/submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift
@@ -20,6 +20,7 @@ import LocalizedPeerData
 import TextSelectionNode
 import UrlEscaping
 import UndoUI
+import ManagedAnimationNode
 
 private let deleteImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionTrash"), color: .white)
 private let actionImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/MessageSelectionForward"), color: .white)
@@ -27,8 +28,6 @@ private let editImage = generateTintedImage(image: UIImage(bundleImageName: "Med
 
 private let backwardImage = generateTintedImage(image:  UIImage(bundleImageName: "Media Gallery/BackwardButton"), color: .white)
 private let forwardImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/ForwardButton"), color: .white)
-private let pauseImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/PauseButton"), color: .white)
-private let playImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/PlayButton"), color: .white)
 
 private let cloudFetchIcon = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/FileCloudFetch"), color: UIColor.white)
 
@@ -108,6 +107,8 @@ class CaptionScrollWrapperNode: ASDisplayNode {
     }
 }
 
+
+
 final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScrollViewDelegate {
     private let context: AccountContext
     private var presentationData: PresentationData
@@ -127,9 +128,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     private let textNode: ImmediateTextNode
     private let authorNameNode: ASTextNode
     private let dateNode: ASTextNode
-    private let backwardButton: HighlightableButtonNode
-    private let forwardButton: HighlightableButtonNode
+    private let backwardButton: PlaybackButtonNode
+    private let forwardButton: PlaybackButtonNode
     private let playbackControlButton: HighlightableButtonNode
+    private let playPauseIconNode: PlayPauseIconNode
     
     private let statusButtonNode: HighlightTrackingButtonNode
     private let statusNode: RadialStatusNode
@@ -152,6 +154,8 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     var setPlayRate: ((Double) -> Void)?
     var fetchControl: (() -> Void)?
     
+    var interacting: ((Bool) -> Void)?
+    
     private var seekTimer: SwiftSignalKit.Timer?
     private var currentIsPaused: Bool = true
     private var seekRate: Double = 1.0
@@ -179,7 +183,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                         self.forwardButton.isHidden = !seekable
                         if status == .Local {
                             self.playbackControlButton.isHidden = false
-                            self.playbackControlButton.setImage(playImage, for: [])
+                            self.playPauseIconNode.enqueueState(.play, animated: true)
                         } else {
                             self.playbackControlButton.isHidden = true
                         }
@@ -188,7 +192,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                         
                         var statusState: RadialStatusNodeState = .none
                         switch status {
-                            case let .Fetching(isActive, progress):
+                            case let .Fetching(_, progress):
                                 let adjustedProgress = max(progress, 0.027)
                                 statusState = .cloudProgress(color: UIColor.white, strokeBackgroundColor: UIColor.white.withAlphaComponent(0.5), lineWidth: 2.0, value: CGFloat(adjustedProgress))
                             case .Local:
@@ -207,7 +211,14 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                         self.backwardButton.isHidden = !seekable
                         self.forwardButton.isHidden = !seekable
                         self.playbackControlButton.isHidden = false
-                        self.playbackControlButton.setImage(paused ? playImage : pauseImage, for: [])
+                        
+                        let icon: PlayPauseIconNodeState
+                        if let wasPlaying = self.wasPlaying {
+                            icon = wasPlaying ? .pause : .play
+                        } else {
+                            icon = paused ? .play : .pause
+                        }
+                        self.playPauseIconNode.enqueueState(icon, animated: true)
                         self.statusButtonNode.isHidden = true
                         self.statusNode.isHidden = true
                 }
@@ -303,17 +314,20 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
         self.dateNode.isUserInteractionEnabled = false
         self.dateNode.displaysAsynchronously = false
         
-        self.backwardButton = HighlightableButtonNode()
+        self.backwardButton = PlaybackButtonNode()
         self.backwardButton.isHidden = true
-        self.backwardButton.setImage(backwardImage, for: [])
+        self.backwardButton.backgroundIconNode.image = backwardImage
         
-        self.forwardButton = HighlightableButtonNode()
+        self.forwardButton = PlaybackButtonNode()
         self.forwardButton.isHidden = true
-        self.forwardButton.setImage(forwardImage, for: [])
+        self.forwardButton.forward = true
+        self.forwardButton.backgroundIconNode.image = forwardImage
         
         self.playbackControlButton = HighlightableButtonNode()
         self.playbackControlButton.isHidden = true
         
+        self.playPauseIconNode = PlayPauseIconNode()
+        
         self.statusButtonNode = HighlightTrackingButtonNode()
         self.statusNode = RadialStatusNode(backgroundNodeColor: .clear)
         self.statusNode.isUserInteractionEnabled = false
@@ -361,6 +375,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
         self.contentNode.addSubnode(self.backwardButton)
         self.contentNode.addSubnode(self.forwardButton)
         self.contentNode.addSubnode(self.playbackControlButton)
+        self.playbackControlButton.addSubnode(self.playPauseIconNode)
         
         self.contentNode.addSubnode(self.statusNode)
         self.contentNode.addSubnode(self.statusButtonNode)
@@ -405,12 +420,14 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
         self.forwardButton.view.addGestureRecognizer(forwardLongPressGestureRecognizer)
     }
     
-    private var wasPlaying = false
+    private var wasPlaying: Bool?
     @objc private func seekBackwardLongPress(_ gestureRecognizer: UILongPressGestureRecognizer) {
         switch gestureRecognizer.state {
             case .began:
+                self.interacting?(true)
+                self.backwardButton.isPressing = true
                 self.wasPlaying = !self.currentIsPaused
-                if self.wasPlaying {
+                if self.wasPlaying == true {
                     self.playbackControl?()
                 }
                 
@@ -431,12 +448,14 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                 self.seekTimer = seekTimer
                 seekTimer.start()
             case .ended, .cancelled:
+                self.interacting?(false)
+                self.backwardButton.isPressing = false
                 self.seekTimer?.invalidate()
                 self.seekTimer = nil
-                if self.wasPlaying {
+                if self.wasPlaying == true {
                     self.playbackControl?()
-                    self.wasPlaying = false
                 }
+                self.wasPlaying = nil
             default:
                 break
         }
@@ -445,8 +464,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     @objc private func seekForwardLongPress(_ gestureRecognizer: UILongPressGestureRecognizer) {
         switch gestureRecognizer.state {
             case .began:
+                self.interacting?(true)
+                self.forwardButton.isPressing = true
                 self.wasPlaying = !self.currentIsPaused
-                if !self.wasPlaying {
+                if self.wasPlaying == false {
                     self.playbackControl?()
                 }
                 
@@ -467,13 +488,16 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                 self.seekTimer = seekTimer
                 seekTimer.start()
             case .ended, .cancelled:
+                self.interacting?(false)
+                self.forwardButton.isPressing = false
                 self.setPlayRate?(1.0)
                 self.seekTimer?.invalidate()
                 self.seekTimer = nil
                 
-                if !self.wasPlaying {
+                if self.wasPlaying == false {
                     self.playbackControl?()
                 }
+                self.wasPlaying = nil
             default:
                 break
         }
@@ -503,7 +527,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     
     func setup(origin: GalleryItemOriginData?, caption: NSAttributedString) {
         let titleText = origin?.title
-        let dateText = origin?.timestamp.flatMap { humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: $0) }
+        let dateText = origin?.timestamp.flatMap { humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: $0).0 }
         
         if self.currentMessageText != caption || self.currentAuthorNameText != titleText || self.currentDateText != dateText {
             self.currentMessageText = caption
@@ -586,8 +610,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
             authorNameText = peer.displayTitle(strings: self.strings, displayOrder: self.nameOrder)
         }
         
-        var dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: message.timestamp)
-        
+        var dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: message.timestamp).0
         if !displayInfo {
             authorNameText = ""
             dateText = ""
@@ -759,22 +782,24 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
         self.deleteButton.frame = deleteFrame
         self.editButton.frame = editFrame
 
-        if let image = self.backwardButton.image(for: .normal) {
+        if let image = self.backwardButton.backgroundIconNode.image {
             self.backwardButton.frame = CGRect(origin: CGPoint(x: floor((width - image.size.width) / 2.0) - 66.0, y: panelHeight - bottomInset - 44.0 + 7.0), size: image.size)
         }
-        if let image = self.forwardButton.image(for: .normal) {
+        if let image = self.forwardButton.backgroundIconNode.image {
             self.forwardButton.frame = CGRect(origin: CGPoint(x: floor((width - image.size.width) / 2.0) + 66.0, y: panelHeight - bottomInset - 44.0 + 7.0), size: image.size)
         }
         
         self.playbackControlButton.frame = CGRect(origin: CGPoint(x: floor((width - 44.0) / 2.0), y: panelHeight - bottomInset - 44.0), size: CGSize(width: 44.0, height: 44.0))
+        self.playPauseIconNode.frame = self.playbackControlButton.bounds.offsetBy(dx: 2.0, dy: 2.0)
         
         let statusSize = CGSize(width: 28.0, height: 28.0)
         transition.updateFrame(node: self.statusNode, frame: CGRect(origin: CGPoint(x: floor((width - statusSize.width) / 2.0), y: panelHeight - bottomInset - statusSize.height - 8.0), size: statusSize))
         
         self.statusButtonNode.frame = CGRect(origin: CGPoint(x: floor((width - 44.0) / 2.0), y: panelHeight - bottomInset - 44.0), size: CGSize(width: 44.0, height: 44.0))
         
-        let authorNameSize = self.authorNameNode.measure(CGSize(width: width - 44.0 * 2.0 - 8.0 * 2.0 - leftInset - rightInset, height: CGFloat.greatestFiniteMagnitude))
-        let dateSize = self.dateNode.measure(CGSize(width: width - 44.0 * 2.0 - 8.0 * 2.0, height: CGFloat.greatestFiniteMagnitude))
+        let buttonsSideInset: CGFloat = !self.editButton.isHidden ? 88.0 : 44.0
+        let authorNameSize = self.authorNameNode.measure(CGSize(width: width - buttonsSideInset * 2.0 - 8.0 * 2.0 - leftInset - rightInset, height: CGFloat.greatestFiniteMagnitude))
+        let dateSize = self.dateNode.measure(CGSize(width: width - buttonsSideInset * 2.0 - 8.0 * 2.0, height: CGFloat.greatestFiniteMagnitude))
         
         if authorNameSize.height.isZero {
             self.dateNode.frame = CGRect(origin: CGPoint(x: floor((width - dateSize.width) / 2.0), y: panelHeight - bottomInset - 44.0 + floor((44.0 - dateSize.height) / 2.0)), size: dateSize)
@@ -873,10 +898,16 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                     if messages.count == 1 {
                         strongSelf.commitDeleteMessages(messages, ask: true)
                     } else {
-                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        strongSelf.interacting?(true)
+                        
+                        var presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        if !presentationData.theme.overallDarkAppearance {
+                            presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+                        }
+                        
                         var generalMessageContentKind: MessageContentKind?
                         for message in messages {
-                            let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: strongSelf.context.account.peerId)
+                            let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: strongSelf.context.account.peerId)
                             if generalMessageContentKind == nil || generalMessageContentKind == currentKind {
                                 generalMessageContentKind = currentKind
                             } else {
@@ -907,7 +938,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                             }
                         }
                     
-                        let actionSheet = ActionSheetController(presentationData: presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
+                        actionSheet.dismissed = { [weak self] _ in
+                            self?.interacting?(false)
+                        }
                         let items: [ActionSheetItem] = [
                             ActionSheetButtonItem(title: singleText, color: .destructive, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
@@ -937,7 +971,11 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     private func commitDeleteMessages(_ messages: [Message], ask: Bool) {
         self.messageContextDisposable.set((self.context.sharedContext.chatAvailableMessageActions(postbox: self.context.account.postbox, accountPeerId: self.context.account.peerId, messageIds: Set(messages.map { $0.id })) |> deliverOnMainQueue).start(next: { [weak self] actions in
             if let strongSelf = self, let controllerInteration = strongSelf.controllerInteraction, !actions.options.isEmpty {
-                let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                var presentationData = strongSelf.presentationData
+                if !presentationData.theme.overallDarkAppearance {
+                    presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+                }
+                let actionSheet = ActionSheetController(presentationData: presentationData)
                 var items: [ActionSheetItem] = []
                 var personalPeerName: String?
                 var isChannel = false
@@ -960,7 +998,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                     items.append(ActionSheetButtonItem(title: globalTitle, color: .destructive, action: { [weak actionSheet] in
                         actionSheet?.dismissAnimated()
                         if let strongSelf = self {
-                            let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: messages.map { $0.id }, type: .forEveryone).start()
+                            let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: messages.map { $0.id }, type: .forEveryone).start()
                             strongSelf.controllerInteraction?.dismissController()
                         }
                     }))
@@ -975,15 +1013,19 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                     items.append(ActionSheetButtonItem(title: localOptionText, color: .destructive, action: { [weak actionSheet] in
                         actionSheet?.dismissAnimated()
                         if let strongSelf = self {
-                            let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: messages.map { $0.id }, type: .forLocalPeer).start()
+                            let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: messages.map { $0.id }, type: .forLocalPeer).start()
                             strongSelf.controllerInteraction?.dismissController()
                         }
                     }))
                 }
                 if !ask && items.count == 1 {
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: messages.map { $0.id }, type: .forEveryone).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: messages.map { $0.id }, type: .forEveryone).start()
                     strongSelf.controllerInteraction?.dismissController()
                 } else if !items.isEmpty {
+                    strongSelf.interacting?(true)
+                    actionSheet.dismissed = { [weak self] _ in
+                        self?.interacting?(false)
+                    }
                     actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
                         ActionSheetButtonItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
@@ -996,18 +1038,25 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     }
     
     @objc func actionButtonPressed() {
+        self.interacting?(true)
+        
         if let currentMessage = self.currentMessage {
             let _ = (self.context.account.postbox.transaction { transaction -> [Message] in
                 return transaction.getMessageGroup(currentMessage.id) ?? []
             } |> deliverOnMainQueue).start(next: { [weak self] messages in
                 if let strongSelf = self, !messages.isEmpty {
-                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    var presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    var forceTheme: PresentationTheme?
+                    if !presentationData.theme.overallDarkAppearance {
+                        forceTheme = defaultDarkColorPresentationTheme
+                        presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+                    }
                     var generalMessageContentKind: MessageContentKind?
                     var beganContentKindScanning = false
                     var messageContentKinds = Set<MessageContentKindKey>()
                     
                     for message in messages {
-                        let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: strongSelf.context.account.peerId)
+                        let currentKind = messageContentKind(contentSettings: strongSelf.context.currentContentSettings.with { $0 }, message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: strongSelf.context.account.peerId)
                         if beganContentKindScanning && currentKind != generalMessageContentKind {
                             generalMessageContentKind = nil
                         } else if !beganContentKindScanning || currentKind == generalMessageContentKind {
@@ -1078,7 +1127,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                                 }
                             }
                         }
-                        let shareController = ShareController(context: strongSelf.context, subject: subject, preferredAction: preferredAction, forcedTheme: defaultDarkColorPresentationTheme)
+                        let shareController = ShareController(context: strongSelf.context, subject: subject, preferredAction: preferredAction, forceTheme: forceTheme)
+                        shareController.dismissed = { [weak self] _ in
+                            self?.interacting?(false)
+                        }
                         shareController.completed = { [weak self] peerIds in
                             if let strongSelf = self {
                                 let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
@@ -1139,7 +1191,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                         
                         let shareAction: ([Message]) -> Void = { messages in
                             if let strongSelf = self {
-                                let shareController = ShareController(context: strongSelf.context, subject: .messages(messages), preferredAction: preferredAction, forcedTheme: defaultDarkColorPresentationTheme)
+                                let shareController = ShareController(context: strongSelf.context, subject: .messages(messages), preferredAction: preferredAction, forceTheme: forceTheme)
+                                shareController.dismissed = { [weak self] _ in
+                                    self?.interacting?(false)
+                                }
                                 shareController.completed = { [weak self] peerIds in
                                     if let strongSelf = self {
                                         let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
@@ -1184,7 +1239,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                             }
                         }
                         
-                        let actionSheet = ActionSheetController(presentationData: presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         let items: [ActionSheetItem] = [
                             ActionSheetButtonItem(title: singleText, color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
@@ -1208,7 +1263,12 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                 }
             })
         } else if let (webPage, media) = self.currentWebPageAndMedia {
-            let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+            var presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+            var forceTheme: PresentationTheme?
+            if !presentationData.theme.overallDarkAppearance {
+                forceTheme = defaultDarkColorPresentationTheme
+                presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+            }
             
             var preferredAction = ShareControllerPreferredAction.default
             var subject = ShareControllerSubject.media(.webPage(webPage: WebpageReference(webPage), media: media))
@@ -1231,7 +1291,7 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                     if availableOpenInOptions(context: self.context, item: item).count > 1 {
                         preferredAction = .custom(action: ShareControllerAction(title: presentationData.strings.Conversation_FileOpenIn, action: { [weak self] in
                             if let strongSelf = self {
-                                let openInController = OpenInActionSheetController(context: strongSelf.context, forceTheme: defaultDarkColorPresentationTheme, item: item, additionalAction: nil, openUrl: { [weak self] url in
+                                let openInController = OpenInActionSheetController(context: strongSelf.context, forceTheme: forceTheme, item: item, additionalAction: nil, openUrl: { [weak self] url in
                                     if let strongSelf = self {
                                         strongSelf.context.sharedContext.openExternalUrl(context: strongSelf.context, urlContext: .generic, url: url, forceExternal: true, presentationData: presentationData, navigationController: nil, dismissInput: {})
                                     }
@@ -1256,7 +1316,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
                     }
                 }
             }
-            let shareController = ShareController(context: self.context, subject: subject, preferredAction: preferredAction, forcedTheme: defaultDarkColorPresentationTheme)
+            let shareController = ShareController(context: self.context, subject: subject, preferredAction: preferredAction, forceTheme: forceTheme)
+            shareController.dismissed = { [weak self] _ in
+                self?.interacting?(false)
+            }
             shareController.completed = { [weak self] peerIds in
                 if let strongSelf = self {
                     let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
@@ -1313,11 +1376,15 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
     }
     
     @objc func backwardButtonPressed() {
+        self.interacting?(true)
         self.seekBackward?(15.0)
+        self.interacting?(false)
     }
     
     @objc func forwardButtonPressed() {
+        self.interacting?(true)
         self.seekForward?(15.0)
+        self.interacting?(false)
     }
     
     @objc private func statusPressed() {
@@ -1381,3 +1448,119 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
         }
     }
 }
+
+private enum PlayPauseIconNodeState: Equatable {
+    case play
+    case pause
+}
+
+private final class PlayPauseIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.35
+    private var iconState: PlayPauseIconNodeState = .pause
+    
+    init() {
+        super.init(size: CGSize(width: 40.0, height: 40.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: PlayPauseIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .play:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 83), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .play:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 41), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+                        }
+                    case .play:
+                        break
+                }
+        }
+    }
+}
+
+private let circleDiameter: CGFloat = 80.0
+
+private final class PlaybackButtonNode: HighlightTrackingButtonNode {
+    let backgroundIconNode: ASImageNode
+    let textNode: ImmediateTextNode
+    
+    var forward: Bool = false
+
+    var isPressing = false {
+        didSet {
+            if self.isPressing != oldValue && !self.isPressing {
+                self.highligthedChanged(false)
+            }
+        }
+    }
+    
+    init() {
+        self.backgroundIconNode = ASImageNode()
+        self.backgroundIconNode.isLayerBacked = true
+        self.backgroundIconNode.displaysAsynchronously = false
+        self.backgroundIconNode.displayWithoutProcessing = true
+        
+        self.textNode = ImmediateTextNode()
+        self.textNode.attributedText = NSAttributedString(string: "15", font: Font.with(size: 11.0, design: .round, weight: .semibold, traits: []), textColor: .white)
+        
+        super.init(pointerStyle: .circle)
+        
+        self.addSubnode(self.backgroundIconNode)
+        self.addSubnode(self.textNode)
+        
+        self.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.backgroundIconNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.backgroundIconNode.alpha = 0.4
+                    
+                    strongSelf.textNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.textNode.alpha = 0.4
+                    
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.18, curve: .linear)
+                    let angle = CGFloat.pi / 4.0 + 0.226
+                    transition.updateTransformRotation(node: strongSelf.backgroundIconNode, angle: strongSelf.forward ? angle : -angle)
+                } else if !strongSelf.isPressing {
+                    strongSelf.backgroundIconNode.alpha = 1.0
+                    strongSelf.backgroundIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    
+                    strongSelf.textNode.alpha = 1.0
+                    strongSelf.textNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.2, curve: .linear)
+                    transition.updateTransformRotation(node: strongSelf.backgroundIconNode, angle: 0.0)
+                }
+            }
+        }
+    }
+    
+    override func layout() {
+        super.layout()
+        self.backgroundIconNode.frame = self.bounds
+        
+        let size = self.bounds.size
+        let textSize = self.textNode.updateLayout(size)
+        self.textNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - textSize.width) / 2.0), y: floorToScreenPixels((size.height - textSize.height) / 2.0) + UIScreenPixel), size: textSize)
+    }
+}
diff --git a/submodules/GalleryUI/Sources/ChatVideoGalleryItemScrubberView.swift b/submodules/GalleryUI/Sources/ChatVideoGalleryItemScrubberView.swift
index 97e49dded0..dcb3b6d743 100644
--- a/submodules/GalleryUI/Sources/ChatVideoGalleryItemScrubberView.swift
+++ b/submodules/GalleryUI/Sources/ChatVideoGalleryItemScrubberView.swift
@@ -9,7 +9,7 @@ import Display
 import UniversalMediaPlayer
 import TelegramPresentationData
 
-private let textFont = Font.regular(13.0)
+private let textFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
 
 private let scrubberBackgroundColor = UIColor(white: 1.0, alpha: 0.42)
 private let scrubberForegroundColor = UIColor.white
@@ -120,7 +120,7 @@ final class ChatVideoGalleryItemScrubberView: UIView {
         self.fetchStatusDisposable.dispose()
     }
     
-    var collapsed: Bool = false
+    var collapsed: Bool?
     func setCollapsed(_ collapsed: Bool, animated: Bool) {
         guard self.collapsed != collapsed else {
             return
@@ -128,15 +128,14 @@ final class ChatVideoGalleryItemScrubberView: UIView {
         
         self.collapsed = collapsed
         
-        guard let (size, _, _) = self.containerLayout else {
-            return
-        }
-        
         let alpha: CGFloat = collapsed ? 0.0 : 1.0
         self.leftTimestampNode.alpha = alpha
         self.rightTimestampNode.alpha = alpha
-        self.infoNode.alpha = size.width < size.height && !self.collapsed ? 1.0 : 0.0
         self.updateScrubberVisibility(animated: animated)
+        
+        if let (size, _, _) = self.containerLayout {
+            self.infoNode.alpha = size.width < size.height && !collapsed ? 1.0 : 0.0
+        }
     }
     
     private func updateScrubberVisibility(animated: Bool) {
@@ -144,10 +143,10 @@ final class ChatVideoGalleryItemScrubberView: UIView {
         var alpha: CGFloat = 1.0
         if let playbackStatus = self.playbackStatus, playbackStatus.duration <= 30.0 {
         } else {
-            alpha = self.collapsed ? 0.0 : 1.0
+            alpha = self.collapsed == true ? 0.0 : 1.0
             collapsed = false
         }
-        self.scrubberNode.setCollapsed(collapsed, animated: animated)
+        self.scrubberNode.setCollapsed(collapsed == true, animated: animated)
         let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.3, curve: .linear) : .immediate
         transition.updateAlpha(node: self.scrubberNode, alpha: alpha)
     }
@@ -226,6 +225,7 @@ final class ChatVideoGalleryItemScrubberView: UIView {
     }
     
     func setFetchStatusSignal(_ fetchStatus: Signal<MediaResourceStatus, NoError>?, strings: PresentationStrings, decimalSeparator: String, fileSize: Int?) {
+        let formatting = DataSizeStringFormatting(strings: strings, decimalSeparator: decimalSeparator)
         if let fileSize = fileSize {
             if let fetchStatus = fetchStatus {
                 self.fetchStatusDisposable.set((fetchStatus
@@ -234,9 +234,9 @@ final class ChatVideoGalleryItemScrubberView: UIView {
                         var text: String
                         switch status {
                             case .Remote:
-                                text = dataSizeString(fileSize, forceDecimal: true, decimalSeparator: decimalSeparator)
+                                text = dataSizeString(fileSize, forceDecimal: true, formatting: formatting)
                             case let .Fetching(_, progress):
-                                text = strings.DownloadingStatus(dataSizeString(Int64(Float(fileSize) * progress), forceDecimal: true, decimalSeparator: decimalSeparator), dataSizeString(fileSize, forceDecimal: true, decimalSeparator: decimalSeparator)).0
+                                text = strings.DownloadingStatus(dataSizeString(Int64(Float(fileSize) * progress), forceDecimal: true, formatting: formatting), dataSizeString(fileSize, forceDecimal: true, formatting: formatting)).0
                             default:
                                 text = ""
                         }
@@ -248,7 +248,7 @@ final class ChatVideoGalleryItemScrubberView: UIView {
                     }
                 }))
             } else {
-                self.infoNode.attributedText = NSAttributedString(string: dataSizeString(fileSize, forceDecimal: true, decimalSeparator: decimalSeparator), font: textFont, textColor: .white)
+                self.infoNode.attributedText = NSAttributedString(string: dataSizeString(fileSize, forceDecimal: true, formatting: formatting), font: textFont, textColor: .white)
             }
         } else {
             self.infoNode.attributedText = nil
@@ -284,7 +284,7 @@ final class ChatVideoGalleryItemScrubberView: UIView {
         let infoSize = self.infoNode.measure(infoConstrainedSize)
         self.infoNode.bounds = CGRect(origin: CGPoint(), size: infoSize)
         transition.updatePosition(node: self.infoNode, position: CGPoint(x: size.width / 2.0, y: infoOffset + infoSize.height / 2.0))
-        self.infoNode.alpha = size.width < size.height && !self.collapsed ? 1.0 : 0.0
+        self.infoNode.alpha = size.width < size.height && self.collapsed == false ? 1.0 : 0.0
         
         self.scrubberNode.frame = CGRect(origin: CGPoint(x: scrubberInset, y: 6.0), size: CGSize(width: size.width - leftInset - rightInset - scrubberInset * 2.0, height: scrubberHeight))
     }
diff --git a/submodules/GalleryUI/Sources/GalleryController.swift b/submodules/GalleryUI/Sources/GalleryController.swift
index a35425a0fe..d55e5ff53f 100644
--- a/submodules/GalleryUI/Sources/GalleryController.swift
+++ b/submodules/GalleryUI/Sources/GalleryController.swift
@@ -323,8 +323,8 @@ public struct GalleryConfiguration {
 }
 
 public class GalleryController: ViewController, StandalonePresentableController {
-    public static let darkNavigationTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: UIColor(rgb: 0x525252), primaryTextColor: .white, backgroundColor: UIColor(white: 0.0, alpha: 0.6), separatorColor: UIColor(white: 0.0, alpha: 0.8), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
-    public static let lightNavigationTheme = NavigationBarTheme(buttonColor: UIColor(rgb: 0x007ee5), disabledButtonColor: UIColor(rgb: 0xd0d0d0), primaryTextColor: .black, backgroundColor: UIColor(red: 0.968626451, green: 0.968626451, blue: 0.968626451, alpha: 1.0), separatorColor: UIColor(red: 0.6953125, green: 0.6953125, blue: 0.6953125, alpha: 1.0), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
+    public static let darkNavigationTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: UIColor(rgb: 0x525252), primaryTextColor: .white, backgroundColor: UIColor(white: 0.0, alpha: 0.6), enableBackgroundBlur: false, separatorColor: UIColor(white: 0.0, alpha: 0.8), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
+    public static let lightNavigationTheme = NavigationBarTheme(buttonColor: UIColor(rgb: 0x007ee5), disabledButtonColor: UIColor(rgb: 0xd0d0d0), primaryTextColor: .black, backgroundColor: UIColor(red: 0.968626451, green: 0.968626451, blue: 0.968626451, alpha: 1.0), enableBackgroundBlur: false, separatorColor: UIColor(red: 0.6953125, green: 0.6953125, blue: 0.6953125, alpha: 1.0), badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
     
     private var galleryNode: GalleryControllerNode {
         return self.displayNode as! GalleryControllerNode
@@ -384,6 +384,10 @@ public class GalleryController: ViewController, StandalonePresentableController
     
     private var screenCaptureEventsDisposable: Disposable?
     
+    public var centralItemUpdated: ((MessageId) -> Void)?
+    
+    private var initialOrientation: UIInterfaceOrientation?
+    
     public init(context: AccountContext, source: GalleryControllerItemSource, invertItemOrder: Bool = false, streamSingleVideo: Bool = false, fromPlayingVideo: Bool = false, landscape: Bool = false, timecode: Double? = nil, synchronousLoad: Bool = false, replaceRootController: @escaping (ViewController, Promise<Bool>?) -> Void, baseNavigationController: NavigationController?, actionInteraction: GalleryControllerActionInteraction? = nil) {
         self.context = context
         self.source = source
@@ -665,7 +669,10 @@ public class GalleryController: ViewController, StandalonePresentableController
         
         openActionOptionsImpl = { [weak self] action in
             if let strongSelf = self {
-                let presentationData = strongSelf.presentationData
+                var presentationData = strongSelf.presentationData
+                if !presentationData.theme.overallDarkAppearance {
+                    presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+                }
                 switch action {
                     case let .url(url, _):
                         var cleanUrl = url
@@ -673,7 +680,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                         let canOpenIn = availableOpenInOptions(context: strongSelf.context, item: .url(url: url)).count > 1
                         let mailtoString = "mailto:"
                         let telString = "tel:"
-                        var openText = strongSelf.presentationData.strings.Conversation_LinkDialogOpen
+                        var openText = presentationData.strings.Conversation_LinkDialogOpen
                         var phoneNumber: String?
                         
                         var isEmail = false
@@ -686,12 +693,12 @@ public class GalleryController: ViewController, StandalonePresentableController
                             canAddToReadingList = false
                             phoneNumber = String(cleanUrl[cleanUrl.index(cleanUrl.startIndex, offsetBy: telString.distance(from: telString.startIndex, to: telString.endIndex))...])
                             cleanUrl = phoneNumber!
-                            openText = strongSelf.presentationData.strings.UserInfo_PhoneCall
+                            openText = presentationData.strings.UserInfo_PhoneCall
                             isPhoneNumber = true
                         } else if canOpenIn {
-                            openText = strongSelf.presentationData.strings.Conversation_FileOpenIn
+                            openText = presentationData.strings.Conversation_FileOpenIn
                         }
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         
                         var items: [ActionSheetItem] = []
                         items.append(ActionSheetTextItem(title: cleanUrl))
@@ -707,7 +714,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                             }
                         }))
                         if let phoneNumber = phoneNumber {
-                            items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_AddContact, color: .accent, action: { [weak actionSheet] in
+                            items.append(ActionSheetButtonItem(title: presentationData.strings.Conversation_AddContact, color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                                 if let strongSelf = self {
                                     strongSelf.dismiss(forceAway: false)
@@ -715,7 +722,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                                 }
                             }))
                         }
-                        items.append(ActionSheetButtonItem(title: canAddToReadingList ? strongSelf.presentationData.strings.ShareMenu_CopyShareLink : strongSelf.presentationData.strings.Conversation_ContextMenuCopy, color: .accent, action: { [weak actionSheet, weak self] in
+                        items.append(ActionSheetButtonItem(title: canAddToReadingList ? presentationData.strings.ShareMenu_CopyShareLink : presentationData.strings.Conversation_ContextMenuCopy, color: .accent, action: { [weak actionSheet, weak self] in
                             actionSheet?.dismissAnimated()
                             UIPasteboard.general.string = cleanUrl
                             
@@ -732,7 +739,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                             self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
                         }))
                         if canAddToReadingList {
-                            items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_AddToReadingList, color: .accent, action: { [weak actionSheet] in
+                            items.append(ActionSheetButtonItem(title: presentationData.strings.Conversation_AddToReadingList, color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                                 if let link = URL(string: url) {
                                     let _ = try? SSReadingList.default()?.addItem(with: link, title: nil, previewText: nil)
@@ -740,13 +747,13 @@ public class GalleryController: ViewController, StandalonePresentableController
                             }))
                         }
                         actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
-                            ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                            ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                             })
                         ])])
                         strongSelf.present(actionSheet, in: .window(.root))
                     case let .peerMention(peerId, mention):
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         var items: [ActionSheetItem] = []
                         if !mention.isEmpty {
                             items.append(ActionSheetTextItem(title: mention))
@@ -774,7 +781,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                         ])])
                         strongSelf.present(actionSheet, in: .window(.root))
                     case let .textMention(mention):
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         actionSheet.setItemGroups([ActionSheetItemGroup(items: [
                             ActionSheetTextItem(title: mention),
                             ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in
@@ -798,7 +805,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                         ])])
                         strongSelf.present(actionSheet, in: .window(.root))
                     case let .botCommand(command):
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         var items: [ActionSheetItem] = []
                         items.append(ActionSheetTextItem(title: command))
                         items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet, weak self] in
@@ -815,7 +822,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                         ])])
                         strongSelf.present(actionSheet, in: .window(.root))
                     case let .hashtag(peerName, hashtag):
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         actionSheet.setItemGroups([ActionSheetItemGroup(items: [
                             ActionSheetTextItem(title: hashtag),
                             ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in
@@ -840,7 +847,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                         ])
                         strongSelf.present(actionSheet, in: .window(.root))
                     case let .timecode(timecode, text):
-                        let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                        let actionSheet = ActionSheetController(presentationData: presentationData)
                         actionSheet.setItemGroups([ActionSheetItemGroup(items: [
                             ActionSheetTextItem(title: text),
                             ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in
@@ -878,7 +885,7 @@ public class GalleryController: ViewController, StandalonePresentableController
                 self.screenCaptureEventsDisposable = (screenCaptureEvents()
                 |> deliverOnMainQueue).start(next: { [weak self] _ in
                     if let strongSelf = self, strongSelf.traceVisibility() {
-                        let _ = addSecretChatMessageScreenshot(account: strongSelf.context.account, peerId: id.peerId).start()
+                        let _ = strongSelf.context.engine.messages.addSecretChatMessageScreenshot(peerId: id.peerId).start()
                     }
                 })
             }
@@ -892,6 +899,10 @@ public class GalleryController: ViewController, StandalonePresentableController
     }
     
     deinit {
+        if let initialOrientation = self.initialOrientation {
+            self.context.sharedContext.applicationBindings.forceOrientation(initialOrientation)
+        }
+        
         self.accountInUseDisposable.dispose()
         self.disposable.dispose()
         self.centralItemAttributesDisposable.dispose()
@@ -1014,6 +1025,17 @@ public class GalleryController: ViewController, StandalonePresentableController
             self?.galleryNode.pager.centralItemNode()?.controlsVisibilityUpdated(isVisible: visible)
         }
         
+        self.galleryNode.updateOrientation = { [weak self] orientation in
+            if let strongSelf = self {
+                if strongSelf.initialOrientation == nil {
+                    strongSelf.initialOrientation = orientation == .portrait ? .landscapeRight : .portrait
+                } else if strongSelf.initialOrientation == orientation {
+                    strongSelf.initialOrientation = nil
+                }
+                strongSelf.context.sharedContext.applicationBindings.forceOrientation(orientation)
+            }
+        }
+        
         let baseNavigationController = self.baseNavigationController
         self.galleryNode.baseNavigationController = { [weak baseNavigationController] in
             return baseNavigationController
@@ -1189,6 +1211,9 @@ public class GalleryController: ViewController, StandalonePresentableController
                 }
                 if strongSelf.didSetReady {
                     strongSelf._hiddenMedia.set(.single(hiddenItem))
+                    if let hiddenItem = hiddenItem {
+                        strongSelf.centralItemUpdated?(hiddenItem.0)
+                    }
                 }
             }
         }
@@ -1283,7 +1308,7 @@ public class GalleryController: ViewController, StandalonePresentableController
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
         
         if !self.adjustedForInitialPreviewingLayout && self.isPresentedInPreviewingContext() {
             self.adjustedForInitialPreviewingLayout = true
diff --git a/submodules/GalleryUI/Sources/GalleryControllerNode.swift b/submodules/GalleryUI/Sources/GalleryControllerNode.swift
index 314dbb9b5d..06780433d2 100644
--- a/submodules/GalleryUI/Sources/GalleryControllerNode.swift
+++ b/submodules/GalleryUI/Sources/GalleryControllerNode.swift
@@ -30,6 +30,8 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture
     public var areControlsHidden = false
     public var controlsVisibilityChanged: ((Bool) -> Void)?
     
+    public var updateOrientation: ((UIInterfaceOrientation) -> Void)?
+    
     public var isBackgroundExtendedOverNavigationBar = true {
         didSet {
             if let (navigationBarHeight, layout) = self.containerLayout {
@@ -38,7 +40,7 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture
         }
     }
     
-    public init(controllerInteraction: GalleryControllerInteraction, pageGap: CGFloat = 20.0) {
+    public init(controllerInteraction: GalleryControllerInteraction, pageGap: CGFloat = 20.0, disableTapNavigation: Bool = false) {
         self.backgroundNode = ASDisplayNode()
         self.backgroundNode.backgroundColor = UIColor.black
         self.scrollView = UIScrollView()
@@ -48,7 +50,7 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture
             self.scrollView.contentInsetAdjustmentBehavior = .never
         }
 
-        self.pager = GalleryPagerNode(pageGap: pageGap)
+        self.pager = GalleryPagerNode(pageGap: pageGap, disableTapNavigation: disableTapNavigation)
         self.footerNode = GalleryFooterNode(controllerInteraction: controllerInteraction)
         
         super.init()
@@ -69,6 +71,12 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture
             }
         }
         
+        self.pager.updateOrientation = { [weak self] orientation in
+            if let strongSelf = self {
+                strongSelf.updateOrientation?(orientation)
+            }
+        }
+        
         self.pager.dismiss = { [weak self] in
             if let strongSelf = self {
                 var interfaceAnimationCompleted = false
@@ -275,6 +283,7 @@ open class GalleryControllerNode: ASDisplayNode, UIScrollViewDelegate, UIGesture
         }
         
         self.pager.frame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height), size: layout.size)
+
         self.pager.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition)
     }
     
diff --git a/submodules/GalleryUI/Sources/GalleryFooterNode.swift b/submodules/GalleryUI/Sources/GalleryFooterNode.swift
index 57ef587554..95acee8794 100644
--- a/submodules/GalleryUI/Sources/GalleryFooterNode.swift
+++ b/submodules/GalleryUI/Sources/GalleryFooterNode.swift
@@ -6,6 +6,7 @@ import Display
 public final class GalleryFooterNode: ASDisplayNode {
     private let backgroundNode: ASDisplayNode
     
+    private var currentThumbnailPanelHeight: CGFloat?
     private var currentFooterContentNode: GalleryFooterContentNode?
     private var currentOverlayContentNode: GalleryOverlayContentNode?
     private var currentLayout: (ContainerViewLayout, CGFloat, Bool)?
@@ -36,11 +37,16 @@ public final class GalleryFooterNode: ASDisplayNode {
         let cleanInsets = layout.insets(options: [])
         
         var dismissedCurrentFooterContentNode: GalleryFooterContentNode?
+        var dismissedThumbnailPanelHeight: CGFloat?
         if self.currentFooterContentNode !== footerContentNode {
             if let currentFooterContentNode = self.currentFooterContentNode {
                 currentFooterContentNode.requestLayout = nil
                 dismissedCurrentFooterContentNode = currentFooterContentNode
             }
+            if let currentThumbnailPanelHeight = self.currentThumbnailPanelHeight {
+                dismissedThumbnailPanelHeight = currentThumbnailPanelHeight
+            }
+            self.currentThumbnailPanelHeight = thumbnailPanelHeight
             self.currentFooterContentNode = footerContentNode
             if let footerContentNode = footerContentNode {
                 footerContentNode.setVisibilityAlpha(self.visibilityAlpha, animated: transition.isAnimated)
@@ -54,22 +60,25 @@ public final class GalleryFooterNode: ASDisplayNode {
             }
         }
         
+        var animateOverlayIn = false
         var dismissedCurrentOverlayContentNode: GalleryOverlayContentNode?
         if self.currentOverlayContentNode !== overlayContentNode {
             if let currentOverlayContentNode = self.currentOverlayContentNode {
                 dismissedCurrentOverlayContentNode = currentOverlayContentNode
             }
             self.currentOverlayContentNode = overlayContentNode
+            animateOverlayIn = true
             if let overlayContentNode = overlayContentNode {
                 overlayContentNode.setVisibilityAlpha(self.visibilityAlpha)
                 self.addSubnode(overlayContentNode)
             }
         }
         
+        let effectiveThumbnailPanelHeight = self.currentThumbnailPanelHeight ?? thumbnailPanelHeight
         var backgroundHeight: CGFloat = 0.0
-        let verticalOffset: CGFloat = isHidden ? (layout.size.width > layout.size.height ? 44.0 : (thumbnailPanelHeight > 0.0 ? 106.0 : 54.0)) : 0.0
+        let verticalOffset: CGFloat = isHidden ? (layout.size.width > layout.size.height ? 44.0 : (effectiveThumbnailPanelHeight > 0.0 ? 106.0 : 54.0)) : 0.0
         if let footerContentNode = self.currentFooterContentNode {
-            backgroundHeight = footerContentNode.updateLayout(size: layout.size, metrics: layout.metrics, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: cleanInsets.bottom, contentInset: thumbnailPanelHeight, transition: transition)
+            backgroundHeight = footerContentNode.updateLayout(size: layout.size, metrics: layout.metrics, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: cleanInsets.bottom, contentInset: effectiveThumbnailPanelHeight, transition: transition)
             transition.updateFrame(node: footerContentNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - backgroundHeight + verticalOffset), size: CGSize(width: layout.size.width, height: backgroundHeight)))
             if let dismissedCurrentFooterContentNode = dismissedCurrentFooterContentNode {
                 let contentTransition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
@@ -96,7 +105,9 @@ public final class GalleryFooterNode: ASDisplayNode {
             overlayContentNode.updateLayout(size: layout.size, metrics: layout.metrics, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, bottomInset: backgroundHeight, transition: transition)
             transition.updateFrame(node: overlayContentNode, frame: CGRect(origin: CGPoint(), size: layout.size))
             
-            overlayContentNode.animateIn(previousContentNode: dismissedCurrentOverlayContentNode, transition: contentTransition)
+            if animateOverlayIn {
+                overlayContentNode.animateIn(previousContentNode: dismissedCurrentOverlayContentNode, transition: contentTransition)
+            }
             if let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode {
                 dismissedCurrentOverlayContentNode.animateOut(nextContentNode: overlayContentNode, transition: contentTransition, completion: { [weak self, weak dismissedCurrentOverlayContentNode] in
                     if let strongSelf = self, let dismissedCurrentOverlayContentNode = dismissedCurrentOverlayContentNode, dismissedCurrentOverlayContentNode !== strongSelf.currentOverlayContentNode {
diff --git a/submodules/GalleryUI/Sources/GalleryItemNode.swift b/submodules/GalleryUI/Sources/GalleryItemNode.swift
index 7f90361440..6903789863 100644
--- a/submodules/GalleryUI/Sources/GalleryItemNode.swift
+++ b/submodules/GalleryUI/Sources/GalleryItemNode.swift
@@ -22,6 +22,7 @@ open class GalleryItemNode: ASDisplayNode {
     
     public var toggleControlsVisibility: () -> Void = { }
     public var updateControlsVisibility: (Bool) -> Void = { _ in }
+    public var updateOrientation: (UIInterfaceOrientation) -> Void = { _ in }
     public var dismiss: () -> Void = { }
     public var beginCustomDismiss: () -> Void = { }
     public var completeCustomDismiss: () -> Void = { }
diff --git a/submodules/GalleryUI/Sources/GalleryPagerNode.swift b/submodules/GalleryUI/Sources/GalleryPagerNode.swift
index 199d822c0b..b6d9e6b6fa 100644
--- a/submodules/GalleryUI/Sources/GalleryPagerNode.swift
+++ b/submodules/GalleryUI/Sources/GalleryPagerNode.swift
@@ -9,7 +9,8 @@ private func edgeWidth(width: CGFloat) -> CGFloat {
     return min(44.0, floor(width / 6.0))
 }
 
-private let leftFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaque: false, rotatedContext: { size, context in
+let fadeWidth: CGFloat = 70.0
+private let leftFadeImage = generateImage(CGSize(width: fadeWidth, height: 32.0), opaque: false, rotatedContext: { size, context in
     let bounds = CGRect(origin: CGPoint(), size: size)
     context.clear(bounds)
     
@@ -19,10 +20,10 @@ private let leftFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaq
     let colorSpace = CGColorSpaceCreateDeviceRGB()
     let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
 
-    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 64.0, y: 0.0), options: CGGradientDrawingOptions())
+    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: CGGradientDrawingOptions())
 })
 
-private let rightFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opaque: false, rotatedContext: { size, context in
+private let rightFadeImage = generateImage(CGSize(width: fadeWidth, height: 32.0), opaque: false, rotatedContext: { size, context in
     let bounds = CGRect(origin: CGPoint(), size: size)
     context.clear(bounds)
     
@@ -32,7 +33,7 @@ private let rightFadeImage = generateImage(CGSize(width: 64.0, height: 1.0), opa
     let colorSpace = CGColorSpaceCreateDeviceRGB()
     let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
 
-    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 64.0, y: 0.0), options: CGGradientDrawingOptions())
+    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: CGGradientDrawingOptions())
 })
 
 public struct GalleryPagerInsertItem {
@@ -77,11 +78,12 @@ public struct GalleryPagerTransaction {
 
 public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGestureRecognizerDelegate {
     private let pageGap: CGFloat
+    private let disableTapNavigation: Bool
     
     private let scrollView: UIScrollView
     
-    private let leftFadeNode: ASImageNode
-    private let rightFadeNode: ASImageNode
+    private let leftFadeNode: ASDisplayNode
+    private let rightFadeNode: ASDisplayNode
     private var highlightedSide: Bool?
     
     private var tapRecognizer: TapLongTapOrDoubleTapGestureRecognizer?
@@ -105,27 +107,28 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
     public var centralItemIndexOffsetUpdated: (([GalleryItem]?, Int, CGFloat)?) -> Void = { _ in }
     public var toggleControlsVisibility: () -> Void = { }
     public var updateControlsVisibility: (Bool) -> Void = { _ in }
+    public var updateOrientation: (UIInterfaceOrientation) -> Void = { _ in }
     public var dismiss: () -> Void = { }
     public var beginCustomDismiss: () -> Void = { }
     public var completeCustomDismiss: () -> Void = { }
     public var baseNavigationController: () -> NavigationController? = { return nil }
     
-    public init(pageGap: CGFloat) {
+    public init(pageGap: CGFloat, disableTapNavigation: Bool) {
         self.pageGap = pageGap
+        self.disableTapNavigation = disableTapNavigation
+
         self.scrollView = UIScrollView()
         if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
             self.scrollView.contentInsetAdjustmentBehavior = .never
         }
         
-        self.leftFadeNode = ASImageNode()
-        self.leftFadeNode.contentMode = .scaleToFill
-        self.leftFadeNode.image = leftFadeImage
+        self.leftFadeNode = ASDisplayNode()
         self.leftFadeNode.alpha = 0.0
+        self.leftFadeNode.backgroundColor = leftFadeImage.flatMap { UIColor(patternImage: $0) }
         
-        self.rightFadeNode = ASImageNode()
-        self.rightFadeNode.contentMode = .scaleToFill
-        self.rightFadeNode.image = rightFadeImage
+        self.rightFadeNode = ASDisplayNode()
         self.rightFadeNode.alpha = 0.0
+        self.rightFadeNode.backgroundColor = rightFadeImage.flatMap { UIColor(patternImage: $0) }
         
         super.init()
         
@@ -293,7 +296,6 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
             transition.animatePosition(node: centralItemNode, from: centralItemNode.position.offsetBy(dx: -updatedCentralPoint.x + centralPoint.x, dy: -updatedCentralPoint.y + centralPoint.y))
         }
         
-        let fadeWidth = min(72.0, layout.size.width * 0.2)
         self.leftFadeNode.frame = CGRect(x: 0.0, y: 0.0, width: fadeWidth, height: layout.size.height)
         self.rightFadeNode.frame = CGRect(x: layout.size.width - fadeWidth, y: 0.0, width: fadeWidth, height: layout.size.height)
     }
@@ -436,6 +438,9 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
     }
     
     private func canGoToPreviousItem() -> Bool {
+        if self.disableTapNavigation {
+            return false
+        }
         if let index = self.centralItemIndex, index > 0 {
             return true
         } else {
@@ -444,6 +449,9 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
     }
     
     private func canGoToNextItem() -> Bool {
+        if self.disableTapNavigation {
+            return false
+        }
         if let index = self.centralItemIndex, index < self.items.count - 1 {
             return true
         } else {
@@ -467,6 +475,7 @@ public final class GalleryPagerNode: ASDisplayNode, UIScrollViewDelegate, UIGest
         let node = self.items[index].node(synchronous: synchronous)
         node.toggleControlsVisibility = self.toggleControlsVisibility
         node.updateControlsVisibility = self.updateControlsVisibility
+        node.updateOrientation = self.updateOrientation
         node.dismiss = self.dismiss
         node.beginCustomDismiss = self.beginCustomDismiss
         node.completeCustomDismiss = self.completeCustomDismiss
diff --git a/submodules/GalleryUI/Sources/GalleryTitleView.swift b/submodules/GalleryUI/Sources/GalleryTitleView.swift
index 89ceb199e5..475efaa33d 100644
--- a/submodules/GalleryUI/Sources/GalleryTitleView.swift
+++ b/submodules/GalleryUI/Sources/GalleryTitleView.swift
@@ -34,7 +34,7 @@ final class GalleryTitleView: UIView, NavigationBarTitleView {
     
     func setMessage(_ message: Message, presentationData: PresentationData, accountPeerId: PeerId) {
         let authorNameText = stringForFullAuthorName(message: message, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: accountPeerId)
-        let dateText = humanReadableStringForTimestamp(strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, timestamp: message.timestamp)
+        let dateText = humanReadableStringForTimestamp(strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, timestamp: message.timestamp).0
         
         self.authorNameNode.attributedText = NSAttributedString(string: authorNameText, font: titleFont, textColor: .white)
         self.dateNode.attributedText = NSAttributedString(string: dateText, font: dateFont, textColor: .white)
diff --git a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift
index 90c12dedaa..3deeab5929 100644
--- a/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift
+++ b/submodules/GalleryUI/Sources/Items/ChatAnimationGalleryItem.swift
@@ -171,7 +171,7 @@ final class ChatAnimationGalleryItemNode: ZoomableContentGalleryItemNode {
             self.setupStatus(resource: fileReference.media.resource)
             
             
-            self._title.set(.single("\(fileReference.media.fileName ?? "") - \(dataSizeString(fileReference.media.size ?? 0, forceDecimal: false, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))"))
+            self._title.set(.single("\(fileReference.media.fileName ?? "") - \(dataSizeString(fileReference.media.size ?? 0, forceDecimal: false, formatting: DataSizeStringFormatting(presentationData: self.presentationData)))"))
             
             let speedItem = UIBarButtonItem(image: UIImage(bundleImageName: "Media Gallery/SlowDown"), style: .plain, target: self, action: #selector(self.toggleSpeedButtonPressed))
             let backgroundItem = UIBarButtonItem(image: backgroundButtonIcon, style: .plain, target: self, action: #selector(self.toggleBackgroundButtonPressed))
diff --git a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift
index 8e3bab9eb4..4ffe741eb3 100644
--- a/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift
+++ b/submodules/GalleryUI/Sources/Items/ChatImageGalleryItem.swift
@@ -353,7 +353,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
         |> delay(0.15, queue: Queue.mainQueue())
         let progressDisposable = progressSignal.start()
         
-        let signal = stickerPacksAttachedToMedia(account: context.account, media: media)
+        let signal = context.engine.stickers.stickerPacksAttachedToMedia(media: media)
         |> afterDisposed {
             Queue.mainQueue().async {
                 progressDisposable.dispose()
@@ -487,7 +487,7 @@ final class ChatImageGalleryItemNode: ZoomableContentGalleryItemNode {
             surfaceCopyView.frame = transformedSurfaceFrame
         }
         
-        self.view.insertSubview(copyView, belowSubview: self.scrollNode.view)
+        //self.view.insertSubview(copyView, belowSubview: self.scrollNode.view)
         copyView.frame = transformedSelfFrame
         
         copyView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
diff --git a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
index fe7bd8b2cf..217fbbd6ee 100644
--- a/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
+++ b/submodules/GalleryUI/Sources/Items/UniversalVideoGalleryItem.swift
@@ -164,81 +164,82 @@ private final class UniversalVideoGalleryItemPictureInPictureNode: ASDisplayNode
     }
 }
 
-private let soundOnImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/SoundOn"), color: .white)
-private let soundOffImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/SoundOff"), color: .white)
-private var roundButtonBackgroundImage = {
-    return generateImage(CGSize(width: 42.0, height: 42), rotatedContext: { size, context in
-        let bounds = CGRect(origin: CGPoint(), size: size)
-        context.clear(bounds)
-        context.setFillColor(UIColor(white: 0.0, alpha: 0.5).cgColor)
-        context.fillEllipse(in: bounds)
-    })
-}()
+private let fullscreenImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/Fullscreen"), color: .white)
+private let minimizeImage = generateTintedImage(image: UIImage(bundleImageName: "Media Gallery/Minimize"), color: .white)
 
 private final class UniversalVideoGalleryItemOverlayNode: GalleryOverlayContentNode {
-    private let soundButtonNode: HighlightableButtonNode
+    private let wrapperNode: ASDisplayNode
+    private let fullscreenNode: HighlightableButtonNode
     private var validLayout: (CGSize, LayoutMetrics, CGFloat, CGFloat, CGFloat)?
     
+    var action: ((Bool) -> Void)?
+    
     override init() {
-        self.soundButtonNode = HighlightableButtonNode()
-        self.soundButtonNode.alpha = 0.0
-        self.soundButtonNode.setBackgroundImage(roundButtonBackgroundImage, for: .normal)
-        self.soundButtonNode.setImage(soundOffImage, for: .normal)
-        self.soundButtonNode.setImage(soundOnImage, for: .selected)
-        self.soundButtonNode.setImage(soundOnImage, for: [.selected, .highlighted])
+        self.wrapperNode = ASDisplayNode()
+        self.wrapperNode.alpha = 0.0
         
+        self.fullscreenNode = HighlightableButtonNode()
+        self.fullscreenNode.setImage(fullscreenImage, for: .normal)
+        self.fullscreenNode.setImage(minimizeImage, for: .selected)
+        self.fullscreenNode.setImage(minimizeImage, for: [.selected, .highlighted])
+    
         super.init()
         
-        self.soundButtonNode.addTarget(self, action: #selector(self.soundButtonPressed), forControlEvents: .touchUpInside)
-        self.addSubnode(self.soundButtonNode)
-    }
-    
-    func hide() {
-        self.soundButtonNode.isHidden = true
+        self.addSubnode(self.wrapperNode)
+        self.wrapperNode.addSubnode(self.fullscreenNode)
+        
+        self.fullscreenNode.addTarget(self, action: #selector(self.toggleFullscreenPressed), forControlEvents: .touchUpInside)
     }
     
     override func updateLayout(size: CGSize, metrics: LayoutMetrics, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) {
         self.validLayout = (size, metrics, leftInset, rightInset, bottomInset)
         
-        let soundButtonDiameter: CGFloat = 42.0
-        let inset: CGFloat = 12.0
-        let effectiveBottomInset = self.visibilityAlpha < 1.0 ? 0.0 : bottomInset
-        let soundButtonFrame = CGRect(origin: CGPoint(x: size.width - soundButtonDiameter - inset - rightInset, y: size.height - soundButtonDiameter - inset - effectiveBottomInset), size: CGSize(width: soundButtonDiameter, height: soundButtonDiameter))
-        transition.updateFrame(node: self.soundButtonNode, frame: soundButtonFrame)
+        let isLandscape = size.width > size.height
+        self.fullscreenNode.isSelected = isLandscape
+        
+        let iconSize: CGFloat = 42.0
+        let inset: CGFloat = 4.0
+        let buttonFrame = CGRect(origin: CGPoint(x: size.width - iconSize - inset - rightInset, y: size.height - iconSize - inset - bottomInset), size: CGSize(width: iconSize, height: iconSize))
+        transition.updateFrame(node: self.wrapperNode, frame: buttonFrame)
+        transition.updateFrame(node: self.fullscreenNode, frame: CGRect(origin: CGPoint(), size: buttonFrame.size))
     }
     
     override func animateIn(previousContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition) {
-        transition.updateAlpha(node: self.soundButtonNode, alpha: 1.0)
+        if !self.visibilityAlpha.isZero {
+            transition.updateAlpha(node: self.wrapperNode, alpha: 1.0)
+        }
     }
     
     override func animateOut(nextContentNode: GalleryOverlayContentNode?, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
-        transition.updateAlpha(node: self.soundButtonNode, alpha: 0.0)
+        transition.updateAlpha(node: self.wrapperNode, alpha: 0.0)
     }
     
     override func setVisibilityAlpha(_ alpha: CGFloat) {
         super.setVisibilityAlpha(alpha)
-        self.updateSoundButtonVisibility()
+        self.updateFullscreenButtonVisibility()
     }
     
-    func updateSoundButtonVisibility() {
-        if self.soundButtonNode.isSelected {
-            self.soundButtonNode.alpha = self.visibilityAlpha
-        } else {
-            self.soundButtonNode.alpha = 1.0
-        }
+    func updateFullscreenButtonVisibility() {
+        self.wrapperNode.alpha = self.visibilityAlpha
         
         if let validLayout = self.validLayout {
             self.updateLayout(size: validLayout.0, metrics: validLayout.1, leftInset: validLayout.2, rightInset: validLayout.3, bottomInset: validLayout.4, transition: .animated(duration: 0.3, curve: .easeInOut))
         }
     }
     
-    @objc func soundButtonPressed() {
-        self.soundButtonNode.isSelected = !self.soundButtonNode.isSelected
-        self.updateSoundButtonVisibility()
+    @objc func toggleFullscreenPressed() {
+        var toLandscape = false
+        if let (size, _, _, _ ,_) = self.validLayout, size.width < size.height {
+            toLandscape = true
+        }
+        if toLandscape {
+            self.wrapperNode.alpha = 0.0
+        }
+        self.action?(toLandscape)
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        if !self.soundButtonNode.frame.contains(point) {
+        if !self.wrapperNode.frame.contains(point) {
             return nil
         }
         return super.hitTest(point, with: event)
@@ -272,12 +273,13 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     private let statusNode: RadialStatusNode
     private var statusNodeShouldBeHidden = true
     
-    private var isCentral = false
+    private var isCentral: Bool?
     private var _isVisible: Bool?
     private var initiallyActivated = false
     private var hideStatusNodeUntilCentrality = false
     private var playOnContentOwnership = false
     private var skipInitialPause = false
+    private var ignorePauseStatus = false
     private var validLayout: (ContainerViewLayout, CGFloat)?
     private var didPause = false
     private var isPaused = true
@@ -300,6 +302,11 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     private var scrubbingFrames = false
     private var scrubbingFrameDisposable: Disposable?
     
+    private let isPlayingPromise = ValuePromise<Bool>(false, ignoreRepeated: true)
+    private let isInteractingPromise = ValuePromise<Bool>(false, ignoreRepeated: true)
+    private let controlsVisiblePromise = ValuePromise<Bool>(true, ignoreRepeated: true)
+    private var hideControlsDisposable: Disposable?
+    
     var playbackCompleted: (() -> Void)?
     
     private var customUnembedWhenPortrait: ((OverlayMediaItemNode) -> Bool)?
@@ -324,25 +331,40 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
         
         super.init()
         
+        self.footerContentNode.interacting = { [weak self] value in
+            self?.isInteractingPromise.set(value)
+        }
+        
+        self.overlayContentNode.action = { [weak self] toLandscape in
+            self?.updateControlsVisibility(!toLandscape)
+            self?.updateOrientation(toLandscape ? .landscapeRight : .portrait)
+        }
+        
         self.scrubberView.seek = { [weak self] timecode in
             self?.videoNode?.seek(timecode)
         }
         
         self.scrubberView.updateScrubbing = { [weak self] timecode in
-            guard let strongSelf = self, let videoFramePreview = strongSelf.videoFramePreview else {
+            guard let strongSelf = self else {
                 return
             }
-            if let timecode = timecode {
-                if !strongSelf.scrubbingFrames {
-                    strongSelf.scrubbingFrames = true
-                    strongSelf.scrubbingFrame.set(videoFramePreview.generatedFrames
-                    |> map(Optional.init))
+            
+            strongSelf.isInteractingPromise.set(timecode != nil)
+            
+            if let videoFramePreview = strongSelf.videoFramePreview {        
+                if let timecode = timecode {
+                    if !strongSelf.scrubbingFrames {
+                        strongSelf.scrubbingFrames = true
+                        strongSelf.scrubbingFrame.set(videoFramePreview.generatedFrames
+                        |> map(Optional.init))
+                    }
+                    videoFramePreview.generateFrame(at: timecode)
+                } else {
+                    strongSelf.isInteractingPromise.set(false)
+                    strongSelf.scrubbingFrame.set(.single(nil))
+                    videoFramePreview.cancelPendingFrames()
+                    strongSelf.scrubbingFrames = false
                 }
-                videoFramePreview.generateFrame(at: timecode)
-            } else {
-                strongSelf.scrubbingFrame.set(.single(nil))
-                videoFramePreview.cancelPendingFrames()
-                strongSelf.scrubbingFrames = false
             }
         }
         
@@ -432,12 +454,30 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
         
         self.titleContentView = GalleryTitleView(frame: CGRect())
         self._titleView.set(.single(self.titleContentView))
+        
+        let shouldHideControlsSignal: Signal<Void, NoError> = combineLatest(self.isPlayingPromise.get(), self.isInteractingPromise.get(), self.controlsVisiblePromise.get())
+        |> mapToSignal { isPlaying, isIntracting, controlsVisible -> Signal<Void, NoError> in
+            if isPlaying && !isIntracting && controlsVisible {
+                return .single(Void())
+                |> delay(4.0, queue: Queue.mainQueue())
+            } else {
+                return .complete()
+            }
+        }
+
+        self.hideControlsDisposable = (shouldHideControlsSignal
+        |> deliverOnMainQueue).start(next: { [weak self] _ in
+            if let strongSelf = self {
+                strongSelf.updateControlsVisibility(false)
+            }
+        })
     }
     
     deinit {
         self.statusDisposable.dispose()
         self.mediaPlaybackStateDisposable.dispose()
         self.scrubbingFrameDisposable?.dispose()
+        self.hideControlsDisposable?.dispose()
     }
     
     override func ready() -> Signal<Void, NoError> {
@@ -474,27 +514,20 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                 pictureInPictureNode.updateLayout(placeholderSize, transition: transition)
             }
         }
-        
+                
         if dismiss {
             self.dismiss()
         }
     }
     
-    private var controlsTimer: SwiftSignalKit.Timer?
-    private var previousPlaying: Bool?
-    
-    private func setupControlsTimer() {
-        
-    }
-    
     func setupItem(_ item: UniversalVideoGalleryItem) {
         if self.item?.content.id != item.content.id {
-            self.previousPlaying = nil
+            self.isPlayingPromise.set(false)
             
             if item.hideControls {
                 self.statusButtonNode.isHidden = true
             }
-            
+                        
             self.dismissOnOrientationChange = item.landscape
             
             var hasLinkedStickers = false
@@ -529,6 +562,13 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                 forceEnablePiP = true
             }
             
+            let dimensions = item.content.dimensions
+            if dimensions.height > 0.0 {
+                if dimensions.width / dimensions.height < 1.33 || isAnimated {
+                    self.overlayContentNode.isHidden = true
+                }
+            }
+            
             if let videoNode = self.videoNode {
                 videoNode.canAttachContent = false
                 videoNode.removeFromSupernode()
@@ -571,7 +611,6 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
             videoNode.backgroundColor = videoNode.ownsContentNode ? UIColor.black : UIColor(rgb: 0x333335)
             if item.fromPlayingVideo {
                 videoNode.canAttachContent = false
-                self.overlayContentNode.hide()
             } else {
                 self.updateDisplayPlaceholder(!videoNode.ownsContentNode)
             }
@@ -600,7 +639,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                     }
                     
                     self.mediaPlaybackStateDisposable.set(throttledSignal.start(next: { status in
-                        if let status = status, status.duration >= 60.0 * 20.0 {
+                        if let status = status, status.duration >= 60.0 * 10.0 {
                             var timestamp: Double?
                             if status.timestamp > 5.0 && status.timestamp < status.duration - 5.0 {
                                 timestamp = status.timestamp
@@ -650,7 +689,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
             |> deliverOnMainQueue).start(next: { [weak self] value, fetchStatus in
                 if let strongSelf = self {
                     var initialBuffering = false
-                    var playing = false
+                    var isPlaying = false
                     var isPaused = true
                     var seekable = hintSeekable
                     var hasStarted = false
@@ -668,7 +707,8 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                         switch value.status {
                             case .playing:
                                 isPaused = false
-                                playing = true
+                                isPlaying = true
+                                strongSelf.ignorePauseStatus = false
                             case let .buffering(_, whilePlaying, _, display):
                                 displayProgress = display
                                 initialBuffering = !whilePlaying
@@ -701,9 +741,10 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                                         isPaused = false
                                     }
                                 } else if strongSelf.actionAtEnd == .stop {
-                                    strongSelf.updateControlsVisibility(true)
-                                    strongSelf.controlsTimer?.invalidate()
-                                    strongSelf.controlsTimer = nil
+                                    strongSelf.isPlayingPromise.set(false)
+                                    if strongSelf.isCentral == true {
+                                        strongSelf.updateControlsVisibility(true)
+                                    }
                                 }
                         }
                         if !value.duration.isZero {
@@ -711,20 +752,11 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                         }
                     }
                     
-                    if strongSelf.isCentral && playing && strongSelf.previousPlaying != true && !disablePlayerControls {
-                        strongSelf.controlsTimer?.invalidate()
-                        
-                        let timer = SwiftSignalKit.Timer(timeout: 3.0, repeat: false, completion: { [weak self] in
-                            self?.updateControlsVisibility(false)
-                            self?.controlsTimer = nil
-                        }, queue: Queue.mainQueue())
-                        timer.start()
-                        strongSelf.controlsTimer = timer
-                    } else if !playing {
-                        strongSelf.controlsTimer?.invalidate()
-                        strongSelf.controlsTimer = nil
+                    if !disablePlayerControls && strongSelf.isCentral == true && isPlaying {
+                        strongSelf.isPlayingPromise.set(true)
+                    } else if !isPlaying {
+                        strongSelf.isPlayingPromise.set(false)
                     }
-                    strongSelf.previousPlaying = playing
                     
                     var fetching = false
                     if initialBuffering {
@@ -742,7 +774,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                                     case .Remote:
                                         state = .download(.white)
                                     case let .Fetching(_, progress):
-                                        if !playing {
+                                        if !isPlaying {
                                             fetching = true
                                             isPaused = true
                                         }
@@ -759,13 +791,13 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                     strongSelf.fetchStatus = fetchStatus
                     
                     if !item.hideControls {
-                        strongSelf.statusNodeShouldBeHidden = (!initialBuffering && (strongSelf.didPause || !isPaused) && !fetching)
+                        strongSelf.statusNodeShouldBeHidden = strongSelf.ignorePauseStatus || (!initialBuffering && (strongSelf.didPause || !isPaused) && !fetching)
                         strongSelf.statusButtonNode.isHidden = strongSelf.hideStatusNodeUntilCentrality || strongSelf.statusNodeShouldBeHidden
                     }
                     
                     if isAnimated || disablePlayerControls {
                         strongSelf.footerContentNode.content = .info
-                    } else if isPaused {
+                    } else if isPaused && !strongSelf.ignorePauseStatus {
                         if hasStarted || strongSelf.didPause {
                             strongSelf.footerContentNode.content = .playback(paused: true, seekable: seekable)
                         } else if let fetchStatus = fetchStatus, !strongSelf.requiresDownload {
@@ -799,10 +831,9 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                     if let strongSelf = self, !isAnimated {
                         videoNode?.seek(0.0)
                         
-                        if strongSelf.actionAtEnd == .stop && strongSelf.isCentral {
+                        if strongSelf.actionAtEnd == .stop && strongSelf.isCentral == true {
+                            strongSelf.isPlayingPromise.set(false)
                             strongSelf.updateControlsVisibility(true)
-                            strongSelf.controlsTimer?.invalidate()
-                            strongSelf.controlsTimer = nil
                         }
                     }
                 }
@@ -825,8 +856,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     }
     
     override func controlsVisibilityUpdated(isVisible: Bool) {
-        self.controlsTimer?.invalidate()
-        self.controlsTimer = nil
+        self.controlsVisiblePromise.set(isVisible)
         
         self.videoNode?.isUserInteractionEnabled = isVisible ? self.videoNodeUserInteractionEnabled : false
         self.videoNode?.notifyPlaybackControlsHidden(!isVisible)
@@ -906,8 +936,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                         }
                     }
                 } else {
-                    self.controlsTimer?.invalidate()
-                    self.controlsTimer = nil
+                    self.isPlayingPromise.set(false)
                     
                     self.dismissOnOrientationChange = false
                     if videoNode.ownsContentNode {
@@ -932,6 +961,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                         if self.skipInitialPause {
                             self.skipInitialPause = false
                         } else {
+                            self.ignorePauseStatus = true
                             videoNode.pause()
                             videoNode.seek(0.0)
                         }
@@ -964,7 +994,7 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     }
     
     override func activateAsInitial() {
-        if let videoNode = self.videoNode, self.isCentral {
+        if let videoNode = self.videoNode, self.isCentral == true {
             self.initiallyActivated = true
 
             var isAnimated = false
@@ -1605,7 +1635,9 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
             |> delay(0.15, queue: Queue.mainQueue())
             let progressDisposable = progressSignal.start()
             
-            let signal = stickerPacksAttachedToMedia(account: self.context.account, media: media)
+            self.isInteractingPromise.set(true)
+            
+            let signal = self.context.engine.stickers.stickerPacksAttachedToMedia(media: media)
             |> afterDisposed {
                 Queue.mainQueue().async {
                     progressDisposable.dispose()
@@ -1618,7 +1650,9 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
                 }
                 let baseNavigationController = strongSelf.baseNavigationController()
                 baseNavigationController?.view.endEditing(true)
-                let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packs[0], stickerPacks: packs, sendSticker: nil)
+                let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packs[0], stickerPacks: packs, sendSticker: nil, dismissed: { [weak self] in
+                    self?.isInteractingPromise.set(false)
+                })
                 (baseNavigationController?.topViewController as? ViewController)?.present(controller, in: .window(.root), with: nil)
             })
         }
@@ -1631,6 +1665,6 @@ final class UniversalVideoGalleryItemNode: ZoomableContentGalleryItemNode {
     }
     
     override func footerContent() -> Signal<(GalleryFooterContentNode?, GalleryOverlayContentNode?), NoError> {
-        return .single((self.footerContentNode, nil))
+        return .single((self.footerContentNode, self.overlayContentNode))
     }
 }
diff --git a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift
index 8d23425be3..ba498852d8 100644
--- a/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift
+++ b/submodules/GalleryUI/Sources/SecretMediaPreviewController.swift
@@ -349,9 +349,9 @@ public final class SecretMediaPreviewController: ViewController {
             |> deliverOnMainQueue).start(next: { [weak self] _ in
                 if let strongSelf = self, strongSelf.traceVisibility() {
                     if strongSelf.messageId.peerId.namespace == Namespaces.Peer.CloudUser {
-                        let _ = enqueueMessages(account: strongSelf.context.account, peerId: strongSelf.messageId.peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil)]).start()
+                        let _ = enqueueMessages(account: strongSelf.context.account, peerId: strongSelf.messageId.peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)]).start()
                     } else if strongSelf.messageId.peerId.namespace == Namespaces.Peer.SecretChat {
-                        let _ = addSecretChatMessageScreenshot(account: strongSelf.context.account, peerId: strongSelf.messageId.peerId).start()
+                        let _ = strongSelf.context.engine.messages.addSecretChatMessageScreenshot(peerId: strongSelf.messageId.peerId).start()
                     }
                 }
             })
@@ -450,7 +450,7 @@ public final class SecretMediaPreviewController: ViewController {
                     self?.didSetReady = true
                 }
                 self._ready.set(ready |> map { true })
-                self.markMessageAsConsumedDisposable.set(markMessageContentAsConsumedInteractively(postbox: self.context.account.postbox, messageId: message.id).start())
+                self.markMessageAsConsumedDisposable.set(self.context.engine.messages.markMessageContentAsConsumedInteractively(messageId: message.id).start())
             } else {
                 var beginTimeAndTimeout: (Double, Double)?
                 var videoDuration: Int32?
@@ -497,7 +497,7 @@ public final class SecretMediaPreviewController: ViewController {
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.controllerNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override public func dismiss(completion: (() -> Void)? = nil) {
diff --git a/submodules/GameUI/Sources/GameController.swift b/submodules/GameUI/Sources/GameController.swift
index d9cbd217e1..5b77a2a9f8 100644
--- a/submodules/GameUI/Sources/GameController.swift
+++ b/submodules/GameUI/Sources/GameController.swift
@@ -79,7 +79,7 @@ public final class GameController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override public var presentationController: UIPresentationController? {
diff --git a/submodules/GameUI/Sources/GameControllerNode.swift b/submodules/GameUI/Sources/GameControllerNode.swift
index 51be76923e..02ef5c9839 100644
--- a/submodules/GameUI/Sources/GameControllerNode.swift
+++ b/submodules/GameUI/Sources/GameControllerNode.swift
@@ -147,7 +147,7 @@ final class GameControllerNode: ViewControllerTracingNode {
                 if eventName == "share_score" {
                     self.present(ShareController(context: self.context, subject: .fromExternal({ [weak self] peerIds, text, account in
                         if let strongSelf = self {
-                            let signals = peerIds.map { forwardGameWithScore(account: account, messageId: strongSelf.message.id, to: $0) }
+                            let signals = peerIds.map { TelegramEngine(account: account).messages.forwardGameWithScore(messageId: strongSelf.message.id, to: $0) }
                             return .single(.preparing)
                             |> then(
                                 combineLatest(signals)
diff --git a/submodules/GameUI/Sources/GameControllerTitleView.swift b/submodules/GameUI/Sources/GameControllerTitleView.swift
index ec012f2fae..6c565228a9 100644
--- a/submodules/GameUI/Sources/GameControllerTitleView.swift
+++ b/submodules/GameUI/Sources/GameControllerTitleView.swift
@@ -40,7 +40,7 @@ final class GameControllerTitleView: UIView {
     }
     
     func set(title: String, subtitle: String) {
-        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
+        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
         self.infoNode.attributedText = NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: self.theme.rootController.navigationBar.secondaryTextColor)
     }
     
diff --git a/submodules/GradientBackground/BUILD b/submodules/GradientBackground/BUILD
new file mode 100644
index 0000000000..f216710644
--- /dev/null
+++ b/submodules/GradientBackground/BUILD
@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "GradientBackground",
+    module_name = "GradientBackground",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-O",
+    ],
+    deps = [
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/GradientBackground/Sources/GradientBackground.swift b/submodules/GradientBackground/Sources/GradientBackground.swift
new file mode 100644
index 0000000000..352d1aacf4
--- /dev/null
+++ b/submodules/GradientBackground/Sources/GradientBackground.swift
@@ -0,0 +1,8 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+
+public func createGradientBackgroundNode(colors: [UIColor]? = nil, useSharedAnimationPhase: Bool = false) -> GradientBackgroundNode {
+    return GradientBackgroundNode(colors: colors, useSharedAnimationPhase: useSharedAnimationPhase)
+}
diff --git a/submodules/GradientBackground/Sources/SoftwareGradientBackground.swift b/submodules/GradientBackground/Sources/SoftwareGradientBackground.swift
new file mode 100644
index 0000000000..21fcde858a
--- /dev/null
+++ b/submodules/GradientBackground/Sources/SoftwareGradientBackground.swift
@@ -0,0 +1,464 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import Accelerate
+
+private func shiftArray(array: [CGPoint], offset: Int) -> [CGPoint] {
+    var newArray = array
+    var offset = offset
+    while offset > 0 {
+        let element = newArray.removeFirst()
+        newArray.append(element)
+        offset -= 1
+    }
+    return newArray
+}
+
+private func gatherPositions(_ list: [CGPoint]) -> [CGPoint] {
+    var result: [CGPoint] = []
+    for i in 0 ..< list.count / 2 {
+        result.append(list[i * 2])
+    }
+    return result
+}
+
+private func interpolateFloat(_ value1: CGFloat, _ value2: CGFloat, at factor: CGFloat) -> CGFloat {
+    return value1 * (1.0 - factor) + value2 * factor
+}
+
+private func interpolatePoints(_ point1: CGPoint, _ point2: CGPoint, at factor: CGFloat) -> CGPoint {
+    return CGPoint(x: interpolateFloat(point1.x, point2.x, at: factor), y: interpolateFloat(point1.y, point2.y, at: factor))
+}
+
+public func adjustSaturationInContext(context: DrawingContext, saturation: CGFloat) {
+    var buffer = vImage_Buffer()
+    buffer.data = context.bytes
+    buffer.width = UInt(context.size.width * context.scale)
+    buffer.height = UInt(context.size.height * context.scale)
+    buffer.rowBytes = context.bytesPerRow
+
+    let divisor: Int32 = 0x1000
+
+    let rwgt: CGFloat = 0.3086
+    let gwgt: CGFloat = 0.6094
+    let bwgt: CGFloat = 0.0820
+
+    let adjustSaturation = saturation
+
+    let a = (1.0 - adjustSaturation) * rwgt + adjustSaturation
+    let b = (1.0 - adjustSaturation) * rwgt
+    let c = (1.0 - adjustSaturation) * rwgt
+    let d = (1.0 - adjustSaturation) * gwgt
+    let e = (1.0 - adjustSaturation) * gwgt + adjustSaturation
+    let f = (1.0 - adjustSaturation) * gwgt
+    let g = (1.0 - adjustSaturation) * bwgt
+    let h = (1.0 - adjustSaturation) * bwgt
+    let i = (1.0 - adjustSaturation) * bwgt + adjustSaturation
+
+    let satMatrix: [CGFloat] = [
+        a, b, c, 0,
+        d, e, f, 0,
+        g, h, i, 0,
+        0, 0, 0, 1
+    ]
+
+    var matrix: [Int16] = satMatrix.map { value in
+        return Int16(value * CGFloat(divisor))
+    }
+
+    vImageMatrixMultiply_ARGB8888(&buffer, &buffer, &matrix, divisor, nil, nil, vImage_Flags(kvImageDoNotTile))
+}
+
+private func generateGradient(size: CGSize, colors inputColors: [UIColor], positions: [CGPoint], adjustSaturation: CGFloat = 1.0) -> UIImage {
+    let colors: [UIColor] = inputColors.count == 1 ? [inputColors[0], inputColors[0], inputColors[0]] : inputColors
+
+    let width = Int(size.width)
+    let height = Int(size.height)
+
+    let rgbData = malloc(MemoryLayout<Float>.size * colors.count * 3)!
+    defer {
+        free(rgbData)
+    }
+    let rgb = rgbData.assumingMemoryBound(to: Float.self)
+    for i in 0 ..< colors.count {
+        var r: CGFloat = 0.0
+        var g: CGFloat = 0.0
+        var b: CGFloat = 0.0
+        colors[i].getRed(&r, green: &g, blue: &b, alpha: nil)
+
+        rgb.advanced(by: i * 3 + 0).pointee = Float(r)
+        rgb.advanced(by: i * 3 + 1).pointee = Float(g)
+        rgb.advanced(by: i * 3 + 2).pointee = Float(b)
+    }
+
+    let positionData = malloc(MemoryLayout<Float>.size * positions.count * 2)!
+    defer {
+        free(positionData)
+    }
+    let positionFloats = positionData.assumingMemoryBound(to: Float.self)
+    for i in 0 ..< positions.count {
+        positionFloats.advanced(by: i * 2 + 0).pointee = Float(positions[i].x)
+        positionFloats.advanced(by: i * 2 + 1).pointee = Float(1.0 - positions[i].y)
+    }
+
+    let context = DrawingContext(size: CGSize(width: CGFloat(width), height: CGFloat(height)), scale: 1.0, opaque: true, clear: false)
+    let imageBytes = context.bytes.assumingMemoryBound(to: UInt8.self)
+
+    for y in 0 ..< height {
+        let directPixelY = Float(y) / Float(height)
+        let centerDistanceY = directPixelY - 0.5
+        let centerDistanceY2 = centerDistanceY * centerDistanceY
+
+        let lineBytes = imageBytes.advanced(by: context.bytesPerRow * y)
+        for x in 0 ..< width {
+            let directPixelX = Float(x) / Float(width)
+
+            let centerDistanceX = directPixelX - 0.5
+            let centerDistance = sqrt(centerDistanceX * centerDistanceX + centerDistanceY2)
+            
+            let swirlFactor = 0.35 * centerDistance
+            let theta = swirlFactor * swirlFactor * 0.8 * 8.0
+            let sinTheta = sin(theta)
+            let cosTheta = cos(theta)
+
+            let pixelX = max(0.0, min(1.0, 0.5 + centerDistanceX * cosTheta - centerDistanceY * sinTheta))
+            let pixelY = max(0.0, min(1.0, 0.5 + centerDistanceX * sinTheta + centerDistanceY * cosTheta))
+
+            var distanceSum: Float = 0.0
+
+            var r: Float = 0.0
+            var g: Float = 0.0
+            var b: Float = 0.0
+
+            for i in 0 ..< colors.count {
+                let colorX = positionFloats[i * 2 + 0]
+                let colorY = positionFloats[i * 2 + 1]
+
+                let distanceX = pixelX - colorX
+                let distanceY = pixelY - colorY
+
+                var distance = max(0.0, 0.92 - sqrt(distanceX * distanceX + distanceY * distanceY))
+                distance = distance * distance * distance
+                distanceSum += distance
+
+                r = r + distance * rgb[i * 3 + 0]
+                g = g + distance * rgb[i * 3 + 1]
+                b = b + distance * rgb[i * 3 + 2]
+            }
+
+            if distanceSum < 0.00001 {
+                distanceSum = 0.00001
+            }
+
+            var pixelB = b / distanceSum * 255.0
+            if pixelB > 255.0 {
+                pixelB = 255.0
+            }
+
+            var pixelG = g / distanceSum * 255.0
+            if pixelG > 255.0 {
+                pixelG = 255.0
+            }
+
+            var pixelR = r / distanceSum * 255.0
+            if pixelR > 255.0 {
+                pixelR = 255.0
+            }
+
+            let pixelBytes = lineBytes.advanced(by: x * 4)
+            pixelBytes.advanced(by: 0).pointee = UInt8(pixelB)
+            pixelBytes.advanced(by: 1).pointee = UInt8(pixelG)
+            pixelBytes.advanced(by: 2).pointee = UInt8(pixelR)
+            pixelBytes.advanced(by: 3).pointee = 0xff
+        }
+    }
+
+    if abs(adjustSaturation - 1.0) > .ulpOfOne {
+        adjustSaturationInContext(context: context, saturation: adjustSaturation)
+    }
+
+    return context.generateImage()!
+}
+
+public final class GradientBackgroundNode: ASDisplayNode {
+    public final class CloneNode: ASImageNode {
+        private weak var parentNode: GradientBackgroundNode?
+        private var index: SparseBag<Weak<CloneNode>>.Index?
+
+        public init(parentNode: GradientBackgroundNode) {
+            self.parentNode = parentNode
+
+            super.init()
+
+            self.index = parentNode.cloneNodes.add(Weak<CloneNode>(self))
+            self.image = parentNode.dimmedImage
+        }
+
+        deinit {
+            if let parentNode = self.parentNode, let index = self.index {
+                parentNode.cloneNodes.remove(index)
+            }
+        }
+    }
+
+    private static let basePositions: [CGPoint] = [
+        CGPoint(x: 0.80, y: 0.10),
+        CGPoint(x: 0.60, y: 0.20),
+        CGPoint(x: 0.35, y: 0.25),
+        CGPoint(x: 0.25, y: 0.60),
+        CGPoint(x: 0.20, y: 0.90),
+        CGPoint(x: 0.40, y: 0.80),
+        CGPoint(x: 0.65, y: 0.75),
+        CGPoint(x: 0.75, y: 0.40)
+    ]
+
+    public static func generatePreview(size: CGSize, colors: [UIColor]) -> UIImage {
+        let positions = gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: 0))
+        return generateGradient(size: size, colors: colors, positions: positions)
+    }
+
+    private var colors: [UIColor]
+    private var phase: Int = 0
+
+    public let contentView: UIImageView
+    private var validPhase: Int?
+    private var invalidated: Bool = false
+
+    private var dimmedImageParams: (size: CGSize, colors: [UIColor], positions: [CGPoint])?
+    private var _dimmedImage: UIImage?
+    private var dimmedImage: UIImage? {
+        if let current = self._dimmedImage {
+            return current
+        } else if let (size, colors, positions) = self.dimmedImageParams {
+            self._dimmedImage = generateGradient(size: size, colors: colors, positions: positions, adjustSaturation: 1.7)
+            return self._dimmedImage
+        } else {
+            return nil
+        }
+    }
+
+    private var validLayout: CGSize?
+    private let cloneNodes = SparseBag<Weak<CloneNode>>()
+
+    private let useSharedAnimationPhase: Bool
+    static var sharedPhase: Int = 0
+
+    public init(colors: [UIColor]? = nil, useSharedAnimationPhase: Bool = false) {
+        self.useSharedAnimationPhase = useSharedAnimationPhase
+        self.contentView = UIImageView()
+        let defaultColors: [UIColor] = [
+            UIColor(rgb: 0x7FA381),
+            UIColor(rgb: 0xFFF5C5),
+            UIColor(rgb: 0x336F55),
+            UIColor(rgb: 0xFBE37D)
+        ]
+        self.colors = colors ?? defaultColors
+
+        super.init()
+
+        self.view.addSubview(self.contentView)
+
+        if useSharedAnimationPhase {
+            self.phase = GradientBackgroundNode.sharedPhase
+        } else {
+            self.phase = 0
+        }
+    }
+
+    deinit {
+    }
+
+    public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition, extendAnimation: Bool = false, backwards: Bool = false) {
+        let sizeUpdated = self.validLayout != size
+        self.validLayout = size
+
+        let imageSize = size.fitted(CGSize(width: 80.0, height: 80.0)).integralFloor
+
+        let positions = gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: self.phase % 8))
+
+        if let validPhase = self.validPhase {
+            if validPhase != self.phase || self.invalidated {
+                self.validPhase = self.phase
+                self.invalidated = false
+
+                var steps: [[CGPoint]] = []
+                if backwards {
+                    let phaseCount = extendAnimation ? 6 : 1
+                    self.phase = (self.phase + phaseCount) % 8
+                    self.validPhase = self.phase
+                    
+                    var stepPhase = self.phase - phaseCount
+                    if stepPhase < 0 {
+                        stepPhase = 8 + stepPhase
+                    }
+                    for _ in 0 ... phaseCount {
+                        steps.append(gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: stepPhase)))
+                        stepPhase = (stepPhase + 1) % 8
+                    }
+                } else if extendAnimation {
+                    let phaseCount = 4
+                    var stepPhase = (self.phase + phaseCount) % 8
+                    for _ in 0 ... phaseCount {
+                        steps.append(gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: stepPhase)))
+                        stepPhase = stepPhase - 1
+                        if stepPhase < 0 {
+                            stepPhase = 7
+                        }
+                    }
+                } else {
+                    steps.append(gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: validPhase % 8)))
+                    steps.append(positions)
+                }
+
+                if case let .animated(duration, curve) = transition, duration > 0.001 {
+                    var images: [UIImage] = []
+
+                    var dimmedImages: [UIImage] = []
+                    let needDimmedImages = !self.cloneNodes.isEmpty
+
+                    let stepCount = steps.count - 1
+
+                    let fps: Double = extendAnimation ? 60 : 30
+                    let maxFrame = Int(duration * fps)
+                    let framesPerAnyStep = maxFrame / stepCount
+
+                    for frameIndex in 0 ..< maxFrame {
+                        let t = curve.solve(at: CGFloat(frameIndex) / CGFloat(maxFrame - 1))
+                        let globalStep = Int(t * CGFloat(maxFrame))
+                        let stepIndex = min(stepCount - 1, globalStep / framesPerAnyStep)
+
+                        let stepFrameIndex = globalStep - stepIndex * framesPerAnyStep
+                        let stepFrames: Int
+                        if stepIndex == stepCount - 1 {
+                            stepFrames = maxFrame - framesPerAnyStep * (stepCount - 1)
+                        } else {
+                            stepFrames = framesPerAnyStep
+                        }
+                        let stepT = CGFloat(stepFrameIndex) / CGFloat(stepFrames - 1)
+
+                        var morphedPositions: [CGPoint] = []
+                        for i in 0 ..< steps[0].count {
+                            morphedPositions.append(interpolatePoints(steps[stepIndex][i], steps[stepIndex + 1][i], at: stepT))
+                        }
+
+                        images.append(generateGradient(size: imageSize, colors: self.colors, positions: morphedPositions))
+                        if needDimmedImages {
+                            dimmedImages.append(generateGradient(size: imageSize, colors: self.colors, positions: morphedPositions, adjustSaturation: 1.7))
+                        }
+                    }
+
+                    self.dimmedImageParams = (imageSize, self.colors, gatherPositions(shiftArray(array: GradientBackgroundNode.basePositions, offset: self.phase % 8)))
+
+                    self.contentView.image = images.last
+
+                    let animation = CAKeyframeAnimation(keyPath: "contents")
+                    animation.values = images.map { $0.cgImage! }
+                    animation.duration = duration * UIView.animationDurationFactor()
+                    if backwards || extendAnimation {
+                        animation.calculationMode = .discrete
+                    } else {
+                        animation.calculationMode = .linear
+                    }
+                    animation.isRemovedOnCompletion = true
+                    if extendAnimation && !backwards {
+                        animation.fillMode = .backwards
+                        animation.beginTime = self.contentView.layer.convertTime(CACurrentMediaTime(), from: nil) + 0.25
+                    }
+
+                    self.contentView.layer.removeAnimation(forKey: "contents")
+                    self.contentView.layer.add(animation, forKey: "contents")
+
+                    if !self.cloneNodes.isEmpty {
+                        let cloneAnimation = CAKeyframeAnimation(keyPath: "contents")
+                        cloneAnimation.values = dimmedImages.map { $0.cgImage! }
+                        cloneAnimation.duration = animation.duration
+                        cloneAnimation.calculationMode = animation.calculationMode
+                        cloneAnimation.isRemovedOnCompletion = animation.isRemovedOnCompletion
+                        cloneAnimation.fillMode = animation.fillMode
+                        cloneAnimation.beginTime = animation.beginTime
+
+                        self._dimmedImage = dimmedImages.last
+
+                        for cloneNode in self.cloneNodes {
+                            if let value = cloneNode.value {
+                                value.image = dimmedImages.last
+                                value.layer.removeAnimation(forKey: "contents")
+                                value.layer.add(cloneAnimation, forKey: "contents")
+                            }
+                        }
+                    }
+                } else {
+                    let image = generateGradient(size: imageSize, colors: self.colors, positions: positions)
+                    self.contentView.image = image
+
+                    let dimmedImage = generateGradient(size: imageSize, colors: self.colors, positions: positions, adjustSaturation: 1.7)
+                    self._dimmedImage = dimmedImage
+                    self.dimmedImageParams = (imageSize, self.colors, positions)
+
+                    for cloneNode in self.cloneNodes {
+                        cloneNode.value?.image = dimmedImage
+                    }
+                }
+            }
+        } else if sizeUpdated {
+            let image = generateGradient(size: imageSize, colors: self.colors, positions: positions)
+            self.contentView.image = image
+
+            let dimmedImage = generateGradient(size: imageSize, colors: self.colors, positions: positions, adjustSaturation: 1.7)
+            self.dimmedImageParams = (imageSize, self.colors, positions)
+
+            for cloneNode in self.cloneNodes {
+                cloneNode.value?.image = dimmedImage
+            }
+
+            self.validPhase = self.phase
+        }
+
+        transition.updateFrame(view: self.contentView, frame: CGRect(origin: CGPoint(), size: size))
+    }
+
+    public func updateColors(colors: [UIColor]) {
+        var updated = false
+        if self.colors.count != colors.count {
+            updated = true
+        } else {
+            for i in 0 ..< self.colors.count {
+                if !self.colors[i].isEqual(colors[i]) {
+                    updated = true
+                    break
+                }
+            }
+        }
+        if updated {
+            self.colors = colors
+            self.invalidated = true
+            if let size = self.validLayout {
+                self.updateLayout(size: size, transition: .immediate)
+            }
+        }
+    }
+
+    public func animateEvent(transition: ContainedViewLayoutTransition, extendAnimation: Bool = false, backwards: Bool = false) {
+        guard case let .animated(duration, _) = transition, duration > 0.001 else {
+            return
+        }
+
+        if extendAnimation || backwards {
+            self.invalidated = true
+        } else {
+            if self.phase == 0 {
+                self.phase = 7
+            } else {
+                self.phase = self.phase - 1
+            }
+        }
+        if self.useSharedAnimationPhase {
+            GradientBackgroundNode.sharedPhase = self.phase
+        }
+        if let size = self.validLayout {
+            self.updateLayout(size: size, transition: transition, extendAnimation: extendAnimation, backwards: backwards)
+        }
+    }
+}
diff --git a/submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift b/submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift
index 76390fe4da..6408a97414 100644
--- a/submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift
+++ b/submodules/GraphCore/Sources/Helpers/UIImage+Utils.swift
@@ -56,7 +56,7 @@ var deviceScale: CGFloat {
 func generateImage(_ size: CGSize, contextGenerator: (CGSize, CGContext) -> Void, opaque: Bool = false, scale: CGFloat? = nil) -> GImage? {
     let selectedScale = scale ?? deviceScale
     let scaledSize = CGSize(width: size.width * selectedScale, height: size.height * selectedScale)
-    let bytesPerRow = (4 * Int(scaledSize.width) + 15) & (~15)
+    let bytesPerRow = (4 * Int(scaledSize.width) + 31) & (~31)
     let length = bytesPerRow * Int(scaledSize.height)
     let bytes = malloc(length)!.assumingMemoryBound(to: Int8.self)
     
diff --git a/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift b/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
index 03b576262f..982a409f23 100644
--- a/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
+++ b/submodules/HashtagSearchUI/Sources/HashtagSearchController.swift
@@ -40,10 +40,10 @@ public final class HashtagSearchController: TelegramBaseController {
         self.title = query
         self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
         
-        let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations)
+        let chatListPresentationData = ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)
         
         let location: SearchMessagesLocation = .general(tags: nil, minDate: nil, maxDate: nil)
-        let search = searchMessages(account: context.account, location: location, query: query, state: nil)
+        let search = context.engine.messages.searchMessages(location: location, query: query, state: nil)
         let foundMessages: Signal<[ChatListSearchEntry], NoError> = search
         |> map { result, _ in
             return result.messages.map({ .message($0, RenderedPeer(message: $0), result.readStates[$0.id.peerId], chatListPresentationData, result.totalCount, nil, false) })
@@ -52,12 +52,13 @@ public final class HashtagSearchController: TelegramBaseController {
         }, peerSelected: { _, _ in
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, togglePeersSelection: { _, _ in
         }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             if let strongSelf = self {
                 strongSelf.openMessageFromSearchDisposable.set((storedMessageFromSearchPeer(account: strongSelf.context.account, peer: peer) |> deliverOnMainQueue).start(next: { actualPeerId in
                     if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController {
-                        strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(actualPeerId), subject: message.id.peerId == actualPeerId ? .message(id: message.id, highlight: true) : nil, keepStack: .always))
+                        strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(actualPeerId), subject: message.id.peerId == actualPeerId ? .message(id: message.id, highlight: true, timecode: nil) : nil, keepStack: .always))
                     }
                 }))
                 strongSelf.controllerNode.listNode.clearHighlightAnimated(true)
@@ -115,17 +116,37 @@ public final class HashtagSearchController: TelegramBaseController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = HashtagSearchControllerNode(context: self.context, peer: self.peer, query: self.query, theme: self.presentationData.theme, strings: self.presentationData.strings, navigationController: self.navigationController as? NavigationController)
+        self.displayNode = HashtagSearchControllerNode(context: self.context, peer: self.peer, query: self.query, theme: self.presentationData.theme, strings: self.presentationData.strings, navigationBar: self.navigationBar, navigationController: self.navigationController as? NavigationController)
         if let chatController = self.controllerNode.chatController {
             chatController.parentController = self
         }
         
         self.displayNodeDidLoad()
     }
+
+    private var suspendNavigationBarLayout: Bool = false
+    private var suspendedNavigationBarLayout: ContainerViewLayout?
+    private var additionalNavigationBarBackgroundHeight: CGFloat = 0.0
+
+    override public func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        if self.suspendNavigationBarLayout {
+            self.suspendedNavigationBarLayout = layout
+            return
+        }
+        self.applyNavigationBarLayout(layout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+    }
     
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.suspendNavigationBarLayout = true
+
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.additionalNavigationBarBackgroundHeight = self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+
+        self.suspendNavigationBarLayout = false
+        if let suspendedNavigationBarLayout = self.suspendedNavigationBarLayout {
+            self.suspendedNavigationBarLayout = suspendedNavigationBarLayout
+            self.applyNavigationBarLayout(suspendedNavigationBarLayout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+        }
     }
 }
diff --git a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift
index fe178a5bab..b7b0f16a86 100644
--- a/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift
+++ b/submodules/HashtagSearchUI/Sources/HashtagSearchControllerNode.swift
@@ -10,12 +10,14 @@ import ChatListUI
 import SegmentedControlNode
 
 final class HashtagSearchControllerNode: ASDisplayNode {
-    private let toolbarBackgroundNode: ASDisplayNode
+    private let navigationBar: NavigationBar?
+
+    private let toolbarBackgroundNode: NavigationBackgroundNode
     private let toolbarSeparatorNode: ASDisplayNode
     private let segmentedControlNode: SegmentedControlNode
     let listNode: ListView
     
-    var chatController: ChatController?
+    let chatController: ChatController?
     
     private let context: AccountContext
     private let query: String
@@ -24,9 +26,9 @@ final class HashtagSearchControllerNode: ASDisplayNode {
     private var enqueuedTransitions: [(ChatListSearchContainerTransition, Bool)] = []
     private var hasValidLayout = false
     
-    var navigationBar: NavigationBar?
-    
-    init(context: AccountContext, peer: Peer?, query: String, theme: PresentationTheme, strings: PresentationStrings, navigationController: NavigationController?) {
+    init(context: AccountContext, peer: Peer?, query: String, theme: PresentationTheme, strings: PresentationStrings, navigationBar: NavigationBar?, navigationController: NavigationController?) {
+        self.navigationBar = navigationBar
+
         self.context = context
         self.query = query
         self.listNode = ListView()
@@ -34,8 +36,7 @@ final class HashtagSearchControllerNode: ASDisplayNode {
             return strings.VoiceOver_ScrollStatus(row, count).0
         }
         
-        self.toolbarBackgroundNode = ASDisplayNode()
-        self.toolbarBackgroundNode.backgroundColor = theme.rootController.navigationBar.backgroundColor
+        self.toolbarBackgroundNode = NavigationBackgroundNode(color: theme.rootController.navigationBar.blurredBackgroundColor)
         
         self.toolbarSeparatorNode = ASDisplayNode()
         self.toolbarSeparatorNode.backgroundColor = theme.rootController.navigationBar.separatorColor
@@ -102,13 +103,13 @@ final class HashtagSearchControllerNode: ASDisplayNode {
         }
     }
     
-    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
         self.containerLayout = (layout, navigationBarHeight)
         
-        if self.chatController != nil && self.toolbarBackgroundNode.supernode == nil {
-            self.addSubnode(self.toolbarBackgroundNode)
-            self.addSubnode(self.toolbarSeparatorNode)
-            self.addSubnode(self.segmentedControlNode)
+        if self.chatController != nil && self.toolbarSeparatorNode.supernode == nil {
+            //self.addSubnode(self.toolbarBackgroundNode)
+            self.navigationBar?.additionalContentNode.addSubnode(self.toolbarSeparatorNode)
+            self.navigationBar?.additionalContentNode.addSubnode(self.segmentedControlNode)
         }
         
         var insets = layout.insets(options: [.input])
@@ -118,10 +119,11 @@ final class HashtagSearchControllerNode: ASDisplayNode {
         let panelY: CGFloat = insets.top - UIScreenPixel - 4.0
         
         transition.updateFrame(node: self.toolbarBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelY), size: CGSize(width: layout.size.width, height: toolbarHeight)))
-        transition.updateFrame(node: self.toolbarSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelY + toolbarHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
+        self.toolbarBackgroundNode.update(size: self.toolbarBackgroundNode.bounds.size, transition: transition)
+        transition.updateFrame(node: self.toolbarSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelY), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
         
         let controlSize = self.segmentedControlNode.updateLayout(.stretchToFill(width: layout.size.width - 14.0 * 2.0), transition: transition)
-        transition.updateFrame(node: self.segmentedControlNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - controlSize.width) / 2.0), y: panelY + floor((toolbarHeight - controlSize.height) / 2.0)), size: controlSize))
+        transition.updateFrame(node: self.segmentedControlNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - controlSize.width) / 2.0), y: panelY + 2.0 + floor((toolbarHeight - controlSize.height) / 2.0)), size: controlSize))
         
         if let chatController = self.chatController {
             insets.top += toolbarHeight - 4.0
@@ -152,5 +154,11 @@ final class HashtagSearchControllerNode: ASDisplayNode {
                 self.dequeueTransition()
             }
         }
+
+        if self.chatController != nil {
+            return toolbarHeight
+        } else {
+            return 0.0
+        }
     }
 }
diff --git a/submodules/ImageCompression/Sources/ImageCompression.swift b/submodules/ImageCompression/Sources/ImageCompression.swift
index 0d123acb2f..8988c56557 100644
--- a/submodules/ImageCompression/Sources/ImageCompression.swift
+++ b/submodules/ImageCompression/Sources/ImageCompression.swift
@@ -58,6 +58,31 @@ public func compressImage(_ image: UIImage, quality: Float) -> Data? {
     return data as Data
 }
 
-public func compressImageMiniThumbnail(_ image: UIImage) -> Data? {
-    return compressMiniThumbnail(image)
+public enum MiniThumbnailType {
+    case image
+    case avatar
+}
+
+public func compressImageMiniThumbnail(_ image: UIImage, type: MiniThumbnailType = .image) -> Data? {
+    switch type {
+    case .image:
+        return compressMiniThumbnail(image, CGSize(width: 40.0, height: 40.0))
+    case .avatar:
+        var size: CGFloat = 8.0
+        var data = compressMiniThumbnail(image, CGSize(width: size, height: size))
+        while true {
+            size += 1.0
+            if let candidateData = compressMiniThumbnail(image, CGSize(width: size, height: size)) {
+                if candidateData.count >= 32 {
+                    break
+                } else {
+                    data = candidateData
+                }
+            } else {
+                break
+            }
+        }
+
+        return data
+    }
 }
diff --git a/submodules/ImageTransparency/Sources/ImageTransparency.swift b/submodules/ImageTransparency/Sources/ImageTransparency.swift
index 3c0e71187e..3283567641 100644
--- a/submodules/ImageTransparency/Sources/ImageTransparency.swift
+++ b/submodules/ImageTransparency/Sources/ImageTransparency.swift
@@ -92,14 +92,19 @@ public func imageRequiresInversion(_ cgImage: CGImage) -> Bool {
         }
         
         if hasAlpha {
+            let probingContext = DrawingContext(size: CGSize(width: cgImage.width, height: cgImage.height))
+            probingContext.withContext { c in
+                c.draw(cgImage, in: CGRect(origin: CGPoint(), size: probingContext.size))
+            }
+
             var matching: Int = 0
             var total: Int = 0
-            for y in 0 ..< Int(context.size.height) {
-                for x in 0 ..< Int(context.size.width) {
+            for y in 0 ..< Int(probingContext.size.height) {
+                for x in 0 ..< Int(probingContext.size.width) {
                     var saturation: CGFloat = 0.0
                     var brightness: CGFloat = 0.0
                     var alpha: CGFloat = 0.0
-                    if context.colorAt(CGPoint(x: x, y: y)).getHue(nil, saturation: &saturation, brightness: &brightness, alpha: &alpha) {
+                    if probingContext.colorAt(CGPoint(x: x, y: y)).getHue(nil, saturation: &saturation, brightness: &brightness, alpha: &alpha) {
                         if alpha < 1.0 {
                             hasAlpha = true
                         }
diff --git a/submodules/ImportStickerPackUI/BUILD b/submodules/ImportStickerPackUI/BUILD
new file mode 100644
index 0000000000..dda51cbc8b
--- /dev/null
+++ b/submodules/ImportStickerPackUI/BUILD
@@ -0,0 +1,38 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "ImportStickerPackUI",
+    module_name = "ImportStickerPackUI",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AccountContext:AccountContext",
+        "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/ShareController:ShareController",
+        "//submodules/ItemListUI:ItemListUI",
+        "//submodules/StickerResources:StickerResources",
+        "//submodules/AlertUI:AlertUI",
+        "//submodules/PresentationDataUtils:PresentationDataUtils",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/MergeLists:MergeLists",
+        "//submodules/ActivityIndicator:ActivityIndicator",
+        "//submodules/AnimatedStickerNode:AnimatedStickerNode",
+        "//submodules/TelegramAnimatedStickerNode:TelegramAnimatedStickerNode",
+        "//submodules/ShimmerEffect:ShimmerEffect",
+        "//submodules/UndoUI:UndoUI",
+        "//submodules/ContextUI:ContextUI",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/StickerPackPreviewUI:StickerPackPreviewUI",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/ImportStickerPackUI/Sources/ImportStickerPack.swift b/submodules/ImportStickerPackUI/Sources/ImportStickerPack.swift
new file mode 100644
index 0000000000..dadfc898be
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/ImportStickerPack.swift
@@ -0,0 +1,102 @@
+import Foundation
+import UIKit
+import Postbox
+
+enum StickerVerificationStatus {
+    case loading
+    case verified
+    case declined
+}
+
+public class ImportStickerPack {
+    public class Sticker: Equatable {
+        public enum Content {
+            case image(Data)
+            case animation(Data)
+        }
+        
+        public static func == (lhs: ImportStickerPack.Sticker, rhs: ImportStickerPack.Sticker) -> Bool {
+            return lhs.uuid == rhs.uuid
+        }
+        
+        let content: Content
+        let emojis: [String]
+        let uuid: UUID
+        var resource: MediaResource?
+        
+        init(content: Content, emojis: [String], uuid: UUID = UUID()) {
+            self.content = content
+            self.emojis = emojis
+            self.uuid = uuid
+        }
+        
+        var data: Data {
+            switch self.content {
+                case let .image(data):
+                    return data
+                case let .animation(data):
+                    return data
+            }
+        }
+        
+        var isAnimated: Bool {
+            if case .animation = self.content {
+                return true
+            } else {
+                return false
+            }
+        }
+    }
+    
+    public let software: String
+    public let isAnimated: Bool
+    public let thumbnail: Sticker?
+    public let stickers: [Sticker]
+    
+    public init?(data: Data) {
+        guard let json = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
+            return nil
+        }
+        self.software = json["software"] as? String ?? ""
+        let isAnimated = json["isAnimated"] as? Bool ?? false
+        self.isAnimated = isAnimated
+        
+        func parseSticker(_ sticker: [String: Any]) -> Sticker? {
+            if let dataString = sticker["data"] as? String, let mimeType = sticker["mimeType"] as? String, let data = Data(base64Encoded: dataString) {
+                var content: Sticker.Content?
+                switch mimeType.lowercased() {
+                    case "image/png":
+                        if !isAnimated {
+                            content = .image(data)
+                        }
+                    case "application/x-tgsticker":
+                        if isAnimated {
+                            content = .animation(data)
+                        }
+                    default:
+                        break
+                }
+                if let content = content {
+                    return Sticker(content: content, emojis: sticker["emojis"] as? [String] ?? [])
+                }
+            }
+            return nil
+        }
+        
+        if let thumbnail = json["thumbnail"] as? [String: Any], let parsedSticker = parseSticker(thumbnail) {
+            self.thumbnail = parsedSticker
+        } else {
+            self.thumbnail = nil
+        }
+        
+        var stickers: [Sticker] = []
+        if let stickersArray = json["stickers"] as? [[String: Any]] {
+            for sticker in stickersArray {
+                if let parsedSticker = parseSticker(sticker) {
+                    stickers.append(parsedSticker)
+                }
+            }
+        }
+        self.stickers = stickers
+    }
+}
diff --git a/submodules/ImportStickerPackUI/Sources/ImportStickerPackController.swift b/submodules/ImportStickerPackUI/Sources/ImportStickerPackController.swift
new file mode 100644
index 0000000000..b49309f8bd
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/ImportStickerPackController.swift
@@ -0,0 +1,169 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import Postbox
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import TelegramUIPreferences
+import AccountContext
+import ShareController
+import StickerResources
+import AlertUI
+import PresentationDataUtils
+import UndoUI
+
+public final class ImportStickerPackController: ViewController, StandalonePresentableController {
+    private var controllerNode: ImportStickerPackControllerNode {
+        return self.displayNode as! ImportStickerPackControllerNode
+    }
+    
+    private var animatedIn = false
+    private var isDismissed = false
+        
+    public var dismissed: (() -> Void)?
+    
+    private let context: AccountContext
+    private weak var parentNavigationController: NavigationController?
+    
+    private let stickerPack: ImportStickerPack
+    private var presentationDataDisposable: Disposable?
+    private var verificationDisposable: Disposable?
+    
+    public init(context: AccountContext, stickerPack: ImportStickerPack, parentNavigationController: NavigationController?) {
+        self.context = context
+        self.parentNavigationController = parentNavigationController
+        
+        self.stickerPack = stickerPack
+        
+        super.init(navigationBarPresentationData: nil)
+        
+        self.blocksBackgroundWhenInOverlay = true
+        self.acceptsFocusWhenInOverlay = true
+        self.statusBar.statusBarStyle = .Ignore
+        
+        self.presentationDataDisposable = (context.sharedContext.presentationData
+        |> deliverOnMainQueue).start(next: { [weak self] presentationData in
+            if let strongSelf = self, strongSelf.isNodeLoaded {
+                strongSelf.controllerNode.updatePresentationData(presentationData)
+            }
+        })
+    }
+    
+    required public init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    deinit {
+        self.presentationDataDisposable?.dispose()
+        self.verificationDisposable?.dispose()
+    }
+    
+    override public func loadDisplayNode() {
+        self.displayNode = ImportStickerPackControllerNode(context: self.context)
+        self.controllerNode.dismiss = { [weak self] in
+            self?.dismissed?()
+            self?.presentingViewController?.dismiss(animated: false, completion: nil)
+        }
+        self.controllerNode.cancel = { [weak self] in
+            self?.dismiss()
+        }
+        self.controllerNode.present = { [weak self] controller, arguments in
+            self?.present(controller, in: .window(.root), with: arguments)
+        }
+        self.controllerNode.presentInGlobalOverlay = { [weak self] controller, arguments in
+            self?.presentInGlobalOverlay(controller, with: arguments)
+        }
+        self.controllerNode.navigationController = self.parentNavigationController
+        
+        Queue.mainQueue().after(0.1) {
+            self.controllerNode.updateStickerPack(self.stickerPack, verifiedStickers: Set(), declinedStickers: Set(), uploadedStickerResources: [:])
+            
+            if self.stickerPack.isAnimated {
+                let _ = (self.context.account.postbox.loadedPeerWithId(self.context.account.peerId)
+                |> deliverOnMainQueue).start(next: { [weak self] peer in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    
+                    var signals: [Signal<(UUID, StickerVerificationStatus, MediaResource?), NoError>] = []
+                    for sticker in strongSelf.stickerPack.stickers {
+                        if let resource = strongSelf.controllerNode.stickerResources[sticker.uuid] {
+                            signals.append(strongSelf.context.engine.stickers.uploadSticker(peer: peer, resource: resource, alt: sticker.emojis.first ?? "", dimensions: PixelDimensions(width: 512, height: 512), isAnimated: true)
+                            |> map { result -> (UUID, StickerVerificationStatus, MediaResource?) in
+                                switch result {
+                                    case .progress:
+                                        return (sticker.uuid, .loading, nil)
+                                    case let .complete(resource, mimeType):
+                                        if mimeType == "application/x-tgsticker" {
+                                            return (sticker.uuid, .verified, resource)
+                                        } else {
+                                            return (sticker.uuid, .declined, nil)
+                                        }
+                                }
+                            }
+                            |> `catch` { _ -> Signal<(UUID, StickerVerificationStatus, MediaResource?), NoError> in
+                                return .single((sticker.uuid, .declined, nil))
+                            })
+                        }
+                    }
+                    strongSelf.verificationDisposable = (combineLatest(signals)
+                    |> deliverOnMainQueue).start(next: { [weak self] results in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        var verifiedStickers = Set<UUID>()
+                        var declinedStickers = Set<UUID>()
+                        var uploadedStickerResources: [UUID: MediaResource] = [:]
+                        for (uuid, result, resource) in results {
+                            switch result {
+                                case .verified:
+                                    if let resource = resource {
+                                        verifiedStickers.insert(uuid)
+                                        uploadedStickerResources[uuid] = resource
+                                    } else {
+                                        declinedStickers.insert(uuid)
+                                    }
+                                case .declined:
+                                    declinedStickers.insert(uuid)
+                                case .loading:
+                                    break
+                            }
+                        }
+                        strongSelf.controllerNode.updateStickerPack(strongSelf.stickerPack, verifiedStickers: verifiedStickers, declinedStickers: declinedStickers, uploadedStickerResources: uploadedStickerResources)
+                    })
+                })
+            }
+        }
+        
+        self.ready.set(self.controllerNode.ready.get())
+    }
+    
+    override public func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        if !self.animatedIn {
+            self.animatedIn = true
+            self.controllerNode.animateIn()
+        }
+    }
+    
+    override public func dismiss(completion: (() -> Void)? = nil) {
+        if !self.isDismissed {
+            self.isDismissed = true
+        } else {
+            return
+        }
+        self.acceptsFocusWhenInOverlay = false
+        self.requestUpdateParameters()
+        self.controllerNode.animateOut(completion: completion)
+    }
+    
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        super.containerLayoutUpdated(layout, transition: transition)
+        
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+    }
+}
+
diff --git a/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift b/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift
new file mode 100644
index 0000000000..c2e27298a8
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/ImportStickerPackControllerNode.swift
@@ -0,0 +1,863 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import Postbox
+import TelegramCore
+import SyncCore
+import TelegramPresentationData
+import TelegramUIPreferences
+import MergeLists
+import ActivityIndicator
+import TextFormat
+import AccountContext
+import ContextUI
+import RadialStatusNode
+import UndoUI
+import StickerPackPreviewUI
+
+private struct StickerPackPreviewGridEntry: Comparable, Equatable, Identifiable {
+    let index: Int
+    let stickerItem: ImportStickerPack.Sticker
+    let isVerified: Bool
+    
+    var stableId: Int {
+        return self.index
+    }
+    
+    static func <(lhs: StickerPackPreviewGridEntry, rhs: StickerPackPreviewGridEntry) -> Bool {
+        return lhs.index < rhs.index
+    }
+    
+    func item(account: Account, interaction: StickerPackPreviewInteraction, theme: PresentationTheme) -> StickerPackPreviewGridItem {
+        return StickerPackPreviewGridItem(account: account, stickerItem: self.stickerItem, interaction: interaction, theme: theme, isVerified: self.isVerified)
+    }
+    
+    
+}
+
+private struct StickerPackPreviewGridTransaction {
+    let deletions: [Int]
+    let insertions: [GridNodeInsertItem]
+    let updates: [GridNodeUpdateItem]
+    
+    init(previousList: [StickerPackPreviewGridEntry], list: [StickerPackPreviewGridEntry], account: Account, interaction: StickerPackPreviewInteraction, theme: PresentationTheme) {
+         let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: previousList, rightList: list)
+        
+        self.deletions = deleteIndices
+        self.insertions = indicesAndItems.map { GridNodeInsertItem(index: $0.0, item: $0.1.item(account: account, interaction: interaction, theme: theme), previousIndex: $0.2) }
+        self.updates = updateIndices.map { GridNodeUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(account: account, interaction: interaction, theme: theme)) }
+    }
+}
+
+final class ImportStickerPackControllerNode: ViewControllerTracingNode, UIScrollViewDelegate {
+    private let context: AccountContext
+    private var presentationData: PresentationData
+    private var stickerPack: ImportStickerPack?
+    var stickerResources: [UUID: MediaResource] = [:]
+    private var uploadedStickerResources: [UUID: MediaResource] = [:]
+    private var stickerPackReady = true
+    
+    private var containerLayout: (ContainerViewLayout, CGFloat)?
+    
+    private let dimNode: ASDisplayNode
+    
+    private let wrappingScrollNode: ASScrollNode
+    private let cancelButtonNode: ASButtonNode
+    
+    private let contentContainerNode: ASDisplayNode
+    private let contentBackgroundNode: ASImageNode
+    private let contentGridNode: GridNode
+    private let createActionButtonNode: ASButtonNode
+    private let createActionSeparatorNode: ASDisplayNode
+    private let addToExistingActionButtonNode: ASButtonNode
+    private let addToExistingActionSeparatorNode: ASDisplayNode
+    private let contentTitleNode: ImmediateTextNode
+    private let contentSeparatorNode: ASDisplayNode
+    
+    private let radialStatus: RadialStatusNode
+    private let radialCheck: RadialStatusNode
+    private let radialStatusBackground: ASImageNode
+    private let radialStatusText: ImmediateTextNode
+    private let progressText: ImmediateTextNode
+    private let infoText: ImmediateTextNode
+    
+    private var interaction: StickerPackPreviewInteraction!
+    
+    weak var navigationController: NavigationController?
+    
+    var present: ((ViewController, Any?) -> Void)?
+    var presentInGlobalOverlay: ((ViewController, Any?) -> Void)?
+    var dismiss: (() -> Void)?
+    var cancel: (() -> Void)?
+    
+    let ready = Promise<Bool>()
+    private var didSetReady = false
+    
+    private var pendingItems: [StickerPackPreviewGridEntry] = []
+    private var currentItems: [StickerPackPreviewGridEntry] = []
+    
+    private var hapticFeedback: HapticFeedback?
+    
+    private let disposable = MetaDisposable()
+    private let shortNameSuggestionDisposable = MetaDisposable()
+    
+    private var progress: (CGFloat, Int32, Int32)?
+        
+    init(context: AccountContext) {
+        self.context = context
+        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        
+        self.wrappingScrollNode = ASScrollNode()
+        self.wrappingScrollNode.view.alwaysBounceVertical = true
+        self.wrappingScrollNode.view.delaysContentTouches = false
+        self.wrappingScrollNode.view.canCancelContentTouches = true
+        
+        self.dimNode = ASDisplayNode()
+        self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
+        
+        self.cancelButtonNode = ASButtonNode()
+        self.cancelButtonNode.displaysAsynchronously = false
+        
+        self.contentContainerNode = ASDisplayNode()
+        self.contentContainerNode.isOpaque = false
+        self.contentContainerNode.clipsToBounds = true
+        
+        self.contentBackgroundNode = ASImageNode()
+        self.contentBackgroundNode.displaysAsynchronously = false
+        self.contentBackgroundNode.displayWithoutProcessing = true
+        
+        self.contentGridNode = GridNode()
+        
+        self.createActionButtonNode = HighlightTrackingButtonNode()
+        self.createActionButtonNode.displaysAsynchronously = false
+        self.createActionButtonNode.titleNode.displaysAsynchronously = false
+        
+        self.addToExistingActionButtonNode = HighlightTrackingButtonNode()
+        self.addToExistingActionButtonNode.displaysAsynchronously = false
+        self.addToExistingActionButtonNode.titleNode.displaysAsynchronously = false
+        
+        self.contentTitleNode = ImmediateTextNode()
+        self.contentTitleNode.displaysAsynchronously = false
+        self.contentTitleNode.maximumNumberOfLines = 1
+        self.contentTitleNode.alpha = 0.0
+        
+        self.contentSeparatorNode = ASDisplayNode()
+        self.contentSeparatorNode.isLayerBacked = true
+        
+        self.createActionSeparatorNode = ASDisplayNode()
+        self.createActionSeparatorNode.isLayerBacked = true
+        self.createActionSeparatorNode.displaysAsynchronously = false
+        
+        self.addToExistingActionSeparatorNode = ASDisplayNode()
+        self.addToExistingActionSeparatorNode.isLayerBacked = true
+        self.addToExistingActionSeparatorNode.displaysAsynchronously = false
+        
+        self.radialStatus = RadialStatusNode(backgroundNodeColor: .clear)
+        self.radialStatus.alpha = 0.0
+        self.radialCheck = RadialStatusNode(backgroundNodeColor: .clear)
+        self.radialCheck.alpha = 0.0
+        
+        self.radialStatusBackground = ASImageNode()
+        self.radialStatusBackground.isUserInteractionEnabled = false
+        self.radialStatusBackground.displaysAsynchronously = false
+        self.radialStatusBackground.image = generateCircleImage(diameter: 180.0, lineWidth: 6.0, color: self.presentationData.theme.list.itemAccentColor.withMultipliedAlpha(0.2))
+        self.radialStatusBackground.alpha = 0.0
+        
+        self.radialStatusText = ImmediateTextNode()
+        self.radialStatusText.isUserInteractionEnabled = false
+        self.radialStatusText.displaysAsynchronously = false
+        self.radialStatusText.maximumNumberOfLines = 1
+        self.radialStatusText.isAccessibilityElement = false
+        self.radialStatusText.alpha = 0.0
+        
+        self.progressText = ImmediateTextNode()
+        self.progressText.isUserInteractionEnabled = false
+        self.progressText.displaysAsynchronously = false
+        self.progressText.maximumNumberOfLines = 1
+        self.progressText.isAccessibilityElement = false
+        self.progressText.alpha = 0.0
+        
+        self.infoText = ImmediateTextNode()
+        self.infoText.isUserInteractionEnabled = false
+        self.infoText.displaysAsynchronously = false
+        self.infoText.maximumNumberOfLines = 4
+        self.infoText.isAccessibilityElement = false
+        self.infoText.textAlignment = .center
+        self.infoText.alpha = 0.0
+        
+        super.init()
+        
+        self.interaction = StickerPackPreviewInteraction(playAnimatedStickers: false)
+        
+        self.backgroundColor = nil
+        self.isOpaque = false
+        
+        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:))))
+        self.addSubnode(self.dimNode)
+        
+        self.wrappingScrollNode.view.delegate = self
+        self.addSubnode(self.wrappingScrollNode)
+        
+        self.wrappingScrollNode.addSubnode(self.cancelButtonNode)
+        self.cancelButtonNode.addTarget(self, action: #selector(self.cancelButtonPressed), forControlEvents: .touchUpInside)
+        
+        self.createActionButtonNode.addTarget(self, action: #selector(self.createActionButtonPressed), forControlEvents: .touchUpInside)
+        self.addToExistingActionButtonNode.addTarget(self, action: #selector(self.addToExistingActionButtonPressed), forControlEvents: .touchUpInside)
+        
+        self.wrappingScrollNode.addSubnode(self.contentBackgroundNode)
+        
+        self.wrappingScrollNode.addSubnode(self.contentContainerNode)
+        self.contentContainerNode.addSubnode(self.contentGridNode)
+        self.contentContainerNode.addSubnode(self.createActionSeparatorNode)
+        self.contentContainerNode.addSubnode(self.createActionButtonNode)
+//        self.contentContainerNode.addSubnode(self.addToExistingActionSeparatorNode)
+//        self.contentContainerNode.addSubnode(self.addToExistingActionButtonNode)
+        self.wrappingScrollNode.addSubnode(self.contentTitleNode)
+        self.wrappingScrollNode.addSubnode(self.contentSeparatorNode)
+        
+        self.wrappingScrollNode.addSubnode(self.radialStatusBackground)
+        self.wrappingScrollNode.addSubnode(self.radialStatus)
+        self.wrappingScrollNode.addSubnode(self.radialCheck)
+        self.wrappingScrollNode.addSubnode(self.radialStatusText)
+        self.wrappingScrollNode.addSubnode(self.progressText)
+        self.wrappingScrollNode.addSubnode(self.infoText)
+        
+        self.createActionButtonNode.setTitle(self.presentationData.strings.ImportStickerPack_CreateNewStickerSet, with: Font.regular(20.0), with: self.presentationData.theme.actionSheet.controlAccentColor, for: .normal)
+        self.addToExistingActionButtonNode.setTitle(self.presentationData.strings.ImportStickerPack_AddToExistingStickerSet, with: Font.regular(20.0), with: self.presentationData.theme.actionSheet.controlAccentColor, for: .normal)
+        
+        self.contentGridNode.presentationLayoutUpdated = { [weak self] presentationLayout, transition in
+            self?.gridPresentationLayoutUpdated(presentationLayout, transition: transition)
+        }
+    }
+    
+    deinit {
+        self.disposable.dispose()
+        self.shortNameSuggestionDisposable.dispose()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
+            self.wrappingScrollNode.view.contentInsetAdjustmentBehavior = .never
+        }
+        self.contentGridNode.view.addGestureRecognizer(PeekControllerGestureRecognizer(contentAtPoint: { [weak self] point -> Signal<(ASDisplayNode, PeekControllerContent)?, NoError>? in
+            if let strongSelf = self {
+                if let itemNode = strongSelf.contentGridNode.itemNodeAtPoint(point) as? StickerPackPreviewGridItemNode, let item = itemNode.stickerPackItem {
+                    var menuItems: [ContextMenuItem] = []
+                    if strongSelf.currentItems.count > 1 {
+                        menuItems.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.ImportStickerPack_RemoveFromImport, textColor: .destructive, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor) }, action: { [weak self] c, f in
+                            f(.dismissWithoutContent)
+                            
+                            if let strongSelf = self {
+                                var updatedItems = strongSelf.currentItems
+                                updatedItems.removeAll(where: { $0.stickerItem.uuid == item.uuid })
+                                strongSelf.pendingItems = updatedItems
+                                
+                                if let (layout, navigationHeight) = strongSelf.containerLayout {
+                                    strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
+                                }
+                            }
+                        })))
+                    }
+                    return .single((itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: item, menu: menuItems)))
+                }
+            }
+            return nil
+        }, present: { [weak self] content, sourceNode in
+            if let strongSelf = self {
+                let controller = PeekController(presentationData: strongSelf.presentationData, content: content, sourceNode: {
+                    return sourceNode
+                })
+                controller.visibilityUpdated = { [weak self] visible in
+                    if let strongSelf = self {
+                        strongSelf.contentGridNode.forceHidden = visible
+                    }
+                }
+                strongSelf.presentInGlobalOverlay?(controller, nil)
+                return controller
+            }
+            return nil
+        }, updateContent: { [weak self] content in
+            if let strongSelf = self {
+                var item: ImportStickerPack.Sticker?
+                if let content = content as? StickerPreviewPeekContent {
+                    item = content.item
+                }
+                strongSelf.updatePreviewingItem(item: item, animated: true)
+            }
+        }, activateBySingleTap: true))
+        
+        self.updatePresentationData(self.presentationData)
+    }
+    
+    func updatePresentationData(_ presentationData: PresentationData) {
+        self.presentationData = presentationData
+        
+        let theme = presentationData.theme
+        let solidBackground = generateImage(CGSize(width: 1.0, height: 1.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(theme.actionSheet.opaqueItemBackgroundColor.cgColor)
+            context.fill(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height)))
+        })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 1)
+        
+        let highlightedSolidBackground = generateImage(CGSize(width: 1.0, height: 1.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(theme.actionSheet.opaqueItemHighlightedBackgroundColor.cgColor)
+            context.fill(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height)))
+        })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 1)
+        
+        let halfRoundedBackground = generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(theme.actionSheet.opaqueItemBackgroundColor.cgColor)
+            context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height)))
+            context.fill(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height / 2.0)))
+        })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 1)
+        
+        let highlightedHalfRoundedBackground = generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(theme.actionSheet.opaqueItemHighlightedBackgroundColor.cgColor)
+            context.fillEllipse(in: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height)))
+            context.fill(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height / 2.0)))
+        })?.stretchableImage(withLeftCapWidth: 16, topCapHeight: 1)
+        
+        let roundedBackground = generateStretchableFilledCircleImage(radius: 16.0, color: presentationData.theme.actionSheet.opaqueItemBackgroundColor)
+        let highlightedRoundedBackground = generateStretchableFilledCircleImage(radius: 16.0, color: presentationData.theme.actionSheet.opaqueItemHighlightedBackgroundColor)
+        
+        self.contentBackgroundNode.image = roundedBackground
+        
+        self.cancelButtonNode.setBackgroundImage(roundedBackground, for: .normal)
+        self.cancelButtonNode.setBackgroundImage(highlightedRoundedBackground, for: .highlighted)
+
+        if self.addToExistingActionButtonNode.supernode != nil {
+            self.createActionButtonNode.setBackgroundImage(solidBackground, for: .normal)
+            self.createActionButtonNode.setBackgroundImage(highlightedSolidBackground, for: .highlighted)
+        } else {
+            self.createActionButtonNode.setBackgroundImage(halfRoundedBackground, for: .normal)
+            self.createActionButtonNode.setBackgroundImage(highlightedHalfRoundedBackground, for: .highlighted)
+        }
+        
+        self.addToExistingActionButtonNode.setBackgroundImage(halfRoundedBackground, for: .normal)
+        self.addToExistingActionButtonNode.setBackgroundImage(highlightedHalfRoundedBackground, for: .highlighted)
+        
+        self.contentSeparatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor
+        self.createActionSeparatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor
+        self.addToExistingActionSeparatorNode.backgroundColor = presentationData.theme.actionSheet.opaqueItemSeparatorColor
+        
+        self.cancelButtonNode.setTitle(presentationData.strings.Common_Cancel, with: Font.medium(20.0), with: presentationData.theme.actionSheet.standardActionTextColor, for: .normal)
+        
+        self.contentTitleNode.linkHighlightColor = presentationData.theme.actionSheet.controlAccentColor.withAlphaComponent(0.5)
+        
+        if let (layout, navigationBarHeight) = self.containerLayout {
+            self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
+        }
+    }
+    
+    private var hadProgress = false
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+        self.containerLayout = (layout, navigationBarHeight)
+        
+        transition.updateFrame(node: self.wrappingScrollNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        
+        var insets = layout.insets(options: [.statusBar])
+        insets.top = max(10.0, insets.top)
+        let cleanInsets = layout.insets(options: [.statusBar])
+        
+        let hasAddToExistingButton = self.addToExistingActionButtonNode.supernode != nil
+        
+        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        
+        var bottomInset: CGFloat = 10.0 + cleanInsets.bottom
+        if insets.bottom > 0 {
+            bottomInset -= 12.0
+        }
+        
+        let buttonHeight: CGFloat = 57.0
+        let sectionSpacing: CGFloat = 8.0
+        let titleAreaHeight: CGFloat = 51.0
+        
+        let width = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: 10.0 + layout.safeInsets.left)
+        
+        let sideInset = floor((layout.size.width - width) / 2.0)
+        
+        transition.updateFrame(node: self.cancelButtonNode, frame: CGRect(origin: CGPoint(x: sideInset, y: layout.size.height - bottomInset - buttonHeight), size: CGSize(width: width, height: buttonHeight)))
+        
+        let maximumContentHeight = layout.size.height - insets.top - bottomInset - buttonHeight - sectionSpacing
+        
+        let contentContainerFrame = CGRect(origin: CGPoint(x: sideInset, y: insets.top), size: CGSize(width: width, height: maximumContentHeight))
+        let contentFrame = contentContainerFrame.insetBy(dx: 12.0, dy: 0.0)
+        
+        var transaction: StickerPackPreviewGridTransaction?
+                
+        var forceTitleUpdate = false
+        if self.progress != nil && !self.hadProgress {
+            self.hadProgress = true
+            forceTitleUpdate = true
+        }
+        
+        if let _ = self.stickerPack, self.currentItems.isEmpty || self.currentItems.count != self.pendingItems.count || self.pendingItems != self.currentItems || forceTitleUpdate {
+            let previousItems = self.currentItems
+            self.currentItems = self.pendingItems
+            
+            let titleFont = Font.medium(20.0)
+            let title: String
+            if let _ = self.progress {
+                title = self.presentationData.strings.ImportStickerPack_ImportingStickers
+            } else {
+                title = self.presentationData.strings.ImportStickerPack_StickerCount(Int32(self.currentItems.count))
+            }
+            self.contentTitleNode.attributedText = stringWithAppliedEntities(title, entities: [], baseColor: self.presentationData.theme.actionSheet.primaryTextColor, linkColor: self.presentationData.theme.actionSheet.controlAccentColor, baseFont: titleFont, linkFont: titleFont, boldFont: titleFont, italicFont: titleFont, boldItalicFont: titleFont, fixedFont: titleFont, blockQuoteFont: titleFont)
+
+            if !forceTitleUpdate {
+                transaction = StickerPackPreviewGridTransaction(previousList: previousItems, list: self.currentItems, account: self.context.account, interaction: self.interaction, theme: self.presentationData.theme)
+            }
+        }
+        let itemCount = self.currentItems.count
+        
+        let titleSize = self.contentTitleNode.updateLayout(CGSize(width: contentContainerFrame.size.width - 24.0, height: CGFloat.greatestFiniteMagnitude))
+        let titleFrame = CGRect(origin: CGPoint(x: contentContainerFrame.minX + floor((contentContainerFrame.size.width - titleSize.width) / 2.0), y: self.contentBackgroundNode.frame.minY + 15.0), size: titleSize)
+        let deltaTitlePosition = CGPoint(x: titleFrame.midX - self.contentTitleNode.frame.midX, y: titleFrame.midY - self.contentTitleNode.frame.midY)
+        self.contentTitleNode.frame = titleFrame
+        transition.animatePosition(node: self.contentTitleNode, from: CGPoint(x: titleFrame.midX + deltaTitlePosition.x, y: titleFrame.midY + deltaTitlePosition.y))
+        
+        transition.updateFrame(node: self.contentTitleNode, frame: titleFrame)
+        transition.updateFrame(node: self.contentSeparatorNode, frame: CGRect(origin: CGPoint(x: contentContainerFrame.minX, y: self.contentBackgroundNode.frame.minY + titleAreaHeight), size: CGSize(width: contentContainerFrame.size.width, height: UIScreenPixel)))
+        
+        let itemsPerRow = 4
+        let itemWidth = floor(contentFrame.size.width / CGFloat(itemsPerRow))
+        let rowCount = itemCount / itemsPerRow + (itemCount % itemsPerRow != 0 ? 1 : 0)
+        
+        let minimallyRevealedRowCount: CGFloat = 3.5
+        let initiallyRevealedRowCount = min(minimallyRevealedRowCount, CGFloat(rowCount))
+        
+        var bottomGridInset = hasAddToExistingButton ? 2.0 * buttonHeight : buttonHeight
+        if let _ = self.progress {
+            bottomGridInset += 210.0
+        }
+        let topInset = max(0.0, contentFrame.size.height - initiallyRevealedRowCount * itemWidth - titleAreaHeight - bottomGridInset)
+        transition.updateFrame(node: self.contentContainerNode, frame: contentContainerFrame)
+        
+        let createButtonOffset = hasAddToExistingButton ? 2.0 * buttonHeight : buttonHeight
+        transition.updateFrame(node: self.createActionButtonNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentContainerFrame.size.height - createButtonOffset), size: CGSize(width: contentContainerFrame.size.width, height: buttonHeight)))
+        transition.updateFrame(node: self.createActionSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentContainerFrame.size.height - createButtonOffset - UIScreenPixel), size: CGSize(width: contentContainerFrame.size.width, height: UIScreenPixel)))
+
+        transition.updateFrame(node: self.addToExistingActionButtonNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentContainerFrame.size.height - buttonHeight), size: CGSize(width: contentContainerFrame.size.width, height: buttonHeight)))
+        transition.updateFrame(node: self.addToExistingActionSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: contentContainerFrame.size.height - buttonHeight - UIScreenPixel), size: CGSize(width: contentContainerFrame.size.width, height: UIScreenPixel)))
+        
+        let gridSize = CGSize(width: contentFrame.size.width, height: max(32.0, contentFrame.size.height - titleAreaHeight))
+        
+        self.contentGridNode.transaction(GridNodeTransaction(deleteItems: transaction?.deletions ?? [], insertItems: transaction?.insertions ?? [], updateItems: transaction?.updates ?? [], scrollToItem: nil, updateLayout: GridNodeUpdateLayout(layout: GridNodeLayout(size: gridSize, insets: UIEdgeInsets(top: topInset, left: 0.0, bottom: bottomGridInset, right: 0.0), preloadSize: 80.0, type: .fixed(itemSize: CGSize(width: itemWidth, height: itemWidth), fillWidth: nil, lineSpacing: 0.0, itemSpacing: nil)), transition: transition), itemTransition: .immediate, stationaryItems: .none, updateFirstIndexInSectionOffset: nil), completion: { _ in })
+        transition.updateFrame(node: self.contentGridNode, frame: CGRect(origin: CGPoint(x: floor((contentContainerFrame.size.width - contentFrame.size.width) / 2.0), y: titleAreaHeight), size: gridSize))
+                        
+        transition.updateAlpha(node: self.contentGridNode, alpha: self.progress == nil ? 1.0 : 0.0)
+        
+        var effectiveProgress: CGFloat = 0.0
+        var count: Int32 = 0
+        var total: Int32 = 0
+        
+        var hasProgress = false
+        if let (progress, progressCount, progressTotal) = self.progress {
+            effectiveProgress = progress
+            count = progressCount
+            total = progressTotal
+            hasProgress = true
+        }
+           
+        let availableHeight: CGFloat = 330.0
+        var radialStatusSize = CGSize(width: 186.0, height: 186.0)
+        var maxIconStatusSpacing: CGFloat = 46.0
+        var maxProgressTextSpacing: CGFloat = 33.0
+        var progressStatusSpacing: CGFloat = 14.0
+        var statusButtonSpacing: CGFloat = 19.0
+        
+        var maxK: CGFloat = availableHeight / (30.0 + maxProgressTextSpacing + 320.0)
+        maxK = max(0.5, min(1.0, maxK))
+        
+        radialStatusSize.width = floor(radialStatusSize.width * maxK)
+        radialStatusSize.height = floor(radialStatusSize.height * maxK)
+        maxIconStatusSpacing = floor(maxIconStatusSpacing * maxK)
+        maxProgressTextSpacing = floor(maxProgressTextSpacing * maxK)
+        progressStatusSpacing = floor(progressStatusSpacing * maxK)
+        statusButtonSpacing = floor(statusButtonSpacing * maxK)
+        
+        var updateRadialBackround = false
+        if let width = self.radialStatusBackground.image?.size.width {
+            if abs(width - radialStatusSize.width) > 0.01 {
+                updateRadialBackround = true
+            }
+        } else {
+            updateRadialBackround = true
+        }
+        
+        if updateRadialBackround {
+            self.radialStatusBackground.image = generateCircleImage(diameter: radialStatusSize.width, lineWidth: 6.0, color: self.presentationData.theme.list.itemAccentColor.withMultipliedAlpha(0.2))
+        }
+        
+        let contentOrigin = self.contentBackgroundNode.frame.minY + 72.0
+        if hasProgress {
+            transition.updateAlpha(node: self.radialStatusText, alpha: 1.0)
+            transition.updateAlpha(node: self.progressText, alpha: 1.0)
+            transition.updateAlpha(node: self.radialStatus, alpha: 1.0)
+            transition.updateAlpha(node: self.infoText, alpha: 1.0)
+            transition.updateAlpha(node: self.radialCheck, alpha: 1.0)
+            transition.updateAlpha(node: self.radialStatusBackground, alpha: 1.0)
+            transition.updateAlpha(node: self.createActionButtonNode, alpha: 0.0)
+            transition.updateAlpha(node: self.contentSeparatorNode, alpha: 0.0)
+            transition.updateAlpha(node: self.createActionSeparatorNode, alpha: 0.0)
+            transition.updateAlpha(node: self.addToExistingActionButtonNode, alpha: 0.0)
+            transition.updateAlpha(node: self.addToExistingActionSeparatorNode, alpha: 0.0)
+        }
+        
+        self.radialStatusText.attributedText = NSAttributedString(string: "\(Int(effectiveProgress * 100.0))%", font: Font.with(size: floor(36.0 * maxK), design: .round, weight: .semibold), textColor: self.presentationData.theme.list.itemPrimaryTextColor)
+        let radialStatusTextSize = self.radialStatusText.updateLayout(CGSize(width: 200.0, height: .greatestFiniteMagnitude))
+        
+        self.progressText.attributedText = NSAttributedString(string:  self.presentationData.strings.ImportStickerPack_Of(String(count), String(total)).0, font: Font.semibold(17.0), textColor: self.presentationData.theme.list.itemPrimaryTextColor)
+        let progressTextSize = self.progressText.updateLayout(CGSize(width: layout.size.width - 16.0 * 2.0, height: .greatestFiniteMagnitude))
+        
+        self.infoText.attributedText = NSAttributedString(string: self.presentationData.strings.ImportStickerPack_InProgress, font: Font.regular(17.0), textColor: self.presentationData.theme.list.itemSecondaryTextColor)
+        let infoTextSize = self.infoText.updateLayout(CGSize(width: layout.size.width - 16.0 * 2.0, height: .greatestFiniteMagnitude))
+        
+        transition.updateFrame(node: self.radialStatus, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - radialStatusSize.width) / 2.0), y: contentOrigin), size: radialStatusSize))
+        let checkSize: CGFloat = 130.0
+        transition.updateFrame(node: self.radialCheck, frame: CGRect(origin: CGPoint(x: self.radialStatus.frame.minX + floor((self.radialStatus.frame.width - checkSize) / 2.0), y: self.radialStatus.frame.minY + floor((self.radialStatus.frame.height - checkSize) / 2.0)), size: CGSize(width: checkSize, height: checkSize)))
+        transition.updateFrame(node: self.radialStatusBackground, frame: self.radialStatus.frame)
+        
+        transition.updateFrame(node: self.radialStatusText, frame: CGRect(origin: CGPoint(x: self.radialStatus.frame.minX + floor((self.radialStatus.frame.width - radialStatusTextSize.width) / 2.0), y: self.radialStatus.frame.minY + floor((self.radialStatus.frame.height - radialStatusTextSize.height) / 2.0)), size: radialStatusTextSize))
+        
+        transition.updateFrame(node: self.progressText, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - progressTextSize.width) / 2.0), y: (self.radialStatus.frame.maxY + maxProgressTextSpacing)), size: progressTextSize))
+        
+        transition.updateFrame(node: self.infoText, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - infoTextSize.width) / 2.0), y: (self.progressText.frame.maxY + maxProgressTextSpacing) + 10.0), size: infoTextSize))
+    }
+    
+    private func gridPresentationLayoutUpdated(_ presentationLayout: GridNodeCurrentPresentationLayout, transition: ContainedViewLayoutTransition) {
+        if let (layout, _) = self.containerLayout {
+            var insets = layout.insets(options: [.statusBar])
+            insets.top = max(10.0, insets.top)
+            let cleanInsets = layout.insets(options: [.statusBar])
+            
+            var bottomInset: CGFloat = 10.0 + cleanInsets.bottom
+            if insets.bottom > 0 {
+                bottomInset -= 12.0
+            }
+            
+            let buttonHeight: CGFloat = 57.0
+            let sectionSpacing: CGFloat = 8.0
+            let titleAreaHeight: CGFloat = 51.0
+            
+            let width = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: 10.0 + layout.safeInsets.left)
+            
+            let sideInset = floor((layout.size.width - width) / 2.0)
+            
+            let maximumContentHeight = layout.size.height - insets.top - bottomInset - buttonHeight - sectionSpacing
+            let contentFrame = CGRect(origin: CGPoint(x: sideInset, y: insets.top), size: CGSize(width: width, height: maximumContentHeight))
+             
+            var backgroundFrame = CGRect(origin: CGPoint(x: contentFrame.minX, y: contentFrame.minY - presentationLayout.contentOffset.y), size: contentFrame.size)
+            if backgroundFrame.minY < contentFrame.minY {
+                backgroundFrame.origin.y = contentFrame.minY
+            }
+            if backgroundFrame.maxY > contentFrame.maxY {
+                backgroundFrame.size.height += contentFrame.maxY - backgroundFrame.maxY
+            }
+            if backgroundFrame.size.height < buttonHeight + 32.0 {
+                backgroundFrame.origin.y -= buttonHeight + 32.0 - backgroundFrame.size.height
+                backgroundFrame.size.height = buttonHeight + 32.0
+            }
+            let backgroundDeltaY = backgroundFrame.minY - self.contentBackgroundNode.frame.minY
+            transition.updateFrame(node: self.contentBackgroundNode, frame: backgroundFrame)
+            transition.animatePositionAdditive(node: self.contentGridNode, offset: CGPoint(x: 0.0, y: -backgroundDeltaY))
+            
+            let titleSize = self.contentTitleNode.bounds.size
+            let titleFrame = CGRect(origin: CGPoint(x: contentFrame.minX + floor((contentFrame.size.width - titleSize.width) / 2.0), y: backgroundFrame.minY + 15.0), size: titleSize)
+            transition.updateFrame(node: self.contentTitleNode, frame: titleFrame)
+        
+            transition.updateFrame(node: self.contentSeparatorNode, frame: CGRect(origin: CGPoint(x: contentFrame.minX, y: backgroundFrame.minY + titleAreaHeight), size: CGSize(width: contentFrame.size.width, height: UIScreenPixel)))
+            
+            if CGFloat(0.0).isLessThanOrEqualTo(presentationLayout.contentOffset.y) {
+                self.contentSeparatorNode.alpha = 1.0
+            } else {
+                self.contentSeparatorNode.alpha = 0.0
+            }
+        }
+    }
+    
+    @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.cancelButtonPressed()
+        }
+    }
+    
+    @objc func cancelButtonPressed() {
+        self.disposable.set(nil)
+        self.cancel?()
+    }
+    
+    private func createStickerSet(title: String, shortName: String) {
+        guard let stickerPack = self.stickerPack else {
+            return
+        }
+        
+        var stickers: [ImportSticker] = []
+        for item in self.currentItems {
+            var dimensions = PixelDimensions(width: 512, height: 512)
+            if case let .image(data) = item.stickerItem.content, let image = UIImage(data: data) {
+                dimensions = PixelDimensions(image.size)
+            }
+            if let resource = self.uploadedStickerResources[item.stickerItem.uuid] {
+                if let localResource = item.stickerItem.resource {
+                    self.context.account.postbox.mediaBox.copyResourceData(from: localResource.id, to: resource.id)
+                }
+                stickers.append(ImportSticker(resource: resource, emojis: item.stickerItem.emojis, dimensions: dimensions))
+            } else if let resource = item.stickerItem.resource {
+                stickers.append(ImportSticker(resource: resource, emojis: item.stickerItem.emojis, dimensions: dimensions))
+            }
+        }
+        var thumbnailSticker: ImportSticker?
+        if let thumbnail = stickerPack.thumbnail {
+            var dimensions = PixelDimensions(width: 512, height: 512)
+            if case let .image(data) = thumbnail.content, let image = UIImage(data: data) {
+                dimensions = PixelDimensions(image.size)
+            }
+            let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+            self.context.account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnail.data)
+            thumbnailSticker = ImportSticker(resource: resource, emojis: [], dimensions: dimensions)
+        }
+        
+        let firstStickerItem = thumbnailSticker ?? stickers.first
+        
+        self.progress = (0.0, 0, Int32(stickers.count))
+        self.radialStatus.transitionToState(.progress(color: self.presentationData.theme.list.itemAccentColor, lineWidth: 6.0, value: max(0.01, 0.0), cancelEnabled: false, animateRotation: false), animated: false, synchronous: true, completion: {})
+        if let (layout, navigationBarHeight) = self.containerLayout {
+            self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition:  .animated(duration: 0.2, curve: .easeInOut))
+        }
+        
+        self.disposable.set((self.context.engine.stickers.createStickerSet(title: title, shortName: shortName, stickers: stickers, thumbnail: thumbnailSticker, isAnimated: stickerPack.isAnimated, software: stickerPack.software)
+        |> deliverOnMainQueue).start(next: { [weak self] status in
+            if let strongSelf = self {
+                if case let .complete(info, items) = status {
+                    if let (_, _, count) = strongSelf.progress {
+                        strongSelf.progress = (1.0, count, count)
+                        strongSelf.radialStatus.transitionToState(.progress(color: strongSelf.presentationData.theme.list.itemAccentColor, lineWidth: 6.0, value: 1.0, cancelEnabled: false, animateRotation: false), animated: !stickerPack.isAnimated, synchronous: true, completion: {})
+                        if let (layout, navigationBarHeight) = strongSelf.containerLayout {
+                            strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
+                        }
+                    }
+                    let _ = strongSelf.context.engine.stickers.addStickerPackInteractively(info: info, items: items).start()
+                    
+                    strongSelf.radialCheck.transitionToState(.progress(color: .clear, lineWidth: 6.0, value: 1.0, cancelEnabled: false, animateRotation: false), animated: false, synchronous: true, completion: {})
+                    strongSelf.radialCheck.transitionToState(.check(strongSelf.presentationData.theme.list.itemAccentColor), animated: true, synchronous: true, completion: {})
+                    strongSelf.radialStatus.layer.animateScale(from: 1.0, to: 1.05, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, additive: false, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.radialStatus.layer.animateScale(from: 1.05, to: 1.0, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, removeOnCompletion: false, additive: false)
+                    })
+                    strongSelf.radialStatusBackground.layer.animateScale(from: 1.0, to: 1.05, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, additive: false, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.radialStatusBackground.layer.animateScale(from: 1.05, to: 1.0, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, removeOnCompletion: false, additive: false)
+                    })
+                    strongSelf.radialCheck.layer.animateScale(from: 1.0, to: 1.05, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, additive: false, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.radialCheck.layer.animateScale(from: 1.05, to: 1.0, duration: 0.07, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, removeOnCompletion: false, additive: false)
+                    })
+                    strongSelf.radialStatusText.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                    strongSelf.radialStatusText.layer.animateScale(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                    
+                    strongSelf.cancelButtonNode.isUserInteractionEnabled = false
+                    
+                    let navigationController = strongSelf.navigationController
+                    let context = strongSelf.context
+                    
+                    Queue.mainQueue().after(1.0) {
+                        var firstItem: StickerPackItem?
+                        if let firstStickerItem = firstStickerItem, let resource = firstStickerItem.resource as? TelegramMediaResource {
+                            firstItem = StickerPackItem(index: ItemCollectionItemIndex(index: 0, id: 0), file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: stickerPack.isAnimated ? "application/x-tgsticker": "image/png", size: nil, attributes: [.FileName(fileName: stickerPack.isAnimated ? "sticker.tgs" : "sticker.png"), .ImageSize(size: firstStickerItem.dimensions)]), indexKeys: [])
+                        }
+                        strongSelf.presentInGlobalOverlay?(UndoOverlayController(presentationData: strongSelf.presentationData, content: .stickersModified(title: strongSelf.presentationData.strings.StickerPackActionInfo_AddedTitle, text: strongSelf.presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: firstItem ?? items.first, context: strongSelf.context), elevatedLayout: false, action: { action in
+                            if case .info = action {
+                                (navigationController?.viewControllers.last as? ViewController)?.present(StickerPackScreen(context: context, mode: .settings, mainStickerPack: .id(id: info.id.id, accessHash: info.accessHash), stickerPacks: [], parentNavigationController: navigationController, actionPerformed: { _, _, _ in
+                            }), in: .window(.root))
+                            }
+                            return true
+                        }), nil)
+                        strongSelf.cancel?()
+                    }
+                } else if case let .progress(progress, count, total) = status {
+                    strongSelf.progress = (CGFloat(progress), count, total)
+                    strongSelf.radialStatus.transitionToState(.progress(color: strongSelf.presentationData.theme.list.itemAccentColor, lineWidth: 6.0, value: max(0.01, CGFloat(progress)), cancelEnabled: false, animateRotation: false), animated: true, synchronous: true, completion: {})
+                    if let (layout, navigationBarHeight) = strongSelf.containerLayout {
+                        strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
+                    }
+                }
+            }
+        }, error: { [weak self] error in
+            if let strongSelf = self {
+                
+            }
+        }))
+    }
+    
+    @objc private func createActionButtonPressed() {
+        var proceedImpl: ((String, String?) -> Void)?
+        let titleController = importStickerPackTitleController(context: self.context, title: self.presentationData.strings.ImportStickerPack_ChooseName, text: self.presentationData.strings.ImportStickerPack_ChooseNameDescription, placeholder: self.presentationData.strings.ImportStickerPack_NamePlaceholder, value: nil, maxLength: 128, apply: { [weak self] title in
+            if let strongSelf = self, let title = title {
+                strongSelf.shortNameSuggestionDisposable.set((strongSelf.context.engine.stickers.getStickerSetShortNameSuggestion(title: title)
+                |> deliverOnMainQueue).start(next: { suggestedShortName in
+                    proceedImpl?(title, suggestedShortName)
+                }))
+            }
+        }, cancel: { [weak self] in
+            if let strongSelf = self {
+                strongSelf.shortNameSuggestionDisposable.set(nil)
+            }
+        })
+        proceedImpl = { [weak titleController, weak self] title, suggestedShortName in
+            guard let strongSelf = self else {
+                return
+            }
+            let controller = importStickerPackShortNameController(context: strongSelf.context, title: strongSelf.presentationData.strings.ImportStickerPack_ChooseLink, text: strongSelf.presentationData.strings.ImportStickerPack_ChooseLinkDescription, placeholder: "", value: suggestedShortName, maxLength: 60, existingAlertController: titleController, apply: { [weak self] shortName in
+                if let shortName = shortName {
+                    self?.createStickerSet(title: title, shortName: shortName)
+                }
+            })
+            strongSelf.present?(controller, nil)
+        }
+        self.present?(titleController, nil)
+    }
+    
+    @objc private func addToExistingActionButtonPressed() {
+        
+    }
+    
+    func animateIn() {
+        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+        
+        let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
+        
+        let dimPosition = self.dimNode.layer.position
+        self.dimNode.layer.animatePosition(from: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), to: dimPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+        self.layer.animateBoundsOriginYAdditive(from: -offset, to: 0.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+    }
+    
+    func animateOut(completion: (() -> Void)? = nil) {
+        var dimCompleted = false
+        var offsetCompleted = false
+        
+        let internalCompletion: () -> Void = { [weak self] in
+            if let strongSelf = self, dimCompleted && offsetCompleted {
+                strongSelf.dismiss?()
+            }
+            completion?()
+        }
+        
+        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in
+            dimCompleted = true
+            internalCompletion()
+        })
+        
+        let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
+        let dimPosition = self.dimNode.layer.position
+        self.dimNode.layer.animatePosition(from: dimPosition, to: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)
+        self.layer.animateBoundsOriginYAdditive(from: 0.0, to: -offset, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in
+            offsetCompleted = true
+            internalCompletion()
+        })
+    }
+    
+    func updateStickerPack(_ stickerPack: ImportStickerPack, verifiedStickers: Set<UUID>, declinedStickers: Set<UUID>, uploadedStickerResources: [UUID: MediaResource]) {
+        self.stickerPack = stickerPack
+        self.uploadedStickerResources = uploadedStickerResources
+        var updatedItems: [StickerPackPreviewGridEntry] = []
+        for item in stickerPack.stickers {
+            if declinedStickers.contains(item.uuid) {
+                continue
+            }
+            if let resource = self.stickerResources[item.uuid] {
+                item.resource = resource
+            } else {
+                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                self.context.account.postbox.mediaBox.storeResourceData(resource.id, data: item.data)
+                item.resource = resource
+                self.stickerResources[item.uuid] = resource
+            }
+            updatedItems.append(StickerPackPreviewGridEntry(index: updatedItems.count, stickerItem: item, isVerified: !item.isAnimated || verifiedStickers.contains(item.uuid)))
+        }
+        self.pendingItems = updatedItems
+      
+        if stickerPack.isAnimated {
+            self.stickerPackReady = stickerPack.stickers.count == (verifiedStickers.count + declinedStickers.count) && updatedItems.count > 0
+        }
+        
+        self.interaction.playAnimatedStickers = true
+                
+        if let _ = self.containerLayout {
+            self.dequeueUpdateStickerPack()
+        }
+    }
+    
+    func dequeueUpdateStickerPack() {
+        if let (layout, navigationBarHeight) = self.containerLayout, let _ = self.stickerPack {
+            let transition: ContainedViewLayoutTransition
+            if self.didSetReady {
+                transition = .animated(duration: 0.4, curve: .spring)
+            } else {
+                transition = .immediate
+            }
+            
+            self.contentTitleNode.alpha = 1.0
+            self.contentTitleNode.layer.animateAlpha(from: self.contentTitleNode.alpha, to: 1.0, duration: 0.2)
+            
+            self.contentGridNode.alpha = 1.0
+            self.contentGridNode.layer.animateAlpha(from: self.contentGridNode.alpha, to: 1.0, duration: 0.2)
+            
+            let buttonTransition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .easeInOut)
+            buttonTransition.updateAlpha(node: self.createActionButtonNode, alpha: self.stickerPackReady ? 1.0 : 0.3)
+            buttonTransition.updateAlpha(node: self.addToExistingActionButtonNode, alpha: self.stickerPackReady ? 1.0 : 0.3)
+            
+            self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition)
+            
+            if !self.didSetReady {
+                self.didSetReady = true
+                self.ready.set(.single(true))
+            }
+        }
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if let result = self.createActionButtonNode.hitTest(self.createActionButtonNode.convert(point, from: self), with: event) {
+            return result
+        }
+        if self.bounds.contains(point) {
+            if !self.contentBackgroundNode.bounds.contains(self.convert(point, to: self.contentBackgroundNode)) && !self.cancelButtonNode.bounds.contains(self.convert(point, to: self.cancelButtonNode)) {
+                return self.dimNode.view
+            }
+        }
+        return super.hitTest(point, with: event)
+    }
+    
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        let contentOffset = scrollView.contentOffset
+        let additionalTopHeight = max(0.0, -contentOffset.y)
+        
+        if additionalTopHeight >= 30.0 {
+            self.cancelButtonPressed()
+        }
+    }
+    
+    private func updatePreviewingItem(item: ImportStickerPack.Sticker?, animated: Bool) {
+        if self.interaction.previewedItem !== item {
+            self.interaction.previewedItem = item
+            
+            self.contentGridNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? StickerPackPreviewGridItemNode {
+                    itemNode.updatePreviewing(animated: animated)
+                }
+            }
+        }
+    }
+}
diff --git a/submodules/ImportStickerPackUI/Sources/ImportStickerPackTitleController.swift b/submodules/ImportStickerPackUI/Sources/ImportStickerPackTitleController.swift
new file mode 100644
index 0000000000..d07f6b3078
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/ImportStickerPackTitleController.swift
@@ -0,0 +1,870 @@
+import Foundation
+import UIKit
+import SwiftSignalKit
+import AsyncDisplayKit
+import Display
+import Postbox
+import TelegramCore
+import SyncCore
+import TelegramPresentationData
+import AccountContext
+import UrlEscaping
+import ActivityIndicator
+
+private class TextField: UITextField, UIScrollViewDelegate {
+    let placeholderLabel: ImmediateTextNode
+    var placeholderString: NSAttributedString? {
+        didSet {
+            self.placeholderLabel.attributedText = self.placeholderString
+            self.setNeedsLayout()
+        }
+    }
+    
+    fileprivate func updatePrefixWidth(_ prefixWidth: CGFloat) {
+        let previousPrefixWidth = self.prefixWidth
+        guard previousPrefixWidth != prefixWidth else {
+            return
+        }
+        self.prefixWidth = prefixWidth
+        if let scrollView = self.scrollView {
+            if scrollView.contentInset.left != prefixWidth {
+                scrollView.contentInset = UIEdgeInsets(top: 0.0, left: prefixWidth, bottom: 0.0, right: 0.0)
+            }
+            if prefixWidth.isZero {
+                scrollView.contentOffset = CGPoint()
+            } else if prefixWidth != previousPrefixWidth {
+                scrollView.contentOffset = CGPoint(x: -prefixWidth, y: 0.0)
+            }
+            self.updatePrefixPosition(transition: .immediate)
+        }
+    }
+    
+    private var prefixWidth: CGFloat = 0.0
+
+    let prefixLabel: ImmediateTextNode
+    var prefixString: NSAttributedString? {
+        didSet {
+            self.prefixLabel.attributedText = self.prefixString
+            self.setNeedsLayout()
+        }
+    }
+    
+    init() {
+        self.prefixLabel = ImmediateTextNode()
+        self.prefixLabel.isUserInteractionEnabled = false
+        self.prefixLabel.displaysAsynchronously = false
+        self.prefixLabel.maximumNumberOfLines = 1
+        self.prefixLabel.truncationMode = .byTruncatingTail
+        
+        self.placeholderLabel = ImmediateTextNode()
+        self.placeholderLabel.isUserInteractionEnabled = false
+        self.placeholderLabel.displaysAsynchronously = false
+        self.placeholderLabel.maximumNumberOfLines = 1
+        self.placeholderLabel.truncationMode = .byTruncatingTail
+                
+        super.init(frame: CGRect())
+        
+        self.addSubnode(self.prefixLabel)
+        self.addSubnode(self.placeholderLabel)
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func addSubview(_ view: UIView) {
+        super.addSubview(view)
+        
+        if let scrollView = view as? UIScrollView {
+            scrollView.delegate = self
+        }
+    }
+    
+    private weak var _scrollView: UIScrollView?
+    var scrollView: UIScrollView? {
+        if let scrollView = self._scrollView {
+            return scrollView
+        }
+        for view in self.subviews {
+            if let scrollView = view as? UIScrollView {
+                _scrollView = scrollView
+                return scrollView
+            }
+        }
+        return nil
+    }
+    
+    override func deleteBackward() {
+        super.deleteBackward()
+        
+        if let scrollView = self.scrollView {
+            if scrollView.contentSize.width <= scrollView.frame.width && scrollView.contentOffset.x > -scrollView.contentInset.left {
+                scrollView.contentOffset = CGPoint(x: max(scrollView.contentOffset.x - 5.0, -scrollView.contentInset.left), y: 0.0)
+                self.updatePrefixPosition()
+            }
+        }
+    }
+    
+    func selectWhole() {
+        guard let scrollView = self.scrollView else {
+            return
+        }
+//        if scrollView.contentSize.width > scrollView.frame.width - scrollView.contentInset.left {
+//            scrollView.contentOffset = CGPoint(x: -scrollView.contentInset.left + scrollView.contentSize.width - (scrollView.frame.width - scrollView.contentInset.left), y: 0.0)
+//            self.updatePrefixPosition()
+//        }
+        self.selectAll(nil)
+    }
+    
+    var fixAutoScroll: CGPoint?
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if let fixAutoScroll = self.fixAutoScroll {
+            self.scrollView?.setContentOffset(fixAutoScroll, animated: true)
+            self.scrollView?.setContentOffset(fixAutoScroll, animated: false)
+            self.fixAutoScroll = nil
+        } else {
+            self.updatePrefixPosition()
+        }
+    }
+    
+    override func becomeFirstResponder() -> Bool {
+        if let contentOffset = self.scrollView?.contentOffset {
+            self.fixAutoScroll = contentOffset
+            Queue.mainQueue().after(0.1) {
+                self.fixAutoScroll = nil
+            }
+        }
+        return super.becomeFirstResponder()
+    }
+    
+    private func updatePrefixPosition(transition: ContainedViewLayoutTransition = .immediate) {
+        if let scrollView = self.scrollView {
+            transition.updateFrame(node: self.prefixLabel, frame: CGRect(origin: CGPoint(x: -scrollView.contentOffset.x - scrollView.contentInset.left, y: self.prefixLabel.frame.minY), size: self.prefixLabel.frame.size))
+        }
+    }
+        
+    override var keyboardAppearance: UIKeyboardAppearance {
+        get {
+            return super.keyboardAppearance
+        }
+        set {
+            let resigning = self.isFirstResponder
+            if resigning {
+                self.resignFirstResponder()
+            }
+            super.keyboardAppearance = newValue
+            if resigning {
+                let _ = self.becomeFirstResponder()
+            }
+        }
+    }
+    
+    override func textRect(forBounds bounds: CGRect) -> CGRect {
+        if bounds.size.width.isZero {
+            return CGRect(origin: CGPoint(), size: CGSize())
+        }
+        var rect = bounds.insetBy(dx: 0.0, dy: 4.0)
+        if #available(iOS 14.0, *) {
+        } else {
+            rect.origin.y += 1.0
+        }
+        if !self.prefixWidth.isZero && self.scrollView?.superview == nil {
+            var offset = self.prefixWidth
+            if let scrollView = self.scrollView {
+                offset = scrollView.contentOffset.x * -1.0
+            }
+            rect.origin.x += offset
+            rect.size.width -= offset
+         }
+        rect.size.width = max(rect.size.width, 10.0)
+        return rect
+    }
+    
+    override func editingRect(forBounds bounds: CGRect) -> CGRect {
+        return self.textRect(forBounds: bounds)
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        let bounds = self.bounds
+        if bounds.size.width.isZero {
+            return
+        }
+                
+        let textRect = self.textRect(forBounds: bounds)
+
+        let labelSize = self.placeholderLabel.updateLayout(textRect.size)
+        self.placeholderLabel.frame = CGRect(origin: CGPoint(x: textRect.minX + 3.0, y: floorToScreenPixels((bounds.height - labelSize.height) / 2.0)), size: labelSize)
+        
+        let prefixSize = self.prefixLabel.updateLayout(CGSize(width: floor(bounds.size.width * 0.7), height: bounds.size.height))
+        let prefixBounds = bounds.insetBy(dx: 4.0, dy: 4.0)
+        self.prefixLabel.frame = CGRect(origin: CGPoint(x: prefixBounds.minX, y: floorToScreenPixels((bounds.height - prefixSize.height) / 2.0)), size: prefixSize)
+        self.updatePrefixWidth(prefixSize.width + 3.0)
+    }
+}
+
+private let validIdentifierSet: CharacterSet = {
+    var set = CharacterSet(charactersIn: "a".unicodeScalars.first! ... "z".unicodeScalars.first!)
+    set.insert(charactersIn: "A".unicodeScalars.first! ... "Z".unicodeScalars.first!)
+    set.insert(charactersIn: "0".unicodeScalars.first! ... "9".unicodeScalars.first!)
+    set.insert("_")
+    return set
+}()
+
+private final class ImportStickerPackTitleInputFieldNode: ASDisplayNode, UITextFieldDelegate {
+    private var theme: PresentationTheme
+    private let backgroundNode: ASImageNode
+    private let textInputNode: TextField
+    private let clearButton: HighlightableButtonNode
+    
+    var updateHeight: (() -> Void)?
+    var complete: (() -> Void)?
+    var textChanged: ((String) -> Void)?
+    
+    private let backgroundInsets = UIEdgeInsets(top: 8.0, left: 16.0, bottom: 15.0, right: 16.0)
+    private let inputInsets = UIEdgeInsets(top: 8.0, left: 8.0, bottom: 8.0, right: 8.0)
+    
+    var text: String {
+        get {
+            return self.textInputNode.attributedText?.string ?? ""
+        }
+        set {
+            self.textInputNode.attributedText = NSAttributedString(string: newValue, font: Font.regular(14.0), textColor: self.theme.actionSheet.inputTextColor)
+            self.textInputNode.placeholderLabel.isHidden = !newValue.isEmpty
+            if self.textInputNode.isFirstResponder {
+                self.clearButton.isHidden = newValue.isEmpty
+            } else {
+                self.clearButton.isHidden = true
+            }
+        }
+    }
+    
+    var prefix: String = "" {
+        didSet {
+            self.textInputNode.prefixString = NSAttributedString(string: self.prefix, font: Font.regular(14.0), textColor: self.theme.actionSheet.inputTextColor)
+        }
+    }
+    
+    var disabled: Bool = false {
+        didSet {
+            self.clearButton.isHidden = true
+        }
+    }
+    
+    private let maxLength: Int
+    
+    init(theme: PresentationTheme, placeholder: String, maxLength: Int, keyboardType: UIKeyboardType = .default, returnKeyType: UIReturnKeyType = .done) {
+        self.theme = theme
+        self.maxLength = maxLength
+        
+        self.backgroundNode = ASImageNode()
+        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode.displayWithoutProcessing = true
+        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: theme.actionSheet.inputHollowBackgroundColor, strokeColor: theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
+        
+        self.textInputNode = TextField()
+        self.textInputNode.font = Font.regular(14.0)
+        self.textInputNode.typingAttributes = [NSAttributedString.Key.font: Font.regular(14.0), NSAttributedString.Key.foregroundColor: theme.actionSheet.inputTextColor]
+        self.textInputNode.clipsToBounds = true
+        self.textInputNode.placeholderString = NSAttributedString(string: placeholder, font: Font.regular(14.0), textColor: theme.actionSheet.secondaryTextColor)
+        self.textInputNode.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance
+        self.textInputNode.keyboardType = keyboardType
+        self.textInputNode.autocapitalizationType = .sentences
+        self.textInputNode.returnKeyType = returnKeyType
+        self.textInputNode.autocorrectionType = .default
+        self.textInputNode.tintColor = theme.actionSheet.controlAccentColor
+                
+        self.clearButton = HighlightableButtonNode()
+        self.clearButton.imageNode.displaysAsynchronously = false
+        self.clearButton.imageNode.displayWithoutProcessing = true
+        self.clearButton.displaysAsynchronously = false
+        self.clearButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: theme.actionSheet.inputClearButtonColor), for: [])
+        self.clearButton.isHidden = true
+        
+        super.init()
+                
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.clearButton)
+        
+        self.clearButton.addTarget(self, action: #selector(self.clearPressed), forControlEvents: .touchUpInside)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.textInputNode.delegate = self
+        self.view.insertSubview(self.textInputNode, aboveSubview: self.backgroundNode.view)
+    }
+    
+    func selectAll() {
+        self.textInputNode.selectWhole()
+    }
+    
+    func updateTheme(_ theme: PresentationTheme) {
+        self.theme = theme
+        
+        self.backgroundNode.image = generateStretchableFilledCircleImage(diameter: 12.0, color: self.theme.actionSheet.inputHollowBackgroundColor, strokeColor: self.theme.actionSheet.inputBorderColor, strokeWidth: 1.0)
+        self.textInputNode.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance
+        self.textInputNode.tintColor = self.theme.actionSheet.controlAccentColor
+        self.clearButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Components/Search Bar/Clear"), color: theme.actionSheet.inputClearButtonColor), for: [])
+    }
+    
+    func updateLayout(width: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
+        let backgroundInsets = self.backgroundInsets
+        let inputInsets = self.inputInsets
+        
+        let textFieldHeight = self.calculateTextFieldMetrics(width: width)
+        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
+        
+        let backgroundFrame = CGRect(origin: CGPoint(x: backgroundInsets.left, y: backgroundInsets.top), size: CGSize(width: width - backgroundInsets.left - backgroundInsets.right, height: panelHeight - backgroundInsets.top - backgroundInsets.bottom))
+        transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+        
+        transition.updateFrame(view: self.textInputNode, frame: CGRect(origin: CGPoint(x: backgroundFrame.minX + inputInsets.left, y: backgroundFrame.minY), size: CGSize(width: backgroundFrame.size.width - inputInsets.left - inputInsets.right - 22.0, height: backgroundFrame.size.height)))
+        
+        if let image = self.clearButton.image(for: []) {
+            transition.updateFrame(node: self.clearButton, frame: CGRect(origin: CGPoint(x: backgroundFrame.maxX - 8.0 - image.size.width, y: backgroundFrame.minY + floor((backgroundFrame.size.height - image.size.height) / 2.0)), size: image.size))
+        }
+        
+        return panelHeight
+    }
+    
+    func activateInput() {
+        let _ = self.textInputNode.becomeFirstResponder()
+    }
+    
+    func deactivateInput() {
+        self.textInputNode.resignFirstResponder()
+    }
+    
+    func textFieldDidBeginEditing(_ textField: UITextField) {
+        self.clearButton.isHidden = (textField.text ?? "").isEmpty
+    }
+    
+    func textFieldDidEndEditing(_ textField: UITextField) {
+        self.clearButton.isHidden = true
+    }
+    
+    func textFieldDidUpdateText(_ text: String) {
+        self.updateTextNodeText(animated: true)
+        self.textChanged?(text)
+        self.clearButton.isHidden = text.isEmpty
+        self.textInputNode.placeholderLabel.isHidden = !text.isEmpty
+    }
+        
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if self.disabled {
+            return false
+        }
+        let updatedText = ((textField.text ?? "") as NSString).replacingCharacters(in: range, with: string)
+        if updatedText.count > maxLength {
+            self.textInputNode.layer.addShakeAnimation()
+            return false
+        }
+        if string == "\n" {
+            self.complete?()
+            return false
+        }
+        
+        if self.textInputNode.keyboardType == .asciiCapable {
+            var cleanString = string.folding(options: .diacriticInsensitive, locale: .current).replacingOccurrences(of: " ", with: "_")
+            
+            let filtered = cleanString.unicodeScalars.filter { validIdentifierSet.contains($0) }
+            let filteredString = String(String.UnicodeScalarView(filtered))
+            
+            if cleanString != filteredString {
+                cleanString = filteredString
+                
+                self.textInputNode.layer.addShakeAnimation()
+                let hapticFeedback = HapticFeedback()
+                hapticFeedback.error()
+                DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 1.0, execute: {
+                    let _ = hapticFeedback
+                })
+            }
+            
+            if cleanString != string {
+                var text = textField.text ?? ""
+                text.replaceSubrange(text.index(text.startIndex, offsetBy: range.lowerBound) ..< text.index(text.startIndex, offsetBy: range.upperBound), with: cleanString)
+                textField.text = text
+                if let startPosition = textField.position(from: textField.beginningOfDocument, offset: range.lowerBound + cleanString.count) {
+                    let selectionRange = textField.textRange(from: startPosition, to: startPosition)
+                    DispatchQueue.main.async {
+                        textField.selectedTextRange = selectionRange
+                    }
+                }
+                self.textFieldDidUpdateText(text)
+                return false
+            }
+        }
+        
+        self.textFieldDidUpdateText(updatedText)
+        return true
+    }
+    
+    private func calculateTextFieldMetrics(width: CGFloat) -> CGFloat {
+        return 33.0
+    }
+    
+    private func updateTextNodeText(animated: Bool) {
+        let backgroundInsets = self.backgroundInsets
+        
+        let textFieldHeight = self.calculateTextFieldMetrics(width: self.bounds.size.width)
+        
+        let panelHeight = textFieldHeight + backgroundInsets.top + backgroundInsets.bottom
+        if !self.bounds.size.height.isEqual(to: panelHeight) {
+            self.updateHeight?()
+        }
+    }
+    
+    @objc func clearPressed() {
+        self.clearButton.isHidden = true
+        
+        self.textInputNode.attributedText = nil
+        self.updateHeight?()
+        self.textChanged?("")
+    }
+}
+
+private final class ImportStickerPackTitleAlertContentNode: AlertContentNode {
+    enum InfoText {
+        case info
+        case checking
+        case available
+        case taken
+        case generating
+    }
+    private var theme: PresentationTheme
+    private var alertTheme: AlertControllerTheme
+    private let strings: PresentationStrings
+    private let title: String
+    private let text: String
+    
+    var infoText: InfoText? {
+        didSet {
+            let text: String
+            let color: UIColor
+            var activity = false
+            if let infoText = self.infoText {
+                switch infoText {
+                    case .info:
+                        text = self.strings.ImportStickerPack_ChooseLinkDescription
+                        color = self.alertTheme.primaryColor
+                    case .checking:
+                        text = self.strings.ImportStickerPack_CheckingLink
+                        color = self.alertTheme.secondaryColor
+                        activity = true
+                    case .available:
+                        text = self.strings.ImportStickerPack_LinkAvailable
+                        color = self.theme.list.freeTextSuccessColor
+                    case .taken:
+                        text = self.strings.ImportStickerPack_LinkTaken
+                        color = self.theme.list.freeTextErrorColor
+                    case .generating:
+                        text = self.strings.ImportStickerPack_GeneratingLink
+                        color = self.alertTheme.secondaryColor
+                        activity = true
+                }
+                self.activityIndicator.isHidden = !activity
+            } else {
+                text = self.text
+                color = self.alertTheme.primaryColor
+            }
+            self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(13.0), textColor: color)
+            if let size = self.validLayout {
+                _ = self.updateLayout(size: size, transition: .immediate)
+            }
+        }
+    }
+    
+    private let titleNode: ASTextNode
+    private let textNode: ASTextNode
+    private let activityIndicator: ActivityIndicator
+    let inputFieldNode: ImportStickerPackTitleInputFieldNode
+    
+    private let actionNodesSeparator: ASDisplayNode
+    fileprivate let actionNodes: [TextAlertContentActionNode]
+    private let actionVerticalSeparators: [ASDisplayNode]
+    
+    private let disposable = MetaDisposable()
+    
+    private var validLayout: CGSize?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    var complete: (() -> Void)? {
+        didSet {
+            self.inputFieldNode.complete = self.complete
+        }
+    }
+        
+    override var dismissOnOutsideTap: Bool {
+        return self.isUserInteractionEnabled
+    }
+    
+    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction], title: String, text: String, placeholder: String, value: String?, maxLength: Int, asciiOnly: Bool = false) {
+        self.strings = strings
+        self.alertTheme = theme
+        self.theme = ptheme
+        self.title = title
+        self.text = text
+        
+        self.titleNode = ASTextNode()
+        self.titleNode.maximumNumberOfLines = 2
+        self.textNode = ASTextNode()
+        self.textNode.maximumNumberOfLines = 8
+        
+        self.activityIndicator = ActivityIndicator(type: .custom(ptheme.rootController.navigationBar.secondaryTextColor, 20.0, 1.5, false), speed: .slow)
+        self.activityIndicator.isHidden = true
+                
+        self.inputFieldNode = ImportStickerPackTitleInputFieldNode(theme: ptheme, placeholder: placeholder, maxLength: maxLength, keyboardType: asciiOnly ? .asciiCapable : .default, returnKeyType: asciiOnly ? .done : .next)
+        if asciiOnly {
+            self.inputFieldNode.prefix = "t.me/addstickers/"
+        }
+        self.inputFieldNode.text = value ?? ""
+        
+        self.actionNodesSeparator = ASDisplayNode()
+        self.actionNodesSeparator.isLayerBacked = true
+        
+        self.actionNodes = actions.map { action -> TextAlertContentActionNode in
+            return TextAlertContentActionNode(theme: theme, action: action)
+        }
+        
+        var actionVerticalSeparators: [ASDisplayNode] = []
+        if actions.count > 1 {
+            for _ in 0 ..< actions.count - 1 {
+                let separatorNode = ASDisplayNode()
+                separatorNode.isLayerBacked = true
+                actionVerticalSeparators.append(separatorNode)
+            }
+        }
+        self.actionVerticalSeparators = actionVerticalSeparators
+        
+        super.init()
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.textNode)
+        self.addSubnode(self.activityIndicator)
+        
+        self.addSubnode(self.inputFieldNode)
+
+        self.addSubnode(self.actionNodesSeparator)
+        
+        for actionNode in self.actionNodes {
+            self.addSubnode(actionNode)
+        }
+        
+        for separatorNode in self.actionVerticalSeparators {
+            self.addSubnode(separatorNode)
+        }
+        
+        self.inputFieldNode.updateHeight = { [weak self] in
+            if let strongSelf = self {
+                if let _ = strongSelf.validLayout {
+                    strongSelf.requestLayout?(.animated(duration: 0.15, curve: .spring))
+                }
+            }
+        }
+        
+        self.updateTheme(theme)
+    }
+    
+    deinit {
+        self.disposable.dispose()
+    }
+    
+    var value: String {
+        return self.inputFieldNode.text
+    }
+
+    override func updateTheme(_ theme: AlertControllerTheme) {
+        self.alertTheme = theme
+        
+        self.titleNode.attributedText = NSAttributedString(string: self.title, font: Font.bold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center)
+        self.textNode.attributedText = NSAttributedString(string: self.text, font: Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center)
+
+        self.actionNodesSeparator.backgroundColor = theme.separatorColor
+        for actionNode in self.actionNodes {
+            actionNode.updateTheme(theme)
+        }
+        for separatorNode in self.actionVerticalSeparators {
+            separatorNode.backgroundColor = theme.separatorColor
+        }
+        
+        if let size = self.validLayout {
+            _ = self.updateLayout(size: size, transition: .immediate)
+        }
+    }
+    
+    override func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+        var size = size
+        size.width = min(size.width, 270.0)
+        let measureSize = CGSize(width: size.width - 16.0 * 2.0, height: CGFloat.greatestFiniteMagnitude)
+        
+        let hadValidLayout = self.validLayout != nil
+        
+        self.validLayout = size
+        
+        var origin: CGPoint = CGPoint(x: 0.0, y: 20.0)
+        let spacing: CGFloat = 5.0
+        
+        let titleSize = self.titleNode.measure(measureSize)
+        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - titleSize.width) / 2.0), y: origin.y), size: titleSize))
+        origin.y += titleSize.height + 4.0
+        
+        let activitySize = CGSize(width: 20.0, height: 20.0)
+        let textSize = self.textNode.measure(measureSize)
+        let activityInset: CGFloat = self.activityIndicator.isHidden ? 0.0 : activitySize.width + 5.0
+        let totalWidth = textSize.width + activityInset
+        transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - totalWidth) / 2.0), y: origin.y - 1.0), size: activitySize))
+        transition.updateFrame(node: self.textNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - totalWidth) / 2.0) + activityInset, y: origin.y), size: textSize))
+        
+        origin.y += textSize.height + 6.0 + spacing
+        
+        let actionButtonHeight: CGFloat = 44.0
+        var minActionsWidth: CGFloat = 0.0
+        let maxActionWidth: CGFloat = floor(size.width / CGFloat(self.actionNodes.count))
+        let actionTitleInsets: CGFloat = 8.0
+        
+        var effectiveActionLayout = TextAlertContentActionLayout.horizontal
+        for actionNode in self.actionNodes {
+            let actionTitleSize = actionNode.titleNode.updateLayout(CGSize(width: maxActionWidth, height: actionButtonHeight))
+            if case .horizontal = effectiveActionLayout, actionTitleSize.height > actionButtonHeight * 0.6667 {
+                effectiveActionLayout = .vertical
+            }
+            switch effectiveActionLayout {
+                case .horizontal:
+                    minActionsWidth += actionTitleSize.width + actionTitleInsets
+                case .vertical:
+                    minActionsWidth = max(minActionsWidth, actionTitleSize.width + actionTitleInsets)
+            }
+        }
+        
+        let insets = UIEdgeInsets(top: 18.0, left: 18.0, bottom: 9.0, right: 18.0)
+        
+        var contentWidth = max(titleSize.width, minActionsWidth)
+        contentWidth = max(contentWidth, 234.0)
+        
+        var actionsHeight: CGFloat = 0.0
+        switch effectiveActionLayout {
+            case .horizontal:
+                actionsHeight = actionButtonHeight
+            case .vertical:
+                actionsHeight = actionButtonHeight * CGFloat(self.actionNodes.count)
+        }
+        
+        let resultWidth = contentWidth + insets.left + insets.right
+        
+        let inputFieldWidth = resultWidth
+        let inputFieldHeight = self.inputFieldNode.updateLayout(width: inputFieldWidth, transition: transition)
+        let inputHeight = inputFieldHeight
+        transition.updateFrame(node: self.inputFieldNode, frame: CGRect(x: 0.0, y: origin.y, width: resultWidth, height: inputFieldHeight))
+        transition.updateAlpha(node: self.inputFieldNode, alpha: inputHeight > 0.0 ? 1.0 : 0.0)
+        
+        let resultSize = CGSize(width: resultWidth, height: titleSize.height + textSize.height + spacing + inputHeight + actionsHeight  + insets.top + insets.bottom)
+        
+        transition.updateFrame(node: self.actionNodesSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+        
+        var actionOffset: CGFloat = 0.0
+        let actionWidth: CGFloat = floor(resultSize.width / CGFloat(self.actionNodes.count))
+        var separatorIndex = -1
+        var nodeIndex = 0
+        for actionNode in self.actionNodes {
+            if separatorIndex >= 0 {
+                let separatorNode = self.actionVerticalSeparators[separatorIndex]
+                switch effectiveActionLayout {
+                    case .horizontal:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: actionOffset - UIScreenPixel, y: resultSize.height - actionsHeight), size: CGSize(width: UIScreenPixel, height: actionsHeight - UIScreenPixel)))
+                    case .vertical:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+                }
+            }
+            separatorIndex += 1
+            
+            let currentActionWidth: CGFloat
+            switch effectiveActionLayout {
+                case .horizontal:
+                    if nodeIndex == self.actionNodes.count - 1 {
+                        currentActionWidth = resultSize.width - actionOffset
+                    } else {
+                        currentActionWidth = actionWidth
+                    }
+                case .vertical:
+                    currentActionWidth = resultSize.width
+            }
+            
+            let actionNodeFrame: CGRect
+            switch effectiveActionLayout {
+                case .horizontal:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: actionOffset, y: resultSize.height - actionsHeight), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += currentActionWidth
+                case .vertical:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += actionButtonHeight
+            }
+            
+            transition.updateFrame(node: actionNode, frame: actionNodeFrame)
+            
+            nodeIndex += 1
+        }
+        
+        if !hadValidLayout {
+            self.inputFieldNode.activateInput()
+        }
+        
+        return resultSize
+    }
+    
+    func animateError() {
+        self.inputFieldNode.layer.addShakeAnimation()
+        self.hapticFeedback.error()
+    }
+}
+
+func importStickerPackTitleController(context: AccountContext, title: String, text: String, placeholder: String, value: String?, maxLength: Int, apply: @escaping (String?) -> Void, cancel: @escaping () -> Void) -> AlertController {
+    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+    var dismissImpl: ((Bool) -> Void)?
+    var applyImpl: (() -> Void)?
+    
+    let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
+        dismissImpl?(true)
+        cancel()
+    }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Next, action: {
+        applyImpl?()
+    })]
+    
+    let contentNode = ImportStickerPackTitleAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, text: text, placeholder: placeholder, value: value, maxLength: maxLength)
+    contentNode.complete = {
+        applyImpl?()
+    }
+    applyImpl = { [weak contentNode] in
+        guard let contentNode = contentNode else {
+            return
+        }
+        let newValue = contentNode.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !newValue.isEmpty else {
+            return
+        }
+        
+        contentNode.infoText = .generating
+        contentNode.inputFieldNode.disabled = true
+        contentNode.actionNodes.last?.actionEnabled = false
+        
+        apply(newValue)
+    }
+    
+    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode)
+    let presentationDataDisposable = context.sharedContext.presentationData.start(next: { [weak controller, weak contentNode] presentationData in
+        controller?.theme = AlertControllerTheme(presentationData: presentationData)
+        contentNode?.inputFieldNode.updateTheme(presentationData.theme)
+    })
+    contentNode.actionNodes.last?.actionEnabled = false
+    contentNode.inputFieldNode.textChanged = { [weak contentNode] title in
+        contentNode?.actionNodes.last?.actionEnabled = !title.trimmingTrailingSpaces().isEmpty
+    }
+    controller.willDismiss = { [weak contentNode] in
+        contentNode?.inputFieldNode.deactivateInput()
+    }
+    controller.dismissed = {
+        presentationDataDisposable.dispose()
+    }
+    dismissImpl = { [weak controller, weak contentNode] animated in
+        contentNode?.inputFieldNode.deactivateInput()
+        if animated {
+            controller?.dismissAnimated()
+        } else {
+            controller?.dismiss()
+        }
+    }
+    return controller
+}
+
+
+func importStickerPackShortNameController(context: AccountContext, title: String, text: String, placeholder: String, value: String?, maxLength: Int, existingAlertController: AlertController?, apply: @escaping (String?) -> Void) -> AlertController {
+    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+    var dismissImpl: ((Bool) -> Void)?
+    var applyImpl: (() -> Void)?
+    
+    let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
+        dismissImpl?(true)
+    }), TextAlertAction(type: .defaultAction, title: presentationData.strings.ImportStickerPack_Create, action: {
+        applyImpl?()
+    })]
+    
+    let contentNode = ImportStickerPackTitleAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, text: text, placeholder: placeholder, value: value, maxLength: maxLength, asciiOnly: true)
+    contentNode.complete = {
+        applyImpl?()
+    }
+    applyImpl = { [weak contentNode] in
+        guard let contentNode = contentNode else {
+            return
+        }
+        let newValue = contentNode.value.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !newValue.isEmpty else {
+            return
+        }
+        
+        dismissImpl?(true)
+        apply(newValue)
+    }
+    
+    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode, existingAlertController: existingAlertController)
+    let presentationDataDisposable = context.sharedContext.presentationData.start(next: { [weak controller, weak contentNode] presentationData in
+        controller?.theme = AlertControllerTheme(presentationData: presentationData)
+        contentNode?.inputFieldNode.updateTheme(presentationData.theme)
+    })
+    let checkDisposable = MetaDisposable()
+    var value = value ?? ""
+    contentNode.actionNodes.last?.actionEnabled = !value.isEmpty
+    if !value.isEmpty {
+        Queue.mainQueue().after(0.25) {
+            contentNode.inputFieldNode.selectAll()
+        }
+    }
+    contentNode.inputFieldNode.textChanged = { [weak contentNode] value in
+        if value.isEmpty {
+            checkDisposable.set(nil)
+            contentNode?.infoText = .info
+            contentNode?.actionNodes.last?.actionEnabled = false
+        } else {
+            checkDisposable.set((context.engine.stickers.validateStickerSetShortNameInteractive(shortName: value)
+            |> deliverOnMainQueue).start(next: { [weak contentNode] result in
+                switch result {
+                    case .checking:
+                        contentNode?.infoText = .checking
+                        contentNode?.actionNodes.last?.actionEnabled = false
+                    case let .availability(availability):
+                        switch availability {
+                            case .available:
+                                contentNode?.infoText = .available
+                                contentNode?.actionNodes.last?.actionEnabled = true
+                            case .taken:
+                                contentNode?.infoText = .taken
+                                contentNode?.actionNodes.last?.actionEnabled = false
+                            case .invalid:
+                                contentNode?.infoText = .info
+                                contentNode?.actionNodes.last?.actionEnabled = false
+                        }
+                    case .invalidFormat:
+                        contentNode?.infoText = .info
+                        contentNode?.actionNodes.last?.actionEnabled = false
+                }
+            }))
+        }
+    }
+    controller.willDismiss = { [weak contentNode] in
+        contentNode?.inputFieldNode.deactivateInput()
+    }
+    controller.dismissed = {
+        presentationDataDisposable.dispose()
+    }
+    dismissImpl = { [weak controller, weak contentNode] animated in
+        contentNode?.inputFieldNode.deactivateInput()
+        if animated {
+            controller?.dismissAnimated()
+        } else {
+            controller?.dismiss()
+        }
+    }
+    return controller
+}
diff --git a/submodules/ImportStickerPackUI/Sources/StickerPackPreviewGridItem.swift b/submodules/ImportStickerPackUI/Sources/StickerPackPreviewGridItem.swift
new file mode 100644
index 0000000000..cf334e4a36
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/StickerPackPreviewGridItem.swift
@@ -0,0 +1,223 @@
+import Foundation
+import UIKit
+import Display
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import AsyncDisplayKit
+import Postbox
+import StickerResources
+import AccountContext
+import AnimatedStickerNode
+import TelegramAnimatedStickerNode
+import TelegramPresentationData
+import ShimmerEffect
+
+final class StickerPackPreviewInteraction {
+    var previewedItem: ImportStickerPack.Sticker?
+    var playAnimatedStickers: Bool
+    
+    init(playAnimatedStickers: Bool) {
+        self.playAnimatedStickers = playAnimatedStickers
+    }
+}
+
+final class StickerPackPreviewGridItem: GridItem {
+    let account: Account
+    let stickerItem: ImportStickerPack.Sticker
+    let interaction: StickerPackPreviewInteraction
+    let theme: PresentationTheme
+    let isVerified: Bool
+    
+    let section: GridSection? = nil
+    
+    init(account: Account, stickerItem: ImportStickerPack.Sticker, interaction: StickerPackPreviewInteraction, theme: PresentationTheme, isVerified: Bool) {
+        self.account = account
+        self.stickerItem = stickerItem
+        self.interaction = interaction
+        self.theme = theme
+        self.isVerified = isVerified
+    }
+    
+    func node(layout: GridNodeLayout, synchronousLoad: Bool) -> GridItemNode {
+        let node = StickerPackPreviewGridItemNode()
+        node.setup(account: self.account, stickerItem: self.stickerItem, interaction: self.interaction, theme: self.theme, isVerified: self.isVerified)
+        return node
+    }
+    
+    func update(node: GridItemNode) {
+        guard let node = node as? StickerPackPreviewGridItemNode else {
+            assertionFailure()
+            return
+        }
+        node.setup(account: self.account, stickerItem: self.stickerItem, interaction: self.interaction, theme: self.theme, isVerified: self.isVerified)
+    }
+}
+
+private let textFont = Font.regular(20.0)
+
+final class StickerPackPreviewGridItemNode: GridItemNode {
+    private var currentState: (Account, ImportStickerPack.Sticker?, CGSize)?
+    private var isVerified: Bool?
+    private let imageNode: ASImageNode
+    private var animationNode: AnimatedStickerNode?
+    private var placeholderNode: ShimmerEffectNode?
+    
+    private var theme: PresentationTheme?
+    
+    override var isVisibleInGrid: Bool {
+        didSet {
+            self.animationNode?.visibility = self.isVisibleInGrid && self.interaction?.playAnimatedStickers ?? true
+        }
+    }
+    
+    private var currentIsPreviewing = false
+    
+    private let stickerFetchedDisposable = MetaDisposable()
+    
+    var interaction: StickerPackPreviewInteraction?
+    
+    var selected: (() -> Void)?
+    
+    var stickerPackItem: ImportStickerPack.Sticker? {
+        return self.currentState?.1
+    }
+    
+    override init() {
+        self.imageNode = ASImageNode()
+        
+        super.init()
+        
+        self.addSubnode(self.imageNode)
+    }
+    
+    deinit {
+        self.stickerFetchedDisposable.dispose()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.imageNodeTap(_:))))
+    }
+    
+    func setup(account: Account, stickerItem: ImportStickerPack.Sticker?, interaction: StickerPackPreviewInteraction, theme: PresentationTheme, isVerified: Bool) {
+        self.interaction = interaction
+        self.theme = theme
+        
+        if self.currentState == nil || self.currentState!.0 !== account || self.currentState!.1 !== stickerItem || self.isVerified != isVerified {
+            var dimensions = CGSize(width: 512.0, height: 512.0)
+            if let stickerItem = stickerItem {
+                switch stickerItem.content {
+                    case let .image(data):
+                        if let animationNode = self.animationNode {
+                            animationNode.visibility = false
+                            self.animationNode = nil
+                            animationNode.removeFromSupernode()
+                        }
+                        self.imageNode.isHidden = false
+                        if let image = UIImage(data: data) {
+                            self.imageNode.image = image
+                            dimensions = image.size
+                        }
+                    case .animation:
+                        self.imageNode.isHidden = true
+                        
+                        if isVerified {
+                            let animationNode = AnimatedStickerNode()
+                            self.animationNode = animationNode
+                            
+                            if let placeholderNode = self.placeholderNode {
+                                self.placeholderNode = nil
+                                placeholderNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak placeholderNode] _ in
+                                    placeholderNode?.removeFromSupernode()
+                                })
+                                self.insertSubnode(animationNode, belowSubnode: placeholderNode)
+                            } else {
+                                self.addSubnode(animationNode)
+                            }
+                            
+                            let fittedDimensions = dimensions.aspectFitted(CGSize(width: 160.0, height: 160.0))
+                            if let resource = stickerItem.resource {
+                                animationNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: Int(fittedDimensions.width), height: Int(fittedDimensions.height), mode: .direct(cachePathPrefix: nil))
+                            }
+                            animationNode.visibility = self.isVisibleInGrid && self.interaction?.playAnimatedStickers ?? true
+                        } else {
+                            let placeholderNode = ShimmerEffectNode()
+                            self.placeholderNode = placeholderNode
+
+                            self.addSubnode(placeholderNode)
+                            if let (absoluteRect, containerSize) = self.absoluteLocation {
+                                placeholderNode.updateAbsoluteRect(absoluteRect, within: containerSize)
+                            }
+                        }
+                }
+            } else {
+                dimensions = CGSize()
+            }
+            self.currentState = (account, stickerItem, dimensions)
+            self.setNeedsLayout()
+        }
+        self.isVerified = isVerified
+    }
+    
+    override func layout() {
+        super.layout()
+        
+        let bounds = self.bounds
+        let boundsSide = min(bounds.size.width - 14.0, bounds.size.height - 14.0)
+        let boundingSize = CGSize(width: boundsSide, height: boundsSide)
+        
+        if let (_, _, dimensions) = self.currentState {
+            let imageSize = dimensions.aspectFitted(boundingSize)
+            self.imageNode.frame = CGRect(origin: CGPoint(x: floor((bounds.size.width - imageSize.width) / 2.0), y: (bounds.size.height - imageSize.height) / 2.0), size: imageSize)
+            if let animationNode = self.animationNode {
+                animationNode.frame = CGRect(origin: CGPoint(x: floor((bounds.size.width - imageSize.width) / 2.0), y: (bounds.size.height - imageSize.height) / 2.0), size: imageSize)
+                animationNode.updateLayout(size: imageSize)
+            }
+            
+            if let placeholderNode = self.placeholderNode, let theme = self.theme {
+                placeholderNode.update(backgroundColor: theme.list.itemBlocksBackgroundColor, foregroundColor: theme.list.mediaPlaceholderColor, shimmeringColor: theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: [.roundedRect(rect: CGRect(origin: CGPoint(), size: imageSize), cornerRadius: 11.0)], horizontal: true, size: imageSize)
+                placeholderNode.frame = self.imageNode.frame
+            }
+        }
+    }
+    
+    func transitionNode() -> ASDisplayNode? {
+        return self
+    }
+    
+    @objc func imageNodeTap(_ recognizer: UITapGestureRecognizer) {
+    }
+    
+    func updatePreviewing(animated: Bool) {
+        var isPreviewing = false
+        if let (_, maybeItem, _) = self.currentState, let interaction = self.interaction, let item = maybeItem {
+            isPreviewing = interaction.previewedItem === item
+        }
+        if self.currentIsPreviewing != isPreviewing {
+            self.currentIsPreviewing = isPreviewing
+            
+            if isPreviewing {
+                self.layer.sublayerTransform = CATransform3DMakeScale(0.8, 0.8, 1.0)
+                if animated {
+                    self.layer.animateSpring(from: 1.0 as NSNumber, to: 0.8 as NSNumber, keyPath: "sublayerTransform.scale", duration: 0.4)
+                }
+            } else {
+                self.layer.sublayerTransform = CATransform3DIdentity
+                if animated {
+                    self.layer.animateSpring(from: 0.8 as NSNumber, to: 1.0 as NSNumber, keyPath: "sublayerTransform.scale", duration: 0.5)
+                }
+            }
+        }
+    }
+    
+    var absoluteLocation: (CGRect, CGSize)?
+    override func updateAbsoluteRect(_ absoluteRect: CGRect, within containerSize: CGSize) {
+        self.absoluteLocation = (absoluteRect, containerSize)
+        if let placeholderNode = self.placeholderNode {
+            placeholderNode.updateAbsoluteRect(absoluteRect, within: containerSize)
+        }
+    }
+}
+
diff --git a/submodules/ImportStickerPackUI/Sources/StickerPreviewPeekContent.swift b/submodules/ImportStickerPackUI/Sources/StickerPreviewPeekContent.swift
new file mode 100644
index 0000000000..b0add8eb54
--- /dev/null
+++ b/submodules/ImportStickerPackUI/Sources/StickerPreviewPeekContent.swift
@@ -0,0 +1,118 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import Postbox
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import StickerResources
+import AnimatedStickerNode
+import TelegramAnimatedStickerNode
+import ContextUI
+
+public final class StickerPreviewPeekContent: PeekControllerContent {
+    let account: Account
+    public let item: ImportStickerPack.Sticker
+    let menu: [ContextMenuItem]
+    
+    public init(account: Account, item: ImportStickerPack.Sticker, menu: [ContextMenuItem]) {
+        self.account = account
+        self.item = item
+        self.menu = menu
+    }
+    
+    public func presentation() -> PeekControllerContentPresentation {
+        return .freeform
+    }
+    
+    public func menuActivation() -> PeerControllerMenuActivation {
+        return .press
+    }
+    
+    public func menuItems() -> [ContextMenuItem] {
+        return self.menu
+    }
+    
+    public func node() -> PeekControllerContentNode & ASDisplayNode {
+        return StickerPreviewPeekContentNode(account: self.account, item: self.item)
+    }
+    
+    public func topAccessoryNode() -> ASDisplayNode? {
+        return nil
+    }
+    
+    public func isEqual(to: PeekControllerContent) -> Bool {
+        if let to = to as? StickerPreviewPeekContent {
+            return self.item === to.item
+        } else {
+            return false
+        }
+    }
+}
+
+private final class StickerPreviewPeekContentNode: ASDisplayNode, PeekControllerContentNode {
+    private let account: Account
+    private let item: ImportStickerPack.Sticker
+    
+    private var textNode: ASTextNode
+    private var imageNode: ASImageNode
+    private var animationNode: AnimatedStickerNode?
+    
+    private var containerLayout: (ContainerViewLayout, CGFloat)?
+    
+    init(account: Account, item: ImportStickerPack.Sticker) {
+        self.account = account
+        self.item = item
+        
+        self.textNode = ASTextNode()
+        self.imageNode = ASImageNode()
+        self.imageNode.displaysAsynchronously = false
+        switch item.content {
+            case let .image(data):
+                self.imageNode.image = UIImage(data: data)
+            case .animation:
+                let animationNode = AnimatedStickerNode()
+                self.animationNode = animationNode
+                let dimensions = PixelDimensions(width: 512, height: 512)
+                let fittedDimensions = dimensions.cgSize.aspectFitted(CGSize(width: 400.0, height: 400.0))
+                if let resource = item.resource {
+                    self.animationNode?.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: Int(fittedDimensions.width), height: Int(fittedDimensions.height), mode: .direct(cachePathPrefix: nil))
+                }
+                self.animationNode?.visibility = true
+        }
+        if case let .image(data) = item.content, let image = UIImage(data: data) {
+            self.imageNode.image = image
+        }
+        self.textNode.attributedText = NSAttributedString(string: item.emojis.joined(separator: " "), font: Font.regular(32.0), textColor: .black)
+                
+        super.init()
+        
+        self.isUserInteractionEnabled = false
+        
+        if let animationNode = self.animationNode {
+            self.addSubnode(animationNode)
+        } else {
+            self.addSubnode(self.imageNode)
+        }
+        
+        self.addSubnode(self.textNode)
+    }
+    
+    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+        let boundingSize = CGSize(width: 180.0, height: 180.0).fitted(size)
+        let imageFrame = CGRect(origin: CGPoint(), size: boundingSize)
+            
+        let textSpacing: CGFloat = 10.0
+        let textSize = self.textNode.measure(CGSize(width: 100.0, height: 100.0))
+        self.textNode.frame = CGRect(origin: CGPoint(x: floor((imageFrame.size.width - textSize.width) / 2.0), y: -textSize.height - textSpacing), size: textSize)
+        
+        self.imageNode.frame = imageFrame
+        
+        if let animationNode = self.animationNode {
+            animationNode.frame = imageFrame
+            animationNode.updateLayout(size: imageFrame.size)
+        }
+        return boundingSize
+    }
+}
diff --git a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift
index 7ff05d9c24..9dc2305790 100644
--- a/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageAnchorItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageAnchorItem: InstantPageItem {
     let wantsNode: Bool = false
@@ -28,7 +29,7 @@ final class InstantPageAnchorItem: InstantPageItem {
     func drawInTile(context: CGContext) {
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return nil
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift
index efc678f687..c188042ead 100644
--- a/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageArticleItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageArticleItem: InstantPageItem {
     var frame: CGRect
@@ -35,7 +36,7 @@ final class InstantPageArticleItem: InstantPageItem {
         self.hasRTL = hasRTL
     }
 
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPageArticleNode(context: context, item: self, webPage: self.webPage, strings: strings, theme: theme, contentItems: self.contentItems, contentSize: self.contentSize, cover: self.cover, url: self.url, webpageId: self.webpageId, openUrl: openUrl)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift
index 8516284d54..024b3148f7 100644
--- a/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageAudioItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageAudioItem: InstantPageItem {
     var frame: CGRect
@@ -24,7 +25,7 @@ final class InstantPageAudioItem: InstantPageItem {
         self.medias = [media]
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPageAudioNode(context: context, strings: strings, theme: theme, webPage: self.webpage, media: self.media, openMedia: openMedia)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift
index be14889554..897fba5a63 100644
--- a/submodules/InstantPageUI/Sources/InstantPageContentNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageContentNode.swift
@@ -193,7 +193,10 @@ final class InstantPageContentNode : ASDisplayNode {
                         self?.openMedia(media)
                         }, longPressMedia: { [weak self] media in
                             self?.longPressMedia(media)
-                        }, openPeer: { [weak self] peerId in
+                        },
+                        activatePinchPreview: nil,
+                        pinchPreviewFinished: nil,
+                        openPeer: { [weak self] peerId in
                             self?.openPeer(peerId)
                         }, openUrl: { [weak self] url in
                             self?.openUrl(url)
diff --git a/submodules/InstantPageUI/Sources/InstantPageController.swift b/submodules/InstantPageUI/Sources/InstantPageController.swift
index 5bbb5f9c17..a4502426d2 100644
--- a/submodules/InstantPageUI/Sources/InstantPageController.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageController.swift
@@ -146,7 +146,7 @@ public final class InstantPageController: ViewController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = InstantPageControllerNode(context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, autoNightModeTriggered: self.presentationData.autoNightModeTriggered, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in
+        self.displayNode = InstantPageControllerNode(controller: self, context: self.context, settings: self.settings, themeSettings: self.themeSettings, presentationTheme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, autoNightModeTriggered: self.presentationData.autoNightModeTriggered, statusBar: self.statusBar, sourcePeerType: self.sourcePeerType, getNavigationController: { [weak self] in
             return self?.navigationController as? NavigationController
         }, present: { [weak self] c, a in
             self?.present(c, in: .window(.root), with: a, blockInteraction: true)
@@ -182,6 +182,6 @@ public final class InstantPageController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift
index 8dbd7a8a65..19e09fbc4f 100644
--- a/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageControllerNode.swift
@@ -16,8 +16,10 @@ import GalleryUI
 import OpenInExternalAppUI
 import LocationUI
 import UndoUI
+import ContextUI
 
 final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
+    private weak var controller: InstantPageController?
     private let context: AccountContext
     private var settings: InstantPagePresentationSettings?
     private var themeSettings: PresentationThemeSettings?
@@ -89,7 +91,8 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
         return InstantPageStoredState(contentOffset: Double(self.scrollNode.view.contentOffset.y), details: details)
     }
     
-    init(context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings,  dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, autoNightModeTriggered: Bool, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) {
+    init(controller: InstantPageController, context: AccountContext, settings: InstantPagePresentationSettings?, themeSettings: PresentationThemeSettings?, presentationTheme: PresentationTheme, strings: PresentationStrings,  dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, autoNightModeTriggered: Bool, statusBar: StatusBar, sourcePeerType: MediaAutoDownloadPeerType, getNavigationController: @escaping () -> NavigationController?, present: @escaping (ViewController, Any?) -> Void, pushController: @escaping (ViewController) -> Void, openPeer: @escaping (PeerId) -> Void, navigateBack: @escaping () -> Void) {
+        self.controller = controller
         self.context = context
         self.presentationTheme = presentationTheme
         self.dateTimeFormat = dateTimeFormat
@@ -556,6 +559,31 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
                         self?.openMedia(media)
                     }, longPressMedia: { [weak self] media in
                         self?.longPressMedia(media)
+                    }, activatePinchPreview: { [weak self] sourceNode in
+                        guard let strongSelf = self, let controller = strongSelf.controller else {
+                            return
+                        }
+                        let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                            guard let strongSelf = self else {
+                                return CGRect()
+                            }
+
+                            let localRect = CGRect(origin: CGPoint(x: 0.0, y: strongSelf.navigationBar.frame.maxY), size: CGSize(width: strongSelf.bounds.width, height: strongSelf.bounds.height - strongSelf.navigationBar.frame.maxY))
+                            return strongSelf.view.convert(localRect, to: nil)
+                        })
+                        controller.window?.presentInGlobalOverlay(pinchController)
+                    }, pinchPreviewFinished: { [weak self] itemNode in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        for (_, listItemNode) in strongSelf.visibleItemsWithNodes {
+                            if let listItemNode = listItemNode as? InstantPagePeerReferenceNode {
+                                if listItemNode.frame.intersects(itemNode.frame) && listItemNode.frame.maxY <= itemNode.frame.maxY + 2.0 {
+                                    listItemNode.layer.animateAlpha(from: 0.0, to: listItemNode.alpha, duration: 0.25)
+                                    break
+                                }
+                            }
+                        }
                     }, openPeer: { [weak self] peerId in
                         self?.openPeer(peerId)
                     }, openUrl: { [weak self] url in
@@ -1147,7 +1175,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.loadProgress.set(0.02)
     
         self.loadWebpageDisposable.set(nil)
-        self.resolveUrlDisposable.set((self.context.sharedContext.resolveUrl(account: self.context.account, url: url.url, skipUrlAuth: true)
+        self.resolveUrlDisposable.set((self.context.sharedContext.resolveUrl(context: self.context, peerId: nil, url: url.url, skipUrlAuth: true)
         |> deliverOnMainQueue).start(next: { [weak self] result in
             if let strongSelf = self {
                 strongSelf.loadProgress.set(0.07)
@@ -1250,7 +1278,7 @@ final class InstantPageControllerNode: ASDisplayNode, UIScrollViewDelegate {
             }, openUrl: { _ in }, openPeer: { _ in
             }, showAll: false)
             
-            let peer = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: "", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+            let peer = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: "", lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
             let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: peer.id, namespace: 0, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peer, text: "", attributes: [], media: [map], peers: SimpleDictionary(), associatedMessages: SimpleDictionary(), associatedMessageIds: [])
             
             let controller = LocationViewController(context: self.context, subject: message, params: controllerParams)
diff --git a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift
index 4dfef89b24..681f993b8e 100644
--- a/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageDetailsItem.swift
@@ -8,6 +8,7 @@ import Display
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageDetailsItem: InstantPageItem {
     var frame: CGRect
@@ -40,7 +41,7 @@ final class InstantPageDetailsItem: InstantPageItem {
         self.index = index
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         var expanded: Bool?
         if let expandedDetails = currentExpandedDetails, let currentlyExpanded = expandedDetails[self.index] {
             expanded = currentlyExpanded
diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift
index 4bcf2e92e9..6d7092f015 100644
--- a/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageFeedbackItem: InstantPageItem {
     var frame: CGRect
@@ -21,7 +22,7 @@ final class InstantPageFeedbackItem: InstantPageItem {
         self.webPage = webPage
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPageFeedbackNode(context: context, strings: strings, theme: theme, webPage: self.webPage, openUrl: openUrl)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift b/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift
index da2ce07137..02f155b17c 100644
--- a/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageFeedbackNode.swift
@@ -73,7 +73,7 @@ final class InstantPageFeedbackNode: ASDisplayNode, InstantPageNode {
     }
     
     @objc func buttonPressed() {
-        self.resolveDisposable.set((resolvePeerByName(account: self.context.account, name: "previews") |> deliverOnMainQueue).start(next: { [weak self] peerId in
+        self.resolveDisposable.set((self.context.engine.peers.resolvePeerByName(name: "previews") |> deliverOnMainQueue).start(next: { [weak self] peerId in
             if let strongSelf = self, let _ = peerId, let webPageId = strongSelf.webPage.id?.id {
                 strongSelf.openUrl(InstantPageUrlItem(url: "https://t.me/previews?start=webpage\(webPageId)", webpageId: nil))
             }
diff --git a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift
index 8c4754b2f1..fa8909089b 100644
--- a/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageGalleryController.swift
@@ -118,7 +118,7 @@ public struct InstantPageGalleryEntry: Equatable {
                 var representations: [TelegramMediaImageRepresentation] = []
                 representations.append(contentsOf: file.previewRepresentations)
                 if let dimensions = file.dimensions {
-                    representations.append(TelegramMediaImageRepresentation(dimensions: dimensions, resource: file.resource, progressiveSizes: []))
+                    representations.append(TelegramMediaImageRepresentation(dimensions: dimensions, resource: file.resource, progressiveSizes: [], immediateThumbnailData: nil))
                 }
                 let image = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: file.immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
                 return InstantImageGalleryItem(context: context, presentationData: presentationData, itemId: self.index, imageReference: .webPage(webPage: WebpageReference(webPage), media: image), caption: caption, credit: credit, location: self.location, openUrl: openUrl, openUrlOptions: openUrlOptions)
@@ -282,9 +282,14 @@ public class InstantPageGalleryController: ViewController, StandalonePresentable
         
         openLinkOptionsImpl = { [weak self] url in
             if let strongSelf = self {
+                var presentationData = strongSelf.presentationData
+                if !presentationData.theme.overallDarkAppearance {
+                    presentationData = presentationData.withUpdated(theme: defaultDarkColorPresentationTheme)
+                }
+                
                 let canOpenIn = availableOpenInOptions(context: context, item: .url(url: url.url)).count > 1
                 let openText = canOpenIn ? strongSelf.presentationData.strings.Conversation_FileOpenIn : strongSelf.presentationData.strings.Conversation_LinkDialogOpen
-                let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData.withUpdated(theme: defaultDarkColorPresentationTheme))
+                let actionSheet = ActionSheetController(presentationData: presentationData)
                 actionSheet.setItemGroups([ActionSheetItemGroup(items: [
                     ActionSheetTextItem(title: url.url),
                     ActionSheetButtonItem(title: openText, color: .accent, action: { [weak actionSheet] in
@@ -457,6 +462,6 @@ public class InstantPageGalleryController: ViewController, StandalonePresentable
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift
index 6bed10a920..3a6d1da89a 100644
--- a/submodules/InstantPageUI/Sources/InstantPageImageItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageImageItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 protocol InstantPageImageAttribute {
 }
@@ -45,8 +46,8 @@ final class InstantPageImageItem: InstantPageItem {
         self.fit = fit
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
-        return InstantPageImageNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: self.webPage, media: self.media, attributes: self.attributes, interactive: self.interactive, roundCorners: self.roundCorners, fit: self.fit, openMedia: openMedia, longPressMedia: longPressMedia)
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
+        return InstantPageImageNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: self.webPage, media: self.media, attributes: self.attributes, interactive: self.interactive, roundCorners: self.roundCorners, fit: self.fit, openMedia: openMedia, longPressMedia: longPressMedia, activatePinchPreview: activatePinchPreview, pinchPreviewFinished: pinchPreviewFinished)
     }
     
     func matchesAnchor(_ anchor: String) -> Bool {
diff --git a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift
index 73e634010e..a63f6dbc28 100644
--- a/submodules/InstantPageUI/Sources/InstantPageImageNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageImageNode.swift
@@ -15,6 +15,7 @@ import LocationResources
 import LiveLocationPositionNode
 import AppBundle
 import TelegramUIPreferences
+import ContextUI
 
 private struct FetchControls {
     let fetch: (Bool) -> Void
@@ -34,7 +35,8 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
     private let longPressMedia: (InstantPageMedia) -> Void
     
     private var fetchControls: FetchControls?
-    
+
+    private let pinchContainerNode: PinchSourceContainerNode
     private let imageNode: TransformImageNode
     private let statusNode: RadialStatusNode
     private let linkIconNode: ASImageNode
@@ -48,7 +50,7 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
     
     private var themeUpdated: Bool = false
     
-    init(context: AccountContext, sourcePeerType: MediaAutoDownloadPeerType, theme: InstantPageTheme, webPage: TelegramMediaWebpage, media: InstantPageMedia, attributes: [InstantPageImageAttribute], interactive: Bool, roundCorners: Bool, fit: Bool, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void) {
+    init(context: AccountContext, sourcePeerType: MediaAutoDownloadPeerType, theme: InstantPageTheme, webPage: TelegramMediaWebpage, media: InstantPageMedia, attributes: [InstantPageImageAttribute], interactive: Bool, roundCorners: Bool, fit: Bool, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?) {
         self.context = context
         self.theme = theme
         self.webPage = webPage
@@ -59,15 +61,17 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
         self.fit = fit
         self.openMedia = openMedia
         self.longPressMedia = longPressMedia
-        
+
+        self.pinchContainerNode = PinchSourceContainerNode()
         self.imageNode = TransformImageNode()
         self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.6))
         self.linkIconNode = ASImageNode()
         self.pinNode = ChatMessageLiveLocationPositionNode()
         
         super.init()
-        
-        self.addSubnode(self.imageNode)
+
+        self.pinchContainerNode.contentNode.addSubnode(self.imageNode)
+        self.addSubnode(self.pinchContainerNode)
         
         if let image = media.media as? TelegramMediaImage, let largest = largestImageRepresentation(image.representations) {
             let imageReference = ImageMediaReference.webPage(webPage: WebpageReference(webPage), media: image)
@@ -97,10 +101,10 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
                 
                 if media.url != nil {
                     self.linkIconNode.image = UIImage(bundleImageName: "Instant View/ImageLink")
-                    self.addSubnode(self.linkIconNode)
+                    self.pinchContainerNode.contentNode.addSubnode(self.linkIconNode)
                 }
 
-                self.addSubnode(self.statusNode)
+                self.pinchContainerNode.contentNode.addSubnode(self.statusNode)
             }
         } else if let file = media.media as? TelegramMediaFile {
             let fileReference = FileMediaReference.webPage(webPage: WebpageReference(webPage), media: file)
@@ -114,16 +118,14 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
             }
             if file.isVideo {
                 self.statusNode.transitionToState(.play(.white), animated: false, completion: {})
-                self.addSubnode(self.statusNode)
+                self.pinchContainerNode.contentNode.addSubnode(self.statusNode)
             }
         } else if let map = media.media as? TelegramMediaMap {
             self.addSubnode(self.pinNode)
-            
-            var zoom: Int32 = 12
+
             var dimensions = CGSize(width: 200.0, height: 100.0)
             for attribute in self.attributes {
                 if let mapAttribute = attribute as? InstantPageMapAttribute {
-                    zoom = mapAttribute.zoom
                     dimensions = mapAttribute.dimensions
                     break
                 }
@@ -135,7 +137,19 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
             self.imageNode.setSignal(chatMessagePhoto(postbox: context.account.postbox, photoReference: imageReference))
             self.fetchedDisposable.set(chatMessagePhotoInteractiveFetched(context: context, photoReference: imageReference, displayAtSize: nil, storeToDownloadsPeerType: nil).start())
             self.statusNode.transitionToState(.play(.white), animated: false, completion: {})
-            self.addSubnode(self.statusNode)
+            self.pinchContainerNode.contentNode.addSubnode(self.statusNode)
+        }
+
+        if let activatePinchPreview = activatePinchPreview {
+            self.pinchContainerNode.activate = { sourceNode in
+                activatePinchPreview(sourceNode)
+            }
+            self.pinchContainerNode.animatedOut = { [weak self] in
+                guard let strongSelf = self else {
+                    return
+                }
+                pinchPreviewFinished?(strongSelf)
+            }
         }
     }
     
@@ -198,7 +212,9 @@ final class InstantPageImageNode: ASDisplayNode, InstantPageNode {
         if self.currentSize != size || self.themeUpdated {
             self.currentSize = size
             self.themeUpdated = false
-            
+
+            self.pinchContainerNode.frame = CGRect(origin: CGPoint(), size: size)
+            self.pinchContainerNode.update(size: size, transition: .immediate)
             self.imageNode.frame = CGRect(origin: CGPoint(), size: size)
             
             let radialStatusSize: CGFloat = 50.0
diff --git a/submodules/InstantPageUI/Sources/InstantPageItem.swift b/submodules/InstantPageUI/Sources/InstantPageItem.swift
index c60bd39cf0..436678bf5a 100644
--- a/submodules/InstantPageUI/Sources/InstantPageItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 protocol InstantPageItem {
     var frame: CGRect { get set }
@@ -16,7 +17,7 @@ protocol InstantPageItem {
     
     func matchesAnchor(_ anchor: String) -> Bool
     func drawInTile(context: CGContext)
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)?
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode?
     func matchesNode(_ node: InstantPageNode) -> Bool
     func linkSelectionRects(at point: CGPoint) -> [CGRect]
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageNode.swift b/submodules/InstantPageUI/Sources/InstantPageNode.swift
index 3eb643e1b4..591d8693cc 100644
--- a/submodules/InstantPageUI/Sources/InstantPageNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageNode.swift
@@ -4,7 +4,7 @@ import AsyncDisplayKit
 import Display
 import TelegramPresentationData
 
-protocol InstantPageNode {    
+protocol InstantPageNode: ASDisplayNode {    
     func updateIsVisible(_ isVisible: Bool)
     
     func transitionNode(media: InstantPageMedia) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift
index 3b5e71ccc4..86075eba4e 100644
--- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPagePeerReferenceItem: InstantPageItem {
     var frame: CGRect
@@ -27,7 +28,7 @@ final class InstantPagePeerReferenceItem: InstantPageItem {
         self.rtl = rtl
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPagePeerReferenceNode(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, initialPeer: self.initialPeer, safeInset: self.safeInset, transparent: self.transparent, rtl: self.rtl, openPeer: openPeer)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift
index 264b1c1117..642c6b5c51 100644
--- a/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPagePeerReferenceNode.swift
@@ -147,10 +147,11 @@ final class InstantPagePeerReferenceNode: ASDisplayNode, InstantPageNode {
         self.joinNode.addTarget(self, action: #selector(self.joinPressed), forControlEvents: .touchUpInside)
         
         let account = self.context.account
+        let context = self.context
         let signal = actualizedPeer(postbox: account.postbox, network: account.network, peer: initialPeer)
         |> mapToSignal({ peer -> Signal<Peer, NoError> in
             if let peer = peer as? TelegramChannel, let username = peer.username, peer.accessHash == nil {
-                return .single(peer) |> then(resolvePeerByName(account: account, name: username)
+                return .single(peer) |> then(context.engine.peers.resolvePeerByName(name: username)
                 |> mapToSignal({ peerId -> Signal<Peer, NoError> in
                     if let peerId = peerId {
                         return account.postbox.transaction({ transaction -> Peer in
@@ -309,7 +310,7 @@ final class InstantPagePeerReferenceNode: ASDisplayNode, InstantPageNode {
     @objc func joinPressed() {
         if let peer = self.peer, case .notJoined = self.joinState {
             self.updateJoinState(.inProgress)
-            self.joinDisposable.set((joinChannel(account: self.context.account, peerId: peer.id, hash: nil) |> deliverOnMainQueue).start(error: { [weak self] _ in
+            self.joinDisposable.set((self.context.engine.peers.joinChannel(peerId: peer.id, hash: nil) |> deliverOnMainQueue).start(error: { [weak self] _ in
                 if let strongSelf = self {
                     if case .inProgress = strongSelf.joinState {
                         strongSelf.updateJoinState(.notJoined)
diff --git a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift
index d43d84cc0c..82d0b9efeb 100644
--- a/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPagePlayableVideoItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPagePlayableVideoItem: InstantPageItem {
     var frame: CGRect
@@ -29,7 +30,7 @@ final class InstantPagePlayableVideoItem: InstantPageItem {
         self.interactive = interactive
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPagePlayableVideoNode(context: context, webPage: self.webPage, theme: theme, media: self.media, interactive: self.interactive, openMedia: openMedia)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageReferenceController.swift b/submodules/InstantPageUI/Sources/InstantPageReferenceController.swift
index 4768118441..fbf69ad4c7 100644
--- a/submodules/InstantPageUI/Sources/InstantPageReferenceController.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageReferenceController.swift
@@ -74,6 +74,6 @@ final class InstantPageReferenceController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift
index 3d22f56dd6..fe506f8626 100644
--- a/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageShapeItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 enum InstantPageShape {
     case rect
@@ -62,7 +63,7 @@ final class InstantPageShapeItem: InstantPageItem {
         return false
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return nil
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift
index 9ce77fc9a6..cf0f8a9d49 100644
--- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageSlideshowItem: InstantPageItem {
     var frame: CGRect
@@ -21,7 +22,7 @@ final class InstantPageSlideshowItem: InstantPageItem {
         self.medias = medias
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPageSlideshowNode(context: context, sourcePeerType: sourcePeerType, theme: theme, webPage: webPage, medias: self.medias, openMedia: openMedia, longPressMedia: longPressMedia)
     }
     
diff --git a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift
index d545caade5..624bf4501f 100644
--- a/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageSlideshowItemNode.swift
@@ -183,7 +183,7 @@ private final class InstantPageSlideshowPagerNode: ASDisplayNode, UIScrollViewDe
         let media = self.items[index]
         let contentNode: ASDisplayNode
         if let _ = media.media as? TelegramMediaImage {
-            contentNode = InstantPageImageNode(context: self.context, sourcePeerType: self.sourcePeerType, theme: self.theme, webPage: self.webPage, media: media, attributes: [], interactive: true, roundCorners: false, fit: false, openMedia: self.openMedia, longPressMedia: self.longPressMedia)
+            contentNode = InstantPageImageNode(context: self.context, sourcePeerType: self.sourcePeerType, theme: self.theme, webPage: self.webPage, media: media, attributes: [], interactive: true, roundCorners: false, fit: false, openMedia: self.openMedia, longPressMedia: self.longPressMedia, activatePinchPreview: nil, pinchPreviewFinished: nil)
         } else if let file = media.media as? TelegramMediaFile {
             contentNode = ASDisplayNode()
         } else {
diff --git a/submodules/InstantPageUI/Sources/InstantPageSubContentNode.swift b/submodules/InstantPageUI/Sources/InstantPageSubContentNode.swift
new file mode 100644
index 0000000000..1b48fd5f8c
--- /dev/null
+++ b/submodules/InstantPageUI/Sources/InstantPageSubContentNode.swift
@@ -0,0 +1,447 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import Postbox
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import TelegramPresentationData
+import TelegramUIPreferences
+import AccountContext
+
+final class InstantPageSubContentNode : ASDisplayNode {
+    private let context: AccountContext
+    private let strings: PresentationStrings
+    private let nameDisplayOrder: PresentationPersonNameOrder
+    private let sourcePeerType: MediaAutoDownloadPeerType
+    private let theme: InstantPageTheme
+    
+    private let openMedia: (InstantPageMedia) -> Void
+    private let longPressMedia: (InstantPageMedia) -> Void
+    private let openPeer: (PeerId) -> Void
+    private let openUrl: (InstantPageUrlItem) -> Void
+    
+    var currentLayoutTiles: [InstantPageTile] = []
+    var currentLayoutItemsWithNodes: [InstantPageItem] = []
+    var distanceThresholdGroupCount: [Int: Int] = [:]
+    
+    var visibleTiles: [Int: InstantPageTileNode] = [:]
+    var visibleItemsWithNodes: [Int: InstantPageNode] = [:]
+    
+    var currentWebEmbedHeights: [Int : CGFloat] = [:]
+    var currentExpandedDetails: [Int : Bool]?
+    var currentDetailsItems: [InstantPageDetailsItem] = []
+    
+    var requestLayoutUpdate: ((Bool) -> Void)?
+    
+    var currentLayout: InstantPageLayout
+    let contentSize: CGSize
+    let inOverlayPanel: Bool
+    
+    private var previousVisibleBounds: CGRect?
+    
+    init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, sourcePeerType: MediaAutoDownloadPeerType, theme: InstantPageTheme, items: [InstantPageItem], contentSize: CGSize, inOverlayPanel: Bool = false, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void) {
+        self.context = context
+        self.strings = strings
+        self.nameDisplayOrder = nameDisplayOrder
+        self.sourcePeerType = sourcePeerType
+        self.theme = theme
+        
+        self.openMedia = openMedia
+        self.longPressMedia = longPressMedia
+        self.openPeer = openPeer
+        self.openUrl = openUrl
+        
+        self.currentLayout = InstantPageLayout(origin: CGPoint(), contentSize: contentSize, items: items)
+        self.contentSize = contentSize
+        self.inOverlayPanel = inOverlayPanel
+        
+        super.init()
+        
+        self.updateLayout()
+    }
+    
+    private func updateLayout() {
+        for (_, tileNode) in self.visibleTiles {
+            tileNode.removeFromSupernode()
+        }
+        self.visibleTiles.removeAll()
+        
+        let currentLayoutTiles = instantPageTilesFromLayout(currentLayout, boundingWidth: contentSize.width)
+        
+        var currentDetailsItems: [InstantPageDetailsItem] = []
+        var currentLayoutItemsWithViews: [InstantPageItem] = []
+        var distanceThresholdGroupCount: [Int: Int] = [:]
+        
+        var expandedDetails: [Int: Bool] = [:]
+        
+        var detailsIndex = -1
+        for item in self.currentLayout.items {
+            if item.wantsNode {
+                currentLayoutItemsWithViews.append(item)
+                if let group = item.distanceThresholdGroup() {
+                    let count: Int
+                    if let currentCount = distanceThresholdGroupCount[Int(group)] {
+                        count = currentCount
+                    } else {
+                        count = 0
+                    }
+                    distanceThresholdGroupCount[Int(group)] = count + 1
+                }
+                if let detailsItem = item as? InstantPageDetailsItem {
+                    detailsIndex += 1
+                    expandedDetails[detailsIndex] = detailsItem.initiallyExpanded
+                    currentDetailsItems.append(detailsItem)
+                }
+            }
+        }
+        
+        if self.currentExpandedDetails == nil {
+            self.currentExpandedDetails = expandedDetails
+        }
+        
+        self.currentLayoutTiles = currentLayoutTiles
+        self.currentLayoutItemsWithNodes = currentLayoutItemsWithViews
+        self.currentDetailsItems = currentDetailsItems
+        self.distanceThresholdGroupCount = distanceThresholdGroupCount
+    }
+    
+    var effectiveContentSize: CGSize {
+        var contentSize = self.contentSize
+        for item in self.currentDetailsItems {
+            let expanded = self.currentExpandedDetails?[item.index] ?? item.initiallyExpanded
+            contentSize.height += -item.frame.height + (expanded ? self.effectiveSizeForDetails(item).height : item.titleHeight)
+        }
+        return contentSize
+    }
+    
+    func updateVisibleItems(visibleBounds: CGRect, animated: Bool = false) {
+        var visibleTileIndices = Set<Int>()
+        var visibleItemIndices = Set<Int>()
+        
+        self.previousVisibleBounds = visibleBounds
+        
+        var topNode: ASDisplayNode?
+        let topTileNode = topNode
+        if let scrollSubnodes = self.subnodes {
+            for node in scrollSubnodes.reversed() {
+                if let node = node as? InstantPageTileNode {
+                    topNode = node
+                    break
+                }
+            }
+        }
+        
+        var collapseOffset: CGFloat = 0.0
+        let transition: ContainedViewLayoutTransition
+        if animated {
+            transition = .animated(duration: 0.3, curve: .spring)
+        } else {
+            transition = .immediate
+        }
+        
+        var itemIndex = -1
+        var embedIndex = -1
+        var detailsIndex = -1
+        
+        for item in self.currentLayoutItemsWithNodes {
+            itemIndex += 1
+            if item is InstantPageWebEmbedItem {
+                embedIndex += 1
+            }
+            if item is InstantPageDetailsItem {
+                detailsIndex += 1
+            }
+            
+            var itemThreshold: CGFloat = 0.0
+            if let group = item.distanceThresholdGroup() {
+                var count: Int = 0
+                if let currentCount = self.distanceThresholdGroupCount[group] {
+                    count = currentCount
+                }
+                itemThreshold = item.distanceThresholdWithGroupCount(count)
+            }
+            
+            var itemFrame = item.frame.offsetBy(dx: 0.0, dy: -collapseOffset)
+            var thresholdedItemFrame = itemFrame
+            thresholdedItemFrame.origin.y -= itemThreshold
+            thresholdedItemFrame.size.height += itemThreshold * 2.0
+            
+            if let detailsItem = item as? InstantPageDetailsItem, let expanded = self.currentExpandedDetails?[detailsIndex] {
+                let height = expanded ? self.effectiveSizeForDetails(detailsItem).height : detailsItem.titleHeight
+                collapseOffset += itemFrame.height - height
+                itemFrame = CGRect(origin: itemFrame.origin, size: CGSize(width: itemFrame.width, height: height))
+            }
+            
+            if visibleBounds.intersects(thresholdedItemFrame) {
+                visibleItemIndices.insert(itemIndex)
+                
+                var itemNode = self.visibleItemsWithNodes[itemIndex]
+                if let currentItemNode = itemNode {
+                    if !item.matchesNode(currentItemNode) {
+                        (currentItemNode as! ASDisplayNode).removeFromSupernode()
+                        self.visibleItemsWithNodes.removeValue(forKey: itemIndex)
+                        itemNode = nil
+                    }
+                }
+                
+                if itemNode == nil {
+                    let itemIndex = itemIndex
+                    let detailsIndex = detailsIndex
+                    if let newNode = item.node(context: self.context, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, theme: theme, sourcePeerType: self.sourcePeerType, openMedia: { [weak self] media in
+                        self?.openMedia(media)
+                        }, longPressMedia: { [weak self] media in
+                            self?.longPressMedia(media)
+                        }, activatePinchPreview: nil, pinchPreviewFinished: nil, openPeer: { [weak self] peerId in
+                            self?.openPeer(peerId)
+                        }, openUrl: { [weak self] url in
+                            self?.openUrl(url)
+                        }, updateWebEmbedHeight: { _ in
+                        }, updateDetailsExpanded: { [weak self] expanded in
+                            self?.updateDetailsExpanded(detailsIndex, expanded)
+                        }, currentExpandedDetails: self.currentExpandedDetails) {
+                        newNode.frame = itemFrame
+                        newNode.updateLayout(size: itemFrame.size, transition: transition)
+                        if let topNode = topNode {
+                            self.insertSubnode(newNode, aboveSubnode: topNode)
+                        } else {
+                            self.insertSubnode(newNode, at: 0)
+                        }
+                        topNode = newNode
+                        self.visibleItemsWithNodes[itemIndex] = newNode
+                        itemNode = newNode
+                        
+                        if let itemNode = itemNode as? InstantPageDetailsNode {
+                            itemNode.requestLayoutUpdate = { [weak self] animated in
+                                self?.requestLayoutUpdate?(animated)
+                            }
+                        }
+                    }
+                } else {
+                    if (itemNode as! ASDisplayNode).frame != itemFrame {
+                        transition.updateFrame(node: (itemNode as! ASDisplayNode), frame: itemFrame)
+                        itemNode?.updateLayout(size: itemFrame.size, transition: transition)
+                    }
+                }
+                
+                if let itemNode = itemNode as? InstantPageDetailsNode {
+                    itemNode.updateVisibleItems(visibleBounds: visibleBounds.offsetBy(dx: -itemNode.frame.minX, dy: -itemNode.frame.minY), animated: animated)
+                }
+            }
+        }
+        
+        topNode = topTileNode
+        
+        var tileIndex = -1
+        for tile in self.currentLayoutTiles {
+            tileIndex += 1
+            
+            let tileFrame = effectiveFrameForTile(tile)
+            var tileVisibleFrame = tileFrame
+            tileVisibleFrame.origin.y -= 400.0
+            tileVisibleFrame.size.height += 400.0 * 2.0
+            if tileVisibleFrame.intersects(visibleBounds) {
+                visibleTileIndices.insert(tileIndex)
+                
+                if self.visibleTiles[tileIndex] == nil {
+                    let tileNode = InstantPageTileNode(tile: tile, backgroundColor: self.inOverlayPanel ? self.theme.overlayPanelColor : self.theme.pageBackgroundColor)
+                    tileNode.frame = tileFrame
+                    if let topNode = topNode {
+                        self.insertSubnode(tileNode, aboveSubnode: topNode)
+                    } else {
+                        self.insertSubnode(tileNode, at: 0)
+                    }
+                    topNode = tileNode
+                    self.visibleTiles[tileIndex] = tileNode
+                } else {
+                    if visibleTiles[tileIndex]!.frame != tileFrame {
+                        transition.updateFrame(node: self.visibleTiles[tileIndex]!, frame: tileFrame)
+                    }
+                }
+            }
+        }
+        
+        var removeTileIndices: [Int] = []
+        for (index, tileNode) in self.visibleTiles {
+            if !visibleTileIndices.contains(index) {
+                removeTileIndices.append(index)
+                tileNode.removeFromSupernode()
+            }
+        }
+        for index in removeTileIndices {
+            self.visibleTiles.removeValue(forKey: index)
+        }
+        
+        var removeItemIndices: [Int] = []
+        for (index, itemNode) in self.visibleItemsWithNodes {
+            if !visibleItemIndices.contains(index) {
+                removeItemIndices.append(index)
+                (itemNode as! ASDisplayNode).removeFromSupernode()
+            } else {
+                var itemFrame = (itemNode as! ASDisplayNode).frame
+                let itemThreshold: CGFloat = 200.0
+                itemFrame.origin.y -= itemThreshold
+                itemFrame.size.height += itemThreshold * 2.0
+                itemNode.updateIsVisible(visibleBounds.intersects(itemFrame))
+            }
+        }
+        for index in removeItemIndices {
+            self.visibleItemsWithNodes.removeValue(forKey: index)
+        }
+    }
+    
+    private func updateWebEmbedHeight(_ index: Int, _ height: CGFloat) {
+        //        let currentHeight = self.currentWebEmbedHeights[index]
+        //        if height != currentHeight {
+        //            if let currentHeight = currentHeight, currentHeight > height {
+        //                return
+        //            }
+        //            self.currentWebEmbedHeights[index] = height
+        //
+        //            let signal: Signal<Void, NoError> = (.complete() |> delay(0.08, queue: Queue.mainQueue()))
+        //            self.updateLayoutDisposable.set(signal.start(completed: { [weak self] in
+        //                if let strongSelf = self {
+        //                    strongSelf.updateLayout()
+        //                    strongSelf.updateVisibleItems()
+        //                }
+        //            }))
+        //        }
+    }
+    
+    func updateDetailsExpanded(_ index: Int, _ expanded: Bool, animated: Bool = true, requestLayout: Bool = true) {
+        if var currentExpandedDetails = self.currentExpandedDetails {
+            currentExpandedDetails[index] = expanded
+            self.currentExpandedDetails = currentExpandedDetails
+        }
+        self.requestLayoutUpdate?(animated)
+    }
+    
+    func transitionNode(media: InstantPageMedia) -> (ASDisplayNode, CGRect, () -> (UIView?, UIView?))? {
+        for (_, itemNode) in self.visibleItemsWithNodes {
+            if let transitionNode = itemNode.transitionNode(media: media) {
+                return transitionNode
+            }
+        }
+        return nil
+    }
+    
+    func updateHiddenMedia(media: InstantPageMedia?) {
+        for (_, itemNode) in self.visibleItemsWithNodes {
+            itemNode.updateHiddenMedia(media: media)
+        }
+    }
+    
+    func scrollableContentOffset(item: InstantPageScrollableItem) -> CGPoint {
+        var contentOffset = CGPoint()
+        for (_, itemNode) in self.visibleItemsWithNodes {
+            if let itemNode = itemNode as? InstantPageScrollableNode, itemNode.item === item {
+                contentOffset = itemNode.contentOffset
+                break
+            }
+        }
+        return contentOffset
+    }
+    
+    func nodeForDetailsItem(_ item: InstantPageDetailsItem) -> InstantPageDetailsNode? {
+        for (_, itemNode) in self.visibleItemsWithNodes {
+            if let detailsNode = itemNode as? InstantPageDetailsNode, detailsNode.item === item {
+                return detailsNode
+            }
+        }
+        return nil
+    }
+    
+    private func effectiveSizeForDetails(_ item: InstantPageDetailsItem) -> CGSize {
+        if let node = nodeForDetailsItem(item) {
+            return CGSize(width: item.frame.width, height: node.effectiveContentSize.height + item.titleHeight)
+        } else {
+            return item.frame.size
+        }
+    }
+    
+    private func effectiveFrameForTile(_ tile: InstantPageTile) -> CGRect {
+        let layoutOrigin = tile.frame.origin
+        var origin = layoutOrigin
+        for item in self.currentDetailsItems {
+            let expanded = self.currentExpandedDetails?[item.index] ?? item.initiallyExpanded
+            if layoutOrigin.y >= item.frame.maxY {
+                let height = expanded ? self.effectiveSizeForDetails(item).height : item.titleHeight
+                origin.y += height - item.frame.height
+            }
+        }
+        return CGRect(origin: origin, size: tile.frame.size)
+    }
+    
+    func effectiveFrameForItem(_ item: InstantPageItem) -> CGRect {
+        let layoutOrigin = item.frame.origin
+        var origin = layoutOrigin
+        
+        for item in self.currentDetailsItems {
+            let expanded = self.currentExpandedDetails?[item.index] ?? item.initiallyExpanded
+            if layoutOrigin.y >= item.frame.maxY {
+                let height = expanded ? self.effectiveSizeForDetails(item).height : item.titleHeight
+                origin.y += height - item.frame.height
+            }
+        }
+        
+        if let item = item as? InstantPageDetailsItem {
+            let expanded = self.currentExpandedDetails?[item.index] ?? item.initiallyExpanded
+            let height = expanded ? self.effectiveSizeForDetails(item).height : item.titleHeight
+            return CGRect(origin: origin, size: CGSize(width: item.frame.width, height: height))
+        } else {
+            return CGRect(origin: origin, size: item.frame.size)
+        }
+    }
+    
+    func textItemAtLocation(_ location: CGPoint) -> (InstantPageTextItem, CGPoint)? {
+        for item in self.currentLayout.items {
+            let itemFrame = self.effectiveFrameForItem(item)
+            if itemFrame.contains(location) {
+                if let item = item as? InstantPageTextItem, item.selectable {
+                    return (item, CGPoint(x: itemFrame.minX - item.frame.minX, y: itemFrame.minY - item.frame.minY))
+                } else if let item = item as? InstantPageScrollableItem {
+                    let contentOffset = scrollableContentOffset(item: item)
+                    if let (textItem, parentOffset) = item.textItemAtLocation(location.offsetBy(dx: -itemFrame.minX + contentOffset.x, dy: -itemFrame.minY)) {
+                        return (textItem, itemFrame.origin.offsetBy(dx: parentOffset.x - contentOffset.x, dy: parentOffset.y))
+                    }
+                } else if let item = item as? InstantPageDetailsItem {
+                    for (_, itemNode) in self.visibleItemsWithNodes {
+                        if let itemNode = itemNode as? InstantPageDetailsNode, itemNode.item === item {
+                            if let (textItem, parentOffset) = itemNode.textItemAtLocation(location.offsetBy(dx: -itemFrame.minX, dy: -itemFrame.minY)) {
+                                return (textItem, itemFrame.origin.offsetBy(dx: parentOffset.x, dy: parentOffset.y))
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return nil
+    }
+    
+    
+    func tapActionAtPoint(_ point: CGPoint) -> TapLongTapOrDoubleTapGestureRecognizerAction {
+        for item in self.currentLayout.items {
+            let frame = self.effectiveFrameForItem(item)
+            if frame.contains(point) {
+                if item is InstantPagePeerReferenceItem {
+                    return .fail
+                } else if item is InstantPageAudioItem {
+                    return .fail
+                } else if item is InstantPageArticleItem {
+                    return .fail
+                } else if item is InstantPageFeedbackItem {
+                    return .fail
+                } else if let item = item as? InstantPageDetailsItem {
+                    for (_, itemNode) in self.visibleItemsWithNodes {
+                        if let itemNode = itemNode as? InstantPageDetailsNode, itemNode.item === item {
+                            return itemNode.tapActionAtPoint(point.offsetBy(dx: -itemNode.frame.minX, dy: -itemNode.frame.minY))
+                        }
+                    }
+                }
+                break
+            }
+        }
+        return .waitForSingleTap
+    }
+}
diff --git a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift
index b496136023..8dd07125ee 100644
--- a/submodules/InstantPageUI/Sources/InstantPageTableItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageTableItem.swift
@@ -8,6 +8,7 @@ import Display
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 private struct TableSide: OptionSet {
     var rawValue: Int32 = 0
@@ -200,12 +201,12 @@ final class InstantPageTableItem: InstantPageScrollableItem {
         return false
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         var additionalNodes: [InstantPageNode] = []
         for cell in self.cells {
             for item in cell.additionalItems {
                 if item.wantsNode {
-                    if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) {
+                    if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, activatePinchPreview: nil, pinchPreviewFinished: nil, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) {
                         node.frame = item.frame.offsetBy(dx: cell.frame.minX, dy: cell.frame.minY)
                         additionalNodes.append(node)
                     }
diff --git a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift
index c9483f1fba..60e725ca0f 100644
--- a/submodules/InstantPageUI/Sources/InstantPageTextItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageTextItem.swift
@@ -9,6 +9,7 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import TextFormat
 import AccountContext
+import ContextUI
 
 public final class InstantPageUrlItem: Equatable {
     public let url: String
@@ -436,7 +437,7 @@ final class InstantPageTextItem: InstantPageItem {
         return false
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return nil
     }
     
@@ -485,11 +486,11 @@ final class InstantPageScrollableTextItem: InstantPageScrollableItem {
         context.restoreGState()
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         var additionalNodes: [InstantPageNode] = []
         for item in additionalItems {
             if item.wantsNode {
-                if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) {
+                if let node = item.node(context: context, strings: strings, nameDisplayOrder: nameDisplayOrder, theme: theme, sourcePeerType: sourcePeerType, openMedia: { _ in }, longPressMedia: { _ in }, activatePinchPreview: nil, pinchPreviewFinished: nil, openPeer: { _ in }, openUrl: { _ in}, updateWebEmbedHeight: { _ in }, updateDetailsExpanded: { _ in }, currentExpandedDetails: nil) {
                     node.frame = item.frame
                     additionalNodes.append(node)
                 }
diff --git a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift
index f432f660ba..14f06fad3f 100644
--- a/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift
+++ b/submodules/InstantPageUI/Sources/InstantPageWebEmbedItem.swift
@@ -7,6 +7,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
+import ContextUI
 
 final class InstantPageWebEmbedItem: InstantPageItem {
     var frame: CGRect
@@ -25,7 +26,7 @@ final class InstantPageWebEmbedItem: InstantPageItem {
         self.enableScrolling = enableScrolling
     }
     
-    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> (InstantPageNode & ASDisplayNode)? {
+    func node(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, theme: InstantPageTheme, sourcePeerType: MediaAutoDownloadPeerType, openMedia: @escaping (InstantPageMedia) -> Void, longPressMedia: @escaping (InstantPageMedia) -> Void, activatePinchPreview: ((PinchSourceContainerNode) -> Void)?, pinchPreviewFinished: ((InstantPageNode) -> Void)?, openPeer: @escaping (PeerId) -> Void, openUrl: @escaping (InstantPageUrlItem) -> Void, updateWebEmbedHeight: @escaping (CGFloat) -> Void, updateDetailsExpanded: @escaping (Bool) -> Void, currentExpandedDetails: [Int : Bool]?) -> InstantPageNode? {
         return InstantPageWebEmbedNode(frame: self.frame, url: self.url, html: self.html, enableScrolling: self.enableScrolling, updateWebEmbedHeight: updateWebEmbedHeight)
     }
     
diff --git a/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift b/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift
index 08e410893a..2502a6a12c 100644
--- a/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift
+++ b/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift
@@ -387,7 +387,7 @@ public func inviteLinkEditController(context: AccountContext, peerId: PeerId, in
                         dismissAction()
                         dismissImpl?()
                         
-                        let _ = (revokePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link)
+                        let _ = (context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: invite.link)
                         |> timeout(10, queue: Queue.mainQueue(), alternate: .fail(.generic))
                         |> deliverOnMainQueue).start(next: { invite in
                             switch invite {
@@ -444,7 +444,7 @@ public func inviteLinkEditController(context: AccountContext, peerId: PeerId, in
 
             let usageLimit = state.usage.value
             if invite == nil {
-                let _ = (createPeerExportedInvitation(account: context.account, peerId: peerId, expireDate: expireDate, usageLimit: usageLimit)
+                let _ = (context.engine.peers.createPeerExportedInvitation(peerId: peerId, expireDate: expireDate, usageLimit: usageLimit)
                 |> timeout(10, queue: Queue.mainQueue(), alternate: .fail(.generic))
                 |> deliverOnMainQueue).start(next: { invite in
                     completion?(invite)
@@ -458,7 +458,7 @@ public func inviteLinkEditController(context: AccountContext, peerId: PeerId, in
                     presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                 })
             } else if let invite = invite {
-                let _ = (editPeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link, expireDate: expireDate, usageLimit: usageLimit)
+                let _ = (context.engine.peers.editPeerExportedInvitation(peerId: peerId, link: invite.link, expireDate: expireDate, usageLimit: usageLimit)
                 |> timeout(10, queue: Queue.mainQueue(), alternate: .fail(.generic))
                 |> deliverOnMainQueue).start(next: { invite in
                     completion?(invite)
diff --git a/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift b/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift
index 68d2764e4b..02985f64fe 100644
--- a/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift
+++ b/submodules/InviteLinksUI/Sources/InviteLinkInviteController.swift
@@ -285,7 +285,7 @@ public final class InviteLinkInviteController: ViewController {
             self.presentationDataPromise = Promise(self.presentationData)
             self.controller = controller
             
-            self.invitesContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, adminId: nil, revoked: false, forceUpdate: false)
+            self.invitesContext = context.engine.peers.peerExportedInvitations(peerId: peerId, adminId: nil, revoked: false, forceUpdate: false)
                         
             self.dimNode = ASDisplayNode()
             self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
@@ -396,7 +396,7 @@ public final class InviteLinkInviteController: ViewController {
                                     dismissAction()
                                     
                                     if let invite = invite {
-                                        let _ = (revokePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
+                                        let _ = (context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
                                             if let result = result, case let .replace(_, invite) = result {
                                                 mainInvitePromise.set(invite)
                                             }
diff --git a/submodules/InviteLinksUI/Sources/InviteLinkListController.swift b/submodules/InviteLinksUI/Sources/InviteLinkListController.swift
index 9314f186b7..973d154cd1 100644
--- a/submodules/InviteLinksUI/Sources/InviteLinkListController.swift
+++ b/submodules/InviteLinksUI/Sources/InviteLinkListController.swift
@@ -418,12 +418,12 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
     var getControllerImpl: (() -> ViewController?)?
     
     let adminId = admin?.peer.peer?.id
-    let invitesContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, adminId: adminId, revoked: false, forceUpdate: true)
-    let revokedInvitesContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, adminId: adminId, revoked: true, forceUpdate: true)
+    let invitesContext = context.engine.peers.peerExportedInvitations(peerId: peerId, adminId: adminId, revoked: false, forceUpdate: true)
+    let revokedInvitesContext = context.engine.peers.peerExportedInvitations(peerId: peerId, adminId: adminId, revoked: true, forceUpdate: true)
     
     let creators: Signal<[ExportedInvitationCreator], NoError>
     if adminId == nil {
-        creators = .single([]) |> then(peerExportedInvitationsCreators(account: context.account, peerId: peerId))
+        creators = .single([]) |> then(context.engine.peers.peerExportedInvitationsCreators(peerId: peerId))
     } else {
         creators = .single([])
     }
@@ -520,7 +520,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
                                     }
                                 }
                                 if revoke {
-                                    revokeLinkDisposable.set((revokePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
+                                    revokeLinkDisposable.set((context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
                                         updateState { state in
                                             var updatedState = state
                                             updatedState.revokingPrivateLink = false
@@ -661,7 +661,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
                         ActionSheetButtonItem(title: presentationData.strings.InviteLink_DeleteLinkAlert_Action, color: .destructive, action: {
                             dismissAction()
 
-                            revokeLinkDisposable.set((deletePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(completed: {
+                            revokeLinkDisposable.set((context.engine.peers.deletePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(completed: {
                             }))
                             
                             revokedInvitesContext.remove(invite)
@@ -695,7 +695,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
                             ActionSheetButtonItem(title: presentationData.strings.GroupInfo_InviteLink_RevokeLink, color: .destructive, action: {
                                 dismissAction()
                                 
-                                revokeLinkDisposable.set((revokePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
+                                revokeLinkDisposable.set((context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
                                     if case let .replace(_, newInvite) = result {
                                         invitesContext.add(newInvite)
                                     }
@@ -732,7 +732,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
                 ActionSheetButtonItem(title: presentationData.strings.InviteLink_DeleteAllRevokedLinksAlert_Action, color: .destructive, action: {
                     dismissAction()
                     
-                    deleteAllRevokedLinksDisposable.set((deleteAllRevokedPeerExportedInvitations(account: context.account, peerId: peerId, adminId: adminId ?? context.account.peerId) |> deliverOnMainQueue).start(completed: {
+                    deleteAllRevokedLinksDisposable.set((context.engine.peers.deleteAllRevokedPeerExportedInvitations(peerId: peerId, adminId: adminId ?? context.account.peerId) |> deliverOnMainQueue).start(completed: {
                     }))
                     
                     revokedInvitesContext.clear()
@@ -770,7 +770,7 @@ public func inviteLinkListController(context: AccountContext, peerId: PeerId, ad
     |> distinctUntilChanged
     |> deliverOnMainQueue
     |> map { invite -> PeerInvitationImportersContext? in
-        return invite.flatMap { PeerInvitationImportersContext(account: context.account, peerId: peerId, invite: $0) }
+        return invite.flatMap { context.engine.peers.peerInvitationImporters(peerId: peerId, invite: $0) }
     } |> afterNext { context in
         if let context = context {
             importersState.set(context.state |> map(Optional.init))
diff --git a/submodules/InviteLinksUI/Sources/InviteLinkQRCodeController.swift b/submodules/InviteLinksUI/Sources/InviteLinkQRCodeController.swift
index aec9ecee79..a13cdeb9a7 100644
--- a/submodules/InviteLinksUI/Sources/InviteLinkQRCodeController.swift
+++ b/submodules/InviteLinksUI/Sources/InviteLinkQRCodeController.swift
@@ -143,7 +143,7 @@ public final class InviteLinkQRCodeController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 
     class Node: ViewControllerTracingNode, UIScrollViewDelegate {
diff --git a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift
index a6483cda91..db9cef882d 100644
--- a/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift
+++ b/submodules/InviteLinksUI/Sources/InviteLinkViewController.swift
@@ -374,7 +374,7 @@ public final class InviteLinkViewController: ViewController {
             self.presentationDataPromise = Promise(self.presentationData)
             self.controller = controller
             
-            self.importersContext = importersContext ?? PeerInvitationImportersContext(account: context.account, peerId: peerId, invite: invite)
+            self.importersContext = importersContext ?? context.engine.peers.peerInvitationImporters(peerId: peerId, invite: invite)
             
             self.dimNode = ASDisplayNode()
             self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
@@ -483,7 +483,7 @@ public final class InviteLinkViewController: ViewController {
                                     dismissAction()
                                     self?.controller?.dismiss()
                                     
-                                    let _ = (deletePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(completed: {
+                                    let _ = (context.engine.peers.deletePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(completed: {
                                     })
                                     
                                     self?.controller?.revokedInvitationsContext?.remove(invite)
@@ -537,7 +537,7 @@ public final class InviteLinkViewController: ViewController {
                                         dismissAction()
                                         self?.controller?.dismiss()
 
-                                        let _ = (revokePeerExportedInvitation(account: context.account, peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
+                                        let _ = (context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: invite.link) |> deliverOnMainQueue).start(next: { result in
                                             if case let .replace(_, newInvite) = result {
                                                 self?.controller?.invitationsContext?.add(newInvite)
                                             }
@@ -598,7 +598,7 @@ public final class InviteLinkViewController: ViewController {
                     if state.importers.isEmpty && state.isLoadingMore {
                         count = min(4, state.count)
                         loading = true
-                        let fakeUser = TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+                        let fakeUser = TelegramUser(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
                         for i in 0 ..< count {
                             entries.append(.importer(Int32(i), presentationData.theme, presentationData.dateTimeFormat, fakeUser, 0, true))
                         }
@@ -839,7 +839,7 @@ public final class InviteLinkViewController: ViewController {
                 } else {
                     let elapsedTime = expireDate - currentTime
                     if elapsedTime >= 86400 {
-                        subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(timeIntervalString(strings: self.presentationData.strings, value: elapsedTime)).0
+                        subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(scheduledTimeIntervalString(strings: self.presentationData.strings, value: elapsedTime)).0
                     } else {
                         subtitleText = self.presentationData.strings.InviteLink_ExpiresIn(textForTimeout(value: elapsedTime)).0
                         if self.countdownTimer == nil {
diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift
index be3a22af2b..ee217b013e 100644
--- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift
+++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift
@@ -392,7 +392,7 @@ public class ItemListInviteLinkItemNode: ListViewItemNode, ItemListItemNode {
                             }
                             let elapsedTime = expireDate - currentTime
                             if elapsedTime >= 86400 {
-                                subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(timeIntervalString(strings: item.presentationData.strings, value: elapsedTime)).0
+                                subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(scheduledTimeIntervalString(strings: item.presentationData.strings, value: elapsedTime)).0
                             } else {
                                 subtitleText += item.presentationData.strings.InviteLink_ExpiresIn(textForTimeout(value: elapsedTime)).0
                             }
diff --git a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift
index 5393572d5c..f924c08da9 100644
--- a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift
+++ b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift
@@ -531,7 +531,7 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo
             }
             
             var updateAvatarOverlayImage: UIImage?
-            if item.updatingImage != nil && item.peer?.id.namespace != -1 && currentOverlayImage == nil {
+            if item.updatingImage != nil && item.peer?.id.namespace != .max && currentOverlayImage == nil {
                 updateAvatarOverlayImage = updatingAvatarOverlayImage
             }
             
diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
index 404f42cc07..5e11e84832 100644
--- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
+++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift
@@ -1328,8 +1328,12 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
         }
     }
     
-    override public func header() -> ListViewItemHeader? {
-        return self.layoutParams?.0.header
+    override public func headers() -> [ListViewItemHeader]? {
+        if let item = self.layoutParams?.0 {
+            return item.header.flatMap { [$0] }
+        } else {
+            return nil
+        }
     }
     
     override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
@@ -1350,10 +1354,11 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo
 }
 
 public final class ItemListPeerItemHeader: ListViewItemHeader {
-    public let id: Int64
+    public let id: ListViewItemNode.HeaderId
     public let text: String
     public let additionalText: String
     public let stickDirection: ListViewItemHeaderStickDirection = .topEdge
+    public let stickOverInsets: Bool = true
     public let theme: PresentationTheme
     public let strings: PresentationStrings
     public let actionTitle: String?
@@ -1364,14 +1369,14 @@ public final class ItemListPeerItemHeader: ListViewItemHeader {
     public init(theme: PresentationTheme, strings: PresentationStrings, text: String, additionalText: String, actionTitle: String? = nil, id: Int64, action: (() -> Void)? = nil) {
         self.text = text
         self.additionalText = additionalText
-        self.id = id
+        self.id = ListViewItemNode.HeaderId(space: 0, id: id)
         self.theme = theme
         self.strings = strings
         self.actionTitle = actionTitle
         self.action = action
     }
     
-    public func node() -> ListViewItemHeaderNode {
+    public func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
         return ItemListPeerItemHeaderNode(theme: self.theme, strings: self.strings, text: self.text, additionalText: self.additionalText, actionTitle: self.actionTitle, action: self.action)
     }
     
@@ -1408,7 +1413,7 @@ public final class ItemListPeerItemHeaderNode: ListViewItemHeaderNode, ItemListH
         self.backgroundNode.backgroundColor = theme.list.blocksBackgroundColor
         
         self.snappedBackgroundNode = ASDisplayNode()
-        self.snappedBackgroundNode.backgroundColor = theme.rootController.navigationBar.backgroundColor
+        self.snappedBackgroundNode.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor
         self.snappedBackgroundNode.alpha = 0.0
         
         self.separatorNode = ASDisplayNode()
@@ -1467,7 +1472,7 @@ public final class ItemListPeerItemHeaderNode: ListViewItemHeaderNode, ItemListH
         self.theme = theme
         
         self.backgroundNode.backgroundColor = theme.list.blocksBackgroundColor
-        self.snappedBackgroundNode.backgroundColor = theme.rootController.navigationBar.backgroundColor
+        self.snappedBackgroundNode.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor
         self.separatorNode.backgroundColor = theme.list.itemBlocksSeparatorColor
         
         let titleFont = Font.regular(13.0)
diff --git a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift
index d7462bab91..85ad2f2bc4 100644
--- a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift
+++ b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift
@@ -451,7 +451,7 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode {
                     thumbnailItem = .animated(item.file.resource)
                     resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: item.file.resource)
                 } else if let dimensions = item.file.dimensions, let resource = chatMessageStickerResource(file: item.file, small: true) as? TelegramMediaResource {
-                    thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: []))
+                    thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                     resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: resource)
                 }
             }
diff --git a/submodules/ItemListUI/BUILD b/submodules/ItemListUI/BUILD
index 68433a99c3..9a38bf8d03 100644
--- a/submodules/ItemListUI/BUILD
+++ b/submodules/ItemListUI/BUILD
@@ -22,6 +22,7 @@ swift_library(
         "//submodules/SegmentedControlNode:SegmentedControlNode",
         "//submodules/AccountContext:AccountContext",
         "//submodules/AnimationUI:AnimationUI",
+        "//submodules/ShimmerEffect:ShimmerEffect",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/ItemListUI/Sources/ItemListController.swift b/submodules/ItemListUI/Sources/ItemListController.swift
index 73a09858ce..8f57656f5d 100644
--- a/submodules/ItemListUI/Sources/ItemListController.swift
+++ b/submodules/ItemListUI/Sources/ItemListController.swift
@@ -444,11 +444,7 @@ open class ItemListController: ViewController, KeyShortcutResponder, Presentable
         }
         |> map { ($0.presentationData, $1) }
         
-        let displayNode = ItemListControllerNode(controller: self, navigationBar: self.navigationBar!, updateNavigationOffset: { [weak self] offset in
-            if let strongSelf = self {
-                strongSelf.navigationOffset = offset
-            }
-        }, state: nodeState)
+        let displayNode = ItemListControllerNode(controller: self, navigationBar: self.navigationBar!, state: nodeState)
         displayNode.dismiss = { [weak self] in
             self?.presentingViewController?.dismiss(animated: true, completion: nil)
         }
@@ -476,7 +472,7 @@ open class ItemListController: ViewController, KeyShortcutResponder, Presentable
         
         self.validLayout = layout
         
-        (self.displayNode as! ItemListControllerNode).containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition, additionalInsets: self.additionalInsets)
+        (self.displayNode as! ItemListControllerNode).containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, transition: transition, additionalInsets: self.additionalInsets)
     }
 
     @objc func leftNavigationButtonPressed() {
diff --git a/submodules/ItemListUI/Sources/ItemListControllerNode.swift b/submodules/ItemListUI/Sources/ItemListControllerNode.swift
index d988e238ba..1fc89122e8 100644
--- a/submodules/ItemListUI/Sources/ItemListControllerNode.swift
+++ b/submodules/ItemListUI/Sources/ItemListControllerNode.swift
@@ -227,7 +227,7 @@ public final class ItemListControllerNodeView: UITracingLayerView {
     weak var controller: ItemListController?
 }
 
-open class ItemListControllerNode: ASDisplayNode, UIScrollViewDelegate {
+open class ItemListControllerNode: ASDisplayNode {
     private var _ready = ValuePromise<Bool>()
     open var ready: Signal<Bool, NoError> {
         return self._ready.get()
@@ -261,8 +261,7 @@ open class ItemListControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var appliedEnsureVisibleItemTag: ItemListItemTag?
     
     private var afterLayoutActions: [() -> Void] = []
-    
-    public let updateNavigationOffset: (CGFloat) -> Void
+
     public var dismiss: (() -> Void)?
     
     public var visibleEntriesUpdated: ((ItemListNodeVisibleEntries) -> Void)?
@@ -282,9 +281,8 @@ open class ItemListControllerNode: ASDisplayNode, UIScrollViewDelegate {
 
     var alwaysSynchronous = false
     
-    public init(controller: ItemListController?, navigationBar: NavigationBar, updateNavigationOffset: @escaping (CGFloat) -> Void, state: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError>) {
+    public init(controller: ItemListController?, navigationBar: NavigationBar, state: Signal<(ItemListPresentationData, (ItemListNodeState, Any)), NoError>) {
         self.navigationBar = navigationBar
-        self.updateNavigationOffset = updateNavigationOffset
         
         self.listNode = ListView()
         self.leftOverlayNode = ASDisplayNode()
@@ -349,7 +347,7 @@ open class ItemListControllerNode: ASDisplayNode, UIScrollViewDelegate {
             self?.contentOffsetChanged?(offset, inVoiceOver)
         }
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             if let strongSelf = self {
                 strongSelf.beganInteractiveDragging?()
             }
@@ -820,11 +818,6 @@ open class ItemListControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.searchNode?.scrollToTop()
     }
     
-    open func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        let distanceFromEquilibrium = scrollView.contentOffset.y - scrollView.contentSize.height / 3.0
-        self.updateNavigationOffset(-distanceFromEquilibrium)
-    }
-    
     open func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
         targetContentOffset.pointee = scrollView.contentOffset
         
diff --git a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
index 585b750ae1..1c58b50e54 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
@@ -4,6 +4,7 @@ import Display
 import AsyncDisplayKit
 import SwiftSignalKit
 import TelegramPresentationData
+import ShimmerEffect
 
 public enum ItemListDisclosureItemTitleColor {
     case primary
@@ -38,8 +39,9 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem {
     let action: (() -> Void)?
     let clearHighlightAutomatically: Bool
     public let tag: ItemListItemTag?
+    public let shimmeringIndex: Int?
     
-    public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil) {
+    public init(presentationData: ItemListPresentationData, icon: UIImage? = nil, title: String, enabled: Bool = true, titleColor: ItemListDisclosureItemTitleColor = .primary, label: String, labelStyle: ItemListDisclosureLabelStyle = .text, sectionId: ItemListSectionId, style: ItemListStyle, disclosureStyle: ItemListDisclosureStyle = .arrow, action: (() -> Void)?, clearHighlightAutomatically: Bool = true, tag: ItemListItemTag? = nil, shimmeringIndex: Int? = nil) {
         self.presentationData = presentationData
         self.icon = icon
         self.title = title
@@ -53,6 +55,7 @@ public class ItemListDisclosureItem: ListViewItem, ItemListItem {
         self.action = action
         self.clearHighlightAutomatically = clearHighlightAutomatically
         self.tag = tag
+        self.shimmeringIndex = shimmeringIndex
     }
     
     public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
@@ -131,6 +134,9 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
     public var tag: ItemListItemTag? {
         return self.item?.tag
     }
+
+    private var placeholderNode: ShimmerEffectNode?
+    private var absoluteLocation: (CGRect, CGSize)?
     
     public init() {
         self.backgroundNode = ASDisplayNode()
@@ -179,6 +185,15 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
         
         self.addSubnode(self.activateArea)
     }
+
+    override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y += self.insets.top
+        self.absoluteLocation = (rect, containerSize)
+        if let shimmerNode = self.placeholderNode {
+            shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+        }
+    }
     
     public func asyncLayout() -> (_ item: ItemListDisclosureItem, _ params: ListViewItemLayoutParams, _ insets: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
@@ -479,6 +494,38 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
                     }
                     
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: height + UIScreenPixel))
+
+                    if let shimmeringIndex = item.shimmeringIndex {
+                        let shimmerNode: ShimmerEffectNode
+                        if let current = strongSelf.placeholderNode {
+                            shimmerNode = current
+                        } else {
+                            shimmerNode = ShimmerEffectNode()
+                            strongSelf.placeholderNode = shimmerNode
+                            if strongSelf.backgroundNode.supernode != nil {
+                                strongSelf.insertSubnode(shimmerNode, aboveSubnode: strongSelf.backgroundNode)
+                            } else {
+                                strongSelf.addSubnode(shimmerNode)
+                            }
+                        }
+                        shimmerNode.frame = CGRect(origin: CGPoint(), size: contentSize)
+                        if let (rect, size) = strongSelf.absoluteLocation {
+                            shimmerNode.updateAbsoluteRect(rect, within: size)
+                        }
+
+                        var shapes: [ShimmerEffectNode.Shape] = []
+
+                        let titleLineWidth: CGFloat = (shimmeringIndex % 2 == 0) ? 120.0 : 80.0
+                        let lineDiameter: CGFloat = 8.0
+
+                        let titleFrame = strongSelf.titleNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter))
+
+                        shimmerNode.update(backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor, foregroundColor: item.presentationData.theme.list.mediaPlaceholderColor, shimmeringColor: item.presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: contentSize)
+                    } else if let shimmerNode = strongSelf.placeholderNode {
+                        strongSelf.placeholderNode = nil
+                        shimmerNode.removeFromSupernode()
+                    }
                 }
             })
         }
diff --git a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
index 717b8c2b51..ca15e82aa4 100644
--- a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
+++ b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
@@ -111,7 +111,7 @@ public class ItemListInfoItem: InfoListItem, ItemListItem {
     }
 }
 
-class InfoItemNode: ListViewItemNode {
+public class InfoItemNode: ListViewItemNode {
     private let backgroundNode: ASDisplayNode
     private let topStripeNode: ASDisplayNode
     private let bottomStripeNode: ASDisplayNode
@@ -128,7 +128,7 @@ class InfoItemNode: ListViewItemNode {
     
     private var item: InfoListItem?
     
-    override var canBeSelected: Bool {
+    public override var canBeSelected: Bool {
         return false
     }
     
@@ -178,7 +178,7 @@ class InfoItemNode: ListViewItemNode {
         self.closeButton.addTarget(self, action: #selector(self.closeButtonPressed), forControlEvents: .touchUpInside)
     }
     
-    override func didLoad() {
+    public override func didLoad() {
         super.didLoad()
         
         let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:)))
@@ -204,12 +204,12 @@ class InfoItemNode: ListViewItemNode {
         let currentItem = self.item
         
         return { item, params, neighbors in
-            let leftInset: CGFloat = 15.0 + params.leftInset
-            let rightInset: CGFloat = 15.0 + params.rightInset
+            let leftInset: CGFloat = 16.0 + params.leftInset
+            let rightInset: CGFloat = 16.0 + params.rightInset
             
-            let titleFont = Font.semibold(item.presentationData.fontSize.itemListBaseFontSize)
-            let textFont = Font.regular(item.presentationData.fontSize.itemListBaseHeaderFontSize)
-            let textBoldFont = Font.semibold(item.presentationData.fontSize.itemListBaseHeaderFontSize)
+            let titleFont = Font.medium(item.presentationData.fontSize.itemListBaseFontSize)
+            let textFont = Font.regular(item.presentationData.fontSize.itemListBaseLabelFontSize / 14.0 * 16.0)
+            let textBoldFont = Font.semibold(item.presentationData.fontSize.itemListBaseLabelFontSize / 14.0 * 16.0)
             let badgeFont = Font.regular(15.0)
     
             var updatedTheme: PresentationTheme?
@@ -217,7 +217,7 @@ class InfoItemNode: ListViewItemNode {
             
             var updatedCloseIcon: UIImage?
             
-            let badgeDiameter: CGFloat = 20.0
+            let badgeDiameter: CGFloat = 22.0
             if currentItem?.presentationData.theme !== item.presentationData.theme {
                 updatedTheme = item.presentationData.theme
                 updatedBadgeImage = generateStretchableFilledCircleImage(diameter: badgeDiameter, color: item.presentationData.theme.list.itemDestructiveColor)
@@ -254,11 +254,11 @@ class InfoItemNode: ListViewItemNode {
                 }))
             }
             
-            let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "!", font: badgeFont, textColor: item.presentationData.theme.list.itemCheckColors.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: badgeDiameter, height: badgeDiameter), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: "!", font: badgeFont, textColor: item.presentationData.theme.list.itemCheckColors.foregroundColor), backgroundColor: nil, maximumNumberOfLines: 3, truncationType: .end, constrainedSize: CGSize(width: badgeDiameter, height: badgeDiameter), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 2, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - rightInset - badgeDiameter - 8.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
-            let contentSize = CGSize(width: params.width, height: titleLayout.size.height + textLayout.size.height + 36.0)
+            let contentSize = CGSize(width: params.width, height: titleLayout.size.height + textLayout.size.height + 38.0)
             let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
             
             return (layout, { [weak self] in
@@ -338,11 +338,11 @@ class InfoItemNode: ListViewItemNode {
                         strongSelf.closeButton.setImage(updatedCloseIcon, for: [])
                     }
                     
-                    strongSelf.badgeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 15.0 + floor((titleLayout.size.height - badgeDiameter) / 2.0)), size: CGSize(width: badgeDiameter, height: badgeDiameter))
+                    strongSelf.badgeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 15.0), size: CGSize(width: badgeDiameter, height: badgeDiameter))
                     
-                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: strongSelf.badgeNode.frame.midX - labelLayout.size.width / 2.0, y: strongSelf.badgeNode.frame.minY + 1.0), size: labelLayout.size)
+                    strongSelf.labelNode.frame = CGRect(origin: CGPoint(x: strongSelf.badgeNode.frame.midX - labelLayout.size.width / 2.0, y: strongSelf.badgeNode.frame.minY + 2.0 + UIScreenPixel), size: labelLayout.size)
                     
-                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: strongSelf.badgeNode.frame.maxX + 8.0, y: 15.0), size: titleLayout.size)
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: strongSelf.badgeNode.frame.maxX + 8.0, y: 16.0), size: titleLayout.size)
                     
                     strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftInset, y: strongSelf.titleNode.frame.maxY + 9.0), size: textLayout.size)
                     
@@ -352,15 +352,15 @@ class InfoItemNode: ListViewItemNode {
         }
     }
 
-    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+    public override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
     }
     
-    override func animateAdded(_ currentTimestamp: Double, duration: Double) {
+    public override func animateAdded(_ currentTimestamp: Double, duration: Double) {
         self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
     }
     
-    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+    public override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
     }
     
diff --git a/submodules/ItemListVenueItem/BUILD b/submodules/ItemListVenueItem/BUILD
index f80b0d9376..7ca5b05b58 100644
--- a/submodules/ItemListVenueItem/BUILD
+++ b/submodules/ItemListVenueItem/BUILD
@@ -18,6 +18,7 @@ swift_library(
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
         "//submodules/PresentationDataUtils:PresentationDataUtils",
         "//submodules/LocationResources:LocationResources",
+        "//submodules/ShimmerEffect:ShimmerEffect",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift
index e4f4921b56..9b4765bbdd 100644
--- a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift
+++ b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift
@@ -9,11 +9,12 @@ import SyncCore
 import TelegramPresentationData
 import ItemListUI
 import LocationResources
+import ShimmerEffect
 
 public final class ItemListVenueItem: ListViewItem, ItemListItem {
     let presentationData: ItemListPresentationData
     let account: Account
-    let venue: TelegramMediaMap
+    let venue: TelegramMediaMap?
     let title: String?
     let subtitle: String?
     let style: ItemListStyle
@@ -23,7 +24,7 @@ public final class ItemListVenueItem: ListViewItem, ItemListItem {
     public let sectionId: ItemListSectionId
     let header: ListViewItemHeader?
     
-    public init(presentationData: ItemListPresentationData, account: Account, venue: TelegramMediaMap, title: String? = nil, subtitle: String? = nil, sectionId: ItemListSectionId = 0, style: ItemListStyle, action: (() -> Void)?, infoAction: (() -> Void)? = nil, header: ListViewItemHeader? = nil) {
+    public init(presentationData: ItemListPresentationData, account: Account, venue: TelegramMediaMap?, title: String? = nil, subtitle: String? = nil, sectionId: ItemListSectionId = 0, style: ItemListStyle, action: (() -> Void)?, infoAction: (() -> Void)? = nil, header: ListViewItemHeader? = nil) {
         self.presentationData = presentationData
         self.account = account
         self.venue = venue
@@ -117,6 +118,9 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
     private let addressNode: TextNode
     private let infoButton: HighlightableButtonNode
     
+    private var placeholderNode: ShimmerEffectNode?
+    private var absoluteLocation: (CGRect, CGSize)?
+    
     private var item: ItemListVenueItem?
     private var layoutParams: (ItemListVenueItem, ListViewItemLayoutParams, ItemListNeighbors, Bool, Bool)?
     
@@ -170,6 +174,15 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
         self.infoButton.addTarget(self, action: #selector(self.infoPressed), forControlEvents: .touchUpInside)
     }
     
+    override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y += self.insets.top
+        self.absoluteLocation = (rect, containerSize)
+        if let shimmerNode = self.placeholderNode {
+            shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+        }
+    }
+    
     public func asyncLayout() -> (_ item: ItemListVenueItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors, _ firstWithHeader: Bool, _ last: Bool) -> (ListViewItemNodeLayout, () -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
         let makeAddressLayout = TextNode.asyncLayout(self.addressNode)
@@ -188,27 +201,27 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
                 updatedTheme = item.presentationData.theme
             }
         
-            let venueType = item.venue.venue?.type ?? ""
-            if currentItem?.venue.venue?.type != venueType {
+            let venueType = item.venue?.venue?.type ?? ""
+            if currentItem?.venue?.venue?.type != venueType {
                 updatedVenueType = venueType
             }
         
             let title: String
-            if let venueTitle = item.venue.venue?.title {
+            if let venueTitle = item.venue?.venue?.title {
                 title = venueTitle
             } else if let customTitle = item.title {
                 title = customTitle
             } else {
-                title = ""
+                title = " "
             }
             
             let subtitle: String
-            if let address = item.venue.venue?.address {
+            if let address = item.venue?.venue?.address {
                 subtitle = address
             } else if let customSubtitle = item.subtitle {
                 subtitle = customSubtitle
             } else {
-                subtitle = ""
+                subtitle = " "
             }
             
             let titleAttributedString = NSAttributedString(string: title, font: titleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor)
@@ -350,6 +363,45 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
                     strongSelf.infoButton.isHidden = item.infoAction == nil
                     
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: contentSize.height + UIScreenPixel + UIScreenPixel))
+                    
+                    if item.venue == nil {
+                        let shimmerNode: ShimmerEffectNode
+                        if let current = strongSelf.placeholderNode {
+                            shimmerNode = current
+                        } else {
+                            shimmerNode = ShimmerEffectNode()
+                            strongSelf.placeholderNode = shimmerNode
+                            if strongSelf.bottomStripeNode.supernode != nil {
+                                strongSelf.insertSubnode(shimmerNode, belowSubnode: strongSelf.bottomStripeNode)
+                            } else {
+                                strongSelf.addSubnode(shimmerNode)
+                            }
+                        }
+                        shimmerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
+                        if let (rect, size) = strongSelf.absoluteLocation {
+                            shimmerNode.updateAbsoluteRect(rect, within: size)
+                        }
+                        
+                        var shapes: [ShimmerEffectNode.Shape] = []
+                        
+                        let titleLineWidth: CGFloat = 180.0
+                        let subtitleLineWidth: CGFloat = 90.0
+                        let lineDiameter: CGFloat = 10.0
+                        
+                        let iconFrame = strongSelf.iconNode.frame
+                        shapes.append(.circle(iconFrame))
+                        
+                        let titleFrame = strongSelf.titleNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter))
+                        
+                        let subtitleFrame = strongSelf.addressNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: subtitleFrame.minX, y: subtitleFrame.minY + floor((subtitleFrame.height - lineDiameter) / 2.0)), width: subtitleLineWidth, diameter: lineDiameter))
+                        
+                        shimmerNode.update(backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor, foregroundColor: item.presentationData.theme.list.mediaPlaceholderColor, shimmeringColor: item.presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: layout.contentSize)
+                    } else if let shimmerNode = strongSelf.placeholderNode {
+                        strongSelf.placeholderNode = nil
+                        shimmerNode.removeFromSupernode()
+                    }
                 }
             })
         }
@@ -405,7 +457,11 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
         self.item?.infoAction?()
     }
     
-    override public func header() -> ListViewItemHeader? {
-        return self.item?.header
+    override public func headers() -> [ListViewItemHeader]? {
+        if let item = self.item {
+            return item.header.flatMap { [$0] }
+        } else {
+            return nil
+        }
     }
 }
diff --git a/submodules/JoinLinkPreviewUI/BUILD b/submodules/JoinLinkPreviewUI/BUILD
index cb02124a89..a7fb398ee0 100644
--- a/submodules/JoinLinkPreviewUI/BUILD
+++ b/submodules/JoinLinkPreviewUI/BUILD
@@ -20,6 +20,7 @@ swift_library(
         "//submodules/ShareController:ShareController",
         "//submodules/SelectablePeerNode:SelectablePeerNode",
         "//submodules/PeerInfoUI:PeerInfoUI",
+        "//submodules/UndoUI:UndoUI",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewController.swift b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewController.swift
index 4701e24a22..d7cbb6817b 100644
--- a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewController.swift
+++ b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewController.swift
@@ -11,6 +11,7 @@ import AccountContext
 import AlertUI
 import PresentationDataUtils
 import PeerInfoUI
+import UndoUI
 
 public final class JoinLinkPreviewController: ViewController {
     private var controllerNode: JoinLinkPreviewControllerNode {
@@ -69,7 +70,7 @@ public final class JoinLinkPreviewController: ViewController {
         if let resolvedState = self.resolvedState {
             signal = .single(resolvedState)
         } else {
-            signal = joinLinkInformation(self.link, account: self.context.account)
+            signal = self.context.engine.peers.joinLinkInformation(self.link)
         }
         
         self.disposable.set((signal
@@ -87,7 +88,8 @@ public final class JoinLinkPreviewController: ViewController {
                         strongSelf.navigateToPeer(peerId, ChatPeekTimeout(deadline: deadline, linkData: strongSelf.link))
                         strongSelf.dismiss()
                     case .invalidHash:
-                        strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.InviteLinks_InviteLinkExpired, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .linkRevoked(text: presentationData.strings.InviteLinks_InviteLinkExpired), elevatedLayout: true, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
                         strongSelf.dismiss()
                 }
             }
@@ -115,11 +117,11 @@ public final class JoinLinkPreviewController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func join() {
-        self.disposable.set((joinChatInteractively(with: self.link, account: self.context.account) |> deliverOnMainQueue).start(next: { [weak self] peerId in
+        self.disposable.set((self.context.engine.peers.joinChatInteractively(with: self.link) |> deliverOnMainQueue).start(next: { [weak self] peerId in
             if let strongSelf = self {
                 if let peerId = peerId {
                     strongSelf.navigateToPeer(peerId, nil)
diff --git a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift
index 3937a380fd..0d95a46cb5 100644
--- a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift
+++ b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift
@@ -63,7 +63,7 @@ final class JoinLinkPreviewPeerContentNode: ASDisplayNode, ShareContentContainer
         
         super.init()
         
-        let peer = TelegramGroup(id: PeerId(namespace: 0, id: 0), title: title, photo: image.flatMap { [$0] } ?? [], participantCount: Int(memberCount), role: .member, membership: .Left, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
+        let peer = TelegramGroup(id: PeerId(0), title: title, photo: image.flatMap { [$0] } ?? [], participantCount: Int(memberCount), role: .member, membership: .Left, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
         
         self.addSubnode(self.avatarNode)
         self.avatarNode.setPeer(context: context, theme: theme, peer: peer, emptyColor: theme.list.mediaPlaceholderColor)
diff --git a/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewController.swift b/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewController.swift
index 82c76ccd0c..56d168908f 100644
--- a/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewController.swift
+++ b/submodules/LanguageLinkPreviewUI/Sources/LanguageLinkPreviewController.swift
@@ -65,7 +65,7 @@ public final class LanguageLinkPreviewController: ViewController {
         }
         self.displayNodeDidLoad()
         
-        self.disposable.set((requestLocalizationPreview(network: self.context.account.network, identifier: self.identifier)
+        self.disposable.set((self.context.engine.localization.requestLocalizationPreview(identifier: self.identifier)
         |> deliverOnMainQueue).start(next: { [weak self] result in
             guard let strongSelf = self else {
                 return
@@ -107,7 +107,7 @@ public final class LanguageLinkPreviewController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func activate() {
@@ -115,7 +115,7 @@ public final class LanguageLinkPreviewController: ViewController {
             return
         }
         self.controllerNode.setInProgress(true)
-        self.disposable.set((downloadAndApplyLocalization(accountManager: self.context.sharedContext.accountManager, postbox: self.context.account.postbox, network: self.context.account.network, languageCode: localizationInfo.languageCode)
+        self.disposable.set((self.context.engine.localization.downloadAndApplyLocalization(accountManager: self.context.sharedContext.accountManager, languageCode: localizationInfo.languageCode)
         |> deliverOnMainQueue).start(error: { [weak self] _ in
             guard let strongSelf = self else {
                 return
diff --git a/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionController.swift b/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionController.swift
index bdde36d467..0635c5b176 100644
--- a/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionController.swift
+++ b/submodules/LanguageSuggestionUI/Sources/LanguageSuggestionController.swift
@@ -353,7 +353,7 @@ public func languageSuggestionController(context: AccountContext, suggestedLocal
             dismissImpl?(true)
         } else {
             startActivity()
-            disposable.set((downloadAndApplyLocalization(accountManager: context.sharedContext.accountManager, postbox: context.account.postbox, network: context.account.network, languageCode: languageCode)
+            disposable.set((context.engine.localization.downloadAndApplyLocalization(accountManager: context.sharedContext.accountManager, languageCode: languageCode)
             |> deliverOnMainQueue).start(completed: {
                 dismissImpl?(true)
             }))
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h
index f837bd957e..0ad1e8080e 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h
@@ -46,8 +46,6 @@
 
 - (instancetype)initWithKeyCommandController:(TGKeyCommandController *)keyCommandController;
 
-+ (void)addTextViewMethods;
-
 - (void)textViewEnsureSelectionVisible;
 
 @end
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h
index 68cebadbfa..5770ecd099 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h
@@ -26,14 +26,10 @@ typedef enum {
 
 @protocol LegacyComponentsAccessChecker <NSObject>
 
-- (bool)checkAddressBookAuthorizationStatusWithAlertDismissComlpetion:(void (^)(void))alertDismissCompletion;
-
 - (bool)checkPhotoAuthorizationStatusForIntent:(TGPhotoAccessIntent)intent alertDismissCompletion:(void (^)(void))alertDismissCompletion;
 
 - (bool)checkMicrophoneAuthorizationStatusForIntent:(TGMicrophoneAccessIntent)intent alertDismissCompletion:(void (^)(void))alertDismissCompletion;
 
-- (bool)checkCameraAuthorizationStatusForIntent:(TGCameraAccessIntent)intent alertDismissCompletion:(void (^)(void))alertDismissCompletion;
-
-- (bool)checkLocationAuthorizationStatusForIntent:(TGLocationAccessIntent)intent alertDismissComlpetion:(void (^)(void))alertDismissCompletion;
+- (bool)checkCameraAuthorizationStatusForIntent:(TGCameraAccessIntent)intent completion:(void (^)(BOOL))completion alertDismissCompletion:(void (^)(void))alertDismissCompletion;
 
 @end
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h
index ee8dcc1e23..eaa49d13ee 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h
@@ -29,6 +29,8 @@ typedef enum {
 
 @protocol LegacyComponentsGlobalsProvider <NSObject>
 
+- (void)makeViewDisableInteractiveKeyboardGestureRecognizer:(UIView *)view;
+
 - (TGLocalization *)effectiveLocalization;
 - (void)log:(NSString *)string;
 - (NSArray<UIWindow *> *)applicationWindows;
@@ -73,6 +75,7 @@ typedef enum {
 
 - (TGNavigationBarPallete *)navigationBarPallete;
 - (TGMenuSheetPallete *)menuSheetPallete;
+- (TGMenuSheetPallete *)darkMenuSheetPallete;
 - (TGMediaAssetsPallete *)mediaAssetsPallete;
 - (TGCheckButtonPallete *)checkButtonPallete;
 
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h
index 9346362f3d..ed3b3f3ae3 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h
@@ -43,7 +43,7 @@
 @property (nonatomic, assign) bool openEditor;
 
 @property (nonatomic, copy) void (^cameraPressed)(TGAttachmentCameraView *cameraView);
-@property (nonatomic, copy) void (^sendPressed)(TGMediaAsset *currentItem, bool asFiles, bool silentPosting, int32_t scheduleTime);
+@property (nonatomic, copy) void (^sendPressed)(TGMediaAsset *currentItem, bool asFiles, bool silentPosting, int32_t scheduleTime, bool isFromPicker);
 @property (nonatomic, copy) void (^avatarCompletionBlock)(UIImage *image);
 @property (nonatomic, copy) void (^avatarVideoCompletionBlock)(UIImage *image, AVAsset *asset, TGVideoEditAdjustments *adjustments);
 
@@ -62,4 +62,6 @@
 
 - (instancetype)initWithContext:(id<LegacyComponentsContext>)context camera:(bool)hasCamera selfPortrait:(bool)selfPortrait forProfilePhoto:(bool)forProfilePhoto assetType:(TGMediaAssetType)assetType saveEditedPhotos:(bool)saveEditedPhotos allowGrouping:(bool)allowGrouping allowSelection:(bool)allowSelection allowEditing:(bool)allowEditing document:(bool)document selectionLimit:(int)selectionLimit;
 
+- (UIView *)getItemSnapshot:(NSString *)uniqueId;
+
 @end
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h
index e12bf35732..916a57346c 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h
@@ -30,16 +30,9 @@ typedef enum {
 + (void)setSecondaryAnimationDurationFactor:(float)factor;
 + (void)setForceSystemCurve:(bool)forceSystemCurve;
 
-+ (CGFloat)applicationStatusBarOffset;
-+ (void)setApplicationStatusBarOffset:(CGFloat)offset;
-+ (void)animateApplicationStatusBarStyleTransitionWithDuration:(NSTimeInterval)duration;
-+ (CGFloat)statusBarHeightForOrientation:(UIInterfaceOrientation)orientation;
-
 + (bool)isKeyboardVisible;
-+ (CGFloat)keyboardHeightForOrientation:(UIInterfaceOrientation)orientation;
-+ (void)applyCurrentKeyboardAutocorrectionVariant;
++ (void)applyCurrentKeyboardAutocorrectionVariant:(UITextView *)textView;
 + (UIWindow *)applicationKeyboardWindow;
-+ (UIView *)applicationKeyboardView;
 + (void)setApplicationKeyboardOffset:(CGFloat)offset;
 
 + (void)forcePerformWithAnimation:(dispatch_block_t)block;
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h
index 9f16354018..5d94419416 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h
@@ -74,7 +74,7 @@ typedef enum
 
 @property (nonatomic, strong) NSString *recipientName;
 
-@property (nonatomic, copy) NSDictionary *(^descriptionGenerator)(id, NSString *, NSArray *, NSString *);
+@property (nonatomic, copy) NSDictionary *(^descriptionGenerator)(id, NSString *, NSArray *, NSString *, NSString *);
 @property (nonatomic, copy) void (^avatarCompletionBlock)(UIImage *image);
 @property (nonatomic, copy) void (^completionBlock)(NSArray *signals, bool silentPosting, int32_t scheduleTime);
 @property (nonatomic, copy) void (^avatarVideoCompletionBlock)(UIImage *image, AVAsset *asset, TGVideoEditAdjustments *adjustments);
@@ -92,7 +92,7 @@ typedef enum
 
 - (UIBarButtonItem *)rightBarButtonItem;
 
-- (NSArray *)resultSignalsWithCurrentItem:(TGMediaAsset *)currentItem descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *))descriptionGenerator;
+- (NSArray *)resultSignalsWithCurrentItem:(TGMediaAsset *)currentItem descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *, NSString *))descriptionGenerator;
 
 - (void)completeWithAvatarImage:(UIImage *)image;
 - (void)completeWithAvatarVideo:(AVAsset *)asset adjustments:(TGVideoEditAdjustments *)adjustments image:(UIImage *)image;
@@ -105,6 +105,6 @@ typedef enum
 
 + (TGMediaAssetType)assetTypeForIntent:(TGMediaAssetsControllerIntent)intent;
 
-+ (NSArray *)resultSignalsForSelectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext intent:(TGMediaAssetsControllerIntent)intent currentItem:(TGMediaAsset *)currentItem storeAssets:(bool)storeAssets useMediaCache:(bool)useMediaCache descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *))descriptionGenerator saveEditedPhotos:(bool)saveEditedPhotos;
++ (NSArray *)resultSignalsForSelectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext intent:(TGMediaAssetsControllerIntent)intent currentItem:(TGMediaAsset *)currentItem storeAssets:(bool)storeAssets useMediaCache:(bool)useMediaCache descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *, NSString *))descriptionGenerator saveEditedPhotos:(bool)saveEditedPhotos;
 
 @end
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h
index 158da0dcee..d4273ef481 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h
@@ -13,6 +13,8 @@ typedef void (^TGMediaAvatarPresentImpl)(id<LegacyComponentsContext>, void (^)(U
 
 @interface TGMediaAvatarMenuMixin : NSObject
 
+@property (nonatomic, assign) bool forceDark;
+
 @property (nonatomic, copy) void (^didFinishWithImage)(UIImage *image);
 @property (nonatomic, copy) void (^didFinishWithVideo)(UIImage *image, AVAsset *asset, TGVideoEditAdjustments *adjustments);
 @property (nonatomic, copy) void (^didFinishWithDelete)(void);
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h
index 38ea38aeb8..0aad93b6da 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h
@@ -34,6 +34,8 @@
 @property (nonatomic, assign) bool dismissesByOutsideTap;
 @property (nonatomic, assign) bool hasSwipeGesture;
 
+@property (nonatomic, assign) bool forceDark;
+
 @property (nonatomic, assign) bool followsKeyboard;
 
 @property (nonatomic, assign) bool ignoreNextDismissal;
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h
index 514aad3bda..319a69076e 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h
@@ -35,6 +35,7 @@
 @property (nonatomic, strong) UIImage *knobImage;
 @property (nonatomic, readonly) UIImageView *knobView;
 
+@property (nonatomic, assign) bool disableSnapToPositions;
 @property (nonatomic, assign) NSInteger positionsCount;
 @property (nonatomic, assign) CGFloat dotSize;
 
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h
index 73b0488a07..1a522e7eb0 100644
--- a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h
@@ -36,7 +36,7 @@
 - (CGRect)frameForSendButton;
 
 - (void)complete;
-- (void)dismiss;
+- (void)dismiss:(bool)cancelled;
 - (bool)stop;
 
 + (void)clearStartImage;
@@ -44,4 +44,7 @@
 + (void)requestCameraAccess:(void (^)(bool granted, bool wasNotDetermined))resultBlock;
 + (void)requestMicrophoneAccess:(void (^)(bool granted, bool wasNotDetermined))resultBlock;
 
+- (UIView *)extractVideoContent;
+- (void)hideVideoContent;
+
 @end
diff --git a/submodules/LegacyComponents/Sources/HPGrowingTextView.m b/submodules/LegacyComponents/Sources/HPGrowingTextView.m
index c31e3cbc5e..99e53f2370 100644
--- a/submodules/LegacyComponents/Sources/HPGrowingTextView.m
+++ b/submodules/LegacyComponents/Sources/HPGrowingTextView.m
@@ -63,12 +63,6 @@ NSString *TGMentionBoldAttributeName = @"TGMentionBoldAttributeName";
 
 - (void)commonInitialiser
 {
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        [HPTextViewInternal addTextViewMethods];
-    });
-    
     CGRect frame = self.frame;
     frame.origin = CGPointZero;
     _internalTextView = [[HPTextViewInternal alloc] initWithKeyCommandController:_keyCommandController];
diff --git a/submodules/LegacyComponents/Sources/HPTextViewInternal.m b/submodules/LegacyComponents/Sources/HPTextViewInternal.m
index 7515e8a770..a7a02ae7bd 100644
--- a/submodules/LegacyComponents/Sources/HPTextViewInternal.m
+++ b/submodules/LegacyComponents/Sources/HPTextViewInternal.m
@@ -29,15 +29,6 @@
     return self;
 }
 
-+ (void)addTextViewMethods
-{
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        InjectInstanceMethodFromAnotherClass([HPTextViewInternal class], [HPTextViewInternal class], @selector(textViewAdjustScrollRange:animated:), NSSelectorFromString(TGEncodeText(@"`tdspmmSbohfUpWjtjcmf;bojnbufe;", -1)));
-    });
-}
-
 - (void)setText:(NSString *)text
 {
     BOOL originalValue = self.scrollEnabled;
@@ -64,25 +55,6 @@
     [super setScrollEnabled:isScrollable];
 }
 
-- (void)textViewAdjustScrollRange:(NSRange)range animated:(BOOL)animated
-{
-    static SEL selector = NULL;
-    static void (*impl)(id, SEL, NSRange, BOOL) = NULL;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        Method method = class_getInstanceMethod([UITextView class], selector);
-        if (method != NULL)
-            impl = (void (*)(id, SEL, NSRange, BOOL))method_getImplementation(method);
-    });
-    
-    animated = false;
-    
-    if (impl != NULL)
-        impl(self, selector, range, animated);
-}
-
 - (void)scrollRectToVisible:(CGRect)__unused rect animated:(BOOL)__unused animated
 {
     
diff --git a/submodules/LegacyComponents/Sources/LegacyComponentsInternal.h b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.h
index 0fac5b8aa4..7feaa28fb6 100644
--- a/submodules/LegacyComponents/Sources/LegacyComponentsInternal.h
+++ b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.h
@@ -14,8 +14,6 @@ void TGLegacyLog(NSString *format, ...);
 int iosMajorVersion();
 int iosMinorVersion();
     
-NSString *TGEncodeText(NSString *string, int key);
-    
 void TGDispatchOnMainThread(dispatch_block_t block);
 void TGDispatchAfter(double delay, dispatch_queue_t queue, dispatch_block_t block);
     
diff --git a/submodules/LegacyComponents/Sources/LegacyComponentsInternal.m b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.m
index 494622075b..a79b0e7f37 100644
--- a/submodules/LegacyComponents/Sources/LegacyComponentsInternal.m
+++ b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.m
@@ -70,20 +70,6 @@ int iosMinorVersion()
     return version;
 }
 
-NSString *TGEncodeText(NSString *string, int key)
-{
-    NSMutableString *result = [[NSMutableString alloc] init];
-    
-    for (int i = 0; i < (int)[string length]; i++)
-    {
-        unichar c = [string characterAtIndex:i];
-        c += key;
-        [result appendString:[NSString stringWithCharacters:&c length:1]];
-    }
-    
-    return result;
-}
-
 int deviceMemorySize()
 {
     static int memorySize = 0;
diff --git a/submodules/LegacyComponents/Sources/PGVideoMovie.m b/submodules/LegacyComponents/Sources/PGVideoMovie.m
index 0d781fbbde..274ec0605c 100755
--- a/submodules/LegacyComponents/Sources/PGVideoMovie.m
+++ b/submodules/LegacyComponents/Sources/PGVideoMovie.m
@@ -1,5 +1,6 @@
 #import "PGVideoMovie.h"
 #import "GPUImageFilter.h"
+#import "LegacyComponentsInternal.h"
 
 GLfloat kColorConversion601Default[] = {
     1.164,  1.164, 1.164,
@@ -226,7 +227,20 @@ NSString *const kYUVVideoRangeConversionForLAFragmentShaderString = SHADER_STRIN
         else {
             [pixBuffAttributes setObject:@(kCVPixelFormatType_32BGRA) forKey:(id)kCVPixelBufferPixelFormatTypeKey];
         }
-        playerItemOutput = [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:pixBuffAttributes];
+        if (iosMajorVersion() >= 10) {
+            NSDictionary *hdVideoProperties = @
+            {
+            AVVideoColorPrimariesKey: AVVideoColorPrimaries_ITU_R_709_2,
+            AVVideoTransferFunctionKey: AVVideoTransferFunction_ITU_R_709_2,
+            AVVideoYCbCrMatrixKey: AVVideoYCbCrMatrix_ITU_R_709_2,
+            };
+            [pixBuffAttributes setObject:hdVideoProperties forKey:AVVideoColorPropertiesKey];
+            playerItemOutput = [[AVPlayerItemVideoOutput alloc] initWithOutputSettings:pixBuffAttributes];
+            
+            
+        } else {
+            playerItemOutput = [[AVPlayerItemVideoOutput alloc] initWithPixelBufferAttributes:pixBuffAttributes];
+        }
         [playerItemOutput setDelegate:self queue:videoProcessingQueue];
 
         [_playerItem addOutput:playerItemOutput];
diff --git a/submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m b/submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m
index 3aa9bcda19..cc036da905 100644
--- a/submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m
+++ b/submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m
@@ -270,7 +270,7 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500;
             {
                 if (strongSelf->_selectionContext.allowGrouping)
                     [[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
-                strongSelf.sendPressed(nil, false, false, 0);
+                strongSelf.sendPressed(nil, false, false, 0, false);
             }
         }];
         [_sendMediaItemView setHidden:true animated:false];
@@ -282,7 +282,7 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500;
             {
                 __strong TGAttachmentCarouselItemView *strongSelf = weakSelf;
                 if (strongSelf != nil && strongSelf.sendPressed != nil)
-                    strongSelf.sendPressed(nil, true, false, 0);
+                    strongSelf.sendPressed(nil, true, false, 0, false);
             }];
             _sendFileItemView.requiresDivider = false;
             [_sendFileItemView setHidden:true animated:false];
@@ -346,6 +346,21 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500;
     [_itemsSizeChangedDisposable dispose];
 }
 
+- (UIView *)getItemSnapshot:(NSString *)uniqueId {
+    for (UIView *cell in _collectionView.visibleCells) {
+        if ([cell isKindOfClass:[TGAttachmentAssetCell class]]) {
+            TGAttachmentAssetCell *assetCell = (TGAttachmentAssetCell *)cell;
+            if (assetCell.asset.identifier != nil && [assetCell.asset.identifier isEqualToString:uniqueId]) {
+                UIView *snapshotView = [assetCell snapshotViewAfterScreenUpdates:false];
+                snapshotView.frame = [assetCell convertRect:assetCell.bounds toView:nil];
+                assetCell.alpha = 0.01f;
+                return snapshotView;
+            }
+        }
+    }
+    return nil;
+}
+
 - (void)setPallete:(TGMenuSheetPallete *)pallete
 {
     _pallete = pallete;
@@ -792,7 +807,7 @@ const NSUInteger TGAttachmentDisplayedAssetLimit = 500;
         {
             if (strongSelf->_selectionContext.allowGrouping)
                 [[NSUserDefaults standardUserDefaults] setObject:@(!strongSelf->_selectionContext.grouping) forKey:@"TG_mediaGroupingDisabled_v0"];
-            strongSelf.sendPressed(item.asset, strongSelf.asFile, silentPosting, scheduleTime);
+            strongSelf.sendPressed(item.asset, strongSelf.asFile, silentPosting, scheduleTime, true);
         }
     };
     
diff --git a/submodules/LegacyComponents/Sources/TGGradientLabel.m b/submodules/LegacyComponents/Sources/TGGradientLabel.m
index 317e9111ac..ca5f4212dd 100644
--- a/submodules/LegacyComponents/Sources/TGGradientLabel.m
+++ b/submodules/LegacyComponents/Sources/TGGradientLabel.m
@@ -113,7 +113,7 @@
         
         _offscreenContextWidth = offscreenWidth;
         _offscreenContextHeight = offscreenHeight;
-        _offscreenContextStride = ((4 * _offscreenContextWidth + 15) & (~15));
+        _offscreenContextStride = ((4 * _offscreenContextWidth + 31) & (~31));
         _offscreenMemory = malloc(_offscreenContextStride * _offscreenContextHeight);
         
         CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
diff --git a/submodules/LegacyComponents/Sources/TGHacks.m b/submodules/LegacyComponents/Sources/TGHacks.m
index 0b1f88a6bc..e8211c63a8 100644
--- a/submodules/LegacyComponents/Sources/TGHacks.m
+++ b/submodules/LegacyComponents/Sources/TGHacks.m
@@ -215,209 +215,6 @@ void InjectInstanceMethodFromAnotherClass(Class toClass, Class fromClass, SEL fr
     window.alpha = alpha;
 }
 
-+ (CGFloat)applicationStatusBarOffset
-{
-    UIWindow *window = [[LegacyComponentsGlobals provider] applicationStatusBarWindow];
-    return window.bounds.origin.y;
-}
-
-+ (void)setApplicationStatusBarOffset:(CGFloat)offset {
-    UIWindow *window = [[LegacyComponentsGlobals provider] applicationStatusBarWindow];
-    CGRect bounds = window.bounds;
-    bounds.origin = CGPointMake(0.0f, -offset);
-    window.bounds = bounds;
-}
-
-static UIView *findStatusBarView()
-{
-    static Class viewClass = nil;
-    static SEL selector = NULL;
-    if (selector == NULL)
-    {
-        NSString *str1 = @"rs`str";
-        NSString *str2 = @"A`qVhmcnv";
-        
-        selector = NSSelectorFromString([[NSString alloc] initWithFormat:@"%@%@", TGEncodeText(str1, 1), TGEncodeText(str2, 1)]);
-        
-        viewClass = NSClassFromString(TGEncodeText(@"VJTubuvtCbs", -1));
-    }
-    
-    UIWindow *window = [[LegacyComponentsGlobals provider] applicationStatusBarWindow];
-    
-    for (UIView *subview in window.subviews)
-    {
-        if ([subview isKindOfClass:viewClass])
-        {
-            return subview;
-        }
-    }
-    
-    return nil;
-}
-
-+ (void)animateApplicationStatusBarAppearance:(int)statusBarAnimation duration:(NSTimeInterval)duration completion:(void (^)())completion
-{
-    [self animateApplicationStatusBarAppearance:statusBarAnimation delay:0.0 duration:duration completion:completion];
-}
-
-+ (void)animateApplicationStatusBarAppearance:(int)statusBarAnimation delay:(NSTimeInterval)delay duration:(NSTimeInterval)duration completion:(void (^)())completion
-{
-    UIView *view = findStatusBarView();
-        
-    if (view != nil)
-    {
-        if ((statusBarAnimation & TGStatusBarAppearanceAnimationSlideDown) || (statusBarAnimation & TGStatusBarAppearanceAnimationSlideUp))
-        {
-            CGPoint startPosition = view.layer.position;
-            CGPoint position = view.layer.position;
-            
-            CGPoint normalPosition = CGPointMake(CGFloor(view.frame.size.width / 2), CGFloor(view.frame.size.height / 2));
-            
-            CGFloat viewHeight = view.frame.size.height;
-            
-            if (statusBarAnimation & TGStatusBarAppearanceAnimationSlideDown)
-            {
-                startPosition = CGPointMake(CGFloor(view.frame.size.width / 2), CGFloor(view.frame.size.height / 2) - viewHeight);
-                position = CGPointMake(CGFloor(view.frame.size.width / 2), CGFloor(view.frame.size.height / 2));
-            }
-            else if (statusBarAnimation & TGStatusBarAppearanceAnimationSlideUp)
-            {
-                startPosition = CGPointMake(CGFloor(view.frame.size.width / 2), CGFloor(view.frame.size.height / 2));
-                position = CGPointMake(CGFloor(view.frame.size.width / 2), CGFloor(view.frame.size.height / 2) - viewHeight);
-            }
-            
-            CABasicAnimation *animation = [[CABasicAnimation alloc] init];
-            animation.duration = duration;
-            animation.fromValue = [NSValue valueWithCGPoint:startPosition];
-            animation.toValue = [NSValue valueWithCGPoint:position];
-            animation.removedOnCompletion = true;
-            animation.fillMode = kCAFillModeForwards;
-            animation.beginTime = delay;
-            animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-            
-            TGAnimationBlockDelegate *delegate = [[TGAnimationBlockDelegate alloc] initWithLayer:view.layer];
-            delegate.completion = ^(BOOL finished)
-            {
-                if (finished)
-                    view.layer.position = normalPosition;
-                if (completion)
-                    completion();
-            };
-            animation.delegate = delegate;
-            [view.layer addAnimation:animation forKey:@"position"];
-            
-            view.layer.position = position;
-        }
-        else if ((statusBarAnimation & TGStatusBarAppearanceAnimationFadeIn) || (statusBarAnimation & TGStatusBarAppearanceAnimationFadeOut))
-        {
-            float startOpacity = view.layer.opacity;
-            float opacity = view.layer.opacity;
-            
-            if (statusBarAnimation & TGStatusBarAppearanceAnimationFadeIn)
-            {
-                startOpacity = 0.0f;
-                opacity = 1.0f;
-            }
-            else if (statusBarAnimation & TGStatusBarAppearanceAnimationFadeOut)
-            {
-                startOpacity = 1.0f;
-                opacity = 0.0f;
-            }
-            
-            CABasicAnimation *animation = [[CABasicAnimation alloc] init];
-            animation.duration = duration;
-            animation.fromValue = @(startOpacity);
-            animation.toValue = @(opacity);
-            animation.removedOnCompletion = true;
-            animation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
-            TGAnimationBlockDelegate *delegate = [[TGAnimationBlockDelegate alloc] initWithLayer:view.layer];
-            delegate.completion = ^(__unused BOOL finished)
-            {
-                if (completion)
-                    completion();
-            };
-            animation.delegate = delegate;
-            
-            [view.layer addAnimation:animation forKey:@"opacity"];
-        }
-    }
-    else
-    {
-        if (completion)
-            completion();
-    }
-}
-
-+ (void)animateApplicationStatusBarStyleTransitionWithDuration:(NSTimeInterval)duration
-{
-    UIView *view = findStatusBarView();
-    
-    if (view != nil)
-    {
-        UIView *snapshotView = [view snapshotViewAfterScreenUpdates:false];
-        [view addSubview:snapshotView];
-        
-        [UIView animateWithDuration:duration animations:^
-        {
-            snapshotView.alpha = 0.0f;
-        } completion:^(__unused BOOL finished)
-        {
-            [snapshotView removeFromSuperview];
-        }];
-    }
-}
-
-+ (CGFloat)statusBarHeightForOrientation:(UIInterfaceOrientation)orientation
-{
-    UIWindow *window = [[LegacyComponentsGlobals provider] applicationStatusBarWindow];
-        
-    Class statusBarClass = NSClassFromString(TGEncodeText(@"VJTubuvtCbs", -1));
-    
-    for (UIView *view in window.subviews)
-    {
-        if ([view isKindOfClass:statusBarClass])
-        {
-            SEL selector = NSSelectorFromString(TGEncodeText(@"dvssfouTuzmf", -1));
-            NSMethodSignature *signature = [statusBarClass instanceMethodSignatureForSelector:selector];
-            if (signature == nil)
-            {
-                TGLegacyLog(@"***** Method not found");
-                return 20.0f;
-            }
-            
-            NSInvocation *inv = [NSInvocation invocationWithMethodSignature:signature];
-            [inv setSelector:selector];
-            [inv setTarget:view];
-            [inv invoke];
-            
-            NSInteger result = 0;
-            [inv getReturnValue:&result];
-            
-            SEL selector2 = NSSelectorFromString(TGEncodeText(@"ifjhiuGpsTuzmf;psjfoubujpo;", -1));
-            NSMethodSignature *signature2 = [statusBarClass methodSignatureForSelector:selector2];
-            if (signature2 == nil)
-            {
-                TGLegacyLog(@"***** Method not found");
-                return 20.0f;
-            }
-            NSInvocation *inv2 = [NSInvocation invocationWithMethodSignature:signature2];
-            [inv2 setSelector:selector2];
-            [inv2 setTarget:[view class]];
-            [inv2 setArgument:&result atIndex:2];
-            NSInteger argOrientation = orientation;
-            [inv2 setArgument:&argOrientation atIndex:3];
-            [inv2 invoke];
-            
-            CGFloat result2 = 0;
-            [inv2 getReturnValue:&result2];
-            
-            return result2;
-        }
-    }
-    
-    return 20.0f;
-}
-
 + (bool)isKeyboardVisible
 {
     return [self isKeyboardVisibleAlt];
@@ -445,66 +242,9 @@ static bool keyboardHidden = true;
     return !keyboardHidden;
 }
 
-+ (CGFloat)keyboardHeightForOrientation:(UIInterfaceOrientation)orientation
++ (void)applyCurrentKeyboardAutocorrectionVariant:(UITextView *)textView
 {
-    static NSInvocation *invocation = nil;
-    static Class keyboardClass = NULL;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        keyboardClass = NSClassFromString(TGEncodeText(@"VJLfzcpbse", -1));
-        
-        SEL selector = NSSelectorFromString(TGEncodeText(@"tj{fGpsJoufsgbdfPsjfoubujpo;", -1));
-        NSMethodSignature *signature = [keyboardClass methodSignatureForSelector:selector];
-        if (signature == nil)
-            TGLegacyLog(@"***** Method not found");
-        else
-        {
-            invocation = [NSInvocation invocationWithMethodSignature:signature];
-            [invocation setSelector:selector];
-        }
-    });
-
-    if (invocation != nil)
-    {
-        [invocation setTarget:[keyboardClass class]];
-        [invocation setArgument:&orientation atIndex:2];
-        [invocation invoke];
-        
-        CGSize result = CGSizeZero;
-        [invocation getReturnValue:&result];
-        
-        return MIN(result.width, result.height);
-    }
-    
-    return 0.0f;
-}
-
-+ (void)applyCurrentKeyboardAutocorrectionVariant
-{
-    static Class keyboardClass = NULL;
-    static SEL currentInstanceSelector = NULL;
-    static SEL applyVariantSelector = NULL;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        keyboardClass = NSClassFromString(TGEncodeText(@"VJLfzcpbse", -1));
-        
-        currentInstanceSelector = NSSelectorFromString(TGEncodeText(@"bdujwfLfzcpbse", -1));
-        applyVariantSelector = NSSelectorFromString(TGEncodeText(@"bddfquBvupdpssfdujpo", -1));
-    });
-    
-    if ([keyboardClass respondsToSelector:currentInstanceSelector])
-    {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-        id currentInstance = [keyboardClass performSelector:currentInstanceSelector];
-        if ([currentInstance respondsToSelector:applyVariantSelector])
-            [currentInstance performSelector:applyVariantSelector];
-#pragma clang diagnostic pop
-    }
+    [textView unmarkText];
 }
 
 + (UIWindow *)applicationKeyboardWindow
@@ -518,32 +258,6 @@ static bool keyboardHidden = true;
     keyboardWindow.frame = CGRectOffset(keyboardWindow.bounds, 0.0f, offset);
 }
 
-+ (UIView *)applicationKeyboardView
-{
-    static Class keyboardViewClass = Nil;
-    static Class keyboardViewContainerClass = Nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        keyboardViewClass = NSClassFromString(TGEncodeText(@"VJJoqvuTfuIptuWjfx", -1));
-        keyboardViewContainerClass = NSClassFromString(TGEncodeText(@"VJJoqvuTfuDpoubjofsWjfx", -1));
-    });
-    
-    for (UIView *view in [self applicationKeyboardWindow].subviews)
-    {
-        if ([view isKindOfClass:keyboardViewContainerClass])
-        {
-            for (UIView *subview in view.subviews)
-            {
-                if ([subview isKindOfClass:keyboardViewClass])
-                    return subview;
-            }
-        }
-    }
-    
-    return nil;
-}
-
 + (void)setForceMovieAnimatedScaleMode:(bool)force
 {
     forceMovieAnimatedScaleMode = force;
diff --git a/submodules/LegacyComponents/Sources/TGMediaAssetsController.m b/submodules/LegacyComponents/Sources/TGMediaAssetsController.m
index 7ab5b91ab6..37058dca22 100644
--- a/submodules/LegacyComponents/Sources/TGMediaAssetsController.m
+++ b/submodules/LegacyComponents/Sources/TGMediaAssetsController.m
@@ -444,7 +444,7 @@
             bool onlyGroupableMedia = true;
             for (TGMediaAsset *item in strongSelf->_selectionContext.selectedItems)
             {
-                TGMediaAsset *asset = asset;
+                TGMediaAsset *asset = item;
                 if ([asset isKindOfClass:[TGCameraCapturedVideo class]]) {
                     asset = [(TGCameraCapturedVideo *)item originalAsset];
                 }
@@ -578,8 +578,11 @@
     [super loadView];
     
     bool hasOnScreenNavigation = false;
-    if (iosMajorVersion() >= 11)
-        hasOnScreenNavigation = (self.viewLoaded && self.view.safeAreaInsets.bottom > FLT_EPSILON) || _context.safeAreaInset.bottom > FLT_EPSILON;
+    if (iosMajorVersion() >= 11) {
+        if (@available(iOS 11.0, *)) {
+            hasOnScreenNavigation = (self.viewLoaded && self.view.safeAreaInsets.bottom > FLT_EPSILON) || _context.safeAreaInset.bottom > FLT_EPSILON;
+        }
+    }
     
     CGFloat inset = [TGViewController safeAreaInsetForOrientation:self.interfaceOrientation hasOnScreenNavigation:hasOnScreenNavigation].bottom;
     _toolbarView = [[TGMediaPickerToolbarView alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height - TGMediaPickerToolbarHeight - inset, self.view.frame.size.width, TGMediaPickerToolbarHeight + inset)];
@@ -648,7 +651,9 @@
               return;
 
             [strongController dismissAnimated:true manual:false completion:nil];
+        if (@available(iOS 14, *)) {
             [[PHPhotoLibrary sharedPhotoLibrary] presentLimitedLibraryPickerFromViewController:strongSelf];
+        }
       }],
      [[TGMenuSheetButtonItemView alloc] initWithTitle:TGLocalized(@"Media.LimitedAccessChangeSettings") type:TGMenuSheetButtonTypeDefault fontSize:20.0 action:^
       {
@@ -725,8 +730,11 @@
         orientation = UIInterfaceOrientationLandscapeLeft;
     
     bool hasOnScreenNavigation = false;
-    if (iosMajorVersion() >= 11)
-        hasOnScreenNavigation = (self.viewLoaded && self.view.safeAreaInsets.bottom > FLT_EPSILON) || _context.safeAreaInset.bottom > FLT_EPSILON;
+    if (iosMajorVersion() >= 11) {
+        if (@available(iOS 11.0, *)) {
+            hasOnScreenNavigation = (self.viewLoaded && self.view.safeAreaInsets.bottom > FLT_EPSILON) || _context.safeAreaInset.bottom > FLT_EPSILON;
+        }
+    }
     
     _toolbarView.safeAreaInset = [TGViewController safeAreaInsetForOrientation:orientation hasOnScreenNavigation:hasOnScreenNavigation];
     _accessView.safeAreaInset = [TGViewController safeAreaInsetForOrientation:orientation hasOnScreenNavigation:hasOnScreenNavigation];
@@ -810,7 +818,7 @@
     }
 }
 
-- (NSArray *)resultSignalsWithCurrentItem:(TGMediaAsset *)currentItem descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *))descriptionGenerator
+- (NSArray *)resultSignalsWithCurrentItem:(TGMediaAsset *)currentItem descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *, NSString *))descriptionGenerator
 {
     bool storeAssets = (_editingContext != nil) && self.shouldStoreAssets;
     
@@ -827,7 +835,7 @@
     return value;
 }
 
-+ (NSArray *)resultSignalsForSelectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext intent:(TGMediaAssetsControllerIntent)intent currentItem:(TGMediaAsset *)currentItem storeAssets:(bool)storeAssets useMediaCache:(bool)__unused useMediaCache descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *))descriptionGenerator saveEditedPhotos:(bool)saveEditedPhotos
++ (NSArray *)resultSignalsForSelectionContext:(TGMediaSelectionContext *)selectionContext editingContext:(TGMediaEditingContext *)editingContext intent:(TGMediaAssetsControllerIntent)intent currentItem:(TGMediaAsset *)currentItem storeAssets:(bool)storeAssets useMediaCache:(bool)__unused useMediaCache descriptionGenerator:(id (^)(id, NSString *, NSArray *, NSString *, NSString *))descriptionGenerator saveEditedPhotos:(bool)saveEditedPhotos
 {
     NSMutableArray *signals = [[NSMutableArray alloc] init];
     NSMutableArray *selectedItems = selectionContext.selectedItems ? [selectionContext.selectedItems mutableCopy] : [[NSMutableArray alloc] init];
@@ -945,7 +953,7 @@
                         if (groupedId != nil)
                             dict[@"groupedId"] = groupedId;
                         
-                        id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                        id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                         return generatedItem;
                     }] catch:^SSignal *(id error)
                     {
@@ -971,7 +979,7 @@
                             if (groupedId != nil)
                                 dict[@"groupedId"] = groupedId;
                             
-                            id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                            id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                             return generatedItem;
                         }];
                     }]];
@@ -998,7 +1006,7 @@
                         else if (groupedId != nil && !hasAnyTimers)
                             dict[@"groupedId"] = groupedId;
                         
-                        id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                        id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                         return generatedItem;
                     }];
                     
@@ -1074,7 +1082,7 @@
                                 else if (groupedId != nil && !hasAnyTimers)
                                     dict[@"groupedId"] = groupedId;
                                 
-                                id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                                id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                                 return generatedItem;
                             }];
                         }]];
@@ -1156,7 +1164,7 @@
                             else if (groupedId != nil && !hasAnyTimers)
                                 dict[@"groupedId"] = groupedId;
                             
-                            id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                            id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                             return generatedItem;
                         }] catch:^SSignal *(__unused id error)
                         {
@@ -1197,7 +1205,7 @@
                         if (groupedId != nil)
                             dict[@"groupedId"] = groupedId;
                         
-                        id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                        id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                         return generatedItem;
                     }]];
                     
@@ -1267,7 +1275,7 @@
                         else if (groupedId != nil && !hasAnyTimers)
                             dict[@"groupedId"] = groupedId;
                         
-                        id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                        id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                         return generatedItem;
                     }]];
                     
@@ -1345,7 +1353,7 @@
                     if (timer != nil)
                         dict[@"timer"] = timer;
                     
-                    id generatedItem = descriptionGenerator(dict, caption, entities, nil);
+                    id generatedItem = descriptionGenerator(dict, caption, entities, nil, asset.identifier);
                     return generatedItem;
                 }]];
                 
@@ -1399,8 +1407,8 @@
     if (_searchController == nil)
         return;
     
-    UIView *backArrow = [self _findBackArrow:self.navigationBar];
-    UIView *backButton = [self _findBackButton:self.navigationBar parentView:self.navigationBar];
+    UIView *backArrow = nil;
+    UIView *backButton = nil;
     
     if ([viewController isKindOfClass:[TGPhotoEditorController class]])
     {
@@ -1432,50 +1440,13 @@
         _searchSnapshotView = nil;
         _searchController.view.hidden = false;
         
-        UIView *backArrow = [self _findBackArrow:self.navigationBar];
-        UIView *backButton = [self _findBackButton:self.navigationBar parentView:self.navigationBar];
+        UIView *backArrow = nil;
+        UIView *backButton = nil;
         backArrow.alpha = 1.0f;
         backButton.alpha = 1.0f;
     }
 }
 
-- (UIView *)_findBackArrow:(UIView *)view
-{
-    Class backArrowClass = NSClassFromString(TGEncodeText(@"`VJObwjhbujpoCbsCbdlJoejdbupsWjfx", -1));
-    
-    if ([view isKindOfClass:backArrowClass])
-        return view;
-    
-    for (UIView *subview in view.subviews)
-    {
-        UIView *result = [self _findBackArrow:subview];
-        if (result != nil)
-            return result;
-    }
-    
-    return nil;
-}
-
-- (UIView *)_findBackButton:(UIView *)view parentView:(UIView *)parentView
-{
-    Class backButtonClass = NSClassFromString(TGEncodeText(@"VJObwjhbujpoJufnCvuupoWjfx", -1));
-    
-    if ([view isKindOfClass:backButtonClass])
-    {
-        if (view.center.x < parentView.frame.size.width / 2.0f)
-            return view;
-    }
-    
-    for (UIView *subview in view.subviews)
-    {
-        UIView *result = [self _findBackButton:subview parentView:parentView];
-        if (result != nil)
-            return result;
-    }
-    
-    return nil;
-}
-
 #pragma mark -
 
 + (TGMediaAssetType)assetTypeForIntent:(TGMediaAssetsControllerIntent)intent
diff --git a/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m b/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
index 1169d65208..12b4f56a8a 100644
--- a/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
+++ b/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
@@ -73,7 +73,7 @@
 - (TGMenuSheetController *)_presentAvatarMenu
 {
     __weak TGMediaAvatarMenuMixin *weakSelf = self;
-    TGMenuSheetController *controller = [[TGMenuSheetController alloc] initWithContext:_context dark:false];
+    TGMenuSheetController *controller = [[TGMenuSheetController alloc] initWithContext:_context dark:self.forceDark];
     controller.dismissesByOutsideTap = true;
     controller.hasSwipeGesture = true;
     controller.didDismiss = ^(bool manual)
@@ -270,101 +270,102 @@
 
 - (void)_displayCameraWithView:(TGAttachmentCameraView *)cameraView menuController:(TGMenuSheetController *)menuController
 {
-    if (![[[LegacyComponentsGlobals provider] accessChecker] checkCameraAuthorizationStatusForIntent:TGCameraAccessIntentDefault alertDismissCompletion:nil])
-        return;
-    
-    if ([_context currentlyInSplitView])
-        return;
-        
-    TGCameraController *controller = nil;
-    CGSize screenSize = TGScreenSize();
-    
-    id<LegacyComponentsOverlayWindowManager> windowManager = [_context makeOverlayWindowManager];
-    
-    if (cameraView.previewView != nil)
-        controller = [[TGCameraController alloc] initWithContext:[windowManager context] saveEditedPhotos:_saveEditedPhotos saveCapturedMedia:_saveCapturedMedia camera:cameraView.previewView.camera previewView:cameraView.previewView intent:_signup ? TGCameraControllerSignupAvatarIntent : TGCameraControllerAvatarIntent];
-    else
-        controller = [[TGCameraController alloc] initWithContext:[windowManager context] saveEditedPhotos:_saveEditedPhotos saveCapturedMedia:_saveCapturedMedia intent:_signup ? TGCameraControllerSignupAvatarIntent : TGCameraControllerAvatarIntent];
-    controller.stickersContext = _stickersContext;
-    controller.shouldStoreCapturedAssets = true;
-    
-    TGCameraControllerWindow *controllerWindow = [[TGCameraControllerWindow alloc] initWithManager:windowManager parentController:_parentController contentController:controller];
-    controllerWindow.hidden = false;
-    controllerWindow.clipsToBounds = true;
-    
-    if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone)
-        controllerWindow.frame = CGRectMake(0, 0, screenSize.width, screenSize.height);
-    else
-        controllerWindow.frame = [_context fullscreenBounds];
-    
-    bool standalone = true;
-    CGRect startFrame = CGRectMake(0, screenSize.height, screenSize.width, screenSize.height);
-    if (cameraView != nil)
-    {
-        standalone = false;
-        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)
-            startFrame = CGRectZero;
-        else
-            startFrame = [controller.view convertRect:cameraView.previewView.frame fromView:cameraView];
-    }
-    
-    [cameraView detachPreviewView];
-    [controller beginTransitionInFromRect:startFrame];
-    
-    __weak TGMediaAvatarMenuMixin *weakSelf = self;
-    __weak TGCameraController *weakCameraController = controller;
-    __weak TGAttachmentCameraView *weakCameraView = cameraView;
-    
-    controller.beginTransitionOut = ^CGRect
-    {
-        __strong TGCameraController *strongCameraController = weakCameraController;
-        if (strongCameraController == nil)
-            return CGRectZero;
-        
-        __strong TGAttachmentCameraView *strongCameraView = weakCameraView;
-        if (strongCameraView != nil)
-        {
-            [strongCameraView willAttachPreviewView];
-            if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)
-                return CGRectZero;
+    [[[LegacyComponentsGlobals provider] accessChecker] checkCameraAuthorizationStatusForIntent:TGCameraAccessIntentDefault completion:^(BOOL allowed) {
+        if (!allowed)
+            return;
+        if ([_context currentlyInSplitView])
+            return;
             
-            return [strongCameraController.view convertRect:strongCameraView.frame fromView:strongCameraView.superview];
+        TGCameraController *controller = nil;
+        CGSize screenSize = TGScreenSize();
+        
+        id<LegacyComponentsOverlayWindowManager> windowManager = [_context makeOverlayWindowManager];
+        
+        if (cameraView.previewView != nil)
+            controller = [[TGCameraController alloc] initWithContext:[windowManager context] saveEditedPhotos:_saveEditedPhotos saveCapturedMedia:_saveCapturedMedia camera:cameraView.previewView.camera previewView:cameraView.previewView intent:_signup ? TGCameraControllerSignupAvatarIntent : TGCameraControllerAvatarIntent];
+        else
+            controller = [[TGCameraController alloc] initWithContext:[windowManager context] saveEditedPhotos:_saveEditedPhotos saveCapturedMedia:_saveCapturedMedia intent:_signup ? TGCameraControllerSignupAvatarIntent : TGCameraControllerAvatarIntent];
+        controller.stickersContext = _stickersContext;
+        controller.shouldStoreCapturedAssets = true;
+        
+        TGCameraControllerWindow *controllerWindow = [[TGCameraControllerWindow alloc] initWithManager:windowManager parentController:_parentController contentController:controller];
+        controllerWindow.hidden = false;
+        controllerWindow.clipsToBounds = true;
+        
+        if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone)
+            controllerWindow.frame = CGRectMake(0, 0, screenSize.width, screenSize.height);
+        else
+            controllerWindow.frame = [_context fullscreenBounds];
+        
+        bool standalone = true;
+        CGRect startFrame = CGRectMake(0, screenSize.height, screenSize.width, screenSize.height);
+        if (cameraView != nil)
+        {
+            standalone = false;
+            if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)
+                startFrame = CGRectZero;
+            else
+                startFrame = [controller.view convertRect:cameraView.previewView.frame fromView:cameraView];
         }
         
-        return CGRectZero;
-    };
-    
-    controller.finishedTransitionOut = ^
-    {
-        __strong TGAttachmentCameraView *strongCameraView = weakCameraView;
-        if (strongCameraView == nil)
-            return;
+        [cameraView detachPreviewView];
+        [controller beginTransitionInFromRect:startFrame];
         
-        [strongCameraView attachPreviewViewAnimated:true];
-    };
-    
-    controller.finishedWithPhoto = ^(__unused TGOverlayController *controller, UIImage *resultImage, __unused NSString *caption, __unused NSArray *entities, __unused NSArray *stickers, __unused NSNumber *timer)
-    {
-        __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
-        if (strongSelf == nil)
-            return;
+        __weak TGMediaAvatarMenuMixin *weakSelf = self;
+        __weak TGCameraController *weakCameraController = controller;
+        __weak TGAttachmentCameraView *weakCameraView = cameraView;
         
-        if (strongSelf.didFinishWithImage != nil)
-            strongSelf.didFinishWithImage(resultImage);
+        controller.beginTransitionOut = ^CGRect
+        {
+            __strong TGCameraController *strongCameraController = weakCameraController;
+            if (strongCameraController == nil)
+                return CGRectZero;
+            
+            __strong TGAttachmentCameraView *strongCameraView = weakCameraView;
+            if (strongCameraView != nil)
+            {
+                [strongCameraView willAttachPreviewView];
+                if ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPad)
+                    return CGRectZero;
+                
+                return [strongCameraController.view convertRect:strongCameraView.frame fromView:strongCameraView.superview];
+            }
+            
+            return CGRectZero;
+        };
         
-        [menuController dismissAnimated:false];
-    };
-    
-    controller.finishedWithVideo = ^(__unused TGOverlayController *controller, NSURL *url, UIImage *previewImage, __unused NSTimeInterval duration, __unused CGSize dimensions, TGVideoEditAdjustments *adjustments, __unused NSString *caption, __unused NSArray *entities, __unused NSArray *stickers, __unused NSNumber *timer){
-        __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
-        if (strongSelf == nil)
-            return;
+        controller.finishedTransitionOut = ^
+        {
+            __strong TGAttachmentCameraView *strongCameraView = weakCameraView;
+            if (strongCameraView == nil)
+                return;
+            
+            [strongCameraView attachPreviewViewAnimated:true];
+        };
         
-        if (strongSelf.didFinishWithVideo != nil)
-            strongSelf.didFinishWithVideo(previewImage, [[AVURLAsset alloc] initWithURL:url options:nil], adjustments);
+        controller.finishedWithPhoto = ^(__unused TGOverlayController *controller, UIImage *resultImage, __unused NSString *caption, __unused NSArray *entities, __unused NSArray *stickers, __unused NSNumber *timer)
+        {
+            __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
+            if (strongSelf == nil)
+                return;
+            
+            if (strongSelf.didFinishWithImage != nil)
+                strongSelf.didFinishWithImage(resultImage);
+            
+            [menuController dismissAnimated:false];
+        };
         
-        [menuController dismissAnimated:false];
-    };
+        controller.finishedWithVideo = ^(__unused TGOverlayController *controller, NSURL *url, UIImage *previewImage, __unused NSTimeInterval duration, __unused CGSize dimensions, TGVideoEditAdjustments *adjustments, __unused NSString *caption, __unused NSArray *entities, __unused NSArray *stickers, __unused NSNumber *timer){
+            __strong TGMediaAvatarMenuMixin *strongSelf = weakSelf;
+            if (strongSelf == nil)
+                return;
+            
+            if (strongSelf.didFinishWithVideo != nil)
+                strongSelf.didFinishWithVideo(previewImage, [[AVURLAsset alloc] initWithURL:url options:nil], adjustments);
+            
+            [menuController dismissAnimated:false];
+        };
+    } alertDismissCompletion:nil];
 }
 
 - (void)_displayMediaPicker
diff --git a/submodules/LegacyComponents/Sources/TGMediaEditingContext.m b/submodules/LegacyComponents/Sources/TGMediaEditingContext.m
index 97970434ef..367eeaf715 100644
--- a/submodules/LegacyComponents/Sources/TGMediaEditingContext.m
+++ b/submodules/LegacyComponents/Sources/TGMediaEditingContext.m
@@ -185,7 +185,10 @@
 
 - (void)cleanup
 {
-    [_diskCache cleanup];
+    TGModernCache *diskCache = _diskCache;
+    TGDispatchAfter(10.0, dispatch_get_main_queue(), ^{
+        [diskCache cleanup];
+    });
     
     [[NSFileManager defaultManager] removeItemAtPath:_fullSizeResultsUrl.path error:nil];
     [[NSFileManager defaultManager] removeItemAtPath:_paintingImagesUrl.path error:nil];
@@ -991,7 +994,7 @@
 
 + (NSUInteger)diskMemoryLimit
 {
-    return 64 * 1024 * 1024;
+    return 512 * 1024 * 1024;
 }
 
 + (NSUInteger)imageSoftMemoryLimit
diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m b/submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m
index 9f861df438..c253a45589 100644
--- a/submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m
+++ b/submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m
@@ -252,7 +252,7 @@ static void setViewFrame(UIView *view, CGRect frame)
     }
         
     if (_inputField.internalTextView.isFirstResponder)
-        [TGHacks applyCurrentKeyboardAutocorrectionVariant];
+        [TGHacks applyCurrentKeyboardAutocorrectionVariant:_inputField.internalTextView];
     
     NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithAttributedString:_inputField.text == nil ? [[NSAttributedString alloc] initWithString:@""] : _inputField.attributedText];
     NSMutableString *usualString = [text.string mutableCopy];
@@ -1028,13 +1028,19 @@ static void setViewFrame(UIView *view, CGRect frame)
             _associatedPanel.frame = associatedPanelFrame;
     }
     
-    UIEdgeInsets inputFieldInsets = [self _inputFieldInsets];
+    UIEdgeInsets visibleInputFieldInsets = [self _inputFieldInsets];
     if (self.isFirstResponder) {
-        inputFieldInsets.right += 41.0;
+        visibleInputFieldInsets.right += 41.0;
     }
+    UIEdgeInsets actualInputFieldInsets = [self _inputFieldInsets];
+    actualInputFieldInsets.right += 41.0;
     
     CGFloat inputContainerHeight = [self heightForInputFieldHeight:self.isFirstResponder ? _inputField.frame.size.height : 0];
-    setViewFrame(_fieldBackground, CGRectMake(inputFieldInsets.left, inputFieldInsets.top, frame.size.width - inputFieldInsets.left - inputFieldInsets.right, inputContainerHeight - inputFieldInsets.top - inputFieldInsets.bottom));
+    CGRect fieldBackgroundFrame = CGRectMake(visibleInputFieldInsets.left, visibleInputFieldInsets.top, frame.size.width - visibleInputFieldInsets.left - visibleInputFieldInsets.right, inputContainerHeight - visibleInputFieldInsets.top - visibleInputFieldInsets.bottom);
+    
+    CGRect actualFieldBackgroundFrame = CGRectMake(actualInputFieldInsets.left, actualInputFieldInsets.top, frame.size.width - actualInputFieldInsets.left - actualInputFieldInsets.right, inputContainerHeight - actualInputFieldInsets.top - actualInputFieldInsets.bottom);
+    
+    setViewFrame(_fieldBackground, fieldBackgroundFrame);
     
     UIEdgeInsets inputFieldInternalEdgeInsets = [self _inputFieldInternalEdgeInsets];
     CGRect onelineFrame = _fieldBackground.frame;
@@ -1049,7 +1055,7 @@ static void setViewFrame(UIView *view, CGRect frame)
         placeholderFrame.origin.x = onelineFrame.origin.x;
     setViewFrame(_placeholderLabel, placeholderFrame);
     
-    CGRect inputFieldClippingFrame = _fieldBackground.frame;
+    CGRect inputFieldClippingFrame = actualFieldBackgroundFrame;
     setViewFrame(_inputFieldClippingContainer, inputFieldClippingFrame);
 
     CGFloat inputFieldWidth = _inputFieldClippingContainer.frame.size.width - inputFieldInternalEdgeInsets.left - 36;
diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m
index a9b1e07199..f5cd71d600 100644
--- a/submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m
+++ b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m
@@ -108,6 +108,8 @@
     self = [super initWithFrame:CGRectZero];
     if (self != nil)
     {
+        [[LegacyComponentsGlobals provider] makeViewDisableInteractiveKeyboardGestureRecognizer:self];
+        
         _actionHandle = [[ASHandle alloc] initWithDelegate:self releaseOnMainThread:true];
         
         _context = context;
diff --git a/submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m b/submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m
index 1c66ba5015..702201f77c 100644
--- a/submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m
+++ b/submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m
@@ -330,8 +330,13 @@
 - (void)updateWithFetchResult:(TGMediaAssetFetchResult *)fetchResult
 {
     TGMediaAsset *currentAsset = ((TGMediaPickerGalleryItem *)_galleryController.currentItem).asset;
-    bool exists = ([fetchResult indexOfAsset:currentAsset] != NSNotFound);
     
+    bool exists;
+    if ([currentAsset isKindOfClass:[TGCameraCapturedVideo class]]) {
+        exists = [fetchResult indexOfAsset:((TGCameraCapturedVideo *)currentAsset).originalAsset] != NSNotFound;
+    } else {
+        exists =  ([fetchResult indexOfAsset:currentAsset] != NSNotFound);
+    }
     if (!exists)
     {
         _galleryModel.dismiss(true, false);
diff --git a/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m b/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
index 35ecd6a849..65b20a3dd2 100644
--- a/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
+++ b/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
@@ -362,14 +362,19 @@
     AVMutableCompositionTrack *compositionTrack = [composition addMutableTrackWithMediaType:AVMediaTypeVideo preferredTrackID:kCMPersistentTrackID_Invalid];
     [compositionTrack insertTimeRange:timeRange ofTrack:videoTrack atTime:kCMTimeZero error:NULL];
     
-    CMTime frameDuration = CMTimeMake(1, 30);
+    CMTime frameDuration30FPS = CMTimeMake(1, 30);
+    CMTime frameDuration = frameDuration30FPS;
     if (videoTrack.nominalFrameRate > 0)
         frameDuration = CMTimeMake(1, (int32_t)videoTrack.nominalFrameRate);
     else if (CMTimeCompare(videoTrack.minFrameDuration, kCMTimeZero) == 1)
         frameDuration = videoTrack.minFrameDuration;
     
     if (CMTimeCompare(frameDuration, kCMTimeZero) != 1 || !CMTIME_IS_VALID(frameDuration) || image != nil || entityRenderer != nil || adjustments.toolsApplied)
-        frameDuration = CMTimeMake(1, 30);
+        frameDuration = frameDuration30FPS;
+    
+    if (CMTimeCompare(frameDuration, frameDuration30FPS)) {
+        frameDuration = frameDuration30FPS;
+    }
     
     NSInteger fps = (NSInteger)(1.0 / CMTimeGetSeconds(frameDuration));
     
@@ -889,7 +894,7 @@
 
 + (NSURL *)_randomTemporaryURL
 {
-    return [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:[[NSString alloc] initWithFormat:@"%x.tmp", (int)arc4random()]]];
+    return [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:[[NSString alloc] initWithFormat:@"%x.mp4", (int)arc4random()]]];
 }
 
 + (NSUInteger)estimatedSizeForPreset:(TGMediaVideoConversionPreset)preset duration:(NSTimeInterval)duration hasAudio:(bool)hasAudio
@@ -1320,7 +1325,8 @@ static CGFloat progressOfSampleBufferInTimeRange(CMSampleBufferRef sampleBuffer,
     {
     AVVideoAverageBitRateKey: @([self _videoBitrateKbpsForPreset:preset] * 1000),
     AVVideoCleanApertureKey: videoCleanApertureSettings,
-    AVVideoPixelAspectRatioKey: videoAspectRatioSettings
+    AVVideoPixelAspectRatioKey: videoAspectRatioSettings,
+    AVVideoExpectedSourceFrameRateKey: @30
     };
     
     NSDictionary *hdVideoProperties = @
@@ -1408,7 +1414,7 @@ static CGFloat progressOfSampleBufferInTimeRange(CMSampleBufferRef sampleBuffer,
             return 64;
             
         case TGMediaVideoConversionPresetVideoMessage:
-            return 32;
+            return 64;
             
         case TGMediaVideoConversionPresetAnimation:
         case TGMediaVideoConversionPresetProfile:
diff --git a/submodules/LegacyComponents/Sources/TGMenuSheetController.m b/submodules/LegacyComponents/Sources/TGMenuSheetController.m
index 66b125cefd..8e10f799dc 100644
--- a/submodules/LegacyComponents/Sources/TGMenuSheetController.m
+++ b/submodules/LegacyComponents/Sources/TGMenuSheetController.m
@@ -95,7 +95,9 @@ typedef enum
         _permittedArrowDirections = UIPopoverArrowDirectionDown;
         _requiuresDimView = true;
         
-        if (!dark && [[LegacyComponentsGlobals provider] respondsToSelector:@selector(menuSheetPallete)])
+        if (dark && [[LegacyComponentsGlobals provider] respondsToSelector:@selector(darkMenuSheetPallete)])
+            self.pallete = [[LegacyComponentsGlobals provider] darkMenuSheetPallete];
+        else if (!dark && [[LegacyComponentsGlobals provider] respondsToSelector:@selector(menuSheetPallete)])
             self.pallete = [[LegacyComponentsGlobals provider] menuSheetPallete];
         
         self.wantsFullScreenLayout = true;
diff --git a/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m b/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
index 34099398e4..0b7799d810 100644
--- a/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
+++ b/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
@@ -249,7 +249,7 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
     _innerCircleView.center = centerPoint;
     _outerCircleView.center = centerPoint;
     _decoration.center = centerPoint;
-    _innerIconWrapperView.center = centerPoint;
+    _innerIconWrapperView.center = CGPointMake(_decoration.frame.size.width / 2.0f, _decoration.frame.size.height / 2.0f);
     
     _lockPanelWrapperView.frame = CGRectMake(floor(centerPoint.x - _lockPanelWrapperView.frame.size.width / 2.0f), floor(centerPoint.y - 122.0f - _lockPanelWrapperView.frame.size.height / 2.0f), _lockPanelWrapperView.frame.size.width, _lockPanelWrapperView.frame.size.height);
     
@@ -420,8 +420,8 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
         _innerIconWrapperView.alpha = 0.0f;
         _innerIconWrapperView.userInteractionEnabled = false;
         [_innerIconWrapperView addSubview:_innerIconView];
-        
-        [[_presentation view] addSubview:_innerIconWrapperView];
+
+        [_decoration addSubview:_innerIconWrapperView];
         
         if (_lock == nil) {
             _stopButton = [[TGModernButton alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 40.0f, 40.0f)];
@@ -448,7 +448,7 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
     block();
     dispatch_async(dispatch_get_main_queue(), block);
     
-    _innerIconWrapperView.transform = CGAffineTransformIdentity;
+    //_innerIconWrapperView.transform = CGAffineTransformIdentity;
     _innerCircleView.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
     _outerCircleView.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
     _decoration.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
@@ -515,11 +515,11 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
         _outerCircleView.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
         if (toSmallSize) {
             _decoration.transform = CGAffineTransformConcat(CGAffineTransformMakeScale(0.33f, 0.33f), CGAffineTransformMakeTranslation(0, 2 - TGScreenPixel));
-            _innerIconWrapperView.transform = CGAffineTransformConcat(CGAffineTransformMakeScale(0.492f, 0.492f), CGAffineTransformMakeTranslation(-TGScreenPixel, 1));
+            //_innerIconWrapperView.transform = CGAffineTransformConcat(CGAffineTransformMakeScale(0.492f, 0.492f), CGAffineTransformMakeTranslation(-TGScreenPixel, 1));
         } else {
             _decoration.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
             _decoration.alpha = 0.0;
-            _innerIconWrapperView.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
+            //_innerIconWrapperView.transform = CGAffineTransformMakeScale(0.2f, 0.2f);
             _innerIconWrapperView.alpha = 0.0f;
         }
         _innerCircleView.alpha = 0.0f;
@@ -864,7 +864,7 @@ static const CGFloat outerCircleMinScale = innerCircleRadius / outerCircleRadius
         transform = CGAffineTransformTranslate(transform, _cancelTranslation, 0);
         
         _innerCircleView.transform = transform;
-        _innerIconWrapperView.transform = transform;
+        //_innerIconWrapperView.transform = transform;
         _decoration.transform = transform;
     }
 }
diff --git a/submodules/LegacyComponents/Sources/TGNavigationController.m b/submodules/LegacyComponents/Sources/TGNavigationController.m
index 440d7325f3..d3bb25fb1b 100644
--- a/submodules/LegacyComponents/Sources/TGNavigationController.m
+++ b/submodules/LegacyComponents/Sources/TGNavigationController.m
@@ -352,40 +352,6 @@
     }
 }
 
-- (void)setShowCallStatusBar:(bool)showCallStatusBar
-{
-    if (_showCallStatusBar == showCallStatusBar)
-        return;
-    
-    _showCallStatusBar = showCallStatusBar;
-    
-    int screenHeight = (int)TGScreenSize().height;
-    CGFloat statusBarHeight = (screenHeight == 812 || screenHeight == 896) ? 0.0f : 20.0f;
-    
-    _currentAdditionalStatusBarHeight = _showCallStatusBar ? statusBarHeight : 0.0f;
-    [(TGNavigationBar *)self.navigationBar setVerticalOffset:_currentAdditionalStatusBarHeight];
-    
-    [UIView animateWithDuration:0.25 animations:^
-    {
-        static SEL selector = NULL;
-        static void (*impl)(id, SEL) = NULL;
-        
-        static dispatch_once_t onceToken;
-        dispatch_once(&onceToken, ^
-        {
-            selector = NSSelectorFromString(TGEncodeText(@"`vqebufCbstGpsDvssfouJoufsgbdfPsjfoubujpo", -1));
-            Method method = class_getInstanceMethod([UINavigationController class], selector);
-            impl = (void (*)(id, SEL))method_getImplementation(method);
-        });
-        
-        if (impl != NULL)
-            impl(self, selector);
-
-        [self updateStatusBarOnControllers];
-    }];
-}
-
-
 - (void)setupStatusBarOnControllers:(NSArray *)controllers
 {
     if ([[self navigationBar] isKindOfClass:[TGNavigationBar class]])
@@ -416,11 +382,6 @@
                 TGViewController *viewController = (TGViewController *)maybeController;
                 [viewController setAdditionalStatusBarHeight:_currentAdditionalStatusBarHeight];
                 [viewController setNeedsStatusBarAppearanceUpdate];
-                
-                if ([viewController.presentedViewController isKindOfClass:[TGNavigationController class]] && viewController.presentedViewController.modalPresentationStyle != UIModalPresentationPopover)
-                {
-                    [(TGNavigationController *)viewController.presentedViewController setShowCallStatusBar:_showCallStatusBar];
-                }
             }
             else if ([maybeController isKindOfClass:[UITabBarController class]] && [maybeController conformsToProtocol:@protocol(TGNavigationControllerTabsController)])
             {
@@ -438,54 +399,9 @@
     }
 }
 
-static UIView *findDimmingView(UIView *view)
-{
-    static NSString *encodedString = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        encodedString = TGEncodeText(@"VJEjnnjohWjfx", -1);
-    });
-    
-    if ([NSStringFromClass(view.class) isEqualToString:encodedString])
-        return view;
-    
-    for (UIView *subview in view.subviews)
-    {
-        UIView *result = findDimmingView(subview);
-        if (result != nil)
-            return result;
-    }
-    
-    return nil;
-}
-
 - (void)viewDidAppear:(BOOL)animated
 {
     [super viewDidAppear:animated];
-    
-    if (self.modalPresentationStyle == UIModalPresentationFormSheet)
-    {
-        UIView *dimmingView = findDimmingView(self.view.window);
-        bool tapSetup = false;
-        if (_dimmingTapRecognizer != nil)
-        {
-            for (UIGestureRecognizer *recognizer in dimmingView.gestureRecognizers)
-            {
-                if (recognizer == _dimmingTapRecognizer)
-                {
-                    tapSetup = true;
-                    break;
-                }
-            }
-        }
-        
-        if (!tapSetup)
-        {
-            _dimmingTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(dimmingViewTapped:)];
-            [dimmingView addGestureRecognizer:_dimmingTapRecognizer];
-        }
-    }
 }
 
 - (void)dimmingViewTapped:(UITapGestureRecognizer *)recognizer
@@ -931,74 +847,16 @@ TGNavigationController *findNavigationController()
 
 - (void)updateInteractiveTransition:(CGFloat)percentComplete
 {
-    TGNavigationController *navigationController = findNavigationController();
-    if (navigationController != nil)
-    {
-        if (!navigationController.disableInteractiveKeyboardTransition && [TGHacks applicationKeyboardWindow] != nil && ![TGHacks applicationKeyboardWindow].hidden)
-        {
-            CGSize screenSize = [TGViewController screenSizeForInterfaceOrientation:navigationController.interfaceOrientation];
-            CGFloat keyboardOffset = MAX(0.0f, percentComplete * screenSize.width);
-            
-            UIView *keyboardView = [TGHacks applicationKeyboardView];
-            CGRect keyboardViewFrame = keyboardView.frame;
-            keyboardViewFrame.origin.x = keyboardOffset;
-            
-            keyboardView.frame = keyboardViewFrame;
-        }
-    }
-    
     [super updateInteractiveTransition:percentComplete];
 }
 
 - (void)finishInteractiveTransition
 {
-    CGFloat value = self.percentComplete;
-    UIView *keyboardView = [TGHacks applicationKeyboardView];
-    CGRect keyboardViewFrame = keyboardView.frame;
-    
     [super finishInteractiveTransition];
-    
-    TGNavigationController *navigationController = findNavigationController();
-    if (navigationController != nil)
-    {
-        if (!navigationController.disableInteractiveKeyboardTransition)
-        {
-            keyboardView.frame = keyboardViewFrame;
-            
-            CGSize screenSize = [TGViewController screenSizeForInterfaceOrientation:navigationController.interfaceOrientation];
-            CGFloat keyboardOffset = 1.0f * screenSize.width;
-            
-            keyboardViewFrame.origin.x = keyboardOffset;
-            NSTimeInterval duration = (1.0 - value) * [navigationController myNominalTransitionAnimationDuration];
-            [UIView animateWithDuration:duration delay:0 options:UIViewAnimationOptionCurveLinear animations:^
-             {
-                 keyboardView.frame = keyboardViewFrame;
-             } completion:nil];
-        }
-    }
 }
 
 - (void)cancelInteractiveTransition
 {
-    CGFloat value = self.percentComplete;
-    
-    TGNavigationController *navigationController = findNavigationController();
-    if (navigationController != nil)
-    {
-        if (!navigationController.disableInteractiveKeyboardTransition && [TGHacks applicationKeyboardWindow] != nil && ![TGHacks applicationKeyboardWindow].hidden)
-        {
-            UIView *keyboardView = [TGHacks applicationKeyboardView];
-            CGRect keyboardViewFrame = keyboardView.frame;
-            keyboardViewFrame.origin.x = 0.0f;
-            
-            NSTimeInterval duration = value * [navigationController myNominalTransitionAnimationDuration];
-            [UIView animateWithDuration:duration delay:0 options:UIViewAnimationOptionCurveLinear animations:^
-             {
-                 keyboardView.frame = keyboardViewFrame;
-             } completion:nil];
-        }
-    }
-    
     [super cancelInteractiveTransition];
 }
 
diff --git a/submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m b/submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m
index eb45317107..1d7d18f920 100644
--- a/submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m
+++ b/submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m
@@ -68,28 +68,7 @@
 }
 
 - (BOOL)shouldAutorotate
-{
-    static NSArray *nonRotateableWindowClasses = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-    {
-        NSMutableArray *array = [[NSMutableArray alloc] init];
-        Class alertClass = NSClassFromString(TGEncodeText(@"`VJBmfsuPwfsmbzXjoepx", -1));
-        if (alertClass != nil)
-            [array addObject:alertClass];
-        
-        nonRotateableWindowClasses = array;
-    });
-    
-    for (UIWindow *window in [[LegacyComponentsGlobals provider] applicationWindows].reverseObjectEnumerator)
-    {
-        for (Class classInfo in nonRotateableWindowClasses)
-        {
-            if ([window isKindOfClass:classInfo])
-                return false;
-        }
-    }
-    
+{    
     UIViewController *rootController = [[LegacyComponentsGlobals provider] applicationWindows].firstObject.rootViewController;
     
     if (rootController.presentedViewController != nil)
diff --git a/submodules/LegacyComponents/Sources/TGPassportAttachMenu.m b/submodules/LegacyComponents/Sources/TGPassportAttachMenu.m
index f083293dec..6d168caa5b 100644
--- a/submodules/LegacyComponents/Sources/TGPassportAttachMenu.m
+++ b/submodules/LegacyComponents/Sources/TGPassportAttachMenu.m
@@ -66,7 +66,7 @@
         
         [TGPassportAttachMenu _displayCameraWithView:cameraView menuController:strongController parentController:strongParentController context:context intent:intent uploadAction:uploadAction];
     };
-    carouselItem.sendPressed = ^(TGMediaAsset *currentItem, __unused bool asFiles, __unused bool silentPosting, __unused int32_t scheduleTime)
+    carouselItem.sendPressed = ^(TGMediaAsset *currentItem, __unused bool asFiles, __unused bool silentPosting, __unused int32_t scheduleTime, __unused bool fromPicker)
     {
         __strong TGMenuSheetController *strongController = weakController;
         if (strongController == nil)
@@ -271,7 +271,7 @@
 
 + (void)_displayCameraWithView:(TGAttachmentCameraView *)cameraView menuController:(TGMenuSheetController *)menuController parentController:(TGViewController *)parentController context:(id<LegacyComponentsContext>)context intent:(TGPassportAttachIntent)intent uploadAction:(void (^)(SSignal *, void (^)(void)))uploadAction
 {
-    if (![[[LegacyComponentsGlobals provider] accessChecker] checkCameraAuthorizationStatusForIntent:TGCameraAccessIntentDefault alertDismissCompletion:nil])
+    if (![[[LegacyComponentsGlobals provider] accessChecker] checkCameraAuthorizationStatusForIntent:TGCameraAccessIntentDefault completion:^(BOOL allowed) { } alertDismissCompletion:nil])
         return;
     
     if ([context currentlyInSplitView])
diff --git a/submodules/LegacyComponents/Sources/TGPhotoCropController.m b/submodules/LegacyComponents/Sources/TGPhotoCropController.m
index 9e497a5ed4..e64c049c3d 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoCropController.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoCropController.m
@@ -502,13 +502,10 @@ NSString * const TGPhotoCropOriginalAspectRatio = @"original";
 
 - (id)currentResultRepresentation
 {
-    if (_transitionOutView != nil && [_transitionOutView isKindOfClass:[UIImageView class]])
-    {
+    if (_transitionOutView != nil && [_transitionOutView isKindOfClass:[UIImageView class]]) {
         return ((UIImageView *)_transitionOutView).image;
-    }
-    else
-    {
-        return [_cropView croppedImageWithMaxSize:CGSizeMake(750, 750)];
+    } else {
+        return [_cropView croppedImageWithMaxSize:TGPhotoEditorScreenImageMaxSize()];
     }
 }
 
diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
index cbf564209e..166715d56b 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
@@ -146,7 +146,6 @@
     {
         _context = context;
         _actionHandle = [[ASHandle alloc] initWithDelegate:self releaseOnMainThread:true];
-        _standaloneEditingContext = [[TGMediaEditingContext alloc] init];
         
         self.automaticallyManageScrollViewInsets = false;
         self.autoManageStatusBarBackground = false;
@@ -2182,10 +2181,14 @@
 
 - (TGMediaEditingContext *)editingContext
 {
-    if (_editingContext)
+    if (_editingContext) {
         return _editingContext;
-    else
+    } else {
+        if (_standaloneEditingContext == nil) {
+            _standaloneEditingContext = [[TGMediaEditingContext alloc] init];
+        }
         return _standaloneEditingContext;
+    }
 }
 
 - (void)doneButtonLongPressed:(UIButton *)sender
diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m
index f5210889db..96f847a378 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m
@@ -89,7 +89,7 @@ const CGFloat TGPhotoEditorSliderViewInternalMargin = 7.0f;
 - (void)setPositionsCount:(NSInteger)positionsCount
 {
     _positionsCount = positionsCount;
-    _tapGestureRecognizer.enabled = _positionsCount > 1;
+    _tapGestureRecognizer.enabled = !_disableSnapToPositions && _positionsCount > 1;
     _doubleTapGestureRecognizer.enabled = !_tapGestureRecognizer.enabled;
 }
 
@@ -158,7 +158,6 @@ const CGFloat TGPhotoEditorSliderViewInternalMargin = 7.0f;
         knobFrame = CGRectMake(knobFrame.origin.y, knobFrame.origin.x, knobFrame.size.width, knobFrame.size.height);
     }
     
-    CGFloat markPosition = visualMargin + visualTotalLength / (_maximumValue - _minimumValue) * (ABS(_minimumValue) + _startValue);
     if (_markValue > FLT_EPSILON)
     {
         CGContextSetFillColorWithColor(context, _backColor.CGColor);
@@ -174,60 +173,14 @@ const CGFloat TGPhotoEditorSliderViewInternalMargin = 7.0f;
         
         CGContextSetBlendMode(context, kCGBlendModeCopy);
     }
-    
-    if (false && _minimumUndottedValue > -1 && self.positionsCount > 1) {
-        CGContextSetLineWidth(context, backFrame.size.height);
-        CGContextSetLineCap(context, kCGLineCapRound);
-        
-        for (NSInteger i = 1; i < self.positionsCount; i++)
-        {
-            CGFloat previousX = margin + totalLength / (self.positionsCount - 1) * (i - 1);
-            CGFloat currentX = margin + totalLength / (self.positionsCount - 1) * i;
-            
-            if (_minimumUndottedValue < i) {
-                CGFloat normalDashWidth = 16.0f;
-                CGFloat dashFraction = 0.6f;
-                CGFloat totalLineWidth = currentX - previousX;
-                int numberOfDashes = (int)floor((double)(totalLineWidth / normalDashWidth));
-                CGFloat dashWidth = (totalLineWidth / (CGFloat)numberOfDashes);
-                
-                CGFloat innerWidth = dashWidth * dashFraction - 2.0f;
-                CGFloat innerOffset = (dashWidth - innerWidth) / 2.0f;
-                
-                CGFloat dottedX = previousX;
-                
-                while (dottedX + innerWidth < currentX) {
-                    bool highlighted = dottedX + dashWidth / 2.0f < CGRectGetMaxX(trackFrame);
-                    
-                    CGContextSetStrokeColorWithColor(context, highlighted ? _trackColor.CGColor : _backColor.CGColor);
-                    
-                    CGContextMoveToPoint(context, dottedX + innerOffset, CGRectGetMidY(backFrame));
-                    CGContextAddLineToPoint(context, dottedX + innerOffset + innerWidth, CGRectGetMidY(backFrame));
-                    CGContextStrokePath(context);
-                    
-                    dottedX += dashWidth;
-                }
-            } else {
-                bool highlighted = (previousX + (currentX - previousX) / 2.0f) < CGRectGetMaxX(trackFrame);
-                CGContextSetStrokeColorWithColor(context, highlighted ? _trackColor.CGColor : _backColor.CGColor);
-                
-                CGContextMoveToPoint(context, previousX, CGRectGetMidY(backFrame));
-                CGContextAddLineToPoint(context, currentX, CGRectGetMidY(backFrame));
-                CGContextStrokePath(context);
-            }
-        }
-    } else {
-        CGContextSetFillColorWithColor(context, _backColor.CGColor);
-        [self drawRectangle:backFrame cornerRadius:self.trackCornerRadius context:context];
-    }
+
+    CGContextSetFillColorWithColor(context, _backColor.CGColor);
+    [self drawRectangle:backFrame cornerRadius:self.trackCornerRadius context:context];
 
     CGContextSetBlendMode(context, kCGBlendModeNormal);
-    
-    if (false && _minimumUndottedValue > -1) {
-    } else {
-        CGContextSetFillColorWithColor(context, _trackColor.CGColor);
-        [self drawRectangle:trackFrame cornerRadius:self.trackCornerRadius context:context];
-    }
+
+    CGContextSetFillColorWithColor(context, _trackColor.CGColor);
+    [self drawRectangle:trackFrame cornerRadius:self.trackCornerRadius context:context];
     
     if (!_startHidden || self.displayEdges)
     {
@@ -644,14 +597,14 @@ const CGFloat TGPhotoEditorSliderViewInternalMargin = 7.0f;
     totalLength -= _knobPadding * 2;
     
     CGFloat previousValue = self.value;
-    if (self.positionsCount > 1)
+    if (self.positionsCount > 1 && !self.disableSnapToPositions)
     {
         NSInteger position = (NSInteger)round((_knobDragCenter / totalLength) * (self.positionsCount - 1));
         _knobDragCenter = position * totalLength / (self.positionsCount - 1);
     }
     
     [self setValue:[self valueForCenterPosition:_knobDragCenter totalLength:totalLength knobSize:_knobView.image.size.width vertical:vertical]];
-    if (previousValue != self.value && (self.positionsCount > 1 || self.value == self.minimumValue || self.value == self.maximumValue || (self.minimumValue != self.startValue && self.value == self.startValue)))
+    if (previousValue != self.value && !self.disableSnapToPositions && (self.positionsCount > 1 || self.value == self.minimumValue || self.value == self.maximumValue || (self.minimumValue != self.startValue && self.value == self.startValue)))
     {
         [_feedbackGenerator selectionChanged];
         [_feedbackGenerator prepare];
diff --git a/submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m b/submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m
index 2cadc81c9e..fd5465eefa 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m
@@ -7,14 +7,14 @@
 #import <Accelerate/Accelerate.h>
 
 const CGSize TGPhotoEditorResultImageMaxSize = { 1280, 1280 };
-const CGSize TGPhotoEditorScreenImageHardLimitSize = { 750, 750 };
+const CGSize TGPhotoEditorScreenImageHardLimitSize = { 1280, 1280 };
+const CGSize TGPhotoEditorScreenImageHardLimitLegacySize = { 750, 750 };
 
 CGSize TGPhotoEditorScreenImageMaxSize()
 {
     CGSize screenSize = TGScreenSize();
-    CGFloat maxSide = MIN(TGPhotoEditorScreenImageHardLimitSize.width, TGScreenScaling() * MIN(screenSize.width, screenSize.height));
-    
-    return CGSizeMake(maxSide, maxSide);
+    CGSize limitSize = screenSize.width == 320 ? TGPhotoEditorScreenImageHardLimitLegacySize : TGPhotoEditorScreenImageHardLimitSize;
+    return limitSize;
 }
 
 CGSize TGPhotoThumbnailSizeForCurrentScreen()
diff --git a/submodules/LegacyComponents/Sources/TGPhotoPaintController.m b/submodules/LegacyComponents/Sources/TGPhotoPaintController.m
index c0ba0e2c91..fa503a47a3 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoPaintController.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoPaintController.m
@@ -1414,7 +1414,7 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f;
 
 - (CGFloat)_brushWeightForSize:(CGFloat)size
 {
-    return [self _brushBaseWeightForCurrentPainting] + [self _brushWeightRangeForCurrentPainting] * size;
+    return ([self _brushBaseWeightForCurrentPainting] + [self _brushWeightRangeForCurrentPainting] * size) / _scrollView.zoomScale;
 }
 
 + (CGSize)maximumPaintingSize
@@ -1739,6 +1739,9 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f;
 {
     [self adjustZoom];
     
+    TGPaintSwatch *currentSwatch = _portraitSettingsView.swatch;
+    [_canvasView setBrushWeight:[self _brushWeightForSize:currentSwatch.brushWeight]];
+    
     if (_scrollView.zoomScale < _scrollView.normalZoomScale - FLT_EPSILON)
     {
         [TGHacks setAnimationDurationFactor:0.5f];
diff --git a/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h
index 6d79b12348..796a49c812 100644
--- a/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h
+++ b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h
@@ -15,13 +15,16 @@
 
 @property (nonatomic, copy) void (^micLevel)(CGFloat);
 
+@property (nonatomic, readonly) bool isZoomAvailable;
+@property (nonatomic, assign) CGFloat zoomLevel;
+
 - (instancetype)initWithDelegate:(id<TGVideoCameraPipelineDelegate>)delegate position:(AVCaptureDevicePosition)position callbackQueue:(dispatch_queue_t)queue liveUploadInterface:(id<TGLiveUploadInterface>)liveUploadInterface;
 
 - (void)startRunning;
 - (void)stopRunning;
 
 - (void)startRecording:(NSURL *)url preset:(TGMediaVideoConversionPreset)preset liveUpload:(bool)liveUpload;
-- (void)stopRecording:(void (^)())completed;
+- (void)stopRecording:(void (^)(bool))completed;
 
 - (CGAffineTransform)transformForOrientation:(AVCaptureVideoOrientation)orientation;
 
diff --git a/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
index 304099a130..fde3cd666c 100644
--- a/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
+++ b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
@@ -135,7 +135,7 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
     {
 		_running = false;
 		
-		[self stopRecording:^{}];
+		[self stopRecording:^(__unused bool success) {}];
 		
 		[_captureSession stopRunning];
 		[self captureSessionDidStopRunning];
@@ -300,7 +300,7 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
 
 - (void)captureSessionDidStopRunning
 {
-	[self stopRecording:^{}];
+	[self stopRecording:^(__unused bool success) {}];
 	[self destroyVideoPipeline];
 }
 
@@ -701,7 +701,7 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
 	[recorder prepareToRecord];
 }
 
-- (void)stopRecording:(void (^)())completed
+- (void)stopRecording:(void (^)(bool))completed
 {
     [[TGVideoCameraPipeline cameraQueue] dispatch:^
     {
@@ -709,7 +709,7 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
         {
             if (_recordingStatus != TGVideoCameraRecordingStatusRecording) {
                 if (completed) {
-                    completed();
+                    completed(false);
                 }
                 return;
             }
@@ -721,7 +721,7 @@ const NSInteger TGVideoCameraRetainedBufferCount = 16;
         [_recorder finishRecording:^{
             __unused __auto_type description = [self description];
             if (completed) {
-                completed();
+                completed(true);
             }
         }];
     }];
@@ -864,6 +864,52 @@ static CGFloat angleOffsetFromPortraitOrientationToOrientation(AVCaptureVideoOri
     return _recorder.videoDuration;
 }
 
+- (CGFloat)zoomLevel
+{
+    if (![_videoDevice respondsToSelector:@selector(videoZoomFactor)])
+        return 1.0f;
+    
+    return (_videoDevice.videoZoomFactor - 1.0f) / ([self _maximumZoomFactor] - 1.0f);
+}
+
+- (CGFloat)_maximumZoomFactor
+{
+    return MIN(5.0f, _videoDevice.activeFormat.videoMaxZoomFactor);
+}
+
+- (void)setZoomLevel:(CGFloat)zoomLevel
+{
+    zoomLevel = MAX(0.0f, MIN(1.0f, zoomLevel));
+    
+    __weak TGVideoCameraPipeline *weakSelf = self;
+    [[TGVideoCameraPipeline cameraQueue] dispatch:^
+    {
+        __strong TGVideoCameraPipeline *strongSelf = weakSelf;
+        if (strongSelf == nil)
+            return;
+        
+        [self _reconfigureDevice:_videoDevice withBlock:^(AVCaptureDevice *device) {
+            device.videoZoomFactor = MAX(1.0f, MIN([strongSelf _maximumZoomFactor], 1.0f + ([strongSelf _maximumZoomFactor] - 1.0f) * zoomLevel));
+        }];
+    }];
+}
+
+- (bool)isZoomAvailable
+{
+    return [TGVideoCameraPipeline _isZoomAvailableForDevice:_videoDevice];
+}
+
++ (bool)_isZoomAvailableForDevice:(AVCaptureDevice *)device
+{
+    if (![device respondsToSelector:@selector(setVideoZoomFactor:)])
+        return false;
+    
+    if (device.position == AVCaptureDevicePositionFront)
+        return false;
+    
+    return true;
+}
+
 - (void)setCameraPosition:(AVCaptureDevicePosition)position
 {
     @synchronized (self)
diff --git a/submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m b/submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m
index cf05bf2cba..ea744f75fc 100644
--- a/submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m
+++ b/submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m
@@ -91,6 +91,8 @@ typedef enum
     TGVideoCameraGLView *_previewView;
     TGVideoMessageRingView *_ringView;
     
+    UIPinchGestureRecognizer *_pinchGestureRecognizer;
+    
     UIView *_separatorView;
     
     UIImageView *_placeholderView;
@@ -344,7 +346,6 @@ typedef enum
     [_circleWrapperView addSubview:_ringView];
     
     CGRect controlsFrame = _controlsFrame;
-//    controlsFrame.size.width = _wrapperView.frame.size.width;
     
     _controlsView = [[TGVideoMessageControls alloc] initWithFrame:controlsFrame assets:_assets slowmodeTimestamp:_slowmodeTimestamp slowmodeView:_slowmodeView];
     _controlsView.pallete = self.pallete;
@@ -417,12 +418,43 @@ typedef enum
         [self.view addSubview:_switchButton];
     }
     
+    _pinchGestureRecognizer = [[UIPinchGestureRecognizer alloc] initWithTarget:self action:@selector(handlePinch:)];
+    _pinchGestureRecognizer.delegate = self;
+    [self.view addGestureRecognizer:_pinchGestureRecognizer];
+    
     void (^voidBlock)(void) = ^{};
     _buttonHandler = [[PGCameraVolumeButtonHandler alloc] initWithUpButtonPressedBlock:voidBlock upButtonReleasedBlock:voidBlock downButtonPressedBlock:voidBlock downButtonReleasedBlock:voidBlock];
     
     [self configureCamera];
 }
 
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
+{
+    if (gestureRecognizer == _pinchGestureRecognizer)
+        return _capturePipeline.isZoomAvailable;
+    
+    return true;
+}
+
+- (void)handlePinch:(UIPinchGestureRecognizer *)gestureRecognizer
+{
+    switch (gestureRecognizer.state)
+    {
+        case UIGestureRecognizerStateChanged:
+        {
+            CGFloat delta = (gestureRecognizer.scale - 1.0f) / 1.5f;
+            CGFloat value = MAX(0.0f, MIN(1.0f, _capturePipeline.zoomLevel + delta));
+            
+            [_capturePipeline setZoomLevel:value];
+            
+            gestureRecognizer.scale = 1.0f;
+        }
+            break;
+        default:
+            break;
+    }
+}
+
 - (TGVideoMessageTransitionType)_transitionType
 {
     static dispatch_once_t onceToken;
@@ -658,9 +690,10 @@ typedef enum
         return;
     
     [_activityDisposable dispose];
-    [self stopRecording:^{
+    [self stopRecording:^() {
         TGDispatchOnMainThread(^{
-            [self dismiss:false];
+            //[self dismiss:false];
+            [self description];
         });
     }];
 }
@@ -955,7 +988,20 @@ typedef enum
 
 - (void)stopRecording:(void (^)())completed
 {
-    [_capturePipeline stopRecording:completed];
+    __weak TGVideoMessageCaptureController *weakSelf = self;
+    [_capturePipeline stopRecording:^(bool success) {
+        TGDispatchOnMainThread(^{
+            __strong TGVideoMessageCaptureController *strongSelf = weakSelf;
+            if (strongSelf == nil) {
+                return;
+            }
+            if (!success) {
+                if (!strongSelf->_dismissed && strongSelf.finishedWithVideo != nil) {
+                    strongSelf.finishedWithVideo(nil, nil, 0, 0.0, CGSizeZero, nil, nil, false, 0);
+                }
+            }
+        });
+    }];
     [_buttonHandler ignoreEventsFor:1.0f andDisable:true];
     [_capturePipeline stopRunning];
 }
@@ -1015,10 +1061,14 @@ typedef enum
         }
     }
     
-    if (!_dismissed && self.finishedWithVideo != nil)
+    if (!_dismissed) {
         self.finishedWithVideo(url, image, fileSize, duration, dimensions, liveUploadData, adjustments, isSilent, scheduleTimestamp);
-    else
+    } else {
         [[NSFileManager defaultManager] removeItemAtURL:url error:NULL];
+        if (self.finishedWithVideo != nil) {
+            self.finishedWithVideo(nil, nil, 0, 0.0, CGSizeZero, nil, nil, false, 0);
+        }
+    }
 }
 
 - (UIImageOrientation)orientationForThumbnailWithTransform:(CGAffineTransform)transform mirrored:(bool)mirrored
@@ -1501,6 +1551,16 @@ static UIImage *startImage = nil;
     return CGSizeMake(240.0f, 240.0f);
 }
 
+- (UIView *)extractVideoContent {
+    UIView *result = [_circleView snapshotViewAfterScreenUpdates:false];
+    result.frame = [_circleView convertRect:_circleView.bounds toView:nil];
+    return result;
+}
+
+- (void)hideVideoContent {
+    _circleWrapperView.alpha = 0.02f;
+}
+
 @end
 
 
diff --git a/submodules/LegacyComponents/Sources/TGVideoMessageControls.m b/submodules/LegacyComponents/Sources/TGVideoMessageControls.m
index c4b6fc917c..d7e68bb320 100644
--- a/submodules/LegacyComponents/Sources/TGVideoMessageControls.m
+++ b/submodules/LegacyComponents/Sources/TGVideoMessageControls.m
@@ -445,7 +445,7 @@ static CGRect viewFrame(UIView *view)
     
     [UIView animateWithDuration:0.2 delay:0.0 options:UIViewAnimationOptionBeginFromCurrentState | animationCurveOption animations:^
     {
-        CGAffineTransform transform = CGAffineTransformScale(transform, 0.25f, 0.25f);
+        CGAffineTransform transform = CGAffineTransformMakeScale(0.25, 0.25);
         _cancelButton.transform = transform;
         _cancelButton.alpha = 0.0f;
     } completion:nil];
diff --git a/submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m b/submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m
index fb0efcbba8..66a0dd2036 100644
--- a/submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m
+++ b/submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m
@@ -70,6 +70,9 @@ typedef enum
     if (self != nil)
     {
         _allowsTrimming = true;
+
+        self.clipsToBounds = true;
+        self.layer.cornerRadius = 16.0f;
         
         _wrapperView = [[UIControl alloc] initWithFrame:CGRectMake(0, 0, 0, 33)];
         _wrapperView.hitTestEdgeInsets = UIEdgeInsetsMake(-5, -10, -5, -10);
diff --git a/submodules/LegacyComponents/Sources/TGViewController.mm b/submodules/LegacyComponents/Sources/TGViewController.mm
index 4ec8d72d20..0a35d3fb26 100644
--- a/submodules/LegacyComponents/Sources/TGViewController.mm
+++ b/submodules/LegacyComponents/Sources/TGViewController.mm
@@ -695,7 +695,7 @@ static id<LegacyComponentsContext> _defaultContext = nil;
 {
     float additionalKeyboardHeight = [self _keyboardAdditionalDeltaHeightWhenRotatingFrom:_viewControllerRotatingFromOrientation toOrientation:toInterfaceOrientation];
     
-    CGFloat statusBarHeight = [TGHacks statusBarHeightForOrientation:toInterfaceOrientation];
+    CGFloat statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
     [self _updateControllerInsetForOrientation:toInterfaceOrientation statusBarHeight:statusBarHeight keyboardHeight:[self _currentKeyboardHeight:toInterfaceOrientation] + additionalKeyboardHeight force:false notify:true];
 }
 
@@ -768,9 +768,6 @@ static id<LegacyComponentsContext> _defaultContext = nil;
     if ([self isViewLoaded] && !_viewControllerHasEverAppeared && ([self findFirstResponder:self.view] == nil && ![self willCaptureInputShortly]))
         return 0.0f;
     
-    if ([TGHacks isKeyboardVisible])
-        return [TGHacks keyboardHeightForOrientation:orientation];
-    
     return 0.0f;
 }
 
@@ -1264,7 +1261,7 @@ static id<LegacyComponentsContext> _defaultContext = nil;
             if (navigationBarHidden != self.navigationController.navigationBarHidden)
             {
                 CGFloat barHeight = [self navigationBarHeightForInterfaceOrientation:self.interfaceOrientation];
-                CGFloat statusBarHeight = [TGHacks statusBarHeightForOrientation:self.interfaceOrientation];
+                CGFloat statusBarHeight = [[UIApplication sharedApplication] statusBarFrame].size.height;
                 if ([self shouldIgnoreStatusBarInOrientation:self.interfaceOrientation])
                     statusBarHeight = 0.0f;
                 
@@ -1435,13 +1432,6 @@ static id<LegacyComponentsContext> _defaultContext = nil;
     if (TGIsPad() && iosMajorVersion() >= 7)
         viewControllerToPresent.preferredContentSize = [self.navigationController preferredContentSize];
     
-    if ([viewControllerToPresent isKindOfClass:[TGNavigationController class]])
-    {
-        TGNavigationController *navController = (TGNavigationController *)self.navigationController;
-        if (navController.showCallStatusBar)
-            [(TGNavigationController *)viewControllerToPresent setShowCallStatusBar:true];
-    }
-    
     if (iosMajorVersion() >= 8 && self.presentedViewController != nil && [self.presentedViewController isKindOfClass:[UIAlertController class]])
     {
         dispatch_async(dispatch_get_main_queue(), ^
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift
index 775c7fc6ca..d6ee786284 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacyAttachmentMenu.swift
@@ -106,7 +106,10 @@ public func legacyMediaEditor(context: AccountContext, peer: Peer, media: AnyMed
         TGPhotoVideoEditor.present(with: legacyController.context, controller: emptyController, caption: initialCaption, entities: [], withItem: item, paint: true, recipientName: recipientName, stickersContext: paintStickersContext, snapshots: snapshots as? [Any], immediate: transitionCompletion != nil, appeared: {
             transitionCompletion?()
         }, completion: { result, editingContext in
-            let signals = TGCameraController.resultSignals(for: nil, editingContext: editingContext, currentItem: result as! TGMediaSelectableItem, storeAssets: false, saveEditedPhotos: false, descriptionGenerator: legacyAssetPickerItemGenerator())
+            let nativeGenerator = legacyAssetPickerItemGenerator()
+            let signals = TGCameraController.resultSignals(for: nil, editingContext: editingContext, currentItem: result as! TGMediaSelectableItem, storeAssets: false, saveEditedPhotos: false, descriptionGenerator: { _1, _2, _3, _4 in
+                nativeGenerator(_1, _2, _3, _4, nil)
+            })
             sendMessagesWithSignals(signals, false, 0)
         }, dismissed: { [weak legacyController] in
             legacyController?.dismiss()
@@ -114,7 +117,7 @@ public func legacyMediaEditor(context: AccountContext, peer: Peer, media: AnyMed
     })
 }
 
-public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocation: ChatLocation, editMediaOptions: LegacyAttachmentMenuMediaEditing?, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, canSendPolls: Bool, presentationData: PresentationData, parentController: LegacyController, recentlyUsedInlineBots: [Peer], initialCaption: String, openGallery: @escaping () -> Void, openCamera: @escaping (TGAttachmentCameraView?, TGMenuSheetController?) -> Void, openFileGallery: @escaping () -> Void, openWebSearch: @escaping () -> Void, openMap: @escaping () -> Void, openContacts: @escaping () -> Void, openPoll: @escaping () -> Void, presentSelectionLimitExceeded: @escaping () -> Void, presentCantSendMultipleFiles: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, selectRecentlyUsedInlineBot: @escaping (Peer) -> Void, presentStickers: @escaping (@escaping (TelegramMediaFile, Bool, UIView, CGRect) -> Void) -> TGPhotoPaintStickersScreen?, present: @escaping (ViewController, Any?) -> Void) -> TGMenuSheetController {
+public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocation: ChatLocation, editMediaOptions: LegacyAttachmentMenuMediaEditing?, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, canSendPolls: Bool, presentationData: PresentationData, parentController: LegacyController, recentlyUsedInlineBots: [Peer], initialCaption: String, openGallery: @escaping () -> Void, openCamera: @escaping (TGAttachmentCameraView?, TGMenuSheetController?) -> Void, openFileGallery: @escaping () -> Void, openWebSearch: @escaping () -> Void, openMap: @escaping () -> Void, openContacts: @escaping () -> Void, openPoll: @escaping () -> Void, presentSelectionLimitExceeded: @escaping () -> Void, presentCantSendMultipleFiles: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32, ((String) -> UIView?)?, @escaping () -> Void) -> Void, selectRecentlyUsedInlineBot: @escaping (Peer) -> Void, presentStickers: @escaping (@escaping (TelegramMediaFile, Bool, UIView, CGRect) -> Void) -> TGPhotoPaintStickersScreen?, present: @escaping (ViewController, Any?) -> Void) -> TGMenuSheetController {
     let defaultVideoPreset = defaultVideoPresetForContext(context)
     UserDefaults.standard.set(defaultVideoPreset.rawValue as NSNumber, forKey: "TG_preferredVideoPreset_v0")
     
@@ -210,15 +213,21 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocati
                 done?(time)
             }
         }
-        carouselItem.sendPressed = { [weak controller, weak carouselItem] currentItem, asFiles, silentPosting, scheduleTime in
+        carouselItem.sendPressed = { [weak controller, weak carouselItem] currentItem, asFiles, silentPosting, scheduleTime, isFromPicker in
             if let controller = controller, let carouselItem = carouselItem {
                 let intent: TGMediaAssetsControllerIntent = asFiles ? TGMediaAssetsControllerSendFileIntent : TGMediaAssetsControllerSendMediaIntent
                 let signals = TGMediaAssetsController.resultSignals(for: carouselItem.selectionContext, editingContext: carouselItem.editingContext, intent: intent, currentItem: currentItem, storeAssets: true, useMediaCache: false, descriptionGenerator: legacyAssetPickerItemGenerator(), saveEditedPhotos: saveEditedPhotos)
                 if slowModeEnabled, let signals = signals, signals.count > 1 {
                     presentCantSendMultipleFiles()
                 } else {
-                    controller.dismiss(animated: true)
-                    sendMessagesWithSignals(signals, silentPosting, scheduleTime)
+                    sendMessagesWithSignals(signals, silentPosting, scheduleTime, isFromPicker ? nil : { [weak carouselItem] uniqueId in
+                        if let carouselItem = carouselItem {
+                            return carouselItem.getItemSnapshot(uniqueId)
+                        }
+                        return nil
+                    }, { [weak controller] in
+                        controller?.dismiss(animated: true)
+                    })
                 }
             }
         };
@@ -301,7 +310,7 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocati
                 
                 let presentationDisposable = context.sharedContext.presentationData.start(next: { [weak legacyController] presentationData in
                     if let legacyController = legacyController, let controller = legacyController.legacyController as? TGMenuSheetController  {
-                        controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme)
+                        controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme, forceDark: false)
                     }
                 })
                 legacyController.disposables.add(presentationDisposable)
@@ -310,8 +319,11 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocati
                 
                 TGPhotoVideoEditor.present(with: legacyController.context, controller: emptyController, caption: "", entities: [], withItem: item, paint: false, recipientName: recipientName, stickersContext: paintStickersContext, snapshots: [], immediate: false, appeared: {
                 }, completion: { result, editingContext in
-                    let signals = TGCameraController.resultSignals(for: nil, editingContext: editingContext, currentItem: result as! TGMediaSelectableItem, storeAssets: false, saveEditedPhotos: false, descriptionGenerator: legacyAssetPickerItemGenerator())
-                    sendMessagesWithSignals(signals, false, 0)
+                    let nativeGenerator = legacyAssetPickerItemGenerator()
+                    let signals = TGCameraController.resultSignals(for: nil, editingContext: editingContext, currentItem: result as! TGMediaSelectableItem, storeAssets: false, saveEditedPhotos: false, descriptionGenerator: { _1, _2, _3, _4 in
+                        nativeGenerator(_1, _2, _3, _4, nil)
+                    })
+                    sendMessagesWithSignals(signals, false, 0, { _ in nil}, {})
                 }, dismissed: { [weak legacyController] in
                     legacyController?.dismiss()
                 })
@@ -378,9 +390,14 @@ public func legacyAttachmentMenu(context: AccountContext, peer: Peer, chatLocati
     return controller
 }
 
-public func legacyMenuPaletteFromTheme(_ theme: PresentationTheme) -> TGMenuSheetPallete {
-    let sheetTheme = theme.actionSheet
-    return TGMenuSheetPallete(dark: theme.overallDarkAppearance, backgroundColor: sheetTheme.opaqueItemBackgroundColor, selectionColor: sheetTheme.opaqueItemHighlightedBackgroundColor, separatorColor: sheetTheme.opaqueItemSeparatorColor, accentColor: sheetTheme.controlAccentColor, destructiveColor: sheetTheme.destructiveActionTextColor, textColor: sheetTheme.primaryTextColor, secondaryTextColor: sheetTheme.secondaryTextColor, spinnerColor: sheetTheme.secondaryTextColor, badgeTextColor: sheetTheme.controlAccentColor, badgeImage: nil, cornersImage: generateStretchableFilledCircleImage(diameter: 11.0, color: nil, strokeColor: nil, strokeWidth: nil, backgroundColor: sheetTheme.opaqueItemBackgroundColor))
+public func legacyMenuPaletteFromTheme(_ theme: PresentationTheme, forceDark: Bool) -> TGMenuSheetPallete {
+    let sheetTheme: PresentationThemeActionSheet
+    if forceDark && !theme.overallDarkAppearance {
+        sheetTheme = defaultDarkColorPresentationTheme.actionSheet
+    } else {
+        sheetTheme = theme.actionSheet
+    }
+    return TGMenuSheetPallete(dark: forceDark || theme.overallDarkAppearance, backgroundColor: sheetTheme.opaqueItemBackgroundColor, selectionColor: sheetTheme.opaqueItemHighlightedBackgroundColor, separatorColor: sheetTheme.opaqueItemSeparatorColor, accentColor: sheetTheme.controlAccentColor, destructiveColor: sheetTheme.destructiveActionTextColor, textColor: sheetTheme.primaryTextColor, secondaryTextColor: sheetTheme.secondaryTextColor, spinnerColor: sheetTheme.secondaryTextColor, badgeTextColor: sheetTheme.controlAccentColor, badgeImage: nil, cornersImage: generateStretchableFilledCircleImage(diameter: 11.0, color: nil, strokeColor: nil, strokeWidth: nil, backgroundColor: sheetTheme.opaqueItemBackgroundColor))
 }
 
 public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, chatLocation: ChatLocation, saveEditedPhotos: Bool, allowGrouping: Bool, hasSchedule: Bool, presentationData: PresentationData, images: [UIImage], presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, sendMessagesWithSignals: @escaping ([Any]?, Bool, Int32) -> Void, presentStickers: @escaping (@escaping (TelegramMediaFile, Bool, UIView, CGRect) -> Void) -> TGPhotoPaintStickersScreen?, present: (ViewController, Any?) -> Void, initialLayout: ContainerViewLayout? = nil) -> ViewController {
@@ -430,7 +447,10 @@ public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, chatLoca
             done?(time)
         }
     }, completed: { selectionContext, editingContext, currentItem, silentPosting, scheduleTime in
-        let signals = TGClipboardMenu.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, descriptionGenerator: legacyAssetPickerItemGenerator())
+        let nativeGenerator = legacyAssetPickerItemGenerator()
+        let signals = TGClipboardMenu.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, descriptionGenerator: { _1, _2, _3, _4 in
+            nativeGenerator(_1, _2, _3, _4, nil)
+        })
         sendMessagesWithSignals(signals, silentPosting, scheduleTime)
     }, dismissed: { [weak legacyController] in
         legacyController?.dismiss()
@@ -441,7 +461,7 @@ public func presentLegacyPasteMenu(context: AccountContext, peer: Peer, chatLoca
     
     let presentationDisposable = context.sharedContext.presentationData.start(next: { [weak legacyController] presentationData in
         if let legacyController = legacyController, let controller = legacyController.legacyController as? TGMenuSheetController  {
-            controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme)
+            controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme, forceDark: false)
         }
     })
     legacyController.disposables.add(presentationDisposable)
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyLiveUploadInterface.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyLiveUploadInterface.swift
index f07d6629c0..dd9295eceb 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyLiveUploadInterface.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacyLiveUploadInterface.swift
@@ -5,6 +5,7 @@ import TelegramCore
 import SyncCore
 import LegacyComponents
 import SwiftSignalKit
+import AccountContext
 
 public class VideoConversionWatcher: TGMediaVideoFileWatcher {
     private let update: (String, Int) -> Void
@@ -44,7 +45,7 @@ public final class LegacyLiveUploadInterfaceResult: NSObject {
 }
 
 public final class LegacyLiveUploadInterface: VideoConversionWatcher, TGLiveUploadInterface {
-    private let account: Account
+    private let context: AccountContext
     private let id: Int64
     private var path: String?
     private var size: Int?
@@ -52,9 +53,9 @@ public final class LegacyLiveUploadInterface: VideoConversionWatcher, TGLiveUplo
     private let data = Promise<MediaResourceData>()
     private let dataValue = Atomic<MediaResourceData?>(value: nil)
     
-    public init(account: Account) {
-        self.account = account
-        self.id = arc4random64()
+    public init(context: AccountContext) {
+        self.context = context
+        self.id = Int64.random(in: Int64.min ... Int64.max)
         
         var updateImpl: ((String, Int) -> Void)?
         super.init(update: { path, size in
@@ -65,7 +66,7 @@ public final class LegacyLiveUploadInterface: VideoConversionWatcher, TGLiveUplo
             if let strongSelf = self {
                 if strongSelf.path == nil {
                     strongSelf.path = path
-                    strongSelf.account.messageMediaPreuploadManager.add(network: strongSelf.account.network, postbox: strongSelf.account.postbox, id: strongSelf.id, encrypt: false, tag: nil, source: strongSelf.data.get())
+                    strongSelf.context.engine.resources.preUpload(id: strongSelf.id, encrypt: false, tag: nil, source: strongSelf.data.get())
                 }
                 strongSelf.size = size
                 
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift
index 68fd2ba850..9860b34a9f 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacyMediaPickers.swift
@@ -20,8 +20,6 @@ public func guessMimeTypeByFileExtension(_ ext: String) -> String {
 }
 
 public func configureLegacyAssetPicker(_ controller: TGMediaAssetsController, context: AccountContext, peer: Peer, chatLocation: ChatLocation, captionsEnabled: Bool = true, storeCreatedAssets: Bool = true, showFileTooltip: Bool = false, initialCaption: String, hasSchedule: Bool, presentWebSearch: (() -> Void)?, presentSelectionLimitExceeded: @escaping () -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void, presentTimerPicker: @escaping (@escaping (Int32) -> Void) -> Void, presentStickers: @escaping (@escaping (TelegramMediaFile, Bool, UIView, CGRect) -> Void) -> TGPhotoPaintStickersScreen?) {
-    let isSecretChat = peer.id.namespace == Namespaces.Peer.SecretChat
-    
     let paintStickersContext = LegacyPaintStickersContext(context: context)
     paintStickersContext.presentStickersController = { completion in
         return presentStickers({ file, animated, view, rect in
@@ -67,7 +65,7 @@ public func configureLegacyAssetPicker(_ controller: TGMediaAssetsController, co
 }
 
 public func legacyAssetPicker(context: AccountContext, presentationData: PresentationData, editingMedia: Bool, fileMode: Bool, peer: Peer?, saveEditedPhotos: Bool, allowGrouping: Bool, selectionLimit: Int) -> Signal<(LegacyComponentsContext) -> TGMediaAssetsController, Void> {
-    let isSecretChat = (peer?.id.namespace ?? 0) == Namespaces.Peer.SecretChat
+    let isSecretChat = (peer?.id.namespace._internalGetInt32Value() ?? 0) == Namespaces.Peer.SecretChat._internalGetInt32Value()
     
     return Signal { subscriber in
         let intent = fileMode ? TGMediaAssetsControllerSendFileIntent : TGMediaAssetsControllerSendMediaIntent
@@ -130,18 +128,20 @@ private final class LegacyAssetItemWrapper: NSObject {
     let item: LegacyAssetItem
     let timer: Int?
     let groupedId: Int64?
+    let uniqueId: String?
     
-    init(item: LegacyAssetItem, timer: Int?, groupedId: Int64?) {
+    init(item: LegacyAssetItem, timer: Int?, groupedId: Int64?, uniqueId: String?) {
         self.item = item
         self.timer = timer
         self.groupedId = groupedId
+        self.uniqueId = uniqueId
         
         super.init()
     }
 }
 
-public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?) -> [AnyHashable : Any]?) {
-    return { anyDict, caption, entities, hash in
+public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?, String?) -> [AnyHashable : Any]?) {
+    return { anyDict, caption, entities, hash, uniqueId in
         let dict = anyDict as! NSDictionary
         let stickers = (dict["stickers"] as? [Data])?.compactMap { data -> FileMediaReference? in
             let decoder = PostboxDecoder(buffer: MemoryBuffer(data: data))
@@ -160,10 +160,10 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
                 let url: String? = (dict["url"] as? String) ?? (dict["url"] as? URL)?.path
                 if let url = url {
                     let dimensions = image.size
-                    result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: 4.0), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: false, asAnimation: true, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                    result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: 4.0), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: false, asAnimation: true, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                 }
             } else {
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .image(image), thumbnail: thumbnail, caption: caption, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .image(image), thumbnail: thumbnail, caption: caption, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
             }
             return result
         } else if (dict["type"] as! NSString) == "cloudPhoto" {
@@ -184,9 +184,9 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
                     name = customName
                 }
                 
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .file(data: .asset(asset.backingAsset), thumbnail: thumbnail, mimeType: mimeType, name: name, caption: caption), timer: nil, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .file(data: .asset(asset.backingAsset), thumbnail: thumbnail, mimeType: mimeType, name: name, caption: caption), timer: nil, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
             } else {
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .asset(asset.backingAsset), thumbnail: thumbnail, caption: caption, stickers: []), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .image(data: .asset(asset.backingAsset), thumbnail: thumbnail, caption: caption, stickers: []), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
             }
             return result
         } else if (dict["type"] as! NSString) == "file" {
@@ -207,12 +207,12 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
                     let dimensions = (dict["dimensions"]! as AnyObject).cgSizeValue!
                     let duration = (dict["duration"]! as AnyObject).doubleValue!
                     
-                    result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: tempFileUrl.path, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: nil, caption: caption, asFile: false, asAnimation: true, stickers: []), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                    result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: tempFileUrl.path, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: nil, caption: caption, asFile: false, asAnimation: true, stickers: []), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                     return result
                 }
                 
                 var result: [AnyHashable: Any] = [:]
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .file(data: .tempFile(tempFileUrl.path), thumbnail: thumbnail, mimeType: mimeType, name: name, caption: caption), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .file(data: .tempFile(tempFileUrl.path), thumbnail: thumbnail, mimeType: mimeType, name: name, caption: caption), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                 return result
             }
         } else if (dict["type"] as! NSString) == "video" {
@@ -224,13 +224,13 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
             
             if let asset = dict["asset"] as? TGMediaAsset {
                 var result: [AnyHashable: Any] = [:]
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .asset(asset), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .asset(asset), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                 return result
             } else if let url = (dict["url"] as? String) ?? (dict["url"] as? URL)?.absoluteString {
                 let dimensions = (dict["dimensions"]! as AnyObject).cgSizeValue!
                 let duration = (dict["duration"]! as AnyObject).doubleValue!
                 var result: [AnyHashable: Any] = [:]
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                 return result
             }
         } else if (dict["type"] as! NSString) == "cameraVideo" {
@@ -246,7 +246,7 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
                 let dimensions = previewImage.pixelSize()
                 let duration = (dict["duration"]! as AnyObject).doubleValue!
                 var result: [AnyHashable: Any] = [:]
-                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value)
+                result["item" as NSString] = LegacyAssetItemWrapper(item: .video(data: .tempFile(path: url, dimensions: dimensions, duration: duration), thumbnail: thumbnail, adjustments: dict["adjustments"] as? TGVideoEditAdjustments, caption: caption, asFile: asFile, asAnimation: false, stickers: stickers), timer: (dict["timer"] as? NSNumber)?.intValue, groupedId: (dict["groupedId"] as? NSNumber)?.int64Value, uniqueId: uniqueId)
                 return result
             }
         }
@@ -254,7 +254,7 @@ public func legacyAssetPickerItemGenerator() -> ((Any?, String?, [Any]?, String?
     }
 }
 
-public func legacyEnqueueGifMessage(account: Account, data: Data) -> Signal<EnqueueMessage, Void> {
+public func legacyEnqueueGifMessage(account: Account, data: Data, correlationId: Int64? = nil) -> Signal<EnqueueMessage, Void> {
     return Signal { subscriber in
         if let previewImage = UIImage(data: data) {
             let dimensions = previewImage.size
@@ -263,9 +263,9 @@ public func legacyEnqueueGifMessage(account: Account, data: Data) -> Signal<Enqu
             let thumbnailSize = dimensions.aspectFitted(CGSize(width: 320.0, height: 320.0))
             let thumbnailImage = TGScaleImageToPixelSize(previewImage, thumbnailSize)!
             if let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
-                let resource = LocalFileMediaResource(fileId: arc4random64())
+                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                 account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnailData)
-                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: []))
+                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             
             var randomId: Int64 = 0
@@ -275,7 +275,7 @@ public func legacyEnqueueGifMessage(account: Account, data: Data) -> Signal<Enqu
             let _ = try? FileManager.default.removeItem(atPath: tempFilePath)
             let _ = try? data.write(to: URL(fileURLWithPath: tempFilePath), options: [.atomic])
         
-            let resource = LocalFileGifMediaResource(randomId: arc4random64(), path: tempFilePath)
+            let resource = LocalFileGifMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), path: tempFilePath)
             let fileName: String = "video.mp4"
             
             let finalDimensions = TGMediaVideoConverter.dimensions(for: dimensions, adjustments: nil, preset: TGMediaVideoConversionPresetAnimation)
@@ -285,8 +285,8 @@ public func legacyEnqueueGifMessage(account: Account, data: Data) -> Signal<Enqu
             fileAttributes.append(.FileName(fileName: fileName))
             fileAttributes.append(.Animated)
             
-            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
-            subscriber.putNext(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil))
+            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
+            subscriber.putNext(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: correlationId))
             subscriber.putCompletion()
         } else {
             subscriber.putError(Void())
@@ -296,7 +296,7 @@ public func legacyEnqueueGifMessage(account: Account, data: Data) -> Signal<Enqu
     } |> runOn(Queue.concurrentDefaultQueue())
 }
 
-public func legacyEnqueueVideoMessage(account: Account, data: Data) -> Signal<EnqueueMessage, Void> {
+public func legacyEnqueueVideoMessage(account: Account, data: Data, correlationId: Int64? = nil) -> Signal<EnqueueMessage, Void> {
     return Signal { subscriber in
         if let previewImage = UIImage(data: data) {
             let dimensions = previewImage.size
@@ -305,9 +305,9 @@ public func legacyEnqueueVideoMessage(account: Account, data: Data) -> Signal<En
             let thumbnailSize = dimensions.aspectFitted(CGSize(width: 320.0, height: 320.0))
             let thumbnailImage = TGScaleImageToPixelSize(previewImage, thumbnailSize)!
             if let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
-                let resource = LocalFileMediaResource(fileId: arc4random64())
+                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                 account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnailData)
-                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: []))
+                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             
             var randomId: Int64 = 0
@@ -317,7 +317,7 @@ public func legacyEnqueueVideoMessage(account: Account, data: Data) -> Signal<En
             let _ = try? FileManager.default.removeItem(atPath: tempFilePath)
             let _ = try? data.write(to: URL(fileURLWithPath: tempFilePath), options: [.atomic])
         
-            let resource = LocalFileGifMediaResource(randomId: arc4random64(), path: tempFilePath)
+            let resource = LocalFileGifMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), path: tempFilePath)
             let fileName: String = "video.mp4"
             
             let finalDimensions = TGMediaVideoConverter.dimensions(for: dimensions, adjustments: nil, preset: TGMediaVideoConversionPresetAnimation)
@@ -327,8 +327,8 @@ public func legacyEnqueueVideoMessage(account: Account, data: Data) -> Signal<En
             fileAttributes.append(.FileName(fileName: fileName))
             fileAttributes.append(.Animated)
             
-            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
-            subscriber.putNext(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil))
+            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
+            subscriber.putNext(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: correlationId))
             subscriber.putCompletion()
         } else {
             subscriber.putError(Void())
@@ -338,10 +338,15 @@ public func legacyEnqueueVideoMessage(account: Account, data: Data) -> Signal<En
     } |> runOn(Queue.concurrentDefaultQueue())
 }
 
-public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -> Signal<[EnqueueMessage], Void> {
+public struct LegacyAssetPickerEnqueueMessage {
+    public var message: EnqueueMessage
+    public var uniqueId: String?
+}
+
+public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -> Signal<[LegacyAssetPickerEnqueueMessage], Void> {
     return Signal { subscriber in
         let disposable = SSignal.combineSignals(signals).start(next: { anyValues in
-            var messages: [EnqueueMessage] = []
+            var messages: [LegacyAssetPickerEnqueueMessage] = []
             
             outer: for item in (anyValues as! NSArray) {
                 if let item = (item as? NSDictionary)?.object(forKey: "item") as? LegacyAssetItemWrapper {
@@ -349,12 +354,12 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                         case let .image(data, thumbnail, caption, stickers):
                             var representations: [TelegramMediaImageRepresentation] = []
                             if let thumbnail = thumbnail {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                 let thumbnailSize = thumbnail.size.aspectFitted(CGSize(width: 320.0, height: 320.0))
                                 let thumbnailImage = TGScaleImageToPixelSize(thumbnail, thumbnailSize)!
                                 if let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
                                     account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnailData)
-                                    representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: []))
+                                    representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 }
                             }
                             switch data {
@@ -368,7 +373,7 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                             let _ = try? scaledImageData.write(to: URL(fileURLWithPath: tempFilePath))
 
                                             let resource = LocalFileReferenceMediaResource(localFilePath: tempFilePath, randomId: randomId)
-                                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledSize), resource: resource, progressiveSizes: []))
+                                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                             
                                             var imageFlags: TelegramMediaImageFlags = []
                                                                                         
@@ -391,7 +396,7 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                             }
                                             
                                             var text = caption ?? ""                                            
-                                            messages.append(.message(text: text, attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId))
+                                            messages.append(LegacyAssetPickerEnqueueMessage(message: .message(text: text, attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId, correlationId: nil), uniqueId: item.uniqueId))
                                         }
                                     }
                                 case let .asset(asset):
@@ -399,15 +404,15 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                     arc4random_buf(&randomId, 8)
                                     let size = CGSize(width: CGFloat(asset.pixelWidth), height: CGFloat(asset.pixelHeight))
                                     let scaledSize = size.aspectFittedOrSmaller(CGSize(width: 1280.0, height: 1280.0))
-                                    let resource = PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: arc4random64())
-                                    representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledSize), resource: resource, progressiveSizes: []))
+                                    let resource = PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: Int64.random(in: Int64.min ... Int64.max))
+                                    representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                     
                                     let media = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: randomId), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                                     var attributes: [MessageAttribute] = []
                                     if let timer = item.timer, timer > 0 && timer <= 60 {
                                         attributes.append(AutoremoveTimeoutMessageAttribute(timeout: Int32(timer), countdownBeginTime: nil))
                                     }
-                                    messages.append(.message(text: caption ?? "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId))
+                                    messages.append(LegacyAssetPickerEnqueueMessage(message: .message(text: caption ?? "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId, correlationId: nil), uniqueId: item.uniqueId))
                                 case .tempFile:
                                     break
                             }
@@ -418,13 +423,13 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                     arc4random_buf(&randomId, 8)
                                     let resource = LocalFileReferenceMediaResource(localFilePath: path, randomId: randomId)
                                     let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: nil, attributes: [.FileName(fileName: name)])
-                                    messages.append(.message(text: caption ?? "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId))
+                                    messages.append(LegacyAssetPickerEnqueueMessage(message: .message(text: caption ?? "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId, correlationId: nil), uniqueId: item.uniqueId))
                                 case let .asset(asset):
                                     var randomId: Int64 = 0
                                     arc4random_buf(&randomId, 8)
-                                    let resource = PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: arc4random64())
+                                    let resource = PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: Int64.random(in: Int64.min ... Int64.max))
                                     let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: nil, attributes: [.FileName(fileName: name)])
-                                    messages.append(.message(text: caption ?? "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId))
+                                    messages.append(LegacyAssetPickerEnqueueMessage(message: .message(text: caption ?? "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId, correlationId: nil), uniqueId: item.uniqueId))
                                 default:
                                     break
                             }
@@ -462,12 +467,12 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                             
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if let thumbnail = thumbnail {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                 let thumbnailSize = finalDimensions.aspectFitted(CGSize(width: 320.0, height: 320.0))
                                 let thumbnailImage = TGScaleImageToPixelSize(thumbnail, thumbnailSize)!
                                 if let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
                                     account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnailData)
-                                    previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: []))
+                                    previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 }
                             }
                             
@@ -505,13 +510,13 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                 case let .tempFile(path, _, _):
                                     if asFile || (asAnimation && !path.contains(".jpg")) {
                                         if let size = fileSize(path) {
-                                            resource = LocalFileMediaResource(fileId: arc4random64(), size: size)
+                                            resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max), size: size)
                                             account.postbox.mediaBox.moveResourceData(resource.id, fromTempPath: path)
                                         } else {
                                             continue outer
                                         }
                                     } else {
-                                        resource = LocalFileVideoMediaResource(randomId: arc4random64(), path: path, adjustments: resourceAdjustments)
+                                        resource = LocalFileVideoMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), path: path, adjustments: resourceAdjustments)
                                     }
                             }
                             
@@ -547,12 +552,12 @@ public func legacyAssetPickerEnqueueMessages(account: Account, signals: [Any]) -
                                 fileAttributes.append(.HasLinkedStickers)
                             }
                             
-                            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
+                            let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: fileAttributes)
 
                             if let timer = item.timer, timer > 0 && timer <= 60 {
                                 attributes.append(AutoremoveTimeoutMessageAttribute(timeout: Int32(timer), countdownBeginTime: nil))
                             }
-                            messages.append(.message(text: caption ?? "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId))
+                            messages.append(LegacyAssetPickerEnqueueMessage(message: .message(text: caption ?? "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: item.groupedId, correlationId: nil), uniqueId: item.uniqueId))
                     }
                 }
             }
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacyPaintStickersContext.swift b/submodules/LegacyMediaPickerUI/Sources/LegacyPaintStickersContext.swift
index dbaebce170..78fd73e01b 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacyPaintStickersContext.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacyPaintStickersContext.swift
@@ -21,7 +21,7 @@ protocol LegacyPaintEntity {
 }
 
 private func render(width: Int, height: Int, bytesPerRow: Int, data: Data, type: AnimationRendererFrameType) -> CIImage? {
-    let calculatedBytesPerRow = (4 * Int(width) + 15) & (~15)
+    let calculatedBytesPerRow = (4 * Int(width) + 31) & (~31)
     assert(bytesPerRow == calculatedBytesPerRow)
     
     let image = generateImagePixel(CGSize(width: CGFloat(width), height: CGFloat(height)), scale: 1.0, pixelGenerator: { _, pixelData, bytesPerRow in
@@ -328,7 +328,10 @@ public final class LegacyPaintEntityRenderer: NSObject, TGPhotoPaintEntityRender
             var result: Double
             let minDuration: Double = 3.0
             if durations.count > 1 {
-                result = min(6.0, Double(durations.reduce(1.0) { Double(lcm(Int32($0 * 10.0), Int32($1 * 10.0))) }) / 10.0)
+                let reduced = durations.reduce(1.0) { lhs, rhs -> Double in
+                    return Double(lcm(Int32(lhs * 10.0), Int32(rhs * 10.0)))
+                }
+                result = min(6.0, Double(reduced) / 10.0)
             } else if let duration = durations.first {
                 result = duration
             } else {
diff --git a/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift b/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift
index 53258c65b3..0f247d9fd5 100644
--- a/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift
+++ b/submodules/LegacyMediaPickerUI/Sources/LegacySuggestionContext.swift
@@ -19,7 +19,7 @@ public func legacySuggestionContext(context: AccountContext, peerId: PeerId, cha
                     for peer in peers {
                         if let peer = peer as? TelegramUser {
                             let user = TGUser()
-                            user.uid = peer.id.id
+                            user.uid = peer.id.id._internalGetInt32Value()
                             user.firstName = peer.firstName
                             user.lastName = peer.lastName
                             user.userName = peer.addressName
@@ -46,7 +46,7 @@ public func legacySuggestionContext(context: AccountContext, peerId: PeerId, cha
     }
     suggestionContext.hashtagListSignal = { query in
         return SSignal { subscriber in
-            let disposable = (recentlyUsedHashtags(postbox: context.account.postbox) |> map { hashtags -> [String] in
+            let disposable = (context.engine.messages.recentlyUsedHashtags() |> map { hashtags -> [String] in
                 let normalizedQuery = query?.lowercased()
                 var result: [String] = []
                 if let normalizedQuery = normalizedQuery {
@@ -74,7 +74,7 @@ public func legacySuggestionContext(context: AccountContext, peerId: PeerId, cha
             return SSignal.complete()
         }
         return SSignal { subscriber in
-            let disposable = (searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: inputLanguageCode, query: query, completeMatch: query.count < 3)
+            let disposable = (context.engine.stickers.searchEmojiKeywords(inputLanguageCode: inputLanguageCode, query: query, completeMatch: query.count < 3)
             |> map { keywords -> [TGAlphacodeEntry] in
                 var result: [TGAlphacodeEntry] = []
                 for keyword in keywords {
diff --git a/submodules/LegacyUI/Sources/LegacyController.swift b/submodules/LegacyUI/Sources/LegacyController.swift
index df58f2cbe3..5fdeaa4f3a 100644
--- a/submodules/LegacyUI/Sources/LegacyController.swift
+++ b/submodules/LegacyUI/Sources/LegacyController.swift
@@ -478,7 +478,7 @@ open class LegacyController: ViewController, PresentableController {
         
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
         if let legacyTelegramController = self.legacyController as? TGViewController {
             var duration: TimeInterval = 0.0
             if case let .animated(transitionDuration, _) = transition {
diff --git a/submodules/LegacyUI/Sources/LegacyMediaLocations.swift b/submodules/LegacyUI/Sources/LegacyMediaLocations.swift
index ca8b0fecc8..92d1d6cf68 100644
--- a/submodules/LegacyUI/Sources/LegacyMediaLocations.swift
+++ b/submodules/LegacyUI/Sources/LegacyMediaLocations.swift
@@ -11,7 +11,7 @@ public func legacyImageLocationUri(resource: MediaResource) -> String? {
     return nil
 }
 
-private let legacyImageUriExpr = try? NSRegularExpression(pattern: "telegram-peer-photo-size-([-\\d]+)-([-\\d]+)-([-\\d]+)-([-\\d]+)", options: [])
+private let legacyImageUriExpr = try? NSRegularExpression(pattern: "telegram-peer-photo-size-([-\\d]+)-([-\\d]+)-([-\\d]+)-([-\\d]+)-([-\\d]+)", options: [])
 
 public func resourceFromLegacyImageUri(_ uri: String) -> MediaResource? {
     guard let legacyImageUriExpr = legacyImageUriExpr else {
@@ -21,13 +21,17 @@ public func resourceFromLegacyImageUri(_ uri: String) -> MediaResource? {
     if let match = matches.first {
         let nsString = uri as NSString
         let datacenterId = nsString.substring(with: match.range(at: 1))
-        let size = nsString.substring(with: match.range(at: 2))
-        let volumeId = nsString.substring(with: match.range(at: 3))
-        let localId = nsString.substring(with: match.range(at: 4))
+        let photoId = nsString.substring(with: match.range(at: 2))
+        let size = nsString.substring(with: match.range(at: 3))
+        let volumeId = nsString.substring(with: match.range(at: 4))
+        let localId = nsString.substring(with: match.range(at: 5))
         
         guard let nDatacenterId = Int32(datacenterId) else {
             return nil
         }
+        guard let nPhotoId = Int64(photoId) else {
+            return nil
+        }
         guard let nSizeSpec = Int32(size), let sizeSpec = CloudPeerPhotoSizeSpec(rawValue: nSizeSpec) else {
             return nil
         }
@@ -38,7 +42,7 @@ public func resourceFromLegacyImageUri(_ uri: String) -> MediaResource? {
             return nil
         }
         
-        return CloudPeerPhotoSizeMediaResource(datacenterId: nDatacenterId, sizeSpec: sizeSpec, volumeId: nVolumeId, localId: nLocalId)
+        return CloudPeerPhotoSizeMediaResource(datacenterId: nDatacenterId, photoId: nPhotoId, sizeSpec: sizeSpec, volumeId: nVolumeId, localId: nLocalId)
     }
     return nil
 }
diff --git a/submodules/LegacyUI/Sources/LegacyPeerAvatarPlaceholderDataSource.swift b/submodules/LegacyUI/Sources/LegacyPeerAvatarPlaceholderDataSource.swift
index 54fb835456..cce9f64a41 100644
--- a/submodules/LegacyUI/Sources/LegacyPeerAvatarPlaceholderDataSource.swift
+++ b/submodules/LegacyUI/Sources/LegacyPeerAvatarPlaceholderDataSource.swift
@@ -61,12 +61,12 @@ final class LegacyPeerAvatarPlaceholderDataSource: TGImageDataSource {
                     return EmptyDisposable
                 }
                 
-                var peerId = PeerId(namespace: 0, id: 0)
+                var peerId = PeerId(0)
                 
                 if let uid = args["uid"] as? String, let nUid = Int32(uid) {
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: nUid)
+                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(nUid))
                 } else if let cid = args["cid"] as? String, let nCid = Int32(cid) {
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: nCid)
+                    peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(nCid))
                 }
                 
                 let image = generateImage(CGSize(width: CGFloat(width), height: CGFloat(height)), rotatedContext: { size, context in
@@ -77,10 +77,10 @@ final class LegacyPeerAvatarPlaceholderDataSource: TGImageDataSource {
                     context.clip()
                     
                     let colorIndex: Int
-                    if peerId.id == 0 {
+                    if peerId.id._internalGetInt32Value() == 0 {
                         colorIndex = -1
                     } else {
-                        colorIndex = abs(Int(account.peerId.id + peerId.id))
+                        colorIndex = abs(Int(account.peerId.id._internalGetInt32Value() &+ peerId.id._internalGetInt32Value()))
                     }
                     
                     let colorsArray: NSArray
diff --git a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
index 16a8c05cab..79984fa147 100644
--- a/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
+++ b/submodules/LegacyUI/Sources/TelegramInitializeLegacyComponents.swift
@@ -39,10 +39,6 @@ private final class LegacyComponentsAccessCheckerImpl: NSObject, LegacyComponent
         self.context = context
     }
     
-    public func checkAddressBookAuthorizationStatus(alertDismissComlpetion alertDismissCompletion: (() -> Void)!) -> Bool {
-        return true
-    }
-    
     public func checkPhotoAuthorizationStatus(for intent: TGPhotoAccessIntent, alertDismissCompletion: (() -> Void)!) -> Bool {
         if let context = self.context {
             DeviceAccess.authorizeAccess(to: .mediaLibrary(.send), presentationData: context.sharedContext.currentPresentationData.with { $0 }, present: context.sharedContext.presentGlobalController, openSettings: context.sharedContext.applicationBindings.openSettings, { value in
@@ -58,24 +54,10 @@ private final class LegacyComponentsAccessCheckerImpl: NSObject, LegacyComponent
         return true
     }
     
-    public func checkCameraAuthorizationStatus(for intent: TGCameraAccessIntent, alertDismissCompletion: (() -> Void)!) -> Bool {
-        return true
-    }
-    
-    public func checkLocationAuthorizationStatus(for intent: TGLocationAccessIntent, alertDismissComlpetion alertDismissCompletion: (() -> Void)!) -> Bool {
-        let subject: DeviceAccessLocationSubject
-        if intent == TGLocationAccessIntentSend {
-            subject = .send
-        } else if intent == TGLocationAccessIntentLiveLocation {
-            subject = .live
-        } else if intent == TGLocationAccessIntentTracking {
-            subject = .tracking
-        } else {
-            assertionFailure()
-            subject = .send
-        }
+    public func checkCameraAuthorizationStatus(for intent: TGCameraAccessIntent, completion: ((Bool) -> Void)!, alertDismissCompletion: (() -> Void)!) -> Bool {
         if let context = self.context {
-            DeviceAccess.authorizeAccess(to: .location(subject), presentationData: context.sharedContext.currentPresentationData.with { $0 }, present: context.sharedContext.presentGlobalController, openSettings: context.sharedContext.applicationBindings.openSettings, { value in
+            DeviceAccess.authorizeAccess(to: .camera(.video), presentationData: context.sharedContext.currentPresentationData.with { $0 }, present: context.sharedContext.presentGlobalController, openSettings: context.sharedContext.applicationBindings.openSettings, { value in
+                completion(value)
                 if !value {
                     alertDismissCompletion?()
                 }
@@ -85,25 +67,25 @@ private final class LegacyComponentsAccessCheckerImpl: NSObject, LegacyComponent
     }
 }
 
-private func encodeText(_ string: String, _ key: Int) -> String {
-    var result = ""
-    for c in string.unicodeScalars {
-        result.append(Character(UnicodeScalar(UInt32(Int(c.value) + key))!))
-    }
-    return result
-}
-
-private let keyboardWindowClass: AnyClass? = {
+private func isKeyboardWindow(window: NSObject) -> Bool {
+    let typeName = NSStringFromClass(type(of: window))
     if #available(iOS 9.0, *) {
-        return NSClassFromString(encodeText("VJSfnpufLfzcpbseXjoepx", -1))
+        if typeName.hasPrefix("UI") && typeName.hasSuffix("RemoteKeyboardWindow") {
+            return true
+        }
     } else {
-        return NSClassFromString(encodeText("VJUfyuFggfdutXjoepx", -1))
+        if typeName.hasPrefix("UI") && typeName.hasSuffix("TextEffectsWindow") {
+            return true
+        }
     }
-}()
+    return false
+}
 
 private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyComponentsGlobalsProvider {
     func log(_ string: String!) {
-        print(string)
+        if let string = string {
+            print("\(string)")
+        }
     }
 
     public func effectiveLocalization() -> TGLocalization! {
@@ -119,12 +101,8 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone
     }
     
     public func applicationKeyboardWindow() -> UIWindow! {
-        guard let keyboardWindowClass = keyboardWindowClass else {
-            return nil
-        }
-        
         for window in legacyComponentsApplication?.windows ?? [] {
-            if window.isKind(of: keyboardWindowClass) {
+            if isKeyboardWindow(window: window) {
                 return window
             }
         }
@@ -174,6 +152,10 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone
         legacyOpenUrl(url)
     }
     
+    public func makeViewDisableInteractiveKeyboardGestureRecognizer(_ view: UIView!) {
+        view.disablesInteractiveKeyboardGestureRecognizer = true
+    }
+    
     public func disableUserInteraction(for timeInterval: TimeInterval) {
     }
     
@@ -259,7 +241,7 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone
             theme = defaultPresentationTheme
         }
         let barTheme = theme.rootController.navigationBar
-        return TGNavigationBarPallete(backgroundColor: barTheme.backgroundColor, separatorColor: barTheme.separatorColor, titleColor: barTheme.primaryTextColor, tintColor: barTheme.accentTextColor)
+        return TGNavigationBarPallete(backgroundColor: barTheme.opaqueBackgroundColor, separatorColor: barTheme.separatorColor, titleColor: barTheme.primaryTextColor, tintColor: barTheme.accentTextColor)
     }
     
     func menuSheetPallete() -> TGMenuSheetPallete! {
@@ -275,6 +257,22 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone
         return TGMenuSheetPallete(dark: theme.overallDarkAppearance, backgroundColor: sheetTheme.opaqueItemBackgroundColor, selectionColor: sheetTheme.opaqueItemHighlightedBackgroundColor, separatorColor: sheetTheme.opaqueItemSeparatorColor, accentColor: sheetTheme.controlAccentColor, destructiveColor: sheetTheme.destructiveActionTextColor, textColor: sheetTheme.primaryTextColor, secondaryTextColor: sheetTheme.secondaryTextColor, spinnerColor: sheetTheme.secondaryTextColor, badgeTextColor: sheetTheme.controlAccentColor, badgeImage: nil, cornersImage: generateStretchableFilledCircleImage(diameter: 11.0, color: nil, strokeColor: nil, strokeWidth: nil, backgroundColor: sheetTheme.opaqueItemBackgroundColor))
     }
     
+    func darkMenuSheetPallete() -> TGMenuSheetPallete! {
+        let theme: PresentationTheme
+        if let legacyContext = legacyContext {
+            let presentationData = legacyContext.sharedContext.currentPresentationData.with { $0 }
+            if presentationData.theme.overallDarkAppearance {
+                theme = presentationData.theme
+            } else {
+                theme = defaultDarkColorPresentationTheme
+            }
+        } else {
+            theme = defaultDarkColorPresentationTheme
+        }
+        let sheetTheme = theme.actionSheet
+        return TGMenuSheetPallete(dark: theme.overallDarkAppearance, backgroundColor: sheetTheme.opaqueItemBackgroundColor, selectionColor: sheetTheme.opaqueItemHighlightedBackgroundColor, separatorColor: sheetTheme.opaqueItemSeparatorColor, accentColor: sheetTheme.controlAccentColor, destructiveColor: sheetTheme.destructiveActionTextColor, textColor: sheetTheme.primaryTextColor, secondaryTextColor: sheetTheme.secondaryTextColor, spinnerColor: sheetTheme.secondaryTextColor, badgeTextColor: sheetTheme.controlAccentColor, badgeImage: nil, cornersImage: generateStretchableFilledCircleImage(diameter: 11.0, color: nil, strokeColor: nil, strokeWidth: nil, backgroundColor: sheetTheme.opaqueItemBackgroundColor))
+    }
+    
     func mediaAssetsPallete() -> TGMediaAssetsPallete! {
         let presentationTheme: PresentationTheme
         if let legacyContext = legacyContext {
@@ -288,7 +286,7 @@ private final class LegacyComponentsGlobalsProviderImpl: NSObject, LegacyCompone
         let navigationBar = presentationTheme.rootController.navigationBar
         let tabBar = presentationTheme.rootController.tabBar
         
-        return TGMediaAssetsPallete(dark: presentationTheme.overallDarkAppearance, backgroundColor: theme.plainBackgroundColor, selectionColor: theme.itemHighlightedBackgroundColor, separatorColor: theme.itemPlainSeparatorColor, textColor: theme.itemPrimaryTextColor, secondaryTextColor: theme.controlSecondaryColor, accentColor: theme.itemAccentColor, destructiveColor: theme.itemDestructiveColor, barBackgroundColor: tabBar.backgroundColor, barSeparatorColor: tabBar.separatorColor, navigationTitleColor: navigationBar.primaryTextColor, badge: generateStretchableFilledCircleImage(diameter: 22.0, color: navigationBar.accentTextColor), badgeTextColor: navigationBar.backgroundColor, sendIconImage: PresentationResourcesChat.chatInputPanelSendButtonImage(presentationTheme), doneIconImage: PresentationResourcesChat.chatInputPanelApplyButtonImage(presentationTheme), maybeAccentColor: navigationBar.accentTextColor)
+        return TGMediaAssetsPallete(dark: presentationTheme.overallDarkAppearance, backgroundColor: theme.plainBackgroundColor, selectionColor: theme.itemHighlightedBackgroundColor, separatorColor: theme.itemPlainSeparatorColor, textColor: theme.itemPrimaryTextColor, secondaryTextColor: theme.controlSecondaryColor, accentColor: theme.itemAccentColor, destructiveColor: theme.itemDestructiveColor, barBackgroundColor: navigationBar.opaqueBackgroundColor, barSeparatorColor: tabBar.separatorColor, navigationTitleColor: navigationBar.primaryTextColor, badge: generateStretchableFilledCircleImage(diameter: 22.0, color: navigationBar.accentTextColor), badgeTextColor: navigationBar.opaqueBackgroundColor, sendIconImage: PresentationResourcesChat.chatInputPanelSendButtonImage(presentationTheme), doneIconImage: PresentationResourcesChat.chatInputPanelApplyButtonImage(presentationTheme), maybeAccentColor: navigationBar.accentTextColor)
     }
     
     func checkButtonPallete() -> TGCheckButtonPallete! {
diff --git a/submodules/ListMessageItem/BUILD b/submodules/ListMessageItem/BUILD
index 55edc54d95..46c2804980 100644
--- a/submodules/ListMessageItem/BUILD
+++ b/submodules/ListMessageItem/BUILD
@@ -31,6 +31,8 @@ swift_library(
         "//submodules/MediaPlayer:UniversalMediaPlayer",
         "//submodules/ContextUI:ContextUI",
         "//submodules/FileMediaResourceStatus:FileMediaResourceStatus",
+        "//submodules/ManagedAnimationNode:ManagedAnimationNode",
+        "//submodules/WallpaperResources:WallpaperResources",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/ListMessageItem/Sources/ListMessageDateHeader.swift b/submodules/ListMessageItem/Sources/ListMessageDateHeader.swift
index 9700c275bb..99e90d504e 100644
--- a/submodules/ListMessageItem/Sources/ListMessageDateHeader.swift
+++ b/submodules/ListMessageItem/Sources/ListMessageDateHeader.swift
@@ -42,7 +42,7 @@ final class ListMessageDateHeader: ListViewItemHeader {
     private let month: Int32
     private let year: Int32
     
-    let id: Int64
+    let id: ListViewItemNode.HeaderId
     let theme: PresentationTheme
     let strings: PresentationStrings
     let fontSize: PresentationFontSize
@@ -61,14 +61,15 @@ final class ListMessageDateHeader: ListViewItemHeader {
         self.month = timeinfo.tm_mon
         self.year = timeinfo.tm_year
         
-        self.id = Int64(self.roundedTimestamp)
+        self.id = ListViewItemNode.HeaderId(space: 0, id: Int64(self.roundedTimestamp))
     }
     
     let stickDirection: ListViewItemHeaderStickDirection = .top
+    let stickOverInsets: Bool = true
     
     let height: CGFloat = 28.0
     
-    func node() -> ListViewItemHeaderNode {
+    func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
         return ListMessageDateHeaderNode(theme: self.theme, strings: self.strings, fontSize: self.fontSize, roundedTimestamp: self.roundedTimestamp, month: self.month, year: self.year)
     }
     
diff --git a/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift b/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
index 9484e73626..846e318a9c 100644
--- a/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
+++ b/submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
@@ -19,6 +19,7 @@ import MusicAlbumArtResources
 import UniversalMediaPlayer
 import ContextUI
 import FileMediaResourceStatus
+import ManagedAnimationNode
 
 private let extensionImageCache = Atomic<[UInt32: UIImage]>(value: [:])
 
@@ -87,7 +88,7 @@ private func extensionImage(fileExtension: String?) -> UIImage? {
         return nil
     }
 }
-private let extensionFont = Font.with(size: 15.0, design: .round, traits: [.bold])
+private let extensionFont = Font.with(size: 15.0, design: .round, weight: .bold)
 
 private struct FetchControls {
     let fetch: () -> Void
@@ -184,7 +185,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
     private let playbackStatusDisposable = MetaDisposable()
     private let playbackStatus = Promise<MediaPlayerStatus>()
     
-    private var downloadStatusIconNode: ASImageNode
+    private var downloadStatusIconNode: DownloadIconNode
     private var linearProgressNode: LinearProgressNode?
     
     private var context: AccountContext?
@@ -246,10 +247,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
         self.iconStatusNode = SemanticStatusNode(backgroundNodeColor: .clear, foregroundNodeColor: .white)
         self.iconStatusNode.isUserInteractionEnabled = false
         
-        self.downloadStatusIconNode = ASImageNode()
-        self.downloadStatusIconNode.isLayerBacked = true
-        self.downloadStatusIconNode.displaysAsynchronously = false
-        self.downloadStatusIconNode.displayWithoutProcessing = true
+        self.downloadStatusIconNode = DownloadIconNode()
         
         self.restrictionNode = ASDisplayNode()
         self.restrictionNode.isHidden = true
@@ -422,7 +420,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
                                     descriptionString = "\(stringForDuration(Int32(duration))) • \(performer)"
                                 }
                             } else if let size = file.size {
-                                descriptionString = dataSizeString(size, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator)
+                                descriptionString = dataSizeString(size, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData))
                             } else {
                                 descriptionString = ""
                             }
@@ -514,9 +512,9 @@ public final class ListMessageFileItemNode: ListMessageNode {
                         var descriptionString: String = ""
                         if let size = file.size {
                             if item.isGlobalSearchResult {
-                                descriptionString = (dataSizeString(size, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator))
+                                descriptionString = dataSizeString(size, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData))
                             } else {
-                                descriptionString = "\(dataSizeString(size, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator)) • \(dateString)"
+                                descriptionString = "\(dataSizeString(size, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData))) • \(dateString)"
                             }
                         } else {
                             if !item.isGlobalSearchResult {
@@ -577,6 +575,13 @@ public final class ListMessageFileItemNode: ListMessageNode {
                 
                 if statusUpdated {
                     updatedStatusSignal = messageFileMediaResourceStatus(context: item.context, file: selectedMedia, message: message, isRecentActions: false, isSharedMedia: true, isGlobalSearch: item.isGlobalSearchResult)
+                    |> mapToSignal { value -> Signal<FileMediaResourceStatus, NoError> in
+                        if case .Fetching = value.fetchStatus {
+                            return .single(value) |> delay(0.1, queue: Queue.concurrentDefaultQueue())
+                        } else {
+                            return .single(value)
+                        }
+                    }
                     
                     if isAudio || isInstantVideo {
                         if let currentUpdatedStatusSignal = updatedStatusSignal {
@@ -738,6 +743,8 @@ public final class ListMessageFileItemNode: ListMessageNode {
                         strongSelf.linearProgressNode?.updateTheme(theme: item.presentationData.theme.theme)
                         
                         strongSelf.restrictionNode.backgroundColor = item.presentationData.theme.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.6)
+                        
+                        strongSelf.downloadStatusIconNode.customColor = item.presentationData.theme.theme.list.itemAccentColor
                     }
                     
                     if let (selectionWidth, selectionApply) = selectionNodeWidthAndApply {
@@ -849,7 +856,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
                         }))
                     }
                     
-                    transition.updateFrame(node: strongSelf.downloadStatusIconNode, frame: CGRect(origin: CGPoint(x: leftOffset + leftInset, y: strongSelf.descriptionNode.frame.minY + floor((strongSelf.descriptionNode.frame.height - 12.0) / 2.0)), size: CGSize(width: 12.0, height: 12.0)))
+                    transition.updateFrame(node: strongSelf.downloadStatusIconNode, frame: CGRect(origin: CGPoint(x: leftOffset + leftInset - 3.0, y: strongSelf.descriptionNode.frame.minY + floor((strongSelf.descriptionNode.frame.height - 18.0) / 2.0)), size: CGSize(width: 18.0, height: 18.0)))
                     
                     if let updatedFetchControls = updatedFetchControls {
                         let _ = strongSelf.fetchControls.swap(updatedFetchControls)
@@ -873,7 +880,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
     }
     
     private func updateStatus(transition: ContainedViewLayoutTransition) {
-        guard let item = self.item, let media = self.currentMedia, let fetchStatus = self.fetchStatus, let status = self.resourceStatus, let layoutParams = self.layoutParams, let contentSize = self.contentSizeValue else {
+        guard let item = self.item, let media = self.currentMedia, let _ = self.fetchStatus, let status = self.resourceStatus, let layoutParams = self.layoutParams, let contentSize = self.contentSizeValue else {
             return
         }
         
@@ -990,7 +997,7 @@ public final class ListMessageFileItemNode: ListMessageNode {
                     switch fetchStatus {
                         case let .Fetching(_, progress):
                             if let file = self.currentMedia as? TelegramMediaFile, let size = file.size {
-                                downloadingString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator)) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator))"
+                                downloadingString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData))) / \(dataSizeString(size, forceDecimal: true, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData)))"
                             }
                             descriptionOffset = 14.0
                         case .Remote:
@@ -1015,10 +1022,12 @@ public final class ListMessageFileItemNode: ListMessageNode {
                     transition.updateFrame(node: linearProgressNode, frame: progressFrame)
                     linearProgressNode.updateProgress(value: CGFloat(progress), completion: {})
                     
+                    var animated = true
                     if self.downloadStatusIconNode.supernode == nil {
+                        animated = false
                         self.offsetContainerNode.addSubnode(self.downloadStatusIconNode)
                     }
-                    self.downloadStatusIconNode.image = PresentationResourcesChat.sharedMediaFileDownloadPauseIcon(item.presentationData.theme.theme)
+                    self.downloadStatusIconNode.enqueueState(.pause, animated: animated)
                 case .Local:
                     if let linearProgressNode = self.linearProgressNode {
                         self.linearProgressNode = nil
@@ -1031,7 +1040,6 @@ public final class ListMessageFileItemNode: ListMessageNode {
                     if self.downloadStatusIconNode.supernode != nil {
                         self.downloadStatusIconNode.removeFromSupernode()
                     }
-                    self.downloadStatusIconNode.image = nil
                 case .Remote:
                     if let linearProgressNode = self.linearProgressNode {
                         self.linearProgressNode = nil
@@ -1039,10 +1047,12 @@ public final class ListMessageFileItemNode: ListMessageNode {
                             linearProgressNode?.removeFromSupernode()
                         })
                     }
+                    var animated = true
                     if self.downloadStatusIconNode.supernode == nil {
+                        animated = false
                         self.offsetContainerNode.addSubnode(self.downloadStatusIconNode)
                     }
-                    self.downloadStatusIconNode.image = PresentationResourcesChat.sharedMediaFileDownloadStartIcon(item.presentationData.theme.theme)
+                    self.downloadStatusIconNode.enqueueState(.download, animated: animated)
                 }
         } else {
             if let linearProgressNode = self.linearProgressNode {
@@ -1063,18 +1073,19 @@ public final class ListMessageFileItemNode: ListMessageNode {
             transition.updateFrame(node: self.descriptionNode, frame: descriptionFrame)
         }
         
+        let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
         if downloadingString != nil {
-            self.descriptionProgressNode.isHidden = false
-            self.descriptionNode.isHidden = true
+            alphaTransition.updateAlpha(node: self.descriptionProgressNode, alpha: 1.0)
+            alphaTransition.updateAlpha(node: self.descriptionNode, alpha: 0.0)
         } else {
-            self.descriptionProgressNode.isHidden = true
-            self.descriptionNode.isHidden = false
+            alphaTransition.updateAlpha(node: self.descriptionProgressNode, alpha: 0.0)
+            alphaTransition.updateAlpha(node: self.descriptionNode, alpha: 1.0)
         }
-        let descriptionFont = Font.regular(floor(item.presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))
+        
+        let descriptionFont = Font.with(size: floor(item.presentationData.fontSize.baseDisplaySize * 13.0 / 17.0), design: .regular, weight: .regular, traits: [.monospacedNumbers])
         self.descriptionProgressNode.attributedText = NSAttributedString(string: downloadingString ?? "", font: descriptionFont, textColor: item.presentationData.theme.theme.list.itemSecondaryTextColor)
         let descriptionSize = self.descriptionProgressNode.updateLayout(CGSize(width: size.width - 14.0, height: size.height))
         transition.updateFrame(node: self.descriptionProgressNode, frame: CGRect(origin: self.descriptionNode.frame.origin, size: descriptionSize))
-        
     }
     
     func activateMedia() {
@@ -1107,8 +1118,8 @@ public final class ListMessageFileItemNode: ListMessageNode {
         }
     }
     
-    override public func header() -> ListViewItemHeader? {
-        return self.item?.header
+    override public func headers() -> [ListViewItemHeader]? {
+        return self.item?.header.flatMap { [$0] }
     }
     
     override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
@@ -1269,3 +1280,53 @@ private final class LinearProgressNode: ASDisplayNode {
         self.shimmerNode.frame = CGRect(origin: CGPoint(x: shimmerOffset - shimmerWidth / 2.0, y: 0.0), size: CGSize(width: shimmerWidth, height: 3.0))
     }
 }
+
+private enum DownloadIconNodeState: Equatable {
+    case download
+    case pause
+}
+
+private final class DownloadIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.3
+    private var iconState: DownloadIconNodeState = .download
+    
+    init() {
+        super.init(size: CGSize(width: 18.0, height: 18.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_shareddownload"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: DownloadIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .download:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_shareddownload"), frames: .range(startFrame: 100, endFrame: 120), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_shareddownload"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .download:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_shareddownload"), frames: .range(startFrame: 0, endFrame: 20), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_shareddownload"), frames: .range(startFrame: 60, endFrame: 60), duration: 0.01))
+                        }
+                    case .download:
+                        break
+                }
+        }
+    }
+}
diff --git a/submodules/ListMessageItem/Sources/ListMessageSnippetItemNode.swift b/submodules/ListMessageItem/Sources/ListMessageSnippetItemNode.swift
index 9c55e664a3..209da15c40 100644
--- a/submodules/ListMessageItem/Sources/ListMessageSnippetItemNode.swift
+++ b/submodules/ListMessageItem/Sources/ListMessageSnippetItemNode.swift
@@ -16,8 +16,9 @@ import UrlHandling
 import UrlWhitelist
 import AccountContext
 import TelegramStringFormatting
+import WallpaperResources
 
-private let iconFont = Font.with(size: 30.0, design: .round, traits: [.bold])
+private let iconFont = Font.with(size: 30.0, design: .round, weight: .bold)
 
 private let iconTextBackgroundImage = generateStretchableFilledCircleImage(radius: 6.0, color: UIColor(rgb: 0xFF9500))
 
@@ -253,6 +254,9 @@ public final class ListMessageSnippetItemNode: ListMessageNode {
             var primaryUrl: String?
             
             var isInstantView = false
+
+            var previewWallpaper: TelegramWallpaper?
+            var previewWallpaperFileReference: FileMediaReference?
             
             var selectedMedia: TelegramMediaWebpage?
             var processed = false
@@ -283,6 +287,17 @@ public final class ListMessageSnippetItemNode: ListMessageNode {
                                 iconImageReferenceAndRepresentation = (.message(message: MessageReference(item.message), media: image), representation)
                             }
                         } else if let file = content.file {
+                            if content.type == "telegram_background" {
+                                if let wallpaper = parseWallpaperUrl(content.url) {
+                                    switch wallpaper {
+                                    case let .slug(slug, _, colors, intensity, angle):
+                                        previewWallpaperFileReference = .message(message: MessageReference(item.message), media: file)
+                                        previewWallpaper = .file(id: file.fileId.id, accessHash: 0, isCreator: false, isDefault: false, isPattern: true, isDark: false, slug: slug, file: file, settings: WallpaperSettings(blur: false, motion: false, colors: colors, intensity: intensity, rotation: angle))
+                                    default:
+                                        break
+                                    }
+                                }
+                            }
                             if let representation = smallestImageRepresentation(file.previewRepresentations) {
                                 iconImageReferenceAndRepresentation = (.message(message: MessageReference(item.message), media: file), representation)
                             }
@@ -508,7 +523,9 @@ public final class ListMessageSnippetItemNode: ListMessageNode {
             }
             
             if currentIconImageRepresentation != iconImageReferenceAndRepresentation?.1 {
-                if let iconImageReferenceAndRepresentation = iconImageReferenceAndRepresentation {
+                if let previewWallpaper = previewWallpaper, let fileReference = previewWallpaperFileReference {
+                    updateIconImageSignal = wallpaperThumbnail(account: item.context.account, accountManager: item.context.sharedContext.accountManager, fileReference: fileReference, wallpaper: previewWallpaper, synchronousLoad: false)
+                } else if let iconImageReferenceAndRepresentation = iconImageReferenceAndRepresentation {
                     if let imageReference = iconImageReferenceAndRepresentation.0.concrete(TelegramMediaImage.self) {
                         updateIconImageSignal = chatWebpageSnippetPhoto(account: item.context.account, photoReference: imageReference)
                     } else if let fileReference = iconImageReferenceAndRepresentation.0.concrete(TelegramMediaFile.self) {
@@ -742,8 +759,12 @@ public final class ListMessageSnippetItemNode: ListMessageNode {
         }
     }
     
-    override public func header() -> ListViewItemHeader? {
-        return self.item?.header
+    override public func headers() -> [ListViewItemHeader]? {
+        if let item = self.item {
+            return item.header.flatMap { [$0] }
+        } else {
+            return nil
+        }
     }
     
     override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
diff --git a/submodules/LiveLocationManager/Sources/LiveLocationManager.swift b/submodules/LiveLocationManager/Sources/LiveLocationManager.swift
index 0cb7e547ea..14e1fa6448 100644
--- a/submodules/LiveLocationManager/Sources/LiveLocationManager.swift
+++ b/submodules/LiveLocationManager/Sources/LiveLocationManager.swift
@@ -10,9 +10,7 @@ import AccountContext
 public final class LiveLocationManagerImpl: LiveLocationManager {
     private let queue = Queue.mainQueue()
     
-    private let postbox: Postbox
-    private let network: Network
-    private let stateManager: AccountStateManager
+    private let account: Account
     private let locationManager: DeviceLocationManager
     
     private let summaryManagerImpl: LiveLocationSummaryManagerImpl
@@ -46,16 +44,14 @@ public final class LiveLocationManagerImpl: LiveLocationManager {
     
     private var invalidationTimer: (SwiftSignalKit.Timer, Int32)?
     
-    public init(postbox: Postbox, network: Network, accountPeerId: PeerId, viewTracker: AccountViewTracker, stateManager: AccountStateManager, locationManager: DeviceLocationManager, inForeground: Signal<Bool, NoError>) {
-        self.postbox = postbox
-        self.network = network
-        self.stateManager = stateManager
+    public init(engine: TelegramEngine, account: Account, locationManager: DeviceLocationManager, inForeground: Signal<Bool, NoError>) {
+        self.account = account
         self.locationManager = locationManager
         
-        self.summaryManagerImpl = LiveLocationSummaryManagerImpl(queue: self.queue, postbox: postbox, accountPeerId: accountPeerId, viewTracker: viewTracker)
+        self.summaryManagerImpl = LiveLocationSummaryManagerImpl(queue: self.queue, engine: engine, postbox: account.postbox, accountPeerId: account.peerId, viewTracker: account.viewTracker)
         
         let viewKey: PostboxViewKey = .localMessageTag(.OutgoingLiveLocation)
-        self.messagesDisposable = (postbox.combinedView(keys: [viewKey])
+        self.messagesDisposable = (account.postbox.combinedView(keys: [viewKey])
         |> deliverOn(self.queue)).start(next: { [weak self] view in
             if let strongSelf = self {
                 let timestamp = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
@@ -175,7 +171,7 @@ public final class LiveLocationManagerImpl: LiveLocationManager {
         let addedStopped = stopMessageIds.subtracting(self.stopMessageIds)
         self.stopMessageIds = stopMessageIds
         for id in addedStopped {
-            self.editMessageDisposables.set((requestEditLiveLocation(postbox: self.postbox, network: self.network, stateManager: self.stateManager, messageId: id, stop: true, coordinate: nil, heading: nil, proximityNotificationRadius: nil)
+            self.editMessageDisposables.set((TelegramEngine(account: self.account).messages.requestEditLiveLocation(messageId: id, stop: true, coordinate: nil, heading: nil, proximityNotificationRadius: nil)
                 |> deliverOn(self.queue)).start(completed: { [weak self] in
                     if let strongSelf = self {
                         strongSelf.editMessageDisposables.set(nil, forKey: id)
@@ -230,7 +226,7 @@ public final class LiveLocationManagerImpl: LiveLocationManager {
         let ids = self.broadcastToMessageIds
         let remainingIds = Atomic<Set<MessageId>>(value: Set(ids.keys))
         for id in ids.keys {
-            self.editMessageDisposables.set((requestEditLiveLocation(postbox: self.postbox, network: self.network, stateManager: self.stateManager, messageId: id, stop: false, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude, accuracyRadius: Int32(accuracyRadius)), heading: heading.flatMap { Int32($0) }, proximityNotificationRadius: nil)
+            self.editMessageDisposables.set((TelegramEngine(account: self.account).messages.requestEditLiveLocation(messageId: id, stop: false, coordinate: (latitude: coordinate.latitude, longitude: coordinate.longitude, accuracyRadius: Int32(accuracyRadius)), heading: heading.flatMap { Int32($0) }, proximityNotificationRadius: nil)
             |> deliverOn(self.queue)).start(completed: { [weak self] in
                 if let strongSelf = self {
                     strongSelf.editMessageDisposables.set(nil, forKey: id)
@@ -253,7 +249,7 @@ public final class LiveLocationManagerImpl: LiveLocationManager {
         
         let ids = self.broadcastToMessageIds.keys.filter({ $0.peerId == peerId })
         if !ids.isEmpty {
-            let _ = self.postbox.transaction({ transaction -> Void in
+            let _ = self.account.postbox.transaction({ transaction -> Void in
                 for id in ids {
                     transaction.updateMessage(id, update: { currentMessage in
                         var storeForwardInfo: StoreMessageForwardInfo?
diff --git a/submodules/LiveLocationManager/Sources/LiveLocationSummaryManager.swift b/submodules/LiveLocationManager/Sources/LiveLocationSummaryManager.swift
index 93440b5d88..db91916199 100644
--- a/submodules/LiveLocationManager/Sources/LiveLocationSummaryManager.swift
+++ b/submodules/LiveLocationManager/Sources/LiveLocationSummaryManager.swift
@@ -79,6 +79,7 @@ private final class LiveLocationSummaryContext {
 
 private final class LiveLocationPeerSummaryContext {
     private let queue: Queue
+    private let engine: TelegramEngine
     private let accountPeerId: PeerId
     private let viewTracker: AccountViewTracker
     private let peerId: PeerId
@@ -116,8 +117,9 @@ private final class LiveLocationPeerSummaryContext {
     
     private let peerDisposable = MetaDisposable()
     
-    init(queue: Queue, accountPeerId: PeerId, viewTracker: AccountViewTracker, peerId: PeerId, becameEmpty: @escaping () -> Void) {
+    init(queue: Queue, engine: TelegramEngine, accountPeerId: PeerId, viewTracker: AccountViewTracker, peerId: PeerId, becameEmpty: @escaping () -> Void) {
         self.queue = queue
+        self.engine = engine
         self.accountPeerId = accountPeerId
         self.viewTracker = viewTracker
         self.peerId = peerId
@@ -160,7 +162,7 @@ private final class LiveLocationPeerSummaryContext {
     
     private func updateSubscription() {
         if self.isActive || !self.subscribers.isEmpty {
-            self.peerDisposable.set((topPeerActiveLiveLocationMessages(viewTracker: self.viewTracker, accountPeerId: self.accountPeerId, peerId: self.peerId)
+            self.peerDisposable.set((self.engine.messages.topPeerActiveLiveLocationMessages(peerId: self.peerId)
                 |> deliverOn(self.queue)).start(next: { [weak self] accountPeer, messages in
                     if let strongSelf = self {
                         var peersAndMessages: [(Peer, Message)] = []
@@ -187,6 +189,7 @@ private final class LiveLocationPeerSummaryContext {
 
 public final class LiveLocationSummaryManagerImpl: LiveLocationSummaryManager {
     private let queue: Queue
+    private let engine: TelegramEngine
     private let postbox: Postbox
     private let accountPeerId: PeerId
     private let viewTracker: AccountViewTracker
@@ -194,9 +197,10 @@ public final class LiveLocationSummaryManagerImpl: LiveLocationSummaryManager {
     private let globalContext: LiveLocationSummaryContext
     private var peerContexts: [PeerId: LiveLocationPeerSummaryContext] = [:]
     
-    init(queue: Queue, postbox: Postbox, accountPeerId: PeerId, viewTracker: AccountViewTracker) {
+    init(queue: Queue, engine: TelegramEngine, postbox: Postbox, accountPeerId: PeerId, viewTracker: AccountViewTracker) {
         assert(queue.isCurrent())
         self.queue = queue
+        self.engine = engine
         self.postbox = postbox
         self.accountPeerId = accountPeerId
         self.viewTracker = viewTracker
@@ -212,7 +216,7 @@ public final class LiveLocationSummaryManagerImpl: LiveLocationSummaryManager {
         
         for peerId in peerIds {
             if self.peerContexts[peerId] == nil {
-                let context = LiveLocationPeerSummaryContext(queue: self.queue, accountPeerId: self.accountPeerId, viewTracker: self.viewTracker, peerId: peerId, becameEmpty: { [weak self] in
+                let context = LiveLocationPeerSummaryContext(queue: self.queue, engine: self.engine, accountPeerId: self.accountPeerId, viewTracker: self.viewTracker, peerId: peerId, becameEmpty: { [weak self] in
                     if let strongSelf = self, let context = strongSelf.peerContexts[peerId], context.isEmpty {
                         strongSelf.peerContexts.removeValue(forKey: peerId)
                     }
@@ -242,7 +246,7 @@ public final class LiveLocationSummaryManagerImpl: LiveLocationSummaryManager {
                     if let current = strongSelf.peerContexts[peerId] {
                         context = current
                     } else {
-                        context = LiveLocationPeerSummaryContext(queue: strongSelf.queue, accountPeerId: strongSelf.accountPeerId, viewTracker: strongSelf.viewTracker, peerId: peerId, becameEmpty: {
+                        context = LiveLocationPeerSummaryContext(queue: strongSelf.queue, engine: strongSelf.engine, accountPeerId: strongSelf.accountPeerId, viewTracker: strongSelf.viewTracker, peerId: peerId, becameEmpty: {
                             if let strongSelf = self, let context = strongSelf.peerContexts[peerId], context.isEmpty {
                                 strongSelf.peerContexts.removeValue(forKey: peerId)
                             }
diff --git a/submodules/LiveLocationTimerNode/Sources/ChatMessageLiveLocationTimerNode.swift b/submodules/LiveLocationTimerNode/Sources/ChatMessageLiveLocationTimerNode.swift
index 2294ce1298..16ae49897a 100644
--- a/submodules/LiveLocationTimerNode/Sources/ChatMessageLiveLocationTimerNode.swift
+++ b/submodules/LiveLocationTimerNode/Sources/ChatMessageLiveLocationTimerNode.swift
@@ -4,8 +4,8 @@ import AsyncDisplayKit
 import Display
 import TelegramPresentationData
 
-private let textFont = Font.with(size: 13.0, design: .round, traits: [.bold])
-private let smallTextFont = Font.with(size: 11.0, design: .round, traits: [.bold])
+private let textFont = Font.with(size: 13.0, design: .round, weight: .bold)
+private let smallTextFont = Font.with(size: 11.0, design: .round, weight: .bold)
 
 private class ChatMessageLiveLocationTimerNodeParams: NSObject {
     let backgroundColor: UIColor
diff --git a/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift b/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift
index 78ce35ae8e..bb338c6e11 100644
--- a/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift
+++ b/submodules/LocationUI/Sources/LocationDistancePickerScreen.swift
@@ -115,7 +115,7 @@ final class LocationDistancePickerScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
@@ -552,7 +552,12 @@ class LocationDistancePickerScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
         
         let offset = self.contentContainerNode.frame.height
-        self.wrappingScrollNode.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, additive: true)
+        let position = self.wrappingScrollNode.position
+        let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+        self.wrappingScrollNode.position = CGPoint(x: position.x, y: position.y + offset)
+        transition.animateView({
+            self.wrappingScrollNode.position = position
+        })
     }
     
     func animateOut(completion: (() -> Void)? = nil) {
diff --git a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
index 50b7f715c1..e267dedc67 100644
--- a/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
+++ b/submodules/LocationUI/Sources/LocationMapHeaderNode.swift
@@ -15,7 +15,7 @@ private func generateBackgroundImage(theme: PresentationTheme) -> UIImage? {
         context.clear(CGRect(origin: CGPoint(), size: size))
         
         context.setShadow(offset: CGSize(), blur: 10.0, color: UIColor(rgb: 0x000000, alpha: 0.2).cgColor)
-        context.setFillColor(theme.rootController.navigationBar.backgroundColor.cgColor)
+        context.setFillColor(theme.rootController.navigationBar.opaqueBackgroundColor.cgColor)
         let path = UIBezierPath(roundedRect: CGRect(origin: CGPoint(x: panelInset, y: panelInset), size: CGSize(width: cornerRadius * 2.0, height: cornerRadius * 2.0)), cornerRadius: cornerRadius)
         context.addPath(path.cgPath)
         context.fillPath()
diff --git a/submodules/LocationUI/Sources/LocationOptionsNode.swift b/submodules/LocationUI/Sources/LocationOptionsNode.swift
index 9aee841c66..950f0df748 100644
--- a/submodules/LocationUI/Sources/LocationOptionsNode.swift
+++ b/submodules/LocationUI/Sources/LocationOptionsNode.swift
@@ -19,7 +19,7 @@ final class LocationOptionsNode: ASDisplayNode {
         self.presentationData = presentationData
         
         self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         self.separatorNode = ASDisplayNode()
         self.separatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
         
@@ -47,7 +47,7 @@ final class LocationOptionsNode: ASDisplayNode {
     
     func updatePresentationData(_ presentationData: PresentationData) {
         self.presentationData = presentationData
-        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         self.separatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
         self.segmentedControlNode.updateTheme(SegmentedControlTheme(theme: self.presentationData.theme))
     }
diff --git a/submodules/LocationUI/Sources/LocationPickerController.swift b/submodules/LocationUI/Sources/LocationPickerController.swift
index 0d9fb08ea1..cabb04b08d 100644
--- a/submodules/LocationUI/Sources/LocationPickerController.swift
+++ b/submodules/LocationUI/Sources/LocationPickerController.swift
@@ -319,7 +319,7 @@ public final class LocationPickerController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
     
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func cancelPressed() {
diff --git a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
index e1b9e6cbd9..e43a09a232 100644
--- a/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
+++ b/submodules/LocationUI/Sources/LocationPickerControllerNode.swift
@@ -10,7 +10,6 @@ import SwiftSignalKit
 import MergeLists
 import ItemListUI
 import ItemListVenueItem
-import ActivityIndicator
 import TelegramPresentationData
 import TelegramStringFormatting
 import AccountContext
@@ -41,7 +40,7 @@ private enum LocationPickerEntry: Comparable, Identifiable {
     case location(PresentationTheme, String, String, TelegramMediaMap?, CLLocationCoordinate2D?)
     case liveLocation(PresentationTheme, String, String, CLLocationCoordinate2D?)
     case header(PresentationTheme, String)
-    case venue(PresentationTheme, TelegramMediaMap, Int)
+    case venue(PresentationTheme, TelegramMediaMap?, Int)
     case attribution(PresentationTheme, LocationAttribution)
     
     var stableId: LocationPickerEntryId {
@@ -52,8 +51,8 @@ private enum LocationPickerEntry: Comparable, Identifiable {
                 return .liveLocation
             case .header:
                 return .header
-            case let .venue(_, venue, _):
-                return .venue(venue.venue?.id ?? "")
+            case let .venue(_, venue, index):
+                return .venue(venue?.venue?.id ?? "\(index)")
             case .attribution:
                 return .attribution
         }
@@ -80,7 +79,7 @@ private enum LocationPickerEntry: Comparable, Identifiable {
                     return false
                 }
             case let .venue(lhsTheme, lhsVenue, lhsIndex):
-                if case let .venue(rhsTheme, rhsVenue, rhsIndex) = rhs, lhsTheme === rhsTheme, lhsVenue.venue?.id == rhsVenue.venue?.id, lhsIndex == rhsIndex {
+                if case let .venue(rhsTheme, rhsVenue, rhsIndex) = rhs, lhsTheme === rhsTheme, lhsVenue?.venue?.id == rhsVenue?.venue?.id, lhsIndex == rhsIndex {
                     return true
                 } else {
                     return false
@@ -158,9 +157,9 @@ private enum LocationPickerEntry: Comparable, Identifiable {
             case let .header(_, title):
                 return LocationSectionHeaderItem(presentationData: ItemListPresentationData(presentationData), title: title)
             case let .venue(_, venue, _):
-                let venueType = venue.venue?.type ?? ""
-                return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: venue, style: .plain, action: {
-                    interaction?.sendVenue(venue)
+                let venueType = venue?.venue?.type ?? ""
+                return ItemListVenueItem(presentationData: ItemListPresentationData(presentationData), account: account, venue: venue, style: .plain, action: venue.flatMap { venue in
+                    return { interaction?.sendVenue(venue) }
                 }, infoAction: ["home", "work"].contains(venueType) ? {
                     interaction?.openHomeWorkInfo()
                     } : nil)
@@ -253,7 +252,6 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
     private let listNode: ListView
     private let emptyResultsTextNode: ImmediateTextNode
     private let headerNode: LocationMapHeaderNode
-    private let activityIndicator: ActivityIndicator
     private let shadeNode: ASDisplayNode
     private let innerShadeNode: ASDisplayNode
     
@@ -301,8 +299,6 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
         
         self.optionsNode = LocationOptionsNode(presentationData: presentationData, updateMapMode: interaction.updateMapMode)
         
-        self.activityIndicator = ActivityIndicator(type: .custom(self.presentationData.theme.list.itemSecondaryTextColor, 22.0, 1.0, false))
-        
         self.shadeNode = ASDisplayNode()
         self.shadeNode.backgroundColor = self.presentationData.theme.list.plainBackgroundColor
         self.shadeNode.alpha = 0.0
@@ -316,7 +312,6 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
         self.addSubnode(self.listNode)
         self.addSubnode(self.headerNode)
         self.addSubnode(self.optionsNode)
-        self.listNode.addSubnode(self.activityIndicator)
         self.listNode.addSubnode(self.emptyResultsTextNode)
         self.shadeNode.addSubnode(self.innerShadeNode)
         self.addSubnode(self.shadeNode)
@@ -408,7 +403,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
             throttledUserLocation(userLocation)
             |> mapToSignal { location -> Signal<[TelegramMediaMap]?, NoError> in
                 if let location = location, location.horizontalAccuracy > 0 {
-                    return combineLatest(nearbyVenues(account: context.account, latitude: location.coordinate.latitude, longitude: location.coordinate.longitude), personalVenues)
+                    return combineLatest(nearbyVenues(context: context, latitude: location.coordinate.latitude, longitude: location.coordinate.longitude), personalVenues)
                     |> map { nearbyVenues, personalVenues -> [TelegramMediaMap]? in
                         var resultVenues: [TelegramMediaMap] = []
                         if let personalVenues = personalVenues {
@@ -436,7 +431,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
                 if let coordinate = coordinate {
                     return (.single(nil)
                     |> then(
-                        nearbyVenues(account: context.account, latitude: coordinate.latitude, longitude: coordinate.longitude)
+                        nearbyVenues(context: context, latitude: coordinate.latitude, longitude: coordinate.longitude)
                         |> map { venues -> ([TelegramMediaMap], CLLocation)? in
                             return (venues, CLLocation(latitude: coordinate.latitude, longitude: coordinate.longitude))
                         }
@@ -504,8 +499,8 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
                 entries.append(.header(presentationData.theme, presentationData.strings.Map_ChooseAPlace.uppercased()))
                 
                 let displayedVenues = foundVenues != nil || state.searchingVenuesAround ? foundVenues : venues
+                var index: Int = 0
                 if let venues = displayedVenues {
-                    var index: Int = 0
                     var attribution: LocationAttribution?
                     for venue in venues {
                         if venue.venue?.provider == "foursquare" {
@@ -519,6 +514,11 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
                     if let attribution = attribution {
                         entries.append(.attribution(presentationData.theme, attribution))
                     }
+                } else {
+                    for i in 0 ..< 8 {
+                        entries.append(.venue(presentationData.theme, nil, index))
+                        index += 1
+                    }
                 }
                 let previousEntries = previousEntries.swap(entries)
                 let previousState = previousState.swap(state)
@@ -637,10 +637,10 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
             let headerFrame = CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: max(0.0, offset + overlap)))
             listTransition.updateFrame(node: strongSelf.headerNode, frame: headerFrame)
             strongSelf.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationBarHeight, topPadding: strongSelf.state.displayingMapModeOptions ? 38.0 : 0.0, offset: 0.0, size: headerFrame.size, transition: listTransition)
-            strongSelf.layoutActivityIndicator(transition: listTransition)
+            strongSelf.layoutEmptyResultsPlaceholder(transition: listTransition)
         }
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             guard let strongSelf = self else {
                 return
             }
@@ -755,12 +755,11 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
         
         self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in
             if let strongSelf = self {
-                strongSelf.activityIndicator.isHidden = !transition.isLoading
                 strongSelf.emptyResultsTextNode.isHidden = transition.isLoading || !transition.isEmpty
                 
                 strongSelf.emptyResultsTextNode.attributedText = NSAttributedString(string: strongSelf.presentationData.strings.Map_NoPlacesNearby, font: Font.regular(15.0), textColor: strongSelf.presentationData.theme.list.freeTextColor)
                 
-                strongSelf.layoutActivityIndicator(transition: .immediate)
+                strongSelf.layoutEmptyResultsPlaceholder(transition: .immediate)
             }
         })
     }
@@ -799,7 +798,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
         }
     }
     
-    private func layoutActivityIndicator(transition: ContainedViewLayoutTransition) {
+    private func layoutEmptyResultsPlaceholder(transition: ContainedViewLayoutTransition) {
         guard let (layout, navigationHeight) = self.validLayout else {
             return
         }
@@ -812,10 +811,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
             headerHeight = topInset
         }
         
-        let indicatorSize = self.activityIndicator.measure(CGSize(width: 100.0, height: 100.0))
         let actionsInset: CGFloat = 148.0
-        transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - indicatorSize.width) / 2.0), y: headerHeight + actionsInset + floor((layout.size.height - headerHeight - actionsInset - indicatorSize.height - layout.intrinsicInsets.bottom) / 2.0)), size: indicatorSize))
-        
         let padding: CGFloat = 16.0
         let emptyTextSize = self.emptyResultsTextNode.updateLayout(CGSize(width: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - padding * 2.0, height: CGFloat.greatestFiniteMagnitude))
         transition.updateFrame(node: self.emptyResultsTextNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - emptyTextSize.width) / 2.0), y: headerHeight + actionsInset + floor((layout.size.height - headerHeight - actionsInset - emptyTextSize.height - layout.intrinsicInsets.bottom) / 2.0)), size: emptyTextSize))
@@ -875,7 +871,7 @@ final class LocationPickerControllerNode: ViewControllerTracingNode, CLLocationM
         self.innerShadeNode.frame = CGRect(x: 0.0, y: 4.0, width: layout.size.width, height: 10000.0)
         self.innerShadeNode.alpha = layout.intrinsicInsets.bottom > 0.0 ? 1.0 : 0.0
         
-        self.layoutActivityIndicator(transition: transition)
+        self.layoutEmptyResultsPlaceholder(transition: transition)
         
         if isFirstLayout {
             while !self.enqueuedTransitions.isEmpty {
diff --git a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
index cadd155df2..75fe5a5e7c 100644
--- a/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
+++ b/submodules/LocationUI/Sources/LocationSearchContainerNode.swift
@@ -165,7 +165,7 @@ final class LocationSearchContainerNode: ASDisplayNode {
         }
         |> mapToSignal { query -> Signal<([LocationSearchEntry], String)?, NoError> in
             if let query = query, !query.isEmpty {
-                let foundVenues = nearbyVenues(account: context.account, latitude: coordinate.latitude, longitude: coordinate.longitude, query: query)
+                let foundVenues = nearbyVenues(context: context, latitude: coordinate.latitude, longitude: coordinate.longitude, query: query)
                 |> afterCompleted {
                     isSearching.set(false)
                 }
@@ -224,7 +224,7 @@ final class LocationSearchContainerNode: ASDisplayNode {
             }
         }))
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.interaction.dismissInput()
         }
     }
diff --git a/submodules/LocationUI/Sources/LocationUtils.swift b/submodules/LocationUI/Sources/LocationUtils.swift
index 7d658b057c..604c803418 100644
--- a/submodules/LocationUI/Sources/LocationUtils.swift
+++ b/submodules/LocationUI/Sources/LocationUtils.swift
@@ -5,6 +5,7 @@ import TelegramCore
 import TelegramPresentationData
 import TelegramStringFormatting
 import MapKit
+import AccountContext
 
 extension TelegramMediaMap {
     convenience init(coordinate: CLLocationCoordinate2D, liveBroadcastingTimeout: Int32? = nil, proximityNotificationRadius: Int32? = nil) {
@@ -32,17 +33,17 @@ public func ==(lhs: CLLocationCoordinate2D, rhs: CLLocationCoordinate2D) -> Bool
     return lhs.latitude == rhs.latitude && lhs.longitude == rhs.longitude
 }
 
-public func nearbyVenues(account: Account, latitude: Double, longitude: Double, query: String? = nil) -> Signal<[TelegramMediaMap], NoError> {
-    return account.postbox.transaction { transaction -> SearchBotsConfiguration in
+public func nearbyVenues(context: AccountContext, latitude: Double, longitude: Double, query: String? = nil) -> Signal<[TelegramMediaMap], NoError> {
+    return context.account.postbox.transaction { transaction -> SearchBotsConfiguration in
         return currentSearchBotsConfiguration(transaction: transaction)
     } |> mapToSignal { searchBotsConfiguration in
-        return resolvePeerByName(account: account, name: searchBotsConfiguration.venueBotUsername ?? "foursquare")
+        return context.engine.peers.resolvePeerByName(name: searchBotsConfiguration.venueBotUsername ?? "foursquare")
         |> take(1)
         |> mapToSignal { peerId -> Signal<ChatContextResultCollection?, NoError> in
             guard let peerId = peerId else {
                 return .single(nil)
             }
-            return requestChatContextResults(account: account, botId: peerId, peerId: account.peerId, query: query ?? "", location: .single((latitude, longitude)), offset: "")
+            return context.engine.messages.requestChatContextResults(botId: peerId, peerId: context.account.peerId, query: query ?? "", location: .single((latitude, longitude)), offset: "")
             |> map { results -> ChatContextResultCollection? in
                 return results?.results
             }
diff --git a/submodules/LocationUI/Sources/LocationViewController.swift b/submodules/LocationUI/Sources/LocationViewController.swift
index 14920a2593..54fcf2468a 100644
--- a/submodules/LocationUI/Sources/LocationViewController.swift
+++ b/submodules/LocationUI/Sources/LocationViewController.swift
@@ -192,7 +192,7 @@ public final class LocationViewController: ViewController {
                         return state
                     }
                     
-                    let _ = requestEditLiveLocation(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, messageId: messageId, stop: false, coordinate: nil, heading: nil, proximityNotificationRadius: 0).start(completed: { [weak self] in
+                    let _ = context.engine.messages.requestEditLiveLocation(messageId: messageId, stop: false, coordinate: nil, heading: nil, proximityNotificationRadius: 0).start(completed: { [weak self] in
                         guard let strongSelf = self else {
                             return
                         }
@@ -261,7 +261,7 @@ public final class LocationViewController: ViewController {
                                     return state
                                 }
                                 
-                                let _ = requestEditLiveLocation(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, messageId: messageId, stop: false, coordinate: nil, heading: nil, proximityNotificationRadius: distance).start(completed: { [weak self] in
+                                let _ = context.engine.messages.requestEditLiveLocation(messageId: messageId, stop: false, coordinate: nil, heading: nil, proximityNotificationRadius: distance).start(completed: { [weak self] in
                                     guard let strongSelf = self else {
                                         return
                                     }
@@ -495,7 +495,7 @@ public final class LocationViewController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
     
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func cancelPressed() {
diff --git a/submodules/LocationUI/Sources/LocationViewControllerNode.swift b/submodules/LocationUI/Sources/LocationViewControllerNode.swift
index d2bb4fa7cb..179270366f 100644
--- a/submodules/LocationUI/Sources/LocationViewControllerNode.swift
+++ b/submodules/LocationUI/Sources/LocationViewControllerNode.swift
@@ -279,7 +279,7 @@ final class LocationViewControllerNode: ViewControllerTracingNode, CLLocationMan
             }
         }
         
-        let liveLocations = topPeerActiveLiveLocationMessages(viewTracker: context.account.viewTracker, accountPeerId: context.account.peerId, peerId: subject.id.peerId)
+        let liveLocations = context.engine.messages.topPeerActiveLiveLocationMessages(peerId: subject.id.peerId)
         |> map { _, messages -> [Message] in
             return messages
         }
@@ -537,7 +537,7 @@ final class LocationViewControllerNode: ViewControllerTracingNode, CLLocationMan
             strongSelf.headerNode.updateLayout(layout: layout, navigationBarHeight: navigationBarHeight, topPadding: strongSelf.state.displayingMapModeOptions ? 38.0 : 0.0, offset: 0.0, size: headerFrame.size, transition: listTransition)
         }
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             guard let strongSelf = self else {
                 return
             }
diff --git a/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift b/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift
index 50f8a1402b..1dde44442a 100644
--- a/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift
+++ b/submodules/ManagedAnimationNode/Sources/ManagedAnimationNode.swift
@@ -12,6 +12,8 @@ import SwiftSignalKit
 public final class ManagedAnimationState {
     public let item: ManagedAnimationItem
     private let instance: LottieInstance
+
+    private let displaySize: CGSize
     
     let frameCount: Int
     let fps: Double
@@ -21,15 +23,11 @@ public final class ManagedAnimationState {
     
     public var executedCallbacks = Set<Int>()
     
-    private let renderContext: DrawingContext
-    
     public init?(displaySize: CGSize, item: ManagedAnimationItem, current: ManagedAnimationState?) {
         let resolvedInstance: LottieInstance
-        let renderContext: DrawingContext
         
         if let current = current {
             resolvedInstance = current.instance
-            renderContext = current.renderContext
         } else {
             guard let path = item.source.path else {
                 return nil
@@ -44,20 +42,21 @@ public final class ManagedAnimationState {
                 return nil
             }
             resolvedInstance = instance
-            renderContext = DrawingContext(size: displaySize, scale: UIScreenScale, premultiplied: true, clear: true)
         }
-        
+
+        self.displaySize = displaySize
         self.item = item
         self.instance = resolvedInstance
-        self.renderContext = renderContext
         
         self.frameCount = Int(self.instance.frameCount)
         self.fps = Double(self.instance.frameRate)
     }
     
     func draw() -> UIImage? {
-        self.instance.renderFrame(with: Int32(self.frameIndex ?? 0), into: self.renderContext.bytes.assumingMemoryBound(to: UInt8.self), width: Int32(self.renderContext.size.width * self.renderContext.scale), height: Int32(self.renderContext.size.height * self.renderContext.scale), bytesPerRow: Int32(self.renderContext.bytesPerRow))
-        return self.renderContext.generateImage()
+        let renderContext = DrawingContext(size: self.displaySize, scale: UIScreenScale, clear: true)
+
+        self.instance.renderFrame(with: Int32(self.frameIndex ?? 0), into: renderContext.bytes.assumingMemoryBound(to: UInt8.self), width: Int32(renderContext.size.width * renderContext.scale), height: Int32(renderContext.size.height * renderContext.scale), bytesPerRow: Int32(renderContext.bytesPerRow))
+        return renderContext.generateImage()
     }
 }
 
@@ -133,10 +132,29 @@ open class ManagedAnimationNode: ASDisplayNode {
     private let imageNode: ASImageNode
     private let displayLink: CADisplayLink
     
+    public var imageUpdated: ((UIImage) -> Void)?
+    public var image: UIImage? {
+        return self.imageNode.image
+    }
+    
     public var state: ManagedAnimationState?
     public var trackStack: [ManagedAnimationItem] = []
     public var didTryAdvancingState = false
     
+    public var customColor: UIColor? {
+        didSet {
+            if let customColor = self.customColor, oldValue?.rgb != customColor.rgb {
+                self.imageNode.image = generateTintedImage(image: self.imageNode.image, color: customColor)
+            }
+        }
+    }
+    
+    public var scale: CGFloat = 1.0 {
+        didSet {
+            self.imageNode.transform = CATransform3DMakeScale(self.scale, self.scale, 1.0)
+        }
+    }
+    
     public init(size: CGSize) {
         self.intrinsicSize = size
         
@@ -242,7 +260,12 @@ open class ManagedAnimationNode: ASDisplayNode {
         if state.frameIndex != frameIndex {
             state.frameIndex = frameIndex
             if let image = state.draw() {
-                self.imageNode.image = image
+                if let customColor = self.customColor {
+                    self.imageNode.image = generateTintedImage(image: image, color: customColor)
+                } else {
+                    self.imageNode.image = image
+                }
+                self.imageUpdated?(image)
             }
             
             for (callbackFrame, callback) in state.item.callbacks {
@@ -274,4 +297,11 @@ open class ManagedAnimationNode: ASDisplayNode {
         self.didTryAdvancingState = false
         self.updateAnimation()
     }
+    
+    open override func layout() {
+        super.layout()
+        
+        self.imageNode.bounds = self.bounds
+        self.imageNode.position = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0)
+    }
 }
diff --git a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSource.swift b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSource.swift
index 3c86dc17ca..83fb2ab4e5 100644
--- a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSource.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSource.swift
@@ -283,6 +283,9 @@ public final class FFMpegMediaFrameSource: NSObject, MediaFrameSource {
                                 let _ = currentSemaphore.swap(nil)
                                 subscriber.putError(.generic)
                             }
+                        } else {
+                            let _ = currentSemaphore.swap(nil)
+                            subscriber.putError(.generic)
                         }
                     }
                 })
diff --git a/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift b/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
index 14c0330554..83e84af1f3 100644
--- a/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
@@ -1,10 +1,30 @@
+
+#if !os(macOS)
 import UIKit
+#else
+import AppKit
+#endif
 import CoreMedia
 import Accelerate
 import FFMpegBinding
 
 private let bufferCount = 32
 
+
+
+#if os(macOS)
+private let deviceColorSpace: CGColorSpace = {
+    if #available(OSX 10.11.2, *) {
+        if let colorSpace = CGColorSpace(name: CGColorSpace.displayP3) {
+            return colorSpace
+        } else {
+            return CGColorSpaceCreateDeviceRGB()
+        }
+    } else {
+        return CGColorSpaceCreateDeviceRGB()
+    }
+}()
+#else
 private let deviceColorSpace: CGColorSpace = {
     if #available(iOSApplicationExtension 9.3, iOS 9.3, *) {
         if let colorSpace = CGColorSpace(name: CGColorSpace.displayP3) {
@@ -16,7 +36,7 @@ private let deviceColorSpace: CGColorSpace = {
         return CGColorSpaceCreateDeviceRGB()
     }
 }()
-
+#endif
 public final class FFMpegMediaVideoFrameDecoder: MediaTrackFrameDecoder {
     public enum ReceiveResult {
         case error
@@ -202,7 +222,7 @@ public final class FFMpegMediaVideoFrameDecoder: MediaTrackFrameDecoder {
         var srcCb = vImage_Buffer(data: frame.data[1], height: vImagePixelCount(frame.height), width: vImagePixelCount(frame.width / 2), rowBytes: Int(frame.lineSize[1]))
         var srcCr = vImage_Buffer(data: frame.data[2], height: vImagePixelCount(frame.height), width: vImagePixelCount(frame.width / 2), rowBytes: Int(frame.lineSize[2]))
         
-        let argbBytesPerRow = (4 * Int(frame.width) + 15) & (~15)
+        let argbBytesPerRow = (4 * Int(frame.width) + 31) & (~31)
         let argbLength = argbBytesPerRow * Int(frame.height)
         let argb = malloc(argbLength)!
         guard let provider = CGDataProvider(dataInfo: argb, data: argb, size: argbLength, releaseData: { bytes, _, _ in
diff --git a/submodules/MediaPlayer/Sources/MediaPlayer.swift b/submodules/MediaPlayer/Sources/MediaPlayer.swift
index 315f8c85c3..72ea0fed6c 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayer.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayer.swift
@@ -284,15 +284,11 @@ private final class MediaPlayerContext {
             }
             let currentTimestamp = CMTimeGetSeconds(CMTimebaseGetTime(loadedState.controlTimebase.timebase))
             var duration: Double = 0.0
-            var videoStatus: MediaTrackFrameBufferStatus?
             if let videoTrackFrameBuffer = loadedState.mediaBuffers.videoBuffer {
-                videoStatus = videoTrackFrameBuffer.status(at: currentTimestamp)
                 duration = max(duration, CMTimeGetSeconds(videoTrackFrameBuffer.duration))
             }
-            
-            var audioStatus: MediaTrackFrameBufferStatus?
+
             if let audioTrackFrameBuffer = loadedState.mediaBuffers.audioBuffer {
-                audioStatus = audioTrackFrameBuffer.status(at: currentTimestamp)
                 duration = max(duration, CMTimeGetSeconds(audioTrackFrameBuffer.duration))
             }
             loadedDuration = duration
@@ -447,6 +443,7 @@ private final class MediaPlayerContext {
         
         switch self.state {
             case .empty:
+                self.stoppedAtEnd = false
                 self.lastStatusUpdateTimestamp = nil
                 if self.enableSound {
                     let queue = self.queue
@@ -476,6 +473,7 @@ private final class MediaPlayerContext {
                 }
                 self.seek(timestamp: 0.0, action: .play)
             case let .seeking(frameSource, timestamp, seekState, disposable, _, enableSound):
+                self.stoppedAtEnd = false
                 self.state = .seeking(frameSource: frameSource, timestamp: timestamp, seekState: seekState, disposable: disposable, action: .play, enableSound: enableSound)
                 self.lastStatusUpdateTimestamp = nil
             case let .paused(loadedState):
@@ -499,12 +497,14 @@ private final class MediaPlayerContext {
                     fadeTimer.start()
                 }
                 
-                if loadedState.lostAudioSession {
+                if loadedState.lostAudioSession && !self.stoppedAtEnd {
+                    self.stoppedAtEnd = false
                     let timestamp = CMTimeGetSeconds(CMTimebaseGetTime(loadedState.controlTimebase.timebase))
                     self.seek(timestamp: timestamp, action: .play)
                 } else {
                     self.lastStatusUpdateTimestamp = nil
                     if self.stoppedAtEnd {
+                        self.stoppedAtEnd = false
                         self.seek(timestamp: 0.0, action: .play)
                     } else {
                         self.state = .playing(loadedState)
@@ -512,10 +512,8 @@ private final class MediaPlayerContext {
                     }
                 }
             case .playing:
-                break
+                self.stoppedAtEnd = false
         }
-        
-        self.stoppedAtEnd = false
     }
     
     fileprivate func playOnceWithSound(playAndRecord: Bool, seek: MediaPlayerSeek = .start) {
@@ -962,28 +960,28 @@ private final class MediaPlayerContext {
             self.playerStatus.set(.single(status))
             let _ = self.playerStatusValue.swap(status)
         }
-        
-        if performActionAtEndNow && !self.stoppedAtEnd {
-            switch self.actionAtEnd {
-                case let .loop(f):
-                    self.stoppedAtEnd = false
-                    self.seek(timestamp: 0.0, action: .play)
-                    f?()
-                case .stop:
-                    self.stoppedAtEnd = true
-                    self.pause(lostAudioSession: false)
-                case let .action(f):
-                    self.stoppedAtEnd = true
-                    self.pause(lostAudioSession: false)
-                    f()
-                case let .loopDisablingSound(f):
-                    self.stoppedAtEnd = false
-                    self.enableSound = false
-                    self.seek(timestamp: 0.0, action: .play)
-                    f()
+
+        if performActionAtEndNow {
+            if !self.stoppedAtEnd {
+                switch self.actionAtEnd {
+                    case let .loop(f):
+                        self.stoppedAtEnd = false
+                        self.seek(timestamp: 0.0, action: .play)
+                        f?()
+                    case .stop:
+                        self.stoppedAtEnd = true
+                        self.pause(lostAudioSession: false)
+                    case let .action(f):
+                        self.stoppedAtEnd = true
+                        self.pause(lostAudioSession: false)
+                        f()
+                    case let .loopDisablingSound(f):
+                        self.stoppedAtEnd = false
+                        self.enableSound = false
+                        self.seek(timestamp: 0.0, action: .play)
+                        f()
+                }
             }
-        } else {
-            self.stoppedAtEnd = false
         }
     }
 }
diff --git a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
index b7ce647975..b97a260cb9 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayerScrubbingNode.swift
@@ -317,13 +317,17 @@ public final class MediaPlayerScrubbingNode: ASDisplayNode {
             if value != self._statusValue {
                 if let value = value, value.seekId == self.ignoreSeekId {
                 } else {
+                    let previousStatusValue = self._statusValue
                     self._statusValue = value
                     self.updateProgressAnimations()
                     
-                    let playbackStatus = value?.status
+                    var playbackStatus = value?.status
                     if self.playbackStatusValue != playbackStatus {
                         self.playbackStatusValue = playbackStatus
                         if let playbackStatusUpdated = self.playbackStatusUpdated {
+                            if playbackStatus == .paused, previousStatusValue?.status == .playing, let value = value, value.timestamp > value.duration - 0.1 {
+                                playbackStatus = .playing
+                            }
                             playbackStatusUpdated(playbackStatus)
                         }
                     }
diff --git a/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift b/submodules/MediaPlayer/Sources/TimeBasedVideoPreload.swift
similarity index 90%
rename from submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
rename to submodules/MediaPlayer/Sources/TimeBasedVideoPreload.swift
index 2015895dab..bc6a8bc7ef 100644
--- a/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
+++ b/submodules/MediaPlayer/Sources/TimeBasedVideoPreload.swift
@@ -5,9 +5,8 @@ import Postbox
 import TelegramCore
 import SyncCore
 import FFMpegBinding
-import UniversalMediaPlayer
 
-func preloadVideoResource(postbox: Postbox, resourceReference: MediaResourceReference, duration: Double) -> Signal<Never, NoError> {
+public func preloadVideoResource(postbox: Postbox, resourceReference: MediaResourceReference, duration: Double) -> Signal<Never, NoError> {
     return Signal { subscriber in
         let queue = Queue()
         let disposable = MetaDisposable()
diff --git a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
index ea1cfbccc7..54f11eb402 100644
--- a/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
+++ b/submodules/MediaResources/Sources/CachedResourceRepresentations.swift
@@ -117,70 +117,6 @@ public final class CachedBlurredWallpaperRepresentation: CachedMediaResourceRepr
     }
 }
 
-public final class CachedPatternWallpaperMaskRepresentation: CachedMediaResourceRepresentation {
-    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
-    
-    public let size: CGSize?
-    
-    public var uniqueId: String {
-        if let size = self.size {
-            return "pattern-wallpaper-mask-\(Int(size.width))x\(Int(size.height))"
-        } else {
-            return "pattern-wallpaper-mask"
-        }
-    }
-    
-    public init(size: CGSize?) {
-        self.size = size
-    }
-    
-    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
-        if let to = to as? CachedPatternWallpaperMaskRepresentation {
-            return self.size == to.size
-        } else {
-            return false
-        }
-    }
-}
-
-
-public final class CachedPatternWallpaperRepresentation: CachedMediaResourceRepresentation {
-    public let keepDuration: CachedMediaRepresentationKeepDuration = .general
-    
-    public let color: UInt32
-    public let bottomColor: UInt32?
-    public let intensity: Int32
-    public let rotation: Int32?
-    
-    public var uniqueId: String {
-        var id: String
-        if let bottomColor = self.bottomColor {
-            id = "pattern-wallpaper-\(self.color)-\(bottomColor)-\(self.intensity)"
-        } else {
-            id = "pattern-wallpaper-\(self.color)-\(self.intensity)"
-        }
-        if let rotation = self.rotation, rotation != 0 {
-            id += "-\(rotation)deg"
-        }
-        return id
-    }
-    
-    public init(color: UInt32, bottomColor: UInt32?, intensity: Int32, rotation: Int32?) {
-        self.color = color
-        self.bottomColor = bottomColor
-        self.intensity = intensity
-        self.rotation = rotation
-    }
-    
-    public func isEqual(to: CachedMediaResourceRepresentation) -> Bool {
-        if let to = to as? CachedPatternWallpaperRepresentation {
-            return self.color == to.color && self.bottomColor == to.bottomColor && self.intensity == intensity && self.rotation == to.rotation
-        } else {
-            return false
-        }
-    }
-}
-
 public final class CachedAlbumArtworkRepresentation: CachedMediaResourceRepresentation {
     public let keepDuration: CachedMediaRepresentationKeepDuration = .general
     
diff --git a/submodules/MessageReactionListUI/Sources/MessageReactionCategoryNode.swift b/submodules/MessageReactionListUI/Sources/MessageReactionCategoryNode.swift
deleted file mode 100644
index a71caccd9c..0000000000
--- a/submodules/MessageReactionListUI/Sources/MessageReactionCategoryNode.swift
+++ /dev/null
@@ -1,104 +0,0 @@
-import Foundation
-import AsyncDisplayKit
-import Display
-import TelegramPresentationData
-import TelegramCore
-import SyncCore
-
-final class MessageReactionCategoryNode: ASDisplayNode {
-    let category: MessageReactionListCategory
-    private let action: () -> Void
-    
-    private let buttonNode: HighlightableButtonNode
-    private let highlightedBackgroundNode: ASImageNode
-    private let iconNode: ASImageNode
-    private let emojiNode: ImmediateTextNode
-    private let countNode: ImmediateTextNode
-    
-    var isSelected = false {
-        didSet {
-            self.highlightedBackgroundNode.alpha = self.isSelected ? 1.0 : 0.0
-        }
-    }
-    
-    init(theme: PresentationTheme, category: MessageReactionListCategory, count: Int, action: @escaping () -> Void) {
-        self.category = category
-        self.action = action
-        
-        self.buttonNode = HighlightableButtonNode()
-        
-        self.highlightedBackgroundNode = ASImageNode()
-        self.highlightedBackgroundNode.displaysAsynchronously = false
-        self.highlightedBackgroundNode.displayWithoutProcessing = true
-        self.highlightedBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 18.0, color: UIColor(rgb: 0xe6e6e8))
-        self.highlightedBackgroundNode.alpha = 1.0
-        
-        self.iconNode = ASImageNode()
-        
-        self.emojiNode = ImmediateTextNode()
-        self.emojiNode.displaysAsynchronously = false
-        let emojiText: String
-        switch category {
-        case .all:
-            emojiText = ""
-            self.iconNode.image = PresentationResourcesChat.chatInputTextFieldTimerImage(theme)
-        case let .reaction(value):
-            emojiText = value
-        }
-        self.emojiNode.attributedText = NSAttributedString(string: emojiText, font: Font.regular(18.0), textColor: .black)
-        
-        self.countNode = ImmediateTextNode()
-        self.countNode.displaysAsynchronously = false
-        self.countNode.attributedText = NSAttributedString(string: "\(count)", font: Font.regular(16.0), textColor: .black)
-        
-        super.init()
-        
-        self.addSubnode(self.highlightedBackgroundNode)
-        self.addSubnode(self.iconNode)
-        self.addSubnode(self.emojiNode)
-        self.addSubnode(self.countNode)
-        self.addSubnode(self.buttonNode)
-        
-        self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
-    }
-    
-    func updateLayout() -> CGSize {
-        let sideInset: CGFloat = 6.0
-        let spacing: CGFloat = 2.0
-        let emojiSize = self.emojiNode.updateLayout(CGSize(width: 100.0, height: 100.0))
-        let iconSize = self.iconNode.image?.size ?? CGSize()
-        let countSize = self.countNode.updateLayout(CGSize(width: 100.0, height: 100.0))
-        
-        let height: CGFloat = 60.0
-        let backgroundHeight: CGFloat = 36.0
-        
-        self.emojiNode.frame = CGRect(origin: CGPoint(x: sideInset, y: floor((height - emojiSize.height) / 2.0)), size: emojiSize)
-        self.iconNode.frame = CGRect(origin: CGPoint(x: sideInset, y: floor((height - iconSize.height) / 2.0)), size: iconSize)
-        
-        let iconFrame: CGRect
-        if self.iconNode.image != nil {
-            iconFrame = self.iconNode.frame
-        } else {
-            iconFrame = self.emojiNode.frame
-        }
-        
-        self.countNode.frame = CGRect(origin: CGPoint(x: iconFrame.maxX + spacing, y: floor((height - countSize.height) / 2.0)), size: countSize)
-        let contentWidth = sideInset * 2.0 + spacing + iconFrame.width + countSize.width
-        self.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: floor((height - backgroundHeight) / 2.0)), size: CGSize(width: contentWidth, height: backgroundHeight))
-        
-        let size = CGSize(width: contentWidth, height: height)
-        self.buttonNode.frame = CGRect(origin: CGPoint(), size: size)
-        return size
-    }
-    
-    @objc private func buttonPressed() {
-        self.action()
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        if self.buttonNode.frame.contains(point) {
-            return self.buttonNode.view
-        }
-        return nil
-    }
-}
diff --git a/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift b/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift
deleted file mode 100644
index 94374463e3..0000000000
--- a/submodules/MessageReactionListUI/Sources/MessageReactionListController.swift
+++ /dev/null
@@ -1,447 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-import Display
-import AccountContext
-import TelegramPresentationData
-import Postbox
-import TelegramCore
-import SyncCore
-import SwiftSignalKit
-import MergeLists
-import ItemListPeerItem
-import ItemListUI
-
-public final class MessageReactionListController: ViewController {
-    private let context: AccountContext
-    private let messageId: MessageId
-    private let presentationData: PresentationData
-    private let initialReactions: [MessageReaction]
-    
-    private var controllerNode: MessageReactionListControllerNode {
-        return self.displayNode as! MessageReactionListControllerNode
-    }
-    
-    private var animatedIn: Bool = false
-    
-    private let _ready = Promise<Bool>()
-    override public var ready: Promise<Bool> {
-        return self._ready
-    }
-    
-    public init(context: AccountContext, messageId: MessageId, initialReactions: [MessageReaction]) {
-        self.context = context
-        self.messageId = messageId
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        self.initialReactions = initialReactions
-        
-        super.init(navigationBarPresentationData: nil)
-        
-        self.statusBar.statusBarStyle = .Ignore
-    }
-    
-    required public init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    override public func loadDisplayNode() {
-        self.displayNode = MessageReactionListControllerNode(context: self.context, presentationData: self.presentationData, messageId: messageId, initialReactions: initialReactions, dismiss: { [weak self] in
-            self?.dismiss()
-        })
-        
-        super.displayNodeDidLoad()
-        
-        self._ready.set(self.controllerNode.isReady.get())
-    }
-    
-    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        super.containerLayoutUpdated(layout, transition: transition)
-        
-        self.controllerNode.containerLayoutUpdated(layout: layout, transition: transition)
-    }
-    
-    override public func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if !self.animatedIn {
-            self.animatedIn = true
-            self.controllerNode.animateIn()
-        }
-    }
-    
-    override public func dismiss(completion: (() -> Void)? = nil) {
-        self.controllerNode.animateOut(completion: { [weak self] in
-            self?.presentingViewController?.dismiss(animated: false, completion: nil)
-            completion?()
-        })
-    }
-}
-
-private struct MessageReactionListTransaction {
-    let deletions: [ListViewDeleteItem]
-    let insertions: [ListViewInsertItem]
-    let updates: [ListViewUpdateItem]
-}
-
-private struct MessageReactionListEntry: Comparable, Identifiable {
-    let index: Int
-    let item: MessageReactionListCategoryItem
-    
-    var stableId: PeerId {
-        return self.item.peer.id
-    }
-    
-    static func <(lhs: MessageReactionListEntry, rhs: MessageReactionListEntry) -> Bool {
-        return lhs.index < rhs.index
-    }
-    
-    func item(context: AccountContext, presentationData: PresentationData) -> ListViewItem {
-        return ItemListPeerItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: self.item.peer, height: .peerList, nameStyle: .distinctBold, presence: nil, text: .none, label: .text(self.item.reaction, .custom(Font.regular(19.0))), editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: false, sectionId: 0, action: {
-            
-        }, setPeerIdWithRevealedOptions: { _, _ in }, removePeer: { _ in }, noInsets: true, tag: nil)
-    }
-}
-
-private func preparedTransition(from fromEntries: [MessageReactionListEntry], to toEntries: [MessageReactionListEntry], context: AccountContext, presentationData: PresentationData) -> MessageReactionListTransaction {
-    let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
-    
-    let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
-    let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData), directionHint: nil) }
-    let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, presentationData: presentationData), directionHint: nil) }
-    
-    return MessageReactionListTransaction(deletions: deletions, insertions: insertions, updates: updates)
-}
-
-private let headerHeight: CGFloat = 60.0
-private let itemHeight: CGFloat = 50.0
-
-private func topInsetForLayout(layout: ContainerViewLayout, itemCount: Int) -> CGFloat {
-    let contentHeight = CGFloat(itemCount) * itemHeight
-    let minimumItemHeights: CGFloat = max(contentHeight, itemHeight * 5.0)
-    
-    return max(layout.size.height - layout.intrinsicInsets.bottom - minimumItemHeights, headerHeight)
-}
-
-private final class MessageReactionListControllerNode: ViewControllerTracingNode {
-    private let context: AccountContext
-    private let presentationData: PresentationData
-    private let dismiss: () -> Void
-    
-    private let listContext: MessageReactionListContext
-    
-    private let dimNode: ASDisplayNode
-    private let backgroundNode: ASDisplayNode
-    private let contentHeaderContainerNode: ASDisplayNode
-    private let contentHeaderContainerBackgroundNode: ASImageNode
-    private let contentHeaderContainerSeparatorNode: ASDisplayNode
-    private var categoryItemNodes: [MessageReactionCategoryNode] = []
-    private let categoryScrollNode: ASScrollNode
-    private let listNode: ListView
-    private var placeholderNode: MessageReactionListLoadingPlaceholder?
-    private var placeholderNodeIsAnimatingOut = false
-    
-    private var validLayout: ContainerViewLayout?
-    
-    private var currentCategory: MessageReactionListCategory = .all
-    private var currentState: MessageReactionListState?
-    
-    private var enqueuedTransactions: [MessageReactionListTransaction] = []
-    
-    private let disposable = MetaDisposable()
-    
-    let isReady = Promise<Bool>()
-    
-    private var forceHeaderTransition: ContainedViewLayoutTransition?
-    
-    init(context: AccountContext, presentationData: PresentationData, messageId: MessageId, initialReactions: [MessageReaction], dismiss: @escaping () -> Void) {
-        self.context = context
-        self.presentationData = presentationData
-        self.dismiss = dismiss
-        
-        self.dimNode = ASDisplayNode()
-        self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
-        
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = self.presentationData.theme.actionSheet.opaqueItemBackgroundColor
-        
-        self.contentHeaderContainerNode = ASDisplayNode()
-        self.contentHeaderContainerBackgroundNode = ASImageNode()
-        self.contentHeaderContainerBackgroundNode.displaysAsynchronously = false
-        
-        self.contentHeaderContainerSeparatorNode = ASDisplayNode()
-        self.contentHeaderContainerSeparatorNode.backgroundColor = self.presentationData.theme.list.itemPlainSeparatorColor
-        
-        self.categoryScrollNode = ASScrollNode()
-        self.contentHeaderContainerBackgroundNode.displayWithoutProcessing = true
-        self.contentHeaderContainerBackgroundNode.image = generateImage(CGSize(width: 10.0, height: 10.0), rotatedContext: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(presentationData.theme.rootController.navigationBar.backgroundColor.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
-            context.fill(CGRect(origin: CGPoint(x: 0.0, y: size.height / 2.0), size: CGSize(width: size.width, height: size.height / 2.0)))
-        })?.stretchableImage(withLeftCapWidth: 5, topCapHeight: 5)
-        
-        self.listNode = ListView()
-        self.listNode.limitHitTestToNodes = true
-        self.listNode.accessibilityPageScrolledString = { row, count in
-            return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
-        }
-        
-        self.placeholderNode = MessageReactionListLoadingPlaceholder(theme: presentationData.theme, itemHeight: itemHeight)
-        self.placeholderNode?.isUserInteractionEnabled = false
-        
-        self.listContext = MessageReactionListContext(postbox: self.context.account.postbox, network: self.context.account.network, messageId: messageId, initialReactions: initialReactions)
-        
-        super.init()
-        
-        self.addSubnode(self.dimNode)
-        self.addSubnode(self.backgroundNode)
-        
-        self.listNode.stackFromBottom = false
-        self.addSubnode(self.listNode)
-        self.placeholderNode.flatMap(self.addSubnode)
-        
-        self.addSubnode(self.contentHeaderContainerNode)
-        self.contentHeaderContainerNode.addSubnode(self.contentHeaderContainerBackgroundNode)
-        self.contentHeaderContainerNode.addSubnode(self.contentHeaderContainerSeparatorNode)
-        self.contentHeaderContainerNode.addSubnode(self.categoryScrollNode)
-        
-        self.listNode.updateFloatingHeaderOffset = { [weak self] offset, listTransition in
-            guard let strongSelf = self, let layout = strongSelf.validLayout else {
-                return
-            }
-            
-            let transition = strongSelf.forceHeaderTransition ?? listTransition
-            strongSelf.forceHeaderTransition = nil
-            
-            let topOffset = offset
-            transition.updateFrame(node: strongSelf.contentHeaderContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: topOffset - headerHeight), size: CGSize(width: layout.size.width, height: headerHeight)))
-            transition.updateFrame(node: strongSelf.contentHeaderContainerBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: headerHeight)))
-            transition.updateFrame(node: strongSelf.contentHeaderContainerSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: headerHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
-            if let placeholderNode = strongSelf.placeholderNode {
-                transition.updateFrame(node: placeholderNode, frame: CGRect(origin: CGPoint(x: 0.0, y: topOffset), size: placeholderNode.bounds.size))
-            }
-            transition.updateFrame(node: strongSelf.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: topOffset - headerHeight / 2.0), size: CGSize(width: layout.size.width, height: layout.size.height + 300.0)))
-        }
-        
-        self.disposable.set((self.listContext.state
-        |> deliverOnMainQueue).start(next: { [weak self] state in
-            self?.updateState(state)
-        }))
-    }
-    
-    deinit {
-        self.disposable.dispose()
-    }
-    
-    override func didLoad() {
-        super.didLoad()
-        
-        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimNodeTapGesture)))
-    }
-    
-    func containerLayoutUpdated(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
-        let isFirstLayout = self.validLayout == nil
-        self.validLayout = layout
-        
-        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
-        
-        transition.updateBounds(node: self.listNode, bounds: CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height))
-        transition.updatePosition(node: self.listNode, position: CGPoint(x: layout.size.width / 2.0, y: layout.size.height / 2.0))
-        
-        var currentCategoryItemCount = 0
-        if let currentState = self.currentState {
-            for (category, categoryState) in currentState.states {
-                if category == self.currentCategory {
-                    currentCategoryItemCount = categoryState.count
-                    break
-                }
-            }
-        }
-        
-        var insets = UIEdgeInsets()
-        insets.top = topInsetForLayout(layout: layout, itemCount: currentCategoryItemCount)
-        insets.bottom = layout.intrinsicInsets.bottom
-        
-        if let placeholderNode = self.placeholderNode, !self.placeholderNodeIsAnimatingOut {
-            let placeholderHeight = min(CGFloat(currentCategoryItemCount) * itemHeight, layout.size.height) + UIScreenPixel
-            placeholderNode.frame = CGRect(origin: placeholderNode.frame.origin, size: CGSize(width: layout.size.width, height: placeholderHeight))
-            placeholderNode.updateLayout(size: CGSize(width: layout.size.width, height: placeholderHeight))
-        }
-        
-        let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
-        self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: layout.size, insets: insets, duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
-        
-        let sideInset: CGFloat = 12.0
-        let spacing: CGFloat = 6.0
-        var leftX = sideInset
-        for itemNode in self.categoryItemNodes {
-            let itemSize = itemNode.updateLayout()
-            itemNode.frame = CGRect(origin: CGPoint(x: leftX, y: 0.0), size: itemSize)
-            leftX += spacing + itemSize.width
-        }
-        leftX += sideInset
-        self.categoryScrollNode.view.contentSize = CGSize(width: leftX, height: 60.0)
-        self.categoryScrollNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: 60.0))
-        
-        if isFirstLayout {
-            while !self.enqueuedTransactions.isEmpty {
-                self.dequeueTransaction()
-            }
-        }
-    }
-    
-    func animateIn() {
-        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        self.dimNode.layer.animatePosition(from: CGPoint(x: self.dimNode.position.x, y: self.dimNode.position.y - self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring, completion: { _ in
-        })
-        self.layer.animatePosition(from: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), to: self.layer.position, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring, completion: { _ in
-        })
-    }
-    
-    func animateOut(completion: @escaping () -> Void) {
-        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
-        self.dimNode.layer.animatePosition(from: self.dimNode.position, to: CGPoint(x: self.dimNode.position.x, y: self.dimNode.position.y - self.layer.bounds.size.height), duration: 0.2, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false)
-        self.layer.animatePosition(from: self.layer.position, to: CGPoint(x: self.layer.position.x, y: self.layer.position.y + self.layer.bounds.size.height), duration: 0.2, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, completion: { _ in
-            completion()
-        })
-    }
-    
-    func updateState(_ state: MessageReactionListState) {
-        if self.currentState != state {
-            self.currentState = state
-            
-            self.updateItems()
-            
-            if let validLayout = self.validLayout {
-                self.containerLayoutUpdated(layout: validLayout, transition: .immediate)
-            }
-        }
-    }
-    
-    private var currentEntries: [MessageReactionListEntry]?
-    private func updateItems() {
-        var entries: [MessageReactionListEntry] = []
-        
-        var index = 0
-        let states = self.currentState?.states ?? []
-        for (category, categoryState) in states {
-            if self.categoryItemNodes.count <= index {
-                let itemNode = MessageReactionCategoryNode(theme: self.presentationData.theme, category: category, count: categoryState.count, action: { [weak self] in
-                    self?.setCategory(category)
-                })
-                self.categoryItemNodes.append(itemNode)
-                self.categoryScrollNode.addSubnode(itemNode)
-                if category == self.currentCategory {
-                    itemNode.isSelected = true
-                } else {
-                    itemNode.isSelected = false
-                }
-            }
-            
-            if category == self.currentCategory {
-                for item in categoryState.items {
-                    entries.append(MessageReactionListEntry(index: entries.count, item: item))
-                }
-            }
-            index += 1
-        }
-        let transaction = preparedTransition(from: self.currentEntries ?? [], to: entries, context: self.context, presentationData: self.presentationData)
-        let previousWasEmpty = self.currentEntries == nil || self.currentEntries?.count == 0
-        let isEmpty = entries.isEmpty
-        self.currentEntries = entries
-        
-        self.enqueuedTransactions.append(transaction)
-        self.dequeueTransaction()
-        
-        if previousWasEmpty && !isEmpty {
-            if let placeholderNode = self.placeholderNode {
-                self.placeholderNodeIsAnimatingOut = true
-                placeholderNode.allowsGroupOpacity = true
-                placeholderNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.18, removeOnCompletion: false, completion: { [weak self] _ in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    strongSelf.placeholderNode?.removeFromSupernode()
-                    strongSelf.placeholderNode = nil
-                })
-            }
-            self.listNode.forEachItemNode({ itemNode in
-                itemNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.18)
-            })
-        }
-    }
-    
-    func setCategory(_ category: MessageReactionListCategory) {
-        if self.currentCategory != category {
-            self.currentCategory = category
-            
-            for itemNode in self.categoryItemNodes {
-                itemNode.isSelected = category == itemNode.category
-            }
-            
-            //self.forceHeaderTransition = .animated(duration: 0.3, curve: .spring)
-            if let validLayout = self.validLayout {
-                self.containerLayoutUpdated(layout: validLayout, transition: .animated(duration: 0.3, curve: .spring))
-            }
-            
-            self.updateItems()
-        }
-    }
-    
-    private func dequeueTransaction() {
-        guard let layout = self.validLayout, let transaction = self.enqueuedTransactions.first else {
-            return
-        }
-            
-        self.enqueuedTransactions.remove(at: 0)
-        
-        var options = ListViewDeleteAndInsertOptions()
-        options.insert(.Synchronous)
-        options.insert(.PreferSynchronousResourceLoading)
-        options.insert(.PreferSynchronousDrawing)
-        
-        var currentCategoryItemCount = 0
-        if let currentState = self.currentState {
-            for (category, categoryState) in currentState.states {
-                if category == self.currentCategory {
-                    currentCategoryItemCount = categoryState.count
-                    break
-                }
-            }
-        }
-        
-        var insets = UIEdgeInsets()
-        insets.top = topInsetForLayout(layout: layout, itemCount: currentCategoryItemCount)
-        insets.bottom = layout.intrinsicInsets.bottom
-        
-        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: self.listNode.bounds.size, insets: insets, duration: 0.3, curve: .Default(duration: 0.3))
-        
-        self.listNode.transaction(deleteIndices: transaction.deletions, insertIndicesAndItems: transaction.insertions, updateIndicesAndItems: transaction.updates, options: options, updateSizeAndInsets: updateSizeAndInsets, updateOpaqueState: nil, completion: { [weak self] _ in
-            self?.isReady.set(.single(true))
-        })
-    }
-    
-    @objc private func dimNodeTapGesture(_ recognizer: UITapGestureRecognizer) {
-        if case .ended = recognizer.state {
-            self.dismiss()
-        }
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        for itemNode in self.categoryItemNodes {
-            if let result = itemNode.hitTest(self.view.convert(point, to: itemNode.view), with: event) {
-                return result
-            }
-        }
-        if let result = self.listNode.hitTest(self.view.convert(point, to: self.listNode.view), with: event) {
-            return result
-        }
-        if point.y >= self.contentHeaderContainerNode.frame.minY && point.y < self.bounds.height {
-            return self.listNode.view
-        }
-        if point.y >= 0 && point.y < self.contentHeaderContainerNode.frame.minY {
-            return self.dimNode.view
-        }
-        return nil
-    }
-}
diff --git a/submodules/MessageReactionListUI/Sources/MessageReactionListLoadingPlaceholder.swift b/submodules/MessageReactionListUI/Sources/MessageReactionListLoadingPlaceholder.swift
deleted file mode 100644
index 7c5eebf198..0000000000
--- a/submodules/MessageReactionListUI/Sources/MessageReactionListLoadingPlaceholder.swift
+++ /dev/null
@@ -1,81 +0,0 @@
-import Foundation
-import AsyncDisplayKit
-import Display
-import TelegramPresentationData
-import TelegramCore
-import SyncCore
-
-final class MessageReactionListLoadingPlaceholder: ASDisplayNode {
-    private let theme: PresentationTheme
-    private let itemHeight: CGFloat
-    private let itemImage: UIImage?
-    
-    private let backgroundNode: ASDisplayNode
-    private let separatorNode: ASDisplayNode
-    private let highlightNode: ASImageNode
-    private var itemNodes: [ASImageNode] = []
-    
-    init(theme: PresentationTheme, itemHeight: CGFloat) {
-        self.theme = theme
-        self.itemHeight = itemHeight
-        
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = UIColor(white: 0.92, alpha: 1.0)
-        
-        self.separatorNode = ASDisplayNode()
-        self.separatorNode.backgroundColor = theme.list.itemPlainSeparatorColor
-        
-        self.highlightNode = ASImageNode()
-        self.highlightNode.displaysAsynchronously = false
-        self.highlightNode.displayWithoutProcessing = true
-        
-        let leftInset: CGFloat = 15.0
-        let avatarSize: CGFloat = 40.0
-        let avatarSpacing: CGFloat = 11.0
-        let contentWidth: CGFloat = 4.0
-        let contentHeight: CGFloat = 14.0
-        let rightInset: CGFloat = 54.0
-        self.itemImage = generateImage(CGSize(width: leftInset + avatarSize + avatarSpacing + contentWidth + rightInset, height: itemHeight), rotatedContext: { size, context in
-            context.setFillColor(theme.actionSheet.opaqueItemBackgroundColor.cgColor)
-            context.fill(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(theme.list.itemPlainSeparatorColor.cgColor)
-            context.fill(CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: UIScreenPixel)))
-            context.setBlendMode(.copy)
-            context.setFillColor(UIColor.clear.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: leftInset, y: floor((itemHeight - avatarSize) / 2.0)), size: CGSize(width: avatarSize, height: avatarSize)))
-            let contentOrigin = leftInset + avatarSize + avatarSpacing
-            context.fill(CGRect(origin: CGPoint(x: contentOrigin, y: floor((size.height - contentHeight) / 2.0)), size: CGSize(width: size.width - contentOrigin - rightInset, height: contentHeight)))
-        })?.stretchableImage(withLeftCapWidth: Int(leftInset + avatarSize + avatarSpacing + 1), topCapHeight: 0)
-        
-        super.init()
-        
-        self.addSubnode(self.backgroundNode)
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.separatorNode)
-    }
-    
-    func updateLayout(size: CGSize) {
-        self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
-        
-        var verticalOffset: CGFloat = 0.0
-        var index = 0
-        while verticalOffset < size.height - 1.0 {
-            if self.itemNodes.count >= index {
-                let itemNode = ASImageNode()
-                itemNode.image = self.itemImage
-                self.itemNodes.append(itemNode)
-                self.addSubnode(itemNode)
-            }
-            self.itemNodes[index].frame = CGRect(origin: CGPoint(x: 0.0, y: verticalOffset), size: CGSize(width: size.width, height: self.itemHeight))
-            verticalOffset += self.itemHeight
-            index += 1
-        }
-        self.separatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: verticalOffset), size: CGSize(width: size.width, height: UIScreenPixel))
-        if index < self.itemNodes.count {
-            for i in index ..< self.itemNodes.count {
-                self.itemNodes[i].removeFromSupernode()
-            }
-            self.itemNodes.removeLast(self.itemNodes.count - index)
-        }
-    }
-}
diff --git a/submodules/MozjpegBinding/Public/MozjpegBinding/MozjpegBinding.h b/submodules/MozjpegBinding/Public/MozjpegBinding/MozjpegBinding.h
index 3e7ec4696f..c7142e4e5e 100644
--- a/submodules/MozjpegBinding/Public/MozjpegBinding/MozjpegBinding.h
+++ b/submodules/MozjpegBinding/Public/MozjpegBinding/MozjpegBinding.h
@@ -2,4 +2,4 @@
 
 NSData * _Nullable compressJPEGData(UIImage * _Nonnull sourceImage);
 NSArray<NSNumber *> * _Nonnull extractJPEGDataScans(NSData * _Nonnull data);
-NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image);
+NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image, CGSize size);
diff --git a/submodules/MozjpegBinding/Sources/MozjpegBinding.m b/submodules/MozjpegBinding/Sources/MozjpegBinding.m
index fa2dd964e2..8138b309ad 100644
--- a/submodules/MozjpegBinding/Sources/MozjpegBinding.m
+++ b/submodules/MozjpegBinding/Sources/MozjpegBinding.m
@@ -70,7 +70,7 @@ NSData * _Nullable compressJPEGData(UIImage * _Nonnull sourceImage) {
     int width = (int)(sourceImage.size.width * sourceImage.scale);
     int height = (int)(sourceImage.size.height * sourceImage.scale);
     
-    int targetBytesPerRow = ((4 * (int)width) + 15) & (~15);
+    int targetBytesPerRow = ((4 * (int)width) + 31) & (~31);
     uint8_t *targetMemory = malloc((int)(targetBytesPerRow * height));
     
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -86,7 +86,7 @@ NSData * _Nullable compressJPEGData(UIImage * _Nonnull sourceImage) {
     
     UIGraphicsPopContext();
     
-    int bufferBytesPerRow = ((3 * (int)width) + 15) & (~15);
+    int bufferBytesPerRow = ((3 * (int)width) + 31) & (~31);
     uint8_t *buffer = malloc(bufferBytesPerRow * height);
     
     for (int y = 0; y < height; y++) {
@@ -146,8 +146,7 @@ NSData * _Nullable compressJPEGData(UIImage * _Nonnull sourceImage) {
     return result;
 }
 
-NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image) {
-    CGSize size = CGSizeMake(40.0f, 40.0f);
+NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image, CGSize size) {
     CGSize fittedSize = image.size;
     if (fittedSize.width > size.width) {
         fittedSize = CGSizeMake(size.width, (int)((fittedSize.height * size.width / MAX(fittedSize.width, 1.0f))));
@@ -159,7 +158,7 @@ NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image) {
     int width = (int)fittedSize.width;
     int height = (int)fittedSize.height;
     
-    int targetBytesPerRow = ((4 * (int)width) + 15) & (~15);
+    int targetBytesPerRow = ((4 * (int)width) + 31) & (~31);
     uint8_t *targetMemory = malloc((int)(targetBytesPerRow * height));
     
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -175,7 +174,7 @@ NSData * _Nullable compressMiniThumbnail(UIImage * _Nonnull image) {
     
     UIGraphicsPopContext();
     
-    int bufferBytesPerRow = ((3 * (int)width) + 15) & (~15);
+    int bufferBytesPerRow = ((3 * (int)width) + 31) & (~31);
     uint8_t *buffer = malloc(bufferBytesPerRow * height);
     
     for (int y = 0; y < height; y++) {
diff --git a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h
index fc190383be..b1e9361e08 100644
--- a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h
+++ b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTRequestErrorContext.h
@@ -10,5 +10,6 @@
 @property (nonatomic) NSUInteger floodWaitSeconds;
 
 @property (nonatomic) bool waitingForTokenExport;
+@property (nonatomic, strong) id waitingForRequestToComplete;
 
 @end
diff --git a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h
index ec32fbbce6..a3a3f2f262 100644
--- a/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h
+++ b/submodules/MtProtoKit/PublicHeaders/MtProtoKit/MTSessionInfo.h
@@ -19,6 +19,8 @@
 
 - (bool)messageProcessed:(int64_t)messageId;
 - (void)setMessageProcessed:(int64_t)messageId;
+- (bool)wasMessageSentOnce:(int64_t)messageId;
+- (void)setMessageWasSentOnce:(int64_t)messageId;
 - (void)scheduleMessageConfirmation:(int64_t)messageId size:(NSInteger)size;
 - (NSArray *)scheduledMessageConfirmations;
 - (bool)scheduledMessageConfirmationsExceedSize:(NSInteger)sizeLimit orCount:(NSUInteger)countLimit;
diff --git a/submodules/MtProtoKit/Sources/GCDAsyncSocket.m b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m
index b3668549b3..0670de7879 100755
--- a/submodules/MtProtoKit/Sources/GCDAsyncSocket.m
+++ b/submodules/MtProtoKit/Sources/GCDAsyncSocket.m
@@ -2402,22 +2402,21 @@ enum GCDAsyncSocketConfig
 	int nosigpipe = 1;
 	setsockopt(socketFD, SOL_SOCKET, SO_NOSIGPIPE, &nosigpipe, sizeof(nosigpipe));
     
-    /*int32_t rcvBuf = 400 * 1024;
+    int32_t rcvBuf = 1024 * 1024;
     setsockopt(socketFD, SOL_SOCKET, SO_RCVBUF, &rcvBuf, 4);
     
     int32_t checkRcvBuf = 0;
     unsigned int checkRcvBufLen = sizeof(checkRcvBuf);
     getsockopt(socketFD, SOL_SOCKET, SO_RCVBUF, &checkRcvBuf, &checkRcvBufLen);
     
-    int32_t sndBuf = 400 * 1024;
+    int32_t sndBuf = 1024 * 1024;
     setsockopt(socketFD, SOL_SOCKET, SO_SNDBUF, &sndBuf, 4);
     
     int32_t checkSndBuf = 0;
     unsigned int checkSndBufLen = sizeof(checkSndBuf);
     getsockopt(socketFD, SOL_SOCKET, SO_SNDBUF, &checkSndBuf, &checkSndBufLen);
-    */
     
-    if (_useTcpNodelay)
+    if (_useTcpNodelay || true)
     {
         int flag = 1;
         setsockopt(socketFD, SOL_SOCKET, TCP_NODELAY, &flag, sizeof(flag));
diff --git a/submodules/MtProtoKit/Sources/MTApiEnvironment.m b/submodules/MtProtoKit/Sources/MTApiEnvironment.m
index f8dd947b67..bcab215524 100644
--- a/submodules/MtProtoKit/Sources/MTApiEnvironment.m
+++ b/submodules/MtProtoKit/Sources/MTApiEnvironment.m
@@ -657,7 +657,7 @@ NSString *suffix = @"";
         [platform isEqualToString:@"iPad8,2"] ||
         [platform isEqualToString:@"iPad8,3"] ||
         [platform isEqualToString:@"iPad8,4"])
-        return @"iPad Pro 11 inch (3rd gen)";
+        return @"iPad Pro 11 inch";
     
     if ([platform isEqualToString:@"iPad8,5"] ||
         [platform isEqualToString:@"iPad8,6"] ||
@@ -667,7 +667,7 @@ NSString *suffix = @"";
     
     if ([platform isEqualToString:@"iPad8,9"] ||
         [platform isEqualToString:@"iPad8,10"])
-        return @"iPad Pro 11 inch (4th gen)";
+        return @"iPad Pro 11 inch (2th gen)";
     
     if ([platform isEqualToString:@"iPad8,11"] ||
         [platform isEqualToString:@"iPad8,12"])
@@ -688,6 +688,18 @@ NSString *suffix = @"";
     if ([platform isEqualToString:@"iPad13,1"] ||
         [platform isEqualToString:@"iPad13,2"])
         return @"iPad Air (4th gen)";
+    
+    if ([platform isEqualToString:@"iPad13,4"] ||
+        [platform isEqualToString:@"iPad13,5"] ||
+        [platform isEqualToString:@"iPad13,6"] ||
+        [platform isEqualToString:@"iPad13,7"])
+        return @"iPad Pro 11 inch (3th gen)";
+    
+    if ([platform isEqualToString:@"iPad13,8"] ||
+        [platform isEqualToString:@"iPad13,9"] ||
+        [platform isEqualToString:@"iPad13,10"] ||
+        [platform isEqualToString:@"iPad13,11"])
+        return @"iPad Pro 12.9 inch (5th gen)";
             
     if ([platform hasPrefix:@"iPhone"])
         return @"Unknown iPhone";
diff --git a/submodules/MtProtoKit/Sources/MTContext.m b/submodules/MtProtoKit/Sources/MTContext.m
index b394ac923c..bde013a54e 100644
--- a/submodules/MtProtoKit/Sources/MTContext.m
+++ b/submodules/MtProtoKit/Sources/MTContext.m
@@ -379,14 +379,14 @@ static int32_t fixedTimeDifferenceValue = 0;
             NSDictionary *datacenterAuthInfoById = [keychain objectForKey:@"datacenterAuthInfoById" group:@"persistent"];
             if (datacenterAuthInfoById != nil) {
                 _datacenterAuthInfoById = [[NSMutableDictionary alloc] initWithDictionary:datacenterAuthInfoById];
-/*#if DEBUG
+#if DEBUG
                 NSArray<NSNumber *> *keys = [_datacenterAuthInfoById allKeys];
                 for (NSNumber *key in keys) {
                     if (parseAuthInfoMapKeyInteger(key).selector != MTDatacenterAuthInfoSelectorPersistent) {
                         [_datacenterAuthInfoById removeObjectForKey:key];
                     }
                 }
-#endif*/
+#endif
             }
             
             NSDictionary *datacenterPublicKeysById = [keychain objectForKey:@"datacenterPublicKeysById" group:@"ephemeral"];
diff --git a/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
index da1ca4e98a..ac200f686b 100644
--- a/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTDatacenterAuthMessageService.m
@@ -13,6 +13,7 @@
 #import <MtProtoKit/MTDatacenterSaltInfo.h>
 #import "MTBuffer.h"
 #import <MtProtoKit/MTEncryption.h>
+#import <CommonCrypto/CommonCrypto.h>
 
 #import "MTInternalMessageParser.h"
 #import "MTServerDhInnerDataMessage.h"
@@ -20,99 +21,70 @@
 #import "MTServerDhParamsMessage.h"
 #import "MTSetClientDhParamsResponseMessage.h"
 
-static NSArray *defaultPublicKeys() {
-    static NSArray *serverPublicKeys = nil;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^
-                  {
-        serverPublicKeys = [[NSArray alloc] initWithObjects:
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAxq7aeLAqJR20tkQQMfRn+ocfrtMlJsQ2Uksfs7Xcoo77jAid0bRt\n"
-"ksiVmT2HEIJUlRxfABoPBV8wY9zRTUMaMA654pUX41mhyVN+XoerGxFvrs9dF1Ru\n"
-"vCHbI02dM2ppPvyytvvMoefRoL5BTcpAihFgm5xCaakgsJ/tH5oVl74CdhQw8J5L\n"
-"xI/K++KJBUyZ26Uba1632cOiq05JBUW0Z2vWIOk4BLysk7+U9z+SxynKiZR3/xdi\n"
-"XvFKk01R3BHV+GUKM2RYazpS/P8v7eyKhAbKxOdRcFpHLlVwfjyM1VlDQrEZxsMp\n"
-"NTLYXb6Sce1Uov0YtNx5wEowlREH1WOTlwIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0x9a996a1db11c729bUL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAsQZnSWVZNfClk29RcDTJQ76n8zZaiTGuUsi8sUhW8AS4PSbPKDm+\n"
-"DyJgdHDWdIF3HBzl7DHeFrILuqTs0vfS7Pa2NW8nUBwiaYQmPtwEa4n7bTmBVGsB\n"
-"1700/tz8wQWOLUlL2nMv+BPlDhxq4kmJCyJfgrIrHlX8sGPcPA4Y6Rwo0MSqYn3s\n"
-"g1Pu5gOKlaT9HKmE6wn5Sut6IiBjWozrRQ6n5h2RXNtO7O2qCDqjgB2vBxhV7B+z\n"
-"hRbLbCmW0tYMDsvPpX5M8fsO05svN+lKtCAuz1leFns8piZpptpSCFn7bWxiA9/f\n"
-"x5x17D7pfah3Sy2pA+NDXyzSlGcKdaUmwQIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0xb05b2a6f70cdea78UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAwVACPi9w23mF3tBkdZz+zwrzKOaaQdr01vAbU4E1pvkfj4sqDsm6\n"
-"lyDONS789sVoD/xCS9Y0hkkC3gtL1tSfTlgCMOOul9lcixlEKzwKENj1Yz/s7daS\n"
-"an9tqw3bfUV/nqgbhGX81v/+7RFAEd+RwFnK7a+XYl9sluzHRyVVaTTveB2GazTw\n"
-"Efzk2DWgkBluml8OREmvfraX3bkHZJTKX4EQSjBbbdJ2ZXIsRrYOXfaA+xayEGB+\n"
-"8hdlLmAjbCVfaigxX0CDqWeR1yFL9kwd9P0NsZRPsmoqVwMbMu7mStFai6aIhc3n\n"
-"Slv8kg9qv1m6XHVQY3PnEw+QQtqSIXklHwIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0xc3b42b026ce86b21UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAwqjFW0pi4reKGbkc9pK83Eunwj/k0G8ZTioMMPbZmW99GivMibwa\n"
-"xDM9RDWabEMyUtGoQC2ZcDeLWRK3W8jMP6dnEKAlvLkDLfC4fXYHzFO5KHEqF06i\n"
-"qAqBdmI1iBGdQv/OQCBcbXIWCGDY2AsiqLhlGQfPOI7/vvKc188rTriocgUtoTUc\n"
-"/n/sIUzkgwTqRyvWYynWARWzQg0I9olLBBC2q5RQJJlnYXZwyTL3y9tdb7zOHkks\n"
-"WV9IMQmZmyZh/N7sMbGWQpt4NMchGpPGeJ2e5gHBjDnlIf2p1yZOYeUYrdbwcS0t\n"
-"UiggS4UeE8TzIuXFQxw7fzEIlmhIaq3FnwIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0x71e025b6c76033e3UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAruw2yP/BCcsJliRoW5eBVBVle9dtjJw+OYED160Wybum9SXtBBLX\n"
-"riwt4rROd9csv0t0OHCaTmRqBcQ0J8fxhN6/cpR1GWgOZRUAiQxoMnlt0R93LCX/\n"
-"j1dnVa/gVbCjdSxpbrfY2g2L4frzjJvdl84Kd9ORYjDEAyFnEA7dD556OptgLQQ2\n"
-"e2iVNq8NZLYTzLp5YpOdO1doK+ttrltggTCy5SrKeLoCPPbOgGsdxJxyz5KKcZnS\n"
-"Lj16yE5HvJQn0CNpRdENvRUXe6tBP78O39oJ8BTHp9oIjd6XWXAsp2CvK45Ol8wF\n"
-"XGF710w9lwCGNbmNxNYhtIkdqfsEcwR5JwIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0xbc35f3509f7b7a5UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAvfLHfYH2r9R70w8prHblWt/nDkh+XkgpflqQVcnAfSuTtO05lNPs\n"
-"pQmL8Y2XjVT4t8cT6xAkdgfmmvnvRPOOKPi0OfJXoRVylFzAQG/j83u5K3kRLbae\n"
-"7fLccVhKZhY46lvsueI1hQdLgNV9n1cQ3TDS2pQOCtovG4eDl9wacrXOJTG2990V\n"
-"jgnIKNA0UMoP+KF03qzryqIt3oTvZq03DyWdGK+AZjgBLaDKSnC6qD2cFY81UryR\n"
-"WOab8zKkWAnhw2kFpcqhI0jdV5QaSCExvnsjVaX0Y1N0870931/5Jb9ICe4nweZ9\n"
-"kSDF/gip3kWLG0o8XQpChDfyvsqB9OLV/wIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0x15ae5fa8b5529542UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAs/ditzm+mPND6xkhzwFIz6J/968CtkcSE/7Z2qAJiXbmZ3UDJPGr\n"
-"zqTDHkO30R8VeRM/Kz2f4nR05GIFiITl4bEjvpy7xqRDspJcCFIOcyXm8abVDhF+\n"
-"th6knSU0yLtNKuQVP6voMrnt9MV1X92LGZQLgdHZbPQz0Z5qIpaKhdyA8DEvWWvS\n"
-"Uwwc+yi1/gGaybwlzZwqXYoPOhwMebzKUk0xW14htcJrRrq+PXXQbRzTMynseCoP\n"
-"Ioke0dtCodbA3qQxQovE16q9zz4Otv2k4j63cz53J+mhkVWAeWxVGI0lltJmWtEY\n"
-"K6er8VqqWot3nqmWMXogrgRLggv/NbbooQIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0xaeae98e13cd7f94fUL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAvmpxVY7ld/8DAjz6F6q05shjg8/4p6047bn6/m8yPy1RBsvIyvuD\n"
-"uGnP/RzPEhzXQ9UJ5Ynmh2XJZgHoE9xbnfxL5BXHplJhMtADXKM9bWB11PU1Eioc\n"
-"3+AXBB8QiNFBn2XI5UkO5hPhbb9mJpjA9Uhw8EdfqJP8QetVsI/xrCEbwEXe0xvi\n"
-"fRLJbY08/Gp66KpQvy7g8w7VB8wlgePexW3pT13Ap6vuC+mQuJPyiHvSxjEKHgqe\n"
-"Pji9NP3tJUFQjcECqcm0yV7/2d0t/pbCm+ZH1sadZspQCEPPrtbkQBlvHb4OLiIW\n"
-"PGHKSMeRFvp3IWcmdJqXahxLCUS1Eh6MAQIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0x5a181b2235057d98UL], @"fingerprint", nil],
-[[NSDictionary alloc] initWithObjectsAndKeys:@"-----BEGIN RSA PUBLIC KEY-----\n"
-"MIIBCgKCAQEAr4v4wxMDXIaMOh8bayF/NyoYdpcysn5EbjTIOZC0RkgzsRj3SGlu\n"
-"52QSz+ysO41dQAjpFLgxPVJoOlxXokaOq827IfW0bGCm0doT5hxtedu9UCQKbE8j\n"
-"lDOk+kWMXHPZFJKWRgKgTu9hcB3y3Vk+JFfLpq3d5ZB48B4bcwrRQnzkx5GhWOFX\n"
-"x73ZgjO93eoQ2b/lDyXxK4B4IS+hZhjzezPZTI5upTRbs5ljlApsddsHrKk6jJNj\n"
-"8Ygs/ps8e6ct82jLXbnndC9s8HjEvDvBPH9IPjv5JUlmHMBFZ5vFQIfbpo0u0+1P\n"
-"n6bkEi5o7/ifoyVv2pAZTRwppTz0EuXD8QIDAQAB\n"
-"-----END RSA PUBLIC KEY-----", @"key", [[NSNumber alloc] initWithUnsignedLongLong:0x9692106da14b9f02UL], @"fingerprint", nil],
-nil];
-    });
-    return serverPublicKeys;
+@interface MTDatacenterAuthPublicKey : NSObject
+
+@property (nonatomic, strong, readonly) NSString *publicKey;
+
+@end
+
+@implementation MTDatacenterAuthPublicKey
+
+- (instancetype)initWithPublicKey:(NSString *)publicKey {
+    self = [super init];
+    if (self != nil) {
+        _publicKey = publicKey;
+    }
+    return self;
 }
 
-static NSDictionary *selectPublicKey(NSArray *fingerprints, NSArray<NSDictionary *> *publicKeys)
-{
-    for (NSNumber *nFingerprint in fingerprints)
-    {
-        for (NSDictionary *keyDesc in publicKeys)
-        {
-            uint64_t keyFingerprint = [[keyDesc objectForKey:@"fingerprint"] unsignedLongLongValue];
+- (uint64_t)fingerprintWithEncryptionProvider:(id<EncryptionProvider>)encryptionProvider {
+    return MTRsaFingerprint(encryptionProvider, _publicKey);
+}
+
+@end
+
+static NSArray<MTDatacenterAuthPublicKey *> *defaultPublicKeys(bool isProduction) {
+    static NSArray<MTDatacenterAuthPublicKey *> *testingPublicKeys = nil;
+    static NSArray<MTDatacenterAuthPublicKey *> *productionPublicKeys = nil;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        testingPublicKeys = @[
+            [[MTDatacenterAuthPublicKey alloc] initWithPublicKey:@"-----BEGIN RSA PUBLIC KEY-----\n"
+             "MIIBCgKCAQEAyMEdY1aR+sCR3ZSJrtztKTKqigvO/vBfqACJLZtS7QMgCGXJ6XIR\n"
+             "yy7mx66W0/sOFa7/1mAZtEoIokDP3ShoqF4fVNb6XeqgQfaUHd8wJpDWHcR2OFwv\n"
+             "plUUI1PLTktZ9uW2WE23b+ixNwJjJGwBDJPQEQFBE+vfmH0JP503wr5INS1poWg/\n"
+             "j25sIWeYPHYeOrFp/eXaqhISP6G+q2IeTaWTXpwZj4LzXq5YOpk4bYEQ6mvRq7D1\n"
+             "aHWfYmlEGepfaYR8Q0YqvvhYtMte3ITnuSJs171+GDqpdKcSwHnd6FudwGO4pcCO\n"
+             "j4WcDuXc2CTHgH8gFTNhp/Y8/SpDOhvn9QIDAQAB\n"
+             "-----END RSA PUBLIC KEY-----"]
+        ];
+
+        productionPublicKeys = @[
+            [[MTDatacenterAuthPublicKey alloc] initWithPublicKey:@"-----BEGIN RSA PUBLIC KEY-----\n"
+             "MIIBCgKCAQEA6LszBcC1LGzyr992NzE0ieY+BSaOW622Aa9Bd4ZHLl+TuFQ4lo4g\n"
+             "5nKaMBwK/BIb9xUfg0Q29/2mgIR6Zr9krM7HjuIcCzFvDtr+L0GQjae9H0pRB2OO\n"
+             "62cECs5HKhT5DZ98K33vmWiLowc621dQuwKWSQKjWf50XYFw42h21P2KXUGyp2y/\n"
+             "+aEyZ+uVgLLQbRA1dEjSDZ2iGRy12Mk5gpYc397aYp438fsJoHIgJ2lgMv5h7WY9\n"
+             "t6N/byY9Nw9p21Og3AoXSL2q/2IJ1WRUhebgAdGVMlV1fkuOQoEzR7EdpqtQD9Cs\n"
+             "5+bfo3Nhmcyvk5ftB0WkJ9z6bNZ7yxrP8wIDAQAB\n"
+             "-----END RSA PUBLIC KEY-----"]
+        ];
+    });
+    if (isProduction) {
+        return productionPublicKeys;
+    } else {
+        return testingPublicKeys;
+    }
+}
+
+static MTDatacenterAuthPublicKey *selectPublicKey(id<EncryptionProvider> encryptionProvider, NSArray<NSNumber *> *fingerprints, NSArray<MTDatacenterAuthPublicKey *> *publicKeys) {
+    for (NSNumber *nFingerprint in fingerprints) {
+        for (MTDatacenterAuthPublicKey *key in publicKeys) {
+            uint64_t keyFingerprint = [key fingerprintWithEncryptionProvider:encryptionProvider];
             
-            if ([nFingerprint unsignedLongLongValue] == keyFingerprint)
-                return keyDesc;
+            if ([nFingerprint unsignedLongLongValue] == keyFingerprint) {
+                return key;
+            }
         }
     }
 
@@ -150,7 +122,7 @@ typedef enum {
     MTDatacenterAuthKey *_authKey;
     NSData *_encryptedClientData;
     
-    NSArray<NSDictionary *> *_publicKeys;
+    NSArray<MTDatacenterAuthPublicKey *> *_publicKeys;
 }
 
 @end
@@ -168,6 +140,17 @@ typedef enum {
     return self;
 }
 
+- (NSArray<MTDatacenterAuthPublicKey *> *)convertPublicKeysFromDictionaries:(NSArray<NSDictionary *> *)list {
+    NSMutableArray<MTDatacenterAuthPublicKey *> *cdnKeys = [[NSMutableArray alloc] init];
+    for (NSDictionary *dict in list) {
+        NSString *key = dict[@"key"];
+        if ([key isKindOfClass:[NSString class]]) {
+            [cdnKeys addObject:[[MTDatacenterAuthPublicKey alloc] initWithPublicKey:key]];
+        }
+    }
+    return cdnKeys;
+}
+
 - (void)reset:(MTProto *)mtProto
 {
     _currentStageMessageId = 0;
@@ -187,15 +170,15 @@ typedef enum {
     _encryptedClientData = nil;
     
     if (mtProto.cdn) {
-        _publicKeys = [mtProto.context publicKeysForDatacenterWithId:mtProto.datacenterId];
-        if (_publicKeys == nil) {
+        _publicKeys = [self convertPublicKeysFromDictionaries:[mtProto.context publicKeysForDatacenterWithId:mtProto.datacenterId]];
+        if (_publicKeys.count == 0) {
             _stage = MTDatacenterAuthStageWaitingForPublicKeys;
             [mtProto.context publicKeysForDatacenterWithIdRequired:mtProto.datacenterId];
         } else {
             _stage = MTDatacenterAuthStagePQ;
         }
     } else {
-        _publicKeys = defaultPublicKeys();
+        _publicKeys = defaultPublicKeys(!mtProto.context.isTestingEnvironment);
         _stage = MTDatacenterAuthStagePQ;
     }
     
@@ -209,9 +192,13 @@ typedef enum {
 }
     
 - (void)mtProtoPublicKeysUpdated:(MTProto *)mtProto datacenterId:(NSInteger)datacenterId publicKeys:(NSArray<NSDictionary *> *)publicKeys {
+    if (!mtProto.cdn) {
+        return;
+    }
+
     if (_stage == MTDatacenterAuthStageWaitingForPublicKeys) {
         if (mtProto.datacenterId == datacenterId) {
-            _publicKeys = publicKeys;
+            _publicKeys = [self convertPublicKeysFromDictionaries:publicKeys];
             if (_publicKeys != nil && _publicKeys.count != 0) {
                 _stage = MTDatacenterAuthStagePQ;
                 [mtProto requestTransportTransaction];
@@ -238,7 +225,7 @@ typedef enum {
                 }
                 
                 MTBuffer *reqPqBuffer = [[MTBuffer alloc] init];
-                [reqPqBuffer appendInt32:(int32_t)0x60469778];
+                [reqPqBuffer appendInt32:(int32_t)0xbe7e8ef1];
                 [reqPqBuffer appendBytes:_nonce.bytes length:_nonce.length];
                 
                 NSString *messageDescription = [NSString stringWithFormat:@"reqPq nonce:%@", _nonce];
@@ -306,6 +293,113 @@ typedef enum {
     return nil;
 }
 
+static NSData *reversedBytes(NSData *data) {
+    NSMutableData *result = [[NSMutableData alloc] initWithLength:data.length];
+    for (NSUInteger i = 0; i < result.length; i++) {
+        ((uint8_t *)result.mutableBytes)[i] = ((uint8_t *)data.bytes)[result.length - i - 1];
+    }
+    return result;
+}
+
+static NSData *encryptRSAModernPadding(id<EncryptionProvider> encryptionProvider, NSData *pqInnerData, NSString *publicKey) {
+    NSMutableData *dataWithPadding = [[NSMutableData alloc] init];
+    [dataWithPadding appendData:pqInnerData];
+    if (dataWithPadding.length > 144) {
+        return nil;
+    }
+    if (dataWithPadding.length != 192) {
+        int originalLength = (int)dataWithPadding.length;
+        int numPaddingBytes = 192 - originalLength;
+        [dataWithPadding setLength:192];
+        int randomResult = SecRandomCopyBytes(kSecRandomDefault, numPaddingBytes, ((uint8_t *)dataWithPadding.mutableBytes) + originalLength);
+        if (randomResult != errSecSuccess) {
+            return nil;
+        }
+    }
+
+    NSData *dataWithPaddingReversed = reversedBytes(dataWithPadding);
+
+    while (true) {
+        int randomResult = 0;
+        NSMutableData *tempKey = [[NSMutableData alloc] initWithLength:32];
+        randomResult = SecRandomCopyBytes(kSecRandomDefault, tempKey.length, tempKey.mutableBytes);
+        if (randomResult != errSecSuccess) {
+            return nil;
+        }
+
+        NSMutableData *tempKeyAndDataWithPadding = [[NSMutableData alloc] init];
+        [tempKeyAndDataWithPadding appendData:tempKey];
+        [tempKeyAndDataWithPadding appendData:dataWithPadding];
+
+        NSMutableData *dataWithHash = [[NSMutableData alloc] init];
+        [dataWithHash appendData:dataWithPaddingReversed];
+        [dataWithHash appendData:MTSha256(tempKeyAndDataWithPadding)];
+        if (dataWithHash.length != 224) {
+            return nil;
+        }
+
+        NSMutableData *zeroIv = [[NSMutableData alloc] initWithLength:32];
+        memset(zeroIv.mutableBytes, 0, zeroIv.length);
+
+        NSData *aesEncrypted = MTAesEncrypt(dataWithHash, tempKey, zeroIv);
+        if (aesEncrypted == nil) {
+            return nil;
+        }
+        NSData *shaAesEncrypted = MTSha256(aesEncrypted);
+
+        NSMutableData *tempKeyXor = [[NSMutableData alloc] initWithLength:tempKey.length];
+        if (tempKeyXor.length != shaAesEncrypted.length) {
+            return nil;
+        }
+        for (NSUInteger i = 0; i < tempKey.length; i++) {
+            ((uint8_t *)tempKeyXor.mutableBytes)[i] = ((uint8_t *)tempKey.bytes)[i] ^ ((uint8_t *)shaAesEncrypted.bytes)[i];
+        }
+
+        NSMutableData *keyAesEncrypted = [[NSMutableData alloc] init];
+        [keyAesEncrypted appendData:tempKeyXor];
+        [keyAesEncrypted appendData:aesEncrypted];
+        if (keyAesEncrypted.length != 256) {
+            return nil;
+        }
+
+        id<MTBignumContext> bignumContext = [encryptionProvider createBignumContext];
+        if (bignumContext == nil) {
+            return nil;
+        }
+        id<MTRsaPublicKey> rsaPublicKey = [encryptionProvider parseRSAPublicKey:publicKey];
+        if (rsaPublicKey == nil) {
+            return nil;
+        }
+        id<MTBignum> rsaModule = [bignumContext rsaGetN:rsaPublicKey];
+        if (rsaModule == nil) {
+            return nil;
+        }
+        id<MTBignum> bignumKeyAesEncrypted = [bignumContext create];
+        if (bignumKeyAesEncrypted == nil) {
+            return nil;
+        }
+        [bignumContext assignBinTo:bignumKeyAesEncrypted value:keyAesEncrypted];
+        int compareResult = [bignumContext compare:rsaModule with:bignumKeyAesEncrypted];
+        if (compareResult <= 0) {
+            continue;
+        }
+
+        NSData *encryptedData = [encryptionProvider rsaEncryptWithPublicKey:publicKey data:keyAesEncrypted];
+        NSMutableData *paddedEncryptedData = [[NSMutableData alloc] init];
+        [paddedEncryptedData appendData:encryptedData];
+        while (paddedEncryptedData.length < 256) {
+            uint8_t zero = 0;
+            [paddedEncryptedData replaceBytesInRange:NSMakeRange(0, 0) withBytes:&zero length:1];
+        }
+
+        if (paddedEncryptedData.length != 256) {
+            return nil;
+        }
+
+        return paddedEncryptedData;
+    }
+}
+
 - (void)mtProto:(MTProto *)mtProto receivedMessage:(MTIncomingMessage *)message authInfoSelector:(MTDatacenterAuthInfoSelector)authInfoSelector
 {
     if (_stage == MTDatacenterAuthStagePQ && [message.body isKindOfClass:[MTResPqMessage class]])
@@ -314,10 +408,10 @@ typedef enum {
         
         if ([_nonce isEqualToData:resPqMessage.nonce])
         {
-            NSDictionary *publicKey = selectPublicKey(resPqMessage.serverPublicKeyFingerprints, _publicKeys);
+            MTDatacenterAuthPublicKey *publicKey = selectPublicKey(_encryptionProvider, resPqMessage.serverPublicKeyFingerprints, _publicKeys);
             
             if (publicKey == nil && mtProto.cdn && resPqMessage.serverPublicKeyFingerprints.count == 1 && _publicKeys.count == 1) {
-                publicKey = @{@"key": _publicKeys[0][@"key"], @"fingerprint": resPqMessage.serverPublicKeyFingerprints[0]};
+                publicKey = _publicKeys[0];
             }
             
             if (publicKey == nil)
@@ -367,7 +461,7 @@ typedef enum {
                 } while (q > 0);
                 _dhQ = qBytes;
                 
-                _dhPublicKeyFingerprint = [[publicKey objectForKey:@"fingerprint"] longLongValue];
+                _dhPublicKeyFingerprint = [publicKey fingerprintWithEncryptionProvider:_encryptionProvider];
                 
                 uint8_t nonceBytes[32];
                 __unused int result = SecRandomCopyBytes(kSecRandomDefault, 32, nonceBytes);
@@ -390,37 +484,14 @@ typedef enum {
                     [innerDataBuffer appendInt32:mtProto.context.tempKeyExpiration];
                     
                     NSData *innerDataBytes = innerDataBuffer.data;
-                    
-                    NSMutableData *dataWithHash = [[NSMutableData alloc] init];
-                    [dataWithHash appendData:MTSha1(innerDataBytes)];
-                    [dataWithHash appendData:innerDataBytes];
-                    while (dataWithHash.length < 255)
-                    {
-                        uint8_t random = 0;
-                        arc4random_buf(&random, 1);
-                        [dataWithHash appendBytes:&random length:1];
-                    }
-                    
-                    NSData *encryptedData = MTRsaEncrypt(_encryptionProvider, [publicKey objectForKey:@"key"], dataWithHash);
+                    NSData *encryptedData = nil;
+
+                    encryptedData = encryptRSAModernPadding(_encryptionProvider, innerDataBytes, publicKey.publicKey);
+
                     if (MTLogEnabled()) {
-                        MTLog(@"[MTDatacenterAuthMessageService#%p encryptedData length %d dataWithHash length %d]", self, (int)encryptedData.length, (int)dataWithHash.length);
+                        MTLog(@"[MTDatacenterAuthMessageService#%p encryptedData length %d]", self, (int)encryptedData.length);
                     }
-                    if (encryptedData.length < 256)
-                    {
-                        NSMutableData *newEncryptedData = [[NSMutableData alloc] init];
-                        for (int i = 0; i < 256 - (int)encryptedData.length; i++)
-                        {
-                            uint8_t random = 0;
-                            arc4random_buf(&random, 1);
-                            [newEncryptedData appendBytes:&random length:1];
-                        }
-                        [newEncryptedData appendData:encryptedData];
-                        encryptedData = newEncryptedData;
-                    }
-                    #if DEBUG
-                    assert(encryptedData.length == 256);
-                    #endif
-                    
+
                     _dhEncryptedData = encryptedData;
                 } else {
                     MTBuffer *innerDataBuffer = [[MTBuffer alloc] init];
@@ -433,42 +504,27 @@ typedef enum {
                     [innerDataBuffer appendBytes:_newNonce.bytes length:_newNonce.length];
                     
                     NSData *innerDataBytes = innerDataBuffer.data;
-                    
-                    NSMutableData *dataWithHash = [[NSMutableData alloc] init];
-                    [dataWithHash appendData:MTSha1(innerDataBytes)];
-                    [dataWithHash appendData:innerDataBytes];
-                    while (dataWithHash.length < 255)
-                    {
-                        uint8_t random = 0;
-                        arc4random_buf(&random, 1);
-                        [dataWithHash appendBytes:&random length:1];
-                    }
 
-                    NSData *encryptedData = MTRsaEncrypt(_encryptionProvider, [publicKey objectForKey:@"key"], dataWithHash);
-                    if (MTLogEnabled()) {
-                        MTLog(@"[MTDatacenterAuthMessageService#%p encryptedData length %d dataWithHash length %d]", self, (int)encryptedData.length, (int)dataWithHash.length);
-                    }
-                    if (encryptedData.length < 256)
-                    {
-                        NSMutableData *newEncryptedData = [[NSMutableData alloc] init];
-                        for (int i = 0; i < 256 - (int)encryptedData.length; i++)
-                        {
-                            uint8_t random = 0;
-                            arc4random_buf(&random, 1);
-                            [newEncryptedData appendBytes:&random length:1];
-                        }
-                        [newEncryptedData appendData:encryptedData];
-                        encryptedData = newEncryptedData;
-                    }
+                    NSData *encryptedData = nil;
+
+                    encryptedData = encryptRSAModernPadding(_encryptionProvider, innerDataBytes, publicKey.publicKey);
                     
                     _dhEncryptedData = encryptedData;
                 }
-                
-                _stage = MTDatacenterAuthStageReqDH;
-                _currentStageMessageId = 0;
-                _currentStageMessageSeqNo = 0;
-                _currentStageTransactionId = nil;
-                [mtProto requestTransportTransaction];
+
+                if (_dhEncryptedData == nil) {
+                    _stage = MTDatacenterAuthStagePQ;
+                    _currentStageMessageId = 0;
+                    _currentStageMessageSeqNo = 0;
+                    _currentStageTransactionId = nil;
+                    [mtProto requestTransportTransaction];
+                } else {
+                    _stage = MTDatacenterAuthStageReqDH;
+                    _currentStageMessageId = 0;
+                    _currentStageMessageSeqNo = 0;
+                    _currentStageTransactionId = nil;
+                    [mtProto requestTransportTransaction];
+                }
             }
         }
     }
diff --git a/submodules/MtProtoKit/Sources/MTProto.m b/submodules/MtProtoKit/Sources/MTProto.m
index c0c1d8177b..fd0dc1ce8e 100644
--- a/submodules/MtProtoKit/Sources/MTProto.m
+++ b/submodules/MtProtoKit/Sources/MTProto.m
@@ -1148,7 +1148,7 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                     {
                         if (!_useUnauthorizedMode)
                         {
-                            NSMutableArray *currentContainerMessages = [[NSMutableArray alloc] init];
+                            NSMutableArray<MTPreparedMessage *> *currentContainerMessages = [[NSMutableArray alloc] init];
                             NSUInteger currentContainerSize = 0;
                             
                             for (NSUInteger j = i; j < transactionMessageList.count; j++, i++)
@@ -1186,8 +1186,9 @@ static const NSUInteger MTMaxUnacknowledgedMessageCount = 64;
                                 }
                             }
                             
-                            if (currentContainerMessages.count == 1)
+                            if (currentContainerMessages.count == 1 && ![transactionSessionInfo wasMessageSentOnce:currentContainerMessages[0].messageId])
                             {
+                                [transactionSessionInfo setMessageWasSentOnce:currentContainerMessages[0].messageId];
                                 int32_t quickAckId = 0;
                                 NSData *messageData = [self _dataForEncryptedMessage:currentContainerMessages[0] authKey:authKey sessionInfo:transactionSessionInfo quickAckId:&quickAckId address:scheme.address extendedPadding:extendedPadding];
                                 if (messageData != nil)
@@ -2054,7 +2055,7 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     [self getAuthKeyForCurrentScheme:scheme createIfNeeded:false authInfoSelector:&authInfoSelector];
     
     if (MTLogEnabled()) {
-        MTLog(@"[MTProto#%p@%p missing key %lld selector %d]", self, _context, _validAuthInfo.authInfo.authKeyId, authInfoSelector);
+        MTLog(@"[MTProto#%p@%p missing key %lld selector %d useExplicitAuthKey: %lld, canResetAuthData: %s]", self, _context, _validAuthInfo.authInfo.authKeyId, authInfoSelector, _useExplicitAuthKey.authKeyId, _canResetAuthData ? "true" : "false");
     }
     
     if (_useExplicitAuthKey != nil) {
@@ -2112,6 +2113,19 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     }
 }
 
+static bool isDataEqualToDataConstTime(NSData *data1, NSData *data2) {
+    if (data1.length != data2.length) {
+        return false;
+    }
+    uint8_t const *bytes1 = data1.bytes;
+    uint8_t const *bytes2 = data2.bytes;
+    int result = 0;
+    for (int i = 0; i < data1.length; i++) {
+        result |= bytes1[i] != bytes2[i];
+    }
+    return result == 0;
+}
+
 - (NSData *)_decryptIncomingTransportData:(NSData *)transportData address:(MTDatacenterAddress *)address authKey:(MTDatacenterAuthKey *)authKey
 {
     MTDatacenterAuthKey *effectiveAuthKey = authKey;
@@ -2138,20 +2152,6 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     
     NSData *decryptedData = MTAesDecrypt(dataToDecrypt, encryptionKey.key, encryptionKey.iv);
     
-    int32_t messageDataLength = 0;
-    [decryptedData getBytes:&messageDataLength range:NSMakeRange(28, 4)];
-    
-    int32_t paddingLength = ((int32_t)decryptedData.length) - messageDataLength;
-    if (paddingLength < 12 || paddingLength > 1024) {
-        __unused NSData *result = MTSha256(decryptedData);
-        return nil;
-    }
-    
-    if (messageDataLength < 0 || messageDataLength > (int32_t)decryptedData.length) {
-        __unused NSData *result = MTSha256(decryptedData);
-        return nil;
-    }
-    
     int xValue = 8;
     NSMutableData *msgKeyLargeData = [[NSMutableData alloc] init];
     [msgKeyLargeData appendBytes:effectiveAuthKey.authKey.bytes + 88 + xValue length:32];
@@ -2160,8 +2160,21 @@ static NSString *dumpHexString(NSData *data, int maxLength) {
     NSData *msgKeyLarge = MTSha256(msgKeyLargeData);
     NSData *messageKey = [msgKeyLarge subdataWithRange:NSMakeRange(8, 16)];
     
-    if (![messageKey isEqualToData:embeddedMessageKey])
+    if (!isDataEqualToDataConstTime(messageKey, embeddedMessageKey)) {
         return nil;
+    }
+
+    int32_t messageDataLength = 0;
+    [decryptedData getBytes:&messageDataLength range:NSMakeRange(28, 4)];
+
+    int32_t paddingLength = ((int32_t)decryptedData.length) - messageDataLength;
+    if (paddingLength < 12 || paddingLength > 1024) {
+        return nil;
+    }
+
+    if (messageDataLength < 0 || messageDataLength > (int32_t)decryptedData.length) {
+        return nil;
+    }
     
     return decryptedData;
 }
diff --git a/submodules/MtProtoKit/Sources/MTRequestMessageService.m b/submodules/MtProtoKit/Sources/MTRequestMessageService.m
index 2a3d4963d6..0b91e6d40e 100644
--- a/submodules/MtProtoKit/Sources/MTRequestMessageService.m
+++ b/submodules/MtProtoKit/Sources/MTRequestMessageService.m
@@ -196,6 +196,20 @@
         {
             if (request.errorContext != nil)
             {
+                if (request.errorContext.waitingForRequestToComplete != nil) {
+                    bool foundDependency = false;
+                    for (MTRequest *anotherRequest in _requests) {
+                        if (request.errorContext.waitingForRequestToComplete == anotherRequest.internalId) {
+                            foundDependency = true;
+                            break;
+                        }
+                    }
+
+                    if (!foundDependency) {
+                        needTransaction = true;
+                    }
+                }
+
                 if (request.requestContext == nil)
                 {
                     if (request.errorContext.minimalExecuteTime > currentTime + DBL_EPSILON)
@@ -407,10 +421,23 @@
         
         if (request.errorContext != nil)
         {
-            if (request.errorContext.minimalExecuteTime > currentTime)
+            if (request.errorContext.minimalExecuteTime > currentTime) {
                 continue;
-            if (request.errorContext.waitingForTokenExport)
+            }
+            if (request.errorContext.waitingForTokenExport) {
                 continue;
+            }
+
+            bool foundDependency = false;
+            for (MTRequest *anotherRequest in _requests) {
+                if (request.errorContext.waitingForRequestToComplete == anotherRequest.internalId) {
+                    foundDependency = true;
+                    break;
+                }
+            }
+            if (foundDependency) {
+                continue;
+            }
         }
         
         if (request.requestContext == nil || (!request.requestContext.waitingForMessageId && !request.requestContext.delivered && request.requestContext.transactionId == nil))
@@ -690,6 +717,28 @@
                                 request.errorContext.minimalExecuteTime = MAX(request.errorContext.minimalExecuteTime, MTAbsoluteSystemTime() + 2.0);
                             }
                         }
+                        else if (
+                            (
+                                rpcError.errorCode == 400 &&
+                                [rpcError.errorDescription isEqualToString:@"MSG_WAIT_TIMEOUT"]
+                            ) ||
+                            (
+                                rpcError.errorCode == 500 &&
+                                [rpcError.errorDescription isEqualToString:@"MSG_WAIT_FAILED"]
+                            )
+                        ) {
+                            if (request.errorContext == nil) {
+                                request.errorContext = [[MTRequestErrorContext alloc] init];
+                            }
+
+                            for (MTRequest *anotherRequest in _requests) {
+                                if (request.shouldDependOnRequest != nil && request.shouldDependOnRequest(anotherRequest)) {
+                                    request.errorContext.waitingForRequestToComplete = anotherRequest.internalId;
+                                    break;
+                                }
+                            }
+                            restartRequest = true;
+                        }
                         else if (rpcError.errorCode == 420 || [rpcError.errorDescription rangeOfString:@"FLOOD_WAIT_"].location != NSNotFound)
                         {
                             if (request.errorContext == nil)
diff --git a/submodules/MtProtoKit/Sources/MTResPqMessage.m b/submodules/MtProtoKit/Sources/MTResPqMessage.m
index 6156721256..2aa73435cd 100644
--- a/submodules/MtProtoKit/Sources/MTResPqMessage.m
+++ b/submodules/MtProtoKit/Sources/MTResPqMessage.m
@@ -16,7 +16,14 @@
 }
 
 - (NSString *)description {
-    return [NSString stringWithFormat:@"res_pq nonce:%@ serverNonce:%@ pq:%@ fingerprints:%@", _nonce, _serverNonce, _pq, _serverPublicKeyFingerprints];
+    NSMutableString *fingerprintsString = [[NSMutableString alloc] init];
+    for (NSNumber *value in _serverPublicKeyFingerprints) {
+        if (fingerprintsString.length != 0) {
+            [fingerprintsString appendString:@"\n"];
+        }
+        [fingerprintsString appendFormat:@"%llx", [value longLongValue]];
+    }
+    return [NSString stringWithFormat:@"res_pq nonce:%@ serverNonce:%@ pq:%@ fingerprints:%@", _nonce, _serverNonce, _pq, fingerprintsString];
 }
 
 @end
diff --git a/submodules/MtProtoKit/Sources/MTSessionInfo.m b/submodules/MtProtoKit/Sources/MTSessionInfo.m
index 1691592fa0..25d8e0dd07 100644
--- a/submodules/MtProtoKit/Sources/MTSessionInfo.m
+++ b/submodules/MtProtoKit/Sources/MTSessionInfo.m
@@ -52,6 +52,7 @@
     NSMutableSet *_processedMessageIdsSet;
     NSMutableArray *_scheduledMessageConfirmations;
     NSMutableDictionary *_containerMessagesMappingDict;
+    NSMutableSet *_sentMessageIdsSet;
 }
 
 @end
@@ -76,6 +77,7 @@
         _scheduledMessageConfirmations = [[NSMutableArray alloc] init];
         
         _processedMessageIdsSet = [[NSMutableSet alloc] init];
+        _sentMessageIdsSet = [[NSMutableSet alloc] init];
         _containerMessagesMappingDict = [[NSMutableDictionary alloc] init];
     }
     return self;
@@ -138,6 +140,14 @@
     [_processedMessageIdsSet addObject:@(messageId)];
 }
 
+- (bool)wasMessageSentOnce:(int64_t)messageId {
+    return [_sentMessageIdsSet containsObject:@(messageId)];
+}
+
+- (void)setMessageWasSentOnce:(int64_t)messageId {
+    [_sentMessageIdsSet addObject:@(messageId)];
+}
+
 - (void)scheduleMessageConfirmation:(int64_t)messageId size:(NSInteger)size
 {
     bool found = false;
diff --git a/submodules/MusicAlbumArtResources/Sources/ExternalMusicAlbumArtResources.swift b/submodules/MusicAlbumArtResources/Sources/ExternalMusicAlbumArtResources.swift
index 81e63879cc..3f45e62f37 100644
--- a/submodules/MusicAlbumArtResources/Sources/ExternalMusicAlbumArtResources.swift
+++ b/submodules/MusicAlbumArtResources/Sources/ExternalMusicAlbumArtResources.swift
@@ -104,6 +104,9 @@ public func fetchExternalMusicAlbumArtResource(account: Account, resource: Exter
             
             let metaUrl = "https://itunes.apple.com/search?term=\(urlEncodedStringFromString("\(performer) \(resource.title)"))&entity=song&limit=4"
             
+            let title = resource.title.lowercased()
+            let isMix = title.contains("remix") || title.contains("mixed")
+            
             let fetchDisposable = MetaDisposable()
             
             let disposable = fetchHttpResource(url: metaUrl).start(next: { result in
@@ -120,7 +123,23 @@ public func fetchExternalMusicAlbumArtResource(account: Account, resource: Exter
                         return
                     }
                     
-                    guard let result = results.first as? [String: Any] else {
+                    var matchingResult: Any?
+                    for result in results {
+                        if let result = result as? [String: Any] {
+                            let title = ((result["trackCensoredName"] as? String) ?? (result["trackName"] as? String))?.lowercased() ?? ""
+                            let resultIsMix = title.contains("remix") || title.contains("mixed")
+                            if isMix == resultIsMix {
+                                matchingResult = result
+                                break
+                            }
+                        }
+                    }
+                    
+                    if matchingResult == nil {
+                        matchingResult = results.first
+                    }
+                    
+                    guard let result = matchingResult as? [String: Any] else {
                         subscriber.putNext(.dataPart(resourceOffset: 0, data: Data(), range: 0 ..< 0, complete: true))
                         subscriber.putCompletion()
                         return
diff --git a/submodules/OpenInExternalAppUI/Sources/OpenInOptions.swift b/submodules/OpenInExternalAppUI/Sources/OpenInOptions.swift
index e855eae738..21117128d1 100644
--- a/submodules/OpenInExternalAppUI/Sources/OpenInOptions.swift
+++ b/submodules/OpenInExternalAppUI/Sources/OpenInOptions.swift
@@ -239,6 +239,15 @@ private func allOpenInOptions(context: AccountContext, item: OpenInItem) -> [Ope
                 }))
             }
             
+            options.append(OpenInOption(identifier: "2gis", application: .other(title: "2GIS", identifier: 481627348, scheme: "dgis", store: nil), action: {
+                let coordinates = "\(lon),\(lat)"
+                if withDirections {
+                    return .openUrl(url: "dgis://2gis.ru/routeSearch/to/\(coordinates)/go")
+                } else {
+                    return .openUrl(url: "dgis://2gis.ru/geo/\(coordinates)")
+                }
+            }))
+            
             options.append(OpenInOption(identifier: "moovit", application: .other(title: "Moovit", identifier: 498477945, scheme: "moovit", store: nil), action: {
                 if withDirections {
                     let destName: String
diff --git a/submodules/PasscodeUI/BUILD b/submodules/PasscodeUI/BUILD
index 60825d4832..cadf3b48ea 100644
--- a/submodules/PasscodeUI/BUILD
+++ b/submodules/PasscodeUI/BUILD
@@ -23,6 +23,7 @@ swift_library(
         "//submodules/AppBundle:AppBundle",
         "//submodules/PasscodeInputFieldNode:PasscodeInputFieldNode",
         "//submodules/MonotonicTime:MonotonicTime",
+        "//submodules/GradientBackground:GradientBackground",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/PasscodeUI/Sources/PasscodeBackground.swift b/submodules/PasscodeUI/Sources/PasscodeBackground.swift
index 41bed65bbe..aff1c5812a 100644
--- a/submodules/PasscodeUI/Sources/PasscodeBackground.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeBackground.swift
@@ -1,19 +1,53 @@
 import Foundation
 import UIKit
+import AsyncDisplayKit
 import Display
 import ImageBlur
 import FastBlur
+import GradientBackground
 
 protocol PasscodeBackground {
     var size: CGSize { get }
-    var backgroundImage: UIImage { get }
-    var foregroundImage: UIImage { get }
+    var backgroundImage: UIImage? { get }
+    var foregroundImage: UIImage? { get }
+    
+    func makeBackgroundNode() -> ASDisplayNode?
+    func makeForegroundNode(backgroundNode: ASDisplayNode?) -> ASDisplayNode?
+}
+
+final class CustomPasscodeBackground: PasscodeBackground {
+    private let colors: [UIColor]
+    private let backgroundNode: GradientBackgroundNode
+    let inverted: Bool
+    
+    public private(set) var size: CGSize
+    public private(set) var backgroundImage: UIImage? = nil
+    public private(set) var foregroundImage: UIImage? = nil
+    
+    init(size: CGSize, colors: [UIColor], inverted: Bool) {
+        self.size = size
+        self.colors = colors
+        self.inverted = inverted
+        self.backgroundNode = createGradientBackgroundNode(colors: self.colors)
+    }
+    
+    func makeBackgroundNode() -> ASDisplayNode? {
+        return self.backgroundNode
+    }
+    
+    func makeForegroundNode(backgroundNode: ASDisplayNode?) -> ASDisplayNode? {
+        if self.inverted, let backgroundNode = backgroundNode as? GradientBackgroundNode {
+            return GradientBackgroundNode.CloneNode(parentNode: backgroundNode)
+        } else {
+            return nil
+        }
+    }
 }
 
 final class GradientPasscodeBackground: PasscodeBackground {
     public private(set) var size: CGSize
-    public private(set) var backgroundImage: UIImage
-    public private(set) var foregroundImage: UIImage
+    public private(set) var backgroundImage: UIImage?
+    public private(set) var foregroundImage: UIImage?
     
     init(size: CGSize, backgroundColors: (UIColor, UIColor), buttonColor: UIColor) {
         self.size = size
@@ -35,12 +69,20 @@ final class GradientPasscodeBackground: PasscodeBackground {
             context.fill(bounds)
         })!
     }
+    
+    func makeBackgroundNode() -> ASDisplayNode? {
+        return nil
+    }
+    
+    func makeForegroundNode(backgroundNode: ASDisplayNode?) -> ASDisplayNode? {
+        return nil
+    }
 }
 
 final class ImageBasedPasscodeBackground: PasscodeBackground {
     public private(set) var size: CGSize
-    public private(set) var backgroundImage: UIImage
-    public private(set) var foregroundImage: UIImage
+    public private(set) var backgroundImage: UIImage?
+    public private(set) var foregroundImage: UIImage?
     
     init(image: UIImage, size: CGSize) {
         self.size = size
@@ -74,7 +116,7 @@ final class ImageBasedPasscodeBackground: PasscodeBackground {
         }
         telegramFastBlurMore(Int32(contextSize.width), Int32(contextSize.height), Int32(backgroundContext.bytesPerRow), backgroundContext.bytes)
         telegramFastBlurMore(Int32(contextSize.width), Int32(contextSize.height), Int32(backgroundContext.bytesPerRow), backgroundContext.bytes)
-        telegramFastBlurMore(Int32(contextSize.width), Int32(contextSize.height), Int32(foregroundContext.bytesPerRow), foregroundContext.bytes)
+        telegramFastBlurMore(Int32(contextSize.width), Int32(contextSize.height), Int32(foregroundContext.bytesPerRow), backgroundContext.bytes)
         
         backgroundContext.withFlippedContext { context in
             context.setFillColor(UIColor(white: 0.0, alpha: 0.35).cgColor)
@@ -82,4 +124,12 @@ final class ImageBasedPasscodeBackground: PasscodeBackground {
         }
         self.backgroundImage = backgroundContext.generateImage()!
     }
+
+    func makeBackgroundNode() -> ASDisplayNode? {
+        return nil
+    }
+    
+    func makeForegroundNode(backgroundNode: ASDisplayNode?) -> ASDisplayNode? {
+        return nil
+    }
 }
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
index ad96c44ada..54ceb4e794 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryController.swift
@@ -58,7 +58,10 @@ public final class PasscodeEntryController: ViewController {
     private var inBackground: Bool = false
     private var inBackgroundDisposable: Disposable?
     
-    public init(applicationBindings: TelegramApplicationBindings, accountManager: AccountManager, appLockContext: AppLockContext, presentationData: PresentationData, presentationDataSignal: Signal<PresentationData, NoError>, challengeData: PostboxAccessChallengeData, biometrics: PasscodeEntryControllerBiometricsMode, arguments: PasscodeEntryControllerPresentationArguments) {
+    private var statusBarHost: StatusBarHost?
+    private var previousStatusBarStyle: UIStatusBarStyle?
+    
+    public init(applicationBindings: TelegramApplicationBindings, accountManager: AccountManager, appLockContext: AppLockContext, presentationData: PresentationData, presentationDataSignal: Signal<PresentationData, NoError>, statusBarHost: StatusBarHost?, challengeData: PostboxAccessChallengeData, biometrics: PasscodeEntryControllerBiometricsMode, arguments: PasscodeEntryControllerPresentationArguments) {
         self.applicationBindings = applicationBindings
         self.accountManager = accountManager
         self.appLockContext = appLockContext
@@ -68,10 +71,19 @@ public final class PasscodeEntryController: ViewController {
         self.biometrics = biometrics
         self.arguments = arguments
         
+        self.statusBarHost = statusBarHost
+        self.previousStatusBarStyle = statusBarHost?.statusBarStyle
         super.init(navigationBarPresentationData: nil)
         
         self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
-        self.statusBar.statusBarStyle = .White
+        self.statusBarHost?.setStatusBarStyle(.lightContent, animated: true)
+        self.statusBarHost?.shouldChangeStatusBarStyle = { [weak self] style in
+            if let strongSelf = self {
+                strongSelf.previousStatusBarStyle = style
+                return false
+            }
+            return true
+        }
         
         self.presentationDataDisposable = (presentationDataSignal
         |> deliverOnMainQueue).start(next: { [weak self] presentationData in
@@ -128,7 +140,7 @@ public final class PasscodeEntryController: ViewController {
         } else {
             biometricsType = nil
         }
-        self.displayNode = PasscodeEntryControllerNode(accountManager: self.accountManager, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, passcodeType: passcodeType, biometricsType: biometricsType, arguments: self.arguments, statusBar: self.statusBar, modalPresentation: self.arguments.modalPresentation)
+        self.displayNode = PasscodeEntryControllerNode(accountManager: self.accountManager, presentationData: self.presentationData, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, passcodeType: passcodeType, biometricsType: biometricsType, arguments: self.arguments, modalPresentation: self.arguments.modalPresentation)
         self.displayNodeDidLoad()
         
         let _ = (self.appLockContext.invalidAttempts
@@ -267,10 +279,14 @@ public final class PasscodeEntryController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     public override func dismiss(completion: (() -> Void)? = nil) {
+        self.statusBarHost?.shouldChangeStatusBarStyle = nil
+        if let statusBarHost = self.statusBarHost, let previousStatusBarStyle = self.previousStatusBarStyle {
+            statusBarHost.setStatusBarStyle(previousStatusBarStyle, animated: true)
+        }
         self.view.endEditing(true)
         self.controllerNode.animateOut { [weak self] in
             guard let strongSelf = self else {
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
index 6272a4c17b..0050da048a 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryControllerNode.swift
@@ -12,6 +12,7 @@ import LocalAuth
 import AppBundle
 import PasscodeInputFieldNode
 import MonotonicTime
+import GradientBackground
 
 private let titleFont = Font.regular(20.0)
 private let subtitleFont = Font.regular(15.0)
@@ -19,6 +20,7 @@ private let buttonFont = Font.regular(17.0)
 
 final class PasscodeEntryControllerNode: ASDisplayNode {
     private let accountManager: AccountManager
+    private var presentationData: PresentationData
     private var theme: PresentationTheme
     private var strings: PresentationStrings
     private var wallpaper: TelegramWallpaper
@@ -27,11 +29,11 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
     private let arguments: PasscodeEntryControllerPresentationArguments
     private var background: PasscodeBackground?
     
-    private let statusBar: StatusBar
-    
     private let modalPresentation: Bool
     
-    private let backgroundNode: ASImageNode
+    private var backgroundCustomNode: ASDisplayNode?
+    private let backgroundDimNode: ASDisplayNode
+    private let backgroundImageNode: ASImageNode
     private let iconNode: PasscodeLockIconNode
     private let titleNode: PasscodeEntryLabelNode
     private let inputFieldNode: PasscodeInputFieldNode
@@ -52,20 +54,24 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
     var checkPasscode: ((String) -> Void)?
     var requestBiometrics: (() -> Void)?
     
-    init(accountManager: AccountManager, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, passcodeType: PasscodeEntryFieldType, biometricsType: LocalAuthBiometricAuthentication?, arguments: PasscodeEntryControllerPresentationArguments, statusBar: StatusBar, modalPresentation: Bool) {
+    init(accountManager: AccountManager, presentationData: PresentationData, theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, passcodeType: PasscodeEntryFieldType, biometricsType: LocalAuthBiometricAuthentication?, arguments: PasscodeEntryControllerPresentationArguments, modalPresentation: Bool) {
         self.accountManager = accountManager
+        self.presentationData = presentationData
         self.theme = theme
         self.strings = strings
         self.wallpaper = wallpaper
         self.passcodeType = passcodeType
         self.biometricsType = biometricsType
         self.arguments = arguments
-        self.statusBar = statusBar
         self.modalPresentation = modalPresentation
         
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.contentMode = .scaleToFill
+        self.backgroundImageNode = ASImageNode()
+        self.backgroundImageNode.contentMode = .scaleToFill
 
+        self.backgroundDimNode = ASDisplayNode()
+        self.backgroundDimNode.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.15)
+        self.backgroundDimNode.isHidden = true
+        
         self.iconNode = PasscodeLockIconNode()
         self.titleNode = PasscodeEntryLabelNode()
         self.inputFieldNode = PasscodeInputFieldNode(color: .white, accentColor: .white, fieldType: passcodeType, keyboardAppearance: .dark, useCustomNumpad: true)
@@ -86,7 +92,20 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
         self.iconNode.unlockedColor = theme.rootController.navigationBar.primaryTextColor
         
         self.keyboardNode.charactedEntered = { [weak self] character in
-            self?.inputFieldNode.append(character)
+            if let strongSelf = self {
+                strongSelf.inputFieldNode.append(character)
+                if let gradientNode = strongSelf.backgroundCustomNode as? GradientBackgroundNode {
+                    gradientNode.animateEvent(transition: .animated(duration: 0.55, curve: .spring))
+                }
+            }
+        }
+        self.keyboardNode.backspace = { [weak self] in
+            if let strongSelf = self {
+                let _ = strongSelf.inputFieldNode.delete()
+                if let gradientNode = strongSelf.backgroundCustomNode as? GradientBackgroundNode {
+                    gradientNode.animateEvent(transition: .animated(duration: 0.55, curve: .spring), backwards: true)
+                }
+            }
         }
         self.inputFieldNode.complete = { [weak self] passcode in
             guard let strongSelf = self else {
@@ -111,7 +130,8 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
             }
         }
         
-        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.backgroundImageNode)
+        self.addSubnode(self.backgroundDimNode)
         self.addSubnode(self.iconNode)
         self.addSubnode(self.titleNode)
         self.addSubnode(self.inputFieldNode)
@@ -146,7 +166,10 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
     
     @objc private func deletePressed() {
         self.hapticFeedback.tap()
-        self.inputFieldNode.delete()
+        let result = self.inputFieldNode.delete()
+        if result, let gradientNode = self.backgroundCustomNode as? GradientBackgroundNode {
+            gradientNode.animateEvent(transition: .animated(duration: 0.55, curve: .spring), backwards: true)
+        }
     }
     
     @objc private func biometricsPressed() {
@@ -158,6 +181,7 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
     }
     
     func updatePresentationData(_ presentationData: PresentationData) {
+        self.presentationData = presentationData
         self.theme = presentationData.theme
         self.strings = presentationData.strings
         self.wallpaper = presentationData.chatWallpaper
@@ -173,26 +197,73 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
             return
         }
         
-        var size = validLayout.size
+        let size = validLayout.size
         if let background = self.background, background.size == size {
             return
         }
         
         switch self.wallpaper {
+            case let .color(colorValue):
+                let color = UIColor(argb: colorValue)
+                let baseColor: UIColor
+                let lightness = color.lightness
+                if lightness < 0.1 || lightness > 0.9 {
+                    baseColor = self.theme.chat.message.outgoing.bubble.withoutWallpaper.fill
+                } else{
+                    baseColor = color
+                }
+                
+                let color1: UIColor
+                let color2: UIColor
+                let color3: UIColor
+                let color4: UIColor
+                if self.theme.overallDarkAppearance {
+                    color1 = baseColor.withMultiplied(hue: 1.034, saturation: 0.819, brightness: 0.214)
+                    color2 = baseColor.withMultiplied(hue: 1.029, saturation: 0.77, brightness: 0.132)
+                    color3 = color1
+                    color4 = color2
+                } else {
+                    color1 = baseColor.withMultiplied(hue: 1.029, saturation: 0.312, brightness: 1.26)
+                    color2 = baseColor.withMultiplied(hue: 1.034, saturation: 0.729, brightness: 0.942)
+                    color3 = baseColor.withMultiplied(hue: 1.029, saturation: 0.729, brightness: 1.231)
+                    color4 = baseColor.withMultiplied(hue: 1.034, saturation: 0.583, brightness: 1.043)
+                }
+                self.background = CustomPasscodeBackground(size: size, colors: [color1, color2, color3, color4], inverted: false)
+            case let .gradient(_, colors, settings):
+                self.background = CustomPasscodeBackground(size: size, colors: colors.compactMap { UIColor(rgb: $0) }, inverted: (settings.intensity ?? 0) < 0)
             case .image, .file:
                 if let image = chatControllerBackgroundImage(theme: self.theme, wallpaper: self.wallpaper, mediaBox: self.accountManager.mediaBox, composed: false, knockoutMode: false) {
                     self.background = ImageBasedPasscodeBackground(image: image, size: size)
                 } else {
-                    self.background = GradientPasscodeBackground(size: size, backgroundColors: self.theme.passcode.backgroundColors.colors, buttonColor: self.theme.passcode.buttonColor)
+                    if case let .file(file) = self.wallpaper, !file.settings.colors.isEmpty {
+                        self.background = CustomPasscodeBackground(size: size, colors: file.settings.colors.compactMap { UIColor(rgb: $0) }, inverted: (file.settings.intensity ?? 0) < 0)
+                    } else {
+                        self.background = GradientPasscodeBackground(size: size, backgroundColors: self.theme.passcode.backgroundColors.colors, buttonColor: self.theme.passcode.buttonColor)
+                    }
                 }
             default:
                 self.background = GradientPasscodeBackground(size: size, backgroundColors: self.theme.passcode.backgroundColors.colors, buttonColor: self.theme.passcode.buttonColor)
         }
         
         if let background = self.background {
-            self.backgroundNode.image = background.backgroundImage
-            self.keyboardNode.updateBackground(background)
-            self.inputFieldNode.updateBackground(background.foregroundImage, size: background.size)
+            self.backgroundCustomNode?.removeFromSupernode()
+            self.backgroundCustomNode = nil
+            
+            if let backgroundImage = background.backgroundImage {
+                self.backgroundImageNode.image = backgroundImage
+                self.backgroundDimNode.isHidden = true
+            } else if let customBackgroundNode = background.makeBackgroundNode() {
+                self.backgroundCustomNode = customBackgroundNode
+                self.insertSubnode(customBackgroundNode, aboveSubnode: self.backgroundImageNode)
+                if let background = background as? CustomPasscodeBackground, background.inverted {
+                    self.backgroundDimNode.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.75)
+                } else {
+                    self.backgroundDimNode.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.15)
+                }
+                self.backgroundDimNode.isHidden = false
+            }
+            self.keyboardNode.updateBackground(self.presentationData, background)
+            self.inputFieldNode.updateBackground(background)
         }
     }
     
@@ -263,7 +334,12 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
                     self.effectView.alpha = 1.0
                 }
             })
-            self.backgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            self.backgroundImageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            if let gradientNode = self.backgroundCustomNode as? GradientBackgroundNode {
+                gradientNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                self.backgroundDimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                gradientNode.animateEvent(transition: .animated(duration: 1.0, curve: .spring), extendAnimation: true)
+            }
         }
         self.titleNode.setAttributedText(NSAttributedString(string: self.strings.EnterPasscode_EnterPasscode, font: titleFont, textColor: .white), animation: .none)
     }
@@ -277,15 +353,21 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
                 self.effectView.alpha = 1.0
             }
         })
-        self.backgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+        self.backgroundImageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+        if let gradientNode = self.backgroundCustomNode as? GradientBackgroundNode {
+            gradientNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+            gradientNode.animateEvent(transition: .animated(duration: 0.35, curve: .spring))
+            self.backgroundDimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+        }
         if !iconFrame.isEmpty {
             self.iconNode.animateIn(fromScale: 0.416)
             self.iconNode.layer.animatePosition(from: iconFrame.center.offsetBy(dx: 6.0, dy: 6.0), to: self.iconNode.layer.position, duration: 0.45)
+            
+            Queue.mainQueue().after(0.45) {
+                self.hapticFeedback.impact(.medium)
+            }
         }
         
-        self.statusBar.layer.removeAnimation(forKey: "opacity")
-        self.statusBar.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
-        
         self.subtitleNode.isHidden = true
         self.inputFieldNode.isHidden = true
         self.keyboardNode.isHidden = true
@@ -303,6 +385,9 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
             
             self.subtitleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
             
+            if let gradientNode = self.backgroundCustomNode as? GradientBackgroundNode {
+                gradientNode.animateEvent(transition: .animated(duration: 1.0, curve: .spring))
+            }
             self.inputFieldNode.animateIn()
             self.keyboardNode.animateIn()
             var biometricDelay = 0.3
@@ -323,7 +408,6 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
     }
     
     func animateOut(down: Bool = false, completion: @escaping () -> Void = {}) {
-        self.statusBar.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
         self.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: down ? self.bounds.size.height : -self.bounds.size.height), duration: 0.2, removeOnCompletion: false, additive: true, completion: { _ in
             completion()
         })
@@ -340,6 +424,10 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
         self.iconNode.layer.addShakeAnimation(amplitude: -8.0, duration: 0.5, count: 6, decay: true)
         
         self.hapticFeedback.error()
+        
+        if let gradientNode = self.backgroundCustomNode as? GradientBackgroundNode {
+            gradientNode.animateEvent(transition: .animated(duration: 1.5, curve: .spring), extendAnimation: true, backwards: true)
+        }
     }
     
     func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
@@ -348,7 +436,14 @@ final class PasscodeEntryControllerNode: ASDisplayNode {
         self.updateBackground()
             
         let bounds = CGRect(origin: CGPoint(), size: layout.size)
-        transition.updateFrame(node: self.backgroundNode, frame: bounds)
+        transition.updateFrame(node: self.backgroundImageNode, frame: bounds)
+        transition.updateFrame(node: self.backgroundDimNode, frame: bounds)
+        if let backgroundCustomNode = self.backgroundCustomNode {
+            transition.updateFrame(node: backgroundCustomNode, frame: bounds)
+            if let gradientBackgroundNode = backgroundCustomNode as? GradientBackgroundNode {
+                gradientBackgroundNode.updateLayout(size: bounds.size, transition: transition)
+            }
+        }
         transition.updateFrame(view: self.effectView, frame: bounds)
         
         switch self.passcodeType {
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift
index 0154e44451..83b322eb0e 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryKeyboardNode.swift
@@ -3,6 +3,8 @@ import UIKit
 import Display
 import AsyncDisplayKit
 import SwiftSignalKit
+import TelegramPresentationData
+import GradientBackground
 
 private let regularTitleFont = Font.regular(36.0)
 private let regularSubtitleFont: UIFont = {
@@ -35,8 +37,9 @@ private func generateButtonImage(background: PasscodeBackground, frame: CGRect,
         context.clip()
         
         context.setAlpha(0.8)
-        context.draw(background.foregroundImage.cgImage!, in: relativeFrame)
-        
+        if let foregroundImage = background.foregroundImage {
+            context.draw(foregroundImage.cgImage!, in: relativeFrame)
+        }
         if highlighted {
             context.setFillColor(UIColor(white: 1.0, alpha: 0.65).cgColor)
             context.fillEllipse(in: bounds)
@@ -98,6 +101,7 @@ private func generateButtonImage(background: PasscodeBackground, frame: CGRect,
 }
 
 final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
+    private var presentationData: PresentationData
     private var background: PasscodeBackground
     let title: String
     private let subtitle: String
@@ -106,15 +110,30 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
     private var regularImage: UIImage?
     private var highlightedImage: UIImage?
     
+    private var blurredBackgroundNode: NavigationBackgroundNode?
+    private var gradientBackgroundNode: GradientBackgroundNode.CloneNode?
     private let backgroundNode: ASImageNode
     
     var action: (() -> Void)?
+    var cancelAction: (() -> Void)?
     
-    init(background: PasscodeBackground, title: String, subtitle: String) {
+    init(presentationData: PresentationData, background: PasscodeBackground, title: String, subtitle: String) {
+        self.presentationData = presentationData
         self.background = background
         self.title = title
         self.subtitle = subtitle
         
+        if let background = background as? CustomPasscodeBackground {
+            if false, background.inverted {
+                let gradientBackgroundNode = background.makeForegroundNode(backgroundNode: background.makeBackgroundNode())
+                self.gradientBackgroundNode = gradientBackgroundNode as? GradientBackgroundNode.CloneNode
+            } else {
+                let blurredBackgroundColor = (background.inverted ? UIColor(rgb: 0xffffff, alpha: 0.1) : UIColor(rgb: 0x000000, alpha: 0.2), dateFillNeedsBlur(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper))
+                let blurredBackgroundNode = NavigationBackgroundNode(color: blurredBackgroundColor.0, enableBlur: blurredBackgroundColor.1)
+                self.blurredBackgroundNode = blurredBackgroundNode
+            }
+        }
+        
         self.backgroundNode = ASImageNode()
         self.backgroundNode.displaysAsynchronously = false
         self.backgroundNode.displayWithoutProcessing = true
@@ -122,6 +141,12 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
         
         super.init()
         
+        if let gradientBackgroundNode = self.gradientBackgroundNode {
+            self.addSubnode(gradientBackgroundNode)
+        }
+        if let blurredBackgroundNode = self.blurredBackgroundNode {
+            self.addSubnode(blurredBackgroundNode)
+        }
         self.addSubnode(self.backgroundNode)
         
         self.highligthedChanged = { [weak self] highlighted in
@@ -146,7 +171,8 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
         }
     }
     
-    func updateBackground(_ background: PasscodeBackground) {
+    func updateBackground(_ presentationData: PresentationData, _ background: PasscodeBackground) {
+        self.presentationData = presentationData
         self.background = background
         self.updateGraphics()
     }
@@ -155,6 +181,12 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
         self.regularImage = generateButtonImage(background: self.background, frame: self.frame, title: self.title, subtitle: self.subtitle, highlighted: false)
         self.highlightedImage = generateButtonImage(background: self.background, frame: self.frame, title: self.title, subtitle: self.subtitle, highlighted: true)
         self.updateState(highlighted: self.isHighlighted)
+        
+        if let gradientBackgroundNode = self.gradientBackgroundNode {
+            let containerSize = self.background.size
+            let shiftedContentsRect = CGRect(origin: CGPoint(x: self.frame.minX / containerSize.width, y: self.frame.minY / containerSize.height), size: CGSize(width: self.frame.width / containerSize.width, height: self.frame.height / containerSize.height))
+            gradientBackgroundNode.layer.contentsRect = shiftedContentsRect
+        }
     }
     
     private func updateState(highlighted: Bool) {
@@ -175,6 +207,13 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
     override func layout() {
         super.layout()
         
+        if let gradientBackgroundNode = self.gradientBackgroundNode {
+            gradientBackgroundNode.frame = self.bounds
+        }
+        if let blurredBackgroundNode = self.blurredBackgroundNode {
+            blurredBackgroundNode.frame = self.bounds
+            blurredBackgroundNode.update(size: blurredBackgroundNode.bounds.size, cornerRadius: blurredBackgroundNode.bounds.height / 2.0, transition: .immediate)
+        }
         self.backgroundNode.frame = self.bounds
     }
     
@@ -183,6 +222,20 @@ final class PasscodeEntryButtonNode: HighlightTrackingButtonNode {
         
         self.action?()
     }
+    
+    override func touchesEnded(_ touches: Set<UITouch>, with event: UIEvent?) {
+        super.touchesEnded(touches, with: event)
+        
+        if let touchPosition = touches.first?.location(in: self.view), !self.view.bounds.contains(touchPosition) {
+            self.cancelAction?()
+        }
+    }
+    
+    override func touchesCancelled(_ touches: Set<UITouch>?, with event: UIEvent?) {
+        super.touchesCancelled(touches, with: event)
+        
+        self.cancelAction?()
+    }
 }
 
 private let buttonsData = [
@@ -199,31 +252,37 @@ private let buttonsData = [
 ]
 
 final class PasscodeEntryKeyboardNode: ASDisplayNode {
+    private var presentationData: PresentationData?
     private var background: PasscodeBackground?
     
     var charactedEntered: ((String) -> Void)?
+    var backspace: (() -> Void)?
     
     private func updateButtons() {
-        guard let background = self.background else {
+        guard let presentationData = self.presentationData, let background = self.background else {
             return
         }
         
         if let subnodes = self.subnodes, !subnodes.isEmpty {
             for case let button as PasscodeEntryButtonNode in subnodes {
-                button.updateBackground(background)
+                button.updateBackground(presentationData, background)
             }
         } else {
             for (title, subtitle) in buttonsData {
-                let buttonNode = PasscodeEntryButtonNode(background: background, title: title, subtitle: subtitle)
+                let buttonNode = PasscodeEntryButtonNode(presentationData: presentationData, background: background, title: title, subtitle: subtitle)
                 buttonNode.action = { [weak self] in
                     self?.charactedEntered?(title)
                 }
+                buttonNode.cancelAction = { [weak self] in
+                    self?.backspace?()
+                }
                 self.addSubnode(buttonNode)
             }
         }
     }
     
-    func updateBackground(_ background: PasscodeBackground) {
+    func updateBackground(_ presentationData: PresentationData, _ background: PasscodeBackground) {
+        self.presentationData = presentationData
         self.background = background
         self.updateButtons()
     }
diff --git a/submodules/PasscodeUI/Sources/PasscodeEntryLabelNode.swift b/submodules/PasscodeUI/Sources/PasscodeEntryLabelNode.swift
index 51db01bf6e..d5b1783263 100644
--- a/submodules/PasscodeUI/Sources/PasscodeEntryLabelNode.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeEntryLabelNode.swift
@@ -22,6 +22,7 @@ final class PasscodeEntryLabelNode: ASDisplayNode {
         self.textNode = ASTextNode()
         self.textNode.isLayerBacked = false
         self.textNode.textAlignment = .center
+        self.textNode.displaysAsynchronously = false
         
         super.init()
         
diff --git a/submodules/PasscodeUI/Sources/PasscodeInputFieldNode.swift b/submodules/PasscodeUI/Sources/PasscodeInputFieldNode.swift
index dd2ce400ac..f6ea4d47e5 100644
--- a/submodules/PasscodeUI/Sources/PasscodeInputFieldNode.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeInputFieldNode.swift
@@ -24,20 +24,23 @@ private func generateDotImage(color: UIColor, filled: Bool) -> UIImage? {
     })
 }
 
-private func generateFieldBackgroundImage(backgroundImage: UIImage, backgroundSize: CGSize, frame: CGRect) -> UIImage? {
+private func generateFieldBackgroundImage(backgroundImage: UIImage?, backgroundSize: CGSize?, frame: CGRect) -> UIImage? {
     return generateImage(frame.size, contextGenerator: { size, context in
         let bounds = CGRect(origin: CGPoint(), size: size)
         context.clear(bounds)
         
-        let relativeFrame = CGRect(x: -frame.minX, y: frame.minY - backgroundSize.height + frame.size.height
-            , width: backgroundSize.width, height: backgroundSize.height)
-        
         let path = UIBezierPath(roundedRect: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height), cornerRadius: 6.0)
         context.addPath(path.cgPath)
         context.clip()
         
-        context.draw(backgroundImage.cgImage!, in: relativeFrame)
-        
+        if let backgroundImage = backgroundImage, let backgroundSize = backgroundSize {
+            let relativeFrame = CGRect(x: -frame.minX, y: frame.minY - backgroundSize.height + frame.size.height
+                , width: backgroundSize.width, height: backgroundSize.height)
+            context.draw(backgroundImage.cgImage!, in: relativeFrame)
+        } else {
+            context.setFillColor(UIColor(rgb: 0xffffff, alpha: 1.0).cgColor)
+            context.fill(bounds)
+        }
         context.setBlendMode(.clear)
         context.setFillColor(UIColor.clear.cgColor)
     
@@ -129,7 +132,7 @@ private class PasscodeEntryDotNode: ASImageNode {
 }
 
 public final class PasscodeInputFieldNode: ASDisplayNode, UITextFieldDelegate {
-    private var background: (UIImage, CGSize)?
+    private var background: PasscodeBackground?
     private var color: UIColor
     private var accentColor: UIColor
     private var fieldType: PasscodeEntryFieldType
@@ -207,8 +210,8 @@ public final class PasscodeInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         }
     }
     
-    func updateBackground(_ image: UIImage, size: CGSize) {
-        self.background = (image, size)
+    func updateBackground(_ background: PasscodeBackground) {
+        self.background = background
         if let (size, topOffset) = self.validLayout {
             let _ = self.updateLayout(size: size, topOffset: topOffset, transition: .immediate)
         }
@@ -276,14 +279,15 @@ public final class PasscodeInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         }
     }
     
-    func delete() {
+    func delete() -> Bool {
         var text = self.textFieldNode.textField.text ?? ""
         guard !text.isEmpty else {
-            return
+            return false
         }
         text = String(text[text.startIndex ..< text.index(text.endIndex, offsetBy: -1)])
         self.textFieldNode.textField.text = text
         self.updateDots(count: text.count, animated: true)
+        return true
     }
     
     func updateDots(count: Int, animated: Bool) {
@@ -346,9 +350,8 @@ public final class PasscodeInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         let fieldFrame = CGRect(x: inset, y: origin.y, width: size.width - inset * 2.0, height: fieldHeight)
         transition.updateFrame(node: self.borderNode, frame: fieldFrame)
         transition.updateFrame(node: self.textFieldNode, frame: fieldFrame.insetBy(dx: 13.0, dy: 0.0))
-        if let (backgroundImage, backgroundSize) = self.background {
-            self.borderNode.image = generateFieldBackgroundImage(backgroundImage: backgroundImage, backgroundSize: backgroundSize, frame: fieldFrame)
-        }
+        
+        self.borderNode.image = generateFieldBackgroundImage(backgroundImage: self.background?.foregroundImage, backgroundSize: self.background?.size, frame: fieldFrame)
         
         return fieldFrame
     }
diff --git a/submodules/PasscodeUI/Sources/PasscodeSetupController.swift b/submodules/PasscodeUI/Sources/PasscodeSetupController.swift
index 33a9f3cb4a..47873beb62 100644
--- a/submodules/PasscodeUI/Sources/PasscodeSetupController.swift
+++ b/submodules/PasscodeUI/Sources/PasscodeSetupController.swift
@@ -143,7 +143,7 @@ public final class PasscodeSetupController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func nextPressed() {
diff --git a/submodules/PassportUI/Sources/Form/FormController.swift b/submodules/PassportUI/Sources/Form/FormController.swift
index d0ce8c2905..aebd1cea99 100644
--- a/submodules/PassportUI/Sources/Form/FormController.swift
+++ b/submodules/PassportUI/Sources/Form/FormController.swift
@@ -45,6 +45,6 @@ public class FormController<InnerState, InitParams, Node: FormControllerNode<Ini
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/PassportUI/Sources/LegacySecureIdAttachmentMenu.swift b/submodules/PassportUI/Sources/LegacySecureIdAttachmentMenu.swift
index eff3936045..6da5632fcf 100644
--- a/submodules/PassportUI/Sources/LegacySecureIdAttachmentMenu.swift
+++ b/submodules/PassportUI/Sources/LegacySecureIdAttachmentMenu.swift
@@ -158,7 +158,7 @@ private func processedLegacySecureIdAttachmentItems(postbox: Postbox, signal: SS
         guard let image = image else {
             return []
         }
-        let randomId = arc4random64()
+        let randomId = Int64.random(in: Int64.min ... Int64.max)
         let tempFilePath = NSTemporaryDirectory() + "\(randomId).jpeg"
         let scaledSize = image.size.aspectFitted(CGSize(width: 2048.0, height: 2048.0))
         if let scaledImage = TGScaleImageToPixelSize(image, scaledSize), let scaledImageData = compressImageToJPEG(scaledImage, quality: 0.84) {
diff --git a/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift b/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift
index 4ea08bef1c..376c52ec14 100644
--- a/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift
+++ b/submodules/PassportUI/Sources/SecureIdAuthAcceptNode.swift
@@ -45,7 +45,7 @@ final class SecureIdAuthAcceptNode: ASDisplayNode {
         
         super.init()
         
-        self.backgroundColor = theme.rootController.navigationBar.backgroundColor
+        self.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor
         
         self.addSubnode(self.separatorNode)
         self.addSubnode(self.buttonBackgroundNode)
diff --git a/submodules/PassportUI/Sources/SecureIdAuthController.swift b/submodules/PassportUI/Sources/SecureIdAuthController.swift
index 1df3ddb5a0..6e224c3a08 100644
--- a/submodules/PassportUI/Sources/SecureIdAuthController.swift
+++ b/submodules/PassportUI/Sources/SecureIdAuthController.swift
@@ -65,7 +65,7 @@ final class SecureIdAuthControllerInteraction {
 }
 
 public enum SecureIdAuthControllerMode {
-    case form(peerId: PeerId, scope: String, publicKey: String, callbackUrl: String, opaquePayload: Data, opaqueNonce: Data)
+    case form(peerId: PeerId, scope: String, publicKey: String, callbackUrl: String?, opaquePayload: Data, opaqueNonce: Data)
     case list
 }
 
@@ -122,12 +122,12 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
         }
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(image: PresentationResourcesRootController.navigationInfoIcon(self.presentationData.theme), style: .plain, target: self, action: #selector(self.infoPressed))
         
-        self.challengeDisposable.set((twoStepAuthData(context.account.network)
+        self.challengeDisposable.set((context.engine.auth.twoStepAuthData()
         |> deliverOnMainQueue).start(next: { [weak self] data in
             if let strongSelf = self {
                 let storedPassword = context.getStoredSecureIdPassword()
                 if data.currentPasswordDerivation != nil, let storedPassword = storedPassword {
-                    strongSelf.authenthicateDisposable.set((accessSecureId(network: strongSelf.context.account.network, password: storedPassword)
+                    strongSelf.authenthicateDisposable.set((strongSelf.context.engine.secureId.accessSecureId(password: storedPassword)
                     |> deliverOnMainQueue).start(next: { context in
                         guard let strongSelf = self, strongSelf.state.verificationState == nil else {
                             return
@@ -366,7 +366,7 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override public func dismiss(completion: (() -> Void)? = nil) {
@@ -423,8 +423,8 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
     @objc private func cancelPressed() {
         self.dismiss()
         
-        if case let .form(reqForm) = self.mode {
-            self.openUrl(secureIdCallbackUrl(with: reqForm.callbackUrl, peerId: reqForm.peerId, result: .cancel, parameters: [:]))
+        if case let .form(peerId, _, _, maybeCallbackUrl, _, _) = self.mode, let callbackUrl = maybeCallbackUrl {
+            self.openUrl(secureIdCallbackUrl(with: callbackUrl, peerId: peerId, result: .cancel, parameters: [:]))
         }
     }
     
@@ -441,7 +441,7 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
                 state.verificationState = .passwordChallenge(hint: hint, state: .checking, hasRecoveryEmail: hasRecoveryEmail)
                 return state
             })
-            self.challengeDisposable.set((accessSecureId(network: self.context.account.network, password: password)
+            self.challengeDisposable.set((self.context.engine.secureId.accessSecureId(password: password)
             |> deliverOnMainQueue).start(next: { [weak self] context in
                 guard let strongSelf = self, let verificationState = strongSelf.state.verificationState, case .passwordChallenge(_, .checking, _) = verificationState else {
                     return
@@ -512,13 +512,13 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
                 guard let strongSelf = self else {
                     return
                 }
-                strongSelf.recoveryDisposable.set((requestTwoStepVerificationPasswordRecoveryCode(network: strongSelf.context.account.network)
+                strongSelf.recoveryDisposable.set((strongSelf.context.engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
                 |> deliverOnMainQueue).start(next: { emailPattern in
                     guard let strongSelf = self else {
                         return
                     }
                     var completionImpl: (() -> Void)?
-                    let controller = resetPasswordController(context: strongSelf.context, emailPattern: emailPattern, completion: {
+                    let controller = resetPasswordController(context: strongSelf.context, emailPattern: emailPattern, completion: { _ in
                         completionImpl?()
                     })
                     completionImpl = { [weak controller] in
@@ -558,7 +558,7 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
                 return
             }
             switch update {
-                case .noPassword:
+                case .noPassword, .pendingPasswordReset:
                     strongSelf.updateState(animated: false, { state in
                         var state = state
                         if let verificationState = state.verificationState, case .noChallenge = verificationState {
@@ -639,13 +639,15 @@ public final class SecureIdAuthController: ViewController, StandalonePresentable
     @objc private func grantAccess() {
         switch self.state {
             case let .form(form):
-                if case let .form(reqForm) = self.mode, let encryptedFormData = form.encryptedFormData, let formData = form.formData {
+                if case let .form(peerId, scope, publicKey, callbackUrl, opaquePayload, opaqueNonce) = self.mode, let encryptedFormData = form.encryptedFormData, let formData = form.formData {
                     let values = parseRequestedFormFields(formData.requestedFields, values: formData.values, primaryLanguageByCountry: encryptedFormData.primaryLanguageByCountry).map({ $0.1 }).flatMap({ $0 })
                     
-                    let _ = (grantSecureIdAccess(network: self.context.account.network, peerId: encryptedFormData.servicePeer.id, publicKey: reqForm.publicKey, scope: reqForm.scope, opaquePayload: reqForm.opaquePayload, opaqueNonce: reqForm.opaqueNonce, values: values, requestedFields: formData.requestedFields)
+                    let _ = (grantSecureIdAccess(network: self.context.account.network, peerId: encryptedFormData.servicePeer.id, publicKey: publicKey, scope: scope, opaquePayload: opaquePayload, opaqueNonce: opaqueNonce, values: values, requestedFields: formData.requestedFields)
                     |> deliverOnMainQueue).start(completed: { [weak self] in
                         self?.dismiss()
-                        self?.openUrl(secureIdCallbackUrl(with: reqForm.callbackUrl, peerId: reqForm.peerId, result: .success, parameters: [:]))
+                        if let callbackUrl = callbackUrl {
+                            self?.openUrl(secureIdCallbackUrl(with: callbackUrl, peerId: peerId, result: .success, parameters: [:]))
+                        }
                     })
                 }
             case .list:
diff --git a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift
index e0f44699b3..5ec8b56f37 100644
--- a/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift
+++ b/submodules/PassportUI/Sources/SecureIdDocumentFormControllerNode.swift
@@ -2601,7 +2601,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode<SecureIdDocum
                     }
                 }
                 for resource in resources {
-                    let id = arc4random64()
+                    let id = Int64.random(in: Int64.min ... Int64.max)
                     innerState.documents.insert(.local(SecureIdVerificationLocalDocument(id: id, resource: SecureIdLocalImageResource(localId: id, source: resource), timestamp: Int32(Date().timeIntervalSince1970), state: .uploading(0.0))), at: addIndex)
                     addIndex += 1
                 }
@@ -2613,7 +2613,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode<SecureIdDocum
                     innerState = removeDocumentWithId(innerState, id: removeDocumentId)
                 }
                 loop: for resource in resources {
-                    let id = arc4random64()
+                    let id = Int64.random(in: Int64.min ... Int64.max)
                     innerState.selfieDocument = .local(SecureIdVerificationLocalDocument(id: id, resource: SecureIdLocalImageResource(localId: id, source: resource), timestamp: Int32(Date().timeIntervalSince1970), state: .uploading(0.0)))
                     break loop
                 }
@@ -2622,7 +2622,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode<SecureIdDocum
                     innerState = removeDocumentWithId(innerState, id: removeDocumentId)
                 }
                 loop: for resource in resources {
-                    let id = arc4random64()
+                    let id = Int64.random(in: Int64.min ... Int64.max)
                     innerState.frontSideDocument = .local(SecureIdVerificationLocalDocument(id: id, resource: SecureIdLocalImageResource(localId: id, source: resource), timestamp: Int32(Date().timeIntervalSince1970), state: .uploading(0.0)))
                     break loop
                 }
@@ -2631,7 +2631,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode<SecureIdDocum
                     innerState = removeDocumentWithId(innerState, id: removeDocumentId)
                 }
                 loop: for resource in resources {
-                    let id = arc4random64()
+                    let id = Int64.random(in: Int64.min ... Int64.max)
                     innerState.backSideDocument = .local(SecureIdVerificationLocalDocument(id: id, resource: SecureIdLocalImageResource(localId: id, source: resource), timestamp: Int32(Date().timeIntervalSince1970), state: .uploading(0.0)))
                     break loop
                 }
@@ -2647,7 +2647,7 @@ final class SecureIdDocumentFormControllerNode: FormControllerNode<SecureIdDocum
                     }
                 }
                 for resource in resources {
-                    let id = arc4random64()
+                    let id = Int64.random(in: Int64.min ... Int64.max)
                     innerState.translations.insert(.local(SecureIdVerificationLocalDocument(id: id, resource: SecureIdLocalImageResource(localId: id, source: resource), timestamp: Int32(Date().timeIntervalSince1970), state: .uploading(0.0))), at: addIndex)
                     addIndex += 1
                 }
diff --git a/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift b/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift
index ce02da88e0..8216885c40 100644
--- a/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift
+++ b/submodules/PassportUI/Sources/SecureIdDocumentGalleryController.swift
@@ -254,7 +254,7 @@ class SecureIdDocumentGalleryController: ViewController, StandalonePresentableCo
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
         
         if firstLayout {
             firstLayout = false
diff --git a/submodules/PasswordSetupUI/Resources/TwoFactorRemovePasswordDone.tgs b/submodules/PasswordSetupUI/Resources/TwoFactorRemovePasswordDone.tgs
new file mode 100644
index 0000000000..8fabc350eb
Binary files /dev/null and b/submodules/PasswordSetupUI/Resources/TwoFactorRemovePasswordDone.tgs differ
diff --git a/submodules/PasswordSetupUI/Resources/TwoFactorSetupRemember.tgs b/submodules/PasswordSetupUI/Resources/TwoFactorSetupRemember.tgs
new file mode 100644
index 0000000000..9e1cf7701b
Binary files /dev/null and b/submodules/PasswordSetupUI/Resources/TwoFactorSetupRemember.tgs differ
diff --git a/submodules/PasswordSetupUI/Resources/TwoFactorSetupRememberSuccess.tgs b/submodules/PasswordSetupUI/Resources/TwoFactorSetupRememberSuccess.tgs
new file mode 100644
index 0000000000..792b9a1773
Binary files /dev/null and b/submodules/PasswordSetupUI/Resources/TwoFactorSetupRememberSuccess.tgs differ
diff --git a/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift b/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
index db3835105c..18b071b38f 100644
--- a/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
+++ b/submodules/PasswordSetupUI/Sources/ResetPasswordController.swift
@@ -115,7 +115,7 @@ public enum ResetPasswordState: Equatable {
     case pendingVerification(emailPattern: String)
 }
 
-public func resetPasswordController(context: AccountContext, emailPattern: String, completion: @escaping () -> Void) -> ViewController {
+public func resetPasswordController(context: AccountContext, emailPattern: String, completion: @escaping (Bool) -> Void) -> ViewController {
     let statePromise = ValuePromise(ResetPasswordControllerState(), ignoreRepeated: true)
     let stateValue = Atomic(value: ResetPasswordControllerState())
     let updateState: ((ResetPasswordControllerState) -> ResetPasswordControllerState) -> Void = { f in
@@ -138,7 +138,20 @@ public func resetPasswordController(context: AccountContext, emailPattern: Strin
         }
     }, openHelp: {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.TwoStepAuth_RecoveryFailed, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+
+        presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetTitle, text: presentationData.strings.TwoStepAuth_RecoveryEmailResetText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetAction, action: {
+            let _ = (context.engine.auth.requestTwoStepPasswordReset()
+            |> deliverOnMainQueue).start(next: { result in
+                switch result {
+                case .done, .waitingForReset:
+                    completion(false)
+                case .declined:
+                    break
+                case let .error(reason):
+                    break
+                }
+            })
+        })]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
     })
     
     var initialFocusImpl: (() -> Void)?
@@ -166,7 +179,7 @@ public func resetPasswordController(context: AccountContext, emailPattern: Strin
                         state.checking = true
                         return state
                     }
-                    saveDisposable.set((recoverTwoStepVerificationPassword(network: context.account.network, code: state.code)
+                    saveDisposable.set((context.engine.auth.performPasswordRecovery(code: state.code, updatedPassword: .none)
                     |> deliverOnMainQueue).start(error: { error in
                         updateState { state in
                             var state = state
@@ -177,7 +190,7 @@ public func resetPasswordController(context: AccountContext, emailPattern: Strin
                         switch error {
                             case .invalidCode:
                                 text = presentationData.strings.TwoStepAuth_RecoveryCodeInvalid
-                            case .codeExpired:
+                            case .expired:
                                 text = presentationData.strings.TwoStepAuth_RecoveryCodeExpired
                             case .limitExceeded:
                                 text = presentationData.strings.TwoStepAuth_FloodError
@@ -187,7 +200,7 @@ public func resetPasswordController(context: AccountContext, emailPattern: Strin
                         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                         presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                     }, completed: {
-                        completion()
+                        completion(true)
                     }))
                 }
             })
diff --git a/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationController.swift b/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationController.swift
index 9760ad783d..478e8abc9d 100644
--- a/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationController.swift
+++ b/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationController.swift
@@ -12,6 +12,7 @@ import AccountContext
 
 public class SetupTwoStepVerificationController: ViewController {
     private let context: AccountContext
+
     private let initialState: SetupTwoStepVerificationInitialState
     private let stateUpdated: (SetupTwoStepVerificationStateUpdate, Bool, SetupTwoStepVerificationController) -> Void
     
@@ -31,21 +32,22 @@ public class SetupTwoStepVerificationController: ViewController {
     
     private var presentationData: PresentationData
     private var presentationDataDisposable: Disposable?
-    
+
     public init(context: AccountContext, initialState: SetupTwoStepVerificationInitialState, stateUpdated: @escaping (SetupTwoStepVerificationStateUpdate, Bool, SetupTwoStepVerificationController) -> Void) {
         self.context = context
+
         self.initialState = initialState
         self.stateUpdated = stateUpdated
         
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        self.presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
         
-        super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings)))
+        super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings)))
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         
         self.navigationItem.setLeftBarButton(UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed)), animated: false)
         
-        self.presentationDataDisposable = (context.sharedContext.presentationData
+        self.presentationDataDisposable = (self.context.sharedContext.presentationData
         |> deliverOnMainQueue).start(next: { [weak self] presentationData in
             if let strongSelf = self {
                 let previousTheme = strongSelf.presentationData.theme
@@ -151,7 +153,7 @@ public class SetupTwoStepVerificationController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func nextPressed() {
diff --git a/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationControllerNode.swift b/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationControllerNode.swift
index 550b0f781c..8fe2f2b704 100644
--- a/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationControllerNode.swift
+++ b/submodules/PasswordSetupUI/Sources/SetupTwoStepVerificationControllerNode.swift
@@ -138,6 +138,7 @@ public enum SetupTwoStepVerificationStateUpdate {
     case noPassword
     case awaitingEmailConfirmation(password: String, pattern: String, codeLength: Int32?)
     case passwordSet(password: String?, hasRecoveryEmail: Bool, hasSecureValues: Bool)
+    case pendingPasswordReset
 }
 
 final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
@@ -161,7 +162,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
         self.stateUpdated = stateUpdated
         self.present = present
         self.dismiss = dismiss
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        self.presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
         self.innerState = SetupTwoStepVerificationControllerInnerState(layout: nil, data: SetupTwoStepVerificationControllerDataState(activity: false, state: SetupTwoStepVerificationState(initialState: initialState)))
         self.activityIndicator = ActivityIndicator(type: .custom(self.presentationData.theme.list.itemAccentColor, 22.0, 2.0, false))
         
@@ -171,7 +172,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
         self.processStateUpdated()
         
         if self.innerState.data.state == nil {
-            self.actionDisposable.set((twoStepAuthData(context.account.network)
+            self.actionDisposable.set((self.context.engine.auth.twoStepAuthData()
             |> deliverOnMainQueue).start(next: { [weak self] data in
                 guard let strongSelf = self else {
                     return
@@ -340,7 +341,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                         state.data.activity = true
                                         return state
                                     }, transition: .animated(duration: 0.5, curve: .spring))
-                                    strongSelf.actionDisposable.set((updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: nil, updatedPassword: .none)
+                                    strongSelf.actionDisposable.set((strongSelf.context.engine.auth.updateTwoStepVerificationPassword(currentPassword: nil, updatedPassword: .none)
                                     |> deliverOnMainQueue).start(next: { _ in
                                         guard let strongSelf = self else {
                                             return
@@ -356,7 +357,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                         guard let strongSelf = self else {
                                             return
                                         }
-                                        strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                                        strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                                         strongSelf.updateState({ state in
                                             var state = state
                                             state.data.activity = false
@@ -393,7 +394,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                 state.data.activity = true
                                 return state
                             }, transition: .animated(duration: 0.5, curve: .spring))
-                            strongSelf.actionDisposable.set((resendTwoStepRecoveryEmail(network: strongSelf.context.account.network)
+                            strongSelf.actionDisposable.set((strongSelf.context.engine.auth.resendTwoStepRecoveryEmail()
                             |> deliverOnMainQueue).start(error: { error in
                                 guard let strongSelf = self else {
                                     return
@@ -405,7 +406,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                     case .generic:
                                         text = strongSelf.presentationData.strings.Login_UnknownError
                                 }
-                                strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                                strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                                 strongSelf.updateState({ state in
                                     var state = state
                                     state.data.activity = false
@@ -526,7 +527,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                         if password == confirmation {
                             state.data.state = .enterHint(mode: mode, password: password, hint: "")
                         } else {
-                            strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_SetupPasswordConfirmFailed, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                            strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_SetupPasswordConfirmFailed, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                         }
                     case let .enterHint(mode, password, hint):
                         switch mode {
@@ -534,7 +535,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                 state.data.state = .enterEmail(state: .create(password: password, hint: hint), email: "")
                             case let .update(current, hasRecoveryEmail, hasSecureValues):
                                 state.data.activity = true
-                                strongSelf.actionDisposable.set((updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: current, updatedPassword: .password(password: password, hint: hint, email: nil))
+                                strongSelf.actionDisposable.set((strongSelf.context.engine.auth.updateTwoStepVerificationPassword(currentPassword: current, updatedPassword: .password(password: password, hint: hint, email: nil))
                                 |> deliverOnMainQueue).start(next: { result in
                                     guard let strongSelf = self else {
                                         return
@@ -558,7 +559,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                     guard let strongSelf = self else {
                                         return
                                     }
-                                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                                    strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                                     strongSelf.updateState({ state in
                                         var state = state
                                         state.data.activity = false
@@ -570,7 +571,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                         state.data.activity = true
                         switch enterState {
                             case let .create(password, hint):
-                                strongSelf.actionDisposable.set((updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: nil, updatedPassword: .password(password: password, hint: hint, email: email))
+                                strongSelf.actionDisposable.set((strongSelf.context.engine.auth.updateTwoStepVerificationPassword(currentPassword: nil, updatedPassword: .password(password: password, hint: hint, email: email))
                                 |> deliverOnMainQueue).start(next: { result in
                                     guard let strongSelf = self else {
                                         return
@@ -602,7 +603,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                         case .generic:
                                             text = strongSelf.presentationData.strings.Login_UnknownError
                                     }
-                                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                                    strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                                     strongSelf.updateState({ state in
                                         var state = state
                                         state.data.activity = false
@@ -618,7 +619,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                     state.data.activity = true
                                     return state
                                 }, transition: .animated(duration: 0.5, curve: .spring))
-                                strongSelf.actionDisposable.set((updateTwoStepVerificationEmail(network: strongSelf.context.account.network, currentPassword: password, updatedEmail: email)
+                                strongSelf.actionDisposable.set((strongSelf.context.engine.auth.updateTwoStepVerificationEmail(currentPassword: password, updatedEmail: email)
                                 |> deliverOnMainQueue).start(next: { result in
                                     guard let strongSelf = self else {
                                         return
@@ -644,7 +645,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                     guard let strongSelf = self else {
                                         return
                                     }
-                                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                                    strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                                     strongSelf.updateState({ state in
                                         var state = state
                                         state.data.activity = false
@@ -654,7 +655,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                         }
                     case let .confirmEmail(confirmState, _, _, code):
                         state.data.activity = true
-                        strongSelf.actionDisposable.set((confirmTwoStepRecoveryEmail(network: strongSelf.context.account.network, code: code)
+                        strongSelf.actionDisposable.set((strongSelf.context.engine.auth.confirmTwoStepRecoveryEmail(code: code)
                         |> deliverOnMainQueue).start(error: { error in
                             guard let strongSelf = self else {
                                 return
@@ -673,7 +674,7 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                                 case .generic:
                                     text = strongSelf.presentationData.strings.Login_UnknownError
                             }
-                            strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
+                            strongSelf.present(textAlertController(sharedContext: strongSelf.context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), nil)
                             
                             strongSelf.updateState({ state in
                                 var state = state
@@ -697,8 +698,8 @@ final class SetupTwoStepVerificationControllerNode: ViewControllerTracingNode {
                 return state
             }, transition: .animated(duration: 0.5, curve: .spring))
         }
-        if case let .enterEmail(enterEmail)? = self.innerState.data.state, case .create = enterEmail.state, enterEmail.email.isEmpty {
-            self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.TwoStepAuth_EmailSkipAlert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .destructiveAction, title: self.presentationData.strings.TwoStepAuth_EmailSkip, action: {
+        if case let .enterEmail(enterEmailState, enterEmailEmail)? = self.innerState.data.state, case .create = enterEmailState, enterEmailEmail.isEmpty {
+            self.present(textAlertController(sharedContext: self.context.sharedContext, title: nil, text: self.presentationData.strings.TwoStepAuth_EmailSkipAlert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .destructiveAction, title: self.presentationData.strings.TwoStepAuth_EmailSkip, action: {
                 continueImpl()
             })]), nil)
         } else {
diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
index a4f3dcc72a..92e4fa5323 100644
--- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
+++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthDataInputScreen.swift
@@ -11,35 +11,71 @@ import TelegramPresentationData
 import PresentationDataUtils
 import TelegramCore
 import AnimatedStickerNode
+import ActivityIndicator
 
 public enum TwoFactorDataInputMode {
+    public struct Recovery {
+        public enum Mode {
+            case notAuthorized(syncContacts: Bool)
+            case authorized
+        }
+
+        public var code: String
+        public var mode: Mode
+
+        public init(code: String, mode: Mode) {
+            self.code = code
+            self.mode = mode
+        }
+    }
+
+    public enum PasswordRecoveryEmailMode {
+        case notAuthorized(syncContacts: Bool)
+        case authorized
+    }
+
     case password
+    case passwordRecoveryEmail(emailPattern: String, mode: PasswordRecoveryEmailMode)
+    case passwordRecovery(Recovery)
     case emailAddress(password: String, hint: String)
     case updateEmailAddress(password: String)
     case emailConfirmation(passwordAndHint: (String, String)?, emailPattern: String, codeLength: Int?)
-    case passwordHint(password: String)
+    case passwordHint(recovery: Recovery?, password: String)
+    case rememberPassword
 }
 
 public final class TwoFactorDataInputScreen: ViewController {
-    private let context: AccountContext
+    private let sharedContext: SharedAccountContext
+    private let engine: SomeTelegramEngine
     private var presentationData: PresentationData
     private let mode: TwoFactorDataInputMode
     private let stateUpdated: (SetupTwoStepVerificationStateUpdate) -> Void
+    private let actionDisposable = MetaDisposable()
     
-    public init(context: AccountContext, mode: TwoFactorDataInputMode, stateUpdated: @escaping (SetupTwoStepVerificationStateUpdate) -> Void) {
-        self.context = context
+    private let forgotDataDisposable = MetaDisposable()
+    private let forgotDataPromise = Promise<TwoStepVerificationConfiguration?>(nil)
+    private var didSetupForgotData = false
+    
+    public var passwordRecoveryFailed: (() -> Void)?
+    
+    public var passwordRemembered: (() -> Void)?
+    public var twoStepAuthSettingsController: ((TwoStepVerificationConfiguration) -> ViewController)?
+    
+    public init(sharedContext: SharedAccountContext, engine: SomeTelegramEngine, mode: TwoFactorDataInputMode, stateUpdated: @escaping (SetupTwoStepVerificationStateUpdate) -> Void, presentation: ViewControllerNavigationPresentation = .modalInLargeLayout) {
+        self.sharedContext = sharedContext
+        self.engine = engine
         self.mode = mode
         self.stateUpdated = stateUpdated
         
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        self.presentationData = self.sharedContext.currentPresentationData.with { $0 }
         
         let defaultTheme = NavigationBarTheme(rootControllerTheme: self.presentationData.theme)
-        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
+        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
         
         super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: navigationBarTheme, strings: NavigationBarStrings(back: self.presentationData.strings.Common_Back, close: self.presentationData.strings.Common_Close)))
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
-        self.navigationPresentation = .modalInLargeLayout
+        self.navigationPresentation = presentation
         self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
         self.navigationBar?.intrinsicCanTransitionInline = false
         
@@ -49,11 +85,24 @@ public final class TwoFactorDataInputScreen: ViewController {
     required init(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    deinit {
+        self.actionDisposable.dispose()
+        self.forgotDataDisposable.dispose()
+    }
     
     @objc private func backPressed() {
         self.dismiss()
     }
     
+    public override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        if case .rememberPassword = self.mode {
+            (self.displayNode as? TwoFactorDataInputScreenNode)?.focus()
+        }
+    }
+    
     override public func loadDisplayNode() {
         self.displayNode = TwoFactorDataInputScreenNode(presentationData: self.presentationData, mode: self.mode, action: { [weak self] in
             guard let strongSelf = self else {
@@ -86,8 +135,75 @@ public final class TwoFactorDataInputScreen: ViewController {
                     }
                     return true
                 }
-                controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .passwordHint(password: values[0]), stateUpdated: strongSelf.stateUpdated))
+                controllers.append(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .passwordHint(recovery: nil, password: values[0]), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation))
                 navigationController.setViewControllers(controllers, animated: true)
+            case let .passwordRecoveryEmail(_, mode):
+                guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
+                    return
+                }
+                let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
+                strongSelf.present(statusController, in: .window(.root))
+
+                strongSelf.actionDisposable.set((strongSelf.engine.auth.checkPasswordRecoveryCode(code: text)
+                |> deliverOnMainQueue).start(error: { [weak statusController] error in
+                    statusController?.dismiss()
+                    guard let strongSelf = self else {
+                        return
+                    }
+
+                    let text: String
+                    switch error {
+                    case .limitExceeded:
+                        text = strongSelf.presentationData.strings.LoginPassword_FloodError
+                    case .invalidCode:
+                        text = strongSelf.presentationData.strings.Login_InvalidCodeError
+                    case .expired:
+                        text = strongSelf.presentationData.strings.Login_CodeExpiredError
+                    case .generic:
+                        text = strongSelf.presentationData.strings.Login_UnknownError
+                    }
+
+                    strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                }, completed: { [weak statusController] in
+                    statusController?.dismiss()
+
+                    guard let strongSelf = self else {
+                        return
+                    }
+
+                    let mappedMode: TwoFactorDataInputMode.Recovery.Mode
+                    switch mode {
+                    case .authorized:
+                        mappedMode = .authorized
+                    case let .notAuthorized(syncContacts):
+                        mappedMode = .notAuthorized(syncContacts: syncContacts)
+                    }
+
+                    let setupController = TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .passwordRecovery(TwoFactorDataInputMode.Recovery(code: text, mode: mappedMode)), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation)
+
+                    guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                        return
+                    }
+                    navigationController.replaceController(strongSelf, with: setupController, animated: true)
+                }))
+            case let .passwordRecovery(recovery):
+                let values = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText
+                if values.count != 2 {
+                    return
+                }
+                if values[0] != values[1] {
+                    strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_SetupPasswordConfirmFailed, actions: [
+                        TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})
+                    ]), in: .window(.root))
+                    return
+                }
+                if values[0].isEmpty {
+                    return
+                }
+                guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                    return
+                }
+                navigationController.replaceController(strongSelf, with: TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .passwordHint(recovery: recovery, password: values[0]), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation), animated: true)
             case let .emailAddress(password, hint):
                 guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
                     return
@@ -95,7 +211,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                 let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
                 strongSelf.present(statusController, in: .window(.root))
                 
-                let _ = (updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: text))
+                let _ = (strongSelf.engine.auth.updateTwoStepVerificationPassword(currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: text))
                 |> deliverOnMainQueue).start(next: { [weak statusController] result in
                     statusController?.dismiss()
                     
@@ -120,7 +236,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                                 }
                                 return true
                             }
-                            controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailConfirmation(passwordAndHint: (password, hint), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated))
+                            controllers.append(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .emailConfirmation(passwordAndHint: (password, hint), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation))
                             navigationController.setViewControllers(controllers, animated: true)
                         } else {
                             guard let navigationController = strongSelf.navigationController as? NavigationController else {
@@ -135,7 +251,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                                 }
                                 return true
                             }
-                            controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
+                            controllers.append(TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .done))
                             navigationController.setViewControllers(controllers, animated: true)
                         }
                     }
@@ -154,7 +270,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                     case .invalidEmail:
                         alertText = presentationData.strings.TwoStepAuth_EmailInvalid
                     }
-                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
                 })
             case let .updateEmailAddress(password):
                 guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
@@ -162,105 +278,182 @@ public final class TwoFactorDataInputScreen: ViewController {
                 }
                 let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
                 strongSelf.present(statusController, in: .window(.root))
-                
-                let _ = (updateTwoStepVerificationEmail(network: strongSelf.context.account.network, currentPassword: password, updatedEmail: text)
-                |> deliverOnMainQueue).start(next: { [weak statusController] result in
-                    statusController?.dismiss()
-                    
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    
-                    switch result {
-                    case .none:
-                        break
-                    case let .password(_, pendingEmail):
-                        if let pendingEmail = pendingEmail {
-                            guard let navigationController = strongSelf.navigationController as? NavigationController else {
-                                return
-                            }
-                            var controllers = navigationController.viewControllers.filter { controller in
-                                if controller is TwoFactorAuthSplashScreen {
-                                    return false
-                                }
-                                if controller is TwoFactorDataInputScreen {
-                                    return false
-                                }
-                                return true
-                            }
-                            controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailConfirmation(passwordAndHint: (password, ""), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated))
-                            navigationController.setViewControllers(controllers, animated: true)
-                        } else {
-                            guard let navigationController = strongSelf.navigationController as? NavigationController else {
-                                return
-                            }
-                            var controllers = navigationController.viewControllers.filter { controller in
-                                if controller is TwoFactorAuthSplashScreen {
-                                    return false
-                                }
-                                if controller is TwoFactorDataInputScreen {
-                                    return false
-                                }
-                                return true
-                            }
-                            controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
-                            navigationController.setViewControllers(controllers, animated: true)
+
+                switch strongSelf.engine {
+                case let .authorized(engine):
+                    let _ = (engine.auth.updateTwoStepVerificationEmail(currentPassword: password, updatedEmail: text)
+                    |> deliverOnMainQueue).start(next: { [weak statusController] result in
+                        statusController?.dismiss()
+
+                        guard let strongSelf = self else {
+                            return
                         }
-                    }
-                }, error: { [weak statusController] error in
-                    statusController?.dismiss()
-                    
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    
-                    let presentationData = strongSelf.presentationData
-                    let alertText: String
-                    switch error {
-                    case .generic:
-                        alertText = presentationData.strings.Login_UnknownError
-                    case .invalidEmail:
-                        alertText = presentationData.strings.TwoStepAuth_EmailInvalid
-                    }
-                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                })
+
+                        switch result {
+                        case .none:
+                            break
+                        case let .password(_, pendingEmail):
+                            if let pendingEmail = pendingEmail {
+                                guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                                    return
+                                }
+                                var controllers = navigationController.viewControllers.filter { controller in
+                                    if controller is TwoFactorAuthSplashScreen {
+                                        return false
+                                    }
+                                    if controller is TwoFactorDataInputScreen {
+                                        return false
+                                    }
+                                    return true
+                                }
+                                controllers.append(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .emailConfirmation(passwordAndHint: (password, ""), emailPattern: text, codeLength: pendingEmail.codeLength.flatMap(Int.init)), stateUpdated: strongSelf.stateUpdated))
+                                navigationController.setViewControllers(controllers, animated: true)
+                            } else {
+                                guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                                    return
+                                }
+                                var controllers = navigationController.viewControllers.filter { controller in
+                                    if controller is TwoFactorAuthSplashScreen {
+                                        return false
+                                    }
+                                    if controller is TwoFactorDataInputScreen {
+                                        return false
+                                    }
+                                    return true
+                                }
+                                controllers.append(TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .done))
+                                navigationController.setViewControllers(controllers, animated: true)
+                            }
+                        }
+                    }, error: { [weak statusController] error in
+                        statusController?.dismiss()
+
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        let presentationData = strongSelf.presentationData
+                        let alertText: String
+                        switch error {
+                        case .generic:
+                            alertText = presentationData.strings.Login_UnknownError
+                        case .invalidEmail:
+                            alertText = presentationData.strings.TwoStepAuth_EmailInvalid
+                        }
+                        strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    })
+                case .unauthorized:
+                    break
+                }
             case .emailConfirmation:
                 guard let text = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !text.isEmpty else {
                     return
                 }
                 let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
                 strongSelf.present(statusController, in: .window(.root))
+
+                switch strongSelf.engine {
+                case let .authorized(engine):
+                    let _ = (engine.auth.confirmTwoStepRecoveryEmail(code: text)
+                    |> deliverOnMainQueue).start(error: { [weak statusController] error in
+                        statusController?.dismiss()
+
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        let presentationData = strongSelf.presentationData
+                        let text: String
+                        switch error {
+                        case .invalidEmail:
+                            text = presentationData.strings.TwoStepAuth_EmailInvalid
+                        case .invalidCode:
+                            text = presentationData.strings.Login_InvalidCodeError
+                        case .expired:
+                            text = presentationData.strings.TwoStepAuth_EmailCodeExpired
+                        case .flood:
+                            text = presentationData.strings.TwoStepAuth_FloodError
+                        case .generic:
+                            text = presentationData.strings.Login_UnknownError
+                        }
+                        strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    }, completed: { [weak statusController] in
+                        statusController?.dismiss()
+
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                            return
+                        }
+                        var controllers = navigationController.viewControllers.filter { controller in
+                            if controller is TwoFactorAuthSplashScreen {
+                                return false
+                            }
+                            if controller is TwoFactorDataInputScreen {
+                                return false
+                            }
+                            return true
+                        }
+                        controllers.append(TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .done))
+                        navigationController.setViewControllers(controllers, animated: true)
+                    })
+                case .unauthorized:
+                    break
+                }
+            case let .passwordHint(recovery, password):
+                guard let value = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !value.isEmpty else {
+                    return
+                }
+
+                if let recovery = recovery {
+                    strongSelf.performRecovery(recovery: recovery, password: password, hint: value)
+                } else {
+                    strongSelf.push(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .emailAddress(password: password, hint: value), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation))
+                }
+            case .rememberPassword:
+                guard case let .authorized(engine) = strongSelf.engine else {
+                    return
+                }
                 
-                let _ = (confirmTwoStepRecoveryEmail(network: strongSelf.context.account.network, code: text)
-                |> deliverOnMainQueue).start(error: { [weak statusController] error in
-                    statusController?.dismiss()
-                    
+                guard let value = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !value.isEmpty else {
+                    return
+                }
+                
+                (strongSelf.displayNode as? TwoFactorDataInputScreenNode)?.isLoading = true
+                
+                let _ = (engine.auth.requestTwoStepVerifiationSettings(password: value)
+                |> deliverOnMainQueue).start(error: { [weak self] error in
                     guard let strongSelf = self else {
                         return
                     }
                     
+                    (strongSelf.displayNode as? TwoFactorDataInputScreenNode)?.isLoading = false
+
                     let presentationData = strongSelf.presentationData
-                    let text: String
+                    let text: String?
                     switch error {
-                    case .invalidEmail:
-                        text = presentationData.strings.TwoStepAuth_EmailInvalid
-                    case .invalidCode:
-                        text = presentationData.strings.Login_InvalidCodeError
-                    case .expired:
-                        text = presentationData.strings.TwoStepAuth_EmailCodeExpired
-                    case .flood:
-                        text = presentationData.strings.TwoStepAuth_FloodError
-                    case .generic:
-                        text = presentationData.strings.Login_UnknownError
+                        case .limitExceeded:
+                            text = presentationData.strings.LoginPassword_FloodError
+                        case .invalidPassword:
+                            text = nil
+                        case .generic:
+                            text = presentationData.strings.Login_UnknownError
                     }
-                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                }, completed: { [weak statusController] in
-                    statusController?.dismiss()
-                    
+                    if let text = text {
+                        strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    } else {
+                        (strongSelf.displayNode as? TwoFactorDataInputScreenNode)?.onAction(success: false)
+                    }
+                }, completed: { [weak self] in
                     guard let strongSelf = self else {
                         return
                     }
                     
+                    (strongSelf.displayNode as? TwoFactorDataInputScreenNode)?.isLoading = false
+                    strongSelf.passwordRemembered?()
+                    
                     guard let navigationController = strongSelf.navigationController as? NavigationController else {
                         return
                     }
@@ -273,15 +466,9 @@ public final class TwoFactorDataInputScreen: ViewController {
                         }
                         return true
                     }
-                    controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
+                    controllers.append(TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .remember))
                     navigationController.setViewControllers(controllers, animated: true)
                 })
-            case let .passwordHint(password):
-                guard let value = (strongSelf.displayNode as! TwoFactorDataInputScreenNode).inputText.first, !value.isEmpty else {
-                    return
-                }
-                
-                strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: value), stateUpdated: strongSelf.stateUpdated))
             }
         }, skipAction: { [weak self] in
             guard let strongSelf = self else {
@@ -297,7 +484,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                         let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
                         strongSelf.present(statusController, in: .window(.root))
                         
-                        let _ = (updateTwoStepVerificationPassword(network: strongSelf.context.account.network, currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: nil))
+                        let _ = (strongSelf.engine.auth.updateTwoStepVerificationPassword(currentPassword: "", updatedPassword: .password(password: password, hint: hint, email: nil))
                         |> deliverOnMainQueue).start(next: { [weak statusController] result in
                             statusController?.dismiss()
                             
@@ -321,7 +508,7 @@ public final class TwoFactorDataInputScreen: ViewController {
                                     }
                                     return true
                                 }
-                                controllers.append(TwoFactorAuthSplashScreen(context: strongSelf.context, mode: .done))
+                                controllers.append(TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .done))
                                 navigationController.setViewControllers(controllers, animated: true)
                             }
                         }, error: { [weak statusController] error in
@@ -339,13 +526,177 @@ public final class TwoFactorDataInputScreen: ViewController {
                             case .invalidEmail:
                                 alertText = presentationData.strings.TwoStepAuth_EmailInvalid
                             }
-                            strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                            strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
                         })
                     }),
                     TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})
                 ]), in: .window(.root))
-            case let .passwordHint(password):
-                strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: ""), stateUpdated: strongSelf.stateUpdated))
+            case let .passwordHint(recovery, password):
+                if let recovery = recovery {
+                    strongSelf.performRecovery(recovery: recovery, password: password, hint: "")
+                } else {
+                    strongSelf.push(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .emailAddress(password: password, hint: ""), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation))
+                }
+            case let .passwordRecovery(recovery):
+                strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: strongSelf.presentationData.strings.TwoFactorSetup_PasswordRecovery_SkipAlertTitle, text: strongSelf.presentationData.strings.TwoFactorSetup_PasswordRecovery_SkipAlertText, actions: [
+                    TextAlertAction(type: .destructiveAction, title: strongSelf.presentationData.strings.TwoFactorSetup_PasswordRecovery_SkipAlertAction, action: {
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.performRecovery(recovery: recovery, password: "", hint: "")
+                    }),
+                    TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})
+                ]), in: .window(.root))
+            case .rememberPassword:
+                guard case let .authorized(engine) = strongSelf.engine else {
+                    return
+                }
+                
+                strongSelf.view.endEditing(true)
+                
+                let sharedContext = strongSelf.sharedContext
+                let presentationData = sharedContext.currentPresentationData.with { $0 }
+                let navigationController = strongSelf.navigationController as? NavigationController
+                
+                if !strongSelf.didSetupForgotData {
+                    strongSelf.didSetupForgotData = true
+                    strongSelf.forgotDataPromise.set(engine.auth.twoStepVerificationConfiguration() |> map(Optional.init))
+                }
+                let disposable = strongSelf.forgotDataDisposable
+                
+                disposable.set((strongSelf.forgotDataPromise.get()
+                |> take(1)
+                |> deliverOnMainQueue).start(next: { [weak self] configuration in
+                    if let strongSelf = self, let configuration = configuration {
+                        switch configuration {
+                            case let .set(_, hasRecoveryEmail, _, _, pendingResetTimestamp):
+                                if hasRecoveryEmail {
+                                    disposable.set((engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
+                                    |> deliverOnMainQueue).start(next: { emailPattern in
+                                        var stateUpdated: ((SetupTwoStepVerificationStateUpdate) -> Void)?
+                                        let controller = TwoFactorDataInputScreen(sharedContext: sharedContext, engine: .authorized(engine), mode: .passwordRecoveryEmail(emailPattern: emailPattern, mode: .authorized), stateUpdated: { state in
+                                            stateUpdated?(state)
+                                        })
+                                        stateUpdated = { [weak controller] state in
+                                            controller?.view.endEditing(true)
+                                            controller?.dismiss()
+                                            
+                                            switch state {
+                                            case .noPassword, .awaitingEmailConfirmation, .passwordSet:
+                                                controller?.dismiss()
+                                                
+                                                navigationController?.filterController(strongSelf, animated: true)
+                                            case .pendingPasswordReset:
+                                                let _ = (engine.auth.twoStepVerificationConfiguration()
+                                                |> deliverOnMainQueue).start(next: { [weak self] configuration in
+                                                    if let strongSelf = self {
+                                                        if let navigationController = navigationController, let twoStepAuthSettingsController = strongSelf.twoStepAuthSettingsController?(configuration) {
+                                                            var controllers = navigationController.viewControllers.filter { controller in
+                                                                if controller is TwoFactorDataInputScreen {
+                                                                    return false
+                                                                }
+                                                                return true
+                                                            }
+                                                            controllers.append(twoStepAuthSettingsController)
+                                                            navigationController.setViewControllers(controllers, animated: true)
+                                                        }
+                                                    }
+                                                })
+                                            }
+                                        }
+                                        strongSelf.push(controller)
+                                    }, error: { _ in
+                                        strongSelf.present(textAlertController(sharedContext: sharedContext, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                    }))
+                                } else {
+                                    if let pendingResetTimestamp = pendingResetTimestamp {
+                                        let remainingSeconds = pendingResetTimestamp - Int32(Date().timeIntervalSince1970)
+                                        if remainingSeconds <= 0 {
+                                            let _ = (engine.auth.requestTwoStepPasswordReset()
+                                            |> deliverOnMainQueue).start(next: { result in
+                                                switch result {
+                                                case .done, .waitingForReset:
+                                                    let _ = (engine.auth.twoStepVerificationConfiguration()
+                                                    |> deliverOnMainQueue).start(next: { [weak self] configuration in
+                                                        if let strongSelf = self {
+                                                            if let navigationController = navigationController, let twoStepAuthSettingsController = strongSelf.twoStepAuthSettingsController?(configuration) {
+                                                                var controllers = navigationController.viewControllers.filter { controller in
+                                                                    if controller is TwoFactorDataInputScreen {
+                                                                        return false
+                                                                    }
+                                                                    return true
+                                                                }
+                                                                controllers.append(twoStepAuthSettingsController)
+                                                                navigationController.setViewControllers(controllers, animated: true)
+                                                            }
+                                                        }
+                                                    })
+                                                case .declined:
+                                                    break
+                                                case let .error(reason):
+                                                    let text: String
+                                                    switch reason {
+                                                    case let .limitExceeded(retryAtTimestamp):
+                                                        if let retryAtTimestamp = retryAtTimestamp {
+                                                            let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                                                            text = presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0
+                                                        } else {
+                                                            text = presentationData.strings.TwoStepAuth_FloodError
+                                                        }
+                                                    case .generic:
+                                                        text = presentationData.strings.Login_UnknownError
+                                                    }
+                                                    strongSelf.present(textAlertController(sharedContext: sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                                }
+                                            })
+                                        }
+                                    } else {
+                                        strongSelf.present(textAlertController(sharedContext: sharedContext, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetTitle, text: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetAction, action: {
+                                            let _ = (engine.auth.requestTwoStepPasswordReset()
+                                            |> deliverOnMainQueue).start(next: { result in
+                                                switch result {
+                                                case .done, .waitingForReset:
+                                                    let _ = (engine.auth.twoStepVerificationConfiguration()
+                                                    |> deliverOnMainQueue).start(next: { [weak self] configuration in
+                                                        if let strongSelf = self {
+                                                            if let navigationController = navigationController, let twoStepAuthSettingsController = strongSelf.twoStepAuthSettingsController?(configuration) {
+                                                                var controllers = navigationController.viewControllers.filter { controller in
+                                                                    if controller is TwoFactorDataInputScreen {
+                                                                        return false
+                                                                    }
+                                                                    return true
+                                                                }
+                                                                controllers.append(twoStepAuthSettingsController)
+                                                                navigationController.setViewControllers(controllers, animated: true)
+                                                            }
+                                                        }
+                                                    })
+                                                case .declined:
+                                                    break
+                                                case let .error(reason):
+                                                    let text: String
+                                                    switch reason {
+                                                    case let .limitExceeded(retryAtTimestamp):
+                                                        if let retryAtTimestamp = retryAtTimestamp {
+                                                            let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                                                            text = presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0
+                                                        } else {
+                                                            text = presentationData.strings.TwoStepAuth_FloodError
+                                                        }
+                                                    case .generic:
+                                                        text = presentationData.strings.Login_UnknownError
+                                                    }
+                                                    strongSelf.present(textAlertController(sharedContext: sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                                }
+                                            })
+                                        })]), in: .window(.root))
+                                    }
+                                }
+                            case .notSet:
+                                break
+                        }
+                    }
+                }))
             default:
                 break
             }
@@ -368,10 +719,49 @@ public final class TwoFactorDataInputScreen: ViewController {
                         }
                         return true
                     }
-                    controllers.append(TwoFactorDataInputScreen(context: strongSelf.context, mode: .emailAddress(password: password, hint: hint), stateUpdated: strongSelf.stateUpdated))
+                    controllers.append(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .emailAddress(password: password, hint: hint), stateUpdated: strongSelf.stateUpdated, presentation: strongSelf.navigationPresentation))
                     navigationController.setViewControllers(controllers, animated: true)
                 } else {
                 }
+            case .passwordRecoveryEmail:
+                switch strongSelf.engine {
+                case let .authorized(engine):
+                    strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: strongSelf.presentationData.strings.TwoStepAuth_RecoveryUnavailableResetTitle, text: strongSelf.presentationData.strings.TwoStepAuth_RecoveryEmailResetText, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.TwoStepAuth_RecoveryUnavailableResetAction, action: {
+                        let _ = (engine.auth.requestTwoStepPasswordReset()
+                        |> deliverOnMainQueue).start(next: { result in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            switch result {
+                            case .done, .waitingForReset:
+                                strongSelf.stateUpdated(.pendingPasswordReset)
+                            case .declined:
+                                break
+                            case let .error(reason):
+                                let text: String
+                                switch reason {
+                                case let .limitExceeded(retryAtTimestamp):
+                                    if let retryAtTimestamp = retryAtTimestamp {
+                                        let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                                        text = strongSelf.presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: strongSelf.presentationData.strings, value: remainingSeconds)).0
+                                    } else {
+                                        text = strongSelf.presentationData.strings.TwoStepAuth_FloodError
+                                    }
+                                case .generic:
+                                    text = strongSelf.presentationData.strings.Login_UnknownError
+                                }
+                                strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                            }
+                        })
+                    })]), in: .window(.root))
+                case .unauthorized:
+                    strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_RecoveryFailed, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.passwordRecoveryFailed?()
+                    })]), in: .window(.root))
+                }
             default:
                 break
             }
@@ -379,29 +769,57 @@ public final class TwoFactorDataInputScreen: ViewController {
             guard let strongSelf = self else {
                 return
             }
-            
-            let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
-            strongSelf.present(statusController, in: .window(.root))
-            
-            let _ = (resendTwoStepRecoveryEmail(network: strongSelf.context.account.network)
-            |> deliverOnMainQueue).start(error: { [weak statusController] error in
-                statusController?.dismiss()
-                
-                guard let strongSelf = self else {
+            switch strongSelf.mode {
+            case .passwordRecoveryEmail:
+                let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
+                strongSelf.present(statusController, in: .window(.root))
+
+                let _ = (strongSelf.engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
+                |> deliverOnMainQueue).start(error: { [weak statusController] error in
+                    statusController?.dismiss()
+
+                    guard let strongSelf = self else {
+                        return
+                    }
+
+                    let text: String
+                    switch error {
+                    case .limitExceeded:
+                        text = strongSelf.presentationData.strings.TwoStepAuth_FloodError
+                    case .generic:
+                        text = strongSelf.presentationData.strings.Login_UnknownError
+                    }
+                    strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                }, completed: { [weak statusController] in
+                    statusController?.dismiss()
+                })
+            default:
+                guard case let .authorized(engine) = strongSelf.engine else {
                     return
                 }
-                
-                let text: String
-                switch error {
-                case .flood:
-                    text = strongSelf.presentationData.strings.TwoStepAuth_FloodError
-                case .generic:
-                    text = strongSelf.presentationData.strings.Login_UnknownError
-                }
-                strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-            }, completed: { [weak statusController] in
-                statusController?.dismiss()
-            })
+                let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
+                strongSelf.present(statusController, in: .window(.root))
+
+                let _ = (engine.auth.resendTwoStepRecoveryEmail()
+                |> deliverOnMainQueue).start(error: { [weak statusController] error in
+                    statusController?.dismiss()
+
+                    guard let strongSelf = self else {
+                        return
+                    }
+
+                    let text: String
+                    switch error {
+                    case .flood:
+                        text = strongSelf.presentationData.strings.TwoStepAuth_FloodError
+                    case .generic:
+                        text = strongSelf.presentationData.strings.Login_UnknownError
+                    }
+                    strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                }, completed: { [weak statusController] in
+                    statusController?.dismiss()
+                })
+            }
         })
         
         self.displayNodeDidLoad()
@@ -410,7 +828,97 @@ public final class TwoFactorDataInputScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        (self.displayNode as! TwoFactorDataInputScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition)
+        (self.displayNode as! TwoFactorDataInputScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+    }
+
+    private func performRecovery(recovery: TwoFactorDataInputMode.Recovery, password: String, hint: String) {
+        let statusController = OverlayStatusController(theme: self.presentationData.theme, type: .loading(cancelled: nil))
+        self.present(statusController, in: .window(.root))
+
+        switch self.engine {
+        case let .unauthorized(engine):
+            var syncContacts = false
+            switch recovery.mode {
+            case let .notAuthorized(syncContactsValue):
+                syncContacts = syncContactsValue
+            case .authorized:
+                break
+            }
+            let _ = (engine.auth.performPasswordRecovery(code: recovery.code, updatedPassword: password.isEmpty ? .none : .password(password: password, hint: hint, email: nil))
+            |> deliverOnMainQueue).start(next: { [weak self, weak statusController] recoveredAccountData in
+                statusController?.dismiss()
+
+                guard let strongSelf = self else {
+                    return
+                }
+
+                if password.isEmpty {
+                    strongSelf.stateUpdated(.noPassword)
+                } else {
+                    strongSelf.stateUpdated(.passwordSet(password: password, hasRecoveryEmail: true, hasSecureValues: false))
+                }
+
+                (strongSelf.navigationController as? NavigationController)?.replaceController(strongSelf, with: TwoFactorAuthSplashScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .recoveryDone(recoveredAccountData: recoveredAccountData, syncContacts: syncContacts, isPasswordSet: !password.isEmpty)), animated: true)
+            }, error: { [weak self, weak statusController] error in
+                statusController?.dismiss()
+
+                guard let strongSelf = self else {
+                    return
+                }
+
+                let text: String
+                switch error {
+                case .limitExceeded:
+                    text = strongSelf.presentationData.strings.LoginPassword_FloodError
+                case .invalidCode:
+                    text = strongSelf.presentationData.strings.Login_InvalidCodeError
+                case .expired:
+                    text = strongSelf.presentationData.strings.Login_CodeExpiredError
+                case .generic:
+                    text = strongSelf.presentationData.strings.Login_UnknownError
+                }
+
+                strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+            }, completed: { [weak statusController] in
+                statusController?.dismiss()
+            })
+        case let .authorized(engine):
+            let _ = (engine.auth.performPasswordRecovery(code: recovery.code, updatedPassword: password.isEmpty ? .none : .password(password: password, hint: hint, email: nil))
+            |> deliverOnMainQueue).start(error: { [weak self, weak statusController] error in
+                statusController?.dismiss()
+
+                guard let strongSelf = self else {
+                    return
+                }
+
+                let text: String
+                switch error {
+                case .limitExceeded:
+                    text = strongSelf.presentationData.strings.LoginPassword_FloodError
+                case .invalidCode:
+                    text = strongSelf.presentationData.strings.Login_InvalidCodeError
+                case .expired:
+                    text = strongSelf.presentationData.strings.Login_CodeExpiredError
+                case .generic:
+                    text = strongSelf.presentationData.strings.Login_UnknownError
+                }
+
+                strongSelf.present(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+            }, completed: { [weak self, weak statusController] in
+                statusController?.dismiss()
+
+                guard let strongSelf = self else {
+                    return
+                }
+
+                if password.isEmpty {
+                    strongSelf.stateUpdated(.noPassword)
+                } else {
+                    strongSelf.stateUpdated(.passwordSet(password: password, hasRecoveryEmail: true, hasSecureValues: false))
+                }
+                strongSelf.dismiss()
+            })
+        }
     }
 }
 
@@ -479,10 +987,17 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
     private let hideButtonNode: HighlightableButtonNode
     private let clearButtonNode: HighlightableButtonNode
     
+    private var activityIndicator: ActivityIndicator?
+    
     fileprivate var ignoreTextChanged: Bool = false
     
     var isFocused: Bool {
-        return self.inputNode.textField.isFirstResponder
+        get {
+            return self.inputNode.textField.isFirstResponder
+        }
+        set {
+            let _ = self.inputNode.textField.becomeFirstResponder()
+        }
     }
     
     var text: String {
@@ -494,6 +1009,43 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
         }
     }
     
+    var isFailed: Bool = false {
+        didSet {
+            if self.isFailed != oldValue {
+                UIView.transition(with: self.view, duration: 0.2, options: [.transitionCrossDissolve, .curveEaseInOut]) {
+                    self.inputNode.textField.textColor = self.isFailed ? self.theme.list.itemDestructiveColor : self.theme.list.freePlainInputField.primaryColor
+                    self.hideButtonNode.setImage(generateTextHiddenImage(color: self.isFailed ? self.theme.list.itemDestructiveColor : self.theme.list.freePlainInputField.controlColor, on: !self.inputNode.textField.isSecureTextEntry), for: [])
+                    self.backgroundNode.image = self.isFailed ? generateStretchableFilledCircleImage(diameter: 20.0, color: self.theme.list.itemDestructiveColor.withAlphaComponent(0.1)) : generateStretchableFilledCircleImage(diameter: 20.0, color: self.theme.list.freePlainInputField.backgroundColor)
+                } completion: { _ in
+                    
+                }
+            }
+        }
+    }
+    
+    var isLoading: Bool = false {
+        didSet {
+            if self.isLoading != oldValue {
+                if self.isLoading {
+                    if self.activityIndicator == nil {
+                        let activityIndicator = ActivityIndicator(type: .custom(self.theme.actionSheet.inputClearButtonColor, 24.0, 1.0, false))
+                        self.activityIndicator = activityIndicator
+                        self.addSubnode(activityIndicator)
+                        if let size = self.validLayout {
+                            self.updateLayout(size: size, transition: .immediate)
+                        }
+                    }
+                } else if let activityIndicator = self.activityIndicator {
+                    self.activityIndicator = nil
+                    activityIndicator.removeFromSupernode()
+                }
+                self.hideButtonNode.isHidden = self.isLoading
+            }
+        }
+    }
+    
+    private var validLayout: CGSize?
+    
     init(theme: PresentationTheme, mode: TwoFactorDataInputTextNodeType, placeholder: String, focusUpdated: @escaping (TwoFactorDataInputTextNode, Bool) -> Void, next: @escaping (TwoFactorDataInputTextNode) -> Void, updated: @escaping (TwoFactorDataInputTextNode) -> Void, toggleTextHidden: @escaping (TwoFactorDataInputTextNode) -> Void) {
         self.theme = theme
         self.mode = mode
@@ -591,6 +1143,9 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
     }
     
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        if self.isLoading {
+            return false
+        }
         return true
     }
     
@@ -598,7 +1153,9 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
         if !self.ignoreTextChanged {
             switch self.mode {
             case .password:
-                break
+                if self.isFailed {
+                    self.isFailed = false
+                }
             default:
                 self.clearButtonNode.isHidden = self.text.isEmpty
             }
@@ -616,6 +1173,8 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
     }
     
     func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
+        self.validLayout = size
+        
         let leftInset: CGFloat = 16.0
         let rightInset: CGFloat = 38.0
         
@@ -623,6 +1182,11 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
         transition.updateFrame(node: self.inputNode, frame: CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: size.width - leftInset - rightInset, height: size.height)))
         transition.updateFrame(node: self.hideButtonNode, frame: CGRect(origin: CGPoint(x: size.width - rightInset - 4.0, y: 0.0), size: CGSize(width: rightInset + 4.0, height: size.height)))
         transition.updateFrame(node: self.clearButtonNode, frame: CGRect(origin: CGPoint(x: size.width - rightInset - 4.0, y: 0.0), size: CGSize(width: rightInset + 4.0, height: size.height)))
+        
+        if let activityIndicator = self.activityIndicator {
+            let indicatorSize = activityIndicator.measure(CGSize(width: 24.0, height: 24.0))
+            transition.updateFrame(node: activityIndicator, frame: CGRect(origin: CGPoint(x: size.width - rightInset + 6.0, y: floorToScreenPixels((size.height - indicatorSize.height) / 2.0) + 1.0), size: indicatorSize))
+        }
     }
     
     func focus() {
@@ -630,7 +1194,7 @@ private final class TwoFactorDataInputTextNode: ASDisplayNode, UITextFieldDelega
     }
     
     func updateTextHidden(_ value: Bool) {
-        self.hideButtonNode.setImage(generateTextHiddenImage(color: self.theme.actionSheet.inputClearButtonColor, on: !value), for: [])
+        self.hideButtonNode.setImage(generateTextHiddenImage(color: self.isFailed ? self.theme.list.itemDestructiveColor : self.theme.list.freePlainInputField.controlColor, on: !value), for: [])
         let text = self.inputNode.textField.text ?? ""
         self.inputNode.textField.isSecureTextEntry = value
         if value {
@@ -671,12 +1235,18 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
     private let inputNodes: [TwoFactorDataInputTextNode]
     private let buttonNode: SolidRoundedButtonNode
     
-    private var navigationHeight: CGFloat?
+    private var validLayout: (ContainerViewLayout, CGFloat)?
     
     var inputText: [String] {
         return self.inputNodes.map { $0.text }
     }
     
+    var isLoading: Bool = false {
+        didSet {
+            self.inputNodes.first?.isLoading = self.isLoading
+        }
+    }
+    
     init(presentationData: PresentationData, mode: TwoFactorDataInputMode, action: @escaping () -> Void, skipAction: @escaping () -> Void, changeEmailAction: @escaping () -> Void, resendCodeAction: @escaping () -> Void) {
         self.presentationData = presentationData
         self.mode = mode
@@ -686,7 +1256,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         self.resendCodeAction = resendCodeAction
         
         self.navigationBackgroundNode = ASDisplayNode()
-        self.navigationBackgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+        self.navigationBackgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         self.navigationBackgroundNode.alpha = 0.0
         self.navigationSeparatorNode = ASDisplayNode()
         self.navigationSeparatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
@@ -695,9 +1265,9 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         self.scrollNode.canCancelAllTouchesInViews = true
         
         switch mode {
-        case .password, .emailAddress, .updateEmailAddress:
+        case .password, .passwordRecovery, .emailAddress, .updateEmailAddress:
             self.monkeyNode = ManagedMonkeyAnimationNode()
-        case .emailConfirmation:
+        case .emailConfirmation, .passwordRecoveryEmail:
             if let path = getAppBundle().path(forResource: "TwoFactorSetupMail", ofType: "tgs") {
                 let animatedStickerNode = AnimatedStickerNode()
                 animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 272, height: 272, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
@@ -711,6 +1281,13 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 animatedStickerNode.visibility = true
                 self.animatedStickerNode = animatedStickerNode
             }
+        case .rememberPassword:
+            if let path = getAppBundle().path(forResource: "TwoFactorSetupRemember", ofType: "tgs") {
+                let animatedStickerNode = AnimatedStickerNode()
+                animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 272, height: 272, playbackMode: .count(3), mode: .direct(cachePathPrefix: nil))
+                animatedStickerNode.visibility = true
+                self.animatedStickerNode = animatedStickerNode
+            }
         }
         
         let title: String
@@ -754,6 +1331,33 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                     toggleTextHidden?(node)
                 })
             ]
+        case .passwordRecovery:
+            title = presentationData.strings.TwoFactorSetup_PasswordRecovery_Title
+            text = NSAttributedString(string: presentationData.strings.TwoFactorSetup_PasswordRecovery_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+            buttonText = presentationData.strings.TwoFactorSetup_PasswordRecovery_Action
+            skipActionText = presentationData.strings.TwoFactorSetup_PasswordRecovery_Skip
+            changeEmailActionText = ""
+            resendCodeActionText = ""
+            inputNodes = [
+                TwoFactorDataInputTextNode(theme: presentationData.theme, mode: .password(confirmation: false), placeholder: presentationData.strings.TwoFactorSetup_PasswordRecovery_PlaceholderPassword, focusUpdated: { node, focused in
+                    focusUpdated?(node, focused)
+                }, next: { node in
+                    next?(node)
+                }, updated: { node in
+                    updated?(node)
+                }, toggleTextHidden: { node in
+                    toggleTextHidden?(node)
+                }),
+                TwoFactorDataInputTextNode(theme: presentationData.theme, mode: .password(confirmation: true), placeholder: presentationData.strings.TwoFactorSetup_PasswordRecovery_PlaceholderConfirmPassword, focusUpdated: { node, focused in
+                    focusUpdated?(node, focused)
+                }, next: { node in
+                    next?(node)
+                }, updated: { node in
+                    updated?(node)
+                }, toggleTextHidden: { node in
+                    toggleTextHidden?(node)
+                })
+            ]
         case .emailAddress, .updateEmailAddress:
             title = presentationData.strings.TwoFactorSetup_Email_Title
             text = NSAttributedString(string: presentationData.strings.TwoFactorSetup_Email_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
@@ -772,6 +1376,33 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                     toggleTextHidden?(node)
                 }),
             ]
+        case let .passwordRecoveryEmail(emailPattern, _):
+            title = presentationData.strings.TwoFactorSetup_EmailVerification_Title
+            let (rawText, ranges) = presentationData.strings.TwoFactorSetup_EmailVerification_Text(emailPattern)
+
+            let string = NSMutableAttributedString()
+            string.append(NSAttributedString(string: rawText, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor))
+            for (_, range) in ranges {
+                string.addAttribute(.font, value: Font.semibold(16.0), range: range)
+            }
+
+            text = string
+
+            buttonText = presentationData.strings.TwoFactorSetup_EmailVerification_Action
+            skipActionText = ""
+            changeEmailActionText = presentationData.strings.TwoStepAuth_RecoveryEmailResetNoAccess
+            resendCodeActionText = presentationData.strings.TwoFactorSetup_EmailVerification_ResendAction
+            inputNodes = [
+                TwoFactorDataInputTextNode(theme: presentationData.theme, mode: .code, placeholder: presentationData.strings.TwoFactorSetup_EmailVerification_Placeholder, focusUpdated: { node, focused in
+                    focusUpdated?(node, focused)
+                }, next: { node in
+                    next?(node)
+                }, updated: { node in
+                    updated?(node)
+                }, toggleTextHidden: { node in
+                    toggleTextHidden?(node)
+                }),
+            ]
         case let .emailConfirmation(_, emailPattern, _):
             title = presentationData.strings.TwoFactorSetup_EmailVerification_Title
             let (rawText, ranges) = presentationData.strings.TwoFactorSetup_EmailVerification_Text(emailPattern)
@@ -819,6 +1450,24 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                     toggleTextHidden?(node)
                 }),
             ]
+        case .rememberPassword:
+            title = presentationData.strings.TwoFactorRemember_Title
+            text = NSAttributedString(string: presentationData.strings.TwoFactorRemember_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+            buttonText = presentationData.strings.TwoFactorRemember_CheckPassword
+            skipActionText = presentationData.strings.TwoFactorRemember_Forgot
+            changeEmailActionText = ""
+            resendCodeActionText = ""
+            inputNodes = [
+                TwoFactorDataInputTextNode(theme: presentationData.theme, mode: .password(confirmation: false), placeholder: presentationData.strings.TwoFactorRemember_Placeholder, focusUpdated: { node, focused in
+                    focusUpdated?(node, focused)
+                }, next: { node in
+                    next?(node)
+                }, updated: { node in
+                    updated?(node)
+                }, toggleTextHidden: { node in
+                    toggleTextHidden?(node)
+                })
+            ]
         }
         
         self.titleNode = ImmediateTextNode()
@@ -848,7 +1497,6 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         self.changeEmailActionTitleNode.attributedText = NSAttributedString(string: changeEmailActionText, font: Font.regular(16.0), textColor: self.presentationData.theme.list.itemAccentColor)
         self.changeEmailActionButtonNode = HighlightTrackingButtonNode()
         self.changeEmailActionButtonNode.isHidden = changeEmailActionText.isEmpty
-        self.changeEmailActionButtonNode.isHidden = changeEmailActionText.isEmpty
         
         self.resendCodeActionTitleNode = ImmediateTextNode()
         self.resendCodeActionTitleNode.isUserInteractionEnabled = false
@@ -864,6 +1512,10 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         
         super.init()
         
+        if case .rememberPassword = mode {
+            self.buttonNode.alpha = 0.0
+        }
+        
         self.backgroundColor = self.presentationData.theme.list.plainBackgroundColor
         
         self.addSubnode(self.scrollNode)
@@ -937,7 +1589,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
             guard let strongSelf = self else {
                 return
             }
-            if let index = strongSelf.inputNodes.index(where: { $0 === node }) {
+            if let index = strongSelf.inputNodes.firstIndex(where: { $0 === node }) {
                 if index == strongSelf.inputNodes.count - 1 {
                     strongSelf.action()
                 } else if strongSelf.buttonNode.isUserInteractionEnabled {
@@ -951,16 +1603,14 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 return
             }
             switch strongSelf.mode {
-            case .password:
+            case .password, .passwordRecovery:
                 if strongSelf.inputNodes[1].isFocused {
-                    let textLength = strongSelf.inputNodes[1].text.count
                     let maxWidth = strongSelf.inputNodes[1].bounds.width
                     
                     let textNode = ImmediateTextNode()
                     textNode.attributedText = NSAttributedString(string: strongSelf.inputNodes[1].text, font: Font.regular(17.0), textColor: .black)
                     let textSize = textNode.updateLayout(CGSize(width: 1000.0, height: 100.0))
-                    
-                    let maxTextLength = 20
+
                     var trackingOffset = textSize.width / maxWidth
                     trackingOffset = max(0.0, min(1.0, trackingOffset))
                     strongSelf.monkeyNode?.setState(.tracking(trackingOffset))
@@ -978,14 +1628,12 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 }
             case .emailAddress:
                 if strongSelf.inputNodes[0].isFocused {
-                    let textLength = strongSelf.inputNodes[0].text.count
                     let maxWidth = strongSelf.inputNodes[0].bounds.width
                     
                     let textNode = ImmediateTextNode()
                     textNode.attributedText = NSAttributedString(string: strongSelf.inputNodes[0].text, font: Font.regular(17.0), textColor: .black)
                     let textSize = textNode.updateLayout(CGSize(width: 1000.0, height: 100.0))
-                    
-                    let maxTextLength = 20
+
                     var trackingOffset = textSize.width / maxWidth
                     trackingOffset = max(0.0, min(1.0, trackingOffset))
                     strongSelf.monkeyNode?.setState(.tracking(trackingOffset))
@@ -996,11 +1644,8 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 break
             }
         }
-        focusUpdated = { [weak self] node, _ in
+        focusUpdated = { node, _ in
             DispatchQueue.main.async {
-                guard let strongSelf = self else {
-                    return
-                }
                 updateAnimations()
             }
         }
@@ -1009,7 +1654,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 return
             }
             switch strongSelf.mode {
-            case .emailAddress, .updateEmailAddress:
+            case .emailAddress, .updateEmailAddress, .passwordRecovery:
                 let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
                 strongSelf.buttonNode.isHidden = !hasText
                 strongSelf.skipActionTitleNode.isHidden = hasText
@@ -1026,6 +1671,18 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 if let codeLength = codeLength, text.count == codeLength {
                     action()
                 }
+            case .passwordRecoveryEmail:
+                let text = strongSelf.inputNodes[0].text
+                let hasText = !text.isEmpty
+                strongSelf.buttonNode.isHidden = !hasText
+                strongSelf.changeEmailActionTitleNode.isHidden = hasText
+                strongSelf.changeEmailActionButtonNode.isHidden = hasText
+                strongSelf.resendCodeActionTitleNode.isHidden = hasText
+                strongSelf.resendCodeActionButtonNode.isHidden = hasText
+
+                if text.count == 6 {
+                    action()
+                }
             case .passwordHint:
                 let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
                 strongSelf.buttonNode.isHidden = !hasText
@@ -1033,6 +1690,30 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 strongSelf.skipActionButtonNode.isHidden = hasText
             case .password:
                 break
+            case .rememberPassword:
+                let hasText = strongSelf.inputNodes.contains(where: { !$0.text.isEmpty })
+                let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
+                transition.updateAlpha(node: strongSelf.buttonNode, alpha: hasText ? 1.0 : 0.0)
+                transition.updateAlpha(node: strongSelf.skipActionTitleNode, alpha: hasText ? 0.0 : 1.0)
+                strongSelf.skipActionButtonNode.isHidden = hasText
+                
+                if strongSelf.textNode.attributedText?.string != strongSelf.presentationData.strings.TwoFactorRemember_Text {
+                    if let snapshotView = strongSelf.textNode.view.snapshotContentTree() {
+                        snapshotView.frame = strongSelf.textNode.view.frame
+                        strongSelf.textNode.view.superview?.addSubview(snapshotView)
+                        
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion:  { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                        
+                        strongSelf.textNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    }
+                    
+                    strongSelf.textNode.attributedText = NSAttributedString(string: strongSelf.presentationData.strings.TwoFactorRemember_Text, font: Font.regular(16.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+                    if let (layout, navigationHeight) = strongSelf.validLayout {
+                        strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate)
+                    }
+                }
             }
             updateAnimations()
         }
@@ -1041,7 +1722,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
                 return
             }
             switch strongSelf.mode {
-            case .password:
+                case .password, .passwordRecovery, .rememberPassword:
                 textHidden = !textHidden
                 for node in strongSelf.inputNodes {
                     node.updateTextHidden(textHidden)
@@ -1054,6 +1735,10 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         self.inputNodes.first.flatMap { updated?($0) }
     }
     
+    func focus() {
+        self.inputNodes.first?.isFocused = true
+    }
+    
     @objc private func skipActionPressed() {
         self.skipAction()
     }
@@ -1085,8 +1770,42 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
     }
     
+    func onAction(success: Bool) {
+        switch self.mode {
+            case .rememberPassword:
+                if !success {
+                    self.skipActionTitleNode.isHidden = false
+                    self.skipActionButtonNode.isHidden = false
+                    
+                    let transition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
+                    transition.updateAlpha(node: self.buttonNode, alpha: 0.0)
+                    transition.updateAlpha(node: self.skipActionTitleNode, alpha: 1.0)
+                    
+                    if let snapshotView = self.textNode.view.snapshotContentTree() {
+                        snapshotView.frame = self.textNode.view.frame
+                        self.textNode.view.superview?.addSubview(snapshotView)
+                        
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion:  { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                        
+                        self.textNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    }
+                    
+                    self.textNode.attributedText = NSAttributedString(string: self.presentationData.strings.TwoFactorRemember_WrongPassword, font: Font.regular(16.0), textColor: self.presentationData.theme.list.itemDestructiveColor)
+                    self.inputNodes.first?.isFailed = true
+                    
+                    if let (layout, navigationHeight) = self.validLayout {
+                        self.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate)
+                    }
+                }
+            default:
+                break
+        }
+    }
+    
     func containerLayoutUpdated(layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition) {
-        self.navigationHeight = navigationHeight
+        self.validLayout = (layout, navigationHeight)
         
         let contentAreaSize = layout.size
         let availableAreaSize = CGSize(width: layout.size.width, height: layout.size.height - layout.insets(options: [.input]).bottom)
@@ -1113,7 +1832,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: contentAreaSize))
         
         let iconSize: CGSize
-        if let animatedStickerNode = self.animatedStickerNode {
+        if let _ = self.animatedStickerNode {
             iconSize = CGSize(width: 136.0, height: 136.0)
         } else if let monkeyNode = self.monkeyNode {
             iconSize = monkeyNode.intrinsicSize
@@ -1190,19 +1909,26 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         
         let buttonWidth = contentAreaSize.width - buttonSideInset * 2.0
         
-        let maxButtonY = min(areaHeight - buttonSpacing, layout.size.height - buttonBottomInset) - buttonHeight
+        let maxButtonY = min(areaHeight - buttonSpacing, layout.size.height - buttonBottomInset) - buttonHeight * 2.0
         
         let buttonFrame = CGRect(origin: CGPoint(x: floor((contentAreaSize.width - buttonWidth) / 2.0), y: max(contentHeight + buttonSpacing, maxButtonY)), size: CGSize(width: buttonWidth, height: buttonHeight))
         transition.updateFrame(node: self.buttonNode, frame: buttonFrame)
-        self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
-        transition.updateFrame(node: self.skipActionButtonNode, frame: buttonFrame)
-        transition.updateFrame(node: self.skipActionTitleNode, frame: CGRect(origin: CGPoint(x: buttonFrame.minX + floor((buttonFrame.width - skipActionSize.width) / 2.0), y: buttonFrame.minY + floor((buttonFrame.height - skipActionSize.height) / 2.0)), size: skipActionSize))
+        let _ = self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
+
+        var skipButtonFrame = buttonFrame
+        if case .rememberPassword = self.mode {
+        } else if !self.buttonNode.isHidden {
+            skipButtonFrame.origin.y += skipButtonFrame.height
+        }
+
+        transition.updateFrame(node: self.skipActionButtonNode, frame: skipButtonFrame)
+        transition.updateFrame(node: self.skipActionTitleNode, frame: CGRect(origin: CGPoint(x: skipButtonFrame.minX + floor((skipButtonFrame.width - skipActionSize.width) / 2.0), y: skipButtonFrame.minY + floor((skipButtonFrame.height - skipActionSize.height) / 2.0)), size: skipActionSize))
         
         let changeEmailActionFrame: CGRect
         let changeEmailActionButtonFrame: CGRect
         let resendCodeActionFrame: CGRect
         let resendCodeActionButtonFrame: CGRect
-        if changeEmailActionSize.width + resendCodeActionSize.width > layout.size.width - 24.0 {
+        if changeEmailActionSize.width + resendCodeActionSize.width > layout.size.width - buttonFrame.minX * 2.0 {
             changeEmailActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.minY), size: CGSize(width: buttonFrame.width, height: buttonFrame.height))
             changeEmailActionFrame = CGRect(origin: CGPoint(x: changeEmailActionButtonFrame.minX + floor((changeEmailActionButtonFrame.width - changeEmailActionSize.width) / 2.0), y: changeEmailActionButtonFrame.minY + floor((changeEmailActionButtonFrame.height - changeEmailActionSize.height) / 2.0)), size: changeEmailActionSize)
             resendCodeActionButtonFrame = CGRect(origin: CGPoint(x: buttonFrame.minX, y: buttonFrame.maxY), size: CGSize(width: buttonFrame.width, height: buttonFrame.height))
@@ -1222,7 +1948,7 @@ private final class TwoFactorDataInputScreenNode: ViewControllerTracingNode, UIS
         
         transition.animateView {
             self.scrollNode.view.contentInset = UIEdgeInsets(top: 0.0, left: 0.0, bottom: layout.insets(options: [.input]).bottom, right: 0.0)
-            self.scrollNode.view.contentSize = CGSize(width: contentAreaSize.width, height: max(availableAreaSize.height, buttonFrame.maxY + bottomInset))
+            self.scrollNode.view.contentSize = CGSize(width: contentAreaSize.width, height: max(availableAreaSize.height, skipButtonFrame.maxY + bottomInset))
         }
     }
 }
diff --git a/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift b/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
index af6154e147..64074345a2 100644
--- a/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
+++ b/submodules/PasswordSetupUI/Sources/TwoFactorAuthSplashScreen.swift
@@ -10,34 +10,51 @@ import AnimatedStickerNode
 import AccountContext
 import TelegramPresentationData
 import PresentationDataUtils
+import TelegramCore
 
 public enum TwoFactorAuthSplashMode {
     case intro
     case done
+    case recoveryDone(recoveredAccountData: RecoveredAccountData?, syncContacts: Bool, isPasswordSet: Bool)
+    case remember
 }
 
 public final class TwoFactorAuthSplashScreen: ViewController {
-    private let context: AccountContext
+    private let sharedContext: SharedAccountContext
+    private let engine: SomeTelegramEngine
     private var presentationData: PresentationData
     private var mode: TwoFactorAuthSplashMode
     
-    public init(context: AccountContext, mode: TwoFactorAuthSplashMode) {
-        self.context = context
+    public init(sharedContext: SharedAccountContext, engine: SomeTelegramEngine, mode: TwoFactorAuthSplashMode, presentation: ViewControllerNavigationPresentation = .modalInLargeLayout) {
+        self.sharedContext = sharedContext
+        self.engine = engine
         self.mode = mode
         
-        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        self.presentationData = self.sharedContext.currentPresentationData.with { $0 }
         
         let defaultTheme = NavigationBarTheme(rootControllerTheme: self.presentationData.theme)
-        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
+        let navigationBarTheme = NavigationBarTheme(buttonColor: defaultTheme.buttonColor, disabledButtonColor: defaultTheme.disabledButtonColor, primaryTextColor: defaultTheme.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: defaultTheme.badgeBackgroundColor, badgeStrokeColor: defaultTheme.badgeStrokeColor, badgeTextColor: defaultTheme.badgeTextColor)
         
         super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: navigationBarTheme, strings: NavigationBarStrings(back: self.presentationData.strings.Common_Back, close: self.presentationData.strings.Common_Close)))
+
+        self.navigationPresentation = presentation
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
-        self.navigationPresentation = .modalInLargeLayout
         self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
         self.navigationBar?.intrinsicCanTransitionInline = false
         
-        self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
+        let hasBackButton: Bool
+        switch mode {
+            case .done, .remember:
+                hasBackButton = false
+            default:
+                hasBackButton = true
+        }
+        if hasBackButton {
+            self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
+        } else {
+            self.navigationItem.leftBarButtonItem = UIBarButtonItem(customDisplayNode: ASDisplayNode())
+        }
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -48,19 +65,31 @@ public final class TwoFactorAuthSplashScreen: ViewController {
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = TwoFactorAuthSplashScreenNode(context: self.context, presentationData: self.presentationData, mode: self.mode, action: { [weak self] in
+        self.displayNode = TwoFactorAuthSplashScreenNode(sharedContext: self.sharedContext, presentationData: self.presentationData, mode: self.mode, action: { [weak self] in
             guard let strongSelf = self else {
                 return
             }
             switch strongSelf.mode {
             case .intro:
-                strongSelf.push(TwoFactorDataInputScreen(context: strongSelf.context, mode: .password, stateUpdated: { _ in
-                }))
-            case .done:
+                strongSelf.push(TwoFactorDataInputScreen(sharedContext: strongSelf.sharedContext, engine: strongSelf.engine, mode: .password, stateUpdated: { _ in
+                }, presentation: strongSelf.navigationPresentation))
+            case .done, .remember:
                 guard let navigationController = strongSelf.navigationController as? NavigationController else {
                     return
                 }
                 navigationController.filterController(strongSelf, animated: true)
+            case let .recoveryDone(recoveredAccountData, syncContacts, _):
+                guard let navigationController = strongSelf.navigationController as? NavigationController else {
+                    return
+                }
+                switch strongSelf.engine {
+                case let .unauthorized(engine):
+                    if let recoveredAccountData = recoveredAccountData {
+                        let _ = loginWithRecoveredAccountData(accountManager: strongSelf.sharedContext.accountManager, account: engine.account, recoveredAccountData: recoveredAccountData, syncContacts: syncContacts).start()
+                    }
+                case .authorized:
+                    navigationController.filterController(strongSelf, animated: true)
+                }
             }
         })
         
@@ -70,7 +99,7 @@ public final class TwoFactorAuthSplashScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        (self.displayNode as! TwoFactorAuthSplashScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationHeight, transition: transition)
+        (self.displayNode as! TwoFactorAuthSplashScreenNode).containerLayoutUpdated(layout: layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
@@ -82,7 +111,8 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
     private var animationOffset: CGPoint = CGPoint()
     private let animationNode: AnimatedStickerNode
     private let titleNode: ImmediateTextNode
-    private let textNode: ImmediateTextNode
+    private let textNodes: [ImmediateTextNode]
+    private let textArrowNodes: [ASImageNode]
     let buttonNode: SolidRoundedButtonNode
     
     var inProgress: Bool = false {
@@ -92,14 +122,14 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         }
     }
     
-    init(context: AccountContext, presentationData: PresentationData, mode: TwoFactorAuthSplashMode, action: @escaping () -> Void) {
+    init(sharedContext: SharedAccountContext, presentationData: PresentationData, mode: TwoFactorAuthSplashMode, action: @escaping () -> Void) {
         self.presentationData = presentationData
         self.mode = mode
         
         self.animationNode = AnimatedStickerNode()
         
         let title: String
-        let text: NSAttributedString
+        let texts: [NSAttributedString]
         let buttonText: String
         
         let textFont = Font.regular(16.0)
@@ -108,7 +138,7 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         switch mode {
         case .intro:
             title = self.presentationData.strings.TwoFactorSetup_Intro_Title
-            text = NSAttributedString(string: self.presentationData.strings.TwoFactorSetup_Intro_Text, font: textFont, textColor: textColor)
+            texts = [NSAttributedString(string: self.presentationData.strings.TwoFactorSetup_Intro_Text, font: textFont, textColor: textColor)]
             buttonText = self.presentationData.strings.TwoFactorSetup_Intro_Action
             
             if let path = getAppBundle().path(forResource: "TwoFactorSetupIntro", ofType: "tgs") {
@@ -118,7 +148,7 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
             }
         case .done:
             title = self.presentationData.strings.TwoFactorSetup_Done_Title
-            text = NSAttributedString(string: self.presentationData.strings.TwoFactorSetup_Done_Text, font: textFont, textColor: textColor)
+            texts = [NSAttributedString(string: self.presentationData.strings.TwoFactorSetup_Done_Text, font: textFont, textColor: textColor)]
             buttonText = self.presentationData.strings.TwoFactorSetup_Done_Action
             
             if let path = getAppBundle().path(forResource: "TwoFactorSetupDone", ofType: "tgs") {
@@ -126,6 +156,41 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
                 self.animationSize = CGSize(width: 124.0, height: 124.0)
                 self.animationNode.visibility = true
             }
+        case let .recoveryDone(_, _, isPasswordSet):
+            title = isPasswordSet ? self.presentationData.strings.TwoFactorSetup_ResetDone_Title : self.presentationData.strings.TwoFactorSetup_ResetDone_TitleNoPassword
+
+            let rawText = isPasswordSet ? self.presentationData.strings.TwoFactorSetup_ResetDone_Text : self.presentationData.strings.TwoFactorSetup_ResetDone_TextNoPassword
+
+            var splitTexts: [String] = [""]
+            var index = rawText.startIndex
+            while index != rawText.endIndex {
+                let c = rawText[index]
+                if c == ">" {
+                    splitTexts.append("")
+                } else {
+                    splitTexts[splitTexts.count - 1].append(c)
+                }
+                index = rawText.index(after: index)
+            }
+            
+            texts = splitTexts.map { NSAttributedString(string: $0, font: textFont, textColor: textColor) }
+            buttonText = self.presentationData.strings.TwoFactorSetup_ResetDone_Action
+
+            if let path = getAppBundle().path(forResource: isPasswordSet ? "TwoFactorSetupDone" : "TwoFactorRemovePasswordDone", ofType: "tgs") {
+                self.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 248, height: 248, playbackMode: isPasswordSet ? .loop : .once, mode: .direct(cachePathPrefix: nil))
+                self.animationSize = CGSize(width: 124.0, height: 124.0)
+                self.animationNode.visibility = true
+            }
+        case .remember:
+            title = self.presentationData.strings.TwoFactorRemember_Done_Title
+            texts = [NSAttributedString(string: self.presentationData.strings.TwoFactorRemember_Done_Text, font: textFont, textColor: textColor)]
+            buttonText = self.presentationData.strings.TwoFactorRemember_Done_Action
+            
+            if let path = getAppBundle().path(forResource: "TwoFactorSetupRememberSuccess", ofType: "tgs") {
+                self.animationNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 248, height: 248, mode: .direct(cachePathPrefix: nil))
+                self.animationSize = CGSize(width: 124.0, height: 124.0)
+                self.animationNode.visibility = true
+            }
         }
         
         self.titleNode = ImmediateTextNode()
@@ -134,12 +199,27 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         self.titleNode.maximumNumberOfLines = 0
         self.titleNode.textAlignment = .center
         
-        self.textNode = ImmediateTextNode()
-        self.textNode.displaysAsynchronously = false
-        self.textNode.attributedText = text
-        self.textNode.maximumNumberOfLines = 0
-        self.textNode.lineSpacing = 0.1
-        self.textNode.textAlignment = .center
+        self.textNodes = texts.map { text in
+            let textNode = ImmediateTextNode()
+
+            textNode.displaysAsynchronously = false
+            textNode.attributedText = text
+            textNode.maximumNumberOfLines = 0
+            textNode.lineSpacing = 0.1
+            textNode.textAlignment = .center
+
+            return textNode
+        }
+
+        let arrowImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Search/DownButton"), color: presentationData.theme.list.itemPrimaryTextColor)
+        self.textArrowNodes = (0 ..< self.textNodes.count - 1).map { _ in
+            let iconNode = ASImageNode()
+
+            iconNode.image = arrowImage
+            iconNode.alpha = 0.34
+
+            return iconNode
+        }
         
         self.buttonNode = SolidRoundedButtonNode(title: buttonText, theme: SolidRoundedButtonTheme(backgroundColor: self.presentationData.theme.list.itemCheckColors.fillColor, foregroundColor: self.presentationData.theme.list.itemCheckColors.foregroundColor), height: 50.0, cornerRadius: 10.0, gloss: false)
         self.buttonNode.isHidden = buttonText.isEmpty
@@ -150,7 +230,8 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         
         self.addSubnode(self.animationNode)
         self.addSubnode(self.titleNode)
-        self.addSubnode(self.textNode)
+        self.textNodes.forEach(self.addSubnode)
+        self.textArrowNodes.forEach(self.addSubnode)
         self.addSubnode(self.buttonNode)
         
         self.buttonNode.pressed = {
@@ -179,9 +260,17 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         }
         
         let titleSize = self.titleNode.updateLayout(CGSize(width: layout.size.width - sideInset * 2.0, height: layout.size.height))
-        let textSize = self.textNode.updateLayout(CGSize(width: layout.size.width - sideInset * 2.0, height: layout.size.height))
+        let textSizes = self.textNodes.map {
+            $0.updateLayout(CGSize(width: layout.size.width - sideInset * 2.0, height: layout.size.height))
+        }
+        var combinedTextHeight: CGFloat = 0.0
+        let textSpacing: CGFloat = 32.0
+        for textSize in textSizes {
+            combinedTextHeight += textSize.height
+        }
+        combinedTextHeight += CGFloat(max(0, textSizes.count - 1)) * textSpacing
         
-        let contentHeight = iconSize.height + iconSpacing + titleSize.height + titleSpacing + textSize.height
+        let contentHeight = iconSize.height + iconSpacing + titleSize.height + titleSpacing + combinedTextHeight
         var contentVerticalOrigin = floor((layout.size.height - contentHeight - iconSize.height / 2.0) / 2.0)
         
         let minimalBottomInset: CGFloat = 60.0
@@ -191,9 +280,9 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         
         let buttonFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - buttonWidth) / 2.0), y: layout.size.height - bottomInset - buttonHeight), size: CGSize(width: buttonWidth, height: buttonHeight))
         transition.updateFrame(node: self.buttonNode, frame: buttonFrame)
-        self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
+        let _ = self.buttonNode.updateLayout(width: buttonFrame.width, transition: transition)
         
-        var maxContentVerticalOrigin = buttonFrame.minY - 12.0 - contentHeight
+        let maxContentVerticalOrigin = buttonFrame.minY - 12.0 - contentHeight
         
         contentVerticalOrigin = min(contentVerticalOrigin, maxContentVerticalOrigin)
         
@@ -202,7 +291,20 @@ private final class TwoFactorAuthSplashScreenNode: ViewControllerTracingNode {
         transition.updateFrameAdditive(node: self.animationNode, frame: iconFrame)
         let titleFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - titleSize.width) / 2.0), y: iconFrame.maxY + iconSpacing), size: titleSize)
         transition.updateFrameAdditive(node: self.titleNode, frame: titleFrame)
-        let textFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - textSize.width) / 2.0), y: titleFrame.maxY + titleSpacing), size: textSize)
-        transition.updateFrameAdditive(node: self.textNode, frame: textFrame)
+
+        var nextTextOrigin: CGFloat = titleFrame.maxY + titleSpacing
+        for i in 0 ..< self.textNodes.count {
+            let textFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - textSizes[i].width) / 2.0), y: nextTextOrigin), size: textSizes[i])
+            transition.updateFrameAdditive(node: self.textNodes[i], frame: textFrame)
+
+            if i != 0 {
+                if let image = self.textArrowNodes[i - 1].image {
+                    let scaledImageSize = CGSize(width: floor(image.size.width * 0.7), height: floor(image.size.height * 0.7))
+                    self.textArrowNodes[i - 1].frame = CGRect(origin: CGPoint(x: floor((layout.size.width - scaledImageSize.width) / 2.0), y: nextTextOrigin - textSpacing + floor((textSpacing - scaledImageSize.height) / 2.0)), size: scaledImageSize)
+                }
+            }
+
+            nextTextOrigin = textFrame.maxY + textSpacing
+        }
     }
 }
diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
index 0a278cd06e..89171cffca 100644
--- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
+++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryController.swift
@@ -22,10 +22,57 @@ public enum AvatarGalleryEntryId: Hashable {
     case resource(String)
 }
 
+public func peerInfoProfilePhotos(context: AccountContext, peerId: PeerId) -> Signal<Any, NoError> {
+    return context.account.postbox.combinedView(keys: [.basicPeer(peerId)])
+    |> mapToSignal { view -> Signal<[AvatarGalleryEntry]?, NoError> in
+        guard let peer = (view.views[.basicPeer(peerId)] as? BasicPeerView)?.peer else {
+            return .single(nil)
+        }
+        return initialAvatarGalleryEntries(account: context.account, peer: peer)
+    }
+    |> distinctUntilChanged
+    |> mapToSignal { entries -> Signal<(Bool, [AvatarGalleryEntry])?, NoError> in
+        if let entries = entries {
+            if let firstEntry = entries.first {
+                return context.account.postbox.loadedPeerWithId(peerId)
+                |> mapToSignal { peer -> Signal<(Bool, [AvatarGalleryEntry])?, NoError>in
+                    return fetchedAvatarGalleryEntries(engine: context.engine, account: context.account, peer: peer, firstEntry: firstEntry)
+                    |> map(Optional.init)
+                }
+            } else {
+                return .single((true, []))
+            }
+        } else {
+            return context.engine.peers.fetchAndUpdateCachedPeerData(peerId: peerId)
+            |> map { _ -> (Bool, [AvatarGalleryEntry])? in
+                return nil
+            }
+        }
+    }
+    |> map { items -> Any in
+        if let items = items {
+            return items
+        } else {
+            return peerInfoProfilePhotos(context: context, peerId: peerId)
+        }
+    }
+}
+
+public func peerInfoProfilePhotosWithCache(context: AccountContext, peerId: PeerId) -> Signal<(Bool, [AvatarGalleryEntry]), NoError> {
+    return context.peerChannelMemberCategoriesContextsManager.profilePhotos(postbox: context.account.postbox, network: context.account.network, peerId: peerId, fetch: peerInfoProfilePhotos(context: context, peerId: peerId))
+    |> map { items -> (Bool, [AvatarGalleryEntry]) in
+        return items as? (Bool, [AvatarGalleryEntry]) ?? (true, [])
+    }
+}
+
 public enum AvatarGalleryEntry: Equatable {
     case topImage([ImageRepresentationWithReference], [VideoRepresentationWithReference], Peer?, GalleryItemIndexData?, Data?, String?)
     case image(MediaId, TelegramMediaImageReference?, [ImageRepresentationWithReference], [VideoRepresentationWithReference], Peer?, Int32?, GalleryItemIndexData?, MessageId?, Data?, String?)
     
+    public init(representation: TelegramMediaImageRepresentation, peer: Peer) {
+        self = .topImage([ImageRepresentationWithReference(representation: representation, reference: MediaResourceReference.standalone(resource: representation.resource))], [], peer, nil, nil, nil)
+    }
+    
     public var id: AvatarGalleryEntryId {
         switch self {
         case let .topImage(representations, _, _, _, _, _):
@@ -115,22 +162,22 @@ public final class AvatarGalleryControllerPresentationArguments {
 }
 
 public func normalizeEntries(_ entries: [AvatarGalleryEntry]) -> [AvatarGalleryEntry] {
-       var updatedEntries: [AvatarGalleryEntry] = []
-       let count: Int32 = Int32(entries.count)
-       var index: Int32 = 0
-       for entry in entries {
-           let indexData = GalleryItemIndexData(position: index, totalCount: count)
-           if case let .topImage(representations, videoRepresentations, peer, _, immediateThumbnailData, category) = entry {
-               updatedEntries.append(.topImage(representations, videoRepresentations, peer, indexData, immediateThumbnailData, category))
-           } else if case let .image(id, reference, representations, videoRepresentations, peer, date, _, messageId, immediateThumbnailData, category) = entry {
-               updatedEntries.append(.image(id, reference, representations, videoRepresentations, peer, date, indexData, messageId, immediateThumbnailData, category))
-           }
-           index += 1
+   var updatedEntries: [AvatarGalleryEntry] = []
+   let count: Int32 = Int32(entries.count)
+   var index: Int32 = 0
+   for entry in entries {
+       let indexData = GalleryItemIndexData(position: index, totalCount: count)
+       if case let .topImage(representations, videoRepresentations, peer, _, immediateThumbnailData, category) = entry {
+           updatedEntries.append(.topImage(representations, videoRepresentations, peer, indexData, immediateThumbnailData, category))
+       } else if case let .image(id, reference, representations, videoRepresentations, peer, date, _, messageId, immediateThumbnailData, category) = entry {
+           updatedEntries.append(.image(id, reference, representations, videoRepresentations, peer, date, indexData, messageId, immediateThumbnailData, category))
        }
-       return updatedEntries
+       index += 1
    }
+   return updatedEntries
+}
 
-public func initialAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry], NoError> {
+public func initialAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry]?, NoError> {
     var initialEntries: [AvatarGalleryEntry] = []
     if !peer.profileImageRepresentations.isEmpty, let peerReference = PeerReference(peer) {
         initialEntries.append(.topImage(peer.profileImageRepresentations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.avatar(peer: peerReference, resource: $0.resource)) }), [], peer, nil, nil, nil))
@@ -155,7 +202,7 @@ public func initialAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<
                 }
                 return [.image(photo.imageId, photo.reference, representations, photo.videoRepresentations.map({ VideoRepresentationWithReference(representation: $0, reference: MediaResourceReference.avatarList(peer: peerReference, resource: $0.resource)) }), peer, nil, nil, nil, photo.immediateThumbnailData, nil)]
             } else {
-                return []
+                return cachedData != nil ? [] : nil
             }
         }
     } else {
@@ -163,12 +210,15 @@ public func initialAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<
     }
 }
 
-public func fetchedAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry], NoError> {
+public func fetchedAvatarGalleryEntries(engine: TelegramEngine, account: Account, peer: Peer) -> Signal<[AvatarGalleryEntry], NoError> {
     return initialAvatarGalleryEntries(account: account, peer: peer)
+    |> map { entries -> [AvatarGalleryEntry] in
+        return entries ?? []
+    }
     |> mapToSignal { initialEntries in
         return .single(initialEntries)
         |> then(
-            requestPeerPhotos(postbox: account.postbox, network: account.network, peerId: peer.id)
+            engine.peers.requestPeerPhotos(peerId: peer.id)
             |> map { photos -> [AvatarGalleryEntry] in
                 var result: [AvatarGalleryEntry] = []
                 if photos.isEmpty {
@@ -219,11 +269,11 @@ public func fetchedAvatarGalleryEntries(account: Account, peer: Peer) -> Signal<
     }
 }
 
-public func fetchedAvatarGalleryEntries(account: Account, peer: Peer, firstEntry: AvatarGalleryEntry) -> Signal<(Bool, [AvatarGalleryEntry]), NoError> {
+public func fetchedAvatarGalleryEntries(engine: TelegramEngine, account: Account, peer: Peer, firstEntry: AvatarGalleryEntry) -> Signal<(Bool, [AvatarGalleryEntry]), NoError> {
     let initialEntries = [firstEntry]
     return Signal<(Bool, [AvatarGalleryEntry]), NoError>.single((false, initialEntries))
     |> then(
-        requestPeerPhotos(postbox: account.postbox, network: account.network, peerId: peer.id)
+        engine.peers.requestPeerPhotos(peerId: peer.id)
         |> map { photos -> (Bool, [AvatarGalleryEntry]) in
             var result: [AvatarGalleryEntry] = []
             let initialEntries = [firstEntry]
@@ -353,10 +403,15 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
         if let remoteEntries = remoteEntries {
             remoteEntriesSignal = remoteEntries.get()
         } else {
-            remoteEntriesSignal = fetchedAvatarGalleryEntries(account: context.account, peer: peer)
+            remoteEntriesSignal = fetchedAvatarGalleryEntries(engine: context.engine, account: context.account, peer: peer)
         }
         
-        let entriesSignal: Signal<[AvatarGalleryEntry], NoError> = skipInitial ? remoteEntriesSignal : (initialAvatarGalleryEntries(account: context.account, peer: peer) |> then(remoteEntriesSignal))
+        let initialSignal = initialAvatarGalleryEntries(account: context.account, peer: peer)
+        |> map { entries -> [AvatarGalleryEntry] in
+            return entries ?? []
+        }
+        
+        let entriesSignal: Signal<[AvatarGalleryEntry], NoError> = skipInitial ? remoteEntriesSignal : (initialSignal |> then(remoteEntriesSignal))
         
         let presentationData = self.presentationData
         
@@ -634,7 +689,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
         
         if !self.adjustedForInitialPreviewingLayout && self.isPresentedInPreviewingContext() {
             self.adjustedForInitialPreviewingLayout = true
@@ -693,7 +748,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
             case let .image(_, reference, _, _, _, _, _, _, _, _):
                 if self.peer.id == self.context.account.peerId, let peerReference = PeerReference(self.peer) {
                     if let reference = reference {
-                        let _ = (updatePeerPhotoExisting(network: self.context.account.network, reference: reference)
+                        let _ = (self.context.engine.accountData.updatePeerPhotoExisting(reference: reference)
                         |> deliverOnMainQueue).start(next: { [weak self] photo in
                             if let strongSelf = self, let photo = photo, let firstEntry = strongSelf.entries.first, case let .image(image) = firstEntry {
                                 let updatedEntry = AvatarGalleryEntry.image(photo.imageId, photo.reference, photo.representations.map({ ImageRepresentationWithReference(representation: $0, reference: MediaResourceReference.avatar(peer: peerReference, resource: $0.resource)) }), photo.videoRepresentations.map({ VideoRepresentationWithReference(representation: $0, reference: MediaResourceReference.avatarList(peer: peerReference, resource: $0.resource)) }), strongSelf.peer, image.5, image.6, image.7, photo.immediateThumbnailData, image.9)
@@ -805,7 +860,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
                     if self.peer.id == self.context.account.peerId {
                     } else {
                         if entry == self.entries.first {
-                            let _ = updatePeerPhoto(postbox: self.context.account.postbox, network: self.context.account.network, stateManager: self.context.account.stateManager, accountPeerId: self.context.account.peerId, peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start()
+                            let _ = self.context.engine.peers.updatePeerPhoto(peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start()
                             dismiss = true
                         } else {
                             if let index = self.entries.firstIndex(of: entry) {
@@ -817,7 +872,7 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
                 case let .image(_, reference, _, _, _, _, _, messageId, _, _):
                     if self.peer.id == self.context.account.peerId {
                         if let reference = reference {
-                            let _ = removeAccountPhoto(network: self.context.account.network, reference: reference).start()
+                            let _ = self.context.engine.accountData.removeAccountPhoto(reference: reference).start()
                         }
                         if entry == self.entries.first {
                             dismiss = true
@@ -830,11 +885,11 @@ public class AvatarGalleryController: ViewController, StandalonePresentableContr
                         }
                     } else {
                         if let messageId = messageId {
-                            let _ = deleteMessagesInteractively(account: self.context.account, messageIds: [messageId], type: .forEveryone).start()
+                            let _ = self.context.engine.messages.deleteMessagesInteractively(messageIds: [messageId], type: .forEveryone).start()
                         }
                         
                         if entry == self.entries.first {
-                            let _ = updatePeerPhoto(postbox: self.context.account.postbox, network: self.context.account.network, stateManager: self.context.account.stateManager, accountPeerId: self.context.account.peerId, peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start()
+                            let _ = self.context.engine.peers.updatePeerPhoto(peerId: self.peer.id, photo: nil, mapResourceToAvatarSizes: { _, _ in .single([:]) }).start()
                             dismiss = true
                         } else {
                             if let index = self.entries.firstIndex(of: entry) {
diff --git a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift
index 0b63aef373..55dec58bb0 100644
--- a/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift
+++ b/submodules/PeerAvatarGalleryUI/Sources/AvatarGalleryItemFooterContentNode.swift
@@ -110,7 +110,7 @@ final class AvatarGalleryItemFooterContentNode: GalleryFooterContentNode {
             case let .image(_, _, _, videoRepresentations, peer, date, _, _, _, _):
                 nameText = peer?.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) ?? ""
                 if let date = date {
-                    dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: date)
+                    dateText = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: date).0
                 }
                 
                 if (!videoRepresentations.isEmpty) {
diff --git a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift
index 2345f79d4d..7a9a47e931 100644
--- a/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift
+++ b/submodules/PeerAvatarGalleryUI/Sources/PeerAvatarImageGalleryItem.swift
@@ -257,7 +257,7 @@ final class PeerAvatarImageGalleryItemNode: ZoomableContentGalleryItemNode {
                     id = image.0.id
                     category = image.9
                 } else {
-                    id = Int64(entry.peer?.id.id ?? 0)
+                    id = Int64(entry.peer?.id.id._internalGetInt32Value() ?? 0)
                     if let resource = entry.videoRepresentations.first?.representation.resource as? CloudPhotoSizeMediaResource {
                         id = id &+ resource.photoId
                     }
diff --git a/submodules/PeerInfoAvatarListNode/BUILD b/submodules/PeerInfoAvatarListNode/BUILD
new file mode 100644
index 0000000000..0eaab52961
--- /dev/null
+++ b/submodules/PeerInfoAvatarListNode/BUILD
@@ -0,0 +1,30 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PeerInfoAvatarListNode",
+    module_name = "PeerInfoAvatarListNode",
+    srcs = glob([
+		"Sources/**/*.swift",
+    ]),
+    deps = [
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/AvatarNode:AvatarNode",
+        "//submodules/PhotoResources:PhotoResources",
+        "//submodules/RadialStatusNode:RadialStatusNode",
+        "//submodules/PeerAvatarGalleryUI:PeerAvatarGalleryUI",
+        "//submodules/TelegramStringFormatting:TelegramStringFormatting",
+        "//submodules/TelegramUniversalVideoContent:TelegramUniversalVideoContent",
+        "//submodules/GalleryUI:GalleryUI",
+        "//submodules/MediaPlayer:UniversalMediaPlayer",
+        "//submodules/AccountContext:AccountContext",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/PeerInfoAvatarListNode/Sources/PeerInfoAvatarListNode.swift b/submodules/PeerInfoAvatarListNode/Sources/PeerInfoAvatarListNode.swift
new file mode 100644
index 0000000000..7677c2afd9
--- /dev/null
+++ b/submodules/PeerInfoAvatarListNode/Sources/PeerInfoAvatarListNode.swift
@@ -0,0 +1,1211 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import SyncCore
+import Postbox
+import TelegramCore
+import AccountContext
+import TelegramPresentationData
+import PhotoResources
+import PeerAvatarGalleryUI
+import TelegramStringFormatting
+import TelegramUniversalVideoContent
+import GalleryUI
+import UniversalMediaPlayer
+import RadialStatusNode
+import TelegramUIPreferences
+
+private class PeerInfoAvatarListLoadingStripNode: ASImageNode {
+    private var currentInHierarchy = false
+    
+    let imageNode = ASImageNode()
+    
+    override init() {
+        super.init()
+        
+        self.addSubnode(self.imageNode)
+    }
+    
+    override public var isHidden: Bool {
+        didSet {
+            self.updateAnimation()
+        }
+    }
+    private var isAnimating = false {
+        didSet {
+            if self.isAnimating != oldValue {
+                if self.isAnimating {
+                    let basicAnimation = CABasicAnimation(keyPath: "opacity")
+                    basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
+                    basicAnimation.duration = 0.45
+                    basicAnimation.fromValue = 0.1
+                    basicAnimation.toValue = 0.75
+                    basicAnimation.repeatCount = Float.infinity
+                    basicAnimation.autoreverses = true
+                    
+                    self.imageNode.layer.add(basicAnimation, forKey: "loading")
+                } else {
+                    self.imageNode.layer.removeAnimation(forKey: "loading")
+                }
+            }
+        }
+    }
+    
+    private func updateAnimation() {
+        self.isAnimating = !self.isHidden && self.currentInHierarchy
+    }
+    
+    override public func willEnterHierarchy() {
+        super.willEnterHierarchy()
+        
+        self.currentInHierarchy = true
+        self.updateAnimation()
+    }
+    
+    override public func didExitHierarchy() {
+        super.didExitHierarchy()
+        
+        self.currentInHierarchy = false
+        self.updateAnimation()
+    }
+    
+    override func layout() {
+        super.layout()
+        
+        self.imageNode.frame = self.bounds
+    }
+}
+
+private struct CustomListItemResourceId: MediaResourceId {
+    public var uniqueId: String {
+        return "customNode"
+    }
+    
+    public var hashValue: Int {
+        return 0
+    }
+    
+    public func isEqual(to: MediaResourceId) -> Bool {
+        if to is CustomListItemResourceId {
+            return true
+        } else {
+            return false
+        }
+    }
+}
+
+public enum PeerInfoAvatarListItem: Equatable {
+    case custom(ASDisplayNode)
+    case topImage([ImageRepresentationWithReference], [VideoRepresentationWithReference], Data?)
+    case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], [VideoRepresentationWithReference], Data?)
+    
+    var id: WrappedMediaResourceId {
+        switch self {
+        case .custom:
+            return WrappedMediaResourceId(CustomListItemResourceId())
+        case let .topImage(representations, _, _):
+            let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation
+            return WrappedMediaResourceId(representation.resource.id)
+        case let .image(_, representations, _, _):
+            let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation
+            return WrappedMediaResourceId(representation.resource.id)
+        }
+    }
+    
+    var representations: [ImageRepresentationWithReference] {
+        switch self {
+            case .custom:
+                return []
+            case let .topImage(representations, _, _):
+                return representations
+            case let .image(_, representations, _, _):
+                return representations
+        }
+    }
+    
+    
+    var videoRepresentations: [VideoRepresentationWithReference] {
+        switch self {
+            case .custom:
+                return []
+            case let .topImage(_, videoRepresentations, _):
+                return videoRepresentations
+            case let .image(_, _, videoRepresentations, _):
+                return videoRepresentations
+        }
+    }
+    
+    public init?(entry: AvatarGalleryEntry) {
+        switch entry {
+            case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
+                self = .topImage(representations, videoRepresentations, immediateThumbnailData)
+            case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
+                if representations.isEmpty {
+                    return nil
+                }
+                self = .image(reference, representations, videoRepresentations, immediateThumbnailData)
+        }
+    }
+}
+
+public final class PeerInfoAvatarListItemNode: ASDisplayNode {
+    private let context: AccountContext
+    private let peer: Peer
+    public let imageNode: TransformImageNode
+    private var videoNode: UniversalVideoNode?
+    private var videoContent: NativeVideoContent?
+    private var videoStartTimestamp: Double?
+    private let playbackStartDisposable = MetaDisposable()
+    private let statusDisposable = MetaDisposable()
+    private let preloadDisposable = MetaDisposable()
+    private let statusNode: RadialStatusNode
+    
+    private var playerStatus: MediaPlayerStatus?
+    private var isLoading = Promise<Bool>(false)
+    private var loadingProgress = Promise<Float?>(nil)
+    private var progress: Signal<Float?, NoError>?
+    private var loadingProgressDisposable = MetaDisposable()
+    private var hasProgress = false
+    
+    public let isReady = Promise<Bool>()
+    private var didSetReady: Bool = false
+    
+    public var item: PeerInfoAvatarListItem?
+        
+    private var statusPromise = Promise<(MediaPlayerStatus?, Double?)?>()
+    var mediaStatus: Signal<(MediaPlayerStatus?, Double?)?, NoError> {
+        get {
+            return self.statusPromise.get()
+        }
+    }
+    
+    var delayCentralityLose = false
+    var isCentral: Bool? = nil {
+        didSet {
+            guard self.isCentral != oldValue, let isCentral = self.isCentral else {
+                return
+            }
+            if isCentral {
+                self.setupVideoPlayback()
+                self.preloadDisposable.set(nil)
+            } else {
+                if let videoNode = self.videoNode {
+                    self.playbackStartDisposable.set(nil)
+                    self.statusPromise.set(.single(nil))
+                    self.videoNode = nil
+                    if self.delayCentralityLose {
+                        Queue.mainQueue().after(0.5) {
+                            videoNode.removeFromSupernode()
+                        }
+                    } else {
+                        videoNode.removeFromSupernode()
+                    }
+                }
+                if let videoContent = self.videoContent {
+                    let duration: Double = (self.videoStartTimestamp ?? 0.0) + 4.0
+                    self.preloadDisposable.set(preloadVideoResource(postbox: self.context.account.postbox, resourceReference: videoContent.fileReference.resourceReference(videoContent.fileReference.media.resource), duration: duration).start())
+                }
+            }
+        }
+    }
+    
+    init(context: AccountContext, peer: Peer) {
+        self.context = context
+        self.peer = peer
+        self.imageNode = TransformImageNode()
+        
+        self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(rgb: 0x000000, alpha: 0.3))
+        self.statusNode.isUserInteractionEnabled = false
+   
+        super.init()
+        
+        self.clipsToBounds = true
+                
+        self.imageNode.contentAnimations = [.firstUpdate, .subsequentUpdates]
+        self.addSubnode(self.imageNode)
+        self.addSubnode(self.statusNode)
+                
+        self.loadingProgressDisposable.set((combineLatest(self.isLoading.get()
+        |> mapToSignal { value -> Signal<Bool, NoError> in
+            if value {
+                return .single(value) |> delay(0.5, queue: Queue.mainQueue())
+            } else {
+                return .single(value)
+            }
+        } |> distinctUntilChanged, self.loadingProgress.get() |> distinctUntilChanged)).start(next: { [weak self] isLoading, progress in
+            guard let strongSelf = self else {
+                return
+            }
+            if isLoading, let progress = progress {
+                strongSelf.hasProgress = true
+                strongSelf.statusNode.transitionToState(.progress(color: .white, lineWidth: nil, value: CGFloat(max(0.027, progress)), cancelEnabled: false, animateRotation: true), completion: {})
+            } else if strongSelf.hasProgress {
+                strongSelf.hasProgress = false
+                strongSelf.statusNode.transitionToState(.progress(color: .white, lineWidth: nil, value: 1.0, cancelEnabled: false, animateRotation: true), completion: { [weak self] in
+                     guard let strongSelf = self else {
+                        return
+                    }
+                    if !strongSelf.hasProgress {
+                        Queue.mainQueue().after(0.3) {
+                            strongSelf.statusNode.transitionToState(.none, completion: {})
+                        }
+                    }
+                })
+            }
+        }))
+    }
+    
+    deinit {
+        self.statusDisposable.dispose()
+        self.playbackStartDisposable.dispose()
+        self.preloadDisposable.dispose()
+    }
+    
+    private func updateStatus() {
+        guard let videoContent = self.videoContent else {
+            return
+        }
+             
+        var bufferingProgress: Float?
+        if isMediaStreamable(resource: videoContent.fileReference.media.resource) {
+            if let playerStatus = self.playerStatus {
+                if case let .buffering(_, _, progress, _) = playerStatus.status {
+                    bufferingProgress = progress
+                } else if case .playing = playerStatus.status {
+                    bufferingProgress = nil
+                }
+            } else {
+                bufferingProgress = nil
+            }
+        }
+        
+        if self.progress == nil {
+            self.loadingProgress.set(.single(bufferingProgress))
+            self.isLoading.set(.single(bufferingProgress != nil))
+        }
+    }
+    
+    public func updateTransitionFraction(_ fraction: CGFloat, transition: ContainedViewLayoutTransition) {
+        if let videoNode = self.videoNode {
+            if case .immediate = transition, fraction == 1.0 {
+                return
+            }
+            transition.updateAlpha(node: videoNode, alpha: 1.0 - fraction)
+        }
+    }
+    
+    private func setupVideoPlayback() {
+        guard let videoContent = self.videoContent, let isCentral = self.isCentral, isCentral, self.videoNode == nil else {
+            return
+        }
+        
+        let mediaManager = self.context.sharedContext.mediaManager
+        let videoNode = UniversalVideoNode(postbox: self.context.account.postbox, audioSession: mediaManager.audioSession, manager: mediaManager.universalVideoManager, decoration: GalleryVideoDecoration(), content: videoContent, priority: .secondaryOverlay)
+        videoNode.isUserInteractionEnabled = false
+        videoNode.canAttachContent = true
+        videoNode.isHidden = true
+        
+        if let _ = self.videoStartTimestamp {
+            self.playbackStartDisposable.set((videoNode.status
+            |> map { status -> Bool in
+                if let status = status, case .playing = status.status {
+                    return true
+                } else {
+                    return false
+                }
+            }
+            |> filter { playing in
+                return playing
+            }
+            |> take(1)
+            |> deliverOnMainQueue).start(completed: { [weak self] in
+                if let strongSelf = self {
+                    Queue.mainQueue().after(0.1) {
+                        strongSelf.videoNode?.isHidden = false
+                    }
+                }
+            }))
+        } else {
+            self.playbackStartDisposable.set(nil)
+            videoNode.isHidden = false
+        }
+        videoNode.play()
+        
+        self.videoNode = videoNode
+        let videoStartTimestamp = self.videoStartTimestamp
+        self.statusPromise.set(videoNode.status |> map { ($0, videoStartTimestamp) })
+        
+        self.statusDisposable.set((self.mediaStatus
+        |> deliverOnMainQueue).start(next: { [weak self] mediaStatus in
+            if let strongSelf = self {
+                if let mediaStatusAndStartTimestamp = mediaStatus {
+                    strongSelf.playerStatus = mediaStatusAndStartTimestamp.0
+                }
+                strongSelf.updateStatus()
+            }
+        }))
+        
+        self.insertSubnode(videoNode, belowSubnode: self.statusNode)
+        
+        self.isReady.set(videoNode.ready |> map { return true })
+    }
+    
+    func setup(item: PeerInfoAvatarListItem, progress: Signal<Float?, NoError>? = nil, synchronous: Bool, fullSizeOnly: Bool = false) {
+        self.item = item
+        self.progress = progress
+        
+        if let progress = progress {
+            self.loadingProgress.set((progress
+            |> beforeNext { [weak self] next in
+                self?.isLoading.set(.single(next != nil))
+            }))
+        }
+        
+        let representations: [ImageRepresentationWithReference]
+        let videoRepresentations: [VideoRepresentationWithReference]
+        let immediateThumbnailData: Data?
+        var id: Int64
+        switch item {
+        case let .custom(node):
+            id = 0
+            representations = []
+            videoRepresentations = []
+            immediateThumbnailData = nil
+            if !synchronous {
+                self.addSubnode(node)
+            }
+        case let .topImage(topRepresentations, videoRepresentationsValue, immediateThumbnail):
+            representations = topRepresentations
+            videoRepresentations = videoRepresentationsValue
+            immediateThumbnailData = immediateThumbnail
+            id = Int64(self.peer.id.id._internalGetInt32Value())
+            if let resource = videoRepresentations.first?.representation.resource as? CloudPhotoSizeMediaResource {
+                id = id &+ resource.photoId
+            }
+        case let .image(reference, imageRepresentations, videoRepresentationsValue, immediateThumbnail):
+            representations = imageRepresentations
+            videoRepresentations = videoRepresentationsValue
+            immediateThumbnailData = immediateThumbnail
+            if case let .cloud(imageId, _, _) = reference {
+                id = imageId
+            } else {
+                id = Int64(self.peer.id.id._internalGetInt32Value())
+            }
+        }
+        self.imageNode.setSignal(chatAvatarGalleryPhoto(account: self.context.account, representations: representations, immediateThumbnailData: immediateThumbnailData, autoFetchFullSize: true, attemptSynchronously: synchronous, skipThumbnail: fullSizeOnly), attemptSynchronously: synchronous, dispatchOnDisplayLink: false)
+        
+        if let video = videoRepresentations.last, let peerReference = PeerReference(self.peer) {
+            let videoFileReference = FileMediaReference.avatarList(peer: peerReference, media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: video.representation.resource, previewRepresentations: representations.map { $0.representation }, videoThumbnails: [], immediateThumbnailData: immediateThumbnailData, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: video.representation.dimensions, flags: [])]))
+            let videoContent = NativeVideoContent(id: .profileVideo(id, nil), fileReference: videoFileReference, streamVideo: isMediaStreamable(resource: video.representation.resource) ? .conservative : .none, loopVideo: true, enableSound: false, fetchAutomatically: true, onlyFullSizeThumbnail: fullSizeOnly, useLargeThumbnail: true, autoFetchFullSizeThumbnail: true, startTimestamp: video.representation.startTimestamp, continuePlayingWithoutSoundOnLostAudioSession: false, placeholderColor: .clear)
+            
+            if videoContent.id != self.videoContent?.id {
+                self.videoContent = videoContent
+                self.videoStartTimestamp = video.representation.startTimestamp
+                self.setupVideoPlayback()
+            }
+        } else {
+            if let videoNode = self.videoNode {
+                self.videoContent = nil
+                self.videoStartTimestamp = nil
+                self.videoNode = nil
+                          
+                videoNode.removeFromSupernode()
+            }
+            
+            self.statusPromise.set(.single(nil))
+            
+            self.statusDisposable.set(nil)
+            
+            self.imageNode.imageUpdated = { [weak self] _ in
+                guard let strongSelf = self else {
+                    return
+                }
+                if !strongSelf.didSetReady {
+                    strongSelf.didSetReady = true
+                    strongSelf.isReady.set(.single(true))
+                }
+            }
+        }
+    }
+    
+    func update(size: CGSize, transition: ContainedViewLayoutTransition) {
+        let imageSize = CGSize(width: min(size.width, size.height), height: min(size.width, size.height))
+        let makeLayout = self.imageNode.asyncLayout()
+        let applyLayout = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))
+        let _ = applyLayout()
+        let imageFrame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floor((size.height - imageSize.height) / 2.0)), size: imageSize)
+        transition.updateFrame(node: self.imageNode, frame: imageFrame)
+        
+        transition.updateFrame(node: self.statusNode, frame: CGRect(origin: CGPoint(x: floor((size.width - 50.0) / 2.0), y: floor((size.height - 50.0) / 2.0)), size: CGSize(width: 50.0, height: 50.0)))
+        
+        if let videoNode = self.videoNode {
+            videoNode.updateLayout(size: imageSize, transition: .immediate)
+            videoNode.frame = imageFrame
+        }
+    }
+}
+
+private let fadeWidth: CGFloat = 70.0
+
+public final class PeerInfoAvatarListContainerNode: ASDisplayNode {
+    private let context: AccountContext
+    public var peer: Peer?
+    
+    public let controlsContainerNode: ASDisplayNode
+    public let controlsClippingNode: ASDisplayNode
+    public let controlsClippingOffsetNode: ASDisplayNode
+    public let shadowNode: ASImageNode
+    
+    public let contentNode: ASDisplayNode
+    let leftHighlightNode: ASDisplayNode
+    let rightHighlightNode: ASDisplayNode
+    var highlightedSide: Bool?
+    public let stripContainerNode: ASDisplayNode
+    public let highlightContainerNode: ASDisplayNode
+    public private(set) var galleryEntries: [AvatarGalleryEntry] = []
+    private var items: [PeerInfoAvatarListItem] = []
+    private var itemNodes: [WrappedMediaResourceId: PeerInfoAvatarListItemNode] = [:]
+    private var stripNodes: [ASImageNode] = []
+    private var activeStripNode: ASImageNode
+    private var loadingStripNode: PeerInfoAvatarListLoadingStripNode
+    private let activeStripImage: UIImage
+    private var appliedStripNodeCurrentIndex: Int?
+    var currentIndex: Int = 0
+    private var transitionFraction: CGFloat = 0.0
+    
+    private var validLayout: CGSize?
+    public var isCollapsing = false
+    private var isExpanded = false
+    
+    public var firstFullSizeOnly = false
+    public var customCenterTapAction: (() -> Void)?
+    
+    private let disposable = MetaDisposable()
+    private let positionDisposable = MetaDisposable()
+    private var initializedList = false
+    private var ignoreNextProfilePhotoUpdate = false
+    public var itemsUpdated: (([PeerInfoAvatarListItem]) -> Void)?
+    public var currentIndexUpdated: (() -> Void)?
+    
+    public let isReady = Promise<Bool>()
+    private var didSetReady = false
+    
+    public var currentItemNode: PeerInfoAvatarListItemNode? {
+        if self.currentIndex >= 0 && self.currentIndex < self.items.count {
+            return self.itemNodes[self.items[self.currentIndex].id]
+        } else {
+            return nil
+        }
+    }
+    
+    public var currentEntry: AvatarGalleryEntry? {
+        if self.currentIndex >= 0 && self.currentIndex < self.galleryEntries.count {
+            return self.galleryEntries[self.currentIndex]
+        } else {
+            return nil
+        }
+    }
+    
+    private var playerUpdateTimer: SwiftSignalKit.Timer?
+    private var playerStatus: (MediaPlayerStatus?, Double?)? {
+        didSet {
+            if self.playerStatus?.0 != oldValue?.0 || self.playerStatus?.1 != oldValue?.1 {
+                if let (playerStatus, _) = self.playerStatus, let status = playerStatus, case .playing = status.status {
+                    self.ensureHasTimer()
+                } else {
+                    self.stopTimer()
+                }
+                self.updateStatus()
+            }
+        }
+    }
+    
+    private func ensureHasTimer() {
+        if self.playerUpdateTimer == nil {
+            let timer = SwiftSignalKit.Timer(timeout: 0.016, repeat: true, completion: { [weak self] in
+                self?.updateStatus()
+                }, queue: Queue.mainQueue())
+            self.playerUpdateTimer = timer
+            timer.start()
+        }
+    }
+    
+    private var playbackProgress: CGFloat?
+    private var loading: Bool = false
+    private func updateStatus() {
+        var position: CGFloat = 1.0
+        var loading = false
+        if let (status, videoStartTimestamp) = self.playerStatus, let playerStatus = status {
+            var playerPosition: Double
+            if case .buffering = playerStatus.status {
+                loading = true
+            }
+            if !playerStatus.generationTimestamp.isZero, case .playing = playerStatus.status {
+                playerPosition = playerStatus.timestamp + (CACurrentMediaTime() - playerStatus.generationTimestamp)
+            } else {
+                playerPosition = playerStatus.timestamp
+            }
+            
+            if let videoStartTimestamp = videoStartTimestamp, false {
+                playerPosition -= videoStartTimestamp
+                if playerPosition < 0.0 {
+                    playerPosition = playerStatus.duration + playerPosition
+                }
+            }
+            
+            if playerStatus.duration.isZero {
+                position = 0.0
+            } else {
+                position = CGFloat(playerPosition / playerStatus.duration)
+            }
+        } else {
+            self.playbackProgress = nil
+        }
+        
+        if let size = self.validLayout {
+            self.playbackProgress = position
+            self.loading = loading
+            self.updateStrips(size: size, itemsAdded: false, stripTransition: .animated(duration: 0.3, curve: .spring))
+        }
+    }
+    
+    private func stopTimer() {
+        self.playerUpdateTimer?.invalidate()
+        self.playerUpdateTimer = nil
+    }
+    
+    public init(context: AccountContext) {
+        self.context = context
+        
+        self.contentNode = ASDisplayNode()
+        
+        self.leftHighlightNode = ASDisplayNode()
+        self.leftHighlightNode.displaysAsynchronously = false
+        self.leftHighlightNode.backgroundColor = generateImage(CGSize(width: fadeWidth, height: 24.0), contextGenerator: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            
+            let topColor = UIColor(rgb: 0x000000, alpha: 0.1)
+            let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
+            
+            var locations: [CGFloat] = [0.0, 1.0]
+            let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
+            
+            let colorSpace = CGColorSpaceCreateDeviceRGB()
+            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+            
+            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+        }).flatMap { UIColor(patternImage: $0) }
+        self.leftHighlightNode.alpha = 0.0
+        
+        self.rightHighlightNode = ASDisplayNode()
+        self.rightHighlightNode.displaysAsynchronously = false
+        self.rightHighlightNode.backgroundColor = generateImage(CGSize(width: fadeWidth, height: 24.0), contextGenerator: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            
+            let topColor = UIColor(rgb: 0x000000, alpha: 0.1)
+            let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
+            
+            var locations: [CGFloat] = [0.0, 1.0]
+            let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
+            
+            let colorSpace = CGColorSpaceCreateDeviceRGB()
+            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+            
+            context.drawLinearGradient(gradient, start: CGPoint(x: size.width, y: 0.0), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+        }).flatMap { UIColor(patternImage: $0) }
+        self.rightHighlightNode.alpha = 0.0
+        
+        self.stripContainerNode = ASDisplayNode()
+        self.contentNode.addSubnode(self.stripContainerNode)
+        self.activeStripImage = generateSmallHorizontalStretchableFilledCircleImage(diameter: 2.0, color: .white)!
+        
+        self.activeStripNode = ASImageNode()
+        self.activeStripNode.image = self.activeStripImage
+        
+        self.loadingStripNode = PeerInfoAvatarListLoadingStripNode()
+        self.loadingStripNode.imageNode.image = self.activeStripImage
+        
+        self.highlightContainerNode = ASDisplayNode()
+        self.highlightContainerNode.addSubnode(self.leftHighlightNode)
+        self.highlightContainerNode.addSubnode(self.rightHighlightNode)
+        
+        self.controlsContainerNode = ASDisplayNode()
+        self.controlsContainerNode.isUserInteractionEnabled = false
+        
+        self.controlsClippingOffsetNode = ASDisplayNode()
+        
+        self.controlsClippingNode = ASDisplayNode()
+        self.controlsClippingNode.isUserInteractionEnabled = false
+        self.controlsClippingNode.clipsToBounds = true
+        
+        self.shadowNode = ASImageNode()
+        self.shadowNode.displaysAsynchronously = false
+        self.shadowNode.displayWithoutProcessing = true
+        self.shadowNode.contentMode = .scaleToFill
+        
+        do {
+            let size = CGSize(width: 88.0, height: 88.0)
+            UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
+            if let context = UIGraphicsGetCurrentContext() {
+                context.clip(to: CGRect(origin: CGPoint(), size: size))
+                
+                let topColor = UIColor(rgb: 0x000000, alpha: 0.4)
+                let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
+                
+                var locations: [CGFloat] = [0.0, 1.0]
+                let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
+                
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+                
+                context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+                
+                let image = UIGraphicsGetImageFromCurrentImageContext()
+                UIGraphicsEndImageContext()
+                if let image = image {
+                    self.shadowNode.image = generateImage(image.size, contextGenerator: { size, context in
+                        context.clear(CGRect(origin: CGPoint(), size: size))
+                        context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                        context.rotate(by: -CGFloat.pi / 2.0)
+                        context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+                        context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: size))
+                    })
+                }
+            }
+        }
+        
+        super.init()
+        
+        self.backgroundColor = .black
+        
+        self.addSubnode(self.contentNode)
+        
+        self.controlsContainerNode.addSubnode(self.highlightContainerNode)
+        self.controlsContainerNode.addSubnode(self.shadowNode)
+        self.controlsContainerNode.addSubnode(self.stripContainerNode)
+        self.controlsClippingNode.addSubnode(self.controlsContainerNode)
+        self.controlsClippingOffsetNode.addSubnode(self.controlsClippingNode)
+        
+        self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in
+            guard let strongSelf = self else {
+                return false
+            }
+            return strongSelf.currentIndex != 0
+        }
+        self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))))
+        
+        let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:)))
+        recognizer.tapActionAtPoint = { _ in
+            return .keepWithSingleTap
+        }
+        recognizer.highlight = { [weak self] point in
+            guard let strongSelf = self, let size = strongSelf.validLayout else {
+                return
+            }
+            var highlightedSide: Bool?
+            if let point = point {
+                if point.x < size.width * 1.0 / 5.0 {
+                    if strongSelf.items.count > 1 {
+                        highlightedSide = false
+                    }
+                } else {
+                    if strongSelf.items.count > 1 {
+                        highlightedSide = true
+                    }
+                }
+            }
+            if strongSelf.highlightedSide != highlightedSide {
+                strongSelf.highlightedSide = highlightedSide
+                let leftAlpha: CGFloat
+                let rightAlpha: CGFloat
+                if let highlightedSide = highlightedSide {
+                    leftAlpha = highlightedSide ? 0.0 : 1.0
+                    rightAlpha = highlightedSide ? 1.0 : 0.0
+                } else {
+                    leftAlpha = 0.0
+                    rightAlpha = 0.0
+                }
+                if strongSelf.leftHighlightNode.alpha != leftAlpha {
+                    strongSelf.leftHighlightNode.alpha = leftAlpha
+                    if leftAlpha.isZero {
+                        strongSelf.leftHighlightNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.16, timingFunction: kCAMediaTimingFunctionSpring)
+                    } else {
+                        strongSelf.leftHighlightNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08)
+                    }
+                }
+                if strongSelf.rightHighlightNode.alpha != rightAlpha {
+                    strongSelf.rightHighlightNode.alpha = rightAlpha
+                    if rightAlpha.isZero {
+                        strongSelf.rightHighlightNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.16, timingFunction: kCAMediaTimingFunctionSpring)
+                    } else {
+                        strongSelf.rightHighlightNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08)
+                    }
+                }
+            }
+        }
+        self.view.addGestureRecognizer(recognizer)
+    }
+    
+    deinit {
+        self.disposable.dispose()
+        self.positionDisposable.dispose()
+    }
+    
+    public override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return super.hitTest(point, with: event)
+    }
+    
+    public func selectFirstItem() {
+        let previousIndex = self.currentIndex
+        self.currentIndex = 0
+        if self.currentIndex != previousIndex {
+            self.currentIndexUpdated?()
+        }
+        if let size = self.validLayout {
+            self.updateItems(size: size, transition: .immediate, stripTransition: .immediate)
+        }
+    }
+    
+    public func updateEntryIsHidden(entry: AvatarGalleryEntry?) {
+        if let entry = entry, let index = self.galleryEntries.firstIndex(of: entry) {
+            self.currentItemNode?.isHidden = index == self.currentIndex
+        } else {
+            self.currentItemNode?.isHidden = false
+        }
+    }
+    
+    public var offsetLocation = false
+    @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) {
+        switch recognizer.state {
+        case .ended:
+            if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation {
+                if let size = self.validLayout, case .tap = gesture {
+                    var location = location
+                    if self.offsetLocation {
+                        location.x += size.width / 2.0
+                    }
+                    if location.x < size.width * 1.0 / 5.0 {
+                        if self.currentIndex != 0 {
+                            let previousIndex = self.currentIndex
+                            self.currentIndex -= 1
+                            if self.currentIndex != previousIndex {
+                                self.currentIndexUpdated?()
+                            }
+                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
+                        } else if self.items.count > 1 {
+                            let previousIndex = self.currentIndex
+                            self.currentIndex = self.items.count - 1
+                            if self.currentIndex != previousIndex {
+                                self.currentIndexUpdated?()
+                            }
+                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
+                        }
+                    } else {
+                        if let customAction = self.customCenterTapAction, location.x < size.width - size.width * 1.0 / 5.0 {
+                            customAction()
+                            return
+                        }
+                        if self.currentIndex < self.items.count - 1 {
+                            let previousIndex = self.currentIndex
+                            self.currentIndex += 1
+                            if self.currentIndex != previousIndex {
+                                self.currentIndexUpdated?()
+                            }
+                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
+                        } else if self.items.count > 1 {
+                            let previousIndex = self.currentIndex
+                            self.currentIndex = 0
+                            if self.currentIndex != previousIndex {
+                                self.currentIndexUpdated?()
+                            }
+                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
+                        }
+                    }
+                }
+            }
+        default:
+            break
+        }
+    }
+    
+    private var pageChangedByPan = false
+    @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) {
+        switch recognizer.state {
+        case .changed:
+            let translation = recognizer.translation(in: self.view)
+            var transitionFraction = translation.x / self.bounds.width
+            if self.currentIndex <= 0 {
+                transitionFraction = min(0.0, transitionFraction)
+            }
+            if self.currentIndex >= self.items.count - 1 {
+                transitionFraction = max(0.0, transitionFraction)
+            }
+            self.transitionFraction = transitionFraction
+            if let size = self.validLayout {
+                self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring), stripTransition: .animated(duration: 0.3, curve: .spring))
+            }
+        case .cancelled, .ended:
+            let translation = recognizer.translation(in: self.view)
+            let velocity = recognizer.velocity(in: self.view)
+            var directionIsToRight: Bool?
+            if abs(velocity.x) > 10.0 {
+                directionIsToRight = velocity.x < 0.0
+            } else if abs(self.transitionFraction) > 0.5 {
+                directionIsToRight = self.transitionFraction < 0.0
+            }
+            var updatedIndex = self.currentIndex
+            if let directionIsToRight = directionIsToRight {
+                if directionIsToRight {
+                    updatedIndex = min(updatedIndex + 1, self.items.count - 1)
+                } else {
+                    updatedIndex = max(updatedIndex - 1, 0)
+                }
+            }
+            let previousIndex = self.currentIndex
+            self.currentIndex = updatedIndex
+            if self.currentIndex != previousIndex {
+                self.pageChangedByPan = true
+                self.currentIndexUpdated?()
+            }
+            self.transitionFraction = 0.0
+            if let size = self.validLayout {
+                self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring), stripTransition: .animated(duration: 0.3, curve: .spring))
+                self.pageChangedByPan = false
+            }
+        default:
+            break
+        }
+    }
+    
+    func setMainItem(_ item: PeerInfoAvatarListItem) {
+        guard case let .image(image) = item else {
+            return
+        }
+        var items: [PeerInfoAvatarListItem] = []
+        var entries: [AvatarGalleryEntry] = []
+        for entry in self.galleryEntries {
+            switch entry {
+                case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
+                    entries.append(entry)
+                    items.append(.topImage(representations, videoRepresentations, immediateThumbnailData))
+                case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
+                    if representations.isEmpty {
+                        continue
+                    }
+                    if image.0 == reference {
+                        entries.insert(entry, at: 0)
+                        items.insert(.image(reference, representations, videoRepresentations, immediateThumbnailData), at: 0)
+                    } else {
+                        entries.append(entry)
+                        items.append(.image(reference, representations, videoRepresentations, immediateThumbnailData))
+                    }
+            }
+        }
+        self.galleryEntries = normalizeEntries(entries)
+        self.items = items
+        self.itemsUpdated?(items)
+        let previousIndex = self.currentIndex
+        self.currentIndex = 0
+        if self.currentIndex != previousIndex {
+            self.currentIndexUpdated?()
+        }
+        self.ignoreNextProfilePhotoUpdate = true
+        if let size = self.validLayout {
+            self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
+        }
+    }
+    
+    public func deleteItem(_ item: PeerInfoAvatarListItem) -> Bool {
+        guard case let .image(image) = item else {
+            return false
+        }
+                
+        var items: [PeerInfoAvatarListItem] = []
+        var entries: [AvatarGalleryEntry] = []
+        let previousIndex = self.currentIndex
+        
+        var index = 0
+        var deletedIndex: Int?
+        for entry in self.galleryEntries {
+            switch entry {
+                case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
+                    entries.append(entry)
+                    items.append(.topImage(representations, videoRepresentations, immediateThumbnailData))
+                case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
+                    if representations.isEmpty {
+                        continue
+                    }
+                    if image.0 != reference {
+                        entries.append(entry)
+                        items.append(.image(reference, representations, videoRepresentations, immediateThumbnailData))
+                    } else {
+                        deletedIndex = index
+                    }
+            }
+            index += 1
+        }
+        
+        
+        if let peer = self.peer, peer is TelegramGroup || peer is TelegramChannel, deletedIndex == 0 {
+            self.galleryEntries = []
+            self.items = []
+            self.itemsUpdated?([])
+            self.currentIndex = 0
+            if let size = self.validLayout {
+                self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
+            }
+            return true
+        }
+        
+        self.galleryEntries = normalizeEntries(entries)
+        self.items = items
+        self.itemsUpdated?(items)
+        self.currentIndex = max(0, previousIndex - 1)
+        if self.currentIndex != previousIndex {
+            self.currentIndexUpdated?()
+        }
+        self.ignoreNextProfilePhotoUpdate = true
+        if let size = self.validLayout {
+            self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
+        }
+        
+        return items.count == 0
+    }
+    
+    private var additionalEntryProgress: Signal<Float?, NoError>? = nil
+    public func update(size: CGSize, peer: Peer?, customNode: ASDisplayNode? = nil, additionalEntry: Signal<(TelegramMediaImageRepresentation, Float)?, NoError> = .single(nil), isExpanded: Bool, transition: ContainedViewLayoutTransition) {
+        self.validLayout = size
+        let previousExpanded = self.isExpanded
+        self.isExpanded = isExpanded
+        if !isExpanded && previousExpanded {
+            self.isCollapsing = true
+        }
+        self.leftHighlightNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: fadeWidth, height: size.height))
+        self.rightHighlightNode.frame = CGRect(origin: CGPoint(x: size.width - fadeWidth, y: 0.0), size: CGSize(width: fadeWidth, height: size.height))
+        
+        if let peer = peer, !self.initializedList {
+            self.initializedList = true
+                    
+            let entry = additionalEntry
+            |> map { representation -> AvatarGalleryEntry? in
+                return representation.flatMap { AvatarGalleryEntry(representation: $0.0, peer: peer) }
+            }
+            
+            self.disposable.set(combineLatest(queue: Queue.mainQueue(), peerInfoProfilePhotosWithCache(context: self.context, peerId: peer.id), entry).start(next: { [weak self] completeAndEntries, entry in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                var (complete, entries) = completeAndEntries
+                
+                if strongSelf.galleryEntries.count > 1, entries.count == 1 && !complete {
+                    return
+                }
+                
+                var synchronous = false
+                if !strongSelf.galleryEntries.isEmpty, let updated = entries.first, case let .image(image) = updated, !image.3.isEmpty, let previous = strongSelf.galleryEntries.first, case let .topImage(topImage) = previous {
+                    let firstEntry = AvatarGalleryEntry.image(image.0, image.1, topImage.0, image.3, image.4, image.5, image.6, image.7, image.8, image.9)
+                    entries.remove(at: 0)
+                    entries.insert(firstEntry, at: 0)
+                    synchronous = true
+                }
+                
+                if let entry = entry {
+                    entries.insert(entry, at: 0)
+                    
+                    strongSelf.additionalEntryProgress = additionalEntry
+                    |> map { value -> Float? in
+                        return value?.1
+                    }
+                }
+                
+                if strongSelf.ignoreNextProfilePhotoUpdate {
+                    if entries.count == 1, let first = entries.first, case .topImage = first {
+                        return
+                    } else {
+                        strongSelf.ignoreNextProfilePhotoUpdate = false
+                        synchronous = true
+                    }
+                }
+                
+                var items: [PeerInfoAvatarListItem] = []
+                if let customNode = customNode {
+                    items.append(.custom(customNode))
+                }
+                for entry in entries {
+                    if let item = PeerInfoAvatarListItem(entry: entry) {
+                        items.append(item)
+                    }
+                }
+                strongSelf.galleryEntries = entries
+                strongSelf.items = items
+                strongSelf.itemsUpdated?(items)
+                if let size = strongSelf.validLayout {
+                    strongSelf.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: synchronous)
+                }
+                if items.isEmpty {
+                    if !strongSelf.didSetReady {
+                        strongSelf.didSetReady = true
+                        strongSelf.isReady.set(.single(true))
+                    }
+                }
+            }))
+        }
+        self.updateItems(size: size, transition: transition, stripTransition: transition)
+    }
+    
+    private func updateStrips(size: CGSize, itemsAdded: Bool, stripTransition: ContainedViewLayoutTransition) {
+        let hadOneStripNode = self.stripNodes.count == 1
+        if self.stripNodes.count != self.items.count {
+            if self.stripNodes.count < self.items.count {
+                for _ in 0 ..< self.items.count - self.stripNodes.count {
+                    let stripNode = ASImageNode()
+                    stripNode.displaysAsynchronously = false
+                    stripNode.displayWithoutProcessing = true
+                    stripNode.image = self.activeStripImage
+                    stripNode.alpha = 0.2
+                    self.stripNodes.append(stripNode)
+                    self.stripContainerNode.addSubnode(stripNode)
+                }
+            } else {
+                for i in (self.items.count ..< self.stripNodes.count).reversed() {
+                    self.stripNodes[i].removeFromSupernode()
+                    self.stripNodes.remove(at: i)
+                }
+            }
+            self.stripContainerNode.addSubnode(self.activeStripNode)
+            self.stripContainerNode.addSubnode(self.loadingStripNode)
+        }
+        if self.appliedStripNodeCurrentIndex != self.currentIndex || itemsAdded {
+            if !self.itemNodes.isEmpty {
+                self.appliedStripNodeCurrentIndex = self.currentIndex
+            }
+            
+            if let currentItemNode = self.currentItemNode {
+                self.positionDisposable.set((currentItemNode.mediaStatus
+                    |> deliverOnMainQueue).start(next: { [weak self] statusAndVideoStartTimestamp in
+                        if let strongSelf = self {
+                            strongSelf.playerStatus = statusAndVideoStartTimestamp
+                        }
+                    }))
+            } else {
+                self.positionDisposable.set(nil)
+            }
+        }
+        if hadOneStripNode && self.stripNodes.count > 1 {
+            self.stripContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+        }
+        let stripInset: CGFloat = 8.0
+        let stripSpacing: CGFloat = 4.0
+        let stripWidth: CGFloat = max(5.0, floorToScreenPixels((size.width - stripInset * 2.0 - stripSpacing * CGFloat(self.stripNodes.count - 1)) / CGFloat(self.stripNodes.count)))
+        let currentStripMinX = stripInset + CGFloat(self.currentIndex) * (stripWidth + stripSpacing)
+        let currentStripMidX = floorToScreenPixels(currentStripMinX + stripWidth / 2.0)
+        let lastStripMaxX = stripInset + CGFloat(self.stripNodes.count - 1) * (stripWidth + stripSpacing) + stripWidth
+        let stripOffset: CGFloat = min(0.0, max(size.width - stripInset - lastStripMaxX, size.width / 2.0 - currentStripMidX))
+        for i in 0 ..< self.stripNodes.count {
+            let stripX: CGFloat = stripInset + CGFloat(i) * (stripWidth + stripSpacing)
+            if i == 0 && self.stripNodes.count == 1 {
+                self.stripNodes[i].isHidden = true
+            } else {
+                self.stripNodes[i].isHidden = false
+            }
+            let stripFrame = CGRect(origin: CGPoint(x: stripOffset + stripX, y: 0.0), size: CGSize(width: stripWidth + 1.0, height: 2.0))
+            stripTransition.updateFrame(node: self.stripNodes[i], frame: stripFrame)
+        }
+        
+        if self.currentIndex >= 0 && self.currentIndex < self.stripNodes.count {
+            var frame = self.stripNodes[self.currentIndex].frame
+            stripTransition.updateFrame(node: self.loadingStripNode, frame: frame)
+            if let playbackProgress = self.playbackProgress {
+                frame.size.width = max(frame.size.height, frame.size.width * playbackProgress)
+            }
+            stripTransition.updateFrameAdditive(node: self.activeStripNode, frame: frame)
+            stripTransition.updateAlpha(node: self.activeStripNode, alpha: self.loading ? 0.0 : 1.0)
+            stripTransition.updateAlpha(node: self.loadingStripNode, alpha: self.loading ? 1.0 : 0.0)
+            
+            self.activeStripNode.isHidden = self.stripNodes.count < 2
+            self.loadingStripNode.isHidden = self.stripNodes.count < 2 || !self.loading
+        }
+    }
+    
+    public var updateCustomItemsOnlySynchronously = false
+    
+    private func updateItems(size: CGSize, update: Bool = false, transition: ContainedViewLayoutTransition, stripTransition: ContainedViewLayoutTransition, synchronous: Bool = false) {
+        var validIds: [WrappedMediaResourceId] = []
+        var addedItemNodesForAdditiveTransition: [PeerInfoAvatarListItemNode] = []
+        var additiveTransitionOffset: CGFloat = 0.0
+        var itemsAdded = false
+        if self.currentIndex >= 0 && self.currentIndex < self.items.count {
+            let preloadSpan: Int = 2
+            for i in max(0, self.currentIndex - preloadSpan) ... min(self.currentIndex + preloadSpan, self.items.count - 1) {
+                if self.items[i].representations.isEmpty {
+                    continue
+                }
+                validIds.append(self.items[i].id)
+                var itemNode: PeerInfoAvatarListItemNode?
+                var wasAdded = false
+                if let current = self.itemNodes[self.items[i].id] {
+                    itemNode = current
+                    if update {
+                        var synchronous = synchronous && i == self.currentIndex
+                        if case .custom = self.items[i], self.updateCustomItemsOnlySynchronously {
+                            synchronous = true
+                        }
+                        current.setup(item: self.items[i], synchronous: synchronous && i == self.currentIndex, fullSizeOnly: self.firstFullSizeOnly && i == 0)
+                    }
+                } else if let peer = self.peer {
+                    wasAdded = true
+                    let addedItemNode = PeerInfoAvatarListItemNode(context: self.context, peer: peer)
+                    itemNode = addedItemNode
+                    addedItemNode.setup(item: self.items[i], progress: i == 0 ? self.additionalEntryProgress : nil, synchronous: (i == 0 && i == self.currentIndex) || (synchronous && i == self.currentIndex), fullSizeOnly: self.firstFullSizeOnly && i == 0)
+                    self.itemNodes[self.items[i].id] = addedItemNode
+                    self.contentNode.addSubnode(addedItemNode)
+                }
+                if let itemNode = itemNode {
+                    itemNode.delayCentralityLose = self.pageChangedByPan
+                    itemNode.isCentral = i == self.currentIndex
+                    itemNode.delayCentralityLose = false
+                    
+                    let indexOffset = CGFloat(i - self.currentIndex)
+                    let itemFrame = CGRect(origin: CGPoint(x: indexOffset * size.width + self.transitionFraction * size.width - size.width / 2.0, y: -size.height / 2.0), size: size)
+                    
+                    if wasAdded {
+                        itemsAdded = true
+                        addedItemNodesForAdditiveTransition.append(itemNode)
+                        itemNode.frame = itemFrame
+                        itemNode.update(size: size, transition: .immediate)
+                    } else {
+                        additiveTransitionOffset = itemNode.frame.minX - itemFrame.minX
+                        transition.updateFrame(node: itemNode, frame: itemFrame)
+                        itemNode.update(size: size, transition: .immediate)
+                    }
+                }
+            }
+        }
+        for itemNode in addedItemNodesForAdditiveTransition {
+            transition.animatePositionAdditive(node: itemNode, offset: CGPoint(x: additiveTransitionOffset, y: 0.0))
+        }
+        var removeIds: [WrappedMediaResourceId] = []
+        for (id, _) in self.itemNodes {
+            if !validIds.contains(id) {
+                removeIds.append(id)
+            }
+        }
+        for id in removeIds {
+            if let itemNode = self.itemNodes.removeValue(forKey: id) {
+                itemNode.removeFromSupernode()
+            }
+        }
+        
+        self.updateStrips(size: size, itemsAdded: itemsAdded, stripTransition: stripTransition)
+        
+        if let item = self.items.first, let itemNode = self.itemNodes[item.id] {
+            if !self.didSetReady {
+                self.didSetReady = true
+                self.isReady.set(itemNode.isReady.get())
+            }
+        }
+    }
+}
diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
index aa6e27d728..2c3c31104b 100644
--- a/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelAdminController.swift
@@ -889,7 +889,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                 return
             }
             
-            transferOwnershipDisposable.set((checkOwnershipTranfserAvailability(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, memberId: adminId) |> deliverOnMainQueue).start(error: { error in
+            transferOwnershipDisposable.set((context.engine.peers.checkOwnershipTranfserAvailability(memberId: adminId) |> deliverOnMainQueue).start(error: { error in
                 let controller = channelOwnershipTransferController(context: context, peer: peer, member: member, initialError: error, present: { c, a in
                     presentControllerImpl?(c, a)
                 }, completion: { upgradedPeerId in
@@ -927,14 +927,14 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                 return current.withUpdatedUpdating(true)
             }
             if peerId.namespace == Namespaces.Peer.CloudGroup {
-                updateRightsDisposable.set((removeGroupAdmin(account: context.account, peerId: peerId, adminId: adminId)
+                updateRightsDisposable.set((context.engine.peers.removeGroupAdmin(peerId: peerId, adminId: adminId)
                 |> deliverOnMainQueue).start(error: { _ in
                 }, completed: {
                     updated(nil)
                     dismissImpl?()
                 }))
             } else {
-                updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: nil, rank: nil) |> deliverOnMainQueue).start(error: { _ in
+                updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: nil, rank: nil) |> deliverOnMainQueue).start(error: { _ in
                     
                 }, completed: {
                     updated(nil)
@@ -1023,6 +1023,8 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                                         } else {
                                             updateFlags = []
                                         }
+                                    } else {
+                                        updateFlags = adminInfo?.rights.rights
                                     }
                                 }
                                 currentRank = rank
@@ -1039,7 +1041,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                             updateState { current in
                                 return current.withUpdatedUpdating(true)
                             }
-                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags ?? []), rank: effectiveRank) |> deliverOnMainQueue).start(error: { error in
+                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags ?? []), rank: effectiveRank) |> deliverOnMainQueue).start(error: { error in
                                 updateState { current in
                                     return current.withUpdatedUpdating(false)
                                 }
@@ -1087,7 +1089,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                             updateState { current in
                                 return current.withUpdatedUpdating(true)
                             }
-                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: currentFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { _ in
+                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: currentFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { _ in
                                 
                             }, completed: {
                                 updated(TelegramChatAdminRights(rights: currentFlags))
@@ -1132,7 +1134,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                             updateState { current in
                                 return current.withUpdatedUpdating(true)
                             }
-                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { error in
+                            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags), rank: updateRank) |> deliverOnMainQueue).start(error: { error in
                                 if case let .addMemberError(addMemberError) = error, let admin = adminView.peers[adminView.peerId] {
                                     var text = presentationData.strings.Login_UnknownError
                                     switch addMemberError {
@@ -1199,7 +1201,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                             updateState { current in
                                 return current.withUpdatedUpdating(true)
                             }
-                            updateRightsDisposable.set((addGroupAdmin(account: context.account, peerId: peerId, adminId: adminId)
+                            updateRightsDisposable.set((context.engine.peers.addGroupAdmin(peerId: peerId, adminId: adminId)
                             |> deliverOnMainQueue).start(error: { error in
                                 if case let .addMemberError(error) = error, case .privacy = error, let admin = adminView.peers[adminView.peerId] {
                                     presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(admin.compactDisplayTitle, admin.compactDisplayTitle).0, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
@@ -1218,7 +1220,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                                 case conversionFailed
                             }
                             
-                            let signal = convertGroupToSupergroup(account: context.account, peerId: peerId)
+                            let signal = context.engine.peers.convertGroupToSupergroup(peerId: peerId)
                             |> map(Optional.init)
                             |> `catch` { error -> Signal<PeerId?, WrappedUpdateChannelAdminRightsError> in
                                 switch error {
@@ -1232,7 +1234,7 @@ public func channelAdminController(context: AccountContext, peerId: PeerId, admi
                                 guard let upgradedPeerId = upgradedPeerId else {
                                     return .fail(.conversionFailed)
                                 }
-                                return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: upgradedPeerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags), rank: updateRank)
+                                return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: upgradedPeerId, memberId: adminId, adminRights: TelegramChatAdminRights(rights: updateFlags), rank: updateRank)
                                 |> mapError { error -> WrappedUpdateChannelAdminRightsError in
                                     return .direct(error)
                                 }
diff --git a/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift b/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift
index ae17167501..d0b16d3986 100644
--- a/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelAdminsController.swift
@@ -389,8 +389,16 @@ private func channelAdminsControllerEntries(presentationData: PresentationData,
                             if id == accountPeerId {
                                 canEdit = false
                             } else if let adminInfo = adminInfo {
-                                if peer.flags.contains(.isCreator) || adminInfo.promotedBy == accountPeerId {
+                                if peer.flags.contains(.isCreator) {
                                     canEdit = true
+                                    canOpen = true
+                                } else if adminInfo.promotedBy == accountPeerId {
+                                    canEdit = true
+                                    if let adminRights = peer.adminRights {
+                                        if adminRights.rights.isEmpty {
+                                            canOpen = false
+                                        }
+                                    }
                                 } else {
                                     canEdit = false
                                 }
@@ -575,14 +583,14 @@ public func channelAdminsController(context: AccountContext, peerId initialPeerI
                 return $0.withUpdatedRemovingPeerId(adminId)
             }
             if peerId.namespace == Namespaces.Peer.CloudGroup {
-                removeAdminDisposable.set((removeGroupAdmin(account: context.account, peerId: peerId, adminId: adminId)
+                removeAdminDisposable.set((context.engine.peers.removeGroupAdmin(peerId: peerId, adminId: adminId)
                 |> deliverOnMainQueue).start(completed: {
                     updateState {
                         return $0.withUpdatedRemovingPeerId(nil)
                     }
                 }))
             } else {
-                removeAdminDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: adminId, adminRights: nil, rank: nil)
+                removeAdminDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: adminId, adminRights: nil, rank: nil)
                 |> deliverOnMainQueue).start(completed: {
                     updateState {
                         return $0.withUpdatedRemovingPeerId(nil)
@@ -657,7 +665,7 @@ public func channelAdminsController(context: AccountContext, peerId initialPeerI
     |> deliverOnMainQueue).start(next: { peerId in
         if peerId.namespace == Namespaces.Peer.CloudChannel {
             var didReportLoadCompleted = false
-            let membersAndLoadMoreControl: (Disposable, PeerChannelMemberCategoryControl?) = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId) { membersState in
+            let membersAndLoadMoreControl: (Disposable, PeerChannelMemberCategoryControl?) = context.peerChannelMemberCategoriesContextsManager.admins(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId) { membersState in
                 if case .loading = membersState.loadingState, membersState.list.isEmpty {
                     adminsPromise.set(.single(nil))
                 } else {
diff --git a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
index 872d4bea6a..6b5a47e44b 100644
--- a/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelBannedMemberController.swift
@@ -506,7 +506,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
                 state.updating = true
                 return state
             }
-            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: nil)
+            updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: nil)
                 |> deliverOnMainQueue).start(error: { _ in
                     
                 }, completed: {
@@ -650,7 +650,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
                                 }
                                 
                                 if peerId.namespace == Namespaces.Peer.CloudGroup {
-                                    let signal = convertGroupToSupergroup(account: context.account, peerId: peerId)
+                                    let signal = context.engine.peers.convertGroupToSupergroup(peerId: peerId)
                                     |> map(Optional.init)
                                     |> `catch` { error -> Signal<PeerId?, NoError> in
                                         switch error {
@@ -667,7 +667,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
                                         guard let upgradedPeerId = upgradedPeerId else {
                                             return .single(nil)
                                         }
-                                        return context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: upgradedPeerId, memberId: memberId, bannedRights: cleanResolvedRights)
+                                        return context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: upgradedPeerId, memberId: memberId, bannedRights: cleanResolvedRights)
                                         |> mapToSignal { _ -> Signal<PeerId?, NoError> in
                                             return .complete()
                                         }
@@ -700,7 +700,7 @@ public func channelBannedMemberController(context: AccountContext, peerId: PeerI
                                         }
                                     }))
                                 } else {
-                                    updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: cleanResolvedRights)
+                                    updateRightsDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: cleanResolvedRights)
                                         |> deliverOnMainQueue).start(error: { _ in
                                             
                                         }, completed: {
diff --git a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift
index b343ba58ac..9a180f0474 100644
--- a/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelBlacklistController.swift
@@ -274,7 +274,8 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
     let updateState: ((ChannelBlacklistControllerState) -> ChannelBlacklistControllerState) -> Void = { f in
         statePromise.set(stateValue.modify { f($0) })
     }
-    
+
+    var getNavigationControllerImpl: (() -> NavigationController?)?
     var presentControllerImpl: ((ViewController, Any?) -> Void)?
     var pushControllerImpl: ((ViewController) -> Void)?
     var dismissInputImpl: (() -> Void)?
@@ -323,7 +324,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                 let progress = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
                 presentControllerImpl?(progress, nil)
-                removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: peer.id, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
+                removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: peer.id, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
                     |> deliverOnMainQueue).start(error: { [weak progress] _ in
                         progress?.dismiss()
                         dismissController?()
@@ -342,7 +343,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
             return $0.withUpdatedRemovingPeerId(memberId)
         }
         
-        removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: nil)  |> deliverOnMainQueue).start(error: { _ in
+        removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: nil)  |> deliverOnMainQueue).start(error: { _ in
             updateState {
                 return $0.withUpdatedRemovingPeerId(nil)
             }
@@ -364,9 +365,19 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
             if !participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder).isEmpty {
                 items.append(ActionSheetTextItem(title: participant.peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)))
             }
-            items.append(ActionSheetButtonItem(title: presentationData.strings.GroupRemoved_ViewUserInfo, action: { [weak actionSheet] in
+            let viewInfoTitle: String
+            if participant.peer is TelegramChannel {
+                viewInfoTitle = presentationData.strings.GroupRemoved_ViewChannelInfo
+            } else {
+                viewInfoTitle = presentationData.strings.GroupRemoved_ViewUserInfo
+            }
+            items.append(ActionSheetButtonItem(title: viewInfoTitle, action: { [weak actionSheet] in
                 actionSheet?.dismissAnimated()
-                if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: participant.peer, mode: .generic, avatarInitiallyExpanded: false, fromChat: false) {
+                if participant.peer is TelegramChannel {
+                    if let navigationController = getNavigationControllerImpl?() {
+                        context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(participant.peer.id)))
+                    }
+                } else if let infoController = context.sharedContext.makePeerInfoController(context: context, peer: participant.peer, mode: .generic, avatarInitiallyExpanded: false, fromChat: false) {
                     pushControllerImpl?(infoController)
                 }
             }))
@@ -377,10 +388,10 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
                     updateState {
                         return $0.withUpdatedRemovingPeerId(memberId)
                     }
-                    let signal = context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: nil)
+                    let signal = context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: nil)
                     |> ignoreValues
                     |> then(
-                        context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: peerId, memberId: memberId)
+                        context.peerChannelMemberCategoriesContextsManager.addMember(engine: context.engine, peerId: peerId, memberId: memberId)
                         |> map { _ -> Void in
                             return Void()
                         }
@@ -407,7 +418,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
                     return $0.withUpdatedRemovingPeerId(memberId)
                 }
                 
-                removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: nil)  |> deliverOnMainQueue).start(error: { _ in
+                removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: nil)  |> deliverOnMainQueue).start(error: { _ in
                     updateState {
                         return $0.withUpdatedRemovingPeerId(nil)
                     }
@@ -426,7 +437,7 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
         })
     })
     
-    let (listDisposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
+    let (listDisposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.banned(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { listState in
         if case .loading(true) = listState.loadingState, listState.list.isEmpty {
             blacklistPromise.set(.single(nil))
         } else {
@@ -520,6 +531,9 @@ public func channelBlacklistController(context: AccountContext, peerId: PeerId)
             (controller.navigationController as? NavigationController)?.pushViewController(c)
         }
     }
+    getNavigationControllerImpl = { [weak controller] in
+        return controller?.navigationController as? NavigationController
+    }
     dismissInputImpl = { [weak controller] in
         controller?.view.endEditing(true)
     }
diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSearchContainerNode.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSearchContainerNode.swift
index 352be4ea7c..37ce4689be 100644
--- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSearchContainerNode.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSearchContainerNode.swift
@@ -219,7 +219,7 @@ final class ChannelDiscussionGroupSearchContainerNode: SearchDisplayControllerCo
             }
         })
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift
index 7c16bdf96b..dc2e738bf6 100644
--- a/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelDiscussionGroupSetupController.swift
@@ -230,7 +230,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
     let groupPeers = Promise<[Peer]?>()
     groupPeers.set(.single(nil)
     |> then(
-        availableGroupsForChannelDiscussion(postbox: context.account.postbox, network: context.account.network)
+        context.engine.peers.availableGroupsForChannelDiscussion()
         |> map(Optional.init)
         |> `catch` { _ -> Signal<[Peer]?, NoError> in
             return .single(nil)
@@ -260,7 +260,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
             }
             let presentationData = context.sharedContext.currentPresentationData.with { $0 }
             pushControllerImpl?(context.sharedContext.makeCreateGroupController(context: context, peerIds: [], initialTitle: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) + " Chat", mode: .supergroup, completion: { groupId, dismiss in
-                var applySignal = updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: peerId, groupId: groupId)
+                var applySignal = context.engine.peers.updateGroupDiscussionForChannel(channelId: peerId, groupId: groupId)
                 var cancelImpl: (() -> Void)?
                 let progressSignal = Signal<Never, NoError> { subscriber in
                     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -327,7 +327,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
                     var applySignal: Signal<Bool, ChannelDiscussionGroupError>
                     var updatedPeerId: PeerId? = nil
                     if let legacyGroup = groupPeer as? TelegramGroup {
-                        applySignal = convertGroupToSupergroup(account: context.account, peerId: legacyGroup.id)
+                        applySignal = context.engine.peers.convertGroupToSupergroup(peerId: legacyGroup.id)
                         |> mapError { error -> ChannelDiscussionGroupError in
                             switch error {
                             case .tooManyChannels:
@@ -358,13 +358,13 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
                                     })
                                 }
                                 
-                                return updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: peerId, groupId: resultPeerId)
+                                return context.engine.peers.updateGroupDiscussionForChannel(channelId: peerId, groupId: resultPeerId)
                             }
                             |> castError(ChannelDiscussionGroupError.self)
                             |> switchToLatest
                         }
                     } else {
-                        applySignal = updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: peerId, groupId: groupId)
+                        applySignal = context.engine.peers.updateGroupDiscussionForChannel(channelId: peerId, groupId: groupId)
                     }
                     var cancelImpl: (() -> Void)?
                     let progressSignal = Signal<Never, NoError> { subscriber in
@@ -413,7 +413,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
                             case .groupHistoryIsCurrentlyPrivate:
                                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                                 presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Channel_DiscussionGroup_MakeHistoryPublic, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.Channel_DiscussionGroup_MakeHistoryPublicProceed, action: {
-                                    var applySignal: Signal<Bool, ChannelDiscussionGroupError> = updateChannelHistoryAvailabilitySettingsInteractively(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, peerId: updatedPeerId ?? groupId, historyAvailableForNewMembers: true)
+                                    var applySignal: Signal<Bool, ChannelDiscussionGroupError> = context.engine.peers.updateChannelHistoryAvailabilitySettingsInteractively(peerId: updatedPeerId ?? groupId, historyAvailableForNewMembers: true)
                                     |> mapError { _ -> ChannelDiscussionGroupError in
                                         return .generic
                                     }
@@ -421,7 +421,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
                                         return .complete()
                                     }
                                     |> then(
-                                        updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: peerId, groupId: updatedPeerId ?? groupId)
+                                        context.engine.peers.updateGroupDiscussionForChannel(channelId: peerId, groupId: updatedPeerId ?? groupId)
                                     )
                                     var cancelImpl: (() -> Void)?
                                     let progressSignal = Signal<Never, NoError> { subscriber in
@@ -502,7 +502,7 @@ public func channelDiscussionGroupSetupController(context: AccountContext, peerI
                 return
             }
             
-            var applySignal = updateGroupDiscussionForChannel(network: context.account.network, postbox: context.account.postbox, channelId: applyPeerId, groupId: nil)
+            var applySignal = context.engine.peers.updateGroupDiscussionForChannel(channelId: applyPeerId, groupId: nil)
             var cancelImpl: (() -> Void)?
             let progressSignal = Signal<Never, NoError> { subscriber in
                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
diff --git a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift
index ae74d55458..ce61260895 100644
--- a/submodules/PeerInfoUI/Sources/ChannelInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelInfoController.swift
@@ -732,13 +732,13 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
                 
                 let completedImpl: (UIImage) -> Void = { image in
                     if let data = image.jpegData(compressionQuality: 0.6) {
-                        let resource = LocalFileMediaResource(fileId: arc4random64())
+                        let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                         context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
-                        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [])
+                        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)
                         updateState {
                             $0.withUpdatedUpdatingAvatar(.image(representation, true))
                         }
-                        updateAvatarDisposable.set((updatePeerPhoto(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, accountPeerId: context.account.peerId, peerId: peerId, photo: uploadedPeerPhoto(postbox: context.account.postbox, network: context.account.network, resource: resource), mapResourceToAvatarSizes: { resource, representations in
+                        updateAvatarDisposable.set((context.engine.peers.updatePeerPhoto(peerId: peerId, photo: context.engine.peers.uploadedPeerPhoto(resource: resource), mapResourceToAvatarSizes: { resource, representations in
                             return mapResourceToAvatarSizes(postbox: context.account.postbox, resource: resource, representations: representations)
                         })
                         |> deliverOnMainQueue).start(next: { result in
@@ -777,7 +777,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
                             return $0.withUpdatedUpdatingAvatar(ItemListAvatarAndNameInfoItemUpdatingAvatar.none)
                         }
                     }
-                    updateAvatarDisposable.set((updatePeerPhoto(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, accountPeerId: context.account.peerId, peerId: peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in
+                    updateAvatarDisposable.set((context.engine.peers.updatePeerPhoto(peerId: peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in
                         return mapResourceToAvatarSizes(postbox: context.account.postbox, resource: resource, representations: representations)
                     }) |> deliverOnMainQueue).start(next: { result in
                         switch result {
@@ -836,11 +836,11 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
             }
             let controller = notificationMuteSettingsController(presentationData: presentationData, notificationSettings: globalSettings.effective.groupChats, soundSettings: soundSettings, openSoundSettings: {
                 let controller = notificationSoundSelectionController(context: context, isModal: true, currentSound: peerSettings.messageSound, defaultSound: globalSettings.effective.groupChats.sound, completion: { sound in
-                    let _ = updatePeerNotificationSoundInteractive(account: context.account, peerId: peerId, sound: sound).start()
+                    let _ = context.engine.peers.updatePeerNotificationSoundInteractive(peerId: peerId, sound: sound).start()
                 })
                 presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
             }, updateSettings: { value in
-                changeMuteSettingsDisposable.set(updatePeerMuteSetting(account: context.account, peerId: peerId, muteInterval: value).start())
+                changeMuteSettingsDisposable.set(context.engine.peers.updatePeerMuteSetting(peerId: peerId, muteInterval: value).start())
             })
             presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
         })
@@ -918,7 +918,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
     }, aboutLinkAction: { action, itemLink in
         aboutLinkActionImpl?(action, itemLink)
     }, toggleSignatures: { enabled in
-        actionsDisposable.add(toggleShouldChannelMessagesSignatures(account: context.account, peerId: peerId, enabled: enabled).start())
+        actionsDisposable.add(context.engine.peers.toggleShouldChannelMessagesSignatures(peerId: peerId, enabled: enabled).start())
     })
 
     var wasEditing: Bool?
@@ -993,7 +993,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
                         
                         let updateTitle: Signal<Void, Void>
                         if let titleValue = updateValues.title {
-                            updateTitle = updatePeerTitle(account: context.account, peerId: peerId, title: titleValue)
+                            updateTitle = context.engine.peers.updatePeerTitle(peerId: peerId, title: titleValue)
                                 |> mapError { _ in return Void() }
                         } else {
                             updateTitle = .complete()
@@ -1001,7 +1001,7 @@ public func channelInfoController(context: AccountContext, peerId: PeerId) -> Vi
                         
                         let updateDescription: Signal<Void, Void>
                         if let descriptionValue = updateValues.description {
-                            updateDescription = updatePeerDescription(account: context.account, peerId: peerId, description: descriptionValue.isEmpty ? nil : descriptionValue)
+                            updateDescription = context.engine.peers.updatePeerDescription(peerId: peerId, description: descriptionValue.isEmpty ? nil : descriptionValue)
                                 |> mapError { _ in return Void() }
                         } else {
                             updateDescription = .complete()
diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
index 9e1de8dd89..dc424cb6ad 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersController.swift
@@ -281,7 +281,13 @@ private func channelMembersControllerEntries(context: AccountContext, presentati
             if let peer = view.peers[view.peerId] as? TelegramChannel, peer.addressName == nil {
                 entries.append(.inviteLink(presentationData.theme, presentationData.strings.Channel_Members_InviteLink))
             }
-            entries.append(.addMemberInfo(presentationData.theme, isGroup ? presentationData.strings.Group_Members_AddMembersHelp : presentationData.strings.Channel_Members_AddMembersHelp))
+            if let peer = view.peers[view.peerId] as? TelegramChannel {
+                if peer.flags.contains(.isGigagroup) {
+                    entries.append(.addMemberInfo(presentationData.theme, presentationData.strings.Group_Members_AddMembersHelp))
+                } else if case .broadcast = peer.info {
+                    entries.append(.addMemberInfo(presentationData.theme, presentationData.strings.Channel_Members_AddMembersHelp))
+                }
+            }
         }
 
         
@@ -353,7 +359,7 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) ->
                     contacts = peerIdsValue
                 }
                 
-                let signal = context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: peerId, memberIds: contacts.compactMap({ contact -> PeerId? in
+                let signal = context.peerChannelMemberCategoriesContextsManager.addMembers(engine: context.engine, peerId: peerId, memberIds: contacts.compactMap({ contact -> PeerId? in
                     switch contact {
                         case let .peer(contactId):
                             return contactId
@@ -437,7 +443,7 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) ->
             return $0.withUpdatedRemovingPeerId(memberId)
         }
         
-        removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
+        removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
         |> deliverOnMainQueue).start(completed: {
             updateState {
                 return $0.withUpdatedRemovingPeerId(nil)
@@ -456,7 +462,7 @@ public func channelMembersController(context: AccountContext, peerId: PeerId) ->
     
     let peerView = context.account.viewTracker.peerView(peerId)
     
-    let (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
+    let (disposable, loadMoreControl) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
         peersPromise.set(.single(state.list))
     })
     actionsDisposable.add(disposable)
diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
index 9e43448063..fe3b052e30 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchContainerNode.swift
@@ -231,13 +231,13 @@ private func categorySignal(context: AccountContext, peerId: PeerId, category: G
         }
         switch category {
             case .admins:
-                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
+                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.admins(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
             case .contacts:
-                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.contacts(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
+                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.contacts(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
             case .bots:
-                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.bots(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
+                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.bots(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
             case .members:
-                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
+                disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, updated: processListState)
         }
         
         let (disposable, _) = disposableAndLoadMoreControl
@@ -437,7 +437,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                     
                     if peerId.namespace == Namespaces.Peer.CloudChannel {
                         if case .searchAdmins = mode {
-                            return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(account: context.account, peerId: peerId, memberId: memberId, adminRights: nil, rank: nil)
+                            return context.peerChannelMemberCategoriesContextsManager.updateMemberAdminRights(engine: context.engine, peerId: peerId, memberId: memberId, adminRights: nil, rank: nil)
                             |> `catch` { _ -> Signal<Void, NoError> in
                                 return .complete()
                             }
@@ -452,7 +452,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                             }
                         }
                         
-                        return context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
+                        return context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
                         |> afterDisposed {
                             Queue.mainQueue().async {
                                 updateState { state in
@@ -465,7 +465,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                     }
                     
                     if case .searchAdmins = mode {
-                        return removeGroupAdmin(account: context.account, peerId: peerId, adminId: memberId)
+                        return context.engine.peers.removeGroupAdmin(peerId: peerId, adminId: memberId)
                         |> `catch` { _ -> Signal<Void, NoError> in
                             return .complete()
                         }
@@ -479,7 +479,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                         }
                     }
                     
-                    return removePeerMember(account: context.account, peerId: peerId, memberId: memberId)
+                    return context.engine.peers.removePeerMember(peerId: peerId, memberId: memberId)
                     |> deliverOnMainQueue
                     |> afterDisposed {
                         updateState { state in
@@ -608,7 +608,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                 switch mode {
                     case .searchMembers, .banAndPromoteActions:
                         foundGroupMembers = Signal { subscriber in
-                            let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
+                            let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
                                 if case .ready = state.loadingState {
                                     subscriber.putNext(state.list)
                                 }
@@ -619,11 +619,11 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                         foundMembers = .single([])
                     case .inviteActions:
                         foundGroupMembers = .single([])
-                        foundMembers = channelMembers(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, category: .recent(.search(query)))
+                        foundMembers = context.engine.peers.channelMembers(peerId: peerId, category: .recent(.search(query)))
                         |> map { $0 ?? [] }
                 case .searchAdmins:
                     foundGroupMembers = Signal { subscriber in
-                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
+                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.admins(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
                             if case .ready = state.loadingState {
                                 subscriber.putNext(state.list)
                             }
@@ -633,7 +633,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                     foundMembers = .single([])
                 case .searchBanned:
                     foundGroupMembers = Signal { subscriber in
-                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.restricted(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
+                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.restricted(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
                             if case .ready = state.loadingState {
                                 subscriber.putNext(state.list)
                                 subscriber.putCompletion()
@@ -643,7 +643,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                     }
                     |> runOn(Queue.mainQueue())
                     foundMembers = Signal { subscriber in
-                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
+                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
                             if case .ready = state.loadingState {
                                 subscriber.putNext(state.list.filter({ participant in
                                     return participant.peer.id != context.account.peerId
@@ -655,7 +655,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                     |> runOn(Queue.mainQueue())
                 case .searchKicked:
                     foundGroupMembers = Signal { subscriber in
-                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.banned(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
+                        let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.banned(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query, updated: { state in
                             if case .ready = state.loadingState {
                                 subscriber.putNext(state.list)
                                 subscriber.putCompletion()
@@ -682,7 +682,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                             foundRemotePeers = .single(([], []))
                         } else {
                             foundContacts = context.account.postbox.searchContacts(query: query.lowercased())
-                            foundRemotePeers = .single(([], [])) |> then(searchPeers(account: context.account, query: query)
+                            foundRemotePeers = .single(([], [])) |> then(context.engine.peers.searchPeers(query: query)
                             |> delay(0.2, queue: Queue.concurrentDefaultQueue()))
                         }
                     case .searchMembers, .searchBanned, .searchKicked, .searchAdmins:
@@ -996,7 +996,7 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
                 }
                 
                 if mode == .banAndPromoteActions || mode == .inviteActions {
-                    foundRemotePeers = .single(([], [])) |> then(searchPeers(account: context.account, query: query)
+                    foundRemotePeers = .single(([], [])) |> then(context.engine.peers.searchPeers(query: query)
                         |> delay(0.2, queue: Queue.concurrentDefaultQueue()))
                 } else {
                     foundRemotePeers = .single(([], []))
@@ -1279,10 +1279,10 @@ public final class ChannelMembersSearchContainerNode: SearchDisplayControllerCon
             }
         })
         
-        self.emptyQueryListNode.beganInteractiveDragging = { [weak self] in
+        self.emptyQueryListNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift
index d93591f208..e0b9298316 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchController.swift
@@ -132,7 +132,7 @@ public final class ChannelMembersSearchController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func activateSearch() {
diff --git a/submodules/PeerInfoUI/Sources/ChannelMembersSearchControllerNode.swift b/submodules/PeerInfoUI/Sources/ChannelMembersSearchControllerNode.swift
index 9078871922..0ae15a0ed8 100644
--- a/submodules/PeerInfoUI/Sources/ChannelMembersSearchControllerNode.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelMembersSearchControllerNode.swift
@@ -419,20 +419,38 @@ class ChannelMembersSearchControllerNode: ASDisplayNode {
         } else {
             let membersState = Promise<ChannelMemberListState>()
             
-            disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
+            disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
                 membersState.set(.single(state))
             })
             
             additionalDisposable.set((combineLatest(queue: .mainQueue(),
                membersState.get(),
+               context.account.postbox.peerView(id: peerId),
                context.account.postbox.contactPeersView(accountPeerId: context.account.peerId, includePresences: true)
-            ).start(next: { [weak self] state, contactsView in
+            ).start(next: { [weak self] state, peerView, contactsView in
                 guard let strongSelf = self else {
                     return
                 }
                 var entries: [ChannelMembersSearchEntry] = []
                 
-                if case .inviteToCall = mode, !filters.contains(where: { filter in
+                var canInviteByLink = false
+                if let peer = peerViewMainPeer(peerView) {
+                    if !(peer.addressName?.isEmpty ?? true) {
+                        canInviteByLink = true
+                    } else if let peer = peer as? TelegramChannel {
+                        if peer.flags.contains(.isCreator) || (peer.adminRights?.rights.contains(.canInviteUsers) == true) {
+                            canInviteByLink = true
+                        }
+                    } else if let peer = peer as? TelegramGroup {
+                        if case .creator = peer.role {
+                            canInviteByLink = true
+                        } else if case let .admin(rights, _) = peer.role, rights.rights.contains(.canInviteUsers) {
+                            canInviteByLink = true
+                        }
+                    }
+                }
+                
+                if case .inviteToCall = mode, canInviteByLink, !filters.contains(where: { filter in
                     if case .excludeNonMembers = filter {
                         return true
                     } else {
@@ -563,7 +581,7 @@ class ChannelMembersSearchControllerNode: ASDisplayNode {
             }
         }
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.view.endEditing(true)
         }
     }
diff --git a/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift b/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift
index 2dc4cd0c0f..bd93b2c704 100644
--- a/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelOwnershipTransferController.swift
@@ -455,12 +455,12 @@ private func commitChannelOwnershipTransferController(context: AccountContext, p
         
         let signal: Signal<PeerId?, ChannelOwnershipTransferError>
         if let peer = peer as? TelegramChannel {
-            signal = context.peerChannelMemberCategoriesContextsManager.transferOwnership(account: context.account, peerId: peer.id, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in
+            signal = context.peerChannelMemberCategoriesContextsManager.transferOwnership(engine: context.engine, peerId: peer.id, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in
                 return .complete()
             }
             |> then(.single(nil))
         } else if let peer = peer as? TelegramGroup {
-            signal = convertGroupToSupergroup(account: context.account, peerId: peer.id)
+            signal = context.engine.peers.convertGroupToSupergroup(peerId: peer.id)
             |> map(Optional.init)
             |> mapError { error -> ChannelOwnershipTransferError in
                 switch error {
@@ -475,7 +475,7 @@ private func commitChannelOwnershipTransferController(context: AccountContext, p
                 guard let upgradedPeerId = upgradedPeerId else {
                     return .fail(.generic)
                 }
-                return context.peerChannelMemberCategoriesContextsManager.transferOwnership(account: context.account, peerId: upgradedPeerId, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in
+                return context.peerChannelMemberCategoriesContextsManager.transferOwnership(engine: context.engine, peerId: upgradedPeerId, memberId: member.id, password: contentNode.password) |> mapToSignal { _ in
                     return .complete()
                 }
                 |> then(.single(upgradedPeerId))
diff --git a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
index 42ecaef5e9..b2b2d60479 100644
--- a/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift
@@ -536,7 +536,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
             peersPromise.set(.single((peerId, nil)))
         } else {
             var loadCompletedCalled = false
-            let disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.restricted(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
+            let disposableAndLoadMoreControl = context.peerChannelMemberCategoriesContextsManager.restricted(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { state in
                 if case .loading(true) = state.loadingState, !updated {
                     peersPromise.set(.single((peerId, nil)))
                 } else {
@@ -594,7 +594,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                 }
                 let state = stateValue.with { $0 }
                 if let modifiedRightsFlags = state.modifiedRightsFlags {
-                    updateDefaultRightsDisposable.set((updateDefaultChannelMemberBannedRights(account: context.account, peerId: view.peerId, rights: TelegramChatBannedRights(flags: completeRights(modifiedRightsFlags), untilDate: Int32.max))
+                    updateDefaultRightsDisposable.set((context.engine.peers.updateDefaultChannelMemberBannedRights(peerId: view.peerId, rights: TelegramChatBannedRights(flags: completeRights(modifiedRightsFlags), untilDate: Int32.max))
                     |> deliverOnMainQueue).start())
                 }
             } else if let group = view.peers[view.peerId] as? TelegramGroup, let _ = view.cachedData as? CachedGroupData {
@@ -624,7 +624,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                 }
                 let state = stateValue.with { $0 }
                 if let modifiedRightsFlags = state.modifiedRightsFlags {
-                    updateDefaultRightsDisposable.set((updateDefaultChannelMemberBannedRights(account: context.account, peerId: view.peerId, rights: TelegramChatBannedRights(flags: completeRights(modifiedRightsFlags), untilDate: Int32.max))
+                    updateDefaultRightsDisposable.set((context.engine.peers.updateDefaultChannelMemberBannedRights(peerId: view.peerId, rights: TelegramChatBannedRights(flags: completeRights(modifiedRightsFlags), untilDate: Int32.max))
                         |> deliverOnMainQueue).start())
                 }
             }
@@ -679,7 +679,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                 return state
             }
             
-            removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: context.account, peerId: peerId, memberId: memberId, bannedRights: nil)
+            removePeerDisposable.set((context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: context.engine, peerId: peerId, memberId: memberId, bannedRights: nil)
             |> deliverOnMainQueue).start(error: { _ in
                 updateState { state in
                     var state = state
@@ -762,7 +762,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
         }
         pushControllerImpl?(controller)
     }, openChannelExample: {
-        resolveDisposable.set((resolvePeerByName(account: context.account, name: "durov") |> deliverOnMainQueue).start(next: { peerId in
+        resolveDisposable.set((context.engine.peers.resolvePeerByName(name: "durov") |> deliverOnMainQueue).start(next: { peerId in
             if let peerId = peerId {
                 navigateToChatControllerImpl?(peerId)
             }
@@ -779,7 +779,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                 }
                 let state = stateValue.with { $0 }
                 if let modifiedSlowmodeTimeout = state.modifiedSlowmodeTimeout {
-                    updateDefaultRightsDisposable.set(updateChannelSlowModeInteractively(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, peerId: view.peerId, timeout: modifiedSlowmodeTimeout == 0 ? nil : value).start())
+                    updateDefaultRightsDisposable.set(context.engine.peers.updateChannelSlowModeInteractively(peerId: view.peerId, timeout: modifiedSlowmodeTimeout == 0 ? nil : value).start())
                 }
             } else if let _ = view.peers[view.peerId] as? TelegramGroup, let _ = view.cachedData as? CachedGroupData {
                 updateState { state in
@@ -797,7 +797,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                 let progress = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
                 presentControllerImpl?(progress, nil)
                 
-                let signal = convertGroupToSupergroup(account: context.account, peerId: view.peerId)
+                let signal = context.engine.peers.convertGroupToSupergroup(peerId: view.peerId)
                 |> mapError { error -> UpdateChannelSlowModeError in
                     switch error {
                     case .tooManyChannels:
@@ -815,7 +815,7 @@ public func channelPermissionsController(context: AccountContext, peerId origina
                     }
                 }
                 |> mapToSignal { upgradedPeerId -> Signal<PeerId?, UpdateChannelSlowModeError> in
-                    return updateChannelSlowModeInteractively(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, peerId: upgradedPeerId, timeout: modifiedSlowmodeTimeout == 0 ? nil : value)
+                    return context.engine.peers.updateChannelSlowModeInteractively(peerId: upgradedPeerId, timeout: modifiedSlowmodeTimeout == 0 ? nil : value)
                     |> mapToSignal { _ -> Signal<PeerId?, UpdateChannelSlowModeError> in
                         return .complete()
                     }
diff --git a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
index f523a1e944..d73f4ef204 100644
--- a/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
+++ b/submodules/PeerInfoUI/Sources/ChannelVisibilityController.swift
@@ -499,8 +499,8 @@ private func channelVisibilityControllerEntries(presentationData: PresentationDa
                     break
                 case .initialSetup, .generic:
                     entries.append(.typeHeader(presentationData.theme, isGroup ? presentationData.strings.Group_Setup_TypeHeader.uppercased() : presentationData.strings.Channel_Edit_LinkItem.uppercased()))
-                    entries.append(.typePublic(presentationData.theme, isGroup ? presentationData.strings.Channel_Setup_TypePublic : presentationData.strings.Channel_Setup_LinkTypePublic, selectedType == .publicChannel))
-                    entries.append(.typePrivate(presentationData.theme, isGroup ? presentationData.strings.Channel_Setup_TypePrivate : presentationData.strings.Channel_Setup_LinkTypePrivate, selectedType == .privateChannel))
+                    entries.append(.typePublic(presentationData.theme, isGroup ? presentationData.strings.Group_Setup_TypePublic : presentationData.strings.Channel_Setup_LinkTypePublic, selectedType == .publicChannel))
+                    entries.append(.typePrivate(presentationData.theme, isGroup ? presentationData.strings.Group_Setup_TypePrivate : presentationData.strings.Channel_Setup_LinkTypePrivate, selectedType == .privateChannel))
             
                     switch selectedType {
                         case .publicChannel:
@@ -818,9 +818,9 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
     }
     
     let peersDisablingAddressNameAssignment = Promise<[Peer]?>()
-    peersDisablingAddressNameAssignment.set(.single(nil) |> then(channelAddressNameAssignmentAvailability(account: context.account, peerId: peerId.namespace == Namespaces.Peer.CloudChannel ? peerId : nil) |> mapToSignal { result -> Signal<[Peer]?, NoError> in
+    peersDisablingAddressNameAssignment.set(.single(nil) |> then(context.engine.peers.channelAddressNameAssignmentAvailability(peerId: peerId.namespace == Namespaces.Peer.CloudChannel ? peerId : nil) |> mapToSignal { result -> Signal<[Peer]?, NoError> in
         if case .addressNameLimitReached = result {
-            return adminedPublicChannels(account: context.account, scope: .all)
+            return context.engine.peers.adminedPublicChannels(scope: .all)
             |> map(Optional.init)
         } else {
             return .single([])
@@ -871,7 +871,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                 return state.withUpdatedEditingPublicLinkText(text)
             }
             
-            checkAddressNameDisposable.set((validateAddressNameInteractive(account: context.account, domain: .peer(peerId), name: text)
+            checkAddressNameDisposable.set((context.engine.peers.validateAddressNameInteractive(domain: .peer(peerId), name: text)
             |> deliverOnMainQueue).start(next: { result in
                 updateState { state in
                     return state.withUpdatedAddressNameValidationStatus(result)
@@ -893,7 +893,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
             return state.withUpdatedRevokingPeerId(peerId)
         }
         
-        revokeAddressNameDisposable.set((updateAddressName(account: context.account, domain: .peer(peerId), name: nil) |> deliverOnMainQueue).start(error: { _ in
+        revokeAddressNameDisposable.set((context.engine.peers.updateAddressName(domain: .peer(peerId), name: nil) |> deliverOnMainQueue).start(error: { _ in
             updateState { state in
                 return state.withUpdatedRevokingPeerId(nil)
             }
@@ -1027,7 +1027,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                                         }
                                     }
                                     if revoke {
-                                        revokeLinkDisposable.set((revokePeerExportedInvitation(account: context.account, peerId: peerId, link: link) |> deliverOnMainQueue).start(completed: {
+                                        revokeLinkDisposable.set((context.engine.peers.revokePeerExportedInvitation(peerId: peerId, link: link) |> deliverOnMainQueue).start(completed: {
                                             updateState {
                                                 $0.withUpdatedRevokingPrivateLink(false)
                                             }
@@ -1101,7 +1101,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                         }
                         _ = ApplicationSpecificNotice.markAsSeenSetPublicChannelLink(accountManager: context.sharedContext.accountManager).start()
                         
-                        updateAddressNameDisposable.set((updateAddressName(account: context.account, domain: .peer(peerId), name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue) |> timeout(10, queue: Queue.mainQueue(), alternate: .fail(.generic))
+                        updateAddressNameDisposable.set((context.engine.peers.updateAddressName(domain: .peer(peerId), name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue) |> timeout(10, queue: Queue.mainQueue(), alternate: .fail(.generic))
                             |> deliverOnMainQueue).start(error: { _ in
                                 updateState { state in
                                     return state.withUpdatedUpdatingAddressName(false)
@@ -1171,9 +1171,9 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                         }
                         _ = ApplicationSpecificNotice.markAsSeenSetPublicChannelLink(accountManager: context.sharedContext.accountManager).start()
                         
-                        let signal = convertGroupToSupergroup(account: context.account, peerId: peerId)
+                        let signal = context.engine.peers.convertGroupToSupergroup(peerId: peerId)
                         |> mapToSignal { upgradedPeerId -> Signal<PeerId?, ConvertGroupToSupergroupError> in
-                            return updateAddressName(account: context.account, domain: .peer(upgradedPeerId), name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue)
+                            return context.engine.peers.updateAddressName(domain: .peer(upgradedPeerId), name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue)
                             |> `catch` { _ -> Signal<Void, NoError> in
                                 return .complete()
                             }
@@ -1357,7 +1357,7 @@ public func channelVisibilityController(context: AccountContext, peerId: PeerId,
                         context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, chatController: nil, context: context, chatLocation: .peer(peerId), keepStack: .never, animated: true))
                     } else {
                         selectionController.displayProgress = true
-                        let _ = (addChannelMembers(account: context.account, peerId: peerId, memberIds: filteredPeerIds)
+                        let _ = (context.engine.peers.addChannelMembers(peerId: peerId, memberIds: filteredPeerIds)
                         |> deliverOnMainQueue).start(error: { [weak selectionController] _ in
                             guard let selectionController = selectionController, let navigationController = selectionController.navigationController as? NavigationController else {
                                 return
diff --git a/submodules/PeerInfoUI/Sources/ConvertToSupergroupController.swift b/submodules/PeerInfoUI/Sources/ConvertToSupergroupController.swift
index 494e9537c2..b1dbe193b9 100644
--- a/submodules/PeerInfoUI/Sources/ConvertToSupergroupController.swift
+++ b/submodules/PeerInfoUI/Sources/ConvertToSupergroupController.swift
@@ -149,7 +149,7 @@ public func convertToSupergroupController(context: AccountContext, peerId: PeerI
             }
             
             if !alreadyConverting {
-                convertDisposable.set((convertGroupToSupergroup(account: context.account, peerId: peerId)
+                convertDisposable.set((context.engine.peers.convertGroupToSupergroup(peerId: peerId)
                 |> deliverOnMainQueue).start(next: { createdPeerId in
                     replaceControllerImpl?(context.sharedContext.makeChatController(context: context, chatLocation: .peer(createdPeerId), subject: nil, botStart: nil, mode: .standard(previewing: false)))
                 }))
diff --git a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift
index 2fa79dc0ca..eba9713cee 100644
--- a/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/DeviceContactInfoController.swift
@@ -396,7 +396,7 @@ private enum DeviceContactInfoEntry: ItemListNodeEntry {
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! DeviceContactInfoControllerArguments
         switch self {
-            case let .info(_, _, strings, dateTimeFormat, peer, state, jobSummary, isPlain):
+            case let .info(_, _, _, dateTimeFormat, peer, state, jobSummary, _):
                 return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .contact, peer: peer, presence: nil, label: jobSummary, cachedData: nil, state: state, sectionId: self.section, style: arguments.isPlain ? .plain : .blocks(withTopInset: false, withExtendedBottomInset: true), editingNameUpdated: { editingName in
                     arguments.updateEditingName(editingName)
                 }, avatarTapped: {
@@ -647,8 +647,13 @@ private func deviceContactInfoEntries(account: Account, presentationData: Presen
     let jobSummary = jobComponents.joined(separator: " — ")
     
     let isOrganization = personName.0.isEmpty && personName.1.isEmpty && !contactData.organization.isEmpty
+
+    var firstName: String = isOrganization ? contactData.organization : personName.0
+    if firstName.isEmpty {
+        firstName = presentationData.strings.Message_Contact
+    }
     
-    entries.append(.info(entries.count, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer: peer ?? TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: isOrganization ? contactData.organization : personName.0, lastName: isOrganization ? nil : personName.1, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), state: ItemListAvatarAndNameInfoItemState(editingName: editingName, updatingName: nil), job: isOrganization ? nil : jobSummary, isPlain: !isShare))
+    entries.append(.info(entries.count, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer: peer ?? TelegramUser(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: firstName, lastName: isOrganization ? nil : personName.1, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []), state: ItemListAvatarAndNameInfoItemState(editingName: editingName, updatingName: nil), job: isOrganization ? nil : jobSummary, isPlain: !isShare))
     
     if !selecting {
         if let _ = peer {
@@ -1099,7 +1104,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device
                         switch subject {
                             case let .create(peer, _, share, shareViaException, _):
                                 if share, filteredPhoneNumbers.count <= 1, let peer = peer {
-                                    addContactDisposable.set((addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions)
+                                    addContactDisposable.set((context.engine.contacts.addContactInteractively(peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions)
                                     |> deliverOnMainQueue).start(error: { _ in
                                         presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
                                     }, completed: {
@@ -1133,7 +1138,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device
                                 switch subject {
                                     case let .create(peer, _, share, shareViaException, _):
                                         if share, let peer = peer {
-                                            return addContactInteractively(account: context.account, peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions)
+                                            return context.engine.contacts.addContactInteractively(peerId: peer.id, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers.first?.value ?? "", addToPrivacyExceptions: shareViaException && addToPrivacyExceptions)
                                             |> mapToSignal { _ -> Signal<(DeviceContactStableId, DeviceContactExtendedData, Peer?)?, AddContactError> in
                                                 return .complete()
                                             }
@@ -1148,7 +1153,7 @@ public func deviceContactInfoController(context: AccountContext, subject: Device
                                         break
                                 }
                                 
-                                return importContact(account: context.account, firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers[0].value)
+                                return context.engine.contacts.importContact(firstName: composedContactData.basicData.firstName, lastName: composedContactData.basicData.lastName, phoneNumber: filteredPhoneNumbers[0].value)
                                 |> castError(AddContactError.self)
                                 |> mapToSignal { peerId -> Signal<(DeviceContactStableId, DeviceContactExtendedData, Peer?)?, AddContactError> in
                                     if let peerId = peerId {
@@ -1322,8 +1327,8 @@ private func addContactToExisting(context: AccountContext, parentController: Vie
     contactsController.navigationPresentation = .modal
     (parentController.navigationController as? NavigationController)?.pushViewController(contactsController)
     let _ = (contactsController.result
-    |> deliverOnMainQueue).start(next: { peer in
-        if let (peer, _) = peer {
+    |> deliverOnMainQueue).start(next: { result in
+        if let (peers, _) = result, let peer = peers.first {
             let dataSignal: Signal<(Peer?, DeviceContactStableId?), NoError>
             switch peer {
                 case let .peer(contact, _, _):
diff --git a/submodules/PeerInfoUI/Sources/GroupInfoSearchNavigationContentNode.swift b/submodules/PeerInfoUI/Sources/GroupInfoSearchNavigationContentNode.swift
index 5a1a9ede36..42168c45cc 100644
--- a/submodules/PeerInfoUI/Sources/GroupInfoSearchNavigationContentNode.swift
+++ b/submodules/PeerInfoUI/Sources/GroupInfoSearchNavigationContentNode.swift
@@ -34,7 +34,7 @@ final class GroupInfoSearchNavigationContentNode: NavigationBarContentNode, Item
         
         self.cancel = cancel
         
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern)
+        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern, displayBackground: false)
         
         super.init()
         
diff --git a/submodules/PeerInfoUI/Sources/GroupPreHistorySetupController.swift b/submodules/PeerInfoUI/Sources/GroupPreHistorySetupController.swift
index f16c20505d..7468d566f6 100644
--- a/submodules/PeerInfoUI/Sources/GroupPreHistorySetupController.swift
+++ b/submodules/PeerInfoUI/Sources/GroupPreHistorySetupController.swift
@@ -161,9 +161,9 @@ public func groupPreHistorySetupController(context: AccountContext, peerId: Peer
                 }
                 if let value = value, value != defaultValue {
                     if peerId.namespace == Namespaces.Peer.CloudGroup {
-                        let signal = convertGroupToSupergroup(account: context.account, peerId: peerId)
+                        let signal = context.engine.peers.convertGroupToSupergroup(peerId: peerId)
                         |> mapToSignal { upgradedPeerId -> Signal<PeerId?, ConvertGroupToSupergroupError> in
-                            return updateChannelHistoryAvailabilitySettingsInteractively(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, peerId: upgradedPeerId, historyAvailableForNewMembers: value)
+                            return context.engine.peers.updateChannelHistoryAvailabilitySettingsInteractively(peerId: upgradedPeerId, historyAvailableForNewMembers: value)
                             |> `catch` { _ -> Signal<Void, NoError> in
                                 return .complete()
                             }
@@ -190,7 +190,7 @@ public func groupPreHistorySetupController(context: AccountContext, peerId: Peer
                             }
                         }))
                     } else {
-                        applyDisposable.set((updateChannelHistoryAvailabilitySettingsInteractively(postbox: context.account.postbox, network: context.account.network, accountStateManager: context.account.stateManager, peerId: peerId, historyAvailableForNewMembers: value)
+                        applyDisposable.set((context.engine.peers.updateChannelHistoryAvailabilitySettingsInteractively(peerId: peerId, historyAvailableForNewMembers: value)
                         |> deliverOnMainQueue).start(completed: {
                             dismissImpl?()
                         }))
diff --git a/submodules/PeerInfoUI/Sources/GroupStickerPackSetupController.swift b/submodules/PeerInfoUI/Sources/GroupStickerPackSetupController.swift
index c79387453e..8c465147ca 100644
--- a/submodules/PeerInfoUI/Sources/GroupStickerPackSetupController.swift
+++ b/submodules/PeerInfoUI/Sources/GroupStickerPackSetupController.swift
@@ -323,7 +323,7 @@ public func groupStickerPackSetupController(context: AccountContext, peerId: Pee
     
     let initialData = Promise<InitialStickerPackData?>()
     if let currentPackInfo = currentPackInfo {
-        initialData.set(cachedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .id(id: currentPackInfo.id.id, accessHash: currentPackInfo.accessHash), forceRemote: false)
+        initialData.set(context.engine.stickers.cachedStickerPack(reference: .id(id: currentPackInfo.id.id, accessHash: currentPackInfo.accessHash), forceRemote: false)
         |> map { result -> InitialStickerPackData? in
             switch result {
                 case .none:
@@ -363,7 +363,7 @@ public func groupStickerPackSetupController(context: AccountContext, peerId: Pee
                     }
                 }
                 return .single((searchText, .searching))
-                |> then((loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .name(searchText.lowercased()), forceActualized: false) |> delay(0.3, queue: Queue.concurrentDefaultQueue()))
+                |> then((context.engine.stickers.loadedStickerPack(reference: .name(searchText.lowercased()), forceActualized: false) |> delay(0.3, queue: Queue.concurrentDefaultQueue()))
                 |> mapToSignal { value -> Signal<(String, GroupStickerPackSearchState), NoError> in
                     switch value {
                         case .fetching:
@@ -402,7 +402,7 @@ public func groupStickerPackSetupController(context: AccountContext, peerId: Pee
     }, updateSearchText: { text in
         searchText.set(text)
     }, openStickersBot: {
-        resolveDisposable.set((resolvePeerByName(account: context.account, name: "stickers") |> deliverOnMainQueue).start(next: { peerId in
+        resolveDisposable.set((context.engine.peers.resolvePeerByName(name: "stickers") |> deliverOnMainQueue).start(next: { peerId in
             if let peerId = peerId {
                 dismissImpl?()
                 navigateToChatControllerImpl?(peerId)
@@ -448,7 +448,7 @@ public func groupStickerPackSetupController(context: AccountContext, peerId: Pee
                             state.isSaving = true
                             return state
                         }
-                        saveDisposable.set((updateGroupSpecificStickerset(postbox: context.account.postbox, network: context.account.network, peerId: peerId, info: info)
+                        saveDisposable.set((context.engine.peers.updateGroupSpecificStickerset(peerId: peerId, info: info)
                         |> deliverOnMainQueue).start(error: { _ in
                             updateState { state in
                                 var state = state
diff --git a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift b/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift
deleted file mode 100644
index 70c6a25db9..0000000000
--- a/submodules/PeerInfoUI/Sources/GroupsInCommonController.swift
+++ /dev/null
@@ -1,244 +0,0 @@
-import Foundation
-import UIKit
-import AsyncDisplayKit
-import Display
-import SwiftSignalKit
-import Postbox
-import TelegramCore
-import SyncCore
-import TelegramPresentationData
-import TelegramUIPreferences
-import ItemListUI
-import PresentationDataUtils
-import AccountContext
-import ItemListPeerItem
-import ContextUI
-
-private final class GroupsInCommonControllerArguments {
-    let context: AccountContext
-    
-    let openPeer: (PeerId) -> Void
-    let contextAction: (Peer, ASDisplayNode, ContextGesture?) -> Void
-    
-    init(context: AccountContext, openPeer: @escaping (PeerId) -> Void, contextAction: @escaping (Peer, ASDisplayNode, ContextGesture?) -> Void) {
-        self.context = context
-        self.openPeer = openPeer
-        self.contextAction = contextAction
-    }
-}
-
-private enum GroupsInCommonSection: Int32 {
-    case peers
-}
-
-private enum GroupsInCommonEntryStableId: Hashable {
-    case peer(PeerId)
-}
-
-private enum GroupsInCommonEntry: ItemListNodeEntry {
-    case peerItem(Int32, PresentationTheme, PresentationStrings, PresentationDateTimeFormat, PresentationPersonNameOrder, Peer)
-    
-    var section: ItemListSectionId {
-        switch self {
-            case .peerItem:
-                return GroupsInCommonSection.peers.rawValue
-        }
-    }
-    
-    var stableId: GroupsInCommonEntryStableId {
-        switch self {
-            case let .peerItem(_, _, _, _, _, peer):
-                return .peer(peer.id)
-        }
-    }
-    
-    static func ==(lhs: GroupsInCommonEntry, rhs: GroupsInCommonEntry) -> Bool {
-        switch lhs {
-            case let .peerItem(lhsIndex, lhsTheme, lhsStrings, lhsDateTimeFormat, lhsNameOrder, lhsPeer):
-                if case let .peerItem(rhsIndex, rhsTheme, rhsStrings, rhsDateTimeFormat, rhsNameOrder, rhsPeer) = rhs {
-                    if lhsIndex != rhsIndex {
-                        return false
-                    }
-                    if lhsTheme !== rhsTheme {
-                        return false
-                    }
-                    if lhsStrings !== rhsStrings {
-                        return false
-                    }
-                    if lhsDateTimeFormat != rhsDateTimeFormat {
-                        return false
-                    }
-                    if !lhsPeer.isEqual(rhsPeer) {
-                        return false
-                    }
-                    if lhsNameOrder != rhsNameOrder {
-                        return false
-                    }
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-    
-    static func <(lhs: GroupsInCommonEntry, rhs: GroupsInCommonEntry) -> Bool {
-        switch lhs {
-        case let .peerItem(index, _, _, _, _, _):
-            switch rhs {
-                case let .peerItem(rhsIndex, _, _, _, _, _):
-                    return index < rhsIndex
-            }
-        }
-    }
-    
-    func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
-        let arguments = arguments as! GroupsInCommonControllerArguments
-        switch self {
-        case let .peerItem(_, theme, strings, dateTimeFormat, nameDisplayOrder, peer):
-            return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer, presence: nil, text: .none, label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
-                arguments.openPeer(peer.id)
-            }, setPeerIdWithRevealedOptions: { _, _ in
-            }, removePeer: { _ in
-            }, contextAction: { node, gesture in
-                arguments.contextAction(peer, node, gesture)
-            })
-        }
-    }
-}
-
-private struct GroupsInCommonControllerState: Equatable {
-    static func ==(lhs: GroupsInCommonControllerState, rhs: GroupsInCommonControllerState) -> Bool {
-        return true
-    }
-}
-
-private func groupsInCommonControllerEntries(presentationData: PresentationData, state: GroupsInCommonControllerState, peers: [Peer]?) -> [GroupsInCommonEntry] {
-    var entries: [GroupsInCommonEntry] = []
-    
-    if let peers = peers {
-        var index: Int32 = 0
-        for peer in peers {
-            entries.append(.peerItem(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, peer))
-            index += 1
-        }
-    }
-    
-    return entries
-}
-
-public func groupsInCommonController(context: AccountContext, peerId: PeerId) -> ViewController {
-    let statePromise = ValuePromise(GroupsInCommonControllerState(), ignoreRepeated: true)
-    let stateValue = Atomic(value: GroupsInCommonControllerState())
-    let updateState: ((GroupsInCommonControllerState) -> GroupsInCommonControllerState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
-    }
-    
-    let actionsDisposable = DisposableSet()
-    
-    let peersPromise = Promise<[Peer]?>(nil)
-    
-    var pushControllerImpl: ((ViewController) -> Void)?
-    var getNavigationControllerImpl: (() -> NavigationController?)?
-    
-    var contextActionImpl: ((Peer, ASDisplayNode, ContextGesture?) -> Void)?
-    
-    let arguments = GroupsInCommonControllerArguments(context: context, openPeer: { memberId in
-        guard let navigationController = getNavigationControllerImpl?() else {
-            return
-        }
-        context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(memberId), animated: true))
-    }, contextAction: { peer, node, gesture in
-        contextActionImpl?(peer, node, gesture)
-    })
-    
-    let peersSignal: Signal<[Peer]?, NoError> = .single(nil) |> then(groupsInCommon(account: context.account, peerId: peerId) |> mapToSignal { peerIds -> Signal<[Peer], NoError> in
-            return context.account.postbox.transaction { transaction -> [Peer] in
-                var result: [Peer] = []
-                for id in peerIds {
-                    if let peer = transaction.getPeer(id.id) {
-                        result.append(peer)
-                    }
-                }
-                return result
-            }
-        }
-        |> map(Optional.init))
-    
-    peersPromise.set(peersSignal)
-    
-    var previousPeers: [Peer]?
-    
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), peersPromise.get())
-        |> deliverOnMainQueue
-        |> map { presentationData, state, peers -> (ItemListControllerState, (ItemListNodeState, Any)) in
-            var emptyStateItem: ItemListControllerEmptyStateItem?
-            if peers == nil {
-                emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme)
-            }
-            
-            let previous = previousPeers
-            previousPeers = peers
-            
-            let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.UserInfo_GroupsInCommon), leftNavigationButton: nil, rightNavigationButton: nil, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
-            let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: groupsInCommonControllerEntries(presentationData: presentationData, state: state, peers: peers), style: .blocks, emptyStateItem: emptyStateItem, animateChanges: previous != nil && peers != nil && previous!.count >= peers!.count)
-            
-            return (controllerState, (listState, arguments))
-        } |> afterDisposed {
-            actionsDisposable.dispose()
-    }
-    
-    let controller = ItemListController(context: context, state: signal)
-    pushControllerImpl = { [weak controller] c in
-        if let controller = controller {
-            (controller.navigationController as? NavigationController)?.pushViewController(c)
-        }
-    }
-    getNavigationControllerImpl = { [weak controller] in
-        return controller?.navigationController as? NavigationController
-    }
-    contextActionImpl = { [weak controller] peer, node, gesture in
-        guard let controller = controller else {
-            return
-        }
-        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        let chatController = context.sharedContext.makeChatController(context: context, chatLocation: .peer(peer.id), subject: nil, botStart: nil, mode: .standard(previewing: true))
-        chatController.canReadHistory.set(false)
-        let items: [ContextMenuItem] = [
-            .action(ContextMenuActionItem(text: presentationData.strings.Conversation_LinkDialogOpen, icon: { _ in nil }, action: { _, f in
-                f(.dismissWithoutContent)
-                arguments.openPeer(peer.id)
-            }))
-        ]
-        let contextController = ContextController(account: context.account, presentationData: presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single(items), reactionItems: [], gesture: gesture)
-        controller.presentInGlobalOverlay(contextController)
-    }
-    return controller
-}
-
-private final class ContextControllerContentSourceImpl: ContextControllerContentSource {
-    let controller: ViewController
-    weak var sourceNode: ASDisplayNode?
-    
-    let navigationController: NavigationController? = nil
-    
-    let passthroughTouches: Bool = true
-    
-    init(controller: ViewController, sourceNode: ASDisplayNode?) {
-        self.controller = controller
-        self.sourceNode = sourceNode
-    }
-    
-    func transitionInfo() -> ContextControllerTakeControllerInfo? {
-        let sourceNode = self.sourceNode
-        return ContextControllerTakeControllerInfo(contentAreaInScreenSpace: CGRect(origin: CGPoint(), size: CGSize(width: 10.0, height: 10.0)), sourceNode: { [weak sourceNode] in
-            if let sourceNode = sourceNode {
-                return (sourceNode, sourceNode.bounds)
-            } else {
-                return nil
-            }
-        })
-    }
-    
-    func animatedIn() {
-    }
-}
diff --git a/submodules/PeerInfoUI/Sources/OldChannelsController.swift b/submodules/PeerInfoUI/Sources/OldChannelsController.swift
index 8b1248bb1a..3a4edeb23e 100644
--- a/submodules/PeerInfoUI/Sources/OldChannelsController.swift
+++ b/submodules/PeerInfoUI/Sources/OldChannelsController.swift
@@ -221,7 +221,7 @@ private final class OldChannelsActionPanelNode: ASDisplayNode {
         
         super.init()
         
-        self.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         
         self.addSubnode(self.separatorNode)
         self.addSubnode(self.buttonNode)
@@ -233,7 +233,7 @@ private final class OldChannelsActionPanelNode: ASDisplayNode {
     
     func updatePresentationData(_ presentationData: ItemListPresentationData) {
         self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
-        self.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
     }
     
     func updateLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) -> CGFloat {
@@ -384,7 +384,7 @@ public func oldChannelsController(context: AccountContext, intent: OldChannelsCo
     
     let peersSignal: Signal<[InactiveChannel]?, NoError> = .single(nil)
     |> then(
-        inactiveChannelList(network: context.account.network)
+        context.engine.peers.inactiveChannelList()
         |> map { peers -> [InactiveChannel]? in
             return peers.sorted(by: { lhs, rhs in
                 return lhs.lastActivityDate < rhs.lastActivityDate
@@ -455,21 +455,21 @@ public func oldChannelsController(context: AccountContext, intent: OldChannelsCo
         let state = stateValue.with { $0 }
         let _ = (peersPromise.get()
         |> take(1)
-        |> mapToSignal { peers in
+        |> mapToSignal { peers -> Signal<Never, NoError> in
+            let peers = peers ?? []
             return context.account.postbox.transaction { transaction -> Void in
-                if let peers = peers {
-                    for peer in peers {
-                        if state.selectedPeers.contains(peer.peer.id) {
-                            if transaction.getPeer(peer.peer.id) == nil {
-                                updatePeers(transaction: transaction, peers: [peer.peer], update: { _, updated in
-                                    return updated
-                                })
-                            }
-                            removePeerChat(account: context.account, transaction: transaction, mediaBox: context.account.postbox.mediaBox, peerId: peer.peer.id, reportChatSpam: false, deleteGloballyIfPossible: false)
+                for peer in peers {
+                    if state.selectedPeers.contains(peer.peer.id) {
+                        if transaction.getPeer(peer.peer.id) == nil {
+                            updatePeers(transaction: transaction, peers: [peer.peer], update: { _, updated in
+                                return updated
+                            })
                         }
                     }
                 }
             }
+            |> ignoreValues
+            |> then(context.engine.peers.removePeerChats(peerIds: Array(peers.map(\.peer.id))))
         }
         |> deliverOnMainQueue).start(completed: {
             completed(true)
diff --git a/submodules/PeerInfoUI/Sources/OldChannelsSearch.swift b/submodules/PeerInfoUI/Sources/OldChannelsSearch.swift
index 4e27823a2f..685ca8cfc0 100644
--- a/submodules/PeerInfoUI/Sources/OldChannelsSearch.swift
+++ b/submodules/PeerInfoUI/Sources/OldChannelsSearch.swift
@@ -263,7 +263,7 @@ private final class OldChannelsSearchContainerNode: SearchDisplayControllerConte
             }
         })
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift b/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift
index 3840254013..6767eab567 100644
--- a/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift
+++ b/submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift
@@ -212,7 +212,7 @@ public func peerAutoremoveSetupScreen(context: AccountContext, peerId: PeerId, c
                 }
                 
                 if updated {
-                    let signal = setChatMessageAutoremoveTimeoutInteractively(account: context.account, peerId: peerId, timeout: resolvedValue)
+                    let signal = context.engine.peers.setChatMessageAutoremoveTimeoutInteractively(peerId: peerId, timeout: resolvedValue)
                     |> deliverOnMainQueue
                     
                     applyDisposable.set((signal
diff --git a/submodules/PeerInfoUI/Sources/PeerReportController.swift b/submodules/PeerInfoUI/Sources/PeerReportController.swift
index 146ce5ddbe..d13701fb43 100644
--- a/submodules/PeerInfoUI/Sources/PeerReportController.swift
+++ b/submodules/PeerInfoUI/Sources/PeerReportController.swift
@@ -33,7 +33,7 @@ public enum PeerReportOption {
     case other
 }
 
-public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextController?, backAction: ((ContextController) -> Void)? = nil, subject: PeerReportSubject, options: [PeerReportOption] = [.spam, .violence, .pornography, .childAbuse, .copyright, .other], passthrough: Bool = false, completion: @escaping (ReportReason?, Bool) -> Void) {
+public func presentPeerReportOptions(context: AccountContext, parent: ViewController, contextController: ContextControllerProtocol?, backAction: ((ContextControllerProtocol) -> Void)? = nil, subject: PeerReportSubject, options: [PeerReportOption] = [.spam, .violence, .pornography, .childAbuse, .copyright, .other], passthrough: Bool = false, completion: @escaping (ReportReason?, Bool) -> Void) {
     if let contextController = contextController {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         var items: [ContextMenuItem] = []
@@ -107,19 +107,19 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro
                         } else {
                             switch subject {
                                 case let .peer(peerId):
-                                    let _ = (reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: "")
+                                    let _ = (context.engine.peers.reportPeer(peerId: peerId, reason: reportReason, message: "")
                                     |> deliverOnMainQueue).start(completed: {
                                         displaySuccess()
                                         completion(nil, false)
                                     })
                                 case let .messages(messageIds):
-                                    let _ = (reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: "")
+                                    let _ = (context.engine.peers.reportPeerMessages(messageIds: messageIds, reason: reportReason, message: "")
                                     |> deliverOnMainQueue).start(completed: {
                                         displaySuccess()
                                         completion(nil, false)
                                     })
                                 case let .profilePhoto(peerId, photoId):
-                                    let _ = (reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: "")
+                                    let _ = (context.engine.peers.reportPeerPhoto(peerId: peerId, reason: reportReason, message: "")
                                     |> deliverOnMainQueue).start(completed: {
                                         displaySuccess()
                                         completion(nil, false)
@@ -163,7 +163,7 @@ public func presentPeerReportOptions(context: AccountContext, parent: ViewContro
         }
         contextController.setItems(.single(items))
     } else {
-        contextController?.dismiss()
+        contextController?.dismiss(completion: nil)
         parent.view.endEditing(true)
         parent.present(peerReportOptionsController(context: context, subject: subject, passthrough: passthrough, present: { [weak parent] c, a in
             parent?.present(c, in: .window(.root), with: a)
@@ -233,19 +233,19 @@ public func peerReportOptionsController(context: AccountContext, subject: PeerRe
                     } else {
                         switch subject {
                             case let .peer(peerId):
-                                let _ = (reportPeer(account: context.account, peerId: peerId, reason: reportReason, message: message)
+                                let _ = (context.engine.peers.reportPeer(peerId: peerId, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, true)
                                 })
                             case let .messages(messageIds):
-                                let _ = (reportPeerMessages(account: context.account, messageIds: messageIds, reason: reportReason, message: message)
+                                let _ = (context.engine.peers.reportPeerMessages(messageIds: messageIds, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, true)
                                 })
                             case let .profilePhoto(peerId, photoId):
-                                let _ = (reportPeerPhoto(account: context.account, peerId: peerId, reason: reportReason, message: message)
+                                let _ = (context.engine.peers.reportPeerPhoto(peerId: peerId, reason: reportReason, message: message)
                                 |> deliverOnMainQueue).start(completed: {
                                     displaySuccess()
                                     completion(nil, true)
diff --git a/submodules/PeerInfoUI/Sources/SecretChatKeyController.swift b/submodules/PeerInfoUI/Sources/SecretChatKeyController.swift
index fb309cd499..a5a15bbc79 100644
--- a/submodules/PeerInfoUI/Sources/SecretChatKeyController.swift
+++ b/submodules/PeerInfoUI/Sources/SecretChatKeyController.swift
@@ -48,6 +48,6 @@ public final class SecretChatKeyController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/PeerInfoUI/Sources/UserInfoController.swift b/submodules/PeerInfoUI/Sources/UserInfoController.swift
index 1c8c012ebc..07faaa9665 100644
--- a/submodules/PeerInfoUI/Sources/UserInfoController.swift
+++ b/submodules/PeerInfoUI/Sources/UserInfoController.swift
@@ -29,744 +29,6 @@ import LocalizedPeerData
 import PhoneNumberFormat
 import TelegramIntents
 
-private final class UserInfoControllerArguments {
-    let context: AccountContext
-    let avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext
-    let updateEditingName: (ItemListAvatarAndNameInfoItemName) -> Void
-    let tapAvatarAction: () -> Void
-    let openChat: () -> Void
-    let addContact: () -> Void
-    let shareContact: () -> Void
-    let shareMyContact: () -> Void
-    let startSecretChat: () -> Void
-    let changeNotificationMuteSettings: () -> Void
-    let openSharedMedia: () -> Void
-    let openGroupsInCommon: () -> Void
-    let updatePeerBlocked: (Bool) -> Void
-    let deleteContact: () -> Void
-    let displayUsernameContextMenu: (String) -> Void
-    let displayCopyContextMenu: (UserInfoEntryTag, String) -> Void
-    let call: () -> Void
-    let openCallMenu: (String) -> Void
-    let requestPhoneNumber: () -> Void
-    let aboutLinkAction: (TextLinkItemActionType, TextLinkItem) -> Void
-    let displayAboutContextMenu: (String) -> Void
-    let openEncryptionKey: (SecretChatKeyFingerprint) -> Void
-    let addBotToGroup: () -> Void
-    let shareBot: () -> Void
-    let botSettings: () -> Void
-    let botHelp: () -> Void
-    let botPrivacy: () -> Void
-    let report: () -> Void
-    
-    init(context: AccountContext, avatarAndNameInfoContext: ItemListAvatarAndNameInfoItemContext, updateEditingName: @escaping (ItemListAvatarAndNameInfoItemName) -> Void, tapAvatarAction: @escaping () -> Void, openChat: @escaping () -> Void, addContact: @escaping () -> Void, shareContact: @escaping () -> Void, shareMyContact: @escaping () -> Void, startSecretChat: @escaping () -> Void, changeNotificationMuteSettings: @escaping () -> Void, openSharedMedia: @escaping () -> Void, openGroupsInCommon: @escaping () -> Void, updatePeerBlocked: @escaping (Bool) -> Void, deleteContact: @escaping () -> Void, displayUsernameContextMenu: @escaping (String) -> Void, displayCopyContextMenu: @escaping (UserInfoEntryTag, String) -> Void, call: @escaping () -> Void, openCallMenu: @escaping (String) -> Void, requestPhoneNumber: @escaping () -> Void, aboutLinkAction: @escaping (TextLinkItemActionType, TextLinkItem) -> Void, displayAboutContextMenu: @escaping (String) -> Void, openEncryptionKey: @escaping (SecretChatKeyFingerprint) -> Void, addBotToGroup: @escaping () -> Void, shareBot: @escaping () -> Void, botSettings: @escaping () -> Void, botHelp: @escaping () -> Void, botPrivacy: @escaping () -> Void, report: @escaping () -> Void) {
-        self.context = context
-        self.avatarAndNameInfoContext = avatarAndNameInfoContext
-        self.updateEditingName = updateEditingName
-        self.tapAvatarAction = tapAvatarAction
-        self.openChat = openChat
-        self.addContact = addContact
-        
-        self.shareContact = shareContact
-        self.shareMyContact = shareMyContact
-        self.startSecretChat = startSecretChat
-        self.changeNotificationMuteSettings = changeNotificationMuteSettings
-        self.openSharedMedia = openSharedMedia
-        self.openGroupsInCommon = openGroupsInCommon
-        self.updatePeerBlocked = updatePeerBlocked
-        self.deleteContact = deleteContact
-        self.displayUsernameContextMenu = displayUsernameContextMenu
-        self.displayCopyContextMenu = displayCopyContextMenu
-        self.call = call
-        self.openCallMenu = openCallMenu
-        self.requestPhoneNumber = requestPhoneNumber
-        self.aboutLinkAction = aboutLinkAction
-        self.displayAboutContextMenu = displayAboutContextMenu
-        self.openEncryptionKey = openEncryptionKey
-        self.addBotToGroup = addBotToGroup
-        self.shareBot = shareBot
-        self.botSettings = botSettings
-        self.botHelp = botHelp
-        self.botPrivacy = botPrivacy
-        self.report = report
-    }
-}
-
-private enum UserInfoSection: ItemListSectionId {
-    case info
-    case actions
-    case sharedMediaAndNotifications
-    case bot
-    case block
-}
-
-private enum UserInfoEntryTag {
-    case about
-    case phoneNumber
-    case username
-}
-
-private func areMessagesEqual(_ lhsMessage: Message, _ rhsMessage: Message) -> Bool {
-    if lhsMessage.stableVersion != rhsMessage.stableVersion {
-        return false
-    }
-    if lhsMessage.id != rhsMessage.id || lhsMessage.flags != rhsMessage.flags {
-        return false
-    }
-    return true
-}
-
-private enum UserInfoEntry: ItemListNodeEntry {
-    case info(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, peer: Peer?, presence: PeerPresence?, cachedData: CachedPeerData?, state: ItemListAvatarAndNameInfoItemState, displayCall: Bool)
-    case calls(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, messages: [Message])
-    case about(PresentationTheme, Peer, String, String)
-    case phoneNumber(PresentationTheme, Int, String, String, Bool)
-    case requestPhoneNumber(PresentationTheme, String, String)
-    case userName(PresentationTheme, String, String)
-    case sendMessage(PresentationTheme, String)
-    case addContact(PresentationTheme, String)
-    case shareContact(PresentationTheme, String)
-    case shareMyContact(PresentationTheme, String)
-    case startSecretChat(PresentationTheme, String)
-    case sharedMedia(PresentationTheme, String)
-    case notifications(PresentationTheme, String, String)
-    case groupsInCommon(PresentationTheme, String, String)
-    case secretEncryptionKey(PresentationTheme, String, SecretChatKeyFingerprint)
-    case botAddToGroup(PresentationTheme, String)
-    case botShare(PresentationTheme, String)
-    case botSettings(PresentationTheme, String)
-    case botHelp(PresentationTheme, String)
-    case botPrivacy(PresentationTheme, String)
-    case botReport(PresentationTheme, String)
-    case block(PresentationTheme, String, DestructiveUserInfoAction)
-    
-    var section: ItemListSectionId {
-        switch self {
-            case .info, .calls, .about, .phoneNumber, .requestPhoneNumber, .userName:
-                return UserInfoSection.info.rawValue
-            case .sendMessage, .addContact, .shareContact, .shareMyContact, .startSecretChat, .botAddToGroup, .botShare:
-                return UserInfoSection.actions.rawValue
-            case .botSettings, .botHelp, .botPrivacy:
-                return UserInfoSection.bot.rawValue
-            case .sharedMedia, .notifications, .groupsInCommon, .secretEncryptionKey:
-                return UserInfoSection.sharedMediaAndNotifications.rawValue
-            case .botReport, .block:
-                return UserInfoSection.block.rawValue
-        }
-    }
-    
-    var stableId: Int {
-        return self.sortIndex
-    }
-    
-    static func ==(lhs: UserInfoEntry, rhs: UserInfoEntry) -> Bool {
-        switch lhs {
-            case let .info(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsPeer, lhsPresence, lhsCachedData, lhsState, lhsDisplayCall):
-                switch rhs {
-                    case let .info(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsPeer, rhsPresence, rhsCachedData, rhsState, rhsDisplayCall):
-                        if lhsTheme !== rhsTheme {
-                            return false
-                        }
-                        if lhsStrings !== rhsStrings {
-                            return false
-                        }
-                        if lhsDateTimeFormat != rhsDateTimeFormat {
-                            return false
-                        }
-                        if let lhsPeer = lhsPeer, let rhsPeer = rhsPeer {
-                            if !lhsPeer.isEqual(rhsPeer) {
-                                return false
-                            }
-                        } else if (lhsPeer != nil) != (rhsPeer != nil) {
-                            return false
-                        }
-                        if let lhsPresence = lhsPresence, let rhsPresence = rhsPresence {
-                            if !lhsPresence.isEqual(to: rhsPresence) {
-                                return false
-                            }
-                        } else if (lhsPresence != nil) != (rhsPresence != nil) {
-                            return false
-                        }
-                        if let lhsCachedData = lhsCachedData, let rhsCachedData = rhsCachedData {
-                            if !lhsCachedData.isEqual(to: rhsCachedData) {
-                                return false
-                            }
-                        } else if (lhsCachedData != nil) != (rhsCachedData != nil) {
-                            return false
-                        }
-                        if lhsState != rhsState {
-                            return false
-                        }
-                        if lhsDisplayCall != rhsDisplayCall {
-                            return false
-                        }
-                        return true
-                    default:
-                        return false
-                }
-            case let .calls(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsMessages):
-                if case let .calls(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsMessages) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat {
-                    if lhsMessages.count != rhsMessages.count {
-                        return false
-                    }
-                    for i in 0 ..< lhsMessages.count {
-                        if !areMessagesEqual(lhsMessages[i], rhsMessages[i]) {
-                            return false
-                        }
-                    }
-                    return true
-                } else {
-                    return false
-                }
-            case let .about(lhsTheme, lhsPeer, lhsText, lhsValue):
-                if case let .about(rhsTheme, rhsPeer, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsPeer.isEqual(rhsPeer), lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .phoneNumber(lhsTheme, lhsIndex, lhsLabel, lhsValue, lhsMain):
-                if case let .phoneNumber(rhsTheme, rhsIndex, rhsLabel, rhsValue, rhsMain) = rhs, lhsTheme === rhsTheme, lhsIndex == rhsIndex, lhsLabel == rhsLabel, lhsValue == rhsValue, lhsMain == rhsMain {
-                    return true
-                } else {
-                    return false
-                }
-            case let .requestPhoneNumber(lhsTheme, lhsLabel, lhsValue):
-                if case let .requestPhoneNumber(rhsTheme, rhsLabel, rhsValue) = rhs, lhsTheme === rhsTheme, lhsLabel == rhsLabel, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .userName(lhsTheme, lhsText, lhsValue):
-                if case let .userName(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .sendMessage(lhsTheme, lhsText):
-                if case let .sendMessage(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .addContact(lhsTheme, lhsText):
-                if case let .addContact(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .shareContact(lhsTheme, lhsText):
-                if case let .shareContact(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .shareMyContact(lhsTheme, lhsText):
-                if case let .shareMyContact(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .startSecretChat(lhsTheme, lhsText):
-                if case let .startSecretChat(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .sharedMedia(lhsTheme, lhsText):
-                if case let .sharedMedia(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .notifications(lhsTheme, lhsText, lhsValue):
-                if case let .notifications(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .groupsInCommon(lhsTheme, lhsText, lhsValue):
-                if case let .groupsInCommon(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .secretEncryptionKey(lhsTheme, lhsText, lhsValue):
-                if case let .secretEncryptionKey(rhsTheme, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsValue == rhsValue {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botAddToGroup(lhsTheme, lhsText):
-                if case let .botAddToGroup(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botShare(lhsTheme, lhsText):
-                if case let .botShare(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botSettings(lhsTheme, lhsText):
-                if case let .botSettings(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botHelp(lhsTheme, lhsText):
-                if case let .botHelp(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botPrivacy(lhsTheme, lhsText):
-                if case let .botPrivacy(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .botReport(lhsTheme, lhsText):
-                if case let .botReport(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .block(lhsTheme, lhsText, lhsAction):
-                if case let .block(rhsTheme, rhsText, rhsAction) = rhs, lhsTheme === rhsTheme, lhsText == rhsText, lhsAction == rhsAction {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-    
-    private var sortIndex: Int {
-        switch self {
-            case .info:
-                return 0
-            case .calls:
-                return 1
-            case let .phoneNumber(_, index, _, _, _):
-                return 2 + index
-            case .requestPhoneNumber:
-                return 998
-            case .about:
-                return 999
-            case .userName:
-                return 1000
-            case .sendMessage:
-                return 1001
-            case .addContact:
-                return 1002
-            case .shareContact:
-                return 1003
-            case .shareMyContact:
-                return 1004
-            case .startSecretChat:
-                return 1005
-            case .botAddToGroup:
-                return 1006
-            case .botShare:
-                return 1007
-            case .botSettings:
-                return 1008
-            case .botHelp:
-                return 1009
-            case .botPrivacy:
-                return 1010
-            case .sharedMedia:
-                return 1011
-            case .notifications:
-                return 1012
-            case .secretEncryptionKey:
-                return 1014
-            case .groupsInCommon:
-                return 1015
-            case .botReport:
-                return 1016
-            case .block:
-                return 1017
-        }
-    }
-    
-    static func <(lhs: UserInfoEntry, rhs: UserInfoEntry) -> Bool {
-        return lhs.sortIndex < rhs.sortIndex
-    }
-    
-    func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
-        let arguments = arguments as! UserInfoControllerArguments
-        switch self {
-            case let .info(theme, strings, dateTimeFormat, peer, presence, cachedData, state, displayCall):
-                return ItemListAvatarAndNameInfoItem(accountContext: arguments.context, presentationData: presentationData, dateTimeFormat: dateTimeFormat, mode: .generic, peer: peer, presence: presence, cachedData: cachedData, state: state, sectionId: self.section, style: .plain, editingNameUpdated: { editingName in
-                    arguments.updateEditingName(editingName)
-                }, avatarTapped: {
-                    arguments.tapAvatarAction()
-                }, context: arguments.avatarAndNameInfoContext, call: displayCall ? {
-                    arguments.call()
-                } : nil)
-            case let .calls(theme, strings, dateTimeFormat, messages):
-                return ItemListCallListItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, messages: messages, sectionId: self.section, style: .plain)
-            case let .about(theme, peer, text, value):
-                var enabledEntityTypes: EnabledEntityTypes = []
-                if let peer = peer as? TelegramUser, let _ = peer.botInfo {
-                    enabledEntityTypes = [.allUrl, .mention, .hashtag]
-                }
-                return ItemListTextWithLabelItem(presentationData: presentationData, label: text, text: foldMultipleLineBreaks(value), enabledEntityTypes: enabledEntityTypes, multiline: true, sectionId: self.section, action: nil, longTapAction: {
-                    arguments.displayAboutContextMenu(value)
-                }, linkItemAction: { action, itemLink in
-                    arguments.aboutLinkAction(action, itemLink)
-                }, tag: UserInfoEntryTag.about)
-            case let .phoneNumber(theme, _, label, value, isMain):
-                return ItemListTextWithLabelItem(presentationData: presentationData, label: label, text: value, textColor: isMain ? .highlighted : .accent, enabledEntityTypes: [], multiline: false, sectionId: self.section, action: {
-                    arguments.openCallMenu(value)
-                }, longTapAction: {
-                    arguments.displayCopyContextMenu(.phoneNumber, value)
-                }, tag: UserInfoEntryTag.phoneNumber)
-            case let .requestPhoneNumber(theme, label, value):
-                return ItemListTextWithLabelItem(presentationData: presentationData, label: label, text: value, textColor: .accent, enabledEntityTypes: [], multiline: false, sectionId: self.section, action: {
-                    arguments.requestPhoneNumber()
-                })
-            case let .userName(theme, text, value):
-                return ItemListTextWithLabelItem(presentationData: presentationData, label: text, text: "@\(value)", textColor: .accent, enabledEntityTypes: [], multiline: false, sectionId: self.section, action: {
-                    arguments.displayUsernameContextMenu("@\(value)")
-                }, longTapAction: {
-                    arguments.displayCopyContextMenu(.username, "@\(value)")
-                }, tag: UserInfoEntryTag.username)
-            case let .sendMessage(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.openChat()
-                })
-            case let .addContact(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.addContact()
-                })
-            case let .shareContact(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.shareContact()
-                })
-            case let .shareMyContact(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.shareMyContact()
-                })
-            case let .startSecretChat(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.startSecretChat()
-                })
-            case let .sharedMedia(theme, text):
-                return ItemListDisclosureItem(presentationData: presentationData, title: text, label: "", sectionId: self.section, style: .plain, action: {
-                    arguments.openSharedMedia()
-                })
-            case let .notifications(theme, text, value):
-                return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .plain, action: {
-                    arguments.changeNotificationMuteSettings()
-                })
-            case let .groupsInCommon(theme, text, value):
-                return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .plain, action: {
-                    arguments.openGroupsInCommon()
-                })
-            case let .secretEncryptionKey(theme, text, fingerprint):
-                return ItemListSecretChatKeyItem(presentationData: presentationData, title: text, fingerprint: fingerprint, sectionId: self.section, style: .plain, action: {
-                    arguments.openEncryptionKey(fingerprint)
-                })
-            case let .botAddToGroup(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.addBotToGroup()
-                })
-            case let .botShare(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.shareBot()
-            })
-            case let .botSettings(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.botSettings()
-                })
-            case let .botHelp(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.botHelp()
-                })
-            case let .botPrivacy(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.botPrivacy()
-                })
-            case let .botReport(theme, text):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    arguments.report()
-                })
-            case let .block(theme, text, action):
-                return ItemListActionItem(presentationData: presentationData, title: text, kind: .destructive, alignment: .natural, sectionId: self.section, style: .plain, action: {
-                    switch action {
-                        case .block:
-                            arguments.updatePeerBlocked(true)
-                        case .unblock:
-                            arguments.updatePeerBlocked(false)
-                        case .removeContact:
-                            arguments.deleteContact()
-                    }
-                })
-        }
-    }
-}
-
-private enum DestructiveUserInfoAction {
-    case block
-    case removeContact
-    case unblock
-}
-
-private struct UserInfoEditingState: Equatable {
-    let editingName: ItemListAvatarAndNameInfoItemName?
-    
-    static func ==(lhs: UserInfoEditingState, rhs: UserInfoEditingState) -> Bool {
-        if lhs.editingName != rhs.editingName {
-            return false
-        }
-        return true
-    }
-}
-
-private struct UserInfoState: Equatable {
-    let savingData: Bool
-    let editingState: UserInfoEditingState?
-    
-    init() {
-        self.savingData = false
-        self.editingState = nil
-    }
-    
-    init(savingData: Bool, editingState: UserInfoEditingState?) {
-        self.savingData = savingData
-        self.editingState = editingState
-    }
-    
-    static func ==(lhs: UserInfoState, rhs: UserInfoState) -> Bool {
-        if lhs.savingData != rhs.savingData {
-            return false
-        }
-        if lhs.editingState != rhs.editingState {
-            return false
-        }
-        return true
-    }
-    
-    func withUpdatedSavingData(_ savingData: Bool) -> UserInfoState {
-        return UserInfoState(savingData: savingData, editingState: self.editingState)
-    }
-    
-    func withUpdatedEditingState(_ editingState: UserInfoEditingState?) -> UserInfoState {
-        return UserInfoState(savingData: self.savingData, editingState: editingState)
-    }
-}
-
-private func stringForBlockAction(strings: PresentationStrings, action: DestructiveUserInfoAction, peer: Peer) -> String {
-    switch action {
-        case .block:
-            if let user = peer as? TelegramUser, user.botInfo != nil {
-                return strings.Bot_Stop
-            } else {
-                return strings.Conversation_BlockUser
-            }
-        case .unblock:
-            if let user = peer as? TelegramUser, user.botInfo != nil {
-                return strings.Bot_Unblock
-            } else {
-                return strings.Conversation_UnblockUser
-            }
-        case .removeContact:
-            return strings.UserInfo_DeleteContact
-    }
-}
-
-private func userInfoEntries(account: Account, presentationData: PresentationData, view: PeerView, cachedPeerData: CachedPeerData?, deviceContacts: [(DeviceContactStableId, DeviceContactBasicData)], mode: PeerInfoControllerMode, state: UserInfoState, peerChatState: PostboxCoding?, globalNotificationSettings: GlobalNotificationSettings) -> [UserInfoEntry] {
-    var entries: [UserInfoEntry] = []
-    
-    guard let peer = view.peers[view.peerId], let user = peerViewMainPeer(view) as? TelegramUser else {
-        return []
-    }
-    
-    var editingName: ItemListAvatarAndNameInfoItemName?
-    
-    var isEditing = false
-    if let editingState = state.editingState {
-        isEditing = true
-        
-        if view.peerIsContact {
-            editingName = editingState.editingName
-        }
-    }
-    
-    var callsAvailable = true
-    if let cachedUserData = cachedPeerData as? CachedUserData {
-        callsAvailable = cachedUserData.voiceCallsAvailable
-    }
-    
-    entries.append(UserInfoEntry.info(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer: user, presence: view.peerPresences[user.id], cachedData: cachedPeerData, state: ItemListAvatarAndNameInfoItemState(editingName: editingName, updatingName: nil), displayCall: user.botInfo == nil && callsAvailable))
-    
-    if case let .calls(messages) = mode, !isEditing {
-        entries.append(UserInfoEntry.calls(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, messages: messages))
-    }
-    
-    if let phoneNumber = user.phone, !phoneNumber.isEmpty {
-        let formattedNumber = formatPhoneNumber(phoneNumber)
-        let normalizedNumber = DeviceContactNormalizedPhoneNumber(rawValue: formattedNumber)
-        
-        var index = 0
-        var found = false
-        
-        var existingNumbers = Set<DeviceContactNormalizedPhoneNumber>()
-        var phoneNumbers: [(String, DeviceContactNormalizedPhoneNumber, Bool)] = []
-        
-        for (_, contact) in deviceContacts {
-            inner: for number in contact.phoneNumbers {
-                var isMain = false
-                let normalizedContactNumber = DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(number.value))
-                if !existingNumbers.contains(normalizedContactNumber) {
-                    existingNumbers.insert(normalizedContactNumber)
-                } else {
-                    continue inner
-                }
-                if normalizedContactNumber == normalizedNumber {
-                    found = true
-                    isMain = true
-                }
-                
-                phoneNumbers.append((number.label, normalizedContactNumber, isMain))
-            }
-        }
-        if !found {
-            entries.append(UserInfoEntry.phoneNumber(presentationData.theme, index, presentationData.strings.ContactInfo_PhoneLabelMobile, formattedNumber, false))
-            index += 1
-        } else {
-            for (label, number, isMain) in phoneNumbers {
-                entries.append(UserInfoEntry.phoneNumber(presentationData.theme, index, localizedPhoneNumberLabel(label: label, strings: presentationData.strings), number.rawValue, isMain && phoneNumbers.count != 1))
-                index += 1
-            }
-        }
-    } else {
-        //entries.append(UserInfoEntry.requestPhoneNumber(presentationData.theme, "phone", "Request Number"))
-    }
-    
-    let aboutTitle: String
-    if let _ = user.botInfo {
-        aboutTitle = presentationData.strings.Profile_BotInfo
-    } else {
-        aboutTitle = presentationData.strings.Profile_About
-    }
-    if user.isFake {
-        let aboutValue: String
-        if let _ = user.botInfo {
-            aboutValue = presentationData.strings.UserInfo_FakeBotWarning
-        } else {
-            aboutValue = presentationData.strings.UserInfo_FakeUserWarning
-        }
-        entries.append(UserInfoEntry.about(presentationData.theme, peer, aboutTitle, aboutValue))
-    } else if user.isScam {
-        let aboutValue: String
-        if let _ = user.botInfo {
-            aboutValue = presentationData.strings.UserInfo_ScamBotWarning
-        } else {
-            aboutValue = presentationData.strings.UserInfo_ScamUserWarning
-        }
-        entries.append(UserInfoEntry.about(presentationData.theme, peer, aboutTitle, aboutValue))
-    } else if let cachedUserData = cachedPeerData as? CachedUserData, let about = cachedUserData.about, !about.isEmpty {
-        entries.append(UserInfoEntry.about(presentationData.theme, peer, aboutTitle, about))
-    }
-    
-    if !isEditing {
-        if let username = user.username, !username.isEmpty {
-            entries.append(UserInfoEntry.userName(presentationData.theme, presentationData.strings.Profile_Username, username))
-        }
-        
-        if !(peer is TelegramSecretChat) {
-            entries.append(UserInfoEntry.sendMessage(presentationData.theme, presentationData.strings.UserInfo_SendMessage))
-        }
-        
-        if user.botInfo == nil {
-            if view.peerIsContact {
-                if let phone = user.phone, !phone.isEmpty {
-                    entries.append(UserInfoEntry.shareContact(presentationData.theme, presentationData.strings.UserInfo_ShareContact))
-                }
-            } else {
-                entries.append(UserInfoEntry.addContact(presentationData.theme, presentationData.strings.Conversation_AddToContacts))
-            }
-        }
-            
-        if let cachedUserData = cachedPeerData as? CachedUserData, let peerStatusSettings = cachedUserData.peerStatusSettings, peerStatusSettings.contains(.canShareContact) {
-            entries.append(UserInfoEntry.shareMyContact(presentationData.theme, presentationData.strings.UserInfo_ShareMyContactInfo))
-        }
-        
-        if let peer = peer as? TelegramUser, peer.botInfo == nil {
-            entries.append(UserInfoEntry.startSecretChat(presentationData.theme, presentationData.strings.UserInfo_StartSecretChat))
-        }
-        
-        if let peer = peer as? TelegramUser, let botInfo = peer.botInfo {
-            if botInfo.flags.contains(.worksWithGroups) {
-                entries.append(UserInfoEntry.botAddToGroup(presentationData.theme, presentationData.strings.UserInfo_InviteBotToGroup))
-            }
-            entries.append(UserInfoEntry.botShare(presentationData.theme, presentationData.strings.UserInfo_ShareBot))
-            
-            if let cachedUserData = cachedPeerData as? CachedUserData, let botInfo = cachedUserData.botInfo {
-                for command in botInfo.commands {
-                    if command.text == "settings" {
-                        entries.append(UserInfoEntry.botSettings(presentationData.theme, presentationData.strings.UserInfo_BotSettings))
-                    } else if command.text == "help" {
-                        entries.append(UserInfoEntry.botHelp(presentationData.theme, presentationData.strings.UserInfo_BotHelp))
-                    } else if command.text == "privacy" {
-                        entries.append(UserInfoEntry.botPrivacy(presentationData.theme, presentationData.strings.UserInfo_BotPrivacy))
-                    }
-                }
-            }
-        }
-        
-        entries.append(UserInfoEntry.sharedMedia(presentationData.theme, presentationData.strings.GroupInfo_SharedMedia))
-    }
-    let notificationsLabel: String
-    let notificationSettings = view.notificationSettings as? TelegramPeerNotificationSettings ?? TelegramPeerNotificationSettings.defaultSettings
-    if case let .muted(until) = notificationSettings.muteState, until >= Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970) {
-        if until < Int32.max - 1 {
-            notificationsLabel = stringForRemainingMuteInterval(strings: presentationData.strings, muteInterval: until)
-        } else {
-            notificationsLabel = presentationData.strings.UserInfo_NotificationsDisabled
-        }
-    } else if case .default = notificationSettings.messageSound {
-        notificationsLabel = presentationData.strings.UserInfo_NotificationsEnabled
-    } else {
-        notificationsLabel = localizedPeerNotificationSoundString(strings: presentationData.strings, sound: notificationSettings.messageSound, default: globalNotificationSettings.effective.channels.sound)
-    }
-    entries.append(UserInfoEntry.notifications(presentationData.theme, presentationData.strings.GroupInfo_Notifications, notificationsLabel))
-    
-    if isEditing {
-        if view.peerIsContact {
-            entries.append(UserInfoEntry.block(presentationData.theme, stringForBlockAction(strings: presentationData.strings, action: .removeContact, peer: user), .removeContact))
-        }
-    } else {
-        if peer is TelegramSecretChat, let peerChatState = peerChatState as? SecretChatKeyState, let keyFingerprint = peerChatState.keyFingerprint {
-            entries.append(UserInfoEntry.secretEncryptionKey(presentationData.theme, presentationData.strings.Profile_EncryptionKey, keyFingerprint))
-        }
-        
-        if let groupsInCommon = (cachedPeerData as? CachedUserData)?.commonGroupCount, groupsInCommon != 0 {
-            entries.append(UserInfoEntry.groupsInCommon(presentationData.theme, presentationData.strings.UserInfo_GroupsInCommon, presentationStringsFormattedNumber(groupsInCommon, presentationData.dateTimeFormat.groupingSeparator)))
-        }
-        
-        if let peer = peer as? TelegramUser, let _ = peer.botInfo {
-            entries.append(UserInfoEntry.botReport(presentationData.theme, presentationData.strings.ReportPeer_Report))
-        }
-        
-        if let cachedData = cachedPeerData as? CachedUserData {
-            if cachedData.isBlocked {
-                entries.append(UserInfoEntry.block(presentationData.theme, stringForBlockAction(strings: presentationData.strings, action: .unblock, peer: user), .unblock))
-            } else {
-                if let peer = peer as? TelegramUser, peer.flags.contains(.isSupport) {
-                } else {
-                    entries.append(UserInfoEntry.block(presentationData.theme, stringForBlockAction(strings: presentationData.strings, action: .block, peer: user), .block))
-                }
-            }
-        }
-    }
-    
-    return entries
-}
-
 private func getUserPeer(postbox: Postbox, peerId: PeerId) -> Signal<(Peer?, CachedPeerData?), NoError> {
     return postbox.transaction { transaction -> (Peer?, CachedPeerData?) in
         guard let peer = transaction.getPeer(peerId) else {
@@ -805,803 +67,3 @@ public func openAddPersonContactImpl(context: AccountContext, peerId: PeerId, pu
         }), completed: nil, cancelled: nil))
     })
 }
-
-public func userInfoController(context: AccountContext, peerId: PeerId, mode: PeerInfoControllerMode = .generic) -> ViewController {
-    let statePromise = ValuePromise(UserInfoState(), ignoreRepeated: true)
-    let stateValue = Atomic(value: UserInfoState())
-    let updateState: ((UserInfoState) -> UserInfoState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
-    }
-    
-    var pushControllerImpl: ((ViewController) -> Void)?
-    var presentControllerImpl: ((ViewController, Any?) -> Void)?
-    var openChatImpl: (() -> Void)?
-    var shareContactImpl: (() -> Void)?
-    var shareMyContactImpl: (() -> Void)?
-    var startSecretChatImpl: (() -> Void)?
-    var botAddToGroupImpl: (() -> Void)?
-    var shareBotImpl: (() -> Void)?
-    var dismissInputImpl: (() -> Void)?
-    var dismissImpl: (() -> Void)?
-    
-    let actionsDisposable = DisposableSet()
-    
-    let updatePeerNameDisposable = MetaDisposable()
-    actionsDisposable.add(updatePeerNameDisposable)
-    
-    let updatePeerBlockedDisposable = MetaDisposable()
-    actionsDisposable.add(updatePeerBlockedDisposable)
-    
-    let changeMuteSettingsDisposable = MetaDisposable()
-    actionsDisposable.add(changeMuteSettingsDisposable)
-    
-    let hiddenAvatarRepresentationDisposable = MetaDisposable()
-    actionsDisposable.add(hiddenAvatarRepresentationDisposable)
-    
-    let createSecretChatDisposable = MetaDisposable()
-    actionsDisposable.add(createSecretChatDisposable)
-    
-    let navigateDisposable = MetaDisposable()
-    actionsDisposable.add(navigateDisposable)
-    
-    var avatarGalleryTransitionArguments: ((AvatarGalleryEntry) -> GalleryTransitionArguments?)?
-    let avatarAndNameInfoContext = ItemListAvatarAndNameInfoItemContext()
-    var updateHiddenAvatarImpl: (() -> Void)?
-    
-    var aboutLinkActionImpl: ((TextLinkItemActionType, TextLinkItem) -> Void)?
-    var displayAboutContextMenuImpl: ((String) -> Void)?
-    var displayCopyContextMenuImpl: ((UserInfoEntryTag, String) -> Void)?
-    var popToRootImpl: (() -> Void)?
-    
-    let cachedAvatarEntries = Atomic<Promise<[AvatarGalleryEntry]>?>(value: nil)
-    
-    let peerView = Promise<(PeerView, CachedPeerData?)>()
-    peerView.set(context.account.viewTracker.peerView(peerId, updateData: true) |> mapToSignal({ view -> Signal<(PeerView, CachedPeerData?), NoError> in
-        if peerId.namespace == Namespaces.Peer.SecretChat {
-            if let peer = peerViewMainPeer(view) {
-                return context.account.viewTracker.peerView(peer.id) |> map({ secretChatView -> (PeerView, CachedPeerData?) in
-                    return (view, secretChatView.cachedData)
-                })
-            }
-        }
-        return .single((view, view.cachedData))
-    }))
-    
-    let requestCallImpl: (Bool) -> Void = { isVideo in
-        let _ = (peerView.get()
-            |> take(1)
-            |> deliverOnMainQueue).start(next: { view in
-            guard let peer = peerViewMainPeer(view.0) else {
-                return
-            }
-            
-            if let cachedUserData = view.1 as? CachedUserData, cachedUserData.callsPrivate {
-                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.Call_ConnectionErrorTitle, text: presentationData.strings.Call_PrivacyErrorMessage(peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
-                return
-            }
-                
-            context.requestCall(peerId: peer.id, isVideo: isVideo, completion: {})
-        })
-    }
-    
-    let arguments = UserInfoControllerArguments(context: context, avatarAndNameInfoContext: avatarAndNameInfoContext, updateEditingName: { editingName in
-        updateState { state in
-            if let _ = state.editingState {
-                return state.withUpdatedEditingState(UserInfoEditingState(editingName: editingName))
-            } else {
-                return state
-            }
-        }
-    }, tapAvatarAction: {
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId) |> deliverOnMainQueue).start(next: { peer, _ in
-            guard let peer = peer else {
-                return
-            }
-            
-            if peer.profileImageRepresentations.isEmpty {
-                return
-            }
-            
-            let galleryController = AvatarGalleryController(context: context, peer: peer, remoteEntries: cachedAvatarEntries.with { $0 }, replaceRootController: { controller, ready in
-            })
-            hiddenAvatarRepresentationDisposable.set((galleryController.hiddenMedia |> deliverOnMainQueue).start(next: { entry in
-                avatarAndNameInfoContext.hiddenAvatarRepresentation = entry?.representations.first?.representation
-                updateHiddenAvatarImpl?()
-            }))
-            presentControllerImpl?(galleryController, AvatarGalleryControllerPresentationArguments(transitionArguments: { entry in
-                return avatarGalleryTransitionArguments?(entry)
-            }))
-        })
-    }, openChat: {
-        openChatImpl?()
-    }, addContact: {
-        openAddPersonContactImpl(context: context, peerId: peerId, pushController: { c in
-            pushControllerImpl?(c)
-        }, present: { c, a in
-            presentControllerImpl?(c, a)
-        })
-    }, shareContact: {
-        shareContactImpl?()
-    }, shareMyContact: {
-        shareMyContactImpl?()
-    }, startSecretChat: {
-        startSecretChatImpl?()
-    }, changeNotificationMuteSettings: {
-        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        let _ = (context.account.postbox.transaction { transaction -> (TelegramPeerNotificationSettings, GlobalNotificationSettings) in
-            let peerSettings: TelegramPeerNotificationSettings = (transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings) ?? TelegramPeerNotificationSettings.defaultSettings
-            let globalSettings: GlobalNotificationSettings = (transaction.getPreferencesEntry(key: PreferencesKeys.globalNotifications) as? GlobalNotificationSettings) ?? GlobalNotificationSettings.defaultSettings
-            return (peerSettings, globalSettings)
-            }
-            |> deliverOnMainQueue).start(next: { peerSettings, globalSettings in
-                let soundSettings: NotificationSoundSettings?
-                if case .default = peerSettings.messageSound {
-                    soundSettings = NotificationSoundSettings(value: nil)
-                } else {
-                    soundSettings = NotificationSoundSettings(value: peerSettings.messageSound)
-                }
-                let controller = notificationMuteSettingsController(presentationData: presentationData, notificationSettings: globalSettings.effective.groupChats, soundSettings: soundSettings, openSoundSettings: {
-                    let controller = notificationSoundSelectionController(context: context, isModal: true, currentSound: peerSettings.messageSound, defaultSound: globalSettings.effective.groupChats.sound, completion: { sound in
-                        let _ = updatePeerNotificationSoundInteractive(account: context.account, peerId: peerId, sound: sound).start()
-                    })
-                    presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-                }, updateSettings: { value in
-                    changeMuteSettingsDisposable.set(updatePeerMuteSetting(account: context.account, peerId: peerId, muteInterval: value).start())
-                })
-                presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-            })
-    }, openSharedMedia: {
-        if let controller = context.sharedContext.makePeerSharedMediaController(context: context, peerId: peerId) {
-            pushControllerImpl?(controller)
-        }
-    }, openGroupsInCommon: {
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-            |> take(1)
-            |> deliverOnMainQueue).start(next: { peer, _ in
-                guard let peer = peer else {
-                    return
-                }
-                
-                pushControllerImpl?(groupsInCommonController(context: context, peerId: peer.id))
-        })
-    }, updatePeerBlocked: { value in
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-        |> take(1)
-        |> deliverOnMainQueue).start(next: { peer, _ in
-            guard let peer = peer else {
-                return
-            }
-            
-            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-            if let peer = peer as? TelegramUser, let _ = peer.botInfo {
-                updatePeerBlockedDisposable.set(requestUpdatePeerIsBlocked(account: context.account, peerId: peer.id, isBlocked: value).start())
-                if !value {
-                    let _ = enqueueMessages(account: context.account, peerId: peer.id, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
-                    openChatImpl?()
-                }
-            } else {
-                if value {
-                    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                    let controller = ActionSheetController(presentationData: presentationData)
-                    let dismissAction: () -> Void = { [weak controller] in
-                        controller?.dismissAnimated()
-                    }
-                    var reportSpam = false
-                    var deleteChat = false
-                    controller.setItemGroups([
-                        ActionSheetItemGroup(items: [
-                            ActionSheetTextItem(title: presentationData.strings.UserInfo_BlockConfirmationTitle(peer.compactDisplayTitle).0),
-                            /*ActionSheetCheckboxItem(title: presentationData.strings.Conversation_Moderate_Report, label: "", value: reportSpam, action: { [weak controller] checkValue in
-                                reportSpam = checkValue
-                                controller?.updateItem(groupIndex: 0, itemIndex: 1, { item in
-                                    if let item = item as? ActionSheetCheckboxItem {
-                                        return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action)
-                                    }
-                                    return item
-                                })
-                            }),
-                            ActionSheetCheckboxItem(title: presentationData.strings.ReportSpam_DeleteThisChat, label: "", value: deleteChat, action: { [weak controller] checkValue in
-                                deleteChat = checkValue
-                                controller?.updateItem(groupIndex: 0, itemIndex: 2, { item in
-                                    if let item = item as? ActionSheetCheckboxItem {
-                                        return ActionSheetCheckboxItem(title: item.title, label: item.label, value: !item.value, action: item.action)
-                                    }
-                                    return item
-                                })
-                            }),*/
-                            ActionSheetButtonItem(title: presentationData.strings.UserInfo_BlockActionTitle(peer.compactDisplayTitle).0, color: .destructive, action: {
-                                dismissAction()
-                                updatePeerBlockedDisposable.set(requestUpdatePeerIsBlocked(account: context.account, peerId: peer.id, isBlocked: true).start())
-                                if deleteChat {
-                                    let _ = removePeerChat(account: context.account, peerId: peerId, reportChatSpam: reportSpam).start()
-                                    popToRootImpl?()
-                                } else if reportSpam {
-                                    let _ = reportPeer(account: context.account, peerId: peerId, reason: .spam, message: "").start()
-                                }
-                                
-                                deleteSendMessageIntents(peerId: peerId)
-                            })
-                        ]),
-                        ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })])
-                    ])
-                    presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-                } else {
-                    let text: String
-                    if value {
-                        text = presentationData.strings.UserInfo_BlockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0
-                    } else {
-                        text = presentationData.strings.UserInfo_UnblockConfirmation(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)).0
-                    }
-                    presentControllerImpl?(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_No, action: {}), TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Yes, action: {
-                        updatePeerBlockedDisposable.set(requestUpdatePeerIsBlocked(account: context.account, peerId: peer.id, isBlocked: value).start())
-                    })]), nil)
-                }
-            }
-        })
-    }, deleteContact: {
-        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        let controller = ActionSheetController(presentationData: presentationData)
-        let dismissAction: () -> Void = { [weak controller] in
-            controller?.dismissAnimated()
-        }
-        controller.setItemGroups([
-            ActionSheetItemGroup(items: [
-                ActionSheetButtonItem(title: presentationData.strings.UserInfo_DeleteContact, color: .destructive, action: {
-                    dismissAction()
-                    let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-                    |> deliverOnMainQueue).start(next: { peer, _ in
-                        guard let peer = peer else {
-                            return
-                        }
-                        let deleteContactFromDevice: Signal<Never, NoError>
-                        if let contactDataManager = context.sharedContext.contactDataManager {
-                            deleteContactFromDevice = contactDataManager.deleteContactWithAppSpecificReference(peerId: peer.id)
-                        } else {
-                            deleteContactFromDevice = .complete()
-                        }
-                        
-                        var deleteSignal = deleteContactPeerInteractively(account: context.account, peerId: peer.id)
-                        |> then(deleteContactFromDevice)
-                        
-                        let progressSignal = Signal<Never, NoError> { subscriber in
-                            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                            let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
-                            presentControllerImpl?(controller, nil)
-                            return ActionDisposable { [weak controller] in
-                                Queue.mainQueue().async() {
-                                    controller?.dismiss()
-                                }
-                            }
-                        }
-                        |> runOn(Queue.mainQueue())
-                        |> delay(0.15, queue: Queue.mainQueue())
-                        let progressDisposable = progressSignal.start()
-                        
-                        deleteSignal = deleteSignal
-                        |> afterDisposed {
-                            Queue.mainQueue().async {
-                                progressDisposable.dispose()
-                            }
-                        }
-                        
-                        updatePeerBlockedDisposable.set((deleteSignal
-                        |> deliverOnMainQueue).start(completed: {
-                            dismissImpl?()
-                        }))
-                        
-                        deleteSendMessageIntents(peerId: peerId)
-                    })
-                })
-            ]),
-            ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })])
-            ])
-        presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-    }, displayUsernameContextMenu: { text in
-        let shareController = ShareController(context: context, subject: .url("\(text)"))
-        presentControllerImpl?(shareController, nil)
-    }, displayCopyContextMenu: { tag, phone in
-        displayCopyContextMenuImpl?(tag, phone)
-    }, call: {
-        requestCallImpl(false)
-    }, openCallMenu: { number in
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-        |> deliverOnMainQueue).start(next: { peer, _ in
-            if let peer = peer as? TelegramUser, let peerPhoneNumber = peer.phone, formatPhoneNumber(number) == formatPhoneNumber(peerPhoneNumber) {
-                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                let controller = ActionSheetController(presentationData: presentationData)
-                let dismissAction: () -> Void = { [weak controller] in
-                    controller?.dismissAnimated()
-                }
-                controller.setItemGroups([
-                    ActionSheetItemGroup(items: [
-                        ActionSheetButtonItem(title: presentationData.strings.UserInfo_TelegramCall, action: {
-                            dismissAction()
-                            requestCallImpl(false)
-                        }),
-                        ActionSheetButtonItem(title: presentationData.strings.UserInfo_PhoneCall, action: {
-                            dismissAction()
-                            context.sharedContext.applicationBindings.openUrl("tel:\(formatPhoneNumber(number).replacingOccurrences(of: " ", with: ""))")
-                        }),
-                    ]),
-                    ActionSheetItemGroup(items: [ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, action: { dismissAction() })])
-                    ])
-                presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-            } else {
-                context.sharedContext.applicationBindings.openUrl("tel:\(formatPhoneNumber(number).replacingOccurrences(of: " ", with: ""))")
-            }
-        })
-    }, requestPhoneNumber: {
-        let _ = (requestPhoneNumber(account: context.account, peerId: peerId)
-        |> deliverOnMainQueue).start(completed: {
-            
-        })
-    }, aboutLinkAction: { action, itemLink in
-        aboutLinkActionImpl?(action, itemLink)
-    }, displayAboutContextMenu: { text in
-        displayAboutContextMenuImpl?(text)
-    }, openEncryptionKey: { fingerprint in
-        let _ = (context.account.postbox.transaction { transaction -> Peer? in
-            if let peer = transaction.getPeer(peerId) as? TelegramSecretChat {
-                if let userPeer = transaction.getPeer(peer.regularPeerId) {
-                    return userPeer
-                }
-            }
-            return nil
-        } |> deliverOnMainQueue).start(next: { peer in
-            if let peer = peer {
-                pushControllerImpl?(SecretChatKeyController(context: context, fingerprint: fingerprint, peer: peer))
-            }
-        })
-    }, addBotToGroup: {
-        botAddToGroupImpl?()
-    }, shareBot: {
-        shareBotImpl?()
-    }, botSettings: {
-        let _ = (context.account.postbox.loadedPeerWithId(peerId)
-        |> deliverOnMainQueue).start(next: { peer in
-            let _ = enqueueMessages(account: context.account, peerId: peer.id, messages: [.message(text: "/settings", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
-            openChatImpl?()
-        })
-    }, botHelp: {
-        let _ = (context.account.postbox.loadedPeerWithId(peerId)
-        |> deliverOnMainQueue).start(next: { peer in
-            let _ = enqueueMessages(account: context.account, peerId: peer.id, messages: [.message(text: "/help", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
-            openChatImpl?()
-        })
-    }, botPrivacy: {
-        let _ = (context.account.postbox.loadedPeerWithId(peerId)
-            |> deliverOnMainQueue).start(next: { peer in
-                let _ = enqueueMessages(account: context.account, peerId: peer.id, messages: [.message(text: "/privacy", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
-                openChatImpl?()
-            })
-    }, report: {
-        presentControllerImpl?(peerReportOptionsController(context: context, subject: .peer(peerId), passthrough: false, present: { c, a in
-            presentControllerImpl?(c, a)
-        }, push: { c in
-            pushControllerImpl?(c)
-        }, completion: { _, _ in }), nil)
-    })
-        
-    let deviceContacts: Signal<[(DeviceContactStableId, DeviceContactBasicData)], NoError> = peerView.get()
-    |> map { peerView -> String in
-        if let peer = peerView.0.peers[peerId] as? TelegramUser {
-            return peer.phone ?? ""
-        }
-        return ""
-    }
-    |> distinctUntilChanged
-    |> mapToSignal { number -> Signal<[(DeviceContactStableId, DeviceContactBasicData)], NoError> in
-        if number.isEmpty {
-            return .single([])
-        } else {
-            return context.sharedContext.contactDataManager?.basicDataForNormalizedPhoneNumber(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(number))) ?? .single([])
-        }
-    }
-    
-    let globalNotificationsKey: PostboxViewKey = .preferences(keys: Set<ValueBoxKey>([PreferencesKeys.globalNotifications]))
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), peerView.get(), deviceContacts, context.account.postbox.combinedView(keys: [.peerChatState(peerId: peerId), globalNotificationsKey]))
-    |> map { presentationData, state, view, deviceContacts, combinedView -> (ItemListControllerState, (ItemListNodeState, Any)) in
-        let peer = peerViewMainPeer(view.0)
-        
-        var globalNotificationSettings: GlobalNotificationSettings = .defaultSettings
-        if let preferencesView = combinedView.views[globalNotificationsKey] as? PreferencesView {
-            if let settings = preferencesView.values[PreferencesKeys.globalNotifications] as? GlobalNotificationSettings {
-                globalNotificationSettings = settings
-            }
-        }
-        
-        if let peer = peer {
-            let _ = cachedAvatarEntries.modify { value in
-                if value != nil {
-                    return value
-                } else {
-                    let promise = Promise<[AvatarGalleryEntry]>()
-                    promise.set(fetchedAvatarGalleryEntries(account: context.account, peer: peer))
-                    return promise
-                }
-            }
-        }
-        var leftNavigationButton: ItemListNavigationButton?
-        let rightNavigationButton: ItemListNavigationButton
-        if let editingState = state.editingState {
-            leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
-                updateState {
-                    $0.withUpdatedEditingState(nil)
-                }
-            })
-            
-            var doneEnabled = true
-            if let editingName = editingState.editingName, editingName.isEmpty {
-                doneEnabled = false
-            }
-            
-            if state.savingData {
-                rightNavigationButton = ItemListNavigationButton(content: .none, style: .activity, enabled: doneEnabled, action: {})
-            } else {
-                rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: doneEnabled, action: {
-                    var updateName: ItemListAvatarAndNameInfoItemName?
-                    updateState { state in
-                        if let editingState = state.editingState, let editingName = editingState.editingName {
-                            if let user = peer {
-                                if ItemListAvatarAndNameInfoItemName(user) != editingName {
-                                    updateName = editingName
-                                }
-                            }
-                        }
-                        if updateName != nil {
-                            return state.withUpdatedSavingData(true)
-                        } else {
-                            return state.withUpdatedEditingState(nil)
-                        }
-                    }
-                    
-                    if let updateName = updateName, case let .personName(firstName, lastName, _) = updateName {
-                        updatePeerNameDisposable.set((updateContactName(account: context.account, peerId: peerId, firstName: firstName, lastName: lastName)
-                        |> deliverOnMainQueue).start(error: { _ in
-                            updateState { state in
-                                return state.withUpdatedSavingData(false)
-                            }
-                        }, completed: {
-                            updateState { state in
-                                return state.withUpdatedSavingData(false).withUpdatedEditingState(nil)
-                            }
-                            
-                            let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-                            |> mapToSignal { peer, _ -> Signal<Void, NoError> in
-                                guard let peer = peer as? TelegramUser, let phone = peer.phone, !phone.isEmpty else {
-                                    return .complete()
-                                }
-                                return (context.sharedContext.contactDataManager?.basicDataForNormalizedPhoneNumber(DeviceContactNormalizedPhoneNumber(rawValue: formatPhoneNumber(phone))) ?? .single([]))
-                                |> take(1)
-                                |> mapToSignal { records -> Signal<Void, NoError> in
-                                    var signals: [Signal<DeviceContactExtendedData?, NoError>] = []
-                                    if let contactDataManager = context.sharedContext.contactDataManager {
-                                        for (id, basicData) in records {
-                                            signals.append(contactDataManager.appendContactData(DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: firstName, lastName: lastName, phoneNumbers: basicData.phoneNumbers), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: ""), to: id))
-                                        }
-                                    }
-                                    return combineLatest(signals)
-                                    |> mapToSignal { _ -> Signal<Void, NoError> in
-                                        return .complete()
-                                    }
-                                }
-                            }).start()
-                        }))
-                    }
-                })
-            }
-        } else {
-            rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Edit), style: .regular, enabled: true, action: {
-                if let user = peer {
-                    updateState { state in
-                        return state.withUpdatedEditingState(UserInfoEditingState(editingName: ItemListAvatarAndNameInfoItemName(user)))
-                    }
-                }
-            })
-        }
-        
-        let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.UserInfo_Title), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: nil)
-        let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: userInfoEntries(account: context.account, presentationData: presentationData, view: view.0, cachedPeerData: view.1, deviceContacts: deviceContacts, mode: mode, state: state, peerChatState: (combinedView.views[.peerChatState(peerId: peerId)] as? PeerChatStateView)?.chatState, globalNotificationSettings: globalNotificationSettings), style: .plain)
-        
-        return (controllerState, (listState, arguments))
-    }
-    |> afterDisposed {
-        actionsDisposable.dispose()
-    }
-    
-    let controller = ItemListController(context: context, state: signal)
-    
-    pushControllerImpl = { [weak controller] value in
-        (controller?.navigationController as? NavigationController)?.pushViewController(value)
-    }
-    dismissImpl = { [weak controller] in
-        guard let controller = controller else {
-            return
-        }
-        (controller.navigationController as? NavigationController)?.filterController(controller, animated: true)
-    }
-    presentControllerImpl = { [weak controller] value, presentationArguments in
-        controller?.present(value, in: .window(.root), with: presentationArguments, blockInteraction: true)
-    }
-    dismissInputImpl = { [weak controller] in
-        controller?.view.endEditing(true)
-    }
-    openChatImpl = { [weak controller] in
-        if let navigationController = (controller?.navigationController as? NavigationController) {
-            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
-        }
-    }
-    shareContactImpl = { [weak controller] in
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-        |> deliverOnMainQueue).start(next: { peer, _ in
-            if let peer = peer as? TelegramUser, let phone = peer.phone {
-                let contact = TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)
-                let shareController = ShareController(context: context, subject: .media(.standalone(media: contact)))
-                controller?.present(shareController, in: .window(.root))
-            }
-        })
-    }
-    shareMyContactImpl = { [weak controller] in
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: context.account.peerId)
-            |> deliverOnMainQueue).start(next: { peer, _ in
-                guard let peer = peer as? TelegramUser, let phone = peer.phone else {
-                    return
-                }
-                let contact = TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)
-                
-                let _ = (enqueueMessages(account: context.account, peerId: peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: contact), replyToMessageId: nil, localGroupingKey: nil)])
-                    |> deliverOnMainQueue).start(next: { [weak controller] _ in
-                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        controller?.present(OverlayStatusController(theme: presentationData.theme, type: .success), in: .window(.root))
-                    })
-        })
-    }
-    startSecretChatImpl = { [weak controller] in
-        let _ = (context.account.postbox.transaction { transaction -> (Peer?, PeerId?) in
-            let peer = transaction.getPeer(peerId)
-            let filteredPeerIds = Array(transaction.getAssociatedPeerIds(peerId)).filter { $0.namespace == Namespaces.Peer.SecretChat }
-            var activeIndices: [ChatListIndex] = []
-            for associatedId in filteredPeerIds {
-                if let state = (transaction.getPeer(associatedId) as? TelegramSecretChat)?.embeddedState {
-                    switch state {
-                        case .active, .handshake:
-                            if let (_, index) = transaction.getPeerChatListIndex(associatedId) {
-                                activeIndices.append(index)
-                            }
-                        default:
-                            break
-                    }
-                }
-            }
-            activeIndices.sort()
-            if let index = activeIndices.last {
-                return (peer, index.messageIndex.id.peerId)
-            } else {
-                return (peer, nil)
-            }
-        } |> deliverOnMainQueue).start(next: { peer, currentPeerId in
-            if let currentPeerId = currentPeerId {
-                if let navigationController = (controller?.navigationController as? NavigationController) {
-                    context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(currentPeerId)))
-                }
-            } else if let controller = controller {
-                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                let displayTitle = peer?.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder) ?? ""
-                controller.present(textAlertController(context: context, title: nil, text: presentationData.strings.UserInfo_StartSecretChatConfirmation(displayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.UserInfo_StartSecretChatStart, action: {
-                    var createSignal = createSecretChat(account: context.account, peerId: peerId)
-                    var cancelImpl: (() -> Void)?
-                    let progressSignal = Signal<Never, NoError> { subscriber in
-                        let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                            cancelImpl?()
-                        }))
-                        presentControllerImpl?(controller, nil)
-                        return ActionDisposable { [weak controller] in
-                            Queue.mainQueue().async() {
-                                controller?.dismiss()
-                            }
-                        }
-                    }
-                    |> runOn(Queue.mainQueue())
-                    |> delay(0.15, queue: Queue.mainQueue())
-                    let progressDisposable = progressSignal.start()
-                    
-                    createSignal = createSignal
-                    |> afterDisposed {
-                        Queue.mainQueue().async {
-                            progressDisposable.dispose()
-                        }
-                    }
-                    cancelImpl = {
-                        createSecretChatDisposable.set(nil)
-                    }
-                    
-                    createSecretChatDisposable.set((createSignal |> deliverOnMainQueue).start(next: { [weak controller] peerId in
-                        if let navigationController = (controller?.navigationController as? NavigationController) {
-                            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
-                        }
-                    }, error: { [weak controller] error in
-                        if let controller = controller {
-                            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                            let text: String
-                            switch error {
-                                case .limitExceeded:
-                                    text = presentationData.strings.TwoStepAuth_FloodError
-                                default:
-                                    text = presentationData.strings.Login_UnknownError
-                            }
-                            controller.present(textAlertController(context: context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                        }
-                    }))
-                })]), in: .window(.root))
-            }
-        })
-    }
-    botAddToGroupImpl = { [weak controller] in
-        guard let controller = controller else {
-            return
-        }
-        context.sharedContext.openResolvedUrl(.groupBotStart(peerId: peerId, payload: ""), context: context, urlContext: .generic, navigationController: controller.navigationController as? NavigationController, openPeer: { id, navigation in
-            
-        }, sendFile: nil,
-        sendSticker: nil,
-        requestMessageActionUrlAuth: nil,
-        joinVoiceChat: nil,
-        present: { c, a in
-            presentControllerImpl?(c, a)
-        }, dismissInput: {
-            dismissInputImpl?()
-        }, contentContext: nil)
-    }
-    shareBotImpl = { [weak controller] in
-        let _ = (getUserPeer(postbox: context.account.postbox, peerId: peerId)
-            |> deliverOnMainQueue).start(next: { peer, _ in
-                if let peer = peer as? TelegramUser, let username = peer.username {
-                    let shareController = ShareController(context: context, subject: .url("https://t.me/\(username)"))
-                    controller?.present(shareController, in: .window(.root))
-                }
-            })
-    }
-    avatarGalleryTransitionArguments = { [weak controller] entry in
-        if let controller = controller {
-            var result: ((ASDisplayNode, CGRect, () -> (UIView?, UIView?)), CGRect)?
-            controller.forEachItemNode { itemNode in
-                if let itemNode = itemNode as? ItemListAvatarAndNameInfoItemNode {
-                    result = itemNode.avatarTransitionNode()
-                }
-            }
-            if let (node, _) = result {
-                return GalleryTransitionArguments(transitionNode: node, addToTransitionSurface: { _ in
-                })
-            }
-        }
-        return nil
-    }
-    updateHiddenAvatarImpl = { [weak controller] in
-        if let controller = controller {
-            controller.forEachItemNode { itemNode in
-                if let itemNode = itemNode as? ItemListAvatarAndNameInfoItemNode {
-                    itemNode.updateAvatarHidden()
-                }
-            }
-        }
-    }
-    aboutLinkActionImpl = { [weak context, weak controller] action, itemLink in
-        if let controller = controller, let context = context {
-            context.sharedContext.handleTextLinkAction(context: context, peerId: peerId, navigateDisposable: navigateDisposable, controller: controller, action: action, itemLink: itemLink)
-        }
-    }
-    displayAboutContextMenuImpl = { [weak controller] text in
-        if let strongController = controller {
-            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-            var resultItemNode: ListViewItemNode?
-            let _ = strongController.frameForItemNode({ itemNode in
-                if let itemNode = itemNode as? ItemListTextWithLabelItemNode {
-                    if let tag = itemNode.tag as? UserInfoEntryTag {
-                        if tag == .about {
-                            resultItemNode = itemNode
-                            return true
-                        }
-                    }
-                }
-                return false
-            })
-            if let resultItemNode = resultItemNode {
-                let contextMenuController = ContextMenuController(actions: [ContextMenuAction(content: .text(title: presentationData.strings.Conversation_ContextMenuCopy, accessibilityLabel: presentationData.strings.Conversation_ContextMenuCopy), action: {
-                    UIPasteboard.general.string = text
-                })])
-                strongController.present(contextMenuController, in: .window(.root), with: ContextMenuControllerPresentationArguments(sourceNodeAndRect: { [weak resultItemNode] in
-                    if let strongController = controller, let resultItemNode = resultItemNode {
-                        return (resultItemNode, resultItemNode.contentBounds.insetBy(dx: 0.0, dy: -2.0), strongController.displayNode, strongController.view.bounds)
-                    } else {
-                        return nil
-                    }
-                }))
-                
-            }
-        }
-    }
-    
-    displayCopyContextMenuImpl = { [weak controller] tag, value in
-        if let strongController = controller {
-            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-            var resultItemNode: ListViewItemNode?
-            let _ = strongController.frameForItemNode({ itemNode in
-                if let itemNode = itemNode as? ItemListTextWithLabelItemNode {
-                    if let itemTag = itemNode.tag as? UserInfoEntryTag {
-                        if itemTag == tag && itemNode.item?.text == value {
-                            resultItemNode = itemNode
-                            return true
-                        }
-                    }
-                }
-                return false
-            })
-            if let resultItemNode = resultItemNode {
-                let contextMenuController = ContextMenuController(actions: [ContextMenuAction(content: .text(title: presentationData.strings.Conversation_ContextMenuCopy, accessibilityLabel: presentationData.strings.Conversation_ContextMenuCopy), action: {
-                    UIPasteboard.general.string = value
-                })])
-                strongController.present(contextMenuController, in: .window(.root), with: ContextMenuControllerPresentationArguments(sourceNodeAndRect: { [weak resultItemNode] in
-                    if let strongController = controller, let resultItemNode = resultItemNode {
-                        return (resultItemNode, resultItemNode.contentBounds.insetBy(dx: 0.0, dy: -2.0), strongController.displayNode, strongController.view.bounds)
-                    } else {
-                        return nil
-                    }
-                }))
-            }
-        }
-    }
-    
-    popToRootImpl = { [weak controller] in
-        (controller?.navigationController as? NavigationController)?.popToRoot(animated: true)
-    }
-    
-    controller.didAppear = { [weak controller] firstTime in
-        guard let controller = controller, firstTime else {
-            return
-        }
-        
-        var resultItemNode: ItemListAvatarAndNameInfoItemNode?
-        let _ = controller.frameForItemNode({ itemNode in
-            if let itemNode = itemNode as? ItemListAvatarAndNameInfoItemNode {
-                resultItemNode = itemNode
-                return true
-            }
-            return false
-        })
-        if let resultItemNode = resultItemNode, let callButtonFrame = resultItemNode.callButtonFrame {
-            let _ = (ApplicationSpecificNotice.getProfileCallTips(accountManager: context.sharedContext.accountManager)
-            |> deliverOnMainQueue).start(next: { [weak controller] counter in
-                guard let controller = controller else {
-                    return
-                }
-                
-                var displayTip = false
-                if counter == 0 {
-                    displayTip = true
-                } else if counter < 3 && arc4random_uniform(4) == 1 {
-                    displayTip = true
-                }
-                if !displayTip {
-                    return
-                }
-                let _ = ApplicationSpecificNotice.incrementProfileCallTips(accountManager: context.sharedContext.accountManager).start()
-            
-                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                let text: String = presentationData.strings.UserInfo_TapToCall
-                
-                let tooltipController = TooltipController(content: .text(text), baseFontSize: presentationData.listsFontSize.baseDisplaySize, dismissByTapOutside: true)
-                controller.present(tooltipController, in: .window(.root), with: TooltipControllerPresentationArguments(sourceNodeAndRect: { [weak resultItemNode] in
-                    if let resultItemNode = resultItemNode {
-                        return (resultItemNode, callButtonFrame)
-                    }
-                    return nil
-                }))
-            })
-        }
-    }
-    
-    controller.navigationItem.backBarButtonItem = UIBarButtonItem(title: context.sharedContext.currentPresentationData.with{ $0 }.strings.Common_Back, style: .plain, target: nil, action: nil)
-    
-    return controller
-}
diff --git a/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.swift b/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.swift
index af518befa8..1389239a93 100644
--- a/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.swift
+++ b/submodules/PeerPresenceStatusManager/Sources/PeerPresenceStatusManager.swift
@@ -4,19 +4,23 @@ import TelegramCore
 import SyncCore
 import SyncCore
 
-private func suggestedUserPresenceStringRefreshTimeout(_ presence: TelegramUserPresence, relativeTo timestamp: Int32) -> Double {
+private func suggestedUserPresenceStringRefreshTimeout(_ presence: TelegramUserPresence, relativeTo timestamp: Int32, isOnline: Bool?) -> Double {
     switch presence.status {
     case let .present(statusTimestamp):
         if statusTimestamp >= timestamp {
             return Double(statusTimestamp - timestamp)
         } else {
-            let difference = timestamp - statusTimestamp
-            if difference < 30 {
-                return Double((30 - difference) + 1)
-            } else if difference < 60 * 60 {
-                return Double((difference % 60) + 1)
+            if let isOnline = isOnline, isOnline {
+                return 1.0
             } else {
-                return Double.infinity
+                let difference = timestamp - statusTimestamp
+                if difference < 30 {
+                    return Double((30 - difference) + 1)
+                } else if difference < 60 * 60 {
+                    return Double((difference % 60) + 1)
+                } else {
+                    return Double.infinity
+                }
             }
         }
     case .recently:
@@ -43,12 +47,12 @@ public final class PeerPresenceStatusManager {
         self.timer?.invalidate()
     }
     
-    public func reset(presence: TelegramUserPresence) {
+    public func reset(presence: TelegramUserPresence, isOnline: Bool? = nil) {
         self.timer?.invalidate()
         self.timer = nil
         
         let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
-        let timeout = suggestedUserPresenceStringRefreshTimeout(presence, relativeTo: Int32(timestamp))
+        let timeout = suggestedUserPresenceStringRefreshTimeout(presence, relativeTo: Int32(timestamp), isOnline: isOnline)
         if timeout.isFinite {
             self.timer = SwiftSignalKit.Timer(timeout: timeout, repeat: false, completion: { [weak self] in
                 if let strongSelf = self {
diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
index db5f2c0b36..25e2a0983a 100644
--- a/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
+++ b/submodules/PeersNearbyUI/Sources/PeersNearbyController.swift
@@ -229,7 +229,7 @@ private enum PeersNearbyEntry: ItemListNodeEntry {
                 var text = strings.Map_DistanceAway(shortStringForDistance(strings: strings, distance: peer.distance)).0
                 let isSelfPeer = peer.peer.0.id == arguments.context.account.peerId
                 if isSelfPeer {
-                    text = strings.PeopleNearby_VisibleUntil(humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: peer.expires)).0
+                    text = strings.PeopleNearby_VisibleUntil(humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: peer.expires).0).0
                 }
                 return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer.peer.0, aliasHandling: .standard, nameColor: .primary, nameStyle: .distinctBold, presence: nil, text: .text(text, .secondary), label: .none, editing: ItemListPeerItemEditing(editable: false, editing: false, revealed: false), revealOptions: nil, switchValue: nil, enabled: true, selectable: !isSelfPeer, sectionId: self.section, action: {
                     if !isSelfPeer {
@@ -478,14 +478,14 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
                 let _ = (coordinatePromise.get()
                 |> deliverOnMainQueue).start(next: { coordinate in
                     if let coordinate = coordinate {
-                        let _ = updatePeersNearbyVisibility(account: context.account, update: .visible(latitude: coordinate.latitude, longitude: coordinate.longitude), background: false).start()
+                        let _ = context.engine.peersNearby.updatePeersNearbyVisibility(update: .visible(latitude: coordinate.latitude, longitude: coordinate.longitude), background: false).start()
                     }
                 })
             })]), nil)
             
             
         } else {
-            let _ = updatePeersNearbyVisibility(account: context.account, update: .invisible, background: false).start()
+            let _ = context.engine.peersNearby.updatePeersNearbyVisibility(update: .invisible, background: false).start()
         }
     }, openProfile: { peer, distance in
         navigateToProfileImpl?(peer, distance)
@@ -512,7 +512,7 @@ public func peersNearbyController(context: AccountContext) -> ViewController {
         cancelImpl = {
             checkCreationAvailabilityDisposable.set(nil)
         }
-        checkCreationAvailabilityDisposable.set((checkPublicChannelCreationAvailability(account: context.account, location: true)
+        checkCreationAvailabilityDisposable.set((context.engine.peers.checkPublicChannelCreationAvailability(location: true)
         |> afterDisposed {
             Queue.mainQueue().async {
                 progressDisposable.dispose()
diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift
index 91ec1a3454..d56431a40b 100644
--- a/submodules/PhotoResources/Sources/PhotoResources.swift
+++ b/submodules/PhotoResources/Sources/PhotoResources.swift
@@ -32,8 +32,8 @@ public func largestRepresentationForPhoto(_ photo: TelegramMediaImage) -> Telegr
 
 private let progressiveRangeMap: [(Int, [Int])] = [
     (100, [0]),
-    (400, [1]),
-    (600, [2, 3]),
+    (400, [3]),
+    (600, [4]),
     (Int(Int32.max), [2, 3, 4])
 ]
 
@@ -59,9 +59,6 @@ public func chatMessagePhotoDatas(postbox: Postbox, photoReference: ImageMediaRe
         }
         
         var sources: [SizeSource] = []
-        if let miniThumbnail = photoReference.media.immediateThumbnailData.flatMap(decodeTinyThumbnail) {
-            sources.append(.miniThumbnail(data: miniThumbnail))
-        }
         let thumbnailByteSize = Int(progressiveRepresentation.progressiveSizes[0])
         var largestByteSize = Int(progressiveRepresentation.progressiveSizes[0])
         for (maxDimension, byteSizes) in progressiveRangeMap {
@@ -79,6 +76,12 @@ public func chatMessagePhotoDatas(postbox: Postbox, photoReference: ImageMediaRe
                 break
             }
         }
+        if sources.isEmpty {
+            sources.append(.image(size: largestByteSize))
+        }
+        if let miniThumbnail = photoReference.media.immediateThumbnailData.flatMap(decodeTinyThumbnail) {
+            sources.insert(.miniThumbnail(data: miniThumbnail), at: 0)
+        }
         
         return Signal { subscriber in
             let signals: [Signal<(SizeSource, Data?), NoError>] = sources.map { source -> Signal<(SizeSource, Data?), NoError> in
@@ -565,7 +568,7 @@ public func rawMessagePhoto(postbox: Postbox, photoReference: ImageMediaReferenc
     }
 }
 
-public func chatMessagePhoto(postbox: Postbox, photoReference: ImageMediaReference, synchronousLoad: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func chatMessagePhoto(postbox: Postbox, photoReference: ImageMediaReference, synchronousLoad: Bool = false, highQuality: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     return chatMessagePhotoInternal(photoData: chatMessagePhotoDatas(postbox: postbox, photoReference: photoReference, tryAdditionalRepresentations: true, synchronousLoad: synchronousLoad), synchronousLoad: synchronousLoad)
     |> map { _, _, generate in
         return generate
@@ -684,7 +687,7 @@ public func chatMessagePhotoInternal(photoData: Signal<Tuple4<Data?, Data?, Chat
                 return context
             }
             
-            let context = DrawingContext(size: arguments.drawingSize, clear: true)
+            let context = DrawingContext(size: arguments.drawingSize, scale: arguments.scale ?? 0.0, clear: true)
             
             context.withFlippedContext { c in
                 c.setBlendMode(.copy)
@@ -2303,7 +2306,7 @@ private func avatarGalleryPhotoDatas(account: Account, fileReference: FileMediaR
     }
 }
 
-public func chatAvatarGalleryPhoto(account: Account, representations: [ImageRepresentationWithReference], immediateThumbnailData: Data?, autoFetchFullSize: Bool = false, attemptSynchronously: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func chatAvatarGalleryPhoto(account: Account, representations: [ImageRepresentationWithReference], immediateThumbnailData: Data?, autoFetchFullSize: Bool = false, attemptSynchronously: Bool = false, skipThumbnail: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     let signal = avatarGalleryPhotoDatas(account: account, representations: representations, immediateThumbnailData: immediateThumbnailData, autoFetchFullSize: autoFetchFullSize, attemptSynchronously: attemptSynchronously)
     
     return signal
@@ -2352,8 +2355,8 @@ public func chatAvatarGalleryPhoto(account: Account, representations: [ImageRepr
             }
             
             var blurredThumbnailImage: UIImage?
-            if let thumbnailImage = thumbnailImage {
-              if max(thumbnailImage.width, thumbnailImage.height) > 200 {
+            if let thumbnailImage = thumbnailImage, !skipThumbnail {
+                if max(thumbnailImage.width, thumbnailImage.height) > 200 {
                     blurredThumbnailImage = UIImage(cgImage: thumbnailImage)
                 } else {
                     let thumbnailSize = CGSize(width: thumbnailImage.width, height: thumbnailImage.height)
diff --git a/submodules/Postbox/Sources/AccountManager.swift b/submodules/Postbox/Sources/AccountManager.swift
index 3da8424277..1025cbe4cb 100644
--- a/submodules/Postbox/Sources/AccountManager.swift
+++ b/submodules/Postbox/Sources/AccountManager.swift
@@ -124,7 +124,7 @@ final class AccountManagerImpl {
         self.tables.append(self.sharedDataTable)
         self.tables.append(self.noticeTable)
         
-        print("AccountManager initialization took \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+        postboxLog("AccountManager initialization took \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
     }
     
     deinit {
diff --git a/submodules/Postbox/Sources/ChatListIndexTable.swift b/submodules/Postbox/Sources/ChatListIndexTable.swift
index c6c17af690..f44ade7157 100644
--- a/submodules/Postbox/Sources/ChatListIndexTable.swift
+++ b/submodules/Postbox/Sources/ChatListIndexTable.swift
@@ -62,8 +62,7 @@ final class ChatListIndexTable: Table {
     }
     
     private func key(_ peerId: PeerId) -> ValueBoxKey {
-        self.sharedKey.setInt32(0, value: peerId.namespace)
-        self.sharedKey.setInt32(4, value: peerId.id)
+        self.sharedKey.setInt64(0, value: peerId.toInt64())
         assert(self.sharedKey.getInt64(0) == peerId.toInt64())
         return self.sharedKey
     }
@@ -648,7 +647,7 @@ final class ChatListIndexTable: Table {
         var summary = PeerGroupUnreadCountersCombinedSummary(namespaces: [:])
         
         postbox.chatListTable.forEachPeer(groupId: groupId, { peerId in
-            if peerId.namespace == Int32.max {
+            if peerId.namespace == .max {
                 return
             }
             guard let combinedState = postbox.readStateTable.getCombinedState(peerId) else {
diff --git a/submodules/Postbox/Sources/ChatListViewState.swift b/submodules/Postbox/Sources/ChatListViewState.swift
index ef08231ff7..7e8d365f44 100644
--- a/submodules/Postbox/Sources/ChatListViewState.swift
+++ b/submodules/Postbox/Sources/ChatListViewState.swift
@@ -242,11 +242,13 @@ private final class ChatListViewSpaceState {
             let allIndices = (lowerOrAtAnchorMessages + higherThanAnchorMessages).map { $0.entryIndex }
             let allEntityIds = (lowerOrAtAnchorMessages + higherThanAnchorMessages).map { $0.entityId }
             if Set(allIndices).count != allIndices.count {
+                var debugRepeatedIndices = Set<MutableChatListEntryIndex>()
                 var existingIndices = Set<MutableChatListEntryIndex>()
                 for i in (0 ..< lowerOrAtAnchorMessages.count).reversed() {
                     if !existingIndices.contains(lowerOrAtAnchorMessages[i].entryIndex) {
                         existingIndices.insert(lowerOrAtAnchorMessages[i].entryIndex)
                     } else {
+                        debugRepeatedIndices.insert(lowerOrAtAnchorMessages[i].entryIndex)
                         lowerOrAtAnchorMessages.remove(at: i)
                     }
                 }
@@ -254,10 +256,11 @@ private final class ChatListViewSpaceState {
                     if !existingIndices.contains(higherThanAnchorMessages[i].entryIndex) {
                         existingIndices.insert(higherThanAnchorMessages[i].entryIndex)
                     } else {
+                        debugRepeatedIndices.insert(higherThanAnchorMessages[i].entryIndex)
                         higherThanAnchorMessages.remove(at: i)
                     }
                 }
-                postboxLog("allIndices not unique: \(allIndices)")
+                postboxLog("allIndices not unique, repeated: \(debugRepeatedIndices)")
                 
                 assert(false)
                 //preconditionFailure()
diff --git a/submodules/Postbox/Sources/ContactTable.swift b/submodules/Postbox/Sources/ContactTable.swift
index 8be82c6de4..e236a3879a 100644
--- a/submodules/Postbox/Sources/ContactTable.swift
+++ b/submodules/Postbox/Sources/ContactTable.swift
@@ -22,11 +22,11 @@ final class ContactTable: Table {
     }
     
     private func lowerBound() -> ValueBoxKey {
-        return self.key(PeerId(namespace: 0, id: 0))
+        return self.key(PeerId(0))
     }
     
     private func upperBound() -> ValueBoxKey {
-        return self.key(PeerId(namespace: Int32.max, id: Int32.max))
+        return self.key(PeerId.max)
     }
     
     func isContact(peerId: PeerId) -> Bool {
@@ -81,7 +81,7 @@ final class ContactTable: Table {
                 let removedPeerIds = peerIdsBeforeModification.subtracting(peerIds)
                 let addedPeerIds = peerIds.subtracting(peerIdsBeforeModification)
                 
-                let sharedKey = self.key(PeerId(namespace: 0, id: 0))
+                let sharedKey = self.key(PeerId(0))
                 
                 for peerId in removedPeerIds {
                     self.valueBox.remove(self.table, key: self.key(peerId, sharedKey: sharedKey), secure: false)
diff --git a/submodules/Postbox/Sources/GlobalMessageIdsTable.swift b/submodules/Postbox/Sources/GlobalMessageIdsTable.swift
index a5665f3e16..800ddf9ffa 100644
--- a/submodules/Postbox/Sources/GlobalMessageIdsTable.swift
+++ b/submodules/Postbox/Sources/GlobalMessageIdsTable.swift
@@ -23,7 +23,7 @@ final class GlobalMessageIdsTable: Table {
     
     func set(_ globalId: Int32, id: MessageId) {
         assert(id.namespace == 0)
-        assert(id.peerId.namespace == 0 || id.peerId.namespace == 1)
+        assert(id.peerId.namespace._internalGetInt32Value() == 0 || id.peerId.namespace._internalGetInt32Value() == 1)
         assert(self.seedConfiguration.globalMessageIdsPeerIdNamespaces.contains(GlobalMessageIdsNamespace(peerIdNamespace: id.peerId.namespace, messageIdNamespace: id.namespace)))
         
         self.sharedBuffer.reset()
diff --git a/submodules/Postbox/Sources/GlobalMessageTagsView.swift b/submodules/Postbox/Sources/GlobalMessageTagsView.swift
index 51bd14f19a..7e272d24f1 100644
--- a/submodules/Postbox/Sources/GlobalMessageTagsView.swift
+++ b/submodules/Postbox/Sources/GlobalMessageTagsView.swift
@@ -348,7 +348,7 @@ final class MutableGlobalMessageTagsView: MutablePostboxView {
         }
         
         if let later = self.later {
-            addedEntries += postbox.messageHistoryTable.laterEntries(globalTagMask: self.globalTag, index: later.predecessor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in
+            addedEntries += postbox.messageHistoryTable.laterEntries(globalTagMask: self.globalTag, index: later.globalPredecessor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in
                 switch entry {
                     case let .message(message):
                         return .intermediateMessage(message)
@@ -358,7 +358,7 @@ final class MutableGlobalMessageTagsView: MutablePostboxView {
             }
         }
         if let earlier = self.earlier {
-            addedEntries += postbox.messageHistoryTable.earlierEntries(globalTagMask: self.globalTag, index: earlier.successor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in
+            addedEntries += postbox.messageHistoryTable.earlierEntries(globalTagMask: self.globalTag, index: earlier.globalSuccessor(), count: self.count).map { entry -> InternalGlobalMessageTagsEntry in
                 switch entry {
                     case let .message(message):
                         return .intermediateMessage(message)
diff --git a/submodules/Postbox/Sources/MediaBox.swift b/submodules/Postbox/Sources/MediaBox.swift
index e7188645ed..f0abfe8281 100644
--- a/submodules/Postbox/Sources/MediaBox.swift
+++ b/submodules/Postbox/Sources/MediaBox.swift
@@ -104,9 +104,10 @@ private struct CachedMediaResourceRepresentationKey: Hashable {
     static func ==(lhs: CachedMediaResourceRepresentationKey, rhs: CachedMediaResourceRepresentationKey) -> Bool {
         return lhs.resourceId.isEqual(to: rhs.resourceId) && lhs.representation.isEqual(to: rhs.representation)
     }
-    
-    var hashValue: Int {
-        return self.resourceId.hashValue
+
+    func hash(into hasher: inout Hasher) {
+        hasher.combine(self.resourceId.hashValue)
+        hasher.combine(self.representation.uniqueId)
     }
 }
 
@@ -1109,15 +1110,17 @@ public final class MediaBox {
         }
     }
     
-    public func removeCachedResources(_ ids: Set<WrappedMediaResourceId>) -> Signal<Void, NoError> {
+    public func removeCachedResources(_ ids: Set<WrappedMediaResourceId>, force: Bool = false) -> Signal<Void, NoError> {
         return Signal { subscriber in
             self.dataQueue.async {
                 for id in ids {
-                    if self.fileContexts[id] != nil {
-                        continue
-                    }
-                    if self.keepResourceContexts[id] != nil {
-                        continue
+                    if !force {
+                        if self.fileContexts[id] != nil {
+                            continue
+                        }
+                        if self.keepResourceContexts[id] != nil {
+                            continue
+                        }
                     }
                     let paths = self.storePathsForId(id.id)
                     unlink(paths.complete)
diff --git a/submodules/Postbox/Sources/MediaResource.swift b/submodules/Postbox/Sources/MediaResource.swift
index bd87e21e24..db25d91a3d 100644
--- a/submodules/Postbox/Sources/MediaResource.swift
+++ b/submodules/Postbox/Sources/MediaResource.swift
@@ -22,7 +22,7 @@ public struct WrappedMediaResourceId: Hashable {
 //    }
     
     public func hash(into hasher: inout Hasher) {
-        hasher.combine(id.hashValue)
+        hasher.combine(self.id.hashValue)
     }
 }
 
diff --git a/submodules/Postbox/Sources/Message.swift b/submodules/Postbox/Sources/Message.swift
index 540b072f43..85b35fefca 100644
--- a/submodules/Postbox/Sources/Message.swift
+++ b/submodules/Postbox/Sources/Message.swift
@@ -10,7 +10,7 @@ public struct MessageId: Hashable, Comparable, CustomStringConvertible, PostboxC
     
     public var description: String {
         get {
-            return "\(namespace)_\(id)"
+            return "\(peerId):\(namespace)_\(id)"
         }
     }
     
@@ -18,14 +18,16 @@ public struct MessageId: Hashable, Comparable, CustomStringConvertible, PostboxC
         self.peerId = peerId
         self.namespace = namespace
         self.id = id
+        if namespace == 0 && id == 0 {
+            assert(true)
+        }
     }
     
     public init(_ buffer: ReadBuffer) {
-        var peerIdNamespaceValue: Int32 = 0
-        memcpy(&peerIdNamespaceValue, buffer.memory + buffer.offset, 4)
-        var peerIdIdValue: Int32 = 0
-        memcpy(&peerIdIdValue, buffer.memory + (buffer.offset + 4), 4)
-        self.peerId = PeerId(namespace: peerIdNamespaceValue, id: peerIdIdValue)
+        var peerIdInt64Value: Int64 = 0
+        memcpy(&peerIdInt64Value, buffer.memory + buffer.offset, 8)
+
+        self.peerId = PeerId(peerIdInt64Value)
         
         var namespaceValue: Int32 = 0
         memcpy(&namespaceValue, buffer.memory + (buffer.offset + 8), 4)
@@ -50,14 +52,12 @@ public struct MessageId: Hashable, Comparable, CustomStringConvertible, PostboxC
     }
     
     public func encodeToBuffer(_ buffer: WriteBuffer) {
-        var peerIdNamespace = self.peerId.namespace
-        var peerIdId = self.peerId.id
+        var peerIdValue = self.peerId.toInt64()
         var namespace = self.namespace
         var id = self.id
-        buffer.write(&peerIdNamespace, offset: 0, length: 4);
-        buffer.write(&peerIdId, offset: 0, length: 4);
-        buffer.write(&namespace, offset: 0, length: 4);
-        buffer.write(&id, offset: 0, length: 4);
+        buffer.write(&peerIdValue, offset: 0, length: 8)
+        buffer.write(&namespace, offset: 0, length: 4)
+        buffer.write(&id, offset: 0, length: 4)
     }
     
     public static func encodeArrayToBuffer(_ array: [MessageId], buffer: WriteBuffer) {
@@ -103,7 +103,22 @@ public struct MessageIndex: Comparable, Hashable {
         self.timestamp = timestamp
     }
     
-    public func predecessor() -> MessageIndex {
+    public func globalPredecessor() -> MessageIndex {
+        let previousPeerId = self.id.peerId.predecessor
+        if previousPeerId != self.id.peerId {
+            return MessageIndex(id: MessageId(peerId: previousPeerId, namespace: self.id.namespace, id: self.id.id), timestamp: self.timestamp)
+        } else if self.id.id != 0 {
+            return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id - 1), timestamp: self.timestamp)
+        } else if self.id.namespace != 0 {
+            return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace - 1, id: Int32.max - 1), timestamp: self.timestamp)
+        } else if self.timestamp != 0 {
+            return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: Int32(Int8.max) - 1, id: Int32.max - 1), timestamp: self.timestamp - 1)
+        } else {
+            return self
+        }
+    }
+
+    public func peerLocalPredecessor() -> MessageIndex {
         if self.id.id != 0 {
             return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id - 1), timestamp: self.timestamp)
         } else if self.id.namespace != 0 {
@@ -115,16 +130,25 @@ public struct MessageIndex: Comparable, Hashable {
         }
     }
     
-    public func successor() -> MessageIndex {
+    public func globalSuccessor() -> MessageIndex {
+        let nextPeerId = self.id.peerId.successor
+        if nextPeerId != self.id.peerId {
+            return MessageIndex(id: MessageId(peerId: nextPeerId, namespace: self.id.namespace, id: self.id.id), timestamp: self.timestamp)
+        } else {
+            return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id == Int32.max ? self.id.id : (self.id.id + 1)), timestamp: self.timestamp)
+        }
+    }
+
+    public func peerLocalSuccessor() -> MessageIndex {
         return MessageIndex(id: MessageId(peerId: self.id.peerId, namespace: self.id.namespace, id: self.id.id == Int32.max ? self.id.id : (self.id.id + 1)), timestamp: self.timestamp)
     }
     
     public static func absoluteUpperBound() -> MessageIndex {
-        return MessageIndex(id: MessageId(peerId: PeerId(namespace: Int32(Int8.max), id: Int32.max), namespace: Int32(Int8.max), id: Int32.max), timestamp: Int32.max)
+        return MessageIndex(id: MessageId(peerId: PeerId.max, namespace: Int32(Int8.max), id: Int32.max), timestamp: Int32.max)
     }
     
     public static func absoluteLowerBound() -> MessageIndex {
-        return MessageIndex(id: MessageId(peerId: PeerId(namespace: 0, id: 0), namespace: 0, id: 0), timestamp: 0)
+        return MessageIndex(id: MessageId(peerId: PeerId(0), namespace: 0, id: 0), timestamp: 0)
     }
     
     public static func lowerBound(peerId: PeerId) -> MessageIndex {
@@ -209,11 +233,11 @@ public struct ChatListIndex: Comparable, Hashable {
     }
     
     public var predecessor: ChatListIndex {
-        return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.predecessor())
+        return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.globalPredecessor())
     }
     
     public var successor: ChatListIndex {
-        return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.successor())
+        return ChatListIndex(pinningIndex: self.pinningIndex, messageIndex: self.messageIndex.globalSuccessor())
     }
 }
 
diff --git a/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift b/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift
index fbbd8ffd59..15f2fb9af5 100644
--- a/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryReadStateTable.swift
@@ -315,7 +315,7 @@ final class MessageHistoryReadStateTable: Table {
                         readPastTopIndex = true
                     }
                     if maxIncomingReadIndex < messageIndex || markedUnread || readPastTopIndex {
-                        let (realDeltaCount, holes, messageIds) = incomingStatsInRange(maxIncomingReadIndex.successor(), messageIndex)
+                        let (realDeltaCount, holes, messageIds) = incomingStatsInRange(maxIncomingReadIndex.peerLocalSuccessor(), messageIndex)
                         var deltaCount = realDeltaCount
                         if readPastTopIndex {
                             deltaCount = max(Int(count), deltaCount)
@@ -366,7 +366,7 @@ final class MessageHistoryReadStateTable: Table {
                     break
                 case let .indexBased(maxIncomingReadIndex, maxOutgoingReadIndex, count, markedUnread):
                     if maxOutgoingReadIndex < messageIndex {
-                        let messageIds: [MessageId] = outgoingIndexStatsInRange(maxOutgoingReadIndex.successor(), messageIndex)
+                        let messageIds: [MessageId] = outgoingIndexStatsInRange(maxOutgoingReadIndex.peerLocalSuccessor(), messageIndex)
                         
                         self.markReadStatesAsUpdated(messageIndex.id.peerId, namespaces: states.namespaces)
                         states.namespaces[messageIndex.id.namespace] = .indexBased(maxIncomingReadIndex: maxIncomingReadIndex, maxOutgoingReadIndex: messageIndex, count: count, markedUnread: markedUnread)
diff --git a/submodules/Postbox/Sources/MessageHistoryTable.swift b/submodules/Postbox/Sources/MessageHistoryTable.swift
index 203849fc24..35f7affa81 100644
--- a/submodules/Postbox/Sources/MessageHistoryTable.swift
+++ b/submodules/Postbox/Sources/MessageHistoryTable.swift
@@ -223,7 +223,7 @@ final class MessageHistoryTable: Table {
     }
     
     private func processIndexOperations(_ peerId: PeerId, operations: [MessageHistoryIndexOperation], processedOperationsByPeerId: inout [PeerId: [MessageHistoryOperation]], updatedMedia: inout [MediaId: Media?], unsentMessageOperations: inout [IntermediateMessageHistoryUnsentOperation], updatedPeerReadStateOperations: inout [PeerId: PeerReadStateSynchronizationOperation?], globalTagsOperations: inout [GlobalMessageHistoryTagsOperation], pendingActionsOperations: inout [PendingMessageActionsOperation], updatedMessageActionsSummaries: inout [PendingMessageActionsSummaryKey: Int32], updatedMessageTagSummaries: inout [MessageHistoryTagsSummaryKey: MessageHistoryTagNamespaceSummary], invalidateMessageTagSummaries: inout [InvalidatedMessageHistoryTagsSummaryEntryOperation], localTagsOperations: inout [IntermediateMessageHistoryLocalTagsOperation], timestampBasedMessageAttributesOperations: inout [TimestampBasedMessageAttributesOperation]) {
-        let sharedKey = self.key(MessageIndex(id: MessageId(peerId: PeerId(namespace: 0, id: 0), namespace: 0, id: 0), timestamp: 0))
+        let sharedKey = self.key(MessageIndex(id: MessageId(peerId: PeerId(0), namespace: 0, id: 0), timestamp: 0))
         let sharedBuffer = WriteBuffer()
         let sharedEncoder = PostboxEncoder()
         
diff --git a/submodules/Postbox/Sources/MessageHistoryView.swift b/submodules/Postbox/Sources/MessageHistoryView.swift
index 71b6869b36..4966a9dea8 100644
--- a/submodules/Postbox/Sources/MessageHistoryView.swift
+++ b/submodules/Postbox/Sources/MessageHistoryView.swift
@@ -904,20 +904,20 @@ public final class MessageHistoryView {
     public let isLoading: Bool
     public let isAddedToChatList: Bool
     
-    public init(tagMask: MessageTags?, namespaces: MessageIdNamespaces, entries: [MessageHistoryEntry], holeEarlier: Bool) {
+    public init(tagMask: MessageTags?, namespaces: MessageIdNamespaces, entries: [MessageHistoryEntry], holeEarlier: Bool, holeLater: Bool, isLoading: Bool) {
         self.tagMask = tagMask
         self.namespaces = namespaces
         self.anchorIndex = .lowerBound
         self.earlierId = nil
         self.laterId = nil
         self.holeEarlier = holeEarlier
-        self.holeLater = false
+        self.holeLater = holeLater
         self.entries = entries
         self.maxReadIndex = nil
         self.fixedReadStates = nil
         self.topTaggedMessages = []
         self.additionalData = []
-        self.isLoading = false
+        self.isLoading = isLoading
         self.isAddedToChatList = false
     }
     
@@ -1053,7 +1053,7 @@ public final class MessageHistoryView {
                                         index = 0
                                         for entry in entries {
                                             if entry.index.id.peerId == peerId && entry.index.id.namespace == namespace {
-                                                maxNamespaceIndex = entry.index.predecessor()
+                                                maxNamespaceIndex = entry.index.peerLocalPredecessor()
                                                 break
                                             }
                                             index += 1
@@ -1109,7 +1109,7 @@ public final class MessageHistoryView {
                             index = 0
                             for entry in entries {
                                 if entry.index.id.peerId == peerId && entry.index.id.namespace == namespace {
-                                    maxNamespaceIndex = entry.index.predecessor()
+                                    maxNamespaceIndex = entry.index.peerLocalPredecessor()
                                     break
                                 }
                                 index += 1
diff --git a/submodules/Postbox/Sources/MessageHistoryViewState.swift b/submodules/Postbox/Sources/MessageHistoryViewState.swift
index 98de702b7b..7257692472 100644
--- a/submodules/Postbox/Sources/MessageHistoryViewState.swift
+++ b/submodules/Postbox/Sources/MessageHistoryViewState.swift
@@ -468,11 +468,11 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if items.higherThanAnchor.count == 0 {
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound())
                         } else {
-                            let clipIndex = items.higherThanAnchor[0].index.predecessor()
+                            let clipIndex = items.higherThanAnchor[0].index.peerLocalPredecessor()
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex)
                         }
                     } else {
-                        let clipIndex = items.lowerOrAtAnchor[0].index.predecessor()
+                        let clipIndex = items.lowerOrAtAnchor[0].index.peerLocalPredecessor()
                         clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex)
                     }
                 } else {
@@ -480,7 +480,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if items.higherThanAnchor.count == 0 {
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound())
                         } else {
-                            let clipIndex = items.higherThanAnchor[0].index.predecessor()
+                            let clipIndex = items.higherThanAnchor[0].index.peerLocalPredecessor()
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex)
                         }
                     } else {
@@ -488,7 +488,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if indices.contains(Int(items.lowerOrAtAnchor[i + 1].index.id.id)) {
                             clipIndex = items.lowerOrAtAnchor[i + 1].index
                         } else {
-                            clipIndex = items.lowerOrAtAnchor[i + 1].index.predecessor()
+                            clipIndex = items.lowerOrAtAnchor[i + 1].index.peerLocalPredecessor()
                         }
                         clipRanges.append(MessageIndex.absoluteLowerBound() ... clipIndex)
                     }
@@ -536,11 +536,11 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if items.lowerOrAtAnchor.count == 0 {
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound())
                         } else {
-                            let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.successor()
+                            let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.peerLocalSuccessor()
                             clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound())
                         }
                     } else {
-                        let clipIndex = items.higherThanAnchor[items.higherThanAnchor.count - 1].index.successor()
+                        let clipIndex = items.higherThanAnchor[items.higherThanAnchor.count - 1].index.peerLocalSuccessor()
                         clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound())
                     }
                 } else {
@@ -548,7 +548,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if items.lowerOrAtAnchor.count == 0 {
                             clipRanges.append(MessageIndex.absoluteLowerBound() ... MessageIndex.absoluteUpperBound())
                         } else {
-                            let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.successor()
+                            let clipIndex = items.lowerOrAtAnchor[items.lowerOrAtAnchor.count - 1].index.peerLocalSuccessor()
                             clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound())
                         }
                     } else {
@@ -556,7 +556,7 @@ private func sampleHoleRanges(input: MessageHistoryInput, orderedEntriesBySpace:
                         if indices.contains(Int(items.higherThanAnchor[i - 1].index.id.id)) {
                             clipIndex = items.higherThanAnchor[i - 1].index
                         } else {
-                            clipIndex = items.higherThanAnchor[i - 1].index.successor()
+                            clipIndex = items.higherThanAnchor[i - 1].index.peerLocalSuccessor()
                         }
                         clipRanges.append(clipIndex ... MessageIndex.absoluteUpperBound())
                     }
diff --git a/submodules/Postbox/Sources/OrderedItemListTable.swift b/submodules/Postbox/Sources/OrderedItemListTable.swift
index 7299cc8994..66c90f3f3d 100644
--- a/submodules/Postbox/Sources/OrderedItemListTable.swift
+++ b/submodules/Postbox/Sources/OrderedItemListTable.swift
@@ -29,17 +29,45 @@ final class OrderedItemListTable: Table {
         let key = ValueBoxKey(length: 1 + 4 + 4)
         key.setUInt8(0, value: OrderedItemListKeyNamespace.indexToId.rawValue)
         key.setInt32(1, value: collectionId)
-        key.setUInt32(5, value: itemIndex)
+        key.setUInt32(1 + 4, value: itemIndex)
         return key
     }
+
+    private func keyIndexToIdLowerBound(collectionId: Int32) -> ValueBoxKey {
+        let key = ValueBoxKey(length: 1 + 4 + 4)
+        key.setUInt8(0, value: OrderedItemListKeyNamespace.indexToId.rawValue)
+        key.setInt32(1, value: collectionId)
+        return key
+    }
+
+    private func keyIndexToIdUpperBound(collectionId: Int32) -> ValueBoxKey {
+        let key = ValueBoxKey(length: 1 + 4 + 4)
+        key.setUInt8(0, value: OrderedItemListKeyNamespace.indexToId.rawValue)
+        key.setInt32(1, value: collectionId)
+        return key.successor
+    }
     
     private func keyIdToIndex(collectionId: Int32, id: MemoryBuffer) -> ValueBoxKey {
         let key = ValueBoxKey(length: 1 + 4 + id.length)
         key.setUInt8(0, value: OrderedItemListKeyNamespace.idToIndex.rawValue)
         key.setInt32(1, value: collectionId)
-        memcpy(key.memory.advanced(by: 5), id.memory, id.length)
+        memcpy(key.memory.advanced(by: 1 + 4), id.memory, id.length)
         return key
     }
+
+    private func keyIdToIndexLowerBound(collectionId: Int32) -> ValueBoxKey {
+        let key = ValueBoxKey(length: 1 + 4)
+        key.setUInt8(0, value: OrderedItemListKeyNamespace.idToIndex.rawValue)
+        key.setInt32(1, value: collectionId)
+        return key
+    }
+
+    private func keyIdToIndexUpperBound(collectionId: Int32) -> ValueBoxKey {
+        let key = ValueBoxKey(length: 1 + 4)
+        key.setUInt8(0, value: OrderedItemListKeyNamespace.idToIndex.rawValue)
+        key.setInt32(1, value: collectionId)
+        return key.successor
+    }
     
     func getItemIds(collectionId: Int32) -> [MemoryBuffer] {
         var itemIds: [MemoryBuffer] = []
@@ -119,6 +147,8 @@ final class OrderedItemListTable: Table {
             self.indexTable.remove(collectionId: collectionId, id: id)
         }
         
+
+        assert(Set(items.map({ $0.id.makeData() })).count == items.count)
         for i in 0 ..< items.count {
             self.valueBox.set(self.table, key: self.keyIndexToId(collectionId: collectionId, itemIndex: UInt32(i)), value: items[i].id)
             var indexValue: UInt32 = UInt32(i)
diff --git a/submodules/Postbox/Sources/Peer.swift b/submodules/Postbox/Sources/Peer.swift
index 2f6dc2f3ca..48943109a3 100644
--- a/submodules/Postbox/Sources/Peer.swift
+++ b/submodules/Postbox/Sources/Peer.swift
@@ -1,11 +1,136 @@
 import Foundation
 
 public struct PeerId: Hashable, CustomStringConvertible, Comparable, Codable {
-    public typealias Namespace = Int32
-    public typealias Id = Int32
+    public struct Namespace: Comparable, Hashable, Codable, CustomStringConvertible {
+        public static var max: Namespace {
+            return Namespace(rawValue: 0x7)
+        }
+
+        fileprivate var rawValue: UInt32
+
+        var predecessor: Namespace {
+            if self.rawValue != 0 {
+                return Namespace(rawValue: self.rawValue - 1)
+            } else {
+                return self
+            }
+        }
+
+        var successor: Namespace {
+            if self.rawValue != Namespace.max.rawValue {
+                return Namespace(rawValue: self.rawValue + 1)
+            } else {
+                return self
+            }
+        }
+
+        public var description: String {
+            return "\(self.rawValue)"
+        }
+
+        fileprivate init(rawValue: UInt32) {
+            precondition((rawValue | 0x7) == 0x7)
+
+            self.rawValue = rawValue
+        }
+
+        public static func _internalFromInt32Value(_ value: Int32) -> Namespace {
+            return Namespace(rawValue: UInt32(bitPattern: value))
+        }
+
+        public func _internalGetInt32Value() -> Int32 {
+            return Int32(bitPattern: self.rawValue)
+        }
+
+        public static func <(lhs: Namespace, rhs: Namespace) -> Bool {
+            return lhs.rawValue < rhs.rawValue
+        }
+    }
+
+    public struct Id: Comparable, Hashable, Codable {
+        public static var min: Id {
+            return Id(rawValue: 0)
+        }
+
+        public static var max: Id {
+            return Id(rawValue: 0x000000007fffffff)
+        }
+
+        fileprivate var rawValue: Int32
+
+        var predecessor: Id {
+            if self.rawValue != 0 {
+                return Id(rawValue: self.rawValue - 1)
+            } else {
+                return self
+            }
+        }
+
+        var successor: Id {
+            if self.rawValue != Id.max.rawValue {
+                return Id(rawValue: self.rawValue + 1)
+            } else {
+                return self
+            }
+        }
+
+        public var description: String {
+            return "\(self.rawValue)"
+        }
+
+        fileprivate init(rawValue: Int32) {
+            //precondition((rawValue | 0x000FFFFFFFFFFFFF) == 0x000FFFFFFFFFFFFF)
+
+            self.rawValue = rawValue
+        }
+
+        public static func _internalFromInt32Value(_ value: Int32) -> Id {
+            return Id(rawValue: value)
+        }
+
+        public func _internalGetInt32Value() -> Int32 {
+            return self.rawValue
+        }
+
+        public static func <(lhs: Id, rhs: Id) -> Bool {
+            return lhs.rawValue < rhs.rawValue
+        }
+    }
+
+    public static var max: PeerId {
+        return PeerId(namespace: .max, id: .max)
+    }
     
     public let namespace: Namespace
     public let id: Id
+
+    var predecessor: PeerId {
+        let previousId = self.id.predecessor
+        if previousId != self.id {
+            return PeerId(namespace: self.namespace, id: previousId)
+        } else {
+            let previousNamespace = self.namespace.predecessor
+            if previousNamespace != self.namespace {
+                return PeerId(namespace: previousNamespace, id: .max)
+            } else {
+                return self
+            }
+        }
+    }
+
+    var successor: PeerId {
+        let nextId = self.id.successor
+        if nextId != self.id {
+            return PeerId(namespace: self.namespace, id: nextId)
+        } else {
+            let nextNamespace = self.namespace.successor
+            if nextNamespace != self.namespace {
+                return PeerId(namespace: nextNamespace, id: .min)
+            } else {
+                return self
+            }
+        }
+    }
     
     public init(namespace: Namespace, id: Id) {
         self.namespace = namespace
@@ -13,12 +138,54 @@ public struct PeerId: Hashable, CustomStringConvertible, Comparable, Codable {
     }
     
     public init(_ n: Int64) {
-        self.namespace = Int32((n >> 32) & 0x7fffffff)
-        self.id = Int32(bitPattern: UInt32(n & 0xffffffff))
+        let data = UInt64(bitPattern: n)
+
+        let legacyNamespaceBits = ((data >> 32) & 0xffffffff)
+        let idLowBits = data & 0xffffffff
+
+        if legacyNamespaceBits == 0x7fffffff && idLowBits == 0 {
+            self.namespace = .max
+            self.id = Id(rawValue: Int32(bitPattern: UInt32(clamping: idLowBits)))
+        } else {
+            let namespaceBits = ((data >> 32) & 0x7)
+            self.namespace = Namespace(rawValue: UInt32(namespaceBits))
+
+            let idHighBits = (data >> (32 + 3)) & 0xffffffff
+            //assert(idHighBits == 0)
+
+            self.id = Id(rawValue: Int32(bitPattern: UInt32(clamping: idLowBits)))
+        }
     }
     
     public func toInt64() -> Int64 {
-        return (Int64(self.namespace) << 32) | Int64(bitPattern: UInt64(UInt32(bitPattern: self.id)))
+        let idLowBits = UInt32(bitPattern: self.id.rawValue)
+
+        let result: Int64
+        if self.namespace == .max && self.id.rawValue == 0 {
+            var data: UInt64 = 0
+
+            let namespaceBits: UInt64 = 0x7fffffff
+            data |= namespaceBits << 32
+
+            data |= UInt64(idLowBits)
+
+            result = Int64(bitPattern: data)
+        } else {
+            var data: UInt64 = 0
+            data |= UInt64(self.namespace.rawValue) << 32
+
+            let idValue = UInt32(bitPattern: self.id.rawValue)
+            let idHighBits = (idValue >> 32) & 0x3FFFFFFF
+            assert(idHighBits == 0)
+
+            data |= UInt64(idLowBits)
+
+            result = Int64(bitPattern: data)
+        }
+
+        assert(PeerId(result) == self)
+
+        return result
     }
     
     public static func encodeArrayToBuffer(_ array: [PeerId], buffer: WriteBuffer) {
@@ -46,32 +213,23 @@ public struct PeerId: Hashable, CustomStringConvertible, Comparable, Codable {
         return array
     }
     
-    public var hashValue: Int {
-        get {
-            return Int(self.id)
-        }
-    }
-    
     public var description: String {
         get {
             return "\(namespace):\(id)"
         }
     }
     
-    public init(_ buffer: ReadBuffer) {
-        var namespace: Int32 = 0
-        var id: Int32 = 0
-        memcpy(&namespace, buffer.memory, 4)
-        self.namespace = namespace
-        memcpy(&id, buffer.memory + 4, 4)
-        self.id = id
-    }
+    /*public init(_ buffer: ReadBuffer) {
+        var value: Int64 = 0
+        memcpy(&value, buffer.memory, 8)
+        buffer.offset += 8
+
+        self.init(value)
+    }*/
     
     public func encodeToBuffer(_ buffer: WriteBuffer) {
-        var namespace = self.namespace
-        var id = self.id
-        buffer.write(&namespace, offset: 0, length: 4);
-        buffer.write(&id, offset: 0, length: 4);
+        var value = self.toInt64()
+        buffer.write(&value, offset: 0, length: 8);
     }
 
     public static func <(lhs: PeerId, rhs: PeerId) -> Bool {
diff --git a/submodules/Postbox/Sources/Postbox.swift b/submodules/Postbox/Sources/Postbox.swift
index 5b0f799b5f..1a93b8aee3 100644
--- a/submodules/Postbox/Sources/Postbox.swift
+++ b/submodules/Postbox/Sources/Postbox.swift
@@ -985,6 +985,11 @@ public final class Transaction {
         assert(!self.disposed)
         self.postbox?.scanMessages(peerId: peerId, namespace: namespace, tag: tag, f)
     }
+
+    public func scanTopMessages(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (Message) -> Bool) {
+        assert(!self.disposed)
+        self.postbox?.scanTopMessages(peerId: peerId, namespace: namespace, limit: limit, f)
+    }
     
     public func scanMessageAttributes(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (MessageId, [MessageAttribute]) -> Bool) {
         self.postbox?.scanMessageAttributes(peerId: peerId, namespace: namespace, limit: limit, f)
@@ -1091,6 +1096,11 @@ public final class Transaction {
         assert(!self.disposed)
         return self.postbox?.searchPeers(query: query) ?? []
     }
+
+    public func clearTimestampBasedAttribute(id: MessageId, tag: UInt16) {
+        assert(!self.disposed)
+        self.postbox?.clearTimestampBasedAttribute(id: id, tag: tag)
+    }
 }
 
 public enum PostboxResult {
@@ -1129,6 +1139,8 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration,
     let queue = sharedQueue
     return Signal { subscriber in
         queue.async {
+            postboxLog("openPostbox, basePath: \(basePath), useCopy: \(useCopy)")
+
             let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil)
             
             var tempDir: TempBoxDirectory?
@@ -1149,6 +1161,7 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration,
                         return
                     }
                 } else {
+                    postboxLog("openPostbox, error1")
                     subscriber.putNext(.error)
                     return
                 }
@@ -1163,10 +1176,14 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration,
             #endif
             
             let startTime = CFAbsoluteTimeGetCurrent()
+
+            postboxLog("openPostbox, initialize SqliteValueBox")
             
             guard var valueBox = SqliteValueBox(basePath: dbBasePath, queue: queue, isTemporary: isTemporary, isReadOnly: isReadOnly, encryptionParameters: encryptionParameters, upgradeProgress: { progress in
+                postboxLog("openPostbox, SqliteValueBox upgrading progress \(progress)")
                 subscriber.putNext(.upgrading(progress))
             }) else {
+                postboxLog("openPostbox, SqliteValueBox open error")
                 subscriber.putNext(.error)
                 return
             }
@@ -1176,10 +1193,13 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration,
                 
                 let userVersion: Int32? = metadataTable.userVersion()
                 let currentUserVersion: Int32 = 25
+
+                postboxLog("openPostbox, current userVersion: \(userVersion ?? nil)")
                 
                 if let userVersion = userVersion {
                     if userVersion != currentUserVersion {
                         if isTemporary {
+                            postboxLog("openPostbox, isTemporary = true, not upgrading")
                             subscriber.putNext(.error)
                             return
                         } else {
@@ -1241,9 +1261,12 @@ public func openPostbox(basePath: String, seedConfiguration: SeedConfiguration,
                 }
                 
                 let endTime = CFAbsoluteTimeGetCurrent()
-                print("Postbox load took \((endTime - startTime) * 1000.0) ms")
+                postboxLog("Postbox load took \((endTime - startTime) * 1000.0) ms")
                 
                 subscriber.putNext(.postbox(Postbox(queue: queue, basePath: basePath, seedConfiguration: seedConfiguration, valueBox: valueBox, timestampForAbsoluteTimeBasedOperations: timestampForAbsoluteTimeBasedOperations, isTemporary: isTemporary, tempDir: tempDir)))
+
+                postboxLog("openPostbox, putCompletion")
+
                 subscriber.putCompletion()
                 break
             }
@@ -1407,22 +1430,11 @@ public final class Postbox {
         self.seedConfiguration = seedConfiguration
         self.tempDir = tempDir
         
-        print("MediaBox path: \(self.basePath + "/media")")
+        postboxLog("MediaBox path: \(basePath + "/media")")
         
         self.mediaBox = MediaBox(basePath: self.basePath + "/media")
         self.valueBox = valueBox
         
-        /*self.pipeNotifier = PipeNotifier(basePath: basePath, notify: { [weak self] in
-            //if let strongSelf = self {
-                /*strongSelf.queue.async {
-                    if strongSelf.valueBox != nil {
-                        let _ = strongSelf.transaction({ _ -> Void in
-                        }).start()
-                    }
-                }*/
-            //}
-        })*/
-        
         self.metadataTable = MetadataTable(valueBox: self.valueBox, table: MetadataTable.tableSpec(0))
         
         self.keychainTable = KeychainTable(valueBox: self.valueBox, table: KeychainTable.tableSpec(1))
@@ -1557,7 +1569,7 @@ public final class Postbox {
             })
         )
         
-        print("(Postbox initialization took \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+        postboxLog("(Postbox initialization took \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
         
         let _ = self.transaction({ transaction -> Void in
             let reindexUnreadVersion: Int32 = 2
@@ -3409,6 +3421,26 @@ public final class Postbox {
             }
         }
     }
+
+    fileprivate func scanTopMessages(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (Message) -> Bool) {
+        let lowerBound = MessageIndex.lowerBound(peerId: peerId, namespace: namespace)
+        var index = MessageIndex.upperBound(peerId: peerId, namespace: namespace)
+        var remainingLimit = limit
+        while remainingLimit > 0 {
+            let messages = self.messageHistoryTable.fetch(peerId: peerId, namespace: namespace, tag: nil, threadId: nil, from: index, includeFrom: false, to: lowerBound, limit: 10)
+            remainingLimit -= 10
+            for message in messages {
+                if !f(self.renderIntermediateMessage(message)) {
+                    break
+                }
+            }
+            if let last = messages.last {
+                index = last.index
+            } else {
+                break
+            }
+        }
+    }
     
     fileprivate func scanMessageAttributes(peerId: PeerId, namespace: MessageId.Namespace, limit: Int, _ f: (MessageId, [MessageAttribute]) -> Bool) {
         var remainingLimit = limit
@@ -3538,6 +3570,10 @@ public final class Postbox {
             }
         }
     }
+
+    fileprivate func clearTimestampBasedAttribute(id: MessageId, tag: UInt16) {
+        self.timestampBasedMessageAttributesTable.remove(tag: tag, id: id, operations: &self.currentTimestampBasedMessageAttributesOperations)
+    }
     
     fileprivate func reindexUnreadCounters() {
         self.groupMessageStatsTable.removeAll()
diff --git a/submodules/Postbox/Sources/PostboxUpgrade_15to16.swift b/submodules/Postbox/Sources/PostboxUpgrade_15to16.swift
index 62a4714b43..e8d8d9334f 100644
--- a/submodules/Postbox/Sources/PostboxUpgrade_15to16.swift
+++ b/submodules/Postbox/Sources/PostboxUpgrade_15to16.swift
@@ -211,10 +211,8 @@ func postboxUpgrade_15to16(metadataTable: MetadataTable, valueBox: ValueBox, pro
     
     valueBox.scanInt64(chatListIndexTable, values: { key, value in
         let peerId = PeerId(key)
-        if peerId.namespace != Int32.max {
-            if parseInclusionIndex(peerId: peerId, value: value) {
-                includedPeerIds.append(peerId)
-            }
+        if parseInclusionIndex(peerId: peerId, value: value) {
+            includedPeerIds.append(peerId)
         }
         return true
     })
diff --git a/submodules/Postbox/Sources/PostboxUpgrade_16to17.swift b/submodules/Postbox/Sources/PostboxUpgrade_16to17.swift
index 3bdbfea670..030c1fce46 100644
--- a/submodules/Postbox/Sources/PostboxUpgrade_16to17.swift
+++ b/submodules/Postbox/Sources/PostboxUpgrade_16to17.swift
@@ -215,10 +215,8 @@ func postboxUpgrade_16to17(metadataTable: MetadataTable, valueBox: ValueBox, pro
     
     valueBox.scanInt64(chatListIndexTable, values: { key, value in
         let peerId = PeerId(key)
-        if peerId.namespace != Int32.max {
-            if parseInclusionIndex(peerId: peerId, value: value) {
-                includedPeerIds.append(peerId)
-            }
+        if parseInclusionIndex(peerId: peerId, value: value) {
+            includedPeerIds.append(peerId)
         }
         return true
     })
diff --git a/submodules/Postbox/Sources/PostboxUpgrade_19to20.swift b/submodules/Postbox/Sources/PostboxUpgrade_19to20.swift
index 2faa64bec9..074275cd5b 100644
--- a/submodules/Postbox/Sources/PostboxUpgrade_19to20.swift
+++ b/submodules/Postbox/Sources/PostboxUpgrade_19to20.swift
@@ -424,7 +424,7 @@ func postboxUpgrade_19to20(metadataTable: MetadataTable, valueBox: ValueBox, pro
     var removeChatListKeys: [ValueBoxKey] = []
     valueBox.scan(chatListTable, keys: { key in
         let (_, _, index, type) = extractChatListKey(key)
-        if index.id.peerId.namespace != 3 { // Secret Chat
+        if index.id.peerId.namespace._internalGetInt32Value() != 3 { // Secret Chat
             sharedChatListIndexKey.setInt64(0, value: index.id.peerId.toInt64())
             valueBox.remove(chatListIndexTable, key: sharedChatListIndexKey, secure: false)
             
diff --git a/submodules/Postbox/Sources/PostboxUpgrade_20to21.swift b/submodules/Postbox/Sources/PostboxUpgrade_20to21.swift
index f33b8459a2..00fd244141 100644
--- a/submodules/Postbox/Sources/PostboxUpgrade_20to21.swift
+++ b/submodules/Postbox/Sources/PostboxUpgrade_20to21.swift
@@ -426,7 +426,7 @@ func postboxUpgrade_20to21(metadataTable: MetadataTable, valueBox: ValueBox, pro
     var removeChatListKeys: [ValueBoxKey] = []
     valueBox.scan(chatListTable, keys: { key in
         let (_, _, index, type) = extractChatListKey(key)
-        if index.id.peerId.namespace != 3 { // Secret Chat
+        if index.id.peerId.namespace._internalGetInt32Value() != 3 { // Secret Chat
             sharedChatListIndexKey.setInt64(0, value: index.id.peerId.toInt64())
             valueBox.remove(chatListIndexTable, key: sharedChatListIndexKey, secure: false)
             
diff --git a/submodules/Postbox/Sources/SqliteValueBox.swift b/submodules/Postbox/Sources/SqliteValueBox.swift
index 0ae732a92a..b9409cecc4 100644
--- a/submodules/Postbox/Sources/SqliteValueBox.swift
+++ b/submodules/Postbox/Sources/SqliteValueBox.swift
@@ -65,7 +65,7 @@ struct SqlitePreparedStatement {
         }
         return res == SQLITE_ROW
     }
-    
+
     struct SqlError: Error {
         var code: Int32
     }
@@ -234,10 +234,8 @@ public final class SqliteValueBox: ValueBox {
         
         let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil)
         let path = basePath + "/db_sqlite"
-        
-        #if DEBUG
-        print("Instance \(self) opening sqlite at \(path)")
-        #endif
+
+        postboxLog("Instance \(self) opening sqlite at \(path)")
         
         #if DEBUG
         let exists = FileManager.default.fileExists(atPath: path)
@@ -297,8 +295,10 @@ public final class SqliteValueBox: ValueBox {
             let _ = try? FileManager.default.removeItem(atPath: path)
             preconditionFailure("Couldn't open database")
         }
-        
-        sqlite3_busy_timeout(database.handle, 1000 * 10000)
+
+        postboxLog("Did open DB at \(path)")
+
+        sqlite3_busy_timeout(database.handle, 5 * 1000)
         
         var resultCode: Bool = true
         
@@ -306,8 +306,12 @@ public final class SqliteValueBox: ValueBox {
         assert(resultCode)
         resultCode = database.execute("PRAGMA cipher_default_plaintext_header_size=32")
         assert(resultCode)
+
+        postboxLog("Did set up cipher")
         
         if self.isEncrypted(database) {
+            postboxLog("Database is encrypted")
+
             if let encryptionParameters = encryptionParameters {
                 precondition(encryptionParameters.salt.data.count == 16)
                 precondition(encryptionParameters.key.data.count == 32)
@@ -316,12 +320,15 @@ public final class SqliteValueBox: ValueBox {
                 
                 resultCode = database.execute("PRAGMA key=\"x'\(hexKey)'\"")
                 assert(resultCode)
+
+                postboxLog("Setting encryption key")
                 
                 if self.isEncrypted(database) {
+                    postboxLog("Encryption key is invalid")
+
                     if isTemporary || isReadOnly {
                         return nil
                     }
-                    postboxLog("Encryption key is invalid")
                     
                     for fileName in dabaseFileNames {
                         let _ = try? FileManager.default.removeItem(atPath: basePath + "/\(fileName)")
@@ -354,6 +361,8 @@ public final class SqliteValueBox: ValueBox {
                 assert(resultCode)
             }
         } else if let encryptionParameters = encryptionParameters, encryptionParameters.forceEncryptionIfNoSet {
+            postboxLog("Not encrypted")
+
             let hexKey = hexString(encryptionParameters.key.data + encryptionParameters.salt.data)
             
             if FileManager.default.fileExists(atPath: path) {
@@ -409,6 +418,8 @@ public final class SqliteValueBox: ValueBox {
                 }
             }
         }
+
+        postboxLog("Did set up encryption")
         
         //database.execute("PRAGMA cache_size=-2097152")
         resultCode = database.execute("PRAGMA mmap_size=0")
@@ -421,6 +432,9 @@ public final class SqliteValueBox: ValueBox {
         assert(resultCode)
         resultCode = database.execute("PRAGMA cipher_memory_security = OFF")
         assert(resultCode)
+
+        postboxLog("Did set up pragmas")
+
         //resultCode = database.execute("PRAGMA wal_autocheckpoint=500")
         //database.execute("PRAGMA journal_size_limit=1536")
         
@@ -441,8 +455,12 @@ public final class SqliteValueBox: ValueBox {
         
         let _ = self.runPragma(database, "checkpoint_fullfsync = 1")
         assert(self.runPragma(database, "checkpoint_fullfsync") == "1")
+
+        postboxLog("Did set up checkpoint_fullfsync")
         
         self.beginInternal(database: database)
+
+        postboxLog("Did begin transaction")
         
         let result = self.getUserVersion(database)
         
@@ -462,8 +480,12 @@ public final class SqliteValueBox: ValueBox {
         for table in self.listFullTextTables(database) {
             self.fullTextTables[table.id] = table
         }
+
+        postboxLog("Did load tables")
         
         self.commitInternal(database: database)
+
+        postboxLog("Did commit final")
         
         lock.unlock()
         
@@ -518,7 +540,21 @@ public final class SqliteValueBox: ValueBox {
     
     private func isEncrypted(_ database: Database) -> Bool {
         var statement: OpaquePointer? = nil
+        postboxLog("isEncrypted prepare...")
+
+        let allIsOk = Atomic<Bool>(value: false)
+        let databasePath = self.databasePath
+        DispatchQueue.global().asyncAfter(deadline: .now() + 5.0, execute: {
+            if allIsOk.with({ $0 }) == false {
+                postboxLog("Timeout reached, discarding database")
+                try? FileManager.default.removeItem(atPath: databasePath)
+
+                exit(0)
+            }
+        })
         let status = sqlite3_prepare_v2(database.handle, "SELECT * FROM sqlite_master LIMIT 1", -1, &statement, nil)
+        let _ = allIsOk.swap(true)
+        postboxLog("isEncrypted prepare done")
         if statement == nil {
             postboxLog("isEncrypted: sqlite3_prepare_v2 status = \(status) [\(self.databasePath)]")
             return true
@@ -536,6 +572,7 @@ public final class SqliteValueBox: ValueBox {
             preparedStatement.destroy()
             return true
         }
+        postboxLog("isEncrypted step done")
         preparedStatement.destroy()
         return status == SQLITE_NOTADB
     }
diff --git a/submodules/Postbox/Sources/TimeBasedCleanup.swift b/submodules/Postbox/Sources/TimeBasedCleanup.swift
index f8b020c907..0230cca372 100644
--- a/submodules/Postbox/Sources/TimeBasedCleanup.swift
+++ b/submodules/Postbox/Sources/TimeBasedCleanup.swift
@@ -170,7 +170,7 @@ private final class TimeBasedCleanupImpl {
         let generalPaths = self.generalPaths
         let shortLivedPaths = self.shortLivedPaths
         let scanOnce = Signal<Never, NoError> { subscriber in
-            DispatchQueue.global(qos: .utility).async {
+            DispatchQueue.global(qos: .background).async {
                 var removedShortLivedCount: Int = 0
                 var removedGeneralCount: Int = 0
                 var removedGeneralLimitCount: Int = 0
diff --git a/submodules/Postbox/Sources/TimestampBasedMessageAttributesTable.swift b/submodules/Postbox/Sources/TimestampBasedMessageAttributesTable.swift
index 8285b09ee2..541cf987e4 100644
--- a/submodules/Postbox/Sources/TimestampBasedMessageAttributesTable.swift
+++ b/submodules/Postbox/Sources/TimestampBasedMessageAttributesTable.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public struct TimestampBasedMessageAttributesEntry {
+public struct TimestampBasedMessageAttributesEntry: CustomStringConvertible {
     public let tag: UInt16
     public let timestamp: Int32
     public let messageId: MessageId
@@ -8,6 +8,10 @@ public struct TimestampBasedMessageAttributesEntry {
     public var index: MessageIndex {
         return MessageIndex(id: self.messageId, timestamp: timestamp)
     }
+
+    public var description: String {
+        return "(tag: \(self.tag), timestamp: \(self.timestamp), messageId: \(self.messageId))"
+    }
 }
 
 enum TimestampBasedMessageAttributesOperation {
@@ -53,7 +57,11 @@ final class TimestampBasedMessageAttributesTable: Table {
     }
     
     func set(tag: UInt16, id: MessageId, timestamp: Int32, operations: inout [TimestampBasedMessageAttributesOperation]) {
-        if let previousTimestamp = self.indexTable.get(tag: tag, id: id) {
+        let previousTimestamp = self.indexTable.get(tag: tag, id: id)
+
+        postboxLog("TimestampBasedMessageAttributesTable set(tag: \(tag), id: \(id), timestamp: \(timestamp)) previousTimestamp: \(String(describing: previousTimestamp))")
+
+        if let previousTimestamp = previousTimestamp {
             if previousTimestamp == timestamp {
                 return
             } else {
@@ -67,7 +75,11 @@ final class TimestampBasedMessageAttributesTable: Table {
     }
     
     func remove(tag: UInt16, id: MessageId, operations: inout [TimestampBasedMessageAttributesOperation]) {
-        if let previousTimestamp = self.indexTable.get(tag: tag, id: id) {
+        let previousTimestamp = self.indexTable.get(tag: tag, id: id)
+
+        postboxLog("TimestampBasedMessageAttributesTable remove(tag: \(tag), id: \(id)) previousTimestamp: \(String(describing: previousTimestamp))")
+
+        if let previousTimestamp = previousTimestamp {
             self.valueBox.remove(self.table, key: self.key(tag: tag, timestamp: previousTimestamp, id: id), secure: false)
             self.indexTable.remove(tag: tag, id: id)
             operations.append(.remove(TimestampBasedMessageAttributesEntry(tag: tag, timestamp: previousTimestamp, messageId: id)))
diff --git a/submodules/Postbox/Sources/TimestampBasedMessageAttributesView.swift b/submodules/Postbox/Sources/TimestampBasedMessageAttributesView.swift
index bbff66b6d0..a253f1ba23 100644
--- a/submodules/Postbox/Sources/TimestampBasedMessageAttributesView.swift
+++ b/submodules/Postbox/Sources/TimestampBasedMessageAttributesView.swift
@@ -7,6 +7,8 @@ final class MutableTimestampBasedMessageAttributesView {
     init(postbox: Postbox, tag: UInt16) {
         self.tag = tag
         self.head = postbox.timestampBasedMessageAttributesTable.head(tag: tag)
+
+        postboxLog("MutableTimestampBasedMessageAttributesView: tag: \(tag) head: \(String(describing: self.head))")
     }
     
     func replay(postbox: Postbox, operations: [TimestampBasedMessageAttributesOperation]) -> Bool {
diff --git a/submodules/PresentationDataUtils/Sources/AlertTheme.swift b/submodules/PresentationDataUtils/Sources/AlertTheme.swift
index a2d4ddb5a2..9fbfb15c0f 100644
--- a/submodules/PresentationDataUtils/Sources/AlertTheme.swift
+++ b/submodules/PresentationDataUtils/Sources/AlertTheme.swift
@@ -6,11 +6,15 @@ import SwiftSignalKit
 import TelegramPresentationData
 
 public func textAlertController(context: AccountContext, forceTheme: PresentationTheme? = nil, title: String?, text: String, actions: [TextAlertAction], actionLayout: TextAlertContentActionLayout = .horizontal, allowInputInset: Bool = true, dismissOnOutsideTap: Bool = true) -> AlertController {
-    var presentationData = context.sharedContext.currentPresentationData.with { $0 }
+    return textAlertController(sharedContext: context.sharedContext, forceTheme: forceTheme, title: title, text: text, actions: actions, actionLayout: actionLayout, allowInputInset: allowInputInset, dismissOnOutsideTap: dismissOnOutsideTap)
+}
+
+public func textAlertController(sharedContext: SharedAccountContext, forceTheme: PresentationTheme? = nil, title: String?, text: String, actions: [TextAlertAction], actionLayout: TextAlertContentActionLayout = .horizontal, allowInputInset: Bool = true, dismissOnOutsideTap: Bool = true) -> AlertController {
+    var presentationData = sharedContext.currentPresentationData.with { $0 }
     if let forceTheme = forceTheme {
         presentationData = presentationData.withUpdated(theme: forceTheme)
     }
-    return textAlertController(alertContext: AlertControllerContext(theme: AlertControllerTheme(presentationData: presentationData), themeSignal: context.sharedContext.presentationData |> map {
+    return textAlertController(alertContext: AlertControllerContext(theme: AlertControllerTheme(presentationData: presentationData), themeSignal: sharedContext.presentationData |> map {
         presentationData in
         var presentationData = presentationData
         if let forceTheme = forceTheme {
diff --git a/submodules/PresentationDataUtils/Sources/OpenUrl.swift b/submodules/PresentationDataUtils/Sources/OpenUrl.swift
index 25b894efca..8ab09feb64 100644
--- a/submodules/PresentationDataUtils/Sources/OpenUrl.swift
+++ b/submodules/PresentationDataUtils/Sources/OpenUrl.swift
@@ -1,11 +1,12 @@
 import Foundation
 import Display
 import SwiftSignalKit
+import Postbox
 import AccountContext
 import OverlayStatusController
 import UrlWhitelist
 
-public func openUserGeneratedUrl(context: AccountContext, url: String, concealed: Bool, skipUrlAuth: Bool = false, present: @escaping (ViewController) -> Void, openResolved: @escaping (ResolvedUrl) -> Void) {
+public func openUserGeneratedUrl(context: AccountContext, peerId: PeerId?, url: String, concealed: Bool, skipUrlAuth: Bool = false, present: @escaping (ViewController) -> Void, openResolved: @escaping (ResolvedUrl) -> Void) {
     var concealed = concealed
     
     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -31,7 +32,7 @@ public func openUserGeneratedUrl(context: AccountContext, url: String, concealed
         cancelImpl = {
             disposable.dispose()
         }
-        disposable.set((context.sharedContext.resolveUrl(account: context.account, url: url, skipUrlAuth: skipUrlAuth)
+        disposable.set((context.sharedContext.resolveUrl(context: context, peerId: peerId, url: url, skipUrlAuth: skipUrlAuth)
         |> afterDisposed {
             Queue.mainQueue().async {
                 progressDisposable.dispose()
diff --git a/submodules/QrCode/Sources/QrCode.swift b/submodules/QrCode/Sources/QrCode.swift
index 5e26ae2357..eb3cb3c082 100644
--- a/submodules/QrCode/Sources/QrCode.swift
+++ b/submodules/QrCode/Sources/QrCode.swift
@@ -46,7 +46,7 @@ public func qrCode(string: String, color: UIColor, backgroundColor: UIColor? = n
             
             if let output = filter.outputImage {
                 let size = Int(output.extent.width)
-                let bytesPerRow = (4 * Int(size) + 15) & (~15)
+                let bytesPerRow = DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(size))
                 let length = bytesPerRow * size
                 let bitmapInfo = CGBitmapInfo(rawValue: CGBitmapInfo.byteOrder32Little.rawValue | CGImageAlphaInfo.noneSkipFirst.rawValue)
                 
diff --git a/submodules/RadialStatusNode/Sources/RadialStatusBackgroundNode.swift b/submodules/RadialStatusNode/Sources/RadialStatusBackgroundNode.swift
index d32ae107a7..8dad789975 100644
--- a/submodules/RadialStatusNode/Sources/RadialStatusBackgroundNode.swift
+++ b/submodules/RadialStatusNode/Sources/RadialStatusBackgroundNode.swift
@@ -1,48 +1,6 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import Display
 
-private final class RadialStatusBackgroundNodeParameters: NSObject {
-    let color: UIColor
-    
-    init(color: UIColor) {
-        self.color = color
-    }
-}
 
-final class RadialStatusBackgroundNode: ASDisplayNode {
-    var color: UIColor {
-        didSet {
-            self.setNeedsDisplay()
-        }
-    }
-    
-    init(color: UIColor, synchronous: Bool) {
-        self.color = color
-        
-        super.init()
-        
-        self.displaysAsynchronously = !synchronous
-        self.isLayerBacked = true
-        self.isOpaque = false
-    }
-    
-    override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? {
-        return RadialStatusBackgroundNodeParameters(color: self.color)
-    }
-    
-    @objc override class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) {
-        let context = UIGraphicsGetCurrentContext()!
-        
-        if !isRasterizing {
-            context.setBlendMode(.copy)
-            context.setFillColor(UIColor.clear.cgColor)
-            context.fill(bounds)
-        }
-        
-        if let parameters = parameters as? RadialStatusBackgroundNodeParameters {
-            context.setFillColor(parameters.color.cgColor)
-            context.fillEllipse(in: bounds)
-        }
-    }
-}
diff --git a/submodules/RadialStatusNode/Sources/RadialStatusNode.swift b/submodules/RadialStatusNode/Sources/RadialStatusNode.swift
index 9bfbcbb715..28670b84b2 100644
--- a/submodules/RadialStatusNode/Sources/RadialStatusNode.swift
+++ b/submodules/RadialStatusNode/Sources/RadialStatusNode.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import AsyncDisplayKit
+import Display
 
 public enum RadialStatusNodeState: Equatable {
     case none
@@ -190,14 +191,19 @@ public final class RadialStatusNode: ASControlNode {
             self.transitionToBackgroundColor(self.state.backgroundColor(color: self.backgroundNodeColor), previousContentNode: nil, animated: false, synchronous: false, completion: {})
         }
     }
-    
+
+    private let enableBlur: Bool
+
     public private(set) var state: RadialStatusNodeState = .none
     
-    private var backgroundNode: RadialStatusBackgroundNode?
+    private var backgroundNode: NavigationBackgroundNode?
+    private var currentBackgroundNodeColor: UIColor?
+
     private var contentNode: RadialStatusContentNode?
     private var nextContentNode: RadialStatusContentNode?
     
-    public init(backgroundNodeColor: UIColor) {
+    public init(backgroundNodeColor: UIColor, enableBlur: Bool = false) {
+        self.enableBlur = enableBlur
         self.backgroundNodeColor = backgroundNodeColor
         
         super.init()
@@ -287,7 +293,7 @@ public final class RadialStatusNode: ASControlNode {
     }
     
     private func transitionToBackgroundColor(_ color: UIColor?, previousContentNode: RadialStatusContentNode?, animated: Bool, synchronous: Bool, completion: @escaping () -> Void) {
-        let currentColor = self.backgroundNode?.color
+        let currentColor = self.currentBackgroundNodeColor
         
         var updated = false
         if let color = color, let currentColor = currentColor {
@@ -299,11 +305,16 @@ public final class RadialStatusNode: ASControlNode {
         if updated {
             if let color = color {
                 if let backgroundNode = self.backgroundNode {
-                    backgroundNode.color = color
+                    backgroundNode.updateColor(color: color, transition: .immediate)
+                    self.currentBackgroundNodeColor = color
+
                     completion()
                 } else {
-                    let backgroundNode = RadialStatusBackgroundNode(color: color, synchronous: synchronous)
+                    let backgroundNode = NavigationBackgroundNode(color: color, enableBlur: self.enableBlur)
+                    self.currentBackgroundNodeColor = color
+
                     backgroundNode.frame = self.bounds
+                    backgroundNode.update(size: backgroundNode.bounds.size, cornerRadius: backgroundNode.bounds.size.height / 2.0, transition: .immediate)
                     self.backgroundNode = backgroundNode
                     self.insertSubnode(backgroundNode, at: 0)
                     
@@ -318,6 +329,7 @@ public final class RadialStatusNode: ASControlNode {
                 }
             } else if let backgroundNode = self.backgroundNode {
                 self.backgroundNode = nil
+                self.currentBackgroundNodeColor = nil
                 if animated {
                     backgroundNode.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
                     previousContentNode?.layer.animateScale(from: 1.0, to: 0.01, duration: 0.2, removeOnCompletion: false)
@@ -336,7 +348,10 @@ public final class RadialStatusNode: ASControlNode {
     }
     
     override public func layout() {
-        self.backgroundNode?.frame = self.bounds
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.frame = self.bounds
+            backgroundNode.update(size: backgroundNode.bounds.size, cornerRadius: backgroundNode.bounds.size.height / 2.0, transition: .immediate)
+        }
         if let contentNode = self.contentNode {
             contentNode.frame = self.bounds
         }
diff --git a/submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift
index 08d5aef3a4..59d287b874 100644
--- a/submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift
+++ b/submodules/SSignalKit/SwiftSignalKit/Source/Bag.swift
@@ -1,5 +1,17 @@
 import Foundation
 
+public final class Weak<T: AnyObject> {
+    private weak var _value: T?
+
+    public var value: T? {
+        return self._value
+    }
+
+    public init(_ value: T) {
+        self._value = value
+    }
+}
+
 public final class Bag<T> {
     public typealias Index = Int
     private var nextIndex: Index = 0
@@ -73,6 +85,46 @@ public final class Bag<T> {
     }
 }
 
+public final class SparseBag<T>: Sequence {
+    public typealias Index = Int
+    private var nextIndex: Index = 0
+    private var items: [Index: T] = [:]
+
+    public init() {
+    }
+
+    public func add(_ item: T) -> Index {
+        let key = self.nextIndex
+        self.nextIndex += 1
+        self.items[key] = item
+
+        return key
+    }
+
+    public func get(_ index: Index) -> T? {
+        return self.items[index]
+    }
+
+    public func remove(_ index: Index) {
+        self.items.removeValue(forKey: index)
+    }
+
+    public func removeAll() {
+        self.items.removeAll()
+    }
+
+    public var isEmpty: Bool {
+        return self.items.isEmpty
+    }
+
+    public func makeIterator() -> AnyIterator<T> {
+        var iterator = self.items.makeIterator()
+        return AnyIterator { () -> T? in
+            return iterator.next()?.value
+        }
+    }
+}
+
 public final class CounterBag {
     private var nextIndex: Int = 1
     private var items = Set<Int>()
diff --git a/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
index 8dc1fed2ed..6f569eac70 100644
--- a/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
+++ b/submodules/SSignalKit/SwiftSignalKit/Source/Signal_Combine.swift
@@ -148,12 +148,18 @@ public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, E>(queue: Que
     }, initialValues: [:], queue: queue)
 }
 
-public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, E>(queue: Queue? = nil, _ s1: Signal<T1, E>, _ s2: Signal<T2, E>, _ s3: Signal<T3, E>, _ s4: Signal<T4, E>, _ s5: Signal<T5, E>, _ s6: Signal<T6, E>, _ s7: Signal<T7, E>, _ s8: Signal<T8, E>, _ s9: Signal<T9, E>, _ s10: Signal<T10, E>,  _ s11: Signal<T11, E>) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11), E> {
+public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, E>(queue: Queue? = nil, _ s1: Signal<T1, E>, _ s2: Signal<T2, E>, _ s3: Signal<T3, E>, _ s4: Signal<T4, E>, _ s5: Signal<T5, E>, _ s6: Signal<T6, E>, _ s7: Signal<T7, E>, _ s8: Signal<T8, E>, _ s9: Signal<T9, E>, _ s10: Signal<T10, E>, _ s11: Signal<T11, E>) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11), E> {
     return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11)], combine: { values in
         return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11)
     }, initialValues: [:], queue: queue)
 }
 
+public func combineLatest<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, E>(queue: Queue? = nil, _ s1: Signal<T1, E>, _ s2: Signal<T2, E>, _ s3: Signal<T3, E>, _ s4: Signal<T4, E>, _ s5: Signal<T5, E>, _ s6: Signal<T6, E>, _ s7: Signal<T7, E>, _ s8: Signal<T8, E>, _ s9: Signal<T9, E>, _ s10: Signal<T10, E>, _ s11: Signal<T11, E>, _ s12: Signal<T12, E>) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12), E> {
+    return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11), signalOfAny(s12)], combine: { values in
+        return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11, values[11] as! T12)
+    }, initialValues: [:], queue: queue)
+}
+
 public func combineLatest<T, E>(queue: Queue? = nil, _ signals: [Signal<T, E>]) -> Signal<[T], E> {
     if signals.count == 0 {
         return single([T](), E.self)
diff --git a/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.swift b/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.swift
index 7e72afbe0d..b9a2d40f90 100644
--- a/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.swift
+++ b/submodules/SaveToCameraRoll/Sources/SaveToCameraRoll.swift
@@ -96,7 +96,7 @@ public func saveToCameraRoll(context: AccountContext, postbox: Postbox, mediaRef
                                 return
                             }
                             
-                            let tempVideoPath = NSTemporaryDirectory() + "\(arc4random64()).mp4"
+                            let tempVideoPath = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max)).mp4"
                             PHPhotoLibrary.shared().performChanges({
                                 if isImage {
                                     if let fileData = try? Data(contentsOf: URL(fileURLWithPath: data.path)) {
diff --git a/submodules/SearchBarNode/Sources/SearchBarNode.swift b/submodules/SearchBarNode/Sources/SearchBarNode.swift
index 94ffecf976..2756d839c7 100644
--- a/submodules/SearchBarNode/Sources/SearchBarNode.swift
+++ b/submodules/SearchBarNode/Sources/SearchBarNode.swift
@@ -26,7 +26,6 @@ private func generateBackground(foregroundColor: UIColor, diameter: CGFloat) ->
     }, opaque: false)?.stretchableImage(withLeftCapWidth: Int(diameter / 2.0), topCapHeight: Int(diameter / 2.0))
 }
 
-
 public struct SearchBarToken {
     public struct Style {
         public let backgroundColor: UIColor
@@ -620,9 +619,9 @@ public final class SearchBarNodeTheme: Equatable {
         self.keyboard = keyboard
     }
     
-    public init(theme: PresentationTheme, hasSeparator: Bool = true) {
-        self.background = theme.rootController.navigationBar.backgroundColor
-        self.separator = hasSeparator ? theme.rootController.navigationBar.separatorColor : theme.rootController.navigationBar.backgroundColor
+    public init(theme: PresentationTheme, hasBackground: Bool = true, hasSeparator: Bool = true) {
+        self.background = hasBackground ? theme.rootController.navigationBar.blurredBackgroundColor : .clear
+        self.separator = hasSeparator ? theme.rootController.navigationBar.separatorColor : theme.rootController.navigationBar.blurredBackgroundColor
         self.inputFill = theme.rootController.navigationSearchBar.inputFillColor
         self.placeholder = theme.rootController.navigationSearchBar.inputPlaceholderTextColor
         self.primaryText = theme.rootController.navigationSearchBar.inputTextColor
@@ -714,7 +713,7 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
     
     public var tokensUpdated: (([SearchBarToken]) -> Void)?
     
-    private let backgroundNode: ASDisplayNode
+    private let backgroundNode: NavigationBackgroundNode
     private let separatorNode: ASDisplayNode
     private let textBackgroundNode: ASDisplayNode
     private var activityIndicator: ActivityIndicator?
@@ -808,13 +807,14 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
     private var strings: PresentationStrings?
     private let cancelText: String?
     
-    public init(theme: SearchBarNodeTheme, strings: PresentationStrings, fieldStyle: SearchBarStyle = .legacy, forceSeparator: Bool = false, cancelText: String? = nil) {
+    public init(theme: SearchBarNodeTheme, strings: PresentationStrings, fieldStyle: SearchBarStyle = .legacy, forceSeparator: Bool = false, displayBackground: Bool = true, cancelText: String? = nil) {
         self.fieldStyle = fieldStyle
         self.forceSeparator = forceSeparator
         self.cancelText = cancelText
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.isLayerBacked = true
+        self.backgroundNode = NavigationBackgroundNode(color: theme.background)
+        self.backgroundNode.isUserInteractionEnabled = false
+        self.backgroundNode.isHidden = !displayBackground
         
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
@@ -887,7 +887,7 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
             self.cancelButton.setAttributedTitle(NSAttributedString(string: self.cancelText ?? strings.Common_Cancel, font: self.cancelText != nil ? Font.semibold(17.0) : Font.regular(17.0), textColor: theme.accent), for: [])
         }
         if self.theme != theme {
-            self.backgroundNode.backgroundColor = theme.background
+            self.backgroundNode.updateColor(color: theme.background, transition: .immediate) 
             if self.fieldStyle != .modern || self.forceSeparator {
                 self.separatorNode.backgroundColor = theme.separator
             }
@@ -914,6 +914,7 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
         self.validLayout = (boundingSize, leftInset, rightInset)
         
         self.backgroundNode.frame = self.bounds
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: .immediate)
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: self.bounds.size.height), size: CGSize(width: self.bounds.size.width, height: UIScreenPixel)))
         
         let verticalOffset: CGFloat = boundingSize.height - 82.0
@@ -928,7 +929,7 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
         let textBackgroundFrame = CGRect(origin: CGPoint(x: contentFrame.minX + padding, y: verticalOffset + textBackgroundHeight), size: CGSize(width: contentFrame.width - padding * 2.0 - (self.hasCancelButton ? cancelButtonSize.width + 11.0 : 0.0), height: textBackgroundHeight))
         transition.updateFrame(node: self.textBackgroundNode, frame: textBackgroundFrame)
         
-        let textFrame = CGRect(origin: CGPoint(x: textBackgroundFrame.minX + 24.0, y: textBackgroundFrame.minY), size: CGSize(width: max(1.0, textBackgroundFrame.size.width - 24.0 - 20.0), height: textBackgroundFrame.size.height))
+        let textFrame = CGRect(origin: CGPoint(x: textBackgroundFrame.minX + 24.0, y: textBackgroundFrame.minY), size: CGSize(width: max(1.0, textBackgroundFrame.size.width - 24.0 - 27.0), height: textBackgroundFrame.size.height))
         
         if let iconImage = self.iconNode.image {
             let iconSize = iconImage.size
@@ -1044,7 +1045,9 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
             separatorCompleted = true
             intermediateCompletion()
         })
-        
+
+        self.textBackgroundNode.isHidden = true
+
         self.textBackgroundNode.layer.animateFrame(from: self.textBackgroundNode.frame, to: targetTextBackgroundFrame, duration: duration, timingFunction: timingFunction, removeOnCompletion: false, completion: { _ in
             textBackgroundCompleted = true
             intermediateCompletion()
@@ -1056,7 +1059,7 @@ public class SearchBarNode: ASDisplayNode, UITextFieldDelegate {
         transitionBackgroundNode.backgroundColor = node.backgroundNode.backgroundColor
         transitionBackgroundNode.cornerRadius = node.backgroundNode.cornerRadius
         self.insertSubnode(transitionBackgroundNode, aboveSubnode: self.textBackgroundNode)
-        transitionBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: duration / 2.0, removeOnCompletion: false)
+        //transitionBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: duration / 2.0, removeOnCompletion: false)
         transitionBackgroundNode.layer.animateFrame(from: self.textBackgroundNode.frame, to: targetTextBackgroundFrame, duration: duration, timingFunction: timingFunction, removeOnCompletion: false)
         
         let textFieldFrame = self.textField.frame
diff --git a/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift b/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift
index 05c001fd06..23329b5e41 100644
--- a/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift
+++ b/submodules/SearchPeerMembers/Sources/SearchPeerMembers.swift
@@ -18,7 +18,7 @@ public func searchPeerMembers(context: AccountContext, peerId: PeerId, chatLocat
         |> mapToSignal { cachedData -> Signal<([Peer], Bool), NoError> in
             if case .peer = chatLocation, let cachedData = cachedData, let memberCount = cachedData.participantsSummary.memberCount, memberCount <= 64 {
                 return Signal { subscriber in
-                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, requestUpdate: false, updated: { state in
+                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: nil, requestUpdate: false, updated: { state in
                         if case .ready = state.loadingState {
                             let normalizedQuery = query.lowercased()
                             subscriber.putNext((state.list.compactMap { participant -> Peer? in
@@ -54,7 +54,7 @@ public func searchPeerMembers(context: AccountContext, peerId: PeerId, chatLocat
             return Signal { subscriber in
                 switch chatLocation {
                 case let .peer(peerId):
-                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query.isEmpty ? nil : query, updated: { state in
+                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, searchQuery: query.isEmpty ? nil : query, updated: { state in
                         if case .ready = state.loadingState {
                             subscriber.putNext((state.list.compactMap { participant in
                                 if participant.peer.isDeleted {
@@ -69,7 +69,7 @@ public func searchPeerMembers(context: AccountContext, peerId: PeerId, chatLocat
                         disposable.dispose()
                     }
                 case let .replyThread(replyThreadMessage):
-                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.mentions(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, threadMessageId: replyThreadMessage.messageId, searchQuery: query.isEmpty ? nil : query, updated: { state in
+                    let (disposable, _) = context.peerChannelMemberCategoriesContextsManager.mentions(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, threadMessageId: replyThreadMessage.messageId, searchQuery: query.isEmpty ? nil : query, updated: { state in
                         if case .ready = state.loadingState {
                             subscriber.putNext((state.list.compactMap { participant in
                                 if participant.peer.isDeleted {
@@ -117,6 +117,6 @@ public func searchPeerMembers(context: AccountContext, peerId: PeerId, chatLocat
             }
         }
     } else {
-        return searchGroupMembers(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, query: query)
+        return context.engine.peers.searchGroupMembers(peerId: peerId, query: query)
     }
 }
diff --git a/submodules/SearchUI/Sources/NavigationBarSearchContentNode.swift b/submodules/SearchUI/Sources/NavigationBarSearchContentNode.swift
index 6c1ab5d9be..a2bcfca7b0 100644
--- a/submodules/SearchUI/Sources/NavigationBarSearchContentNode.swift
+++ b/submodules/SearchUI/Sources/NavigationBarSearchContentNode.swift
@@ -41,7 +41,7 @@ public class NavigationBarSearchContentNode: NavigationBarContentNode {
         self.placeholder = placeholder
         self.placeholderNode.accessibilityLabel = placeholder
         if let disabledOverlay = self.disabledOverlay {
-            disabledOverlay.backgroundColor = theme.rootController.navigationBar.backgroundColor.withAlphaComponent(0.5)
+            disabledOverlay.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor.withAlphaComponent(0.5)
         }
         if let validLayout = self.validLayout {
             self.updatePlaceholder(self.expansionProgress, size: validLayout.0, leftInset: validLayout.1, rightInset: validLayout.2, transition: .immediate)
@@ -88,34 +88,9 @@ public class NavigationBarSearchContentNode: NavigationBarContentNode {
     }
     
     public func setIsEnabled(_ enabled: Bool, animated: Bool = false) {
-        if !enabled {
-            if self.disabledOverlay == nil {
-                let disabledOverlay = ASDisplayNode()
-                self.addSubnode(disabledOverlay)
-                self.disabledOverlay = disabledOverlay
-                if animated {
-                    disabledOverlay.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
-                }
-            }
-            if let disabledOverlay = self.disabledOverlay {
-                disabledOverlay.backgroundColor = self.theme?.rootController.navigationBar.backgroundColor.withAlphaComponent(0.4)
-                
-                var disabledOverlayFrame = self.placeholderNode.frame
-                if let searchBarHeight = self.placeholderHeight {
-                    disabledOverlayFrame.size.height = searchBarHeight
-                }
-                disabledOverlay.frame = disabledOverlayFrame
-            }
-        } else if let disabledOverlay = self.disabledOverlay {
-            self.disabledOverlay = nil
-            if animated {
-                disabledOverlay.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak disabledOverlay] _ in
-                    disabledOverlay?.removeFromSupernode()
-                })
-            } else {
-                disabledOverlay.removeFromSupernode()
-            }
-        }
+        let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.25, curve: .easeInOut) : .immediate
+        transition.updateAlpha(node: self.placeholderNode, alpha: enabled ? 1.0 : 0.6)
+        self.placeholderNode.isUserInteractionEnabled = enabled
     }
     
     private func updatePlaceholder(_ progress: CGFloat, size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) {
@@ -130,7 +105,7 @@ public class NavigationBarSearchContentNode: NavigationBarContentNode {
         let overscrollProgress = max(0.0, max(0.0, self.expansionProgress - 1.0 + fraction) / fraction - visibleProgress)
         
         let searchBarNodeLayout = self.placeholderNode.asyncLayout()
-        let (searchBarHeight, searchBarApply) = searchBarNodeLayout(NSAttributedString(string: self.placeholder, font: searchBarFont, textColor: self.theme?.rootController.navigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth, height: fieldHeight), visibleProgress, self.theme?.rootController.navigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93), self.theme?.rootController.navigationSearchBar.inputFillColor ?? .clear, self.theme?.rootController.navigationBar.backgroundColor ?? .clear, transition)
+        let (searchBarHeight, searchBarApply) = searchBarNodeLayout(NSAttributedString(string: self.placeholder, font: searchBarFont, textColor: self.theme?.rootController.navigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93)), CGSize(width: baseWidth, height: fieldHeight), visibleProgress, self.theme?.rootController.navigationSearchBar.inputPlaceholderTextColor ?? UIColor(rgb: 0x8e8e93), self.theme?.rootController.navigationSearchBar.inputFillColor ?? .clear, self.theme?.rootController.navigationBar.opaqueBackgroundColor ?? .clear, transition)
         searchBarApply()
         
         let searchBarFrame = CGRect(origin: CGPoint(x: padding + leftInset, y: 8.0 + overscrollProgress * fieldHeight), size: CGSize(width: baseWidth, height: fieldHeight))
diff --git a/submodules/SearchUI/Sources/SearchDisplayController.swift b/submodules/SearchUI/Sources/SearchDisplayController.swift
index e176758e03..341bebff44 100644
--- a/submodules/SearchUI/Sources/SearchDisplayController.swift
+++ b/submodules/SearchUI/Sources/SearchDisplayController.swift
@@ -37,8 +37,8 @@ public final class SearchDisplayController {
     
     private var isSearchingDisposable: Disposable?
     
-    public init(presentationData: PresentationData, mode: SearchDisplayControllerMode = .navigation, placeholder: String? = nil, hasSeparator: Bool = false, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) {
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: presentationData.theme, hasSeparator: hasSeparator), strings: presentationData.strings, fieldStyle: .modern, forceSeparator: hasSeparator)
+    public init(presentationData: PresentationData, mode: SearchDisplayControllerMode = .navigation, placeholder: String? = nil, hasBackground: Bool = false, hasSeparator: Bool = false, contentNode: SearchDisplayControllerContentNode, cancel: @escaping () -> Void) {
+        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: presentationData.theme, hasBackground: hasBackground, hasSeparator: hasSeparator), strings: presentationData.strings, fieldStyle: .modern, forceSeparator: hasSeparator, displayBackground: hasBackground)
         self.backgroundNode = BackgroundNode()
         self.backgroundNode.backgroundColor = presentationData.theme.chatList.backgroundColor
         self.backgroundNode.allowsGroupOpacity = true
@@ -231,6 +231,9 @@ public final class SearchDisplayController {
         self.searchBar.activate()
         if let placeholder = placeholder {
             self.searchBar.animateIn(from: placeholder, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+            if self.contentNode.hasDim {
+                self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue)
+            }
         } else {
             self.searchBar.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue)
             self.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue)
@@ -255,17 +258,6 @@ public final class SearchDisplayController {
         let backgroundNode = self.backgroundNode
         let contentNode = self.contentNode
         if animated {
-            if let placeholder = placeholder, let (layout, navigationBarHeight) = self.containerLayout {
-                let contentNodePosition = self.backgroundNode.layer.position
-                let targetTextBackgroundFrame = placeholder.convert(placeholder.backgroundNode.frame, to: nil)
-                
-                var contentNavigationBarHeight = navigationBarHeight
-                if layout.statusBarHeight == nil {
-                    contentNavigationBarHeight += 28.0
-                }
-                
-                self.backgroundNode.layer.animatePosition(from: contentNodePosition, to: CGPoint(x: contentNodePosition.x, y: contentNodePosition.y + (targetTextBackgroundFrame.maxY + 8.0 - contentNavigationBarHeight)), duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)
-            }
             backgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak backgroundNode] _ in
                 backgroundNode?.removeFromSupernode()
             })
diff --git a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
index 02a8516c32..5042a4a69b 100644
--- a/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
+++ b/submodules/SelectablePeerNode/Sources/SelectablePeerNode.swift
@@ -138,6 +138,7 @@ public final class SelectablePeerNode: ASDisplayNode {
     }
     
     public func setup(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, peer: RenderedPeer, online: Bool = false, numberOfLines: Int = 2, synchronousLoad: Bool) {
+        let isFirstTime = self.peer == nil
         self.peer = peer
         guard let mainPeer = peer.chatMainPeer else {
             return
@@ -165,7 +166,7 @@ public final class SelectablePeerNode: ASDisplayNode {
         
         let onlineLayout = self.onlineNode.asyncLayout()
         let (onlineSize, onlineApply) = onlineLayout(online, false)
-        let _ = onlineApply(false)
+        let _ = onlineApply(!isFirstTime)
         
         self.onlineNode.setImage(PresentationResourcesChatList.recentStatusOnlineIcon(theme, state: .panel), color: nil, transition: .immediate)
         self.onlineNode.frame = CGRect(origin: CGPoint(), size: onlineSize)
diff --git a/submodules/SemanticStatusNode/BUILD b/submodules/SemanticStatusNode/BUILD
index 9f6c4667f7..43a601eeee 100644
--- a/submodules/SemanticStatusNode/BUILD
+++ b/submodules/SemanticStatusNode/BUILD
@@ -10,6 +10,10 @@ swift_library(
         "//submodules/Display:Display",
         "//submodules/AsyncDisplayKit:AsyncDisplayKit",
         "//submodules/LegacyComponents:LegacyComponents",
+        "//submodules/GZip:GZip",
+        "//submodules/rlottie:RLottieBinding",
+        "//submodules/AppBundle:AppBundle",
+        "//submodules/ManagedAnimationNode:ManagedAnimationNode"
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/SemanticStatusNode/Sources/SemanticStatusNode.swift b/submodules/SemanticStatusNode/Sources/SemanticStatusNode.swift
index f0ece247d4..dcf38e6d72 100644
--- a/submodules/SemanticStatusNode/Sources/SemanticStatusNode.swift
+++ b/submodules/SemanticStatusNode/Sources/SemanticStatusNode.swift
@@ -3,6 +3,10 @@ import UIKit
 import AsyncDisplayKit
 import Display
 import SwiftSignalKit
+import RLottieBinding
+import GZip
+import AppBundle
+import ManagedAnimationNode
 
 public enum SemanticStatusNodeState: Equatable {
     public struct ProgressAppearance: Equatable {
@@ -38,6 +42,7 @@ private protocol SemanticStatusNodeStateDrawingState: NSObjectProtocol {
 
 private protocol SemanticStatusNodeStateContext: class {
     var isAnimating: Bool { get }
+    var requestUpdate: () -> Void { get set }
     
     func drawingState(transitionFraction: CGFloat) -> SemanticStatusNodeStateDrawingState
 }
@@ -87,10 +92,12 @@ private final class SemanticStatusNodeIconContext: SemanticStatusNodeStateContex
     final class DrawingState: NSObject, SemanticStatusNodeStateDrawingState {
         let transitionFraction: CGFloat
         let icon: SemanticStatusNodeIcon
-        
-        init(transitionFraction: CGFloat, icon: SemanticStatusNodeIcon) {
+        let iconImage: UIImage?
+                
+        init(transitionFraction: CGFloat, icon: SemanticStatusNodeIcon, iconImage: UIImage?) {
             self.transitionFraction = transitionFraction
             self.icon = icon
+            self.iconImage = iconImage
             
             super.init()
         }
@@ -116,38 +123,65 @@ private final class SemanticStatusNodeIconContext: SemanticStatusNodeStateContex
                 break
             case .play:
                 let diameter = size.width
-                
                 let factor = diameter / 50.0
-                
-                let size = CGSize(width: 15.0, height: 18.0)
-                context.translateBy(x: (diameter - size.width) / 2.0 + 1.5, y: (diameter - size.height) / 2.0)
+               
+
+                let size: CGSize
+                var offset: CGFloat = 0.0
+                if let iconImage = self.iconImage {
+                    size = iconImage.size
+                } else {
+                    offset = 1.5
+                    size = CGSize(width: 15.0, height: 18.0)
+                }
+                context.translateBy(x: (diameter - size.width) / 2.0 + offset, y: (diameter - size.height) / 2.0)
                 if (diameter < 40.0) {
                     context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
                     context.scaleBy(x: factor, y: factor)
                     context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
                 }
-                let _ = try? drawSvgPath(context, path: "M1.71891969,0.209353049 C0.769586558,-0.350676705 0,0.0908839327 0,1.18800046 L0,16.8564753 C0,17.9569971 0.750549162,18.357187 1.67393713,17.7519379 L14.1073836,9.60224049 C15.0318735,8.99626906 15.0094718,8.04970371 14.062401,7.49100858 L1.71891969,0.209353049 ")
-                context.fillPath()
+                if let iconImage = self.iconImage {
+                    context.saveGState()
+                    let iconRect = CGRect(origin: CGPoint(), size: iconImage.size)
+                    context.clip(to: iconRect, mask: iconImage.cgImage!)
+                    context.fill(iconRect)
+                    context.restoreGState()
+                } else {
+                    let _ = try? drawSvgPath(context, path: "M1.71891969,0.209353049 C0.769586558,-0.350676705 0,0.0908839327 0,1.18800046 L0,16.8564753 C0,17.9569971 0.750549162,18.357187 1.67393713,17.7519379 L14.1073836,9.60224049 C15.0318735,8.99626906 15.0094718,8.04970371 14.062401,7.49100858 L1.71891969,0.209353049 ")
+                    context.fillPath()
+                }
                 if (diameter < 40.0) {
                     context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
                     context.scaleBy(x: 1.0 / 0.8, y: 1.0 / 0.8)
                     context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
                 }
-                context.translateBy(x: -(diameter - size.width) / 2.0 - 1.5, y: -(diameter - size.height) / 2.0)
+                context.translateBy(x: -(diameter - size.width) / 2.0 - offset, y: -(diameter - size.height) / 2.0)
             case .pause:
                 let diameter = size.width
-                
                 let factor = diameter / 50.0
                 
-                let size = CGSize(width: 15.0, height: 16.0)
+                let size: CGSize
+                if let iconImage = self.iconImage {
+                    size = iconImage.size
+                } else {
+                    size = CGSize(width: 15.0, height: 16.0)
+                }
                 context.translateBy(x: (diameter - size.width) / 2.0, y: (diameter - size.height) / 2.0)
                 if (diameter < 40.0) {
                     context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
                     context.scaleBy(x: factor, y: factor)
                     context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
                 }
-                let _ = try? drawSvgPath(context, path: "M0,1.00087166 C0,0.448105505 0.443716645,0 0.999807492,0 L4.00019251,0 C4.55237094,0 5,0.444630861 5,1.00087166 L5,14.9991283 C5,15.5518945 4.55628335,16 4.00019251,16 L0.999807492,16 C0.447629061,16 0,15.5553691 0,14.9991283 L0,1.00087166 Z M10,1.00087166 C10,0.448105505 10.4437166,0 10.9998075,0 L14.0001925,0 C14.5523709,0 15,0.444630861 15,1.00087166 L15,14.9991283 C15,15.5518945 14.5562834,16 14.0001925,16 L10.9998075,16 C10.4476291,16 10,15.5553691 10,14.9991283 L10,1.00087166 ")
-                context.fillPath()
+                if let iconImage = self.iconImage {
+                    context.saveGState()
+                    let iconRect = CGRect(origin: CGPoint(), size: iconImage.size)
+                    context.clip(to: iconRect, mask: iconImage.cgImage!)
+                    context.fill(iconRect)
+                    context.restoreGState()
+                } else {
+                    let _ = try? drawSvgPath(context, path: "M0,1.00087166 C0,0.448105505 0.443716645,0 0.999807492,0 L4.00019251,0 C4.55237094,0 5,0.444630861 5,1.00087166 L5,14.9991283 C5,15.5518945 4.55628335,16 4.00019251,16 L0.999807492,16 C0.447629061,16 0,15.5553691 0,14.9991283 L0,1.00087166 Z M10,1.00087166 C10,0.448105505 10.4437166,0 10.9998075,0 L14.0001925,0 C14.5523709,0 15,0.444630861 15,1.00087166 L15,14.9991283 C15,15.5518945 14.5562834,16 14.0001925,16 L10.9998075,16 C10.4476291,16 10,15.5553691 10,14.9991283 L10,1.00087166 ")
+                    context.fillPath()
+                }
                 if (diameter < 40.0) {
                     context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
                     context.scaleBy(x: 1.0 / 0.8, y: 1.0 / 0.8)
@@ -156,7 +190,6 @@ private final class SemanticStatusNodeIconContext: SemanticStatusNodeStateContex
                 context.translateBy(x: -(diameter - size.width) / 2.0, y: -(diameter - size.height) / 2.0)
             case let .custom(image):
                 let diameter = size.width
-                
                 let imageRect = CGRect(origin: CGPoint(x: floor((diameter - image.size.width) / 2.0), y: floor((diameter - image.size.height) / 2.0)), size: image.size)
                 
                 context.saveGState()
@@ -207,18 +240,36 @@ private final class SemanticStatusNodeIconContext: SemanticStatusNodeStateContex
         }
     }
     
-    let icon: SemanticStatusNodeIcon
+    var icon: SemanticStatusNodeIcon {
+        didSet {
+            self.animationNode?.enqueueState(self.icon == .play ? .play : .pause, animated: self.iconImage != nil)
+        }
+    }
+
+    var animationNode: PlayPauseIconNode?
+    var iconImage: UIImage?
     
     init(icon: SemanticStatusNodeIcon) {
         self.icon = icon
+        
+        if [.play, .pause].contains(icon) {
+            self.animationNode = PlayPauseIconNode()
+            self.animationNode?.imageUpdated = { [weak self] image in
+                self?.iconImage = image
+                self?.requestUpdate()
+            }
+            self.iconImage = self.animationNode?.image
+        }
     }
     
     var isAnimating: Bool {
         return false
     }
     
+    var requestUpdate: () -> Void = {}
+    
     func drawingState(transitionFraction: CGFloat) -> SemanticStatusNodeStateDrawingState {
-        return DrawingState(transitionFraction: transitionFraction, icon: self.icon)
+        return DrawingState(transitionFraction: transitionFraction, icon: self.icon, iconImage: self.iconImage)
     }
 }
 
@@ -231,11 +282,11 @@ private final class SemanticStatusNodeProgressTransition {
         self.initialValue = initialValue
     }
     
-    func valueAt(timestamp: Double, actualValue: CGFloat) -> CGFloat {
+    func valueAt(timestamp: Double, actualValue: CGFloat) -> (CGFloat, Bool) {
         let duration = 0.2
         var t = CGFloat((timestamp - self.beginTime) / duration)
         t = min(1.0, max(0.0, t))
-        return t * actualValue + (1.0 - t) * self.initialValue
+        return (t * actualValue + (1.0 - t) * self.initialValue, t >= 1.0 - 0.001)
     }
 }
 
@@ -373,6 +424,8 @@ private final class SemanticStatusNodeProgressContext: SemanticStatusNodeStateCo
         return true
     }
     
+    var requestUpdate: () -> Void = {}
+    
     init(value: CGFloat?, displayCancel: Bool, appearance: SemanticStatusNodeState.ProgressAppearance?) {
         self.value = value
         self.displayCancel = displayCancel
@@ -385,7 +438,11 @@ private final class SemanticStatusNodeProgressContext: SemanticStatusNodeStateCo
         let resolvedValue: CGFloat?
         if let value = self.value {
             if let transition = self.transition {
-                resolvedValue = transition.valueAt(timestamp: timestamp, actualValue: value)
+                let (v, isCompleted) = transition.valueAt(timestamp: timestamp, actualValue: value)
+                resolvedValue = v
+                if isCompleted {
+                    self.transition = nil
+                }
             } else {
                 resolvedValue = value
             }
@@ -395,14 +452,18 @@ private final class SemanticStatusNodeProgressContext: SemanticStatusNodeStateCo
         return DrawingState(transitionFraction: transitionFraction, value: resolvedValue, displayCancel: self.displayCancel, appearance: self.appearance, timestamp: timestamp)
     }
     
+    func maskView() -> UIView? {
+        return nil
+    }
+    
     func updateValue(value: CGFloat?) {
         if value != self.value {
-            let previousValue = value
+            let previousValue = self.value
             self.value = value
             let timestamp = CACurrentMediaTime()
             if let _ = value, let previousValue = previousValue {
                 if let transition = self.transition {
-                    self.transition = SemanticStatusNodeProgressTransition(beginTime: timestamp, initialValue: transition.valueAt(timestamp: timestamp, actualValue: previousValue))
+                    self.transition = SemanticStatusNodeProgressTransition(beginTime: timestamp, initialValue: transition.valueAt(timestamp: timestamp, actualValue: previousValue).0)
                 } else {
                     self.transition = SemanticStatusNodeProgressTransition(beginTime: timestamp, initialValue: previousValue)
                 }
@@ -494,6 +555,8 @@ private final class SemanticStatusNodeCheckContext: SemanticStatusNodeStateConte
         return true
     }
     
+    var requestUpdate: () -> Void = {}
+    
     init(value: CGFloat, appearance: SemanticStatusNodeState.CheckAppearance?) {
         self.value = value
         self.appearance = appearance
@@ -506,13 +569,21 @@ private final class SemanticStatusNodeCheckContext: SemanticStatusNodeStateConte
         
         let resolvedValue: CGFloat
         if let transition = self.transition {
-            resolvedValue = transition.valueAt(timestamp: timestamp, actualValue: value)
+            let (v, isCompleted) = transition.valueAt(timestamp: timestamp, actualValue: value)
+            resolvedValue = v
+            if isCompleted {
+                self.transition = nil
+            }
         } else {
             resolvedValue = value
         }
         return DrawingState(transitionFraction: transitionFraction, value: resolvedValue, appearance: self.appearance)
     }
     
+    func maskView() -> UIView? {
+        return nil
+    }
+    
     func animate() {
         guard self.value < 1.0 else {
             return
@@ -542,8 +613,15 @@ private extension SemanticStatusNodeState {
             default:
                 preconditionFailure()
             }
-            if let current = current as? SemanticStatusNodeIconContext, current.icon == icon {
-                return current
+            if let current = current as? SemanticStatusNodeIconContext {
+                if current.icon == icon {
+                    return current
+                } else if (current.icon == .play && icon == .pause) || (current.icon == .pause && icon == .play) {
+                    current.icon = icon
+                    return current
+                } else {
+                    return SemanticStatusNodeIconContext(icon: icon)
+                }
             } else {
                 return SemanticStatusNodeIconContext(icon: icon)
             }
@@ -774,6 +852,16 @@ public final class SemanticStatusNode: ASControlNode {
     private var disposable: Disposable?
     private var backgroundNodeImage: UIImage?
     
+    private let hasLayoutPromise = ValuePromise(false, ignoreRepeated: true)
+    
+    public override func layout() {
+        super.layout()
+        
+        if !self.bounds.width.isZero {
+            self.hasLayoutPromise.set(true)
+        }
+    }
+    
     public init(backgroundNodeColor: UIColor, foregroundNodeColor: UIColor, image: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? = nil, overlayForegroundNodeColor: UIColor? = nil, cutout: CGRect? = nil) {
         self.state = .none
         self.stateContext = self.state.context(current: nil)
@@ -786,9 +874,8 @@ public final class SemanticStatusNode: ASControlNode {
         
         if let image = image {
             let start = CACurrentMediaTime()
-            self.disposable = (image
-            |> deliverOnMainQueue).start(next: { [weak self] transform in
-                guard let strongSelf = self else {
+            self.disposable = combineLatest(queue: Queue.mainQueue(), image, self.hasLayoutPromise.get()).start(next: { [weak self] transform, ready in
+                guard let strongSelf = self, ready else {
                     return
                 }
                 let context = transform(TransformImageArguments(corners: ImageCorners(radius: strongSelf.bounds.width / 2.0), imageSize: strongSelf.bounds.size, boundingSize: strongSelf.bounds.size, intrinsicInsets: UIEdgeInsets()))
@@ -854,6 +941,9 @@ public final class SemanticStatusNode: ASControlNode {
             self.state = state
             let previousStateContext = self.stateContext
             self.stateContext = self.state.context(current: self.stateContext)
+            self.stateContext.requestUpdate = { [weak self] in
+                self?.setNeedsDisplay()
+            }
             
             if animated && previousStateContext !== self.stateContext {
                 self.transitionContext = SemanticStatusNodeTransitionContext(startTime: CACurrentMediaTime(), duration: 0.18, previousStateContext: previousStateContext, previousAppearanceContext: nil, completion: completion)
@@ -927,3 +1017,53 @@ public final class SemanticStatusNode: ASControlNode {
         parameters.appearanceState.drawForeground(context: context, size: bounds.size)
     }
 }
+
+private enum PlayPauseIconNodeState: Equatable {
+    case play
+    case pause
+}
+
+private final class PlayPauseIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.35
+    private var iconState: PlayPauseIconNodeState = .play
+    
+    init() {
+        super.init(size: CGSize(width: 36.0, height: 36.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: PlayPauseIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .play:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 83), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .play:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 41), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+                        }
+                    case .play:
+                        break
+                }
+        }
+    }
+}
diff --git a/submodules/SettingsUI/BUILD b/submodules/SettingsUI/BUILD
index 97155853ad..aef7b6fda1 100644
--- a/submodules/SettingsUI/BUILD
+++ b/submodules/SettingsUI/BUILD
@@ -88,6 +88,8 @@ swift_library(
         "//submodules/AuthTransferUI:AuthTransferUI",
         "//submodules/WidgetSetupScreen:WidgetSetupScreen",
         "//submodules/UIKitRuntimeUtils:UIKitRuntimeUtils",
+        "//submodules/DebugSettingsUI:DebugSettingsUI",
+        "//submodules/WallpaperBackgroundNode:WallpaperBackgroundNode",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift
index 94145bbdb7..06bce910f7 100644
--- a/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift
+++ b/submodules/SettingsUI/Sources/BubbleSettings/BubbleSettingsController.swift
@@ -13,6 +13,7 @@ import ChatListUI
 import WallpaperResources
 import LegacyComponents
 import ItemListUI
+import WallpaperBackgroundNode
 
 private func generateMaskImage(color: UIColor) -> UIImage? {
     return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in
@@ -62,18 +63,15 @@ private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDel
         
         self.scrollNode = ASScrollNode()
     
-        self.chatBackgroundNode = WallpaperBackgroundNode()
+        self.chatBackgroundNode = WallpaperBackgroundNode(context: context)
         self.chatBackgroundNode.displaysAsynchronously = false
         
         self.messagesContainerNode = ASDisplayNode()
         self.messagesContainerNode.clipsToBounds = true
         self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
         
-        self.chatBackgroundNode.image = chatControllerBackgroundImage(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false)
-        self.chatBackgroundNode.motionEnabled = self.presentationData.chatWallpaper.settings?.motion ?? false
-        if case .gradient = self.presentationData.chatWallpaper {
-            self.chatBackgroundNode.imageContentMode = .scaleToFill
-        }
+        self.chatBackgroundNode.update(wallpaper: self.presentationData.chatWallpaper)
+        self.chatBackgroundNode.updateBubbleTheme(bubbleTheme: self.presentationData.theme, bubbleCorners: self.presentationData.chatBubbleCorners)
                         
         self.toolbarNode = BubbleSettingsToolbarNode(presentationThemeSettings: self.presentationThemeSettings, presentationData: self.presentationData)
                 
@@ -162,7 +160,7 @@ private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDel
         let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp:  self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder)
         
         var items: [ListViewItem] = []
-        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
         let otherPeerId = self.context.account.peerId
         var peers = SimpleDictionary<PeerId, Peer>()
         var messages = SimpleDictionary<MessageId, Message>()
@@ -173,20 +171,20 @@ private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDel
         messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: [])
         
         let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId, threadMessageId: nil)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA="
         let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))]
         let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes)
         
         let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message3], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message3], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message4], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message4], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let width: CGFloat
         if case .regular = layout.metrics.widthClass {
@@ -249,7 +247,7 @@ private final class BubbleSettingsControllerNode: ASDisplayNode, UIScrollViewDel
             dateHeaderNode = currentDateHeaderNode
             headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem)
         } else {
-            dateHeaderNode = headerItem.node()
+            dateHeaderNode = headerItem.node(synchronousLoad: true)
             dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
             self.messagesContainerNode.addSubnode(dateHeaderNode)
             self.dateHeaderNode = dateHeaderNode
@@ -394,7 +392,7 @@ final class BubbleSettingsController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberCodeController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberCodeController.swift
index 3f37c4c2a7..0dd32295e6 100644
--- a/submodules/SettingsUI/Sources/ChangePhoneNumberCodeController.swift
+++ b/submodules/SettingsUI/Sources/ChangePhoneNumberCodeController.swift
@@ -230,7 +230,7 @@ func changePhoneNumberCodeController(context: AccountContext, phoneNumber: Strin
                     |> take(1)
                     |> mapToSignal { _ -> Signal<Void, NoError> in
                         return Signal { subscriber in
-                            return requestNextChangeAccountPhoneNumberVerification(account: context.account, phoneNumber: phoneNumber, phoneCodeHash: data.hash).start(next: { next in
+                            return context.engine.accountData.requestNextChangeAccountPhoneNumberVerification(phoneNumber: phoneNumber, phoneCodeHash: data.hash).start(next: { next in
                                 currentDataPromise?.set(.single(next))
                             }, error: { error in
                                 
@@ -254,7 +254,7 @@ func changePhoneNumberCodeController(context: AccountContext, phoneNumber: Strin
             }
         }
         if let code = code {
-            changePhoneDisposable.set((requestChangeAccountPhoneNumber(account: context.account, phoneNumber: phoneNumber, phoneCodeHash: codeData.hash, phoneCode: code) |> deliverOnMainQueue).start(error: { error in
+            changePhoneDisposable.set((context.engine.accountData.requestChangeAccountPhoneNumber(phoneNumber: phoneNumber, phoneCodeHash: codeData.hash, phoneCode: code) |> deliverOnMainQueue).start(error: { error in
                 updateState {
                     return $0.withUpdatedChecking(false)
                 }
@@ -277,6 +277,9 @@ func changePhoneNumberCodeController(context: AccountContext, phoneNumber: Strin
                 }
                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                 presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success), nil)
+                
+                let _ = dismissServerProvidedSuggestion(account: context.account, suggestion: .validatePhoneNumber).start()
+                
                 dismissImpl?()
             }))
         }
diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift
index f7b4f026b9..05aac53984 100644
--- a/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift
+++ b/submodules/SettingsUI/Sources/ChangePhoneNumberController.swift
@@ -12,8 +12,10 @@ import AlertUI
 import PresentationDataUtils
 import CountrySelectionUI
 import PhoneNumberFormat
+import CoreTelephony
+import MessageUI
 
-final class ChangePhoneNumberController: ViewController {
+final class ChangePhoneNumberController: ViewController, MFMailComposeViewControllerDelegate {
     private var controllerNode: ChangePhoneNumberControllerNode {
         return self.displayNode as! ChangePhoneNumberControllerNode
     }
@@ -88,7 +90,7 @@ final class ChangePhoneNumberController: ViewController {
             }
         }
         
-        loadServerCountryCodes(accountManager: self.context.sharedContext.accountManager, network: self.context.account.network, completion: { [weak self] in
+        loadServerCountryCodes(accountManager: self.context.sharedContext.accountManager, engine: self.context.engine, completion: { [weak self] in
             if let strongSelf = self {
                 strongSelf.controllerNode.updateCountryCode()
             }
@@ -121,7 +123,7 @@ final class ChangePhoneNumberController: ViewController {
         }
         if !number.isEmpty {
             self.inProgress = true
-            self.requestDisposable.set((requestChangeAccountPhoneNumberVerification(account: self.context.account, phoneNumber: self.controllerNode.currentNumber) |> deliverOnMainQueue).start(next: { [weak self] next in
+            self.requestDisposable.set((self.context.engine.accountData.requestChangeAccountPhoneNumberVerification(phoneNumber: self.controllerNode.currentNumber) |> deliverOnMainQueue).start(next: { [weak self] next in
                 if let strongSelf = self {
                     strongSelf.inProgress = false
                     (strongSelf.navigationController as? NavigationController)?.pushViewController(changePhoneNumberCodeController(context: strongSelf.context, phoneNumber: strongSelf.controllerNode.currentNumber, codeData: next))
@@ -133,18 +135,39 @@ final class ChangePhoneNumberController: ViewController {
                     let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
                 
                     let text: String
+                    var actions: [TextAlertAction] = []
                     switch error {
                         case .limitExceeded:
                             text = presentationData.strings.Login_CodeFloodError
+                            actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                         case .invalidPhoneNumber:
                             text = presentationData.strings.Login_InvalidPhoneError
+                            actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                         case .phoneNumberOccupied:
                             text = presentationData.strings.ChangePhone_ErrorOccupied(formatPhoneNumber(phoneNumber)).0
+                            actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
+                        case .phoneBanned:
+                            text = presentationData.strings.Login_PhoneBannedError
+                            actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
+                            actions.append(TextAlertAction(type: .genericAction, title: presentationData.strings.Login_PhoneNumberHelp, action: { [weak self] in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                let formattedNumber = formatPhoneNumber(number)
+                                let appVersion = (Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String) ?? "unknown"
+                                let systemVersion = UIDevice.current.systemVersion
+                                let locale = Locale.current.identifier
+                                let carrier = CTCarrier()
+                                let mnc = carrier.mobileNetworkCode ?? "none"
+                                
+                                strongSelf.presentEmailComposeController(address: "login@stel.com", subject: presentationData.strings.Login_PhoneBannedEmailSubject(formattedNumber).0, body: presentationData.strings.Login_PhoneBannedEmailBody(formattedNumber, appVersion, systemVersion, locale, mnc).0)
+                            }))
                         case .generic:
                             text = presentationData.strings.Login_UnknownError
+                            actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                     }
                     
-                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: actions), in: .window(.root))
                 }
             }))
         } else {
@@ -152,4 +175,22 @@ final class ChangePhoneNumberController: ViewController {
             self.controllerNode.animateError()
         }
     }
+    
+    private func presentEmailComposeController(address: String, subject: String, body: String) {
+        if MFMailComposeViewController.canSendMail() {
+            let composeController = MFMailComposeViewController()
+            composeController.setToRecipients([address])
+            composeController.setSubject(subject)
+            composeController.setMessageBody(body, isHTML: false)
+            composeController.mailComposeDelegate = self
+            
+            self.view.window?.rootViewController?.present(composeController, animated: true, completion: nil)
+        } else {
+            self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: nil, text: self.presentationData.strings.Login_EmailNotConfiguredError, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+        }
+    }
+    
+    public func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
+        controller.dismiss(animated: true, completion: nil)
+    }
 }
diff --git a/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
index b01109917d..06b2801b5a 100644
--- a/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
+++ b/submodules/SettingsUI/Sources/ChangePhoneNumberIntroController.swift
@@ -11,6 +11,7 @@ import AlertUI
 import PresentationDataUtils
 import AppBundle
 import Markdown
+import PhoneNumberFormat
 
 private final class ChangePhoneNumberIntroControllerNode: ASDisplayNode {
     var presentationData: PresentationData
@@ -101,7 +102,8 @@ public final class ChangePhoneNumberIntroController: ViewController {
         
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         
-        self.title = phoneNumber
+        let formattedPhone = formatPhoneNumber(phoneNumber)
+        self.title = formattedPhone
         self.navigationItem.backBarButtonItem = UIBarButtonItem(title: presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
         //self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: "Cancel", style: .plain, target: self, action: #selector(self.cancelPressed))
     }
@@ -133,7 +135,7 @@ public final class ChangePhoneNumberIntroController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        (self.displayNode as! ChangePhoneNumberIntroControllerNode).containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        (self.displayNode as! ChangePhoneNumberIntroControllerNode).containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func cancelPressed() {
@@ -141,7 +143,7 @@ public final class ChangePhoneNumberIntroController: ViewController {
     }
     
     func proceed() {
-        self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.PhoneNumberHelp_Alert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: self.presentationData.strings.Common_OK, action: { [weak self] in
+        self.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.PhoneNumberHelp_Alert, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: self.presentationData.strings.TwoFactorSetup_Email_Action, action: { [weak self] in
             if let strongSelf = self {
                 (strongSelf.navigationController as? NavigationController)?.replaceTopController(ChangePhoneNumberController(context: strongSelf.context), animated: true)
             }
diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadMediaCategoryController.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadMediaCategoryController.swift
index 222efd9093..c0054bdbfc 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadMediaCategoryController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadMediaCategoryController.swift	
@@ -71,7 +71,7 @@ private enum AutodownloadMediaCategoryEntry: ItemListNodeEntry {
     case peerChannels(PresentationTheme, String, Bool)
     
     case sizeHeader(PresentationTheme, String)
-    case sizeItem(PresentationTheme, String, String, Int32)
+    case sizeItem(PresentationTheme, PresentationStrings, String, String, Int32)
     case sizePreload(PresentationTheme, String, Bool, Bool)
     case sizePreloadInfo(PresentationTheme, String)
     
@@ -145,8 +145,8 @@ private enum AutodownloadMediaCategoryEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .sizeItem(lhsTheme, lhsDecimalSeparator, lhsText, lhsValue):
-                if case let .sizeItem(rhsTheme, rhsDecimalSeparator, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsDecimalSeparator == rhsDecimalSeparator, lhsText == rhsText, lhsValue == rhsValue {
+            case let .sizeItem(lhsTheme, lhsStrings, lhsDecimalSeparator, lhsText, lhsValue):
+                if case let .sizeItem(rhsTheme, rhsStrings, rhsDecimalSeparator, rhsText, rhsValue) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsDecimalSeparator == rhsDecimalSeparator, lhsText == rhsText, lhsValue == rhsValue {
                     return true
                 } else {
                     return false
@@ -173,35 +173,35 @@ private enum AutodownloadMediaCategoryEntry: ItemListNodeEntry {
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! AutodownloadMediaCategoryControllerArguments
         switch self {
-            case let .peerHeader(theme, text):
+            case let .peerHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .peerContacts(theme, text, value):
+            case let .peerContacts(_, text, value):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, enableInteractiveChanges: true, enabled: true, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.togglePeer(.contact)
                 })
-            case let .peerOtherPrivate(theme, text, value):
+            case let .peerOtherPrivate(_, text, value):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, enableInteractiveChanges: true, enabled: true, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.togglePeer(.otherPrivate)
                 })
-            case let .peerGroups(theme, text, value):
+            case let .peerGroups(_, text, value):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, enableInteractiveChanges: true, enabled: true, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.togglePeer(.group)
                 })
-            case let .peerChannels(theme, text, value):
+            case let .peerChannels(_, text, value):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value, enableInteractiveChanges: true, enabled: true, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.togglePeer(.channel)
                 })
-            case let .sizeHeader(theme, text):
+            case let .sizeHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .sizeItem(theme, decimalSeparator, text, value):
-                return AutodownloadSizeLimitItem(theme: theme, decimalSeparator: decimalSeparator, text: text, value: value, sectionId: self.section, updated: { value in
+            case let .sizeItem(theme, strings, decimalSeparator, text, value):
+                return AutodownloadSizeLimitItem(theme: theme, strings: strings, decimalSeparator: decimalSeparator, text: text, value: value, sectionId: self.section, updated: { value in
                     arguments.adjustSize(value)
                 })
-            case let .sizePreload(theme, text, value, enabled):
+            case let .sizePreload(_, text, value, enabled):
                 return ItemListSwitchItem(presentationData: presentationData, title: text, value: value && enabled, enableInteractiveChanges: true, enabled: enabled, sectionId: self.section, style: .blocks, updated: { value in
                     arguments.toggleVideoPreload()
                 })
-            case let .sizePreloadInfo(theme, text):
+            case let .sizePreloadInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
         }
     }
@@ -277,7 +277,7 @@ private func autodownloadMediaCategoryControllerEntries(presentationData: Presen
                 sizeText = autodownloadDataSizeString(Int64(size), decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)
             }
             let text = presentationData.strings.AutoDownloadSettings_UpTo(sizeText).0
-            entries.append(.sizeItem(presentationData.theme, presentationData.dateTimeFormat.decimalSeparator, text, size))
+            entries.append(.sizeItem(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat.decimalSeparator, text, size))
             if #available(iOSApplicationExtension 10.3, *), category == .video {
                 entries.append(.sizePreload(presentationData.theme, presentationData.strings.AutoDownloadSettings_PreloadVideo, predownload, size > 2 * 1024 * 1024))
                 entries.append(.sizePreloadInfo(presentationData.theme, presentationData.strings.AutoDownloadSettings_PreloadVideoInfo(sizeText).0))
diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift
index af3fe51a26..fdd1b17419 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift	
@@ -51,14 +51,16 @@ private func sizeValue(for sliderValue: CGFloat) -> Int32 {
 
 final class AutodownloadSizeLimitItem: ListViewItem, ItemListItem {
     let theme: PresentationTheme
+    let strings: PresentationStrings
     let decimalSeparator: String
     let text: String
     let value: Int32
     let sectionId: ItemListSectionId
     let updated: (Int32) -> Void
     
-    init(theme: PresentationTheme, decimalSeparator: String, text: String, value: Int32, sectionId: ItemListSectionId, updated: @escaping (Int32) -> Void) {
+    init(theme: PresentationTheme, strings: PresentationStrings, decimalSeparator: String, text: String, value: Int32, sectionId: ItemListSectionId, updated: @escaping (Int32) -> Void) {
         self.theme = theme
+        self.strings = strings
         self.decimalSeparator = decimalSeparator
         self.text = text
         self.value = value
@@ -201,9 +203,11 @@ private final class AutodownloadSizeLimitItemNode: ListViewItemNode {
             
             let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.text, font: Font.regular(17.0), textColor: item.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
             
-            let (minTextLayout, minTextApply) = makeMinTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: dataSizeString(512 * 1024, decimalSeparator: item.decimalSeparator), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
+            let formatting = DataSizeStringFormatting(strings: item.strings, decimalSeparator: item.decimalSeparator)
             
-            let (maxTextLayout, maxTextApply) = makeMaxTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: dataSizeString(1536 * 1024 * 1024, decimalSeparator: item.decimalSeparator), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
+            let (minTextLayout, minTextApply) = makeMinTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: dataSizeString(512 * 1024, formatting: formatting), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
+            
+            let (maxTextLayout, maxTextApply) = makeMaxTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: dataSizeString(1536 * 1024 * 1024, formatting: formatting), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
             
             contentSize = CGSize(width: params.width, height: 88.0)
             insets = itemListNeighborsGroupedInsets(neighbors)
diff --git a/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift
index bb511ddb3a..7b26b8b274 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift	
@@ -24,7 +24,7 @@ private func stringForCacheSize(strings: PresentationStrings, size: Int32) -> St
     if size > 100 {
         return strings.Cache_NoLimit
     } else {
-        return dataSizeString(Int64(size) * 1024 * 1024 * 1024)
+        return dataSizeString(Int64(size) * 1024 * 1024 * 1024, formatting: DataSizeStringFormatting(strings: strings, decimalSeparator: "."))
     }
 }
 
diff --git a/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift b/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift
index 87744afa82..df38d5e13d 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/NetworkUsageStatsController.swift	
@@ -258,47 +258,47 @@ private enum NetworkUsageStatsEntry: ItemListNodeEntry {
     func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
         let arguments = arguments as! NetworkUsageStatsControllerArguments
         switch self {
-            case let .messagesHeader(theme, text):
+            case let .messagesHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .messagesSent(theme, text, value):
+            case let .messagesSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .messagesReceived(theme, text, value):
+            case let .messagesReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .imageHeader(theme, text):
+            case let .imageHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .imageSent(theme, text, value):
+            case let .imageSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .imageReceived(theme, text, value):
+            case let .imageReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .videoHeader(theme, text):
+            case let .videoHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .videoSent(theme, text, value):
+            case let .videoSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .videoReceived(theme, text, value):
+            case let .videoReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .audioHeader(theme, text):
+            case let .audioHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .audioSent(theme, text, value):
+            case let .audioSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .audioReceived(theme, text, value):
+            case let .audioReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .fileHeader(theme, text):
+            case let .fileHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .fileSent(theme, text, value):
+            case let .fileSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .fileReceived(theme, text, value):
+            case let .fileReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .callHeader(theme, text):
+            case let .callHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .callSent(theme, text, value):
+            case let .callSent(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .callReceived(theme, text, value):
+            case let .callReceived(_, text, value):
                 return ItemListDisclosureItem(presentationData: presentationData, title: text, label: value, sectionId: self.section, style: .blocks, disclosureStyle: .none , action: nil)
-            case let .reset(theme, section, text):
+            case let .reset(_, section, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.resetStatistics(section)
                 })
-            case let .resetTimestamp(theme, text):
+            case let .resetTimestamp(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
         }
     }
@@ -307,31 +307,32 @@ private enum NetworkUsageStatsEntry: ItemListNodeEntry {
 private func networkUsageStatsControllerEntries(presentationData: PresentationData, section: NetworkUsageControllerSection, stats: NetworkUsageStats) -> [NetworkUsageStatsEntry] {
     var entries: [NetworkUsageStatsEntry] = []
     
+    let formatting = DataSizeStringFormatting(presentationData: presentationData)
     switch section {
         case .cellular:
             entries.append(.messagesHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_GeneralDataSection))
-            entries.append(.messagesSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.generic.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.messagesReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.generic.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.messagesSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.generic.cellular.outgoing, formatting: formatting)))
+            entries.append(.messagesReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.generic.cellular.incoming, formatting: formatting)))
             
             entries.append(.imageHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaImageDataSection))
-            entries.append(.imageSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.image.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.imageReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.image.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.imageSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.image.cellular.outgoing, formatting: formatting)))
+            entries.append(.imageReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.image.cellular.incoming, formatting: formatting)))
             
             entries.append(.videoHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaVideoDataSection))
-            entries.append(.videoSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.video.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.videoReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.video.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.videoSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.video.cellular.outgoing, formatting: formatting)))
+            entries.append(.videoReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.video.cellular.incoming, formatting: formatting)))
             
             entries.append(.audioHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaAudioDataSection))
-            entries.append(.audioSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.audio.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.audioReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.audio.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.audioSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.audio.cellular.outgoing, formatting: formatting)))
+            entries.append(.audioReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.audio.cellular.incoming, formatting: formatting)))
             
             entries.append(.fileHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaDocumentDataSection))
-            entries.append(.fileSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.file.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.fileReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.file.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.fileSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.file.cellular.outgoing, formatting: formatting)))
+            entries.append(.fileReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.file.cellular.incoming, formatting: formatting)))
             
             entries.append(.callHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_CallDataSection))
-            entries.append(.callSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.call.cellular.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.callReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.call.cellular.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.callSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.call.cellular.outgoing, formatting: formatting)))
+            entries.append(.callReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.call.cellular.incoming, formatting: formatting)))
             
             entries.append(.reset(presentationData.theme, section, presentationData.strings.NetworkUsageSettings_ResetStats))
         
@@ -344,28 +345,28 @@ private func networkUsageStatsControllerEntries(presentationData: PresentationDa
             }
         case .wifi:
             entries.append(.messagesHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_GeneralDataSection))
-            entries.append(.messagesSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.generic.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.messagesReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.generic.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.messagesSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.generic.wifi.outgoing, formatting: formatting)))
+            entries.append(.messagesReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.generic.wifi.incoming, formatting: formatting)))
             
             entries.append(.imageHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaImageDataSection))
-            entries.append(.imageSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.image.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.imageReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.image.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.imageSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.image.wifi.outgoing, formatting: formatting)))
+            entries.append(.imageReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.image.wifi.incoming, formatting: formatting)))
             
             entries.append(.videoHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaVideoDataSection))
-            entries.append(.videoSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.video.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.videoReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.video.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.videoSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.video.wifi.outgoing, formatting: formatting)))
+            entries.append(.videoReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.video.wifi.incoming, formatting: formatting)))
             
             entries.append(.audioHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaAudioDataSection))
-            entries.append(.audioSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.audio.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.audioReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.audio.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.audioSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.audio.wifi.outgoing, formatting: formatting)))
+            entries.append(.audioReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.audio.wifi.incoming, formatting: formatting)))
             
             entries.append(.fileHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_MediaDocumentDataSection))
-            entries.append(.fileSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.file.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.fileReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.file.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.fileSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.file.wifi.outgoing, formatting: formatting)))
+            entries.append(.fileReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.file.wifi.incoming, formatting: formatting)))
             
             entries.append(.callHeader(presentationData.theme, presentationData.strings.NetworkUsageSettings_CallDataSection))
-            entries.append(.callSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.call.wifi.outgoing, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
-            entries.append(.callReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.call.wifi.incoming, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
+            entries.append(.callSent(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesSent, dataSizeString(stats.call.wifi.outgoing, formatting: formatting)))
+            entries.append(.callReceived(presentationData.theme, presentationData.strings.NetworkUsageSettings_BytesReceived, dataSizeString(stats.call.wifi.incoming, formatting: formatting)))
             
             entries.append(.reset(presentationData.theme, section, presentationData.strings.NetworkUsageSettings_ResetStats))
             if stats.resetWifiTimestamp != 0 {
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift
index 610a18a8e9..48b0ac5ebf 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxyServerActionSheetController.swift	
@@ -12,6 +12,7 @@ import ActivityIndicator
 import OverlayStatusController
 import AccountContext
 import PresentationDataUtils
+import UrlEscaping
 
 public final class ProxyServerActionSheetController: ActionSheetController {
     private var presentationDisposable: Disposable?
@@ -131,7 +132,7 @@ private final class ProxyServerInfoItemNode: ActionSheetItemNode {
         let serverTextNode = ImmediateTextNode()
         serverTextNode.isUserInteractionEnabled = false
         serverTextNode.displaysAsynchronously = false
-        serverTextNode.attributedText = NSAttributedString(string: server.host, font: textFont, textColor: theme.primaryTextColor)
+        serverTextNode.attributedText = NSAttributedString(string: urlEncodedStringFromString(server.host), font: textFont, textColor: theme.primaryTextColor)
         fieldNodes.append((serverTitleNode, serverTextNode))
         
         let portTitleNode = ImmediateTextNode()
diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift
index 5d7e756311..3e68942278 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift	
@@ -10,6 +10,7 @@ import TelegramPresentationData
 import ItemListUI
 import PresentationDataUtils
 import ActivityIndicator
+import UrlEscaping
 
 private let activitySize = CGSize(width: 24.0, height: 24.0)
 
@@ -236,7 +237,7 @@ private final class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode {
             }
             
             let titleAttributedString = NSMutableAttributedString()
-            titleAttributedString.append(NSAttributedString(string: item.server.host, font: titleFont, textColor: item.theme.list.itemPrimaryTextColor))
+            titleAttributedString.append(NSAttributedString(string: urlEncodedStringFromString(item.server.host), font: titleFont, textColor: item.theme.list.itemPrimaryTextColor))
             titleAttributedString.append(NSAttributedString(string: ":\(item.server.port)", font: titleFont, textColor: item.theme.list.itemSecondaryTextColor))
             let statusAttributedString = NSAttributedString(string: item.label, font: statusFont, textColor: item.labelAccent ? item.theme.list.itemAccentColor : item.theme.list.itemSecondaryTextColor)
             
diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift
index 9b9882a2b2..2b63878ba5 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageController.swift	
@@ -71,7 +71,7 @@ private enum StorageUsageEntry: ItemListNodeEntry {
     case maximumSizeInfo(PresentationTheme, String)
     
     case storageHeader(PresentationTheme, String)
-    case storageUsage(PresentationTheme, PresentationDateTimeFormat, [StorageUsageCategory])
+    case storageUsage(PresentationTheme, PresentationStrings, PresentationDateTimeFormat, [StorageUsageCategory])
     case collecting(PresentationTheme, String)
     case clearAll(PresentationTheme, String, Bool)
     
@@ -164,8 +164,8 @@ private enum StorageUsageEntry: ItemListNodeEntry {
                 } else {
                     return false
                 }
-            case let .storageUsage(lhsTheme, lhsDateTimeFormat, lhsCategories):
-                if case let .storageUsage(rhsTheme, rhsDateTimeFormat, rhsCategories) = rhs, lhsTheme === rhsTheme, lhsDateTimeFormat == rhsDateTimeFormat, lhsCategories == rhsCategories {
+            case let .storageUsage(lhsTheme, lhsStrings, lhsDateTimeFormat, lhsCategories):
+                if case let .storageUsage(rhsTheme, rhsStrings, rhsDateTimeFormat, rhsCategories) = rhs, lhsTheme === rhsTheme, lhsStrings == rhsStrings, lhsDateTimeFormat == rhsDateTimeFormat, lhsCategories == rhsCategories {
                     return true
                 } else {
                     return false
@@ -249,8 +249,8 @@ private enum StorageUsageEntry: ItemListNodeEntry {
                 return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section)
             case let .storageHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .storageUsage(theme, dateTimeFormat, categories):
-                return StorageUsageItem(theme: theme, dateTimeFormat: dateTimeFormat, categories: categories, sectionId: self.section)
+            case let .storageUsage(theme, strings, dateTimeFormat, categories):
+                return StorageUsageItem(theme: theme, strings: strings, dateTimeFormat: dateTimeFormat, categories: categories, sectionId: self.section)
             case let .collecting(theme, text):
                 return CalculatingCacheSizeItem(theme: theme, title: text, sectionId: self.section, style: .blocks)
             case let .clearAll(_, text, enabled):
@@ -262,7 +262,7 @@ private enum StorageUsageEntry: ItemListNodeEntry {
             case let .peersHeader(_, text):
                 return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
             case let .peer(_, _, strings, dateTimeFormat, nameDisplayOrder, peer, chatPeer, value, revealed):
-                var options: [ItemListPeerItemRevealOption] = [ItemListPeerItemRevealOption(type: .destructive, title: strings.ClearCache_Clear, action: {
+                let options: [ItemListPeerItemRevealOption] = [ItemListPeerItemRevealOption(type: .destructive, title: strings.ClearCache_Clear, action: {
                     arguments.clearPeerMedia(peer.id)
                 })]
                 return ItemListPeerItem(presentationData: presentationData, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, context: arguments.context, peer: peer, aliasHandling: .threatSelfAsSaved, nameColor: chatPeer == nil ? .primary : .secret, presence: nil, text: .none, label: .disclosure(value), editing: ItemListPeerItemEditing(editable: true, editing: false, revealed: revealed), revealOptions: ItemListPeerItemRevealOptions(options: options), switchValue: nil, enabled: true, selectable: true, sectionId: self.section, action: {
@@ -340,7 +340,7 @@ private func storageUsageControllerEntries(presentationData: PresentationData, c
         categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageOtherApps, size: otherAppsSpace, fraction: CGFloat(otherAppsSpace) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color2))
         categories.append(StorageUsageCategory(title: presentationData.strings.ClearCache_StorageFree, size: freeSpace, fraction: CGFloat(freeSpace) / totalSpaceValue, color: presentationData.theme.list.itemBarChart.color3))
         
-        entries.append(.storageUsage(presentationData.theme, presentationData.dateTimeFormat, categories))
+        entries.append(.storageUsage(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, categories))
         
         entries.append(.clearAll(presentationData.theme, presentationData.strings.ClearCache_ClearCache, telegramCacheSize > 0))
         
@@ -358,7 +358,7 @@ private func storageUsageControllerEntries(presentationData: PresentationData, c
                         chatPeer = mainPeer
                         mainPeer = associatedPeer
                     }
-                    entries.append(.peer(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, mainPeer, chatPeer, dataSizeString(size, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), state.peerIdWithRevealedOptions == peer.id))
+                    entries.append(.peer(index, presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, presentationData.nameDisplayOrder, mainPeer, chatPeer, dataSizeString(size, formatting: DataSizeStringFormatting(presentationData: presentationData)), state.peerIdWithRevealedOptions == peer.id))
                     index += 1
                 }
             }
@@ -394,7 +394,7 @@ func cacheUsageStats(context: AccountContext) -> Signal<CacheUsageStatsResult?,
         containerPath + "/Documents/tempcache_v1/store",
     ]
     return .single(nil)
-    |> then(collectCacheUsageStats(account: context.account, additionalCachePaths: additionalPaths, logFilesPath: context.sharedContext.applicationBindings.containerPath + "/telegram-data/logs")
+    |> then(context.engine.resources.collectCacheUsageStats(additionalCachePaths: additionalPaths, logFilesPath: context.sharedContext.applicationBindings.containerPath + "/telegram-data/logs")
     |> map(Optional.init))
 }
 
@@ -490,7 +490,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                         if filteredSize == 0 {
                             title = presentationData.strings.Cache_ClearNone
                         } else {
-                            title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0
+                            title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0
                         }
                         
                         if let item = item as? ActionSheetButtonItem {
@@ -527,7 +527,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                         let categorySize: Int64 = size
                         totalSize += categorySize
                         let index = itemIndex
-                        items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), value: true, action: { value in
+                        items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, formatting: DataSizeStringFormatting(presentationData: presentationData)), value: true, action: { value in
                             toggleCheck(categoryId, index)
                         }))
                         itemIndex += 1
@@ -537,7 +537,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                 if otherSize.1 != 0 {
                     totalSize += otherSize.1
                     let index = itemIndex
-                    items.append(ActionSheetCheckboxItem(title: presentationData.strings.Localization_LanguageOther, label: dataSizeString(otherSize.1, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), value: true, action: { value in
+                    items.append(ActionSheetCheckboxItem(title: presentationData.strings.Localization_LanguageOther, label: dataSizeString(otherSize.1, formatting: DataSizeStringFormatting(presentationData: presentationData)), value: true, action: { value in
                         toggleCheck(nil, index)
                     }))
                     itemIndex += 1
@@ -545,7 +545,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                 selectedSize = totalSize
                 
                 if !items.isEmpty {
-                    items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0, action: {
+                    items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0, action: {
                         if let statsPromise = statsPromise {
                             let clearCategories = sizeIndex.keys.filter({ sizeIndex[$0]!.0 })
                             
@@ -581,7 +581,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                             var updatedTempPaths = stats.tempPaths
                             var updatedTempSize = stats.tempSize
                             
-                            var signal: Signal<Void, NoError> = clearCachedMediaResources(account: context.account, mediaResourceIds: clearResourceIds)
+                            var signal: Signal<Void, NoError> = context.engine.resources.clearCachedMediaResources(mediaResourceIds: clearResourceIds)
                             if otherSize.0 {
                                 let removeTempFiles: Signal<Void, NoError> = Signal { subscriber in
                                     let fileManager = FileManager.default
@@ -637,7 +637,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                             clearDisposable.set((signal
                             |> deliverOnMainQueue).start(completed: {
                                 statsPromise.set(.single(.result(resultStats)))
-                                presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
+                                presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
                             }))
                         }
                         
@@ -692,7 +692,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                             if filteredSize == 0 {
                                 title = presentationData.strings.Cache_ClearNone
                             } else {
-                                title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0
+                                title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0
                             }
                             
                             if let item = item as? ActionSheetButtonItem {
@@ -732,7 +732,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                             totalSize += categorySize
                             if categorySize > 1024 {
                                 let index = itemIndex
-                                items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), value: true, action: { value in
+                                items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, formatting: DataSizeStringFormatting(presentationData: presentationData)), value: true, action: { value in
                                     toggleCheck(categoryId, index)
                                 }))
                                 itemIndex += 1
@@ -742,7 +742,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                     selectedSize = totalSize
                     
                     if !items.isEmpty {
-                        items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0, action: {
+                        items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0, action: {
                             if let statsPromise = statsPromise {
                                 let clearCategories = sizeIndex.keys.filter({ sizeIndex[$0]!.0 })
                                 var clearMediaIds = Set<MediaId>()
@@ -784,7 +784,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                                     }
                                 }
                                 
-                                var signal = clearCachedMediaResources(account: context.account, mediaResourceIds: clearResourceIds)
+                                var signal = context.engine.resources.clearCachedMediaResources(mediaResourceIds: clearResourceIds)
                                 
                                 let resultStats = CacheUsageStats(media: media, mediaResourceIds: stats.mediaResourceIds, peers: stats.peers, otherSize: stats.otherSize, otherPaths: stats.otherPaths, cacheSize: stats.cacheSize, tempPaths: stats.tempPaths, tempSize: stats.tempSize, immutableSize: stats.immutableSize)
                                 
@@ -818,7 +818,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                                 clearDisposable.set((signal
                                 |> deliverOnMainQueue).start(completed: {
                                     statsPromise.set(.single(.result(resultStats)))
-                                    presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
+                                    presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
                                 }))
                             }
                             
@@ -911,7 +911,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                             }
                         }
                         
-                        var signal = clearCachedMediaResources(account: context.account, mediaResourceIds: clearResourceIds)
+                        var signal = context.engine.resources.clearCachedMediaResources(mediaResourceIds: clearResourceIds)
                         
                         let resultStats = CacheUsageStats(media: media, mediaResourceIds: stats.mediaResourceIds, peers: stats.peers, otherSize: stats.otherSize, otherPaths: stats.otherPaths, cacheSize: stats.cacheSize, tempPaths: stats.tempPaths, tempSize: stats.tempSize, immutableSize: stats.immutableSize)
                         
@@ -945,7 +945,7 @@ public func storageUsageController(context: AccountContext, cacheUsagePromise: P
                         clearDisposable.set((signal
                         |> deliverOnMainQueue).start(completed: {
                             statsPromise.set(.single(.result(resultStats)))
-                            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
+                            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(totalSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), .current, nil)
                         }))
                     }
                 }
diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift
index 03ca00282f..3c4d8770d6 100644
--- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift	
+++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift	
@@ -19,12 +19,14 @@ struct StorageUsageCategory: Equatable {
 
 final class StorageUsageItem: ListViewItem, ItemListItem {
     let theme: PresentationTheme
+    let strings: PresentationStrings
     let dateTimeFormat: PresentationDateTimeFormat
     let categories: [StorageUsageCategory]
     let sectionId: ItemListSectionId
     
-    init(theme: PresentationTheme, dateTimeFormat: PresentationDateTimeFormat, categories: [StorageUsageCategory], sectionId: ItemListSectionId) {
+    init(theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, categories: [StorageUsageCategory], sectionId: ItemListSectionId) {
         self.theme = theme
+        self.strings = strings
         self.dateTimeFormat = dateTimeFormat
         self.categories = categories
         self.sectionId = sectionId
@@ -187,7 +189,7 @@ private final class StorageUsageItemNode: ListViewItemNode {
                 let category = item.categories[i]
                 
                 let attributedString = NSMutableAttributedString(string: category.title, font: Font.regular(14.0), textColor: item.theme.list.itemPrimaryTextColor, paragraphAlignment: .natural)
-                attributedString.append(NSAttributedString(string: " • \(dataSizeString(category.size, forceDecimal: true, decimalSeparator: item.dateTimeFormat.decimalSeparator))", font: Font.bold(14.0), textColor: item.theme.list.itemPrimaryTextColor))
+                attributedString.append(NSAttributedString(string: " • \(dataSizeString(category.size, forceDecimal: true, formatting: DataSizeStringFormatting(strings: item.strings, decimalSeparator: item.dateTimeFormat.decimalSeparator)))", font: Font.bold(14.0), textColor: item.theme.list.itemPrimaryTextColor))
                 
                 let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: attributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - params.leftInset - params.rightInset - 60.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
                 
diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListController.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListController.swift
index dfaca96c32..f96efea62d 100644
--- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListController.swift	
+++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListController.swift	
@@ -145,7 +145,7 @@ public class LocalizationListController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, transition: transition)
     }
     
     @objc private func editPressed() {
diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift
index aa17f128bf..0328661f80 100644
--- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift	
+++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListControllerNode.swift	
@@ -14,7 +14,6 @@ import AccountContext
 import ShareController
 import SearchBarNode
 import SearchUI
-import ActivityIndicator
 import UndoUI
 
 private enum LanguageListSection: ItemListSectionId {
@@ -33,12 +32,12 @@ private enum LanguageListEntryType {
 }
 
 private enum LanguageListEntry: Comparable, Identifiable {
-    case localization(index: Int, info: LocalizationInfo, type: LanguageListEntryType, selected: Bool, activity: Bool, revealed: Bool, editing: Bool)
+    case localization(index: Int, info: LocalizationInfo?, type: LanguageListEntryType, selected: Bool, activity: Bool, revealed: Bool, editing: Bool)
     
     var stableId: LanguageListEntryId {
         switch self {
-            case let .localization(_, info, _, _, _, _, _):
-                return .localization(info.languageCode)
+            case let .localization(index, info, _, _, _, _, _):
+                return .localization(info?.languageCode ?? "\(index)")
         }
     }
     
@@ -56,8 +55,10 @@ private enum LanguageListEntry: Comparable, Identifiable {
     func item(presentationData: PresentationData, searchMode: Bool, openSearch: @escaping () -> Void, selectLocalization: @escaping (LocalizationInfo) -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void) -> ListViewItem {
         switch self {
             case let .localization(_, info, type, selected, activity, revealed, editing):
-                return LocalizationListItem(presentationData: ItemListPresentationData(presentationData), id: info.languageCode, title: info.title, subtitle: info.localizedTitle, checked: selected, activity: activity, editing: LocalizationListItemEditing(editable: !selected && !searchMode && !info.isOfficial, editing: editing, revealed: !selected && revealed, reorderable: false), sectionId: type == .official ? LanguageListSection.official.rawValue : LanguageListSection.unofficial.rawValue, alwaysPlain: searchMode, action: {
-                    selectLocalization(info)
+                return LocalizationListItem(presentationData: ItemListPresentationData(presentationData), id: info?.languageCode ?? "", title: info?.title ?? " ", subtitle: info?.localizedTitle ?? " ", checked: selected, activity: activity, loading: info == nil, editing: LocalizationListItemEditing(editable: !selected && !searchMode && !(info?.isOfficial ?? true), editing: editing, revealed: !selected && revealed, reorderable: false), sectionId: type == .official ? LanguageListSection.official.rawValue : LanguageListSection.unofficial.rawValue, alwaysPlain: searchMode, action: {
+                    if let info = info {
+                        selectLocalization(info)
+                    }
                 }, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem)
         }
     }
@@ -173,7 +174,7 @@ private final class LocalizationListSearchContainerNode: SearchDisplayController
                 }
             })
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
@@ -259,16 +260,17 @@ private struct LanguageListNodeTransition {
     let firstTime: Bool
     let isLoading: Bool
     let animated: Bool
+    let crossfade: Bool
 }
 
-private func preparedLanguageListNodeTransition(presentationData: PresentationData, from fromEntries: [LanguageListEntry], to toEntries: [LanguageListEntry], openSearch: @escaping () -> Void, selectLocalization: @escaping (LocalizationInfo) -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void, firstTime: Bool, isLoading: Bool, forceUpdate: Bool, animated: Bool) -> LanguageListNodeTransition {
+private func preparedLanguageListNodeTransition(presentationData: PresentationData, from fromEntries: [LanguageListEntry], to toEntries: [LanguageListEntry], openSearch: @escaping () -> Void, selectLocalization: @escaping (LocalizationInfo) -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void, firstTime: Bool, isLoading: Bool, forceUpdate: Bool, animated: Bool, crossfade: Bool) -> LanguageListNodeTransition {
     let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries, allUpdated: forceUpdate)
     
     let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
     let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(presentationData: presentationData, searchMode: false, openSearch: openSearch, selectLocalization: selectLocalization, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem), directionHint: nil) }
     let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(presentationData: presentationData, searchMode: false, openSearch: openSearch, selectLocalization: selectLocalization, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem), directionHint: nil) }
     
-    return LanguageListNodeTransition(deletions: deletions, insertions: insertions, updates: updates, firstTime: firstTime, isLoading: isLoading, animated: animated)
+    return LanguageListNodeTransition(deletions: deletions, insertions: insertions, updates: updates, firstTime: firstTime, isLoading: isLoading, animated: animated, crossfade: crossfade)
 }
 
 final class LocalizationListControllerNode: ViewControllerTracingNode {
@@ -285,7 +287,6 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
     private var containerLayout: (ContainerViewLayout, CGFloat)?
     let listNode: ListView
     private var queuedTransitions: [LanguageListNodeTransition] = []
-    private var activityIndicator: ActivityIndicator?
     private var searchDisplayController: SearchDisplayController?
     
     private let presentationDataValue = Promise<PresentationData>()
@@ -365,19 +366,22 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
         }
         
         let preferencesKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.localizationListState]))
+        let previousState = Atomic<LocalizationListState?>(value: nil)
         let previousEntriesHolder = Atomic<([LanguageListEntry], PresentationTheme, PresentationStrings)?>(value: nil)
         self.listDisposable = combineLatest(queue: .mainQueue(), context.account.postbox.combinedView(keys: [preferencesKey]), context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.localizationSettings]), self.presentationDataValue.get(), self.applyingCode.get(), revealedCode.get(), self.isEditing.get()).start(next: { [weak self] view, sharedData, presentationData, applyingCode, revealedCode, isEditing in
             guard let strongSelf = self else {
                 return
             }
-            
+                        
             var entries: [LanguageListEntry] = []
             var activeLanguageCode: String?
             if let localizationSettings = sharedData.entries[SharedDataKeys.localizationSettings] as? LocalizationSettings {
                 activeLanguageCode = localizationSettings.primaryComponent.languageCode
             }
             var existingIds = Set<String>()
-            if let localizationListState = (view.views[preferencesKey] as? PreferencesView)?.values[PreferencesKeys.localizationListState] as? LocalizationListState, !localizationListState.availableOfficialLocalizations.isEmpty {
+            
+            let localizationListState = (view.views[preferencesKey] as? PreferencesView)?.values[PreferencesKeys.localizationListState] as? LocalizationListState
+            if let localizationListState = localizationListState, !localizationListState.availableOfficialLocalizations.isEmpty {
                 strongSelf.currentListState = localizationListState
                 
                 let availableSavedLocalizations = localizationListState.availableSavedLocalizations.filter({ info in !localizationListState.availableOfficialLocalizations.contains(where: { $0.languageCode == info.languageCode }) })
@@ -402,12 +406,19 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
                     existingIds.insert(info.languageCode)
                     entries.append(.localization(index: entries.count, info: info, type: .official, selected: info.languageCode == activeLanguageCode, activity: applyingCode == info.languageCode, revealed: revealedCode == info.languageCode, editing: false))
                 }
+            } else {
+                for _ in 0 ..< 15 {
+                    entries.append(.localization(index: entries.count, info: nil, type: .official, selected: false, activity: false, revealed: false, editing: false))
+                }
             }
+            
+            let previousState = previousState.swap(localizationListState)
+            
             let previousEntriesAndPresentationData = previousEntriesHolder.swap((entries, presentationData.theme, presentationData.strings))
-            let transition = preparedLanguageListNodeTransition(presentationData: presentationData, from: previousEntriesAndPresentationData?.0 ?? [], to: entries, openSearch: openSearch, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem, firstTime: previousEntriesAndPresentationData == nil, isLoading: entries.isEmpty, forceUpdate: previousEntriesAndPresentationData?.1 !== presentationData.theme || previousEntriesAndPresentationData?.2 !== presentationData.strings, animated: (previousEntriesAndPresentationData?.0.count ?? 0) >= entries.count)
+            let transition = preparedLanguageListNodeTransition(presentationData: presentationData, from: previousEntriesAndPresentationData?.0 ?? [], to: entries, openSearch: openSearch, selectLocalization: { [weak self] info in self?.selectLocalization(info) }, setItemWithRevealedOptions: setItemWithRevealedOptions, removeItem: removeItem, firstTime: previousEntriesAndPresentationData == nil, isLoading: entries.isEmpty, forceUpdate: previousEntriesAndPresentationData?.1 !== presentationData.theme || previousEntriesAndPresentationData?.2 !== presentationData.strings, animated: (previousEntriesAndPresentationData?.0.count ?? 0) >= entries.count, crossfade: (previousState == nil) != (localizationListState == nil))
             strongSelf.enqueueTransition(transition)
         })
-        self.updatedDisposable = synchronizedLocalizationListState(postbox: context.account.postbox, network: context.account.network).start()
+        self.updatedDisposable = context.engine.localization.synchronizedLocalizationListState().start()
     }
     
     deinit {
@@ -444,11 +455,6 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
         
         self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
         
-        if let activityIndicator = self.activityIndicator {
-            let indicatorSize = activityIndicator.measure(CGSize(width: 100.0, height: 100.0))
-            transition.updateFrame(node: activityIndicator, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - indicatorSize.width) / 2.0), y: updateSizeAndInsets.insets.top + 50.0 + floor((layout.size.height - updateSizeAndInsets.insets.top - updateSizeAndInsets.insets.bottom - indicatorSize.height - 50.0) / 2.0)), size: indicatorSize))
-        }
-        
         if !hadValidLayout {
             self.dequeueTransitions()
         }
@@ -463,7 +469,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
     }
     
     private func dequeueTransitions() {
-        guard let (layout, navigationBarHeight) = self.containerLayout else {
+        guard let _ = self.containerLayout else {
             return
         }
         while !self.queuedTransitions.isEmpty {
@@ -473,6 +479,8 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
             if transition.firstTime {
                 options.insert(.Synchronous)
                 options.insert(.LowLatency)
+            } else if transition.crossfade {
+                options.insert(.AnimateCrossfade)
             } else if transition.animated {
                 options.insert(.AnimateInsertion)
             }
@@ -482,17 +490,6 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
                         strongSelf.didSetReady = true
                         strongSelf._ready.set(true)
                     }
-                    
-                    if transition.isLoading, strongSelf.activityIndicator == nil {
-                        let activityIndicator = ActivityIndicator(type: .custom(strongSelf.presentationData.theme.list.itemAccentColor, 22.0, 1.0, false))
-                        strongSelf.activityIndicator = activityIndicator
-                        strongSelf.insertSubnode(activityIndicator, aboveSubnode: strongSelf.listNode)
-                        
-                        strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
-                    } else if !transition.isLoading, let activityIndicator = strongSelf.activityIndicator {
-                        strongSelf.activityIndicator = nil
-                        activityIndicator.removeFromSupernode()
-                    }
                 }
             })
         }
@@ -504,7 +501,7 @@ final class LocalizationListControllerNode: ViewControllerTracingNode {
                 return
             }
             strongSelf.applyingCode.set(.single(info.languageCode))
-            strongSelf.applyDisposable.set((downloadAndApplyLocalization(accountManager: strongSelf.context.sharedContext.accountManager, postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, languageCode: info.languageCode)
+            strongSelf.applyDisposable.set((strongSelf.context.engine.localization.downloadAndApplyLocalization(accountManager: strongSelf.context.sharedContext.accountManager, languageCode: info.languageCode)
                 |> deliverOnMainQueue).start(completed: {
                     self?.applyingCode.set(.single(nil))
                 }))
diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift
index c00aef3a25..ba852bc7ef 100644
--- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift	
+++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift	
@@ -8,6 +8,7 @@ import ItemListUI
 import PresentationDataUtils
 import ActivityIndicator
 import ChatListSearchItemNode
+import ShimmerEffect
 
 struct LocalizationListItemEditing: Equatable {
     let editable: Bool
@@ -23,6 +24,7 @@ class LocalizationListItem: ListViewItem, ItemListItem {
     let subtitle: String
     let checked: Bool
     let activity: Bool
+    let loading: Bool
     let editing: LocalizationListItemEditing
     let sectionId: ItemListSectionId
     let alwaysPlain: Bool
@@ -30,13 +32,14 @@ class LocalizationListItem: ListViewItem, ItemListItem {
     let setItemWithRevealedOptions: (String?, String?) -> Void
     let removeItem: (String) -> Void
     
-    init(presentationData: ItemListPresentationData, id: String, title: String, subtitle: String, checked: Bool, activity: Bool, editing: LocalizationListItemEditing, sectionId: ItemListSectionId, alwaysPlain: Bool, action: @escaping () -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void) {
+    init(presentationData: ItemListPresentationData, id: String, title: String, subtitle: String, checked: Bool, activity: Bool, loading: Bool, editing: LocalizationListItemEditing, sectionId: ItemListSectionId, alwaysPlain: Bool, action: @escaping () -> Void, setItemWithRevealedOptions: @escaping (String?, String?) -> Void, removeItem: @escaping (String) -> Void) {
         self.presentationData = presentationData
         self.id = id
         self.title = title
         self.subtitle = subtitle
         self.checked = checked
         self.activity = activity
+        self.loading = loading
         self.editing = editing
         self.sectionId = sectionId
         self.alwaysPlain = alwaysPlain
@@ -108,6 +111,9 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode {
     private var item: LocalizationListItem?
     private var layoutParams: (ListViewItemLayoutParams, ItemListNeighbors)?
     
+    private var placeholderNode: ShimmerEffectNode?
+    private var absoluteLocation: (CGRect, CGSize)?
+    
     private var editableControlNode: ItemListEditableControlNode?
     private var reorderControlNode: ItemListEditableReorderControlNode?
     
@@ -117,7 +123,7 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode {
         if self.editableControlNode != nil {
             return false
         }
-        if let _ = self.layoutParams?.0 {
+        if let _ = self.layoutParams?.0, let item = self.item, !item.loading {
             return super.canBeSelected
         } else {
             return false
@@ -167,6 +173,15 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode {
         self.addSubnode(self.activateArea)
     }
     
+    override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y += self.insets.top
+        self.absoluteLocation = (rect, containerSize)
+        if let shimmerNode = self.placeholderNode {
+            shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+        }
+    }
+    
     func asyncLayout() -> (_ item: LocalizationListItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, (Bool) -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
         let makeSubtitleLayout = TextNode.asyncLayout(self.subtitleNode)
@@ -322,6 +337,42 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode {
                         strongSelf.setRevealOptions((left: [], right: []))
                     }
                     strongSelf.setRevealOptionsOpened(item.editing.revealed, animated: animated)
+                    
+                    if item.loading {
+                        let shimmerNode: ShimmerEffectNode
+                        if let current = strongSelf.placeholderNode {
+                            shimmerNode = current
+                        } else {
+                            shimmerNode = ShimmerEffectNode()
+                            strongSelf.placeholderNode = shimmerNode
+                            if strongSelf.bottomStripeNode.supernode != nil {
+                                strongSelf.insertSubnode(shimmerNode, belowSubnode: strongSelf.bottomStripeNode)
+                            } else {
+                                strongSelf.addSubnode(shimmerNode)
+                            }
+                        }
+                        shimmerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
+                        if let (rect, size) = strongSelf.absoluteLocation {
+                            shimmerNode.updateAbsoluteRect(rect, within: size)
+                        }
+                        
+                        var shapes: [ShimmerEffectNode.Shape] = []
+                        
+                        let titleLineWidth: CGFloat = 80.0
+                        let subtitleLineWidth: CGFloat = 50.0
+                        let lineDiameter: CGFloat = 10.0
+                        
+                        let titleFrame = strongSelf.titleNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: titleFrame.minX, y: titleFrame.minY + floor((titleFrame.height - lineDiameter) / 2.0)), width: titleLineWidth, diameter: lineDiameter))
+                        
+                        let subtitleFrame = strongSelf.subtitleNode.frame
+                        shapes.append(.roundedRectLine(startPoint: CGPoint(x: subtitleFrame.minX, y: subtitleFrame.minY + floor((subtitleFrame.height - lineDiameter) / 2.0)), width: subtitleLineWidth, diameter: lineDiameter))
+                        
+                        shimmerNode.update(backgroundColor: item.presentationData.theme.list.itemBlocksBackgroundColor, foregroundColor: item.presentationData.theme.list.mediaPlaceholderColor, shimmeringColor: item.presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.4), shapes: shapes, size: layout.contentSize)
+                    } else if let shimmerNode = strongSelf.placeholderNode {
+                        strongSelf.placeholderNode = nil
+                        shimmerNode.removeFromSupernode()
+                    }
                 }
             })
         }
diff --git a/submodules/SettingsUI/Sources/LogoutOptionsController.swift b/submodules/SettingsUI/Sources/LogoutOptionsController.swift
index a9443cd2a2..7a68f36c76 100644
--- a/submodules/SettingsUI/Sources/LogoutOptionsController.swift
+++ b/submodules/SettingsUI/Sources/LogoutOptionsController.swift
@@ -157,7 +157,7 @@ public func logoutOptionsController(context: AccountContext, navigationControlle
         dismissImpl?()
     }, contactSupport: { [weak navigationController] in
         let supportPeer = Promise<PeerId?>()
-        supportPeer.set(supportPeerId(account: context.account))
+        supportPeer.set(context.engine.peers.supportPeerId())
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
         var faqUrl = presentationData.strings.Settings_FAQ_URL
diff --git a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
index 66a5dfe0ae..7689a657cd 100644
--- a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptionControllerNode.swift
@@ -780,16 +780,16 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode {
         let presentationData = context.sharedContext.currentPresentationData.modify {$0}
         
         let updatePeerSound: (PeerId, PeerMessageSound) -> Signal<Void, NoError> = { peerId, sound in
-            return updatePeerNotificationSoundInteractive(account: context.account, peerId: peerId, sound: sound) |> deliverOnMainQueue
+            return context.engine.peers.updatePeerNotificationSoundInteractive(peerId: peerId, sound: sound) |> deliverOnMainQueue
         }
         
-        let updatePeerNotificationInterval:(PeerId, Int32?) -> Signal<Void, NoError> = { peerId, muteInterval in
-            return updatePeerMuteSetting(account: context.account, peerId: peerId, muteInterval: muteInterval) |> deliverOnMainQueue
+        let updatePeerNotificationInterval: (PeerId, Int32?) -> Signal<Void, NoError> = { peerId, muteInterval in
+            return context.engine.peers.updatePeerMuteSetting(peerId: peerId, muteInterval: muteInterval) |> deliverOnMainQueue
         }
         
         let updatePeerDisplayPreviews:(PeerId, PeerNotificationDisplayPreviews) -> Signal<Void, NoError> = {
             peerId, displayPreviews in
-            return updatePeerDisplayPreviewsSetting(account: context.account, peerId: peerId, displayPreviews: displayPreviews) |> deliverOnMainQueue
+            return context.engine.peers.updatePeerDisplayPreviewsSetting(peerId: peerId, displayPreviews: displayPreviews) |> deliverOnMainQueue
         }
         
         self.backgroundColor = presentationData.theme.list.blocksBackgroundColor
@@ -842,13 +842,11 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode {
                         updateNotificationsView({})
                     })
                 }, removePeerFromExceptions: {
-                    let _ = (context.account.postbox.transaction { transaction -> Peer? in
-                        updatePeerMuteSetting(transaction: transaction, peerId: peerId, muteInterval: nil)
-                        updatePeerDisplayPreviewsSetting(transaction: transaction, peerId: peerId, displayPreviews: .default)
-                        updatePeerNotificationSoundInteractive(transaction: transaction, peerId: peerId, sound: .default)
+                    let _ = (context.engine.peers.removeCustomNotificationSettings(peerIds: [peerId])
+                    |> map { _ -> Peer? in }
+                    |> then(context.account.postbox.transaction { transaction -> Peer? in
                         return transaction.getPeer(peerId)
-                    }
-                    |> deliverOnMainQueue).start(next: { peer in
+                    })).start(next: { peer in
                         guard let peer = peer else {
                             return
                         }
@@ -917,11 +915,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode {
                 updateState { value in
                     return value.withUpdatedPeerMuteInterval(peer, nil).withUpdatedPeerSound(peer, .default).withUpdatedPeerDisplayPreviews(peer, .default)
                 }
-                _ = (context.account.postbox.transaction { transaction in
-                    updatePeerNotificationSoundInteractive(transaction: transaction, peerId: peer.id, sound: .default)
-                    updatePeerMuteSetting(transaction: transaction, peerId: peer.id, muteInterval: nil)
-                    updatePeerDisplayPreviewsSetting(transaction: transaction, peerId: peer.id, displayPreviews: .default)
-                }
+                let _ = (context.engine.peers.removeCustomNotificationSettings(peerIds: [peer.id])
                 |> deliverOnMainQueue).start(completed: {
                     updateNotificationsView({})
                 })
@@ -953,13 +947,7 @@ final class NotificationExceptionsControllerNode: ViewControllerTracingNode {
                             }
                             return state
                         }
-                        let _ = (context.account.postbox.transaction { transaction -> Void in
-                            for value in values {
-                                updatePeerNotificationSoundInteractive(transaction: transaction, peerId: value.peer.id, sound: .default)
-                                updatePeerMuteSetting(transaction: transaction, peerId: value.peer.id, muteInterval: nil)
-                                updatePeerDisplayPreviewsSetting(transaction: transaction, peerId: value.peer.id, displayPreviews: .default)
-                            }
-                        }
+                        let _ = (context.engine.peers.removeCustomNotificationSettings(peerIds: values.map(\.peer.id))
                         |> deliverOnMainQueue).start(completed: {
                             updateNotificationsView({})
                         })
@@ -1279,7 +1267,7 @@ private final class NotificationExceptionsSearchContainerNode: SearchDisplayCont
             }
         })
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptions.swift b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptions.swift
index e56e371194..566da4ec52 100644
--- a/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptions.swift
+++ b/submodules/SettingsUI/Sources/Notifications/Exceptions/NotificationExceptions.swift
@@ -157,7 +157,7 @@ public class NotificationExceptionsController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func removeAllPressed() {
diff --git a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
index b34263b70d..545d26e11e 100644
--- a/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
+++ b/submodules/SettingsUI/Sources/Notifications/NotificationsAndSounds.swift
@@ -1008,7 +1008,7 @@ public func notificationsAndSoundsController(context: AccountContext, exceptions
     let sharedData = context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.inAppNotificationSettings])
     let preferences = context.account.postbox.preferencesView(keys: [PreferencesKeys.globalNotifications])
     
-    let exceptionsSignal = Signal<NotificationExceptionsList?, NoError>.single(exceptionsList) |> then(notificationExceptionsList(postbox: context.account.postbox, network: context.account.network) |> map(Optional.init))
+    let exceptionsSignal = Signal<NotificationExceptionsList?, NoError>.single(exceptionsList) |> then(context.engine.peers.notificationExceptionsList() |> map(Optional.init))
     
     notificationExceptions.set(exceptionsSignal |> map { list -> (NotificationExceptionMode, NotificationExceptionMode, NotificationExceptionMode) in
         var users:[PeerId : NotificationExceptionWrapper] = [:]
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/ConfirmPhoneNumberController.swift b/submodules/SettingsUI/Sources/Privacy and Security/ConfirmPhoneNumberController.swift
index ac27bd6795..e0b7c6dee5 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/ConfirmPhoneNumberController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/ConfirmPhoneNumberController.swift	
@@ -216,7 +216,7 @@ public func confirmPhoneNumberCodeController(context: AccountContext, phoneNumbe
             |> take(1)
             |> mapToSignal { _ -> Signal<Void, NoError> in
                 return Signal { subscriber in
-                    return requestNextCancelAccountResetOption(network: context.account.network, phoneNumber: phoneNumber, phoneCodeHash: data.hash).start(next: { next in
+                    return context.engine.auth.requestNextCancelAccountResetOption(phoneNumber: phoneNumber, phoneCodeHash: data.hash).start(next: { next in
                         currentDataPromise?.set(.single(next))
                     }, error: { error in
                         
@@ -242,7 +242,7 @@ public func confirmPhoneNumberCodeController(context: AccountContext, phoneNumbe
             }
         }
         if let code = code {
-            confirmPhoneDisposable.set((requestCancelAccountReset(network: context.account.network, phoneCodeHash: codeData.hash, phoneCode: code)
+            confirmPhoneDisposable.set((context.engine.auth.requestCancelAccountReset(phoneCodeHash: codeData.hash, phoneCode: code)
             |> deliverOnMainQueue).start(error: { error in
                 updateState { state in
                     var state = state
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/CreatePasswordController.swift b/submodules/SettingsUI/Sources/Privacy and Security/CreatePasswordController.swift
index 5be4d7c79c..f8d3dc0936 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/CreatePasswordController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/CreatePasswordController.swift	
@@ -274,7 +274,7 @@ func createPasswordController(context: AccountContext, createPasswordContext: Cr
                         state.saving = true
                         return state
                     }
-                    saveDisposable.set((updateTwoStepVerificationPassword(network: context.account.network, currentPassword: currentPassword, updatedPassword: .password(password: state.passwordText, hint: state.hintText, email: email))
+                    saveDisposable.set((context.engine.auth.updateTwoStepVerificationPassword(currentPassword: currentPassword, updatedPassword: .password(password: state.passwordText, hint: state.hintText, email: email))
                         |> deliverOnMainQueue).start(next: { update in
                             switch update {
                             case .none:
@@ -356,7 +356,7 @@ func createPasswordController(context: AccountContext, createPasswordContext: Cr
             return state
         }
         
-        saveDisposable.set((updateTwoStepVerificationPassword(network: context.account.network, currentPassword: currentPassword, updatedPassword: .none)
+        saveDisposable.set((context.engine.auth.updateTwoStepVerificationPassword(currentPassword: currentPassword, updatedPassword: .none)
             |> deliverOnMainQueue).start(next: { _ in
                 updateState { state in
                     var state = state
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift
index 2372c84b27..f8803407b2 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/DataPrivacySettingsController.swift	
@@ -9,11 +9,11 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import ItemListUI
 import PresentationDataUtils
-import OverlayStatusController
 import AccountContext
 import AlertUI
 import PresentationDataUtils
 import TelegramNotices
+import UndoUI
 
 private final class DataPrivacyControllerArguments {
     let account: Account
@@ -360,7 +360,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                     info.insert(.shippingInfo)
                 }
                 
-                clearPaymentInfoDisposable.set((clearBotPaymentInfo(network: context.account.network, info: info)
+                clearPaymentInfoDisposable.set((context.engine.payments.clearBotPaymentInfo(info: info)
                     |> deliverOnMainQueue).start(completed: {
                         updateState { state in
                             var state = state
@@ -368,7 +368,19 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                             return state
                         }
                         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success))
+                        let text: String?
+                        if info.contains([.paymentInfo, .shippingInfo]) {
+                            text = presentationData.strings.Privacy_PaymentsClear_AllInfoCleared
+                        } else if info.contains(.paymentInfo) {
+                            text = presentationData.strings.Privacy_PaymentsClear_PaymentInfoCleared
+                        } else if info.contains(.shippingInfo) {
+                            text = presentationData.strings.Privacy_PaymentsClear_ShippingInfoCleared
+                        } else {
+                            text = nil
+                        }
+                        if let text = text {
+                            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: text), elevatedLayout: false, action: { _ in return false }))
+                        }
                     }))
             }
             dismissAction()
@@ -414,7 +426,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                     })
                 }).start()
                 
-                actionsDisposable.add((deleteAllContacts(account: context.account)
+                actionsDisposable.add((context.engine.contacts.deleteAllContacts()
                 |> deliverOnMainQueue).start(completed: {
                     updateState { state in
                         var state = state
@@ -422,7 +434,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                         return state
                     }
                     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                    presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success))
+                    presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Privacy_ContactsReset_ContactsDeleted), elevatedLayout: false, action: { _ in return false }))
                 }))
             }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Cancel, action: {})]))
         }
@@ -441,7 +453,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                 state.updatedSuggestFrequentContacts = value
                 return state
             }
-            let _ = updateRecentPeersEnabled(postbox: context.account.postbox, network: context.account.network, enabled: value).start()
+            let _ = context.engine.peers.updateRecentPeersEnabled(enabled: value).start()
         }
         if !value {
             let presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -470,7 +482,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                         return state
                     }
                     if clear {
-                        clearPaymentInfoDisposable.set((clearCloudDraftsInteractively(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId)
+                        clearPaymentInfoDisposable.set((context.engine.messages.clearCloudDraftsInteractively()
                             |> deliverOnMainQueue).start(completed: {
                                 updateState { state in
                                     var state = state
@@ -478,7 +490,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
                                     return state
                                 }
                                 let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                                presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .success))
+                                presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.Privacy_DeleteDrafts_DraftsDeleted), elevatedLayout: false, action: { _ in return false }))
                             }))
                     }
                     dismissAction()
@@ -491,9 +503,9 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
     
     let previousState = Atomic<DataPrivacyControllerState?>(value: nil)
     
-    actionsDisposable.add(managedUpdatedRecentPeers(accountPeerId: context.account.peerId, postbox: context.account.postbox, network: context.account.network).start())
+    actionsDisposable.add(context.engine.peers.managedUpdatedRecentPeers().start())
     
-    let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, statePromise.get(), context.sharedContext.accountManager.noticeEntry(key: ApplicationSpecificNotice.secretChatLinkPreviewsKey()), context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.contactSynchronizationSettings]), context.account.postbox.preferencesView(keys: [PreferencesKeys.contactsSettings]), recentPeers(account: context.account))
+    let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, statePromise.get(), context.sharedContext.accountManager.noticeEntry(key: ApplicationSpecificNotice.secretChatLinkPreviewsKey()), context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.contactSynchronizationSettings]), context.account.postbox.preferencesView(keys: [PreferencesKeys.contactsSettings]), context.engine.peers.recentPeers())
     |> map { presentationData, state, noticeView, sharedData, preferences, recentPeers -> (ItemListControllerState, (ItemListNodeState, Any)) in
         let secretChatLinkPreviews = noticeView.value.flatMap({ ApplicationSpecificNotice.getSecretChatLinkPreviews($0) })
         
@@ -530,7 +542,7 @@ public func dataPrivacyController(context: AccountContext) -> ViewController {
     
     let controller = ItemListController(context: context, state: signal)
     presentControllerImpl = { [weak controller] c in
-        controller?.present(c, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+        controller?.present(c, in: .window(.root))
     }
     
     return controller
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift
index 3ac27c2c04..000b2d8d36 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift	
@@ -150,7 +150,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode {
             let insets: UIEdgeInsets
             let separatorHeight = UIScreenPixel
             
-            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
             
             var peers = SimpleDictionary<PeerId, Peer>()
             let messages = SimpleDictionary<MessageId, Message>()
@@ -159,7 +159,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode {
             
             let forwardInfo = MessageForwardInfo(author: item.linkEnabled ? peers[peerId] : nil, source: nil, sourceMessageId: nil, date: 0, authorSignature: item.linkEnabled ? nil : item.peerName, psaType: nil, flags: [])
             
-            let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, messages: [Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])], theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)
+            let messageItem = item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, messages: [Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: forwardInfo, author: nil, text: item.strings.Privacy_Forwards_PreviewMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])], theme: item.theme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: nil)
             
             var node: ListViewItemNode?
             if let current = currentNode {
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift
index 750686026c..7b4c6980d7 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/PasscodeOptionsController.swift	
@@ -469,7 +469,7 @@ public func passcodeEntryController(context: AccountContext, animateIn: Bool = t
                 biometrics = .none
             }
             #endif
-            let controller = PasscodeEntryController(applicationBindings: context.sharedContext.applicationBindings, accountManager: context.sharedContext.accountManager, appLockContext: context.sharedContext.appLockContext, presentationData: context.sharedContext.currentPresentationData.with { $0 }, presentationDataSignal: context.sharedContext.presentationData, challengeData: challenge, biometrics: biometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: false, fadeIn: true, cancel: {
+            let controller = PasscodeEntryController(applicationBindings: context.sharedContext.applicationBindings, accountManager: context.sharedContext.accountManager, appLockContext: context.sharedContext.appLockContext, presentationData: context.sharedContext.currentPresentationData.with { $0 }, presentationDataSignal: context.sharedContext.presentationData, statusBarHost: context.sharedContext.mainWindow?.statusBarHost, challengeData: challenge, biometrics: biometrics, arguments: PasscodeEntryControllerPresentationArguments(animated: false, fadeIn: true, cancel: {
                 completion(false)
             }, modalPresentation: modalPresentation))
             controller.presentationCompleted = { [weak controller] in
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift
index 5e332cc700..ab2508baa9 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyAndSecurityController.swift	
@@ -506,11 +506,11 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
     actionsDisposable.add(updateAutoArchiveDisposable)
     
     let privacySettingsPromise = Promise<AccountPrivacySettings?>()
-    privacySettingsPromise.set(.single(initialSettings) |> then(requestAccountPrivacySettings(account: context.account) |> map(Optional.init)))
+    privacySettingsPromise.set(.single(initialSettings) |> then(context.engine.privacy.requestAccountPrivacySettings() |> map(Optional.init)))
         
     let blockedPeersContext = blockedPeersContext ?? BlockedPeersContext(account: context.account)
-    let activeSessionsContext = activeSessionsContext ?? ActiveSessionsContext(account: context.account)
-    let webSessionsContext = webSessionsContext ?? WebSessionsContext(account: context.account)
+    let activeSessionsContext = activeSessionsContext ?? context.engine.privacy.activeSessions()
+    let webSessionsContext = webSessionsContext ?? context.engine.privacy.webSessions()
     
     let blockedPeersState = Promise<BlockedPeersContextState>()
     blockedPeersState.set(blockedPeersContext.state)
@@ -542,7 +542,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
     }
     
     let updateHasTwoStepAuth: () -> Void = {
-        let signal = twoStepVerificationConfiguration(account: context.account)
+        let signal = context.engine.auth.twoStepVerificationConfiguration()
         |> map { value -> TwoStepVerificationAccessConfiguration? in
             return TwoStepVerificationAccessConfiguration(configuration: value, password: nil)
         }
@@ -727,15 +727,15 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
             }
         })
     }, openTwoStepVerification: { data in
-        var intro = false
+        let intro = false
         if let data = data {
             switch data {
             case .set:
                 break
             case let .notSet(pendingEmail):
-                //intro = pendingEmail == nil
                 if pendingEmail == nil {
-                    let controller = TwoFactorAuthSplashScreen(context: context, mode: .intro)
+                    let controller = TwoFactorAuthSplashScreen(sharedContext: context.sharedContext, engine: .authorized(context.engine), mode: .intro)
+
                     pushControllerImpl?(controller, true)
                     return
                 } else {
@@ -779,7 +779,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
             return .complete()
         }
         
-        updateAutoArchiveDisposable.set((updateAccountAutoArchiveChats(account: context.account, value: archiveValue)
+        updateAutoArchiveDisposable.set((context.engine.privacy.updateAccountAutoArchiveChats(value: archiveValue)
         |> mapToSignal { _ -> Signal<Void, NoError> in }
         |> then(applyTimeout)
         |> deliverOnMainQueue).start(completed: {
@@ -817,7 +817,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
                             }
                             return .complete()
                         }
-                    updateAccountTimeoutDisposable.set((updateAccountRemovalTimeout(account: context.account, timeout: timeout)
+                        updateAccountTimeoutDisposable.set((context.engine.privacy.updateAccountRemovalTimeout(timeout: timeout)
                         |> then(applyTimeout)
                         |> deliverOnMainQueue).start(completed: {
                             updateState { state in
@@ -851,7 +851,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
         pushControllerImpl?(dataPrivacyController(context: context), true)
     })
     
-    actionsDisposable.add(managedUpdatedRecentPeers(accountPeerId: context.account.peerId, postbox: context.account.postbox, network: context.account.network).start())
+    actionsDisposable.add(context.engine.peers.managedUpdatedRecentPeers().start())
 
     actionsDisposable.add((privacySettingsPromise.get()
     |> deliverOnMainQueue).start(next: { settings in
@@ -865,7 +865,7 @@ public func privacyAndSecurityController(context: AccountContext, initialSetting
     
     let preferencesKey: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.appConfiguration]))
     
-    let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, statePromise.get(), privacySettingsPromise.get(), context.sharedContext.accountManager.noticeEntry(key: ApplicationSpecificNotice.secretChatLinkPreviewsKey()), context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.contactSynchronizationSettings]), recentPeers(account: context.account), blockedPeersState.get(), webSessionsContext.state, context.sharedContext.accountManager.accessChallengeData(), combineLatest(twoStepAuth.get(), twoStepAuthDataValue.get()), context.account.postbox.combinedView(keys: [preferencesKey]))
+    let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, statePromise.get(), privacySettingsPromise.get(), context.sharedContext.accountManager.noticeEntry(key: ApplicationSpecificNotice.secretChatLinkPreviewsKey()), context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.contactSynchronizationSettings]), context.engine.peers.recentPeers(), blockedPeersState.get(), webSessionsContext.state, context.sharedContext.accountManager.accessChallengeData(), combineLatest(twoStepAuth.get(), twoStepAuthDataValue.get()), context.account.postbox.combinedView(keys: [preferencesKey]))
     |> map { presentationData, state, privacySettings, noticeView, sharedData, recentPeers, blockedPeersState, activeWebsitesState, accessChallengeData, twoStepAuth, preferences -> (ItemListControllerState, (ItemListNodeState, Any)) in
         var canAutoarchive = false
         if let view = preferences.views[preferencesKey] as? PreferencesView, let appConfiguration = view.values[PreferencesKeys.appConfiguration] as? AppConfiguration, let data = appConfiguration.data, let hasAutoarchive = data["autoarchive_setting_available"] as? Bool {
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift
index 4de91ff54d..76c2e339a9 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/PrivacyIntroController.swift	
@@ -178,6 +178,6 @@ final class PrivacyIntroController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift
index 1ba0704ebf..9d71c8b993 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsController.swift	
@@ -1038,14 +1038,14 @@ func selectivePrivacySettingsController(context: AccountContext, kind: Selective
                     type = .phoneNumber
             }
             
-            let updateSettingsSignal = updateSelectiveAccountPrivacySettings(account: context.account, type: type, settings: settings)
+            let updateSettingsSignal = context.engine.privacy.updateSelectiveAccountPrivacySettings(type: type, settings: settings)
             var updateCallP2PSettingsSignal: Signal<Void, NoError> = Signal.complete()
             if let callP2PSettings = callP2PSettings {
-                updateCallP2PSettingsSignal = updateSelectiveAccountPrivacySettings(account: context.account, type: .voiceCallsP2P, settings: callP2PSettings)
+                updateCallP2PSettingsSignal = context.engine.privacy.updateSelectiveAccountPrivacySettings(type: .voiceCallsP2P, settings: callP2PSettings)
             }
             var updatePhoneDiscoverySignal: Signal<Void, NoError> = Signal.complete()
             if let phoneDiscoveryEnabled = phoneDiscoveryEnabled {
-                updatePhoneDiscoverySignal = updatePhoneNumberDiscovery(account: context.account, value: phoneDiscoveryEnabled)
+                updatePhoneDiscoverySignal = context.engine.privacy.updatePhoneNumberDiscovery(value: phoneDiscoveryEnabled)
             }
             
             let _ = (combineLatest(updateSettingsSignal, updateCallP2PSettingsSignal, updatePhoneDiscoverySignal)
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationPasswordEntryController.swift b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationPasswordEntryController.swift
deleted file mode 100644
index 6a4ab372c1..0000000000
--- a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationPasswordEntryController.swift	
+++ /dev/null
@@ -1,456 +0,0 @@
-import Foundation
-import UIKit
-import Display
-import SwiftSignalKit
-import Postbox
-import TelegramCore
-import SyncCore
-import TelegramPresentationData
-import ItemListUI
-import PresentationDataUtils
-import AccountContext
-import AlertUI
-import PresentationDataUtils
-
-private final class TwoStepVerificationPasswordEntryControllerArguments {
-    let updateEntryText: (String) -> Void
-    let next: () -> Void
-    
-    init(updateEntryText: @escaping (String) -> Void, next: @escaping () -> Void) {
-        self.updateEntryText = updateEntryText
-        self.next = next
-    }
-}
-
-private enum TwoStepVerificationPasswordEntrySection: Int32 {
-    case password
-}
-
-private enum TwoStepVerificationPasswordEntryTag: ItemListItemTag {
-    case input
-    
-    func isEqual(to other: ItemListItemTag) -> Bool {
-        if let other = other as? TwoStepVerificationPasswordEntryTag {
-            switch self {
-                case .input:
-                    if case .input = other {
-                        return true
-                    } else {
-                        return false
-                    }
-            }
-        } else {
-            return false
-        }
-    }
-}
-
-private enum TwoStepVerificationPasswordEntryEntry: ItemListNodeEntry {
-    case passwordEntryTitle(PresentationTheme, String)
-    case passwordEntry(PresentationTheme, PresentationStrings, String)
-    
-    case hintTitle(PresentationTheme, String)
-    case hintEntry(PresentationTheme, PresentationStrings, String)
-    
-    case emailEntry(PresentationTheme, PresentationStrings, String)
-    case emailInfo(PresentationTheme, String)
-    
-    var section: ItemListSectionId {
-        return TwoStepVerificationPasswordEntrySection.password.rawValue
-    }
-    
-    var stableId: Int32 {
-        switch self {
-            case .passwordEntryTitle:
-                return 0
-            case .passwordEntry:
-                return 1
-            case .hintTitle:
-                return 2
-            case .hintEntry:
-                return 3
-            case .emailEntry:
-                return 5
-            case .emailInfo:
-                return 6
-        }
-    }
-    
-    static func ==(lhs: TwoStepVerificationPasswordEntryEntry, rhs: TwoStepVerificationPasswordEntryEntry) -> Bool {
-        switch lhs {
-            case let .passwordEntryTitle(lhsTheme, lhsText):
-                if case let .passwordEntryTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .passwordEntry(lhsTheme, lhsStrings, lhsText):
-                if case let .passwordEntry(rhsTheme, rhsStrings, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .hintTitle(lhsTheme, lhsText):
-                if case let .hintTitle(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .hintEntry(lhsTheme, lhsStrings, lhsText):
-                if case let .hintEntry(rhsTheme, rhsStrings, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .emailEntry(lhsTheme, lhsStrings, lhsText):
-                if case let .emailEntry(rhsTheme, rhsStrings, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .emailInfo(lhsTheme, lhsText):
-                if case let .emailInfo(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-    
-    static func <(lhs: TwoStepVerificationPasswordEntryEntry, rhs: TwoStepVerificationPasswordEntryEntry) -> Bool {
-        return lhs.stableId < rhs.stableId
-    }
-    
-    func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
-        let arguments = arguments as! TwoStepVerificationPasswordEntryControllerArguments
-        switch self {
-            case let .passwordEntryTitle(theme, text):
-                return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .passwordEntry(theme, strings, text):
-                return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(string: "", textColor: .black), text: text, placeholder: "", type: .password, spacing: 0.0, tag: TwoStepVerificationPasswordEntryTag.input, sectionId: self.section, textUpdated: { updatedText in
-                    arguments.updateEntryText(updatedText)
-                }, action: {
-                    arguments.next()
-                })
-            case let .hintTitle(theme, text):
-                return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-            case let .hintEntry(theme, strings, text):
-                return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(string: "", textColor: .black), text: text, placeholder: "", type: .password, spacing: 0.0, tag: TwoStepVerificationPasswordEntryTag.input, sectionId: self.section, textUpdated: { updatedText in
-                    arguments.updateEntryText(updatedText)
-                }, action: {
-                    arguments.next()
-                })
-            case let .emailEntry(theme, strings, text):
-                return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(string: strings.TwoStepAuth_Email, textColor: .black), text: text, placeholder: "", type: .email, spacing: 10.0, tag: TwoStepVerificationPasswordEntryTag.input, sectionId: self.section, textUpdated: { updatedText in
-                    arguments.updateEntryText(updatedText)
-                }, action: {
-                    arguments.next()
-                })
-            case let .emailInfo(theme, text):
-                return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
-        }
-    }
-}
-
-private enum PasswordEntryStage: Equatable {
-    case entry(text: String)
-    case reentry(first: String, text: String)
-    case hint(password: String, text: String)
-    case email(password: String, hint: String, text: String)
-    
-    func updateCurrentText(_ text: String) -> PasswordEntryStage {
-        switch self {
-            case .entry:
-                return .entry(text: text)
-            case let .reentry(first, _):
-                return .reentry(first: first, text: text)
-            case let .hint(password, _):
-                return .hint(password: password, text: text)
-            case let .email(password, hint, _):
-                return .email(password: password, hint: hint, text: text)
-        }
-    }
-    
-    static func ==(lhs: PasswordEntryStage, rhs: PasswordEntryStage) -> Bool {
-        switch lhs {
-            case let .entry(text):
-                if case .entry(text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case let .reentry(first, text):
-                if case .reentry(first, text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case let .hint(password, text):
-                if case .hint(password, text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-            case let .email(password, hint, text):
-                if case .email(password, hint, text) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-}
-
-private struct TwoStepVerificationPasswordEntryControllerState: Equatable {
-    let stage: PasswordEntryStage
-    let updating: Bool
-    
-    init(stage: PasswordEntryStage, updating: Bool) {
-        self.stage = stage
-        self.updating = updating
-    }
-    
-    static func ==(lhs: TwoStepVerificationPasswordEntryControllerState, rhs: TwoStepVerificationPasswordEntryControllerState) -> Bool {
-        if lhs.stage != rhs.stage {
-            return false
-        }
-        if lhs.updating != rhs.updating {
-            return false
-        }
-        
-        return true
-    }
-    
-    func withUpdatedStage(_ stage: PasswordEntryStage) -> TwoStepVerificationPasswordEntryControllerState {
-        return TwoStepVerificationPasswordEntryControllerState(stage: stage, updating: self.updating)
-    }
-    
-    func withUpdatedUpdating(_ updating: Bool) -> TwoStepVerificationPasswordEntryControllerState {
-        return TwoStepVerificationPasswordEntryControllerState(stage: self.stage, updating: updating)
-    }
-}
-
-private func twoStepVerificationPasswordEntryControllerEntries(presentationData: PresentationData, state: TwoStepVerificationPasswordEntryControllerState, mode: TwoStepVerificationPasswordEntryMode) -> [TwoStepVerificationPasswordEntryEntry] {
-    var entries: [TwoStepVerificationPasswordEntryEntry] = []
-    
-    switch state.stage {
-        case let .entry(text):
-            entries.append(.passwordEntryTitle(presentationData.theme, presentationData.strings.TwoStepAuth_SetupPasswordEnterPasswordNew))
-            entries.append(.passwordEntry(presentationData.theme, presentationData.strings, text))
-        case let .reentry(_, text):
-            entries.append(.passwordEntryTitle(presentationData.theme, presentationData.strings.TwoStepAuth_SetupPasswordConfirmPassword))
-            entries.append(.passwordEntry(presentationData.theme, presentationData.strings, text))
-        case let .hint(_, text):
-            entries.append(.hintTitle(presentationData.theme, presentationData.strings.TwoStepAuth_SetupHint))
-            entries.append(.hintEntry(presentationData.theme, presentationData.strings, text))
-        case let .email(_, _, text):
-            entries.append(.emailEntry(presentationData.theme, presentationData.strings, text))
-            entries.append(.emailInfo(presentationData.theme, presentationData.strings.TwoStepAuth_EmailHelp))
-    }
-    
-    return entries
-}
-
-enum TwoStepVerificationPasswordEntryMode {
-    case setup
-    case change(current: String)
-    case setupEmail(password: String)
-}
-
-struct TwoStepVerificationPasswordEntryResult {
-    let password: String
-    let pendingEmail: TwoStepVerificationPendingEmail?
-}
-
-func twoStepVerificationPasswordEntryController(context: AccountContext, mode: TwoStepVerificationPasswordEntryMode, result: Promise<TwoStepVerificationPasswordEntryResult?>) -> ViewController {
-    let initialStage: PasswordEntryStage
-    switch mode {
-        case .setup, .change:
-            initialStage = .entry(text: "")
-        case .setupEmail:
-            initialStage = .email(password: "", hint: "", text: "")
-    }
-    let initialState = TwoStepVerificationPasswordEntryControllerState(stage: initialStage, updating: false)
-    
-    let statePromise = ValuePromise(initialState, ignoreRepeated: true)
-    let stateValue = Atomic(value: initialState)
-    let updateState: ((TwoStepVerificationPasswordEntryControllerState) -> TwoStepVerificationPasswordEntryControllerState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
-    }
-    
-    var dismissImpl: (() -> Void)?
-    var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments) -> Void)?
-    
-    let actionsDisposable = DisposableSet()
-    
-    let updatePasswordDisposable = MetaDisposable()
-    actionsDisposable.add(updatePasswordDisposable)
-    
-    let checkPassword: () -> Void = {
-        var passwordHintEmail: (String, String, String)?
-        var invalidReentry = false
-        updateState { state in
-            if state.updating {
-                return state
-            } else {
-                switch state.stage {
-                    case let .entry(text):
-                        if text.isEmpty {
-                            return state
-                        } else {
-                            return state.withUpdatedStage(.reentry(first: text, text: ""))
-                        }
-                    case let .reentry(first, text):
-                        if text.isEmpty {
-                            return state
-                        } else if text != first {
-                            invalidReentry = true
-                            return state.withUpdatedStage(.entry(text: ""))
-                        } else {
-                            return state.withUpdatedStage(.hint(password: text, text: ""))
-                        }
-                    case let .hint(password, text):
-                        switch mode {
-                            case .setup:
-                                return state.withUpdatedStage(.email(password: password, hint: text, text: ""))
-                            case .change:
-                                passwordHintEmail = (password, text, "")
-                                return state.withUpdatedUpdating(true)
-                            case .setupEmail:
-                                preconditionFailure()
-                        }
-                    case let .email(password, hint, text):
-                        passwordHintEmail = (password, hint, text)
-                        return state.withUpdatedUpdating(true)
-                }
-            }
-        }
-        if let (password, hint, email) = passwordHintEmail {
-            switch mode {
-                case .setup, .change:
-                    var currentPassword: String?
-                    if case let .change(current) = mode {
-                        currentPassword = current
-                    }
-                    updatePasswordDisposable.set((updateTwoStepVerificationPassword(network: context.account.network, currentPassword: currentPassword, updatedPassword: .password(password: password, hint: hint, email: email)) |> deliverOnMainQueue).start(next: { update in
-                        updateState {
-                            $0.withUpdatedUpdating(false)
-                        }
-                        switch update {
-                            case let .password(password, pendingEmail):
-                                result.set(.single(TwoStepVerificationPasswordEntryResult(password: password, pendingEmail: pendingEmail)))
-                            case .none:
-                                break
-                        }
-                    }, error: { error in
-                        updateState {
-                            $0.withUpdatedUpdating(false)
-                        }
-                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        let alertText: String
-                        switch error {
-                            case .generic:
-                                alertText = presentationData.strings.Login_UnknownError
-                            case .invalidEmail:
-                                alertText = presentationData.strings.TwoStepAuth_EmailInvalid
-                        }
-                        presentControllerImpl?(textAlertController(context: context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-                    }))
-                case let .setupEmail(password):
-                    updatePasswordDisposable.set((updateTwoStepVerificationEmail(network: context.account.network, currentPassword: password, updatedEmail: email) |> deliverOnMainQueue).start(next: { update in
-                        updateState {
-                            $0.withUpdatedUpdating(false)
-                        }
-                        switch update {
-                            case let .password(password, pendingEmail):
-                                result.set(.single(TwoStepVerificationPasswordEntryResult(password: password, pendingEmail: pendingEmail)))
-                            case .none:
-                                break
-                        }
-                    }, error: { error in
-                        updateState {
-                            $0.withUpdatedUpdating(false)
-                        }
-                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        let alertText: String
-                        switch error {
-                            case .generic:
-                                alertText = presentationData.strings.Login_UnknownError
-                            case .invalidEmail:
-                                alertText = presentationData.strings.TwoStepAuth_EmailInvalid
-                        }
-                        presentControllerImpl?(textAlertController(context: context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-                    }))
-            }
-        } else if invalidReentry {
-            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-            presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.TwoStepAuth_SetupPasswordConfirmFailed, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-        }
-    }
-    
-    let arguments = TwoStepVerificationPasswordEntryControllerArguments(updateEntryText: { updatedText in
-        updateState {
-            $0.withUpdatedStage($0.stage.updateCurrentText(updatedText))
-        }
-    }, next: {
-        checkPassword()
-    })
-    
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get()) |> deliverOnMainQueue
-        |> map { presentationData, state -> (ItemListControllerState, (ItemListNodeState, Any)) in
-            
-            let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
-                dismissImpl?()
-            })
-            
-            var rightNavigationButton: ItemListNavigationButton?
-            if state.updating {
-                rightNavigationButton = ItemListNavigationButton(content: .none, style: .activity, enabled: true, action: {})
-            } else {
-                var nextEnabled = true
-                switch state.stage {
-                    case let .entry(text):
-                        if text.isEmpty {
-                            nextEnabled = false
-                        }
-                    case let.reentry(_, text):
-                        if text.isEmpty {
-                            nextEnabled = false
-                        }
-                    case .hint, .email:
-                        break
-                }
-                rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Next), style: .bold, enabled: nextEnabled, action: {
-                    checkPassword()
-                })
-            }
-            
-            let title: String
-            switch mode {
-                case .setup, .change:
-                    title = presentationData.strings.TwoStepAuth_EnterPasswordTitle
-                case .setupEmail:
-                    title = presentationData.strings.TwoStepAuth_EmailTitle
-            }
-            
-            let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(title), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
-            let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: twoStepVerificationPasswordEntryControllerEntries(presentationData: presentationData, state: state, mode: mode), style: .blocks, focusItemTag: TwoStepVerificationPasswordEntryTag.input, emptyStateItem: nil, animateChanges: false)
-            
-            return (controllerState, (listState, arguments))
-        } |> afterDisposed {
-            actionsDisposable.dispose()
-    }
-    
-    let controller = ItemListController(context: context, state: signal)
-    presentControllerImpl = { [weak controller] c, p in
-        if let controller = controller {
-            controller.present(c, in: .window(.root), with: p)
-        }
-    }
-    dismissImpl = { [weak controller] in
-        controller?.view.endEditing(true)
-        controller?.dismiss()
-    }
-    
-    return controller
-}
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationResetController.swift b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationResetController.swift
deleted file mode 100644
index 2f6091ea8e..0000000000
--- a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationResetController.swift	
+++ /dev/null
@@ -1,247 +0,0 @@
-import Foundation
-import UIKit
-import Display
-import SwiftSignalKit
-import Postbox
-import TelegramCore
-import SyncCore
-import TelegramPresentationData
-import ItemListUI
-import PresentationDataUtils
-import TextFormat
-import AccountContext
-import AlertUI
-import PresentationDataUtils
-import Markdown
-
-private final class TwoStepVerificationResetControllerArguments {
-    let updateEntryText: (String) -> Void
-    let next: () -> Void
-    let openEmailInaccessible: () -> Void
-    
-    init(updateEntryText: @escaping (String) -> Void, next: @escaping () -> Void, openEmailInaccessible: @escaping () -> Void) {
-        self.updateEntryText = updateEntryText
-        self.next = next
-        self.openEmailInaccessible = openEmailInaccessible
-    }
-}
-
-private enum TwoStepVerificationResetSection: Int32 {
-    case password
-}
-
-private enum TwoStepVerificationResetTag: ItemListItemTag {
-    case input
-    
-    func isEqual(to other: ItemListItemTag) -> Bool {
-        if let other = other as? TwoStepVerificationResetTag {
-            switch self {
-            case .input:
-                if case .input = other {
-                    return true
-                } else {
-                    return false
-                }
-            }
-        } else {
-            return false
-        }
-    }
-}
-
-private enum TwoStepVerificationResetEntry: ItemListNodeEntry {
-    case codeEntry(PresentationTheme, PresentationStrings, String, String)
-    case codeInfo(PresentationTheme, String)
-    
-    var section: ItemListSectionId {
-        return TwoStepVerificationResetSection.password.rawValue
-    }
-    
-    var stableId: Int32 {
-        switch self {
-            case .codeEntry:
-                return 0
-            case .codeInfo:
-                return 1
-        }
-    }
-    
-    static func ==(lhs: TwoStepVerificationResetEntry, rhs: TwoStepVerificationResetEntry) -> Bool {
-        switch lhs {
-            case let .codeEntry(lhsTheme, lhsStrings, lhsPlaceholder, lhsText):
-                if case let .codeEntry(rhsTheme, rhsStrings, rhsPlaceholder, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsPlaceholder == rhsPlaceholder, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-            case let .codeInfo(lhsTheme, lhsText):
-                if case let .codeInfo(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-    
-    static func <(lhs: TwoStepVerificationResetEntry, rhs: TwoStepVerificationResetEntry) -> Bool {
-        return lhs.stableId < rhs.stableId
-    }
-    
-    func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem {
-        let arguments = arguments as! TwoStepVerificationResetControllerArguments
-        switch self {
-            case let .codeEntry(theme, strings, placeholder, text):
-                return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(string: placeholder, textColor: theme.list.itemPrimaryTextColor), text: text, placeholder: "", type: .password, spacing: 10.0, tag: TwoStepVerificationResetTag.input, sectionId: self.section, textUpdated: { updatedText in
-                    arguments.updateEntryText(updatedText)
-                }, action: {
-                    arguments.next()
-                })
-            case let .codeInfo(theme, text):
-                return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section)
-        }
-    }
-}
-
-private struct TwoStepVerificationResetControllerState: Equatable {
-    let codeText: String
-    let checking: Bool
-    
-    init(codeText: String, checking: Bool) {
-        self.codeText = codeText
-        self.checking = checking
-    }
-    
-    static func ==(lhs: TwoStepVerificationResetControllerState, rhs: TwoStepVerificationResetControllerState) -> Bool {
-        if lhs.codeText != rhs.codeText {
-            return false
-        }
-        if lhs.checking != rhs.checking {
-            return false
-        }
-        
-        return true
-    }
-    
-    func withUpdatedCodeText(_ codeText: String) -> TwoStepVerificationResetControllerState {
-        return TwoStepVerificationResetControllerState(codeText: codeText, checking: self.checking)
-    }
-    
-    func withUpdatedChecking(_ checking: Bool) -> TwoStepVerificationResetControllerState {
-        return TwoStepVerificationResetControllerState(codeText: self.codeText, checking: checking)
-    }
-}
-
-private func twoStepVerificationResetControllerEntries(presentationData: PresentationData, state: TwoStepVerificationResetControllerState, emailPattern: String) -> [TwoStepVerificationResetEntry] {
-    var entries: [TwoStepVerificationResetEntry] = []
-
-    entries.append(.codeEntry(presentationData.theme, presentationData.strings, presentationData.strings.TwoStepAuth_RecoveryCode, state.codeText))
-    entries.append(.codeInfo(presentationData.theme, "\(presentationData.strings.TwoStepAuth_RecoveryCodeHelp)\n\n[\(presentationData.strings.TwoStepAuth_RecoveryEmailUnavailable(escapedPlaintextForMarkdown(emailPattern)).0)]()"))
-    
-    return entries
-}
-
-func twoStepVerificationResetController(context: AccountContext, emailPattern: String, result: Promise<Bool>) -> ViewController {
-    let initialState = TwoStepVerificationResetControllerState(codeText: "", checking: false)
-    
-    let statePromise = ValuePromise(initialState, ignoreRepeated: true)
-    let stateValue = Atomic(value: initialState)
-    let updateState: ((TwoStepVerificationResetControllerState) -> TwoStepVerificationResetControllerState) -> Void = { f in
-        statePromise.set(stateValue.modify { f($0) })
-    }
-    
-    var dismissImpl: (() -> Void)?
-    var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments) -> Void)?
-    
-    let actionsDisposable = DisposableSet()
-    
-    let resetPasswordDisposable = MetaDisposable()
-    actionsDisposable.add(resetPasswordDisposable)
-    
-    let checkCode: () -> Void = {
-        var code: String?
-        updateState { state in
-            if state.checking || state.codeText.isEmpty {
-                return state
-            } else {
-                code = state.codeText
-                return state.withUpdatedChecking(true)
-            }
-        }
-        if let code = code {
-            resetPasswordDisposable.set((recoverTwoStepVerificationPassword(network: context.account.network, code: code) |> deliverOnMainQueue).start(error: { error in
-                updateState {
-                    return $0.withUpdatedChecking(false)
-                }
-                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                let alertText: String
-                switch error {
-                    case .generic:
-                        alertText = presentationData.strings.Login_UnknownError
-                    case .invalidCode:
-                        alertText = presentationData.strings.Login_InvalidCodeError
-                    case .codeExpired:
-                        alertText = presentationData.strings.Login_CodeExpiredError
-                    case .limitExceeded:
-                        alertText = presentationData.strings.Login_CodeFloodError
-                }
-                presentControllerImpl?(textAlertController(context: context, title: nil, text: alertText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-            }, completed: {
-                updateState {
-                    return $0.withUpdatedChecking(false)
-                }
-                result.set(.single(true))
-            }))
-        }
-    }
-    
-    let arguments = TwoStepVerificationResetControllerArguments(updateEntryText: { updatedText in
-        updateState {
-            $0.withUpdatedCodeText(updatedText)
-        }
-    }, next: {
-        checkCode()
-    }, openEmailInaccessible: {
-        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.TwoStepAuth_RecoveryFailed, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
-    })
-    
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get()) |> deliverOnMainQueue
-        |> map { presentationData, state -> (ItemListControllerState, (ItemListNodeState, Any)) in
-            
-            let leftNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Cancel), style: .regular, enabled: true, action: {
-                dismissImpl?()
-            })
-            
-            var rightNavigationButton: ItemListNavigationButton?
-            if state.checking {
-                rightNavigationButton = ItemListNavigationButton(content: .none, style: .activity, enabled: true, action: {})
-            } else {
-                var nextEnabled = true
-                if state.codeText.isEmpty {
-                    nextEnabled = false
-                }
-                rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Next), style: .bold, enabled: nextEnabled, action: {
-                    checkCode()
-                })
-            }
-            
-            let controllerState = ItemListControllerState(presentationData: ItemListPresentationData(presentationData), title: .text(presentationData.strings.TwoStepAuth_RecoveryTitle), leftNavigationButton: leftNavigationButton, rightNavigationButton: rightNavigationButton, backNavigationButton: ItemListBackButton(title: presentationData.strings.Common_Back), animateChanges: false)
-            let listState = ItemListNodeState(presentationData: ItemListPresentationData(presentationData), entries: twoStepVerificationResetControllerEntries(presentationData: presentationData, state: state, emailPattern: emailPattern), style: .blocks, focusItemTag: TwoStepVerificationResetTag.input, emptyStateItem: nil, animateChanges: false)
-            
-            return (controllerState, (listState, arguments))
-        } |> afterDisposed {
-            actionsDisposable.dispose()
-    }
-    
-    let controller = ItemListController(context: context, state: signal)
-    presentControllerImpl = { [weak controller] c, p in
-        if let controller = controller {
-            controller.present(c, in: .window(.root), with: p)
-        }
-    }
-    dismissImpl = { [weak controller] in
-        controller?.dismiss()
-    }
-    
-    return controller
-}
diff --git a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift
index 71419adcbb..dd2af7c141 100644
--- a/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift	
+++ b/submodules/SettingsUI/Sources/Privacy and Security/TwoStepVerificationUnlockController.swift	
@@ -26,8 +26,10 @@ private final class TwoStepVerificationUnlockSettingsControllerArguments {
     let openResetPendingEmail: () -> Void
     let updateEmailCode: (String) -> Void
     let openConfirmEmail: () -> Void
+    let declinePasswordReset: () -> Void
+    let resetPassword: () -> Void
     
-    init(updatePasswordText: @escaping (String) -> Void, checkPassword: @escaping () -> Void, openForgotPassword: @escaping () -> Void, openSetupPassword: @escaping () -> Void, openDisablePassword: @escaping () -> Void, openSetupEmail: @escaping () -> Void, openResetPendingEmail: @escaping () -> Void, updateEmailCode: @escaping (String) -> Void, openConfirmEmail: @escaping () -> Void) {
+    init(updatePasswordText: @escaping (String) -> Void, checkPassword: @escaping () -> Void, openForgotPassword: @escaping () -> Void, openSetupPassword: @escaping () -> Void, openDisablePassword: @escaping () -> Void, openSetupEmail: @escaping () -> Void, openResetPendingEmail: @escaping () -> Void, updateEmailCode: @escaping (String) -> Void, openConfirmEmail: @escaping () -> Void, declinePasswordReset: @escaping () -> Void, resetPassword: @escaping () -> Void) {
         self.updatePasswordText = updatePasswordText
         self.checkPassword = checkPassword
         self.openForgotPassword = openForgotPassword
@@ -37,6 +39,8 @@ private final class TwoStepVerificationUnlockSettingsControllerArguments {
         self.openResetPendingEmail = openResetPendingEmail
         self.updateEmailCode = updateEmailCode
         self.openConfirmEmail = openConfirmEmail
+        self.declinePasswordReset = declinePasswordReset
+        self.resetPassword = resetPassword
     }
 }
 
@@ -132,47 +136,53 @@ private enum TwoStepVerificationUnlockSettingsEntry: ItemListNodeEntry {
                 }, action: {
                     arguments.checkPassword()
                 })
-            case let .passwordEntryInfo(theme, text):
+            case let .passwordEntryInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section, linkAction: { action in
                     switch action {
-                        case .tap:
-                            arguments.openForgotPassword()
+                        case let .tap(item):
+                            if item == "forgot" {
+                                arguments.openForgotPassword()
+                            } else if item == "declineReset" {
+                                arguments.declinePasswordReset()
+                            } else if item == "reset" {
+                                arguments.resetPassword()
+                            }
                     }
                 })
-            case let .passwordSetup(theme, text):
+            case let .passwordSetup(_, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.openSetupPassword()
                 })
-            case let .passwordSetupInfo(theme, text):
+            case let .passwordSetupInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section)
-            case let .changePassword(theme, text):
+            case let .changePassword(_, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.openSetupPassword()
                 })
-            case let .turnPasswordOff(theme, text):
+            case let .turnPasswordOff(_, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.openDisablePassword()
                 })
-            case let .setupRecoveryEmail(theme, text):
+            case let .setupRecoveryEmail(_, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.openSetupEmail()
                 })
-            case let .passwordInfo(theme, text):
+            case let .passwordInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
-            case let .pendingEmailConfirmInfo(theme, text):
+            case let .pendingEmailConfirmInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(text), sectionId: self.section)
-            case let .pendingEmailConfirmCode(theme, strings, title, text):
+            case let .pendingEmailConfirmCode(_, _, title, text):
                 return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(string: ""), text: text, placeholder: title, type: .number, sectionId: self.section, textUpdated: { value in
                     arguments.updateEmailCode(value)
                 }, action: {})
-            case let .pendingEmailInfo(theme, text):
+            case let .pendingEmailInfo(_, text):
                 return ItemListTextItem(presentationData: presentationData, text: .markdown(text), sectionId: self.section, linkAction: { action in
                     switch action {
                         case .tap:
                             arguments.openResetPendingEmail()
                     }
                 })
-            case let .pendingEmailOpenConfirm(theme, text):
+            case let .pendingEmailOpenConfirm(_, text):
                 return ItemListActionItem(presentationData: presentationData, title: text, kind: .generic, alignment: .natural, sectionId: self.section, style: .blocks, action: {
                     arguments.openConfirmEmail()
                 })
@@ -204,13 +214,28 @@ private func twoStepVerificationUnlockSettingsControllerEntries(presentationData
                             entries.append(.passwordSetup(presentationData.theme, presentationData.strings.TwoStepAuth_SetPassword))
                             entries.append(.passwordSetupInfo(presentationData.theme, presentationData.strings.TwoStepAuth_SetPasswordHelp))
                         }
-                    case let .set(hint, _, _):
+                    case let .set(hint, _, _, pendingResetTimestamp):
                         entries.append(.passwordEntry(presentationData.theme, presentationData.strings, presentationData.strings.TwoStepAuth_EnterPasswordPassword, state.passwordText))
-                        if hint.isEmpty {
-                            entries.append(.passwordEntryInfo(presentationData.theme, presentationData.strings.TwoStepAuth_EnterPasswordHelp + "\n\n[" + presentationData.strings.TwoStepAuth_EnterPasswordForgot + "](forgot)"))
-                        } else {
-                            entries.append(.passwordEntryInfo(presentationData.theme, presentationData.strings.TwoStepAuth_EnterPasswordHint(escapedPlaintextForMarkdown(hint)).0 + "\n\n" + presentationData.strings.TwoStepAuth_EnterPasswordHelp + "\n\n[" + presentationData.strings.TwoStepAuth_EnterPasswordForgot + "](forgot)"))
+                        var text: String = ""
+                        if !hint.isEmpty {
+                            text += presentationData.strings.TwoStepAuth_EnterPasswordHint(escapedPlaintextForMarkdown(hint)).0
                         }
+
+                        if let pendingResetTimestamp = pendingResetTimestamp {
+                            text += "\n\n"
+                            let remainingSeconds = pendingResetTimestamp - Int32(Date().timeIntervalSince1970)
+                            if remainingSeconds <= 0 {
+                                text += "[" + presentationData.strings.TwoStepAuth_ResetAction + "](reset)"
+                            } else {
+                                text.append(presentationData.strings.TwoStepAuth_ResetPendingText(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0)
+                                text.append("\n[\(presentationData.strings.TwoStepAuth_CancelResetTitle)](declineReset)")
+                            }
+                        } else {
+                            text += "\n\n"
+                            text += presentationData.strings.TwoStepAuth_EnterPasswordHelp + "\n\n[" + presentationData.strings.TwoStepAuth_EnterPasswordForgot + "](forgot)"
+                        }
+
+                        entries.append(.passwordEntryInfo(presentationData.theme, text))
                 }
             }
         case let .manage(_, emailSet, pendingEmail, _):
@@ -228,36 +253,36 @@ private func twoStepVerificationUnlockSettingsControllerEntries(presentationData
     return entries
 }
 
-enum TwoStepVerificationUnlockSettingsControllerMode {
+public enum TwoStepVerificationUnlockSettingsControllerMode {
     case access(intro: Bool, data: Signal<TwoStepVerificationUnlockSettingsControllerData, NoError>?)
     case manage(password: String, email: String, pendingEmail: TwoStepVerificationPendingEmail?, hasSecureValues: Bool)
 }
 
-struct TwoStepVerificationPendingEmailState: Equatable {
+public struct TwoStepVerificationPendingEmailState: Equatable {
     let password: String?
     let email: TwoStepVerificationPendingEmail
 }
 
-enum TwoStepVerificationAccessConfiguration: Equatable {
+public enum TwoStepVerificationAccessConfiguration: Equatable {
     case notSet(pendingEmail: TwoStepVerificationPendingEmailState?)
-    case set(hint: String, hasRecoveryEmail: Bool, hasSecureValues: Bool)
+    case set(hint: String, hasRecoveryEmail: Bool, hasSecureValues: Bool, pendingResetTimestamp: Int32?)
     
-    init(configuration: TwoStepVerificationConfiguration, password: String?) {
+    public init(configuration: TwoStepVerificationConfiguration, password: String?) {
         switch configuration {
             case let .notSet(pendingEmail):
                 self = .notSet(pendingEmail: pendingEmail.flatMap({ TwoStepVerificationPendingEmailState(password: password, email: $0) }))
-            case let .set(hint, hasRecoveryEmail, _, hasSecureValues):
-                self = .set(hint: hint, hasRecoveryEmail: hasRecoveryEmail, hasSecureValues: hasSecureValues)
+            case let .set(hint, hasRecoveryEmail, _, hasSecureValues, pendingResetTimestamp):
+                self = .set(hint: hint, hasRecoveryEmail: hasRecoveryEmail, hasSecureValues: hasSecureValues, pendingResetTimestamp: pendingResetTimestamp)
         }
     }
 }
 
-enum TwoStepVerificationUnlockSettingsControllerData: Equatable {
+public enum TwoStepVerificationUnlockSettingsControllerData: Equatable {
     case access(configuration: TwoStepVerificationAccessConfiguration?)
     case manage(password: String, emailSet: Bool, pendingEmail: TwoStepVerificationPendingEmail?, hasSecureValues: Bool)
 }
 
-func twoStepVerificationUnlockSettingsController(context: AccountContext, mode: TwoStepVerificationUnlockSettingsControllerMode, openSetupPasswordImmediately: Bool = false) -> ViewController {
+public func twoStepVerificationUnlockSettingsController(context: AccountContext, mode: TwoStepVerificationUnlockSettingsControllerMode, openSetupPasswordImmediately: Bool = false) -> ViewController {
     let initialState = TwoStepVerificationUnlockSettingsControllerState()
     
     let statePromise = ValuePromise(initialState, ignoreRepeated: true)
@@ -268,6 +293,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
     
     var replaceControllerImpl: ((ViewController, Bool) -> Void)?
     var presentControllerImpl: ((ViewController, ViewControllerPresentationArguments?) -> Void)?
+    var pushControllerImpl: ((ViewController) -> Void)?
     var dismissImpl: (() -> Void)?
     
     let actionsDisposable = DisposableSet()
@@ -291,7 +317,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
             } else {
                 dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.access(configuration: nil))
                 |> then(remoteDataPromise.get()))
-                remoteDataPromise.set(twoStepVerificationConfiguration(account: context.account)
+                remoteDataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
                 |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil)) })
             }
         case let .manage(password, email, pendingEmail, hasSecureValues):
@@ -330,7 +356,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                     return state
                 }
                 if let code = code {
-                    setupDisposable.set((confirmTwoStepRecoveryEmail(network: context.account.network, code: code)
+                    setupDisposable.set((context.engine.auth.confirmTwoStepRecoveryEmail(code: code)
                     |> deliverOnMainQueue).start(error: { error in
                         updateState { state in
                             var state = state
@@ -379,7 +405,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                         dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.manage(password: password, emailSet: true, pendingEmail: nil, hasSecureValues: false)))
                                     } else {
                                         dataPromise.set(.single(.access(configuration: nil))
-                                            |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: pendingEmail.password)) }))
+                                        |> then(context.engine.auth.twoStepVerificationConfiguration() |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: pendingEmail.password)) }))
                                     }
                                 case let .manage(manage):
                                     dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.manage(password: manage.password, emailSet: true, pendingEmail: nil, hasSecureValues: manage.hasSecureValues)))
@@ -416,11 +442,10 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
         }
         
         if let password = password, !password.isEmpty, !wasChecking {
-            checkDisposable.set((requestTwoStepVerifiationSettings(network: context.account.network, password: password)
+            checkDisposable.set((context.engine.auth.requestTwoStepVerifiationSettings(password: password)
             |> mapToSignal { settings -> Signal<(TwoStepVerificationSettings, TwoStepVerificationPendingEmail?), AuthorizationPasswordVerificationError> in
-                return twoStepVerificationConfiguration(account: context.account)
+                return context.engine.auth.twoStepVerificationConfiguration()
                 |> mapError { _ -> AuthorizationPasswordVerificationError in
-                    return .generic
                 }
                 |> map { configuration in
                     var pendingEmail: TwoStepVerificationPendingEmail?
@@ -469,34 +494,42 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                     if let configuration = configuration {
                         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                         switch configuration {
-                            case let .set(_, hasRecoveryEmail, _):
+                            case let .set(_, hasRecoveryEmail, _, pendingResetTimestamp):
                                 if hasRecoveryEmail {
                                     updateState { state in
                                         var state = state
                                         state.checking = true
                                         return state
                                     }
-                                    setupResultDisposable.set((requestTwoStepVerificationPasswordRecoveryCode(network: context.account.network)
+                                    setupResultDisposable.set((context.engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
                                     |> deliverOnMainQueue).start(next: { emailPattern in
                                         updateState { state in
                                             var state = state
                                             state.checking = false
                                             return state
                                         }
-                                        
-                                        var completionImpl: (() -> Void)?
-                                        let controller = resetPasswordController(context: context, emailPattern: emailPattern, completion: {
-                                            completionImpl?()
+
+                                        var stateUpdated: ((SetupTwoStepVerificationStateUpdate) -> Void)?
+                                        let controller = TwoFactorDataInputScreen(sharedContext: context.sharedContext, engine: .authorized(context.engine), mode: .passwordRecoveryEmail(emailPattern: emailPattern, mode: .authorized), stateUpdated: { state in
+                                            stateUpdated?(state)
                                         })
-                                        completionImpl = { [weak controller] in
-                                            dataPromise.set(.single(TwoStepVerificationUnlockSettingsControllerData.access(configuration: .notSet(pendingEmail: nil))))
+                                        stateUpdated = { [weak controller] state in
                                             controller?.view.endEditing(true)
                                             controller?.dismiss()
                                             
-                                            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                                            presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(presentationData.strings.TwoStepAuth_DisableSuccess, false)), nil)
+                                            switch state {
+                                            case .noPassword, .awaitingEmailConfirmation, .passwordSet:
+                                                controller?.dismiss()
+
+                                                dismissImpl?()
+                                            case .pendingPasswordReset:
+                                                dataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
+                                                |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil))
+                                                })
+                                            }
                                         }
-                                        presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                        
+                                        pushControllerImpl?(controller)
                                     }, error: { _ in
                                         updateState { state in
                                             var state = state
@@ -506,7 +539,64 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                         presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
                                     }))
                                 } else {
-                                    presentControllerImpl?(textAlertController(context: context, title: nil, text: presentationData.strings.TwoStepAuth_RecoveryUnavailable, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                    if let pendingResetTimestamp = pendingResetTimestamp {
+                                        let remainingSeconds = pendingResetTimestamp - Int32(Date().timeIntervalSince1970)
+                                        if remainingSeconds <= 0 {
+                                            let _ = (context.engine.auth.requestTwoStepPasswordReset()
+                                            |> deliverOnMainQueue).start(next: { result in
+                                                switch result {
+                                                case .done, .waitingForReset:
+                                                    dataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
+                                                    |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil))
+                                                    })
+                                                case .declined:
+                                                    break
+                                                case let .error(reason):
+                                                    let text: String
+                                                    switch reason {
+                                                    case let .limitExceeded(retryAtTimestamp):
+                                                        if let retryAtTimestamp = retryAtTimestamp {
+                                                            let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                                                            text = presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0
+                                                        } else {
+                                                            text = presentationData.strings.TwoStepAuth_FloodError
+                                                        }
+                                                    case .generic:
+                                                        text = presentationData.strings.Login_UnknownError
+                                                    }
+                                                    presentControllerImpl?(textAlertController(sharedContext: context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+                                                }
+                                            })
+                                        }
+                                    } else {
+                                        presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetTitle, text: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.TwoStepAuth_RecoveryUnavailableResetAction, action: {
+                                            let _ = (context.engine.auth.requestTwoStepPasswordReset()
+                                            |> deliverOnMainQueue).start(next: { result in
+                                                switch result {
+                                                case .done, .waitingForReset:
+                                                    dataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
+                                                    |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil))
+                                                    })
+                                                case .declined:
+                                                    break
+                                                case let .error(reason):
+                                                    let text: String
+                                                    switch reason {
+                                                    case let .limitExceeded(retryAtTimestamp):
+                                                        if let retryAtTimestamp = retryAtTimestamp {
+                                                            let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                                                            text = presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0
+                                                        } else {
+                                                            text = presentationData.strings.TwoStepAuth_FloodError
+                                                        }
+                                                    case .generic:
+                                                        text = presentationData.strings.Login_UnknownError
+                                                    }
+                                                    presentControllerImpl?(textAlertController(sharedContext: context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+                                                }
+                                            })
+                                        })]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                    }
                                 }
                             case .notSet:
                                 break
@@ -527,6 +617,8 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                             case .notSet:
                                 let controller = SetupTwoStepVerificationController(context: context, initialState: .createPassword, stateUpdated: { update, shouldDismiss, controller in
                                     switch update {
+                                        case .pendingPasswordReset:
+                                            break
                                         case .noPassword:
                                             dataPromise.set(.single(.access(configuration: .notSet(pendingEmail: nil))))
                                         case let .awaitingEmailConfirmation(password, pattern, codeLength):
@@ -538,7 +630,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                                 presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(presentationData.strings.TwoStepAuth_EnabledSuccess, false)), nil)
                                             } else {
                                                 dataPromise.set(.single(.access(configuration: nil))
-                                                |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
+                                                |> then(context.engine.auth.twoStepVerificationConfiguration() |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
                                             }
                                     }
                                     if shouldDismiss {
@@ -558,6 +650,8 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                 case let .manage(password, hasRecovery, pendingEmail, hasSecureValues):
                     let controller = SetupTwoStepVerificationController(context: context, initialState: .updatePassword(current: password, hasRecoveryEmail: hasRecovery, hasSecureValues: hasSecureValues), stateUpdated: { update, shouldDismiss, controller in
                         switch update {
+                            case .pendingPasswordReset:
+                                break
                             case .noPassword:
                                 dataPromise.set(.single(.access(configuration: .notSet(pendingEmail: nil))))
                             case .awaitingEmailConfirmation:
@@ -570,7 +664,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                     presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(presentationData.strings.TwoStepAuth_PasswordChangeSuccess, false)), nil)
                                 } else {
                                     dataPromise.set(.single(.access(configuration: nil))
-                                    |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
+                                    |> then(context.engine.auth.twoStepVerificationConfiguration() |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
                                 }
                         }
                         if shouldDismiss {
@@ -612,7 +706,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                 case let .manage(password, _, _, _):
                                     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
                                     presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(presentationData.strings.TwoStepAuth_DisableSuccess, false)), nil)
-                                    return updateTwoStepVerificationPassword(network: context.account.network, currentPassword: password, updatedPassword: .none)
+                                    return context.engine.auth.updateTwoStepVerificationPassword(currentPassword: password, updatedPassword: .none)
                                         |> mapToSignal { _ -> Signal<Void, UpdateTwoStepVerificationPasswordError> in
                                             return .complete()
                                         }
@@ -647,10 +741,10 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
             case .access:
                 break
             case let .manage(password, emailSet, _, hasSecureValues):
-                //let controller = TwoFactorDataInputScreen(context: context, mode: .updateEmailAddress(password: password))
-                
                 let controller = SetupTwoStepVerificationController(context: context, initialState: .addEmail(hadRecoveryEmail: emailSet, hasSecureValues: hasSecureValues, password: password), stateUpdated: { update, shouldDismiss, controller in
                     switch update {
+                        case .pendingPasswordReset:
+                            break
                         case .noPassword:
                             assertionFailure()
                             break
@@ -665,7 +759,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                 presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .genericSuccess(emailSet ? presentationData.strings.TwoStepAuth_EmailChangeSuccess : presentationData.strings.TwoStepAuth_EmailAddSuccess, false)), nil)
                             } else {
                                 dataPromise.set(.single(.access(configuration: nil))
-                                    |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
+                                |> then(context.engine.auth.twoStepVerificationConfiguration() |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
                             }
                     }
                     if shouldDismiss {
@@ -681,7 +775,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
             state.checking = true
             return state
         }
-        setupDisposable.set((updateTwoStepVerificationPassword(network: context.account.network, currentPassword: nil, updatedPassword: .none)
+        setupDisposable.set((context.engine.auth.updateTwoStepVerificationPassword(currentPassword: nil, updatedPassword: .none)
         |> deliverOnMainQueue).start(next: { _ in
             updateState { state in
                 var state = state
@@ -738,6 +832,8 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                     }
                     let controller = SetupTwoStepVerificationController(context: context, initialState: .confirmEmail(password: password, hasSecureValues: hasSecureValues, pattern: pendingEmail.pattern, codeLength: pendingEmail.codeLength), stateUpdated: { update, shouldDismiss, controller in
                         switch update {
+                            case .pendingPasswordReset:
+                                break
                             case .noPassword:
                                 assertionFailure()
                                 break
@@ -752,7 +848,7 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                                     dataPromise.set(.single(data))
                                 } else {
                                     dataPromise.set(.single(.access(configuration: nil))
-                                    |> then(twoStepVerificationConfiguration(account: context.account) |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
+                                    |> then(context.engine.auth.twoStepVerificationConfiguration() |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: password)) }))
                                 }
                         }
                         if shouldDismiss {
@@ -762,12 +858,75 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
                     presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
             }
         })
+    }, declinePasswordReset: {
+        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        presentControllerImpl?(textAlertController(context: context, title: presentationData.strings.TwoStepAuth_CancelResetTitle, text: presentationData.strings.TwoStepAuth_CancelResetText, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Yes, action: {
+            let _ = (context.engine.auth.declineTwoStepPasswordReset()
+            |> deliverOnMainQueue).start(completed: {
+                dataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
+                |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil))
+                })
+            })
+        }), TextAlertAction(type: .genericAction, title: presentationData.strings.Common_No, action: {
+        })]), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+    }, resetPassword: {
+        let _ = (context.engine.auth.requestTwoStepPasswordReset()
+        |> deliverOnMainQueue).start(next: { result in
+            switch result {
+            case .done:
+                dismissImpl?()
+            case .waitingForReset:
+                dataPromise.set(context.engine.auth.twoStepVerificationConfiguration()
+                |> map { TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: $0, password: nil))
+                })
+            case .declined:
+                break
+            case let .error(reason):
+                let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                let text: String
+                switch reason {
+                case let .limitExceeded(retryAtTimestamp):
+                    if let retryAtTimestamp = retryAtTimestamp {
+                        let remainingSeconds = retryAtTimestamp - Int32(Date().timeIntervalSince1970)
+                        text = presentationData.strings.TwoFactorSetup_ResetFloodWait(timeIntervalString(strings: presentationData.strings, value: remainingSeconds)).0
+                    } else {
+                        text = presentationData.strings.TwoStepAuth_FloodError
+                    }
+                case .generic:
+                    text = presentationData.strings.Login_UnknownError
+                }
+                presentControllerImpl?(textAlertController(sharedContext: context.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), nil)
+            }
+        })
     })
     
     var initialFocusImpl: (() -> Void)?
     var didAppear = false
+
+    let dataWithTimer = dataPromise.get()
+    |> distinctUntilChanged
+    |> mapToSignal { data -> Signal<TwoStepVerificationUnlockSettingsControllerData, NoError> in
+        switch data {
+        case let .access(configuration):
+            if let configuration = configuration {
+                switch configuration {
+                case let .set(_, _, _, pendingResetTimestamp):
+                    if pendingResetTimestamp != nil {
+                        return .single(data)
+                        |> then(.complete() |> delay(0.5, queue: .mainQueue()))
+                        |> restart
+                    }
+                default:
+                    break
+                }
+            }
+        default:
+            break
+        }
+        return .single(data)
+    }
     
-    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), dataPromise.get() |> deliverOnMainQueue) |> deliverOnMainQueue
+    let signal = combineLatest(context.sharedContext.presentationData, statePromise.get(), dataWithTimer |> deliverOnMainQueue) |> deliverOnMainQueue
     |> map { presentationData, state, data -> (ItemListControllerState, (ItemListNodeState, Any)) in
         var rightNavigationButton: ItemListNavigationButton?
         var emptyStateItem: ItemListControllerEmptyStateItem?
@@ -826,6 +985,9 @@ func twoStepVerificationUnlockSettingsController(context: AccountContext, mode:
             controller.present(c, in: .window(.root), with: p)
         }
     }
+    pushControllerImpl = { [weak controller] c in
+        controller?.push(c)
+    }
     dismissImpl = { [weak controller] in
         controller?.dismiss()
     }
diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchItem.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchItem.swift
index 862cb1755b..4c1d7bb5b8 100644
--- a/submodules/SettingsUI/Sources/Search/SettingsSearchItem.swift
+++ b/submodules/SettingsUI/Sources/Search/SettingsSearchItem.swift
@@ -535,11 +535,11 @@ public final class SettingsSearchContainerNode: SearchDisplayControllerContentNo
                 }
             })
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
         
-        self.recentListNode.beganInteractiveDragging = { [weak self] in
+        self.recentListNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
     }
diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchRecentItem.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchRecentItem.swift
index e51d602ac6..22dfb3b3d4 100644
--- a/submodules/SettingsUI/Sources/Search/SettingsSearchRecentItem.swift
+++ b/submodules/SettingsUI/Sources/Search/SettingsSearchRecentItem.swift
@@ -243,9 +243,9 @@ class SettingsSearchRecentItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
index 045996ac7a..ddb16e8422 100644
--- a/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
+++ b/submodules/SettingsUI/Sources/Search/SettingsSearchableItems.swift
@@ -430,7 +430,7 @@ private func privacySearchableItems(context: AccountContext, privacySettings: Ac
         if let privacySettings = privacySettings {
             privacySignal = .single(privacySettings)
         } else {
-            privacySignal = requestAccountPrivacySettings(account: context.account)
+            privacySignal = context.engine.privacy.requestAccountPrivacySettings()
         }
         let callsSignal: Signal<(VoiceCallSettings, VoipConfiguration)?, NoError>
         if case .voiceCalls = kind {
@@ -535,10 +535,10 @@ private func privacySearchableItems(context: AccountContext, privacySettings: Ac
             present(.push, twoStepVerificationUnlockSettingsController(context: context, mode: .access(intro: true, data: nil)))
         }),
         activeSessionsContext == nil ? nil : SettingsSearchableItem(id: .privacy(9), title: strings.Settings_Devices, alternate: synonyms(strings.SettingsSearch_Synonyms_Privacy_AuthSessions) + [strings.PrivacySettings_AuthSessions], icon: icon, breadcrumbs: [strings.Settings_PrivacySettings], present: { context, _, present in
-            present(.push, recentSessionsController(context: context, activeSessionsContext: activeSessionsContext!, webSessionsContext: webSessionsContext ?? WebSessionsContext(account: context.account), websitesOnly: false))
+            present(.push, recentSessionsController(context: context, activeSessionsContext: activeSessionsContext!, webSessionsContext: webSessionsContext ?? context.engine.privacy.webSessions(), websitesOnly: false))
         }),
         webSessionsContext == nil ? nil : SettingsSearchableItem(id: .privacy(10), title: strings.PrivacySettings_WebSessions, alternate: synonyms(strings.SettingsSearch_Synonyms_Privacy_AuthSessions), icon: icon, breadcrumbs: [strings.Settings_PrivacySettings], present: { context, _, present in
-            present(.push, recentSessionsController(context: context, activeSessionsContext: activeSessionsContext ?? ActiveSessionsContext(account: context.account), webSessionsContext: webSessionsContext ?? WebSessionsContext(account: context.account), websitesOnly: true))
+            present(.push, recentSessionsController(context: context, activeSessionsContext: activeSessionsContext ?? context.engine.privacy.activeSessions(), webSessionsContext: webSessionsContext ?? context.engine.privacy.webSessions(), websitesOnly: true))
         }),
         SettingsSearchableItem(id: .privacy(11), title: strings.PrivacySettings_DeleteAccountTitle, alternate: synonyms(strings.SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor), icon: icon, breadcrumbs: [strings.Settings_PrivacySettings], present: { context, _, present in
             presentPrivacySettings(context, present, .accountTimeout)
@@ -708,7 +708,7 @@ private func languageSearchableItems(context: AccountContext, localizations: [Lo
         let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
         present(.immediate, controller)
         
-        let _ = (downloadAndApplyLocalization(accountManager: context.sharedContext.accountManager, postbox: context.account.postbox, network: context.account.network, languageCode: languageCode)
+        let _ = (context.engine.localization.downloadAndApplyLocalization(accountManager: context.sharedContext.accountManager, languageCode: languageCode)
         |> deliverOnMainQueue).start(completed: { [weak controller] in
             controller?.dismiss()
             present(.dismiss, nil)
@@ -883,7 +883,7 @@ func settingsSearchableItems(context: AccountContext, notificationExceptionsList
         }
         
         let support = SettingsSearchableItem(id: .support(0), title: strings.Settings_Support, alternate: synonyms(strings.SettingsSearch_Synonyms_Support), icon: .support, breadcrumbs: [], present: { context, _, present in
-            let _ = (supportPeerId(account: context.account)
+            let _ = (context.engine.peers.supportPeerId()
             |> deliverOnMainQueue).start(next: { peerId in
                 if let peerId = peerId {
                     present(.push, context.sharedContext.makeChatController(context: context, chatLocation: .peer(peerId), subject: nil, botStart: nil, mode: .standard(previewing: false)))
diff --git a/submodules/SettingsUI/Sources/Stickers/ArchivedStickerPacksController.swift b/submodules/SettingsUI/Sources/Stickers/ArchivedStickerPacksController.swift
index 84d5b2a096..9ab2596ff6 100644
--- a/submodules/SettingsUI/Sources/Stickers/ArchivedStickerPacksController.swift
+++ b/submodules/SettingsUI/Sources/Stickers/ArchivedStickerPacksController.swift
@@ -268,7 +268,7 @@ public func archivedStickerPacksController(context: AccountContext, mode: Archiv
             namespace = .masks
     }
     let stickerPacks = Promise<[ArchivedStickerPackItem]?>()
-    stickerPacks.set(.single(archived) |> then(archivedStickerPacks(account: context.account, namespace: namespace) |> map(Optional.init)))
+    stickerPacks.set(.single(archived) |> then(context.engine.stickers.archivedStickerPacks(namespace: namespace) |> map(Optional.init)))
     
     actionsDisposable.add(stickerPacks.get().start(next: { packs in
         updatedPacks(packs)
@@ -302,17 +302,16 @@ public func archivedStickerPacksController(context: AccountContext, mode: Archiv
         if !add {
             return
         }
-        let _ = (loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
+        let _ = (context.engine.stickers.loadedStickerPack(reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
         |> mapToSignal { result -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
             switch result {
             case let .result(info, items, installed):
                 if installed {
                     return .complete()
                 } else {
-                    return addStickerPackInteractively(postbox: context.account.postbox, info: info, items: items)
+                    return context.engine.stickers.addStickerPackInteractively(info: info, items: items)
                         |> ignoreValues
                         |> mapToSignal { _ -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                            return .complete()
                         }
                         |> then(.single((info, items)))
                 }
@@ -336,7 +335,7 @@ public func archivedStickerPacksController(context: AccountContext, mode: Archiv
                 }
             }
             
-            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
+            presentControllerImpl?(UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, context: context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
                 return true
             }), nil)
             
@@ -390,7 +389,7 @@ public func archivedStickerPacksController(context: AccountContext, mode: Archiv
                     
                     return .complete()
             }
-            removePackDisposables.set((removeArchivedStickerPack(account: context.account, info: info) |> then(applyPacks) |> deliverOnMainQueue).start(completed: {
+            removePackDisposables.set((context.engine.stickers.removeArchivedStickerPack(info: info) |> then(applyPacks) |> deliverOnMainQueue).start(completed: {
                 updateState { state in
                     var removingPackIds = state.removingPackIds
                     removingPackIds.remove(info.id)
diff --git a/submodules/SettingsUI/Sources/Stickers/FeaturedStickerPacksController.swift b/submodules/SettingsUI/Sources/Stickers/FeaturedStickerPacksController.swift
index f98650abec..b460f6c795 100644
--- a/submodules/SettingsUI/Sources/Stickers/FeaturedStickerPacksController.swift
+++ b/submodules/SettingsUI/Sources/Stickers/FeaturedStickerPacksController.swift
@@ -180,14 +180,14 @@ public func featuredStickerPacksController(context: AccountContext) -> ViewContr
     let arguments = FeaturedStickerPacksControllerArguments(account: context.account, openStickerPack: { info in
         presentStickerPackController?(info)
     }, addPack: { info in
-        let _ = (loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
+        let _ = (context.engine.stickers.loadedStickerPack(reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
         |> mapToSignal { result -> Signal<Void, NoError> in
             switch result {
                 case let .result(info, items, installed):
                     if installed {
                         return .complete()
                     } else {
-                        return addStickerPackInteractively(postbox: context.account.postbox, info: info, items: items)
+                        return context.engine.stickers.addStickerPackInteractively(info: info, items: items)
                     }
                 case .fetching:
                     break
@@ -254,7 +254,7 @@ public func featuredStickerPacksController(context: AccountContext) -> ViewContr
         if !unreadIds.isEmpty {
             alreadyReadIds.formUnion(Set(unreadIds))
             
-            let _ = markFeaturedStickerPacksAsSeenInteractively(postbox: context.account.postbox, ids: unreadIds).start()
+            let _ = context.engine.stickers.markFeaturedStickerPacksAsSeenInteractively(ids: unreadIds).start()
         }
     }
     
diff --git a/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift b/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift
index 6129ce7dae..d0c6783df5 100644
--- a/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift
+++ b/submodules/SettingsUI/Sources/Stickers/InstalledStickerPacksController.swift
@@ -532,7 +532,7 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
             controller?.dismissAnimated()
         }
         let removeAction: (RemoveStickerPackOption) -> Void = { action in
-            let _ = (removeStickerPackInteractively(postbox: context.account.postbox, id: archivedItem.info.id, option: action)
+            let _ = (context.engine.stickers.removeStickerPackInteractively(id: archivedItem.info.id, option: action)
             |> deliverOnMainQueue).start(next: { indexAndItems in
                 guard let (positionInList, items) = indexAndItems else {
                     return
@@ -548,9 +548,9 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
                     }
                 }
                 
-                navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: action == .archive ? presentationData.strings.StickerPackActionInfo_ArchivedTitle : presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(archivedItem.info.title).0, undo: true, info: archivedItem.info, topItem: archivedItem.topItems.first, account: context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { action in
+                navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: action == .archive ? presentationData.strings.StickerPackActionInfo_ArchivedTitle : presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(archivedItem.info.title).0, undo: true, info: archivedItem.info, topItem: archivedItem.topItems.first, context: context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { action in
                     if case .undo = action {
-                        let _ = addStickerPackInteractively(postbox: context.account.postbox, info: archivedItem.info, items: items, positionInList: positionInList).start()
+                        let _ = context.engine.stickers.addStickerPackInteractively(info: archivedItem.info, items: items, positionInList: positionInList).start()
                     }
                     return true
                 }))
@@ -581,7 +581,7 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
         ])
         presentControllerImpl?(controller, ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
     }, openStickersBot: {
-        resolveDisposable.set((resolvePeerByName(account: context.account, name: "stickers") |> deliverOnMainQueue).start(next: { peerId in
+        resolveDisposable.set((context.engine.peers.resolvePeerByName(name: "stickers") |> deliverOnMainQueue).start(next: { peerId in
             if let peerId = peerId {
                 navigateToChatControllerImpl?(peerId)
             }
@@ -655,10 +655,10 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
     switch mode {
         case .general, .modal:
             featured.set(context.account.viewTracker.featuredStickerPacks())
-            archivedPromise.set(.single(archivedPacks) |> then(archivedStickerPacks(account: context.account) |> map(Optional.init)))
+            archivedPromise.set(.single(archivedPacks) |> then(context.engine.stickers.archivedStickerPacks() |> map(Optional.init)))
         case .masks:
             featured.set(.single([]))
-            archivedPromise.set(.single(nil) |> then(archivedStickerPacks(account: context.account, namespace: .masks) |> map(Optional.init)))
+            archivedPromise.set(.single(nil) |> then(context.engine.stickers.archivedStickerPacks(namespace: .masks) |> map(Optional.init)))
     }
 
     var previousPackCount: Int?
@@ -686,10 +686,10 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
         var rightNavigationButton: ItemListNavigationButton?
         var toolbarItem: ItemListToolbarItem?
         if let packCount = packCount, packCount != 0 {
-            if case .modal = mode {
-                rightNavigationButton = nil
-            } else {
-                if state.editing {
+            if state.editing {
+                if case .modal = mode {
+                    rightNavigationButton = nil
+                } else {
                     rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Done), style: .bold, enabled: true, action: {
                         updateState {
                             $0.withUpdatedEditing(false).withUpdatedSelectedPackIds(nil)
@@ -698,75 +698,97 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
                             dismissImpl?()
                         }
                     })
-                    
-                    let selectedCount = Int32(state.selectedPackIds?.count ?? 0)
-                    toolbarItem = StickersToolbarItem(selectedCount: selectedCount, actions: [.init(title: presentationData.strings.StickerPacks_ActionDelete, isEnabled: selectedCount > 0, action: {
-                        let actionSheet = ActionSheetController(presentationData: presentationData)
-                        var items: [ActionSheetItem] = []
-                        items.append(ActionSheetButtonItem(title: presentationData.strings.StickerPacks_DeleteStickerPacksConfirmation(selectedCount), color: .destructive, action: { [weak actionSheet] in
-                            actionSheet?.dismissAnimated()
-                           
+                }
+                
+                let selectedCount = Int32(state.selectedPackIds?.count ?? 0)
+                toolbarItem = StickersToolbarItem(selectedCount: selectedCount, actions: [.init(title: presentationData.strings.StickerPacks_ActionDelete, isEnabled: selectedCount > 0, action: {
+                    let actionSheet = ActionSheetController(presentationData: presentationData)
+                    var items: [ActionSheetItem] = []
+                    items.append(ActionSheetButtonItem(title: presentationData.strings.StickerPacks_DeleteStickerPacksConfirmation(selectedCount), color: .destructive, action: { [weak actionSheet] in
+                        actionSheet?.dismissAnimated()
+                       
+                        if case .modal = mode {
+                            updateState {
+                                $0.withUpdatedEditing(true).withUpdatedSelectedPackIds(nil)
+                            }
+                        } else {
                             updateState {
                                 $0.withUpdatedEditing(false).withUpdatedSelectedPackIds(nil)
                             }
-                            
-                            var packIds: [ItemCollectionId] = []
-                            for entry in stickerPacks {
-                                if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
-                                    packIds.append(entry.id)
-                                }
+                        }
+                        
+                        var packIds: [ItemCollectionId] = []
+                        for entry in stickerPacks {
+                            if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
+                                packIds.append(entry.id)
                             }
-                                                        
-                            let _ = removeStickerPacksInteractively(postbox: context.account.postbox, ids: packIds, option: .delete).start()
-                        }))
-                        actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
-                            ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
-                                actionSheet?.dismissAnimated()
-                            })
-                        ])])
-                        presentControllerImpl?(actionSheet, nil)
-                    }), .init(title: presentationData.strings.StickerPacks_ActionArchive, isEnabled: selectedCount > 0, action: {
-                        let actionSheet = ActionSheetController(presentationData: presentationData)
-                        var items: [ActionSheetItem] = []
-                        items.append(ActionSheetButtonItem(title: presentationData.strings.StickerPacks_ArchiveStickerPacksConfirmation(selectedCount), color: .destructive, action: { [weak actionSheet] in
+                        }
+                                                    
+                        let _ = context.engine.stickers.removeStickerPacksInteractively(ids: packIds, option: .delete).start()
+                    }))
+                    actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
+                        ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
                             actionSheet?.dismissAnimated()
-                           
+                        })
+                    ])])
+                    presentControllerImpl?(actionSheet, nil)
+                }), .init(title: presentationData.strings.StickerPacks_ActionArchive, isEnabled: selectedCount > 0, action: {
+                    let actionSheet = ActionSheetController(presentationData: presentationData)
+                    var items: [ActionSheetItem] = []
+                    items.append(ActionSheetButtonItem(title: presentationData.strings.StickerPacks_ArchiveStickerPacksConfirmation(selectedCount), color: .destructive, action: { [weak actionSheet] in
+                        actionSheet?.dismissAnimated()
+                       
+                        if case .modal = mode {
+                            updateState {
+                                $0.withUpdatedEditing(true).withUpdatedSelectedPackIds(nil)
+                            }
+                        } else {
                             updateState {
                                 $0.withUpdatedEditing(false).withUpdatedSelectedPackIds(nil)
                             }
-                            
-                            var packIds: [ItemCollectionId] = []
-                            for entry in stickerPacks {
-                                if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
-                                    packIds.append(entry.id)
-                                }
+                        }
+                        
+                        var packIds: [ItemCollectionId] = []
+                        for entry in stickerPacks {
+                            if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
+                                packIds.append(entry.id)
                             }
-                                                        
-                            let _ = removeStickerPacksInteractively(postbox: context.account.postbox, ids: packIds, option: .archive).start()
-                        }))
-                        actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
-                            ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
-                                actionSheet?.dismissAnimated()
-                            })
-                        ])])
-                        presentControllerImpl?(actionSheet, nil)
-                    }), .init(title: presentationData.strings.StickerPacks_ActionShare, isEnabled: selectedCount > 0, action: {
+                        }
+                                                    
+                        let _ = context.engine.stickers.removeStickerPacksInteractively(ids: packIds, option: .archive).start()
+                    }))
+                    actionSheet.setItemGroups([ActionSheetItemGroup(items: items), ActionSheetItemGroup(items: [
+                        ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                            actionSheet?.dismissAnimated()
+                        })
+                    ])])
+                    presentControllerImpl?(actionSheet, nil)
+                }), .init(title: presentationData.strings.StickerPacks_ActionShare, isEnabled: selectedCount > 0, action: {
+                    if case .modal = mode {
+                        updateState {
+                            $0.withUpdatedEditing(true).withUpdatedSelectedPackIds(nil)
+                        }
+                    } else {
                         updateState {
                             $0.withUpdatedEditing(false).withUpdatedSelectedPackIds(nil)
                         }
-                        
-                        var packNames: [String] = []
-                        for entry in stickerPacks {
-                            if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
-                                if let info = entry.info as? StickerPackCollectionInfo {
-                                    packNames.append(info.shortName)
-                                }
+                    }
+                    
+                    var packNames: [String] = []
+                    for entry in stickerPacks {
+                        if let selectedPackIds = state.selectedPackIds, selectedPackIds.contains(entry.id) {
+                            if let info = entry.info as? StickerPackCollectionInfo {
+                                packNames.append(info.shortName)
                             }
                         }
-                        let text = packNames.map { "https://t.me/addstickers/\($0)" }.joined(separator: "\n")
-                        let shareController = ShareController(context: context, subject: .text(text), externalShare: true)
-                        presentControllerImpl?(shareController, nil)
-                    })])
+                    }
+                    let text = packNames.map { "https://t.me/addstickers/\($0)" }.joined(separator: "\n")
+                    let shareController = ShareController(context: context, subject: .text(text), externalShare: true)
+                    presentControllerImpl?(shareController, nil)
+                })])
+            } else {
+                if case .modal = mode {
+                    rightNavigationButton = nil
                 } else {
                     rightNavigationButton = ItemListNavigationButton(content: .text(presentationData.strings.Common_Edit), style: .regular, enabled: true, action: {
                         updateState {
@@ -954,13 +976,13 @@ public func installedStickerPacksController(context: AccountContext, mode: Insta
                     }
                     switch action {
                     case .add:
-                        navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
+                        navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, context: context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
                             return true
                         }))
                     case let .remove(positionInList):
-                        navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(info.title).0, undo: true, info: info, topItem: items.first, account: context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { action in
+                        navigationControllerImpl?()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(info.title).0, undo: true, info: info, topItem: items.first, context: context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { action in
                             if case .undo = action {
-                                let _ = addStickerPackInteractively(postbox: context.account.postbox, info: info, items: items, positionInList: positionInList).start()
+                                let _ = context.engine.stickers.addStickerPackInteractively(info: info, items: items, positionInList: positionInList).start()
                             }
                             return true
                         }))
diff --git a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceController.swift b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceController.swift
index d06773453a..3b10fd385c 100644
--- a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceController.swift	
+++ b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceController.swift	
@@ -36,7 +36,7 @@ public class TermsOfServiceControllerTheme {
 
 public extension TermsOfServiceControllerTheme {
     convenience init(presentationTheme: PresentationTheme) {
-        self.init(statusBarStyle: presentationTheme.rootController.statusBarStyle.style, navigationBackground: presentationTheme.rootController.navigationBar.backgroundColor, navigationSeparator: presentationTheme.rootController.navigationBar.separatorColor, listBackground: presentationTheme.list.blocksBackgroundColor, itemBackground: presentationTheme.list.itemBlocksBackgroundColor, itemSeparator: presentationTheme.list.itemBlocksSeparatorColor, primary: presentationTheme.list.itemPrimaryTextColor, accent: presentationTheme.list.itemAccentColor, disabled: presentationTheme.rootController.navigationBar.disabledButtonColor)
+        self.init(statusBarStyle: presentationTheme.rootController.statusBarStyle.style, navigationBackground: presentationTheme.rootController.navigationBar.opaqueBackgroundColor, navigationSeparator: presentationTheme.rootController.navigationBar.separatorColor, listBackground: presentationTheme.list.blocksBackgroundColor, itemBackground: presentationTheme.list.itemBlocksBackgroundColor, itemSeparator: presentationTheme.list.itemBlocksSeparatorColor, primary: presentationTheme.list.itemPrimaryTextColor, accent: presentationTheme.list.itemAccentColor, disabled: presentationTheme.rootController.navigationBar.disabledButtonColor)
     }
 }
 
@@ -145,7 +145,7 @@ public class TermsOfServiceController: ViewController, StandalonePresentableCont
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override public func viewDidAppear(_ animated: Bool) {
diff --git a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift
index 6871c9e3da..5a75ca945e 100644
--- a/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift	
+++ b/submodules/SettingsUI/Sources/Terms of Service/TermsOfServiceControllerNode.swift	
@@ -79,7 +79,7 @@ final class TermsOfServiceControllerNode: ViewControllerTracingNode {
         super.init()
         
         self.backgroundColor = self.presentationData.theme.list.blocksBackgroundColor
-        self.toolbarNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+        self.toolbarNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         self.toolbarSeparatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
         
         self.contentBackgroundNode.backgroundColor = self.presentationData.theme.list.itemBlocksBackgroundColor
diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift
index e98633d1cc..ecff3147ef 100644
--- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift	
+++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionController.swift	
@@ -13,6 +13,7 @@ import ChatListUI
 import WallpaperResources
 import LegacyComponents
 import ItemListUI
+import WallpaperBackgroundNode
 
 private func generateMaskImage(color: UIColor) -> UIImage? {
     return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in
@@ -74,18 +75,15 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
         self.pageControlNode = PageControlNode(dotSpacing: 7.0, dotColor: .white, inactiveDotColor: UIColor.white.withAlphaComponent(0.4))
     
         self.chatListBackgroundNode = ASDisplayNode()
-        self.chatBackgroundNode = WallpaperBackgroundNode()
+        self.chatBackgroundNode = WallpaperBackgroundNode(context: context)
         self.chatBackgroundNode.displaysAsynchronously = false
         
         self.messagesContainerNode = ASDisplayNode()
         self.messagesContainerNode.clipsToBounds = true
         self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
         
-        self.chatBackgroundNode.image = chatControllerBackgroundImage(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false)
-        self.chatBackgroundNode.motionEnabled = self.presentationData.chatWallpaper.settings?.motion ?? false
-        if case .gradient = self.presentationData.chatWallpaper {
-            self.chatBackgroundNode.imageContentMode = .scaleToFill
-        }
+        self.chatBackgroundNode.update(wallpaper: self.presentationData.chatWallpaper)
+        self.chatBackgroundNode.updateBubbleTheme(bubbleTheme: self.presentationData.theme, bubbleCorners: self.presentationData.chatBubbleCorners)
                         
         self.toolbarNode = TextSelectionToolbarNode(presentationThemeSettings: self.presentationThemeSettings, presentationData: self.presentationData)
                 
@@ -213,7 +211,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
         }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, hidePsa: { _ in
         }, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
@@ -223,14 +221,14 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
         let peers = SimpleDictionary<PeerId, Peer>()
         let messages = SimpleDictionary<MessageId, Message>()
         let selfPeer = TelegramUser(id: self.context.account.peerId, accessHash: nil, firstName: nil, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 2), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: 3), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
-        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer5 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: 5), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .broadcast(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
-        let peer6 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: 5), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer7 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 6), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(2)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(3)), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
+        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer5 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(5)), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .broadcast(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
+        let peer6 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(5)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer7 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(6)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
         
         let timestamp = self.referenceTimestamp
         
@@ -308,7 +306,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
         let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp:  self.referenceTimestamp, theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder)
         
         var items: [ListViewItem] = []
-        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
         let otherPeerId = self.context.account.peerId
         var peers = SimpleDictionary<PeerId, Peer>()
         var messages = SimpleDictionary<MessageId, Message>()
@@ -319,20 +317,20 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
         messages[replyMessageId] = Message(stableId: 3, stableVersion: 0, id: replyMessageId, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: SimpleDictionary(), associatedMessageIds: [])
         
         let message1 = Message(stableId: 4, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 4), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66003, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_3_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let message2 = Message(stableId: 3, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 3), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66002, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_2_Text, attributes: [ReplyMessageAttribute(messageId: replyMessageId, threadMessageId: nil)], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let waveformBase64 = "DAAOAAkACQAGAAwADwAMABAADQAPABsAGAALAA0AGAAfABoAHgATABgAGQAYABQADAAVABEAHwANAA0ACQAWABkACQAOAAwACQAfAAAAGQAVAAAAEwATAAAACAAfAAAAHAAAABwAHwAAABcAGQAAABQADgAAABQAHwAAAB8AHwAAAAwADwAAAB8AEwAAABoAFwAAAB8AFAAAAAAAHwAAAAAAHgAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAHwAAAAAAAAA="
         let voiceAttributes: [TelegramMediaFileAttribute] = [.Audio(isVoice: true, duration: 23, title: nil, performer: nil, waveform: MemoryBuffer(data: Data(base64Encoded: waveformBase64)!))]
         let voiceMedia = TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: 0, attributes: voiceAttributes)
         
         let message3 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66001, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: "", attributes: [], media: [voiceMedia], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message3], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message3], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local), tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let message4 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: otherPeerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: self.presentationData.strings.Appearance_ThemePreview_Chat_1_Text, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message4], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message4], theme: self.presentationData.theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.chatBackgroundNode))
         
         let width: CGFloat
         if case .regular = layout.metrics.widthClass {
@@ -388,7 +386,7 @@ private final class TextSizeSelectionControllerNode: ASDisplayNode, UIScrollView
             dateHeaderNode = currentDateHeaderNode
             headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem)
         } else {
-            dateHeaderNode = headerItem.node()
+            dateHeaderNode = headerItem.node(synchronousLoad: true)
             dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
             self.messagesContainerNode.addSubnode(dateHeaderNode)
             self.dateHeaderNode = dateHeaderNode
@@ -569,7 +567,7 @@ final class TextSizeSelectionController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
diff --git a/submodules/SettingsUI/Sources/Themes/CustomWallpaperPicker.swift b/submodules/SettingsUI/Sources/Themes/CustomWallpaperPicker.swift
index 940dc2ce69..c706d19b1a 100644
--- a/submodules/SettingsUI/Sources/Themes/CustomWallpaperPicker.swift
+++ b/submodules/SettingsUI/Sources/Themes/CustomWallpaperPicker.swift
@@ -130,11 +130,11 @@ func uploadCustomWallpaper(context: AccountContext, wallpaper: WallpaperGalleryE
         let thumbnailImage = generateScaledImage(image: croppedImage, size: thumbnailDimensions, scale: 1.0)
         
         if let data = croppedImage.jpegData(compressionQuality: 0.8), let thumbnailImage = thumbnailImage, let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
-            let thumbnailResource = LocalFileMediaResource(fileId: arc4random64())
+            let thumbnailResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
             context.sharedContext.accountManager.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData)
             context.account.postbox.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData)
             
-            let resource = LocalFileMediaResource(fileId: arc4random64())
+            let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
             context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data)
             context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
             
@@ -174,8 +174,8 @@ func uploadCustomWallpaper(context: AccountContext, wallpaper: WallpaperGalleryE
             }
             
             let apply: () -> Void = {
-                let settings = WallpaperSettings(blur: mode.contains(.blur), motion: mode.contains(.motion), color: nil, intensity: nil)
-                let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: []), TelegramMediaImageRepresentation(dimensions: PixelDimensions(croppedImage.size), resource: resource, progressiveSizes: [])], settings)
+                let settings = WallpaperSettings(blur: mode.contains(.blur), motion: mode.contains(.motion), colors: [], intensity: nil)
+                let wallpaper: TelegramWallpaper = .image([TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil), TelegramMediaImageRepresentation(dimensions: PixelDimensions(croppedImage.size), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)], settings)
                 updateWallpaper(wallpaper)
                 DispatchQueue.main.async {
                     completion()
diff --git a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
index 14713d7a87..fc6d82f5d3 100644
--- a/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
+++ b/submodules/SettingsUI/Sources/Themes/EditThemeController.swift
@@ -359,7 +359,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                         |> mapToSignal { wallpaper -> Signal<TelegramWallpaper?, NoError> in
                             if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper {
                                 var convertedRepresentations: [ImageRepresentationWithReference] = []
-                                convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
+                                convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
                                 return wallpaperDatas(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: .standalone(media: file.file), representations: convertedRepresentations, alwaysShowThumbnailFirst: false, thumbnail: false, onlyFullSize: true, autoFetchFullSize: true, synchronousLoad: false)
                                 |> mapToSignal { _, fullSizeData, complete -> Signal<TelegramWallpaper?, NoError> in
                                     guard complete, let fullSizeData = fullSizeData else {
@@ -443,7 +443,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                 |> take(1)).start(next: { previewTheme, settings in
                     let saveThemeTemplateFile: (String, LocalFileMediaResource, @escaping () -> Void) -> Void = { title, resource, completion in
                         let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: resource.fileId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/x-tgtheme-ios", size: nil, attributes: [.FileName(fileName: "\(title).tgios-theme")])
-                        let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                        let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
 
                         let _ = enqueueMessages(account: context.account, peerId: context.account.peerId, messages: [message]).start()
 
@@ -478,7 +478,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                     let themeData: Data?
                     let themeThumbnailData: Data?
                     if let theme = theme, let themeString = encodePresentationTheme(theme), let data = themeString.data(using: .utf8) {
-                        let resource = LocalFileMediaResource(fileId: arc4random64())
+                        let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                         context.account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                         context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                         themeResource = resource
@@ -514,7 +514,6 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                     let prepare: Signal<CreateThemeResult, CreateThemeError>
                     if let resolvedWallpaper = resolvedWallpaper, case let .file(file) = resolvedWallpaper, resolvedWallpaper.isPattern {
                         let resource = file.file.resource
-                        let representation = CachedPatternWallpaperRepresentation(color: file.settings.color ?? 0xd6e2ee, bottomColor: file.settings.bottomColor, intensity: file.settings.intensity ?? 50, rotation: file.settings.rotation)
                         
                         var data: Data?
                         if let path = context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
@@ -525,13 +524,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                         
                         if let data = data {
                             context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
-                            prepare = (context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true)
-                            |> filter({ $0.complete })
-                            |> take(1)
-                            |> castError(CreateThemeError.self)
-                            |> mapToSignal { _ -> Signal<CreateThemeResult, CreateThemeError> in
-                                return .complete()
-                            })
+                            prepare = .complete()
                         } else {
                             prepare = .complete()
                         }
@@ -556,7 +549,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                                             var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers
                                             themeSpecificChatWallpapers[themeReference.index] = nil
                                             
-                                            return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                            return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                         }) |> deliverOnMainQueue).start(completed: {
                                             if !hasCustomFile {
                                                 saveThemeTemplateFile(state.title, themeResource, {
@@ -590,7 +583,7 @@ public func editThemeController(context: AccountContext, mode: EditThemeControll
                                         var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers
                                         themeSpecificChatWallpapers[themeReference.index] = nil
                                         
-                                        return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                        return PresentationThemeSettings(theme: themeReference, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                     }) |> deliverOnMainQueue).start(completed: {
                                         if let themeResource = themeResource, !hasCustomFile {
                                             saveThemeTemplateFile(state.title, themeResource, {
diff --git a/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift b/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift
index f1fb72e4cf..d4cd1100ed 100644
--- a/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/SettingsThemeWallpaperNode.swift
@@ -10,6 +10,7 @@ import TelegramPresentationData
 import AccountContext
 import RadialStatusNode
 import WallpaperResources
+import GradientBackground
 
 private func whiteColorImage(theme: PresentationTheme, color: UIColor) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     return .single({ arguments in
@@ -29,21 +30,38 @@ private func whiteColorImage(theme: PresentationTheme, color: UIColor) -> Signal
     })
 }
 
+private let blackColorImage: UIImage? = {
+    let context = DrawingContext(size: CGSize(width: 1.0, height: 1.0), scale: 1.0, opaque: true, clear: false)
+    context.withContext { c in
+        c.setFillColor(UIColor.black.cgColor)
+        c.fill(CGRect(origin: CGPoint(), size: CGSize(width: 1.0, height: 1.0)))
+    }
+    return context.generateImage()
+}()
+
 final class SettingsThemeWallpaperNode: ASDisplayNode {
     var wallpaper: TelegramWallpaper?
     private var arguments: PatternWallpaperArguments?
     
     let buttonNode = HighlightTrackingButtonNode()
-    let backgroundNode = ASDisplayNode()
+    let backgroundNode = ASImageNode()
     let imageNode = TransformImageNode()
+    private var gradientNode: GradientBackgroundNode?
     private let statusNode: RadialStatusNode
     
     var pressed: (() -> Void)?
+
+    private let displayLoading: Bool
+    private var isSelected: Bool = false
+    private var isLoaded: Bool = false
+
+    private let isLoadedDisposable = MetaDisposable()
          
-    init(overlayBackgroundColor: UIColor = UIColor(white: 0.0, alpha: 0.3)) {
+    init(displayLoading: Bool = false, overlayBackgroundColor: UIColor = UIColor(white: 0.0, alpha: 0.3)) {
+        self.displayLoading = displayLoading
         self.imageNode.contentAnimations = [.subsequentUpdates]
         
-        self.statusNode = RadialStatusNode(backgroundNodeColor: overlayBackgroundColor)
+        self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.2), enableBlur: true)
         let progressDiameter: CGFloat = 50.0
         self.statusNode.frame = CGRect(x: 0.0, y: 0.0, width: progressDiameter, height: progressDiameter)
         self.statusNode.isUserInteractionEnabled = false
@@ -57,10 +75,36 @@ final class SettingsThemeWallpaperNode: ASDisplayNode {
         
         self.buttonNode.addTarget(self, action: #selector(self.buttonPressed), forControlEvents: .touchUpInside)
     }
+
+    deinit {
+        self.isLoadedDisposable.dispose()
+    }
     
     func setSelected(_ selected: Bool, animated: Bool = false) {
-        let state: RadialStatusNodeState = selected ? .check(.white) : .none
-        self.statusNode.transitionToState(state, animated: animated, completion: {})
+        if self.isSelected != selected {
+            self.isSelected = selected
+
+            self.updateStatus(animated: animated)
+        }
+    }
+
+    private func updateIsLoaded(isLoaded: Bool, animated: Bool) {
+        if self.isLoaded != isLoaded {
+            self.isLoaded = isLoaded
+            self.updateStatus(animated: animated)
+        }
+    }
+
+    private func updateStatus(animated: Bool) {
+        if self.isSelected {
+            if self.isLoaded || !displayLoading {
+                self.statusNode.transitionToState(.check(.white), animated: animated, completion: {})
+            } else {
+                self.statusNode.transitionToState(.progress(color: .white, lineWidth: nil, value: nil, cancelEnabled: false, animateRotation: true), animated: animated, completion: {})
+            }
+        } else {
+            self.statusNode.transitionToState(.none, animated: animated, completion: {})
+        }
     }
     
     func setOverlayBackgroundColor(_ color: UIColor) {
@@ -71,9 +115,68 @@ final class SettingsThemeWallpaperNode: ASDisplayNode {
         self.buttonNode.frame = CGRect(origin: CGPoint(), size: size)
         self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
         self.imageNode.frame = CGRect(origin: CGPoint(), size: size)
-        
-        let state: RadialStatusNodeState = selected ? .check(.white) : .none
-        self.statusNode.transitionToState(state, animated: false, completion: {})
+
+        var colors: [UInt32] = []
+        var intensity: CGFloat = 0.5
+        if case let .gradient(_, value, _) = wallpaper {
+            colors = value
+        } else if case let .file(file) = wallpaper {
+            colors = file.settings.colors
+            intensity = CGFloat(file.settings.intensity ?? 50) / 100.0
+        } else if case let .color(color) = wallpaper {
+            colors = [color]
+        }
+        let isBlack = UIColor.average(of: colors.map(UIColor.init(rgb:))).hsb.b <= 0.01
+        if colors.count >= 3 {
+            if let gradientNode = self.gradientNode {
+                gradientNode.updateColors(colors: colors.map { UIColor(rgb: $0) })
+            } else {
+                let gradientNode = createGradientBackgroundNode()
+                gradientNode.isUserInteractionEnabled = false
+                self.gradientNode = gradientNode
+                gradientNode.updateColors(colors: colors.map { UIColor(rgb: $0) })
+                self.insertSubnode(gradientNode, belowSubnode: self.imageNode)
+            }
+
+            if intensity < 0.0 {
+                self.imageNode.layer.compositingFilter = nil
+            } else {
+                if isBlack {
+                    self.imageNode.layer.compositingFilter = nil
+                } else {
+                    self.imageNode.layer.compositingFilter = "softLightBlendMode"
+                }
+            }
+            self.backgroundNode.image = nil
+        } else {
+            if let gradientNode = self.gradientNode {
+                self.gradientNode = nil
+                gradientNode.removeFromSupernode()
+            }
+
+            if intensity < 0.0 {
+                self.imageNode.layer.compositingFilter = nil
+            } else {
+                if isBlack {
+                    self.imageNode.layer.compositingFilter = nil
+                } else {
+                    self.imageNode.layer.compositingFilter = "softLightBlendMode"
+                }
+            }
+
+            if colors.count >= 2 {
+                self.backgroundNode.image = generateGradientImage(size: CGSize(width: 80.0, height: 80.0), colors: colors.map(UIColor.init(rgb:)), locations: [0.0, 1.0], direction: .vertical)
+                self.backgroundNode.backgroundColor = nil
+            } else if colors.count >= 1 {
+                self.backgroundNode.image = nil
+                self.backgroundNode.backgroundColor = UIColor(rgb: colors[0])
+            }
+        }
+
+        if let gradientNode = self.gradientNode {
+            gradientNode.frame = CGRect(origin: CGPoint(), size: size)
+            gradientNode.updateLayout(size: size, transition: .immediate)
+        }
         
         let progressDiameter: CGFloat = 50.0
         self.statusNode.frame = CGRect(x: floorToScreenPixels((size.width - progressDiameter) / 2.0), y: floorToScreenPixels((size.height - progressDiameter) / 2.0), width: progressDiameter, height: progressDiameter)
@@ -84,79 +187,101 @@ final class SettingsThemeWallpaperNode: ASDisplayNode {
             self.wallpaper = wallpaper
             switch wallpaper {
                 case .builtin:
-                    self.imageNode.isHidden = false
-                    self.backgroundNode.isHidden = true
-                    self.imageNode.setSignal(settingsBuiltinWallpaperImage(account: context.account))
-                    let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: CGSize(), boundingSize: size, intrinsicInsets: UIEdgeInsets()))
-                    apply()
-                case let .color(color):
-                    let theme = context.sharedContext.currentPresentationData.with { $0 }.theme
-                    let uiColor = UIColor(rgb: color)
-                    if uiColor.distance(to: theme.list.itemBlocksBackgroundColor) < 200 {
-                        self.imageNode.isHidden = false
-                        self.backgroundNode.isHidden = true
-                        self.imageNode.setSignal(whiteColorImage(theme: theme, color: uiColor))
-                        let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: CGSize(), boundingSize: size, intrinsicInsets: UIEdgeInsets()))
-                        apply()
-                    } else {
-                        self.imageNode.isHidden = true
-                        self.backgroundNode.isHidden = false
-                        self.backgroundNode.backgroundColor = UIColor(rgb: color)
-                    }
-                case let .gradient(topColor, bottomColor, _):
-                    self.imageNode.isHidden = false
-                    self.backgroundNode.isHidden = true
-                    self.imageNode.setSignal(gradientImage([UIColor(rgb: topColor), UIColor(rgb: bottomColor)]))
+                    self.imageNode.alpha = 1.0
+                    self.imageNode.setSignal(settingsBuiltinWallpaperImage(account: context.account, thumbnail: true))
                     let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: CGSize(), boundingSize: size, intrinsicInsets: UIEdgeInsets()))
                     apply()
+                    self.isLoadedDisposable.set(nil)
+                    self.updateIsLoaded(isLoaded: true, animated: false)
                 case let .image(representations, _):
-                    self.imageNode.isHidden = false
-                    self.backgroundNode.isHidden = true
-                    
                     let convertedRepresentations: [ImageRepresentationWithReference] = representations.map({ ImageRepresentationWithReference(representation: $0, reference: .wallpaper(wallpaper: nil, resource: $0.resource)) })
+                    self.imageNode.alpha = 1.0
                     self.imageNode.setSignal(wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, thumbnail: true, autoFetchFullSize: true, synchronousLoad: synchronousLoad))
                   
                     let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: largestImageRepresentation(representations)!.dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets()))
                     apply()
+                    self.isLoadedDisposable.set(nil)
+                    self.updateIsLoaded(isLoaded: true, animated: false)
                 case let .file(file):
-                    self.imageNode.isHidden = false
-                    
                     let convertedRepresentations : [ImageRepresentationWithReference] = file.file.previewRepresentations.map {
                         ImageRepresentationWithReference(representation: $0, reference: .wallpaper(wallpaper: .slug(file.slug), resource: $0.resource))
                     }
+
+                    let fullDimensions = file.file.dimensions ?? PixelDimensions(width: 2000, height: 4000)
+                    let convertedFullRepresentations = [ImageRepresentationWithReference(representation: .init(dimensions: fullDimensions, resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource))]
                     
                     let imageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>
+                    var placeholder: UIImage?
                     if wallpaper.isPattern {
-                        self.backgroundNode.isHidden = false
-                        
-                        var patternColors: [UIColor] = []
-                        var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5)
                         var patternIntensity: CGFloat = 0.5
-                        if let color = file.settings.color {
+                        if !file.settings.colors.isEmpty {
                             if let intensity = file.settings.intensity {
                                 patternIntensity = CGFloat(intensity) / 100.0
                             }
-                            patternColor = UIColor(rgb: color, alpha: patternIntensity)
-                            patternColors.append(patternColor)
-                            
-                            if let bottomColor = file.settings.bottomColor {
-                                patternColors.append(UIColor(rgb: bottomColor, alpha: patternIntensity))
+                        }
+
+                        if patternIntensity < 0.0 {
+                            placeholder = blackColorImage
+                            self.imageNode.alpha = 1.0
+                            self.arguments = PatternWallpaperArguments(colors: [.clear], rotation: nil, customPatternColor: UIColor(white: 0.0, alpha: 1.0 + patternIntensity))
+                        } else {
+                            self.imageNode.alpha = CGFloat(file.settings.intensity ?? 50) / 100.0
+                            let isLight = UIColor.average(of: file.settings.colors.map(UIColor.init(rgb:))).hsb.b > 0.3
+                            self.arguments = PatternWallpaperArguments(colors: [.clear], rotation: nil, customPatternColor: isLight ? .black : .white)
+                        }
+                        imageSignal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .thumbnail, autoFetchFullSize: true)
+                        |> mapToSignal { value -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> in
+                            if let value = value {
+                                return .single(value)
+                            } else {
+                                return .complete()
                             }
                         }
-                        
-                        self.backgroundNode.backgroundColor = patternColor
-                        self.arguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation)
-                        imageSignal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .thumbnail, autoFetchFullSize: true)
+
+                        let anyStatus = combineLatest(queue: .mainQueue(),
+                            context.account.postbox.mediaBox.resourceStatus(convertedFullRepresentations[0].reference.resource, approximateSynchronousValue: true),
+                            context.sharedContext.accountManager.mediaBox.resourceStatus(convertedFullRepresentations[0].reference.resource, approximateSynchronousValue: true)
+                        )
+                        |> map { a, b -> Bool in
+                            switch a {
+                            case .Local:
+                                return true
+                            default:
+                                break
+                            }
+                            switch b {
+                            case .Local:
+                                return true
+                            default:
+                                break
+                            }
+                            return false
+                        }
+                        |> distinctUntilChanged
+
+                        self.updateIsLoaded(isLoaded: false, animated: false)
+                        self.isLoadedDisposable.set((anyStatus
+                        |> deliverOnMainQueue).start(next: { [weak self] value in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.updateIsLoaded(isLoaded: value, animated: true)
+                        }))
                     } else {
-                        self.backgroundNode.isHidden = true
-                        
-                        imageSignal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: .standalone(media: file.file), representations: convertedRepresentations, thumbnail: true, autoFetchFullSize: true, synchronousLoad: synchronousLoad)
+                        self.imageNode.alpha = 1.0
+
+                        imageSignal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: .standalone(media: file.file), representations: convertedRepresentations, thumbnail: true, autoFetchFullSize: true, blurred: file.settings.blur, synchronousLoad: synchronousLoad)
+
+                        self.updateIsLoaded(isLoaded: true, animated: false)
+                        self.isLoadedDisposable.set(nil)
                     }
                     self.imageNode.setSignal(imageSignal, attemptSynchronously: synchronousLoad)
                     
                     let dimensions = file.file.dimensions ?? PixelDimensions(width: 100, height: 100)
                     let apply = self.imageNode.asyncLayout()(TransformImageArguments(corners: corners, imageSize: dimensions.cgSize.aspectFilled(size), boundingSize: size, intrinsicInsets: UIEdgeInsets(), custom: self.arguments))
                     apply()
+                default:
+                    break
             }
         } else if let wallpaper = self.wallpaper {
             switch wallpaper {
@@ -172,6 +297,8 @@ final class SettingsThemeWallpaperNode: ASDisplayNode {
                     apply()
             }
         }
+
+        self.setSelected(selected, animated: false)
     }
     
     @objc func buttonPressed() {
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift
index 21c9950124..b193e7982a 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorController.swift
@@ -69,10 +69,7 @@ final class ThemeAccentColorController: ViewController {
         self.mode = mode
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
-        var section: ThemeColorSection = .accent
-        if case .background = mode {
-            section = .background
-        }
+        var section: ThemeColorSection = .background
         self.section = section
         
         self.segmentedTitleView = ThemeColorSegmentedTitleView(theme: self.presentationData.theme, strings: self.presentationData.strings, selectedSection: section)
@@ -133,6 +130,12 @@ final class ThemeAccentColorController: ViewController {
     deinit {
         self.applyDisposable.dispose()
     }
+
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+
+        self.controllerNode.animateWallpaperAppeared()
+    }
     
     override func loadDisplayNode() {
         super.loadDisplayNode()
@@ -154,20 +157,16 @@ final class ThemeAccentColorController: ViewController {
         }, apply: { [weak self] state, serviceBackgroundColor in
             if let strongSelf = self {
                 let context = strongSelf.context
-                let initialAccentColor = strongSelf.initialAccentColor
                 let autoNightModeTriggered = strongSelf.presentationData.autoNightModeTriggered
                 
                 var coloredWallpaper: TelegramWallpaper?
-                if let backgroundColors = state.backgroundColors {
-                    let color = backgroundColors.0.argb
-                    let bottomColor = backgroundColors.1.flatMap { $0.argb }
-                    
+                if !state.backgroundColors.isEmpty {
                     if let patternWallpaper = state.patternWallpaper {
-                        coloredWallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation))
-                    } else if let bottomColor = bottomColor {
-                        coloredWallpaper = .gradient(color, bottomColor, WallpaperSettings(motion: state.motion, rotation: state.rotation))
+                        coloredWallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(colors: state.backgroundColors, intensity: state.patternIntensity, rotation: state.rotation))
+                    } else if state.backgroundColors.count >= 2 {
+                        coloredWallpaper = .gradient(nil, state.backgroundColors, WallpaperSettings(rotation: state.rotation))
                     } else {
-                        coloredWallpaper = .color(color)
+                        coloredWallpaper = .color(state.backgroundColors[0])
                     }
                 }
                 
@@ -175,10 +174,9 @@ final class ThemeAccentColorController: ViewController {
                 let apply: Signal<Void, NoError>
                 
                 let prepareWallpaper: Signal<CreateThemeResult, CreateThemeError>
-                if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper, let backgroundColors = state.backgroundColors {
+                if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper, !state.backgroundColors.isEmpty {
                     let resource = file.file.resource
-                    let representation = CachedPatternWallpaperRepresentation(color: backgroundColors.0.argb, bottomColor: backgroundColors.1.flatMap { $0.argb }, intensity: state.patternIntensity, rotation: state.rotation)
-                    
+
                     var data: Data?
                     if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
                         data = maybeData
@@ -188,13 +186,7 @@ final class ThemeAccentColorController: ViewController {
                     
                     if let data = data {
                         strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
-                        prepareWallpaper = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true)
-                        |> filter({ $0.complete })
-                        |> take(1)
-                        |> castError(CreateThemeError.self)
-                        |> mapToSignal { _ -> Signal<CreateThemeResult, CreateThemeError> in
-                            return .complete()
-                        })
+                        prepareWallpaper = .complete()
                     } else {
                         prepareWallpaper = .complete()
                     }
@@ -220,7 +212,7 @@ final class ThemeAccentColorController: ViewController {
                         }
                         
                         if let themeReference = generalThemeReference {
-                            updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors, wallpaper: state.initialWallpaper ?? coloredWallpaper, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme
+                            updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors, wallpaper: coloredWallpaper ?? state.initialWallpaper, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme
                         } else {
                             updatedTheme = customizePresentationTheme(theme, editing: false, accentColor: state.accentColor, backgroundColors: state.backgroundColors, bubbleColors: state.messagesColors, wallpaper: state.initialWallpaper ?? coloredWallpaper)
                         }
@@ -248,7 +240,7 @@ final class ThemeAccentColorController: ViewController {
                         baseTheme = .classic
                     }
                     
-                    let wallpaper = state.initialWallpaper ?? coloredWallpaper
+                    let wallpaper = coloredWallpaper ?? state.initialWallpaper
                     
                     let settings = TelegramThemeSettings(baseTheme: baseTheme, accentColor: state.accentColor, messageColors: state.messagesColors, wallpaper: wallpaper)
                     let baseThemeReference = PresentationThemeReference.builtin(PresentationBuiltinThemeReference(baseTheme: baseTheme))
@@ -276,7 +268,7 @@ final class ThemeAccentColorController: ViewController {
                                     var themeSpecificAccentColors = current.themeSpecificAccentColors
                                     themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index)
                                     
-                                    return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                    return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                 })
                                 |> castError(CreateThemeError.self)
                             } else {
@@ -305,7 +297,7 @@ final class ThemeAccentColorController: ViewController {
                                     var themeSpecificAccentColors = current.themeSpecificAccentColors
                                     themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: themeReference.index)
                                     
-                                    return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                    return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                 })
                                 |> castError(CreateThemeError.self)
                             } else {
@@ -396,7 +388,7 @@ final class ThemeAccentColorController: ViewController {
                 
             let accentColor: UIColor
             var initialWallpaper: TelegramWallpaper?
-            var backgroundColors: (UIColor, UIColor?)?
+            var backgroundColors: [UInt32] = []
             var patternWallpaper: TelegramWallpaper?
             var patternIntensity: Int32 = 50
             var motion = false
@@ -411,27 +403,33 @@ final class ThemeAccentColorController: ViewController {
                 if case let .file(file) = wallpaper, wallpaper.isPattern {
                     var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.4)
                     var bottomColor: UIColor?
-                    if let color = file.settings.color {
+                    if !file.settings.colors.isEmpty {
                         if let intensity = file.settings.intensity {
                             patternIntensity = intensity
                         }
-                        patternColor = UIColor(rgb: color)
-                        if let bottomColorValue = file.settings.bottomColor {
-                            bottomColor = UIColor(rgb: bottomColorValue)
+                        patternColor = UIColor(rgb: file.settings.colors[0])
+                        if file.settings.colors.count >= 2 {
+                            bottomColor = UIColor(rgb: file.settings.colors[1])
                         }
                     }
                     patternWallpaper = wallpaper
-                    backgroundColors = (patternColor, bottomColor)
+                    backgroundColors = file.settings.colors
                     motion = file.settings.motion
                     rotation = file.settings.rotation ?? 0
                 } else if case let .color(color) = wallpaper {
-                    backgroundColors = (UIColor(rgb: color), nil)
-                } else if case let .gradient(topColor, bottomColor, settings) = wallpaper {
-                    backgroundColors = (UIColor(rgb: topColor), UIColor(rgb: bottomColor))
+                    backgroundColors = [color]
+                } else if case let .gradient(_, colors, settings) = wallpaper {
+                    backgroundColors = colors
                     motion = settings.motion
                     rotation = settings.rotation ?? 0
                 } else {
-                    backgroundColors = nil
+                    if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, knockoutMode: false) {
+                        backgroundColors = [averageColor(from: image).rgb]
+                    } else if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: strongSelf.context.account.postbox.mediaBox, knockoutMode: false) {
+                        backgroundColors = [averageColor(from: image).rgb]
+                    } else {
+                        backgroundColors = [UIColor.gray.rgb]
+                    }
                 }
             }
             
@@ -450,7 +448,7 @@ final class ThemeAccentColorController: ViewController {
                         }
                         
                         if let defaultPatternWallpaper = defaultPatternWallpaper {
-                            wallpaper = defaultPatternWallpaper.withUpdatedSettings(WallpaperSettings(blur: settings.blur, motion: settings.motion, color: 0xd6e2ee, bottomColor: nil, intensity: 40, rotation: nil))
+                            wallpaper = defaultPatternWallpaper.withUpdatedSettings(WallpaperSettings(blur: settings.blur, motion: settings.motion, colors: [0xd6e2ee], intensity: 40, rotation: nil))
                         }
                     }
                 }
@@ -458,13 +456,15 @@ final class ThemeAccentColorController: ViewController {
                 if case .colors(_, true) = strongSelf.mode {
                     let themeSpecificAccentColor = settings.themeSpecificAccentColors[themeReference.index]
                     accentColor = themeSpecificAccentColor?.color ?? defaultDayAccentColor
-                   
+
+                    var referenceTheme: PresentationTheme?
                     if let accentColor = themeSpecificAccentColor, let customWallpaper = settings.themeSpecificChatWallpapers[coloredThemeIndex(reference: themeReference, accentColor: accentColor)] {
                         wallpaper = customWallpaper
                     } else if let customWallpaper = settings.themeSpecificChatWallpapers[themeReference.index] {
                         wallpaper = customWallpaper
                     } else {
-                        let theme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: themeSpecificAccentColor?.color, wallpaper: themeSpecificAccentColor?.wallpaper) ?? defaultPresentationTheme
+                        let theme = makePresentationTheme(mediaBox: strongSelf.context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: themeSpecificAccentColor?.color, wallpaper: themeSpecificAccentColor?.wallpaper, baseColor: themeSpecificAccentColor?.baseColor) ?? defaultPresentationTheme
+                        referenceTheme = theme
                         wallpaper = theme.chat.defaultWallpaper
                     }
                     
@@ -475,7 +475,7 @@ final class ThemeAccentColorController: ViewController {
                     }
                     
                     if let initialBackgroundColor = strongSelf.initialBackgroundColor {
-                        backgroundColors = (initialBackgroundColor, nil)
+                        backgroundColors = [initialBackgroundColor.rgb]
                     } else {
                         extractWallpaperParameters(wallpaper)
                     }
@@ -489,6 +489,8 @@ final class ThemeAccentColorController: ViewController {
                     } else {
                         if let themeReference = strongSelf.mode.themeReference, themeReference == .builtin(.dayClassic), settings.themeSpecificAccentColors[themeReference.index] == nil {
                             messageColors = (UIColor(rgb: 0xe1ffc7), nil)
+                        } else if let referenceTheme = referenceTheme {
+                            messageColors = (referenceTheme.chat.message.outgoing.bubble.withoutWallpaper.fill, referenceTheme.chat.message.outgoing.bubble.withoutWallpaper.gradientFill)
                         } else {
                             messageColors = nil
                         }
@@ -539,7 +541,7 @@ final class ThemeAccentColorController: ViewController {
                          }
                          
                          if let initialBackgroundColor = strongSelf.initialBackgroundColor {
-                             backgroundColors = (initialBackgroundColor, nil)
+                            backgroundColors = [initialBackgroundColor.rgb]
                          } else {
                              extractWallpaperParameters(wallpaper)
                          }
@@ -601,11 +603,11 @@ final class ThemeAccentColorController: ViewController {
                 }
             } else {
                 accentColor = defaultDayAccentColor
-                backgroundColors = nil
+                backgroundColors = []
                 messageColors = nil
             }
             
-            let initialState = ThemeColorState(section: strongSelf.section, accentColor: accentColor, initialWallpaper: initialWallpaper, backgroundColors: backgroundColors, patternWallpaper: patternWallpaper, patternIntensity: patternIntensity, motion: motion, defaultMessagesColor: defaultMessagesColor, messagesColors: messageColors, rotation: rotation)
+            let initialState = ThemeColorState(section: strongSelf.section, accentColor: accentColor, initialWallpaper: initialWallpaper, backgroundColors: backgroundColors, patternWallpaper: patternWallpaper, patternIntensity: patternIntensity, defaultMessagesColor: defaultMessagesColor, messagesColors: messageColors, rotation: rotation)
             
             strongSelf.controllerNode.updateState({ _ in
                 return initialState
@@ -617,6 +619,6 @@ final class ThemeAccentColorController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
index 8cd04d4ec1..b27204c058 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeAccentColorControllerNode.swift
@@ -12,6 +12,7 @@ import ChatListUI
 import AccountContext
 import WallpaperResources
 import PresentationDataUtils
+import WallpaperBackgroundNode
 
 private func generateMaskImage(color: UIColor) -> UIImage? {
     return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in
@@ -29,8 +30,8 @@ private func generateMaskImage(color: UIColor) -> UIImage? {
 }
  
 enum ThemeColorSection: Int {
-    case accent
     case background
+    case accent
     case messages
 }
 
@@ -41,13 +42,12 @@ struct ThemeColorState {
     
     var accentColor: UIColor
     var initialWallpaper: TelegramWallpaper?
-    var backgroundColors: (UIColor, UIColor?)?
+    var backgroundColors: [UInt32]
     
     fileprivate var preview: Bool
     fileprivate var previousPatternWallpaper: TelegramWallpaper?
     var patternWallpaper: TelegramWallpaper?
     var patternIntensity: Int32
-    var motion: Bool
     
     var defaultMessagesColor: UIColor?
     var messagesColors: (UIColor, UIColor?)?
@@ -60,18 +60,17 @@ struct ThemeColorState {
         self.displayPatternPanel = false
         self.accentColor = .clear
         self.initialWallpaper = nil
-        self.backgroundColors = nil
+        self.backgroundColors = []
         self.preview = false
         self.previousPatternWallpaper = nil
         self.patternWallpaper = nil
         self.patternIntensity = 50
-        self.motion = false
         self.defaultMessagesColor = nil
         self.messagesColors = nil
         self.rotation = 0
     }
     
-    init(section: ThemeColorSection, accentColor: UIColor, initialWallpaper: TelegramWallpaper?, backgroundColors: (UIColor, UIColor?)?, patternWallpaper: TelegramWallpaper?, patternIntensity: Int32, motion: Bool, defaultMessagesColor: UIColor?, messagesColors: (UIColor, UIColor?)?, rotation: Int32 = 0) {
+    init(section: ThemeColorSection, accentColor: UIColor, initialWallpaper: TelegramWallpaper?, backgroundColors: [UInt32], patternWallpaper: TelegramWallpaper?, patternIntensity: Int32, defaultMessagesColor: UIColor?, messagesColors: (UIColor, UIColor?)?, rotation: Int32 = 0) {
         self.section = section
         self.colorPanelCollapsed = false
         self.displayPatternPanel = false
@@ -82,7 +81,6 @@ struct ThemeColorState {
         self.previousPatternWallpaper = nil
         self.patternWallpaper = patternWallpaper
         self.patternIntensity = patternIntensity
-        self.motion = motion
         self.defaultMessagesColor = defaultMessagesColor
         self.messagesColors = messagesColors
         self.rotation = rotation
@@ -104,20 +102,10 @@ struct ThemeColorState {
         if self.rotation != otherState.rotation {
             return false
         }
-        if let lhsBackgroundColors = self.backgroundColors, let rhsBackgroundColors = otherState.backgroundColors {
-            if lhsBackgroundColors.0 != rhsBackgroundColors.0 {
-                return false
-            }
-            if let lhsSecondColor = lhsBackgroundColors.1, let rhsSecondColor = rhsBackgroundColors.1 {
-                if lhsSecondColor != rhsSecondColor {
-                    return false
-                }
-            } else if (lhsBackgroundColors.1 == nil) != (rhsBackgroundColors.1 == nil) {
-                return false
-            }
-        } else if (self.backgroundColors == nil) != (otherState.backgroundColors == nil) {
+        if self.backgroundColors != otherState.backgroundColors {
             return false
         }
+
         if let lhsMessagesColors = self.messagesColors, let rhsMessagesColors = otherState.messagesColors {
             if lhsMessagesColors.0 != rhsMessagesColors.0 {
                 return false
@@ -137,11 +125,11 @@ struct ThemeColorState {
 }
 
 private func calcPatternColors(for state: ThemeColorState) -> [UIColor] {
-    if let backgroundColors = state.backgroundColors {
+    if state.backgroundColors.count >= 1 {
         let patternIntensity = CGFloat(state.patternIntensity) / 100.0
-        let topPatternColor = backgroundColors.0.withAlphaComponent(patternIntensity)
-        if let bottomColor = backgroundColors.1 {
-            let bottomPatternColor = bottomColor.withAlphaComponent(patternIntensity)
+        let topPatternColor = UIColor(rgb: state.backgroundColors[0]).withAlphaComponent(patternIntensity)
+        if state.backgroundColors.count >= 2 {
+            let bottomPatternColor = UIColor(rgb: state.backgroundColors[1]).withAlphaComponent(patternIntensity)
             return [topPatternColor, bottomPatternColor]
         } else {
             return [topPatternColor, topPatternColor]
@@ -168,15 +156,21 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
     private let scrollNode: ASScrollNode
     private let pageControlBackgroundNode: ASDisplayNode
     private let pageControlNode: PageControlNode
-    private var motionButtonNode: WallpaperOptionButtonNode
+
     private var patternButtonNode: WallpaperOptionButtonNode
+    private var colorsButtonNode: WallpaperOptionButtonNode
+
+    private var playButtonNode: HighlightableButtonNode
+    private let playButtonBackgroundNode: NavigationBackgroundNode
+    private let playButtonPlayImage: UIImage?
+    private let playButtonRotateImage: UIImage?
+
     private let chatListBackgroundNode: ASDisplayNode
     private var chatNodes: [ListViewItemNode]?
     private let maskNode: ASImageNode
     private let backgroundContainerNode: ASDisplayNode
     private let backgroundWrapperNode: ASDisplayNode
-    private let immediateBackgroundNode: ASImageNode
-    private let signalBackgroundNode: TransformImageNode
+    private let backgroundNode: WallpaperBackgroundNode
     private let messagesContainerNode: ASDisplayNode
     private var dateHeaderNode: ListViewItemHeaderNode?
     private var messageNodes: [ListViewItemNode]?
@@ -193,7 +187,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
     private let serviceBackgroundColorPromise = Promise<UIColor>()
     private var wallpaperDisposable = MetaDisposable()
     
-    private var currentBackgroundColors: (UIColor, UIColor?, Int32?)?
+    private var currentBackgroundColors: ([UInt32], Int32?, Int32?)?
     private var currentBackgroundPromise = Promise<(UIColor, UIColor?)?>()
     
     private var patternWallpaper: TelegramWallpaper?
@@ -243,22 +237,53 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         self.pageControlBackgroundNode.cornerRadius = 10.5
         
         self.pageControlNode = PageControlNode(dotSpacing: 7.0, dotColor: .white, inactiveDotColor: UIColor.white.withAlphaComponent(0.4))
-        
-        self.motionButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_Motion, value: .check(false))
+
         self.patternButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_Pattern, value: .check(false))
+        self.colorsButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_WallpaperColors, value: .colors(false, []))
+
+        self.playButtonBackgroundNode = NavigationBackgroundNode(color: UIColor(white: 0.0, alpha: 0.3))
+        self.playButtonNode = HighlightableButtonNode()
+        self.playButtonNode.insertSubnode(self.playButtonBackgroundNode, at: 0)
+
+        self.playButtonPlayImage = generateImage(CGSize(width: 48.0, height: 48.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(UIColor.white.cgColor)
+
+            let diameter = size.width
+
+            let factor = diameter / 50.0
+
+            let size = CGSize(width: 15.0, height: 18.0)
+            context.translateBy(x: (diameter - size.width) / 2.0 + 1.5, y: (diameter - size.height) / 2.0)
+            if (diameter < 40.0) {
+                context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                context.scaleBy(x: factor, y: factor)
+                context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+            }
+            let _ = try? drawSvgPath(context, path: "M1.71891969,0.209353049 C0.769586558,-0.350676705 0,0.0908839327 0,1.18800046 L0,16.8564753 C0,17.9569971 0.750549162,18.357187 1.67393713,17.7519379 L14.1073836,9.60224049 C15.0318735,8.99626906 15.0094718,8.04970371 14.062401,7.49100858 L1.71891969,0.209353049 ")
+            context.fillPath()
+            if (diameter < 40.0) {
+                context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                context.scaleBy(x: 1.0 / 0.8, y: 1.0 / 0.8)
+                context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+            }
+            context.translateBy(x: -(diameter - size.width) / 2.0 - 1.5, y: -(diameter - size.height) / 2.0)
+        })
+
+        self.playButtonRotateImage = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorRotateIcon"), color: .white)
+
+        self.playButtonNode.setImage(self.playButtonPlayImage, for: [])
         
         self.chatListBackgroundNode = ASDisplayNode()
         
         self.backgroundContainerNode = ASDisplayNode()
         self.backgroundContainerNode.clipsToBounds = true
         self.backgroundWrapperNode = ASDisplayNode()
-        self.immediateBackgroundNode = ASImageNode()
-        self.signalBackgroundNode = TransformImageNode()
-        self.signalBackgroundNode.displaysAsynchronously = false
+        self.backgroundNode = WallpaperBackgroundNode(context: context)
         
         self.messagesContainerNode = ASDisplayNode()
         self.messagesContainerNode.clipsToBounds = true
-        self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
+        self.messagesContainerNode.transform = CATransform3DMakeScale(-1.0, -1.0, 1.0)
         
         self.colorPanelNode = WallpaperColorPanelNode(theme: self.theme, strings: self.presentationData.strings)
         self.patternPanelNode = WallpaperPatternPanelNode(context: self.context, theme: self.theme, strings: self.presentationData.strings)
@@ -292,8 +317,9 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         self.chatListBackgroundNode.addSubnode(self.maskNode)
         self.addSubnode(self.pageControlBackgroundNode)
         self.addSubnode(self.pageControlNode)
-        self.addSubnode(self.motionButtonNode)
         self.addSubnode(self.patternButtonNode)
+        self.addSubnode(self.colorsButtonNode)
+        self.addSubnode(self.playButtonNode)
         self.addSubnode(self.colorPanelNode)
         self.addSubnode(self.patternPanelNode)
         self.addSubnode(self.toolbarNode)
@@ -303,50 +329,27 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         self.scrollNode.addSubnode(self.messagesContainerNode)
         
         self.backgroundContainerNode.addSubnode(self.backgroundWrapperNode)
-        self.backgroundWrapperNode.addSubnode(self.immediateBackgroundNode)
-        self.backgroundWrapperNode.addSubnode(self.signalBackgroundNode)
-        
-        self.signalBackgroundNode.imageUpdated = { [weak self] _ in
-            if let strongSelf = self {
-                strongSelf.ready.set(.single(true))
-                strongSelf.signalBackgroundNode.contentAnimations = []
-            }
-        }
-        
-        self.motionButtonNode.addTarget(self, action: #selector(self.toggleMotion), forControlEvents: .touchUpInside)
+        self.backgroundWrapperNode.addSubnode(self.backgroundNode)
+
         self.patternButtonNode.addTarget(self, action: #selector(self.togglePattern), forControlEvents: .touchUpInside)
-               
-        self.colorPanelNode.colorAdded = { [weak self] in
-            if let strongSelf = self {
-                strongSelf.signalBackgroundNode.contentAnimations = [.subsequentUpdates]
-            }
-        }
+        self.colorsButtonNode.addTarget(self, action: #selector(self.toggleColors), forControlEvents: .touchUpInside)
+        self.playButtonNode.addTarget(self, action: #selector(self.playPressed), forControlEvents: .touchUpInside)
         
-        self.colorPanelNode.colorRemoved = { [weak self] in
-            if let strongSelf = self {
-                strongSelf.signalBackgroundNode.contentAnimations = [.subsequentUpdates]
-            }
-        }
-        
-        self.colorPanelNode.colorsChanged = { [weak self] firstColor, secondColor, ended in
+        self.colorPanelNode.colorsChanged = { [weak self] colors, ended in
             if let strongSelf = self, let section = strongSelf.state.section {
                 strongSelf.updateState({ current in
                     var updated = current
                     updated.preview = !ended
                     switch section {
                         case .accent:
-                            if let firstColor = firstColor {
-                                updated.accentColor = firstColor
+                            if let firstColor = colors.first {
+                                updated.accentColor = UIColor(rgb: firstColor)
                             }
                         case .background:
-                            if let firstColor = firstColor {
-                                updated.backgroundColors = (firstColor, secondColor)
-                            } else {
-                                updated.backgroundColors = nil
-                            }
+                            updated.backgroundColors = colors
                         case .messages:
-                            if let firstColor = firstColor {
-                                updated.messagesColors = (firstColor, secondColor)
+                            if colors.count >= 1 {
+                                updated.messagesColors = (UIColor(rgb: colors[0]), colors.count >= 2 ? UIColor(rgb: colors[1]) : nil)
                             } else {
                                 updated.messagesColors = nil
                             }
@@ -423,47 +426,41 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                 }
             }
         }
-        
+
+        self.backgroundNode.update(wallpaper: self.wallpaper)
+        self.backgroundNode.updateBubbleTheme(bubbleTheme: self.theme, bubbleCorners: self.presentationData.chatBubbleCorners)
+
         self.stateDisposable = (self.statePromise.get()
         |> deliverOn(self.queue)
         |> mapToThrottled { next -> Signal<ThemeColorState, NoError> in
             return .single(next) |> then(.complete() |> delay(0.0166667, queue: self.queue))
         }
-        |> map { [weak self] state -> (PresentationTheme?, (TelegramWallpaper, UIImage?, Signal<(TransformImageArguments) -> DrawingContext?, NoError>?, (() -> Void)?), UIColor, (UIColor, UIColor?)?, PatternWallpaperArguments, Bool) in
+        |> map { state -> (PresentationTheme?, TelegramWallpaper, UIColor, [UInt32], Int32, PatternWallpaperArguments, Bool) in
             let accentColor = state.accentColor
             var backgroundColors = state.backgroundColors
             let messagesColors = state.messagesColors
-            
-            var wallpaper: TelegramWallpaper
-            var wallpaperImage: UIImage?
-            var wallpaperSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?
 
-            var singleBackgroundColor: UIColor?
-            
+            var wallpaper: TelegramWallpaper
+
             var updateOnlyWallpaper = false
             if state.section == .background && state.preview {
                 updateOnlyWallpaper = true
             }
-            
-            if let backgroundColors = backgroundColors {
+
+            if !backgroundColors.isEmpty {
                 if let patternWallpaper = state.patternWallpaper, case let .file(file) = patternWallpaper {
-                    let color = backgroundColors.0.argb
-                    let bottomColor = backgroundColors.1.flatMap { $0.argb }
-                    wallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(motion: state.motion, color: color, bottomColor: bottomColor, intensity: state.patternIntensity, rotation: state.rotation))
-                    
+                    wallpaper = patternWallpaper.withUpdatedSettings(WallpaperSettings(colors: backgroundColors, intensity: state.patternIntensity, rotation: state.rotation))
+
                     let dimensions = file.file.dimensions ?? PixelDimensions(width: 100, height: 100)
                     var convertedRepresentations: [ImageRepresentationWithReference] = []
                     for representation in file.file.previewRepresentations {
                         convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .wallpaper(wallpaper: .slug(file.slug), resource: representation.resource)))
                     }
-                    convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
-                    
-                    wallpaperSignal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: true)
-                } else if let bottomColor = backgroundColors.1 {
-                    wallpaper = .gradient(backgroundColors.0.argb, bottomColor.argb, WallpaperSettings(rotation: state.rotation))
-                    wallpaperSignal = gradientImage([backgroundColors.0, bottomColor], rotation: state.rotation)
+                    convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
+                } else if backgroundColors.count >= 2 {
+                    wallpaper = .gradient(nil, backgroundColors, WallpaperSettings(rotation: state.rotation))
                 } else {
-                    wallpaper = .color(backgroundColors.0.argb)
+                    wallpaper = .color(backgroundColors.first ?? 0xffffff)
                 }
             } else if let themeReference = mode.themeReference, case let .builtin(theme) = themeReference, state.initialWallpaper == nil {
                 var suggestedWallpaper: TelegramWallpaper
@@ -471,25 +468,23 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                     case .dayClassic:
                         let topColor = accentColor.withMultiplied(hue: 1.010, saturation: 0.414, brightness: 0.957)
                         let bottomColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.867, brightness: 0.965)
-                        suggestedWallpaper = .gradient(topColor.argb, bottomColor.argb, WallpaperSettings())
-                        wallpaperSignal = gradientImage([topColor, bottomColor], rotation: state.rotation)
-                        backgroundColors = (topColor, bottomColor)
+                        suggestedWallpaper = .gradient(nil, [topColor.rgb, bottomColor.rgb], WallpaperSettings())
+                        backgroundColors = [topColor.rgb, bottomColor.rgb]
                     case .nightAccent:
                         let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18)
-                        suggestedWallpaper = .color(color.argb)
-                        backgroundColors = (color, nil)
+                        suggestedWallpaper = .color(color.rgb)
+                        backgroundColors = [color.rgb]
                     default:
                         suggestedWallpaper = .builtin(WallpaperSettings())
                 }
                 wallpaper = suggestedWallpaper
             } else {
                 wallpaper = state.initialWallpaper ?? .builtin(WallpaperSettings())
-                wallpaperImage = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: false)
             }
-            
-            let serviceBackgroundColor = serviceColor(for: (wallpaper, wallpaperImage))
+
+            let serviceBackgroundColor = serviceColor(for: (wallpaper, nil))
             let updatedTheme: PresentationTheme?
-            
+
             if !updateOnlyWallpaper {
                 if let themeReference = mode.themeReference {
                     updatedTheme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: messagesColors, serviceBackgroundColor: serviceBackgroundColor, preview: true) ?? defaultPresentationTheme
@@ -498,29 +493,22 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                 } else {
                     updatedTheme = theme
                 }
-            
-                let _ = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: updatedTheme!, wallpaper: wallpaper, bubbleCorners: bubbleCorners)
+
+                let _ = PresentationResourcesChat.principalGraphics(theme: updatedTheme!, wallpaper: wallpaper, bubbleCorners: bubbleCorners)
             } else {
                 updatedTheme = nil
             }
-            
+
             let patternArguments = PatternWallpaperArguments(colors: calcPatternColors(for: state), rotation: wallpaper.settings?.rotation ?? 0, preview: state.preview)
-            
-            var wallpaperApply: (() -> Void)?
-            if let strongSelf = self, wallpaper.isPattern, let (layout, _, _) = strongSelf.validLayout {
-                let makeImageLayout = strongSelf.signalBackgroundNode.asyncLayout()
-                wallpaperApply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: wallpaper.dimensions ?? layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))
-            }
-            
-            return (updatedTheme, (wallpaper, wallpaperImage, wallpaperSignal, wallpaperApply), serviceBackgroundColor, backgroundColors, patternArguments, state.preview)
+
+            return (updatedTheme, wallpaper, serviceBackgroundColor, backgroundColors, state.rotation, patternArguments, state.preview)
         }
-        |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaperImageAndSignal, serviceBackgroundColor, backgroundColors, patternArguments, preview in
+        |> deliverOnMainQueue).start(next: { [weak self] theme, wallpaper, serviceBackgroundColor, backgroundColors, rotation, patternArguments, preview in
             guard let strongSelf = self else {
                 return
             }
-            let (wallpaper, wallpaperImage, wallpaperSignal, wallpaperApply) = wallpaperImageAndSignal
-            
-            if let theme = theme  {
+
+            if let theme = theme {
                 strongSelf.theme = theme
                 strongSelf.themeUpdated?(theme)
                 strongSelf.themePromise.set(.single(theme))
@@ -528,56 +516,45 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                 strongSelf.toolbarNode.updateThemeAndStrings(theme: theme, strings: strongSelf.presentationData.strings)
                 strongSelf.chatListBackgroundNode.backgroundColor = theme.chatList.backgroundColor
                 strongSelf.maskNode.image = generateMaskImage(color: theme.chatList.backgroundColor)
+
+                strongSelf.backgroundNode.updateBubbleTheme(bubbleTheme: theme, bubbleCorners: strongSelf.presentationData.chatBubbleCorners)
             }
-            
+
             strongSelf.serviceBackgroundColor = serviceBackgroundColor
             strongSelf.serviceBackgroundColorPromise.set(.single(serviceBackgroundColor))
-            
-            if case let .color(value) = wallpaper {
-                strongSelf.backgroundColor = UIColor(rgb: value)
-                strongSelf.immediateBackgroundNode.backgroundColor = UIColor(rgb: value)
-                strongSelf.immediateBackgroundNode.image = nil
-                strongSelf.signalBackgroundNode.isHidden = true
-                strongSelf.signalBackgroundNode.contentAnimations = []
-                strongSelf.signalBackgroundNode.reset()
-                strongSelf.patternWallpaper = nil
-                strongSelf.ready.set(.single(true) )
-            } else if let wallpaperImage = wallpaperImage {
-                strongSelf.immediateBackgroundNode.image = wallpaperImage
-                strongSelf.signalBackgroundNode.isHidden = true
-                strongSelf.signalBackgroundNode.contentAnimations = []
-                strongSelf.signalBackgroundNode.reset()
-                strongSelf.patternWallpaper = nil
-                strongSelf.ready.set(.single(true) )
-            } else if let wallpaperSignal = wallpaperSignal {
-                strongSelf.signalBackgroundNode.contentMode = .scaleToFill
-                strongSelf.signalBackgroundNode.isHidden = false
-                
-                if case let .file(file) = wallpaper, let (layout, _, _) = strongSelf.validLayout {
-                    wallpaperApply?()
-                    
-                    if let previousWallpaper = strongSelf.patternWallpaper, case let .file(previousFile) = previousWallpaper, file.id == previousFile.id {
-                    } else {
-                        strongSelf.signalBackgroundNode.setSignal(wallpaperSignal)
-                        strongSelf.patternWallpaper = wallpaper
-                    }
-                } else {
-                    strongSelf.signalBackgroundNode.setSignal(wallpaperSignal)
-                    strongSelf.patternWallpaper = nil
-                }
-            }
+
+            strongSelf.backgroundNode.update(wallpaper: wallpaper)
+            strongSelf.backgroundNode.updateBubbleTheme(bubbleTheme: strongSelf.theme, bubbleCorners: strongSelf.presentationData.chatBubbleCorners)
+
+            strongSelf.ready.set(.single(true))
+
             strongSelf.wallpaper = wallpaper
             strongSelf.patternArguments = patternArguments
-            
+
+            strongSelf.colorsButtonNode.colors = backgroundColors.map(UIColor.init(rgb:))
+
             if !preview {
-                if let backgroundColors = backgroundColors {
-                    strongSelf.currentBackgroundColors = (backgroundColors.0, backgroundColors.1, strongSelf.state.rotation)
+                if !backgroundColors.isEmpty {
+                    strongSelf.currentBackgroundColors = (backgroundColors, strongSelf.state.rotation, strongSelf.state.patternIntensity)
                 } else {
                     strongSelf.currentBackgroundColors = nil
                 }
                 strongSelf.patternPanelNode.backgroundColors = strongSelf.currentBackgroundColors
+            } else {
+                let previousIntensity = strongSelf.patternPanelNode.backgroundColors?.2
+                let updatedIntensity = strongSelf.state.patternIntensity
+                if let previousIntensity = previousIntensity {
+                    if (previousIntensity < 0) != (updatedIntensity < 0) {
+                        if !backgroundColors.isEmpty {
+                            strongSelf.currentBackgroundColors = (backgroundColors, strongSelf.state.rotation, strongSelf.state.patternIntensity)
+                        } else {
+                            strongSelf.currentBackgroundColors = nil
+                        }
+                        strongSelf.patternPanelNode.backgroundColors = strongSelf.currentBackgroundColors
+                    }
+                }
             }
-            
+
             if let _ = theme, let (layout, navigationBarHeight, messagesBottomInset) = strongSelf.validLayout {
                 strongSelf.updateChatsLayout(layout: layout, topInset: navigationBarHeight, transition: .immediate)
                 strongSelf.updateMessagesLayout(layout: layout, bottomInset: messagesBottomInset, transition: .immediate)
@@ -595,7 +572,8 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                 strongSelf.patternPanelNode.serviceBackgroundColor = color
                 strongSelf.pageControlBackgroundNode.backgroundColor = color
                 strongSelf.patternButtonNode.buttonColor = color
-                strongSelf.motionButtonNode.buttonColor = color
+                strongSelf.colorsButtonNode.buttonColor = color
+                strongSelf.playButtonBackgroundNode.updateColor(color: color, transition: .immediate)
             }
         })
     }
@@ -641,27 +619,26 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         }
              
         let colorPanelCollapsed = self.state.colorPanelCollapsed
+
+        if colorPanelCollapsed != previousState.colorPanelCollapsed {
+            Queue.mainQueue().justDispatch {
+                self.colorPanelNode.view.endEditing(true)
+            }
+        }
         
         if (previousState.patternWallpaper != nil) != (self.state.patternWallpaper != nil) {
             self.patternButtonNode.setSelected(self.state.patternWallpaper != nil, animated: animated)
         }
         
-        if previousState.motion != self.state.motion {
-            self.motionButtonNode.setSelected(self.state.motion, animated: animated)
-            self.setMotionEnabled(self.state.motion, animated: animated)
-        }
-        
         let sectionChanged = previousState.section != self.state.section
         if sectionChanged, let section = self.state.section {
             self.view.endEditing(true)
             
-            let firstColor: UIColor?
-            let secondColor: UIColor?
+            var colors: [UInt32]
             var defaultColor: UIColor?
             switch section {
                 case .accent:
-                    firstColor = self.state.accentColor ?? defaultDayAccentColor
-                    secondColor = nil
+                    colors = [self.state.accentColor.rgb]
                 case .background:
                     if let themeReference = self.mode.themeReference, case let .builtin(theme) = themeReference {
                         switch theme {
@@ -673,15 +650,10 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                                 break
                         }
                     }
-                    if let backgroundColors = self.state.backgroundColors {
-                        firstColor = backgroundColors.0
-                        secondColor = backgroundColors.1
-                    } else if previousState.initialWallpaper != nil, let image = self.immediateBackgroundNode.image {
-                        firstColor = averageColor(from: image)
-                        secondColor = nil
+                    if !self.state.backgroundColors.isEmpty {
+                        colors = self.state.backgroundColors
                     } else {
-                        firstColor = nil
-                        secondColor = nil
+                        colors = []
                     }
                 case .messages:
                     if let defaultMessagesColor = self.state.defaultMessagesColor {
@@ -692,16 +664,42 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                         defaultColor = self.state.accentColor
                     }
                     if let messagesColors = self.state.messagesColors {
-                        firstColor = messagesColors.0
-                        secondColor = messagesColors.1
+                        if let second = messagesColors.1 {
+                            colors = [messagesColors.0.rgb, second.rgb]
+                        } else {
+                            colors = [messagesColors.0.rgb]
+                        }
                     } else {
-                        firstColor = nil
-                        secondColor = nil
+                        colors = []
                     }
             }
 
+            if colors.isEmpty, let defaultColor = defaultColor {
+                colors = [defaultColor.rgb]
+            }
+
+            let maximumNumberOfColors: Int
+            switch self.state.section {
+            case .accent:
+                maximumNumberOfColors = 1
+            case .background:
+                maximumNumberOfColors = 4
+            case .messages:
+                maximumNumberOfColors = 2
+            default:
+                maximumNumberOfColors = 1
+            }
+
             self.colorPanelNode.updateState({ _ in
-                return WallpaperColorPanelNodeState(selection: colorPanelCollapsed ? .none : .first, firstColor: firstColor, defaultColor: defaultColor, secondColor: secondColor, secondColorAvailable: self.state.section != .accent, rotateAvailable: self.state.section == .background, rotation: self.state.rotation ?? 0, preview: false, simpleGradientGeneration: self.state.section == .messages)
+                return WallpaperColorPanelNodeState(
+                    selection: colorPanelCollapsed ? nil : 0,
+                    colors: colors,
+                    maximumNumberOfColors: maximumNumberOfColors,
+                    rotateAvailable: self.state.section == .background,
+                    rotation: self.state.rotation,
+                    preview: false,
+                    simpleGradientGeneration: self.state.section == .messages
+                )
             }, animated: animated)
             
             needsLayout = true
@@ -714,7 +712,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
             
             self.colorPanelNode.updateState({ current in
                 var updated = current
-                updated.selection = colorPanelCollapsed ? .none : .first
+                updated.selection = colorPanelCollapsed ? nil : 0
                 return updated
             }, animated: animated)
         }
@@ -745,6 +743,20 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         if (previousState.patternWallpaper == nil) != (self.state.patternWallpaper == nil) {
             needsLayout = true
         }
+
+        if (previousState.backgroundColors.count >= 2) != (self.state.backgroundColors.count >= 2) {
+            needsLayout = true
+        }
+
+        if previousState.backgroundColors.count != self.state.backgroundColors.count {
+            if self.state.backgroundColors.count <= 2 {
+                self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+            } else {
+                self.playButtonNode.setImage(self.playButtonPlayImage, for: [])
+            }
+        }
+
+        self.colorsButtonNode.isSelected = !self.state.colorPanelCollapsed
         
         if needsLayout, let (layout, navigationBarHeight, _) = self.validLayout {
             self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: animated ? .animated(duration: animationDuration, curve: animationCurve) : .immediate)
@@ -759,6 +771,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
             }
             updated.section = section
             updated.displayPatternPanel = false
+            updated.colorPanelCollapsed = false
             return updated
         }, animated: true)
     }
@@ -766,7 +779,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
         }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, hidePsa: { _ in
         }, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
@@ -777,11 +790,11 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         let peers = SimpleDictionary<PeerId, Peer>()
         let messages = SimpleDictionary<MessageId, Message>()
         let selfPeer = TelegramUser(id: self.context.account.peerId, accessHash: nil, firstName: nil, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 2), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: 3), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
-        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(2)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(3)), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
+        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
         
         let timestamp = self.referenceTimestamp
         
@@ -843,7 +856,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp:  self.referenceTimestamp, theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder)
         
         var items: [ListViewItem] = []
-        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
         let otherPeerId = self.context.account.peerId
         var peers = SimpleDictionary<PeerId, Peer>()
         var messages = SimpleDictionary<MessageId, Message>()
@@ -883,17 +896,28 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         
         items = sampleMessages.reversed().map { message in
             let item = self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message], theme: self.theme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: { [weak self] message in
-                if message.flags.contains(.Incoming) {
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.updateState({ state in
+                    var state = state
+                    if state.section == .background {
+                        state.colorPanelCollapsed = true
+                        state.displayPatternPanel = false
+                    }
+                    return state
+                }, animated: true)
+                /*if message.flags.contains(.Incoming) {
                     self?.updateSection(.accent)
                     self?.requestSectionUpdate?(.accent)
                 } else {
                     self?.updateSection(.messages)
                     self?.requestSectionUpdate?(.messages)
-                }
+                }*/
             }, clickThroughMessage: { [weak self] in
                 self?.updateSection(.background)
                 self?.requestSectionUpdate?(.background)
-            })
+            }, backgroundNode: self.backgroundNode)
             return item
         }
         
@@ -921,7 +945,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
                     itemNode = node
                     apply().1(ListViewItemApply(isOnScreen: true))
                 })
-                itemNode!.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
+                //itemNode!.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
                 messageNodes.append(itemNode!)
                 self.messagesContainerNode.addSubnode(itemNode!)
             }
@@ -931,9 +955,13 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         var bottomOffset: CGFloat = 9.0 + bottomInset
         if let messageNodes = self.messageNodes {
             for itemNode in messageNodes {
+                let previousFrame = itemNode.frame
                 transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(x: 0.0, y: bottomOffset), size: itemNode.frame.size))
                 bottomOffset += itemNode.frame.height
                 itemNode.updateFrame(itemNode.frame, within: layout.size)
+                if case let .animated(duration, curve) = transition {
+                    itemNode.applyAbsoluteOffset(value: CGPoint(x: 0.0, y: -itemNode.frame.minY + previousFrame.minY), animationCurve: curve, duration: duration)
+                }
             }
         }
         
@@ -942,8 +970,8 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
             dateHeaderNode = currentDateHeaderNode
             headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem)
         } else {
-            dateHeaderNode = headerItem.node()
-            dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
+            dateHeaderNode = headerItem.node(synchronousLoad: true)
+            //dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
             self.messagesContainerNode.addSubnode(dateHeaderNode)
             self.dateHeaderNode = dateHeaderNode
         }
@@ -983,7 +1011,7 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         
         var colorPanelOffset: CGFloat = 0.0
         if self.state.colorPanelCollapsed {
-            colorPanelOffset = colorPanelHeight - inputFieldPanelHeight
+            colorPanelOffset = colorPanelHeight
         }
         let colorPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomInset - colorPanelHeight + colorPanelOffset), size: CGSize(width: layout.size.width, height: colorPanelHeight))
         bottomInset += (colorPanelHeight - colorPanelOffset)
@@ -1004,28 +1032,26 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         
         self.chatListBackgroundNode.frame = CGRect(x: bounds.width, y: 0.0, width: bounds.width, height: bounds.height)
         
-        transition.updateFrame(node: self.messagesContainerNode, frame: CGRect(x: 0.0, y: navigationBarHeight, width: bounds.width, height: bounds.height - bottomInset - navigationBarHeight))
+        transition.updateBounds(node: self.messagesContainerNode, bounds: CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height))
+        transition.updatePosition(node: self.messagesContainerNode, position: CGRect(x: 0.0, y: 0.0, width: bounds.width, height: bounds.height).center)
         
         let backgroundSize = CGSize(width: bounds.width, height: bounds.height - (colorPanelHeight - colorPanelOffset))
         transition.updateFrame(node: self.backgroundContainerNode, frame: CGRect(origin: CGPoint(), size: backgroundSize))
-        
-        let makeImageLayout = self.signalBackgroundNode.asyncLayout()
-        let imageApply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: self.patternWallpaper?.dimensions ?? layout.size, boundingSize: layout.size, intrinsicInsets: UIEdgeInsets(), custom: self.patternArguments))
-        let _ = imageApply()
+
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        self.backgroundNode.updateLayout(size: self.backgroundNode.bounds.size, transition: transition)
         
         transition.updatePosition(node: self.backgroundWrapperNode, position: CGPoint(x: backgroundSize.width / 2.0, y: backgroundSize.height / 2.0))
         
         transition.updateBounds(node: self.backgroundWrapperNode, bounds: CGRect(origin: CGPoint(), size: layout.size))
-        transition.updateFrame(node: self.immediateBackgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size))
-        transition.updateFrame(node: self.signalBackgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size))
     
         let displayOptionButtons = self.state.section == .background
-        var messagesBottomInset: CGFloat = 0.0
+        var messagesBottomInset: CGFloat = bottomInset
         
         if displayOptionButtons {
-            messagesBottomInset = 46.0
+            messagesBottomInset += 56.0
         } else if chatListPreviewAvailable {
-            messagesBottomInset = 37.0
+            messagesBottomInset += 37.0
         }
         self.updateChatsLayout(layout: layout, topInset: navigationBarHeight, transition: transition)
         self.updateMessagesLayout(layout: layout, bottomInset: messagesBottomInset, transition: messagesTransition)
@@ -1043,39 +1069,42 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         transition.updateFrame(node: self.maskNode, frame: CGRect(x: 0.0, y: layout.size.height - bottomInset - 80.0, width: bounds.width, height: 80.0))
         
         let patternButtonSize = self.patternButtonNode.measure(layout.size)
-        let motionButtonSize = self.motionButtonNode.measure(layout.size)
-        let maxButtonWidth = max(patternButtonSize.width, motionButtonSize.width)
+        let colorsButtonSize = self.colorsButtonNode.measure(layout.size)
+        let maxButtonWidth = max(patternButtonSize.width, colorsButtonSize.width)
         let buttonSize = CGSize(width: maxButtonWidth, height: 30.0)
-        
-        let leftButtonFrame = CGRect(origin: CGPoint(x: floor(layout.size.width / 2.0 - buttonSize.width - 10.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize)
-        let centerButtonFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - buttonSize.width) / 2.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize)
-        let rightButtonFrame = CGRect(origin: CGPoint(x: ceil(layout.size.width / 2.0 + 10.0), y: layout.size.height - bottomInset - 44.0), size: buttonSize)
 
-        var hasMotion: Bool = self.state.patternWallpaper != nil || self.state.displayPatternPanel
+        let patternAlpha: CGFloat = displayOptionButtons ? 1.0 : 0.0
+        let colorsAlpha: CGFloat = displayOptionButtons ? 1.0 : 0.0
         
-        var patternAlpha: CGFloat = displayOptionButtons ? 1.0 : 0.0
-        var motionAlpha: CGFloat = displayOptionButtons && hasMotion ? 1.0 : 0.0
-        
-        var patternFrame = hasMotion ? leftButtonFrame : centerButtonFrame
-        var motionFrame = hasMotion ? rightButtonFrame : centerButtonFrame
+        let patternFrame: CGRect
+        let colorsFrame: CGRect
+
+        let playButtonSize = CGSize(width: 48.0, height: 48.0)
+        var centerDistance: CGFloat = 40.0
+        let buttonsVerticalOffset: CGFloat = 5.0
+
+        let playFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - playButtonSize.width) / 2.0), y: layout.size.height - bottomInset - 44.0 - buttonsVerticalOffset + floor((buttonSize.height - playButtonSize.height) / 2.0)), size: playButtonSize)
+
+        let playAlpha: CGFloat
+        if self.state.backgroundColors.count >= 2 {
+            playAlpha = displayOptionButtons ? 1.0 : 0.0
+            centerDistance += playButtonSize.width
+        } else {
+            playAlpha = 0.0
+        }
+
+        patternFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - buttonSize.width * 2.0 - centerDistance) / 2.0), y: layout.size.height - bottomInset - 44.0 - buttonsVerticalOffset), size: buttonSize)
+        colorsFrame = CGRect(origin: CGPoint(x: patternFrame.maxX + centerDistance, y: layout.size.height - bottomInset - 44.0 - buttonsVerticalOffset), size: buttonSize)
         
         transition.updateFrame(node: self.patternButtonNode, frame: patternFrame)
         transition.updateAlpha(node: self.patternButtonNode, alpha: patternAlpha)
-        
-        transition.updateFrame(node: self.motionButtonNode, frame: motionFrame)
-        transition.updateAlpha(node: self.motionButtonNode, alpha: motionAlpha)
-        
-        if isFirstLayout {
-            self.setMotionEnabled(self.state.motion, animated: false)
-        }
-    }
-        
-    @objc private func toggleMotion() {
-        self.updateState({ current in
-            var updated = current
-            updated.motion = !updated.motion
-            return updated
-        }, animated: true)
+        transition.updateFrame(node: self.colorsButtonNode, frame: colorsFrame)
+        transition.updateAlpha(node: self.colorsButtonNode, alpha: colorsAlpha)
+
+        transition.updateFrame(node: self.playButtonNode, frame: playFrame)
+        transition.updateFrame(node: self.playButtonBackgroundNode, frame: CGRect(origin: CGPoint(), size: playFrame.size))
+        self.playButtonBackgroundNode.update(size: playFrame.size, cornerRadius: playFrame.size.height / 2.0, transition: transition)
+        transition.updateAlpha(node: self.playButtonNode, alpha: playAlpha)
     }
     
     @objc private func togglePattern() {
@@ -1087,24 +1116,41 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
         var appeared = false
         self.updateState({ current in
             var updated = current
-            if updated.patternWallpaper != nil {
-                updated.previousPatternWallpaper = updated.patternWallpaper
-                updated.patternWallpaper = nil
-                updated.displayPatternPanel = false
-            } else {
+            if !updated.displayPatternPanel {
                 updated.colorPanelCollapsed = false
                 updated.displayPatternPanel = true
                 if current.patternWallpaper == nil, let wallpaper = wallpaper {
                     updated.patternWallpaper = wallpaper
-                    if updated.backgroundColors == nil {
+                    if updated.backgroundColors.isEmpty {
                         if let backgroundColors = backgroundColors {
-                            updated.backgroundColors = (backgroundColors.0, backgroundColors.1)
+                            updated.backgroundColors = backgroundColors.0
                         } else {
-                            updated.backgroundColors = nil
+                            updated.backgroundColors = []
                         }
                     }
                     appeared = true
                 }
+            } else {
+                updated.colorPanelCollapsed = true
+                if updated.patternWallpaper != nil {
+                    updated.previousPatternWallpaper = updated.patternWallpaper
+                    updated.patternWallpaper = nil
+                    updated.displayPatternPanel = false
+                } else {
+                    updated.colorPanelCollapsed = false
+                    updated.displayPatternPanel = true
+                    if current.patternWallpaper == nil, let wallpaper = wallpaper {
+                        updated.patternWallpaper = wallpaper
+                        if updated.backgroundColors.isEmpty {
+                            if let backgroundColors = backgroundColors {
+                                updated.backgroundColors = backgroundColors.0
+                            } else {
+                                updated.backgroundColors = []
+                            }
+                        }
+                        appeared = true
+                    }
+                }
             }
             return updated
         }, animated: true)
@@ -1113,50 +1159,38 @@ final class ThemeAccentColorControllerNode: ASDisplayNode, UIScrollViewDelegate
             self.patternPanelNode.didAppear(initialWallpaper: wallpaper, intensity: self.state.patternIntensity)
         }
     }
-    
-    private let motionAmount: CGFloat = 32.0
-    private func setMotionEnabled(_ enabled: Bool, animated: Bool) {
-        guard let (layout, _, _) = self.validLayout else {
-            return
-        }
-        
-        if enabled {
-            let horizontal = UIInterpolatingMotionEffect(keyPath: "center.x", type: .tiltAlongHorizontalAxis)
-            horizontal.minimumRelativeValue = motionAmount
-            horizontal.maximumRelativeValue = -motionAmount
-            
-            let vertical = UIInterpolatingMotionEffect(keyPath: "center.y", type: .tiltAlongVerticalAxis)
-            vertical.minimumRelativeValue = motionAmount
-            vertical.maximumRelativeValue = -motionAmount
-            
-            let group = UIMotionEffectGroup()
-            group.motionEffects = [horizontal, vertical]
-            self.backgroundWrapperNode.view.addMotionEffect(group)
-            
-            let scale = (layout.size.width + motionAmount * 2.0) / layout.size.width
-            if animated {
-                self.backgroundWrapperNode.transform = CATransform3DMakeScale(scale, scale, 1.0)
-                self.backgroundWrapperNode.layer.animateScale(from: 1.0, to: scale, duration: 0.2)
+
+    @objc private func toggleColors() {
+        self.updateState({ current in
+            var updated = current
+            if updated.displayPatternPanel {
+                updated.displayPatternPanel = false
+                updated.colorPanelCollapsed = false
             } else {
-                self.backgroundWrapperNode.transform = CATransform3DMakeScale(scale, scale, 1.0)
-            }
-        } else {
-            let position = self.backgroundWrapperNode.layer.presentation()?.position
-            
-            for effect in self.backgroundWrapperNode.view.motionEffects {
-                self.backgroundWrapperNode.view.removeMotionEffect(effect)
-            }
-            
-            let scale = (layout.size.width + motionAmount * 2.0) / layout.size.width
-            if animated {
-                self.backgroundWrapperNode.transform = CATransform3DIdentity
-                self.backgroundWrapperNode.layer.animateScale(from: scale, to: 1.0, duration: 0.2)
-                if let position = position {
-                    self.backgroundWrapperNode.layer.animatePosition(from: position, to: self.backgroundWrapperNode.layer.position, duration: 0.2)
+                if updated.colorPanelCollapsed {
+                    updated.colorPanelCollapsed = false
+                } else {
+                    updated.colorPanelCollapsed = true
                 }
-            } else {
-                self.backgroundWrapperNode.transform = CATransform3DIdentity
             }
+            updated.displayPatternPanel = false
+            return updated
+        }, animated: true)
+    }
+
+    @objc private func playPressed() {
+        if self.state.backgroundColors.count >= 3 {
+            self.backgroundNode.animateEvent(transition: .animated(duration: 0.5, curve: .spring))
+        } else {
+            self.updateState({ state in
+                var state = state
+                state.rotation = (state.rotation + 90) % 360
+                return state
+            }, animated: true)
         }
     }
+
+    func animateWallpaperAppeared() {
+        self.backgroundNode.animateEvent(transition: .animated(duration: 2.0, curve: .spring), extendAnimation: true)
+    }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorPresets.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorPresets.swift
index ceb0836926..98410c1f7b 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorPresets.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorPresets.swift
@@ -2,19 +2,33 @@ import Foundation
 import Postbox
 import SyncCore
 import TelegramUIPreferences
+import TelegramPresentationData
 
-private func patternWallpaper(slug: String, topColor: UInt32, bottomColor: UInt32?, intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
-   return TelegramWallpaper.file(id: 0, accessHash: 0, isCreator: false, isDefault: true, isPattern: true, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(color: topColor, bottomColor: bottomColor, intensity: intensity ?? 50, rotation: rotation))
+private func patternWallpaper(data: BuiltinWallpaperData, colors: [UInt32], intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
+    return defaultBuiltinWallpaper(data: data, colors: colors, intensity: intensity ?? 50, rotation: rotation)
 }
 
 var dayClassicColorPresets: [PresentationThemeAccentColor] = [
-    PresentationThemeAccentColor(index: 106, baseColor: .preset, accentColor: 0xfff55783, bubbleColors: (0xffd6f5ff, 0xffc9fdfe), wallpaper: patternWallpaper(slug: "p-pXcflrmFIBAAAAvXYQk-mCwZU", topColor: 0xfffce3ec, bottomColor: 0xfffec8ff, intensity: 50, rotation: 45)),
-    PresentationThemeAccentColor(index: 102, baseColor: .preset, accentColor: 0xffff5fa9, bubbleColors: (0xfffff4d7, nil), wallpaper: patternWallpaper(slug: "51nnTjx8mFIBAAAAaFGJsMIvWkk", topColor: 0xfff6b594, bottomColor: 0xffebf6cd, intensity: 46, rotation: 45)),
-    PresentationThemeAccentColor(index: 104, baseColor: .preset, accentColor: 0xff5a9e29, bubbleColors: (0xfffff8df, 0xffdcf8c6), wallpaper: patternWallpaper(slug: "R3j69wKskFIBAAAAoUdXWCKMzCM", topColor: 0xffede6dd, bottomColor: 0xffffd59e, intensity: 50, rotation: nil)),
-    PresentationThemeAccentColor(index: 101, baseColor: .preset, accentColor: 0xff7e5fe5, bubbleColors: (0xfff5e2ff, nil), wallpaper: patternWallpaper(slug: "nQcFYJe1mFIBAAAAcI95wtIK0fk", topColor: 0xfffcccf4, bottomColor: 0xffae85f0, intensity: 54, rotation: nil)),
-    PresentationThemeAccentColor(index: 107, baseColor: .preset, accentColor: 0xff2cb9ed, bubbleColors: (0xffadf7b5, 0xfffcff8b), wallpaper: patternWallpaper(slug: "CJNyxPMgSVAEAAAAvW9sMwc51cw", topColor: 0xff1a2d1a, bottomColor: 0xff5f6f54, intensity: 50, rotation: 225)),
-    PresentationThemeAccentColor(index: 103, baseColor: .preset, accentColor: 0xff199972, bubbleColors: (0xfffffec7, nil), wallpaper: patternWallpaper(slug: "fqv01SQemVIBAAAApND8LDRUhRU", topColor: 0xffc1e7cb, bottomColor: nil, intensity: 50, rotation: nil)),
-    PresentationThemeAccentColor(index: 105, baseColor: .preset, accentColor: 0x0ff09eee, bubbleColors: (0xff94fff9, 0xffccffc7), wallpaper: patternWallpaper(slug: "p-pXcflrmFIBAAAAvXYQk-mCwZU", topColor: 0xffffbca6, bottomColor: 0xffff63bd, intensity: 57, rotation: 225))
+    // Pink with Blue
+    PresentationThemeAccentColor(index: 106, baseColor: .preset, accentColor: 0xfff55783, bubbleColors: (0xffd6f5ff, 0xffc9fdfe), wallpaper: patternWallpaper(data: .default, colors: [0x8dc0eb, 0xb9d1ea, 0xc6b1ef, 0xebd7ef], intensity: 50, rotation: nil)),
+
+    // Pink with Gold
+    PresentationThemeAccentColor(index: 102, baseColor: .preset, accentColor: 0xFFFF5FA9, bubbleColors: (0xFFFFF4D7, nil), wallpaper: patternWallpaper(data: .variant12, colors: [0xeaa36e, 0xf0e486, 0xf29ebf, 0xe8c06e], intensity: 50, rotation: nil)),
+
+    // Green
+    PresentationThemeAccentColor(index: 104, baseColor: .preset, accentColor: 0xFF5A9E29, bubbleColors: (0xffFFF8DF, nil), wallpaper: patternWallpaper(data: .variant13, colors: [0x7fc289, 0xe4d573, 0xafd677, 0xf0c07a], intensity: 50, rotation: nil)),
+
+    // Purple
+    PresentationThemeAccentColor(index: 101, baseColor: .preset, accentColor: 0xFF7E5FE5, bubbleColors: (0xFFF5e2FF, nil), wallpaper: patternWallpaper(data: .variant14, colors: [0xe4b2ea, 0x8376c2, 0xeab9d9, 0xb493e6], intensity: 50, rotation: nil)),
+
+    // Light Blue
+    PresentationThemeAccentColor(index: 107, baseColor: .preset, accentColor: 0xFF2CB9ED, bubbleColors: (0xFFADF7B5, 0xFFFCFF8B), wallpaper: patternWallpaper(data: .variant3, colors: [0x1a2e1a, 0x47623c, 0x222e24, 0x314429], intensity: 50, rotation: nil)),
+
+    // Mint
+    PresentationThemeAccentColor(index: 103, baseColor: .preset, accentColor: 0xFF199972, bubbleColors: (0xFFFFFEC7, nil), wallpaper: patternWallpaper(data: .variant3, colors: [0xdceb92, 0x8fe1d6, 0x67a3f2, 0x85d685], intensity: 50, rotation: nil)),
+
+    // Pink with Green
+    PresentationThemeAccentColor(index: 105, baseColor: .preset, accentColor: 0xFFDA90D9, bubbleColors: (0xFF94FFF9, 0xFFCCFFC7), wallpaper: patternWallpaper(data: .variant9, colors: [0xffc3b2, 0xe2c0ff, 0xffe7b2], intensity: 50, rotation: nil))
 ]
 
 var dayColorPresets: [PresentationThemeAccentColor] = [
@@ -25,8 +39,8 @@ var dayColorPresets: [PresentationThemeAccentColor] = [
 ]
 
 var nightColorPresets: [PresentationThemeAccentColor] = [
-    PresentationThemeAccentColor(index: 101, baseColor: .preset, accentColor: 0x007aff, bubbleColors: (0x007aff, 0xff53f4), wallpaper: nil),
-    PresentationThemeAccentColor(index: 102, baseColor: .preset, accentColor: 0x00b09b, bubbleColors: (0xaee946, 0x00b09b), wallpaper: nil),
-    PresentationThemeAccentColor(index: 103, baseColor: .preset, accentColor: 0xd33213, bubbleColors: (0xf9db00, 0xd33213), wallpaper: nil),
-    PresentationThemeAccentColor(index: 104, baseColor: .preset, accentColor: 0xea8ced, bubbleColors: (0xea8ced, 0x00c2ed), wallpaper: nil)
+    PresentationThemeAccentColor(index: 101, baseColor: .preset, accentColor: 0x007aff, bubbleColors: (0x007aff, 0xff53f4), wallpaper: patternWallpaper(data: .variant4, colors: [0xe4b2ea, 0x8376c2, 0xeab9d9, 0xb493e6], intensity: -35, rotation: nil)),
+    PresentationThemeAccentColor(index: 102, baseColor: .preset, accentColor: 0x00b09b, bubbleColors: (0xaee946, 0x00b09b), wallpaper: patternWallpaper(data: .variant9, colors: [0xe4b2ea, 0x8376c2, 0xeab9d9, 0xb493e6], intensity: -35, rotation: nil)),
+    PresentationThemeAccentColor(index: 103, baseColor: .preset, accentColor: 0xd33213, bubbleColors: (0xf9db00, 0xd33213), wallpaper: patternWallpaper(data: .variant2, colors: [0xfec496, 0xdd6cb9, 0x962fbf, 0x4f5bd5], intensity: -40, rotation: nil)),
+    PresentationThemeAccentColor(index: 104, baseColor: .preset, accentColor: 0xea8ced, bubbleColors: (0xea8ced, 0x00c2ed), wallpaper: patternWallpaper(data: .variant6, colors: [0x8adbf2, 0x888dec, 0xe39fea, 0x679ced], intensity: -30, rotation: nil))
 ]
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorSegmentedTitleView.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorSegmentedTitleView.swift
index 37cdcf7299..a8d182994d 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorSegmentedTitleView.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorSegmentedTitleView.swift
@@ -31,7 +31,7 @@ final class ThemeColorSegmentedTitleView: UIView {
     init(theme: PresentationTheme, strings: PresentationStrings, selectedSection: ThemeColorSection) {
         self.theme = theme
         
-        let sections = [strings.Theme_Colors_Accent, strings.Theme_Colors_Background, strings.Theme_Colors_Messages]
+        let sections = [strings.Theme_Colors_Background, strings.Theme_Colors_Accent, strings.Theme_Colors_Messages]
         self.segmentedControlNode = SegmentedControlNode(theme: SegmentedControlTheme(theme: theme), items: sections.map { SegmentedControlItem(title: $0) }, selectedIndex: selectedSection.rawValue)
         
         super.init(frame: CGRect())
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift
index 99d25dbc70..1d7670f305 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridController.swift
@@ -11,47 +11,96 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
 
-private func availableColors() -> [UInt32] {
-    return [
-        0xffffff,
-        0xd4dfea,
-        0xb3cde1,
-        0x6ab7ea,
-        0x008dd0,
-        0xd3e2da,
-        0xc8e6c9,
-        0xc5e1a5,
-        0x61b06e,
-        0xcdcfaf,
-        0xa7a895,
-        0x7c6f72,
-        0xffd7ae,
-        0xffb66d,
-        0xde8751,
-        0xefd5e0,
-        0xdba1b9,
-        0xffafaf,
-        0xf16a60,
-        0xe8bcea,
-        0x9592ed,
-        0xd9bc60,
-        0xb17e49,
-        0xd5cef7,
-        0xdf506b,
-        0x8bd2cc,
-        0x3c847e,
-        0x22612c,
-        0x244d7c,
-        0x3d3b85,
-        0x65717d,
-        0x18222d,
-        0x000000
-    ]
+private func availableGradients(theme: PresentationTheme) -> [[UInt32]] {
+    if theme.overallDarkAppearance {
+        return [
+            [0x1e3557, 0x151a36, 0x1c4352, 0x2a4541] as [UInt32],
+            [0x1d223f, 0x1d1832, 0x1b2943, 0x141631] as [UInt32],
+            [0x203439, 0x102028, 0x1d3c3a, 0x172635] as [UInt32],
+            [0x1c2731, 0x1a1c25, 0x27303b, 0x1b1b21] as [UInt32],
+            [0x3a1c3a, 0x24193c, 0x392e3e, 0x1a1632] as [UInt32],
+            [0x2c211b, 0x44332a, 0x22191f, 0x3b2d36] as [UInt32],
+            [0x1e3557, 0x182036, 0x1c4352, 0x16263a] as [UInt32],
+            [0x111236, 0x14424f, 0x0b2334, 0x3b315d] as [UInt32],
+            [0x2d4836, 0x172b19, 0x364331, 0x103231] as [UInt32]
+        ]
+    } else {
+        return [
+            [0xdbddbb, 0x6ba587, 0xd5d88d, 0x88b884] as [UInt32],
+            [0x8dc0eb, 0xb9d1ea, 0xc6b1ef, 0xebd7ef] as [UInt32],
+            [0x97beeb, 0xb1e9ea, 0xc6b1ef, 0xefb7dc] as [UInt32],
+            [0x8adbf2, 0x888dec, 0xe39fea, 0x679ced] as [UInt32],
+            [0xb0cdeb, 0x9fb0ea, 0xbbead5, 0xb2e3dd] as [UInt32],
+            [0xdaeac8, 0xa2b4ff, 0xeccbff, 0xb9e2ff] as [UInt32],
+            [0xdceb92, 0x8fe1d6, 0x67a3f2, 0x85d685] as [UInt32],
+            [0xeaa36e, 0xf0e486, 0xf29ebf, 0xe8c06e] as [UInt32],
+            [0xffc3b2, 0xe2c0ff, 0xffe7b2, 0xf8cece] as [UInt32]
+        ]
+    }
 }
 
-private func randomColor() -> UInt32 {
-    let colors = availableColors()
-    return colors[1 ..< colors.count - 1].randomElement() ?? 0x000000
+private func availableColors(theme: PresentationTheme) -> [UInt32] {
+    if theme.overallDarkAppearance {
+        return [
+            0x1D2D3C,
+            0x111B26,
+            0x0B141E,
+            0x1F361F,
+            0x131F15,
+            0x0E1710,
+            0x2F2E27,
+            0x2A261F,
+            0x191817,
+            0x432E30,
+            0x2E1C1E,
+            0x1F1314,
+            0x432E3C,
+            0x2E1C28,
+            0x1F131B,
+            0x3C2E43,
+            0x291C2E,
+            0x1D1221,
+            0x312E43,
+            0x1E1C2E,
+            0x141221,
+            0x2F3F3F,
+            0x212D30,
+            0x141E20,
+            0x272524,
+            0x191716,
+            0x000000
+        ]
+    } else {
+        return [
+            0xD3DFEA,
+            0xA5C5DB,
+            0x6F99C8,
+            0xD2E3A9,
+            0xA4D48E,
+            0x7DBB6E,
+            0xE6DDAE,
+            0xD5BE91,
+            0xCBA479,
+            0xEBC0B9,
+            0xE0A79D,
+            0xC97870,
+            0xEBB9C8,
+            0xE09DB7,
+            0xD27593,
+            0xDAC2ED,
+            0xD3A5E7,
+            0xB587D2,
+            0xC2C2ED,
+            0xA5A5E7,
+            0x7F7FD0,
+            0xC2E2ED,
+            0xA5D6E7,
+            0x7FBAD0,
+            0xD6C2B9,
+            0x9C8882,
+            0x000000
+        ]
+    }
 }
 
 final class ThemeColorsGridController: ViewController {
@@ -120,7 +169,7 @@ final class ThemeColorsGridController: ViewController {
     }
     
     override func loadDisplayNode() {
-        self.displayNode = ThemeColorsGridControllerNode(context: self.context, presentationData: self.presentationData, colors: availableColors(), present: { [weak self] controller, arguments in
+        self.displayNode = ThemeColorsGridControllerNode(context: self.context, presentationData: self.presentationData, gradients: availableGradients(theme: self.presentationData.theme), colors: availableColors(theme: self.presentationData.theme), present: { [weak self] controller, arguments in
             self?.present(controller, in: .window(.root), with: arguments, blockInteraction: true)
         }, pop: { [weak self] in
             if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController {
@@ -177,6 +226,6 @@ final class ThemeColorsGridController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerItem.swift
index fecf396153..b2c1cbcdb1 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerItem.swift
@@ -47,7 +47,7 @@ final class ThemeColorsGridControllerItemNode: GridItemNode {
     private var interaction: ThemeColorsGridControllerInteraction?
     
     override init() {
-        self.wallpaperNode = SettingsThemeWallpaperNode()
+        self.wallpaperNode = SettingsThemeWallpaperNode(displayLoading: false)
         super.init()
         
         self.addSubnode(self.wallpaperNode)
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
index e1b471550c..f0206397e9 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeColorsGridControllerNode.swift
@@ -88,7 +88,7 @@ final class ThemeColorsGridControllerNode: ASDisplayNode {
     
     private var disposable: Disposable?
     
-    init(context: AccountContext, presentationData: PresentationData, colors: [UInt32], present: @escaping (ViewController, Any?) -> Void, pop: @escaping () -> Void, presentColorPicker: @escaping () -> Void) {
+    init(context: AccountContext, presentationData: PresentationData, gradients: [[UInt32]], colors: [UInt32], present: @escaping (ViewController, Any?) -> Void, pop: @escaping () -> Void, presentColorPicker: @escaping () -> Void) {
         self.context = context
         self.presentationData = presentationData
         self.present = present
@@ -142,7 +142,9 @@ final class ThemeColorsGridControllerNode: ASDisplayNode {
         })
         self.controllerInteraction = interaction
         
-        let wallpapers = colors.map { TelegramWallpaper.color($0) }
+        var wallpapers: [TelegramWallpaper] = []
+        wallpapers.append(contentsOf: gradients.map { TelegramWallpaper.gradient(nil, $0, WallpaperSettings()) })
+        wallpapers.append(contentsOf: colors.map { TelegramWallpaper.color($0) })
         let transition = context.sharedContext.presentationData
         |> map { presentationData -> (ThemeColorsGridEntryTransition, Bool) in
             var entries: [ThemeColorsGridControllerEntry] = []
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift
index 9444ef01e6..8f6be20568 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridController.swift
@@ -149,6 +149,47 @@ final class ThemeGridController: ViewController {
                 let controller = ThemeColorsGridController(context: strongSelf.context)
                 (strongSelf.navigationController as? NavigationController)?.pushViewController(controller)
             }
+
+            /*if let strongSelf = self {
+                let _ = (strongSelf.context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings])
+                |> take(1)
+                |> deliverOnMainQueue).start(next: { [weak self] sharedData in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings
+
+                    let autoNightModeTriggered = strongSelf.presentationData.autoNightModeTriggered
+                    let themeReference: PresentationThemeReference
+                    if autoNightModeTriggered {
+                        themeReference = settings.automaticThemeSwitchSetting.theme
+                    } else {
+                        themeReference = settings.theme
+                    }
+
+                    let controller = ThemeAccentColorController(context: strongSelf.context, mode: .background(themeReference: themeReference))
+                    controller.completion = { [weak self] in
+                        if let strongSelf = self, let navigationController = strongSelf.navigationController as? NavigationController {
+                            var controllers = navigationController.viewControllers
+                            controllers = controllers.filter { controller in
+                                if controller is ThemeColorsGridController {
+                                    return false
+                                }
+                                return true
+                            }
+                            navigationController.setViewControllers(controllers, animated: false)
+                            controllers = controllers.filter { controller in
+                                if controller is ThemeAccentColorController {
+                                    return false
+                                }
+                                return true
+                            }
+                            navigationController.setViewControllers(controllers, animated: true)
+                        }
+                    }
+                    strongSelf.push(controller)
+                })
+            }*/
         }, emptyStateUpdated: { [weak self] empty in
             if let strongSelf = self {
                 if empty != strongSelf.isEmpty {
@@ -239,10 +280,17 @@ final class ThemeGridController: ViewController {
                             strongSelf.present(controller, in: .window(.root))
                             
                             let _ = resetWallpapers(account: strongSelf.context.account).start(completed: { [weak self, weak controller] in
-                                let presentationData = strongSelf.presentationData
                                 let _ = updatePresentationThemeSettingsInteractively(accountManager: strongSelf.context.sharedContext.accountManager, { current in
                                     return current.withUpdatedThemeSpecificChatWallpapers([:])
                                 }).start()
+
+                                let _ = (strongSelf.context.sharedContext.accountManager.transaction { transaction in
+                                    WallpapersState.update(transaction: transaction, { state in
+                                        var state = state
+                                        state.wallpapers.removeAll()
+                                        return state
+                                    })
+                                }).start()
                                 
                                 let _ = (telegramWallpapers(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network)
                                 |> deliverOnMainQueue).start(completed: { [weak self, weak controller] in
@@ -299,8 +347,8 @@ final class ThemeGridController: ViewController {
                 case let .file(_, _, _, _, isPattern, _, slug, _, settings):
                     var options: [String] = []
                     if isPattern {
-                        if let color = settings.color {
-                            options.append("bg_color=\(UIColor(rgb: color).hexString)")
+                        if settings.colors.count >= 1 {
+                            options.append("bg_color=\(UIColor(rgb: settings.colors[0]).hexString)")
                         }
                         if let intensity = settings.intensity {
                             options.append("intensity=\(intensity)")
@@ -339,7 +387,7 @@ final class ThemeGridController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, transition: transition)
     }
     
     func activateSearch() {
@@ -375,7 +423,9 @@ final class ThemeGridController: ViewController {
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Done, style: .done, target: self, action: #selector(self.donePressed))
         self.searchContentNode?.setIsEnabled(false, animated: true)
         self.controllerNode.updateState { state in
-            return state.withUpdatedEditing(true)
+            var state = state
+            state.editing = true
+            return state
         }
     }
     
@@ -384,7 +434,9 @@ final class ThemeGridController: ViewController {
         self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Edit, style: .plain, target: self, action: #selector(self.editPressed))
         self.searchContentNode?.setIsEnabled(true, animated: true)
         self.controllerNode.updateState { state in
-            return state.withUpdatedEditing(false)
+            var state = state
+            state.editing = false
+            return state
         }
     }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerItem.swift
index 5f38860949..0652c21f76 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerItem.swift
@@ -12,6 +12,7 @@ import GridMessageSelectionNode
 final class ThemeGridControllerItem: GridItem {
     let context: AccountContext
     let wallpaper: TelegramWallpaper
+    let wallpaperId: ThemeGridControllerEntry.StableId
     let index: Int
     let editable: Bool
     let selected: Bool
@@ -19,9 +20,10 @@ final class ThemeGridControllerItem: GridItem {
     
     let section: GridSection? = nil
     
-    init(context: AccountContext, wallpaper: TelegramWallpaper, index: Int, editable: Bool, selected: Bool, interaction: ThemeGridControllerInteraction) {
+    init(context: AccountContext, wallpaper: TelegramWallpaper, wallpaperId: ThemeGridControllerEntry.StableId, index: Int, editable: Bool, selected: Bool, interaction: ThemeGridControllerInteraction) {
         self.context = context
         self.wallpaper = wallpaper
+        self.wallpaperId = wallpaperId
         self.index = index
         self.editable = editable
         self.selected = selected
@@ -30,7 +32,7 @@ final class ThemeGridControllerItem: GridItem {
     
     func node(layout: GridNodeLayout, synchronousLoad: Bool) -> GridItemNode {
         let node = ThemeGridControllerItemNode()
-        node.setup(context: self.context, wallpaper: self.wallpaper, editable: self.editable, selected: self.selected, interaction: self.interaction, synchronousLoad: synchronousLoad)
+        node.setup(item: self, synchronousLoad: synchronousLoad)
         return node
     }
     
@@ -39,7 +41,7 @@ final class ThemeGridControllerItem: GridItem {
             assertionFailure()
             return
         }
-        node.setup(context: self.context, wallpaper: self.wallpaper, editable: self.editable, selected: self.selected, interaction: self.interaction, synchronousLoad: false)
+        node.setup(item: self, synchronousLoad: false)
     }
 }
 
@@ -47,11 +49,11 @@ final class ThemeGridControllerItemNode: GridItemNode {
     private let wallpaperNode: SettingsThemeWallpaperNode
     private var selectionNode: GridMessageSelectionNode?
     
-    private var currentState: (AccountContext, TelegramWallpaper, Bool, Bool, Bool)?
-    private var interaction: ThemeGridControllerInteraction?
+    private var item: ThemeGridControllerItem?
     
     override init() {
-        self.wallpaperNode = SettingsThemeWallpaperNode()
+        self.wallpaperNode = SettingsThemeWallpaperNode(displayLoading: false)
+
         super.init()
         
         self.addSubnode(self.wallpaperNode)
@@ -64,50 +66,35 @@ final class ThemeGridControllerItemNode: GridItemNode {
         self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
     }
     
-    func setup(context: AccountContext, wallpaper: TelegramWallpaper, editable: Bool, selected: Bool, interaction: ThemeGridControllerInteraction, synchronousLoad: Bool) {
-        self.interaction = interaction
-        
-        if self.currentState == nil || self.currentState!.0 !== context || wallpaper != self.currentState!.1 || selected != self.currentState!.2 || synchronousLoad != self.currentState!.3 || editable != self.currentState!.4 {
-            self.currentState = (context, wallpaper, selected, synchronousLoad, editable)
-            self.updateSelectionState(animated: false)
-            self.setNeedsLayout()
-        }
+    func setup(item: ThemeGridControllerItem, synchronousLoad: Bool) {
+        self.item = item
+        self.updateSelectionState(animated: false)
+        self.setNeedsLayout()
     }
     
     @objc func tapGesture(_ recognizer: UITapGestureRecognizer) {
         if case .ended = recognizer.state {
-            if let (_, wallpaper, _, _, _) = self.currentState {
-                self.interaction?.openWallpaper(wallpaper)
+            if let item = self.item {
+                item.interaction.openWallpaper(item.wallpaper)
             }
         }
     }
     
     func updateSelectionState(animated: Bool) {
-        if let (context, wallpaper, _, _, editable) = self.currentState {
-            var editing = false
-            var id: Int64?
-            if case let .file(file) = wallpaper {
-                id = file.id
-            } else if case .image = wallpaper {
-                id = 0
-            }
-            var selectedIndices = Set<Int64>()
-            if let interaction = self.interaction {
-                let (active, indices) = interaction.selectionState
-                editing = active
-                selectedIndices = indices
-            }
-            if let id = id, editing && editable {
-                let selected = selectedIndices.contains(id)
+        if let item = self.item {
+            let (editing, selectedIds) = item.interaction.selectionState
+
+            if editing && item.editable {
+                let selected = selectedIds.contains(item.wallpaperId)
                 
                 if let selectionNode = self.selectionNode {
                     selectionNode.updateSelected(selected, animated: animated)
                     selectionNode.frame = CGRect(origin: CGPoint(), size: self.bounds.size)
                 } else {
-                    let theme = context.sharedContext.currentPresentationData.with { $0 }.theme
+                    let theme = item.context.sharedContext.currentPresentationData.with { $0 }.theme
                     let selectionNode = GridMessageSelectionNode(theme: theme, toggle: { [weak self] value in
                         if let strongSelf = self {
-                            strongSelf.interaction?.toggleWallpaperSelection(id, value)
+                            strongSelf.item?.interaction.toggleWallpaperSelection(item.wallpaperId, value)
                         }
                     })
                     
@@ -139,8 +126,8 @@ final class ThemeGridControllerItemNode: GridItemNode {
         super.layout()
         
         let bounds = self.bounds
-        if let (context, wallpaper, selected, synchronousLoad, _) = self.currentState {
-            self.wallpaperNode.setWallpaper(context: context, wallpaper: wallpaper, selected: selected, size: bounds.size, synchronousLoad: synchronousLoad)
+        if let item = self.item {
+            self.wallpaperNode.setWallpaper(context: item.context, wallpaper: item.wallpaper, selected: item.selected, size: bounds.size, synchronousLoad: false)
             self.selectionNode?.frame = CGRect(origin: CGPoint(), size: bounds.size)
         }
     }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
index 75476d20eb..0e39a2108a 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridControllerNode.swift
@@ -18,36 +18,18 @@ import SearchUI
 import WallpaperResources
 
 struct ThemeGridControllerNodeState: Equatable {
-    let editing: Bool
-    var selectedIndices: Set<Int64>
-    
-    func withUpdatedEditing(_ editing: Bool) -> ThemeGridControllerNodeState {
-        return ThemeGridControllerNodeState(editing: editing, selectedIndices: editing ? self.selectedIndices : Set())
-    }
-    
-    func withUpdatedSelectedIndices(_ selectedIndices: Set<Int64>) -> ThemeGridControllerNodeState {
-        return ThemeGridControllerNodeState(editing: self.editing, selectedIndices: selectedIndices)
-    }
-    
-    static func ==(lhs: ThemeGridControllerNodeState, rhs: ThemeGridControllerNodeState) -> Bool {
-        if lhs.editing != rhs.editing {
-            return false
-        }
-        if lhs.selectedIndices != rhs.selectedIndices {
-            return false
-        }
-        return true
-    }
+    var editing: Bool
+    var selectedIds: Set<ThemeGridControllerEntry.StableId>
 }
 
 final class ThemeGridControllerInteraction {
     let openWallpaper: (TelegramWallpaper) -> Void
-    let toggleWallpaperSelection: (Int64, Bool) -> Void
+    let toggleWallpaperSelection: (ThemeGridControllerEntry.StableId, Bool) -> Void
     let deleteSelectedWallpapers: () -> Void
     let shareSelectedWallpapers: () -> Void
-    var selectionState: (Bool, Set<Int64>) = (false, Set())
+    var selectionState: (Bool, Set<ThemeGridControllerEntry.StableId>) = (false, Set())
     
-    init(openWallpaper: @escaping (TelegramWallpaper) -> Void, toggleWallpaperSelection: @escaping (Int64, Bool) -> Void, deleteSelectedWallpapers: @escaping () -> Void, shareSelectedWallpapers: @escaping () -> Void) {
+    init(openWallpaper: @escaping (TelegramWallpaper) -> Void, toggleWallpaperSelection: @escaping (ThemeGridControllerEntry.StableId, Bool) -> Void, deleteSelectedWallpapers: @escaping () -> Void, shareSelectedWallpapers: @escaping () -> Void) {
         self.openWallpaper = openWallpaper
         self.toggleWallpaperSelection = toggleWallpaperSelection
         self.deleteSelectedWallpapers = deleteSelectedWallpapers
@@ -55,46 +37,45 @@ final class ThemeGridControllerInteraction {
     }
 }
 
-private struct ThemeGridControllerEntry: Comparable, Identifiable {
-    let index: Int
-    let wallpaper: TelegramWallpaper
-    let isEditable: Bool
-    let isSelected: Bool
-    
-    static func ==(lhs: ThemeGridControllerEntry, rhs: ThemeGridControllerEntry) -> Bool {
-        return lhs.index == rhs.index && lhs.wallpaper == rhs.wallpaper && lhs.isEditable == rhs.isEditable && lhs.isSelected == rhs.isSelected
+struct ThemeGridControllerEntry: Comparable, Identifiable {
+    enum StableId: Hashable {
+        case builtin
+        case color(UInt32)
+        case gradient([UInt32])
+        case file(Int64, [UInt32], Int32)
+        case image(String)
     }
+
+    var index: Int
+    var wallpaper: TelegramWallpaper
+    var isEditable: Bool
+    var isSelected: Bool
     
     static func <(lhs: ThemeGridControllerEntry, rhs: ThemeGridControllerEntry) -> Bool {
         return lhs.index < rhs.index
     }
     
-    var stableId: Int64 {
+    var stableId: StableId {
         switch self.wallpaper {
-            case .builtin:
-                return 0
-            case let .color(color):
-                return (Int64(1) << 32) | Int64(bitPattern: UInt64(color))
-            case let .gradient(topColor, bottomColor, _):
-                var hash: UInt32 = topColor
-                hash = hash &* 31 &+ bottomColor
-                return (Int64(2) << 32) | Int64(hash)
-            case let .file(id, _, _, _, _, _, _, _, settings):
-                var hash: Int = id.hashValue
-                hash = hash &* 31 &+ (settings.color?.hashValue ?? 0)
-                hash = hash &* 31 &+ (settings.intensity?.hashValue ?? 0)
-                return (Int64(3) << 32) | Int64(hash)
-            case let .image(representations, _):
-                if let largest = largestImageRepresentation(representations) {
-                    return (Int64(4) << 32) | Int64(largest.resource.id.hashValue)
-                } else {
-                    return 0
-                }
+        case .builtin:
+            return .builtin
+        case let .color(color):
+            return .color(color)
+        case let .gradient(_, colors, _):
+            return .gradient(colors)
+        case let .file(id, _, _, _, _, _, _, _, settings):
+            return .file(id, settings.colors, settings.intensity ?? 0)
+        case let .image(representations, _):
+            if let largest = largestImageRepresentation(representations) {
+                return .image(largest.resource.id.uniqueId)
+            } else {
+                return .image("")
+            }
         }
     }
     
     func item(context: AccountContext, interaction: ThemeGridControllerInteraction) -> ThemeGridControllerItem {
-        return ThemeGridControllerItem(context: context, wallpaper: self.wallpaper, index: self.index, editable: self.isEditable, selected: self.isSelected, interaction: interaction)
+        return ThemeGridControllerItem(context: context, wallpaper: self.wallpaper, wallpaperId: self.stableId, index: self.index, editable: self.isEditable, selected: self.isSelected, interaction: interaction)
     }
 }
 
@@ -146,20 +127,19 @@ private func selectedWallpapers(entries: [ThemeGridControllerEntry]?, state: The
     }
     var wallpapers: [TelegramWallpaper] = []
     for entry in entries {
-        if case let .file(file) = entry.wallpaper {
-            if state.selectedIndices.contains(file.id) {
-                wallpapers.append(entry.wallpaper)
-            }
-        } else if case .image = entry.wallpaper {
-            if state.selectedIndices.contains(0) {
-                wallpapers.append(entry.wallpaper)
-            }
+        if state.selectedIds.contains(entry.stableId) {
+            wallpapers.append(entry.wallpaper)
         }
     }
     return wallpapers
 }
 
 final class ThemeGridControllerNode: ASDisplayNode {
+    private struct Wallpaper: Equatable {
+        var wallpaper: TelegramWallpaper
+        var isLocal: Bool
+    }
+
     private let context: AccountContext
     private var presentationData: PresentationData
     private var controllerInteraction: ThemeGridControllerInteraction?
@@ -173,7 +153,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
     var requestDeactivateSearch: (() -> Void)?
     
     let ready = ValuePromise<Bool>()
-    let wallpapersPromise: Promise<[TelegramWallpaper]>
+    private let wallpapersPromise: Promise<[Wallpaper]>
     
     private var backgroundNode: ASDisplayNode
     private var separatorNode: ASDisplayNode
@@ -193,7 +173,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
     
     private var selectionPanel: ThemeGridSelectionPanelNode?
     private var selectionPanelSeparatorNode: ASDisplayNode?
-    private var selectionPanelBackgroundNode: ASDisplayNode?
+    private var selectionPanelBackgroundNode: NavigationBackgroundNode?
     
     let gridNode: GridNode
     private let leftOverlayNode: ASDisplayNode
@@ -258,15 +238,16 @@ final class ThemeGridControllerNode: ASDisplayNode {
         self.resetDescriptionItemNode = ItemListTextItemNode()
         self.resetDescriptionItem = ItemListTextItem(presentationData: ItemListPresentationData(presentationData), text: .plain(presentationData.strings.Wallpaper_ResetWallpapersInfo), sectionId: 0)
         
-        self.currentState = ThemeGridControllerNodeState(editing: false, selectedIndices: Set())
+        self.currentState = ThemeGridControllerNodeState(editing: false, selectedIds: Set())
         self.statePromise = ValuePromise(self.currentState, ignoreRepeated: true)
-        
-        let wallpapersPromise = Promise<[TelegramWallpaper]>()
-        wallpapersPromise.set(telegramWallpapers(postbox: context.account.postbox, network: context.account.network))
+
+        let defaultWallpaper = presentationData.theme.chat.defaultWallpaper
+
+        let wallpapersPromise = Promise<[Wallpaper]>()
         self.wallpapersPromise = wallpapersPromise
         
-        let deletedWallpaperSlugsValue = Atomic<Set<String>>(value: Set())
-        let deletedWallpaperSlugsPromise = ValuePromise<Set<String>>(Set())
+        let deletedWallpaperIdsValue = Atomic<Set<ThemeGridControllerEntry.StableId>>(value: Set())
+        let deletedWallpaperIdsPromise = ValuePromise<Set<ThemeGridControllerEntry.StableId>>(Set())
         
         super.init()
         
@@ -308,31 +289,47 @@ final class ThemeGridControllerNode: ASDisplayNode {
             }
         }, toggleWallpaperSelection: { [weak self] id, value in
             if let strongSelf = self {
-                strongSelf.updateState { current in
-                    var updated = current.selectedIndices
+                strongSelf.updateState { state in
+                    var state = state
                     if value {
-                        updated.insert(id)
+                        state.selectedIds.insert(id)
                     } else {
-                        updated.remove(id)
+                        state.selectedIds.remove(id)
                     }
-                    return current.withUpdatedSelectedIndices(updated)
+                    return state
                 }
             }
         }, deleteSelectedWallpapers: { [weak self] in
             let entries = previousEntries.with { $0 }
             if let strongSelf = self, let entries = entries {
-                deleteWallpapers(selectedWallpapers(entries: entries, state: strongSelf.currentState), { [weak self] in
+                let wallpapers = selectedWallpapers(entries: entries, state: strongSelf.currentState)
+
+                deleteWallpapers(wallpapers, { [weak self] in
                     if let strongSelf = self {
-                        var updatedDeletedSlugs = deletedWallpaperSlugsValue.with { $0 }
+                        var updatedDeletedIds = deletedWallpaperIdsValue.with { $0 }
                         
                         for entry in entries {
-                            if case let .file(file) = entry.wallpaper, strongSelf.currentState.selectedIndices.contains(file.id) {
-                                updatedDeletedSlugs.insert(file.slug)
+                            if strongSelf.currentState.selectedIds.contains(entry.stableId) {
+                                updatedDeletedIds.insert(entry.stableId)
                             }
                         }
                         
-                        let _ = deletedWallpaperSlugsValue.swap(updatedDeletedSlugs)
-                        deletedWallpaperSlugsPromise.set(updatedDeletedSlugs)
+                        let _ = deletedWallpaperIdsValue.swap(updatedDeletedIds)
+                        deletedWallpaperIdsPromise.set(updatedDeletedIds)
+
+                        let _ = (strongSelf.context.sharedContext.accountManager.transaction { transaction in
+                            WallpapersState.update(transaction: transaction, { state in
+                                var state = state
+                                for wallpaper in wallpapers {
+                                    if let index = state.wallpapers.firstIndex(where: {
+                                        $0.isBasicallyEqual(to: wallpaper)
+                                    }) {
+                                        state.wallpapers.remove(at: index)
+                                    }
+                                }
+                                return state
+                            })
+                        }).start()
                     }
                 })
             }
@@ -344,8 +341,8 @@ final class ThemeGridControllerNode: ASDisplayNode {
         })
         self.controllerInteraction = interaction
         
-        let transition = combineLatest(wallpapersPromise.get(), deletedWallpaperSlugsPromise.get(), context.sharedContext.presentationData)
-        |> map { wallpapers, deletedWallpaperSlugs, presentationData -> (ThemeGridEntryTransition, Bool) in
+        let transition = combineLatest(self.wallpapersPromise.get(), deletedWallpaperIdsPromise.get(), context.sharedContext.presentationData)
+        |> map { wallpapers, deletedWallpaperIds, presentationData -> (ThemeGridEntryTransition, Bool) in
             var entries: [ThemeGridControllerEntry] = []
             var index = 1
             
@@ -355,35 +352,40 @@ final class ThemeGridControllerNode: ASDisplayNode {
             } else if presentationData.chatWallpaper.isBasicallyEqual(to: presentationData.theme.chat.defaultWallpaper) {
                 isSelectedEditable = false
             }
-            entries.insert(ThemeGridControllerEntry(index: 0, wallpaper: presentationData.chatWallpaper, isEditable: isSelectedEditable, isSelected: true), at: 0)
+            entries.insert(ThemeGridControllerEntry(index: 0, wallpaper: presentationData.chatWallpaper, isEditable: false, isSelected: true), at: 0)
             
             var defaultWallpaper: TelegramWallpaper?
             if !presentationData.chatWallpaper.isBasicallyEqual(to: presentationData.theme.chat.defaultWallpaper) {
-                if case .builtin = presentationData.theme.chat.defaultWallpaper {
-                } else {
+                let entry = ThemeGridControllerEntry(index: 1, wallpaper: presentationData.theme.chat.defaultWallpaper, isEditable: false, isSelected: false)
+                if !entries.contains(where: { $0.stableId == entry.stableId }) {
                     defaultWallpaper = presentationData.theme.chat.defaultWallpaper
-                    entries.insert(ThemeGridControllerEntry(index: 1, wallpaper: presentationData.theme.chat.defaultWallpaper, isEditable: false, isSelected: false), at: 1)
+                    entries.insert(entry, at: index)
                     index += 1
                 }
             }
             
             var sortedWallpapers: [TelegramWallpaper] = []
             if presentationData.theme.overallDarkAppearance {
+                var localWallpapers: [TelegramWallpaper] = []
                 var darkWallpapers: [TelegramWallpaper] = []
                 for wallpaper in wallpapers {
-                    if case let .file(file) = wallpaper, file.isDark {
-                        darkWallpapers.append(wallpaper)
+                    if wallpaper.isLocal {
+                        localWallpapers.append(wallpaper.wallpaper)
                     } else {
-                        sortedWallpapers.append(wallpaper)
+                        if case let .file(file) = wallpaper.wallpaper, file.isDark {
+                            darkWallpapers.append(wallpaper.wallpaper)
+                        } else {
+                            sortedWallpapers.append(wallpaper.wallpaper)
+                        }
                     }
                 }
-                sortedWallpapers = darkWallpapers + sortedWallpapers
+                sortedWallpapers = localWallpapers + darkWallpapers + sortedWallpapers
             } else {
-                sortedWallpapers = wallpapers
+                sortedWallpapers = wallpapers.map(\.wallpaper)
             }
             
             for wallpaper in sortedWallpapers {
-                if case let .file(file) = wallpaper, deletedWallpaperSlugs.contains(file.slug) || (wallpaper.isPattern && file.settings.color == nil) {
+                if case let .file(file) = wallpaper, (wallpaper.isPattern && file.settings.colors.isEmpty) {
                     continue
                 }
                 let selected = presentationData.chatWallpaper.isBasicallyEqual(to: wallpaper)
@@ -395,11 +397,24 @@ final class ThemeGridControllerNode: ASDisplayNode {
                 if case .builtin = wallpaper {
                     isEditable = false
                 }
-                if !selected && !isDefault {
-                    entries.append(ThemeGridControllerEntry(index: index, wallpaper: wallpaper, isEditable: isEditable, isSelected: false))
+                if isDefault || presentationData.chatWallpaper.isBasicallyEqual(to: wallpaper) {
+                    isEditable = false
+                }
+                if !selected && !isDefault {
+                    let entry = ThemeGridControllerEntry(index: index, wallpaper: wallpaper, isEditable: isEditable, isSelected: false)
+                    if deletedWallpaperIds.contains(entry.stableId) {
+                        continue
+                    }
+                    if !entries.contains(where: { $0.stableId == entry.stableId }) {
+                        entries.append(entry)
+                        index += 1
+                    }
                 }
-                index += 1
             }
+
+            /*if !entries.isEmpty {
+                entries = [entries[0]]
+            }*/
             
             let previous = previousEntries.swap(entries)
             return (preparedThemeGridEntryTransition(context: context, from: previous ?? [], to: entries, interaction: interaction), previous == nil)
@@ -409,6 +424,8 @@ final class ThemeGridControllerNode: ASDisplayNode {
                 strongSelf.enqueueTransition(transition)
             }
         })
+
+        self.updateWallpapers()
     }
     
     deinit {
@@ -491,7 +508,31 @@ final class ThemeGridControllerNode: ASDisplayNode {
     }
     
     func updateWallpapers() {
-        self.wallpapersPromise.set(telegramWallpapers(postbox: self.context.account.postbox, network: self.context.account.network))
+        self.wallpapersPromise.set(combineLatest(queue: .mainQueue(),
+            telegramWallpapers(postbox: self.context.account.postbox, network: self.context.account.network),
+            self.context.sharedContext.accountManager.sharedData(keys: [SharedDataKeys.wallapersState])
+        )
+        |> map { remoteWallpapers, sharedData -> [Wallpaper] in
+            let localState = (sharedData.entries[SharedDataKeys.wallapersState] as? WallpapersState) ?? WallpapersState.default
+
+            var wallpapers: [Wallpaper] = []
+            for wallpaper in localState.wallpapers {
+                if !wallpapers.contains(where: {
+                    $0.wallpaper.isBasicallyEqual(to: wallpaper)
+                }) {
+                    wallpapers.append(Wallpaper(wallpaper: wallpaper, isLocal: true))
+                }
+            }
+            for wallpaper in remoteWallpapers {
+                if !wallpapers.contains(where: {
+                    $0.wallpaper.isBasicallyEqual(to: wallpaper)
+                }) {
+                    wallpapers.append(Wallpaper(wallpaper: wallpaper, isLocal: false))
+                }
+            }
+
+            return wallpapers
+        })
     }
     
     func updatePresentationData(_ presentationData: PresentationData) {
@@ -531,7 +572,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
             self.statePromise.set(state)
         }
         
-        let selectionState = (self.currentState.editing, self.currentState.selectedIndices)
+        let selectionState = (self.currentState.editing, self.currentState.selectedIds)
         if let interaction = self.controllerInteraction, interaction.selectionState != selectionState {
             let requestLayout = interaction.selectionState.0 != self.currentState.editing
             self.controllerInteraction?.selectionState = selectionState
@@ -545,7 +586,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
             if requestLayout, let (containerLayout, navigationBarHeight) = self.validLayout {
                 self.containerLayoutUpdated(containerLayout, navigationBarHeight: navigationBarHeight, transition: .animated(duration: 0.4, curve: .spring))
             }
-            self.selectionPanel?.selectedIndices = selectionState.1
+            self.selectionPanel?.selectedIds = selectionState.1
         }
     }
     
@@ -647,7 +688,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
         if self.currentState.editing {
             let panelHeight: CGFloat
             if let selectionPanel = self.selectionPanel {
-                selectionPanel.selectedIndices = self.currentState.selectedIndices
+                selectionPanel.selectedIds = self.currentState.selectedIds
                 panelHeight = selectionPanel.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, maxHeight: 0.0, transition: transition, metrics: layout.metrics)
                 transition.updateFrame(node: selectionPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - insets.bottom - panelHeight), size: CGSize(width: layout.size.width, height: panelHeight)))
                 if let selectionPanelSeparatorNode = self.selectionPanelSeparatorNode {
@@ -655,24 +696,21 @@ final class ThemeGridControllerNode: ASDisplayNode {
                 }
                 if let selectionPanelBackgroundNode = self.selectionPanelBackgroundNode {
                     transition.updateFrame(node: selectionPanelBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - insets.bottom - panelHeight), size: CGSize(width: layout.size.width, height: insets.bottom + panelHeight)))
+                    selectionPanelBackgroundNode.update(size: selectionPanelBackgroundNode.bounds.size, transition: transition)
                 }
             } else {
-                let selectionPanelBackgroundNode = ASDisplayNode()
-                selectionPanelBackgroundNode.isLayerBacked = true
-                selectionPanelBackgroundNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor
+                let selectionPanelBackgroundNode = NavigationBackgroundNode(color: self.presentationData.theme.rootController.navigationBar.blurredBackgroundColor)
                 self.addSubnode(selectionPanelBackgroundNode)
                 self.selectionPanelBackgroundNode = selectionPanelBackgroundNode
                 
                 let selectionPanel = ThemeGridSelectionPanelNode(theme: self.presentationData.theme)
-                selectionPanel.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor
                 selectionPanel.controllerInteraction = self.controllerInteraction
-                selectionPanel.selectedIndices = self.currentState.selectedIndices
+                selectionPanel.selectedIds = self.currentState.selectedIds
                 panelHeight = selectionPanel.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, maxHeight: 0.0, transition: .immediate, metrics: layout.metrics)
                 self.selectionPanel = selectionPanel
                 self.addSubnode(selectionPanel)
                 
                 let selectionPanelSeparatorNode = ASDisplayNode()
-                selectionPanelSeparatorNode.isLayerBacked = true
                 selectionPanelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelSeparatorColor
                 self.addSubnode(selectionPanelSeparatorNode)
                 self.selectionPanelSeparatorNode = selectionPanelSeparatorNode
@@ -682,6 +720,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
                 selectionPanelSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height), size: CGSize(width: layout.size.width, height: UIScreenPixel))
                 transition.updateFrame(node: selectionPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - insets.bottom - panelHeight), size: CGSize(width: layout.size.width, height: panelHeight)))
                 transition.updateFrame(node: selectionPanelBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - insets.bottom - panelHeight), size: CGSize(width: layout.size.width, height: insets.bottom + panelHeight)))
+                selectionPanelBackgroundNode.update(size: selectionPanelBackgroundNode.bounds.size, transition: .immediate)
                 transition.updateFrame(node: selectionPanelSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - insets.bottom - panelHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
             }
             
@@ -701,6 +740,7 @@ final class ThemeGridControllerNode: ASDisplayNode {
                 transition.updateFrame(node: selectionPanelBackgroundNode, frame: selectionPanelBackgroundNode.frame.offsetBy(dx: 0.0, dy: selectionPanel.bounds.size.height + insets.bottom), completion: { [weak selectionPanelSeparatorNode] _ in
                     selectionPanelSeparatorNode?.removeFromSupernode()
                 })
+                selectionPanelBackgroundNode.update(size: selectionPanelBackgroundNode.bounds.size, transition: transition)
             }
         }
         
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchColorsItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchColorsItem.swift
index c0dcf33d56..4f2c87afe8 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchColorsItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchColorsItem.swift
@@ -93,7 +93,11 @@ final class ThemeGridSearchColorsNode: ASDisplayNode {
         return CGSize(width: constrainedSize.width, height: 100.0)
     }
     
+    private var validLayout: (CGSize, CGFloat, CGFloat)?
     func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
+        let hadLayout = self.validLayout != nil
+        self.validLayout = (size, leftInset, rightInset)
+        
         self.sectionHeaderNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: 29.0))
         self.sectionHeaderNode.updateLayout(size: CGSize(width: size.width, height: 29.0), leftInset: leftInset, rightInset: rightInset)
         
@@ -103,6 +107,9 @@ final class ThemeGridSearchColorsNode: ASDisplayNode {
 
         self.scrollNode.frame = CGRect(x: 0.0, y: 29.0, width: size.width, height: size.height - 29.0)
         self.scrollNode.view.contentInset = insets
+        if !hadLayout {
+            self.scrollNode.view.contentOffset = CGPoint(x: -leftInset, y: 0.0)
+        }
         
         var offset: CGFloat = inset
         if let subnodes = self.scrollNode.subnodes {
@@ -242,9 +249,9 @@ class ThemeGridSearchColorsItemNode: ListViewItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchContentNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchContentNode.swift
index 39f33e0555..0862763d18 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchContentNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchContentNode.swift
@@ -497,7 +497,7 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
                     guard let name = configuration.imageBotUsername else {
                         return .single(nil)
                     }
-                    return resolvePeerByName(account: context.account, name: name)
+                    return context.engine.peers.resolvePeerByName(name: name)
                     |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                         if let peerId = peerId {
                             return context.account.postbox.loadedPeerWithId(peerId)
@@ -520,7 +520,7 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
                                     let geoPoint = collection.geoPoint.flatMap { geoPoint -> (Double, Double) in
                                         return (geoPoint.latitude, geoPoint.longitude)
                                     }
-                                    return requestChatContextResults(account: self.context.account, botId: collection.botId, peerId: collection.peerId, query: searchContext.result.query, location: .single(geoPoint), offset: nextOffset)
+                                    return self.context.engine.messages.requestChatContextResults(botId: collection.botId, peerId: collection.peerId, query: searchContext.result.query, location: .single(geoPoint), offset: nextOffset)
                                     |> map { results -> ChatContextResultCollection? in
                                         return results?.results
                                     }
@@ -572,7 +572,7 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
                         
                         return (.complete() |> delay(0.1, queue: Queue.concurrentDefaultQueue()))
                         |> then(
-                            requestContextResults(account: context.account, botId: user.id, query: wallpaperQuery, peerId: context.account.peerId, limit: 16)
+                            requestContextResults(context: context, botId: user.id, query: wallpaperQuery, peerId: context.account.peerId, limit: 16)
                             |> map { results -> ChatContextResultCollection? in
                                 return results?.results
                             }
@@ -654,7 +654,7 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
             }
         })
         
-        self.recentListNode.beganInteractiveDragging = { [weak self] in
+        self.recentListNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
         
@@ -848,7 +848,7 @@ final class ThemeGridSearchContentNode: SearchDisplayControllerContentNode {
     }
     
     private func clearRecentSearch() {
-        let _ = (clearRecentlySearchedPeers(postbox: self.context.account.postbox) |> deliverOnMainQueue).start()
+        let _ = (self.context.engine.peers.clearRecentlySearchedPeers() |> deliverOnMainQueue).start()
     }
     
     override func scrollToTop() {
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchItem.swift
index 04d8256dce..4d4383553f 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridSearchItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridSearchItem.swift
@@ -109,10 +109,10 @@ final class ThemeGridSearchItemNode: GridItemNode {
             
             var representations: [TelegramMediaImageRepresentation] = []
             if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions {
-                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: []))
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             if let imageResource = imageResource, let imageDimensions = imageDimensions {
-                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: []))
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             if !representations.isEmpty {
                 let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift b/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift
index 78a1c64556..0d7500fbf6 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeGridSelectionPanelNode.swift
@@ -17,11 +17,11 @@ final class ThemeGridSelectionPanelNode: ASDisplayNode {
     
     private var theme: PresentationTheme
     
-    var selectedIndices = Set<Int64>() {
+    var selectedIds = Set<ThemeGridControllerEntry.StableId>() {
         didSet {
-            if oldValue != self.selectedIndices {
-                self.deleteButton.isEnabled = !self.selectedIndices.isEmpty
-                self.shareButton.isEnabled = !self.selectedIndices.isEmpty
+            if oldValue != self.selectedIds {
+                self.deleteButton.isEnabled = !self.selectedIds.isEmpty
+                self.shareButton.isEnabled = !self.selectedIds.isEmpty
             }
         }
     }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
index 923279b761..dd72374307 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
@@ -245,7 +245,7 @@ public final class ThemePreviewController: ViewController {
                 }
             case .media:
                 if let strings = encodePresentationTheme(previewTheme), let data = strings.data(using: .utf8) {
-                    let resource = LocalFileMediaResource(fileId: arc4random64())
+                    let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
                     context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data)
                     theme = .single(.local(PresentationLocalTheme(title: previewTheme.name.string, resource: resource, resolvedWallpaper: nil)))
@@ -479,7 +479,7 @@ public final class ThemePreviewController: ViewController {
         
         self.validLayout = layout
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 
     @objc private func actionPressed() {
diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
index 13125e369d..82d7f5f0a0 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewControllerNode.swift
@@ -12,6 +12,7 @@ import AccountContext
 import ChatListUI
 import WallpaperResources
 import LegacyComponents
+import WallpaperBackgroundNode
 
 private func generateMaskImage(color: UIColor) -> UIImage? {
     return generateImage(CGSize(width: 1.0, height: 80.0), opaque: false, rotatedContext: { size, context in
@@ -55,6 +56,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private let instantChatBackgroundNode: WallpaperBackgroundNode
     private let remoteChatBackgroundNode: TransformImageNode
     private let blurredNode: BlurredImageNode
+    private let wallpaperNode: WallpaperBackgroundNode
     private var dateHeaderNode: ListViewItemHeaderNode?
     private var messageNodes: [ListViewItemNode]?
 
@@ -68,11 +70,15 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var fetchDisposable = MetaDisposable()
     
     private var dismissed = false
+
+    private var wallpaper: TelegramWallpaper
     
     init(context: AccountContext, previewTheme: PresentationTheme, initialWallpaper: TelegramWallpaper?, dismiss: @escaping () -> Void, apply: @escaping () -> Void, isPreview: Bool, ready: Promise<Bool>) {
         self.context = context
         self.previewTheme = previewTheme
         self.isPreview = isPreview
+
+        self.wallpaper = initialWallpaper ?? previewTheme.chat.defaultWallpaper
         
         self.ready = ready
         
@@ -102,18 +108,12 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.messagesContainerNode.clipsToBounds = true
         self.messagesContainerNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
         
-        self.instantChatBackgroundNode = WallpaperBackgroundNode()
+        self.instantChatBackgroundNode = WallpaperBackgroundNode(context: context)
         self.instantChatBackgroundNode.displaysAsynchronously = false
-        
-        let wallpaper = initialWallpaper ?? previewTheme.chat.defaultWallpaper
-        self.instantChatBackgroundNode.image = chatControllerBackgroundImage(theme: previewTheme, wallpaper: wallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper)
-        if self.instantChatBackgroundNode.image != nil {
-            self.ready.set(.single(true))
-        }
-        if case .gradient = wallpaper {
-            self.instantChatBackgroundNode.imageContentMode = .scaleToFill
-        }
-        self.instantChatBackgroundNode.motionEnabled = previewTheme.chat.defaultWallpaper.settings?.motion ?? false
+
+        self.ready.set(.single(true))
+        self.instantChatBackgroundNode.update(wallpaper: wallpaper)
+
         self.instantChatBackgroundNode.view.contentMode = .scaleAspectFill
         
         self.remoteChatBackgroundNode = TransformImageNode()
@@ -121,6 +121,8 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         self.blurredNode = BlurredImageNode()
         self.blurredNode.blurView.contentMode = .scaleAspectFill
+
+        self.wallpaperNode = WallpaperBackgroundNode(context: context)
         
         self.toolbarNode = WallpaperGalleryToolbarNode(theme: self.previewTheme, strings: self.presentationData.strings, doneButtonType: .set)
         
@@ -147,7 +149,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.chatListBackgroundNode.backgroundColor = self.previewTheme.chatList.backgroundColor
         self.maskNode.image = generateMaskImage(color: self.previewTheme.chatList.backgroundColor)
         
-        if case let .color(value) = self.previewTheme.chat.defaultWallpaper {
+        if case let .color(value) = self.wallpaper {
             self.instantChatBackgroundNode.backgroundColor = UIColor(rgb: value)
         }
         
@@ -182,13 +184,25 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 }
             }
         }
-        
-        if case let .file(file) = self.previewTheme.chat.defaultWallpaper {
+
+        var gradientColors: [UInt32] = []
+        if case let .file(file) = self.wallpaper {
+            gradientColors = file.settings.colors
+
             if file.settings.blur {
                 self.chatContainerNode.insertSubnode(self.blurredNode, belowSubnode: self.messagesContainerNode)
             }
+        } else if case let .gradient(_, colors, _) = self.wallpaper {
+            gradientColors = colors
         }
-        
+
+        if gradientColors.count >= 3 {
+            self.chatContainerNode.insertSubnode(self.wallpaperNode, belowSubnode: self.messagesContainerNode)
+        }
+
+        self.wallpaperNode.update(wallpaper: self.wallpaper)
+        self.wallpaperNode.updateBubbleTheme(bubbleTheme: self.previewTheme, bubbleCorners: self.presentationData.chatBubbleCorners)
+
         self.remoteChatBackgroundNode.imageUpdated = { [weak self] image in
             if let strongSelf = self, strongSelf.blurredNode.supernode != nil {
                 var image = image
@@ -231,20 +245,12 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 for representation in file.file.previewRepresentations {
                     convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: .wallpaper(wallpaper: .slug(file.slug), resource: representation.resource)))
                 }
-                convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
+                convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
                 
                 let signal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>
                 let fileReference = FileMediaReference.standalone(media: file.file)
                 if wallpaper.isPattern {
-                    signal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: false)
-                } else if strongSelf.instantChatBackgroundNode.image == nil {
-                    signal = wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: fileReference, representations: convertedRepresentations, alwaysShowThumbnailFirst: false, autoFetchFullSize: false)
-                        |> afterNext { next in
-                            if let _ = context.sharedContext.accountManager.mediaBox.completedResourcePath(file.file.resource) {
-                            } else if let path = context.account.postbox.mediaBox.completedResourcePath(file.file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path)) {
-                                context.sharedContext.accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data)
-                            }
-                    }
+                    signal = .complete()
                 } else {
                     signal = .complete()
                 }
@@ -271,14 +277,14 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 })
                 
                 var patternArguments: PatternWallpaperArguments?
-                if let color = file.settings.color {
+                if !file.settings.colors.isEmpty {
                     var patternIntensity: CGFloat = 0.5
                     if let intensity = file.settings.intensity {
                         patternIntensity = CGFloat(intensity) / 100.0
                     }
-                    var patternColors = [UIColor(rgb: color, alpha: patternIntensity)]
-                    if let bottomColor = file.settings.bottomColor {
-                        patternColors.append(UIColor(rgb: bottomColor, alpha: patternIntensity))
+                    var patternColors = [UIColor(rgb: file.settings.colors[0], alpha: patternIntensity)]
+                    if file.settings.colors.count >= 2 {
+                        patternColors.append(UIColor(rgb: file.settings.colors[1], alpha: patternIntensity))
                     }
                     patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation)
                 }
@@ -313,7 +319,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         self.chatListBackgroundNode.backgroundColor = self.previewTheme.chatList.backgroundColor
         self.maskNode.image = generateMaskImage(color: self.previewTheme.chatList.backgroundColor)
-        if case let .color(value) = self.previewTheme.chat.defaultWallpaper {
+        if case let .color(value) = self.wallpaper {
             self.instantChatBackgroundNode.backgroundColor = UIColor(rgb: value)
         }
         
@@ -350,7 +356,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private func updateChatsLayout(layout: ContainerViewLayout, topInset: CGFloat, transition: ContainedViewLayoutTransition) {
         var items: [ChatListItem] = []
         
-        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, additionalCategorySelected: { _ in
+        let interaction = ChatListNodeInteraction(activateSearch: {}, peerSelected: { _, _ in }, disabledPeerSelected: { _ in }, togglePeerSelected: { _ in }, togglePeersSelection: { _, _ in }, additionalCategorySelected: { _ in
         }, messageSelected: { _, _, _ in}, groupSelected: { _ in }, addContact: { _ in }, setPeerIdWithRevealedOptions: { _, _ in }, setItemPinned: { _, _ in }, setPeerMuted: { _, _ in }, deletePeer: { _, _ in }, updatePeerGrouping: { _, _ in }, togglePeerMarkedUnread: { _, _ in}, toggleArchivedFolderHiddenByDefault: {}, hidePsa: { _ in
         }, activateChatPreview: { _, _, gesture in
             gesture?.cancel()
@@ -361,14 +367,14 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         let peers = SimpleDictionary<PeerId, Peer>()
         let messages = SimpleDictionary<MessageId, Message>()
         let selfPeer = TelegramUser(id: self.context.account.peerId, accessHash: nil, firstName: nil, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 1), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 2), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: 3), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
-        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 4), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer5 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: 5), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .broadcast(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
-        let peer6 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: 5), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
-        let peer7 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: 6), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer1 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_1_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer2 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(2)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_2_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer3 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(3)), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .group(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
+        let peer3Author = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_3_AuthorName, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer4 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_4_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer5 = TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(5)), accessHash: nil, title: self.presentationData.strings.Appearance_ThemePreview_ChatList_5_Name, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .member, info: .broadcast(.init(flags: [])), flags: [], restrictionInfo: nil, adminRights: nil, bannedRights: nil, defaultBannedRights: nil)
+        let peer6 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(5)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_6_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+        let peer7 = TelegramUser(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(6)), accessHash: nil, firstName: self.presentationData.strings.Appearance_ThemePreview_ChatList_7_Name, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
         
         let timestamp = self.referenceTimestamp
         
@@ -448,7 +454,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp:  self.referenceTimestamp, theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder)
         
         var items: [ListViewItem] = []
-        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
         let otherPeerId = self.context.account.peerId
         var peers = SimpleDictionary<PeerId, Peer>()
         var messages = SimpleDictionary<MessageId, Message>()
@@ -487,7 +493,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         sampleMessages.append(message8)
         
         items = sampleMessages.reversed().map { message in
-            self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message], theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.previewTheme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil)
+            self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message], theme: self.previewTheme, strings: self.presentationData.strings, wallpaper: self.wallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: !message.media.isEmpty ? FileMediaResourceStatus(mediaStatus: .playbackStatus(.paused), fetchStatus: .Local) : nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.wallpaperNode)
         }
                 
         let width: CGFloat
@@ -544,7 +550,7 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
             dateHeaderNode = currentDateHeaderNode
             headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem)
         } else {
-            dateHeaderNode = headerItem.node()
+            dateHeaderNode = headerItem.node(synchronousLoad: true)
             dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
             self.messagesContainerNode.addSubnode(dateHeaderNode)
             self.dateHeaderNode = dateHeaderNode
@@ -594,6 +600,8 @@ final class ThemePreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.instantChatBackgroundNode.updateLayout(size: self.instantChatBackgroundNode.bounds.size, transition: .immediate)
         self.remoteChatBackgroundNode.frame = self.chatContainerNode.bounds
         self.blurredNode.frame = self.chatContainerNode.bounds
+        self.wallpaperNode.frame = self.chatContainerNode.bounds
+        self.wallpaperNode.updateLayout(size: self.wallpaperNode.bounds.size, transition: .immediate)
         
         transition.updateFrame(node: self.toolbarNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), size: CGSize(width: layout.size.width, height: toolbarHeight)))
         self.toolbarNode.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition)
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift
index 1f5fd063ac..d88914ce70 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift
@@ -319,6 +319,10 @@ class ThemeSettingsAppIconItemNode: ListViewItemNode, ItemListItemNode {
                                     bordered = false
                                 case "WhiteFilled":
                                     name = "⍺ White"
+                                case "New1":
+                                    name = item.strings.Appearance_AppIconNew1
+                                case "New2":
+                                    name = item.strings.Appearance_AppIconNew2
                                 default:
                                     break
                             }
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift
index 2a24f6b579..5a07d05a5e 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift
@@ -11,6 +11,7 @@ import TelegramUIPreferences
 import ItemListUI
 import PresentationDataUtils
 import AccountContext
+import WallpaperBackgroundNode
 
 struct ChatPreviewMessageItem: Equatable {
     static func == (lhs: ChatPreviewMessageItem, rhs: ChatPreviewMessageItem) -> Bool {
@@ -95,7 +96,7 @@ class ThemeSettingsChatPreviewItem: ListViewItem, ItemListItem {
 }
 
 class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
-    private let backgroundNode: ASImageNode
+    private var backgroundNode: WallpaperBackgroundNode?
     private let topStripeNode: ASDisplayNode
     private let bottomStripeNode: ASDisplayNode
     private let maskNode: ASImageNode
@@ -109,12 +110,6 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
     private let disposable = MetaDisposable()
     
     init() {
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displaysAsynchronously = false
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.contentMode = .scaleAspectFill
-        
         self.topStripeNode = ASDisplayNode()
         self.topStripeNode.isLayerBacked = true
         
@@ -138,21 +133,22 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
     }
     
     func asyncLayout() -> (_ item: ThemeSettingsChatPreviewItem, _ params: ListViewItemLayoutParams, _ neighbors: ItemListNeighbors) -> (ListViewItemNodeLayout, () -> Void) {
-        let currentItem = self.item
-        
         let currentNodes = self.messageNodes
+
+        var currentBackgroundNode = self.backgroundNode
         
         return { item, params, neighbors in
-            var updatedBackgroundSignal: Signal<(UIImage?, Bool)?, NoError>?
-            if currentItem?.wallpaper != item.wallpaper {
-                updatedBackgroundSignal = chatControllerBackgroundImageSignal(wallpaper: item.wallpaper, mediaBox: item.context.sharedContext.accountManager.mediaBox, accountMediaBox: item.context.account.postbox.mediaBox)
+            if currentBackgroundNode == nil {
+                currentBackgroundNode = WallpaperBackgroundNode(context: item.context)
             }
+            currentBackgroundNode?.update(wallpaper: item.wallpaper)
+            currentBackgroundNode?.updateBubbleTheme(bubbleTheme: item.theme, bubbleCorners: item.chatBubbleCorners)
             
             let insets: UIEdgeInsets
             let separatorHeight = UIScreenPixel
             
-            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
-            let otherPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 2)
+            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
+            let otherPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(2))
             var items: [ListViewItem] = []
             for messageItem in item.messageItems.reversed() {
                 var peers = SimpleDictionary<PeerId, Peer>()
@@ -165,7 +161,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
                 }
                 
                 let message = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: messageItem.outgoing ? otherPeerId : peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: messageItem.outgoing ? [] : [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: messageItem.outgoing ? TelegramUser(id: otherPeerId, accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: []) : nil, text: messageItem.text, attributes: messageItem.reply != nil ? [ReplyMessageAttribute(messageId: replyMessageId, threadMessageId: nil)] : [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-                items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, messages: [message], theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+                items.append(item.context.sharedContext.makeChatMessagePreviewItem(context: item.context, messages: [message], theme: item.componentTheme, strings: item.strings, wallpaper: item.wallpaper, fontSize: item.fontSize, chatBubbleCorners: item.chatBubbleCorners, dateTimeFormat: item.dateTimeFormat, nameOrder: item.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: currentBackgroundNode))
             }
             
             var nodes: [ListViewItemNode] = []
@@ -224,32 +220,34 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
                         node.updateFrame(CGRect(origin: CGPoint(x: 0.0, y: topOffset), size: node.frame.size), within: layoutSize)
                         topOffset += node.frame.size.height
                     }
+
+                    if let currentBackgroundNode = currentBackgroundNode, strongSelf.backgroundNode !== currentBackgroundNode {
+                        strongSelf.backgroundNode = currentBackgroundNode
+                        strongSelf.insertSubnode(currentBackgroundNode, at: 0)
+                    }
                     
-                    if let updatedBackgroundSignal = updatedBackgroundSignal {
+                    /*if let updatedBackgroundSignal = updatedBackgroundSignal {
                         strongSelf.disposable.set((updatedBackgroundSignal
                         |> deliverOnMainQueue).start(next: { [weak self] image in
-                            if let strongSelf = self, let (image, final) = image {
+                            if let strongSelf = self, let (image, final) = image, let backgroundNode = strongSelf.backgroundNode {
                                 if final && !strongSelf.finalImage {
                                     let tempLayer = CALayer()
-                                    tempLayer.frame = strongSelf.backgroundNode.bounds
-                                    tempLayer.contentsGravity = strongSelf.backgroundNode.layer.contentsGravity
+                                    tempLayer.frame = backgroundNode.bounds
+                                    tempLayer.contentsGravity = backgroundNode.layer.contentsGravity
                                     tempLayer.contents = strongSelf.contents
                                     strongSelf.layer.addSublayer(tempLayer)
                                     tempLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak tempLayer] _ in
                                         tempLayer?.removeFromSuperlayer()
                                     })
                                 }
-                                strongSelf.backgroundNode.image = image
+                                backgroundNode.image = image
                                 strongSelf.finalImage = final
                             }
                         }))
-                    }
+                    }*/
                     strongSelf.topStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
                     strongSelf.bottomStripeNode.backgroundColor = item.theme.list.itemBlocksSeparatorColor
-                    
-                    if strongSelf.backgroundNode.supernode == nil {
-                        strongSelf.insertSubnode(strongSelf.backgroundNode, at: 0)
-                    }
+
                     if strongSelf.topStripeNode.supernode == nil {
                         strongSelf.insertSubnode(strongSelf.topStripeNode, at: 1)
                     }
@@ -286,7 +284,12 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
                     strongSelf.maskNode.image = hasCorners ? PresentationResourcesItemList.cornersImage(item.theme, top: hasTopCorners, bottom: hasBottomCorners) : nil
                     
                     let backgroundFrame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: params.width, height: contentSize.height + min(insets.top, separatorHeight) + min(insets.bottom, separatorHeight)))
-                    strongSelf.backgroundNode.frame = backgroundFrame.insetBy(dx: 0.0, dy: -100.0)
+                    if let backgroundNode = strongSelf.backgroundNode {
+                        backgroundNode.frame = backgroundFrame.insetBy(dx: 0.0, dy: -100.0)
+                        backgroundNode.update(wallpaper: item.wallpaper)
+                        backgroundNode.updateBubbleTheme(bubbleTheme: item.theme, bubbleCorners: item.chatBubbleCorners)
+                        backgroundNode.updateLayout(size: backgroundNode.bounds.size, transition: .immediate)
+                    }
                     strongSelf.maskNode.frame = backgroundFrame.insetBy(dx: params.leftInset, dy: 0.0)
                     strongSelf.topStripeNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight))
                     strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: bottomStripeInset, y: contentSize.height + bottomStripeOffset), size: CGSize(width: layoutSize.width - bottomStripeInset, height: separatorHeight))
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
index c1bb641a8e..7f7047442f 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsController.swift
@@ -374,6 +374,19 @@ private enum ThemeSettingsControllerEntry: ItemListNodeEntry {
                     }
                 }
                 colorItems.append(contentsOf: colors.map { .color($0) })
+                if let index = colorItems.firstIndex(where: { item in
+                    if case .default = item {
+                        return true
+                    } else {
+                        return false
+                    }
+                }) {
+                    if index > 0 {
+                        let item = colorItems[index]
+                        colorItems.remove(at: index)
+                        colorItems.insert(item, at: 1)
+                    }
+                }
                 
                 return ThemeSettingsAccentColorItem(theme: theme, sectionId: self.section, generalThemeReference: generalThemeReference, themeReference: currentTheme, colors: colorItems, currentColor: currentColor, updated: { color in
                     if let color = color {
@@ -522,7 +535,7 @@ private func themeSettingsControllerEntries(presentationData: PresentationData,
     
     entries.append(.otherHeader(presentationData.theme, strings.Appearance_Other.uppercased()))
     entries.append(.largeEmoji(presentationData.theme, strings.Appearance_LargeEmoji, presentationData.largeEmoji))
-    entries.append(.animations(presentationData.theme, strings.Appearance_ReduceMotion, presentationData.disableAnimations))
+    entries.append(.animations(presentationData.theme, strings.Appearance_ReduceMotion, presentationData.reduceMotion))
     entries.append(.animationsInfo(presentationData.theme, strings.Appearance_ReduceMotionInfo))
     
     return entries
@@ -536,6 +549,10 @@ private final class ThemeSettingsControllerImpl: ItemListController, ThemeSettin
 }
 
 public func themeSettingsController(context: AccountContext, focusOnItemTag: ThemeSettingsEntryTag? = nil) -> ViewController {
+    #if DEBUG
+    BuiltinWallpaperData.generate(account: context.account)
+    #endif
+
     var pushControllerImpl: ((ViewController) -> Void)?
     var presentControllerImpl: ((ViewController, Any?) -> Void)?
     var updateControllersImpl: ((([UIViewController]) -> [UIViewController]) -> Void)?
@@ -598,9 +615,9 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
         let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
             return current.withUpdatedLargeEmoji(largeEmoji)
         }).start()
-    }, disableAnimations: { disableAnimations in
+    }, disableAnimations: { reduceMotion in
         let _ = updatePresentationThemeSettingsInteractively(accountManager: context.sharedContext.accountManager, { current in
-            return current.withUpdatedDisableAnimations(disableAnimations)
+            return current.withUpdatedReduceMotion(reduceMotion)
         }).start()
     }, selectAppIcon: { name in
         currentAppIconName.set(name)
@@ -831,7 +848,14 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
                 if let accentColor = accentColor, case let .theme(themeReference) = accentColor {
                     theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: themeReference)
                 } else {
-                    theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: generalThemeReference, accentColor: accentColor?.accentColor, bubbleColors: accentColor?.customBubbleColors, wallpaper: accentColor?.wallpaper)
+                    var baseColor: PresentationThemeBaseColor?
+                    switch accentColor {
+                    case let .accentColor(value):
+                        baseColor = value.baseColor
+                    default:
+                        break
+                    }
+                    theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: generalThemeReference, accentColor: accentColor?.accentColor, bubbleColors: accentColor?.customBubbleColors, wallpaper: accentColor?.wallpaper, baseColor: baseColor)
                 }
                 effectiveWallpaper = theme?.chat.defaultWallpaper ?? .builtin(WallpaperSettings())
             }
@@ -1016,17 +1040,10 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
             presentInGlobalOverlayImpl?(contextController, nil)
         })
     })
-    
-    let previousThemeReference = Atomic<PresentationThemeReference?>(value: nil)
-    let previousAccentColor = Atomic<PresentationThemeAccentColor?>(value: nil)
-    
+
     let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, context.sharedContext.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.presentationThemeSettings]), cloudThemes.get(), availableAppIcons, currentAppIconName.get(), removedThemeIndexesPromise.get())
         |> map { presentationData, sharedData, cloudThemes, availableAppIcons, currentAppIconName, removedThemeIndexes -> (ItemListControllerState, (ItemListNodeState, Any)) in
         let settings = (sharedData.entries[ApplicationSpecificSharedDataKeys.presentationThemeSettings] as? PresentationThemeSettings) ?? PresentationThemeSettings.defaultSettings
-        
-        let dateTimeFormat = presentationData.dateTimeFormat
-        let largeEmoji = presentationData.largeEmoji
-        let disableAnimations = presentationData.disableAnimations
     
         let themeReference: PresentationThemeReference
         if presentationData.autoNightModeTriggered {
@@ -1035,18 +1052,21 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
             themeReference = settings.theme
         }
         
-        let accentColor = settings.themeSpecificAccentColors[themeReference.index]
-        
         let rightNavigationButton = ItemListNavigationButton(content: .icon(.add), style: .regular, enabled: true, action: {
             moreImpl?()
         })
         
         var defaultThemes: [PresentationThemeReference] = []
         if presentationData.autoNightModeTriggered {
+            defaultThemes.append(contentsOf: [.builtin(.nightAccent), .builtin(.night)])
         } else {
-            defaultThemes.append(contentsOf: [.builtin(.dayClassic), .builtin(.day)])
+            defaultThemes.append(contentsOf: [
+                .builtin(.dayClassic),
+                .builtin(.nightAccent),
+                .builtin(.day),
+                .builtin(.night)
+            ])
         }
-        defaultThemes.append(contentsOf: [.builtin(.night), .builtin(.nightAccent)])
         
         let cloudThemes: [PresentationThemeReference] = cloudThemes.map { .cloud(PresentationCloudTheme(theme: $0, resolvedWallpaper: nil, creatorAccountId: $0.isCreator ? context.account.id : nil)) }.filter { !removedThemeIndexes.contains($0.index) }
         
@@ -1236,21 +1256,9 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
             |> mapToSignal { cachedWallpaper in
                 if let wallpaper = cachedWallpaper?.wallpaper, case let .file(file) = wallpaper {
                     let resource = file.file.resource
-                    let representation = CachedPatternWallpaperRepresentation(color: file.settings.color ?? 0xd6e2ee, bottomColor: file.settings.bottomColor, intensity: file.settings.intensity ?? 50, rotation: file.settings.rotation)
                             
                     let _ = fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)).start()
 
-                    let _ = (context.account.postbox.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: false, fetch: true)
-                    |> filter({ $0.complete })).start(next: { data in
-                        if data.complete, let path = context.account.postbox.mediaBox.completedResourcePath(resource) {
-                            if let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
-                                context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: maybeData, synchronous: true)
-                            }
-                            if let maybeData = try? Data(contentsOf: URL(fileURLWithPath: data.path), options: .mappedRead) {
-                                context.sharedContext.accountManager.mediaBox.storeCachedResourceRepresentation(resource, representation: representation, data: maybeData)
-                            }
-                        }
-                    })
                     return .single(wallpaper)
     
                 } else {
@@ -1285,7 +1293,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
                     updatedTheme = generalThemeReference
                 }
                 
-                guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: generalThemeReference, accentColor: accentColor?.color, wallpaper: presetWallpaper) else {
+                guard let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: generalThemeReference, accentColor: accentColor?.color, wallpaper: presetWallpaper, baseColor: accentColor?.baseColor) else {
                     return current
                 }
                 
@@ -1304,7 +1312,7 @@ public func themeSettingsController(context: AccountContext, focusOnItemTag: The
                     }
                 }
                 
-                return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                return PresentationThemeSettings(theme: updatedTheme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: updatedAutomaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
             }).start()
             
             presentCrossfadeControllerImpl?(true)
diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift
index 67f48a9bc6..db8b0f5436 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift
@@ -249,11 +249,15 @@ private final class ThemeSettingsThemeItemIconNode : ListViewItemNode {
             var updatedThemeReference = false
             var updatedAccentColor = false
             var updatedTheme = false
+            var updatedWallpaper = false
             var updatedSelected = false
             
             if currentItem?.themeReference != item.themeReference {
                 updatedThemeReference = true
             }
+            if currentItem?.wallpaper != item.wallpaper {
+                updatedWallpaper = true
+            }
             if currentItem == nil || currentItem?.accentColor != item.accentColor {
                 updatedAccentColor = true
             }
@@ -278,7 +282,7 @@ private final class ThemeSettingsThemeItemIconNode : ListViewItemNode {
                         }
                         strongSelf.containerNode.isGestureEnabled = false
                     } else {
-                        if updatedThemeReference || updatedAccentColor {
+                        if updatedThemeReference || updatedAccentColor || updatedWallpaper {
                             strongSelf.imageNode.setSignal(themeIconImage(account: item.context.account, accountManager: item.context.sharedContext.accountManager, theme: item.themeReference, color: item.accentColor, wallpaper: item.wallpaper))
                         }
                         strongSelf.containerNode.isGestureEnabled = true
@@ -545,8 +549,6 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode {
 
             return (layout, { [weak self] in
                 if let strongSelf = self {
-                    let isFirstLayout = currentItem == nil
-                    
                     strongSelf.item = item
                     strongSelf.layoutParams = params
 
@@ -614,27 +616,37 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode {
                     var entries: [ThemeSettingsThemeEntry] = []
                     var index: Int = 0
                     for var theme in item.themes {
-                        if !item.displayUnsupported, case let .cloud(theme) = theme, theme.theme.file == nil {
-                            continue
+                        if case let .cloud(theme) = theme {
+                            if !item.displayUnsupported && theme.theme.file == nil {
+                                continue
+                            }
                         }
                         let title = themeDisplayName(strings: item.strings, reference: theme)
                         var accentColor = item.themeSpecificAccentColors[theme.generalThemeReference.index]
-                        if let customThemeIndex = accentColor?.themeIndex {
+                        /*if let customThemeIndex = accentColor?.themeIndex {
                             if let customTheme = themes[customThemeIndex] {
                                 theme = customTheme
                             }
                             accentColor = nil
+                        }*/
+
+                        var themeWallpaper: TelegramWallpaper?
+                        if case let .cloud(theme) = theme {
+                            themeWallpaper = theme.resolvedWallpaper ?? theme.theme.settings?.wallpaper
                         }
+
+                        let customWallpaper = item.themeSpecificChatWallpapers[theme.generalThemeReference.index]
                         
-                        let wallpaper = accentColor?.wallpaper
+                        let wallpaper = accentColor?.wallpaper ?? customWallpaper ?? themeWallpaper
+
                         entries.append(ThemeSettingsThemeEntry(index: index, themeReference: theme, title: title, accentColor: accentColor, selected: item.currentTheme.index == theme.index, theme: item.theme, wallpaper: wallpaper))
                         index += 1
                     }
                     
-                    let action: (PresentationThemeReference) -> Void = { [weak self, weak item] themeReference in
+                    let action: (PresentationThemeReference) -> Void = { [weak self] themeReference in
                         if let strongSelf = self {
                             strongSelf.item?.updatedTheme(themeReference)
-                            ensureThemeVisible(listNode: strongSelf.listNode, themeReference: themeReference, animated: true)
+                            let _ = ensureThemeVisible(listNode: strongSelf.listNode, themeReference: themeReference, animated: true)
                         }
                     }
                     let previousEntries = strongSelf.entries ?? []
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift
index 3bb307b4ab..7d1f6b29c5 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperColorPanelNode.swift
@@ -33,13 +33,6 @@ private func textInputBackgroundImage(fieldColor: UIColor, strokeColor: UIColor,
 
 private func generateSwatchBorderImage(theme: PresentationTheme) -> UIImage? {
     return nil
-    return generateImage(CGSize(width: 21.0, height: 21.0), rotatedContext: { size, context in
-        let bounds = CGRect(origin: CGPoint(), size: size)
-        context.clear(bounds)
-        context.setLineWidth(1.0)
-        context.setStrokeColor(theme.chat.inputPanel.inputControlColor.cgColor)
-        context.strokeEllipse(in: bounds.insetBy(dx: 1.0, dy: 1.0))
-    })
 }
 
 private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
@@ -61,7 +54,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
     var colorSelected: (() -> Void)?
     
     private var color: UIColor?
-    
+
     private var isDefault = false {
         didSet {
             self.updateSelectionVisibility()
@@ -73,25 +66,19 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
             self.removeButton.isUserInteractionEnabled = self.isRemovable
         }
     }
-    
-    var isSelected: Bool = false {
-        didSet {
-            self.updateSelectionVisibility()
-            self.gestureRecognizer?.isEnabled = !self.isSelected
-            if !self.isSelected {
-                self.textFieldNode.textField.resignFirstResponder()
-            }
-        }
-    }
    
     private var previousIsDefault: Bool?
     private var previousColor: UIColor?
     private var validLayout: (CGSize, Bool)?
     
     private var skipEndEditing = false
+
+    private let displaySwatch: Bool
     
-    init(theme: PresentationTheme) {
+    init(theme: PresentationTheme, displaySwatch: Bool = true) {
         self.theme = theme
+
+        self.displaySwatch = displaySwatch
         
         self.textBackgroundNode = ASImageNode()
         self.textBackgroundNode.image = textInputBackgroundImage(fieldColor: theme.chat.inputPanel.inputBackgroundColor, strokeColor: theme.chat.inputPanel.inputStrokeColor, diameter: 33.0)
@@ -148,7 +135,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         self.textFieldNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
         self.textFieldNode.textField.tintColor = self.theme.list.itemAccentColor
         
-        let gestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapped))
+        let gestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(self.tapped(_:)))
         self.view.addGestureRecognizer(gestureRecognizer)
         self.gestureRecognizer = gestureRecognizer
     }
@@ -201,12 +188,12 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         }
         
         self.colorRemoved?()
-        self.removeButton.layer.removeAnimation(forKey: "opacity")
-        self.removeButton.alpha = 1.0
     }
     
-    @objc private func tapped() {
-        self.colorSelected?()
+    @objc private func tapped(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.colorSelected?()
+        }
     }
         
     @objc internal func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
@@ -249,18 +236,13 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
     }
     
     func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool {
-        if self.isSelected {
-            self.skipEndEditing = false
-            self.previousColor = self.color
-            self.previousIsDefault = self.isDefault
-            
-            textField.textColor = self.theme.chat.inputPanel.inputTextColor
-            
-            return true
-        } else {
-            self.colorSelected?()
-            return false
-        }
+        self.skipEndEditing = false
+        self.previousColor = self.color
+        self.previousIsDefault = self.isDefault
+
+        textField.textColor = self.theme.chat.inputPanel.inputTextColor
+
+        return true
     }
     
     @objc func textFieldDidEndEditing(_ textField: UITextField) {
@@ -294,7 +276,7 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
     }
     
     private func updateSelectionVisibility() {
-        self.selectionNode.isHidden = !self.isSelected || self.isDefault
+        self.selectionNode.isHidden = true
     }
     
     func updateLayout(size: CGSize, condensed: Bool, transition: ContainedViewLayoutTransition) {
@@ -303,8 +285,15 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         let swatchFrame = CGRect(origin: CGPoint(x: 6.0, y: 6.0), size: CGSize(width: 21.0, height: 21.0))
         transition.updateFrame(node: self.swatchNode, frame: swatchFrame)
         transition.updateFrame(node: self.borderNode, frame: swatchFrame)
+
+        self.swatchNode.isHidden = !self.displaySwatch
         
-        let textPadding: CGFloat = condensed ? 31.0 : 37.0
+        let textPadding: CGFloat
+        if self.displaySwatch {
+            textPadding = condensed ? 31.0 : 37.0
+        } else {
+            textPadding = 12.0
+        }
         
         transition.updateFrame(node: self.textBackgroundNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height))
         transition.updateFrame(node: self.textFieldNode, frame: CGRect(x: textPadding + 10.0, y: 1.0, width: size.width - (21.0 + textPadding), height: size.height - 2.0))
@@ -317,45 +306,91 @@ private class ColorInputFieldNode: ASDisplayNode, UITextFieldDelegate {
         let removeSize = CGSize(width: 33.0, height: 33.0)
         let removeOffset: CGFloat = condensed ? 3.0 : 0.0
         transition.updateFrame(node: self.removeButton, frame: CGRect(origin: CGPoint(x: size.width - removeSize.width + removeOffset, y: 0.0), size: removeSize))
-        transition.updateAlpha(node: self.removeButton, alpha: self.isRemovable ? 1.0 : 0.0)
+        self.removeButton.alpha = self.isRemovable ? 1.0 : 0.0
     }
 }
 
-enum WallpaperColorPanelNodeSelectionState {
-    case none
-    case first
-    case second
-}
-
-struct WallpaperColorPanelNodeState {
-    var selection: WallpaperColorPanelNodeSelectionState
-    var firstColor: UIColor?
-    var defaultColor: UIColor?
-    var secondColor: UIColor?
-    var secondColorAvailable: Bool
+struct WallpaperColorPanelNodeState: Equatable {
+    var selection: Int?
+    var colors: [UInt32]
+    var maximumNumberOfColors: Int
     var rotateAvailable: Bool
     var rotation: Int32
     var preview: Bool
     var simpleGradientGeneration: Bool
 }
 
+private final class ColorSampleItemNode: ASImageNode {
+    private struct State: Equatable {
+        var color: UInt32
+        var size: CGSize
+        var isSelected: Bool
+    }
+
+    private var action: () -> Void
+    private var validState: State?
+
+    init(action: @escaping () -> Void) {
+        self.action = action
+
+        super.init()
+
+        self.isUserInteractionEnabled = true
+        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
+    }
+
+    @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.action()
+        }
+    }
+
+    func update(size: CGSize, color: UIColor, isSelected: Bool) {
+        let state = State(color: color.rgb, size: size, isSelected: isSelected)
+        if self.validState != state {
+            self.validState = state
+
+            self.image = generateImage(CGSize(width: size.width, height: size.height), rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                context.setFillColor(color.cgColor)
+                context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+
+                context.setBlendMode(.softLight)
+                context.setStrokeColor(UIColor(white: 0.0, alpha: 0.3).cgColor)
+                context.setLineWidth(UIScreenPixel)
+                context.strokeEllipse(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: UIScreenPixel, dy: UIScreenPixel))
+
+                if isSelected {
+                    context.setBlendMode(.copy)
+                    context.setStrokeColor(UIColor.clear.cgColor)
+                    let lineWidth: CGFloat = 2.0
+                    context.setLineWidth(lineWidth)
+                    let inset: CGFloat = 2.0 + lineWidth / 2.0
+                    context.strokeEllipse(in: CGRect(origin: CGPoint(), size: size).insetBy(dx: inset, dy: inset))
+                }
+            })
+        }
+    }
+}
+
 final class WallpaperColorPanelNode: ASDisplayNode {
     private var theme: PresentationTheme
      
     private var state: WallpaperColorPanelNodeState
     
-    private let backgroundNode: ASDisplayNode
+    private let backgroundNode: NavigationBackgroundNode
     private let topSeparatorNode: ASDisplayNode
     private let bottomSeparatorNode: ASDisplayNode
-    private let firstColorFieldNode: ColorInputFieldNode
-    private let secondColorFieldNode: ColorInputFieldNode
     private let rotateButton: HighlightableButtonNode
     private let swapButton: HighlightableButtonNode
     private let addButton: HighlightableButtonNode
     private let doneButton: HighlightableButtonNode
     private let colorPickerNode: WallpaperColorPickerNode
 
-    var colorsChanged: ((UIColor?, UIColor?, Bool) -> Void)?
+    private var sampleItemNodes: [ColorSampleItemNode] = []
+    private let multiColorFieldNode: ColorInputFieldNode
+
+    var colorsChanged: (([UInt32], Bool) -> Void)?
     var colorSelected: (() -> Void)?
     var rotate: (() -> Void)?
     
@@ -367,8 +402,7 @@ final class WallpaperColorPanelNode: ASDisplayNode {
     init(theme: PresentationTheme, strings: PresentationStrings) {
         self.theme = theme
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor
+        self.backgroundNode = NavigationBackgroundNode(color: theme.chat.inputPanel.panelBackgroundColor)
         
         self.topSeparatorNode = ASDisplayNode()
         self.topSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor
@@ -386,19 +420,25 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         self.swapButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorSwapIcon"), color: theme.chat.inputPanel.panelControlColor), for: .normal)
         self.addButton = HighlightableButtonNode()
         self.addButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorAddIcon"), color: theme.chat.inputPanel.panelControlColor), for: .normal)
+
+        self.multiColorFieldNode = ColorInputFieldNode(theme: theme, displaySwatch: false)
         
-        self.firstColorFieldNode = ColorInputFieldNode(theme: theme)
-        self.secondColorFieldNode = ColorInputFieldNode(theme: theme)
-        
-        self.state = WallpaperColorPanelNodeState(selection: .first, firstColor: nil, secondColor: nil, secondColorAvailable: false, rotateAvailable: false, rotation: 0, preview: false, simpleGradientGeneration: false)
+        self.state = WallpaperColorPanelNodeState(
+            selection: 0,
+            colors: [],
+            maximumNumberOfColors: 1,
+            rotateAvailable: false,
+            rotation: 0,
+            preview: false,
+            simpleGradientGeneration: false
+        )
         
         super.init()
         
         self.addSubnode(self.backgroundNode)
         self.addSubnode(self.topSeparatorNode)
         self.addSubnode(self.bottomSeparatorNode)
-        self.addSubnode(self.firstColorFieldNode)
-        self.addSubnode(self.secondColorFieldNode)
+        self.addSubnode(self.multiColorFieldNode)
         self.addSubnode(self.doneButton)
         self.addSubnode(self.colorPickerNode)
         
@@ -409,79 +449,34 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         self.rotateButton.addTarget(self, action: #selector(self.rotatePressed), forControlEvents: .touchUpInside)
         self.swapButton.addTarget(self, action: #selector(self.swapPressed), forControlEvents: .touchUpInside)
         self.addButton.addTarget(self, action: #selector(self.addPressed), forControlEvents: .touchUpInside)
-        
-        self.firstColorFieldNode.colorChanged = { [weak self] color, ended in
+
+        self.multiColorFieldNode.colorChanged = { [weak self] color, ended in
             if let strongSelf = self {
                 strongSelf.updateState({ current in
                     var updated = current
-                    updated.firstColor = color
+                    updated.preview = !ended
+                    if let index = strongSelf.state.selection {
+                        updated.colors[index] = color.rgb
+                    }
                     return updated
                 })
             }
         }
-        self.firstColorFieldNode.colorRemoved = { [weak self] in
+        self.multiColorFieldNode.colorRemoved = { [weak self] in
             if let strongSelf = self {
                 strongSelf.colorRemoved?()
                 strongSelf.updateState({ current in
                     var updated = current
-                    updated.selection = .first
-                    if let defaultColor = current.defaultColor, updated.secondColor == nil {
-                        updated.firstColor = nil
-                    } else {
-                        updated.firstColor = updated.secondColor ?? updated.firstColor
-                    }
-                    updated.secondColor = nil
-                    return updated
-                }, animated: strongSelf.state.secondColor != nil)
-            }
-        }
-        self.firstColorFieldNode.colorSelected = { [weak self] in
-            if let strongSelf = self {
-                strongSelf.secondColorFieldNode.setSkipEndEditingIfNeeded()
-                strongSelf.updateState({ current in
-                    var updated = current
-                    if updated.selection != .none {
-                        updated.selection = .first
+                    if let index = strongSelf.state.selection {
+                        updated.colors.remove(at: index)
+                        if updated.colors.isEmpty {
+                            updated.selection = nil
+                        } else {
+                            updated.selection = max(0, min(index - 1, updated.colors.count - 1))
+                        }
                     }
                     return updated
-                })
-                
-                strongSelf.colorSelected?()
-            }
-        }
-        
-        self.secondColorFieldNode.colorChanged = { [weak self] color, ended in
-            if let strongSelf = self {
-                strongSelf.updateState({ current in
-                    var updated = current
-                    updated.secondColor = color
-                    return updated
-                })
-            }
-        }
-        self.secondColorFieldNode.colorRemoved = { [weak self] in
-            if let strongSelf = self {
-                strongSelf.colorRemoved?()
-                strongSelf.updateState({ current in
-                    var updated = current
-                    if updated.selection != .none {
-                        updated.selection = .first
-                    }
-                    updated.secondColor = nil
-                    return updated
-                })
-            }
-        }
-        self.secondColorFieldNode.colorSelected = { [weak self] in
-            if let strongSelf = self {
-                strongSelf.firstColorFieldNode.setSkipEndEditingIfNeeded()
-                strongSelf.updateState({ current in
-                    var updated = current
-                    updated.selection = .second
-                    return updated
-                })
-                
-                strongSelf.colorSelected?()
+                }, animated: strongSelf.state.colors.count >= 2)
             }
         }
         
@@ -490,13 +485,8 @@ final class WallpaperColorPanelNode: ASDisplayNode {
                 strongSelf.updateState({ current in
                     var updated = current
                     updated.preview = true
-                    switch strongSelf.state.selection {
-                        case .first:
-                            updated.firstColor = color
-                        case .second:
-                            updated.secondColor = color
-                        default:
-                            break
+                    if let index = strongSelf.state.selection {
+                        updated.colors[index] = color.rgb
                     }
                     return updated
                 }, updateLayout: false)
@@ -507,13 +497,8 @@ final class WallpaperColorPanelNode: ASDisplayNode {
                 strongSelf.updateState({ current in
                     var updated = current
                     updated.preview = false
-                    switch strongSelf.state.selection {
-                        case .first:
-                            updated.firstColor = color
-                        case .second:
-                            updated.secondColor = color
-                        default:
-                            break
+                    if let index = strongSelf.state.selection {
+                        updated.colors[index] = color.rgb
                     }
                     return updated
                 }, updateLayout: false)
@@ -523,125 +508,49 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         
     func updateTheme(_ theme: PresentationTheme) {
         self.theme = theme
-        self.backgroundNode.backgroundColor = self.theme.chat.inputPanel.panelBackgroundColor
+        self.backgroundNode.updateColor(color: self.theme.chat.inputPanel.panelBackgroundColor, transition: .immediate)
         self.topSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor
         self.bottomSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor
-        self.firstColorFieldNode.updateTheme(theme)
-        self.secondColorFieldNode.updateTheme(theme)
+        self.multiColorFieldNode.updateTheme(theme)
     }
     
     func updateState(_ f: (WallpaperColorPanelNodeState) -> WallpaperColorPanelNodeState, updateLayout: Bool = true, animated: Bool = true) {
         var updateLayout = updateLayout
-        let previousFirstColor = self.state.firstColor
-        let previousSecondColor = self.state.secondColor
+        let previousColors = self.state.colors
         let previousPreview = self.state.preview
-        let previousRotation = self.state.rotation
         self.state = f(self.state)
         
-        let firstColor: UIColor
-        var firstColorIsDefault = false
-        if let color = self.state.firstColor {
-            firstColor = color
-        } else if let defaultColor = self.state.defaultColor {
-            firstColor = defaultColor
-            firstColorIsDefault = true
-        } else {
-            firstColor = .white
-        }
-        let secondColor = self.state.secondColor
-        
-        if secondColor == nil && previousSecondColor != nil && firstColor == previousSecondColor && animated {
-            self.animateLeftColorFieldOut()
-        }
-        
-        self.firstColorFieldNode.setColor(firstColor, isDefault: self.state.firstColor == nil, update: false)
-        if let secondColor = secondColor {
-            self.secondColorFieldNode.setColor(secondColor, update: false)
-        }
-        
-        var firstColorWasRemovable = self.firstColorFieldNode.isRemovable
-        self.firstColorFieldNode.isRemovable = self.state.secondColor != nil || (self.state.defaultColor != nil && self.state.firstColor != nil)
-        if firstColorWasRemovable != self.firstColorFieldNode.isRemovable {
+        let colorWasRemovable = self.multiColorFieldNode.isRemovable
+        self.multiColorFieldNode.isRemovable = self.state.colors.count > 1
+        if colorWasRemovable != self.multiColorFieldNode.isRemovable {
             updateLayout = true
         }
+
+        if let index = self.state.selection {
+            if self.state.colors.count > index {
+                self.colorPickerNode.color = UIColor(rgb: self.state.colors[index])
+            }
+        }
     
         if updateLayout, let size = self.validLayout {
-            switch self.state.selection {
-                case .first:
-                    self.colorPickerNode.color = firstColor
-                case .second:
-                    if let secondColor = secondColor {
-                        self.colorPickerNode.color = secondColor
-                    }
-                default:
-                    break
-            }
-            
             self.updateLayout(size: size, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)
         }
-        
-        if self.state.firstColor?.argb != previousFirstColor?.argb || self.state.secondColor?.argb != previousSecondColor?.argb || self.state.preview != previousPreview {
-            self.colorsChanged?(firstColorIsDefault ? nil : firstColor, secondColor, !self.state.preview)
-        }
-    }
-    
-    private func animateLeftColorFieldOut() {
-        guard let size = self.validLayout else {
-            return
-        }
-        
-        let condensedLayout = size.width < 375.0
-        let leftInset: CGFloat
-        let fieldSpacing: CGFloat
-        if condensedLayout {
-            leftInset = 6.0
-            fieldSpacing = 40.0
-        } else {
-            leftInset = 15.0
-            fieldSpacing = 45.0
-        }
-        let rightInsetWithButton: CGFloat = 42.0
-        
-        let offset: CGFloat = -(self.secondColorFieldNode.frame.minX - leftInset)
-        
-        if let fieldSnapshotView = self.firstColorFieldNode.view.snapshotView(afterScreenUpdates: false) {
-            fieldSnapshotView.frame = self.firstColorFieldNode.frame
-            self.view.addSubview(fieldSnapshotView)
-            
-            fieldSnapshotView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: offset, y: 0.0), duration: 0.3, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true, force: false) { _ in
-                fieldSnapshotView.removeFromSuperview()
+
+        if let index = state.selection {
+            if self.state.colors.count > index {
+                self.multiColorFieldNode.setColor(UIColor(rgb: self.state.colors[index]), update: false)
             }
         }
-        
-        let middleButton: ASDisplayNode
-        if self.rotateButton.alpha > 1.0 {
-            middleButton = self.rotateButton
-        } else {
-            middleButton = self.swapButton
-        }
-        if let buttonSnapshotView = middleButton.view.snapshotContentTree() {
-            buttonSnapshotView.frame = middleButton.frame
-            self.view.addSubview(buttonSnapshotView)
-            
-            buttonSnapshotView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: offset, y: 0.0), duration: 0.3, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, additive: true, force: false) { _ in
-                buttonSnapshotView.removeFromSuperview()
+
+        for i in 0 ..< state.colors.count {
+            if i < self.sampleItemNodes.count {
+                self.sampleItemNodes[i].update(size: self.sampleItemNodes[i].bounds.size, color: UIColor(rgb: state.colors[i]), isSelected: state.selection == i)
             }
         }
-        
-        self.rotateButton.alpha = 0.0
-        self.swapButton.alpha = 0.0
-        
-        let buttonOffset: CGFloat = (rightInsetWithButton - 13.0) / 2.0
-        var buttonFrame = self.addButton.frame
-        buttonFrame.origin.x = size.width
-        self.addButton.frame = buttonFrame
-        self.addButton.alpha = 1.0
-        
-        self.firstColorFieldNode.frame = self.secondColorFieldNode.frame
-        
-        var fieldFrame = self.secondColorFieldNode.frame
-        fieldFrame.origin.x = fieldFrame.maxX + fieldSpacing
-        self.secondColorFieldNode.frame = fieldFrame
+
+        if self.state.colors != previousColors || self.state.preview != previousPreview {
+            self.colorsChanged?(self.state.colors, !self.state.preview)
+        }
     }
     
     func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
@@ -651,6 +560,7 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         let separatorHeight = UIScreenPixel
         let topPanelHeight: CGFloat = 47.0
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: topPanelHeight))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
         transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: separatorHeight))
         transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(x: 0.0, y: topPanelHeight, width: size.width, height: separatorHeight))
         
@@ -671,13 +581,18 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         
         let buttonSize = CGSize(width: 26.0, height: 26.0)
         let buttonOffset: CGFloat = (rightInsetWithButton - 13.0) / 2.0
-        let middleButtonFrame = CGRect(origin: CGPoint(x: self.state.secondColor != nil ? floor((size.width - 26.0) / 2.0) : (self.state.secondColorAvailable ? size.width - rightInsetWithButton + floor((rightInsetWithButton - buttonSize.width) / 2.0) : size.width + buttonOffset), y: floor((topPanelHeight - buttonSize.height) / 2.0)), size: buttonSize)
+        //let middleButtonFrame = CGRect(origin: CGPoint(x: self.state.secondColor != nil ? floor((size.width - 26.0) / 2.0) : (self.state.secondColorAvailable ? size.width - rightInsetWithButton + floor((rightInsetWithButton - buttonSize.width) / 2.0) : size.width + buttonOffset), y: floor((topPanelHeight - buttonSize.height) / 2.0)), size: buttonSize)
         
-        transition.updateFrame(node: self.rotateButton, frame: middleButtonFrame)
-        transition.updateFrame(node: self.swapButton, frame: middleButtonFrame)
-        transition.updateFrame(node: self.addButton, frame: middleButtonFrame)
+        //transition.updateFrame(node: self.rotateButton, frame: middleButtonFrame)
+        //transition.updateFrame(node: self.swapButton, frame: middleButtonFrame)
+
+        let canAddColors = self.state.colors.count < self.state.maximumNumberOfColors
+
+        transition.updateFrame(node: self.addButton, frame: CGRect(origin: CGPoint(x: size.width - rightInset - buttonSize.width, y: floor((topPanelHeight - buttonSize.height) / 2.0)), size: buttonSize))
+        transition.updateAlpha(node: self.addButton, alpha: canAddColors ? 1.0 : 0.0)
+        transition.updateSublayerTransformScale(node: self.addButton, scale: canAddColors ? 1.0 : 0.1)
         
-        let rotateButtonAlpha: CGFloat
+        /*let rotateButtonAlpha: CGFloat
         let swapButtonAlpha: CGFloat
         let addButtonAlpha: CGFloat
         if let _ = self.state.secondColor {
@@ -700,10 +615,9 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         }
         transition.updateAlpha(node: self.rotateButton, alpha: rotateButtonAlpha)
         transition.updateAlpha(node: self.swapButton, alpha: swapButtonAlpha)
-        transition.updateAlpha(node: self.addButton, alpha: addButtonAlpha)
+        transition.updateAlpha(node: self.addButton, alpha: addButtonAlpha)*/
         
-        func degreesToRadians(_ degrees: CGFloat) -> CGFloat
-        {
+        func degreesToRadians(_ degrees: CGFloat) -> CGFloat {
             var degrees = degrees
             if degrees >= 270.0 {
                 degrees = degrees - 360.0
@@ -712,20 +626,67 @@ final class WallpaperColorPanelNode: ASDisplayNode {
         }
 
         transition.updateTransformRotation(node: self.rotateButton, angle: degreesToRadians(CGFloat(self.state.rotation)), beginWithCurrentState: true, completion: nil)
-        
-        self.firstColorFieldNode.isRemovable = self.state.secondColor != nil || (self.state.defaultColor != nil && self.state.firstColor != nil)
-        self.secondColorFieldNode.isRemovable = true
-        
-        self.firstColorFieldNode.isSelected = self.state.selection == .first
-        self.secondColorFieldNode.isSelected = self.state.selection == .second
-        
-        let firstFieldFrame = CGRect(x: leftInset, y: (topPanelHeight - fieldHeight) / 2.0, width: self.state.secondColor != nil ? floorToScreenPixels((size.width - fieldSpacing) / 2.0) - leftInset : size.width - leftInset - (self.state.secondColorAvailable ? rightInsetWithButton : rightInset), height: fieldHeight)
-        transition.updateFrame(node: self.firstColorFieldNode, frame: firstFieldFrame)
-        self.firstColorFieldNode.updateLayout(size: firstFieldFrame.size, condensed: condensedLayout, transition: transition)
-        
-        let secondFieldFrame = CGRect(x: firstFieldFrame.maxX + fieldSpacing, y: (topPanelHeight - fieldHeight) / 2.0, width: firstFieldFrame.width, height: fieldHeight)
-        transition.updateFrame(node: self.secondColorFieldNode, frame: secondFieldFrame)
-        self.secondColorFieldNode.updateLayout(size: secondFieldFrame.size, condensed: condensedLayout, transition: transition)
+
+        self.rotateButton.isHidden = true
+        self.swapButton.isHidden = true
+        self.multiColorFieldNode.isHidden = false
+
+        let sampleItemSize: CGFloat = 32.0
+        let sampleItemSpacing: CGFloat = 15.0
+
+        var nextSampleX = leftInset
+
+        for i in 0 ..< self.state.colors.count {
+            var animateIn = false
+            let itemNode: ColorSampleItemNode
+            if self.sampleItemNodes.count > i {
+                itemNode = self.sampleItemNodes[i]
+            } else {
+                itemNode = ColorSampleItemNode(action: { [weak self] in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    let index = i
+                    strongSelf.updateState({ state in
+                        var state = state
+                        state.selection = index
+                        return state
+                    })
+                })
+                self.sampleItemNodes.append(itemNode)
+                self.insertSubnode(itemNode, aboveSubnode: self.multiColorFieldNode)
+                animateIn = true
+            }
+
+            if i != 0 {
+                nextSampleX += sampleItemSpacing
+            }
+            itemNode.frame = CGRect(origin: CGPoint(x: nextSampleX, y: (topPanelHeight - sampleItemSize) / 2.0), size: CGSize(width: sampleItemSize, height: sampleItemSize))
+            nextSampleX += sampleItemSize
+            itemNode.update(size: itemNode.bounds.size, color: UIColor(rgb: self.state.colors[i]), isSelected: self.state.selection == i)
+
+            if animateIn {
+                transition.animateTransformScale(node: itemNode, from: 0.1)
+                itemNode.alpha = 0.0
+                transition.updateAlpha(node: itemNode, alpha: 1.0)
+            }
+        }
+        if self.sampleItemNodes.count > self.state.colors.count {
+            for i in self.state.colors.count ..< self.sampleItemNodes.count {
+                let itemNode = self.sampleItemNodes[i]
+                transition.updateTransformScale(node: itemNode, scale: 0.1)
+                transition.updateAlpha(node: itemNode, alpha: 0.0, completion: { [weak itemNode] _ in
+                    itemNode?.removeFromSupernode()
+                })
+            }
+            self.sampleItemNodes.removeSubrange(self.state.colors.count ..< self.sampleItemNodes.count)
+        }
+
+        let fieldX = nextSampleX + sampleItemSpacing
+
+        let fieldFrame = CGRect(x: fieldX, y: (topPanelHeight - fieldHeight) / 2.0, width: size.width - fieldX - leftInset - (canAddColors ? (buttonSize.width + sampleItemSpacing) : 0.0), height: fieldHeight)
+        transition.updateFrame(node: self.multiColorFieldNode, frame: fieldFrame)
+        self.multiColorFieldNode.updateLayout(size: fieldFrame.size, condensed: false, transition: transition)
         
         let colorPickerSize = CGSize(width: size.width, height: size.height - topPanelHeight - separatorHeight)
         transition.updateFrame(node: self.colorPickerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: topPanelHeight + separatorHeight), size: colorPickerSize))
@@ -746,25 +707,53 @@ final class WallpaperColorPanelNode: ASDisplayNode {
     }
     
     @objc private func swapPressed() {
-        self.updateState({ current in
+        /*self.updateState({ current in
             var updated = current
             if let secondColor = current.secondColor {
                 updated.firstColor = secondColor
                 updated.secondColor = current.firstColor
             }
             return updated
-        })
+        })*/
     }
     
     @objc private func addPressed() {
         self.colorSelected?()
         self.colorAdded?()
+
+        self.multiColorFieldNode.setSkipEndEditingIfNeeded()
+
+        self.updateState({ current in
+            var current = current
+            if current.colors.count < current.maximumNumberOfColors {
+                if current.colors.isEmpty {
+                    current.colors.append(0xffffff)
+                } else if current.simpleGradientGeneration {
+                    var hsb = UIColor(rgb: current.colors[0]).hsb
+                    if hsb.1 > 0.5 {
+                        hsb.1 -= 0.15
+                    } else {
+                        hsb.1 += 0.15
+                    }
+                    if hsb.0 > 0.5 {
+                        hsb.0 -= 0.05
+                    } else {
+                        hsb.0 += 0.05
+                    }
+                    current.colors.append(UIColor(hue: hsb.0, saturation: hsb.1, brightness: hsb.2, alpha: 1.0).rgb)
+                } else {
+                    current.colors.append(current.colors[current.colors.count - 1])
+                }
+                current.selection = current.colors.count - 1
+            }
+            return current
+        })
         
-        self.firstColorFieldNode.setSkipEndEditingIfNeeded()
+        /*self.firstColorFieldNode.setSkipEndEditingIfNeeded()
         
         self.updateState({ current in
             var updated = current
-            updated.selection = .second
+            updated.selection = .index(1)
             
             let firstColor = current.firstColor ?? current.defaultColor
             if let color = firstColor {
@@ -790,6 +779,13 @@ final class WallpaperColorPanelNode: ASDisplayNode {
             }
 
             return updated
-        })
+        })*/
+    }
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if let result = super.hitTest(point, with: event) {
+            return result
+        }
+        return nil
     }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperColorPickerNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorPickerNode.swift
index cf89d9b0d7..48b935af57 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperColorPickerNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperColorPickerNode.swift
@@ -238,6 +238,7 @@ final class WallpaperColorPickerNode: ASDisplayNode {
         self.brightnessNode.hitTestSlop = UIEdgeInsets(top: -16.0, left: -16.0, bottom: -16.0, right: -16.0)
         self.brightnessKnobNode = ASImageNode()
         self.brightnessKnobNode.image = pointerImage
+        self.brightnessKnobNode.isUserInteractionEnabled = false
         self.colorNode = WallpaperColorHueSaturationNode()
         self.colorNode.hitTestSlop = UIEdgeInsets(top: -16.0, left: -16.0, bottom: -16.0, right: -16.0)
         self.colorKnobNode = WallpaperColorKnobNode()
diff --git a/Telegram/SupportFiles/Empty.swift b/submodules/SettingsUI/Sources/Themes/WallpaperColorsPanelNode.swift
similarity index 100%
rename from Telegram/SupportFiles/Empty.swift
rename to submodules/SettingsUI/Sources/Themes/WallpaperColorsPanelNode.swift
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
index 7924a034f8..9973dfafe9 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryController.swift
@@ -25,8 +25,8 @@ public enum WallpaperListType {
 
 public enum WallpaperListSource {
     case list(wallpapers: [TelegramWallpaper], central: TelegramWallpaper, type: WallpaperListType)
-    case wallpaper(TelegramWallpaper, WallpaperPresentationOptions?, UIColor?, UIColor?, Int32?, Int32?, Message?)
-    case slug(String, TelegramMediaFile?, WallpaperPresentationOptions?, UIColor?, UIColor?, Int32?, Int32?, Message?)
+    case wallpaper(TelegramWallpaper, WallpaperPresentationOptions?, [UInt32], Int32?, Int32?, Message?)
+    case slug(String, TelegramMediaFile?, WallpaperPresentationOptions?, [UInt32], Int32?, Int32?, Message?)
     case asset(PHAsset)
     case contextResult(ChatContextResult)
     case customColor(UInt32?)
@@ -89,6 +89,8 @@ class WallpaperGalleryOverlayNode: ASDisplayNode {
 }
 
 class WallpaperGalleryControllerNode: GalleryControllerNode {
+    var nativeStatusBar: StatusBar?
+
     override func updateDistanceFromEquilibrium(_ value: CGFloat) {
         guard let itemNode = self.pager.centralItemNode() as? WallpaperGalleryItemNode else {
             return
@@ -96,36 +98,63 @@ class WallpaperGalleryControllerNode: GalleryControllerNode {
         
         itemNode.updateDismissTransition(value)
     }
+
+    override func didLoad() {
+        super.didLoad()
+
+        //self.view.addGestureRecognizer(UILongPressGestureRecognizer(target: self, action: #selector(self.longPressGesture(_:))))
+    }
+
+    @objc private func longPressGesture(_ recognizer: UILongPressGestureRecognizer) {
+        switch recognizer.state {
+        case .began:
+            self.setControlsHidden(true, animated: false)
+
+            self.overlayNode?.alpha = 0.0
+            self.nativeStatusBar?.updateAlpha(0.0, transition: .immediate)
+
+            if let itemNode = self.pager.centralItemNode() as? WallpaperGalleryItemNode {
+                itemNode.updateDismissTransition(self.bounds.size.height)
+            }
+        case .ended, .cancelled:
+            self.setControlsHidden(false, animated: false)
+
+            self.overlayNode?.alpha = 1.0
+            self.nativeStatusBar?.updateAlpha(1.0, transition: .immediate)
+
+            if let itemNode = self.pager.centralItemNode() as? WallpaperGalleryItemNode {
+                itemNode.updateDismissTransition(0.0)
+            }
+        default:
+            break
+        }
+    }
 }
 
-private func updatedFileWallpaper(wallpaper: TelegramWallpaper, firstColor: UIColor?, secondColor: UIColor?, intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
+private func updatedFileWallpaper(wallpaper: TelegramWallpaper, colors: [UInt32], intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
     if case let .file(file) = wallpaper {
-        return updatedFileWallpaper(id: file.id, accessHash: file.accessHash, slug: file.slug, file: file.file, firstColor: firstColor, secondColor: secondColor, intensity: intensity, rotation: rotation)
+        return updatedFileWallpaper(id: file.id, accessHash: file.accessHash, slug: file.slug, file: file.file, colors: colors, intensity: intensity, rotation: rotation)
     } else {
         return wallpaper
     }
 }
 
-private func updatedFileWallpaper(id: Int64? = nil, accessHash: Int64? = nil, slug: String, file: TelegramMediaFile, firstColor: UIColor?, secondColor: UIColor?, intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
+private func updatedFileWallpaper(id: Int64? = nil, accessHash: Int64? = nil, slug: String, file: TelegramMediaFile, colors: [UInt32], intensity: Int32?, rotation: Int32?) -> TelegramWallpaper {
     var isPattern = ["image/png", "image/svg+xml", "application/x-tgwallpattern"].contains(file.mimeType)
     if let fileName = file.fileName, fileName.hasSuffix(".svgbg") {
         isPattern = true
     }
-    var firstColorValue: UInt32?
-    var secondColorValue: UInt32?
+    var colorValues: [UInt32] = []
     var intensityValue: Int32?
-    if let firstColor = firstColor {
-        firstColorValue = firstColor.argb
-        intensityValue = intensity
-    } else if isPattern {
-        firstColorValue = 0xd6e2ee
+    if !colors.isEmpty {
+        colorValues = colors
+        intensityValue = intensity ?? 50
+    } else {
+        colorValues = [0xd6e2ee]
         intensityValue = 50
     }
-    if let secondColor = secondColor {
-        secondColorValue = secondColor.argb
-    }
     
-    return .file(id: id ?? 0, accessHash: accessHash ?? 0, isCreator: false, isDefault: false, isPattern: isPattern, isDark: false, slug: slug, file: file, settings: WallpaperSettings(color: firstColorValue, bottomColor: secondColorValue, intensity: intensityValue, rotation: rotation))
+    return .file(id: id ?? 0, accessHash: accessHash ?? 0, isCreator: false, isDefault: false, isPattern: isPattern, isDark: false, slug: slug, file: file, settings: WallpaperSettings(colors: colorValues, intensity: intensityValue, rotation: rotation))
 }
 
 public class WallpaperGalleryController: ViewController {
@@ -142,6 +171,7 @@ public class WallpaperGalleryController: ViewController {
         return self._ready
     }
     private var didSetReady = false
+    private var didBeginSettingReady = false
     
     private let disposable = MetaDisposable()
     
@@ -165,8 +195,14 @@ public class WallpaperGalleryController: ViewController {
     private var overlayNode: WallpaperGalleryOverlayNode?
     private var toolbarNode: WallpaperGalleryToolbarNode?
     private var patternPanelNode: WallpaperPatternPanelNode?
-    
+    private var colorsPanelNode: WallpaperColorPanelNode?
+
+    private var patternInitialWallpaper: TelegramWallpaper?
     private var patternPanelEnabled = false
+    private var colorsPanelEnabled = false
+
+    private var savedPatternWallpaper: TelegramWallpaper?
+    private var savedPatternIntensity: Int32?
     
     public init(context: AccountContext, source: WallpaperListSource) {
         self.context = context
@@ -190,15 +226,15 @@ public class WallpaperGalleryController: ViewController {
                 if case let .wallpapers(wallpaperOptions) = type, let options = wallpaperOptions {
                     self.initialOptions = options
                 }
-            case let .slug(slug, file, options, firstColor, secondColor, intensity, rotation, message):
+            case let .slug(slug, file, options, colors, intensity, rotation, message):
                 if let file = file {
-                    let wallpaper = updatedFileWallpaper(slug: slug, file: file, firstColor: firstColor, secondColor: secondColor, intensity: intensity, rotation: rotation)
+                    let wallpaper = updatedFileWallpaper(slug: slug, file: file, colors: colors, intensity: intensity, rotation: rotation)
                     entries = [.wallpaper(wallpaper, message)]
                     centralEntryIndex = 0
                     self.initialOptions = options
                 }
-            case let .wallpaper(wallpaper, options, firstColor, secondColor, intensity, rotation, message):
-                let wallpaper = updatedFileWallpaper(wallpaper: wallpaper, firstColor: firstColor, secondColor: secondColor, intensity: intensity, rotation: rotation)
+            case let .wallpaper(wallpaper, options, colors, intensity, rotation, message):
+                let wallpaper = updatedFileWallpaper(wallpaper: wallpaper, colors: colors, intensity: intensity, rotation: rotation)
                 entries = [.wallpaper(wallpaper, message)]
                 centralEntryIndex = 0
                 self.initialOptions = options
@@ -283,7 +319,8 @@ public class WallpaperGalleryController: ViewController {
         self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData))
         self.toolbarNode?.updateThemeAndStrings(theme: self.presentationData.theme, strings: self.presentationData.strings)
         self.patternPanelNode?.updateTheme(self.presentationData.theme)
-        self.patternPanelNode?.backgroundColors = self.presentationData.theme.overallDarkAppearance ? (self.presentationData.theme.list.blocksBackgroundColor, nil, nil) : nil
+
+        self.colorsPanelNode?.updateTheme(self.presentationData.theme)
     }
     
     func dismiss(forceAway: Bool) {
@@ -304,6 +341,17 @@ public class WallpaperGalleryController: ViewController {
         }
         return GalleryPagerTransaction(deleteItems: [], insertItems: [], updateItems: updateItems, focusOnItem: self.galleryNode.pager.centralItemNode()?.index, synchronous: false)
     }
+
+    private func updateCurrentEntryTransaction(entry: WallpaperGalleryEntry, arguments: WallpaperGalleryItemArguments, index: Int) -> GalleryPagerTransaction {
+        var updateItems: [GalleryPagerUpdateItem] = []
+        for i in 0 ..< self.entries.count {
+            if i == index {
+                let item = GalleryPagerUpdateItem(index: index, previousIndex: index, item: WallpaperGalleryItem(context: self.context, index: index, entry: entry, arguments: arguments, source: self.source))
+                updateItems.append(item)
+            }
+        }
+        return GalleryPagerTransaction(deleteItems: [], insertItems: [], updateItems: updateItems, focusOnItem: self.galleryNode.pager.centralItemNode()?.index, synchronous: false)
+    }
     
     override public func loadDisplayNode() {
         let controllerInteraction = GalleryControllerInteraction(presentController: { [weak self] controller, arguments in
@@ -315,17 +363,22 @@ public class WallpaperGalleryController: ViewController {
         }, replaceRootController: { controller, ready in
         }, editMedia: { _ in
         })
-        self.displayNode = WallpaperGalleryControllerNode(controllerInteraction: controllerInteraction, pageGap: 0.0)
+        self.displayNode = WallpaperGalleryControllerNode(controllerInteraction: controllerInteraction, pageGap: 0.0, disableTapNavigation: true)
         self.displayNodeDidLoad()
+
+        (self.displayNode as? WallpaperGalleryControllerNode)?.nativeStatusBar = self.statusBar
         
         self.galleryNode.navigationBar = self.navigationBar
         self.galleryNode.dismiss = { [weak self] in
             self?.presentingViewController?.dismiss(animated: false, completion: nil)
         }
-        
+
+        var currentCentralItemIndex: Int?
         self.galleryNode.pager.centralItemIndexUpdated = { [weak self] index in
             if let strongSelf = self {
-                strongSelf.bindCentralItemNode(animated: true)
+                let updated = currentCentralItemIndex != index
+                currentCentralItemIndex = index
+                strongSelf.bindCentralItemNode(animated: true, updated: updated)
             }
         }
         
@@ -374,6 +427,7 @@ public class WallpaperGalleryController: ViewController {
                 dismissed = true
                 if let centralItemNode = strongSelf.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode {
                     let options = centralItemNode.options
+                    let gradientColors = centralItemNode.colors
                     if !strongSelf.entries.isEmpty {
                         let entry = strongSelf.entries[centralItemNode.index]
                         switch entry {
@@ -392,13 +446,13 @@ public class WallpaperGalleryController: ViewController {
                                 
                                 let completion: (TelegramWallpaper) -> Void = { wallpaper in
                                     let baseSettings = wallpaper.settings
-                                    let updatedSettings = WallpaperSettings(blur: options.contains(.blur), motion: options.contains(.motion), color: baseSettings?.color, bottomColor: baseSettings?.bottomColor, intensity: baseSettings?.intensity)
+                                    let updatedSettings = WallpaperSettings(blur: options.contains(.blur), motion: options.contains(.motion), colors: baseSettings?.colors ?? [], intensity: baseSettings?.intensity, rotation: baseSettings?.rotation)
                                     let wallpaper = wallpaper.withUpdatedSettings(updatedSettings)
                                     
                                     let autoNightModeTriggered = strongSelf.presentationData.autoNightModeTriggered
                                     let _ = (updatePresentationThemeSettingsInteractively(accountManager: strongSelf.context.sharedContext.accountManager, { current in
                                         var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers
-                                        var wallpaper = wallpaper.isBasicallyEqual(to: strongSelf.presentationData.theme.chat.defaultWallpaper) ? nil : wallpaper
+                                        let wallpaper = wallpaper.isBasicallyEqual(to: strongSelf.presentationData.theme.chat.defaultWallpaper) ? nil : wallpaper
                                         let themeReference: PresentationThemeReference
                                         if autoNightModeTriggered {
                                             themeReference = current.automaticThemeSwitchSetting.theme
@@ -424,6 +478,18 @@ public class WallpaperGalleryController: ViewController {
                                             break
                                     }
                                     let _ = installWallpaper(account: strongSelf.context.account, wallpaper: wallpaper).start()
+                                    let _ = (strongSelf.context.sharedContext.accountManager.transaction { transaction in
+                                        WallpapersState.update(transaction: transaction, { state in
+                                            var state = state
+                                            if let index = state.wallpapers.firstIndex(where: {
+                                                $0.isBasicallyEqual(to: wallpaper)
+                                            }) {
+                                                state.wallpapers.remove(at: index)
+                                            }
+                                            state.wallpapers.insert(wallpaper, at: 0)
+                                            return state
+                                        })
+                                    }).start()
                                 }
                                 
                                 let applyWallpaper: (TelegramWallpaper) -> Void = { wallpaper in
@@ -449,24 +515,31 @@ public class WallpaperGalleryController: ViewController {
                                             }
                                         }
                                     } else if case let .file(file) = wallpaper, let resource = resource {
-                                        if wallpaper.isPattern, let color = file.settings.color, let intensity = file.settings.intensity {
-                                            let representation = CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation)
-                                            
+                                        if wallpaper.isPattern, !file.settings.colors.isEmpty, let intensity = file.settings.intensity {
                                             var data: Data?
+                                            var thumbnailData: Data?
                                             if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
                                                 data = maybeData
                                             } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
                                                 data = maybeData
                                             }
+
+                                            let thumbnailResource = file.file.previewRepresentations.first?.resource
+
+                                            if let resource = thumbnailResource {
+                                                if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+                                                    thumbnailData = maybeData
+                                                } else if let path = strongSelf.context.sharedContext.accountManager.mediaBox.completedResourcePath(resource), let maybeData = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
+                                                    thumbnailData = maybeData
+                                                }
+                                            }
                                             
                                             if let data = data {
                                                 strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
-                                                let _ = (strongSelf.context.sharedContext.accountManager.mediaBox.cachedResourceRepresentation(resource, representation: representation, complete: true, fetch: true)
-                                                |> filter({ $0.complete })
-                                                |> take(1)
-                                                |> deliverOnMainQueue).start(next: { _ in
-                                                    completion(wallpaper)
-                                                })
+                                                if let thumbnailResource = thumbnailResource, let thumbnailData = thumbnailData {
+                                                    strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData, synchronous: true)
+                                                }
+                                                completion(wallpaper)
                                             }
                                         } else if let path = strongSelf.context.account.postbox.mediaBox.completedResourcePath(file.file.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead) {
                                                 strongSelf.context.sharedContext.accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data)
@@ -500,7 +573,12 @@ public class WallpaperGalleryController: ViewController {
                                         applyWallpaper(wallpaper)
                                     })
                                 } else {
-                                    applyWallpaper(wallpaper)
+                                    var updatedWallpaper = wallpaper
+                                    if var settings = wallpaper.settings {
+                                        settings.motion = options.contains(.motion)
+                                        updatedWallpaper = updatedWallpaper.withUpdatedSettings(settings)
+                                    }
+                                    applyWallpaper(updatedWallpaper)
                                 }
                             default:
                                 break
@@ -511,11 +589,6 @@ public class WallpaperGalleryController: ViewController {
                 }
             }
         }
-        
-        let ready = self.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak self] _ in
-            self?.didSetReady = true
-        }
-        self._ready.set(ready |> map { true })
     }
     
     private func currentEntry() -> WallpaperGalleryEntry? {
@@ -532,10 +605,14 @@ public class WallpaperGalleryController: ViewController {
         super.viewDidAppear(animated)
         
         self.galleryNode.modalAnimateIn()
-        self.bindCentralItemNode(animated: false)
+        self.bindCentralItemNode(animated: false, updated: false)
+
+        if let centralItemNode = self.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode {
+            centralItemNode.animateWallpaperAppeared()
+        }
     }
     
-    private func bindCentralItemNode(animated: Bool) {
+    private func bindCentralItemNode(animated: Bool, updated: Bool) {
         if let node = self.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode {
             self.centralItemSubtitle.set(node.subtitle.get())
             self.centralItemStatus.set(node.status.get())
@@ -543,27 +620,119 @@ public class WallpaperGalleryController: ViewController {
             node.action = { [weak self] in
                 self?.actionPressed()
             }
-            node.requestPatternPanel = { [weak self] enabled in
+            node.requestPatternPanel = { [weak self] enabled, initialWallpaper in
                 if let strongSelf = self, let (layout, _) = strongSelf.validLayout {
+                    strongSelf.colorsPanelEnabled = false
+                    strongSelf.colorsPanelNode?.view.endEditing(true)
+
+                    if !enabled {
+                        strongSelf.savedPatternWallpaper = initialWallpaper
+                        strongSelf.savedPatternIntensity = initialWallpaper.settings?.intensity
+                    }
+
+                    strongSelf.patternInitialWallpaper = enabled ? initialWallpaper : nil
+                    switch initialWallpaper {
+                    case let .color(color):
+                        strongSelf.patternPanelNode?.backgroundColors = ([color], nil, nil)
+                    case let .gradient(_, colors, settings):
+                        strongSelf.patternPanelNode?.backgroundColors = (colors, settings.rotation, nil)
+                    case let .file(file) where file.isPattern:
+                        strongSelf.patternPanelNode?.backgroundColors = (file.settings.colors, file.settings.rotation, file.settings.intensity)
+                    default:
+                        break
+                    }
+                    strongSelf.patternPanelNode?.serviceBackgroundColor = serviceColor(for: (initialWallpaper, nil))
                     strongSelf.patternPanelEnabled = enabled
                     strongSelf.galleryNode.scrollView.isScrollEnabled = !enabled
                     if enabled {
-                        strongSelf.patternPanelNode?.didAppear()
+                        strongSelf.patternPanelNode?.updateWallpapers()
+                        strongSelf.patternPanelNode?.didAppear(initialWallpaper: strongSelf.savedPatternWallpaper, intensity: strongSelf.savedPatternIntensity)
                     } else {
-                        strongSelf.updateEntries(pattern: .color(0), preview: false)
+                        switch initialWallpaper {
+                        case .color, .gradient:
+                            strongSelf.updateEntries(wallpaper: initialWallpaper)
+                        case let .file(file):
+                            if !file.settings.colors.isEmpty {
+                                if file.settings.colors.count >= 2 {
+                                    strongSelf.updateEntries(wallpaper: .gradient(nil, file.settings.colors, WallpaperSettings(rotation: file.settings.rotation)))
+                                } else {
+                                    strongSelf.updateEntries(wallpaper: .color(file.settings.colors[0]))
+                                }
+                            }
+                        default:
+                            break
+                        }
                     }
                     strongSelf.containerLayoutUpdated(layout, transition: .animated(duration: 0.3, curve: .spring))
                 }
             }
+
+            node.toggleColorsPanel = { [weak self] colors in
+                if let strongSelf = self, let (layout, _) = strongSelf.validLayout, let colors = colors, let itemNode = strongSelf.galleryNode.pager.centralItemNode() as? WallpaperGalleryItemNode {
+                    strongSelf.patternPanelEnabled = false
+                    strongSelf.colorsPanelEnabled = !strongSelf.colorsPanelEnabled
+                    strongSelf.galleryNode.scrollView.isScrollEnabled = !strongSelf.colorsPanelEnabled
+                    if !strongSelf.colorsPanelEnabled {
+                        strongSelf.colorsPanelNode?.view.endEditing(true)
+                    }
+
+                    if strongSelf.colorsPanelEnabled {
+                        strongSelf.colorsPanelNode?.updateState({ _ in
+                            return WallpaperColorPanelNodeState(
+                                selection: 0,
+                                colors: colors.map(\.rgb),
+                                maximumNumberOfColors: 4,
+                                rotateAvailable: false,
+                                rotation: 0,
+                                preview: false,
+                                simpleGradientGeneration: false
+                            )
+                        }, animated: false)
+                    }
+
+                    itemNode.updateIsColorsPanelActive(strongSelf.colorsPanelEnabled, animated: true)
+
+                    strongSelf.containerLayoutUpdated(layout, transition: .animated(duration: 0.3, curve: .spring))
+                }
+            }
+
+            node.requestRotateGradient = { [weak self] angle in
+                guard let strongSelf = self, let _ = strongSelf.validLayout, let entry = strongSelf.currentEntry(), case let .wallpaper(wallpaper, _) = entry else {
+                    return
+                }
+                var settings = wallpaper.settings ?? WallpaperSettings()
+                settings.rotation = angle
+                strongSelf.updateEntries(wallpaper: wallpaper.withUpdatedSettings(settings))
+            }
             
-            if let entry = self.currentEntry(), case let .wallpaper(wallpaper, _) = entry, case let .file(_, _, _, _, true, _, _, _ , settings) = wallpaper, let color = settings.color {
-                if self.patternPanelNode?.backgroundColors != nil, let snapshotView = self.patternPanelNode?.scrollNode.view.snapshotContentTree() {
+            if let entry = self.currentEntry(), case let .wallpaper(wallpaper, _) = entry, case let .file(_, _, _, _, true, _, _, _ , settings) = wallpaper, !settings.colors.isEmpty {
+                /*if self.patternPanelNode?.backgroundColors != nil, let snapshotView = self.patternPanelNode?.scrollNode.view.snapshotContentTree() {
                     self.patternPanelNode?.view.addSubview(snapshotView)
                     snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false) { [weak snapshotView] _ in
                         snapshotView?.removeFromSuperview()
                     }
+                }*/
+                //self.patternPanelNode?.backgroundColors = ([settings.colors[0]], nil)
+            }
+
+            if updated {
+                if self.colorsPanelEnabled || self.patternPanelEnabled {
+                    self.colorsPanelEnabled = false
+                    self.colorsPanelNode?.view.endEditing(true)
+                    self.patternPanelEnabled = false
+
+                    if let (layout, _) = self.validLayout {
+                        self.containerLayoutUpdated(layout, transition: .animated(duration: 0.3, curve: .spring))
+                    }
                 }
-                self.patternPanelNode?.backgroundColors = (UIColor(rgb: color), nil, nil)
+            }
+            if !self.didBeginSettingReady {
+                self.didBeginSettingReady = true
+
+                let ready = self.galleryNode.pager.ready() |> timeout(2.0, queue: Queue.mainQueue(), alternate: .single(Void())) |> afterNext { [weak self] _ in
+                    self?.didSetReady = true
+                }
+                self._ready.set(ready |> map { true })
             }
         }
     }
@@ -591,27 +760,53 @@ public class WallpaperGalleryController: ViewController {
         
         self.galleryNode.pager.transaction(self.updateTransaction(entries: entries, arguments: WallpaperGalleryItemArguments(colorPreview: preview, isColorsList: false, patternEnabled: self.patternPanelEnabled)))
     }
+
+    private func updateEntries(wallpaper: TelegramWallpaper, preview: Bool = false) {
+        guard self.validLayout != nil, let centralEntryIndex = self.galleryNode.pager.centralItemNode()?.index else {
+            return
+        }
+
+        var entries = self.entries
+        var currentEntry = entries[centralEntryIndex]
+        switch currentEntry {
+            case .wallpaper:
+                currentEntry = .wallpaper(wallpaper, nil)
+            default:
+                break
+        }
+        entries[centralEntryIndex] = currentEntry
+        self.entries = entries
+
+        self.galleryNode.pager.transaction(self.updateCurrentEntryTransaction(entry: currentEntry, arguments: WallpaperGalleryItemArguments(colorPreview: preview, isColorsList: false, patternEnabled: self.patternPanelEnabled), index: centralEntryIndex))
+    }
     
     private func updateEntries(pattern: TelegramWallpaper?, intensity: Int32? = nil, preview: Bool = false) {
         var updatedEntries: [WallpaperGalleryEntry] = []
         for entry in self.entries {
-            var entryColor: UInt32?
+            var entryColors: [UInt32] = []
             if case let .wallpaper(wallpaper, _) = entry {
                 if case let .color(color) = wallpaper {
-                    entryColor = color
-                } else if case let .file(file) = wallpaper {
-                    entryColor = file.settings.color
+                    entryColors = [color]
+                } else if case let .file(file) = wallpaper, file.isPattern {
+                    entryColors = file.settings.colors
+                } else if case let .gradient(_, colors, _) = wallpaper {
+                    entryColors = colors
                 }
             }
             
-            if let entryColor = entryColor {
+            if !entryColors.isEmpty {
                 if let pattern = pattern, case let .file(file) = pattern {
-                    let newSettings = WallpaperSettings(blur: file.settings.blur, motion: file.settings.motion, color: entryColor, intensity: intensity)
+                    let newSettings = WallpaperSettings(blur: file.settings.blur, motion: file.settings.motion, colors: entryColors, intensity: intensity)
                     let newWallpaper = TelegramWallpaper.file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: pattern.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: newSettings)
                     updatedEntries.append(.wallpaper(newWallpaper, nil))
                 } else {
-                    let newWallpaper = TelegramWallpaper.color(entryColor)
-                    updatedEntries.append(.wallpaper(newWallpaper, nil))
+                    if entryColors.count == 1 {
+                        let newWallpaper = TelegramWallpaper.color(entryColors[0])
+                        updatedEntries.append(.wallpaper(newWallpaper, nil))
+                    } else {
+                        let newWallpaper = TelegramWallpaper.gradient(nil, entryColors, WallpaperSettings(rotation: nil))
+                        updatedEntries.append(.wallpaper(newWallpaper, nil))
+                    }
                 }
             }
         }
@@ -626,17 +821,23 @@ public class WallpaperGalleryController: ViewController {
         let hadLayout = self.validLayout != nil
         
         super.containerLayoutUpdated(layout, transition: transition)
+
+        let panelHeight: CGFloat = 235.0
+
+        var pagerLayout = layout
+        if self.patternPanelEnabled || self.colorsPanelEnabled {
+            pagerLayout.intrinsicInsets.bottom += panelHeight
+        }
+        pagerLayout.intrinsicInsets.bottom = max(pagerLayout.intrinsicInsets.bottom, layout.inputHeight ?? 0.0)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(pagerLayout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
         self.overlayNode?.frame = self.galleryNode.bounds
         
         transition.updateFrame(node: self.toolbarNode!, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom), size: CGSize(width: layout.size.width, height: 49.0 + layout.intrinsicInsets.bottom)))
         self.toolbarNode!.updateLayout(size: CGSize(width: layout.size.width, height: 49.0), layout: layout, transition: transition)
         
         var bottomInset = layout.intrinsicInsets.bottom + 49.0
-        let standardInputHeight = layout.deviceMetrics.keyboardHeight(inLandscape: false)
-        let height = max(standardInputHeight, layout.inputHeight ?? 0.0) - bottomInset + 47.0
         
         let currentPatternPanelNode: WallpaperPatternPanelNode
         if let patternPanelNode = self.patternPanelNode {
@@ -644,26 +845,90 @@ public class WallpaperGalleryController: ViewController {
         } else {
             let patternPanelNode = WallpaperPatternPanelNode(context: self.context, theme: presentationData.theme, strings: presentationData.strings)
             patternPanelNode.patternChanged = { [weak self] pattern, intensity, preview in
-                if let strongSelf = self, strongSelf.validLayout != nil {
-                    strongSelf.updateEntries(pattern: pattern, intensity: intensity, preview: preview)
+                if let strongSelf = self, strongSelf.validLayout != nil, let patternInitialWallpaper = strongSelf.patternInitialWallpaper {
+                    var colors: [UInt32] = []
+                    var rotation: Int32?
+                    switch patternInitialWallpaper {
+                    case let .color(color):
+                        colors = [color]
+                    case let .file(file):
+                        colors = file.settings.colors
+                        rotation = file.settings.rotation
+                    case let .gradient(_, colorsValue, settings):
+                        colors = colorsValue
+                        rotation = settings.rotation
+                    default:
+                        break
+                    }
+                    switch patternInitialWallpaper {
+                    case .color, .file, .gradient:
+                        if let pattern = pattern, case let .file(file) = pattern {
+                            let newSettings = WallpaperSettings(blur: file.settings.blur, motion: file.settings.motion, colors: colors, intensity: intensity)
+                            let newWallpaper = TelegramWallpaper.file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: pattern.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: newSettings)
+
+                            strongSelf.savedPatternWallpaper = newWallpaper
+                            strongSelf.savedPatternIntensity = intensity
+
+                            strongSelf.updateEntries(wallpaper: newWallpaper, preview: preview)
+                        }
+                    default:
+                        break
+                    }
+
+                    strongSelf.patternPanelNode?.backgroundColors = (colors, rotation, intensity)
                 }
             }
-            patternPanelNode.backgroundColors = self.presentationData.theme.overallDarkAppearance ? (self.presentationData.theme.list.blocksBackgroundColor, nil, nil) : nil
             self.patternPanelNode = patternPanelNode
             currentPatternPanelNode = patternPanelNode
             self.overlayNode?.insertSubnode(patternPanelNode, belowSubnode: self.toolbarNode!)
         }
-        
-        let panelHeight: CGFloat = 235.0
+
+        let currentColorsPanelNode: WallpaperColorPanelNode
+        if let current = self.colorsPanelNode {
+            currentColorsPanelNode = current
+        } else {
+            let colorsPanelNode = WallpaperColorPanelNode(theme: self.presentationData.theme, strings: self.presentationData.strings)
+            self.colorsPanelNode = colorsPanelNode
+            currentColorsPanelNode = colorsPanelNode
+            self.overlayNode?.insertSubnode(colorsPanelNode, belowSubnode: self.toolbarNode!)
+
+            colorsPanelNode.colorsChanged = { [weak self] colors, _ in
+                guard let strongSelf = self else {
+                    return
+                }
+                guard let entry = strongSelf.currentEntry(), case let .wallpaper(currentWallpaper, _) = entry else {
+                    return
+                }
+
+                var wallpaper: TelegramWallpaper = .gradient(nil, colors, WallpaperSettings(blur: false, motion: false, colors: [], intensity: nil, rotation: nil))
+
+                if case let .file(file) = currentWallpaper {
+                    wallpaper = currentWallpaper.withUpdatedSettings(WallpaperSettings(blur: false, motion: false, colors: colors, intensity: file.settings.intensity, rotation: file.settings.rotation))
+                }
+
+                strongSelf.updateEntries(wallpaper: wallpaper)
+            }
+        }
+
         var patternPanelFrame = CGRect(x: 0.0, y: layout.size.height, width: layout.size.width, height: panelHeight)
         if self.patternPanelEnabled {
-            patternPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - bottomInset - panelHeight)
+            patternPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - max((layout.inputHeight ?? 0.0) - panelHeight + 44.0, bottomInset) - panelHeight)
             bottomInset += panelHeight
         }
-        bottomInset += 66.0
         
         transition.updateFrame(node: currentPatternPanelNode, frame: patternPanelFrame)
         currentPatternPanelNode.updateLayout(size: patternPanelFrame.size, transition: transition)
+
+        var colorsPanelFrame = CGRect(x: 0.0, y: layout.size.height, width: layout.size.width, height: panelHeight)
+        if self.colorsPanelEnabled {
+            colorsPanelFrame.origin = CGPoint(x: 0.0, y: layout.size.height - max((layout.inputHeight ?? 0.0) - panelHeight + 44.0, bottomInset) - panelHeight)
+            bottomInset += panelHeight
+        }
+
+        transition.updateFrame(node: currentColorsPanelNode, frame: colorsPanelFrame)
+        currentColorsPanelNode.updateLayout(size: colorsPanelFrame.size, transition: transition)
+
+        bottomInset += 66.0
         
         self.validLayout = (layout, bottomInset)
         if !hadLayout {
@@ -721,11 +986,20 @@ public class WallpaperGalleryController: ViewController {
                 })
             case let .file(_, _, _, _, isPattern, _, slug, _, settings):
                 if isPattern {
-                    if let color = settings.color {
-                        if let bottomColor = settings.bottomColor {
-                            options.append("bg_color=\(UIColor(rgb: color).hexString)-\(UIColor(rgb: bottomColor).hexString)")
+                    if !settings.colors.isEmpty {
+                        if settings.colors.count == 2 {
+                            options.append("bg_color=\(UIColor(rgb: settings.colors[0]).hexString)-\(UIColor(rgb: settings.colors[1]).hexString)")
+                        } else if settings.colors.count >= 3 {
+                            var colorsString = ""
+                            for color in settings.colors {
+                                if !colorsString.isEmpty {
+                                    colorsString.append("~")
+                                }
+                                colorsString.append(UIColor(rgb: color).hexString)
+                            }
+                            options.append("bg_color=\(colorsString)")
                         } else {
-                            options.append("bg_color=\(UIColor(rgb: color).hexString)")
+                            options.append("bg_color=\(UIColor(rgb: settings.colors[0]).hexString)")
                         }
                     }
                     if let intensity = settings.intensity {
@@ -744,8 +1018,21 @@ public class WallpaperGalleryController: ViewController {
                 controller = ShareController(context: context, subject: .url("https://t.me/bg/\(slug)\(optionsString)"))
             case let .color(color):
                 controller = ShareController(context: context, subject: .url("https://t.me/bg/\(UIColor(rgb: color).hexString)"))
-            case let .gradient(topColor, bottomColor, _):
-                controller = ShareController(context: context, subject:. url("https://t.me/bg/\(UIColor(rgb: topColor).hexString)-\(UIColor(rgb: bottomColor).hexString)"))
+            case let .gradient(_, colors, _):
+                var colorsString = ""
+
+                for color in colors {
+                    if !colorsString.isEmpty {
+                        if colors.count >= 3 {
+                            colorsString.append("~")
+                        } else {
+                            colorsString.append("-")
+                        }
+                    }
+                    colorsString.append(UIColor(rgb: color).hexString)
+                }
+
+                controller = ShareController(context: context, subject:. url("https://t.me/bg/\(colorsString)"))
             default:
                 break
         }
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
index 7e93b9ff75..e9cc0bce08 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryItem.swift
@@ -18,6 +18,7 @@ import GalleryUI
 import LocalMediaResources
 import WallpaperResources
 import AppBundle
+import WallpaperBackgroundNode
 
 struct WallpaperGalleryItemArguments {
     let colorPreview: Bool
@@ -71,11 +72,11 @@ class WallpaperGalleryItem: GalleryItem {
 private let progressDiameter: CGFloat = 50.0
 private let motionAmount: CGFloat = 32.0
 
-private func reference(for resource: MediaResource, media: Media, message: Message?) -> MediaResourceReference {
+private func reference(for resource: MediaResource, media: Media, message: Message?, slug: String?) -> MediaResourceReference {
     if let message = message {
         return .media(media: .message(message: MessageReference(message), media: media), resource: resource)
     }
-    return .wallpaper(wallpaper: nil, resource: resource)
+    return .wallpaper(wallpaper: slug.flatMap(WallpaperReference.slug), resource: resource)
 }
 
 final class WallpaperGalleryItemNode: GalleryItemNode {
@@ -90,6 +91,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
     
     let wrapperNode: ASDisplayNode
     let imageNode: TransformImageNode
+    let nativeNode: WallpaperBackgroundNode
     private let statusNode: RadialStatusNode
     private let blurredNode: BlurredImageNode
     let cropNode: WallpaperCropNode
@@ -97,9 +99,13 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
     private var blurButtonNode: WallpaperOptionButtonNode
     private var motionButtonNode: WallpaperOptionButtonNode
     private var patternButtonNode: WallpaperOptionButtonNode
+    private var colorsButtonNode: WallpaperOptionButtonNode
+    private var playButtonNode: HighlightableButtonNode
+    private let playButtonBackgroundNode: NavigationBackgroundNode
     
     private let messagesContainerNode: ASDisplayNode
     private var messageNodes: [ListViewItemNode]?
+    private var validMessages: [String]?
     
     fileprivate let _ready = Promise<Void>()
     private let fetchDisposable = MetaDisposable()
@@ -110,10 +116,19 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
     let status = Promise<MediaResourceStatus>(.Local)
     let actionButton = Promise<UIBarButtonItem?>(nil)
     var action: (() -> Void)?
-    var requestPatternPanel: ((Bool) -> Void)?
+    var requestPatternPanel: ((Bool, TelegramWallpaper) -> Void)?
+    var toggleColorsPanel: (([UIColor]?) -> Void)?
+    var requestRotateGradient: ((Int32) -> Void)?
     
-    private var validLayout: ContainerViewLayout?
+    private var validLayout: (ContainerViewLayout, CGFloat)?
     private var validOffset: CGFloat?
+
+    private var initialWallpaper: TelegramWallpaper?
+
+    private let playButtonPlayImage: UIImage?
+    private let playButtonRotateImage: UIImage?
+
+    private var isReadyDisposable: Disposable?
     
     init(context: AccountContext) {
         self.context = context
@@ -122,6 +137,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         self.wrapperNode = ASDisplayNode()
         self.imageNode = TransformImageNode()
         self.imageNode.contentAnimations = .subsequentUpdates
+        self.nativeNode = WallpaperBackgroundNode(context: context)
         self.cropNode = WallpaperCropNode()
         self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(white: 0.0, alpha: 0.6))
         self.statusNode.frame = CGRect(x: 0.0, y: 0.0, width: progressDiameter, height: progressDiameter)
@@ -139,36 +155,84 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         self.motionButtonNode.setEnabled(false)
         self.patternButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_Pattern, value: .check(false))
         self.patternButtonNode.setEnabled(false)
+
+        self.colorsButtonNode = WallpaperOptionButtonNode(title: self.presentationData.strings.WallpaperPreview_WallpaperColors, value: .colors(false, [.clear]))
+
+        self.playButtonBackgroundNode = NavigationBackgroundNode(color: UIColor(white: 0.0, alpha: 0.3))
+        self.playButtonNode = HighlightableButtonNode()
+        self.playButtonNode.insertSubnode(self.playButtonBackgroundNode, at: 0)
+
+        self.playButtonPlayImage = generateImage(CGSize(width: 48.0, height: 48.0), rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            context.setFillColor(UIColor.white.cgColor)
+
+            let diameter = size.width
+
+            let factor = diameter / 50.0
+
+            let size = CGSize(width: 15.0, height: 18.0)
+            context.translateBy(x: (diameter - size.width) / 2.0 + 1.5, y: (diameter - size.height) / 2.0)
+            if (diameter < 40.0) {
+                context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                context.scaleBy(x: factor, y: factor)
+                context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+            }
+            let _ = try? drawSvgPath(context, path: "M1.71891969,0.209353049 C0.769586558,-0.350676705 0,0.0908839327 0,1.18800046 L0,16.8564753 C0,17.9569971 0.750549162,18.357187 1.67393713,17.7519379 L14.1073836,9.60224049 C15.0318735,8.99626906 15.0094718,8.04970371 14.062401,7.49100858 L1.71891969,0.209353049 ")
+            context.fillPath()
+            if (diameter < 40.0) {
+                context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                context.scaleBy(x: 1.0 / 0.8, y: 1.0 / 0.8)
+                context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+            }
+            context.translateBy(x: -(diameter - size.width) / 2.0 - 1.5, y: -(diameter - size.height) / 2.0)
+        })
+
+        self.playButtonRotateImage = generateTintedImage(image: UIImage(bundleImageName: "Settings/ThemeColorRotateIcon"), color: .white)
+
+        self.playButtonNode.setImage(self.playButtonPlayImage, for: [])
         
         super.init()
         
         self.clipsToBounds = true
         self.backgroundColor = .black
         
-        self.imageNode.imageUpdated = { [weak self] _ in
-            self?._ready.set(.single(Void()))
+        self.imageNode.imageUpdated = { [weak self] image in
+            if image != nil {
+                self?._ready.set(.single(Void()))
+            }
         }
+        self.isReadyDisposable = (self.nativeNode.isReady
+        |> filter { $0 }
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { [weak self] _ in
+            self?._ready.set(.single(Void()))
+        })
         
         self.imageNode.view.contentMode = .scaleAspectFill
         self.imageNode.clipsToBounds = true
         
         self.addSubnode(self.wrapperNode)
-        self.addSubnode(self.statusNode)
+        //self.addSubnode(self.statusNode)
         self.addSubnode(self.messagesContainerNode)
         
         self.addSubnode(self.blurButtonNode)
         self.addSubnode(self.motionButtonNode)
         self.addSubnode(self.patternButtonNode)
+        self.addSubnode(self.colorsButtonNode)
+        self.addSubnode(self.playButtonNode)
         
         self.blurButtonNode.addTarget(self, action: #selector(self.toggleBlur), forControlEvents: .touchUpInside)
         self.motionButtonNode.addTarget(self, action: #selector(self.toggleMotion), forControlEvents: .touchUpInside)
         self.patternButtonNode.addTarget(self, action: #selector(self.togglePattern), forControlEvents: .touchUpInside)
+        self.colorsButtonNode.addTarget(self, action: #selector(self.toggleColors), forControlEvents: .touchUpInside)
+        self.playButtonNode.addTarget(self, action: #selector(self.togglePlay), forControlEvents: .touchUpInside)
     }
     
     deinit {
         self.fetchDisposable.dispose()
         self.statusDisposable.dispose()
         self.colorDisposable.dispose()
+        self.isReadyDisposable?.dispose()
     }
     
     var cropRect: CGRect? {
@@ -210,8 +274,8 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             if previousEntry != entry {
                 self.preparePatternEditing()
             }
-            
-            self.patternButtonNode.isSelected = self.arguments.patternEnabled
+
+            self.colorsButtonNode.colors = self.calculateGradientColors() ?? defaultBuiltinWallpaperGradientColors
             
             let imagePromise = Promise<UIImage?>()
             
@@ -231,14 +295,61 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             let progressAction = UIBarButtonItem(customDisplayNode: ProgressNavigationButtonNode(color: presentationData.theme.rootController.navigationBar.accentTextColor))
             
             var isBlurrable = true
+
+            self.nativeNode.updateBubbleTheme(bubbleTheme: presentationData.theme, bubbleCorners: presentationData.chatBubbleCorners)
+
+            switch entry {
+            case let .wallpaper(wallpaper, _):
+                self.nativeNode.update(wallpaper: wallpaper)
+
+                if case let .file(_, _, _, _, isPattern, _, _, _, settings) = wallpaper, isPattern {
+                    self.nativeNode.isHidden = false
+                    self.patternButtonNode.isSelected = isPattern
+
+                    if isPattern && settings.colors.count >= 3 {
+                        self.playButtonNode.setImage(self.playButtonPlayImage, for: [])
+                    } else {
+                        self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+                    }
+                } else if case let .gradient(_, colors, _) = wallpaper {
+                    self.nativeNode.isHidden = false
+                    self.nativeNode.update(wallpaper: wallpaper)
+                    self.patternButtonNode.isSelected = false
+
+                    if colors.count >= 3 {
+                        self.playButtonNode.setImage(self.playButtonPlayImage, for: [])
+                    } else {
+                        self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+                    }
+                } else if case .color = wallpaper {
+                    self.nativeNode.isHidden = false
+                    self.nativeNode.update(wallpaper: wallpaper)
+                    self.patternButtonNode.isSelected = false
+                } else {
+                    self.nativeNode.isHidden = true
+                    self.patternButtonNode.isSelected = false
+                    self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+                }
+            case .asset:
+                self.nativeNode._internalUpdateIsSettingUpWallpaper()
+                self.nativeNode.isHidden = true
+                self.patternButtonNode.isSelected = false
+                self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+            default:
+                self.nativeNode.isHidden = true
+                self.patternButtonNode.isSelected = false
+                self.playButtonNode.setImage(self.playButtonRotateImage, for: [])
+            }
             
             switch entry {
                 case let .wallpaper(wallpaper, message):
+                    self.initialWallpaper = wallpaper
+
                     switch wallpaper {
                         case .builtin:
                             displaySize = CGSize(width: 1308.0, height: 2688.0).fitted(CGSize(width: 1280.0, height: 1280.0)).dividedByScreenScale().integralFloor
                             contentSize = displaySize
-                            signal = settingsBuiltinWallpaperImage(account: context.account)
+                            signal = settingsBuiltinWallpaperImage(account: self.context.account)
                             fetchSignal = .complete()
                             statusSignal = .single(.Local)
                             subtitleSignal = .single(nil)
@@ -247,17 +358,17 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                         case let .color(color):
                             displaySize = CGSize(width: 1.0, height: 1.0)
                             contentSize = displaySize
-                            signal = solidColorImage(UIColor(rgb: color))
+                            signal = .single({ _ in nil })
                             fetchSignal = .complete()
                             statusSignal = .single(.Local)
                             subtitleSignal = .single(nil)
                             actionSignal = .single(defaultAction)
                             colorSignal = chatServiceBackgroundColor(wallpaper: wallpaper, mediaBox: self.context.account.postbox.mediaBox)
                             isBlurrable = false
-                        case let .gradient(topColor, bottomColor, settings):
+                        case let .gradient(_, colors, settings):
                             displaySize = CGSize(width: 1.0, height: 1.0)
                             contentSize = displaySize
-                            signal = gradientImage([UIColor(rgb: topColor), UIColor(rgb: bottomColor)], rotation: settings.rotation)
+                            signal = .single({ _ in nil })
                             fetchSignal = .complete()
                             statusSignal = .single(.Local)
                             subtitleSignal = .single(nil)
@@ -271,24 +382,24 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                             
                             var convertedRepresentations: [ImageRepresentationWithReference] = []
                             for representation in file.file.previewRepresentations {
-                                convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: reference(for: representation.resource, media: file.file, message: message)))
+                                convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: reference(for: representation.resource, media: file.file, message: message, slug: file.slug)))
                             }
-                            convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: []), reference: reference(for: file.file.resource, media: file.file, message: message)))
+                            convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: reference(for: file.file.resource, media: file.file, message: message, slug: file.slug)))
                             
                             if wallpaper.isPattern {
                                 var patternColors: [UIColor] = []
                                 var patternColor = UIColor(rgb: 0xd6e2ee, alpha: 0.5)
                                 var patternIntensity: CGFloat = 0.5
                                 
-                                if let color = file.settings.color {
+                                if !file.settings.colors.isEmpty {
                                     if let intensity = file.settings.intensity {
                                         patternIntensity = CGFloat(intensity) / 100.0
                                     }
-                                    patternColor = UIColor(rgb: color, alpha: patternIntensity)
+                                    patternColor = UIColor(rgb: file.settings.colors[0], alpha: patternIntensity)
                                     patternColors.append(patternColor)
                                     
-                                    if let bottomColor = file.settings.bottomColor {
-                                        patternColors.append(UIColor(rgb: bottomColor, alpha: patternIntensity))
+                                    if file.settings.colors.count >= 2 {
+                                        patternColors.append(UIColor(rgb: file.settings.colors[1], alpha: patternIntensity))
                                     }
                                 }
        
@@ -296,28 +407,11 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                                 
                                 self.backgroundColor = patternColor.withAlphaComponent(1.0)
                                 
-                                if let previousEntry = previousEntry, case let .wallpaper(wallpaper, _) = previousEntry, case let .file(previousFile) = wallpaper, file.id == previousFile.id && (file.settings.color != previousFile.settings.color || file.settings.intensity != previousFile.settings.intensity) && self.colorPreview == self.arguments.colorPreview {
-                                    
-                                    let makeImageLayout = self.imageNode.asyncLayout()
-                                    Queue.concurrentDefaultQueue().async {
-                                        let apply = makeImageLayout(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))
-                                        Queue.mainQueue().async {
-                                            if self.colorPreview {
-                                                apply()
-                                            }
-                                        }
-                                    }
-                                    return
-                                } else if let offset = self.validOffset, self.arguments.colorPreview && abs(offset) > 0.0 {
-                                    return
-                                } else {
-                                    patternArguments = PatternWallpaperArguments(colors: patternColors, rotation: file.settings.rotation)
-                                }
-                                
                                 self.colorPreview = self.arguments.colorPreview
-                                
-                                signal = patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: true)
-                                colorSignal = chatServiceBackgroundColor(wallpaper: wallpaper, mediaBox: context.account.postbox.mediaBox)
+
+                                signal = .single({ _ in nil })
+
+                                colorSignal = chatServiceBackgroundColor(wallpaper: wallpaper, mediaBox: self.context.account.postbox.mediaBox)
                                 
                                 isBlurrable = false
                             } else {
@@ -341,11 +435,11 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                                 }
                             }
                             if let fileSize = file.file.size {
-                                subtitleSignal = .single(dataSizeString(fileSize))
+                                subtitleSignal = .single(dataSizeString(fileSize, formatting: DataSizeStringFormatting(presentationData: self.presentationData)))
                             } else {
                                 subtitleSignal = .single(nil)
                             }
-                            if file.id == 0 {
+                            if file.slug.isEmpty {
                                 actionSignal = .single(nil)
                             } else {
                                 actionSignal = .single(defaultAction)
@@ -374,7 +468,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                                     }
                                 }
                                 if let fileSize = largestSize.resource.size {
-                                    subtitleSignal = .single(dataSizeString(fileSize))
+                                    subtitleSignal = .single(dataSizeString(fileSize, formatting: DataSizeStringFormatting(presentationData: self.presentationData)))
                                 } else {
                                     subtitleSignal = .single(nil)
                                 }
@@ -407,7 +501,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                     let dimensions = CGSize(width: asset.pixelWidth, height: asset.pixelHeight)
                     contentSize = dimensions
                     displaySize = dimensions.dividedByScreenScale().integralFloor
-                    signal = photoWallpaper(postbox: context.account.postbox, photoLibraryResource: PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: arc4random64()))
+                    signal = photoWallpaper(postbox: context.account.postbox, photoLibraryResource: PhotoLibraryMediaResource(localIdentifier: asset.localIdentifier, uniqueId: Int64.random(in: Int64.min ... Int64.max)))
                     fetchSignal = .complete()
                     statusSignal = .single(.Local)
                     subtitleSignal = .single(nil)
@@ -448,9 +542,9 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                         
                         var representations: [TelegramMediaImageRepresentation] = []
                         if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions {
-                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: []))
+                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
                         }
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: []))
+                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil))
                         let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                         
                         signal = chatMessagePhoto(postbox: context.account.postbox, photoReference: .standalone(media: tmpImage))
@@ -471,6 +565,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             if self.cropNode.supernode == nil {
                 self.imageNode.contentMode = .scaleAspectFill
                 self.wrapperNode.addSubnode(self.imageNode)
+                self.wrapperNode.addSubnode(self.nativeNode)
             } else {
                 self.imageNode.contentMode = .scaleToFill
             }
@@ -479,6 +574,9 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: displaySize, boundingSize: displaySize, intrinsicInsets: UIEdgeInsets(), custom: patternArguments))()
             self.imageNode.imageUpdated = { [weak self] image in
                 if let strongSelf = self {
+                    if image != nil {
+                        strongSelf._ready.set(.single(Void()))
+                    }
                     var image = isBlurrable ? image : nil
                     if let imageToScale = image {
                         let actualSize = CGSize(width: imageToScale.size.width * imageToScale.scale, height: imageToScale.size.height * imageToScale.scale)
@@ -522,22 +620,24 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             
             self.colorDisposable.set((colorSignal
             |> deliverOnMainQueue).start(next: { [weak self] color in
-                self?.statusNode.backgroundNodeColor = color
-                self?.patternButtonNode.buttonColor = color
-                self?.blurButtonNode.buttonColor = color
-                self?.motionButtonNode.buttonColor = color
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.statusNode.backgroundNodeColor = color
+                strongSelf.patternButtonNode.buttonColor = color
+                strongSelf.blurButtonNode.buttonColor = color
+                strongSelf.motionButtonNode.buttonColor = color
+                strongSelf.colorsButtonNode.buttonColor = color
+
+                strongSelf.playButtonBackgroundNode.updateColor(color: color, transition: .immediate)
             }))
-            
-            if let layout = self.validLayout {
-                //self.updateButtonsLayout(layout: layout, offset: CGPoint(), transition: animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate)
-            }
         } else if self.arguments.patternEnabled != previousArguments.patternEnabled {
             self.patternButtonNode.isSelected = self.arguments.patternEnabled
-            
-            if let layout = self.validLayout {
-                self.updateButtonsLayout(layout: layout, offset: CGPoint(), transition: .immediate)
-                self.updateMessagesLayout(layout: layout, offset: CGPoint(), transition: .immediate)
-            }
+        }
+
+        if let (layout, _) = self.validLayout {
+            self.updateButtonsLayout(layout: layout, offset: CGPoint(), transition: .immediate)
+            self.updateMessagesLayout(layout: layout, offset: CGPoint(), transition: .immediate)
         }
     }
     
@@ -547,7 +647,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             return
         }
         self.validOffset = offset
-        if let layout = self.validLayout {
+        if let (layout, _) = self.validLayout {
             self.updateWrapperLayout(layout: layout, offset: offset, transition: .immediate)
             self.updateButtonsLayout(layout: layout, offset: CGPoint(x: offset, y: 0.0), transition: .immediate)
             self.updateMessagesLayout(layout: layout, offset: CGPoint(x: offset, y: 0.0), transition:.immediate)
@@ -555,7 +655,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
     }
     
     func updateDismissTransition(_ value: CGFloat) {
-        if let layout = self.validLayout {
+        if let (layout, _) = self.validLayout {
             self.updateButtonsLayout(layout: layout, offset: CGPoint(x: 0.0, y: value), transition: .immediate)
             self.updateMessagesLayout(layout: layout, offset: CGPoint(x: 0.0, y: value), transition: .immediate)
         }
@@ -578,8 +678,20 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             
             self.setMotionEnabled(newValue.contains(.motion), animated: false)
             self.motionButtonNode.isSelected = newValue.contains(.motion)
+
+            if let (layout, _) = self.validLayout {
+                self.updateButtonsLayout(layout: layout, offset: CGPoint(), transition: .immediate)
+            }
         }
     }
+
+    var colors: [UInt32]? {
+        return self.calculateGradientColors()?.map({ $0.rgb })
+    }
+
+    func updateIsColorsPanelActive(_ value: Bool, animated: Bool) {
+        self.colorsButtonNode.setSelected(value, animated: false)
+    }
     
     @objc func toggleBlur() {
         let value = !self.blurButtonNode.isSelected
@@ -591,7 +703,7 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         let blurRadius: CGFloat = 45.0
         
         var animated = animated
-        if animated, let layout = self.validLayout {
+        if animated, let (layout, _) = self.validLayout {
             animated = min(layout.size.width, layout.size.height) > 321.0
         } else {
             animated = false
@@ -637,6 +749,10 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         let value = !self.motionButtonNode.isSelected
         self.motionButtonNode.setSelected(value, animated: true)
         self.setMotionEnabled(value, animated: true)
+
+        if let (layout, navigationBarHeight) = self.validLayout {
+            self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .animated(duration: 0.2, curve: .easeInOut))
+        }
     }
     
     var isPatternEnabled: Bool {
@@ -644,19 +760,79 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
     }
     
     @objc private func togglePattern() {
+        guard let initialWallpaper = self.initialWallpaper else {
+            return
+        }
+
         let value = !self.patternButtonNode.isSelected
         self.patternButtonNode.setSelected(value, animated: false)
         
-        self.requestPatternPanel?(value)
+        self.requestPatternPanel?(value, initialWallpaper)
+    }
+
+    func calculateGradientColors() -> [UIColor]? {
+        guard let entry = self.entry else {
+            return nil
+        }
+        switch entry {
+        case let .wallpaper(wallpaper, _):
+            switch wallpaper {
+            case let .file(_, _, _, _, isPattern, _, _, _, settings):
+                if isPattern {
+                    if settings.colors.isEmpty {
+                        return nil
+                    } else {
+                        return settings.colors.map(UIColor.init(rgb:))
+                    }
+                } else {
+                    return nil
+                }
+            case let .gradient(_, colors, _):
+                return colors.map(UIColor.init(rgb:))
+            case let .color(color):
+                return [UIColor(rgb: color)]
+            default:
+                return nil
+            }
+        default:
+            return nil
+        }
+    }
+
+    @objc private func toggleColors() {
+        guard let currentGradientColors = self.calculateGradientColors() else {
+            return
+        }
+        self.toggleColorsPanel?(currentGradientColors)
+    }
+
+    @objc private func togglePlay() {
+        guard let entry = self.entry, case let .wallpaper(wallpaper, _) = entry else {
+            return
+        }
+        switch wallpaper {
+        case let .gradient(_, colors, settings):
+            if colors.count >= 3 {
+                self.nativeNode.animateEvent(transition: .animated(duration: 0.5, curve: .spring))
+            } else {
+                let rotation = settings.rotation ?? 0
+                self.requestRotateGradient?((rotation + 90) % 360)
+            }
+        case let .file(file):
+            if file.isPattern {
+                if file.settings.colors.count >= 3 {
+                    self.nativeNode.animateEvent(transition: .animated(duration: 0.5, curve: .spring))
+                } else {
+                    let rotation = file.settings.rotation ?? 0
+                    self.requestRotateGradient?((rotation + 90) % 360)
+                }
+            }
+        default:
+            break
+        }
     }
     
     private func preparePatternEditing() {
-        if let entry = self.entry, case let .wallpaper(wallpaper, _) = entry, case let .file(file) = wallpaper {
-            let dimensions = file.file.dimensions ?? PixelDimensions(width: 1440, height: 2960)
-            
-            let size = dimensions.cgSize.fitted(CGSize(width: 1280.0, height: 1280.0))
-            let _ = self.context.account.postbox.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: true).start()
-        }
     }
     
     func setMotionEnabled(_ enabled: Bool, animated: Bool) {
@@ -710,19 +886,25 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         let patternButtonSize = self.patternButtonNode.measure(layout.size)
         let blurButtonSize = self.blurButtonNode.measure(layout.size)
         let motionButtonSize = self.motionButtonNode.measure(layout.size)
+        let colorsButtonSize = self.colorsButtonNode.measure(layout.size)
+        let playButtonSize = CGSize(width: 48.0, height: 48.0)
         
         let maxButtonWidth = max(patternButtonSize.width, max(blurButtonSize.width, motionButtonSize.width))
         let buttonSize = CGSize(width: maxButtonWidth, height: 30.0)
         let alpha = 1.0 - min(1.0, max(0.0, abs(offset.y) / 50.0))
         
-        var additionalYOffset: CGFloat = 0.0
-        if self.patternButtonNode.isSelected {
+        let additionalYOffset: CGFloat = 0.0
+        /*if self.patternButtonNode.isSelected {
             additionalYOffset = -235.0
-        }
+        } else if self.colorsButtonNode.isSelected {
+            additionalYOffset = -235.0
+        }*/
+
+        let buttonSpacing: CGFloat = 18.0
         
-        let leftButtonFrame = CGRect(origin: CGPoint(x: floor(layout.size.width / 2.0 - buttonSize.width - 10.0) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize)
+        let leftButtonFrame = CGRect(origin: CGPoint(x: floor(layout.size.width / 2.0 - buttonSize.width - buttonSpacing) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize)
         let centerButtonFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - buttonSize.width) / 2.0) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize)
-        let rightButtonFrame = CGRect(origin: CGPoint(x: ceil(layout.size.width / 2.0 + 10.0) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize)
+        let rightButtonFrame = CGRect(origin: CGPoint(x: ceil(layout.size.width / 2.0 + buttonSpacing) + offset.x, y: layout.size.height - 49.0 - layout.intrinsicInsets.bottom - 54.0 + offset.y + additionalYOffset), size: buttonSize)
         
         var patternAlpha: CGFloat = 0.0
         var patternFrame = centerButtonFrame
@@ -732,6 +914,14 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         
         var motionFrame = centerButtonFrame
         var motionAlpha: CGFloat = 0.0
+
+        var colorsFrame = CGRect(origin: CGPoint(x: rightButtonFrame.maxX - colorsButtonSize.width, y: rightButtonFrame.minY), size: colorsButtonSize)
+        var colorsAlpha: CGFloat = 0.0
+
+        let playFrame = CGRect(origin: CGPoint(x: centerButtonFrame.midX - playButtonSize.width / 2.0, y: centerButtonFrame.midY - playButtonSize.height / 2.0), size: playButtonSize)
+        var playAlpha: CGFloat = 0.0
+
+        let centerOffset: CGFloat = 32.0
         
         if let entry = self.entry {
             switch entry {
@@ -749,35 +939,65 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
                     switch wallpaper {
                         case .builtin:
                             motionAlpha = 1.0
+                            motionFrame = centerButtonFrame
                         case .color:
+                            motionAlpha = 0.0
                             patternAlpha = 1.0
-                            if self.patternButtonNode.isSelected {
-                                patternFrame = leftButtonFrame
-                                motionAlpha = 1.0
-                                motionFrame = rightButtonFrame
-                            }
+
+                            patternFrame = leftButtonFrame
+                            playAlpha = 0.0
+
+                            colorsAlpha = 1.0
                         case .image:
                             blurAlpha = 1.0
                             blurFrame = leftButtonFrame
                             motionAlpha = 1.0
                             motionFrame = rightButtonFrame
-                        case .gradient:
-                            motionAlpha = 1.0
+                        case let .gradient(_, colors, _):
+                            motionAlpha = 0.0
+                            patternAlpha = 1.0
+
+                            if colors.count >= 2 {
+                                playAlpha = 1.0
+                                patternFrame = leftButtonFrame.offsetBy(dx: -centerOffset, dy: 0.0)
+                                colorsFrame = colorsFrame.offsetBy(dx: centerOffset, dy: 0.0)
+                            } else {
+                                playAlpha = 0.0
+                                patternFrame = leftButtonFrame
+                            }
+
+                            colorsAlpha = 1.0
                         case let .file(file):
-                            if wallpaper.isPattern {
-                                motionAlpha = 1.0
-                                if self.arguments.isColorsList {
-                                    patternAlpha = 1.0
-                                    if self.patternButtonNode.isSelected {
-                                        patternFrame = leftButtonFrame
+                            if file.isPattern {
+                                motionAlpha = 0.0
+                                patternAlpha = 1.0
+
+                                if file.settings.colors.count >= 2 {
+                                    playAlpha = 1.0
+                                    patternFrame = leftButtonFrame.offsetBy(dx: -centerOffset, dy: 0.0)
+                                    colorsFrame = colorsFrame.offsetBy(dx: centerOffset, dy: 0.0)
+                                } else {
+                                    playAlpha = 0.0
+                                    patternFrame = leftButtonFrame
+                                }
+
+                                colorsAlpha = 1.0
+                            } else {
+                                if wallpaper.isPattern {
+                                    motionAlpha = 1.0
+                                    if self.arguments.isColorsList {
+                                        patternAlpha = 1.0
+                                        if self.patternButtonNode.isSelected {
+                                            patternFrame = leftButtonFrame
+                                        }
+                                        motionFrame = rightButtonFrame
                                     }
+                                } else {
+                                    blurAlpha = 1.0
+                                    blurFrame = leftButtonFrame
+                                    motionAlpha = 1.0
                                     motionFrame = rightButtonFrame
                                 }
-                            } else {
-                                blurAlpha = 1.0
-                                blurFrame = leftButtonFrame
-                                motionAlpha = 1.0
-                                motionFrame = rightButtonFrame
                             }
                     }
             }
@@ -791,16 +1011,26 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         
         transition.updateFrame(node: self.motionButtonNode, frame: motionFrame)
         transition.updateAlpha(node: self.motionButtonNode, alpha: motionAlpha * alpha)
+
+        transition.updateFrame(node: self.colorsButtonNode, frame: colorsFrame)
+        transition.updateAlpha(node: self.colorsButtonNode, alpha: colorsAlpha * alpha)
+
+        transition.updateFrame(node: self.playButtonNode, frame: playFrame)
+        transition.updateFrame(node: self.playButtonBackgroundNode, frame: CGRect(origin: CGPoint(), size: playFrame.size))
+        self.playButtonBackgroundNode.update(size: playFrame.size, cornerRadius: playFrame.size.height / 2.0, transition: transition)
+        transition.updateAlpha(node: self.playButtonNode, alpha: playAlpha * alpha)
+        transition.updateSublayerTransformScale(node: self.playButtonNode, scale: max(0.1, playAlpha))
     }
     
     private func updateMessagesLayout(layout: ContainerViewLayout, offset: CGPoint, transition: ContainedViewLayoutTransition) {
         var bottomInset: CGFloat = 115.0
-        if self.patternButtonNode.isSelected {
-            bottomInset = 350.0
+
+        if self.patternButtonNode.isSelected || self.colorsButtonNode.isSelected {
+            //bottomInset = 350.0
         }
         
         var items: [ListViewItem] = []
-        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 1)
+        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(1))
         let otherPeerId = self.context.account.peerId
         var peers = SimpleDictionary<PeerId, Peer>()
         let messages = SimpleDictionary<MessageId, Message>()
@@ -816,14 +1046,48 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         
         if let source = self.source {
             switch source {
-                case .wallpaper, .slug:
+                case .slug, .wallpaper:
                     topMessageText = presentationData.strings.WallpaperPreview_PreviewTopText
                     bottomMessageText = presentationData.strings.WallpaperPreview_PreviewBottomText
+
+                    var hasAnimatableGradient = false
+                    switch currentWallpaper {
+                    case let .file(file) where file.isPattern:
+                        if file.settings.colors.count >= 3 {
+                            hasAnimatableGradient = true
+                        }
+                    case let .gradient(_, colors, _):
+                        if colors.count >= 3 {
+                            hasAnimatableGradient = true
+                        }
+                    default:
+                        break
+                    }
+                    if hasAnimatableGradient {
+                        bottomMessageText = presentationData.strings.WallpaperPreview_PreviewBottomTextAnimatable
+                    }
                 case let .list(_, _, type):
                     switch type {
                         case .wallpapers:
                             topMessageText = presentationData.strings.WallpaperPreview_SwipeTopText
                             bottomMessageText = presentationData.strings.WallpaperPreview_SwipeBottomText
+
+                            var hasAnimatableGradient = false
+                            switch currentWallpaper {
+                            case let .file(file) where file.isPattern:
+                                if file.settings.colors.count >= 3 {
+                                    hasAnimatableGradient = true
+                                }
+                            case let .gradient(_, colors, _):
+                                if colors.count >= 3 {
+                                    hasAnimatableGradient = true
+                                }
+                            default:
+                                break
+                            }
+                            if hasAnimatableGradient {
+                                bottomMessageText = presentationData.strings.WallpaperPreview_PreviewBottomTextAnimatable
+                            }
                         case .colors:
                             topMessageText = presentationData.strings.WallpaperPreview_SwipeColorsTopText
                             bottomMessageText = presentationData.strings.WallpaperPreview_SwipeColorsBottomText
@@ -840,14 +1104,29 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         let theme = self.presentationData.theme.withUpdated(preview: true)
                    
         let message1 = Message(stableId: 2, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 2), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66001, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[otherPeerId], text: bottomMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message1], theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.nativeNode))
         
         let message2 = Message(stableId: 1, stableVersion: 0, id: MessageId(peerId: peerId, namespace: 0, id: 1), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 66000, flags: [.Incoming], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: peers[peerId], text: topMessageText, attributes: [], media: [], peers: peers, associatedMessages: messages, associatedMessageIds: [])
-        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil))
+        items.append(self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: [message2], theme: theme, strings: self.presentationData.strings, wallpaper: currentWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: self.nativeNode))
         
         let params = ListViewItemLayoutParams(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, availableHeight: layout.size.height)
-        if let _ = self.messageNodes {
+        if let messageNodes = self.messageNodes {
+            if self.validMessages != [topMessageText, bottomMessageText] {
+                self.validMessages = [topMessageText, bottomMessageText]
+                for i in 0 ..< items.count {
+                    items[i].updateNode(async: { f in f() }, node: { return messageNodes[i] }, params: params, previousItem: i == 0 ? nil : items[i - 1], nextItem: i == (items.count - 1) ? nil : items[i + 1], animation: .None) { layout, apply in
+                        let nodeFrame = CGRect(origin: messageNodes[i].frame.origin, size: CGSize(width: layout.size.width, height: layout.size.height))
+
+                        messageNodes[i].contentSize = layout.contentSize
+                        messageNodes[i].insets = layout.insets
+                        messageNodes[i].frame = nodeFrame
+
+                        apply(ListViewItemApply(isOnScreen: true))
+                    }
+                }
+            }
         } else {
+            self.validMessages = [topMessageText, bottomMessageText]
             var messageNodes: [ListViewItemNode] = []
             for i in 0 ..< items.count {
                 var itemNode: ListViewItemNode?
@@ -890,6 +1169,8 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
         
         if self.cropNode.supernode == nil {
             self.imageNode.frame = self.wrapperNode.bounds
+            self.nativeNode.frame = self.wrapperNode.bounds
+            self.nativeNode.updateLayout(size: self.nativeNode.bounds.size, transition: .immediate)
             self.blurredNode.frame = self.imageNode.frame
         } else {
             self.cropNode.frame = self.wrapperNode.bounds
@@ -903,20 +1184,21 @@ final class WallpaperGalleryItemNode: GalleryItemNode {
             self.blurredNode.frame = self.imageNode.bounds
         }
         
-        var additionalYOffset: CGFloat = 0.0
-        if self.patternButtonNode.isSelected {
-            additionalYOffset = -190.0
-        }
+        let additionalYOffset: CGFloat = 0.0
         
         self.statusNode.frame = CGRect(x: layout.safeInsets.left + floorToScreenPixels((layout.size.width - layout.safeInsets.left - layout.safeInsets.right - progressDiameter) / 2.0), y: floorToScreenPixels((layout.size.height + additionalYOffset - progressDiameter) / 2.0), width: progressDiameter, height: progressDiameter)
         
         self.updateButtonsLayout(layout: layout, offset: CGPoint(x: offset, y: 0.0), transition: transition)
         self.updateMessagesLayout(layout: layout, offset: CGPoint(x: offset, y: 0.0), transition: transition)
         
-        self.validLayout = layout
+        self.validLayout = (layout, navigationBarHeight)
     }
     
     override func visibilityUpdated(isVisible: Bool) {
         super.visibilityUpdated(isVisible: isVisible)
     }
+
+    func animateWallpaperAppeared() {
+        self.nativeNode.animateEvent(transition: .animated(duration: 2.0, curve: .spring), extendAnimation: true)
+    }
 }
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
index 97e93331b7..ae64944748 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
@@ -35,6 +35,7 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode {
     private let cancelHighlightBackgroundNode = ASDisplayNode()
     private let doneButton = HighlightTrackingButtonNode()
     private let doneHighlightBackgroundNode = ASDisplayNode()
+    private let backgroundNode = NavigationBackgroundNode(color: .clear)
     private let separatorNode = ASDisplayNode()
     private let topSeparatorNode = ASDisplayNode()
     
@@ -51,7 +52,8 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode {
         self.doneHighlightBackgroundNode.alpha = 0.0
         
         super.init()
-        
+
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.cancelHighlightBackgroundNode)
         self.addSubnode(self.cancelButton)
         self.addSubnode(self.doneHighlightBackgroundNode)
@@ -96,7 +98,7 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode {
     
     func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) {
         self.theme = theme
-        self.backgroundColor = theme.rootController.tabBar.backgroundColor
+        self.backgroundNode.updateColor(color: theme.rootController.tabBar.backgroundColor, transition: .immediate)
         self.separatorNode.backgroundColor = theme.rootController.tabBar.separatorColor
         self.topSeparatorNode.backgroundColor = theme.rootController.tabBar.separatorColor
         self.cancelHighlightBackgroundNode.backgroundColor = theme.list.itemHighlightedBackgroundColor
@@ -132,6 +134,8 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode {
         self.doneHighlightBackgroundNode.frame = CGRect(origin: CGPoint(x: floor(size.width / 2.0), y: 0.0), size: CGSize(width: size.width - floor(size.width / 2.0), height: size.height))
         self.separatorNode.frame = CGRect(origin: CGPoint(x: floor(size.width / 2.0), y: 0.0), size: CGSize(width: UIScreenPixel, height: size.height + layout.intrinsicInsets.bottom))
         self.topSeparatorNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: UIScreenPixel))
+        self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.backgroundNode.update(size: CGSize(width: size.width, height: size.height + layout.intrinsicInsets.bottom), transition: .immediate)
     }
     
     @objc func cancelPressed() {
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
index b57c724bfc..b0ebf964cb 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperOptionButtonNode.swift
@@ -9,10 +9,33 @@ import CheckNode
 enum WallpaperOptionButtonValue {
     case check(Bool)
     case color(Bool, UIColor)
+    case colors(Bool, [UIColor])
+}
+
+private func generateColorsImage(diameter: CGFloat, colors: [UIColor]) -> UIImage? {
+    return generateImage(CGSize(width: diameter, height: diameter), rotatedContext: { size, context in
+        context.clear(CGRect(origin: CGPoint(), size: size))
+
+        if !colors.isEmpty {
+            let center = CGPoint(x: size.width / 2.0, y: size.height / 2.0)
+            var startAngle = -CGFloat.pi * 0.5
+            for i in 0 ..< colors.count {
+                context.setFillColor(colors[i].cgColor)
+
+                let endAngle = startAngle + 2.0 * CGFloat.pi * (1.0 / CGFloat(colors.count))
+
+                context.move(to: center)
+                context.addArc(center: center, radius: size.width / 2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false)
+                context.fillPath()
+
+                startAngle = endAngle
+            }
+        }
+    })
 }
 
 final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
-    private let backgroundNode: ASDisplayNode
+    private let backgroundNode: NavigationBackgroundNode
     private let checkNode: CheckNode
     private let colorNode: ASImageNode
     private let textNode: ASTextNode
@@ -23,16 +46,18 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
     override var isSelected: Bool {
         get {
             switch self._value {
-                case let .check(selected), let .color(selected, _):
-                    return selected
+            case let .check(selected), let .color(selected, _), let .colors(selected, _):
+                return selected
             }
         }
         set {
             switch self._value {
-                case .check:
-                    self._value = .check(newValue)
-                case let .color(_, color):
-                    self._value = .color(newValue, color)
+            case .check:
+                self._value = .check(newValue)
+            case let .color(_, color):
+                self._value = .color(newValue, color)
+            case let .colors(_, colors):
+                self._value = .colors(newValue, colors)
             }
             self.checkNode.setSelected(newValue, animated: false)
         }
@@ -41,8 +66,7 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
     init(title: String, value: WallpaperOptionButtonValue) {
         self._value = value
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = UIColor(rgb: 0x000000, alpha: 0.3)
+        self.backgroundNode = NavigationBackgroundNode(color: UIColor(rgb: 0x000000, alpha: 0.3))
         self.backgroundNode.cornerRadius = 14.0
         
         self.checkNode = CheckNode(theme: CheckNodeTheme(backgroundColor: .white, strokeColor: .clear, borderColor: .white, overlayBorder: false, hasInset: false, hasShadow: false, borderWidth: 1.5))
@@ -56,14 +80,18 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
         super.init()
         
         switch value {
-            case let .check(selected):
-                self.checkNode.isHidden = false
-                self.colorNode.isHidden = true
-                self.checkNode.selected = selected
-            case let .color(_, color):
-                self.checkNode.isHidden = true
-                self.colorNode.isHidden = false
-                self.colorNode.image = generateFilledCircleImage(diameter: 18.0, color: color)
+        case let .check(selected):
+            self.checkNode.isHidden = false
+            self.colorNode.isHidden = true
+            self.checkNode.selected = selected
+        case let .color(_, color):
+            self.checkNode.isHidden = true
+            self.colorNode.isHidden = false
+            self.colorNode.image = generateFilledCircleImage(diameter: 18.0, color: color)
+        case let .colors(_, colors):
+            self.checkNode.isHidden = true
+            self.colorNode.isHidden = false
+            self.colorNode.image = generateColorsImage(diameter: 18.0, colors: colors)
         }
         
         self.addSubnode(self.backgroundNode)
@@ -104,7 +132,7 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
     
     var buttonColor: UIColor = UIColor(rgb: 0x000000, alpha: 0.3) {
         didSet {
-            self.backgroundNode.backgroundColor = self.buttonColor
+            self.backgroundNode.updateColor(color: self.buttonColor, transition: .immediate)
         }
     }
     
@@ -129,9 +157,50 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
             }
         }
     }
+
+    var colors: [UIColor]? {
+        get {
+            switch self._value {
+            case let .colors(_, colors):
+                return colors
+            default:
+                return nil
+            }
+        }
+        set {
+            if let colors = newValue {
+                switch self._value {
+                case let .colors(selected, current):
+                    if current.count == colors.count {
+                        var updated = false
+                        for i in 0 ..< current.count {
+                            if !current[i].isEqual(colors[i]) {
+                                updated = true
+                                break
+                            }
+                        }
+                        if !updated {
+                            return
+                        }
+                    }
+                    self._value = .colors(selected, colors)
+                    self.colorNode.image = generateColorsImage(diameter: 18.0, colors: colors)
+                default:
+                    break
+                }
+            }
+        }
+    }
     
     func setSelected(_ selected: Bool, animated: Bool = false) {
-        self._value = .check(selected)
+        switch self._value {
+        case .check:
+            self._value = .check(selected)
+        case let .color(_, color):
+            self._value = .color(selected, color)
+        case let .colors(_, colors):
+            self._value = .colors(selected, colors)
+        }
         self.checkNode.setSelected(selected, animated: animated)
     }
     
@@ -152,10 +221,11 @@ final class WallpaperOptionButtonNode: HighlightTrackingButtonNode {
     
     override func layout() {
         super.layout()
-        
+
         self.backgroundNode.frame = self.bounds
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: 15.0, transition: .immediate)
         
-        guard let textSize = self.textSize else {
+        guard let _ = self.textSize else {
             return
         }
         
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift
index 3e00ffa2ce..fa972c2292 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperPatternPanelNode.swift
@@ -9,10 +9,34 @@ import TelegramPresentationData
 import LegacyComponents
 import AccountContext
 import MergeLists
+import Postbox
 
 private let itemSize = CGSize(width: 88.0, height: 88.0)
 private let inset: CGFloat = 12.0
 
+private func intensityToSliderValue(_ value: Int32, allowDark: Bool) -> CGFloat {
+    if allowDark {
+        if value < 0 {
+            return max(0.0, min(100.0, CGFloat(abs(value))))
+        } else {
+            return 100.0 + max(0.0, min(100.0, CGFloat(value)))
+        }
+    } else {
+        return CGFloat(max(value, 0)) * 2.0
+    }
+}
+
+private func sliderValueToIntensity(_ value: CGFloat, allowDark: Bool) -> Int32 {
+    if allowDark {
+        if value < 100.0 {
+            return -Int32(max(1.0, value))
+        } else {
+            return Int32(value - 100.0)
+        }
+    } else {
+        return Int32(value / 2.0)
+    }
+}
 
 private struct WallpaperPatternEntry: Comparable, Identifiable {
     let index: Int
@@ -105,7 +129,7 @@ private final class WallpaperPatternItemNode : ListViewItemNode {
     var item: WallpaperPatternItem?
 
     init() {
-        self.wallpaperNode = SettingsThemeWallpaperNode()
+        self.wallpaperNode = SettingsThemeWallpaperNode(displayLoading: true)
         
         super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
 
@@ -165,7 +189,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
     private let context: AccountContext
     private var theme: PresentationTheme
     
-    private let backgroundNode: ASDisplayNode
+    private let backgroundNode: NavigationBackgroundNode
     private let topSeparatorNode: ASDisplayNode
     
     let scrollNode: ASScrollNode
@@ -189,10 +213,22 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
         }
     }
     
-    var backgroundColors: (UIColor, UIColor?, Int32?)? = nil {
+    var backgroundColors: ([UInt32], Int32?, Int32?)? = nil {
         didSet {
-            if oldValue?.0.rgb != self.backgroundColors?.0.rgb || oldValue?.1?.rgb != self.backgroundColors?.1?.rgb
-            || oldValue?.2 != self.backgroundColors?.2 {
+            var updated = false
+            if oldValue?.0 != self.backgroundColors?.0 || oldValue?.1 != self.backgroundColors?.1 {
+                updated = true
+            } else if oldValue?.2 != self.backgroundColors?.2 {
+                if let oldIntensity = oldValue?.2, let newIntensity = self.backgroundColors?.2 {
+                    if (oldIntensity < 0) != (newIntensity < 0) {
+                        updated = true
+                    }
+                } else if (oldValue?.2 != nil) != (self.backgroundColors?.2 != nil) {
+                    updated = true
+                }
+            }
+
+            if updated {
                 self.updateWallpapers()
             }
         }
@@ -202,12 +238,14 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
     
     var patternChanged: ((TelegramWallpaper?, Int32?, Bool) -> Void)?
 
+    private let allowDark: Bool
+
     init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings) {
         self.context = context
         self.theme = theme
+        self.allowDark = theme.overallDarkAppearance
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = self.theme.chat.inputPanel.panelBackgroundColor
+        self.backgroundNode = NavigationBackgroundNode(color: theme.chat.inputPanel.panelBackgroundColor)
         
         self.topSeparatorNode = ASDisplayNode()
         self.topSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor
@@ -230,12 +268,21 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
         
         self.addSubnode(self.titleNode)
         self.addSubnode(self.labelNode)
-        
         self.disposable = ((telegramWallpapers(postbox: context.account.postbox, network: context.account.network)
-        |> map { wallpapers in
+        |> map { wallpapers -> [TelegramWallpaper] in
+            var existingIds = Set<MediaId>()
+
             return wallpapers.filter { wallpaper in
                 if case let .file(file) = wallpaper, wallpaper.isPattern, file.file.mimeType != "image/webp" {
-                    return true
+                    if file.id == 0 {
+                        return true
+                    }
+                    if existingIds.contains(file.file.fileId) {
+                        return false
+                    } else {
+                        existingIds.insert(file.file.fileId)
+                        return true
+                    }
                 } else {
                     return false
                 }
@@ -261,16 +308,25 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
         self.scrollNode.view.alwaysBounceHorizontal = true
         
         let sliderView = TGPhotoEditorSliderView()
+        sliderView.disableSnapToPositions = true
         sliderView.trackCornerRadius = 1.0
         sliderView.lineSize = 2.0
-        sliderView.minimumValue = 0.0
         sliderView.startValue = 0.0
-        sliderView.maximumValue = 100.0
-        sliderView.value = 40.0
+        sliderView.minimumValue = 0.0
+        sliderView.maximumValue = 200.0
+        if self.allowDark {
+            sliderView.positionsCount = 3
+        }
+        sliderView.useLinesForPositions = true
+        sliderView.value = intensityToSliderValue(50, allowDark: self.allowDark)
         sliderView.disablesInteractiveTransitionGestureRecognizer = true
         sliderView.backgroundColor = .clear
         sliderView.backColor = self.theme.list.disclosureArrowColor
-        sliderView.trackColor = self.theme.list.itemAccentColor
+        if self.allowDark {
+            sliderView.trackColor = self.theme.list.disclosureArrowColor
+        } else {
+            sliderView.trackColor = self.theme.list.itemAccentColor
+        }
         
         self.view.addSubview(sliderView)
         sliderView.addTarget(self, action: #selector(self.sliderValueChanged), for: .valueChanged)
@@ -286,26 +342,35 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
             node.removeFromSupernode()
         }
           
-        let backgroundColors = self.backgroundColors ?? (UIColor(rgb: 0xd6e2ee), nil, nil)
+        let backgroundColors = self.backgroundColors ?? ([0xd6e2ee], nil, nil)
+        let intensity: Int32 = backgroundColors.2.flatMap { value in
+            if value < 0 {
+                return -80
+            } else {
+                return 80
+            }
+        } ?? 80
         
         var selectedFileId: Int64?
+        var selectedSlug: String?
         if let currentWallpaper = self.currentWallpaper, case let .file(file) = currentWallpaper {
             selectedFileId = file.id
+            selectedSlug = file.slug
         }
         
         for wallpaper in self.wallpapers {
-            let node = SettingsThemeWallpaperNode(overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4))
+            let node = SettingsThemeWallpaperNode(displayLoading: true, overlayBackgroundColor: self.serviceBackgroundColor.withAlphaComponent(0.4))
             node.clipsToBounds = true
             node.cornerRadius = 5.0
             
             var updatedWallpaper = wallpaper
             if case let .file(file) = updatedWallpaper {
-                let settings = WallpaperSettings(color: backgroundColors.0.rgb, bottomColor: backgroundColors.1.flatMap { $0.rgb }, intensity: 100, rotation: backgroundColors.2)
+                let settings = WallpaperSettings(colors: backgroundColors.0, intensity: intensity, rotation: backgroundColors.1)
                 updatedWallpaper = .file(id: file.id, accessHash: file.accessHash, isCreator: file.isCreator, isDefault: file.isDefault, isPattern: updatedWallpaper.isPattern, isDark: file.isDark, slug: file.slug, file: file.file, settings: settings)
             }
             
             var selected = false
-            if case let .file(file) = wallpaper, file.id == selectedFileId {
+            if case let .file(file) = wallpaper, (file.id == selectedFileId || file.slug == selectedSlug) {
                 selected = true
             }
             
@@ -314,7 +379,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
                 if let strongSelf = self {
                     strongSelf.currentWallpaper = updatedWallpaper
                     if let sliderView = strongSelf.sliderView {
-                        strongSelf.patternChanged?(updatedWallpaper, Int32(sliderView.value), false)
+                        strongSelf.patternChanged?(updatedWallpaper, sliderValueToIntensity(sliderView.value, allowDark: strongSelf.allowDark), false)
                     }
                     if let subnodes = strongSelf.scrollNode.subnodes {
                         for case let subnode as SettingsThemeWallpaperNode in subnodes {
@@ -337,11 +402,15 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
     func updateTheme(_ theme: PresentationTheme) {
         self.theme = theme
         
-        self.backgroundNode.backgroundColor = self.theme.chat.inputPanel.panelBackgroundColor
+        self.backgroundNode.updateColor(color: self.theme.chat.inputPanel.panelBackgroundColor, transition: .immediate)
         self.topSeparatorNode.backgroundColor = self.theme.chat.inputPanel.panelSeparatorColor
             
         self.sliderView?.backColor = self.theme.list.disclosureArrowColor
-        self.sliderView?.trackColor = self.theme.list.itemAccentColor
+        if self.allowDark {
+            self.sliderView?.trackColor = self.theme.list.disclosureArrowColor
+        } else {
+            self.sliderView?.trackColor = self.theme.list.itemAccentColor
+        }
         self.titleNode.attributedText = NSAttributedString(string: self.labelNode.attributedText?.string ?? "", font: Font.bold(17.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
         self.labelNode.attributedText = NSAttributedString(string: self.labelNode.attributedText?.string ?? "", font: Font.regular(14.0), textColor: self.theme.rootController.navigationBar.primaryTextColor)
         
@@ -356,12 +425,19 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
         }
         
         if let wallpaper = self.currentWallpaper {
-            self.patternChanged?(wallpaper, Int32(sliderView.value), sliderView.isTracking)
+            self.patternChanged?(wallpaper, sliderValueToIntensity(sliderView.value, allowDark: self.allowDark), sliderView.isTracking)
         }
     }
     
     func didAppear(initialWallpaper: TelegramWallpaper? = nil, intensity: Int32? = nil) {
-        var wallpaper = initialWallpaper ?? self.wallpapers.first
+        let wallpaper: TelegramWallpaper?
+
+        switch initialWallpaper {
+        case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, _):
+            wallpaper = .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: isPattern, isDark: isDark, slug: slug, file: file, settings: self.wallpapers[0].settings ?? WallpaperSettings())
+        default:
+            wallpaper = self.wallpapers.first
+        }
         
         if let wallpaper = wallpaper {
             var selectedFileId: Int64?
@@ -370,7 +446,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
             }
             
             self.currentWallpaper = wallpaper
-            self.sliderView?.value = CGFloat(intensity ?? 50)
+            self.sliderView?.value = intensity.flatMap { intensityToSliderValue($0, allowDark: self.allowDark) } ?? intensityToSliderValue(50, allowDark: self.allowDark)
             
             self.scrollNode.view.contentOffset = CGPoint()
             
@@ -386,8 +462,8 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
                 }
             }
                         
-            if initialWallpaper == nil, let wallpaper = self.currentWallpaper, let sliderView = self.sliderView {
-                self.patternChanged?(wallpaper, Int32(sliderView.value), false)
+            if let wallpaper = self.currentWallpaper, let sliderView = self.sliderView {
+                self.patternChanged?(wallpaper, sliderValueToIntensity(sliderView.value, allowDark: self.allowDark), false)
             }
             
             if let selectedNode = selectedNode {
@@ -418,6 +494,7 @@ final class WallpaperPatternPanelNode: ASDisplayNode {
         self.validLayout = size
         
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
         transition.updateFrame(node: self.topSeparatorNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: UIScreenPixel))
         
         let titleSize = self.titleNode.updateLayout(self.bounds.size)
diff --git a/submodules/SettingsUI/Sources/UsernameSetupController.swift b/submodules/SettingsUI/Sources/UsernameSetupController.swift
index cede57928c..26789fa576 100644
--- a/submodules/SettingsUI/Sources/UsernameSetupController.swift
+++ b/submodules/SettingsUI/Sources/UsernameSetupController.swift
@@ -260,7 +260,7 @@ public func usernameSetupController(context: AccountContext) -> ViewController {
                 return state.withUpdatedEditingPublicLinkText(text)
             }
             
-            checkAddressNameDisposable.set((validateAddressNameInteractive(account: context.account, domain: .account, name: text)
+            checkAddressNameDisposable.set((context.engine.peers.validateAddressNameInteractive(domain: .account, name: text)
             |> deliverOnMainQueue).start(next: { result in
                 updateState { state in
                     return state.withUpdatedAddressNameValidationStatus(result)
@@ -325,7 +325,7 @@ public func usernameSetupController(context: AccountContext) -> ViewController {
                     }
                     
                     if let updatedAddressNameValue = updatedAddressNameValue {
-                        updateAddressNameDisposable.set((updateAddressName(account: context.account, domain: .account, name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue)
+                        updateAddressNameDisposable.set((context.engine.peers.updateAddressName(domain: .account, name: updatedAddressNameValue.isEmpty ? nil : updatedAddressNameValue)
                             |> deliverOnMainQueue).start(error: { _ in
                                 updateState { state in
                                     return state.withUpdatedUpdatingAddressName(false)
diff --git a/submodules/ShareController/BUILD b/submodules/ShareController/BUILD
index 0ea81b3ebf..d86123a68d 100644
--- a/submodules/ShareController/BUILD
+++ b/submodules/ShareController/BUILD
@@ -27,6 +27,7 @@ swift_library(
         "//submodules/TelegramIntents:TelegramIntents",
         "//submodules/AccountContext:AccountContext",
         "//submodules/SegmentedControlNode:SegmentedControlNode",
+        "//submodules/WallpaperBackgroundNode:WallpaperBackgroundNode",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/ShareController/Sources/ShareController.swift b/submodules/ShareController/Sources/ShareController.swift
index 76e8adbeac..b2ebd337a7 100644
--- a/submodules/ShareController/Sources/ShareController.swift
+++ b/submodules/ShareController/Sources/ShareController.swift
@@ -16,6 +16,7 @@ import UrlEscaping
 import StickerResources
 import SaveToCameraRoll
 import TelegramStringFormatting
+import WallpaperBackgroundNode
 
 public struct ShareControllerAction {
     let title: String
@@ -299,7 +300,7 @@ public final class ShareController: ViewController {
     private var currentAccount: Account
     private var presentationData: PresentationData
     private var presentationDataDisposable: Disposable?
-    private let forcedTheme: PresentationTheme?
+    private let forceTheme: PresentationTheme?
     
     private let externalShare: Bool
     private let immediateExternalShare: Bool
@@ -326,12 +327,14 @@ public final class ShareController: ViewController {
             }
         }
     }
+
+    public var debugAction: (() -> Void)?
     
-    public convenience init(context: AccountContext, subject: ShareControllerSubject, presetText: String? = nil, preferredAction: ShareControllerPreferredAction = .default, showInChat: ((Message) -> Void)? = nil, fromForeignApp: Bool = false, segmentedValues: [ShareControllerSegmentedValue]? = nil, externalShare: Bool = true, immediateExternalShare: Bool = false, switchableAccounts: [AccountWithInfo] = [], immediatePeerId: PeerId? = nil, forcedTheme: PresentationTheme? = nil, forcedActionTitle: String? = nil) {
-        self.init(sharedContext: context.sharedContext, currentContext: context, subject: subject, presetText: presetText, preferredAction: preferredAction, showInChat: showInChat, fromForeignApp: fromForeignApp, segmentedValues: segmentedValues, externalShare: externalShare, immediateExternalShare: immediateExternalShare, switchableAccounts: switchableAccounts, immediatePeerId: immediatePeerId, forcedTheme: forcedTheme, forcedActionTitle: forcedActionTitle)
+    public convenience init(context: AccountContext, subject: ShareControllerSubject, presetText: String? = nil, preferredAction: ShareControllerPreferredAction = .default, showInChat: ((Message) -> Void)? = nil, fromForeignApp: Bool = false, segmentedValues: [ShareControllerSegmentedValue]? = nil, externalShare: Bool = true, immediateExternalShare: Bool = false, switchableAccounts: [AccountWithInfo] = [], immediatePeerId: PeerId? = nil, forceTheme: PresentationTheme? = nil, forcedActionTitle: String? = nil) {
+        self.init(sharedContext: context.sharedContext, currentContext: context, subject: subject, presetText: presetText, preferredAction: preferredAction, showInChat: showInChat, fromForeignApp: fromForeignApp, segmentedValues: segmentedValues, externalShare: externalShare, immediateExternalShare: immediateExternalShare, switchableAccounts: switchableAccounts, immediatePeerId: immediatePeerId, forceTheme: forceTheme, forcedActionTitle: forcedActionTitle)
     }
     
-    public init(sharedContext: SharedAccountContext, currentContext: AccountContext, subject: ShareControllerSubject, presetText: String? = nil, preferredAction: ShareControllerPreferredAction = .default, showInChat: ((Message) -> Void)? = nil, fromForeignApp: Bool = false, segmentedValues: [ShareControllerSegmentedValue]? = nil, externalShare: Bool = true, immediateExternalShare: Bool = false, switchableAccounts: [AccountWithInfo] = [], immediatePeerId: PeerId? = nil, forcedTheme: PresentationTheme? = nil, forcedActionTitle: String? = nil) {
+    public init(sharedContext: SharedAccountContext, currentContext: AccountContext, subject: ShareControllerSubject, presetText: String? = nil, preferredAction: ShareControllerPreferredAction = .default, showInChat: ((Message) -> Void)? = nil, fromForeignApp: Bool = false, segmentedValues: [ShareControllerSegmentedValue]? = nil, externalShare: Bool = true, immediateExternalShare: Bool = false, switchableAccounts: [AccountWithInfo] = [], immediatePeerId: PeerId? = nil, forceTheme: PresentationTheme? = nil, forcedActionTitle: String? = nil) {
         self.sharedContext = sharedContext
         self.currentContext = currentContext
         self.currentAccount = currentContext.account
@@ -343,11 +346,11 @@ public final class ShareController: ViewController {
         self.immediatePeerId = immediatePeerId
         self.fromForeignApp = fromForeignApp
         self.segmentedValues = segmentedValues
-        self.forcedTheme = forcedTheme
+        self.forceTheme = forceTheme
         
         self.presentationData = self.sharedContext.currentPresentationData.with { $0 }
-        if let forcedTheme = self.forcedTheme {
-            self.presentationData = self.presentationData.withUpdated(theme: forcedTheme)
+        if let forceTheme = self.forceTheme {
+            self.presentationData = self.presentationData.withUpdated(theme: forceTheme)
         }
         
         super.init(navigationBarPresentationData: nil)
@@ -432,7 +435,7 @@ public final class ShareController: ViewController {
                                 guard let strongSelf = self else {
                                     return
                                 }
-                                let _ = (exportMessageLink(account: strongSelf.currentAccount, peerId: chatPeer.id, messageId: message.id)
+                                let _ = (TelegramEngine(account: strongSelf.currentAccount).messages.exportMessageLink(peerId: chatPeer.id, messageId: message.id)
                                 |> map { result -> String? in
                                     return result
                                 }
@@ -487,17 +490,17 @@ public final class ShareController: ViewController {
                 return
             }
             strongSelf.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: title, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-        }, externalShare: self.externalShare, immediateExternalShare: self.immediateExternalShare, immediatePeerId: self.immediatePeerId, fromForeignApp: self.fromForeignApp, forcedTheme: self.forcedTheme, segmentedValues: self.segmentedValues)
+        }, externalShare: self.externalShare, immediateExternalShare: self.immediateExternalShare, immediatePeerId: self.immediatePeerId, fromForeignApp: self.fromForeignApp, forceTheme: self.forceTheme, segmentedValues: self.segmentedValues)
         self.controllerNode.completed = self.completed
         self.controllerNode.dismiss = { [weak self] shared in
-            self?.presentingViewController?.dismiss(animated: false, completion: nil)
             self?.dismissed?(shared)
+            self?.presentingViewController?.dismiss(animated: false, completion: nil)
         }
         self.controllerNode.cancel = { [weak self] in
             self?.controllerNode.view.endEditing(true)
             self?.controllerNode.animateOut(shared: false, completion: {
-                self?.presentingViewController?.dismiss(animated: false, completion: nil)
                 self?.dismissed?(false)
+                self?.presentingViewController?.dismiss(animated: false, completion: nil)
             })
         }
         self.controllerNode.share = { [weak self] text, peerIds in
@@ -517,9 +520,9 @@ public final class ShareController: ViewController {
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: url + "\n\n" + text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: url + "\n\n" + text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     } else {
-                        messages.append(.message(text: url, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: url, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
@@ -527,58 +530,58 @@ public final class ShareController: ViewController {
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
-                    messages.append(.message(text: string, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                    messages.append(.message(text: string, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
             case let .quote(string, url):
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
                     let attributedText = NSMutableAttributedString(string: string, attributes: [ChatTextInputAttributes.italic: true as NSNumber])
                     attributedText.append(NSAttributedString(string: "\n\n\(url)"))
                     let entities = generateChatInputTextEntities(attributedText)
-                    messages.append(.message(text: attributedText.string, attributes: [TextEntitiesMessageAttribute(entities: entities)], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                    messages.append(.message(text: attributedText.string, attributes: [TextEntitiesMessageAttribute(entities: entities)], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
             case let .image(representations):
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
-                    messages.append(.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: arc4random64()), representations: representations.map({ $0.representation }), immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])), replyToMessageId: nil, localGroupingKey: nil))
+                    messages.append(.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: Int64.random(in: Int64.min ... Int64.max)), representations: representations.map({ $0.representation }), immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
             case let .media(mediaReference):
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
-                    messages.append(.message(text: "", attributes: [], mediaReference: mediaReference, replyToMessageId: nil, localGroupingKey: nil))
+                    messages.append(.message(text: "", attributes: [], mediaReference: mediaReference, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
             case let .mapMedia(media):
                 for peerId in peerIds {
                     var messages: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
-                    messages.append(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil))
+                    messages.append(.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messages))
                 }
             case let .messages(messages):
                 for peerId in peerIds {
                     var messagesToEnqueue: [EnqueueMessage] = []
                     if !text.isEmpty {
-                        messagesToEnqueue.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                        messagesToEnqueue.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
                     }
                     for message in messages {
-                        messagesToEnqueue.append(.forward(source: message.id, grouping: .auto, attributes: []))
+                        messagesToEnqueue.append(.forward(source: message.id, grouping: .auto, attributes: [], correlationId: nil))
                     }
                     shareSignals.append(enqueueMessages(account: strongSelf.currentAccount, peerId: peerId, messages: messagesToEnqueue))
                 }
@@ -616,7 +619,7 @@ public final class ShareController: ViewController {
                         if let error = error {
                             Queue.mainQueue().async {
                                 let _ = (account.postbox.transaction { transaction -> Peer? in
-                                    deleteMessages(transaction: transaction, mediaBox: account.postbox.mediaBox, ids: [id])
+                                    TelegramEngine(account: account).messages.deleteMessages(transaction: transaction, ids: [id])
                                     return transaction.getPeer(id.peerId)
                                 }
                                 |> deliverOnMainQueue).start(next: { peer in
@@ -661,7 +664,7 @@ public final class ShareController: ViewController {
                     case let .quote(text, url):
                         collectableItems.append(CollectableExternalShareItem(url: "", text: "\"\(text)\"\n\n\(url)", author: nil, timestamp: nil, mediaReference: nil))
                     case let .image(representations):
-                        let media = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: arc4random64()), representations: representations.map({ $0.representation }), immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
+                        let media = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: Int64.random(in: Int64.min ... Int64.max)), representations: representations.map({ $0.representation }), immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                         collectableItems.append(CollectableExternalShareItem(url: "", text: "", author: nil, timestamp: nil, mediaReference: .standalone(media: media)))
                     case let .media(mediaReference):
                         collectableItems.append(CollectableExternalShareItem(url: "", text: "", author: nil, timestamp: nil, mediaReference: mediaReference))
@@ -706,7 +709,19 @@ public final class ShareController: ViewController {
                             } else {
                                 authorPeerId = accountPeerId
                             }
-                            collectableItems.append(CollectableExternalShareItem(url: url, text: message.text, author: authorPeerId, timestamp: message.timestamp, mediaReference: selectedMedia.flatMap({ AnyMediaReference.message(message: MessageReference(message), media: $0) })))
+                            
+                            var restrictedText: String?
+                            for attribute in message.attributes {
+                                if let attribute = attribute as? RestrictedContentMessageAttribute {
+                                    restrictedText = attribute.platformText(platform: "ios", contentSettings: strongSelf.currentContext.currentContentSettings.with { $0 }) ?? ""
+                                }
+                            }
+                            
+                            if let restrictedText = restrictedText {
+                                collectableItems.append(CollectableExternalShareItem(url: url, text: restrictedText, author: authorPeerId, timestamp: message.timestamp, mediaReference: nil))
+                            } else {
+                                collectableItems.append(CollectableExternalShareItem(url: url, text: message.text, author: authorPeerId, timestamp: message.timestamp, mediaReference: selectedMedia.flatMap({ AnyMediaReference.message(message: MessageReference(message), media: $0) })))
+                            }
                         }
                     case .fromExternal:
                         break
@@ -800,6 +815,9 @@ public final class ShareController: ViewController {
             strongSelf.view.endEditing(true)
             strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
         }
+        self.controllerNode.debugAction = { [weak self] in
+            self?.debugAction?()
+        }
         self.displayNodeDidLoad()
         
         self.peersDisposable.set((self.peers.get()
@@ -839,7 +857,7 @@ public final class ShareController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func saveToCameraRoll(messages: [Message]) {
@@ -967,9 +985,8 @@ final class MessageStoryRenderer {
 
         self.containerNode = ASDisplayNode()
         
-        self.instantChatBackgroundNode = WallpaperBackgroundNode()
+        self.instantChatBackgroundNode = WallpaperBackgroundNode(context: context)
         self.instantChatBackgroundNode.displaysAsynchronously = false
-        self.instantChatBackgroundNode.image = chatControllerBackgroundImage(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper)
         
         self.messagesContainerNode = ASDisplayNode()
         self.messagesContainerNode.clipsToBounds = true
@@ -1012,7 +1029,7 @@ final class MessageStoryRenderer {
         let theme = self.presentationData.theme.withUpdated(preview: true)
         let headerItem = self.context.sharedContext.makeChatMessageDateHeaderItem(context: self.context, timestamp: self.messages.first?.timestamp ?? 0, theme: theme, strings: self.presentationData.strings, wallpaper: self.presentationData.chatWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder)
     
-        let items: [ListViewItem] = [self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: self.messages, theme: theme, strings: self.presentationData.strings, wallpaper: self.presentationData.theme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil)]
+        let items: [ListViewItem] = [self.context.sharedContext.makeChatMessagePreviewItem(context: self.context, messages: self.messages, theme: theme, strings: self.presentationData.strings, wallpaper: self.presentationData.theme.chat.defaultWallpaper, fontSize: self.presentationData.chatFontSize, chatBubbleCorners: self.presentationData.chatBubbleCorners, dateTimeFormat: self.presentationData.dateTimeFormat, nameOrder: self.presentationData.nameDisplayOrder, forcedResourceStatus: nil, tapMessage: nil, clickThroughMessage: nil, backgroundNode: nil)]
     
         let inset: CGFloat = 16.0
         let width = layout.size.width - inset * 2.0
@@ -1065,7 +1082,7 @@ final class MessageStoryRenderer {
             dateHeaderNode = currentDateHeaderNode
             headerItem.updateNode(dateHeaderNode, previous: nil, next: headerItem)
         } else {
-            dateHeaderNode = headerItem.node()
+            dateHeaderNode = headerItem.node(synchronousLoad: true)
             dateHeaderNode.subnodeTransform = CATransform3DMakeScale(-1.0, 1.0, 1.0)
             self.messagesContainerNode.addSubnode(dateHeaderNode)
             self.dateHeaderNode = dateHeaderNode
diff --git a/submodules/ShareController/Sources/ShareControllerNode.swift b/submodules/ShareController/Sources/ShareControllerNode.swift
index 4d33c1a50f..9608e6275e 100644
--- a/submodules/ShareController/Sources/ShareControllerNode.swift
+++ b/submodules/ShareController/Sources/ShareControllerNode.swift
@@ -25,7 +25,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
     private let sharedContext: SharedAccountContext
     private var context: AccountContext?
     private var presentationData: PresentationData
-    private let forcedTheme: PresentationTheme?
+    private let forceTheme: PresentationTheme?
     private let externalShare: Bool
     private let immediateExternalShare: Bool
     private var immediatePeerId: PeerId?
@@ -61,6 +61,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
     var share: ((String, [PeerId]) -> Signal<ShareState, NoError>)?
     var shareExternal: (() -> Signal<ShareExternalState, NoError>)?
     var switchToAnotherAccount: (() -> Void)?
+    var debugAction: (() -> Void)?
     var openStats: (() -> Void)?
     var completed: (([PeerId]) -> Void)?
     
@@ -80,10 +81,10 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
     
     private let presetText: String?
     
-    init(sharedContext: SharedAccountContext, presetText: String?, defaultAction: ShareControllerAction?, requestLayout: @escaping (ContainedViewLayoutTransition) -> Void, presentError: @escaping (String?, String) -> Void, externalShare: Bool, immediateExternalShare: Bool, immediatePeerId: PeerId?, fromForeignApp: Bool, forcedTheme: PresentationTheme?, segmentedValues: [ShareControllerSegmentedValue]?) {
+    init(sharedContext: SharedAccountContext, presetText: String?, defaultAction: ShareControllerAction?, requestLayout: @escaping (ContainedViewLayoutTransition) -> Void, presentError: @escaping (String?, String) -> Void, externalShare: Bool, immediateExternalShare: Bool, immediatePeerId: PeerId?, fromForeignApp: Bool, forceTheme: PresentationTheme?, segmentedValues: [ShareControllerSegmentedValue]?) {
         self.sharedContext = sharedContext
         self.presentationData = sharedContext.currentPresentationData.with { $0 }
-        self.forcedTheme = forcedTheme
+        self.forceTheme = forceTheme
         self.externalShare = externalShare
         self.immediateExternalShare = immediateExternalShare
         self.immediatePeerId = immediatePeerId
@@ -96,8 +97,8 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
         self.defaultAction = defaultAction
         self.requestLayout = requestLayout
         
-        if let forcedTheme = self.forcedTheme {
-            self.presentationData = self.presentationData.withUpdated(theme: forcedTheme)
+        if let forceTheme = self.forceTheme {
+            self.presentationData = self.presentationData.withUpdated(theme: forceTheme)
         }
         
         let roundedBackground = generateStretchableFilledCircleImage(radius: 16.0, color: self.presentationData.theme.actionSheet.opaqueItemBackgroundColor)
@@ -272,8 +273,8 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
             return
         }
         self.presentationData = presentationData
-        if let forcedTheme = self.forcedTheme {
-            self.presentationData = self.presentationData.withUpdated(theme: forcedTheme)
+        if let forceTheme = self.forceTheme {
+            self.presentationData = self.presentationData.withUpdated(theme: forceTheme)
         }
         
         let roundedBackground = generateStretchableFilledCircleImage(radius: 16.0, color: self.presentationData.theme.actionSheet.opaqueItemBackgroundColor)
@@ -378,7 +379,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
                         let animation = contentNode.layer.makeAnimation(from: 0.0 as NSNumber, to: 1.0 as NSNumber, keyPath: "opacity", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.35)
                         animation.fillMode = .both
                         if !fastOut {
-                            animation.beginTime = CACurrentMediaTime() + 0.1
+                            animation.beginTime = contentNode.layer.convertTime(CACurrentMediaTime(), from: nil) + 0.1
                         }
                         contentNode.layer.add(animation, forKey: "opacity")
                     }
@@ -594,6 +595,13 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
                 self.animateOut(shared: true, completion: {
                 })
                 self.completed?(peerIds)
+                
+                Queue.mainQueue().after(0.44) {
+                    if self.hapticFeedback == nil {
+                        self.hapticFeedback = HapticFeedback()
+                    }
+                    self.hapticFeedback?.success()
+                }
             }
             let fromForeignApp = self.fromForeignApp
             self.shareDisposable.set((signal
@@ -730,10 +738,12 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
         let animated = self.peersContentNode == nil
         let peersContentNode = SharePeersContainerNode(sharedContext: self.sharedContext, context: context, switchableAccounts: switchableAccounts, theme: self.presentationData.theme, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder, peers: peers, accountPeer: accountPeer, controllerInteraction: self.controllerInteraction!, externalShare: self.externalShare, switchToAnotherAccount: { [weak self] in
             self?.switchToAnotherAccount?()
+        }, debugAction: { [weak self] in
+            self?.debugAction?()
         }, extendedInitialReveal: self.presetText != nil, segmentedValues: self.segmentedValues)
         self.peersContentNode = peersContentNode
         peersContentNode.openSearch = { [weak self] in
-            let _ = (recentlySearchedPeers(postbox: context.account.postbox)
+            let _ = (context.engine.peers.recentlySearchedPeers()
             |> take(1)
             |> deliverOnMainQueue).start(next: { peers in
                 if let strongSelf = self {
diff --git a/submodules/ShareController/Sources/ShareInputFieldNode.swift b/submodules/ShareController/Sources/ShareInputFieldNode.swift
index cc60e09b3b..47de1c6bc3 100644
--- a/submodules/ShareController/Sources/ShareInputFieldNode.swift
+++ b/submodules/ShareController/Sources/ShareInputFieldNode.swift
@@ -170,10 +170,10 @@ public final class ShareInputFieldNode: ASDisplayNode, ASEditableTextNodeDelegat
     @objc public func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) {
         self.updateTextNodeText(animated: true)
         self.updateText?(editableTextNode.attributedText?.string ?? "")
+        self.placeholderNode.isHidden = !(editableTextNode.textView.text ?? "").isEmpty
     }
     
     public func editableTextNodeDidBeginEditing(_ editableTextNode: ASEditableTextNode) {
-        self.placeholderNode.isHidden = true
         self.clearButton.isHidden = false
         
         if self.selectTextOnce {
diff --git a/submodules/ShareController/Sources/SharePeersContainerNode.swift b/submodules/ShareController/Sources/SharePeersContainerNode.swift
index 8b05d91369..381beb78e5 100644
--- a/submodules/ShareController/Sources/SharePeersContainerNode.swift
+++ b/submodules/ShareController/Sources/SharePeersContainerNode.swift
@@ -81,6 +81,7 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
     private let nameDisplayOrder: PresentationPersonNameOrder
     private let controllerInteraction: ShareControllerInteraction
     private let switchToAnotherAccount: () -> Void
+    private let debugAction: () -> Void
     private let extendedInitialReveal: Bool
     
     let accountPeer: Peer
@@ -113,7 +114,7 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
     
     let peersValue = Promise<[(RenderedPeer, PeerPresence?)]>()
     
-    init(sharedContext: SharedAccountContext, context: AccountContext, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peers: [(RenderedPeer, PeerPresence?)], accountPeer: Peer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void, extendedInitialReveal: Bool, segmentedValues: [ShareControllerSegmentedValue]?) {
+    init(sharedContext: SharedAccountContext, context: AccountContext, switchableAccounts: [AccountWithInfo], theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, peers: [(RenderedPeer, PeerPresence?)], accountPeer: Peer, controllerInteraction: ShareControllerInteraction, externalShare: Bool, switchToAnotherAccount: @escaping () -> Void, debugAction: @escaping () -> Void, extendedInitialReveal: Bool, segmentedValues: [ShareControllerSegmentedValue]?) {
         self.sharedContext = sharedContext
         self.context = context
         self.theme = theme
@@ -122,6 +123,7 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
         self.controllerInteraction = controllerInteraction
         self.accountPeer = accountPeer
         self.switchToAnotherAccount = switchToAnotherAccount
+        self.debugAction = debugAction
         self.extendedInitialReveal = extendedInitialReveal
         self.segmentedValues = segmentedValues
         
@@ -133,14 +135,16 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
             var index: Int32 = 0
             
             var existingPeerIds: Set<PeerId> = Set()
-            
             entries.append(SharePeerEntry(index: index, peer: RenderedPeer(peer: accountPeer), presence: nil, theme: theme, strings: strings))
+            existingPeerIds.insert(accountPeer.id)
             index += 1
             
             for peer in foundPeers.reversed() {
-                entries.append(SharePeerEntry(index: index, peer: peer, presence: nil, theme: theme, strings: strings))
-                existingPeerIds.insert(peer.peerId)
-                index += 1
+                if !existingPeerIds.contains(peer.peerId) {
+                    entries.append(SharePeerEntry(index: index, peer: peer, presence: nil, theme: theme, strings: strings))
+                    existingPeerIds.insert(peer.peerId)
+                    index += 1
+                }
             }
             
             for (peer, presence) in initialPeers {
@@ -238,6 +242,8 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
         self.segmentedNode.selectedIndexChanged = { [weak self] index in
             self?.segmentedSelectedIndexUpdated?(index)
         }
+
+        self.contentTitleNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.debugTapGesture(_:))))
     }
     
     deinit {
@@ -462,4 +468,27 @@ final class SharePeersContainerNode: ASDisplayNode, ShareContentContainerNode {
     @objc private func accountTapGesture(_ recognizer: UITapGestureRecognizer) {
         self.switchToAnotherAccount()
     }
+
+    private var debugTapCounter: (Double, Int) = (0.0, 0)
+
+    @objc private func debugTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            let timestamp = CACurrentMediaTime()
+            if self.debugTapCounter.0 < timestamp - 0.4 {
+                self.debugTapCounter.0 = timestamp
+                self.debugTapCounter.1 = 0
+            }
+
+            if self.debugTapCounter.0 >= timestamp - 0.4 {
+                self.debugTapCounter.0 = timestamp
+                self.debugTapCounter.1 += 1
+            }
+
+            if self.debugTapCounter.1 >= 10 {
+                self.debugTapCounter.1 = 0
+
+                self.debugAction()
+            }
+        }
+    }
 }
diff --git a/submodules/ShareController/Sources/ShareSearchContainerNode.swift b/submodules/ShareController/Sources/ShareSearchContainerNode.swift
index 2cba52dc8b..51dac1c75d 100644
--- a/submodules/ShareController/Sources/ShareSearchContainerNode.swift
+++ b/submodules/ShareController/Sources/ShareSearchContainerNode.swift
@@ -249,7 +249,7 @@ final class ShareSearchContainerNode: ASDisplayNode, ShareContentContainerNode {
                 let foundLocalPeers = context.account.postbox.searchPeers(query: query.lowercased())
                 let foundRemotePeers: Signal<([FoundPeer], [FoundPeer]), NoError> = .single(([], []))
                 |> then(
-                    searchPeers(account: context.account, query: query)
+                    context.engine.peers.searchPeers(query: query)
                     |> delay(0.2, queue: Queue.concurrentDefaultQueue())
                 )
                 
@@ -333,7 +333,7 @@ final class ShareSearchContainerNode: ASDisplayNode, ShareContentContainerNode {
             self?.searchQuery.set(text)
         }
         
-        let hasRecentPeers = recentPeers(account: context.account)
+        let hasRecentPeers = context.engine.peers.recentPeers()
         |> map { value -> Bool in
             switch value {
             case let .peers(peers):
diff --git a/submodules/ShareItems/Sources/ShareItems.swift b/submodules/ShareItems/Sources/ShareItems.swift
index 48d7040e80..a91ec1dec9 100644
--- a/submodules/ShareItems/Sources/ShareItems.swift
+++ b/submodules/ShareItems/Sources/ShareItems.swift
@@ -127,7 +127,7 @@ private func preparedShareItem(account: Account, to peerId: PeerId, value: [Stri
         
         let estimatedSize = TGMediaVideoConverter.estimatedSize(for: preset, duration: finalDuration, hasAudio: true)
         
-        let resource = LocalFileVideoMediaResource(randomId: arc4random64(), path: asset.url.path, adjustments: resourceAdjustments)
+        let resource = LocalFileVideoMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), path: asset.url.path, adjustments: resourceAdjustments)
         return standaloneUploadedFile(account: account, peerId: peerId, text: "", source: .resource(.standalone(resource: resource)), mimeType: "video/mp4", attributes: [.Video(duration: Int(finalDuration), size: PixelDimensions(width: Int32(finalDimensions.width), height: Int32(finalDimensions.height)), flags: flags)], hintFileIsLarge: estimatedSize > 10 * 1024 * 1024)
         |> mapError { _ -> Void in
             return Void()
@@ -394,26 +394,26 @@ public func sentShareItems(account: Account, to peerIds: [PeerId], items: [Prepa
     }
     
     if ((mediaTypes.photo + mediaTypes.video) > 1) && (mediaTypes.music == 0 && mediaTypes.other == 0) {
-        groupingKey = arc4random64()
+        groupingKey = Int64.random(in: Int64.min ... Int64.max)
     } else if ((mediaTypes.photo + mediaTypes.video) == 0) && ((mediaTypes.music > 1 && mediaTypes.other == 0) || (mediaTypes.music == 0 && mediaTypes.other > 1)) {
-        groupingKey = arc4random64()
+        groupingKey = Int64.random(in: Int64.min ... Int64.max)
     }
     
     var mediaMessages: [EnqueueMessage] = []
     for item in items {
         switch item {
             case let .text(text):
-                messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil))
+                messages.append(.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
             case let .media(media):
                 switch media {
                     case let .media(reference):
-                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: reference, replyToMessageId: nil, localGroupingKey: groupingKey)
+                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: reference, replyToMessageId: nil, localGroupingKey: groupingKey, correlationId: nil)
                         messages.append(message)
                         mediaMessages.append(message)
                         
                 }
                 if let _ = groupingKey, mediaMessages.count % 10 == 0 {
-                    groupingKey = arc4random64()
+                    groupingKey = Int64.random(in: Int64.min ... Int64.max)
                 }
         }
     }
diff --git a/submodules/ShimmerEffect/Sources/ShimmerEffect.swift b/submodules/ShimmerEffect/Sources/ShimmerEffect.swift
index 3157a60c1a..456806dec7 100644
--- a/submodules/ShimmerEffect/Sources/ShimmerEffect.swift
+++ b/submodules/ShimmerEffect/Sources/ShimmerEffect.swift
@@ -2,9 +2,10 @@ import UIKit
 import AsyncDisplayKit
 import Display
 
-private final class ShimmerEffectForegroundNode: ASDisplayNode {
+final class ShimmerEffectForegroundNode: ASDisplayNode {
     private var currentBackgroundColor: UIColor?
     private var currentForegroundColor: UIColor?
+    private var currentHorizontal: Bool?
     private let imageNodeContainer: ASDisplayNode
     private let imageNode: ASImageNode
     
@@ -45,31 +46,56 @@ private final class ShimmerEffectForegroundNode: ASDisplayNode {
         self.updateAnimation()
     }
     
-    func update(backgroundColor: UIColor, foregroundColor: UIColor) {
-        if let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor) {
+    func update(backgroundColor: UIColor, foregroundColor: UIColor, horizontal: Bool = false) {
+        if let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor), self.currentHorizontal == horizontal {
             return
         }
         self.currentBackgroundColor = backgroundColor
         self.currentForegroundColor = foregroundColor
+        self.currentHorizontal = horizontal
         
-        self.imageNode.image = generateImage(CGSize(width: 16.0, height: 320.0), opaque: false, scale: 1.0, rotatedContext: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(backgroundColor.cgColor)
-            context.fill(CGRect(origin: CGPoint(), size: size))
-            
-            context.clip(to: CGRect(origin: CGPoint(), size: size))
-            
-            let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
-            let peakColor = foregroundColor.cgColor
-            
-            var locations: [CGFloat] = [0.0, 0.5, 1.0]
-            let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
-            
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
-            
-            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
-        })
+        let image: UIImage?
+        if horizontal {
+            image = generateImage(CGSize(width: 320.0, height: 16.0), opaque: false, scale: 1.0, rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                context.setFillColor(backgroundColor.cgColor)
+                context.fill(CGRect(origin: CGPoint(), size: size))
+                
+                context.clip(to: CGRect(origin: CGPoint(), size: size))
+                
+                let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
+                let peakColor = foregroundColor.cgColor
+                
+                var locations: [CGFloat] = [0.0, 0.5, 1.0]
+                let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
+                
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+                
+                context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: CGGradientDrawingOptions())
+            })
+        } else {
+            image = generateImage(CGSize(width: 16.0, height: 320.0), opaque: false, scale: 1.0, rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                context.setFillColor(backgroundColor.cgColor)
+                context.fill(CGRect(origin: CGPoint(), size: size))
+                
+                context.clip(to: CGRect(origin: CGPoint(), size: size))
+                
+                let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
+                let peakColor = foregroundColor.cgColor
+                
+                var locations: [CGFloat] = [0.0, 0.5, 1.0]
+                let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
+                
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+                
+                context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+            })
+        }
+        self.imageNode.image = image
+        self.updateAnimation()
     }
     
     func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
@@ -95,7 +121,7 @@ private final class ShimmerEffectForegroundNode: ASDisplayNode {
     }
     
     private func updateAnimation() {
-        let shouldBeAnimating = self.isCurrentlyInHierarchy && self.absoluteLocation != nil
+        let shouldBeAnimating = self.isCurrentlyInHierarchy && self.absoluteLocation != nil && self.currentHorizontal != nil
         if shouldBeAnimating != self.shouldBeAnimating {
             self.shouldBeAnimating = shouldBeAnimating
             if shouldBeAnimating {
@@ -107,15 +133,25 @@ private final class ShimmerEffectForegroundNode: ASDisplayNode {
     }
     
     private func addImageAnimation() {
-        guard let containerSize = self.absoluteLocation?.1 else {
+        guard let containerSize = self.absoluteLocation?.1, let horizontal = self.currentHorizontal else {
             return
         }
-        let gradientHeight: CGFloat = 250.0
-        self.imageNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -gradientHeight), size: CGSize(width: containerSize.width, height: gradientHeight))
-        let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.height + gradientHeight) as NSNumber, keyPath: "position.y", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
-        animation.repeatCount = Float.infinity
-        animation.beginTime = 1.0
-        self.imageNode.layer.add(animation, forKey: "shimmer")
+        
+        if horizontal {
+            let gradientHeight: CGFloat = 320.0
+            self.imageNode.frame = CGRect(origin: CGPoint(x: -gradientHeight, y: 0.0), size: CGSize(width: gradientHeight, height: containerSize.height))
+            let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.width + gradientHeight) as NSNumber, keyPath: "position.x", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
+            animation.repeatCount = Float.infinity
+            animation.beginTime = 1.0
+            self.imageNode.layer.add(animation, forKey: "shimmer")
+        } else {
+            let gradientHeight: CGFloat = 250.0
+            self.imageNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -gradientHeight), size: CGSize(width: containerSize.width, height: gradientHeight))
+            let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.height + gradientHeight) as NSNumber, keyPath: "position.y", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
+            animation.repeatCount = Float.infinity
+            animation.beginTime = 1.0
+            self.imageNode.layer.add(animation, forKey: "shimmer")
+        }
     }
 }
 
@@ -135,6 +171,7 @@ public final class ShimmerEffectNode: ASDisplayNode {
     private var currentBackgroundColor: UIColor?
     private var currentForegroundColor: UIColor?
     private var currentShimmeringColor: UIColor?
+    private var currentHorizontal: Bool?
     private var currentSize = CGSize()
     
     override public init() {
@@ -157,8 +194,8 @@ public final class ShimmerEffectNode: ASDisplayNode {
         self.effectNode.updateAbsoluteRect(rect, within: containerSize)
     }
     
-    public func update(backgroundColor: UIColor, foregroundColor: UIColor, shimmeringColor: UIColor, shapes: [Shape], size: CGSize) {
-        if self.currentShapes == shapes, let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor), let currentShimmeringColor = self.currentShimmeringColor, currentShimmeringColor.isEqual(shimmeringColor), self.currentSize == size {
+    public func update(backgroundColor: UIColor, foregroundColor: UIColor, shimmeringColor: UIColor, shapes: [Shape], horizontal: Bool = false, size: CGSize) {
+        if self.currentShapes == shapes, let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor), let currentShimmeringColor = self.currentShimmeringColor, currentShimmeringColor.isEqual(shimmeringColor), horizontal == self.currentHorizontal, self.currentSize == size {
             return
         }
         
@@ -166,11 +203,12 @@ public final class ShimmerEffectNode: ASDisplayNode {
         self.currentForegroundColor = foregroundColor
         self.currentShimmeringColor = shimmeringColor
         self.currentShapes = shapes
+        self.currentHorizontal = horizontal
         self.currentSize = size
         
         self.backgroundNode.backgroundColor = foregroundColor
         
-        self.effectNode.update(backgroundColor: foregroundColor, foregroundColor: shimmeringColor)
+        self.effectNode.update(backgroundColor: foregroundColor, foregroundColor: shimmeringColor, horizontal: horizontal)
         
         self.foregroundNode.image = generateImage(size, rotatedContext: { size, context in
             context.setFillColor(backgroundColor.cgColor)
diff --git a/submodules/ShimmerEffect/Sources/StickerShimmerEffectNode.swift b/submodules/ShimmerEffect/Sources/StickerShimmerEffectNode.swift
index b0d5a129d8..af464d3222 100644
--- a/submodules/ShimmerEffect/Sources/StickerShimmerEffectNode.swift
+++ b/submodules/ShimmerEffect/Sources/StickerShimmerEffectNode.swift
@@ -2,124 +2,6 @@ import Foundation
 import AsyncDisplayKit
 import Display
 
-private final class ShimmerEffectForegroundNode: ASDisplayNode {
-    private var currentBackgroundColor: UIColor?
-    private var currentForegroundColor: UIColor?
-    private let imageNodeContainer: ASDisplayNode
-    private let imageNode: ASImageNode
-    
-    private var absoluteLocation: (CGRect, CGSize)?
-    private var isCurrentlyInHierarchy = false
-    private var shouldBeAnimating = false
-    
-    override init() {
-        self.imageNodeContainer = ASDisplayNode()
-        self.imageNodeContainer.isLayerBacked = true
-        
-        self.imageNode = ASImageNode()
-        self.imageNode.isLayerBacked = true
-        self.imageNode.displaysAsynchronously = false
-        self.imageNode.displayWithoutProcessing = true
-        self.imageNode.contentMode = .scaleToFill
-        
-        super.init()
-        
-        self.isLayerBacked = true
-        self.clipsToBounds = true
-        
-        self.imageNodeContainer.addSubnode(self.imageNode)
-        self.addSubnode(self.imageNodeContainer)
-    }
-    
-    override func didEnterHierarchy() {
-        super.didEnterHierarchy()
-        
-        self.isCurrentlyInHierarchy = true
-        self.updateAnimation()
-    }
-    
-    override func didExitHierarchy() {
-        super.didExitHierarchy()
-        
-        self.isCurrentlyInHierarchy = false
-        self.updateAnimation()
-    }
-    
-    func update(backgroundColor: UIColor, foregroundColor: UIColor) {
-        if let currentBackgroundColor = self.currentBackgroundColor, currentBackgroundColor.isEqual(backgroundColor), let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor) {
-            return
-        }
-        self.currentBackgroundColor = backgroundColor
-        self.currentForegroundColor = foregroundColor
-        
-        let image = generateImage(CGSize(width: 320.0, height: 16.0), opaque: false, scale: 1.0, rotatedContext: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(backgroundColor.cgColor)
-            context.fill(CGRect(origin: CGPoint(), size: size))
-            
-            context.clip(to: CGRect(origin: CGPoint(), size: size))
-            
-            let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
-            let peakColor = foregroundColor.cgColor
-            
-            var locations: [CGFloat] = [0.0, 0.5, 1.0]
-            let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
-            
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
-            
-            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: CGGradientDrawingOptions())
-        })
-        self.imageNode.image = image
-    }
-    
-    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
-        if let absoluteLocation = self.absoluteLocation, absoluteLocation.0 == rect && absoluteLocation.1 == containerSize {
-            return
-        }
-        let sizeUpdated = self.absoluteLocation?.1 != containerSize
-        let frameUpdated = self.absoluteLocation?.0 != rect
-        self.absoluteLocation = (rect, containerSize)
-        
-        if sizeUpdated {
-            if self.shouldBeAnimating {
-                self.imageNode.layer.removeAnimation(forKey: "shimmer")
-                self.addImageAnimation()
-            } else {
-                self.updateAnimation()
-            }
-        }
-        
-        if frameUpdated {
-            self.imageNodeContainer.frame = CGRect(origin: CGPoint(x: -rect.minX, y: -rect.minY), size: containerSize)
-        }
-    }
-    
-    private func updateAnimation() {
-        let shouldBeAnimating = self.isCurrentlyInHierarchy && self.absoluteLocation != nil
-        if shouldBeAnimating != self.shouldBeAnimating {
-            self.shouldBeAnimating = shouldBeAnimating
-            if shouldBeAnimating {
-                self.addImageAnimation()
-            } else {
-                self.imageNode.layer.removeAnimation(forKey: "shimmer")
-            }
-        }
-    }
-    
-    private func addImageAnimation() {
-        guard let containerSize = self.absoluteLocation?.1 else {
-            return
-        }
-        let gradientHeight: CGFloat = 320.0
-        self.imageNode.frame = CGRect(origin: CGPoint(x: -gradientHeight, y: 0.0), size: CGSize(width: gradientHeight, height: containerSize.height))
-        let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.width + gradientHeight) as NSNumber, keyPath: "position.x", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
-        animation.repeatCount = Float.infinity
-        animation.beginTime = 1.0
-        self.imageNode.layer.add(animation, forKey: "shimmer")
-    }
-}
-
 private let decodingMap: [String] = ["A", "A", "C", "A", "A", "A", "A", "H", "A", "A", "A", "L", "M", "A", "A", "A", "Q", "A", "S", "T", "A", "V", "A", "A", "A", "Z", "a", "a", "c", "a", "a", "a", "a", "h", "a", "a", "a", "l", "m", "a", "a", "a", "q", "a", "s", "t", "a", "v", "a", ".", "a", "z", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "-", ","]
 private func decodeStickerThumbnailData(_ data: Data) -> String {
     var string = "M"
@@ -140,6 +22,7 @@ private func decodeStickerThumbnailData(_ data: Data) -> String {
 }
 
 public class StickerShimmerEffectNode: ASDisplayNode {
+    private var backdropNode: ASDisplayNode?
     private let backgroundNode: ASDisplayNode
     private let effectNode: ShimmerEffectForegroundNode
     private let foregroundNode: ASImageNode
@@ -163,11 +46,21 @@ public class StickerShimmerEffectNode: ASDisplayNode {
         self.addSubnode(self.effectNode)
         self.addSubnode(self.foregroundNode)
     }
-    
+        
     public var isEmpty: Bool {
         return self.currentData == nil
     }
     
+    public func addBackdropNode(_ backdropNode: ASDisplayNode) {
+        if let current = self.backdropNode {
+            current.removeFromSupernode()
+        }
+        self.backdropNode = backdropNode
+        self.insertSubnode(backdropNode, at: 0)
+        
+        self.effectNode.layer.compositingFilter = "screenBlendMode"
+    }
+    
     public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
         self.effectNode.updateAbsoluteRect(rect, within: containerSize)
     }
@@ -188,8 +81,9 @@ public class StickerShimmerEffectNode: ASDisplayNode {
         
         self.backgroundNode.backgroundColor = foregroundColor
         
-        self.effectNode.update(backgroundColor: backgroundColor == nil ? .clear : foregroundColor, foregroundColor: shimmeringColor)
+        self.effectNode.update(backgroundColor: backgroundColor == nil ? .clear : foregroundColor, foregroundColor: shimmeringColor, horizontal: true)
         
+        let bounds = CGRect(origin: CGPoint(), size: size)
         let image = generateImage(size, rotatedContext: { size, context in
             if let backgroundColor = backgroundColor {
                 context.setFillColor(backgroundColor.cgColor)
@@ -219,7 +113,7 @@ public class StickerShimmerEffectNode: ASDisplayNode {
                 UIGraphicsPopContext()
             }
         })
-                
+                        
         if backgroundColor == nil {
             self.foregroundNode.image = nil
             
@@ -228,7 +122,7 @@ public class StickerShimmerEffectNode: ASDisplayNode {
                 maskView = current
             } else {
                 maskView = UIImageView()
-                maskView.frame = CGRect(origin: CGPoint(), size: size)
+                maskView.frame = bounds
                 self.maskView = maskView
                 self.view.mask = maskView
             }
@@ -244,9 +138,10 @@ public class StickerShimmerEffectNode: ASDisplayNode {
         
         self.maskView?.image = image
         
-        self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
-        self.foregroundNode.frame = CGRect(origin: CGPoint(), size: size)
-        self.effectNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.backdropNode?.frame = bounds
+        self.backgroundNode.frame = bounds
+        self.foregroundNode.frame = bounds
+        self.effectNode.frame = bounds
     }
 }
 
diff --git a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
index f25d6743ea..2f63f71b6f 100644
--- a/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
+++ b/submodules/SolidRoundedButtonNode/Sources/SolidRoundedButtonNode.swift
@@ -3,8 +3,6 @@ import UIKit
 import AsyncDisplayKit
 import Display
 
-private let textFont: UIFont = Font.regular(16.0)
-
 public final class SolidRoundedButtonTheme {
     public let backgroundColor: UIColor
     public let foregroundColor: UIColor
diff --git a/submodules/StatisticsUI/Sources/ChannelStatsController.swift b/submodules/StatisticsUI/Sources/ChannelStatsController.swift
index 2bae41250a..649297977a 100644
--- a/submodules/StatisticsUI/Sources/ChannelStatsController.swift
+++ b/submodules/StatisticsUI/Sources/ChannelStatsController.swift
@@ -518,7 +518,7 @@ public func channelStatsController(context: AccountContext, peerId: PeerId, cach
         items.append(.action(ContextMenuActionItem(text: presentationData.strings.SharedMedia_ViewInChat, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/GoToMessage"), color: theme.contextMenu.primaryColor) }, action: { [weak controller] c, _ in
             c.dismiss(completion: {
                 if let navigationController = controller?.navigationController as? NavigationController {
-                    context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true)))
+                    context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true, timecode: nil)))
                 }
             })
         })))
diff --git a/submodules/StatisticsUI/Sources/GroupStatsController.swift b/submodules/StatisticsUI/Sources/GroupStatsController.swift
index 7370caed78..d2fc365197 100644
--- a/submodules/StatisticsUI/Sources/GroupStatsController.swift
+++ b/submodules/StatisticsUI/Sources/GroupStatsController.swift
@@ -901,7 +901,7 @@ public func groupStatsController(context: AccountContext, peerId: PeerId, cached
     }
     promotePeerImpl = { [weak controller] participantPeerId in
         if let navigationController = controller?.navigationController as? NavigationController {
-            let _ = (fetchChannelParticipant(account: context.account, peerId: peerId, participantId: participantPeerId)
+            let _ = (context.engine.peers.fetchChannelParticipant(peerId: peerId, participantId: participantPeerId)
             |> take(1)
             |> deliverOnMainQueue).start(next: { participant in
                 if let participant = participant, let controller = context.sharedContext.makeChannelAdminController(context: context, peerId: peerId, adminId: participantPeerId, initialParticipant: participant) {
diff --git a/submodules/StatisticsUI/Sources/MessageStatsController.swift b/submodules/StatisticsUI/Sources/MessageStatsController.swift
index 72ce6daff7..3eebe518d1 100644
--- a/submodules/StatisticsUI/Sources/MessageStatsController.swift
+++ b/submodules/StatisticsUI/Sources/MessageStatsController.swift
@@ -215,13 +215,13 @@ public func messageStatsController(context: AccountContext, messageId: MessageId
     
     let previousData = Atomic<MessageStats?>(value: nil)
     
-    let searchSignal = searchMessages(account: context.account, location: .publicForwards(messageId: messageId, datacenterId: Int(datacenterId)), query: "", state: nil)
+    let searchSignal = context.engine.messages.searchMessages(location: .publicForwards(messageId: messageId, datacenterId: Int(datacenterId)), query: "", state: nil)
     |> map(Optional.init)
     |> afterNext { result in
         if let result = result {
             for message in result.0.messages {
                 if let peer = message.peers[message.id.peerId], let peerReference = PeerReference(peer) {
-                    let _ = updatedRemotePeer(postbox: context.account.postbox, network: context.account.network, peer: peerReference).start()
+                    let _ = context.engine.peers.updatedRemotePeer(peer: peerReference).start()
                 }
             }
         }
@@ -264,7 +264,7 @@ public func messageStatsController(context: AccountContext, messageId: MessageId
     }
     navigateToMessageImpl = { [weak controller] messageId in
         if let navigationController = controller?.navigationController as? NavigationController {
-            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true), keepStack: .always, useExisting: false, purposefulAction: {}, peekData: nil))
+            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true, timecode: nil), keepStack: .always, useExisting: false, purposefulAction: {}, peekData: nil))
         }
     }
     return controller
diff --git a/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift b/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift
index d2bbfdfd00..339fc1a3f7 100644
--- a/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift
+++ b/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift
@@ -166,7 +166,7 @@ class MessageStatsOverviewItemNode: ListViewItemNode {
             
             centerValueLabelLayoutAndApply = makeCenterValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.publicShares.flatMap { compactNumericCountString(Int($0)) } ?? "–", font: valueFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
-            rightValueLabelLayoutAndApply = makeRightValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.publicShares.flatMap { "≈\( compactNumericCountString(item.stats.forwards - Int($0)))" } ?? "–", font: valueFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            rightValueLabelLayoutAndApply = makeRightValueLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.publicShares.flatMap { "≈\( compactNumericCountString(max(0, item.stats.forwards - Int($0))))" } ?? "–", font: valueFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
                         
             leftTitleLabelLayoutAndApply = makeLeftTitleLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.presentationData.strings.Stats_Message_Views, font: titleFont, textColor: item.presentationData.theme.list.sectionHeaderTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
diff --git a/submodules/StatisticsUI/Sources/StatsMessageItem.swift b/submodules/StatisticsUI/Sources/StatsMessageItem.swift
index 0851a6a5e8..c097cecdb8 100644
--- a/submodules/StatisticsUI/Sources/StatsMessageItem.swift
+++ b/submodules/StatisticsUI/Sources/StatsMessageItem.swift
@@ -241,7 +241,8 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode {
         
             let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize)
             
-            let contentKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.message, strings: item.presentationData.strings, nameDisplayOrder: .firstLast, accountPeerId: item.context.account.peerId)
+            let presentationData = item.context.sharedContext.currentPresentationData.with { $0 }
+            let contentKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.message, strings: item.presentationData.strings, nameDisplayOrder: .firstLast,  dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId)
             var text = !item.message.text.isEmpty ? item.message.text : stringForMediaKind(contentKind, strings: item.presentationData.strings).0
             text = foldLineBreaks(text)
             
@@ -288,7 +289,6 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode {
                         
             let labelFont = Font.regular(floor(item.presentationData.fontSize.itemListBaseFontSize * 13.0 / 17.0))
             
-            let presentationData = item.context.sharedContext.currentPresentationData.with { $0 }
             let label = stringForFullDate(timestamp: item.message.timestamp, strings: item.presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
             
             let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: label, font: labelFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - totalLeftInset - rightInset - additionalRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
diff --git a/submodules/StickerPackPreviewUI/BUILD b/submodules/StickerPackPreviewUI/BUILD
index bf34fcb5bb..d844048b4d 100644
--- a/submodules/StickerPackPreviewUI/BUILD
+++ b/submodules/StickerPackPreviewUI/BUILD
@@ -28,6 +28,7 @@ swift_library(
         "//submodules/ArchivedStickerPacksNotice:ArchivedStickerPacksNotice",
         "//submodules/ShimmerEffect:ShimmerEffect",
         "//submodules/UndoUI:UndoUI",
+        "//submodules/ContextUI:ContextUI",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewController.swift b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewController.swift
index 15923c2ae7..4cfa82d782 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewController.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewController.swift
@@ -25,7 +25,9 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
     }
     
     private var animatedIn = false
-    private var dismissed = false
+    private var isDismissed = false
+        
+    public var dismissed: (() -> Void)?
     
     private let context: AccountContext
     private let mode: StickerPackPreviewControllerMode
@@ -80,7 +82,7 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
         self.acceptsFocusWhenInOverlay = true
         self.statusBar.statusBarStyle = .Ignore
         
-        self.stickerPackContents.set(loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: stickerPack, forceActualized: true))
+        self.stickerPackContents.set(context.engine.stickers.loadedStickerPack(reference: stickerPack, forceActualized: true))
         
         self.presentationDataDisposable = (context.sharedContext.presentationData
         |> deliverOnMainQueue).start(next: { [weak self] presentationData in
@@ -130,7 +132,7 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
             }
             
             let account = strongSelf.context.account
-            strongSelf.openMentionDisposable.set((resolvePeerByName(account: strongSelf.context.account, name: mention)
+            strongSelf.openMentionDisposable.set((strongSelf.context.engine.peers.resolvePeerByName(name: mention)
             |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                 if let peerId = peerId {
                     return account.postbox.loadedPeerWithId(peerId)
@@ -150,6 +152,7 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
             }))
         }, actionPerformed: self.actionPerformed)
         self.controllerNode.dismiss = { [weak self] in
+            self?.dismissed?()
             self?.presentingViewController?.dismiss(animated: false, completion: nil)
         }
         self.controllerNode.cancel = { [weak self] in
@@ -264,8 +267,8 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
     }
     
     override public func dismiss(completion: (() -> Void)? = nil) {
-        if !self.dismissed {
-            self.dismissed = true
+        if !self.isDismissed {
+            self.isDismissed = true
         } else {
             return
         }
@@ -277,7 +280,7 @@ public final class StickerPackPreviewController: ViewController, StandalonePrese
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift
index e4198bd782..68ddba3a16 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPackPreviewControllerNode.swift
@@ -12,6 +12,7 @@ import MergeLists
 import ActivityIndicator
 import TextFormat
 import AccountContext
+import ContextUI
 
 private struct StickerPackPreviewGridEntry: Comparable, Identifiable {
     let index: Int
@@ -88,6 +89,8 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
     
     private var hapticFeedback: HapticFeedback?
     
+    private weak var peekController: PeekController?
+    
     init(context: AccountContext, openShare: (() -> Void)?, openMention: @escaping (String) -> Void, actionPerformed: ((StickerPackCollectionInfo, [ItemCollectionItem], StickerPackScreenPerformedAction) -> Void)?) {
         self.context = context
         self.openShare = openShare
@@ -204,28 +207,31 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
                     |> deliverOnMainQueue
                     |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                         if let strongSelf = self {
-                            var menuItems: [PeekControllerMenuItem] = []
+                            var menuItems: [ContextMenuItem] = []
                             if let stickerPack = strongSelf.stickerPack, case let .result(info, _, _) = stickerPack, info.id.namespace == Namespaces.ItemCollection.CloudStickerPacks {
                                 if strongSelf.sendSticker != nil {
-                                    menuItems.append(PeekControllerMenuItem(title: strongSelf.presentationData.strings.ShareMenu_Send, color: .accent, font: .bold, action: { node, rect in
-                                        if let strongSelf = self {
-                                            return strongSelf.sendSticker?(.standalone(media: item.file), node, rect) ?? false
-                                        } else {
-                                            return false
-                                        }
-                                    }))
-                                }
-                                menuItems.append(PeekControllerMenuItem(title: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
-                                        if let strongSelf = self {
-                                            if isStarred {
-                                                let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
-                                            } else {
-                                                let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                    menuItems.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                        if let strongSelf = self, let peekController = strongSelf.peekController {
+                                            if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                let _ = strongSelf.sendSticker?(.standalone(media: item.file), animationNode, animationNode.bounds)
+                                            } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                let _ = strongSelf.sendSticker?(.standalone(media: item.file), imageNode, imageNode.bounds)
                                             }
                                         }
-                                    return true
-                                }))
-                                menuItems.append(PeekControllerMenuItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true }))
+                                        f(.default)
+                                    })))
+                                }
+                                menuItems.append(.action(ContextMenuActionItem(text: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                    
+                                    if let strongSelf = self {
+                                        if isStarred {
+                                            let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                        } else {
+                                            let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
+                                        }
+                                    }
+                                })))
                             }
                             return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                         } else {
@@ -237,7 +243,7 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.presentationData.theme), content: content, sourceNode: {
+                let controller = PeekController(presentationData: strongSelf.presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
                 controller.visibilityUpdated = { [weak self] visible in
@@ -245,6 +251,7 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
                         strongSelf.contentGridNode.forceHidden = visible
                     }
                 }
+                strongSelf.peekController = controller
                 strongSelf.presentInGlobalOverlay?(controller, nil)
                 return controller
             }
@@ -521,7 +528,7 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
             switch stickerPack {
                 case let .result(info, items, installed):
                     if installed {
-                        let _ = (removeStickerPackInteractively(postbox: self.context.account.postbox, id: info.id, option: .delete)
+                        let _ = (self.context.engine.stickers.removeStickerPackInteractively(id: info.id, option: .delete)
                         |> deliverOnMainQueue).start(next: { [weak self] indexAndItems in
                             guard let strongSelf = self, let (positionInList, _) = indexAndItems else {
                                 return
@@ -532,7 +539,7 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
                             self.updateStickerPack(.result(info: info, items: items, installed: false), stickerSettings: stickerSettings)
                         }
                     } else {
-                        let _ = addStickerPackInteractively(postbox: self.context.account.postbox, info: info, items: items).start()
+                        let _ = self.context.engine.stickers.addStickerPackInteractively(info: info, items: items).start()
                         if !dismissOnAction {
                             self.updateStickerPack(.result(info: info, items: items, installed: true), stickerSettings: stickerSettings)
                         }
@@ -550,11 +557,17 @@ final class StickerPackPreviewControllerNode: ViewControllerTracingNode, UIScrol
     func animateIn() {
         self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
         
-        let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
-        
+        let offset: CGFloat = 510.0        
         let dimPosition = self.dimNode.layer.position
-        self.dimNode.layer.animatePosition(from: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), to: dimPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-        self.layer.animateBoundsOriginYAdditive(from: -offset, to: 0.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+
+        let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+        let targetBounds = self.bounds
+        self.bounds = self.bounds.offsetBy(dx: 0.0, dy: -offset)
+        self.dimNode.position = CGPoint(x: dimPosition.x, y: dimPosition.y - offset)
+        transition.animateView({
+            self.bounds = targetBounds
+            self.dimNode.position = dimPosition
+        })
     }
     
     func animateOut(completion: (() -> Void)? = nil) {
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift b/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
index 512a1b7bcf..e7ad90f035 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPackScreen.swift
@@ -11,6 +11,7 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import MergeLists
 import ShimmerEffect
+import ContextUI
 
 private struct StickerPackPreviewGridEntry: Comparable, Identifiable {
     let index: Int
@@ -100,6 +101,8 @@ private final class StickerPackContainer: ASDisplayNode {
     
     private let interaction: StickerPackPreviewInteraction
     
+    private weak var peekController: PeekController?
+    
     init(index: Int, context: AccountContext, presentationData: PresentationData, stickerPack: StickerPackReference, decideNextAction: @escaping (StickerPackContainer, StickerPackAction) -> StickerPackNextAction, requestDismiss: @escaping () -> Void, expandProgressUpdated: @escaping (StickerPackContainer, ContainedViewLayoutTransition, ContainedViewLayoutTransition) -> Void, presentInGlobalOverlay: @escaping (ViewController, Any?) -> Void, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?) {
         self.index = index
         self.context = context
@@ -238,7 +241,7 @@ private final class StickerPackContainer: ASDisplayNode {
             return updatedOffset
         }
         
-        self.itemsDisposable = (loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: stickerPack, forceActualized: false)
+        self.itemsDisposable = (context.engine.stickers.loadedStickerPack(reference: stickerPack, forceActualized: false)
         |> deliverOnMainQueue).start(next: { [weak self] contents in
             guard let strongSelf = self else {
                 return
@@ -276,28 +279,27 @@ private final class StickerPackContainer: ASDisplayNode {
                     |> deliverOnMainQueue
                     |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                         if let strongSelf = self {
-                            var menuItems: [PeekControllerMenuItem] = []
+                            var menuItems: [ContextMenuItem] = []
                             if let (info, _, _) = strongSelf.currentStickerPack, info.id.namespace == Namespaces.ItemCollection.CloudStickerPacks {
                                 if strongSelf.sendSticker != nil {
-                                    menuItems.append(PeekControllerMenuItem(title: strongSelf.presentationData.strings.ShareMenu_Send, color: .accent, font: .bold, action: { node, rect in
-                                        if let strongSelf = self {
-                                            return strongSelf.sendSticker?(.standalone(media: item.file), node, rect) ?? false
-                                        } else {
-                                            return false
+                                    menuItems.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                        if let strongSelf = self, let peekController = strongSelf.peekController, let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                            let _ = strongSelf.sendSticker?(.standalone(media: item.file), animationNode, animationNode.bounds)
                                         }
-                                    }))
+                                        f(.default)
+                                    })))
                                 }
-                                menuItems.append(PeekControllerMenuItem(title: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
-                                        if let strongSelf = self {
-                                            if isStarred {
-                                                let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
-                                            } else {
-                                                let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
-                                            }
+                                menuItems.append(.action(ContextMenuActionItem(text: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                    
+                                    if let strongSelf = self {
+                                        if isStarred {
+                                            let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
+                                        } else {
+                                            let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                         }
-                                    return true
-                                }))
-                                menuItems.append(PeekControllerMenuItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true }))
+                                    }
+                                })))
                             }
                             return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                         } else {
@@ -309,9 +311,10 @@ private final class StickerPackContainer: ASDisplayNode {
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.presentationData.theme), content: content, sourceNode: {
+                let controller = PeekController(presentationData: strongSelf.presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
+                strongSelf.peekController = controller
                 strongSelf.presentInGlobalOverlay(controller, nil)
                 return controller
             }
@@ -340,9 +343,9 @@ private final class StickerPackContainer: ASDisplayNode {
                 return
             }
             if installed {
-                let _ = removeStickerPackInteractively(postbox: strongSelf.context.account.postbox, id: info.id, option: .delete).start()
+                let _ = strongSelf.context.engine.stickers.removeStickerPackInteractively(id: info.id, option: .delete).start()
             } else {
-                let _ = addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items).start()
+                let _ = strongSelf.context.engine.stickers.addStickerPackInteractively(info: info, items: items).start()
             }
             
             switch strongSelf.decideNextAction(strongSelf, installed ? .remove : .add) {
@@ -988,6 +991,8 @@ public final class StickerPackScreenImpl: ViewController {
         return self.displayNode as! StickerPackScreenNode
     }
     
+    public var dismissed: (() -> Void)?
+    
     private let _ready = Promise<Bool>()
     override public var ready: Promise<Bool> {
         return self._ready
@@ -1020,6 +1025,7 @@ public final class StickerPackScreenImpl: ViewController {
                 strongSelf.updateModalStyleOverlayTransitionFactor(value, transition: transition)
             }
         }, dismissed: { [weak self] in
+            self?.dismissed?()
             self?.dismiss()
         }, presentInGlobalOverlay: { [weak self] c, a in
             self?.presentInGlobalOverlay(c, with: a)
@@ -1060,10 +1066,11 @@ public enum StickerPackScreenPerformedAction {
     case remove(positionInList: Int)
 }
 
-public func StickerPackScreen(context: AccountContext, mode: StickerPackPreviewControllerMode = .default, mainStickerPack: StickerPackReference, stickerPacks: [StickerPackReference], parentNavigationController: NavigationController? = nil, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)? = nil, actionPerformed: ((StickerPackCollectionInfo, [ItemCollectionItem], StickerPackScreenPerformedAction) -> Void)? = nil) -> ViewController {
+public func StickerPackScreen(context: AccountContext, mode: StickerPackPreviewControllerMode = .default, mainStickerPack: StickerPackReference, stickerPacks: [StickerPackReference], parentNavigationController: NavigationController? = nil, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)? = nil, actionPerformed: ((StickerPackCollectionInfo, [ItemCollectionItem], StickerPackScreenPerformedAction) -> Void)? = nil, dismissed: (() -> Void)? = nil) -> ViewController {
     //return StickerPackScreenImpl(context: context, stickerPacks: stickerPacks, selectedStickerPackIndex: stickerPacks.firstIndex(of: mainStickerPack) ?? 0, parentNavigationController: parentNavigationController, sendSticker: sendSticker)
     
     let controller = StickerPackPreviewController(context: context, stickerPack: mainStickerPack, mode: mode, parentNavigationController: parentNavigationController, actionPerformed: actionPerformed)
+    controller.dismissed = dismissed
     controller.sendSticker = sendSticker
     return controller
 }
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPreviewController.swift b/submodules/StickerPackPreviewUI/Sources/StickerPreviewController.swift
index d4aad4b91c..7281977304 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPreviewController.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPreviewController.swift
@@ -69,7 +69,7 @@ public final class StickerPreviewController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     public func updateItem(_ item: StickerPackItem) {
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift b/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift
index 093498780a..edc6b01210 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPreviewControllerNode.swift
@@ -138,7 +138,7 @@ final class StickerPreviewControllerNode: ASDisplayNode, UIScrollViewDelegate {
             self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(32.0), textColor: .black)
             break
         }
-        self.imageNode.setSignal(chatMessageSticker(account: context.account, file: item.file, small: false))
+        self.imageNode.setSignal(chatMessageSticker(account: context.account, file: item.file, small: false, onlyFullSize: false))
         
         if let (layout, navigationBarHeight) = self.containerLayout {
             self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: .immediate)
diff --git a/submodules/StickerPackPreviewUI/Sources/StickerPreviewPeekContent.swift b/submodules/StickerPackPreviewUI/Sources/StickerPreviewPeekContent.swift
index 6af3b952f5..38ee9a8531 100644
--- a/submodules/StickerPackPreviewUI/Sources/StickerPreviewPeekContent.swift
+++ b/submodules/StickerPackPreviewUI/Sources/StickerPreviewPeekContent.swift
@@ -9,6 +9,7 @@ import SwiftSignalKit
 import StickerResources
 import AnimatedStickerNode
 import TelegramAnimatedStickerNode
+import ContextUI
 
 public enum StickerPreviewPeekItem: Equatable {
     case pack(StickerPackItem)
@@ -27,9 +28,9 @@ public enum StickerPreviewPeekItem: Equatable {
 public final class StickerPreviewPeekContent: PeekControllerContent {
     let account: Account
     public let item: StickerPreviewPeekItem
-    let menu: [PeekControllerMenuItem]
+    let menu: [ContextMenuItem]
     
-    public init(account: Account, item: StickerPreviewPeekItem, menu: [PeekControllerMenuItem]) {
+    public init(account: Account, item: StickerPreviewPeekItem, menu: [ContextMenuItem]) {
         self.account = account
         self.item = item
         self.menu = menu
@@ -39,11 +40,11 @@ public final class StickerPreviewPeekContent: PeekControllerContent {
         return .freeform
     }
     
-    public func menuActivation() -> PeerkControllerMenuActivation {
+    public func menuActivation() -> PeerControllerMenuActivation {
         return .press
     }
     
-    public func menuItems() -> [PeekControllerMenuItem] {
+    public func menuItems() -> [ContextMenuItem] {
         return self.menu
     }
     
@@ -64,13 +65,13 @@ public final class StickerPreviewPeekContent: PeekControllerContent {
     }
 }
 
-private final class StickerPreviewPeekContentNode: ASDisplayNode, PeekControllerContentNode {
+public final class StickerPreviewPeekContentNode: ASDisplayNode, PeekControllerContentNode {
     private let account: Account
     private let item: StickerPreviewPeekItem
     
     private var textNode: ASTextNode
-    private var imageNode: TransformImageNode
-    private var animationNode: AnimatedStickerNode?
+    public var imageNode: TransformImageNode
+    public var animationNode: AnimatedStickerNode?
     
     private var containerLayout: (ContainerViewLayout, CGFloat)?
     
@@ -114,7 +115,7 @@ private final class StickerPreviewPeekContentNode: ASDisplayNode, PeekController
         }
     }
     
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+    public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
         let boundingSize = CGSize(width: 180.0, height: 180.0).fitted(size)
         
         if let dimensitons = self.item.file.dimensions {
@@ -123,7 +124,7 @@ private final class StickerPreviewPeekContentNode: ASDisplayNode, PeekController
             
             let imageSize = dimensitons.cgSize.aspectFitted(boundingSize)
             self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))()
-            let imageFrame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: textSize.height + textSpacing), size: imageSize)
+            let imageFrame = CGRect(origin: CGPoint(x: 0.0, y: textSize.height + textSpacing), size: imageSize)
             self.imageNode.frame = imageFrame
             if let animationNode = self.animationNode {
                 animationNode.frame = imageFrame
@@ -132,7 +133,7 @@ private final class StickerPreviewPeekContentNode: ASDisplayNode, PeekController
             
             self.textNode.frame = CGRect(origin: CGPoint(x: floor((imageFrame.size.width - textSize.width) / 2.0), y: -textSize.height - textSpacing), size: textSize)
             
-            return CGSize(width: size.width, height: imageFrame.height + textSize.height + textSpacing)
+            return CGSize(width: imageFrame.width, height: imageFrame.height + textSize.height + textSpacing)
         } else {
             return CGSize(width: size.width, height: 10.0)
         }
diff --git a/submodules/StickerResources/Sources/StickerResources.swift b/submodules/StickerResources/Sources/StickerResources.swift
index b41cfecd44..7e907abb57 100644
--- a/submodules/StickerResources/Sources/StickerResources.swift
+++ b/submodules/StickerResources/Sources/StickerResources.swift
@@ -402,7 +402,7 @@ public func chatMessageSticker(postbox: Postbox, file: TelegramMediaFile, small:
                 return nil
             }
             
-            if file.immediateThumbnailData != nil && fullSizeData == nil {
+            if file.immediateThumbnailData != nil && thumbnailData == nil && fullSizeData == nil {
                 return nil
             }
             
diff --git a/submodules/Stripe/PublicHeaders/Stripe/STPToken.h b/submodules/Stripe/PublicHeaders/Stripe/STPToken.h
index ad44f21ecb..4f6896d968 100755
--- a/submodules/Stripe/PublicHeaders/Stripe/STPToken.h
+++ b/submodules/Stripe/PublicHeaders/Stripe/STPToken.h
@@ -21,7 +21,7 @@
 /**
  *  You cannot directly instantiate an `STPToken`. You should only use one that has been returned from an `STPAPIClient` callback.
  */
-- (nonnull instancetype) init __attribute__((unavailable("You cannot directly instantiate an STPToken. You should only use one that has been returned from an STPAPIClient callback.")));
+- (nonnull instancetype) init;
 
 /**
  *  The value of the token. You can store this value on your server and use it to make charges and customers. @see
diff --git a/submodules/Svg/Sources/Svg.m b/submodules/Svg/Sources/Svg.m
index 099cb481f0..eb56cc50cd 100755
--- a/submodules/Svg/Sources/Svg.m
+++ b/submodules/Svg/Sources/Svg.m
@@ -104,9 +104,9 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size, UIColor *b
         [xmlString replaceOccurrencesOfString:[NSString stringWithFormat:@"class=\"%@\"", styleName] withString:[NSString stringWithFormat:@"style=\"%@\"", styleValue] options:0 range:NSMakeRange(0, xmlString.length)];
     }
     
-    char *zeroTerminatedData = xmlString.UTF8String;
+    const char *zeroTerminatedData = xmlString.UTF8String;
     
-    NSVGimage *image = nsvgParse(zeroTerminatedData, "px", 96);
+    NSVGimage *image = nsvgParse((char *)zeroTerminatedData, "px", 96);
     if (image == nil || image->width < 1.0f || image->height < 1.0f) {
         return nil;
     }
@@ -135,7 +135,6 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size, UIColor *b
         }
         
         if (shape->fill.type != NSVG_PAINT_NONE) {
-            //CGContextSetFillColorWithColor(context, UIColorRGBA(shape->fill.color, shape->opacity).CGColor);
             CGContextSetFillColorWithColor(context, [foregroundColor colorWithAlphaComponent:shape->opacity].CGColor);
 
             bool isFirst = true;
@@ -173,7 +172,6 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size, UIColor *b
         }
         
         if (shape->stroke.type != NSVG_PAINT_NONE) {
-            //CGContextSetStrokeColorWithColor(context, UIColorRGBA(shape->fill.color, shape->opacity).CGColor);
             CGContextSetStrokeColorWithColor(context, [foregroundColor colorWithAlphaComponent:shape->opacity].CGColor);
             CGContextSetMiterLimit(context, shape->miterLimit);
             
@@ -196,10 +194,10 @@ UIImage * _Nullable drawSvgImage(NSData * _Nonnull data, CGSize size, UIColor *b
                     CGContextSetLineJoin(context, kCGLineJoinBevel);
                     break;
                 case NSVG_JOIN_MITER:
-                    CGContextSetLineCap(context, kCGLineJoinMiter);
+                    CGContextSetLineJoin(context, kCGLineJoinMiter);
                     break;
                 case NSVG_JOIN_ROUND:
-                    CGContextSetLineCap(context, kCGLineJoinRound);
+                    CGContextSetLineJoin(context, kCGLineJoinRound);
                     break;
                 default:
                     break;
diff --git a/submodules/SvgRendering/BUILD b/submodules/SvgRendering/BUILD
new file mode 100644
index 0000000000..20e1b4b487
--- /dev/null
+++ b/submodules/SvgRendering/BUILD
@@ -0,0 +1,14 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "SvgRendering",
+    module_name = "SvgRendering",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    deps = [
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/SvgRendering/Sources/SvgParser.swift b/submodules/SvgRendering/Sources/SvgParser.swift
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/submodules/SyncCore/Sources/CachedChannelData.swift b/submodules/SyncCore/Sources/CachedChannelData.swift
index 24adca7534..5b994dc253 100644
--- a/submodules/SyncCore/Sources/CachedChannelData.swift
+++ b/submodules/SyncCore/Sources/CachedChannelData.swift
@@ -159,21 +159,29 @@ public final class CachedChannelData: CachedPeerData {
         public var id: Int64
         public var accessHash: Int64
         public var title: String?
+        public var scheduleTimestamp: Int32?
+        public var subscribedToScheduled: Bool
         
         public init(
             id: Int64,
             accessHash: Int64,
-            title: String?
+            title: String?,
+            scheduleTimestamp: Int32?,
+            subscribedToScheduled: Bool
         ) {
             self.id = id
             self.accessHash = accessHash
             self.title = title
+            self.scheduleTimestamp = scheduleTimestamp
+            self.subscribedToScheduled = subscribedToScheduled
         }
         
         public init(decoder: PostboxDecoder) {
             self.id = decoder.decodeInt64ForKey("id", orElse: 0)
             self.accessHash = decoder.decodeInt64ForKey("accessHash", orElse: 0)
             self.title = decoder.decodeOptionalStringForKey("title")
+            self.scheduleTimestamp = decoder.decodeOptionalInt32ForKey("scheduleTimestamp")
+            self.subscribedToScheduled = decoder.decodeBoolForKey("subscribed", orElse: false)
         }
         
         public func encode(_ encoder: PostboxEncoder) {
@@ -184,6 +192,12 @@ public final class CachedChannelData: CachedPeerData {
             } else {
                 encoder.encodeNil(forKey: "title")
             }
+            if let scheduleTimestamp = self.scheduleTimestamp {
+                encoder.encodeInt32(scheduleTimestamp, forKey: "scheduleTimestamp")
+            } else {
+                encoder.encodeNil(forKey: "scheduleTimestamp")
+            }
+            encoder.encodeBool(self.subscribedToScheduled, forKey: "subscribed")
         }
     }
     
diff --git a/submodules/SyncCore/Sources/CloudFileMediaResource.swift b/submodules/SyncCore/Sources/CloudFileMediaResource.swift
index adbc601e56..fa65be62e9 100644
--- a/submodules/SyncCore/Sources/CloudFileMediaResource.swift
+++ b/submodules/SyncCore/Sources/CloudFileMediaResource.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Postbox
 
-public struct CloudFileMediaResourceId: MediaResourceId {
+public struct CloudFileMediaResourceId: MediaResourceId, Hashable, Equatable {
     let datacenterId: Int
     let volumeId: Int64
     let localId: Int32
@@ -18,13 +18,9 @@ public struct CloudFileMediaResourceId: MediaResourceId {
         return "telegram-cloud-file-\(self.datacenterId)-\(self.volumeId)-\(self.localId)-\(self.secret)"
     }
     
-    public var hashValue: Int {
-        return self.secret.hashValue
-    }
-    
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudFileMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.volumeId == to.volumeId && self.localId == to.localId && self.secret == to.secret
+            return self == to
         } else {
             return false
         }
@@ -91,7 +87,7 @@ public final class CloudFileMediaResource: TelegramMediaResource {
     }
 }
 
-public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable {
+public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable, Equatable {
     let datacenterId: Int32
     let photoId: Int64
     let sizeSpec: String
@@ -108,7 +104,7 @@ public struct CloudPhotoSizeMediaResourceId: MediaResourceId, Hashable {
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudPhotoSizeMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.sizeSpec == to.sizeSpec
+            return self == to
         } else {
             return false
         }
@@ -120,8 +116,6 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource {
     public let photoId: Int64
     public let accessHash: Int64
     public let sizeSpec: String
-    public let volumeId: Int64
-    public let localId: Int32
     public let size: Int?
     public let fileReference: Data?
     
@@ -129,13 +123,11 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource {
         return CloudPhotoSizeMediaResourceId(datacenterId: Int32(self.datacenterId), photoId: self.photoId, sizeSpec: self.sizeSpec)
     }
     
-    public init(datacenterId: Int32, photoId: Int64, accessHash: Int64, sizeSpec: String, volumeId: Int64, localId: Int32, size: Int?, fileReference: Data?) {
+    public init(datacenterId: Int32, photoId: Int64, accessHash: Int64, sizeSpec: String, size: Int?, fileReference: Data?) {
         self.datacenterId = Int(datacenterId)
         self.photoId = photoId
         self.accessHash = accessHash
         self.sizeSpec = sizeSpec
-        self.volumeId = volumeId
-        self.localId = localId
         self.size = size
         self.fileReference = fileReference
     }
@@ -145,8 +137,6 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource {
         self.photoId = decoder.decodeInt64ForKey("i", orElse: 0)
         self.accessHash = decoder.decodeInt64ForKey("h", orElse: 0)
         self.sizeSpec = decoder.decodeStringForKey("s", orElse: "")
-        self.volumeId = decoder.decodeInt64ForKey("v", orElse: 0)
-        self.localId = decoder.decodeInt32ForKey("l", orElse: 0)
         if let size = decoder.decodeOptionalInt32ForKey("n") {
             self.size = Int(size)
         } else {
@@ -160,8 +150,6 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource {
         encoder.encodeInt64(self.photoId, forKey: "i")
         encoder.encodeInt64(self.accessHash, forKey: "h")
         encoder.encodeString(self.sizeSpec, forKey: "s")
-        encoder.encodeInt64(self.volumeId, forKey: "v")
-        encoder.encodeInt32(self.localId, forKey: "l")
         if let size = self.size {
             encoder.encodeInt32(Int32(size), forKey: "n")
         } else {
@@ -176,14 +164,14 @@ public final class CloudPhotoSizeMediaResource: TelegramMediaResource {
     
     public func isEqual(to: MediaResource) -> Bool {
         if let to = to as? CloudPhotoSizeMediaResource {
-            return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.accessHash == to.accessHash && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId && self.size == to.size && self.fileReference == to.fileReference
+            return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.accessHash == to.accessHash && self.sizeSpec == to.sizeSpec && self.size == to.size && self.fileReference == to.fileReference
         } else {
             return false
         }
     }
 }
 
-public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable {
+public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable, Equatable {
     let datacenterId: Int32
     let documentId: Int64
     let sizeSpec: String
@@ -200,7 +188,7 @@ public struct CloudDocumentSizeMediaResourceId: MediaResourceId, Hashable {
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudDocumentSizeMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.documentId == to.documentId && self.sizeSpec == to.sizeSpec
+            return self == to
         } else {
             return false
         }
@@ -212,21 +200,17 @@ public final class CloudDocumentSizeMediaResource: TelegramMediaResource {
     public let documentId: Int64
     public let accessHash: Int64
     public let sizeSpec: String
-    public let volumeId: Int64
-    public let localId: Int32
     public let fileReference: Data?
     
     public var id: MediaResourceId {
         return CloudDocumentSizeMediaResourceId(datacenterId: Int32(self.datacenterId), documentId: self.documentId, sizeSpec: self.sizeSpec)
     }
     
-    public init(datacenterId: Int32, documentId: Int64, accessHash: Int64, sizeSpec: String, volumeId: Int64, localId: Int32, fileReference: Data?) {
+    public init(datacenterId: Int32, documentId: Int64, accessHash: Int64, sizeSpec: String, fileReference: Data?) {
         self.datacenterId = Int(datacenterId)
         self.documentId = documentId
         self.accessHash = accessHash
         self.sizeSpec = sizeSpec
-        self.volumeId = volumeId
-        self.localId = localId
         self.fileReference = fileReference
     }
     
@@ -235,8 +219,6 @@ public final class CloudDocumentSizeMediaResource: TelegramMediaResource {
         self.documentId = decoder.decodeInt64ForKey("i", orElse: 0)
         self.accessHash = decoder.decodeInt64ForKey("h", orElse: 0)
         self.sizeSpec = decoder.decodeStringForKey("s", orElse: "")
-        self.volumeId = decoder.decodeInt64ForKey("v", orElse: 0)
-        self.localId = decoder.decodeInt32ForKey("l", orElse: 0)
         self.fileReference = decoder.decodeBytesForKey("fr")?.makeData()
     }
     
@@ -245,8 +227,6 @@ public final class CloudDocumentSizeMediaResource: TelegramMediaResource {
         encoder.encodeInt64(self.documentId, forKey: "i")
         encoder.encodeInt64(self.accessHash, forKey: "h")
         encoder.encodeString(self.sizeSpec, forKey: "s")
-        encoder.encodeInt64(self.volumeId, forKey: "v")
-        encoder.encodeInt32(self.localId, forKey: "l")
         if let fileReference = self.fileReference {
             encoder.encodeBytes(MemoryBuffer(data: fileReference), forKey: "fr")
         } else {
@@ -256,7 +236,7 @@ public final class CloudDocumentSizeMediaResource: TelegramMediaResource {
     
     public func isEqual(to: MediaResource) -> Bool {
         if let to = to as? CloudDocumentSizeMediaResource {
-            return self.datacenterId == to.datacenterId && self.documentId == to.documentId && self.accessHash == to.accessHash && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId && self.fileReference == to.fileReference
+            return self.datacenterId == to.datacenterId && self.documentId == to.documentId && self.accessHash == to.accessHash && self.sizeSpec == to.sizeSpec && self.fileReference == to.fileReference
         } else {
             return false
         }
@@ -268,26 +248,32 @@ public enum CloudPeerPhotoSizeSpec: Int32 {
     case fullSize
 }
 
-public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable {
+public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable, Equatable {
     let datacenterId: Int32
+    let photoId: Int64?
     let sizeSpec: CloudPeerPhotoSizeSpec
-    let volumeId: Int64
-    let localId: Int32
+    let volumeId: Int64?
+    let localId: Int32?
     
-    init(datacenterId: Int32, sizeSpec: CloudPeerPhotoSizeSpec, volumeId: Int64, localId: Int32) {
+    init(datacenterId: Int32, photoId: Int64?, sizeSpec: CloudPeerPhotoSizeSpec, volumeId: Int64?, localId: Int32?) {
         self.datacenterId = datacenterId
+        self.photoId = photoId
         self.sizeSpec = sizeSpec
         self.volumeId = volumeId
         self.localId = localId
     }
     
     public var uniqueId: String {
-        return "telegram-peer-photo-size-\(self.datacenterId)-\(self.sizeSpec.rawValue)-\(self.volumeId)-\(self.localId)"
+        if let photoId = self.photoId {
+            return "telegram-peer-photo-size-\(self.datacenterId)-\(photoId)-\(self.sizeSpec.rawValue)-\(self.volumeId ?? 0)-\(self.localId ?? 0)"
+        } else {
+            return "telegram-peer-photo-size-\(self.datacenterId)-\(self.sizeSpec.rawValue)-\(self.volumeId ?? 0)-\(self.localId ?? 0)"
+        }
     }
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudPeerPhotoSizeMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId
+            return self == to
         } else {
             return false
         }
@@ -296,16 +282,18 @@ public struct CloudPeerPhotoSizeMediaResourceId: MediaResourceId, Hashable {
 
 public final class CloudPeerPhotoSizeMediaResource: TelegramMediaResource {
     public let datacenterId: Int
+    public let photoId: Int64?
     public let sizeSpec: CloudPeerPhotoSizeSpec
-    public let volumeId: Int64
-    public let localId: Int32
+    public let volumeId: Int64?
+    public let localId: Int32?
     
     public var id: MediaResourceId {
-        return CloudPeerPhotoSizeMediaResourceId(datacenterId: Int32(self.datacenterId), sizeSpec: self.sizeSpec, volumeId: self.volumeId, localId: self.localId)
+        return CloudPeerPhotoSizeMediaResourceId(datacenterId: Int32(self.datacenterId), photoId: self.photoId, sizeSpec: self.sizeSpec, volumeId: self.volumeId, localId: self.localId)
     }
     
-    public init(datacenterId: Int32, sizeSpec: CloudPeerPhotoSizeSpec, volumeId: Int64, localId: Int32) {
+    public init(datacenterId: Int32, photoId: Int64?, sizeSpec: CloudPeerPhotoSizeSpec, volumeId: Int64?, localId: Int32?) {
         self.datacenterId = Int(datacenterId)
+        self.photoId = photoId
         self.sizeSpec = sizeSpec
         self.volumeId = volumeId
         self.localId = localId
@@ -313,45 +301,65 @@ public final class CloudPeerPhotoSizeMediaResource: TelegramMediaResource {
     
     public required init(decoder: PostboxDecoder) {
         self.datacenterId = Int(decoder.decodeInt32ForKey("d", orElse: 0))
+        self.photoId = decoder.decodeOptionalInt64ForKey("p")
         self.sizeSpec = CloudPeerPhotoSizeSpec(rawValue: decoder.decodeInt32ForKey("s", orElse: 0)) ?? .small
-        self.volumeId = decoder.decodeInt64ForKey("v", orElse: 0)
-        self.localId = decoder.decodeInt32ForKey("l", orElse: 0)
+        self.volumeId = decoder.decodeOptionalInt64ForKey("v")
+        self.localId = decoder.decodeOptionalInt32ForKey("l")
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt32(Int32(self.datacenterId), forKey: "d")
+        if let photoId = self.photoId {
+            encoder.encodeInt64(photoId, forKey: "p")
+        } else {
+            encoder.encodeNil(forKey: "p")
+        }
         encoder.encodeInt32(self.sizeSpec.rawValue, forKey: "s")
-        encoder.encodeInt64(self.volumeId, forKey: "v")
-        encoder.encodeInt32(self.localId, forKey: "l")
+        if let volumeId = self.volumeId {
+            encoder.encodeInt64(volumeId, forKey: "v")
+        } else {
+            encoder.encodeNil(forKey: "v")
+        }
+        if let localId = self.localId {
+            encoder.encodeInt32(localId, forKey: "l")
+        } else {
+            encoder.encodeNil(forKey: "l")
+        }
     }
     
     public func isEqual(to: MediaResource) -> Bool {
         if let to = to as? CloudPeerPhotoSizeMediaResource {
-            return self.datacenterId == to.datacenterId && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId
+            return self.datacenterId == to.datacenterId && self.photoId == to.photoId && self.sizeSpec == to.sizeSpec && self.volumeId == to.volumeId && self.localId == to.localId
         } else {
             return false
         }
     }
 }
 
-public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashable {
+public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashable, Equatable {
     let datacenterId: Int32
-    let volumeId: Int64
-    let localId: Int32
+    let thumbVersion: Int32?
+    let volumeId: Int64?
+    let localId: Int32?
     
-    init(datacenterId: Int32, volumeId: Int64, localId: Int32) {
+    init(datacenterId: Int32, thumbVersion: Int32?, volumeId: Int64?, localId: Int32?) {
         self.datacenterId = datacenterId
+        self.thumbVersion = thumbVersion
         self.volumeId = volumeId
         self.localId = localId
     }
     
     public var uniqueId: String {
-        return "telegram-stickerpackthumbnail-\(self.datacenterId)-\(self.volumeId)-\(self.localId)"
+        if let thumbVersion = self.thumbVersion {
+            return "telegram-stickerpackthumbnail-\(self.datacenterId)-\(thumbVersion)-\(self.volumeId ?? 0)-\(self.localId ?? 0)"
+        } else {
+            return "telegram-stickerpackthumbnail-\(self.datacenterId)-\(self.volumeId ?? 0)-\(self.localId ?? 0)"
+        }
     }
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudStickerPackThumbnailMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.volumeId == to.volumeId && self.localId == to.localId
+            return self == to
         } else {
             return false
         }
@@ -360,41 +368,57 @@ public struct CloudStickerPackThumbnailMediaResourceId: MediaResourceId, Hashabl
 
 public final class CloudStickerPackThumbnailMediaResource: TelegramMediaResource {
     public let datacenterId: Int
-    public let volumeId: Int64
-    public let localId: Int32
+    public let thumbVersion: Int32?
+    public let volumeId: Int64?
+    public let localId: Int32?
     
     public var id: MediaResourceId {
-        return CloudStickerPackThumbnailMediaResourceId(datacenterId: Int32(self.datacenterId), volumeId: self.volumeId, localId: self.localId)
+        return CloudStickerPackThumbnailMediaResourceId(datacenterId: Int32(self.datacenterId), thumbVersion: self.thumbVersion, volumeId: self.volumeId, localId: self.localId)
     }
     
-    public init(datacenterId: Int32, volumeId: Int64, localId: Int32) {
+    public init(datacenterId: Int32, thumbVersion: Int32?, volumeId: Int64?, localId: Int32?) {
         self.datacenterId = Int(datacenterId)
+        self.thumbVersion = thumbVersion
         self.volumeId = volumeId
         self.localId = localId
     }
     
     public required init(decoder: PostboxDecoder) {
         self.datacenterId = Int(decoder.decodeInt32ForKey("d", orElse: 0))
-        self.volumeId = decoder.decodeInt64ForKey("v", orElse: 0)
-        self.localId = decoder.decodeInt32ForKey("l", orElse: 0)
+        self.thumbVersion = decoder.decodeOptionalInt32ForKey("t")
+        self.volumeId = decoder.decodeOptionalInt64ForKey("v")
+        self.localId = decoder.decodeOptionalInt32ForKey("l")
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt32(Int32(self.datacenterId), forKey: "d")
-        encoder.encodeInt64(self.volumeId, forKey: "v")
-        encoder.encodeInt32(self.localId, forKey: "l")
+        if let thumbVersion = self.thumbVersion {
+            encoder.encodeInt32(thumbVersion, forKey: "t")
+        } else {
+            encoder.encodeNil(forKey: "t")
+        }
+        if let volumeId = self.volumeId {
+            encoder.encodeInt64(volumeId, forKey: "v")
+        } else {
+            encoder.encodeNil(forKey: "v")
+        }
+        if let localId = self.localId {
+            encoder.encodeInt32(localId, forKey: "l")
+        } else {
+            encoder.encodeNil(forKey: "l")
+        }
     }
     
     public func isEqual(to: MediaResource) -> Bool {
         if let to = to as? CloudStickerPackThumbnailMediaResource {
-            return self.datacenterId == to.datacenterId && self.volumeId == to.volumeId && self.localId == to.localId
+            return self.datacenterId == to.datacenterId && self.thumbVersion == to.thumbVersion && self.volumeId == to.volumeId && self.localId == to.localId
         } else {
             return false
         }
     }
 }
 
-public struct CloudDocumentMediaResourceId: MediaResourceId {
+public struct CloudDocumentMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let datacenterId: Int
     public let fileId: Int64
     
@@ -407,13 +431,9 @@ public struct CloudDocumentMediaResourceId: MediaResourceId {
         return "telegram-cloud-document-\(self.datacenterId)-\(self.fileId)"
     }
     
-    public var hashValue: Int {
-        return self.fileId.hashValue
-    }
-    
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? CloudDocumentMediaResourceId {
-            return self.datacenterId == to.datacenterId && self.fileId == to.fileId
+            return self == to
         } else {
             return false
         }
@@ -484,20 +504,16 @@ public final class CloudDocumentMediaResource: TelegramMediaResource {
     }
 }
 
-public struct LocalFileMediaResourceId: MediaResourceId {
+public struct LocalFileMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let fileId: Int64
     
     public var uniqueId: String {
         return "telegram-local-file-\(self.fileId)"
     }
     
-    public var hashValue: Int {
-        return self.fileId.hashValue
-    }
-    
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? LocalFileMediaResourceId {
-            return self.fileId == to.fileId
+            return self == to
         } else {
             return false
         }
@@ -549,20 +565,16 @@ public class LocalFileMediaResource: TelegramMediaResource {
     }
 }
 
-public struct LocalFileReferenceMediaResourceId: MediaResourceId {
+public struct LocalFileReferenceMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let randomId: Int64
     
     public var uniqueId: String {
         return "local-file-\(self.randomId)"
     }
     
-    public var hashValue: Int {
-        return self.randomId.hashValue
-    }
-    
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? LocalFileReferenceMediaResourceId {
-            return self.randomId == to.randomId
+            return self == to
         } else {
             return false
         }
@@ -613,21 +625,17 @@ public class LocalFileReferenceMediaResource: TelegramMediaResource {
     }
 }
 
-public struct HttpReferenceMediaResourceId: MediaResourceId {
+public struct HttpReferenceMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let url: String
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? HttpReferenceMediaResourceId {
-            return self.url == to.url
+            return self == to
         } else {
             return false
         }
     }
     
-    public var hashValue: Int {
-        return self.url.hashValue
-    }
-    
     public var uniqueId: String {
         return "http-\(persistentHash32(self.url))"
     }
@@ -673,23 +681,19 @@ public final class HttpReferenceMediaResource: TelegramMediaResource {
     }
 }
 
-public struct WebFileReferenceMediaResourceId: MediaResourceId {
+public struct WebFileReferenceMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let url: String
     public let accessHash: Int64
     public let size: Int32
     
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? WebFileReferenceMediaResourceId {
-            return self.url == to.url && size == to.size && accessHash == to.accessHash
+            return self == to
         } else {
             return false
         }
     }
     
-    public var hashValue: Int {
-        return self.url.hashValue
-    }
-    
     public var uniqueId: String {
         return "proxy-\(persistentHash32(self.url))-\(size)-\(accessHash)"
     }
@@ -732,7 +736,7 @@ public final class WebFileReferenceMediaResource: TelegramMediaResource {
 }
 
 
-public struct SecretFileMediaResourceId: MediaResourceId {
+public struct SecretFileMediaResourceId: MediaResourceId, Hashable, Equatable {
     public let fileId: Int64
     public let datacenterId: Int32
     
@@ -745,13 +749,9 @@ public struct SecretFileMediaResourceId: MediaResourceId {
         self.datacenterId = datacenterId
     }
     
-    public var hashValue: Int {
-        return self.fileId.hashValue
-    }
-    
     public func isEqual(to: MediaResourceId) -> Bool {
         if let to = to as? SecretFileMediaResourceId {
-            return self.fileId == to.fileId && self.datacenterId == to.datacenterId
+            return self == to
         } else {
             return false
         }
@@ -859,3 +859,59 @@ public final class EmptyMediaResource: TelegramMediaResource {
         return to is EmptyMediaResource
     }
 }
+
+public struct WallpaperDataResourceId: MediaResourceId {
+    public var uniqueId: String {
+        return "wallpaper-\(self.slug)"
+    }
+
+    public var hashValue: Int {
+        return self.slug.hashValue
+    }
+
+    public var slug: String
+
+    public init(slug: String) {
+        self.slug = slug
+    }
+
+    public func isEqual(to: MediaResourceId) -> Bool {
+        guard let to = to as? WallpaperDataResourceId else {
+            return false
+        }
+        if self.slug != to.slug {
+            return false
+        }
+        return true
+    }
+}
+
+public final class WallpaperDataResource: TelegramMediaResource {
+    public let slug: String
+
+    public init(slug: String) {
+        self.slug = slug
+    }
+
+    public init(decoder: PostboxDecoder) {
+        self.slug = decoder.decodeStringForKey("s", orElse: "")
+    }
+
+    public func encode(_ encoder: PostboxEncoder) {
+        encoder.encodeString(self.slug, forKey: "s")
+    }
+
+    public var id: MediaResourceId {
+        return WallpaperDataResourceId(slug: self.slug)
+    }
+
+    public func isEqual(to: MediaResource) -> Bool {
+        guard let to = to as? WallpaperDataResource else {
+            return false
+        }
+        if self.slug != to.slug {
+            return false
+        }
+        return true
+    }
+}
diff --git a/submodules/SyncCore/Sources/Namespaces.swift b/submodules/SyncCore/Sources/Namespaces.swift
index bfccdc26ec..61cde874e7 100644
--- a/submodules/SyncCore/Sources/Namespaces.swift
+++ b/submodules/SyncCore/Sources/Namespaces.swift
@@ -31,11 +31,11 @@ public struct Namespaces {
     }
     
     public struct Peer {
-        public static let CloudUser: Int32 = 0
-        public static let CloudGroup: Int32 = 1
-        public static let CloudChannel: Int32 = 2
-        public static let SecretChat: Int32 = 3
-        public static let Empty: Int32 = Int32.max
+        public static let CloudUser = PeerId.Namespace._internalFromInt32Value(0)
+        public static let CloudGroup = PeerId.Namespace._internalFromInt32Value(1)
+        public static let CloudChannel = PeerId.Namespace._internalFromInt32Value(2)
+        public static let SecretChat = PeerId.Namespace._internalFromInt32Value(3)
+        public static let Empty = PeerId.Namespace.max
     }
     
     public struct ItemCollection {
@@ -202,7 +202,6 @@ private enum PreferencesKeyValues: Int32 {
     case globalNotifications = 0
     case suggestedLocalization = 3
     case limitsConfiguration = 4
-    case coreSettings = 7
     case contentPrivacySettings = 8
     case networkSettings = 9
     case remoteStorageConfiguration = 10
@@ -251,12 +250,6 @@ public struct PreferencesKeys {
         return key
     }()
     
-    public static let coreSettings: ValueBoxKey = {
-        let key = ValueBoxKey(length: 4)
-        key.setInt32(0, value: PreferencesKeyValues.coreSettings.rawValue)
-        return key
-    }()
-    
     public static let contentPrivacySettings: ValueBoxKey = {
         let key = ValueBoxKey(length: 4)
         key.setInt32(0, value: PreferencesKeyValues.contentPrivacySettings.rawValue)
@@ -356,6 +349,7 @@ private enum SharedDataKeyValues: Int32 {
     case autodownloadSettings = 5
     case themeSettings = 6
     case countriesList = 7
+    case wallapersState = 8
 }
 
 public struct SharedDataKeys {
@@ -400,6 +394,12 @@ public struct SharedDataKeys {
         key.setInt32(0, value: SharedDataKeyValues.countriesList.rawValue)
         return key
     }()
+
+    public static let wallapersState: ValueBoxKey = {
+        let key = ValueBoxKey(length: 4)
+        key.setInt32(0, value: SharedDataKeyValues.wallapersState.rawValue)
+        return key
+    }()
 }
 
 public func applicationSpecificItemCacheCollectionId(_ value: Int8) -> Int8 {
diff --git a/submodules/SyncCore/Sources/OutgoingMessageInfoAttribute.swift b/submodules/SyncCore/Sources/OutgoingMessageInfoAttribute.swift
index 42856b9faf..9426cf01ab 100644
--- a/submodules/SyncCore/Sources/OutgoingMessageInfoAttribute.swift
+++ b/submodules/SyncCore/Sources/OutgoingMessageInfoAttribute.swift
@@ -19,30 +19,38 @@ public class OutgoingMessageInfoAttribute: MessageAttribute {
     public let uniqueId: Int64
     public let flags: OutgoingMessageInfoFlags
     public let acknowledged: Bool
+    public let correlationId: Int64?
     
-    public init(uniqueId: Int64, flags: OutgoingMessageInfoFlags, acknowledged: Bool) {
+    public init(uniqueId: Int64, flags: OutgoingMessageInfoFlags, acknowledged: Bool, correlationId: Int64?) {
         self.uniqueId = uniqueId
         self.flags = flags
         self.acknowledged = acknowledged
+        self.correlationId = correlationId
     }
     
     required public init(decoder: PostboxDecoder) {
         self.uniqueId = decoder.decodeInt64ForKey("u", orElse: 0)
         self.flags = OutgoingMessageInfoFlags(rawValue: decoder.decodeInt32ForKey("f", orElse: 0))
         self.acknowledged = decoder.decodeInt32ForKey("ack", orElse: 0) != 0
+        self.correlationId = decoder.decodeOptionalInt64ForKey("cid")
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt64(self.uniqueId, forKey: "u")
         encoder.encodeInt32(self.flags.rawValue, forKey: "f")
         encoder.encodeInt32(self.acknowledged ? 1 : 0, forKey: "ack")
+        if let correlationId = self.correlationId {
+            encoder.encodeInt64(correlationId, forKey: "cid")
+        } else {
+            encoder.encodeNil(forKey: "cid")
+        }
     }
     
     public func withUpdatedFlags(_ flags: OutgoingMessageInfoFlags) -> OutgoingMessageInfoAttribute {
-        return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: flags, acknowledged: self.acknowledged)
+        return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: flags, acknowledged: self.acknowledged, correlationId: self.correlationId)
     }
     
     public func withUpdatedAcknowledged(_ acknowledged: Bool) -> OutgoingMessageInfoAttribute {
-        return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: self.flags, acknowledged: acknowledged)
+        return OutgoingMessageInfoAttribute(uniqueId: self.uniqueId, flags: self.flags, acknowledged: acknowledged, correlationId: self.correlationId)
     }
 }
diff --git a/submodules/SyncCore/Sources/PeerReference.swift b/submodules/SyncCore/Sources/PeerReference.swift
index dc50bea070..9b93b4f6e6 100644
--- a/submodules/SyncCore/Sources/PeerReference.swift
+++ b/submodules/SyncCore/Sources/PeerReference.swift
@@ -39,15 +39,15 @@ public enum PeerReference: PostboxCoding, Hashable, Equatable {
         switch peer {
             case let user as TelegramUser:
                 if let accessHash = user.accessHash {
-                    self = .user(id: user.id.id, accessHash: accessHash.value)
+                    self = .user(id: user.id.id._internalGetInt32Value(), accessHash: accessHash.value)
                 } else {
                     return nil
                 }
             case let group as TelegramGroup:
-                self = .group(id: group.id.id)
+                self = .group(id: group.id.id._internalGetInt32Value())
             case let channel as TelegramChannel:
                 if let accessHash = channel.accessHash {
-                    self = .channel(id: channel.id.id, accessHash: accessHash.value)
+                    self = .channel(id: channel.id.id._internalGetInt32Value(), accessHash: accessHash.value)
                 } else {
                     return nil
                 }
diff --git a/submodules/SyncCore/Sources/ReplyMarkupMessageAttribute.swift b/submodules/SyncCore/Sources/ReplyMarkupMessageAttribute.swift
index d1eb42c27c..33e8c4db04 100644
--- a/submodules/SyncCore/Sources/ReplyMarkupMessageAttribute.swift
+++ b/submodules/SyncCore/Sources/ReplyMarkupMessageAttribute.swift
@@ -150,23 +150,31 @@ public struct ReplyMarkupMessageFlags: OptionSet {
 public class ReplyMarkupMessageAttribute: MessageAttribute, Equatable {
     public let rows: [ReplyMarkupRow]
     public let flags: ReplyMarkupMessageFlags
+    public let placeholder: String?
     
-    public init(rows: [ReplyMarkupRow], flags: ReplyMarkupMessageFlags) {
+    public init(rows: [ReplyMarkupRow], flags: ReplyMarkupMessageFlags, placeholder: String?) {
         self.rows = rows
         self.flags = flags
+        self.placeholder = placeholder
     }
     
     public required init(decoder: PostboxDecoder) {
         self.rows = decoder.decodeObjectArrayWithDecoderForKey("r")
         self.flags = ReplyMarkupMessageFlags(rawValue: decoder.decodeInt32ForKey("f", orElse: 0))
+        self.placeholder = decoder.decodeOptionalStringForKey("pl")
     }
     
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeObjectArray(self.rows, forKey: "r")
         encoder.encodeInt32(self.flags.rawValue, forKey: "f")
+        if let placeholder = self.placeholder {
+            encoder.encodeString(placeholder, forKey: "pl")
+        } else {
+            encoder.encodeNil(forKey: "pl")
+        }
     }
     
     public static func ==(lhs: ReplyMarkupMessageAttribute, rhs: ReplyMarkupMessageAttribute) -> Bool {
-        return lhs.flags == rhs.flags && lhs.rows == rhs.rows
+        return lhs.flags == rhs.flags && lhs.rows == rhs.rows && lhs.placeholder == rhs.placeholder
     }
 }
diff --git a/submodules/SyncCore/Sources/SecretChatState.swift b/submodules/SyncCore/Sources/SecretChatState.swift
index 26164481a5..48be226cf4 100644
--- a/submodules/SyncCore/Sources/SecretChatState.swift
+++ b/submodules/SyncCore/Sources/SecretChatState.swift
@@ -249,7 +249,7 @@ public struct SecretChatLayerNegotiationState: PostboxCoding, Equatable {
     }
     
     public init(decoder: PostboxDecoder) {
-        self.activeLayer = SecretChatSequenceBasedLayer(rawValue: decoder.decodeInt32ForKey("a", orElse: 0)) ?? .layer46
+        self.activeLayer = SecretChatSequenceBasedLayer(rawValue: decoder.decodeInt32ForKey("a", orElse: 0)) ?? .layer73
         self.locallyRequestedLayer = decoder.decodeOptionalInt32ForKey("lr")
         self.remotelyRequestedLayer = decoder.decodeOptionalInt32ForKey("rr")
     }
diff --git a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
index 843c08ddea..d9b8c07eb7 100644
--- a/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
+++ b/submodules/SyncCore/Sources/StandaloneAccountTransaction.swift
@@ -38,7 +38,7 @@ public let telegramPostboxSeedConfiguration: SeedConfiguration = {
         globalMessageIdsPeerIdNamespaces.insert(GlobalMessageIdsNamespace(peerIdNamespace: peerIdNamespace, messageIdNamespace: Namespaces.Message.Cloud))
     }
     
-    return SeedConfiguration(globalMessageIdsPeerIdNamespaces: globalMessageIdsPeerIdNamespaces, initializeChatListWithHole: (topLevel: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1)), groups: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1))), messageHoles: messageHoles, upgradedMessageHoles: upgradedMessageHoles, messageThreadHoles: messageThreadHoles, existingMessageTags: MessageTags.all, messageTagsWithSummary: [.unseenPersonalMessage, .pinned], existingGlobalMessageTags: GlobalMessageTags.all, peerNamespacesRequiringMessageTextIndex: [Namespaces.Peer.SecretChat], peerSummaryCounterTags: { peer, isContact in
+    return SeedConfiguration(globalMessageIdsPeerIdNamespaces: globalMessageIdsPeerIdNamespaces, initializeChatListWithHole: (topLevel: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: PeerId.Id._internalFromInt32Value(0)), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1)), groups: ChatListHole(index: MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: PeerId.Id._internalFromInt32Value(0)), namespace: Namespaces.Message.Cloud, id: 1), timestamp: Int32.max - 1))), messageHoles: messageHoles, upgradedMessageHoles: upgradedMessageHoles, messageThreadHoles: messageThreadHoles, existingMessageTags: MessageTags.all, messageTagsWithSummary: [.unseenPersonalMessage, .pinned], existingGlobalMessageTags: GlobalMessageTags.all, peerNamespacesRequiringMessageTextIndex: [Namespaces.Peer.SecretChat], peerSummaryCounterTags: { peer, isContact in
         if let peer = peer as? TelegramUser {
             if peer.botInfo != nil {
                 return .bot
diff --git a/submodules/SyncCore/Sources/SynchronizePinnedChatsOperation.swift b/submodules/SyncCore/Sources/SynchronizePinnedChatsOperation.swift
index 4f9fd6b5ff..02b21573c2 100644
--- a/submodules/SyncCore/Sources/SynchronizePinnedChatsOperation.swift
+++ b/submodules/SyncCore/Sources/SynchronizePinnedChatsOperation.swift
@@ -48,7 +48,7 @@ public func addSynchronizePinnedChatsOperation(transaction: Transaction, groupId
     var previousItemIds = transaction.getPinnedItemIds(groupId: groupId)
     var updateLocalIndex: Int32?
     
-    transaction.operationLogEnumerateEntries(peerId: PeerId(namespace: 0, id: rawId), tag: OperationLogTags.SynchronizePinnedChats, { entry in
+    transaction.operationLogEnumerateEntries(peerId: PeerId(namespace: PeerId.Namespace._internalFromInt32Value(0), id: PeerId.Id._internalFromInt32Value(rawId)), tag: OperationLogTags.SynchronizePinnedChats, { entry in
         updateLocalIndex = entry.tagLocalIndex
         if let contents = entry.contents as? SynchronizePinnedChatsOperation {
             previousItemIds = contents.previousItemIds
@@ -57,7 +57,7 @@ public func addSynchronizePinnedChatsOperation(transaction: Transaction, groupId
     })
     let operationContents = SynchronizePinnedChatsOperation(previousItemIds: previousItemIds)
     if let updateLocalIndex = updateLocalIndex {
-        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(namespace: 0, id: rawId), tag: OperationLogTags.SynchronizePinnedChats, tagLocalIndex: updateLocalIndex)
+        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(namespace: PeerId.Namespace._internalFromInt32Value(0), id: PeerId.Id._internalFromInt32Value(rawId)), tag: OperationLogTags.SynchronizePinnedChats, tagLocalIndex: updateLocalIndex)
     }
-    transaction.operationLogAddEntry(peerId: PeerId(namespace: 0, id: rawId), tag: OperationLogTags.SynchronizePinnedChats, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
+    transaction.operationLogAddEntry(peerId: PeerId(namespace: PeerId.Namespace._internalFromInt32Value(0), id: PeerId.Id._internalFromInt32Value(rawId)), tag: OperationLogTags.SynchronizePinnedChats, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
 }
diff --git a/submodules/SyncCore/Sources/TelegramMediaAction.swift b/submodules/SyncCore/Sources/TelegramMediaAction.swift
index 8da6281da5..7ad29dd436 100644
--- a/submodules/SyncCore/Sources/TelegramMediaAction.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaAction.swift
@@ -46,7 +46,7 @@ public enum TelegramMediaActionType: PostboxCoding, Equatable {
     case peerJoined
     case phoneNumberRequest
     case geoProximityReached(from: PeerId, to: PeerId, distance: Int32)
-    case groupPhoneCall(callId: Int64, accessHash: Int64, duration: Int32?)
+    case groupPhoneCall(callId: Int64, accessHash: Int64, scheduleDate: Int32?, duration: Int32?)
     case inviteToGroupPhoneCall(callId: Int64, accessHash: Int64, peerIds: [PeerId])
     
     public init(decoder: PostboxDecoder) {
@@ -101,7 +101,7 @@ public enum TelegramMediaActionType: PostboxCoding, Equatable {
             case 21:
                 self = .geoProximityReached(from: PeerId(decoder.decodeInt64ForKey("fromId", orElse: 0)), to: PeerId(decoder.decodeInt64ForKey("toId", orElse: 0)), distance: (decoder.decodeInt32ForKey("dst", orElse: 0)))
             case 22:
-                self = .groupPhoneCall(callId: decoder.decodeInt64ForKey("callId", orElse: 0), accessHash: decoder.decodeInt64ForKey("accessHash", orElse: 0), duration: decoder.decodeOptionalInt32ForKey("duration"))
+                self = .groupPhoneCall(callId: decoder.decodeInt64ForKey("callId", orElse: 0), accessHash: decoder.decodeInt64ForKey("accessHash", orElse: 0), scheduleDate: decoder.decodeOptionalInt32ForKey("scheduleDate"), duration: decoder.decodeOptionalInt32ForKey("duration"))
             case 23:
                 var peerIds: [PeerId] = []
                 if let peerId = decoder.decodeOptionalInt64ForKey("peerId") {
@@ -200,10 +200,15 @@ public enum TelegramMediaActionType: PostboxCoding, Equatable {
                 encoder.encodeInt64(from.toInt64(), forKey: "fromId")
                 encoder.encodeInt64(to.toInt64(), forKey: "toId")
                 encoder.encodeInt32(distance, forKey: "dst")
-            case let .groupPhoneCall(callId, accessHash, duration):
+            case let .groupPhoneCall(callId, accessHash, scheduleDate, duration):
                 encoder.encodeInt32(22, forKey: "_rawValue")
                 encoder.encodeInt64(callId, forKey: "callId")
                 encoder.encodeInt64(accessHash, forKey: "accessHash")
+                if let scheduleDate = scheduleDate {
+                    encoder.encodeInt32(scheduleDate, forKey: "scheduleDate")
+                } else {
+                    encoder.encodeNil(forKey: "scheduleDate")
+                }
                 if let duration = duration {
                     encoder.encodeInt32(duration, forKey: "duration")
                 } else {
diff --git a/submodules/SyncCore/Sources/TelegramMediaFile.swift b/submodules/SyncCore/Sources/TelegramMediaFile.swift
index 66f8ac0d75..9b27539e27 100644
--- a/submodules/SyncCore/Sources/TelegramMediaFile.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaFile.swift
@@ -425,6 +425,8 @@ public final class TelegramMediaFile: Media, Equatable, Codable {
             if case .Sticker = attribute {
                 if let s = self.size, s < 300 * 1024 {
                     return !isAnimatedSticker
+                } else if self.size == nil {
+                    return !isAnimatedSticker
                 }
             }
         }
@@ -577,6 +579,10 @@ public final class TelegramMediaFile: Media, Equatable, Codable {
     public func withUpdatedPartialReference(_ partialReference: PartialMediaReference?) -> TelegramMediaFile {
         return TelegramMediaFile(fileId: self.fileId, partialReference: partialReference, resource: self.resource, previewRepresentations: self.previewRepresentations, videoThumbnails: self.videoThumbnails, immediateThumbnailData: self.immediateThumbnailData, mimeType: self.mimeType, size: self.size, attributes: self.attributes)
     }
+
+    public func withUpdatedResource(_ resource: TelegramMediaResource) -> TelegramMediaFile {
+        return TelegramMediaFile(fileId: self.fileId, partialReference: self.partialReference, resource: resource, previewRepresentations: self.previewRepresentations, videoThumbnails: self.videoThumbnails, immediateThumbnailData: self.immediateThumbnailData, mimeType: self.mimeType, size: self.size, attributes: self.attributes)
+    }
     
     public func withUpdatedSize(_ size: Int?) -> TelegramMediaFile {
         return TelegramMediaFile(fileId: self.fileId, partialReference: self.partialReference, resource: self.resource, previewRepresentations: self.previewRepresentations, videoThumbnails: self.videoThumbnails, immediateThumbnailData: self.immediateThumbnailData, mimeType: self.mimeType, size: size, attributes: self.attributes)
diff --git a/submodules/SyncCore/Sources/TelegramMediaImage.swift b/submodules/SyncCore/Sources/TelegramMediaImage.swift
index 644a023398..11c9c10d8c 100644
--- a/submodules/SyncCore/Sources/TelegramMediaImage.swift
+++ b/submodules/SyncCore/Sources/TelegramMediaImage.swift
@@ -304,17 +304,20 @@ public final class TelegramMediaImageRepresentation: PostboxCoding, Equatable, C
     public let dimensions: PixelDimensions
     public let resource: TelegramMediaResource
     public let progressiveSizes: [Int32]
+    public let immediateThumbnailData: Data?
     
-    public init(dimensions: PixelDimensions, resource: TelegramMediaResource, progressiveSizes: [Int32]) {
+    public init(dimensions: PixelDimensions, resource: TelegramMediaResource, progressiveSizes: [Int32], immediateThumbnailData: Data?) {
         self.dimensions = dimensions
         self.resource = resource
         self.progressiveSizes = progressiveSizes
+        self.immediateThumbnailData = immediateThumbnailData
     }
     
     public init(decoder: PostboxDecoder) {
         self.dimensions = PixelDimensions(width: decoder.decodeInt32ForKey("dx", orElse: 0), height: decoder.decodeInt32ForKey("dy", orElse: 0))
         self.resource = decoder.decodeObjectForKey("r") as? TelegramMediaResource ?? EmptyMediaResource()
         self.progressiveSizes = decoder.decodeInt32ArrayForKey("ps")
+        self.immediateThumbnailData = decoder.decodeDataForKey("th")
     }
     
     public func encode(_ encoder: PostboxEncoder) {
@@ -322,6 +325,11 @@ public final class TelegramMediaImageRepresentation: PostboxCoding, Equatable, C
         encoder.encodeInt32(self.dimensions.height, forKey: "dy")
         encoder.encodeObject(self.resource, forKey: "r")
         encoder.encodeInt32Array(self.progressiveSizes, forKey: "ps")
+        if let immediateThumbnailData = self.immediateThumbnailData {
+            encoder.encodeData(immediateThumbnailData, forKey: "th")
+        } else {
+            encoder.encodeNil(forKey: "th")
+        }
     }
     
     public var description: String {
@@ -338,6 +346,9 @@ public final class TelegramMediaImageRepresentation: PostboxCoding, Equatable, C
         if self.progressiveSizes != other.progressiveSizes {
             return false
         }
+        if self.immediateThumbnailData != other.immediateThumbnailData {
+            return false
+        }
         return true
     }
 }
diff --git a/submodules/SyncCore/Sources/TelegramWallpaper.swift b/submodules/SyncCore/Sources/TelegramWallpaper.swift
index 7b500b04de..baf2a7aba0 100644
--- a/submodules/SyncCore/Sources/TelegramWallpaper.swift
+++ b/submodules/SyncCore/Sources/TelegramWallpaper.swift
@@ -1,18 +1,16 @@
 import Postbox
 
 public struct WallpaperSettings: PostboxCoding, Equatable {
-    public let blur: Bool
-    public let motion: Bool
-    public let color: UInt32?
-    public let bottomColor: UInt32?
-    public let intensity: Int32?
-    public let rotation: Int32?
+    public var blur: Bool
+    public var motion: Bool
+    public var colors: [UInt32]
+    public var intensity: Int32?
+    public var rotation: Int32?
     
-    public init(blur: Bool = false, motion: Bool = false, color: UInt32? = nil, bottomColor: UInt32? = nil, intensity: Int32? = nil, rotation: Int32? = nil) {
+    public init(blur: Bool = false, motion: Bool = false, colors: [UInt32] = [], intensity: Int32? = nil, rotation: Int32? = nil) {
         self.blur = blur
         self.motion = motion
-        self.color = color
-        self.bottomColor = bottomColor
+        self.colors = colors
         self.intensity = intensity
         self.rotation = rotation
     }
@@ -20,8 +18,16 @@ public struct WallpaperSettings: PostboxCoding, Equatable {
     public init(decoder: PostboxDecoder) {
         self.blur = decoder.decodeInt32ForKey("b", orElse: 0) != 0
         self.motion = decoder.decodeInt32ForKey("m", orElse: 0) != 0
-        self.color = decoder.decodeOptionalInt32ForKey("c").flatMap { UInt32(bitPattern: $0) }
-        self.bottomColor = decoder.decodeOptionalInt32ForKey("bc").flatMap { UInt32(bitPattern: $0) }
+        if let topColor = decoder.decodeOptionalInt32ForKey("c").flatMap(UInt32.init(bitPattern:)) {
+            var colors: [UInt32] = [topColor]
+            if let bottomColor = decoder.decodeOptionalInt32ForKey("bc").flatMap(UInt32.init(bitPattern:)) {
+                colors.append(bottomColor)
+            }
+            self.colors = colors
+        } else {
+            self.colors = decoder.decodeInt32ArrayForKey("colors").map(UInt32.init(bitPattern:))
+        }
+
         self.intensity = decoder.decodeOptionalInt32ForKey("i")
         self.rotation = decoder.decodeOptionalInt32ForKey("r")
     }
@@ -29,16 +35,7 @@ public struct WallpaperSettings: PostboxCoding, Equatable {
     public func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt32(self.blur ? 1 : 0, forKey: "b")
         encoder.encodeInt32(self.motion ? 1 : 0, forKey: "m")
-        if let color = self.color {
-            encoder.encodeInt32(Int32(bitPattern: color), forKey: "c")
-        } else {
-            encoder.encodeNil(forKey: "c")
-        }
-        if let bottomColor = self.bottomColor {
-            encoder.encodeInt32(Int32(bitPattern: bottomColor), forKey: "bc")
-        } else {
-            encoder.encodeNil(forKey: "bc")
-        }
+        encoder.encodeInt32Array(self.colors.map(Int32.init(bitPattern:)), forKey: "colors")
         if let intensity = self.intensity {
             encoder.encodeInt32(intensity, forKey: "i")
         } else {
@@ -58,18 +55,15 @@ public struct WallpaperSettings: PostboxCoding, Equatable {
         if lhs.motion != rhs.motion {
             return false
         }
-        if lhs.color != rhs.color {
-            return false
-        }
-        if lhs.bottomColor != rhs.bottomColor {
+        if lhs.colors != rhs.colors {
             return false
         }
         if lhs.intensity != rhs.intensity {
-              return false
-          }
+            return false
+        }
         if lhs.rotation != rhs.rotation {
-              return false
-          }
+            return false
+        }
         return true
     }
 }
@@ -77,33 +71,45 @@ public struct WallpaperSettings: PostboxCoding, Equatable {
 public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
     case builtin(WallpaperSettings)
     case color(UInt32)
-    case gradient(UInt32, UInt32, WallpaperSettings)
+    case gradient(Int64?, [UInt32], WallpaperSettings)
     case image([TelegramMediaImageRepresentation], WallpaperSettings)
     case file(id: Int64, accessHash: Int64, isCreator: Bool, isDefault: Bool, isPattern: Bool, isDark: Bool, slug: String, file: TelegramMediaFile, settings: WallpaperSettings)
     
     public init(decoder: PostboxDecoder) {
         switch decoder.decodeInt32ForKey("v", orElse: 0) {
-            case 0:
-                let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
-                self = .builtin(settings)
-            case 1:
-                self = .color(UInt32(bitPattern: decoder.decodeInt32ForKey("c", orElse: 0)))
-            case 2:
-                let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
-                self = .image(decoder.decodeObjectArrayWithDecoderForKey("i"), settings)
-            case 3:
-                let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
-                if let file = decoder.decodeObjectForKey("file", decoder: { TelegramMediaFile(decoder: $0) }) as? TelegramMediaFile {
-                    self = .file(id: decoder.decodeInt64ForKey("id", orElse: 0), accessHash: decoder.decodeInt64ForKey("accessHash", orElse: 0), isCreator: decoder.decodeInt32ForKey("isCreator", orElse: 0) != 0, isDefault: decoder.decodeInt32ForKey("isDefault", orElse: 0) != 0, isPattern: decoder.decodeInt32ForKey("isPattern", orElse: 0) != 0, isDark: decoder.decodeInt32ForKey("isDark", orElse: 0) != 0, slug: decoder.decodeStringForKey("slug", orElse: ""), file: file, settings: settings)
-                } else {
-                    self = .color(0xffffff)
-                }
-            case 4:
-                 let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
-                self = .gradient(UInt32(bitPattern: decoder.decodeInt32ForKey("c1", orElse: 0)), UInt32(bitPattern: decoder.decodeInt32ForKey("c2", orElse: 0)), settings)
-            default:
-                assertionFailure()
+        case 0:
+            let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
+            self = .builtin(settings)
+        case 1:
+            self = .color(UInt32(bitPattern: decoder.decodeInt32ForKey("c", orElse: 0)))
+        case 2:
+            let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
+            self = .image(decoder.decodeObjectArrayWithDecoderForKey("i"), settings)
+        case 3:
+            let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
+            if let file = decoder.decodeObjectForKey("file", decoder: { TelegramMediaFile(decoder: $0) }) as? TelegramMediaFile {
+                self = .file(id: decoder.decodeInt64ForKey("id", orElse: 0), accessHash: decoder.decodeInt64ForKey("accessHash", orElse: 0), isCreator: decoder.decodeInt32ForKey("isCreator", orElse: 0) != 0, isDefault: decoder.decodeInt32ForKey("isDefault", orElse: 0) != 0, isPattern: decoder.decodeInt32ForKey("isPattern", orElse: 0) != 0, isDark: decoder.decodeInt32ForKey("isDark", orElse: 0) != 0, slug: decoder.decodeStringForKey("slug", orElse: ""), file: file, settings: settings)
+            } else {
                 self = .color(0xffffff)
+            }
+        case 4:
+            let settings = decoder.decodeObjectForKey("settings", decoder: { WallpaperSettings(decoder: $0) }) as? WallpaperSettings ?? WallpaperSettings()
+
+            var colors: [UInt32] = []
+
+            if let topColor = decoder.decodeOptionalInt32ForKey("c1").flatMap(UInt32.init(bitPattern:)) {
+                colors.append(topColor)
+                if let bottomColor = decoder.decodeOptionalInt32ForKey("c2").flatMap(UInt32.init(bitPattern:)) {
+                    colors.append(bottomColor)
+                }
+            } else {
+                colors = decoder.decodeInt32ArrayForKey("colors").map(UInt32.init(bitPattern:))
+            }
+
+            self = .gradient(decoder.decodeOptionalInt64ForKey("id"), colors, settings)
+        default:
+            assertionFailure()
+            self = .color(0xffffff)
         }
     }
     
@@ -124,10 +130,14 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
             case let .color(color):
                 encoder.encodeInt32(1, forKey: "v")
                 encoder.encodeInt32(Int32(bitPattern: color), forKey: "c")
-            case let .gradient(topColor, bottomColor, settings):
+            case let .gradient(id, colors, settings):
                 encoder.encodeInt32(4, forKey: "v")
-                encoder.encodeInt32(Int32(bitPattern: topColor), forKey: "c1")
-                encoder.encodeInt32(Int32(bitPattern: bottomColor), forKey: "c2")
+                if let id = id {
+                    encoder.encodeInt64(id, forKey: "id")
+                } else {
+                    encoder.encodeNil(forKey: "id")
+                }
+                encoder.encodeInt32Array(colors.map(Int32.init(bitPattern:)), forKey: "colors")
                 encoder.encodeObject(settings, forKey: "settings")
             case let .image(representations, settings):
                 encoder.encodeInt32(2, forKey: "v")
@@ -161,8 +171,8 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
                 } else {
                     return false
                 }
-            case let .gradient(topColor, bottomColor, settings):
-                if case .gradient(topColor, bottomColor, settings) = rhs {
+            case let .gradient(id, colors, settings):
+                if case .gradient(id, colors, settings) = rhs {
                     return true
                 } else {
                     return false
@@ -196,8 +206,8 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
                 } else {
                     return false
                 }
-            case let .gradient(topColor, bottomColor, _):
-                if case .gradient(topColor, bottomColor, _) = wallpaper {
+            case let .gradient(_, colors, _):
+                if case .gradient(_, colors, _) = wallpaper {
                     return true
                 } else {
                     return false
@@ -209,7 +219,7 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
                     return false
                 }
             case let .file(_, _, _, _, _, _, lhsSlug, _, lhsSettings):
-                if case let .file(_, _, _, _, _, _, rhsSlug, _, rhsSettings) = wallpaper, lhsSlug == rhsSlug, lhsSettings.color == rhsSettings.color && lhsSettings.intensity == rhsSettings.intensity {
+                if case let .file(_, _, _, _, _, _, rhsSlug, _, rhsSettings) = wallpaper, lhsSlug == rhsSlug, lhsSettings.colors == rhsSettings.colors && lhsSettings.intensity == rhsSettings.intensity {
                     return true
                 } else {
                     return false
@@ -232,12 +242,12 @@ public enum TelegramWallpaper: OrderedItemListEntryContents, Equatable {
                 return .builtin(settings)
             case .color:
                 return self
-            case let .gradient(topColor, bottomColor, _):
-                return .gradient(topColor, bottomColor, settings)
+            case let .gradient(id, colors, _):
+                return .gradient(id, colors, settings)
             case let .image(representations, _):
                 return .image(representations, settings)
             case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, _):
-                return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: settings.color != nil ? true : isPattern, isDark: isDark, slug: slug, file: file, settings: settings)
+                return .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: isPattern, isDark: isDark, slug: slug, file: file, settings: settings)
         }
     }
 }
diff --git a/submodules/SyncCore/Sources/wallapersState.swift b/submodules/SyncCore/Sources/wallapersState.swift
new file mode 100644
index 0000000000..b3117097fa
--- /dev/null
+++ b/submodules/SyncCore/Sources/wallapersState.swift
@@ -0,0 +1,35 @@
+import Postbox
+import SwiftSignalKit
+
+public struct WallpapersState: PreferencesEntry, Equatable {
+    public var wallpapers: [TelegramWallpaper]
+
+    public static var `default`: WallpapersState {
+        return WallpapersState(wallpapers: [])
+    }
+
+    public init(wallpapers: [TelegramWallpaper]) {
+        self.wallpapers = wallpapers
+    }
+
+    public init(decoder: PostboxDecoder) {
+        self.wallpapers = decoder.decodeObjectArrayWithDecoderForKey("wallpapers")
+    }
+
+    public func encode(_ encoder: PostboxEncoder) {
+        encoder.encodeObjectArray(self.wallpapers, forKey: "wallpapers")
+    }
+
+    public func isEqual(to: PreferencesEntry) -> Bool {
+        return self == (to as? WallpapersState)
+    }
+}
+
+public extension WallpapersState {
+    static func update(transaction: AccountManagerModifier, _ f: (WallpapersState) -> WallpapersState) {
+        transaction.updateSharedData(SharedDataKeys.wallapersState, { current in
+            let item = (transaction.getSharedData(SharedDataKeys.wallapersState) as? WallpapersState) ?? WallpapersState(wallpapers: [])
+            return f(item)
+        })
+    }
+}
diff --git a/submodules/TelegramAnimatedStickerNode/Sources/AnimatedStickerUtils.swift b/submodules/TelegramAnimatedStickerNode/Sources/AnimatedStickerUtils.swift
index d39c63244e..a12fc19c98 100644
--- a/submodules/TelegramAnimatedStickerNode/Sources/AnimatedStickerUtils.swift
+++ b/submodules/TelegramAnimatedStickerNode/Sources/AnimatedStickerUtils.swift
@@ -136,7 +136,7 @@ public func experimentalConvertCompressedLottieToCombinedMp4(data: Data, size: C
                         return
                     }
                     
-                    let bytesPerRow = (4 * Int(size.width) + 15) & (~15)
+                    let bytesPerRow = DeviceGraphicsContextSettings.shared.bytesPerRow(forWidth: Int(size.width))
                     
                     var currentFrame: Int32 = 0
                     
diff --git a/submodules/TelegramApi/Sources/Api0.swift b/submodules/TelegramApi/Sources/Api0.swift
index eb7b7b353d..33901fcd07 100644
--- a/submodules/TelegramApi/Sources/Api0.swift
+++ b/submodules/TelegramApi/Sources/Api0.swift
@@ -7,7 +7,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1255641564] = { return parseString($0) }
     dict[-1240849242] = { return Api.messages.StickerSet.parse_stickerSet($0) }
     dict[2004925620] = { return Api.GroupCall.parse_groupCallDiscarded($0) }
-    dict[-1061026514] = { return Api.GroupCall.parse_groupCall($0) }
+    dict[-711498484] = { return Api.GroupCall.parse_groupCall($0) }
     dict[-457104426] = { return Api.InputGeoPoint.parse_inputGeoPointEmpty($0) }
     dict[1210199983] = { return Api.InputGeoPoint.parse_inputGeoPoint($0) }
     dict[-784000893] = { return Api.payments.ValidatedRequestedInfo.parse_validatedRequestedInfo($0) }
@@ -88,7 +88,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-347535331] = { return Api.RecentMeUrl.parse_recentMeUrlChatInvite($0) }
     dict[-1140172836] = { return Api.RecentMeUrl.parse_recentMeUrlStickerSet($0) }
     dict[-797791052] = { return Api.RestrictionReason.parse_restrictionReason($0) }
-    dict[-177282392] = { return Api.channels.ChannelParticipants.parse_channelParticipants($0) }
+    dict[-1699676497] = { return Api.channels.ChannelParticipants.parse_channelParticipants($0) }
     dict[-266911767] = { return Api.channels.ChannelParticipants.parse_channelParticipantsNotModified($0) }
     dict[-599948721] = { return Api.RichText.parse_textEmpty($0) }
     dict[1950782688] = { return Api.RichText.parse_textPlain($0) }
@@ -115,14 +115,14 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1705233435] = { return Api.account.PasswordSettings.parse_passwordSettings($0) }
     dict[-1945767479] = { return Api.help.SupportName.parse_supportName($0) }
     dict[-288727837] = { return Api.LangPackLanguage.parse_langPackLanguage($0) }
-    dict[-399391402] = { return Api.VideoSize.parse_videoSize($0) }
-    dict[497489295] = { return Api.help.AppUpdate.parse_appUpdate($0) }
+    dict[-567037804] = { return Api.VideoSize.parse_videoSize($0) }
+    dict[-860107216] = { return Api.help.AppUpdate.parse_appUpdate($0) }
     dict[-1000708810] = { return Api.help.AppUpdate.parse_noAppUpdate($0) }
     dict[-209337866] = { return Api.LangPackDifference.parse_langPackDifference($0) }
-    dict[84438264] = { return Api.WallPaperSettings.parse_wallPaperSettings($0) }
+    dict[499236004] = { return Api.WallPaperSettings.parse_wallPaperSettings($0) }
     dict[-1519029347] = { return Api.EmojiURL.parse_emojiURL($0) }
     dict[1611985938] = { return Api.StatsGroupTopAdmin.parse_statsGroupTopAdmin($0) }
-    dict[-791039645] = { return Api.channels.ChannelParticipant.parse_channelParticipant($0) }
+    dict[-541588713] = { return Api.channels.ChannelParticipant.parse_channelParticipant($0) }
     dict[-1736378792] = { return Api.InputCheckPasswordSRP.parse_inputCheckPasswordEmpty($0) }
     dict[-763367294] = { return Api.InputCheckPasswordSRP.parse_inputCheckPasswordSRP($0) }
     dict[-1432995067] = { return Api.storage.FileType.parse_fileUnknown($0) }
@@ -142,7 +142,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[767652808] = { return Api.InputEncryptedFile.parse_inputEncryptedFileBigUploaded($0) }
     dict[1304052993] = { return Api.account.Takeout.parse_takeout($0) }
     dict[-1456996667] = { return Api.messages.InactiveChats.parse_inactiveChats($0) }
-    dict[430815881] = { return Api.GroupCallParticipant.parse_groupCallParticipant($0) }
+    dict[-341428482] = { return Api.GroupCallParticipant.parse_groupCallParticipant($0) }
     dict[1443858741] = { return Api.messages.SentEncryptedMessage.parse_sentEncryptedMessage($0) }
     dict[-1802240206] = { return Api.messages.SentEncryptedMessage.parse_sentEncryptedFile($0) }
     dict[289586518] = { return Api.SavedContact.parse_savedPhoneContact($0) }
@@ -261,7 +261,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-2112423005] = { return Api.Update.parse_updateTheme($0) }
     dict[-2027964103] = { return Api.Update.parse_updateGeoLiveViewed($0) }
     dict[1448076945] = { return Api.Update.parse_updateLoginToken($0) }
-    dict[1123585836] = { return Api.Update.parse_updateMessagePollVote($0) }
+    dict[938909451] = { return Api.Update.parse_updateMessagePollVote($0) }
     dict[654302845] = { return Api.Update.parse_updateDialogFilter($0) }
     dict[-1512627963] = { return Api.Update.parse_updateDialogFilterOrder($0) }
     dict[889491791] = { return Api.Update.parse_updateDialogFilters($0) }
@@ -280,15 +280,18 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-206342113] = { return Api.Update.parse_updateChatParticipant($0) }
     dict[2146218476] = { return Api.Update.parse_updateChannelParticipant($0) }
     dict[133777546] = { return Api.Update.parse_updateBotStopped($0) }
+    dict[192428418] = { return Api.Update.parse_updateGroupCallConnection($0) }
+    dict[-813823885] = { return Api.Update.parse_updateBotCommands($0) }
     dict[136574537] = { return Api.messages.VotesList.parse_votesList($0) }
     dict[1558266229] = { return Api.PopularContact.parse_popularContact($0) }
+    dict[-592373577] = { return Api.GroupCallParticipantVideoSourceGroup.parse_groupCallParticipantVideoSourceGroup($0) }
     dict[-373643672] = { return Api.FolderPeer.parse_folderPeer($0) }
     dict[367766557] = { return Api.ChannelParticipant.parse_channelParticipant($0) }
     dict[-1557620115] = { return Api.ChannelParticipant.parse_channelParticipantSelf($0) }
     dict[1149094475] = { return Api.ChannelParticipant.parse_channelParticipantCreator($0) }
     dict[-859915345] = { return Api.ChannelParticipant.parse_channelParticipantAdmin($0) }
-    dict[470789295] = { return Api.ChannelParticipant.parse_channelParticipantBanned($0) }
-    dict[-1010402965] = { return Api.ChannelParticipant.parse_channelParticipantLeft($0) }
+    dict[1352785878] = { return Api.ChannelParticipant.parse_channelParticipantBanned($0) }
+    dict[453242886] = { return Api.ChannelParticipant.parse_channelParticipantLeft($0) }
     dict[-1567730343] = { return Api.MessageUserVote.parse_messageUserVote($0) }
     dict[909603888] = { return Api.MessageUserVote.parse_messageUserVoteInputOption($0) }
     dict[244310238] = { return Api.MessageUserVote.parse_messageUserVoteMultiple($0) }
@@ -313,10 +316,10 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-199313886] = { return Api.account.Themes.parse_themesNotModified($0) }
     dict[2137482273] = { return Api.account.Themes.parse_themes($0) }
     dict[236446268] = { return Api.PhotoSize.parse_photoSizeEmpty($0) }
-    dict[2009052699] = { return Api.PhotoSize.parse_photoSize($0) }
-    dict[-374917894] = { return Api.PhotoSize.parse_photoCachedSize($0) }
+    dict[1976012384] = { return Api.PhotoSize.parse_photoSize($0) }
+    dict[35527382] = { return Api.PhotoSize.parse_photoCachedSize($0) }
     dict[-525288402] = { return Api.PhotoSize.parse_photoStrippedSize($0) }
-    dict[1520986705] = { return Api.PhotoSize.parse_photoSizeProgressive($0) }
+    dict[-96535659] = { return Api.PhotoSize.parse_photoSizeProgressive($0) }
     dict[-668906175] = { return Api.PhotoSize.parse_photoPathSize($0) }
     dict[-244016606] = { return Api.messages.Stickers.parse_stickersNotModified($0) }
     dict[-463889475] = { return Api.messages.Stickers.parse_stickers($0) }
@@ -328,7 +331,6 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[1881892265] = { return Api.account.WallPapers.parse_wallPapers($0) }
     dict[1012306921] = { return Api.InputTheme.parse_inputTheme($0) }
     dict[-175567375] = { return Api.InputTheme.parse_inputThemeSlug($0) }
-    dict[-1132476723] = { return Api.FileLocation.parse_fileLocationToBeDeprecated($0) }
     dict[-2032041631] = { return Api.Poll.parse_poll($0) }
     dict[-1195615476] = { return Api.InputNotifyPeer.parse_inputNotifyPeer($0) }
     dict[423314455] = { return Api.InputNotifyPeer.parse_inputNotifyUsers($0) }
@@ -354,8 +356,9 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[1098628881] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageMediaVenue($0) }
     dict[-1494368259] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageMediaContact($0) }
     dict[1262639204] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageGame($0) }
+    dict[-672693723] = { return Api.InputBotInlineMessage.parse_inputBotInlineMessageMediaInvoice($0) }
     dict[2002815875] = { return Api.KeyboardButtonRow.parse_keyboardButtonRow($0) }
-    dict[1088567208] = { return Api.StickerSet.parse_stickerSet($0) }
+    dict[-673242758] = { return Api.StickerSet.parse_stickerSet($0) }
     dict[-1111085620] = { return Api.messages.ExportedChatInvites.parse_exportedChatInvites($0) }
     dict[354925740] = { return Api.SecureSecretSettings.parse_secureSecretSettings($0) }
     dict[539045032] = { return Api.photos.Photo.parse_photo($0) }
@@ -392,7 +395,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-440664550] = { return Api.InputMedia.parse_inputMediaPhotoExternal($0) }
     dict[-78455655] = { return Api.InputMedia.parse_inputMediaDocumentExternal($0) }
     dict[-750828557] = { return Api.InputMedia.parse_inputMediaGame($0) }
-    dict[-186607933] = { return Api.InputMedia.parse_inputMediaInvoice($0) }
+    dict[-646342540] = { return Api.InputMedia.parse_inputMediaInvoice($0) }
     dict[-1759532989] = { return Api.InputMedia.parse_inputMediaGeoLive($0) }
     dict[261416433] = { return Api.InputMedia.parse_inputMediaPoll($0) }
     dict[-428884101] = { return Api.InputMedia.parse_inputMediaDice($0) }
@@ -527,8 +530,8 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-786326563] = { return Api.InputPrivacyKey.parse_inputPrivacyKeyAddedByPhone($0) }
     dict[235081943] = { return Api.help.RecentMeUrls.parse_recentMeUrls($0) }
     dict[-1606526075] = { return Api.ReplyMarkup.parse_replyKeyboardHide($0) }
-    dict[-200242528] = { return Api.ReplyMarkup.parse_replyKeyboardForceReply($0) }
-    dict[889353612] = { return Api.ReplyMarkup.parse_replyKeyboardMarkup($0) }
+    dict[-2035021048] = { return Api.ReplyMarkup.parse_replyKeyboardForceReply($0) }
+    dict[-2049074735] = { return Api.ReplyMarkup.parse_replyKeyboardMarkup($0) }
     dict[1218642516] = { return Api.ReplyMarkup.parse_replyInlineMarkup($0) }
     dict[1556570557] = { return Api.EmojiKeywordsDifference.parse_emojiKeywordsDifference($0) }
     dict[1493171408] = { return Api.HighScore.parse_highScore($0) }
@@ -555,6 +558,9 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[182649427] = { return Api.MessageRange.parse_messageRange($0) }
     dict[946083368] = { return Api.messages.StickerSetInstallResult.parse_stickerSetInstallResultSuccess($0) }
     dict[904138920] = { return Api.messages.StickerSetInstallResult.parse_stickerSetInstallResultArchive($0) }
+    dict[-478701471] = { return Api.account.ResetPasswordResult.parse_resetPasswordFailedWait($0) }
+    dict[-370148227] = { return Api.account.ResetPasswordResult.parse_resetPasswordRequestedWait($0) }
+    dict[-383330754] = { return Api.account.ResetPasswordResult.parse_resetPasswordOk($0) }
     dict[856375399] = { return Api.Config.parse_config($0) }
     dict[-75283823] = { return Api.TopPeerCategoryPeers.parse_topPeerCategoryPeers($0) }
     dict[-1107729093] = { return Api.Game.parse_game($0) }
@@ -578,16 +584,24 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1160215659] = { return Api.InputMessage.parse_inputMessageReplyTo($0) }
     dict[-2037963464] = { return Api.InputMessage.parse_inputMessagePinned($0) }
     dict[-1392895362] = { return Api.InputMessage.parse_inputMessageCallbackQuery($0) }
+    dict[1735736008] = { return Api.GroupCallParticipantVideo.parse_groupCallParticipantVideo($0) }
     dict[-58224696] = { return Api.PhoneCallProtocol.parse_phoneCallProtocol($0) }
     dict[-1237848657] = { return Api.StatsDateRangeDays.parse_statsDateRangeDays($0) }
     dict[-275956116] = { return Api.messages.AffectedFoundMessages.parse_affectedFoundMessages($0) }
+    dict[795652779] = { return Api.BotCommandScope.parse_botCommandScopeDefault($0) }
+    dict[1011811544] = { return Api.BotCommandScope.parse_botCommandScopeUsers($0) }
+    dict[1877059713] = { return Api.BotCommandScope.parse_botCommandScopeChats($0) }
+    dict[-1180016534] = { return Api.BotCommandScope.parse_botCommandScopeChatAdmins($0) }
+    dict[-610432643] = { return Api.BotCommandScope.parse_botCommandScopePeer($0) }
+    dict[1071145937] = { return Api.BotCommandScope.parse_botCommandScopePeerAdmins($0) }
+    dict[169026035] = { return Api.BotCommandScope.parse_botCommandScopePeerUser($0) }
     dict[-1539849235] = { return Api.WallPaper.parse_wallPaper($0) }
-    dict[-1963717851] = { return Api.WallPaper.parse_wallPaperNoFile($0) }
+    dict[-528465642] = { return Api.WallPaper.parse_wallPaperNoFile($0) }
     dict[-1938715001] = { return Api.messages.Messages.parse_messages($0) }
     dict[978610270] = { return Api.messages.Messages.parse_messagesSlice($0) }
     dict[1682413576] = { return Api.messages.Messages.parse_channelMessages($0) }
     dict[1951620897] = { return Api.messages.Messages.parse_messagesNotModified($0) }
-    dict[-1022713000] = { return Api.Invoice.parse_invoice($0) }
+    dict[215516896] = { return Api.Invoice.parse_invoice($0) }
     dict[1933519201] = { return Api.PeerSettings.parse_peerSettings($0) }
     dict[1577067778] = { return Api.auth.SentCode.parse_sentCode($0) }
     dict[480546647] = { return Api.InputChatPhoto.parse_inputChatPhotoEmpty($0) }
@@ -635,10 +649,10 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-177732982] = { return Api.BankCardOpenUrl.parse_bankCardOpenUrl($0) }
     dict[307276766] = { return Api.account.Authorizations.parse_authorizations($0) }
     dict[935395612] = { return Api.ChatPhoto.parse_chatPhotoEmpty($0) }
-    dict[-770990276] = { return Api.ChatPhoto.parse_chatPhoto($0) }
+    dict[476978193] = { return Api.ChatPhoto.parse_chatPhoto($0) }
     dict[1869903447] = { return Api.PageCaption.parse_pageCaption($0) }
-    dict[1062645411] = { return Api.payments.PaymentForm.parse_paymentForm($0) }
-    dict[1342771681] = { return Api.payments.PaymentReceipt.parse_paymentReceipt($0) }
+    dict[-1928649707] = { return Api.payments.PaymentForm.parse_paymentForm($0) }
+    dict[280319440] = { return Api.payments.PaymentReceipt.parse_paymentReceipt($0) }
     dict[863093588] = { return Api.messages.PeerDialogs.parse_peerDialogs($0) }
     dict[-1831650802] = { return Api.UrlAuthResult.parse_urlAuthResultRequest($0) }
     dict[-1886646706] = { return Api.UrlAuthResult.parse_urlAuthResultAccepted($0) }
@@ -650,6 +664,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-427863538] = { return Api.InputStickerSet.parse_inputStickerSetDice($0) }
     dict[-1231326505] = { return Api.messages.ChatAdminsWithInvites.parse_chatAdminsWithInvites($0) }
     dict[-1729618630] = { return Api.BotInfo.parse_botInfo($0) }
+    dict[-2046910401] = { return Api.stickers.SuggestedShortName.parse_suggestedShortName($0) }
     dict[-1519637954] = { return Api.updates.State.parse_state($0) }
     dict[537022650] = { return Api.User.parse_userEmpty($0) }
     dict[-1820043071] = { return Api.User.parse_user($0) }
@@ -666,8 +681,8 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[700340377] = { return Api.InputFileLocation.parse_inputTakeoutFileLocation($0) }
     dict[1075322878] = { return Api.InputFileLocation.parse_inputPhotoFileLocation($0) }
     dict[-667654413] = { return Api.InputFileLocation.parse_inputPhotoLegacyFileLocation($0) }
-    dict[668375447] = { return Api.InputFileLocation.parse_inputPeerPhotoFileLocation($0) }
-    dict[230353641] = { return Api.InputFileLocation.parse_inputStickerSetThumb($0) }
+    dict[925204121] = { return Api.InputFileLocation.parse_inputPeerPhotoFileLocation($0) }
+    dict[-1652231205] = { return Api.InputFileLocation.parse_inputStickerSetThumb($0) }
     dict[-1146808775] = { return Api.InputFileLocation.parse_inputGroupCallStream($0) }
     dict[286776671] = { return Api.GeoPoint.parse_geoPointEmpty($0) }
     dict[-1297942941] = { return Api.GeoPoint.parse_geoPoint($0) }
@@ -689,7 +704,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[2104790276] = { return Api.DataJSON.parse_dataJSON($0) }
     dict[-433014407] = { return Api.InputWallPaper.parse_inputWallPaper($0) }
     dict[1913199744] = { return Api.InputWallPaper.parse_inputWallPaperSlug($0) }
-    dict[-2077770836] = { return Api.InputWallPaper.parse_inputWallPaperNoFile($0) }
+    dict[-1770371538] = { return Api.InputWallPaper.parse_inputWallPaperNoFile($0) }
     dict[-1118798639] = { return Api.InputThemeSettings.parse_inputThemeSettings($0) }
     dict[1251549527] = { return Api.InputStickeredMedia.parse_inputStickeredMediaPhoto($0) }
     dict[70813275] = { return Api.InputStickeredMedia.parse_inputStickeredMediaDocument($0) }
@@ -754,6 +769,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[85477117] = { return Api.BotInlineMessage.parse_botInlineMessageMediaGeo($0) }
     dict[-1970903652] = { return Api.BotInlineMessage.parse_botInlineMessageMediaVenue($0) }
     dict[416402882] = { return Api.BotInlineMessage.parse_botInlineMessageMediaContact($0) }
+    dict[894081801] = { return Api.BotInlineMessage.parse_botInlineMessageMediaInvoice($0) }
     dict[-1673717362] = { return Api.InputPeerNotifySettings.parse_inputPeerNotifySettings($0) }
     dict[-1634752813] = { return Api.messages.FavedStickers.parse_favedStickersNotModified($0) }
     dict[-209768682] = { return Api.messages.FavedStickers.parse_favedStickers($0) }
@@ -783,7 +799,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1908627474] = { return Api.SecureValueType.parse_secureValueTypeEmail($0) }
     dict[-732254058] = { return Api.PasswordKdfAlgo.parse_passwordKdfAlgoUnknown($0) }
     dict[982592842] = { return Api.PasswordKdfAlgo.parse_passwordKdfAlgoSHA256SHA256PBKDF2HMACSHA512iter100000SHA256ModPow($0) }
-    dict[-1390001672] = { return Api.account.Password.parse_password($0) }
+    dict[408623183] = { return Api.account.Password.parse_password($0) }
     dict[-2000710887] = { return Api.InputBotInlineResult.parse_inputBotInlineResult($0) }
     dict[-1462213465] = { return Api.InputBotInlineResult.parse_inputBotInlineResultPhoto($0) }
     dict[-459324] = { return Api.InputBotInlineResult.parse_inputBotInlineResultDocument($0) }
@@ -824,6 +840,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[2047704898] = { return Api.MessageAction.parse_messageActionGroupCall($0) }
     dict[1991897370] = { return Api.MessageAction.parse_messageActionInviteToGroupCall($0) }
     dict[-1441072131] = { return Api.MessageAction.parse_messageActionSetMessagesTTL($0) }
+    dict[-1281329567] = { return Api.MessageAction.parse_messageActionGroupCallScheduled($0) }
     dict[1399245077] = { return Api.PhoneCall.parse_phoneCallEmpty($0) }
     dict[462375633] = { return Api.PhoneCall.parse_phoneCallWaiting($0) }
     dict[-2014659757] = { return Api.PhoneCall.parse_phoneCallRequested($0) }
@@ -846,7 +863,7 @@ fileprivate let parsers: [Int32 : (BufferReader) -> Any?] = {
     dict[-1282352120] = { return Api.PageRelatedArticle.parse_pageRelatedArticle($0) }
     dict[313694676] = { return Api.StickerPack.parse_stickerPack($0) }
     dict[1326562017] = { return Api.UserProfilePhoto.parse_userProfilePhotoEmpty($0) }
-    dict[1775479590] = { return Api.UserProfilePhoto.parse_userProfilePhoto($0) }
+    dict[-2100168954] = { return Api.UserProfilePhoto.parse_userProfilePhoto($0) }
     dict[-74456004] = { return Api.payments.SavedInfo.parse_savedInfo($0) }
     dict[1041346555] = { return Api.updates.ChannelDifference.parse_channelDifferenceEmpty($0) }
     dict[-1531132162] = { return Api.updates.ChannelDifference.parse_channelDifferenceTooLong($0) }
@@ -1082,6 +1099,8 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.PopularContact:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.GroupCallParticipantVideoSourceGroup:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.FolderPeer:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.ChannelParticipant:
@@ -1114,8 +1133,6 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.InputTheme:
                 _1.serialize(buffer, boxed)
-            case let _1 as Api.FileLocation:
-                _1.serialize(buffer, boxed)
             case let _1 as Api.Poll:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.InputNotifyPeer:
@@ -1300,6 +1317,8 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.messages.StickerSetInstallResult:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.account.ResetPasswordResult:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.Config:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.TopPeerCategoryPeers:
@@ -1332,12 +1351,16 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.InputMessage:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.GroupCallParticipantVideo:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.PhoneCallProtocol:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.StatsDateRangeDays:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.messages.AffectedFoundMessages:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.BotCommandScope:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.WallPaper:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.messages.Messages:
@@ -1398,6 +1421,8 @@ public struct Api {
                 _1.serialize(buffer, boxed)
             case let _1 as Api.BotInfo:
                 _1.serialize(buffer, boxed)
+            case let _1 as Api.stickers.SuggestedShortName:
+                _1.serialize(buffer, boxed)
             case let _1 as Api.updates.State:
                 _1.serialize(buffer, boxed)
             case let _1 as Api.User:
diff --git a/submodules/TelegramApi/Sources/Api2.swift b/submodules/TelegramApi/Sources/Api2.swift
index bcb055e5d5..c4e4a4df88 100644
--- a/submodules/TelegramApi/Sources/Api2.swift
+++ b/submodules/TelegramApi/Sources/Api2.swift
@@ -1,7 +1,7 @@
 public extension Api {
     public enum GroupCall: TypeConstructorDescription {
         case groupCallDiscarded(id: Int64, accessHash: Int64, duration: Int32)
-        case groupCall(flags: Int32, id: Int64, accessHash: Int64, participantsCount: Int32, params: Api.DataJSON?, title: String?, streamDcId: Int32?, recordStartDate: Int32?, version: Int32)
+        case groupCall(flags: Int32, id: Int64, accessHash: Int64, participantsCount: Int32, title: String?, streamDcId: Int32?, recordStartDate: Int32?, scheduleDate: Int32?, unmutedVideoCount: Int32?, unmutedVideoLimit: Int32, version: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -13,18 +13,20 @@ public extension Api {
                     serializeInt64(accessHash, buffer: buffer, boxed: false)
                     serializeInt32(duration, buffer: buffer, boxed: false)
                     break
-                case .groupCall(let flags, let id, let accessHash, let participantsCount, let params, let title, let streamDcId, let recordStartDate, let version):
+                case .groupCall(let flags, let id, let accessHash, let participantsCount, let title, let streamDcId, let recordStartDate, let scheduleDate, let unmutedVideoCount, let unmutedVideoLimit, let version):
                     if boxed {
-                        buffer.appendInt32(-1061026514)
+                        buffer.appendInt32(-711498484)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeInt64(id, buffer: buffer, boxed: false)
                     serializeInt64(accessHash, buffer: buffer, boxed: false)
                     serializeInt32(participantsCount, buffer: buffer, boxed: false)
-                    if Int(flags) & Int(1 << 0) != 0 {params!.serialize(buffer, true)}
                     if Int(flags) & Int(1 << 3) != 0 {serializeString(title!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 4) != 0 {serializeInt32(streamDcId!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 5) != 0 {serializeInt32(recordStartDate!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 7) != 0 {serializeInt32(scheduleDate!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 10) != 0 {serializeInt32(unmutedVideoCount!, buffer: buffer, boxed: false)}
+                    serializeInt32(unmutedVideoLimit, buffer: buffer, boxed: false)
                     serializeInt32(version, buffer: buffer, boxed: false)
                     break
     }
@@ -34,8 +36,8 @@ public extension Api {
         switch self {
                 case .groupCallDiscarded(let id, let accessHash, let duration):
                 return ("groupCallDiscarded", [("id", id), ("accessHash", accessHash), ("duration", duration)])
-                case .groupCall(let flags, let id, let accessHash, let participantsCount, let params, let title, let streamDcId, let recordStartDate, let version):
-                return ("groupCall", [("flags", flags), ("id", id), ("accessHash", accessHash), ("participantsCount", participantsCount), ("params", params), ("title", title), ("streamDcId", streamDcId), ("recordStartDate", recordStartDate), ("version", version)])
+                case .groupCall(let flags, let id, let accessHash, let participantsCount, let title, let streamDcId, let recordStartDate, let scheduleDate, let unmutedVideoCount, let unmutedVideoLimit, let version):
+                return ("groupCall", [("flags", flags), ("id", id), ("accessHash", accessHash), ("participantsCount", participantsCount), ("title", title), ("streamDcId", streamDcId), ("recordStartDate", recordStartDate), ("scheduleDate", scheduleDate), ("unmutedVideoCount", unmutedVideoCount), ("unmutedVideoLimit", unmutedVideoLimit), ("version", version)])
     }
     }
     
@@ -65,29 +67,33 @@ public extension Api {
             _3 = reader.readInt64()
             var _4: Int32?
             _4 = reader.readInt32()
-            var _5: Api.DataJSON?
-            if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() {
-                _5 = Api.parse(reader, signature: signature) as? Api.DataJSON
-            } }
-            var _6: String?
-            if Int(_1!) & Int(1 << 3) != 0 {_6 = parseString(reader) }
+            var _5: String?
+            if Int(_1!) & Int(1 << 3) != 0 {_5 = parseString(reader) }
+            var _6: Int32?
+            if Int(_1!) & Int(1 << 4) != 0 {_6 = reader.readInt32() }
             var _7: Int32?
-            if Int(_1!) & Int(1 << 4) != 0 {_7 = reader.readInt32() }
+            if Int(_1!) & Int(1 << 5) != 0 {_7 = reader.readInt32() }
             var _8: Int32?
-            if Int(_1!) & Int(1 << 5) != 0 {_8 = reader.readInt32() }
+            if Int(_1!) & Int(1 << 7) != 0 {_8 = reader.readInt32() }
             var _9: Int32?
-            _9 = reader.readInt32()
+            if Int(_1!) & Int(1 << 10) != 0 {_9 = reader.readInt32() }
+            var _10: Int32?
+            _10 = reader.readInt32()
+            var _11: Int32?
+            _11 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
-            let _c5 = (Int(_1!) & Int(1 << 0) == 0) || _5 != nil
-            let _c6 = (Int(_1!) & Int(1 << 3) == 0) || _6 != nil
-            let _c7 = (Int(_1!) & Int(1 << 4) == 0) || _7 != nil
-            let _c8 = (Int(_1!) & Int(1 << 5) == 0) || _8 != nil
-            let _c9 = _9 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 {
-                return Api.GroupCall.groupCall(flags: _1!, id: _2!, accessHash: _3!, participantsCount: _4!, params: _5, title: _6, streamDcId: _7, recordStartDate: _8, version: _9!)
+            let _c5 = (Int(_1!) & Int(1 << 3) == 0) || _5 != nil
+            let _c6 = (Int(_1!) & Int(1 << 4) == 0) || _6 != nil
+            let _c7 = (Int(_1!) & Int(1 << 5) == 0) || _7 != nil
+            let _c8 = (Int(_1!) & Int(1 << 7) == 0) || _8 != nil
+            let _c9 = (Int(_1!) & Int(1 << 10) == 0) || _9 != nil
+            let _c10 = _10 != nil
+            let _c11 = _11 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 {
+                return Api.GroupCall.groupCall(flags: _1!, id: _2!, accessHash: _3!, participantsCount: _4!, title: _5, streamDcId: _6, recordStartDate: _7, scheduleDate: _8, unmutedVideoCount: _9, unmutedVideoLimit: _10!, version: _11!)
             }
             else {
                 return nil
@@ -3198,17 +3204,16 @@ public extension Api {
     
     }
     public enum VideoSize: TypeConstructorDescription {
-        case videoSize(flags: Int32, type: String, location: Api.FileLocation, w: Int32, h: Int32, size: Int32, videoStartTs: Double?)
+        case videoSize(flags: Int32, type: String, w: Int32, h: Int32, size: Int32, videoStartTs: Double?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .videoSize(let flags, let type, let location, let w, let h, let size, let videoStartTs):
+                case .videoSize(let flags, let type, let w, let h, let size, let videoStartTs):
                     if boxed {
-                        buffer.appendInt32(-399391402)
+                        buffer.appendInt32(-567037804)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeString(type, buffer: buffer, boxed: false)
-                    location.serialize(buffer, true)
                     serializeInt32(w, buffer: buffer, boxed: false)
                     serializeInt32(h, buffer: buffer, boxed: false)
                     serializeInt32(size, buffer: buffer, boxed: false)
@@ -3219,8 +3224,8 @@ public extension Api {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .videoSize(let flags, let type, let location, let w, let h, let size, let videoStartTs):
-                return ("videoSize", [("flags", flags), ("type", type), ("location", location), ("w", w), ("h", h), ("size", size), ("videoStartTs", videoStartTs)])
+                case .videoSize(let flags, let type, let w, let h, let size, let videoStartTs):
+                return ("videoSize", [("flags", flags), ("type", type), ("w", w), ("h", h), ("size", size), ("videoStartTs", videoStartTs)])
     }
     }
     
@@ -3229,27 +3234,22 @@ public extension Api {
             _1 = reader.readInt32()
             var _2: String?
             _2 = parseString(reader)
-            var _3: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _3 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
+            var _3: Int32?
+            _3 = reader.readInt32()
             var _4: Int32?
             _4 = reader.readInt32()
             var _5: Int32?
             _5 = reader.readInt32()
-            var _6: Int32?
-            _6 = reader.readInt32()
-            var _7: Double?
-            if Int(_1!) & Int(1 << 0) != 0 {_7 = reader.readDouble() }
+            var _6: Double?
+            if Int(_1!) & Int(1 << 0) != 0 {_6 = reader.readDouble() }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
             let _c5 = _5 != nil
-            let _c6 = _6 != nil
-            let _c7 = (Int(_1!) & Int(1 << 0) == 0) || _7 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 {
-                return Api.VideoSize.videoSize(flags: _1!, type: _2!, location: _3!, w: _4!, h: _5!, size: _6!, videoStartTs: _7)
+            let _c6 = (Int(_1!) & Int(1 << 0) == 0) || _6 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 {
+                return Api.VideoSize.videoSize(flags: _1!, type: _2!, w: _3!, h: _4!, size: _5!, videoStartTs: _6)
             }
             else {
                 return nil
@@ -3310,17 +3310,19 @@ public extension Api {
     
     }
     public enum WallPaperSettings: TypeConstructorDescription {
-        case wallPaperSettings(flags: Int32, backgroundColor: Int32?, secondBackgroundColor: Int32?, intensity: Int32?, rotation: Int32?)
+        case wallPaperSettings(flags: Int32, backgroundColor: Int32?, secondBackgroundColor: Int32?, thirdBackgroundColor: Int32?, fourthBackgroundColor: Int32?, intensity: Int32?, rotation: Int32?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .wallPaperSettings(let flags, let backgroundColor, let secondBackgroundColor, let intensity, let rotation):
+                case .wallPaperSettings(let flags, let backgroundColor, let secondBackgroundColor, let thirdBackgroundColor, let fourthBackgroundColor, let intensity, let rotation):
                     if boxed {
-                        buffer.appendInt32(84438264)
+                        buffer.appendInt32(499236004)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 0) != 0 {serializeInt32(backgroundColor!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 4) != 0 {serializeInt32(secondBackgroundColor!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 5) != 0 {serializeInt32(thirdBackgroundColor!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 6) != 0 {serializeInt32(fourthBackgroundColor!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 3) != 0 {serializeInt32(intensity!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 4) != 0 {serializeInt32(rotation!, buffer: buffer, boxed: false)}
                     break
@@ -3329,8 +3331,8 @@ public extension Api {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .wallPaperSettings(let flags, let backgroundColor, let secondBackgroundColor, let intensity, let rotation):
-                return ("wallPaperSettings", [("flags", flags), ("backgroundColor", backgroundColor), ("secondBackgroundColor", secondBackgroundColor), ("intensity", intensity), ("rotation", rotation)])
+                case .wallPaperSettings(let flags, let backgroundColor, let secondBackgroundColor, let thirdBackgroundColor, let fourthBackgroundColor, let intensity, let rotation):
+                return ("wallPaperSettings", [("flags", flags), ("backgroundColor", backgroundColor), ("secondBackgroundColor", secondBackgroundColor), ("thirdBackgroundColor", thirdBackgroundColor), ("fourthBackgroundColor", fourthBackgroundColor), ("intensity", intensity), ("rotation", rotation)])
     }
     }
     
@@ -3342,16 +3344,22 @@ public extension Api {
             var _3: Int32?
             if Int(_1!) & Int(1 << 4) != 0 {_3 = reader.readInt32() }
             var _4: Int32?
-            if Int(_1!) & Int(1 << 3) != 0 {_4 = reader.readInt32() }
+            if Int(_1!) & Int(1 << 5) != 0 {_4 = reader.readInt32() }
             var _5: Int32?
-            if Int(_1!) & Int(1 << 4) != 0 {_5 = reader.readInt32() }
+            if Int(_1!) & Int(1 << 6) != 0 {_5 = reader.readInt32() }
+            var _6: Int32?
+            if Int(_1!) & Int(1 << 3) != 0 {_6 = reader.readInt32() }
+            var _7: Int32?
+            if Int(_1!) & Int(1 << 4) != 0 {_7 = reader.readInt32() }
             let _c1 = _1 != nil
             let _c2 = (Int(_1!) & Int(1 << 0) == 0) || _2 != nil
             let _c3 = (Int(_1!) & Int(1 << 4) == 0) || _3 != nil
-            let _c4 = (Int(_1!) & Int(1 << 3) == 0) || _4 != nil
-            let _c5 = (Int(_1!) & Int(1 << 4) == 0) || _5 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.WallPaperSettings.wallPaperSettings(flags: _1!, backgroundColor: _2, secondBackgroundColor: _3, intensity: _4, rotation: _5)
+            let _c4 = (Int(_1!) & Int(1 << 5) == 0) || _4 != nil
+            let _c5 = (Int(_1!) & Int(1 << 6) == 0) || _5 != nil
+            let _c6 = (Int(_1!) & Int(1 << 3) == 0) || _6 != nil
+            let _c7 = (Int(_1!) & Int(1 << 4) == 0) || _7 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 {
+                return Api.WallPaperSettings.wallPaperSettings(flags: _1!, backgroundColor: _2, secondBackgroundColor: _3, thirdBackgroundColor: _4, fourthBackgroundColor: _5, intensity: _6, rotation: _7)
             }
             else {
                 return nil
@@ -3604,13 +3612,13 @@ public extension Api {
     
     }
     public enum GroupCallParticipant: TypeConstructorDescription {
-        case groupCallParticipant(flags: Int32, peer: Api.Peer, date: Int32, activeDate: Int32?, source: Int32, volume: Int32?, about: String?, raiseHandRating: Int64?)
+        case groupCallParticipant(flags: Int32, peer: Api.Peer, date: Int32, activeDate: Int32?, source: Int32, volume: Int32?, about: String?, raiseHandRating: Int64?, video: Api.GroupCallParticipantVideo?, presentation: Api.GroupCallParticipantVideo?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .groupCallParticipant(let flags, let peer, let date, let activeDate, let source, let volume, let about, let raiseHandRating):
+                case .groupCallParticipant(let flags, let peer, let date, let activeDate, let source, let volume, let about, let raiseHandRating, let video, let presentation):
                     if boxed {
-                        buffer.appendInt32(430815881)
+                        buffer.appendInt32(-341428482)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     peer.serialize(buffer, true)
@@ -3620,14 +3628,16 @@ public extension Api {
                     if Int(flags) & Int(1 << 7) != 0 {serializeInt32(volume!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 11) != 0 {serializeString(about!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 13) != 0 {serializeInt64(raiseHandRating!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 6) != 0 {video!.serialize(buffer, true)}
+                    if Int(flags) & Int(1 << 14) != 0 {presentation!.serialize(buffer, true)}
                     break
     }
     }
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .groupCallParticipant(let flags, let peer, let date, let activeDate, let source, let volume, let about, let raiseHandRating):
-                return ("groupCallParticipant", [("flags", flags), ("peer", peer), ("date", date), ("activeDate", activeDate), ("source", source), ("volume", volume), ("about", about), ("raiseHandRating", raiseHandRating)])
+                case .groupCallParticipant(let flags, let peer, let date, let activeDate, let source, let volume, let about, let raiseHandRating, let video, let presentation):
+                return ("groupCallParticipant", [("flags", flags), ("peer", peer), ("date", date), ("activeDate", activeDate), ("source", source), ("volume", volume), ("about", about), ("raiseHandRating", raiseHandRating), ("video", video), ("presentation", presentation)])
     }
     }
     
@@ -3650,6 +3660,14 @@ public extension Api {
             if Int(_1!) & Int(1 << 11) != 0 {_7 = parseString(reader) }
             var _8: Int64?
             if Int(_1!) & Int(1 << 13) != 0 {_8 = reader.readInt64() }
+            var _9: Api.GroupCallParticipantVideo?
+            if Int(_1!) & Int(1 << 6) != 0 {if let signature = reader.readInt32() {
+                _9 = Api.parse(reader, signature: signature) as? Api.GroupCallParticipantVideo
+            } }
+            var _10: Api.GroupCallParticipantVideo?
+            if Int(_1!) & Int(1 << 14) != 0 {if let signature = reader.readInt32() {
+                _10 = Api.parse(reader, signature: signature) as? Api.GroupCallParticipantVideo
+            } }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
@@ -3658,8 +3676,10 @@ public extension Api {
             let _c6 = (Int(_1!) & Int(1 << 7) == 0) || _6 != nil
             let _c7 = (Int(_1!) & Int(1 << 11) == 0) || _7 != nil
             let _c8 = (Int(_1!) & Int(1 << 13) == 0) || _8 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 {
-                return Api.GroupCallParticipant.groupCallParticipant(flags: _1!, peer: _2!, date: _3!, activeDate: _4, source: _5!, volume: _6, about: _7, raiseHandRating: _8)
+            let _c9 = (Int(_1!) & Int(1 << 6) == 0) || _9 != nil
+            let _c10 = (Int(_1!) & Int(1 << 14) == 0) || _10 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 {
+                return Api.GroupCallParticipant.groupCallParticipant(flags: _1!, peer: _2!, date: _3!, activeDate: _4, source: _5!, volume: _6, about: _7, raiseHandRating: _8, video: _9, presentation: _10)
             }
             else {
                 return nil
@@ -4658,7 +4678,7 @@ public extension Api {
         case updateTheme(theme: Api.Theme)
         case updateGeoLiveViewed(peer: Api.Peer, msgId: Int32)
         case updateLoginToken
-        case updateMessagePollVote(pollId: Int64, userId: Int32, options: [Buffer])
+        case updateMessagePollVote(pollId: Int64, userId: Int32, options: [Buffer], qts: Int32)
         case updateDialogFilter(flags: Int32, id: Int32, filter: Api.DialogFilter?)
         case updateDialogFilterOrder(order: [Int32])
         case updateDialogFilters
@@ -4677,6 +4697,8 @@ public extension Api {
         case updateChatParticipant(flags: Int32, chatId: Int32, date: Int32, actorId: Int32, userId: Int32, prevParticipant: Api.ChatParticipant?, newParticipant: Api.ChatParticipant?, invite: Api.ExportedChatInvite?, qts: Int32)
         case updateChannelParticipant(flags: Int32, channelId: Int32, date: Int32, actorId: Int32, userId: Int32, prevParticipant: Api.ChannelParticipant?, newParticipant: Api.ChannelParticipant?, invite: Api.ExportedChatInvite?, qts: Int32)
         case updateBotStopped(userId: Int32, date: Int32, stopped: Api.Bool, qts: Int32)
+        case updateGroupCallConnection(flags: Int32, params: Api.DataJSON)
+        case updateBotCommands(peer: Api.Peer, botId: Int32, commands: [Api.BotCommand])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -5286,9 +5308,9 @@ public extension Api {
                     }
                     
                     break
-                case .updateMessagePollVote(let pollId, let userId, let options):
+                case .updateMessagePollVote(let pollId, let userId, let options, let qts):
                     if boxed {
-                        buffer.appendInt32(1123585836)
+                        buffer.appendInt32(938909451)
                     }
                     serializeInt64(pollId, buffer: buffer, boxed: false)
                     serializeInt32(userId, buffer: buffer, boxed: false)
@@ -5297,6 +5319,7 @@ public extension Api {
                     for item in options {
                         serializeBytes(item, buffer: buffer, boxed: false)
                     }
+                    serializeInt32(qts, buffer: buffer, boxed: false)
                     break
                 case .updateDialogFilter(let flags, let id, let filter):
                     if boxed {
@@ -5471,6 +5494,25 @@ public extension Api {
                     stopped.serialize(buffer, true)
                     serializeInt32(qts, buffer: buffer, boxed: false)
                     break
+                case .updateGroupCallConnection(let flags, let params):
+                    if boxed {
+                        buffer.appendInt32(192428418)
+                    }
+                    serializeInt32(flags, buffer: buffer, boxed: false)
+                    params.serialize(buffer, true)
+                    break
+                case .updateBotCommands(let peer, let botId, let commands):
+                    if boxed {
+                        buffer.appendInt32(-813823885)
+                    }
+                    peer.serialize(buffer, true)
+                    serializeInt32(botId, buffer: buffer, boxed: false)
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(commands.count))
+                    for item in commands {
+                        item.serialize(buffer, true)
+                    }
+                    break
     }
     }
     
@@ -5620,8 +5662,8 @@ public extension Api {
                 return ("updateGeoLiveViewed", [("peer", peer), ("msgId", msgId)])
                 case .updateLoginToken:
                 return ("updateLoginToken", [])
-                case .updateMessagePollVote(let pollId, let userId, let options):
-                return ("updateMessagePollVote", [("pollId", pollId), ("userId", userId), ("options", options)])
+                case .updateMessagePollVote(let pollId, let userId, let options, let qts):
+                return ("updateMessagePollVote", [("pollId", pollId), ("userId", userId), ("options", options), ("qts", qts)])
                 case .updateDialogFilter(let flags, let id, let filter):
                 return ("updateDialogFilter", [("flags", flags), ("id", id), ("filter", filter)])
                 case .updateDialogFilterOrder(let order):
@@ -5658,6 +5700,10 @@ public extension Api {
                 return ("updateChannelParticipant", [("flags", flags), ("channelId", channelId), ("date", date), ("actorId", actorId), ("userId", userId), ("prevParticipant", prevParticipant), ("newParticipant", newParticipant), ("invite", invite), ("qts", qts)])
                 case .updateBotStopped(let userId, let date, let stopped, let qts):
                 return ("updateBotStopped", [("userId", userId), ("date", date), ("stopped", stopped), ("qts", qts)])
+                case .updateGroupCallConnection(let flags, let params):
+                return ("updateGroupCallConnection", [("flags", flags), ("params", params)])
+                case .updateBotCommands(let peer, let botId, let commands):
+                return ("updateBotCommands", [("peer", peer), ("botId", botId), ("commands", commands)])
     }
     }
     
@@ -6890,11 +6936,14 @@ public extension Api {
             if let _ = reader.readInt32() {
                 _3 = Api.parseVector(reader, elementSignature: -1255641564, elementType: Buffer.self)
             }
+            var _4: Int32?
+            _4 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
-            if _c1 && _c2 && _c3 {
-                return Api.Update.updateMessagePollVote(pollId: _1!, userId: _2!, options: _3!)
+            let _c4 = _4 != nil
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.Update.updateMessagePollVote(pollId: _1!, userId: _2!, options: _3!, qts: _4!)
             }
             else {
                 return nil
@@ -7277,6 +7326,43 @@ public extension Api {
                 return nil
             }
         }
+        public static func parse_updateGroupCallConnection(_ reader: BufferReader) -> Update? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            var _2: Api.DataJSON?
+            if let signature = reader.readInt32() {
+                _2 = Api.parse(reader, signature: signature) as? Api.DataJSON
+            }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            if _c1 && _c2 {
+                return Api.Update.updateGroupCallConnection(flags: _1!, params: _2!)
+            }
+            else {
+                return nil
+            }
+        }
+        public static func parse_updateBotCommands(_ reader: BufferReader) -> Update? {
+            var _1: Api.Peer?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.Peer
+            }
+            var _2: Int32?
+            _2 = reader.readInt32()
+            var _3: [Api.BotCommand]?
+            if let _ = reader.readInt32() {
+                _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.BotCommand.self)
+            }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            let _c3 = _3 != nil
+            if _c1 && _c2 && _c3 {
+                return Api.Update.updateBotCommands(peer: _1!, botId: _2!, commands: _3!)
+            }
+            else {
+                return nil
+            }
+        }
     
     }
     public enum PopularContact: TypeConstructorDescription {
@@ -7316,6 +7402,50 @@ public extension Api {
             }
         }
     
+    }
+    public enum GroupCallParticipantVideoSourceGroup: TypeConstructorDescription {
+        case groupCallParticipantVideoSourceGroup(semantics: String, sources: [Int32])
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .groupCallParticipantVideoSourceGroup(let semantics, let sources):
+                    if boxed {
+                        buffer.appendInt32(-592373577)
+                    }
+                    serializeString(semantics, buffer: buffer, boxed: false)
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(sources.count))
+                    for item in sources {
+                        serializeInt32(item, buffer: buffer, boxed: false)
+                    }
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .groupCallParticipantVideoSourceGroup(let semantics, let sources):
+                return ("groupCallParticipantVideoSourceGroup", [("semantics", semantics), ("sources", sources)])
+    }
+    }
+    
+        public static func parse_groupCallParticipantVideoSourceGroup(_ reader: BufferReader) -> GroupCallParticipantVideoSourceGroup? {
+            var _1: String?
+            _1 = parseString(reader)
+            var _2: [Int32]?
+            if let _ = reader.readInt32() {
+                _2 = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self)
+            }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            if _c1 && _c2 {
+                return Api.GroupCallParticipantVideoSourceGroup.groupCallParticipantVideoSourceGroup(semantics: _1!, sources: _2!)
+            }
+            else {
+                return nil
+            }
+        }
+    
     }
     public enum FolderPeer: TypeConstructorDescription {
         case folderPeer(peer: Api.Peer, folderId: Int32)
@@ -7362,8 +7492,8 @@ public extension Api {
         case channelParticipantSelf(userId: Int32, inviterId: Int32, date: Int32)
         case channelParticipantCreator(flags: Int32, userId: Int32, adminRights: Api.ChatAdminRights, rank: String?)
         case channelParticipantAdmin(flags: Int32, userId: Int32, inviterId: Int32?, promotedBy: Int32, date: Int32, adminRights: Api.ChatAdminRights, rank: String?)
-        case channelParticipantBanned(flags: Int32, userId: Int32, kickedBy: Int32, date: Int32, bannedRights: Api.ChatBannedRights)
-        case channelParticipantLeft(userId: Int32)
+        case channelParticipantBanned(flags: Int32, peer: Api.Peer, kickedBy: Int32, date: Int32, bannedRights: Api.ChatBannedRights)
+        case channelParticipantLeft(peer: Api.Peer)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -7403,21 +7533,21 @@ public extension Api {
                     adminRights.serialize(buffer, true)
                     if Int(flags) & Int(1 << 2) != 0 {serializeString(rank!, buffer: buffer, boxed: false)}
                     break
-                case .channelParticipantBanned(let flags, let userId, let kickedBy, let date, let bannedRights):
+                case .channelParticipantBanned(let flags, let peer, let kickedBy, let date, let bannedRights):
                     if boxed {
-                        buffer.appendInt32(470789295)
+                        buffer.appendInt32(1352785878)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
-                    serializeInt32(userId, buffer: buffer, boxed: false)
+                    peer.serialize(buffer, true)
                     serializeInt32(kickedBy, buffer: buffer, boxed: false)
                     serializeInt32(date, buffer: buffer, boxed: false)
                     bannedRights.serialize(buffer, true)
                     break
-                case .channelParticipantLeft(let userId):
+                case .channelParticipantLeft(let peer):
                     if boxed {
-                        buffer.appendInt32(-1010402965)
+                        buffer.appendInt32(453242886)
                     }
-                    serializeInt32(userId, buffer: buffer, boxed: false)
+                    peer.serialize(buffer, true)
                     break
     }
     }
@@ -7432,10 +7562,10 @@ public extension Api {
                 return ("channelParticipantCreator", [("flags", flags), ("userId", userId), ("adminRights", adminRights), ("rank", rank)])
                 case .channelParticipantAdmin(let flags, let userId, let inviterId, let promotedBy, let date, let adminRights, let rank):
                 return ("channelParticipantAdmin", [("flags", flags), ("userId", userId), ("inviterId", inviterId), ("promotedBy", promotedBy), ("date", date), ("adminRights", adminRights), ("rank", rank)])
-                case .channelParticipantBanned(let flags, let userId, let kickedBy, let date, let bannedRights):
-                return ("channelParticipantBanned", [("flags", flags), ("userId", userId), ("kickedBy", kickedBy), ("date", date), ("bannedRights", bannedRights)])
-                case .channelParticipantLeft(let userId):
-                return ("channelParticipantLeft", [("userId", userId)])
+                case .channelParticipantBanned(let flags, let peer, let kickedBy, let date, let bannedRights):
+                return ("channelParticipantBanned", [("flags", flags), ("peer", peer), ("kickedBy", kickedBy), ("date", date), ("bannedRights", bannedRights)])
+                case .channelParticipantLeft(let peer):
+                return ("channelParticipantLeft", [("peer", peer)])
     }
     }
     
@@ -7526,8 +7656,10 @@ public extension Api {
         public static func parse_channelParticipantBanned(_ reader: BufferReader) -> ChannelParticipant? {
             var _1: Int32?
             _1 = reader.readInt32()
-            var _2: Int32?
-            _2 = reader.readInt32()
+            var _2: Api.Peer?
+            if let signature = reader.readInt32() {
+                _2 = Api.parse(reader, signature: signature) as? Api.Peer
+            }
             var _3: Int32?
             _3 = reader.readInt32()
             var _4: Int32?
@@ -7542,18 +7674,20 @@ public extension Api {
             let _c4 = _4 != nil
             let _c5 = _5 != nil
             if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.ChannelParticipant.channelParticipantBanned(flags: _1!, userId: _2!, kickedBy: _3!, date: _4!, bannedRights: _5!)
+                return Api.ChannelParticipant.channelParticipantBanned(flags: _1!, peer: _2!, kickedBy: _3!, date: _4!, bannedRights: _5!)
             }
             else {
                 return nil
             }
         }
         public static func parse_channelParticipantLeft(_ reader: BufferReader) -> ChannelParticipant? {
-            var _1: Int32?
-            _1 = reader.readInt32()
+            var _1: Api.Peer?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.Peer
+            }
             let _c1 = _1 != nil
             if _c1 {
-                return Api.ChannelParticipant.channelParticipantLeft(userId: _1!)
+                return Api.ChannelParticipant.channelParticipantLeft(peer: _1!)
             }
             else {
                 return nil
@@ -8127,10 +8261,10 @@ public extension Api {
     }
     public enum PhotoSize: TypeConstructorDescription {
         case photoSizeEmpty(type: String)
-        case photoSize(type: String, location: Api.FileLocation, w: Int32, h: Int32, size: Int32)
-        case photoCachedSize(type: String, location: Api.FileLocation, w: Int32, h: Int32, bytes: Buffer)
+        case photoSize(type: String, w: Int32, h: Int32, size: Int32)
+        case photoCachedSize(type: String, w: Int32, h: Int32, bytes: Buffer)
         case photoStrippedSize(type: String, bytes: Buffer)
-        case photoSizeProgressive(type: String, location: Api.FileLocation, w: Int32, h: Int32, sizes: [Int32])
+        case photoSizeProgressive(type: String, w: Int32, h: Int32, sizes: [Int32])
         case photoPathSize(type: String, bytes: Buffer)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -8141,22 +8275,20 @@ public extension Api {
                     }
                     serializeString(type, buffer: buffer, boxed: false)
                     break
-                case .photoSize(let type, let location, let w, let h, let size):
+                case .photoSize(let type, let w, let h, let size):
                     if boxed {
-                        buffer.appendInt32(2009052699)
+                        buffer.appendInt32(1976012384)
                     }
                     serializeString(type, buffer: buffer, boxed: false)
-                    location.serialize(buffer, true)
                     serializeInt32(w, buffer: buffer, boxed: false)
                     serializeInt32(h, buffer: buffer, boxed: false)
                     serializeInt32(size, buffer: buffer, boxed: false)
                     break
-                case .photoCachedSize(let type, let location, let w, let h, let bytes):
+                case .photoCachedSize(let type, let w, let h, let bytes):
                     if boxed {
-                        buffer.appendInt32(-374917894)
+                        buffer.appendInt32(35527382)
                     }
                     serializeString(type, buffer: buffer, boxed: false)
-                    location.serialize(buffer, true)
                     serializeInt32(w, buffer: buffer, boxed: false)
                     serializeInt32(h, buffer: buffer, boxed: false)
                     serializeBytes(bytes, buffer: buffer, boxed: false)
@@ -8168,12 +8300,11 @@ public extension Api {
                     serializeString(type, buffer: buffer, boxed: false)
                     serializeBytes(bytes, buffer: buffer, boxed: false)
                     break
-                case .photoSizeProgressive(let type, let location, let w, let h, let sizes):
+                case .photoSizeProgressive(let type, let w, let h, let sizes):
                     if boxed {
-                        buffer.appendInt32(1520986705)
+                        buffer.appendInt32(-96535659)
                     }
                     serializeString(type, buffer: buffer, boxed: false)
-                    location.serialize(buffer, true)
                     serializeInt32(w, buffer: buffer, boxed: false)
                     serializeInt32(h, buffer: buffer, boxed: false)
                     buffer.appendInt32(481674261)
@@ -8196,14 +8327,14 @@ public extension Api {
         switch self {
                 case .photoSizeEmpty(let type):
                 return ("photoSizeEmpty", [("type", type)])
-                case .photoSize(let type, let location, let w, let h, let size):
-                return ("photoSize", [("type", type), ("location", location), ("w", w), ("h", h), ("size", size)])
-                case .photoCachedSize(let type, let location, let w, let h, let bytes):
-                return ("photoCachedSize", [("type", type), ("location", location), ("w", w), ("h", h), ("bytes", bytes)])
+                case .photoSize(let type, let w, let h, let size):
+                return ("photoSize", [("type", type), ("w", w), ("h", h), ("size", size)])
+                case .photoCachedSize(let type, let w, let h, let bytes):
+                return ("photoCachedSize", [("type", type), ("w", w), ("h", h), ("bytes", bytes)])
                 case .photoStrippedSize(let type, let bytes):
                 return ("photoStrippedSize", [("type", type), ("bytes", bytes)])
-                case .photoSizeProgressive(let type, let location, let w, let h, let sizes):
-                return ("photoSizeProgressive", [("type", type), ("location", location), ("w", w), ("h", h), ("sizes", sizes)])
+                case .photoSizeProgressive(let type, let w, let h, let sizes):
+                return ("photoSizeProgressive", [("type", type), ("w", w), ("h", h), ("sizes", sizes)])
                 case .photoPathSize(let type, let bytes):
                 return ("photoPathSize", [("type", type), ("bytes", bytes)])
     }
@@ -8223,23 +8354,18 @@ public extension Api {
         public static func parse_photoSize(_ reader: BufferReader) -> PhotoSize? {
             var _1: String?
             _1 = parseString(reader)
-            var _2: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _2 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
+            var _2: Int32?
+            _2 = reader.readInt32()
             var _3: Int32?
             _3 = reader.readInt32()
             var _4: Int32?
             _4 = reader.readInt32()
-            var _5: Int32?
-            _5 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
-            let _c5 = _5 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.PhotoSize.photoSize(type: _1!, location: _2!, w: _3!, h: _4!, size: _5!)
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.PhotoSize.photoSize(type: _1!, w: _2!, h: _3!, size: _4!)
             }
             else {
                 return nil
@@ -8248,23 +8374,18 @@ public extension Api {
         public static func parse_photoCachedSize(_ reader: BufferReader) -> PhotoSize? {
             var _1: String?
             _1 = parseString(reader)
-            var _2: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _2 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
+            var _2: Int32?
+            _2 = reader.readInt32()
             var _3: Int32?
             _3 = reader.readInt32()
-            var _4: Int32?
-            _4 = reader.readInt32()
-            var _5: Buffer?
-            _5 = parseBytes(reader)
+            var _4: Buffer?
+            _4 = parseBytes(reader)
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
-            let _c5 = _5 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.PhotoSize.photoCachedSize(type: _1!, location: _2!, w: _3!, h: _4!, bytes: _5!)
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.PhotoSize.photoCachedSize(type: _1!, w: _2!, h: _3!, bytes: _4!)
             }
             else {
                 return nil
@@ -8287,25 +8408,20 @@ public extension Api {
         public static func parse_photoSizeProgressive(_ reader: BufferReader) -> PhotoSize? {
             var _1: String?
             _1 = parseString(reader)
-            var _2: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _2 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
+            var _2: Int32?
+            _2 = reader.readInt32()
             var _3: Int32?
             _3 = reader.readInt32()
-            var _4: Int32?
-            _4 = reader.readInt32()
-            var _5: [Int32]?
+            var _4: [Int32]?
             if let _ = reader.readInt32() {
-                _5 = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self)
+                _4 = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self)
             }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
-            let _c5 = _5 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.PhotoSize.photoSizeProgressive(type: _1!, location: _2!, w: _3!, h: _4!, sizes: _5!)
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.PhotoSize.photoSizeProgressive(type: _1!, w: _2!, h: _3!, sizes: _4!)
             }
             else {
                 return nil
@@ -8462,44 +8578,6 @@ public extension Api {
             }
         }
     
-    }
-    public enum FileLocation: TypeConstructorDescription {
-        case fileLocationToBeDeprecated(volumeId: Int64, localId: Int32)
-    
-    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
-    switch self {
-                case .fileLocationToBeDeprecated(let volumeId, let localId):
-                    if boxed {
-                        buffer.appendInt32(-1132476723)
-                    }
-                    serializeInt64(volumeId, buffer: buffer, boxed: false)
-                    serializeInt32(localId, buffer: buffer, boxed: false)
-                    break
-    }
-    }
-    
-    public func descriptionFields() -> (String, [(String, Any)]) {
-        switch self {
-                case .fileLocationToBeDeprecated(let volumeId, let localId):
-                return ("fileLocationToBeDeprecated", [("volumeId", volumeId), ("localId", localId)])
-    }
-    }
-    
-        public static func parse_fileLocationToBeDeprecated(_ reader: BufferReader) -> FileLocation? {
-            var _1: Int64?
-            _1 = reader.readInt64()
-            var _2: Int32?
-            _2 = reader.readInt32()
-            let _c1 = _1 != nil
-            let _c2 = _2 != nil
-            if _c1 && _c2 {
-                return Api.FileLocation.fileLocationToBeDeprecated(volumeId: _1!, localId: _2!)
-            }
-            else {
-                return nil
-            }
-        }
-    
     }
     public enum Poll: TypeConstructorDescription {
         case poll(id: Int64, flags: Int32, question: String, answers: [Api.PollAnswer], closePeriod: Int32?, closeDate: Int32?)
@@ -9068,6 +9146,7 @@ public extension Api {
         case inputBotInlineMessageMediaVenue(flags: Int32, geoPoint: Api.InputGeoPoint, title: String, address: String, provider: String, venueId: String, venueType: String, replyMarkup: Api.ReplyMarkup?)
         case inputBotInlineMessageMediaContact(flags: Int32, phoneNumber: String, firstName: String, lastName: String, vcard: String, replyMarkup: Api.ReplyMarkup?)
         case inputBotInlineMessageGame(flags: Int32, replyMarkup: Api.ReplyMarkup?)
+        case inputBotInlineMessageMediaInvoice(flags: Int32, title: String, description: String, photo: Api.InputWebDocument?, invoice: Api.Invoice, payload: Buffer, provider: String, providerData: Api.DataJSON, replyMarkup: Api.ReplyMarkup?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -9139,6 +9218,20 @@ public extension Api {
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 2) != 0 {replyMarkup!.serialize(buffer, true)}
                     break
+                case .inputBotInlineMessageMediaInvoice(let flags, let title, let description, let photo, let invoice, let payload, let provider, let providerData, let replyMarkup):
+                    if boxed {
+                        buffer.appendInt32(-672693723)
+                    }
+                    serializeInt32(flags, buffer: buffer, boxed: false)
+                    serializeString(title, buffer: buffer, boxed: false)
+                    serializeString(description, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 0) != 0 {photo!.serialize(buffer, true)}
+                    invoice.serialize(buffer, true)
+                    serializeBytes(payload, buffer: buffer, boxed: false)
+                    serializeString(provider, buffer: buffer, boxed: false)
+                    providerData.serialize(buffer, true)
+                    if Int(flags) & Int(1 << 2) != 0 {replyMarkup!.serialize(buffer, true)}
+                    break
     }
     }
     
@@ -9156,6 +9249,8 @@ public extension Api {
                 return ("inputBotInlineMessageMediaContact", [("flags", flags), ("phoneNumber", phoneNumber), ("firstName", firstName), ("lastName", lastName), ("vcard", vcard), ("replyMarkup", replyMarkup)])
                 case .inputBotInlineMessageGame(let flags, let replyMarkup):
                 return ("inputBotInlineMessageGame", [("flags", flags), ("replyMarkup", replyMarkup)])
+                case .inputBotInlineMessageMediaInvoice(let flags, let title, let description, let photo, let invoice, let payload, let provider, let providerData, let replyMarkup):
+                return ("inputBotInlineMessageMediaInvoice", [("flags", flags), ("title", title), ("description", description), ("photo", photo), ("invoice", invoice), ("payload", payload), ("provider", provider), ("providerData", providerData), ("replyMarkup", replyMarkup)])
     }
     }
     
@@ -9317,6 +9412,49 @@ public extension Api {
                 return nil
             }
         }
+        public static func parse_inputBotInlineMessageMediaInvoice(_ reader: BufferReader) -> InputBotInlineMessage? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            var _2: String?
+            _2 = parseString(reader)
+            var _3: String?
+            _3 = parseString(reader)
+            var _4: Api.InputWebDocument?
+            if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() {
+                _4 = Api.parse(reader, signature: signature) as? Api.InputWebDocument
+            } }
+            var _5: Api.Invoice?
+            if let signature = reader.readInt32() {
+                _5 = Api.parse(reader, signature: signature) as? Api.Invoice
+            }
+            var _6: Buffer?
+            _6 = parseBytes(reader)
+            var _7: String?
+            _7 = parseString(reader)
+            var _8: Api.DataJSON?
+            if let signature = reader.readInt32() {
+                _8 = Api.parse(reader, signature: signature) as? Api.DataJSON
+            }
+            var _9: Api.ReplyMarkup?
+            if Int(_1!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() {
+                _9 = Api.parse(reader, signature: signature) as? Api.ReplyMarkup
+            } }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            let _c3 = _3 != nil
+            let _c4 = (Int(_1!) & Int(1 << 0) == 0) || _4 != nil
+            let _c5 = _5 != nil
+            let _c6 = _6 != nil
+            let _c7 = _7 != nil
+            let _c8 = _8 != nil
+            let _c9 = (Int(_1!) & Int(1 << 2) == 0) || _9 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 {
+                return Api.InputBotInlineMessage.inputBotInlineMessageMediaInvoice(flags: _1!, title: _2!, description: _3!, photo: _4, invoice: _5!, payload: _6!, provider: _7!, providerData: _8!, replyMarkup: _9)
+            }
+            else {
+                return nil
+            }
+        }
     
     }
     public enum KeyboardButtonRow: TypeConstructorDescription {
@@ -9360,13 +9498,13 @@ public extension Api {
     
     }
     public enum StickerSet: TypeConstructorDescription {
-        case stickerSet(flags: Int32, installedDate: Int32?, id: Int64, accessHash: Int64, title: String, shortName: String, thumbs: [Api.PhotoSize]?, thumbDcId: Int32?, count: Int32, hash: Int32)
+        case stickerSet(flags: Int32, installedDate: Int32?, id: Int64, accessHash: Int64, title: String, shortName: String, thumbs: [Api.PhotoSize]?, thumbDcId: Int32?, thumbVersion: Int32?, count: Int32, hash: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .stickerSet(let flags, let installedDate, let id, let accessHash, let title, let shortName, let thumbs, let thumbDcId, let count, let hash):
+                case .stickerSet(let flags, let installedDate, let id, let accessHash, let title, let shortName, let thumbs, let thumbDcId, let thumbVersion, let count, let hash):
                     if boxed {
-                        buffer.appendInt32(1088567208)
+                        buffer.appendInt32(-673242758)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 0) != 0 {serializeInt32(installedDate!, buffer: buffer, boxed: false)}
@@ -9380,6 +9518,7 @@ public extension Api {
                         item.serialize(buffer, true)
                     }}
                     if Int(flags) & Int(1 << 4) != 0 {serializeInt32(thumbDcId!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 4) != 0 {serializeInt32(thumbVersion!, buffer: buffer, boxed: false)}
                     serializeInt32(count, buffer: buffer, boxed: false)
                     serializeInt32(hash, buffer: buffer, boxed: false)
                     break
@@ -9388,8 +9527,8 @@ public extension Api {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .stickerSet(let flags, let installedDate, let id, let accessHash, let title, let shortName, let thumbs, let thumbDcId, let count, let hash):
-                return ("stickerSet", [("flags", flags), ("installedDate", installedDate), ("id", id), ("accessHash", accessHash), ("title", title), ("shortName", shortName), ("thumbs", thumbs), ("thumbDcId", thumbDcId), ("count", count), ("hash", hash)])
+                case .stickerSet(let flags, let installedDate, let id, let accessHash, let title, let shortName, let thumbs, let thumbDcId, let thumbVersion, let count, let hash):
+                return ("stickerSet", [("flags", flags), ("installedDate", installedDate), ("id", id), ("accessHash", accessHash), ("title", title), ("shortName", shortName), ("thumbs", thumbs), ("thumbDcId", thumbDcId), ("thumbVersion", thumbVersion), ("count", count), ("hash", hash)])
     }
     }
     
@@ -9413,9 +9552,11 @@ public extension Api {
             var _8: Int32?
             if Int(_1!) & Int(1 << 4) != 0 {_8 = reader.readInt32() }
             var _9: Int32?
-            _9 = reader.readInt32()
+            if Int(_1!) & Int(1 << 4) != 0 {_9 = reader.readInt32() }
             var _10: Int32?
             _10 = reader.readInt32()
+            var _11: Int32?
+            _11 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = (Int(_1!) & Int(1 << 0) == 0) || _2 != nil
             let _c3 = _3 != nil
@@ -9424,10 +9565,11 @@ public extension Api {
             let _c6 = _6 != nil
             let _c7 = (Int(_1!) & Int(1 << 4) == 0) || _7 != nil
             let _c8 = (Int(_1!) & Int(1 << 4) == 0) || _8 != nil
-            let _c9 = _9 != nil
+            let _c9 = (Int(_1!) & Int(1 << 4) == 0) || _9 != nil
             let _c10 = _10 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 {
-                return Api.StickerSet.stickerSet(flags: _1!, installedDate: _2, id: _3!, accessHash: _4!, title: _5!, shortName: _6!, thumbs: _7, thumbDcId: _8, count: _9!, hash: _10!)
+            let _c11 = _11 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 {
+                return Api.StickerSet.stickerSet(flags: _1!, installedDate: _2, id: _3!, accessHash: _4!, title: _5!, shortName: _6!, thumbs: _7, thumbDcId: _8, thumbVersion: _9, count: _10!, hash: _11!)
             }
             else {
                 return nil
@@ -9919,7 +10061,7 @@ public extension Api {
         case inputMediaPhotoExternal(flags: Int32, url: String, ttlSeconds: Int32?)
         case inputMediaDocumentExternal(flags: Int32, url: String, ttlSeconds: Int32?)
         case inputMediaGame(id: Api.InputGame)
-        case inputMediaInvoice(flags: Int32, title: String, description: String, photo: Api.InputWebDocument?, invoice: Api.Invoice, payload: Buffer, provider: String, providerData: Api.DataJSON, startParam: String)
+        case inputMediaInvoice(flags: Int32, title: String, description: String, photo: Api.InputWebDocument?, invoice: Api.Invoice, payload: Buffer, provider: String, providerData: Api.DataJSON, startParam: String?)
         case inputMediaGeoLive(flags: Int32, geoPoint: Api.InputGeoPoint, heading: Int32?, period: Int32?, proximityNotificationRadius: Int32?)
         case inputMediaPoll(flags: Int32, poll: Api.Poll, correctAnswers: [Buffer]?, solution: String?, solutionEntities: [Api.MessageEntity]?)
         case inputMediaDice(emoticon: String)
@@ -10032,7 +10174,7 @@ public extension Api {
                     break
                 case .inputMediaInvoice(let flags, let title, let description, let photo, let invoice, let payload, let provider, let providerData, let startParam):
                     if boxed {
-                        buffer.appendInt32(-186607933)
+                        buffer.appendInt32(-646342540)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeString(title, buffer: buffer, boxed: false)
@@ -10042,7 +10184,7 @@ public extension Api {
                     serializeBytes(payload, buffer: buffer, boxed: false)
                     serializeString(provider, buffer: buffer, boxed: false)
                     providerData.serialize(buffer, true)
-                    serializeString(startParam, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 1) != 0 {serializeString(startParam!, buffer: buffer, boxed: false)}
                     break
                 case .inputMediaGeoLive(let flags, let geoPoint, let heading, let period, let proximityNotificationRadius):
                     if boxed {
@@ -10353,7 +10495,7 @@ public extension Api {
                 _8 = Api.parse(reader, signature: signature) as? Api.DataJSON
             }
             var _9: String?
-            _9 = parseString(reader)
+            if Int(_1!) & Int(1 << 1) != 0 {_9 = parseString(reader) }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
@@ -10362,9 +10504,9 @@ public extension Api {
             let _c6 = _6 != nil
             let _c7 = _7 != nil
             let _c8 = _8 != nil
-            let _c9 = _9 != nil
+            let _c9 = (Int(_1!) & Int(1 << 1) == 0) || _9 != nil
             if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 {
-                return Api.InputMedia.inputMediaInvoice(flags: _1!, title: _2!, description: _3!, photo: _4, invoice: _5!, payload: _6!, provider: _7!, providerData: _8!, startParam: _9!)
+                return Api.InputMedia.inputMediaInvoice(flags: _1!, title: _2!, description: _3!, photo: _4, invoice: _5!, payload: _6!, provider: _7!, providerData: _8!, startParam: _9)
             }
             else {
                 return nil
@@ -13209,8 +13351,8 @@ public extension Api {
     }
     public enum ReplyMarkup: TypeConstructorDescription {
         case replyKeyboardHide(flags: Int32)
-        case replyKeyboardForceReply(flags: Int32)
-        case replyKeyboardMarkup(flags: Int32, rows: [Api.KeyboardButtonRow])
+        case replyKeyboardForceReply(flags: Int32, placeholder: String?)
+        case replyKeyboardMarkup(flags: Int32, rows: [Api.KeyboardButtonRow], placeholder: String?)
         case replyInlineMarkup(rows: [Api.KeyboardButtonRow])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -13221,15 +13363,16 @@ public extension Api {
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     break
-                case .replyKeyboardForceReply(let flags):
+                case .replyKeyboardForceReply(let flags, let placeholder):
                     if boxed {
-                        buffer.appendInt32(-200242528)
+                        buffer.appendInt32(-2035021048)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 3) != 0 {serializeString(placeholder!, buffer: buffer, boxed: false)}
                     break
-                case .replyKeyboardMarkup(let flags, let rows):
+                case .replyKeyboardMarkup(let flags, let rows, let placeholder):
                     if boxed {
-                        buffer.appendInt32(889353612)
+                        buffer.appendInt32(-2049074735)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     buffer.appendInt32(481674261)
@@ -13237,6 +13380,7 @@ public extension Api {
                     for item in rows {
                         item.serialize(buffer, true)
                     }
+                    if Int(flags) & Int(1 << 3) != 0 {serializeString(placeholder!, buffer: buffer, boxed: false)}
                     break
                 case .replyInlineMarkup(let rows):
                     if boxed {
@@ -13255,10 +13399,10 @@ public extension Api {
         switch self {
                 case .replyKeyboardHide(let flags):
                 return ("replyKeyboardHide", [("flags", flags)])
-                case .replyKeyboardForceReply(let flags):
-                return ("replyKeyboardForceReply", [("flags", flags)])
-                case .replyKeyboardMarkup(let flags, let rows):
-                return ("replyKeyboardMarkup", [("flags", flags), ("rows", rows)])
+                case .replyKeyboardForceReply(let flags, let placeholder):
+                return ("replyKeyboardForceReply", [("flags", flags), ("placeholder", placeholder)])
+                case .replyKeyboardMarkup(let flags, let rows, let placeholder):
+                return ("replyKeyboardMarkup", [("flags", flags), ("rows", rows), ("placeholder", placeholder)])
                 case .replyInlineMarkup(let rows):
                 return ("replyInlineMarkup", [("rows", rows)])
     }
@@ -13278,9 +13422,12 @@ public extension Api {
         public static func parse_replyKeyboardForceReply(_ reader: BufferReader) -> ReplyMarkup? {
             var _1: Int32?
             _1 = reader.readInt32()
+            var _2: String?
+            if Int(_1!) & Int(1 << 3) != 0 {_2 = parseString(reader) }
             let _c1 = _1 != nil
-            if _c1 {
-                return Api.ReplyMarkup.replyKeyboardForceReply(flags: _1!)
+            let _c2 = (Int(_1!) & Int(1 << 3) == 0) || _2 != nil
+            if _c1 && _c2 {
+                return Api.ReplyMarkup.replyKeyboardForceReply(flags: _1!, placeholder: _2)
             }
             else {
                 return nil
@@ -13293,10 +13440,13 @@ public extension Api {
             if let _ = reader.readInt32() {
                 _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.KeyboardButtonRow.self)
             }
+            var _3: String?
+            if Int(_1!) & Int(1 << 3) != 0 {_3 = parseString(reader) }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
-            if _c1 && _c2 {
-                return Api.ReplyMarkup.replyKeyboardMarkup(flags: _1!, rows: _2!)
+            let _c3 = (Int(_1!) & Int(1 << 3) == 0) || _3 != nil
+            if _c1 && _c2 && _c3 {
+                return Api.ReplyMarkup.replyKeyboardMarkup(flags: _1!, rows: _2!, placeholder: _3)
             }
             else {
                 return nil
@@ -14834,6 +14984,58 @@ public extension Api {
             }
         }
     
+    }
+    public enum GroupCallParticipantVideo: TypeConstructorDescription {
+        case groupCallParticipantVideo(flags: Int32, endpoint: String, sourceGroups: [Api.GroupCallParticipantVideoSourceGroup], audioSource: Int32?)
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .groupCallParticipantVideo(let flags, let endpoint, let sourceGroups, let audioSource):
+                    if boxed {
+                        buffer.appendInt32(1735736008)
+                    }
+                    serializeInt32(flags, buffer: buffer, boxed: false)
+                    serializeString(endpoint, buffer: buffer, boxed: false)
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(sourceGroups.count))
+                    for item in sourceGroups {
+                        item.serialize(buffer, true)
+                    }
+                    if Int(flags) & Int(1 << 1) != 0 {serializeInt32(audioSource!, buffer: buffer, boxed: false)}
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .groupCallParticipantVideo(let flags, let endpoint, let sourceGroups, let audioSource):
+                return ("groupCallParticipantVideo", [("flags", flags), ("endpoint", endpoint), ("sourceGroups", sourceGroups), ("audioSource", audioSource)])
+    }
+    }
+    
+        public static func parse_groupCallParticipantVideo(_ reader: BufferReader) -> GroupCallParticipantVideo? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            var _2: String?
+            _2 = parseString(reader)
+            var _3: [Api.GroupCallParticipantVideoSourceGroup]?
+            if let _ = reader.readInt32() {
+                _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.GroupCallParticipantVideoSourceGroup.self)
+            }
+            var _4: Int32?
+            if Int(_1!) & Int(1 << 1) != 0 {_4 = reader.readInt32() }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            let _c3 = _3 != nil
+            let _c4 = (Int(_1!) & Int(1 << 1) == 0) || _4 != nil
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.GroupCallParticipantVideo.groupCallParticipantVideo(flags: _1!, endpoint: _2!, sourceGroups: _3!, audioSource: _4)
+            }
+            else {
+                return nil
+            }
+        }
+    
     }
     public enum PhoneCallProtocol: TypeConstructorDescription {
         case phoneCallProtocol(flags: Int32, minLayer: Int32, maxLayer: Int32, libraryVersions: [String])
@@ -14924,10 +15126,144 @@ public extension Api {
             }
         }
     
+    }
+    public enum BotCommandScope: TypeConstructorDescription {
+        case botCommandScopeDefault
+        case botCommandScopeUsers
+        case botCommandScopeChats
+        case botCommandScopeChatAdmins
+        case botCommandScopePeer(peer: Api.InputPeer)
+        case botCommandScopePeerAdmins(peer: Api.InputPeer)
+        case botCommandScopePeerUser(peer: Api.InputPeer, userId: Api.InputUser)
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .botCommandScopeDefault:
+                    if boxed {
+                        buffer.appendInt32(795652779)
+                    }
+                    
+                    break
+                case .botCommandScopeUsers:
+                    if boxed {
+                        buffer.appendInt32(1011811544)
+                    }
+                    
+                    break
+                case .botCommandScopeChats:
+                    if boxed {
+                        buffer.appendInt32(1877059713)
+                    }
+                    
+                    break
+                case .botCommandScopeChatAdmins:
+                    if boxed {
+                        buffer.appendInt32(-1180016534)
+                    }
+                    
+                    break
+                case .botCommandScopePeer(let peer):
+                    if boxed {
+                        buffer.appendInt32(-610432643)
+                    }
+                    peer.serialize(buffer, true)
+                    break
+                case .botCommandScopePeerAdmins(let peer):
+                    if boxed {
+                        buffer.appendInt32(1071145937)
+                    }
+                    peer.serialize(buffer, true)
+                    break
+                case .botCommandScopePeerUser(let peer, let userId):
+                    if boxed {
+                        buffer.appendInt32(169026035)
+                    }
+                    peer.serialize(buffer, true)
+                    userId.serialize(buffer, true)
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .botCommandScopeDefault:
+                return ("botCommandScopeDefault", [])
+                case .botCommandScopeUsers:
+                return ("botCommandScopeUsers", [])
+                case .botCommandScopeChats:
+                return ("botCommandScopeChats", [])
+                case .botCommandScopeChatAdmins:
+                return ("botCommandScopeChatAdmins", [])
+                case .botCommandScopePeer(let peer):
+                return ("botCommandScopePeer", [("peer", peer)])
+                case .botCommandScopePeerAdmins(let peer):
+                return ("botCommandScopePeerAdmins", [("peer", peer)])
+                case .botCommandScopePeerUser(let peer, let userId):
+                return ("botCommandScopePeerUser", [("peer", peer), ("userId", userId)])
+    }
+    }
+    
+        public static func parse_botCommandScopeDefault(_ reader: BufferReader) -> BotCommandScope? {
+            return Api.BotCommandScope.botCommandScopeDefault
+        }
+        public static func parse_botCommandScopeUsers(_ reader: BufferReader) -> BotCommandScope? {
+            return Api.BotCommandScope.botCommandScopeUsers
+        }
+        public static func parse_botCommandScopeChats(_ reader: BufferReader) -> BotCommandScope? {
+            return Api.BotCommandScope.botCommandScopeChats
+        }
+        public static func parse_botCommandScopeChatAdmins(_ reader: BufferReader) -> BotCommandScope? {
+            return Api.BotCommandScope.botCommandScopeChatAdmins
+        }
+        public static func parse_botCommandScopePeer(_ reader: BufferReader) -> BotCommandScope? {
+            var _1: Api.InputPeer?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.InputPeer
+            }
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.BotCommandScope.botCommandScopePeer(peer: _1!)
+            }
+            else {
+                return nil
+            }
+        }
+        public static func parse_botCommandScopePeerAdmins(_ reader: BufferReader) -> BotCommandScope? {
+            var _1: Api.InputPeer?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.InputPeer
+            }
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.BotCommandScope.botCommandScopePeerAdmins(peer: _1!)
+            }
+            else {
+                return nil
+            }
+        }
+        public static func parse_botCommandScopePeerUser(_ reader: BufferReader) -> BotCommandScope? {
+            var _1: Api.InputPeer?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.InputPeer
+            }
+            var _2: Api.InputUser?
+            if let signature = reader.readInt32() {
+                _2 = Api.parse(reader, signature: signature) as? Api.InputUser
+            }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            if _c1 && _c2 {
+                return Api.BotCommandScope.botCommandScopePeerUser(peer: _1!, userId: _2!)
+            }
+            else {
+                return nil
+            }
+        }
+    
     }
     public enum WallPaper: TypeConstructorDescription {
         case wallPaper(id: Int64, flags: Int32, accessHash: Int64, slug: String, document: Api.Document, settings: Api.WallPaperSettings?)
-        case wallPaperNoFile(flags: Int32, settings: Api.WallPaperSettings?)
+        case wallPaperNoFile(id: Int64, flags: Int32, settings: Api.WallPaperSettings?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -14942,10 +15278,11 @@ public extension Api {
                     document.serialize(buffer, true)
                     if Int(flags) & Int(1 << 2) != 0 {settings!.serialize(buffer, true)}
                     break
-                case .wallPaperNoFile(let flags, let settings):
+                case .wallPaperNoFile(let id, let flags, let settings):
                     if boxed {
-                        buffer.appendInt32(-1963717851)
+                        buffer.appendInt32(-528465642)
                     }
+                    serializeInt64(id, buffer: buffer, boxed: false)
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 2) != 0 {settings!.serialize(buffer, true)}
                     break
@@ -14956,8 +15293,8 @@ public extension Api {
         switch self {
                 case .wallPaper(let id, let flags, let accessHash, let slug, let document, let settings):
                 return ("wallPaper", [("id", id), ("flags", flags), ("accessHash", accessHash), ("slug", slug), ("document", document), ("settings", settings)])
-                case .wallPaperNoFile(let flags, let settings):
-                return ("wallPaperNoFile", [("flags", flags), ("settings", settings)])
+                case .wallPaperNoFile(let id, let flags, let settings):
+                return ("wallPaperNoFile", [("id", id), ("flags", flags), ("settings", settings)])
     }
     }
     
@@ -14992,16 +15329,19 @@ public extension Api {
             }
         }
         public static func parse_wallPaperNoFile(_ reader: BufferReader) -> WallPaper? {
-            var _1: Int32?
-            _1 = reader.readInt32()
-            var _2: Api.WallPaperSettings?
-            if Int(_1!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() {
-                _2 = Api.parse(reader, signature: signature) as? Api.WallPaperSettings
+            var _1: Int64?
+            _1 = reader.readInt64()
+            var _2: Int32?
+            _2 = reader.readInt32()
+            var _3: Api.WallPaperSettings?
+            if Int(_2!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() {
+                _3 = Api.parse(reader, signature: signature) as? Api.WallPaperSettings
             } }
             let _c1 = _1 != nil
-            let _c2 = (Int(_1!) & Int(1 << 2) == 0) || _2 != nil
-            if _c1 && _c2 {
-                return Api.WallPaper.wallPaperNoFile(flags: _1!, settings: _2)
+            let _c2 = _2 != nil
+            let _c3 = (Int(_2!) & Int(1 << 2) == 0) || _3 != nil
+            if _c1 && _c2 && _c3 {
+                return Api.WallPaper.wallPaperNoFile(id: _1!, flags: _2!, settings: _3)
             }
             else {
                 return nil
@@ -15010,13 +15350,13 @@ public extension Api {
     
     }
     public enum Invoice: TypeConstructorDescription {
-        case invoice(flags: Int32, currency: String, prices: [Api.LabeledPrice])
+        case invoice(flags: Int32, currency: String, prices: [Api.LabeledPrice], maxTipAmount: Int64?, suggestedTipAmounts: [Int64]?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .invoice(let flags, let currency, let prices):
+                case .invoice(let flags, let currency, let prices, let maxTipAmount, let suggestedTipAmounts):
                     if boxed {
-                        buffer.appendInt32(-1022713000)
+                        buffer.appendInt32(215516896)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeString(currency, buffer: buffer, boxed: false)
@@ -15025,14 +15365,20 @@ public extension Api {
                     for item in prices {
                         item.serialize(buffer, true)
                     }
+                    if Int(flags) & Int(1 << 8) != 0 {serializeInt64(maxTipAmount!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 8) != 0 {buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(suggestedTipAmounts!.count))
+                    for item in suggestedTipAmounts! {
+                        serializeInt64(item, buffer: buffer, boxed: false)
+                    }}
                     break
     }
     }
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .invoice(let flags, let currency, let prices):
-                return ("invoice", [("flags", flags), ("currency", currency), ("prices", prices)])
+                case .invoice(let flags, let currency, let prices, let maxTipAmount, let suggestedTipAmounts):
+                return ("invoice", [("flags", flags), ("currency", currency), ("prices", prices), ("maxTipAmount", maxTipAmount), ("suggestedTipAmounts", suggestedTipAmounts)])
     }
     }
     
@@ -15045,11 +15391,19 @@ public extension Api {
             if let _ = reader.readInt32() {
                 _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.LabeledPrice.self)
             }
+            var _4: Int64?
+            if Int(_1!) & Int(1 << 8) != 0 {_4 = reader.readInt64() }
+            var _5: [Int64]?
+            if Int(_1!) & Int(1 << 8) != 0 {if let _ = reader.readInt32() {
+                _5 = Api.parseVector(reader, elementSignature: 570911930, elementType: Int64.self)
+            } }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
-            if _c1 && _c2 && _c3 {
-                return Api.Invoice.invoice(flags: _1!, currency: _2!, prices: _3!)
+            let _c4 = (Int(_1!) & Int(1 << 8) == 0) || _4 != nil
+            let _c5 = (Int(_1!) & Int(1 << 8) == 0) || _5 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 {
+                return Api.Invoice.invoice(flags: _1!, currency: _2!, prices: _3!, maxTipAmount: _4, suggestedTipAmounts: _5)
             }
             else {
                 return nil
@@ -16315,7 +16669,7 @@ public extension Api {
     }
     public enum ChatPhoto: TypeConstructorDescription {
         case chatPhotoEmpty
-        case chatPhoto(flags: Int32, photoSmall: Api.FileLocation, photoBig: Api.FileLocation, dcId: Int32)
+        case chatPhoto(flags: Int32, photoId: Int64, strippedThumb: Buffer?, dcId: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -16325,13 +16679,13 @@ public extension Api {
                     }
                     
                     break
-                case .chatPhoto(let flags, let photoSmall, let photoBig, let dcId):
+                case .chatPhoto(let flags, let photoId, let strippedThumb, let dcId):
                     if boxed {
-                        buffer.appendInt32(-770990276)
+                        buffer.appendInt32(476978193)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
-                    photoSmall.serialize(buffer, true)
-                    photoBig.serialize(buffer, true)
+                    serializeInt64(photoId, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 1) != 0 {serializeBytes(strippedThumb!, buffer: buffer, boxed: false)}
                     serializeInt32(dcId, buffer: buffer, boxed: false)
                     break
     }
@@ -16341,8 +16695,8 @@ public extension Api {
         switch self {
                 case .chatPhotoEmpty:
                 return ("chatPhotoEmpty", [])
-                case .chatPhoto(let flags, let photoSmall, let photoBig, let dcId):
-                return ("chatPhoto", [("flags", flags), ("photoSmall", photoSmall), ("photoBig", photoBig), ("dcId", dcId)])
+                case .chatPhoto(let flags, let photoId, let strippedThumb, let dcId):
+                return ("chatPhoto", [("flags", flags), ("photoId", photoId), ("strippedThumb", strippedThumb), ("dcId", dcId)])
     }
     }
     
@@ -16352,22 +16706,18 @@ public extension Api {
         public static func parse_chatPhoto(_ reader: BufferReader) -> ChatPhoto? {
             var _1: Int32?
             _1 = reader.readInt32()
-            var _2: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _2 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
-            var _3: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _3 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
+            var _2: Int64?
+            _2 = reader.readInt64()
+            var _3: Buffer?
+            if Int(_1!) & Int(1 << 1) != 0 {_3 = parseBytes(reader) }
             var _4: Int32?
             _4 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
-            let _c3 = _3 != nil
+            let _c3 = (Int(_1!) & Int(1 << 1) == 0) || _3 != nil
             let _c4 = _4 != nil
             if _c1 && _c2 && _c3 && _c4 {
-                return Api.ChatPhoto.chatPhoto(flags: _1!, photoSmall: _2!, photoBig: _3!, dcId: _4!)
+                return Api.ChatPhoto.chatPhoto(flags: _1!, photoId: _2!, strippedThumb: _3, dcId: _4!)
             }
             else {
                 return nil
@@ -17023,8 +17373,8 @@ public extension Api {
         case inputTakeoutFileLocation
         case inputPhotoFileLocation(id: Int64, accessHash: Int64, fileReference: Buffer, thumbSize: String)
         case inputPhotoLegacyFileLocation(id: Int64, accessHash: Int64, fileReference: Buffer, volumeId: Int64, localId: Int32, secret: Int64)
-        case inputPeerPhotoFileLocation(flags: Int32, peer: Api.InputPeer, volumeId: Int64, localId: Int32)
-        case inputStickerSetThumb(stickerset: Api.InputStickerSet, volumeId: Int64, localId: Int32)
+        case inputPeerPhotoFileLocation(flags: Int32, peer: Api.InputPeer, photoId: Int64)
+        case inputStickerSetThumb(stickerset: Api.InputStickerSet, thumbVersion: Int32)
         case inputGroupCallStream(call: Api.InputGroupCall, timeMs: Int64, scale: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
@@ -17087,22 +17437,20 @@ public extension Api {
                     serializeInt32(localId, buffer: buffer, boxed: false)
                     serializeInt64(secret, buffer: buffer, boxed: false)
                     break
-                case .inputPeerPhotoFileLocation(let flags, let peer, let volumeId, let localId):
+                case .inputPeerPhotoFileLocation(let flags, let peer, let photoId):
                     if boxed {
-                        buffer.appendInt32(668375447)
+                        buffer.appendInt32(925204121)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     peer.serialize(buffer, true)
-                    serializeInt64(volumeId, buffer: buffer, boxed: false)
-                    serializeInt32(localId, buffer: buffer, boxed: false)
+                    serializeInt64(photoId, buffer: buffer, boxed: false)
                     break
-                case .inputStickerSetThumb(let stickerset, let volumeId, let localId):
+                case .inputStickerSetThumb(let stickerset, let thumbVersion):
                     if boxed {
-                        buffer.appendInt32(230353641)
+                        buffer.appendInt32(-1652231205)
                     }
                     stickerset.serialize(buffer, true)
-                    serializeInt64(volumeId, buffer: buffer, boxed: false)
-                    serializeInt32(localId, buffer: buffer, boxed: false)
+                    serializeInt32(thumbVersion, buffer: buffer, boxed: false)
                     break
                 case .inputGroupCallStream(let call, let timeMs, let scale):
                     if boxed {
@@ -17131,10 +17479,10 @@ public extension Api {
                 return ("inputPhotoFileLocation", [("id", id), ("accessHash", accessHash), ("fileReference", fileReference), ("thumbSize", thumbSize)])
                 case .inputPhotoLegacyFileLocation(let id, let accessHash, let fileReference, let volumeId, let localId, let secret):
                 return ("inputPhotoLegacyFileLocation", [("id", id), ("accessHash", accessHash), ("fileReference", fileReference), ("volumeId", volumeId), ("localId", localId), ("secret", secret)])
-                case .inputPeerPhotoFileLocation(let flags, let peer, let volumeId, let localId):
-                return ("inputPeerPhotoFileLocation", [("flags", flags), ("peer", peer), ("volumeId", volumeId), ("localId", localId)])
-                case .inputStickerSetThumb(let stickerset, let volumeId, let localId):
-                return ("inputStickerSetThumb", [("stickerset", stickerset), ("volumeId", volumeId), ("localId", localId)])
+                case .inputPeerPhotoFileLocation(let flags, let peer, let photoId):
+                return ("inputPeerPhotoFileLocation", [("flags", flags), ("peer", peer), ("photoId", photoId)])
+                case .inputStickerSetThumb(let stickerset, let thumbVersion):
+                return ("inputStickerSetThumb", [("stickerset", stickerset), ("thumbVersion", thumbVersion)])
                 case .inputGroupCallStream(let call, let timeMs, let scale):
                 return ("inputGroupCallStream", [("call", call), ("timeMs", timeMs), ("scale", scale)])
     }
@@ -17266,14 +17614,11 @@ public extension Api {
             }
             var _3: Int64?
             _3 = reader.readInt64()
-            var _4: Int32?
-            _4 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
-            let _c4 = _4 != nil
-            if _c1 && _c2 && _c3 && _c4 {
-                return Api.InputFileLocation.inputPeerPhotoFileLocation(flags: _1!, peer: _2!, volumeId: _3!, localId: _4!)
+            if _c1 && _c2 && _c3 {
+                return Api.InputFileLocation.inputPeerPhotoFileLocation(flags: _1!, peer: _2!, photoId: _3!)
             }
             else {
                 return nil
@@ -17284,15 +17629,12 @@ public extension Api {
             if let signature = reader.readInt32() {
                 _1 = Api.parse(reader, signature: signature) as? Api.InputStickerSet
             }
-            var _2: Int64?
-            _2 = reader.readInt64()
-            var _3: Int32?
-            _3 = reader.readInt32()
+            var _2: Int32?
+            _2 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
-            let _c3 = _3 != nil
-            if _c1 && _c2 && _c3 {
-                return Api.InputFileLocation.inputStickerSetThumb(stickerset: _1!, volumeId: _2!, localId: _3!)
+            if _c1 && _c2 {
+                return Api.InputFileLocation.inputStickerSetThumb(stickerset: _1!, thumbVersion: _2!)
             }
             else {
                 return nil
@@ -17972,7 +18314,7 @@ public extension Api {
     public enum InputWallPaper: TypeConstructorDescription {
         case inputWallPaper(id: Int64, accessHash: Int64)
         case inputWallPaperSlug(slug: String)
-        case inputWallPaperNoFile
+        case inputWallPaperNoFile(id: Int64)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -17989,11 +18331,11 @@ public extension Api {
                     }
                     serializeString(slug, buffer: buffer, boxed: false)
                     break
-                case .inputWallPaperNoFile:
+                case .inputWallPaperNoFile(let id):
                     if boxed {
-                        buffer.appendInt32(-2077770836)
+                        buffer.appendInt32(-1770371538)
                     }
-                    
+                    serializeInt64(id, buffer: buffer, boxed: false)
                     break
     }
     }
@@ -18004,8 +18346,8 @@ public extension Api {
                 return ("inputWallPaper", [("id", id), ("accessHash", accessHash)])
                 case .inputWallPaperSlug(let slug):
                 return ("inputWallPaperSlug", [("slug", slug)])
-                case .inputWallPaperNoFile:
-                return ("inputWallPaperNoFile", [])
+                case .inputWallPaperNoFile(let id):
+                return ("inputWallPaperNoFile", [("id", id)])
     }
     }
     
@@ -18035,7 +18377,15 @@ public extension Api {
             }
         }
         public static func parse_inputWallPaperNoFile(_ reader: BufferReader) -> InputWallPaper? {
-            return Api.InputWallPaper.inputWallPaperNoFile
+            var _1: Int64?
+            _1 = reader.readInt64()
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.InputWallPaper.inputWallPaperNoFile(id: _1!)
+            }
+            else {
+                return nil
+            }
         }
     
     }
@@ -19163,6 +19513,7 @@ public extension Api {
         case botInlineMessageMediaGeo(flags: Int32, geo: Api.GeoPoint, heading: Int32?, period: Int32?, proximityNotificationRadius: Int32?, replyMarkup: Api.ReplyMarkup?)
         case botInlineMessageMediaVenue(flags: Int32, geo: Api.GeoPoint, title: String, address: String, provider: String, venueId: String, venueType: String, replyMarkup: Api.ReplyMarkup?)
         case botInlineMessageMediaContact(flags: Int32, phoneNumber: String, firstName: String, lastName: String, vcard: String, replyMarkup: Api.ReplyMarkup?)
+        case botInlineMessageMediaInvoice(flags: Int32, title: String, description: String, photo: Api.WebDocument?, currency: String, totalAmount: Int64, replyMarkup: Api.ReplyMarkup?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -19227,6 +19578,18 @@ public extension Api {
                     serializeString(vcard, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 2) != 0 {replyMarkup!.serialize(buffer, true)}
                     break
+                case .botInlineMessageMediaInvoice(let flags, let title, let description, let photo, let currency, let totalAmount, let replyMarkup):
+                    if boxed {
+                        buffer.appendInt32(894081801)
+                    }
+                    serializeInt32(flags, buffer: buffer, boxed: false)
+                    serializeString(title, buffer: buffer, boxed: false)
+                    serializeString(description, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 0) != 0 {photo!.serialize(buffer, true)}
+                    serializeString(currency, buffer: buffer, boxed: false)
+                    serializeInt64(totalAmount, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 2) != 0 {replyMarkup!.serialize(buffer, true)}
+                    break
     }
     }
     
@@ -19242,6 +19605,8 @@ public extension Api {
                 return ("botInlineMessageMediaVenue", [("flags", flags), ("geo", geo), ("title", title), ("address", address), ("provider", provider), ("venueId", venueId), ("venueType", venueType), ("replyMarkup", replyMarkup)])
                 case .botInlineMessageMediaContact(let flags, let phoneNumber, let firstName, let lastName, let vcard, let replyMarkup):
                 return ("botInlineMessageMediaContact", [("flags", flags), ("phoneNumber", phoneNumber), ("firstName", firstName), ("lastName", lastName), ("vcard", vcard), ("replyMarkup", replyMarkup)])
+                case .botInlineMessageMediaInvoice(let flags, let title, let description, let photo, let currency, let totalAmount, let replyMarkup):
+                return ("botInlineMessageMediaInvoice", [("flags", flags), ("title", title), ("description", description), ("photo", photo), ("currency", currency), ("totalAmount", totalAmount), ("replyMarkup", replyMarkup)])
     }
     }
     
@@ -19387,6 +19752,39 @@ public extension Api {
                 return nil
             }
         }
+        public static func parse_botInlineMessageMediaInvoice(_ reader: BufferReader) -> BotInlineMessage? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            var _2: String?
+            _2 = parseString(reader)
+            var _3: String?
+            _3 = parseString(reader)
+            var _4: Api.WebDocument?
+            if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() {
+                _4 = Api.parse(reader, signature: signature) as? Api.WebDocument
+            } }
+            var _5: String?
+            _5 = parseString(reader)
+            var _6: Int64?
+            _6 = reader.readInt64()
+            var _7: Api.ReplyMarkup?
+            if Int(_1!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() {
+                _7 = Api.parse(reader, signature: signature) as? Api.ReplyMarkup
+            } }
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            let _c3 = _3 != nil
+            let _c4 = (Int(_1!) & Int(1 << 0) == 0) || _4 != nil
+            let _c5 = _5 != nil
+            let _c6 = _6 != nil
+            let _c7 = (Int(_1!) & Int(1 << 2) == 0) || _7 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 {
+                return Api.BotInlineMessage.botInlineMessageMediaInvoice(flags: _1!, title: _2!, description: _3!, photo: _4, currency: _5!, totalAmount: _6!, replyMarkup: _7)
+            }
+            else {
+                return nil
+            }
+        }
     
     }
     public enum InputPeerNotifySettings: TypeConstructorDescription {
@@ -20369,6 +20767,7 @@ public extension Api {
         case messageActionGroupCall(flags: Int32, call: Api.InputGroupCall, duration: Int32?)
         case messageActionInviteToGroupCall(call: Api.InputGroupCall, users: [Int32])
         case messageActionSetMessagesTTL(period: Int32)
+        case messageActionGroupCallScheduled(call: Api.InputGroupCall, scheduleDate: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -20573,6 +20972,13 @@ public extension Api {
                     }
                     serializeInt32(period, buffer: buffer, boxed: false)
                     break
+                case .messageActionGroupCallScheduled(let call, let scheduleDate):
+                    if boxed {
+                        buffer.appendInt32(-1281329567)
+                    }
+                    call.serialize(buffer, true)
+                    serializeInt32(scheduleDate, buffer: buffer, boxed: false)
+                    break
     }
     }
     
@@ -20632,6 +21038,8 @@ public extension Api {
                 return ("messageActionInviteToGroupCall", [("call", call), ("users", users)])
                 case .messageActionSetMessagesTTL(let period):
                 return ("messageActionSetMessagesTTL", [("period", period)])
+                case .messageActionGroupCallScheduled(let call, let scheduleDate):
+                return ("messageActionGroupCallScheduled", [("call", call), ("scheduleDate", scheduleDate)])
     }
     }
     
@@ -20969,6 +21377,22 @@ public extension Api {
                 return nil
             }
         }
+        public static func parse_messageActionGroupCallScheduled(_ reader: BufferReader) -> MessageAction? {
+            var _1: Api.InputGroupCall?
+            if let signature = reader.readInt32() {
+                _1 = Api.parse(reader, signature: signature) as? Api.InputGroupCall
+            }
+            var _2: Int32?
+            _2 = reader.readInt32()
+            let _c1 = _1 != nil
+            let _c2 = _2 != nil
+            if _c1 && _c2 {
+                return Api.MessageAction.messageActionGroupCallScheduled(call: _1!, scheduleDate: _2!)
+            }
+            else {
+                return nil
+            }
+        }
     
     }
     public enum PhoneCall: TypeConstructorDescription {
@@ -21769,7 +22193,7 @@ public extension Api {
     }
     public enum UserProfilePhoto: TypeConstructorDescription {
         case userProfilePhotoEmpty
-        case userProfilePhoto(flags: Int32, photoId: Int64, photoSmall: Api.FileLocation, photoBig: Api.FileLocation, dcId: Int32)
+        case userProfilePhoto(flags: Int32, photoId: Int64, strippedThumb: Buffer?, dcId: Int32)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
@@ -21779,14 +22203,13 @@ public extension Api {
                     }
                     
                     break
-                case .userProfilePhoto(let flags, let photoId, let photoSmall, let photoBig, let dcId):
+                case .userProfilePhoto(let flags, let photoId, let strippedThumb, let dcId):
                     if boxed {
-                        buffer.appendInt32(1775479590)
+                        buffer.appendInt32(-2100168954)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeInt64(photoId, buffer: buffer, boxed: false)
-                    photoSmall.serialize(buffer, true)
-                    photoBig.serialize(buffer, true)
+                    if Int(flags) & Int(1 << 1) != 0 {serializeBytes(strippedThumb!, buffer: buffer, boxed: false)}
                     serializeInt32(dcId, buffer: buffer, boxed: false)
                     break
     }
@@ -21796,8 +22219,8 @@ public extension Api {
         switch self {
                 case .userProfilePhotoEmpty:
                 return ("userProfilePhotoEmpty", [])
-                case .userProfilePhoto(let flags, let photoId, let photoSmall, let photoBig, let dcId):
-                return ("userProfilePhoto", [("flags", flags), ("photoId", photoId), ("photoSmall", photoSmall), ("photoBig", photoBig), ("dcId", dcId)])
+                case .userProfilePhoto(let flags, let photoId, let strippedThumb, let dcId):
+                return ("userProfilePhoto", [("flags", flags), ("photoId", photoId), ("strippedThumb", strippedThumb), ("dcId", dcId)])
     }
     }
     
@@ -21809,23 +22232,16 @@ public extension Api {
             _1 = reader.readInt32()
             var _2: Int64?
             _2 = reader.readInt64()
-            var _3: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _3 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
-            var _4: Api.FileLocation?
-            if let signature = reader.readInt32() {
-                _4 = Api.parse(reader, signature: signature) as? Api.FileLocation
-            }
-            var _5: Int32?
-            _5 = reader.readInt32()
+            var _3: Buffer?
+            if Int(_1!) & Int(1 << 1) != 0 {_3 = parseBytes(reader) }
+            var _4: Int32?
+            _4 = reader.readInt32()
             let _c1 = _1 != nil
             let _c2 = _2 != nil
-            let _c3 = _3 != nil
+            let _c3 = (Int(_1!) & Int(1 << 1) == 0) || _3 != nil
             let _c4 = _4 != nil
-            let _c5 = _5 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 {
-                return Api.UserProfilePhoto.userProfilePhoto(flags: _1!, photoId: _2!, photoSmall: _3!, photoBig: _4!, dcId: _5!)
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.UserProfilePhoto.userProfilePhoto(flags: _1!, photoId: _2!, strippedThumb: _3, dcId: _4!)
             }
             else {
                 return nil
diff --git a/submodules/TelegramApi/Sources/Api3.swift b/submodules/TelegramApi/Sources/Api3.swift
index 7f9aceb2f5..da75f10e38 100644
--- a/submodules/TelegramApi/Sources/Api3.swift
+++ b/submodules/TelegramApi/Sources/Api3.swift
@@ -1,14 +1,14 @@
 public extension Api {
 public struct channels {
     public enum ChannelParticipants: TypeConstructorDescription {
-        case channelParticipants(count: Int32, participants: [Api.ChannelParticipant], users: [Api.User])
+        case channelParticipants(count: Int32, participants: [Api.ChannelParticipant], chats: [Api.Chat], users: [Api.User])
         case channelParticipantsNotModified
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .channelParticipants(let count, let participants, let users):
+                case .channelParticipants(let count, let participants, let chats, let users):
                     if boxed {
-                        buffer.appendInt32(-177282392)
+                        buffer.appendInt32(-1699676497)
                     }
                     serializeInt32(count, buffer: buffer, boxed: false)
                     buffer.appendInt32(481674261)
@@ -17,6 +17,11 @@ public struct channels {
                         item.serialize(buffer, true)
                     }
                     buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(chats.count))
+                    for item in chats {
+                        item.serialize(buffer, true)
+                    }
+                    buffer.appendInt32(481674261)
                     buffer.appendInt32(Int32(users.count))
                     for item in users {
                         item.serialize(buffer, true)
@@ -33,8 +38,8 @@ public struct channels {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .channelParticipants(let count, let participants, let users):
-                return ("channelParticipants", [("count", count), ("participants", participants), ("users", users)])
+                case .channelParticipants(let count, let participants, let chats, let users):
+                return ("channelParticipants", [("count", count), ("participants", participants), ("chats", chats), ("users", users)])
                 case .channelParticipantsNotModified:
                 return ("channelParticipantsNotModified", [])
     }
@@ -47,15 +52,20 @@ public struct channels {
             if let _ = reader.readInt32() {
                 _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.ChannelParticipant.self)
             }
-            var _3: [Api.User]?
+            var _3: [Api.Chat]?
             if let _ = reader.readInt32() {
-                _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
+                _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.Chat.self)
+            }
+            var _4: [Api.User]?
+            if let _ = reader.readInt32() {
+                _4 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
             }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
-            if _c1 && _c2 && _c3 {
-                return Api.channels.ChannelParticipants.channelParticipants(count: _1!, participants: _2!, users: _3!)
+            let _c4 = _4 != nil
+            if _c1 && _c2 && _c3 && _c4 {
+                return Api.channels.ChannelParticipants.channelParticipants(count: _1!, participants: _2!, chats: _3!, users: _4!)
             }
             else {
                 return nil
@@ -67,16 +77,21 @@ public struct channels {
     
     }
     public enum ChannelParticipant: TypeConstructorDescription {
-        case channelParticipant(participant: Api.ChannelParticipant, users: [Api.User])
+        case channelParticipant(participant: Api.ChannelParticipant, chats: [Api.Chat], users: [Api.User])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .channelParticipant(let participant, let users):
+                case .channelParticipant(let participant, let chats, let users):
                     if boxed {
-                        buffer.appendInt32(-791039645)
+                        buffer.appendInt32(-541588713)
                     }
                     participant.serialize(buffer, true)
                     buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(chats.count))
+                    for item in chats {
+                        item.serialize(buffer, true)
+                    }
+                    buffer.appendInt32(481674261)
                     buffer.appendInt32(Int32(users.count))
                     for item in users {
                         item.serialize(buffer, true)
@@ -87,8 +102,8 @@ public struct channels {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .channelParticipant(let participant, let users):
-                return ("channelParticipant", [("participant", participant), ("users", users)])
+                case .channelParticipant(let participant, let chats, let users):
+                return ("channelParticipant", [("participant", participant), ("chats", chats), ("users", users)])
     }
     }
     
@@ -97,14 +112,19 @@ public struct channels {
             if let signature = reader.readInt32() {
                 _1 = Api.parse(reader, signature: signature) as? Api.ChannelParticipant
             }
-            var _2: [Api.User]?
+            var _2: [Api.Chat]?
             if let _ = reader.readInt32() {
-                _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
+                _2 = Api.parseVector(reader, elementSignature: 0, elementType: Api.Chat.self)
+            }
+            var _3: [Api.User]?
+            if let _ = reader.readInt32() {
+                _3 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
             }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
-            if _c1 && _c2 {
-                return Api.channels.ChannelParticipant.channelParticipant(participant: _1!, users: _2!)
+            let _c3 = _3 != nil
+            if _c1 && _c2 && _c3 {
+                return Api.channels.ChannelParticipant.channelParticipant(participant: _1!, chats: _2!, users: _3!)
             }
             else {
                 return nil
@@ -281,15 +301,16 @@ public struct payments {
     
     }
     public enum PaymentForm: TypeConstructorDescription {
-        case paymentForm(flags: Int32, botId: Int32, invoice: Api.Invoice, providerId: Int32, url: String, nativeProvider: String?, nativeParams: Api.DataJSON?, savedInfo: Api.PaymentRequestedInfo?, savedCredentials: Api.PaymentSavedCredentials?, users: [Api.User])
+        case paymentForm(flags: Int32, formId: Int64, botId: Int32, invoice: Api.Invoice, providerId: Int32, url: String, nativeProvider: String?, nativeParams: Api.DataJSON?, savedInfo: Api.PaymentRequestedInfo?, savedCredentials: Api.PaymentSavedCredentials?, users: [Api.User])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .paymentForm(let flags, let botId, let invoice, let providerId, let url, let nativeProvider, let nativeParams, let savedInfo, let savedCredentials, let users):
+                case .paymentForm(let flags, let formId, let botId, let invoice, let providerId, let url, let nativeProvider, let nativeParams, let savedInfo, let savedCredentials, let users):
                     if boxed {
-                        buffer.appendInt32(1062645411)
+                        buffer.appendInt32(-1928649707)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
+                    serializeInt64(formId, buffer: buffer, boxed: false)
                     serializeInt32(botId, buffer: buffer, boxed: false)
                     invoice.serialize(buffer, true)
                     serializeInt32(providerId, buffer: buffer, boxed: false)
@@ -309,54 +330,57 @@ public struct payments {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .paymentForm(let flags, let botId, let invoice, let providerId, let url, let nativeProvider, let nativeParams, let savedInfo, let savedCredentials, let users):
-                return ("paymentForm", [("flags", flags), ("botId", botId), ("invoice", invoice), ("providerId", providerId), ("url", url), ("nativeProvider", nativeProvider), ("nativeParams", nativeParams), ("savedInfo", savedInfo), ("savedCredentials", savedCredentials), ("users", users)])
+                case .paymentForm(let flags, let formId, let botId, let invoice, let providerId, let url, let nativeProvider, let nativeParams, let savedInfo, let savedCredentials, let users):
+                return ("paymentForm", [("flags", flags), ("formId", formId), ("botId", botId), ("invoice", invoice), ("providerId", providerId), ("url", url), ("nativeProvider", nativeProvider), ("nativeParams", nativeParams), ("savedInfo", savedInfo), ("savedCredentials", savedCredentials), ("users", users)])
     }
     }
     
         public static func parse_paymentForm(_ reader: BufferReader) -> PaymentForm? {
             var _1: Int32?
             _1 = reader.readInt32()
-            var _2: Int32?
-            _2 = reader.readInt32()
-            var _3: Api.Invoice?
+            var _2: Int64?
+            _2 = reader.readInt64()
+            var _3: Int32?
+            _3 = reader.readInt32()
+            var _4: Api.Invoice?
             if let signature = reader.readInt32() {
-                _3 = Api.parse(reader, signature: signature) as? Api.Invoice
+                _4 = Api.parse(reader, signature: signature) as? Api.Invoice
             }
-            var _4: Int32?
-            _4 = reader.readInt32()
-            var _5: String?
-            _5 = parseString(reader)
+            var _5: Int32?
+            _5 = reader.readInt32()
             var _6: String?
-            if Int(_1!) & Int(1 << 4) != 0 {_6 = parseString(reader) }
-            var _7: Api.DataJSON?
+            _6 = parseString(reader)
+            var _7: String?
+            if Int(_1!) & Int(1 << 4) != 0 {_7 = parseString(reader) }
+            var _8: Api.DataJSON?
             if Int(_1!) & Int(1 << 4) != 0 {if let signature = reader.readInt32() {
-                _7 = Api.parse(reader, signature: signature) as? Api.DataJSON
+                _8 = Api.parse(reader, signature: signature) as? Api.DataJSON
             } }
-            var _8: Api.PaymentRequestedInfo?
+            var _9: Api.PaymentRequestedInfo?
             if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() {
-                _8 = Api.parse(reader, signature: signature) as? Api.PaymentRequestedInfo
+                _9 = Api.parse(reader, signature: signature) as? Api.PaymentRequestedInfo
             } }
-            var _9: Api.PaymentSavedCredentials?
+            var _10: Api.PaymentSavedCredentials?
             if Int(_1!) & Int(1 << 1) != 0 {if let signature = reader.readInt32() {
-                _9 = Api.parse(reader, signature: signature) as? Api.PaymentSavedCredentials
+                _10 = Api.parse(reader, signature: signature) as? Api.PaymentSavedCredentials
             } }
-            var _10: [Api.User]?
+            var _11: [Api.User]?
             if let _ = reader.readInt32() {
-                _10 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
+                _11 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
             }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
             let _c5 = _5 != nil
-            let _c6 = (Int(_1!) & Int(1 << 4) == 0) || _6 != nil
+            let _c6 = _6 != nil
             let _c7 = (Int(_1!) & Int(1 << 4) == 0) || _7 != nil
-            let _c8 = (Int(_1!) & Int(1 << 0) == 0) || _8 != nil
-            let _c9 = (Int(_1!) & Int(1 << 1) == 0) || _9 != nil
-            let _c10 = _10 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 {
-                return Api.payments.PaymentForm.paymentForm(flags: _1!, botId: _2!, invoice: _3!, providerId: _4!, url: _5!, nativeProvider: _6, nativeParams: _7, savedInfo: _8, savedCredentials: _9, users: _10!)
+            let _c8 = (Int(_1!) & Int(1 << 4) == 0) || _8 != nil
+            let _c9 = (Int(_1!) & Int(1 << 0) == 0) || _9 != nil
+            let _c10 = (Int(_1!) & Int(1 << 1) == 0) || _10 != nil
+            let _c11 = _11 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 {
+                return Api.payments.PaymentForm.paymentForm(flags: _1!, formId: _2!, botId: _3!, invoice: _4!, providerId: _5!, url: _6!, nativeProvider: _7, nativeParams: _8, savedInfo: _9, savedCredentials: _10, users: _11!)
             }
             else {
                 return nil
@@ -365,21 +389,25 @@ public struct payments {
     
     }
     public enum PaymentReceipt: TypeConstructorDescription {
-        case paymentReceipt(flags: Int32, date: Int32, botId: Int32, invoice: Api.Invoice, providerId: Int32, info: Api.PaymentRequestedInfo?, shipping: Api.ShippingOption?, currency: String, totalAmount: Int64, credentialsTitle: String, users: [Api.User])
+        case paymentReceipt(flags: Int32, date: Int32, botId: Int32, providerId: Int32, title: String, description: String, photo: Api.WebDocument?, invoice: Api.Invoice, info: Api.PaymentRequestedInfo?, shipping: Api.ShippingOption?, tipAmount: Int64?, currency: String, totalAmount: Int64, credentialsTitle: String, users: [Api.User])
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .paymentReceipt(let flags, let date, let botId, let invoice, let providerId, let info, let shipping, let currency, let totalAmount, let credentialsTitle, let users):
+                case .paymentReceipt(let flags, let date, let botId, let providerId, let title, let description, let photo, let invoice, let info, let shipping, let tipAmount, let currency, let totalAmount, let credentialsTitle, let users):
                     if boxed {
-                        buffer.appendInt32(1342771681)
+                        buffer.appendInt32(280319440)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeInt32(date, buffer: buffer, boxed: false)
                     serializeInt32(botId, buffer: buffer, boxed: false)
-                    invoice.serialize(buffer, true)
                     serializeInt32(providerId, buffer: buffer, boxed: false)
+                    serializeString(title, buffer: buffer, boxed: false)
+                    serializeString(description, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 2) != 0 {photo!.serialize(buffer, true)}
+                    invoice.serialize(buffer, true)
                     if Int(flags) & Int(1 << 0) != 0 {info!.serialize(buffer, true)}
                     if Int(flags) & Int(1 << 1) != 0 {shipping!.serialize(buffer, true)}
+                    if Int(flags) & Int(1 << 3) != 0 {serializeInt64(tipAmount!, buffer: buffer, boxed: false)}
                     serializeString(currency, buffer: buffer, boxed: false)
                     serializeInt64(totalAmount, buffer: buffer, boxed: false)
                     serializeString(credentialsTitle, buffer: buffer, boxed: false)
@@ -394,8 +422,8 @@ public struct payments {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .paymentReceipt(let flags, let date, let botId, let invoice, let providerId, let info, let shipping, let currency, let totalAmount, let credentialsTitle, let users):
-                return ("paymentReceipt", [("flags", flags), ("date", date), ("botId", botId), ("invoice", invoice), ("providerId", providerId), ("info", info), ("shipping", shipping), ("currency", currency), ("totalAmount", totalAmount), ("credentialsTitle", credentialsTitle), ("users", users)])
+                case .paymentReceipt(let flags, let date, let botId, let providerId, let title, let description, let photo, let invoice, let info, let shipping, let tipAmount, let currency, let totalAmount, let credentialsTitle, let users):
+                return ("paymentReceipt", [("flags", flags), ("date", date), ("botId", botId), ("providerId", providerId), ("title", title), ("description", description), ("photo", photo), ("invoice", invoice), ("info", info), ("shipping", shipping), ("tipAmount", tipAmount), ("currency", currency), ("totalAmount", totalAmount), ("credentialsTitle", credentialsTitle), ("users", users)])
     }
     }
     
@@ -406,43 +434,57 @@ public struct payments {
             _2 = reader.readInt32()
             var _3: Int32?
             _3 = reader.readInt32()
-            var _4: Api.Invoice?
+            var _4: Int32?
+            _4 = reader.readInt32()
+            var _5: String?
+            _5 = parseString(reader)
+            var _6: String?
+            _6 = parseString(reader)
+            var _7: Api.WebDocument?
+            if Int(_1!) & Int(1 << 2) != 0 {if let signature = reader.readInt32() {
+                _7 = Api.parse(reader, signature: signature) as? Api.WebDocument
+            } }
+            var _8: Api.Invoice?
             if let signature = reader.readInt32() {
-                _4 = Api.parse(reader, signature: signature) as? Api.Invoice
+                _8 = Api.parse(reader, signature: signature) as? Api.Invoice
             }
-            var _5: Int32?
-            _5 = reader.readInt32()
-            var _6: Api.PaymentRequestedInfo?
+            var _9: Api.PaymentRequestedInfo?
             if Int(_1!) & Int(1 << 0) != 0 {if let signature = reader.readInt32() {
-                _6 = Api.parse(reader, signature: signature) as? Api.PaymentRequestedInfo
+                _9 = Api.parse(reader, signature: signature) as? Api.PaymentRequestedInfo
             } }
-            var _7: Api.ShippingOption?
+            var _10: Api.ShippingOption?
             if Int(_1!) & Int(1 << 1) != 0 {if let signature = reader.readInt32() {
-                _7 = Api.parse(reader, signature: signature) as? Api.ShippingOption
+                _10 = Api.parse(reader, signature: signature) as? Api.ShippingOption
             } }
-            var _8: String?
-            _8 = parseString(reader)
-            var _9: Int64?
-            _9 = reader.readInt64()
-            var _10: String?
-            _10 = parseString(reader)
-            var _11: [Api.User]?
+            var _11: Int64?
+            if Int(_1!) & Int(1 << 3) != 0 {_11 = reader.readInt64() }
+            var _12: String?
+            _12 = parseString(reader)
+            var _13: Int64?
+            _13 = reader.readInt64()
+            var _14: String?
+            _14 = parseString(reader)
+            var _15: [Api.User]?
             if let _ = reader.readInt32() {
-                _11 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
+                _15 = Api.parseVector(reader, elementSignature: 0, elementType: Api.User.self)
             }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
             let _c4 = _4 != nil
             let _c5 = _5 != nil
-            let _c6 = (Int(_1!) & Int(1 << 0) == 0) || _6 != nil
-            let _c7 = (Int(_1!) & Int(1 << 1) == 0) || _7 != nil
+            let _c6 = _6 != nil
+            let _c7 = (Int(_1!) & Int(1 << 2) == 0) || _7 != nil
             let _c8 = _8 != nil
-            let _c9 = _9 != nil
-            let _c10 = _10 != nil
-            let _c11 = _11 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 {
-                return Api.payments.PaymentReceipt.paymentReceipt(flags: _1!, date: _2!, botId: _3!, invoice: _4!, providerId: _5!, info: _6, shipping: _7, currency: _8!, totalAmount: _9!, credentialsTitle: _10!, users: _11!)
+            let _c9 = (Int(_1!) & Int(1 << 0) == 0) || _9 != nil
+            let _c10 = (Int(_1!) & Int(1 << 1) == 0) || _10 != nil
+            let _c11 = (Int(_1!) & Int(1 << 3) == 0) || _11 != nil
+            let _c12 = _12 != nil
+            let _c13 = _13 != nil
+            let _c14 = _14 != nil
+            let _c15 = _15 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 && _c11 && _c12 && _c13 && _c14 && _c15 {
+                return Api.payments.PaymentReceipt.paymentReceipt(flags: _1!, date: _2!, botId: _3!, providerId: _4!, title: _5!, description: _6!, photo: _7, invoice: _8!, info: _9, shipping: _10, tipAmount: _11, currency: _12!, totalAmount: _13!, credentialsTitle: _14!, users: _15!)
             }
             else {
                 return nil
@@ -1773,14 +1815,14 @@ public struct help {
     
     }
     public enum AppUpdate: TypeConstructorDescription {
-        case appUpdate(flags: Int32, id: Int32, version: String, text: String, entities: [Api.MessageEntity], document: Api.Document?, url: String?)
+        case appUpdate(flags: Int32, id: Int32, version: String, text: String, entities: [Api.MessageEntity], document: Api.Document?, url: String?, sticker: Api.Document?)
         case noAppUpdate
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .appUpdate(let flags, let id, let version, let text, let entities, let document, let url):
+                case .appUpdate(let flags, let id, let version, let text, let entities, let document, let url, let sticker):
                     if boxed {
-                        buffer.appendInt32(497489295)
+                        buffer.appendInt32(-860107216)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeInt32(id, buffer: buffer, boxed: false)
@@ -1793,6 +1835,7 @@ public struct help {
                     }
                     if Int(flags) & Int(1 << 1) != 0 {document!.serialize(buffer, true)}
                     if Int(flags) & Int(1 << 2) != 0 {serializeString(url!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 3) != 0 {sticker!.serialize(buffer, true)}
                     break
                 case .noAppUpdate:
                     if boxed {
@@ -1805,8 +1848,8 @@ public struct help {
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .appUpdate(let flags, let id, let version, let text, let entities, let document, let url):
-                return ("appUpdate", [("flags", flags), ("id", id), ("version", version), ("text", text), ("entities", entities), ("document", document), ("url", url)])
+                case .appUpdate(let flags, let id, let version, let text, let entities, let document, let url, let sticker):
+                return ("appUpdate", [("flags", flags), ("id", id), ("version", version), ("text", text), ("entities", entities), ("document", document), ("url", url), ("sticker", sticker)])
                 case .noAppUpdate:
                 return ("noAppUpdate", [])
     }
@@ -1831,6 +1874,10 @@ public struct help {
             } }
             var _7: String?
             if Int(_1!) & Int(1 << 2) != 0 {_7 = parseString(reader) }
+            var _8: Api.Document?
+            if Int(_1!) & Int(1 << 3) != 0 {if let signature = reader.readInt32() {
+                _8 = Api.parse(reader, signature: signature) as? Api.Document
+            } }
             let _c1 = _1 != nil
             let _c2 = _2 != nil
             let _c3 = _3 != nil
@@ -1838,8 +1885,9 @@ public struct help {
             let _c5 = _5 != nil
             let _c6 = (Int(_1!) & Int(1 << 1) == 0) || _6 != nil
             let _c7 = (Int(_1!) & Int(1 << 2) == 0) || _7 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 {
-                return Api.help.AppUpdate.appUpdate(flags: _1!, id: _2!, version: _3!, text: _4!, entities: _5!, document: _6, url: _7)
+            let _c8 = (Int(_1!) & Int(1 << 3) == 0) || _8 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 {
+                return Api.help.AppUpdate.appUpdate(flags: _1!, id: _2!, version: _3!, text: _4!, entities: _5!, document: _6, url: _7, sticker: _8)
             }
             else {
                 return nil
diff --git a/submodules/TelegramApi/Sources/Api4.swift b/submodules/TelegramApi/Sources/Api4.swift
index 3e22875d1c..fbbd0ce0df 100644
--- a/submodules/TelegramApi/Sources/Api4.swift
+++ b/submodules/TelegramApi/Sources/Api4.swift
@@ -621,6 +621,44 @@ public struct upload {
 }
 }
 public extension Api {
+public struct stickers {
+    public enum SuggestedShortName: TypeConstructorDescription {
+        case suggestedShortName(shortName: String)
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .suggestedShortName(let shortName):
+                    if boxed {
+                        buffer.appendInt32(-2046910401)
+                    }
+                    serializeString(shortName, buffer: buffer, boxed: false)
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .suggestedShortName(let shortName):
+                return ("suggestedShortName", [("shortName", shortName)])
+    }
+    }
+    
+        public static func parse_suggestedShortName(_ reader: BufferReader) -> SuggestedShortName? {
+            var _1: String?
+            _1 = parseString(reader)
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.stickers.SuggestedShortName.suggestedShortName(shortName: _1!)
+            }
+            else {
+                return nil
+            }
+        }
+    
+    }
+}
+}
+public extension Api {
 public struct storage {
     public enum FileType: TypeConstructorDescription {
         case fileUnknown
@@ -1133,6 +1171,72 @@ public struct account {
             }
         }
     
+    }
+    public enum ResetPasswordResult: TypeConstructorDescription {
+        case resetPasswordFailedWait(retryDate: Int32)
+        case resetPasswordRequestedWait(untilDate: Int32)
+        case resetPasswordOk
+    
+    public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
+    switch self {
+                case .resetPasswordFailedWait(let retryDate):
+                    if boxed {
+                        buffer.appendInt32(-478701471)
+                    }
+                    serializeInt32(retryDate, buffer: buffer, boxed: false)
+                    break
+                case .resetPasswordRequestedWait(let untilDate):
+                    if boxed {
+                        buffer.appendInt32(-370148227)
+                    }
+                    serializeInt32(untilDate, buffer: buffer, boxed: false)
+                    break
+                case .resetPasswordOk:
+                    if boxed {
+                        buffer.appendInt32(-383330754)
+                    }
+                    
+                    break
+    }
+    }
+    
+    public func descriptionFields() -> (String, [(String, Any)]) {
+        switch self {
+                case .resetPasswordFailedWait(let retryDate):
+                return ("resetPasswordFailedWait", [("retryDate", retryDate)])
+                case .resetPasswordRequestedWait(let untilDate):
+                return ("resetPasswordRequestedWait", [("untilDate", untilDate)])
+                case .resetPasswordOk:
+                return ("resetPasswordOk", [])
+    }
+    }
+    
+        public static func parse_resetPasswordFailedWait(_ reader: BufferReader) -> ResetPasswordResult? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.account.ResetPasswordResult.resetPasswordFailedWait(retryDate: _1!)
+            }
+            else {
+                return nil
+            }
+        }
+        public static func parse_resetPasswordRequestedWait(_ reader: BufferReader) -> ResetPasswordResult? {
+            var _1: Int32?
+            _1 = reader.readInt32()
+            let _c1 = _1 != nil
+            if _c1 {
+                return Api.account.ResetPasswordResult.resetPasswordRequestedWait(untilDate: _1!)
+            }
+            else {
+                return nil
+            }
+        }
+        public static func parse_resetPasswordOk(_ reader: BufferReader) -> ResetPasswordResult? {
+            return Api.account.ResetPasswordResult.resetPasswordOk
+        }
+    
     }
     public enum ContentSettings: TypeConstructorDescription {
         case contentSettings(flags: Int32)
@@ -1287,13 +1391,13 @@ public struct account {
     
     }
     public enum Password: TypeConstructorDescription {
-        case password(flags: Int32, currentAlgo: Api.PasswordKdfAlgo?, srpB: Buffer?, srpId: Int64?, hint: String?, emailUnconfirmedPattern: String?, newAlgo: Api.PasswordKdfAlgo, newSecureAlgo: Api.SecurePasswordKdfAlgo, secureRandom: Buffer)
+        case password(flags: Int32, currentAlgo: Api.PasswordKdfAlgo?, srpB: Buffer?, srpId: Int64?, hint: String?, emailUnconfirmedPattern: String?, newAlgo: Api.PasswordKdfAlgo, newSecureAlgo: Api.SecurePasswordKdfAlgo, secureRandom: Buffer, pendingResetDate: Int32?)
     
     public func serialize(_ buffer: Buffer, _ boxed: Swift.Bool) {
     switch self {
-                case .password(let flags, let currentAlgo, let srpB, let srpId, let hint, let emailUnconfirmedPattern, let newAlgo, let newSecureAlgo, let secureRandom):
+                case .password(let flags, let currentAlgo, let srpB, let srpId, let hint, let emailUnconfirmedPattern, let newAlgo, let newSecureAlgo, let secureRandom, let pendingResetDate):
                     if boxed {
-                        buffer.appendInt32(-1390001672)
+                        buffer.appendInt32(408623183)
                     }
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 2) != 0 {currentAlgo!.serialize(buffer, true)}
@@ -1304,14 +1408,15 @@ public struct account {
                     newAlgo.serialize(buffer, true)
                     newSecureAlgo.serialize(buffer, true)
                     serializeBytes(secureRandom, buffer: buffer, boxed: false)
+                    if Int(flags) & Int(1 << 5) != 0 {serializeInt32(pendingResetDate!, buffer: buffer, boxed: false)}
                     break
     }
     }
     
     public func descriptionFields() -> (String, [(String, Any)]) {
         switch self {
-                case .password(let flags, let currentAlgo, let srpB, let srpId, let hint, let emailUnconfirmedPattern, let newAlgo, let newSecureAlgo, let secureRandom):
-                return ("password", [("flags", flags), ("currentAlgo", currentAlgo), ("srpB", srpB), ("srpId", srpId), ("hint", hint), ("emailUnconfirmedPattern", emailUnconfirmedPattern), ("newAlgo", newAlgo), ("newSecureAlgo", newSecureAlgo), ("secureRandom", secureRandom)])
+                case .password(let flags, let currentAlgo, let srpB, let srpId, let hint, let emailUnconfirmedPattern, let newAlgo, let newSecureAlgo, let secureRandom, let pendingResetDate):
+                return ("password", [("flags", flags), ("currentAlgo", currentAlgo), ("srpB", srpB), ("srpId", srpId), ("hint", hint), ("emailUnconfirmedPattern", emailUnconfirmedPattern), ("newAlgo", newAlgo), ("newSecureAlgo", newSecureAlgo), ("secureRandom", secureRandom), ("pendingResetDate", pendingResetDate)])
     }
     }
     
@@ -1340,6 +1445,8 @@ public struct account {
             }
             var _9: Buffer?
             _9 = parseBytes(reader)
+            var _10: Int32?
+            if Int(_1!) & Int(1 << 5) != 0 {_10 = reader.readInt32() }
             let _c1 = _1 != nil
             let _c2 = (Int(_1!) & Int(1 << 2) == 0) || _2 != nil
             let _c3 = (Int(_1!) & Int(1 << 2) == 0) || _3 != nil
@@ -1349,8 +1456,9 @@ public struct account {
             let _c7 = _7 != nil
             let _c8 = _8 != nil
             let _c9 = _9 != nil
-            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 {
-                return Api.account.Password.password(flags: _1!, currentAlgo: _2, srpB: _3, srpId: _4, hint: _5, emailUnconfirmedPattern: _6, newAlgo: _7!, newSecureAlgo: _8!, secureRandom: _9!)
+            let _c10 = (Int(_1!) & Int(1 << 5) == 0) || _10 != nil
+            if _c1 && _c2 && _c3 && _c4 && _c5 && _c6 && _c7 && _c8 && _c9 && _c10 {
+                return Api.account.Password.password(flags: _1!, currentAlgo: _2, srpB: _3, srpId: _4, hint: _5, emailUnconfirmedPattern: _6, newAlgo: _7!, newSecureAlgo: _8!, secureRandom: _9!, pendingResetDate: _10)
             }
             else {
                 return nil
@@ -4376,12 +4484,12 @@ public extension Api {
                     })
                 }
             
-                public static func getParticipant(channel: Api.InputChannel, userId: Api.InputUser) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.channels.ChannelParticipant>) {
+                public static func getParticipant(channel: Api.InputChannel, participant: Api.InputPeer) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.channels.ChannelParticipant>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(1416484774)
+                    buffer.appendInt32(-1599378234)
                     channel.serialize(buffer, true)
-                    userId.serialize(buffer, true)
-                    return (FunctionDescription(name: "channels.getParticipant", parameters: [("channel", channel), ("userId", userId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.channels.ChannelParticipant? in
+                    participant.serialize(buffer, true)
+                    return (FunctionDescription(name: "channels.getParticipant", parameters: [("channel", channel), ("participant", participant)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.channels.ChannelParticipant? in
                         let reader = BufferReader(buffer)
                         var result: Api.channels.ChannelParticipant?
                         if let signature = reader.readInt32() {
@@ -4624,13 +4732,13 @@ public extension Api {
                     })
                 }
             
-                public static func editBanned(channel: Api.InputChannel, userId: Api.InputUser, bannedRights: Api.ChatBannedRights) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                public static func editBanned(channel: Api.InputChannel, participant: Api.InputPeer, bannedRights: Api.ChatBannedRights) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(1920559378)
+                    buffer.appendInt32(-1763259007)
                     channel.serialize(buffer, true)
-                    userId.serialize(buffer, true)
+                    participant.serialize(buffer, true)
                     bannedRights.serialize(buffer, true)
-                    return (FunctionDescription(name: "channels.editBanned", parameters: [("channel", channel), ("userId", userId), ("bannedRights", bannedRights)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                    return (FunctionDescription(name: "channels.editBanned", parameters: [("channel", channel), ("participant", participant), ("bannedRights", bannedRights)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
                         let reader = BufferReader(buffer)
                         var result: Api.Updates?
                         if let signature = reader.readInt32() {
@@ -4848,11 +4956,14 @@ public extension Api {
                 }
             }
             public struct payments {
-                public static func getPaymentForm(msgId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentForm>) {
+                public static func getPaymentForm(flags: Int32, peer: Api.InputPeer, msgId: Int32, themeParams: Api.DataJSON?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentForm>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-1712285883)
+                    buffer.appendInt32(-1976353651)
+                    serializeInt32(flags, buffer: buffer, boxed: false)
+                    peer.serialize(buffer, true)
                     serializeInt32(msgId, buffer: buffer, boxed: false)
-                    return (FunctionDescription(name: "payments.getPaymentForm", parameters: [("msgId", msgId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentForm? in
+                    if Int(flags) & Int(1 << 0) != 0 {themeParams!.serialize(buffer, true)}
+                    return (FunctionDescription(name: "payments.getPaymentForm", parameters: [("flags", flags), ("peer", peer), ("msgId", msgId), ("themeParams", themeParams)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentForm? in
                         let reader = BufferReader(buffer)
                         var result: Api.payments.PaymentForm?
                         if let signature = reader.readInt32() {
@@ -4862,11 +4973,12 @@ public extension Api {
                     })
                 }
             
-                public static func getPaymentReceipt(msgId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentReceipt>) {
+                public static func getPaymentReceipt(peer: Api.InputPeer, msgId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentReceipt>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-1601001088)
+                    buffer.appendInt32(611897804)
+                    peer.serialize(buffer, true)
                     serializeInt32(msgId, buffer: buffer, boxed: false)
-                    return (FunctionDescription(name: "payments.getPaymentReceipt", parameters: [("msgId", msgId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentReceipt? in
+                    return (FunctionDescription(name: "payments.getPaymentReceipt", parameters: [("peer", peer), ("msgId", msgId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentReceipt? in
                         let reader = BufferReader(buffer)
                         var result: Api.payments.PaymentReceipt?
                         if let signature = reader.readInt32() {
@@ -4876,13 +4988,14 @@ public extension Api {
                     })
                 }
             
-                public static func validateRequestedInfo(flags: Int32, msgId: Int32, info: Api.PaymentRequestedInfo) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.ValidatedRequestedInfo>) {
+                public static func validateRequestedInfo(flags: Int32, peer: Api.InputPeer, msgId: Int32, info: Api.PaymentRequestedInfo) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.ValidatedRequestedInfo>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(1997180532)
+                    buffer.appendInt32(-619695760)
                     serializeInt32(flags, buffer: buffer, boxed: false)
+                    peer.serialize(buffer, true)
                     serializeInt32(msgId, buffer: buffer, boxed: false)
                     info.serialize(buffer, true)
-                    return (FunctionDescription(name: "payments.validateRequestedInfo", parameters: [("flags", flags), ("msgId", msgId), ("info", info)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.ValidatedRequestedInfo? in
+                    return (FunctionDescription(name: "payments.validateRequestedInfo", parameters: [("flags", flags), ("peer", peer), ("msgId", msgId), ("info", info)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.ValidatedRequestedInfo? in
                         let reader = BufferReader(buffer)
                         var result: Api.payments.ValidatedRequestedInfo?
                         if let signature = reader.readInt32() {
@@ -4892,15 +5005,18 @@ public extension Api {
                     })
                 }
             
-                public static func sendPaymentForm(flags: Int32, msgId: Int32, requestedInfoId: String?, shippingOptionId: String?, credentials: Api.InputPaymentCredentials) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentResult>) {
+                public static func sendPaymentForm(flags: Int32, formId: Int64, peer: Api.InputPeer, msgId: Int32, requestedInfoId: String?, shippingOptionId: String?, credentials: Api.InputPaymentCredentials, tipAmount: Int64?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.payments.PaymentResult>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(730364339)
+                    buffer.appendInt32(818134173)
                     serializeInt32(flags, buffer: buffer, boxed: false)
+                    serializeInt64(formId, buffer: buffer, boxed: false)
+                    peer.serialize(buffer, true)
                     serializeInt32(msgId, buffer: buffer, boxed: false)
                     if Int(flags) & Int(1 << 0) != 0 {serializeString(requestedInfoId!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 1) != 0 {serializeString(shippingOptionId!, buffer: buffer, boxed: false)}
                     credentials.serialize(buffer, true)
-                    return (FunctionDescription(name: "payments.sendPaymentForm", parameters: [("flags", flags), ("msgId", msgId), ("requestedInfoId", requestedInfoId), ("shippingOptionId", shippingOptionId), ("credentials", credentials)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentResult? in
+                    if Int(flags) & Int(1 << 2) != 0 {serializeInt64(tipAmount!, buffer: buffer, boxed: false)}
+                    return (FunctionDescription(name: "payments.sendPaymentForm", parameters: [("flags", flags), ("formId", formId), ("peer", peer), ("msgId", msgId), ("requestedInfoId", requestedInfoId), ("shippingOptionId", shippingOptionId), ("credentials", credentials), ("tipAmount", tipAmount)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.payments.PaymentResult? in
                         let reader = BufferReader(buffer)
                         var result: Api.payments.PaymentResult?
                         if let signature = reader.readInt32() {
@@ -5204,11 +5320,13 @@ public extension Api {
                     })
                 }
             
-                public static func recoverPassword(code: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.auth.Authorization>) {
+                public static func recoverPassword(flags: Int32, code: String, newSettings: Api.account.PasswordInputSettings?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.auth.Authorization>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(1319464594)
+                    buffer.appendInt32(923364464)
+                    serializeInt32(flags, buffer: buffer, boxed: false)
                     serializeString(code, buffer: buffer, boxed: false)
-                    return (FunctionDescription(name: "auth.recoverPassword", parameters: [("code", code)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.auth.Authorization? in
+                    if Int(flags) & Int(1 << 0) != 0 {newSettings!.serialize(buffer, true)}
+                    return (FunctionDescription(name: "auth.recoverPassword", parameters: [("flags", flags), ("code", code), ("newSettings", newSettings)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.auth.Authorization? in
                         let reader = BufferReader(buffer)
                         var result: Api.auth.Authorization?
                         if let signature = reader.readInt32() {
@@ -5313,6 +5431,20 @@ public extension Api {
                         return result
                     })
                 }
+            
+                public static func checkRecoveryPassword(code: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(221691769)
+                    serializeString(code, buffer: buffer, boxed: false)
+                    return (FunctionDescription(name: "auth.checkRecoveryPassword", parameters: [("code", code)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Bool?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        }
+                        return result
+                    })
+                }
             }
             public struct bots {
                 public static func sendCustomRequest(customMethod: String, params: Api.DataJSON) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.DataJSON>) {
@@ -5345,15 +5477,17 @@ public extension Api {
                     })
                 }
             
-                public static func setBotCommands(commands: [Api.BotCommand]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                public static func setBotCommands(scope: Api.BotCommandScope, langCode: String, commands: [Api.BotCommand]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-2141370634)
+                    buffer.appendInt32(85399130)
+                    scope.serialize(buffer, true)
+                    serializeString(langCode, buffer: buffer, boxed: false)
                     buffer.appendInt32(481674261)
                     buffer.appendInt32(Int32(commands.count))
                     for item in commands {
                         item.serialize(buffer, true)
                     }
-                    return (FunctionDescription(name: "bots.setBotCommands", parameters: [("commands", commands)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                    return (FunctionDescription(name: "bots.setBotCommands", parameters: [("scope", scope), ("langCode", langCode), ("commands", commands)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
                         let reader = BufferReader(buffer)
                         var result: Api.Bool?
                         if let signature = reader.readInt32() {
@@ -5362,6 +5496,36 @@ public extension Api {
                         return result
                     })
                 }
+            
+                public static func resetBotCommands(scope: Api.BotCommandScope, langCode: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(1032708345)
+                    scope.serialize(buffer, true)
+                    serializeString(langCode, buffer: buffer, boxed: false)
+                    return (FunctionDescription(name: "bots.resetBotCommands", parameters: [("scope", scope), ("langCode", langCode)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Bool?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        }
+                        return result
+                    })
+                }
+            
+                public static func getBotCommands(scope: Api.BotCommandScope, langCode: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.BotCommand]>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(-481554986)
+                    scope.serialize(buffer, true)
+                    serializeString(langCode, buffer: buffer, boxed: false)
+                    return (FunctionDescription(name: "bots.getBotCommands", parameters: [("scope", scope), ("langCode", langCode)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> [Api.BotCommand]? in
+                        let reader = BufferReader(buffer)
+                        var result: [Api.BotCommand]?
+                        if let _ = reader.readInt32() {
+                            result = Api.parseVector(reader, elementSignature: 0, elementType: Api.BotCommand.self)
+                        }
+                        return result
+                    })
+                }
             }
             public struct users {
                 public static func getUsers(id: [Api.InputUser]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Api.User]>) {
@@ -6270,9 +6434,9 @@ public extension Api {
                 }
             }
             public struct stickers {
-                public static func createStickerSet(flags: Int32, userId: Api.InputUser, title: String, shortName: String, thumb: Api.InputDocument?, stickers: [Api.InputStickerSetItem]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.messages.StickerSet>) {
+                public static func createStickerSet(flags: Int32, userId: Api.InputUser, title: String, shortName: String, thumb: Api.InputDocument?, stickers: [Api.InputStickerSetItem], software: String?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.messages.StickerSet>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-251435136)
+                    buffer.appendInt32(-1876841625)
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     userId.serialize(buffer, true)
                     serializeString(title, buffer: buffer, boxed: false)
@@ -6283,7 +6447,8 @@ public extension Api {
                     for item in stickers {
                         item.serialize(buffer, true)
                     }
-                    return (FunctionDescription(name: "stickers.createStickerSet", parameters: [("flags", flags), ("userId", userId), ("title", title), ("shortName", shortName), ("thumb", thumb), ("stickers", stickers)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.messages.StickerSet? in
+                    if Int(flags) & Int(1 << 3) != 0 {serializeString(software!, buffer: buffer, boxed: false)}
+                    return (FunctionDescription(name: "stickers.createStickerSet", parameters: [("flags", flags), ("userId", userId), ("title", title), ("shortName", shortName), ("thumb", thumb), ("stickers", stickers), ("software", software)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.messages.StickerSet? in
                         let reader = BufferReader(buffer)
                         var result: Api.messages.StickerSet?
                         if let signature = reader.readInt32() {
@@ -6351,6 +6516,34 @@ public extension Api {
                         return result
                     })
                 }
+            
+                public static func checkShortName(shortName: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(676017721)
+                    serializeString(shortName, buffer: buffer, boxed: false)
+                    return (FunctionDescription(name: "stickers.checkShortName", parameters: [("shortName", shortName)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Bool?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        }
+                        return result
+                    })
+                }
+            
+                public static func suggestShortName(title: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.stickers.SuggestedShortName>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(1303364867)
+                    serializeString(title, buffer: buffer, boxed: false)
+                    return (FunctionDescription(name: "stickers.suggestShortName", parameters: [("title", title)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.stickers.SuggestedShortName? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.stickers.SuggestedShortName?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.stickers.SuggestedShortName
+                        }
+                        return result
+                    })
+                }
             }
             public struct account {
                 public static func registerDevice(flags: Int32, tokenType: Int32, token: String, appSandbox: Api.Bool, secret: Buffer, otherUids: [Int32]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
@@ -7395,6 +7588,34 @@ public extension Api {
                         return result
                     })
                 }
+            
+                public static func resetPassword() -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.account.ResetPasswordResult>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(-1828139493)
+                    
+                    return (FunctionDescription(name: "account.resetPassword", parameters: []), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.account.ResetPasswordResult? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.account.ResetPasswordResult?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.account.ResetPasswordResult
+                        }
+                        return result
+                    })
+                }
+            
+                public static func declinePasswordReset() -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(1284770294)
+                    
+                    return (FunctionDescription(name: "account.declinePasswordReset", parameters: []), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Bool?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        }
+                        return result
+                    })
+                }
             }
             public struct langpack {
                 public static func getLangPack(langPack: String, langCode: String) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.LangPackDifference>) {
@@ -7689,12 +7910,15 @@ public extension Api {
                     })
                 }
             
-                public static func createGroupCall(peer: Api.InputPeer, randomId: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                public static func createGroupCall(flags: Int32, peer: Api.InputPeer, randomId: Int32, title: String?, scheduleDate: Int32?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-1120031776)
+                    buffer.appendInt32(1221445336)
+                    serializeInt32(flags, buffer: buffer, boxed: false)
                     peer.serialize(buffer, true)
                     serializeInt32(randomId, buffer: buffer, boxed: false)
-                    return (FunctionDescription(name: "phone.createGroupCall", parameters: [("peer", peer), ("randomId", randomId)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                    if Int(flags) & Int(1 << 0) != 0 {serializeString(title!, buffer: buffer, boxed: false)}
+                    if Int(flags) & Int(1 << 1) != 0 {serializeInt32(scheduleDate!, buffer: buffer, boxed: false)}
+                    return (FunctionDescription(name: "phone.createGroupCall", parameters: [("flags", flags), ("peer", peer), ("randomId", randomId), ("title", title), ("scheduleDate", scheduleDate)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
                         let reader = BufferReader(buffer)
                         var result: Api.Updates?
                         if let signature = reader.readInt32() {
@@ -7826,16 +8050,20 @@ public extension Api {
                     })
                 }
             
-                public static func checkGroupCall(call: Api.InputGroupCall, source: Int32) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                public static func checkGroupCall(call: Api.InputGroupCall, sources: [Int32]) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<[Int32]>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-1219855382)
+                    buffer.appendInt32(-1248003721)
                     call.serialize(buffer, true)
-                    serializeInt32(source, buffer: buffer, boxed: false)
-                    return (FunctionDescription(name: "phone.checkGroupCall", parameters: [("call", call), ("source", source)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                    buffer.appendInt32(481674261)
+                    buffer.appendInt32(Int32(sources.count))
+                    for item in sources {
+                        serializeInt32(item, buffer: buffer, boxed: false)
+                    }
+                    return (FunctionDescription(name: "phone.checkGroupCall", parameters: [("call", call), ("sources", sources)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> [Int32]? in
                         let reader = BufferReader(buffer)
-                        var result: Api.Bool?
-                        if let signature = reader.readInt32() {
-                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        var result: [Int32]?
+                        if let _ = reader.readInt32() {
+                            result = Api.parseVector(reader, elementSignature: -1471112230, elementType: Int32.self)
                         }
                         return result
                     })
@@ -7857,15 +8085,19 @@ public extension Api {
                     })
                 }
             
-                public static func editGroupCallParticipant(flags: Int32, call: Api.InputGroupCall, participant: Api.InputPeer, volume: Int32?, raiseHand: Api.Bool?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                public static func editGroupCallParticipant(flags: Int32, call: Api.InputGroupCall, participant: Api.InputPeer, muted: Api.Bool?, volume: Int32?, raiseHand: Api.Bool?, videoStopped: Api.Bool?, videoPaused: Api.Bool?, presentationPaused: Api.Bool?) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
                     let buffer = Buffer()
-                    buffer.appendInt32(-646583424)
+                    buffer.appendInt32(-1524155713)
                     serializeInt32(flags, buffer: buffer, boxed: false)
                     call.serialize(buffer, true)
                     participant.serialize(buffer, true)
+                    if Int(flags) & Int(1 << 0) != 0 {muted!.serialize(buffer, true)}
                     if Int(flags) & Int(1 << 1) != 0 {serializeInt32(volume!, buffer: buffer, boxed: false)}
                     if Int(flags) & Int(1 << 2) != 0 {raiseHand!.serialize(buffer, true)}
-                    return (FunctionDescription(name: "phone.editGroupCallParticipant", parameters: [("flags", flags), ("call", call), ("participant", participant), ("volume", volume), ("raiseHand", raiseHand)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                    if Int(flags) & Int(1 << 3) != 0 {videoStopped!.serialize(buffer, true)}
+                    if Int(flags) & Int(1 << 4) != 0 {videoPaused!.serialize(buffer, true)}
+                    if Int(flags) & Int(1 << 5) != 0 {presentationPaused!.serialize(buffer, true)}
+                    return (FunctionDescription(name: "phone.editGroupCallParticipant", parameters: [("flags", flags), ("call", call), ("participant", participant), ("muted", muted), ("volume", volume), ("raiseHand", raiseHand), ("videoStopped", videoStopped), ("videoPaused", videoPaused), ("presentationPaused", presentationPaused)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
                         let reader = BufferReader(buffer)
                         var result: Api.Updates?
                         if let signature = reader.readInt32() {
@@ -7918,6 +8150,79 @@ public extension Api {
                         return result
                     })
                 }
+            
+                public static func toggleGroupCallStartSubscription(call: Api.InputGroupCall, subscribed: Api.Bool) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(563885286)
+                    call.serialize(buffer, true)
+                    subscribed.serialize(buffer, true)
+                    return (FunctionDescription(name: "phone.toggleGroupCallStartSubscription", parameters: [("call", call), ("subscribed", subscribed)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Updates?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Updates
+                        }
+                        return result
+                    })
+                }
+            
+                public static func startScheduledGroupCall(call: Api.InputGroupCall) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(1451287362)
+                    call.serialize(buffer, true)
+                    return (FunctionDescription(name: "phone.startScheduledGroupCall", parameters: [("call", call)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Updates?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Updates
+                        }
+                        return result
+                    })
+                }
+            
+                public static func saveDefaultGroupCallJoinAs(peer: Api.InputPeer, joinAs: Api.InputPeer) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Bool>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(1465786252)
+                    peer.serialize(buffer, true)
+                    joinAs.serialize(buffer, true)
+                    return (FunctionDescription(name: "phone.saveDefaultGroupCallJoinAs", parameters: [("peer", peer), ("joinAs", joinAs)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Bool? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Bool?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Bool
+                        }
+                        return result
+                    })
+                }
+            
+                public static func joinGroupCallPresentation(call: Api.InputGroupCall, params: Api.DataJSON) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(-873829436)
+                    call.serialize(buffer, true)
+                    params.serialize(buffer, true)
+                    return (FunctionDescription(name: "phone.joinGroupCallPresentation", parameters: [("call", call), ("params", params)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Updates?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Updates
+                        }
+                        return result
+                    })
+                }
+            
+                public static func leaveGroupCallPresentation(call: Api.InputGroupCall) -> (FunctionDescription, Buffer, DeserializeFunctionResponse<Api.Updates>) {
+                    let buffer = Buffer()
+                    buffer.appendInt32(475058500)
+                    call.serialize(buffer, true)
+                    return (FunctionDescription(name: "phone.leaveGroupCallPresentation", parameters: [("call", call)]), buffer, DeserializeFunctionResponse { (buffer: Buffer) -> Api.Updates? in
+                        let reader = BufferReader(buffer)
+                        var result: Api.Updates?
+                        if let signature = reader.readInt32() {
+                            result = Api.parse(reader, signature: signature) as? Api.Updates
+                        }
+                        return result
+                    })
+                }
             }
     }
 }
diff --git a/submodules/TelegramAudio/Sources/ManagedAudioSession.swift b/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
index cc431709c8..ffe4017e73 100644
--- a/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
+++ b/submodules/TelegramAudio/Sources/ManagedAudioSession.swift
@@ -3,6 +3,17 @@ import SwiftSignalKit
 import AVFoundation
 import UIKit
 
+private var managedAudioSessionLogger: (String) -> Void = { _ in }
+
+public func setManagedAudioSessionLogger(_ f: @escaping (String) -> Void) {
+    managedAudioSessionLogger = f
+}
+
+func managedAudioSessionLog(_ what: @autoclosure () -> String) {
+    managedAudioSessionLogger(what())
+}
+
+
 public enum ManagedAudioSessionType: Equatable {
     case ambient
     case play
@@ -208,11 +219,15 @@ public final class ManagedAudioSession {
         })
         
         NotificationCenter.default.addObserver(forName: AVAudioSession.interruptionNotification, object: AVAudioSession.sharedInstance(), queue: nil, using: { [weak self] notification in
+            managedAudioSessionLog("Interruption received")
+
             guard let info = notification.userInfo,
                 let typeValue = info[AVAudioSessionInterruptionTypeKey] as? UInt,
                 let type = AVAudioSession.InterruptionType(rawValue: typeValue) else {
                     return
             }
+
+            managedAudioSessionLog("Interruption type: \(type)")
             
             queue.async {
                 if let strongSelf = self {
@@ -222,6 +237,17 @@ public final class ManagedAudioSession {
                 }
             }
         })
+
+        NotificationCenter.default.addObserver(forName: AVAudioSession.mediaServicesWereLostNotification, object: AVAudioSession.sharedInstance(), queue: nil, using: { [weak self] _ in
+            managedAudioSessionLog("Media Services were lost")
+            queue.after(1.0, {
+                if let strongSelf = self {
+                    if let (type, outputMode) = strongSelf.currentTypeAndOutputMode {
+                        strongSelf.setup(type: type, outputMode: outputMode, activateNow: true)
+                    }
+                }
+            })
+        })
         
         queue.async {
             self.isHeadsetPluggedInValue = self.isHeadsetPluggedIn()
@@ -524,7 +550,7 @@ public final class ManagedAudioSession {
     private func updateHolders(interruption: Bool = false) {
         assert(self.queue.isCurrent())
         
-        print("holder count \(self.holders.count)")
+        managedAudioSessionLog("holder count \(self.holders.count)")
         
         if !self.holders.isEmpty {
             var activeIndex: Int?
@@ -625,7 +651,7 @@ public final class ManagedAudioSession {
         assert(self.queue.isCurrent())
         
         let route = AVAudioSession.sharedInstance().currentRoute
-        //print("\(route)")
+        //managedAudioSessionLog("\(route)")
         for desc in route.outputs {
             if desc.portType == .headphones || desc.portType == .bluetoothA2DP || desc.portType == .bluetoothHFP {
                 return true
@@ -643,13 +669,13 @@ public final class ManagedAudioSession {
         let wasPlaybackActive = self.currentTypeAndOutputMode?.0.isPlay ?? false
         self.currentTypeAndOutputMode = nil
         
-        print("ManagedAudioSession setting active false")
+        managedAudioSessionLog("ManagedAudioSession setting active false")
         do {
             try AVAudioSession.sharedInstance().setActive(false, options: [.notifyOthersOnDeactivation])
             try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
             try AVAudioSession.sharedInstance().setPreferredInput(nil)
         } catch let error {
-            print("ManagedAudioSession applyNone error \(error), waiting")
+            managedAudioSessionLog("ManagedAudioSession applyNone error \(error), waiting")
 
             Thread.sleep(forTimeInterval: 2.0)
 
@@ -658,7 +684,7 @@ public final class ManagedAudioSession {
                 try AVAudioSession.sharedInstance().overrideOutputAudioPort(.none)
                 try AVAudioSession.sharedInstance().setPreferredInput(nil)
             } catch let error {
-                print("ManagedAudioSession applyNone repeated error \(error), giving up")
+                managedAudioSessionLog("ManagedAudioSession applyNone repeated error \(error), giving up")
             }
         }
         
@@ -687,7 +713,7 @@ public final class ManagedAudioSession {
             do {
                 let nativeCategory = nativeCategoryForType(type, headphones: self.isHeadsetPluggedInValue, outputMode: outputMode)
                 
-                print("ManagedAudioSession setting category for \(type) (native: \(nativeCategory)) activateNow: \(activateNow)")
+                managedAudioSessionLog("ManagedAudioSession setting category for \(type) (native: \(nativeCategory)) activateNow: \(activateNow)")
                 var options: AVAudioSession.CategoryOptions = []
                 switch type {
                     case .play, .ambient:
@@ -703,13 +729,15 @@ public final class ManagedAudioSession {
                     case .record, .voiceCall, .videoCall:
                         options.insert(.allowBluetooth)
                 }
-                print("ManagedAudioSession setting active true")
+                managedAudioSessionLog("ManagedAudioSession setting active true")
                 let mode: AVAudioSession.Mode
                    switch type {
                        case .voiceCall:
                            mode = .voiceChat
+                            options.insert(.mixWithOthers)
                        case .videoCall:
                            mode = .videoChat
+                            options.insert(.mixWithOthers)
                        default:
                            mode = .default
                    }
@@ -720,7 +748,7 @@ public final class ManagedAudioSession {
                     try AVAudioSession.sharedInstance().setMode(mode)
                 }
             } catch let error {
-                print("ManagedAudioSession setup error \(error)")
+                managedAudioSessionLog("ManagedAudioSession setup error \(error)")
             }
         }
         
@@ -741,7 +769,7 @@ public final class ManagedAudioSession {
     }
     
     private func setupOutputMode(_ outputMode: AudioSessionOutputMode, type: ManagedAudioSessionType) throws {
-        print("ManagedAudioSession setup \(outputMode) for \(type)")
+        managedAudioSessionLog("ManagedAudioSession setup \(outputMode) for \(type)")
         var resetToBuiltin = false
         switch outputMode {
         case .system:
@@ -831,21 +859,21 @@ public final class ManagedAudioSession {
                 
                 try AVAudioSession.sharedInstance().setActive(true, options: [.notifyOthersOnDeactivation])
                 
-                print("\(CFAbsoluteTimeGetCurrent()) AudioSession activate: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+                managedAudioSessionLog("\(CFAbsoluteTimeGetCurrent()) AudioSession activate: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
                 
                 try self.setupOutputMode(outputMode, type: type)
                 
-                print("\(CFAbsoluteTimeGetCurrent()) AudioSession setupOutputMode: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+                managedAudioSessionLog("\(CFAbsoluteTimeGetCurrent()) AudioSession setupOutputMode: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
                 
                 self.updateCurrentAudioRouteInfo()
                 
-                print("\(CFAbsoluteTimeGetCurrent()) AudioSession updateCurrentAudioRouteInfo: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
+                managedAudioSessionLog("\(CFAbsoluteTimeGetCurrent()) AudioSession updateCurrentAudioRouteInfo: \((CFAbsoluteTimeGetCurrent() - startTime) * 1000.0) ms")
                 
                 if case .voiceCall = type {
                     try AVAudioSession.sharedInstance().setPreferredIOBufferDuration(0.005)
                 }
             } catch let error {
-                print("ManagedAudioSession activate error \(error)")
+                managedAudioSessionLog("ManagedAudioSession activate error \(error)")
             }
         }
     }
@@ -858,7 +886,7 @@ public final class ManagedAudioSession {
     
     public func callKitActivatedAudioSession() {
         /*self.queue.async {
-            print("ManagedAudioSession callKitDeactivatedAudioSession")
+             managedAudioSessionLog("ManagedAudioSession callKitDeactivatedAudioSession")
             self.callKitAudioSessionIsActive = true
             self.updateHolders()
         }*/
@@ -866,7 +894,7 @@ public final class ManagedAudioSession {
     
     public func callKitDeactivatedAudioSession() {
         /*self.queue.async {
-            print("ManagedAudioSession callKitDeactivatedAudioSession")
+             managedAudioSessionLog("ManagedAudioSession callKitDeactivatedAudioSession")
             self.callKitAudioSessionIsActive = false
             self.updateHolders()
         }*/
diff --git a/submodules/TelegramBaseController/BUILD b/submodules/TelegramBaseController/BUILD
index dfa86f0840..7d1c7d3d24 100644
--- a/submodules/TelegramBaseController/BUILD
+++ b/submodules/TelegramBaseController/BUILD
@@ -21,6 +21,7 @@ swift_library(
         "//submodules/PresentationDataUtils:PresentationDataUtils",
         "//submodules/Markdown:Markdown",
         "//submodules/TelegramCallsUI:TelegramCallsUI",
+        "//submodules/ManagedAnimationNode:ManagedAnimationNode",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift b/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift
index fa59e85683..d99edd3a58 100644
--- a/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift
+++ b/submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift
@@ -49,9 +49,8 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
         
         self.tapAction = tapAction
         self.close = close
-        
+
         self.contentNode = ASDisplayNode()
-        self.contentNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
         
         self.iconNode = ASImageNode()
         self.iconNode.isLayerBacked = true
@@ -101,7 +100,6 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
         self.theme = presentationData.theme
         self.strings = presentationData.strings
         
-        self.contentNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
         self.iconNode.image = PresentationResourcesRootController.navigationLiveLocationIcon(self.theme)
         
         self.wavesNode.color = self.theme.rootController.navigationBar.accentTextColor
@@ -178,7 +176,7 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
         let closeButtonSize = self.closeButton.measure(CGSize(width: 100.0, height: 100.0))
         transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: bounds.size.width - 18.0 - closeButtonSize.width - rightInset, y: minimizedTitleFrame.minY + 8.0), size: closeButtonSize))
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: size.height - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: UIScreenPixel)))
     }
     
     func update(peers: [Peer], mode: LocationBroadcastNavigationAccessoryPanelMode, canClose: Bool) {
@@ -191,9 +189,16 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
     func animateIn(_ transition: ContainedViewLayoutTransition) {
         self.clipsToBounds = true
         let contentPosition = self.contentNode.layer.position
+
         transition.animatePosition(node: self.contentNode, from: CGPoint(x: contentPosition.x, y: contentPosition.y - 37.0), completion: { [weak self] _ in
             self?.clipsToBounds = false
         })
+
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.animatePositionAdditive(node: self.separatorNode, offset: CGPoint(x: 0.0, y: size.height))
     }
     
     func animateOut(_ transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
@@ -203,6 +208,12 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
             self?.clipsToBounds = false
             completion()
         })
+
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.updatePosition(node: self.separatorNode, position: self.separatorNode.position.offsetBy(dx: 0.0, dy: size.height))
     }
     
     @objc func closePressed() {
diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift
index c9c981ae06..ee4211ad3a 100644
--- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift
+++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryContainerNode.swift
@@ -8,36 +8,59 @@ import TelegramPresentationData
 import AccountContext
 
 public final class MediaNavigationAccessoryContainerNode: ASDisplayNode, UIGestureRecognizerDelegate {
+    private let displayBackground: Bool
+
     public let backgroundNode: ASDisplayNode
+    public let separatorNode: ASDisplayNode
     public let headerNode: MediaNavigationAccessoryHeaderNode
     
     private let currentHeaderHeight: CGFloat = MediaNavigationAccessoryHeaderNode.minimizedHeight
     
     private var presentationData: PresentationData
     
-    init(context: AccountContext) {
+    init(context: AccountContext, displayBackground: Bool) {
+        self.displayBackground = displayBackground
+
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
         self.backgroundNode = ASDisplayNode()
+        self.separatorNode = ASDisplayNode()
         self.headerNode = MediaNavigationAccessoryHeaderNode(presentationData: self.presentationData)
         
         super.init()
-        
-        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+
+        if self.displayBackground {
+            self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
+            self.separatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
+        }
         self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.separatorNode)
         
         self.addSubnode(self.headerNode)
     }
     
     func updatePresentationData(_ presentationData: PresentationData) {
         self.presentationData = presentationData
-        
-        self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+
+        if self.displayBackground {
+            self.backgroundNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
+            self.separatorNode.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
+        }
+
         self.headerNode.updatePresentationData(presentationData)
     }
-    
+
+    func animateIn(transition: ContainedViewLayoutTransition) {
+        self.headerNode.animateIn(transition: transition)
+    }
+
+    func animateOut(transition: ContainedViewLayoutTransition) {
+        self.headerNode.animateOut(transition: transition)
+    }
+
     func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) {
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: self.currentHeaderHeight)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: self.currentHeaderHeight - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
         
         let headerHeight = self.currentHeaderHeight
         transition.updateFrame(node: self.headerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: headerHeight)))
diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift
index 31aab50b23..2816162c63 100644
--- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift
+++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryHeaderNode.swift
@@ -10,6 +10,7 @@ import TelegramUIPreferences
 import UniversalMediaPlayer
 import AccountContext
 import TelegramStringFormatting
+import ManagedAnimationNode
 
 private let titleFont = Font.regular(12.0)
 private let subtitleFont = Font.regular(10.0)
@@ -79,7 +80,7 @@ private class MediaHeaderItemNode: ASDisplayNode {
                     }
                     
                     if titleText == subtitleText {
-                        subtitleText = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: timestamp)
+                        subtitleText = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: timestamp).0
                     }
                     
                     titleString = NSAttributedString(string: titleText, font: titleFont, textColor: theme.rootController.navigationBar.primaryTextColor)
@@ -147,8 +148,7 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
     
     private let closeButton: HighlightableButtonNode
     private let actionButton: HighlightTrackingButtonNode
-    private let actionPauseNode: ASImageNode
-    private let actionPlayNode: ASImageNode
+    private let playPauseIconNode: PlayPauseIconNode
     private let rateButton: HighlightableButtonNode
     private let accessibilityAreaNode: AccessibilityAreaNode
     
@@ -226,7 +226,7 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         self.rightMaskNode = ASImageNode()
         self.rightMaskNode.contentMode = .scaleToFill
         
-        let maskImage = generateMaskImage(color: self.theme.rootController.navigationBar.backgroundColor)
+        let maskImage = generateMaskImage(color: self.theme.rootController.navigationBar.opaqueBackgroundColor)
         self.leftMaskNode.image = maskImage
         self.rightMaskNode.image = maskImage
         
@@ -248,20 +248,8 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         self.actionButton.hitTestSlop = UIEdgeInsets(top: -8.0, left: -8.0, bottom: -8.0, right: -8.0)
         self.actionButton.displaysAsynchronously = false
         
-        self.actionPauseNode = ASImageNode()
-        self.actionPauseNode.contentMode = .center
-        self.actionPauseNode.isLayerBacked = true
-        self.actionPauseNode.displaysAsynchronously = false
-        self.actionPauseNode.displayWithoutProcessing = true
-        self.actionPauseNode.image = PresentationResourcesRootController.navigationPlayerPauseIcon(self.theme)
-        
-        self.actionPlayNode = ASImageNode()
-        self.actionPlayNode.contentMode = .center
-        self.actionPlayNode.isLayerBacked = true
-        self.actionPlayNode.displaysAsynchronously = false
-        self.actionPlayNode.displayWithoutProcessing = true
-        self.actionPlayNode.image = PresentationResourcesRootController.navigationPlayerPlayIcon(self.theme)
-        self.actionPlayNode.isHidden = true
+        self.playPauseIconNode = PlayPauseIconNode()
+        self.playPauseIconNode.customColor = self.theme.rootController.navigationBar.accentTextColor
         
         self.scrubbingNode = MediaPlayerScrubbingNode(content: .standard(lineHeight: 2.0, lineCap: .square, scrubberHandle: .none, backgroundColor: .clear, foregroundColor: self.theme.rootController.navigationBar.accentTextColor, bufferingColor: self.theme.rootController.navigationBar.accentTextColor.withAlphaComponent(0.5), chapters: []))
         
@@ -278,15 +266,14 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         self.scrollNode.addSubnode(self.previousItemNode)
         self.scrollNode.addSubnode(self.nextItemNode)
         
-        self.addSubnode(self.leftMaskNode)
-        self.addSubnode(self.rightMaskNode)
+        //self.addSubnode(self.leftMaskNode)
+        //self.addSubnode(self.rightMaskNode)
         
         self.addSubnode(self.closeButton)
         self.addSubnode(self.rateButton)
         self.addSubnode(self.accessibilityAreaNode)
         
-        self.actionButton.addSubnode(self.actionPauseNode)
-        self.actionButton.addSubnode(self.actionPlayNode)
+        self.actionButton.addSubnode(self.playPauseIconNode)
         self.addSubnode(self.actionButton)
         
         self.closeButton.addTarget(self, action: #selector(self.closeButtonPressed), forControlEvents: .touchUpInside)
@@ -341,8 +328,7 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
                 } else {
                     paused = true
                 }
-                strongSelf.actionPlayNode.isHidden = !paused
-                strongSelf.actionPauseNode.isHidden = paused
+                strongSelf.playPauseIconNode.enqueueState(paused ? .play : .pause, animated: true)
                 strongSelf.actionButton.accessibilityLabel = paused ? strongSelf.strings.VoiceOver_Media_PlaybackPlay : strongSelf.strings.VoiceOver_Media_PlaybackPause
             }
         }
@@ -369,13 +355,12 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         self.nameDisplayOrder = presentationData.nameDisplayOrder
         self.dateTimeFormat = presentationData.dateTimeFormat
         
-        let maskImage = generateMaskImage(color: self.theme.rootController.navigationBar.backgroundColor)
+        let maskImage = generateMaskImage(color: self.theme.rootController.navigationBar.opaqueBackgroundColor)
         self.leftMaskNode.image = maskImage
         self.rightMaskNode.image = maskImage
         
         self.closeButton.setImage(PresentationResourcesRootController.navigationPlayerCloseButton(self.theme), for: [])
-        self.actionPlayNode.image = PresentationResourcesRootController.navigationPlayerPlayIcon(self.theme)
-        self.actionPauseNode.image = PresentationResourcesRootController.navigationPlayerPauseIcon(self.theme)
+        self.playPauseIconNode.customColor = self.theme.rootController.navigationBar.accentTextColor
         self.separatorNode.backgroundColor = self.theme.rootController.navigationBar.separatorColor
         self.scrubbingNode.updateContent(.standard(lineHeight: 2.0, lineCap: .square, scrubberHandle: .none, backgroundColor: .clear, foregroundColor: self.theme.rootController.navigationBar.accentTextColor, bufferingColor: self.theme.rootController.navigationBar.accentTextColor.withAlphaComponent(0.5), chapters: []))
         
@@ -430,6 +415,22 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
             self.playNext?()
         }
     }
+
+    func animateIn(transition: ContainedViewLayoutTransition) {
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.animatePositionAdditive(node: self.separatorNode, offset: CGPoint(x: 0.0, y: size.height))
+    }
+
+    func animateOut(transition: ContainedViewLayoutTransition) {
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.updatePosition(node: self.separatorNode, position: self.separatorNode.position.offsetBy(dx: 0.0, dy: size.height))
+    }
     
     public func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition) {
         self.validLayout = (size, leftInset, rightInset)
@@ -477,12 +478,11 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: bounds.size.width - 44.0 - rightInset, y: 0.0), size: CGSize(width: 44.0, height: minHeight)))
         let rateButtonSize = CGSize(width: 24.0, height: minHeight)
         transition.updateFrame(node: self.rateButton, frame: CGRect(origin: CGPoint(x: bounds.size.width - 18.0 - closeButtonSize.width - 17.0 - rateButtonSize.width - rightInset, y: 0.0), size: rateButtonSize))
-        transition.updateFrame(node: self.actionPlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: 40.0, height: 37.0)))
-        transition.updateFrame(node: self.actionPauseNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: 40.0, height: 37.0)))
+        transition.updateFrame(node: self.playPauseIconNode, frame: CGRect(origin: CGPoint(x: 6.0, y: 4.0 + UIScreenPixel), size: CGSize(width: 28.0, height: 28.0)))
         transition.updateFrame(node: self.actionButton, frame: CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: 40.0, height: 37.0)))
         transition.updateFrame(node: self.scrubbingNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 37.0 - 2.0), size: CGSize(width: size.width, height: 2.0)))
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: minHeight - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: UIScreenPixel)))
         
         self.accessibilityAreaNode.frame = CGRect(origin: CGPoint(x: self.actionButton.frame.maxX, y: 0.0), size: CGSize(width: self.rateButton.frame.minX - self.actionButton.frame.maxX, height: minHeight))
     }
@@ -505,3 +505,53 @@ public final class MediaNavigationAccessoryHeaderNode: ASDisplayNode, UIScrollVi
         }
     }
 }
+
+private enum PlayPauseIconNodeState: Equatable {
+    case play
+    case pause
+}
+
+private final class PlayPauseIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.35
+    private var iconState: PlayPauseIconNodeState = .pause
+    
+    init() {
+        super.init(size: CGSize(width: 28.0, height: 28.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: PlayPauseIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .play:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 83), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .play:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 41), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+                        }
+                    case .play:
+                        break
+                }
+        }
+    }
+}
diff --git a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryPanel.swift b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryPanel.swift
index 5f6aa9da2b..04ef455bf7 100644
--- a/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryPanel.swift
+++ b/submodules/TelegramBaseController/Sources/MediaNavigationAccessoryPanel.swift
@@ -16,8 +16,8 @@ public final class MediaNavigationAccessoryPanel: ASDisplayNode {
     public var playPrevious: (() -> Void)?
     public var playNext: (() -> Void)?
     
-    public init(context: AccountContext) {
-        self.containerNode = MediaNavigationAccessoryContainerNode(context: context)
+    public init(context: AccountContext, displayBackground: Bool = false) {
+        self.containerNode = MediaNavigationAccessoryContainerNode(context: context, displayBackground: displayBackground)
         
         super.init()
         
@@ -61,6 +61,9 @@ public final class MediaNavigationAccessoryPanel: ASDisplayNode {
     public func animateIn(transition: ContainedViewLayoutTransition) {
         self.clipsToBounds = true
         let contentPosition = self.containerNode.layer.position
+
+        self.containerNode.animateIn(transition: transition)
+        
         transition.animatePosition(node: self.containerNode, from: CGPoint(x: contentPosition.x, y: contentPosition.y - 37.0), completion: { [weak self] _ in
             self?.clipsToBounds = false
         })
@@ -69,6 +72,9 @@ public final class MediaNavigationAccessoryPanel: ASDisplayNode {
     public func animateOut(transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
         self.clipsToBounds = true
         let contentPosition = self.containerNode.layer.position
+
+        self.containerNode.animateOut(transition: transition)
+
         transition.animatePosition(node: self.containerNode, to: CGPoint(x: contentPosition.x, y: contentPosition.y - 37.0), removeOnCompletion: false, completion: { [weak self] _ in
             self?.clipsToBounds = false
             completion()
diff --git a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
index 9bdaf8d5e4..16e3e6bd81 100644
--- a/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
+++ b/submodules/TelegramBaseController/Sources/TelegramBaseController.swift
@@ -77,6 +77,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
     
     public var tempVoicePlaylistEnded: (() -> Void)?
     public var tempVoicePlaylistItemChanged: ((SharedMediaPlaylistItem?, SharedMediaPlaylistItem?) -> Void)?
+    public var tempVoicePlaylistCurrentItem: SharedMediaPlaylistItem?
     
     public var mediaAccessoryPanel: (MediaNavigationAccessoryPanel, MediaManagerPlayerType)?
     
@@ -94,19 +95,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
     private var presentationDataDisposable: Disposable?
     private var playlistPreloadDisposable: Disposable?
     
-    override open var navigationHeight: CGFloat {
-        return super.navigationHeight + self.additionalHeight
-    }
-    
-    override open var navigationInsetHeight: CGFloat {
-        return super.navigationInsetHeight + self.additionalHeight
-    }
-    
-    override open var visualNavigationInsetHeight: CGFloat {
-        return super.visualNavigationInsetHeight + self.additionalHeight
-    }
-    
-    public var additionalHeight: CGFloat {
+    override open var additionalNavigationBarHeight: CGFloat {
         var height: CGFloat = 0.0
         if let _ = self.groupCallAccessoryPanel {
             height += 50.0
@@ -120,10 +109,6 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
         return height
     }
     
-    open var primaryNavigationHeight: CGFloat {
-        return super.navigationHeight
-    }
-    
     public init(context: AccountContext, navigationBarPresentationData: NavigationBarPresentationData?, mediaAccessoryPanelVisibility: MediaAccessoryPanelVisibility, locationBroadcastPanelSource: LocationBroadcastPanelSource, groupCallPanelSource: GroupCallPanelSource) {
         self.context = context
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -166,6 +151,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                         updatedVoiceItem = playlistStateAndType.1.item
                     }
                     
+                    strongSelf.tempVoicePlaylistCurrentItem = updatedVoiceItem
                     strongSelf.tempVoicePlaylistItemChanged?(previousVoiceItem, updatedVoiceItem)
                     if let playlistStateAndType = playlistStateAndType {
                         strongSelf.playlistStateAndType = (playlistStateAndType.1.item, playlistStateAndType.1.previousItem, playlistStateAndType.1.nextItem, playlistStateAndType.1.order, playlistStateAndType.2, playlistStateAndType.0)
@@ -303,7 +289,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                             let disposable = MetaDisposable()
                             
                             callContextCache.impl.syncWith { impl in
-                                let callContext = impl.get(account: context.account, peerId: peerId, call: activeCall)
+                                let callContext = impl.get(account: context.account, engine: context.engine, peerId: peerId, call: activeCall)
                                 disposable.set((callContext.context.panelData
                                 |> deliverOnMainQueue).start(next: { panelData in
                                     callContext.keep()
@@ -333,7 +319,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                     if previousCurrentGroupCall != nil && currentGroupCall == nil && availableState?.participantCount == 1 {
                         panelData = nil
                     } else {
-                        panelData = currentGroupCall != nil || availableState?.participantCount == 0 ? nil : availableState
+                        panelData = currentGroupCall != nil || (availableState?.participantCount == 0 && availableState?.info.scheduleTimestamp == nil) ? nil : availableState
                     }
                     
                     let wasEmpty = strongSelf.groupCallPanelData == nil
@@ -376,11 +362,25 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
     required public init(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    private var suspendNavigationBarLayout: Bool = false
+    private var suspendedNavigationBarLayout: ContainerViewLayout?
+    private var additionalNavigationBarBackgroundHeight: CGFloat = 0.0
+
+    override open func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        if self.suspendNavigationBarLayout {
+            self.suspendedNavigationBarLayout = layout
+            return
+        }
+        self.applyNavigationBarLayout(layout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+    }
     
     override open func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.suspendNavigationBarLayout = true
+        
         super.containerLayoutUpdated(layout, transition: transition)
         
-        var navigationHeight = super.navigationHeight
+        var navigationHeight = super.navigationLayout(layout: layout).navigationFrame.maxY - self.additionalNavigationBarHeight
         if !self.displayNavigationBar {
             navigationHeight = 0.0
         }
@@ -406,14 +406,10 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                     strongSelf.joinGroupCall(
                         peerId: groupCallPanelData.peerId,
                         invite: nil,
-                        activeCall: CachedChannelData.ActiveCall(id: groupCallPanelData.info.id, accessHash: groupCallPanelData.info.accessHash, title: groupCallPanelData.info.title)
+                        activeCall: CachedChannelData.ActiveCall(id: groupCallPanelData.info.id, accessHash: groupCallPanelData.info.accessHash, title: groupCallPanelData.info.title, scheduleTimestamp: groupCallPanelData.info.scheduleTimestamp, subscribedToScheduled: groupCallPanelData.info.subscribedToScheduled)
                     )
                 })
-                if let navigationBar = self.navigationBar {
-                    self.displayNode.insertSubnode(groupCallAccessoryPanel, aboveSubnode: navigationBar)
-                } else {
-                    self.displayNode.addSubnode(groupCallAccessoryPanel)
-                }
+                self.navigationBar?.additionalContentNode.addSubnode(groupCallAccessoryPanel)
                 self.groupCallAccessoryPanel = groupCallAccessoryPanel
                 groupCallAccessoryPanel.frame = panelFrame
                 
@@ -560,11 +556,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                         strongSelf.present(controller, in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
                     }
                 })
-                if let navigationBar = self.navigationBar {
-                    self.displayNode.insertSubnode(locationBroadcastAccessoryPanel, aboveSubnode: navigationBar)
-                } else {
-                    self.displayNode.addSubnode(locationBroadcastAccessoryPanel)
-                }
+                self.navigationBar?.additionalContentNode.addSubnode(locationBroadcastAccessoryPanel)
                 self.locationBroadcastAccessoryPanel = locationBroadcastAccessoryPanel
                 locationBroadcastAccessoryPanel.frame = panelFrame
                 
@@ -806,11 +798,9 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                 }
                 mediaAccessoryPanel.frame = panelFrame
                 if let dismissingPanel = self.dismissingPanel {
-                    self.displayNode.insertSubnode(mediaAccessoryPanel, aboveSubnode: dismissingPanel)
-                } else if let navigationBar = self.navigationBar {
-                    self.displayNode.insertSubnode(mediaAccessoryPanel, belowSubnode: navigationBar)
+                    self.navigationBar?.additionalContentNode.insertSubnode(mediaAccessoryPanel, aboveSubnode: dismissingPanel)
                 } else {
-                    self.displayNode.addSubnode(mediaAccessoryPanel)
+                    self.navigationBar?.additionalContentNode.addSubnode(mediaAccessoryPanel)
                 }
                 self.mediaAccessoryPanel = (mediaAccessoryPanel, type)
                 mediaAccessoryPanel.updateLayout(size: panelFrame.size, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: .immediate)
@@ -842,6 +832,12 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                 }
             })
         }
+
+        self.suspendNavigationBarLayout = false
+        if let suspendedNavigationBarLayout = self.suspendedNavigationBarLayout {
+            self.suspendedNavigationBarLayout = suspendedNavigationBarLayout
+            self.applyNavigationBarLayout(suspendedNavigationBarLayout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+        }
     }
     
     open var keyShortcuts: [KeyShortcut] {
@@ -856,6 +852,8 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
         let context = self.context
         let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
         
+        self.view.endEditing(true)
+        
         self.context.joinGroupCall(peerId: peerId, invite: invite, requestJoinAsPeerId: { completion in
             let currentAccountPeer = context.account.postbox.loadedPeerWithId(context.account.peerId)
             |> map { peer in
@@ -865,7 +863,7 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                 return transaction.getPeerCachedData(peerId: peerId)
             }
             
-            let _ = (combineLatest(currentAccountPeer, cachedGroupCallDisplayAsAvailablePeers(account: context.account, peerId: peerId), cachedData)
+            let _ = (combineLatest(currentAccountPeer, context.engine.calls.cachedGroupCallDisplayAsAvailablePeers(peerId: peerId), cachedData)
             |> map { currentAccountPeer, availablePeers, cachedData -> ([FoundPeer], CachedPeerData?) in
                 var result = currentAccountPeer
                 result.append(contentsOf: availablePeers)
@@ -898,7 +896,10 @@ open class TelegramBaseController: ViewController, KeyShortcutResponder {
                         var items: [ActionSheetItem] = []
                         var isGroup = false
                         for peer in peers {
-                            if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
+                            if peer.peer is TelegramGroup {
+                                isGroup = true
+                                break
+                            } else if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
                                 isGroup = true
                                 break
                             }
diff --git a/submodules/TelegramCallsUI/BUILD b/submodules/TelegramCallsUI/BUILD
index 50825f66db..57dca2b206 100644
--- a/submodules/TelegramCallsUI/BUILD
+++ b/submodules/TelegramCallsUI/BUILD
@@ -1,4 +1,44 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+load(
+    "@build_bazel_rules_apple//apple:resources.bzl",
+    "apple_resource_bundle",
+    "apple_resource_group",
+)
+load("//build-system/bazel-utils:plist_fragment.bzl",
+    "plist_fragment",
+)
+
+filegroup(
+    name = "TelegramCallsUIMetalResources",
+    srcs = glob([
+        "Resources/**/*.metal",
+    ]),
+    visibility = ["//visibility:public"],
+)
+
+plist_fragment(
+    name = "TelegramCallsUIBundleInfoPlist",
+    extension = "plist",
+    template =
+    """
+    <key>CFBundleIdentifier</key>
+    <string>org.telegram.TelegramCallsUI</string>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleName</key>
+    <string>TelegramCallsUI</string>
+    """
+)
+
+apple_resource_bundle(
+    name = "TelegramCallsUIBundle",
+    infoplists = [
+        ":TelegramCallsUIBundleInfoPlist",
+    ],
+    resources = [
+        ":TelegramCallsUIMetalResources",
+    ],
+)
 
 swift_library(
     name = "TelegramCallsUI",
@@ -6,6 +46,9 @@ swift_library(
     srcs = glob([
         "Sources/**/*.swift",
     ]),
+    data = [
+        ":TelegramCallsUIBundle",
+    ],
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
         "//submodules/Display:Display",
@@ -42,6 +85,12 @@ swift_library(
         "//submodules/DeviceProximity:DeviceProximity",
         "//submodules/ManagedAnimationNode:ManagedAnimationNode",
         "//submodules/TemporaryCachedPeerDataManager:TemporaryCachedPeerDataManager",
+        "//submodules/PeerInfoAvatarListNode:PeerInfoAvatarListNode",
+        "//submodules/WebSearchUI:WebSearchUI",
+        "//submodules/MapResourceToAvatarSizes:MapResourceToAvatarSizes",
+        "//submodules/TextFormat:TextFormat",
+        "//submodules/Markdown:Markdown",
+        "//submodules/ChatTitleActivityNode:ChatTitleActivityNode",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramCallsUI/Resources/I420VideoShaders.metal b/submodules/TelegramCallsUI/Resources/I420VideoShaders.metal
new file mode 100644
index 0000000000..894d3e520c
--- /dev/null
+++ b/submodules/TelegramCallsUI/Resources/I420VideoShaders.metal
@@ -0,0 +1,49 @@
+#include <metal_stdlib>
+using namespace metal;
+
+typedef struct {
+    packed_float2 position;
+    packed_float2 texcoord;
+} Vertex;
+
+typedef struct {
+    float4 position[[position]];
+    float2 texcoord;
+} Varyings;
+
+vertex Varyings i420VertexPassthrough(constant Vertex *verticies[[buffer(0)]],
+                                  unsigned int vid[[vertex_id]]) {
+    Varyings out;
+    constant Vertex &v = verticies[vid];
+    out.position = float4(float2(v.position), 0.0, 1.0);
+    out.texcoord = v.texcoord;
+
+    return out;
+}
+
+fragment half4 i420FragmentColorConversion(
+    Varyings in[[stage_in]],
+    texture2d<float, access::sample> textureY[[texture(0)]],
+    texture2d<float, access::sample> textureU[[texture(1)]],
+    texture2d<float, access::sample> textureV[[texture(2)]]) {
+    constexpr sampler s(address::clamp_to_edge, filter::linear);
+    float y;
+    float u;
+    float v;
+    float r;
+    float g;
+    float b;
+    // Conversion for YUV to rgb from http://www.fourcc.org/fccyvrgb.php
+    y = textureY.sample(s, in.texcoord).r;
+    u = textureU.sample(s, in.texcoord).r;
+    v = textureV.sample(s, in.texcoord).r;
+    u = u - 0.5;
+    v = v - 0.5;
+    r = y + 1.403 * v;
+    g = y - 0.344 * u - 0.714 * v;
+    b = y + 1.770 * u;
+
+    float4 out = float4(r, g, b, 1.0);
+
+    return half4(out);
+}
\ No newline at end of file
diff --git a/submodules/TelegramCallsUI/Resources/NV12VideoShaders.metal b/submodules/TelegramCallsUI/Resources/NV12VideoShaders.metal
new file mode 100644
index 0000000000..3f0fca262d
--- /dev/null
+++ b/submodules/TelegramCallsUI/Resources/NV12VideoShaders.metal
@@ -0,0 +1,57 @@
+#include <metal_stdlib>
+using namespace metal;
+
+typedef struct {
+    packed_float2 position;
+    packed_float2 texcoord;
+} Vertex;
+
+typedef struct {
+    float4 position[[position]];
+    float2 texcoord;
+} Varyings;
+
+vertex Varyings nv12VertexPassthrough(
+    constant Vertex *verticies[[buffer(0)]],
+    unsigned int vid[[vertex_id]]
+) {
+    Varyings out;
+    constant Vertex &v = verticies[vid];
+    out.position = float4(float2(v.position), 0.0, 1.0);
+    out.texcoord = v.texcoord;
+    return out;
+}
+
+float4 samplePoint(texture2d<float, access::sample> textureY, texture2d<float, access::sample> textureCbCr, sampler s, float2 texcoord) {
+    float y;
+    float2 uv;
+    y = textureY.sample(s, texcoord).r;
+    uv = textureCbCr.sample(s, texcoord).rg - float2(0.5, 0.5);
+
+    // Conversion for YUV to rgb from http://www.fourcc.org/fccyvrgb.php
+    float4 out = float4(y + 1.403 * uv.y, y - 0.344 * uv.x - 0.714 * uv.y, y + 1.770 * uv.x, 1.0);
+    return out;
+}
+
+fragment half4 nv12FragmentColorConversion(
+    Varyings in[[stage_in]],
+    texture2d<float, access::sample> textureY[[texture(0)]],
+    texture2d<float, access::sample> textureCbCr[[texture(1)]]
+) {
+    constexpr sampler s(address::clamp_to_edge, filter::linear);
+
+    float4 out = samplePoint(textureY, textureCbCr, s, in.texcoord);
+
+    return half4(out);
+}
+
+fragment half4 blitFragmentColorConversion(
+    Varyings in[[stage_in]],
+    texture2d<float, access::sample> texture[[texture(0)]]
+) {
+    constexpr sampler s(address::clamp_to_edge, filter::linear);
+
+    float4 out = texture.sample(s, in.texcoord);
+
+    return half4(out);
+}
diff --git a/submodules/TelegramCallsUI/Sources/CallController.swift b/submodules/TelegramCallsUI/Sources/CallController.swift
index 64281e9645..3fde19a833 100644
--- a/submodules/TelegramCallsUI/Sources/CallController.swift
+++ b/submodules/TelegramCallsUI/Sources/CallController.swift
@@ -187,7 +187,9 @@ public final class CallController: ViewController {
                             if port.type == .bluetooth {
                                 var image = UIImage(bundleImageName: "Call/CallBluetoothButton")
                                 let portName = port.name.lowercased()
-                                if portName.contains("airpods pro") {
+                                if portName.contains("airpods max") {
+                                    image = UIImage(bundleImageName: "Call/CallAirpodsMaxButton")
+                                } else if portName.contains("airpods pro") {
                                     image = UIImage(bundleImageName: "Call/CallAirpodsProButton")
                                 } else if portName.contains("airpods") {
                                     image = UIImage(bundleImageName: "Call/CallAirpodsButton")
@@ -341,7 +343,7 @@ public final class CallController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     override public func dismiss(completion: (() -> Void)? = nil) {
diff --git a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift
index 5a0bc5da67..42468535b8 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerButton.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerButton.swift
@@ -5,6 +5,7 @@ import AsyncDisplayKit
 import SwiftSignalKit
 import AppBundle
 import SemanticStatusNode
+import AnimationUI
 
 private let labelFont = Font.regular(13.0)
 
@@ -30,6 +31,8 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         }
         
         enum Image {
+            case cameraOff
+            case cameraOn
             case camera
             case mute
             case flipCamera
@@ -37,10 +40,12 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
             case speaker
             case airpods
             case airpodsPro
+            case airpodsMax
             case headphones
             case accept
             case end
             case cancel
+            case share
         }
         
         var appearance: Appearance
@@ -56,20 +61,26 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         }
     }
     
+    private let wrapperNode: ASDisplayNode
     private let contentContainer: ASDisplayNode
     private let effectView: UIVisualEffectView
     private let contentBackgroundNode: ASImageNode
     private let contentNode: ASImageNode
+    private var animationNode: AnimationNode?
     private let overlayHighlightNode: ASImageNode
     private var statusNode: SemanticStatusNode?
     let textNode: ImmediateTextNode
     
-    private let largeButtonSize: CGFloat = 72.0
+    private let largeButtonSize: CGFloat
     
+    private var size: CGSize?
     private(set) var currentContent: Content?
     private(set) var currentText: String = ""
     
-    init() {
+    init(largeButtonSize: CGFloat = 72.0) {
+        self.largeButtonSize = largeButtonSize
+        
+        self.wrapperNode = ASDisplayNode()
         self.contentContainer = ASDisplayNode()
         
         self.effectView = UIVisualEffectView()
@@ -94,10 +105,11 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         
         super.init(pointerStyle: nil)
         
-        self.addSubnode(self.contentContainer)
+        self.addSubnode(self.wrapperNode)
+        self.wrapperNode.addSubnode(self.contentContainer)
         self.contentContainer.frame = CGRect(origin: CGPoint(), size: CGSize(width: self.largeButtonSize, height: self.largeButtonSize))
         
-        self.addSubnode(self.textNode)
+        self.wrapperNode.addSubnode(self.textNode)
         
         self.contentContainer.view.addSubview(self.effectView)
         self.contentContainer.addSubnode(self.contentBackgroundNode)
@@ -121,6 +133,11 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         }
     }
     
+    override func layout() {
+        super.layout()
+        self.wrapperNode.frame = self.bounds
+    }
+    
     func update(size: CGSize, content: Content, text: String, transition: ContainedViewLayoutTransition) {
         let scaleFactor = size.width / self.largeButtonSize
         
@@ -131,9 +148,10 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         self.contentNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: self.largeButtonSize, height: self.largeButtonSize))
         self.overlayHighlightNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: self.largeButtonSize, height: self.largeButtonSize))
         
-        if self.currentContent != content {
+        if self.currentContent != content || self.size != size {
             let previousContent = self.currentContent
             self.currentContent = content
+            self.size = size
             
             if content.hasProgress {
                 let statusFrame = CGRect(origin: CGPoint(), size: CGSize(width: self.largeButtonSize, height: self.largeButtonSize))
@@ -164,11 +182,40 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
                 self.effectView.isHidden = true
             }
             
-            transition.updateAlpha(node: self, alpha: content.isEnabled ? 1.0 : 0.4)
-            self.isUserInteractionEnabled = content.isEnabled
+            transition.updateAlpha(node: self.wrapperNode, alpha: content.isEnabled ? 1.0 : 0.4)
+            self.wrapperNode.isUserInteractionEnabled = content.isEnabled
             
             let contentBackgroundImage: UIImage? = nil
             
+            var animationName: String?
+            switch content.image {
+                case .cameraOff:
+                    animationName = "anim_cameraoff"
+                case .cameraOn:
+                    animationName = "anim_cameraon"
+                default:
+                    break
+            }
+            
+            if let animationName = animationName {
+                let animationFrame = CGRect(origin: CGPoint(), size: CGSize(width: self.largeButtonSize, height: self.largeButtonSize))
+                if self.animationNode == nil {
+                    let animationNode = AnimationNode(animation: animationName, colors: nil, scale: 1.0)
+                    self.animationNode = animationNode
+                    self.contentContainer.insertSubnode(animationNode, aboveSubnode: self.contentNode)
+                }
+                if let animationNode = self.animationNode {
+                    animationNode.bounds = animationFrame
+                    animationNode.position = CGPoint(x: self.largeButtonSize / 2.0, y: self.largeButtonSize / 2.0)
+                    if previousContent == nil {
+                        animationNode.seekToEnd()
+                    } else if previousContent?.image != content.image {
+                        animationNode.setAnimation(name: animationName)
+                        animationNode.play()
+                    }
+                }
+            }
+            
             let contentImage = generateImage(CGSize(width: self.largeButtonSize, height: self.largeButtonSize), contextGenerator: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
                 
@@ -209,6 +256,8 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
                 var image: UIImage?
                 
                 switch content.image {
+                case .cameraOff, .cameraOn:
+                    image = nil
                 case .camera:
                     image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallCameraButton"), color: imageColor)
                 case .mute:
@@ -223,6 +272,8 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
                     image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallAirpodsButton"), color: imageColor)
                 case .airpodsPro:
                     image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallAirpodsProButton"), color: imageColor)
+                case .airpodsMax:
+                    image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallAirpodsMaxButton"), color: imageColor)
                 case .headphones:
                     image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallHeadphonesButton"), color: imageColor)
                 case .accept:
@@ -246,6 +297,8 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
                         context.addLine(to: CGPoint(x: 2.0 + UIScreenPixel, y: 26.0 - UIScreenPixel))
                         context.strokePath()
                     })
+                case .share:
+                    image = generateTintedImage(image: UIImage(bundleImageName: "Call/CallShareButton"), color: imageColor)
                 }
             
                 if let image = image {
@@ -323,6 +376,9 @@ final class CallControllerButtonItemNode: HighlightTrackingButtonNode {
         
         transition.updatePosition(node: self.contentContainer, position: CGPoint(x: size.width / 2.0, y: size.height / 2.0))
         transition.updateSublayerTransformScale(node: self.contentContainer, scale: scaleFactor)
+        if let animationNode = self.animationNode {
+            transition.updateTransformScale(node: animationNode, scale: isSmall ? 1.35 : 1.12)
+        }
         
         if self.currentText != text {
             self.textNode.attributedText = NSAttributedString(string: text, font: labelFont, textColor: .white)
diff --git a/submodules/TelegramCallsUI/Sources/CallControllerButtonsNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerButtonsNode.swift
index bafe04e8c3..12ad79611d 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerButtonsNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerButtonsNode.swift
@@ -11,6 +11,7 @@ enum CallControllerButtonsSpeakerMode: Equatable {
         case generic
         case airpods
         case airpodsPro
+        case airpodsMax
     }
     
     case none
@@ -51,6 +52,7 @@ private enum ButtonDescription: Equatable {
         case bluetooth
         case airpods
         case airpodsPro
+        case airpodsMax
         case headphones
     }
     
@@ -215,6 +217,8 @@ final class CallControllerButtonsNode: ASDisplayNode {
                             soundOutput = .airpods
                         case .airpodsPro:
                             soundOutput = .airpodsPro
+                        case .airpodsMax:
+                            soundOutput = .airpodsMax
                 }
             }
             
@@ -306,6 +310,8 @@ final class CallControllerButtonsNode: ASDisplayNode {
                                 soundOutput = .airpods
                             case .airpodsPro:
                                 soundOutput = .airpodsPro
+                            case .airpodsMax:
+                                soundOutput = .airpodsMax
                     }
                 }
                 
@@ -362,6 +368,8 @@ final class CallControllerButtonsNode: ASDisplayNode {
                                 soundOutput = .airpods
                             case .airpodsPro:
                                 soundOutput = .airpodsPro
+                            case .airpodsMax:
+                                soundOutput = .airpodsMax
                     }
                 }
                 
@@ -468,6 +476,9 @@ final class CallControllerButtonsNode: ASDisplayNode {
                 case .airpodsPro:
                     image = .airpodsPro
                     title = strings.Call_Audio
+                case .airpodsMax:
+                    image = .airpodsMax
+                    title = strings.Call_Audio
                 case .headphones:
                     image = .headphones
                     title = strings.Call_Audio
diff --git a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
index 6c5651cc17..ded0d56666 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift
@@ -16,6 +16,7 @@ import CallsEmoji
 import TooltipUI
 import AlertUI
 import PresentationDataUtils
+import DeviceAccess
 
 private func interpolateFrame(from fromValue: CGRect, to toValue: CGRect, t: CGFloat) -> CGRect {
     return CGRect(x: floorToScreenPixels(toValue.origin.x * t + fromValue.origin.x * (1.0 - t)), y: floorToScreenPixels(toValue.origin.y * t + fromValue.origin.y * (1.0 - t)), width: floorToScreenPixels(toValue.size.width * t + fromValue.size.width * (1.0 - t)), height: floorToScreenPixels(toValue.size.height * t + fromValue.size.height * (1.0 - t)))
@@ -132,6 +133,14 @@ private final class CallVideoNode: ASDisplayNode {
         self.isReadyTimer?.invalidate()
     }
     
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.layer.cornerCurve = .continuous
+        }
+    }
+    
     func animateRadialMask(from fromRect: CGRect, to toRect: CGRect) {
         let maskLayer = CAShapeLayer()
         maskLayer.frame = fromRect
@@ -551,25 +560,36 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
             switch callState.state {
             case .active:
                 if strongSelf.outgoingVideoNodeValue == nil {
-                    let proceed = {
-                        strongSelf.displayedCameraConfirmation = true
-                        switch callState.videoState {
-                        case .inactive:
-                            strongSelf.isRequestingVideo = true
-                            strongSelf.updateButtonsMode()
-                        default:
-                            break
+                    DeviceAccess.authorizeAccess(to: .camera(.videoCall), onlyCheck: true, presentationData: strongSelf.presentationData, present: { [weak self] c, a in
+                        if let strongSelf = self {
+                            strongSelf.present?(c)
                         }
-                        strongSelf.call.requestVideo()
-                    }
-                    
-                    if strongSelf.displayedCameraConfirmation {
-                        proceed()
-                    } else {
-                        strongSelf.present?(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: strongSelf.presentationData.strings.Call_CameraConfirmationText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Call_CameraConfirmationConfirm, action: {
+                    }, openSettings: { [weak self] in
+                        self?.sharedContext.applicationBindings.openSettings()
+                    }, _: { [weak self] ready in
+                        guard let strongSelf = self, ready else {
+                            return
+                        }
+                        let proceed = {
+                            strongSelf.displayedCameraConfirmation = true
+                            switch callState.videoState {
+                            case .inactive:
+                                strongSelf.isRequestingVideo = true
+                                strongSelf.updateButtonsMode()
+                            default:
+                                break
+                            }
+                            strongSelf.call.requestVideo()
+                        }
+                        
+                        if strongSelf.displayedCameraConfirmation {
                             proceed()
-                        })]))
-                    }
+                        } else {
+                            strongSelf.present?(textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: strongSelf.presentationData.strings.Call_CameraConfirmationText, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Call_CameraConfirmationConfirm, action: {
+                                proceed()
+                            })]))
+                        }
+                    })
                 } else {
                     strongSelf.call.disableVideo()
                     strongSelf.cancelScheduledUIHiding()
diff --git a/submodules/TelegramCallsUI/Sources/CallControllerToastNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerToastNode.swift
index b8a472ddcd..ddcb9aa279 100644
--- a/submodules/TelegramCallsUI/Sources/CallControllerToastNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallControllerToastNode.swift
@@ -222,9 +222,6 @@ private class CallControllerToastItemNode: ASDisplayNode {
         self.clipNode = ASDisplayNode()
         self.clipNode.clipsToBounds = true
         self.clipNode.layer.cornerRadius = 14.0
-        if #available(iOS 13.0, *) {
-            self.clipNode.layer.cornerCurve = .continuous
-        }
         
         self.effectView = UIVisualEffectView()
         self.effectView.effect = UIBlurEffect(style: .light)
@@ -248,6 +245,14 @@ private class CallControllerToastItemNode: ASDisplayNode {
         self.clipNode.addSubnode(self.textNode)
     }
     
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.clipNode.layer.cornerCurve = .continuous
+        }
+    }
+    
     func update(width: CGFloat, content: Content, transition: ContainedViewLayoutTransition) -> CGFloat {
         let inset: CGFloat = 30.0
         let isNarrowScreen = width <= 320.0
diff --git a/submodules/TelegramCallsUI/Sources/CallFeedbackController.swift b/submodules/TelegramCallsUI/Sources/CallFeedbackController.swift
index 3016ce0f12..d21e7b7cd1 100644
--- a/submodules/TelegramCallsUI/Sources/CallFeedbackController.swift
+++ b/submodules/TelegramCallsUI/Sources/CallFeedbackController.swift
@@ -314,7 +314,7 @@ public func callFeedbackController(sharedContext: SharedAccountContext, account:
             }
             comment.append(hashtags)
             
-            let _ = rateCallAndSendLogs(account: account, callId: callId, starsCount: rating, comment: comment, userInitiated: userInitiated, includeLogs: state.includeLogs).start()
+            let _ = rateCallAndSendLogs(engine: TelegramEngine(account: account), callId: callId, starsCount: rating, comment: comment, userInitiated: userInitiated, includeLogs: state.includeLogs).start()
             dismissImpl?()
             
             presentControllerImpl?(OverlayStatusController(theme: presentationData.theme, type: .starSuccess(presentationData.strings.CallFeedback_Success)))
diff --git a/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift b/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift
index b148c695db..e816f62270 100644
--- a/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift
+++ b/submodules/TelegramCallsUI/Sources/CallKitIntegration.swift
@@ -169,7 +169,7 @@ class CallKitProviderDelegate: NSObject, CXProviderDelegate {
     func startCall(account: Account, peerId: PeerId, isVideo: Bool, displayTitle: String) {
         let uuid = UUID()
         self.currentStartCallAccount = (uuid, account)
-        let handle = CXHandle(type: .generic, value: "\(peerId.id)")
+        let handle = CXHandle(type: .generic, value: "\(peerId.id._internalGetInt32Value())")
         let startCallAction = CXStartCallAction(call: uuid, handle: handle)
         startCallAction.contactIdentifier = displayTitle
 
diff --git a/submodules/TelegramCallsUI/Sources/CallRatingController.swift b/submodules/TelegramCallsUI/Sources/CallRatingController.swift
index 63103d7e8b..961f02c7a6 100644
--- a/submodules/TelegramCallsUI/Sources/CallRatingController.swift
+++ b/submodules/TelegramCallsUI/Sources/CallRatingController.swift
@@ -240,24 +240,24 @@ private final class CallRatingAlertContentNode: AlertContentNode {
     }
 }
 
-func rateCallAndSendLogs(account: Account, callId: CallId, starsCount: Int, comment: String, userInitiated: Bool, includeLogs: Bool) -> Signal<Void, NoError> {
-    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 4244000)
+func rateCallAndSendLogs(engine: TelegramEngine, callId: CallId, starsCount: Int, comment: String, userInitiated: Bool, includeLogs: Bool) -> Signal<Void, NoError> {
+    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(4244000))
 
-    let rate = rateCall(account: account, callId: callId, starsCount: Int32(starsCount), comment: comment, userInitiated: userInitiated)
+    let rate = engine.calls.rateCall(callId: callId, starsCount: Int32(starsCount), comment: comment, userInitiated: userInitiated)
     if includeLogs {
-        let id = arc4random64()
+        let id = Int64.random(in: Int64.min ... Int64.max)
         let name = "\(callId.id)_\(callId.accessHash).log.json"
-        let path = callLogsPath(account: account) + "/" + name
+        let path = callLogsPath(account: engine.account) + "/" + name
         let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: path, randomId: id), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: name)])
-        let message = EnqueueMessage.message(text: comment, attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+        let message = EnqueueMessage.message(text: comment, attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
         return rate
-        |> then(enqueueMessages(account: account, peerId: peerId, messages: [message])
+        |> then(enqueueMessages(account: engine.account, peerId: peerId, messages: [message])
         |> mapToSignal({ _ -> Signal<Void, NoError> in
             return .single(Void())
         }))
     } else if !comment.isEmpty {
         return rate
-        |> then(enqueueMessages(account: account, peerId: peerId, messages: [.message(text: comment, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)])
+        |> then(enqueueMessages(account: engine.account, peerId: peerId, messages: [.message(text: comment, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
         |> mapToSignal({ _ -> Signal<Void, NoError> in
             return .single(Void())
         }))
@@ -284,7 +284,7 @@ public func callRatingController(sharedContext: SharedAccountContext, account: A
         if rating < 4 {
             push(callFeedbackController(sharedContext: sharedContext, account: account, callId: callId, rating: rating, userInitiated: userInitiated, isVideo: isVideo))
         } else {
-            let _ = rateCallAndSendLogs(account: account, callId: callId, starsCount: rating, comment: "", userInitiated: userInitiated, includeLogs: false).start()
+            let _ = rateCallAndSendLogs(engine: TelegramEngine(account: account), callId: callId, starsCount: rating, comment: "", userInitiated: userInitiated, includeLogs: false).start()
         }
     })
     
diff --git a/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift b/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift
index 5dbf6ecaf4..f02ecdc0ad 100644
--- a/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift
+++ b/submodules/TelegramCallsUI/Sources/CallStatusBarNode.swift
@@ -8,18 +8,29 @@ import TelegramCore
 import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
-import LegacyComponents
 import AnimatedCountLabelNode
 
-private let blue = UIColor(rgb: 0x0078ff)
-private let lightBlue = UIColor(rgb: 0x59c7f8)
+private let blue = UIColor(rgb: 0x007fff)
+private let lightBlue = UIColor(rgb: 0x00affe)
 private let green = UIColor(rgb: 0x33c659)
 private let activeBlue = UIColor(rgb: 0x00a0b9)
+private let purple = UIColor(rgb: 0x3252ef)
+private let pink = UIColor(rgb: 0xef436c)
+private let latePurple = UIColor(rgb: 0xaa56a6)
+private let latePink = UIColor(rgb: 0xef476f)
 
 private class CallStatusBarBackgroundNode: ASDisplayNode {
+    enum State {
+        case connecting
+        case cantSpeak
+        case late
+        case active
+        case speaking
+    }
     private let foregroundView: UIView
     private let foregroundGradientLayer: CAGradientLayer
     private let maskCurveView: VoiceCurveView
+    private let initialTimestamp = CACurrentMediaTime()
     
     var audioLevel: Float = 0.0  {
         didSet {
@@ -35,9 +46,9 @@ private class CallStatusBarBackgroundNode: ASDisplayNode {
         }
     }
     
-    var speaking: Bool? = nil {
+    var state: State = .connecting {
         didSet {
-            if self.speaking != oldValue {
+            if self.state != oldValue {
                 self.updateGradientColors()
             }
         }
@@ -46,13 +57,28 @@ private class CallStatusBarBackgroundNode: ASDisplayNode {
     private func updateGradientColors() {
         let initialColors = self.foregroundGradientLayer.colors
         let targetColors: [CGColor]
-        if let speaking = self.speaking {
-            targetColors = speaking ? [green.cgColor, activeBlue.cgColor] : [blue.cgColor, lightBlue.cgColor]
-        } else {
-            targetColors = [connectingColor.cgColor, connectingColor.cgColor]
+        switch self.state {
+            case .connecting:
+                targetColors = [connectingColor.cgColor, connectingColor.cgColor]
+            case .active:
+                targetColors = [blue.cgColor, lightBlue.cgColor]
+            case .speaking:
+                targetColors = [green.cgColor, activeBlue.cgColor]
+            case .cantSpeak:
+                targetColors = [purple.cgColor, pink.cgColor]
+            case .late:
+                targetColors = [latePurple.cgColor, latePink.cgColor]
+        }
+
+        if CACurrentMediaTime() - self.initialTimestamp > 0.1 {
+            self.foregroundGradientLayer.colors = targetColors
+            self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+        } else {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            self.foregroundGradientLayer.colors = targetColors
+            CATransaction.commit()
         }
-        self.foregroundGradientLayer.colors = targetColors
-        self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
     }
     
     private let hierarchyTrackingNode: HierarchyTrackingNode
@@ -177,6 +203,8 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
     private var currentCallState: PresentationCallState?
     private var currentGroupCallState: PresentationGroupCallSummaryState?
     private var currentIsMuted = true
+    private var currentCantSpeak = false
+    private var currentScheduleTimestamp: Int32?
     private var currentMembers: PresentationGroupCallMembers?
     private var currentIsConnected = true
     
@@ -279,16 +307,25 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
                             strongSelf.currentMembers = members
                                 
                             var isMuted = isMuted
+                            var cantSpeak = false
                             if let state = state, let muteState = state.callState.muteState {
                                 if !muteState.canUnmute {
                                     isMuted = true
+                                    cantSpeak = true
                                 }
                             }
+                            if state?.callState.scheduleTimestamp != nil {
+                                cantSpeak = true
+                            }
                             strongSelf.currentIsMuted = isMuted
+                            strongSelf.currentCantSpeak = cantSpeak
+                            strongSelf.currentScheduleTimestamp = state?.callState.scheduleTimestamp
                             
                             let currentIsConnected: Bool
                             if let state = state, case .connected = state.callState.networkState {
                                 currentIsConnected = true
+                            } else if state?.callState.scheduleTimestamp != nil {
+                                currentIsConnected = true
                             } else {
                                 currentIsConnected = false
                             }
@@ -316,10 +353,11 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
         var title: String = ""
         var speakerSubtitle: String = ""
         
-        let textFont = Font.regular(13.0)
+        let textFont = Font.with(size: 13.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
         let textColor = UIColor.white
         var segments: [AnimatedCountLabelNode.Segment] = []
         var displaySpeakerSubtitle = false
+        var isLate = false
         
         if let presentationData = self.presentationData {
             if let voiceChatTitle = self.currentGroupCallState?.info?.title, !voiceChatTitle.isEmpty {
@@ -350,7 +388,23 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
             }
             displaySpeakerSubtitle = speakerSubtitle != title && !speakerSubtitle.isEmpty
             
-            if let membersCount = membersCount {
+            var requiresTimer = false
+            if let scheduleTime = self.currentGroupCallState?.info?.scheduleTimestamp {
+                requiresTimer = true
+                
+                let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+                let elapsedTime = scheduleTime - currentTime
+                let timerText: String
+                if elapsedTime >= 86400 {
+                    timerText = presentationData.strings.VoiceChat_StatusStartsIn(scheduledTimeIntervalString(strings: presentationData.strings, value: elapsedTime)).0
+                } else if elapsedTime < 0 {
+                    isLate = true
+                    timerText = presentationData.strings.VoiceChat_StatusLateBy(textForTimeout(value: abs(elapsedTime))).0
+                } else {
+                    timerText = presentationData.strings.VoiceChat_StatusStartsIn(textForTimeout(value: elapsedTime)).0
+                }
+                segments.append(.text(0, NSAttributedString(string: timerText, font: textFont, textColor: textColor)))
+            } else if let membersCount = membersCount {
                 var membersPart = presentationData.strings.VoiceChat_Status_Members(membersCount)
                 if membersPart.contains("[") && membersPart.contains("]") {
                     if let startIndex = membersPart.firstIndex(of: "["), let endIndex = membersPart.firstIndex(of: "]") {
@@ -402,6 +456,19 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
             }
             
             self.backgroundNode.connectingColor = color
+            
+            if requiresTimer {
+                if self.currentCallTimer == nil {
+                    let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in
+                        self?.update()
+                    }, queue: Queue.mainQueue())
+                    timer.start()
+                    self.currentCallTimer = timer
+                }
+            } else if let currentCallTimer = self.currentCallTimer {
+                self.currentCallTimer = nil
+                currentCallTimer.invalidate()
+            }
         }
         
         if self.subtitleNode.segments != segments && !displaySpeakerSubtitle {
@@ -439,7 +506,19 @@ public class CallStatusBarNodeImpl: CallStatusBarNode {
             self.speakerNode.frame = CGRect(origin: CGPoint(x: horizontalOrigin + titleSize.width + spacing, y: verticalOrigin + floor((contentHeight - speakerSize.height) / 2.0)), size: speakerSize)
         }
         
-        self.backgroundNode.speaking = self.currentIsConnected ? !self.currentIsMuted : nil
+        let state: CallStatusBarBackgroundNode.State
+        if self.currentIsConnected {
+            if self.currentCantSpeak {
+                state = isLate ? .late : .cantSpeak
+            } else if self.currentIsMuted {
+                state = .active
+            } else {
+                state = .speaking
+            }
+        } else {
+            state = .connecting
+        }
+        self.backgroundNode.state = state
         self.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: size.height + 18.0))
     }
 }
@@ -601,8 +680,8 @@ final class CurveView: UIView {
             }
             CATransaction.begin()
             CATransaction.setDisableActions(true)
-            let lv = minOffset + (maxOffset - minOffset) * level
-            shapeLayer.transform = CATransform3DMakeTranslation(0.0, lv * 16.0, 0.0)
+            let lv = self.minOffset + (self.maxOffset - self.minOffset) * self.level
+            self.shapeLayer.transform = CATransform3DMakeTranslation(0.0, lv * 16.0, 0.0)
             CATransaction.commit()
         }
     }
@@ -616,39 +695,16 @@ final class CurveView: UIView {
         return layer
     }()
     
-    private var transition: CGFloat = 0 {
-        didSet {
-            guard let currentPoints = currentPoints else { return }
-            
-            shapeLayer.path = UIBezierPath.smoothCurve(through: currentPoints, length: bounds.width, smoothness: smoothness, curve: true).cgPath
-        }
-    }
     
     override var frame: CGRect {
         didSet {
             if self.frame.size != oldValue.size {
-                self.fromPoints = nil
-                self.toPoints = nil
+                self.shapeLayer.path = nil
                 self.animateToNewShape()
             }
         }
     }
     
-    private var fromPoints: [CGPoint]?
-    private var toPoints: [CGPoint]?
-    
-    private var currentPoints: [CGPoint]? {
-        guard let fromPoints = fromPoints, let toPoints = toPoints else { return nil }
-        
-        return fromPoints.enumerated().map { offset, fromPoint in
-            let toPoint = toPoints[offset]
-            return CGPoint(
-                x: fromPoint.x + (toPoint.x - fromPoint.x) * transition,
-                y: fromPoint.y + (toPoint.y - fromPoint.y) * transition
-            )
-        }
-    }
-    
     init(
         pointsCount: Int,
         minRandomness: CGFloat,
@@ -670,7 +726,7 @@ final class CurveView: UIView {
         
         super.init(frame: .zero)
         
-        layer.addSublayer(shapeLayer)
+        self.layer.addSublayer(self.shapeLayer)
     }
     
     required init?(coder: NSCoder) {
@@ -678,7 +734,7 @@ final class CurveView: UIView {
     }
     
     func setColor(_ color: UIColor) {
-        shapeLayer.fillColor = color.cgColor
+        self.shapeLayer.fillColor = color.cgColor
     }
     
     func updateSpeedLevel(to newSpeedLevel: CGFloat) {
@@ -690,57 +746,40 @@ final class CurveView: UIView {
     }
     
     func startAnimating() {
-        animateToNewShape()
+        self.animateToNewShape()
     }
     
     func stopAnimating() {
-        fromPoints = currentPoints
-        toPoints = nil
-        pop_removeAnimation(forKey: "curve")
+        self.shapeLayer.removeAnimation(forKey: "path")
     }
     
     private func animateToNewShape() {
-        if pop_animation(forKey: "curve") != nil {
-            fromPoints = currentPoints
-            toPoints = nil
-            pop_removeAnimation(forKey: "curve")
+        if self.shapeLayer.path == nil {
+            let points = self.generateNextCurve(for: self.bounds.size)
+            self.shapeLayer.path = UIBezierPath.smoothCurve(through: points, length: bounds.width, smoothness: self.smoothness, curve: true).cgPath
         }
         
-        if fromPoints == nil {
-            fromPoints = generateNextCurve(for: bounds.size)
-        }
-        if toPoints == nil {
-            toPoints = generateNextCurve(for: bounds.size)
-        }
+        let nextPoints = self.generateNextCurve(for: self.bounds.size)
+        let nextPath = UIBezierPath.smoothCurve(through: nextPoints, length: bounds.width, smoothness: self.smoothness, curve: true).cgPath
         
-        let animation = POPBasicAnimation()
-        animation.property = POPAnimatableProperty.property(withName: "curve.transition", initializer: { property in
-            property?.readBlock = { curveView, values in
-                guard let curveView = curveView as? CurveView, let values = values else { return }
-                
-                values.pointee = curveView.transition
-            }
-            property?.writeBlock = { curveView, values in
-                guard let curveView = curveView as? CurveView, let values = values else { return }
-                
-                curveView.transition = values.pointee
-            }
-        })  as? POPAnimatableProperty
-        animation.completionBlock = { [weak self] animation, finished in
+        let animation = CABasicAnimation(keyPath: "path")
+        let previousPath = self.shapeLayer.path
+        self.shapeLayer.path = nextPath
+        animation.duration = CFTimeInterval(1 / (self.minSpeed + (self.maxSpeed - self.minSpeed) * self.speedLevel))
+        animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+        animation.fromValue = previousPath
+        animation.toValue = nextPath
+        animation.isRemovedOnCompletion = false
+        animation.fillMode = .forwards
+        animation.completion = { [weak self] finished in
             if finished {
-                self?.fromPoints = self?.currentPoints
-                self?.toPoints = nil
                 self?.animateToNewShape()
             }
         }
-        animation.duration = CFTimeInterval(1 / (minSpeed + (maxSpeed - minSpeed) * speedLevel))
-        animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
-        animation.fromValue = 0
-        animation.toValue = 1
-        pop_add(animation, forKey: "curve")
+        self.shapeLayer.add(animation, forKey: "path")
         
-        lastSpeedLevel = speedLevel
-        speedLevel = 0
+        self.lastSpeedLevel = self.speedLevel
+        self.speedLevel = 0
     }
     
     private func generateNextCurve(for size: CGSize) -> [CGPoint] {
@@ -792,8 +831,8 @@ final class CurveView: UIView {
         
         CATransaction.begin()
         CATransaction.setDisableActions(true)
-        shapeLayer.position = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0)
-        shapeLayer.bounds = self.bounds
+        self.shapeLayer.position = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0)
+        self.shapeLayer.bounds = self.bounds
         CATransaction.commit()
     }
 }
diff --git a/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift b/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift
index e3d40c7883..1026980ca3 100644
--- a/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift
+++ b/submodules/TelegramCallsUI/Sources/CallSuggestTabController.swift
@@ -11,16 +11,13 @@ import TelegramUIPreferences
 import AccountContext
 import AppBundle
 
-private func generateIconImage(theme: AlertControllerTheme) -> UIImage? {
-    return UIImage(bundleImageName: "Call List/AlertIcon")
-}
-
 private final class CallSuggestTabAlertContentNode: AlertContentNode {
     private let strings: PresentationStrings
     
     private let titleNode: ASTextNode
     private let textNode: ASTextNode
     private let iconNode: ASImageNode
+    private let accentIconNode: ASImageNode
     
     private let actionNodesSeparator: ASDisplayNode
     private let actionNodes: [TextAlertContentActionNode]
@@ -42,6 +39,12 @@ private final class CallSuggestTabAlertContentNode: AlertContentNode {
         self.textNode.maximumNumberOfLines = 0
         
         self.iconNode = ASImageNode()
+        self.iconNode.displaysAsynchronously = false
+        self.iconNode.displayWithoutProcessing = true
+       
+        self.accentIconNode = ASImageNode()
+        self.accentIconNode.displaysAsynchronously = false
+        self.accentIconNode.displayWithoutProcessing = true
         
         self.actionNodesSeparator = ASDisplayNode()
         self.actionNodesSeparator.isLayerBacked = true
@@ -65,6 +68,7 @@ private final class CallSuggestTabAlertContentNode: AlertContentNode {
         self.addSubnode(self.titleNode)
         self.addSubnode(self.textNode)
         self.addSubnode(self.iconNode)
+        self.addSubnode(self.accentIconNode)
         
         self.addSubnode(self.actionNodesSeparator)
         
@@ -82,7 +86,8 @@ private final class CallSuggestTabAlertContentNode: AlertContentNode {
     override func updateTheme(_ theme: AlertControllerTheme) {
         self.titleNode.attributedText = NSAttributedString(string: strings.Calls_CallTabTitle, font: Font.bold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center)
         self.textNode.attributedText = NSAttributedString(string: strings.Calls_CallTabDescription, font: Font.regular(13.0), textColor: theme.primaryColor, paragraphAlignment: .center)
-        self.iconNode.image = generateIconImage(theme: theme)
+        self.iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call List/AlertIcon"), color: theme.controlBorderColor)
+        self.accentIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call List/AlertAccentIcon"), color: theme.accentColor)
         
         self.actionNodesSeparator.backgroundColor = theme.separatorColor
         for actionNode in self.actionNodes {
@@ -112,7 +117,9 @@ private final class CallSuggestTabAlertContentNode: AlertContentNode {
         var iconSize = CGSize()
         if let icon = self.iconNode.image {
             iconSize = icon.size
-            transition.updateFrame(node: self.iconNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - iconSize.width) / 2.0), y: origin.y), size: iconSize))
+            let iconFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - iconSize.width) / 2.0), y: origin.y), size: iconSize)
+            transition.updateFrame(node: self.iconNode, frame: iconFrame)
+            transition.updateFrame(node: self.accentIconNode, frame: iconFrame)
             origin.y += iconSize.height + 16.0
         }
         
diff --git a/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift b/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift
index e49dc24222..12e61cca8d 100644
--- a/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift
+++ b/submodules/TelegramCallsUI/Sources/GroupCallNavigationAccessoryPanel.swift
@@ -7,12 +7,29 @@ import SyncCore
 import Postbox
 import TelegramPresentationData
 import TelegramUIPreferences
+import TelegramStringFormatting
 import AccountContext
 import AppBundle
 import SwiftSignalKit
 import AnimatedAvatarSetNode
 import AudioBlob
 
+func textForTimeout(value: Int32) -> String {
+    if value < 3600 {
+        let minutes = value / 60
+        let seconds = value % 60
+        let secondsPadding = seconds < 10 ? "0" : ""
+        return "\(minutes):\(secondsPadding)\(seconds)"
+    } else {
+        let hours = value / 3600
+        let minutes = (value % 3600) / 60
+        let minutesPadding = minutes < 10 ? "0" : ""
+        let seconds = value % 60
+        let secondsPadding = seconds < 10 ? "0" : ""
+        return "\(hours):\(minutesPadding)\(minutes):\(secondsPadding)\(seconds)"
+    }
+}
+
 private let titleFont = Font.semibold(15.0)
 private let subtitleFont = Font.regular(13.0)
 
@@ -79,6 +96,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
     private let context: AccountContext
     private var theme: PresentationTheme
     private var strings: PresentationStrings
+    private var dateTimeFormat: PresentationDateTimeFormat
     
     private let tapAction: () -> Void
     
@@ -102,12 +120,18 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
     private var textIsActive = false
     private let muteIconNode: ASImageNode
     
+    private var isScheduled = false
+    private var isLate = false
+    private var currentText: String = ""
+    private var updateTimer: SwiftSignalKit.Timer?
+    
     private let avatarsContext: AnimatedAvatarSetContext
     private var avatarsContent: AnimatedAvatarSetContext.Content?
     private let avatarsNode: AnimatedAvatarSetNode
     private var audioLevelGenerators: [PeerId: FakeAudioLevelGenerator] = [:]
     private var audioLevelGeneratorTimer: SwiftSignalKit.Timer?
-    
+
+    private let backgroundNode: ASDisplayNode
     private let separatorNode: ASDisplayNode
     
     private let membersDisposable = MetaDisposable()
@@ -125,6 +149,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         self.context = context
         self.theme = presentationData.theme
         self.strings = presentationData.strings
+        self.dateTimeFormat = presentationData.dateTimeFormat
         
         self.tapAction = tapAction
         
@@ -135,6 +160,9 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         self.joinButton = HighlightableButtonNode()
         self.joinButtonTitleNode = ImmediateTextNode()
         self.joinButtonBackgroundNode = ASImageNode()
+        self.joinButtonBackgroundNode.clipsToBounds = true
+        self.joinButtonBackgroundNode.displaysAsynchronously = false
+        self.joinButtonBackgroundNode.cornerRadius = 14.0
         
         self.micButton = HighlightTrackingButtonNode()
         self.micButtonForegroundNode = VoiceChatMicrophoneNode()
@@ -147,13 +175,17 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         
         self.avatarsContext = AnimatedAvatarSetContext()
         self.avatarsNode = AnimatedAvatarSetNode()
+
+        self.backgroundNode = ASDisplayNode()
         
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
         
         super.init()
-        
+
         self.addSubnode(self.contentNode)
+
+        self.contentNode.addSubnode(self.backgroundNode)
         
         self.tapButton.highligthedChanged = { [weak self] highlighted in
             if let strongSelf = self {
@@ -198,6 +230,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         self.membersDisposable.dispose()
         self.isMutedDisposable.dispose()
         self.audioLevelGeneratorTimer?.invalidate()
+        self.updateTimer?.invalidate()
     }
     
     public override func didLoad() {
@@ -250,25 +283,50 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
     public func updatePresentationData(_ presentationData: PresentationData) {
         self.theme = presentationData.theme
         self.strings = presentationData.strings
-        
-        self.contentNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
-        
-        self.theme = presentationData.theme
-        
+        self.dateTimeFormat = presentationData.dateTimeFormat
+
         self.separatorNode.backgroundColor = presentationData.theme.chat.historyNavigation.strokeColor
         
-        self.joinButtonTitleNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_PanelJoin.uppercased(), font: Font.semibold(15.0), textColor: presentationData.theme.chat.inputPanel.actionControlForegroundColor)
-        self.joinButtonBackgroundNode.image = generateStretchableFilledCircleImage(diameter: 28.0, color: presentationData.theme.chat.inputPanel.actionControlFillColor)
-        
+        self.joinButtonTitleNode.attributedText = NSAttributedString(string: self.joinButtonTitleNode.attributedText?.string ?? "", font: Font.with(size: 15.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: self.isScheduled ? .white : presentationData.theme.chat.inputPanel.actionControlForegroundColor)
         self.textNode.attributedText = NSAttributedString(string: self.textNode.attributedText?.string ?? "", font: Font.regular(13.0), textColor: presentationData.theme.chat.inputPanel.secondaryTextColor)
         
         self.muteIconNode.image = PresentationResourcesChat.chatTitleMuteIcon(presentationData.theme)
         
+        self.updateJoinButton()
+        
         if let (size, leftInset, rightInset) = self.validLayout {
             self.updateLayout(size: size, leftInset: leftInset, rightInset: rightInset, transition: .immediate)
         }
     }
     
+    private func updateJoinButton() {
+        if self.isScheduled {
+            let purple = UIColor(rgb: 0x5d4ed1)
+            let pink = UIColor(rgb: 0xea436f)
+            let latePurple = UIColor(rgb: 0xaa56a6)
+            let latePink = UIColor(rgb: 0xef476f)
+            let colors: [UIColor]
+            if self.isLate {
+                colors = [latePurple, latePink]
+            } else {
+                colors = [purple, pink]
+            }
+            if self.joinButtonBackgroundNode.image != nil, let snapshotView = self.joinButtonBackgroundNode.view.snapshotContentTree() {
+                self.joinButtonBackgroundNode.view.superview?.insertSubview(snapshotView, aboveSubview: self.joinButtonBackgroundNode.view)
+                
+                snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 1.0, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                    snapshotView?.removeFromSuperview()
+                })
+            }
+            
+            self.joinButtonBackgroundNode.image = generateGradientImage(size: CGSize(width: 100.0, height: 1.0), colors: colors, locations: [0.0, 1.0], direction: .horizontal)
+            self.joinButtonBackgroundNode.backgroundColor = nil
+        } else {
+            self.joinButtonBackgroundNode.image = nil
+            self.joinButtonBackgroundNode.backgroundColor = self.theme.chat.inputPanel.actionControlFillColor
+        }
+    }
+    
     private func animateTextChange() {
         if let snapshotView = self.textNode.view.snapshotContentTree() {
             let offset: CGFloat = self.textIsActive ? -7.0 : 7.0
@@ -298,6 +356,7 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
             } else {
                 membersText = self.strings.VoiceChat_Panel_Members(Int32(data.participantCount))
             }
+            self.currentText = membersText
             
             self.avatarsContent = self.avatarsContext.update(peers: data.topParticipants.map { $0.peer }, animated: false)
             
@@ -321,9 +380,8 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
                     } else {
                         membersText = strongSelf.strings.VoiceChat_Panel_Members(Int32(summaryState.participantCount))
                     }
-                                        
-                    strongSelf.textNode.attributedText = NSAttributedString(string: membersText, font: Font.regular(13.0), textColor: strongSelf.theme.chat.inputPanel.secondaryTextColor)
-                    
+                    strongSelf.currentText = membersText
+                                                            
                     strongSelf.avatarsContent = strongSelf.avatarsContext.update(peers: summaryState.topParticipants.map { $0.peer }, animated: false)
                     
                     if let (size, leftInset, rightInset) = strongSelf.validLayout {
@@ -382,7 +440,6 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
                         strongSelf.micButton.view.insertSubview(audioLevelView, at: 0)
                     }
                     
-                    let level = min(1.0, max(0.0, CGFloat(value)))
                     strongSelf.audioLevelView?.updateLevel(CGFloat(value) * 2.0)
                     if value > 0.0 {
                         strongSelf.audioLevelView?.startAnimating()
@@ -400,9 +457,8 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
             } else {
                 membersText = self.strings.VoiceChat_Panel_Members(Int32(data.participantCount))
             }
+            self.currentText = membersText
             
-            self.textNode.attributedText = NSAttributedString(string: membersText, font: Font.regular(13.0), textColor: self.theme.chat.inputPanel.secondaryTextColor)
-
             self.avatarsContent = self.avatarsContext.update(peers: data.topParticipants.map { $0.peer }, animated: false)
             
             updateAudioLevels = true
@@ -466,6 +522,59 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
             transition.updateFrame(node: self.avatarsNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - avatarsSize.width) / 2.0), y: floor((size.height - avatarsSize.height) / 2.0)), size: avatarsSize))
         }
         
+        var joinText = self.strings.VoiceChat_PanelJoin
+        var title = self.strings.VoiceChat_Title
+        var text = self.currentText
+        var isScheduled = false
+        var isLate = false
+        if let scheduleTime = self.currentData?.info.scheduleTimestamp {
+            isScheduled = true
+            if let voiceChatTitle = self.currentData?.info.title {
+                title = voiceChatTitle
+                text = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true, format: HumanReadableStringFormat(dateFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsOn($0) }, tomorrowFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTomorrow($0) }, todayFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsToday($0) })).0
+            } else {
+                title = self.strings.Conversation_ScheduledVoiceChat
+                text = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true, format: HumanReadableStringFormat(dateFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsOnShort($0) }, tomorrowFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTomorrowShort($0) }, todayFormatString: { self.strings.Conversation_ScheduledVoiceChatStartsTodayShort($0) })).0
+            }
+            
+            let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+            let elapsedTime = scheduleTime - currentTime
+            if elapsedTime >= 86400 {
+                joinText = scheduledTimeIntervalString(strings: strings, value: elapsedTime)
+            } else if elapsedTime < 0 {
+                joinText = "-\(textForTimeout(value: abs(elapsedTime)))"
+                isLate = true
+            } else {
+                joinText = textForTimeout(value: elapsedTime)
+            }
+            
+            if self.updateTimer == nil {
+                let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in
+                    if let strongSelf = self, let (size, leftInset, rightInset) = strongSelf.validLayout {
+                        strongSelf.updateLayout(size: size, leftInset: leftInset, rightInset: rightInset, transition: .immediate)
+                    }
+                }, queue: Queue.mainQueue())
+                self.updateTimer = timer
+                timer.start()
+            }
+        } else {
+            if let timer = self.updateTimer {
+                self.updateTimer = nil
+                timer.invalidate()
+            }
+            if let voiceChatTitle = self.currentData?.info.title, voiceChatTitle.count < 15 {
+                title = voiceChatTitle
+            }
+        }
+        
+        if self.isScheduled != isScheduled || self.isLate != isLate {
+            self.isScheduled = isScheduled
+            self.isLate = isLate
+            self.updateJoinButton()
+        }
+        
+        self.joinButtonTitleNode.attributedText = NSAttributedString(string: joinText.uppercased(), font: Font.with(size: 15.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: isScheduled ? .white : self.theme.chat.inputPanel.actionControlForegroundColor)
+        
         let joinButtonTitleSize = self.joinButtonTitleNode.updateLayout(CGSize(width: 150.0, height: .greatestFiniteMagnitude))
         let joinButtonSize = CGSize(width: joinButtonTitleSize.width + 20.0, height: 28.0)
         let joinButtonFrame = CGRect(origin: CGPoint(x: size.width - rightInset - 7.0 - joinButtonSize.width, y: floor((panelHeight - joinButtonSize.height) / 2.0)), size: joinButtonSize)
@@ -500,15 +609,17 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
                 self.micButtonBackgroundNode.image = updatedImage
             }
         }
-        
-        var title = self.strings.VoiceChat_Title
-        if let voiceChatTitle = self.currentData?.info.title, voiceChatTitle.count < 15 {
-            title = voiceChatTitle
-        }
-        
+                
         self.titleNode.attributedText = NSAttributedString(string: title, font: Font.semibold(15.0), textColor: self.theme.chat.inputPanel.primaryTextColor)
         
-        let titleSize = self.titleNode.updateLayout(CGSize(width: size.width / 2.0 - 56.0, height: .greatestFiniteMagnitude))
+        self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(13.0), textColor: self.theme.chat.inputPanel.secondaryTextColor)
+        
+        var constrainedWidth = size.width / 2.0 - 56.0
+        if isScheduled {
+            constrainedWidth = size.width - 100.0
+        }
+        
+        let titleSize = self.titleNode.updateLayout(CGSize(width: constrainedWidth, height: .greatestFiniteMagnitude))
         let textSize = self.textNode.updateLayout(CGSize(width: size.width, height: .greatestFiniteMagnitude))
         
         let titleFrame = CGRect(origin: CGPoint(x: leftInset + 16.0, y: 9.0), size: titleSize)
@@ -522,7 +633,8 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         self.joinButton.isHidden = self.currentData?.groupCall != nil
         self.micButton.isHidden = self.currentData?.groupCall == nil
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: panelHeight)))
     }
     
     public func animateIn(_ transition: ContainedViewLayoutTransition) {
@@ -531,6 +643,12 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
         transition.animatePosition(node: self.contentNode, from: CGPoint(x: contentPosition.x, y: contentPosition.y - 50.0), completion: { [weak self] _ in
             self?.clipsToBounds = false
         })
+
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.animatePositionAdditive(node: self.separatorNode, offset: CGPoint(x: 0.0, y: size.height))
     }
     
     public func animateOut(_ transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
@@ -540,6 +658,12 @@ public final class GroupCallNavigationAccessoryPanel: ASDisplayNode {
             self?.clipsToBounds = false
             completion()
         })
+
+        guard let (size, _, _) = self.validLayout else {
+            return
+        }
+
+        transition.updatePosition(node: self.separatorNode, position: self.separatorNode.position.offsetBy(dx: 0.0, dy: size.height))
     }
     
     func rightButtonSnapshotViews() -> (background: UIView, foreground: UIView)? {
diff --git a/submodules/TelegramCallsUI/Sources/GroupVideoNode.swift b/submodules/TelegramCallsUI/Sources/GroupVideoNode.swift
new file mode 100644
index 0000000000..3167b142ed
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/GroupVideoNode.swift
@@ -0,0 +1,374 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import AccountContext
+import ContextUI
+
+final class GroupVideoNode: ASDisplayNode {
+    static let useBlurTransparency: Bool = !UIAccessibility.isReduceTransparencyEnabled
+
+    enum Position {
+        case tile
+        case list
+        case mainstage
+    }
+    
+    enum LayoutMode {
+        case fillOrFitToSquare
+        case fillHorizontal
+        case fillVertical
+        case fit
+    }
+    
+    let sourceContainerNode: PinchSourceContainerNode
+    private let containerNode: ASDisplayNode
+    private let videoViewContainer: UIView
+    private let videoView: VideoRenderingView
+    
+    private let backdropVideoViewContainer: UIView
+    private let backdropVideoView: VideoRenderingView?
+    private var backdropEffectView: UIVisualEffectView?
+    
+    private var effectView: UIVisualEffectView?
+    private var isBlurred: Bool = false
+
+    private var isEnabled: Bool = false
+    private var isBlurEnabled: Bool = false
+        
+    private var validLayout: (CGSize, LayoutMode)?
+    
+    var tapped: (() -> Void)?
+    
+    private let readyPromise = ValuePromise(false)
+    var ready: Signal<Bool, NoError> {
+        return self.readyPromise.get()
+    }
+    
+    public var isMainstageExclusive = false
+    
+    init(videoView: VideoRenderingView, backdropVideoView: VideoRenderingView?) {
+        self.sourceContainerNode = PinchSourceContainerNode()
+        self.containerNode = ASDisplayNode()
+        self.videoViewContainer = UIView()
+        self.videoViewContainer.isUserInteractionEnabled = false
+        self.videoView = videoView
+        
+        self.backdropVideoViewContainer = UIView()
+        self.backdropVideoViewContainer.isUserInteractionEnabled = false
+        self.backdropVideoView = backdropVideoView
+                
+        super.init()
+                
+        if let backdropVideoView = backdropVideoView {
+            self.backdropVideoViewContainer.addSubview(backdropVideoView)
+            self.view.addSubview(self.backdropVideoViewContainer)
+            
+            let effect: UIVisualEffect
+            if #available(iOS 13.0, *) {
+                effect = UIBlurEffect(style: .systemThinMaterialDark)
+            } else {
+                effect = UIBlurEffect(style: .dark)
+            }
+            //let backdropEffectView = UIVisualEffectView(effect: effect)
+            //self.view.addSubview(backdropEffectView)
+            //self.backdropEffectView = backdropEffectView
+        }
+        
+        self.videoViewContainer.addSubview(self.videoView)
+        self.addSubnode(self.sourceContainerNode)
+        self.containerNode.view.addSubview(self.videoViewContainer)
+        self.sourceContainerNode.contentNode.addSubnode(self.containerNode)
+                
+        self.clipsToBounds = true
+        
+        videoView.setOnFirstFrameReceived({ [weak self] _ in
+            Queue.mainQueue().async {
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.readyPromise.set(true)
+                if let (size, layoutMode) = strongSelf.validLayout {
+                    strongSelf.updateLayout(size: size, layoutMode: layoutMode, transition: .immediate)
+                }
+            }
+        })
+        
+        videoView.setOnOrientationUpdated({ [weak self] _, _ in
+            Queue.mainQueue().async {
+                guard let strongSelf = self else {
+                    return
+                }
+                if let (size, layoutMode) = strongSelf.validLayout {
+                    strongSelf.updateLayout(size: size, layoutMode: layoutMode, transition: .immediate)
+                }
+            }
+        })
+        
+        self.containerNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
+    }
+
+    func updateIsEnabled(_ isEnabled: Bool) {
+        self.isEnabled = isEnabled
+
+        self.videoView.updateIsEnabled(isEnabled)
+        self.backdropVideoView?.updateIsEnabled(isEnabled && self.isBlurEnabled)
+    }
+    
+    func updateIsBlurred(isBlurred: Bool, light: Bool = false, animated: Bool = true) {
+        if self.isBlurred == isBlurred {
+            return
+        }
+        self.isBlurred = isBlurred
+        
+        if isBlurred {
+            if self.effectView == nil {
+                let effectView = UIVisualEffectView()
+                self.effectView = effectView
+                effectView.frame = self.bounds
+                self.view.addSubview(effectView)
+            }
+            if animated {
+                UIView.animate(withDuration: 0.3, animations: {
+                    self.effectView?.effect = UIBlurEffect(style: light ? .light : .dark)
+                })
+            } else {
+                self.effectView?.effect = UIBlurEffect(style: light ? .light : .dark)
+            }
+        } else if let effectView = self.effectView {
+            self.effectView = nil
+            UIView.animate(withDuration: 0.3, animations: {
+                effectView.effect = nil
+            }, completion: { [weak effectView] _ in
+                effectView?.removeFromSuperview()
+            })
+        }
+    }
+    
+    func flip(withBackground: Bool) {
+        if withBackground {
+            self.backgroundColor = .black
+        }
+        var snapshotView: UIView?
+        if let snapshot = self.videoView.snapshotView(afterScreenUpdates: false) {
+            snapshotView = snapshot
+            snapshot.transform = self.videoView.transform
+            snapshot.frame = self.videoView.frame
+            self.videoView.superview?.insertSubview(snapshot, aboveSubview: self.videoView)
+        }
+        UIView.transition(with: withBackground ? self.videoViewContainer : self.view, duration: 0.4, options: [.transitionFlipFromLeft, .curveEaseOut], animations: {
+            UIView.performWithoutAnimation {
+                self.updateIsBlurred(isBlurred: true, light: false, animated: false)
+            }
+        }) { finished in
+            self.backgroundColor = nil
+            if let snapshotView = snapshotView {
+                Queue.mainQueue().after(0.3) {
+                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                        snapshotView?.removeFromSuperview()
+                    })
+                    self.updateIsBlurred(isBlurred: false)
+                }
+            } else {
+                Queue.mainQueue().after(0.4) {
+                    self.updateIsBlurred(isBlurred: false)
+                }
+            }
+        }
+    }
+    
+    @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.tapped?()
+        }
+    }
+    
+    var aspectRatio: CGFloat {
+        let orientation = self.videoView.getOrientation()
+        var aspect = self.videoView.getAspect()
+        if aspect <= 0.01 {
+            aspect = 3.0 / 4.0
+        }
+        let rotatedAspect: CGFloat
+        switch orientation {
+        case .rotation0:
+            rotatedAspect = 1.0 / aspect
+        case .rotation90:
+            rotatedAspect = aspect
+        case .rotation180:
+            rotatedAspect = 1.0 / aspect
+        case .rotation270:
+            rotatedAspect = aspect
+        }
+        return rotatedAspect
+    }
+    
+    func updateLayout(size: CGSize, layoutMode: LayoutMode, transition: ContainedViewLayoutTransition) {
+        self.validLayout = (size, layoutMode)
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        self.sourceContainerNode.update(size: size, transition: .immediate)
+        transition.updateFrameAsPositionAndBounds(node: self.sourceContainerNode, frame: bounds)
+        transition.updateFrameAsPositionAndBounds(node: self.containerNode, frame: bounds)
+        transition.updateFrameAsPositionAndBounds(layer: self.videoViewContainer.layer, frame: bounds)
+        transition.updateFrameAsPositionAndBounds(layer: self.backdropVideoViewContainer.layer, frame: bounds)
+        
+        let orientation = self.videoView.getOrientation()
+        var aspect = self.videoView.getAspect()
+        if aspect <= 0.01 {
+            aspect = 3.0 / 4.0
+        }
+        
+        let rotatedAspect: CGFloat
+        let angle: CGFloat
+        let switchOrientation: Bool
+        switch orientation {
+        case .rotation0:
+            angle = 0.0
+            rotatedAspect = 1 / aspect
+            switchOrientation = false
+        case .rotation90:
+            angle = CGFloat.pi / 2.0
+            rotatedAspect = aspect
+            switchOrientation = true
+        case .rotation180:
+            angle = CGFloat.pi
+            rotatedAspect = 1 / aspect
+            switchOrientation = false
+        case .rotation270:
+            angle = CGFloat.pi * 3.0 / 2.0
+            rotatedAspect = aspect
+            switchOrientation = true
+        }
+        
+        var rotatedVideoSize = CGSize(width: 100.0, height: rotatedAspect * 100.0)
+        let videoSize = rotatedVideoSize
+        
+        var containerSize = size
+        if switchOrientation {
+            rotatedVideoSize = CGSize(width: rotatedVideoSize.height, height: rotatedVideoSize.width)
+            containerSize = CGSize(width: containerSize.height, height: containerSize.width)
+        }
+        
+        let fittedSize = rotatedVideoSize.aspectFitted(containerSize)
+        let filledSize = rotatedVideoSize.aspectFilled(containerSize)
+        var squareSide = size.height
+        if !size.height.isZero && size.width / size.height < 1.2 {
+            squareSide = max(size.width, size.height)
+        }
+        let filledToSquareSize = rotatedVideoSize.aspectFilled(CGSize(width: squareSide, height: squareSide))
+        
+        switch layoutMode {
+            case .fit:
+                rotatedVideoSize = fittedSize
+            case .fillOrFitToSquare:
+                rotatedVideoSize = filledToSquareSize
+            case .fillHorizontal:
+                if videoSize.width > videoSize.height {
+                    rotatedVideoSize = filledSize
+                } else {
+                    rotatedVideoSize = fittedSize
+                }
+            case .fillVertical:
+                if videoSize.width < videoSize.height {
+                    rotatedVideoSize = filledSize
+                } else {
+                    rotatedVideoSize = fittedSize
+                }
+        }
+        
+        var rotatedVideoFrame = CGRect(origin: CGPoint(x: floor((size.width - rotatedVideoSize.width) / 2.0), y: floor((size.height - rotatedVideoSize.height) / 2.0)), size: rotatedVideoSize)
+        rotatedVideoFrame.origin.x = floor(rotatedVideoFrame.origin.x)
+        rotatedVideoFrame.origin.y = floor(rotatedVideoFrame.origin.y)
+        rotatedVideoFrame.size.width = ceil(rotatedVideoFrame.size.width)
+        rotatedVideoFrame.size.height = ceil(rotatedVideoFrame.size.height)
+
+        self.videoView.alpha = 0.995
+        
+        let normalizedVideoSize = rotatedVideoFrame.size.aspectFilled(CGSize(width: 1080.0, height: 1080.0))
+        transition.updatePosition(layer: self.videoView.layer, position: rotatedVideoFrame.center)
+        transition.updateBounds(layer: self.videoView.layer, bounds: CGRect(origin: CGPoint(), size: normalizedVideoSize))
+        
+        let transformScale: CGFloat = rotatedVideoFrame.width / normalizedVideoSize.width
+        transition.updateTransformScale(layer: self.videoViewContainer.layer, scale: transformScale)
+        
+        if let backdropVideoView = self.backdropVideoView {
+            backdropVideoView.alpha = 0.995
+
+            let topFrame = rotatedVideoFrame
+            
+            rotatedVideoSize = filledSize
+            var rotatedVideoFrame = CGRect(origin: CGPoint(x: floor((size.width - rotatedVideoSize.width) / 2.0), y: floor((size.height - rotatedVideoSize.height) / 2.0)), size: rotatedVideoSize)
+            rotatedVideoFrame.origin.x = floor(rotatedVideoFrame.origin.x)
+            rotatedVideoFrame.origin.y = floor(rotatedVideoFrame.origin.y)
+            rotatedVideoFrame.size.width = ceil(rotatedVideoFrame.size.width)
+            rotatedVideoFrame.size.height = ceil(rotatedVideoFrame.size.height)
+
+            self.isBlurEnabled = !topFrame.contains(rotatedVideoFrame)
+            
+            let normalizedVideoSize = rotatedVideoFrame.size.aspectFilled(CGSize(width: 1080.0, height: 1080.0))
+
+            self.backdropVideoView?.updateIsEnabled(self.isEnabled && self.isBlurEnabled)
+
+            if self.isBlurEnabled {
+                self.backdropVideoView?.isHidden = false
+                self.backdropEffectView?.isHidden = false
+            }
+            transition.updatePosition(layer: backdropVideoView.layer, position: rotatedVideoFrame.center, force: true, completion: { [weak self] value in
+                guard let strongSelf = self, value else {
+                    return
+                }
+                if !strongSelf.isBlurEnabled {
+                    strongSelf.backdropVideoView?.updateIsEnabled(false)
+                    strongSelf.backdropVideoView?.isHidden = true
+                    strongSelf.backdropEffectView?.isHidden = false
+                }
+            })
+            transition.updateBounds(layer: backdropVideoView.layer, bounds: CGRect(origin: CGPoint(), size: normalizedVideoSize))
+            
+            let transformScale: CGFloat = rotatedVideoFrame.width / normalizedVideoSize.width
+
+            transition.updateTransformScale(layer: self.backdropVideoViewContainer.layer, scale: transformScale)
+            
+            let transition: ContainedViewLayoutTransition = .immediate
+            transition.updateTransformRotation(view: backdropVideoView, angle: angle)
+        }
+        
+        if let backdropEffectView = self.backdropEffectView {
+            let maxSide = max(bounds.width, bounds.height) + 32.0
+            let squareBounds = CGRect(x: (bounds.width - maxSide) / 2.0, y: (bounds.height - maxSide) / 2.0, width: maxSide, height: maxSide)
+            
+            if case let .animated(duration, .spring) = transition {
+                UIView.animate(withDuration: duration, delay: 0.0, usingSpringWithDamping: 500.0, initialSpringVelocity: 0.0, options: .layoutSubviews, animations: {
+                    backdropEffectView.frame = squareBounds
+                })
+            } else {
+                transition.animateView {
+                    backdropEffectView.frame = squareBounds
+                }
+            }
+        }
+        
+        if let effectView = self.effectView {
+            if case let .animated(duration, .spring) = transition {
+                UIView.animate(withDuration: duration, delay: 0.0, usingSpringWithDamping: 500.0, initialSpringVelocity: 0.0, options: .layoutSubviews, animations: {
+                    effectView.frame = bounds
+                })
+            } else {
+                transition.animateView {
+                    effectView.frame = bounds
+                }
+            }
+        }
+        
+        let transition: ContainedViewLayoutTransition = .immediate
+        transition.updateTransformRotation(view: self.videoView, angle: angle)
+    }
+    
+    var snapshotView: UIView?
+    func storeSnapshot() {
+        if self.frame.size.width == 180.0 {
+            self.snapshotView = self.view.snapshotView(afterScreenUpdates: false)
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/MetalVideoRenderingView.swift b/submodules/TelegramCallsUI/Sources/MetalVideoRenderingView.swift
new file mode 100644
index 0000000000..54545769af
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/MetalVideoRenderingView.swift
@@ -0,0 +1,657 @@
+#if targetEnvironment(simulator)
+#else
+
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import AccountContext
+import TelegramVoip
+import AVFoundation
+import Metal
+import MetalPerformanceShaders
+
+private func alignUp(size: Int, align: Int) -> Int {
+    precondition(((align - 1) & align) == 0, "Align must be a power of two")
+
+    let alignmentMask = align - 1
+    return (size + alignmentMask) & ~alignmentMask
+}
+
+private func getCubeVertexData(
+    cropX: Int,
+    cropY: Int,
+    cropWidth: Int,
+    cropHeight: Int,
+    frameWidth: Int,
+    frameHeight: Int,
+    rotation: Int,
+    buffer: UnsafeMutablePointer<Float>
+) {
+    let cropLeft = Float(cropX) / Float(frameWidth)
+    let cropRight = Float(cropX + cropWidth) / Float(frameWidth)
+    let cropTop = Float(cropY) / Float(frameHeight)
+    let cropBottom = Float(cropY + cropHeight) / Float(frameHeight)
+
+    switch rotation {
+    default:
+        var values: [Float] = [
+            -1.0, -1.0, cropLeft, cropBottom,
+            1.0, -1.0, cropRight, cropBottom,
+            -1.0,  1.0, cropLeft, cropTop,
+            1.0,  1.0, cropRight, cropTop
+        ]
+        memcpy(buffer, &values, values.count * MemoryLayout.size(ofValue: values[0]));
+    }
+}
+
+@available(iOS 13.0, *)
+private protocol FrameBufferRenderingState {
+    var frameSize: CGSize? { get }
+
+    func encode(renderingContext: MetalVideoRenderingContext, vertexBuffer: MTLBuffer, renderEncoder: MTLRenderCommandEncoder) -> Bool
+}
+
+@available(iOS 13.0, *)
+private final class BlitRenderingState {
+    static func encode(renderingContext: MetalVideoRenderingContext, texture: MTLTexture, vertexBuffer: MTLBuffer, renderEncoder: MTLRenderCommandEncoder) -> Bool {
+        renderEncoder.setRenderPipelineState(renderingContext.blitPipelineState)
+
+        renderEncoder.setVertexBuffer(vertexBuffer, offset: 0, index: 0)
+
+        renderEncoder.setFragmentTexture(texture, index: 0)
+
+        renderEncoder.drawPrimitives(type: .triangleStrip, vertexStart: 0, vertexCount: 4, instanceCount: 1)
+
+        return true
+    }
+}
+
+@available(iOS 13.0, *)
+private final class NV12FrameBufferRenderingState: FrameBufferRenderingState {
+    private var yTexture: MTLTexture?
+    private var uvTexture: MTLTexture?
+
+    var frameSize: CGSize? {
+        if let yTexture = self.yTexture {
+            return CGSize(width: yTexture.width, height: yTexture.height)
+        } else {
+            return nil
+        }
+    }
+
+    func updateTextureBuffers(renderingContext: MetalVideoRenderingContext, frameBuffer: OngoingGroupCallContext.VideoFrameData.NativeBuffer) {
+        let pixelBuffer = frameBuffer.pixelBuffer
+
+        var lumaTexture: MTLTexture?
+        var chromaTexture: MTLTexture?
+        var outTexture: CVMetalTexture?
+
+        let lumaWidth = CVPixelBufferGetWidthOfPlane(pixelBuffer, 0)
+        let lumaHeight = CVPixelBufferGetHeightOfPlane(pixelBuffer, 0)
+
+        var indexPlane = 0
+        var result = CVMetalTextureCacheCreateTextureFromImage(kCFAllocatorDefault, renderingContext.textureCache, pixelBuffer, nil, .r8Unorm, lumaWidth, lumaHeight, indexPlane, &outTexture)
+        if result == kCVReturnSuccess, let outTexture = outTexture {
+            lumaTexture = CVMetalTextureGetTexture(outTexture)
+        }
+        outTexture = nil
+
+        indexPlane = 1
+        result = CVMetalTextureCacheCreateTextureFromImage(kCFAllocatorDefault, renderingContext.textureCache, pixelBuffer, nil, .rg8Unorm, lumaWidth / 2, lumaHeight / 2, indexPlane, &outTexture)
+        if result == kCVReturnSuccess, let outTexture = outTexture {
+            chromaTexture = CVMetalTextureGetTexture(outTexture)
+        }
+        outTexture = nil
+
+        if let lumaTexture = lumaTexture, let chromaTexture = chromaTexture {
+            self.yTexture = lumaTexture
+            self.uvTexture = chromaTexture
+        } else {
+            self.yTexture = nil
+            self.uvTexture = nil
+        }
+    }
+
+    func encode(renderingContext: MetalVideoRenderingContext, vertexBuffer: MTLBuffer, renderEncoder: MTLRenderCommandEncoder) -> Bool {
+        guard let yTexture = self.yTexture, let uvTexture = self.uvTexture else {
+            return false
+        }
+
+        renderEncoder.setRenderPipelineState(renderingContext.nv12PipelineState)
+
+        renderEncoder.setVertexBuffer(vertexBuffer, offset: 0, index: 0)
+
+        renderEncoder.setFragmentTexture(yTexture, index: 0)
+        renderEncoder.setFragmentTexture(uvTexture, index: 1)
+
+        renderEncoder.drawPrimitives(type: .triangleStrip, vertexStart: 0, vertexCount: 4, instanceCount: 1)
+
+        return true
+    }
+}
+
+@available(iOS 13.0, *)
+private final class I420FrameBufferRenderingState: FrameBufferRenderingState {
+    private var yTexture: MTLTexture?
+    private var uTexture: MTLTexture?
+    private var vTexture: MTLTexture?
+
+    private var lumaTextureDescriptorSize: CGSize?
+    private var lumaTextureDescriptor: MTLTextureDescriptor?
+    private var chromaTextureDescriptor: MTLTextureDescriptor?
+
+    var frameSize: CGSize? {
+        if let yTexture = self.yTexture {
+            return CGSize(width: yTexture.width, height: yTexture.height)
+        } else {
+            return nil
+        }
+    }
+
+    func updateTextureBuffers(renderingContext: MetalVideoRenderingContext, frameBuffer: OngoingGroupCallContext.VideoFrameData.I420Buffer) {
+        let lumaSize = CGSize(width: frameBuffer.width, height: frameBuffer.height)
+
+        if lumaSize != lumaTextureDescriptorSize || lumaTextureDescriptor == nil || chromaTextureDescriptor == nil {
+            self.lumaTextureDescriptorSize = lumaSize
+
+            let lumaTextureDescriptor = MTLTextureDescriptor.texture2DDescriptor(pixelFormat: .r8Unorm, width: frameBuffer.width, height: frameBuffer.height, mipmapped: false)
+            lumaTextureDescriptor.usage = .shaderRead
+            self.lumaTextureDescriptor = lumaTextureDescriptor
+
+            self.yTexture = renderingContext.device.makeTexture(descriptor: lumaTextureDescriptor)
+
+            let chromaTextureDescriptor = MTLTextureDescriptor.texture2DDescriptor(pixelFormat: .r8Unorm, width: frameBuffer.width / 2, height: frameBuffer.height / 2, mipmapped: false)
+            chromaTextureDescriptor.usage = .shaderRead
+            self.chromaTextureDescriptor = chromaTextureDescriptor
+
+            self.uTexture = renderingContext.device.makeTexture(descriptor: chromaTextureDescriptor)
+            self.vTexture = renderingContext.device.makeTexture(descriptor: chromaTextureDescriptor)
+        }
+
+        guard let yTexture = self.yTexture, let uTexture = self.uTexture, let vTexture = self.vTexture else {
+            return
+        }
+
+        frameBuffer.y.withUnsafeBytes { bufferPointer in
+            if let baseAddress = bufferPointer.baseAddress {
+                yTexture.replace(region: MTLRegionMake2D(0, 0, yTexture.width, yTexture.height), mipmapLevel: 0, withBytes: baseAddress, bytesPerRow: frameBuffer.strideY)
+            }
+        }
+
+        frameBuffer.u.withUnsafeBytes { bufferPointer in
+            if let baseAddress = bufferPointer.baseAddress {
+                uTexture.replace(region: MTLRegionMake2D(0, 0, uTexture.width, uTexture.height), mipmapLevel: 0, withBytes: baseAddress, bytesPerRow: frameBuffer.strideU)
+            }
+        }
+
+        frameBuffer.v.withUnsafeBytes { bufferPointer in
+            if let baseAddress = bufferPointer.baseAddress {
+                vTexture.replace(region: MTLRegionMake2D(0, 0, vTexture.width, vTexture.height), mipmapLevel: 0, withBytes: baseAddress, bytesPerRow: frameBuffer.strideV)
+            }
+        }
+    }
+
+    func encode(renderingContext: MetalVideoRenderingContext, vertexBuffer: MTLBuffer, renderEncoder: MTLRenderCommandEncoder) -> Bool {
+        guard let yTexture = self.yTexture, let uTexture = self.uTexture, let vTexture = self.vTexture else {
+            return false
+        }
+
+        renderEncoder.setRenderPipelineState(renderingContext.i420PipelineState)
+
+        renderEncoder.setVertexBuffer(vertexBuffer, offset: 0, index: 0)
+
+        renderEncoder.setFragmentTexture(yTexture, index: 0)
+        renderEncoder.setFragmentTexture(uTexture, index: 1)
+        renderEncoder.setFragmentTexture(vTexture, index: 2)
+
+        renderEncoder.drawPrimitives(type: .triangleStrip, vertexStart: 0, vertexCount: 4, instanceCount: 1)
+
+        return true
+    }
+}
+
+@available(iOS 13.0, *)
+final class MetalVideoRenderingView: UIView, VideoRenderingView {
+    static override var layerClass: AnyClass {
+        return CAMetalLayer.self
+    }
+
+    private var metalLayer: CAMetalLayer {
+        return self.layer as! CAMetalLayer
+    }
+
+    private weak var renderingContext: MetalVideoRenderingContext?
+    private var renderingContextIndex: Int?
+
+    private let blur: Bool
+
+    private let vertexBuffer: MTLBuffer
+
+    private var frameBufferRenderingState: FrameBufferRenderingState?
+    private var blurInputTexture: MTLTexture?
+    private var blurOutputTexture: MTLTexture?
+
+    fileprivate private(set) var isEnabled: Bool = false
+    fileprivate var needsRedraw: Bool = false
+    fileprivate let numberOfUsedDrawables = Atomic<Int>(value: 0)
+
+    private var onFirstFrameReceived: ((Float) -> Void)?
+    private var onOrientationUpdated: ((PresentationCallVideoView.Orientation, CGFloat) -> Void)?
+    private var onIsMirroredUpdated: ((Bool) -> Void)?
+
+    private var didReportFirstFrame: Bool = false
+    private var currentOrientation: PresentationCallVideoView.Orientation = .rotation0
+    private var currentAspect: CGFloat = 1.0
+
+    private var disposable: Disposable?
+
+    init?(renderingContext: MetalVideoRenderingContext, input: Signal<OngoingGroupCallContext.VideoFrameData, NoError>, blur: Bool) {
+        self.renderingContext = renderingContext
+        self.blur = blur
+
+        let vertexBufferArray = Array<Float>(repeating: 0, count: 16)
+        guard let vertexBuffer = renderingContext.device.makeBuffer(bytes: vertexBufferArray, length: vertexBufferArray.count * MemoryLayout.size(ofValue: vertexBufferArray[0]), options: [.cpuCacheModeWriteCombined]) else {
+            return nil
+        }
+        self.vertexBuffer = vertexBuffer
+
+        super.init(frame: CGRect())
+
+        self.renderingContextIndex = renderingContext.add(view: self)
+
+        self.metalLayer.device = renderingContext.device
+        self.metalLayer.pixelFormat = .bgra8Unorm
+        self.metalLayer.framebufferOnly = true
+        self.metalLayer.allowsNextDrawableTimeout = true
+
+        self.disposable = input.start(next: { [weak self] videoFrameData in
+            Queue.mainQueue().async {
+                self?.addFrame(videoFrameData)
+            }
+        })
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+        self.disposable?.dispose()
+        if let renderingContext = self.renderingContext, let renderingContextIndex = self.renderingContextIndex {
+            renderingContext.remove(index: renderingContextIndex)
+        }
+    }
+
+    private func addFrame(_ videoFrameData: OngoingGroupCallContext.VideoFrameData) {
+        let aspect = CGFloat(videoFrameData.width) / CGFloat(videoFrameData.height)
+        var isAspectUpdated = false
+        if self.currentAspect != aspect {
+            self.currentAspect = aspect
+            isAspectUpdated = true
+        }
+
+        let videoFrameOrientation = PresentationCallVideoView.Orientation(videoFrameData.orientation)
+        var isOrientationUpdated = false
+        if self.currentOrientation != videoFrameOrientation {
+            self.currentOrientation = videoFrameOrientation
+            isOrientationUpdated = true
+        }
+
+        if isAspectUpdated || isOrientationUpdated {
+            self.onOrientationUpdated?(self.currentOrientation, self.currentAspect)
+        }
+
+        if !self.didReportFirstFrame {
+            self.didReportFirstFrame = true
+            self.onFirstFrameReceived?(Float(self.currentAspect))
+        }
+
+        if self.isEnabled, let renderingContext = self.renderingContext {
+            switch videoFrameData.buffer {
+            case let .native(buffer):
+                let renderingState: NV12FrameBufferRenderingState
+                if let current = self.frameBufferRenderingState as? NV12FrameBufferRenderingState {
+                    renderingState = current
+                } else {
+                    renderingState = NV12FrameBufferRenderingState()
+                    self.frameBufferRenderingState = renderingState
+                }
+                renderingState.updateTextureBuffers(renderingContext: renderingContext, frameBuffer: buffer)
+                self.needsRedraw = true
+            case let .i420(buffer):
+                let renderingState: I420FrameBufferRenderingState
+                if let current = self.frameBufferRenderingState as? I420FrameBufferRenderingState {
+                    renderingState = current
+                } else {
+                    renderingState = I420FrameBufferRenderingState()
+                    self.frameBufferRenderingState = renderingState
+                }
+                renderingState.updateTextureBuffers(renderingContext: renderingContext, frameBuffer: buffer)
+                self.needsRedraw = true
+            default:
+                break
+            }
+        }
+    }
+
+    fileprivate func encode(commandBuffer: MTLCommandBuffer) -> MTLDrawable? {
+        guard let renderingContext = self.renderingContext else {
+            return nil
+        }
+        if self.numberOfUsedDrawables.with({ $0 }) >= 2 {
+            return nil
+        }
+        guard let frameBufferRenderingState = self.frameBufferRenderingState else {
+            return nil
+        }
+
+        guard let frameSize = frameBufferRenderingState.frameSize else {
+            return nil
+        }
+
+        let drawableSize: CGSize
+        if self.blur {
+            drawableSize = frameSize.aspectFitted(CGSize(width: 64.0, height: 64.0))
+        } else {
+            drawableSize = frameSize
+        }
+
+        if self.blur {
+            if let current = self.blurInputTexture, current.width == Int(drawableSize.width) && current.height == Int(drawableSize.height) {
+            } else {
+                let blurTextureDescriptor = MTLTextureDescriptor.texture2DDescriptor(pixelFormat: .bgra8Unorm, width: Int(drawableSize.width), height: Int(drawableSize.height), mipmapped: false)
+                blurTextureDescriptor.usage = [.shaderRead, .shaderWrite, .renderTarget]
+
+                if let texture = renderingContext.device.makeTexture(descriptor: blurTextureDescriptor) {
+                    self.blurInputTexture = texture
+                }
+            }
+
+            if let current = self.blurOutputTexture, current.width == Int(drawableSize.width) && current.height == Int(drawableSize.height) {
+            } else {
+                let blurTextureDescriptor = MTLTextureDescriptor.texture2DDescriptor(pixelFormat: .bgra8Unorm, width: Int(drawableSize.width), height: Int(drawableSize.height), mipmapped: false)
+                blurTextureDescriptor.usage = [.shaderRead, .shaderWrite]
+
+                if let texture = renderingContext.device.makeTexture(descriptor: blurTextureDescriptor) {
+                    self.blurOutputTexture = texture
+                }
+            }
+        }
+
+        if self.metalLayer.drawableSize != drawableSize {
+            self.metalLayer.drawableSize = drawableSize
+
+            getCubeVertexData(
+                cropX: 0,
+                cropY: 0,
+                cropWidth: Int(drawableSize.width),
+                cropHeight: Int(drawableSize.height),
+                frameWidth: Int(drawableSize.width),
+                frameHeight: Int(drawableSize.height),
+                rotation: 0,
+                buffer: self.vertexBuffer.contents().assumingMemoryBound(to: Float.self)
+            )
+        }
+
+
+        guard let drawable = self.metalLayer.nextDrawable() else {
+            return nil
+        }
+
+        if let blurInputTexture = self.blurInputTexture, let blurOutputTexture = self.blurOutputTexture {
+            let renderPassDescriptor = MTLRenderPassDescriptor()
+            renderPassDescriptor.colorAttachments[0].texture = blurInputTexture
+            renderPassDescriptor.colorAttachments[0].loadAction = .clear
+            renderPassDescriptor.colorAttachments[0].clearColor = MTLClearColor(
+                red: 0.0,
+                green: 0.0,
+                blue: 0.0,
+                alpha: 1.0
+            )
+
+            guard let renderEncoder = commandBuffer.makeRenderCommandEncoder(descriptor: renderPassDescriptor) else {
+                return nil
+            }
+
+            let _ = frameBufferRenderingState.encode(renderingContext: renderingContext, vertexBuffer: self.vertexBuffer, renderEncoder: renderEncoder)
+
+            renderEncoder.endEncoding()
+
+            renderingContext.blurKernel.encode(commandBuffer: commandBuffer, sourceTexture: blurInputTexture, destinationTexture: blurOutputTexture)
+
+            let blitPassDescriptor = MTLRenderPassDescriptor()
+            blitPassDescriptor.colorAttachments[0].texture = drawable.texture
+            blitPassDescriptor.colorAttachments[0].loadAction = .clear
+            blitPassDescriptor.colorAttachments[0].clearColor = MTLClearColor(
+                red: 0.0,
+                green: 0.0,
+                blue: 0.0,
+                alpha: 1.0
+            )
+
+            guard let blitEncoder = commandBuffer.makeRenderCommandEncoder(descriptor: blitPassDescriptor) else {
+                return nil
+            }
+
+            let _ = BlitRenderingState.encode(renderingContext: renderingContext, texture: blurOutputTexture, vertexBuffer: self.vertexBuffer, renderEncoder: blitEncoder)
+
+            blitEncoder.endEncoding()
+        } else {
+            let renderPassDescriptor = MTLRenderPassDescriptor()
+            renderPassDescriptor.colorAttachments[0].texture = drawable.texture
+            renderPassDescriptor.colorAttachments[0].loadAction = .clear
+            renderPassDescriptor.colorAttachments[0].clearColor = MTLClearColor(
+                red: 0.0,
+                green: 0.0,
+                blue: 0.0,
+                alpha: 1.0
+            )
+
+            guard let renderEncoder = commandBuffer.makeRenderCommandEncoder(descriptor: renderPassDescriptor) else {
+                return nil
+            }
+
+            let _ = frameBufferRenderingState.encode(renderingContext: renderingContext, vertexBuffer: self.vertexBuffer, renderEncoder: renderEncoder)
+
+            renderEncoder.endEncoding()
+        }
+
+        return drawable
+    }
+
+    func setOnFirstFrameReceived(_ f: @escaping (Float) -> Void) {
+        self.onFirstFrameReceived = f
+        self.didReportFirstFrame = false
+    }
+
+    func setOnOrientationUpdated(_ f: @escaping (PresentationCallVideoView.Orientation, CGFloat) -> Void) {
+        self.onOrientationUpdated = f
+    }
+
+    func getOrientation() -> PresentationCallVideoView.Orientation {
+        return self.currentOrientation
+    }
+
+    func getAspect() -> CGFloat {
+        return self.currentAspect
+    }
+
+    func setOnIsMirroredUpdated(_ f: @escaping (Bool) -> Void) {
+        self.onIsMirroredUpdated = f
+    }
+
+    func updateIsEnabled(_ isEnabled: Bool) {
+        if self.isEnabled != isEnabled {
+            self.isEnabled = isEnabled
+
+            if self.isEnabled {
+                self.needsRedraw = true
+            }
+        }
+    }
+}
+
+@available(iOS 13.0, *)
+class MetalVideoRenderingContext {
+    private final class ViewReference {
+        weak var view: MetalVideoRenderingView?
+
+        init(view: MetalVideoRenderingView) {
+            self.view = view
+        }
+    }
+
+    fileprivate let device: MTLDevice
+    fileprivate let textureCache: CVMetalTextureCache
+    fileprivate let blurKernel: MPSImageGaussianBlur
+
+    fileprivate let blitPipelineState: MTLRenderPipelineState
+    fileprivate let nv12PipelineState: MTLRenderPipelineState
+    fileprivate let i420PipelineState: MTLRenderPipelineState
+
+    private let commandQueue: MTLCommandQueue
+
+    private var displayLink: ConstantDisplayLinkAnimator?
+    private var viewReferences = Bag<ViewReference>()
+
+    init?() {
+        guard let device = MTLCreateSystemDefaultDevice() else {
+            return nil
+        }
+        self.device = device
+
+        var textureCache: CVMetalTextureCache?
+        let _ = CVMetalTextureCacheCreate(kCFAllocatorDefault, nil, self.device, nil, &textureCache)
+        if let textureCache = textureCache {
+            self.textureCache = textureCache
+        } else {
+            return nil
+        }
+
+        let mainBundle = Bundle(for: MetalVideoRenderingView.self)
+
+        guard let path = mainBundle.path(forResource: "TelegramCallsUIBundle", ofType: "bundle") else {
+            return nil
+        }
+        guard let bundle = Bundle(path: path) else {
+            return nil
+        }
+        guard let defaultLibrary = try? self.device.makeDefaultLibrary(bundle: bundle) else {
+            return nil
+        }
+
+        self.blurKernel = MPSImageGaussianBlur(device: self.device, sigma: 3.0)
+
+        func makePipelineState(vertexProgram: String, fragmentProgram: String) -> MTLRenderPipelineState? {
+            guard let loadedVertexProgram = defaultLibrary.makeFunction(name: vertexProgram) else {
+                return nil
+            }
+            guard let loadedFragmentProgram = defaultLibrary.makeFunction(name: fragmentProgram) else {
+                return nil
+            }
+
+            let pipelineStateDescriptor = MTLRenderPipelineDescriptor()
+            pipelineStateDescriptor.vertexFunction = loadedVertexProgram
+            pipelineStateDescriptor.fragmentFunction = loadedFragmentProgram
+            pipelineStateDescriptor.colorAttachments[0].pixelFormat = .bgra8Unorm
+            guard let pipelineState = try? device.makeRenderPipelineState(descriptor: pipelineStateDescriptor) else {
+                return nil
+            }
+
+            return pipelineState
+        }
+
+        guard let blitPipelineState = makePipelineState(vertexProgram: "nv12VertexPassthrough", fragmentProgram: "blitFragmentColorConversion") else {
+            return nil
+        }
+        self.blitPipelineState = blitPipelineState
+
+        guard let nv12PipelineState = makePipelineState(vertexProgram: "nv12VertexPassthrough", fragmentProgram: "nv12FragmentColorConversion") else {
+            return nil
+        }
+        self.nv12PipelineState = nv12PipelineState
+
+        guard let i420PipelineState = makePipelineState(vertexProgram: "i420VertexPassthrough", fragmentProgram: "i420FragmentColorConversion") else {
+            return nil
+        }
+        self.i420PipelineState = i420PipelineState
+
+        guard let commandQueue = self.device.makeCommandQueue() else {
+            return nil
+        }
+        self.commandQueue = commandQueue
+        
+        self.displayLink = ConstantDisplayLinkAnimator(update: { [weak self] in
+            self?.redraw()
+        })
+        self.displayLink?.isPaused = false
+    }
+
+    func updateVisibility(isVisible: Bool) {
+        self.displayLink?.isPaused = !isVisible
+    }
+
+    fileprivate func add(view: MetalVideoRenderingView) -> Int {
+        return self.viewReferences.add(ViewReference(view: view))
+    }
+
+    fileprivate func remove(index: Int) {
+        self.viewReferences.remove(index)
+    }
+
+    private func redraw() {
+        guard let commandBuffer = self.commandQueue.makeCommandBuffer() else {
+            return
+        }
+
+        var drawables: [MTLDrawable] = []
+        var takenViewReferences: [ViewReference] = []
+
+        for viewReference in self.viewReferences.copyItems() {
+            guard let videoView = viewReference.view else {
+                continue
+            }
+
+            if !videoView.needsRedraw {
+                continue
+            }
+            videoView.needsRedraw = false
+
+            if let drawable = videoView.encode(commandBuffer: commandBuffer) {
+                let numberOfUsedDrawables = videoView.numberOfUsedDrawables
+                let _ = numberOfUsedDrawables.modify {
+                    return $0 + 1
+                }
+                takenViewReferences.append(viewReference)
+
+                drawable.addPresentedHandler { _ in
+                    let _ = numberOfUsedDrawables.modify {
+                        return max(0, $0 - 1)
+                    }
+                }
+
+                drawables.append(drawable)
+            }
+        }
+
+        if drawables.isEmpty {
+            return
+        }
+
+        if drawables.count > 10 {
+            print("Schedule \(drawables.count) drawables")
+        }
+
+        commandBuffer.addScheduledHandler { _ in
+            for drawable in drawables {
+                drawable.present()
+            }
+        }
+
+        commandBuffer.commit()
+    }
+}
+
+#endif
diff --git a/submodules/TelegramCallsUI/Sources/PresentationCall.swift b/submodules/TelegramCallsUI/Sources/PresentationCall.swift
index 110a963ac2..6d1867ab59 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationCall.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationCall.swift
@@ -24,7 +24,7 @@ final class PresentationCallToneRenderer {
     private var toneRendererAudioSessionActivated = false
     private let audioLevelPipe = ValuePipe<Float>()
     
-    init(tone: PresentationCallTone) {
+    init(tone: PresentationCallTone, completed: (() -> Void)? = nil) {
         let queue = Queue.mainQueue()
         self.queue = queue
         
@@ -52,6 +52,7 @@ final class PresentationCallToneRenderer {
         let toneDataOffset = Atomic<Int>(value: 0)
         
         let toneData = Atomic<Data?>(value: nil)
+        let reportedCompletion = Atomic<Bool>(value: false)
         
         self.toneRenderer.beginRequestingFrames(queue: DispatchQueue.global(), takeFrame: {
             var data = toneData.with { $0 }
@@ -63,6 +64,9 @@ final class PresentationCallToneRenderer {
             }
             
             guard let toneData = data else {
+                if !reportedCompletion.swap(true) {
+                    completed?()
+                }
                 return .finished
             }
             
@@ -83,6 +87,11 @@ final class PresentationCallToneRenderer {
             
             if let takeOffset = takeOffset {
                 if let toneDataMaxOffset = toneDataMaxOffset, takeOffset >= toneDataMaxOffset {
+                    if !reportedCompletion.swap(true) {
+                        Queue.mainQueue().after(1.0, {
+                            completed?()
+                        })
+                    }
                     return .finished
                 }
                 
@@ -117,6 +126,9 @@ final class PresentationCallToneRenderer {
                 
                 let status = CMBlockBufferCreateWithMemoryBlock(allocator: nil, memoryBlock: bytes, blockLength: frameSize, blockAllocator: nil, customBlockSource: nil, offsetToData: 0, dataLength: frameSize, flags: 0, blockBufferOut: &blockBuffer)
                 if status != noErr {
+                    if !reportedCompletion.swap(true) {
+                        completed?()
+                    }
                     return .finished
                 }
                 
@@ -127,15 +139,24 @@ final class PresentationCallToneRenderer {
                 var sampleBuffer: CMSampleBuffer?
                 var sampleSize = frameSize
                 guard CMSampleBufferCreate(allocator: nil, dataBuffer: blockBuffer, dataReady: true, makeDataReadyCallback: nil, refcon: nil, formatDescription: nil, sampleCount: 1, sampleTimingEntryCount: 1, sampleTimingArray: &timingInfo, sampleSizeEntryCount: 1, sampleSizeArray: &sampleSize, sampleBufferOut: &sampleBuffer) == noErr else {
+                    if !reportedCompletion.swap(true) {
+                        completed?()
+                    }
                     return .finished
                 }
                 
                 if let sampleBuffer = sampleBuffer {
                     return .frame(MediaTrackFrame(type: .audio, sampleBuffer: sampleBuffer, resetDecoder: false, decoded: true))
                 } else {
+                    if !reportedCompletion.swap(true) {
+                        completed?()
+                    }
                     return .finished
                 }
             } else {
+                if !reportedCompletion.swap(true) {
+                    completed?()
+                }
                 return .finished
             }
         })
@@ -927,6 +948,7 @@ public final class PresentationCallImpl: PresentationCall {
                 let setOnFirstFrameReceived = view.setOnFirstFrameReceived
                 let setOnOrientationUpdated = view.setOnOrientationUpdated
                 let setOnIsMirroredUpdated = view.setOnIsMirroredUpdated
+                let updateIsEnabled = view.updateIsEnabled
                 completion(PresentationCallVideoView(
                     holder: view,
                     view: view.view,
@@ -978,6 +1000,9 @@ public final class PresentationCallImpl: PresentationCall {
                         setOnIsMirroredUpdated { value in
                             f?(value)
                         }
+                    },
+                    updateIsEnabled: { value in
+                        updateIsEnabled(value)
                     }
                 ))
             } else {
@@ -992,11 +1017,12 @@ public final class PresentationCallImpl: PresentationCall {
             self.videoCapturer = videoCapturer
         }
         
-        self.videoCapturer?.makeOutgoingVideoView(completion: { view in
+        self.videoCapturer?.makeOutgoingVideoView(requestClone: false, completion: { view, _ in
             if let view = view {
                 let setOnFirstFrameReceived = view.setOnFirstFrameReceived
                 let setOnOrientationUpdated = view.setOnOrientationUpdated
                 let setOnIsMirroredUpdated = view.setOnIsMirroredUpdated
+                let updateIsEnabled = view.updateIsEnabled
                 completion(PresentationCallVideoView(
                     holder: view,
                     view: view.view,
@@ -1048,6 +1074,9 @@ public final class PresentationCallImpl: PresentationCall {
                         setOnIsMirroredUpdated { value in
                             f?(value)
                         }
+                    },
+                    updateIsEnabled: { value in
+                        updateIsEnabled(value)
                     }
                 ))
             } else {
diff --git a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift
index 6ffd1d3607..f0d671d9ca 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationCallManager.swift
@@ -206,7 +206,7 @@ public final class PresentationCallManagerImpl: PresentationCallManager {
         
         startCallImpl = { [weak self] account, uuid, handle, isVideo in
             if let strongSelf = self, let userId = Int32(handle) {
-                return strongSelf.startCall(account: account, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), isVideo: isVideo, internalId: uuid)
+                return strongSelf.startCall(account: account, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), isVideo: isVideo, internalId: uuid)
                 |> take(1)
                 |> map { result -> Bool in
                     return result
@@ -624,6 +624,113 @@ public final class PresentationCallManagerImpl: PresentationCallManager {
         }
     }
     
+    private func requestScheduleGroupCall(accountContext: AccountContext, peerId: PeerId, internalId: CallSessionInternalId = CallSessionInternalId()) -> Signal<Bool, NoError> {
+        let (presentationData, present, openSettings) = self.getDeviceAccessData()
+        
+        let isVideo = false
+        
+        let accessEnabledSignal: Signal<Bool, NoError> = Signal { subscriber in
+            DeviceAccess.authorizeAccess(to: .microphone(.voiceCall), presentationData: presentationData, present: { c, a in
+                present(c, a)
+            }, openSettings: {
+                openSettings()
+            }, { value in
+                if isVideo && value {
+                    DeviceAccess.authorizeAccess(to: .camera(.videoCall), presentationData: presentationData, present: { c, a in
+                        present(c, a)
+                    }, openSettings: {
+                        openSettings()
+                    }, { value in
+                        subscriber.putNext(value)
+                        subscriber.putCompletion()
+                    })
+                } else {
+                    subscriber.putNext(value)
+                    subscriber.putCompletion()
+                }
+            })
+            return EmptyDisposable
+        }
+        |> runOn(Queue.mainQueue())
+        
+        return accessEnabledSignal
+        |> deliverOnMainQueue
+        |> mapToSignal { [weak self] accessEnabled -> Signal<Bool, NoError> in
+            guard let strongSelf = self else {
+                return .single(false)
+            }
+            
+            if !accessEnabled {
+                return .single(false)
+            }
+                    
+            let call = PresentationGroupCallImpl(
+                accountContext: accountContext,
+                audioSession: strongSelf.audioSession,
+                callKitIntegration: nil,
+                getDeviceAccessData: strongSelf.getDeviceAccessData,
+                initialCall: nil,
+                internalId: internalId,
+                peerId: peerId,
+                invite: nil,
+                joinAsPeerId: nil
+            )
+            strongSelf.updateCurrentGroupCall(call)
+            strongSelf.currentGroupCallPromise.set(.single(call))
+            strongSelf.hasActiveGroupCallsPromise.set(true)
+            strongSelf.removeCurrentGroupCallDisposable.set((call.canBeRemoved
+            |> filter { $0 }
+            |> take(1)
+            |> deliverOnMainQueue).start(next: { [weak call] value in
+                guard let strongSelf = self, let call = call else {
+                    return
+                }
+                if value {
+                    if strongSelf.currentGroupCall === call {
+                        strongSelf.updateCurrentGroupCall(nil)
+                        strongSelf.currentGroupCallPromise.set(.single(nil))
+                        strongSelf.hasActiveGroupCallsPromise.set(false)
+                    }
+                }
+            }))
+        
+            return .single(true)
+        }
+    }
+    
+    public func scheduleGroupCall(context: AccountContext, peerId: PeerId, endCurrentIfAny: Bool) -> RequestScheduleGroupCallResult {
+        let begin: () -> Void = { [weak self] in
+            let _ = self?.requestScheduleGroupCall(accountContext: context, peerId: peerId).start()
+        }
+        
+        if let currentGroupCall = self.currentGroupCallValue {
+            if endCurrentIfAny {
+                let endSignal = currentGroupCall.leave(terminateIfPossible: false)
+                |> filter { $0 }
+                |> take(1)
+                |> deliverOnMainQueue
+                self.startCallDisposable.set(endSignal.start(next: { _ in
+                    begin()
+                }))
+            } else {
+                return .alreadyInProgress(currentGroupCall.peerId)
+            }
+        } else if let currentCall = self.currentCall {
+            if endCurrentIfAny {
+                self.callKitIntegration?.dropCall(uuid: currentCall.internalId)
+                self.startCallDisposable.set((currentCall.hangUp()
+                |> deliverOnMainQueue).start(next: { _ in
+                    begin()
+                }))
+            } else {
+                return .alreadyInProgress(currentCall.peerId)
+            }
+        } else {
+            begin()
+        }
+        return .success
+    }
+    
     public func joinGroupCall(context: AccountContext, peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, initialCall: CachedChannelData.ActiveCall, endCurrentIfAny: Bool) -> JoinGroupCallManagerResult {
         let begin: () -> Void = { [weak self] in
             if let requestJoinAsPeerId = requestJoinAsPeerId {
diff --git a/submodules/TelegramCallsUI/Sources/PresentationCallToneData.swift b/submodules/TelegramCallsUI/Sources/PresentationCallToneData.swift
index 065a6939d7..0d4afbbed2 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationCallToneData.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationCallToneData.swift
@@ -108,15 +108,15 @@ enum PresentationCallTone: Equatable {
 func presentationCallToneData(_ tone: PresentationCallTone) -> Data? {
     switch tone {
         case .ringing:
-            return loadToneData(name: "voip_ringback.caf")
+            return loadToneData(name: "voip_ringback.mp3")
         case .connecting:
             return loadToneData(name: "voip_connecting.mp3")
         case .busy:
-            return loadToneData(name: "voip_busy.caf")
+            return loadToneData(name: "voip_busy.mp3")
         case .failed:
-            return loadToneData(name: "voip_fail.caf")
+            return loadToneData(name: "voip_fail.mp3")
         case .ended:
-            return loadToneData(name: "voip_end.caf")
+            return loadToneData(name: "voip_end.mp3")
         case .groupJoined:
             return loadToneData(name: "voip_group_joined.mp3")
         case .groupLeft:
diff --git a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
index 587eed8c7d..36a3c47ba1 100644
--- a/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
+++ b/submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
@@ -24,16 +24,41 @@ private extension GroupCallParticipantsContext.Participant {
         if let ssrc = self.ssrc {
             participantSsrcs.insert(ssrc)
         }
-        if let jsonParams = self.jsonParams, let jsonData = jsonParams.data(using: .utf8), let json = try? JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any] {
-            if let groups = json["ssrc-groups"] as? [Any] {
-                for group in groups {
-                    if let group = group as? [String: Any] {
-                        if let groupSources = group["sources"] as? [UInt32] {
-                            for source in groupSources {
-                                participantSsrcs.insert(source)
-                            }
-                        }
-                    }
+        if let videoDescription = self.videoDescription {
+            for group in videoDescription.ssrcGroups {
+                for ssrc in group.ssrcs {
+                    participantSsrcs.insert(ssrc)
+                }
+            }
+        }
+        if let presentationDescription = self.presentationDescription {
+            for group in presentationDescription.ssrcGroups {
+                for ssrc in group.ssrcs {
+                    participantSsrcs.insert(ssrc)
+                }
+            }
+        }
+        return participantSsrcs
+    }
+
+    var videoSsrcs: Set<UInt32> {
+        var participantSsrcs = Set<UInt32>()
+        if let videoDescription = self.videoDescription {
+            for group in videoDescription.ssrcGroups {
+                for ssrc in group.ssrcs {
+                    participantSsrcs.insert(ssrc)
+                }
+            }
+        }
+        return participantSsrcs
+    }
+
+    var presentationSsrcs: Set<UInt32> {
+        var participantSsrcs = Set<UInt32>()
+        if let presentationDescription = self.presentationDescription {
+            for group in presentationDescription.ssrcGroups {
+                for ssrc in group.ssrcs {
+                    participantSsrcs.insert(ssrc)
                 }
             }
         }
@@ -67,17 +92,22 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext {
         return self.panelDataPromise.get()
     }
     
-    public init(account: Account, peerId: PeerId, call: CachedChannelData.ActiveCall) {
+    public init(account: Account, engine: TelegramEngine, peerId: PeerId, call: CachedChannelData.ActiveCall) {
         self.panelDataPromise.set(.single(GroupCallPanelData(
             peerId: peerId,
             info: GroupCallInfo(
                 id: call.id,
                 accessHash: call.accessHash,
                 participantCount: 0,
-                clientParams: nil,
                 streamDcId: nil,
                 title: call.title,
-                recordingStartTimestamp: nil
+                scheduleTimestamp: call.scheduleTimestamp,
+                subscribedToScheduled: call.subscribedToScheduled,
+                recordingStartTimestamp: nil,
+                sortAscending: true,
+                defaultParticipantsAreMuted: nil,
+                isVideoEnabled: false,
+                unmutedVideoLimit: 0
             ),
             topParticipants: [],
             participantCount: 0,
@@ -85,7 +115,7 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext {
             groupCall: nil
         )))
         
-        self.disposable = (getGroupCallParticipants(account: account, callId: call.id, accessHash: call.accessHash, offset: "", ssrcs: [], limit: 100)
+        self.disposable = (engine.calls.getGroupCallParticipants(callId: call.id, accessHash: call.accessHash, offset: "", ssrcs: [], limit: 100, sortAscending: nil)
         |> map(Optional.init)
         |> `catch` { _ -> Signal<GroupCallParticipantsContext.State?, NoError> in
             return .single(nil)
@@ -94,8 +124,7 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext {
             guard let strongSelf = self, let state = state else {
                 return
             }
-            let context = GroupCallParticipantsContext(
-                account: account,
+            let context = engine.calls.groupCall(
                 peerId: peerId,
                 myPeerId: account.peerId,
                 id: call.id,
@@ -119,7 +148,7 @@ public final class AccountGroupCallContextImpl: AccountGroupCallContext {
                 }
                 return GroupCallPanelData(
                     peerId: peerId,
-                    info: GroupCallInfo(id: call.id, accessHash: call.accessHash, participantCount: state.totalCount, clientParams: nil, streamDcId: nil, title: state.title, recordingStartTimestamp: nil),
+                    info: GroupCallInfo(id: call.id, accessHash: call.accessHash, participantCount: state.totalCount, streamDcId: nil, title: state.title, scheduleTimestamp: state.scheduleTimestamp, subscribedToScheduled: state.subscribedToScheduled, recordingStartTimestamp: nil, sortAscending: state.sortAscending, defaultParticipantsAreMuted: state.defaultParticipantsAreMuted, isVideoEnabled: state.isVideoEnabled, unmutedVideoLimit: state.unmutedVideoLimit),
                     topParticipants: topParticipants,
                     participantCount: state.totalCount,
                     activeSpeakers: activeSpeakers,
@@ -155,12 +184,12 @@ public final class AccountGroupCallContextCacheImpl: AccountGroupCallContextCach
             self.queue = queue
         }
         
-        public func get(account: Account, peerId: PeerId, call: CachedChannelData.ActiveCall) -> AccountGroupCallContextImpl.Proxy {
+        public func get(account: Account, engine: TelegramEngine, peerId: PeerId, call: CachedChannelData.ActiveCall) -> AccountGroupCallContextImpl.Proxy {
             let result: Record
             if let current = self.contexts[call.id] {
                 result = current
             } else {
-                let context = AccountGroupCallContextImpl(account: account, peerId: peerId, call: call)
+                let context = AccountGroupCallContextImpl(account: account, engine: engine, peerId: peerId, call: call)
                 result = Record(context: context)
                 self.contexts[call.id] = result
             }
@@ -186,8 +215,8 @@ public final class AccountGroupCallContextCacheImpl: AccountGroupCallContextCach
             })
         }
 
-        public func leaveInBackground(account: Account, id: Int64, accessHash: Int64, source: UInt32) {
-            let disposable = leaveGroupCall(account: account, callId: id, accessHash: accessHash, source: source).start()
+        public func leaveInBackground(engine: TelegramEngine, id: Int64, accessHash: Int64, source: UInt32) {
+            let disposable = engine.calls.leaveGroupCall(callId: id, accessHash: accessHash, source: source).start()
             self.leaveDisposables.add(disposable)
         }
     }
@@ -204,7 +233,7 @@ public final class AccountGroupCallContextCacheImpl: AccountGroupCallContextCach
 }
 
 private extension PresentationGroupCallState {
-    static func initialValue(myPeerId: PeerId, title: String?) -> PresentationGroupCallState {
+    static func initialValue(myPeerId: PeerId, title: String?, scheduleTimestamp: Int32?, subscribedToScheduled: Bool) -> PresentationGroupCallState {
         return PresentationGroupCallState(
             myPeerId: myPeerId,
             networkState: .connecting,
@@ -214,7 +243,10 @@ private extension PresentationGroupCallState {
             defaultParticipantMuteState: nil,
             recordingStartTimestamp: nil,
             title: title,
-            raisedHand: false
+            raisedHand: false,
+            scheduleTimestamp: scheduleTimestamp,
+            subscribedToScheduled: subscribedToScheduled,
+            isVideoEnabled: false
         )
     }
 }
@@ -358,24 +390,36 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     private var ignorePreviousJoinAsPeerId: (PeerId, UInt32)?
     private var reconnectingAsPeer: Peer?
     
-    public private(set) var isVideo: Bool
+    public private(set) var hasVideo: Bool
+    public private(set) var hasScreencast: Bool
+    private let isVideoEnabled: Bool
     
     private var temporaryJoinTimestamp: Int32
     private var temporaryActivityTimestamp: Double?
     private var temporaryActivityRank: Int?
     private var temporaryRaiseHandRating: Int64?
     private var temporaryHasRaiseHand: Bool = false
+    private var temporaryJoinedVideo: Bool = true
     private var temporaryMuteState: GroupCallParticipantsContext.Participant.MuteState?
     
     private var internalState: InternalState = .requesting
     private let internalStatePromise = Promise<InternalState>(.requesting)
     private var currentLocalSsrc: UInt32?
+    private var currentLocalEndpointId: String?
     
-    private var callContext: OngoingGroupCallContext?
+    private var genericCallContext: OngoingGroupCallContext?
     private var currentConnectionMode: OngoingGroupCallContext.ConnectionMode = .none
-    private var ssrcMapping: [UInt32: PeerId] = [:]
-    
-    private var requestedSsrcs = Set<UInt32>()
+    private var didInitializeConnectionMode: Bool = false
+
+    private var screencastCallContext: OngoingGroupCallContext?
+    private var screencastBufferServerContext: IpcGroupCallBufferAppContext?
+    private var screencastCapturer: OngoingCallVideoCapturer?
+
+    private struct SsrcMapping {
+        var peerId: PeerId
+        var isPresentation: Bool
+    }
+    private var ssrcMapping: [UInt32: SsrcMapping] = [:]
     
     private var summaryInfoState = Promise<SummaryInfoState?>(nil)
     private var summaryParticipantsState = Promise<SummaryParticipantsState?>(nil)
@@ -405,6 +449,15 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             }
         }
     }
+
+    private let isNoiseSuppressionEnabledPromise = ValuePromise<Bool>(true)
+    public var isNoiseSuppressionEnabled: Signal<Bool, NoError> {
+        return self.isNoiseSuppressionEnabledPromise.get()
+    }
+    private let isNoiseSuppressionEnabledDisposable = MetaDisposable()
+
+    private var isVideoMuted: Bool = false
+    private let isVideoMutedDisposable = MetaDisposable()
     
     private let audioOutputStatePromise = Promise<([AudioSessionOutput], AudioSessionOutput?)>(([], nil))
     private var audioOutputStateDisposable: Disposable?
@@ -463,6 +516,18 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     public var state: Signal<PresentationGroupCallState, NoError> {
         return self.statePromise.get()
     }
+
+    private var stateVersionValue: Int = 0 {
+        didSet {
+            if self.stateVersionValue != oldValue {
+                self.stateVersionPromise.set(self.stateVersionValue)
+            }
+        }
+    }
+    private let stateVersionPromise = ValuePromise<Int>(0)
+    public var stateVersion: Signal<Int, NoError> {
+        return self.stateVersionPromise.get()
+    }
     
     private var membersValue: PresentationGroupCallMembers? {
         didSet {
@@ -500,7 +565,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     }
     
     private let joinDisposable = MetaDisposable()
+    private let screencastJoinDisposable = MetaDisposable()
     private let requestDisposable = MetaDisposable()
+    private let startDisposable = MetaDisposable()
+    private let subscribeDisposable = MetaDisposable()
     private var groupCallParticipantUpdatesDisposable: Disposable?
     
     private let networkStateDisposable = MetaDisposable()
@@ -531,19 +599,23 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     private var toneRenderer: PresentationCallToneRenderer?
     
     private var videoCapturer: OngoingCallVideoCapturer?
-    
-    private let incomingVideoSourcePromise = Promise<[PeerId: UInt32]>([:])
-    public var incomingVideoSources: Signal<[PeerId: UInt32], NoError> {
-        return self.incomingVideoSourcePromise.get()
-    }
-    
-    private var missingSsrcs = Set<UInt32>()
-    private var processedMissingSsrcs = Set<UInt32>()
-    private let missingSsrcsDisposable = MetaDisposable()
-    private var isRequestingMissingSsrcs: Bool = false
+    private var useFrontCamera: Bool = true
 
     private var peerUpdatesSubscription: Disposable?
     
+    public private(set) var schedulePending = false
+    private var isScheduled = false
+    private var isScheduledStarted = false
+
+    private let isSpeakingPromise = ValuePromise<Bool>(false, ignoreRepeated: true)
+    public var isSpeaking: Signal<Bool, NoError> {
+        return self.isSpeakingPromise.get()
+    }
+    
+    private var screencastFramesDisposable: Disposable?
+    private var screencastAudioDataDisposable: Disposable?
+    private var screencastStateDisposable: Disposable?
+    
     init(
         accountContext: AccountContext,
         audioSession: ManagedAudioSession,
@@ -566,14 +638,17 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.peerId = peerId
         self.invite = invite
         self.joinAsPeerId = joinAsPeerId ?? accountContext.account.peerId
+        self.schedulePending = initialCall == nil
+        self.isScheduled = initialCall == nil || initialCall?.scheduleTimestamp != nil
         
-        self.stateValue = PresentationGroupCallState.initialValue(myPeerId: self.joinAsPeerId, title: initialCall?.title)
+        self.stateValue = PresentationGroupCallState.initialValue(myPeerId: self.joinAsPeerId, title: initialCall?.title, scheduleTimestamp: initialCall?.scheduleTimestamp, subscribedToScheduled: initialCall?.subscribedToScheduled ?? false)
         self.statePromise = ValuePromise(self.stateValue)
         
         self.temporaryJoinTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970)
-        
-        //self.videoCapturer = OngoingCallVideoCapturer(keepLandscape: true)
-        self.isVideo = self.videoCapturer != nil
+
+        self.isVideoEnabled = true
+        self.hasVideo = false
+        self.hasScreencast = false
         
         var didReceiveAudioOutputs = false
         
@@ -678,7 +753,6 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 return
             }
             if case let .established(callInfo, _, _, _, _) = strongSelf.internalState {
-                var addedParticipants: [(UInt32, String?)] = []
                 var removedSsrc: [UInt32] = []
                 for (callId, update) in updates {
                     if callId == callInfo.id {
@@ -713,14 +787,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                                         }
                                     }
                                 } else if case .joined = participantUpdate.participationStatusChange {
-                                    if let ssrc = participantUpdate.ssrc {
-                                        addedParticipants.append((ssrc, participantUpdate.jsonParams))
-                                    }
                                 } else if let ssrc = participantUpdate.ssrc, strongSelf.ssrcMapping[ssrc] == nil {
-                                    addedParticipants.append((ssrc, participantUpdate.jsonParams))
                                 }
                             }
-                        case let .call(isTerminated, _, _, _):
+                        case let .call(isTerminated, _, _, _, _, _):
                             if isTerminated {
                                 strongSelf.markAsCanBeRemoved()
                             }
@@ -728,9 +798,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     }
                 }
                 if !removedSsrc.isEmpty {
-                    strongSelf.callContext?.removeSsrcs(ssrcs: removedSsrc)
+                    strongSelf.genericCallContext?.removeSsrcs(ssrcs: removedSsrc)
                 }
-                //strongSelf.callContext?.addParticipants(participants: addedParticipants)
             }
         })
         
@@ -753,7 +822,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         })
         
         if let initialCall = initialCall, let temporaryParticipantsContext = (self.accountContext.cachedGroupCallContexts as? AccountGroupCallContextCacheImpl)?.impl.syncWith({ impl in
-            impl.get(account: accountContext.account, peerId: peerId, call: CachedChannelData.ActiveCall(id: initialCall.id, accessHash: initialCall.accessHash, title: initialCall.title))
+            impl.get(account: accountContext.account, engine: accountContext.engine, peerId: peerId, call: CachedChannelData.ActiveCall(id: initialCall.id, accessHash: initialCall.accessHash, title: initialCall.title, scheduleTimestamp: initialCall.scheduleTimestamp, subscribedToScheduled: initialCall.subscribedToScheduled))
         }) {
             self.switchToTemporaryParticipantsContext(sourceContext: temporaryParticipantsContext.context.participantsContext, oldMyPeerId: self.joinAsPeerId)
         } else {
@@ -797,19 +866,67 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             strongSelf.stateValue = updatedValue
         })
         
-        self.requestCall(movingFromBroadcastToRtc: false)
+        if let _ = self.initialCall {
+            self.requestCall(movingFromBroadcastToRtc: false)
+        }
+
+        let basePath = self.accountContext.sharedContext.basePath + "/broadcast-coordination"
+        let screencastBufferServerContext = IpcGroupCallBufferAppContext(basePath: basePath)
+        self.screencastBufferServerContext = screencastBufferServerContext
+        let screencastCapturer = OngoingCallVideoCapturer(isCustom: true)
+        self.screencastCapturer = screencastCapturer
+        self.screencastFramesDisposable = (screencastBufferServerContext.frames
+        |> deliverOnMainQueue).start(next: { [weak screencastCapturer] screencastFrame in
+            guard let screencastCapturer = screencastCapturer else {
+                return
+            }
+            screencastCapturer.injectPixelBuffer(screencastFrame.0, rotation: screencastFrame.1)
+        })
+        self.screencastAudioDataDisposable = (screencastBufferServerContext.audioData
+        |> deliverOnMainQueue).start(next: { [weak self] data in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.screencastCallContext?.addExternalAudioData(data: data)
+        })
+        self.screencastStateDisposable = (screencastBufferServerContext.isActive
+        |> distinctUntilChanged
+        |> deliverOnMainQueue).start(next: { [weak self] isActive in
+            guard let strongSelf = self else {
+                return
+            }
+            if isActive {
+                strongSelf.requestScreencast()
+            } else {
+                strongSelf.disableScreencast()
+            }
+        })
+
+        /*Queue.mainQueue().after(2.0, { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.screencastBufferClientContext = IpcGroupCallBufferBroadcastContext(basePath: basePath)
+        })*/
     }
     
     deinit {
+        assert(Queue.mainQueue().isCurrent())
+
         self.audioSessionShouldBeActiveDisposable?.dispose()
         self.audioSessionActiveDisposable?.dispose()
         self.summaryStateDisposable?.dispose()
         self.audioSessionDisposable?.dispose()
         self.joinDisposable.dispose()
+        self.screencastJoinDisposable.dispose()
         self.requestDisposable.dispose()
+        self.startDisposable.dispose()
+        self.subscribeDisposable.dispose()
         self.groupCallParticipantUpdatesDisposable?.dispose()
         self.leaveDisposable.dispose()
         self.isMutedDisposable.dispose()
+        self.isNoiseSuppressionEnabledDisposable.dispose()
+        self.isVideoMutedDisposable.dispose()
         self.memberStatesDisposable.dispose()
         self.networkStateDisposable.dispose()
         self.checkCallDisposable?.dispose()
@@ -817,7 +934,6 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.participantsContextStateDisposable.dispose()
         self.myAudioLevelDisposable.dispose()
         self.memberEventsPipeDisposable.dispose()
-        self.missingSsrcsDisposable.dispose()
         
         self.myAudioLevelTimer?.invalidate()
         self.typingDisposable.dispose()
@@ -831,10 +947,15 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.removedChannelMembersDisposable?.dispose()
 
         self.peerUpdatesSubscription?.dispose()
+
+        self.screencastFramesDisposable?.dispose()
+        self.screencastAudioDataDisposable?.dispose()
+        self.screencastStateDisposable?.dispose()
     }
     
     private func switchToTemporaryParticipantsContext(sourceContext: GroupCallParticipantsContext?, oldMyPeerId: PeerId) {
         let myPeerId = self.joinAsPeerId
+        let accountContext = self.accountContext
         let myPeer = self.accountContext.account.postbox.transaction { transaction -> (Peer, CachedPeerData?)? in
             if let peer = transaction.getPeer(myPeerId) {
                 return (peer, transaction.getPeerCachedData(peerId: myPeerId))
@@ -842,8 +963,13 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 return nil
             }
         }
+        |> beforeNext { view in
+            if let view = view, view.1 == nil {
+                let _ = accountContext.engine.peers.fetchAndUpdateCachedPeerData(peerId: myPeerId).start()
+            }
+        }
         if let sourceContext = sourceContext, let initialState = sourceContext.immediateState {
-            let temporaryParticipantsContext = GroupCallParticipantsContext(account: self.account, peerId: self.peerId, myPeerId: myPeerId, id: sourceContext.id, accessHash: sourceContext.accessHash, state: initialState, previousServiceState: sourceContext.serviceState)
+            let temporaryParticipantsContext = self.accountContext.engine.calls.groupCall(peerId: self.peerId, myPeerId: myPeerId, id: sourceContext.id, accessHash: sourceContext.accessHash, state: initialState, previousServiceState: sourceContext.serviceState)
             self.temporaryParticipantsContext = temporaryParticipantsContext
             self.participantsContextStateDisposable.set((combineLatest(queue: .mainQueue(),
                 myPeer,
@@ -854,7 +980,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 guard let strongSelf = self else {
                     return
                 }
-
+                
                 var topParticipants: [GroupCallParticipantsContext.Participant] = []
 
                 var members = PresentationGroupCallMembers(
@@ -886,12 +1012,13 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                         } else if let cachedData = cachedData as? CachedUserData {
                             about = cachedData.about
                         } else {
-                            about = nil
+                            about = " "
                         }
                         participants.append(GroupCallParticipantsContext.Participant(
                             peer: myPeer,
                             ssrc: nil,
-                            jsonParams: nil,
+                            videoDescription: nil,
+                            presentationDescription: nil,
                             joinTimestamp: strongSelf.temporaryJoinTimestamp,
                             raiseHandRating: strongSelf.temporaryRaiseHandRating,
                             hasRaiseHand: strongSelf.temporaryHasRaiseHand,
@@ -899,9 +1026,10 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                             activityRank: strongSelf.temporaryActivityRank,
                             muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false),
                             volume: nil,
-                            about: about
+                            about: about,
+                            joinedVideo: strongSelf.temporaryJoinedVideo
                         ))
-                        participants.sort()
+                        participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: state.sortAscending) })
                     }
                 }
 
@@ -959,31 +1087,30 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
 
                 var participants: [GroupCallParticipantsContext.Participant] = []
 
-                if !participants.contains(where: { $0.peer.id == myPeerId }) {
-                    if let (myPeer, cachedData) = myPeerAndCachedData {
-                        let about: String?
-                        if let cachedData = cachedData as? CachedUserData {
-                            about = cachedData.about
-                        } else if let cachedData = cachedData as? CachedUserData {
-                            about = cachedData.about
-                        } else {
-                            about = nil
-                        }
-                        participants.append(GroupCallParticipantsContext.Participant(
-                            peer: myPeer,
-                            ssrc: nil,
-                            jsonParams: nil,
-                            joinTimestamp: strongSelf.temporaryJoinTimestamp,
-                            raiseHandRating: strongSelf.temporaryRaiseHandRating,
-                            hasRaiseHand: strongSelf.temporaryHasRaiseHand,
-                            activityTimestamp: strongSelf.temporaryActivityTimestamp,
-                            activityRank: strongSelf.temporaryActivityRank,
-                            muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false),
-                            volume: nil,
-                            about: about
-                        ))
-                        participants.sort()
+                if let (myPeer, cachedData) = myPeerAndCachedData {
+                    let about: String?
+                    if let cachedData = cachedData as? CachedUserData {
+                        about = cachedData.about
+                    } else if let cachedData = cachedData as? CachedUserData {
+                        about = cachedData.about
+                    } else {
+                        about = " "
                     }
+                    participants.append(GroupCallParticipantsContext.Participant(
+                        peer: myPeer,
+                        ssrc: nil,
+                        videoDescription: nil,
+                        presentationDescription: nil,
+                        joinTimestamp: strongSelf.temporaryJoinTimestamp,
+                        raiseHandRating: strongSelf.temporaryRaiseHandRating,
+                        hasRaiseHand: strongSelf.temporaryHasRaiseHand,
+                        activityTimestamp: strongSelf.temporaryActivityTimestamp,
+                        activityRank: strongSelf.temporaryActivityRank,
+                        muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false),
+                        volume: nil,
+                        about: about,
+                        joinedVideo: strongSelf.temporaryJoinedVideo
+                    ))
                 }
 
                 for participant in participants {
@@ -1004,6 +1131,198 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
     }
     
+    private func switchToTemporaryScheduledParticipantsContext() {
+        guard let callInfo = self.internalState.callInfo, callInfo.scheduleTimestamp != nil else {
+            return
+        }
+        let accountContext = self.accountContext
+        let peerId = self.peerId
+        let rawAdminIds: Signal<Set<PeerId>, NoError>
+        if peerId.namespace == Namespaces.Peer.CloudChannel {
+            rawAdminIds = Signal { subscriber in
+                let (disposable, _) = accountContext.peerChannelMemberCategoriesContextsManager.admins(engine: accountContext.engine, postbox: accountContext.account.postbox, network: accountContext.account.network, accountPeerId: accountContext.account.peerId, peerId: peerId, updated: { list in
+                    var peerIds = Set<PeerId>()
+                    for item in list.list {
+                        if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) {
+                            peerIds.insert(item.peer.id)
+                        }
+                    }
+                    subscriber.putNext(peerIds)
+                })
+                return disposable
+            }
+            |> distinctUntilChanged
+            |> runOn(.mainQueue())
+        } else {
+            rawAdminIds = accountContext.account.postbox.combinedView(keys: [.cachedPeerData(peerId: peerId)])
+            |> map { views -> Set<PeerId> in
+                guard let view = views.views[.cachedPeerData(peerId: peerId)] as? CachedPeerDataView else {
+                    return Set()
+                }
+                guard let cachedData = view.cachedPeerData as? CachedGroupData, let participants = cachedData.participants else {
+                    return Set()
+                }
+                return Set(participants.participants.compactMap { item -> PeerId? in
+                    switch item {
+                    case .creator, .admin:
+                        return item.peerId
+                    default:
+                        return nil
+                    }
+                })
+            }
+            |> distinctUntilChanged
+        }
+        
+        let adminIds = combineLatest(queue: .mainQueue(),
+            rawAdminIds,
+            accountContext.account.postbox.combinedView(keys: [.basicPeer(peerId)])
+        )
+        |> map { rawAdminIds, view -> Set<PeerId> in
+            var rawAdminIds = rawAdminIds
+            if let peerView = view.views[.basicPeer(peerId)] as? BasicPeerView, let peer = peerView.peer as? TelegramChannel {
+                if peer.hasPermission(.manageCalls) {
+                    rawAdminIds.insert(accountContext.account.peerId)
+                } else {
+                    rawAdminIds.remove(accountContext.account.peerId)
+                }
+            }
+            return rawAdminIds
+        }
+        |> distinctUntilChanged
+
+        let participantsContext = self.accountContext.engine.calls.groupCall(
+            peerId: self.peerId,
+            myPeerId: self.joinAsPeerId,
+            id: callInfo.id,
+            accessHash: callInfo.accessHash,
+            state: GroupCallParticipantsContext.State(
+                participants: [],
+                nextParticipantsFetchOffset: nil,
+                adminIds: Set(),
+                isCreator: false,
+                defaultParticipantsAreMuted: callInfo.defaultParticipantsAreMuted ?? GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: self.stateValue.defaultParticipantMuteState == .muted, canChange: true),
+                sortAscending: true,
+                recordingStartTimestamp: nil,
+                title: self.stateValue.title,
+                scheduleTimestamp: self.stateValue.scheduleTimestamp,
+                subscribedToScheduled: self.stateValue.subscribedToScheduled,
+                totalCount: 0,
+                isVideoEnabled: callInfo.isVideoEnabled,
+                unmutedVideoLimit: callInfo.unmutedVideoLimit,
+                version: 0
+            ),
+            previousServiceState: nil
+        )
+        self.temporaryParticipantsContext = nil
+        self.participantsContext = participantsContext
+        
+        let myPeerId = self.joinAsPeerId
+        let myPeer = self.accountContext.account.postbox.transaction { transaction -> (Peer, CachedPeerData?)? in
+            if let peer = transaction.getPeer(myPeerId) {
+                return (peer, transaction.getPeerCachedData(peerId: myPeerId))
+            } else {
+                return nil
+            }
+        }
+        |> beforeNext { view in
+            if let view = view, view.1 == nil {
+                let _ = accountContext.engine.peers.fetchAndUpdateCachedPeerData(peerId: myPeerId).start()
+            }
+        }
+        self.participantsContextStateDisposable.set(combineLatest(queue: .mainQueue(),
+            participantsContext.state,
+            adminIds,
+            myPeer,
+            accountContext.account.postbox.peerView(id: peerId)
+        ).start(next: { [weak self] state, adminIds, myPeerAndCachedData, view in
+            guard let strongSelf = self else {
+                return
+            }
+            
+            var members = PresentationGroupCallMembers(
+                participants: [],
+                speakingParticipants: Set(),
+                totalCount: state.totalCount,
+                loadMoreToken: state.nextParticipantsFetchOffset
+            )
+            
+            strongSelf.stateValue.adminIds = adminIds
+            let canManageCall = state.isCreator || strongSelf.stateValue.adminIds.contains(strongSelf.accountContext.account.peerId)
+            
+            var participants: [GroupCallParticipantsContext.Participant] = []
+            var topParticipants: [GroupCallParticipantsContext.Participant] = []
+            if let (myPeer, cachedData) = myPeerAndCachedData {
+                let about: String?
+                if let cachedData = cachedData as? CachedUserData {
+                    about = cachedData.about
+                } else if let cachedData = cachedData as? CachedUserData {
+                    about = cachedData.about
+                } else {
+                    about = " "
+                }
+                participants.append(GroupCallParticipantsContext.Participant(
+                    peer: myPeer,
+                    ssrc: nil,
+                    videoDescription: nil,
+                    presentationDescription: nil,
+                    joinTimestamp: strongSelf.temporaryJoinTimestamp,
+                    raiseHandRating: strongSelf.temporaryRaiseHandRating,
+                    hasRaiseHand: strongSelf.temporaryHasRaiseHand,
+                    activityTimestamp: strongSelf.temporaryActivityTimestamp,
+                    activityRank: strongSelf.temporaryActivityRank,
+                    muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: canManageCall || !state.defaultParticipantsAreMuted.isMuted, mutedByYou: false),
+                    volume: nil,
+                    about: about,
+                    joinedVideo: strongSelf.temporaryJoinedVideo
+                ))
+            }
+
+            for participant in participants {
+                members.participants.append(participant)
+
+                if topParticipants.count < 3 {
+                    topParticipants.append(participant)
+                }
+            }
+            
+            strongSelf.membersValue = members
+            strongSelf.stateValue.canManageCall = state.isCreator || adminIds.contains(strongSelf.accountContext.account.peerId)
+            strongSelf.stateValue.defaultParticipantMuteState = state.defaultParticipantsAreMuted.isMuted ? .muted : .unmuted
+            
+            
+            strongSelf.stateValue.recordingStartTimestamp = state.recordingStartTimestamp
+            strongSelf.stateValue.title = state.title
+            strongSelf.stateValue.muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canManageCall || !state.defaultParticipantsAreMuted.isMuted, mutedByYou: false)
+        
+            strongSelf.stateValue.scheduleTimestamp = strongSelf.isScheduledStarted ? nil : state.scheduleTimestamp
+            if state.scheduleTimestamp == nil && !strongSelf.isScheduledStarted {
+                strongSelf.updateSessionState(internalState: .active(GroupCallInfo(id: callInfo.id, accessHash: callInfo.accessHash, participantCount: state.totalCount, streamDcId: callInfo.streamDcId, title: state.title, scheduleTimestamp: nil, subscribedToScheduled: false, recordingStartTimestamp: nil, sortAscending: true, defaultParticipantsAreMuted: callInfo.defaultParticipantsAreMuted ?? state.defaultParticipantsAreMuted, isVideoEnabled: callInfo.isVideoEnabled, unmutedVideoLimit: callInfo.unmutedVideoLimit)), audioSessionControl: strongSelf.audioSessionControl)
+            } else {
+                strongSelf.summaryInfoState.set(.single(SummaryInfoState(info: GroupCallInfo(
+                    id: callInfo.id,
+                    accessHash: callInfo.accessHash,
+                    participantCount: state.totalCount,
+                    streamDcId: nil,
+                    title: state.title,
+                    scheduleTimestamp: state.scheduleTimestamp,
+                    subscribedToScheduled: false,
+                    recordingStartTimestamp: state.recordingStartTimestamp,
+                    sortAscending: state.sortAscending,
+                    defaultParticipantsAreMuted: state.defaultParticipantsAreMuted,
+                    isVideoEnabled: state.isVideoEnabled,
+                    unmutedVideoLimit: state.unmutedVideoLimit
+                ))))
+                
+                strongSelf.summaryParticipantsState.set(.single(SummaryParticipantsState(
+                    participantCount: state.totalCount,
+                    topParticipants: topParticipants,
+                    activeSpeakers: Set()
+                )))
+            }
+        }))
+    }
+    
     private func updateSessionState(internalState: InternalState, audioSessionControl: ManagedAudioSessionControl?) {
         let previousControl = self.audioSessionControl
         self.audioSessionControl = audioSessionControl
@@ -1033,259 +1352,312 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             }
         }
         
+        var shouldJoin = false
+        let activeCallInfo: GroupCallInfo?
         switch previousInternalState {
-        case .active:
-            break
-        default:
-            if case let .active(callInfo) = internalState {
-                let callContext: OngoingGroupCallContext
-                if let current = self.callContext {
-                    callContext = current
+            case let .active(previousCallInfo):
+                if case let .active(callInfo) = internalState {
+                    shouldJoin = previousCallInfo.scheduleTimestamp != nil && callInfo.scheduleTimestamp == nil
+                    self.participantsContext = nil
+                    activeCallInfo = callInfo
                 } else {
-                    callContext = OngoingGroupCallContext(video: self.videoCapturer, participantDescriptionsRequired: { [weak self] ssrcs in
-                        Queue.mainQueue().async {
-                            guard let strongSelf = self else {
-                                return
-                            }
-                            strongSelf.maybeRequestParticipants(ssrcs: ssrcs)
-                        }
-                    }, audioStreamData: OngoingGroupCallContext.AudioStreamData(account: self.accountContext.account, callId: callInfo.id, accessHash: callInfo.accessHash), rejoinNeeded: { [weak self] in
-                        Queue.mainQueue().async {
-                            guard let strongSelf = self else {
-                                return
-                            }
-                            if case .established = strongSelf.internalState {
-                                strongSelf.requestCall(movingFromBroadcastToRtc: false)
-                            }
-                        }
-                    })
-                    self.incomingVideoSourcePromise.set(callContext.videoSources
-                    |> deliverOnMainQueue
-                    |> map { [weak self] sources -> [PeerId: UInt32] in
+                    activeCallInfo = nil
+                }
+            default:
+                if case let .active(callInfo) = internalState {
+                    shouldJoin = callInfo.scheduleTimestamp == nil
+                    activeCallInfo = callInfo
+                } else {
+                    activeCallInfo = nil
+                }
+        }
+        if self.leaving {
+            shouldJoin = false
+        }
+        
+        if shouldJoin, let callInfo = activeCallInfo {
+            let genericCallContext: OngoingGroupCallContext
+            if let current = self.genericCallContext {
+                genericCallContext = current
+            } else {
+                var outgoingAudioBitrateKbit: Int32?
+                let appConfiguration = self.accountContext.currentAppConfiguration.with({ $0 })
+                if let data = appConfiguration.data, let value = data["voice_chat_send_bitrate"] as? Int32 {
+                    outgoingAudioBitrateKbit = value
+                }
+
+                let enableNoiseSuppression = accountContext.sharedContext.immediateExperimentalUISettings.enableNoiseSuppression
+
+                genericCallContext = OngoingGroupCallContext(video: self.videoCapturer, requestMediaChannelDescriptions: { [weak self] ssrcs, completion in
+                    let disposable = MetaDisposable()
+                    Queue.mainQueue().async {
                         guard let strongSelf = self else {
-                            return [:]
+                            return
                         }
-                        var result: [PeerId: UInt32] = [:]
-                        for source in sources {
-                            if let peerId = strongSelf.ssrcMapping[source] {
-                                result[peerId] = source
+                        disposable.set(strongSelf.requestMediaChannelDescriptions(ssrcs: ssrcs, completion: completion))
+                    }
+                    return disposable
+                }, audioStreamData: OngoingGroupCallContext.AudioStreamData(engine: self.accountContext.engine, callId: callInfo.id, accessHash: callInfo.accessHash), rejoinNeeded: { [weak self] in
+                    Queue.mainQueue().async {
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        if case .established = strongSelf.internalState {
+                            strongSelf.requestCall(movingFromBroadcastToRtc: false)
+                        }
+                    }
+                }, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, videoContentType: self.isVideoEnabled ? .generic : .none, enableNoiseSuppression: enableNoiseSuppression)
+
+                self.genericCallContext = genericCallContext
+                self.stateVersionValue += 1
+            }
+            self.joinDisposable.set((genericCallContext.joinPayload
+            |> distinctUntilChanged(isEqual: { lhs, rhs in
+                if lhs.0 != rhs.0 {
+                    return false
+                }
+                if lhs.1 != rhs.1 {
+                    return false
+                }
+                return true
+            })
+            |> deliverOnMainQueue).start(next: { [weak self] joinPayload, ssrc in
+                guard let strongSelf = self else {
+                    return
+                }
+
+                let peerAdminIds: Signal<[PeerId], NoError>
+                let peerId = strongSelf.peerId
+                if strongSelf.peerId.namespace == Namespaces.Peer.CloudChannel {
+                    peerAdminIds = Signal { subscriber in
+                        let (disposable, _) = strongSelf.accountContext.peerChannelMemberCategoriesContextsManager.admins(engine: strongSelf.accountContext.engine, postbox: strongSelf.accountContext.account.postbox, network: strongSelf.accountContext.account.network, accountPeerId: strongSelf.accountContext.account.peerId, peerId: peerId, updated: { list in
+                            var peerIds = Set<PeerId>()
+                            for item in list.list {
+                                if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) {
+                                    peerIds.insert(item.peer.id)
+                                }
+                            }
+                            subscriber.putNext(Array(peerIds))
+                        })
+                        return disposable
+                    }
+                    |> distinctUntilChanged
+                    |> runOn(.mainQueue())
+                } else {
+                    peerAdminIds = strongSelf.account.postbox.transaction { transaction -> [PeerId] in
+                        var result: [PeerId] = []
+                        if let cachedData = transaction.getPeerCachedData(peerId: peerId) as? CachedGroupData {
+                            if let participants = cachedData.participants {
+                                for participant in participants.participants {
+                                    if case .creator = participant {
+                                        result.append(participant.peerId)
+                                    } else if case .admin = participant {
+                                        result.append(participant.peerId)
+                                    }
+                                }
                             }
                         }
                         return result
-                    })
-                    self.callContext = callContext
+                    }
                 }
-                self.joinDisposable.set((callContext.joinPayload
-                |> distinctUntilChanged(isEqual: { lhs, rhs in
-                    if lhs.0 != rhs.0 {
-                        return false
-                    }
-                    if lhs.1 != rhs.1 {
-                        return false
-                    }
-                    return true
-                })
-                |> deliverOnMainQueue).start(next: { [weak self] joinPayload, ssrc in
+
+                strongSelf.currentLocalSsrc = ssrc
+                strongSelf.requestDisposable.set((strongSelf.accountContext.engine.calls.joinGroupCall(
+                    peerId: strongSelf.peerId,
+                    joinAs: strongSelf.joinAsPeerId,
+                    callId: callInfo.id,
+                    accessHash: callInfo.accessHash,
+                    preferMuted: true,
+                    joinPayload: joinPayload,
+                    peerAdminIds: peerAdminIds,
+                    inviteHash: strongSelf.invite
+                )
+                |> deliverOnMainQueue).start(next: { joinCallResult in
                     guard let strongSelf = self else {
                         return
                     }
+                    let clientParams = joinCallResult.jsonParams
+                    if let data = clientParams.data(using: .utf8), let dict = (try? JSONSerialization.jsonObject(with: data, options: [])) as? [String: Any] {
+                        if let video = dict["video"] as? [String: Any] {
+                            if let endpointId = video["endpoint"] as? String {
+                                strongSelf.currentLocalEndpointId = endpointId
+                            }
+                        }
+                    }
 
-                    let peerAdminIds: Signal<[PeerId], NoError>
-                    let peerId = strongSelf.peerId
-                    if strongSelf.peerId.namespace == Namespaces.Peer.CloudChannel {
-                        peerAdminIds = Signal { subscriber in
-                            let (disposable, _) = strongSelf.accountContext.peerChannelMemberCategoriesContextsManager.admins(postbox: strongSelf.accountContext.account.postbox, network: strongSelf.accountContext.account.network, accountPeerId: strongSelf.accountContext.account.peerId, peerId: peerId, updated: { list in
-                                var peerIds = Set<PeerId>()
-                                for item in list.list {
-                                    if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) {
-                                        peerIds.insert(item.peer.id)
-                                    }
+                    strongSelf.ssrcMapping.removeAll()
+                    for participant in joinCallResult.state.participants {
+                        if let ssrc = participant.ssrc {
+                            strongSelf.ssrcMapping[ssrc] = SsrcMapping(peerId: participant.peer.id, isPresentation: false)
+                        }
+                        if let presentationSsrc = participant.presentationDescription?.audioSsrc {
+                            strongSelf.ssrcMapping[presentationSsrc] = SsrcMapping(peerId: participant.peer.id, isPresentation: true)
+                        }
+                    }
+
+                    switch joinCallResult.connectionMode {
+                    case .rtc:
+                        strongSelf.currentConnectionMode = .rtc
+                        strongSelf.genericCallContext?.setConnectionMode(.rtc, keepBroadcastConnectedIfWasEnabled: false)
+                        strongSelf.genericCallContext?.setJoinResponse(payload: clientParams)
+                    case .broadcast:
+                        strongSelf.currentConnectionMode = .broadcast
+                        strongSelf.genericCallContext?.setConnectionMode(.broadcast, keepBroadcastConnectedIfWasEnabled: false)
+                    }
+
+                    strongSelf.updateSessionState(internalState: .established(info: joinCallResult.callInfo, connectionMode: joinCallResult.connectionMode, clientParams: clientParams, localSsrc: ssrc, initialState: joinCallResult.state), audioSessionControl: strongSelf.audioSessionControl)
+                }, error: { error in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    if case .anonymousNotAllowed = error {
+                        let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 }
+                        strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_AnonymousDisabledAlertText, actions: [
+                            TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})
+                        ]), on: .root, blockInteraction: false, completion: {})
+                    } else if case .tooManyParticipants = error {
+                        let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 }
+                        strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_ChatFullAlertText, actions: [
+                            TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})
+                        ]), on: .root, blockInteraction: false, completion: {})
+                    } else if case .invalidJoinAsPeer = error {
+                        let peerId = strongSelf.peerId
+                        let _ = strongSelf.accountContext.engine.calls.clearCachedGroupCallDisplayAsAvailablePeers(peerId: peerId).start()
+                        let _ = (strongSelf.accountContext.account.postbox.transaction { transaction -> Void in
+                            transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
+                                if let current = current as? CachedChannelData {
+                                    return current.withUpdatedCallJoinPeerId(nil)
+                                } else if let current = current as? CachedGroupData {
+                                    return current.withUpdatedCallJoinPeerId(nil)
+                                } else {
+                                    return current
                                 }
-                                subscriber.putNext(Array(peerIds))
                             })
-                            return disposable
-                        }
-                        |> distinctUntilChanged
-                        |> runOn(.mainQueue())
-                    } else {
-                        peerAdminIds = strongSelf.account.postbox.transaction { transaction -> [PeerId] in
-                            var result: [PeerId] = []
-                            if let cachedData = transaction.getPeerCachedData(peerId: peerId) as? CachedGroupData {
-                                if let participants = cachedData.participants {
-                                    for participant in participants.participants {
-                                        if case .creator = participant {
-                                            result.append(participant.peerId)
-                                        } else if case .admin = participant {
-                                            result.append(participant.peerId)
-                                        }
-                                    }
-                                }
-                            }
-                            return result
-                        }
+                        }).start()
                     }
-
-                    strongSelf.currentLocalSsrc = ssrc
-                    strongSelf.requestDisposable.set((joinGroupCall(
-                        account: strongSelf.account,
-                        peerId: strongSelf.peerId,
-                        joinAs: strongSelf.joinAsPeerId,
-                        callId: callInfo.id,
-                        accessHash: callInfo.accessHash,
-                        preferMuted: true,
-                        joinPayload: joinPayload,
-                        peerAdminIds: peerAdminIds,
-                        inviteHash: strongSelf.invite
-                    )
-                    |> deliverOnMainQueue).start(next: { joinCallResult in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        if let clientParams = joinCallResult.callInfo.clientParams {
-                            strongSelf.ssrcMapping.removeAll()
-                            let addedParticipants: [(UInt32, String?)] = []
-                            for participant in joinCallResult.state.participants {
-                                if let ssrc = participant.ssrc {
-                                    strongSelf.ssrcMapping[ssrc] = participant.peer.id
-                                    //addedParticipants.append((participant.ssrc, participant.jsonParams))
-                                }
-                            }
-                            
-                            switch joinCallResult.connectionMode {
-                            case .rtc:
-                                strongSelf.currentConnectionMode = .rtc
-                                strongSelf.callContext?.setConnectionMode(.rtc, keepBroadcastConnectedIfWasEnabled: false)
-                                strongSelf.callContext?.setJoinResponse(payload: clientParams, participants: addedParticipants)
-                            case .broadcast:
-                                strongSelf.currentConnectionMode = .broadcast
-                                strongSelf.callContext?.setConnectionMode(.broadcast, keepBroadcastConnectedIfWasEnabled: false)
-                            }
-                            
-                            strongSelf.updateSessionState(internalState: .established(info: joinCallResult.callInfo, connectionMode: joinCallResult.connectionMode, clientParams: clientParams, localSsrc: ssrc, initialState: joinCallResult.state), audioSessionControl: strongSelf.audioSessionControl)
-                        }
-                    }, error: { error in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        if case .anonymousNotAllowed = error {
-                            let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 }
-                            strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_AnonymousDisabledAlertText, actions: [
-                                TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})
-                            ]), on: .root, blockInteraction: false, completion: {})
-                        } else if case .tooManyParticipants = error {
-                            let presentationData = strongSelf.accountContext.sharedContext.currentPresentationData.with { $0 }
-                            strongSelf.accountContext.sharedContext.mainWindow?.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: nil, text: presentationData.strings.VoiceChat_ChatFullAlertText, actions: [
-                                TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})
-                            ]), on: .root, blockInteraction: false, completion: {})
-                        }
-                        strongSelf.markAsCanBeRemoved()
-                    }))
+                    strongSelf.markAsCanBeRemoved()
                 }))
+            }))
+            
+            self.networkStateDisposable.set((genericCallContext.networkState
+            |> deliverOnMainQueue).start(next: { [weak self] state in
+                guard let strongSelf = self else {
+                    return
+                }
+                let mappedState: PresentationGroupCallState.NetworkState
+                if state.isConnected {
+                    mappedState = .connected
+                } else {
+                    mappedState = .connecting
+                }
+
+                let wasConnecting = strongSelf.stateValue.networkState == .connecting
+                if strongSelf.stateValue.networkState != mappedState {
+                    strongSelf.stateValue.networkState = mappedState
+                }
+                let isConnecting = mappedState == .connecting
                 
-                self.networkStateDisposable.set((callContext.networkState
-                |> deliverOnMainQueue).start(next: { [weak self] state in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    let mappedState: PresentationGroupCallState.NetworkState
-                    if state.isConnected {
-                        mappedState = .connected
-                    } else {
-                        mappedState = .connecting
-                    }
-
-                    let wasConnecting = strongSelf.stateValue.networkState == .connecting
-                    if strongSelf.stateValue.networkState != mappedState {
-                        strongSelf.stateValue.networkState = mappedState
-                    }
-                    let isConnecting = mappedState == .connecting
-                    
-                    if strongSelf.isCurrentlyConnecting != isConnecting {
-                        strongSelf.isCurrentlyConnecting = isConnecting
-                        if isConnecting {
-                            strongSelf.startCheckingCallIfNeeded()
-                        } else {
-                            strongSelf.checkCallDisposable?.dispose()
-                            strongSelf.checkCallDisposable = nil
-                        }
-                    }
-
-                    strongSelf.isReconnectingAsSpeaker = state.isTransitioningFromBroadcastToRtc
-                    
-                    if (wasConnecting != isConnecting && strongSelf.didConnectOnce) {
-                        if isConnecting {
-                            let toneRenderer = PresentationCallToneRenderer(tone: .groupConnecting)
-                            strongSelf.toneRenderer = toneRenderer
-                            toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive)
-                        } else {
-                            strongSelf.toneRenderer = nil
-                        }
-                    }
-                    
+                if strongSelf.isCurrentlyConnecting != isConnecting {
+                    strongSelf.isCurrentlyConnecting = isConnecting
                     if isConnecting {
-                        strongSelf.didStartConnectingOnce = true
+                        strongSelf.startCheckingCallIfNeeded()
+                    } else {
+                        strongSelf.checkCallDisposable?.dispose()
+                        strongSelf.checkCallDisposable = nil
                     }
-                    
-                    if state.isConnected {
-                        if !strongSelf.didConnectOnce {
-                            strongSelf.didConnectOnce = true
-                            
-                            let toneRenderer = PresentationCallToneRenderer(tone: .groupJoined)
-                            strongSelf.toneRenderer = toneRenderer
-                            toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive)
-                        }
+                }
 
-                        if let peer = strongSelf.reconnectingAsPeer {
-                            strongSelf.reconnectingAsPeer = nil
-                            strongSelf.reconnectedAsEventsPipe.putNext(peer)
+                strongSelf.isReconnectingAsSpeaker = state.isTransitioningFromBroadcastToRtc
+                
+                if (wasConnecting != isConnecting && strongSelf.didConnectOnce) {
+                    if isConnecting {
+                        strongSelf.beginTone(tone: .groupConnecting)
+                    } else {
+                        strongSelf.toneRenderer = nil
+                    }
+                }
+                
+                if isConnecting {
+                    strongSelf.didStartConnectingOnce = true
+                }
+                
+                if state.isConnected {
+                    if !strongSelf.didConnectOnce {
+                        strongSelf.didConnectOnce = true
+                        
+                        if !strongSelf.isScheduled {
+                            strongSelf.beginTone(tone: .groupJoined)
                         }
                     }
-                }))
-                
-                self.audioLevelsDisposable.set((callContext.audioLevels
-                |> deliverOnMainQueue).start(next: { [weak self] levels in
-                    guard let strongSelf = self else {
-                        return
+
+                    if let peer = strongSelf.reconnectingAsPeer {
+                        strongSelf.reconnectingAsPeer = nil
+                        strongSelf.reconnectedAsEventsPipe.putNext(peer)
                     }
-                    var result: [(PeerId, UInt32, Float, Bool)] = []
-                    var myLevel: Float = 0.0
-                    var myLevelHasVoice: Bool = false
-                    var missingSsrcs = Set<UInt32>()
-                    for (ssrcKey, level, hasVoice) in levels {
-                        var peerId: PeerId?
-                        let ssrcValue: UInt32
-                        switch ssrcKey {
-                        case .local:
-                            peerId = strongSelf.joinAsPeerId
-                            ssrcValue = 0
-                        case let .source(ssrc):
-                            peerId = strongSelf.ssrcMapping[ssrc]
+                }
+            }))
+
+            self.isNoiseSuppressionEnabledDisposable.set((genericCallContext.isNoiseSuppressionEnabled
+            |> deliverOnMainQueue).start(next: { [weak self] value in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.isNoiseSuppressionEnabledPromise.set(value)
+            }))
+            
+            self.audioLevelsDisposable.set((genericCallContext.audioLevels
+            |> deliverOnMainQueue).start(next: { [weak self] levels in
+                guard let strongSelf = self else {
+                    return
+                }
+                var result: [(PeerId, UInt32, Float, Bool)] = []
+                var myLevel: Float = 0.0
+                var myLevelHasVoice: Bool = false
+                var orignalMyLevelHasVoice: Bool = false
+                var missingSsrcs = Set<UInt32>()
+                for (ssrcKey, level, hasVoice) in levels {
+                    var peerId: PeerId?
+                    let ssrcValue: UInt32
+                    switch ssrcKey {
+                    case .local:
+                        peerId = strongSelf.joinAsPeerId
+                        ssrcValue = 0
+                    case let .source(ssrc):
+                        if let mapping = strongSelf.ssrcMapping[ssrc] {
+                            if mapping.isPresentation {
+                                peerId = nil
+                                ssrcValue = 0
+                            } else {
+                                peerId = mapping.peerId
+                                ssrcValue = ssrc
+                            }
+                        } else {
                             ssrcValue = ssrc
                         }
-                        if let peerId = peerId {
-                            if case .local = ssrcKey {
-                                if !strongSelf.isMutedValue.isEffectivelyMuted {
-                                    myLevel = level
-                                    myLevelHasVoice = hasVoice
-                                }
-                            }
-                            result.append((peerId, ssrcValue, level, hasVoice))
-                        } else if ssrcValue != 0 {
-                            missingSsrcs.insert(ssrcValue)
+                    }
+                    if let peerId = peerId {
+                        if case .local = ssrcKey {
+                            orignalMyLevelHasVoice = hasVoice
+                            myLevel = level
+                            myLevelHasVoice = hasVoice
                         }
+                        result.append((peerId, ssrcValue, level, hasVoice))
+                    } else if ssrcValue != 0 {
+                        missingSsrcs.insert(ssrcValue)
                     }
-                    
-                    strongSelf.speakingParticipantsContext.update(levels: result)
-                    
-                    let mappedLevel = myLevel * 1.5
-                    strongSelf.myAudioLevelPipe.putNext(mappedLevel)
-                    strongSelf.processMyAudioLevel(level: mappedLevel, hasVoice: myLevelHasVoice)
-                    
-                    if !missingSsrcs.isEmpty {
-                        strongSelf.participantsContext?.ensureHaveParticipants(ssrcs: missingSsrcs)
-                    }
-                }))
-            }
+                }
+                
+                strongSelf.speakingParticipantsContext.update(levels: result)
+                
+                let mappedLevel = myLevel * 1.5
+                strongSelf.myAudioLevelPipe.putNext(mappedLevel)
+                strongSelf.processMyAudioLevel(level: mappedLevel, hasVoice: myLevelHasVoice)
+                strongSelf.isSpeakingPromise.set(orignalMyLevelHasVoice)
+                
+                if !missingSsrcs.isEmpty {
+                    strongSelf.participantsContext?.ensureHaveParticipants(ssrcs: missingSsrcs)
+                }
+            }))
         }
         
         switch previousInternalState {
@@ -1305,13 +1677,16 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 if self.stateValue.title != initialState.title {
                     self.stateValue.title = initialState.title
                 }
+                if self.stateValue.scheduleTimestamp != initialState.scheduleTimestamp {
+                    self.stateValue.scheduleTimestamp = initialState.scheduleTimestamp
+                }
                 
                 let accountContext = self.accountContext
                 let peerId = self.peerId
                 let rawAdminIds: Signal<Set<PeerId>, NoError>
                 if peerId.namespace == Namespaces.Peer.CloudChannel {
                     rawAdminIds = Signal { subscriber in
-                        let (disposable, _) = accountContext.peerChannelMemberCategoriesContextsManager.admins(postbox: accountContext.account.postbox, network: accountContext.account.network, accountPeerId: accountContext.account.peerId, peerId: peerId, updated: { list in
+                        let (disposable, _) = accountContext.peerChannelMemberCategoriesContextsManager.admins(engine: accountContext.engine, postbox: accountContext.account.postbox, network: accountContext.account.network, accountPeerId: accountContext.account.peerId, peerId: peerId, updated: { list in
                             var peerIds = Set<PeerId>()
                             for item in list.list {
                                 if let adminInfo = item.participant.adminInfo, adminInfo.rights.rights.contains(.canManageCalls) {
@@ -1367,12 +1742,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 var initialState = initialState
                 var serviceState: GroupCallParticipantsContext.ServiceState?
                 if let participantsContext = self.participantsContext, let immediateState = participantsContext.immediateState {
-                    initialState.mergeActivity(from: immediateState, myPeerId: myPeerId, previousMyPeerId: self.ignorePreviousJoinAsPeerId?.0)
+                    initialState.mergeActivity(from: immediateState, myPeerId: myPeerId, previousMyPeerId: self.ignorePreviousJoinAsPeerId?.0, mergeActivityTimestamps: true)
                     serviceState = participantsContext.serviceState
                 }
                 
-                let participantsContext = GroupCallParticipantsContext(
-                    account: self.accountContext.account,
+                let participantsContext = self.accountContext.engine.calls.groupCall(
                     peerId: self.peerId,
                     myPeerId: self.joinAsPeerId,
                     id: callInfo.id,
@@ -1382,13 +1756,20 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 )
                 self.temporaryParticipantsContext = nil
                 self.participantsContext = participantsContext
-                let myPeer = self.accountContext.account.postbox.transaction { transaction -> (Peer, CachedPeerData?)? in
-                    if let peer = transaction.getPeer(myPeerId) {
-                        return (peer, transaction.getPeerCachedData(peerId: myPeerId))
+                let myPeer = self.accountContext.account.postbox.peerView(id: myPeerId)
+                |> map { view -> (Peer, CachedPeerData?)? in
+                    if let peer = peerViewMainPeer(view) {
+                        return (peer, view.cachedData)
                     } else {
                         return nil
                     }
                 }
+                |> beforeNext { view in
+                    if let view = view, view.1 == nil {
+                        let _ = accountContext.engine.peers.fetchAndUpdateCachedPeerData(peerId: myPeerId).start()
+                    }
+                }
+                
                 self.participantsContextStateDisposable.set(combineLatest(queue: .mainQueue(),
                     participantsContext.state,
                     participantsContext.activeSpeakers,
@@ -1456,13 +1837,14 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                             } else if let cachedData = cachedData as? CachedChannelData {
                                 about = cachedData.about
                             } else {
-                                about = nil
+                                about = " "
                             }
 
                             participants.append(GroupCallParticipantsContext.Participant(
                                 peer: myPeer,
                                 ssrc: nil,
-                                jsonParams: nil,
+                                videoDescription: nil,
+                                presentationDescription: nil,
                                 joinTimestamp: strongSelf.temporaryJoinTimestamp,
                                 raiseHandRating: strongSelf.temporaryRaiseHandRating,
                                 hasRaiseHand: strongSelf.temporaryHasRaiseHand,
@@ -1470,11 +1852,14 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                                 activityRank: strongSelf.temporaryActivityRank,
                                 muteState: strongSelf.temporaryMuteState ?? GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false),
                                 volume: nil,
-                                about: about
+                                about: about,
+                                joinedVideo: strongSelf.temporaryJoinedVideo
                             ))
-                            participants.sort()
+                            participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: state.sortAscending) })
                         }
                     }
+
+                    var otherParticipantsWithVideo = 0
                     
                     for participant in participants {
                         var participant = participant
@@ -1484,10 +1869,26 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                         }
                         
                         if let ssrc = participant.ssrc {
-                            strongSelf.ssrcMapping[ssrc] = participant.peer.id
+                            strongSelf.ssrcMapping[ssrc] = SsrcMapping(peerId: participant.peer.id, isPresentation: false)
+                        }
+                        if let presentationSsrc = participant.presentationDescription?.audioSsrc {
+                            strongSelf.ssrcMapping[presentationSsrc] = SsrcMapping(peerId: participant.peer.id, isPresentation: true)
                         }
                         
                         if participant.peer.id == strongSelf.joinAsPeerId {
+                            if let (myPeer, cachedData) = myPeerAndCachedData {
+                                let about: String?
+                                if let cachedData = cachedData as? CachedUserData {
+                                    about = cachedData.about
+                                } else if let cachedData = cachedData as? CachedChannelData {
+                                    about = cachedData.about
+                                } else {
+                                    about = " "
+                                }
+                                participant.peer = myPeer
+                                participant.about = about
+                            }
+                        
                             var filteredMuteState = participant.muteState
                             if isReconnectingAsSpeaker || strongSelf.currentConnectionMode != .rtc {
                                 filteredMuteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: false)
@@ -1496,7 +1897,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
 
                             let previousRaisedHand = strongSelf.stateValue.raisedHand
                             if !(strongSelf.stateValue.muteState?.canUnmute ?? false) {
-                                strongSelf.stateValue.raisedHand = participant.raiseHandRating != nil
+                                strongSelf.stateValue.raisedHand = participant.hasRaiseHand
                             }
                             
                             if let muteState = participant.muteState, muteState.canUnmute && previousRaisedHand { 
@@ -1534,30 +1935,41 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                                     switch strongSelf.isMutedValue {
                                     case let .muted(isPushToTalkActive):
                                         if !isPushToTalkActive {
-                                            strongSelf.callContext?.setIsMuted(true)
+                                            strongSelf.genericCallContext?.setIsMuted(true)
                                         }
                                     case .unmuted:
                                         strongSelf.isMutedValue = .muted(isPushToTalkActive: false)
-                                        strongSelf.callContext?.setIsMuted(true)
+                                        strongSelf.genericCallContext?.setIsMuted(true)
                                     }
                                 } else {
                                     strongSelf.isMutedValue = .muted(isPushToTalkActive: false)
-                                    strongSelf.callContext?.setIsMuted(true)
+                                    strongSelf.genericCallContext?.setIsMuted(true)
                                 }
                                 strongSelf.stateValue.muteState = muteState
                             } else if let currentMuteState = strongSelf.stateValue.muteState, !currentMuteState.canUnmute {
                                 strongSelf.isMutedValue = .muted(isPushToTalkActive: false)
                                 strongSelf.stateValue.muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false)
-                                strongSelf.callContext?.setIsMuted(true)
+                                strongSelf.genericCallContext?.setIsMuted(true)
                             }
                         } else {
                             if let ssrc = participant.ssrc {
                                 if let volume = participant.volume {
-                                    strongSelf.callContext?.setVolume(ssrc: ssrc, volume: Double(volume) / 10000.0)
+                                    strongSelf.genericCallContext?.setVolume(ssrc: ssrc, volume: Double(volume) / 10000.0)
                                 } else if participant.muteState?.mutedByYou == true {
-                                    strongSelf.callContext?.setVolume(ssrc: ssrc, volume: 0.0)
+                                    strongSelf.genericCallContext?.setVolume(ssrc: ssrc, volume: 0.0)
                                 }
                             }
+                            if let presentationSsrc = participant.presentationDescription?.audioSsrc {
+                                if let volume = participant.volume {
+                                    strongSelf.genericCallContext?.setVolume(ssrc: presentationSsrc, volume: Double(volume) / 10000.0)
+                                } else if participant.muteState?.mutedByYou == true {
+                                    strongSelf.genericCallContext?.setVolume(ssrc: presentationSsrc, volume: 0.0)
+                                }
+                            }
+
+                            if participant.videoDescription != nil || participant.presentationDescription != nil {
+                                otherParticipantsWithVideo += 1
+                            }
                         }
                         
                         if let index = updatedInvitedPeers.firstIndex(of: participant.peer.id) {
@@ -1581,15 +1993,22 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     }
                     strongSelf.stateValue.recordingStartTimestamp = state.recordingStartTimestamp
                     strongSelf.stateValue.title = state.title
-                                        
+                    strongSelf.stateValue.scheduleTimestamp = state.scheduleTimestamp
+                    strongSelf.stateValue.isVideoEnabled = state.isVideoEnabled && otherParticipantsWithVideo < state.unmutedVideoLimit
+                    
                     strongSelf.summaryInfoState.set(.single(SummaryInfoState(info: GroupCallInfo(
                         id: callInfo.id,
                         accessHash: callInfo.accessHash,
                         participantCount: state.totalCount,
-                        clientParams: nil,
                         streamDcId: nil,
                         title: state.title,
-                        recordingStartTimestamp: state.recordingStartTimestamp
+                        scheduleTimestamp: state.scheduleTimestamp,
+                        subscribedToScheduled: false,
+                        recordingStartTimestamp: state.recordingStartTimestamp,
+                        sortAscending: state.sortAscending,
+                        defaultParticipantsAreMuted: state.defaultParticipantsAreMuted,
+                        isVideoEnabled: state.isVideoEnabled,
+                        unmutedVideoLimit: state.unmutedVideoLimit
                     ))))
                     
                     strongSelf.summaryParticipantsState.set(.single(SummaryParticipantsState(
@@ -1608,7 +2027,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                 |> mapToSignal { event -> Signal<PresentationGroupCallMemberEvent, NoError> in
                     return postbox.transaction { transaction -> Signal<PresentationGroupCallMemberEvent, NoError> in
                         if let peer = transaction.getPeer(event.peerId) {
-                            return .single(PresentationGroupCallMemberEvent(peer: peer, joined: event.joined))
+                            let isContact = transaction.isPeerContact(peerId: event.peerId)
+                            let isInChatList = transaction.getPeerChatListIndex(event.peerId) != nil
+                            return .single(PresentationGroupCallMemberEvent(peer: peer, isContact: isContact, isInChatList: isInChatList, canUnmute: event.canUnmute, joined: event.joined))
                         } else {
                             return .complete()
                         }
@@ -1616,90 +2037,79 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                     |> switchToLatest
                 }
                 |> deliverOnMainQueue).start(next: { [weak self] event in
-                    guard let strongSelf = self else {
+                    guard let strongSelf = self, event.peer.id != strongSelf.stateValue.myPeerId else {
                         return
                     }
-                    if event.peer.id == strongSelf.stateValue.myPeerId {
-                        return
+                    var skip = false
+                    if let participantsCount = strongSelf.participantsContext?.immediateState?.totalCount, participantsCount >= 250 {
+                        if event.peer.isVerified || event.isContact || event.isInChatList || (strongSelf.stateValue.defaultParticipantMuteState == .muted && event.canUnmute) {
+                            skip = false
+                        } else {
+                            skip = true
+                        }
+                    }
+                    if !skip {
+                        strongSelf.memberEventsPipe.putNext(event)
                     }
-                    strongSelf.memberEventsPipe.putNext(event)
                 }))
                 
                 if let isCurrentlyConnecting = self.isCurrentlyConnecting, isCurrentlyConnecting {
                     self.startCheckingCallIfNeeded()
                 }
+            } else if case let .active(callInfo) = internalState, callInfo.scheduleTimestamp != nil {
+                self.switchToTemporaryScheduledParticipantsContext()
             }
         }
     }
     
-    private func maybeRequestParticipants(ssrcs: Set<UInt32>) {
-        var missingSsrcs = ssrcs
-        missingSsrcs.subtract(self.processedMissingSsrcs)
-        if missingSsrcs.isEmpty {
-            return
+    private func requestMediaChannelDescriptions(ssrcs: Set<UInt32>, completion: @escaping ([OngoingGroupCallContext.MediaChannelDescription]) -> Void) -> Disposable {
+        func extractMediaChannelDescriptions(remainingSsrcs: inout Set<UInt32>, participants: [GroupCallParticipantsContext.Participant], into result: inout [OngoingGroupCallContext.MediaChannelDescription]) {
+            for participant in participants {
+                guard let audioSsrc = participant.ssrc else {
+                    continue
+                }
+
+                if remainingSsrcs.contains(audioSsrc) {
+                    remainingSsrcs.remove(audioSsrc)
+
+                    result.append(OngoingGroupCallContext.MediaChannelDescription(
+                        kind: .audio,
+                        audioSsrc: audioSsrc,
+                        videoDescription: nil
+                    ))
+                }
+
+                if let screencastSsrc = participant.presentationDescription?.audioSsrc {
+                    if remainingSsrcs.contains(screencastSsrc) {
+                        remainingSsrcs.remove(screencastSsrc)
+
+                        result.append(OngoingGroupCallContext.MediaChannelDescription(
+                            kind: .audio,
+                            audioSsrc: screencastSsrc,
+                            videoDescription: nil
+                        ))
+                    }
+                }
+            }
         }
-        self.processedMissingSsrcs.formUnion(ssrcs)
-        
-        var addedParticipants: [(UInt32, String?)] = []
-        
+
+        var remainingSsrcs = ssrcs
+        var result: [OngoingGroupCallContext.MediaChannelDescription] = []
+
         if let membersValue = self.membersValue {
-            for participant in membersValue.participants {
-                let participantSsrcs = participant.allSsrcs
-                
-                if !missingSsrcs.intersection(participantSsrcs).isEmpty {
-                    missingSsrcs.subtract(participantSsrcs)
-                    self.processedMissingSsrcs.formUnion(participantSsrcs)
-                    
-                    if let ssrc = participant.ssrc {
-                        addedParticipants.append((ssrc, participant.jsonParams))
-                    }
-                }
-            }
+            extractMediaChannelDescriptions(remainingSsrcs: &remainingSsrcs, participants: membersValue.participants, into: &result)
         }
-        
-        if !addedParticipants.isEmpty {
-            self.callContext?.addParticipants(participants: addedParticipants)
-        }
-        
-        if !missingSsrcs.isEmpty {
-            self.missingSsrcs.formUnion(missingSsrcs)
-            self.maybeRequestMissingSsrcs()
-        }
-    }
-    
-    private func maybeRequestMissingSsrcs() {
-        if self.isRequestingMissingSsrcs {
-            return
-        }
-        if self.missingSsrcs.isEmpty {
-            return
-        }
-        if case let .established(callInfo, _, _, _, _) = self.internalState {
-            self.isRequestingMissingSsrcs = true
-            
-            let requestedSsrcs = self.missingSsrcs
-            self.missingSsrcsDisposable.set((getGroupCallParticipants(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, offset: "", ssrcs: Array(requestedSsrcs), limit: 100)
-            |> deliverOnMainQueue).start(next: { [weak self] state in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.isRequestingMissingSsrcs = false
-                strongSelf.missingSsrcs.subtract(requestedSsrcs)
-                
-                var addedParticipants: [(UInt32, String?)] = []
-                
-                for participant in state.participants {
-                    if let ssrc = participant.ssrc {
-                        addedParticipants.append((ssrc, participant.jsonParams))
-                    }
-                }
-                
-                if !addedParticipants.isEmpty {
-                    strongSelf.callContext?.addParticipants(participants: addedParticipants)
-                }
-                
-                strongSelf.maybeRequestMissingSsrcs()
-            }))
+
+        if !remainingSsrcs.isEmpty, let callInfo = self.internalState.callInfo {
+            return (self.accountContext.engine.calls.getGroupCallParticipants(callId: callInfo.id, accessHash: callInfo.accessHash, offset: "", ssrcs: Array(remainingSsrcs), limit: 100, sortAscending: callInfo.sortAscending)
+            |> deliverOnMainQueue).start(next: { state in
+                extractMediaChannelDescriptions(remainingSsrcs: &remainingSsrcs, participants: state.participants, into: &result)
+
+                completion(result)
+            })
+        } else {
+            completion(result)
+            return EmptyDisposable
         }
     }
     
@@ -1708,14 +2118,21 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             return
         }
         if case let .established(callInfo, connectionMode, _, ssrc, _) = self.internalState, case .rtc = connectionMode {
-            let checkSignal = checkGroupCall(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, ssrc: Int32(bitPattern: ssrc))
+            let checkSignal = self.accountContext.engine.calls.checkGroupCall(callId: callInfo.id, accessHash: callInfo.accessHash, ssrcs: [ssrc])
             
             self.checkCallDisposable = ((
                 checkSignal
                 |> castError(Bool.self)
                 |> delay(4.0, queue: .mainQueue())
                 |> mapToSignal { result -> Signal<Bool, Bool> in
-                    if case .success = result {
+                    var foundAll = true
+                    for value in [ssrc] {
+                        if !result.contains(value) {
+                            foundAll = false
+                            break
+                        }
+                    }
+                    if foundAll {
                         return .fail(true)
                     } else {
                         return .single(true)
@@ -1741,6 +2158,24 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
     }
 
+    private func beginTone(tone: PresentationCallTone) {
+        var completed: (() -> Void)?
+        let toneRenderer = PresentationCallToneRenderer(tone: tone, completed: {
+            completed?()
+        })
+        completed = { [weak self, weak toneRenderer] in
+            Queue.mainQueue().async {
+                guard let strongSelf = self, let toneRenderer = toneRenderer, toneRenderer === strongSelf.toneRenderer else {
+                    return
+                }
+                strongSelf.toneRenderer = nil
+            }
+        }
+
+        self.toneRenderer = toneRenderer
+        toneRenderer.setAudioSessionActive(self.isAudioSessionActive)
+    }
+
     public func playTone(_ tone: PresentationGroupCallTone) {
         let name: String
         switch tone {
@@ -1750,9 +2185,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             name = "voip_group_recording_started.mp3"
         }
 
-        let toneRenderer = PresentationCallToneRenderer(tone: .custom(name: name, loopCount: 1))
-        self.toneRenderer = toneRenderer
-        toneRenderer.setAudioSessionActive(self.isAudioSessionActive)
+        self.beginTone(tone: .custom(name: name, loopCount: 1))
     }
     
     private func markAsCanBeRemoved() {
@@ -1761,7 +2194,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
         self.markedAsCanBeRemoved = true
 
-        self.callContext?.stop()
+        self.genericCallContext?.stop()
+
+        //self.screencastIpcContext = nil
+        self.screencastCallContext?.stop()
+
         self._canBeRemoved.set(.single(true))
         
         if self.didConnectOnce {
@@ -1776,10 +2213,8 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                         strongSelf.wasRemoved.set(.single(true))
                         return
                     }
-                    
-                    let toneRenderer = PresentationCallToneRenderer(tone: .groupLeft)
-                    strongSelf.toneRenderer = toneRenderer
-                    toneRenderer.setAudioSessionActive(strongSelf.isAudioSessionActive)
+
+                    strongSelf.beginTone(tone: .groupLeft)
                     
                     Queue.mainQueue().after(1.0, {
                         strongSelf.wasRemoved.set(.single(true))
@@ -1802,11 +2237,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             return transaction.getPeer(peerId)
         }
         |> deliverOnMainQueue).start(next: { [weak self] myPeer in
-            guard let strongSelf = self, let _ = myPeer else {
+            guard let strongSelf = self, let myPeer = myPeer else {
                 return
             }
-
-            strongSelf.reconnectingAsPeer = myPeer
             
             let previousPeerId = strongSelf.joinAsPeerId
             if let localSsrc = strongSelf.currentLocalSsrc {
@@ -1814,48 +2247,63 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             }
             strongSelf.joinAsPeerId = peerId
             
-            if let participantsContext = strongSelf.participantsContext, let immediateState = participantsContext.immediateState {
-                for participant in immediateState.participants {
-                    if participant.peer.id == previousPeerId {
-                        strongSelf.temporaryJoinTimestamp = participant.joinTimestamp
-                        strongSelf.temporaryActivityTimestamp = participant.activityTimestamp
-                        strongSelf.temporaryActivityRank = participant.activityRank
-                        strongSelf.temporaryRaiseHandRating = participant.raiseHandRating
-                        strongSelf.temporaryHasRaiseHand = participant.hasRaiseHand
-                        strongSelf.temporaryMuteState = participant.muteState
-                    }
-                }
-                strongSelf.switchToTemporaryParticipantsContext(sourceContext: participantsContext, oldMyPeerId: previousPeerId)
-            } else {
+            if strongSelf.stateValue.scheduleTimestamp != nil {
                 strongSelf.stateValue.myPeerId = peerId
+                strongSelf.reconnectedAsEventsPipe.putNext(myPeer)
+                strongSelf.switchToTemporaryScheduledParticipantsContext()
+            } else {
+                strongSelf.disableVideo()
+                strongSelf.isMutedValue = .muted(isPushToTalkActive: false)
+                strongSelf.isMutedPromise.set(strongSelf.isMutedValue)
+                
+                strongSelf.reconnectingAsPeer = myPeer
+                
+                if let participantsContext = strongSelf.participantsContext, let immediateState = participantsContext.immediateState {
+                    for participant in immediateState.participants {
+                        if participant.peer.id == previousPeerId {
+                            strongSelf.temporaryJoinTimestamp = participant.joinTimestamp
+                            strongSelf.temporaryActivityTimestamp = participant.activityTimestamp
+                            strongSelf.temporaryActivityRank = participant.activityRank
+                            strongSelf.temporaryRaiseHandRating = participant.raiseHandRating
+                            strongSelf.temporaryHasRaiseHand = participant.hasRaiseHand
+                            strongSelf.temporaryMuteState = participant.muteState
+                            strongSelf.temporaryJoinedVideo = participant.joinedVideo
+                        }
+                    }
+                    strongSelf.switchToTemporaryParticipantsContext(sourceContext: participantsContext, oldMyPeerId: previousPeerId)
+                } else {
+                    strongSelf.stateValue.myPeerId = peerId
+                }
+                
+                strongSelf.requestCall(movingFromBroadcastToRtc: false)
             }
-            
-            strongSelf.requestCall(movingFromBroadcastToRtc: false)
         })
     }
     
     public func leave(terminateIfPossible: Bool) -> Signal<Bool, NoError> {
         self.leaving = true
-        if let callInfo = self.internalState.callInfo, let localSsrc = self.currentLocalSsrc {
+        if let callInfo = self.internalState.callInfo {
             if terminateIfPossible {
-                self.leaveDisposable.set((stopGroupCall(account: self.account, peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash)
+                self.leaveDisposable.set((self.accountContext.engine.calls.stopGroupCall(peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash)
                 |> deliverOnMainQueue).start(completed: { [weak self] in
                     guard let strongSelf = self else {
                         return
                     }
                     strongSelf.markAsCanBeRemoved()
                 }))
-            } else {
+            } else if let localSsrc = self.currentLocalSsrc {
                 if let contexts = self.accountContext.cachedGroupCallContexts as? AccountGroupCallContextCacheImpl {
-                    let account = self.account
+                    let engine = self.accountContext.engine
                     let id = callInfo.id
                     let accessHash = callInfo.accessHash
                     let source = localSsrc
                     contexts.impl.with { impl in
-                        impl.leaveInBackground(account: account, id: id, accessHash: accessHash, source: source)
+                        impl.leaveInBackground(engine: engine, id: id, accessHash: accessHash, source: source)
                     }
                 }
                 self.markAsCanBeRemoved()
+            } else {
+                self.markAsCanBeRemoved()
             }
         } else {
             self.markAsCanBeRemoved()
@@ -1893,7 +2341,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             isVisuallyMuted = false
             let _ = self.updateMuteState(peerId: self.joinAsPeerId, isMuted: false)
         }
-        self.callContext?.setIsMuted(isEffectivelyMuted)
+        self.genericCallContext?.setIsMuted(isEffectivelyMuted)
         
         if isVisuallyMuted {
             self.stateValue.muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: true, mutedByYou: false)
@@ -1901,6 +2349,68 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             self.stateValue.muteState = nil
         }
     }
+
+    public func setIsNoiseSuppressionEnabled(_ isNoiseSuppressionEnabled: Bool) {
+        self.genericCallContext?.setIsNoiseSuppressionEnabled(isNoiseSuppressionEnabled)
+    }
+    
+    public func toggleScheduledSubscription(_ subscribe: Bool) {
+        guard case let .active(callInfo) = self.internalState, callInfo.scheduleTimestamp != nil else {
+            return
+        }
+        
+        self.stateValue.subscribedToScheduled = subscribe
+        
+        self.subscribeDisposable.set((self.accountContext.engine.calls.toggleScheduledGroupCallSubscription(peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash, subscribe: subscribe)
+        |> deliverOnMainQueue).start())
+    }
+    
+    public func schedule(timestamp: Int32) {
+        guard self.schedulePending else {
+            return
+        }
+        
+        self.schedulePending = false
+        self.stateValue.scheduleTimestamp = timestamp
+        
+        self.summaryParticipantsState.set(.single(SummaryParticipantsState(
+            participantCount: 1,
+            topParticipants: [],
+            activeSpeakers: Set()
+        )))
+        
+        self.startDisposable.set((self.accountContext.engine.calls.createGroupCall(peerId: self.peerId, title: nil, scheduleDate: timestamp)
+        |> deliverOnMainQueue).start(next: { [weak self] callInfo in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.updateSessionState(internalState: .active(callInfo), audioSessionControl: strongSelf.audioSessionControl)
+        }, error: { [weak self] error in
+            if let strongSelf = self {
+                strongSelf.markAsCanBeRemoved()
+            }
+        }))
+    }
+    
+    
+    public func startScheduled() {
+        guard case let .active(callInfo) = self.internalState else {
+            return
+        }
+        
+        self.isScheduledStarted = true
+        self.stateValue.scheduleTimestamp = nil
+        
+        self.startDisposable.set((self.accountContext.engine.calls.startScheduledGroupCall(peerId: self.peerId, callId: callInfo.id, accessHash: callInfo.accessHash)
+        |> deliverOnMainQueue).start(next: { [weak self] callInfo in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.updateSessionState(internalState: .active(callInfo), audioSessionControl: strongSelf.audioSessionControl)
+
+            strongSelf.beginTone(tone: .groupJoined)
+        }))
+    }
     
     public func raiseHand() {
         guard let membersValue = self.membersValue else {
@@ -1908,7 +2418,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
         for participant in membersValue.participants {
             if participant.peer.id == self.joinAsPeerId {
-                if participant.raiseHandRating != nil {
+                if participant.hasRaiseHand {
                     return
                 }
                 break
@@ -1924,7 +2434,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
         for participant in membersValue.participants {
             if participant.peer.id == self.joinAsPeerId {
-                if participant.raiseHandRating == nil {
+                if !participant.hasRaiseHand {
                     return
                 }
                 break
@@ -1934,48 +2444,303 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.participantsContext?.lowerHand()
     }
     
+    public func makeOutgoingVideoView(requestClone: Bool, completion: @escaping (PresentationCallVideoView?, PresentationCallVideoView?) -> Void) {
+        if self.videoCapturer == nil {
+            let videoCapturer = OngoingCallVideoCapturer()
+            self.videoCapturer = videoCapturer
+        }
+
+        guard let videoCapturer = self.videoCapturer else {
+            completion(nil, nil)
+            return
+        }
+        videoCapturer.makeOutgoingVideoView(requestClone: requestClone, completion: { mainView, cloneView in
+            if let mainView = mainView {
+                let setOnFirstFrameReceived = mainView.setOnFirstFrameReceived
+                let setOnOrientationUpdated = mainView.setOnOrientationUpdated
+                let setOnIsMirroredUpdated = mainView.setOnIsMirroredUpdated
+                let updateIsEnabled = mainView.updateIsEnabled
+                let mainVideoView = PresentationCallVideoView(
+                    holder: mainView,
+                    view: mainView.view,
+                    setOnFirstFrameReceived: { f in
+                        setOnFirstFrameReceived(f)
+                    },
+                    getOrientation: { [weak mainView] in
+                        if let mainView = mainView {
+                            let mappedValue: PresentationCallVideoView.Orientation
+                            switch mainView.getOrientation() {
+                            case .rotation0:
+                                mappedValue = .rotation0
+                            case .rotation90:
+                                mappedValue = .rotation90
+                            case .rotation180:
+                                mappedValue = .rotation180
+                            case .rotation270:
+                                mappedValue = .rotation270
+                            }
+                            return mappedValue
+                        } else {
+                            return .rotation0
+                        }
+                    },
+                    getAspect: { [weak mainView] in
+                        if let mainView = mainView {
+                            return mainView.getAspect()
+                        } else {
+                            return 0.0
+                        }
+                    },
+                    setOnOrientationUpdated: { f in
+                        setOnOrientationUpdated { value, aspect in
+                            let mappedValue: PresentationCallVideoView.Orientation
+                            switch value {
+                            case .rotation0:
+                                mappedValue = .rotation0
+                            case .rotation90:
+                                mappedValue = .rotation90
+                            case .rotation180:
+                                mappedValue = .rotation180
+                            case .rotation270:
+                                mappedValue = .rotation270
+                            }
+                            f?(mappedValue, aspect)
+                        }
+                    },
+                    setOnIsMirroredUpdated: { f in
+                        setOnIsMirroredUpdated { value in
+                            f?(value)
+                        }
+                    },
+                    updateIsEnabled: { value in
+                        updateIsEnabled(value)
+                    }
+                )
+                var cloneVideoView: PresentationCallVideoView?
+                if let cloneView = cloneView {
+                    let setOnFirstFrameReceived = cloneView.setOnFirstFrameReceived
+                    let setOnOrientationUpdated = cloneView.setOnOrientationUpdated
+                    let setOnIsMirroredUpdated = cloneView.setOnIsMirroredUpdated
+                    let updateIsEnabled = cloneView.updateIsEnabled
+                    cloneVideoView = PresentationCallVideoView(
+                        holder: cloneView,
+                        view: cloneView.view,
+                        setOnFirstFrameReceived: { f in
+                            setOnFirstFrameReceived(f)
+                        },
+                        getOrientation: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                let mappedValue: PresentationCallVideoView.Orientation
+                                switch cloneView.getOrientation() {
+                                case .rotation0:
+                                    mappedValue = .rotation0
+                                case .rotation90:
+                                    mappedValue = .rotation90
+                                case .rotation180:
+                                    mappedValue = .rotation180
+                                case .rotation270:
+                                    mappedValue = .rotation270
+                                }
+                                return mappedValue
+                            } else {
+                                return .rotation0
+                            }
+                        },
+                        getAspect: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                return cloneView.getAspect()
+                            } else {
+                                return 0.0
+                            }
+                        },
+                        setOnOrientationUpdated: { f in
+                            setOnOrientationUpdated { value, aspect in
+                                let mappedValue: PresentationCallVideoView.Orientation
+                                switch value {
+                                case .rotation0:
+                                    mappedValue = .rotation0
+                                case .rotation90:
+                                    mappedValue = .rotation90
+                                case .rotation180:
+                                    mappedValue = .rotation180
+                                case .rotation270:
+                                    mappedValue = .rotation270
+                                }
+                                f?(mappedValue, aspect)
+                            }
+                        },
+                        setOnIsMirroredUpdated: { f in
+                            setOnIsMirroredUpdated { value in
+                                f?(value)
+                            }
+                        },
+                        updateIsEnabled: { value in
+                            updateIsEnabled(value)
+                        }
+                    )
+                }
+                completion(mainVideoView, cloneVideoView)
+            } else {
+                completion(nil, nil)
+            }
+        })
+    }
+    
     public func requestVideo() {
         if self.videoCapturer == nil {
             let videoCapturer = OngoingCallVideoCapturer()
             self.videoCapturer = videoCapturer
         }
-        self.isVideo = true
+
         if let videoCapturer = self.videoCapturer {
-            self.callContext?.requestVideo(videoCapturer)
+            self.requestVideo(capturer: videoCapturer)
+        }
+    }
+
+    func requestVideo(capturer: OngoingCallVideoCapturer) {
+        self.videoCapturer = capturer
+        
+        self.hasVideo = true
+        if let videoCapturer = self.videoCapturer {
+            self.genericCallContext?.requestVideo(videoCapturer)
+            self.isVideoMuted = false
+            self.isVideoMutedDisposable.set((videoCapturer.isActive
+            |> distinctUntilChanged
+            |> deliverOnMainQueue).start(next: { [weak self] value in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.isVideoMuted = !value
+                strongSelf.updateLocalVideoState()
+            }))
+
+            self.updateLocalVideoState()
         }
     }
     
     public func disableVideo() {
-        self.isVideo = false
+        self.hasVideo = false
+        self.useFrontCamera = true;
         if let _ = self.videoCapturer {
             self.videoCapturer = nil
-            self.callContext?.disableVideo()
+            self.isVideoMutedDisposable.set(nil)
+            self.genericCallContext?.disableVideo()
+            self.isVideoMuted = true
+        
+            self.updateLocalVideoState()
+        }
+    }
+
+    private func updateLocalVideoState() {
+        self.participantsContext?.updateVideoState(peerId: self.joinAsPeerId, isVideoMuted: self.videoCapturer == nil, isVideoPaused: self.isVideoMuted, isPresentationPaused: nil)
+    }
+    
+    public func switchVideoCamera() {
+        self.useFrontCamera = !self.useFrontCamera
+        self.videoCapturer?.switchVideoInput(isFront: self.useFrontCamera)
+    }
+
+    private func requestScreencast() {
+        guard let callInfo = self.internalState.callInfo, self.screencastCallContext == nil else {
+            return
+        }
+        
+        self.hasScreencast = true
+
+        let screencastCallContext = OngoingGroupCallContext(video: self.screencastCapturer, requestMediaChannelDescriptions: { _, _ in EmptyDisposable }, audioStreamData: nil, rejoinNeeded: { }, outgoingAudioBitrateKbit: nil, videoContentType: .screencast, enableNoiseSuppression: false)
+        self.screencastCallContext = screencastCallContext
+
+        self.screencastJoinDisposable.set((screencastCallContext.joinPayload
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { [weak self] joinPayload in
+            guard let strongSelf = self else {
+                return
+            }
+
+            strongSelf.requestDisposable.set((strongSelf.accountContext.engine.calls.joinGroupCallAsScreencast(
+                peerId: strongSelf.peerId,
+                callId: callInfo.id,
+                accessHash: callInfo.accessHash,
+                joinPayload: joinPayload.0
+            )
+            |> deliverOnMainQueue).start(next: { joinCallResult in
+                guard let strongSelf = self, let screencastCallContext = strongSelf.screencastCallContext else {
+                    return
+                }
+                let clientParams = joinCallResult.jsonParams
+
+                screencastCallContext.setConnectionMode(.rtc, keepBroadcastConnectedIfWasEnabled: false)
+                screencastCallContext.setJoinResponse(payload: clientParams)
+            }, error: { error in
+                guard let _ = self else {
+                    return
+                }
+            }))
+        }))
+    }
+
+    public func disableScreencast() {
+        self.hasScreencast = false
+        if let screencastCallContext = self.screencastCallContext {
+            self.screencastCallContext = nil
+            screencastCallContext.stop()
+
+            let maybeCallInfo: GroupCallInfo? = self.internalState.callInfo
+
+            if let callInfo = maybeCallInfo {
+                self.screencastJoinDisposable.set(self.accountContext.engine.calls.leaveGroupCallAsScreencast(
+                    callId: callInfo.id,
+                    accessHash: callInfo.accessHash
+                ).start())
+            }
+            
+            self.screencastBufferServerContext?.stopScreencast()
         }
     }
     
     public func setVolume(peerId: PeerId, volume: Int32, sync: Bool) {
-        for (ssrc, id) in self.ssrcMapping {
-            if id == peerId {
-                self.callContext?.setVolume(ssrc: ssrc, volume: Double(volume) / 10000.0)
-                if sync {
-                    self.participantsContext?.updateMuteState(peerId: peerId, muteState: nil, volume: volume, raiseHand: nil)
-                }
-                break
+        var found = false
+        for (ssrc, mapping) in self.ssrcMapping {
+            if mapping.peerId == peerId {
+                self.genericCallContext?.setVolume(ssrc: ssrc, volume: Double(volume) / 10000.0)
+                found = true
             }
         }
+        if found && sync {
+            self.participantsContext?.updateMuteState(peerId: peerId, muteState: nil, volume: volume, raiseHand: nil)
+        }
     }
     
-    public func setFullSizeVideo(peerId: PeerId?) {
-        var resolvedSsrc: UInt32?
-        if let peerId = peerId {
-            for (ssrc, id) in self.ssrcMapping {
-                if id == peerId {
-                    resolvedSsrc = ssrc
-                    break
-                }
+    public func setRequestedVideoList(items: [PresentationGroupCallRequestedVideo]) {
+        self.genericCallContext?.setRequestedVideoChannels(items.compactMap { item -> OngoingGroupCallContext.VideoChannel in
+            let mappedMinQuality: OngoingGroupCallContext.VideoChannel.Quality
+            let mappedMaxQuality: OngoingGroupCallContext.VideoChannel.Quality
+            switch item.minQuality {
+            case .thumbnail:
+                mappedMinQuality = .thumbnail
+            case .medium:
+                mappedMinQuality = .medium
+            case .full:
+                mappedMinQuality = .full
             }
-        }
-        self.callContext?.setFullSizeVideoSsrc(ssrc: resolvedSsrc)
+            switch item.maxQuality {
+            case .thumbnail:
+                mappedMaxQuality = .thumbnail
+            case .medium:
+                mappedMaxQuality = .medium
+            case .full:
+                mappedMaxQuality = .full
+            }
+            return OngoingGroupCallContext.VideoChannel(
+                audioSsrc: item.audioSsrc,
+                endpointId: item.endpointId,
+                ssrcGroups: item.ssrcGroups.map { group in
+                    return OngoingGroupCallContext.VideoChannel.SsrcGroup(semantics: group.semantics, ssrcs: group.ssrcs)
+                },
+                minQuality: mappedMinQuality,
+                maxQuality: mappedMaxQuality
+            )
+        })
     }
     
     public func setCurrentAudioOutput(_ output: AudioSessionOutput) {
@@ -2095,12 +2860,11 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     }
     
     private func requestCall(movingFromBroadcastToRtc: Bool) {
-        self.currentConnectionMode = .none
-        self.callContext?.setConnectionMode(.none, keepBroadcastConnectedIfWasEnabled: movingFromBroadcastToRtc)
-        
-        self.missingSsrcsDisposable.set(nil)
-        self.missingSsrcs.removeAll()
-        self.processedMissingSsrcs.removeAll()
+        if !self.didInitializeConnectionMode || self.currentConnectionMode != .none {
+            self.didInitializeConnectionMode = true
+            self.currentConnectionMode = .none
+            self.genericCallContext?.setConnectionMode(.none, keepBroadcastConnectedIfWasEnabled: movingFromBroadcastToRtc)
+        }
         
         self.internalState = .requesting
         self.internalStatePromise.set(.single(.requesting))
@@ -2111,10 +2875,18 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         }
         
         let account = self.account
-        
+        let context = self.accountContext
         let currentCall: Signal<GroupCallInfo?, CallError>
         if let initialCall = self.initialCall {
-            currentCall = getCurrentGroupCall(account: account, callId: initialCall.id, accessHash: initialCall.accessHash)
+            currentCall = context.engine.calls.getCurrentGroupCall(callId: initialCall.id, accessHash: initialCall.accessHash)
+            |> mapError { _ -> CallError in
+                return .generic
+            }
+            |> map { summary -> GroupCallInfo? in
+                return summary?.info
+            }
+        } else if case let .active(callInfo) = self.internalState {
+            currentCall = context.engine.calls.getCurrentGroupCall(callId: callInfo.id, accessHash: callInfo.accessHash)
             |> mapError { _ -> CallError in
                 return .generic
             }
@@ -2153,7 +2925,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             }
             
             if let value = value {
-                strongSelf.initialCall = CachedChannelData.ActiveCall(id: value.id, accessHash: value.accessHash, title: value.title)
+                strongSelf.initialCall = CachedChannelData.ActiveCall(id: value.id, accessHash: value.accessHash, title: value.title, scheduleTimestamp: nil, subscribedToScheduled: false)
                 
                 strongSelf.updateSessionState(internalState: .active(value), audioSessionControl: strongSelf.audioSessionControl)
             } else {
@@ -2163,7 +2935,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
     }
     
     public func invitePeer(_ peerId: PeerId) -> Bool {
-        guard case let .established(callInfo, _, _, _, _) = self.internalState, !self.invitedPeersValue.contains(peerId) else {
+        guard let callInfo = self.internalState.callInfo, !self.invitedPeersValue.contains(peerId) else {
             return false
         }
 
@@ -2171,7 +2943,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         updatedInvitedPeers.insert(peerId, at: 0)
         self.invitedPeersValue = updatedInvitedPeers
         
-        let _ = inviteToGroupCall(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, peerId: peerId).start()
+        let _ = self.accountContext.engine.calls.inviteToGroupCall(callId: callInfo.id, accessHash: callInfo.accessHash, peerId: peerId).start()
         
         return true
     }
@@ -2182,15 +2954,17 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.invitedPeersValue = updatedInvitedPeers
     }
     
-    public func updateTitle(_ title: String){
-        guard case let .established(callInfo, _, _, _, _) = self.internalState else {
+    public func updateTitle(_ title: String) {
+        guard let callInfo = self.internalState.callInfo else {
             return
         }
-        
-        let _ = editGroupCallTitle(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash, title: title).start()
+        self.stateValue.title = title.isEmpty ? nil : title
+        let _ = self.accountContext.engine.calls.editGroupCallTitle(callId: callInfo.id, accessHash: callInfo.accessHash, title: title).start()
     }
     
     public var inviteLinks: Signal<GroupCallInviteLinks?, NoError> {
+        let engine = self.accountContext.engine
+
         return self.state
         |> map { state -> PeerId in
             return state.myPeerId
@@ -2207,7 +2981,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
             }
             |> mapToSignal { state in
                 if let callInfo =  state.callInfo {
-                    return groupCallInviteLinks(account: self.account, callId: callInfo.id, accessHash: callInfo.accessHash)
+                    return engine.calls.groupCallInviteLinks(callId: callInfo.id, accessHash: callInfo.accessHash)
                 } else {
                     return .complete()
                 }
@@ -2269,22 +3043,28 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
         self.participantsContext?.updateDefaultParticipantsAreMuted(isMuted: isMuted)
     }
     
-    public func makeIncomingVideoView(source: UInt32, completion: @escaping (PresentationCallVideoView?) -> Void) {
-        self.callContext?.makeIncomingVideoView(source: source, completion: { view in
-            if let view = view {
-                let setOnFirstFrameReceived = view.setOnFirstFrameReceived
-                let setOnOrientationUpdated = view.setOnOrientationUpdated
-                let setOnIsMirroredUpdated = view.setOnIsMirroredUpdated
-                completion(PresentationCallVideoView(
-                    holder: view,
-                    view: view.view,
+    public func makeIncomingVideoView(endpointId: String, requestClone: Bool, completion: @escaping (PresentationCallVideoView?, PresentationCallVideoView?) -> Void) {
+        if endpointId == self.currentLocalEndpointId {
+            self.makeOutgoingVideoView(requestClone: requestClone, completion: completion)
+            return
+        }
+
+        self.genericCallContext?.makeIncomingVideoView(endpointId: endpointId, requestClone: requestClone, completion: { mainView, cloneView in
+            if let mainView = mainView {
+                let setOnFirstFrameReceived = mainView.setOnFirstFrameReceived
+                let setOnOrientationUpdated = mainView.setOnOrientationUpdated
+                let setOnIsMirroredUpdated = mainView.setOnIsMirroredUpdated
+                let updateIsEnabled = mainView.updateIsEnabled
+                let mainVideoView = PresentationCallVideoView(
+                    holder: mainView,
+                    view: mainView.view,
                     setOnFirstFrameReceived: { f in
                         setOnFirstFrameReceived(f)
                     },
-                    getOrientation: { [weak view] in
-                        if let view = view {
+                    getOrientation: { [weak mainView] in
+                        if let mainView = mainView {
                             let mappedValue: PresentationCallVideoView.Orientation
-                            switch view.getOrientation() {
+                            switch mainView.getOrientation() {
                             case .rotation0:
                                 mappedValue = .rotation0
                             case .rotation90:
@@ -2299,9 +3079,9 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                             return .rotation0
                         }
                     },
-                    getAspect: { [weak view] in
-                        if let view = view {
-                            return view.getAspect()
+                    getAspect: { [weak mainView] in
+                        if let mainView = mainView {
+                            return mainView.getAspect()
                         } else {
                             return 0.0
                         }
@@ -2326,13 +3106,86 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
                         setOnIsMirroredUpdated { value in
                             f?(value)
                         }
+                    },
+                    updateIsEnabled: { value in
+                        updateIsEnabled(value)
                     }
-                ))
+                )
+
+                var cloneVideoView: PresentationCallVideoView?
+                if let cloneView = cloneView {
+                    let setOnFirstFrameReceived = cloneView.setOnFirstFrameReceived
+                    let setOnOrientationUpdated = cloneView.setOnOrientationUpdated
+                    let setOnIsMirroredUpdated = cloneView.setOnIsMirroredUpdated
+                    let updateIsEnabled = cloneView.updateIsEnabled
+                    cloneVideoView = PresentationCallVideoView(
+                        holder: cloneView,
+                        view: cloneView.view,
+                        setOnFirstFrameReceived: { f in
+                            setOnFirstFrameReceived(f)
+                        },
+                        getOrientation: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                let mappedValue: PresentationCallVideoView.Orientation
+                                switch cloneView.getOrientation() {
+                                case .rotation0:
+                                    mappedValue = .rotation0
+                                case .rotation90:
+                                    mappedValue = .rotation90
+                                case .rotation180:
+                                    mappedValue = .rotation180
+                                case .rotation270:
+                                    mappedValue = .rotation270
+                                }
+                                return mappedValue
+                            } else {
+                                return .rotation0
+                            }
+                        },
+                        getAspect: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                return cloneView.getAspect()
+                            } else {
+                                return 0.0
+                            }
+                        },
+                        setOnOrientationUpdated: { f in
+                            setOnOrientationUpdated { value, aspect in
+                                let mappedValue: PresentationCallVideoView.Orientation
+                                switch value {
+                                case .rotation0:
+                                    mappedValue = .rotation0
+                                case .rotation90:
+                                    mappedValue = .rotation90
+                                case .rotation180:
+                                    mappedValue = .rotation180
+                                case .rotation270:
+                                    mappedValue = .rotation270
+                                }
+                                f?(mappedValue, aspect)
+                            }
+                        },
+                        setOnIsMirroredUpdated: { f in
+                            setOnIsMirroredUpdated { value in
+                                f?(value)
+                            }
+                        },
+                        updateIsEnabled: { value in
+                            updateIsEnabled(value)
+                        }
+                    )
+                }
+
+                completion(mainVideoView, cloneVideoView)
             } else {
-                completion(nil)
+                completion(nil, nil)
             }
         })
     }
+
+    func video(endpointId: String) -> Signal<OngoingGroupCallContext.VideoFrameData, NoError>? {
+        return self.genericCallContext?.video(endpointId: endpointId)
+    }
     
     public func loadMoreMembers(token: String) {
         self.participantsContext?.loadMore(token: token)
diff --git a/submodules/TelegramCallsUI/Sources/SampleBufferVideoRenderingView.swift b/submodules/TelegramCallsUI/Sources/SampleBufferVideoRenderingView.swift
new file mode 100644
index 0000000000..a6dd976c83
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/SampleBufferVideoRenderingView.swift
@@ -0,0 +1,144 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import AccountContext
+import TelegramVoip
+import AVFoundation
+
+private func sampleBufferFromPixelBuffer(pixelBuffer: CVPixelBuffer) -> CMSampleBuffer? {
+    var maybeFormat: CMVideoFormatDescription?
+    let status = CMVideoFormatDescriptionCreateForImageBuffer(allocator: kCFAllocatorDefault, imageBuffer: pixelBuffer, formatDescriptionOut: &maybeFormat)
+    if status != noErr {
+        return nil
+    }
+    guard let format = maybeFormat else {
+        return nil
+    }
+
+    var timingInfo = CMSampleTimingInfo(
+        duration: CMTimeMake(value: 1, timescale: 30),
+        presentationTimeStamp: CMTimeMake(value: 0, timescale: 30),
+        decodeTimeStamp: CMTimeMake(value: 0, timescale: 30)
+    )
+
+    var maybeSampleBuffer: CMSampleBuffer?
+    let bufferStatus = CMSampleBufferCreateReadyWithImageBuffer(allocator: kCFAllocatorDefault, imageBuffer: pixelBuffer, formatDescription: format, sampleTiming: &timingInfo, sampleBufferOut: &maybeSampleBuffer)
+
+    if (bufferStatus != noErr) {
+        return nil
+    }
+    guard let sampleBuffer = maybeSampleBuffer else {
+        return nil
+    }
+
+    let attachments: NSArray = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, createIfNecessary: true)! as NSArray
+    let dict: NSMutableDictionary = attachments[0] as! NSMutableDictionary
+    dict[kCMSampleAttachmentKey_DisplayImmediately as NSString] = true as NSNumber
+
+    return sampleBuffer
+}
+
+final class SampleBufferVideoRenderingView: UIView, VideoRenderingView {
+    static override var layerClass: AnyClass {
+        return AVSampleBufferDisplayLayer.self
+    }
+
+    private var sampleBufferLayer: AVSampleBufferDisplayLayer {
+        return self.layer as! AVSampleBufferDisplayLayer
+    }
+
+    private var isEnabled: Bool = false
+
+    private var onFirstFrameReceived: ((Float) -> Void)?
+    private var onOrientationUpdated: ((PresentationCallVideoView.Orientation, CGFloat) -> Void)?
+    private var onIsMirroredUpdated: ((Bool) -> Void)?
+
+    private var didReportFirstFrame: Bool = false
+    private var currentOrientation: PresentationCallVideoView.Orientation = .rotation0
+    private var currentAspect: CGFloat = 1.0
+
+    private var disposable: Disposable?
+
+    init(input: Signal<OngoingGroupCallContext.VideoFrameData, NoError>) {
+        super.init(frame: CGRect())
+
+        self.disposable = input.start(next: { [weak self] videoFrameData in
+            Queue.mainQueue().async {
+                self?.addFrame(videoFrameData)
+            }
+        })
+
+        self.sampleBufferLayer.videoGravity = .resize
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+        self.disposable?.dispose()
+    }
+
+    private func addFrame(_ videoFrameData: OngoingGroupCallContext.VideoFrameData) {
+        let aspect = CGFloat(videoFrameData.width) / CGFloat(videoFrameData.height)
+        var isAspectUpdated = false
+        if self.currentAspect != aspect {
+            self.currentAspect = aspect
+            isAspectUpdated = true
+        }
+
+        let videoFrameOrientation = PresentationCallVideoView.Orientation(videoFrameData.orientation)
+        var isOrientationUpdated = false
+        if self.currentOrientation != videoFrameOrientation {
+            self.currentOrientation = videoFrameOrientation
+            isOrientationUpdated = true
+        }
+
+        if isAspectUpdated || isOrientationUpdated {
+            self.onOrientationUpdated?(self.currentOrientation, self.currentAspect)
+        }
+
+        if !self.didReportFirstFrame {
+            self.didReportFirstFrame = true
+            self.onFirstFrameReceived?(Float(self.currentAspect))
+        }
+
+        if self.isEnabled {
+            switch videoFrameData.buffer {
+            case let .native(buffer):
+                if let sampleBuffer = sampleBufferFromPixelBuffer(pixelBuffer: buffer.pixelBuffer) {
+                    self.sampleBufferLayer.enqueue(sampleBuffer)
+                }
+            default:
+                break
+            }
+        }
+    }
+
+    func setOnFirstFrameReceived(_ f: @escaping (Float) -> Void) {
+        self.onFirstFrameReceived = f
+        self.didReportFirstFrame = false
+    }
+
+    func setOnOrientationUpdated(_ f: @escaping (PresentationCallVideoView.Orientation, CGFloat) -> Void) {
+        self.onOrientationUpdated = f
+    }
+
+    func getOrientation() -> PresentationCallVideoView.Orientation {
+        return self.currentOrientation
+    }
+
+    func getAspect() -> CGFloat {
+        return self.currentAspect
+    }
+
+    func setOnIsMirroredUpdated(_ f: @escaping (Bool) -> Void) {
+        self.onIsMirroredUpdated = f
+    }
+
+    func updateIsEnabled(_ isEnabled: Bool) {
+        self.isEnabled = isEnabled
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VideoRenderingContext.swift b/submodules/TelegramCallsUI/Sources/VideoRenderingContext.swift
new file mode 100644
index 0000000000..e9bb3e13cd
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VideoRenderingContext.swift
@@ -0,0 +1,71 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import AccountContext
+import TelegramVoip
+import AVFoundation
+
+protocol VideoRenderingView: UIView {
+    func setOnFirstFrameReceived(_ f: @escaping (Float) -> Void)
+    func setOnOrientationUpdated(_ f: @escaping (PresentationCallVideoView.Orientation, CGFloat) -> Void)
+    func getOrientation() -> PresentationCallVideoView.Orientation
+    func getAspect() -> CGFloat
+    func setOnIsMirroredUpdated(_ f: @escaping (Bool) -> Void)
+    func updateIsEnabled(_ isEnabled: Bool)
+}
+
+class VideoRenderingContext {
+    private var metalContextImpl: Any?
+
+    #if targetEnvironment(simulator)
+    #else
+    @available(iOS 13.0, *)
+    var metalContext: MetalVideoRenderingContext {
+        if let value = self.metalContextImpl as? MetalVideoRenderingContext {
+            return value
+        } else {
+            let value = MetalVideoRenderingContext()!
+            self.metalContextImpl = value
+            return value
+        }
+    }
+    #endif
+
+    func makeView(input: Signal<OngoingGroupCallContext.VideoFrameData, NoError>, blur: Bool) -> VideoRenderingView? {
+        #if targetEnvironment(simulator)
+        return SampleBufferVideoRenderingView(input: input)
+        #else
+        if #available(iOS 13.0, *) {
+            return MetalVideoRenderingView(renderingContext: self.metalContext, input: input, blur: blur)
+        } else {
+            return SampleBufferVideoRenderingView(input: input)
+        }
+        #endif
+    }
+
+    func updateVisibility(isVisible: Bool) {
+        #if targetEnvironment(simulator)
+        #else
+        if #available(iOS 13.0, *) {
+            self.metalContext.updateVisibility(isVisible: isVisible)
+        }
+        #endif
+    }
+}
+
+extension PresentationCallVideoView.Orientation {
+    init(_ orientation: OngoingCallVideoOrientation) {
+        switch orientation {
+        case .rotation0:
+            self = .rotation0
+        case .rotation90:
+            self = .rotation90
+        case .rotation180:
+            self = .rotation180
+        case .rotation270:
+            self = .rotation270
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift b/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
index d53f1fd35b..2b6b756bbf 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
@@ -3,7 +3,6 @@ import UIKit
 import AsyncDisplayKit
 import Display
 import SwiftSignalKit
-import LegacyComponents
 import AnimationUI
 import AppBundle
 import ManagedAnimationNode
@@ -14,8 +13,8 @@ private let subtitleFont = Font.regular(13.0)
 private let white = UIColor(rgb: 0xffffff)
 private let greyColor = UIColor(rgb: 0x2c2c2e)
 private let secondaryGreyColor = UIColor(rgb: 0x1c1c1e)
-private let blue = UIColor(rgb: 0x0078ff)
-private let lightBlue = UIColor(rgb: 0x59c7f8)
+private let blue = UIColor(rgb: 0x007fff)
+private let lightBlue = UIColor(rgb: 0x00affe)
 private let green = UIColor(rgb: 0x33c659)
 private let activeBlue = UIColor(rgb: 0x00a0b9)
 private let purple = UIColor(rgb: 0x3252ef)
@@ -24,6 +23,11 @@ private let pink = UIColor(rgb: 0xef436c)
 private let areaSize = CGSize(width: 300.0, height: 300.0)
 private let blobSize = CGSize(width: 190.0, height: 190.0)
 
+private let smallScale: CGFloat = 0.48
+private let smallIconScale: CGFloat = 0.69
+
+private let buttonHeight: CGFloat = 52.0
+
 final class VoiceChatActionButton: HighlightTrackingButtonNode {
     enum State: Equatable {
         enum ActiveState: Equatable {
@@ -31,7 +35,15 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
             case muted
             case on
         }
+        
+        enum ScheduledState: Equatable {
+            case start
+            case subscribe
+            case unsubscribe
+        }
 
+        case button(text: String)
+        case scheduled(state: ScheduledState)
         case connecting
         case active(state: ActiveState)
     }
@@ -48,15 +60,17 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
     private let containerNode: ASDisplayNode
     private let backgroundNode: VoiceChatActionButtonBackgroundNode
     private let iconNode: VoiceChatActionButtonIconNode
-    private let titleLabel: ImmediateTextNode
+    private let labelContainerNode: ASDisplayNode
+    let titleLabel: ImmediateTextNode
     private let subtitleLabel: ImmediateTextNode
+    private let buttonTitleLabel: ImmediateTextNode
     
     private var currentParams: (size: CGSize, buttonSize: CGSize, state: VoiceChatActionButton.State, dark: Bool, small: Bool, title: String, subtitle: String, snap: Bool)?
     
     private var activePromise = ValuePromise<Bool>(false)
-    private var outerColorPromise = ValuePromise<UIColor?>(nil)
-    var outerColor: Signal<UIColor?, NoError> {
-        return outerColorPromise.get()
+    private var outerColorPromise = Promise<(UIColor?, UIColor?)>((nil, nil))
+    var outerColor: Signal<(UIColor?, UIColor?), NoError> {
+        return self.outerColorPromise.get()
     }
     
     var connectingColor: UIColor = UIColor(rgb: 0xb6b6bb) {
@@ -80,13 +94,18 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
     var wasActiveWhenPressed = false
     var pressing: Bool = false {
         didSet {
-            guard let (_, _, state, _, _, _, _, snap) = self.currentParams, !self.isDisabled else {
+            guard let (_, _, state, _, small, _, _, snap) = self.currentParams, !self.isDisabled else {
                 return
             }
             if self.pressing {
                 let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
-                transition.updateTransformScale(node: self.iconNode, scale: snap ? 0.5 : 0.9)
-            
+                if small {
+                    transition.updateTransformScale(node: self.backgroundNode, scale: smallScale * 0.9)
+                    transition.updateTransformScale(node: self.iconNode, scale: smallIconScale * 0.9)
+                } else {
+                    transition.updateTransformScale(node: self.iconNode, scale: snap ? 0.5 : 0.9)
+                }
+                
                 switch state {
                     case let .active(state):
                         switch state {
@@ -95,12 +114,17 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
                             default:
                                 break
                         }
-                    case .connecting:
+                    case .connecting, .button, .scheduled:
                         break
                 }
             } else {
                 let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
-                transition.updateTransformScale(node: self.iconNode, scale: snap ? 0.5 : 1.0)
+                if small {
+                    transition.updateTransformScale(node: self.backgroundNode, scale: smallScale)
+                    transition.updateTransformScale(node: self.iconNode, scale: smallIconScale)
+                } else {
+                    transition.updateTransformScale(node: self.iconNode, scale: snap ? 0.5 : 1.0)
+                }
                 self.wasActiveWhenPressed = false
             }
         }
@@ -108,34 +132,63 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
         
     init() {
         self.bottomNode = ASDisplayNode()
+        self.bottomNode.isUserInteractionEnabled = false
         self.containerNode = ASDisplayNode()
+        self.containerNode.isUserInteractionEnabled = false
         self.backgroundNode = VoiceChatActionButtonBackgroundNode()
         self.iconNode = VoiceChatActionButtonIconNode(isColored: false)
         
+        self.labelContainerNode = ASDisplayNode()
         self.titleLabel = ImmediateTextNode()
         self.subtitleLabel = ImmediateTextNode()
+        self.buttonTitleLabel = ImmediateTextNode()
+        self.buttonTitleLabel.isUserInteractionEnabled = false
+        self.buttonTitleLabel.alpha = 0.0
         
         super.init()
     
         self.addSubnode(self.bottomNode)
-        self.addSubnode(self.titleLabel)
-        self.addSubnode(self.subtitleLabel)
-
+        self.labelContainerNode.addSubnode(self.titleLabel)
+        self.labelContainerNode.addSubnode(self.subtitleLabel)
+        self.addSubnode(self.labelContainerNode)
+        
         self.addSubnode(self.containerNode)
         self.containerNode.addSubnode(self.backgroundNode)
         self.containerNode.addSubnode(self.iconNode)
         
+        self.containerNode.addSubnode(self.buttonTitleLabel)
+        
         self.highligthedChanged = { [weak self] pressing in
             if let strongSelf = self {
-                guard let (_, _, _, _, _, _, _, snap) = strongSelf.currentParams else {
+                guard let (_, _, state, _, small, _, _, snap) = strongSelf.currentParams else {
                     return
                 }
                 if pressing {
-                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
-                    transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 0.9)
+                    if case .button = state {
+                        strongSelf.containerNode.layer.removeAnimation(forKey: "opacity")
+                        strongSelf.containerNode.alpha = 0.4
+                    } else {
+                        let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
+                        if small {
+                            transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale * 0.9)
+                            transition.updateTransformScale(node: strongSelf.iconNode, scale: smallIconScale * 0.9)
+                        } else {
+                            transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 0.9)
+                        }
+                    }
                 } else if !strongSelf.pressing {
-                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
-                    transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 1.0)
+                    if case .button = state {
+                        strongSelf.containerNode.alpha = 1.0
+                        strongSelf.containerNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    } else {
+                        let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
+                        if small {
+                            transition.updateTransformScale(node: strongSelf.backgroundNode, scale: smallScale)
+                            transition.updateTransformScale(node: strongSelf.iconNode, scale: smallIconScale)
+                        } else {
+                            transition.updateTransformScale(node: strongSelf.iconNode, scale: snap ? 0.5 : 1.0)
+                        }
+                    }
                 }
             }
         }
@@ -144,8 +197,8 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
             self?.activePromise.set(active)
         }
         
-        self.backgroundNode.updatedOuterColor = { [weak self] color in
-            self?.outerColorPromise.set(color)
+        self.backgroundNode.updatedColors = { [weak self] outerColor, activeColor in
+            self?.outerColorPromise.set(.single((outerColor, activeColor)))
         }
     }
     
@@ -153,7 +206,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
         self.activeDisposable.dispose()
     }
     
-    func updateLevel(_ level: CGFloat) {
+    func updateLevel(_ level: CGFloat, immediately: Bool = false) {
         self.backgroundNode.audioLevel = level
     }
     
@@ -191,9 +244,16 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
         let subtitleSize = self.subtitleLabel.updateLayout(CGSize(width: size.width, height: .greatestFiniteMagnitude))
         let totalHeight = titleSize.height + subtitleSize.height + 1.0
 
-        self.titleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor(size.height - totalHeight / 2.0) - 70.0), size: titleSize)
-        self.subtitleLabel.frame = CGRect(origin: CGPoint(x: floor((size.width - subtitleSize.width) / 2.0), y: self.titleLabel.frame.maxY + 1.0), size: subtitleSize)
-
+        self.labelContainerNode.frame = CGRect(origin: CGPoint(), size: size)
+        
+        let titleLabelFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - totalHeight) / 2.0) + 84.0), size: titleSize)
+        let subtitleLabelFrame = CGRect(origin: CGPoint(x: floor((size.width - subtitleSize.width) / 2.0), y: titleLabelFrame.maxY + 1.0), size: subtitleSize)
+    
+        self.titleLabel.bounds = CGRect(origin: CGPoint(), size: titleLabelFrame.size)
+        self.titleLabel.position = titleLabelFrame.center
+        self.subtitleLabel.bounds = CGRect(origin: CGPoint(), size: subtitleLabelFrame.size)
+        self.subtitleLabel.position = subtitleLabelFrame.center
+        
         self.bottomNode.frame = CGRect(origin: CGPoint(), size: size)
         self.containerNode.frame = CGRect(origin: CGPoint(), size: size)
         
@@ -209,7 +269,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
                     default:
                         break
                 }
-            case .connecting:
+            case .connecting, .button, .scheduled:
                 break
         }
         
@@ -221,11 +281,24 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
             transition.updateAlpha(node: self.subtitleLabel, alpha: 0.0)
             transition.updateAlpha(layer: self.backgroundNode.maskProgressLayer, alpha: 0.0)
         } else {
-            let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
-            transition.updateTransformScale(node: self.backgroundNode, scale: small ? 0.85 : 1.0, delay: 0.05)
-            transition.updateTransformScale(node: self.iconNode, scale: self.pressing ? 0.9 : 1.0, delay: 0.05)
-            transition.updateAlpha(node: self.titleLabel, alpha: 1.0, delay: 0.05)
-            transition.updateAlpha(node: self.subtitleLabel, alpha: 1.0, delay: 0.05)
+            let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.4, curve: .spring) : .immediate
+            if small {
+                transition.updateTransformScale(node: self.backgroundNode, scale: self.pressing ? smallScale * 0.9 : smallScale, delay: 0.0)
+                transition.updateTransformScale(node: self.iconNode, scale: self.pressing ? smallIconScale * 0.9 : smallIconScale, delay: 0.0)
+                transition.updateAlpha(node: self.titleLabel, alpha: 0.0)
+                transition.updateAlpha(node: self.subtitleLabel, alpha: 0.0)
+                transition.updateSublayerTransformOffset(layer: self.labelContainerNode.layer, offset: CGPoint(x: 0.0, y: -43.0))
+                transition.updateTransformScale(node: self.titleLabel, scale: 0.8)
+                transition.updateTransformScale(node: self.subtitleLabel, scale: 0.8)
+            } else {
+                transition.updateTransformScale(node: self.backgroundNode, scale: 1.0, delay: 0.0)
+                transition.updateTransformScale(node: self.iconNode, scale: self.pressing ? 0.9 : 1.0, delay: 0.0)
+                transition.updateAlpha(node: self.titleLabel, alpha: 1.0, delay: 0.05)
+                transition.updateAlpha(node: self.subtitleLabel, alpha: 1.0, delay: 0.05)
+                transition.updateSublayerTransformOffset(layer: self.labelContainerNode.layer, offset: CGPoint())
+                transition.updateTransformScale(node: self.titleLabel, scale: 1.0)
+                transition.updateTransformScale(node: self.subtitleLabel, scale: 1.0)
+            }
             transition.updateAlpha(layer: self.backgroundNode.maskProgressLayer, alpha: 1.0)
         }
         
@@ -236,12 +309,23 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
     
     private var previousIcon: VoiceChatActionButtonIconAnimationState?
     private func applyIconParams() {
-        guard let (_, _, state, _, _, _, _, snap) = self.currentParams else {
+        guard let (_, _, state, _, _, _, _, _) = self.currentParams else {
             return
         }
         
         let icon: VoiceChatActionButtonIconAnimationState
         switch state {
+            case .button:
+                icon = .empty
+            case let .scheduled(state):
+                switch state {
+                    case .start:
+                        icon = .start
+                    case .subscribe:
+                        icon = .subscribe
+                    case .unsubscribe:
+                        icon = .unsubscribe
+                }
             case let .active(state):
                 switch state {
                     case .on:
@@ -261,7 +345,6 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
         self.previousIcon = icon
         
         self.iconNode.enqueueState(icon)
-//        self.iconNode.update(state: VoiceChatMicrophoneNode.State(muted: iconMuted, filled: true, color: iconColor), animated: true)
     }
     
     func update(snap: Bool, animated: Bool) {
@@ -269,7 +352,7 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
             self.currentParams = (previous.size, previous.buttonSize, previous.state, previous.dark, previous.small, previous.title, previous.subtitle, snap)
             
             self.backgroundNode.isSnap = snap
-            self.backgroundNode.glowHidden = snap
+            self.backgroundNode.glowHidden = snap || previous.small
             self.backgroundNode.updateColors()
             self.applyParams(animated: animated)
             self.applyIconParams()
@@ -283,8 +366,30 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
 
         self.statePromise.set(state)
         
+        if let previousState = previousState, case .button = previousState, case .scheduled = state {
+            self.buttonTitleLabel.alpha = 0.0
+            self.buttonTitleLabel.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            self.buttonTitleLabel.layer.animateScale(from: 1.0, to: 0.001, duration: 0.24)
+            
+            self.iconNode.alpha = 1.0
+            self.iconNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.iconNode.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.42, damping: 104.0)
+        }
+        
         var backgroundState: VoiceChatActionButtonBackgroundNode.State
+        var animated = true
         switch state {
+            case let .button(text):
+                backgroundState = .button
+                self.buttonTitleLabel.alpha = 1.0
+                self.buttonTitleLabel.attributedText = NSAttributedString(string: text, font: Font.semibold(17.0), textColor: .white)
+                let titleSize = self.buttonTitleLabel.updateLayout(CGSize(width: size.width, height: 100.0))
+                self.buttonTitleLabel.frame = CGRect(origin: CGPoint(x: floor((self.bounds.width - titleSize.width) / 2.0), y: floor((self.bounds.height - titleSize.height) / 2.0)), size: titleSize)
+            case .scheduled:
+                backgroundState = .disabled
+                if previousState == .connecting {
+                    animated = false
+                }
             case let .active(state):
                 switch state {
                     case .on:
@@ -299,8 +404,9 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
         }
         self.applyIconParams()
         
+        self.backgroundNode.glowHidden = (self.currentParams?.snap ?? false) || small
         self.backgroundNode.isDark = dark
-        self.backgroundNode.update(state: backgroundState, animated: true)
+        self.backgroundNode.update(state: backgroundState, animated: animated)
         
         if case .active = state, let previousState = previousState, case .connecting = previousState, animated {
             self.activeDisposable.set((self.activePromise.get()
@@ -311,14 +417,18 @@ final class VoiceChatActionButton: HighlightTrackingButtonNode {
                 }
             }))
         } else {
-            applyParams(animated: animated)
+            self.applyParams(animated: animated)
         }
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
         var hitRect = self.bounds
-        if let (_, buttonSize, _, _, _, _, _, _) = self.currentParams {
-            hitRect = self.bounds.insetBy(dx: (self.bounds.width - buttonSize.width) / 2.0, dy: (self.bounds.height - buttonSize.height) / 2.0)
+        if let (_, buttonSize, state, _, _, _, _, _) = self.currentParams {
+            if case .button = state {
+                hitRect = CGRect(x: 0.0, y: floor((self.bounds.height - buttonHeight) / 2.0), width: self.bounds.width, height: buttonHeight)
+            } else {
+                hitRect = self.bounds.insetBy(dx: (self.bounds.width - buttonSize.width) / 2.0, dy: (self.bounds.height - buttonSize.height) / 2.0)
+            }
         }
         let result = super.hitTest(point, with: event)
         if !hitRect.contains(point) {
@@ -424,6 +534,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
     enum State: Equatable {
         case connecting
         case disabled
+        case button
         case blob(Bool)
     }
     
@@ -434,12 +545,14 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
     
     var audioLevel: CGFloat = 0.0  {
         didSet {
-            self.maskBlobView.updateLevel(audioLevel)
+            self.maskBlobView.updateLevel(self.audioLevel, immediately: false)
         }
     }
     
+    
+    
     var updatedActive: ((Bool) -> Void)?
-    var updatedOuterColor: ((UIColor?) -> Void)?
+    var updatedColors: ((UIColor?, UIColor?) -> Void)?
     
     private let backgroundCircleLayer = CAShapeLayer()
     private let foregroundCircleLayer = CAShapeLayer()
@@ -495,7 +608,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         
         self.foregroundGradientLayer.type = .radial
         self.foregroundGradientLayer.colors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
-        self.foregroundGradientLayer.locations = [0.0, 0.85, 1.0]
+        self.foregroundGradientLayer.locations = [0.0, 0.55, 1.0]
         self.foregroundGradientLayer.startPoint = CGPoint(x: 1.0, y: 0.0)
         self.foregroundGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0)
         
@@ -517,9 +630,11 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         self.maskProgressLayer.lineCap = .round
         self.maskProgressLayer.path = path
         
-        let largerCirclePath = UIBezierPath(ovalIn: CGRect(origin: CGPoint(), size: CGSize(width: buttonSize.width + progressLineWidth, height: buttonSize.height + progressLineWidth))).cgPath
-        self.maskCircleLayer.fillColor = white.cgColor
+        let circleFrame = CGRect(origin: CGPoint(x: (areaSize.width - buttonSize.width) / 2.0, y: (areaSize.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0)
+        let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath
+        
         self.maskCircleLayer.path = largerCirclePath
+        self.maskCircleLayer.fillColor = white.cgColor
         self.maskCircleLayer.isHidden = true
         
         updateInHierarchy = { [weak self] value in
@@ -560,11 +675,11 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
             let previousValue = self.foregroundGradientLayer.startPoint
             let newValue: CGPoint
             if self.maskBlobView.presentationAudioLevel > 0.22 {
-                newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.1 ..< 0.35))
+                newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.15 ..< 0.35))
             } else if self.maskBlobView.presentationAudioLevel > 0.01 {
-                newValue = CGPoint(x: CGFloat.random(in: 0.77 ..< 0.95), y: CGFloat.random(in: 0.1 ..< 0.35))
+                newValue = CGPoint(x: CGFloat.random(in: 0.57 ..< 0.85), y: CGFloat.random(in: 0.15 ..< 0.45))
             } else {
-                newValue = CGPoint(x: CGFloat.random(in: 0.65 ..< 0.85), y: CGFloat.random(in: 0.1 ..< 0.45))
+                newValue = CGPoint(x: CGFloat.random(in: 0.6 ..< 0.75), y: CGFloat.random(in: 0.25 ..< 0.45))
             }
             self.foregroundGradientLayer.startPoint = newValue
             
@@ -663,7 +778,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         case muted
     }
     
-    func updateGlowAndGradientAnimations(type: Gradient, previousType: Gradient? = nil) {
+    func updateGlowAndGradientAnimations(type: Gradient, previousType: Gradient? = nil, animated: Bool = true) {
         let effectivePreviousTyoe = previousType ?? .active
         
         let scale: CGFloat
@@ -677,37 +792,44 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         let initialColors = self.foregroundGradientLayer.colors
         
         let outerColor: UIColor?
+        let activeColor: UIColor?
         let targetColors: [CGColor]
         let targetScale: CGFloat
         switch type {
             case .speaking:
                 targetColors = [activeBlue.cgColor, green.cgColor, green.cgColor]
                 targetScale = 0.89
-                outerColor = UIColor(rgb: 0x21674f)
+                outerColor = UIColor(rgb: 0x134b22)
+                activeColor = green
             case .active:
                 targetColors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
                 targetScale = 0.85
-                outerColor = UIColor(rgb: 0x1d588d)
+                outerColor = UIColor(rgb: 0x002e5d)
+                activeColor = blue
             case .connecting:
                 targetColors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
                 targetScale = 0.3
                 outerColor = nil
+                activeColor = blue
             case .muted:
                 targetColors = [pink.cgColor, purple.cgColor, purple.cgColor]
                 targetScale = 0.85
-                outerColor = UIColor(rgb: 0x3b3474)
+                outerColor = UIColor(rgb: 0x24306b)
+                activeColor = purple
         }
-        self.updatedOuterColor?(outerColor)
+        self.updatedColors?(outerColor, activeColor)
         
         self.maskGradientLayer.transform = CATransform3DMakeScale(targetScale, targetScale, 1.0)
         if let _ = previousType {
             self.maskGradientLayer.animateScale(from: initialScale, to: targetScale, duration: 0.3)
-        } else {
+        } else if animated {
             self.maskGradientLayer.animateSpring(from: initialScale as NSNumber, to: targetScale as NSNumber, keyPath: "transform.scale", duration: 0.45)
         }
         
         self.foregroundGradientLayer.colors = targetColors
-        self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+        if animated {
+            self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+        }
     }
     
     private func playMuteAnimation() {
@@ -796,7 +918,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         self.maskBlobView.startAnimating()
         self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45)
     }
-    
+        
     private func playConnectionAnimation(type: Gradient, completion: @escaping () -> Void) {
         CATransaction.begin()
         let initialRotation: CGFloat = CGFloat((self.maskProgressLayer.value(forKeyPath: "presentationLayer.transform.rotation.z") as? NSNumber)?.floatValue ?? 0.0)
@@ -843,7 +965,8 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
                 
                 self.updateGlowAndGradientAnimations(type: type, previousType: nil)
                 
-                if case .blob = self.state {
+                if case .connecting = self.state {
+                } else {
                     self.maskBlobView.isHidden = false
                     self.maskBlobView.startAnimating()
                     self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45)
@@ -878,6 +1001,53 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         CATransaction.commit()
     }
     
+    private var maskIsCircle = true
+    private func setupButtonAnimation() {
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        self.backgroundCircleLayer.isHidden = true
+        self.foregroundCircleLayer.isHidden = true
+        self.maskCircleLayer.isHidden = false
+        self.maskProgressLayer.isHidden = true
+        self.maskGradientLayer.isHidden = true
+        
+        let path = UIBezierPath(roundedRect: CGRect(x: 0.0, y: floor((self.bounds.height - buttonHeight) / 2.0), width: self.bounds.width, height: buttonHeight), cornerRadius: 10.0).cgPath
+        self.maskCircleLayer.path = path
+        self.maskIsCircle = false
+        
+        CATransaction.commit()
+        
+        self.updateGlowAndGradientAnimations(type: .muted, previousType: nil)
+        
+        self.updatedActive?(true)
+    }
+    
+    private func playScheduledAnimation() {
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        self.maskGradientLayer.isHidden = false
+        CATransaction.commit()
+        
+        let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0)
+        let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath
+        
+        let previousPath = self.maskCircleLayer.path
+        self.maskCircleLayer.path = largerCirclePath
+        self.maskIsCircle = true
+        
+        self.maskCircleLayer.animateSpring(from: previousPath as AnyObject, to: largerCirclePath as AnyObject, keyPath: "path", duration: 0.6, initialVelocity: 0.0, damping: 100.0)
+        
+        self.maskBlobView.isHidden = false
+        self.maskBlobView.startAnimating()
+        self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0)
+        
+        self.disableGlowAnimations = true
+        self.maskGradientLayer.removeAllAnimations()
+        self.maskGradientLayer.animateSpring(from: 0.3 as NSNumber, to: 0.85 as NSNumber, keyPath: "transform.scale", duration: 0.45, completion: { [weak self] _ in
+            self?.disableGlowAnimations = false
+        })
+    }
+    
     var isActive = false
     func updateAnimations() {
         if !self.isCurrentlyInHierarchy {
@@ -930,7 +1100,9 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
                 self.isActive = false
                 
                 if let transition = self.transition {
-                    if case .connecting = transition {
+                    if case .button = transition {
+                        self.playScheduledAnimation()
+                    } else if case .connecting = transition {
                         self.playConnectionAnimation(type: .muted) { [weak self] in
                             self?.isActive = false
                         }
@@ -939,8 +1111,21 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
                         self.playMuteAnimation()
                     }
                     self.transition = nil
+                } else {
+                    if self.maskBlobView.isHidden {
+                        self.updateGlowAndGradientAnimations(type: .muted, previousType: nil, animated: false)
+                        self.maskCircleLayer.isHidden = false
+                        self.maskProgressLayer.isHidden = true
+                        self.maskGradientLayer.isHidden = false
+                        self.maskBlobView.isHidden = false
+                        self.maskBlobView.startAnimating()
+                        self.maskBlobView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.45)
+                    }
                 }
-                break
+            case .button:
+                self.updatedActive?(true)
+                self.isActive = false
+                self.setupButtonAnimation()
         }
     }
     
@@ -1005,23 +1190,41 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
         self.updateAnimations()
     }
     
+    var previousSize: CGSize?
     override func layout() {
         super.layout()
         
-        let center = CGPoint(x: self.bounds.width / 2.0, y: self.bounds.height / 2.0)
+        let sizeUpdated = self.previousSize != self.bounds.size
+        self.previousSize = self.bounds.size
         
-        let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize)
+        let bounds = CGRect(x: (self.bounds.width - areaSize.width) / 2.0, y: (self.bounds.height - areaSize.height) / 2.0, width: areaSize.width, height: areaSize.height)
+        let center = bounds.center
+        
+        self.maskBlobView.frame = CGRect(origin: CGPoint(x: bounds.minX + (bounds.width - blobSize.width) / 2.0, y: bounds.minY + (bounds.height - blobSize.height) / 2.0), size: blobSize)
+        
+        let circleFrame = CGRect(origin: CGPoint(x: bounds.minX + (bounds.width - buttonSize.width) / 2.0, y: bounds.minY + (bounds.height - buttonSize.height) / 2.0), size: buttonSize)
         self.backgroundCircleLayer.frame = circleFrame
         self.foregroundCircleLayer.position = center
         self.foregroundCircleLayer.bounds = CGRect(origin: CGPoint(), size: CGSize(width: circleFrame.width - progressLineWidth, height: circleFrame.height - progressLineWidth))
         self.growingForegroundCircleLayer.position = center
         self.growingForegroundCircleLayer.bounds = self.foregroundCircleLayer.bounds
-        self.maskCircleLayer.frame = circleFrame.insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0)
+        self.maskCircleLayer.frame = self.bounds
+
+        if sizeUpdated && self.maskIsCircle {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            let circleFrame = CGRect(origin: CGPoint(x: (self.bounds.width - buttonSize.width) / 2.0, y: (self.bounds.height - buttonSize.height) / 2.0), size: buttonSize).insetBy(dx: -progressLineWidth / 2.0, dy: -progressLineWidth / 2.0)
+            let largerCirclePath = UIBezierPath(roundedRect: CGRect(x: circleFrame.minX, y: circleFrame.minY, width: circleFrame.width, height: circleFrame.height), cornerRadius: circleFrame.width / 2.0).cgPath
+            
+            self.maskCircleLayer.path = largerCirclePath
+            CATransaction.commit()
+        }
+        
         self.maskProgressLayer.frame = circleFrame.insetBy(dx: -3.0, dy: -3.0)
         self.foregroundView.frame = self.bounds
         self.foregroundGradientLayer.frame = self.bounds
         self.maskGradientLayer.position = center
-        self.maskGradientLayer.bounds = self.bounds
+        self.maskGradientLayer.bounds = bounds
         self.maskView.frame = self.bounds
     }
 }
@@ -1094,17 +1297,20 @@ private final class VoiceBlobView: UIView {
     }
     
     public func setColor(_ color: UIColor) {
-        mediumBlob.setColor(color.withAlphaComponent(0.55))
-        bigBlob.setColor(color.withAlphaComponent(0.35))
+        mediumBlob.setColor(color.withAlphaComponent(0.5))
+        bigBlob.setColor(color.withAlphaComponent(0.21))
     }
     
-    public func updateLevel(_ level: CGFloat) {
+    public func updateLevel(_ level: CGFloat, immediately: Bool) {
         let normalizedLevel = min(1, max(level / maxLevel, 0))
         
         mediumBlob.updateSpeedLevel(to: normalizedLevel)
         bigBlob.updateSpeedLevel(to: normalizedLevel)
         
         audioLevel = normalizedLevel
+        if immediately {
+            presentationAudioLevel = normalizedLevel
+        }
     }
     
     public func startAnimating() {
@@ -1168,12 +1374,14 @@ final class BlobView: UIView {
     
     var level: CGFloat = 0 {
         didSet {
-            CATransaction.begin()
-            CATransaction.setDisableActions(true)
-            let lv = minScale + (maxScale - minScale) * level
-            shapeLayer.transform = CATransform3DMakeScale(lv, lv, 1)
-            self.scaleUpdated?(level)
-            CATransaction.commit()
+            if abs(self.level - oldValue) > 0.01 {
+                CATransaction.begin()
+                CATransaction.setDisableActions(true)
+                let lv = self.minScale + (self.maxScale - self.minScale) * self.level
+                self.shapeLayer.transform = CATransform3DMakeScale(lv, lv, 1)
+                self.scaleUpdated?(self.level)
+                CATransaction.commit()
+            }
         }
     }
     
@@ -1185,30 +1393,7 @@ final class BlobView: UIView {
         layer.strokeColor = nil
         return layer
     }()
-    
-    private var transition: CGFloat = 0 {
-        didSet {
-            guard let currentPoints = currentPoints else { return }
-            
-            shapeLayer.path = UIBezierPath.smoothCurve(through: currentPoints, length: bounds.width, smoothness: smoothness).cgPath
-        }
-    }
-    
-    private var fromPoints: [CGPoint]?
-    private var toPoints: [CGPoint]?
-    
-    private var currentPoints: [CGPoint]? {
-        guard let fromPoints = fromPoints, let toPoints = toPoints else { return nil }
         
-        return fromPoints.enumerated().map { offset, fromPoint in
-            let toPoint = toPoints[offset]
-            return CGPoint(
-                x: fromPoint.x + (toPoint.x - fromPoint.x) * transition,
-                y: fromPoint.y + (toPoint.y - fromPoint.y) * transition
-            )
-        }
-    }
-    
     init(
         pointsCount: Int,
         minRandomness: CGFloat,
@@ -1231,9 +1416,9 @@ final class BlobView: UIView {
         
         super.init(frame: .zero)
         
-        layer.addSublayer(shapeLayer)
+        self.layer.addSublayer(self.shapeLayer)
         
-        shapeLayer.transform = CATransform3DMakeScale(minScale, minScale, 1)
+        self.shapeLayer.transform = CATransform3DMakeScale(minScale, minScale, 1)
     }
     
     required init?(coder: NSCoder) {
@@ -1241,11 +1426,11 @@ final class BlobView: UIView {
     }
     
     func setColor(_ color: UIColor) {
-        shapeLayer.fillColor = color.cgColor
+        self.shapeLayer.fillColor = color.cgColor
     }
     
     func updateSpeedLevel(to newSpeedLevel: CGFloat) {
-        speedLevel = max(speedLevel, newSpeedLevel)
+        self.speedLevel = max(self.speedLevel, newSpeedLevel)
         
 //        if abs(lastSpeedLevel - newSpeedLevel) > 0.45 {
 //            animateToNewShape()
@@ -1253,57 +1438,41 @@ final class BlobView: UIView {
     }
     
     func startAnimating() {
-        animateToNewShape()
+        self.animateToNewShape()
     }
     
     func stopAnimating() {
-        fromPoints = currentPoints
-        toPoints = nil
-        pop_removeAnimation(forKey: "blob")
+        self.shapeLayer.removeAnimation(forKey: "path")
     }
     
     private func animateToNewShape() {
-        if pop_animation(forKey: "blob") != nil {
-            fromPoints = currentPoints
-            toPoints = nil
-            pop_removeAnimation(forKey: "blob")
+        if self.shapeLayer.path == nil {
+            let points = generateNextBlob(for: self.bounds.size)
+            self.shapeLayer.path = UIBezierPath.smoothCurve(through: points, length: bounds.width, smoothness: smoothness).cgPath
         }
         
-        if fromPoints == nil {
-            fromPoints = generateNextBlob(for: bounds.size)
-        }
-        if toPoints == nil {
-            toPoints = generateNextBlob(for: bounds.size)
-        }
+        let nextPoints = generateNextBlob(for: self.bounds.size)
+        let nextPath = UIBezierPath.smoothCurve(through: nextPoints, length: bounds.width, smoothness: smoothness).cgPath
         
-        let animation = POPBasicAnimation()
-        animation.property = POPAnimatableProperty.property(withName: "blob.transition", initializer: { property in
-            property?.readBlock = { blobView, values in
-                guard let blobView = blobView as? BlobView, let values = values else { return }
-                
-                values.pointee = blobView.transition
-            }
-            property?.writeBlock = { blobView, values in
-                guard let blobView = blobView as? BlobView, let values = values else { return }
-                
-                blobView.transition = values.pointee
-            }
-        })  as? POPAnimatableProperty
-        animation.completionBlock = { [weak self] animation, finished in
+        let animation = CABasicAnimation(keyPath: "path")
+        let previousPath = self.shapeLayer.path
+        self.shapeLayer.path = nextPath
+        animation.duration = CFTimeInterval(1.0 / (minSpeed + (maxSpeed - minSpeed) * speedLevel))
+        animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
+        animation.fromValue = previousPath
+        animation.toValue = nextPath
+        animation.isRemovedOnCompletion = false
+        animation.fillMode = .forwards
+        animation.completion = { [weak self] finished in
             if finished {
-                self?.fromPoints = self?.currentPoints
-                self?.toPoints = nil
                 self?.animateToNewShape()
             }
         }
-        animation.duration = CFTimeInterval(1 / (minSpeed + (maxSpeed - minSpeed) * speedLevel))
-        animation.timingFunction = CAMediaTimingFunction(name: .easeInEaseOut)
-        animation.fromValue = 0
-        animation.toValue = 1
-        pop_add(animation, forKey: "blob")
+
+        self.shapeLayer.add(animation, forKey: "path")
         
-        lastSpeedLevel = speedLevel
-        speedLevel = 0
+        self.lastSpeedLevel = self.speedLevel
+        self.speedLevel = 0
     }
     
     // MARK: Helpers
@@ -1357,6 +1526,10 @@ final class BlobView: UIView {
 }
 
 enum VoiceChatActionButtonIconAnimationState: Equatable {
+    case empty
+    case start
+    case subscribe
+    case unsubscribe
     case unmute
     case mute
     case hand
@@ -1381,30 +1554,77 @@ final class VoiceChatActionButtonIconNode: ManagedAnimationNode {
         let previousState = self.iconState
         self.iconState = state
         
+        if state != .empty {
+            self.alpha = 1.0
+        }
         switch previousState {
+            case .empty:
+                switch state {
+                    case .start:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001))
+                    default:
+                        break
+                }
+            case .subscribe:
+                switch state {
+                    case .unsubscribe:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminder")))
+                    case .mute:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToMute")))
+                    case .hand:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToRaiseHand")))
+                    default:
+                        break
+                }
+            case .unsubscribe:
+                switch state {
+                    case .subscribe:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminder")))
+                    case .mute:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToMute")))
+                    case .hand:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToRaiseHand")))
+                    default:
+                        break
+                }
+            case .start:
+                switch state {
+                    case .mute:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart")))
+                    default:
+                        break
+                }
             case .unmute:
                 switch state {
                     case .mute:
                         self.trackTo(item: ManagedAnimationItem(source: .local("VoiceMute")))
                     case .hand:
-                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOff2")))
-                    case .unmute:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmuteToRaiseHand")))
+                    default:
                         break
                 }
             case .mute:
                 switch state {
+                    case .start:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceStart"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001))
                     case .unmute:
-                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmute"), frames: .range(startFrame: 0, endFrame: 12), duration: 0.2))
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceUnmute")))
                     case .hand:
-                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOff")))
-                    case .mute:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceMuteToRaiseHand")))
+                    case .subscribe:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceSetReminderToRaiseHand"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001))
+                    case .unsubscribe:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceCancelReminderToRaiseHand"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.001))
+                    case .empty:
+                        self.alpha = 0.0
+                    default:
                         break
                 }
             case .hand:
                 switch state {
                     case .mute, .unmute:
-                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceHandOn")))
-                    case .hand:
+                        self.trackTo(item: ManagedAnimationItem(source: .local("VoiceRaiseHandToMute")))
+                    default:
                         break
                 }
         }
@@ -1417,15 +1637,25 @@ final class VoiceChatActionButtonIconNode: ManagedAnimationNode {
             }
             
             var useTiredAnimation = false
+            var useAngryAnimation = false
             let val = Float.random(in: 0.0..<1.0)
             if val <= 0.01 {
                 useTiredAnimation = true
+            } else if val <= 0.05 {
+                useAngryAnimation = true
             }
             
-            let normalAnimations = ["VoiceHand_1", "VoiceHand_2", "VoiceHand_3", "VoiceHand_4", "VoiceHand_7"]
+            let normalAnimations = ["VoiceHand_1", "VoiceHand_2", "VoiceHand_3", "VoiceHand_4", "VoiceHand_7", "VoiceHand_8"]
             let tiredAnimations = ["VoiceHand_5", "VoiceHand_6"]
-            let animations = useTiredAnimation ? tiredAnimations : normalAnimations
-            
+            let angryAnimations = ["VoiceHand_9", "VoiceHand_10"]
+            let animations: [String]
+            if useTiredAnimation {
+                animations = tiredAnimations
+            } else if useAngryAnimation {
+                animations = angryAnimations
+            } else {
+                animations = normalAnimations
+            }
             if let animationName = animations.randomElement() {
                 self.trackTo(item: ManagedAnimationItem(source: .local(animationName)))
             }
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift
index 16638681c3..d547845763 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift
@@ -55,7 +55,7 @@ class VoiceChatActionItem: ListViewItem {
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = VoiceChatActionItemNode()
-            let (layout, apply) = node.asyncLayout()(self, params, false, nextItem == nil)
+            let (layout, apply) = node.asyncLayout()(self, params, previousItem == nil || previousItem is VoiceChatTilesGridItem, nextItem == nil)
             
             node.contentSize = layout.contentSize
             node.insets = layout.insets
@@ -74,7 +74,7 @@ class VoiceChatActionItem: ListViewItem {
                 let makeLayout = nodeValue.asyncLayout()
                 
                 async {
-                    let (layout, apply) = makeLayout(self, params, false, nextItem == nil)
+                    let (layout, apply) = makeLayout(self, params, previousItem == nil || previousItem is VoiceChatTilesGridItem, nextItem == nil)
                     Queue.mainQueue().async {
                         completion(layout, { _ in
                             apply()
@@ -95,6 +95,7 @@ class VoiceChatActionItem: ListViewItem {
 class VoiceChatActionItemNode: ListViewItemNode {
     private let topStripeNode: ASDisplayNode
     private let bottomStripeNode: ASDisplayNode
+    private let highlightContainerNode: ASDisplayNode
     private let highlightedBackgroundNode: ASDisplayNode
     
     private let iconNode: ASImageNode
@@ -121,13 +122,17 @@ class VoiceChatActionItemNode: ListViewItemNode {
         self.iconNode.displayWithoutProcessing = true
         self.iconNode.displaysAsynchronously = false
         
+        self.highlightContainerNode = ASDisplayNode()
+        self.highlightContainerNode.clipsToBounds = true
+        
         self.highlightedBackgroundNode = ASDisplayNode()
-        self.highlightedBackgroundNode.isLayerBacked = true
         
         self.activateArea = AccessibilityAreaNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
         
+        self.highlightContainerNode.addSubnode(self.highlightedBackgroundNode)
+        
         self.addSubnode(self.iconNode)
         self.addSubnode(self.titleNode)
         self.addSubnode(self.activateArea)
@@ -138,30 +143,42 @@ class VoiceChatActionItemNode: ListViewItemNode {
         }
     }
     
-    func asyncLayout() -> (_ item: VoiceChatActionItem, _ params: ListViewItemLayoutParams, _ firstWithHeader: Bool, _ last: Bool) -> (ListViewItemNodeLayout, () -> Void) {
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.highlightContainerNode.layer.cornerCurve = .continuous
+        }
+    }
+    
+    func asyncLayout() -> (_ item: VoiceChatActionItem, _ params: ListViewItemLayoutParams, _ first: Bool, _ last: Bool) -> (ListViewItemNodeLayout, () -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
         let currentItem = self.item
         
-        return { item, params, firstWithHeader, last in
+        return { item, params, first, last in
             var updatedTheme: PresentationTheme?
+            var updatedContent = false
             
             if currentItem?.presentationData.theme !== item.presentationData.theme {
                 updatedTheme = item.presentationData.theme
             }
+            if currentItem?.title != item.title {
+                updatedContent = true
+            }
             
             let titleFont = Font.regular(17.0)
             
-            var leftInset: CGFloat = 16.0 + params.leftInset
+            var leftInset: CGFloat = 8.0 + params.leftInset
             if case .generic = item.icon {
                 leftInset += 49.0
             }
             
-            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: UIColor(rgb: 0xffffff)), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - 10.0 - leftInset - params.rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.title, font: titleFont, textColor: item.presentationData.theme.list.itemAccentColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - 10.0 - leftInset - params.rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
             let contentHeight: CGFloat = 12.0 * 2.0 + titleLayout.size.height
             
             let contentSize = CGSize(width: params.width, height: contentHeight)
-            let insets = UIEdgeInsets(top: firstWithHeader ? 29.0 : 0.0, left: 0.0, bottom: 0.0, right: 0.0)
+            let insets = UIEdgeInsets()
             let separatorHeight = UIScreenPixel
             
             let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
@@ -170,6 +187,10 @@ class VoiceChatActionItemNode: ListViewItemNode {
                 if let strongSelf = self {
                     strongSelf.item = item
                     
+                    guard params.width > 0.0 else {
+                        return
+                    }
+                    
                     strongSelf.activateArea.accessibilityLabel = item.title
                     strongSelf.activateArea.frame = CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: CGSize(width: layout.contentSize.width - params.leftInset - params.rightInset, height: layout.contentSize.height))
                     
@@ -178,7 +199,9 @@ class VoiceChatActionItemNode: ListViewItemNode {
                         strongSelf.bottomStripeNode.backgroundColor = UIColor(rgb: 0xffffff, alpha: 0.08)
                         strongSelf.highlightedBackgroundNode.backgroundColor = item.presentationData.theme.list.itemHighlightedBackgroundColor
                         
-                        strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: UIColor(rgb: 0xffffff))
+                        strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: item.presentationData.theme.list.itemAccentColor)
+                    } else if updatedContent {
+                        strongSelf.iconNode.image = generateTintedImage(image: item.icon.image, color: item.presentationData.theme.list.itemAccentColor)
                     }
                     
                     let _ = titleApply()
@@ -186,7 +209,7 @@ class VoiceChatActionItemNode: ListViewItemNode {
                     let titleOffset = leftInset
                     let hideBottomStripe: Bool = last
                     if let image = item.icon.image {
-                        let iconFrame = CGRect(origin: CGPoint(x: params.leftInset + floor((leftInset - params.leftInset - image.size.width) / 2.0) + 3.0, y: floor((contentSize.height - image.size.height) / 2.0)), size: image.size)
+                        let iconFrame = CGRect(origin: CGPoint(x: params.leftInset + floor((leftInset - params.leftInset - image.size.width) / 2.0) - 1.0, y: floor((contentSize.height - image.size.height) / 2.0)), size: image.size)
                         strongSelf.iconNode.frame = iconFrame
                     }
                 
@@ -202,7 +225,11 @@ class VoiceChatActionItemNode: ListViewItemNode {
                     
                     strongSelf.bottomStripeNode.frame = CGRect(origin: CGPoint(x: leftInset, y: contentSize.height - separatorHeight), size: CGSize(width: params.width - leftInset, height: separatorHeight))
                     
-                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: titleOffset, y: floor((contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+                    strongSelf.titleNode.frame = CGRect(origin: CGPoint(x: titleOffset + 1.0, y: floor((contentSize.height - titleLayout.size.height) / 2.0)), size: titleLayout.size)
+                    
+                    strongSelf.highlightContainerNode.frame = CGRect(origin: CGPoint(x: params.leftInset, y: -UIScreenPixel), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel + 11.0))
+                    
+                    strongSelf.highlightContainerNode.cornerRadius = first ? 11.0 : 0.0
                     
                     strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: contentSize.height + UIScreenPixel + UIScreenPixel))
                 }
@@ -214,8 +241,8 @@ class VoiceChatActionItemNode: ListViewItemNode {
         super.setHighlighted(highlighted, at: point, animated: animated)
         
         if highlighted {
-            self.highlightedBackgroundNode.alpha = 1.0
-            if self.highlightedBackgroundNode.supernode == nil {
+            self.highlightContainerNode.alpha = 1.0
+            if self.highlightContainerNode.supernode == nil {
                 var anchorNode: ASDisplayNode?
                 if self.bottomStripeNode.supernode != nil {
                     anchorNode = self.bottomStripeNode
@@ -223,24 +250,24 @@ class VoiceChatActionItemNode: ListViewItemNode {
                     anchorNode = self.topStripeNode
                 }
                 if let anchorNode = anchorNode {
-                    self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode)
+                    self.insertSubnode(self.highlightContainerNode, aboveSubnode: anchorNode)
                 } else {
-                    self.addSubnode(self.highlightedBackgroundNode)
+                    self.addSubnode(self.highlightContainerNode)
                 }
             }
         } else {
-            if self.highlightedBackgroundNode.supernode != nil {
+            if self.highlightContainerNode.supernode != nil {
                 if animated {
-                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                    self.highlightContainerNode.layer.animateAlpha(from: self.highlightContainerNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
                         if let strongSelf = self {
                             if completed {
-                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                                strongSelf.highlightContainerNode.removeFromSupernode()
                             }
                         }
                     })
-                    self.highlightedBackgroundNode.alpha = 0.0
+                    self.highlightContainerNode.alpha = 0.0
                 } else {
-                    self.highlightedBackgroundNode.removeFromSupernode()
+                    self.highlightContainerNode.removeFromSupernode()
                 }
             }
         }
@@ -254,7 +281,7 @@ class VoiceChatActionItemNode: ListViewItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         return nil
     }
 }
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift
new file mode 100644
index 0000000000..05b5d1185a
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatCameraPreviewController.swift
@@ -0,0 +1,588 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import Postbox
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import AccountContext
+import TelegramPresentationData
+import SolidRoundedButtonNode
+import PresentationDataUtils
+import UIKitRuntimeUtils
+import ReplayKit
+
+private let accentColor: UIColor = UIColor(rgb: 0x007aff)
+
+final class VoiceChatCameraPreviewController: ViewController {
+    private var controllerNode: VoiceChatCameraPreviewControllerNode {
+        return self.displayNode as! VoiceChatCameraPreviewControllerNode
+    }
+    
+    private let context: AccountContext
+    
+    private var animatedIn = false
+
+    private let cameraNode: GroupVideoNode
+    private let shareCamera: (ASDisplayNode, Bool) -> Void
+    private let switchCamera: () -> Void
+    
+    private var presentationDataDisposable: Disposable?
+    
+    init(context: AccountContext, cameraNode: GroupVideoNode, shareCamera: @escaping (ASDisplayNode, Bool) -> Void, switchCamera: @escaping () -> Void) {
+        self.context = context
+        self.cameraNode = cameraNode
+        self.shareCamera = shareCamera
+        self.switchCamera = switchCamera
+        
+        super.init(navigationBarPresentationData: nil)
+        
+        self.statusBar.statusBarStyle = .Ignore
+        
+        self.blocksBackgroundWhenInOverlay = true
+        
+        self.presentationDataDisposable = (context.sharedContext.presentationData
+        |> deliverOnMainQueue).start(next: { [weak self] presentationData in
+            if let strongSelf = self {
+                strongSelf.controllerNode.updatePresentationData(presentationData)
+            }
+        })
+        
+        self.statusBar.statusBarStyle = .Ignore
+    }
+    
+    required init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    deinit {
+        self.presentationDataDisposable?.dispose()
+    }
+    
+    override public func loadDisplayNode() {
+        self.displayNode = VoiceChatCameraPreviewControllerNode(controller: self, context: self.context, cameraNode: self.cameraNode)
+        self.controllerNode.shareCamera = { [weak self] unmuted in
+            if let strongSelf = self {
+                strongSelf.shareCamera(strongSelf.cameraNode, unmuted)
+                strongSelf.dismiss()
+            }
+        }
+        self.controllerNode.switchCamera = { [weak self] in
+            self?.switchCamera()
+            self?.cameraNode.flip(withBackground: false)
+        }
+        self.controllerNode.dismiss = { [weak self] in
+            self?.presentingViewController?.dismiss(animated: false, completion: nil)
+        }
+        self.controllerNode.cancel = { [weak self] in
+            self?.dismiss()
+        }
+    }
+    
+    override public func loadView() {
+        super.loadView()
+    }
+    
+    override public func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        if !self.animatedIn {
+            self.animatedIn = true
+            self.controllerNode.animateIn()
+        }
+    }
+    
+    override public func dismiss(completion: (() -> Void)? = nil) {
+        self.controllerNode.animateOut(completion: completion)
+    }
+    
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        super.containerLayoutUpdated(layout, transition: transition)
+        
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+    }
+}
+
+private class VoiceChatCameraPreviewControllerNode: ViewControllerTracingNode, UIScrollViewDelegate {
+    private weak var controller: VoiceChatCameraPreviewController?
+    private let context: AccountContext
+    private var presentationData: PresentationData
+    
+    private let cameraNode: GroupVideoNode
+    private let dimNode: ASDisplayNode
+    private let wrappingScrollNode: ASScrollNode
+    private let contentContainerNode: ASDisplayNode
+    private let effectNode: ASDisplayNode
+    private let backgroundNode: ASDisplayNode
+    private let contentBackgroundNode: ASDisplayNode
+    private let titleNode: ASTextNode
+    private let previewContainerNode: ASDisplayNode
+    private let shimmerNode: ShimmerEffectForegroundNode
+    private let cameraButton: SolidRoundedButtonNode
+    private let screenButton: SolidRoundedButtonNode
+    private var broadcastPickerView: UIView?
+    private let cancelButton: SolidRoundedButtonNode
+    
+    private let microphoneButton: HighlightTrackingButtonNode
+    private let microphoneEffectView: UIVisualEffectView
+    private let microphoneIconNode: VoiceChatMicrophoneNode
+    
+    private let switchCameraButton: HighlightTrackingButtonNode
+    private let switchCameraEffectView: UIVisualEffectView
+    private let switchCameraIconNode: ASImageNode
+    
+    private var containerLayout: (ContainerViewLayout, CGFloat)?
+
+    private var applicationStateDisposable: Disposable?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    private let readyDisposable = MetaDisposable()
+    
+    var shareCamera: ((Bool) -> Void)?
+    var switchCamera: (() -> Void)?
+    var dismiss: (() -> Void)?
+    var cancel: (() -> Void)?
+    
+    init(controller: VoiceChatCameraPreviewController, context: AccountContext, cameraNode: GroupVideoNode) {
+        self.controller = controller
+        self.context = context
+        self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        
+        self.cameraNode = cameraNode
+        
+        self.wrappingScrollNode = ASScrollNode()
+        self.wrappingScrollNode.view.alwaysBounceVertical = true
+        self.wrappingScrollNode.view.delaysContentTouches = false
+        self.wrappingScrollNode.view.canCancelContentTouches = true
+        
+        self.dimNode = ASDisplayNode()
+        self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
+        
+        self.contentContainerNode = ASDisplayNode()
+        self.contentContainerNode.isOpaque = false
+
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.clipsToBounds = true
+        self.backgroundNode.cornerRadius = 16.0
+        
+        let backgroundColor = UIColor(rgb: 0x1c1c1e)
+        let textColor: UIColor = .white
+        let buttonColor: UIColor = UIColor(rgb: 0x2b2b2f)
+        let buttonTextColor: UIColor = .white
+        let blurStyle: UIBlurEffect.Style = .dark
+        
+        self.effectNode = ASDisplayNode(viewBlock: {
+            return UIVisualEffectView(effect: UIBlurEffect(style: blurStyle))
+        })
+        
+        self.contentBackgroundNode = ASDisplayNode()
+        self.contentBackgroundNode.backgroundColor = backgroundColor
+        
+        let title =  self.presentationData.strings.VoiceChat_VideoPreviewTitle
+        
+        self.titleNode = ASTextNode()
+        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.bold(17.0), textColor: textColor)
+                
+        self.cameraButton = SolidRoundedButtonNode(theme: SolidRoundedButtonTheme(backgroundColor: accentColor, foregroundColor: .white), font: .bold, height: 52.0, cornerRadius: 11.0, gloss: false)
+        self.cameraButton.title = self.presentationData.strings.VoiceChat_VideoPreviewShareCamera
+        
+        self.screenButton = SolidRoundedButtonNode(theme: SolidRoundedButtonTheme(backgroundColor: buttonColor, foregroundColor: buttonTextColor), font: .bold, height: 52.0, cornerRadius: 11.0, gloss: false)
+        self.screenButton.title = self.presentationData.strings.VoiceChat_VideoPreviewShareScreen
+
+        if #available(iOS 12.0, *) {
+            let broadcastPickerView = RPSystemBroadcastPickerView(frame: CGRect(x: 0, y: 0, width: 50, height: 52.0))
+            broadcastPickerView.alpha = 0.02
+            broadcastPickerView.preferredExtension = "\(self.context.sharedContext.applicationBindings.appBundleId).BroadcastUpload"
+            broadcastPickerView.showsMicrophoneButton = false
+            self.broadcastPickerView = broadcastPickerView
+        }
+        
+        self.cancelButton = SolidRoundedButtonNode(theme: SolidRoundedButtonTheme(backgroundColor: buttonColor, foregroundColor: buttonTextColor), font: .regular, height: 52.0, cornerRadius: 11.0, gloss: false)
+        self.cancelButton.title = self.presentationData.strings.Common_Cancel
+        
+        self.previewContainerNode = ASDisplayNode()
+        self.previewContainerNode.clipsToBounds = true
+        self.previewContainerNode.cornerRadius = 11.0
+        self.previewContainerNode.backgroundColor = UIColor(rgb: 0x2b2b2f)
+        
+        self.shimmerNode = ShimmerEffectForegroundNode(size: 200.0)
+        self.previewContainerNode.addSubnode(self.shimmerNode)
+        
+        self.microphoneButton = HighlightTrackingButtonNode()
+        self.microphoneButton.isSelected = true
+        self.microphoneEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
+        self.microphoneEffectView.clipsToBounds = true
+        self.microphoneEffectView.layer.cornerRadius = 24.0
+        self.microphoneEffectView.isUserInteractionEnabled = false
+        
+        self.microphoneIconNode = VoiceChatMicrophoneNode()
+        self.microphoneIconNode.update(state: .init(muted: false, filled: true, color: .white), animated: false)
+        
+        self.switchCameraButton = HighlightTrackingButtonNode()
+        self.switchCameraEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
+        self.switchCameraEffectView.clipsToBounds = true
+        self.switchCameraEffectView.layer.cornerRadius = 24.0
+        self.switchCameraEffectView.isUserInteractionEnabled = false
+        
+        self.switchCameraIconNode = ASImageNode()
+        self.switchCameraIconNode.displaysAsynchronously = false
+        self.switchCameraIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/SwitchCameraIcon"), color: .white)
+        self.switchCameraIconNode.contentMode = .center
+        
+        super.init()
+        
+        self.backgroundColor = nil
+        self.isOpaque = false
+        
+        self.dimNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.dimTapGesture(_:))))
+        self.addSubnode(self.dimNode)
+        
+        self.wrappingScrollNode.view.delegate = self
+        self.addSubnode(self.wrappingScrollNode)
+                
+        self.wrappingScrollNode.addSubnode(self.backgroundNode)
+        self.wrappingScrollNode.addSubnode(self.contentContainerNode)
+        
+        self.backgroundNode.addSubnode(self.effectNode)
+        self.backgroundNode.addSubnode(self.contentBackgroundNode)
+        self.contentContainerNode.addSubnode(self.titleNode)
+        self.contentContainerNode.addSubnode(self.cameraButton)
+        self.contentContainerNode.addSubnode(self.screenButton)
+        if let broadcastPickerView = self.broadcastPickerView {
+            self.contentContainerNode.view.addSubview(broadcastPickerView)
+        }
+        self.contentContainerNode.addSubnode(self.cancelButton)
+        
+        self.contentContainerNode.addSubnode(self.previewContainerNode)
+        
+        self.previewContainerNode.addSubnode(self.cameraNode)
+        self.previewContainerNode.addSubnode(self.microphoneButton)
+        self.microphoneButton.view.addSubview(self.microphoneEffectView)
+        self.microphoneButton.addSubnode(self.microphoneIconNode)
+        self.previewContainerNode.addSubnode(self.switchCameraButton)
+        self.switchCameraButton.view.addSubview(self.switchCameraEffectView)
+        self.switchCameraButton.addSubnode(self.switchCameraIconNode)
+        
+        self.cameraButton.pressed = { [weak self] in
+            if let strongSelf = self {
+                strongSelf.shareCamera?(strongSelf.microphoneButton.isSelected)
+            }
+        }
+        self.cancelButton.pressed = { [weak self] in
+            if let strongSelf = self {
+                strongSelf.cancel?()
+            }
+        }
+        
+        self.microphoneButton.addTarget(self, action: #selector(self.microphonePressed), forControlEvents: .touchUpInside)
+        self.microphoneButton.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .spring)
+                    transition.updateSublayerTransformScale(node: strongSelf.microphoneButton, scale: 0.9)
+                } else {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.5, curve: .spring)
+                    transition.updateSublayerTransformScale(node: strongSelf.microphoneButton, scale: 1.0)
+                }
+            }
+        }
+        
+        self.switchCameraButton.addTarget(self, action: #selector(self.switchCameraPressed), forControlEvents: .touchUpInside)
+        self.switchCameraButton.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .spring)
+                    transition.updateSublayerTransformScale(node: strongSelf.switchCameraButton, scale: 0.9)
+                } else {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.5, curve: .spring)
+                    transition.updateSublayerTransformScale(node: strongSelf.switchCameraButton, scale: 1.0)
+                }
+            }
+        }
+        
+        self.readyDisposable.set(self.cameraNode.ready.start(next: { [weak self] ready in
+            if let strongSelf = self, ready {
+                Queue.mainQueue().after(0.07) {
+                    strongSelf.shimmerNode.alpha = 0.0
+                    strongSelf.shimmerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                }
+            }
+        }))
+    }
+    
+    deinit {
+        self.readyDisposable.dispose()
+        self.applicationStateDisposable?.dispose()
+    }
+    
+    @objc private func microphonePressed() {
+        self.hapticFeedback.impact(.light)
+        self.microphoneButton.isSelected = !self.microphoneButton.isSelected
+        self.microphoneIconNode.update(state: .init(muted: !self.microphoneButton.isSelected, filled: true, color: .white), animated: true)
+    }
+    
+    @objc private func switchCameraPressed() {
+        self.hapticFeedback.impact(.light)
+        self.switchCamera?()
+        
+        let springDuration: Double = 0.7
+        let springDamping: CGFloat = 100.0
+        self.switchCameraButton.isUserInteractionEnabled = false
+        self.switchCameraIconNode.layer.animateSpring(from: 0.0 as NSNumber, to: CGFloat.pi as NSNumber, keyPath: "transform.rotation.z", duration: springDuration, damping: springDamping, completion: { [weak self] _ in
+            self?.switchCameraButton.isUserInteractionEnabled = true
+        })
+    }
+        
+    func updatePresentationData(_ presentationData: PresentationData) {
+        self.presentationData = presentationData
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOSApplicationExtension 11.0, iOS 11.0, *) {
+            self.wrappingScrollNode.view.contentInsetAdjustmentBehavior = .never
+        }
+    }
+    
+    @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.cancel?()
+        }
+    }
+    
+    func animateIn() {
+        self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+        
+        let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
+        let dimPosition = self.dimNode.layer.position
+        
+        let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+        let targetBounds = self.bounds
+        self.bounds = self.bounds.offsetBy(dx: 0.0, dy: -offset)
+        self.dimNode.position = CGPoint(x: dimPosition.x, y: dimPosition.y - offset)
+        transition.animateView({
+            self.bounds = targetBounds
+            self.dimNode.position = dimPosition
+        })
+
+        self.applicationStateDisposable = (self.context.sharedContext.applicationBindings.applicationIsActive
+        |> filter { !$0 }
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { [weak self] _ in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.controller?.dismiss()
+        })
+    }
+    
+    func animateOut(completion: (() -> Void)? = nil) {
+        var dimCompleted = false
+        var offsetCompleted = false
+        
+        let internalCompletion: () -> Void = { [weak self] in
+            if let strongSelf = self, dimCompleted && offsetCompleted {
+                strongSelf.dismiss?()
+            }
+            completion?()
+        }
+        
+        self.dimNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in
+            dimCompleted = true
+            internalCompletion()
+        })
+        
+        let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
+        let dimPosition = self.dimNode.layer.position
+        self.dimNode.layer.animatePosition(from: dimPosition, to: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false)
+        self.layer.animateBoundsOriginYAdditive(from: 0.0, to: -offset, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in
+            offsetCompleted = true
+            internalCompletion()
+        })
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if self.bounds.contains(point) {
+            if !self.contentBackgroundNode.bounds.contains(self.convert(point, to: self.contentBackgroundNode)) {
+                return self.dimNode.view
+            }
+        }
+        return super.hitTest(point, with: event)
+    }
+    
+    func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) {
+        let contentOffset = scrollView.contentOffset
+        let additionalTopHeight = max(0.0, -contentOffset.y)
+        
+        if additionalTopHeight >= 30.0 {
+            self.cancel?()
+        }
+    }
+    
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+        self.containerLayout = (layout, navigationBarHeight)
+        
+        let isLandscape: Bool
+        if layout.size.width > layout.size.height {
+            isLandscape = true
+        } else {
+            isLandscape = false
+        }
+        let isTablet: Bool
+        if case .regular = layout.metrics.widthClass {
+            isTablet = true
+        } else {
+            isTablet = false
+        }
+        
+        var insets = layout.insets(options: [.statusBar, .input])
+        let cleanInsets = layout.insets(options: [.statusBar])
+        insets.top = max(10.0, insets.top)
+        
+        var buttonOffset: CGFloat = 60.0
+        if let _ = self.broadcastPickerView {
+            buttonOffset *= 2.0
+        }
+        let bottomInset: CGFloat = isTablet ? 31.0 : 10.0 + cleanInsets.bottom
+        let titleHeight: CGFloat = 54.0
+        var contentHeight = titleHeight + bottomInset + 52.0 + 17.0
+        let innerContentHeight: CGFloat = layout.size.height - contentHeight - 160.0
+        var width = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: layout.safeInsets.left)
+        if isLandscape {
+            if isTablet {
+                width = 870.0
+                contentHeight = 690.0
+            } else {
+                contentHeight = layout.size.height
+                width = layout.size.width
+            }
+        } else {
+            if isTablet {
+                width = 600.0
+                contentHeight = 960.0
+            } else {
+                contentHeight = titleHeight + bottomInset + 52.0 + 17.0 + innerContentHeight + buttonOffset
+            }
+        }
+        
+        let previewInset: CGFloat = 16.0
+        let sideInset = floor((layout.size.width - width) / 2.0)
+        let contentFrame: CGRect
+        if isTablet {
+            contentFrame = CGRect(origin: CGPoint(x: sideInset, y: floor((layout.size.height - contentHeight) / 2.0)), size: CGSize(width: width, height: contentHeight))
+        } else {
+            contentFrame = CGRect(origin: CGPoint(x: sideInset, y: layout.size.height - contentHeight), size: CGSize(width: width, height: contentHeight))
+        }
+        var backgroundFrame = CGRect(origin: CGPoint(x: contentFrame.minX, y: contentFrame.minY), size: CGSize(width: contentFrame.width, height: contentFrame.height))
+        if !isTablet {
+            backgroundFrame.size.height += 2000.0
+        }
+        if backgroundFrame.minY < contentFrame.minY {
+            backgroundFrame.origin.y = contentFrame.minY
+        }
+        transition.updateAlpha(node: self.titleNode, alpha: isLandscape && !isTablet ? 0.0 : 1.0)
+        transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+        transition.updateFrame(node: self.effectNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
+        transition.updateFrame(node: self.contentBackgroundNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
+        transition.updateFrame(node: self.wrappingScrollNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        
+        let titleSize = self.titleNode.measure(CGSize(width: width, height: titleHeight))
+        let titleFrame = CGRect(origin: CGPoint(x: floor((contentFrame.width - titleSize.width) / 2.0), y: 18.0), size: titleSize)
+        transition.updateFrame(node: self.titleNode, frame: titleFrame)
+        
+        var previewSize: CGSize
+        var previewFrame: CGRect
+        if isLandscape {
+            let previewHeight = contentHeight - 21.0 - 52.0 - 10.0
+            previewSize = CGSize(width: min(contentFrame.width - layout.safeInsets.left - layout.safeInsets.right, previewHeight * 1.7778), height: previewHeight)
+            if isTablet {
+                previewSize.width -= previewInset * 2.0
+                previewSize.height -= 46.0
+            }
+            previewFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((contentFrame.width - previewSize.width) / 2.0), y: 0.0), size: previewSize)
+            if isTablet {
+                previewFrame.origin.y += 56.0
+            }
+        } else {
+            previewSize = CGSize(width: contentFrame.width - previewInset * 2.0, height: contentHeight - 243.0 - bottomInset + (120.0 - buttonOffset))
+            if isTablet {
+                previewSize.height += 17.0
+            }
+            previewFrame = CGRect(origin: CGPoint(x: previewInset, y: 56.0), size: previewSize)
+        }
+        transition.updateFrame(node: self.previewContainerNode, frame: previewFrame)
+        transition.updateFrame(node: self.shimmerNode, frame: CGRect(origin: CGPoint(), size: previewFrame.size))
+        self.shimmerNode.update(foregroundColor: UIColor(rgb: 0xffffff, alpha: 0.07))
+        self.shimmerNode.updateAbsoluteRect(previewFrame, within: layout.size)
+        
+        self.cameraNode.frame =  CGRect(origin: CGPoint(), size: previewSize)
+        self.cameraNode.updateLayout(size: previewSize, layoutMode: isLandscape ? .fillHorizontal : .fillVertical, transition: .immediate)
+        
+        let microphoneFrame = CGRect(x: 16.0, y: previewSize.height - 48.0 - 16.0, width: 48.0, height: 48.0)
+        transition.updateFrame(node: self.microphoneButton, frame: microphoneFrame)
+        transition.updateFrame(view: self.microphoneEffectView, frame: CGRect(origin: CGPoint(), size: microphoneFrame.size))
+        transition.updateFrameAsPositionAndBounds(node: self.microphoneIconNode, frame: CGRect(origin: CGPoint(x: 1.0, y: 0.0), size: microphoneFrame.size).insetBy(dx: 6.0, dy: 6.0))
+        self.microphoneIconNode.transform = CATransform3DMakeScale(1.2, 1.2, 1.0)
+        
+        let switchCameraFrame = CGRect(x: previewSize.width - 48.0 - 16.0, y: previewSize.height - 48.0 - 16.0, width: 48.0, height: 48.0)
+        transition.updateFrame(node: self.switchCameraButton, frame: switchCameraFrame)
+        transition.updateFrame(view: self.switchCameraEffectView, frame: CGRect(origin: CGPoint(), size: switchCameraFrame.size))
+        transition.updateFrame(node: self.switchCameraIconNode, frame: CGRect(origin: CGPoint(), size: switchCameraFrame.size))
+        
+        if isLandscape {
+            var buttonsCount: Int = 2
+            if let _ = self.broadcastPickerView {
+                buttonsCount += 1
+            } else {
+                self.screenButton.isHidden = true
+            }
+            
+            let buttonInset: CGFloat = 6.0
+            var leftButtonInset = buttonInset
+            let availableWidth: CGFloat
+            if isTablet {
+                availableWidth = contentFrame.width - layout.safeInsets.left - layout.safeInsets.right - previewInset * 2.0
+                leftButtonInset += previewInset
+            } else {
+                availableWidth = contentFrame.width - layout.safeInsets.left - layout.safeInsets.right
+            }
+            let buttonWidth = floorToScreenPixels((availableWidth - CGFloat(buttonsCount + 1) * buttonInset) / CGFloat(buttonsCount))
+            
+            let cameraButtonHeight = self.cameraButton.updateLayout(width: buttonWidth, transition: transition)
+            let screenButtonHeight = self.screenButton.updateLayout(width: buttonWidth, transition: transition)
+            let cancelButtonHeight = self.cancelButton.updateLayout(width: buttonWidth, transition: transition)
+            
+            transition.updateFrame(node: self.cancelButton, frame: CGRect(x: layout.safeInsets.left + leftButtonInset, y: previewFrame.maxY + 10.0, width: buttonWidth, height: cancelButtonHeight))
+            if let broadcastPickerView = self.broadcastPickerView {
+                transition.updateFrame(node: self.screenButton, frame: CGRect(x: layout.safeInsets.left + leftButtonInset + buttonWidth + buttonInset, y: previewFrame.maxY + 10.0, width: buttonWidth, height: screenButtonHeight))
+                broadcastPickerView.frame = CGRect(x: layout.safeInsets.left + leftButtonInset + buttonWidth + buttonInset, y: previewFrame.maxY + 10.0, width: buttonWidth, height: screenButtonHeight)
+                transition.updateFrame(node: self.cameraButton, frame: CGRect(x: layout.safeInsets.left + leftButtonInset + buttonWidth + buttonInset + buttonWidth + buttonInset, y: previewFrame.maxY + 10.0, width: buttonWidth, height: cameraButtonHeight))
+            } else {
+                transition.updateFrame(node: self.cameraButton, frame: CGRect(x: layout.safeInsets.left + leftButtonInset + buttonWidth + buttonInset, y: previewFrame.maxY + 10.0, width: buttonWidth, height: cameraButtonHeight))
+            }
+            
+        } else {
+            let bottomInset = isTablet ? 21.0 : insets.bottom + 16.0
+            let buttonInset: CGFloat = 16.0
+            let cameraButtonHeight = self.cameraButton.updateLayout(width: contentFrame.width - buttonInset * 2.0, transition: transition)
+            transition.updateFrame(node: self.cameraButton, frame: CGRect(x: buttonInset, y: contentHeight - cameraButtonHeight - bottomInset - buttonOffset, width: contentFrame.width, height: cameraButtonHeight))
+            
+            let screenButtonHeight = self.screenButton.updateLayout(width: contentFrame.width - buttonInset * 2.0, transition: transition)
+            transition.updateFrame(node: self.screenButton, frame: CGRect(x: buttonInset, y: contentHeight - cameraButtonHeight - 8.0 - screenButtonHeight - bottomInset, width: contentFrame.width, height: screenButtonHeight))
+            if let broadcastPickerView = self.broadcastPickerView {
+                broadcastPickerView.frame = CGRect(x: buttonInset, y: contentHeight - cameraButtonHeight - 8.0 - screenButtonHeight - bottomInset, width: contentFrame.width + 1000.0, height: screenButtonHeight)
+            } else {
+                self.screenButton.isHidden = true
+            }
+           
+            let cancelButtonHeight = self.cancelButton.updateLayout(width: contentFrame.width - buttonInset * 2.0, transition: transition)
+            transition.updateFrame(node: self.cancelButton, frame: CGRect(x: buttonInset, y: contentHeight - cancelButtonHeight - bottomInset, width: contentFrame.width, height: cancelButtonHeight))
+        }
+        
+        transition.updateFrame(node: self.contentContainerNode, frame: contentFrame)
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift
index f5fe1cbff4..42249b143f 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatController.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatController.swift
@@ -5,6 +5,7 @@ import AsyncDisplayKit
 import SwiftSignalKit
 import TelegramPresentationData
 import TelegramUIPreferences
+import TelegramStringFormatting
 import TelegramVoip
 import TelegramAudio
 import AccountContext
@@ -24,15 +25,46 @@ import DirectionalPanGesture
 import PeerInfoUI
 import AvatarNode
 import TooltipUI
+import LegacyUI
+import LegacyComponents
+import LegacyMediaPickerUI
+import WebSearchUI
+import MapResourceToAvatarSizes
+import SolidRoundedButtonNode
+import AudioBlob
+import DeviceAccess
 
-private let panelBackgroundColor = UIColor(rgb: 0x1c1c1e)
-private let secondaryPanelBackgroundColor = UIColor(rgb: 0x2c2c2e)
-private let fullscreenBackgroundColor = UIColor(rgb: 0x000000)
-private let dimColor = UIColor(white: 0.0, alpha: 0.5)
+let panelBackgroundColor = UIColor(rgb: 0x1c1c1e)
+let secondaryPanelBackgroundColor = UIColor(rgb: 0x2c2c2e)
+let fullscreenBackgroundColor = UIColor(rgb: 0x000000)
+private let smallButtonSize = CGSize(width: 36.0, height: 36.0)
 private let sideButtonSize = CGSize(width: 56.0, height: 56.0)
-private let bottomAreaHeight: CGFloat = 205.0
+private let topPanelHeight: CGFloat = 63.0
+let bottomAreaHeight: CGFloat = 206.0
+private let fullscreenBottomAreaHeight: CGFloat = 80.0
+private let bottomGradientHeight: CGFloat = 70.0
 
-private func cornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? {
+public struct VoiceChatConfiguration {
+    static var defaultValue: VoiceChatConfiguration {
+        return VoiceChatConfiguration(videoParticipantsMaxCount: 30)
+    }
+    
+    public let videoParticipantsMaxCount: Int32
+    
+    fileprivate init(videoParticipantsMaxCount: Int32) {
+        self.videoParticipantsMaxCount = videoParticipantsMaxCount
+    }
+    
+    static func with(appConfiguration: AppConfiguration) -> VoiceChatConfiguration {
+        if let data = appConfiguration.data, let value = data["groupcall_video_participants_max"] as? Double {
+            return VoiceChatConfiguration(videoParticipantsMaxCount: Int32(value))
+        } else {
+            return .defaultValue
+        }
+    }
+}
+
+func decorationCornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? {
     if !top && !bottom {
         return nil
     }
@@ -58,270 +90,184 @@ private func cornersImage(top: Bool, bottom: Bool, dark: Bool) -> UIImage? {
     })?.stretchableImage(withLeftCapWidth: 25, topCapHeight: 25)
 }
 
+func decorationTopCornersImage(dark: Bool) -> UIImage? {
+    return generateImage(CGSize(width: 50.0, height: 110.0), rotatedContext: { (size, context) in
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        context.setFillColor((dark ? fullscreenBackgroundColor : panelBackgroundColor).cgColor)
+        context.fill(bounds)
+        
+        context.setBlendMode(.clear)
+        
+        var corners: UIRectCorner = []
+        corners.insert(.topLeft)
+        corners.insert(.topRight)
 
-private final class VoiceChatControllerTitleNode: ASDisplayNode {
-    private var theme: PresentationTheme
-    
-    private let titleNode: ASTextNode
-    private let infoNode: ASTextNode
-    fileprivate let recordingIconNode: VoiceChatRecordingIconNode
-    
-    public var isRecording: Bool = false {
-        didSet {
-            self.recordingIconNode.isHidden = !self.isRecording
-        }
+        let path = UIBezierPath(roundedRect: CGRect(x: 0.0, y: 60.0, width: 50.0, height: 50.0), byRoundingCorners: corners, cornerRadii: CGSize(width: 11.0, height: 11.0))
+        context.addPath(path.cgPath)
+        context.fillPath()
+    })?.stretchableImage(withLeftCapWidth: 25, topCapHeight: 32)
+}
+
+func decorationBottomCornersImage(dark: Bool) -> UIImage? {
+    return generateImage(CGSize(width: 50.0, height: 110.0), rotatedContext: { (size, context) in
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        context.setFillColor((dark ? fullscreenBackgroundColor : panelBackgroundColor).cgColor)
+        context.fill(bounds)
+        
+        context.setBlendMode(.clear)
+        
+        var corners: UIRectCorner = []
+        corners.insert(.bottomLeft)
+        corners.insert(.bottomRight)
+
+        let path = UIBezierPath(roundedRect: CGRect(x: 0.0, y: 0.0, width: 50.0, height: 50.0), byRoundingCorners: corners, cornerRadii: CGSize(width: 11.0, height: 11.0))
+        context.addPath(path.cgPath)
+        context.fillPath()
+    })?.resizableImage(withCapInsets: UIEdgeInsets(top: 25.0, left: 25.0, bottom: 0.0, right: 25.0), resizingMode: .stretch)
+}
+
+private func decorationBottomGradientImage(dark: Bool) -> UIImage? {
+    return generateImage(CGSize(width: 24.0, height: bottomGradientHeight), rotatedContext: { size, context in
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        context.clear(bounds)
+        
+        let color = dark ? fullscreenBackgroundColor : panelBackgroundColor
+        let colorsArray = [color.withAlphaComponent(0.0).cgColor, color.cgColor] as CFArray
+        var locations: [CGFloat] = [1.0, 0.0]
+        let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
+        context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+    })
+}
+
+struct VoiceChatPeerEntry: Identifiable {
+    enum State {
+        case listening
+        case speaking
+        case invited
+        case raisedHand
     }
     
-    var tapped: (() -> Void)?
+    var peer: Peer
+    var about: String?
+    var isMyPeer: Bool
+    var videoEndpointId: String?
+    var videoPaused: Bool
+    var presentationEndpointId: String?
+    var presentationPaused: Bool
+    var effectiveSpeakerVideoEndpointId: String?
+    var state: State
+    var muteState: GroupCallParticipantsContext.Participant.MuteState?
+    var canManageCall: Bool
+    var volume: Int32?
+    var raisedHand: Bool
+    var displayRaisedHandStatus: Bool
+    var active: Bool
+    var isLandscape: Bool
     
-    init(theme: PresentationTheme) {
-        self.theme = theme
-        
-        self.titleNode = ASTextNode()
-        self.titleNode.displaysAsynchronously = false
-        self.titleNode.maximumNumberOfLines = 1
-        self.titleNode.truncationMode = .byTruncatingTail
-        self.titleNode.isOpaque = false
-        
-        self.infoNode = ASTextNode()
-        self.infoNode.displaysAsynchronously = false
-        self.infoNode.maximumNumberOfLines = 1
-        self.infoNode.truncationMode = .byTruncatingTail
-        self.infoNode.isOpaque = false
-        
-        self.recordingIconNode = VoiceChatRecordingIconNode(hasBackground: false)
-        
-        super.init()
-        
-        self.addSubnode(self.titleNode)
-        self.addSubnode(self.infoNode)
-        self.addSubnode(self.recordingIconNode)
+    var effectiveVideoEndpointId: String? {
+        return self.presentationEndpointId ?? self.videoEndpointId
     }
-        
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
+
+    init(
+        peer: Peer,
+        about: String?,
+        isMyPeer: Bool,
+        videoEndpointId: String?,
+        videoPaused: Bool,
+        presentationEndpointId: String?,
+        presentationPaused: Bool,
+        effectiveSpeakerVideoEndpointId: String?,
+        state: State,
+        muteState: GroupCallParticipantsContext.Participant.MuteState?,
+        canManageCall: Bool,
+        volume: Int32?,
+        raisedHand: Bool,
+        displayRaisedHandStatus: Bool,
+        active: Bool,
+        isLandscape: Bool
+    ) {
+        self.peer = peer
+        self.about = about
+        self.isMyPeer = isMyPeer
+        self.videoEndpointId = videoEndpointId
+        self.videoPaused = videoPaused
+        self.presentationEndpointId = presentationEndpointId
+        self.presentationPaused = presentationPaused
+        self.effectiveSpeakerVideoEndpointId = effectiveSpeakerVideoEndpointId
+        self.state = state
+        self.muteState = muteState
+        self.canManageCall = canManageCall
+        self.volume = volume
+        self.raisedHand = raisedHand
+        self.displayRaisedHandStatus = displayRaisedHandStatus
+        self.active = active
+        self.isLandscape = isLandscape
     }
     
-    override func didLoad() {
-        super.didLoad()
-        
-        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap)))
+    var stableId: PeerId {
+        return self.peer.id
     }
     
-    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
-        if point.y > 0.0 && point.y < self.frame.size.height && point.x > min(self.titleNode.frame.minX, self.infoNode.frame.minX) && point.x < max(self.recordingIconNode.frame.maxX, self.infoNode.frame.maxX) {
-            return true
-        } else {
+    static func ==(lhs: VoiceChatPeerEntry, rhs: VoiceChatPeerEntry) -> Bool {
+        if !lhs.peer.isEqual(rhs.peer) {
             return false
         }
-    }
-    
-    @objc private func tap() {
-        self.tapped?()
-    }
-    
-    func update(size: CGSize, title: String, subtitle: String, transition: ContainedViewLayoutTransition) {
-        var titleUpdated = false
-        if let previousTitle = self.titleNode.attributedText?.string {
-            titleUpdated = previousTitle != title
+        if lhs.about != rhs.about {
+            return false
         }
-        
-        if titleUpdated, let snapshotView = self.titleNode.view.snapshotContentTree() {
-            snapshotView.frame = self.titleNode.frame
-            self.view.addSubview(snapshotView)
-            
-            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                snapshotView?.removeFromSuperview()
-            })
-            
-            self.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+        if lhs.isMyPeer != rhs.isMyPeer {
+            return false
         }
-        
-        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: UIColor(rgb: 0xffffff))
-        self.infoNode.attributedText = NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: UIColor(rgb: 0xffffff, alpha: 0.5))
-        
-        let constrainedSize = CGSize(width: size.width - 120.0, height: size.height)
-        let titleSize = self.titleNode.measure(constrainedSize)
-        let infoSize = self.infoNode.measure(constrainedSize)
-        let titleInfoSpacing: CGFloat = 0.0
-        
-        let combinedHeight = titleSize.height + infoSize.height + titleInfoSpacing
-        
-        let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0)), size: titleSize)
-        self.titleNode.frame = titleFrame
-        self.infoNode.frame = CGRect(origin: CGPoint(x: floor((size.width - infoSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0) + titleSize.height + titleInfoSpacing), size: infoSize)
-        
-        let iconSide = 16.0 + (1.0 + UIScreenPixel) * 2.0
-        let iconSize: CGSize = CGSize(width: iconSide, height: iconSide)
-        self.recordingIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 1.0, y: titleFrame.minY + 1.0), size: iconSize)
-    }
-}
-
-final class GroupVideoNode: ASDisplayNode {
-    private let videoViewContainer: UIView
-    private let videoView: PresentationCallVideoView
-    
-    private var validLayout: CGSize?
-    
-    var tapped: (() -> Void)?
-    
-    init(videoView: PresentationCallVideoView) {
-        self.videoViewContainer = UIView()
-        self.videoView = videoView
-        
-        super.init()
-        
-        self.videoViewContainer.addSubview(self.videoView.view)
-        self.view.addSubview(self.videoViewContainer)
-        
-        videoView.setOnFirstFrameReceived({ [weak self] _ in
-            Queue.mainQueue().async {
-                guard let strongSelf = self else {
-                    return
-                }
-                if let size = strongSelf.validLayout {
-                    strongSelf.updateLayout(size: size, transition: .immediate)
-                }
-            }
-        })
-        
-        videoView.setOnOrientationUpdated({ [weak self] _, _ in
-            Queue.mainQueue().async {
-                guard let strongSelf = self else {
-                    return
-                }
-                if let size = strongSelf.validLayout {
-                    strongSelf.updateLayout(size: size, transition: .immediate)
-                }
-            }
-        })
-        
-        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
-    }
-    
-    @objc private func tapGesture(_ recognizer: UITapGestureRecognizer) {
-        if case .ended = recognizer.state {
-            self.tapped?()
+        if lhs.videoEndpointId != rhs.videoEndpointId {
+            return false
         }
-    }
-    
-    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
-        self.validLayout = size
-        self.videoViewContainer.frame = CGRect(origin: CGPoint(), size: size)
-        
-        let orientation = self.videoView.getOrientation()
-        var aspect = self.videoView.getAspect()
-        if aspect <= 0.01 {
-            aspect = 3.0 / 4.0
+        if lhs.videoPaused != rhs.videoPaused {
+            return false
         }
-        
-        let rotatedAspect: CGFloat
-        let angle: CGFloat
-        let switchOrientation: Bool
-        switch orientation {
-        case .rotation0:
-            angle = 0.0
-            rotatedAspect = 1 / aspect
-            switchOrientation = false
-        case .rotation90:
-            angle = CGFloat.pi / 2.0
-            rotatedAspect = aspect
-            switchOrientation = true
-        case .rotation180:
-            angle = CGFloat.pi
-            rotatedAspect = 1 / aspect
-            switchOrientation = false
-        case .rotation270:
-            angle = CGFloat.pi * 3.0 / 2.0
-            rotatedAspect = aspect
-            switchOrientation = true
+        if lhs.presentationEndpointId != rhs.presentationEndpointId {
+            return false
         }
-        
-        var rotatedVideoSize = CGSize(width: 100.0, height: rotatedAspect * 100.0)
-        
-        if size.width < 100.0 || true {
-            rotatedVideoSize = rotatedVideoSize.aspectFilled(size)
-        } else {
-            rotatedVideoSize = rotatedVideoSize.aspectFitted(size)
+        if lhs.presentationPaused != rhs.presentationPaused {
+            return false
         }
-        
-        if switchOrientation {
-            rotatedVideoSize = CGSize(width: rotatedVideoSize.height, height: rotatedVideoSize.width)
+        if lhs.effectiveSpeakerVideoEndpointId != rhs.effectiveSpeakerVideoEndpointId {
+            return false
         }
-        var rotatedVideoFrame = CGRect(origin: CGPoint(x: floor((size.width - rotatedVideoSize.width) / 2.0), y: floor((size.height - rotatedVideoSize.height) / 2.0)), size: rotatedVideoSize)
-        rotatedVideoFrame.origin.x = floor(rotatedVideoFrame.origin.x)
-        rotatedVideoFrame.origin.y = floor(rotatedVideoFrame.origin.y)
-        rotatedVideoFrame.size.width = ceil(rotatedVideoFrame.size.width)
-        rotatedVideoFrame.size.height = ceil(rotatedVideoFrame.size.height)
-        self.videoView.view.center = rotatedVideoFrame.center
-        self.videoView.view.bounds = CGRect(origin: CGPoint(), size: rotatedVideoFrame.size)
-        
-        let transition: ContainedViewLayoutTransition = .immediate
-        transition.updateTransformRotation(view: self.videoView.view, angle: angle)
-    }
-}
-
-private final class MainVideoContainerNode: ASDisplayNode {
-    private let context: AccountContext
-    private let call: PresentationGroupCall
-    
-    private var currentVideoNode: GroupVideoNode?
-    private var currentPeer: (PeerId, UInt32)?
-    
-    private var validLayout: CGSize?
-    
-    init(context: AccountContext, call: PresentationGroupCall) {
-        self.context = context
-        self.call = call
-        
-        super.init()
-        
-        self.backgroundColor = .black
-    }
-    
-    func updatePeer(peer: (peerId: PeerId, source: UInt32)?) {
-        if self.currentPeer?.0 == peer?.0 && self.currentPeer?.1 == peer?.1 {
-            return
+        if lhs.state != rhs.state {
+            return false
         }
-        self.currentPeer = peer
-        if let (_, source) = peer {
-            self.call.makeIncomingVideoView(source: source, completion: { [weak self] videoView in
-                Queue.mainQueue().async {
-                    guard let strongSelf = self, let videoView = videoView else {
-                        return
-                    }
-                    let videoNode = GroupVideoNode(videoView: videoView)
-                    if let currentVideoNode = strongSelf.currentVideoNode {
-                        currentVideoNode.removeFromSupernode()
-                        strongSelf.currentVideoNode = nil
-                    }
-                    strongSelf.currentVideoNode = videoNode
-                    strongSelf.addSubnode(videoNode)
-                    if let size = strongSelf.validLayout {
-                        strongSelf.update(size: size, transition: .immediate)
-                    }
-                }
-            })
-        } else {
-            if let currentVideoNode = self.currentVideoNode {
-                currentVideoNode.removeFromSupernode()
-                self.currentVideoNode = nil
-            }
+        if lhs.muteState != rhs.muteState {
+            return false
         }
-    }
-    
-    func update(size: CGSize, transition: ContainedViewLayoutTransition) {
-        self.validLayout = size
-        
-        if let currentVideoNode = self.currentVideoNode {
-            transition.updateFrame(node: currentVideoNode, frame: CGRect(origin: CGPoint(), size: size))
-            currentVideoNode.updateLayout(size: size, transition: .immediate)
+        if lhs.canManageCall != rhs.canManageCall {
+            return false
         }
+        if lhs.volume != rhs.volume {
+            return false
+        }
+        if lhs.raisedHand != rhs.raisedHand {
+            return false
+        }
+        if lhs.displayRaisedHandStatus != rhs.displayRaisedHandStatus {
+            return false
+        }
+        if lhs.active != rhs.active {
+            return false
+        }
+        if lhs.isLandscape != rhs.isLandscape {
+            return false
+        }
+        return true
     }
 }
 
 public final class VoiceChatController: ViewController {
-    private final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate {
+    enum DisplayMode {
+        case modal(isExpanded: Bool, isFilled: Bool)
+        case fullscreen(controlsHidden: Bool)
+    }
+    
+    fileprivate final class Node: ViewControllerTracingNode, UIGestureRecognizerDelegate {
         private struct ListTransition {
             let deletions: [ListViewDeleteItem]
             let insertions: [ListViewInsertItem]
@@ -334,33 +280,29 @@ public final class VoiceChatController: ViewController {
             let animated: Bool
         }
         
-        private struct State: Equatable {
-            var revealedPeerId: PeerId?
-        }
-        
         private final class Interaction {
             let updateIsMuted: (PeerId, Bool) -> Void
-            let openPeer: (PeerId) -> Void
+            let switchToPeer: (PeerId, String?, Bool) -> Void
             let openInvite: () -> Void
-            let peerContextAction: (PeerEntry, ASDisplayNode, ContextGesture?) -> Void
-            let setPeerIdWithRevealedOptions: (PeerId?, PeerId?) -> Void
-            let getPeerVideo: (UInt32) -> GroupVideoNode?
+            let peerContextAction: (VoiceChatPeerEntry, ASDisplayNode, ContextGesture?, Bool) -> Void
+            let getPeerVideo: (String, GroupVideoNode.Position) -> GroupVideoNode?
+            var isExpanded: Bool = false
             
             private var audioLevels: [PeerId: ValuePipe<Float>] = [:]
             
+            var updateAvatarPromise = Promise<(TelegramMediaImageRepresentation, Float)?>(nil)
+            
             init(
                 updateIsMuted: @escaping (PeerId, Bool) -> Void,
-                openPeer: @escaping (PeerId) -> Void,
+                switchToPeer: @escaping (PeerId, String?, Bool) -> Void,
                 openInvite: @escaping () -> Void,
-                peerContextAction: @escaping (PeerEntry, ASDisplayNode, ContextGesture?) -> Void,
-                setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void,
-                getPeerVideo: @escaping (UInt32) -> GroupVideoNode?
+                peerContextAction: @escaping (VoiceChatPeerEntry, ASDisplayNode, ContextGesture?, Bool) -> Void,
+                getPeerVideo: @escaping (String, GroupVideoNode.Position) -> GroupVideoNode?
             ) {
                 self.updateIsMuted = updateIsMuted
-                self.openPeer = openPeer
+                self.switchToPeer = switchToPeer
                 self.openInvite = openInvite
                 self.peerContextAction = peerContextAction
-                self.setPeerIdWithRevealedOptions = setPeerIdWithRevealedOptions
                 self.getPeerVideo = getPeerVideo
             }
             
@@ -401,84 +343,8 @@ public final class VoiceChatController: ViewController {
             }
         }
         
-        private struct PeerEntry: Comparable, Identifiable {
-            enum State {
-                case listening
-                case speaking
-                case invited
-                case raisedHand
-            }
-            
-            var peer: Peer
-            var about: String?
-            var isMyPeer: Bool
-            var ssrc: UInt32?
-            var presence: TelegramUserPresence?
-            var activityTimestamp: Int32
-            var state: State
-            var muteState: GroupCallParticipantsContext.Participant.MuteState?
-            var revealed: Bool?
-            var canManageCall: Bool
-            var volume: Int32?
-            var raisedHand: Bool
-            var displayRaisedHandStatus: Bool
-            
-            var stableId: PeerId {
-                return self.peer.id
-            }
-            
-            static func ==(lhs: PeerEntry, rhs: PeerEntry) -> Bool {
-                if !lhs.peer.isEqual(rhs.peer) {
-                    return false
-                }
-                if lhs.about != rhs.about {
-                    return false
-                }
-                if lhs.isMyPeer != rhs.isMyPeer {
-                    return false
-                }
-                if lhs.ssrc != rhs.ssrc {
-                    return false
-                }
-                if lhs.presence != rhs.presence {
-                    return false
-                }
-                if lhs.activityTimestamp != rhs.activityTimestamp {
-                    return false
-                }
-                if lhs.state != rhs.state {
-                    return false
-                }
-                if lhs.muteState != rhs.muteState {
-                    return false
-                }
-                if lhs.revealed != rhs.revealed {
-                    return false
-                }
-                if lhs.canManageCall != rhs.canManageCall {
-                    return false
-                }
-                if lhs.volume != rhs.volume {
-                    return false
-                }
-                if lhs.raisedHand != rhs.raisedHand {
-                    return false
-                }
-                if lhs.displayRaisedHandStatus != rhs.displayRaisedHandStatus {
-                    return false
-                }
-                return true
-            }
-            
-            static func <(lhs: PeerEntry, rhs: PeerEntry) -> Bool {
-                if lhs.activityTimestamp != rhs.activityTimestamp {
-                    return lhs.activityTimestamp > rhs.activityTimestamp
-                }
-                return lhs.peer.id < rhs.peer.id
-            }
-        }
-        
         private enum EntryId: Hashable {
+            case tiles
             case invite
             case peerId(PeerId)
             
@@ -488,6 +354,13 @@ public final class VoiceChatController: ViewController {
             
             static func ==(lhs: EntryId, rhs: EntryId) -> Bool {
                 switch lhs {
+                    case .tiles:
+                        switch rhs {
+                            case .tiles:
+                                return true
+                            default:
+                                return false
+                        }
                     case .invite:
                         switch rhs {
                             case .invite:
@@ -507,30 +380,39 @@ public final class VoiceChatController: ViewController {
         }
         
         private enum ListEntry: Comparable, Identifiable {
-            case invite(PresentationTheme, PresentationStrings, String)
-            case peer(PeerEntry)
+            case tiles([VoiceChatTileItem], VoiceChatTileLayoutMode)
+            case invite(PresentationTheme, PresentationStrings, String, Bool)
+            case peer(VoiceChatPeerEntry, Int32)
             
             var stableId: EntryId {
                 switch self {
+                    case .tiles:
+                        return .tiles
                     case .invite:
                         return .invite
-                    case let .peer(peerEntry):
+                    case let .peer(peerEntry, _):
                         return .peerId(peerEntry.peer.id)
                 }
             }
             
             static func ==(lhs: ListEntry, rhs: ListEntry) -> Bool {
                 switch lhs {
-                    case let .invite(lhsTheme, lhsStrings, lhsText):
-                        if case let .invite(rhsTheme, rhsStrings, rhsText) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText {
+                    case let .tiles(lhsTiles, lhsLayoutMode):
+                        if case let .tiles(rhsTiles, rhsLayoutMode) = rhs, lhsTiles == rhsTiles, lhsLayoutMode == rhsLayoutMode {
                             return true
                         } else {
                             return false
                         }
-                    case let .peer(lhsPeerEntry):
+                    case let .invite(lhsTheme, lhsStrings, lhsText, lhsIsLink):
+                        if case let .invite(rhsTheme, rhsStrings, rhsText, rhsIsLink) = rhs, lhsTheme === rhsTheme, lhsStrings === rhsStrings, lhsText == rhsText, lhsIsLink == rhsIsLink {
+                            return true
+                        } else {
+                            return false
+                        }
+                    case let .peer(lhsPeerEntry, lhsIndex):
                         switch rhs {
-                            case let .peer(rhsPeerEntry):
-                                return lhsPeerEntry == rhsPeerEntry
+                            case let .peer(rhsPeerEntry, rhsIndex):
+                                return lhsPeerEntry == rhsPeerEntry && lhsIndex == rhsIndex
                             default:
                                 return false
                         }
@@ -539,38 +421,272 @@ public final class VoiceChatController: ViewController {
 
             static func <(lhs: ListEntry, rhs: ListEntry) -> Bool {
                 switch lhs {
-                    case .invite:
+                    case .tiles:
                         return true
-                    case let .peer(lhsPeerEntry):
+                    case .invite:
+                        return false
+                    case let .peer(_, lhsIndex):
                         switch rhs {
-                            case .invite:
+                            case .tiles:
                                 return false
-                            case let .peer(rhsPeerEntry):
-                                return lhsPeerEntry < rhsPeerEntry
+                            case let .peer(_, rhsIndex):
+                                return lhsIndex < rhsIndex
+                            case .invite:
+                                return true
                         }
                 }
             }
             
+            func tileItem(context: AccountContext, presentationData: PresentationData, interaction: Interaction, isTablet: Bool, videoEndpointId: String, videoReady: Bool, videoTimeouted: Bool, videoIsPaused: Bool, showAsPresentation: Bool, secondary: Bool) -> VoiceChatTileItem? {
+                guard case let .peer(peerEntry, _) = self else {
+                    return nil
+                }
+                let peer = peerEntry.peer
+                
+                let icon: VoiceChatTileItem.Icon
+                var text: VoiceChatParticipantItem.ParticipantText
+                var additionalText: VoiceChatParticipantItem.ParticipantText?
+                var speaking = false
+                                
+                var textIcon = VoiceChatParticipantItem.ParticipantText.TextIcon()
+                let yourText: String
+                if (peerEntry.about?.isEmpty ?? true) && peer.smallProfileImage == nil {
+                    yourText = presentationData.strings.VoiceChat_TapToAddPhotoOrBio
+                } else if peer.smallProfileImage == nil {
+                    yourText = presentationData.strings.VoiceChat_TapToAddPhoto
+                } else if (peerEntry.about?.isEmpty ?? true) {
+                    yourText = presentationData.strings.VoiceChat_TapToAddBio
+                } else {
+                    yourText = presentationData.strings.VoiceChat_You
+                }
+                
+                var state = peerEntry.state
+                if let muteState = peerEntry.muteState, case .speaking = state, muteState.mutedByYou || !muteState.canUnmute {
+                    state = .listening
+                }
+                switch state {
+                case .listening:
+                    if peerEntry.isMyPeer {
+                        text = .text(yourText, textIcon, .accent)
+                    } else if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                        text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                    } else if let about = peerEntry.about, !about.isEmpty {
+                        text = .text(about, textIcon, .generic)
+                    } else {
+                        text = .text(presentationData.strings.VoiceChat_StatusListening, textIcon, .generic)
+                    }
+                    if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                        icon = .microphone(true)
+                        additionalText = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                    } else {
+                        icon = .microphone(peerEntry.muteState != nil)
+                    }
+                case .speaking:
+                    if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                        text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                        icon = .microphone(true)
+                        additionalText = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                    } else {
+                        if peerEntry.volume != nil {
+                            textIcon.insert(.volume)
+                        }
+                        let volumeValue = peerEntry.volume.flatMap { $0 / 100 }
+                        if let volume = volumeValue, volume != 100 {
+                            text = .text( presentationData.strings.VoiceChat_StatusSpeakingVolume("\(volume)%").0, textIcon, .constructive)
+                        } else {
+                            text = .text(presentationData.strings.VoiceChat_StatusSpeaking, textIcon, .constructive)
+                        }
+                        icon = .microphone(false)
+                        speaking = true
+                    }
+                case .raisedHand, .invited:
+                    text = .none
+                    icon = .none
+                }
+                
+                if let about = peerEntry.about, !about.isEmpty {
+                    textIcon = []
+                    text = .text(about, textIcon, .generic)
+                }
+                
+                return VoiceChatTileItem(account: context.account, peer: peerEntry.peer, videoEndpointId: videoEndpointId, videoReady: videoReady, videoTimeouted: videoTimeouted, isVideoLimit: false, videoLimit: 0, isPaused: videoIsPaused, isOwnScreencast: peerEntry.presentationEndpointId == videoEndpointId && peerEntry.isMyPeer, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, speaking: speaking, secondary: secondary, isTablet: isTablet, icon: showAsPresentation ? .presentation : icon, text: text, additionalText: additionalText, action: {
+                    interaction.switchToPeer(peer.id, videoEndpointId, !secondary)
+                }, contextAction: { node, gesture in
+                    interaction.peerContextAction(peerEntry, node, gesture, false)
+                }, getVideo: { position in
+                    return interaction.getPeerVideo(videoEndpointId, position)
+                }, getAudioLevel: {
+                    return interaction.getAudioLevel(peerEntry.peer.id)
+                })
+            }
+            
+            func fullscreenItem(context: AccountContext, presentationData: PresentationData, interaction: Interaction) -> ListViewItem {
+                switch self {
+                    case .tiles:
+                        return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: "", icon: .none, action: {
+                        })
+                    case .invite:
+                        return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: "", icon: .generic(UIImage(bundleImageName: "Chat/Context Menu/AddUser")!), action: {
+                            interaction.openInvite()
+                        })
+                    case let .peer(peerEntry, _):
+                        let peer = peerEntry.peer
+                        var textColor: VoiceChatFullscreenParticipantItem.Color = .generic
+                        var color: VoiceChatFullscreenParticipantItem.Color = .generic
+                        let icon: VoiceChatFullscreenParticipantItem.Icon
+                        var text: VoiceChatParticipantItem.ParticipantText
+                        
+                        var textIcon = VoiceChatParticipantItem.ParticipantText.TextIcon()
+                        let yourText: String
+                        if (peerEntry.about?.isEmpty ?? true) && peer.smallProfileImage == nil {
+                            yourText = presentationData.strings.VoiceChat_TapToAddPhotoOrBio
+                        } else if peer.smallProfileImage == nil {
+                            yourText = presentationData.strings.VoiceChat_TapToAddPhoto
+                        } else if (peerEntry.about?.isEmpty ?? true) {
+                            yourText = presentationData.strings.VoiceChat_TapToAddBio
+                        } else {
+                            yourText = presentationData.strings.VoiceChat_You
+                        }
+                            
+                        var state = peerEntry.state
+                        if let muteState = peerEntry.muteState, case .speaking = state, muteState.mutedByYou || !muteState.canUnmute {
+                            state = .listening
+                        }
+                        switch state {
+                        case .listening:
+                            if peerEntry.isMyPeer {
+                                text = .text(yourText, textIcon, .accent)
+                            } else if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                            } else if let about = peerEntry.about, !about.isEmpty {
+                                text = .text(about, textIcon, .generic)
+                            } else {
+                                text = .text(presentationData.strings.VoiceChat_StatusListening, textIcon, .generic)
+                            }
+                            if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                                textColor = .destructive
+                                color = .destructive
+                                icon = .microphone(true, UIColor(rgb: 0xff3b30))
+                            } else {
+                                icon = .microphone(peerEntry.muteState != nil, UIColor.white)
+                                color = .accent
+                            }
+                        case .speaking:
+                            if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
+                                textColor = .destructive
+                                color = .destructive
+                                icon = .microphone(true, UIColor(rgb: 0xff3b30))
+                            } else {
+                                if peerEntry.volume != nil {
+                                    textIcon.insert(.volume)
+                                }
+                                let volumeValue = peerEntry.volume.flatMap { $0 / 100 }
+                                if let volume = volumeValue, volume != 100 {
+                                    text = .text( presentationData.strings.VoiceChat_StatusSpeakingVolume("\(volume)%").0, textIcon, .constructive)
+                                } else {
+                                    text = .text(presentationData.strings.VoiceChat_StatusSpeaking, textIcon, .constructive)
+                                }
+                                icon = .microphone(false, UIColor(rgb: 0x34c759))
+                                textColor = .constructive
+                                color = .constructive
+                            }
+                        case .raisedHand:
+                            text = .none
+                            textColor = .accent
+                            icon = .wantsToSpeak
+                        case .invited:
+                            text = .none
+                            icon = .none
+                        }
+                        
+                        if let about = peerEntry.about, !about.isEmpty {
+                            textIcon = []
+                            text = .text(about, textIcon, .generic)
+                        }
+                        
+                        var videoEndpointId = peerEntry.effectiveVideoEndpointId
+                        var otherVideoEndpointId: String?
+                        let hasBothVideos = peerEntry.presentationEndpointId != nil && peerEntry.videoEndpointId != nil
+                        if hasBothVideos {
+                            if let effectiveVideoEndpointId = peerEntry.effectiveSpeakerVideoEndpointId {
+                                if effectiveVideoEndpointId == peerEntry.videoEndpointId {
+                                    videoEndpointId = peerEntry.presentationEndpointId
+                                    otherVideoEndpointId = videoEndpointId
+                                } else if effectiveVideoEndpointId == peerEntry.presentationEndpointId {
+                                    videoEndpointId = peerEntry.videoEndpointId
+                                    otherVideoEndpointId = videoEndpointId
+                                }
+                            }
+                        }
+                        
+                        var isPaused = false
+                        if videoEndpointId == peerEntry.videoEndpointId {
+                            isPaused = peerEntry.videoPaused
+                        } else if videoEndpointId == peerEntry.presentationEndpointId {
+                            isPaused = peerEntry.presentationPaused
+                        }
+                        
+                        return VoiceChatFullscreenParticipantItem(presentationData: ItemListPresentationData(presentationData), nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: peerEntry.peer, videoEndpointId: videoEndpointId, isPaused: isPaused, icon: icon, text: text, textColor: textColor, color: color, isLandscape: peerEntry.isLandscape, active: peerEntry.active, showVideoWhenActive: otherVideoEndpointId != nil, getAudioLevel: { return interaction.getAudioLevel(peerEntry.peer.id) }, getVideo: {
+                            if let videoEndpointId = videoEndpointId {
+                                return interaction.getPeerVideo(videoEndpointId, .list)
+                            } else {
+                                return nil
+                            }
+                        }, action: { _ in
+                            interaction.switchToPeer(peerEntry.peer.id, otherVideoEndpointId, false)
+                        }, contextAction: { node, gesture in
+                            interaction.peerContextAction(peerEntry, node, gesture, true)
+                        }, getUpdatingAvatar: {
+                            return interaction.updateAvatarPromise.get()
+                        })
+                }
+            }
+            
             func item(context: AccountContext, presentationData: PresentationData, interaction: Interaction) -> ListViewItem {
                 switch self {
-                    case let .invite(_, _, text):
-                        return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .generic(UIImage(bundleImageName: "Chat/Context Menu/AddUser")!), action: {
+                    case let .tiles(tiles, layoutMode):
+                        return VoiceChatTilesGridItem(context: context, tiles: tiles, layoutMode: layoutMode, getIsExpanded: {
+                            return interaction.isExpanded
+                        })
+                    case let .invite(_, _, text, isLink):
+                        return VoiceChatActionItem(presentationData: ItemListPresentationData(presentationData), title: text, icon: .generic(UIImage(bundleImageName: isLink ? "Chat/Context Menu/Link" : "Chat/Context Menu/AddUser")!), action: {
                             interaction.openInvite()
                         })
-                    case let .peer(peerEntry):
+                    case let .peer(peerEntry, _):
                         let peer = peerEntry.peer
-                        
+                            
                         var text: VoiceChatParticipantItem.ParticipantText
                         var expandedText: VoiceChatParticipantItem.ParticipantText?
                         let icon: VoiceChatParticipantItem.Icon
-                        switch peerEntry.state {
+                        
+                        var state = peerEntry.state
+                        if let muteState = peerEntry.muteState, case .speaking = state, muteState.mutedByYou || !muteState.canUnmute {
+                            state = .listening
+                        }
+                        
+                        var textIcon = VoiceChatParticipantItem.ParticipantText.TextIcon()
+                        let yourText: String
+                        if (peerEntry.about?.isEmpty ?? true) && peer.smallProfileImage == nil {
+                            yourText = presentationData.strings.VoiceChat_TapToAddPhotoOrBio
+                        } else if peer.smallProfileImage == nil {
+                            yourText = presentationData.strings.VoiceChat_TapToAddPhoto
+                        } else if (peerEntry.about?.isEmpty ?? true) {
+                            yourText = presentationData.strings.VoiceChat_TapToAddBio
+                        } else {
+                            yourText = presentationData.strings.VoiceChat_You
+                        }
+                        
+                        switch state {
                         case .listening:
-                            if let muteState = peerEntry.muteState, muteState.mutedByYou {
-                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, .destructive)
+                            if peerEntry.isMyPeer {
+                                text = .text(yourText, textIcon, .accent)
+                            } else if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
                             } else if let about = peerEntry.about, !about.isEmpty {
-                                text = .text(about, .generic)
+                                text = .text(about, textIcon, .generic)
                             } else {
-                                text = .text(presentationData.strings.VoiceChat_StatusListening, .generic)
+                                text = .text(presentationData.strings.VoiceChat_StatusListening, textIcon, .generic)
                             }
                             let microphoneColor: UIColor
                             if let muteState = peerEntry.muteState, !muteState.canUnmute || muteState.mutedByYou {
@@ -581,46 +697,50 @@ public final class VoiceChatController: ViewController {
                             icon = .microphone(peerEntry.muteState != nil, microphoneColor)
                         case .speaking:
                             if let muteState = peerEntry.muteState, muteState.mutedByYou {
-                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, .destructive)
+                                text = .text(presentationData.strings.VoiceChat_StatusMutedForYou, textIcon, .destructive)
                                 icon = .microphone(true, UIColor(rgb: 0xff3b30))
                             } else {
+                                if peerEntry.volume != nil {
+                                    textIcon.insert(.volume)
+                                }
                                 let volumeValue = peerEntry.volume.flatMap { $0 / 100 }
                                 if let volume = volumeValue, volume != 100 {
-                                    text = .text( presentationData.strings.VoiceChat_StatusSpeakingVolume("\(volume)%").0, .constructive)
+                                    text = .text( presentationData.strings.VoiceChat_StatusSpeakingVolume("\(volume)%").0, textIcon, .constructive)
                                 } else {
-                                    text = .text(presentationData.strings.VoiceChat_StatusSpeaking, .constructive)
+                                    text = .text(presentationData.strings.VoiceChat_StatusSpeaking, textIcon, .constructive)
                                 }
                                 icon = .microphone(false, UIColor(rgb: 0x34c759))
                             }
                         case .invited:
-                            text = .text(presentationData.strings.VoiceChat_StatusInvited, .generic)
+                            text = .text(presentationData.strings.VoiceChat_StatusInvited, textIcon, .generic)
                             icon = .invite(true)
                         case .raisedHand:
-                            if let about = peerEntry.about, !about.isEmpty && !peerEntry.displayRaisedHandStatus {
-                                text = .text(about, .generic)
+                            if peerEntry.isMyPeer && !peerEntry.displayRaisedHandStatus {
+                                text = .text(yourText, textIcon, .accent)
+                            } else if let about = peerEntry.about, !about.isEmpty && !peerEntry.displayRaisedHandStatus {
+                                text = .text(about, textIcon, .generic)
                             } else {
-                                text = .text(presentationData.strings.VoiceChat_StatusWantsToSpeak, .accent)
+                                text = .text(presentationData.strings.VoiceChat_StatusWantsToSpeak, textIcon, .accent)
                             }
                             icon = .wantsToSpeak
                         }
                         
                         if let about = peerEntry.about, !about.isEmpty {
-                            expandedText = .text(about, .generic)
+                            textIcon = []
+                            expandedText = .text(about, textIcon, .generic)
                         }
-                                                
-                        let revealOptions: [VoiceChatParticipantItem.RevealOption] = []
-                        
-                        return VoiceChatParticipantItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: peer, ssrc: peerEntry.ssrc, presence: peerEntry.presence, text: text, expandedText: expandedText, icon: icon, enabled: true, selectable: !peerEntry.isMyPeer || peerEntry.canManageCall || peerEntry.raisedHand, getAudioLevel: { return interaction.getAudioLevel(peer.id) }, getVideo: {
-                            if let ssrc = peerEntry.ssrc {
-                                return interaction.getPeerVideo(ssrc)
-                            } else {
-                                return nil
+                                                                        
+                        return VoiceChatParticipantItem(presentationData: ItemListPresentationData(presentationData), dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, context: context, peer: peer, text: text, expandedText: expandedText, icon: icon, getAudioLevel: { return interaction.getAudioLevel(peer.id) }, action: { node in
+                            if let node = node {
+                                interaction.peerContextAction(peerEntry, node, nil, false)
                             }
-                        }, revealOptions: revealOptions, revealed: peerEntry.revealed, setPeerIdWithRevealedOptions: { peerId, fromPeerId in
-                            interaction.setPeerIdWithRevealedOptions(peerId, fromPeerId)
-                        }, action: { node in
-                            interaction.peerContextAction(peerEntry, node, nil)
-                        }, contextAction: nil)
+                        }, contextAction: { node, gesture in
+                            interaction.peerContextAction(peerEntry, node, gesture, false)
+                        }, getIsExpanded: {
+                            return interaction.isExpanded
+                        }, getUpdatingAvatar: {
+                            return interaction.updateAvatarPromise.get()
+                        })
                 }
             }
         }
@@ -635,6 +755,20 @@ public final class VoiceChatController: ViewController {
             return ListTransition(deletions: deletions, insertions: insertions, updates: updates, isLoading: isLoading, isEmpty: isEmpty, canInvite: canInvite, crossFade: crossFade, count: toEntries.count, animated: animated)
         }
         
+        private func preparedFullscreenTransition(from fromEntries: [ListEntry], to toEntries: [ListEntry], isLoading: Bool, isEmpty: Bool, canInvite: Bool, crossFade: Bool, animated: Bool, context: AccountContext, presentationData: PresentationData, interaction: Interaction) -> ListTransition {
+            let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
+            
+            let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
+            let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.fullscreenItem(context: context, presentationData: presentationData, interaction: interaction), directionHint: nil) }
+            let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.fullscreenItem(context: context, presentationData: presentationData, interaction: interaction), directionHint: nil) }
+            
+            return ListTransition(deletions: deletions, insertions: insertions, updates: updates, isLoading: isLoading, isEmpty: isEmpty, canInvite: canInvite, crossFade: crossFade, count: toEntries.count, animated: animated)
+        }
+        
+        private let currentAvatarMixin = Atomic<TGMediaAvatarMenuMixin?>(value: nil)
+        
+        private var configuration: VoiceChatConfiguration?
+        
         private weak var controller: VoiceChatController?
         private let sharedContext: SharedAccountContext
         private let context: AccountContext
@@ -646,54 +780,99 @@ public final class VoiceChatController: ViewController {
         private let dimNode: ASDisplayNode
         private let contentContainer: ASDisplayNode
         private let backgroundNode: ASDisplayNode
-        private var mainVideoContainer: MainVideoContainerNode?
+        private let listContainer: ASDisplayNode
         private let listNode: ListView
+        private let fullscreenListContainer: ASDisplayNode
+        private let fullscreenListNode: ListView
+        private let tileGridNode: VoiceChatTileGridNode
         private let topPanelNode: ASDisplayNode
         private let topPanelEdgeNode: ASDisplayNode
         private let topPanelBackgroundNode: ASDisplayNode
         private let optionsButton: VoiceChatHeaderButton
-        private var optionsButtonIsAvatar = false
         private let closeButton: VoiceChatHeaderButton
+        private let panelButton: VoiceChatHeaderButton
         private let topCornersNode: ASImageNode
         fileprivate let bottomPanelNode: ASDisplayNode
+        private let bottomGradientNode: ASDisplayNode
         private let bottomPanelBackgroundNode: ASDisplayNode
         private let bottomCornersNode: ASImageNode
-        fileprivate let audioOutputNode: CallControllerButtonItemNode
-        fileprivate let cameraButtonNode: CallControllerButtonItemNode
-        fileprivate let leaveNode: CallControllerButtonItemNode
+        fileprivate let audioButton: CallControllerButtonItemNode
+        fileprivate let cameraButton: CallControllerButtonItemNode
+        fileprivate let switchCameraButton: CallControllerButtonItemNode
+        fileprivate let leaveButton: CallControllerButtonItemNode
         fileprivate let actionButton: VoiceChatActionButton
         private let leftBorderNode: ASDisplayNode
         private let rightBorderNode: ASDisplayNode
+        private let mainStageContainerNode: ASDisplayNode
+        private let mainStageBackgroundNode: ASDisplayNode
+        private let mainStageNode: VoiceChatMainStageNode
+       
+        private let transitionMaskView: UIView
+        private let transitionMaskTopFillLayer: CALayer
+        private let transitionMaskFillLayer: CALayer
+        private let transitionMaskGradientLayer: CAGradientLayer
+        private let transitionMaskBottomFillLayer: CALayer
+        private let transitionContainerNode: ASDisplayNode
         
-        private let titleNode: VoiceChatControllerTitleNode
+        private var isScheduling = false
+        private let timerNode: VoiceChatTimerNode
+        private var pickerView: UIDatePicker?
+        private let dateFormatter: DateFormatter
+        private let scheduleTextNode: ImmediateTextNode
+        private let scheduleCancelButton: SolidRoundedButtonNode
+        private var scheduleButtonTitle = ""
+        
+        private let titleNode: VoiceChatTitleNode
         
         private var enqueuedTransitions: [ListTransition] = []
-        private var floatingHeaderOffset: CGFloat?
+        private var enqueuedFullscreenTransitions: [ListTransition] = []
         
         private var validLayout: (ContainerViewLayout, CGFloat)?
         private var didSetContentsReady: Bool = false
         private var didSetDataReady: Bool = false
         
+        private var isFirstTime = true
+        private var topInset: CGFloat?
+        
+        private var animatingInsertion = false
+        private var animatingExpansion = false
+        private var animatingAppearance = false
+        private var animatingButtonsSwap = false
+        private var animatingMainStage = false
+        private var animatingContextMenu = false
+        private var panGestureArguments: (topInset: CGFloat, offset: CGFloat)?
+        private var isPanning = false
+        
         private var peer: Peer?
         private var currentTitle: String = ""
         private var currentTitleIsCustom = false
         private var currentSubtitle: String = ""
+        private var currentSpeakingSubtitle: String?
         private var currentCallMembers: ([GroupCallParticipantsContext.Participant], String?)?
         private var currentInvitedPeers: [Peer]?
         private var currentSpeakingPeers: Set<PeerId>?
         private var currentContentOffset: CGFloat?
-        private var ignoreScrolling = false
-        private var currentAudioButtonColor: UIColor?
+        private var currentNormalButtonColor: UIColor?
+        private var currentActiveButtonColor: UIColor?
         
+        private var myEntry: VoiceChatPeerEntry?
+        private var mainEntry: VoiceChatPeerEntry?
         private var currentEntries: [ListEntry] = []
+        private var currentFullscreenEntries: [ListEntry] = []
+        private var currentTileItems: [VoiceChatTileItem] = []
+        private var displayPanelVideos = false
+        private var joinedVideo: Bool?
         
         private var peerViewDisposable: Disposable?
         private let leaveDisposable = MetaDisposable()
         
         private var isMutedDisposable: Disposable?
+        private var isNoiseSuppressionEnabled: Bool = true
+        private var isNoiseSuppressionEnabledDisposable: Disposable?
         private var callStateDisposable: Disposable?
         
         private var pushingToTalk = false
+        private var temporaryPushingToTalk = false
         private let hapticFeedback = HapticFeedback()
         
         private var callState: PresentationGroupCallState?
@@ -713,24 +892,21 @@ public final class VoiceChatController: ViewController {
         
         private var audioLevelsDisposable: Disposable?
         private var myAudioLevelDisposable: Disposable?
+        private var isSpeakingDisposable: Disposable?
         private var memberStatesDisposable: Disposable?
         private var actionButtonColorDisposable: Disposable?
         
         private var itemInteraction: Interaction?
                 
         private let inviteDisposable = MetaDisposable()
-        
         private let memberEventsDisposable = MetaDisposable()
         private let reconnectedAsEventsDisposable = MetaDisposable()
-        private let voiceSourcesDisposable = MetaDisposable()
+        private let stateVersionDisposable = MetaDisposable()
+        private var applicationStateDisposable: Disposable?
         
-        private var requestedVideoSources = Set<UInt32>()
-        private var videoNodes: [(PeerId, UInt32, GroupVideoNode)] = []
-
         private let displayAsPeersPromise = Promise<[FoundPeer]>([])
         private let inviteLinksPromise = Promise<GroupCallInviteLinks?>(nil)
         
-        
         private var raisedHandDisplayDisposables: [PeerId: Disposable] = [:]
         private var displayedRaisedHands = Set<PeerId>() {
             didSet {
@@ -739,14 +915,68 @@ public final class VoiceChatController: ViewController {
         }
         private let displayedRaisedHandsPromise = ValuePromise<Set<PeerId>>(Set())
         
-        private var currentDominantSpeakerWithVideo: (PeerId, UInt32)?
+        private var requestedVideoSources = Set<String>()
+        private var requestedVideoChannels: [PresentationGroupCallRequestedVideo] = []
+
+        private var videoRenderingContext: VideoRenderingContext
+        private var videoNodes: [String: GroupVideoNode] = [:]
+        private var wideVideoNodes = Set<String>()
+        private var videoOrder: [String] = []
+        private var readyVideoEndpointIds = Set<String>()
+        private var readyVideoEndpointIdsPromise = ValuePromise<Set<String>>(Set())
+        private var timeoutedEndpointIds = Set<String>()
+        private var readyVideoDisposables = DisposableDict<String>()
+        private var myPeerVideoReadyDisposable = MetaDisposable()
+        
+        private var peerIdToEndpointId: [PeerId: String] = [:]
+                
+        private var currentSpeakers: [PeerId] = []
+        private var currentDominantSpeaker: (PeerId, String?, Double)?
+        private var currentForcedSpeaker: (PeerId, String?)?
+        private var effectiveSpeaker: (PeerId, String?, Bool, Bool, Bool)?
+        
+        private var updateAvatarDisposable = MetaDisposable()
+        private let updateAvatarPromise = Promise<(TelegramMediaImageRepresentation, Float)?>(nil)
+        private var currentUpdatingAvatar: TelegramMediaImageRepresentation?
+        
+        private var connectedOnce = false
+        private var ignoreConnecting = false
+        private var ignoreConnectingTimer: SwiftSignalKit.Timer?
+        
+        private var displayUnmuteTooltipTimer: SwiftSignalKit.Timer?
+        private var dismissUnmuteTooltipTimer: SwiftSignalKit.Timer?
+        private var lastUnmuteTooltipDisplayTimestamp: Double?
+        
+        private var panelHidden = false
+        private var displayMode: DisplayMode = .modal(isExpanded: false, isFilled: false) {
+            didSet {
+                if case let .modal(isExpanded, _) = self.displayMode {
+                    self.itemInteraction?.isExpanded = isExpanded
+                } else {
+                    self.itemInteraction?.isExpanded = true
+                }
+            }
+        }
+                
+        private var isExpanded: Bool {
+            switch self.displayMode {
+                case .modal(true, _), .fullscreen:
+                    return true
+                default:
+                    return false
+            }
+        }
         
         init(controller: VoiceChatController, sharedContext: SharedAccountContext, call: PresentationGroupCall) {
             self.controller = controller
             self.sharedContext = sharedContext
             self.context = call.accountContext
             self.call = call
+
+            self.videoRenderingContext = VideoRenderingContext()
             
+            self.isScheduling = call.schedulePending
+                        
             let presentationData = sharedContext.currentPresentationData.with { $0 }
             self.presentationData = presentationData
             
@@ -754,20 +984,20 @@ public final class VoiceChatController: ViewController {
             self.currentSubtitle = self.presentationData.strings.SocksProxySetup_ProxyStatusConnecting
             
             self.dimNode = ASDisplayNode()
-            self.dimNode.backgroundColor = dimColor
+            self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
             
             self.contentContainer = ASDisplayNode()
             self.contentContainer.isHidden = true
             
             self.backgroundNode = ASDisplayNode()
-            self.backgroundNode.backgroundColor = secondaryPanelBackgroundColor
+            self.backgroundNode.backgroundColor = self.isScheduling ? panelBackgroundColor : secondaryPanelBackgroundColor
             self.backgroundNode.clipsToBounds = false
             
-            /*if false {
-                self.mainVideoContainer = MainVideoContainerNode(context: call.accountContext, call: call)
-            }*/
+            self.listContainer = ASDisplayNode()
             
             self.listNode = ListView()
+            self.listNode.alpha = self.isScheduling ? 0.0 : 1.0
+            self.listNode.isUserInteractionEnabled = !self.isScheduling
             self.listNode.verticalScrollIndicatorColor = UIColor(white: 1.0, alpha: 0.3)
             self.listNode.clipsToBounds = true
             self.listNode.scroller.bounces = false
@@ -775,6 +1005,18 @@ public final class VoiceChatController: ViewController {
                 return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
             }
             
+            self.fullscreenListContainer = ASDisplayNode()
+            self.fullscreenListContainer.isHidden = true
+            
+            self.fullscreenListNode = ListView()
+            self.fullscreenListNode.transform = CATransform3DMakeRotation(-CGFloat(CGFloat.pi / 2.0), 0.0, 0.0, 1.0)
+            self.fullscreenListNode.clipsToBounds = true
+            self.fullscreenListNode.accessibilityPageScrolledString = { row, count in
+                return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
+            }
+            
+            self.tileGridNode = VoiceChatTileGridNode(context: self.context)
+            
             self.topPanelNode = ASDisplayNode()
             self.topPanelNode.clipsToBounds = false
             
@@ -791,31 +1033,53 @@ public final class VoiceChatController: ViewController {
             }
             
             self.optionsButton = VoiceChatHeaderButton(context: self.context)
+            self.optionsButton.setContent(.more(optionsCircleImage(dark: false)))
             self.closeButton = VoiceChatHeaderButton(context: self.context)
             self.closeButton.setContent(.image(closeButtonImage(dark: false)))
+            self.panelButton = VoiceChatHeaderButton(context: self.context, wide: true)
+            self.panelButton.setContent(.image(panelButtonImage(dark: false)))
             
-            self.titleNode = VoiceChatControllerTitleNode(theme: self.presentationData.theme)
+            self.titleNode = VoiceChatTitleNode(theme: self.presentationData.theme)
             
             self.topCornersNode = ASImageNode()
             self.topCornersNode.displaysAsynchronously = false
             self.topCornersNode.displayWithoutProcessing = true
-            self.topCornersNode.image = cornersImage(top: true, bottom: false, dark: false)
-            
+            self.topCornersNode.image = decorationTopCornersImage(dark: false)
+            self.topCornersNode.isUserInteractionEnabled = false
+                
             self.bottomPanelNode = ASDisplayNode()
             self.bottomPanelNode.clipsToBounds = false
             
             self.bottomPanelBackgroundNode = ASDisplayNode()
             self.bottomPanelBackgroundNode.backgroundColor = panelBackgroundColor
+            self.bottomPanelBackgroundNode.isUserInteractionEnabled = false
+            
+            self.bottomGradientNode = ASDisplayNode()
+            self.bottomGradientNode.displaysAsynchronously = false
+            self.bottomGradientNode.backgroundColor = decorationBottomGradientImage(dark: false).flatMap { UIColor(patternImage: $0) }
             
             self.bottomCornersNode = ASImageNode()
             self.bottomCornersNode.displaysAsynchronously = false
             self.bottomCornersNode.displayWithoutProcessing = true
-            self.bottomCornersNode.image = cornersImage(top: false, bottom: true, dark: false)
+            self.bottomCornersNode.image = decorationBottomCornersImage(dark: false)
+            self.bottomCornersNode.isUserInteractionEnabled = false
             
-            self.audioOutputNode = CallControllerButtonItemNode()
-            self.cameraButtonNode = CallControllerButtonItemNode()
-            self.leaveNode = CallControllerButtonItemNode()
+            self.audioButton = CallControllerButtonItemNode()
+            self.cameraButton = CallControllerButtonItemNode(largeButtonSize: sideButtonSize.width)
+            self.switchCameraButton = CallControllerButtonItemNode()
+            self.switchCameraButton.alpha = 0.0
+            self.switchCameraButton.isUserInteractionEnabled = false
+            self.leaveButton = CallControllerButtonItemNode()
             self.actionButton = VoiceChatActionButton()
+            
+            if self.isScheduling {
+                self.cameraButton.alpha = 0.0
+                self.cameraButton.isUserInteractionEnabled = false
+                self.audioButton.alpha = 0.0
+                self.audioButton.isUserInteractionEnabled = false
+                self.leaveButton.alpha = 0.0
+                self.leaveButton.isUserInteractionEnabled = false
+            }
 
             self.leftBorderNode = ASDisplayNode()
             self.leftBorderNode.backgroundColor = panelBackgroundColor
@@ -827,23 +1091,83 @@ public final class VoiceChatController: ViewController {
             self.rightBorderNode.isUserInteractionEnabled = false
             self.rightBorderNode.clipsToBounds = false
             
-            super.init()
+            self.mainStageContainerNode = ASDisplayNode()
+            self.mainStageContainerNode.clipsToBounds = true
+            self.mainStageContainerNode.isUserInteractionEnabled = false
+            self.mainStageContainerNode.isHidden = true
             
-            let statePromise = ValuePromise(State(), ignoreRepeated: true)
-            let stateValue = Atomic(value: State())
-            let updateState: ((State) -> State) -> Void = { f in
-                statePromise.set(stateValue.modify { f($0) })
-            }
+            self.mainStageBackgroundNode = ASDisplayNode()
+            self.mainStageBackgroundNode.backgroundColor = .black
+            self.mainStageBackgroundNode.alpha = 0.0
+            self.mainStageBackgroundNode.isUserInteractionEnabled = false
+            
+            self.mainStageNode = VoiceChatMainStageNode(context: self.context, call: self.call)
+            
+            self.transitionMaskView = UIView()
+            self.transitionMaskTopFillLayer = CALayer()
+            self.transitionMaskTopFillLayer.backgroundColor = UIColor.white.cgColor
+            self.transitionMaskTopFillLayer.opacity = 0.0
+            
+            self.transitionMaskFillLayer = CALayer()
+            self.transitionMaskFillLayer.backgroundColor = UIColor.white.cgColor
+                        
+            self.transitionMaskGradientLayer = CAGradientLayer()
+            self.transitionMaskGradientLayer.colors = [UIColor.white.cgColor, UIColor.white.withAlphaComponent(0.0).cgColor]
+            self.transitionMaskGradientLayer.locations = [0.0, 1.0]
+            self.transitionMaskGradientLayer.startPoint = CGPoint(x: 0.0, y: 0.0)
+            self.transitionMaskGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0)
+            
+            self.transitionMaskBottomFillLayer = CALayer()
+            self.transitionMaskBottomFillLayer.backgroundColor = UIColor.white.cgColor
+            self.transitionMaskBottomFillLayer.opacity = 0.0
+            
+            self.transitionMaskView.layer.addSublayer(self.transitionMaskTopFillLayer)
+            self.transitionMaskView.layer.addSublayer(self.transitionMaskFillLayer)
+            self.transitionMaskView.layer.addSublayer(self.transitionMaskGradientLayer)
+            self.transitionMaskView.layer.addSublayer(self.transitionMaskBottomFillLayer)
+            
+            self.transitionContainerNode = ASDisplayNode()
+            self.transitionContainerNode.clipsToBounds = true
+            self.transitionContainerNode.isUserInteractionEnabled = false
+            self.transitionContainerNode.view.mask = self.transitionMaskView
+//            self.transitionContainerNode.view.addSubview(self.transitionMaskView)
+            
+            self.scheduleTextNode = ImmediateTextNode()
+            self.scheduleTextNode.isHidden = !self.isScheduling
+            self.scheduleTextNode.isUserInteractionEnabled = false
+            self.scheduleTextNode.textAlignment = .center
+            self.scheduleTextNode.maximumNumberOfLines = 4
+            
+            self.scheduleCancelButton = SolidRoundedButtonNode(title: self.presentationData.strings.Common_Cancel, theme: SolidRoundedButtonTheme(backgroundColor:  UIColor(rgb: 0x2b2b2f), foregroundColor: .white), height: 52.0, cornerRadius: 10.0)
+            self.scheduleCancelButton.isHidden = !self.isScheduling
+            
+            self.dateFormatter = DateFormatter()
+            self.dateFormatter.timeStyle = .none
+            self.dateFormatter.dateStyle = .short
+            self.dateFormatter.timeZone = TimeZone.current
+            
+            self.timerNode = VoiceChatTimerNode(strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat)
+            self.timerNode.isHidden = true
+            
+            super.init()
             
             let context = self.context
             let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(context.account.peerId)
             |> map { peer in
                 return [FoundPeer(peer: peer, subscribers: nil)]
             }
+
+            self.isNoiseSuppressionEnabledDisposable = (call.isNoiseSuppressionEnabled
+            |> deliverOnMainQueue).start(next: { [weak self] value in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.isNoiseSuppressionEnabled = value
+            })
             
             let displayAsPeers: Signal<[FoundPeer], NoError> = currentAccountPeer
             |> then(
-                combineLatest(currentAccountPeer, cachedGroupCallDisplayAsAvailablePeers(account: context.account, peerId: call.peerId))
+                combineLatest(currentAccountPeer, context.engine.calls.cachedGroupCallDisplayAsAvailablePeers(peerId: call.peerId))
                 |> map { currentAccountPeer, availablePeers -> [FoundPeer] in
                     var result = currentAccountPeer
                     result.append(contentsOf: availablePeers)
@@ -857,33 +1181,17 @@ public final class VoiceChatController: ViewController {
             
             self.itemInteraction = Interaction(updateIsMuted: { [weak self] peerId, isMuted in
                 let _ = self?.call.updateMuteState(peerId: peerId, isMuted: isMuted)
-            }, openPeer: { [weak self] peerId in
-                if let strongSelf = self {
-                    /*let context = strongSelf.context
-                    strongSelf.controller?.dismiss(completion: {
-                        Queue.mainQueue().justDispatch {
-                            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId), keepStack: .always, purposefulAction: {}, peekData: nil))
-                        }
-                    })*/
-                    for entry in strongSelf.currentEntries {
-                        switch entry {
-                        case let .peer(peer):
-                            if peer.peer.id == peerId {
-                                if let source = peer.ssrc {
-                                    if strongSelf.currentDominantSpeakerWithVideo?.0 != peerId || strongSelf.currentDominantSpeakerWithVideo?.1 != source {
-                                        strongSelf.currentDominantSpeakerWithVideo = (peerId, source)
-                                        strongSelf.call.setFullSizeVideo(peerId: peerId)
-                                        strongSelf.mainVideoContainer?.updatePeer(peer: (peerId: peerId, source: source))
-                                    } else {
-                                        strongSelf.currentDominantSpeakerWithVideo = nil
-                                        strongSelf.call.setFullSizeVideo(peerId: nil)
-                                        strongSelf.mainVideoContainer?.updatePeer(peer: nil)
-                                    }
-                                }
-                            }
-                        default:
-                            break
+            }, switchToPeer: { [weak self] peerId, videoEndpointId, expand in
+                if let strongSelf = self, strongSelf.connectedOnce {
+                    if expand, let videoEndpointId = videoEndpointId {
+                        strongSelf.currentDominantSpeaker = (peerId, videoEndpointId, CACurrentMediaTime() + 3.0)
+                        strongSelf.updateDisplayMode(.fullscreen(controlsHidden: false))
+                    } else {
+                        strongSelf.currentForcedSpeaker = nil
+                        if peerId != strongSelf.currentDominantSpeaker?.0 || (videoEndpointId != nil && videoEndpointId != strongSelf.currentDominantSpeaker?.1) {
+                            strongSelf.currentDominantSpeaker = (peerId, videoEndpointId, CACurrentMediaTime())
                         }
+                        strongSelf.updateMainVideo(waitForFullSize: true, updateMembers: true, force: true)
                     }
                 }
             }, openInvite: { [weak self] in
@@ -905,12 +1213,11 @@ public final class VoiceChatController: ViewController {
                     }
                     
                     if let groupPeer = groupPeer as? TelegramChannel {
-                        var canInvite = true
+                        var canInviteMembers = true
                         if case .broadcast = groupPeer.info, !(groupPeer.addressName?.isEmpty ?? true) {
-                            canInvite = false
+                            canInviteMembers = false
                         }
-                        
-                        if !canInvite {
+                        if !canInviteMembers {
                             if let inviteLinks = inviteLinks {
                                 strongSelf.presentShare(inviteLinks)
                             }
@@ -923,7 +1230,7 @@ public final class VoiceChatController: ViewController {
                         filters.append(.disable(Array(currentCallMembers.map { $0.peer.id })))
                     }
                     if let groupPeer = groupPeer as? TelegramChannel {
-                        if !groupPeer.hasPermission(.inviteMembers) {
+                        if !groupPeer.hasPermission(.inviteMembers) && inviteLinks?.listenerLink == nil {
                             filters.append(.excludeNonMembers)
                         }
                     } else if let groupPeer = groupPeer as? TelegramGroup {
@@ -941,7 +1248,6 @@ public final class VoiceChatController: ViewController {
                         }
                         
                         let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                        
                         if peer.id == strongSelf.callState?.myPeerId {
                             return
                         }
@@ -952,154 +1258,171 @@ public final class VoiceChatController: ViewController {
                                 strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: participant.peer, text: strongSelf.presentationData.strings.VoiceChat_InvitedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
                             }
                         } else {
-                            let text: String
-                            if let groupPeer = groupPeer as? TelegramChannel, case .broadcast = groupPeer.info {
-                                text = strongSelf.presentationData.strings.VoiceChat_InviteMemberToChannelFirstText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), groupPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0
+                            if let groupPeer = groupPeer as? TelegramChannel, let listenerLink = inviteLinks?.listenerLink, !groupPeer.hasPermission(.inviteMembers) {
+                                let text = strongSelf.presentationData.strings.VoiceChat_SendPublicLinkText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), groupPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0
+                                
+                                strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: text, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.VoiceChat_SendPublicLinkSend, action: { [weak self] in
+                                    dismissController?()
+                                    
+                                    if let strongSelf = self {
+                                        let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: listenerLink, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
+                                        |> deliverOnMainQueue).start(next: { [weak self] _ in
+                                            if let strongSelf = self {
+                                                strongSelf.presentUndoOverlay(content: .forward(savedMessages: false, text: strongSelf.presentationData.strings.UserInfo_LinkForwardTooltip_Chat_One(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return true })
+                                            }
+                                        })
+                                    }
+                                })]), in: .window(.root))
                             } else {
-                                text = strongSelf.presentationData.strings.VoiceChat_InviteMemberToGroupFirstText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), groupPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0
-                            }
-                            
-                            strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: text, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.VoiceChat_InviteMemberToGroupFirstAdd, action: {
-                                guard let strongSelf = self else {
-                                    return
+                                let text: String
+                                if let groupPeer = groupPeer as? TelegramChannel, case .broadcast = groupPeer.info {
+                                    text = strongSelf.presentationData.strings.VoiceChat_InviteMemberToChannelFirstText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), groupPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0
+                                } else {
+                                    text = strongSelf.presentationData.strings.VoiceChat_InviteMemberToGroupFirstText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), groupPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0
                                 }
                                 
-                                if let groupPeer = groupPeer as? TelegramChannel {
-                                    let selfController = strongSelf.controller
-                                    let inviteDisposable = strongSelf.inviteDisposable
-                                    var inviteSignal = strongSelf.context.peerChannelMemberCategoriesContextsManager.addMembers(account: strongSelf.context.account, peerId: groupPeer.id, memberIds: [peer.id])
-                                    var cancelImpl: (() -> Void)?
-                                    let progressSignal = Signal<Never, NoError> { [weak selfController] subscriber in
-                                        let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                                            cancelImpl?()
-                                        }))
-                                        selfController?.present(controller, in: .window(.root))
-                                        return ActionDisposable { [weak controller] in
-                                            Queue.mainQueue().async() {
-                                                controller?.dismiss()
-                                            }
-                                        }
-                                    }
-                                    |> runOn(Queue.mainQueue())
-                                    |> delay(0.15, queue: Queue.mainQueue())
-                                    let progressDisposable = progressSignal.start()
-                                    
-                                    inviteSignal = inviteSignal
-                                    |> afterDisposed {
-                                        Queue.mainQueue().async {
-                                            progressDisposable.dispose()
-                                        }
-                                    }
-                                    cancelImpl = {
-                                        inviteDisposable.set(nil)
+                                strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: text, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: presentationData.strings.VoiceChat_InviteMemberToGroupFirstAdd, action: {
+                                    guard let strongSelf = self else {
+                                        return
                                     }
                                     
-                                    inviteDisposable.set((inviteSignal |> deliverOnMainQueue).start(error: { error in
-                                        dismissController?()
-                                        guard let strongSelf = self else {
-                                            return
-                                        }
-                                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                        
-                                        let text: String
-                                        switch error {
-                                            case .limitExceeded:
-                                                text = presentationData.strings.Channel_ErrorAddTooMuch
-                                            case .tooMuchJoined:
-                                                text = presentationData.strings.Invite_ChannelsTooMuch
-                                            case .generic:
-                                                text = presentationData.strings.Login_UnknownError
-                                            case .restricted:
-                                                text = presentationData.strings.Channel_ErrorAddBlocked
-                                            case .notMutualContact:
-                                                if case .broadcast = groupPeer.info {
-                                                    text = presentationData.strings.Channel_AddUserLeftError
-                                                } else {
-                                                    text = presentationData.strings.GroupInfo_AddUserLeftError
+                                    if let groupPeer = groupPeer as? TelegramChannel {
+                                        let selfController = strongSelf.controller
+                                        let inviteDisposable = strongSelf.inviteDisposable
+                                        var inviteSignal = strongSelf.context.peerChannelMemberCategoriesContextsManager.addMembers(engine: strongSelf.context.engine, peerId: groupPeer.id, memberIds: [peer.id])
+                                        var cancelImpl: (() -> Void)?
+                                        let progressSignal = Signal<Never, NoError> { [weak selfController] subscriber in
+                                            let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                                                cancelImpl?()
+                                            }))
+                                            selfController?.present(controller, in: .window(.root))
+                                            return ActionDisposable { [weak controller] in
+                                                Queue.mainQueue().async() {
+                                                    controller?.dismiss()
                                                 }
-                                            case .botDoesntSupportGroups:
-                                                text = presentationData.strings.Channel_BotDoesntSupportGroups
-                                            case .tooMuchBots:
-                                                text = presentationData.strings.Channel_TooMuchBots
-                                            case .bot:
-                                                text = presentationData.strings.Login_UnknownError
-                                        }
-                                        strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                    }, completed: {
-                                        guard let strongSelf = self else {
-                                            dismissController?()
-                                            return
-                                        }
-                                        dismissController?()
-                                        
-                                        if strongSelf.call.invitePeer(peer.id) {
-                                            strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: peer, text: strongSelf.presentationData.strings.VoiceChat_InvitedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
-                                        }
-                                    }))
-                                } else if let groupPeer = groupPeer as? TelegramGroup {
-                                    let selfController = strongSelf.controller
-                                    let inviteDisposable = strongSelf.inviteDisposable
-                                    var inviteSignal = addGroupMember(account: strongSelf.context.account, peerId: groupPeer.id, memberId: peer.id)
-                                    var cancelImpl: (() -> Void)?
-                                    let progressSignal = Signal<Never, NoError> { [weak selfController] subscriber in
-                                        let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                                            cancelImpl?()
-                                        }))
-                                        selfController?.present(controller, in: .window(.root))
-                                        return ActionDisposable { [weak controller] in
-                                            Queue.mainQueue().async() {
-                                                controller?.dismiss()
                                             }
                                         }
-                                    }
-                                    |> runOn(Queue.mainQueue())
-                                    |> delay(0.15, queue: Queue.mainQueue())
-                                    let progressDisposable = progressSignal.start()
-                                    
-                                    inviteSignal = inviteSignal
-                                    |> afterDisposed {
-                                        Queue.mainQueue().async {
-                                            progressDisposable.dispose()
-                                        }
-                                    }
-                                    cancelImpl = {
-                                        inviteDisposable.set(nil)
-                                    }
-                                    
-                                    inviteDisposable.set((inviteSignal |> deliverOnMainQueue).start(error: { error in
-                                        dismissController?()
-                                        guard let strongSelf = self else {
-                                            return
-                                        }
-                                        let context = strongSelf.context
-                                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                        |> runOn(Queue.mainQueue())
+                                        |> delay(0.15, queue: Queue.mainQueue())
+                                        let progressDisposable = progressSignal.start()
                                         
-                                        switch error {
-                                        case .privacy:
-                                            let _ = (strongSelf.context.account.postbox.loadedPeerWithId(peer.id)
-                                            |> deliverOnMainQueue).start(next: { peer in
-                                                self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                            })
-                                        case .notMutualContact:
-                                            strongSelf.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                        case .tooManyChannels:
-                                            strongSelf.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                        case .groupFull, .generic:
-                                            strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                        inviteSignal = inviteSignal
+                                        |> afterDisposed {
+                                            Queue.mainQueue().async {
+                                                progressDisposable.dispose()
+                                            }
                                         }
-                                    }, completed: {
-                                        guard let strongSelf = self else {
+                                        cancelImpl = {
+                                            inviteDisposable.set(nil)
+                                        }
+                                        
+                                        inviteDisposable.set((inviteSignal |> deliverOnMainQueue).start(error: { error in
                                             dismissController?()
-                                            return
+                                            guard let strongSelf = self else {
+                                                return
+                                            }
+                                            let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                            
+                                            let text: String
+                                            switch error {
+                                                case .limitExceeded:
+                                                    text = presentationData.strings.Channel_ErrorAddTooMuch
+                                                case .tooMuchJoined:
+                                                    text = presentationData.strings.Invite_ChannelsTooMuch
+                                                case .generic:
+                                                    text = presentationData.strings.Login_UnknownError
+                                                case .restricted:
+                                                    text = presentationData.strings.Channel_ErrorAddBlocked
+                                                case .notMutualContact:
+                                                    if case .broadcast = groupPeer.info {
+                                                        text = presentationData.strings.Channel_AddUserLeftError
+                                                    } else {
+                                                        text = presentationData.strings.GroupInfo_AddUserLeftError
+                                                    }
+                                                case .botDoesntSupportGroups:
+                                                    text = presentationData.strings.Channel_BotDoesntSupportGroups
+                                                case .tooMuchBots:
+                                                    text = presentationData.strings.Channel_TooMuchBots
+                                                case .bot:
+                                                    text = presentationData.strings.Login_UnknownError
+                                            }
+                                            strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                        }, completed: {
+                                            guard let strongSelf = self else {
+                                                dismissController?()
+                                                return
+                                            }
+                                            dismissController?()
+                                            
+                                            if strongSelf.call.invitePeer(peer.id) {
+                                                strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: peer, text: strongSelf.presentationData.strings.VoiceChat_InvitedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
+                                            }
+                                        }))
+                                    } else if let groupPeer = groupPeer as? TelegramGroup {
+                                        let selfController = strongSelf.controller
+                                        let inviteDisposable = strongSelf.inviteDisposable
+                                        var inviteSignal = strongSelf.context.engine.peers.addGroupMember(peerId: groupPeer.id, memberId: peer.id)
+                                        var cancelImpl: (() -> Void)?
+                                        let progressSignal = Signal<Never, NoError> { [weak selfController] subscriber in
+                                            let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
+                                                cancelImpl?()
+                                            }))
+                                            selfController?.present(controller, in: .window(.root))
+                                            return ActionDisposable { [weak controller] in
+                                                Queue.mainQueue().async() {
+                                                    controller?.dismiss()
+                                                }
+                                            }
                                         }
-                                        dismissController?()
+                                        |> runOn(Queue.mainQueue())
+                                        |> delay(0.15, queue: Queue.mainQueue())
+                                        let progressDisposable = progressSignal.start()
                                         
-                                        if strongSelf.call.invitePeer(peer.id) {
-                                            strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: peer, text: strongSelf.presentationData.strings.VoiceChat_InvitedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
+                                        inviteSignal = inviteSignal
+                                        |> afterDisposed {
+                                            Queue.mainQueue().async {
+                                                progressDisposable.dispose()
+                                            }
                                         }
-                                    }))
-                                }
-                            })]), in: .window(.root))
+                                        cancelImpl = {
+                                            inviteDisposable.set(nil)
+                                        }
+                                        
+                                        inviteDisposable.set((inviteSignal |> deliverOnMainQueue).start(error: { error in
+                                            dismissController?()
+                                            guard let strongSelf = self else {
+                                                return
+                                            }
+                                            let context = strongSelf.context
+                                            let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                            
+                                            switch error {
+                                            case .privacy:
+                                                let _ = (strongSelf.context.account.postbox.loadedPeerWithId(peer.id)
+                                                |> deliverOnMainQueue).start(next: { peer in
+                                                    self?.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Privacy_GroupsAndChannels_InviteToGroupError(peer.compactDisplayTitle, peer.compactDisplayTitle).0, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                                })
+                                            case .notMutualContact:
+                                                strongSelf.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.GroupInfo_AddUserLeftError, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                            case .tooManyChannels:
+                                                strongSelf.controller?.present(textAlertController(context: context, title: nil, text: presentationData.strings.Invite_ChannelsTooMuch, actions: [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                            case .groupFull, .generic:
+                                                strongSelf.controller?.present(textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                                            }
+                                        }, completed: {
+                                            guard let strongSelf = self else {
+                                                dismissController?()
+                                                return
+                                            }
+                                            dismissController?()
+                                            
+                                            if strongSelf.call.invitePeer(peer.id) {
+                                                strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: peer, text: strongSelf.presentationData.strings.VoiceChat_InvitedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
+                                            }
+                                        }))
+                                    }
+                                })]), in: .window(.root))
+                            }
                         }
                     })
                     controller.copyInviteLink = {
@@ -1111,7 +1434,9 @@ public final class VoiceChatController: ViewController {
                         let callPeerId = strongSelf.call.peerId
                         
                         let _ = (strongSelf.context.account.postbox.transaction { transaction -> String? in
-                            if let peer = transaction.getPeer(callPeerId), let addressName = peer.addressName, !addressName.isEmpty {
+                            if let link = inviteLinks?.listenerLink {
+                                return link
+                            } else if let peer = transaction.getPeer(callPeerId), let addressName = peer.addressName, !addressName.isEmpty {
                                 return "https://t.me/\(addressName)"
                             } else if let cachedData = transaction.getPeerCachedData(peerId: callPeerId) {
                                 if let cachedData = cachedData as? CachedChannelData {
@@ -1139,46 +1464,46 @@ public final class VoiceChatController: ViewController {
                     }
                     strongSelf.controller?.push(controller)
                 })
-            }, peerContextAction: { [weak self] entry, sourceNode, gesture in
-                guard let strongSelf = self, let controller = strongSelf.controller, let sourceNode = sourceNode as? ContextExtractedContentContainingNode else {
+            }, peerContextAction: { [weak self] entry, sourceNode, gesture, fullscreen in
+                guard let strongSelf = self, let sourceNode = sourceNode as? ContextExtractedContentContainingNode else {
                     return
                 }
                 
                 let muteStatePromise = Promise<GroupCallParticipantsContext.Participant.MuteState?>(entry.muteState)
                    
-                let itemsForEntry: (PeerEntry, GroupCallParticipantsContext.Participant.MuteState?) -> [ContextMenuItem] = { entry, muteState in
+                let itemsForEntry: (VoiceChatPeerEntry, GroupCallParticipantsContext.Participant.MuteState?) -> [ContextMenuItem] = { entry, muteState in
                     var items: [ContextMenuItem] = []
                     
+                    var hasVolumeSlider = false
                     let peer = entry.peer
                     if let muteState = muteState, !muteState.canUnmute || muteState.mutedByYou {
                     } else {
-                        let minValue: CGFloat
-                        if let callState = strongSelf.callState, callState.canManageCall && callState.adminIds.contains(peer.id) && muteState != nil {
-                            minValue = 0.01
-                        } else {
-                            minValue = 0.0
-                        }
-                        items.append(.custom(VoiceChatVolumeContextItem(minValue: minValue, value: entry.volume.flatMap { CGFloat($0) / 10000.0 } ?? 1.0, valueChanged: { newValue, finished in
-                            if finished && newValue.isZero {
-                                let updatedMuteState = strongSelf.call.updateMuteState(peerId: peer.id, isMuted: true)
-                                muteStatePromise.set(.single(updatedMuteState))
+                        if entry.canManageCall || !entry.isMyPeer {
+                            hasVolumeSlider = true
+                            
+                            let minValue: CGFloat
+                            if let callState = strongSelf.callState, callState.canManageCall && callState.adminIds.contains(peer.id) && muteState != nil {
+                                minValue = 0.01
                             } else {
-                                strongSelf.call.setVolume(peerId: peer.id, volume: Int32(newValue * 10000), sync: finished)
+                                minValue = 0.0
                             }
-                        }), true))
+                            items.append(.custom(VoiceChatVolumeContextItem(minValue: minValue, value: entry.volume.flatMap { CGFloat($0) / 10000.0 } ?? 1.0, valueChanged: { newValue, finished in
+                                if finished && newValue.isZero {
+                                    let updatedMuteState = strongSelf.call.updateMuteState(peerId: peer.id, isMuted: true)
+                                    muteStatePromise.set(.single(updatedMuteState))
+                                } else {
+                                    strongSelf.call.setVolume(peerId: peer.id, volume: Int32(newValue * 10000), sync: finished)
+                                }
+                            }), true))
+                        }
                     }
                     
-                    /*items.append(.action(ContextMenuActionItem(text: "Toggle Full Screen", icon: { theme in
-                        return nil
-                    }, action: { _, f in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        
-                        strongSelf.itemInteraction?.openPeer(peer.id)
-                        f(.default)
-                    })))*/
-                    
+                    if entry.isMyPeer && !hasVolumeSlider && ((entry.about?.isEmpty ?? true) || entry.peer.smallProfileImage == nil) {
+                        items.append(.custom(VoiceChatInfoContextItem(text: strongSelf.presentationData.strings.VoiceChat_ImproveYourProfileText, icon: { theme in
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Tip"), color: theme.actionSheet.primaryTextColor)
+                        }), true))
+                    }
+                                        
                     if peer.id == strongSelf.callState?.myPeerId {
                         if entry.raisedHand {
                             items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_CancelSpeakRequest, icon: { theme in
@@ -1192,6 +1517,76 @@ public final class VoiceChatController: ViewController {
                                 f(.default)
                             })))
                         }
+                        items.append(.action(ContextMenuActionItem(text: peer.smallProfileImage == nil ? strongSelf.presentationData.strings.VoiceChat_AddPhoto : strongSelf.presentationData.strings.VoiceChat_ChangePhoto, icon: { theme in
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Camera"), color: theme.actionSheet.primaryTextColor)
+                        }, action: { _, f in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            
+                            f(.default)
+                            Queue.mainQueue().after(0.1) {
+                                strongSelf.openAvatarForEditing(fromGallery: false, completion: {})
+                            }
+                        })))
+                        
+                        items.append(.action(ContextMenuActionItem(text: (entry.about?.isEmpty ?? true) ? strongSelf.presentationData.strings.VoiceChat_AddBio : strongSelf.presentationData.strings.VoiceChat_EditBio, icon: { theme in
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Info"), color: theme.actionSheet.primaryTextColor)
+                        }, action: { _, f in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            f(.default)
+                               
+                            Queue.mainQueue().after(0.1) {
+                                let maxBioLength: Int
+                                if peer.id.namespace == Namespaces.Peer.CloudUser {
+                                    maxBioLength = 70
+                                } else {
+                                    maxBioLength = 100
+                                }
+                                let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_EditBioTitle, text: presentationData.strings.VoiceChat_EditBioText, placeholder: presentationData.strings.VoiceChat_EditBioPlaceholder, doneButtonTitle: presentationData.strings.VoiceChat_EditBioSave, value: entry.about, maxLength: maxBioLength, apply: { bio in
+                                    if let strongSelf = self, let bio = bio {
+                                        if peer.id.namespace == Namespaces.Peer.CloudUser {
+                                            let _ = (strongSelf.context.engine.accountData.updateAbout(about: bio)
+                                            |> `catch` { _ -> Signal<Void, NoError> in
+                                                return .complete()
+                                            }).start()
+                                        } else {
+                                            let _ = (strongSelf.context.engine.peers.updatePeerDescription(peerId: peer.id, description: bio)
+                                            |> `catch` { _ -> Signal<Void, NoError> in
+                                                return .complete()
+                                            }).start()
+                                        }
+                                        
+                                        strongSelf.presentUndoOverlay(content: .info(text: strongSelf.presentationData.strings.VoiceChat_EditBioSuccess), action: { _ in return false })
+                                    }
+                                })
+                                self?.controller?.present(controller, in: .window(.root))
+                            }
+                        })))
+                        
+                        if let peer = peer as? TelegramUser {
+                            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_ChangeName, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/ChangeName"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                f(.default)
+                                   
+                                Queue.mainQueue().after(0.1) {
+                                    let controller = voiceChatUserNameController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_ChangeNameTitle, firstNamePlaceholder: presentationData.strings.UserInfo_FirstNamePlaceholder, lastNamePlaceholder: presentationData.strings.UserInfo_LastNamePlaceholder, doneButtonTitle: presentationData.strings.VoiceChat_EditBioSave, firstName: peer.firstName, lastName: peer.lastName, maxLength: 128, apply: { firstAndLastName in
+                                        if let strongSelf = self, let (firstName, lastName) = firstAndLastName {
+                                            let _ = context.engine.accountData.updateAccountPeerName(firstName: firstName, lastName: lastName).start()
+                                            
+                                            strongSelf.presentUndoOverlay(content: .info(text: strongSelf.presentationData.strings.VoiceChat_EditNameSuccess), action: { _ in return false })
+                                        }
+                                    })
+                                    self?.controller?.present(controller, in: .window(.root))
+                                }
+                            })))
+                        }
                     } else {
                         if let callState = strongSelf.callState, (callState.canManageCall || callState.adminIds.contains(strongSelf.context.account.peerId)) {
                             if callState.adminIds.contains(peer.id) {
@@ -1219,6 +1614,8 @@ public final class VoiceChatController: ViewController {
                                         
                                         let _ = strongSelf.call.updateMuteState(peerId: peer.id, isMuted: false)
                                         f(.default)
+                                        
+                                        strongSelf.presentUndoOverlay(content: .voiceChatCanSpeak(text: presentationData.strings.VoiceChat_UserCanNowSpeak(entry.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return true })
                                     })))
                                 } else {
                                     items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_MutePeer, icon: { theme in
@@ -1261,11 +1658,16 @@ public final class VoiceChatController: ViewController {
                         
                         let openTitle: String
                         let openIcon: UIImage?
-                        if peer.id.namespace == Namespaces.Peer.CloudChannel {
-                            openTitle = strongSelf.presentationData.strings.VoiceChat_OpenChannel
-                            openIcon = UIImage(bundleImageName: "Chat/Context Menu/Channels")
+                        if [Namespaces.Peer.CloudChannel, Namespaces.Peer.CloudGroup].contains(peer.id.namespace) {
+                            if let peer = peer as? TelegramChannel, case .broadcast = peer.info {
+                                openTitle = strongSelf.presentationData.strings.VoiceChat_OpenChannel
+                                openIcon = UIImage(bundleImageName: "Chat/Context Menu/Channels")
+                            } else {
+                                openTitle = strongSelf.presentationData.strings.VoiceChat_OpenGroup
+                                openIcon = UIImage(bundleImageName: "Chat/Context Menu/Groups")
+                            }
                         } else {
-                            openTitle = strongSelf.presentationData.strings.VoiceChat_OpenChat
+                            openTitle = strongSelf.presentationData.strings.Conversation_ContextMenuSendMessage
                             openIcon = UIImage(bundleImageName: "Chat/Context Menu/Message")
                         }
                         items.append(.action(ContextMenuActionItem(text: openTitle, icon: { theme in
@@ -1277,15 +1679,15 @@ public final class VoiceChatController: ViewController {
                         
                             let context = strongSelf.context
                             strongSelf.controller?.dismiss(completion: {
-                                Queue.mainQueue().justDispatch {
+                                Queue.mainQueue().after(0.3) {
                                     context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peer.id), keepStack: .always, purposefulAction: {}, peekData: nil))
                                 }
                             })
                         
-                            f(.default)
+                            f(.dismissWithoutContent)
                         })))
                     
-                        if let callState = strongSelf.callState, (callState.canManageCall && !callState.adminIds.contains(peer.id) && peer.id.namespace != Namespaces.Peer.CloudChannel) {
+                        if let callState = strongSelf.callState, (callState.canManageCall && !callState.adminIds.contains(peer.id)), peer.id != strongSelf.call.peerId {
                             items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_RemovePeer, textColor: .destructive, icon: { theme in
                                 return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.destructiveActionTextColor)
                             }, action: { [weak self] c, _ in
@@ -1312,7 +1714,7 @@ public final class VoiceChatController: ViewController {
                                                 return
                                             }
                                             
-                                            let _ = strongSelf.context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: strongSelf.context.account, peerId: strongSelf.call.peerId, memberId: peer.id, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max)).start()
+                                            let _ = strongSelf.context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: strongSelf.context.engine, peerId: strongSelf.call.peerId, memberId: peer.id, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max)).start()
                                             strongSelf.call.removedPeer(peer.id)
                                             
                                             strongSelf.presentUndoOverlay(content: .banned(text: strongSelf.presentationData.strings.VoiceChat_RemovedPeerText(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
@@ -1340,53 +1742,124 @@ public final class VoiceChatController: ViewController {
                     return itemsForEntry(entry, muteState)
                 }
                 
-                let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme), source: .extracted(VoiceChatContextExtractedContentSource(controller: controller, sourceNode: sourceNode, keepInPlace: false, blurBackground: true)), items: items, reactionItems: [], gesture: gesture)
-                strongSelf.controller?.presentInGlobalOverlay(contextController)
-            }, setPeerIdWithRevealedOptions: { peerId, _ in
-                updateState { state in
-                    var updated = state
-                    updated.revealedPeerId = peerId
-                    return updated
+                var centerVertically = entry.peer.smallProfileImage != nil || (!fullscreen && entry.effectiveVideoEndpointId != nil)
+                if let (layout, _) = strongSelf.validLayout, case .regular = layout.metrics.widthClass {
+                    centerVertically = false
                 }
-            }, getPeerVideo: { [weak self] ssrc in
+                
+                var useMaskView = true
+                if case .fullscreen = strongSelf.displayMode {
+                    useMaskView = false
+                }
+                
+                let dismissPromise = ValuePromise<Bool>(false)
+                let source = VoiceChatContextExtractedContentSource(sourceNode: sourceNode, maskView: useMaskView ? strongSelf.transitionMaskView : nil, keepInPlace: false, blurBackground: true, centerVertically: centerVertically, shouldBeDismissed: dismissPromise.get(), animateTransitionIn: { [weak self] in
+                    if let strongSelf = self {
+                        strongSelf.animatingContextMenu = true
+                        strongSelf.updateDecorationsLayout(transition: .immediate)
+                        if strongSelf.isLandscape {
+                            strongSelf.transitionMaskTopFillLayer.opacity = 1.0
+                        }
+                        strongSelf.transitionContainerNode.view.mask = nil
+                        strongSelf.transitionMaskBottomFillLayer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4, removeOnCompletion: false, completion: { [weak self] _ in
+                            Queue.mainQueue().after(0.3) {
+                                self?.transitionMaskTopFillLayer.opacity = 0.0
+                                self?.transitionMaskBottomFillLayer.removeAllAnimations()
+                                self?.animatingContextMenu = false
+                                self?.updateDecorationsLayout(transition: .immediate)
+                            }
+                        })
+                    }
+                }, animateTransitionOut: { [weak self] in
+                    if let strongSelf = self {
+                        strongSelf.animatingContextMenu = true
+                        strongSelf.updateDecorationsLayout(transition: .immediate)
+                        strongSelf.transitionMaskTopFillLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.4)
+                        strongSelf.transitionMaskBottomFillLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.4, completion: { [weak self] _ in
+                            self?.animatingContextMenu = false
+                            self?.updateDecorationsLayout(transition: .immediate)
+                            self?.transitionContainerNode.view.mask = self?.transitionMaskView
+                        })
+                    }
+                })
+                sourceNode.requestDismiss = {
+                    dismissPromise.set(true)
+                }
+                
+                let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme), source: .extracted(source), items: items, reactionItems: [], gesture: gesture)
+                contextController.useComplexItemsTransitionAnimation = true
+                strongSelf.controller?.presentInGlobalOverlay(contextController)
+            }, getPeerVideo: { [weak self] endpointId, position in
                 guard let strongSelf = self else {
                     return nil
                 }
-                for (_, listSsrc, videoNode) in strongSelf.videoNodes {
-                    if listSsrc == ssrc {
+                var ignore = false
+                if case .mainstage = position {
+                    ignore = false
+                } else if case .fullscreen = strongSelf.displayMode, !strongSelf.isPanning {
+                    ignore = ![.mainstage, .list].contains(position)
+                } else {
+                    ignore = position != .tile
+                }
+                if ignore {
+                    return nil
+                }
+                if !strongSelf.readyVideoEndpointIds.contains(endpointId) {
+                    return nil
+                }
+                for (listEndpointId, videoNode) in strongSelf.videoNodes {
+                    if listEndpointId == endpointId {
+                        if position != .mainstage && videoNode.isMainstageExclusive {
+                            return nil
+                        }
                         return videoNode
                     }
                 }
                 return nil
             })
+            self.itemInteraction?.updateAvatarPromise = self.updateAvatarPromise
             
             self.topPanelNode.addSubnode(self.topPanelEdgeNode)
             self.topPanelNode.addSubnode(self.topPanelBackgroundNode)
             self.topPanelNode.addSubnode(self.titleNode)
             self.topPanelNode.addSubnode(self.optionsButton)
             self.topPanelNode.addSubnode(self.closeButton)
-            self.topPanelNode.addSubnode(self.topCornersNode)
+            self.topPanelNode.addSubnode(self.panelButton)
             
-            self.bottomPanelNode.addSubnode(self.bottomCornersNode)
-            self.bottomPanelNode.addSubnode(self.bottomPanelBackgroundNode)
-            self.bottomPanelNode.addSubnode(self.audioOutputNode)
-            //self.bottomPanelNode.addSubnode(self.cameraButtonNode)
-            self.bottomPanelNode.addSubnode(self.leaveNode)
+            self.bottomPanelNode.addSubnode(self.cameraButton)
+            self.bottomPanelNode.addSubnode(self.audioButton)
+            self.bottomPanelNode.addSubnode(self.switchCameraButton)
+            self.bottomPanelNode.addSubnode(self.leaveButton)
             self.bottomPanelNode.addSubnode(self.actionButton)
+            self.bottomPanelNode.addSubnode(self.scheduleCancelButton)
             
             self.addSubnode(self.dimNode)
             self.addSubnode(self.contentContainer)
             self.contentContainer.addSubnode(self.backgroundNode)
             
-            self.contentContainer.addSubnode(self.listNode)
-            if let mainVideoContainer = self.mainVideoContainer {
-                self.contentContainer.addSubnode(mainVideoContainer)
-            }
+            self.contentContainer.addSubnode(self.listContainer)
             self.contentContainer.addSubnode(self.topPanelNode)
-            self.contentContainer.addSubnode(self.leftBorderNode)
-            self.contentContainer.addSubnode(self.rightBorderNode)
+            self.listContainer.addSubnode(self.listNode)
+            self.listContainer.addSubnode(self.leftBorderNode)
+            self.listContainer.addSubnode(self.rightBorderNode)
+            self.listContainer.addSubnode(self.bottomCornersNode)
+            self.listContainer.addSubnode(self.topCornersNode)
+            self.contentContainer.addSubnode(self.bottomGradientNode)
+            self.contentContainer.addSubnode(self.bottomPanelBackgroundNode)
+            self.contentContainer.addSubnode(self.tileGridNode)
+            self.contentContainer.addSubnode(self.mainStageContainerNode)
+            self.contentContainer.addSubnode(self.transitionContainerNode)
             self.contentContainer.addSubnode(self.bottomPanelNode)
+            self.contentContainer.addSubnode(self.timerNode)
+            self.contentContainer.addSubnode(self.scheduleTextNode)
+            self.contentContainer.addSubnode(self.fullscreenListContainer)
+            self.fullscreenListContainer.addSubnode(self.fullscreenListNode)
             
+            self.mainStageContainerNode.addSubnode(self.mainStageBackgroundNode)
+            self.mainStageContainerNode.addSubnode(self.mainStageNode)
+            
+            self.updateDecorationsColors()
+                        
             let invitedPeers: Signal<[Peer], NoError> = self.call.invitedPeers
             |> mapToSignal { ids -> Signal<[Peer], NoError> in
                 return context.account.postbox.transaction { transaction -> [Peer] in
@@ -1414,18 +1887,40 @@ public final class VoiceChatController: ViewController {
                 self.call.state,
                 self.call.members,
                 invitedPeers,
-                self.displayAsPeersPromise.get()
+                self.displayAsPeersPromise.get(),
+                self.context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration])
             )
             |> mapToThrottled { values in
                 return .single(values)
                 |> then(.complete() |> delay(0.1, queue: Queue.mainQueue()))
-            }).start(next: { [weak self] state, callMembers, invitedPeers, displayAsPeers in
+            }).start(next: { [weak self] state, callMembers, invitedPeers, displayAsPeers, preferencesView in
                 guard let strongSelf = self else {
                     return
                 }
                 
+                let appConfiguration: AppConfiguration = preferencesView.values[PreferencesKeys.appConfiguration] as? AppConfiguration ?? .defaultValue
+                let configuration = VoiceChatConfiguration.with(appConfiguration: appConfiguration)
+                strongSelf.configuration = configuration
+                
+                var animate = false
                 if strongSelf.callState != state {
+                    if let previousCallState = strongSelf.callState {
+                        var networkStateUpdated = false
+                        if case .connecting = previousCallState.networkState, case .connected = state.networkState {
+                            networkStateUpdated = true
+                            strongSelf.connectedOnce = true
+                        }
+                        var canUnmuteUpdated = false
+                        if previousCallState.muteState?.canUnmute != state.muteState?.canUnmute {
+                            canUnmuteUpdated = true
+                        }
+                        if previousCallState.isVideoEnabled != state.isVideoEnabled || (state.isVideoEnabled && networkStateUpdated) || canUnmuteUpdated {
+                            strongSelf.animatingButtonsSwap = true
+                            animate = true
+                        }
+                    }
                     strongSelf.callState = state
+                    strongSelf.mainStageNode.callState = state
                     
                     if let muteState = state.muteState, !muteState.canUnmute {
                         if strongSelf.pushingToTalk {
@@ -1442,27 +1937,32 @@ public final class VoiceChatController: ViewController {
                 let subtitle = strongSelf.presentationData.strings.VoiceChat_Panel_Members(Int32(max(1, callMembers?.totalCount ?? 0)))
                 strongSelf.currentSubtitle = subtitle
                 
-                if let callState = strongSelf.callState, callState.canManageCall {
-                    strongSelf.optionsButtonIsAvatar = false
-                    strongSelf.optionsButton.isUserInteractionEnabled = true
-                    strongSelf.optionsButton.alpha = 1.0
-                } else if displayAsPeers.count > 1 {
-                    strongSelf.optionsButtonIsAvatar = true
-                    for peer in displayAsPeers {
-                        if peer.peer.id == state.myPeerId {
-                            strongSelf.optionsButton.setContent(.avatar(peer.peer))
-                        }
-                    }
-                    strongSelf.optionsButton.isUserInteractionEnabled = true
-                    strongSelf.optionsButton.alpha = 1.0
-                } else {
-                    strongSelf.optionsButtonIsAvatar = false
+                if strongSelf.isScheduling {
                     strongSelf.optionsButton.isUserInteractionEnabled = false
                     strongSelf.optionsButton.alpha = 0.0
+                    strongSelf.closeButton.isUserInteractionEnabled = false
+                    strongSelf.closeButton.alpha = 0.0
+                    strongSelf.panelButton.isUserInteractionEnabled = false
+                    strongSelf.panelButton.alpha = 0.0
+                } else {
+                    if let (layout, _) = strongSelf.validLayout {
+                        if case .regular = layout.metrics.widthClass, !strongSelf.peerIdToEndpointId.isEmpty {
+                            strongSelf.panelButton.isUserInteractionEnabled = true
+                        } else {
+                            strongSelf.panelButton.isUserInteractionEnabled = false
+                        }
+                    }
+                    if let callState = strongSelf.callState, callState.canManageCall {
+                        strongSelf.optionsButton.isUserInteractionEnabled = true
+                    } else if displayAsPeers.count > 1 {
+                        strongSelf.optionsButton.isUserInteractionEnabled = true
+                    } else {
+                        strongSelf.optionsButton.isUserInteractionEnabled = true
+                    }
                 }
                 
                 if let (layout, navigationHeight) = strongSelf.validLayout {
-                    strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
+                    strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: animate ? .animated(duration: 0.4, curve: .spring) : .immediate)
                 }
             })
             
@@ -1486,9 +1986,8 @@ public final class VoiceChatController: ViewController {
                     strongSelf.titleNode.isRecording = isRecording
                 }
                 if !strongSelf.didSetDataReady {
-                    strongSelf.updateMembers(muteState: strongSelf.effectiveMuteState, callMembers: strongSelf.currentCallMembers ?? ([], nil), invitedPeers: strongSelf.currentInvitedPeers ?? [], speakingPeers: strongSelf.currentSpeakingPeers ?? Set())
-                    
                     strongSelf.didSetDataReady = true
+                    strongSelf.updateMembers()
                     strongSelf.controller?.dataReady.set(true)
                 }
             })
@@ -1518,24 +2017,43 @@ public final class VoiceChatController: ViewController {
                     levels = levels.filter { $0.0 != strongSelf.callState?.myPeerId }
                 }
                 
-                var maxLevelWithVideo: (PeerId, UInt32, Float)?
+                var maxLevelWithVideo: (PeerId, Float)?
                 for (peerId, source, level, hasSpeech) in levels {
-                    if hasSpeech && source != 0 {
-                        if let (_, _, currentLevel) = maxLevelWithVideo {
+                    let hasVideo = strongSelf.peerIdToEndpointId[peerId] != nil
+                    if hasSpeech && source != 0 && hasVideo {
+                        if let (_, currentLevel) = maxLevelWithVideo {
                             if currentLevel < level {
-                                maxLevelWithVideo = (peerId, source, level)
+                                maxLevelWithVideo = (peerId, level)
                             }
                         } else {
-                            maxLevelWithVideo = (peerId, source, level)
+                            maxLevelWithVideo = (peerId, level)
                         }
                     }
                 }
                 
-                if let (peerId, source, _) = maxLevelWithVideo {
-                    if strongSelf.currentDominantSpeakerWithVideo?.0 != peerId || strongSelf.currentDominantSpeakerWithVideo?.1 != source {
-                        strongSelf.currentDominantSpeakerWithVideo = (peerId, source)
-                        strongSelf.call.setFullSizeVideo(peerId: peerId)
-                        strongSelf.mainVideoContainer?.updatePeer(peer: (peerId: peerId, source: source))
+                if maxLevelWithVideo == nil {
+                    if let (peerId, _, _) = strongSelf.currentDominantSpeaker {
+                        maxLevelWithVideo = (peerId, 0.0)
+                    } else if strongSelf.peerIdToEndpointId.count > 0 {
+                        for entry in strongSelf.currentFullscreenEntries {
+                            if case let .peer(peerEntry, _) = entry {
+                                if let _ = peerEntry.effectiveVideoEndpointId {
+                                    maxLevelWithVideo = (peerEntry.peer.id, 0.0)
+                                    break
+                                }
+                            }
+                        }
+                    }
+                }
+                                
+                if case .fullscreen = strongSelf.displayMode, !strongSelf.mainStageNode.animating && !strongSelf.animatingExpansion {
+                    if let (peerId, _) = maxLevelWithVideo {
+                        if let (currentPeerId, _, timestamp) = strongSelf.currentDominantSpeaker {
+                            if CACurrentMediaTime() - timestamp > 2.5 && peerId != currentPeerId {
+                                strongSelf.currentDominantSpeaker = (peerId, nil, CACurrentMediaTime())
+                                strongSelf.updateMainVideo(waitForFullSize: true)
+                            }
+                        }
                     }
                 }
                 
@@ -1550,39 +2068,110 @@ public final class VoiceChatController: ViewController {
                 var effectiveLevel: Float = 0.0
                 if let state = strongSelf.callState, state.muteState == nil || strongSelf.pushingToTalk {
                     effectiveLevel = level
+                } else if level > 0.1 {
+                    effectiveLevel = level * 0.5
                 }
                 strongSelf.actionButton.updateLevel(CGFloat(effectiveLevel))
             })
             
-            self.leaveNode.addTarget(self, action: #selector(self.leavePressed), forControlEvents: .touchUpInside)
-            
-            self.actionButton.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside)
-            
-            self.audioOutputNode.addTarget(self, action: #selector(self.audioOutputPressed), forControlEvents: .touchUpInside)
-            
-            self.cameraButtonNode.addTarget(self, action: #selector(self.cameraPressed), forControlEvents: .touchUpInside)
-
-            self.optionsButton.contextAction = { [weak self] sourceNode, gesture in
-                self?.openContextMenu(sourceNode: sourceNode, gesture: gesture)
-            }
-            
-            self.optionsButton.addTarget(self, action: #selector(self.optionsPressed), forControlEvents: .touchUpInside)
-            self.closeButton.addTarget(self, action: #selector(self.closePressed), forControlEvents: .touchUpInside)
-            
-            self.actionButtonColorDisposable = (self.actionButton.outerColor
-            |> deliverOnMainQueue).start(next: { [weak self] color in
-                if let strongSelf = self {
-                    let animated = strongSelf.currentAudioButtonColor != nil
-                    strongSelf.currentAudioButtonColor = color
-                    strongSelf.updateButtons(animated: animated)
+            self.isSpeakingDisposable = (self.call.isSpeaking
+            |> deliverOnMainQueue).start(next: { [weak self] isSpeaking in
+                guard let strongSelf = self else {
+                    return
+                }
+                if let state = strongSelf.callState, state.muteState == nil || strongSelf.pushingToTalk {
+                    strongSelf.displayUnmuteTooltipTimer?.invalidate()
+                    strongSelf.displayUnmuteTooltipTimer = nil
+                    strongSelf.dismissUnmuteTooltipTimer?.invalidate()
+                    strongSelf.dismissUnmuteTooltipTimer = nil
+                } else {
+                    if isSpeaking {
+                        var shouldDisplayTooltip = false
+                        if let previousTimstamp = strongSelf.lastUnmuteTooltipDisplayTimestamp, CACurrentMediaTime() > previousTimstamp + 45.0 {
+                            shouldDisplayTooltip = true
+                        } else if strongSelf.lastUnmuteTooltipDisplayTimestamp == nil {
+                            shouldDisplayTooltip = true
+                        }
+                        if shouldDisplayTooltip {
+                            strongSelf.dismissUnmuteTooltipTimer?.invalidate()
+                            strongSelf.dismissUnmuteTooltipTimer = nil
+                            
+                            if strongSelf.displayUnmuteTooltipTimer == nil {
+                                let timer = SwiftSignalKit.Timer(timeout: 1.0, repeat: false, completion: { [weak self] in
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    strongSelf.lastUnmuteTooltipDisplayTimestamp = CACurrentMediaTime()
+                                    strongSelf.displayUnmuteTooltip()
+                                    strongSelf.displayUnmuteTooltipTimer?.invalidate()
+                                    strongSelf.displayUnmuteTooltipTimer = nil
+                                    strongSelf.dismissUnmuteTooltipTimer?.invalidate()
+                                    strongSelf.dismissUnmuteTooltipTimer = nil
+                                }, queue: Queue.mainQueue())
+                                timer.start()
+                                strongSelf.displayUnmuteTooltipTimer = timer
+                            }
+                        }
+                    } else if strongSelf.dismissUnmuteTooltipTimer == nil && strongSelf.displayUnmuteTooltipTimer != nil {
+                        let timer = SwiftSignalKit.Timer(timeout: 0.4, repeat: false, completion: { [weak self] in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.displayUnmuteTooltipTimer?.invalidate()
+                            strongSelf.displayUnmuteTooltipTimer = nil
+                           
+                            strongSelf.dismissUnmuteTooltipTimer?.invalidate()
+                            strongSelf.dismissUnmuteTooltipTimer = nil
+                        }, queue: Queue.mainQueue())
+                        timer.start()
+                        strongSelf.dismissUnmuteTooltipTimer = timer
+                    }
                 }
             })
             
+            self.leaveButton.addTarget(self, action: #selector(self.leavePressed), forControlEvents: .touchUpInside)
+            self.actionButton.addTarget(self, action: #selector(self.actionPressed), forControlEvents: .touchUpInside)
+            self.audioButton.addTarget(self, action: #selector(self.audioPressed), forControlEvents: .touchUpInside)
+            self.cameraButton.addTarget(self, action: #selector(self.cameraPressed), forControlEvents: .touchUpInside)
+            self.switchCameraButton.addTarget(self, action: #selector(self.switchCameraPressed), forControlEvents: .touchUpInside)
+            self.optionsButton.contextAction = { [weak self] sourceNode, gesture in
+                self?.openSettingsMenu(sourceNode: sourceNode, gesture: gesture)
+            }
+            self.optionsButton.addTarget(self, action: #selector(self.optionsPressed), forControlEvents: .touchUpInside)
+            self.closeButton.addTarget(self, action: #selector(self.closePressed), forControlEvents: .touchUpInside)
+            self.panelButton.addTarget(self, action: #selector(self.panelPressed), forControlEvents: .touchUpInside)
+            
+            self.actionButtonColorDisposable = (self.actionButton.outerColor
+            |> deliverOnMainQueue).start(next: { [weak self] normalColor, activeColor in
+                if let strongSelf = self {
+                    let animated = strongSelf.currentNormalButtonColor != nil || strongSelf.currentActiveButtonColor == nil
+                    strongSelf.currentNormalButtonColor = normalColor
+                    strongSelf.currentActiveButtonColor = activeColor
+                    strongSelf.updateButtons(transition: animated ? .animated(duration: 0.3, curve: .linear) : .immediate)
+                }
+            })
+            
+            self.fullscreenListNode.updateFloatingHeaderOffset = { [weak self] _, _ in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                var visiblePeerIds = Set<PeerId>()
+                strongSelf.fullscreenListNode.forEachVisibleItemNode { itemNode in
+                    if let itemNode = itemNode as? VoiceChatFullscreenParticipantItemNode, let item = itemNode.item {
+                        if item.videoEndpointId == nil {
+                            visiblePeerIds.insert(item.peer.id)
+                        }
+                    }
+                }
+                strongSelf.mainStageNode.update(visiblePeerIds: visiblePeerIds)
+            }
+            
             self.listNode.updateFloatingHeaderOffset = { [weak self] offset, transition in
                 if let strongSelf = self {
                     strongSelf.currentContentOffset = offset
-                    if strongSelf.animation == nil && !strongSelf.animatingExpansion {
-                        strongSelf.updateFloatingHeaderOffset(offset: offset, transition: transition)
+                    if !(strongSelf.animatingExpansion || strongSelf.animatingInsertion || strongSelf.animatingAppearance) && (strongSelf.panGestureArguments == nil || strongSelf.isExpanded) {
+                        strongSelf.updateDecorationsLayout(transition: transition)
                     }
                 }
             }
@@ -1599,16 +2188,16 @@ public final class VoiceChatController: ViewController {
                 }
             }
             
-//            self.memberEventsDisposable.set((self.call.memberEvents
-//            |> deliverOnMainQueue).start(next: { [weak self] event in
-//                guard let strongSelf = self else {
-//                    return
-//                }
-//                if event.joined {
-//                    strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: event.peer, text: strongSelf.presentationData.strings.VoiceChat_PeerJoinedText(event.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
-//                }
-//            }))
-
+            self.memberEventsDisposable.set((self.call.memberEvents
+            |> deliverOnMainQueue).start(next: { [weak self] event in
+                guard let strongSelf = self else {
+                    return
+                }
+                if event.joined {
+                    strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: event.peer, text: strongSelf.presentationData.strings.VoiceChat_PeerJoinedText(event.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
+                }
+            }))
+            
             self.reconnectedAsEventsDisposable.set((self.call.reconnectedAsEvents
             |> deliverOnMainQueue).start(next: { [weak self] peer in
                 guard let strongSelf = self else {
@@ -1616,111 +2205,160 @@ public final class VoiceChatController: ViewController {
                 }
                 strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: peer, text: strongSelf.presentationData.strings.VoiceChat_DisplayAsSuccess(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
             }))
-            
-            self.voiceSourcesDisposable.set((self.call.incomingVideoSources
-            |> deliverOnMainQueue).start(next: { [weak self] sources in
+
+            self.stateVersionDisposable.set((self.call.stateVersion
+            |> distinctUntilChanged
+            |> deliverOnMainQueue).start(next: { [weak self] _ in
                 guard let strongSelf = self else {
                     return
                 }
-                var validSources = Set<UInt32>()
-                for (peerId, source) in sources {
-                    validSources.insert(source)
-                    
-                    if !strongSelf.requestedVideoSources.contains(source) {
-                        strongSelf.requestedVideoSources.insert(source)
-                        strongSelf.call.makeIncomingVideoView(source: source, completion: { videoView in
-                            Queue.mainQueue().async {
-                                guard let strongSelf = self, let videoView = videoView else {
-                                    return
-                                }
-                                let videoNode = GroupVideoNode(videoView: videoView)
-                                strongSelf.videoNodes.append((peerId, source, videoNode))
-                                //strongSelf.addSubnode(videoNode)
-                                if let (layout, navigationHeight) = strongSelf.validLayout {
-                                    strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
-                                    
-                                    loop: for i in 0 ..< strongSelf.currentEntries.count {
-                                        let entry = strongSelf.currentEntries[i]
-                                        switch entry {
-                                        case let .peer(peerEntry):
-                                            if peerEntry.ssrc == source {
-                                                let presentationData = strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme)
-                                                strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [ListViewUpdateItem(index: i, previousIndex: i, item: entry.item(context: strongSelf.context, presentationData: presentationData, interaction: strongSelf.itemInteraction!), directionHint: nil)], options: [.Synchronous], updateOpaqueState: nil)
-                                                break loop
-                                            }
-                                        default:
-                                            break
-                                        }
-                                    }
-                                }
-                            }
-                        })
-                    }
-                }
-                
-                var updated = false
-                for i in (0 ..< strongSelf.videoNodes.count).reversed() {
-                    if !validSources.contains(strongSelf.videoNodes[i].1) {
-                        let ssrc = strongSelf.videoNodes[i].1
-                        strongSelf.videoNodes.remove(at: i)
-                        
-                        loop: for j in 0 ..< strongSelf.currentEntries.count {
-                            let entry = strongSelf.currentEntries[j]
-                            switch entry {
-                            case let .peer(peerEntry):
-                                if peerEntry.ssrc == ssrc {
-                                    let presentationData = strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme)
-                                    strongSelf.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [ListViewUpdateItem(index: i, previousIndex: i, item: entry.item(context: strongSelf.context, presentationData: presentationData, interaction: strongSelf.itemInteraction!), directionHint: nil)], options: [.Synchronous], updateOpaqueState: nil)
-                                    break loop
-                                }
-                            default:
-                                break
-                            }
-                        }
-                        
-                        //strongSelf.videoNodes[i].2.removeFromSupernode()
-                        updated = true
-                    }
-                }
-                
-                if let (_, source) = strongSelf.currentDominantSpeakerWithVideo {
-                    if !validSources.contains(source) {
-                        strongSelf.currentDominantSpeakerWithVideo = nil
-                        strongSelf.call.setFullSizeVideo(peerId: nil)
-                        strongSelf.mainVideoContainer?.updatePeer(peer: nil)
-                    }
-                }
-                
-                if updated {
-                    if let (layout, navigationHeight) = strongSelf.validLayout {
-                        strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
-                    }
-                }
+                strongSelf.callStateDidReset()
             }))
             
             self.titleNode.tapped = { [weak self] in
-                if let strongSelf = self, !strongSelf.titleNode.recordingIconNode.isHidden {
-                    var ignore = false
-                    strongSelf.controller?.forEachController { controller -> Bool in
-                        if controller is TooltipScreen {
-                            ignore = true
+                if let strongSelf = self, !strongSelf.isScheduling {
+                    if strongSelf.callState?.canManageCall ?? false {
+                        strongSelf.openTitleEditing()
+                    } else if !strongSelf.titleNode.recordingIconNode.isHidden {
+                        var hasTooltipAlready = false
+                        strongSelf.controller?.forEachController { controller -> Bool in
+                            if controller is TooltipScreen {
+                                hasTooltipAlready = true
+                            }
+                            return true
+                        }
+                        if !hasTooltipAlready {
+                            let location = strongSelf.titleNode.recordingIconNode.convert(strongSelf.titleNode.recordingIconNode.bounds, to: nil)
+                            strongSelf.controller?.present(TooltipScreen(text: presentationData.strings.VoiceChat_RecordingInProgress, icon: nil, location: .point(location.offsetBy(dx: 1.0, dy: 0.0), .top), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in
+                                return .dismiss(consume: true)
+                            }), in: .window(.root))
                         }
-                        return true
                     }
-                    
-                    guard !ignore else {
-                        return
-                    }
-                    
-                    let location = strongSelf.titleNode.recordingIconNode.convert(strongSelf.titleNode.recordingIconNode.bounds, to: nil)
-                    strongSelf.controller?.present(TooltipScreen(text: presentationData.strings.VoiceChat_RecordingInProgress, icon: nil, location: .point(location.offsetBy(dx: 1.0, dy: 0.0), .top), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in
-                        return .dismiss(consume: true)
-                    }), in: .window(.root))
                 }
             }
             
-            //self.isFullscreen = true
-            //self.isExpanded = true
+            self.scheduleCancelButton.pressed = { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.dismissScheduled()
+                }
+            }
+            
+            self.mainStageNode.controlsHidden = { [weak self] hidden in
+                if let strongSelf = self {
+                    if hidden {
+                        strongSelf.fullscreenListNode.alpha = 0.0
+                    } else {
+                        strongSelf.fullscreenListNode.alpha = 1.0
+                        strongSelf.fullscreenListNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                    }
+                }
+            }
+        
+            self.mainStageNode.tapped = { [weak self] in
+                if let strongSelf = self, let (layout, navigationHeight) = strongSelf.validLayout, !strongSelf.animatingExpansion && !strongSelf.animatingMainStage && !strongSelf.mainStageNode.animating {
+                    if case .regular = layout.metrics.widthClass {
+                        strongSelf.panelHidden = !strongSelf.panelHidden
+                        
+                        strongSelf.animatingExpansion = true
+                        let transition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
+                        strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                        strongSelf.updateDecorationsLayout(transition: transition)
+                    } else {
+                        let effectiveDisplayMode = strongSelf.displayMode
+                        let nextDisplayMode: DisplayMode
+                        switch effectiveDisplayMode {
+                            case .modal:
+                                nextDisplayMode = effectiveDisplayMode
+                            case let .fullscreen(controlsHidden):
+                                if controlsHidden {
+                                    nextDisplayMode = .fullscreen(controlsHidden: false)
+                                } else {
+                                    nextDisplayMode = .fullscreen(controlsHidden: true)
+                                }
+                        }
+                        strongSelf.updateDisplayMode(nextDisplayMode)
+                    }
+                }
+            }
+            
+            self.mainStageNode.stopScreencast = { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.call.disableScreencast()
+                }
+            }
+            
+            self.mainStageNode.back = { [weak self] in
+                if let strongSelf = self, !strongSelf.isPanning && !strongSelf.animatingExpansion && !strongSelf.mainStageNode.animating {
+                    strongSelf.currentForcedSpeaker = nil
+                    strongSelf.updateDisplayMode(.modal(isExpanded: true, isFilled: true), fromPan: true)
+                    strongSelf.effectiveSpeaker = nil
+                }
+            }
+            
+            self.mainStageNode.togglePin = { [weak self] in
+                if let strongSelf = self {
+                    if let (peerId, videoEndpointId, _, _, _) = strongSelf.effectiveSpeaker {
+                        if let _ = strongSelf.currentForcedSpeaker {
+                            strongSelf.currentDominantSpeaker = (peerId, videoEndpointId, CACurrentMediaTime())
+                            strongSelf.currentForcedSpeaker = nil
+                        } else {
+                            strongSelf.currentForcedSpeaker = (peerId, videoEndpointId)
+                        }
+                    }
+                    strongSelf.updateMembers()
+                }
+            }
+            
+            self.mainStageNode.switchTo = { [weak self] peerId in
+                if let strongSelf = self, let interaction = strongSelf.itemInteraction {
+                    interaction.switchToPeer(peerId, nil, false)
+                }
+            }
+            
+            self.mainStageNode.getAudioLevel = { [weak self] peerId in
+                return self?.itemInteraction?.getAudioLevel(peerId) ?? .single(0.0)
+            }
+            
+            self.mainStageNode.getVideo = { [weak self] endpointId, isMyPeer, completion in
+                if let strongSelf = self {
+                    if isMyPeer {
+                        if strongSelf.readyVideoEndpointIds.contains(endpointId) {
+                            completion(strongSelf.itemInteraction?.getPeerVideo(endpointId, .mainstage))
+                        } else {
+                            strongSelf.myPeerVideoReadyDisposable.set((strongSelf.readyVideoEndpointIdsPromise.get()
+                            |> filter { $0.contains(endpointId) }
+                            |> take(1)
+                            |> deliverOnMainQueue).start(next: { [weak self] _ in
+                                if let strongSelf = self {
+                                    completion(strongSelf.itemInteraction?.getPeerVideo(endpointId, .mainstage))
+                                }
+                            }))
+                        }
+                    } else {
+                        if let input = (strongSelf.call as! PresentationGroupCallImpl).video(endpointId: endpointId) {
+                            if let videoView = strongSelf.videoRenderingContext.makeView(input: input, blur: false) {
+                                completion(GroupVideoNode(videoView: videoView, backdropVideoView: strongSelf.videoRenderingContext.makeView(input: input, blur: true)))
+                            }
+                        }
+
+                        /*strongSelf.call.makeIncomingVideoView(endpointId: endpointId, requestClone: GroupVideoNode.useBlurTransparency, completion: { videoView, backdropVideoView in
+                            if let videoView = videoView {
+                                completion(GroupVideoNode(videoView: videoView, backdropVideoView: backdropVideoView))
+                            } else {
+                                completion(nil)
+                            }
+                        })*/
+                    }
+                }
+            }
+            
+            self.applicationStateDisposable = (self.context.sharedContext.applicationBindings.applicationIsActive
+            |> deliverOnMainQueue).start(next: { [weak self] active in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.appIsActive = active
+            })
         }
         
         deinit {
@@ -1728,27 +2366,26 @@ public final class VoiceChatController: ViewController {
             self.peerViewDisposable?.dispose()
             self.leaveDisposable.dispose()
             self.isMutedDisposable?.dispose()
+            self.isNoiseSuppressionEnabledDisposable?.dispose()
             self.callStateDisposable?.dispose()
             self.audioOutputStateDisposable?.dispose()
             self.memberStatesDisposable?.dispose()
             self.audioLevelsDisposable?.dispose()
             self.myAudioLevelDisposable?.dispose()
+            self.isSpeakingDisposable?.dispose()
             self.inviteDisposable.dispose()
             self.memberEventsDisposable.dispose()
             self.reconnectedAsEventsDisposable.dispose()
-            self.voiceSourcesDisposable.dispose()
+            self.stateVersionDisposable.dispose()
+            self.updateAvatarDisposable.dispose()
+            self.ignoreConnectingTimer?.invalidate()
+            self.readyVideoDisposables.dispose()
+            self.applicationStateDisposable?.dispose()
+            self.myPeerVideoReadyDisposable.dispose()
         }
-
-        private func openContextMenu(sourceNode: ASDisplayNode, gesture: ContextGesture?) {
-            let canManageCall = !self.optionsButtonIsAvatar
-
-            let items: Signal<[ContextMenuItem], NoError>
-            if canManageCall {
-                items = self.contextMenuMainItems()
-            } else {
-                items = self.contextMenuDisplayAsItems()
-            }
-
+        
+        private func openSettingsMenu(sourceNode: ASDisplayNode, gesture: ContextGesture?) {
+            let items: Signal<[ContextMenuItem], NoError> = self.contextMenuMainItems()
             if let controller = self.controller {
                 let contextController = ContextController(account: self.context.account, presentationData: self.presentationData.withUpdated(theme: self.darkTheme), source: .reference(VoiceChatContextReferenceContentSource(controller: controller, sourceNode: self.optionsButton.referenceNode)), items: items, reactionItems: [], gesture: gesture)
                 controller.presentInGlobalOverlay(contextController)
@@ -1760,9 +2397,9 @@ public final class VoiceChatController: ViewController {
                 return .single([])
             }
 
+            let canManageCall = self.callState?.canManageCall == true
             let avatarSize = CGSize(width: 28.0, height: 28.0)
-
-            return combineLatest(self.displayAsPeersPromise.get(), self.context.account.postbox.loadedPeerWithId(call.peerId), self.inviteLinksPromise.get())
+            return combineLatest(self.displayAsPeersPromise.get(), self.context.account.postbox.loadedPeerWithId(self.call.peerId), self.inviteLinksPromise.get())
             |> take(1)
             |> deliverOnMainQueue
             |> map { [weak self] peers, chatPeer, inviteLinks -> [ContextMenuItem] in
@@ -1787,45 +2424,68 @@ public final class VoiceChatController: ViewController {
                         }
                     }
                 }
-
-                items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EditTitle, icon: { theme -> UIImage? in
-                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Pencil"), color: theme.actionSheet.primaryTextColor)
-                }, action: { _, f in
-                    f(.default)
-
-                    guard let strongSelf = self else {
-                        return
-                    }
-
-                    let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_EditTitleTitle, text: presentationData.strings.VoiceChat_EditTitleText, placeholder: chatPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), value: strongSelf.callState?.title, apply: { title in
-                        if let strongSelf = self, let title = title {
-                            strongSelf.call.updateTitle(title)
-
-                            strongSelf.presentUndoOverlay(content: .voiceChatFlag(text: title.isEmpty ? strongSelf.presentationData.strings.VoiceChat_EditTitleRemoveSuccess : strongSelf.presentationData.strings.VoiceChat_EditTitleSuccess(title).0), action: { _ in return false })
+                
+                if let (availableOutputs, currentOutput) = strongSelf.audioOutputState, availableOutputs.count > 1 {
+                    var currentOutputTitle = ""
+                    for output in availableOutputs {
+                        if output == currentOutput {
+                        let title: String
+                            switch output {
+                                case .builtin:
+                                    title = UIDevice.current.model
+                                case .speaker:
+                                    title = strongSelf.presentationData.strings.Call_AudioRouteSpeaker
+                                case .headphones:
+                                    title = strongSelf.presentationData.strings.Call_AudioRouteHeadphones
+                                case let .port(port):
+                                    title = port.name
+                            }
+                            currentOutputTitle = title
+                            break
                         }
-                    })
-                    self?.controller?.present(controller, in: .window(.root))
-                })))
-
-                var hasPermissions = true
-                if let chatPeer = chatPeer as? TelegramChannel {
-                    if case .broadcast = chatPeer.info {
-                        hasPermissions = false
-                    } else if chatPeer.flags.contains(.isGigagroup) {
-                        hasPermissions = false
                     }
-                }
-                if hasPermissions {
-                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EditPermissions, icon: { theme -> UIImage? in
-                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Restrict"), color: theme.actionSheet.primaryTextColor)
+                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_ContextAudio, textLayout: .secondLineWithValue(currentOutputTitle), icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/Audio"), color: theme.actionSheet.primaryTextColor)
                     }, action: { c, _ in
                         guard let strongSelf = self else {
                             return
                         }
-                        c.setItems(strongSelf.contextMenuPermissionItems())
+                        c.setItems(strongSelf.contextMenuAudioItems())
                     })))
                 }
 
+                if canManageCall {
+                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EditTitle, icon: { theme -> UIImage? in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Pencil"), color: theme.actionSheet.primaryTextColor)
+                    }, action: { _, f in
+                        f(.default)
+
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.openTitleEditing()
+                    })))
+
+                    var hasPermissions = true
+                    if let chatPeer = chatPeer as? TelegramChannel {
+                        if case .broadcast = chatPeer.info {
+                            hasPermissions = false
+                        } else if chatPeer.flags.contains(.isGigagroup) {
+                            hasPermissions = false
+                        }
+                    }
+                    if hasPermissions {
+                        items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EditPermissions, icon: { theme -> UIImage? in
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Restrict"), color: theme.actionSheet.primaryTextColor)
+                        }, action: { c, _ in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            c.setItems(strongSelf.contextMenuPermissionItems())
+                        })))
+                    }
+                }
+            
                 if let inviteLinks = inviteLinks {
                     items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_Share, icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Link"), color: theme.actionSheet.primaryTextColor)
@@ -1835,60 +2495,95 @@ public final class VoiceChatController: ViewController {
                         self?.presentShare(inviteLinks)
                     })))
                 }
-
-                if let recordingStartTimestamp = strongSelf.callState?.recordingStartTimestamp {
-                    items.append(.custom(VoiceChatRecordingContextItem(timestamp: recordingStartTimestamp, action: { _, f in
-                        f(.dismissWithoutContent)
-
-                        guard let strongSelf = self else {
-                            return
-                        }
-
-                        let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: strongSelf.presentationData.strings.VoiceChat_StopRecordingTitle, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_StopRecordingStop, action: {
-                            if let strongSelf = self {
-                                strongSelf.call.setShouldBeRecording(false, title: nil)
-
-                                strongSelf.presentUndoOverlay(content: .forward(savedMessages: true, text: strongSelf.presentationData.strings.VoiceChat_RecordingSaved), action: { [weak self] value in
-                                    if case .info = value, let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController {
-                                        let context = strongSelf.context
-                                        strongSelf.controller?.dismiss(completion: {
-                                            Queue.mainQueue().justDispatch {
-                                                context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(context.account.peerId), keepStack: .always, purposefulAction: {}, peekData: nil))
-                                            }
-                                        })
-                                        
-                                        return true
-                                    }
-                                    return false
-                                })
-                            }
-                        })])
-                        self?.controller?.present(alertController, in: .window(.root))
-                    }), false))
-                } else {
-                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_StartRecording, icon: { theme -> UIImage? in
-                        return generateStartRecordingIcon(color: theme.actionSheet.primaryTextColor)
+                
+                let isScheduled = strongSelf.isScheduled
+                
+                if !isScheduled {
+                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_NoiseSuppression, textColor: .primary, textLayout: .secondLineWithValue(strongSelf.isNoiseSuppressionEnabled ? strongSelf.presentationData.strings.VoiceChat_NoiseSuppressionEnabled : strongSelf.presentationData.strings.VoiceChat_NoiseSuppressionDisabled), icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/Noise"), color: theme.actionSheet.primaryTextColor)
                     }, action: { _, f in
                         f(.dismissWithoutContent)
-
-                        guard let strongSelf = self else {
-                            return
+                        if let strongSelf = self {
+                            strongSelf.call.setIsNoiseSuppressionEnabled(!strongSelf.isNoiseSuppressionEnabled)
                         }
-
-                        let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_StartRecordingTitle, text: presentationData.strings.VoiceChat_StartRecordingText, placeholder: presentationData.strings.VoiceChat_RecordingTitlePlaceholder, value: nil, apply: { title in
-                            if let strongSelf = self, let title = title {
-                                strongSelf.call.setShouldBeRecording(true, title: title)
-
-                                strongSelf.presentUndoOverlay(content: .voiceChatRecording(text: strongSelf.presentationData.strings.VoiceChat_RecordingStarted), action: { _ in return false })
-                                strongSelf.call.playTone(.recordingStarted)
-                            }
-                        })
-                        self?.controller?.present(controller, in: .window(.root))
                     })))
                 }
+                
+                if let callState = strongSelf.callState, callState.isVideoEnabled && (callState.muteState?.canUnmute ?? true) {
+                    if #available(iOS 12.0, *) {
+                        if strongSelf.call.hasScreencast {
+                            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_StopScreenSharing, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/ShareScreen"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                f(.default)
 
-                if let callState = strongSelf.callState, callState.canManageCall {
-                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_EndVoiceChat, textColor: .destructive, icon: { theme in
+                                self?.call.disableScreencast()
+                            })))
+                        } else {
+                            items.append(.custom(VoiceChatShareScreenContextItem(context: strongSelf.context, text: strongSelf.presentationData.strings.VoiceChat_ShareScreen, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/ShareScreen"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, _ in }), false))
+                        }
+                    }
+                }
+
+                if canManageCall {
+                    if let recordingStartTimestamp = strongSelf.callState?.recordingStartTimestamp {
+                        items.append(.custom(VoiceChatRecordingContextItem(timestamp: recordingStartTimestamp, action: { _, f in
+                            f(.dismissWithoutContent)
+
+                            guard let strongSelf = self else {
+                                return
+                            }
+
+                            let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: nil, text: strongSelf.presentationData.strings.VoiceChat_StopRecordingTitle, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_StopRecordingStop, action: {
+                                if let strongSelf = self {
+                                    strongSelf.call.setShouldBeRecording(false, title: nil)
+
+                                    strongSelf.presentUndoOverlay(content: .forward(savedMessages: true, text: strongSelf.presentationData.strings.VoiceChat_RecordingSaved), action: { [weak self] value in
+                                        if case .info = value, let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController {
+                                            let context = strongSelf.context
+                                            strongSelf.controller?.dismiss(completion: {
+                                                Queue.mainQueue().justDispatch {
+                                                    context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(context.account.peerId), keepStack: .always, purposefulAction: {}, peekData: nil))
+                                                }
+                                            })
+                                            
+                                            return true
+                                        }
+                                        return false
+                                    })
+                                }
+                            })])
+                            self?.controller?.present(alertController, in: .window(.root))
+                        }), false))
+                    } else {
+                        if strongSelf.callState?.scheduleTimestamp == nil {
+                            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_StartRecording, icon: { theme -> UIImage? in
+                                return generateStartRecordingIcon(color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                f(.dismissWithoutContent)
+
+                                guard let strongSelf = self else {
+                                    return
+                                }
+
+                                let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: presentationData.strings.VoiceChat_StartRecordingTitle, text: presentationData.strings.VoiceChat_StartRecordingText, placeholder: presentationData.strings.VoiceChat_RecordingTitlePlaceholder, value: nil, maxLength: 40, apply: { title in
+                                    if let strongSelf = self, let title = title {
+                                        strongSelf.call.setShouldBeRecording(true, title: title)
+
+                                        strongSelf.presentUndoOverlay(content: .voiceChatRecording(text: strongSelf.presentationData.strings.VoiceChat_RecordingStarted), action: { _ in return false })
+                                        strongSelf.call.playTone(.recordingStarted)
+                                    }
+                                })
+                                self?.controller?.present(controller, in: .window(.root))
+                            })))
+                        }
+                    }
+                }
+
+                if canManageCall {
+                    items.append(.action(ContextMenuActionItem(text: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelVoiceChat : strongSelf.presentationData.strings.VoiceChat_EndVoiceChat, textColor: .destructive, icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.destructiveActionTextColor)
                     }, action: { _, f in
                         f(.dismissWithoutContent)
@@ -1910,25 +2605,80 @@ public final class VoiceChatController: ViewController {
                             })
                         }
 
-                        let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: {
+                        let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationTitle : strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationText : strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationEnd : strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: {
                             action()
                         })])
                         strongSelf.controller?.present(alertController, in: .window(.root))
                     })))
+                } else {
+                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_LeaveVoiceChat, textColor: .destructive, icon: { theme in
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Clear"), color: theme.actionSheet.destructiveActionTextColor)
+                    }, action: { _, f in
+                        f(.dismissWithoutContent)
+
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        let _ = (strongSelf.call.leave(terminateIfPossible: false)
+                        |> filter { $0 }
+                        |> take(1)
+                        |> deliverOnMainQueue).start(completed: {
+                            self?.controller?.dismiss()
+                        })
+                    })))
                 }
-
-
                 return items
             }
         }
 
+        private func contextMenuAudioItems() -> Signal<[ContextMenuItem], NoError> {
+            guard let (availableOutputs, currentOutput) = self.audioOutputState else {
+                return .single([])
+            }
+
+            var items: [ContextMenuItem] = []
+            for output in availableOutputs {
+                let title: String
+                switch output {
+                    case .builtin:
+                        title = UIDevice.current.model
+                    case .speaker:
+                        title = self.presentationData.strings.Call_AudioRouteSpeaker
+                    case .headphones:
+                        title = self.presentationData.strings.Call_AudioRouteHeadphones
+                    case let .port(port):
+                        title = port.name
+                }
+                items.append(.action(ContextMenuActionItem(text: title, icon: { theme in
+                    if output == currentOutput {
+                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Check"), color: theme.actionSheet.primaryTextColor)
+                    } else {
+                        return nil
+                    }
+               }, action: { [weak self] _, f in
+                    f(.default)
+                    self?.call.setCurrentAudioOutput(output)
+                })))
+            }
+            items.append(.separator)
+            items.append(.action(ContextMenuActionItem(text: self.presentationData.strings.Common_Back, icon: { theme in
+                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.actionSheet.primaryTextColor)
+            }, action: { [weak self] (c, _) in
+                guard let strongSelf = self else {
+                    return
+                }
+                c.setItems(strongSelf.contextMenuMainItems())
+            })))
+            return .single(items)
+        }
+        
         private func contextMenuDisplayAsItems() -> Signal<[ContextMenuItem], NoError> {
             guard let myPeerId = self.callState?.myPeerId else {
                 return .single([])
             }
 
             let avatarSize = CGSize(width: 28.0, height: 28.0)
-            let canManageCall = !self.optionsButtonIsAvatar
             let darkTheme = self.darkTheme
 
             return self.displayAsPeersPromise.get()
@@ -1942,7 +2692,10 @@ public final class VoiceChatController: ViewController {
                 
                 var isGroup = false
                 for peer in peers {
-                    if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
+                    if peer.peer is TelegramGroup {
+                        isGroup = true
+                        break
+                    } else if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
                         isGroup = true
                         break
                     }
@@ -2003,17 +2756,15 @@ public final class VoiceChatController: ViewController {
                         items.append(.separator)
                     }
                 }
-                if canManageCall {
-                    items.append(.separator)
-                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Common_Back, icon: { theme in
-                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.actionSheet.primaryTextColor)
-                    }, action: { (c, _) in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        c.setItems(strongSelf.contextMenuMainItems())
-                    })))
-                }
+                items.append(.separator)
+                items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.Common_Back, icon: { theme in
+                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Back"), color: theme.actionSheet.primaryTextColor)
+                }, action: { (c, _) in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    c.setItems(strongSelf.contextMenuMainItems())
+                })))
                 return items
             }
         }
@@ -2082,12 +2833,205 @@ public final class VoiceChatController: ViewController {
             panRecognizer.delaysTouchesBegan = false
             panRecognizer.cancelsTouchesInView = true
             self.view.addGestureRecognizer(panRecognizer)
+            
+            if self.isScheduling {
+                self.setupSchedulePickerView()
+                self.updateScheduleButtonTitle()
+            }
+        }
+        
+        private func updateSchedulePickerLimits() {
+            let timeZone = TimeZone(secondsFromGMT: 0)!
+            var calendar = Calendar(identifier: .gregorian)
+            calendar.timeZone = timeZone
+            let currentDate = Date()
+            var components = calendar.dateComponents(Set([.era, .year, .month, .day, .hour, .minute, .second]), from: currentDate)
+            components.second = 0
+            
+            let roundedDate = calendar.date(from: components)!
+            let next1MinDate = calendar.date(byAdding: .minute, value: 1, to: roundedDate)
+            
+            let minute = components.minute ?? 0
+            components.minute = 0
+            let roundedToHourDate = calendar.date(from: components)!
+            components.hour = 0
+        
+            let roundedToMidnightDate = calendar.date(from: components)!
+            let nextTwoHourDate = calendar.date(byAdding: .hour, value: minute > 30 ? 4 : 3, to: roundedToHourDate)
+            let maxDate = calendar.date(byAdding: .day, value: 8, to: roundedToMidnightDate)
+        
+            if let date = calendar.date(byAdding: .day, value: 365, to: currentDate) {
+                self.pickerView?.maximumDate = date
+            }
+            if let next1MinDate = next1MinDate, let nextTwoHourDate = nextTwoHourDate {
+                self.pickerView?.minimumDate = next1MinDate
+                self.pickerView?.maximumDate = maxDate
+                self.pickerView?.date = nextTwoHourDate
+            }
+        }
+        
+        private func setupSchedulePickerView() {
+            var currentDate: Date?
+            if let pickerView = self.pickerView {
+                currentDate = pickerView.date
+                pickerView.removeFromSuperview()
+            }
+            
+            let textColor = UIColor.white
+            UILabel.setDateLabel(textColor)
+            
+            let pickerView = UIDatePicker()
+            pickerView.timeZone = TimeZone(secondsFromGMT: 0)
+            pickerView.datePickerMode = .countDownTimer
+            pickerView.datePickerMode = .dateAndTime
+            pickerView.locale = Locale.current
+            pickerView.timeZone = TimeZone.current
+            pickerView.minuteInterval = 1
+            self.contentContainer.view.addSubview(pickerView)
+            pickerView.addTarget(self, action: #selector(self.scheduleDatePickerUpdated), for: .valueChanged)
+            if #available(iOS 13.4, *) {
+                pickerView.preferredDatePickerStyle = .wheels
+            }
+            pickerView.setValue(textColor, forKey: "textColor")
+            self.pickerView = pickerView
+            
+            self.updateSchedulePickerLimits()
+            if let currentDate = currentDate {
+                pickerView.date = currentDate
+            }
+        }
+        
+        private let calendar = Calendar(identifier: .gregorian)
+        private func updateScheduleButtonTitle() {
+            guard let date = self.pickerView?.date else {
+                return
+            }
+            
+            let calendar = Calendar(identifier: .gregorian)
+            let currentTimestamp = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+            let timestamp = Int32(date.timeIntervalSince1970)
+            let time = stringForMessageTimestamp(timestamp: timestamp, dateTimeFormat: self.presentationData.dateTimeFormat)
+            let buttonTitle: String
+            if calendar.isDateInToday(date) {
+                buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleToday(time).0
+            } else if calendar.isDateInTomorrow(date) {
+                buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleTomorrow(time).0
+            } else {
+                buttonTitle = self.presentationData.strings.ScheduleVoiceChat_ScheduleOn(self.dateFormatter.string(from: date), time).0
+            }
+            self.scheduleButtonTitle = buttonTitle
+            
+            let delta = timestamp - currentTimestamp
+            
+            var isGroup = true
+            if let peer = self.peer as? TelegramChannel, case .broadcast = peer.info {
+                isGroup = false
+            }
+            let intervalString = scheduledTimeIntervalString(strings: self.presentationData.strings, value: max(60, delta))
+            self.scheduleTextNode.attributedText = NSAttributedString(string: isGroup ? self.presentationData.strings.ScheduleVoiceChat_GroupText(intervalString).0 : self.presentationData.strings.ScheduleVoiceChat_ChannelText(intervalString).0, font: Font.regular(14.0), textColor: UIColor(rgb: 0x8e8e93))
+            
+            if let (layout, navigationHeight) = self.validLayout {
+                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
+            }
+        }
+        
+        @objc private func scheduleDatePickerUpdated() {
+            self.updateScheduleButtonTitle()
+        }
+        
+        private func schedule() {
+            if let date = self.pickerView?.date, date > Date() {
+                self.call.schedule(timestamp: Int32(date.timeIntervalSince1970))
+                                   
+                self.isScheduling = false
+                self.transitionToScheduled()
+                if let (layout, navigationHeight) = self.validLayout {
+                    self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
+                }
+            }
+        }
+        
+        private func dismissScheduled() {
+            self.leaveDisposable.set((self.call.leave(terminateIfPossible: true)
+            |> deliverOnMainQueue).start(completed: { [weak self] in
+                self?.controller?.dismiss(closing: true)
+            }))
+        }
+        
+        private func transitionToScheduled() {
+            let springDuration: Double = 0.6
+            let springDamping: CGFloat = 100.0
+            
+            self.optionsButton.alpha = 1.0
+            self.optionsButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.optionsButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping)
+            self.optionsButton.isUserInteractionEnabled = true
+            
+            self.closeButton.alpha = 1.0
+            self.closeButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.closeButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping)
+            self.closeButton.isUserInteractionEnabled = true
+            
+            self.audioButton.alpha = 1.0
+            self.audioButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.audioButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping)
+            self.audioButton.isUserInteractionEnabled = true
+            
+            self.leaveButton.alpha = 1.0
+            self.leaveButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.leaveButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, damping: springDamping)
+            self.leaveButton.isUserInteractionEnabled = true
+            
+            self.scheduleCancelButton.alpha = 0.0
+            self.scheduleCancelButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15)
+            self.scheduleCancelButton.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: 26.0), duration: 0.2, removeOnCompletion: false, additive: true)
+            
+            self.actionButton.titleLabel.layer.animatePosition(from: CGPoint(x: 0.0, y: -26.0), to: CGPoint(), duration: 0.2, additive: true)
+            
+            if let pickerView = self.pickerView {
+                self.pickerView = nil
+                pickerView.alpha = 0.0
+                pickerView.layer.animateScale(from: 1.0, to: 0.25, duration: 0.15, removeOnCompletion: false)
+                pickerView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak pickerView] _ in
+                    pickerView?.removeFromSuperview()
+                })
+                pickerView.isUserInteractionEnabled = false
+            }
+            
+            self.timerNode.isHidden = false
+            self.timerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+            self.timerNode.animateIn()
+            
+            self.scheduleTextNode.alpha = 0.0
+            self.scheduleTextNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25)
+            
+            self.updateTitle(slide: true, transition: .animated(duration: 0.2, curve: .easeInOut))
+        }
+        
+        private func transitionToCall() {
+            self.updateDecorationsColors()
+            
+            self.listNode.alpha = 1.0
+            self.listNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.listNode.isUserInteractionEnabled = true
+            
+            self.timerNode.alpha = 0.0
+            self.timerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, completion: { [weak self] _ in
+                self?.timerNode.isHidden = true
+            })
+                        
+            if self.audioButton.isHidden {
+                self.audioButton.isHidden = false
+                self.audioButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                self.audioButton.layer.animateSpring(from: 0.01 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0)
+            }
+            
+            self.updateTitle(transition: .animated(duration: 0.2, curve: .easeInOut))
         }
         
         @objc private func optionsPressed() {
-            if self.optionsButton.isUserInteractionEnabled {
-                self.optionsButton.contextAction?(self.optionsButton.containerNode, nil)
-            }
+            self.optionsButton.play()
+            self.optionsButton.contextAction?(self.optionsButton.containerNode, nil)
         }
         
         @objc private func closePressed() {
@@ -2095,6 +3039,18 @@ public final class VoiceChatController: ViewController {
             self.controller?.dismissAllTooltips()
         }
         
+        @objc private func panelPressed() {
+            guard let (layout, navigationHeight) = self.validLayout, !self.animatingExpansion && !self.animatingMainStage && !self.mainStageNode.animating else {
+                return
+            }
+            self.panelHidden = !self.panelHidden
+            
+            self.animatingExpansion = true
+            let transition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
+            self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+            self.updateDecorationsLayout(transition: transition)
+        }
+        
         @objc private func leavePressed() {
             self.hapticFeedback.impact(.light)
             self.controller?.dismissAllTooltips()
@@ -2105,18 +3061,30 @@ public final class VoiceChatController: ViewController {
                         return
                     }
 
-                    let _ = (strongSelf.call.leave(terminateIfPossible: true)
-                    |> filter { $0 }
-                    |> take(1)
+                    strongSelf.leaveDisposable.set((strongSelf.call.leave(terminateIfPossible: true)
                     |> deliverOnMainQueue).start(completed: {
                         self?.controller?.dismiss()
-                    })
+                    }))
                 }
                 
                 let actionSheet = ActionSheetController(presentationData: self.presentationData.withUpdated(theme: self.darkTheme))
                 var items: [ActionSheetItem] = []
                 
                 items.append(ActionSheetTextItem(title: self.presentationData.strings.VoiceChat_LeaveConfirmation))
+                items.append(ActionSheetButtonItem(title: self.isScheduled ? self.presentationData.strings.VoiceChat_LeaveAndCancelVoiceChat : self.presentationData.strings.VoiceChat_LeaveAndEndVoiceChat, color: .destructive, action: { [weak self, weak actionSheet] in
+                    actionSheet?.dismissAnimated()
+                    
+                    if let strongSelf = self {
+                        if let (members, _) = strongSelf.currentCallMembers, members.count >= 10 || true {
+                            let alertController = textAlertController(context: strongSelf.context, forceTheme: strongSelf.darkTheme, title: strongSelf.isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationTitle : strongSelf.presentationData.strings.VoiceChat_EndConfirmationTitle, text: strongSelf.isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationText :  strongSelf.presentationData.strings.VoiceChat_EndConfirmationText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .genericAction, title: strongSelf.isScheduled ? strongSelf.presentationData.strings.VoiceChat_CancelConfirmationEnd :  strongSelf.presentationData.strings.VoiceChat_EndConfirmationEnd, action: {
+                                action()
+                            })])
+                            strongSelf.controller?.present(alertController, in: .window(.root))
+                        } else {
+                            action()
+                        }
+                    }
+                }))
                 items.append(ActionSheetButtonItem(title: self.presentationData.strings.VoiceChat_LeaveVoiceChat, color: .accent, action: { [weak self, weak actionSheet] in
                     actionSheet?.dismissAnimated()
                     
@@ -2130,12 +3098,6 @@ public final class VoiceChatController: ViewController {
                     }))
                 }))
                 
-                items.append(ActionSheetButtonItem(title: self.presentationData.strings.VoiceChat_LeaveAndEndVoiceChat, color: .destructive, action: { [weak actionSheet] in
-                    actionSheet?.dismissAnimated()
-                    
-                     action()
-                }))
-
                 actionSheet.setItemGroups([
                     ActionSheetItemGroup(items: items),
                     ActionSheetItemGroup(items: [
@@ -2155,8 +3117,12 @@ public final class VoiceChatController: ViewController {
         
         @objc func dimTapGesture(_ recognizer: UITapGestureRecognizer) {
             if case .ended = recognizer.state {
-                self.controller?.dismiss(closing: false)
-                self.controller?.dismissAllTooltips()
+                if self.isScheduling {
+                    self.dismissScheduled()
+                } else {
+                    self.controller?.dismiss(closing: false)
+                    self.controller?.dismissAllTooltips()
+                }
             }
         }
         
@@ -2208,7 +3174,7 @@ public final class VoiceChatController: ViewController {
                             return formatSendTitle(presentationData.strings.VoiceChat_InviteLink_InviteListeners(Int32(count)))
                         })]
                     }
-                    let shareController = ShareController(context: strongSelf.context, subject: .url(inviteLinks.listenerLink), segmentedValues: segmentedValues, forcedTheme: strongSelf.darkTheme, forcedActionTitle: presentationData.strings.VoiceChat_CopyInviteLink)
+                    let shareController = ShareController(context: strongSelf.context, subject: .url(inviteLinks.listenerLink), segmentedValues: segmentedValues, forceTheme: strongSelf.darkTheme, forcedActionTitle: presentationData.strings.VoiceChat_CopyInviteLink)
                     shareController.completed = { [weak self] peerIds in
                         if let strongSelf = self {
                             let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
@@ -2256,23 +3222,25 @@ public final class VoiceChatController: ViewController {
             })
         }
         
-        private var pressTimer: SwiftSignalKit.Timer?
-        private func startPressTimer() {
-            self.pressTimer?.invalidate()
+        private var actionButtonPressTimer: SwiftSignalKit.Timer?
+        private var actionButtonPressedTimestamp: Double?
+        private func startActionButtonPressTimer() {
+            self.actionButtonPressTimer?.invalidate()
             let pressTimer = SwiftSignalKit.Timer(timeout: 0.185, repeat: false, completion: { [weak self] in
-                self?.pressTimerFired()
-                self?.pressTimer = nil
+                self?.actionButtonPressedTimestamp = CACurrentMediaTime()
+                self?.actionButtonPressTimerFired()
+                self?.actionButtonPressTimer = nil
             }, queue: Queue.mainQueue())
-            self.pressTimer = pressTimer
+            self.actionButtonPressTimer = pressTimer
             pressTimer.start()
         }
         
-        private func stopPressTimer() {
-            self.pressTimer?.invalidate()
-            self.pressTimer = nil
+        private func stopActionButtonPressTimer() {
+            self.actionButtonPressTimer?.invalidate()
+            self.actionButtonPressTimer = nil
         }
         
-        private func pressTimerFired() {
+        private func actionButtonPressTimerFired() {
             guard let callState = self.callState else {
                 return
             }
@@ -2285,14 +3253,44 @@ public final class VoiceChatController: ViewController {
                 self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
             }
             
-            self.updateMembers(muteState: self.effectiveMuteState, callMembers: self.currentCallMembers ?? ([], nil), invitedPeers: self.currentInvitedPeers ?? [], speakingPeers: self.currentSpeakingPeers ?? Set())
+            self.updateMembers()
         }
         
         @objc private func actionButtonPressGesture(_ gestureRecognizer: UILongPressGestureRecognizer) {
             guard let callState = self.callState else {
                 return
             }
-            if case .connecting = callState.networkState {
+            if case .connecting = callState.networkState, callState.scheduleTimestamp == nil && !self.isScheduling {
+                return
+            }
+            if callState.scheduleTimestamp != nil || self.isScheduling {
+                switch gestureRecognizer.state {
+                    case .began:
+                        self.actionButton.pressing = true
+                        self.hapticFeedback.impact(.light)
+                    case .ended, .cancelled:
+                        self.actionButton.pressing = false
+                        
+                        let location = gestureRecognizer.location(in: self.actionButton.view)
+                        if self.actionButton.hitTest(location, with: nil) != nil {
+                            if self.isScheduling {
+                                self.schedule()
+                            } else if callState.canManageCall {
+                                self.call.startScheduled()
+                            } else {
+                                if !callState.subscribedToScheduled {
+                                    let location = self.actionButton.view.convert(self.actionButton.bounds, to: self.view).center
+                                    let point = CGRect(origin: CGPoint(x: location.x - 5.0, y: location.y - 5.0 - 68.0), size: CGSize(width: 10.0, height: 10.0))
+                                    self.controller?.present(TooltipScreen(text: self.presentationData.strings.VoiceChat_ReminderNotify, style: .gradient(UIColor(rgb: 0x262c5a), UIColor(rgb: 0x5d2835)), icon: nil, location: .point(point, .bottom), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in
+                                        return .dismiss(consume: false)
+                                    }), in: .window(.root))
+                                }
+                                self.call.toggleScheduledSubscription(!callState.subscribedToScheduled)
+                            }
+                        }
+                    default:
+                        break
+                }
                 return
             }
             if let muteState = callState.muteState {
@@ -2319,20 +3317,39 @@ public final class VoiceChatController: ViewController {
                 case .began:
                     self.actionButton.pressing = true
                     self.hapticFeedback.impact(.light)
-                    self.startPressTimer()
+                    self.actionButtonPressedTimestamp = nil
+                    self.startActionButtonPressTimer()
                     if let (layout, navigationHeight) = self.validLayout {
                         self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
                     }
                 case .ended, .cancelled:
-                    self.pushingToTalk = false
-                    self.actionButton.pressing = false
-                    
-                    if self.pressTimer != nil {
-                        self.stopPressTimer()
+                    if self.actionButtonPressTimer != nil {
+                        self.pushingToTalk = false
+                        self.actionButton.pressing = false
+                        
+                        self.stopActionButtonPressTimer()
                         self.call.toggleIsMuted()
                     } else {
                         self.hapticFeedback.impact(.light)
-                        self.call.setIsMuted(action: .muted(isPushToTalkActive: false))
+                        if self.pushingToTalk, let timestamp = self.actionButtonPressedTimestamp, CACurrentMediaTime() < timestamp + 0.5 {
+                            self.pushingToTalk = false
+                            self.temporaryPushingToTalk = true
+                            self.call.setIsMuted(action: .unmuted)
+                            
+                            Queue.mainQueue().after(0.1) {
+                                self.temporaryPushingToTalk = false
+                                self.actionButton.pressing = false
+                                
+                                if let (layout, navigationHeight) = self.validLayout {
+                                    self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
+                                }
+                            }
+                        } else {
+                            self.pushingToTalk = false
+                            self.actionButton.pressing = false
+                            
+                            self.call.setIsMuted(action: .muted(isPushToTalkActive: false))
+                        }
                     }
                     
                     if let callState = self.callState {
@@ -2342,17 +3359,60 @@ public final class VoiceChatController: ViewController {
                     if let (layout, navigationHeight) = self.validLayout {
                         self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .spring))
                     }
-                    self.updateMembers(muteState: self.effectiveMuteState, callMembers: self.currentCallMembers ?? ([], nil), invitedPeers: self.currentInvitedPeers ?? [], speakingPeers: self.currentSpeakingPeers ?? Set())
+                    self.updateMembers()
                 default:
                     break
             }
         }
         
-        @objc private func actionButtonPressed() {
+        @objc private func actionPressed() {
+            if self.isScheduling {
+                self.schedule()
+            }
         }
         
-        @objc private func audioOutputPressed() {
+        @objc private func audioPressed() {
             self.hapticFeedback.impact(.light)
+                        
+            if let _ = self.callState?.scheduleTimestamp {
+                if let callState = self.callState, let peer = self.peer, !callState.canManageCall && (peer.addressName?.isEmpty ?? true) {
+                    return
+                }
+                
+                let _ = (self.inviteLinksPromise.get()
+                |> take(1)
+                |> deliverOnMainQueue).start(next: { [weak self] inviteLinks in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    
+                    let callPeerId = strongSelf.call.peerId
+                    let _ = (strongSelf.context.account.postbox.transaction { transaction -> GroupCallInviteLinks? in
+                        if let inviteLinks = inviteLinks {
+                            return inviteLinks
+                        } else if let peer = transaction.getPeer(callPeerId), let addressName = peer.addressName, !addressName.isEmpty {
+                            return GroupCallInviteLinks(listenerLink: "https://t.me/\(addressName)?voicechat", speakerLink: nil)
+                        } else if let cachedData = transaction.getPeerCachedData(peerId: callPeerId) {
+                            if let cachedData = cachedData as? CachedChannelData, let link = cachedData.exportedInvitation?.link {
+                                return GroupCallInviteLinks(listenerLink: link, speakerLink: nil)
+                            } else if let cachedData = cachedData as? CachedGroupData, let link = cachedData.exportedInvitation?.link {
+                                return GroupCallInviteLinks(listenerLink: link, speakerLink: nil)
+                            }
+                        }
+                        return nil
+                    }
+                    |> deliverOnMainQueue).start(next: { links in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        
+                        if let links = links {
+                            strongSelf.presentShare(links)
+                        }
+                    })
+                })
+                return
+            }
             
             guard let (availableOutputs, currentOutput) = self.audioOutputState else {
                 return
@@ -2360,8 +3420,7 @@ public final class VoiceChatController: ViewController {
             guard availableOutputs.count >= 2 else {
                 return
             }
-            let hasMute = false
-            
+
             if availableOutputs.count == 2 {
                 for output in availableOutputs {
                     if output != currentOutput {
@@ -2370,12 +3429,9 @@ public final class VoiceChatController: ViewController {
                     }
                 }
             } else {
-                let actionSheet = ActionSheetController(presentationData: self.presentationData)
+                let actionSheet = ActionSheetController(presentationData: self.presentationData.withUpdated(theme: self.darkTheme))
                 var items: [ActionSheetItem] = []
                 for output in availableOutputs {
-                    if hasMute, case .builtin = output {
-                        continue
-                    }
                     let title: String
                     var icon: UIImage?
                     switch output {
@@ -2391,7 +3447,9 @@ public final class VoiceChatController: ViewController {
                             if port.type == .bluetooth {
                                 var image = UIImage(bundleImageName: "Call/CallBluetoothButton")
                                 let portName = port.name.lowercased()
-                                if portName.contains("airpods pro") {
+                                if portName.contains("airpods max") {
+                                    image = UIImage(bundleImageName: "Call/CallAirpodsMaxButton")
+                                } else if portName.contains("airpods pro") {
                                     image = UIImage(bundleImageName: "Call/CallAirpodsProButton")
                                 } else if portName.contains("airpods") {
                                     image = UIImage(bundleImageName: "Call/CallAirpodsButton")
@@ -2416,29 +3474,156 @@ public final class VoiceChatController: ViewController {
         }
         
         @objc private func cameraPressed() {
-            if self.call.isVideo {
+            self.hapticFeedback.impact(.light)
+            if self.call.hasVideo {
                 self.call.disableVideo()
+                
+                if let (layout, navigationHeight) = self.validLayout {
+                    self.animatingButtonsSwap = true
+                    self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring))
+                }
             } else {
-                self.call.requestVideo()
+                DeviceAccess.authorizeAccess(to: .camera(.videoCall), onlyCheck: true, presentationData: self.presentationData.withUpdated(theme: self.darkTheme), present: { [weak self] c, a in
+                    self?.controller?.present(c, in: .window(.root), with: a)
+                }, openSettings: { [weak self] in
+                    self?.context.sharedContext.applicationBindings.openSettings()
+                }, _: { [weak self] ready in
+                    guard let strongSelf = self, ready else {
+                        return
+                    }
+                    let videoCapturer = OngoingCallVideoCapturer()
+                    let input = videoCapturer.video()
+                    if let videoView = strongSelf.videoRenderingContext.makeView(input: input, blur: false) {
+                        let cameraNode = GroupVideoNode(videoView: videoView, backdropVideoView: nil)
+                        let controller = VoiceChatCameraPreviewController(context: strongSelf.context, cameraNode: cameraNode, shareCamera: { [weak self] _, unmuted in
+                            if let strongSelf = self {
+                                strongSelf.call.setIsMuted(action: unmuted ? .unmuted : .muted(isPushToTalkActive: false))
+                                (strongSelf.call as! PresentationGroupCallImpl).requestVideo(capturer: videoCapturer)
+
+                                if let (layout, navigationHeight) = strongSelf.validLayout {
+                                    strongSelf.animatingButtonsSwap = true
+                                    strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring))
+                                }
+                            }
+                        }, switchCamera: { [weak self] in
+                            Queue.mainQueue().after(0.1) {
+                                self?.call.switchVideoCamera()
+                            }
+                        })
+                        strongSelf.controller?.present(controller, in: .window(.root))
+                    }
+
+                    /*strongSelf.call.makeOutgoingVideoView(requestClone: false, completion: { [weak self] view, _ in
+                        guard let strongSelf = self, let view = view else {
+                            return
+                        }
+                        let cameraNode = GroupVideoNode(videoView: view, backdropVideoView: nil)
+                        let controller = VoiceChatCameraPreviewController(context: strongSelf.context, cameraNode: cameraNode, shareCamera: { [weak self] videoNode, unmuted in
+                            if let strongSelf = self {
+                                strongSelf.call.setIsMuted(action: unmuted ? .unmuted : .muted(isPushToTalkActive: false))
+                                strongSelf.call.requestVideo()
+                                
+                                if let (layout, navigationHeight) = strongSelf.validLayout {
+                                    strongSelf.animatingButtonsSwap = true
+                                    strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.4, curve: .spring))
+                                }
+                            }
+                        }, switchCamera: { [weak self] in
+                            Queue.mainQueue().after(0.1) {
+                                self?.call.switchVideoCamera()
+                            }
+                        })
+                        strongSelf.controller?.present(controller, in: .window(.root))
+                    })*/
+                })
             }
         }
         
-        private func updateFloatingHeaderOffset(offset: CGFloat, transition: ContainedViewLayoutTransition, completion: (() -> Void)? = nil) {
+        @objc private func switchCameraPressed() {
+            self.hapticFeedback.impact(.light)
+            Queue.mainQueue().after(0.1) {
+                self.call.switchVideoCamera()
+            }
+            
+            if let callState = self.callState {
+                for entry in self.currentFullscreenEntries {
+                    if case let .peer(peerEntry, _) = entry {
+                        if peerEntry.peer.id == callState.myPeerId {
+                            if let videoEndpointId = peerEntry.videoEndpointId, let videoNode = self.videoNodes[videoEndpointId] {
+                                videoNode.flip(withBackground: false)
+                            }
+                            break
+                        }
+                    }
+                }
+            }
+            self.mainStageNode.flipVideoIfNeeded()
+            
+            let springDuration: Double = 0.7
+            let springDamping: CGFloat = 100.0
+            self.switchCameraButton.isUserInteractionEnabled = false
+            self.switchCameraButton.layer.animateSpring(from: 0.0 as NSNumber, to: CGFloat.pi as NSNumber, keyPath: "transform.rotation.z", duration: springDuration, damping: springDamping, completion: { [weak self] _ in
+                self?.switchCameraButton.isUserInteractionEnabled = true
+            })
+        }
+        
+        private var isLandscape: Bool {
+            if let (layout, _) = self.validLayout, layout.size.width > layout.size.height, case .compact = layout.metrics.widthClass {
+                return true
+            } else {
+                return false
+            }
+        }
+        
+        private var effectiveBottomAreaHeight: CGFloat {
+            if let (layout, _) = self.validLayout, case .regular = layout.metrics.widthClass {
+                return bottomAreaHeight
+            }
+            switch self.displayMode {
+                case .modal:
+                    return bottomAreaHeight
+                case let .fullscreen(controlsHidden):
+                    return controlsHidden ? 0.0 : fullscreenBottomAreaHeight
+            }
+        }
+        
+        private var isFullscreen: Bool {
+            switch self.displayMode {
+                case .fullscreen(_), .modal(_, true):
+                    return true
+                default:
+                    return false
+            }
+        }
+                
+        private func updateDecorationsLayout(transition: ContainedViewLayoutTransition, completion: (() -> Void)? = nil) {
             guard let (layout, _) = self.validLayout else {
                 return
             }
-
-            let layoutTopInset: CGFloat = max(layout.statusBarHeight ?? 0.0, layout.safeInsets.top)
-            let topPanelHeight: CGFloat = 63.0
-            let listTopInset = layoutTopInset + topPanelHeight
-            let bottomPanelHeight = bottomAreaHeight + layout.intrinsicInsets.bottom
+           
+            let isLandscape = self.isLandscape
             
-            var size = layout.size
+            let layoutTopInset: CGFloat = max(layout.statusBarHeight ?? 0.0, layout.safeInsets.top)
+            let listTopInset = isLandscape ? topPanelHeight : layoutTopInset + topPanelHeight
+            let bottomPanelHeight = isLandscape ? layout.intrinsicInsets.bottom : bottomAreaHeight + layout.intrinsicInsets.bottom
+            
+            let size = layout.size
+            let contentWidth: CGFloat
+            var contentLeftInset: CGFloat = 0.0
+            var forceUpdate = false
             if case .regular = layout.metrics.widthClass {
-                size.width = floor(min(size.width, size.height) * 0.5)
+                contentWidth = max(320.0, min(375.0, floor(size.width * 0.3)))
+                if self.peerIdToEndpointId.isEmpty {
+                    contentLeftInset = 0.0
+                } else {
+                    contentLeftInset = self.panelHidden ? layout.size.width : layout.size.width - contentWidth
+                }
+                forceUpdate = true
+            } else {
+                contentWidth = isLandscape ? min(530.0, size.width - 210.0) : size.width
             }
             
-            let listSize = CGSize(width: size.width, height: layout.size.height - listTopInset - bottomPanelHeight)
+            let listSize = CGSize(width: contentWidth, height: layout.size.height - listTopInset - bottomPanelHeight + bottomGradientHeight)
             let topInset: CGFloat
             if let (panInitialTopInset, panOffset) = self.panGestureArguments {
                 if self.isExpanded {
@@ -2446,105 +3631,195 @@ public final class VoiceChatController: ViewController {
                 } else {
                     topInset = max(0.0, panInitialTopInset + min(0.0, panOffset))
                 }
-            } else if let _ = self.animation {
-                topInset = self.listNode.frame.minY - listTopInset
+            } else if case .regular = layout.metrics.widthClass {
+                topInset = 0.0
             } else if let currentTopInset = self.topInset {
                 topInset = self.isExpanded ? 0.0 : currentTopInset
             } else {
-                topInset = listSize.height
+                topInset = listSize.height - 46.0 - floor(56.0 * 3.5)
             }
             
-            let offset = offset + topInset
-            self.floatingHeaderOffset = offset
-                    
-            let rawPanelOffset = offset + listTopInset - topPanelHeight
+            var bottomEdge: CGFloat = 0.0
+            if case .regular = layout.metrics.widthClass {
+                bottomEdge = size.height
+            } else {
+                self.listNode.forEachItemNode { itemNode in
+                    if let itemNode = itemNode as? ListViewItemNode {
+                        let convertedFrame = self.listNode.view.convert(itemNode.frame, to: self.contentContainer.view)
+                        if convertedFrame.maxY > bottomEdge {
+                            bottomEdge = convertedFrame.maxY
+                        }
+                    }
+                }
+                if bottomEdge.isZero {
+                    bottomEdge = self.listNode.frame.minY + 46.0 + 56.0
+                }
+            }
+            
+            let rawPanelOffset = topInset + listTopInset - topPanelHeight
             let panelOffset = max(layoutTopInset, rawPanelOffset)
-            let topPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: panelOffset), size: CGSize(width: size.width, height: topPanelHeight))
-            
-            if let mainVideoContainer = self.mainVideoContainer {
-                let videoContainerFrame = CGRect(origin: CGPoint(x: 0.0, y: topPanelFrame.maxY), size: CGSize(width: layout.size.width, height: 200.0))
-                transition.updateFrameAdditive(node: mainVideoContainer, frame: videoContainerFrame)
-                mainVideoContainer.update(size: videoContainerFrame.size, transition: transition)
+            let topPanelFrame: CGRect
+            if isLandscape {
+                topPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: topPanelHeight))
+            } else {
+                topPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: panelOffset), size: CGSize(width: size.width, height: topPanelHeight))
             }
             
+            let sideInset: CGFloat = 14.0
+            
+            let bottomPanelCoverHeight = bottomAreaHeight + layout.intrinsicInsets.bottom
+            var bottomGradientFrame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelCoverHeight), size: CGSize(width: size.width, height: bottomGradientHeight))
+            if isLandscape {
+                bottomGradientFrame.origin.y = layout.size.height
+            }
+            
+            let transitionContainerFrame = CGRect(x: 0.0, y: 0.0, width: layout.size.width, height: layout.size.height)
+            transition.updateFrame(node: self.transitionContainerNode, frame: transitionContainerFrame)
+            transition.updateFrame(view: self.transitionMaskView, frame: CGRect(x: 0.0, y: 0.0, width: transitionContainerFrame.width, height: transitionContainerFrame.height))
+            let updateMaskLayers = {
+                var topPanelFrame = topPanelFrame
+                if self.animatingContextMenu {
+                    topPanelFrame.origin.y = 0.0
+                }
+                transition.updateFrame(layer: self.transitionMaskTopFillLayer, frame: CGRect(x: 0.0, y: 0.0, width: transitionContainerFrame.width, height: topPanelFrame.maxY))
+                transition.updateFrame(layer: self.transitionMaskFillLayer, frame: CGRect(x: 0.0, y: topPanelFrame.maxY, width: transitionContainerFrame.width, height: bottomGradientFrame.minY - topPanelFrame.maxY))
+                transition.updateFrame(layer: self.transitionMaskGradientLayer, frame: CGRect(x: 0.0, y: bottomGradientFrame.minY, width: transitionContainerFrame.width, height: bottomGradientFrame.height))
+                transition.updateFrame(layer: self.transitionMaskBottomFillLayer, frame: CGRect(x: 0.0, y: bottomGradientFrame.minY, width: transitionContainerFrame.width, height: max(0.0, transitionContainerFrame.height - bottomGradientFrame.minY)))
+            }
+            if transition.isAnimated {
+                updateMaskLayers()
+            } else {
+                CATransaction.begin()
+                CATransaction.setDisableActions(true)
+                updateMaskLayers()
+                CATransaction.commit()
+            }
+            
+            var bottomInset: CGFloat = 0.0
+            if case .compact = layout.metrics.widthClass, case let .fullscreen(controlsHidden) = self.displayMode {
+                if !controlsHidden {
+                    bottomInset = 80.0
+                }
+            }
+            transition.updateAlpha(node: self.bottomGradientNode, alpha: self.isLandscape ? 0.0 : 1.0)
+            
+            var isTablet = false
+            let videoFrame: CGRect
+            let videoContainerFrame: CGRect
+            if case .regular = layout.metrics.widthClass {
+                isTablet = true
+                let videoTopEdgeY = topPanelFrame.maxY
+                let videoBottomEdgeY = layout.size.height - layout.intrinsicInsets.bottom
+                videoFrame = CGRect(x: sideInset, y: 0.0, width: contentLeftInset - sideInset, height: videoBottomEdgeY - videoTopEdgeY)
+                videoContainerFrame = CGRect(origin: CGPoint(x: 0.0, y: videoTopEdgeY), size: CGSize(width: contentLeftInset, height: layout.size.height))
+            } else {
+                let videoTopEdgeY = isLandscape ? 0.0 : layoutTopInset
+                let videoBottomEdgeY = self.isLandscape ? layout.size.height : layout.size.height - layout.intrinsicInsets.bottom - 92.0
+                videoFrame = CGRect(x: 0.0, y: videoTopEdgeY, width: isLandscape ? max(0.0, layout.size.width - layout.safeInsets.right - 92.0) : layout.size.width, height: videoBottomEdgeY - videoTopEdgeY)
+                videoContainerFrame = CGRect(origin: CGPoint(), size: layout.size)
+            }
+            transition.updateFrame(node: self.mainStageContainerNode, frame: videoContainerFrame)
+            transition.updateFrame(node: self.mainStageBackgroundNode, frame: videoFrame)
+            if !self.mainStageNode.animating {
+                transition.updateFrame(node: self.mainStageNode, frame: videoFrame)
+            }
+            self.mainStageNode.update(size: videoFrame.size, sideInset: layout.safeInsets.left, bottomInset: self.isLandscape ? 0.0 : bottomInset, isLandscape: videoFrame.width > videoFrame.height, isTablet: isTablet, transition: transition)
+            
             let backgroundFrame = CGRect(origin: CGPoint(x: 0.0, y: topPanelFrame.maxY), size: CGSize(width: size.width, height: layout.size.height))
-            let sideInset: CGFloat = 16.0
-            let leftBorderFrame = CGRect(origin: CGPoint(x: 0.0, y: topPanelFrame.maxY - 16.0), size: CGSize(width: sideInset, height: layout.size.height))
-            let rightBorderFrame = CGRect(origin: CGPoint(x: size.width - sideInset, y: topPanelFrame.maxY - 16.0), size: CGSize(width: sideInset, height: layout.size.height))
+            
+            let leftBorderFrame: CGRect
+            let rightBorderFrame: CGRect
+            let additionalInset: CGFloat = 60.0
+            let additionalSideInset = (size.width - contentWidth) / 2.0
+            let additionalLeftInset = size.width / 2.0
+            if isLandscape {
+                leftBorderFrame = CGRect(origin: CGPoint(x: 0.0, y: topPanelFrame.maxY - additionalInset), size: CGSize(width: (size.width - contentWidth) / 2.0 + sideInset, height: layout.size.height))
+                rightBorderFrame = CGRect(origin: CGPoint(x: size.width - (size.width - contentWidth) / 2.0 - sideInset, y: topPanelFrame.maxY - additionalInset), size: CGSize(width: layout.safeInsets.right + (size.width - contentWidth) / 2.0 + sideInset, height: layout.size.height))
+            } else {
+                var isFullscreen = false
+                if case .fullscreen = self.displayMode {
+                    isFullscreen = true
+                    forceUpdate = true
+                }
+                leftBorderFrame = CGRect(origin: CGPoint(x: -additionalInset - additionalLeftInset, y: topPanelFrame.maxY - additionalInset * (isFullscreen ? 0.95 : 0.8)), size: CGSize(width: sideInset + additionalInset + additionalLeftInset + (contentLeftInset.isZero ? additionalSideInset : contentLeftInset), height: layout.size.height))
+                rightBorderFrame = CGRect(origin: CGPoint(x: size.width - sideInset - (contentLeftInset.isZero ? additionalSideInset : 0.0), y: topPanelFrame.maxY - additionalInset * (isFullscreen ? 0.95 : 0.8)), size: CGSize(width: sideInset + additionalInset + additionalLeftInset + additionalSideInset, height: layout.size.height))
+            }
+            
+            let topCornersFrame = CGRect(x: sideInset + (contentLeftInset.isZero ? floorToScreenPixels((size.width - contentWidth) / 2.0) : contentLeftInset), y: topPanelFrame.maxY - 60.0, width: contentWidth - sideInset * 2.0, height: 50.0 + 60.0)
             
             let previousTopPanelFrame = self.topPanelNode.frame
             let previousBackgroundFrame = self.backgroundNode.frame
             let previousLeftBorderFrame = self.leftBorderNode.frame
             let previousRightBorderFrame = self.rightBorderNode.frame
             
-            if !topPanelFrame.equalTo(previousTopPanelFrame) {
-                self.topPanelNode.frame = topPanelFrame
-                let positionDelta = CGPoint(x: 0.0, y: topPanelFrame.minY - previousTopPanelFrame.minY)
-                transition.animateOffsetAdditive(layer: self.topPanelNode.layer, offset: positionDelta.y, completion: completion)
+            if !topPanelFrame.equalTo(previousTopPanelFrame) || forceUpdate {
+                if topPanelFrame.width != previousTopPanelFrame.width {
+                    transition.updateFrame(node: self.topPanelNode, frame: topPanelFrame)
+                    transition.updateFrame(node: self.topCornersNode, frame: topCornersFrame)
+                    transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+                    transition.updateFrame(node: self.leftBorderNode, frame: leftBorderFrame)
+                    transition.updateFrame(node: self.rightBorderNode, frame: rightBorderFrame)
+                } else {
+                    self.topPanelNode.frame = topPanelFrame
+                    let positionDelta = CGPoint(x: 0.0, y: topPanelFrame.minY - previousTopPanelFrame.minY)
+                    transition.animateOffsetAdditive(layer: self.topPanelNode.layer, offset: positionDelta.y, completion: completion)
 
-                self.backgroundNode.frame = backgroundFrame
-                let backgroundPositionDelta = CGPoint(x: 0.0, y: previousBackgroundFrame.minY - backgroundFrame.minY)
-                transition.animatePositionAdditive(node: self.backgroundNode, offset: backgroundPositionDelta)
-                
-                self.leftBorderNode.frame = leftBorderFrame
-                let leftBorderPositionDelta = CGPoint(x: 0.0, y: previousLeftBorderFrame.minY - leftBorderFrame.minY)
-                transition.animatePositionAdditive(node: self.leftBorderNode, offset: leftBorderPositionDelta)
-                
-                self.rightBorderNode.frame = rightBorderFrame
-                let rightBorderPositionDelta = CGPoint(x: 0.0, y: previousRightBorderFrame.minY - rightBorderFrame.minY)
-                transition.animatePositionAdditive(node: self.rightBorderNode, offset: rightBorderPositionDelta)
+                    transition.updateFrame(node: self.topCornersNode, frame: topCornersFrame)
+
+                    self.backgroundNode.frame = backgroundFrame
+                    let backgroundPositionDelta = CGPoint(x: 0.0, y: previousBackgroundFrame.minY - backgroundFrame.minY)
+                    transition.animatePositionAdditive(node: self.backgroundNode, offset: backgroundPositionDelta)
+                    
+                    self.leftBorderNode.frame = leftBorderFrame
+                    let leftBorderPositionDelta = CGPoint(x: previousLeftBorderFrame.maxX - leftBorderFrame.maxX, y: previousLeftBorderFrame.minY - leftBorderFrame.minY)
+                    transition.animatePositionAdditive(node: self.leftBorderNode, offset: leftBorderPositionDelta)
+                    
+                    self.rightBorderNode.frame = rightBorderFrame
+                    let rightBorderPositionDelta = CGPoint(x: previousRightBorderFrame.minX - rightBorderFrame.minX, y: previousRightBorderFrame.minY - rightBorderFrame.minY)
+                    transition.animatePositionAdditive(node: self.rightBorderNode, offset: rightBorderPositionDelta)
+                }
             } else {
                 completion?()
             }
-            self.topPanelBackgroundNode.frame = CGRect(x: 0.0, y: topPanelHeight - 24.0, width: size.width, height: 24.0)
-                        
-            var bottomEdge: CGFloat = 0.0
-            self.listNode.forEachItemNode { itemNode in
-                if let itemNode = itemNode as? ListViewItemNode {
-                    let convertedFrame = self.listNode.view.convert(itemNode.frame, to: self.view)
-                    if convertedFrame.maxY > bottomEdge {
-                        bottomEdge = convertedFrame.maxY
-                    }
-                }
-            }
-                        
-            let listMaxY = listTopInset + listSize.height
-            if bottomEdge.isZero {
-                bottomEdge = listMaxY
-            }
+
+            self.topPanelBackgroundNode.frame = CGRect(x: 0.0, y: topPanelHeight - 24.0, width: size.width, height: min(topPanelFrame.height, 24.0))
             
-            var bottomOffset: CGFloat = 0.0
-            if bottomEdge < listMaxY && (self.panGestureArguments != nil || self.isExpanded) {
-                bottomOffset = bottomEdge - listMaxY
-            }
-        
-            let bottomCornersFrame = CGRect(origin: CGPoint(x: sideInset, y: -50.0 + bottomOffset), size: CGSize(width: size.width - sideInset * 2.0, height: 50.0))
+            let listMaxY = listTopInset + listSize.height
+            let bottomOffset = min(0.0, bottomEdge - listMaxY) + layout.size.height - bottomPanelHeight
+
+            let bottomCornersFrame = CGRect(origin: CGPoint(x: sideInset + floorToScreenPixels((size.width - contentWidth) / 2.0), y: -50.0 + bottomOffset + bottomGradientHeight), size: CGSize(width: contentWidth - sideInset * 2.0, height: 50.0 + 60.0))
+            let bottomPanelBackgroundFrame = CGRect(x: 0.0, y: bottomOffset + bottomGradientHeight, width: size.width, height: 2000.0)
             let previousBottomCornersFrame = self.bottomCornersNode.frame
             if !bottomCornersFrame.equalTo(previousBottomCornersFrame) {
-                self.bottomCornersNode.frame = bottomCornersFrame
-                self.bottomPanelBackgroundNode.frame = CGRect(x: 0.0, y: bottomOffset, width: size.width, height: 2000.0)
-                
-                let positionDelta = CGPoint(x: 0.0, y: previousBottomCornersFrame.minY - bottomCornersFrame.minY)
-                transition.animatePositionAdditive(node: self.bottomCornersNode, offset: positionDelta)
-                transition.animatePositionAdditive(node: self.bottomPanelBackgroundNode, offset: positionDelta)
+                if bottomCornersFrame.width != previousBottomCornersFrame.width {
+                    transition.updateFrame(node: self.bottomCornersNode, frame: bottomCornersFrame)
+                    transition.updateFrame(node: self.bottomPanelBackgroundNode, frame: bottomPanelBackgroundFrame)
+                } else {
+                    self.bottomCornersNode.frame = bottomCornersFrame
+                    self.bottomPanelBackgroundNode.frame = bottomPanelBackgroundFrame
+                    
+                    let positionDelta = CGPoint(x: 0.0, y: previousBottomCornersFrame.minY - bottomCornersFrame.minY)
+                    transition.animatePositionAdditive(node: self.bottomCornersNode, offset: positionDelta)
+                    transition.animatePositionAdditive(node: self.bottomPanelBackgroundNode, offset: positionDelta)
+                }
             }
         }
         
-        var isFullscreen = false
-        func updateIsFullscreen(_ isFullscreen: Bool) {
-            guard self.isFullscreen != isFullscreen, let (layout, _) = self.validLayout else {
+        private var decorationsAreDark: Bool?
+        private var ignoreLayout = false
+        private func updateDecorationsColors() {
+            guard let (layout, _) = self.validLayout else {
                 return
             }
-            self.isFullscreen = isFullscreen
-
-            self.controller?.statusBar.updateStatusBarStyle(isFullscreen ? .White : .Ignore, animated: true)
-                        
-            var size = layout.size
-            if case .regular = layout.metrics.widthClass {
-                size.width = floor(min(size.width, size.height) * 0.5)
-            }
             
-            let topPanelHeight: CGFloat = 63.0
+            let isFullscreen = self.isFullscreen
+            let effectiveDisplayMode = self.displayMode
+            
+            self.ignoreLayout = true
+            self.controller?.statusBar.updateStatusBarStyle(isFullscreen ? .White : .Ignore, animated: true)
+            self.ignoreLayout = false
+            
+            let size = layout.size
             let topEdgeFrame: CGRect
             if isFullscreen {
                 let offset: CGFloat
@@ -2558,51 +3833,93 @@ public final class VoiceChatController: ViewController {
                 topEdgeFrame = CGRect(x: 0.0, y: 0.0, width: size.width, height: topPanelHeight)
             }
             
+            let backgroundColor: UIColor
+            if case .fullscreen = effectiveDisplayMode {
+                backgroundColor = isFullscreen ? panelBackgroundColor : secondaryPanelBackgroundColor
+            } else if self.isScheduling || self.callState?.scheduleTimestamp != nil {
+                backgroundColor = panelBackgroundColor
+            } else {
+                backgroundColor = isFullscreen ? panelBackgroundColor : secondaryPanelBackgroundColor
+            }
+            
             let transition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .linear)
             transition.updateFrame(node: self.topPanelEdgeNode, frame: topEdgeFrame)
             transition.updateCornerRadius(node: self.topPanelEdgeNode, cornerRadius: isFullscreen ? layout.deviceMetrics.screenCornerRadius - 0.5 : 12.0)
             transition.updateBackgroundColor(node: self.topPanelBackgroundNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
             transition.updateBackgroundColor(node: self.topPanelEdgeNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
-            transition.updateBackgroundColor(node: self.backgroundNode, color: isFullscreen ? panelBackgroundColor : secondaryPanelBackgroundColor)
+            transition.updateBackgroundColor(node: self.backgroundNode, color: backgroundColor)
             transition.updateBackgroundColor(node: self.bottomPanelBackgroundNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
             transition.updateBackgroundColor(node: self.leftBorderNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
             transition.updateBackgroundColor(node: self.rightBorderNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
-            transition.updateBackgroundColor(node: self.rightBorderNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
             
-            if let snapshotView = self.topCornersNode.view.snapshotContentTree() {
-                snapshotView.frame = self.topCornersNode.frame
-                self.topPanelNode.view.addSubview(snapshotView)
-                
-                snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                    snapshotView?.removeFromSuperview()
-                })
+            var gridNode: VoiceChatTilesGridItemNode?
+            self.listNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                    gridNode = itemNode
+                }
+            }
+            if let gridNode = gridNode {
+                transition.updateBackgroundColor(node: gridNode.backgroundNode, color: isFullscreen ? fullscreenBackgroundColor : panelBackgroundColor)
             }
-            self.topCornersNode.image = cornersImage(top: true, bottom: false, dark: isFullscreen)
             
-            if let snapshotView = self.bottomCornersNode.view.snapshotContentTree() {
-                snapshotView.frame = self.bottomCornersNode.bounds
-                self.bottomCornersNode.view.addSubview(snapshotView)
+            let previousDark = self.decorationsAreDark
+            self.decorationsAreDark = isFullscreen
+            if previousDark != self.decorationsAreDark {
+                if let snapshotView = self.topCornersNode.view.snapshotContentTree() {
+                    snapshotView.frame = self.topCornersNode.bounds
+                    self.topCornersNode.view.addSubview(snapshotView)
+                    
+                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                        snapshotView?.removeFromSuperview()
+                    })
+                }
+                self.topCornersNode.image = decorationTopCornersImage(dark: isFullscreen)
                 
-                snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                    snapshotView?.removeFromSuperview()
-                })
-            }
-            self.bottomCornersNode.image = cornersImage(top: false, bottom: true, dark: isFullscreen)
+                if let snapshotView = self.bottomCornersNode.view.snapshotContentTree() {
+                    snapshotView.frame = self.bottomCornersNode.bounds
+                    self.bottomCornersNode.view.addSubview(snapshotView)
+                    
+                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                        snapshotView?.removeFromSuperview()
+                    })
+                }
+                self.bottomCornersNode.image = decorationBottomCornersImage(dark: isFullscreen)
+                
+                if let gridNode = gridNode {
+                    if let snapshotView = gridNode.cornersNode.view.snapshotContentTree() {
+                        snapshotView.frame = gridNode.cornersNode.bounds
+                        gridNode.cornersNode.view.addSubview(snapshotView)
+                        
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                    }
+                    gridNode.cornersNode.image = decorationCornersImage(top: true, bottom: false, dark: isFullscreen)
+                    gridNode.supernode?.addSubnode(gridNode)
+                }
+                
+                UIView.transition(with: self.bottomGradientNode.view, duration: 0.3, options: [.transitionCrossDissolve, .curveLinear]) {
+                    self.bottomGradientNode.backgroundColor = decorationBottomGradientImage(dark: isFullscreen).flatMap { UIColor(patternImage: $0) }
+                } completion: { _ in
+                }
 
-            if !self.optionsButtonIsAvatar {
-                self.optionsButton.setContent(.image(optionsButtonImage(dark: isFullscreen)), animated: transition.isAnimated)
+                self.closeButton.setContent(.image(closeButtonImage(dark: isFullscreen)), animated: transition.isAnimated)
+                self.optionsButton.setContent(.more(optionsCircleImage(dark: isFullscreen)), animated: transition.isAnimated)
+                self.panelButton.setContent(.image(panelButtonImage(dark: isFullscreen)), animated: transition.isAnimated)
             }
-            self.closeButton.setContent(.image(closeButtonImage(dark: isFullscreen)), animated: transition.isAnimated)
-            
+                            
             self.updateTitle(transition: transition)
         }
         
-        private func updateTitle(transition: ContainedViewLayoutTransition) {
-            guard let (layout, _) = self.validLayout else {
+        private func updateTitle(slide: Bool = false, transition: ContainedViewLayoutTransition) {
+            guard let _ = self.validLayout else {
                 return
             }
+            
             var title = self.currentTitle
-            if !self.isFullscreen && !self.currentTitleIsCustom {
+            if self.isScheduling {
+                title = self.presentationData.strings.ScheduleVoiceChat_Title
+            } else if case .modal(_, false) = self.displayMode, !self.currentTitleIsCustom {
                 if let navigationController = self.controller?.navigationController as? NavigationController {
                     for controller in navigationController.viewControllers.reversed() {
                         if let controller = controller as? ChatController, case let .peer(peerId) = controller.chatLocation, peerId == self.call.peerId {
@@ -2612,22 +3929,27 @@ public final class VoiceChatController: ViewController {
                 }
             }
             
-            var size = layout.size
-            if case .regular = layout.metrics.widthClass {
-                size.width = floor(min(size.width, size.height) * 0.5)
+            var subtitle = self.currentSpeakingSubtitle ?? self.currentSubtitle
+            var speaking = self.currentSpeakingSubtitle != nil
+            if self.isScheduling {
+                subtitle = ""
+                speaking = false
+            } else if self.callState?.scheduleTimestamp != nil {
+                if self.callState?.canManageCall ?? false {
+                    subtitle = self.presentationData.strings.VoiceChat_TapToEditTitle
+                } else {
+                    subtitle = self.presentationData.strings.VoiceChat_Scheduled
+                }
+                speaking = false
             }
             
-            self.titleNode.update(size: CGSize(width: size.width, height: 44.0), title: title, subtitle: self.currentSubtitle, transition: transition)
+            self.titleNode.update(size: CGSize(width: self.titleNode.bounds.width, height: 44.0), title: title, subtitle: subtitle, speaking: speaking, slide: slide, transition: transition)
         }
         
-        private func updateButtons(animated: Bool) {
-            let audioButtonAppearance: CallControllerButtonItemNode.Content.Appearance
-            if let color = self.currentAudioButtonColor {
-                audioButtonAppearance = .color(.custom(color.rgb, 1.0))
-            } else {
-                audioButtonAppearance = .color(.custom(self.isFullscreen ? 0x1c1c1e : 0x2c2c2e, 1.0))
+        private func updateButtons(transition: ContainedViewLayoutTransition) {
+            guard let (layout, _) = self.validLayout else {
+                return
             }
-                        
             var audioMode: CallControllerButtonsSpeakerMode = .none
             //var hasAudioRouteMenu: Bool = false
             if let (availableOutputs, maybeCurrentOutput) = self.audioOutputState, let currentOutput = maybeCurrentOutput {
@@ -2642,7 +3964,9 @@ public final class VoiceChatController: ViewController {
                     case let .port(port):
                         var type: CallControllerButtonsSpeakerMode.BluetoothType = .generic
                         let portName = port.name.lowercased()
-                        if portName.contains("airpods pro") {
+                        if portName.contains("airpods max") {
+                            type = .airpodsMax
+                        } else if portName.contains("airpods pro") {
                             type = .airpodsPro
                         } else if portName.contains("airpods") {
                             type = .airpods
@@ -2654,15 +3978,28 @@ public final class VoiceChatController: ViewController {
                 }
             }
             
-            let soundImage: CallControllerButtonItemNode.Content.Image
-            var soundAppearance: CallControllerButtonItemNode.Content.Appearance = audioButtonAppearance
+            let normalButtonAppearance: CallControllerButtonItemNode.Content.Appearance
+            let activeButtonAppearance: CallControllerButtonItemNode.Content.Appearance
+            if let color = self.currentNormalButtonColor {
+                normalButtonAppearance = .color(.custom(color.rgb, 1.0))
+            } else {
+                normalButtonAppearance = .color(.custom(self.isFullscreen ? 0x1c1c1e : 0x2c2c2e, 1.0))
+            }
+            if let color = self.currentActiveButtonColor {
+                activeButtonAppearance = .color(.custom(color.rgb, 1.0))
+            } else {
+                activeButtonAppearance = .color(.custom(self.isFullscreen ? 0x1c1c1e : 0x2c2c2e, 1.0))
+            }
+
+            var soundImage: CallControllerButtonItemNode.Content.Image
+            var soundAppearance: CallControllerButtonItemNode.Content.Appearance = normalButtonAppearance
             var soundTitle: String = self.presentationData.strings.Call_Speaker
             switch audioMode {
             case .none, .builtin:
                 soundImage = .speaker
             case .speaker:
                 soundImage = .speaker
-                soundAppearance = .blurred(isFilled: true)
+                soundAppearance = activeButtonAppearance
             case .headphones:
                 soundImage = .headphones
                 soundTitle = self.presentationData.strings.Call_Audio
@@ -2674,69 +4011,168 @@ public final class VoiceChatController: ViewController {
                     soundImage = .airpods
                 case .airpodsPro:
                     soundImage = .airpodsPro
+                case .airpodsMax:
+                    soundImage = .airpodsMax
                 }
                 soundTitle = self.presentationData.strings.Call_Audio
             }
+                        
+            let isScheduled = self.isScheduling || self.callState?.scheduleTimestamp != nil
             
-            self.audioOutputNode.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: soundAppearance, image: soundImage), text: soundTitle, transition: animated ? .animated(duration: 0.3, curve: .linear) : .immediate)
+            var isSoundEnabled = true
+            if isScheduled {
+                if let callState = self.callState, let peer = self.peer, !callState.canManageCall && (peer.addressName?.isEmpty ?? true) {
+                    isSoundEnabled = false
+                } else {
+                    soundImage = .share
+                    soundTitle = self.presentationData.strings.VoiceChat_ShareShort
+                    soundAppearance = normalButtonAppearance
+                }
+            }
             
-            let cameraButtonSize = CGSize(width: 40.0, height: 40.0)
+            let audioButtonSize: CGSize
+            var buttonsTitleAlpha: CGFloat
+            let effectiveDisplayMode = self.displayMode
             
-            self.cameraButtonNode.update(size: cameraButtonSize, content: CallControllerButtonItemNode.Content(appearance: CallControllerButtonItemNode.Content.Appearance.blurred(isFilled: false), image: .camera), text: " ", transition: animated ? .animated(duration: 0.3, curve: .linear) : .immediate)
+            let hasCameraButton = self.cameraButton.isUserInteractionEnabled
+            let hasVideo = self.call.hasVideo
+            switch effectiveDisplayMode {
+                case .modal:
+                    audioButtonSize = hasCameraButton ? smallButtonSize : sideButtonSize
+                    buttonsTitleAlpha = 1.0
+                case .fullscreen:
+                    if case .regular = layout.metrics.widthClass {
+                        audioButtonSize = hasCameraButton ? smallButtonSize : sideButtonSize
+                    } else {
+                        audioButtonSize = sideButtonSize
+                    }
+                    if case .regular = layout.metrics.widthClass {
+                        buttonsTitleAlpha = 1.0
+                    } else {
+                        buttonsTitleAlpha = 0.0
+                    }
+            }
             
-            self.leaveNode.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: .color(.custom(0xff3b30, 0.3)), image: .cancel), text: self.presentationData.strings.VoiceChat_Leave, transition: .immediate)
+            self.cameraButton.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: hasVideo ? activeButtonAppearance : normalButtonAppearance, image: hasVideo ? .cameraOn : .cameraOff), text: self.presentationData.strings.VoiceChat_Video, transition: transition)
+            
+            self.switchCameraButton.update(size: audioButtonSize, content: CallControllerButtonItemNode.Content(appearance: normalButtonAppearance, image: .flipCamera), text: "", transition: transition)
+                    
+            transition.updateAlpha(node: self.switchCameraButton, alpha: hasCameraButton && hasVideo ? 1.0 : 0.0)
+            transition.updateTransformScale(node: self.switchCameraButton, scale: hasCameraButton && hasVideo ? 1.0 : 0.0)
+            
+            transition.updateTransformScale(node: self.cameraButton, scale: hasCameraButton ? 1.0 : 0.0)
+        
+            let hasAudioButton = !self.isScheduling
+            transition.updateAlpha(node: self.audioButton, alpha: hasCameraButton || !hasAudioButton ? 0.0 : 1.0)
+            transition.updateTransformScale(node: self.audioButton, scale: hasCameraButton || !hasAudioButton ? 0.0 : 1.0)
+            
+            self.audioButton.update(size: audioButtonSize, content: CallControllerButtonItemNode.Content(appearance: soundAppearance, image: soundImage, isEnabled: isSoundEnabled), text: soundTitle, transition: transition)
+            self.audioButton.isUserInteractionEnabled = isSoundEnabled
+            
+            self.leaveButton.update(size: sideButtonSize, content: CallControllerButtonItemNode.Content(appearance: .color(.custom(0xff3b30, 0.3)), image: .cancel), text: self.presentationData.strings.VoiceChat_Leave, transition: .immediate)
+            
+            transition.updateAlpha(node: self.cameraButton.textNode, alpha: buttonsTitleAlpha)
+            transition.updateAlpha(node: self.switchCameraButton.textNode, alpha: buttonsTitleAlpha)
+            transition.updateAlpha(node: self.audioButton.textNode, alpha: buttonsTitleAlpha)
+            transition.updateAlpha(node: self.leaveButton.textNode, alpha: buttonsTitleAlpha)
         }
         
         func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+            guard !self.ignoreLayout else {
+                return
+            }
             let isFirstTime = self.validLayout == nil
+            let previousLayout = self.validLayout?.0
             self.validLayout = (layout, navigationHeight)
-
-            var size = layout.size
+            
+            let size = layout.size
+            let contentWidth: CGFloat
+            let headerWidth: CGFloat
+            let contentLeftInset: CGFloat
             if case .regular = layout.metrics.widthClass {
-                size.width = floor(min(size.width, size.height) * 0.5)
+                contentWidth = max(320.0, min(375.0, floor(size.width * 0.3)))
+                headerWidth = size.width
+                if self.peerIdToEndpointId.isEmpty {
+                    contentLeftInset = 0.0
+                } else {
+                    contentLeftInset = self.panelHidden ? layout.size.width : layout.size.width - contentWidth
+                }
+            } else {
+                contentWidth = self.isLandscape ? min(530.0, size.width - 210.0) : size.width
+                headerWidth = contentWidth
+                contentLeftInset = 0.0
             }
             
+            var previousIsLandscape = false
+            if let previousLayout = previousLayout, case .compact = previousLayout.metrics.widthClass, previousLayout.size.width > previousLayout.size.height {
+                previousIsLandscape = true
+            }
+            var shouldSwitchToExpanded = false
+            if case let .modal(isExpanded, _) = self.displayMode {
+                if previousIsLandscape != self.isLandscape && !isExpanded {
+                    shouldSwitchToExpanded = true
+                } else if case .regular = layout.metrics.widthClass, !isExpanded {
+                    shouldSwitchToExpanded = true
+                }
+            }
+            if shouldSwitchToExpanded {
+                self.displayMode = .modal(isExpanded: true, isFilled: true)
+                self.updateDecorationsColors()
+                self.updateDecorationsLayout(transition: transition)
+                self.updateMembers()
+            } else if case .fullscreen = self.displayMode, previousIsLandscape != self.isLandscape {
+                self.updateMembers()
+            }
+            
+            let effectiveDisplayMode = self.displayMode
+
+            transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - headerWidth) / 2.0), y: 10.0), size: CGSize(width: headerWidth, height: 44.0)))
             self.updateTitle(transition: transition)
-            transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 10.0), size: CGSize(width: size.width, height: 44.0)))
-            transition.updateFrame(node: self.optionsButton, frame: CGRect(origin: CGPoint(x: 20.0, y: 18.0), size: CGSize(width: 28.0, height: 28.0)))
-            transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: size.width - 20.0 - 28.0, y: 18.0), size: CGSize(width: 28.0, height: 28.0)))
+            
+            transition.updateFrame(node: self.optionsButton, frame: CGRect(origin: CGPoint(x: 20.0 + floorToScreenPixels((size.width - headerWidth) / 2.0), y: 18.0), size: CGSize(width: 28.0, height: 28.0)))
+            transition.updateFrame(node: self.panelButton, frame: CGRect(origin: CGPoint(x: size.width - floorToScreenPixels((size.width - headerWidth) / 2.0) - 20.0 - 28.0 - 38.0 - 24.0, y: 18.0), size: CGSize(width: 38.0, height: 28.0)))
+            transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: size.width - floorToScreenPixels((size.width - headerWidth) / 2.0) - 20.0 - 28.0, y: 18.0), size: CGSize(width: 28.0, height: 28.0)))
+            
+            transition.updateAlpha(node: self.optionsButton, alpha: self.optionsButton.isUserInteractionEnabled ? 1.0 : 0.0)
+            transition.updateAlpha(node: self.panelButton, alpha: self.panelButton.isUserInteractionEnabled ? 1.0 : 0.0)
             
             transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
-            
             transition.updateFrame(node: self.contentContainer, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((layout.size.width - size.width) / 2.0), y: 0.0), size: size))
             
             let layoutTopInset: CGFloat = max(layout.statusBarHeight ?? 0.0, layout.safeInsets.top)
+            let sideInset: CGFloat = 14.0
             
-            let sideInset: CGFloat = 16.0
-            var insets = UIEdgeInsets()
-            insets.left = layout.safeInsets.left + sideInset
-            insets.right = layout.safeInsets.right + sideInset
+            var listInsets = UIEdgeInsets()
+            listInsets.left = sideInset + (self.isLandscape ? 0.0 : layout.safeInsets.left)
+            listInsets.right = sideInset + (self.isLandscape ? 0.0 : layout.safeInsets.right)
             
-            let topPanelHeight: CGFloat = 63.0
-            if let _ = self.panGestureArguments {
+            let topEdgeOffset: CGFloat
+            if let statusBarHeight = layout.statusBarHeight {
+                topEdgeOffset = statusBarHeight
+            } else {
+                topEdgeOffset = 44.0
+            }
+            
+            if self.isLandscape {
+                transition.updateFrame(node: self.topPanelEdgeNode, frame: CGRect(x: 0.0, y: -topEdgeOffset, width: size.width, height: topPanelHeight + topEdgeOffset))
+            } else if let _ = self.panGestureArguments {
             } else {
                 let topEdgeFrame: CGRect
                 if self.isFullscreen {
-                    let offset: CGFloat
-                    if let statusBarHeight = layout.statusBarHeight {
-                        offset = statusBarHeight
-                    } else {
-                        offset = 44.0
-                    }
-                    topEdgeFrame = CGRect(x: 0.0, y: -offset, width: size.width, height: topPanelHeight + offset)
+                    topEdgeFrame = CGRect(x: 0.0, y: -topEdgeOffset, width: size.width, height: topPanelHeight + topEdgeOffset)
                 } else {
                     topEdgeFrame = CGRect(x: 0.0, y: 0.0, width: size.width, height: topPanelHeight)
                 }
                 transition.updateFrame(node: self.topPanelEdgeNode, frame: topEdgeFrame)
             }
             
-            let bottomPanelHeight = bottomAreaHeight + layout.intrinsicInsets.bottom
+            let bottomPanelHeight = self.effectiveBottomAreaHeight + layout.intrinsicInsets.bottom
             var listTopInset = layoutTopInset + topPanelHeight
-            if self.mainVideoContainer != nil {
-                listTopInset += 200.0
+            if self.isLandscape {
+                listTopInset = topPanelHeight
             }
-            let listSize = CGSize(width: size.width, height: layout.size.height - listTopInset - bottomPanelHeight)
-                 
+            
+            let listSize = CGSize(width: contentWidth, height: layout.size.height - listTopInset - (self.isLandscape ? layout.intrinsicInsets.bottom : bottomPanelHeight) + bottomGradientHeight)
             let topInset: CGFloat
             if let (panInitialTopInset, panOffset) = self.panGestureArguments {
                 if self.isExpanded {
@@ -2744,154 +4180,475 @@ public final class VoiceChatController: ViewController {
                 } else {
                     topInset = max(0.0, panInitialTopInset + min(0.0, panOffset))
                 }
+            } else if case .regular = layout.metrics.widthClass {
+                topInset = 0.0
             } else if let currentTopInset = self.topInset {
                 topInset = self.isExpanded ? 0.0 : currentTopInset
             } else {
-                topInset = listSize.height
+                topInset = listSize.height - 46.0 - floor(56.0 * 3.5) - bottomGradientHeight
             }
             
-            if self.animation == nil {
-                transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(x: 0.0, y: listTopInset + topInset), size: listSize))
+            transition.updateFrameAsPositionAndBounds(node: self.listContainer, frame: CGRect(origin: CGPoint(), size: size))
+            transition.updateFrame(node: self.listNode, frame: CGRect(origin: CGPoint(x: contentLeftInset.isZero ? floorToScreenPixels((size.width - contentWidth) / 2.0) : contentLeftInset, y: listTopInset + topInset), size: listSize))
+            
+            let tileGridSize = CGSize(width: max(0.0, contentLeftInset - sideInset), height: size.height - layout.intrinsicInsets.bottom - listTopInset - topInset)
+            
+            if contentLeftInset > 0.0 {
+                self.tileGridNode.isHidden = false
             }
+            if !self.tileGridNode.isHidden {
+                let _ = self.tileGridNode.update(size: tileGridSize, layoutMode: .grid, items: self.currentTileItems, transition: transition, completion: { [weak self] in
+                    if contentLeftInset.isZero && transition.isAnimated {
+                        self?.tileGridNode.isHidden = true
+                    }
+                })
+            }
+            transition.updateFrame(node: self.tileGridNode, frame: CGRect(origin: CGPoint(x: sideInset, y: listTopInset + topInset), size: tileGridSize))
+            self.tileGridNode.updateAbsoluteRect(CGRect(origin: CGPoint(), size: tileGridSize), within: tileGridSize)
+            
+            listInsets.bottom = bottomGradientHeight
             
             let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
-            let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: listSize, insets: insets, duration: duration, curve: curve)
+            self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: listSize, insets: listInsets, duration: duration, curve: curve), stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
             
-            self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+            let fullscreenListWidth: CGFloat
+            let fullscreenListHeight: CGFloat = 84.0
+            let fullscreenListTransform: CATransform3D
+            let fullscreenListInset: CGFloat = 14.0
+            let fullscreenListUpdateSizeAndInsets: ListViewUpdateSizeAndInsets
+            let fullscreenListContainerFrame: CGRect
+            if self.isLandscape {
+                fullscreenListWidth = layout.size.height
+                fullscreenListTransform = CATransform3DIdentity
+                fullscreenListUpdateSizeAndInsets = ListViewUpdateSizeAndInsets(size: CGSize(width: fullscreenListHeight, height: layout.size.height), insets: UIEdgeInsets(top: fullscreenListInset, left: 0.0, bottom: fullscreenListInset, right: 0.0), duration: duration, curve: curve)
+                fullscreenListContainerFrame = CGRect(x: layout.size.width - min(self.effectiveBottomAreaHeight, fullscreenBottomAreaHeight) - layout.safeInsets.right - fullscreenListHeight - 4.0, y: 0.0, width: fullscreenListHeight, height: layout.size.height)
+            } else {
+                fullscreenListWidth = layout.size.width
+                fullscreenListTransform = CATransform3DMakeRotation(-CGFloat(CGFloat.pi / 2.0), 0.0, 0.0, 1.0)
+                fullscreenListUpdateSizeAndInsets = ListViewUpdateSizeAndInsets(size: CGSize(width: fullscreenListHeight, height: layout.size.width), insets: UIEdgeInsets(top: fullscreenListInset + layout.safeInsets.left, left: 0.0, bottom: fullscreenListInset + layout.safeInsets.left, right: 0.0), duration: duration, curve: curve)
+                fullscreenListContainerFrame = CGRect(x: 0.0, y: layout.size.height - min(bottomPanelHeight, fullscreenBottomAreaHeight + layout.intrinsicInsets.bottom) - fullscreenListHeight - 4.0, width: layout.size.width, height: fullscreenListHeight)
+            }
             
-            transition.updateFrame(node: self.topCornersNode, frame: CGRect(origin: CGPoint(x: sideInset, y: 63.0), size: CGSize(width: size.width - sideInset * 2.0, height: 50.0)))
+            transition.updateFrame(node: self.fullscreenListContainer, frame: fullscreenListContainerFrame)
             
-            let bottomPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - bottomPanelHeight), size: CGSize(width: size.width, height: bottomPanelHeight))
+            self.fullscreenListNode.bounds = CGRect(x: 0.0, y: 0.0, width: fullscreenListHeight, height: fullscreenListWidth)
+            transition.updatePosition(node: self.fullscreenListNode, position: CGPoint(x: fullscreenListContainerFrame.width / 2.0, y: fullscreenListContainerFrame.height / 2.0))
+
+            self.fullscreenListNode.transform = fullscreenListTransform
+            self.fullscreenListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: fullscreenListUpdateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+            
+            if case .regular = layout.metrics.widthClass {
+                self.transitionContainerNode.view.mask = nil
+            } else {
+                self.transitionContainerNode.view.mask = self.transitionMaskView
+            }
+            
+            var childrenLayout = layout
+            var childrenInsets = childrenLayout.intrinsicInsets
+            var childrenSafeInsets = childrenLayout.safeInsets
+            if case .regular = layout.metrics.widthClass {
+                let childrenLayoutWidth: CGFloat = 375.0
+                if contentLeftInset.isZero {
+                    childrenSafeInsets.left = floorToScreenPixels((size.width - childrenLayoutWidth) / 2.0)
+                    childrenSafeInsets.right = floorToScreenPixels((size.width - childrenLayoutWidth) / 2.0)
+                } else {
+                    childrenSafeInsets.left = floorToScreenPixels((contentLeftInset - childrenLayoutWidth) / 2.0)
+                    childrenSafeInsets.right = childrenSafeInsets.left + (size.width - contentLeftInset)
+                }
+            } else if !self.isLandscape, case .fullscreen = effectiveDisplayMode {
+                childrenInsets.bottom += self.effectiveBottomAreaHeight + fullscreenListHeight + 30.0
+            }
+            childrenLayout.safeInsets = childrenSafeInsets
+            childrenLayout.intrinsicInsets = childrenInsets
+            self.controller?.presentationContext.containerLayoutUpdated(childrenLayout, transition: transition)
+            
+            var bottomPanelLeftInset = contentLeftInset
+            var bottomPanelWidth = size.width - contentLeftInset
+            if case .regular = layout.metrics.widthClass, bottomPanelLeftInset.isZero {
+                bottomPanelLeftInset = floorToScreenPixels((layout.size.width - contentWidth) / 2.0)
+                bottomPanelWidth = contentWidth
+            }
+            
+            var bottomPanelFrame = CGRect(origin: CGPoint(x: bottomPanelLeftInset, y: layout.size.height - bottomPanelHeight), size: CGSize(width: bottomPanelWidth, height: bottomPanelHeight))
+            let bottomPanelCoverHeight = bottomAreaHeight + layout.intrinsicInsets.bottom
+            if self.isLandscape {
+                bottomPanelFrame = CGRect(origin: CGPoint(x: layout.size.width - fullscreenBottomAreaHeight - layout.safeInsets.right, y: 0.0), size: CGSize(width: fullscreenBottomAreaHeight + layout.safeInsets.right, height: layout.size.height))
+            }
+            let bottomGradientFrame = CGRect(origin: CGPoint(x: bottomPanelLeftInset, y: layout.size.height - bottomPanelCoverHeight), size: CGSize(width: bottomPanelWidth, height: bottomGradientHeight))
+            transition.updateFrame(node: self.bottomGradientNode, frame: bottomGradientFrame)
             transition.updateFrame(node: self.bottomPanelNode, frame: bottomPanelFrame)
             
-            let cameraButtonSize = CGSize(width: 40.0, height: 40.0)
-            let centralButtonSize = CGSize(width: 300.0, height: 300.0)
-                        
-            let actionButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - centralButtonSize.width) / 2.0), y: floorToScreenPixels((bottomAreaHeight - centralButtonSize.height) / 2.0)), size: centralButtonSize)
+            if let pickerView = self.pickerView {
+                transition.updateFrame(view: pickerView, frame: CGRect(x: 0.0, y: layout.size.height - bottomPanelHeight - 216.0, width: size.width, height: 216.0))
+            }
+             
+            let timerFrame = CGRect(x: 0.0, y: layout.size.height - bottomPanelHeight - 216.0, width: size.width, height: 216.0)
+            transition.updateFrame(node: self.timerNode, frame: timerFrame)
+            self.timerNode.update(size: timerFrame.size, scheduleTime: self.callState?.scheduleTimestamp, transition: .immediate)
             
+            let scheduleTextSize = self.scheduleTextNode.updateLayout(CGSize(width: size.width - sideInset * 2.0, height: CGFloat.greatestFiniteMagnitude))
+            self.scheduleTextNode.frame = CGRect(origin: CGPoint(x: floor((size.width - scheduleTextSize.width) / 2.0), y: layout.size.height - layout.intrinsicInsets.bottom - scheduleTextSize.height - 145.0), size: scheduleTextSize)
+            
+            let centralButtonSide = min(contentWidth, size.height) - 32.0
+            let centralButtonSize = CGSize(width: centralButtonSide, height: centralButtonSide)
+            let cameraButtonSize = smallButtonSize
+            let sideButtonMinimalInset: CGFloat = 16.0
+            let sideButtonOffset = min(42.0, floor((((contentWidth - 112.0) / 2.0) - sideButtonSize.width) / 2.0))
+            let sideButtonOrigin = max(sideButtonMinimalInset, floor((contentWidth - 112.0) / 2.0) - sideButtonOffset - sideButtonSize.width)
+                        
+            let smallButtons: Bool
+            if case .regular = layout.metrics.widthClass {
+                smallButtons = false
+            } else {
+                switch effectiveDisplayMode {
+                    case .modal:
+                        smallButtons = self.isLandscape
+                    case .fullscreen:
+                        smallButtons = true
+            }
+            }
             let actionButtonState: VoiceChatActionButton.State
             let actionButtonTitle: String
             let actionButtonSubtitle: String
             var actionButtonEnabled = true
-            if let callState = self.callState {
-                switch callState.networkState {
-                case .connecting:
+            if let callState = self.callState, !self.isScheduling {
+                if callState.scheduleTimestamp != nil {
+                    self.ignoreConnecting = true
+                    if callState.canManageCall {
+                        actionButtonState = .scheduled(state: .start)
+                        actionButtonTitle = self.presentationData.strings.VoiceChat_StartNow
+                        actionButtonSubtitle = ""
+                    } else {
+                        if callState.subscribedToScheduled {
+                            actionButtonState = .scheduled(state: .unsubscribe)
+                            actionButtonTitle = self.presentationData.strings.VoiceChat_CancelReminder
+                        } else {
+                            actionButtonState = .scheduled(state: .subscribe)
+                            actionButtonTitle = self.presentationData.strings.VoiceChat_SetReminder
+                        }
+                        actionButtonSubtitle = ""
+                    }
+                } else {
+                    let connected = self.ignoreConnecting || callState.networkState == .connected
+                    if case .connected = callState.networkState {
+                        self.ignoreConnecting = false
+                        self.ignoreConnectingTimer?.invalidate()
+                        self.ignoreConnectingTimer = nil
+                    } else if self.ignoreConnecting {
+                        if self.ignoreConnectingTimer == nil {
+                            let timer = SwiftSignalKit.Timer(timeout: 3.0, repeat: false, completion: { [weak self] in
+                                if let strongSelf = self {
+                                    strongSelf.ignoreConnecting = false
+                                    strongSelf.ignoreConnectingTimer?.invalidate()
+                                    strongSelf.ignoreConnectingTimer = nil
+                                    
+                                    if let (layout, navigationHeight) = strongSelf.validLayout {
+                                        strongSelf.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
+                                    }
+                                }
+                            }, queue: Queue.mainQueue())
+                            self.ignoreConnectingTimer = timer
+                            timer.start()
+                        }
+                    }
+
+                    if connected {
+                        if let muteState = callState.muteState, !self.pushingToTalk && !self.temporaryPushingToTalk {
+                            if muteState.canUnmute {
+                                actionButtonState = .active(state: .muted)
+                                
+                                actionButtonTitle = self.presentationData.strings.VoiceChat_Unmute
+                                actionButtonSubtitle = ""
+                            } else {
+                                actionButtonState = .active(state: .cantSpeak)
+                                
+                                if callState.raisedHand {
+                                    actionButtonTitle = self.presentationData.strings.VoiceChat_AskedToSpeak
+                                    actionButtonSubtitle = self.presentationData.strings.VoiceChat_AskedToSpeakHelp
+                                } else {
+                                    actionButtonTitle = self.presentationData.strings.VoiceChat_MutedByAdmin
+                                    actionButtonSubtitle = self.presentationData.strings.VoiceChat_MutedByAdminHelp
+                                }
+                            }
+                        } else {
+                            actionButtonState = .active(state: .on)
+                            
+                            actionButtonTitle = self.pushingToTalk ? self.presentationData.strings.VoiceChat_Live : self.presentationData.strings.VoiceChat_Mute
+                            actionButtonSubtitle = ""
+                        }
+                    } else {
+                        actionButtonState = .connecting
+                        actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting
+                        actionButtonSubtitle = ""
+                        actionButtonEnabled = false
+                    }
+                }
+            } else {
+                if self.isScheduling {
+                    actionButtonState = .button(text: self.scheduleButtonTitle)
+                    actionButtonTitle = ""
+                    actionButtonSubtitle = ""
+                    actionButtonEnabled = true
+                } else {
                     actionButtonState = .connecting
                     actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting
                     actionButtonSubtitle = ""
                     actionButtonEnabled = false
-                case .connected:
-                    if let muteState = callState.muteState, !self.pushingToTalk {
-                        if muteState.canUnmute {
-                            actionButtonState = .active(state: .muted)
-                            
-                            actionButtonTitle = self.presentationData.strings.VoiceChat_Unmute
-                            actionButtonSubtitle = ""
-                        } else {
-                            actionButtonState = .active(state: .cantSpeak)
-                            
-                            if callState.raisedHand {
-                                actionButtonTitle = self.presentationData.strings.VoiceChat_AskedToSpeak
-                                actionButtonSubtitle = self.presentationData.strings.VoiceChat_AskedToSpeakHelp
-                            } else {
-                                actionButtonTitle = self.presentationData.strings.VoiceChat_MutedByAdmin
-                                actionButtonSubtitle = self.presentationData.strings.VoiceChat_MutedByAdminHelp
-                            }
-                        }
-                    } else {
-                        actionButtonState = .active(state: .on)
-                        
-                        actionButtonTitle = self.pushingToTalk ? self.presentationData.strings.VoiceChat_Live : self.presentationData.strings.VoiceChat_Mute
-                        actionButtonSubtitle = ""
-                    }
                 }
-            } else {
-                actionButtonState = .connecting
-                actionButtonTitle = self.presentationData.strings.VoiceChat_Connecting
-                actionButtonSubtitle = ""
-                actionButtonEnabled = false
             }
             
             self.actionButton.isDisabled = !actionButtonEnabled
-            self.actionButton.update(size: centralButtonSize, buttonSize: CGSize(width: 112.0, height: 112.0), state: actionButtonState, title: actionButtonTitle, subtitle: actionButtonSubtitle, dark: self.isFullscreen, small: false, animated: true)
+            self.actionButton.update(size: centralButtonSize, buttonSize: CGSize(width: 112.0, height: 112.0), state: actionButtonState, title: actionButtonTitle, subtitle: actionButtonSubtitle, dark: self.isFullscreen, small: smallButtons, animated: true)
+
+            let isVideoEnabled = self.callState?.isVideoEnabled ?? false
+            var hasCameraButton = isVideoEnabled
+            if let joinedVideo = self.joinedVideo {
+                hasCameraButton = joinedVideo
+            }
+            if !isVideoEnabled {
+                hasCameraButton = false
+            }
+            switch actionButtonState {
+                case let .active(state):
+                    switch state {
+                        case .cantSpeak:
+                            hasCameraButton = false
+                        case .on, .muted:
+                            break
+                    }
+                case .connecting:
+                    if !self.connectedOnce {
+                        hasCameraButton = false
+                    }
+                case .scheduled, .button:
+                    hasCameraButton = false
+            }
+            let hasVideo = hasCameraButton && self.call.hasVideo
+            
+            let upperButtonDistance: CGFloat = 12.0
+            let firstButtonFrame: CGRect
+            let secondButtonFrame: CGRect
+            let thirdButtonFrame: CGRect
+            let forthButtonFrame: CGRect
+            
+            let leftButtonFrame: CGRect
+            if self.isScheduled || !hasVideo {
+                leftButtonFrame = CGRect(origin: CGPoint(x: sideButtonOrigin, y: floor((self.effectiveBottomAreaHeight - sideButtonSize.height) / 2.0)), size: sideButtonSize)
+            } else {
+                leftButtonFrame = CGRect(origin: CGPoint(x: sideButtonOrigin, y: floor((self.effectiveBottomAreaHeight - sideButtonSize.height - upperButtonDistance - cameraButtonSize.height) / 2.0) + upperButtonDistance + cameraButtonSize.height), size: sideButtonSize)
+            }
+            let rightButtonFrame = CGRect(origin: CGPoint(x: contentWidth - sideButtonOrigin - sideButtonSize.width, y: floor((self.effectiveBottomAreaHeight - sideButtonSize.height) / 2.0)), size: sideButtonSize)
+            var centerButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - centralButtonSize.width) / 2.0), y: floor((self.effectiveBottomAreaHeight - centralButtonSize.height) / 2.0) - 3.0), size: centralButtonSize)
+            
+            if case .regular = layout.metrics.widthClass {
+                centerButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((contentWidth - centralButtonSize.width) / 2.0), y: floor((self.effectiveBottomAreaHeight - centralButtonSize.height) / 2.0) - 3.0), size: centralButtonSize)
+                
+                if hasCameraButton {
+                    firstButtonFrame = CGRect(origin: CGPoint(x: floor(leftButtonFrame.midX - cameraButtonSize.width / 2.0), y: leftButtonFrame.minY - upperButtonDistance - cameraButtonSize.height), size: cameraButtonSize)
+                } else {
+                    firstButtonFrame = CGRect(origin: CGPoint(x: leftButtonFrame.center.x - cameraButtonSize.width / 2.0, y: leftButtonFrame.center.y - cameraButtonSize.height / 2.0), size: cameraButtonSize)
+                }
+                secondButtonFrame = leftButtonFrame
+                thirdButtonFrame = centerButtonFrame
+                forthButtonFrame = rightButtonFrame
+            } else {
+                switch effectiveDisplayMode {
+                    case .modal:
+                        if self.isLandscape {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasVideo {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.height - sideInset * 2.0 - sideButtonSize.height * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let x = floor((fullscreenBottomAreaHeight - sideButtonSize.width) / 2.0)
+                            forthButtonFrame = CGRect(origin: CGPoint(x: x, y: sideInset), size: sideButtonSize)
+                            let thirdButtonPreFrame = CGRect(origin: CGPoint(x: x, y: sideInset + sideButtonSize.height + spacing), size: sideButtonSize)
+                            thirdButtonFrame = CGRect(origin: CGPoint(x: floor(thirdButtonPreFrame.midX - centralButtonSize.width / 2.0), y: floor(thirdButtonPreFrame.midY - centralButtonSize.height / 2.0)), size: centralButtonSize)
+                            secondButtonFrame = CGRect(origin: CGPoint(x: x, y: thirdButtonPreFrame.maxY + spacing), size: sideButtonSize)
+                            if hasCameraButton {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: x, y: layout.size.height - sideInset - sideButtonSize.height), size: sideButtonSize)
+                            } else {
+                                firstButtonFrame = secondButtonFrame
+                            }
+                        } else {
+                            if hasCameraButton {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: floor(leftButtonFrame.midX - cameraButtonSize.width / 2.0), y: leftButtonFrame.minY - upperButtonDistance - cameraButtonSize.height), size: cameraButtonSize)
+                            } else {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: leftButtonFrame.center.x - cameraButtonSize.width / 2.0, y: leftButtonFrame.center.y - cameraButtonSize.height / 2.0), size: cameraButtonSize)
+                            }
+                            secondButtonFrame = leftButtonFrame
+                            thirdButtonFrame = centerButtonFrame
+                            forthButtonFrame = rightButtonFrame
+                        }
+                    case let .fullscreen(controlsHidden):
+                        if self.isLandscape {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasVideo {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.height - sideInset * 2.0 - sideButtonSize.height * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let x = controlsHidden ? fullscreenBottomAreaHeight + layout.safeInsets.right + 30.0 : floor((fullscreenBottomAreaHeight - sideButtonSize.width) / 2.0)
+                            forthButtonFrame = CGRect(origin: CGPoint(x: x, y: sideInset), size: sideButtonSize)
+                            let thirdButtonPreFrame = CGRect(origin: CGPoint(x: x, y: sideInset + sideButtonSize.height + spacing), size: sideButtonSize)
+                            thirdButtonFrame = CGRect(origin: CGPoint(x: floor(thirdButtonPreFrame.midX - centralButtonSize.width / 2.0), y: floor(thirdButtonPreFrame.midY - centralButtonSize.height / 2.0)), size: centralButtonSize)
+                            secondButtonFrame = CGRect(origin: CGPoint(x: x, y: thirdButtonPreFrame.maxY + spacing), size: sideButtonSize)
+                            if hasVideo {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: x, y: layout.size.height - sideInset - sideButtonSize.height), size: sideButtonSize)
+                            } else {
+                                firstButtonFrame = secondButtonFrame
+                            }
+                        } else {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasVideo {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.width - sideInset * 2.0 - sideButtonSize.width * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let y = controlsHidden ? self.effectiveBottomAreaHeight + layout.intrinsicInsets.bottom + 30.0: floor((self.effectiveBottomAreaHeight - sideButtonSize.height) / 2.0)
+                            if hasVideo {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: y), size: sideButtonSize)
+                                secondButtonFrame = CGRect(origin: CGPoint(x: firstButtonFrame.maxX + spacing, y: y), size: sideButtonSize)
+                            } else {
+                                firstButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: y), size: sideButtonSize)
+                                secondButtonFrame = firstButtonFrame
+                            }
+                            let thirdButtonPreFrame = CGRect(origin: CGPoint(x: secondButtonFrame.maxX + spacing, y: y), size: sideButtonSize)
+                            thirdButtonFrame = CGRect(origin: CGPoint(x: floor(thirdButtonPreFrame.midX - centralButtonSize.width / 2.0), y: floor(thirdButtonPreFrame.midY - centralButtonSize.height / 2.0)), size: centralButtonSize)
+                            forthButtonFrame = CGRect(origin: CGPoint(x: thirdButtonPreFrame.maxX + spacing, y: y), size: sideButtonSize)
+                        }
+                }
+            }
+                                    
+            let buttonHeight = self.scheduleCancelButton.updateLayout(width: size.width - 32.0, transition: .immediate)
+            self.scheduleCancelButton.frame = CGRect(x: 16.0, y: 137.0, width: size.width - 32.0, height: buttonHeight)
             
             if self.actionButton.supernode === self.bottomPanelNode {
-                transition.updateFrame(node: self.actionButton, frame: actionButtonFrame)
+                transition.updateFrame(node: self.actionButton, frame: thirdButtonFrame, completion: transition.isAnimated ? { [weak self] _ in
+                    self?.animatingExpansion = false
+                } : nil)
             }
             
-            self.updateButtons(animated: !isFirstTime)
+            self.cameraButton.isUserInteractionEnabled = hasCameraButton
             
-            /*var currentVideoOrigin = CGPoint(x: 4.0, y: (layout.statusBarHeight ?? 0.0) + 4.0)
-            for (_, _, videoNode) in self.videoNodes {
-                let videoSize = CGSize(width: 300.0, height: 500.0)
-                if currentVideoOrigin.x + videoSize.width > layout.size.width {
-                    currentVideoOrigin.x = 0.0
-                    currentVideoOrigin.y += videoSize.height
-                }
-                
-                videoNode.frame = CGRect(origin: currentVideoOrigin, size: videoSize)
-                videoNode.updateLayout(size: videoSize, transition: .immediate)
-                if videoNode.supernode == nil {
-                    self.contentContainer.addSubnode(videoNode)
-                }
-                 
-                currentVideoOrigin.x += videoSize.width + 4.0
-            }*/
-            
-            let sideButtonMinimalInset: CGFloat = 16.0
-            let sideButtonOffset = min(42.0, floor((((size.width - 112.0) / 2.0) - sideButtonSize.width) / 2.0))
-            let sideButtonOrigin = max(sideButtonMinimalInset, floor((size.width - 112.0) / 2.0) - sideButtonOffset - sideButtonSize.width)
-            
-            if self.audioOutputNode.supernode === self.bottomPanelNode {
-                if true {
-                    let audioOutputFrame = CGRect(origin: CGPoint(x: sideButtonOrigin, y: floor((bottomAreaHeight - sideButtonSize.height) / 2.0)), size: sideButtonSize)
-                    transition.updateFrame(node: self.audioOutputNode, frame: audioOutputFrame)
+            var buttonsTransition: ContainedViewLayoutTransition = .immediate
+            if !isFirstTime {
+                if case .animated(_, .spring) = transition {
+                    buttonsTransition = transition
                 } else {
-                    let cameraButtonDistance: CGFloat = 4.0
-                    
-                    let audioOutputFrame = CGRect(origin: CGPoint(x: sideButtonOrigin, y: floor((bottomAreaHeight - sideButtonSize.height - cameraButtonDistance - cameraButtonSize.height) / 2.0) + cameraButtonDistance + cameraButtonSize.height), size: sideButtonSize)
-                    
-                    transition.updateFrame(node: self.audioOutputNode, frame: audioOutputFrame)
-                    
-                    transition.updateFrame(node: self.cameraButtonNode, frame: CGRect(origin: CGPoint(x: floor(audioOutputFrame.midX - cameraButtonSize.width / 2.0), y: audioOutputFrame.minY - cameraButtonDistance - cameraButtonSize.height), size: cameraButtonSize))
+                    buttonsTransition = .animated(duration: 0.3, curve: .linear)
                 }
+            }
+            self.updateButtons(transition: buttonsTransition)
+            
+            if self.audioButton.supernode === self.bottomPanelNode {
+                transition.updateAlpha(node: self.cameraButton, alpha: hasCameraButton ? 1.0 : 0.0)
+                transition.updateFrameAsPositionAndBounds(node: self.switchCameraButton, frame: firstButtonFrame)
                 
-                transition.updateFrame(node: self.leaveNode, frame: CGRect(origin: CGPoint(x: size.width - sideButtonOrigin - sideButtonSize.width, y: floor((bottomAreaHeight - sideButtonSize.height) / 2.0)), size: sideButtonSize))
+                if !self.animatingButtonsSwap || transition.isAnimated {
+                    transition.updateFrameAsPositionAndBounds(node: self.audioButton, frame: secondButtonFrame, completion: { [weak self] _ in
+                        self?.animatingButtonsSwap = false
+                    })
+                    transition.updateFrameAsPositionAndBounds(node: self.cameraButton, frame: secondButtonFrame)
+                }
+                transition.updateFrameAsPositionAndBounds(node: self.leaveButton, frame: forthButtonFrame)
             }
             if isFirstTime {
                 while !self.enqueuedTransitions.isEmpty {
                     self.dequeueTransition()
                 }
+                while !self.enqueuedFullscreenTransitions.isEmpty {
+                    self.dequeueFullscreenTransition()
+                }
             }
         }
         
+        private var appIsActive = true {
+            didSet {
+                if self.appIsActive != oldValue {
+                    self.updateVisibility()
+                    self.updateRequestedVideoChannels()
+                }
+            }
+        }
+        private var visibility = false {
+            didSet {
+                if self.visibility != oldValue {
+                    self.updateVisibility()
+                    self.updateRequestedVideoChannels()
+                }
+            }
+        }
+        
+        private func updateVisibility() {
+            let visible = self.appIsActive && self.visibility
+            if self.tileGridNode.isHidden {
+                self.tileGridNode.visibility = false
+            } else {
+                self.tileGridNode.visibility = visible
+            }
+            self.mainStageNode.visibility = visible
+            self.listNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                    itemNode.gridVisibility = visible
+                }
+            }
+            self.fullscreenListNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? VoiceChatFullscreenParticipantItemNode {
+                    itemNode.gridVisibility = visible
+                }
+            }
+
+            self.videoRenderingContext.updateVisibility(isVisible: visible)
+        }
+        
         func animateIn() {
             guard let (layout, navigationHeight) = self.validLayout else {
                 return
             }
-            let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
             
-            let topPanelFrame = self.topPanelNode.view.convert(self.topPanelNode.bounds, to: self.view)
-
+            self.visibility = true
+            
+            self.updateDecorationsLayout(transition: .immediate)
+            
+            self.animatingAppearance = true
+            
             let initialBounds = self.contentContainer.bounds
+            let topPanelFrame = self.topPanelNode.view.convert(self.topPanelNode.bounds, to: self.view)
             self.contentContainer.bounds = initialBounds.offsetBy(dx: 0.0, dy: -(layout.size.height - topPanelFrame.minY))
             self.contentContainer.isHidden = false
+            
+            let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
             transition.animateView({
                 self.contentContainer.view.bounds = initialBounds
             }, completion: { _ in
+                self.animatingAppearance = false
                 if self.actionButton.supernode !== self.bottomPanelNode {
                     self.actionButton.ignoreHierarchyChanges = true
-                    self.audioOutputNode.isHidden = false
-                    self.cameraButtonNode.isHidden = false
-                    self.leaveNode.isHidden = false
-                    self.audioOutputNode.layer.removeAllAnimations()
-                    self.cameraButtonNode.layer.removeAllAnimations()
-                    self.leaveNode.layer.removeAllAnimations()
-                    self.bottomPanelNode.addSubnode(self.audioOutputNode)
-                    //self.bottomPanelNode.addSubnode(self.cameraButtonNode)
-                    self.bottomPanelNode.addSubnode(self.leaveNode)
+                    self.audioButton.isHidden = false
+                    self.cameraButton.isHidden = false
+                    self.leaveButton.isHidden = false
+                    self.audioButton.layer.removeAllAnimations()
+                    self.cameraButton.layer.removeAllAnimations()
+                    self.leaveButton.layer.removeAllAnimations()
+                    self.bottomPanelNode.addSubnode(self.cameraButton)
+                    self.bottomPanelNode.addSubnode(self.audioButton)
+                    self.bottomPanelNode.addSubnode(self.leaveButton)
                     self.bottomPanelNode.addSubnode(self.actionButton)
-                    self.containerLayoutUpdated(layout, navigationHeight :navigationHeight, transition: .immediate)
+                    self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
                     self.actionButton.ignoreHierarchyChanges = false
                 }
                 
@@ -2915,6 +4672,8 @@ public final class VoiceChatController: ViewController {
                         var bounds = strongSelf.contentContainer.bounds
                         bounds.origin.y = 0.0
                         strongSelf.contentContainer.bounds = bounds
+                        
+                        strongSelf.visibility = false
                     }
                     completion?()
                 }
@@ -2938,14 +4697,36 @@ public final class VoiceChatController: ViewController {
             }
         }
         
-        private var topInset: CGFloat?
-        private var isFirstTime = true
+        private func enqueueFullscreenTransition(_ transition: ListTransition) {
+            self.enqueuedFullscreenTransitions.append(transition)
+            
+            if let _ = self.validLayout {
+                while !self.enqueuedFullscreenTransitions.isEmpty {
+                    self.dequeueFullscreenTransition()
+                }
+            }
+        }
+
         private func dequeueTransition() {
             guard let (layout, _) = self.validLayout, let transition = self.enqueuedTransitions.first else {
                 return
             }
             self.enqueuedTransitions.remove(at: 0)
             
+            if let callState = self.callState {
+                if callState.scheduleTimestamp != nil && self.listNode.alpha > 0.0 {
+                    self.timerNode.isHidden = false
+                    self.cameraButton.alpha = 0.0
+                    self.cameraButton.isUserInteractionEnabled = false
+                    self.listNode.alpha = 0.0
+                    self.listNode.isUserInteractionEnabled = false
+                    self.backgroundNode.backgroundColor = panelBackgroundColor
+                    self.updateDecorationsColors()
+                } else if callState.scheduleTimestamp == nil && !self.isScheduling && self.listNode.alpha == 0.0 {
+                    self.transitionToCall()
+                }
+            }
+            
             var options = ListViewDeleteAndInsertOptions()
             let isFirstTime = self.isFirstTime
             if isFirstTime {
@@ -2954,140 +4735,115 @@ public final class VoiceChatController: ViewController {
                 if transition.crossFade {
                     options.insert(.AnimateCrossfade)
                 }
-                if transition.animated && self.animation == nil {
+                if transition.animated {
                     options.insert(.AnimateInsertion)
                 }
             }
             options.insert(.LowLatency)
             options.insert(.PreferSynchronousResourceLoading)
-            
-            var itemsHeight: CGFloat = 0.0
-            var itemsCount = transition.count
-            if transition.canInvite {
-                itemsHeight += 46.0
-                itemsCount -= 1
-            }
-            itemsHeight += CGFloat(itemsCount) * 56.0
-           
-            let layoutTopInset: CGFloat = max(layout.statusBarHeight ?? 0.0, layout.safeInsets.top)
-            
-            let sideInset: CGFloat = 16.0
-            var insets = UIEdgeInsets()
-            insets.left = layout.safeInsets.left + sideInset
-            insets.right = layout.safeInsets.right + sideInset
-            
+                 
             var size = layout.size
             if case .regular = layout.metrics.widthClass {
                 size.width = floor(min(size.width, size.height) * 0.5)
             }
             
-            let bottomPanelHeight = bottomAreaHeight + layout.intrinsicInsets.bottom
-            let listTopInset = layoutTopInset + 63.0
-            let listSize = CGSize(width: size.width, height: layout.size.height - listTopInset - bottomPanelHeight)
+            let bottomPanelHeight = self.isLandscape ? layout.intrinsicInsets.bottom : bottomAreaHeight + layout.intrinsicInsets.bottom
+            let layoutTopInset: CGFloat = max(layout.statusBarHeight ?? 0.0, layout.safeInsets.top)
+            let listTopInset = layoutTopInset + topPanelHeight
+            let listSize = CGSize(width: size.width, height: layout.size.height - listTopInset - bottomPanelHeight + bottomGradientHeight)
             
-            self.topInset = max(0.0, max(listSize.height - itemsHeight, listSize.height - 46.0 - floor(56.0 * 3.5)))
+            self.topInset = listSize.height - 46.0 - floor(56.0 * 3.5) - bottomGradientHeight
             
-            let targetY = listTopInset + (self.topInset ?? listSize.height)
-            
-            if isFirstTime {
-                var frame = self.listNode.frame
-                frame.origin.y = targetY
-                self.listNode.frame = frame
-            } else if !self.isExpanded {
-                if self.listNode.frame.minY != targetY && !self.animatingExpansion && self.panGestureArguments == nil {
-                    self.animation = ListViewAnimation(from: self.listNode.frame.minY, to: targetY, duration: 0.4, curve: listViewAnimationCurveSystem, beginAt: CACurrentMediaTime(), update: { [weak self] _, currentValue in
-                        if let strongSelf = self {
-                            var frame = strongSelf.listNode.frame
-                            frame.origin.y = currentValue
-                            strongSelf.listNode.frame = frame
-                            strongSelf.updateFloatingHeaderOffset(offset: strongSelf.currentContentOffset ?? 0.0, transition: .immediate)
-                        }
-                    })
-                    self.updateAnimation()
-                }
+            if transition.animated {
+                self.animatingInsertion = true
             }
-                        
             self.listNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: nil, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { [weak self] _ in
                 guard let strongSelf = self else {
                     return
                 }
+                if isFirstTime {
+                    strongSelf.updateDecorationsLayout(transition: .immediate)
+                } else if strongSelf.animatingInsertion {
+                    strongSelf.updateDecorationsLayout(transition: .animated(duration: 0.2, curve: .easeInOut))
+                }
+                strongSelf.animatingInsertion = false
                 if !strongSelf.didSetContentsReady {
                     strongSelf.didSetContentsReady = true
                     strongSelf.controller?.contentsReady.set(true)
                 }
+                strongSelf.updateVisibility()
+            })
+        }
+
+        private func dequeueFullscreenTransition() {
+            guard let _ = self.validLayout, let transition = self.enqueuedFullscreenTransitions.first else {
+                return
+            }
+            self.enqueuedFullscreenTransitions.remove(at: 0)
+            
+            var options = ListViewDeleteAndInsertOptions()
+            let isFirstTime = self.isFirstTime
+            if !isFirstTime {
+                if transition.animated {
+                    options.insert(.AnimateInsertion)
+                }
+            }
+            
+            self.fullscreenListNode.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: nil, updateSizeAndInsets: nil, updateOpaqueState: nil, completion: { _ in
             })
         }
         
-        
-        private var animator: ConstantDisplayLinkAnimator?
-        private var animation: ListViewAnimation?
-        private func updateAnimation() {
-            var animate = false
-            let timestamp = CACurrentMediaTime()
-            
-            if let animation = self.animation {
-                animation.applyAt(timestamp)
-            
-                if animation.completeAt(timestamp) {
-                    self.animation = nil
-                } else {
-                    animate = true
-                }
-            }
-            
-            if animate {
-                let animator: ConstantDisplayLinkAnimator
-                if let current = self.animator {
-                    animator = current
-                } else {
-                    animator = ConstantDisplayLinkAnimator(update: { [weak self] in
-                        self?.updateAnimation()
-                    })
-                    self.animator = animator
-                }
-                animator.isPaused = false
-            } else {
-                self.animator?.isPaused = true
-            }
+        private func updateMembers(maybeUpdateVideo: Bool = true, force: Bool = false) {
+            self.updateMembers(muteState: self.effectiveMuteState, callMembers: self.currentCallMembers ?? ([], nil), invitedPeers: self.currentInvitedPeers ?? [], speakingPeers: self.currentSpeakingPeers ?? Set(), maybeUpdateVideo: maybeUpdateVideo, force: force)
         }
         
-        private func updateMembers(muteState: GroupCallParticipantsContext.Participant.MuteState?, callMembers: ([GroupCallParticipantsContext.Participant], String?), invitedPeers: [Peer], speakingPeers: Set<PeerId>) {
+        private func updateMembers(muteState: GroupCallParticipantsContext.Participant.MuteState?, callMembers: ([GroupCallParticipantsContext.Participant], String?), invitedPeers: [Peer], speakingPeers: Set<PeerId>, maybeUpdateVideo: Bool = true, force: Bool = false) {
             var disableAnimation = false
             if self.currentCallMembers?.1 != callMembers.1 {
                 disableAnimation = true
             }
             
+            let speakingPeersUpdated = self.currentSpeakingPeers != speakingPeers
             self.currentCallMembers = callMembers
             self.currentSpeakingPeers = speakingPeers
             self.currentInvitedPeers = invitedPeers
             
-            let previousEntries = self.currentEntries
             var entries: [ListEntry] = []
-            
+            var fullscreenEntries: [ListEntry] = []
             var index: Int32 = 0
-            
+            var fullscreenIndex: Int32 = 0
             var processedPeerIds = Set<PeerId>()
+            var processedFullscreenPeerIds = Set<PeerId>()
+                        
+            var peerIdToCameraEndpointId: [PeerId: String] = [:]
+            var peerIdToEndpointId: [PeerId: String] = [:]
+
+            var requestedVideoChannels: [PresentationGroupCallRequestedVideo] = []
+            var gridTileItems: [VoiceChatTileItem] = []
+            var tileItems: [VoiceChatTileItem] = []
+            var gridTileByVideoEndpoint: [String: VoiceChatTileItem] = [:]
+            var tileByVideoEndpoint: [String: VoiceChatTileItem] = [:]
+            var entryByPeerId: [PeerId: VoiceChatPeerEntry] = [:]
+            var latestWideVideo: String? = nil
             
-            var canInvite = true
-            if let peer = self.peer as? TelegramChannel {
-                if peer.flags.contains(.isGigagroup) || (peer.addressName?.isEmpty ?? true) {
-                    if peer.flags.contains(.isCreator) || peer.adminRights != nil {
-                    } else {
-                        canInvite = false
-                    }
-                }
-            }
-            if canInvite {
-                entries.append(.invite(self.presentationData.theme, self.presentationData.strings, self.presentationData.strings.VoiceChat_InviteMember))
+            var isTablet = false
+            var displayPanelVideos = false
+            if let (layout, _) = self.validLayout, case .regular = layout.metrics.widthClass {
+                isTablet = true
+                displayPanelVideos = self.displayPanelVideos
             }
             
+            var joinedVideo = self.joinedVideo ?? true
+            
+            var myEntry: VoiceChatPeerEntry?
+            var mainEntry: VoiceChatPeerEntry?
             for member in callMembers.0 {
                 if processedPeerIds.contains(member.peer.id) {
                     continue
                 }
                 processedPeerIds.insert(member.peer.id)
                 
-                let memberState: PeerEntry.State
+                let memberState: VoiceChatPeerEntry.State
                 var memberMuteState: GroupCallParticipantsContext.Participant.MuteState?
                 if member.hasRaiseHand && !(member.muteState?.canUnmute ?? false) {
                     memberState = .raisedHand
@@ -3104,8 +4860,7 @@ public final class VoiceChatController: ViewController {
                                 var displayedRaisedHands = strongSelf.displayedRaisedHands
                                 displayedRaisedHands.remove(member.peer.id)
                                 strongSelf.displayedRaisedHands = displayedRaisedHands
-                                
-                                strongSelf.updateMembers(muteState: strongSelf.effectiveMuteState, callMembers: strongSelf.currentCallMembers ?? ([], nil), invitedPeers: strongSelf.currentInvitedPeers ?? [], speakingPeers: strongSelf.currentSpeakingPeers ?? Set())
+                                strongSelf.updateMembers()
                             }
                         })
                     }
@@ -3128,53 +4883,279 @@ public final class VoiceChatController: ViewController {
                     }
                 }
                 
-                entries.append(.peer(PeerEntry(
-                    peer: member.peer,
+                var memberPeer = member.peer
+                if member.peer.id == self.callState?.myPeerId {
+                    joinedVideo = member.joinedVideo
+                    if let user = memberPeer as? TelegramUser, let photo = self.currentUpdatingAvatar {
+                        memberPeer = user.withUpdatedPhoto([photo])
+                    }
+                }
+                
+                if let videoEndpointId = member.videoEndpointId {
+                    peerIdToCameraEndpointId[member.peer.id] = videoEndpointId
+                }
+                if let anyEndpointId = member.presentationEndpointId ?? member.videoEndpointId {
+                    peerIdToEndpointId[member.peer.id] = anyEndpointId
+                }
+                
+                let peerEntry = VoiceChatPeerEntry(
+                    peer: memberPeer,
                     about: member.about,
                     isMyPeer: self.callState?.myPeerId == member.peer.id,
-                    ssrc: member.ssrc,
-                    presence: nil,
-                    activityTimestamp: Int32.max - 1 - index,
+                    videoEndpointId: member.videoEndpointId,
+                    videoPaused: member.videoDescription?.isPaused ?? false,
+                    presentationEndpointId: member.presentationEndpointId,
+                    presentationPaused: member.presentationDescription?.isPaused ?? false,
+                    effectiveSpeakerVideoEndpointId: self.effectiveSpeaker?.1,
                     state: memberState,
                     muteState: memberMuteState,
                     canManageCall: self.callState?.canManageCall ?? false,
                     volume: member.volume,
-                    raisedHand: member.raiseHandRating != nil,
-                    displayRaisedHandStatus: self.displayedRaisedHands.contains(member.peer.id)
-                )))
+                    raisedHand: member.hasRaiseHand,
+                    displayRaisedHandStatus: self.displayedRaisedHands.contains(member.peer.id),
+                    active: memberPeer.id == self.effectiveSpeaker?.0,
+                    isLandscape: self.isLandscape
+                )
+                if peerEntry.isMyPeer {
+                    myEntry = peerEntry
+                }
+                if peerEntry.active {
+                    mainEntry = peerEntry
+                }
+                entryByPeerId[peerEntry.peer.id] = peerEntry
+                
+                var isTile = false
+                if let interaction = self.itemInteraction {
+                    if let videoEndpointId = member.presentationEndpointId {
+                        if !self.videoOrder.contains(videoEndpointId) {
+                            if peerEntry.isMyPeer {
+                                self.videoOrder.insert(videoEndpointId, at: 0)
+                            } else {
+                                self.videoOrder.append(videoEndpointId)
+                            }
+                        }
+                        if isTablet {
+                            if let tileItem = ListEntry.peer(peerEntry, 0).tileItem(context: self.context, presentationData: self.presentationData, interaction: interaction, isTablet: isTablet, videoEndpointId: videoEndpointId, videoReady: self.readyVideoEndpointIds.contains(videoEndpointId), videoTimeouted: self.timeoutedEndpointIds.contains(videoEndpointId), videoIsPaused: member.presentationDescription?.isPaused ?? false, showAsPresentation: peerIdToCameraEndpointId[peerEntry.peer.id] != nil, secondary: false) {
+                                isTile = true
+                                gridTileByVideoEndpoint[videoEndpointId] = tileItem
+                            }
+                        }
+                        if let tileItem = ListEntry.peer(peerEntry, 0).tileItem(context: self.context, presentationData: self.presentationData, interaction: interaction, isTablet: isTablet, videoEndpointId: videoEndpointId, videoReady: self.readyVideoEndpointIds.contains(videoEndpointId), videoTimeouted: self.timeoutedEndpointIds.contains(videoEndpointId), videoIsPaused: member.presentationDescription?.isPaused ?? false, showAsPresentation: peerIdToCameraEndpointId[peerEntry.peer.id] != nil, secondary: displayPanelVideos) {
+                            isTile = true
+                            tileByVideoEndpoint[videoEndpointId] = tileItem
+                        }
+                        if self.wideVideoNodes.contains(videoEndpointId) {
+                            latestWideVideo = videoEndpointId
+                        }
+                    }
+                    if let videoEndpointId = member.videoEndpointId {
+                        if !self.videoOrder.contains(videoEndpointId) {
+                            if peerEntry.isMyPeer {
+                                self.videoOrder.insert(videoEndpointId, at: 0)
+                            } else {
+                                self.videoOrder.append(videoEndpointId)
+                            }
+                        }
+                        if isTablet {
+                            if let tileItem = ListEntry.peer(peerEntry, 0).tileItem(context: self.context, presentationData: self.presentationData, interaction: interaction, isTablet: isTablet, videoEndpointId: videoEndpointId, videoReady: self.readyVideoEndpointIds.contains(videoEndpointId), videoTimeouted: self.timeoutedEndpointIds.contains(videoEndpointId), videoIsPaused: member.videoDescription?.isPaused ?? false, showAsPresentation: false, secondary: false) {
+                                isTile = true
+                                gridTileByVideoEndpoint[videoEndpointId] = tileItem
+                            }
+                        }
+                        if let tileItem = ListEntry.peer(peerEntry, 0).tileItem(context: self.context, presentationData: self.presentationData, interaction: interaction, isTablet: isTablet, videoEndpointId: videoEndpointId, videoReady: self.readyVideoEndpointIds.contains(videoEndpointId), videoTimeouted: self.timeoutedEndpointIds.contains(videoEndpointId), videoIsPaused: member.videoDescription?.isPaused ?? false, showAsPresentation: false, secondary: displayPanelVideos) {
+                            isTile = true
+                            tileByVideoEndpoint[videoEndpointId] = tileItem
+                        }
+                        if self.wideVideoNodes.contains(videoEndpointId) {
+                            latestWideVideo = videoEndpointId
+                        }
+                    }
+                }
+                
+                if !isTile || isTablet || !joinedVideo {
+                    entries.append(.peer(peerEntry, index))
+                }
+    
                 index += 1
+            
+                if self.callState?.networkState == .connecting {
+                } else {
+                    if var videoChannel = member.requestedVideoChannel(minQuality: .thumbnail, maxQuality: .medium) {
+                        if self.effectiveSpeaker?.1 == videoChannel.endpointId {
+                            videoChannel.maxQuality = .full
+                        }
+                        requestedVideoChannels.append(videoChannel)
+                    }
+                    if member.peer.id != self.callState?.myPeerId {
+                        if var presentationChannel = member.requestedPresentationVideoChannel(minQuality: .thumbnail, maxQuality: .thumbnail) {
+                            if self.effectiveSpeaker?.1 == presentationChannel.endpointId {
+                                presentationChannel.minQuality = .full
+                                presentationChannel.maxQuality = .full
+                            }
+                            requestedVideoChannels.append(presentationChannel)
+                        }
+                    }
+                }
             }
             
+            var temporaryList: [String] = []
+            for tileVideoEndpoint in self.videoOrder {
+                if let _ = tileByVideoEndpoint[tileVideoEndpoint] {
+                    temporaryList.append(tileVideoEndpoint)
+                }
+            }
+            
+            if (tileByVideoEndpoint.count % 2) != 0, let last = temporaryList.last, !self.wideVideoNodes.contains(last), let latestWide = latestWideVideo {
+                self.videoOrder.removeAll(where: { $0 == latestWide })
+                self.videoOrder.append(latestWide)
+            }
+            
+            for tileVideoEndpoint in self.videoOrder {
+                if let tileItem = gridTileByVideoEndpoint[tileVideoEndpoint] {
+                    gridTileItems.append(tileItem)
+                }
+                if let tileItem = tileByVideoEndpoint[tileVideoEndpoint] {
+                    if displayPanelVideos && tileItem.peer.id == self.effectiveSpeaker?.0 {
+                    } else {
+                        tileItems.append(tileItem)
+                    }
+                    if let fullscreenEntry = entryByPeerId[tileItem.peer.id] {
+                        if processedFullscreenPeerIds.contains(tileItem.peer.id) {
+                            continue
+                        }
+                        fullscreenEntries.append(.peer(fullscreenEntry, fullscreenIndex))
+                        processedFullscreenPeerIds.insert(fullscreenEntry.peer.id)
+                        fullscreenIndex += 1
+                    }
+                }
+            }
+            
+            self.joinedVideo = joinedVideo
+            
+            if !joinedVideo && (!tileItems.isEmpty || !gridTileItems.isEmpty), let peer = self.peer {
+                tileItems.removeAll()
+                gridTileItems.removeAll()
+                
+                let configuration = self.configuration ?? VoiceChatConfiguration.defaultValue
+                tileItems.append(VoiceChatTileItem(account: self.context.account, peer: peer, videoEndpointId: "", videoReady: false, videoTimeouted: true, isVideoLimit: true, videoLimit: configuration.videoParticipantsMaxCount, isPaused: false, isOwnScreencast: false, strings: self.presentationData.strings, nameDisplayOrder: self.presentationData.nameDisplayOrder, speaking: false, secondary: false, isTablet: false, icon: .none, text: .none, additionalText: nil, action: {}, contextAction: nil, getVideo: { _ in return nil }, getAudioLevel: nil))
+            }
+            
+            for member in callMembers.0 {
+                if processedFullscreenPeerIds.contains(member.peer.id) {
+                    continue
+                }
+                processedFullscreenPeerIds.insert(member.peer.id)
+                if let peerEntry = entryByPeerId[member.peer.id] {
+                    fullscreenEntries.append(.peer(peerEntry, fullscreenIndex))
+                    fullscreenIndex += 1
+                }
+            }
+                                    
             for peer in invitedPeers {
                 if processedPeerIds.contains(peer.id) {
                     continue
                 }
                 processedPeerIds.insert(peer.id)
                 
-                entries.append(.peer(PeerEntry(
+                entries.append(.peer(VoiceChatPeerEntry(
                     peer: peer,
                     about: nil,
                     isMyPeer: false,
-                    ssrc: nil,
-                    presence: nil,
-                    activityTimestamp: Int32.max - 1 - index,
+                    videoEndpointId: nil,
+                    videoPaused: false,
+                    presentationEndpointId: nil,
+                    presentationPaused: false,
+                    effectiveSpeakerVideoEndpointId: nil,
                     state: .invited,
                     muteState: nil,
                     canManageCall: false,
                     volume: nil,
                     raisedHand: false,
-                    displayRaisedHandStatus: false
-                )))
+                    displayRaisedHandStatus: false,
+                    active: false,
+                    isLandscape: false
+                ), index))
                 index += 1
             }
             
+            self.requestedVideoChannels = requestedVideoChannels
+            
+            var myVideoUpdated = false
+            if let previousMyEntry = self.myEntry, let myEntry = myEntry, previousMyEntry.effectiveVideoEndpointId == nil && myEntry.effectiveVideoEndpointId != nil && self.currentForcedSpeaker == nil {
+                self.currentDominantSpeaker = (myEntry.peer.id, myEntry.effectiveVideoEndpointId, CACurrentMediaTime())
+                myVideoUpdated = true
+            }
+            self.myEntry = myEntry
+                        
+            guard self.didSetDataReady && (force || (!self.isPanning && !self.animatingExpansion && !self.animatingMainStage)) else {
+                return
+            }
+            
+            let previousMainEntry = self.mainEntry
+            self.mainEntry = mainEntry
+            if let mainEntry = mainEntry {
+                self.mainStageNode.update(peerEntry: mainEntry, pinned: self.currentForcedSpeaker != nil)
+                
+                if let previousMainEntry = previousMainEntry, maybeUpdateVideo {
+                    if previousMainEntry.effectiveVideoEndpointId != mainEntry.effectiveVideoEndpointId || previousMainEntry.videoPaused != mainEntry.videoPaused || myVideoUpdated {
+                        self.updateMainVideo(waitForFullSize: true, entries: fullscreenEntries, force: true)
+                        return
+                    }
+                }
+            } else if self.effectiveSpeaker != nil, !fullscreenEntries.isEmpty {
+                self.updateMainVideo(waitForFullSize: true, entries: fullscreenEntries, force: true)
+                return
+            }
+            
+            self.updateRequestedVideoChannels()
+            
+            self.peerIdToEndpointId = peerIdToEndpointId
+                    
+            var updateLayout = false
+            var animatingLayout = false
+            if self.currentTileItems.isEmpty != gridTileItems.isEmpty {
+                animatingLayout = true
+                updateLayout = true
+            }
+            if isTablet {
+                updateLayout = true
+                self.currentTileItems = gridTileItems
+                if displayPanelVideos && !tileItems.isEmpty {
+                    entries.insert(.tiles(tileItems, .pairs), at: 0)
+                }
+            } else {
+                if !tileItems.isEmpty {
+                    entries.insert(.tiles(tileItems, .pairs), at: 0)
+                }
+            }
+            
+            var canInvite = true
+            var inviteIsLink = false
+            if let peer = self.peer as? TelegramChannel {
+                if peer.flags.contains(.isGigagroup) {
+                    if peer.flags.contains(.isCreator) || peer.adminRights != nil {
+                    } else {
+                        canInvite = false
+                    }
+                }
+                if case .broadcast = peer.info, !(peer.addressName?.isEmpty ?? true) {
+                    inviteIsLink = true
+                }
+            }
+            if canInvite {
+                entries.append(.invite(self.presentationData.theme, self.presentationData.strings, inviteIsLink ? self.presentationData.strings.VoiceChat_Share : self.presentationData.strings.VoiceChat_InviteMember, inviteIsLink))
+            }
+            
+            let previousEntries = self.currentEntries
+            let previousFullscreenEntries = self.currentFullscreenEntries
             self.currentEntries = entries
+            self.currentFullscreenEntries = fullscreenEntries
             
             if previousEntries.count == entries.count {
                 var allEqual = true
                 for i in 0 ..< previousEntries.count {
                     if previousEntries[i].stableId != entries[i].stableId {
-                        if case let .peer(lhsPeer) = previousEntries[i], case let .peer(rhsPeer) = entries[i] {
+                        if case let .peer(lhsPeer, _) = previousEntries[i], case let .peer(rhsPeer, _) = entries[i] {
                             if lhsPeer.isMyPeer != rhsPeer.isMyPeer {
                                 allEqual = false
                                 break
@@ -3188,17 +5169,322 @@ public final class VoiceChatController: ViewController {
                 if allEqual {
                     disableAnimation = true
                 }
+            } else if abs(previousEntries.count - entries.count) > 10 {
+                disableAnimation = true
+            }
+        
+            let presentationData = self.presentationData.withUpdated(theme: self.darkTheme)
+            let transition = self.preparedTransition(from: previousEntries, to: entries, isLoading: false, isEmpty: false, canInvite: canInvite, crossFade: false, animated: !disableAnimation, context: self.context, presentationData: presentationData, interaction: self.itemInteraction!)
+            self.enqueueTransition(transition)
+            
+            let fullscreenTransition = self.preparedFullscreenTransition(from: previousFullscreenEntries, to: fullscreenEntries, isLoading: false, isEmpty: false, canInvite: canInvite, crossFade: false, animated: true, context: self.context, presentationData: presentationData, interaction: self.itemInteraction!)
+            if !isTablet {
+                self.enqueueFullscreenTransition(fullscreenTransition)
             }
             
-            let presentationData = self.presentationData.withUpdated(theme: self.darkTheme)
-            let transition = preparedTransition(from: previousEntries, to: entries, isLoading: false, isEmpty: false, canInvite: canInvite, crossFade: false, animated: !disableAnimation, context: self.context, presentationData: presentationData, interaction: self.itemInteraction!)
-            self.enqueueTransition(transition)
+            if speakingPeersUpdated {
+                var speakingPeers = speakingPeers
+                var updatedSpeakers: [PeerId] = []
+                for peerId in self.currentSpeakers {
+                    if speakingPeers.contains(peerId) {
+                        updatedSpeakers.append(peerId)
+                        speakingPeers.remove(peerId)
+                    }
+                }
+                
+                var currentSpeakingSubtitle = ""
+                for peerId in Array(speakingPeers) {
+                    updatedSpeakers.append(peerId)
+                    if let peer = entryByPeerId[peerId]?.peer {
+                        let displayName = speakingPeers.count == 1 ? peer.displayTitle(strings: self.presentationData.strings, displayOrder: self.presentationData.nameDisplayOrder) : peer.compactDisplayTitle
+                        if currentSpeakingSubtitle.isEmpty {
+                            currentSpeakingSubtitle.append(displayName)
+                        } else {
+                            currentSpeakingSubtitle.append(", \(displayName)")
+                        }
+                    }
+                }
+                self.currentSpeakers = updatedSpeakers
+                self.currentSpeakingSubtitle = currentSpeakingSubtitle.isEmpty ? nil : currentSpeakingSubtitle
+                self.updateTitle(transition: .immediate)
+            }
+            
+            if case .fullscreen = self.displayMode, !self.mainStageNode.animating {
+                if speakingPeersUpdated {
+                    self.mainStageNode.update(speakingPeerId: self.currentSpeakers.first)
+                }
+            } else {
+                self.mainStageNode.update(speakingPeerId: nil)
+            }
+            
+            if updateLayout, let (layout, navigationHeight) = self.validLayout {
+                let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .easeInOut)
+                if animatingLayout {
+                    self.animatingExpansion = true
+                }
+                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                self.updateDecorationsLayout(transition: transition)
+            }
+        }
+
+        private func callStateDidReset() {
+            self.requestedVideoSources.removeAll()
+            self.filterRequestedVideoChannels(channels: [])
+            self.updateRequestedVideoChannels()
+        }
+
+        private func filterRequestedVideoChannels(channels: [PresentationGroupCallRequestedVideo]) {
+            var validSources = Set<String>()
+            for channel in channels {
+                validSources.insert(channel.endpointId)
+
+                if !self.requestedVideoSources.contains(channel.endpointId) {
+                    self.requestedVideoSources.insert(channel.endpointId)
+
+                    let input = (self.call as! PresentationGroupCallImpl).video(endpointId: channel.endpointId)
+                    if let input = input, let videoView = self.videoRenderingContext.makeView(input: input, blur: false) {
+                        let videoNode = GroupVideoNode(videoView: videoView, backdropVideoView: self.videoRenderingContext.makeView(input: input, blur: true))
+
+                        self.readyVideoDisposables.set((combineLatest(videoNode.ready, .single(false) |> then(.single(true) |> delay(10.0, queue: Queue.mainQueue())))
+                        |> deliverOnMainQueue
+                        ).start(next: { [weak self, weak videoNode] ready, timeouted in
+                            if let strongSelf = self, let videoNode = videoNode {
+                                Queue.mainQueue().after(0.1) {
+                                    if timeouted && !ready {
+                                        strongSelf.timeoutedEndpointIds.insert(channel.endpointId)
+                                        strongSelf.readyVideoEndpointIds.remove(channel.endpointId)
+                                        strongSelf.readyVideoEndpointIdsPromise.set(strongSelf.readyVideoEndpointIds)
+                                        strongSelf.wideVideoNodes.remove(channel.endpointId)
+
+                                        strongSelf.updateMembers()
+                                    } else if ready {
+                                        strongSelf.readyVideoEndpointIds.insert(channel.endpointId)
+                                        strongSelf.readyVideoEndpointIdsPromise.set(strongSelf.readyVideoEndpointIds)
+                                        strongSelf.timeoutedEndpointIds.remove(channel.endpointId)
+                                        if videoNode.aspectRatio <= 0.77 {
+                                            strongSelf.wideVideoNodes.insert(channel.endpointId)
+                                        } else {
+                                            strongSelf.wideVideoNodes.remove(channel.endpointId)
+                                        }
+                                        strongSelf.updateMembers()
+
+                                        if let (layout, _) = strongSelf.validLayout, case .compact = layout.metrics.widthClass {
+                                            if let interaction = strongSelf.itemInteraction {
+                                                loop: for i in 0 ..< strongSelf.currentFullscreenEntries.count {
+                                                    let entry = strongSelf.currentFullscreenEntries[i]
+                                                    switch entry {
+                                                    case let .peer(peerEntry, _):
+                                                        if peerEntry.effectiveVideoEndpointId == channel.endpointId {
+                                                            let presentationData = strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme)
+                                                            strongSelf.fullscreenListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [ListViewUpdateItem(index: i, previousIndex: i, item: entry.fullscreenItem(context: strongSelf.context, presentationData: presentationData, interaction: interaction), directionHint: nil)], options: [.Synchronous], updateOpaqueState: nil)
+                                                            break loop
+                                                        }
+                                                    default:
+                                                        break
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }), forKey: channel.endpointId)
+                        self.videoNodes[channel.endpointId] = videoNode
+
+                        if let _ = self.validLayout {
+                            self.updateMembers()
+                        }
+                    }
+
+                    /*self.call.makeIncomingVideoView(endpointId: channel.endpointId, requestClone: GroupVideoNode.useBlurTransparency, completion: { [weak self] videoView, backdropVideoView in
+                        Queue.mainQueue().async {
+                            guard let strongSelf = self, let videoView = videoView else {
+                                return
+                            }
+                            let videoNode = GroupVideoNode(videoView: videoView, backdropVideoView: backdropVideoView)
+                            
+                            strongSelf.readyVideoDisposables.set((combineLatest(videoNode.ready, .single(false) |> then(.single(true) |> delay(10.0, queue: Queue.mainQueue())))
+                            |> deliverOnMainQueue
+                            ).start(next: { [weak self, weak videoNode] ready, timeouted in
+                                if let strongSelf = self, let videoNode = videoNode {
+                                    Queue.mainQueue().after(0.1) {
+                                        if timeouted && !ready {
+                                            strongSelf.timeoutedEndpointIds.insert(channel.endpointId)
+                                            strongSelf.readyVideoEndpointIds.remove(channel.endpointId)
+                                            strongSelf.readyVideoEndpointIdsPromise.set(strongSelf.readyVideoEndpointIds)
+                                            strongSelf.wideVideoNodes.remove(channel.endpointId)
+                                            
+                                            strongSelf.updateMembers()
+                                        } else if ready {
+                                            strongSelf.readyVideoEndpointIds.insert(channel.endpointId)
+                                            strongSelf.readyVideoEndpointIdsPromise.set(strongSelf.readyVideoEndpointIds)
+                                            strongSelf.timeoutedEndpointIds.remove(channel.endpointId)
+                                            if videoNode.aspectRatio <= 0.77 {
+                                                strongSelf.wideVideoNodes.insert(channel.endpointId)
+                                            } else {
+                                                strongSelf.wideVideoNodes.remove(channel.endpointId)
+                                            }
+                                            strongSelf.updateMembers()
+
+                                            if let (layout, _) = strongSelf.validLayout, case .compact = layout.metrics.widthClass {
+                                                if let interaction = strongSelf.itemInteraction {
+                                                    loop: for i in 0 ..< strongSelf.currentFullscreenEntries.count {
+                                                        let entry = strongSelf.currentFullscreenEntries[i]
+                                                        switch entry {
+                                                        case let .peer(peerEntry, _):
+                                                            if peerEntry.effectiveVideoEndpointId == channel.endpointId {
+                                                                let presentationData = strongSelf.presentationData.withUpdated(theme: strongSelf.darkTheme)
+                                                                strongSelf.fullscreenListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [ListViewUpdateItem(index: i, previousIndex: i, item: entry.fullscreenItem(context: strongSelf.context, presentationData: presentationData, interaction: interaction), directionHint: nil)], options: [.Synchronous], updateOpaqueState: nil)
+                                                                break loop
+                                                            }
+                                                        default:
+                                                            break
+                                                        }
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }), forKey: channel.endpointId)
+                            strongSelf.videoNodes[channel.endpointId] = videoNode
+
+                            if let _ = strongSelf.validLayout {
+                                strongSelf.updateMembers()
+                            }
+                        }
+                    })*/
+                }
+            }
+
+            var removeRequestedVideoSources: [String] = []
+            for source in self.requestedVideoSources {
+                if !validSources.contains(source) {
+                    removeRequestedVideoSources.append(source)
+                }
+            }
+            for source in removeRequestedVideoSources {
+                self.requestedVideoSources.remove(source)
+            }
+
+            for (videoEndpointId, _) in self.videoNodes {
+                if !validSources.contains(videoEndpointId) {
+                    self.videoNodes[videoEndpointId] = nil
+                    self.videoOrder.removeAll(where: { $0 == videoEndpointId })
+                    self.readyVideoEndpointIds.remove(videoEndpointId)
+                    self.readyVideoEndpointIdsPromise.set(self.readyVideoEndpointIds)
+                    self.readyVideoDisposables.set(nil, forKey: videoEndpointId)
+                }
+            }
         }
         
+        private func updateMainVideo(waitForFullSize: Bool, entries: [ListEntry]? = nil, updateMembers: Bool = true, force: Bool = false, completion: (() -> Void)? = nil) {
+            let effectiveMainSpeaker = self.currentForcedSpeaker ?? self.currentDominantSpeaker.flatMap { ($0.0, $0.1) }
+            guard effectiveMainSpeaker?.0 != self.effectiveSpeaker?.0 || effectiveMainSpeaker?.1 != self.effectiveSpeaker?.1 || force else {
+                return
+            }
+            
+            let currentEntries = entries ?? self.currentFullscreenEntries
+            var effectiveSpeaker: (PeerId, String?, Bool, Bool, Bool)? = nil
+            var anySpeakerWithVideo: (PeerId, String?, Bool, Bool, Bool)? = nil
+            var anySpeaker: (PeerId, Bool)? = nil
+            if let (peerId, preferredVideoEndpointId) = effectiveMainSpeaker {
+                for entry in currentEntries {
+                    switch entry {
+                    case let .peer(peer, _):
+                        if peer.peer.id == peerId {
+                            if let preferredVideoEndpointId = preferredVideoEndpointId, peer.videoEndpointId == preferredVideoEndpointId || peer.presentationEndpointId == preferredVideoEndpointId {
+                                var isPaused = false
+                                if peer.presentationEndpointId != nil && preferredVideoEndpointId == peer.presentationEndpointId {
+                                    isPaused = peer.presentationPaused
+                                } else if peer.videoEndpointId != nil && preferredVideoEndpointId == peer.videoEndpointId {
+                                    isPaused = peer.videoPaused
+                                }
+                                effectiveSpeaker = (peerId, preferredVideoEndpointId, peer.isMyPeer, peer.presentationEndpointId != nil && preferredVideoEndpointId == peer.presentationEndpointId, isPaused)
+                            } else {
+                                var isPaused = false
+                                if peer.effectiveVideoEndpointId != nil && peer.effectiveVideoEndpointId == peer.presentationEndpointId {
+                                    isPaused = peer.presentationPaused
+                                } else if peer.effectiveVideoEndpointId != nil && peer.effectiveVideoEndpointId == peer.videoEndpointId {
+                                    isPaused = peer.videoPaused
+                                }
+                                effectiveSpeaker = (peerId, peer.effectiveVideoEndpointId, peer.isMyPeer, peer.presentationEndpointId != nil && peer.effectiveVideoEndpointId == peer.presentationEndpointId, isPaused)
+                            }
+                        } else if anySpeakerWithVideo == nil, let videoEndpointId = peer.effectiveVideoEndpointId {
+                            var isPaused = false
+                            if videoEndpointId == peer.presentationEndpointId {
+                                isPaused = peer.presentationPaused
+                            } else if videoEndpointId == peer.videoEndpointId {
+                                isPaused = peer.videoPaused
+                            }
+                            anySpeakerWithVideo = (peer.peer.id, videoEndpointId, peer.isMyPeer, peer.presentationEndpointId != nil && videoEndpointId == peer.presentationEndpointId, isPaused)
+                        } else if anySpeaker == nil {
+                            anySpeaker = (peer.peer.id, peer.isMyPeer)
+                        }
+                    default:
+                        break
+                    }
+                }
+            }
+
+            if effectiveSpeaker == nil {
+                self.currentForcedSpeaker = nil
+                effectiveSpeaker = anySpeakerWithVideo ?? anySpeaker.flatMap { ($0.0, nil, $0.1, false, false) }
+                if let (peerId, videoEndpointId, _, _, _) = effectiveSpeaker {
+                    self.currentDominantSpeaker = (peerId, videoEndpointId, CACurrentMediaTime())
+                } else {
+                    self.currentDominantSpeaker = nil
+                }
+            }
+            
+            self.effectiveSpeaker = effectiveSpeaker
+            if updateMembers {
+                self.updateMembers(maybeUpdateVideo: false, force: force)
+            }
+            
+            var waitForFullSize = waitForFullSize
+            var isReady = false
+            if let (_, maybeVideoEndpointId, _, _, _) = effectiveSpeaker, let videoEndpointId = maybeVideoEndpointId {
+                isReady = true
+                if !self.readyVideoEndpointIds.contains(videoEndpointId) {
+                    isReady = false
+                    if entries == nil {
+                        waitForFullSize = false
+                    }
+                }
+            }
+            
+            self.mainStageNode.update(peer: effectiveSpeaker, isReady: isReady, waitForFullSize: waitForFullSize, completion: {
+                completion?()
+            })
+        }
+
+        private func updateRequestedVideoChannels() {
+            Queue.mainQueue().after(0.3) {
+                let enableVideo = self.appIsActive && self.visibility
+
+                self.call.setRequestedVideoList(items: enableVideo ? self.requestedVideoChannels : [])
+                self.filterRequestedVideoChannels(channels: self.requestedVideoChannels)
+            }
+        }
+             
         override func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-            if gestureRecognizer is DirectionalPanGestureRecognizer {
-                let location = gestureRecognizer.location(in: self.bottomPanelNode.view)
-                if self.audioOutputNode.frame.contains(location) || (!self.cameraButtonNode.isHidden && self.cameraButtonNode.frame.contains(location)) || self.leaveNode.frame.contains(location) {
+            if gestureRecognizer is UILongPressGestureRecognizer {
+                return !self.isScheduling
+            } else if gestureRecognizer is DirectionalPanGestureRecognizer {
+                if self.mainStageNode.animating || self.animatingMainStage {
+                    return false
+                }
+                
+                let bottomPanelLocation = gestureRecognizer.location(in: self.bottomPanelNode.view)
+                let containerLocation = gestureRecognizer.location(in: self.contentContainer.view)
+                let mainStageLocation = gestureRecognizer.location(in: self.mainStageNode.view)
+                
+                if self.isLandscape && self.mainStageContainerNode.isUserInteractionEnabled && mainStageLocation.x > self.mainStageNode.frame.width - 80.0 {
+                    return false
+                }
+                
+                if self.audioButton.frame.contains(bottomPanelLocation) || (!self.cameraButton.isHidden && self.cameraButton.frame.contains(bottomPanelLocation)) || self.leaveButton.frame.contains(bottomPanelLocation) || self.pickerView?.frame.contains(containerLocation) == true || (self.mainStageContainerNode.isUserInteractionEnabled && (mainStageLocation.y < 44.0 || mainStageLocation.y > self.mainStageNode.frame.height - 100.0)) {
                     return false
                 }
             }
@@ -3212,16 +5498,17 @@ public final class VoiceChatController: ViewController {
             return false
         }
         
-        private var isExpanded = false
-        private var animatingExpansion = false
-        private var panGestureArguments: (topInset: CGFloat, offset: CGFloat)?
-        
         @objc func panGesture(_ recognizer: UIPanGestureRecognizer) {
+            guard let (layout, _) = self.validLayout else {
+                return
+            }
             let contentOffset = self.listNode.visibleContentOffset()
             switch recognizer.state {
                 case .began:
                     let topInset: CGFloat
-                    if self.isExpanded {
+                    if case .regular = layout.metrics.widthClass {
+                        topInset = 0.0
+                    } else if self.isExpanded {
                         topInset = 0.0
                     } else if let currentTopInset = self.topInset {
                         topInset = currentTopInset
@@ -3231,43 +5518,97 @@ public final class VoiceChatController: ViewController {
                     self.panGestureArguments = (topInset, 0.0)
                     
                     self.controller?.dismissAllTooltips()
+                    
+                    if case .fullscreen = self.displayMode, case .compact = layout.metrics.widthClass {
+                        self.isPanning = true
+                        
+                        self.mainStageBackgroundNode.alpha = 0.0
+                        self.mainStageBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.4)
+                        self.mainStageNode.setControlsHidden(true, animated: true)
+                        
+                        self.fullscreenListNode.alpha = 0.0
+                        self.fullscreenListNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.1, completion: { [weak self] finished in
+                            self?.attachTileVideos()
+                            
+                            self?.fullscreenListContainer.subnodeTransform = CATransform3DIdentity
+                        })
+                        
+                        self.listContainer.transform = CATransform3DMakeScale(0.86, 0.86, 1.0)
+                        
+                        self.contentContainer.insertSubnode(self.mainStageContainerNode, aboveSubnode: self.bottomPanelNode)
+                    }
                 case .changed:
                     var translation = recognizer.translation(in: self.contentContainer.view).y
-                    var topInset: CGFloat = 0.0
-                    if let (currentTopInset, currentPanOffset) = self.panGestureArguments {
-                        topInset = currentTopInset
-                        
-                        if case let .known(value) = contentOffset, value <= 0.5 {
-                        } else {
-                            translation = currentPanOffset
-                            if self.isExpanded {
-                                recognizer.setTranslation(CGPoint(), in: self.contentContainer.view)
-                            }
-                        }
-                        
-                        self.panGestureArguments = (currentTopInset, translation)
+                    if self.isScheduled && translation < 0.0 {
+                        return
                     }
-                
-                    let currentOffset = topInset + translation
-                    if currentOffset < 20.0 {
-                        self.updateIsFullscreen(true)
-                    } else if currentOffset > 40.0 {
-                        self.updateIsFullscreen(false)
-                    }
-                
-                    if self.isExpanded {
+                    
+                    let translateBounds: Bool
+                    if case .regular = layout.metrics.widthClass {
+                        translateBounds = true
                     } else {
-                        if currentOffset > 0.0 {
-                            self.listNode.scroller.panGestureRecognizer.setTranslation(CGPoint(), in: self.listNode.scroller)
+                        switch self.displayMode {
+                            case let .modal(isExpanded, previousIsFilled):
+                                var topInset: CGFloat = 0.0
+                                if let (currentTopInset, currentPanOffset) = self.panGestureArguments {
+                                    topInset = currentTopInset
+                                    
+                                    if case let .known(value) = contentOffset, value <= 0.5 {
+                                    } else {
+                                        translation = currentPanOffset
+                                        if self.isExpanded {
+                                            recognizer.setTranslation(CGPoint(), in: self.contentContainer.view)
+                                        }
+                                    }
+                                    
+                                    self.panGestureArguments = (currentTopInset, translation)
+                                }
+                            
+                                let currentOffset = topInset + translation
+                            
+                                var isFilled = previousIsFilled
+                                if currentOffset < 20.0 {
+                                    isFilled = true
+                                } else if currentOffset > 40.0 {
+                                    isFilled = false
+                                }
+                                if isFilled != previousIsFilled {
+                                    self.displayMode = .modal(isExpanded: isExpanded, isFilled: isFilled)
+                                    self.updateDecorationsColors()
+                                }
+                                 
+                                if self.isExpanded {
+                                } else {
+                                    if currentOffset > 0.0 {
+                                        self.listNode.scroller.panGestureRecognizer.setTranslation(CGPoint(), in: self.listNode.scroller)
+                                    }
+                                }
+                            case .fullscreen:
+                                if abs(translation) > 32.0 {
+                                    if self.fullscreenListNode.layer.animationKeys()?.contains("opacity") == true {
+                                        self.fullscreenListNode.layer.removeAllAnimations()
+                                    }
+                                }
+                                var bounds = self.mainStageContainerNode.bounds
+                                bounds.origin.y = -translation
+                                self.mainStageContainerNode.bounds = bounds
+                                
+                                var backgroundFrame = self.mainStageNode.frame
+                                backgroundFrame.origin.y += -translation
+                                self.mainStageBackgroundNode.frame = backgroundFrame
+                                
+                                self.fullscreenListContainer.subnodeTransform = CATransform3DMakeTranslation(0.0, translation, 0.0)
                         }
+                        
+                        translateBounds = !self.isExpanded
                     }
                     
                     if let (layout, navigationHeight) = self.validLayout {
                         self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .immediate)
-                        self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .immediate)
+                        self.updateDecorationsLayout(transition: .immediate)
                     }
                     
-                    if !self.isExpanded {
+                    if translateBounds {
                         var bounds = self.contentContainer.bounds
                         bounds.origin.y = -translation
                         bounds.origin.y = min(0.0, bounds.origin.y)
@@ -3301,28 +5642,68 @@ public final class VoiceChatController: ViewController {
                         topInset = self.listNode.frame.height
                     }
                     
-                    if self.isExpanded {
+                    if case .fullscreen = self.displayMode, case .compact = layout.metrics.widthClass {
+                        self.panGestureArguments = nil
+                        self.fullscreenListContainer.subnodeTransform = CATransform3DIdentity
+                        if abs(translation.y) > 100.0 || abs(velocity.y) > 300.0 {
+                            self.mainStageBackgroundNode.layer.removeAllAnimations()
+                            self.currentForcedSpeaker = nil
+                            self.updateDisplayMode(.modal(isExpanded: true, isFilled: true), fromPan: true)
+                            self.effectiveSpeaker = nil
+                        } else {
+                            self.isPanning = false
+                            self.mainStageBackgroundNode.alpha = 1.0
+                            self.mainStageBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, completion: { [weak self] _ in
+                                self?.attachFullscreenVideos()
+                            })
+                            self.mainStageNode.setControlsHidden(false, animated: true, delay: 0.15)
+                            
+                            self.fullscreenListNode.alpha = 1.0
+                            self.fullscreenListNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.15)
+                            
+                            var bounds = self.mainStageContainerNode.bounds
+                            let previousBounds = bounds
+                            bounds.origin.y = 0.0
+                            self.mainStageContainerNode.bounds = bounds
+                            self.mainStageContainerNode.layer.animateBounds(from: previousBounds, to: self.mainStageContainerNode.bounds, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in
+                                if let strongSelf = self {
+                                    strongSelf.listContainer.transform = CATransform3DIdentity
+                                    strongSelf.contentContainer.insertSubnode(strongSelf.mainStageContainerNode, belowSubnode: strongSelf.transitionContainerNode)
+                                    strongSelf.updateMembers()
+                                }
+                            })
+                        }
+                    } else if case .modal(true, _) = self.displayMode, case .compact = layout.metrics.widthClass {
                         self.panGestureArguments = nil
                         if velocity.y > 300.0 || offset > topInset / 2.0 {
-                            self.isExpanded = false
-                            self.updateIsFullscreen(false)
+                            self.displayMode = .modal(isExpanded: false, isFilled: false)
+                            self.updateDecorationsColors()
                             self.animatingExpansion = true
                             self.listNode.scroller.setContentOffset(CGPoint(), animated: false)
                             
-                            if let (layout, navigationHeight) = self.validLayout {
-                                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
+                            let distance: CGFloat
+                            if let topInset = self.topInset {
+                                distance = topInset - offset
+                            } else {
+                                distance = 0.0
                             }
-                            self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
+                            let initialVelocity: CGFloat = distance.isZero ? 0.0 : abs(velocity.y / distance)
+                            let transition = ContainedViewLayoutTransition.animated(duration: 0.45, curve: .customSpring(damping: 124.0, initialVelocity: initialVelocity))
+                            if let (layout, navigationHeight) = self.validLayout {
+                                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                            }
+                            self.updateDecorationsLayout(transition: transition, completion: {
                                 self.animatingExpansion = false
                             })
                         } else {
-                            self.updateIsFullscreen(true)
+                            self.displayMode = .modal(isExpanded: true, isFilled: true)
+                            self.updateDecorationsColors()
                             self.animatingExpansion = true
                             
                             if let (layout, navigationHeight) = self.validLayout {
                                 self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
                             }
-                            self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
+                            self.updateDecorationsLayout(transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
                                 self.animatingExpansion = false
                             })
                         }
@@ -3330,34 +5711,48 @@ public final class VoiceChatController: ViewController {
                         self.panGestureArguments = nil
                         var dismissing = false
                         if bounds.minY < -60 || (bounds.minY < 0.0 && velocity.y > 300.0) {
-                            self.controller?.dismiss(closing: false, manual: true)
-                            dismissing = true
-                        } else if velocity.y < -300.0 || offset < topInset / 2.0 {
-                            if velocity.y > -1500.0 && !self.isFullscreen {
+                            if self.isScheduling {
+                                self.dismissScheduled()
+                            } else if case .regular = layout.metrics.widthClass {
+                                self.controller?.dismiss(closing: false, manual: true)
+                                dismissing = true
+                            } else {
+                                if case .fullscreen = self.displayMode {
+                                } else {
+                                    self.controller?.dismiss(closing: false, manual: true)
+                                    dismissing = true
+                                }
+                            }
+                        } else if !self.isScheduling && (velocity.y < -300.0 || offset < topInset / 2.0) {
+                            if velocity.y > -2200.0 && !self.isFullscreen {
                                 DispatchQueue.main.async {
                                     self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
                                 }
                             }
-                            
-                            self.isExpanded = true
-                            self.updateIsFullscreen(true)
+                                                        
+                            let initialVelocity: CGFloat = offset.isZero ? 0.0 : abs(velocity.y / offset)
+                            let transition = ContainedViewLayoutTransition.animated(duration: 0.45, curve: .customSpring(damping: 124.0, initialVelocity: initialVelocity))
+                            if case .modal = self.displayMode {
+                                self.displayMode = .modal(isExpanded: true, isFilled: true)
+                            }
+                            self.updateDecorationsColors()
                             self.animatingExpansion = true
                             
                             if let (layout, navigationHeight) = self.validLayout {
-                                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
+                                self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
                             }
-                            self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
+                            self.updateDecorationsLayout(transition: transition, completion: {
                                 self.animatingExpansion = false
                             })
-                        } else {
-                            self.updateIsFullscreen(false)
+                        } else if !self.isScheduling {
+                            self.updateDecorationsColors()
                             self.animatingExpansion = true
                             self.listNode.scroller.setContentOffset(CGPoint(), animated: false)
                                                         
                             if let (layout, navigationHeight) = self.validLayout {
                                 self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
                             }
-                            self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
+                            self.updateDecorationsLayout(transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
                                 self.animatingExpansion = false
                             })
                         }
@@ -3381,9 +5776,35 @@ public final class VoiceChatController: ViewController {
                     if let (layout, navigationHeight) = self.validLayout {
                         self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: .animated(duration: 0.3, curve: .easeInOut))
                     }
-                    self.updateFloatingHeaderOffset(offset: self.currentContentOffset ?? 0.0, transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
+                    self.updateDecorationsLayout(transition: .animated(duration: 0.3, curve: .easeInOut), completion: {
                         self.animatingExpansion = false
                     })
+                    
+                    if case .fullscreen = self.displayMode, case .regular = layout.metrics.widthClass {
+                        self.fullscreenListContainer.subnodeTransform = CATransform3DIdentity
+                        self.isPanning = false
+                        self.mainStageBackgroundNode.alpha = 1.0
+                        self.mainStageBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, completion: { [weak self] _ in
+                            self?.attachFullscreenVideos()
+                        })
+                        self.mainStageNode.setControlsHidden(false, animated: true, delay: 0.15)
+                        
+                        self.fullscreenListNode.alpha = 1.0
+                        self.fullscreenListNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.15)
+                        
+                        var bounds = self.mainStageContainerNode.bounds
+                        let previousBounds = bounds
+                        bounds.origin.y = 0.0
+                        self.mainStageContainerNode.bounds = bounds
+                        self.mainStageContainerNode.layer.animateBounds(from: previousBounds, to: self.mainStageContainerNode.bounds, duration: 0.2, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in
+                            if let strongSelf = self {
+                                strongSelf.contentContainer.insertSubnode(strongSelf.mainStageContainerNode, belowSubnode: strongSelf.transitionContainerNode)
+                                strongSelf.updateMembers()
+                                
+                                strongSelf.listContainer.transform = CATransform3DIdentity
+                            }
+                        })
+                    }
                 default:
                     break
             }
@@ -3391,23 +5812,12 @@ public final class VoiceChatController: ViewController {
         
         override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
             let result = super.hitTest(point, with: event)
-            
-            if let result = result {
-                for (_, _, videoNode) in self.videoNodes {
-                    if videoNode.view === result || result.isDescendant(of: videoNode.view) {
-                        return result
-                    }
-                }
-            }
-
             if result === self.topPanelNode.view {
                 return self.view
             }
-            
             if result === self.bottomPanelNode.view {
                 return self.view
             }
-            
             if !self.bounds.contains(point) {
                 return nil
             }
@@ -3416,6 +5826,768 @@ public final class VoiceChatController: ViewController {
             }
             return result
         }
+        
+        fileprivate func scrollToTop() {
+            if self.isExpanded {
+                self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+            }
+        }
+        
+        private func openTitleEditing() {
+            let _ = (self.context.account.postbox.loadedPeerWithId(self.call.peerId)
+            |> deliverOnMainQueue).start(next: { [weak self] chatPeer in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                let initialTitle = strongSelf.callState?.title ?? ""
+                let controller = voiceChatTitleEditController(sharedContext: strongSelf.context.sharedContext, account: strongSelf.context.account, forceTheme: strongSelf.darkTheme, title: strongSelf.presentationData.strings.VoiceChat_EditTitleTitle, text: strongSelf.presentationData.strings.VoiceChat_EditTitleText, placeholder: chatPeer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), value: initialTitle, maxLength: 40, apply: { title in
+                    if let strongSelf = self, let title = title, title != initialTitle {
+                        strongSelf.call.updateTitle(title)
+
+                        strongSelf.presentUndoOverlay(content: .voiceChatFlag(text: title.isEmpty ? strongSelf.presentationData.strings.VoiceChat_EditTitleRemoveSuccess : strongSelf.presentationData.strings.VoiceChat_EditTitleSuccess(title).0), action: { _ in return false })
+                    }
+                })
+                strongSelf.controller?.present(controller, in: .window(.root))
+            })
+        }
+        
+        private func openAvatarForEditing(fromGallery: Bool = false, completion: @escaping () -> Void = {}) {
+            guard let peerId = self.callState?.myPeerId else {
+                return
+            }
+            
+            let _ = (self.context.account.postbox.transaction { transaction -> (Peer?, SearchBotsConfiguration) in
+                return (transaction.getPeer(peerId), currentSearchBotsConfiguration(transaction: transaction))
+            }
+            |> deliverOnMainQueue).start(next: { [weak self] peer, searchBotsConfiguration in
+                guard let strongSelf = self, let peer = peer else {
+                    return
+                }
+                
+                let presentationData = strongSelf.presentationData
+                
+                let legacyController = LegacyController(presentation: .custom, theme: strongSelf.darkTheme)
+                legacyController.statusBar.statusBarStyle = .Ignore
+                
+                let emptyController = LegacyEmptyController(context: legacyController.context)!
+                let navigationController = makeLegacyNavigationController(rootController: emptyController)
+                navigationController.setNavigationBarHidden(true, animated: false)
+                navigationController.navigationBar.transform = CGAffineTransform(translationX: -1000.0, y: 0.0)
+                
+                legacyController.bind(controller: navigationController)
+                
+                strongSelf.view.endEditing(true)
+                strongSelf.controller?.present(legacyController, in: .window(.root))
+                
+                var hasPhotos = false
+                if !peer.profileImageRepresentations.isEmpty {
+                    hasPhotos = true
+                }
+                
+                let paintStickersContext = LegacyPaintStickersContext(context: strongSelf.context)
+//                paintStickersContext.presentStickersController = { completion in
+//                    let controller = DrawingStickersScreen(context: strongSelf.context, selectSticker: { fileReference, node, rect in
+//                        let coder = PostboxEncoder()
+//                        coder.encodeRootObject(fileReference.media)
+//                        completion?(coder.makeData(), fileReference.media.isAnimatedSticker, node.view, rect)
+//                        return true
+//                    })
+//                    strongSelf.controller?.present(controller, in: .window(.root))
+//                    return controller
+//                }
+                
+                let mixin = TGMediaAvatarMenuMixin(context: legacyController.context, parentController: emptyController, hasSearchButton: true, hasDeleteButton: hasPhotos && !fromGallery, hasViewButton: false, personalPhoto: peerId.namespace == Namespaces.Peer.CloudUser, isVideo: false, saveEditedPhotos: false, saveCapturedMedia: false, signup: false)!
+                mixin.forceDark = true
+                mixin.stickersContext = paintStickersContext
+                let _ = strongSelf.currentAvatarMixin.swap(mixin)
+                mixin.requestSearchController = { [weak self] assetsController in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    let controller = WebSearchController(context: strongSelf.context, peer: peer, chatLocation: nil, configuration: searchBotsConfiguration, mode: .avatar(initialQuery: peer.id.namespace == Namespaces.Peer.CloudUser ? nil : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), completion: { [weak self] result in
+                        assetsController?.dismiss()
+                        self?.updateProfilePhoto(result)
+                    }))
+                    controller.navigationPresentation = .modal
+                    strongSelf.controller?.push(controller)
+                    
+                    if fromGallery {
+                        completion()
+                    }
+                }
+                mixin.didFinishWithImage = { [weak self] image in
+                    if let image = image {
+                        completion()
+                       self?.updateProfilePhoto(image)
+                    }
+                }
+                mixin.didFinishWithVideo = { [weak self] image, asset, adjustments in
+                    if let image = image, let asset = asset {
+                        completion()
+                        self?.updateProfileVideo(image, asset: asset, adjustments: adjustments)
+                    }
+                }
+                mixin.didFinishWithDelete = {
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    
+                    let proceed = {
+                        let _ = strongSelf.currentAvatarMixin.swap(nil)
+                        let postbox = strongSelf.context.account.postbox
+                        strongSelf.updateAvatarDisposable.set((strongSelf.context.engine.peers.updatePeerPhoto(peerId: peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in
+                            return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
+                        })
+                        |> deliverOnMainQueue).start())
+                    }
+                    
+                    let actionSheet = ActionSheetController(presentationData: presentationData.withUpdated(theme: strongSelf.darkTheme))
+                    let items: [ActionSheetItem] = [
+                        ActionSheetButtonItem(title: presentationData.strings.Settings_RemoveConfirmation, color: .destructive, action: { [weak actionSheet] in
+                            actionSheet?.dismissAnimated()
+                            proceed()
+                        })
+                    ]
+                    
+                    actionSheet.setItemGroups([
+                        ActionSheetItemGroup(items: items),
+                        ActionSheetItemGroup(items: [
+                            ActionSheetButtonItem(title: presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
+                                actionSheet?.dismissAnimated()
+                            })
+                        ])
+                    ])
+                    strongSelf.controller?.present(actionSheet, in: .window(.root))
+                }
+                mixin.didDismiss = { [weak legacyController] in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    let _ = strongSelf.currentAvatarMixin.swap(nil)
+                    legacyController?.dismiss()
+                }
+                let menuController = mixin.present()
+                if let menuController = menuController {
+                    menuController.customRemoveFromParentViewController = { [weak legacyController] in
+                        legacyController?.dismiss()
+                    }
+                }
+            })
+        }
+        
+        private func updateProfilePhoto(_ image: UIImage) {
+            guard let data = image.jpegData(compressionQuality: 0.6), let peerId = self.callState?.myPeerId else {
+                return
+            }
+            
+            let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+            self.call.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
+            let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)
+            
+            self.currentUpdatingAvatar = representation
+            self.updateAvatarPromise.set(.single((representation, 0.0)))
+
+            let postbox = self.call.account.postbox
+            let signal = peerId.namespace == Namespaces.Peer.CloudUser ? self.call.accountContext.engine.accountData.updateAccountPhoto(resource: resource, videoResource: nil, videoStartTimestamp: nil, mapResourceToAvatarSizes: { resource, representations in
+                return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
+            }) : self.call.accountContext.engine.peers.updatePeerPhoto(peerId: peerId, photo: self.call.accountContext.engine.peers.uploadedPeerPhoto(resource: resource), mapResourceToAvatarSizes: { resource, representations in
+                return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
+            })
+            
+            self.updateAvatarDisposable.set((signal
+            |> deliverOnMainQueue).start(next: { [weak self] result in
+                guard let strongSelf = self else {
+                    return
+                }
+                switch result {
+                    case .complete:
+                        strongSelf.updateAvatarPromise.set(.single(nil))
+                    case let .progress(value):
+                        strongSelf.updateAvatarPromise.set(.single((representation, value)))
+                }
+            }))
+            
+            self.updateMembers()
+        }
+        
+        private func updateProfileVideo(_ image: UIImage, asset: Any?, adjustments: TGVideoEditAdjustments?) {
+            guard let data = image.jpegData(compressionQuality: 0.6), let peerId = self.callState?.myPeerId else {
+                return
+            }
+            
+            let photoResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+            self.context.account.postbox.mediaBox.storeResourceData(photoResource.id, data: data)
+            let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [], immediateThumbnailData: nil)
+            
+            self.currentUpdatingAvatar = representation
+            self.updateAvatarPromise.set(.single((representation, 0.0)))
+
+            var videoStartTimestamp: Double? = nil
+            if let adjustments = adjustments, adjustments.videoStartValue > 0.0 {
+                videoStartTimestamp = adjustments.videoStartValue - adjustments.trimStartValue
+            }
+
+            let context = self.context
+            let account = self.context.account
+            let signal = Signal<TelegramMediaResource, UploadPeerPhotoError> { [weak self] subscriber in
+                let entityRenderer: LegacyPaintEntityRenderer? = adjustments.flatMap { adjustments in
+                    if let paintingData = adjustments.paintingData, paintingData.hasAnimation {
+                        return LegacyPaintEntityRenderer(account: account, adjustments: adjustments)
+                    } else {
+                        return nil
+                    }
+                }
+                let uploadInterface = LegacyLiveUploadInterface(context: context)
+                let signal: SSignal
+                if let asset = asset as? AVAsset {
+                    signal = TGMediaVideoConverter.convert(asset, adjustments: adjustments, watcher: uploadInterface, entityRenderer: entityRenderer)!
+                } else if let url = asset as? URL, let data = try? Data(contentsOf: url, options: [.mappedRead]), let image = UIImage(data: data), let entityRenderer = entityRenderer {
+                    let durationSignal: SSignal = SSignal(generator: { subscriber in
+                        let disposable = (entityRenderer.duration()).start(next: { duration in
+                            subscriber?.putNext(duration)
+                            subscriber?.putCompletion()
+                        })
+                        
+                        return SBlockDisposable(block: {
+                            disposable.dispose()
+                        })
+                    })
+                    signal = durationSignal.map(toSignal: { duration -> SSignal? in
+                        if let duration = duration as? Double {
+                            return TGMediaVideoConverter.renderUIImage(image, duration: duration, adjustments: adjustments, watcher: nil, entityRenderer: entityRenderer)!
+                        } else {
+                            return SSignal.single(nil)
+                        }
+                    })
+                   
+                } else {
+                    signal = SSignal.complete()
+                }
+                
+                let signalDisposable = signal.start(next: { next in
+                    if let result = next as? TGMediaVideoConversionResult {
+                        if let image = result.coverImage, let data = image.jpegData(compressionQuality: 0.7) {
+                            account.postbox.mediaBox.storeResourceData(photoResource.id, data: data)
+                        }
+                        
+                        if let timestamp = videoStartTimestamp {
+                            videoStartTimestamp = max(0.0, min(timestamp, result.duration - 0.05))
+                        }
+                        
+                        var value = stat()
+                        if stat(result.fileURL.path, &value) == 0 {
+                            if let data = try? Data(contentsOf: result.fileURL) {
+                                let resource: TelegramMediaResource
+                                if let liveUploadData = result.liveUploadData as? LegacyLiveUploadInterfaceResult {
+                                    resource = LocalFileMediaResource(fileId: liveUploadData.id)
+                                } else {
+                                    resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                }
+                                account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
+                                subscriber.putNext(resource)
+                            }
+                        }
+                        subscriber.putCompletion()
+                    } else if let strongSelf = self, let progress = next as? NSNumber {
+                        Queue.mainQueue().async {
+                            strongSelf.updateAvatarPromise.set(.single((representation, Float(truncating: progress) * 0.25)))
+                        }
+                    }
+                }, error: { _ in
+                }, completed: nil)
+                
+                let disposable = ActionDisposable {
+                    signalDisposable?.dispose()
+                }
+                
+                return ActionDisposable {
+                    disposable.dispose()
+                }
+            }
+            
+            self.updateAvatarDisposable.set((signal
+            |> mapToSignal { videoResource -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> in
+                if peerId.namespace == Namespaces.Peer.CloudUser {
+                    return context.engine.accountData.updateAccountPhoto(resource: photoResource, videoResource: videoResource, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
+                        return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations)
+                    })
+                } else {
+                    return context.engine.peers.updatePeerPhoto(peerId: peerId, photo: context.engine.peers.uploadedPeerPhoto(resource: photoResource), video: context.engine.peers.uploadedPeerVideo(resource: videoResource) |> map(Optional.init), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
+                        return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations)
+                    })
+                }
+            }
+            |> deliverOnMainQueue).start(next: { [weak self] result in
+                guard let strongSelf = self else {
+                    return
+                }
+                switch result {
+                    case .complete:
+                        strongSelf.updateAvatarPromise.set(.single(nil))
+                    case let .progress(value):
+                        strongSelf.updateAvatarPromise.set(.single((representation, 0.25 + value * 0.75)))
+                }
+            }))
+        }
+        
+        private func displayUnmuteTooltip() {
+            guard let (layout, _) = self.validLayout else {
+                return
+            }
+            let location = self.actionButton.view.convert(self.actionButton.bounds, to: self.view).center
+            var point = CGRect(origin: CGPoint(x: location.x - 5.0, y: location.y - 5.0 - 68.0), size: CGSize(width: 10.0, height: 10.0))
+            var position: TooltipScreen.ArrowPosition = .bottom
+            if case .compact = layout.metrics.widthClass {
+                if self.isLandscape {
+                    point.origin.x = location.x - 5.0 - 36.0
+                    point.origin.y = location.y - 5.0
+                    position = .right
+                } else if case .fullscreen = self.displayMode  {
+                    point.origin.y += 32.0
+                }
+            }
+            self.controller?.present(TooltipScreen(text: self.presentationData.strings.VoiceChat_UnmuteSuggestion, style: .gradient(UIColor(rgb: 0x1d446c), UIColor(rgb: 0x193e63)), icon: nil, location: .point(point, position), displayDuration: .custom(8.0), shouldDismissOnTouch: { _ in
+                return .dismiss(consume: false)
+            }), in: .window(.root))
+        }
+        
+        private func displayToggleVideoSourceTooltip(screencast: Bool) {
+//            guard let videoContainerNode = self.mainStageVideoContainerNode else {
+//                return
+//            }
+//
+//            let location = videoContainerNode.view.convert(videoContainerNode.otherVideoWrapperNode.frame, to: nil)
+//            self.controller?.present(TooltipScreen(text: screencast ? self.presentationData.strings.VoiceChat_TapToViewCameraVideo : self.presentationData.strings.VoiceChat_TapToViewScreenVideo, icon: nil, location: .point(location.offsetBy(dx: -9.0, dy: 0.0), .right), displayDuration: .custom(3.0), shouldDismissOnTouch: { _ in
+//                return .dismiss(consume: false)
+//            }), in: .window(.root))
+        }
+        
+        private var isScheduled: Bool {
+            return self.isScheduling || self.callState?.scheduleTimestamp != nil
+        }
+        
+        private func attachFullscreenVideos() {
+            guard let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass else {
+                return
+            }
+            var verticalItemNodes: [String: ASDisplayNode] = [:]
+            self.listNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                    for tileNode in itemNode.tileNodes {
+                        if let item = tileNode.item {
+                            verticalItemNodes[String(item.peer.id.toInt64()) + "_" + item.videoEndpointId] = tileNode
+                        }
+                        
+                        if tileNode.item?.peer.id == self.effectiveSpeaker?.0 && tileNode.item?.videoEndpointId == self.effectiveSpeaker?.1 {
+                            tileNode.isHidden = false
+                        }
+                    }
+                }
+            }
+                        
+            self.fullscreenListNode.forEachItemNode { itemNode in
+                if let itemNode = itemNode as? VoiceChatFullscreenParticipantItemNode, let item = itemNode.item {
+                    let otherItemNode = verticalItemNodes[String(item.peer.id.toInt64()) + "_" + (item.videoEndpointId ?? "")]
+                    itemNode.transitionIn(from: otherItemNode)
+                }
+            }
+        }
+        
+        private func attachTileVideos() {
+            var fullscreenItemNodes: [String: VoiceChatFullscreenParticipantItemNode] = [:]
+            var tileNodes: [VoiceChatTileItemNode] = []
+            if !self.tileGridNode.isHidden {
+                tileNodes = self.tileGridNode.tileNodes
+            } else {
+                self.fullscreenListNode.forEachItemNode { itemNode in
+                    if let itemNode = itemNode as? VoiceChatFullscreenParticipantItemNode, let item = itemNode.item {
+                        fullscreenItemNodes[String(item.peer.id.toInt64()) + "_" + (item.videoEndpointId ?? "")] = itemNode
+                    }
+                }
+                self.listNode.forEachItemNode { itemNode in
+                    if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                        tileNodes = itemNode.tileNodes
+                    }
+                }
+            }
+            
+            for tileNode in tileNodes {
+                if let item = tileNode.item {
+                    let otherItemNode = fullscreenItemNodes[String(item.peer.id.toInt64()) + "_" + item.videoEndpointId]
+                    tileNode.transitionIn(from: otherItemNode)
+                    
+                    if tileNode.item?.peer.id == self.effectiveSpeaker?.0 && tileNode.item?.videoEndpointId == self.effectiveSpeaker?.1 {
+                        tileNode.isHidden = true
+                    }
+                }
+            }
+        }
+        
+        private func updateDisplayMode(_ displayMode: DisplayMode, fromPan: Bool = false) {
+            guard !self.animatingExpansion && !self.animatingMainStage && !self.mainStageNode.animating else {
+                return
+            }
+            self.updateMembers()
+            
+            let previousDisplayMode = self.displayMode
+            var isFullscreen = false
+            if case .fullscreen = displayMode {
+                isFullscreen = true
+            }
+            
+            if case .fullscreen = previousDisplayMode, case .fullscreen = displayMode {
+                self.animatingExpansion = true
+            } else {
+                self.animatingMainStage = true
+            }
+            
+            var hasFullscreenList = false
+            if let (layout, _) = self.validLayout, case .compact = layout.metrics.widthClass {
+                hasFullscreenList = true
+            }
+            
+            let completion = {
+                self.displayMode = displayMode
+                self.updateDecorationsColors()
+                
+                self.mainStageContainerNode.isHidden = false
+                self.mainStageContainerNode.isUserInteractionEnabled = isFullscreen
+                
+                let transition: ContainedViewLayoutTransition = .animated(duration: 0.55, curve: .spring)
+                if case .modal = previousDisplayMode, case .fullscreen = self.displayMode {
+                    self.mainStageNode.alpha = 0.0
+                    self.updateDecorationsLayout(transition: .immediate)
+                    
+                    var verticalItemNodes: [String: ASDisplayNode] = [:]
+                    
+                    var tileNodes: [VoiceChatTileItemNode] = []
+                    if !self.tileGridNode.isHidden {
+                        tileNodes = self.tileGridNode.tileNodes
+                    } else {
+                        self.listNode.forEachItemNode { itemNode in
+                            if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                                tileNodes = itemNode.tileNodes
+                            }
+                        }
+                    }
+                    for tileNode in tileNodes {
+                        if let item = tileNode.item {
+                            verticalItemNodes[String(item.peer.id.toInt64()) + "_" + item.videoEndpointId] = tileNode
+                        }
+                    }
+                    
+                    let completion = {
+                        let effectiveSpeakerPeerId = self.effectiveSpeaker?.0
+
+                        if hasFullscreenList {
+                            self.fullscreenListContainer.isHidden = false
+                            self.fullscreenListNode.alpha = 0.0
+                        }
+                        
+                        var gridSnapshotView: UIView?
+                        if !hasFullscreenList, let snapshotView = self.tileGridNode.view.snapshotView(afterScreenUpdates: false) {
+                            gridSnapshotView = snapshotView
+                            self.tileGridNode.view.addSubview(snapshotView)
+                            self.displayPanelVideos = true
+                            self.updateMembers(maybeUpdateVideo: false, force: true)
+                        }
+                        
+                        let completion = {
+                            if hasFullscreenList {
+                                self.attachFullscreenVideos()
+                                
+                                self.fullscreenListNode.alpha = 1.0
+                                self.fullscreenListNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
+                            }
+                        }
+                        if let effectiveSpeakerPeerId = effectiveSpeakerPeerId, let otherItemNode = verticalItemNodes[String(effectiveSpeakerPeerId.toInt64()) + "_" + (self.effectiveSpeaker?.1 ?? "")] {
+                                                        
+                            if hasFullscreenList {
+                                let transitionStartPosition = otherItemNode.view.convert(CGPoint(x: otherItemNode.frame.width / 2.0, y: otherItemNode.frame.height), to: self.fullscreenListContainer.view.superview)
+                                self.fullscreenListContainer.layer.animatePosition(from: transitionStartPosition, to: self.fullscreenListContainer.position, duration: 0.55, timingFunction: kCAMediaTimingFunctionSpring)
+                            }
+                            
+                            self.mainStageNode.animateTransitionIn(from: otherItemNode, transition: transition, completion: { [weak self] in
+                                self?.animatingMainStage = false
+                            })
+                            self.mainStageNode.alpha = 1.0
+                            
+                            self.mainStageBackgroundNode.alpha = 1.0
+                            self.mainStageBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: hasFullscreenList ? 0.13 : 0.3, completion: { [weak otherItemNode] _ in
+                                otherItemNode?.alpha = 0.0
+                                gridSnapshotView?.removeFromSuperview()
+                                completion()
+                            })
+                        } else {
+                            completion()
+                        }
+                        
+                        if hasFullscreenList {
+                            self.listContainer.layer.animateScale(from: 1.0, to: 0.86, duration: 0.55, timingFunction: kCAMediaTimingFunctionSpring)
+                        }
+                        
+                        if self.isLandscape {
+                            self.transitionMaskTopFillLayer.opacity = 1.0
+                        }
+                        self.transitionMaskBottomFillLayer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, removeOnCompletion: false, completion: { [weak self] _ in
+                            Queue.mainQueue().after(0.3) {
+                                self?.transitionMaskTopFillLayer.opacity = 0.0
+                                self?.transitionMaskBottomFillLayer.removeAllAnimations()
+                            }
+                        })
+                                                
+                        if let (layout, navigationHeight) = self.validLayout {
+                            self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                            self.updateDecorationsLayout(transition: transition)
+                        }
+                    }
+                    let effectiveSpeakerPeerId = self.effectiveSpeaker?.0
+                    var index = 0
+                    for item in self.currentFullscreenEntries {
+                        if case let .peer(entry, _) = item, entry.peer.id == effectiveSpeakerPeerId {
+                            break
+                        } else {
+                            index += 1
+                        }
+                    }
+                    let position: ListViewScrollPosition
+                    if index > self.currentFullscreenEntries.count - 3 {
+                        index = self.currentFullscreenEntries.count - 1
+                        position = .bottom(0.0)
+                    } else {
+                        position = .center(.bottom)
+                    }
+                    self.fullscreenListNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: index, position: position, animated: false, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in
+                        completion()
+                    })
+                } else if case .fullscreen = previousDisplayMode, case .modal = self.displayMode {
+                    var minimalVisiblePeerid: (PeerId, CGFloat)?
+                    var fullscreenItemNodes: [String: VoiceChatFullscreenParticipantItemNode] = [:]
+                    self.fullscreenListNode.forEachItemNode { itemNode in
+                        if let itemNode = itemNode as? VoiceChatFullscreenParticipantItemNode, let item = itemNode.item {
+                            let convertedFrame = itemNode.view.convert(itemNode.bounds, to: self.transitionContainerNode.view)
+                            if let (_, x) = minimalVisiblePeerid {
+                                if convertedFrame.minX >= 0.0 && convertedFrame.minX < x {
+                                    minimalVisiblePeerid = (item.peer.id, convertedFrame.minX)
+                                }
+                            } else if convertedFrame.minX >= 0.0 {
+                                minimalVisiblePeerid = (item.peer.id, convertedFrame.minX)
+                            }
+                            fullscreenItemNodes[String(item.peer.id.toInt64()) + "_" + (item.videoEndpointId ?? "")] = itemNode
+                        }
+                    }
+                                        
+                    let completion = {
+                        let effectiveSpeakerPeerId = self.effectiveSpeaker?.0
+                        var targetTileNode: VoiceChatTileItemNode?
+                        
+                        self.transitionContainerNode.addSubnode(self.mainStageNode)
+                        
+                        self.listContainer.transform = CATransform3DIdentity
+                        
+                        var tileNodes: [VoiceChatTileItemNode] = []
+                        if !self.tileGridNode.isHidden {
+                            tileNodes = self.tileGridNode.tileNodes
+                        } else {
+                            self.listNode.forEachItemNode { itemNode in
+                                if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                                    tileNodes = itemNode.tileNodes
+                                }
+                            }
+                        }
+                        for tileNode in tileNodes {
+                            if let item = tileNode.item {
+                                if item.peer.id == effectiveSpeakerPeerId, item.videoEndpointId == self.effectiveSpeaker?.1 {
+                                    targetTileNode = tileNode
+                                }
+                            }
+                        }
+                                                                        
+                        var transitionOffset = -self.mainStageContainerNode.bounds.minY
+                        if transitionOffset.isZero, let (layout, _) = self.validLayout {
+                            if case .regular = layout.metrics.widthClass {
+                                transitionOffset += 87.0
+                            }
+                            if let targetTileNode = targetTileNode {
+                                let transitionTargetPosition = targetTileNode.view.convert(CGPoint(x: targetTileNode.frame.width / 2.0, y: targetTileNode.frame.height), to: self.fullscreenListContainer.view.superview)
+                                self.fullscreenListContainer.layer.animatePosition(from: self.fullscreenListContainer.position, to: transitionTargetPosition, duration: 0.55, timingFunction: kCAMediaTimingFunctionSpring)
+                            }
+                            
+                            if !hasFullscreenList {
+                                self.displayPanelVideos = false
+                                self.listNode.forEachItemNode { itemNode in
+                                    if let itemNode = itemNode as? VoiceChatTilesGridItemNode {
+                                        itemNode.snapshotForDismissal()
+                                    }
+                                }
+                                self.updateMembers(maybeUpdateVideo: false, force: true)
+                                self.attachTileVideos()
+                                
+                                self.mainStageBackgroundNode.alpha = 0.0
+                                self.mainStageBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25)
+                            } else {
+                                self.fullscreenListNode.alpha = 0.0
+                                self.mainStageBackgroundNode.alpha = 1.0
+                                self.fullscreenListNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.1, completion: { [weak self] _ in
+                                    if let strongSelf = self {
+                                        strongSelf.fullscreenListContainer.isHidden = true
+                                        strongSelf.fullscreenListNode.alpha = 1.0
+                                        strongSelf.attachTileVideos()
+                                        
+                                        strongSelf.mainStageBackgroundNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25)
+                                        strongSelf.mainStageBackgroundNode.alpha = 0.0
+                                    }
+                                })
+                            }
+                        }
+                        self.mainStageNode.animateTransitionOut(to: targetTileNode, offset: transitionOffset, transition: transition, completion: { [weak self] in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.effectiveSpeaker = nil
+                            strongSelf.mainStageNode.update(peer: nil, waitForFullSize: false)
+                            strongSelf.mainStageNode.setControlsHidden(false, animated: false)
+                            strongSelf.fullscreenListContainer.isHidden = true
+                            strongSelf.mainStageContainerNode.isHidden = true
+                            strongSelf.mainStageContainerNode.addSubnode(strongSelf.mainStageNode)
+                            
+                            var bounds = strongSelf.mainStageContainerNode.bounds
+                            bounds.origin.y = 0.0
+                            strongSelf.mainStageContainerNode.bounds = bounds
+                            
+                            strongSelf.contentContainer.insertSubnode(strongSelf.mainStageContainerNode, belowSubnode: strongSelf.transitionContainerNode)
+                            
+                            strongSelf.isPanning = false
+                            strongSelf.animatingMainStage = false
+                        })
+                                
+                        if hasFullscreenList {
+                            self.listContainer.layer.animateScale(from: 0.86, to: 1.0, duration: 0.55, timingFunction: kCAMediaTimingFunctionSpring)
+                        }
+                        
+                        self.transitionMaskTopFillLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                        if !transitionOffset.isZero {
+                            self.transitionMaskBottomFillLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3)
+                        }
+                        
+                        if let (layout, navigationHeight) = self.validLayout {
+                            self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                            self.updateDecorationsLayout(transition: transition)
+                        }
+                    }
+                    if false, let (peerId, _) = minimalVisiblePeerid {
+                        var index = 0
+                        for item in self.currentEntries {
+                            if case let .peer(entry, _) = item, entry.peer.id == peerId {
+                                break
+                            } else {
+                                index += 1
+                            }
+                        }
+                        self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: index, position: .top(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in
+                            completion()
+                        })
+                    } else {
+                        completion()
+                    }
+                } else if case .fullscreen = self.displayMode {
+                    if let (layout, navigationHeight) = self.validLayout {
+                        let transition: ContainedViewLayoutTransition = .animated(duration: 0.4, curve: .spring)
+                        self.containerLayoutUpdated(layout, navigationHeight: navigationHeight, transition: transition)
+                        self.updateDecorationsLayout(transition: transition)
+                    }
+                }
+            }
+        
+            if case .fullscreen(false) = displayMode, case .modal = previousDisplayMode {
+                self.updateMainVideo(waitForFullSize: true, updateMembers: true, force: true, completion: {
+                    completion()
+                })
+            } else {
+                completion()
+            }
+        }
+        
+        fileprivate var actionButtonPosition: CGPoint {
+            guard let (layout, _) = self.validLayout else {
+                return CGPoint()
+            }
+            let size = layout.size
+            let hasCameraButton = self.cameraButton.isUserInteractionEnabled
+            let centralButtonSide = min(size.width, size.height) - 32.0
+            let centralButtonSize = CGSize(width: centralButtonSide, height: centralButtonSide)
+            
+            if case .regular = layout.metrics.widthClass {
+                let contentWidth: CGFloat = max(320.0, min(375.0, floor(size.width * 0.3)))
+                let contentLeftInset: CGFloat
+                if self.peerIdToEndpointId.isEmpty {
+                    contentLeftInset = floorToScreenPixels((layout.size.width - contentWidth) / 2.0)
+                } else {
+                    contentLeftInset = self.panelHidden ? layout.size.width : layout.size.width - contentWidth
+                }
+                return CGPoint(x: contentLeftInset + floorToScreenPixels(contentWidth / 2.0), y: layout.size.height - self.effectiveBottomAreaHeight - layout.intrinsicInsets.bottom + floor(self.effectiveBottomAreaHeight / 2.0) - 3.0)
+            } else {
+                switch self.displayMode {
+                    case .modal:
+                        if self.isLandscape {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasCameraButton {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.height - sideInset * 2.0 - sideButtonSize.height * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let x = layout.size.width - fullscreenBottomAreaHeight - layout.safeInsets.right + floor((fullscreenBottomAreaHeight - sideButtonSize.width) / 2.0)
+                            let actionButtonFrame = CGRect(origin: CGPoint(x: x, y: sideInset + sideButtonSize.height + spacing), size: sideButtonSize)
+                            return actionButtonFrame.center
+                        } else {
+                            let actionButtonFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - centralButtonSize.width) / 2.0), y: layout.size.height - self.effectiveBottomAreaHeight - layout.intrinsicInsets.bottom + floor((self.effectiveBottomAreaHeight - centralButtonSize.height) / 2.0) - 3.0), size: centralButtonSize)
+                            return actionButtonFrame.center
+                        }
+                    case let .fullscreen(controlsHidden):
+                        if self.isLandscape {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasCameraButton {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.height - sideInset * 2.0 - sideButtonSize.height * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let x = layout.size.width - fullscreenBottomAreaHeight - layout.safeInsets.right + (controlsHidden ? fullscreenBottomAreaHeight + layout.safeInsets.right + 30.0 : floor((fullscreenBottomAreaHeight - sideButtonSize.width) / 2.0))
+                            let actionButtonFrame = CGRect(origin: CGPoint(x: x, y: sideInset + sideButtonSize.height + spacing), size: sideButtonSize)
+                            return actionButtonFrame.center
+                        } else {
+                            let sideInset: CGFloat
+                            let buttonsCount: Int
+                            if hasCameraButton {
+                                sideInset = 26.0
+                                buttonsCount = 4
+                            } else {
+                                sideInset = 42.0
+                                buttonsCount = 3
+                            }
+                            let spacing = floor((layout.size.width - sideInset * 2.0 - sideButtonSize.width * CGFloat(buttonsCount)) / (CGFloat(buttonsCount - 1)))
+                            let y = layout.size.height - self.effectiveBottomAreaHeight - layout.intrinsicInsets.bottom + (controlsHidden ? self.effectiveBottomAreaHeight + layout.intrinsicInsets.bottom + 30.0: floor((self.effectiveBottomAreaHeight - sideButtonSize.height) / 2.0))
+                            let secondButtonFrame: CGRect
+                            if hasCameraButton {
+                                let firstButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: y), size: sideButtonSize)
+                                secondButtonFrame = CGRect(origin: CGPoint(x: firstButtonFrame.maxX + spacing, y: y), size: sideButtonSize)
+                            } else {
+                                secondButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: y), size: sideButtonSize)
+                            }
+                            let actionButtonFrame = CGRect(origin: CGPoint(x: secondButtonFrame.maxX + spacing, y: y), size: sideButtonSize)
+                            return actionButtonFrame.center
+                        }
+                }
+            }
+        }
     }
     
     private let sharedContext: SharedAccountContext
@@ -3456,7 +6628,10 @@ public final class VoiceChatController: ViewController {
         
         super.init(navigationBarPresentationData: nil)
         
-        self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
+        self.automaticallyControlPresentationContextLayout = false
+        self.blocksBackgroundWhenInOverlay = true
+        
+        self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .all)
                  
         self.statusBar.statusBarStyle = .Ignore
         
@@ -3474,6 +6649,10 @@ public final class VoiceChatController: ViewController {
             return true
         }
         |> filter { $0 })
+        
+        self.scrollToTop = { [weak self] in
+            self?.controllerNode.scrollToTop()
+        }
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -3484,7 +6663,7 @@ public final class VoiceChatController: ViewController {
         self.idleTimerExtensionDisposable.dispose()
         
         if let currentOverlayController = self.currentOverlayController {
-            currentOverlayController.animateOut(reclaim: false, completion: { _ in })
+            currentOverlayController.animateOut(reclaim: false, targetPosition: CGPoint(), completion: { _ in })
         }
     }
     
@@ -3535,6 +6714,8 @@ public final class VoiceChatController: ViewController {
                 let count = navigationController.viewControllers.count
                 if count == 2 || navigationController.viewControllers[count - 2] is ChatController {
                     if case .active(.cantSpeak) = self.controllerNode.actionButton.stateValue {
+                    } else if case .button = self.controllerNode.actionButton.stateValue {
+                    } else if case .scheduled = self.controllerNode.actionButton.stateValue {
                     } else if let chatController = navigationController.viewControllers[count - 2] as? ChatController, chatController.isSendButtonVisible {
                     } else if let tabBarController = navigationController.viewControllers[count - 2] as? TabBarController, let chatListController = tabBarController.controllers[tabBarController.selectedIndex] as? ChatListController, chatListController.isSearchActive {
                     } else {
@@ -3570,13 +6751,13 @@ public final class VoiceChatController: ViewController {
             return true
         })
     }
-    
+
     private func detachActionButton() {
         guard self.currentOverlayController == nil && !self.isDisconnected else {
             return
         }
         
-        let overlayController = VoiceChatOverlayController(actionButton: self.controllerNode.actionButton, audioOutputNode: self.controllerNode.audioOutputNode, leaveNode: self.controllerNode.leaveNode, navigationController: self.navigationController as? NavigationController, initiallyHidden: self.dismissedManually)
+        let overlayController = VoiceChatOverlayController(actionButton: self.controllerNode.actionButton, audioOutputNode: self.controllerNode.audioButton, cameraNode: self.controllerNode.cameraButton, leaveNode: self.controllerNode.leaveButton, navigationController: self.navigationController as? NavigationController, initiallyHidden: self.dismissedManually)
         if let navigationController = self.navigationController as? NavigationController {
             navigationController.presentOverlay(controller: overlayController, inGlobal: true, blockInteraction: false)
         }
@@ -3586,12 +6767,13 @@ public final class VoiceChatController: ViewController {
         
         self.reclaimActionButton = { [weak self, weak overlayController] in
             if let strongSelf = self {
-                overlayController?.animateOut(reclaim: true, completion: { immediate in
+                overlayController?.animateOut(reclaim: true, targetPosition: strongSelf.controllerNode.actionButtonPosition, completion: { immediate in
                     if let strongSelf = self, immediate {
                         strongSelf.controllerNode.actionButton.ignoreHierarchyChanges = true
+                        strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.cameraButton)
+                        strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.audioButton)
+                        strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.leaveButton)
                         strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.actionButton)
-                        strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.audioOutputNode)
-                        strongSelf.controllerNode.bottomPanelNode.addSubnode(strongSelf.controllerNode.leaveNode)
                         
                         if immediate, let layout = strongSelf.validLayout {
                             strongSelf.containerLayoutUpdated(layout, transition: .immediate)
@@ -3623,31 +6805,43 @@ public final class VoiceChatController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         self.validLayout = layout
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
 private final class VoiceChatContextExtractedContentSource: ContextExtractedContentSource {
     var keepInPlace: Bool
-    let ignoreContentTouches: Bool = true
+    let ignoreContentTouches: Bool = false
     let blurBackground: Bool
+    let maskView: UIView?
+  
+    private var animateTransitionIn: () -> Void
+    private var animateTransitionOut: () -> Void
     
-    private let controller: ViewController
     private let sourceNode: ContextExtractedContentContainingNode
     
-    init(controller: ViewController, sourceNode: ContextExtractedContentContainingNode, keepInPlace: Bool, blurBackground: Bool) {
-        self.controller = controller
+    var centerVertically: Bool
+    var shouldBeDismissed: Signal<Bool, NoError>
+    
+    init(sourceNode: ContextExtractedContentContainingNode, maskView: UIView?, keepInPlace: Bool, blurBackground: Bool, centerVertically: Bool, shouldBeDismissed: Signal<Bool, NoError>, animateTransitionIn: @escaping () -> Void, animateTransitionOut: @escaping () -> Void) {
         self.sourceNode = sourceNode
+        self.maskView = maskView
         self.keepInPlace = keepInPlace
         self.blurBackground = blurBackground
+        self.centerVertically = centerVertically
+        self.shouldBeDismissed = shouldBeDismissed
+        self.animateTransitionIn = animateTransitionIn
+        self.animateTransitionOut = animateTransitionOut
     }
     
     func takeView() -> ContextControllerTakeViewInfo? {
-        return ContextControllerTakeViewInfo(contentContainingNode: self.sourceNode, contentAreaInScreenSpace: UIScreen.main.bounds)
+        self.animateTransitionIn()
+        return ContextControllerTakeViewInfo(contentContainingNode: self.sourceNode, contentAreaInScreenSpace: UIScreen.main.bounds, maskView: self.maskView)
     }
     
     func putBack() -> ContextControllerPutBackViewInfo? {
-        return ContextControllerPutBackViewInfo(contentAreaInScreenSpace: UIScreen.main.bounds)
+        self.animateTransitionOut()
+        return ContextControllerPutBackViewInfo(contentAreaInScreenSpace: UIScreen.main.bounds, maskView: self.maskView)
     }
 }
 
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift
new file mode 100644
index 0000000000..4ba7b1c7cb
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatFullscreenParticipantItem.swift
@@ -0,0 +1,1004 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import Postbox
+import TelegramCore
+import SyncCore
+import TelegramPresentationData
+import TelegramUIPreferences
+import ItemListUI
+import PresentationDataUtils
+import AvatarNode
+import TelegramStringFormatting
+import PeerPresenceStatusManager
+import ContextUI
+import AccountContext
+import LegacyComponents
+import AudioBlob
+import PeerInfoAvatarListNode
+
+private let avatarFont = avatarPlaceholderFont(size: floor(50.0 * 16.0 / 37.0))
+private let tileSize = CGSize(width: 84.0, height: 84.0)
+private let backgroundCornerRadius: CGFloat = 11.0
+private let videoCornerRadius: CGFloat = 23.0
+private let avatarSize: CGFloat = 50.0
+private let videoSize = CGSize(width: 180.0, height: 180.0)
+
+private let accentColor: UIColor = UIColor(rgb: 0x007aff)
+private let constructiveColor: UIColor = UIColor(rgb: 0x34c759)
+private let destructiveColor: UIColor = UIColor(rgb: 0xff3b30)
+
+private let borderLineWidth: CGFloat = 2.0
+
+private let fadeColor = UIColor(rgb: 0x000000, alpha: 0.5)
+let fadeHeight: CGFloat = 50.0
+
+private var fadeImage: UIImage? = {
+    return generateImage(CGSize(width: fadeHeight, height: fadeHeight), rotatedContext: { size, context in
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        context.clear(bounds)
+        
+        let colorsArray = [fadeColor.withAlphaComponent(0.0).cgColor, fadeColor.cgColor] as CFArray
+        var locations: [CGFloat] = [1.0, 0.0]
+        let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
+        context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+    })
+}()
+
+final class VoiceChatFullscreenParticipantItem: ListViewItem {
+    enum Icon {
+        case none
+        case microphone(Bool, UIColor)
+        case invite(Bool)
+        case wantsToSpeak
+    }
+    
+    enum Color {
+        case generic
+        case accent
+        case constructive
+        case destructive
+    }
+    
+    let presentationData: ItemListPresentationData
+    let nameDisplayOrder: PresentationPersonNameOrder
+    let context: AccountContext
+    let peer: Peer
+    let videoEndpointId: String?
+    let isPaused: Bool
+    let icon: Icon
+    let text: VoiceChatParticipantItem.ParticipantText
+    let textColor: Color
+    let color: Color
+    let isLandscape: Bool
+    let active: Bool
+    let showVideoWhenActive: Bool
+    let getAudioLevel: (() -> Signal<Float, NoError>)?
+    let getVideo: () -> GroupVideoNode?
+    let action: ((ASDisplayNode?) -> Void)?
+    let contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?
+    let getUpdatingAvatar: () -> Signal<(TelegramMediaImageRepresentation, Float)?, NoError>
+    
+    public let selectable: Bool = true
+    
+    public init(presentationData: ItemListPresentationData, nameDisplayOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, videoEndpointId: String?, isPaused: Bool, icon: Icon, text: VoiceChatParticipantItem.ParticipantText, textColor: Color, color: Color, isLandscape: Bool, active: Bool, showVideoWhenActive: Bool, getAudioLevel: (() -> Signal<Float, NoError>)?, getVideo: @escaping () -> GroupVideoNode?, action: ((ASDisplayNode?) -> Void)?, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, getUpdatingAvatar: @escaping () -> Signal<(TelegramMediaImageRepresentation, Float)?, NoError>) {
+        self.presentationData = presentationData
+        self.nameDisplayOrder = nameDisplayOrder
+        self.context = context
+        self.peer = peer
+        self.videoEndpointId = videoEndpointId
+        self.isPaused = isPaused
+        self.icon = icon
+        self.text = text
+        self.textColor = textColor
+        self.color = color
+        self.isLandscape = isLandscape
+        self.active = active
+        self.showVideoWhenActive = showVideoWhenActive
+        self.getAudioLevel = getAudioLevel
+        self.getVideo = getVideo
+        self.action = action
+        self.contextAction = contextAction
+        self.getUpdatingAvatar = getUpdatingAvatar
+    }
+        
+    public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = VoiceChatFullscreenParticipantItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params, previousItem == nil, nextItem == nil)
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (node.avatarNode.ready, { _ in apply(synchronousLoads, false) })
+                })
+            }
+        }
+    }
+    
+    public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? VoiceChatFullscreenParticipantItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                var animated = true
+                if case .None = animation {
+                    animated = false
+                }
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params, previousItem == nil, nextItem == nil)
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply(false, animated)
+                        })
+                    }
+                }
+            }
+        }
+    }
+    
+    public func selected(listView: ListView) {
+        listView.clearHighlightAnimated(true)
+    }
+}
+
+class VoiceChatFullscreenParticipantItemNode: ItemListRevealOptionsItemNode {
+    let contextSourceNode: ContextExtractedContentContainingNode
+    private let containerNode: ContextControllerSourceNode
+    let backgroundImageNode: ASImageNode
+    private let extractedBackgroundImageNode: ASImageNode
+    let offsetContainerNode: ASDisplayNode
+    let highlightNode: VoiceChatTileHighlightNode
+    
+    private var extractedRect: CGRect?
+    private var nonExtractedRect: CGRect?
+    private var extractedVerticalOffset: CGFloat?
+        
+    let avatarNode: AvatarNode
+    let contentWrapperNode: ASDisplayNode
+    private let titleNode: TextNode
+    private let statusNode: VoiceChatParticipantStatusNode
+    private var credibilityIconNode: ASImageNode?
+        
+    private let actionContainerNode: ASDisplayNode
+    private var animationNode: VoiceChatMicrophoneNode?
+    private var iconNode: ASImageNode?
+    private var raiseHandNode: VoiceChatRaiseHandNode?
+    private var actionButtonNode: HighlightableButtonNode
+    
+    var audioLevelView: VoiceBlobView?
+    private let audioLevelDisposable = MetaDisposable()
+    private var didSetupAudioLevel = false
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    
+    private var layoutParams: (VoiceChatFullscreenParticipantItem, ListViewItemLayoutParams, Bool, Bool)?
+    private var isExtracted = false
+    private var animatingExtraction = false
+    private var animatingSelection = false
+    private var wavesColor: UIColor?
+    
+    let videoContainerNode: ASDisplayNode
+    let videoFadeNode: ASDisplayNode
+    var videoNode: GroupVideoNode?
+    
+    private var profileNode: VoiceChatPeerProfileNode?
+    
+    private var raiseHandTimer: SwiftSignalKit.Timer?
+    private var silenceTimer: SwiftSignalKit.Timer?
+    
+    var item: VoiceChatFullscreenParticipantItem? {
+        return self.layoutParams?.0
+    }
+    
+    init() {
+        self.contextSourceNode = ContextExtractedContentContainingNode()
+        self.containerNode = ContextControllerSourceNode()
+        
+        self.backgroundImageNode = ASImageNode()
+        self.backgroundImageNode.clipsToBounds = true
+        self.backgroundImageNode.displaysAsynchronously = false
+        self.backgroundImageNode.alpha = 0.0
+        
+        self.extractedBackgroundImageNode = ASImageNode()
+        self.extractedBackgroundImageNode.clipsToBounds = true
+        self.extractedBackgroundImageNode.displaysAsynchronously = false
+        self.extractedBackgroundImageNode.alpha = 0.0
+        
+        self.highlightNode = VoiceChatTileHighlightNode()
+        self.highlightNode.isHidden = true
+        
+        self.offsetContainerNode = ASDisplayNode()
+        
+        self.avatarNode = AvatarNode(font: avatarFont)
+        self.avatarNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: avatarSize, height: avatarSize))
+        
+        self.contentWrapperNode = ASDisplayNode()
+        
+        self.videoContainerNode = ASDisplayNode()
+        self.videoContainerNode.clipsToBounds = true
+        
+        self.videoFadeNode = ASDisplayNode()
+        self.videoFadeNode.displaysAsynchronously = false
+        if let image = fadeImage {
+            self.videoFadeNode.backgroundColor = UIColor(patternImage: image)
+        }
+        self.videoContainerNode.addSubnode(self.videoFadeNode)
+        
+        self.titleNode = TextNode()
+        self.titleNode.displaysAsynchronously = false
+        self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.contentMode = .left
+        self.titleNode.contentsScale = UIScreen.main.scale
+        
+        self.statusNode = VoiceChatParticipantStatusNode()
+    
+        self.actionContainerNode = ASDisplayNode()
+        self.actionButtonNode = HighlightableButtonNode()
+        
+        super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
+        
+        self.isAccessibilityElement = true
+        
+        self.containerNode.addSubnode(self.contextSourceNode)
+        self.containerNode.targetNodeForActivationProgress = self.contextSourceNode.contentNode
+        self.addSubnode(self.containerNode)
+        
+        self.contextSourceNode.contentNode.addSubnode(self.backgroundImageNode)
+        self.backgroundImageNode.addSubnode(self.extractedBackgroundImageNode)
+        self.contextSourceNode.contentNode.addSubnode(self.offsetContainerNode)
+        self.offsetContainerNode.addSubnode(self.videoContainerNode)
+        self.offsetContainerNode.addSubnode(self.contentWrapperNode)
+        self.contentWrapperNode.addSubnode(self.titleNode)
+        self.contentWrapperNode.addSubnode(self.actionContainerNode)
+        self.actionContainerNode.addSubnode(self.actionButtonNode)
+        self.offsetContainerNode.addSubnode(self.avatarNode)
+        self.contextSourceNode.contentNode.addSubnode(self.highlightNode)
+        self.containerNode.targetNodeForActivationProgress = self.contextSourceNode.contentNode
+                
+        self.containerNode.shouldBegin = { [weak self] location in
+            guard let _ = self else {
+                return false
+            }
+            return true
+        }
+        self.containerNode.activated = { [weak self] gesture, _ in
+            guard let strongSelf = self, let item = strongSelf.layoutParams?.0, let contextAction = item.contextAction else {
+                gesture.cancel()
+                return
+            }
+            contextAction(strongSelf.contextSourceNode, gesture)
+        }
+        self.contextSourceNode.willUpdateIsExtractedToContextPreview = { [weak self] isExtracted, transition in
+            guard let strongSelf = self, let _ = strongSelf.item else {
+                return
+            }
+            strongSelf.updateIsExtracted(isExtracted, transition: transition)
+        }
+    }
+    
+    deinit {
+        self.audioLevelDisposable.dispose()
+        self.raiseHandTimer?.invalidate()
+        self.silenceTimer?.invalidate()
+    }
+    
+    override func selected() {
+        super.selected()
+        if self.animatingSelection {
+            return
+        }
+        self.layoutParams?.0.action?(self.contextSourceNode)
+    }
+    
+    func transitionIn(from sourceNode: ASDisplayNode?) {
+        guard let item = self.item else {
+            return
+        }
+        let active = item.active && !item.showVideoWhenActive
+        
+        var videoNode: GroupVideoNode?
+        if let sourceNode = sourceNode as? VoiceChatTileItemNode {
+            if let sourceVideoNode = sourceNode.videoNode {
+                sourceNode.videoNode = nil
+                videoNode = sourceVideoNode
+            }
+        }
+        
+        if videoNode == nil {
+            videoNode = item.getVideo()
+        }
+        
+        if videoNode?.isMainstageExclusive == true && active {
+            videoNode = nil
+        }
+        
+        if let videoNode = videoNode {
+            if active {
+                self.avatarNode.alpha = 1.0
+                videoNode.alpha = 0.0
+            } else {
+                self.avatarNode.alpha = 0.0
+                videoNode.alpha = 1.0
+            }
+            self.videoNode = videoNode
+            self.videoContainerNode.insertSubnode(videoNode, at: 0)
+            
+            videoNode.updateLayout(size: videoSize, layoutMode: .fillOrFitToSquare, transition: .immediate)
+            videoNode.frame = CGRect(origin: CGPoint(), size: videoSize)
+        }
+    }
+    
+    var gridVisibility = true {
+        didSet {
+            self.updateIsEnabled()
+        }
+    }
+    
+    func updateIsEnabled() {
+        guard let (rect, containerSize) = self.absoluteLocation else {
+            return
+        }
+        let isVisibleInContainer = rect.maxY >= 0.0 && rect.minY <= containerSize.height
+        if let videoNode = self.videoNode, videoNode.supernode === self.videoContainerNode {
+            videoNode.updateIsEnabled(self.gridVisibility && isVisibleInContainer)
+        }
+    }
+    
+    private func updateIsExtracted(_ isExtracted: Bool, transition: ContainedViewLayoutTransition) {
+        guard self.isExtracted != isExtracted,  let extractedRect = self.extractedRect, let nonExtractedRect = self.nonExtractedRect, let item = self.item else {
+            return
+        }
+        self.isExtracted = isExtracted
+        
+        if item.peer.smallProfileImage != nil {
+            let springDuration: Double = 0.42
+            let springDamping: CGFloat = 124.0
+            
+            if isExtracted {
+                var hasVideo = false
+                if let videoNode = self.videoNode, videoNode.supernode == self.videoContainerNode, !videoNode.alpha.isZero {
+                    hasVideo = true
+                }
+                let profileNode = VoiceChatPeerProfileNode(context: item.context, size: extractedRect.size, sourceSize: nonExtractedRect.size, peer: item.peer, text: item.text, customNode: hasVideo ? self.videoContainerNode : nil, additionalEntry: .single(nil), requestDismiss: { [weak self] in
+                    self?.contextSourceNode.requestDismiss?()
+                })
+                profileNode.frame = CGRect(origin: CGPoint(), size: extractedRect.size)
+                self.profileNode = profileNode
+                self.contextSourceNode.contentNode.addSubnode(profileNode)
+
+                profileNode.animateIn(from: self, targetRect: extractedRect, transition: transition)
+                var appearenceTransition = transition
+                if transition.isAnimated {
+                    appearenceTransition = .animated(duration: springDuration, curve: .customSpring(damping: springDamping, initialVelocity: 0.0))
+                }
+                appearenceTransition.updateFrame(node: profileNode, frame: extractedRect)
+                
+                self.contextSourceNode.contentNode.customHitTest = { [weak self] point in
+                    if let strongSelf = self, let profileNode = strongSelf.profileNode {
+                        if profileNode.avatarListWrapperNode.frame.contains(point) {
+                            return profileNode.avatarListNode.view
+                        }
+                    }
+                    return nil
+                }
+                self.highlightNode.isHidden = true
+                self.backgroundImageNode.isHidden = true
+            } else if let profileNode = self.profileNode {
+                self.profileNode = nil
+                profileNode.animateOut(to: self, targetRect: nonExtractedRect, transition: transition, completion: { [weak self] in
+                    self?.backgroundImageNode.isHidden = false
+                })
+                
+                var appearenceTransition = transition
+                if transition.isAnimated {
+                    appearenceTransition = .animated(duration: 0.2, curve: .easeInOut)
+                }
+                appearenceTransition.updateFrame(node: profileNode, frame: nonExtractedRect)
+                
+                self.contextSourceNode.contentNode.customHitTest = nil
+                self.highlightNode.isHidden = !item.active
+            }
+        }
+    }
+    
+    func asyncLayout() -> (_ item: VoiceChatFullscreenParticipantItem, _ params: ListViewItemLayoutParams, _ first: Bool, _ last: Bool) -> (ListViewItemNodeLayout, (Bool, Bool) -> Void) {
+        let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
+        let makeStatusLayout = self.statusNode.asyncLayout()
+        
+        let currentItem = self.layoutParams?.0
+        var hasVideo = self.videoNode != nil
+        
+        return { item, params, first, last in
+            let titleFont = Font.semibold(13.0)
+            var titleAttributedString: NSAttributedString?
+            
+            if !hasVideo && item.videoEndpointId != nil {
+                hasVideo = true
+            }
+            let active = item.active && !item.showVideoWhenActive
+            
+            var titleColor = item.presentationData.theme.list.itemPrimaryTextColor
+            if !hasVideo || active {
+                switch item.textColor {
+                    case .generic:
+                        titleColor = item.presentationData.theme.list.itemPrimaryTextColor
+                    case .accent:
+                        titleColor = item.presentationData.theme.list.itemAccentColor
+                    case .constructive:
+                        titleColor = constructiveColor
+                    case .destructive:
+                        titleColor = destructiveColor
+                }
+            }
+            let currentBoldFont: UIFont = titleFont
+            
+            if let user = item.peer as? TelegramUser {
+                if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
+                    titleAttributedString = NSAttributedString(string: firstName, font: titleFont, textColor: titleColor)
+                } else if let firstName = user.firstName, !firstName.isEmpty {
+                    titleAttributedString = NSAttributedString(string: firstName, font: currentBoldFont, textColor: titleColor)
+                } else if let lastName = user.lastName, !lastName.isEmpty {
+                    titleAttributedString = NSAttributedString(string: lastName, font: currentBoldFont, textColor: titleColor)
+                } else {
+                    titleAttributedString = NSAttributedString(string: item.presentationData.strings.User_DeletedAccount, font: currentBoldFont, textColor: titleColor)
+                }
+            } else if let group = item.peer as? TelegramGroup {
+                titleAttributedString = NSAttributedString(string: group.title, font: currentBoldFont, textColor: titleColor)
+            } else if let channel = item.peer as? TelegramChannel {
+                titleAttributedString = NSAttributedString(string: channel.title, font: currentBoldFont, textColor: titleColor)
+            }
+        
+            var wavesColor = UIColor(rgb: 0x34c759)
+            var gradient: VoiceChatTileHighlightNode.Gradient = .active
+            switch item.color {
+                case .accent:
+                    wavesColor = accentColor
+                    if case .wantsToSpeak = item.icon {
+                        gradient = .muted
+                    }
+                case .constructive:
+                    gradient = .speaking
+                case .destructive:
+                    gradient = .mutedForYou
+                    wavesColor = destructiveColor
+                default:
+                    break
+            }
+            var titleUpdated = false
+            if let currentColor = currentItem?.textColor, currentColor != item.textColor {
+                titleUpdated = true
+            }
+
+            let leftInset: CGFloat = 58.0 + params.leftInset
+            
+            var titleIconsWidth: CGFloat = 0.0
+            var currentCredibilityIconImage: UIImage?
+            var credibilityIconOffset: CGFloat = 0.0
+            if item.peer.isScam {
+                currentCredibilityIconImage = PresentationResourcesChatList.scamIcon(item.presentationData.theme, strings: item.presentationData.strings, type: .regular)
+                credibilityIconOffset = 2.0
+            } else if item.peer.isFake {
+                currentCredibilityIconImage = PresentationResourcesChatList.fakeIcon(item.presentationData.theme, strings: item.presentationData.strings, type: .regular)
+                credibilityIconOffset = 2.0
+            } else if item.peer.isVerified {
+                currentCredibilityIconImage = PresentationResourcesChatList.verifiedIcon(item.presentationData.theme)
+                credibilityIconOffset = 3.0
+            }
+            
+            if let currentCredibilityIconImage = currentCredibilityIconImage {
+                titleIconsWidth += 4.0 + currentCredibilityIconImage.size.width
+            }
+                      
+            let constrainedWidth = params.width - 24.0 - 10.0
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: constrainedWidth, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+                        
+            let availableWidth = params.availableHeight
+            let (statusLayout, _) = makeStatusLayout(CGSize(width: availableWidth - 30.0, height: CGFloat.greatestFiniteMagnitude), item.text, true)
+            
+            let contentSize = tileSize
+            let insets = UIEdgeInsets(top: 0.0, left: 0.0, bottom: !last ? 6.0 : 0.0, right: 0.0)
+                            
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
+                        
+            return (layout, { [weak self] synchronousLoad, animated in
+                if let strongSelf = self {
+                    let hadItem = strongSelf.layoutParams?.0 != nil
+                    strongSelf.layoutParams = (item, params, first, last)
+                    strongSelf.wavesColor = wavesColor
+                    
+                    let videoContainerScale = tileSize.width / videoSize.width
+                    
+                    let appearanceDuration: Double = 0.25
+                    let apperanceTransition = ContainedViewLayoutTransition.animated(duration: appearanceDuration, curve: .easeInOut)
+                    let videoNode = item.getVideo()
+                    if let currentVideoNode = strongSelf.videoNode, currentVideoNode !== videoNode {
+                        if videoNode == nil {
+                            let snapshotView = currentVideoNode.snapshotView
+                            if strongSelf.avatarNode.alpha.isZero {
+                                strongSelf.animatingSelection = true
+                                strongSelf.videoContainerNode.layer.animateScale(from: videoContainerScale, to: 0.001, duration: appearanceDuration, completion: { _ in
+                                    snapshotView?.removeFromSuperview()
+                                })
+                                strongSelf.avatarNode.layer.animateScale(from: 0.0, to: 1.0, duration: appearanceDuration, completion: { [weak self] _ in
+                                    self?.animatingSelection = false
+                                })
+                                strongSelf.videoContainerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: -9.0), duration: appearanceDuration, additive: true)
+                                strongSelf.audioLevelView?.layer.animateScale(from: 0.0, to: 1.0, duration: appearanceDuration)
+                            }
+                            if currentVideoNode.supernode === strongSelf.videoContainerNode {
+                                apperanceTransition.updateAlpha(node: currentVideoNode, alpha: 0.0)
+                            } else if let snapshotView = snapshotView {
+                                strongSelf.videoContainerNode.view.insertSubview(snapshotView, at: 0)
+                                apperanceTransition.updateAlpha(layer: snapshotView.layer, alpha: 0.0)
+                            }
+                            apperanceTransition.updateAlpha(node: strongSelf.videoFadeNode, alpha: 0.0)
+                            apperanceTransition.updateAlpha(node: strongSelf.avatarNode, alpha: 1.0)
+                            if let audioLevelView = strongSelf.audioLevelView {
+                                apperanceTransition.updateAlpha(layer: audioLevelView.layer, alpha: 1.0)
+                            }
+                        } else {
+                            if currentItem?.peer.id == item.peer.id {
+                                currentVideoNode.layer.animateScale(from: 1.0, to: 0.0, duration: appearanceDuration, removeOnCompletion: false, completion: { [weak self, weak currentVideoNode] _ in
+                                    currentVideoNode?.layer.removeAllAnimations()
+                                    if currentVideoNode !== self?.videoNode {
+                                        currentVideoNode?.removeFromSupernode()
+                                    }
+                                })
+                            } else {
+                                currentVideoNode.removeFromSupernode()
+                            }
+                        }
+                    }
+                    
+                    let videoNodeUpdated = strongSelf.videoNode !== videoNode
+                    strongSelf.videoNode = videoNode
+                    
+                    videoNode?.updateIsBlurred(isBlurred: item.isPaused, light: true)
+                    
+                    let nonExtractedRect: CGRect
+                    let avatarFrame: CGRect
+                    let titleFrame: CGRect
+                    let animationSize: CGSize
+                    let animationFrame: CGRect
+                    let animationScale: CGFloat
+                    
+                    nonExtractedRect = CGRect(origin: CGPoint(), size: layout.contentSize)
+                    strongSelf.containerNode.transform = CATransform3DMakeRotation(item.isLandscape ? 0.0 : CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+                    avatarFrame = CGRect(origin: CGPoint(x: floor((layout.size.width - avatarSize) / 2.0), y: 7.0), size: CGSize(width: avatarSize, height: avatarSize))
+                    
+                    animationSize = CGSize(width: 36.0, height: 36.0)
+                    animationScale = 0.66667
+                    animationFrame = CGRect(x: layout.size.width - 29.0, y: 55.0, width: 24.0, height: 24.0)
+                    titleFrame = CGRect(origin: CGPoint(x: 8.0, y: 63.0), size: titleLayout.size)
+                                    
+                    let extractedWidth = availableWidth
+                    var extractedRect = CGRect(x: 0.0, y: 0.0, width: extractedWidth, height: extractedWidth + statusLayout.height + 39.0)
+                    if item.peer.smallProfileImage == nil {
+                        extractedRect = nonExtractedRect
+                    }
+                    strongSelf.extractedRect = extractedRect
+                    strongSelf.nonExtractedRect = nonExtractedRect
+                    
+                    strongSelf.backgroundImageNode.frame = nonExtractedRect
+                
+                    if strongSelf.backgroundImageNode.image == nil {
+                        strongSelf.backgroundImageNode.image = generateStretchableFilledCircleImage(diameter: backgroundCornerRadius * 2.0, color: UIColor(rgb: 0x1c1c1e))
+                        strongSelf.backgroundImageNode.alpha = 1.0
+                    }
+                    strongSelf.extractedBackgroundImageNode.frame = strongSelf.backgroundImageNode.bounds
+                    strongSelf.contextSourceNode.contentRect = extractedRect
+                    
+                    let contentBounds = CGRect(origin: CGPoint(), size: layout.contentSize)
+                    strongSelf.containerNode.frame = contentBounds
+                    strongSelf.contextSourceNode.frame = contentBounds
+                    strongSelf.contentWrapperNode.frame = contentBounds
+                    strongSelf.offsetContainerNode.frame = contentBounds
+                    strongSelf.contextSourceNode.contentNode.frame = contentBounds
+                    strongSelf.actionContainerNode.frame = contentBounds
+                    strongSelf.highlightNode.frame = contentBounds
+                    strongSelf.highlightNode.updateLayout(size: contentBounds.size, transition: .immediate)
+                    
+                    strongSelf.containerNode.isGestureEnabled = item.contextAction != nil
+                        
+                    strongSelf.accessibilityLabel = titleAttributedString?.string
+                    var combinedValueString = ""
+//                    if let statusString = statusAttributedString?.string, !statusString.isEmpty {
+//                        combinedValueString.append(statusString)
+//                    }
+                    
+                    strongSelf.accessibilityValue = combinedValueString
+                                        
+                    let transition: ContainedViewLayoutTransition
+                    if animated && hadItem {
+                        transition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
+                    } else {
+                        transition = .immediate
+                    }
+                                                            
+                    if titleUpdated, let snapshotView = strongSelf.titleNode.view.snapshotContentTree() {
+                        strongSelf.titleNode.view.superview?.addSubview(snapshotView)
+                        snapshotView.frame = strongSelf.titleNode.view.frame
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.18, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+                    }
+                    
+                    let _ = titleApply()               
+                    transition.updateFrame(node: strongSelf.titleNode, frame: titleFrame)
+                
+                    if let currentCredibilityIconImage = currentCredibilityIconImage {
+                        let iconNode: ASImageNode
+                        if let current = strongSelf.credibilityIconNode {
+                            iconNode = current
+                        } else {
+                            iconNode = ASImageNode()
+                            iconNode.isLayerBacked = true
+                            iconNode.displaysAsynchronously = false
+                            iconNode.displayWithoutProcessing = true
+                            strongSelf.offsetContainerNode.addSubnode(iconNode)
+                            strongSelf.credibilityIconNode = iconNode
+                        }
+                        iconNode.image = currentCredibilityIconImage
+                        transition.updateFrame(node: iconNode, frame: CGRect(origin: CGPoint(x: leftInset + titleLayout.size.width + 3.0, y: credibilityIconOffset), size: currentCredibilityIconImage.size))
+                    } else if let credibilityIconNode = strongSelf.credibilityIconNode {
+                        strongSelf.credibilityIconNode = nil
+                        credibilityIconNode.removeFromSupernode()
+                    }
+                    
+                    transition.updateFrameAsPositionAndBounds(node: strongSelf.avatarNode, frame: avatarFrame)
+                    
+                    strongSelf.highlightNode.updateGlowAndGradientAnimations(type: gradient, animated: true)
+                    
+                    let blobFrame = avatarFrame.insetBy(dx: -18.0, dy: -18.0)
+                    if let getAudioLevel = item.getAudioLevel {
+                        if !strongSelf.didSetupAudioLevel || currentItem?.peer.id != item.peer.id {
+                            strongSelf.audioLevelView?.frame = blobFrame
+                            strongSelf.didSetupAudioLevel = true
+                            strongSelf.audioLevelDisposable.set((getAudioLevel()
+                            |> deliverOnMainQueue).start(next: { value in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                
+                                strongSelf.highlightNode.updateLevel(CGFloat(value))
+                                
+                                if strongSelf.audioLevelView == nil, value > 0.0 {
+                                    let audioLevelView = VoiceBlobView(
+                                        frame: blobFrame,
+                                        maxLevel: 1.5,
+                                        smallBlobRange: (0, 0),
+                                        mediumBlobRange: (0.69, 0.87),
+                                        bigBlobRange: (0.71, 1.0)
+                                    )
+                                    
+                                    let maskRect = CGRect(origin: .zero, size: blobFrame.size)
+                                    let playbackMaskLayer = CAShapeLayer()
+                                    playbackMaskLayer.frame = maskRect
+                                    playbackMaskLayer.fillRule = .evenOdd
+                                    let maskPath = UIBezierPath()
+                                    maskPath.append(UIBezierPath(roundedRect: maskRect.insetBy(dx: 18, dy: 18), cornerRadius: 22))
+                                    maskPath.append(UIBezierPath(rect: maskRect))
+                                    playbackMaskLayer.path = maskPath.cgPath
+                                    audioLevelView.layer.mask = playbackMaskLayer
+                                    
+                                    audioLevelView.setColor(wavesColor)
+                                    audioLevelView.alpha = strongSelf.isExtracted ? 0.0 : 1.0
+                                    
+                                    strongSelf.audioLevelView = audioLevelView
+                                    strongSelf.offsetContainerNode.view.insertSubview(audioLevelView, at: 0)
+                                    
+                                    if let item = strongSelf.item, strongSelf.videoNode != nil && !active {
+                                        audioLevelView.alpha = 0.0
+                                    }
+                                }
+                                
+                                let level = min(1.0, max(0.0, CGFloat(value)))
+                                if let audioLevelView = strongSelf.audioLevelView {
+                                    audioLevelView.updateLevel(CGFloat(value))
+                                    
+                                    let avatarScale: CGFloat
+                                    if value > 0.02 {
+                                        audioLevelView.startAnimating()
+                                        avatarScale = 1.03 + level * 0.13
+
+                                        if let silenceTimer = strongSelf.silenceTimer {
+                                            silenceTimer.invalidate()
+                                            strongSelf.silenceTimer = nil
+                                        }
+                                    } else {
+                                        avatarScale = 1.0
+                                        if strongSelf.silenceTimer == nil {
+                                            let silenceTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: false, completion: { [weak self] in
+                                                self?.audioLevelView?.stopAnimating(duration: 0.75)
+                                                self?.silenceTimer = nil
+                                            }, queue: Queue.mainQueue())
+                                            strongSelf.silenceTimer = silenceTimer
+                                            silenceTimer.start()
+                                        }
+                                    }
+                                    
+                                    if let wavesColor = strongSelf.wavesColor {
+                                        audioLevelView.setColor(wavesColor, animated: true)
+                                    }
+                                    
+                                    if !strongSelf.animatingSelection {
+                                        let transition: ContainedViewLayoutTransition = .animated(duration: 0.15, curve: .easeInOut)
+                                        transition.updateTransformScale(node: strongSelf.avatarNode, scale: strongSelf.isExtracted ? 1.0 : avatarScale, beginWithCurrentState: true)
+                                    }
+                                }
+                            }))
+                        }
+                    } else if let audioLevelView = strongSelf.audioLevelView {
+                        strongSelf.audioLevelView = nil
+                        audioLevelView.removeFromSuperview()
+                        
+                        strongSelf.audioLevelDisposable.set(nil)
+                    }
+                    
+                    var overrideImage: AvatarNodeImageOverride?
+                    if item.peer.isDeleted {
+                        overrideImage = .deletedIcon
+                    }
+                    strongSelf.avatarNode.setPeer(context: item.context, theme: item.presentationData.theme, peer: item.peer, overrideImage: overrideImage, emptyColor: item.presentationData.theme.list.mediaPlaceholderColor, synchronousLoad: synchronousLoad, storeUnrounded: true)
+                
+                    var hadMicrophoneNode = false
+                    var hadRaiseHandNode = false
+                    var hadIconNode = false
+                    var nodeToAnimateIn: ASDisplayNode?
+                    
+                    if case let .microphone(muted, color) = item.icon {
+                        let animationNode: VoiceChatMicrophoneNode
+                        if let current = strongSelf.animationNode {
+                            animationNode = current
+                        } else {
+                            animationNode = VoiceChatMicrophoneNode()
+                            strongSelf.animationNode = animationNode
+                            strongSelf.actionButtonNode.addSubnode(animationNode)
+                            
+                            nodeToAnimateIn = animationNode
+                        }
+                        var color = color
+                        if (hasVideo && !active) || color.rgb == 0x979797 {
+                            color = UIColor(rgb: 0xffffff)
+                        }
+                        animationNode.update(state: VoiceChatMicrophoneNode.State(muted: muted, filled: true, color: color), animated: true)
+                        strongSelf.actionButtonNode.isUserInteractionEnabled = false
+                    } else if let animationNode = strongSelf.animationNode {
+                        hadMicrophoneNode = true
+                        strongSelf.animationNode = nil
+                        animationNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                        animationNode.layer.animateScale(from: 1.0, to: 0.001, duration: 0.2, removeOnCompletion: false, completion: { [weak animationNode] _ in
+                            animationNode?.removeFromSupernode()
+                        })
+                    }
+                    
+                    if case .wantsToSpeak = item.icon {
+                        let raiseHandNode: VoiceChatRaiseHandNode
+                        if let current = strongSelf.raiseHandNode {
+                            raiseHandNode = current
+                        } else {
+                            raiseHandNode = VoiceChatRaiseHandNode(color: item.presentationData.theme.list.itemAccentColor)
+                            raiseHandNode.contentMode = .center
+                            strongSelf.raiseHandNode = raiseHandNode
+                            strongSelf.actionButtonNode.addSubnode(raiseHandNode)
+                            
+                            nodeToAnimateIn = raiseHandNode
+                            raiseHandNode.playRandomAnimation()
+                            
+                            strongSelf.raiseHandTimer = SwiftSignalKit.Timer(timeout: Double.random(in: 8.0 ... 10.5), repeat: true, completion: {
+                                self?.raiseHandNode?.playRandomAnimation()
+                            }, queue: Queue.mainQueue())
+                            strongSelf.raiseHandTimer?.start()
+                        }
+                        strongSelf.actionButtonNode.isUserInteractionEnabled = false
+                    } else if let raiseHandNode = strongSelf.raiseHandNode {
+                        hadRaiseHandNode = true
+                        strongSelf.raiseHandNode = nil
+                        if let raiseHandTimer = strongSelf.raiseHandTimer {
+                            strongSelf.raiseHandTimer = nil
+                            raiseHandTimer.invalidate()
+                        }
+                        raiseHandNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                        raiseHandNode.layer.animateScale(from: 1.0, to: 0.001, duration: 0.2, removeOnCompletion: false, completion: { [weak raiseHandNode] _ in
+                            raiseHandNode?.removeFromSupernode()
+                        })
+                    }
+                    
+                    if case let .invite(invited) = item.icon {
+                        let iconNode: ASImageNode
+                        if let current = strongSelf.iconNode {
+                            iconNode = current
+                        } else {
+                            iconNode = ASImageNode()
+                            iconNode.contentMode = .center
+                            strongSelf.iconNode = iconNode
+                            strongSelf.actionButtonNode.addSubnode(iconNode)
+                            
+                            nodeToAnimateIn = iconNode
+                        }
+                        
+                        if invited {
+                            iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/Context Menu/Invited"), color: UIColor(rgb: 0x979797))
+                        } else {
+                            iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: item.presentationData.theme.list.itemAccentColor)
+                        }
+                        strongSelf.actionButtonNode.isUserInteractionEnabled = false
+                    } else if let iconNode = strongSelf.iconNode {
+                        hadIconNode = true
+                        strongSelf.iconNode = nil
+                        iconNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                        iconNode.layer.animateScale(from: 1.0, to: 0.001, duration: 0.2, removeOnCompletion: false, completion: { [weak iconNode] _ in
+                            iconNode?.removeFromSupernode()
+                        })
+                    }
+                    
+                    if let node = nodeToAnimateIn, hadMicrophoneNode || hadRaiseHandNode || hadIconNode {
+                        node.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        node.layer.animateScale(from: 0.001, to: 1.0, duration: 0.2)
+                    }
+                    
+                    if !strongSelf.isExtracted && !strongSelf.animatingExtraction && strongSelf.videoContainerNode.supernode == strongSelf.offsetContainerNode {
+                        strongSelf.videoFadeNode.frame = CGRect(x: 0.0, y: videoSize.height - fadeHeight, width: videoSize.width, height: fadeHeight)
+                        strongSelf.videoContainerNode.bounds = CGRect(origin: CGPoint(), size: videoSize)
+
+                        if let videoNode = strongSelf.videoNode {
+                            strongSelf.videoFadeNode.alpha = videoNode.alpha
+                        } else {
+                            strongSelf.videoFadeNode.alpha = 0.0
+                        }
+                        strongSelf.videoContainerNode.position = CGPoint(x: tileSize.width / 2.0, y: tileSize.height / 2.0)
+                        strongSelf.videoContainerNode.cornerRadius = videoCornerRadius
+                        strongSelf.videoContainerNode.transform = CATransform3DMakeScale(videoContainerScale, videoContainerScale, 1.0)
+                    
+                        strongSelf.highlightNode.isHidden = !item.active
+                    }
+                    
+                    let canUpdateAvatarVisibility = !strongSelf.isExtracted && !strongSelf.animatingExtraction
+                    
+                    if let videoNode = videoNode {
+                        if !strongSelf.isExtracted && !strongSelf.animatingExtraction {
+                            if currentItem != nil {
+                                if active {
+                                    if strongSelf.avatarNode.alpha.isZero {
+                                        strongSelf.animatingSelection = true
+                                        strongSelf.videoContainerNode.layer.animateScale(from: videoContainerScale, to: 0.001, duration: appearanceDuration)
+                                        strongSelf.avatarNode.layer.animateScale(from: 0.0, to: 1.0, duration: appearanceDuration, completion: { [weak self] _ in
+                                            self?.animatingSelection = false
+                                        })
+                                        strongSelf.videoContainerNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: -9.0), duration: appearanceDuration, additive: true)
+                                        strongSelf.audioLevelView?.layer.animateScale(from: 0.0, to: 1.0, duration: appearanceDuration)
+                                    }
+                                    if videoNodeUpdated {
+                                        videoNode.alpha = 0.0
+                                        strongSelf.videoFadeNode.alpha = 0.0
+                                    } else {
+                                        apperanceTransition.updateAlpha(node: videoNode, alpha: 0.0)
+                                        apperanceTransition.updateAlpha(node: strongSelf.videoFadeNode, alpha: 0.0)
+                                    }
+                                    apperanceTransition.updateAlpha(node: strongSelf.avatarNode, alpha: 1.0)
+                                    if let audioLevelView = strongSelf.audioLevelView {
+                                        apperanceTransition.updateAlpha(layer: audioLevelView.layer, alpha: 1.0)
+                                    }
+                                } else {
+                                    if !strongSelf.avatarNode.alpha.isZero {
+                                        strongSelf.videoContainerNode.layer.animateScale(from: 0.001, to: videoContainerScale, duration: appearanceDuration)
+                                        strongSelf.avatarNode.layer.animateScale(from: 1.0, to: 0.001, duration: appearanceDuration)
+                                        strongSelf.audioLevelView?.layer.animateScale(from: 1.0, to: 0.001, duration: appearanceDuration)
+                                        strongSelf.videoContainerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: -9.0), to: CGPoint(), duration: appearanceDuration, additive: true)
+                                    }
+                                    if videoNode.supernode === strongSelf.videoContainerNode {
+                                        apperanceTransition.updateAlpha(node: videoNode, alpha: 1.0)
+                                    }
+                                    apperanceTransition.updateAlpha(node: strongSelf.videoFadeNode, alpha: 1.0)
+                                    apperanceTransition.updateAlpha(node: strongSelf.avatarNode, alpha: 0.0)
+                                    if let audioLevelView = strongSelf.audioLevelView {
+                                        apperanceTransition.updateAlpha(layer: audioLevelView.layer, alpha: 0.0)
+                                    }
+                                }
+                            } else {
+                                if active {
+                                    videoNode.alpha = 0.0
+                                    if canUpdateAvatarVisibility {
+                                        strongSelf.avatarNode.alpha = 1.0
+                                    }
+                                } else {
+                                    videoNode.alpha = 1.0
+                                    strongSelf.avatarNode.alpha = 0.0
+                                }
+                            }
+                        }
+                        
+                        videoNode.updateLayout(size: videoSize, layoutMode: .fillOrFitToSquare, transition: .immediate)
+                        if !strongSelf.isExtracted && !strongSelf.animatingExtraction {
+                            if videoNode.supernode !== strongSelf.videoContainerNode {
+                                videoNode.clipsToBounds = true
+                                strongSelf.videoContainerNode.insertSubnode(videoNode, at: 0)
+                            }
+                            
+                            videoNode.position = CGPoint(x: videoSize.width / 2.0, y: videoSize.height / 2.0)
+                            videoNode.bounds = CGRect(origin: CGPoint(), size: videoSize)
+                        }
+                        
+                        if let _ = currentItem, videoNodeUpdated {
+                            if active {
+                                if canUpdateAvatarVisibility {
+                                    strongSelf.avatarNode.alpha = 1.0
+                                }
+                                videoNode.alpha = 0.0
+                            } else {
+                                strongSelf.animatingSelection = true
+                                let previousAvatarNodeAlpha = strongSelf.avatarNode.alpha
+                                strongSelf.avatarNode.alpha = 0.0
+                                strongSelf.avatarNode.layer.animateAlpha(from: previousAvatarNodeAlpha, to: 0.0, duration: appearanceDuration)
+                                videoNode.layer.animateScale(from: 0.01, to: 1.0, duration: appearanceDuration, completion: { [weak self] _ in
+                                    self?.animatingSelection = false
+                                })
+                                videoNode.alpha = 1.0
+                            }
+                        } else {
+                            if active {
+                                if canUpdateAvatarVisibility {
+                                    strongSelf.avatarNode.alpha = 1.0
+                                }
+                                videoNode.alpha = 0.0
+                            } else {
+                                strongSelf.avatarNode.alpha = 0.0
+                                videoNode.alpha = 1.0
+                            }
+                        }
+                    } else if canUpdateAvatarVisibility {
+                        strongSelf.avatarNode.alpha = 1.0
+                    }
+                                        
+                    strongSelf.iconNode?.frame = CGRect(origin: CGPoint(), size: animationSize)
+                    strongSelf.animationNode?.frame = CGRect(origin: CGPoint(), size: animationSize)
+                    strongSelf.raiseHandNode?.frame = CGRect(origin: CGPoint(), size: animationSize).insetBy(dx: -6.0, dy: -6.0).offsetBy(dx: -2.0, dy: 0.0)
+                    
+                    strongSelf.actionButtonNode.transform = CATransform3DMakeScale(animationScale, animationScale, 1.0)
+                    transition.updateFrame(node: strongSelf.actionButtonNode, frame: animationFrame)
+                                        
+                    strongSelf.updateIsHighlighted(transition: transition)
+                }
+            })
+        }
+    }
+    
+    var isHighlighted = false
+    func updateIsHighlighted(transition: ContainedViewLayoutTransition) {
+
+    }
+    
+    override func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        super.setHighlighted(highlighted, at: point, animated: animated)
+             
+        self.isHighlighted = highlighted
+            
+        self.updateIsHighlighted(transition: (animated && !highlighted) ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)
+    }
+    
+    override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
+        self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
+    }
+    
+    override func animateRemoved(_ currentTimestamp: Double, duration: Double) {
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
+    }
+    
+    override func headers() -> [ListViewItemHeader]? {
+        return nil
+    }
+    
+    override func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y += self.insets.top
+        self.absoluteLocation = (rect, containerSize)
+        
+        self.updateIsEnabled()
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatOptionsButton.swift b/submodules/TelegramCallsUI/Sources/VoiceChatHeaderButton.swift
similarity index 68%
rename from submodules/TelegramCallsUI/Sources/VoiceChatOptionsButton.swift
rename to submodules/TelegramCallsUI/Sources/VoiceChatHeaderButton.swift
index f5cdd8f9c6..92b9af8cb2 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatOptionsButton.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatHeaderButton.swift
@@ -6,6 +6,7 @@ import Postbox
 import AccountContext
 import TelegramPresentationData
 import AvatarNode
+import AnimationUI
 
 func optionsBackgroundImage(dark: Bool) -> UIImage? {
     return generateImage(CGSize(width: 28.0, height: 28.0), contextGenerator: { size, context in
@@ -16,17 +17,34 @@ func optionsBackgroundImage(dark: Bool) -> UIImage? {
     })?.stretchableImage(withLeftCapWidth: 14, topCapHeight: 14)
 }
 
-func optionsButtonImage(dark: Bool) -> UIImage? {
+func optionsCircleImage(dark: Bool) -> UIImage? {
     return generateImage(CGSize(width: 28.0, height: 28.0), contextGenerator: { size, context in
         context.clear(CGRect(origin: CGPoint(), size: size))
         
         context.setFillColor(UIColor(rgb: dark ? 0x1c1c1e : 0x2c2c2e).cgColor)
         context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
+    })
+}
+
+func panelButtonImage(dark: Bool) -> UIImage? {
+    return generateImage(CGSize(width: 38.0, height: 28.0), contextGenerator: { size, context in
+        context.clear(CGRect(origin: CGPoint(), size: size))
+        
+        context.addPath(UIBezierPath(roundedRect: CGRect(origin: CGPoint(), size: size), cornerRadius: 14.0).cgPath)
+        context.setFillColor(UIColor(rgb: dark ? 0x1c1c1e : 0x2c2c2e).cgColor)
+        context.fillPath()
         
         context.setFillColor(UIColor.white.cgColor)
-        context.fillEllipse(in: CGRect(x: 6.0, y: 12.0, width: 4.0, height: 4.0))
-        context.fillEllipse(in: CGRect(x: 12.0, y: 12.0, width: 4.0, height: 4.0))
-        context.fillEllipse(in: CGRect(x: 18.0, y: 12.0, width: 4.0, height: 4.0))
+        
+        if let image = UIImage(bundleImageName: "Call/PanelIcon") {
+            let imageSize = image.size
+            let imageRect = CGRect(origin: CGPoint(), size: imageSize)
+            context.saveGState()
+            context.translateBy(x: 7.0, y: 2.0)
+            context.clip(to: imageRect, mask: image.cgImage!)
+            context.fill(imageRect)
+            context.restoreGState()
+        }
     })
 }
 
@@ -51,6 +69,7 @@ func closeButtonImage(dark: Bool) -> UIImage? {
 final class VoiceChatHeaderButton: HighlightableButtonNode {
     enum Content {
         case image(UIImage?)
+        case more(UIImage?)
         case avatar(Peer)
     }
     
@@ -60,13 +79,17 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
     let referenceNode: ContextReferenceContentNode
     let containerNode: ContextControllerSourceNode
     private let iconNode: ASImageNode
+    private var animationNode: AnimationNode?
     private let avatarNode: AvatarNode
     
     var contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?
     
-    init(context: AccountContext) {
+    private let wide: Bool
+    
+    init(context: AccountContext, wide: Bool = false) {
         self.context = context
         self.theme = context.sharedContext.currentPresentationData.with { $0 }.theme
+        self.wide = wide
         
         self.referenceNode = ContextReferenceContentNode()
         self.containerNode = ContextControllerSourceNode()
@@ -99,9 +122,9 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
             strongSelf.contextAction?(strongSelf.containerNode, gesture)
         }
         
-        self.iconNode.image = optionsButtonImage(dark: false)
+        self.iconNode.image = optionsCircleImage(dark: false)
         
-        self.containerNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 28.0, height: 28.0))
+        self.containerNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: wide ? 38.0 : 28.0, height: 28.0))
         self.referenceNode.frame = self.containerNode.bounds
         self.iconNode.frame = self.containerNode.bounds
         self.avatarNode.frame = self.containerNode.bounds
@@ -109,6 +132,15 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
     
     private var content: Content?
     func setContent(_ content: Content, animated: Bool = false) {
+        if case .more = content, self.animationNode == nil {
+            let iconColor = UIColor(rgb: 0xffffff)
+            let animationNode = AnimationNode(animation: "anim_profilemore", colors: ["Point 2.Group 1.Fill 1": iconColor,
+                                                                                      "Point 3.Group 1.Fill 1": iconColor,
+                                                                                      "Point 1.Group 1.Fill 1": iconColor], scale: 1.0)
+            animationNode.frame = self.containerNode.bounds
+            self.addSubnode(animationNode)
+            self.animationNode = animationNode
+        }
         if animated {
             switch content {
                 case let .image(image):
@@ -127,7 +159,12 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
                     self.avatarNode.setPeer(context: self.context, theme: self.theme, peer: peer)
                     self.iconNode.isHidden = true
                     self.avatarNode.isHidden = false
-                    
+                    self.animationNode?.isHidden = true
+                case let .more(image):
+                    self.iconNode.image = image
+                    self.iconNode.isHidden = false
+                    self.avatarNode.isHidden = true
+                    self.animationNode?.isHidden = false
             }
         } else {
             self.content = content
@@ -140,6 +177,12 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
                     self.avatarNode.setPeer(context: self.context, theme: self.theme, peer: peer)
                     self.iconNode.isHidden = true
                     self.avatarNode.isHidden = false
+                    self.animationNode?.isHidden = true
+                case let .more(image):
+                    self.iconNode.image = image
+                    self.iconNode.isHidden = false
+                    self.avatarNode.isHidden = true
+                    self.animationNode?.isHidden = false
             }
         }
     }
@@ -150,9 +193,13 @@ final class VoiceChatHeaderButton: HighlightableButtonNode {
     }
     
     override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
-        return CGSize(width: 28.0, height: 28.0)
+        return CGSize(width: wide ? 38.0 : 28.0, height: 28.0)
     }
         
     func onLayout() {
     }
+    
+    func play() {
+        self.animationNode?.playOnce()
+    }
 }
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift
index 577f352ffb..341328fba7 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatInfoContextItem.swift
@@ -17,7 +17,7 @@ public final class VoiceChatInfoContextItem: ContextMenuCustomItem {
         self.icon = icon
     }
     
-    public func node(presentationData: PresentationData, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
+    public func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
         return VoiceChatInfoContextItemNode(presentationData: presentationData, item: self, getController: getController, actionSelected: actionSelected)
     }
 }
@@ -25,14 +25,14 @@ public final class VoiceChatInfoContextItem: ContextMenuCustomItem {
 private final class VoiceChatInfoContextItemNode: ASDisplayNode, ContextMenuCustomNode {
     private let item: VoiceChatInfoContextItem
     private let presentationData: PresentationData
-    private let getController: () -> ContextController?
+    private let getController: () -> ContextControllerProtocol?
     private let actionSelected: (ContextMenuActionResult) -> Void
     
     private let backgroundNode: ASDisplayNode
     private let textNode: ImmediateTextNode
     private let iconNode: ASImageNode
     
-    init(presentationData: PresentationData, item: VoiceChatInfoContextItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
+    init(presentationData: PresentationData, item: VoiceChatInfoContextItem, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
         self.item = item
         self.presentationData = presentationData
         self.getController = getController
@@ -73,7 +73,7 @@ private final class VoiceChatInfoContextItemNode: ASDisplayNode, ContextMenuCust
         let standardIconWidth: CGFloat = 32.0
         var rightTextInset: CGFloat = sideInset
         if !iconSize.width.isZero {
-            rightTextInset = max(iconSize.width, standardIconWidth) + iconSideInset + sideInset - 8.0
+            rightTextInset = max(iconSize.width, standardIconWidth) + iconSideInset + sideInset - 12.0
         }
     
         let textSize = self.textNode.updateLayout(CGSize(width: constrainedWidth - sideInset - rightTextInset, height: .greatestFiniteMagnitude))
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift
index e4c8d97308..2c1ecb5060 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatJoinScreen.swift
@@ -14,6 +14,7 @@ import PresentationDataUtils
 import PeerInfoUI
 import ShareController
 import AvatarNode
+import UndoUI
 
 public final class VoiceChatJoinScreen: ViewController {
     private var controllerNode: Node {
@@ -71,7 +72,7 @@ public final class VoiceChatJoinScreen: ViewController {
         let context = self.context
         let peerId = self.peerId
         let invite = self.invite
-        let signal = updatedCurrentPeerGroupCall(account: context.account, peerId: peerId)
+        let signal = context.engine.calls.updatedCurrentPeerGroupCall(peerId: peerId)
         |> castError(GetCurrentGroupCallError.self)
         |> mapToSignal { call -> Signal<(Peer, GroupCallSummary)?, GetCurrentGroupCallError> in
             if let call = call {
@@ -79,7 +80,7 @@ public final class VoiceChatJoinScreen: ViewController {
                     return transaction.getPeer(peerId)
                 }
                 |> castError(GetCurrentGroupCallError.self)
-                return combineLatest(peer, getCurrentGroupCall(account: context.account, callId: call.id, accessHash: call.accessHash))
+                return combineLatest(peer, context.engine.calls.getCurrentGroupCall(callId: call.id, accessHash: call.accessHash))
                 |> map { peer, call -> (Peer, GroupCallSummary)? in
                     if let peer = peer, let call = call {
                         return (peer, call)
@@ -124,7 +125,7 @@ public final class VoiceChatJoinScreen: ViewController {
             currentGroupCall = .single(nil)
         }
             
-        self.disposable.set(combineLatest(queue: Queue.mainQueue(), signal, cachedGroupCallDisplayAsAvailablePeers(account: context.account, peerId: peerId) |> castError(GetCurrentGroupCallError.self), cachedData, currentGroupCall).start(next: { [weak self] peerAndCall, availablePeers, cachedData, currentGroupCallIdAndCanUnmute in
+        self.disposable.set(combineLatest(queue: Queue.mainQueue(), signal, context.engine.calls.cachedGroupCallDisplayAsAvailablePeers(peerId: peerId) |> castError(GetCurrentGroupCallError.self), cachedData, currentGroupCall).start(next: { [weak self] peerAndCall, availablePeers, cachedData, currentGroupCallIdAndCanUnmute in
             if let strongSelf = self {
                 if let (peer, call) = peerAndCall {
                     if let (currentGroupCall, currentGroupCallId, canUnmute) = currentGroupCallIdAndCanUnmute, call.info.id == currentGroupCallId {
@@ -143,8 +144,8 @@ public final class VoiceChatJoinScreen: ViewController {
                     } else if let cachedData = cachedData as? CachedGroupData {
                         defaultJoinAsPeerId = cachedData.callJoinPeerId
                     }
-                                    
-                    let activeCall = CachedChannelData.ActiveCall(id: call.info.id, accessHash: call.info.accessHash, title: call.info.title)
+                    
+                    let activeCall = CachedChannelData.ActiveCall(id: call.info.id, accessHash: call.info.accessHash, title: call.info.title, scheduleTimestamp: call.info.scheduleTimestamp, subscribedToScheduled: call.info.subscribedToScheduled)
                     if availablePeers.count > 0 && defaultJoinAsPeerId == nil {
                         strongSelf.dismiss()
                         strongSelf.join(activeCall)
@@ -152,7 +153,8 @@ public final class VoiceChatJoinScreen: ViewController {
                         strongSelf.controllerNode.setPeer(call: activeCall, peer: peer, title: call.info.title, memberCount: call.info.participantCount)
                     }
                 } else {
-                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.InviteLinks_InviteLinkExpired, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                    strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .linkRevoked(text: presentationData.strings.InviteLinks_InviteLinkExpired), elevatedLayout: true, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
                     strongSelf.dismiss()
                 }
             }
@@ -181,7 +183,7 @@ public final class VoiceChatJoinScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 
     class Node: ViewControllerTracingNode, UIScrollViewDelegate {
@@ -513,10 +515,16 @@ public final class VoiceChatJoinScreen: ViewController {
                 self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
                 
                 let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
-                
                 let dimPosition = self.dimNode.layer.position
-                self.dimNode.layer.animatePosition(from: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), to: dimPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                self.layer.animateBoundsOriginYAdditive(from: -offset, to: 0.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                
+                let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+                let targetBounds = self.bounds
+                self.bounds = self.bounds.offsetBy(dx: 0.0, dy: -offset)
+                self.dimNode.position = CGPoint(x: dimPosition.x, y: dimPosition.y - offset)
+                transition.animateView({
+                    self.bounds = targetBounds
+                    self.dimNode.position = dimPosition
+                })
             }
         }
         
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatMainStageNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatMainStageNode.swift
new file mode 100644
index 0000000000..c4bde166a4
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatMainStageNode.swift
@@ -0,0 +1,1338 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramPresentationData
+import TelegramUIPreferences
+import TelegramStringFormatting
+import TelegramVoip
+import TelegramAudio
+import AccountContext
+import Postbox
+import TelegramCore
+import SyncCore
+import AppBundle
+import PresentationDataUtils
+import AvatarNode
+import AudioBlob
+import TextFormat
+import Markdown
+import ContextUI
+
+private let backArrowImage = NavigationBarTheme.generateBackArrowImage(color: .white)
+private let backgroundCornerRadius: CGFloat = 11.0
+private let fadeColor = UIColor(rgb: 0x000000, alpha: 0.5)
+private let destructiveColor: UIColor = UIColor(rgb: 0xff3b30)
+
+private class VoiceChatPinButtonNode: HighlightTrackingButtonNode {
+    private let pinButtonIconNode: VoiceChatPinNode
+    private let pinButtonClippingnode: ASDisplayNode
+    private let pinButtonTitleNode: ImmediateTextNode
+    
+    init(presentationData: PresentationData) {
+        self.pinButtonIconNode = VoiceChatPinNode()
+        self.pinButtonClippingnode = ASDisplayNode()
+        self.pinButtonClippingnode.clipsToBounds = true
+    
+        self.pinButtonTitleNode = ImmediateTextNode()
+        self.pinButtonTitleNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_Unpin, font: Font.regular(17.0), textColor: .white)
+        self.pinButtonTitleNode.alpha = 0.0
+    
+        super.init()
+        
+        self.addSubnode(self.pinButtonClippingnode)
+        self.addSubnode(self.pinButtonIconNode)
+        self.pinButtonClippingnode.addSubnode(self.pinButtonTitleNode)
+        
+        self.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.pinButtonClippingnode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.pinButtonIconNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.pinButtonClippingnode.alpha = 0.4
+                    strongSelf.pinButtonIconNode.alpha = 0.4
+                } else {
+                    strongSelf.pinButtonClippingnode.alpha = 1.0
+                    strongSelf.pinButtonIconNode.alpha = 1.0
+                    strongSelf.pinButtonClippingnode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    strongSelf.pinButtonIconNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                }
+            }
+        }
+    }
+    
+    private var isPinned = false
+    func update(pinned: Bool, animated: Bool) {
+        let wasPinned = self.isPinned
+        self.pinButtonIconNode.update(state: .init(pinned: pinned, color: .white), animated: true)
+        self.isPinned = pinned
+        
+        self.pinButtonTitleNode.alpha = self.isPinned ? 1.0 : 0.0
+        if animated && pinned != wasPinned {
+            if wasPinned {
+                self.pinButtonTitleNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+                self.pinButtonTitleNode.layer.animatePosition(from: CGPoint(), to: CGPoint(x: self.pinButtonTitleNode.frame.width, y: 0.0), duration: 0.2, additive: true)
+            } else {
+                self.pinButtonTitleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                self.pinButtonTitleNode.layer.animatePosition(from: CGPoint(x: self.pinButtonTitleNode.frame.width, y: 0.0), to: CGPoint(), duration: 0.2, additive: true)
+            }
+        }
+    }
+    
+    func update(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+        let unpinSize = self.pinButtonTitleNode.updateLayout(size)
+        let pinIconSize = CGSize(width: 48.0, height: 48.0)
+        let totalSize = CGSize(width: unpinSize.width + pinIconSize.width, height: 44.0)
+        
+        transition.updateFrame(node: self.pinButtonIconNode, frame: CGRect(origin: CGPoint(x: totalSize.width - pinIconSize.width, y: 0.0), size: pinIconSize))
+        transition.updateFrame(node: self.pinButtonTitleNode, frame: CGRect(origin: CGPoint(x: 4.0, y: 12.0), size: unpinSize))
+        transition.updateFrame(node: self.pinButtonClippingnode, frame: CGRect(x: 0.0, y: 0.0, width: totalSize.width - pinIconSize.width * 0.6667, height: 44.0))
+        
+        return totalSize
+    }
+}
+
+final class VoiceChatMainStageNode: ASDisplayNode {
+    private let context: AccountContext
+    private let call: PresentationGroupCall
+    private var currentPeer: (PeerId, String?, Bool, Bool, Bool)?
+    private var currentPeerEntry: VoiceChatPeerEntry?
+        
+    var callState: PresentationGroupCallState?
+    
+    private var currentVideoNode: GroupVideoNode?
+        
+    private let backgroundNode: ASDisplayNode
+    private let topFadeNode: ASDisplayNode
+    private let bottomFadeNode: ASDisplayNode
+    private let bottomGradientNode: ASDisplayNode
+    private let bottomFillNode: ASDisplayNode
+    private let headerNode: ASDisplayNode
+    private let backButtonNode: HighlightableButtonNode
+    private let backButtonArrowNode: ASImageNode
+    private let pinButtonNode: VoiceChatPinButtonNode
+    private let audioLevelNode: VoiceChatBlobNode
+    private let audioLevelDisposable = MetaDisposable()
+    private let speakingPeerDisposable = MetaDisposable()
+    private let speakingAudioLevelDisposable = MetaDisposable()
+    private var backdropAvatarNode: ImageNode
+    private var avatarNode: ImageNode
+    private let titleNode: ImmediateTextNode
+    private let microphoneNode: VoiceChatMicrophoneNode
+    private let placeholderTextNode: ImmediateTextNode
+    private let placeholderIconNode: ASImageNode
+    private let placeholderButton: HighlightTrackingButtonNode
+    private var placeholderButtonEffectView: UIVisualEffectView?
+    private let placeholderButtonHighlightNode: ASDisplayNode
+    private let placeholderButtonTextNode: ImmediateTextNode
+    
+    private let speakingContainerNode: ASDisplayNode
+    private var speakingEffectView: UIVisualEffectView?
+    private let speakingAvatarNode: AvatarNode
+    private let speakingTitleNode: ImmediateTextNode
+    private var speakingAudioLevelView: VoiceBlobView?
+    
+    private var validLayout: (CGSize, CGFloat, CGFloat, Bool, Bool)?
+    
+    var tapped: (() -> Void)?
+    var back: (() -> Void)?
+    var togglePin: (() -> Void)?
+    var switchTo: ((PeerId) -> Void)?
+    var stopScreencast: (() -> Void)?
+    
+    var controlsHidden: ((Bool) -> Void)?
+    
+    var getAudioLevel: ((PeerId) -> Signal<Float, NoError>)?
+    var getVideo: ((String, Bool, @escaping (GroupVideoNode?) -> Void) -> Void)?
+    private let videoReadyDisposable = MetaDisposable()
+    private var silenceTimer: SwiftSignalKit.Timer?
+        
+    init(context: AccountContext, call: PresentationGroupCall) {
+        self.context = context
+        self.call = call
+        
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.alpha = 0.0
+        self.backgroundNode.backgroundColor = UIColor(rgb: 0x1c1c1e)
+        
+        self.topFadeNode = ASDisplayNode()
+        self.topFadeNode.alpha = 0.0
+        self.topFadeNode.displaysAsynchronously = false
+        if let image = generateImage(CGSize(width: fadeHeight, height: fadeHeight), rotatedContext: { size, context in
+            let bounds = CGRect(origin: CGPoint(), size: size)
+            context.clear(bounds)
+            
+            let colorsArray = [fadeColor.cgColor, fadeColor.withAlphaComponent(0.0).cgColor] as CFArray
+            var locations: [CGFloat] = [1.0, 0.0]
+            let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
+            context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+        }) {
+            self.topFadeNode.backgroundColor = UIColor(patternImage: image)
+        }
+        
+        self.bottomFadeNode = ASDisplayNode()
+        
+        self.bottomGradientNode = ASDisplayNode()
+        self.bottomGradientNode.displaysAsynchronously = false
+        if let image = generateImage(CGSize(width: fadeHeight, height: fadeHeight), rotatedContext: { size, context in
+            let bounds = CGRect(origin: CGPoint(), size: size)
+            context.clear(bounds)
+            
+            let colorsArray = [fadeColor.withAlphaComponent(0.0).cgColor, fadeColor.cgColor] as CFArray
+            var locations: [CGFloat] = [1.0, 0.0]
+            let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
+            context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+        }) {
+            self.bottomGradientNode.backgroundColor = UIColor(patternImage: image)
+        }
+        
+        self.bottomFillNode = ASDisplayNode()
+        self.bottomFillNode.backgroundColor = fadeColor
+        
+        self.headerNode = ASDisplayNode()
+        self.headerNode.alpha = 0.0
+        
+        self.backButtonArrowNode = ASImageNode()
+        self.backButtonArrowNode.displayWithoutProcessing = true
+        self.backButtonArrowNode.displaysAsynchronously = false
+        self.backButtonArrowNode.image = NavigationBarTheme.generateBackArrowImage(color: .white)
+        self.backButtonNode = HighlightableButtonNode()
+        
+        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+        
+        self.pinButtonNode = VoiceChatPinButtonNode(presentationData: presentationData)
+        
+        self.backdropAvatarNode = ImageNode()
+        self.backdropAvatarNode.contentMode = .scaleAspectFill
+        self.backdropAvatarNode.displaysAsynchronously = false
+        
+        self.audioLevelNode = VoiceChatBlobNode(size: CGSize(width: 300.0, height: 300.0))
+        
+        self.avatarNode = ImageNode()
+        self.avatarNode.displaysAsynchronously = false
+        self.avatarNode.isHidden = true
+        
+        self.titleNode = ImmediateTextNode()
+        self.titleNode.alpha = 0.0
+        self.titleNode.displaysAsynchronously = false
+        self.titleNode.isUserInteractionEnabled = false
+        
+        self.microphoneNode = VoiceChatMicrophoneNode()
+        self.microphoneNode.alpha = 0.0
+        
+        self.speakingContainerNode = ASDisplayNode()
+        self.speakingContainerNode.alpha = 0.0
+        
+        self.speakingAvatarNode = AvatarNode(font: avatarPlaceholderFont(size: 14.0))
+        self.speakingTitleNode = ImmediateTextNode()
+        self.speakingTitleNode.displaysAsynchronously = false
+        
+        self.placeholderTextNode = ImmediateTextNode()
+        self.placeholderTextNode.alpha = 0.0
+        self.placeholderTextNode.maximumNumberOfLines = 2
+        self.placeholderTextNode.textAlignment = .center
+        
+        self.placeholderIconNode = ASImageNode()
+        self.placeholderIconNode.alpha = 0.0
+        self.placeholderIconNode.contentMode = .scaleAspectFit
+        self.placeholderIconNode.displaysAsynchronously = false
+        
+        self.placeholderButton = HighlightTrackingButtonNode()
+        self.placeholderButton.alpha = 0.0
+        self.placeholderButton.clipsToBounds = true
+        self.placeholderButton.cornerRadius = backgroundCornerRadius
+            
+        self.placeholderButtonHighlightNode = ASDisplayNode()
+        self.placeholderButtonHighlightNode.alpha = 0.0
+        self.placeholderButtonHighlightNode.backgroundColor = UIColor(white: 1.0, alpha: 0.4)
+        self.placeholderButtonHighlightNode.isUserInteractionEnabled = false
+             
+        self.placeholderButtonTextNode = ImmediateTextNode()
+        self.placeholderButtonTextNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_StopScreenSharingShort, font: Font.semibold(17.0), textColor: .white)
+        self.placeholderButtonTextNode.isUserInteractionEnabled = false
+        
+        super.init()
+        
+        self.clipsToBounds = true
+        self.cornerRadius = backgroundCornerRadius
+        
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.backdropAvatarNode)
+        self.addSubnode(self.topFadeNode)
+        self.addSubnode(self.bottomFadeNode)
+        self.bottomFadeNode.addSubnode(self.bottomGradientNode)
+        self.bottomFadeNode.addSubnode(self.bottomFillNode)
+        self.addSubnode(self.audioLevelNode)
+        self.addSubnode(self.avatarNode)
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.microphoneNode)
+        self.addSubnode(self.headerNode)
+        self.headerNode.addSubnode(self.backButtonNode)
+        self.headerNode.addSubnode(self.backButtonArrowNode)
+        self.headerNode.addSubnode(self.pinButtonNode)
+        
+        self.addSubnode(self.placeholderIconNode)
+        self.addSubnode(self.placeholderTextNode)
+        
+        self.addSubnode(self.placeholderButton)
+        self.placeholderButton.addSubnode(self.placeholderButtonHighlightNode)
+        self.placeholderButton.addSubnode(self.placeholderButtonTextNode)
+        self.placeholderButton.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.placeholderButtonHighlightNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.placeholderButtonHighlightNode.alpha = 1.0
+                } else {
+                    strongSelf.placeholderButtonHighlightNode.alpha = 0.0
+                    strongSelf.placeholderButtonHighlightNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+                }
+            }
+        }
+        self.placeholderButton.addTarget(self, action: #selector(self.stopSharingPressed), forControlEvents: .touchUpInside)
+        
+        self.addSubnode(self.speakingContainerNode)
+        self.speakingContainerNode.addSubnode(self.speakingAvatarNode)
+        self.speakingContainerNode.addSubnode(self.speakingTitleNode)
+
+        self.backButtonNode.setTitle(presentationData.strings.Common_Back, with: Font.regular(17.0), with: .white, for: [])
+        self.backButtonNode.hitTestSlop = UIEdgeInsets(top: -8.0, left: -20.0, bottom: -8.0, right: -8.0)
+        self.backButtonNode.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.backButtonNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.backButtonArrowNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.backButtonNode.alpha = 0.4
+                    strongSelf.backButtonArrowNode.alpha = 0.4
+                } else {
+                    strongSelf.backButtonNode.alpha = 1.0
+                    strongSelf.backButtonArrowNode.alpha = 1.0
+                    strongSelf.backButtonNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    strongSelf.backButtonArrowNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                }
+            }
+        }
+        self.backButtonNode.addTarget(self, action: #selector(self.backPressed), forControlEvents: .touchUpInside)
+        self.pinButtonNode.addTarget(self, action: #selector(self.pinPressed), forControlEvents: .touchUpInside)
+    }
+    
+    deinit {
+        self.videoReadyDisposable.dispose()
+        self.audioLevelDisposable.dispose()
+        self.speakingPeerDisposable.dispose()
+        self.speakingAudioLevelDisposable.dispose()
+        self.silenceTimer?.invalidate()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.layer.cornerCurve = .continuous
+        }
+        
+        self.topFadeNode.view.layer.rasterizationScale = UIScreen.main.scale
+        self.topFadeNode.view.layer.shouldRasterize = true
+        self.bottomFadeNode.view.layer.rasterizationScale = UIScreen.main.scale
+        self.bottomFadeNode.view.layer.shouldRasterize = true
+        
+        let speakingEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
+        speakingEffectView.layer.cornerRadius = 19.0
+        speakingEffectView.clipsToBounds = true
+        if #available(iOS 13.0, *) {
+            speakingEffectView.layer.cornerCurve = .continuous
+        }
+        self.speakingContainerNode.view.insertSubview(speakingEffectView, at: 0)
+        self.speakingEffectView = speakingEffectView
+        
+        let placeholderButtonEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
+        placeholderButtonEffectView.isUserInteractionEnabled = false
+        self.placeholderButton.view.insertSubview(placeholderButtonEffectView, at: 0)
+        self.placeholderButtonEffectView = placeholderButtonEffectView
+        
+        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap)))
+        self.speakingContainerNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.speakingTap)))
+    }
+    
+    @objc private func tap() {
+        self.tapped?()
+    }
+    
+    @objc private func speakingTap() {
+        if let peerId = self.effectiveSpeakingPeerId {
+            self.switchTo?(peerId)
+            self.update(speakingPeerId: nil)
+        }
+    }
+    
+    @objc private func backPressed() {
+        self.back?()
+    }
+    
+    @objc private func pinPressed() {
+        self.togglePin?()
+    }
+    
+    @objc private func stopSharingPressed() {
+        self.stopScreencast?()
+    }
+    
+    var visibility = true {
+        didSet {
+            if let videoNode = self.currentVideoNode, videoNode.supernode === self {
+                videoNode.updateIsEnabled(self.visibility)
+            }
+        }
+    }
+    
+    var animating: Bool {
+        return self.animatingIn || self.animatingOut
+    }
+    
+    private var animatingIn = false
+    private var animatingOut = false
+    private var appeared = false
+    
+    func animateTransitionIn(from sourceNode: ASDisplayNode, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
+        guard let sourceNode = sourceNode as? VoiceChatTileItemNode, let _ = sourceNode.item, let (_, sideInset, bottomInset, isLandscape, isTablet) = self.validLayout else {
+            return
+        }
+        self.appeared = true
+        
+        self.backgroundNode.alpha = 0.0
+        self.topFadeNode.alpha = 0.0
+        self.titleNode.alpha = 0.0
+        self.microphoneNode.alpha = 0.0
+        self.headerNode.alpha = 0.0
+        
+        let hasPlaceholder = !self.placeholderIconNode.alpha.isZero
+                
+        let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
+        alphaTransition.updateAlpha(node: self.backgroundNode, alpha: 1.0)
+        alphaTransition.updateAlpha(node: self.topFadeNode, alpha: 1.0)
+        alphaTransition.updateAlpha(node: self.titleNode, alpha: 1.0)
+        alphaTransition.updateAlpha(node: self.microphoneNode, alpha: 1.0)
+        alphaTransition.updateAlpha(node: self.headerNode, alpha: 1.0)
+        if hasPlaceholder {
+            self.placeholderIconNode.alpha = 0.0
+            self.placeholderTextNode.alpha = 0.0
+            alphaTransition.updateAlpha(node: self.placeholderTextNode, alpha: 1.0)
+            
+            if !self.placeholderButton.alpha.isZero {
+                self.placeholderButton.alpha = 0.0
+                alphaTransition.updateAlpha(node: self.placeholderButton, alpha: 1.0)
+            }
+        }
+        
+        let targetFrame = self.frame
+        
+        if let snapshotView = sourceNode.infoNode.view.snapshotView(afterScreenUpdates: false) {
+            self.view.addSubview(snapshotView)
+            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                snapshotView?.removeFromSuperview()
+            })
+            var infoFrame = snapshotView.frame
+            infoFrame.origin.x = sideInset
+            infoFrame.origin.y = targetFrame.height - infoFrame.height - (sideInset.isZero ? bottomInset : 14.0)
+            transition.updateFrame(view: snapshotView, frame: infoFrame)
+        }
+                        
+        self.animatingIn = true
+        let startLocalFrame = sourceNode.view.convert(sourceNode.bounds, to: self.supernode?.view)
+        self.update(size: startLocalFrame.size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, force: true, transition: .immediate)
+        self.frame = startLocalFrame
+        self.update(size: targetFrame.size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, force: true, transition: transition)
+        transition.updateFrame(node: self, frame: targetFrame, completion: { [weak self] _ in
+            sourceNode.alpha = 1.0
+            self?.animatingIn = false
+            completion()
+        })
+        
+        if hasPlaceholder, let iconSnapshotView = sourceNode.placeholderIconNode.view.snapshotView(afterScreenUpdates: false), let textSnapshotView = sourceNode.placeholderTextNode.view.snapshotView(afterScreenUpdates: false) {
+            iconSnapshotView.frame = sourceNode.placeholderIconNode.frame
+            self.view.addSubview(iconSnapshotView)
+            textSnapshotView.frame = sourceNode.placeholderTextNode.frame
+            self.view.addSubview(textSnapshotView)
+            transition.updatePosition(layer: iconSnapshotView.layer, position: self.placeholderIconNode.position, completion: { [weak self, weak iconSnapshotView] _ in
+                iconSnapshotView?.removeFromSuperview()
+                self?.placeholderIconNode.alpha = 1.0
+            })
+            transition.updateTransformScale(layer: iconSnapshotView.layer, scale: 2.0)
+            textSnapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak textSnapshotView] _ in
+                textSnapshotView?.removeFromSuperview()
+            })
+            let textPosition =  self.placeholderTextNode.position
+            self.placeholderTextNode.position = textSnapshotView.center
+            transition.updatePosition(layer: textSnapshotView.layer, position: textPosition)
+            transition.updatePosition(node: self.placeholderTextNode, position: textPosition)
+        }
+    }
+    
+    func animateTransitionOut(to targetNode: ASDisplayNode?, offset: CGFloat, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void) {
+        guard let (_, sideInset, bottomInset, isLandscape, isTablet) = self.validLayout else {
+            return
+        }
+        
+        self.appeared = false
+        
+        let hasPlaceholder = !self.placeholderIconNode.alpha.isZero
+                
+        let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
+        if offset.isZero {
+            alphaTransition.updateAlpha(node: self.backgroundNode, alpha: 0.0)
+        } else {
+            self.backgroundNode.alpha = 0.0
+            
+            self.microphoneNode.alpha = 1.0
+            self.titleNode.alpha = 1.0
+            self.bottomFadeNode.alpha = 1.0
+        }
+        alphaTransition.updateAlpha(node: self.topFadeNode, alpha: 0.0)
+        alphaTransition.updateAlpha(node: self.titleNode, alpha: 0.0)
+        alphaTransition.updateAlpha(node: self.microphoneNode, alpha: 0.0)
+        alphaTransition.updateAlpha(node: self.headerNode, alpha: 0.0)
+        alphaTransition.updateAlpha(node: self.bottomFadeNode, alpha: 1.0)
+        if hasPlaceholder {
+            alphaTransition.updateAlpha(node: self.placeholderTextNode, alpha: 0.0)
+            if !self.placeholderButton.alpha.isZero {
+                self.placeholderButton.alpha = 0.0
+                self.placeholderButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            }
+        }
+        
+        let originalFrame = self.frame
+        let initialFrame = originalFrame.offsetBy(dx: 0.0, dy: offset)
+        guard let targetNode = targetNode as? VoiceChatTileItemNode, let _ = targetNode.item else {
+            guard let supernode = self.supernode else {
+                completion()
+                return
+            }
+            self.animatingOut = true
+            self.frame = initialFrame
+            if offset < 0.0 {
+                let targetFrame = CGRect(origin: CGPoint(x: 0.0, y: -originalFrame.size.height), size: originalFrame.size)
+                transition.updateFrame(node: self, frame: targetFrame, completion: { [weak self] _ in
+                    self?.frame = originalFrame
+                    completion()
+                    self?.animatingOut = false
+                })
+            } else {
+                let targetFrame = CGRect(origin: CGPoint(x: 0.0, y: supernode.frame.height), size: originalFrame.size)
+                transition.updateFrame(node: self, frame: targetFrame, completion: { [weak self] _ in
+                    self?.frame = originalFrame
+                    completion()
+                    self?.animatingOut = false
+                })
+            }
+            return
+        }
+        
+        targetNode.isHidden = false
+        if offset.isZero {
+            targetNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+        }
+                
+        self.animatingOut = true
+        let targetFrame = targetNode.view.convert(targetNode.bounds, to: self.supernode?.view)
+        
+        let currentVideoNode = self.currentVideoNode
+        
+        var infoView: UIView?
+        if let snapshotView = targetNode.infoNode.view.snapshotView(afterScreenUpdates: false) {
+            infoView = snapshotView
+            self.view.addSubview(snapshotView)
+            snapshotView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, removeOnCompletion: false)
+            var infoFrame = snapshotView.frame
+            infoFrame.origin.y = initialFrame.height - infoFrame.height - (sideInset.isZero ? bottomInset : 14.0)
+            snapshotView.frame = infoFrame
+            transition.updateFrame(view: snapshotView, frame: CGRect(origin: CGPoint(), size: targetFrame.size))
+        }
+                
+        targetNode.alpha = 0.0
+        
+        self.frame = initialFrame
+        
+        let textPosition = self.placeholderTextNode.position
+        var textTargetPosition = textPosition
+        var textView: UIView?
+        if hasPlaceholder, let iconSnapshotView = targetNode.placeholderIconNode.view.snapshotView(afterScreenUpdates: false), let textSnapshotView = targetNode.placeholderTextNode.view.snapshotView(afterScreenUpdates: false) {
+            self.view.addSubview(iconSnapshotView)
+            self.view.addSubview(textSnapshotView)
+            iconSnapshotView.transform = CGAffineTransform(scaleX: 2.0, y: 2.0)
+            iconSnapshotView.center = self.placeholderIconNode.position
+            textSnapshotView.center = textPosition
+            textTargetPosition = targetNode.placeholderTextNode.position
+            
+            self.placeholderIconNode.alpha = 0.0
+            transition.updatePosition(layer: iconSnapshotView.layer, position: targetNode.placeholderIconNode.position, completion: { [weak self, weak iconSnapshotView] _ in
+                iconSnapshotView?.removeFromSuperview()
+                self?.placeholderIconNode.alpha = 1.0
+            })
+            transition.updateTransformScale(layer: iconSnapshotView.layer, scale: 1.0)
+            
+            textView = textSnapshotView
+            textSnapshotView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, removeOnCompletion: false)
+        }
+        
+        self.update(size: targetFrame.size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, force: true, transition: transition)
+        transition.updateFrame(node: self, frame: targetFrame, completion: { [weak self] _ in
+            if let strongSelf = self {
+                completion()
+                
+                infoView?.removeFromSuperview()
+                textView?.removeFromSuperview()
+                currentVideoNode?.isMainstageExclusive = false
+                targetNode.transitionIn(from: nil)
+                targetNode.alpha = 1.0
+                targetNode.highlightNode.layer.animateAlpha(from: 0.0, to: targetNode.highlightNode.alpha, duration: 0.2)
+                strongSelf.animatingOut = false
+                strongSelf.frame = originalFrame
+                strongSelf.update(size: initialFrame.size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+            }
+        })
+        
+        if hasPlaceholder {
+            self.placeholderTextNode.position = textPosition
+            if let textSnapshotView = textView {
+                transition.updatePosition(layer: textSnapshotView.layer, position: textTargetPosition)
+            }
+            transition.updatePosition(node: self.placeholderTextNode, position: textTargetPosition)
+        }
+        
+        self.update(speakingPeerId: nil)
+    }
+    
+    private var effectiveSpeakingPeerId: PeerId?
+    private func updateSpeakingPeer() {
+        guard let (_, _, _, _, isTablet) = self.validLayout else {
+            return
+        }
+        var effectiveSpeakingPeerId = self.speakingPeerId
+        if let peerId = effectiveSpeakingPeerId, self.currentPeer?.0 == peerId || self.callState?.myPeerId == peerId || isTablet {
+            effectiveSpeakingPeerId = nil
+        }
+        guard self.effectiveSpeakingPeerId != effectiveSpeakingPeerId else {
+            return
+        }
+        self.effectiveSpeakingPeerId = effectiveSpeakingPeerId
+        if let getAudioLevel = self.getAudioLevel, let peerId = effectiveSpeakingPeerId {
+            let wavesColor = UIColor(rgb: 0x34c759)
+            if let speakingAudioLevelView = self.speakingAudioLevelView {
+                speakingAudioLevelView.removeFromSuperview()
+                self.speakingAudioLevelView = nil
+            }
+            
+            self.speakingPeerDisposable.set((self.context.account.postbox.loadedPeerWithId(peerId)
+            |> deliverOnMainQueue).start(next: { [weak self] peer in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    strongSelf.speakingAvatarNode.setPeer(context: strongSelf.context, theme: presentationData.theme, peer: peer)
+                
+                let bodyAttributes = MarkdownAttributeSet(font: Font.regular(15.0), textColor: .white, additionalAttributes: [:])
+                let boldAttributes = MarkdownAttributeSet(font: Font.semibold(15.0), textColor: .white, additionalAttributes: [:])
+                let attributedText = addAttributesToStringWithRanges(presentationData.strings.VoiceChat_ParticipantIsSpeaking(peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)), body: bodyAttributes, argumentAttributes: [0: boldAttributes])
+                strongSelf.speakingTitleNode.attributedText = attributedText
+
+                strongSelf.speakingContainerNode.alpha = 0.0
+                
+                if let (size, sideInset, bottomInset, isLandscape, isTablet) = strongSelf.validLayout {
+                    strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+                }
+                
+                strongSelf.speakingContainerNode.alpha = 1.0
+                strongSelf.speakingContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                strongSelf.speakingContainerNode.layer.animateScale(from: 0.01, to: 1.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                
+                let blobFrame = strongSelf.speakingAvatarNode.frame.insetBy(dx: -12.0, dy: -12.0)
+                strongSelf.speakingAudioLevelDisposable.set((getAudioLevel(peerId)
+                |> deliverOnMainQueue).start(next: { [weak self] value in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    
+                    if strongSelf.speakingAudioLevelView == nil, value > 0.0 {
+                        let audioLevelView = VoiceBlobView(
+                            frame: blobFrame,
+                            maxLevel: 1.5,
+                            smallBlobRange: (0, 0),
+                            mediumBlobRange: (0.69, 0.87),
+                            bigBlobRange: (0.71, 1.0)
+                        )
+                        audioLevelView.setColor(wavesColor)
+                        audioLevelView.alpha = 1.0
+                        
+                        strongSelf.speakingAudioLevelView = audioLevelView
+                        strongSelf.speakingContainerNode.view.insertSubview(audioLevelView, belowSubview: strongSelf.speakingAvatarNode.view)
+                    }
+                    
+                    let level = min(1.5, max(0.0, CGFloat(value)))
+                    if let audioLevelView = strongSelf.speakingAudioLevelView {
+                        audioLevelView.updateLevel(CGFloat(value))
+                        
+                        let avatarScale: CGFloat
+                        if value > 0.02 {
+                            audioLevelView.startAnimating(immediately: true)
+                            avatarScale = 1.03 + level * 0.13
+                            audioLevelView.setColor(wavesColor, animated: true)
+                        } else {
+                            avatarScale = 1.0
+                        }
+                        
+                        let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
+                        transition.updateTransformScale(node: strongSelf.speakingAvatarNode, scale: avatarScale, beginWithCurrentState: true)
+                    }
+                }))
+            }))
+        } else {
+            self.speakingPeerDisposable.set(nil)
+            self.speakingAudioLevelDisposable.set(nil)
+            
+            let audioLevelView = self.speakingAudioLevelView
+            self.speakingAudioLevelView = nil
+            
+            if !self.speakingContainerNode.alpha.isZero {
+                self.speakingContainerNode.alpha = 0.0
+                self.speakingContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, completion: { _ in
+                    audioLevelView?.removeFromSuperview()
+                })
+                self.speakingContainerNode.layer.animateScale(from: 1.0, to: 0.01, duration: 0.3)
+            } else {
+                audioLevelView?.removeFromSuperview()
+            }
+        }
+    }
+    
+    private var visiblePeerIds = Set<PeerId>()
+    func update(visiblePeerIds: Set<PeerId>) {
+        self.visiblePeerIds = visiblePeerIds
+        self.updateSpeakingPeer()
+    }
+    
+    private var speakingPeerId: PeerId?
+    func update(speakingPeerId: PeerId?) {
+        self.speakingPeerId = speakingPeerId
+        self.updateSpeakingPeer()
+    }
+    
+    func update(peerEntry: VoiceChatPeerEntry, pinned: Bool) {
+        let previousPeerEntry = self.currentPeerEntry
+        self.currentPeerEntry = peerEntry
+                
+        let peer = peerEntry.peer
+        let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+        if !arePeersEqual(previousPeerEntry?.peer, peerEntry.peer) {
+            self.backdropAvatarNode.setSignal(peerAvatarCompleteImage(account: self.context.account, peer: peer, size: CGSize(width: 240.0, height: 240.0), round: false, font: avatarPlaceholderFont(size: 78.0), drawLetters: false, blurred: true))
+            self.avatarNode.setSignal(peerAvatarCompleteImage(account: self.context.account, peer: peer, size: CGSize(width: 180.0, height: 180.0), font: avatarPlaceholderFont(size: 78.0), fullSize: true))
+        }
+                
+        var gradient: VoiceChatBlobNode.Gradient = .active
+        var muted = false
+        var state = peerEntry.state
+        if let muteState = peerEntry.muteState, case .speaking = state, muteState.mutedByYou || !muteState.canUnmute {
+            state = .listening
+        }
+        var mutedForYou = false
+        switch state {
+            case .listening:
+                if let muteState = peerEntry.muteState {
+                    muted = true
+                    if muteState.mutedByYou {
+                        gradient = .mutedForYou
+                        mutedForYou = true
+                    } else if !muteState.canUnmute {
+                        gradient = .muted
+                    }
+                } else {
+                    gradient = .active
+                    muted = peerEntry.muteState != nil
+                }
+            case .speaking:
+                if let muteState = peerEntry.muteState, muteState.mutedByYou {
+                    gradient = .mutedForYou
+                    muted = true
+                    mutedForYou = true
+                } else {
+                    gradient = .speaking
+                    muted = false
+                }
+            default:
+                muted = true
+        }
+        
+        var microphoneColor = UIColor.white
+        var titleAttributedString = NSAttributedString(string: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), font: Font.semibold(15.0), textColor: .white)
+        if mutedForYou {
+            microphoneColor = destructiveColor
+            
+            let updatedString = NSMutableAttributedString(attributedString: titleAttributedString)
+            updatedString.append(NSAttributedString(string: " \(presentationData.strings.VoiceChat_StatusMutedForYou)", font: Font.regular(15.0), textColor: UIColor.white))
+            titleAttributedString = updatedString
+        }
+        self.titleNode.attributedText = titleAttributedString
+        if let (size, sideInset, bottomInset, isLandscape, isTablet) = self.validLayout {
+            self.update(size: size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+        }
+        
+        self.pinButtonNode.update(pinned: pinned, animated: true)
+        
+        self.audioLevelNode.startAnimating(immediately: true)
+        
+        if let getAudioLevel = self.getAudioLevel, previousPeerEntry?.peer.id != peerEntry.peer.id {
+            self.avatarNode.layer.removeAllAnimations()
+            self.avatarNode.transform = CATransform3DIdentity
+            self.audioLevelNode.updateGlowAndGradientAnimations(type: .active, animated: false)
+            self.audioLevelNode.updateLevel(0.0, immediately: true)
+            
+            self.audioLevelNode.isHidden = self.currentPeer?.1 != nil
+            self.audioLevelDisposable.set((getAudioLevel(peerEntry.peer.id)
+            |> deliverOnMainQueue).start(next: { [weak self] value in
+                guard let strongSelf = self else {
+                    return
+                }
+                                    
+                let level = min(1.5, max(0.0, CGFloat(value)))
+                
+                strongSelf.audioLevelNode.updateLevel(CGFloat(value), immediately: false)
+                    
+                let avatarScale: CGFloat
+                if value > 0.02 {
+                    avatarScale = 1.03 + level * 0.13
+                } else {
+                    avatarScale = 1.0
+                }
+                
+                let transition: ContainedViewLayoutTransition = .animated(duration: 0.15, curve: .easeInOut)
+                transition.updateTransformScale(node: strongSelf.avatarNode, scale: avatarScale, beginWithCurrentState: true)
+            }))
+        }
+        
+        self.audioLevelNode.updateGlowAndGradientAnimations(type: gradient, animated: true)
+        
+        self.microphoneNode.update(state: VoiceChatMicrophoneNode.State(muted: muted, filled: true, color: microphoneColor), animated: true)
+    }
+    
+    private func setAvatarHidden(_ hidden: Bool) {
+        self.topFadeNode.isHidden = !hidden
+        self.bottomFadeNode.isHidden = !hidden
+        self.avatarNode.isHidden = hidden
+        self.audioLevelNode.isHidden = hidden
+    }
+    
+    func update(peer: (peer: PeerId, endpointId: String?, isMyPeer: Bool, isPresentation: Bool, isPaused: Bool)?, isReady: Bool = true, waitForFullSize: Bool, completion: (() -> Void)? = nil) {
+        let previousPeer = self.currentPeer
+        if previousPeer?.0 == peer?.0 && previousPeer?.1 == peer?.1 && previousPeer?.2 == peer?.2 && previousPeer?.3 == peer?.3 && previousPeer?.4 == peer?.4 {
+            completion?()
+            return
+        }
+        self.currentPeer = peer
+       
+        self.updateSpeakingPeer()
+        
+        var isTablet = false
+        if let (_, _, _, _, isTabletValue) = self.validLayout {
+            isTablet = isTabletValue
+        }
+        
+        if let (_, endpointId, isMyPeer, isPresentation, isPaused) = peer {
+            let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+            
+            var showPlaceholder = false
+            if isMyPeer && isPresentation {
+                self.placeholderTextNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_YouAreSharingScreen, font: Font.semibold(15.0), textColor: .white)
+                self.placeholderIconNode.image = generateTintedImage(image: UIImage(bundleImageName: isTablet ? "Call/ScreenShareTablet" : "Call/ScreenSharePhone"), color: .white)
+                showPlaceholder = true
+            } else if isPaused {
+                self.placeholderTextNode.attributedText = NSAttributedString(string: presentationData.strings.VoiceChat_VideoPaused, font: Font.semibold(14.0), textColor: .white)
+                self.placeholderIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/Pause"), color: .white)
+                showPlaceholder = true
+            }
+            
+            let updatePlaceholderVisibility = {
+                let peerChanged = previousPeer?.0 != peer?.0
+                let transition: ContainedViewLayoutTransition = self.appeared && !peerChanged ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+                transition.updateAlpha(node: self.placeholderTextNode, alpha: showPlaceholder ? 1.0 : 0.0)
+                transition.updateAlpha(node: self.placeholderIconNode, alpha: showPlaceholder ? 1.0 : 0.0)
+                transition.updateAlpha(node: self.placeholderButton, alpha: showPlaceholder && !isPaused ? 1.0 : 0.0)
+            }
+            
+            if endpointId != previousPeer?.1 {
+                updatePlaceholderVisibility()
+                if let endpointId = endpointId {
+                    var delayTransition = false
+                    if previousPeer?.0 == peer?.0 && previousPeer?.1 == nil && self.appeared {
+                        delayTransition = true
+                    }                    
+                    if !delayTransition {
+                        self.setAvatarHidden(true)
+                    }
+                    
+                    var waitForFullSize = waitForFullSize
+                    if isMyPeer && !isPresentation && isReady && !self.appeared {
+                        waitForFullSize = false
+                    }
+                    
+                    self.getVideo?(endpointId, isMyPeer && !isPresentation, { [weak self] videoNode in
+                        Queue.mainQueue().async {
+                            guard let strongSelf = self, let videoNode = videoNode else {
+                                return
+                            }
+                            
+                            videoNode.isMainstageExclusive = isMyPeer && !isPresentation
+                            if videoNode.isMainstageExclusive {
+                                videoNode.storeSnapshot()
+                            }
+                            videoNode.tapped = { [weak self] in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.tap()
+                            }
+                            videoNode.sourceContainerNode.activate = { [weak self] sourceNode in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.setControlsHidden(true, animated: false)
+                                strongSelf.controlsHidden?(true)
+                                let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                                    return UIScreen.main.bounds
+                                })
+                                strongSelf.context.sharedContext.mainWindow?.presentInGlobalOverlay(pinchController)
+                            }
+                            videoNode.sourceContainerNode.animatedOut = { [weak self] in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.controlsHidden?(false)
+                                strongSelf.setControlsHidden(false, animated: true)
+                            }
+                            videoNode.updateIsBlurred(isBlurred: isPaused, light: true, animated: false)
+                            videoNode.isUserInteractionEnabled = true
+                            let previousVideoNode = strongSelf.currentVideoNode
+                            var previousVideoNodeSnapshot: UIView?
+                            if let previousVideoNode = previousVideoNode, previousVideoNode.isMainstageExclusive, let snapshotView = previousVideoNode.view.snapshotView(afterScreenUpdates: false) {
+                                previousVideoNodeSnapshot = snapshotView
+                                snapshotView.frame = previousVideoNode.frame
+                                previousVideoNode.view.superview?.insertSubview(snapshotView, aboveSubview: previousVideoNode.view)
+                            }
+                            strongSelf.currentVideoNode = videoNode
+                            strongSelf.insertSubnode(videoNode, aboveSubnode: strongSelf.backdropAvatarNode)
+
+                            if delayTransition {
+                                videoNode.alpha = 0.0
+                            } else if !isReady {
+                                videoNode.alpha = 0.0
+                                strongSelf.topFadeNode.isHidden = true
+                                strongSelf.bottomFadeNode.isHidden = true
+                            } else if isMyPeer {
+                                videoNode.layer.removeAnimation(forKey: "opacity")
+                                videoNode.alpha = 1.0
+                            }
+                            if waitForFullSize {
+                                previousVideoNode?.isMainstageExclusive = false
+                                Queue.mainQueue().after(2.0) {
+                                    previousVideoNodeSnapshot?.removeFromSuperview()
+                                    if let previousVideoNode = previousVideoNode, previousVideoNode.supernode === strongSelf && !previousVideoNode.isMainstageExclusive {
+                                        previousVideoNode.removeFromSupernode()
+                                    }
+                                }
+                                strongSelf.videoReadyDisposable.set((videoNode.ready
+                                |> filter { $0 }
+                                |> take(1)
+                                |> deliverOnMainQueue).start(next: { [weak self] _ in
+                                    Queue.mainQueue().after(0.1) {
+                                        guard let strongSelf = self else {
+                                            return
+                                        }
+                                        
+                                        if let (size, sideInset, bottomInset, isLandscape, isTablet) = strongSelf.validLayout {
+                                            strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+                                        }
+                                        
+                                        Queue.mainQueue().after(0.02) {
+                                            completion?()
+                                        }
+                                        
+                                        if videoNode.alpha.isZero {
+                                            if delayTransition {
+                                                strongSelf.topFadeNode.isHidden = false
+                                                strongSelf.bottomFadeNode.isHidden = false
+                                                strongSelf.topFadeNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                                                strongSelf.bottomFadeNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                                                strongSelf.avatarNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
+                                                strongSelf.audioLevelNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
+                                            }
+                                            if let videoNode = strongSelf.currentVideoNode {
+                                                videoNode.alpha = 1.0
+                                                videoNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in
+                                                    if let strongSelf = self {
+                                                        strongSelf.setAvatarHidden(true)
+                                                        strongSelf.avatarNode.layer.removeAllAnimations()
+                                                        strongSelf.audioLevelNode.layer.removeAllAnimations()
+                                                        previousVideoNodeSnapshot?.removeFromSuperview()
+                                                        if let previousVideoNode = previousVideoNode, previousVideoNode.supernode === strongSelf {
+                                                            previousVideoNode.removeFromSupernode()
+                                                        }
+                                                    }
+                                                })
+                                            }
+                                        } else {
+                                            previousVideoNodeSnapshot?.removeFromSuperview()
+                                            previousVideoNode?.isMainstageExclusive = false
+                                            Queue.mainQueue().after(0.07) {
+                                                if let previousVideoNode = previousVideoNode, previousVideoNode.supernode === strongSelf {
+                                                    previousVideoNode.removeFromSupernode()
+                                                }
+                                            }
+                                        }
+                                    }
+                                }))
+                            } else {
+                                if let (size, sideInset, bottomInset, isLandscape, isTablet) = strongSelf.validLayout {
+                                    strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+                                }
+                                if let previousVideoNode = previousVideoNode {
+                                    previousVideoNodeSnapshot?.removeFromSuperview()
+                                    previousVideoNode.isMainstageExclusive = false
+                                    if previousVideoNode.supernode === strongSelf {
+                                        previousVideoNode.removeFromSupernode()
+                                    }
+                                }
+                                strongSelf.videoReadyDisposable.set(nil)
+                                completion?()
+                            }
+                        }
+                    })
+                } else {
+                    if let currentVideoNode = self.currentVideoNode {
+                        currentVideoNode.isMainstageExclusive = false
+                        if currentVideoNode.supernode === self {
+                            currentVideoNode.removeFromSupernode()
+                        }
+                        self.currentVideoNode = nil
+                    }
+                    self.setAvatarHidden(false)
+                    completion?()
+                }
+            } else {
+                self.setAvatarHidden(endpointId != nil)
+                if waitForFullSize && !isReady && !isPaused, let videoNode = self.currentVideoNode {
+                    self.videoReadyDisposable.set((videoNode.ready
+                    |> filter { $0 }
+                    |> take(1)
+                    |> deliverOnMainQueue).start(next: { [weak self] _ in
+                        Queue.mainQueue().after(0.1) {
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            
+                            if let (size, sideInset, bottomInset, isLandscape, isTablet) = strongSelf.validLayout {
+                                strongSelf.update(size: size, sideInset: sideInset, bottomInset: bottomInset, isLandscape: isLandscape, isTablet: isTablet, transition: .immediate)
+                            }
+                            
+                            Queue.mainQueue().after(0.02) {
+                                completion?()
+                            }
+                            
+                            updatePlaceholderVisibility()
+                            if videoNode.alpha.isZero {
+                                videoNode.updateIsBlurred(isBlurred: isPaused, light: true, animated: false)
+                                strongSelf.topFadeNode.isHidden = true
+                                strongSelf.bottomFadeNode.isHidden = true
+                                if let videoNode = strongSelf.currentVideoNode {
+                                    videoNode.alpha = 1.0
+                                    videoNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, completion: { [weak self] _ in
+                                        if let strongSelf = self {
+                                            strongSelf.setAvatarHidden(true)
+                                        }
+                                    })
+                                }
+                            }
+                        }
+                    }))
+                } else {
+                    updatePlaceholderVisibility()
+                    self.currentVideoNode?.updateIsBlurred(isBlurred: isPaused, light: true, animated: true)
+                    completion?()
+                }
+            }
+        } else {
+            self.videoReadyDisposable.set(nil)
+            if let currentVideoNode = self.currentVideoNode {
+                currentVideoNode.isMainstageExclusive = false
+                if currentVideoNode.supernode === self {
+                    currentVideoNode.removeFromSupernode()
+                }
+                self.currentVideoNode = nil
+            }
+            completion?()
+        }
+    }
+    
+    func setControlsHidden(_ hidden: Bool, animated: Bool, delay: Double = 0.0) {
+        let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+        transition.updateAlpha(node: self.headerNode, alpha: hidden ? 0.0 : 1.0, delay: delay)
+        transition.updateAlpha(node: self.topFadeNode, alpha: hidden ? 0.0 : 1.0, delay: delay)
+        
+        transition.updateAlpha(node: self.titleNode, alpha: hidden ? 0.0 : 1.0, delay: delay)
+        transition.updateAlpha(node: self.microphoneNode, alpha: hidden ? 0.0 : 1.0, delay: delay)
+        transition.updateAlpha(node: self.bottomFadeNode, alpha: hidden ? 0.0 : 1.0, delay: delay)
+    }
+    
+    func update(size: CGSize, sideInset: CGFloat, bottomInset: CGFloat, isLandscape: Bool, isTablet: Bool, force: Bool = false, transition: ContainedViewLayoutTransition) {
+        self.validLayout = (size, sideInset, bottomInset, isLandscape, isTablet)
+        
+        if self.animating && !force {
+            return
+        }
+        
+        let initialBottomInset = bottomInset
+        var bottomInset = bottomInset        
+        let layoutMode: GroupVideoNode.LayoutMode
+        if case .immediate = transition, self.animatingIn {
+            layoutMode = .fillOrFitToSquare
+            bottomInset = 0.0
+        } else if self.animatingOut {
+            layoutMode = .fillOrFitToSquare
+            bottomInset = 0.0
+        } else {
+            if let (_, _, _, isPresentation, _) = self.currentPeer, isPresentation {
+                layoutMode = .fit
+            } else {
+                layoutMode = isLandscape ? .fillHorizontal : .fillVertical
+            }
+        }
+        
+        if let currentVideoNode = self.currentVideoNode {
+            transition.updateFrame(node: currentVideoNode, frame: CGRect(origin: CGPoint(), size: size))
+            currentVideoNode.updateLayout(size: size, layoutMode: layoutMode, transition: transition)
+        }
+        
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size))
+        transition.updateFrame(node: self.backdropAvatarNode, frame: CGRect(origin: CGPoint(), size: size))
+        
+        let avatarSize = CGSize(width: 180.0, height: 180.0)
+        let avatarFrame = CGRect(origin: CGPoint(x: (size.width - avatarSize.width) / 2.0, y: (size.height - avatarSize.height) / 2.0), size: avatarSize)
+        transition.updateFrame(node: self.avatarNode, frame: avatarFrame)
+        transition.updateFrame(node: self.audioLevelNode, frame: avatarFrame.insetBy(dx: -60.0, dy: -60.0))
+        
+        let animationSize = CGSize(width: 36.0, height: 36.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: size.width - sideInset * 2.0 - 24.0 - animationSize.width, height: size.height))
+        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: sideInset + 12.0 + animationSize.width, y: size.height - bottomInset - titleSize.height - 16.0), size: titleSize))
+        
+        transition.updateFrame(node: self.microphoneNode, frame: CGRect(origin: CGPoint(x: sideInset + 7.0, y: size.height - bottomInset - animationSize.height - 6.0), size: animationSize))
+        
+        var totalFadeHeight: CGFloat = fadeHeight
+        if size.height != tileHeight && size.width < size.height {
+            totalFadeHeight += bottomInset
+        }
+        transition.updateFrame(node: self.bottomFadeNode, frame: CGRect(x: 0.0, y: size.height - totalFadeHeight, width: size.width, height: totalFadeHeight))
+        transition.updateFrame(node: self.bottomGradientNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: fadeHeight))
+        transition.updateFrame(node: self.bottomFillNode, frame: CGRect(x: 0.0, y: fadeHeight, width: size.width, height: max(0.0, totalFadeHeight - fadeHeight)))
+        transition.updateFrame(node: self.topFadeNode, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: 50.0))
+        
+        let backSize = self.backButtonNode.measure(CGSize(width: 320.0, height: 100.0))
+        if let image = self.backButtonArrowNode.image {
+            transition.updateFrame(node: self.backButtonArrowNode, frame: CGRect(origin: CGPoint(x: sideInset + 8.0, y: 11.0), size: image.size))
+        }
+        transition.updateFrame(node: self.backButtonNode, frame: CGRect(origin: CGPoint(x: sideInset + 27.0, y: 12.0), size: backSize))
+        
+        let offset: CGFloat = sideInset.isZero ? 0.0 : initialBottomInset + 8.0
+        let pinButtonSize = self.pinButtonNode.update(size: size, transition: transition)
+        transition.updateFrame(node: self.pinButtonNode, frame: CGRect(origin: CGPoint(x: size.width - pinButtonSize.width - offset, y: 0.0), size: pinButtonSize))
+        
+        transition.updateFrame(node: self.headerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: 64.0)))
+        
+        let speakingInset: CGFloat = 16.0
+        let speakingAvatarSize = CGSize(width: 30.0, height: 30.0)
+        let speakingTitleSize = self.speakingTitleNode.updateLayout(CGSize(width: size.width - 100.0, height: CGFloat.greatestFiniteMagnitude))
+        let speakingContainerSize = CGSize(width: speakingTitleSize.width + speakingInset * 2.0 + speakingAvatarSize.width, height: 38.0)
+        self.speakingEffectView?.frame = CGRect(origin: CGPoint(), size: speakingContainerSize)
+        self.speakingAvatarNode.frame = CGRect(origin: CGPoint(x: 4.0, y: 4.0), size: speakingAvatarSize)
+        self.speakingTitleNode.frame = CGRect(origin: CGPoint(x: 4.0 + speakingAvatarSize.width + 14.0, y: floorToScreenPixels((38.0 - speakingTitleSize.height) / 2.0)), size: speakingTitleSize)
+        transition.updateFrame(node: self.speakingContainerNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - speakingContainerSize.width) / 2.0), y: 46.0), size: speakingContainerSize))
+        
+        let placeholderTextSize = self.placeholderTextNode.updateLayout(CGSize(width: size.width - 100.0, height: 100.0))
+        transition.updateFrame(node: self.placeholderTextNode, frame: CGRect(origin: CGPoint(x: floor((size.width - placeholderTextSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) + 10.0), size: placeholderTextSize))
+        if let imageSize = self.placeholderIconNode.image?.size {
+            transition.updateFrame(node: self.placeholderIconNode, frame: CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) - imageSize.height - 8.0), size: imageSize))
+        }
+        
+        let placeholderButtonTextSize = self.placeholderButtonTextNode.updateLayout(CGSize(width: 240.0, height: 100.0))
+        let placeholderButtonSize = CGSize(width: placeholderButtonTextSize.width + 60.0, height: 52.0)
+        transition.updateFrame(node: self.placeholderButton, frame: CGRect(origin: CGPoint(x: floor((size.width - placeholderButtonSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) + 10.0 + placeholderTextSize.height + 30.0), size: placeholderButtonSize))
+        self.placeholderButtonEffectView?.frame = CGRect(origin: CGPoint(), size: placeholderButtonSize)
+        self.placeholderButtonHighlightNode.frame = CGRect(origin: CGPoint(), size: placeholderButtonSize)
+        self.placeholderButtonTextNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((placeholderButtonSize.width - placeholderButtonTextSize.width) / 2.0), y: floorToScreenPixels((placeholderButtonSize.height - placeholderButtonTextSize.height) / 2.0)), size: placeholderButtonTextSize)
+        
+        if let imageSize = self.placeholderIconNode.image?.size {
+            transition.updateFrame(node: self.placeholderIconNode, frame: CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) - imageSize.height - 8.0), size: imageSize))
+        }
+    }
+    
+    func flipVideoIfNeeded() {
+        guard self.currentPeer?.0 == self.callState?.myPeerId else {
+            return
+        }
+        self.currentVideoNode?.flip(withBackground: false)
+    }
+}
+
+private let blue = UIColor(rgb: 0x007fff)
+private let lightBlue = UIColor(rgb: 0x00affe)
+private let green = UIColor(rgb: 0x33c659)
+private let activeBlue = UIColor(rgb: 0x00a0b9)
+private let purple = UIColor(rgb: 0x3252ef)
+private let pink = UIColor(rgb: 0xef436c)
+
+class VoiceChatBlobNode: ASDisplayNode {
+    enum Gradient {
+        case speaking
+        case active
+        case connecting
+        case mutedForYou
+        case muted
+    }
+    private let size: CGSize
+    
+    private let blobView: VoiceBlobView
+    private let foregroundGradientLayer = CAGradientLayer()
+    
+    private let hierarchyTrackingNode: HierarchyTrackingNode
+    private var isCurrentlyInHierarchy = false
+    
+    init(size: CGSize) {
+        self.size = size
+        self.blobView = VoiceBlobView(
+            frame: CGRect(origin: CGPoint(), size: size),
+            maxLevel: 1.5,
+            smallBlobRange: (0, 0),
+            mediumBlobRange: (0.69, 0.87),
+            bigBlobRange: (0.71, 1.0)
+        )
+        self.blobView.setColor(.white)
+        
+        self.foregroundGradientLayer.type = .radial
+        self.foregroundGradientLayer.colors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
+        self.foregroundGradientLayer.locations = [0.0, 0.85, 1.0]
+        self.foregroundGradientLayer.startPoint = CGPoint(x: 1.0, y: 0.0)
+        self.foregroundGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0)
+        
+        var updateInHierarchy: ((Bool) -> Void)?
+        self.hierarchyTrackingNode = HierarchyTrackingNode({ value in
+            updateInHierarchy?(value)
+        })
+        
+        super.init()
+        
+        updateInHierarchy = { [weak self] value in
+            if let strongSelf = self {
+                strongSelf.isCurrentlyInHierarchy = value
+                strongSelf.updateAnimations()
+            }
+        }
+        
+        self.addSubnode(self.hierarchyTrackingNode)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.view.mask = self.blobView
+        self.layer.addSublayer(self.foregroundGradientLayer)
+    }
+        
+    func updateAnimations() {
+        if !self.isCurrentlyInHierarchy {
+            self.foregroundGradientLayer.removeAllAnimations()
+            self.blobView.stopAnimating()
+            return
+        }
+        self.setupGradientAnimations()
+        self.blobView.startAnimating(immediately: true)
+    }
+    
+    func updateLevel(_ level: CGFloat, immediately: Bool) {
+        self.blobView.updateLevel(level, immediately: immediately)
+    }
+    
+    func startAnimating(immediately: Bool) {
+        self.blobView.startAnimating(immediately: immediately)
+    }
+    
+    func stopAnimating() {
+        self.blobView.stopAnimating(duration: 0.8)
+    }
+    
+    private func setupGradientAnimations() {
+        if let _ = self.foregroundGradientLayer.animation(forKey: "movement") {
+        } else {
+            let previousValue = self.foregroundGradientLayer.startPoint
+            let newValue: CGPoint
+            if self.blobView.presentationAudioLevel > 0.22 {
+                newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.15 ..< 0.35))
+            } else if self.blobView.presentationAudioLevel > 0.01 {
+                newValue = CGPoint(x: CGFloat.random(in: 0.57 ..< 0.85), y: CGFloat.random(in: 0.15 ..< 0.45))
+            } else {
+                newValue = CGPoint(x: CGFloat.random(in: 0.6 ..< 0.75), y: CGFloat.random(in: 0.25 ..< 0.45))
+            }
+            self.foregroundGradientLayer.startPoint = newValue
+            
+            CATransaction.begin()
+            
+            let animation = CABasicAnimation(keyPath: "startPoint")
+            animation.duration = Double.random(in: 0.8 ..< 1.4)
+            animation.fromValue = previousValue
+            animation.toValue = newValue
+            
+            CATransaction.setCompletionBlock { [weak self] in
+                if let isCurrentlyInHierarchy = self?.isCurrentlyInHierarchy, isCurrentlyInHierarchy {
+                    self?.setupGradientAnimations()
+                }
+            }
+            
+            self.foregroundGradientLayer.add(animation, forKey: "movement")
+            CATransaction.commit()
+        }
+    }
+    
+    private var gradient: Gradient?
+    func updateGlowAndGradientAnimations(type: Gradient, animated: Bool = true) {
+        guard self.gradient != type else {
+            return
+        }
+        self.gradient = type
+        let initialColors = self.foregroundGradientLayer.colors
+        let targetColors: [CGColor]
+        switch type {
+            case .speaking:
+                targetColors = [activeBlue.cgColor, green.cgColor, green.cgColor]
+            case .active:
+                targetColors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
+            case .connecting:
+                targetColors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
+            case .mutedForYou:
+                targetColors = [pink.cgColor, destructiveColor.cgColor, destructiveColor.cgColor]
+            case .muted:
+                targetColors = [pink.cgColor, purple.cgColor, purple.cgColor]
+        }
+        if animated {
+            self.foregroundGradientLayer.colors = targetColors
+            self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+        } else {
+            CATransaction.begin()
+            CATransaction.setDisableActions(true)
+            self.foregroundGradientLayer.colors = targetColors
+            CATransaction.commit()
+        }
+    }
+    
+    override func layout() {
+        super.layout()
+        
+        self.blobView.frame = self.bounds
+        self.foregroundGradientLayer.frame = self.bounds.insetBy(dx: -24.0, dy: -24.0)
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift
index d97c234197..0edd0f7c02 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatMicrophoneNode.swift
@@ -158,12 +158,12 @@ final class VoiceChatMicrophoneNode: ASDisplayNode {
 
         context.setFillColor(parameters.color.cgColor)
         
-        var clearLineWidth: CGFloat = 4.0
+        var clearLineWidth: CGFloat = 2.0
         var lineWidth: CGFloat = 1.0 + UIScreenPixel
         if bounds.size.width > 36.0 {
             context.scaleBy(x: 2.0, y: 2.0)
         } else if bounds.size.width < 30.0 {
-            clearLineWidth = 3.0
+            clearLineWidth = 2.0
             lineWidth = 1.0
         }
         
@@ -207,18 +207,19 @@ final class VoiceChatMicrophoneNode: ASDisplayNode {
             }
             
             if parameters.reverse {
-                startPoint = CGPoint(x: origin.x + length * (1.0 - parameters.transition), y: origin.y + length * (1.0 - parameters.transition))
-                endPoint = CGPoint(x: origin.x + length, y: origin.y + length)
+                startPoint = CGPoint(x: origin.x + length * (1.0 - parameters.transition), y: origin.y + length * (1.0 - parameters.transition)).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+                endPoint = CGPoint(x: origin.x + length, y: origin.y + length).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
             } else {
-                startPoint = origin
-                endPoint = CGPoint(x: origin.x + length * parameters.transition, y: origin.y + length * parameters.transition)
+                startPoint = origin.offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+                endPoint = CGPoint(x: origin.x + length * parameters.transition, y: origin.y + length * parameters.transition).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
             }
+            
         
             context.setBlendMode(.clear)
             context.setLineWidth(clearLineWidth)
             
-            context.move(to: startPoint)
-            context.addLine(to: endPoint)
+            context.move(to: startPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel))
+            context.addLine(to: endPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel))
             context.strokePath()
         
             context.setBlendMode(.normal)
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift
index 73a578f66f..ba6f4787df 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatOverlayController.swift
@@ -97,9 +97,15 @@ public final class VoiceChatOverlayController: ViewController {
         private var initialRightButtonPosition: CGPoint?
         
         func animateIn(from: CGRect) {
-            guard let actionButton = self.controller?.actionButton, let leftButton = self.controller?.audioOutputNode, let rightButton = self.controller?.leaveNode else {
+            guard let controller = self.controller, let actionButton = controller.actionButton, let audioOutputNode = controller.audioOutputNode, let cameraNode = controller.cameraNode,  let rightButton = controller.leaveNode else {
                 return
             }
+            let leftButton: CallControllerButtonItemNode
+            if audioOutputNode.alpha.isZero {
+                leftButton = cameraNode
+            } else {
+                leftButton = audioOutputNode
+            }
             
             self.initialLeftButtonPosition = leftButton.position
             self.initialRightButtonPosition = rightButton.position
@@ -162,20 +168,25 @@ public final class VoiceChatOverlayController: ViewController {
         
         private var animating = false
         private var dismissed = false
-        func animateOut(reclaim: Bool, completion: @escaping (Bool) -> Void) {
-            guard let actionButton = self.controller?.actionButton, let leftButton = self.controller?.audioOutputNode, let rightButton = self.controller?.leaveNode, let layout = self.validLayout else {
+        func animateOut(reclaim: Bool, targetPosition: CGPoint, completion: @escaping (Bool) -> Void) {
+            guard let controller = self.controller, let actionButton = controller.actionButton, let audioOutputNode = controller.audioOutputNode, let cameraNode = controller.cameraNode,  let rightButton = controller.leaveNode else {
                 return
             }
+            let leftButton: CallControllerButtonItemNode
+            if audioOutputNode.alpha.isZero {
+                leftButton = cameraNode
+            } else {
+                leftButton = audioOutputNode
+            }
             
             if reclaim {
                 self.dismissed = true
-                let targetPosition = CGPoint(x: layout.size.width / 2.0, y: layout.size.height - layout.intrinsicInsets.bottom - 205.0 / 2.0)
                 if self.isSlidOffscreen {
                     self.isSlidOffscreen = false
                     self.isButtonHidden = true
                     actionButton.layer.sublayerTransform = CATransform3DIdentity
                     actionButton.update(snap: false, animated: false)
-                    actionButton.position = CGPoint(x: targetPosition.x, y: 205.0 / 2.0)
+                    actionButton.position = CGPoint(x: targetPosition.x, y: bottomAreaHeight / 2.0)
                     
                     leftButton.isHidden = false
                     rightButton.isHidden = false
@@ -191,7 +202,7 @@ public final class VoiceChatOverlayController: ViewController {
                     actionButton.layer.removeAllAnimations()
                     actionButton.layer.sublayerTransform = CATransform3DIdentity
                     actionButton.update(snap: false, animated: false)
-                    actionButton.position = CGPoint(x: targetPosition.x, y: 205.0 / 2.0)
+                    actionButton.position = CGPoint(x: targetPosition.x, y: bottomAreaHeight / 2.0)
                    
                     leftButton.isHidden = false
                     rightButton.isHidden = false
@@ -264,7 +275,14 @@ public final class VoiceChatOverlayController: ViewController {
         func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
             self.validLayout = layout
             
-            if let actionButton = self.controller?.actionButton, let leftButton = self.controller?.audioOutputNode, let rightButton = self.controller?.leaveNode, !self.animating && !self.dismissed {
+            if let controller = self.controller, let actionButton = controller.actionButton, let audioOutputNode = controller.audioOutputNode, let cameraNode = controller.cameraNode, let rightButton = controller.leaveNode, !self.animating && !self.dismissed {
+                let leftButton: CallControllerButtonItemNode
+                if audioOutputNode.alpha.isZero {
+                    leftButton = cameraNode
+                } else {
+                    leftButton = audioOutputNode
+                }
+                
                 let convertedRect = actionButton.view.convert(actionButton.bounds, to: self.view)
                 let insets = layout.insets(options: [.input])
                 
@@ -302,6 +320,7 @@ public final class VoiceChatOverlayController: ViewController {
     }
     
     private weak var actionButton: VoiceChatActionButton?
+    private weak var cameraNode: CallControllerButtonItemNode?
     private weak var audioOutputNode: CallControllerButtonItemNode?
     private weak var leaveNode: CallControllerButtonItemNode?
     
@@ -315,9 +334,10 @@ public final class VoiceChatOverlayController: ViewController {
     private var currentParams: ([UIViewController], [UIViewController], VoiceChatActionButton.State)?
     fileprivate var initiallyHidden: Bool
     
-    init(actionButton: VoiceChatActionButton, audioOutputNode: CallControllerButtonItemNode, leaveNode: CallControllerButtonItemNode, navigationController: NavigationController?, initiallyHidden: Bool) {
+    init(actionButton: VoiceChatActionButton, audioOutputNode: CallControllerButtonItemNode, cameraNode: CallControllerButtonItemNode, leaveNode: CallControllerButtonItemNode, navigationController: NavigationController?, initiallyHidden: Bool) {
         self.actionButton = actionButton
         self.audioOutputNode = audioOutputNode
+        self.cameraNode = cameraNode
         self.leaveNode = leaveNode
         self.parentNavigationController = navigationController
         self.initiallyHidden = initiallyHidden
@@ -371,8 +391,8 @@ public final class VoiceChatOverlayController: ViewController {
         completion?()
     }
             
-    func animateOut(reclaim: Bool, completion: @escaping (Bool) -> Void) {
-        self.controllerNode.animateOut(reclaim: reclaim, completion: completion)
+    func animateOut(reclaim: Bool, targetPosition: CGPoint, completion: @escaping (Bool) -> Void) {
+        self.controllerNode.animateOut(reclaim: reclaim, targetPosition: targetPosition, completion: completion)
     }
     
     public func updateVisibility() {
@@ -396,7 +416,7 @@ public final class VoiceChatOverlayController: ViewController {
         var slide = true
         var hidden = true
         var animated = true
-        var animateInsets = true
+
         if controllers.count == 1 || controllers.last is ChatController {
             if let chatController = controllers.last as? ChatController {
                 slide = false
@@ -416,9 +436,13 @@ public final class VoiceChatOverlayController: ViewController {
             hidden = true
         }
         
-        if case .active(.cantSpeak) = state {
-            hidden = true
+        switch state {
+            case .active(.cantSpeak), .button, .scheduled:
+                hidden = true
+            default:
+                break
         }
+
         if hasVoiceChatController {
             hidden = false
             animated = self.initiallyHidden
@@ -429,7 +453,6 @@ public final class VoiceChatOverlayController: ViewController {
         
         let previousInsets = self.additionalSideInsets
         self.additionalSideInsets = hidden ? UIEdgeInsets() : UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 75.0)
-        
         if previousInsets != self.additionalSideInsets {
             self.parentNavigationController?.requestLayout(transition: .animated(duration: 0.3, curve: .easeInOut))
         }
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift
index 4759d4027a..e2bcb6bed8 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift
@@ -12,23 +12,38 @@ import ItemListUI
 import PresentationDataUtils
 import AvatarNode
 import TelegramStringFormatting
-import PeerPresenceStatusManager
 import ContextUI
 import AccountContext
 import LegacyComponents
 import AudioBlob
+import PeerInfoAvatarListNode
 
 final class VoiceChatParticipantItem: ListViewItem {
-    enum ParticipantText {
-        public enum TextColor {
+    enum ParticipantText: Equatable {
+        struct TextIcon: OptionSet {
+            public var rawValue: Int32
+            
+            public init(rawValue: Int32) {
+                self.rawValue = rawValue
+            }
+            
+            public init() {
+                self.rawValue = 0
+            }
+            
+            public static let volume = TextIcon(rawValue: 1 << 0)
+            public static let video = TextIcon(rawValue: 1 << 1)
+            public static let screen = TextIcon(rawValue: 1 << 2)
+        }
+        
+        enum TextColor {
             case generic
             case accent
             case constructive
             case destructive
         }
         
-        case presence
-        case text(String, TextColor)
+        case text(String, TextIcon, TextColor)
         case none
     }
     
@@ -39,71 +54,42 @@ final class VoiceChatParticipantItem: ListViewItem {
         case wantsToSpeak
     }
     
-    struct RevealOption {
-        enum RevealOptionType {
-            case neutral
-            case warning
-            case destructive
-            case accent
-        }
-        
-        var type: RevealOptionType
-        var title: String
-        var action: () -> Void
-        
-        init(type: RevealOptionType, title: String, action: @escaping () -> Void) {
-            self.type = type
-            self.title = title
-            self.action = action
-        }
-    }
-
     let presentationData: ItemListPresentationData
     let dateTimeFormat: PresentationDateTimeFormat
     let nameDisplayOrder: PresentationPersonNameOrder
     let context: AccountContext
     let peer: Peer
-    let ssrc: UInt32?
-    let presence: PeerPresence?
     let text: ParticipantText
     let expandedText: ParticipantText?
     let icon: Icon
-    let enabled: Bool
-    public let selectable: Bool
     let getAudioLevel: (() -> Signal<Float, NoError>)?
-    let getVideo: () -> GroupVideoNode?
-    let revealOptions: [RevealOption]
-    let revealed: Bool?
-    let setPeerIdWithRevealedOptions: (PeerId?, PeerId?) -> Void
-    let action: ((ASDisplayNode) -> Void)?
+    let action: ((ASDisplayNode?) -> Void)?
     let contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?
+    let getIsExpanded: () -> Bool
+    let getUpdatingAvatar: () -> Signal<(TelegramMediaImageRepresentation, Float)?, NoError>
     
-    public init(presentationData: ItemListPresentationData, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, ssrc: UInt32?, presence: PeerPresence?, text: ParticipantText, expandedText: ParticipantText?, icon: Icon, enabled: Bool, selectable: Bool, getAudioLevel: (() -> Signal<Float, NoError>)?, getVideo: @escaping () -> GroupVideoNode?, revealOptions: [RevealOption], revealed: Bool?, setPeerIdWithRevealedOptions: @escaping (PeerId?, PeerId?) -> Void, action: ((ASDisplayNode) -> Void)?, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil) {
+    public let selectable: Bool = true
+    
+    public init(presentationData: ItemListPresentationData, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, context: AccountContext, peer: Peer, text: ParticipantText, expandedText: ParticipantText?, icon: Icon, getAudioLevel: (() -> Signal<Float, NoError>)?, action: ((ASDisplayNode?) -> Void)?, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)? = nil, getIsExpanded: @escaping () -> Bool, getUpdatingAvatar: @escaping () -> Signal<(TelegramMediaImageRepresentation, Float)?, NoError>) {
         self.presentationData = presentationData
         self.dateTimeFormat = dateTimeFormat
         self.nameDisplayOrder = nameDisplayOrder
         self.context = context
         self.peer = peer
-        self.ssrc = ssrc
-        self.presence = presence
         self.text = text
         self.expandedText = expandedText
         self.icon = icon
-        self.enabled = enabled
-        self.selectable = selectable
         self.getAudioLevel = getAudioLevel
-        self.getVideo = getVideo
-        self.revealOptions = revealOptions
-        self.revealed = revealed
-        self.setPeerIdWithRevealedOptions = setPeerIdWithRevealedOptions
         self.action = action
         self.contextAction = contextAction
+        self.getIsExpanded = getIsExpanded
+        self.getUpdatingAvatar = getUpdatingAvatar
     }
         
     public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = VoiceChatParticipantItemNode()
-            let (layout, apply) = node.asyncLayout()(self, params, previousItem == nil, nextItem == nil)
+            let (layout, apply) = node.asyncLayout()(self, params, previousItem == nil || previousItem is VoiceChatTilesGridItem, nextItem == nil)
             
             node.contentSize = layout.contentSize
             node.insets = layout.insets
@@ -127,7 +113,7 @@ final class VoiceChatParticipantItem: ListViewItem {
                 }
                 
                 async {
-                    let (layout, apply) = makeLayout(self, params, previousItem == nil, nextItem == nil)
+                    let (layout, apply) = makeLayout(self, params, previousItem == nil || previousItem is VoiceChatTilesGridItem, nextItem == nil)
                     Queue.mainQueue().async {
                         completion(layout, { _ in
                             apply(false, animated)
@@ -144,51 +130,172 @@ final class VoiceChatParticipantItem: ListViewItem {
 }
 
 private let avatarFont = avatarPlaceholderFont(size: floor(40.0 * 16.0 / 37.0))
+private let tileSize = CGSize(width: 84.0, height: 84.0)
+private let backgroundCornerRadius: CGFloat = 14.0
+private let avatarSize: CGFloat = 40.0
+
+private let accentColor: UIColor = UIColor(rgb: 0x007aff)
+private let constructiveColor: UIColor = UIColor(rgb: 0x34c759)
+private let destructiveColor: UIColor = UIColor(rgb: 0xff3b30)
+
+class VoiceChatParticipantStatusNode: ASDisplayNode {
+    private var iconNodes: [ASImageNode]
+    private let textNode: TextNode
+    
+    private var currentParams: (CGSize, VoiceChatParticipantItem.ParticipantText)?
+    
+    override init() {
+        self.iconNodes = []
+        self.textNode = TextNode()
+        self.textNode.isUserInteractionEnabled = false
+        self.textNode.contentMode = .left
+        self.textNode.contentsScale = UIScreen.main.scale
+        
+        super.init()
+        
+        self.addSubnode(self.textNode)
+    }
+    
+    func asyncLayout() -> (_ size: CGSize, _ text: VoiceChatParticipantItem.ParticipantText, _ expanded: Bool) -> (CGSize, () -> Void) {
+        let makeTextLayout = TextNode.asyncLayout(self.textNode)
+        
+        return { size, text, expanded in
+            let statusFont = Font.regular(14.0)
+            
+            var attributedString: NSAttributedString?
+            var color: UIColor = .white
+            var hasVolume = false
+            var hasVideo = false
+            var hasScreen = false
+            switch text {
+                case let .text(text, textIcon, textColor):
+                    hasVolume = textIcon.contains(.volume)
+                    hasVideo = textIcon.contains(.video)
+                    hasScreen = textIcon.contains(.screen)
+                    
+                    var textColorValue: UIColor
+                    switch textColor {
+                    case .generic:
+                        textColorValue = UIColor(rgb: 0x98989e)
+                    case .accent:
+                        textColorValue = accentColor
+                    case .constructive:
+                        textColorValue = constructiveColor
+                    case .destructive:
+                        textColorValue = destructiveColor
+                    }
+                    color = textColorValue
+                    attributedString = NSAttributedString(string: text, font: statusFont, textColor: textColorValue)
+                default:
+                    break
+            }
+                        
+            let iconSize = CGSize(width: 16.0, height: 16.0)
+            let spacing: CGFloat = 3.0
+            
+            var icons: [UIImage] = []
+            if hasVolume, let image = generateTintedImage(image: UIImage(bundleImageName: "Call/StatusVolume"), color: color) {
+                icons.append(image)
+            }
+            if hasVideo, let image = generateTintedImage(image: UIImage(bundleImageName: "Call/StatusVideo"), color: color) {
+                icons.append(image)
+            }
+            if hasScreen, let image = generateTintedImage(image: UIImage(bundleImageName: "Call/StatusScreen"), color: color) {
+                icons.append(image)
+            }
+            
+            let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: attributedString, backgroundColor: nil, maximumNumberOfLines: expanded ? 4 : 1, truncationType: .end, constrainedSize: CGSize(width: size.width - (iconSize.width + spacing) * CGFloat(icons.count), height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            var contentSize = textLayout.size
+            contentSize.width += (iconSize.width + spacing) * CGFloat(icons.count)
+            
+            return (contentSize, { [weak self] in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                strongSelf.currentParams = (size, text)
+                
+                for i in 0 ..< icons.count {
+                    let iconNode: ASImageNode
+                    if strongSelf.iconNodes.count >= i + 1 {
+                        iconNode = strongSelf.iconNodes[i]
+                    } else {
+                        iconNode = ASImageNode()
+                        strongSelf.addSubnode(iconNode)
+                        strongSelf.iconNodes.append(iconNode)
+                    }
+                    iconNode.frame = CGRect(origin: CGPoint(x: (iconSize.width + spacing) * CGFloat(i), y: 1.0), size: iconSize)
+                    
+                    iconNode.image = icons[i]
+                }
+                if strongSelf.iconNodes.count > icons.count {
+                    for i in icons.count ..< strongSelf.iconNodes.count {
+                        strongSelf.iconNodes[i].image = nil
+                    }
+                }
+                
+                
+                let _ = textApply()
+                strongSelf.textNode.frame = CGRect(origin: CGPoint(x: (iconSize.width + spacing) * CGFloat(icons.count), y: 0.0), size: textLayout.size)
+            })
+        }
+    }
+}
 
 class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
     private let topStripeNode: ASDisplayNode
     private let bottomStripeNode: ASDisplayNode
+    private let highlightContainerNode: ASDisplayNode
     private let highlightedBackgroundNode: ASDisplayNode
-    private var disabledOverlayNode: ASDisplayNode?
     
     let contextSourceNode: ContextExtractedContentContainingNode
     private let containerNode: ContextControllerSourceNode
+    private let backgroundImageNode: ASImageNode
     private let extractedBackgroundImageNode: ASImageNode
     private let offsetContainerNode: ASDisplayNode
     
     private var extractedRect: CGRect?
     private var nonExtractedRect: CGRect?
+    private var extractedVerticalOffset: CGFloat?
         
-    fileprivate let avatarNode: AvatarNode
+    let avatarNode: AvatarNode
+    private let contentWrapperNode: ASDisplayNode
     private let titleNode: TextNode
-    private let statusNode: TextNode
-    private let expandedStatusNode: TextNode
+    private let statusNode: VoiceChatParticipantStatusNode
+    private let expandedStatusNode: VoiceChatParticipantStatusNode
     private var credibilityIconNode: ASImageNode?
     
+    private var avatarTransitionNode: ASImageNode?
+    private var avatarListContainerNode: ASDisplayNode?
+    private var avatarListWrapperNode: PinchSourceContainerNode?
+    private var avatarListNode: PeerInfoAvatarListContainerNode?
+    
     private let actionContainerNode: ASDisplayNode
     private var animationNode: VoiceChatMicrophoneNode?
     private var iconNode: ASImageNode?
     private var raiseHandNode: VoiceChatRaiseHandNode?
     private var actionButtonNode: HighlightableButtonNode
     
-    private var audioLevelView: VoiceBlobView?
+    var audioLevelView: VoiceBlobView?
     private let audioLevelDisposable = MetaDisposable()
     private var didSetupAudioLevel = false
     
     private var absoluteLocation: (CGRect, CGSize)?
     
-    private var peerPresenceManager: PeerPresenceStatusManager?
     private var layoutParams: (VoiceChatParticipantItem, ListViewItemLayoutParams, Bool, Bool)?
+    private var isExtracted = false
+    private var animatingExtraction = false
     private var wavesColor: UIColor?
-    
-    private var videoNode: GroupVideoNode?
-    
+        
     private var raiseHandTimer: SwiftSignalKit.Timer?
+    private var silenceTimer: SwiftSignalKit.Timer?
     
     var item: VoiceChatParticipantItem? {
         return self.layoutParams?.0
     }
     
+    private var currentTitle: String?
+    
     init() {
         self.topStripeNode = ASDisplayNode()
         self.topStripeNode.isLayerBacked = true
@@ -199,64 +306,67 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
         self.contextSourceNode = ContextExtractedContentContainingNode()
         self.containerNode = ContextControllerSourceNode()
         
+        self.backgroundImageNode = ASImageNode()
+        self.backgroundImageNode.clipsToBounds = true
+        self.backgroundImageNode.displaysAsynchronously = false
+        self.backgroundImageNode.alpha = 0.0
+        
         self.extractedBackgroundImageNode = ASImageNode()
+        self.extractedBackgroundImageNode.clipsToBounds = true
         self.extractedBackgroundImageNode.displaysAsynchronously = false
         self.extractedBackgroundImageNode.alpha = 0.0
-        
+
         self.offsetContainerNode = ASDisplayNode()
         
         self.avatarNode = AvatarNode(font: avatarFont)
         self.avatarNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 40.0, height: 40.0))
         
+        self.contentWrapperNode = ASDisplayNode()
+   
         self.titleNode = TextNode()
         self.titleNode.isUserInteractionEnabled = false
         self.titleNode.contentMode = .left
         self.titleNode.contentsScale = UIScreen.main.scale
         
-        self.statusNode = TextNode()
+        self.statusNode = VoiceChatParticipantStatusNode()
         self.statusNode.isUserInteractionEnabled = false
-        self.statusNode.contentMode = .left
-        self.statusNode.contentsScale = UIScreen.main.scale
         
-        self.expandedStatusNode = TextNode()
+        self.expandedStatusNode = VoiceChatParticipantStatusNode()
         self.expandedStatusNode.isUserInteractionEnabled = false
-        self.expandedStatusNode.contentMode = .left
-        self.expandedStatusNode.contentsScale = UIScreen.main.scale
         self.expandedStatusNode.alpha = 0.0
         
         self.actionContainerNode = ASDisplayNode()
         self.actionButtonNode = HighlightableButtonNode()
         
+        self.highlightContainerNode = ASDisplayNode()
+        self.highlightContainerNode.clipsToBounds = true
+        
         self.highlightedBackgroundNode = ASDisplayNode()
-        self.highlightedBackgroundNode.isLayerBacked = true
         
         super.init(layerBacked: false, dynamicBounce: false, rotated: false, seeThrough: false)
         
         self.isAccessibilityElement = true
         
+        self.highlightContainerNode.addSubnode(self.highlightedBackgroundNode)
+        
         self.containerNode.addSubnode(self.contextSourceNode)
         self.containerNode.targetNodeForActivationProgress = self.contextSourceNode.contentNode
         self.addSubnode(self.containerNode)
         
-        self.contextSourceNode.contentNode.addSubnode(self.extractedBackgroundImageNode)
+        self.contextSourceNode.contentNode.addSubnode(self.backgroundImageNode)
+        self.backgroundImageNode.addSubnode(self.extractedBackgroundImageNode)
         self.contextSourceNode.contentNode.addSubnode(self.offsetContainerNode)
-        self.offsetContainerNode.addSubnode(self.avatarNode)
-        self.offsetContainerNode.addSubnode(self.titleNode)
-        self.offsetContainerNode.addSubnode(self.statusNode)
-        self.offsetContainerNode.addSubnode(self.expandedStatusNode)
-        self.offsetContainerNode.addSubnode(self.actionContainerNode)
+        self.offsetContainerNode.addSubnode(self.contentWrapperNode)
+        self.contentWrapperNode.addSubnode(self.titleNode)
+        self.contentWrapperNode.addSubnode(self.statusNode)
+        self.contentWrapperNode.addSubnode(self.expandedStatusNode)
+        self.contentWrapperNode.addSubnode(self.actionContainerNode)
         self.actionContainerNode.addSubnode(self.actionButtonNode)
+        self.offsetContainerNode.addSubnode(self.avatarNode)
         self.containerNode.targetNodeForActivationProgress = self.contextSourceNode.contentNode
         
         self.actionButtonNode.addTarget(self, action: #selector(self.actionButtonPressed), forControlEvents: .touchUpInside)
-        
-        self.peerPresenceManager = PeerPresenceStatusManager(update: { [weak self] in
-            if let strongSelf = self, let layoutParams = strongSelf.layoutParams {
-                let (_, apply) = strongSelf.asyncLayout()(layoutParams.0, layoutParams.1, layoutParams.2, layoutParams.3)
-                apply(false, true)
-            }
-        })
-        
+                
         self.containerNode.shouldBegin = { [weak self] location in
             guard let strongSelf = self else {
                 return false
@@ -279,49 +389,387 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                 return
             }
             
+            strongSelf.isExtracted = isExtracted
+            
+            let inset: CGFloat = 0.0
             if isExtracted {
-                strongSelf.extractedBackgroundImageNode.image = generateStretchableFilledCircleImage(diameter: 28.0, color: item.presentationData.theme.list.itemBlocksBackgroundColor)
-            }
-            
-            if let extractedRect = strongSelf.extractedRect, let nonExtractedRect = strongSelf.nonExtractedRect {
-                let rect = isExtracted ? extractedRect : nonExtractedRect
-                transition.updateFrame(node: strongSelf.extractedBackgroundImageNode, frame: rect)
-            }
-            
-            transition.updateAlpha(node: strongSelf.statusNode, alpha: isExtracted ? 0.0 : 1.0)
-            transition.updateAlpha(node: strongSelf.expandedStatusNode, alpha: isExtracted ? 1.0 : 0.0)
-            
-            transition.updateAlpha(node: strongSelf.actionContainerNode, alpha: isExtracted ? 0.0 : 1.0)
-            
-            transition.updateSublayerTransformOffset(layer: strongSelf.offsetContainerNode.layer, offset: CGPoint(x: isExtracted ? 12.0 : 0.0, y: 0.0))
-           
-            transition.updateSublayerTransformOffset(layer: strongSelf.actionContainerNode.layer, offset: CGPoint(x: isExtracted ? -24.0 : 0.0, y: 0.0))
-            
-            transition.updateAlpha(node: strongSelf.extractedBackgroundImageNode, alpha: isExtracted ? 1.0 : 0.0, completion: { _ in
-                if !isExtracted {
-                    self?.extractedBackgroundImageNode.image = nil
+                strongSelf.contextSourceNode.contentNode.customHitTest = { [weak self] point in
+                    if let strongSelf = self {
+                        if let avatarListWrapperNode = strongSelf.avatarListWrapperNode, avatarListWrapperNode.frame.contains(point) {
+                            return strongSelf.avatarListNode?.view
+                        }
+                    }
+                    return nil
                 }
-            })
+            } else {
+                strongSelf.contextSourceNode.contentNode.customHitTest = nil
+            }
+                       
+            let extractedVerticalOffset = strongSelf.extractedVerticalOffset ?? 0.0
+            if let extractedRect = strongSelf.extractedRect, let nonExtractedRect = strongSelf.nonExtractedRect {
+                let rect: CGRect
+                if isExtracted {
+                    if extractedVerticalOffset > 0.0 {
+                        rect = CGRect(x: extractedRect.minX, y: extractedRect.minY + extractedVerticalOffset, width: extractedRect.width, height: extractedRect.height - extractedVerticalOffset)
+                    } else {
+                        rect = extractedRect
+                    }
+                } else {
+                    rect = nonExtractedRect
+                }
+                
+                let springDuration: Double = isExtracted ? 0.42 : 0.3
+                let springDamping: CGFloat = isExtracted ? 124.0 : 1000.0
+                
+                let itemBackgroundColor: UIColor = item.getIsExpanded() ? UIColor(rgb: 0x1c1c1e) : UIColor(rgb: 0x2c2c2e)
+                
+                if !extractedVerticalOffset.isZero {
+                    let radiusTransition = ContainedViewLayoutTransition.animated(duration: 0.15, curve: .easeInOut)
+                    if isExtracted {
+                        strongSelf.backgroundImageNode.image = generateImage(CGSize(width: backgroundCornerRadius * 2.0, height: backgroundCornerRadius * 2.0), rotatedContext: { (size, context) in
+                            let bounds = CGRect(origin: CGPoint(), size: size)
+                            context.clear(bounds)
+                            
+                            context.setFillColor(itemBackgroundColor.cgColor)
+                            context.fillEllipse(in: bounds)
+                            context.fill(CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height / 2.0))
+                        })?.stretchableImage(withLeftCapWidth: Int(backgroundCornerRadius), topCapHeight: Int(backgroundCornerRadius))
+                        strongSelf.extractedBackgroundImageNode.image = generateImage(CGSize(width: backgroundCornerRadius * 2.0, height: backgroundCornerRadius * 2.0), rotatedContext: { (size, context) in
+                            let bounds = CGRect(origin: CGPoint(), size: size)
+                            context.clear(bounds)
+                            
+                            context.setFillColor(item.presentationData.theme.list.itemBlocksBackgroundColor.cgColor)
+                            context.fillEllipse(in: bounds)
+                            context.fill(CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height / 2.0))
+                        })?.stretchableImage(withLeftCapWidth: Int(backgroundCornerRadius), topCapHeight: Int(backgroundCornerRadius))
+                        strongSelf.backgroundImageNode.cornerRadius = backgroundCornerRadius
+                                              
+                        strongSelf.avatarNode.transform = CATransform3DIdentity
+                        var avatarInitialRect = strongSelf.avatarNode.view.convert(strongSelf.avatarNode.bounds, to: strongSelf.offsetContainerNode.supernode?.view)
+                        if strongSelf.avatarTransitionNode == nil {
+                            transition.updateCornerRadius(node: strongSelf.backgroundImageNode, cornerRadius: 0.0)
+                              
+                            let targetRect = CGRect(x: extractedRect.minX, y: extractedRect.minY, width: extractedRect.width, height: extractedRect.width)
+                            let initialScale = avatarInitialRect.width / targetRect.width
+                            avatarInitialRect.origin.y += backgroundCornerRadius / 2.0 * initialScale
+                            
+                            let avatarListWrapperNode = PinchSourceContainerNode()
+                            avatarListWrapperNode.clipsToBounds = true
+                            avatarListWrapperNode.cornerRadius = backgroundCornerRadius
+                            avatarListWrapperNode.activate = { [weak self] sourceNode in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.avatarListNode?.controlsContainerNode.alpha = 0.0
+                                let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                                    return UIScreen.main.bounds
+                                })
+                                item.context.sharedContext.mainWindow?.presentInGlobalOverlay(pinchController)
+                            }
+                            avatarListWrapperNode.deactivated = { [weak self] in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.avatarListWrapperNode?.contentNode.layer.animate(from: 0.0 as NSNumber, to: backgroundCornerRadius as NSNumber, keyPath: "cornerRadius", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.3, completion: { _ in
+                                })
+                            }
+                            avatarListWrapperNode.update(size: targetRect.size, transition: .immediate)
+                            avatarListWrapperNode.frame = CGRect(x: targetRect.minX, y: targetRect.minY, width: targetRect.width, height: targetRect.height + backgroundCornerRadius)
+                            avatarListWrapperNode.animatedOut = { [weak self] in
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.avatarListNode?.controlsContainerNode.alpha = 1.0
+                                strongSelf.avatarListNode?.controlsContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+                            }
+                            
+                            let transitionNode = ASImageNode()
+                            transitionNode.clipsToBounds = true
+                            transitionNode.displaysAsynchronously = false
+                            transitionNode.displayWithoutProcessing = true
+                            transitionNode.image = strongSelf.avatarNode.unroundedImage
+                            transitionNode.frame = CGRect(origin: CGPoint(), size: targetRect.size)
+                            transitionNode.cornerRadius = targetRect.width / 2.0
+                            radiusTransition.updateCornerRadius(node: transitionNode, cornerRadius: 0.0)
+                            
+                            strongSelf.avatarNode.isHidden = true
+                            avatarListWrapperNode.contentNode.addSubnode(transitionNode)
+                            
+                            strongSelf.avatarTransitionNode = transitionNode
+    
+                            let avatarListContainerNode = ASDisplayNode()
+                            avatarListContainerNode.clipsToBounds = true
+                            avatarListContainerNode.frame = CGRect(origin: CGPoint(), size: targetRect.size)
+                            avatarListContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                            avatarListContainerNode.cornerRadius = targetRect.width / 2.0
+                            
+                            avatarListWrapperNode.layer.animateSpring(from: initialScale as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+                            avatarListWrapperNode.layer.animateSpring(from: NSValue(cgPoint: avatarInitialRect.center), to: NSValue(cgPoint: avatarListWrapperNode.position), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+                            
+                            radiusTransition.updateCornerRadius(node: avatarListContainerNode, cornerRadius: 0.0)
+                            
+                            let avatarListNode = PeerInfoAvatarListContainerNode(context: item.context)
+                            avatarListWrapperNode.contentNode.clipsToBounds = true
+                            avatarListNode.backgroundColor = .clear
+                            avatarListNode.peer = item.peer
+                            avatarListNode.firstFullSizeOnly = true
+                            avatarListNode.offsetLocation = true
+                            avatarListNode.customCenterTapAction = { [weak self] in
+                                self?.contextSourceNode.requestDismiss?()
+                            }
+                            avatarListNode.frame = CGRect(x: targetRect.width / 2.0, y: targetRect.height / 2.0, width: targetRect.width, height: targetRect.height)
+                            avatarListNode.controlsClippingNode.frame = CGRect(x: -targetRect.width / 2.0, y: -targetRect.height / 2.0, width: targetRect.width, height: targetRect.height)
+                            avatarListNode.controlsClippingOffsetNode.frame = CGRect(origin: CGPoint(x: targetRect.width / 2.0, y: targetRect.height / 2.0), size: CGSize())
+                            avatarListNode.stripContainerNode.frame = CGRect(x: 0.0, y: 13.0, width: targetRect.width, height: 2.0)
+                            avatarListNode.shadowNode.frame = CGRect(x: 0.0, y: 0.0, width: targetRect.width, height: 44.0)
+                            
+                            avatarListContainerNode.addSubnode(avatarListNode)
+                            avatarListContainerNode.addSubnode(avatarListNode.controlsClippingOffsetNode)
+                            avatarListWrapperNode.contentNode.addSubnode(avatarListContainerNode)
+                            
+                            avatarListNode.update(size: targetRect.size, peer: item.peer, customNode: nil, additionalEntry: item.getUpdatingAvatar(), isExpanded: true, transition: .immediate)
+                            strongSelf.offsetContainerNode.supernode?.addSubnode(avatarListWrapperNode)
+
+                            strongSelf.audioLevelView?.alpha = 0.0
+                            
+                            strongSelf.avatarListWrapperNode = avatarListWrapperNode
+                            strongSelf.avatarListContainerNode = avatarListContainerNode
+                            strongSelf.avatarListNode = avatarListNode
+                        }
+                    } else if let transitionNode = strongSelf.avatarTransitionNode, let avatarListWrapperNode = strongSelf.avatarListWrapperNode, let avatarListContainerNode = strongSelf.avatarListContainerNode {
+                        strongSelf.animatingExtraction = true
+                        
+                        transition.updateCornerRadius(node: strongSelf.backgroundImageNode, cornerRadius: backgroundCornerRadius)
+                        
+                        var avatarInitialRect = CGRect(origin: strongSelf.avatarNode.frame.origin, size: strongSelf.avatarNode.frame.size)
+                        let targetScale = avatarInitialRect.width / avatarListContainerNode.frame.width
+                        avatarInitialRect.origin.y += backgroundCornerRadius / 2.0 * targetScale
+                        
+                        strongSelf.avatarTransitionNode = nil
+                        strongSelf.avatarListWrapperNode = nil
+                        strongSelf.avatarListContainerNode = nil
+                        strongSelf.avatarListNode = nil
+                        
+                        avatarListContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak avatarListContainerNode] _ in
+                            avatarListContainerNode?.removeFromSupernode()
+                        })
+                                                
+                        avatarListWrapperNode.layer.animate(from: 1.0 as NSNumber, to: targetScale as NSNumber, keyPath: "transform.scale", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false)
+                        avatarListWrapperNode.layer.animate(from: NSValue(cgPoint: avatarListWrapperNode.position), to: NSValue(cgPoint: avatarInitialRect.center), keyPath: "position", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false, completion: { [weak transitionNode, weak self] _ in
+                            transitionNode?.removeFromSupernode()
+                            self?.avatarNode.isHidden = false
+                            
+                            self?.audioLevelView?.alpha = 1.0
+                            self?.audioLevelView?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                            
+                            if let strongSelf = self {
+                                strongSelf.animatingExtraction = false
+                            }
+                        })
+    
+                        radiusTransition.updateCornerRadius(node: avatarListContainerNode, cornerRadius: avatarListContainerNode.frame.width / 2.0)
+                        radiusTransition.updateCornerRadius(node: transitionNode, cornerRadius: avatarListContainerNode.frame.width / 2.0)
+                    }
+                    
+                    let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
+                    alphaTransition.updateAlpha(node: strongSelf.statusNode, alpha: isExtracted ? 0.0 : 1.0)
+                    alphaTransition.updateAlpha(node: strongSelf.expandedStatusNode, alpha: isExtracted ? 1.0 : 0.0)
+                    alphaTransition.updateAlpha(node: strongSelf.actionContainerNode, alpha: isExtracted ? 0.0 : 1.0, delay: isExtracted ? 0.0 : 0.1)
+                    
+                    let offsetInitialSublayerTransform = strongSelf.offsetContainerNode.layer.sublayerTransform
+                    strongSelf.offsetContainerNode.layer.sublayerTransform = CATransform3DMakeTranslation(isExtracted ? -43 : 0.0, isExtracted ? extractedVerticalOffset : 0.0, 0.0)
+                    
+                    let actionInitialSublayerTransform = strongSelf.actionContainerNode.layer.sublayerTransform
+                    strongSelf.actionContainerNode.layer.sublayerTransform = CATransform3DMakeTranslation(isExtracted ? 43.0 : 0.0, 0.0, 0.0)
+                    
+                    let initialBackgroundPosition = strongSelf.backgroundImageNode.position
+                    strongSelf.backgroundImageNode.layer.position = rect.center
+                    let initialBackgroundBounds = strongSelf.backgroundImageNode.bounds
+                    strongSelf.backgroundImageNode.layer.bounds = CGRect(origin: CGPoint(), size: rect.size)
+                    
+                    let initialExtractedBackgroundPosition = strongSelf.extractedBackgroundImageNode.position
+                    strongSelf.extractedBackgroundImageNode.layer.position = CGPoint(x: rect.size.width / 2.0, y: rect.size.height / 2.0)
+                    let initialExtractedBackgroundBounds = strongSelf.extractedBackgroundImageNode.bounds
+                    strongSelf.extractedBackgroundImageNode.layer.bounds = strongSelf.backgroundImageNode.layer.bounds
+                    if isExtracted {
+                        strongSelf.offsetContainerNode.layer.animateSpring(from: NSValue(caTransform3D: offsetInitialSublayerTransform), to: NSValue(caTransform3D: strongSelf.offsetContainerNode.layer.sublayerTransform), keyPath: "sublayerTransform", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+                        strongSelf.actionContainerNode.layer.animateSpring(from: NSValue(caTransform3D: actionInitialSublayerTransform), to: NSValue(caTransform3D: strongSelf.actionContainerNode.layer.sublayerTransform), keyPath: "sublayerTransform", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+                        strongSelf.backgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: strongSelf.backgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+                        strongSelf.backgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: strongSelf.backgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+                        strongSelf.extractedBackgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialExtractedBackgroundPosition), to: NSValue(cgPoint: strongSelf.extractedBackgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+                        strongSelf.extractedBackgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialExtractedBackgroundBounds), to: NSValue(cgRect: strongSelf.extractedBackgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+                    } else {
+                        strongSelf.offsetContainerNode.layer.animate(from: NSValue(caTransform3D: offsetInitialSublayerTransform), to: NSValue(caTransform3D: strongSelf.offsetContainerNode.layer.sublayerTransform), keyPath: "sublayerTransform", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        strongSelf.actionContainerNode.layer.animate(from: NSValue(caTransform3D: actionInitialSublayerTransform), to: NSValue(caTransform3D: strongSelf.actionContainerNode.layer.sublayerTransform), keyPath: "sublayerTransform", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        strongSelf.backgroundImageNode.layer.animate(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: strongSelf.backgroundImageNode.position), keyPath: "position", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        strongSelf.backgroundImageNode.layer.animate(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: strongSelf.backgroundImageNode.bounds), keyPath: "bounds", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        strongSelf.extractedBackgroundImageNode.layer.animate(from: NSValue(cgPoint: initialExtractedBackgroundPosition), to: NSValue(cgPoint: strongSelf.extractedBackgroundImageNode.position), keyPath: "position", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                        strongSelf.extractedBackgroundImageNode.layer.animate(from: NSValue(cgRect: initialExtractedBackgroundBounds), to: NSValue(cgRect: strongSelf.extractedBackgroundImageNode.bounds), keyPath: "bounds", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2)
+                    }
+
+                    if isExtracted {
+                        strongSelf.backgroundImageNode.alpha = 1.0
+                        strongSelf.extractedBackgroundImageNode.alpha = 1.0
+                        strongSelf.extractedBackgroundImageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1, delay: 0.1, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue)
+                    } else {
+                        strongSelf.extractedBackgroundImageNode.alpha = 0.0
+                        strongSelf.extractedBackgroundImageNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, delay: 0.0, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, removeOnCompletion: false, completion: { [weak self] _ in
+                            if let strongSelf = self {
+                                strongSelf.backgroundImageNode.image = nil
+                                strongSelf.extractedBackgroundImageNode.image = nil
+                                strongSelf.extractedBackgroundImageNode.layer.removeAllAnimations()
+                            }
+                        })
+                    }
+                } else {
+                    if isExtracted {
+                        strongSelf.backgroundImageNode.alpha = 0.0
+                        strongSelf.extractedBackgroundImageNode.alpha = 1.0
+                        strongSelf.backgroundImageNode.image = generateStretchableFilledCircleImage(diameter: backgroundCornerRadius * 2.0, color: itemBackgroundColor)
+                        strongSelf.extractedBackgroundImageNode.image = generateStretchableFilledCircleImage(diameter: backgroundCornerRadius * 2.0, color: item.presentationData.theme.list.itemBlocksBackgroundColor)
+                    }
+                    
+                    transition.updateFrame(node: strongSelf.backgroundImageNode, frame: rect)
+                    transition.updateFrame(node: strongSelf.extractedBackgroundImageNode, frame: CGRect(origin: CGPoint(), size: rect.size))
+                    
+                    transition.updateAlpha(node: strongSelf.statusNode, alpha: isExtracted ? 0.0 : 1.0)
+                    transition.updateAlpha(node: strongSelf.expandedStatusNode, alpha: isExtracted ? 1.0 : 0.0)
+                    transition.updateAlpha(node: strongSelf.actionContainerNode, alpha: isExtracted ? 0.0 : 1.0)
+                    
+                    transition.updateSublayerTransformOffset(layer: strongSelf.offsetContainerNode.layer, offset: CGPoint(x: isExtracted ? inset : 0.0, y: isExtracted ? extractedVerticalOffset : 0.0))
+                    transition.updateSublayerTransformOffset(layer: strongSelf.actionContainerNode.layer, offset: CGPoint(x: isExtracted ? -inset * 2.0 : 0.0, y: 0.0))
+                    
+                    transition.updateAlpha(node: strongSelf.backgroundImageNode, alpha: isExtracted ? 1.0 : 0.0, completion: { _ in
+                        if !isExtracted {
+                            self?.backgroundImageNode.image = nil
+                            self?.extractedBackgroundImageNode.image = nil
+                        }
+                    })
+                }
+            }
         }
     }
     
     deinit {
         self.audioLevelDisposable.dispose()
         self.raiseHandTimer?.invalidate()
+        self.silenceTimer?.invalidate()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.highlightContainerNode.layer.cornerCurve = .continuous
+        }
     }
     
     override func selected() {
         super.selected()
         self.layoutParams?.0.action?(self.contextSourceNode)
     }
+    
+    func animateTransitionIn(from sourceNode: ASDisplayNode, containerNode: ASDisplayNode, transition: ContainedViewLayoutTransition) {
+        guard let _ = self.item, let sourceNode = sourceNode as? VoiceChatFullscreenParticipantItemNode, let _ = sourceNode.item else {
+            return
+        }
+        var duration: Double = 0.2
+        var timingFunction: String = CAMediaTimingFunctionName.easeInEaseOut.rawValue
+        if case let .animated(transitionDuration, curve) = transition {
+            duration = transitionDuration + 0.08
+            timingFunction = curve.timingFunction
+        }
+        
+        let startContainerAvatarPosition = sourceNode.avatarNode.view.convert(sourceNode.avatarNode.bounds, to: containerNode.view).center
+        var animate = true
+        if containerNode.frame.width > containerNode.frame.height {
+            if startContainerAvatarPosition.y < -tileSize.height * 2.0 || startContainerAvatarPosition.y > containerNode.frame.height + tileSize.height * 2.0 {
+                animate = false
+            }
+        } else {
+            if startContainerAvatarPosition.x < -tileSize.width * 4.0 || startContainerAvatarPosition.x > containerNode.frame.width + tileSize.width * 4.0 {
+                animate = false
+            }
+        }
+        if animate {
+            sourceNode.avatarNode.alpha = 0.0
+            sourceNode.audioLevelView?.alpha = 0.0
+            
+            let initialAvatarPosition = self.avatarNode.position
+            let initialBackgroundPosition = sourceNode.backgroundImageNode.position
+            let initialContentPosition = sourceNode.contentWrapperNode.position
+            
+            let startContainerBackgroundPosition = sourceNode.backgroundImageNode.view.convert(sourceNode.backgroundImageNode.bounds, to: containerNode.view).center
+            let startContainerContentPosition = sourceNode.contentWrapperNode.view.convert(sourceNode.contentWrapperNode.bounds, to: containerNode.view).center
+
+            let targetContainerAvatarPosition = self.avatarNode.view.convert(self.avatarNode.bounds, to: containerNode.view).center
+
+            sourceNode.backgroundImageNode.position = targetContainerAvatarPosition
+            sourceNode.contentWrapperNode.position = targetContainerAvatarPosition
+            containerNode.addSubnode(sourceNode.backgroundImageNode)
+            containerNode.addSubnode(sourceNode.contentWrapperNode)
+
+            sourceNode.highlightNode.alpha = 0.0
+            
+            sourceNode.backgroundImageNode.layer.animatePosition(from: startContainerBackgroundPosition, to: targetContainerAvatarPosition, duration: duration, timingFunction: timingFunction, completion: { [weak sourceNode] _ in
+                if let sourceNode = sourceNode {
+                    Queue.mainQueue().after(0.1, {
+                        sourceNode.backgroundImageNode.layer.removeAllAnimations()
+                        sourceNode.contentWrapperNode.layer.removeAllAnimations()
+                    })
+                    sourceNode.backgroundImageNode.alpha = 1.0
+                    sourceNode.highlightNode.alpha = 1.0
+                    sourceNode.backgroundImageNode.position = initialBackgroundPosition
+                    sourceNode.contextSourceNode.contentNode.insertSubnode(sourceNode.backgroundImageNode, at: 0)
+                }
+            })
+
+            sourceNode.contentWrapperNode.layer.animatePosition(from: startContainerContentPosition, to: targetContainerAvatarPosition, duration: duration, timingFunction: timingFunction, completion: { [weak sourceNode] _ in
+                if let sourceNode = sourceNode {
+                    sourceNode.avatarNode.alpha = 1.0
+                    sourceNode.audioLevelView?.alpha = 1.0
+                    sourceNode.contentWrapperNode.position = initialContentPosition
+                    sourceNode.offsetContainerNode.insertSubnode(sourceNode.contentWrapperNode, aboveSubnode: sourceNode.videoContainerNode)
+                }
+            })
+
+            if let audioLevelView = self.audioLevelView {
+                audioLevelView.center = targetContainerAvatarPosition
+                containerNode.view.addSubview(audioLevelView)
+                
+                audioLevelView.layer.animateScale(from: 1.25, to: 1.0, duration: duration, timingFunction: timingFunction)
+                audioLevelView.layer.animatePosition(from: startContainerAvatarPosition, to: targetContainerAvatarPosition, duration: duration, timingFunction: timingFunction, removeOnCompletion: false)
+            }
+            self.avatarNode.position = targetContainerAvatarPosition
+            containerNode.addSubnode(self.avatarNode)
+            
+            self.avatarNode.layer.animateScale(from: 1.25, to: 1.0, duration: duration, timingFunction: timingFunction)
+            self.avatarNode.layer.animatePosition(from: startContainerAvatarPosition, to: targetContainerAvatarPosition, duration: duration, timingFunction: timingFunction, completion: { [weak self] _ in
+                if let strongSelf = self {
+                    strongSelf.avatarNode.position = initialAvatarPosition
+                    strongSelf.offsetContainerNode.addSubnode(strongSelf.avatarNode)
+                    if let audioLevelView = strongSelf.audioLevelView {
+                        audioLevelView.layer.removeAllAnimations()
+                        audioLevelView.center = initialAvatarPosition
+                        strongSelf.offsetContainerNode.view.insertSubview(audioLevelView, at: 0)
+                    }
+                }
+            })
+
+            sourceNode.backgroundImageNode.layer.animateScale(from: 1.0, to: 0.001, duration: duration, timingFunction: timingFunction)
+            sourceNode.backgroundImageNode.layer.animateAlpha(from: sourceNode.backgroundImageNode.alpha, to: 0.0, duration: duration, timingFunction: timingFunction, removeOnCompletion: false)
+            sourceNode.contentWrapperNode.layer.animateScale(from: 1.0, to: 0.001, duration: duration, timingFunction: timingFunction)
+            sourceNode.contentWrapperNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration, timingFunction: timingFunction, removeOnCompletion: false)
+        }
+    }
         
     func asyncLayout() -> (_ item: VoiceChatParticipantItem, _ params: ListViewItemLayoutParams, _ first: Bool, _ last: Bool) -> (ListViewItemNodeLayout, (Bool, Bool) -> Void) {
         let makeTitleLayout = TextNode.asyncLayout(self.titleNode)
-        let makeStatusLayout = TextNode.asyncLayout(self.statusNode)
-        let makeExpandedStatusLayout = TextNode.asyncLayout(self.expandedStatusNode)
-        var currentDisabledOverlayNode = self.disabledOverlayNode
+        let makeStatusLayout = self.statusNode.asyncLayout()
+        let makeExpandedStatusLayout = self.expandedStatusNode.asyncLayout()
         
         let currentItem = self.layoutParams?.0
+        let currentTitle = self.currentTitle
         
         return { item, params, first, last in
             var updatedTheme: PresentationTheme?
@@ -330,102 +778,57 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
             }
                         
             let titleFont = Font.regular(17.0)
-            let statusFont = Font.regular(14.0)
-            
             var titleAttributedString: NSAttributedString?
-            var statusAttributedString: NSAttributedString?
-            var expandedStatusAttributedString: NSAttributedString?
+            let titleColor = item.presentationData.theme.list.itemPrimaryTextColor
             
             let rightInset: CGFloat = params.rightInset
-        
-            let titleColor = item.presentationData.theme.list.itemPrimaryTextColor
-            let currentBoldFont: UIFont = titleFont
             
+            var updatedTitle = false
             if let user = item.peer as? TelegramUser {
                 if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
-                    let string = NSMutableAttributedString()
-                    switch item.nameDisplayOrder {
-                    case .firstLast:
-                        string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
-                        string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
-                        string.append(NSAttributedString(string: lastName, font: currentBoldFont, textColor: titleColor))
-                    case .lastFirst:
-                        string.append(NSAttributedString(string: lastName, font: currentBoldFont, textColor: titleColor))
-                        string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
-                        string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
-                    }
-                    titleAttributedString = string
+                        let string = NSMutableAttributedString()
+                        switch item.nameDisplayOrder {
+                            case .firstLast:
+                                string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                            case .lastFirst:
+                                string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                        }
+                        titleAttributedString = string
                 } else if let firstName = user.firstName, !firstName.isEmpty {
-                    titleAttributedString = NSAttributedString(string: firstName, font: currentBoldFont, textColor: titleColor)
+                    titleAttributedString = NSAttributedString(string: firstName, font: titleFont, textColor: titleColor)
                 } else if let lastName = user.lastName, !lastName.isEmpty {
-                    titleAttributedString = NSAttributedString(string: lastName, font: currentBoldFont, textColor: titleColor)
+                    titleAttributedString = NSAttributedString(string: lastName, font: titleFont, textColor: titleColor)
                 } else {
-                    titleAttributedString = NSAttributedString(string: item.presentationData.strings.User_DeletedAccount, font: currentBoldFont, textColor: titleColor)
+                    titleAttributedString = NSAttributedString(string: item.presentationData.strings.User_DeletedAccount, font: titleFont, textColor: titleColor)
                 }
             } else if let group = item.peer as? TelegramGroup {
-                titleAttributedString = NSAttributedString(string: group.title, font: currentBoldFont, textColor: titleColor)
+                titleAttributedString = NSAttributedString(string: group.title, font: titleFont, textColor: titleColor)
             } else if let channel = item.peer as? TelegramChannel {
-                titleAttributedString = NSAttributedString(string: channel.title, font: currentBoldFont, textColor: titleColor)
+                titleAttributedString = NSAttributedString(string: channel.title, font: titleFont, textColor: titleColor)
+            }
+            if let currentTitle = currentTitle, currentTitle != titleAttributedString?.string {
+                updatedTitle = true
             }
             
             var wavesColor = UIColor(rgb: 0x34c759)
-            switch item.text {
-            case .presence:
-                if let user = item.peer as? TelegramUser, let botInfo = user.botInfo {
-                    let botStatus: String
-                    if botInfo.flags.contains(.hasAccessToChatHistory) {
-                        botStatus = item.presentationData.strings.Bot_GroupStatusReadsHistory
-                    } else {
-                        botStatus = item.presentationData.strings.Bot_GroupStatusDoesNotReadHistory
-                    }
-                    statusAttributedString = NSAttributedString(string: botStatus, font: statusFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor)
-                } else if let presence = item.presence as? TelegramUserPresence {
-                    let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
-                    let (string, _) = stringAndActivityForUserPresence(strings: item.presentationData.strings, dateTimeFormat: item.dateTimeFormat, presence: presence, relativeTo: Int32(timestamp))
-                    statusAttributedString = NSAttributedString(string: string, font: statusFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor)
-                } else {
-                    statusAttributedString = NSAttributedString(string: item.presentationData.strings.LastSeen_Offline, font: statusFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor)
-                }
-            case let .text(text, textColor):
-                let textColorValue: UIColor
+            if case let .text(_, _, textColor) = item.text {
                 switch textColor {
-                case .generic:
-                    textColorValue = item.presentationData.theme.list.itemSecondaryTextColor
-                case .accent:
-                    textColorValue = item.presentationData.theme.list.itemAccentColor
-                    wavesColor = textColorValue
-                case .constructive:
-                    textColorValue = UIColor(rgb: 0x34c759)
-                case .destructive:
-                    textColorValue = UIColor(rgb: 0xff3b30)
-                    wavesColor = textColorValue
+                    case .accent:
+                        wavesColor = accentColor
+                    case .destructive:
+                        wavesColor = destructiveColor
+                    default:
+                        break
                 }
-                statusAttributedString = NSAttributedString(string: text, font: statusFont, textColor: textColorValue)
-            case .none:
-                break
-            }
-            
-            if let expandedText = item.expandedText, case let .text(text, textColor) = expandedText {
-                let textColorValue: UIColor
-                switch textColor {
-                case .generic:
-                    textColorValue = item.presentationData.theme.list.itemSecondaryTextColor
-                case .accent:
-                    textColorValue = item.presentationData.theme.list.itemAccentColor
-                case .constructive:
-                    textColorValue = UIColor(rgb: 0x34c759)
-                case .destructive:
-                    textColorValue = UIColor(rgb: 0xff3b30)
-                }
-                expandedStatusAttributedString = NSAttributedString(string: text, font: statusFont, textColor: textColorValue)
-            } else {
-                expandedStatusAttributedString = statusAttributedString
             }
 
-            let leftInset: CGFloat = 65.0 + params.leftInset
+            let leftInset: CGFloat = 58.0 + params.leftInset
             let verticalInset: CGFloat = 8.0
             let verticalOffset: CGFloat = 0.0
-            let avatarSize: CGFloat = 40.0
             
             var titleIconsWidth: CGFloat = 0.0
             var currentCredibilityIconImage: UIImage?
@@ -444,102 +847,101 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
             if let currentCredibilityIconImage = currentCredibilityIconImage {
                 titleIconsWidth += 4.0 + currentCredibilityIconImage.size.width
             }
-                              
-            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - rightInset - 30.0 - titleIconsWidth, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-            let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - rightInset - 30.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
-            let (expandedStatusLayout, expandedStatusApply) = makeExpandedStatusLayout(TextNodeLayoutArguments(attributedString: expandedStatusAttributedString, backgroundColor: nil, maximumNumberOfLines: 4, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - rightInset - 30.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
             
-            let insets = UIEdgeInsets()
-    
-            let titleSpacing: CGFloat = statusLayout.size.height == 0.0 ? 0.0 : 1.0
+            var expandedRightInset: CGFloat = 30.0
+            if item.peer.smallProfileImage != nil {
+                expandedRightInset = 0.0
+            }
+                              
+            let constrainedWidth = params.width - leftInset - 12.0 - rightInset - 30.0 - titleIconsWidth
+            let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: constrainedWidth, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let expandedWidth = min(params.width - leftInset - rightInset, params.availableHeight - 30.0)
+            let (statusLayout, statusApply) = makeStatusLayout(CGSize(width: params.width - leftInset - 8.0 - rightInset - 30.0, height: CGFloat.greatestFiniteMagnitude), item.text, false)
+            let (expandedStatusLayout, expandedStatusApply) = makeExpandedStatusLayout(CGSize(width: expandedWidth - 8.0 - expandedRightInset, height: CGFloat.greatestFiniteMagnitude), item.expandedText ?? item.text, params.availableHeight > params.width)
+            
+            let titleSpacing: CGFloat = statusLayout.height == 0.0 ? 0.0 : 1.0
             
             let minHeight: CGFloat = titleLayout.size.height + verticalInset * 2.0
-            let rawHeight: CGFloat = verticalInset * 2.0 + titleLayout.size.height + titleSpacing + statusLayout.size.height
+            let rawHeight: CGFloat = verticalInset * 2.0 + titleLayout.size.height + titleSpacing + statusLayout.height
             
             let contentSize = CGSize(width: params.width, height: max(minHeight, rawHeight))
+            let insets = UIEdgeInsets()
             let separatorHeight = UIScreenPixel
             
             let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)
             let layoutSize = layout.size
             
-            if !item.enabled {
-                if currentDisabledOverlayNode == nil {
-                    currentDisabledOverlayNode = ASDisplayNode()
-                    currentDisabledOverlayNode?.backgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.5)
-                }
-            } else {
-                currentDisabledOverlayNode = nil
-            }
-            
             var animateStatusTransitionFromUp: Bool?
             if let currentItem = currentItem {
-                if case .presence = currentItem.text, case let .text(_, newColor) = item.text {
+                if case let .text(_, _, currentColor) = currentItem.text, case let .text(_, _, newColor) = item.text, currentColor != newColor {
                     animateStatusTransitionFromUp = newColor == .constructive
-                } else if case let .text(_, currentColor) = currentItem.text, case let .text(_, newColor) = item.text, currentColor != newColor {
-                    animateStatusTransitionFromUp = newColor == .constructive
-                } else if case .text = currentItem.text, case .presence = item.text {
-                    animateStatusTransitionFromUp = false
                 }
             }
-            
-            let peerRevealOptions: [ItemListRevealOption]
-            var mappedOptions: [ItemListRevealOption] = []
-            var index: Int32 = 0
-            for option in item.revealOptions {
-                let color: UIColor
-                let textColor: UIColor
-                switch option.type {
-                    case .neutral:
-                        color = item.presentationData.theme.list.itemDisclosureActions.constructive.fillColor
-                        textColor = item.presentationData.theme.list.itemDisclosureActions.constructive.foregroundColor
-                    case .warning:
-                        color = item.presentationData.theme.list.itemDisclosureActions.warning.fillColor
-                        textColor = item.presentationData.theme.list.itemDisclosureActions.warning.foregroundColor
-                    case .destructive:
-                        color = item.presentationData.theme.list.itemDisclosureActions.destructive.fillColor
-                        textColor = item.presentationData.theme.list.itemDisclosureActions.destructive.foregroundColor
-                    case .accent:
-                        color = item.presentationData.theme.list.itemDisclosureActions.accent.fillColor
-                        textColor = item.presentationData.theme.list.itemDisclosureActions.accent.foregroundColor
-                }
-                mappedOptions.append(ItemListRevealOption(key: index, title: option.title, icon: .none, color: color, textColor: textColor))
-                index += 1
-            }
-            peerRevealOptions = mappedOptions
-            
+                        
             return (layout, { [weak self] synchronousLoad, animated in
                 if let strongSelf = self {
+                    let hadItem = strongSelf.layoutParams?.0 != nil
                     strongSelf.layoutParams = (item, params, first, last)
+                    strongSelf.currentTitle = titleAttributedString?.string
                     strongSelf.wavesColor = wavesColor
-                    
-                    let nonExtractedRect = CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width - 16.0, height: layout.contentSize.height))
                                     
-                    var extractedRect = CGRect(origin: CGPoint(), size: layout.contentSize).insetBy(dx: 16.0 + params.leftInset, dy: 0.0)
-                    let extractedHeight = extractedRect.height + expandedStatusLayout.size.height - statusLayout.size.height
+                    let nonExtractedRect: CGRect
+                    let avatarFrame: CGRect
+                    let titleFrame: CGRect
+                    let animationSize: CGSize
+                    let animationFrame: CGRect
+                    let animationScale: CGFloat
+                    
+                    nonExtractedRect = CGRect(origin: CGPoint(x: 16.0, y: 0.0), size: CGSize(width: layout.contentSize.width - 32.0, height: layout.contentSize.height))
+                    avatarFrame = CGRect(origin: CGPoint(x: params.leftInset + 8.0, y: floorToScreenPixels((layout.contentSize.height - avatarSize) / 2.0)), size: CGSize(width: avatarSize, height: avatarSize))
+                    animationSize = CGSize(width: 36.0, height: 36.0)
+                    animationScale = 1.0
+                    animationFrame = CGRect(x: params.width - animationSize.width - 6.0 - params.rightInset, y: floor((layout.contentSize.height - animationSize.height) / 2.0) + 1.0, width: animationSize.width, height: animationSize.height)
+                    titleFrame = CGRect(origin: CGPoint(x: leftInset, y: verticalInset + verticalOffset), size: titleLayout.size)
+                                       
+                    var extractedRect = CGRect(origin: CGPoint(), size: layout.contentSize).insetBy(dx: params.leftInset, dy: 0.0)
+                    var extractedHeight = extractedRect.height + expandedStatusLayout.height - statusLayout.height
+                    var extractedVerticalOffset: CGFloat = 0.0
+                    if item.peer.smallProfileImage != nil {
+                        extractedRect.size.width = min(extractedRect.width, params.availableHeight - 20.0)
+                        extractedVerticalOffset = extractedRect.width
+                        extractedHeight += extractedVerticalOffset
+                    }
+
                     extractedRect.size.height = extractedHeight
                     
+                    strongSelf.extractedVerticalOffset = extractedVerticalOffset
                     strongSelf.extractedRect = extractedRect
                     strongSelf.nonExtractedRect = nonExtractedRect
                     
-                    if strongSelf.contextSourceNode.isExtractedToContextPreview {
-                        strongSelf.extractedBackgroundImageNode.frame = extractedRect
+                    if strongSelf.isExtracted {
+                        var extractedRect = extractedRect
+                        if !extractedVerticalOffset.isZero {
+                            extractedRect = CGRect(x: extractedRect.minX, y: extractedRect.minY + extractedVerticalOffset, width: extractedRect.width, height: extractedRect.height - extractedVerticalOffset)
+                        }
+                        strongSelf.backgroundImageNode.frame = extractedRect
                     } else {
-                        strongSelf.extractedBackgroundImageNode.frame = nonExtractedRect
+                        strongSelf.backgroundImageNode.frame = nonExtractedRect
                     }
+                    strongSelf.extractedBackgroundImageNode.frame = strongSelf.backgroundImageNode.bounds
                     strongSelf.contextSourceNode.contentRect = extractedRect
                     
-                    strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
-                    strongSelf.contextSourceNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
-                    strongSelf.offsetContainerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
-                    strongSelf.contextSourceNode.contentNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
-                    strongSelf.containerNode.isGestureEnabled = item.contextAction != nil
-                    strongSelf.actionContainerNode.frame = CGRect(origin: CGPoint(), size: layout.contentSize)
+                    let contentBounds = CGRect(origin: CGPoint(), size: layout.contentSize)
+                    strongSelf.containerNode.frame = contentBounds
+                    strongSelf.contextSourceNode.frame = contentBounds
+                    strongSelf.contentWrapperNode.frame = contentBounds
+                    strongSelf.offsetContainerNode.frame = contentBounds
+                    strongSelf.contextSourceNode.contentNode.frame = contentBounds
+                    strongSelf.actionContainerNode.frame = contentBounds
                     
+                    strongSelf.containerNode.isGestureEnabled = item.contextAction != nil
+                        
                     strongSelf.accessibilityLabel = titleAttributedString?.string
                     var combinedValueString = ""
-                    if let statusString = statusAttributedString?.string, !statusString.isEmpty {
-                        combinedValueString.append(statusString)
-                    }
+//                    if let statusString = statusAttributedString?.string, !statusString.isEmpty {
+//                        combinedValueString.append(statusString)
+//                    }
                     
                     strongSelf.accessibilityValue = combinedValueString
                     
@@ -550,27 +952,19 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                     }
                                         
                     let transition: ContainedViewLayoutTransition
-                    if animated {
-                        transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+                    if animated && hadItem {
+                        transition = ContainedViewLayoutTransition.animated(duration: 0.3, curve: .easeInOut)
                     } else {
                         transition = .immediate
                     }
                     
-                    if let currentDisabledOverlayNode = currentDisabledOverlayNode {
-                        if currentDisabledOverlayNode != strongSelf.disabledOverlayNode {
-                            strongSelf.disabledOverlayNode = currentDisabledOverlayNode
-                            strongSelf.addSubnode(currentDisabledOverlayNode)
-                            currentDisabledOverlayNode.alpha = 0.0
-                            transition.updateAlpha(node: currentDisabledOverlayNode, alpha: 1.0)
-                            currentDisabledOverlayNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight))
-                        } else {
-                            transition.updateFrame(node: currentDisabledOverlayNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.contentSize.width, height: layout.contentSize.height - separatorHeight)))
-                        }
-                    } else if let disabledOverlayNode = strongSelf.disabledOverlayNode {
-                        transition.updateAlpha(node: disabledOverlayNode, alpha: 0.0, completion: { [weak disabledOverlayNode] _ in
-                            disabledOverlayNode?.removeFromSupernode()
+                    if updatedTitle, let snapshotView = strongSelf.titleNode.view.snapshotContentTree() {
+                        strongSelf.titleNode.view.superview?.insertSubview(snapshotView, aboveSubview: strongSelf.titleNode.view)
+
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
                         })
-                        strongSelf.disabledOverlayNode = nil
+                        strongSelf.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
                     }
                     
                     if let animateStatusTransitionFromUp = animateStatusTransitionFromUp, !strongSelf.contextSourceNode.isExtractedToContextPreview {
@@ -602,13 +996,13 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
 
                     strongSelf.topStripeNode.isHidden = first
                     strongSelf.bottomStripeNode.isHidden = last
-                
+                 
                     transition.updateFrame(node: strongSelf.topStripeNode, frame: CGRect(origin: CGPoint(x: leftInset, y: -min(insets.top, separatorHeight)), size: CGSize(width: layoutSize.width, height: separatorHeight)))
                     transition.updateFrame(node: strongSelf.bottomStripeNode, frame: CGRect(origin: CGPoint(x: leftInset, y: contentSize.height + -separatorHeight), size: CGSize(width: layoutSize.width - leftInset, height: separatorHeight)))
                     
-                    transition.updateFrame(node: strongSelf.titleNode, frame: CGRect(origin: CGPoint(x: leftInset, y: verticalInset + verticalOffset), size: titleLayout.size))
-                    transition.updateFrame(node: strongSelf.statusNode, frame: CGRect(origin: CGPoint(x: leftInset, y: strongSelf.titleNode.frame.maxY + titleSpacing), size: statusLayout.size))
-                    transition.updateFrame(node: strongSelf.expandedStatusNode, frame: CGRect(origin: CGPoint(x: leftInset, y: strongSelf.titleNode.frame.maxY + titleSpacing), size: expandedStatusLayout.size))
+                    transition.updateFrame(node: strongSelf.titleNode, frame: titleFrame)
+                    transition.updateFrame(node: strongSelf.statusNode, frame: CGRect(origin: CGPoint(x: leftInset, y: strongSelf.titleNode.frame.maxY + titleSpacing), size: statusLayout))
+                    transition.updateFrame(node: strongSelf.expandedStatusNode, frame: CGRect(origin: CGPoint(x: leftInset, y: strongSelf.titleNode.frame.maxY + titleSpacing), size: expandedStatusLayout))
                     
                     if let currentCredibilityIconImage = currentCredibilityIconImage {
                         let iconNode: ASImageNode
@@ -629,7 +1023,6 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                         credibilityIconNode.removeFromSupernode()
                     }
                     
-                    let avatarFrame = CGRect(origin: CGPoint(x: params.leftInset + 15.0, y: floorToScreenPixels((layout.contentSize.height - avatarSize) / 2.0)), size: CGSize(width: avatarSize, height: avatarSize))
                     transition.updateFrameAsPositionAndBounds(node: strongSelf.avatarNode, frame: avatarFrame)
                     
                     let blobFrame = avatarFrame.insetBy(dx: -14.0, dy: -14.0)
@@ -663,6 +1056,8 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                                     audioLevelView.layer.mask = playbackMaskLayer
                                     
                                     audioLevelView.setColor(wavesColor)
+                                    audioLevelView.alpha = strongSelf.isExtracted ? 0.0 : 1.0
+                                    
                                     strongSelf.audioLevelView = audioLevelView
                                     strongSelf.offsetContainerNode.view.insertSubview(audioLevelView, at: 0)
                                 }
@@ -672,19 +1067,31 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                                     audioLevelView.updateLevel(CGFloat(value))
                                     
                                     let avatarScale: CGFloat
-                                    if value > 0.0 {
+                                    if value > 0.02 {
                                         audioLevelView.startAnimating()
                                         avatarScale = 1.03 + level * 0.13
                                         if let wavesColor = strongSelf.wavesColor {
                                             audioLevelView.setColor(wavesColor, animated: true)
                                         }
+                                        
+                                        if let silenceTimer = strongSelf.silenceTimer {
+                                            silenceTimer.invalidate()
+                                            strongSelf.silenceTimer = nil
+                                        }
                                     } else {
-                                        audioLevelView.stopAnimating(duration: 0.5)
                                         avatarScale = 1.0
+                                        if strongSelf.silenceTimer == nil {
+                                            let silenceTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: false, completion: { [weak self] in
+                                                self?.audioLevelView?.stopAnimating(duration: 0.75)
+                                                self?.silenceTimer = nil
+                                            }, queue: Queue.mainQueue())
+                                            strongSelf.silenceTimer = silenceTimer
+                                            silenceTimer.start()
+                                        }
                                     }
                                     
                                     let transition: ContainedViewLayoutTransition = .animated(duration: 0.15, curve: .easeInOut)
-                                    transition.updateTransformScale(node: strongSelf.avatarNode, scale: avatarScale, beginWithCurrentState: true)
+                                    transition.updateTransformScale(node: strongSelf.avatarNode, scale: strongSelf.isExtracted ? 1.0 : avatarScale, beginWithCurrentState: true)
                                 }
                             }))
                         }
@@ -699,9 +1106,13 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                     if item.peer.isDeleted {
                         overrideImage = .deletedIcon
                     }
-                    strongSelf.avatarNode.setPeer(context: item.context, theme: item.presentationData.theme, peer: item.peer, overrideImage: overrideImage, emptyColor: item.presentationData.theme.list.mediaPlaceholderColor, synchronousLoad: synchronousLoad)
+                    strongSelf.avatarNode.setPeer(context: item.context, theme: item.presentationData.theme, peer: item.peer, overrideImage: overrideImage, emptyColor: item.presentationData.theme.list.mediaPlaceholderColor, synchronousLoad: synchronousLoad, storeUnrounded: true)
                 
-                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: params.width, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel))
+                    strongSelf.highlightContainerNode.frame = CGRect(origin: CGPoint(x: params.leftInset, y: -UIScreenPixel), size: CGSize(width: params.width - params.leftInset - params.rightInset, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel + 11.0))
+                    
+                    strongSelf.highlightContainerNode.cornerRadius = first ? 11.0 : 0.0
+                    
+                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: params.width, height: layout.contentSize.height + UIScreenPixel + UIScreenPixel))
                     
                     var hadMicrophoneNode = false
                     var hadRaiseHandNode = false
@@ -719,6 +1130,7 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                             
                             nodeToAnimateIn = animationNode
                         }
+                        animationNode.alpha = 1.0
                         animationNode.update(state: VoiceChatMicrophoneNode.State(muted: muted, filled: false, color: color), animated: true)
                         strongSelf.actionButtonNode.isUserInteractionEnabled = false
                     } else if let animationNode = strongSelf.animationNode {
@@ -795,40 +1207,16 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                         node.layer.animateScale(from: 0.001, to: 1.0, duration: 0.2)
                     }
                     
-                    let videoSize = CGSize(width: avatarSize, height: avatarSize)
+                    strongSelf.avatarNode.isHidden = strongSelf.isExtracted
                     
-                    let videoNode = item.getVideo()
-                    if let current = strongSelf.videoNode, current !== videoNode {
-                        current.removeFromSupernode()
-                    }
-                    let actionOffset: CGFloat = 0.0
-                    strongSelf.videoNode = videoNode
-                    if let videoNode = videoNode {
-                        videoNode.updateLayout(size: videoSize, transition: .immediate)
-                        if videoNode.supernode !== strongSelf.avatarNode {
-                            videoNode.clipsToBounds = true
-                            videoNode.cornerRadius = avatarSize / 2.0
-                            strongSelf.avatarNode.addSubnode(videoNode)
-                        }
-                        
-                        videoNode.frame = CGRect(origin: CGPoint(), size: videoSize)
-                    }
-                    
-                    let animationSize = CGSize(width: 36.0, height: 36.0)
                     strongSelf.iconNode?.frame = CGRect(origin: CGPoint(), size: animationSize)
                     strongSelf.animationNode?.frame = CGRect(origin: CGPoint(), size: animationSize)
                     strongSelf.raiseHandNode?.frame = CGRect(origin: CGPoint(), size: animationSize).insetBy(dx: -6.0, dy: -6.0).offsetBy(dx: -2.0, dy: 0.0)
                     
-                    strongSelf.actionButtonNode.frame = CGRect(x: params.width - animationSize.width - 6.0 - params.rightInset + actionOffset, y: floor((layout.contentSize.height - animationSize.height) / 2.0) + 1.0, width: animationSize.width, height: animationSize.height)
-                    
-                    if let presence = item.presence as? TelegramUserPresence {
-                        strongSelf.peerPresenceManager?.reset(presence: presence)
-                    }
-                    
+                    strongSelf.actionButtonNode.transform = CATransform3DMakeScale(animationScale, animationScale, 1.0)
+                    transition.updateFrame(node: strongSelf.actionButtonNode, frame: animationFrame)
+
                     strongSelf.updateIsHighlighted(transition: transition)
-                    
-                    strongSelf.setRevealOptions((left: [], right: peerRevealOptions))
-                    strongSelf.setRevealOptionsOpened(item.revealed ?? false, animated: animated)
                 }
             })
         }
@@ -837,8 +1225,8 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
     var isHighlighted = false
     func updateIsHighlighted(transition: ContainedViewLayoutTransition) {
         if self.isHighlighted {
-            self.highlightedBackgroundNode.alpha = 1.0
-            if self.highlightedBackgroundNode.supernode == nil {
+            self.highlightContainerNode.alpha = 1.0
+            if self.highlightContainerNode.supernode == nil {
                 var anchorNode: ASDisplayNode?
                 if self.bottomStripeNode.supernode != nil {
                     anchorNode = self.bottomStripeNode
@@ -846,24 +1234,24 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
                     anchorNode = self.topStripeNode
                 }
                 if let anchorNode = anchorNode {
-                    self.insertSubnode(self.highlightedBackgroundNode, aboveSubnode: anchorNode)
+                    self.insertSubnode(self.highlightContainerNode, aboveSubnode: anchorNode)
                 } else {
-                    self.addSubnode(self.highlightedBackgroundNode)
+                    self.addSubnode(self.highlightContainerNode)
                 }
             }
         } else {
-            if self.highlightedBackgroundNode.supernode != nil {
+            if self.highlightContainerNode.supernode != nil {
                 if transition.isAnimated {
-                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                    self.highlightContainerNode.layer.animateAlpha(from: self.highlightContainerNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
                         if let strongSelf = self {
                             if completed {
-                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                                strongSelf.highlightContainerNode.removeFromSupernode()
                             }
                         }
                     })
-                    self.highlightedBackgroundNode.alpha = 0.0
+                    self.highlightContainerNode.alpha = 0.0
                 } else {
-                    self.highlightedBackgroundNode.removeFromSupernode()
+                    self.highlightContainerNode.removeFromSupernode()
                 }
             }
         }
@@ -885,7 +1273,7 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
     }
     
-    override func header() -> ListViewItemHeader? {
+    override func headers() -> [ListViewItemHeader]? {
         return nil
     }
     
@@ -900,47 +1288,4 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode {
             contextAction(self.contextSourceNode, nil)
         }
     }
-    
-    override func updateRevealOffset(offset: CGFloat, transition: ContainedViewLayoutTransition) {
-        super.updateRevealOffset(offset: offset, transition: transition)
-        
-        if let _ = self.layoutParams?.0, let params = self.layoutParams?.1 {
-            let leftInset: CGFloat = 65.0 + params.leftInset
-                        
-            var avatarFrame = self.avatarNode.frame
-            avatarFrame.origin.x = offset + leftInset - 50.0
-            transition.updateFrame(node: self.avatarNode, frame: avatarFrame)
-            
-            var titleFrame = self.titleNode.frame
-            titleFrame.origin.x = leftInset + offset
-            transition.updateFrame(node: self.titleNode, frame: titleFrame)
-            
-            var statusFrame = self.statusNode.frame
-            let previousStatusFrame = statusFrame
-            statusFrame.origin.x = leftInset + offset
-            self.statusNode.frame = statusFrame
-            transition.animatePositionAdditive(node: self.statusNode, offset: CGPoint(x: previousStatusFrame.minX - statusFrame.minX, y: 0))
-        }
-    }
-    
-    override func revealOptionsInteractivelyOpened() {
-        if let item = self.layoutParams?.0 {
-            item.setPeerIdWithRevealedOptions(item.peer.id, nil)
-        }
-    }
-    
-    override func revealOptionsInteractivelyClosed() {
-        if let item = self.layoutParams?.0 {
-            item.setPeerIdWithRevealedOptions(nil, item.peer.id)
-        }
-    }
-    
-    override func revealOptionSelected(_ option: ItemListRevealOption, animated: Bool) {
-        if let item = self.layoutParams?.0 {
-            item.revealOptions[Int(option.key)].action()
-        }
-        
-        self.setRevealOptionsOpened(false, animated: true)
-        self.revealOptionsInteractivelyClosed()
-    }
 }
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatPeerProfileNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatPeerProfileNode.swift
new file mode 100644
index 0000000000..61472fcb1f
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatPeerProfileNode.swift
@@ -0,0 +1,504 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import Postbox
+import TelegramCore
+import SyncCore
+import TelegramPresentationData
+import TelegramUIPreferences
+import PresentationDataUtils
+import AvatarNode
+import TelegramStringFormatting
+import ContextUI
+import AccountContext
+import LegacyComponents
+import PeerInfoAvatarListNode
+
+private let backgroundCornerRadius: CGFloat = 14.0
+
+final class VoiceChatPeerProfileNode: ASDisplayNode {
+    private let context: AccountContext
+    private let size: CGSize
+    private var peer: Peer
+    private var text: VoiceChatParticipantItem.ParticipantText
+    private let customNode: ASDisplayNode?
+    private let additionalEntry: Signal<(TelegramMediaImageRepresentation, Float)?, NoError>
+    
+    private let backgroundImageNode: ASImageNode
+    private let avatarListContainerNode: ASDisplayNode
+    let avatarListWrapperNode: PinchSourceContainerNode
+    let avatarListNode: PeerInfoAvatarListContainerNode
+    private var videoFadeNode: ASImageNode
+    private let infoNode: ASDisplayNode
+    private let titleNode: ImmediateTextNode
+    private let statusNode: VoiceChatParticipantStatusNode
+    
+    private var appeared = false
+    
+    init(context: AccountContext, size: CGSize, sourceSize: CGSize, peer: Peer, text: VoiceChatParticipantItem.ParticipantText, customNode: ASDisplayNode? = nil, additionalEntry: Signal<(TelegramMediaImageRepresentation, Float)?, NoError>, requestDismiss: (() -> Void)?) {
+        self.context = context
+        self.size = size
+        self.peer = peer
+        self.text = text
+        self.customNode = customNode
+        self.additionalEntry = additionalEntry
+        
+        self.backgroundImageNode = ASImageNode()
+        self.backgroundImageNode.clipsToBounds = true
+        self.backgroundImageNode.displaysAsynchronously = false
+        self.backgroundImageNode.displayWithoutProcessing = true
+        
+        self.videoFadeNode = ASImageNode()
+        self.videoFadeNode.displaysAsynchronously = false
+        self.videoFadeNode.contentMode = .scaleToFill
+        
+        self.avatarListContainerNode = ASDisplayNode()
+        self.avatarListContainerNode.clipsToBounds = true
+        
+        self.avatarListWrapperNode = PinchSourceContainerNode()
+        self.avatarListWrapperNode.clipsToBounds = true
+        self.avatarListWrapperNode.cornerRadius = backgroundCornerRadius
+       
+        self.avatarListNode = PeerInfoAvatarListContainerNode(context: context)
+        self.avatarListNode.backgroundColor = .clear
+        self.avatarListNode.peer = peer
+        self.avatarListNode.firstFullSizeOnly = true
+        self.avatarListNode.offsetLocation = true
+        self.avatarListNode.customCenterTapAction = {
+            requestDismiss?()
+        }
+        
+        self.infoNode = ASDisplayNode()
+        self.infoNode.clipsToBounds = true
+        
+        self.titleNode = ImmediateTextNode()
+        self.titleNode.isUserInteractionEnabled = false
+        self.titleNode.contentMode = .left
+        self.titleNode.contentsScale = UIScreen.main.scale
+        
+        self.statusNode = VoiceChatParticipantStatusNode()
+        self.statusNode.isUserInteractionEnabled = false
+        
+        super.init()
+        
+        self.clipsToBounds = true
+        
+        self.addSubnode(self.backgroundImageNode)
+        self.addSubnode(self.infoNode)
+        self.addSubnode(self.videoFadeNode)
+        self.addSubnode(self.avatarListWrapperNode)
+        self.infoNode.addSubnode(self.titleNode)
+        self.infoNode.addSubnode(self.statusNode)
+        
+        self.avatarListContainerNode.addSubnode(self.avatarListNode)
+        self.avatarListContainerNode.addSubnode(self.avatarListNode.controlsClippingOffsetNode)
+        self.avatarListWrapperNode.contentNode.addSubnode(self.avatarListContainerNode)
+        
+        self.avatarListWrapperNode.activate = { [weak self] sourceNode in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.avatarListNode.controlsContainerNode.alpha = 0.0
+            let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                return UIScreen.main.bounds
+            })
+            context.sharedContext.mainWindow?.presentInGlobalOverlay(pinchController)
+        }
+        self.avatarListWrapperNode.deactivated = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.avatarListWrapperNode.contentNode.layer.animate(from: 0.0 as NSNumber, to: backgroundCornerRadius as NSNumber, keyPath: "cornerRadius", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.3, completion: { _ in
+            })
+        }
+        self.avatarListWrapperNode.animatedOut = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.avatarListNode.controlsContainerNode.alpha = 1.0
+            strongSelf.avatarListNode.controlsContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+        }
+        
+        self.updateInfo(size: size, sourceSize: sourceSize, animate: false)
+    }
+    
+    func updateInfo(size: CGSize, sourceSize: CGSize, animate: Bool) {
+        let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+        
+        let titleFont = Font.regular(17.0)
+        let titleColor = UIColor.white
+        var titleAttributedString: NSAttributedString?
+        if let user = self.peer as? TelegramUser {
+            if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
+                let string = NSMutableAttributedString()
+                switch presentationData.nameDisplayOrder {
+                    case .firstLast:
+                        string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                        string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                        string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                    case .lastFirst:
+                        string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                        string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                        string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                }
+                titleAttributedString = string
+            } else if let firstName = user.firstName, !firstName.isEmpty {
+                titleAttributedString = NSAttributedString(string: firstName, font: titleFont, textColor: titleColor)
+            } else if let lastName = user.lastName, !lastName.isEmpty {
+                titleAttributedString = NSAttributedString(string: lastName, font: titleFont, textColor: titleColor)
+            } else {
+                titleAttributedString = NSAttributedString(string: presentationData.strings.User_DeletedAccount, font: titleFont, textColor: titleColor)
+            }
+        } else if let group = peer as? TelegramGroup {
+            titleAttributedString = NSAttributedString(string: group.title, font: titleFont, textColor: titleColor)
+        } else if let channel = peer as? TelegramChannel {
+            titleAttributedString = NSAttributedString(string: channel.title, font: titleFont, textColor: titleColor)
+        }
+        self.titleNode.attributedText = titleAttributedString
+        
+        let titleSize = self.titleNode.updateLayout(CGSize(width: self.size.width - 24.0, height: size.height))
+        
+        let makeStatusLayout = self.statusNode.asyncLayout()
+        let (statusLayout, statusApply) = makeStatusLayout(CGSize(width: self.size.width - 24.0, height: CGFloat.greatestFiniteMagnitude), self.text, true)
+        let _ = statusApply()
+        
+        self.titleNode.frame = CGRect(origin: CGPoint(x: 14.0, y: 0.0), size: titleSize)
+        self.statusNode.frame = CGRect(origin: CGPoint(x: 14.0, y: titleSize.height + 3.0), size: statusLayout)
+        
+        let totalHeight = titleSize.height + statusLayout.height + 3.0 + 8.0
+        let infoFrame = CGRect(x: 0.0, y: size.height - totalHeight, width: sourceSize.width, height: totalHeight)
+
+        if animate {
+            let springDuration: Double = !self.appeared ? 0.42 : 0.3
+            let springDamping: CGFloat = !self.appeared ? 124.0 : 1000.0
+            
+            let initialInfoPosition = self.infoNode.position
+            self.infoNode.layer.position = infoFrame.center
+            let initialInfoBounds = self.infoNode.bounds
+            self.infoNode.layer.bounds = CGRect(origin: CGPoint(), size: infoFrame.size)
+            
+            self.infoNode.layer.animateSpring(from: NSValue(cgPoint: initialInfoPosition), to: NSValue(cgPoint: self.infoNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+            self.infoNode.layer.animateSpring(from: NSValue(cgRect: initialInfoBounds), to: NSValue(cgRect: self.infoNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+        } else {
+            self.infoNode.frame = infoFrame
+        }
+    }
+    
+    func animateIn(from sourceNode: ASDisplayNode, targetRect: CGRect, transition: ContainedViewLayoutTransition) {
+        let radiusTransition = ContainedViewLayoutTransition.animated(duration: 0.15, curve: .easeInOut)
+        let springDuration: Double = 0.42
+        let springDamping: CGFloat = 124.0
+        
+        if let sourceNode = sourceNode as? VoiceChatTileItemNode {
+            let sourceRect = sourceNode.bounds
+            self.backgroundImageNode.frame = sourceNode.bounds
+            self.updateInfo(size: sourceNode.bounds.size, sourceSize: sourceNode.bounds.size, animate: false)
+            self.updateInfo(size: targetRect.size, sourceSize: targetRect.size, animate: true)
+                        
+            self.backgroundImageNode.image = generateImage(CGSize(width: backgroundCornerRadius * 2.0, height: backgroundCornerRadius * 2.0), rotatedContext: { (size, context) in
+                let bounds = CGRect(origin: CGPoint(), size: size)
+                context.clear(bounds)
+                
+                context.setFillColor(UIColor(rgb: 0x1c1c1e).cgColor)
+                context.fillEllipse(in: bounds)
+                context.fill(CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height / 2.0))
+            })?.stretchableImage(withLeftCapWidth: Int(backgroundCornerRadius), topCapHeight: Int(backgroundCornerRadius))
+            self.backgroundImageNode.cornerRadius = backgroundCornerRadius
+                                  
+            transition.updateCornerRadius(node: self.backgroundImageNode, cornerRadius: 0.0)
+              
+            let initialRect = sourceRect
+            let initialScale: CGFloat = sourceRect.width / targetRect.width
+            
+            let targetSize = CGSize(width: targetRect.size.width, height: targetRect.size.width)
+            self.avatarListWrapperNode.update(size: targetSize, transition: .immediate)
+            self.avatarListWrapperNode.frame = CGRect(x: targetRect.minX, y: targetRect.minY, width: targetRect.width, height: targetRect.width + backgroundCornerRadius)
+            
+            self.avatarListContainerNode.frame = CGRect(origin: CGPoint(), size: targetSize)
+            self.avatarListContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.avatarListContainerNode.cornerRadius = targetRect.width / 2.0
+            
+            var appearanceTransition = transition
+            if transition.isAnimated {
+                appearanceTransition = .animated(duration: springDuration, curve: .customSpring(damping: springDamping, initialVelocity: 0.0))
+            }
+            
+            if let videoNode = sourceNode.videoNode {
+                videoNode.updateLayout(size: targetSize, layoutMode: .fillOrFitToSquare, transition: appearanceTransition)
+                appearanceTransition.updateFrame(node: videoNode, frame: CGRect(origin: CGPoint(), size: targetSize))
+                appearanceTransition.updateFrame(node: sourceNode.videoContainerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: targetSize.width, height: targetSize.height + backgroundCornerRadius)))
+                sourceNode.videoContainerNode.cornerRadius = backgroundCornerRadius
+            }
+            self.insertSubnode(sourceNode.videoContainerNode, belowSubnode: self.avatarListWrapperNode)
+            
+            if let snapshotView = sourceNode.infoNode.view.snapshotView(afterScreenUpdates: false) {
+                self.videoFadeNode.image = tileFadeImage
+                self.videoFadeNode.transform = CATransform3DMakeScale(1.0, -1.0, 1.0)
+                self.videoFadeNode.frame = CGRect(x: 0.0, y: sourceRect.height - sourceNode.fadeNode.frame.height, width: sourceRect.width, height: sourceNode.fadeNode.frame.height)
+                
+                self.insertSubnode(self.videoFadeNode, aboveSubnode: sourceNode.videoContainerNode)
+                self.view.insertSubview(snapshotView, aboveSubview: sourceNode.videoContainerNode.view)
+                snapshotView.frame = sourceRect
+                appearanceTransition.updateFrame(view: snapshotView, frame: CGRect(origin: CGPoint(x: 0.0, y: targetSize.height - snapshotView.frame.size.height), size: snapshotView.frame.size))
+                snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { _ in
+                    snapshotView.removeFromSuperview()
+                })
+                appearanceTransition.updateFrame(node: self.videoFadeNode, frame: CGRect(origin: CGPoint(x: 0.0, y: targetSize.height - self.videoFadeNode.frame.size.height), size: CGSize(width: targetSize.width, height: self.videoFadeNode.frame.height)))
+                self.videoFadeNode.alpha = 0.0
+                self.videoFadeNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            }
+            
+            self.avatarListWrapperNode.layer.animateSpring(from: initialScale as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+            self.avatarListWrapperNode.layer.animateSpring(from: NSValue(cgPoint: initialRect.center), to: NSValue(cgPoint: self.avatarListWrapperNode.position), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, completion: { [weak self] _ in
+                if let strongSelf = self {
+                    strongSelf.avatarListNode.updateCustomItemsOnlySynchronously = false
+                    strongSelf.avatarListNode.currentItemNode?.addSubnode(sourceNode.videoContainerNode)
+                }
+            })
+            
+            radiusTransition.updateCornerRadius(node: self.avatarListContainerNode, cornerRadius: 0.0)
+            
+            self.avatarListWrapperNode.contentNode.clipsToBounds = true
+
+            self.avatarListNode.frame = CGRect(x: targetRect.width / 2.0, y: targetRect.width / 2.0, width: targetRect.width, height: targetRect.width)
+            self.avatarListNode.controlsClippingNode.frame = CGRect(x: -targetRect.width / 2.0, y: -targetRect.width / 2.0, width: targetRect.width, height: targetRect.width)
+            self.avatarListNode.controlsClippingOffsetNode.frame = CGRect(origin: CGPoint(x: targetRect.width / 2.0, y: targetRect.width / 2.0), size: CGSize())
+            self.avatarListNode.stripContainerNode.frame = CGRect(x: 0.0, y: 13.0, width: targetRect.width, height: 2.0)
+            self.avatarListNode.shadowNode.frame = CGRect(x: 0.0, y: 0.0, width: targetRect.width, height: 44.0)
+            
+            self.avatarListNode.updateCustomItemsOnlySynchronously = true
+            self.avatarListNode.update(size: targetSize, peer: self.peer, customNode: self.customNode, additionalEntry: self.additionalEntry, isExpanded: true, transition: .immediate)
+            
+            let backgroundTargetRect = CGRect(x: 0.0, y: targetSize.height - backgroundCornerRadius * 2.0, width: targetRect.width, height: targetRect.height - targetSize.height + backgroundCornerRadius * 2.0)
+            let initialBackgroundPosition = self.backgroundImageNode.position
+            self.backgroundImageNode.layer.position = backgroundTargetRect.center
+            let initialBackgroundBounds = self.backgroundImageNode.bounds
+            self.backgroundImageNode.layer.bounds = CGRect(origin: CGPoint(), size: backgroundTargetRect.size)
+            
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: self.backgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: self.backgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+        } else if let sourceNode = sourceNode as? VoiceChatFullscreenParticipantItemNode {
+            let sourceRect = sourceNode.bounds
+            self.backgroundImageNode.frame = sourceNode.bounds
+            self.updateInfo(size: sourceNode.bounds.size, sourceSize: sourceNode.bounds.size, animate: false)
+            self.updateInfo(size: targetRect.size, sourceSize: targetRect.size, animate: true)
+            
+            self.backgroundImageNode.image = generateImage(CGSize(width: backgroundCornerRadius * 2.0, height: backgroundCornerRadius * 2.0), rotatedContext: { (size, context) in
+                let bounds = CGRect(origin: CGPoint(), size: size)
+                context.clear(bounds)
+                
+                context.setFillColor(UIColor(rgb: 0x1c1c1e).cgColor)
+                context.fillEllipse(in: bounds)
+                context.fill(CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height / 2.0))
+            })?.stretchableImage(withLeftCapWidth: Int(backgroundCornerRadius), topCapHeight: Int(backgroundCornerRadius))
+            self.backgroundImageNode.cornerRadius = backgroundCornerRadius
+                                  
+            transition.updateCornerRadius(node: self.backgroundImageNode, cornerRadius: 0.0)
+              
+            let initialRect: CGRect
+            let hasVideo: Bool
+            if let videoNode = sourceNode.videoNode, videoNode.supernode == sourceNode.videoContainerNode, !videoNode.alpha.isZero {
+                initialRect = sourceRect
+                hasVideo = true
+            } else {
+                initialRect = sourceNode.avatarNode.frame
+                hasVideo = false
+            }
+            let initialScale = initialRect.width / targetRect.width
+            
+            let targetSize = CGSize(width: targetRect.size.width, height: targetRect.size.width)
+            self.avatarListWrapperNode.update(size: targetSize, transition: .immediate)
+            self.avatarListWrapperNode.frame = CGRect(x: targetRect.minX, y: targetRect.minY, width: targetRect.width, height: targetRect.width + backgroundCornerRadius)
+            
+            self.avatarListContainerNode.frame = CGRect(origin: CGPoint(), size: targetSize)
+            self.avatarListContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            self.avatarListContainerNode.cornerRadius = targetRect.width / 2.0
+            
+            var appearanceTransition = transition
+            if transition.isAnimated {
+                appearanceTransition = .animated(duration: springDuration, curve: .customSpring(damping: springDamping, initialVelocity: 0.0))
+            }
+            
+            if let videoNode = sourceNode.videoNode, hasVideo {
+                videoNode.updateLayout(size: targetSize, layoutMode: .fillOrFitToSquare, transition: appearanceTransition)
+                appearanceTransition.updateFrame(node: videoNode, frame: CGRect(origin: CGPoint(), size: targetSize))
+                appearanceTransition.updateFrame(node: sourceNode.videoFadeNode, frame: CGRect(origin: CGPoint(x: 0.0, y: targetSize.height - fadeHeight), size: CGSize(width: targetSize.width, height: fadeHeight)))
+                appearanceTransition.updateTransformScale(node: sourceNode.videoContainerNode, scale: 1.0)
+                appearanceTransition.updateFrame(node: sourceNode.videoContainerNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: targetSize.width, height: targetSize.height + backgroundCornerRadius)))
+                sourceNode.videoContainerNode.cornerRadius = backgroundCornerRadius
+                appearanceTransition.updateAlpha(node: sourceNode.videoFadeNode, alpha: 0.0)
+            } else {
+                let transitionNode = ASImageNode()
+                transitionNode.clipsToBounds = true
+                transitionNode.displaysAsynchronously = false
+                transitionNode.displayWithoutProcessing = true
+                transitionNode.image = sourceNode.avatarNode.unroundedImage
+                transitionNode.frame = CGRect(origin: CGPoint(), size: targetSize)
+                transitionNode.cornerRadius = targetRect.width / 2.0
+                radiusTransition.updateCornerRadius(node: transitionNode, cornerRadius: 0.0)
+                
+                sourceNode.avatarNode.isHidden = true
+                self.avatarListWrapperNode.contentNode.insertSubnode(transitionNode, at: 0)
+            }
+            self.insertSubnode(sourceNode.videoContainerNode, belowSubnode: self.avatarListWrapperNode)
+            
+            self.avatarListWrapperNode.layer.animateSpring(from: initialScale as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+            self.avatarListWrapperNode.layer.animateSpring(from: NSValue(cgPoint: initialRect.center), to: NSValue(cgPoint: self.avatarListWrapperNode.position), keyPath: "position", duration: springDuration, initialVelocity: 0.0, damping: springDamping, completion: { [weak self] _ in
+                if let strongSelf = self {
+                    strongSelf.avatarListNode.updateCustomItemsOnlySynchronously = false
+                    strongSelf.avatarListNode.currentItemNode?.addSubnode(sourceNode.videoContainerNode)
+                }
+            })
+            
+            radiusTransition.updateCornerRadius(node: self.avatarListContainerNode, cornerRadius: 0.0)
+            
+            self.avatarListWrapperNode.contentNode.clipsToBounds = true
+
+            self.avatarListNode.frame = CGRect(x: targetRect.width / 2.0, y: targetRect.width / 2.0, width: targetRect.width, height: targetRect.width)
+            self.avatarListNode.controlsClippingNode.frame = CGRect(x: -targetRect.width / 2.0, y: -targetRect.width / 2.0, width: targetRect.width, height: targetRect.width)
+            self.avatarListNode.controlsClippingOffsetNode.frame = CGRect(origin: CGPoint(x: targetRect.width / 2.0, y: targetRect.width / 2.0), size: CGSize())
+            self.avatarListNode.stripContainerNode.frame = CGRect(x: 0.0, y: 13.0, width: targetRect.width, height: 2.0)
+            self.avatarListNode.shadowNode.frame = CGRect(x: 0.0, y: 0.0, width: targetRect.width, height: 44.0)
+            
+            self.avatarListNode.updateCustomItemsOnlySynchronously = true
+            self.avatarListNode.update(size: targetSize, peer: self.peer, customNode: self.customNode, additionalEntry: self.additionalEntry, isExpanded: true, transition: .immediate)
+            
+            let backgroundTargetRect = CGRect(x: 0.0, y: targetSize.height - backgroundCornerRadius * 2.0, width: targetRect.width, height: targetRect.height - targetSize.height + backgroundCornerRadius * 2.0)
+            let initialBackgroundPosition = self.backgroundImageNode.position
+            self.backgroundImageNode.layer.position = backgroundTargetRect.center
+            let initialBackgroundBounds = self.backgroundImageNode.bounds
+            self.backgroundImageNode.layer.bounds = CGRect(origin: CGPoint(), size: backgroundTargetRect.size)
+            
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: self.backgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: self.backgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+        }
+        self.appeared = true
+    }
+    
+    func animateOut(to targetNode: ASDisplayNode, targetRect: CGRect, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void = {}) {
+        let radiusTransition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
+        let springDuration: Double = 0.3
+        let springDamping: CGFloat = 1000.0
+        if let targetNode = targetNode as? VoiceChatTileItemNode {
+            let initialSize = self.bounds
+            self.updateInfo(size: targetRect.size, sourceSize: targetRect.size, animate: true)
+            
+            transition.updateCornerRadius(node: self.backgroundImageNode, cornerRadius: backgroundCornerRadius)
+            
+            let targetScale = targetRect.width / avatarListContainerNode.frame.width
+                        
+            self.insertSubnode(targetNode.videoContainerNode, belowSubnode: self.avatarListWrapperNode)
+            self.insertSubnode(self.videoFadeNode, aboveSubnode: targetNode.videoContainerNode)
+            self.avatarListWrapperNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+            
+            self.avatarListWrapperNode.layer.animate(from: 1.0 as NSNumber, to: targetScale as NSNumber, keyPath: "transform.scale", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false)
+            self.avatarListWrapperNode.layer.animate(from: NSValue(cgPoint: self.avatarListWrapperNode.position), to: NSValue(cgPoint: targetRect.center), keyPath: "position", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false, completion: { [weak self, weak targetNode] _ in
+                if let targetNode = targetNode {
+                    targetNode.contentNode.insertSubnode(targetNode.videoContainerNode, aboveSubnode: targetNode.backgroundNode)
+                }
+                completion()
+                self?.removeFromSupernode()
+            })
+            
+            radiusTransition.updateCornerRadius(node: self.avatarListContainerNode, cornerRadius: backgroundCornerRadius)
+            
+            if let snapshotView = targetNode.infoNode.view.snapshotView(afterScreenUpdates: true) {
+                self.view.insertSubview(snapshotView, aboveSubview: targetNode.videoContainerNode.view)
+                let snapshotFrame = snapshotView.frame
+                snapshotView.frame = CGRect(origin: CGPoint(x: 0.0, y: initialSize.width - snapshotView.frame.size.height), size: snapshotView.frame.size)
+                transition.updateFrame(view: snapshotView, frame: snapshotFrame)
+                snapshotView.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                transition.updateFrame(node: self.videoFadeNode, frame: CGRect(origin: CGPoint(x: 0.0, y: targetRect.height - self.videoFadeNode.frame.size.height), size: CGSize(width: targetRect.width, height: self.videoFadeNode.frame.height)))
+                self.videoFadeNode.alpha = 1.0
+                self.videoFadeNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            }
+            
+            if let videoNode = targetNode.videoNode {
+                videoNode.updateLayout(size: targetRect.size, layoutMode: .fillOrFitToSquare, transition: transition)
+                transition.updateFrame(node: videoNode, frame: targetRect)
+                transition.updateFrame(node: targetNode.videoContainerNode, frame: targetRect)
+            }
+            
+            let backgroundTargetRect = targetRect
+            let initialBackgroundPosition = self.backgroundImageNode.position
+            self.backgroundImageNode.layer.position = backgroundTargetRect.center
+            let initialBackgroundBounds = self.backgroundImageNode.bounds
+            self.backgroundImageNode.layer.bounds = CGRect(origin: CGPoint(), size: backgroundTargetRect.size)
+            
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: self.backgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: self.backgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+            
+            self.avatarListNode.stripContainerNode.alpha = 0.0
+            self.avatarListNode.stripContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            
+            self.avatarListNode.shadowNode.alpha = 0.0
+            self.avatarListNode.shadowNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            
+            self.infoNode.alpha = 0.0
+            self.infoNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+        } else if let targetNode = targetNode as? VoiceChatFullscreenParticipantItemNode {
+            let backgroundTargetRect = targetRect
+            
+            let initialSize = self.bounds
+            self.updateInfo(size: targetRect.size, sourceSize: targetRect.size, animate: true)
+            
+            targetNode.avatarNode.isHidden = false
+            
+            transition.updateCornerRadius(node: self.backgroundImageNode, cornerRadius: backgroundCornerRadius)
+            
+            var targetRect = targetRect
+            let hasVideo: Bool
+            if let videoNode = targetNode.videoNode, !videoNode.alpha.isZero {
+                hasVideo = true
+            } else {
+                targetRect = targetNode.avatarNode.frame
+                hasVideo = false
+            }
+            let targetScale = targetRect.width / self.avatarListContainerNode.frame.width
+                        
+            self.insertSubnode(targetNode.videoContainerNode, belowSubnode: self.avatarListWrapperNode)
+            self.insertSubnode(self.videoFadeNode, aboveSubnode: targetNode.videoContainerNode)
+            self.avatarListWrapperNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+            
+            self.avatarListWrapperNode.layer.animate(from: 1.0 as NSNumber, to: targetScale as NSNumber, keyPath: "transform.scale", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false)
+            self.avatarListWrapperNode.layer.animate(from: NSValue(cgPoint: self.avatarListWrapperNode.position), to: NSValue(cgPoint: targetRect.center), keyPath: "position", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.2, removeOnCompletion: false, completion: { [weak self, weak targetNode] _ in
+                if let targetNode = targetNode {
+                    targetNode.offsetContainerNode.insertSubnode(targetNode.videoContainerNode, at: 0)
+                }
+                completion()
+                self?.removeFromSupernode()
+            })
+            
+            radiusTransition.updateCornerRadius(node: self.avatarListContainerNode, cornerRadius: backgroundCornerRadius)
+            
+            if hasVideo, let videoNode = targetNode.videoNode {
+                videoNode.updateLayout(size: CGSize(width: 180.0, height: 180.0), layoutMode: .fillOrFitToSquare, transition: transition)
+                transition.updateFrame(node: videoNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: 180.0, height: 180.0)))
+                transition.updateTransformScale(node: targetNode.videoContainerNode, scale: 84.0 / 180.0)
+                transition.updateFrameAsPositionAndBounds(node: targetNode.videoContainerNode, frame: CGRect(x: 0.0, y: 0.0, width: 180.0, height: 180.0))
+                transition.updatePosition(node: targetNode.videoContainerNode, position: CGPoint(x: 42.0, y: 42.0))
+                transition.updateFrame(node: targetNode.videoFadeNode, frame: CGRect(x: 0.0, y: 180.0 - fadeHeight, width: 180.0, height: fadeHeight))
+                transition.updateAlpha(node: targetNode.videoFadeNode, alpha: 1.0)
+            }
+            
+            let initialBackgroundPosition = self.backgroundImageNode.position
+            self.backgroundImageNode.layer.position = backgroundTargetRect.center
+            let initialBackgroundBounds = self.backgroundImageNode.bounds
+            self.backgroundImageNode.layer.bounds = CGRect(origin: CGPoint(), size: backgroundTargetRect.size)
+            
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgPoint: initialBackgroundPosition), to: NSValue(cgPoint: self.backgroundImageNode.position), keyPath: "position", duration: springDuration, delay: 0.0, initialVelocity: 0.0, damping: springDamping)
+            self.backgroundImageNode.layer.animateSpring(from: NSValue(cgRect: initialBackgroundBounds), to: NSValue(cgRect: self.backgroundImageNode.bounds), keyPath: "bounds", duration: springDuration, initialVelocity: 0.0, damping: springDamping)
+            
+            self.avatarListNode.stripContainerNode.alpha = 0.0
+            self.avatarListNode.stripContainerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+           
+            self.avatarListNode.shadowNode.alpha = 0.0
+            self.avatarListNode.shadowNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+            
+            self.infoNode.alpha = 0.0
+            self.infoNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2)
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatPinNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatPinNode.swift
new file mode 100644
index 0000000000..613dd8c150
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatPinNode.swift
@@ -0,0 +1,201 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+
+private let iconImage = generateTintedImage(image: UIImage(bundleImageName: "Call/Pin"), color: .white)
+
+private final class VoiceChatPinNodeDrawingState: NSObject {
+    let color: UIColor
+    let transition: CGFloat
+    let reverse: Bool
+    
+    init(color: UIColor, transition: CGFloat, reverse: Bool) {
+        self.color = color
+        self.transition = transition
+        self.reverse = reverse
+        
+        super.init()
+    }
+}
+
+final class VoiceChatPinNode: ASDisplayNode {
+    class State: Equatable {
+        let pinned: Bool
+        let color: UIColor
+    
+        init(pinned: Bool, color: UIColor) {
+            self.pinned = pinned
+            self.color = color
+        }
+        
+        static func ==(lhs: State, rhs: State) -> Bool {
+            if lhs.pinned != rhs.pinned {
+                return false
+            }
+            if lhs.color.argb != rhs.color.argb {
+                return false
+            }
+            return true
+        }
+    }
+    
+    private class TransitionContext {
+        let startTime: Double
+        let duration: Double
+        let previousState: State
+        
+        init(startTime: Double, duration: Double, previousState: State) {
+            self.startTime = startTime
+            self.duration = duration
+            self.previousState = previousState
+        }
+    }
+    
+    private var animator: ConstantDisplayLinkAnimator?
+    
+    private var hasState = false
+    private var state: State = State(pinned: false, color: .black)
+    private var transitionContext: TransitionContext?
+    
+    override init() {
+        super.init()
+        
+        self.isOpaque = false
+    }
+    
+    func update(state: State, animated: Bool) {
+        var animated = animated
+        if !self.hasState {
+            self.hasState = true
+            animated = false
+        }
+        
+        if self.state != state {
+            let previousState = self.state
+            self.state = state
+            
+            if animated {
+                self.transitionContext = TransitionContext(startTime: CACurrentMediaTime(), duration: 0.18, previousState: previousState)
+            }
+            
+            self.updateAnimations()
+            self.setNeedsDisplay()
+        }
+    }
+    
+    private func updateAnimations() {
+        var animate = false
+        let timestamp = CACurrentMediaTime()
+        
+        if let transitionContext = self.transitionContext {
+            if transitionContext.startTime + transitionContext.duration < timestamp {
+                self.transitionContext = nil
+            } else {
+                animate = true
+            }
+        }
+        
+        if animate {
+            let animator: ConstantDisplayLinkAnimator
+            if let current = self.animator {
+                animator = current
+            } else {
+                animator = ConstantDisplayLinkAnimator(update: { [weak self] in
+                    self?.updateAnimations()
+                })
+                self.animator = animator
+            }
+            animator.isPaused = false
+        } else {
+            self.animator?.isPaused = true
+        }
+        
+        self.setNeedsDisplay()
+    }
+    
+    override public func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? {
+        var transitionFraction: CGFloat = self.state.pinned ? 1.0 : 0.0
+        var color = self.state.color
+        
+        var reverse = false
+        if let transitionContext = self.transitionContext {
+            let timestamp = CACurrentMediaTime()
+            var t = CGFloat((timestamp - transitionContext.startTime) / transitionContext.duration)
+            t = min(1.0, max(0.0, t))
+            
+            if transitionContext.previousState.pinned != self.state.pinned {
+                transitionFraction = self.state.pinned ? t : 1.0 - t
+                
+                reverse = transitionContext.previousState.pinned
+            }
+            
+            if transitionContext.previousState.color.rgb != color.rgb {
+                color = transitionContext.previousState.color.interpolateTo(color, fraction: t)!
+            }
+        }
+        
+        return VoiceChatPinNodeDrawingState(color: color, transition: transitionFraction, reverse: reverse)
+    }
+    
+    @objc override public class func draw(_ bounds: CGRect, withParameters parameters: Any?, isCancelled: () -> Bool, isRasterizing: Bool) {
+        let context = UIGraphicsGetCurrentContext()!
+        
+        if !isRasterizing {
+            context.setBlendMode(.copy)
+            context.setFillColor(UIColor.clear.cgColor)
+            context.fill(bounds)
+        }
+        
+        guard let parameters = parameters as? VoiceChatPinNodeDrawingState else {
+            return
+        }
+
+        context.setFillColor(parameters.color.cgColor)
+        
+        let clearLineWidth: CGFloat = 2.0
+        let lineWidth: CGFloat = 1.0 + UIScreenPixel
+        if let iconImage = iconImage?.cgImage {
+            context.saveGState()
+            context.translateBy(x: bounds.midX, y: bounds.midY)
+            context.scaleBy(x: 1.0, y: -1.0)
+            context.translateBy(x: -bounds.midX, y: -bounds.midY)
+            context.draw(iconImage, in: CGRect(origin: CGPoint(), size: CGSize(width: 48.0, height: 48.0)))
+            context.restoreGState()
+        }
+        
+        if parameters.transition > 0.0 {
+            let startPoint: CGPoint
+            let endPoint: CGPoint
+            
+            let origin = CGPoint(x: 14.0, y: 16.0 - UIScreenPixel)
+            let length: CGFloat = 17.0
+        
+            if parameters.reverse {
+                startPoint = CGPoint(x: origin.x + length * (1.0 - parameters.transition), y: origin.y + length * (1.0 - parameters.transition)).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+                endPoint = CGPoint(x: origin.x + length, y: origin.y + length).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+            } else {
+                startPoint = origin.offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+                endPoint = CGPoint(x: origin.x + length * parameters.transition, y: origin.y + length * parameters.transition).offsetBy(dx: UIScreenPixel, dy: -UIScreenPixel)
+            }
+            
+        
+            context.setBlendMode(.clear)
+            context.setLineWidth(clearLineWidth)
+            
+            context.move(to: startPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel))
+            context.addLine(to: endPoint.offsetBy(dx: 0.0, dy: 1.0 + UIScreenPixel))
+            context.strokePath()
+        
+            context.setBlendMode(.normal)
+            context.setStrokeColor(parameters.color.cgColor)
+            context.setLineWidth(lineWidth)
+            context.setLineCap(.round)
+            context.setLineJoin(.round)
+            
+            context.move(to: startPoint)
+            context.addLine(to: endPoint)
+            context.strokePath()
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatRecordingContextItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatRecordingContextItem.swift
index ae86077f45..235c917d83 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatRecordingContextItem.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatRecordingContextItem.swift
@@ -22,14 +22,14 @@ func generateStartRecordingIcon(color: UIColor) -> UIImage? {
 
 final class VoiceChatRecordingContextItem: ContextMenuCustomItem {
     fileprivate let timestamp: Int32
-    fileprivate let action: (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void
+    fileprivate let action: (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void
     
-    init(timestamp: Int32, action: @escaping (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void) {
+    init(timestamp: Int32, action: @escaping (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void) {
         self.timestamp = timestamp
         self.action = action
     }
     
-    func node(presentationData: PresentationData, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
+    func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
         return VoiceChatRecordingContextItemNode(presentationData: presentationData, item: self, getController: getController, actionSelected: actionSelected)
     }
 }
@@ -94,7 +94,7 @@ class VoiceChatRecordingIconNode: ASDisplayNode {
 private final class VoiceChatRecordingContextItemNode: ASDisplayNode, ContextMenuCustomNode {
     private let item: VoiceChatRecordingContextItem
     private let presentationData: PresentationData
-    private let getController: () -> ContextController?
+    private let getController: () -> ContextControllerProtocol?
     private let actionSelected: (ContextMenuActionResult) -> Void
     
     private let backgroundNode: ASDisplayNode
@@ -108,7 +108,7 @@ private final class VoiceChatRecordingContextItemNode: ASDisplayNode, ContextMen
     
     private var pointerInteraction: PointerInteraction?
 
-    init(presentationData: PresentationData, item: VoiceChatRecordingContextItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
+    init(presentationData: PresentationData, item: VoiceChatRecordingContextItem, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
         self.item = item
         self.presentationData = presentationData
         self.getController = getController
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatShareScreenContextItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatShareScreenContextItem.swift
new file mode 100644
index 0000000000..a91ab9b17b
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatShareScreenContextItem.swift
@@ -0,0 +1,188 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import TelegramPresentationData
+import AppBundle
+import ContextUI
+import TelegramStringFormatting
+import ReplayKit
+import AccountContext
+
+final class VoiceChatShareScreenContextItem: ContextMenuCustomItem {
+    fileprivate let context: AccountContext
+    fileprivate let text: String
+    fileprivate let icon: (PresentationTheme) -> UIImage?
+    fileprivate let action: (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void
+    
+    init(context: AccountContext, text: String, icon: @escaping (PresentationTheme) -> UIImage?, action: @escaping (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void) {
+        self.context = context
+        self.text = text
+        self.icon = icon
+        self.action = action
+    }
+    
+    func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
+        return VoiceChatShareScreenContextItemNode(presentationData: presentationData, item: self, getController: getController, actionSelected: actionSelected)
+    }
+}
+
+private let textFont = Font.regular(17.0)
+
+private final class VoiceChatShareScreenContextItemNode: ASDisplayNode, ContextMenuCustomNode {
+    private let item: VoiceChatShareScreenContextItem
+    private let presentationData: PresentationData
+    private let getController: () -> ContextControllerProtocol?
+    private let actionSelected: (ContextMenuActionResult) -> Void
+    
+    private let backgroundNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+    private let textNode: ImmediateTextNode
+    private let iconNode: ASImageNode
+    
+    private var timer: SwiftSignalKit.Timer?
+    
+    private var pointerInteraction: PointerInteraction?
+    
+    private var broadcastPickerView: UIView?
+    private var applicationStateDisposable: Disposable?
+
+    init(presentationData: PresentationData, item: VoiceChatShareScreenContextItem, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
+        self.item = item
+        self.presentationData = presentationData
+        self.getController = getController
+        self.actionSelected = actionSelected
+        
+        let textFont = Font.regular(presentationData.listsFontSize.baseDisplaySize)
+        
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.isAccessibilityElement = false
+        self.backgroundNode.backgroundColor = presentationData.theme.contextMenu.itemBackgroundColor
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isAccessibilityElement = false
+        self.highlightedBackgroundNode.backgroundColor = presentationData.theme.contextMenu.itemHighlightedBackgroundColor
+        self.highlightedBackgroundNode.alpha = 0.0
+        
+        self.textNode = ImmediateTextNode()
+        self.textNode.isAccessibilityElement = false
+        self.textNode.isUserInteractionEnabled = false
+        self.textNode.displaysAsynchronously = false
+        self.textNode.attributedText = NSAttributedString(string: item.text, font: textFont, textColor: presentationData.theme.contextMenu.primaryColor)
+        self.textNode.maximumNumberOfLines = 1
+    
+        if #available(iOS 12.0, *) {
+            let broadcastPickerView = RPSystemBroadcastPickerView(frame: CGRect(x: 0, y: 0, width: 50, height: 52.0))
+            broadcastPickerView.alpha = 0.02
+            broadcastPickerView.preferredExtension = "\(item.context.sharedContext.applicationBindings.appBundleId).BroadcastUpload"
+            broadcastPickerView.showsMicrophoneButton = false
+            self.broadcastPickerView = broadcastPickerView
+        }
+        
+        self.iconNode = ASImageNode()
+        self.iconNode.isAccessibilityElement = false
+        self.iconNode.displaysAsynchronously = false
+        self.iconNode.displayWithoutProcessing = true
+        self.iconNode.isUserInteractionEnabled = false
+        self.iconNode.image = item.icon(presentationData.theme)
+        
+        super.init()
+        
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.highlightedBackgroundNode)
+        if let broadcastPickerView = self.broadcastPickerView {
+            self.view.addSubview(broadcastPickerView)
+        }
+        self.addSubnode(self.textNode)
+        self.addSubnode(self.iconNode)
+    }
+    
+    deinit {
+        self.timer?.invalidate()
+        self.applicationStateDisposable?.dispose()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.applicationStateDisposable = (self.item.context.sharedContext.applicationBindings.applicationIsActive
+        |> filter { !$0 }
+        |> take(1)
+        |> deliverOnMainQueue).start(next: { [weak self] _ in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.getController()?.dismiss(completion: nil)
+        })
+    }
+    
+    private var validLayout: CGSize?
+    func updateLayout(constrainedWidth: CGFloat) -> (CGSize, (CGSize, ContainedViewLayoutTransition) -> Void) {
+        let sideInset: CGFloat = 16.0
+        let iconSideInset: CGFloat = 12.0
+        let verticalInset: CGFloat = 12.0
+        
+        let iconSize = self.iconNode.image.flatMap({ $0.size }) ?? CGSize()
+        
+        let standardIconWidth: CGFloat = 32.0
+        var rightTextInset: CGFloat = sideInset
+        if !iconSize.width.isZero {
+            rightTextInset = max(iconSize.width, standardIconWidth) + iconSideInset + sideInset
+        }
+        
+        let textSize = self.textNode.updateLayout(CGSize(width: constrainedWidth - sideInset - rightTextInset, height: .greatestFiniteMagnitude))
+
+        
+        let verticalSpacing: CGFloat = 2.0
+        let combinedTextHeight = textSize.height + verticalSpacing
+        return (CGSize(width: textSize.width + sideInset + rightTextInset, height: verticalInset * 2.0 + combinedTextHeight), { size, transition in
+            self.validLayout = size
+            
+            let verticalOrigin = floor((size.height - combinedTextHeight) / 2.0)
+            let textFrame = CGRect(origin: CGPoint(x: sideInset, y: verticalOrigin), size: textSize)
+            transition.updateFrameAdditive(node: self.textNode, frame: textFrame)
+
+            if !iconSize.width.isZero {
+                transition.updateFrameAdditive(node: self.iconNode, frame: CGRect(origin: CGPoint(x: size.width - standardIconWidth - iconSideInset + floor((standardIconWidth - iconSize.width) / 2.0), y: floor((size.height - iconSize.height) / 2.0)), size: iconSize))
+            }
+            
+            transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: size.height)))
+            transition.updateFrame(node: self.highlightedBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: size.height)))
+            
+            if let broadcastPickerView = self.broadcastPickerView {
+                broadcastPickerView.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.width, height: size.height))
+            }
+        })
+    }
+    
+    func updateTheme(presentationData: PresentationData) {
+        self.backgroundNode.backgroundColor = presentationData.theme.contextMenu.itemBackgroundColor
+        self.highlightedBackgroundNode.backgroundColor = presentationData.theme.contextMenu.itemHighlightedBackgroundColor
+        
+        let textFont = Font.regular(presentationData.listsFontSize.baseDisplaySize)
+        let subtextFont = Font.regular(presentationData.listsFontSize.baseDisplaySize * 13.0 / 17.0)
+        
+        self.textNode.attributedText = NSAttributedString(string: self.textNode.attributedText?.string ?? "", font: textFont, textColor: presentationData.theme.contextMenu.primaryColor)
+    }
+    
+    @objc private func buttonPressed() {
+        self.performAction()
+    }
+    
+    func performAction() {
+        guard let controller = self.getController() else {
+            return
+        }
+        self.item.action(controller, { [weak self] result in
+            self?.actionSelected(result)
+        })
+    }
+    
+    func setIsHighlighted(_ value: Bool) {
+        if value {
+            self.highlightedBackgroundNode.alpha = 1.0
+        } else {
+            self.highlightedBackgroundNode.alpha = 0.0
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTileGridNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTileGridNode.swift
new file mode 100644
index 0000000000..dca6322e0d
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatTileGridNode.swift
@@ -0,0 +1,335 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import AccountContext
+
+private let tileSpacing: CGFloat = 4.0
+let tileHeight: CGFloat = 180.0
+
+enum VoiceChatTileLayoutMode {
+    case pairs
+    case rows
+    case grid
+}
+
+final class VoiceChatTileGridNode: ASDisplayNode {
+    private let context: AccountContext
+    
+    private var items: [VoiceChatTileItem] = []
+    fileprivate var itemNodes: [String: VoiceChatTileItemNode] = [:]
+    private var isFirstTime = true
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    
+    var tileNodes: [VoiceChatTileItemNode] {
+        return Array(self.itemNodes.values)
+    }
+    
+    init(context: AccountContext) {
+        self.context = context
+        
+        super.init()
+        
+        self.clipsToBounds = true
+    }
+    
+    var visibility = true {
+        didSet {
+            for (_, tileNode) in self.itemNodes {
+                tileNode.visibility = self.visibility
+            }
+        }
+    }
+    
+    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        self.absoluteLocation = (rect, containerSize)
+        for itemNode in self.itemNodes.values {
+            var localRect = rect
+            localRect.origin = localRect.origin.offsetBy(dx: itemNode.frame.minX, dy: itemNode.frame.minY)
+            localRect.size = itemNode.frame.size
+            itemNode.updateAbsoluteRect(localRect, within: containerSize)
+        }
+    }
+    
+    func update(size: CGSize, layoutMode: VoiceChatTileLayoutMode, items: [VoiceChatTileItem], transition: ContainedViewLayoutTransition, completion: @escaping () -> Void = {}) -> CGSize {
+        let wasEmpty = self.items.isEmpty
+        self.items = items
+        
+        var validIds: [String] = []
+        
+        let colsCount: CGFloat
+        if case .grid = layoutMode {
+            if items.count < 3 {
+                colsCount = 1
+            } else if items.count < 5 {
+                colsCount = 2
+            } else {
+                colsCount = 3
+            }
+        } else {
+            colsCount = 2
+        }
+        let rowsCount = ceil(CGFloat(items.count) / colsCount)
+        
+        let genericItemWidth = floorToScreenPixels((size.width - tileSpacing * (colsCount - 1)) / colsCount)
+        let lastRowItemsAreWide: Bool
+        let lastRowItemWidth: CGFloat
+        if case .grid = layoutMode {
+            lastRowItemsAreWide = [1, 2].contains(items.count) || items.count % Int(colsCount) != 0
+            var lastRowItemsCount = CGFloat(items.count % Int(colsCount))
+            if lastRowItemsCount.isZero {
+                lastRowItemsCount = colsCount
+            }
+            lastRowItemWidth = floorToScreenPixels((size.width - tileSpacing * (lastRowItemsCount - 1)) / lastRowItemsCount)
+        } else {
+            lastRowItemsAreWide = items.count == 1 || items.count % Int(colsCount) != 0
+            lastRowItemWidth = size.width
+        }
+
+        let isFirstTime = self.isFirstTime
+        if isFirstTime {
+            self.isFirstTime = false
+        }
+        
+        var availableWidth = min(size.width, size.height)
+        var itemHeight = tileHeight
+        if case .grid = layoutMode {
+            itemHeight = size.height / rowsCount - (tileSpacing * (rowsCount - 1))
+        }
+        
+        for i in 0 ..< self.items.count {
+            let item = self.items[i]
+            let col = CGFloat(i % Int(colsCount))
+            let row = floor(CGFloat(i) / colsCount)
+            let isLastRow = row == (rowsCount - 1)
+            
+            let rowItemWidth = isLastRow && lastRowItemsAreWide ? lastRowItemWidth : genericItemWidth
+            let itemSize = CGSize(
+                width: rowItemWidth,
+                height: itemHeight
+            )
+            
+            if case .grid = layoutMode {
+                availableWidth = rowItemWidth
+            }
+
+            let itemFrame = CGRect(origin: CGPoint(x: col * (rowItemWidth + tileSpacing), y: row * (itemHeight + tileSpacing)), size: itemSize)
+            
+            validIds.append(item.id)
+            var itemNode: VoiceChatTileItemNode?
+            var wasAdded = false
+            if let current = self.itemNodes[item.id] {
+                itemNode = current
+                current.update(size: itemSize, availableWidth: availableWidth, item: item, transition: transition)
+            } else {
+                wasAdded = true
+                let addedItemNode = VoiceChatTileItemNode(context: self.context)
+                itemNode = addedItemNode
+                addedItemNode.update(size: itemSize, availableWidth: availableWidth, item: item, transition: .immediate)
+                self.itemNodes[self.items[i].id] = addedItemNode
+                self.addSubnode(addedItemNode)
+            }
+            if let itemNode = itemNode {
+                itemNode.visibility = self.visibility
+                let itemTransition: ContainedViewLayoutTransition = wasAdded ? .immediate : transition
+                itemTransition.updateFrameAsPositionAndBounds(node: itemNode, frame: itemFrame)
+                if wasAdded && !isFirstTime {
+                    itemNode.layer.animateScale(from: 0.0, to: 1.0, duration: wasEmpty ? 0.4 : 0.3)
+                    itemNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                }
+                
+                if let (rect, containerSize) = self.absoluteLocation {
+                    var localRect = rect
+                    localRect.origin = localRect.origin.offsetBy(dx: itemFrame.minX, dy: itemFrame.minY)
+                    localRect.size = itemFrame.size
+                    itemNode.updateAbsoluteRect(localRect, within: containerSize)
+                }
+            }
+        }
+        
+        var removeIds: [String] = []
+        for (id, _) in self.itemNodes {
+            if !validIds.contains(id) {
+                removeIds.append(id)
+            }
+        }
+        for id in removeIds {
+            if let itemNode = self.itemNodes.removeValue(forKey: id) {
+                itemNode.layer.animateScale(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, additive: true)
+                itemNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak itemNode] _ in
+                    itemNode?.removeFromSupernode()
+                })
+            }
+        }
+        
+        if case let .animated(duration, _) = transition {
+            Queue.mainQueue().after(duration) {
+                completion()
+            }
+        } else {
+            completion()
+        }
+        
+        let rowCount = ceil(CGFloat(self.items.count) / 2.0)
+        return CGSize(width: size.width, height: rowCount * (itemHeight + tileSpacing))
+    }
+}
+
+final class VoiceChatTilesGridItem: ListViewItem {
+    let context: AccountContext
+    let tiles: [VoiceChatTileItem]
+    let layoutMode: VoiceChatTileLayoutMode
+    let getIsExpanded: () -> Bool
+    
+    init(context: AccountContext, tiles: [VoiceChatTileItem], layoutMode: VoiceChatTileLayoutMode, getIsExpanded: @escaping () -> Bool) {
+        self.context = context
+        self.tiles = tiles
+        self.layoutMode = layoutMode
+        self.getIsExpanded = getIsExpanded
+    }
+    
+    func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        async {
+            let node = VoiceChatTilesGridItemNode()
+            let (layout, apply) = node.asyncLayout()(self, params)
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply() })
+                })
+            }
+        }
+    }
+    
+    func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? VoiceChatTilesGridItemNode {
+                let makeLayout = nodeValue.asyncLayout()
+                
+                async {
+                    let (layout, apply) = makeLayout(self, params)
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply()
+                        })
+                    }
+                }
+            }
+        }
+    }
+}
+
+final class VoiceChatTilesGridItemNode: ListViewItemNode {
+    private var item: VoiceChatTilesGridItem?
+    
+    private var tileGridNode: VoiceChatTileGridNode?
+    let backgroundNode: ASDisplayNode
+    let cornersNode: ASImageNode
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    
+    var tileNodes: [VoiceChatTileItemNode] {
+        if let values = self.tileGridNode?.itemNodes.values {
+            return Array(values)
+        } else {
+            return []
+        }
+    }
+    
+    init() {
+        self.backgroundNode = ASDisplayNode()
+        
+        self.cornersNode = ASImageNode()
+        self.cornersNode.displaysAsynchronously = false
+        self.cornersNode.image = decorationCornersImage(top: true, bottom: false, dark: false)
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+                
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.cornersNode)
+    }
+    
+    override func animateFrameTransition(_ progress: CGFloat, _ currentValue: CGFloat) {
+        super.animateFrameTransition(progress, currentValue)
+        
+        if let tileGridNode = self.tileGridNode {
+            var gridFrame = tileGridNode.frame
+            gridFrame.size.height = currentValue
+            tileGridNode.frame = gridFrame
+        }
+        
+        var backgroundFrame = self.backgroundNode.frame
+        backgroundFrame.size.height = currentValue
+        self.backgroundNode.frame = backgroundFrame
+        
+        var cornersFrame = self.cornersNode.frame
+        cornersFrame.origin.y = currentValue
+        self.cornersNode.frame = cornersFrame
+    }
+    
+    func asyncLayout() -> (_ item: VoiceChatTilesGridItem, _ params: ListViewItemLayoutParams) -> (ListViewItemNodeLayout, () -> Void) {
+        let currentItem = self.item
+        return { item, params in
+            let rowCount = ceil(CGFloat(item.tiles.count) / 2.0)
+            let contentSize = CGSize(width: params.width, height: rowCount * (tileHeight + tileSpacing))
+            let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: UIEdgeInsets())
+            return (layout, { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    
+                    let tileGridNode: VoiceChatTileGridNode
+                    if let current = strongSelf.tileGridNode {
+                        tileGridNode = current
+                    } else {
+                        strongSelf.backgroundNode.backgroundColor = item.getIsExpanded() ? fullscreenBackgroundColor  : panelBackgroundColor
+                        strongSelf.cornersNode.image = decorationCornersImage(top: true, bottom: false, dark: item.getIsExpanded())
+                        
+                        tileGridNode = VoiceChatTileGridNode(context: item.context)
+                        tileGridNode.visibility = strongSelf.gridVisibility
+                        strongSelf.addSubnode(tileGridNode)
+                        strongSelf.tileGridNode = tileGridNode
+                    }
+
+                    
+                    if let (rect, size) = strongSelf.absoluteLocation {
+                        tileGridNode.updateAbsoluteRect(rect, within: size)
+                    }
+                    
+                    let transition: ContainedViewLayoutTransition = currentItem == nil ? .immediate : .animated(duration: 0.3, curve: .easeInOut)
+                    let tileGridSize = tileGridNode.update(size: CGSize(width: params.width - params.leftInset - params.rightInset, height: params.availableHeight), layoutMode: item.layoutMode, items: item.tiles, transition: transition)
+                    if currentItem == nil {
+                        tileGridNode.frame = CGRect(x: params.leftInset, y: 0.0, width: tileGridSize.width, height: tileGridSize.height)
+                        strongSelf.backgroundNode.frame = tileGridNode.frame
+                        strongSelf.cornersNode.frame = CGRect(x: params.leftInset, y: layout.size.height, width: tileGridSize.width, height: 50.0)
+                    } else {
+                        transition.updateFrame(node: tileGridNode, frame: CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: tileGridSize))
+                        transition.updateFrame(node: strongSelf.backgroundNode, frame: CGRect(origin: CGPoint(x: params.leftInset, y: 0.0), size: tileGridSize))
+                        strongSelf.cornersNode.frame = CGRect(x: params.leftInset, y: layout.size.height, width: tileGridSize.width, height: 50.0)
+                    }
+                }
+            })
+        }
+    }
+    
+    override public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        self.absoluteLocation = (rect, containerSize)
+        self.tileGridNode?.updateAbsoluteRect(rect, within: containerSize)
+    }
+    
+    var gridVisibility: Bool = true {
+        didSet {
+            self.tileGridNode?.visibility = self.gridVisibility
+        }
+    }
+    
+    func snapshotForDismissal() {
+        if let snapshotView = self.tileGridNode?.view.snapshotView(afterScreenUpdates: false) {
+            self.tileGridNode?.view.addSubview(snapshotView)
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTileItemNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTileItemNode.swift
new file mode 100644
index 0000000000..f51e3c71ce
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatTileItemNode.swift
@@ -0,0 +1,986 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import Postbox
+import SyncCore
+import TelegramCore
+import AccountContext
+import TelegramUIPreferences
+import TelegramPresentationData
+import AvatarNode
+
+private let backgroundCornerRadius: CGFloat = 11.0
+private let borderLineWidth: CGFloat = 2.0
+
+private let destructiveColor: UIColor = UIColor(rgb: 0xff3b30)
+
+final class VoiceChatTileItem: Equatable {
+    enum Icon: Equatable {
+        case none
+        case microphone(Bool)
+        case presentation
+    }
+    
+    let account: Account
+    let peer: Peer
+    let videoEndpointId: String
+    let videoReady: Bool
+    let videoTimeouted: Bool
+    let isVideoLimit: Bool
+    let videoLimit: Int32
+    let isPaused: Bool
+    let isOwnScreencast: Bool
+    let strings: PresentationStrings
+    let nameDisplayOrder: PresentationPersonNameOrder
+    let icon: Icon
+    let text: VoiceChatParticipantItem.ParticipantText
+    let additionalText: VoiceChatParticipantItem.ParticipantText?
+    let speaking: Bool
+    let secondary: Bool
+    let isTablet: Bool
+    let action: () -> Void
+    let contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?
+    let getVideo: (GroupVideoNode.Position) -> GroupVideoNode?
+    let getAudioLevel: (() -> Signal<Float, NoError>)?
+    
+    var id: String {
+        return self.videoEndpointId
+    }
+    
+    init(account: Account, peer: Peer, videoEndpointId: String, videoReady: Bool, videoTimeouted: Bool, isVideoLimit: Bool, videoLimit: Int32, isPaused: Bool, isOwnScreencast: Bool, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, speaking: Bool, secondary: Bool, isTablet: Bool, icon: Icon, text: VoiceChatParticipantItem.ParticipantText, additionalText: VoiceChatParticipantItem.ParticipantText?, action:  @escaping () -> Void, contextAction: ((ASDisplayNode, ContextGesture?) -> Void)?, getVideo: @escaping (GroupVideoNode.Position) -> GroupVideoNode?, getAudioLevel: (() -> Signal<Float, NoError>)?) {
+        self.account = account
+        self.peer = peer
+        self.videoEndpointId = videoEndpointId
+        self.videoReady = videoReady
+        self.videoTimeouted = videoTimeouted
+        self.isVideoLimit = isVideoLimit
+        self.videoLimit = videoLimit
+        self.isPaused = isPaused
+        self.isOwnScreencast = isOwnScreencast
+        self.strings = strings
+        self.nameDisplayOrder = nameDisplayOrder
+        self.icon = icon
+        self.text = text
+        self.additionalText = additionalText
+        self.speaking = speaking
+        self.secondary = secondary
+        self.isTablet = isTablet
+        self.action = action
+        self.contextAction = contextAction
+        self.getVideo = getVideo
+        self.getAudioLevel = getAudioLevel
+    }
+    
+    static func == (lhs: VoiceChatTileItem, rhs: VoiceChatTileItem) -> Bool {
+        if !arePeersEqual(lhs.peer, rhs.peer) {
+            return false
+        }
+        if lhs.videoEndpointId != rhs.videoEndpointId {
+            return false
+        }
+        if lhs.videoReady != rhs.videoReady {
+            return false
+        }
+        if lhs.videoTimeouted != rhs.videoTimeouted {
+            return false
+        }
+        if lhs.isPaused != rhs.isPaused {
+            return false
+        }
+        if lhs.isOwnScreencast != rhs.isOwnScreencast {
+            return false
+        }
+        if lhs.icon != rhs.icon {
+            return false
+        }
+        if lhs.text != rhs.text {
+            return false
+        }
+        if lhs.additionalText != rhs.additionalText {
+            return false
+        }
+        if lhs.speaking != rhs.speaking {
+            return false
+        }
+        if lhs.secondary != rhs.secondary {
+            return false
+        }
+        if lhs.icon != rhs.icon {
+            return false
+        }
+        return true
+    }
+}
+
+private let fadeColor = UIColor(rgb: 0x000000, alpha: 0.5)
+
+var tileFadeImage: UIImage? = {
+    return generateImage(CGSize(width: fadeHeight, height: fadeHeight), rotatedContext: { size, context in
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        context.clear(bounds)
+        
+        let colorsArray = [fadeColor.withAlphaComponent(0.0).cgColor, fadeColor.cgColor] as CFArray
+        var locations: [CGFloat] = [1.0, 0.0]
+        let gradient = CGGradient(colorsSpace: deviceColorSpace, colors: colorsArray, locations: &locations)!
+        context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+    })
+}()
+
+final class VoiceChatTileItemNode: ASDisplayNode {
+    private let context: AccountContext
+  
+    let contextSourceNode: ContextExtractedContentContainingNode
+    private let containerNode: ContextControllerSourceNode
+    let contentNode: ASDisplayNode
+    let backgroundNode: ASDisplayNode
+    var videoContainerNode: ASDisplayNode
+    var videoNode: GroupVideoNode?
+    let infoNode: ASDisplayNode
+    let fadeNode: ASDisplayNode
+    private var shimmerNode: VoiceChatTileShimmeringNode?
+    private let titleNode: ImmediateTextNode
+    private var iconNode: ASImageNode?
+    private var animationNode: VoiceChatMicrophoneNode?
+    var highlightNode: VoiceChatTileHighlightNode
+    private let statusNode: VoiceChatParticipantStatusNode
+    
+    let placeholderTextNode: ImmediateTextNode
+    let placeholderIconNode: ASImageNode
+    
+    private var profileNode: VoiceChatPeerProfileNode?
+    private var extractedRect: CGRect?
+    private var nonExtractedRect: CGRect?
+    
+    private var validLayout: (CGSize, CGFloat)?
+    var item: VoiceChatTileItem?
+    private var isExtracted = false
+    
+    private let audioLevelDisposable = MetaDisposable()
+    
+    init(context: AccountContext) {
+        self.context = context
+        
+        self.contextSourceNode = ContextExtractedContentContainingNode()
+        self.containerNode = ContextControllerSourceNode()
+        
+        self.contentNode = ASDisplayNode()
+        self.contentNode.clipsToBounds = true
+        self.contentNode.cornerRadius = backgroundCornerRadius
+
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.backgroundColor = panelBackgroundColor
+        
+        self.videoContainerNode = ASDisplayNode()
+        self.videoContainerNode.clipsToBounds = true
+        
+        self.infoNode = ASDisplayNode()
+        
+        self.fadeNode = ASDisplayNode()
+        self.fadeNode.displaysAsynchronously = false
+        if let image = tileFadeImage {
+            self.fadeNode.backgroundColor = UIColor(patternImage: image)
+        }
+        
+        self.titleNode = ImmediateTextNode()
+        self.titleNode.displaysAsynchronously = false
+        
+        self.statusNode = VoiceChatParticipantStatusNode()
+        
+        self.highlightNode = VoiceChatTileHighlightNode()
+        self.highlightNode.alpha = 0.0
+        self.highlightNode.updateGlowAndGradientAnimations(type: .speaking)
+        
+        self.placeholderTextNode = ImmediateTextNode()
+        self.placeholderTextNode.alpha = 0.0
+        self.placeholderTextNode.maximumNumberOfLines = 2
+        self.placeholderTextNode.textAlignment = .center
+        
+        self.placeholderIconNode = ASImageNode()
+        self.placeholderIconNode.alpha = 0.0
+        self.placeholderIconNode.contentMode = .scaleAspectFit
+        self.placeholderIconNode.displaysAsynchronously = false
+        
+        super.init()
+        
+        self.containerNode.addSubnode(self.contextSourceNode)
+        self.containerNode.targetNodeForActivationProgress = self.contextSourceNode.contentNode
+        self.addSubnode(self.containerNode)
+        
+        self.contextSourceNode.contentNode.addSubnode(self.contentNode)
+        self.contentNode.addSubnode(self.backgroundNode)
+        self.contentNode.addSubnode(self.videoContainerNode)
+        self.contentNode.addSubnode(self.fadeNode)
+        self.contentNode.addSubnode(self.infoNode)
+        self.infoNode.addSubnode(self.titleNode)
+        self.contentNode.addSubnode(self.placeholderTextNode)
+        self.contentNode.addSubnode(self.placeholderIconNode)
+        self.contentNode.addSubnode(self.highlightNode)
+        
+        self.containerNode.shouldBegin = { [weak self] location in
+            guard let strongSelf = self, let item = strongSelf.item, item.videoReady && !item.isVideoLimit else {
+                return false
+            }
+            return true
+        }
+        self.containerNode.activated = { [weak self] gesture, _ in
+            guard let strongSelf = self, let item = strongSelf.item, let contextAction = item.contextAction, !item.isVideoLimit else {
+                gesture.cancel()
+                return
+            }
+            contextAction(strongSelf.contextSourceNode, gesture)
+        }
+        self.contextSourceNode.willUpdateIsExtractedToContextPreview = { [weak self] isExtracted, transition in
+            guard let strongSelf = self, let _ = strongSelf.item else {
+                return
+            }
+            strongSelf.updateIsExtracted(isExtracted, transition: transition)
+        }
+    }
+    
+    deinit {
+        self.audioLevelDisposable.dispose()
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        if #available(iOS 13.0, *) {
+            self.contentNode.layer.cornerCurve = .continuous
+        }
+        
+        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap)))
+    }
+    
+    @objc private func tap() {
+        if let item = self.item {
+            item.action()
+        }
+    }
+    
+    private func updateIsExtracted(_ isExtracted: Bool, transition: ContainedViewLayoutTransition) {
+        guard self.isExtracted != isExtracted, let extractedRect = self.extractedRect, let nonExtractedRect = self.nonExtractedRect, let item = self.item else {
+            return
+        }
+        self.isExtracted = isExtracted
+        
+        let springDuration: Double = 0.42
+        let springDamping: CGFloat = 124.0
+        if isExtracted {
+            let profileNode = VoiceChatPeerProfileNode(context: self.context, size: extractedRect.size, sourceSize: nonExtractedRect.size, peer: item.peer, text: item.text, customNode: self.videoContainerNode, additionalEntry: .single(nil), requestDismiss: { [weak self] in
+                self?.contextSourceNode.requestDismiss?()
+            })
+            profileNode.frame = CGRect(origin: CGPoint(), size: self.bounds.size)
+            self.profileNode = profileNode
+            self.contextSourceNode.contentNode.addSubnode(profileNode)
+
+            profileNode.animateIn(from: self, targetRect: extractedRect, transition: transition)
+            var appearenceTransition = transition
+            if transition.isAnimated {
+                appearenceTransition = .animated(duration: springDuration, curve: .customSpring(damping: springDamping, initialVelocity: 0.0))
+            }
+            appearenceTransition.updateFrame(node: profileNode, frame: extractedRect)
+            
+            self.contextSourceNode.contentNode.customHitTest = { [weak self] point in
+                if let strongSelf = self, let profileNode = strongSelf.profileNode {
+                    if profileNode.avatarListWrapperNode.frame.contains(point) {
+                        return profileNode.avatarListNode.view
+                    }
+                }
+                return nil
+            }
+            
+            self.backgroundNode.isHidden = true
+            self.fadeNode.isHidden = true
+            self.infoNode.isHidden = true
+            self.highlightNode.isHidden = true
+        } else if let profileNode = self.profileNode {
+            self.profileNode = nil
+            
+            self.infoNode.isHidden = false
+            profileNode.animateOut(to: self, targetRect: nonExtractedRect, transition: transition, completion: { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.backgroundNode.isHidden = false
+                    strongSelf.fadeNode.isHidden = false
+                    strongSelf.highlightNode.isHidden = false
+                }
+            })
+            
+            var appearenceTransition = transition
+            if transition.isAnimated {
+                appearenceTransition = .animated(duration: 0.2, curve: .easeInOut)
+            }
+            appearenceTransition.updateFrame(node: profileNode, frame: nonExtractedRect)
+            
+            self.contextSourceNode.contentNode.customHitTest = nil
+        }
+    }
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        self.absoluteLocation = (rect, containerSize)
+        if let shimmerNode = self.shimmerNode {
+            shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+        }
+        self.updateIsEnabled()
+    }
+    
+    var visibility = true {
+        didSet {
+            self.updateIsEnabled()
+        }
+    }
+    
+    func updateIsEnabled() {
+        guard let (rect, containerSize) = self.absoluteLocation else {
+            return
+        }
+        let isVisibleInContainer = rect.maxY >= 0.0 && rect.minY <= containerSize.height
+        if let videoNode = self.videoNode, videoNode.supernode === self.videoContainerNode {
+            videoNode.updateIsEnabled(self.visibility && isVisibleInContainer)
+        }
+    }
+    
+    func update(size: CGSize, availableWidth: CGFloat, item: VoiceChatTileItem, transition: ContainedViewLayoutTransition) {
+        guard self.validLayout?.0 != size || self.validLayout?.1 != availableWidth || self.item != item else {
+            return
+        }
+        
+        self.validLayout = (size, availableWidth)
+        
+        if !item.videoReady || item.isOwnScreencast {
+            let shimmerNode: VoiceChatTileShimmeringNode
+            let shimmerTransition: ContainedViewLayoutTransition
+            if let current = self.shimmerNode {
+                shimmerNode = current
+                shimmerTransition = transition
+            } else {
+                shimmerNode = VoiceChatTileShimmeringNode(account: item.account, peer: item.peer)
+                self.contentNode.insertSubnode(shimmerNode, aboveSubnode: self.fadeNode)
+                self.shimmerNode = shimmerNode
+                
+                if let (rect, containerSize) = self.absoluteLocation {
+                    shimmerNode.updateAbsoluteRect(rect, within: containerSize)
+                }
+                shimmerTransition = .immediate
+            }
+            shimmerTransition.updateFrame(node: shimmerNode, frame: CGRect(origin: CGPoint(), size: size))
+            shimmerNode.update(shimmeringColor: UIColor.white, shimmering: !item.isOwnScreencast && !item.videoTimeouted && !item.isPaused, size: size, transition: shimmerTransition)
+        } else if let shimmerNode = self.shimmerNode {
+            self.shimmerNode = nil
+            shimmerNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak shimmerNode] _ in
+                shimmerNode?.removeFromSupernode()
+            })
+        }
+        
+        var nodeToAnimateIn: ASDisplayNode?
+        var placeholderAppeared = false
+        
+        var itemTransition = transition
+        if self.item != item {
+            let previousItem = self.item
+            self.item = item
+            
+            if let getAudioLevel = item.getAudioLevel {
+                self.audioLevelDisposable.set((getAudioLevel()
+                |> deliverOnMainQueue).start(next: { [weak self] value in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.highlightNode.updateLevel(CGFloat(value))
+                }))
+            }
+            
+            let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
+            transition.updateAlpha(node: self.highlightNode, alpha: item.speaking ? 1.0 : 0.0)
+            
+            if previousItem?.videoEndpointId != item.videoEndpointId || self.videoNode == nil {
+                if let current = self.videoNode {
+                    self.videoNode = nil
+                    current.removeFromSupernode()
+                }
+                
+                if let videoNode = item.getVideo(item.secondary ? .list : .tile) {
+                    itemTransition = .immediate
+                    self.videoNode = videoNode
+                    self.videoContainerNode.addSubnode(videoNode)
+                    self.updateIsEnabled()
+                }
+            }
+            
+            self.videoNode?.updateIsBlurred(isBlurred: item.isPaused, light: true)
+            
+            var showPlaceholder = false
+            if item.isVideoLimit {
+                self.placeholderTextNode.attributedText = NSAttributedString(string: item.strings.VoiceChat_VideoParticipantsLimitExceeded(String(item.videoLimit)).0, font: Font.semibold(13.0), textColor: .white)
+                self.placeholderIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/VideoUnavailable"), color: .white)
+                showPlaceholder = true
+            } else if item.isOwnScreencast {
+                self.placeholderTextNode.attributedText = NSAttributedString(string: item.strings.VoiceChat_YouAreSharingScreen, font: Font.semibold(13.0), textColor: .white)
+                self.placeholderIconNode.image = generateTintedImage(image: UIImage(bundleImageName: item.isTablet ? "Call/ScreenShareTablet" : "Call/ScreenSharePhone"), color: .white)
+                showPlaceholder = true
+            } else if item.isPaused {
+                self.placeholderTextNode.attributedText = NSAttributedString(string: item.strings.VoiceChat_VideoPaused, font: Font.semibold(13.0), textColor: .white)
+                self.placeholderIconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/Pause"), color: .white)
+                showPlaceholder = true
+            }
+            
+            placeholderAppeared = self.placeholderTextNode.alpha.isZero && showPlaceholder
+            transition.updateAlpha(node: self.placeholderTextNode, alpha: showPlaceholder ? 1.0 : 0.0)
+            transition.updateAlpha(node: self.placeholderIconNode, alpha: showPlaceholder ? 1.0 : 0.0)
+            
+            let titleFont = Font.semibold(13.0)
+            let titleColor = UIColor.white
+            var titleAttributedString: NSAttributedString?
+            if item.isVideoLimit {
+                titleAttributedString = nil
+            } else if let user = item.peer as? TelegramUser {
+                if let firstName = user.firstName, let lastName = user.lastName, !firstName.isEmpty, !lastName.isEmpty {
+                        let string = NSMutableAttributedString()
+                        switch item.nameDisplayOrder {
+                            case .firstLast:
+                                string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                            case .lastFirst:
+                                string.append(NSAttributedString(string: lastName, font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: " ", font: titleFont, textColor: titleColor))
+                                string.append(NSAttributedString(string: firstName, font: titleFont, textColor: titleColor))
+                        }
+                        titleAttributedString = string
+                } else if let firstName = user.firstName, !firstName.isEmpty {
+                    titleAttributedString = NSAttributedString(string: firstName, font: titleFont, textColor: titleColor)
+                } else if let lastName = user.lastName, !lastName.isEmpty {
+                    titleAttributedString = NSAttributedString(string: lastName, font: titleFont, textColor: titleColor)
+                } else {
+                    titleAttributedString = NSAttributedString(string: item.strings.User_DeletedAccount, font: titleFont, textColor: titleColor)
+                }
+            } else if let group = item.peer as? TelegramGroup {
+                titleAttributedString = NSAttributedString(string: group.title, font: titleFont, textColor: titleColor)
+            } else if let channel = item.peer as? TelegramChannel {
+                titleAttributedString = NSAttributedString(string: channel.title, font: titleFont, textColor: titleColor)
+            }
+            
+            var microphoneColor = UIColor.white
+            if let additionalText = item.additionalText, case let .text(_, _, color) = additionalText {
+                if case .destructive = color {
+                    microphoneColor = destructiveColor
+                }
+            }
+            self.titleNode.attributedText = titleAttributedString
+            
+            var hadMicrophoneNode = false
+            var hadIconNode = false
+            
+            if case let .microphone(muted) = item.icon {
+                let animationNode: VoiceChatMicrophoneNode
+                if let current = self.animationNode {
+                    animationNode = current
+                } else {
+                    animationNode = VoiceChatMicrophoneNode()
+                    self.animationNode = animationNode
+                    self.infoNode.addSubnode(animationNode)
+                    
+                    nodeToAnimateIn = animationNode
+                }
+                animationNode.alpha = 1.0
+                animationNode.update(state: VoiceChatMicrophoneNode.State(muted: muted, filled: true, color: microphoneColor), animated: true)
+            } else if let animationNode = self.animationNode {
+                hadMicrophoneNode = true
+                self.animationNode = nil
+                animationNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                animationNode.layer.animateScale(from: 1.0, to: 0.001, duration: 0.2, removeOnCompletion: false, completion: { [weak animationNode] _ in
+                    animationNode?.removeFromSupernode()
+                })
+            }
+            
+            if case .presentation = item.icon {
+                let iconNode: ASImageNode
+                if let current = self.iconNode {
+                    iconNode = current
+                } else {
+                    iconNode = ASImageNode()
+                    iconNode.displaysAsynchronously = false
+                    iconNode.contentMode = .center
+                    self.iconNode = iconNode
+                    self.infoNode.addSubnode(iconNode)
+                    
+                    nodeToAnimateIn = iconNode
+                }
+                
+                iconNode.image = generateTintedImage(image: UIImage(bundleImageName: "Call/StatusScreen"), color: .white)
+            } else if let iconNode = self.iconNode {
+                hadIconNode = true
+                self.iconNode = nil
+                iconNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false)
+                iconNode.layer.animateScale(from: 1.0, to: 0.001, duration: 0.2, removeOnCompletion: false, completion: { [weak iconNode] _ in
+                    iconNode?.removeFromSupernode()
+                })
+            }
+            
+            if let node = nodeToAnimateIn, hadMicrophoneNode || hadIconNode {
+                node.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                node.layer.animateScale(from: 0.001, to: 1.0, duration: 0.2)
+            }
+        }
+        
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        self.containerNode.frame = bounds
+        self.contextSourceNode.frame = bounds
+        self.contextSourceNode.contentNode.frame = bounds
+        
+        transition.updateFrame(node: self.contentNode, frame: bounds)
+        
+        let extractedWidth = availableWidth
+        let makeStatusLayout = self.statusNode.asyncLayout()
+        let (statusLayout, _) = makeStatusLayout(CGSize(width: availableWidth - 30.0, height: CGFloat.greatestFiniteMagnitude), item.text, true)
+                
+        let extractedRect = CGRect(x: 0.0, y: 0.0, width: extractedWidth, height: extractedWidth + statusLayout.height + 39.0)
+        let nonExtractedRect = bounds
+        self.extractedRect = extractedRect
+        self.nonExtractedRect = nonExtractedRect
+        
+        self.contextSourceNode.contentRect = extractedRect
+        
+        if self.videoContainerNode.supernode === self.contentNode {
+            if let videoNode = self.videoNode {
+                itemTransition.updateFrame(node: videoNode, frame: bounds)
+                if videoNode.supernode === self.videoContainerNode {
+                    videoNode.updateLayout(size: size, layoutMode: .fillOrFitToSquare, transition: itemTransition)
+                }
+            }
+            transition.updateFrame(node: self.videoContainerNode, frame: bounds)
+        }
+        
+        transition.updateFrame(node: self.backgroundNode, frame: bounds)
+        transition.updateFrame(node: self.highlightNode, frame: bounds)
+        self.highlightNode.updateLayout(size: bounds.size, transition: transition)
+        transition.updateFrame(node: self.infoNode, frame: bounds)
+        transition.updateFrame(node: self.fadeNode, frame: CGRect(x: 0.0, y: size.height - fadeHeight, width: size.width, height: fadeHeight))
+        
+        let titleSize = self.titleNode.updateLayout(CGSize(width: size.width - 50.0, height: size.height))
+        self.titleNode.frame = CGRect(origin: CGPoint(x: 30.0, y: size.height - titleSize.height - 8.0), size: titleSize)
+        
+        var transition = transition
+        if nodeToAnimateIn != nil || placeholderAppeared {
+            transition = .immediate
+        }
+        
+        if let iconNode = self.iconNode, let image = iconNode.image {
+            transition.updateFrame(node: iconNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels(16.0 - image.size.width / 2.0), y: floorToScreenPixels(size.height - 15.0 - image.size.height / 2.0)), size: image.size))
+        }
+        
+        if let animationNode = self.animationNode {
+            let animationSize = CGSize(width: 36.0, height: 36.0)
+            animationNode.bounds = CGRect(origin: CGPoint(), size: animationSize)
+            animationNode.transform = CATransform3DMakeScale(0.66667, 0.66667, 1.0)
+            transition.updatePosition(node: animationNode, position: CGPoint(x: 16.0, y: size.height - 15.0))
+        }
+        
+        let placeholderTextSize = self.placeholderTextNode.updateLayout(CGSize(width: size.width - 30.0, height: 100.0))
+        transition.updateFrame(node: self.placeholderTextNode, frame: CGRect(origin: CGPoint(x: floor((size.width - placeholderTextSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) + 10.0), size: placeholderTextSize))
+        if let image = self.placeholderIconNode.image {
+            let imageScale: CGFloat = item.isVideoLimit ? 1.0 : 0.5
+            let imageSize = CGSize(width: image.size.width * imageScale, height: image.size.height * imageScale)
+            transition.updateFrame(node: self.placeholderIconNode, frame: CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floorToScreenPixels(size.height / 2.0) - imageSize.height - 4.0), size: imageSize))
+        }
+    }
+    
+    func transitionIn(from sourceNode: ASDisplayNode?) {
+        guard let item = self.item else {
+            return
+        }
+        var videoNode: GroupVideoNode?
+        if let sourceNode = sourceNode as? VoiceChatFullscreenParticipantItemNode, let _ = sourceNode.item {
+            if let sourceVideoNode = sourceNode.videoNode {
+                sourceNode.videoNode = nil
+                videoNode = sourceVideoNode
+            }
+        }
+        
+        if videoNode == nil {
+            videoNode = item.getVideo(item.secondary ? .list : .tile)
+        }
+        
+        if let videoNode = videoNode {
+            videoNode.alpha = 1.0
+            self.videoNode = videoNode
+            self.videoContainerNode.addSubnode(videoNode)
+            
+            videoNode.updateLayout(size: self.bounds.size, layoutMode: .fillOrFitToSquare, transition: .immediate)
+            videoNode.frame = self.bounds
+            
+            self.updateIsEnabled()
+        }
+    }
+}
+
+private let blue = UIColor(rgb: 0x007fff)
+private let lightBlue = UIColor(rgb: 0x00affe)
+private let green = UIColor(rgb: 0x33c659)
+private let activeBlue = UIColor(rgb: 0x00a0b9)
+private let purple = UIColor(rgb: 0x3252ef)
+private let pink = UIColor(rgb: 0xef436c)
+
+class VoiceChatTileHighlightNode: ASDisplayNode {
+    enum Gradient {
+        case speaking
+        case active
+        case mutedForYou
+        case muted
+    }
+    
+    private var maskView: UIView?
+    private let maskLayer = CALayer()
+    
+    private let foregroundGradientLayer = CAGradientLayer()
+    
+    private let hierarchyTrackingNode: HierarchyTrackingNode
+    private var isCurrentlyInHierarchy = false
+    
+    private var audioLevel: CGFloat = 0.0
+    private var presentationAudioLevel: CGFloat = 0.0
+    
+    private var displayLinkAnimator: ConstantDisplayLinkAnimator?
+    
+    override init() {
+        self.foregroundGradientLayer.type = .radial
+        self.foregroundGradientLayer.colors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
+        self.foregroundGradientLayer.locations = [0.0, 0.85, 1.0]
+        self.foregroundGradientLayer.startPoint = CGPoint(x: 1.0, y: 0.0)
+        self.foregroundGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0)
+        
+        var updateInHierarchy: ((Bool) -> Void)?
+        self.hierarchyTrackingNode = HierarchyTrackingNode({ value in
+            updateInHierarchy?(value)
+        })
+        
+        super.init()
+        
+        updateInHierarchy = { [weak self] value in
+            if let strongSelf = self {
+                strongSelf.isCurrentlyInHierarchy = value
+                strongSelf.updateAnimations()
+            }
+        }
+        
+        self.displayLinkAnimator = ConstantDisplayLinkAnimator() { [weak self] in
+            guard let strongSelf = self else { return }
+            
+            strongSelf.presentationAudioLevel = strongSelf.presentationAudioLevel * 0.9 + strongSelf.audioLevel * 0.1
+        }
+        
+        self.addSubnode(self.hierarchyTrackingNode)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.layer.addSublayer(self.foregroundGradientLayer)
+        
+        let maskView = UIView()
+        maskView.layer.addSublayer(self.maskLayer)
+        self.maskView = maskView
+        
+        self.maskLayer.masksToBounds = true
+        self.maskLayer.cornerRadius = backgroundCornerRadius - UIScreenPixel
+        self.maskLayer.borderColor = UIColor.white.cgColor
+        self.maskLayer.borderWidth = borderLineWidth
+                
+        self.view.mask = self.maskView
+    }
+    
+    func updateAnimations() {
+        if !self.isCurrentlyInHierarchy {
+            self.foregroundGradientLayer.removeAllAnimations()
+            return
+        }
+        self.setupGradientAnimations()
+    }
+    
+    func updateLevel(_ level: CGFloat) {
+        self.audioLevel = level
+    }
+    
+    func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        if let maskView = self.maskView {
+            transition.updateFrame(view: maskView, frame: bounds)
+        }
+        transition.updateFrame(layer: self.maskLayer, frame: bounds)
+        transition.updateFrame(layer: self.foregroundGradientLayer, frame: bounds)
+    }
+    
+    private func setupGradientAnimations() {
+        if let _ = self.foregroundGradientLayer.animation(forKey: "movement") {
+        } else {
+            let previousValue = self.foregroundGradientLayer.startPoint
+            let newValue: CGPoint
+            if self.presentationAudioLevel > 0.22 {
+                newValue = CGPoint(x: CGFloat.random(in: 0.9 ..< 1.0), y: CGFloat.random(in: 0.15 ..< 0.35))
+            } else if self.presentationAudioLevel > 0.01 {
+                newValue = CGPoint(x: CGFloat.random(in: 0.57 ..< 0.85), y: CGFloat.random(in: 0.15 ..< 0.45))
+            } else {
+                newValue = CGPoint(x: CGFloat.random(in: 0.6 ..< 0.75), y: CGFloat.random(in: 0.25 ..< 0.45))
+            }
+            self.foregroundGradientLayer.startPoint = newValue
+            
+            CATransaction.begin()
+            
+            let animation = CABasicAnimation(keyPath: "startPoint")
+            animation.duration = Double.random(in: 0.8 ..< 1.4)
+            animation.fromValue = previousValue
+            animation.toValue = newValue
+            
+            CATransaction.setCompletionBlock { [weak self] in
+                if let isCurrentlyInHierarchy = self?.isCurrentlyInHierarchy, isCurrentlyInHierarchy {
+                    self?.setupGradientAnimations()
+                }
+            }
+            
+            self.foregroundGradientLayer.add(animation, forKey: "movement")
+            CATransaction.commit()
+        }
+    }
+    
+    private var gradient: Gradient?
+    func updateGlowAndGradientAnimations(type: Gradient, animated: Bool = true) {
+        guard self.gradient != type else {
+            return
+        }
+        self.gradient = type
+        let initialColors = self.foregroundGradientLayer.colors
+        let targetColors: [CGColor]
+        switch type {
+            case .speaking:
+                targetColors = [activeBlue.cgColor, green.cgColor, green.cgColor]
+            case .active:
+                targetColors = [lightBlue.cgColor, blue.cgColor, blue.cgColor]
+            case .mutedForYou:
+                targetColors = [pink.cgColor, destructiveColor.cgColor, destructiveColor.cgColor]
+            case .muted:
+                targetColors = [pink.cgColor, purple.cgColor, purple.cgColor]
+        }
+        self.foregroundGradientLayer.colors = targetColors
+        if animated {
+            self.foregroundGradientLayer.animate(from: initialColors as AnyObject, to: targetColors as AnyObject, keyPath: "colors", timingFunction: CAMediaTimingFunctionName.linear.rawValue, duration: 0.3)
+        }
+        self.updateAnimations()
+    }
+}
+
+final class ShimmerEffectForegroundNode: ASDisplayNode {
+    private var currentForegroundColor: UIColor?
+    private let imageNodeContainer: ASDisplayNode
+    private let imageNode: ASDisplayNode
+    
+    private var absoluteLocation: (CGRect, CGSize)?
+    private var isCurrentlyInHierarchy = false
+    private var shouldBeAnimating = false
+    
+    private let size: CGFloat
+    
+    init(size: CGFloat) {
+        self.size = size
+        
+        self.imageNodeContainer = ASDisplayNode()
+        self.imageNodeContainer.isLayerBacked = true
+        
+        self.imageNode = ASDisplayNode()
+        self.imageNode.isLayerBacked = true
+        self.imageNode.displaysAsynchronously = false
+        
+        super.init()
+        
+        self.isLayerBacked = true
+        self.clipsToBounds = true
+        
+        self.imageNodeContainer.addSubnode(self.imageNode)
+        self.addSubnode(self.imageNodeContainer)
+    }
+    
+    override func didEnterHierarchy() {
+        super.didEnterHierarchy()
+        
+        self.isCurrentlyInHierarchy = true
+        self.updateAnimation()
+    }
+    
+    override func didExitHierarchy() {
+        super.didExitHierarchy()
+        
+        self.isCurrentlyInHierarchy = false
+        self.updateAnimation()
+    }
+    
+    func update(foregroundColor: UIColor) {
+        if let currentForegroundColor = self.currentForegroundColor, currentForegroundColor.isEqual(foregroundColor) {
+            return
+        }
+        self.currentForegroundColor = foregroundColor
+        
+        let image = generateImage(CGSize(width: self.size, height: 16.0), opaque: false, scale: 1.0, rotatedContext: { size, context in
+            context.clear(CGRect(origin: CGPoint(), size: size))
+            
+            context.clip(to: CGRect(origin: CGPoint(), size: size))
+            
+            let transparentColor = foregroundColor.withAlphaComponent(0.0).cgColor
+            let peakColor = foregroundColor.cgColor
+            
+            var locations: [CGFloat] = [0.0, 0.5, 1.0]
+            let colors: [CGColor] = [transparentColor, peakColor, transparentColor]
+            
+            let colorSpace = CGColorSpaceCreateDeviceRGB()
+            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
+            
+            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: CGGradientDrawingOptions())
+        })
+        if let image = image {
+            self.imageNode.backgroundColor = UIColor(patternImage: image)
+        }
+    }
+    
+    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        if let absoluteLocation = self.absoluteLocation, absoluteLocation.0 == rect && absoluteLocation.1 == containerSize {
+            return
+        }
+        let sizeUpdated = self.absoluteLocation?.1 != containerSize
+        let frameUpdated = self.absoluteLocation?.0 != rect
+        self.absoluteLocation = (rect, containerSize)
+        
+        if sizeUpdated {
+            if self.shouldBeAnimating {
+                self.imageNode.layer.removeAnimation(forKey: "shimmer")
+                self.addImageAnimation()
+            } else {
+                self.updateAnimation()
+            }
+        }
+        
+        if frameUpdated {
+            self.imageNodeContainer.frame = CGRect(origin: CGPoint(x: -rect.minX, y: -rect.minY), size: containerSize)
+        }
+    }
+    
+    private func updateAnimation() {
+        let shouldBeAnimating = self.isCurrentlyInHierarchy && self.absoluteLocation != nil
+        if shouldBeAnimating != self.shouldBeAnimating {
+            self.shouldBeAnimating = shouldBeAnimating
+            if shouldBeAnimating {
+                self.addImageAnimation()
+            } else {
+                self.imageNode.layer.removeAnimation(forKey: "shimmer")
+            }
+        }
+    }
+    
+    private func addImageAnimation() {
+        guard let containerSize = self.absoluteLocation?.1 else {
+            return
+        }
+        let gradientHeight: CGFloat = self.size
+        self.imageNode.frame = CGRect(origin: CGPoint(x: -gradientHeight, y: 0.0), size: CGSize(width: gradientHeight, height: containerSize.height))
+        let animation = self.imageNode.layer.makeAnimation(from: 0.0 as NSNumber, to: (containerSize.width + gradientHeight) as NSNumber, keyPath: "position.x", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 1.3 * 1.0, delay: 0.0, mediaTimingFunction: nil, removeOnCompletion: true, additive: true)
+        animation.repeatCount = Float.infinity
+        animation.beginTime = 1.0
+        self.imageNode.layer.add(animation, forKey: "shimmer")
+    }
+}
+
+private class VoiceChatTileShimmeringNode: ASDisplayNode {
+    private let backgroundNode: ImageNode
+    private let effectNode: ShimmerEffectForegroundNode
+    
+    private let borderNode: ASDisplayNode
+    private var borderMaskView: UIView?
+    private let borderEffectNode: ShimmerEffectForegroundNode
+    
+    private var currentShimmeringColor: UIColor?
+    private var currentShimmering: Bool?
+    private var currentSize: CGSize?
+    
+    public init(account: Account, peer: Peer) {
+        self.backgroundNode = ImageNode(enableHasImage: false, enableEmpty: false, enableAnimatedTransition: true)
+        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode.contentMode = .scaleAspectFill
+        
+        self.effectNode = ShimmerEffectForegroundNode(size: 240.0)
+        
+        self.borderNode = ASDisplayNode()
+        self.borderEffectNode = ShimmerEffectForegroundNode(size: 320.0)
+        
+        super.init()
+        
+        self.clipsToBounds = true
+        self.cornerRadius = backgroundCornerRadius
+        
+        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.effectNode)
+        self.addSubnode(self.borderNode)
+        self.borderNode.addSubnode(self.borderEffectNode)
+        
+        self.backgroundNode.setSignal(peerAvatarCompleteImage(account: account, peer: peer, size: CGSize(width: 250.0, height: 250.0), round: false, font: Font.regular(16.0), drawLetters: false, fullSize: false, blurred: true))
+    }
+    
+    public override func didLoad() {
+        super.didLoad()
+        
+        if self.effectNode.supernode != nil {
+            self.effectNode.layer.compositingFilter = "screenBlendMode"
+            self.borderEffectNode.layer.compositingFilter = "screenBlendMode"
+            
+            let borderMaskView = UIView()
+            borderMaskView.layer.borderWidth = 1.0
+            borderMaskView.layer.borderColor = UIColor.white.cgColor
+            borderMaskView.layer.cornerRadius = backgroundCornerRadius
+            self.borderMaskView = borderMaskView
+            
+            if let size = self.currentSize {
+                borderMaskView.frame = CGRect(origin: CGPoint(), size: size)
+            }
+            self.borderNode.view.mask = borderMaskView
+            
+            if #available(iOS 13.0, *) {
+                borderMaskView.layer.cornerCurve = .continuous
+            }
+        }
+        if #available(iOS 13.0, *) {
+            self.layer.cornerCurve = .continuous
+        }
+    }
+    
+    public func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        self.effectNode.updateAbsoluteRect(rect, within: containerSize)
+        self.borderEffectNode.updateAbsoluteRect(rect, within: containerSize)
+    }
+    
+    public func update(shimmeringColor: UIColor, shimmering: Bool, size: CGSize, transition: ContainedViewLayoutTransition) {
+        if let currentShimmeringColor = self.currentShimmeringColor, currentShimmeringColor.isEqual(shimmeringColor) && self.currentSize == size && self.currentShimmering == shimmering {
+            return
+        }
+        
+        let firstTime = self.currentShimmering == nil
+        self.currentShimmeringColor = shimmeringColor
+        self.currentShimmering = shimmering
+        self.currentSize = size
+        
+        let transition: ContainedViewLayoutTransition = firstTime ? .immediate : (transition.isAnimated ? transition : .animated(duration: 0.45, curve: .easeInOut))
+        transition.updateAlpha(node: self.effectNode, alpha: shimmering ? 1.0 : 0.0)
+        transition.updateAlpha(node: self.borderNode, alpha: shimmering ? 1.0 : 0.0)
+        
+        let bounds = CGRect(origin: CGPoint(), size: size)
+        
+        self.effectNode.update(foregroundColor: shimmeringColor.withAlphaComponent(0.3))
+        transition.updateFrame(node: self.effectNode, frame: bounds)
+        
+        self.borderEffectNode.update(foregroundColor: shimmeringColor.withAlphaComponent(0.45))
+        transition.updateFrame(node: self.borderEffectNode, frame: bounds)
+        
+        transition.updateFrame(node: self.backgroundNode, frame: bounds)
+        transition.updateFrame(node: self.borderNode, frame: bounds)
+        if let borderMaskView = self.borderMaskView {
+            transition.updateFrame(view: borderMaskView, frame: bounds)
+        }
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift
new file mode 100644
index 0000000000..9ae4a52d95
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatTimerNode.swift
@@ -0,0 +1,182 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import SwiftSignalKit
+import TelegramPresentationData
+import TelegramStringFormatting
+
+private let purple = UIColor(rgb: 0x3252ef)
+private let pink = UIColor(rgb: 0xef436c)
+
+private let latePurple = UIColor(rgb: 0x974aa9)
+private let latePink = UIColor(rgb: 0xf0436c)
+
+final class VoiceChatTimerNode: ASDisplayNode {
+    private let strings: PresentationStrings
+    private let dateTimeFormat: PresentationDateTimeFormat
+    
+    private let titleNode: ImmediateTextNode
+    private let subtitleNode: ImmediateTextNode
+    
+    private let timerNode: ImmediateTextNode
+    
+    private let foregroundView = UIView()
+    private let foregroundGradientLayer = CAGradientLayer()
+    private let maskView = UIView()
+    
+    private var validLayout: CGSize?
+    
+    private var updateTimer: SwiftSignalKit.Timer?
+    
+    private let hierarchyTrackingNode: HierarchyTrackingNode
+    private var isCurrentlyInHierarchy = false
+    
+    private var isLate = false
+    
+    init(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat) {
+        self.strings = strings
+        self.dateTimeFormat = dateTimeFormat
+        
+        var updateInHierarchy: ((Bool) -> Void)?
+        self.hierarchyTrackingNode = HierarchyTrackingNode({ value in
+            updateInHierarchy?(value)
+        })
+        
+        self.titleNode = ImmediateTextNode()
+        self.subtitleNode = ImmediateTextNode()
+        
+        self.timerNode = ImmediateTextNode()
+        
+        super.init()
+        
+        self.addSubnode(self.hierarchyTrackingNode)
+        
+        self.allowsGroupOpacity = true
+        self.isUserInteractionEnabled = false
+        
+        self.foregroundGradientLayer.type = .radial
+        self.foregroundGradientLayer.colors = [pink.cgColor, purple.cgColor, purple.cgColor]
+        self.foregroundGradientLayer.locations = [0.0, 0.85, 1.0]
+        self.foregroundGradientLayer.startPoint = CGPoint(x: 1.0, y: 0.0)
+        self.foregroundGradientLayer.endPoint = CGPoint(x: 0.0, y: 1.0)
+        
+        self.foregroundView.mask = self.maskView
+        self.foregroundView.layer.addSublayer(self.foregroundGradientLayer)
+        
+        self.view.addSubview(self.foregroundView)
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.subtitleNode)
+        
+        self.maskView.addSubnode(self.timerNode)
+        
+        updateInHierarchy = { [weak self] value in
+            if let strongSelf = self {
+                strongSelf.isCurrentlyInHierarchy = value
+                strongSelf.updateAnimations()
+            }
+        }
+    }
+    
+    deinit {
+        self.updateTimer?.invalidate()
+    }
+    
+    func animateIn() {
+        self.foregroundView.layer.animateSpring(from: 0.1 as NSNumber, to: 1.0 as NSNumber, keyPath: "transform.scale", duration: 0.6, damping: 100.0)
+    }
+    
+    private func updateAnimations() {
+        if self.isInHierarchy {
+            self.setupGradientAnimations()
+        } else {
+            self.foregroundGradientLayer.removeAllAnimations()
+        }
+    }
+    
+    private func setupGradientAnimations() {
+        if let _ = self.foregroundGradientLayer.animation(forKey: "movement") {
+        } else {
+            let previousValue = self.foregroundGradientLayer.startPoint
+            let newValue = CGPoint(x: CGFloat.random(in: 0.65 ..< 0.85), y: CGFloat.random(in: 0.1 ..< 0.45))
+            self.foregroundGradientLayer.startPoint = newValue
+            
+            CATransaction.begin()
+            
+            let animation = CABasicAnimation(keyPath: "startPoint")
+            animation.duration = Double.random(in: 0.8 ..< 1.4)
+            animation.fromValue = previousValue
+            animation.toValue = newValue
+            
+            CATransaction.setCompletionBlock { [weak self] in
+                if let isCurrentlyInHierarchy = self?.isCurrentlyInHierarchy, isCurrentlyInHierarchy {
+                    self?.setupGradientAnimations()
+                }
+            }
+            
+            self.foregroundGradientLayer.add(animation, forKey: "movement")
+            CATransaction.commit()
+        }
+    }
+    
+    func update(size: CGSize, scheduleTime: Int32?, transition: ContainedViewLayoutTransition) {
+        if self.validLayout == nil {
+            self.updateAnimations()
+        }
+        self.validLayout = size
+                
+        guard let scheduleTime = scheduleTime else {
+            return
+        }
+        
+        self.foregroundView.frame = CGRect(origin: CGPoint(), size: size)
+        self.foregroundGradientLayer.frame = self.foregroundView.bounds
+        self.maskView.frame = self.foregroundView.bounds
+        
+        let currentTime = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
+        let elapsedTime = scheduleTime - currentTime
+        let timerText: String
+        if elapsedTime >= 86400 {
+            timerText = scheduledTimeIntervalString(strings: self.strings, value: elapsedTime)
+        } else {
+            timerText = textForTimeout(value: abs(elapsedTime))
+            if elapsedTime < 0 && !self.isLate {
+                self.isLate = true
+                self.foregroundGradientLayer.colors = [latePink.cgColor, latePurple.cgColor, latePurple.cgColor]
+            }
+        }
+        
+        if self.updateTimer == nil {
+            let timer = SwiftSignalKit.Timer(timeout: 0.5, repeat: true, completion: { [weak self] in
+                if let strongSelf = self, let size = strongSelf.validLayout {
+                    strongSelf.update(size: size, scheduleTime: scheduleTime, transition: .immediate)
+                }
+            }, queue: Queue.mainQueue())
+            self.updateTimer = timer
+            timer.start()
+        }
+        
+        let subtitle = humanReadableStringForTimestamp(strings: self.strings, dateTimeFormat: self.dateTimeFormat, timestamp: scheduleTime, alwaysShowTime: true).0
+        
+        self.titleNode.attributedText = NSAttributedString(string: elapsedTime < 0 ?  self.strings.VoiceChat_LateBy :  self.strings.VoiceChat_StartsIn, font: Font.with(size: 23.0, design: .round, weight: .semibold, traits: []), textColor: .white)
+        let titleSize = self.titleNode.updateLayout(size)
+        self.titleNode.frame = CGRect(x: floor((size.width - titleSize.width) / 2.0), y: 48.0, width: titleSize.width, height: titleSize.height)
+        
+        
+        self.timerNode.attributedText = NSAttributedString(string: timerText, font: Font.with(size: 68.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: .white)
+        
+        var timerSize = self.timerNode.updateLayout(CGSize(width: size.width + 100.0, height: size.height))
+        if timerSize.width > size.width - 32.0 {
+            self.timerNode.attributedText = NSAttributedString(string: timerText, font: Font.with(size: 60.0, design: .round, weight: .semibold, traits: [.monospacedNumbers]), textColor: .white)
+            timerSize = self.timerNode.updateLayout(CGSize(width: size.width + 100.0, height: size.height))
+        }
+        
+        self.timerNode.frame = CGRect(x: floor((size.width - timerSize.width) / 2.0), y: 78.0, width: timerSize.width, height: timerSize.height)
+        
+        self.subtitleNode.attributedText = NSAttributedString(string: subtitle, font: Font.with(size: 21.0, design: .round, weight: .semibold, traits: []), textColor: .white)
+        let subtitleSize = self.subtitleNode.updateLayout(size)
+        self.subtitleNode.frame = CGRect(x: floor((size.width - subtitleSize.width) / 2.0), y: 164.0, width: subtitleSize.width, height: subtitleSize.height)
+        
+        self.foregroundView.frame = CGRect(origin: CGPoint(), size: size)
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift
index ba30aeec5e..0f4f27e534 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatTitleEditController.swift
@@ -31,7 +31,11 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT
         set {
             self.textInputNode.attributedText = NSAttributedString(string: newValue, font: Font.regular(17.0), textColor: self.theme.actionSheet.inputTextColor)
             self.placeholderNode.isHidden = !newValue.isEmpty
-            self.clearButton.isHidden = newValue.isEmpty
+            if self.textInputNode.isFirstResponder() {
+                self.clearButton.isHidden = newValue.isEmpty
+            } else {
+                self.clearButton.isHidden = true
+            }
         }
     }
     
@@ -41,8 +45,11 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT
         }
     }
     
-    init(theme: PresentationTheme, placeholder: String) {
+    private let maxLength: Int
+    
+    init(theme: PresentationTheme, placeholder: String, maxLength: Int, returnKeyType: UIReturnKeyType = .done) {
         self.theme = theme
+        self.maxLength = maxLength
         
         self.backgroundNode = ASImageNode()
         self.backgroundNode.isLayerBacked = true
@@ -58,7 +65,7 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT
         self.textInputNode.keyboardAppearance = theme.rootController.keyboardColor.keyboardAppearance
         self.textInputNode.keyboardType = .default
         self.textInputNode.autocapitalizationType = .sentences
-        self.textInputNode.returnKeyType = .done
+        self.textInputNode.returnKeyType = returnKeyType
         self.textInputNode.autocorrectionType = .default
         self.textInputNode.tintColor = theme.actionSheet.controlAccentColor
         
@@ -133,9 +140,17 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT
         self.clearButton.isHidden = !self.placeholderNode.isHidden
     }
     
+    func editableTextNodeDidBeginEditing(_ editableTextNode: ASEditableTextNode) {
+        self.clearButton.isHidden = (editableTextNode.textView.text ?? "").isEmpty
+    }
+    
+    func editableTextNodeDidFinishEditing(_ editableTextNode: ASEditableTextNode) {
+        self.clearButton.isHidden = true
+    }
+    
     func editableTextNode(_ editableTextNode: ASEditableTextNode, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
         let updatedText = (editableTextNode.textView.text as NSString).replacingCharacters(in: range, with: text)
-        if updatedText.count > 40 {
+        if updatedText.count > maxLength {
             self.textInputNode.layer.addShakeAnimation()
             return false
         }
@@ -171,7 +186,6 @@ private final class VoiceChatTitleEditInputFieldNode: ASDisplayNode, ASEditableT
         self.clearButton.isHidden = true
         
         self.textInputNode.attributedText = nil
-        self.deactivateInput()
         self.updateHeight?()
     }
 }
@@ -205,7 +219,7 @@ private final class VoiceChatTitleEditAlertContentNode: AlertContentNode {
         return self.isUserInteractionEnabled
     }
     
-    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction], title: String, text: String, placeholder: String, value: String?) {
+    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction], title: String, text: String, placeholder: String, value: String?, maxLength: Int) {
         self.strings = strings
         self.title = title
         self.text = text
@@ -215,7 +229,7 @@ private final class VoiceChatTitleEditAlertContentNode: AlertContentNode {
         self.textNode = ASTextNode()
         self.textNode.maximumNumberOfLines = 8
         
-        self.inputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: placeholder)
+        self.inputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: placeholder, maxLength: maxLength)
         self.inputFieldNode.text = value ?? ""
         
         self.actionNodesSeparator = ASDisplayNode()
@@ -408,7 +422,7 @@ private final class VoiceChatTitleEditAlertContentNode: AlertContentNode {
     }
 }
 
-func voiceChatTitleEditController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, text: String, placeholder: String, value: String?, apply: @escaping (String?) -> Void) -> AlertController {
+func voiceChatTitleEditController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, text: String, placeholder: String, doneButtonTitle: String? = nil, value: String?, maxLength: Int, apply: @escaping (String?) -> Void) -> AlertController {
     var presentationData = sharedContext.currentPresentationData.with { $0 }
     if let forceTheme = forceTheme {
         presentationData = presentationData.withUpdated(theme: forceTheme)
@@ -419,11 +433,11 @@ func voiceChatTitleEditController(sharedContext: SharedAccountContext, account:
     
     let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
         dismissImpl?(true)
-    }), TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_Done, action: {
+    }), TextAlertAction(type: .defaultAction, title: doneButtonTitle ?? presentationData.strings.Common_Done, action: {
         applyImpl?()
     })]
     
-    let contentNode = VoiceChatTitleEditAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, text: text, placeholder: placeholder, value: value)
+    let contentNode = VoiceChatTitleEditAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, text: text, placeholder: placeholder, value: value, maxLength: maxLength)
     contentNode.complete = {
         applyImpl?()
     }
@@ -450,8 +464,307 @@ func voiceChatTitleEditController(sharedContext: SharedAccountContext, account:
     controller.dismissed = {
         presentationDataDisposable.dispose()
     }
-    dismissImpl = { [weak controller] animated in
-        contentNode.inputFieldNode.deactivateInput()
+    dismissImpl = { [weak controller, weak contentNode] animated in
+        contentNode?.inputFieldNode.deactivateInput()
+        if animated {
+            controller?.dismissAnimated()
+        } else {
+            controller?.dismiss()
+        }
+    }
+    return controller
+}
+
+private final class VoiceChatUserNameEditAlertContentNode: AlertContentNode {
+    private let strings: PresentationStrings
+    private let title: String
+    
+    private let titleNode: ASTextNode
+    let firstNameInputFieldNode: VoiceChatTitleEditInputFieldNode
+    let lastNameInputFieldNode: VoiceChatTitleEditInputFieldNode
+    
+    private let actionNodesSeparator: ASDisplayNode
+    private let actionNodes: [TextAlertContentActionNode]
+    private let actionVerticalSeparators: [ASDisplayNode]
+    
+    private let disposable = MetaDisposable()
+    
+    private var validLayout: CGSize?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    var complete: (() -> Void)? {
+        didSet {
+            self.lastNameInputFieldNode.complete = self.complete
+        }
+    }
+    
+    override var dismissOnOutsideTap: Bool {
+        return self.isUserInteractionEnabled
+    }
+    
+    init(theme: AlertControllerTheme, ptheme: PresentationTheme, strings: PresentationStrings, actions: [TextAlertAction], title: String, firstNamePlaceholder: String, lastNamePlaceholder: String, firstNameValue: String?, lastNameValue: String?, maxLength: Int) {
+        self.strings = strings
+        self.title = title
+    
+        self.titleNode = ASTextNode()
+        self.titleNode.maximumNumberOfLines = 2
+        
+        self.firstNameInputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: firstNamePlaceholder, maxLength: maxLength, returnKeyType: .next)
+        self.firstNameInputFieldNode.text = firstNameValue ?? ""
+        
+        self.lastNameInputFieldNode = VoiceChatTitleEditInputFieldNode(theme: ptheme, placeholder: lastNamePlaceholder, maxLength: maxLength)
+        self.lastNameInputFieldNode.text = lastNameValue ?? ""
+        
+        self.actionNodesSeparator = ASDisplayNode()
+        self.actionNodesSeparator.isLayerBacked = true
+        
+        self.actionNodes = actions.map { action -> TextAlertContentActionNode in
+            return TextAlertContentActionNode(theme: theme, action: action)
+        }
+        
+        var actionVerticalSeparators: [ASDisplayNode] = []
+        if actions.count > 1 {
+            for _ in 0 ..< actions.count - 1 {
+                let separatorNode = ASDisplayNode()
+                separatorNode.isLayerBacked = true
+                actionVerticalSeparators.append(separatorNode)
+            }
+        }
+        self.actionVerticalSeparators = actionVerticalSeparators
+        
+        super.init()
+        
+        self.addSubnode(self.titleNode)
+        
+        self.addSubnode(self.firstNameInputFieldNode)
+        self.addSubnode(self.lastNameInputFieldNode)
+
+        self.addSubnode(self.actionNodesSeparator)
+        
+        for actionNode in self.actionNodes {
+            self.addSubnode(actionNode)
+        }
+        
+        for separatorNode in self.actionVerticalSeparators {
+            self.addSubnode(separatorNode)
+        }
+        
+        self.updateTheme(theme)
+        
+        self.firstNameInputFieldNode.complete = { [weak self] in
+            self?.lastNameInputFieldNode.activateInput()
+        }
+    }
+    
+    deinit {
+        self.disposable.dispose()
+    }
+    
+    var firstName: String {
+        return self.firstNameInputFieldNode.text
+    }
+    
+    var lastName: String {
+        return self.lastNameInputFieldNode.text
+    }
+
+    override func updateTheme(_ theme: AlertControllerTheme) {
+        self.titleNode.attributedText = NSAttributedString(string: self.title, font: Font.bold(17.0), textColor: theme.primaryColor, paragraphAlignment: .center)
+
+        self.actionNodesSeparator.backgroundColor = theme.separatorColor
+        for actionNode in self.actionNodes {
+            actionNode.updateTheme(theme)
+        }
+        for separatorNode in self.actionVerticalSeparators {
+            separatorNode.backgroundColor = theme.separatorColor
+        }
+        
+        if let size = self.validLayout {
+            _ = self.updateLayout(size: size, transition: .immediate)
+        }
+    }
+    
+    override func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
+        var size = size
+        size.width = min(size.width, 270.0)
+        let measureSize = CGSize(width: size.width - 16.0 * 2.0, height: CGFloat.greatestFiniteMagnitude)
+        
+        let hadValidLayout = self.validLayout != nil
+        
+        self.validLayout = size
+        
+        var origin: CGPoint = CGPoint(x: 0.0, y: 20.0)
+        let spacing: CGFloat = 0.0
+        
+        let titleSize = self.titleNode.measure(measureSize)
+        transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - titleSize.width) / 2.0), y: origin.y), size: titleSize))
+        origin.y += titleSize.height + 4.0
+                
+        let actionButtonHeight: CGFloat = 44.0
+        var minActionsWidth: CGFloat = 0.0
+        let maxActionWidth: CGFloat = floor(size.width / CGFloat(self.actionNodes.count))
+        let actionTitleInsets: CGFloat = 8.0
+        
+        var effectiveActionLayout = TextAlertContentActionLayout.horizontal
+        for actionNode in self.actionNodes {
+            let actionTitleSize = actionNode.titleNode.updateLayout(CGSize(width: maxActionWidth, height: actionButtonHeight))
+            if case .horizontal = effectiveActionLayout, actionTitleSize.height > actionButtonHeight * 0.6667 {
+                effectiveActionLayout = .vertical
+            }
+            switch effectiveActionLayout {
+                case .horizontal:
+                    minActionsWidth += actionTitleSize.width + actionTitleInsets
+                case .vertical:
+                    minActionsWidth = max(minActionsWidth, actionTitleSize.width + actionTitleInsets)
+            }
+        }
+        
+        let insets = UIEdgeInsets(top: 18.0, left: 18.0, bottom: 9.0, right: 18.0)
+        
+        var contentWidth = max(titleSize.width, minActionsWidth)
+        contentWidth = max(contentWidth, 234.0)
+        
+        var actionsHeight: CGFloat = 0.0
+        switch effectiveActionLayout {
+            case .horizontal:
+                actionsHeight = actionButtonHeight
+            case .vertical:
+                actionsHeight = actionButtonHeight * CGFloat(self.actionNodes.count)
+        }
+        
+        let resultWidth = contentWidth + insets.left + insets.right
+        
+        let inputFieldWidth = resultWidth
+        let firstInputFieldHeight = self.firstNameInputFieldNode.updateLayout(width: inputFieldWidth, transition: transition)
+        transition.updateFrame(node: self.firstNameInputFieldNode, frame: CGRect(x: 0.0, y: origin.y, width: resultWidth, height: firstInputFieldHeight))
+        
+        origin.y += firstInputFieldHeight + spacing
+        
+        let lastInputFieldHeight = self.lastNameInputFieldNode.updateLayout(width: inputFieldWidth, transition: transition)
+        transition.updateFrame(node: self.lastNameInputFieldNode, frame: CGRect(x: 0.0, y: origin.y, width: resultWidth, height: lastInputFieldHeight))
+        
+        let resultSize = CGSize(width: resultWidth, height: titleSize.height + firstInputFieldHeight + spacing + lastInputFieldHeight + actionsHeight + insets.top + insets.bottom)
+        
+        transition.updateFrame(node: self.actionNodesSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+        
+        var actionOffset: CGFloat = 0.0
+        let actionWidth: CGFloat = floor(resultSize.width / CGFloat(self.actionNodes.count))
+        var separatorIndex = -1
+        var nodeIndex = 0
+        for actionNode in self.actionNodes {
+            if separatorIndex >= 0 {
+                let separatorNode = self.actionVerticalSeparators[separatorIndex]
+                switch effectiveActionLayout {
+                    case .horizontal:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: actionOffset - UIScreenPixel, y: resultSize.height - actionsHeight), size: CGSize(width: UIScreenPixel, height: actionsHeight - UIScreenPixel)))
+                    case .vertical:
+                        transition.updateFrame(node: separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset - UIScreenPixel), size: CGSize(width: resultSize.width, height: UIScreenPixel)))
+                }
+            }
+            separatorIndex += 1
+            
+            let currentActionWidth: CGFloat
+            switch effectiveActionLayout {
+                case .horizontal:
+                    if nodeIndex == self.actionNodes.count - 1 {
+                        currentActionWidth = resultSize.width - actionOffset
+                    } else {
+                        currentActionWidth = actionWidth
+                    }
+                case .vertical:
+                    currentActionWidth = resultSize.width
+            }
+            
+            let actionNodeFrame: CGRect
+            switch effectiveActionLayout {
+                case .horizontal:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: actionOffset, y: resultSize.height - actionsHeight), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += currentActionWidth
+                case .vertical:
+                    actionNodeFrame = CGRect(origin: CGPoint(x: 0.0, y: resultSize.height - actionsHeight + actionOffset), size: CGSize(width: currentActionWidth, height: actionButtonHeight))
+                    actionOffset += actionButtonHeight
+            }
+            
+            transition.updateFrame(node: actionNode, frame: actionNodeFrame)
+            
+            nodeIndex += 1
+        }
+        
+        if !hadValidLayout {
+            self.firstNameInputFieldNode.activateInput()
+        }
+        
+        return resultSize
+    }
+    
+    func animateError() {
+        if self.firstNameInputFieldNode.text.isEmpty {
+            self.firstNameInputFieldNode.layer.addShakeAnimation()
+        }
+        self.hapticFeedback.error()
+    }
+}
+
+func voiceChatUserNameController(sharedContext: SharedAccountContext, account: Account, forceTheme: PresentationTheme?, title: String, firstNamePlaceholder: String, lastNamePlaceholder: String, doneButtonTitle: String? = nil, firstName: String?, lastName: String?, maxLength: Int, apply: @escaping ((String, String)?) -> Void) -> AlertController {
+    var presentationData = sharedContext.currentPresentationData.with { $0 }
+    if let forceTheme = forceTheme {
+        presentationData = presentationData.withUpdated(theme: forceTheme)
+    }
+    
+    var dismissImpl: ((Bool) -> Void)?
+    var applyImpl: (() -> Void)?
+    
+    let actions: [TextAlertAction] = [TextAlertAction(type: .genericAction, title: presentationData.strings.Common_Cancel, action: {
+        dismissImpl?(true)
+    }), TextAlertAction(type: .defaultAction, title: doneButtonTitle ?? presentationData.strings.Common_Done, action: {
+        applyImpl?()
+    })]
+    
+    let contentNode = VoiceChatUserNameEditAlertContentNode(theme: AlertControllerTheme(presentationData: presentationData), ptheme: presentationData.theme, strings: presentationData.strings, actions: actions, title: title, firstNamePlaceholder: firstNamePlaceholder, lastNamePlaceholder: lastNamePlaceholder, firstNameValue: firstName, lastNameValue: lastName, maxLength: maxLength)
+    contentNode.complete = {
+        applyImpl?()
+    }
+    applyImpl = { [weak contentNode] in
+        guard let contentNode = contentNode else {
+            return
+        }
+        
+        let previousFirstName = firstName ?? ""
+        let previousLastName = lastName ?? ""
+        let newFirstName = contentNode.firstName.trimmingCharacters(in: .whitespacesAndNewlines)
+        let newLastName = contentNode.lastName.trimmingCharacters(in: .whitespacesAndNewlines)
+        
+        if newFirstName.isEmpty {
+            contentNode.animateError()
+            return
+        }
+        
+        dismissImpl?(true)
+        
+        if previousFirstName != newFirstName || previousLastName != newLastName {
+            apply((newFirstName, newLastName))
+        } else {
+            apply(nil)
+        }
+    }
+    
+    let controller = AlertController(theme: AlertControllerTheme(presentationData: presentationData), contentNode: contentNode)
+    let presentationDataDisposable = sharedContext.presentationData.start(next: { [weak controller, weak contentNode] presentationData in
+        var presentationData = presentationData
+        if let forceTheme = forceTheme {
+            presentationData = presentationData.withUpdated(theme: forceTheme)
+        }
+        controller?.theme = AlertControllerTheme(presentationData: presentationData)
+        contentNode?.firstNameInputFieldNode.updateTheme(presentationData.theme)
+        contentNode?.lastNameInputFieldNode.updateTheme(presentationData.theme)
+    })
+    controller.dismissed = {
+        presentationDataDisposable.dispose()
+    }
+    dismissImpl = { [weak controller, weak contentNode] animated in
+        contentNode?.firstNameInputFieldNode.deactivateInput()
+        contentNode?.lastNameInputFieldNode.deactivateInput()
         if animated {
             controller?.dismissAnimated()
         } else {
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift b/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift
new file mode 100644
index 0000000000..7bf78c1574
--- /dev/null
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatTitleNode.swift
@@ -0,0 +1,120 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramPresentationData
+import ChatTitleActivityNode
+
+private let constructiveColor: UIColor = UIColor(rgb: 0x34c759)
+
+final class VoiceChatTitleNode: ASDisplayNode {
+    private var theme: PresentationTheme
+    
+    private let titleNode: ASTextNode
+    private let infoNode: ChatTitleActivityNode
+    let recordingIconNode: VoiceChatRecordingIconNode
+    
+    public var isRecording: Bool = false {
+        didSet {
+            self.recordingIconNode.isHidden = !self.isRecording
+        }
+    }
+    
+    var tapped: (() -> Void)?
+    
+    init(theme: PresentationTheme) {
+        self.theme = theme
+        
+        self.titleNode = ASTextNode()
+        self.titleNode.displaysAsynchronously = false
+        self.titleNode.maximumNumberOfLines = 1
+        self.titleNode.truncationMode = .byTruncatingTail
+        self.titleNode.isOpaque = false
+        
+        self.infoNode = ChatTitleActivityNode()
+        
+        self.recordingIconNode = VoiceChatRecordingIconNode(hasBackground: false)
+        
+        super.init()
+        
+        self.addSubnode(self.titleNode)
+        self.addSubnode(self.infoNode)
+        self.addSubnode(self.recordingIconNode)
+    }
+        
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        self.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tap)))
+    }
+    
+    override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+        if point.y > 0.0 && point.y < self.frame.size.height && point.x > min(self.titleNode.frame.minX, self.infoNode.frame.minX) && point.x < max(self.recordingIconNode.frame.maxX, self.infoNode.frame.maxX) {
+            return true
+        } else {
+            return false
+        }
+    }
+    
+    @objc private func tap() {
+        self.tapped?()
+    }
+    
+    func update(size: CGSize, title: String, subtitle: String, speaking: Bool, slide: Bool, transition: ContainedViewLayoutTransition) {
+        guard !size.width.isZero else {
+            return
+        }
+        var titleUpdated = false
+        if let previousTitle = self.titleNode.attributedText?.string {
+            titleUpdated = previousTitle != title
+        }
+        
+        if titleUpdated, let snapshotView = self.titleNode.view.snapshotContentTree() {
+            snapshotView.frame = self.titleNode.frame
+            self.view.addSubview(snapshotView)
+            
+            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                snapshotView?.removeFromSuperview()
+            })
+            
+            self.titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+            
+            if slide {
+                self.infoNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                let offset: CGFloat = 16.0
+                snapshotView.layer.animatePosition(from: CGPoint(), to: CGPoint(x: 0.0, y: -offset), duration: 0.2, removeOnCompletion: false, additive: true)
+                self.titleNode.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: 0.2, additive: true)
+                self.infoNode.layer.animatePosition(from: CGPoint(x: 0.0, y: offset), to: CGPoint(), duration: 0.2, additive: true)
+            }
+        }
+        
+        self.titleNode.attributedText = NSAttributedString(string: title, font: Font.medium(17.0), textColor: UIColor(rgb: 0xffffff))
+            
+        var state = ChatTitleActivityNodeState.none
+        if speaking {
+            state = .recordingVoice(NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: constructiveColor), constructiveColor)
+        } else {
+            state = .info(NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: UIColor(rgb: 0xffffff, alpha: 0.5)), .generic)
+        }
+        let _ = self.infoNode.transitionToState(state, animation: .slide)
+        
+        let constrainedSize = CGSize(width: size.width - 140.0, height: size.height)
+        let titleSize = self.titleNode.measure(constrainedSize)
+        let infoSize = self.infoNode.updateLayout(constrainedSize, offset: 1.0, alignment: .center)
+        let titleInfoSpacing: CGFloat = 0.0
+        
+        let combinedHeight = titleSize.height + infoSize.height + titleInfoSpacing
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0)), size: titleSize)
+        self.titleNode.frame = titleFrame
+        self.infoNode.frame = CGRect(origin: CGPoint(x: floor((size.width - infoSize.width) / 2.0), y: floor((size.height - combinedHeight) / 2.0) + titleSize.height + titleInfoSpacing), size: infoSize)
+        
+        let iconSide = 16.0 + (1.0 + UIScreenPixel) * 2.0
+        let iconSize: CGSize = CGSize(width: iconSide, height: iconSide)
+        self.recordingIconNode.frame = CGRect(origin: CGPoint(x: titleFrame.maxX + 1.0, y: titleFrame.minY + 1.0), size: iconSize)
+    }
+}
diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift
index 08fc213063..43e89a59ab 100644
--- a/submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift
+++ b/submodules/TelegramCallsUI/Sources/VoiceChatVolumeContextItem.swift
@@ -17,7 +17,7 @@ final class VoiceChatVolumeContextItem: ContextMenuCustomItem {
         self.valueChanged = valueChanged
     }
     
-    func node(presentationData: PresentationData, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
+    func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
         return VoiceChatVolumeContextItemNode(presentationData: presentationData, getController: getController, minValue: self.minValue, value: self.value, valueChanged: self.valueChanged)
     }
 }
@@ -45,7 +45,7 @@ private final class VoiceChatVolumeContextItemNode: ASDisplayNode, ContextMenuCu
     
     private let hapticFeedback = HapticFeedback()
 
-    init(presentationData: PresentationData, getController: @escaping () -> ContextController?, minValue: CGFloat, value: CGFloat, valueChanged: @escaping (CGFloat, Bool) -> Void) {
+    init(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, minValue: CGFloat, value: CGFloat, valueChanged: @escaping (CGFloat, Bool) -> Void) {
         self.presentationData = presentationData
         self.minValue = minValue
         self.value = value
diff --git a/submodules/TelegramCore/Sources/Account.swift b/submodules/TelegramCore/Sources/Account/Account.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/Account.swift
rename to submodules/TelegramCore/Sources/Account/Account.swift
index 73786ebc8e..3c269a5ee9 100644
--- a/submodules/TelegramCore/Sources/Account.swift
+++ b/submodules/TelegramCore/Sources/Account/Account.swift
@@ -67,6 +67,11 @@ public class UnauthorizedAccount {
     public var updateLoginTokenEvents: Signal<Void, NoError> {
         return self.updateLoginTokenPipe.signal()
     }
+
+    private let serviceNotificationPipe = ValuePipe<String>()
+    public var serviceNotificationEvents: Signal<String, NoError> {
+        return self.serviceNotificationPipe.signal()
+    }
     
     public var masterDatacenterId: Int32 {
         return Int32(self.network.mtProto.datacenterId)
@@ -83,8 +88,11 @@ public class UnauthorizedAccount {
         self.postbox = postbox
         self.network = network
         let updateLoginTokenPipe = self.updateLoginTokenPipe
+        let serviceNotificationPipe = self.serviceNotificationPipe
         self.stateManager = UnauthorizedAccountStateManager(network: network, updateLoginToken: {
             updateLoginTokenPipe.putNext(Void())
+        }, displayServiceNotification: { text in
+            serviceNotificationPipe.putNext(text)
         })
         
         network.shouldKeepConnection.set(self.shouldBeServiceTaskMaster.get()
@@ -362,13 +370,14 @@ public struct TwoStepAuthData {
     public let unconfirmedEmailPattern: String?
     public let secretRandom: Data
     public let nextSecurePasswordDerivation: TwoStepSecurePasswordDerivation
+    public let pendingResetTimestamp: Int32?
 }
 
-public func twoStepAuthData(_ network: Network) -> Signal<TwoStepAuthData, MTRpcError> {
+func _internal_twoStepAuthData(_ network: Network) -> Signal<TwoStepAuthData, MTRpcError> {
     return network.request(Api.functions.account.getPassword())
     |> map { config -> TwoStepAuthData in
         switch config {
-            case let .password(flags, currentAlgo, srpB, srpId, hint, emailUnconfirmedPattern, newAlgo, newSecureAlgo, secureRandom):
+            case let .password(flags, currentAlgo, srpB, srpId, hint, emailUnconfirmedPattern, newAlgo, newSecureAlgo, secureRandom, pendingResetDate):
                 let hasRecovery = (flags & (1 << 0)) != 0
                 let hasSecureValues = (flags & (1 << 1)) != 0
                 
@@ -390,7 +399,7 @@ public func twoStepAuthData(_ network: Network) -> Signal<TwoStepAuthData, MTRpc
                     srpSessionData = TwoStepSRPSessionData(id: srpId, B: srpB.makeData())
                 }
                 
-                return TwoStepAuthData(nextPasswordDerivation: nextDerivation, currentPasswordDerivation: currentDerivation, srpSessionData: srpSessionData, hasRecovery: hasRecovery, hasSecretValues: hasSecureValues, currentHint: hint, unconfirmedEmailPattern: emailUnconfirmedPattern, secretRandom: secureRandom.makeData(), nextSecurePasswordDerivation: nextSecureDerivation)
+                return TwoStepAuthData(nextPasswordDerivation: nextDerivation, currentPasswordDerivation: currentDerivation, srpSessionData: srpSessionData, hasRecovery: hasRecovery, hasSecretValues: hasSecureValues, currentHint: hint, unconfirmedEmailPattern: emailUnconfirmedPattern, secretRandom: secureRandom.makeData(), nextSecurePasswordDerivation: nextSecureDerivation, pendingResetTimestamp: pendingResetDate)
         }
     }
 }
@@ -655,7 +664,7 @@ func securePasswordKDF(password: String, derivation: TwoStepSecurePasswordDeriva
 }
 
 func verifyPassword(_ account: UnauthorizedAccount, password: String) -> Signal<Api.auth.Authorization, MTRpcError> {
-    return twoStepAuthData(account.network)
+    return _internal_twoStepAuthData(account.network)
     |> mapToSignal { authData -> Signal<Api.auth.Authorization, MTRpcError> in
         guard let currentPasswordDerivation = authData.currentPasswordDerivation, let srpSessionData = authData.srpSessionData else {
             return .fail(MTRpcError(errorCode: 400, errorDescription: "INTERNAL_NO_PASSWORD"))
@@ -843,7 +852,7 @@ public class Account {
     public private(set) var viewTracker: AccountViewTracker!
     public private(set) var pendingMessageManager: PendingMessageManager!
     public private(set) var pendingUpdateMessageManager: PendingUpdateMessageManager!
-    public private(set) var messageMediaPreuploadManager: MessageMediaPreuploadManager!
+    private(set) var messageMediaPreuploadManager: MessageMediaPreuploadManager!
     private(set) var mediaReferenceRevalidationContext: MediaReferenceRevalidationContext!
     private var peerInputActivityManager: PeerInputActivityManager!
     private var localInputActivityManager: PeerInputActivityManager!
@@ -1046,7 +1055,7 @@ public class Account {
         self.managedOperationsDisposable.add(managedSynchronizeRecentlyUsedMediaOperations(postbox: self.postbox, network: self.network, category: .stickers, revalidationContext: self.mediaReferenceRevalidationContext).start())
         self.managedOperationsDisposable.add(managedSynchronizeSavedGifsOperations(postbox: self.postbox, network: self.network, revalidationContext: self.mediaReferenceRevalidationContext).start())
         self.managedOperationsDisposable.add(managedSynchronizeSavedStickersOperations(postbox: self.postbox, network: self.network, revalidationContext: self.mediaReferenceRevalidationContext).start())
-        self.managedOperationsDisposable.add(managedRecentlyUsedInlineBots(postbox: self.postbox, network: self.network, accountPeerId: peerId).start())
+        self.managedOperationsDisposable.add(_internal_managedRecentlyUsedInlineBots(postbox: self.postbox, network: self.network, accountPeerId: peerId).start())
         self.managedOperationsDisposable.add(managedLocalTypingActivities(activities: self.localInputActivityManager.allActivities(), postbox: self.postbox, network: self.network, accountPeerId: self.peerId).start())
         self.managedOperationsDisposable.add(managedSynchronizeConsumeMessageContentOperations(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start())
         self.managedOperationsDisposable.add(managedConsumePersonalMessagesActions(postbox: self.postbox, network: self.network, stateManager: self.stateManager).start())
@@ -1123,15 +1132,17 @@ public class Account {
             self.managedOperationsDisposable.add(managedAnimatedEmojiUpdates(postbox: self.postbox, network: self.network).start())
         }
         self.managedOperationsDisposable.add(managedGreetingStickers(postbox: self.postbox, network: self.network).start())
-        
-        let mediaBox = postbox.mediaBox
-        self.storageSettingsDisposable = accountManager.sharedData(keys: [SharedDataKeys.cacheStorageSettings]).start(next: { [weak mediaBox] sharedData in
-            guard let mediaBox = mediaBox else {
-                return
-            }
-            let settings: CacheStorageSettings = sharedData.entries[SharedDataKeys.cacheStorageSettings] as? CacheStorageSettings ?? CacheStorageSettings.defaultSettings
-            mediaBox.setMaxStoreTimes(general: settings.defaultCacheStorageTimeout, shortLived: 60 * 60, gigabytesLimit: settings.defaultCacheStorageLimitGigabytes)
-        })
+
+        if !supplementary {
+            let mediaBox = postbox.mediaBox
+            self.storageSettingsDisposable = accountManager.sharedData(keys: [SharedDataKeys.cacheStorageSettings]).start(next: { [weak mediaBox] sharedData in
+                guard let mediaBox = mediaBox else {
+                    return
+                }
+                let settings: CacheStorageSettings = sharedData.entries[SharedDataKeys.cacheStorageSettings] as? CacheStorageSettings ?? CacheStorageSettings.defaultSettings
+                mediaBox.setMaxStoreTimes(general: settings.defaultCacheStorageTimeout, shortLived: 60 * 60, gigabytesLimit: settings.defaultCacheStorageLimitGigabytes)
+            })
+        }
         
         let _ = masterNotificationsKey(masterNotificationKeyValue: self.masterNotificationKey, postbox: self.postbox, ignoreDisabled: false).start(next: { key in
             let encoder = JSONEncoder()
@@ -1249,9 +1260,9 @@ public func setupAccount(_ account: Account, fetchCachedResourceRepresentation:
     account.postbox.mediaBox.preFetchedResourcePath = preFetchedResourcePath
     account.postbox.mediaBox.fetchResource = { [weak account] resource, intervals, parameters -> Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> in
         if let strongAccount = account {
-            if let result = fetchResource(account: strongAccount, resource: resource, intervals: intervals, parameters: parameters) {
+            if let result = strongAccount.auxiliaryMethods.fetchResource(strongAccount, resource, intervals, parameters) {
                 return result
-            } else if let result = strongAccount.auxiliaryMethods.fetchResource(strongAccount, resource, intervals, parameters) {
+            } else if let result = fetchResource(account: strongAccount, resource: resource, intervals: intervals, parameters: parameters) {
                 return result
             } else {
                 return .never()
diff --git a/submodules/TelegramCore/Sources/AccountIntermediateState.swift b/submodules/TelegramCore/Sources/Account/AccountIntermediateState.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/AccountIntermediateState.swift
rename to submodules/TelegramCore/Sources/Account/AccountIntermediateState.swift
index c468b1f85c..dcce140d9e 100644
--- a/submodules/TelegramCore/Sources/AccountIntermediateState.swift
+++ b/submodules/TelegramCore/Sources/Account/AccountIntermediateState.swift
@@ -417,7 +417,7 @@ struct AccountMutableState {
             switch user {
                 case let .user(_, id, _, _, _, _, _, _, status, _, _, _, _):
                     if let status = status {
-                        presences[PeerId(namespace: Namespaces.Peer.CloudUser, id: id)] = status
+                        presences[PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))] = status
                     }
                     break
                 case .userEmpty:
diff --git a/submodules/TelegramCore/Sources/AccountManager.swift b/submodules/TelegramCore/Sources/Account/AccountManager.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/AccountManager.swift
rename to submodules/TelegramCore/Sources/Account/AccountManager.swift
index 69ed985493..b1e3d106d0 100644
--- a/submodules/TelegramCore/Sources/AccountManager.swift
+++ b/submodules/TelegramCore/Sources/Account/AccountManager.swift
@@ -174,6 +174,8 @@ private var declaredEncodables: Void = {
     declareEncodable(CachedPeerExportedInvitations.self, f: { CachedPeerExportedInvitations(decoder: $0) })
     declareEncodable(ExportedInvitation.self, f: { ExportedInvitation(decoder: $0) })
     declareEncodable(CachedDisplayAsPeers.self, f: { CachedDisplayAsPeers(decoder: $0) })
+    declareEncodable(WallpapersState.self, f: { WallpapersState(decoder: $0) })
+    declareEncodable(WallpaperDataResource.self, f: { WallpaperDataResource(decoder: $0) })
     
     return
 }()
@@ -187,7 +189,27 @@ public func rootPathForBasePath(_ appGroupPath: String) -> String {
 }
 
 public func performAppGroupUpgrades(appGroupPath: String, rootPath: String) {
-    let _ = try? FileManager.default.createDirectory(at: URL(fileURLWithPath: rootPath), withIntermediateDirectories: true, attributes: nil)
+    DispatchQueue.global(qos: .default).async {
+        let _ = try? FileManager.default.createDirectory(at: URL(fileURLWithPath: rootPath), withIntermediateDirectories: true, attributes: nil)
+
+        if let items = FileManager.default.enumerator(at: URL(fileURLWithPath: appGroupPath), includingPropertiesForKeys: [.isDirectoryKey], options: [.skipsHiddenFiles, .skipsSubdirectoryDescendants], errorHandler: nil) {
+            let allowedDirectories: [String] = [
+                "telegram-data",
+                "Library"
+            ]
+
+            for url in items {
+                guard let url = url as? URL else {
+                    continue
+                }
+                if let isDirectory = try? url.resourceValues(forKeys: [.isDirectoryKey]).isDirectory, isDirectory {
+                    if !allowedDirectories.contains(url.lastPathComponent) {
+                        let _ = try? FileManager.default.removeItem(at: url)
+                    }
+                }
+            }
+        }
+    }
     
     do {
         var resourceValues = URLResourceValues()
diff --git a/submodules/TelegramCore/Sources/AccountStateReset.swift b/submodules/TelegramCore/Sources/AccountStateReset.swift
deleted file mode 100644
index 02d0d22972..0000000000
--- a/submodules/TelegramCore/Sources/AccountStateReset.swift
+++ /dev/null
@@ -1,292 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-import MtProtoKit
-
-import SyncCore
-
-private struct LocalChatListEntryRange {
-    var entries: [ChatListNamespaceEntry]
-    var upperBound: ChatListIndex?
-    var lowerBound: ChatListIndex
-    var count: Int32
-    var hash: UInt32
-    
-    var apiHash: Int32 {
-        return Int32(bitPattern: self.hash & UInt32(0x7FFFFFFF))
-    }
-}
-
-private func combineHash(_ value: Int32, into hash: inout UInt32) {
-    let low = UInt32(bitPattern: value)
-    hash = (hash &* 20261) &+ low
-}
-
-private func combineChatListNamespaceEntryHash(index: ChatListIndex, readState: PeerReadState?, topMessageAttributes: [MessageAttribute], tagSummary: MessageHistoryTagNamespaceSummary?, interfaceState: PeerChatInterfaceState?, into hash: inout UInt32) {
-    /*
-     dialog.pinned ? 1 : 0,
-     dialog.unread_mark ? 1 : 0,
-     dialog.peer.channel_id || dialog.peer.chat_id || dialog.peer.user_id,
-     dialog.top_message.id,
-     top_message.edit_date || top_message.date,
-     dialog.read_inbox_max_id,
-     dialog.read_outbox_max_id,
-     dialog.unread_count,
-     dialog.unread_mentions_count,
-     draft.draft.date || 0
-     
-     */
-    
-    combineHash(index.pinningIndex != nil ? 1 : 0, into: &hash)
-    if let readState = readState, readState.markedUnread {
-        combineHash(1, into: &hash)
-    } else {
-        combineHash(0, into: &hash)
-    }
-    combineHash(index.messageIndex.id.peerId.id, into: &hash)
-    combineHash(index.messageIndex.id.id, into: &hash)
-    var timestamp = index.messageIndex.timestamp
-    for attribute in topMessageAttributes {
-        if let attribute = attribute as? EditedMessageAttribute {
-            timestamp = max(timestamp, attribute.date)
-        }
-    }
-    combineHash(timestamp, into: &hash)
-    if let readState = readState, case let .idBased(maxIncomingReadId, maxOutgoingReadId, _, count, _) = readState {
-        combineHash(maxIncomingReadId, into: &hash)
-        combineHash(maxOutgoingReadId, into: &hash)
-        combineHash(count, into: &hash)
-    } else {
-        combineHash(0, into: &hash)
-        combineHash(0, into: &hash)
-        combineHash(0, into: &hash)
-    }
-    
-    if let tagSummary = tagSummary {
-        combineHash(tagSummary.count, into: &hash)
-    } else {
-        combineHash(0, into: &hash)
-    }
-    
-    if let embeddedState = interfaceState?.chatListEmbeddedState {
-        combineHash(embeddedState.timestamp, into: &hash)
-    } else {
-        combineHash(0, into: &hash)
-    }
-}
-
-private func localChatListEntryRanges(_ entries: [ChatListNamespaceEntry], limit: Int) -> [LocalChatListEntryRange] {
-    var result: [LocalChatListEntryRange] = []
-    var currentRange: LocalChatListEntryRange?
-    for i in 0 ..< entries.count {
-        switch entries[i] {
-            case let .peer(index, readState, topMessageAttributes, tagSummary, interfaceState):
-                var updatedRange: LocalChatListEntryRange
-                if let current = currentRange {
-                    updatedRange = current
-                } else {
-                    updatedRange = LocalChatListEntryRange(entries: [], upperBound: result.last?.lowerBound, lowerBound: index, count: 0, hash: 0)
-                }
-                updatedRange.entries.append(entries[i])
-                updatedRange.lowerBound = index
-                updatedRange.count += 1
-                
-                combineChatListNamespaceEntryHash(index: index, readState: readState, topMessageAttributes: topMessageAttributes, tagSummary: tagSummary, interfaceState: interfaceState, into: &updatedRange.hash)
-            
-                if Int(updatedRange.count) >= limit {
-                    result.append(updatedRange)
-                    currentRange = nil
-                } else {
-                    currentRange = updatedRange
-                }
-            case .hole:
-                if let currentRangeValue = currentRange {
-                    result.append(currentRangeValue)
-                    currentRange = nil
-                }
-        }
-    }
-    if let currentRangeValue = currentRange {
-        result.append(currentRangeValue)
-        currentRange = nil
-    }
-    return result
-}
-
-private struct ResolvedChatListResetRange {
-    let head: Bool
-    let local: LocalChatListEntryRange
-    let remote: FetchedChatList
-}
-
-/*func accountStateReset(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
-    let pinnedChats: Signal<Api.messages.PeerDialogs, NoError> = network.request(Api.functions.messages.getPinnedDialogs(folderId: 0))
-    |> retryRequest
-    let state: Signal<Api.updates.State, NoError> = network.request(Api.functions.updates.getState())
-    |> retryRequest
-    
-    return postbox.transaction { transaction -> [ChatListNamespaceEntry] in
-        return transaction.getChatListNamespaceEntries(groupId: .root, namespace: Namespaces.Message.Cloud, summaryTag: MessageTags.unseenPersonalMessage)
-    }
-    |> mapToSignal { localChatListEntries -> Signal<Void, NoError> in
-        let localRanges = localChatListEntryRanges(localChatListEntries, limit: 100)
-        var signal: Signal<ResolvedChatListResetRange?, NoError> = .complete()
-        for i in 0 ..< localRanges.count {
-            let upperBound: MessageIndex
-            let head = i == 0
-            let localRange = localRanges[i]
-            if let rangeUpperBound = localRange.upperBound {
-                upperBound = rangeUpperBound.messageIndex.predecessor()
-            } else {
-                upperBound = MessageIndex(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.Empty, id: 0), namespace: Namespaces.Message.Cloud, id: 0), timestamp: 0)
-            }
-            
-            let rangeSignal: Signal<ResolvedChatListResetRange?, NoError> = fetchChatList(postbox: postbox, network: network, location: .general, upperBound: upperBound, hash: localRange.apiHash, limit: localRange.count)
-            |> map { remote -> ResolvedChatListResetRange? in
-                if let remote = remote {
-                    return ResolvedChatListResetRange(head: head, local: localRange, remote: remote)
-                } else {
-                    return nil
-                }
-            }
-            
-            signal = signal
-            |> then(rangeSignal)
-        }
-        let collectedResolvedRanges: Signal<[ResolvedChatListResetRange], NoError> = signal
-        |> map { next -> [ResolvedChatListResetRange] in
-            if let next = next {
-                return [next]
-            } else {
-                return []
-            }
-        }
-        |> reduceLeft(value: [], f: { list, next in
-            var list = list
-            list.append(contentsOf: next)
-            return list
-        })
-        
-        return combineLatest(collectedResolvedRanges, state)
-        |> mapToSignal { collectedRanges, state -> Signal<Void, NoError> in
-            return postbox.transaction { transaction -> Void in
-                for range in collectedRanges {
-                    let previousPeerIds = transaction.resetChatList(keepPeerNamespaces: [Namespaces.Peer.SecretChat], upperBound: range.local.upperBound ?? ChatListIndex.absoluteUpperBound, lowerBound: range.local.lowerBound)
-                    #if DEBUG
-                    for peerId in previousPeerIds {
-                        print("pre \(peerId) [\(transaction.getPeer(peerId)?.debugDisplayTitle ?? "nil")]")
-                    }
-                    print("pre hash \(range.local.hash)")
-                    print("")
-                    
-                    var preRecalculatedHash: UInt32 = 0
-                    for entry in range.local.entries {
-                        switch entry {
-                            case let .peer(index, readState, topMessageAttributes, tagSummary, interfaceState):
-                                print("val \(index.messageIndex.id.peerId) [\(transaction.getPeer(index.messageIndex.id.peerId)?.debugDisplayTitle ?? "nil")]")
-                                combineChatListNamespaceEntryHash(index: index, readState: readState, topMessageAttributes: topMessageAttributes, tagSummary: nil, interfaceState: nil, into: &preRecalculatedHash)
-                            default:
-                                break
-                        }
-                    }
-                    print("pre recalculated hash \(preRecalculatedHash)")
-                    print("")
-                    
-                    var hash: UInt32 = 0
-                    range.remote.storeMessages.compactMap({ message -> MessageIndex? in
-                        if case let .Id(id) = message.id {
-                            if range.remote.topMessageIds[id.peerId] == id {
-                                return message.index
-                            }
-                        }
-                        return nil
-                    }).sorted(by: { lhs, rhs in
-                        return lhs > rhs
-                    }).forEach({ index in
-                        var topMessageAttributes: [MessageAttribute] = []
-                        for message in range.remote.storeMessages {
-                            if case let .Id(id) = message.id, id == index.id {
-                                topMessageAttributes = message.attributes
-                            }
-                        }
-                        combineChatListNamespaceEntryHash(index: ChatListIndex(pinningIndex: nil, messageIndex: index), readState: range.remote.readStates[index.id.peerId]?[Namespaces.Message.Cloud], topMessageAttributes: topMessageAttributes, tagSummary: nil, interfaceState: nil, into: &hash)
-                        print("upd \(index.id.peerId) [\(transaction.getPeer(index.id.peerId)?.debugDisplayTitle ?? "nil")]")
-                    })
-                    print("upd hash \(hash)")
-                    #endif
-                    
-                    updatePeers(transaction: transaction, peers: range.remote.peers, update: { _, updated -> Peer in
-                        return updated
-                    })
-                    updatePeerPresences(transaction: transaction, accountPeerId: accountPeerId, peerPresences: range.remote.peerPresences)
-                    
-                    transaction.updateCurrentPeerNotificationSettings(range.remote.notificationSettings)
-                    
-                    var allPeersWithMessages = Set<PeerId>()
-                    for message in range.remote.storeMessages {
-                        allPeersWithMessages.insert(message.id.peerId)
-                    }
-                    
-                    for (_, messageId) in range.remote.topMessageIds {
-                        if messageId.id > 1 {
-                            var skipHole = false
-                            if let localTopId = transaction.getTopPeerMessageIndex(peerId: messageId.peerId, namespace: messageId.namespace)?.id {
-                                if localTopId >= messageId {
-                                    skipHole = true
-                                }
-                            }
-                            if !skipHole {
-                                //transaction.addHole(MessageId(peerId: messageId.peerId, namespace: messageId.namespace, id: messageId.id - 1))
-                            }
-                        }
-                    }
-                    
-                    let _ = transaction.addMessages(range.remote.storeMessages, location: .UpperHistoryBlock)
-                    
-                    transaction.resetIncomingReadStates(range.remote.readStates)
-                    
-                    for (peerId, chatState) in range.remote.chatStates {
-                        if let chatState = chatState as? ChannelState {
-                            if let current = transaction.getPeerChatState(peerId) as? ChannelState {
-                                transaction.setPeerChatState(peerId, state: current.withUpdatedPts(chatState.pts))
-                            } else {
-                                transaction.setPeerChatState(peerId, state: chatState)
-                            }
-                        } else {
-                            transaction.setPeerChatState(peerId, state: chatState)
-                        }
-                    }
-                    
-                    for (peerId, summary) in range.remote.mentionTagSummaries {
-                        transaction.replaceMessageTagSummary(peerId: peerId, tagMask: .unseenPersonalMessage, namespace: Namespaces.Message.Cloud, count: summary.count, maxId: summary.range.maxId)
-                    }
-                    
-                    let namespacesWithHoles: [PeerId.Namespace: [MessageId.Namespace]] = [
-                        Namespaces.Peer.CloudUser: [Namespaces.Message.Cloud],
-                        Namespaces.Peer.CloudGroup: [Namespaces.Message.Cloud],
-                        Namespaces.Peer.CloudChannel: [Namespaces.Message.Cloud]
-                    ]
-                    for peerId in previousPeerIds {
-                        if !allPeersWithMessages.contains(peerId), let namespaces = namespacesWithHoles[peerId.namespace] {
-                            for namespace in namespaces {
-                                //transaction.addHole(MessageId(peerId: peerId, namespace: namespace, id: Int32.max - 1))
-                            }
-                        }
-                    }
-                    
-                    if range.head {
-                        transaction.setPinnedItemIds(groupId: nil, itemIds: range.remote.pinnedItemIds ?? [])
-                    }
-                }
-                
-                if let currentState = transaction.getState() as? AuthorizedAccountState, let embeddedState = currentState.state {
-                    switch state {
-                        case let .state(pts, _, _, seq, _):
-                            transaction.setState(currentState.changedState(AuthorizedAccountState.State(pts: pts, qts: embeddedState.qts, date: embeddedState.date, seq: seq)))
-                    }
-                }
-            }
-        }
-    }
-}*/
diff --git a/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift b/submodules/TelegramCore/Sources/ApiUtils/ApiGroupOrChannel.swift
similarity index 79%
rename from submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ApiGroupOrChannel.swift
index 46c548fae7..bb4734b39a 100644
--- a/submodules/TelegramCore/Sources/ApiGroupOrChannel.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/ApiGroupOrChannel.swift
@@ -7,19 +7,15 @@ import SyncCore
 func imageRepresentationsForApiChatPhoto(_ photo: Api.ChatPhoto) -> [TelegramMediaImageRepresentation] {
     var representations: [TelegramMediaImageRepresentation] = []
     switch photo {
-        case let .chatPhoto(flags, photoSmall, photoBig, dcId):
+        case let .chatPhoto(_, photoId, strippedThumb, dcId):
             let smallResource: TelegramMediaResource
             let fullSizeResource: TelegramMediaResource
-            switch photoSmall {
-                case let .fileLocationToBeDeprecated(volumeId, localId):
-                    smallResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: .small, volumeId: volumeId, localId: localId)
-            }
-            switch photoBig {
-                case let .fileLocationToBeDeprecated(volumeId, localId):
-                    fullSizeResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: .fullSize, volumeId: volumeId, localId: localId)
-            }
-            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 80, height: 80), resource: smallResource, progressiveSizes: []))
-            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: fullSizeResource, progressiveSizes: []))
+
+            smallResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: photoId, sizeSpec: .small, volumeId: nil, localId: nil)
+            fullSizeResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: photoId, sizeSpec: .fullSize, volumeId: nil, localId: nil)
+
+            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 80, height: 80), resource: smallResource, progressiveSizes: [], immediateThumbnailData: strippedThumb?.makeData()))
+            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: fullSizeResource, progressiveSizes: [], immediateThumbnailData: strippedThumb?.makeData()))
         case .chatPhotoEmpty:
             break
     }
@@ -34,7 +30,7 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? {
         if let migratedTo = migratedTo {
             switch migratedTo {
             case let .inputChannel(channelId, accessHash):
-                migrationReference = TelegramGroupToChannelMigrationReference(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), accessHash: accessHash)
+                migrationReference = TelegramGroupToChannelMigrationReference(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), accessHash: accessHash)
             case .inputChannelEmpty:
                 break
             case .inputChannelFromMessage:
@@ -57,11 +53,11 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? {
         if (flags & Int32(1 << 24)) != 0 {
             groupFlags.insert(.hasActiveVoiceChat)
         }
-        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), title: title, photo: imageRepresentationsForApiChatPhoto(photo), participantCount: Int(participantsCount), role: role, membership: left ? .Left : .Member, flags: groupFlags, defaultBannedRights: defaultBannedRights.flatMap(TelegramChatBannedRights.init(apiBannedRights:)), migrationReference: migrationReference, creationDate: date, version: Int(version))
+        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id)), title: title, photo: imageRepresentationsForApiChatPhoto(photo), participantCount: Int(participantsCount), role: role, membership: left ? .Left : .Member, flags: groupFlags, defaultBannedRights: defaultBannedRights.flatMap(TelegramChatBannedRights.init(apiBannedRights:)), migrationReference: migrationReference, creationDate: date, version: Int(version))
     case let .chatEmpty(id):
-        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), title: "", photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
+        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id)), title: "", photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
     case let .chatForbidden(id, title):
-        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), title: title, photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
+        return TelegramGroup(id: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id)), title: title, photo: [], participantCount: 0, role: .member, membership: .Removed, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
     case let .channel(flags, id, accessHash, title, username, photo, date, version, restrictionReason, adminRights, bannedRights, defaultBannedRights, _):
         let isMin = (flags & (1 << 12)) != 0
         
@@ -133,7 +129,7 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? {
             }
         }
         
-        return TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: id), accessHash: accessHashValue, title: title, username: username, photo: imageRepresentationsForApiChatPhoto(photo), creationDate: date, version: version, participationStatus: participationStatus, info: info, flags: channelFlags, restrictionInfo: restrictionInfo, adminRights: adminRights.flatMap(TelegramChatAdminRights.init), bannedRights: bannedRights.flatMap(TelegramChatBannedRights.init), defaultBannedRights: defaultBannedRights.flatMap(TelegramChatBannedRights.init))
+        return TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id)), accessHash: accessHashValue, title: title, username: username, photo: imageRepresentationsForApiChatPhoto(photo), creationDate: date, version: version, participationStatus: participationStatus, info: info, flags: channelFlags, restrictionInfo: restrictionInfo, adminRights: adminRights.flatMap(TelegramChatAdminRights.init), bannedRights: bannedRights.flatMap(TelegramChatBannedRights.init), defaultBannedRights: defaultBannedRights.flatMap(TelegramChatBannedRights.init))
     case let .channelForbidden(flags, id, accessHash, title, untilDate):
         let info: TelegramChannelInfo
         if (flags & Int32(1 << 8)) != 0 {
@@ -142,7 +138,7 @@ func parseTelegramGroupOrChannel(chat: Api.Chat) -> Peer? {
             info = .broadcast(TelegramChannelBroadcastInfo(flags: []))
         }
         
-        return TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: id), accessHash: .personal(accessHash), title: title, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .kicked, info: info, flags: TelegramChannelFlags(), restrictionInfo: nil, adminRights: nil, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: untilDate ?? Int32.max), defaultBannedRights: nil)
+        return TelegramChannel(id: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id)), accessHash: .personal(accessHash), title: title, username: nil, photo: [], creationDate: 0, version: 0, participationStatus: .kicked, info: info, flags: TelegramChannelFlags(), restrictionInfo: nil, adminRights: nil, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: untilDate ?? Int32.max), defaultBannedRights: nil)
     }
 }
 
diff --git a/submodules/TelegramCore/Sources/ApiUtils.swift b/submodules/TelegramCore/Sources/ApiUtils/ApiUtils.swift
similarity index 74%
rename from submodules/TelegramCore/Sources/ApiUtils.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ApiUtils.swift
index f7beff73f4..9f9ffc38f9 100644
--- a/submodules/TelegramCore/Sources/ApiUtils.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/ApiUtils.swift
@@ -8,11 +8,11 @@ public extension PeerReference {
     var id: PeerId {
         switch self {
         case let .user(id, _):
-            return PeerId(namespace: Namespaces.Peer.CloudUser, id: id)
+            return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))
         case let .group(id):
-            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: id)
+            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id))
         case let .channel(id, _):
-            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: id)
+            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id))
         }
     }
 }
@@ -49,12 +49,12 @@ extension PeerReference {
 func forceApiInputPeer(_ peer: Peer) -> Api.InputPeer? {
     switch peer {
     case let user as TelegramUser:
-        return Api.InputPeer.inputPeerUser(userId: user.id.id, accessHash: user.accessHash?.value ?? 0)
+        return Api.InputPeer.inputPeerUser(userId: user.id.id._internalGetInt32Value(), accessHash: user.accessHash?.value ?? 0)
     case let group as TelegramGroup:
-        return Api.InputPeer.inputPeerChat(chatId: group.id.id)
+        return Api.InputPeer.inputPeerChat(chatId: group.id.id._internalGetInt32Value())
     case let channel as TelegramChannel:
         if let accessHash = channel.accessHash {
-            return Api.InputPeer.inputPeerChannel(channelId: channel.id.id, accessHash: accessHash.value)
+            return Api.InputPeer.inputPeerChannel(channelId: channel.id.id._internalGetInt32Value(), accessHash: accessHash.value)
         } else {
             return nil
         }
@@ -66,12 +66,12 @@ func forceApiInputPeer(_ peer: Peer) -> Api.InputPeer? {
 func apiInputPeer(_ peer: Peer) -> Api.InputPeer? {
     switch peer {
     case let user as TelegramUser where user.accessHash != nil:
-        return Api.InputPeer.inputPeerUser(userId: user.id.id, accessHash: user.accessHash!.value)
+        return Api.InputPeer.inputPeerUser(userId: user.id.id._internalGetInt32Value(), accessHash: user.accessHash!.value)
     case let group as TelegramGroup:
-        return Api.InputPeer.inputPeerChat(chatId: group.id.id)
+        return Api.InputPeer.inputPeerChat(chatId: group.id.id._internalGetInt32Value())
     case let channel as TelegramChannel:
         if let accessHash = channel.accessHash {
-            return Api.InputPeer.inputPeerChannel(channelId: channel.id.id, accessHash: accessHash.value)
+            return Api.InputPeer.inputPeerChannel(channelId: channel.id.id._internalGetInt32Value(), accessHash: accessHash.value)
         } else {
             return nil
         }
@@ -82,7 +82,7 @@ func apiInputPeer(_ peer: Peer) -> Api.InputPeer? {
 
 func apiInputChannel(_ peer: Peer) -> Api.InputChannel? {
     if let channel = peer as? TelegramChannel, let accessHash = channel.accessHash {
-        return Api.InputChannel.inputChannel(channelId: channel.id.id, accessHash: accessHash.value)
+        return Api.InputChannel.inputChannel(channelId: channel.id.id._internalGetInt32Value(), accessHash: accessHash.value)
     } else {
         return nil
     }
@@ -90,7 +90,7 @@ func apiInputChannel(_ peer: Peer) -> Api.InputChannel? {
 
 func apiInputUser(_ peer: Peer) -> Api.InputUser? {
     if let user = peer as? TelegramUser, let accessHash = user.accessHash {
-        return Api.InputUser.inputUser(userId: user.id.id, accessHash: accessHash.value)
+        return Api.InputUser.inputUser(userId: user.id.id._internalGetInt32Value(), accessHash: accessHash.value)
     } else {
         return nil
     }
@@ -98,7 +98,7 @@ func apiInputUser(_ peer: Peer) -> Api.InputUser? {
 
 func apiInputSecretChat(_ peer: Peer) -> Api.InputEncryptedChat? {
     if let chat = peer as? TelegramSecretChat {
-        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: chat.accessHash)
+        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: chat.accessHash)
     } else {
         return nil
     }
diff --git a/submodules/TelegramCore/Sources/BotInfo.swift b/submodules/TelegramCore/Sources/ApiUtils/BotInfo.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/BotInfo.swift
rename to submodules/TelegramCore/Sources/ApiUtils/BotInfo.swift
diff --git a/submodules/TelegramCore/Sources/CachedChannelParticipants.swift b/submodules/TelegramCore/Sources/ApiUtils/CachedChannelParticipants.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/CachedChannelParticipants.swift
rename to submodules/TelegramCore/Sources/ApiUtils/CachedChannelParticipants.swift
index c59f280f4d..8964880bd0 100644
--- a/submodules/TelegramCore/Sources/CachedChannelParticipants.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/CachedChannelParticipants.swift
@@ -199,19 +199,19 @@ extension ChannelParticipant {
     init(apiParticipant: Api.ChannelParticipant) {
         switch apiParticipant {
             case let .channelParticipant(userId, date):
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil)
+                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil)
             case let .channelParticipantCreator(_, userId, adminRights, rank):
-                self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights) ?? TelegramChatAdminRights(rights: []), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), canBeEditedByAccountPeer: true), rank: rank)
+                self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights) ?? TelegramChatAdminRights(rights: []), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), canBeEditedByAccountPeer: true), rank: rank)
             case let .channelParticipantBanned(flags, userId, restrictedBy, date, bannedRights):
                 let hasLeft = (flags & (1 << 0)) != 0
-                let banInfo = ChannelParticipantBannedInfo(rights: TelegramChatBannedRights(apiBannedRights: bannedRights), restrictedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: restrictedBy), timestamp: date, isMember: !hasLeft)
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: banInfo, rank: nil)
+                let banInfo = ChannelParticipantBannedInfo(rights: TelegramChatBannedRights(apiBannedRights: bannedRights), restrictedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(restrictedBy)), timestamp: date, isMember: !hasLeft)
+                self = .member(id: userId.peerId, invitedAt: date, adminInfo: nil, banInfo: banInfo, rank: nil)
             case let .channelParticipantAdmin(flags, userId, _, promotedBy, date, adminRights, rank: rank):
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights) ?? TelegramChatAdminRights(rights: []), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: promotedBy), canBeEditedByAccountPeer: (flags & (1 << 0)) != 0), banInfo: nil, rank: rank)
+                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), invitedAt: date, adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(apiAdminRights: adminRights) ?? TelegramChatAdminRights(rights: []), promotedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(promotedBy)), canBeEditedByAccountPeer: (flags & (1 << 0)) != 0), banInfo: nil, rank: rank)
             case let .channelParticipantSelf(userId, _, date):
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil)
+                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), invitedAt: date, adminInfo: nil, banInfo: nil, rank: nil)
             case let .channelParticipantLeft(userId):
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil)
+                self = .member(id: userId.peerId, invitedAt: 0, adminInfo: nil, banInfo: nil, rank: nil)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/CachedGroupParticipants.swift b/submodules/TelegramCore/Sources/ApiUtils/CachedGroupParticipants.swift
similarity index 69%
rename from submodules/TelegramCore/Sources/CachedGroupParticipants.swift
rename to submodules/TelegramCore/Sources/ApiUtils/CachedGroupParticipants.swift
index ceb0b1839c..c536963ca3 100644
--- a/submodules/TelegramCore/Sources/CachedGroupParticipants.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/CachedGroupParticipants.swift
@@ -8,11 +8,11 @@ extension GroupParticipant {
     init(apiParticipant: Api.ChatParticipant) {
         switch apiParticipant {
             case let .chatParticipantCreator(userId):
-                self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))
+                self = .creator(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))
             case let .chatParticipantAdmin(userId, inviterId, date):
-                self = .admin(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId), invitedAt: date)
+                self = .admin(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), invitedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId)), invitedAt: date)
             case let .chatParticipant(userId, inviterId, date):
-                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), invitedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId), invitedAt: date)
+                self = .member(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), invitedBy: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId)), invitedAt: date)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/ChatContextResult.swift b/submodules/TelegramCore/Sources/ApiUtils/ChatContextResult.swift
similarity index 91%
rename from submodules/TelegramCore/Sources/ChatContextResult.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ChatContextResult.swift
index 1b3069c2db..1a1668cb64 100644
--- a/submodules/TelegramCore/Sources/ChatContextResult.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/ChatContextResult.swift
@@ -19,6 +19,7 @@ public enum ChatContextResultMessage: PostboxCoding, Equatable, Codable {
     case text(text: String, entities: TextEntitiesMessageAttribute?, disableUrlPreview: Bool, replyMarkup: ReplyMarkupMessageAttribute?)
     case mapLocation(media: TelegramMediaMap, replyMarkup: ReplyMarkupMessageAttribute?)
     case contact(media: TelegramMediaContact, replyMarkup: ReplyMarkupMessageAttribute?)
+    case invoice(media: TelegramMediaInvoice, replyMarkup: ReplyMarkupMessageAttribute?)
     
     public init(decoder: PostboxDecoder) {
         switch decoder.decodeInt32ForKey("_v", orElse: 0) {
@@ -30,6 +31,8 @@ public enum ChatContextResultMessage: PostboxCoding, Equatable, Codable {
                 self = .mapLocation(media: decoder.decodeObjectForKey("l") as! TelegramMediaMap, replyMarkup: decoder.decodeObjectForKey("m") as? ReplyMarkupMessageAttribute)
             case 3:
                 self = .contact(media: decoder.decodeObjectForKey("c") as! TelegramMediaContact, replyMarkup: decoder.decodeObjectForKey("m") as? ReplyMarkupMessageAttribute)
+            case 4:
+                self = .invoice(media: decoder.decodeObjectForKey("i") as! TelegramMediaInvoice, replyMarkup: decoder.decodeObjectForKey("m") as? ReplyMarkupMessageAttribute)
             default:
                 self = .auto(caption: "", entities: nil, replyMarkup: nil)
         }
@@ -80,6 +83,14 @@ public enum ChatContextResultMessage: PostboxCoding, Equatable, Codable {
                 } else {
                     encoder.encodeNil(forKey: "m")
                 }
+            case let .invoice(media: media, replyMarkup):
+                encoder.encodeInt32(4, forKey: "_v")
+                encoder.encodeObject(media, forKey: "i")
+                if let replyMarkup = replyMarkup {
+                    encoder.encodeObject(replyMarkup, forKey: "m")
+                } else {
+                    encoder.encodeNil(forKey: "m")
+                }
         }
     }
     
@@ -157,6 +168,18 @@ public enum ChatContextResultMessage: PostboxCoding, Equatable, Codable {
                 } else {
                     return false
                 }
+            case let .invoice(lhsMedia, lhsReplyMarkup):
+                if case let .invoice(rhsMedia, rhsReplyMarkup) = rhs {
+                    if !lhsMedia.isEqual(to: rhsMedia) {
+                        return false
+                    }
+                    if lhsReplyMarkup != rhsReplyMarkup {
+                        return false
+                    }
+                    return true
+                } else {
+                    return false
+                }
         }
     }
 }
@@ -444,6 +467,19 @@ extension ChatContextResultMessage {
                     parsedReplyMarkup = ReplyMarkupMessageAttribute(apiMarkup: replyMarkup)
                 }
                 self = .contact(media: media, replyMarkup: parsedReplyMarkup)
+            case let .botInlineMessageMediaInvoice(flags, title, description, photo, currency, totalAmount, replyMarkup):
+                var parsedFlags = TelegramMediaInvoiceFlags()
+                if (flags & (1 << 3)) != 0 {
+                    parsedFlags.insert(.isTest)
+                }
+                if (flags & (1 << 1)) != 0 {
+                    parsedFlags.insert(.shippingAddressRequested)
+                }
+                var parsedReplyMarkup: ReplyMarkupMessageAttribute?
+                if let replyMarkup = replyMarkup {
+                    parsedReplyMarkup = ReplyMarkupMessageAttribute(apiMarkup: replyMarkup)
+                }
+                self = .invoice(media: TelegramMediaInvoice(title: title, description: description, photo: photo.flatMap(TelegramMediaWebFile.init), receiptMessageId: nil, currency: currency, totalAmount: totalAmount, startParam: "", flags: parsedFlags), replyMarkup: parsedReplyMarkup)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/CloudFileMediaResource.swift b/submodules/TelegramCore/Sources/ApiUtils/CloudFileMediaResource.swift
similarity index 82%
rename from submodules/TelegramCore/Sources/CloudFileMediaResource.swift
rename to submodules/TelegramCore/Sources/ApiUtils/CloudFileMediaResource.swift
index 71a2ac6b6a..57dc51dc09 100644
--- a/submodules/TelegramCore/Sources/CloudFileMediaResource.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/CloudFileMediaResource.swift
@@ -34,7 +34,7 @@ extension CloudDocumentSizeMediaResource: TelegramCloudMediaResource, TelegramMu
     }
 }
 
-extension CloudPeerPhotoSizeMediaResource:  TelegramMultipartFetchableResource {
+extension CloudPeerPhotoSizeMediaResource: TelegramMultipartFetchableResource {
     func apiInputLocation(peerReference: PeerReference) -> Api.InputFileLocation? {
         let flags: Int32
         switch self.sizeSpec {
@@ -43,13 +43,21 @@ extension CloudPeerPhotoSizeMediaResource:  TelegramMultipartFetchableResource {
             case .fullSize:
                 flags = 1 << 0
         }
-        return Api.InputFileLocation.inputPeerPhotoFileLocation(flags: flags, peer: peerReference.inputPeer, volumeId: self.volumeId, localId: self.localId)
+        if let photoId = self.photoId {
+            return Api.InputFileLocation.inputPeerPhotoFileLocation(flags: flags, peer: peerReference.inputPeer, photoId: photoId)
+        } else {
+            return nil
+        }
     }
 }
 
-extension CloudStickerPackThumbnailMediaResource:  TelegramMultipartFetchableResource {
+extension CloudStickerPackThumbnailMediaResource: TelegramMultipartFetchableResource {
     func apiInputLocation(packReference: StickerPackReference) -> Api.InputFileLocation? {
-        return Api.InputFileLocation.inputStickerSetThumb(stickerset: packReference.apiInputStickerSet, volumeId: self.volumeId, localId: self.localId)
+        if let thumbVersion = self.thumbVersion {
+            return Api.InputFileLocation.inputStickerSetThumb(stickerset: packReference.apiInputStickerSet, thumbVersion: thumbVersion)
+        } else {
+            return nil
+        }
     }
 }
 
diff --git a/submodules/TelegramCore/Sources/CloudMediaResourceParameters.swift b/submodules/TelegramCore/Sources/ApiUtils/CloudMediaResourceParameters.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CloudMediaResourceParameters.swift
rename to submodules/TelegramCore/Sources/ApiUtils/CloudMediaResourceParameters.swift
diff --git a/submodules/TelegramCore/Sources/EncryptedMediaResource.swift b/submodules/TelegramCore/Sources/ApiUtils/EncryptedMediaResource.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/EncryptedMediaResource.swift
rename to submodules/TelegramCore/Sources/ApiUtils/EncryptedMediaResource.swift
diff --git a/submodules/TelegramCore/Sources/ExportedInvitation.swift b/submodules/TelegramCore/Sources/ApiUtils/ExportedInvitation.swift
similarity index 69%
rename from submodules/TelegramCore/Sources/ExportedInvitation.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ExportedInvitation.swift
index cd4fb5b3fb..48b008b36c 100644
--- a/submodules/TelegramCore/Sources/ExportedInvitation.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/ExportedInvitation.swift
@@ -8,7 +8,7 @@ extension ExportedInvitation {
     init(apiExportedInvite: Api.ExportedChatInvite) {
         switch apiExportedInvite {
         case let .chatInviteExported(flags, link, adminId, date, startDate, expireDate, usageLimit, usage):
-            self = ExportedInvitation(link: link, isPermanent: (flags & (1 << 5)) != 0, isRevoked: (flags & (1 << 0)) != 0, adminId: PeerId(namespace: Namespaces.Peer.CloudUser, id: adminId), date: date, startDate: startDate, expireDate: expireDate, usageLimit: usageLimit, count: usage)
+            self = ExportedInvitation(link: link, isPermanent: (flags & (1 << 5)) != 0, isRevoked: (flags & (1 << 0)) != 0, adminId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(adminId)), date: date, startDate: startDate, expireDate: expireDate, usageLimit: usageLimit, count: usage)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/ImageRepresentationWithReference.swift b/submodules/TelegramCore/Sources/ApiUtils/ImageRepresentationWithReference.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ImageRepresentationWithReference.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ImageRepresentationWithReference.swift
diff --git a/submodules/TelegramCore/Sources/InstantPage.swift b/submodules/TelegramCore/Sources/ApiUtils/InstantPage.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/InstantPage.swift
rename to submodules/TelegramCore/Sources/ApiUtils/InstantPage.swift
diff --git a/submodules/TelegramCore/Sources/MediaResourceApiUtils.swift b/submodules/TelegramCore/Sources/ApiUtils/MediaResourceApiUtils.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/MediaResourceApiUtils.swift
rename to submodules/TelegramCore/Sources/ApiUtils/MediaResourceApiUtils.swift
diff --git a/submodules/TelegramCore/Sources/PeerAccessRestrictionInfo.swift b/submodules/TelegramCore/Sources/ApiUtils/PeerAccessRestrictionInfo.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/PeerAccessRestrictionInfo.swift
rename to submodules/TelegramCore/Sources/ApiUtils/PeerAccessRestrictionInfo.swift
diff --git a/submodules/TelegramCore/Sources/CachedChannelData.swift b/submodules/TelegramCore/Sources/ApiUtils/PeerGeoLocation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CachedChannelData.swift
rename to submodules/TelegramCore/Sources/ApiUtils/PeerGeoLocation.swift
diff --git a/submodules/TelegramCore/Sources/ReactionsMessageAttribute.swift b/submodules/TelegramCore/Sources/ApiUtils/ReactionsMessageAttribute.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ReactionsMessageAttribute.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ReactionsMessageAttribute.swift
diff --git a/submodules/TelegramCore/Sources/RemoteStorageConfiguration.swift b/submodules/TelegramCore/Sources/ApiUtils/RemoteStorageConfiguration.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/RemoteStorageConfiguration.swift
rename to submodules/TelegramCore/Sources/ApiUtils/RemoteStorageConfiguration.swift
index 174478236d..90a45f895d 100644
--- a/submodules/TelegramCore/Sources/RemoteStorageConfiguration.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/RemoteStorageConfiguration.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func currentWebDocumentsHostDatacenterId(postbox: Postbox, isTestingEnvironment: Bool) -> Signal<Int32, NoError> {
+func currentWebDocumentsHostDatacenterId(postbox: Postbox, isTestingEnvironment: Bool) -> Signal<Int32, NoError> {
     return postbox.transaction { transaction -> Int32 in
         if let entry = transaction.getPreferencesEntry(key: PreferencesKeys.remoteStorageConfiguration) as? RemoteStorageConfiguration {
             return entry.webDocumentsHostDatacenterId
diff --git a/submodules/TelegramCore/Sources/ReplyMarkupMessageAttribute.swift b/submodules/TelegramCore/Sources/ApiUtils/ReplyMarkupMessageAttribute.swift
similarity index 91%
rename from submodules/TelegramCore/Sources/ReplyMarkupMessageAttribute.swift
rename to submodules/TelegramCore/Sources/ApiUtils/ReplyMarkupMessageAttribute.swift
index 3f42956000..02917a8b14 100644
--- a/submodules/TelegramCore/Sources/ReplyMarkupMessageAttribute.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/ReplyMarkupMessageAttribute.swift
@@ -56,8 +56,9 @@ extension ReplyMarkupMessageAttribute {
     convenience init(apiMarkup: Api.ReplyMarkup) {
         var rows: [ReplyMarkupRow] = []
         var flags = ReplyMarkupMessageFlags()
+        var placeholder: String?
         switch apiMarkup {
-            case let .replyKeyboardMarkup(markupFlags, apiRows):
+            case let .replyKeyboardMarkup(markupFlags, apiRows, apiPlaceholder):
                 rows = apiRows.map { ReplyMarkupRow(apiRow: $0) }
                 if (markupFlags & (1 << 0)) != 0 {
                     flags.insert(.fit)
@@ -68,10 +69,11 @@ extension ReplyMarkupMessageAttribute {
                 if (markupFlags & (1 << 2)) != 0 {
                     flags.insert(.personal)
                 }
+                placeholder = apiPlaceholder
             case let .replyInlineMarkup(apiRows):
                 rows = apiRows.map { ReplyMarkupRow(apiRow: $0) }
                 flags.insert(.inline)
-            case let .replyKeyboardForceReply(forceReplyFlags):
+            case let .replyKeyboardForceReply(forceReplyFlags, apiPlaceholder):
                 if (forceReplyFlags & (1 << 1)) != 0 {
                     flags.insert(.once)
                 }
@@ -79,11 +81,12 @@ extension ReplyMarkupMessageAttribute {
                     flags.insert(.personal)
                 }
                 flags.insert(.setupReply)
+                placeholder = apiPlaceholder
             case let .replyKeyboardHide(hideFlags):
                 if (hideFlags & (1 << 2)) != 0 {
                     flags.insert(.personal)
                 }
         }
-        self.init(rows: rows, flags: flags)
+        self.init(rows: rows, flags: flags, placeholder: placeholder)
     }
 }
diff --git a/submodules/TelegramCore/Sources/RichText.swift b/submodules/TelegramCore/Sources/ApiUtils/RichText.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/RichText.swift
rename to submodules/TelegramCore/Sources/ApiUtils/RichText.swift
diff --git a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift b/submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/StoreMessage_Telegram.swift
rename to submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
index bb7bea2dc2..19efa3f4c5 100644
--- a/submodules/TelegramCore/Sources/StoreMessage_Telegram.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/StoreMessage_Telegram.swift
@@ -157,14 +157,14 @@ func apiMessagePeerIds(_ message: Api.Message) -> [PeerId] {
             }
             
             if let viaBotId = viaBotId {
-                result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: viaBotId))
+                result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(viaBotId)))
             }
             
             if let media = media {
                 switch media {
                     case let .messageMediaContact(_, _, _, _, userId):
                         if userId != 0 {
-                            result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))
+                            result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))
                         }
                     default:
                         break
@@ -175,7 +175,7 @@ func apiMessagePeerIds(_ message: Api.Message) -> [PeerId] {
                 for entity in entities {
                     switch entity {
                         case let .messageEntityMentionName(_, _, userId):
-                            result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))
+                            result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))
                         default:
                             break
                     }
@@ -196,30 +196,30 @@ func apiMessagePeerIds(_ message: Api.Message) -> [PeerId] {
             }
             
             switch action {
-                case .messageActionChannelCreate, .messageActionChatDeletePhoto, .messageActionChatEditPhoto, .messageActionChatEditTitle, .messageActionEmpty, .messageActionPinMessage, .messageActionHistoryClear, .messageActionGameScore, .messageActionPaymentSent, .messageActionPaymentSentMe, .messageActionPhoneCall, .messageActionScreenshotTaken, .messageActionCustomAction, .messageActionBotAllowed, .messageActionSecureValuesSent, .messageActionSecureValuesSentMe, .messageActionContactSignUp, .messageActionGroupCall, .messageActionSetMessagesTTL:
+                case .messageActionChannelCreate, .messageActionChatDeletePhoto, .messageActionChatEditPhoto, .messageActionChatEditTitle, .messageActionEmpty, .messageActionPinMessage, .messageActionHistoryClear, .messageActionGameScore, .messageActionPaymentSent, .messageActionPaymentSentMe, .messageActionPhoneCall, .messageActionScreenshotTaken, .messageActionCustomAction, .messageActionBotAllowed, .messageActionSecureValuesSent, .messageActionSecureValuesSentMe, .messageActionContactSignUp, .messageActionGroupCall, .messageActionSetMessagesTTL, .messageActionGroupCallScheduled:
                     break
                 case let .messageActionChannelMigrateFrom(_, chatId):
-                    result.append(PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId))
+                    result.append(PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)))
                 case let .messageActionChatAddUser(users):
                     for id in users {
-                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: id))
+                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id)))
                     }
                 case let .messageActionChatCreate(_, users):
                     for id in users {
-                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: id))
+                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id)))
                     }
                 case let .messageActionChatDeleteUser(userId):
-                    result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))
+                    result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))
                 case let .messageActionChatJoinedByLink(inviterId):
-                    result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId))
+                    result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId)))
                 case let .messageActionChatMigrateTo(channelId):
-                    result.append(PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId))
+                    result.append(PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)))
                 case let .messageActionGeoProximityReached(fromId, toId, _):
                     result.append(fromId.peerId)
                     result.append(toId.peerId)
                 case let .messageActionInviteToGroupCall(_, userIds):
                     for id in userIds {
-                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: id))
+                        result.append(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id)))
                     }
             }
         
@@ -263,7 +263,7 @@ func textMediaAndExpirationTimerFromApiMedia(_ media: Api.MessageMedia?, _ peerI
                 return (TelegramMediaExpiredContent(data: .image), nil)
             }
         case let .messageMediaContact(phoneNumber, firstName, lastName, vcard, userId):
-            let contactPeerId: PeerId? = userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+            let contactPeerId: PeerId? = userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
             let mediaContact = TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: contactPeerId, vCardData: vcard.isEmpty ? nil : vcard)
             return (mediaContact, nil)
         case let .messageMediaGeo(geo):
@@ -354,7 +354,7 @@ func messageTextEntitiesFromApiEntities(_ entities: [Api.MessageEntity]) -> [Mes
             case let .messageEntityTextUrl(offset, length, url):
                 result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .TextUrl(url: url)))
             case let .messageEntityMentionName(offset, length, userId):
-                result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .TextMention(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))))
+                result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .TextMention(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))))
             case let .messageEntityPhone(offset, length):
                 result.append(MessageTextEntity(range: Int(offset) ..< Int(offset + length), type: .PhoneNumber))
             case let .messageEntityCashtag(offset, length):
@@ -385,10 +385,10 @@ extension StoreMessage {
                         peerId = chatPeerId.peerId
                         authorId = resolvedFromId
                     case let .peerChat(chatId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         authorId = resolvedFromId
                     case let .peerChannel(channelId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         authorId = resolvedFromId
                 }
                 
@@ -444,15 +444,7 @@ extension StoreMessage {
                             }
                             
                             if let savedFromPeer = savedFromPeer, let savedFromMsgId = savedFromMsgId {
-                                let peerId: PeerId
-                                switch savedFromPeer {
-                                    case let .peerChannel(channelId):
-                                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                                    case let .peerChat(chatId):
-                                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                                    case let .peerUser(userId):
-                                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                                }
+                                let peerId: PeerId = savedFromPeer.peerId
                                 let messageId: MessageId = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: savedFromMsgId)
                                 attributes.append(SourceReferenceMessageAttribute(messageId: messageId))
                             }
@@ -510,7 +502,7 @@ extension StoreMessage {
                 }
                 
                 if let viaBotId = viaBotId {
-                    attributes.append(InlineBotMessageAttribute(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: viaBotId), title: nil))
+                    attributes.append(InlineBotMessageAttribute(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(viaBotId)), title: nil))
                 }
                 
                 if namespace != Namespaces.Message.ScheduledCloud {
@@ -569,7 +561,7 @@ extension StoreMessage {
                             recentRepliersPeerIds = nil
                         }
                         
-                        let commentsPeerId = channelId.flatMap { PeerId(namespace: Namespaces.Peer.CloudChannel, id: $0) }
+                        let commentsPeerId = channelId.flatMap { PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value($0)) }
                         
                         attributes.append(ReplyThreadMessageAttribute(count: repliesCount, latestUsers: recentRepliersPeerIds ?? [], commentsPeerId: commentsPeerId, maxMessageId: maxId, maxReadMessageId: readMaxId))
                     }
diff --git a/submodules/TelegramCore/Sources/TelegramChannel.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramChannel.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramChannel.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramChannel.swift
diff --git a/submodules/TelegramCore/Sources/TelegramChannelAdminRights.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramChannelAdminRights.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramChannelAdminRights.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramChannelAdminRights.swift
diff --git a/submodules/TelegramCore/Sources/TelegramChannelBannedRights.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramChannelBannedRights.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramChannelBannedRights.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramChannelBannedRights.swift
diff --git a/submodules/TelegramCore/Sources/TelegramGroup.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramGroup.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramGroup.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramGroup.swift
diff --git a/submodules/TelegramCore/Sources/TelegramMediaAction.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaAction.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/TelegramMediaAction.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaAction.swift
index 8e93f430ac..d21d94f107 100644
--- a/submodules/TelegramCore/Sources/TelegramMediaAction.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaAction.swift
@@ -9,23 +9,23 @@ func telegramMediaActionFromApiAction(_ action: Api.MessageAction) -> TelegramMe
         case let .messageActionChannelCreate(title):
             return TelegramMediaAction(action: .groupCreated(title: title))
         case let .messageActionChannelMigrateFrom(title, chatId):
-            return TelegramMediaAction(action: .channelMigratedFromGroup(title: title, groupId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)))
+            return TelegramMediaAction(action: .channelMigratedFromGroup(title: title, groupId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))))
         case let .messageActionChatAddUser(users):
-            return TelegramMediaAction(action: .addedMembers(peerIds: users.map({ PeerId(namespace: Namespaces.Peer.CloudUser, id: $0) })))
+            return TelegramMediaAction(action: .addedMembers(peerIds: users.map({ PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value($0)) })))
         case let .messageActionChatCreate(title, _):
             return TelegramMediaAction(action: .groupCreated(title: title))
         case .messageActionChatDeletePhoto:
             return TelegramMediaAction(action: .photoUpdated(image: nil))
         case let .messageActionChatDeleteUser(userId):
-            return TelegramMediaAction(action: .removedMembers(peerIds: [PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]))
+            return TelegramMediaAction(action: .removedMembers(peerIds: [PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]))
         case let .messageActionChatEditPhoto(photo):
             return TelegramMediaAction(action: .photoUpdated(image: telegramMediaImageFromApiPhoto(photo)))
         case let .messageActionChatEditTitle(title):
             return TelegramMediaAction(action: .titleUpdated(title: title))
         case let .messageActionChatJoinedByLink(inviterId):
-            return TelegramMediaAction(action: .joinedByLink(inviter: PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId)))
+            return TelegramMediaAction(action: .joinedByLink(inviter: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId))))
         case let .messageActionChatMigrateTo(channelId):
-            return TelegramMediaAction(action: .groupMigratedToChannel(channelId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)))
+            return TelegramMediaAction(action: .groupMigratedToChannel(channelId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))))
         case .messageActionHistoryClear:
             return TelegramMediaAction(action: .historyCleared)
         case .messageActionPinMessage:
@@ -62,17 +62,22 @@ func telegramMediaActionFromApiAction(_ action: Api.MessageAction) -> TelegramMe
         case let .messageActionGroupCall(_, call, duration):
             switch call {
             case let .inputGroupCall(id, accessHash):
-                return TelegramMediaAction(action: .groupPhoneCall(callId: id, accessHash: accessHash, duration: duration))
+                return TelegramMediaAction(action: .groupPhoneCall(callId: id, accessHash: accessHash, scheduleDate: nil, duration: duration))
             }
         case let .messageActionInviteToGroupCall(call, userIds):
             switch call {
             case let .inputGroupCall(id, accessHash):
                 return TelegramMediaAction(action: .inviteToGroupPhoneCall(callId: id, accessHash: accessHash, peerIds: userIds.map { userId in
-                    PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                    PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                 }))
             }
         case let .messageActionSetMessagesTTL(period):
             return TelegramMediaAction(action: .messageAutoremoveTimeoutUpdated(period))
+        case let .messageActionGroupCallScheduled(call, scheduleDate):
+            switch call {
+            case let .inputGroupCall(id, accessHash):
+                return TelegramMediaAction(action: .groupPhoneCall(callId: id, accessHash: accessHash, scheduleDate: scheduleDate, duration: nil))
+            }
     }
 }
 
diff --git a/submodules/TelegramCore/Sources/TelegramMediaFile.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaFile.swift
similarity index 75%
rename from submodules/TelegramCore/Sources/TelegramMediaFile.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaFile.swift
index d75d737956..02a0afa129 100644
--- a/submodules/TelegramCore/Sources/TelegramMediaFile.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaFile.swift
@@ -125,24 +125,15 @@ func telegramMediaFileThumbnailRepresentationsFromApiSizes(datacenterId: Int32,
     var representations: [TelegramMediaImageRepresentation] = []
     for size in sizes {
         switch size {
-            case let .photoCachedSize(type, location, w, h, _):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, fileReference: fileReference)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSize(type, location, w, h, _):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, fileReference: fileReference)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSizeProgressive(type, location, w, h, sizes):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, fileReference: fileReference)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes))
-                }
+            case let .photoCachedSize(type, w, h, _):
+                let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, fileReference: fileReference)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSize(type, w, h, _):
+                let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, fileReference: fileReference)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSizeProgressive(type, w, h, sizes):
+                let resource = CloudDocumentSizeMediaResource(datacenterId: datacenterId, documentId: documentId, accessHash: accessHash, sizeSpec: type, fileReference: fileReference)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes, immediateThumbnailData: nil))
             case let .photoPathSize(_, data):
                 immediateThumbnailData = data.makeData()
             case let .photoStrippedSize(_, data):
@@ -166,12 +157,9 @@ func telegramMediaFileFromApiDocument(_ document: Api.Document) -> TelegramMedia
             if let videoThumbs = videoThumbs {
                 for thumb in videoThumbs {
                     switch thumb {
-                    case let .videoSize(_, type, location, w, h, _, _):
+                    case let .videoSize(_, type, w, h, _, _):
                         let resource: TelegramMediaResource
-                        switch location {
-                        case let .fileLocationToBeDeprecated(volumeId, localId):
-                            resource = CloudDocumentSizeMediaResource(datacenterId: dcId, documentId: id, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, fileReference: fileReference.makeData())
-                        }
+                        resource = CloudDocumentSizeMediaResource(datacenterId: dcId, documentId: id, accessHash: accessHash, sizeSpec: type, fileReference: fileReference.makeData())
                         
                         videoThumbnails.append(TelegramMediaFile.VideoThumbnail(
                             dimensions: PixelDimensions(width: w, height: h),
diff --git a/submodules/TelegramCore/Sources/TelegramMediaGame.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaGame.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramMediaGame.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaGame.swift
diff --git a/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaImage.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaImage.swift
new file mode 100644
index 0000000000..f0bbd3e317
--- /dev/null
+++ b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaImage.swift
@@ -0,0 +1,61 @@
+import Foundation
+import Postbox
+import TelegramApi
+
+import SyncCore
+
+func telegramMediaImageRepresentationsFromApiSizes(datacenterId: Int32, photoId: Int64, accessHash: Int64, fileReference: Data?, sizes: [Api.PhotoSize]) -> (immediateThumbnail: Data?, representations:  [TelegramMediaImageRepresentation]) {
+    var immediateThumbnailData: Data?
+    var representations: [TelegramMediaImageRepresentation] = []
+    for size in sizes {
+        switch size {
+            case let .photoCachedSize(type, w, h, _):
+                let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, size: nil, fileReference: fileReference)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSize(type, w, h, size):
+                let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, size: Int(size), fileReference: fileReference)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSizeProgressive(type, w, h, sizes):
+                if !sizes.isEmpty {
+                    let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, size: Int(sizes[sizes.count - 1]), fileReference: fileReference)
+                    representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes, immediateThumbnailData: nil))
+                }
+            case let .photoStrippedSize(_, data):
+                immediateThumbnailData = data.makeData()
+            case .photoPathSize:
+                break
+            case .photoSizeEmpty:
+                break
+        }
+    }
+    return (immediateThumbnailData, representations)
+}
+
+func telegramMediaImageFromApiPhoto(_ photo: Api.Photo) -> TelegramMediaImage? {
+    switch photo {
+        case let .photo(flags, id, accessHash, fileReference, _, sizes, videoSizes, dcId):
+            let (immediateThumbnailData, representations) = telegramMediaImageRepresentationsFromApiSizes(datacenterId: dcId, photoId: id, accessHash: accessHash, fileReference: fileReference.makeData(), sizes: sizes)
+            var imageFlags: TelegramMediaImageFlags = []
+            let hasStickers = (flags & (1 << 0)) != 0
+            if hasStickers {
+                imageFlags.insert(.hasStickers)
+            }
+            
+            var videoRepresentations: [TelegramMediaImage.VideoRepresentation] = []
+            if let videoSizes = videoSizes {
+                for size in videoSizes {
+                    switch size {
+                        case let .videoSize(_, type, w, h, size, videoStartTs):
+                            let resource: TelegramMediaResource
+                            resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, size: Int(size), fileReference: fileReference.makeData())
+                            
+                            videoRepresentations.append(TelegramMediaImage.VideoRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, startTimestamp: videoStartTs))
+                    }
+                }
+            }
+            
+            return TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.CloudImage, id: id), representations: representations, videoRepresentations: videoRepresentations, immediateThumbnailData: immediateThumbnailData, reference: .cloud(imageId: id, accessHash: accessHash, fileReference: fileReference.makeData()), partialReference: nil, flags: imageFlags)
+        case .photoEmpty:
+            return nil
+    }
+}
diff --git a/submodules/TelegramCore/Sources/TelegramMediaMap.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaMap.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramMediaMap.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaMap.swift
diff --git a/submodules/TelegramCore/Sources/TelegramMediaPoll.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaPoll.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/TelegramMediaPoll.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaPoll.swift
index 34c84ec378..2d45433129 100644
--- a/submodules/TelegramCore/Sources/TelegramMediaPoll.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaPoll.swift
@@ -36,7 +36,7 @@ extension TelegramMediaPollResults {
                 }
                 
                 self.init(voters: results.flatMap({ $0.map(TelegramMediaPollOptionVoters.init(apiVoters:)) }), totalVoters: totalVoters, recentVoters: recentVoters.flatMap { recentVoters in
-                    return recentVoters.map { PeerId(namespace: Namespaces.Peer.CloudUser, id: $0) }
+                    return recentVoters.map { PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value($0)) }
                     } ?? [], solution: parsedSolution)
         }
     }
diff --git a/submodules/TelegramCore/Sources/TelegramMediaWebDocument.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebDocument.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramMediaWebDocument.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebDocument.swift
diff --git a/submodules/TelegramCore/Sources/TelegramMediaWebFile.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebFile.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramMediaWebFile.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebFile.swift
diff --git a/submodules/TelegramCore/Sources/TelegramMediaWebpage.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebpage.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramMediaWebpage.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramMediaWebpage.swift
diff --git a/submodules/TelegramCore/Sources/TelegramPeerNotificationSettings.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramPeerNotificationSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramPeerNotificationSettings.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramPeerNotificationSettings.swift
diff --git a/submodules/TelegramCore/Sources/TelegramUser.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramUser.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/TelegramUser.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramUser.swift
index c4225bb235..83cbbca4f8 100644
--- a/submodules/TelegramCore/Sources/TelegramUser.swift
+++ b/submodules/TelegramCore/Sources/ApiUtils/TelegramUser.swift
@@ -7,21 +7,17 @@ import SyncCore
 func parsedTelegramProfilePhoto(_ photo: Api.UserProfilePhoto) -> [TelegramMediaImageRepresentation] {
     var representations: [TelegramMediaImageRepresentation] = []
     switch photo {
-        case let .userProfilePhoto(flags, _, photoSmall, photoBig, dcId):
+        case let .userProfilePhoto(flags, id, strippedThumb, dcId):
             let _ = (flags & (1 << 0)) != 0
             
             let smallResource: TelegramMediaResource
             let fullSizeResource: TelegramMediaResource
-            switch photoSmall {
-                case let .fileLocationToBeDeprecated(volumeId, localId):
-                    smallResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: .small, volumeId: volumeId, localId: localId)
-            }
-            switch photoBig {
-                case let .fileLocationToBeDeprecated(volumeId, localId):
-                    fullSizeResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: .fullSize, volumeId: volumeId, localId: localId)
-            }
-            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 80, height: 80), resource: smallResource, progressiveSizes: []))
-            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: fullSizeResource, progressiveSizes: []))
+
+            smallResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: id, sizeSpec: .small, volumeId: nil, localId: nil)
+            fullSizeResource = CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: id, sizeSpec: .fullSize, volumeId: nil, localId: nil)
+
+            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 80, height: 80), resource: smallResource, progressiveSizes: [], immediateThumbnailData: strippedThumb?.makeData()))
+            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: fullSizeResource, progressiveSizes: [], immediateThumbnailData: strippedThumb?.makeData()))
         case .userProfilePhotoEmpty:
             break
     }
@@ -74,9 +70,9 @@ extension TelegramUser {
             
             let restrictionInfo: PeerAccessRestrictionInfo? = restrictionReason.flatMap(PeerAccessRestrictionInfo.init(apiReasons:))
             
-            self.init(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: id), accessHash: accessHashValue, firstName: firstName, lastName: lastName, username: username, phone: phone, photo: representations, botInfo: botInfo, restrictionInfo: restrictionInfo, flags: userFlags)
+            self.init(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id)), accessHash: accessHashValue, firstName: firstName, lastName: lastName, username: username, phone: phone, photo: representations, botInfo: botInfo, restrictionInfo: restrictionInfo, flags: userFlags)
         case let .userEmpty(id):
-            self.init(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: id), accessHash: nil, firstName: nil, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+            self.init(id: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id)), accessHash: nil, firstName: nil, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
         }
     }
     
diff --git a/submodules/TelegramCore/Sources/TelegramUserPresence.swift b/submodules/TelegramCore/Sources/ApiUtils/TelegramUserPresence.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TelegramUserPresence.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TelegramUserPresence.swift
diff --git a/submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift b/submodules/TelegramCore/Sources/ApiUtils/TextEntitiesMessageAttribute.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/TextEntitiesMessageAttribute.swift
rename to submodules/TelegramCore/Sources/ApiUtils/TextEntitiesMessageAttribute.swift
diff --git a/submodules/TelegramCore/Sources/Theme.swift b/submodules/TelegramCore/Sources/ApiUtils/Theme.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/Theme.swift
rename to submodules/TelegramCore/Sources/ApiUtils/Theme.swift
diff --git a/submodules/TelegramCore/Sources/ApiUtils/Wallpaper.swift b/submodules/TelegramCore/Sources/ApiUtils/Wallpaper.swift
new file mode 100644
index 0000000000..d4fab6e8c0
--- /dev/null
+++ b/submodules/TelegramCore/Sources/ApiUtils/Wallpaper.swift
@@ -0,0 +1,113 @@
+import Foundation
+import Postbox
+import SwiftSignalKit
+import TelegramApi
+
+import SyncCore
+
+extension WallpaperSettings {
+    init(apiWallpaperSettings: Api.WallPaperSettings) {
+        switch apiWallpaperSettings {
+        case let .wallPaperSettings(flags, backgroundColor, secondBackgroundColor, thirdBackgroundColor, fourthBackgroundColor, intensity, rotation):
+            var colors: [UInt32] = []
+            if let backgroundColor = backgroundColor {
+                colors.append(UInt32(bitPattern: backgroundColor))
+            }
+            if let secondBackgroundColor = secondBackgroundColor {
+                colors.append(UInt32(bitPattern: secondBackgroundColor))
+            }
+            if let thirdBackgroundColor = thirdBackgroundColor {
+                colors.append(UInt32(bitPattern: thirdBackgroundColor))
+            }
+            if let fourthBackgroundColor = fourthBackgroundColor {
+                colors.append(UInt32(bitPattern: fourthBackgroundColor))
+            }
+            self = WallpaperSettings(blur: (flags & 1 << 1) != 0, motion: (flags & 1 << 2) != 0, colors: colors, intensity: intensity, rotation: rotation)
+        }
+    }
+}
+
+func apiWallpaperSettings(_ wallpaperSettings: WallpaperSettings) -> Api.WallPaperSettings {
+    var flags: Int32 = 0
+    var backgroundColor: Int32?
+    if wallpaperSettings.colors.count >= 1 {
+        flags |= (1 << 0)
+        backgroundColor = Int32(bitPattern: wallpaperSettings.colors[0])
+    }
+    if wallpaperSettings.blur {
+        flags |= (1 << 1)
+    }
+    if wallpaperSettings.motion {
+        flags |= (1 << 2)
+    }
+    if let _ = wallpaperSettings.intensity {
+        flags |= (1 << 3)
+    }
+    var secondBackgroundColor: Int32?
+    if wallpaperSettings.colors.count >= 2 {
+        flags |= (1 << 4)
+        secondBackgroundColor = Int32(bitPattern: wallpaperSettings.colors[1])
+    }
+    var thirdBackgroundColor: Int32?
+    if wallpaperSettings.colors.count >= 3 {
+        flags |= (1 << 5)
+        thirdBackgroundColor = Int32(bitPattern: wallpaperSettings.colors[2])
+    }
+    var fourthBackgroundColor: Int32?
+    if wallpaperSettings.colors.count >= 4 {
+        flags |= (1 << 6)
+        fourthBackgroundColor = Int32(bitPattern: wallpaperSettings.colors[3])
+    }
+    return .wallPaperSettings(flags: flags, backgroundColor: backgroundColor, secondBackgroundColor: secondBackgroundColor, thirdBackgroundColor: thirdBackgroundColor, fourthBackgroundColor: fourthBackgroundColor, intensity: wallpaperSettings.intensity, rotation: wallpaperSettings.rotation ?? 0)
+}
+
+extension TelegramWallpaper {
+    init(apiWallpaper: Api.WallPaper) {
+        switch apiWallpaper {
+            case let .wallPaper(id, flags, accessHash, slug, document, settings):
+                if let file = telegramMediaFileFromApiDocument(document) {
+                    let wallpaperSettings: WallpaperSettings
+                    if let settings = settings {
+                        wallpaperSettings = WallpaperSettings(apiWallpaperSettings: settings)
+                    } else {
+                        wallpaperSettings = WallpaperSettings()
+                    }
+                    self = .file(id: id, accessHash: accessHash, isCreator: (flags & 1 << 0) != 0, isDefault: (flags & 1 << 1) != 0, isPattern: (flags & 1 << 3) != 0, isDark: (flags & 1 << 4) != 0, slug: slug, file: file, settings: wallpaperSettings)
+                } else {
+                    //assertionFailure()
+                    self = .color(0xffffff)
+                }
+            case let .wallPaperNoFile(id, _, settings):
+                if let settings = settings, case let .wallPaperSettings(_, backgroundColor, secondBackgroundColor, thirdBackgroundColor, fourthBackgroundColor, _, rotation) = settings {
+                    let colors: [UInt32] = ([backgroundColor, secondBackgroundColor, thirdBackgroundColor, fourthBackgroundColor] as [Int32?]).compactMap({ color -> UInt32? in
+                        return color.flatMap(UInt32.init(bitPattern:))
+                    })
+                    if colors.count > 1 {
+                        self = .gradient(id, colors, WallpaperSettings(rotation: rotation))
+                    } else if colors.count == 1 {
+                        self = .color(UInt32(bitPattern: colors[0]))
+                    } else {
+                        self = .color(0xffffff)
+                    }
+                } else {
+                    self = .color(0xffffff)
+                }
+               
+        }
+    }
+    
+    var apiInputWallpaperAndSettings: (Api.InputWallPaper?, Api.WallPaperSettings)? {
+        switch self {
+        case .builtin:
+            return nil
+        case let .file(_, _, _, _, _, _, slug, _, settings):
+            return (.inputWallPaperSlug(slug: slug), apiWallpaperSettings(settings))
+        case let .color(color):
+            return (.inputWallPaperNoFile(id: 0), apiWallpaperSettings(WallpaperSettings(colors: [color])))
+        case let .gradient(id, colors, settings):
+            return (.inputWallPaperNoFile(id: id ?? 0), apiWallpaperSettings(WallpaperSettings(colors: colors, rotation: settings.rotation)))
+        default:
+            return nil
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/Authorization.swift b/submodules/TelegramCore/Sources/Authorization.swift
index ed6ba8e60a..ce58de6028 100644
--- a/submodules/TelegramCore/Sources/Authorization.swift
+++ b/submodules/TelegramCore/Sources/Authorization.swift
@@ -31,6 +31,44 @@ func switchToAuthorizedAccount(transaction: AccountManagerModifier, account: Una
     transaction.removeAuth()
 }
 
+private struct Regex {
+    let pattern: String
+    let options: NSRegularExpression.Options!
+
+    private var matcher: NSRegularExpression {
+        return try! NSRegularExpression(pattern: self.pattern, options: self.options)
+    }
+
+    init(_ pattern: String) {
+        self.pattern = pattern
+        self.options = []
+    }
+
+    func match(_ string: String, options: NSRegularExpression.MatchingOptions = []) -> Bool {
+        return self.matcher.numberOfMatches(in: string, options: options, range: NSMakeRange(0, string.utf16.count)) != 0
+    }
+}
+
+private protocol RegularExpressionMatchable {
+    func match(_ regex: Regex) -> Bool
+}
+
+private struct MatchString: RegularExpressionMatchable {
+    private let string: String
+
+    init(_ string: String) {
+        self.string = string
+    }
+
+    func match(_ regex: Regex) -> Bool {
+        return regex.match(self.string)
+    }
+}
+
+private func ~=<T: RegularExpressionMatchable>(pattern: Regex, matchable: T) -> Bool {
+    return matchable.match(pattern)
+}
+
 public func sendAuthorizationCode(accountManager: AccountManager, account: UnauthorizedAccount, phoneNumber: String, apiId: Int32, apiHash: String, syncContacts: Bool) -> Signal<UnauthorizedAccount, AuthorizationCodeRequestError> {
     let sendCode = Api.functions.auth.sendCode(phoneNumber: phoneNumber, apiId: apiId, apiHash: apiHash, settings: .codeSettings(flags: 0))
     
@@ -39,7 +77,7 @@ public func sendAuthorizationCode(accountManager: AccountManager, account: Unaut
         return (result, account)
     }
     |> `catch` { error -> Signal<(Api.auth.SentCode, UnauthorizedAccount), MTRpcError> in
-        switch (error.errorDescription ?? "") {
+        switch MatchString(error.errorDescription ?? "") {
             case Regex("(PHONE_|USER_|NETWORK_)MIGRATE_(\\d+)"):
                 let range = error.errorDescription.range(of: "MIGRATE_")!
                 let updatedMasterDatacenterId = Int32(error.errorDescription[range.upperBound ..< error.errorDescription.endIndex])!
@@ -85,7 +123,6 @@ public func sendAuthorizationCode(accountManager: AccountManager, account: Unaut
             return account
         }
         |> mapError { _ -> AuthorizationCodeRequestError in
-            return .generic(info: nil)
         }
     }
 }
@@ -123,7 +160,7 @@ public func resendAuthorizationCode(account: UnauthorizedAccount) -> Signal<Void
                                                 transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .confirmationCodeEntry(number: number, type: SentAuthorizationCodeType(apiType: type), hash: phoneCodeHash, timeout: timeout, nextType: parsedNextType, syncContacts: syncContacts)))
                                         
                                     }
-                                    } |> mapError { _ -> AuthorizationCodeRequestError in return .generic(info: nil) }
+                                    } |> mapError { _ -> AuthorizationCodeRequestError in }
                             }
                     } else {
                         return .fail(.generic(info: nil))
@@ -136,7 +173,6 @@ public func resendAuthorizationCode(account: UnauthorizedAccount) -> Signal<Void
         }
     }
     |> mapError { _ -> AuthorizationCodeRequestError in
-        return .generic(info: nil)
     }
     |> switchToLatest
 }
@@ -233,7 +269,6 @@ public func authorizeWithCode(accountManager: AccountManager, account: Unauthori
                         }
                         |> switchToLatest
                         |> mapError { _ -> AuthorizationCodeVerificationError in
-                                return .generic
                         }
                     }
                 default:
@@ -244,7 +279,6 @@ public func authorizeWithCode(accountManager: AccountManager, account: Unauthori
         }
     }
     |> mapError { _ -> AuthorizationCodeVerificationError in
-        return .generic
     }
     |> switchToLatest
 }
@@ -294,7 +328,6 @@ public func authorizeWithPassword(accountManager: AccountManager, account: Unaut
         }
         |> switchToLatest
         |> mapError { _ -> AuthorizationPasswordVerificationError in
-            return .generic
         }
     }
 }
@@ -309,38 +342,15 @@ public enum PasswordRecoveryOption {
     case email(pattern: String)
 }
 
-public func requestPasswordRecovery(account: UnauthorizedAccount) -> Signal<PasswordRecoveryOption, PasswordRecoveryRequestError> {
-    return account.network.request(Api.functions.auth.requestPasswordRecovery())
-        |> map(Optional.init)
-        |> `catch` { error -> Signal<Api.auth.PasswordRecovery?, PasswordRecoveryRequestError> in
-            if error.errorDescription.hasPrefix("FLOOD_WAIT") {
-                return .fail(.limitExceeded)
-            } else if error.errorDescription.hasPrefix("PASSWORD_RECOVERY_NA") {
-                return .single(nil)
-            } else {
-                return .fail(.generic)
-            }
-        }
-        |> map { result -> PasswordRecoveryOption in
-            if let result = result {
-                switch result {
-                    case let .passwordRecovery(emailPattern):
-                        return .email(pattern: emailPattern)
-                }
-            } else {
-                return .none
-            }
-        }
-}
-
 public enum PasswordRecoveryError {
     case invalidCode
     case limitExceeded
     case expired
+    case generic
 }
 
-public func performPasswordRecovery(accountManager: AccountManager, account: UnauthorizedAccount, code: String, syncContacts: Bool) -> Signal<Void, PasswordRecoveryError> {
-    return account.network.request(Api.functions.auth.recoverPassword(code: code))
+func _internal_checkPasswordRecoveryCode(network: Network, code: String) -> Signal<Never, PasswordRecoveryError> {
+    return network.request(Api.functions.auth.checkRecoveryPassword(code: code), automaticFloodWait: false)
     |> mapError { error -> PasswordRecoveryError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
             return .limitExceeded
@@ -350,26 +360,79 @@ public func performPasswordRecovery(accountManager: AccountManager, account: Una
             return .invalidCode
         }
     }
-    |> mapToSignal { result -> Signal<Void, PasswordRecoveryError> in
-        return account.postbox.transaction { transaction -> Signal<Void, NoError> in
-            switch result {
-            case let .authorization(_, _, user):
-                let user = TelegramUser(user: user)
-                let state = AuthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, peerId: user.id, state: nil)
-                /*transaction.updatePeersInternal([user], update: { current, peer -> Peer? in
-                 return peer
-                 })*/
-                initializedAppSettingsAfterLogin(transaction: transaction, appVersion: account.networkArguments.appVersion, syncContacts: syncContacts)
-                transaction.setState(state)
-                return accountManager.transaction { transaction -> Void in
-                    switchToAuthorizedAccount(transaction: transaction, account: account)
-                }
-            case .authorizationSignUpRequired:
-                return .complete()
+    |> mapToSignal { result -> Signal<Never, PasswordRecoveryError> in
+        return .complete()
+    }
+}
+
+public final class RecoveredAccountData {
+    let authorization: Api.auth.Authorization
+
+    init(authorization: Api.auth.Authorization) {
+        self.authorization = authorization
+    }
+}
+
+public func loginWithRecoveredAccountData(accountManager: AccountManager, account: UnauthorizedAccount, recoveredAccountData: RecoveredAccountData, syncContacts: Bool) -> Signal<Never, NoError> {
+    return account.postbox.transaction { transaction -> Signal<Void, NoError> in
+        switch recoveredAccountData.authorization {
+        case let .authorization(_, _, user):
+            let user = TelegramUser(user: user)
+            let state = AuthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, peerId: user.id, state: nil)
+
+            initializedAppSettingsAfterLogin(transaction: transaction, appVersion: account.networkArguments.appVersion, syncContacts: syncContacts)
+            transaction.setState(state)
+            return accountManager.transaction { transaction -> Void in
+                switchToAuthorizedAccount(transaction: transaction, account: account)
+            }
+        case .authorizationSignUpRequired:
+            return .complete()
+        }
+    }
+    |> switchToLatest
+    |> ignoreValues
+}
+
+func _internal_performPasswordRecovery(network: Network, code: String, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<RecoveredAccountData, PasswordRecoveryError> {
+    return _internal_twoStepAuthData(network)
+    |> mapError { _ -> PasswordRecoveryError in
+        return .generic
+    }
+    |> mapToSignal { authData -> Signal<RecoveredAccountData, PasswordRecoveryError> in
+        let newSettings: Api.account.PasswordInputSettings?
+        switch updatedPassword {
+        case .none:
+            newSettings = nil
+        case let .password(password, hint, email):
+            var flags: Int32 = 1 << 0
+            if email != nil {
+                flags |= (1 << 1)
+            }
+
+            guard let (updatedPasswordHash, updatedPasswordDerivation) = passwordUpdateKDF(encryptionProvider: network.encryptionProvider, password: password, derivation: authData.nextPasswordDerivation) else {
+                return .fail(.invalidCode)
+            }
+
+            newSettings = Api.account.PasswordInputSettings.passwordInputSettings(flags: flags, newAlgo: updatedPasswordDerivation.apiAlgo, newPasswordHash: Buffer(data: updatedPasswordHash), hint: hint, email: email, newSecureSettings: nil)
+        }
+
+        var flags: Int32 = 0
+        if newSettings != nil {
+            flags |= 1 << 0
+        }
+        return network.request(Api.functions.auth.recoverPassword(flags: flags, code: code, newSettings: newSettings), automaticFloodWait: false)
+        |> mapError { error -> PasswordRecoveryError in
+            if error.errorDescription.hasPrefix("FLOOD_WAIT") {
+                return .limitExceeded
+            } else if error.errorDescription.hasPrefix("PASSWORD_RECOVERY_EXPIRED") {
+                return .expired
+            } else {
+                return .invalidCode
             }
         }
-        |> switchToLatest
-        |> mapError { _ in return PasswordRecoveryError.expired }
+        |> mapToSignal { result -> Signal<RecoveredAccountData, PasswordRecoveryError> in
+            return .single(RecoveredAccountData(authorization: result))
+        }
     }
 }
 
@@ -418,7 +481,7 @@ public func performAccountReset(account: UnauthorizedAccount) -> Signal<Void, Ac
                 }
             }
         }
-        |> mapError { _ in return AccountResetError.generic }
+        |> mapError { _ -> AccountResetError in }
     }
 }
 
@@ -467,10 +530,10 @@ public func signUpWithName(accountManager: AccountManager, account: Unauthorized
                         |> castError(SignUpError.self)
                     
                     if let avatarData = avatarData {
-                        let resource = LocalFileMediaResource(fileId: arc4random64())
+                        let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                         account.postbox.mediaBox.storeResourceData(resource.id, data: avatarData)
                         
-                        return updatePeerPhotoInternal(postbox: account.postbox, network: account.network, stateManager: nil, accountPeerId: user.id, peer: .single(user), photo: uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: resource), video: avatarVideo, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { _, _ in .single([:]) })
+                        return _internal_updatePeerPhotoInternal(postbox: account.postbox, network: account.network, stateManager: nil, accountPeerId: user.id, peer: .single(user), photo: _internal_uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: resource), video: avatarVideo, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { _, _ in .single([:]) })
                             |> `catch` { _ -> Signal<UpdatePeerPhotoStatus, SignUpError> in
                                 return .complete()
                             }
@@ -497,7 +560,6 @@ public func signUpWithName(accountManager: AccountManager, account: Unauthorized
         }
     }
     |> mapError { _ -> SignUpError in
-        return .generic
     }
     |> switchToLatest
 }
diff --git a/submodules/TelegramCore/Sources/BotPaymentForm.swift b/submodules/TelegramCore/Sources/BotPaymentForm.swift
deleted file mode 100644
index cdb8a9ce8a..0000000000
--- a/submodules/TelegramCore/Sources/BotPaymentForm.swift
+++ /dev/null
@@ -1,393 +0,0 @@
-import Foundation
-import Postbox
-import MtProtoKit
-import SwiftSignalKit
-import TelegramApi
-
-import SyncCore
-
-public struct BotPaymentInvoiceFields: OptionSet {
-    public var rawValue: Int32
-    
-    public init(rawValue: Int32) {
-        self.rawValue = rawValue
-    }
-    
-    public init() {
-        self.rawValue = 0
-    }
-    
-    public static let name = BotPaymentInvoiceFields(rawValue: 1 << 0)
-    public static let phone = BotPaymentInvoiceFields(rawValue: 1 << 1)
-    public static let email = BotPaymentInvoiceFields(rawValue: 1 << 2)
-    public static let shippingAddress = BotPaymentInvoiceFields(rawValue: 1 << 3)
-    public static let flexibleShipping = BotPaymentInvoiceFields(rawValue: 1 << 4)
-}
-
-public struct BotPaymentPrice : Equatable {
-    public let label: String
-    public let amount: Int64
-    
-    public init(label: String, amount: Int64) {
-        self.label = label
-        self.amount = amount
-    }
-}
-
-public struct BotPaymentInvoice : Equatable {
-    public let isTest: Bool
-    public let requestedFields: BotPaymentInvoiceFields
-    public let currency: String
-    public let prices: [BotPaymentPrice]
-}
-
-public struct BotPaymentNativeProvider : Equatable {
-    public let name: String
-    public let params: String
-}
-
-public struct BotPaymentShippingAddress: Equatable {
-    public let streetLine1: String
-    public let streetLine2: String
-    public let city: String
-    public let state: String
-    public let countryIso2: String
-    public let postCode: String
-    
-    public init(streetLine1: String, streetLine2: String, city: String, state: String, countryIso2: String, postCode: String) {
-        self.streetLine1 = streetLine1
-        self.streetLine2 = streetLine2
-        self.city = city
-        self.state = state
-        self.countryIso2 = countryIso2
-        self.postCode = postCode
-    }
-}
-
-public struct BotPaymentRequestedInfo: Equatable {
-    public let name: String?
-    public let phone: String?
-    public let email: String?
-    public let shippingAddress: BotPaymentShippingAddress?
-    
-    public init(name: String?, phone: String?, email: String?, shippingAddress: BotPaymentShippingAddress?) {
-        self.name = name
-        self.phone = phone
-        self.email = email
-        self.shippingAddress = shippingAddress
-    }
-}
-
-public enum BotPaymentSavedCredentials: Equatable {
-    case card(id: String, title: String)
-    
-    public static func ==(lhs: BotPaymentSavedCredentials, rhs: BotPaymentSavedCredentials) -> Bool {
-        switch lhs {
-            case let .card(id, title):
-                if case .card(id, title) = rhs {
-                    return true
-                } else {
-                    return false
-                }
-        }
-    }
-}
-
-public struct BotPaymentForm : Equatable {
-    public let canSaveCredentials: Bool
-    public let passwordMissing: Bool
-    public let invoice: BotPaymentInvoice
-    public let providerId: PeerId
-    public let url: String
-    public let nativeProvider: BotPaymentNativeProvider?
-    public let savedInfo: BotPaymentRequestedInfo?
-    public let savedCredentials: BotPaymentSavedCredentials?
-}
-
-public enum BotPaymentFormRequestError {
-    case generic
-}
-
-extension BotPaymentInvoice {
-    init(apiInvoice: Api.Invoice) {
-        switch apiInvoice {
-            case let .invoice(flags, currency, prices):
-                var fields = BotPaymentInvoiceFields()
-                if (flags & (1 << 1)) != 0 {
-                    fields.insert(.name)
-                }
-                if (flags & (1 << 2)) != 0 {
-                    fields.insert(.phone)
-                }
-                if (flags & (1 << 3)) != 0 {
-                    fields.insert(.email)
-                }
-                if (flags & (1 << 4)) != 0 {
-                    fields.insert(.shippingAddress)
-                }
-                if (flags & (1 << 5)) != 0 {
-                    fields.insert(.flexibleShipping)
-                }
-                self.init(isTest: (flags & (1 << 0)) != 0, requestedFields: fields, currency: currency, prices: prices.map {
-                    switch $0 {
-                        case let .labeledPrice(label, amount):
-                            return BotPaymentPrice(label: label, amount: amount)
-                    }
-                })
-        }
-    }
-}
-
-extension BotPaymentRequestedInfo {
-    init(apiInfo: Api.PaymentRequestedInfo) {
-        switch apiInfo {
-            case let .paymentRequestedInfo(_, name, phone, email, shippingAddress):
-                var parsedShippingAddress: BotPaymentShippingAddress?
-                if let shippingAddress = shippingAddress {
-                    switch shippingAddress {
-                    case let .postAddress(streetLine1, streetLine2, city, state, countryIso2, postCode):
-                        parsedShippingAddress = BotPaymentShippingAddress(streetLine1: streetLine1, streetLine2: streetLine2, city: city, state: state, countryIso2: countryIso2, postCode: postCode)
-                    }
-                }
-                self.init(name: name, phone: phone, email: email, shippingAddress: parsedShippingAddress)
-        }
-    }
-}
-
-public func fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: MessageId) -> Signal<BotPaymentForm, BotPaymentFormRequestError> {
-    return network.request(Api.functions.payments.getPaymentForm(msgId: messageId.id))
-        |> `catch` { _ -> Signal<Api.payments.PaymentForm, BotPaymentFormRequestError> in
-            return .fail(.generic)
-        }
-        |> mapToSignal { result -> Signal<BotPaymentForm, BotPaymentFormRequestError> in
-            return postbox.transaction { transaction -> BotPaymentForm in
-                switch result {
-                    case let .paymentForm(flags, _, invoice, providerId, url, nativeProvider, nativeParams, savedInfo, savedCredentials, apiUsers):
-                        var peers: [Peer] = []
-                        for user in apiUsers {
-                            let parsed = TelegramUser(user: user)
-                            peers.append(parsed)
-                        }
-                        updatePeers(transaction: transaction, peers: peers, update: { _, updated in
-                            return updated
-                        })
-                        
-                        let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice)
-                        var parsedNativeProvider: BotPaymentNativeProvider?
-                        if let nativeProvider = nativeProvider, let nativeParams = nativeParams {
-                            switch nativeParams {
-                                case let .dataJSON(data):
-                                parsedNativeProvider = BotPaymentNativeProvider(name: nativeProvider, params: data)
-                            }
-                        }
-                        let parsedSavedInfo = savedInfo.flatMap(BotPaymentRequestedInfo.init)
-                        var parsedSavedCredentials: BotPaymentSavedCredentials?
-                        if let savedCredentials = savedCredentials {
-                            switch savedCredentials {
-                                case let .paymentSavedCredentialsCard(id, title):
-                                    parsedSavedCredentials = .card(id: id, title: title)
-                            }
-                        }
-                        return BotPaymentForm(canSaveCredentials: (flags & (1 << 2)) != 0, passwordMissing: (flags & (1 << 3)) != 0, invoice: parsedInvoice, providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: providerId), url: url, nativeProvider: parsedNativeProvider, savedInfo: parsedSavedInfo, savedCredentials: parsedSavedCredentials)
-                }
-            } |> mapError { _ -> BotPaymentFormRequestError in return .generic }
-        }
-}
-
-public enum ValidateBotPaymentFormError {
-    case generic
-    case shippingNotAvailable
-    case addressStateInvalid
-    case addressPostcodeInvalid
-    case addressCityInvalid
-    case nameInvalid
-    case emailInvalid
-    case phoneInvalid
-}
-
-public struct BotPaymentShippingOption : Equatable {
-    public let id: String
-    public let title: String
-    public let prices: [BotPaymentPrice]
-}
-
-public struct BotPaymentValidatedFormInfo : Equatable {
-    public let id: String?
-    public let shippingOptions: [BotPaymentShippingOption]?
-}
-
-extension BotPaymentShippingOption {
-    init(apiOption: Api.ShippingOption) {
-        switch apiOption {
-            case let .shippingOption(id, title, prices):
-                self.init(id: id, title: title, prices: prices.map {
-                    switch $0 {
-                        case let .labeledPrice(label, amount):
-                            return BotPaymentPrice(label: label, amount: amount)
-                        }
-                })
-        }
-    }
-}
-
-public func validateBotPaymentForm(network: Network, saveInfo: Bool, messageId: MessageId, formInfo: BotPaymentRequestedInfo) -> Signal<BotPaymentValidatedFormInfo, ValidateBotPaymentFormError>  {
-    var flags: Int32 = 0
-    if saveInfo {
-        flags |= (1 << 0)
-    }
-    var infoFlags: Int32 = 0
-    if let _ = formInfo.name {
-        infoFlags |= (1 << 0)
-    }
-    if let _ = formInfo.phone {
-        infoFlags |= (1 << 1)
-    }
-    if let _ = formInfo.email {
-        infoFlags |= (1 << 2)
-    }
-    var apiShippingAddress: Api.PostAddress?
-    if let address = formInfo.shippingAddress {
-        infoFlags |= (1 << 3)
-        apiShippingAddress = .postAddress(streetLine1: address.streetLine1, streetLine2: address.streetLine2, city: address.city, state: address.state, countryIso2: address.countryIso2, postCode: address.postCode)
-    }
-    return network.request(Api.functions.payments.validateRequestedInfo(flags: flags, msgId: messageId.id, info: .paymentRequestedInfo(flags: infoFlags, name: formInfo.name, phone: formInfo.phone, email: formInfo.email, shippingAddress: apiShippingAddress)))
-        |> mapError { error -> ValidateBotPaymentFormError in
-            if error.errorDescription == "SHIPPING_NOT_AVAILABLE" {
-                return .shippingNotAvailable
-            } else if error.errorDescription == "ADDRESS_STATE_INVALID" {
-                return .addressStateInvalid
-            } else if error.errorDescription == "ADDRESS_POSTCODE_INVALID" {
-                return .addressPostcodeInvalid
-            } else if error.errorDescription == "ADDRESS_CITY_INVALID" {
-                return .addressCityInvalid
-            } else if error.errorDescription == "REQ_INFO_NAME_INVALID" {
-                return .nameInvalid
-            } else if error.errorDescription == "REQ_INFO_EMAIL_INVALID" {
-                return .emailInvalid
-            } else if error.errorDescription == "REQ_INFO_PHONE_INVALID" {
-                return .phoneInvalid
-            } else {
-                return .generic
-            }
-        }
-        |> map { result -> BotPaymentValidatedFormInfo in
-            switch result {
-                case let .validatedRequestedInfo(_, id, shippingOptions):
-                    return BotPaymentValidatedFormInfo(id: id, shippingOptions: shippingOptions.flatMap {
-                        return $0.map(BotPaymentShippingOption.init)
-                    })
-            }
-        }
-}
-
-public enum BotPaymentCredentials {
-    case generic(data: String, saveOnServer: Bool)
-    case saved(id: String, tempPassword: Data)
-    case applePay(data: String)
-}
-
-public enum SendBotPaymentFormError {
-    case generic
-    case precheckoutFailed
-    case paymentFailed
-    case alreadyPaid
-}
-
-public enum SendBotPaymentResult {
-    case done
-    case externalVerificationRequired(url: String)
-}
-
-public func sendBotPaymentForm(account: Account, messageId: MessageId, validatedInfoId: String?, shippingOptionId: String?, credentials: BotPaymentCredentials) -> Signal<SendBotPaymentResult, SendBotPaymentFormError> {
-    let apiCredentials: Api.InputPaymentCredentials
-    switch credentials {
-        case let .generic(data, saveOnServer):
-            var credentialsFlags: Int32 = 0
-            if saveOnServer {
-                credentialsFlags |= (1 << 0)
-            }
-            apiCredentials = .inputPaymentCredentials(flags: credentialsFlags, data: .dataJSON(data: data))
-        case let .saved(id, tempPassword):
-            apiCredentials = .inputPaymentCredentialsSaved(id: id, tmpPassword: Buffer(data: tempPassword))
-        case let .applePay(data):
-            apiCredentials = .inputPaymentCredentialsApplePay(paymentData: .dataJSON(data: data))
-    }
-    var flags: Int32 = 0
-    if validatedInfoId != nil {
-        flags |= (1 << 0)
-    }
-    if shippingOptionId != nil {
-        flags |= (1 << 1)
-    }
-    return account.network.request(Api.functions.payments.sendPaymentForm(flags: flags, msgId: messageId.id, requestedInfoId: validatedInfoId, shippingOptionId: shippingOptionId, credentials: apiCredentials))
-    |> map { result -> SendBotPaymentResult in
-        switch result {
-            case let .paymentResult(updates):
-                account.stateManager.addUpdates(updates)
-                return .done
-            case let .paymentVerificationNeeded(url):
-                return .externalVerificationRequired(url: url)
-        }
-    }
-    |> `catch` { error -> Signal<SendBotPaymentResult, SendBotPaymentFormError> in
-        if error.errorDescription == "BOT_PRECHECKOUT_FAILED" {
-            return .fail(.precheckoutFailed)
-        } else if error.errorDescription == "PAYMENT_FAILED" {
-            return .fail(.paymentFailed)
-        } else if error.errorDescription == "INVOICE_ALREADY_PAID" {
-            return .fail(.alreadyPaid)
-        }
-        return .fail(.generic)
-    }
-}
-
-public struct BotPaymentReceipt : Equatable {
-    public let invoice: BotPaymentInvoice
-    public let info: BotPaymentRequestedInfo?
-    public let shippingOption: BotPaymentShippingOption?
-    public let credentialsTitle: String
-}
-
-public func requestBotPaymentReceipt(network: Network, messageId: MessageId) -> Signal<BotPaymentReceipt, NoError> {
-    return network.request(Api.functions.payments.getPaymentReceipt(msgId: messageId.id))
-    |> retryRequest
-    |> map { result -> BotPaymentReceipt in
-        switch result {
-            case let .paymentReceipt(_, _, _, invoice, _, info, shipping, _, _, credentialsTitle, _):
-                let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice)
-                let parsedInfo = info.flatMap(BotPaymentRequestedInfo.init)
-                let shippingOption = shipping.flatMap(BotPaymentShippingOption.init)
-                return BotPaymentReceipt(invoice: parsedInvoice, info: parsedInfo, shippingOption: shippingOption, credentialsTitle: credentialsTitle)
-        }
-    }
-}
-
-public struct BotPaymentInfo: OptionSet {
-    public var rawValue: Int32
-    
-    public init(rawValue: Int32) {
-        self.rawValue = rawValue
-    }
-    
-    public init() {
-        self.rawValue = 0
-    }
-    
-    public static let paymentInfo = BotPaymentInfo(rawValue: 1 << 0)
-    public static let shippingInfo = BotPaymentInfo(rawValue: 1 << 1)
-}
-
-public func clearBotPaymentInfo(network: Network, info: BotPaymentInfo) -> Signal<Void, NoError> {
-    var flags: Int32 = 0
-    if info.contains(.paymentInfo) {
-        flags |= (1 << 0)
-    }
-    if info.contains(.shippingInfo) {
-        flags |= (1 << 1)
-    }
-    return network.request(Api.functions.payments.clearSavedInfo(flags: flags))
-    |> retryRequest
-    |> mapToSignal { _ -> Signal<Void, NoError> in
-        return .complete()
-    }
-}
diff --git a/submodules/TelegramCore/Sources/ChannelAdmins.swift b/submodules/TelegramCore/Sources/ChannelAdmins.swift
deleted file mode 100644
index 8c6f54c8de..0000000000
--- a/submodules/TelegramCore/Sources/ChannelAdmins.swift
+++ /dev/null
@@ -1,82 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-import MtProtoKit
-
-import SyncCore
-
-public func channelAdmins(account: Account, peerId: PeerId) -> Signal<[RenderedChannelParticipant], NoError> {
-    return account.postbox.transaction { transaction -> Signal<[RenderedChannelParticipant], NoError> in
-        if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer) {
-            return account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: .channelParticipantsAdmins, offset: 0, limit: 100, hash: 0))
-                |> retryRequest
-                |> mapToSignal { result -> Signal<[RenderedChannelParticipant], NoError> in
-                    switch result {
-                        case let .channelParticipants(count, participants, users):
-                            var items: [RenderedChannelParticipant] = []
-                            
-                            var peers: [PeerId: Peer] = [:]
-                            var presences:[PeerId: PeerPresence] = [:]
-                            for user in users {
-                                let peer = TelegramUser(user: user)
-                                peers[peer.id] = peer
-                                if let presence = TelegramUserPresence(apiUser: user) {
-                                    presences[peer.id] = presence
-                                }
-                            }
-                            
-                            for participant in CachedChannelParticipants(apiParticipants: participants).participants {
-                                if let peer = peers[participant.peerId] {
-                                    items.append(RenderedChannelParticipant(participant: participant, peer: peer, peers: peers, presences: presences))
-                                }
-                            }
-                        
-                            return account.postbox.transaction { transaction -> [RenderedChannelParticipant] in
-                                transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
-                                    if let cachedData = cachedData as? CachedChannelData {
-                                        return cachedData.withUpdatedParticipantsSummary(cachedData.participantsSummary.withUpdatedAdminCount(count))
-                                    } else {
-                                        return cachedData
-                                    }
-                                })
-                                return items
-                            }
-                        case .channelParticipantsNotModified:
-                            return .single([])
-                    }
-                }
-        } else {
-            return .single([])
-        }
-    } |> switchToLatest
-}
-
-public func channelAdminIds(postbox: Postbox, network: Network, peerId: PeerId, hash: Int32) -> Signal<[PeerId], NoError> {
-    return postbox.transaction { transaction in
-        if let peer = transaction.getPeer(peerId) as? TelegramChannel, case .group = peer.info, let apiChannel = apiInputChannel(peer) {
-            let api = Api.functions.channels.getParticipants(channel: apiChannel, filter: .channelParticipantsAdmins, offset: 0, limit: 100, hash: hash)
-            return network.request(api) |> retryRequest |> mapToSignal { result in
-                switch result {
-                case let .channelParticipants(_, participants, users):
-                    let users = users.filter({ user in
-                        return participants.contains(where: { participant in
-                            switch participant {
-                            case let .channelParticipantAdmin(_, userId, _, _, _, _, _):
-                                return user.peerId.id == userId
-                            case let .channelParticipantCreator(_, userId, _, _):
-                                return user.peerId.id == userId
-                            default:
-                                return false
-                            }
-                        })
-                    })
-                    return .single(users.map({TelegramUser(user: $0).id}))
-                    default:
-                        return .complete()
-                }
-            }
-        }
-        return .complete()
-    } |> switchToLatest
-}
diff --git a/submodules/TelegramCore/Sources/ChannelParticipants.swift b/submodules/TelegramCore/Sources/ChannelParticipants.swift
deleted file mode 100644
index e3fb732676..0000000000
--- a/submodules/TelegramCore/Sources/ChannelParticipants.swift
+++ /dev/null
@@ -1,84 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-import MtProtoKit
-
-import SyncCore
-
-public struct RenderedChannelParticipant: Equatable {
-    public let participant: ChannelParticipant
-    public let peer: Peer
-    public let peers: [PeerId: Peer]
-    public let presences: [PeerId: PeerPresence]
-    
-    public init(participant: ChannelParticipant, peer: Peer, peers: [PeerId: Peer] = [:], presences: [PeerId: PeerPresence] = [:]) {
-        self.participant = participant
-        self.peer = peer
-        self.peers = peers
-        self.presences = presences
-    }
-    
-    public static func ==(lhs: RenderedChannelParticipant, rhs: RenderedChannelParticipant) -> Bool {
-        return lhs.participant == rhs.participant && lhs.peer.isEqual(rhs.peer)
-    }
-}
-
-func updateChannelParticipantsSummary(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
-    return account.postbox.transaction { transaction -> Signal<Void, NoError> in
-        if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer) {
-            let admins = account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: .channelParticipantsAdmins, offset: 0, limit: 0, hash: 0))
-            let members = account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: .channelParticipantsRecent, offset: 0, limit: 0, hash: 0))
-            let banned = account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: .channelParticipantsBanned(q: ""), offset: 0, limit: 0, hash: 0))
-            let kicked = account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: .channelParticipantsKicked(q: ""), offset: 0, limit: 0, hash: 0))
-            return combineLatest(admins, members, banned, kicked)
-            |> mapToSignal { admins, members, banned, kicked -> Signal<Void, MTRpcError> in
-                return account.postbox.transaction { transaction -> Void in
-                    transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
-                        if let current = current as? CachedChannelData {
-                            let adminCount: Int32
-                            switch admins {
-                                case let .channelParticipants(count, _, _):
-                                    adminCount = count
-                                case .channelParticipantsNotModified:
-                                    assertionFailure()
-                                    adminCount = 0
-                            }
-                            let memberCount: Int32
-                            switch members {
-                                case let .channelParticipants(count, _, _):
-                                    memberCount = count
-                                case .channelParticipantsNotModified:
-                                    assertionFailure()
-                                    memberCount = 0
-                            }
-                            let bannedCount: Int32
-                            switch banned {
-                                case let .channelParticipants(count, _, _):
-                                    bannedCount = count
-                                case .channelParticipantsNotModified:
-                                    assertionFailure()
-                                    bannedCount = 0
-                            }
-                            let kickedCount: Int32
-                            switch kicked {
-                                case let .channelParticipants(count, _, _):
-                                    kickedCount = count
-                                case .channelParticipantsNotModified:
-                                    assertionFailure()
-                                    kickedCount = 0
-                            }
-                            return current.withUpdatedParticipantsSummary(CachedChannelParticipantsSummary(memberCount: memberCount, adminCount: adminCount, bannedCount: bannedCount, kickedCount: kickedCount))
-                        }
-                        return current
-                    })
-                } |> mapError { _ -> MTRpcError in return MTRpcError(errorCode: 0, errorDescription: "") }
-                }
-                |> `catch` { _ -> Signal<Void, NoError> in
-                    return .complete()
-                }
-        } else {
-            return .complete()
-        }
-    } |> switchToLatest
-}
diff --git a/submodules/TelegramCore/Sources/ChatHistoryImport.swift b/submodules/TelegramCore/Sources/ChatHistoryImport.swift
deleted file mode 100644
index d1e5811512..0000000000
--- a/submodules/TelegramCore/Sources/ChatHistoryImport.swift
+++ /dev/null
@@ -1,244 +0,0 @@
-import Foundation
-import SwiftSignalKit
-import Postbox
-import SyncCore
-import TelegramApi
-
-public enum ChatHistoryImport {
-    public struct Session {
-        fileprivate var peerId: PeerId
-        fileprivate var inputPeer: Api.InputPeer
-        fileprivate var id: Int64
-    }
-    
-    public enum InitImportError {
-        case generic
-        case chatAdminRequired
-        case invalidChatType
-        case userBlocked
-        case limitExceeded
-    }
-    
-    public enum ParsedInfo {
-        case privateChat(title: String?)
-        case group(title: String?)
-        case unknown(title: String?)
-    }
-    
-    public enum GetInfoError {
-        case generic
-        case parseError
-    }
-    
-    public static func getInfo(account: Account, header: String) -> Signal<ParsedInfo, GetInfoError> {
-        return account.network.request(Api.functions.messages.checkHistoryImport(importHead: header))
-        |> mapError { _ -> GetInfoError in
-            return .generic
-        }
-        |> mapToSignal { result -> Signal<ParsedInfo, GetInfoError> in
-            switch result {
-            case let .historyImportParsed(flags, title):
-                if (flags & (1 << 0)) != 0 {
-                    return .single(.privateChat(title: title))
-                } else if (flags & (1 << 1)) != 0 {
-                    return .single(.group(title: title))
-                } else {
-                    return .single(.unknown(title: title))
-                }
-            }
-        }
-    }
-    
-    public static func initSession(account: Account, peerId: PeerId, file: TempBoxFile, mediaCount: Int32) -> Signal<Session, InitImportError> {
-        return multipartUpload(network: account.network, postbox: account.postbox, source: .tempFile(file), encrypt: false, tag: nil, hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: true, useLargerParts: true, increaseParallelParts: true, useMultiplexedRequests: false, useCompression: true)
-        |> mapError { _ -> InitImportError in
-            return .generic
-        }
-        |> mapToSignal { result -> Signal<Session, InitImportError> in
-            switch result {
-            case let .inputFile(inputFile):
-                return account.postbox.transaction { transaction -> Api.InputPeer? in
-                    return transaction.getPeer(peerId).flatMap(apiInputPeer)
-                }
-                |> castError(InitImportError.self)
-                |> mapToSignal { inputPeer -> Signal<Session, InitImportError> in
-                    guard let inputPeer = inputPeer else {
-                        return .fail(.generic)
-                    }
-                    return account.network.request(Api.functions.messages.initHistoryImport(peer: inputPeer, file: inputFile, mediaCount: mediaCount), automaticFloodWait: false)
-                    |> mapError { error -> InitImportError in
-                        if error.errorDescription == "CHAT_ADMIN_REQUIRED" {
-                            return .chatAdminRequired
-                        } else if error.errorDescription == "IMPORT_PEER_TYPE_INVALID" {
-                            return .invalidChatType
-                        } else if error.errorDescription == "USER_IS_BLOCKED" {
-                            return .userBlocked
-                        } else if error.errorDescription == "FLOOD_WAIT" {
-                            return .limitExceeded
-                        } else {
-                            return .generic
-                        }
-                    }
-                    |> map { result -> Session in
-                        switch result {
-                        case let .historyImport(id):
-                            return Session(peerId: peerId, inputPeer: inputPeer, id: id)
-                        }
-                    }
-                }
-            case .progress:
-                return .complete()
-            case .inputSecretFile:
-                return .fail(.generic)
-            }
-        }
-    }
-    
-    public enum MediaType {
-        case photo
-        case file
-        case video
-        case sticker
-        case voice
-    }
-    
-    public enum UploadMediaError {
-        case generic
-        case chatAdminRequired
-    }
-    
-    public static func uploadMedia(account: Account, session: Session, file: TempBoxFile, disposeFileAfterDone: Bool, fileName: String, mimeType: String, type: MediaType) -> Signal<Float, UploadMediaError> {
-        var forceNoBigParts = true
-        guard let size = fileSize(file.path), size != 0 else {
-            return .single(1.0)
-        }
-        if size >= 30 * 1024 * 1024 {
-            forceNoBigParts = false
-        }
-        
-        return multipartUpload(network: account.network, postbox: account.postbox, source: .tempFile(file), encrypt: false, tag: nil, hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: forceNoBigParts, useLargerParts: true, useMultiplexedRequests: true)
-        |> mapError { _ -> UploadMediaError in
-            return .generic
-        }
-        |> mapToSignal { result -> Signal<Float, UploadMediaError> in
-            let inputMedia: Api.InputMedia
-            switch result {
-            case let .inputFile(inputFile):
-                switch type {
-                case .photo:
-                    inputMedia = .inputMediaUploadedPhoto(flags: 0, file: inputFile, stickers: nil, ttlSeconds: nil)
-                case .file, .video, .sticker, .voice:
-                    var attributes: [Api.DocumentAttribute] = []
-                    attributes.append(.documentAttributeFilename(fileName: fileName))
-                    var resolvedMimeType = mimeType
-                    switch type {
-                    case .video:
-                        resolvedMimeType = "video/mp4"
-                    case .sticker:
-                        resolvedMimeType = "image/webp"
-                    case .voice:
-                        resolvedMimeType = "audio/ogg"
-                    default:
-                        break
-                    }
-                    inputMedia = .inputMediaUploadedDocument(flags: 0, file: inputFile, thumb: nil, mimeType: resolvedMimeType, attributes: attributes, stickers: nil, ttlSeconds: nil)
-                }
-            case let .progress(value):
-                return .single(value)
-            case .inputSecretFile:
-                return .fail(.generic)
-            }
-            return account.network.request(Api.functions.messages.uploadImportedMedia(peer: session.inputPeer, importId: session.id, fileName: fileName, media: inputMedia))
-            |> mapError { error -> UploadMediaError in
-                switch error.errorDescription {
-                case "CHAT_ADMIN_REQUIRED":
-                    return .chatAdminRequired
-                default:
-                    return .generic
-                }
-            }
-            |> mapToSignal { result -> Signal<Float, UploadMediaError> in
-                return .single(1.0)
-            }
-            |> afterDisposed {
-                if disposeFileAfterDone {
-                    TempBox.shared.dispose(file)
-                }
-            }
-        }
-    }
-    
-    public enum StartImportError {
-        case generic
-    }
-    
-    public static func startImport(account: Account, session: Session) -> Signal<Never, StartImportError> {
-        return account.network.request(Api.functions.messages.startHistoryImport(peer: session.inputPeer, importId: session.id))
-        |> mapError { _ -> StartImportError in
-            return .generic
-        }
-        |> mapToSignal { result -> Signal<Never, StartImportError> in
-            if case .boolTrue = result {
-                return .complete()
-            } else {
-                return .fail(.generic)
-            }
-        }
-    }
-    
-    public enum CheckPeerImportResult {
-        case allowed
-        case alert(String)
-    }
-    
-    public enum CheckPeerImportError {
-        case generic
-        case chatAdminRequired
-        case invalidChatType
-        case userBlocked
-        case limitExceeded
-        case notMutualContact
-    }
-    
-    public static func checkPeerImport(account: Account, peerId: PeerId) -> Signal<CheckPeerImportResult, CheckPeerImportError> {
-        return account.postbox.transaction { transaction -> Peer? in
-            return transaction.getPeer(peerId)
-        }
-        |> castError(CheckPeerImportError.self)
-        |> mapToSignal { peer -> Signal<CheckPeerImportResult, CheckPeerImportError> in
-            guard let peer = peer else {
-                return .fail(.generic)
-            }
-            guard let inputPeer = apiInputPeer(peer) else {
-                return .fail(.generic)
-            }
-            
-            return account.network.request(Api.functions.messages.checkHistoryImportPeer(peer: inputPeer))
-            |> mapError { error -> CheckPeerImportError in
-                if error.errorDescription == "CHAT_ADMIN_REQUIRED" {
-                    return .chatAdminRequired
-                } else if error.errorDescription == "IMPORT_PEER_TYPE_INVALID" {
-                    return .invalidChatType
-                } else if error.errorDescription == "USER_IS_BLOCKED" {
-                    return .userBlocked
-                } else if error.errorDescription == "USER_NOT_MUTUAL_CONTACT" {
-                    return .notMutualContact
-                } else if error.errorDescription == "FLOOD_WAIT" {
-                    return .limitExceeded
-                } else {
-                    return .generic
-                }
-            }
-            |> map { result -> CheckPeerImportResult in
-                switch result {
-                case let .checkedHistoryImportPeer(confirmText):
-                    if confirmText.isEmpty {
-                        return .allowed
-                    } else {
-                        return .alert(confirmText)
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/submodules/TelegramCore/Sources/Config/TelegramCore.xcconfig b/submodules/TelegramCore/Sources/Config/TelegramCore.xcconfig
deleted file mode 100644
index c3b3ada1b4..0000000000
--- a/submodules/TelegramCore/Sources/Config/TelegramCore.xcconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-SWIFT_INCLUDE_PATHS = $(SRCROOT)/TelegramCore
-MODULEMAP_PRIVATE_FILE = $(SRCROOT)/TelegramCore/module.private.modulemap
diff --git a/submodules/TelegramCore/Sources/CoreSettings.swift b/submodules/TelegramCore/Sources/CoreSettings.swift
deleted file mode 100644
index 6fed549367..0000000000
--- a/submodules/TelegramCore/Sources/CoreSettings.swift
+++ /dev/null
@@ -1,59 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import MtProtoKit
-
-import SyncCore
-
-public final class CoreSettings: PreferencesEntry, Equatable {
-    public let fastForward: Bool
-    
-    public static var defaultSettings = CoreSettings(fastForward: true)
-    
-    public init(fastForward: Bool) {
-        self.fastForward = fastForward
-    }
-    
-    public init(decoder: PostboxDecoder) {
-        self.fastForward = decoder.decodeInt32ForKey("fastForward", orElse: 0) != 0
-    }
-    
-    public func encode(_ encoder: PostboxEncoder) {
-        encoder.encodeInt32(self.fastForward ? 1 : 0, forKey: "fastForward")
-    }
-    
-    public func withUpdatedFastForward(_ fastForward: Bool) -> CoreSettings {
-        return CoreSettings(fastForward: fastForward)
-    }
-    
-    public func isEqual(to: PreferencesEntry) -> Bool {
-        guard let to = to as? CoreSettings else {
-            return false
-        }
-        
-        return self == to
-    }
-    
-    public static func ==(lhs: CoreSettings, rhs: CoreSettings) -> Bool {
-        if lhs.fastForward != rhs.fastForward {
-            return false
-        }
-        return true
-    }
-}
-
-public func updateCoreSettings(postbox: Postbox, _ f: @escaping (CoreSettings) -> CoreSettings) -> Signal<Void, NoError> {
-    return postbox.transaction { transaction -> Void in
-        var updated: CoreSettings?
-        transaction.updatePreferencesEntry(key: PreferencesKeys.coreSettings, { current in
-            if let current = current as? CoreSettings {
-                updated = f(current)
-                return updated
-            } else {
-                updated = f(CoreSettings.defaultSettings)
-                return updated
-            }
-        })
-    }
-}
-
diff --git a/submodules/TelegramCore/Sources/DeleteAccount.swift b/submodules/TelegramCore/Sources/DeleteAccount.swift
deleted file mode 100644
index 6ef229ca72..0000000000
--- a/submodules/TelegramCore/Sources/DeleteAccount.swift
+++ /dev/null
@@ -1,16 +0,0 @@
-import Foundation
-import SwiftSignalKit
-import Postbox
-import TelegramApi
-
-public enum DeleteAccountError {
-    case generic
-}
-
-public func deleteAccount(account: Account) -> Signal<Never, DeleteAccountError> {
-    return account.network.request(Api.functions.account.deleteAccount(reason: "GDPR"))
-    |> mapError { _ -> DeleteAccountError in
-        return .generic
-    }
-    |> ignoreValues
-}
diff --git a/submodules/TelegramCore/Sources/Either.swift b/submodules/TelegramCore/Sources/Either.swift
deleted file mode 100644
index 1478adbc58..0000000000
--- a/submodules/TelegramCore/Sources/Either.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import Foundation
-
-public enum Either<Left, Right> {
-    case left(value: Left)
-    case right(value: Right)
-}
diff --git a/submodules/TelegramCore/Sources/GlobalTelegramCoreConfiguration.swift b/submodules/TelegramCore/Sources/GlobalTelegramCoreConfiguration.swift
deleted file mode 100644
index 7cf05d8aa9..0000000000
--- a/submodules/TelegramCore/Sources/GlobalTelegramCoreConfiguration.swift
+++ /dev/null
@@ -1,5 +0,0 @@
-import Foundation
-
-public final class GlobalTelegramCoreConfiguration {
-    public static var readMessages: Bool = true
-}
diff --git a/submodules/TelegramCore/Sources/Info.plist b/submodules/TelegramCore/Sources/Info.plist
deleted file mode 100644
index fbe1e6b314..0000000000
--- a/submodules/TelegramCore/Sources/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/TelegramCore/Sources/GroupReturnAndLeft.swift b/submodules/TelegramCore/Sources/MacOS/GroupReturnAndLeft.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/GroupReturnAndLeft.swift
rename to submodules/TelegramCore/Sources/MacOS/GroupReturnAndLeft.swift
index 16360909ab..5073e42342 100644
--- a/submodules/TelegramCore/Sources/GroupReturnAndLeft.swift
+++ b/submodules/TelegramCore/Sources/MacOS/GroupReturnAndLeft.swift
@@ -9,7 +9,7 @@ public func returnGroup(account: Account, peerId: PeerId) -> Signal<Void, NoErro
         |> take(1)
         |> mapToSignal { peer -> Signal<Void, NoError> in
             if let inputUser = apiInputUser(peer) {
-                return account.network.request(Api.functions.messages.addChatUser(chatId: peerId.id, userId: inputUser, fwdLimit: 50))
+                return account.network.request(Api.functions.messages.addChatUser(chatId: peerId.id._internalGetInt32Value(), userId: inputUser, fwdLimit: 50))
                     |> retryRequest
                     |> mapToSignal { updates -> Signal<Void, NoError> in
                         account.stateManager.addUpdates(updates)
@@ -26,7 +26,7 @@ public func leftGroup(account: Account, peerId: PeerId) -> Signal<Void, NoError>
         |> take(1)
         |> mapToSignal { peer -> Signal<Void, NoError> in
             if let inputUser = apiInputUser(peer) {
-                return account.network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: peerId.id, userId: inputUser))
+                return account.network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: peerId.id._internalGetInt32Value(), userId: inputUser))
                     |> retryRequest
                     |> mapToSignal { updates -> Signal<Void, NoError> in
                         account.stateManager.addUpdates(updates)
diff --git a/submodules/TelegramCore/Sources/MacInternalUpdater.swift b/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/MacInternalUpdater.swift
rename to submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
index f185d80ce8..a54dd51ab4 100644
--- a/submodules/TelegramCore/Sources/MacInternalUpdater.swift
+++ b/submodules/TelegramCore/Sources/MacOS/MacInternalUpdater.swift
@@ -12,7 +12,7 @@ public enum InternalUpdaterError {
 }
 
 public func requestUpdatesXml(account: Account, source: String) -> Signal<Data, InternalUpdaterError> {
-    return resolvePeerByName(account: account, name: source)
+    return TelegramEngine(account: account).peers.resolvePeerByName(name: source)
         |> castError(InternalUpdaterError.self)
         |> mapToSignal { peerId -> Signal<Peer?, InternalUpdaterError> in
             return account.postbox.transaction { transaction in
@@ -79,7 +79,7 @@ public enum AppUpdateDownloadResult {
 }
 
 public func downloadAppUpdate(account: Account, source: String, messageId: Int32) -> Signal<AppUpdateDownloadResult, InternalUpdaterError> {
-    return resolvePeerByName(account: account, name: source)
+    return TelegramEngine(account: account).peers.resolvePeerByName(name: source)
         |> castError(InternalUpdaterError.self)
         |> mapToSignal { peerId -> Signal<Peer?, InternalUpdaterError> in
             return account.postbox.transaction { transaction in
diff --git a/submodules/TelegramCore/Sources/NotificationAutolockReportManager.swift b/submodules/TelegramCore/Sources/MacOS/NotificationAutolockReportManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/NotificationAutolockReportManager.swift
rename to submodules/TelegramCore/Sources/MacOS/NotificationAutolockReportManager.swift
diff --git a/submodules/TelegramCore/Sources/MessageReactionList.swift b/submodules/TelegramCore/Sources/MessageReactionList.swift
deleted file mode 100644
index e011fb66e4..0000000000
--- a/submodules/TelegramCore/Sources/MessageReactionList.swift
+++ /dev/null
@@ -1,210 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-import MtProtoKit
-
-import SyncCore
-
-public enum MessageReactionListCategory: Hashable {
-    case all
-    case reaction(String)
-}
-
-public final class MessageReactionListCategoryItem: Equatable {
-    public let peer: Peer
-    public let reaction: String
-    
-    init(peer: Peer, reaction: String) {
-        self.peer = peer
-        self.reaction = reaction
-    }
-    
-    public static func ==(lhs: MessageReactionListCategoryItem, rhs: MessageReactionListCategoryItem) -> Bool {
-        if lhs.peer.id != rhs.peer.id {
-            return false
-        }
-        if lhs.reaction != rhs.reaction {
-            return false
-        }
-        return true
-    }
-}
-
-public struct MessageReactionListCategoryState: Equatable {
-    public var count: Int
-    public var completed: Bool
-    public var items: [MessageReactionListCategoryItem]
-    public var loadingMore: Bool
-    fileprivate var nextOffset: String?
-}
-
-private enum LoadReactionsError {
-    case generic
-}
-
-private final class MessageReactionCategoryContext {
-    private let postbox: Postbox
-    private let network: Network
-    private let messageId: MessageId
-    private let category: MessageReactionListCategory
-    private var state: MessageReactionListCategoryState
-    var statePromise: ValuePromise<MessageReactionListCategoryState>
-    
-    private let loadingDisposable = MetaDisposable()
-    
-    init(postbox: Postbox, network: Network, messageId: MessageId, category: MessageReactionListCategory, initialState: MessageReactionListCategoryState) {
-        self.postbox = postbox
-        self.network = network
-        self.messageId = messageId
-        self.category = category
-        self.state = initialState
-        self.statePromise = ValuePromise(initialState)
-    }
-    
-    deinit {
-        self.loadingDisposable.dispose()
-    }
-    
-    func loadMore() {
-        if self.state.completed || self.state.loadingMore {
-            return
-        }
-        /*self.state.loadingMore = true
-        self.statePromise.set(self.state)
-        
-        var flags: Int32 = 0
-        var reaction: String?
-        switch self.category {
-        case .all:
-            break
-        case let .reaction(value):
-            flags |= 1 << 0
-            reaction = value
-        }
-        let messageId = self.messageId
-        let offset = self.state.nextOffset
-        var request = self.postbox.transaction { transaction -> Api.InputPeer? in
-            let inputPeer = transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
-            return inputPeer
-        }
-        |> castError(LoadReactionsError.self)
-        |> mapToSignal { inputPeer -> Signal<Api.messages.MessageReactionsList, LoadReactionsError> in
-            guard let inputPeer = inputPeer else {
-                return .fail(.generic)
-            }
-            return self.network.request(Api.functions.messages.getMessageReactionsList(flags: flags, peer: inputPeer, id: messageId.id, reaction: reaction, offset: offset, limit: 64))
-            |> mapError { _ -> LoadReactionsError in
-                return .generic
-            }
-        }
-        //#if DEBUG
-        //request = request |> delay(1.0, queue: .mainQueue())
-        //#endif
-        self.loadingDisposable.set((request
-        |> deliverOnMainQueue).start(next: { [weak self] result in
-            guard let strongSelf = self else {
-                return
-            }
-            let currentState = strongSelf.state
-            let _ = (strongSelf.postbox.transaction { transaction -> MessageReactionListCategoryState in
-                var mergedItems = currentState.items
-                var currentIds = Set(mergedItems.lazy.map { $0.peer.id })
-                switch result {
-                case let .messageReactionsList(_, count, reactions, users, nextOffset):
-                    var peers: [Peer] = []
-                    for user in users {
-                        let parsedUser = TelegramUser(user: user)
-                        peers.append(parsedUser)
-                    }
-                    updatePeers(transaction: transaction, peers: peers, update: { _, updated in updated })
-                    for reaction in reactions {
-                        switch reaction {
-                        case let .messageUserReaction(userId, reaction):
-                            if let peer = transaction.getPeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)) {
-                                if !currentIds.contains(peer.id) {
-                                    currentIds.insert(peer.id)
-                                    mergedItems.append(MessageReactionListCategoryItem(peer: peer, reaction: reaction))
-                                }
-                            }
-                        }
-                    }
-                    return MessageReactionListCategoryState(count: max(mergedItems.count, Int(count)), completed: nextOffset == nil, items: mergedItems, loadingMore: false, nextOffset: nextOffset)
-                }
-            }
-            |> deliverOnMainQueue).start(next: { state in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.state = state
-                strongSelf.statePromise.set(state)
-            })
-        }, error: { _ in
-            
-        }))*/
-    }
-}
-
-public struct MessageReactionListState: Equatable {
-    public var states: [(MessageReactionListCategory, MessageReactionListCategoryState)]
-    
-    public static func ==(lhs: MessageReactionListState, rhs: MessageReactionListState) -> Bool {
-        if lhs.states.count != rhs.states.count {
-            return false
-        }
-        for i in 0 ..< lhs.states.count {
-            if lhs.states[i].0 != rhs.states[i].0 {
-                return false
-            }
-            if lhs.states[i].1 != rhs.states[i].1 {
-                return false
-            }
-        }
-        return true
-    }
-}
-
-public final class MessageReactionListContext {
-    private let postbox: Postbox
-    private let network: Network
-    
-    private var categoryContexts: [MessageReactionListCategory: MessageReactionCategoryContext] = [:]
-    
-    private let _state = Promise<MessageReactionListState>()
-    public var state: Signal<MessageReactionListState, NoError> {
-        return self._state.get()
-    }
-    
-    public init(postbox: Postbox, network: Network, messageId: MessageId, initialReactions: [MessageReaction]) {
-        self.postbox = postbox
-        self.network = network
-        
-        var allState = MessageReactionListCategoryState(count: 0, completed: false, items: [], loadingMore: false, nextOffset: nil)
-        var signals: [Signal<(MessageReactionListCategory, MessageReactionListCategoryState), NoError>] = []
-        for reaction in initialReactions {
-            allState.count += Int(reaction.count)
-            let context = MessageReactionCategoryContext(postbox: postbox, network: network, messageId: messageId, category: .reaction(reaction.value), initialState: MessageReactionListCategoryState(count: Int(reaction.count), completed: false, items: [], loadingMore: false, nextOffset: nil))
-            signals.append(context.statePromise.get() |> map { value -> (MessageReactionListCategory, MessageReactionListCategoryState) in
-                return (.reaction(reaction.value), value)
-            })
-            self.categoryContexts[.reaction(reaction.value)] = context
-            context.loadMore()
-        }
-        let allContext = MessageReactionCategoryContext(postbox: postbox, network: network, messageId: messageId, category: .all, initialState: allState)
-        signals.insert(allContext.statePromise.get() |> map { value -> (MessageReactionListCategory, MessageReactionListCategoryState) in
-            return (.all, value)
-        }, at: 0)
-        self.categoryContexts[.all] = allContext
-        
-        self._state.set(combineLatest(queue: .mainQueue(), signals)
-        |> map { states in
-            return MessageReactionListState(states: states)
-        })
-        
-        allContext.loadMore()
-    }
-    
-    public func loadMore(category: MessageReactionListCategory) {
-        self.categoryContexts[category]?.loadMore()
-    }
-}
diff --git a/submodules/TelegramCore/Sources/MultipeerManager.swift b/submodules/TelegramCore/Sources/MultipeerManager.swift
deleted file mode 100644
index 90004e3427..0000000000
--- a/submodules/TelegramCore/Sources/MultipeerManager.swift
+++ /dev/null
@@ -1,119 +0,0 @@
-import Foundation
-import MultipeerConnectivity
-
-protocol ColorServiceManagerDelegate {
-    
-    func connectedDevicesChanged(manager : ColorServiceManager, connectedDevices: [String])
-    func colorChanged(manager : ColorServiceManager, colorString: String)
-    
-}
-
-class ColorServiceManager : NSObject {
-    private let ColorServiceType = "tg-p2p"
-    
-    private let myPeerId = MCPeerID(displayName: UIDevice.current.name)
-    
-    private let serviceAdvertiser : MCNearbyServiceAdvertiser
-    private let serviceBrowser : MCNearbyServiceBrowser
-    
-    var delegate : ColorServiceManagerDelegate?
-    
-    lazy var session : MCSession = {
-        let session = MCSession(peer: self.myPeerId, securityIdentity: nil, encryptionPreference: .required)
-        session.delegate = self
-        return session
-    }()
-    
-    override init() {
-        self.serviceAdvertiser = MCNearbyServiceAdvertiser(peer: myPeerId, discoveryInfo: nil, serviceType: ColorServiceType)
-        self.serviceBrowser = MCNearbyServiceBrowser(peer: myPeerId, serviceType: ColorServiceType)
-        
-        super.init()
-        
-        self.serviceAdvertiser.delegate = self
-        self.serviceAdvertiser.startAdvertisingPeer()
-        
-        self.serviceBrowser.delegate = self
-        self.serviceBrowser.startBrowsingForPeers()
-    }
-    
-    func send(colorName : String) {
-        NSLog("%@", "sendColor: \(colorName) to \(session.connectedPeers.count) peers")
-        
-        if session.connectedPeers.count > 0 {
-            do {
-                try self.session.send(colorName.data(using: .utf8)!, toPeers: session.connectedPeers, with: .reliable)
-            }
-            catch let error {
-                NSLog("%@", "Error for sending: \(error)")
-            }
-        }
-        
-    }
-    
-    deinit {
-        self.serviceAdvertiser.stopAdvertisingPeer()
-        self.serviceBrowser.stopBrowsingForPeers()
-    }
-    
-}
-
-extension ColorServiceManager : MCNearbyServiceAdvertiserDelegate {
-    
-    func advertiser(_ advertiser: MCNearbyServiceAdvertiser, didNotStartAdvertisingPeer error: Error) {
-        NSLog("%@", "didNotStartAdvertisingPeer: \(error)")
-    }
-    
-    func advertiser(_ advertiser: MCNearbyServiceAdvertiser, didReceiveInvitationFromPeer peerID: MCPeerID, withContext context: Data?, invitationHandler: @escaping (Bool, MCSession?) -> Void) {
-        NSLog("%@", "didReceiveInvitationFromPeer \(peerID)")
-        invitationHandler(true, self.session)
-    }
-    
-}
-
-extension ColorServiceManager : MCNearbyServiceBrowserDelegate {
-    
-    func browser(_ browser: MCNearbyServiceBrowser, didNotStartBrowsingForPeers error: Error) {
-        NSLog("%@", "didNotStartBrowsingForPeers: \(error)")
-    }
-    
-    func browser(_ browser: MCNearbyServiceBrowser, foundPeer peerID: MCPeerID, withDiscoveryInfo info: [String : String]?) {
-        NSLog("%@", "foundPeer: \(peerID)")
-        NSLog("%@", "invitePeer: \(peerID)")
-        browser.invitePeer(peerID, to: self.session, withContext: nil, timeout: 10)
-    }
-    
-    func browser(_ browser: MCNearbyServiceBrowser, lostPeer peerID: MCPeerID) {
-        NSLog("%@", "lostPeer: \(peerID)")
-    }
-    
-}
-
-extension ColorServiceManager : MCSessionDelegate {
-    
-    func session(_ session: MCSession, peer peerID: MCPeerID, didChange state: MCSessionState) {
-        NSLog("%@", "peer \(peerID) didChangeState: \(state)")
-        self.delegate?.connectedDevicesChanged(manager: self, connectedDevices:
-            session.connectedPeers.map{$0.displayName})
-    }
-    
-    func session(_ session: MCSession, didReceive data: Data, fromPeer peerID: MCPeerID) {
-        NSLog("%@", "didReceiveData: \(data)")
-        let str = String(data: data, encoding: .utf8)!
-        self.delegate?.colorChanged(manager: self, colorString: str)
-    }
-    
-    func session(_ session: MCSession, didReceive stream: InputStream, withName streamName: String, fromPeer peerID: MCPeerID) {
-        NSLog("%@", "didReceiveStream")
-    }
-    
-    func session(_ session: MCSession, didStartReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, with progress: Progress) {
-        NSLog("%@", "didStartReceivingResourceWithName")
-    }
-    
-    func session(_ session: MCSession, didFinishReceivingResourceWithName resourceName: String, fromPeer peerID: MCPeerID, at localURL: URL?, withError error: Error?) {
-        NSLog("%@", "didFinishReceivingResourceWithName")
-    }
-    
-}
-
diff --git a/submodules/TelegramCore/Sources/Download.swift b/submodules/TelegramCore/Sources/Network/Download.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/Download.swift
rename to submodules/TelegramCore/Sources/Network/Download.swift
diff --git a/submodules/TelegramCore/Sources/FetchHttpResource.swift b/submodules/TelegramCore/Sources/Network/FetchHttpResource.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/FetchHttpResource.swift
rename to submodules/TelegramCore/Sources/Network/FetchHttpResource.swift
diff --git a/submodules/TelegramCore/Sources/FetchedMediaResource.swift b/submodules/TelegramCore/Sources/Network/FetchedMediaResource.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/FetchedMediaResource.swift
rename to submodules/TelegramCore/Sources/Network/FetchedMediaResource.swift
index 33f492620e..e45786cfe8 100644
--- a/submodules/TelegramCore/Sources/FetchedMediaResource.swift
+++ b/submodules/TelegramCore/Sources/Network/FetchedMediaResource.swift
@@ -69,9 +69,27 @@ public func stickerPackFileReference(_ file: TelegramMediaFile) -> FileMediaRefe
     return .standalone(media: file)
 }
 
+private func areResourcesEqual(_ lhs: MediaResource, _ rhs: MediaResource) -> Bool {
+    if let lhsResource = lhs as? CloudDocumentMediaResource, let rhsResource = rhs as? CloudDocumentMediaResource {
+        if lhsResource.fileId == rhsResource.fileId {
+            return true
+        }
+    } else if let lhsResource = lhs as? CloudDocumentSizeMediaResource, let rhsResource = rhs as? CloudDocumentSizeMediaResource {
+        if lhsResource.documentId == rhsResource.documentId && lhsResource.sizeSpec == rhsResource.sizeSpec {
+            return true
+        }
+    }
+    return lhs.id.isEqual(to: rhs.id)
+}
+
 private func findMediaResource(media: Media, previousMedia: Media?, resource: MediaResource) -> TelegramMediaResource? {
     if let image = media as? TelegramMediaImage {
         for representation in image.representations {
+            if let updatedResource = representation.resource as? CloudPhotoSizeMediaResource, let previousResource = resource as? CloudPhotoSizeMediaResource {
+                if updatedResource.photoId == previousResource.photoId && updatedResource.sizeSpec == previousResource.sizeSpec {
+                    return representation.resource
+                }
+            }
             if representation.resource.id.isEqual(to: resource.id) {
                 return representation.resource
             }
@@ -81,33 +99,15 @@ private func findMediaResource(media: Media, previousMedia: Media?, resource: Me
                 return representation.resource
             }
         }
-        if let legacyResource = resource as? CloudFileMediaResource {
-            for representation in image.representations {
-                if let updatedResource = representation.resource as? CloudPhotoSizeMediaResource {
-                    if updatedResource.localId == legacyResource.localId && updatedResource.volumeId == legacyResource.volumeId {
-                        return representation.resource
-                    }
-                }
-            }
-        }
     } else if let file = media as? TelegramMediaFile {
-        if file.resource.id.isEqual(to: resource.id) {
+        if areResourcesEqual(file.resource, resource) {
             return file.resource
         } else {
             for representation in file.previewRepresentations {
-                if representation.resource.id.isEqual(to: resource.id) {
+                if areResourcesEqual(representation.resource, resource) {
                     return representation.resource
                 }
             }
-            if let legacyResource = resource as? CloudFileMediaResource {
-                for representation in file.previewRepresentations {
-                    if let updatedResource = representation.resource as? CloudDocumentSizeMediaResource {
-                        if updatedResource.localId == legacyResource.localId && updatedResource.volumeId == legacyResource.volumeId {
-                            return representation.resource
-                        }
-                    }
-                }
-            }
         }
     } else if let webPage = media as? TelegramMediaWebpage, case let .Loaded(content) = webPage.content {
         if let image = content.image, let result = findMediaResource(media: image, previousMedia: previousMedia, resource: resource) {
@@ -382,7 +382,7 @@ final class MediaReferenceRevalidationContext {
     
     func peer(postbox: Postbox, network: Network, background: Bool, peer: PeerReference) -> Signal<Peer, RevalidateMediaReferenceError> {
         return self.genericItem(key: .peer(peer: peer), background: background, request: { next, error in
-            return (updatedRemotePeer(postbox: postbox, network: network, peer: peer)
+            return (_internal_updatedRemotePeer(postbox: postbox, network: network, peer: peer)
             |> mapError { _ -> RevalidateMediaReferenceError in
                 return .generic
             }).start(next: { value in
@@ -400,7 +400,13 @@ final class MediaReferenceRevalidationContext {
     }
     
     func wallpapers(postbox: Postbox, network: Network, background: Bool, wallpaper: WallpaperReference?) -> Signal<[TelegramWallpaper], RevalidateMediaReferenceError> {
-        return self.genericItem(key: .wallpapers, background: background, request: { next, error in
+        let key: MediaReferenceRevalidationKey
+        if let wallpaper = wallpaper {
+            key = .wallpaper(wallpaper: wallpaper)
+        } else {
+            key = .wallpapers
+        }
+        return self.genericItem(key: key, background: background, request: { next, error in
             let signal: Signal<[TelegramWallpaper]?, RevalidateMediaReferenceError>
             if let wallpaper = wallpaper, case let .slug(slug) = wallpaper {
                 signal = getWallpaper(network: network, slug: slug)
@@ -412,7 +418,6 @@ final class MediaReferenceRevalidationContext {
                 signal = telegramWallpapers(postbox: postbox, network: network, forceUpdate: true)
                 |> last
                 |> mapError { _ -> RevalidateMediaReferenceError in
-                    return .generic
                 }
             }
             return (signal
@@ -456,7 +461,7 @@ final class MediaReferenceRevalidationContext {
     
     func peerAvatars(postbox: Postbox, network: Network, background: Bool, peer: PeerReference) -> Signal<[TelegramPeerPhoto], RevalidateMediaReferenceError> {
         return self.genericItem(key: .peerAvatars(peer: peer), background: background, request: { next, error in
-            return (requestPeerPhotos(postbox: postbox, network: network, peerId: peer.id)
+            return (_internal_requestPeerPhotos(postbox: postbox, network: network, peerId: peer.id)
             |> mapError { _ -> RevalidateMediaReferenceError in
                 return .generic
             }).start(next: { value in
@@ -618,19 +623,15 @@ func revalidateMediaResourceReference(postbox: Postbox, network: Network, revali
             return revalidationContext.peer(postbox: postbox, network: network, background: info.preferBackgroundReferenceRevalidation, peer: peer)
             |> mapToSignal { updatedPeer -> Signal<RevalidatedMediaResource, RevalidateMediaReferenceError> in
                 for representation in updatedPeer.profileImageRepresentations {
+                    if let updatedResource = representation.resource as? CloudPeerPhotoSizeMediaResource, let previousResource = resource as? CloudPeerPhotoSizeMediaResource {
+                        if updatedResource.sizeSpec == previousResource.sizeSpec {
+                            return .single(RevalidatedMediaResource(updatedResource: representation.resource, updatedReference: nil))
+                        }
+                    }
                     if representation.resource.id.isEqual(to: resource.id) {
                         return .single(RevalidatedMediaResource(updatedResource: representation.resource, updatedReference: nil))
                     }
                 }
-                if let legacyResource = resource as? CloudFileMediaResource {
-                    for representation in updatedPeer.profileImageRepresentations {
-                        if let updatedResource = representation.resource as? CloudPeerPhotoSizeMediaResource {
-                            if updatedResource.localId == legacyResource.localId && updatedResource.volumeId == legacyResource.volumeId {
-                                return .single(RevalidatedMediaResource(updatedResource: updatedResource, updatedReference: nil))
-                            }
-                        }
-                    }
-                }
                 return .fail(.generic)
             }
         case let .avatarList(peer, _):
@@ -693,12 +694,8 @@ func revalidateMediaResourceReference(postbox: Postbox, network: Network, revali
                     if thumbnail.resource.id.isEqual(to: resource.id) {
                         return .single(RevalidatedMediaResource(updatedResource: thumbnail.resource, updatedReference: nil))
                     }
-                    if let legacyResource = resource as? CloudFileMediaResource {
-                        if let updatedResource = thumbnail.resource as? CloudStickerPackThumbnailMediaResource {
-                            if updatedResource.localId == legacyResource.localId && updatedResource.volumeId == legacyResource.volumeId {
-                                return .single(RevalidatedMediaResource(updatedResource: updatedResource, updatedReference: nil))
-                            }
-                        }
+                    if let _ = thumbnail.resource as? CloudStickerPackThumbnailMediaResource, let _ = resource as? CloudStickerPackThumbnailMediaResource {
+                        return .single(RevalidatedMediaResource(updatedResource: thumbnail.resource, updatedReference: nil))
                     }
                 }
                 return .fail(.generic)
diff --git a/submodules/TelegramCore/Sources/MultipartFetch.swift b/submodules/TelegramCore/Sources/Network/MultipartFetch.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/MultipartFetch.swift
rename to submodules/TelegramCore/Sources/Network/MultipartFetch.swift
index 3b777d69e1..c5f525144e 100644
--- a/submodules/TelegramCore/Sources/MultipartFetch.swift
+++ b/submodules/TelegramCore/Sources/Network/MultipartFetch.swift
@@ -445,7 +445,7 @@ private final class MultipartFetchManager {
     init(resource: TelegramMediaResource, parameters: MediaResourceFetchParameters?, size: Int?, intervals: Signal<[(Range<Int>, MediaBoxFetchPriority)], NoError>, encryptionKey: SecretFileEncryptionKey?, decryptedSize: Int32?, location: MultipartFetchMasterLocation, postbox: Postbox, network: Network, revalidationContext: MediaReferenceRevalidationContext, partReady: @escaping (Int, Data) -> Void, reportCompleteSize: @escaping (Int) -> Void) {
         self.resource = resource
         self.parameters = parameters
-        self.consumerId = arc4random64()
+        self.consumerId = Int64.random(in: Int64.min ... Int64.max)
         
         self.completeSize = size
         if let size = size {
@@ -454,7 +454,7 @@ private final class MultipartFetchManager {
                 self.parallelParts = 4 * 4
             } else {
                 self.defaultPartSize = 128 * 1024
-                self.parallelParts = 4
+                self.parallelParts = 8
             }
         } else {
             self.parallelParts = 1
@@ -752,10 +752,9 @@ func multipartFetch(postbox: Postbox, network: Network, mediaReferenceRevalidati
                             if let location = resource.apiInputLocation(peerReference: peer) {
                                 return .location(location)
                             } else {
-                                return .none
+                                return .revalidate
                             }
                         case .messageAuthorAvatar:
-                            
                             return .revalidate
                         default:
                             return .none
@@ -769,7 +768,7 @@ func multipartFetch(postbox: Postbox, network: Network, mediaReferenceRevalidati
                             if let location = resource.apiInputLocation(packReference: stickerPack) {
                                 return .location(location)
                             } else {
-                                return .none
+                                return .revalidate
                             }
                         default:
                             return .none
diff --git a/submodules/TelegramCore/Sources/MultipartUpload.swift b/submodules/TelegramCore/Sources/Network/MultipartUpload.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/MultipartUpload.swift
rename to submodules/TelegramCore/Sources/Network/MultipartUpload.swift
index 359f815c11..7ac8cb2005 100644
--- a/submodules/TelegramCore/Sources/MultipartUpload.swift
+++ b/submodules/TelegramCore/Sources/Network/MultipartUpload.swift
@@ -395,7 +395,7 @@ func multipartUpload(network: Network, postbox: Postbox, source: MultipartUpload
     
     let uploadInterface: Signal<UploadInterface, NoError>
     if useMultiplexedRequests {
-        uploadInterface = .single(.multiplexed(manager: network.multiplexedRequestManager, datacenterId: network.datacenterId, consumerId: arc4random64()))
+        uploadInterface = .single(.multiplexed(manager: network.multiplexedRequestManager, datacenterId: network.datacenterId, consumerId: Int64.random(in: Int64.min ... Int64.max)))
     } else {
         uploadInterface = network.upload(tag: tag)
         |> map { download -> UploadInterface in
diff --git a/submodules/TelegramCore/Sources/MultiplexedRequestManager.swift b/submodules/TelegramCore/Sources/Network/MultiplexedRequestManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/MultiplexedRequestManager.swift
rename to submodules/TelegramCore/Sources/Network/MultiplexedRequestManager.swift
diff --git a/submodules/TelegramCore/Sources/Network.swift b/submodules/TelegramCore/Sources/Network/Network.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/Network.swift
rename to submodules/TelegramCore/Sources/Network/Network.swift
diff --git a/submodules/TelegramCore/Sources/NetworkType.swift b/submodules/TelegramCore/Sources/Network/NetworkType.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/NetworkType.swift
rename to submodules/TelegramCore/Sources/Network/NetworkType.swift
diff --git a/submodules/TelegramCore/Sources/ProxyServersStatuses.swift b/submodules/TelegramCore/Sources/Network/ProxyServersStatuses.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ProxyServersStatuses.swift
rename to submodules/TelegramCore/Sources/Network/ProxyServersStatuses.swift
diff --git a/submodules/TelegramCore/Sources/PeerParticipants.swift b/submodules/TelegramCore/Sources/PeerParticipants.swift
deleted file mode 100644
index 6f12d25956..0000000000
--- a/submodules/TelegramCore/Sources/PeerParticipants.swift
+++ /dev/null
@@ -1,40 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-
-import SyncCore
-
-private struct PeerParticipants: Equatable {
-    let peers: [Peer]
-    
-    static func ==(lhs: PeerParticipants, rhs: PeerParticipants) -> Bool {
-        if lhs.peers.count != rhs.peers.count {
-            return false
-        }
-        for i in 0 ..< lhs.peers.count {
-            if !lhs.peers[i].isEqual(rhs.peers[i]) {
-                return false
-            }
-        }
-        return true
-    }
-}
-
-public func peerParticipants(postbox: Postbox, id: PeerId) -> Signal<[Peer], NoError> {
-    return postbox.peerView(id: id) |> map { view -> PeerParticipants in
-        if let cachedGroupData = view.cachedData as? CachedGroupData, let participants = cachedGroupData.participants {
-            var peers: [Peer] = []
-            for participant in participants.participants {
-                if let peer = view.peers[participant.peerId] {
-                    peers.append(peer)
-                }
-            }
-            return PeerParticipants(peers: peers)
-        } else {
-            return PeerParticipants(peers: [])
-        }
-    }
-    |> distinctUntilChanged |> map { participants in
-        return participants.peers
-    }
-}
diff --git a/submodules/TelegramCore/Sources/PeerStatistics.swift b/submodules/TelegramCore/Sources/PeerStatistics.swift
index 83f9383e9a..21726144ca 100644
--- a/submodules/TelegramCore/Sources/PeerStatistics.swift
+++ b/submodules/TelegramCore/Sources/PeerStatistics.swift
@@ -1065,7 +1065,7 @@ extension GroupStatsTopPoster {
     init(apiStatsGroupTopPoster: Api.StatsGroupTopPoster) {
         switch apiStatsGroupTopPoster {
             case let .statsGroupTopPoster(userId, messages, avgChars):
-                self = GroupStatsTopPoster(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), messageCount: messages, averageChars: avgChars)
+                self = GroupStatsTopPoster(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), messageCount: messages, averageChars: avgChars)
         }
     }
 }
@@ -1074,7 +1074,7 @@ extension GroupStatsTopAdmin {
     init(apiStatsGroupTopAdmin: Api.StatsGroupTopAdmin) {
         switch apiStatsGroupTopAdmin {
             case let .statsGroupTopAdmin(userId, deleted, kicked, banned):
-                self = GroupStatsTopAdmin(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), deletedCount: deleted, kickedCount: kicked, bannedCount: banned)
+                self = GroupStatsTopAdmin(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), deletedCount: deleted, kickedCount: kicked, bannedCount: banned)
         }
     }
 }
@@ -1083,7 +1083,7 @@ extension GroupStatsTopInviter {
     init(apiStatsGroupTopInviter: Api.StatsGroupTopInviter) {
         switch apiStatsGroupTopInviter {
             case let .statsGroupTopInviter(userId, invitations):
-                self = GroupStatsTopInviter(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), inviteCount: invitations)
+                self = GroupStatsTopInviter(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), inviteCount: invitations)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift b/submodules/TelegramCore/Sources/PendingMessages/ChatUpdatingMessageMedia.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ChatUpdatingMessageMedia.swift
rename to submodules/TelegramCore/Sources/PendingMessages/ChatUpdatingMessageMedia.swift
diff --git a/submodules/TelegramCore/Sources/EnqueueMessage.swift b/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/EnqueueMessage.swift
rename to submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
index 6c5fddddc3..c664d3e96a 100644
--- a/submodules/TelegramCore/Sources/EnqueueMessage.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/EnqueueMessage.swift
@@ -11,13 +11,13 @@ public enum EnqueueMessageGrouping {
 }
 
 public enum EnqueueMessage {
-    case message(text: String, attributes: [MessageAttribute], mediaReference: AnyMediaReference?, replyToMessageId: MessageId?, localGroupingKey: Int64?)
-    case forward(source: MessageId, grouping: EnqueueMessageGrouping, attributes: [MessageAttribute])
+    case message(text: String, attributes: [MessageAttribute], mediaReference: AnyMediaReference?, replyToMessageId: MessageId?, localGroupingKey: Int64?, correlationId: Int64?)
+    case forward(source: MessageId, grouping: EnqueueMessageGrouping, attributes: [MessageAttribute], correlationId: Int64?)
     
     public func withUpdatedReplyToMessageId(_ replyToMessageId: MessageId?) -> EnqueueMessage {
         switch self {
-            case let .message(text, attributes, mediaReference, _, localGroupingKey):
-                return .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey)
+            case let .message(text, attributes, mediaReference, _, localGroupingKey, correlationId):
+                return .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey, correlationId: correlationId)
             case .forward:
                 return self
         }
@@ -25,21 +25,41 @@ public enum EnqueueMessage {
     
     public func withUpdatedAttributes(_ f: ([MessageAttribute]) -> [MessageAttribute]) -> EnqueueMessage {
         switch self {
-            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey):
-                return .message(text: text, attributes: f(attributes), mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey)
-            case let .forward(source, grouping, attributes):
-                return .forward(source: source, grouping: grouping, attributes: f(attributes))
+            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey, correlationId):
+                return .message(text: text, attributes: f(attributes), mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey, correlationId: correlationId)
+            case let .forward(source, grouping, attributes, correlationId):
+                return .forward(source: source, grouping: grouping, attributes: f(attributes), correlationId: correlationId)
         }
     }
     
     public func withUpdatedGroupingKey(_ f: (Int64?) -> Int64?) -> EnqueueMessage {
         switch self {
-            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey):
-                return .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: f(localGroupingKey))
+            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey, correlationId):
+                return .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: f(localGroupingKey), correlationId: correlationId)
             case .forward:
                 return self
         }
     }
+
+    public func withUpdatedCorrelationId(_ value: Int64?) -> EnqueueMessage {
+        switch self {
+            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey, _):
+                return .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey, correlationId: value)
+            case let .forward(source, grouping, attributes, _):
+                return .forward(source: source, grouping: grouping, attributes: attributes, correlationId: value)
+        }
+    }
+}
+
+private extension EnqueueMessage {
+    var correlationId: Int64? {
+        switch self {
+        case let .message(_, _, _, _, _, correlationId):
+            return correlationId
+        case let .forward(_, _, _, correlationId):
+            return correlationId
+        }
+    }
 }
 
 func augmentMediaWithReference(_ mediaReference: AnyMediaReference) -> Media {
@@ -62,9 +82,9 @@ func augmentMediaWithReference(_ mediaReference: AnyMediaReference) -> Media {
 
 private func convertForwardedMediaForSecretChat(_ media: Media) -> Media {
     if let file = media as? TelegramMediaFile {
-        return TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: file.partialReference, resource: file.resource, previewRepresentations: file.previewRepresentations, videoThumbnails: file.videoThumbnails, immediateThumbnailData: file.immediateThumbnailData, mimeType: file.mimeType, size: file.size, attributes: file.attributes)
+        return TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: file.partialReference, resource: file.resource, previewRepresentations: file.previewRepresentations, videoThumbnails: file.videoThumbnails, immediateThumbnailData: file.immediateThumbnailData, mimeType: file.mimeType, size: file.size, attributes: file.attributes)
     } else if let image = media as? TelegramMediaImage {
-        return TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: arc4random64()), representations: image.representations, immediateThumbnailData: image.immediateThumbnailData, reference: image.reference, partialReference: image.partialReference, flags: [])
+        return TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: Int64.random(in: Int64.min ... Int64.max)), representations: image.representations, immediateThumbnailData: image.immediateThumbnailData, reference: image.reference, partialReference: image.partialReference, flags: [])
     } else {
         return media
     }
@@ -139,7 +159,7 @@ private func opportunisticallyTransformOutgoingMedia(network: Network, postbox:
     var hasMedia = false
     loop: for message in messages {
         switch message {
-            case let .message(_, _, mediaReference, _, _):
+            case let .message(_, _, mediaReference, _, _, _):
                 if mediaReference != nil {
                     hasMedia = true
                     break loop
@@ -156,14 +176,14 @@ private func opportunisticallyTransformOutgoingMedia(network: Network, postbox:
     var signals: [Signal<(Bool, EnqueueMessage), NoError>] = []
     for message in messages {
         switch message {
-            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey):
+            case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey, correlationId):
                 if let mediaReference = mediaReference {
                     signals.append(opportunisticallyTransformMessageWithMedia(network: network, postbox: postbox, transformOutgoingMessageMedia: transformOutgoingMessageMedia, mediaReference: mediaReference, userInteractive: userInteractive)
                     |> map { result -> (Bool, EnqueueMessage) in
                         if let result = result {
-                            return (true, .message(text: text, attributes: attributes, mediaReference: .standalone(media: result.media), replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey))
+                            return (true, .message(text: text, attributes: attributes, mediaReference: .standalone(media: result.media), replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey, correlationId: correlationId))
                         } else {
-                            return (false, .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey))
+                            return (false, .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: replyToMessageId, localGroupingKey: localGroupingKey, correlationId: correlationId))
                         }
                     })
                 } else {
@@ -235,12 +255,12 @@ public func resendMessages(account: Account, messageIds: [MessageId]) -> Signal<
                         }
                     }
                     
-                    messages.append(.message(text: message.text, attributes: filteredAttributes, mediaReference: message.media.first.flatMap(AnyMediaReference.standalone), replyToMessageId: replyToMessageId, localGroupingKey: message.groupingKey))
+                    messages.append(.message(text: message.text, attributes: filteredAttributes, mediaReference: message.media.first.flatMap(AnyMediaReference.standalone), replyToMessageId: replyToMessageId, localGroupingKey: message.groupingKey, correlationId: nil))
                 }
             }
             let _ = enqueueMessages(transaction: transaction, account: account, peerId: peerId, messages: messages.map { (false, $0) })
         }
-        deleteMessages(transaction: transaction, mediaBox: account.postbox.mediaBox, ids: removeMessageIds, deleteMedia: false)
+        _internal_deleteMessages(transaction: transaction, mediaBox: account.postbox.mediaBox, ids: removeMessageIds, deleteMedia: false)
     }
 }
 
@@ -258,7 +278,7 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
             }
         }
         switch message {
-            case let .message(_, _, _, replyToMessageId, _):
+            case let .message(_, _, _, replyToMessageId, _, _):
                 if let replyToMessageId = replyToMessageId, replyToMessageId.peerId != peerId, let replyMessage = transaction.getMessage(replyToMessageId) {
                     var canBeForwarded = true
                     if replyMessage.id.namespace != Namespaces.Message.Cloud {
@@ -271,10 +291,10 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
                         }
                     }
                     if canBeForwarded {
-                        updatedMessages.append((true, .forward(source: replyToMessageId, grouping: .none, attributes: [])))
+                        updatedMessages.append((true, .forward(source: replyToMessageId, grouping: .none, attributes: [], correlationId: nil)))
                     }
                 }
-            case let .forward(sourceId, _, _):
+            case let .forward(sourceId, _, _, _):
                 if let sourceMessage = forwardedMessageToBeReuploaded(transaction: transaction, id: sourceId) {
                     var mediaReference: AnyMediaReference?
                     if sourceMessage.id.peerId.namespace == Namespaces.Peer.SecretChat {
@@ -282,7 +302,7 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
                             mediaReference = .standalone(media: media)
                         }
                     }
-                    updatedMessages.append((transformedMedia, .message(text: sourceMessage.text, attributes: sourceMessage.attributes, mediaReference: mediaReference, replyToMessageId: nil, localGroupingKey: nil)))
+                    updatedMessages.append((transformedMedia, .message(text: sourceMessage.text, attributes: sourceMessage.attributes, mediaReference: mediaReference, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)))
                     continue outer
                 }
         }
@@ -319,11 +339,11 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
             if transformedMedia {
                 infoFlags.insert(.transformedMedia)
             }
-            attributes.append(OutgoingMessageInfoAttribute(uniqueId: randomId, flags: infoFlags, acknowledged: false))
+            attributes.append(OutgoingMessageInfoAttribute(uniqueId: randomId, flags: infoFlags, acknowledged: false, correlationId: message.correlationId))
             globallyUniqueIds.append(randomId)
             
             switch message {
-                case let .message(text, requestedAttributes, mediaReference, replyToMessageId, localGroupingKey):
+                case let .message(text, requestedAttributes, mediaReference, replyToMessageId, localGroupingKey, correlationId):
                     var peerAutoremoveTimeout: Int32?
                     if let peer = peer as? TelegramSecretChat {
                         var isAction = false
@@ -495,7 +515,7 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
                     }
                     
                     storeMessages.append(StoreMessage(peerId: peerId, namespace: messageNamespace, globallyUniqueId: randomId, groupingKey: localGroupingKey, threadId: threadId, timestamp: effectiveTimestamp, flags: flags, tags: tags, globalTags: globalTags, localTags: localTags, forwardInfo: nil, authorId: authorId, text: text, attributes: attributes, media: mediaList))
-                case let .forward(source, grouping, requestedAttributes):    
+                case let .forward(source, grouping, requestedAttributes, correlationId):
                     let sourceMessage = transaction.getMessage(source)
                     if let sourceMessage = sourceMessage, let author = sourceMessage.author ?? sourceMessage.peers[sourceMessage.id.peerId] {
                         if let peer = peer as? TelegramSecretChat {
@@ -583,7 +603,7 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
                                 }
                                 
                                 if !rows.isEmpty {
-                                    attributes.append(ReplyMarkupMessageAttribute(rows: rows, flags: sourceReplyMarkup.flags))
+                                    attributes.append(ReplyMarkupMessageAttribute(rows: rows, flags: sourceReplyMarkup.flags, placeholder: sourceReplyMarkup.placeholder))
                                 }
                             }
                             
@@ -676,7 +696,7 @@ func enqueueMessages(transaction: Transaction, account: Account, peerId: PeerId,
                                     if let generatedKey = localGroupingKeyBySourceKey[groupingKey] {
                                         localGroupingKey = generatedKey
                                     } else {
-                                        let generatedKey = arc4random64()
+                                        let generatedKey = Int64.random(in: Int64.min ... Int64.max)
                                         localGroupingKeyBySourceKey[groupingKey] = generatedKey
                                         localGroupingKey = generatedKey
                                     }
diff --git a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift b/submodules/TelegramCore/Sources/PendingMessages/PendingMessageUploadedContent.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
rename to submodules/TelegramCore/Sources/PendingMessages/PendingMessageUploadedContent.swift
index 0de3aa8a3a..08dc51b7df 100644
--- a/submodules/TelegramCore/Sources/PendingMessageUploadedContent.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/PendingMessageUploadedContent.swift
@@ -374,7 +374,7 @@ private func uploadedMediaImageContent(network: Network, postbox: Postbox, trans
                                         let attribute = updatedAttributes[index] as! OutgoingMessageInfoAttribute
                                         updatedAttributes[index] = attribute.withUpdatedFlags(attribute.flags.union([.transformedMedia]))
                                     } else {
-                                        updatedAttributes.append(OutgoingMessageInfoAttribute(uniqueId: arc4random64(), flags: [.transformedMedia], acknowledged: false))
+                                        updatedAttributes.append(OutgoingMessageInfoAttribute(uniqueId: Int64.random(in: Int64.min ... Int64.max), flags: [.transformedMedia], acknowledged: false, correlationId: nil))
                                     }
                                     return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: currentMessage.tags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: updatedAttributes, media: currentMessage.media))
                                 })
@@ -664,7 +664,7 @@ private func uploadedMediaFileContent(network: Network, postbox: Postbox, auxili
                                     let attribute = updatedAttributes[index] as! OutgoingMessageInfoAttribute
                                     updatedAttributes[index] = attribute.withUpdatedFlags(attribute.flags.union([.transformedMedia]))
                                 } else {
-                                    updatedAttributes.append(OutgoingMessageInfoAttribute(uniqueId: arc4random64(), flags: [.transformedMedia], acknowledged: false))
+                                    updatedAttributes.append(OutgoingMessageInfoAttribute(uniqueId: Int64.random(in: Int64.min ... Int64.max), flags: [.transformedMedia], acknowledged: false, correlationId: nil))
                                 }
                                 return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: currentMessage.tags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: updatedAttributes, media: currentMessage.media))
                             })
diff --git a/submodules/TelegramCore/Sources/PendingUpdateMessageManager.swift b/submodules/TelegramCore/Sources/PendingMessages/PendingUpdateMessageManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/PendingUpdateMessageManager.swift
rename to submodules/TelegramCore/Sources/PendingMessages/PendingUpdateMessageManager.swift
diff --git a/submodules/TelegramCore/Sources/RequestEditMessage.swift b/submodules/TelegramCore/Sources/PendingMessages/RequestEditMessage.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/RequestEditMessage.swift
rename to submodules/TelegramCore/Sources/PendingMessages/RequestEditMessage.swift
index 69ffc23c06..a97ce331bb 100644
--- a/submodules/TelegramCore/Sources/RequestEditMessage.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/RequestEditMessage.swift
@@ -28,7 +28,7 @@ public enum RequestEditMessageError {
     case invalidGrouping
 }
 
-public func requestEditMessage(account: Account, messageId: MessageId, text: String, media: RequestEditMessageMedia, entities: TextEntitiesMessageAttribute? = nil, disableUrlPreview: Bool = false, scheduleTime: Int32? = nil) -> Signal<RequestEditMessageResult, RequestEditMessageError> {
+func _internal_requestEditMessage(account: Account, messageId: MessageId, text: String, media: RequestEditMessageMedia, entities: TextEntitiesMessageAttribute? = nil, disableUrlPreview: Bool = false, scheduleTime: Int32? = nil) -> Signal<RequestEditMessageResult, RequestEditMessageError> {
     return requestEditMessage(postbox: account.postbox, network: account.network, stateManager: account.stateManager, transformOutgoingMessageMedia: account.transformOutgoingMessageMedia, messageMediaPreuploadManager: account.messageMediaPreuploadManager, mediaReferenceRevalidationContext: account.mediaReferenceRevalidationContext, messageId: messageId, text: text, media: media, entities: entities, disableUrlPreview: disableUrlPreview, scheduleTime: scheduleTime)
 }
 
@@ -255,7 +255,7 @@ private func requestEditMessageInternal(postbox: Postbox, network: Network, stat
     }
 }
 
-public func requestEditLiveLocation(postbox: Postbox, network: Network, stateManager: AccountStateManager, messageId: MessageId, stop: Bool, coordinate: (latitude: Double, longitude: Double, accuracyRadius: Int32?)?, heading: Int32?, proximityNotificationRadius: Int32?) -> Signal<Void, NoError> {
+func _internal_requestEditLiveLocation(postbox: Postbox, network: Network, stateManager: AccountStateManager, messageId: MessageId, stop: Bool, coordinate: (latitude: Double, longitude: Double, accuracyRadius: Int32?)?, heading: Int32?, proximityNotificationRadius: Int32?) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> (Api.InputPeer, TelegramMediaMap)? in
         guard let inputPeer = transaction.getPeer(messageId.peerId).flatMap(apiInputPeer) else {
             return nil
diff --git a/submodules/TelegramCore/Sources/StandaloneSendMessage.swift b/submodules/TelegramCore/Sources/PendingMessages/StandaloneSendMessage.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/StandaloneSendMessage.swift
rename to submodules/TelegramCore/Sources/PendingMessages/StandaloneSendMessage.swift
index f43e7c9b91..bbba34b3a7 100644
--- a/submodules/TelegramCore/Sources/StandaloneSendMessage.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/StandaloneSendMessage.swift
@@ -74,7 +74,7 @@ private func sendMessageContent(account: Account, peerId: PeerId, attributes: [M
         if peerId.namespace == Namespaces.Peer.SecretChat {
             return .complete()
         } else if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
-            var uniqueId: Int64 = arc4random64()
+            var uniqueId: Int64 = Int64.random(in: Int64.min ... Int64.max)
             //var forwardSourceInfoAttribute: ForwardSourceInfoAttribute?
             var messageEntities: [Api.MessageEntity]?
             var replyMessageId: Int32?
diff --git a/submodules/TelegramCore/Sources/StandaloneUploadedMedia.swift b/submodules/TelegramCore/Sources/PendingMessages/StandaloneUploadedMedia.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/StandaloneUploadedMedia.swift
rename to submodules/TelegramCore/Sources/PendingMessages/StandaloneUploadedMedia.swift
index a704f06335..16831f3f70 100644
--- a/submodules/TelegramCore/Sources/StandaloneUploadedMedia.swift
+++ b/submodules/TelegramCore/Sources/PendingMessages/StandaloneUploadedMedia.swift
@@ -87,7 +87,7 @@ public func standaloneUploadedImage(account: Account, peerId: PeerId, text: Stri
             case let .inputSecretFile(file, _, key):
                 return account.postbox.transaction { transaction -> Api.InputEncryptedChat? in
                     if let peer = transaction.getPeer(peerId) as? TelegramSecretChat {
-                        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash)
+                        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash)
                     }
                     return nil
                 }
@@ -102,7 +102,7 @@ public func standaloneUploadedImage(account: Account, peerId: PeerId, text: Stri
                     |> mapToSignal { result -> Signal<StandaloneUploadMediaEvent, StandaloneUploadMediaError> in
                         switch result {
                             case let .encryptedFile(id, accessHash, size, dcId, _):
-                                return .single(.result(.media(.standalone(media: TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: arc4random64()), representations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: SecretFileMediaResource(fileId: id, accessHash: accessHash, containerSize: size, decryptedSize: Int32(data.count), datacenterId: Int(dcId), key: key), progressiveSizes: [])], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])))))
+                                return .single(.result(.media(.standalone(media: TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: Int64.random(in: Int64.min ... Int64.max)), representations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: SecretFileMediaResource(fileId: id, accessHash: accessHash, containerSize: size, decryptedSize: Int32(data.count), datacenterId: Int(dcId), key: key), progressiveSizes: [], immediateThumbnailData: nil)], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])))))
                             case .encryptedFileEmpty:
                                 return .fail(.generic)
                         }
@@ -181,7 +181,7 @@ public func standaloneUploadedFile(account: Account, peerId: PeerId, text: Strin
                             case let .inputSecretFile(file, _, key):
                                 return account.postbox.transaction { transaction -> Api.InputEncryptedChat? in
                                     if let peer = transaction.getPeer(peerId) as? TelegramSecretChat {
-                                        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash)
+                                        return Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash)
                                     }
                                     return nil
                                 }
@@ -195,7 +195,7 @@ public func standaloneUploadedFile(account: Account, peerId: PeerId, text: Strin
                                     |> mapToSignal { result -> Signal<StandaloneUploadMediaEvent, StandaloneUploadMediaError> in
                                         switch result {
                                             case let .encryptedFile(id, accessHash, size, dcId, _):
-                                                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: SecretFileMediaResource(fileId: id, accessHash: accessHash, containerSize: size, decryptedSize: size, datacenterId: Int(dcId), key: key), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: attributes)
+                                                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: SecretFileMediaResource(fileId: id, accessHash: accessHash, containerSize: size, decryptedSize: size, datacenterId: Int(dcId), key: key), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: attributes)
 
                                                 return .single(.result(.media(.standalone(media: media))))
                                             case .encryptedFileEmpty:
diff --git a/submodules/TelegramCore/Sources/Random.swift b/submodules/TelegramCore/Sources/Random.swift
deleted file mode 100644
index 20bf912990..0000000000
--- a/submodules/TelegramCore/Sources/Random.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-import Foundation
-
-public func arc4random64() -> Int64 {
-    var value: Int64 = 0
-    arc4random_buf(&value, 8)
-    return value
-}
diff --git a/submodules/TelegramCore/Sources/Regex.swift b/submodules/TelegramCore/Sources/Regex.swift
deleted file mode 100644
index 474e383e1f..0000000000
--- a/submodules/TelegramCore/Sources/Regex.swift
+++ /dev/null
@@ -1,33 +0,0 @@
-import Foundation
-
-public struct Regex {
-    let pattern: String
-    let options: NSRegularExpression.Options!
-    
-    private var matcher: NSRegularExpression {
-        return try! NSRegularExpression(pattern: self.pattern, options: self.options)
-    }
-    
-    public init(_ pattern: String) {
-        self.pattern = pattern
-        self.options = []
-    }
-    
-    public func match(_ string: String, options: NSRegularExpression.MatchingOptions = []) -> Bool {
-        return self.matcher.numberOfMatches(in: string, options: options, range: NSMakeRange(0, string.utf16.count)) != 0
-    }
-}
-
-public protocol RegularExpressionMatchable {
-    func match(_ regex: Regex) -> Bool
-}
-
-extension String: RegularExpressionMatchable {
-    public func match(_ regex: Regex) -> Bool {
-        return regex.match(self)
-    }
-}
-
-public func ~=<T: RegularExpressionMatchable>(pattern: Regex, matchable: T) -> Bool {
-    return matchable.match(pattern)
-}
diff --git a/submodules/TelegramCore/Sources/RequestPhoneNumber.swift b/submodules/TelegramCore/Sources/RequestPhoneNumber.swift
deleted file mode 100644
index 2842feaa2e..0000000000
--- a/submodules/TelegramCore/Sources/RequestPhoneNumber.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-
-public func requestPhoneNumber(account: Account, peerId: PeerId) -> Signal<Never, NoError> {
-    return .never()
-    /*return account.postbox.transaction { transaction -> Api.InputPeer? in
-        return transaction.getPeer(peerId).flatMap(apiInputPeer)
-    }
-    |> mapToSignal { inputPeer -> Signal<Never, NoError> in
-        guard let inputPeer = inputPeer else {
-            return .complete()
-        }
-        return account.network.request(Api.functions.messages.sendPhoneNumberRequest(peer: inputPeer, randomId: arc4random64()))
-        |> map(Optional.init)
-        |> `catch` { _ -> Signal<Api.Updates?, NoError> in
-            return .single(nil)
-        }
-        |> mapToSignal { updates -> Signal<Never, NoError> in
-            if let updates = updates {
-                account.stateManager.addUpdates(updates)
-            }
-            return .complete()
-        }
-    }*/
-}
-
diff --git a/submodules/TelegramCore/Sources/SecretChatEncryption.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatEncryption.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecretChatEncryption.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatEncryption.swift
diff --git a/submodules/TelegramCore/Sources/SecretChatEncryptionConfig.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatEncryptionConfig.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecretChatEncryptionConfig.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatEncryptionConfig.swift
diff --git a/submodules/TelegramCore/Sources/SecretChatFileReference.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatFileReference.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecretChatFileReference.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatFileReference.swift
diff --git a/submodules/TelegramCore/Sources/SecretChatIncomingEncryptedOperation.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatIncomingEncryptedOperation.swift
similarity index 60%
rename from submodules/TelegramCore/Sources/SecretChatIncomingEncryptedOperation.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatIncomingEncryptedOperation.swift
index ac842093b8..6977f48dad 100644
--- a/submodules/TelegramCore/Sources/SecretChatIncomingEncryptedOperation.swift
+++ b/submodules/TelegramCore/Sources/SecretChats/SecretChatIncomingEncryptedOperation.swift
@@ -17,9 +17,9 @@ extension SecretChatIncomingEncryptedOperation {
     convenience init(message: Api.EncryptedMessage) {
         switch message {
             case let .encryptedMessage(randomId, chatId, date, bytes, file):
-                self.init(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId), globallyUniqueId: randomId, timestamp: date, type: .message, keyFingerprint: keyFingerprintFromBytes(bytes), contents: MemoryBuffer(bytes), mediaFileReference: SecretChatFileReference(file))
+                self.init(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId)), globallyUniqueId: randomId, timestamp: date, type: .message, keyFingerprint: keyFingerprintFromBytes(bytes), contents: MemoryBuffer(bytes), mediaFileReference: SecretChatFileReference(file))
             case let .encryptedMessageService(randomId, chatId, date, bytes):
-                self.init(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId), globallyUniqueId: randomId, timestamp: date, type: .service, keyFingerprint: keyFingerprintFromBytes(bytes), contents: MemoryBuffer(bytes), mediaFileReference: nil)
+                self.init(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId)), globallyUniqueId: randomId, timestamp: date, type: .service, keyFingerprint: keyFingerprintFromBytes(bytes), contents: MemoryBuffer(bytes), mediaFileReference: nil)
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/SecretChatLayerNegotiation.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatLayerNegotiation.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/SecretChatLayerNegotiation.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatLayerNegotiation.swift
index ed5c0fbad3..474b62523c 100644
--- a/submodules/TelegramCore/Sources/SecretChatLayerNegotiation.swift
+++ b/submodules/TelegramCore/Sources/SecretChats/SecretChatLayerNegotiation.swift
@@ -23,11 +23,11 @@ func secretChatAddReportCurrentLayerSupportOperationAndUpdateRequestedLayer(tran
     switch state.embeddedState {
         case .basicLayer:
             var updatedState = state
-            updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer8, actionGloballyUniqueId: arc4random64(), layerSupport: topSupportedLayer.rawValue), state: updatedState)
+            updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer8, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: topSupportedLayer.rawValue), state: updatedState)
             return updatedState
         case let .sequenceBasedLayer(sequenceState):
             var updatedState = state
-            updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: sequenceState.layerNegotiationState.activeLayer.secretChatLayer, actionGloballyUniqueId: arc4random64(), layerSupport: topSupportedLayer.rawValue), state: updatedState)
+            updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: sequenceState.layerNegotiationState.activeLayer.secretChatLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: topSupportedLayer.rawValue), state: updatedState)
             updatedState =  updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceState.withUpdatedLayerNegotiationState(sequenceState.layerNegotiationState.withUpdatedLocallyRequestedLayer(topSupportedLayer.rawValue))))
             return updatedState
         default:
diff --git a/submodules/TelegramCore/Sources/SecretChatOutgoingOperation.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatOutgoingOperation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecretChatOutgoingOperation.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatOutgoingOperation.swift
diff --git a/submodules/TelegramCore/Sources/SecretChatRekeySession.swift b/submodules/TelegramCore/Sources/SecretChats/SecretChatRekeySession.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/SecretChatRekeySession.swift
rename to submodules/TelegramCore/Sources/SecretChats/SecretChatRekeySession.swift
index d48e08b32f..d6feff50bf 100644
--- a/submodules/TelegramCore/Sources/SecretChatRekeySession.swift
+++ b/submodules/TelegramCore/Sources/SecretChats/SecretChatRekeySession.swift
@@ -16,12 +16,12 @@ func secretChatInitiateRekeySessionIfNeeded(transaction: Transaction, peerId: Pe
             let tagLocalIndex = transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing)
             let canonicalIndex = sequenceState.canonicalOutgoingOperationIndex(tagLocalIndex)
             if let key = state.keychain.latestKey(validForSequenceBasedCanonicalIndex: canonicalIndex), key.useCount >= keyUseCountThreshold {
-                let sessionId = arc4random64()
+                let sessionId = Int64.random(in: Int64.min ... Int64.max)
                 let aBytes = malloc(256)!
                 let _ = SecRandomCopyBytes(nil, 256, aBytes.assumingMemoryBound(to: UInt8.self))
                 let a = MemoryBuffer(memory: aBytes, capacity: 256, length: 256, freeWhenDone: true)
                 
-                transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsRequestKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: arc4random64(), rekeySessionId: sessionId, a: a), mutable: true, delivered: false))
+                transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsRequestKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), rekeySessionId: sessionId, a: a), mutable: true, delivered: false))
                 return state.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceState.withUpdatedRekeyState(SecretChatRekeySessionState(id: sessionId, data: .requesting))))
             }
         default:
@@ -69,7 +69,7 @@ func secretChatAdvanceRekeySessionIfNeeded(encryptionProvider: EncryptionProvide
                         
                         assert(remoteKeyFingerprint == keyFingerprint)
                         
-                        transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsCommitKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: arc4random64(), rekeySessionId: rekeySession.id, keyFingerprint: keyFingerprint), mutable: true, delivered: false))
+                        transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsCommitKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), rekeySessionId: rekeySession.id, keyFingerprint: keyFingerprint), mutable: true, delivered: false))
                         
                         let keyValidityOperationIndex = transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing)
                         let keyValidityOperationCanonicalIndex = sequenceState.canonicalOutgoingOperationIndex(keyValidityOperationIndex)
@@ -92,7 +92,7 @@ func secretChatAdvanceRekeySessionIfNeeded(encryptionProvider: EncryptionProvide
                         return SecretChatKey(fingerprint: keyFingerprint, key: key, validity: .sequenceBasedIndexRange(fromCanonicalIndex: keyValidityOperationCanonicalIndex), useCount: 0)
                     }))
                     
-                    transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .noop(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: arc4random64()), mutable: true, delivered: false))
+                    transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .noop(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max)), mutable: true, delivered: false))
                     
                     return updatedState
                 } else {
@@ -107,7 +107,7 @@ func secretChatAdvanceRekeySessionIfNeeded(encryptionProvider: EncryptionProvide
                 switch rekeySession.data {
                     case .requesting, .requested:
                         if rekeySessionId < rekeySession.id {
-                            transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsAbortSession(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: arc4random64(), rekeySessionId: rekeySession.id), mutable: true, delivered: false))
+                            transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsAbortSession(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), rekeySessionId: rekeySession.id), mutable: true, delivered: false))
                         } else {
                             acceptSession = false
                         }
@@ -123,7 +123,7 @@ func secretChatAdvanceRekeySessionIfNeeded(encryptionProvider: EncryptionProvide
                 
                 let rekeySession = SecretChatRekeySessionState(id: rekeySessionId, data: .accepting)
                 
-                transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsAcceptKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: arc4random64(), rekeySessionId: rekeySession.id, gA: gA, b: b), mutable: true, delivered: false))
+                transaction.operationLogAddEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SecretChatOutgoingOperation(contents: .pfsAcceptKey(layer: sequenceState.layerNegotiationState.activeLayer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), rekeySessionId: rekeySession.id, gA: gA, b: b), mutable: true, delivered: false))
                 return state.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceState.withUpdatedRekeyState(rekeySession)))
             }
         }
diff --git a/submodules/TelegramCore/Sources/SetSecretChatMessageAutoremoveTimeoutInteractively.swift b/submodules/TelegramCore/Sources/SecretChats/SetSecretChatMessageAutoremoveTimeoutInteractively.swift
similarity index 82%
rename from submodules/TelegramCore/Sources/SetSecretChatMessageAutoremoveTimeoutInteractively.swift
rename to submodules/TelegramCore/Sources/SecretChats/SetSecretChatMessageAutoremoveTimeoutInteractively.swift
index eb1473f89c..8dba9e3b3c 100644
--- a/submodules/TelegramCore/Sources/SetSecretChatMessageAutoremoveTimeoutInteractively.swift
+++ b/submodules/TelegramCore/Sources/SecretChats/SetSecretChatMessageAutoremoveTimeoutInteractively.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func setSecretChatMessageAutoremoveTimeoutInteractively(account: Account, peerId: PeerId, timeout: Int32?) -> Signal<Void, NoError> {
+func _internal_setSecretChatMessageAutoremoveTimeoutInteractively(account: Account, peerId: PeerId, timeout: Int32?) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         if let peer = transaction.getPeer(peerId) as? TelegramSecretChat, let state = transaction.getPeerChatState(peerId) as? SecretChatState {
             if state.messageAutoremoveTimeout != timeout {
@@ -17,13 +17,13 @@ public func setSecretChatMessageAutoremoveTimeoutInteractively(account: Account,
                     transaction.setPeerChatState(peerId, state: updatedState)
                 }
                 
-                let _ = enqueueMessages(transaction: transaction, account: account, peerId: peerId, messages: [(true, .message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.messageAutoremoveTimeoutUpdated(timeout == nil ? 0 : timeout!))), replyToMessageId: nil, localGroupingKey: nil))])
+                let _ = enqueueMessages(transaction: transaction, account: account, peerId: peerId, messages: [(true, .message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.messageAutoremoveTimeoutUpdated(timeout == nil ? 0 : timeout!))), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))])
             }
         }
     }
 }
 
-public func addSecretChatMessageScreenshot(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_addSecretChatMessageScreenshot(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         if let _ = transaction.getPeer(peerId) as? TelegramSecretChat, let state = transaction.getPeerChatState(peerId) as? SecretChatState {
             switch state.embeddedState {
@@ -32,7 +32,7 @@ public func addSecretChatMessageScreenshot(account: Account, peerId: PeerId) ->
             default:
                 break
             }
-            let _ = enqueueMessages(transaction: transaction, account: account, peerId: peerId, messages: [(true, .message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil))])
+            let _ = enqueueMessages(transaction: transaction, account: account, peerId: peerId, messages: [(true, .message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaAction(action: TelegramMediaActionType.historyScreenshot)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))])
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/UpdateSecretChat.swift b/submodules/TelegramCore/Sources/SecretChats/UpdateSecretChat.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/UpdateSecretChat.swift
rename to submodules/TelegramCore/Sources/SecretChats/UpdateSecretChat.swift
index 1ddf64698a..b3bcc86e9f 100644
--- a/submodules/TelegramCore/Sources/UpdateSecretChat.swift
+++ b/submodules/TelegramCore/Sources/SecretChats/UpdateSecretChat.swift
@@ -19,7 +19,7 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
     assert((currentPeer == nil) == (currentState == nil))
     switch chat {
         case let .encryptedChat(_, _, _, adminId, _, gAOrB, remoteKeyFingerprint):
-            if let currentPeer = currentPeer, let currentState = currentState, adminId == accountPeerId.id {
+            if let currentPeer = currentPeer, let currentState = currentState, adminId == accountPeerId.id._internalGetInt32Value() {
                 if case let .handshake(handshakeState) = currentState.embeddedState, case let .requested(_, p, a) = handshakeState {
                     let pData = p.makeData()
                     let aData = a.makeData()
@@ -50,7 +50,7 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
                     
                     var updatedState = currentState
                     updatedState = updatedState.withUpdatedKeychain(SecretChatKeychain(keys: [SecretChatKey(fingerprint: keyFingerprint, key: MemoryBuffer(data: key), validity: .indefinite, useCount: 0)]))
-                    updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer46, locallyRequestedLayer: nil, remotelyRequestedLayer: nil), rekeyState: nil, baseIncomingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: currentPeer.id, tag: OperationLogTags.SecretIncomingDecrypted), baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: currentPeer.id, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)))
+                    updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer73, locallyRequestedLayer: nil, remotelyRequestedLayer: nil), rekeyState: nil, baseIncomingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: currentPeer.id, tag: OperationLogTags.SecretIncomingDecrypted), baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: currentPeer.id, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)))
                     
                     updatedState = updatedState.withUpdatedKeyFingerprint(SecretChatKeyFingerprint(sha1: SecretChatKeySha1Fingerprint(digest: sha1Digest(key)), sha256: SecretChatKeySha256Fingerprint(digest: sha256Digest(key))))
                     
@@ -78,7 +78,7 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
                 
                 if isRemoved {
                     let peerId = currentPeer.id
-                    clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
+                    _internal_clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
                     transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
                     transaction.removeOrderedItemListItem(collectionId: Namespaces.OrderedItemList.RecentlySearchedPeerIds, itemId: RecentPeerItemId(peerId).rawValue)
                 }
@@ -88,7 +88,7 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
         case .encryptedChatEmpty(_):
             break
         case let .encryptedChatRequested(_, folderId, _, accessHash, date, adminId, participantId, gA):
-            if currentPeer == nil && participantId == accountPeerId.id {
+            if currentPeer == nil && participantId == accountPeerId.id._internalGetInt32Value() {
                 if settings.acceptOnThisDevice {
                     let state = SecretChatState(role: .participant, embeddedState: .handshake(.accepting), keychain: SecretChatKeychain(keys: []), keyFingerprint: nil, messageAutoremoveTimeout: nil)
                     
@@ -99,7 +99,7 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
                         let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: chat.peerId, operation: .initialHandshakeAccept(gA: MemoryBuffer(gA), accessHash: accessHash, b: b), state: state)
                         transaction.setPeerChatState(chat.peerId, state: updatedState)
                         
-                        let peer = TelegramSecretChat(id: chat.peerId, creationDate: date, regularPeerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: adminId), accessHash: accessHash, role: updatedState.role, embeddedState: updatedState.embeddedState.peerState, messageAutoremoveTimeout: nil)
+                        let peer = TelegramSecretChat(id: chat.peerId, creationDate: date, regularPeerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(adminId)), accessHash: accessHash, role: updatedState.role, embeddedState: updatedState.embeddedState.peerState, messageAutoremoveTimeout: nil)
                         updatePeers(transaction: transaction, peers: [peer], update: { _, updated in return updated })
                         if folderId != nil {
                             transaction.updatePeerChatListInclusion(peer.id, inclusion: .ifHasMessagesOrOneOf(groupId: Namespaces.PeerGroup.archive, pinningIndex: nil, minTimestamp: date))
@@ -122,9 +122,9 @@ func updateSecretChat(encryptionProvider: EncryptionProvider, accountPeerId: Pee
                 Logger.shared.log("State", "got encryptedChatRequested, but peer already exists or this account is creator")
             }
         case let .encryptedChatWaiting(_, accessHash, date, adminId, participantId):
-            if let requestData = requestData, currentPeer == nil && adminId == accountPeerId.id {
+            if let requestData = requestData, currentPeer == nil && adminId == accountPeerId.id._internalGetInt32Value() {
                 let state = SecretChatState(role: .creator, embeddedState: .handshake(.requested(g: requestData.g, p: requestData.p, a: requestData.a)), keychain: SecretChatKeychain(keys: []), keyFingerprint: nil, messageAutoremoveTimeout: nil)
-                let peer = TelegramSecretChat(id: chat.peerId, creationDate: date, regularPeerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: participantId), accessHash: accessHash, role: state.role, embeddedState: state.embeddedState.peerState, messageAutoremoveTimeout: nil)
+                let peer = TelegramSecretChat(id: chat.peerId, creationDate: date, regularPeerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(participantId)), accessHash: accessHash, role: state.role, embeddedState: state.embeddedState.peerState, messageAutoremoveTimeout: nil)
                 updatePeers(transaction: transaction, peers: [peer], update: { _, updated in return updated })
                 transaction.setPeerChatState(peer.id, state: state)
                 transaction.resetIncomingReadStates([peer.id: [
diff --git a/submodules/TelegramCore/Sources/AutodownloadSettings.swift b/submodules/TelegramCore/Sources/Settings/AutodownloadSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/AutodownloadSettings.swift
rename to submodules/TelegramCore/Sources/Settings/AutodownloadSettings.swift
diff --git a/submodules/TelegramCore/Sources/CacheStorageSettings.swift b/submodules/TelegramCore/Sources/Settings/CacheStorageSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CacheStorageSettings.swift
rename to submodules/TelegramCore/Sources/Settings/CacheStorageSettings.swift
diff --git a/submodules/TelegramCore/Sources/ContentPrivacySettings.swift b/submodules/TelegramCore/Sources/Settings/ContentPrivacySettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ContentPrivacySettings.swift
rename to submodules/TelegramCore/Sources/Settings/ContentPrivacySettings.swift
diff --git a/submodules/TelegramCore/Sources/ContentSettings.swift b/submodules/TelegramCore/Sources/Settings/ContentSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ContentSettings.swift
rename to submodules/TelegramCore/Sources/Settings/ContentSettings.swift
diff --git a/submodules/TelegramCore/Sources/GlobalNotificationSettings.swift b/submodules/TelegramCore/Sources/Settings/GlobalNotificationSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/GlobalNotificationSettings.swift
rename to submodules/TelegramCore/Sources/Settings/GlobalNotificationSettings.swift
diff --git a/submodules/TelegramCore/Sources/LimitsConfiguration.swift b/submodules/TelegramCore/Sources/Settings/LimitsConfiguration.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/LimitsConfiguration.swift
rename to submodules/TelegramCore/Sources/Settings/LimitsConfiguration.swift
diff --git a/submodules/TelegramCore/Sources/LoggingSettings.swift b/submodules/TelegramCore/Sources/Settings/LoggingSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/LoggingSettings.swift
rename to submodules/TelegramCore/Sources/Settings/LoggingSettings.swift
diff --git a/submodules/TelegramCore/Sources/NetworkSettings.swift b/submodules/TelegramCore/Sources/Settings/NetworkSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/NetworkSettings.swift
rename to submodules/TelegramCore/Sources/Settings/NetworkSettings.swift
diff --git a/submodules/TelegramCore/Sources/PeerContactSettings.swift b/submodules/TelegramCore/Sources/Settings/PeerContactSettings.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/PeerContactSettings.swift
rename to submodules/TelegramCore/Sources/Settings/PeerContactSettings.swift
index 6bc742bd87..d2ac0d1a85 100644
--- a/submodules/TelegramCore/Sources/PeerContactSettings.swift
+++ b/submodules/TelegramCore/Sources/Settings/PeerContactSettings.swift
@@ -65,5 +65,5 @@ public func unarchiveAutomaticallyArchivedPeer(account: Account, peerId: PeerId)
     }
     |> deliverOnMainQueue).start()
     
-    let _ = updatePeerMuteSetting(account: account, peerId: peerId, muteInterval: nil).start()
+    let _ = _internal_updatePeerMuteSetting(account: account, peerId: peerId, muteInterval: nil).start()
 }
diff --git a/submodules/TelegramCore/Sources/PrivacySettings.swift b/submodules/TelegramCore/Sources/Settings/PrivacySettings.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/PrivacySettings.swift
rename to submodules/TelegramCore/Sources/Settings/PrivacySettings.swift
index 0ad2eade68..3f44df44b3 100644
--- a/submodules/TelegramCore/Sources/PrivacySettings.swift
+++ b/submodules/TelegramCore/Sources/Settings/PrivacySettings.swift
@@ -162,7 +162,7 @@ extension SelectivePrivacySettings {
                     current = .enableContacts(enableFor: [:], disableFor: [:])
                 case let .privacyValueAllowUsers(users):
                     for id in users {
-                        if let peer = peers[PeerId(namespace: Namespaces.Peer.CloudUser, id: id)] {
+                        if let peer = peers[PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))] {
                             enableFor[peer.peer.id] = peer
                         }
                     }
@@ -172,13 +172,13 @@ extension SelectivePrivacySettings {
                     break
                 case let .privacyValueDisallowUsers(users):
                     for id in users {
-                        if let peer = peers[PeerId(namespace: Namespaces.Peer.CloudUser, id: id)] {
+                        if let peer = peers[PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))] {
                             disableFor[peer.peer.id] = peer
                         }
                     }
                 case let .privacyValueAllowChatParticipants(chats):
                     for id in chats {
-                        for possibleId in [PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), PeerId(namespace: Namespaces.Peer.CloudChannel, id: id)] {
+                        for possibleId in [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id)), PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id))] {
                             if let peer = peers[possibleId] {
                                 enableFor[peer.peer.id] = peer
                             }
@@ -186,7 +186,7 @@ extension SelectivePrivacySettings {
                     }
                 case let .privacyValueDisallowChatParticipants(chats):
                     for id in chats {
-                        for possibleId in [PeerId(namespace: Namespaces.Peer.CloudGroup, id: id), PeerId(namespace: Namespaces.Peer.CloudChannel, id: id)] {
+                        for possibleId in [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id)), PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id))] {
                             if let peer = peers[possibleId] {
                                 disableFor[peer.peer.id] = peer
                             }
diff --git a/submodules/TelegramCore/Sources/ProxySettings.swift b/submodules/TelegramCore/Sources/Settings/ProxySettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ProxySettings.swift
rename to submodules/TelegramCore/Sources/Settings/ProxySettings.swift
diff --git a/submodules/TelegramCore/Sources/VoipConfiguration.swift b/submodules/TelegramCore/Sources/Settings/VoipConfiguration.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/VoipConfiguration.swift
rename to submodules/TelegramCore/Sources/Settings/VoipConfiguration.swift
diff --git a/submodules/TelegramCore/Sources/SingleMessageView.swift b/submodules/TelegramCore/Sources/SingleMessageView.swift
deleted file mode 100644
index 203daf6bce..0000000000
--- a/submodules/TelegramCore/Sources/SingleMessageView.swift
+++ /dev/null
@@ -1,105 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-import MtProtoKit
-
-import SyncCore
-
-public func singleMessageView(account: Account, messageId: MessageId, loadIfNotExists: Bool) -> Signal<MessageView, NoError> {
-    return Signal { subscriber in
-        let loadedMessage = account.postbox.transaction { transaction -> Signal<Void, NoError> in
-            if transaction.getMessage(messageId) == nil, loadIfNotExists {
-                return fetchMessage(transaction: transaction, account: account, messageId: messageId)
-            } else {
-                return .complete()
-            }
-        } |> switchToLatest
-        
-        let disposable = loadedMessage.start()
-        let viewDisposable = account.postbox.messageView(messageId).start(next: { view in
-            subscriber.putNext(view)
-        })
-        
-        return ActionDisposable {
-            disposable.dispose()
-            viewDisposable.dispose()
-        }
-    }
-}
-
-private func fetchMessage(transaction: Transaction, account: Account, messageId: MessageId) -> Signal<Void, NoError> {
-    if let peer = transaction.getPeer(messageId.peerId) {
-        var signal: Signal<Api.messages.Messages, MTRpcError>?
-        if messageId.namespace == Namespaces.Message.ScheduledCloud {
-            if let inputPeer = apiInputPeer(peer) {
-                signal = account.network.request(Api.functions.messages.getScheduledMessages(peer: inputPeer, id: [messageId.id]))
-            }
-        } else if messageId.peerId.namespace == Namespaces.Peer.CloudUser || messageId.peerId.namespace == Namespaces.Peer.CloudGroup {
-            signal = account.network.request(Api.functions.messages.getMessages(id: [Api.InputMessage.inputMessageID(id: messageId.id)]))
-        } else if messageId.peerId.namespace == Namespaces.Peer.CloudChannel {
-            if let inputChannel = apiInputChannel(peer) {
-                signal = account.network.request(Api.functions.channels.getMessages(channel: inputChannel, id: [Api.InputMessage.inputMessageID(id: messageId.id)]))
-            }
-        }
-        if let signal = signal {
-            return signal
-                |> `catch` { _ -> Signal<Api.messages.Messages, NoError> in
-                    return .single(.messages(messages: [], chats: [], users: []))
-                }
-                |> mapToSignal { result -> Signal<Void, NoError> in
-                    return account.postbox.transaction { transaction -> Void in
-                        let apiMessages: [Api.Message]
-                        let apiChats: [Api.Chat]
-                        let apiUsers: [Api.User]
-                        switch result {
-                            case let .messages(messages, chats, users):
-                                apiMessages = messages
-                                apiChats = chats
-                                apiUsers = users
-                            case let .messagesSlice(_, _, _, _, messages, chats, users):
-                                apiMessages = messages
-                                apiChats = chats
-                                apiUsers = users
-                            case let .channelMessages(_, _, _, _, messages, chats, users):
-                                apiMessages = messages
-                                apiChats = chats
-                                apiUsers = users
-                            case .messagesNotModified:
-                                apiMessages = []
-                                apiChats = []
-                                apiUsers = []
-                        }
-                        
-                        var peers: [PeerId: Peer] = [:]
-                        
-                        for user in apiUsers {
-                            if let user = TelegramUser.merge(transaction.getPeer(user.peerId) as? TelegramUser, rhs: user) {
-                                peers[user.id] = user
-                            }
-                        }
-                        
-                        for chat in apiChats {
-                            if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) {
-                                peers[groupOrChannel.id] = groupOrChannel
-                            }
-                        }
-                        
-                        updatePeers(transaction: transaction, peers: Array(peers.values), update: { _, updated in
-                            return updated
-                        })
-                        
-                        for message in apiMessages {
-                            if let message = StoreMessage(apiMessage: message, namespace: messageId.namespace) {
-                                let _ = transaction.addMessages([message], location: .Random)
-                            }
-                        }
-                    }
-                }
-        } else {
-            return .complete()
-        }
-    } else {
-        return .complete()
-    }
-}
diff --git a/submodules/TelegramCore/Sources/AccountState.swift b/submodules/TelegramCore/Sources/State/AccountState.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/AccountState.swift
rename to submodules/TelegramCore/Sources/State/AccountState.swift
diff --git a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
rename to submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
index bf4ddea375..5004e5bb9d 100644
--- a/submodules/TelegramCore/Sources/AccountStateManagementUtils.swift
+++ b/submodules/TelegramCore/Sources/State/AccountStateManagementUtils.swift
@@ -23,7 +23,7 @@ private func peerIdsFromUpdateGroups(_ groups: [UpdateGroup]) -> Set<PeerId> {
         }
         switch group {
             case let .updateChannelPts(channelId, _, _):
-                peerIds.insert(PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId))
+                peerIds.insert(PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)))
             default:
                 break
         }
@@ -77,7 +77,7 @@ private func peerIdsRequiringLocalChatStateFromUpdates(_ updates: [Api.Update])
         }
         switch update {
             case let .updateChannelTooLong(_, channelId, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 peerIds.insert(peerId)
             case let .updateFolderPeers(folderPeers, _, _):
                 for peer in folderPeers {
@@ -87,7 +87,7 @@ private func peerIdsRequiringLocalChatStateFromUpdates(_ updates: [Api.Update])
                     }
                 }
             case let .updateReadChannelInbox(_, _, channelId, _, _, _):
-                peerIds.insert(PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId))
+                peerIds.insert(PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)))
             case let .updateReadHistoryInbox(_, _, peer, _, _, _, _):
                 peerIds.insert(peer.peerId)
             case let .updateDraftMessage(peer, draft):
@@ -109,16 +109,25 @@ private func peerIdsRequiringLocalChatStateFromUpdateGroups(_ groups: [UpdateGro
     
     for group in groups {
         peerIds.formUnion(peerIdsRequiringLocalChatStateFromUpdates(group.updates))
-        
-        /*for chat in group.chats {
-            if let channel = parseTelegramGroupOrChannel(chat: chat) as? TelegramChannel {
+
+        var channelUpdates = Set<PeerId>()
+        for update in group.updates {
+            switch update {
+            case let .updateChannel(channelId):
+                channelUpdates.insert(PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)))
+            default:
+                break
+            }
+        }
+        for chat in group.chats {
+            if let channel = parseTelegramGroupOrChannel(chat: chat) as? TelegramChannel, channelUpdates.contains(channel.id) {
                 if let accessHash = channel.accessHash, case .personal = accessHash {
                     if case .member = channel.participationStatus {
                         peerIds.insert(channel.id)
                     }
                 }
             }
-        }*/
+        }
         
         switch group {
         case let .ensurePeerHasLocalState(peerId):
@@ -138,7 +147,7 @@ private func locallyGeneratedMessageTimestampsFromUpdateGroups(_ groups: [Update
             switch update {
                 case let .updateServiceNotification(_, date, _, _, _, _):
                     if let date = date {
-                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000)
+                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000))
                         if messageTimestamps[peerId] == nil {
                             messageTimestamps[peerId] = [(Namespaces.Message.Local, date)]
                         } else {
@@ -294,7 +303,7 @@ private func peerIdsRequiringLocalChatStateFromDifference(_ difference: Api.upda
                 }
                 switch update {
                     case let .updateChannelTooLong(_, channelId, _):
-                        let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         peerIds.insert(peerId)
                     default:
                         break
@@ -316,7 +325,7 @@ private func peerIdsRequiringLocalChatStateFromDifference(_ difference: Api.upda
                 }
                 switch update {
                     case let .updateChannelTooLong(_, channelId, _):
-                        let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         peerIds.insert(peerId)
                     default:
                         break
@@ -349,7 +358,7 @@ private func locallyGeneratedMessageTimestampsFromDifference(_ difference: Api.u
             switch update {
                 case let .updateServiceNotification(_, date, _, _, _, _):
                     if let date = date {
-                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000)
+                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000))
                         if messageTimestamps[peerId] == nil {
                             messageTimestamps[peerId] = [(Namespaces.Message.Local, date)]
                         } else {
@@ -675,21 +684,21 @@ private func sortedUpdates(_ updates: [Api.Update]) -> [Api.Update] {
     for update in updates {
         switch update {
             case let .updateChannelTooLong(_, channelId, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if updatesByChannel[peerId] == nil {
                     updatesByChannel[peerId] = [update]
                 } else {
                     updatesByChannel[peerId]!.append(update)
                 }
             case let .updateDeleteChannelMessages(channelId, _, _, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if updatesByChannel[peerId] == nil {
                     updatesByChannel[peerId] = [update]
                 } else {
                     updatesByChannel[peerId]!.append(update)
                 }
             case let .updatePinnedChannelMessages(_, channelId, _, _, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if updatesByChannel[peerId] == nil {
                     updatesByChannel[peerId] = [update]
                 } else {
@@ -716,14 +725,14 @@ private func sortedUpdates(_ updates: [Api.Update]) -> [Api.Update] {
                     otherUpdates.append(update)
                 }
             case let .updateChannelWebPage(channelId, _, _, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if updatesByChannel[peerId] == nil {
                     updatesByChannel[peerId] = [update]
                 } else {
                     updatesByChannel[peerId]!.append(update)
                 }
             case let .updateChannelAvailableMessages(channelId, _):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if updatesByChannel[peerId] == nil {
                     updatesByChannel[peerId] = [update]
                 } else {
@@ -808,7 +817,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
     for update in sortedUpdates(updates) {
         switch update {
             case let .updateChannelTooLong(_, channelId, channelPts):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if !channelsToPoll.contains(peerId) {
                     if let channelPts = channelPts, let channelState = state.channelStates[peerId], channelState.pts >= channelPts {
                         Logger.shared.log("State", "channel \(peerId) (\((updatedState.peers[peerId] as? TelegramChannel)?.title ?? "nil")) skip updateChannelTooLong by pts")
@@ -817,7 +826,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 }
             case let .updateDeleteChannelMessages(channelId, messages, pts: pts, ptsCount):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if let previousState = updatedState.channelStates[peerId] {
                     if previousState.pts >= pts {
                         Logger.shared.log("State", "channel \(peerId) (\((updatedState.peers[peerId] as? TelegramChannel)?.title ?? "nil")) skip old delete update")
@@ -868,7 +877,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     Logger.shared.log("State", "Invalid updateEditChannelMessage")
                 }
             case let .updateChannelWebPage(channelId, apiWebpage, pts, ptsCount):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if let previousState = updatedState.channelStates[peerId] {
                     if previousState.pts >= pts {
                     } else if previousState.pts + ptsCount == pts {
@@ -894,7 +903,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 }
             case let .updateChannelAvailableMessages(channelId, minId):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 updatedState.updateMinAvailableMessage(MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: minId))
             case let .updateDeleteMessages(messages, _, _):
                 updatedState.deleteMessagesWithGlobalIds(messages)
@@ -971,7 +980,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                 if popup {
                     updatedState.addDisplayAlert(text, isDropAuth: type.hasPrefix("AUTH_KEY_DROP_"))
                 } else if let date = date {
-                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000)
+                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000))
                     
                     if updatedState.peers[peerId] == nil {
                         updatedState.updatePeer(peerId, { peer in
@@ -1020,13 +1029,13 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 }
             case let .updateReadChannelInbox(_, folderId, channelId, maxId, stillUnreadCount, pts):
-                updatedState.resetIncomingReadState(groupId: PeerGroupId(rawValue: folderId ?? 0), peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, maxIncomingReadId: maxId, count: stillUnreadCount, pts: pts)
+                updatedState.resetIncomingReadState(groupId: PeerGroupId(rawValue: folderId ?? 0), peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, maxIncomingReadId: maxId, count: stillUnreadCount, pts: pts)
             case let .updateReadChannelOutbox(channelId, maxId):
-                updatedState.readOutbox(MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: maxId), timestamp: nil)
+                updatedState.readOutbox(MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, id: maxId), timestamp: nil)
             case let .updateChannel(channelId):
-                updatedState.addExternallyUpdatedPeerId(PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId))
+                updatedState.addExternallyUpdatedPeerId(PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)))
             case let .updateChat(chatId):
-                updatedState.addExternallyUpdatedPeerId(PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId))
+                updatedState.addExternallyUpdatedPeerId(PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)))
             case let .updateReadHistoryInbox(_, folderId, peer, maxId, stillUnreadCount, pts, _):
                 updatedState.resetIncomingReadState(groupId: PeerGroupId(rawValue: folderId ?? 0), peerId: peer.peerId, namespace: Namespaces.Message.Cloud, maxIncomingReadId: maxId, count: stillUnreadCount, pts: pts)
             case let .updateReadHistoryOutbox(peer, maxId, _, _):
@@ -1034,11 +1043,11 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
             case let .updateReadChannelDiscussionInbox(_, channelId, topMsgId, readMaxId, mainChannelId, mainChannelPost):
                 var mainChannelMessage: MessageId?
                 if let mainChannelId = mainChannelId, let mainChannelPost = mainChannelPost {
-                    mainChannelMessage = MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: mainChannelId), namespace: Namespaces.Message.Cloud, id: mainChannelPost)
+                    mainChannelMessage = MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(mainChannelId)), namespace: Namespaces.Message.Cloud, id: mainChannelPost)
                 }
-                updatedState.readThread(threadMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: topMsgId), readMaxId: readMaxId, isIncoming: true, mainChannelMessage: mainChannelMessage)
+                updatedState.readThread(threadMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, id: topMsgId), readMaxId: readMaxId, isIncoming: true, mainChannelMessage: mainChannelMessage)
             case let .updateReadChannelDiscussionOutbox(channelId, topMsgId, readMaxId):
-                updatedState.readThread(threadMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: topMsgId), readMaxId: readMaxId, isIncoming: false, mainChannelMessage: nil)
+                updatedState.readThread(threadMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, id: topMsgId), readMaxId: readMaxId, isIncoming: false, mainChannelMessage: nil)
             case let .updateDialogUnreadMark(flags, peer):
                 switch peer {
                     case let .dialogPeer(peer):
@@ -1072,9 +1081,9 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                 let groupPeerId: PeerId
                 switch participants {
                     case let .chatParticipants(chatId, _, _):
-                        groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                     case let .chatParticipantsForbidden(_, chatId, _):
-                        groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                 }
                 updatedState.updateCachedPeerData(groupPeerId, { current in
                     let previous: CachedGroupData
@@ -1086,9 +1095,9 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     return previous.withUpdatedParticipants(CachedGroupParticipants(apiParticipants: participants))
                 })
             case let .updateChatParticipantAdd(chatId, userId, inviterId, date, _):
-                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                let inviterPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId)
+                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
+                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
+                let inviterPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId))
                 updatedState.updateCachedPeerData(groupPeerId, { current in
                     if let current = current as? CachedGroupData, let participants = current.participants {
                         var updatedParticipants = participants.participants
@@ -1101,8 +1110,8 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 })
             case let .updateChatParticipantDelete(chatId, userId, _):
-                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
+                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                 updatedState.updateCachedPeerData(groupPeerId, { current in
                     if let current = current as? CachedGroupData, let participants = current.participants {
                         var updatedParticipants = participants.participants
@@ -1115,8 +1124,8 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 })
             case let .updateChatParticipantAdmin(chatId, userId, isAdmin, _):
-                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                let groupPeerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
+                let userPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                 updatedState.updateCachedPeerData(groupPeerId, { current in
                     if let current = current as? CachedGroupData, let participants = current.participants {
                         var updatedParticipants = participants.participants
@@ -1147,12 +1156,12 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 })
             case let .updatePinnedChannelMessages(flags, channelId, messages, pts, ptsCount):
-                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                let peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 if let previousState = updatedState.channelStates[peerId] {
                     if previousState.pts >= pts {
                         Logger.shared.log("State", "channel \(peerId) (\((updatedState.peers[peerId] as? TelegramChannel)?.title ?? "nil")) skip old pinned messages update")
                     } else if previousState.pts + ptsCount == pts {
-                        let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         updatedState.updateMessagesPinned(ids: messages.map { id in
                             MessageId(peerId: channelPeerId, namespace: Namespaces.Message.Cloud, id: id)
                         }, pinned: (flags & (1 << 0)) != 0)
@@ -1181,10 +1190,10 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     return previous.withUpdatedIsBlocked(blocked == .boolTrue)
                 })
             case let .updateUserStatus(userId, status):
-                updatedState.mergePeerPresences([PeerId(namespace: Namespaces.Peer.CloudUser, id: userId): status], explicit: true)
+                updatedState.mergePeerPresences([PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)): status], explicit: true)
             case let .updateUserName(userId, firstName, lastName, username):
                 //TODO add contact checking for apply first and last name
-                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), { peer in
+                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), { peer in
                     if let user = peer as? TelegramUser {
                         return user.withUpdatedUsername(username)
                     } else {
@@ -1192,7 +1201,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 })
             case let .updateUserPhoto(userId, _, photo, _):
-                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), { peer in
+                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), { peer in
                     if let user = peer as? TelegramUser {
                         return user.withUpdatedPhoto(parsedTelegramProfilePhoto(photo))
                     } else {
@@ -1200,7 +1209,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     }
                 })
             case let .updateUserPhone(userId, phone):
-                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), { peer in
+                updatedState.updatePeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), { peer in
                     if let user = peer as? TelegramUser {
                         return user.withUpdatedPhone(phone.isEmpty ? nil : phone)
                     } else {
@@ -1243,7 +1252,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
             case let .updateNewEncryptedMessage(message, _):
                 updatedState.addSecretMessages([message])
             case let .updateEncryptedMessagesRead(chatId, maxDate, date):
-                updatedState.readSecretOutbox(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId), timestamp: maxDate, actionTimestamp: date)
+                updatedState.readSecretOutbox(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId)), timestamp: maxDate, actionTimestamp: date)
             case let .updateUserTyping(userId, type):
                 if let date = updatesDate, date + 60 > serverTime {
                     let activity = PeerInputActivity(apiType: type, timestamp: date)
@@ -1252,7 +1261,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                         category = .voiceChat
                     }
                     
-                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), category: category), peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), activity: activity)
+                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), category: category), peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), activity: activity)
                 }
             case let .updateChatUserTyping(chatId, userId, type):
                 if let date = updatesDate, date + 60 > serverTime {
@@ -1262,11 +1271,11 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                         category = .voiceChat
                     }
                     
-                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId), category: category), peerId: userId.peerId, activity: activity)
+                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)), category: category), peerId: userId.peerId, activity: activity)
                 }
             case let .updateChannelUserTyping(_, channelId, topMsgId, userId, type):
                 if let date = updatesDate, date + 60 > serverTime {
-                    let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                    let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                     let threadId = topMsgId.flatMap { makeMessageThreadId(MessageId(peerId: channelPeerId, namespace: Namespaces.Message.Cloud, id: $0)) }
                     
                     let activity = PeerInputActivity(apiType: type, timestamp: date)
@@ -1281,7 +1290,7 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                 }
             case let .updateEncryptedChatTyping(chatId):
                 if let date = updatesDate, date + 60 > serverTime {
-                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId), category: .global), peerId: nil, activity: .typingText)
+                    updatedState.addPeerInputActivity(chatPeerId: PeerActivitySpace(peerId: PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId)), category: .global), peerId: nil, activity: .typingText)
                 }
             case let .updateDialogPinned(flags, folderId, peer):
                 let groupId: PeerGroupId = folderId.flatMap(PeerGroupId.init(rawValue:)) ?? .root
@@ -1316,9 +1325,9 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
             case let .updateReadMessagesContents(messages, _, _):
                 updatedState.addReadMessagesContents((nil, messages))
             case let .updateChannelReadMessagesContents(channelId, messages):
-                updatedState.addReadMessagesContents((PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), messages))
+                updatedState.addReadMessagesContents((PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), messages))
             case let .updateChannelMessageViews(channelId, id, views):
-                updatedState.addUpdateMessageImpressionCount(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: id), count: views)
+                updatedState.addUpdateMessageImpressionCount(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, id: id), count: views)
             /*case let .updateChannelMessageForwards(channelId, id, forwards):
                 updatedState.addUpdateMessageForwardsCount(id: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: id), count: forwards)*/
             case let .updateNewStickerSet(stickerset):
@@ -1358,8 +1367,8 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                     updatedState.updateGroupCallParticipants(id: id, accessHash: accessHash, participants: participants, version: version)
                 }
             case let .updateGroupCall(channelId, call):
-                updatedState.updateGroupCall(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), call: call)
-                updatedState.updateGroupCall(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: channelId), call: call)
+                updatedState.updateGroupCall(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), call: call)
+                updatedState.updateGroupCall(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(channelId)), call: call)
             case let .updatePeerHistoryTTL(_, peer, ttl):
                 updatedState.updateAutoremoveTimeout(peer: peer, value: CachedPeerAutoremoveTimeout.Value(ttl))
             case let .updateLangPackTooLong(langCode):
@@ -1415,6 +1424,38 @@ private func finalStateWithUpdatesAndServerTime(postbox: Postbox, network: Netwo
                 updatedState.addUpdateChatListFilterOrder(order: order)
             case let .updateDialogFilter(_, id, filter):
                 updatedState.addUpdateChatListFilter(id: id, filter: filter)
+            case let .updateBotCommands(peer, botId, apiCommands):
+                let botPeerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId))
+                let commands: [BotCommand] = apiCommands.map { command in
+                    switch command {
+                    case let .botCommand(command, description):
+                        return BotCommand(text: command, description: description)
+                    }
+                }
+                updatedState.updateCachedPeerData(peer.peerId, { current in
+                    if peer.peerId.namespace == Namespaces.Peer.CloudUser, let previous = current as? CachedUserData {
+                        if let botInfo = previous.botInfo {
+                            return previous.withUpdatedBotInfo(BotInfo(description: botInfo.description, commands: commands))
+                        }
+                    } else if peer.peerId.namespace == Namespaces.Peer.CloudGroup, let previous = current as? CachedGroupData {
+                        if let index = previous.botInfos.firstIndex(where: { $0.peerId == botPeerId }) {
+                            var updatedBotInfos = previous.botInfos
+                            let previousBotInfo = updatedBotInfos[index]
+                            updatedBotInfos.remove(at: index)
+                            updatedBotInfos.insert(CachedPeerBotInfo(peerId: botPeerId, botInfo: BotInfo(description: previousBotInfo.botInfo.description, commands: commands)), at: index)
+                            return previous.withUpdatedBotInfos(updatedBotInfos)
+                        }
+                    } else if peer.peerId.namespace == Namespaces.Peer.CloudChannel, let previous = current as? CachedChannelData {
+                        if let index = previous.botInfos.firstIndex(where: { $0.peerId == botPeerId }) {
+                            var updatedBotInfos = previous.botInfos
+                            let previousBotInfo = updatedBotInfos[index]
+                            updatedBotInfos.remove(at: index)
+                            updatedBotInfos.insert(CachedPeerBotInfo(peerId: botPeerId, botInfo: BotInfo(description: previousBotInfo.botInfo.description, commands: commands)), at: index)
+                            return previous.withUpdatedBotInfos(updatedBotInfos)
+                        }
+                    }
+                    return current
+                })
             default:
                 break
         }
@@ -1667,49 +1708,49 @@ private func resolveMissingPeerChatInfos(network: Network, state: AccountMutable
     }
 }
 
-func keepPollingChannel(postbox: Postbox, network: Network, peerId: PeerId, stateManager: AccountStateManager) -> Signal<Void, NoError> {
-    let signal: Signal<Void, NoError> = postbox.transaction { transaction -> Signal<Void, NoError> in
-        if let accountState = (transaction.getState() as? AuthorizedAccountState)?.state, let peer = transaction.getPeer(peerId) {
-            var channelStates: [PeerId: AccountStateChannelState] = [:]
-            if let channelState = transaction.getPeerChatState(peerId) as? ChannelState {
-                channelStates[peerId] = AccountStateChannelState(pts: channelState.pts)
-            }
-            let initialPeers: [PeerId: Peer] = [peerId: peer]
-            var peerChatInfos: [PeerId: PeerChatInfo] = [:]
-            let inclusion = transaction.getPeerChatListInclusion(peerId)
-            var hasValidInclusion = false
-            switch inclusion {
-                case .ifHasMessagesOrOneOf:
-                    hasValidInclusion = true
-                case .notIncluded:
-                    hasValidInclusion = false
-            }
-            if hasValidInclusion {
-                if let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
-                    peerChatInfos[peerId] = PeerChatInfo(notificationSettings: notificationSettings)
-                }
-            }
-            let initialState = AccountMutableState(initialState: AccountInitialState(state: accountState, peerIds: Set(), peerIdsRequiringLocalChatState: Set(), channelStates: channelStates, peerChatInfos: peerChatInfos, locallyGeneratedMessageTimestamps: [:], cloudReadStates: [:], channelsToPollExplicitely: Set()), initialPeers: initialPeers, initialReferencedMessageIds: Set(), initialStoredMessages: Set(), initialReadInboxMaxIds: [:], storedMessagesByPeerIdAndTimestamp: [:])
-            return pollChannel(network: network, peer: peer, state: initialState)
-            |> mapToSignal { (finalState, _, timeout) -> Signal<Void, NoError> in
-                return resolveAssociatedMessages(network: network, state: finalState)
-                |> mapToSignal { resultingState -> Signal<AccountFinalState, NoError> in
-                    return resolveMissingPeerChatInfos(network: network, state: resultingState)
-                    |> map { resultingState, _ -> AccountFinalState in
-                        return AccountFinalState(state: resultingState, shouldPoll: false, incomplete: false, missingUpdatesFromChannels: Set(), discard: false)
-                    }
-                }
-                |> mapToSignal { finalState -> Signal<Void, NoError> in
-                    return stateManager.addReplayAsynchronouslyBuiltFinalState(finalState)
-                    |> mapToSignal { _ -> Signal<Void, NoError> in
-                        return .complete() |> delay(Double(timeout ?? 30), queue: Queue.concurrentDefaultQueue())
-                    }
-                }
-            }
-        } else {
+func keepPollingChannel(postbox: Postbox, network: Network, peerId: PeerId, stateManager: AccountStateManager) -> Signal<Int32, NoError> {
+    let signal: Signal<Int32, NoError> = postbox.transaction { transaction -> Signal<Int32, NoError> in
+        guard let accountState = (transaction.getState() as? AuthorizedAccountState)?.state, let peer = transaction.getPeer(peerId) else {
             return .complete()
             |> delay(30.0, queue: Queue.concurrentDefaultQueue())
         }
+
+        var channelStates: [PeerId: AccountStateChannelState] = [:]
+        if let channelState = transaction.getPeerChatState(peerId) as? ChannelState {
+            channelStates[peerId] = AccountStateChannelState(pts: channelState.pts)
+        }
+        let initialPeers: [PeerId: Peer] = [peerId: peer]
+        var peerChatInfos: [PeerId: PeerChatInfo] = [:]
+        let inclusion = transaction.getPeerChatListInclusion(peerId)
+        var hasValidInclusion = false
+        switch inclusion {
+            case .ifHasMessagesOrOneOf:
+                hasValidInclusion = true
+            case .notIncluded:
+                hasValidInclusion = false
+        }
+        if hasValidInclusion {
+            if let notificationSettings = transaction.getPeerNotificationSettings(peerId) as? TelegramPeerNotificationSettings {
+                peerChatInfos[peerId] = PeerChatInfo(notificationSettings: notificationSettings)
+            }
+        }
+        let initialState = AccountMutableState(initialState: AccountInitialState(state: accountState, peerIds: Set(), peerIdsRequiringLocalChatState: Set(), channelStates: channelStates, peerChatInfos: peerChatInfos, locallyGeneratedMessageTimestamps: [:], cloudReadStates: [:], channelsToPollExplicitely: Set()), initialPeers: initialPeers, initialReferencedMessageIds: Set(), initialStoredMessages: Set(), initialReadInboxMaxIds: [:], storedMessagesByPeerIdAndTimestamp: [:])
+        return pollChannel(network: network, peer: peer, state: initialState)
+        |> mapToSignal { (finalState, _, timeout) -> Signal<Int32, NoError> in
+            return resolveAssociatedMessages(network: network, state: finalState)
+            |> mapToSignal { resultingState -> Signal<AccountFinalState, NoError> in
+                return resolveMissingPeerChatInfos(network: network, state: resultingState)
+                |> map { resultingState, _ -> AccountFinalState in
+                    return AccountFinalState(state: resultingState, shouldPoll: false, incomplete: false, missingUpdatesFromChannels: Set(), discard: false)
+                }
+            }
+            |> mapToSignal { finalState -> Signal<Int32, NoError> in
+                return stateManager.addReplayAsynchronouslyBuiltFinalState(finalState)
+                |> mapToSignal { _ -> Signal<Int32, NoError> in
+                    return .single(timeout ?? 30) |> then(.complete() |> delay(Double(timeout ?? 30), queue: Queue.concurrentDefaultQueue()))
+                }
+            }
+        }
     }
     |> switchToLatest
     |> restart
@@ -1782,15 +1823,7 @@ private func resetChannels(network: Network, peers: [Peer], state: AccountMutabl
                                 continue loop
                         }
                         
-                        let peerId: PeerId
-                        switch apiPeer {
-                            case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                            case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                            case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                        }
+                        let peerId: PeerId = apiPeer.peerId
                         
                         if readStates[peerId] == nil {
                             readStates[peerId] = [:]
@@ -1958,7 +1991,7 @@ private func pollChannel(network: Network, peer: Peer, state: AccountMutableStat
                                         Logger.shared.log("State", "Invalid updateEditChannelMessage")
                                     }
                                 case let .updatePinnedChannelMessages(flags, channelId, messages, _, _):
-                                    let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                                    let channelPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                                     updatedState.updateMessagesPinned(ids: messages.map { id in
                                         MessageId(peerId: channelPeerId, namespace: Namespaces.Message.Cloud, id: id)
                                     }, pinned: (flags & (1 << 0)) != 0)
@@ -2485,11 +2518,11 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                     addMessageMediaResourceIdsToRemove(media: media, resourceIds: &resourceIds)
                 })
                 if !resourceIds.isEmpty {
-                    let _ = mediaBox.removeCachedResources(Set(resourceIds)).start()
+                    let _ = mediaBox.removeCachedResources(Set(resourceIds), force: true).start()
                 }
                 deletedMessageIds.append(contentsOf: ids.map { .global($0) })
             case let .DeleteMessages(ids):
-                deleteMessages(transaction: transaction, mediaBox: mediaBox, ids: ids, manualAddMessageThreadStatsDifference: { id, add, remove in
+                _internal_deleteMessages(transaction: transaction, mediaBox: mediaBox, ids: ids, manualAddMessageThreadStatsDifference: { id, add, remove in
                     addMessageThreadStatsDifference(threadMessageId: id, remove: remove, addedMessagePeer: nil, addedMessageId: nil, isOutgoing: false)
                 })
                 deletedMessageIds.append(contentsOf: ids.map { .messageId($0) })
@@ -2502,7 +2535,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                     addMessageMediaResourceIdsToRemove(media: media, resourceIds: &resourceIds)
                 })
                 if !resourceIds.isEmpty {
-                    let _ = mediaBox.removeCachedResources(Set(resourceIds)).start()
+                    let _ = mediaBox.removeCachedResources(Set(resourceIds), force: true).start()
                 }
             case let .UpdatePeerChatInclusion(peerId, groupId, changedGroup):
                 let currentInclusion = transaction.getPeerChatListInclusion(peerId)
@@ -2722,6 +2755,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                 if count == 0 {
                     transaction.removeHole(peerId: peerId, namespace: namespace, space: .tag(.unseenPersonalMessage), range: 1 ... (Int32.max - 1))
                     let ids = transaction.getMessageIndicesWithTag(peerId: peerId, namespace: namespace, tag: .unseenPersonalMessage).map({ $0.id })
+                    Logger.shared.log("State", "will call markUnseenPersonalMessage for \(ids.count) messages")
                     for id in ids {
                         markUnseenPersonalMessage(transaction: transaction, id: id, addSynchronizeAction: false)
                     }
@@ -2980,22 +3014,23 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                     if let info = GroupCallInfo(call) {
                         transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
                             if let current = current as? CachedChannelData {
-                                return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title))
+                                return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled))
                             } else if let current = current as? CachedGroupData {
-                                return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title))
+                                return current.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled))
                             } else {
                                 return current
                             }
                         })
                         
                         switch call {
-                        case let .groupCall(flags, _, _, _, _, title, streamDcId, recordStartDate, _):
+                        case let .groupCall(flags, _, _, _, title, _, recordStartDate, scheduleDate, _, _, _):
                             let isMuted = (flags & (1 << 1)) != 0
                             let canChange = (flags & (1 << 2)) != 0
+                            let isVideoEnabled = (flags & (1 << 9)) != 0
                             let defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange)
                             updatedGroupCallParticipants.append((
                                 info.id,
-                                .call(isTerminated: false, defaultParticipantsAreMuted: defaultParticipantsAreMuted, title: title, recordingStartTimestamp: recordStartDate)
+                                .call(isTerminated: false, defaultParticipantsAreMuted: defaultParticipantsAreMuted, title: title, recordingStartTimestamp: recordStartDate, scheduleTimestamp: scheduleDate, isVideoEnabled: isVideoEnabled)
                             ))
                         default:
                             break
@@ -3004,7 +3039,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                 case let .groupCallDiscarded(callId, _, _):
                     updatedGroupCallParticipants.append((
                         callId,
-                        .call(isTerminated: true, defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), title: nil, recordingStartTimestamp: nil)
+                        .call(isTerminated: true, defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false), title: nil, recordingStartTimestamp: nil, scheduleTimestamp: nil, isVideoEnabled: false)
                     ))
                     
                     transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
@@ -3204,7 +3239,7 @@ func replayFinalState(accountManager: AccountManager, postbox: Postbox, accountP
                                 }
                                 
                                 switch set {
-                                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _):
+                                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _, _):
                                         if (flags & (1 << 3)) != 0 {
                                             namespace = Namespaces.ItemCollection.CloudMaskPacks
                                         } else {
diff --git a/submodules/TelegramCore/Sources/AccountStateManager.swift b/submodules/TelegramCore/Sources/State/AccountStateManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/AccountStateManager.swift
rename to submodules/TelegramCore/Sources/State/AccountStateManager.swift
diff --git a/submodules/TelegramCore/Sources/AccountViewTracker.swift b/submodules/TelegramCore/Sources/State/AccountViewTracker.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/AccountViewTracker.swift
rename to submodules/TelegramCore/Sources/State/AccountViewTracker.swift
index 859a4b532c..8dd610993c 100644
--- a/submodules/TelegramCore/Sources/AccountViewTracker.swift
+++ b/submodules/TelegramCore/Sources/State/AccountViewTracker.swift
@@ -224,9 +224,21 @@ private final class CachedChannelParticipantsContext {
 private final class ChannelPollingContext {
     var subscribers = Bag<Void>()
     let disposable = MetaDisposable()
+    let isUpdated = Promise<Bool>(false)
+
+    private(set) var isUpdatedValue: Bool = false
+    private var isUpdatedDisposable: Disposable?
+
+    init(queue: Queue) {
+        self.isUpdatedDisposable = (self.isUpdated.get()
+        |> deliverOn(queue)).start(next: { [weak self] value in
+            self?.isUpdatedValue = value
+        })
+    }
     
     deinit {
         self.disposable.dispose()
+        self.isUpdatedDisposable?.dispose()
     }
 }
 
@@ -717,7 +729,7 @@ public final class AccountViewTracker {
                                                         switch replies {
                                                         case let .messageReplies(_, repliesCountValue, _, recentRepliers, channelId, maxId, readMaxId):
                                                             if let channelId = channelId {
-                                                                commentsChannelId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                                                                commentsChannelId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                                                             }
                                                             repliesCount = repliesCountValue
                                                             if let recentRepliers = recentRepliers {
@@ -1224,7 +1236,7 @@ public final class AccountViewTracker {
                 return
             }
             let queue = self.queue
-            context.disposable.set(combineLatest(fetchAndUpdateSupplementalCachedPeerData(peerId: peerId, network: account.network, postbox: account.postbox), fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)).start(next: { [weak self] supplementalStatus, cachedStatus in
+            context.disposable.set(combineLatest(fetchAndUpdateSupplementalCachedPeerData(peerId: peerId, network: account.network, postbox: account.postbox), _internal_fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)).start(next: { [weak self] supplementalStatus, cachedStatus in
                 queue.async {
                     guard let strongSelf = self else {
                         return
@@ -1266,7 +1278,7 @@ public final class AccountViewTracker {
                     return
                 }
                 let queue = self.queue
-                context.disposable.set(combineLatest(fetchAndUpdateSupplementalCachedPeerData(peerId: peerId, network: account.network, postbox: account.postbox), fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)).start(next: { [weak self] supplementalStatus, cachedStatus in
+                context.disposable.set(combineLatest(fetchAndUpdateSupplementalCachedPeerData(peerId: peerId, network: account.network, postbox: account.postbox), _internal_fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)).start(next: { [weak self] supplementalStatus, cachedStatus in
                     queue.async {
                         guard let strongSelf = self else {
                             return
@@ -1302,13 +1314,27 @@ public final class AccountViewTracker {
                 if let current = self.channelPollingContexts[peerId] {
                     context = current
                 } else {
-                    context = ChannelPollingContext()
+                    context = ChannelPollingContext(queue: self.queue)
                     self.channelPollingContexts[peerId] = context
                 }
                 
                 if context.subscribers.isEmpty {
                     if let account = self.account {
-                        context.disposable.set(keepPollingChannel(postbox: account.postbox, network: account.network, peerId: peerId, stateManager: account.stateManager).start())
+                        let queue = self.queue
+                        context.disposable.set(keepPollingChannel(postbox: account.postbox, network: account.network, peerId: peerId, stateManager: account.stateManager).start(next: { [weak context] isValidForTimeout in
+                            queue.async {
+                                guard let context = context else {
+                                    return
+                                }
+                                context.isUpdated.set(
+                                    .single(true)
+                                    |> then(
+                                        .single(false)
+                                        |> delay(Double(isValidForTimeout), queue: queue)
+                                    )
+                                )
+                            }
+                        }))
                     }
                 }
                 
@@ -1378,34 +1404,68 @@ public final class AccountViewTracker {
             peerId = peerIdValue
         }
         if peerId.namespace == Namespaces.Peer.CloudChannel {
-            return Signal { subscriber in
+            return Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> { subscriber in
                 let combinedDisposable = MetaDisposable()
                 self.queue.async {
+                    let polled = self.polledChannel(peerId: peerId).start()
+
                     var addHole = false
+                    let pollingCompleted: Signal<Bool, NoError>
                     if let context = self.channelPollingContexts[peerId] {
-                        if context.subscribers.isEmpty {
+                        if !context.isUpdatedValue {
                             addHole = true
                         }
+                        pollingCompleted = context.isUpdated.get()
                     } else {
                         addHole = true
+                        pollingCompleted = .single(true)
                     }
-                    if addHole {
-                        let _ = self.account?.postbox.transaction({ transaction -> Void in
-                            if transaction.getPeerChatListIndex(peerId) == nil {
-                                if let message = transaction.getTopPeerMessageId(peerId: peerId, namespace: Namespaces.Message.Cloud) {
-                                    //transaction.addHole(peerId: peerId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: message.id + 1 ... (Int32.max - 1))
-                                }
+                    let isAutomaticallyTracked = self.account!.postbox.transaction { transaction -> Bool in
+                        if transaction.getPeerChatListIndex(peerId) == nil {
+                            if addHole {
+                                transaction.addHole(peerId: peerId, namespace: Namespaces.Message.Cloud, space: .everywhere, range: 1 ... (Int32.max - 1))
                             }
-                        }).start()
+                            return false
+                        } else {
+                            return true
+                        }
                     }
-                    let disposable = history.start(next: { next in
+
+                    let historyIsValid = combineLatest(queue: self.queue,
+                        pollingCompleted,
+                        isAutomaticallyTracked
+                    )
+                    |> map { lhs, rhs -> Bool in
+                        return lhs || rhs
+                    }
+
+                    var loaded = false
+                    let validHistory = historyIsValid
+                    |> distinctUntilChanged
+                    |> take(until: { next in
+                        if next {
+                            return SignalTakeAction(passthrough: true, complete: true)
+                        } else {
+                            return SignalTakeAction(passthrough: true, complete: false)
+                        }
+                    })
+                    |> mapToSignal { isValid -> Signal<(MessageHistoryView, ViewUpdateType, InitialMessageHistoryData?), NoError> in
+                        if isValid {
+                            assert(!loaded)
+                            loaded = true
+                            return history
+                        } else {
+                            let view = MessageHistoryView(tagMask: nil, namespaces: .all, entries: [], holeEarlier: true, holeLater: true, isLoading: true)
+                            return .single((view, .Initial, nil))
+                        }
+                    }
+
+                    let disposable = validHistory.start(next: { next in
                         subscriber.putNext(next)
-                    }, error: { error in
-                        subscriber.putError(error)
                     }, completed: {
                         subscriber.putCompletion()
                     })
-                    let polled = self.polledChannel(peerId: peerId).start()
+
                     combinedDisposable.set(ActionDisposable {
                         disposable.dispose()
                         polled.dispose()
diff --git a/submodules/TelegramCore/Sources/AppChangelog.swift b/submodules/TelegramCore/Sources/State/AppChangelog.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/AppChangelog.swift
rename to submodules/TelegramCore/Sources/State/AppChangelog.swift
diff --git a/submodules/TelegramCore/Sources/AppChangelogState.swift b/submodules/TelegramCore/Sources/State/AppChangelogState.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/AppChangelogState.swift
rename to submodules/TelegramCore/Sources/State/AppChangelogState.swift
diff --git a/submodules/TelegramCore/Sources/AppConfiguration.swift b/submodules/TelegramCore/Sources/State/AppConfiguration.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/AppConfiguration.swift
rename to submodules/TelegramCore/Sources/State/AppConfiguration.swift
index 827589c8ad..1599a52130 100644
--- a/submodules/TelegramCore/Sources/AppConfiguration.swift
+++ b/submodules/TelegramCore/Sources/State/AppConfiguration.swift
@@ -1,7 +1,7 @@
 import Postbox
 import SyncCore
 
-public func currentAppConfiguration(transaction: Transaction) -> AppConfiguration {
+private func currentAppConfiguration(transaction: Transaction) -> AppConfiguration {
     if let entry = transaction.getPreferencesEntry(key: PreferencesKeys.appConfiguration) as? AppConfiguration {
         return entry
     } else {
diff --git a/submodules/TelegramCore/Sources/AppUpdate.swift b/submodules/TelegramCore/Sources/State/AppUpdate.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/AppUpdate.swift
rename to submodules/TelegramCore/Sources/State/AppUpdate.swift
index 5ab4dc5c7d..546b6b8778 100644
--- a/submodules/TelegramCore/Sources/AppUpdate.swift
+++ b/submodules/TelegramCore/Sources/State/AppUpdate.swift
@@ -16,7 +16,7 @@ public struct AppUpdateInfo: Equatable {
 extension AppUpdateInfo {
     init?(apiAppUpdate: Api.help.AppUpdate) {
         switch apiAppUpdate {
-            case let .appUpdate(flags, _, version, text, entities, _, _):
+            case let .appUpdate(flags, _, version, text, entities, _, _, _):
                 self.blocking = (flags & (1 << 0)) != 0
                 self.version = version
                 self.text = text
diff --git a/submodules/TelegramCore/Sources/ApplyUpdateMessage.swift b/submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ApplyUpdateMessage.swift
rename to submodules/TelegramCore/Sources/State/ApplyUpdateMessage.swift
diff --git a/submodules/TelegramCore/Sources/CachedSentMediaReferences.swift b/submodules/TelegramCore/Sources/State/CachedSentMediaReferences.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CachedSentMediaReferences.swift
rename to submodules/TelegramCore/Sources/State/CachedSentMediaReferences.swift
diff --git a/submodules/TelegramCore/Sources/CallSessionManager.swift b/submodules/TelegramCore/Sources/State/CallSessionManager.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/CallSessionManager.swift
rename to submodules/TelegramCore/Sources/State/CallSessionManager.swift
index 69401d05cb..7d6cdfde5a 100644
--- a/submodules/TelegramCore/Sources/CallSessionManager.swift
+++ b/submodules/TelegramCore/Sources/State/CallSessionManager.swift
@@ -246,7 +246,7 @@ private final class CallSessionContext {
     var isVideoPossible: Bool
     var state: CallSessionInternalState
     let subscribers = Bag<(CallSession) -> Void>()
-    let signalingSubscribers = Bag<(Data) -> Void>()
+    var signalingReceiver: (([Data]) -> Void)?
     
     let signalingDisposables = DisposableSet()
     
@@ -254,7 +254,7 @@ private final class CallSessionContext {
     
     var isEmpty: Bool {
         if case .terminated = self.state {
-            return self.subscribers.isEmpty && self.signalingSubscribers.isEmpty
+            return self.subscribers.isEmpty
         } else {
             return false
         }
@@ -303,6 +303,8 @@ private final class CallSessionManagerContext {
     private let ringingSubscribers = Bag<([CallSessionRingingState]) -> Void>()
     private var contexts: [CallSessionInternalId: CallSessionContext] = [:]
     private var contextIdByStableId: [CallSessionStableId: CallSessionInternalId] = [:]
+
+    private var enqueuedSignalingData: [Int64: [Data]] = [:]
     
     private let disposables = DisposableSet()
     
@@ -395,29 +397,31 @@ private final class CallSessionManagerContext {
         }
     }
     
-    func callSignalingData(internalId: CallSessionInternalId) -> Signal<Data, NoError> {
+    func beginReceivingCallSignalingData(internalId: CallSessionInternalId, _ receiver: @escaping ([Data]) -> Void) -> Disposable {
         let queue = self.queue
-        return Signal { [weak self] subscriber in
-            let disposable = MetaDisposable()
-            queue.async {
-                if let strongSelf = self, let context = strongSelf.contexts[internalId] {
-                    let index = context.signalingSubscribers.add { next in
-                        subscriber.putNext(next)
+
+        let disposable = MetaDisposable()
+        queue.async { [weak self] in
+            if let strongSelf = self, let context = strongSelf.contexts[internalId] {
+                context.signalingReceiver = receiver
+
+                for (listStableId, listInternalId) in strongSelf.contextIdByStableId {
+                    if listInternalId == internalId {
+                        strongSelf.deliverCallSignalingData(id: listStableId)
+                        break
                     }
-                    disposable.set(ActionDisposable {
-                        queue.async {
-                            if let strongSelf = self, let context = strongSelf.contexts[internalId] {
-                                context.signalingSubscribers.remove(index)
-                                if context.isEmpty {
-                                    strongSelf.contexts.removeValue(forKey: internalId)
-                                }
-                            }
-                        }
-                    })
                 }
+
+                disposable.set(ActionDisposable {
+                    queue.async {
+                        if let strongSelf = self, let context = strongSelf.contexts[internalId] {
+                            context.signalingReceiver = nil
+                        }
+                    }
+                })
             }
-            return disposable
         }
+        return disposable
     }
     
     private func ringingStatesValue() -> [CallSessionRingingState] {
@@ -475,6 +479,7 @@ private final class CallSessionManagerContext {
             }))
             self.contextIdByStableId[stableId] = internalId
             self.contextUpdated(internalId: internalId)
+            self.deliverCallSignalingData(id: stableId)
             self.ringingStatesUpdated()
             return internalId
         } else {
@@ -558,7 +563,7 @@ private final class CallSessionManagerContext {
                                 |> timeout(5.0, queue: strongSelf.queue, alternate: .single(nil))
                                 |> deliverOnMainQueue).start(next: { debugLog in
                                     if let debugLog = debugLog {
-                                        let _ = saveCallDebugLog(network: network, callId: CallId(id: id, accessHash: accessHash), log: debugLog).start()
+                                        _internal_saveCallDebugLog(network: network, callId: CallId(id: id, accessHash: accessHash), log: debugLog).start()
                                     }
                                 })
                             }
@@ -596,7 +601,7 @@ private final class CallSessionManagerContext {
     func accept(internalId: CallSessionInternalId) {
         if let context = self.contexts[internalId] {
             switch context.state {
-                case let .ringing(id, accessHash, gAHash, b, remoteVersions):
+                case let .ringing(id, accessHash, gAHash, b, _):
                     let acceptVersions = self.versions.map({ $0.version })
                     context.state = .accepting(id: id, accessHash: accessHash, gAHash: gAHash, b: b, disposable: (acceptCallSession(postbox: self.postbox, network: self.network, stableId: id, accessHash: accessHash, b: b, maxLayer: self.maxLayer, versions: acceptVersions) |> deliverOn(self.queue)).start(next: { [weak self] result in
                         if let strongSelf = self, let context = strongSelf.contexts[internalId] {
@@ -652,7 +657,7 @@ private final class CallSessionManagerContext {
         switch call {
         case .phoneCallEmpty:
             break
-        case let .phoneCallAccepted(flags, id, _, _, _, _, gB, remoteProtocol):
+        case let .phoneCallAccepted(_, id, _, _, _, _, gB, remoteProtocol):
             let remoteVersions: [String]
             switch remoteProtocol {
             case let .phoneCallProtocol(_, _, _, versions):
@@ -815,7 +820,7 @@ private final class CallSessionManagerContext {
                 versions = libraryVersions
             }
             if self.contextIdByStableId[id] == nil {
-                let internalId = self.addIncoming(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: adminId), stableId: id, accessHash: accessHash, timestamp: date, gAHash: gAHash.makeData(), versions: versions, isVideo: isVideo)
+                let internalId = self.addIncoming(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(adminId)), stableId: id, accessHash: accessHash, timestamp: date, gAHash: gAHash.makeData(), versions: versions, isVideo: isVideo)
                 if let internalId = internalId {
                     var resultRingingStateValue: CallSessionRingingState?
                     for ringingState in self.ringingStatesValue() {
@@ -854,11 +859,22 @@ private final class CallSessionManagerContext {
     }
     
     func addCallSignalingData(id: Int64, data: Data) {
+        if self.enqueuedSignalingData[id] == nil {
+            self.enqueuedSignalingData[id] = []
+        }
+        self.enqueuedSignalingData[id]?.append(data)
+
+        self.deliverCallSignalingData(id: id)
+    }
+
+    private func deliverCallSignalingData(id: Int64) {
         guard let internalId = self.contextIdByStableId[id], let context = self.contexts[internalId] else {
             return
         }
-        for f in context.signalingSubscribers.copyItems() {
-            f(data)
+        if let signalingReceiver = context.signalingReceiver {
+            if let data = self.enqueuedSignalingData.removeValue(forKey: id) {
+                signalingReceiver(data)
+            }
         }
     }
     
@@ -894,7 +910,7 @@ private final class CallSessionManagerContext {
         let randomStatus = SecRandomCopyBytes(nil, 256, aBytes.assumingMemoryBound(to: UInt8.self))
         let a = Data(bytesNoCopy: aBytes, count: 256, deallocator: .free)
         if randomStatus == 0 {
-            self.contexts[internalId] = CallSessionContext(peerId: peerId, isOutgoing: true, type: isVideo ? .video : .audio, isVideoPossible: enableVideo || isVideo, state: .requesting(a: a, disposable: (requestCallSession(postbox: self.postbox, network: self.network, peerId: peerId, a: a, maxLayer: self.maxLayer, versions: self.filteredVersions(enableVideo: enableVideo), isVideo: isVideo) |> deliverOn(queue)).start(next: { [weak self] result in
+            self.contexts[internalId] = CallSessionContext(peerId: peerId, isOutgoing: true, type: isVideo ? .video : .audio, isVideoPossible: enableVideo || isVideo, state: .requesting(a: a, disposable: (requestCallSession(postbox: self.postbox, network: self.network, peerId: peerId, a: a, maxLayer: self.maxLayer, versions: self.filteredVersions(enableVideo: true), isVideo: isVideo) |> deliverOn(queue)).start(next: { [weak self] result in
                 if let strongSelf = self, let context = strongSelf.contexts[internalId] {
                     if case .requesting = context.state {
                         switch result {
@@ -902,6 +918,7 @@ private final class CallSessionManagerContext {
                                 context.state = .requested(id: id, accessHash: accessHash, a: a, gA: gA, config: config, remoteConfirmationTimestamp: remoteConfirmationTimestamp)
                                 strongSelf.contextIdByStableId[id] = internalId
                                 strongSelf.contextUpdated(internalId: internalId)
+                                strongSelf.deliverCallSignalingData(id: id)
                             case let .failed(error):
                                 context.state = .terminated(id: nil, accessHash: nil, reason: .error(error), reportRating: false, sendDebugLogs: false)
                                 strongSelf.contextUpdated(internalId: internalId)
@@ -1044,16 +1061,14 @@ public final class CallSessionManager {
         }
     }
     
-    public func callSignalingData(internalId: CallSessionInternalId) -> Signal<Data, NoError> {
-        return Signal { [weak self] subscriber in
-            let disposable = MetaDisposable()
-            self?.withContext { context in
-                disposable.set(context.callSignalingData(internalId: internalId).start(next: { next in
-                    subscriber.putNext(next)
-                }))
-            }
-            return disposable
+    public func beginReceivingCallSignalingData(internalId: CallSessionInternalId, _ receiver: @escaping ([Data]) -> Void) -> Disposable {
+        let disposable = MetaDisposable()
+
+        self.withContext { context in
+            disposable.set(context.beginReceivingCallSignalingData(internalId: internalId, receiver))
         }
+
+        return disposable
     }
 }
 
diff --git a/submodules/TelegramCore/Sources/ChannelState.swift b/submodules/TelegramCore/Sources/State/ChannelState.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/ChannelState.swift
rename to submodules/TelegramCore/Sources/State/ChannelState.swift
index 504cd68f65..effa4e6c62 100644
--- a/submodules/TelegramCore/Sources/ChannelState.swift
+++ b/submodules/TelegramCore/Sources/State/ChannelState.swift
@@ -18,11 +18,11 @@ func channelUpdatesByPeerId(updates: [ChannelUpdate]) -> [PeerId: [ChannelUpdate
             case let .updateNewChannelMessage(message, _, _):
                 peerId = apiMessagePeerId(message)
             case let .updateDeleteChannelMessages(channelId, _, _, _):
-                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
             case let .updateEditChannelMessage(message, _, _):
                 peerId = apiMessagePeerId(message)
             case let .updateChannelWebPage(channelId, _, _, _):
-                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
             default:
                 break
         }
diff --git a/submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift b/submodules/TelegramCore/Sources/State/ChatHistoryPreloadManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ChatHistoryPreloadManager.swift
rename to submodules/TelegramCore/Sources/State/ChatHistoryPreloadManager.swift
diff --git a/submodules/TelegramCore/Sources/CloudChatRemoveMessagesOperation.swift b/submodules/TelegramCore/Sources/State/CloudChatRemoveMessagesOperation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CloudChatRemoveMessagesOperation.swift
rename to submodules/TelegramCore/Sources/State/CloudChatRemoveMessagesOperation.swift
diff --git a/submodules/TelegramCore/Sources/ContactSyncManager.swift b/submodules/TelegramCore/Sources/State/ContactSyncManager.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/ContactSyncManager.swift
rename to submodules/TelegramCore/Sources/State/ContactSyncManager.swift
index 83b1d3db2a..b5b4aca039 100644
--- a/submodules/TelegramCore/Sources/ContactSyncManager.swift
+++ b/submodules/TelegramCore/Sources/State/ContactSyncManager.swift
@@ -345,7 +345,7 @@ private func pushDeviceContactData(postbox: Postbox, network: Network, contacts:
                                 for item in imported {
                                     switch item {
                                         case let .importedContact(userId, _):
-                                            addedContactPeerIds.insert(PeerId(namespace: Namespaces.Peer.CloudUser, id: userId))
+                                            addedContactPeerIds.insert(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)))
                                     }
                                 }
                                 for item in retryContacts {
@@ -399,7 +399,7 @@ private func updateContactPresences(postbox: Postbox, network: Network, accountP
             for status in statuses {
                 switch status {
                     case let .contactStatus(userId, status):
-                        peerPresences[PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)] = TelegramUserPresence(apiStatus: status)
+                        peerPresences[PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))] = TelegramUserPresence(apiStatus: status)
                 }
             }
             updatePeerPresences(transaction: transaction, accountPeerId: accountPeerId, peerPresences: peerPresences)
diff --git a/submodules/TelegramCore/Sources/Fetch.swift b/submodules/TelegramCore/Sources/State/Fetch.swift
similarity index 76%
rename from submodules/TelegramCore/Sources/Fetch.swift
rename to submodules/TelegramCore/Sources/State/Fetch.swift
index 34b3a5c0c8..a8a796d242 100644
--- a/submodules/TelegramCore/Sources/Fetch.swift
+++ b/submodules/TelegramCore/Sources/State/Fetch.swift
@@ -63,6 +63,21 @@ func fetchResource(account: Account, resource: MediaResource, intervals: Signal<
     } else if let httpReference = resource as? HttpReferenceMediaResource {
         return .single(.dataPart(resourceOffset: 0, data: Data(), range: 0 ..< 0, complete: false))
         |> then(fetchHttpResource(url: httpReference.url))
+    } else if let wallpaperResource = resource as? WallpaperDataResource {
+        return getWallpaper(network: account.network, slug: wallpaperResource.slug)
+        |> mapError { _ -> MediaResourceDataFetchError in
+            return .generic
+        }
+        |> mapToSignal { wallpaper -> Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> in
+            guard case let .file(file) = wallpaper else {
+                return .fail(.generic)
+            }
+            guard let cloudResource = file.file.resource as? TelegramMultipartFetchableResource else {
+                return .fail(.generic)
+            }
+            return .single(.dataPart(resourceOffset: 0, data: Data(), range: 0 ..< 0, complete: false))
+            |> then(fetchCloudMediaLocation(account: account, resource: cloudResource, datacenterId: cloudResource.datacenterId, size: resource.size == 0 ? nil : resource.size, intervals: intervals, parameters: MediaResourceFetchParameters(tag: nil, info: TelegramCloudMediaResourceFetchInfo(reference: .standalone(resource: file.file.resource), preferBackgroundReferenceRevalidation: false, continueInBackground: false), isRandomAccessAllowed: true)))
+        }
     }
     return nil
 }
diff --git a/submodules/TelegramCore/Sources/FetchChatList.swift b/submodules/TelegramCore/Sources/State/FetchChatList.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/FetchChatList.swift
rename to submodules/TelegramCore/Sources/State/FetchChatList.swift
index 9da9b60c2c..1fdf736c59 100644
--- a/submodules/TelegramCore/Sources/FetchChatList.swift
+++ b/submodules/TelegramCore/Sources/State/FetchChatList.swift
@@ -113,11 +113,11 @@ private func parseDialogs(apiDialogs: [Api.Dialog], apiMessages: [Api.Message],
                 let peerId: PeerId
                 switch apiPeer {
                     case let .peerUser(userId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                     case let .peerChat(chatId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                     case let .peerChannel(channelId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                 }
                 
                 if readStates[peerId] == nil {
diff --git a/submodules/TelegramCore/Sources/FetchSecretFileResource.swift b/submodules/TelegramCore/Sources/State/FetchSecretFileResource.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/FetchSecretFileResource.swift
rename to submodules/TelegramCore/Sources/State/FetchSecretFileResource.swift
diff --git a/submodules/TelegramCore/Sources/HistoryViewStateValidation.swift b/submodules/TelegramCore/Sources/State/HistoryViewStateValidation.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/HistoryViewStateValidation.swift
rename to submodules/TelegramCore/Sources/State/HistoryViewStateValidation.swift
index f66c02d007..9dfa747529 100644
--- a/submodules/TelegramCore/Sources/HistoryViewStateValidation.swift
+++ b/submodules/TelegramCore/Sources/State/HistoryViewStateValidation.swift
@@ -410,7 +410,7 @@ private func hashForMessages(_ messages: [Message], withChannelIds: Bool) -> Int
     
     for message in sorted {
         if withChannelIds {
-            acc = (acc &* 20261) &+ UInt32(message.id.peerId.id)
+            acc = (acc &* 20261) &+ UInt32(message.id.peerId.id._internalGetInt32Value())
         }
         
         acc = (acc &* 20261) &+ UInt32(message.id.id)
@@ -435,7 +435,7 @@ private func hashForMessages(_ messages: [StoreMessage], withChannelIds: Bool) -
     for message in messages {
         if case let .Id(id) = message.id {
             if withChannelIds {
-                acc = (acc &* 20261) &+ UInt32(id.peerId.id)
+                acc = (acc &* 20261) &+ UInt32(id.peerId.id._internalGetInt32Value())
             }
             acc = (acc &* 20261) &+ UInt32(id.id)
             var timestamp = message.timestamp
@@ -832,7 +832,7 @@ private func validateBatch(postbox: Postbox, network: Network, transaction: Tran
                                         return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: updatedTags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: attributes, media: currentMessage.media))
                                     })
                                 } else {
-                                    deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [id])
+                                    _internal_deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [id])
                                     Logger.shared.log("HistoryValidation", "deleting message \(id) in \(id.peerId)")
                                 }
                             }
@@ -1011,7 +1011,7 @@ private func validateReplyThreadBatch(postbox: Postbox, network: Network, transa
                 
                     for id in removedMessageIds {
                         if !validMessageIds.contains(id) {
-                            deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [id])
+                            _internal_deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [id])
                             Logger.shared.log("HistoryValidation", "deleting thread message \(id) in \(id.peerId)")
                         }
                     }
diff --git a/submodules/TelegramCore/Sources/Holes.swift b/submodules/TelegramCore/Sources/State/Holes.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/Holes.swift
rename to submodules/TelegramCore/Sources/State/Holes.swift
index fc66edb831..946a9faea0 100644
--- a/submodules/TelegramCore/Sources/Holes.swift
+++ b/submodules/TelegramCore/Sources/State/Holes.swift
@@ -573,13 +573,13 @@ func fetchMessageHistoryHole(accountPeerId: PeerId, source: FetchMessageHistoryH
 func groupBoundaryPeer(_ peerId: PeerId, accountPeerId: PeerId) -> Api.Peer {
     switch peerId.namespace {
         case Namespaces.Peer.CloudUser:
-            return Api.Peer.peerUser(userId: peerId.id)
+            return Api.Peer.peerUser(userId: peerId.id._internalGetInt32Value())
         case Namespaces.Peer.CloudGroup:
-            return Api.Peer.peerChat(chatId: peerId.id)
+            return Api.Peer.peerChat(chatId: peerId.id._internalGetInt32Value())
         case Namespaces.Peer.CloudChannel:
-            return Api.Peer.peerChannel(channelId: peerId.id)
+            return Api.Peer.peerChannel(channelId: peerId.id._internalGetInt32Value())
         default:
-            return Api.Peer.peerUser(userId: accountPeerId.id)
+            return Api.Peer.peerUser(userId: accountPeerId.id._internalGetInt32Value())
     }
 }
 
@@ -698,7 +698,7 @@ func fetchCallListHole(network: Network, postbox: Postbox, accountPeerId: PeerId
                 
                 var updatedIndex: MessageIndex?
                 if let topIndex = topIndex {
-                    updatedIndex = topIndex.predecessor()
+                    updatedIndex = topIndex.globalPredecessor()
                 }
                 
                 transaction.replaceGlobalMessageTagsHole(globalTags: [.Calls, .MissedCalls], index: holeIndex, with: updatedIndex, messages: storeMessages)
diff --git a/submodules/TelegramCore/Sources/InitializeAccountAfterLogin.swift b/submodules/TelegramCore/Sources/State/InitializeAccountAfterLogin.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/InitializeAccountAfterLogin.swift
rename to submodules/TelegramCore/Sources/State/InitializeAccountAfterLogin.swift
diff --git a/submodules/TelegramCore/Sources/ManagedAccountPresence.swift b/submodules/TelegramCore/Sources/State/ManagedAccountPresence.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedAccountPresence.swift
rename to submodules/TelegramCore/Sources/State/ManagedAccountPresence.swift
diff --git a/submodules/TelegramCore/Sources/ManagedAnimatedEmojiUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedAnimatedEmojiUpdates.swift
similarity index 75%
rename from submodules/TelegramCore/Sources/ManagedAnimatedEmojiUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedAnimatedEmojiUpdates.swift
index bb16cf50fa..1577d99a51 100644
--- a/submodules/TelegramCore/Sources/ManagedAnimatedEmojiUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedAnimatedEmojiUpdates.swift
@@ -5,7 +5,7 @@ import TelegramApi
 import MtProtoKit
 
 func managedAnimatedEmojiUpdates(postbox: Postbox, network: Network) -> Signal<Void, NoError> {
-    let poll = loadedStickerPack(postbox: postbox, network: network, reference: .animatedEmoji, forceActualized: true)
+    let poll = _internal_loadedStickerPack(postbox: postbox, network: network, reference: .animatedEmoji, forceActualized: true)
     |> mapToSignal { _ -> Signal<Void, NoError> in
         return .complete()
     }
diff --git a/submodules/TelegramCore/Sources/ManagedAppConfigurationUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedAppConfigurationUpdates.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/ManagedAppConfigurationUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedAppConfigurationUpdates.swift
index b7a757eee1..eb4fab79b5 100644
--- a/submodules/TelegramCore/Sources/ManagedAppConfigurationUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedAppConfigurationUpdates.swift
@@ -30,7 +30,9 @@ func updateAppConfigurationOnce(postbox: Postbox, network: Network) -> Signal<Vo
 
 func managedAppConfigurationUpdates(postbox: Postbox, network: Network) -> Signal<Void, NoError> {
     let poll = Signal<Void, NoError> { subscriber in
-        return updateAppConfigurationOnce(postbox: postbox, network: network).start()
+        return updateAppConfigurationOnce(postbox: postbox, network: network).start(completed: {
+            subscriber.putCompletion()
+        })
     }
     return (poll |> then(.complete() |> suspendAwareDelay(1.0 * 60.0 * 60.0, queue: Queue.concurrentDefaultQueue()))) |> restart
 }
diff --git a/submodules/TelegramCore/Sources/ManagedAutodownloadSettingsUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedAutodownloadSettingsUpdates.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/ManagedAutodownloadSettingsUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedAutodownloadSettingsUpdates.swift
index 620fe11e9c..e68464b5db 100644
--- a/submodules/TelegramCore/Sources/ManagedAutodownloadSettingsUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedAutodownloadSettingsUpdates.swift
@@ -14,7 +14,9 @@ func managedAutodownloadSettingsUpdates(accountManager: AccountManager, network:
             return updateAutodownloadSettingsInteractively(accountManager: accountManager, { _ -> AutodownloadSettings in
                 return AutodownloadSettings(apiAutodownloadSettings: result)
             })
-        }).start()
+        }).start(completed: {
+            subscriber.putCompletion()
+        })
     }
     return (poll |> then(.complete() |> suspendAwareDelay(1.0 * 60.0 * 60.0, queue: Queue.concurrentDefaultQueue()))) |> restart
 }
diff --git a/submodules/TelegramCore/Sources/ManagedAutoremoveMessageOperations.swift b/submodules/TelegramCore/Sources/State/ManagedAutoremoveMessageOperations.swift
similarity index 89%
rename from submodules/TelegramCore/Sources/ManagedAutoremoveMessageOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedAutoremoveMessageOperations.swift
index 6fea6b7b9d..cb3cb92aad 100644
--- a/submodules/TelegramCore/Sources/ManagedAutoremoveMessageOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedAutoremoveMessageOperations.swift
@@ -62,8 +62,12 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
         |> distinctUntilChanged*/
 
         let timeOffset: Signal<Double, NoError> = .single(0.0)
-        
-        let disposable = combineLatest(timeOffset, postbox.timestampBasedMessageAttributesView(tag: isRemove ? 0 : 1)).start(next: { timeOffset, view in
+
+        Logger.shared.log("Autoremove", "starting isRemove: \(isRemove)")
+
+        let tag: UInt16 = isRemove ? 0 : 1
+
+        let disposable = combineLatest(timeOffset, postbox.timestampBasedMessageAttributesView(tag: tag)).start(next: { timeOffset, view in
             let (disposeOperations, beginOperations) = helper.with { helper -> (disposeOperations: [Disposable], beginOperations: [(TimestampBasedMessageAttributesEntry, MetaDisposable)]) in
                 return helper.update(view.head)
             }
@@ -79,9 +83,11 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
                 let signal = Signal<Void, NoError>.complete()
                 |> suspendAwareDelay(delay, queue: Queue.concurrentDefaultQueue())
                 |> then(postbox.transaction { transaction -> Void in
+                    Logger.shared.log("Autoremove", "Performing autoremove for \(entry.messageId), isRemove: \(isRemove)")
+
                     if let message = transaction.getMessage(entry.messageId) {
                         if message.id.peerId.namespace == Namespaces.Peer.SecretChat || isRemove {
-                            deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [entry.messageId])
+                            _internal_deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [entry.messageId])
                         } else {
                             transaction.updateMessage(message.id, update: { currentMessage in
                                 var storeForwardInfo: StoreMessageForwardInfo?
@@ -106,6 +112,9 @@ func managedAutoremoveMessageOperations(network: Network, postbox: Postbox, isRe
                                 return .update(StoreMessage(id: currentMessage.id, globallyUniqueId: currentMessage.globallyUniqueId, groupingKey: currentMessage.groupingKey, threadId: currentMessage.threadId, timestamp: currentMessage.timestamp, flags: StoreMessageFlags(currentMessage.flags), tags: currentMessage.tags, globalTags: currentMessage.globalTags, localTags: currentMessage.localTags, forwardInfo: storeForwardInfo, authorId: currentMessage.author?.id, text: currentMessage.text, attributes: updatedAttributes, media: updatedMedia))
                             })
                         }
+                    } else {
+                        transaction.clearTimestampBasedAttribute(id: entry.messageId, tag: tag)
+                        Logger.shared.log("Autoremove", "No message to autoremove for \(entry.messageId)")
                     }
                 })
                 disposable.set(signal.start())
diff --git a/submodules/TelegramCore/Sources/ManagedChatListHoles.swift b/submodules/TelegramCore/Sources/State/ManagedChatListHoles.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedChatListHoles.swift
rename to submodules/TelegramCore/Sources/State/ManagedChatListHoles.swift
diff --git a/submodules/TelegramCore/Sources/ManagedCloudChatRemoveMessagesOperations.swift b/submodules/TelegramCore/Sources/State/ManagedCloudChatRemoveMessagesOperations.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/ManagedCloudChatRemoveMessagesOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedCloudChatRemoveMessagesOperations.swift
index 6e769af8a3..eb40e138ec 100644
--- a/submodules/TelegramCore/Sources/ManagedCloudChatRemoveMessagesOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedCloudChatRemoveMessagesOperations.swift
@@ -96,7 +96,7 @@ func managedCloudChatRemoveMessagesOperations(postbox: Postbox, network: Network
                             }
                         } else if let operation = entry.contents as? CloudChatClearHistoryOperation {
                             if let peer = transaction.getPeer(entry.peerId) {
-                                return clearHistory(transaction: transaction, postbox: postbox, network: network, stateManager: stateManager, peer: peer, operation: operation)
+                                return _internal_clearHistory(transaction: transaction, postbox: postbox, network: network, stateManager: stateManager, peer: peer, operation: operation)
                             } else {
                                 return .complete()
                             }
@@ -177,7 +177,7 @@ private func removeMessages(postbox: Postbox, network: Network, stateManager: Ac
                     if let result = result {
                         switch result {
                         case let .affectedMessages(pts, ptsCount):
-                            stateManager.addUpdateGroups([.updateChannelPts(channelId: peer.id.id, pts: pts, ptsCount: ptsCount)])
+                            stateManager.addUpdateGroups([.updateChannelPts(channelId: peer.id.id._internalGetInt32Value(), pts: pts, ptsCount: ptsCount)])
                         }
                     }
                     return .complete()
@@ -267,7 +267,7 @@ private func removeChat(transaction: Transaction, postbox: Postbox, network: Net
     } else if peer.id.namespace == Namespaces.Peer.CloudGroup {
         let deleteUser: Signal<Void, NoError>
         if operation.deleteGloballyIfPossible {
-            deleteUser = network.request(Api.functions.messages.deleteChat(chatId: peer.id.id))
+            deleteUser = network.request(Api.functions.messages.deleteChat(chatId: peer.id.id._internalGetInt32Value()))
             |> `catch` { _ in
                 return .single(.boolFalse)
             }
@@ -275,7 +275,7 @@ private func removeChat(transaction: Transaction, postbox: Postbox, network: Net
                 return .complete()
             }
         } else {
-            deleteUser = network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: peer.id.id, userId: Api.InputUser.inputUserSelf))
+            deleteUser = network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: peer.id.id._internalGetInt32Value(), userId: Api.InputUser.inputUserSelf))
                 |> map { result -> Api.Updates? in
                     return result
                 }
@@ -311,7 +311,7 @@ private func removeChat(transaction: Transaction, postbox: Postbox, network: Net
         |> then(deleteUser)
         |> then(reportSignal)
         |> then(postbox.transaction { transaction -> Void in
-            clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peer.id, namespaces: .all)
+            _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peer.id, namespaces: .all)
         })
     } else if peer.id.namespace == Namespaces.Peer.CloudUser {
         if let inputPeer = apiInputPeer(peer) {
@@ -330,7 +330,7 @@ private func removeChat(transaction: Transaction, postbox: Postbox, network: Net
             return requestClearHistory(postbox: postbox, network: network, stateManager: stateManager, inputPeer: inputPeer, maxId: operation.topMessageId?.id ?? Int32.max - 1, justClear: false, type: operation.deleteGloballyIfPossible ? .forEveryone : .forLocalPeer)
             |> then(reportSignal)
             |> then(postbox.transaction { transaction -> Void in
-                clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peer.id, namespaces: .not(Namespaces.Message.allScheduled))
+                _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peer.id, namespaces: .not(Namespaces.Message.allScheduled))
             })
         } else {
             return .complete()
@@ -376,7 +376,7 @@ private func requestClearHistory(postbox: Postbox, network: Network, stateManage
     }
 }
 
-private func clearHistory(transaction: Transaction, postbox: Postbox, network: Network, stateManager: AccountStateManager, peer: Peer, operation: CloudChatClearHistoryOperation) -> Signal<Void, NoError> {
+private func _internal_clearHistory(transaction: Transaction, postbox: Postbox, network: Network, stateManager: AccountStateManager, peer: Peer, operation: CloudChatClearHistoryOperation) -> Signal<Void, NoError> {
     if peer.id.namespace == Namespaces.Peer.CloudGroup || peer.id.namespace == Namespaces.Peer.CloudUser {
         if let inputPeer = apiInputPeer(peer) {
             return requestClearHistory(postbox: postbox, network: network, stateManager: stateManager, inputPeer: inputPeer, maxId: operation.topMessageId.id, justClear: true, type: operation.type)
diff --git a/submodules/TelegramCore/Sources/ManagedConfigurationUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/ManagedConfigurationUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
index 39de484df8..4818ad8f99 100644
--- a/submodules/TelegramCore/Sources/ManagedConfigurationUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedConfigurationUpdates.swift
@@ -90,7 +90,9 @@ func managedConfigurationUpdates(accountManager: AccountManager, postbox: Postbo
                 }
             }
             |> switchToLatest
-        }).start()
+        }).start(completed: {
+            subscriber.putCompletion()
+        })
     }
     
     return (poll |> then(.complete() |> suspendAwareDelay(1.0 * 60.0 * 60.0, queue: Queue.concurrentDefaultQueue()))) |> restart
diff --git a/submodules/TelegramCore/Sources/ManagedConsumePersonalMessagesActions.swift b/submodules/TelegramCore/Sources/State/ManagedConsumePersonalMessagesActions.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedConsumePersonalMessagesActions.swift
rename to submodules/TelegramCore/Sources/State/ManagedConsumePersonalMessagesActions.swift
diff --git a/submodules/TelegramCore/Sources/ManagedGlobalNotificationSettings.swift b/submodules/TelegramCore/Sources/State/ManagedGlobalNotificationSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedGlobalNotificationSettings.swift
rename to submodules/TelegramCore/Sources/State/ManagedGlobalNotificationSettings.swift
diff --git a/submodules/TelegramCore/Sources/ManagedLocalInputActivities.swift b/submodules/TelegramCore/Sources/State/ManagedLocalInputActivities.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/ManagedLocalInputActivities.swift
rename to submodules/TelegramCore/Sources/State/ManagedLocalInputActivities.swift
index 95b5eea8cf..c422460cf4 100644
--- a/submodules/TelegramCore/Sources/ManagedLocalInputActivities.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedLocalInputActivities.swift
@@ -143,7 +143,14 @@ private func requestActivity(postbox: Postbox, network: Network, accountPeerId:
                 return .complete()
             }
             if let channel = peer as? TelegramChannel, case .broadcast = channel.info {
-                return .complete()
+                if let activity = activity {
+                    switch activity {
+                    case .speakingInGroupCall:
+                        break
+                    default:
+                        return .complete()
+                    }
+                }
             }
             if let _ = peer as? TelegramUser {
                 if let presence = transaction.getPeerPresence(peerId: peerId) as? TelegramUserPresence {
@@ -177,7 +184,8 @@ private func requestActivity(postbox: Postbox, network: Network, accountPeerId:
                     return .complete()
                 }
             } else if let peer = peer as? TelegramSecretChat, activity == .typingText {
-                return network.request(Api.functions.messages.setEncryptedTyping(peer: .inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash), typing: .boolTrue))
+                let _ = PeerId(peer.id.toInt64())
+                return network.request(Api.functions.messages.setEncryptedTyping(peer: .inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash), typing: .boolTrue))
                 |> `catch` { _ -> Signal<Api.Bool, NoError> in
                     return .single(.boolFalse)
                 }
diff --git a/submodules/TelegramCore/Sources/ManagedLocalizationUpdatesOperations.swift b/submodules/TelegramCore/Sources/State/ManagedLocalizationUpdatesOperations.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/ManagedLocalizationUpdatesOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedLocalizationUpdatesOperations.swift
index 4a95be5cf0..68157e0cfd 100644
--- a/submodules/TelegramCore/Sources/ManagedLocalizationUpdatesOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedLocalizationUpdatesOperations.swift
@@ -228,7 +228,7 @@ private func synchronizeLocalizationUpdates(accountManager: AccountManager, post
             case .reset:
                 return accountManager.transaction { transaction -> Signal<Void, Void> in
                     let (primary, _) = getLocalization(transaction)
-                    return downloadAndApplyLocalization(accountManager: accountManager, postbox: postbox, network: network, languageCode: primary.code)
+                    return _internal_downloadAndApplyLocalization(accountManager: accountManager, postbox: postbox, network: network, languageCode: primary.code)
                     |> mapError { _ -> Void in
                         return Void()
                     }
diff --git a/submodules/TelegramCore/Sources/ManagedMessageHistoryHoles.swift b/submodules/TelegramCore/Sources/State/ManagedMessageHistoryHoles.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedMessageHistoryHoles.swift
rename to submodules/TelegramCore/Sources/State/ManagedMessageHistoryHoles.swift
diff --git a/submodules/TelegramCore/Sources/ManagedNotificationSettingsBehaviors.swift b/submodules/TelegramCore/Sources/State/ManagedNotificationSettingsBehaviors.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedNotificationSettingsBehaviors.swift
rename to submodules/TelegramCore/Sources/State/ManagedNotificationSettingsBehaviors.swift
diff --git a/submodules/TelegramCore/Sources/ManagedPendingPeerNotificationSettings.swift b/submodules/TelegramCore/Sources/State/ManagedPendingPeerNotificationSettings.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedPendingPeerNotificationSettings.swift
rename to submodules/TelegramCore/Sources/State/ManagedPendingPeerNotificationSettings.swift
diff --git a/submodules/TelegramCore/Sources/ManagedProxyInfoUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedProxyInfoUpdates.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedProxyInfoUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedProxyInfoUpdates.swift
diff --git a/submodules/TelegramCore/Sources/ManagedRecentStickers.swift b/submodules/TelegramCore/Sources/State/ManagedRecentStickers.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/ManagedRecentStickers.swift
rename to submodules/TelegramCore/Sources/State/ManagedRecentStickers.swift
index 8323da2f5f..d1f3c2d489 100644
--- a/submodules/TelegramCore/Sources/ManagedRecentStickers.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedRecentStickers.swift
@@ -27,8 +27,18 @@ private func managedRecentMedia(postbox: Postbox, network: Network, collectionId
             itemIds.reverse()
         }
         return fetch(forceFetch ? 0 : hashForIds(itemIds))
-            |> mapToSignal { items in
-                if let items = items {
+            |> mapToSignal { sourceItems in
+                var items: [OrderedItemListEntry] = []
+                if let sourceItems = sourceItems {
+                    var existingIds = Set<Data>()
+                    for item in sourceItems {
+                        let id = item.id.makeData()
+                        if !existingIds.contains(id) {
+                            existingIds.insert(id)
+                            items.append(item)
+                        }
+                    }
+
                     return postbox.transaction { transaction -> Void in
                         transaction.replaceOrderedItemListItems(collectionId: collectionId, items: items)
                     }
diff --git a/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSecretChatOutgoingOperations.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSecretChatOutgoingOperations.swift
index e8cedadb60..56262edfa6 100644
--- a/submodules/TelegramCore/Sources/ManagedSecretChatOutgoingOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedSecretChatOutgoingOperations.swift
@@ -227,7 +227,7 @@ private func initialHandshakeAccept(postbox: Postbox, network: Network, peerId:
             memcpy(&keyFingerprint, bytes.advanced(by: keyHash.count - 8), 8)
         }
         
-        let result = network.request(Api.functions.messages.acceptEncryption(peer: .inputEncryptedChat(chatId: peerId.id, accessHash: accessHash), gB: Buffer(data: gb), keyFingerprint: keyFingerprint))
+        let result = network.request(Api.functions.messages.acceptEncryption(peer: .inputEncryptedChat(chatId: peerId.id._internalGetInt32Value(), accessHash: accessHash), gB: Buffer(data: gb), keyFingerprint: keyFingerprint))
         
         let response = result
         |> map { result -> Api.EncryptedChat? in
@@ -245,7 +245,7 @@ private func initialHandshakeAccept(postbox: Postbox, network: Network, peerId:
                 if let state = transaction.getPeerChatState(peerId) as? SecretChatState {
                     var updatedState = state
                     updatedState = updatedState.withUpdatedKeychain(SecretChatKeychain(keys: [SecretChatKey(fingerprint: keyFingerprint, key: MemoryBuffer(data: key), validity: .indefinite, useCount: 0)]))
-                    updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer46, locallyRequestedLayer: nil, remotelyRequestedLayer: nil), rekeyState: nil, baseIncomingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretIncomingDecrypted), baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)))
+                    updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer73, locallyRequestedLayer: nil, remotelyRequestedLayer: nil), rekeyState: nil, baseIncomingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretIncomingDecrypted), baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)))
                     updatedState = updatedState.withUpdatedKeyFingerprint(SecretChatKeyFingerprint(sha1: SecretChatKeySha1Fingerprint(digest: sha1Digest(key)), sha256: SecretChatKeySha256Fingerprint(digest: sha256Digest(key))))
                     
                     var layer: SecretChatLayer?
@@ -258,7 +258,7 @@ private func initialHandshakeAccept(postbox: Postbox, network: Network, peerId:
                             layer = sequenceState.layerNegotiationState.activeLayer.secretChatLayer
                     }
                     if let layer = layer {
-                        updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: layer, actionGloballyUniqueId: arc4random64(), layerSupport: 46), state: updatedState)
+                        updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: 46), state: updatedState)
                     }
                     transaction.setPeerChatState(peerId, state: updatedState)
                     if let peer = transaction.getPeer(peerId) as? TelegramSecretChat {
@@ -1352,7 +1352,7 @@ private func markOutgoingOperationAsCompleted(transaction: Transaction, peerId:
             if let operation = entry?.contents as? SecretChatOutgoingOperation {
                 return PeerOperationLogEntryUpdate(mergedIndex: .remove, contents: .update(operation.withUpdatedDelivered(true)))
             } else {
-                assertionFailure()
+                //assertionFailure()
                 return PeerOperationLogEntryUpdate(mergedIndex: .remove, contents: .none)
             }
         })
@@ -1377,7 +1377,7 @@ private func replaceOutgoingOperationWithEmptyMessage(transaction: Transaction,
     if let layer = layer {
         transaction.operationLogUpdateEntry(peerId: peerId, tag: OperationLogTags.SecretOutgoing, tagLocalIndex: tagLocalIndex, { entry in
             if let _ = entry?.contents as? SecretChatOutgoingOperation {
-                return PeerOperationLogEntryUpdate(mergedIndex: .none, contents: .update(SecretChatOutgoingOperation(contents: SecretChatOutgoingOperationContents.deleteMessages(layer: layer, actionGloballyUniqueId: arc4random64(), globallyUniqueIds: [globallyUniqueId]), mutable: true, delivered: false)))
+                return PeerOperationLogEntryUpdate(mergedIndex: .none, contents: .update(SecretChatOutgoingOperation(contents: SecretChatOutgoingOperationContents.deleteMessages(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), globallyUniqueIds: [globallyUniqueId]), mutable: true, delivered: false)))
             } else {
                 assertionFailure()
                 return PeerOperationLogEntryUpdate(mergedIndex: .remove, contents: .none)
@@ -1519,8 +1519,8 @@ private func sendMessage(auxiliaryMethods: AccountAuxiliaryMethods, postbox: Pos
                         }
                     }
                 } else {
-                    replaceOutgoingOperationWithEmptyMessage(transaction: transaction, peerId: messageId.peerId, tagLocalIndex: tagLocalIndex, globallyUniqueId: arc4random64())
-                    deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [messageId])
+                    replaceOutgoingOperationWithEmptyMessage(transaction: transaction, peerId: messageId.peerId, tagLocalIndex: tagLocalIndex, globallyUniqueId: Int64.random(in: Int64.min ... Int64.max))
+                    _internal_deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: [messageId])
                     return .complete()
                 }
             } else {
@@ -1636,7 +1636,7 @@ private func sendBoxedDecryptedMessage(postbox: Postbox, network: Network, peer:
     decryptedMessage.serialize(payload, role: state.role, sequenceInfo: sequenceInfo)
     let encryptedPayload = encryptedMessageContents(parameters: parameters, data: MemoryBuffer(payload))
     let sendMessage: Signal<Api.messages.SentEncryptedMessage, MTRpcError>
-    let inputPeer = Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash)
+    let inputPeer = Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash)
     
     var flags: Int32 = 0
     if silent {
@@ -1646,7 +1646,7 @@ private func sendBoxedDecryptedMessage(postbox: Postbox, network: Network, peer:
     if asService {
         let actionRandomId: Int64
         if wasDelivered {
-            actionRandomId = arc4random64()
+            actionRandomId = Int64.random(in: Int64.min ... Int64.max)
         } else {
             actionRandomId = globallyUniqueId
         }
@@ -1676,7 +1676,7 @@ private func requestTerminateSecretChat(postbox: Postbox, network: Network, peer
     if requestRemoteHistoryRemoval {
         flags |= 1 << 0
     }
-    return network.request(Api.functions.messages.discardEncryption(flags: flags, chatId: peerId.id))
+    return network.request(Api.functions.messages.discardEncryption(flags: flags, chatId: peerId.id._internalGetInt32Value()))
     |> map(Optional.init)
     |> `catch` { _ in
         return .single(nil)
@@ -1692,7 +1692,7 @@ private func requestTerminateSecretChat(postbox: Postbox, network: Network, peer
             }
             |> mapToSignal { peer -> Signal<Void, NoError> in
                 if let peer = peer {
-                    return network.request(Api.functions.messages.reportEncryptedSpam(peer: Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash)))
+                    return network.request(Api.functions.messages.reportEncryptedSpam(peer: Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash)))
                     |> map(Optional.init)
                     |> `catch` { _ -> Signal<Api.Bool?, NoError> in
                         return .single(nil)
diff --git a/submodules/TelegramCore/Sources/ManagedServiceViews.swift b/submodules/TelegramCore/Sources/State/ManagedServiceViews.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedServiceViews.swift
rename to submodules/TelegramCore/Sources/State/ManagedServiceViews.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeAppLogEventsOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeAppLogEventsOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeAppLogEventsOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeAppLogEventsOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeChatInputStateOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeChatInputStateOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeChatInputStateOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeChatInputStateOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeConsumeMessageContentsOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeConsumeMessageContentsOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeConsumeMessageContentsOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeConsumeMessageContentsOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeEmojiKeywordsOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeEmojiKeywordsOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeEmojiKeywordsOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeEmojiKeywordsOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeGroupMessageStats.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeGroupMessageStats.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeGroupMessageStats.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeGroupMessageStats.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeGroupedPeersOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeGroupedPeersOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeGroupedPeersOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeGroupedPeersOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeInstalledStickerPacksOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeInstalledStickerPacksOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeInstalledStickerPacksOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeInstalledStickerPacksOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeMarkAllUnseenPersonalMessagesOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeMarkFeaturedStickerPacksAsSeenOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizePeerReadStates.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizePeerReadStates.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizePeerReadStates.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizePeerReadStates.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizePinnedChatsOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizePinnedChatsOperations.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/ManagedSynchronizePinnedChatsOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizePinnedChatsOperations.swift
index b5ff3b474e..90280571f0 100644
--- a/submodules/TelegramCore/Sources/ManagedSynchronizePinnedChatsOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedSynchronizePinnedChatsOperations.swift
@@ -83,7 +83,7 @@ func managedSynchronizePinnedChatsOperations(postbox: Postbox, network: Network,
                 let signal = withTakenOperation(postbox: postbox, peerId: entry.peerId, tagLocalIndex: entry.tagLocalIndex, { transaction, entry -> Signal<Void, NoError> in
                     if let entry = entry {
                         if let operation = entry.contents as? SynchronizePinnedChatsOperation {
-                            return synchronizePinnedChats(transaction: transaction, postbox: postbox, network: network, accountPeerId: accountPeerId, stateManager: stateManager, groupId: PeerGroupId(rawValue: entry.peerId.id), operation: operation)
+                            return synchronizePinnedChats(transaction: transaction, postbox: postbox, network: network, accountPeerId: accountPeerId, stateManager: stateManager, groupId: PeerGroupId(rawValue: entry.peerId.id._internalGetInt32Value()), operation: operation)
                         } else {
                             assertionFailure()
                         }
@@ -182,15 +182,7 @@ private func synchronizePinnedChats(transaction: Transaction, postbox: Postbox,
                             continue loop
                     }
                     
-                    let peerId: PeerId
-                    switch apiPeer {
-                        case let .peerUser(userId):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                        case let .peerChat(chatId):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                        case let .peerChannel(channelId):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                    }
+                    let peerId: PeerId = apiPeer.peerId
                     
                     remoteItemIds.append(.peer(peerId))
                     
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeRecentlyUsedMediaOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeRecentlyUsedMediaOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeRecentlyUsedMediaOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeRecentlyUsedMediaOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeSavedGifsOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeSavedGifsOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeSavedGifsOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeSavedGifsOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedSynchronizeSavedStickersOperations.swift b/submodules/TelegramCore/Sources/State/ManagedSynchronizeSavedStickersOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ManagedSynchronizeSavedStickersOperations.swift
rename to submodules/TelegramCore/Sources/State/ManagedSynchronizeSavedStickersOperations.swift
diff --git a/submodules/TelegramCore/Sources/ManagedVoipConfigurationUpdates.swift b/submodules/TelegramCore/Sources/State/ManagedVoipConfigurationUpdates.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/ManagedVoipConfigurationUpdates.swift
rename to submodules/TelegramCore/Sources/State/ManagedVoipConfigurationUpdates.swift
index b3da17c751..2465ca6d99 100644
--- a/submodules/TelegramCore/Sources/ManagedVoipConfigurationUpdates.swift
+++ b/submodules/TelegramCore/Sources/State/ManagedVoipConfigurationUpdates.swift
@@ -19,7 +19,9 @@ func managedVoipConfigurationUpdates(postbox: Postbox, network: Network) -> Sign
                         })
                 }
             }
-        }).start()
+        }).start(completed: {
+            subscriber.putCompletion()
+        })
     }
     return (poll |> then(.complete() |> suspendAwareDelay(12.0 * 60.0 * 60.0, queue: Queue.concurrentDefaultQueue()))) |> restart
 }
diff --git a/submodules/TelegramCore/Sources/MessageMediaPreuploadManager.swift b/submodules/TelegramCore/Sources/State/MessageMediaPreuploadManager.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/MessageMediaPreuploadManager.swift
rename to submodules/TelegramCore/Sources/State/MessageMediaPreuploadManager.swift
index e53e9b0414..dedd571f41 100644
--- a/submodules/TelegramCore/Sources/MessageMediaPreuploadManager.swift
+++ b/submodules/TelegramCore/Sources/State/MessageMediaPreuploadManager.swift
@@ -33,7 +33,7 @@ private final class MessageMediaPreuploadManagerContext {
         assert(self.queue.isCurrent())
     }
     
-    func add(network: Network, postbox: Postbox, id: Int64, encrypt: Bool, tag: MediaResourceFetchTag?, source: Signal<MediaResourceData, NoError>, onComplete:(()->Void)? = nil) {
+    func add(network: Network, postbox: Postbox, id: Int64, encrypt: Bool, tag: MediaResourceFetchTag?, source: Signal<MediaResourceData, NoError>, onComplete: (()->Void)? = nil) {
         let context = MessageMediaPreuploadManagerUploadContext()
         self.uploadContexts[id] = context
         let queue = self.queue
@@ -103,7 +103,7 @@ private final class MessageMediaPreuploadManagerContext {
     }
 }
 
-public final class MessageMediaPreuploadManager {
+final class MessageMediaPreuploadManager {
     private let impl: QueueLocalObject<MessageMediaPreuploadManagerContext>
     
     init() {
@@ -113,7 +113,7 @@ public final class MessageMediaPreuploadManager {
         })
     }
     
-    public func add(network: Network, postbox: Postbox, id: Int64, encrypt: Bool, tag: MediaResourceFetchTag?, source: Signal<MediaResourceData, NoError>, onComplete:(()->Void)? = nil) {
+    func add(network: Network, postbox: Postbox, id: Int64, encrypt: Bool, tag: MediaResourceFetchTag?, source: Signal<MediaResourceData, NoError>, onComplete:(()->Void)? = nil) {
         self.impl.with { context in
             context.add(network: network, postbox: postbox, id: id, encrypt: encrypt, tag: tag, source: source, onComplete: onComplete)
         }
diff --git a/submodules/TelegramCore/Sources/MessageReactions.swift b/submodules/TelegramCore/Sources/State/MessageReactions.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/MessageReactions.swift
rename to submodules/TelegramCore/Sources/State/MessageReactions.swift
diff --git a/submodules/TelegramCore/Sources/PeerInputActivity.swift b/submodules/TelegramCore/Sources/State/PeerInputActivity.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/PeerInputActivity.swift
rename to submodules/TelegramCore/Sources/State/PeerInputActivity.swift
index 36ff067c50..611ee31e27 100644
--- a/submodules/TelegramCore/Sources/PeerInputActivity.swift
+++ b/submodules/TelegramCore/Sources/State/PeerInputActivity.swift
@@ -63,7 +63,7 @@ extension PeerInputActivity {
                 self = .uploadingInstantVideo(progress: progress)
             case .speakingInGroupCallAction:
                 self = .speakingInGroupCall(timestamp: timestamp)
-            case let .sendMessageHistoryImportAction(progress):
+            case let .sendMessageHistoryImportAction:
                 return nil
         }
     }
diff --git a/submodules/TelegramCore/Sources/PeerInputActivityManager.swift b/submodules/TelegramCore/Sources/State/PeerInputActivityManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/PeerInputActivityManager.swift
rename to submodules/TelegramCore/Sources/State/PeerInputActivityManager.swift
diff --git a/submodules/TelegramCore/Sources/PendingMessageManager.swift b/submodules/TelegramCore/Sources/State/PendingMessageManager.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/PendingMessageManager.swift
rename to submodules/TelegramCore/Sources/State/PendingMessageManager.swift
diff --git a/submodules/TelegramCore/Sources/ProcessSecretChatIncomingDecryptedOperations.swift b/submodules/TelegramCore/Sources/State/ProcessSecretChatIncomingDecryptedOperations.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/ProcessSecretChatIncomingDecryptedOperations.swift
rename to submodules/TelegramCore/Sources/State/ProcessSecretChatIncomingDecryptedOperations.swift
index ee7c56aaf5..d9f28c1f79 100644
--- a/submodules/TelegramCore/Sources/ProcessSecretChatIncomingDecryptedOperations.swift
+++ b/submodules/TelegramCore/Sources/State/ProcessSecretChatIncomingDecryptedOperations.swift
@@ -190,7 +190,7 @@ func processSecretChatIncomingDecryptedOperations(encryptionProvider: Encryption
                                                     let role = updatedState.role
                                                     let fromSeqNo: Int32 = (topProcessedCanonicalIncomingOperationIndex + 1) * 2 + (role == .creator ? 0 : 1)
                                                     let toSeqNo: Int32 = (canonicalIncomingIndex - 1) * 2 + (role == .creator ? 0 : 1)
-                                                    updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.resendOperations(layer: layer, actionGloballyUniqueId: arc4random64(), fromSeqNo: fromSeqNo, toSeqNo: toSeqNo), state: updatedState)
+                                                    updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.resendOperations(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), fromSeqNo: fromSeqNo, toSeqNo: toSeqNo), state: updatedState)
                                                 } else {
                                                     assertionFailure()
                                                 }
@@ -204,7 +204,7 @@ func processSecretChatIncomingDecryptedOperations(encryptionProvider: Encryption
                                                 let role = updatedState.role
                                                 let fromSeqNo: Int32 = Int32(0 * 2) + (role == .creator ? Int32(0) : Int32(1))
                                                 let toSeqNo: Int32 = (canonicalIncomingIndex - 1) * 2 + (role == .creator ? 0 : 1)
-                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.resendOperations(layer: layer, actionGloballyUniqueId: arc4random64(), fromSeqNo: fromSeqNo, toSeqNo: toSeqNo), state: updatedState)
+                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.resendOperations(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), fromSeqNo: fromSeqNo, toSeqNo: toSeqNo), state: updatedState)
                                             } else {
                                                 assertionFailure()
                                             }
@@ -230,15 +230,15 @@ func processSecretChatIncomingDecryptedOperations(encryptionProvider: Encryption
                                             if layerSupport >= 101 {
                                                 let sequenceBasedLayerState = SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer101, locallyRequestedLayer: 101, remotelyRequestedLayer: layerSupport), rekeyState: nil, baseIncomingOperationIndex: entry.tagLocalIndex, baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)
                                                 updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceBasedLayerState))
-                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer101, actionGloballyUniqueId: arc4random64(), layerSupport: 101), state: updatedState)
+                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer101, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: 101), state: updatedState)
                                             } else if layerSupport >= 73 {
                                                 let sequenceBasedLayerState = SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer73, locallyRequestedLayer: 73, remotelyRequestedLayer: layerSupport), rekeyState: nil, baseIncomingOperationIndex: entry.tagLocalIndex, baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)
                                                 updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceBasedLayerState))
-                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer73, actionGloballyUniqueId: arc4random64(), layerSupport: 101), state: updatedState)
+                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer73, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: 101), state: updatedState)
                                             } else if layerSupport >= 46 {
-                                                let sequenceBasedLayerState = SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer46, locallyRequestedLayer: 46, remotelyRequestedLayer: layerSupport), rekeyState: nil, baseIncomingOperationIndex: entry.tagLocalIndex, baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)
+                                                let sequenceBasedLayerState = SecretChatSequenceBasedLayerState(layerNegotiationState: SecretChatLayerNegotiationState(activeLayer: .layer73, locallyRequestedLayer: 46, remotelyRequestedLayer: layerSupport), rekeyState: nil, baseIncomingOperationIndex: entry.tagLocalIndex, baseOutgoingOperationIndex: transaction.operationLogGetNextEntryLocalIndex(peerId: peerId, tag: OperationLogTags.SecretOutgoing), topProcessedCanonicalIncomingOperationIndex: nil)
                                                 updatedState = updatedState.withUpdatedEmbeddedState(.sequenceBasedLayer(sequenceBasedLayerState))
-                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer46, actionGloballyUniqueId: arc4random64(), layerSupport: 101), state: updatedState)
+                                                updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: .reportLayerSupport(layer: .layer73, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), layerSupport: 101), state: updatedState)
                                             } else {
                                                 throw MessageParsingError.contentParsingError
                                             }
@@ -276,10 +276,10 @@ func processSecretChatIncomingDecryptedOperations(encryptionProvider: Encryption
                                                 }
                                             }
                                         }
-                                        deleteMessages(transaction: transaction, mediaBox: mediaBox, ids: filteredMessageIds)
+                                        _internal_deleteMessages(transaction: transaction, mediaBox: mediaBox, ids: filteredMessageIds)
                                     }
                                 case .clearHistory:
-                                    clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
+                                    _internal_clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
                                 case let .markMessagesContentAsConsumed(globallyUniqueIds):
                                     var messageIds: [MessageId] = []
                                     for id in globallyUniqueIds {
@@ -711,11 +711,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         if let file = file {
                             var representations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
-                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: []))
+                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: [], immediateThumbnailData: nil))
                             let image = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.CloudSecretImage, id: file.id), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                             parsedMedia.append(image)
                         }
@@ -737,8 +737,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             }
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -752,8 +752,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             let parsedAttributes: [TelegramMediaFileAttribute] = [.Video(duration: Int(duration), size: PixelDimensions(width: w, height: h), flags: []), .FileName(fileName: "video.mov")]
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -771,7 +771,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             case let .photoSize(_, location, w, h, size):
                                 switch location {
                                     case let .fileLocation(dcId, volumeId, localId, secret):
-                                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: []))
+                                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: [], immediateThumbnailData: nil))
                                     case .fileLocationUnavailable:
                                         break
                                 }
@@ -781,7 +781,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                                         case let .fileLocation(dcId, volumeId, localId, secret):
                                            let resource = CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: bytes.size, fileReference: nil)
                                            resources.append((resource, bytes.makeData()))
-                                           previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
+                                           previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                         case .fileLocationUnavailable:
                                             break
                                     }
@@ -792,11 +792,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudFile, id: id), partialReference: nil, resource: CloudDocumentMediaResource(datacenterId: Int(dcId), fileId: id, accessHash: accessHash, size: Int(size), fileReference: nil, fileName: nil), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
                         parsedMedia.append(fileMedia)
                     case let .decryptedMessageMediaWebPage(url):
-                        parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: arc4random64()), content: .Pending(0, url)))
+                        parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: Int64.random(in: Int64.min ... Int64.max)), content: .Pending(0, url)))
                     case let .decryptedMessageMediaGeoPoint(lat, long):
                         parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                     case let .decryptedMessageMediaContact(phoneNumber, firstName, lastName, userId):
-                        parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), vCardData: nil))
+                        parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), vCardData: nil))
                     case let .decryptedMessageMediaVenue(lat, long, title, address, provider, venueId):
                         parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: MapVenue(title: title, address: address, provider: provider, id: venueId, type: nil), liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                     case .decryptedMessageMediaEmpty:
@@ -913,11 +913,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         if let file = file {
                             var representations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
-                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: []))
+                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: [], immediateThumbnailData: nil))
                             let image = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.CloudSecretImage, id: file.id), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                             parsedMedia.append(image)
                         }
@@ -940,8 +940,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             }
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -971,8 +971,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             let parsedAttributes: [TelegramMediaFileAttribute] = [.Video(duration: Int(duration), size: PixelDimensions(width: w, height: h), flags: []), .FileName(fileName: "video.mov")]
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -990,7 +990,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             case let .photoSize(_, location, w, h, size):
                                 switch location {
                                     case let .fileLocation(dcId, volumeId, localId, secret):
-                                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: []))
+                                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: [], immediateThumbnailData: nil))
                                     case .fileLocationUnavailable:
                                         break
                                 }
@@ -1000,7 +1000,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                                         case let .fileLocation(dcId, volumeId, localId, secret):
                                             let resource = CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: bytes.size, fileReference: nil)
                                             resources.append((resource, bytes.makeData()))
-                                            previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
+                                            previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                         case .fileLocationUnavailable:
                                             break
                                     }
@@ -1011,11 +1011,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudFile, id: id), partialReference: nil, resource: CloudDocumentMediaResource(datacenterId: Int(dcId), fileId: id, accessHash: accessHash, size: Int(size), fileReference: nil, fileName: nil), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
                         parsedMedia.append(fileMedia)
                     case let .decryptedMessageMediaWebPage(url):
-                        parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: arc4random64()), content: .Pending(0, url)))
+                        parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: Int64.random(in: Int64.min ... Int64.max)), content: .Pending(0, url)))
                     case let .decryptedMessageMediaGeoPoint(lat, long):
                         parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                     case let .decryptedMessageMediaContact(phoneNumber, firstName, lastName, userId):
-                        parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), vCardData: nil))
+                        parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), vCardData: nil))
                     case let .decryptedMessageMediaVenue(lat, long, title, address, provider, venueId):
                         parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: MapVenue(title: title, address: address, provider: provider, id: venueId, type: nil), liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                     case .decryptedMessageMediaEmpty:
@@ -1151,11 +1151,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         if let file = file {
                             var representations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
-                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: []))
+                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), progressiveSizes: [], immediateThumbnailData: nil))
                             let image = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.CloudSecretImage, id: file.id), representations: representations, immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                             parsedMedia.append(image)
                         }
@@ -1178,8 +1178,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             }
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -1209,8 +1209,8 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                             let parsedAttributes: [TelegramMediaFileAttribute] = [.Video(duration: Int(duration), size: PixelDimensions(width: w, height: h), flags: []), .FileName(fileName: "video.mov")]
                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                             if thumb.size != 0 {
-                                let resource = LocalFileMediaResource(fileId: arc4random64())
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: []))
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: thumbW, height: thumbH), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 resources.append((resource, thumb.makeData()))
                             }
                             let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudSecretFile, id: file.id), partialReference: nil, resource: file.resource(key: SecretFileEncryptionKey(aesKey: key.makeData(), aesIv: iv.makeData()), decryptedSize: size), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
@@ -1228,7 +1228,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                         case let .photoSize(_, location, w, h, size):
                             switch location {
                             case let .fileLocation(dcId, volumeId, localId, secret):
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: []))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: size == 0 ? nil : Int(size), fileReference: nil), progressiveSizes: [], immediateThumbnailData: nil))
                             case .fileLocationUnavailable:
                                 break
                             }
@@ -1238,7 +1238,7 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                                 case let .fileLocation(dcId, volumeId, localId, secret):
                                     let resource = CloudFileMediaResource(datacenterId: Int(dcId), volumeId: volumeId, localId: localId, secret: secret, size: bytes.size, fileReference: nil)
                                     resources.append((resource, bytes.makeData()))
-                                    previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
+                                    previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                                 case .fileLocationUnavailable:
                                     break
                                 }
@@ -1249,11 +1249,11 @@ private func parseMessage(peerId: PeerId, authorId: PeerId, tagLocalIndex: Int32
                     let fileMedia = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.CloudFile, id: id), partialReference: nil, resource: CloudDocumentMediaResource(datacenterId: Int(dcId), fileId: id, accessHash: accessHash, size: Int(size), fileReference: nil, fileName: nil), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: Int(size), attributes: parsedAttributes)
                     parsedMedia.append(fileMedia)
                 case let .decryptedMessageMediaWebPage(url):
-                    parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: arc4random64()), content: .Pending(0, url)))
+                    parsedMedia.append(TelegramMediaWebpage(webpageId: MediaId(namespace: Namespaces.Media.LocalWebpage, id: Int64.random(in: Int64.min ... Int64.max)), content: .Pending(0, url)))
                 case let .decryptedMessageMediaGeoPoint(lat, long):
                     parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                 case let .decryptedMessageMediaContact(phoneNumber, firstName, lastName, userId):
-                    parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), vCardData: nil))
+                    parsedMedia.append(TelegramMediaContact(firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, peerId: userId == 0 ? nil : PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), vCardData: nil))
                 case let .decryptedMessageMediaVenue(lat, long, title, address, provider, venueId):
                     parsedMedia.append(TelegramMediaMap(latitude: lat, longitude: long, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: MapVenue(title: title, address: address, provider: provider, id: venueId, type: nil), liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil))
                 case .decryptedMessageMediaEmpty:
diff --git a/submodules/TelegramCore/Sources/ProcessSecretChatIncomingEncryptedOperations.swift b/submodules/TelegramCore/Sources/State/ProcessSecretChatIncomingEncryptedOperations.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ProcessSecretChatIncomingEncryptedOperations.swift
rename to submodules/TelegramCore/Sources/State/ProcessSecretChatIncomingEncryptedOperations.swift
diff --git a/submodules/TelegramCore/Sources/Serialization.swift b/submodules/TelegramCore/Sources/State/Serialization.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/Serialization.swift
rename to submodules/TelegramCore/Sources/State/Serialization.swift
index f0775e12ba..96684c4e81 100644
--- a/submodules/TelegramCore/Sources/Serialization.swift
+++ b/submodules/TelegramCore/Sources/State/Serialization.swift
@@ -210,7 +210,7 @@ public class BoxedMessage: NSObject {
 
 public class Serialization: NSObject, MTSerialization {
     public func currentLayer() -> UInt {
-        return 125
+        return 131
     }
     
     public func parseMessage(_ data: Data!) -> Any! {
diff --git a/submodules/TelegramCore/Sources/StickerManagement.swift b/submodules/TelegramCore/Sources/State/StickerManagement.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/StickerManagement.swift
rename to submodules/TelegramCore/Sources/State/StickerManagement.swift
index ab3da0cac2..4aefb157f1 100644
--- a/submodules/TelegramCore/Sources/StickerManagement.swift
+++ b/submodules/TelegramCore/Sources/State/StickerManagement.swift
@@ -90,7 +90,7 @@ public func preloadedFeaturedStickerSet(network: Network, postbox: Postbox, id:
     return postbox.transaction { transaction -> Signal<Void, NoError> in
         if let pack = transaction.getOrderedItemListItem(collectionId: Namespaces.OrderedItemList.CloudFeaturedStickerPacks, itemId: FeaturedStickerPackItemId(id.id).rawValue)?.contents as? FeaturedStickerPackItem {
             if pack.topItems.count < 5 && pack.topItems.count < pack.info.count {
-                return requestStickerSet(postbox: postbox, network: network, reference: .id(id: pack.info.id.id, accessHash: pack.info.accessHash))
+                return _internal_requestStickerSet(postbox: postbox, network: network, reference: .id(id: pack.info.id.id, accessHash: pack.info.accessHash))
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<RequestStickerSetResult?, NoError> in
                     return .single(nil)
diff --git a/submodules/TelegramCore/Sources/SynchronizeAppLogEventsOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeAppLogEventsOperation.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/SynchronizeAppLogEventsOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeAppLogEventsOperation.swift
index 541fb91a73..7ab8ac4b8f 100644
--- a/submodules/TelegramCore/Sources/SynchronizeAppLogEventsOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeAppLogEventsOperation.swift
@@ -7,7 +7,7 @@ import SyncCore
 
 public func addAppLogEvent(postbox: Postbox, time: Double = Date().timeIntervalSince1970, type: String, peerId: PeerId? = nil, data: JSON = .dictionary([:])) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeAppLogEvents
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     let _ = (postbox.transaction { transaction in
         transaction.operationLogAddEntry(peerId: peerId, tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SynchronizeAppLogEventsOperation(content: .add(time: time, type: type, peerId: peerId, data: data)))
     }).start()
@@ -15,7 +15,7 @@ public func addAppLogEvent(postbox: Postbox, time: Double = Date().timeIntervalS
 
 public func invokeAppLogEventsSynchronization(postbox: Postbox) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeAppLogEvents
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     let _ = (postbox.transaction { transaction in
         var topOperation: (SynchronizeSavedStickersOperation, Int32)?
diff --git a/submodules/TelegramCore/Sources/SynchronizeChatInputStateOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeChatInputStateOperation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SynchronizeChatInputStateOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeChatInputStateOperation.swift
diff --git a/submodules/TelegramCore/Sources/SynchronizeConsumeMessageContentsOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeConsumeMessageContentsOperation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SynchronizeConsumeMessageContentsOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeConsumeMessageContentsOperation.swift
diff --git a/submodules/TelegramCore/Sources/SynchronizeEmojiKeywordsOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeEmojiKeywordsOperation.swift
similarity index 82%
rename from submodules/TelegramCore/Sources/SynchronizeEmojiKeywordsOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeEmojiKeywordsOperation.swift
index 52fb84441a..7baa130399 100644
--- a/submodules/TelegramCore/Sources/SynchronizeEmojiKeywordsOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeEmojiKeywordsOperation.swift
@@ -1,11 +1,12 @@
 import Foundation
 import Postbox
+import MurMurHash32
 
 import SyncCore
 
 func addSynchronizeEmojiKeywordsOperation(transaction: Transaction, inputLanguageCode: String, languageCode: String?, fromVersion: Int32?) {
     let tag = OperationLogTags.SynchronizeEmojiKeywords
-    let peerId = PeerId(emojiKeywordColletionIdForCode(inputLanguageCode).id)
+    let peerId = PeerId(namespace: PeerId.Namespace._internalFromInt32Value(0), id: PeerId.Id._internalFromInt32Value(murMurHashString32(inputLanguageCode)))
     
     var hasExistingOperation = false
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag) { entry -> Bool in
diff --git a/submodules/TelegramCore/Sources/SynchronizeGroupedPeersOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeGroupedPeersOperation.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/SynchronizeGroupedPeersOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeGroupedPeersOperation.swift
index ccc308a736..ee66d432f9 100644
--- a/submodules/TelegramCore/Sources/SynchronizeGroupedPeersOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeGroupedPeersOperation.swift
@@ -36,7 +36,7 @@ public func updatePeerGroupIdInteractively(transaction: Transaction, peerId: Pee
 
 private func addSynchronizeGroupedPeersOperation(transaction: Transaction, peerId: PeerId, groupId: PeerGroupId) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeGroupedPeers
-    let logPeerId = PeerId(namespace: 0, id: 0)
+    let logPeerId = PeerId(0)
     
     transaction.operationLogAddEntry(peerId: logPeerId, tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: SynchronizeGroupedPeersOperation(peerId: peerId, groupId: groupId))
 }
diff --git a/submodules/TelegramCore/Sources/SynchronizeInstalledStickerPacksOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeInstalledStickerPacksOperation.swift
similarity index 84%
rename from submodules/TelegramCore/Sources/SynchronizeInstalledStickerPacksOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeInstalledStickerPacksOperation.swift
index f550172e03..0cb242c17f 100644
--- a/submodules/TelegramCore/Sources/SynchronizeInstalledStickerPacksOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeInstalledStickerPacksOperation.swift
@@ -35,7 +35,7 @@ func addSynchronizeInstalledStickerPacksOperation(transaction: Transaction, name
     }
     var previousStickerPackIds: [ItemCollectionId]?
     var archivedPacks: [ItemCollectionId] = []
-    transaction.operationLogEnumerateEntries(peerId: PeerId(namespace: 0, id: 0), tag: tag, { entry in
+    transaction.operationLogEnumerateEntries(peerId: PeerId(0), tag: tag, { entry in
         updateLocalIndex = entry.tagLocalIndex
         if let operation = entry.contents as? SynchronizeInstalledStickerPacksOperation {
             previousStickerPackIds = operation.previousPacks
@@ -64,16 +64,16 @@ func addSynchronizeInstalledStickerPacksOperation(transaction: Transaction, name
     }
     let operationContents = SynchronizeInstalledStickerPacksOperation(previousPacks: previousPacks, archivedPacks: archivedPacks, noDelay: noDelay)
     if let updateLocalIndex = updateLocalIndex {
-        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(namespace: 0, id: 0), tag: tag, tagLocalIndex: updateLocalIndex)
+        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(0), tag: tag, tagLocalIndex: updateLocalIndex)
     }
-    transaction.operationLogAddEntry(peerId: PeerId(namespace: 0, id: 0), tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
+    transaction.operationLogAddEntry(peerId: PeerId(0), tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
 }
 
 func addSynchronizeMarkFeaturedStickerPacksAsSeenOperation(transaction: Transaction, ids: [ItemCollectionId]) {
     var updateLocalIndex: Int32?
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeMarkFeaturedStickerPacksAsSeen
     var previousIds = Set<ItemCollectionId>()
-    transaction.operationLogEnumerateEntries(peerId: PeerId(namespace: 0, id: 0), tag: tag, { entry in
+    transaction.operationLogEnumerateEntries(peerId: PeerId(0), tag: tag, { entry in
         updateLocalIndex = entry.tagLocalIndex
         if let operation = entry.contents as? SynchronizeMarkFeaturedStickerPacksAsSeenOperation {
             previousIds = Set(operation.ids)
@@ -84,7 +84,7 @@ func addSynchronizeMarkFeaturedStickerPacksAsSeenOperation(transaction: Transact
     })
     let operationContents = SynchronizeMarkFeaturedStickerPacksAsSeenOperation(ids: Array(previousIds.union(Set(ids))))
     if let updateLocalIndex = updateLocalIndex {
-        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(namespace: 0, id: 0), tag: tag, tagLocalIndex: updateLocalIndex)
+        let _ = transaction.operationLogRemoveEntry(peerId: PeerId(0), tag: tag, tagLocalIndex: updateLocalIndex)
     }
-    transaction.operationLogAddEntry(peerId: PeerId(namespace: 0, id: 0), tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
+    transaction.operationLogAddEntry(peerId: PeerId(0), tag: tag, tagLocalIndex: .automatic, tagMergedIndex: .automatic, contents: operationContents)
 }
diff --git a/submodules/TelegramCore/Sources/SynchronizeLocalizationUpdatesOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeLocalizationUpdatesOperation.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/SynchronizeLocalizationUpdatesOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeLocalizationUpdatesOperation.swift
index f471030761..b2e72b4a2a 100644
--- a/submodules/TelegramCore/Sources/SynchronizeLocalizationUpdatesOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeLocalizationUpdatesOperation.swift
@@ -6,7 +6,7 @@ import SyncCore
 
 func addSynchronizeLocalizationUpdatesOperation(transaction: Transaction) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeLocalizationUpdates
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     var topLocalIndex: Int32?
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
diff --git a/submodules/TelegramCore/Sources/SynchronizeMarkAllUnseenPersonalMessagesOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeMarkAllUnseenPersonalMessagesOperation.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SynchronizeMarkAllUnseenPersonalMessagesOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeMarkAllUnseenPersonalMessagesOperation.swift
diff --git a/submodules/TelegramCore/Sources/SynchronizePeerReadState.swift b/submodules/TelegramCore/Sources/State/SynchronizePeerReadState.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/SynchronizePeerReadState.swift
rename to submodules/TelegramCore/Sources/State/SynchronizePeerReadState.swift
index 6d745cb599..46d81f30be 100644
--- a/submodules/TelegramCore/Sources/SynchronizePeerReadState.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizePeerReadState.swift
@@ -206,10 +206,6 @@ private func validatePeerReadState(network: Network, postbox: Postbox, stateMana
 }
 
 private func pushPeerReadState(network: Network, postbox: Postbox, stateManager: AccountStateManager, peerId: PeerId, readState: PeerReadState) -> Signal<PeerReadState, PeerReadStateValidationError> {
-    if !GlobalTelegramCoreConfiguration.readMessages {
-        return .single(readState)
-    }
-    
     if peerId.namespace == Namespaces.Peer.SecretChat {
         return inputSecretChat(postbox: postbox, peerId: peerId)
         |> mapToSignal { inputPeer -> Signal<PeerReadState, PeerReadStateValidationError> in
diff --git a/submodules/TelegramCore/Sources/SynchronizeRecentlyUsedMediaOperations.swift b/submodules/TelegramCore/Sources/State/SynchronizeRecentlyUsedMediaOperations.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/SynchronizeRecentlyUsedMediaOperations.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeRecentlyUsedMediaOperations.swift
index c8104c39fd..ab5ca09fab 100644
--- a/submodules/TelegramCore/Sources/SynchronizeRecentlyUsedMediaOperations.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeRecentlyUsedMediaOperations.swift
@@ -14,7 +14,7 @@ func addSynchronizeRecentlyUsedMediaOperation(transaction: Transaction, category
         case .stickers:
             tag = OperationLogTags.SynchronizeRecentlyUsedStickers
     }
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     var topOperation: (SynchronizeRecentlyUsedMediaOperation, Int32)?
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
diff --git a/submodules/TelegramCore/Sources/SynchronizeSavedGifsOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeSavedGifsOperation.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/SynchronizeSavedGifsOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeSavedGifsOperation.swift
index e130f8c64e..2b4c00961a 100644
--- a/submodules/TelegramCore/Sources/SynchronizeSavedGifsOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeSavedGifsOperation.swift
@@ -6,7 +6,7 @@ import SyncCore
 
 func addSynchronizeSavedGifsOperation(transaction: Transaction, operation: SynchronizeSavedGifsOperationContent) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeSavedGifs
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     var topOperation: (SynchronizeSavedGifsOperation, Int32)?
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
diff --git a/submodules/TelegramCore/Sources/SynchronizeSavedStickersOperation.swift b/submodules/TelegramCore/Sources/State/SynchronizeSavedStickersOperation.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/SynchronizeSavedStickersOperation.swift
rename to submodules/TelegramCore/Sources/State/SynchronizeSavedStickersOperation.swift
index bd53548f3e..5eb5ea9075 100644
--- a/submodules/TelegramCore/Sources/SynchronizeSavedStickersOperation.swift
+++ b/submodules/TelegramCore/Sources/State/SynchronizeSavedStickersOperation.swift
@@ -7,7 +7,7 @@ import SyncCore
 
 func addSynchronizeSavedStickersOperation(transaction: Transaction, operation: SynchronizeSavedStickersOperationContent) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeSavedStickers
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     var topOperation: (SynchronizeSavedStickersOperation, Int32)?
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
diff --git a/submodules/TelegramCore/Sources/UnauthorizedAccountStateManager.swift b/submodules/TelegramCore/Sources/State/UnauthorizedAccountStateManager.swift
similarity index 82%
rename from submodules/TelegramCore/Sources/UnauthorizedAccountStateManager.swift
rename to submodules/TelegramCore/Sources/State/UnauthorizedAccountStateManager.swift
index b9993cf1f9..57895597f9 100644
--- a/submodules/TelegramCore/Sources/UnauthorizedAccountStateManager.swift
+++ b/submodules/TelegramCore/Sources/State/UnauthorizedAccountStateManager.swift
@@ -54,10 +54,12 @@ final class UnauthorizedAccountStateManager {
     private var updateService: UnauthorizedUpdateMessageService?
     private let updateServiceDisposable = MetaDisposable()
     private let updateLoginToken: () -> Void
+    private let displayServiceNotification: (String) -> Void
     
-    init(network: Network, updateLoginToken: @escaping () -> Void) {
+    init(network: Network, updateLoginToken: @escaping () -> Void, displayServiceNotification: @escaping (String) -> Void) {
         self.network = network
         self.updateLoginToken = updateLoginToken
+        self.displayServiceNotification = displayServiceNotification
     }
     
     deinit {
@@ -69,11 +71,17 @@ final class UnauthorizedAccountStateManager {
             if self.updateService == nil {
                 self.updateService = UnauthorizedUpdateMessageService()
                 let updateLoginToken = self.updateLoginToken
+                let displayServiceNotification = self.displayServiceNotification
                 self.updateServiceDisposable.set(self.updateService!.pipe.signal().start(next: { updates in
                     for update in updates {
                         switch update {
                         case .updateLoginToken:
                             updateLoginToken()
+                        case let .updateServiceNotification(flags, _, _, message, _, _):
+                            let popup = (flags & (1 << 0)) != 0
+                            if popup {
+                                displayServiceNotification(message)
+                            }
                         default:
                             break
                         }
diff --git a/submodules/TelegramCore/Sources/UpdateGroup.swift b/submodules/TelegramCore/Sources/State/UpdateGroup.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/UpdateGroup.swift
rename to submodules/TelegramCore/Sources/State/UpdateGroup.swift
diff --git a/submodules/TelegramCore/Sources/UpdateMessageService.swift b/submodules/TelegramCore/Sources/State/UpdateMessageService.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/UpdateMessageService.swift
rename to submodules/TelegramCore/Sources/State/UpdateMessageService.swift
index aa4b178dd1..fc375938cc 100644
--- a/submodules/TelegramCore/Sources/UpdateMessageService.swift
+++ b/submodules/TelegramCore/Sources/State/UpdateMessageService.swift
@@ -67,7 +67,7 @@ class UpdateMessageService: NSObject, MTMessageService {
             case let .updateShortMessage(flags, id, userId, message, pts, ptsCount, date, fwdFrom, viaBotId, replyHeader, entities, ttlPeriod):
                 let generatedFromId: Api.Peer
                 if (Int(flags) & 1 << 1) != 0 {
-                    generatedFromId = Api.Peer.peerUser(userId: self.peerId.id)
+                    generatedFromId = Api.Peer.peerUser(userId: self.peerId.id._internalGetInt32Value())
                 } else {
                     generatedFromId = Api.Peer.peerUser(userId: userId)
                 }
diff --git a/submodules/TelegramCore/Sources/UpdatesApiUtils.swift b/submodules/TelegramCore/Sources/State/UpdatesApiUtils.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/UpdatesApiUtils.swift
rename to submodules/TelegramCore/Sources/State/UpdatesApiUtils.swift
index b9f6ae6935..e32acae449 100644
--- a/submodules/TelegramCore/Sources/UpdatesApiUtils.swift
+++ b/submodules/TelegramCore/Sources/State/UpdatesApiUtils.swift
@@ -9,13 +9,10 @@ private func collectPreCachedResources(for photo: Api.Photo) -> [(MediaResource,
         case let .photo(_, id, accessHash, fileReference, _, sizes, _, dcId):
             for size in sizes {
                 switch size {
-                    case let .photoCachedSize(type, location, _, _, bytes):
-                        switch location {
-                            case let .fileLocationToBeDeprecated(volumeId, localId):
-                                let resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: nil, fileReference: fileReference.makeData())
-                                let data = bytes.makeData()
-                                return [(resource, data)]
-                        }
+                    case let .photoCachedSize(type, _, _, bytes):
+                        let resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, size: nil, fileReference: fileReference.makeData())
+                        let data = bytes.makeData()
+                        return [(resource, data)]
                     default:
                         break
                 }
@@ -32,13 +29,10 @@ private func collectPreCachedResources(for document: Api.Document) -> [(MediaRes
             if let thumbs = thumbs {
                 for thumb in thumbs {
                     switch thumb {
-                        case let .photoCachedSize(type, location, _, _, bytes):
-                            switch location {
-                                case let .fileLocationToBeDeprecated(volumeId, localId):
-                                    let resource = CloudDocumentSizeMediaResource(datacenterId: dcId, documentId: id, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, fileReference: fileReference.makeData())
-                                    let data = bytes.makeData()
-                                    return [(resource, data)]
-                            }
+                        case let .photoCachedSize(type, _, _, bytes):
+                            let resource = CloudDocumentSizeMediaResource(datacenterId: dcId, documentId: id, accessHash: accessHash, sizeSpec: type, fileReference: fileReference.makeData())
+                            let data = bytes.makeData()
+                            return [(resource, data)]
                         default:
                             break
                     }
@@ -152,15 +146,15 @@ extension Api.Chat {
     var peerId: PeerId {
         switch self {
             case let .chat(chat):
-                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chat.id)
+                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chat.id))
             case let .chatEmpty(id):
-                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: id)
+                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id))
             case let .chatForbidden(id, _):
-                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: id)
+                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(id))
             case let .channel(channel):
-                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channel.id)
+                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channel.id))
             case let .channelForbidden(_, id, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: id)
+                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(id))
         }
     }
 }
@@ -169,9 +163,9 @@ extension Api.User {
     var peerId: PeerId {
         switch self {
             case .user(_, let id, _, _, _, _, _, _, _, _, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.CloudUser, id: id)
+                return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))
             case let .userEmpty(id):
-                return PeerId(namespace: Namespaces.Peer.CloudUser, id: id)
+                return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(id))
         }
     }
 }
@@ -180,11 +174,11 @@ extension Api.Peer {
     var peerId: PeerId {
         switch self {
             case let .peerChannel(channelId):
-                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
             case let .peerChat(chatId):
-                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
             case let .peerUser(userId):
-                return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
         }
     }
 }
@@ -254,40 +248,40 @@ extension Api.Update {
     var peerIds: [PeerId] {
         switch self {
             case let .updateChannel(channelId):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updateChat(chatId):
-                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))]
             case let .updateChannelTooLong(_, channelId, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updateChatParticipantAdd(chatId, userId, inviterId, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId), PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)), PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId))]
             case let .updateChatParticipantAdmin(chatId, userId, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId), PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)), PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]
             case let .updateChatParticipantDelete(chatId, userId, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId), PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)), PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]
             case let .updateChatParticipants(participants):
                 switch participants {
                     case let .chatParticipants(chatId, _, _):
-                        return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)]
+                        return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))]
                     case let .chatParticipantsForbidden(_, chatId, _):
-                        return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)]
+                        return [PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))]
                 }
             case let .updateDeleteChannelMessages(channelId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updatePinnedChannelMessages(_, channelId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updateNewChannelMessage(message, _, _):
                 return apiMessagePeerIds(message)
             case let .updateEditChannelMessage(message, _, _):
                 return apiMessagePeerIds(message)
             case let .updateChannelWebPage(channelId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updateNewMessage(message, _, _):
                 return apiMessagePeerIds(message)
             case let .updateEditMessage(message, _, _):
                 return apiMessagePeerIds(message)
             case let .updateReadChannelInbox(_, _, channelId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))]
             case let .updateNotifySettings(peer, _):
                 switch peer {
                     case let .notifyPeer(peer):
@@ -296,14 +290,14 @@ extension Api.Update {
                         return []
                 }
             case let .updateUserName(userId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]
             case let .updateUserPhone(userId, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]
             case let .updateUserPhoto(userId, _, _, _):
-                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)]
+                return [PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))]
             case let .updateServiceNotification(_, inboxDate, _, _, _, _):
                 if let _ = inboxDate {
-                    return [PeerId(namespace: Namespaces.Peer.CloudUser, id: 777000)]
+                    return [PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(777000))]
                 } else {
                     return []
                 }
@@ -424,9 +418,9 @@ extension Api.Updates {
             case .updatesTooLong:
                 return []
             case let .updateShortMessage(_, id, userId, _, _, _, _, _, _, _, _, _):
-                return [MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), namespace: Namespaces.Message.Cloud, id: id)]
+                return [MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), namespace: Namespaces.Message.Cloud, id: id)]
             case let .updateShortChatMessage(_, id, _, chatId, _, _, _, _, _, _, _, _, _):
-                return [MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId), namespace: Namespaces.Message.Cloud, id: id)]
+                return [MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId)), namespace: Namespaces.Message.Cloud, id: id)]
         }
     }
     
@@ -555,15 +549,15 @@ extension Api.EncryptedChat {
     var peerId: PeerId {
         switch self {
             case let .encryptedChat(id, _, _, _, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: id)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(id))
             case let .encryptedChatDiscarded(_, id):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: id)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(id))
             case let .encryptedChatEmpty(id):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: id)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(id))
             case let .encryptedChatRequested(_, _, id, _, _, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: id)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(id))
             case let .encryptedChatWaiting(id, _, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: id)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(id))
         }
     }
 }
@@ -572,9 +566,9 @@ extension Api.EncryptedMessage {
     var peerId: PeerId {
         switch self {
             case let .encryptedMessage(_, chatId, _, _, _):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId))
             case let .encryptedMessageService(_, chatId, _, _):
-                return PeerId(namespace: Namespaces.Peer.SecretChat, id: chatId)
+                return PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(chatId))
         }
     }
 }
diff --git a/submodules/TelegramCore/Sources/StringFormat.swift b/submodules/TelegramCore/Sources/StringFormat.swift
deleted file mode 100644
index e71bca62ab..0000000000
--- a/submodules/TelegramCore/Sources/StringFormat.swift
+++ /dev/null
@@ -1,36 +0,0 @@
-import Foundation
-
-// Incuding at least one Objective-C class in a swift file ensures that it doesn't get stripped by the linker
-private final class LinkHelperClass: NSObject {
-}
-
-public func dataSizeString(_ size: Int, forceDecimal: Bool = false, decimalSeparator: String = ".") -> String {
-    return dataSizeString(Int64(size), forceDecimal: forceDecimal, decimalSeparator: decimalSeparator)
-}
-
-public func dataSizeString(_ size: Int64, forceDecimal: Bool = false, decimalSeparator: String = ".") -> String {
-    if size >= 1024 * 1024 * 1024 {
-        let remainder = Int64((Double(size % (1024 * 1024 * 1024)) / (1024 * 1024 * 102.4)).rounded(.down))
-        if remainder != 0 || forceDecimal {
-            return "\(size / (1024 * 1024 * 1024))\(decimalSeparator)\(remainder) GB"
-        } else {
-            return "\(size / (1024 * 1024 * 1024)) GB"
-        }
-    } else if size >= 1024 * 1024 {
-        let remainder = Int64((Double(size % (1024 * 1024)) / (1024.0 * 102.4)).rounded(.down))
-        if remainder != 0 || forceDecimal {
-            return "\(size / (1024 * 1024))\(decimalSeparator)\(remainder) MB"
-        } else {
-            return "\(size / (1024 * 1024)) MB"
-        }
-    } else if size >= 1024 {
-        let remainder = (size % (1024)) / (102)
-        if remainder != 0 || forceDecimal {
-            return "\(size / 1024)\(decimalSeparator)\(remainder) KB"
-        } else {
-            return "\(size / 1024) KB"
-        }
-    } else {
-        return "\(size) B"
-    }
-}
diff --git a/submodules/TelegramCore/Sources/Suggestions.swift b/submodules/TelegramCore/Sources/Suggestions.swift
index aaa642eba5..1703b0316d 100644
--- a/submodules/TelegramCore/Sources/Suggestions.swift
+++ b/submodules/TelegramCore/Sources/Suggestions.swift
@@ -7,12 +7,22 @@ import SyncCore
 public enum ServerProvidedSuggestion: String {
     case autoarchivePopular = "AUTOARCHIVE_POPULAR"
     case newcomerTicks = "NEWCOMER_TICKS"
+    case validatePhoneNumber = "VALIDATE_PHONE_NUMBER"
+    case validatePassword = "VALIDATE_PASSWORD"
 }
 
-public func getServerProvidedSuggestions(postbox: Postbox) -> Signal<[ServerProvidedSuggestion], NoError> {
+private var dismissedSuggestionsPromise = ValuePromise<[AccountRecordId: Set<ServerProvidedSuggestion>]>([:])
+private var dismissedSuggestions: [AccountRecordId: Set<ServerProvidedSuggestion>] = [:] {
+    didSet {
+        dismissedSuggestionsPromise.set(dismissedSuggestions)
+    }
+}
+
+public func getServerProvidedSuggestions(account: Account) -> Signal<[ServerProvidedSuggestion], NoError> {
     let key: PostboxViewKey = .preferences(keys: Set([PreferencesKeys.appConfiguration]))
-    return postbox.combinedView(keys: [key])
-    |> map { views -> [ServerProvidedSuggestion] in
+    return combineLatest(account.postbox.combinedView(keys: [key]), dismissedSuggestionsPromise.get())
+    |> map { views, dismissedSuggestionsValue -> [ServerProvidedSuggestion] in
+        let dismissedSuggestions = dismissedSuggestionsValue[account.id] ?? Set()
         guard let view = views.views[key] as? PreferencesView else {
             return []
         }
@@ -24,12 +34,17 @@ public func getServerProvidedSuggestions(postbox: Postbox) -> Signal<[ServerProv
         }
         return list.compactMap { item -> ServerProvidedSuggestion? in
             return ServerProvidedSuggestion(rawValue: item)
-        }
+        }.filter { !dismissedSuggestions.contains($0) }
     }
     |> distinctUntilChanged
 }
 
 public func dismissServerProvidedSuggestion(account: Account, suggestion: ServerProvidedSuggestion) -> Signal<Never, NoError> {
+    if let _ = dismissedSuggestions[account.id] {
+        dismissedSuggestions[account.id]?.insert(suggestion)
+    } else {
+        dismissedSuggestions[account.id] = Set([suggestion])
+    }
     return account.network.request(Api.functions.help.dismissSuggestion(peer: .inputPeerEmpty, suggestion: suggestion.rawValue))
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .single(.boolFalse)
diff --git a/submodules/TelegramCore/Sources/TelegramCore.h b/submodules/TelegramCore/Sources/TelegramCore.h
deleted file mode 100644
index 286a45d335..0000000000
--- a/submodules/TelegramCore/Sources/TelegramCore.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-//  TelegramCore.h
-//  TelegramCore
-//
-//  Created by Peter on 8/1/16.
-//  Copyright © 2016 Peter. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-//! Project version number for TelegramCore.
-FOUNDATION_EXPORT double TelegramCoreVersionNumber;
-
-//! Project version string for TelegramCore.
-FOUNDATION_EXPORT const unsigned char TelegramCoreVersionString[];
-
-#import <TelegramCore/FormatPhoneNumber.h>
-#import <TelegramCore/Crypto.h>
-#import <TelegramCore/NetworkLogging.h>
-#import <TelegramCore/Reachability.h>
diff --git a/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/ChangeAccountPhoneNumber.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/AccountData/ChangeAccountPhoneNumber.swift
index b4fcc97cd6..8ceec98541 100644
--- a/submodules/TelegramCore/Sources/ChangeAccountPhoneNumber.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/ChangeAccountPhoneNumber.swift
@@ -33,10 +33,11 @@ public enum RequestChangeAccountPhoneNumberVerificationError {
     case invalidPhoneNumber
     case limitExceeded
     case phoneNumberOccupied
+    case phoneBanned
     case generic
 }
 
-public func requestChangeAccountPhoneNumberVerification(account: Account, phoneNumber: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
+func _internal_requestChangeAccountPhoneNumberVerification(account: Account, phoneNumber: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
     return account.network.request(Api.functions.account.sendChangePhoneCode(phoneNumber: phoneNumber, settings: .codeSettings(flags: 0)), automaticFloodWait: false)
         |> mapError { error -> RequestChangeAccountPhoneNumberVerificationError in
             if error.errorDescription.hasPrefix("FLOOD_WAIT") {
@@ -45,6 +46,8 @@ public func requestChangeAccountPhoneNumberVerification(account: Account, phoneN
                 return .invalidPhoneNumber
             } else if error.errorDescription == "PHONE_NUMBER_OCCUPIED" {
                 return .phoneNumberOccupied
+            } else if error.errorDescription == "PHONE_NUMBER_BANNED" {
+                return .phoneBanned
             } else {
                 return .generic
             }
@@ -61,7 +64,7 @@ public func requestChangeAccountPhoneNumberVerification(account: Account, phoneN
         }
 }
 
-public func requestNextChangeAccountPhoneNumberVerification(account: Account, phoneNumber: String, phoneCodeHash: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
+func _internal_requestNextChangeAccountPhoneNumberVerification(account: Account, phoneNumber: String, phoneCodeHash: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
     return account.network.request(Api.functions.auth.resendCode(phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash), automaticFloodWait: false)
         |> mapError { error -> RequestChangeAccountPhoneNumberVerificationError in
             if error.errorDescription.hasPrefix("FLOOD_WAIT") {
@@ -93,7 +96,7 @@ public enum ChangeAccountPhoneNumberError {
     case limitExceeded
 }
 
-public func requestChangeAccountPhoneNumber(account: Account, phoneNumber: String, phoneCodeHash: String, phoneCode: String) -> Signal<Void, ChangeAccountPhoneNumberError> {
+func _internal_requestChangeAccountPhoneNumber(account: Account, phoneNumber: String, phoneCodeHash: String, phoneCode: String) -> Signal<Void, ChangeAccountPhoneNumberError> {
     return account.network.request(Api.functions.account.changePhone(phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash, phoneCode: phoneCode), automaticFloodWait: false)
         |> mapError { error -> ChangeAccountPhoneNumberError in
             if error.errorDescription.hasPrefix("FLOOD_WAIT") {
diff --git a/submodules/TelegramCore/Sources/RegisterNotificationToken.swift b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/RegisterNotificationToken.swift
similarity index 71%
rename from submodules/TelegramCore/Sources/RegisterNotificationToken.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/AccountData/RegisterNotificationToken.swift
index d57cb98c9b..9349247abb 100644
--- a/submodules/TelegramCore/Sources/RegisterNotificationToken.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/RegisterNotificationToken.swift
@@ -10,7 +10,7 @@ public enum NotificationTokenType {
     case voip
 }
 
-public func unregisterNotificationToken(account: Account, token: Data, type: NotificationTokenType, otherAccountUserIds: [Int32]) -> Signal<Never, NoError> {
+func _internal_unregisterNotificationToken(account: Account, token: Data, type: NotificationTokenType, otherAccountUserIds: [PeerId.Id]) -> Signal<Never, NoError> {
     let mappedType: Int32
     switch type {
         case .aps:
@@ -18,12 +18,12 @@ public func unregisterNotificationToken(account: Account, token: Data, type: Not
         case .voip:
             mappedType = 9
     }
-    return account.network.request(Api.functions.account.unregisterDevice(tokenType: mappedType, token: hexString(token), otherUids: otherAccountUserIds))
+    return account.network.request(Api.functions.account.unregisterDevice(tokenType: mappedType, token: hexString(token), otherUids: otherAccountUserIds.map({ $0._internalGetInt32Value() })))
     |> retryRequest
     |> ignoreValues
 }
 
-public func registerNotificationToken(account: Account, token: Data, type: NotificationTokenType, sandbox: Bool, otherAccountUserIds: [Int32], excludeMutedChats: Bool) -> Signal<Never, NoError> {
+func _internal_registerNotificationToken(account: Account, token: Data, type: NotificationTokenType, sandbox: Bool, otherAccountUserIds: [PeerId.Id], excludeMutedChats: Bool) -> Signal<Never, NoError> {
     return masterNotificationsKey(account: account, ignoreDisabled: false)
     |> mapToSignal { masterKey -> Signal<Never, NoError> in
         let mappedType: Int32
@@ -42,7 +42,7 @@ public func registerNotificationToken(account: Account, token: Data, type: Notif
         if excludeMutedChats {
             flags |= 1 << 0
         }
-        return account.network.request(Api.functions.account.registerDevice(flags: flags, tokenType: mappedType, token: hexString(token), appSandbox: sandbox ? .boolTrue : .boolFalse, secret: Buffer(data: keyData), otherUids: otherAccountUserIds))
+        return account.network.request(Api.functions.account.registerDevice(flags: flags, tokenType: mappedType, token: hexString(token), appSandbox: sandbox ? .boolTrue : .boolFalse, secret: Buffer(data: keyData), otherUids: otherAccountUserIds.map({ $0._internalGetInt32Value() })))
         |> retryRequest
         |> ignoreValues
     }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/AccountData/TelegramEngineAccountData.swift b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/TelegramEngineAccountData.swift
new file mode 100644
index 0000000000..5fbab699aa
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/TelegramEngineAccountData.swift
@@ -0,0 +1,62 @@
+import Foundation
+import SwiftSignalKit
+import Postbox
+import SyncCore
+
+public extension TelegramEngine {
+    final class AccountData {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func acceptTermsOfService(id: String) -> Signal<Void, NoError> {
+		    return _internal_acceptTermsOfService(account: self.account, id: id)
+		}
+
+		public func resetAccountDueTermsOfService() -> Signal<Void, NoError> {
+			return _internal_resetAccountDueTermsOfService(network: self.account.network)
+		}
+
+        public func requestChangeAccountPhoneNumberVerification(phoneNumber: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
+            return _internal_requestChangeAccountPhoneNumberVerification(account: self.account, phoneNumber: phoneNumber)
+        }
+
+        public func requestNextChangeAccountPhoneNumberVerification(phoneNumber: String, phoneCodeHash: String) -> Signal<ChangeAccountPhoneNumberData, RequestChangeAccountPhoneNumberVerificationError> {
+            return _internal_requestNextChangeAccountPhoneNumberVerification(account: self.account, phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash)
+        }
+
+        public func requestChangeAccountPhoneNumber(phoneNumber: String, phoneCodeHash: String, phoneCode: String) -> Signal<Void, ChangeAccountPhoneNumberError> {
+            return _internal_requestChangeAccountPhoneNumber(account: self.account, phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash, phoneCode: phoneCode)
+        }
+
+        public func updateAccountPeerName(firstName: String, lastName: String) -> Signal<Void, NoError> {
+            return _internal_updateAccountPeerName(account: self.account, firstName: firstName, lastName: lastName)
+        }
+
+        public func updateAbout(about: String?) -> Signal<Void, UpdateAboutError> {
+            return _internal_updateAbout(account: self.account, about: about)
+        }
+
+        public func unregisterNotificationToken(token: Data, type: NotificationTokenType, otherAccountUserIds: [PeerId.Id]) -> Signal<Never, NoError> {
+            return _internal_unregisterNotificationToken(account: self.account, token: token, type: type, otherAccountUserIds: otherAccountUserIds)
+        }
+
+        public func registerNotificationToken(token: Data, type: NotificationTokenType, sandbox: Bool, otherAccountUserIds: [PeerId.Id], excludeMutedChats: Bool) -> Signal<Never, NoError> {
+            return _internal_registerNotificationToken(account: self.account, token: token, type: type, sandbox: sandbox, otherAccountUserIds: otherAccountUserIds, excludeMutedChats: excludeMutedChats)
+        }
+
+        public func updateAccountPhoto(resource: MediaResource?, videoResource: MediaResource?, videoStartTimestamp: Double?, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
+            return _internal_updateAccountPhoto(account: self.account, resource: resource, videoResource: videoResource, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
+        }
+
+        public func updatePeerPhotoExisting(reference: TelegramMediaImageReference) -> Signal<TelegramMediaImage?, NoError> {
+            return _internal_updatePeerPhotoExisting(network: self.account.network, reference: reference)
+        }
+
+        public func removeAccountPhoto(reference: TelegramMediaImageReference?) -> Signal<Void, NoError> {
+            return _internal_removeAccountPhoto(network: self.account.network, reference: reference)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/TermsOfService.swift b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/TermsOfService.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/TermsOfService.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/AccountData/TermsOfService.swift
index e3514b3fe9..b0c66a3537 100644
--- a/submodules/TelegramCore/Sources/TermsOfService.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/TermsOfService.swift
@@ -34,7 +34,7 @@ extension TermsOfServiceUpdate {
     }
 }
 
-public func acceptTermsOfService(account: Account, id: String) -> Signal<Void, NoError> {
+func _internal_acceptTermsOfService(account: Account, id: String) -> Signal<Void, NoError> {
     return account.network.request(Api.functions.help.acceptTermsOfService(id: .dataJSON(data: id)))
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .complete()
@@ -45,7 +45,7 @@ public func acceptTermsOfService(account: Account, id: String) -> Signal<Void, N
     }
 }
 
-public func resetAccountDueTermsOfService(network: Network) -> Signal<Void, NoError> {
+func _internal_resetAccountDueTermsOfService(network: Network) -> Signal<Void, NoError> {
     return network.request(Api.functions.account.deleteAccount(reason: "Decline ToS update"))
     |> retryRequest
     |> map { _ in return }
diff --git a/submodules/TelegramCore/Sources/UpdateAccountPeerName.swift b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/UpdateAccountPeerName.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/UpdateAccountPeerName.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/AccountData/UpdateAccountPeerName.swift
index f46bc43b89..533a240653 100644
--- a/submodules/TelegramCore/Sources/UpdateAccountPeerName.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/AccountData/UpdateAccountPeerName.swift
@@ -6,7 +6,7 @@ import MtProtoKit
 
 import SyncCore
 
-public func updateAccountPeerName(account: Account, firstName: String, lastName: String) -> Signal<Void, NoError> {
+func _internal_updateAccountPeerName(account: Account, firstName: String, lastName: String) -> Signal<Void, NoError> {
     return account.network.request(Api.functions.account.updateProfile(flags: (1 << 0) | (1 << 1), firstName: firstName, lastName: lastName, about: nil))
         |> map { result -> Api.User? in
             return result
@@ -30,7 +30,7 @@ public enum UpdateAboutError {
 }
 
 
-public func updateAbout(account: Account, about: String?) -> Signal<Void, UpdateAboutError> {
+func _internal_updateAbout(account: Account, about: String?) -> Signal<Void, UpdateAboutError> {
     return account.network.request(Api.functions.account.updateProfile(flags: about == nil ? 0 : (1 << 2), firstName: nil, lastName: nil, about: about))
         |> mapError { _ -> UpdateAboutError in
             return .generic
diff --git a/submodules/TelegramCore/Sources/AuthTransfer.swift b/submodules/TelegramCore/Sources/TelegramEngine/Auth/AuthTransfer.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/AuthTransfer.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Auth/AuthTransfer.swift
index e661aa715d..0e5e086488 100644
--- a/submodules/TelegramCore/Sources/AuthTransfer.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Auth/AuthTransfer.swift
@@ -21,8 +21,8 @@ public enum ExportAuthTransferTokenResult {
     case passwordRequested(UnauthorizedAccount)
 }
 
-public func exportAuthTransferToken(accountManager: AccountManager, account: UnauthorizedAccount, otherAccountUserIds: [Int32], syncContacts: Bool) -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> {
-    return account.network.request(Api.functions.auth.exportLoginToken(apiId: account.networkArguments.apiId, apiHash: account.networkArguments.apiHash, exceptIds: otherAccountUserIds))
+func _internal_exportAuthTransferToken(accountManager: AccountManager, account: UnauthorizedAccount, otherAccountUserIds: [PeerId.Id], syncContacts: Bool) -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> {
+    return account.network.request(Api.functions.auth.exportLoginToken(apiId: account.networkArguments.apiId, apiHash: account.networkArguments.apiHash, exceptIds: otherAccountUserIds.map({ $0._internalGetInt32Value() })))
     |> map(Optional.init)
     |> `catch` { error -> Signal<Api.auth.LoginToken?, ExportAuthTransferTokenError> in
         if error.errorDescription == "SESSION_PASSWORD_NEEDED" {
diff --git a/submodules/TelegramCore/Sources/CancelAccountReset.swift b/submodules/TelegramCore/Sources/TelegramEngine/Auth/CancelAccountReset.swift
similarity index 85%
rename from submodules/TelegramCore/Sources/CancelAccountReset.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Auth/CancelAccountReset.swift
index ef3215c26c..60e1b8e0ca 100644
--- a/submodules/TelegramCore/Sources/CancelAccountReset.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Auth/CancelAccountReset.swift
@@ -18,7 +18,7 @@ public enum RequestCancelAccountResetDataError {
     case generic
 }
 
-public func requestCancelAccountResetData(network: Network, hash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
+func _internal_requestCancelAccountResetData(network: Network, hash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
     return network.request(Api.functions.account.sendConfirmPhoneCode(hash: hash, settings: .codeSettings(flags: 0)), automaticFloodWait: false)
     |> mapError { error -> RequestCancelAccountResetDataError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
@@ -39,7 +39,7 @@ public func requestCancelAccountResetData(network: Network, hash: String) -> Sig
     }
 }
 
-public func requestNextCancelAccountResetOption(network: Network, phoneNumber: String, phoneCodeHash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
+func _internal_requestNextCancelAccountResetOption(network: Network, phoneNumber: String, phoneCodeHash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
     return network.request(Api.functions.auth.resendCode(phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash), automaticFloodWait: false)
     |> mapError { error -> RequestCancelAccountResetDataError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
@@ -67,7 +67,7 @@ public enum CancelAccountResetError {
     case limitExceeded
 }
 
-public func requestCancelAccountReset(network: Network, phoneCodeHash: String, phoneCode: String) -> Signal<Never, CancelAccountResetError> {
+func _internal_requestCancelAccountReset(network: Network, phoneCodeHash: String, phoneCode: String) -> Signal<Never, CancelAccountResetError> {
     return network.request(Api.functions.account.confirmPhone(phoneCodeHash: phoneCodeHash, phoneCode: phoneCode))
     |> mapError { error -> CancelAccountResetError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
diff --git a/submodules/TelegramCore/Sources/ConfirmTwoStepRecoveryEmail.swift b/submodules/TelegramCore/Sources/TelegramEngine/Auth/ConfirmTwoStepRecoveryEmail.swift
similarity index 80%
rename from submodules/TelegramCore/Sources/ConfirmTwoStepRecoveryEmail.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Auth/ConfirmTwoStepRecoveryEmail.swift
index dcc5c4433f..240ae7f8a0 100644
--- a/submodules/TelegramCore/Sources/ConfirmTwoStepRecoveryEmail.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Auth/ConfirmTwoStepRecoveryEmail.swift
@@ -12,7 +12,7 @@ public enum ConfirmTwoStepRecoveryEmailError {
     case generic
 }
 
-public func confirmTwoStepRecoveryEmail(network: Network, code: String) -> Signal<Never, ConfirmTwoStepRecoveryEmailError> {
+func _internal_confirmTwoStepRecoveryEmail(network: Network, code: String) -> Signal<Never, ConfirmTwoStepRecoveryEmailError> {
     return network.request(Api.functions.account.confirmPasswordEmail(code: code), automaticFloodWait: false)
     |> mapError { error -> ConfirmTwoStepRecoveryEmailError in
         if error.errorDescription == "EMAIL_INVALID" {
@@ -34,7 +34,7 @@ public enum ResendTwoStepRecoveryEmailError {
     case generic
 }
 
-public func resendTwoStepRecoveryEmail(network: Network) -> Signal<Never, ResendTwoStepRecoveryEmailError> {
+func _internal_resendTwoStepRecoveryEmail(network: Network) -> Signal<Never, ResendTwoStepRecoveryEmailError> {
     return network.request(Api.functions.account.resendPasswordEmail(), automaticFloodWait: false)
     |> mapError { error -> ResendTwoStepRecoveryEmailError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
@@ -49,7 +49,7 @@ public enum CancelTwoStepRecoveryEmailError {
     case generic
 }
 
-public func cancelTwoStepRecoveryEmail(network: Network) -> Signal<Never, CancelTwoStepRecoveryEmailError> {
+func _internal_cancelTwoStepRecoveryEmail(network: Network) -> Signal<Never, CancelTwoStepRecoveryEmailError> {
     return network.request(Api.functions.account.cancelPasswordEmail(), automaticFloodWait: false)
     |> mapError { _ -> CancelTwoStepRecoveryEmailError in
         return .generic
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Auth/TelegramEngineAuth.swift b/submodules/TelegramCore/Sources/TelegramEngine/Auth/TelegramEngineAuth.swift
new file mode 100644
index 0000000000..c0f69f9d95
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Auth/TelegramEngineAuth.swift
@@ -0,0 +1,195 @@
+import SwiftSignalKit
+import Postbox
+import TelegramApi
+import MtProtoKit
+import SyncCore
+
+public extension TelegramEngineUnauthorized {
+    final class Auth {
+        private let account: UnauthorizedAccount
+
+        init(account: UnauthorizedAccount) {
+            self.account = account
+        }
+
+        public func exportAuthTransferToken(accountManager: AccountManager, otherAccountUserIds: [PeerId.Id], syncContacts: Bool) -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> {
+            return _internal_exportAuthTransferToken(accountManager: accountManager, account: self.account, otherAccountUserIds: otherAccountUserIds, syncContacts: syncContacts)
+        }
+
+        public func twoStepAuthData() -> Signal<TwoStepAuthData, MTRpcError> {
+            return _internal_twoStepAuthData(self.account.network)
+        }
+
+        public func updateTwoStepVerificationPassword(currentPassword: String?, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+            return _internal_updateTwoStepVerificationPassword(network: self.account.network, currentPassword: currentPassword, updatedPassword: updatedPassword)
+        }
+
+        public func requestTwoStepVerificationPasswordRecoveryCode() -> Signal<String, RequestTwoStepVerificationPasswordRecoveryCodeError> {
+            return _internal_requestTwoStepVerificationPasswordRecoveryCode(network: self.account.network)
+        }
+
+        public func checkPasswordRecoveryCode(code: String) -> Signal<Never, PasswordRecoveryError> {
+            return _internal_checkPasswordRecoveryCode(network: self.account.network, code: code)
+        }
+
+        public func performPasswordRecovery(code: String, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<RecoveredAccountData, PasswordRecoveryError> {
+            return _internal_performPasswordRecovery(network: self.account.network, code: code, updatedPassword: updatedPassword)
+        }
+
+        public func resendTwoStepRecoveryEmail() -> Signal<Never, ResendTwoStepRecoveryEmailError> {
+            return _internal_resendTwoStepRecoveryEmail(network: self.account.network)
+        }
+
+        public func uploadedPeerVideo(resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
+            return _internal_uploadedPeerVideo(postbox: self.account.postbox, network: self.account.network, messageMediaPreuploadManager: nil, resource: resource)
+        }
+    }
+}
+
+public enum DeleteAccountError {
+    case generic
+}
+
+public extension TelegramEngine {
+    final class Auth {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func twoStepAuthData() -> Signal<TwoStepAuthData, MTRpcError> {
+            return _internal_twoStepAuthData(self.account.network)
+        }
+
+        public func updateTwoStepVerificationPassword(currentPassword: String?, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+            return _internal_updateTwoStepVerificationPassword(network: self.account.network, currentPassword: currentPassword, updatedPassword: updatedPassword)
+        }
+
+        public func deleteAccount() -> Signal<Never, DeleteAccountError> {
+            return self.account.network.request(Api.functions.account.deleteAccount(reason: "GDPR"))
+            |> mapError { _ -> DeleteAccountError in
+                return .generic
+            }
+            |> ignoreValues
+        }
+
+        public func updateTwoStepVerificationEmail(currentPassword: String, updatedEmail: String) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+            return _internal_updateTwoStepVerificationEmail(network: self.account.network, currentPassword: currentPassword, updatedEmail: updatedEmail)
+        }
+
+        public func confirmTwoStepRecoveryEmail(code: String) -> Signal<Never, ConfirmTwoStepRecoveryEmailError> {
+            return _internal_confirmTwoStepRecoveryEmail(network: self.account.network, code: code)
+        }
+
+        public func resendTwoStepRecoveryEmail() -> Signal<Never, ResendTwoStepRecoveryEmailError> {
+        	return _internal_resendTwoStepRecoveryEmail(network: self.account.network)
+        }
+
+        public func cancelTwoStepRecoveryEmail() -> Signal<Never, CancelTwoStepRecoveryEmailError> {
+        	return _internal_cancelTwoStepRecoveryEmail(network: self.account.network)
+        }
+
+        public func twoStepVerificationConfiguration() -> Signal<TwoStepVerificationConfiguration, NoError> {
+            return _internal_twoStepVerificationConfiguration(account: self.account)
+        }
+
+        public func requestTwoStepVerifiationSettings(password: String) -> Signal<TwoStepVerificationSettings, AuthorizationPasswordVerificationError> {
+            return _internal_requestTwoStepVerifiationSettings(network: self.account.network, password: password)
+        }
+
+        public func requestTwoStepVerificationPasswordRecoveryCode() -> Signal<String, RequestTwoStepVerificationPasswordRecoveryCodeError> {
+            return _internal_requestTwoStepVerificationPasswordRecoveryCode(network: self.account.network)
+        }
+
+        public func performPasswordRecovery(code: String, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<RecoveredAccountData, PasswordRecoveryError> {
+            return _internal_performPasswordRecovery(network: self.account.network, code: code, updatedPassword: updatedPassword)
+        }
+
+        public func cachedTwoStepPasswordToken() -> Signal<TemporaryTwoStepPasswordToken?, NoError> {
+            return _internal_cachedTwoStepPasswordToken(postbox: self.account.postbox)
+        }
+
+        public func cacheTwoStepPasswordToken(token: TemporaryTwoStepPasswordToken?) -> Signal<Void, NoError> {
+            return _internal_cacheTwoStepPasswordToken(postbox: self.account.postbox, token: token)
+        }
+
+        public func requestTemporaryTwoStepPasswordToken(password: String, period: Int32, requiresBiometrics: Bool) -> Signal<TemporaryTwoStepPasswordToken, AuthorizationPasswordVerificationError> {
+            return _internal_requestTemporaryTwoStepPasswordToken(account: self.account, password: password, period: period, requiresBiometrics: requiresBiometrics)
+        }
+
+        public func checkPasswordRecoveryCode(code: String) -> Signal<Never, PasswordRecoveryError> {
+            return _internal_checkPasswordRecoveryCode(network: self.account.network, code: code)
+        }
+
+        public func requestTwoStepPasswordReset() -> Signal<RequestTwoStepPasswordResetResult, NoError> {
+            return _internal_requestTwoStepPasswordReset(network: self.account.network)
+        }
+
+        public func declineTwoStepPasswordReset() -> Signal<Never, NoError> {
+            return _internal_declineTwoStepPasswordReset(network: self.account.network)
+        }
+
+        public func requestCancelAccountResetData(hash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
+            return _internal_requestCancelAccountResetData(network: self.account.network, hash: hash)
+        }
+
+        public func requestNextCancelAccountResetOption(phoneNumber: String, phoneCodeHash: String) -> Signal<CancelAccountResetData, RequestCancelAccountResetDataError> {
+            return _internal_requestNextCancelAccountResetOption(network: self.account.network, phoneNumber: phoneNumber, phoneCodeHash: phoneCodeHash)
+        }
+
+        public func requestCancelAccountReset(phoneCodeHash: String, phoneCode: String) -> Signal<Never, CancelAccountResetError> {
+            return _internal_requestCancelAccountReset(network: self.account.network, phoneCodeHash: phoneCodeHash, phoneCode: phoneCode)
+        }
+    }
+}
+
+public extension SomeTelegramEngine {
+    final class Auth {
+        private let engine: SomeTelegramEngine
+
+        init(engine: SomeTelegramEngine) {
+            self.engine = engine
+        }
+
+        public func twoStepAuthData() -> Signal<TwoStepAuthData, MTRpcError> {
+            switch self.engine {
+            case let .authorized(engine):
+                return engine.auth.twoStepAuthData()
+            case let .unauthorized(engine):
+                return engine.auth.twoStepAuthData()
+            }
+        }
+
+        public func updateTwoStepVerificationPassword(currentPassword: String?, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+            switch self.engine {
+            case let .authorized(engine):
+                return engine.auth.updateTwoStepVerificationPassword(currentPassword: currentPassword, updatedPassword: updatedPassword)
+            case let .unauthorized(engine):
+                return engine.auth.updateTwoStepVerificationPassword(currentPassword: currentPassword, updatedPassword: updatedPassword)
+            }
+        }
+
+        public func requestTwoStepVerificationPasswordRecoveryCode() -> Signal<String, RequestTwoStepVerificationPasswordRecoveryCodeError> {
+            switch self.engine {
+            case let .authorized(engine):
+                return engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
+            case let .unauthorized(engine):
+                return engine.auth.requestTwoStepVerificationPasswordRecoveryCode()
+            }
+        }
+
+        public func checkPasswordRecoveryCode(code: String) -> Signal<Never, PasswordRecoveryError> {
+            switch self.engine {
+            case let .authorized(engine):
+                return engine.auth.checkPasswordRecoveryCode(code: code)
+            case let .unauthorized(engine):
+                return engine.auth.checkPasswordRecoveryCode(code: code)
+            }
+        }
+    }
+
+    var auth: Auth {
+        return Auth(engine: self)
+    }
+}
diff --git a/submodules/TelegramCore/Sources/TwoStepVerification.swift b/submodules/TelegramCore/Sources/TelegramEngine/Auth/TwoStepVerification.swift
similarity index 78%
rename from submodules/TelegramCore/Sources/TwoStepVerification.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Auth/TwoStepVerification.swift
index 286db5bae4..2ac72ff952 100644
--- a/submodules/TelegramCore/Sources/TwoStepVerification.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Auth/TwoStepVerification.swift
@@ -8,17 +8,17 @@ import SyncCore
 
 public enum TwoStepVerificationConfiguration {
     case notSet(pendingEmail: TwoStepVerificationPendingEmail?)
-    case set(hint: String, hasRecoveryEmail: Bool, pendingEmail: TwoStepVerificationPendingEmail?, hasSecureValues: Bool)
+    case set(hint: String, hasRecoveryEmail: Bool, pendingEmail: TwoStepVerificationPendingEmail?, hasSecureValues: Bool, pendingResetTimestamp: Int32?)
 }
 
-public func twoStepVerificationConfiguration(account: Account) -> Signal<TwoStepVerificationConfiguration, NoError> {
+func _internal_twoStepVerificationConfiguration(account: Account) -> Signal<TwoStepVerificationConfiguration, NoError> {
     return account.network.request(Api.functions.account.getPassword())
     |> retryRequest
     |> map { result -> TwoStepVerificationConfiguration in
         switch result {
             case let .password(password):
                 if password.currentAlgo != nil {
-                    return .set(hint: password.hint ?? "", hasRecoveryEmail: (password.flags & (1 << 0)) != 0, pendingEmail: password.emailUnconfirmedPattern.flatMap({ TwoStepVerificationPendingEmail(pattern: $0, codeLength: nil) }), hasSecureValues: (password.flags & (1 << 1)) != 0)
+                    return .set(hint: password.hint ?? "", hasRecoveryEmail: (password.flags & (1 << 0)) != 0, pendingEmail: password.emailUnconfirmedPattern.flatMap({ TwoStepVerificationPendingEmail(pattern: $0, codeLength: nil) }), hasSecureValues: (password.flags & (1 << 1)) != 0, pendingResetTimestamp: password.pendingResetDate)
                 } else {
                     return .notSet(pendingEmail: password.emailUnconfirmedPattern.flatMap({ TwoStepVerificationPendingEmail(pattern: $0, codeLength: nil) }))
                 }
@@ -37,8 +37,8 @@ public struct TwoStepVerificationSettings {
     public let secureSecret: TwoStepVerificationSecureSecret?
 }
 
-public func requestTwoStepVerifiationSettings(network: Network, password: String) -> Signal<TwoStepVerificationSettings, AuthorizationPasswordVerificationError> {
-    return twoStepAuthData(network)
+func _internal_requestTwoStepVerifiationSettings(network: Network, password: String) -> Signal<TwoStepVerificationSettings, AuthorizationPasswordVerificationError> {
+    return _internal_twoStepAuthData(network)
     |> mapError { error -> AuthorizationPasswordVerificationError in
         if error.errorDescription.hasPrefix("FLOOD_WAIT") {
             return .limitExceeded
@@ -111,14 +111,14 @@ public enum UpdatedTwoStepVerificationPassword {
     case password(password: String, hint: String, email: String?)
 }
 
-public func updateTwoStepVerificationPassword(network: Network, currentPassword: String?, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
-    return twoStepAuthData(network)
+func _internal_updateTwoStepVerificationPassword(network: Network, currentPassword: String?, updatedPassword: UpdatedTwoStepVerificationPassword) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+    return _internal_twoStepAuthData(network)
     |> mapError { _ -> UpdateTwoStepVerificationPasswordError in
         return .generic
     }
     |> mapToSignal { authData -> Signal<TwoStepVerificationSecureSecret?, UpdateTwoStepVerificationPasswordError> in
         if let _ = authData.currentPasswordDerivation {
-            return requestTwoStepVerifiationSettings(network: network, password: currentPassword ?? "")
+            return _internal_requestTwoStepVerifiationSettings(network: network, password: currentPassword ?? "")
             |> mapError { _ -> UpdateTwoStepVerificationPasswordError in
                 return .generic
             }
@@ -130,7 +130,7 @@ public func updateTwoStepVerificationPassword(network: Network, currentPassword:
         }
     }
     |> mapToSignal { secureSecret -> Signal<(TwoStepAuthData, TwoStepVerificationSecureSecret?), UpdateTwoStepVerificationPasswordError> in
-        return twoStepAuthData(network)
+        return _internal_twoStepAuthData(network)
         |> mapError { _ -> UpdateTwoStepVerificationPasswordError in
             return .generic
         }
@@ -205,7 +205,7 @@ public func updateTwoStepVerificationPassword(network: Network, currentPassword:
                                 codeLength = value
                             }
                         }
-                        return twoStepAuthData(network)
+                        return _internal_twoStepAuthData(network)
                         |> map { result -> UpdateTwoStepVerificationPasswordResult in
                             return .password(password: password, pendingEmail: result.unconfirmedEmailPattern.flatMap({ TwoStepVerificationPendingEmail(pattern: $0, codeLength: codeLength) }))
                         }
@@ -233,7 +233,7 @@ enum UpdateTwoStepVerificationSecureSecretError {
 }
 
 func updateTwoStepVerificationSecureSecret(network: Network, password: String, secret: Data) -> Signal<UpdateTwoStepVerificationSecureSecretResult, UpdateTwoStepVerificationSecureSecretError> {
-    return twoStepAuthData(network)
+    return _internal_twoStepAuthData(network)
     |> mapError { _ -> UpdateTwoStepVerificationSecureSecretError in
         return .generic
     }
@@ -263,8 +263,8 @@ func updateTwoStepVerificationSecureSecret(network: Network, password: String, s
     }
 }
 
-public func updateTwoStepVerificationEmail(network: Network, currentPassword: String, updatedEmail: String) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
-    return twoStepAuthData(network)
+func _internal_updateTwoStepVerificationEmail(network: Network, currentPassword: String, updatedEmail: String) -> Signal<UpdateTwoStepVerificationPasswordResult, UpdateTwoStepVerificationPasswordError> {
+    return _internal_twoStepAuthData(network)
     |> mapError { _ -> UpdateTwoStepVerificationPasswordError in
         return .generic
     }
@@ -286,7 +286,7 @@ public func updateTwoStepVerificationEmail(network: Network, currentPassword: St
         }
         |> `catch` { error -> Signal<UpdateTwoStepVerificationPasswordResult, MTRpcError> in
             if error.errorDescription.hasPrefix("EMAIL_UNCONFIRMED") {
-                return twoStepAuthData(network)
+                return _internal_twoStepAuthData(network)
                 |> map { result -> UpdateTwoStepVerificationPasswordResult in
                     var codeLength: Int32?
                     if error.errorDescription.hasPrefix("EMAIL_UNCONFIRMED_") {
@@ -312,19 +312,26 @@ public func updateTwoStepVerificationEmail(network: Network, currentPassword: St
 
 public enum RequestTwoStepVerificationPasswordRecoveryCodeError {
     case generic
+    case limitExceeded
 }
 
-public func requestTwoStepVerificationPasswordRecoveryCode(network: Network) -> Signal<String, RequestTwoStepVerificationPasswordRecoveryCodeError> {
+func _internal_requestTwoStepVerificationPasswordRecoveryCode(network: Network) -> Signal<String, RequestTwoStepVerificationPasswordRecoveryCodeError> {
     return network.request(Api.functions.auth.requestPasswordRecovery(), automaticFloodWait: false)
-        |> mapError { _ -> RequestTwoStepVerificationPasswordRecoveryCodeError in
+    |> mapError { error -> RequestTwoStepVerificationPasswordRecoveryCodeError in
+        if error.errorDescription.hasPrefix("FLOOD_WAIT") {
+            return .limitExceeded
+        } else if error.errorDescription.hasPrefix("PASSWORD_RECOVERY_NA") {
+            return .generic
+        } else {
             return .generic
         }
-        |> map { result -> String in
-            switch result {
-                case let .passwordRecovery(emailPattern):
-                    return emailPattern
-            }
+    }
+    |> map { result -> String in
+        switch result {
+            case let .passwordRecovery(emailPattern):
+                return emailPattern
         }
+    }
 }
 
 public enum RecoverTwoStepVerificationPasswordError {
@@ -334,25 +341,7 @@ public enum RecoverTwoStepVerificationPasswordError {
     case invalidCode
 }
 
-public func recoverTwoStepVerificationPassword(network: Network, code: String) -> Signal<Void, RecoverTwoStepVerificationPasswordError> {
-    return network.request(Api.functions.auth.recoverPassword(code: code), automaticFloodWait: false)
-        |> mapError { error -> RecoverTwoStepVerificationPasswordError in
-            if error.errorDescription.hasPrefix("FLOOD_WAIT_") {
-                return .limitExceeded
-            } else if error.errorDescription == "PASSWORD_RECOVERY_EXPIRED" {
-                return .codeExpired
-            } else if error.errorDescription == "CODE_INVALID" {
-                return .invalidCode
-            } else {
-                return .generic
-            }
-        }
-        |> mapToSignal { _ -> Signal<Void, RecoverTwoStepVerificationPasswordError> in
-            return .complete()
-        }
-}
-
-public func cachedTwoStepPasswordToken(postbox: Postbox) -> Signal<TemporaryTwoStepPasswordToken?, NoError> {
+func _internal_cachedTwoStepPasswordToken(postbox: Postbox) -> Signal<TemporaryTwoStepPasswordToken?, NoError> {
     return postbox.transaction { transaction -> TemporaryTwoStepPasswordToken? in
         let key = ValueBoxKey(length: 1)
         key.setUInt8(0, value: 0)
@@ -360,7 +349,7 @@ public func cachedTwoStepPasswordToken(postbox: Postbox) -> Signal<TemporaryTwoS
     }
 }
 
-public func cacheTwoStepPasswordToken(postbox: Postbox, token: TemporaryTwoStepPasswordToken?) -> Signal<Void, NoError> {
+func _internal_cacheTwoStepPasswordToken(postbox: Postbox, token: TemporaryTwoStepPasswordToken?) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         let key = ValueBoxKey(length: 1)
         key.setUInt8(0, value: 0)
@@ -372,8 +361,8 @@ public func cacheTwoStepPasswordToken(postbox: Postbox, token: TemporaryTwoStepP
     }
 }
 
-public func requestTemporaryTwoStepPasswordToken(account: Account, password: String, period: Int32, requiresBiometrics: Bool) -> Signal<TemporaryTwoStepPasswordToken, AuthorizationPasswordVerificationError> {
-    return twoStepAuthData(account.network)
+func _internal_requestTemporaryTwoStepPasswordToken(account: Account, password: String, period: Int32, requiresBiometrics: Bool) -> Signal<TemporaryTwoStepPasswordToken, AuthorizationPasswordVerificationError> {
+    return _internal_twoStepAuthData(account.network)
     |> mapToSignal { authData -> Signal<TemporaryTwoStepPasswordToken, MTRpcError> in
         guard let currentPasswordDerivation = authData.currentPasswordDerivation, let srpSessionData = authData.srpSessionData else {
             return .fail(MTRpcError(errorCode: 400, errorDescription: "NO_PASSWORD"))
@@ -402,3 +391,60 @@ public func requestTemporaryTwoStepPasswordToken(account: Account, password: Str
         }
     }
 }
+
+public enum RequestTwoStepPasswordResetResult {
+    public enum ErrorReason {
+        case generic
+        case limitExceeded(retryAtTimestamp: Int32?)
+    }
+
+    case done
+    case waitingForReset(resetAtTimestamp: Int32)
+    case declined
+    case error(reason: ErrorReason)
+}
+
+func _internal_requestTwoStepPasswordReset(network: Network) -> Signal<RequestTwoStepPasswordResetResult, NoError> {
+    return network.request(Api.functions.account.resetPassword(), automaticFloodWait: false)
+    |> map { result -> RequestTwoStepPasswordResetResult in
+        switch result {
+        case let .resetPasswordFailedWait(retryDate):
+            return .error(reason: .limitExceeded(retryAtTimestamp: retryDate))
+        case .resetPasswordOk:
+            return .done
+        case let .resetPasswordRequestedWait(untilDate):
+            return .waitingForReset(resetAtTimestamp: untilDate)
+        }
+    }
+    |> `catch` { error -> Signal<RequestTwoStepPasswordResetResult, NoError> in
+        if error.errorDescription.hasPrefix("FLOOD_WAIT") {
+            return .single(.error(reason: .limitExceeded(retryAtTimestamp: nil)))
+        } else if error.errorDescription.hasPrefix("RESET_WAIT_") {
+            if let remainingSeconds = Int32(error.errorDescription[error.errorDescription.index(error.errorDescription.startIndex, offsetBy: "RESET_WAIT_".count)...]) {
+                let timestamp = Int32(network.globalTime)
+                return .single(.waitingForReset(resetAtTimestamp: timestamp + remainingSeconds))
+            } else {
+                return .single(.error(reason: .generic))
+            }
+        } else if error.errorDescription.hasPrefix("RESET_PREVIOUS_WAIT_") {
+            if let remainingSeconds = Int32(error.errorDescription[error.errorDescription.index(error.errorDescription.startIndex, offsetBy: "RESET_PREVIOUS_WAIT_".count)...]) {
+                let timestamp = Int32(network.globalTime)
+                return .single(.waitingForReset(resetAtTimestamp: timestamp + remainingSeconds))
+            } else {
+                return .single(.error(reason: .generic))
+            }
+        } else if error.errorDescription == "RESET_PREVIOUS_DECLINE" {
+            return .single(.declined)
+        } else {
+            return .single(.error(reason: .generic))
+        }
+    }
+}
+
+func _internal_declineTwoStepPasswordReset(network: Network) -> Signal<Never, NoError> {
+    return network.request(Api.functions.account.declinePasswordReset())
+    |> `catch` { _ -> Signal<Api.Bool, NoError> in
+        return .single(.boolFalse)
+    }
+    |> ignoreValues
+}
diff --git a/submodules/TelegramCore/Sources/GroupCalls.swift b/submodules/TelegramCore/Sources/TelegramEngine/Calls/GroupCalls.swift
similarity index 64%
rename from submodules/TelegramCore/Sources/GroupCalls.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Calls/GroupCalls.swift
index 9b7eec5c9e..5bf3a438e2 100644
--- a/submodules/TelegramCore/Sources/GroupCalls.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Calls/GroupCalls.swift
@@ -8,27 +8,42 @@ public struct GroupCallInfo: Equatable {
     public var id: Int64
     public var accessHash: Int64
     public var participantCount: Int
-    public var clientParams: String?
     public var streamDcId: Int32?
     public var title: String?
+    public var scheduleTimestamp: Int32?
+    public var subscribedToScheduled: Bool
     public var recordingStartTimestamp: Int32?
+    public var sortAscending: Bool
+    public var defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?
+    public var isVideoEnabled: Bool
+    public var unmutedVideoLimit: Int
     
     public init(
         id: Int64,
         accessHash: Int64,
         participantCount: Int,
-        clientParams: String?,
         streamDcId: Int32?,
         title: String?,
-        recordingStartTimestamp: Int32?
+        scheduleTimestamp: Int32?,
+        subscribedToScheduled: Bool,
+        recordingStartTimestamp: Int32?,
+        sortAscending: Bool,
+        defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?,
+        isVideoEnabled: Bool,
+        unmutedVideoLimit: Int
     ) {
         self.id = id
         self.accessHash = accessHash
         self.participantCount = participantCount
-        self.clientParams = clientParams
         self.streamDcId = streamDcId
         self.title = title
+        self.scheduleTimestamp = scheduleTimestamp
+        self.subscribedToScheduled = subscribedToScheduled
         self.recordingStartTimestamp = recordingStartTimestamp
+        self.sortAscending = sortAscending
+        self.defaultParticipantsAreMuted = defaultParticipantsAreMuted
+        self.isVideoEnabled = isVideoEnabled
+        self.unmutedVideoLimit = unmutedVideoLimit
     }
 }
 
@@ -40,22 +55,20 @@ public struct GroupCallSummary: Equatable {
 extension GroupCallInfo {
     init?(_ call: Api.GroupCall) {
         switch call {
-        case let .groupCall(_, id, accessHash, participantCount, params, title, streamDcId, recordStartDate, _):
-            var clientParams: String?
-            if let params = params {
-                switch params {
-                case let .dataJSON(data):
-                    clientParams = data
-                }
-            }
+        case let .groupCall(flags, id, accessHash, participantsCount, title, streamDcId, recordStartDate, scheduleDate, _, unmutedVideoLimit, _):
             self.init(
                 id: id,
                 accessHash: accessHash,
-                participantCount: Int(participantCount),
-                clientParams: clientParams,
+                participantCount: Int(participantsCount),
                 streamDcId: streamDcId,
                 title: title,
-                recordingStartTimestamp: recordStartDate
+                scheduleTimestamp: scheduleDate,
+                subscribedToScheduled: (flags & (1 << 8)) != 0,
+                recordingStartTimestamp: recordStartDate,
+                sortAscending: (flags & (1 << 6)) != 0,
+                defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: (flags & (1 << 1)) != 0, canChange: (flags & (1 << 2)) != 0),
+                isVideoEnabled: (flags & (1 << 9)) != 0,
+                unmutedVideoLimit: Int(unmutedVideoLimit)
             )
         case .groupCallDiscarded:
             return nil
@@ -67,7 +80,7 @@ public enum GetCurrentGroupCallError {
     case generic
 }
 
-public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int64) -> Signal<GroupCallSummary?, GetCurrentGroupCallError> {
+func _internal_getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int64, peerId: PeerId? = nil) -> Signal<GroupCallSummary?, GetCurrentGroupCallError> {
     return account.network.request(Api.functions.phone.getGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash)))
     |> mapError { _ -> GetCurrentGroupCallError in
         return .generic
@@ -96,63 +109,24 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int
                         peers.append(peer)
                     }
                 }
+                if let peerId = peerId {
+                    transaction.updatePeerCachedData(peerIds: [peerId], update: { _, current in
+                        if let cachedData = current as? CachedChannelData {
+                            return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall.init(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: cachedData.activeCall?.subscribedToScheduled ?? false))
+                        } else if let cachedData = current as? CachedGroupData {
+                            return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: cachedData.activeCall?.subscribedToScheduled ?? false))
+                        } else {
+                            return current
+                        }
+                    })
+                }
                 
                 updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer in
                     return updated
                 })
                 updatePeerPresences(transaction: transaction, accountPeerId: account.peerId, peerPresences: peerPresences)
                 
-                var parsedParticipants: [GroupCallParticipantsContext.Participant] = []
-                
-                loop: for participant in participants {
-                    switch participant {
-                    case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating):
-                        let peerId: PeerId
-                        switch apiPeerId {
-                            case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                            case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                            case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                        }
-                        
-                        let ssrc = UInt32(bitPattern: source)
-                        guard let peer = transaction.getPeer(peerId) else {
-                            continue loop
-                        }
-                        let muted = (flags & (1 << 0)) != 0
-                        let mutedByYou = (flags & (1 << 9)) != 0
-                        var muteState: GroupCallParticipantsContext.Participant.MuteState?
-                        if muted {
-                            let canUnmute = (flags & (1 << 2)) != 0
-                            muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canUnmute, mutedByYou: mutedByYou)
-                        } else if mutedByYou {
-                            muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: mutedByYou)
-                        }
-                        let jsonParams: String? = nil
-                        /*if let params = params {
-                            switch params {
-                            case let .dataJSON(data):
-                                jsonParams = data
-                            }
-                        }*/
-                        parsedParticipants.append(GroupCallParticipantsContext.Participant(
-                            peer: peer,
-                            ssrc: ssrc,
-                            jsonParams: jsonParams,
-                            joinTimestamp: date,
-                            raiseHandRating: raiseHandRating,
-                            hasRaiseHand: raiseHandRating != nil,
-                            activityTimestamp: activeDate.flatMap(Double.init),
-                            activityRank: nil,
-                            muteState: muteState,
-                            volume: volume,
-                            about: about
-                        ))
-                    }
-                }
-                
+                let parsedParticipants = participants.compactMap { GroupCallParticipantsContext.Participant($0, transaction: transaction) }
                 return GroupCallSummary(
                     info: info,
                     topParticipants: parsedParticipants
@@ -167,9 +141,10 @@ public func getCurrentGroupCall(account: Account, callId: Int64, accessHash: Int
 public enum CreateGroupCallError {
     case generic
     case anonymousNotAllowed
+    case scheduledTooLate
 }
 
-public func createGroupCall(account: Account, peerId: PeerId) -> Signal<GroupCallInfo, CreateGroupCallError> {
+func _internal_createGroupCall(account: Account, peerId: PeerId, title: String?, scheduleDate: Int32?) -> Signal<GroupCallInfo, CreateGroupCallError> {
     return account.postbox.transaction { transaction -> Api.InputPeer? in
         let callPeer = transaction.getPeer(peerId).flatMap(apiInputPeer)
         return callPeer
@@ -179,11 +154,19 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal<GroupCal
         guard let inputPeer = inputPeer else {
             return .fail(.generic)
         }
-        
-        return account.network.request(Api.functions.phone.createGroupCall(peer: inputPeer, randomId: Int32.random(in: Int32.min ... Int32.max)))
+        var flags: Int32 = 0
+        if let _ = title {
+            flags |= (1 << 0)
+        }
+        if let _ = scheduleDate {
+            flags |= (1 << 1)
+        }
+        return account.network.request(Api.functions.phone.createGroupCall(flags: flags, peer: inputPeer, randomId: Int32.random(in: Int32.min ... Int32.max), title: title, scheduleDate: scheduleDate))
         |> mapError { error -> CreateGroupCallError in
             if error.errorDescription == "ANONYMOUS_CALLS_DISABLED" {
                 return .anonymousNotAllowed
+            } else if error.errorDescription == "SCHEDULE_DATE_TOO_LATE" {
+                return .scheduledTooLate
             }
             return .generic
         }
@@ -206,9 +189,9 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal<GroupCal
             return account.postbox.transaction { transaction -> GroupCallInfo in
                 transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
                     if let cachedData = cachedData as? CachedChannelData {
-                        return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title))
+                        return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled))
                     } else if let cachedData = cachedData as? CachedGroupData {
-                        return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title))
+                        return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled))
                     } else {
                         return cachedData
                     }
@@ -223,22 +206,165 @@ public func createGroupCall(account: Account, peerId: PeerId) -> Signal<GroupCal
     }
 }
 
+public enum StartScheduledGroupCallError {
+    case generic
+}
+
+func _internal_startScheduledGroupCall(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64) -> Signal<GroupCallInfo, StartScheduledGroupCallError> {
+    return account.network.request(Api.functions.phone.startScheduledGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash)))
+    |> mapError { error -> StartScheduledGroupCallError in
+        return .generic
+    }
+    |> mapToSignal { result -> Signal<GroupCallInfo, StartScheduledGroupCallError> in
+        var parsedCall: GroupCallInfo?
+        loop: for update in result.allUpdates {
+            switch update {
+            case let .updateGroupCall(_, call):
+                parsedCall = GroupCallInfo(call)
+                break loop
+            default:
+                break
+            }
+        }
+        
+        guard let callInfo = parsedCall else {
+            return .fail(.generic)
+        }
+        
+        return account.postbox.transaction { transaction -> GroupCallInfo in
+            transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
+                if let cachedData = cachedData as? CachedChannelData {
+                    return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: nil, subscribedToScheduled: false))
+                } else if let cachedData = cachedData as? CachedGroupData {
+                    return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: nil, subscribedToScheduled: false))
+                } else {
+                    return cachedData
+                }
+            })
+            
+            account.stateManager.addUpdates(result)
+            
+            return callInfo
+        }
+        |> castError(StartScheduledGroupCallError.self)
+    }
+}
+
+public enum ToggleScheduledGroupCallSubscriptionError {
+    case generic
+}
+
+func _internal_toggleScheduledGroupCallSubscription(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64, subscribe: Bool) -> Signal<Void, ToggleScheduledGroupCallSubscriptionError> {
+    return account.network.request(Api.functions.phone.toggleGroupCallStartSubscription(call: .inputGroupCall(id: callId, accessHash: accessHash), subscribed: subscribe ? .boolTrue : .boolFalse))
+    |> mapError { error -> ToggleScheduledGroupCallSubscriptionError in
+        return .generic
+    }
+    |> mapToSignal { result -> Signal<Void, ToggleScheduledGroupCallSubscriptionError> in
+        var parsedCall: GroupCallInfo?
+        loop: for update in result.allUpdates {
+            switch update {
+            case let .updateGroupCall(_, call):
+                parsedCall = GroupCallInfo(call)
+                break loop
+            default:
+                break
+            }
+        }
+        
+        guard let callInfo = parsedCall else {
+            return .fail(.generic)
+        }
+        
+        return account.postbox.transaction { transaction in
+            transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
+                if let cachedData = cachedData as? CachedChannelData {
+                    return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled))
+                } else if let cachedData = cachedData as? CachedGroupData {
+                    return cachedData.withUpdatedActiveCall(CachedChannelData.ActiveCall(id: callInfo.id, accessHash: callInfo.accessHash, title: callInfo.title, scheduleTimestamp: callInfo.scheduleTimestamp, subscribedToScheduled: callInfo.subscribedToScheduled))
+                } else {
+                    return cachedData
+                }
+            })
+            
+            account.stateManager.addUpdates(result)
+        }
+        |> castError(ToggleScheduledGroupCallSubscriptionError.self)
+    }
+}
+
+public enum UpdateGroupCallJoinAsPeerError {
+    case generic
+}
+
+func _internal_updateGroupCallJoinAsPeer(account: Account, peerId: PeerId, joinAs: PeerId) -> Signal<Never, UpdateGroupCallJoinAsPeerError> {
+    return account.postbox.transaction { transaction -> (Api.InputPeer, Api.InputPeer)? in
+        if let peer = transaction.getPeer(peerId), let joinAsPeer = transaction.getPeer(joinAs), let inputPeer = apiInputPeer(peer), let joinInputPeer = apiInputPeer(joinAsPeer) {
+            return (inputPeer, joinInputPeer)
+        } else {
+            return nil
+        }
+    }
+    |> castError(UpdateGroupCallJoinAsPeerError.self)
+    |> mapToSignal { result in
+        guard let (inputPeer, joinInputPeer) = result else {
+            return .fail(.generic)
+        }
+        return account.network.request(Api.functions.phone.saveDefaultGroupCallJoinAs(peer: inputPeer, joinAs: joinInputPeer))
+        |> mapError { _ -> UpdateGroupCallJoinAsPeerError in
+            return .generic
+        }
+        |> mapToSignal { result -> Signal<Never, UpdateGroupCallJoinAsPeerError> in
+            return account.postbox.transaction { transaction in
+                transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
+                    if let cachedData = cachedData as? CachedChannelData {
+                        return cachedData.withUpdatedCallJoinPeerId(joinAs)
+                    } else if let cachedData = cachedData as? CachedGroupData {
+                        return cachedData.withUpdatedCallJoinPeerId(joinAs)
+                    } else {
+                        return cachedData
+                    }
+                })
+            }
+            |> castError(UpdateGroupCallJoinAsPeerError.self)
+            |> ignoreValues
+        }
+    }
+}
+
 public enum GetGroupCallParticipantsError {
     case generic
 }
 
-public func getGroupCallParticipants(account: Account, callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32) -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> {
-    return account.network.request(Api.functions.phone.getGroupParticipants(call: .inputGroupCall(id: callId, accessHash: accessHash), ids: [], sources: ssrcs.map { Int32(bitPattern: $0) }, offset: offset, limit: limit))
+func _internal_getGroupCallParticipants(account: Account, callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32, sortAscending: Bool?) -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> {
+    let sortAscendingValue: Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?, Bool, Int), GetGroupCallParticipantsError>
+    
+    sortAscendingValue = _internal_getCurrentGroupCall(account: account, callId: callId, accessHash: accessHash)
     |> mapError { _ -> GetGroupCallParticipantsError in
         return .generic
     }
-    |> mapToSignal { result -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> in
+    |> mapToSignal { result -> Signal<(Bool, Int32?, Bool, GroupCallParticipantsContext.State.DefaultParticipantsAreMuted?, Bool, Int), GetGroupCallParticipantsError> in
+        guard let result = result else {
+            return .fail(.generic)
+        }
+        return .single((sortAscending ?? result.info.sortAscending, result.info.scheduleTimestamp, result.info.subscribedToScheduled, result.info.defaultParticipantsAreMuted, result.info.isVideoEnabled, result.info.unmutedVideoLimit))
+    }
+
+    return combineLatest(
+        account.network.request(Api.functions.phone.getGroupParticipants(call: .inputGroupCall(id: callId, accessHash: accessHash), ids: [], sources: ssrcs.map { Int32(bitPattern: $0) }, offset: offset, limit: limit))
+        |> mapError { _ -> GetGroupCallParticipantsError in
+            return .generic
+        },
+        sortAscendingValue
+    )
+    |> mapToSignal { result, sortAscendingAndScheduleTimestamp -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> in
         return account.postbox.transaction { transaction -> GroupCallParticipantsContext.State in
             var parsedParticipants: [GroupCallParticipantsContext.Participant] = []
             let totalCount: Int
             let version: Int32
             let nextParticipantsFetchOffset: String?
             
+            let (sortAscendingValue, scheduleTimestamp, subscribedToScheduled, defaultParticipantsAreMuted, isVideoEnabled, unmutedVideoLimit) = sortAscendingAndScheduleTimestamp
+            
             switch result {
             case let .groupParticipants(count, participants, nextOffset, chats, users, apiVersion):
                 totalCount = Int(count)
@@ -272,66 +398,25 @@ public func getGroupCallParticipants(account: Account, callId: Int64, accessHash
                 })
                 updatePeerPresences(transaction: transaction, accountPeerId: account.peerId, peerPresences: peerPresences)
                 
-                loop: for participant in participants {
-                    switch participant {
-                    case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating):
-                        let peerId: PeerId
-                        switch apiPeerId {
-                            case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                            case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                            case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                        }
-                        let ssrc = UInt32(bitPattern: source)
-                        guard let peer = transaction.getPeer(peerId) else {
-                            continue loop
-                        }
-                        let muted = (flags & (1 << 0)) != 0
-                        let mutedByYou = (flags & (1 << 9)) != 0
-                        var muteState: GroupCallParticipantsContext.Participant.MuteState?
-                        if muted {
-                            let canUnmute = (flags & (1 << 2)) != 0
-                            muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canUnmute, mutedByYou: mutedByYou)
-                        } else if mutedByYou {
-                            muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: mutedByYou)
-                        }
-                        let jsonParams: String? = nil
-                        /*if let params = params {
-                            switch params {
-                            case let .dataJSON(data):
-                                jsonParams = data
-                            }
-                        }*/
-                        parsedParticipants.append(GroupCallParticipantsContext.Participant(
-                            peer: peer,
-                            ssrc: ssrc,
-                            jsonParams: jsonParams,
-                            joinTimestamp: date,
-                            raiseHandRating: raiseHandRating,
-                            hasRaiseHand: raiseHandRating != nil,
-                            activityTimestamp: activeDate.flatMap(Double.init),
-                            activityRank: nil,
-                            muteState: muteState,
-                            volume: volume,
-                            about: about
-                        ))
-                    }
-                }
+                parsedParticipants = participants.compactMap { GroupCallParticipantsContext.Participant($0, transaction: transaction) }
             }
-            
-            parsedParticipants.sort()
+
+            parsedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: sortAscendingValue) })
             
             return GroupCallParticipantsContext.State(
                 participants: parsedParticipants,
                 nextParticipantsFetchOffset: nextParticipantsFetchOffset,
                 adminIds: Set(),
                 isCreator: false,
-                defaultParticipantsAreMuted: GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false),
+                defaultParticipantsAreMuted: defaultParticipantsAreMuted ?? GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: false, canChange: false),
+                sortAscending: sortAscendingValue,
                 recordingStartTimestamp: nil,
                 title: nil,
+                scheduleTimestamp: scheduleTimestamp,
+                subscribedToScheduled: subscribedToScheduled,
                 totalCount: totalCount,
+                isVideoEnabled: isVideoEnabled,
+                unmutedVideoLimit: unmutedVideoLimit,
                 version: version
             )
         }
@@ -343,6 +428,7 @@ public enum JoinGroupCallError {
     case generic
     case anonymousNotAllowed
     case tooManyParticipants
+    case invalidJoinAsPeer
 }
 
 public struct JoinGroupCallResult {
@@ -354,9 +440,10 @@ public struct JoinGroupCallResult {
     public var callInfo: GroupCallInfo
     public var state: GroupCallParticipantsContext.State
     public var connectionMode: ConnectionMode
+    public var jsonParams: String
 }
 
-public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, callId: Int64, accessHash: Int64, preferMuted: Bool, joinPayload: String, peerAdminIds: Signal<[PeerId], NoError>, inviteHash: String? = nil) -> Signal<JoinGroupCallResult, JoinGroupCallError> {
+func _internal_joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, callId: Int64, accessHash: Int64, preferMuted: Bool, joinPayload: String, peerAdminIds: Signal<[PeerId], NoError>, inviteHash: String? = nil) -> Signal<JoinGroupCallResult, JoinGroupCallError> {
     return account.postbox.transaction { transaction -> Api.InputPeer? in
         if let joinAs = joinAs {
             return transaction.getPeer(joinAs).flatMap(apiInputPeer)
@@ -374,21 +461,44 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
         if preferMuted {
             flags |= (1 << 0)
         }
+        flags |= (1 << 2)
         if let _ = inviteHash {
             flags |= (1 << 1)
         }
 
         let joinRequest = account.network.request(Api.functions.phone.joinGroupCall(flags: flags, call: .inputGroupCall(id: callId, accessHash: accessHash), joinAs: inputJoinAs, inviteHash: inviteHash, params: .dataJSON(data: joinPayload)))
-        |> mapError { error -> JoinGroupCallError in
+            |> `catch` { error -> Signal<Api.Updates, JoinGroupCallError> in
             if error.errorDescription == "GROUPCALL_ANONYMOUS_FORBIDDEN" {
-                return .anonymousNotAllowed
+                return .fail(.anonymousNotAllowed)
             } else if error.errorDescription == "GROUPCALL_PARTICIPANTS_TOO_MUCH" {
-                return .tooManyParticipants
+                return .fail(.tooManyParticipants)
+            } else if error.errorDescription == "JOIN_AS_PEER_INVALID" {
+                return .fail(.invalidJoinAsPeer)
+            } else if error.errorDescription == "GROUPCALL_INVALID" {
+                return account.postbox.transaction { transaction -> Signal<Api.Updates, JoinGroupCallError> in
+                    transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
+                        if let current = current as? CachedGroupData {
+                            if current.activeCall?.id == callId {
+                                return current.withUpdatedActiveCall(nil)
+                            }
+                        } else if let current = current as? CachedChannelData {
+                            if current.activeCall?.id == callId {
+                                return current.withUpdatedActiveCall(nil)
+                            }
+                        }
+                        return current
+                    })
+
+                    return .fail(.generic)
+                }
+                |> castError(JoinGroupCallError.self)
+                |> switchToLatest
+            } else {
+                return .fail(.generic)
             }
-            return .generic
         }
 
-        let getParticipantsRequest = getGroupCallParticipants(account: account, callId: callId, accessHash: accessHash, offset: "", ssrcs: [], limit: 100)
+        let getParticipantsRequest = _internal_getGroupCallParticipants(account: account, callId: callId, accessHash: accessHash, offset: "", ssrcs: [], limit: 100, sortAscending: true)
         |> mapError { _ -> JoinGroupCallError in
             return .generic
         }
@@ -397,7 +507,7 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
             joinRequest,
             getParticipantsRequest
         )
-        |> mapToSignal { updates, participantsState -> Signal<JoinGroupCallResult, JoinGroupCallError> in            
+        |> mapToSignal { updates, participantsState -> Signal<JoinGroupCallResult, JoinGroupCallError> in
             let peer = account.postbox.transaction { transaction -> Peer? in
                 return transaction.getPeer(peerId)
             }
@@ -426,31 +536,41 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                 account.stateManager.addUpdates(updates)
                 
                 var maybeParsedCall: GroupCallInfo?
+                var maybeParsedClientParams: String?
                 loop: for update in updates.allUpdates {
                     switch update {
                     case let .updateGroupCall(_, call):
                         maybeParsedCall = GroupCallInfo(call)
                         
                         switch call {
-                        case let .groupCall(flags, _, _, _, _, title, _, recordStartDate, _):
+                        case let .groupCall(flags, _, _, _, title, _, recordStartDate, scheduleDate, _, unmutedVideoLimit, _):
                             let isMuted = (flags & (1 << 1)) != 0
                             let canChange = (flags & (1 << 2)) != 0
+                            let isVideoEnabled = (flags & (1 << 9)) != 0
                             state.defaultParticipantsAreMuted = GroupCallParticipantsContext.State.DefaultParticipantsAreMuted(isMuted: isMuted, canChange: canChange)
                             state.title = title
                             state.recordingStartTimestamp = recordStartDate
+                            state.scheduleTimestamp = scheduleDate
+                            state.isVideoEnabled = isVideoEnabled
+                            state.unmutedVideoLimit = Int(unmutedVideoLimit)
                         default:
                             break
                         }
-                        
-                        break loop
+                    case let .updateGroupCallConnection(_, params):
+                        switch params {
+                        case let .dataJSON(data):
+                            maybeParsedClientParams = data
+                        }
                     default:
                         break
                     }
                 }
                 
-                guard let parsedCall = maybeParsedCall else {
+                guard let parsedCall = maybeParsedCall, let parsedClientParams = maybeParsedClientParams else {
                     return .fail(.generic)
                 }
+
+                state.sortAscending = parsedCall.sortAscending
                 
                 let apiUsers: [Api.User] = []
                 
@@ -468,7 +588,7 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                 }
 
                 let connectionMode: JoinGroupCallResult.ConnectionMode
-                if let clientParams = parsedCall.clientParams, let clientParamsData = clientParams.data(using: .utf8), let dict = (try? JSONSerialization.jsonObject(with: clientParamsData, options: [])) as? [String: Any] {
+                if let clientParamsData = parsedClientParams.data(using: .utf8), let dict = (try? JSONSerialization.jsonObject(with: clientParamsData, options: [])) as? [String: Any] {
                     if let stream = dict["stream"] as? Bool, stream {
                         connectionMode = .broadcast
                     } else {
@@ -481,9 +601,9 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                 return account.postbox.transaction { transaction -> JoinGroupCallResult in
                     transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, cachedData -> CachedPeerData? in
                         if let cachedData = cachedData as? CachedChannelData {
-                            return cachedData.withUpdatedCallJoinPeerId(joinAs)
+                            return cachedData.withUpdatedCallJoinPeerId(joinAs).withUpdatedActiveCall(CachedChannelData.ActiveCall(id: parsedCall.id, accessHash: parsedCall.accessHash, title: parsedCall.title, scheduleTimestamp: nil, subscribedToScheduled: false))
                         } else if let cachedData = cachedData as? CachedGroupData {
-                            return cachedData.withUpdatedCallJoinPeerId(joinAs)
+                            return cachedData.withUpdatedCallJoinPeerId(joinAs).withUpdatedActiveCall(CachedChannelData.ActiveCall(id: parsedCall.id, accessHash: parsedCall.accessHash, title: parsedCall.title, scheduleTimestamp: nil, subscribedToScheduled: false))
                         } else {
                             return cachedData
                         }
@@ -496,16 +616,8 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                         case let .updateGroupCallParticipants(_, participants, _):
                             loop: for participant in participants {
                                 switch participant {
-                                case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating):
-                                    let peerId: PeerId
-                                    switch apiPeerId {
-                                        case let .peerUser(userId):
-                                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                                        case let .peerChat(chatId):
-                                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                                        case let .peerChannel(channelId):
-                                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                                    }
+                                case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating, video, presentation):
+                                    let peerId: PeerId = apiPeerId.peerId
                                     let ssrc = UInt32(bitPattern: source)
                                     guard let peer = transaction.getPeer(peerId) else {
                                         continue loop
@@ -519,18 +631,19 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                                     } else if mutedByYou {
                                         muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: mutedByYou)
                                     }
-                                    let jsonParams: String? = nil
-                                    /*if let params = params {
-                                        switch params {
-                                        case let .dataJSON(data):
-                                            jsonParams = data
-                                        }
-                                    }*/
+                                    var videoDescription = video.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+                                    var presentationDescription = presentation.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+                                    if muteState?.canUnmute == false {
+                                        videoDescription = nil
+                                        presentationDescription = nil
+                                    }
+                                    let joinedVideo = (flags & (1 << 15)) != 0
                                     if !state.participants.contains(where: { $0.peer.id == peer.id }) {
                                         state.participants.append(GroupCallParticipantsContext.Participant(
                                             peer: peer,
                                             ssrc: ssrc,
-                                            jsonParams: jsonParams,
+                                            videoDescription: videoDescription,
+                                            presentationDescription: presentationDescription,
                                             joinTimestamp: date,
                                             raiseHandRating: raiseHandRating,
                                             hasRaiseHand: raiseHandRating != nil,
@@ -538,7 +651,8 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                                             activityRank: nil,
                                             muteState: muteState,
                                             volume: volume,
-                                            about: about
+                                            about: about,
+                                            joinedVideo: joinedVideo
                                         ))
                                     }
                                 }
@@ -548,7 +662,7 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                         }
                     }
 
-                    state.participants.sort()
+                    state.participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: state.sortAscending) })
 
                     updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer in
                         return updated
@@ -558,21 +672,86 @@ public func joinGroupCall(account: Account, peerId: PeerId, joinAs: PeerId?, cal
                     return JoinGroupCallResult(
                         callInfo: parsedCall,
                         state: state,
-                        connectionMode: connectionMode
+                        connectionMode: connectionMode,
+                        jsonParams: parsedClientParams
                     )
                 }
                 |> castError(JoinGroupCallError.self)
             }
         }
     }
-    
+}
+
+public struct JoinGroupCallAsScreencastResult {
+    public var jsonParams: String
+    public var endpointId: String
+}
+
+func _internal_joinGroupCallAsScreencast(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64, joinPayload: String) -> Signal<JoinGroupCallAsScreencastResult, JoinGroupCallError> {
+    return account.network.request(Api.functions.phone.joinGroupCallPresentation(call: .inputGroupCall(id: callId, accessHash: accessHash), params: .dataJSON(data: joinPayload)))
+    |> mapError { _ -> JoinGroupCallError in
+        return .generic
+    }
+    |> mapToSignal { updates -> Signal<JoinGroupCallAsScreencastResult, JoinGroupCallError> in
+        account.stateManager.addUpdates(updates)
+
+        var maybeParsedClientParams: String?
+        loop: for update in updates.allUpdates {
+            switch update {
+            case let .updateGroupCallConnection(_, params):
+                switch params {
+                case let .dataJSON(data):
+                    maybeParsedClientParams = data
+                }
+            default:
+                break
+            }
+        }
+
+        guard let parsedClientParams = maybeParsedClientParams else {
+            return .fail(.generic)
+        }
+
+        var maybeEndpointId: String?
+
+        if let jsonData = parsedClientParams.data(using: .utf8), let json = try? JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any] {
+            if let videoSection = json["video"] as? [String: Any] {
+                maybeEndpointId = videoSection["endpoint"] as? String
+            }
+        }
+
+        guard let endpointId = maybeEndpointId else {
+            return .fail(.generic)
+        }
+
+        return .single(JoinGroupCallAsScreencastResult(
+            jsonParams: parsedClientParams,
+            endpointId: endpointId
+        ))
+    }
+}
+
+public enum LeaveGroupCallAsScreencastError {
+    case generic
+}
+
+func _internal_leaveGroupCallAsScreencast(account: Account, callId: Int64, accessHash: Int64) -> Signal<Never, LeaveGroupCallAsScreencastError> {
+    return account.network.request(Api.functions.phone.leaveGroupCallPresentation(call: .inputGroupCall(id: callId, accessHash: accessHash)))
+    |> mapError { _ -> LeaveGroupCallAsScreencastError in
+        return .generic
+    }
+    |> mapToSignal { updates -> Signal<Never, LeaveGroupCallAsScreencastError> in
+        account.stateManager.addUpdates(updates)
+
+        return .complete()
+    }
 }
 
 public enum LeaveGroupCallError {
     case generic
 }
 
-public func leaveGroupCall(account: Account, callId: Int64, accessHash: Int64, source: UInt32) -> Signal<Never, LeaveGroupCallError> {
+func _internal_leaveGroupCall(account: Account, callId: Int64, accessHash: Int64, source: UInt32) -> Signal<Never, LeaveGroupCallError> {
     return account.network.request(Api.functions.phone.leaveGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash), source: Int32(bitPattern: source)))
     |> mapError { _ -> LeaveGroupCallError in
         return .generic
@@ -588,7 +767,7 @@ public enum StopGroupCallError {
     case generic
 }
 
-public func stopGroupCall(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64) -> Signal<Never, StopGroupCallError> {
+func _internal_stopGroupCall(account: Account, peerId: PeerId, callId: Int64, accessHash: Int64) -> Signal<Never, StopGroupCallError> {
     return account.network.request(Api.functions.phone.discardGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash)))
     |> mapError { _ -> StopGroupCallError in
         return .generic
@@ -630,26 +809,13 @@ public func stopGroupCall(account: Account, peerId: PeerId, callId: Int64, acces
     }
 }
 
-public enum CheckGroupCallResult {
-    case success
-    case restart
-}
-
-public func checkGroupCall(account: Account, callId: Int64, accessHash: Int64, ssrc: Int32) -> Signal<CheckGroupCallResult, NoError> {
-    return account.network.request(Api.functions.phone.checkGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash), source: ssrc))
-    |> `catch` { _ -> Signal<Api.Bool, NoError> in
-        return .single(.boolFalse)
+func _internal_checkGroupCall(account: Account, callId: Int64, accessHash: Int64, ssrcs: [UInt32]) -> Signal<[UInt32], NoError> {
+    return account.network.request(Api.functions.phone.checkGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash), sources: ssrcs.map(Int32.init(bitPattern:))))
+    |> `catch` { _ -> Signal<[Int32], NoError> in
+        return .single([])
     }
-    |> map { result -> CheckGroupCallResult in
-        #if DEBUG
-        //return .restart
-        #endif
-        switch result {
-        case .boolTrue:
-            return .success
-        case .boolFalse:
-            return .restart
-        }
+    |> map { result -> [UInt32] in
+        return result.map(UInt32.init(bitPattern:))
     }
 }
 
@@ -670,7 +836,7 @@ private func binaryInsertionIndex(_ inputArr: [GroupCallParticipantsContext.Part
 }
 
 public final class GroupCallParticipantsContext {
-    public struct Participant: Equatable, Comparable {
+    public struct Participant: Equatable, CustomStringConvertible {
         public struct MuteState: Equatable {
             public var canUnmute: Bool
             public var mutedByYou: Bool
@@ -680,10 +846,23 @@ public final class GroupCallParticipantsContext {
                 self.mutedByYou = mutedByYou
             }
         }
+
+        public struct VideoDescription: Equatable {
+            public struct SsrcGroup: Equatable {
+                public var semantics: String
+                public var ssrcs: [UInt32]
+            }
+
+            public var endpointId: String
+            public var ssrcGroups: [SsrcGroup]
+            public var audioSsrc: UInt32?
+            public var isPaused: Bool
+        }
         
         public var peer: Peer
         public var ssrc: UInt32?
-        public var jsonParams: String?
+        public var videoDescription: VideoDescription?
+        public var presentationDescription: VideoDescription?
         public var joinTimestamp: Int32
         public var raiseHandRating: Int64?
         public var hasRaiseHand: Bool
@@ -692,11 +871,13 @@ public final class GroupCallParticipantsContext {
         public var muteState: MuteState?
         public var volume: Int32?
         public var about: String?
+        public var joinedVideo: Bool
         
         public init(
             peer: Peer,
             ssrc: UInt32?,
-            jsonParams: String?,
+            videoDescription: VideoDescription?,
+            presentationDescription: VideoDescription?,
             joinTimestamp: Int32,
             raiseHandRating: Int64?,
             hasRaiseHand: Bool,
@@ -704,11 +885,13 @@ public final class GroupCallParticipantsContext {
             activityRank: Int?,
             muteState: MuteState?,
             volume: Int32?,
-            about: String?
+            about: String?,
+            joinedVideo: Bool
         ) {
             self.peer = peer
             self.ssrc = ssrc
-            self.jsonParams = jsonParams
+            self.videoDescription = videoDescription
+            self.presentationDescription = presentationDescription
             self.joinTimestamp = joinTimestamp
             self.raiseHandRating = raiseHandRating
             self.hasRaiseHand = hasRaiseHand
@@ -717,11 +900,18 @@ public final class GroupCallParticipantsContext {
             self.muteState = muteState
             self.volume = volume
             self.about = about
+            self.joinedVideo = joinedVideo
+        }
+
+        public var description: String {
+            return "Participant(peer: \(peer.id): \(peer.debugDisplayTitle), ssrc: \(String(describing: self.ssrc))"
         }
         
-        public mutating func mergeActivity(from other: Participant) {
+        public mutating func mergeActivity(from other: Participant, mergeActivityTimestamp: Bool) {
             self.activityRank = other.activityRank
-            self.activityTimestamp = other.activityTimestamp
+            if mergeActivityTimestamp {
+                self.activityTimestamp = other.activityTimestamp
+            }
         }
         
         public static func ==(lhs: Participant, rhs: Participant) -> Bool {
@@ -731,6 +921,12 @@ public final class GroupCallParticipantsContext {
             if lhs.ssrc != rhs.ssrc {
                 return false
             }
+            if lhs.videoDescription != rhs.videoDescription {
+                return false
+            }
+            if lhs.presentationDescription != rhs.presentationDescription {
+                return false
+            }
             if lhs.joinTimestamp != rhs.joinTimestamp {
                 return false
             }
@@ -761,7 +957,13 @@ public final class GroupCallParticipantsContext {
             return true
         }
         
-        public static func <(lhs: Participant, rhs: Participant) -> Bool {
+        public static func compare(lhs: Participant, rhs: Participant, sortAscending: Bool) -> Bool {
+            let lhsCanUnmute = lhs.muteState?.canUnmute ?? true
+            let rhsCanUnmute = rhs.muteState?.canUnmute ?? true
+            if lhsCanUnmute != rhsCanUnmute {
+                return lhsCanUnmute
+            }
+
             if let lhsActivityRank = lhs.activityRank, let rhsActivityRank = rhs.activityRank {
                 if lhsActivityRank != rhsActivityRank {
                     return lhsActivityRank < rhsActivityRank
@@ -793,7 +995,11 @@ public final class GroupCallParticipantsContext {
             }
             
             if lhs.joinTimestamp != rhs.joinTimestamp {
-                return lhs.joinTimestamp > rhs.joinTimestamp
+                if sortAscending {
+                    return lhs.joinTimestamp < rhs.joinTimestamp
+                } else {
+                    return lhs.joinTimestamp > rhs.joinTimestamp
+                }
             }
             
             return lhs.peer.id < rhs.peer.id
@@ -804,6 +1010,11 @@ public final class GroupCallParticipantsContext {
         public struct DefaultParticipantsAreMuted: Equatable {
             public var isMuted: Bool
             public var canChange: Bool
+            
+            public init(isMuted: Bool, canChange: Bool) {
+                self.isMuted = isMuted
+                self.canChange = canChange
+            }
         }
         
         public var participants: [Participant]
@@ -811,12 +1022,17 @@ public final class GroupCallParticipantsContext {
         public var adminIds: Set<PeerId>
         public var isCreator: Bool
         public var defaultParticipantsAreMuted: DefaultParticipantsAreMuted
+        public var sortAscending: Bool
         public var recordingStartTimestamp: Int32?
         public var title: String?
+        public var scheduleTimestamp: Int32?
+        public var subscribedToScheduled: Bool
         public var totalCount: Int
+        public var isVideoEnabled: Bool
+        public var unmutedVideoLimit: Int
         public var version: Int32
         
-        public mutating func mergeActivity(from other: State, myPeerId: PeerId, previousMyPeerId: PeerId?) {
+        public mutating func mergeActivity(from other: State, myPeerId: PeerId?, previousMyPeerId: PeerId?, mergeActivityTimestamps: Bool) {
             var indexMap: [PeerId: Int] = [:]
             for i in 0 ..< other.participants.count {
                 indexMap[other.participants[i].peer.id] = i
@@ -824,14 +1040,46 @@ public final class GroupCallParticipantsContext {
             
             for i in 0 ..< self.participants.count {
                 if let index = indexMap[self.participants[i].peer.id] {
-                    self.participants[i].mergeActivity(from: other.participants[index])
+                    self.participants[i].mergeActivity(from: other.participants[index], mergeActivityTimestamp: mergeActivityTimestamps)
                     if self.participants[i].peer.id == myPeerId || self.participants[i].peer.id == previousMyPeerId {
                         self.participants[i].joinTimestamp = other.participants[index].joinTimestamp
                     }
                 }
             }
             
-            self.participants.sort()
+            self.participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: self.sortAscending) })
+        }
+        
+        public init(
+            participants: [Participant],
+            nextParticipantsFetchOffset: String?,
+            adminIds: Set<PeerId>,
+            isCreator: Bool,
+            defaultParticipantsAreMuted: DefaultParticipantsAreMuted,
+            sortAscending: Bool,
+            recordingStartTimestamp: Int32?,
+            title: String?,
+            scheduleTimestamp: Int32?,
+            subscribedToScheduled: Bool,
+            totalCount: Int,
+            isVideoEnabled: Bool,
+            unmutedVideoLimit: Int,
+            version: Int32
+        ) {
+            self.participants = participants
+            self.nextParticipantsFetchOffset = nextParticipantsFetchOffset
+            self.adminIds = adminIds
+            self.isCreator = isCreator
+            self.defaultParticipantsAreMuted = defaultParticipantsAreMuted
+            self.sortAscending = sortAscending
+            self.recordingStartTimestamp = recordingStartTimestamp
+            self.title = title
+            self.scheduleTimestamp = scheduleTimestamp
+            self.subscribedToScheduled = subscribedToScheduled
+            self.totalCount = totalCount
+            self.isVideoEnabled = isVideoEnabled
+            self.unmutedVideoLimit = unmutedVideoLimit
+            self.version = version
         }
     }
     
@@ -881,7 +1129,8 @@ public final class GroupCallParticipantsContext {
                 
                 public var peerId: PeerId
                 public var ssrc: UInt32?
-                public var jsonParams: String?
+                public var videoDescription: GroupCallParticipantsContext.Participant.VideoDescription?
+                public var presentationDescription: GroupCallParticipantsContext.Participant.VideoDescription?
                 public var joinTimestamp: Int32
                 public var activityTimestamp: Double?
                 public var raiseHandRating: Int64?
@@ -889,12 +1138,14 @@ public final class GroupCallParticipantsContext {
                 public var participationStatusChange: ParticipationStatusChange
                 public var volume: Int32?
                 public var about: String?
+                public var joinedVideo: Bool
                 public var isMin: Bool
                 
                 init(
                     peerId: PeerId,
                     ssrc: UInt32?,
-                    jsonParams: String?,
+                    videoDescription: GroupCallParticipantsContext.Participant.VideoDescription?,
+                    presentationDescription: GroupCallParticipantsContext.Participant.VideoDescription?,
                     joinTimestamp: Int32,
                     activityTimestamp: Double?,
                     raiseHandRating: Int64?,
@@ -902,11 +1153,13 @@ public final class GroupCallParticipantsContext {
                     participationStatusChange: ParticipationStatusChange,
                     volume: Int32?,
                     about: String?,
+                    joinedVideo: Bool,
                     isMin: Bool
                 ) {
                     self.peerId = peerId
                     self.ssrc = ssrc
-                    self.jsonParams = jsonParams
+                    self.videoDescription = videoDescription
+                    self.presentationDescription = presentationDescription
                     self.joinTimestamp = joinTimestamp
                     self.activityTimestamp = activityTimestamp
                     self.raiseHandRating = raiseHandRating
@@ -914,6 +1167,7 @@ public final class GroupCallParticipantsContext {
                     self.participationStatusChange = participationStatusChange
                     self.volume = volume
                     self.about = about
+                    self.joinedVideo = joinedVideo
                     self.isMin = isMin
                 }
             }
@@ -925,15 +1179,17 @@ public final class GroupCallParticipantsContext {
         }
         
         case state(update: StateUpdate)
-        case call(isTerminated: Bool, defaultParticipantsAreMuted: State.DefaultParticipantsAreMuted, title: String?, recordingStartTimestamp: Int32?)
+        case call(isTerminated: Bool, defaultParticipantsAreMuted: State.DefaultParticipantsAreMuted, title: String?, recordingStartTimestamp: Int32?, scheduleTimestamp: Int32?, isVideoEnabled: Bool)
     }
     
     public final class MemberEvent {
         public let peerId: PeerId
+        public let canUnmute: Bool
         public let joined: Bool
         
-        public init(peerId: PeerId, joined: Bool) {
+        public init(peerId: PeerId, canUnmute: Bool, joined: Bool) {
             self.peerId = peerId
+            self.canUnmute = canUnmute
             self.joined = joined
         }
     }
@@ -958,11 +1214,24 @@ public final class GroupCallParticipantsContext {
     
     public var state: Signal<State, NoError> {
         let accountPeerId = self.account.peerId
+        let myPeerId = self.myPeerId
         return self.statePromise.get()
         |> map { state -> State in
             var publicState = state.state
             var sortAgain = false
-            let canSeeHands = state.state.isCreator || state.state.adminIds.contains(accountPeerId)
+            var canSeeHands = state.state.isCreator || state.state.adminIds.contains(accountPeerId)
+            for participant in publicState.participants {
+                if participant.peer.id == myPeerId {
+                    if let muteState = participant.muteState {
+                        if muteState.canUnmute {
+                            canSeeHands = true
+                        }
+                    } else {
+                        canSeeHands = true
+                    }
+                    break
+                }
+            }
             for i in 0 ..< publicState.participants.count {
                 if let pendingMuteState = state.overlayState.pendingMuteStateChanges[publicState.participants[i].peer.id] {
                     publicState.participants[i].muteState = pendingMuteState.state
@@ -974,7 +1243,7 @@ public final class GroupCallParticipantsContext {
                 }
             }
             if sortAgain {
-                publicState.participants.sort()
+                publicState.participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: publicState.sortAscending) })
             }
             return publicState
         }
@@ -1016,15 +1285,19 @@ public final class GroupCallParticipantsContext {
     private var activityRankResetTimer: SwiftSignalKit.Timer?
     
     private let updateDefaultMuteDisposable = MetaDisposable()
+    private let resetInviteLinksDisposable = MetaDisposable()
     private let updateShouldBeRecordingDisposable = MetaDisposable()
 
+    private var localVideoIsMuted: Bool? = nil
+    private var localIsVideoPaused: Bool? = nil
+    private var localIsPresentationPaused: Bool? = nil
     public struct ServiceState {
         fileprivate var nextActivityRank: Int = 0
     }
 
     public private(set) var serviceState: ServiceState
     
-    public init(account: Account, peerId: PeerId, myPeerId: PeerId, id: Int64, accessHash: Int64, state: State, previousServiceState: ServiceState?) {
+    init(account: Account, peerId: PeerId, myPeerId: PeerId, id: Int64, accessHash: Int64, state: State, previousServiceState: ServiceState?) {
         self.account = account
         self.myPeerId = myPeerId
         self.id = id
@@ -1088,7 +1361,7 @@ public final class GroupCallParticipantsContext {
                 }
                 
                 if updated {
-                    updatedParticipants.sort()
+                    updatedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: strongSelf.stateValue.state.sortAscending) })
                     
                     strongSelf.stateValue = InternalState(
                         state: State(
@@ -1097,9 +1370,14 @@ public final class GroupCallParticipantsContext {
                             adminIds: strongSelf.stateValue.state.adminIds,
                             isCreator: strongSelf.stateValue.state.isCreator,
                             defaultParticipantsAreMuted: strongSelf.stateValue.state.defaultParticipantsAreMuted,
+                            sortAscending: strongSelf.stateValue.state.sortAscending,
                             recordingStartTimestamp: strongSelf.stateValue.state.recordingStartTimestamp,
                             title: strongSelf.stateValue.state.title,
+                            scheduleTimestamp: strongSelf.stateValue.state.scheduleTimestamp,
+                            subscribedToScheduled: strongSelf.stateValue.state.subscribedToScheduled,
                             totalCount: strongSelf.stateValue.state.totalCount,
+                            isVideoEnabled: strongSelf.stateValue.state.isVideoEnabled,
+                            unmutedVideoLimit: strongSelf.stateValue.state.unmutedVideoLimit,
                             version: strongSelf.stateValue.state.version
                         ),
                         overlayState: strongSelf.stateValue.overlayState
@@ -1133,7 +1411,7 @@ public final class GroupCallParticipantsContext {
                 }
             }
             if updated {
-                strongSelf.stateValue.state.participants.sort()
+                strongSelf.stateValue.state.participants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: strongSelf.stateValue.state.sortAscending) })
             }
         }, queue: .mainQueue())
         self.activityRankResetTimer?.start()
@@ -1146,6 +1424,7 @@ public final class GroupCallParticipantsContext {
         self.updateDefaultMuteDisposable.dispose()
         self.updateShouldBeRecordingDisposable.dispose()
         self.activityRankResetTimer?.invalidate()
+        resetInviteLinksDisposable.dispose()
     }
     
     public func addUpdates(updates: [Update]) {
@@ -1153,11 +1432,13 @@ public final class GroupCallParticipantsContext {
         for update in updates {
             if case let .state(update) = update {
                 stateUpdates.append(update)
-            } else if case let .call(_, defaultParticipantsAreMuted, title, recordingStartTimestamp) = update {
+            } else if case let .call(_, defaultParticipantsAreMuted, title, recordingStartTimestamp, scheduleTimestamp, isVideoEnabled) = update {
                 var state = self.stateValue.state
                 state.defaultParticipantsAreMuted = defaultParticipantsAreMuted
                 state.recordingStartTimestamp = recordingStartTimestamp
                 state.title = title
+                state.scheduleTimestamp = scheduleTimestamp
+                state.isVideoEnabled = isVideoEnabled
                 
                 self.stateValue.state = state
             }
@@ -1218,7 +1499,7 @@ public final class GroupCallParticipantsContext {
         }
         
         if updated {
-            updatedParticipants.sort()
+            updatedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: strongSelf.stateValue.state.sortAscending) })
             
             strongSelf.stateValue = InternalState(
                 state: State(
@@ -1227,9 +1508,14 @@ public final class GroupCallParticipantsContext {
                     adminIds: strongSelf.stateValue.state.adminIds,
                     isCreator: strongSelf.stateValue.state.isCreator,
                     defaultParticipantsAreMuted: strongSelf.stateValue.state.defaultParticipantsAreMuted,
+                    sortAscending: strongSelf.stateValue.state.sortAscending,
                     recordingStartTimestamp: strongSelf.stateValue.state.recordingStartTimestamp,
                     title: strongSelf.stateValue.state.title,
+                    scheduleTimestamp: strongSelf.stateValue.state.scheduleTimestamp,
+                    subscribedToScheduled: strongSelf.stateValue.state.subscribedToScheduled,
                     totalCount: strongSelf.stateValue.state.totalCount,
+                    isVideoEnabled: strongSelf.stateValue.state.isVideoEnabled,
+                    unmutedVideoLimit: strongSelf.stateValue.state.unmutedVideoLimit,
                     version: strongSelf.stateValue.state.version
                 ),
                 overlayState: strongSelf.stateValue.overlayState
@@ -1247,6 +1533,9 @@ public final class GroupCallParticipantsContext {
             if let ssrc = participant.ssrc {
                 existingSsrcs.insert(ssrc)
             }
+            if let presentationDescription = participant.presentationDescription, let presentationAudioSsrc = presentationDescription.audioSsrc {
+                existingSsrcs.insert(presentationAudioSsrc)
+            }
         }
         
         for ssrc in ssrcs {
@@ -1271,8 +1560,10 @@ public final class GroupCallParticipantsContext {
         self.isLoadingMore = true
         
         let ssrcs = self.missingSsrcs
+
+        Logger.shared.log("GroupCallParticipantsContext", "will request ssrcs=\(ssrcs)")
         
-        self.disposable.set((getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: "", ssrcs: Array(ssrcs), limit: 100)
+        self.disposable.set((_internal_getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: "", ssrcs: Array(ssrcs), limit: 100, sortAscending: true)
         |> deliverOnMainQueue).start(next: { [weak self] state in
             guard let strongSelf = self else {
                 return
@@ -1280,10 +1571,12 @@ public final class GroupCallParticipantsContext {
             strongSelf.isLoadingMore = false
             
             strongSelf.missingSsrcs.subtract(ssrcs)
+
+            Logger.shared.log("GroupCallParticipantsContext", "did receive response for ssrcs=\(ssrcs), \(state.participants)")
             
             var updatedState = strongSelf.stateValue.state
             
-            updatedState.participants = mergeAndSortParticipants(current: updatedState.participants, with: state.participants)
+            updatedState.participants = mergeAndSortParticipants(current: updatedState.participants, with: state.participants, sortAscending: updatedState.sortAscending)
             
             updatedState.totalCount = max(updatedState.totalCount, state.totalCount)
             updatedState.version = max(updatedState.version, updatedState.version)
@@ -1359,7 +1652,7 @@ public final class GroupCallParticipantsContext {
                     if let index = updatedParticipants.firstIndex(where: { $0.peer.id == participantUpdate.peerId }) {
                         updatedParticipants.remove(at: index)
                         updatedTotalCount = max(0, updatedTotalCount - 1)
-                        strongSelf.memberEventsPipe.putNext(MemberEvent(peerId: participantUpdate.peerId, joined: false))
+                        strongSelf.memberEventsPipe.putNext(MemberEvent(peerId: participantUpdate.peerId, canUnmute: false, joined: false))
                     } else if isVersionUpdate {
                         updatedTotalCount = max(0, updatedTotalCount - 1)
                     }
@@ -1382,7 +1675,7 @@ public final class GroupCallParticipantsContext {
                         updatedParticipants.remove(at: index)
                     } else if case .joined = participantUpdate.participationStatusChange {
                         updatedTotalCount += 1
-                        strongSelf.memberEventsPipe.putNext(MemberEvent(peerId: participantUpdate.peerId, joined: true))
+                        strongSelf.memberEventsPipe.putNext(MemberEvent(peerId: participantUpdate.peerId, canUnmute: participantUpdate.muteState?.canUnmute ?? true, joined: true))
                     }
 
                     var activityTimestamp: Double?
@@ -1392,6 +1685,11 @@ public final class GroupCallParticipantsContext {
                         activityTimestamp = participantUpdate.activityTimestamp ?? previousActivityTimestamp
                     }
 
+                    if let muteState = participantUpdate.muteState, !muteState.canUnmute {
+                        previousActivityRank = nil
+                        activityTimestamp = nil
+                    }
+
                     var volume = participantUpdate.volume
                     var muteState = participantUpdate.muteState
                     if participantUpdate.isMin {
@@ -1404,11 +1702,11 @@ public final class GroupCallParticipantsContext {
                             volume = previousVolume
                         }
                     }
-                    
                     let participant = Participant(
                         peer: peer,
                         ssrc: participantUpdate.ssrc,
-                        jsonParams: participantUpdate.jsonParams,
+                        videoDescription: participantUpdate.videoDescription,
+                        presentationDescription: participantUpdate.presentationDescription,
                         joinTimestamp: previousJoinTimestamp ?? participantUpdate.joinTimestamp,
                         raiseHandRating: participantUpdate.raiseHandRating,
                         hasRaiseHand: participantUpdate.raiseHandRating != nil,
@@ -1416,7 +1714,8 @@ public final class GroupCallParticipantsContext {
                         activityRank: previousActivityRank,
                         muteState: muteState,
                         volume: volume,
-                        about: participantUpdate.about
+                        about: participantUpdate.about,
+                        joinedVideo: participantUpdate.joinedVideo
                     )
                     updatedParticipants.append(participant)
                 }
@@ -1435,8 +1734,12 @@ public final class GroupCallParticipantsContext {
             let defaultParticipantsAreMuted = strongSelf.stateValue.state.defaultParticipantsAreMuted
             let recordingStartTimestamp = strongSelf.stateValue.state.recordingStartTimestamp
             let title = strongSelf.stateValue.state.title
+            let scheduleTimestamp = strongSelf.stateValue.state.scheduleTimestamp
+            let subscribedToScheduled = strongSelf.stateValue.state.subscribedToScheduled
+            let isVideoEnabled = strongSelf.stateValue.state.isVideoEnabled
+            let unmutedVideoLimit = strongSelf.stateValue.state.unmutedVideoLimit
             
-            updatedParticipants.sort()
+            updatedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: strongSelf.stateValue.state.sortAscending) })
             
             strongSelf.stateValue = InternalState(
                 state: State(
@@ -1445,9 +1748,14 @@ public final class GroupCallParticipantsContext {
                     adminIds: adminIds,
                     isCreator: isCreator,
                     defaultParticipantsAreMuted: defaultParticipantsAreMuted,
+                    sortAscending: strongSelf.stateValue.state.sortAscending,
                     recordingStartTimestamp: recordingStartTimestamp,
                     title: title,
+                    scheduleTimestamp: scheduleTimestamp,
+                    subscribedToScheduled: subscribedToScheduled,
                     totalCount: updatedTotalCount,
+                    isVideoEnabled: isVideoEnabled,
+                    unmutedVideoLimit: unmutedVideoLimit,
                     version: update.version
                 ),
                 overlayState: updatedOverlayState
@@ -1467,13 +1775,21 @@ public final class GroupCallParticipantsContext {
         
         self.updateQueue.removeAll()
         
-        self.disposable.set((getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: "", ssrcs: [], limit: 100)
+        self.disposable.set((_internal_getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: "", ssrcs: [], limit: 100, sortAscending: self.stateValue.state.sortAscending)
         |> deliverOnMainQueue).start(next: { [weak self] state in
             guard let strongSelf = self else {
                 return
             }
             strongSelf.isLoadingMore = false
             strongSelf.shouldResetStateFromServer = false
+            var state = state
+            state.adminIds = strongSelf.stateValue.state.adminIds
+            state.isCreator = strongSelf.stateValue.state.isCreator
+            state.defaultParticipantsAreMuted = strongSelf.stateValue.state.defaultParticipantsAreMuted
+            state.title = strongSelf.stateValue.state.title
+            state.recordingStartTimestamp = strongSelf.stateValue.state.recordingStartTimestamp
+            state.scheduleTimestamp = strongSelf.stateValue.state.scheduleTimestamp
+            state.mergeActivity(from: strongSelf.stateValue.state, myPeerId: nil, previousMyPeerId: nil, mergeActivityTimestamps: false)
             strongSelf.stateValue.state = state
             strongSelf.endedProcessingUpdate()
         }))
@@ -1526,8 +1842,10 @@ public final class GroupCallParticipantsContext {
             if let volume = volume, volume > 0 {
                 flags |= 1 << 1
             }
+            var muted: Api.Bool?
             if let muteState = muteState, (!muteState.canUnmute || peerId == myPeerId || muteState.mutedByYou) {
                 flags |= 1 << 0
+                muted = .boolTrue
             }
             let raiseHandApi: Api.Bool?
             if let raiseHand = raiseHand {
@@ -1537,7 +1855,7 @@ public final class GroupCallParticipantsContext {
                 raiseHandApi = nil
             }
                         
-            return account.network.request(Api.functions.phone.editGroupCallParticipant(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), participant: inputPeer, volume: volume, raiseHand: raiseHandApi))
+            return account.network.request(Api.functions.phone.editGroupCallParticipant(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), participant: inputPeer, muted: muted, volume: volume, raiseHand: raiseHandApi, videoStopped: nil, videoPaused: nil, presentationPaused: nil))
             |> map(Optional.init)
             |> `catch` { _ -> Signal<Api.Updates?, NoError> in
                 return .single(nil)
@@ -1576,6 +1894,85 @@ public final class GroupCallParticipantsContext {
             }
         }))
     }
+
+    public func updateVideoState(peerId: PeerId, isVideoMuted: Bool?, isVideoPaused: Bool?, isPresentationPaused: Bool?) {
+        if self.localVideoIsMuted == isVideoMuted && self.localIsVideoPaused == isVideoPaused && self.localIsPresentationPaused == isPresentationPaused {
+            return
+        }
+        self.localVideoIsMuted = isVideoMuted
+        self.localIsVideoPaused = isVideoPaused
+        self.localIsPresentationPaused = isPresentationPaused
+        
+        let disposable = MetaDisposable()
+
+        let account = self.account
+        let id = self.id
+        let accessHash = self.accessHash
+
+        let signal: Signal<Api.Updates?, NoError> = self.account.postbox.transaction { transaction -> Api.InputPeer? in
+            return transaction.getPeer(peerId).flatMap(apiInputPeer)
+        }
+        |> mapToSignal { inputPeer -> Signal<Api.Updates?, NoError> in
+            guard let inputPeer = inputPeer else {
+                return .single(nil)
+            }
+            var flags: Int32 = 0
+            var videoMuted: Api.Bool?
+
+            if let isVideoMuted = isVideoMuted {
+                videoMuted = isVideoMuted ? .boolTrue : .boolFalse
+                flags |= 1 << 3
+            }
+
+            var videoPaused: Api.Bool?
+            if isVideoMuted != nil, let isVideoPaused = isVideoPaused {
+                videoPaused = isVideoPaused ? .boolTrue : .boolFalse
+                flags |= 1 << 4
+            }
+            var presentationPaused: Api.Bool?
+
+            if let isPresentationPaused = isPresentationPaused {
+                presentationPaused = isPresentationPaused ? .boolTrue : .boolFalse
+                flags |= 1 << 5
+            }
+
+            return account.network.request(Api.functions.phone.editGroupCallParticipant(flags: flags, call: .inputGroupCall(id: id, accessHash: accessHash), participant: inputPeer, muted: nil, volume: nil, raiseHand: nil, videoStopped: videoMuted, videoPaused: videoPaused, presentationPaused: presentationPaused))
+            |> map(Optional.init)
+            |> `catch` { _ -> Signal<Api.Updates?, NoError> in
+                return .single(nil)
+            }
+        }
+
+        disposable.set((signal
+        |> deliverOnMainQueue).start(next: { [weak self] updates in
+            guard let strongSelf = self else {
+                return
+            }
+
+            if let updates = updates {
+                var stateUpdates: [GroupCallParticipantsContext.Update] = []
+
+                loop: for update in updates.allUpdates {
+                    switch update {
+                    case let .updateGroupCallParticipants(call, participants, version):
+                        switch call {
+                        case let .inputGroupCall(updateCallId, _):
+                            if updateCallId != id {
+                                continue loop
+                            }
+                        }
+                        stateUpdates.append(.state(update: GroupCallParticipantsContext.Update.StateUpdate(participants: participants, version: version, removePendingMuteStates: [peerId])))
+                    default:
+                        break
+                    }
+                }
+
+                strongSelf.addUpdates(updates: stateUpdates)
+
+                strongSelf.account.stateManager.addUpdates(updates)
+            }
+        }))
+    }
     
     public func raiseHand() {
         self.updateMuteState(peerId: self.myPeerId, muteState: nil, volume: nil, raiseHand: true)
@@ -1617,6 +2014,16 @@ public final class GroupCallParticipantsContext {
         }))
     }
     
+    public func resetInviteLinks() {
+        self.resetInviteLinksDisposable.set((self.account.network.request(Api.functions.phone.toggleGroupCallSettings(flags: 1 << 1, call: .inputGroupCall(id: self.id, accessHash: self.accessHash), joinMuted: nil))
+        |> deliverOnMainQueue).start(next: { [weak self] updates in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.account.stateManager.addUpdates(updates)
+        }))
+    }
+    
     public func loadMore(token: String) {
         if token != self.stateValue.state.nextParticipantsFetchOffset {
             Logger.shared.log("GroupCallParticipantsContext", "loadMore called with an invalid token \(token) (the valid one is \(String(describing: self.stateValue.state.nextParticipantsFetchOffset)))")
@@ -1627,7 +2034,7 @@ public final class GroupCallParticipantsContext {
         }
         self.isLoadingMore = true
         
-        self.disposable.set((getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: token, ssrcs: [], limit: 100)
+        self.disposable.set((_internal_getGroupCallParticipants(account: self.account, callId: self.id, accessHash: self.accessHash, offset: token, ssrcs: [], limit: 100, sortAscending: self.stateValue.state.sortAscending)
         |> deliverOnMainQueue).start(next: { [weak self] state in
             guard let strongSelf = self else {
                 return
@@ -1636,7 +2043,7 @@ public final class GroupCallParticipantsContext {
             
             var updatedState = strongSelf.stateValue.state
             
-            updatedState.participants = mergeAndSortParticipants(current: updatedState.participants, with: state.participants)
+            updatedState.participants = mergeAndSortParticipants(current: updatedState.participants, with: state.participants, sortAscending: updatedState.sortAscending)
             
             updatedState.nextParticipantsFetchOffset = state.nextParticipantsFetchOffset
             updatedState.totalCount = max(updatedState.totalCount, state.totalCount)
@@ -1654,16 +2061,8 @@ public final class GroupCallParticipantsContext {
 extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
     init(_ apiParticipant: Api.GroupCallParticipant) {
         switch apiParticipant {
-        case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating):
-            let peerId: PeerId
-            switch apiPeerId {
-                case let .peerUser(userId):
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                case let .peerChat(chatId):
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                case let .peerChannel(channelId):
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-            }
+        case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating, video, presentation):
+            let peerId: PeerId = apiPeerId.peerId
             let ssrc = UInt32(bitPattern: source)
             let muted = (flags & (1 << 0)) != 0
             let mutedByYou = (flags & (1 << 9)) != 0
@@ -1676,6 +2075,7 @@ extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
             }
             let isRemoved = (flags & (1 << 1)) != 0
             let justJoined = (flags & (1 << 4)) != 0
+            let joinedVideo = (flags & (1 << 15)) != 0
             let isMin = (flags & (1 << 8)) != 0
             
             let participationStatusChange: GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate.ParticipationStatusChange
@@ -1687,18 +2087,17 @@ extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
                 participationStatusChange = .none
             }
             
-            let jsonParams: String? = nil
-            /*if let params = params {
-                switch params {
-                case let .dataJSON(data):
-                    jsonParams = data
-                }
-            }*/
-            
+            var videoDescription = video.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+            var presentationDescription = presentation.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+            if muteState?.canUnmute == false {
+                videoDescription = nil
+                presentationDescription = nil
+            }
             self.init(
                 peerId: peerId,
                 ssrc: ssrc,
-                jsonParams: jsonParams,
+                videoDescription: videoDescription,
+                presentationDescription: presentationDescription,
                 joinTimestamp: date,
                 activityTimestamp: activeDate.flatMap(Double.init),
                 raiseHandRating: raiseHandRating,
@@ -1706,6 +2105,7 @@ extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
                 participationStatusChange: participationStatusChange,
                 volume: volume,
                 about: about,
+                joinedVideo: joinedVideo,
                 isMin: isMin
             )
         }
@@ -1714,68 +2114,8 @@ extension GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate {
 
 extension GroupCallParticipantsContext.Update.StateUpdate {
     init(participants: [Api.GroupCallParticipant], version: Int32, removePendingMuteStates: Set<PeerId> = Set()) {
-        var participantUpdates: [GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate] = []
-        for participant in participants {
-            switch participant {
-            case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating):
-                let peerId: PeerId
-                switch apiPeerId {
-                    case let .peerUser(userId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                    case let .peerChat(chatId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                    case let .peerChannel(channelId):
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                }
-                let ssrc = UInt32(bitPattern: source)
-                let muted = (flags & (1 << 0)) != 0
-                let mutedByYou = (flags & (1 << 9)) != 0
-                var muteState: GroupCallParticipantsContext.Participant.MuteState?
-                if muted {
-                    let canUnmute = (flags & (1 << 2)) != 0
-                    muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canUnmute, mutedByYou: mutedByYou)
-                } else if mutedByYou {
-                    muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: mutedByYou)
-                }
-                let isRemoved = (flags & (1 << 1)) != 0
-                let justJoined = (flags & (1 << 4)) != 0
-                let isMin = (flags & (1 << 8)) != 0
-                
-                let participationStatusChange: GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate.ParticipationStatusChange
-                if isRemoved {
-                    participationStatusChange = .left
-                } else if justJoined {
-                    participationStatusChange = .joined
-                } else {
-                    participationStatusChange = .none
-                }
-                
-                let jsonParams: String? = nil
-                /*if let params = params {
-                    switch params {
-                    case let .dataJSON(data):
-                        jsonParams = data
-                    }
-                }*/
-                
-                participantUpdates.append(GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate(
-                    peerId: peerId,
-                    ssrc: ssrc,
-                    jsonParams: jsonParams,
-                    joinTimestamp: date,
-                    activityTimestamp: activeDate.flatMap(Double.init),
-                    raiseHandRating: raiseHandRating,
-                    muteState: muteState,
-                    participationStatusChange: participationStatusChange,
-                    volume: volume,
-                    about: about,
-                    isMin: isMin
-                ))
-            }
-        }
-        
         self.init(
-            participantUpdates: participantUpdates,
+            participantUpdates: participants.map { GroupCallParticipantsContext.Update.StateUpdate.ParticipantUpdate($0) },
             version: version,
             removePendingMuteStates: removePendingMuteStates
         )
@@ -1786,7 +2126,7 @@ public enum InviteToGroupCallError {
     case generic
 }
 
-public func inviteToGroupCall(account: Account, callId: Int64, accessHash: Int64, peerId: PeerId) -> Signal<Never, InviteToGroupCallError> {
+func _internal_inviteToGroupCall(account: Account, callId: Int64, accessHash: Int64, peerId: PeerId) -> Signal<Never, InviteToGroupCallError> {
     return account.postbox.transaction { transaction -> Peer? in
         return transaction.getPeer(peerId)
     }
@@ -1821,7 +2161,7 @@ public struct GroupCallInviteLinks {
     }
 }
 
-public func groupCallInviteLinks(account: Account, callId: Int64, accessHash: Int64) -> Signal<GroupCallInviteLinks?, NoError> {
+func _internal_groupCallInviteLinks(account: Account, callId: Int64, accessHash: Int64) -> Signal<GroupCallInviteLinks?, NoError> {
     let call = Api.InputGroupCall.inputGroupCall(id: callId, accessHash: accessHash)
     let listenerInvite: Signal<String?, NoError> = account.network.request(Api.functions.phone.exportGroupCallInvite(flags: 0, call: call))
     |> map(Optional.init)
@@ -1861,7 +2201,7 @@ public enum EditGroupCallTitleError {
     case generic
 }
 
-public func editGroupCallTitle(account: Account, callId: Int64, accessHash: Int64, title: String) -> Signal<Never, EditGroupCallTitleError> {
+func _internal_editGroupCallTitle(account: Account, callId: Int64, accessHash: Int64, title: String) -> Signal<Never, EditGroupCallTitleError> {
     return account.network.request(Api.functions.phone.editGroupCallTitle(call: .inputGroupCall(id: callId, accessHash: accessHash), title: title)) |> mapError { _ -> EditGroupCallTitleError in
         return .generic
     }
@@ -1871,7 +2211,7 @@ public func editGroupCallTitle(account: Account, callId: Int64, accessHash: Int6
     }
 }
 
-public func groupCallDisplayAsAvailablePeers(network: Network, postbox: Postbox, peerId: PeerId) -> Signal<[FoundPeer], NoError> {
+func _internal_groupCallDisplayAsAvailablePeers(network: Network, postbox: Postbox, peerId: PeerId) -> Signal<[FoundPeer], NoError> {
     return postbox.transaction { transaction -> Api.InputPeer? in
         return transaction.getPeer(peerId).flatMap(apiInputPeer)
     } |> mapToSignal { inputPeer in
@@ -1939,8 +2279,16 @@ public final class CachedDisplayAsPeers: PostboxCoding {
     }
 }
 
+func _internal_clearCachedGroupCallDisplayAsAvailablePeers(account: Account, peerId: PeerId) -> Signal<Never, NoError> {
+    return account.postbox.transaction { transaction -> Void in
+        let key = ValueBoxKey(length: 8)
+        key.setInt64(0, value: peerId.toInt64())
+        transaction.removeItemCacheEntry(id: ItemCacheEntryId(collectionId: Namespaces.CachedItemCollection.cachedGroupCallDisplayAsPeers, key: key))
+    }
+    |> ignoreValues
+}
 
-public func cachedGroupCallDisplayAsAvailablePeers(account: Account, peerId: PeerId) -> Signal<[FoundPeer], NoError> {
+func _internal_cachedGroupCallDisplayAsAvailablePeers(account: Account, peerId: PeerId) -> Signal<[FoundPeer], NoError> {
     let key = ValueBoxKey(length: 8)
     key.setInt64(0, value: peerId.toInt64())
     return account.postbox.transaction { transaction -> ([FoundPeer], Int32)? in
@@ -1966,7 +2314,7 @@ public func cachedGroupCallDisplayAsAvailablePeers(account: Account, peerId: Pee
         if let (cachedPeers, timestamp) = cachedPeersAndTimestamp, currentTimestamp - timestamp < 60 * 3 && !cachedPeers.isEmpty {
             return .single(cachedPeers)
         } else {
-            return groupCallDisplayAsAvailablePeers(network: account.network, postbox: account.postbox, peerId: peerId)
+            return _internal_groupCallDisplayAsAvailablePeers(network: account.network, postbox: account.postbox, peerId: peerId)
             |> mapToSignal { peers -> Signal<[FoundPeer], NoError> in
                 return account.postbox.transaction { transaction -> [FoundPeer] in
                     let currentTimestamp = Int32(CFAbsoluteTimeGetCurrent() + kCFAbsoluteTimeIntervalSince1970)
@@ -1978,8 +2326,8 @@ public func cachedGroupCallDisplayAsAvailablePeers(account: Account, peerId: Pee
     }
 }
 
-public func updatedCurrentPeerGroupCall(account: Account, peerId: PeerId) -> Signal<CachedChannelData.ActiveCall?, NoError> {
-    return fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)
+func _internal_updatedCurrentPeerGroupCall(account: Account, peerId: PeerId) -> Signal<CachedChannelData.ActiveCall?, NoError> {
+    return _internal_fetchAndUpdateCachedPeerData(accountPeerId: account.peerId, peerId: peerId, network: account.network, postbox: account.postbox)
     |> mapToSignal { _ -> Signal<CachedChannelData.ActiveCall?, NoError> in
         return account.postbox.transaction { transaction -> CachedChannelData.ActiveCall? in
             return (transaction.getPeerCachedData(peerId: peerId) as? CachedChannelData)?.activeCall
@@ -1987,7 +2335,7 @@ public func updatedCurrentPeerGroupCall(account: Account, peerId: PeerId) -> Sig
     }
 }
 
-private func mergeAndSortParticipants(current currentParticipants: [GroupCallParticipantsContext.Participant], with updatedParticipants: [GroupCallParticipantsContext.Participant]) -> [GroupCallParticipantsContext.Participant] {
+private func mergeAndSortParticipants(current currentParticipants: [GroupCallParticipantsContext.Participant], with updatedParticipants: [GroupCallParticipantsContext.Participant], sortAscending: Bool) -> [GroupCallParticipantsContext.Participant] {
     var mergedParticipants = currentParticipants
     
     var existingParticipantIndices: [PeerId: Int] = [:]
@@ -2001,8 +2349,8 @@ private func mergeAndSortParticipants(current currentParticipants: [GroupCallPar
             mergedParticipants.append(participant)
         }
     }
-    
-    mergedParticipants.sort()
+
+    mergedParticipants.sort(by: { GroupCallParticipantsContext.Participant.compare(lhs: $0, rhs: $1, sortAscending: sortAscending) })
     
     return mergedParticipants
 }
@@ -2015,7 +2363,7 @@ public final class AudioBroadcastDataSource {
     }
 }
 
-public func getAudioBroadcastDataSource(account: Account, callId: Int64, accessHash: Int64) -> Signal<AudioBroadcastDataSource?, NoError> {
+func _internal_getAudioBroadcastDataSource(account: Account, callId: Int64, accessHash: Int64) -> Signal<AudioBroadcastDataSource?, NoError> {
     return account.network.request(Api.functions.phone.getGroupCall(call: .inputGroupCall(id: callId, accessHash: accessHash)))
     |> map(Optional.init)
     |> `catch` { _ -> Signal<Api.phone.GroupCall?, NoError> in
@@ -2051,7 +2399,7 @@ public struct GetAudioBroadcastPartResult {
     public var responseTimestamp: Double
 }
 
-public func getAudioBroadcastPart(dataSource: AudioBroadcastDataSource, callId: Int64, accessHash: Int64, timestampIdMilliseconds: Int64, durationMilliseconds: Int64) -> Signal<GetAudioBroadcastPartResult, NoError> {
+func _internal_getAudioBroadcastPart(dataSource: AudioBroadcastDataSource, callId: Int64, accessHash: Int64, timestampIdMilliseconds: Int64, durationMilliseconds: Int64) -> Signal<GetAudioBroadcastPartResult, NoError> {
     let scale: Int32
     switch durationMilliseconds {
     case 1000:
@@ -2083,12 +2431,12 @@ public func getAudioBroadcastPart(dataSource: AudioBroadcastDataSource, callId:
                 status: .rejoinNeeded,
                 responseTimestamp: responseTimestamp
             ))
-        } else if error.errorDescription.hasPrefix("FLOOD_WAIT") {
+        } else if error.errorDescription.hasPrefix("FLOOD_WAIT") || error.errorDescription == "TIME_TOO_BIG" {
             return .single(GetAudioBroadcastPartResult(
                 status: .notReady,
                 responseTimestamp: responseTimestamp
             ))
-        } else if error.errorDescription == "TIME_INVALID" || error.errorDescription == "TIME_TOO_SMALL" || error.errorDescription == "TIME_TOO_BIG" {
+        } else if error.errorDescription == "TIME_INVALID" || error.errorDescription == "TIME_TOO_SMALL" {
             return .single(GetAudioBroadcastPartResult(
                 status: .resyncNeeded,
                 responseTimestamp: responseTimestamp
@@ -2101,3 +2449,66 @@ public func getAudioBroadcastPart(dataSource: AudioBroadcastDataSource, callId:
         }
     }
 }
+
+extension GroupCallParticipantsContext.Participant {
+     init?(_ apiParticipant: Api.GroupCallParticipant, transaction: Transaction) {
+        switch apiParticipant {
+            case let .groupCallParticipant(flags, apiPeerId, date, activeDate, source, volume, about, raiseHandRating, video, presentation):
+                let peerId: PeerId = apiPeerId.peerId
+                let ssrc = UInt32(bitPattern: source)
+                guard let peer = transaction.getPeer(peerId) else {
+                    return nil
+                }
+                let muted = (flags & (1 << 0)) != 0
+                let mutedByYou = (flags & (1 << 9)) != 0
+                var muteState: GroupCallParticipantsContext.Participant.MuteState?
+                if muted {
+                    let canUnmute = (flags & (1 << 2)) != 0
+                    muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: canUnmute, mutedByYou: mutedByYou)
+                } else if mutedByYou {
+                    muteState = GroupCallParticipantsContext.Participant.MuteState(canUnmute: false, mutedByYou: mutedByYou)
+                }
+                 
+                var videoDescription = video.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+                var presentationDescription = presentation.flatMap(GroupCallParticipantsContext.Participant.VideoDescription.init)
+                if muteState?.canUnmute == false {
+                    videoDescription = nil
+                    presentationDescription = nil
+                }
+                let joinedVideo = (flags & (1 << 15)) != 0
+                
+                self.init(
+                    peer: peer,
+                    ssrc: ssrc,
+                    videoDescription: videoDescription,
+                    presentationDescription: presentationDescription,
+                    joinTimestamp: date,
+                    raiseHandRating: raiseHandRating,
+                    hasRaiseHand: raiseHandRating != nil,
+                    activityTimestamp: activeDate.flatMap(Double.init),
+                    activityRank: nil,
+                    muteState: muteState,
+                    volume: volume,
+                    about: about,
+                    joinedVideo: joinedVideo
+                )
+        }
+    }
+}
+
+private extension GroupCallParticipantsContext.Participant.VideoDescription {
+    init(_ apiVideo: Api.GroupCallParticipantVideo) {
+        switch apiVideo {
+        case let .groupCallParticipantVideo(flags, endpoint, sourceGroups, audioSource):
+            var parsedSsrcGroups: [SsrcGroup] = []
+            for group in sourceGroups {
+                switch group {
+                case let .groupCallParticipantVideoSourceGroup(semantics, sources):
+                    parsedSsrcGroups.append(SsrcGroup(semantics: semantics, ssrcs: sources.map(UInt32.init(bitPattern:))))
+                }
+            }
+            let isPaused = (flags & (1 << 0)) != 0
+            self.init(endpointId: endpoint, ssrcGroups: parsedSsrcGroups, audioSsrc: audioSource.flatMap(UInt32.init(bitPattern:)), isPaused: isPaused)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/RateCall.swift b/submodules/TelegramCore/Sources/TelegramEngine/Calls/RateCall.swift
similarity index 75%
rename from submodules/TelegramCore/Sources/RateCall.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Calls/RateCall.swift
index bac6cd7258..7a8ed6ebee 100644
--- a/submodules/TelegramCore/Sources/RateCall.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Calls/RateCall.swift
@@ -4,7 +4,7 @@ import MtProtoKit
 import SwiftSignalKit
 import TelegramApi
 
-public func rateCall(account: Account, callId: CallId, starsCount: Int32, comment: String = "", userInitiated: Bool) -> Signal<Void, NoError> {
+func _internal_rateCall(account: Account, callId: CallId, starsCount: Int32, comment: String = "", userInitiated: Bool) -> Signal<Void, NoError> {
     var flags: Int32 = 0
     if userInitiated {
         flags |= (1 << 0)
@@ -14,7 +14,7 @@ public func rateCall(account: Account, callId: CallId, starsCount: Int32, commen
     |> map { _ in }
 }
 
-public func saveCallDebugLog(network: Network, callId: CallId, log: String) -> Signal<Void, NoError> {
+func _internal_saveCallDebugLog(network: Network, callId: CallId, log: String) -> Signal<Void, NoError> {
     if log.count > 1024 * 16 {
         return .complete()
     }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Calls/TelegramEngineCalls.swift b/submodules/TelegramCore/Sources/TelegramEngine/Calls/TelegramEngineCalls.swift
new file mode 100644
index 0000000000..3e0f02a662
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Calls/TelegramEngineCalls.swift
@@ -0,0 +1,109 @@
+import SwiftSignalKit
+import Postbox
+import SyncCore
+
+public extension TelegramEngine {
+    final class Calls {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func rateCall(callId: CallId, starsCount: Int32, comment: String = "", userInitiated: Bool) -> Signal<Void, NoError> {
+            return _internal_rateCall(account: self.account, callId: callId, starsCount: starsCount, comment: comment, userInitiated: userInitiated)
+        }
+
+        public func saveCallDebugLog(callId: CallId, log: String) -> Signal<Void, NoError> {
+            return _internal_saveCallDebugLog(network: self.account.network, callId: callId, log: log)
+        }
+
+        public func getCurrentGroupCall(callId: Int64, accessHash: Int64, peerId: PeerId? = nil) -> Signal<GroupCallSummary?, GetCurrentGroupCallError> {
+            return _internal_getCurrentGroupCall(account: self.account, callId: callId, accessHash: accessHash, peerId: peerId)
+        }
+
+        public func createGroupCall(peerId: PeerId, title: String?, scheduleDate: Int32?) -> Signal<GroupCallInfo, CreateGroupCallError> {
+            return _internal_createGroupCall(account: self.account, peerId: peerId, title: title, scheduleDate: scheduleDate)
+        }
+
+        public func startScheduledGroupCall(peerId: PeerId, callId: Int64, accessHash: Int64) -> Signal<GroupCallInfo, StartScheduledGroupCallError> {
+            return _internal_startScheduledGroupCall(account: self.account, peerId: peerId, callId: callId, accessHash: accessHash)
+        }
+
+        public func toggleScheduledGroupCallSubscription(peerId: PeerId, callId: Int64, accessHash: Int64, subscribe: Bool) -> Signal<Void, ToggleScheduledGroupCallSubscriptionError> {
+            return _internal_toggleScheduledGroupCallSubscription(account: self.account, peerId: peerId, callId: callId, accessHash: accessHash, subscribe: subscribe)
+        }
+
+        public func updateGroupCallJoinAsPeer(peerId: PeerId, joinAs: PeerId) -> Signal<Never, UpdateGroupCallJoinAsPeerError> {
+            return _internal_updateGroupCallJoinAsPeer(account: self.account, peerId: peerId, joinAs: joinAs)
+        }
+
+        public func getGroupCallParticipants(callId: Int64, accessHash: Int64, offset: String, ssrcs: [UInt32], limit: Int32, sortAscending: Bool?) -> Signal<GroupCallParticipantsContext.State, GetGroupCallParticipantsError> {
+            return _internal_getGroupCallParticipants(account: self.account, callId: callId, accessHash: accessHash, offset: offset, ssrcs: ssrcs, limit: limit, sortAscending: sortAscending)
+        }
+
+        public func joinGroupCall(peerId: PeerId, joinAs: PeerId?, callId: Int64, accessHash: Int64, preferMuted: Bool, joinPayload: String, peerAdminIds: Signal<[PeerId], NoError>, inviteHash: String? = nil) -> Signal<JoinGroupCallResult, JoinGroupCallError> {
+            return _internal_joinGroupCall(account: self.account, peerId: peerId, joinAs: joinAs, callId: callId, accessHash: accessHash, preferMuted: preferMuted, joinPayload: joinPayload, peerAdminIds: peerAdminIds, inviteHash: inviteHash)
+        }
+
+        public func joinGroupCallAsScreencast(peerId: PeerId, callId: Int64, accessHash: Int64, joinPayload: String) -> Signal<JoinGroupCallAsScreencastResult, JoinGroupCallError> {
+            return _internal_joinGroupCallAsScreencast(account: self.account, peerId: peerId, callId: callId, accessHash: accessHash, joinPayload: joinPayload)
+        }
+
+        public func leaveGroupCallAsScreencast(callId: Int64, accessHash: Int64) -> Signal<Never, LeaveGroupCallAsScreencastError> {
+            return _internal_leaveGroupCallAsScreencast(account: self.account, callId: callId, accessHash: accessHash)
+        }
+
+        public func leaveGroupCall(callId: Int64, accessHash: Int64, source: UInt32) -> Signal<Never, LeaveGroupCallError> {
+            return _internal_leaveGroupCall(account: self.account, callId: callId, accessHash: accessHash, source: source)
+        }
+
+        public func stopGroupCall(peerId: PeerId, callId: Int64, accessHash: Int64) -> Signal<Never, StopGroupCallError> {
+            return _internal_stopGroupCall(account: self.account, peerId: peerId, callId: callId, accessHash: accessHash)
+        }
+
+        public func checkGroupCall(callId: Int64, accessHash: Int64, ssrcs: [UInt32]) -> Signal<[UInt32], NoError> {
+            return _internal_checkGroupCall(account: account, callId: callId, accessHash: accessHash, ssrcs: ssrcs)
+        }
+
+        public func inviteToGroupCall(callId: Int64, accessHash: Int64, peerId: PeerId) -> Signal<Never, InviteToGroupCallError> {
+            return _internal_inviteToGroupCall(account: self.account, callId: callId, accessHash: accessHash, peerId: peerId)
+        }
+
+        public func groupCallInviteLinks(callId: Int64, accessHash: Int64) -> Signal<GroupCallInviteLinks?, NoError> {
+            return _internal_groupCallInviteLinks(account: self.account, callId: callId, accessHash: accessHash)
+        }
+
+        public func editGroupCallTitle(callId: Int64, accessHash: Int64, title: String) -> Signal<Never, EditGroupCallTitleError> {
+            return _internal_editGroupCallTitle(account: self.account, callId: callId, accessHash: accessHash, title: title)
+        }
+
+        /*public func groupCallDisplayAsAvailablePeers(peerId: PeerId) -> Signal<[FoundPeer], NoError> {
+            return _internal_groupCallDisplayAsAvailablePeers(network: self.account.network, postbox: self.account.postbox, peerId: peerId)
+        }*/
+
+        public func clearCachedGroupCallDisplayAsAvailablePeers(peerId: PeerId) -> Signal<Never, NoError> {
+            return _internal_clearCachedGroupCallDisplayAsAvailablePeers(account: self.account, peerId: peerId)
+        }
+
+        public func cachedGroupCallDisplayAsAvailablePeers(peerId: PeerId) -> Signal<[FoundPeer], NoError> {
+            return _internal_cachedGroupCallDisplayAsAvailablePeers(account: self.account, peerId: peerId)
+        }
+
+        public func updatedCurrentPeerGroupCall(peerId: PeerId) -> Signal<CachedChannelData.ActiveCall?, NoError> {
+            return _internal_updatedCurrentPeerGroupCall(account: self.account, peerId: peerId)
+        }
+
+        public func getAudioBroadcastDataSource(callId: Int64, accessHash: Int64) -> Signal<AudioBroadcastDataSource?, NoError> {
+            return _internal_getAudioBroadcastDataSource(account: self.account, callId: callId, accessHash: accessHash)
+        }
+
+        public func getAudioBroadcastPart(dataSource: AudioBroadcastDataSource, callId: Int64, accessHash: Int64, timestampIdMilliseconds: Int64, durationMilliseconds: Int64) -> Signal<GetAudioBroadcastPartResult, NoError> {
+            return _internal_getAudioBroadcastPart(dataSource: dataSource, callId: callId, accessHash: accessHash, timestampIdMilliseconds: timestampIdMilliseconds, durationMilliseconds: durationMilliseconds)
+        }
+
+        public func groupCall(peerId: PeerId, myPeerId: PeerId, id: Int64, accessHash: Int64, state: GroupCallParticipantsContext.State, previousServiceState: GroupCallParticipantsContext.ServiceState?) -> GroupCallParticipantsContext {
+            return GroupCallParticipantsContext(account: self.account, peerId: peerId, myPeerId: myPeerId, id: id, accessHash: accessHash, state: state, previousServiceState: previousServiceState)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ContactManagement.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/ContactManagement.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/ContactManagement.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/ContactManagement.swift
index f2bb32ffc9..43f9be29db 100644
--- a/submodules/TelegramCore/Sources/ContactManagement.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/ContactManagement.swift
@@ -56,7 +56,7 @@ func syncContactsOnce(network: Network, postbox: Postbox, accountPeerId: PeerId)
         let contactPeerIds = transaction.getContactPeerIds()
         let totalCount = transaction.getRemoteContactCount()
         let peerIds = Set(contactPeerIds.filter({ $0.namespace == Namespaces.Peer.CloudUser }))
-        return hashForCountAndIds(count: totalCount, ids: peerIds.map({ $0.id }).sorted())
+        return hashForCountAndIds(count: totalCount, ids: peerIds.map({ $0.id._internalGetInt32Value() }).sorted())
     }
 
     let updatedPeers = initialContactPeerIdsHash
@@ -105,7 +105,7 @@ func syncContactsOnce(network: Network, postbox: Postbox, accountPeerId: PeerId)
     return appliedUpdatedPeers
 }
 
-public func deleteContactPeerInteractively(account: Account, peerId: PeerId) -> Signal<Never, NoError> {
+func _internal_deleteContactPeerInteractively(account: Account, peerId: PeerId) -> Signal<Never, NoError> {
     return account.postbox.transaction { transaction -> Signal<Never, NoError> in
         if let peer = transaction.getPeer(peerId), let inputUser = apiInputUser(peer) {
             return account.network.request(Api.functions.contacts.deleteContacts(id: [inputUser]))
@@ -133,7 +133,7 @@ public func deleteContactPeerInteractively(account: Account, peerId: PeerId) ->
     |> switchToLatest
 }
 
-public func deleteAllContacts(account: Account) -> Signal<Never, NoError> {
+func _internal_deleteAllContacts(account: Account) -> Signal<Never, NoError> {
     return account.postbox.transaction { transaction -> [Api.InputUser] in
         return transaction.getContactPeerIds().compactMap(transaction.getPeer).compactMap({ apiInputUser($0) }).compactMap({ $0 })
     }
@@ -166,7 +166,7 @@ public func deleteAllContacts(account: Account) -> Signal<Never, NoError> {
     }
 }
 
-public func resetSavedContacts(network: Network) -> Signal<Void, NoError> {
+func _internal_resetSavedContacts(network: Network) -> Signal<Void, NoError> {
     return network.request(Api.functions.contacts.resetSaved())
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .single(.boolFalse)
diff --git a/submodules/TelegramCore/Sources/DeviceContact.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/DeviceContact.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/DeviceContact.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/DeviceContact.swift
diff --git a/submodules/TelegramCore/Sources/ImportContact.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/ImportContact.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/ImportContact.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/ImportContact.swift
index 0783431a6d..5f3d5cf6bb 100644
--- a/submodules/TelegramCore/Sources/ImportContact.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/ImportContact.swift
@@ -4,8 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func importContact(account: Account, firstName: String, lastName: String, phoneNumber: String) -> Signal<PeerId?, NoError> {
-    
+func _internal_importContact(account: Account, firstName: String, lastName: String, phoneNumber: String) -> Signal<PeerId?, NoError> {
     let input = Api.InputContact.inputPhoneContact(clientId: 1, phone: phoneNumber, firstName: firstName, lastName: lastName)
     
     return account.network.request(Api.functions.contacts.importContacts(contacts: [input]))
@@ -42,7 +41,7 @@ public enum AddContactError {
     case generic
 }
 
-public func addContactInteractively(account: Account, peerId: PeerId, firstName: String, lastName: String, phoneNumber: String, addToPrivacyExceptions: Bool) -> Signal<Never, AddContactError> {
+func _internal_addContactInteractively(account: Account, peerId: PeerId, firstName: String, lastName: String, phoneNumber: String, addToPrivacyExceptions: Bool) -> Signal<Never, AddContactError> {
     return account.postbox.transaction { transaction -> (Api.InputUser, String)? in
         if let user = transaction.getPeer(peerId) as? TelegramUser, let inputUser = apiInputUser(user) {
             return (inputUser, user.phone == nil ? phoneNumber : "")
@@ -99,7 +98,7 @@ public enum AcceptAndShareContactError {
     case generic
 }
 
-public func acceptAndShareContact(account: Account, peerId: PeerId) -> Signal<Never, AcceptAndShareContactError> {
+func _internal_acceptAndShareContact(account: Account, peerId: PeerId) -> Signal<Never, AcceptAndShareContactError> {
     return account.postbox.transaction { transaction -> Api.InputUser? in
         return transaction.getPeer(peerId).flatMap(apiInputUser)
     }
diff --git a/submodules/TelegramCore/Sources/PhoneNumber.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/PhoneNumber.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/PhoneNumber.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/PhoneNumber.swift
diff --git a/submodules/TelegramCore/Sources/TelegramDeviceContactImportInfo.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramDeviceContactImportInfo.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/TelegramDeviceContactImportInfo.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramDeviceContactImportInfo.swift
index 7d02ab0fa2..0a82dd2dc1 100644
--- a/submodules/TelegramCore/Sources/TelegramDeviceContactImportInfo.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramDeviceContactImportInfo.swift
@@ -48,7 +48,7 @@ enum TelegramDeviceContactImportIdentifier: Hashable, Comparable, Equatable {
     }
 }
 
-public func deviceContactsImportedByCount(postbox: Postbox, contacts: [(String, [DeviceContactNormalizedPhoneNumber])]) -> Signal<[String: Int32], NoError> {
+func _internal_deviceContactsImportedByCount(postbox: Postbox, contacts: [(String, [DeviceContactNormalizedPhoneNumber])]) -> Signal<[String: Int32], NoError> {
     return postbox.transaction { transaction -> [String: Int32] in
         var result: [String: Int32] = [:]
         for (id, numbers) in contacts {
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramEngineContacts.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramEngineContacts.swift
new file mode 100644
index 0000000000..172f879418
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/TelegramEngineContacts.swift
@@ -0,0 +1,44 @@
+import SwiftSignalKit
+import Postbox
+
+public extension TelegramEngine {
+    final class Contacts {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func deleteContactPeerInteractively(peerId: PeerId) -> Signal<Never, NoError> {
+            return _internal_deleteContactPeerInteractively(account: self.account, peerId: peerId)
+        }
+
+        public func deleteAllContacts() -> Signal<Never, NoError> {
+            return _internal_deleteAllContacts(account: self.account)
+        }
+
+        public func resetSavedContacts() -> Signal<Void, NoError> {
+            return _internal_resetSavedContacts(network: self.account.network)
+        }
+
+        public func updateContactName(peerId: PeerId, firstName: String, lastName: String) -> Signal<Void, UpdateContactNameError> {
+            return _internal_updateContactName(account: self.account, peerId: peerId, firstName: firstName, lastName: lastName)
+        }
+
+        public func deviceContactsImportedByCount(contacts: [(String, [DeviceContactNormalizedPhoneNumber])]) -> Signal<[String: Int32], NoError> {
+            return _internal_deviceContactsImportedByCount(postbox: self.account.postbox, contacts: contacts)
+        }
+
+        public func importContact(firstName: String, lastName: String, phoneNumber: String) -> Signal<PeerId?, NoError> {
+            return _internal_importContact(account: self.account, firstName: firstName, lastName: lastName, phoneNumber: phoneNumber)
+        }
+
+        public func addContactInteractively(peerId: PeerId, firstName: String, lastName: String, phoneNumber: String, addToPrivacyExceptions: Bool) -> Signal<Never, AddContactError> {
+            return _internal_addContactInteractively(account: self.account, peerId: peerId, firstName: firstName, lastName: lastName, phoneNumber: phoneNumber, addToPrivacyExceptions: addToPrivacyExceptions)
+        }
+
+        public func acceptAndShareContact(peerId: PeerId) -> Signal<Never, AcceptAndShareContactError> {
+            return _internal_acceptAndShareContact(account: self.account, peerId: peerId)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/UpdateContactName.swift b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/UpdateContactName.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/UpdateContactName.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Contacts/UpdateContactName.swift
index cb5ba9f76e..dd6939d74d 100644
--- a/submodules/TelegramCore/Sources/UpdateContactName.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Contacts/UpdateContactName.swift
@@ -10,7 +10,7 @@ public enum UpdateContactNameError {
     case generic
 }
 
-public func updateContactName(account: Account, peerId: PeerId, firstName: String, lastName: String) -> Signal<Void, UpdateContactNameError> {
+func _internal_updateContactName(account: Account, peerId: PeerId, firstName: String, lastName: String) -> Signal<Void, UpdateContactNameError> {
     return account.postbox.transaction { transaction -> Signal<Void, UpdateContactNameError> in
         if let peer = transaction.getPeer(peerId) as? TelegramUser, let inputUser = apiInputUser(peer) {
             return account.network.request(Api.functions.contacts.addContact(flags: 0, id: inputUser, firstName: firstName, lastName: lastName, phone: ""))
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/HistoryImport/TelegramEngineHistoryImport.swift b/submodules/TelegramCore/Sources/TelegramEngine/HistoryImport/TelegramEngineHistoryImport.swift
new file mode 100644
index 0000000000..309c0673a0
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/HistoryImport/TelegramEngineHistoryImport.swift
@@ -0,0 +1,255 @@
+import Foundation
+import SwiftSignalKit
+import Postbox
+import SyncCore
+import TelegramApi
+
+public extension TelegramEngine {
+    final class HistoryImport {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public struct Session {
+            fileprivate var peerId: PeerId
+            fileprivate var inputPeer: Api.InputPeer
+            fileprivate var id: Int64
+        }
+    
+        public enum InitImportError {
+            case generic
+            case chatAdminRequired
+            case invalidChatType
+            case userBlocked
+            case limitExceeded
+        }
+        
+        public enum ParsedInfo {
+            case privateChat(title: String?)
+            case group(title: String?)
+            case unknown(title: String?)
+        }
+        
+        public enum GetInfoError {
+            case generic
+            case parseError
+        }
+        
+        public func getInfo(header: String) -> Signal<ParsedInfo, GetInfoError> {
+            return self.account.network.request(Api.functions.messages.checkHistoryImport(importHead: header))
+            |> mapError { _ -> GetInfoError in
+                return .generic
+            }
+            |> mapToSignal { result -> Signal<ParsedInfo, GetInfoError> in
+                switch result {
+                case let .historyImportParsed(flags, title):
+                    if (flags & (1 << 0)) != 0 {
+                        return .single(.privateChat(title: title))
+                    } else if (flags & (1 << 1)) != 0 {
+                        return .single(.group(title: title))
+                    } else {
+                        return .single(.unknown(title: title))
+                    }
+                }
+            }
+        }
+        
+        public func initSession(peerId: PeerId, file: TempBoxFile, mediaCount: Int32) -> Signal<Session, InitImportError> {
+            let account = self.account
+            return multipartUpload(network: self.account.network, postbox: self.account.postbox, source: .tempFile(file), encrypt: false, tag: nil, hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: true, useLargerParts: true, increaseParallelParts: true, useMultiplexedRequests: false, useCompression: true)
+            |> mapError { _ -> InitImportError in
+                return .generic
+            }
+            |> mapToSignal { result -> Signal<Session, InitImportError> in
+                switch result {
+                case let .inputFile(inputFile):
+                    return account.postbox.transaction { transaction -> Api.InputPeer? in
+                        return transaction.getPeer(peerId).flatMap(apiInputPeer)
+                    }
+                    |> castError(InitImportError.self)
+                    |> mapToSignal { inputPeer -> Signal<Session, InitImportError> in
+                        guard let inputPeer = inputPeer else {
+                            return .fail(.generic)
+                        }
+                        return account.network.request(Api.functions.messages.initHistoryImport(peer: inputPeer, file: inputFile, mediaCount: mediaCount), automaticFloodWait: false)
+                        |> mapError { error -> InitImportError in
+                            if error.errorDescription == "CHAT_ADMIN_REQUIRED" {
+                                return .chatAdminRequired
+                            } else if error.errorDescription == "IMPORT_PEER_TYPE_INVALID" {
+                                return .invalidChatType
+                            } else if error.errorDescription == "USER_IS_BLOCKED" {
+                                return .userBlocked
+                            } else if error.errorDescription == "FLOOD_WAIT" {
+                                return .limitExceeded
+                            } else {
+                                return .generic
+                            }
+                        }
+                        |> map { result -> Session in
+                            switch result {
+                            case let .historyImport(id):
+                                return Session(peerId: peerId, inputPeer: inputPeer, id: id)
+                            }
+                        }
+                    }
+                case .progress:
+                    return .complete()
+                case .inputSecretFile:
+                    return .fail(.generic)
+                }
+            }
+        }
+        
+        public enum MediaType {
+            case photo
+            case file
+            case video
+            case sticker
+            case voice
+        }
+        
+        public enum UploadMediaError {
+            case generic
+            case chatAdminRequired
+        }
+        
+        public func uploadMedia(session: Session, file: TempBoxFile, disposeFileAfterDone: Bool, fileName: String, mimeType: String, type: MediaType) -> Signal<Float, UploadMediaError> {
+            var forceNoBigParts = true
+            guard let size = fileSize(file.path), size != 0 else {
+                return .single(1.0)
+            }
+            if size >= 30 * 1024 * 1024 {
+                forceNoBigParts = false
+            }
+
+            let account = self.account
+            return multipartUpload(network: self.account.network, postbox: self.account.postbox, source: .tempFile(file), encrypt: false, tag: nil, hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: forceNoBigParts, useLargerParts: true, useMultiplexedRequests: true)
+            |> mapError { _ -> UploadMediaError in
+                return .generic
+            }
+            |> mapToSignal { result -> Signal<Float, UploadMediaError> in
+                let inputMedia: Api.InputMedia
+                switch result {
+                case let .inputFile(inputFile):
+                    switch type {
+                    case .photo:
+                        inputMedia = .inputMediaUploadedPhoto(flags: 0, file: inputFile, stickers: nil, ttlSeconds: nil)
+                    case .file, .video, .sticker, .voice:
+                        var attributes: [Api.DocumentAttribute] = []
+                        attributes.append(.documentAttributeFilename(fileName: fileName))
+                        var resolvedMimeType = mimeType
+                        switch type {
+                        case .video:
+                            resolvedMimeType = "video/mp4"
+                        case .sticker:
+                            resolvedMimeType = "image/webp"
+                        case .voice:
+                            resolvedMimeType = "audio/ogg"
+                        default:
+                            break
+                        }
+                        inputMedia = .inputMediaUploadedDocument(flags: 0, file: inputFile, thumb: nil, mimeType: resolvedMimeType, attributes: attributes, stickers: nil, ttlSeconds: nil)
+                    }
+                case let .progress(value):
+                    return .single(value)
+                case .inputSecretFile:
+                    return .fail(.generic)
+                }
+                return account.network.request(Api.functions.messages.uploadImportedMedia(peer: session.inputPeer, importId: session.id, fileName: fileName, media: inputMedia))
+                |> mapError { error -> UploadMediaError in
+                    switch error.errorDescription {
+                    case "CHAT_ADMIN_REQUIRED":
+                        return .chatAdminRequired
+                    default:
+                        return .generic
+                    }
+                }
+                |> mapToSignal { result -> Signal<Float, UploadMediaError> in
+                    return .single(1.0)
+                }
+                |> afterDisposed {
+                    if disposeFileAfterDone {
+                        TempBox.shared.dispose(file)
+                    }
+                }
+            }
+        }
+        
+        public enum StartImportError {
+            case generic
+        }
+        
+        public func startImport(session: Session) -> Signal<Never, StartImportError> {
+            return self.account.network.request(Api.functions.messages.startHistoryImport(peer: session.inputPeer, importId: session.id))
+            |> mapError { _ -> StartImportError in
+                return .generic
+            }
+            |> mapToSignal { result -> Signal<Never, StartImportError> in
+                if case .boolTrue = result {
+                    return .complete()
+                } else {
+                    return .fail(.generic)
+                }
+            }
+        }
+        
+        public enum CheckPeerImportResult {
+            case allowed
+            case alert(String)
+        }
+        
+        public enum CheckPeerImportError {
+            case generic
+            case chatAdminRequired
+            case invalidChatType
+            case userBlocked
+            case limitExceeded
+            case notMutualContact
+        }
+        
+        public func checkPeerImport(peerId: PeerId) -> Signal<CheckPeerImportResult, CheckPeerImportError> {
+            let account = self.account
+            return self.account.postbox.transaction { transaction -> Peer? in
+                return transaction.getPeer(peerId)
+            }
+            |> castError(CheckPeerImportError.self)
+            |> mapToSignal { peer -> Signal<CheckPeerImportResult, CheckPeerImportError> in
+                guard let peer = peer else {
+                    return .fail(.generic)
+                }
+                guard let inputPeer = apiInputPeer(peer) else {
+                    return .fail(.generic)
+                }
+                
+                return account.network.request(Api.functions.messages.checkHistoryImportPeer(peer: inputPeer))
+                |> mapError { error -> CheckPeerImportError in
+                    if error.errorDescription == "CHAT_ADMIN_REQUIRED" {
+                        return .chatAdminRequired
+                    } else if error.errorDescription == "IMPORT_PEER_TYPE_INVALID" {
+                        return .invalidChatType
+                    } else if error.errorDescription == "USER_IS_BLOCKED" {
+                        return .userBlocked
+                    } else if error.errorDescription == "USER_NOT_MUTUAL_CONTACT" {
+                        return .notMutualContact
+                    } else if error.errorDescription == "FLOOD_WAIT" {
+                        return .limitExceeded
+                    } else {
+                        return .generic
+                    }
+                }
+                |> map { result -> CheckPeerImportResult in
+                    switch result {
+                    case let .checkedHistoryImportPeer(confirmText):
+                        if confirmText.isEmpty {
+                            return .allowed
+                        } else {
+                            return .alert(confirmText)
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/Countries.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/Countries.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/Countries.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/Countries.swift
index 6ba3de2611..42fd67735d 100644
--- a/submodules/TelegramCore/Sources/Countries.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/Countries.swift
@@ -102,7 +102,7 @@ public final class CountriesList: PreferencesEntry, Equatable {
 }
 
 
-public func getCountriesList(accountManager: AccountManager, network: Network, langCode: String?, forceUpdate: Bool = false) -> Signal<[Country], NoError> {
+func _internal_getCountriesList(accountManager: AccountManager, network: Network, langCode: String?, forceUpdate: Bool = false) -> Signal<[Country], NoError> {
     let fetch: ([Country]?, Int32?) -> Signal<[Country], NoError> = { current, hash in
         return network.request(Api.functions.help.getCountriesList(langCode: langCode ?? "", hash: hash ?? 0))
         |> retryRequest
diff --git a/submodules/TelegramCore/Sources/LocalizationInfo.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationInfo.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/LocalizationInfo.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationInfo.swift
diff --git a/submodules/TelegramCore/Sources/LocalizationListState.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationListState.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/LocalizationListState.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationListState.swift
index 662173ff39..090e40a0cb 100644
--- a/submodules/TelegramCore/Sources/LocalizationListState.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationListState.swift
@@ -51,7 +51,7 @@ func updateLocalizationListStateInteractively(transaction: Transaction, _ f: @es
     })
 }
 
-public func synchronizedLocalizationListState(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
+func _internal_synchronizedLocalizationListState(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
     return network.request(Api.functions.langpack.getLanguages(langPack: ""))
     |> retryRequest
     |> mapToSignal { languages -> Signal<Never, NoError> in
diff --git a/submodules/TelegramCore/Sources/LocalizationPreview.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationPreview.swift
similarity index 76%
rename from submodules/TelegramCore/Sources/LocalizationPreview.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationPreview.swift
index 919c74c013..b6aa82f737 100644
--- a/submodules/TelegramCore/Sources/LocalizationPreview.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/LocalizationPreview.swift
@@ -9,7 +9,7 @@ public enum RequestLocalizationPreviewError {
     case generic
 }
 
-public func requestLocalizationPreview(network: Network, identifier: String) -> Signal<LocalizationInfo, RequestLocalizationPreviewError> {
+func _internal_requestLocalizationPreview(network: Network, identifier: String) -> Signal<LocalizationInfo, RequestLocalizationPreviewError> {
     return network.request(Api.functions.langpack.getLanguage(langPack: "", langCode: identifier))
     |> mapError { _ -> RequestLocalizationPreviewError in
         return .generic
diff --git a/submodules/TelegramCore/Sources/Localizations.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/Localizations.swift
similarity index 85%
rename from submodules/TelegramCore/Sources/Localizations.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/Localizations.swift
index 4f6e4fdef6..fa98c35845 100644
--- a/submodules/TelegramCore/Sources/Localizations.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/Localizations.swift
@@ -5,14 +5,14 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func currentlySuggestedLocalization(network: Network, extractKeys: [String]) -> Signal<SuggestedLocalizationInfo?, NoError> {
+func _internal_currentlySuggestedLocalization(network: Network, extractKeys: [String]) -> Signal<SuggestedLocalizationInfo?, NoError> {
     return network.request(Api.functions.help.getConfig())
         |> retryRequest
         |> mapToSignal { result -> Signal<SuggestedLocalizationInfo?, NoError> in
             switch result {
                 case let .config(config):
                     if let suggestedLangCode = config.suggestedLangCode {
-                        return suggestedLocalizationInfo(network: network, languageCode: suggestedLangCode, extractKeys: extractKeys) |> map(Optional.init)
+                        return _internal_suggestedLocalizationInfo(network: network, languageCode: suggestedLangCode, extractKeys: extractKeys) |> map(Optional.init)
                     } else {
                         return .single(nil)
                     }
@@ -20,7 +20,7 @@ public func currentlySuggestedLocalization(network: Network, extractKeys: [Strin
         }
 }
 
-public func suggestedLocalizationInfo(network: Network, languageCode: String, extractKeys: [String]) -> Signal<SuggestedLocalizationInfo, NoError> {
+func _internal_suggestedLocalizationInfo(network: Network, languageCode: String, extractKeys: [String]) -> Signal<SuggestedLocalizationInfo, NoError> {
     return combineLatest(network.request(Api.functions.langpack.getLanguages(langPack: "")), network.request(Api.functions.langpack.getStrings(langPack: "", langCode: languageCode, keys: extractKeys)))
         |> retryRequest
         |> map { languages, strings -> SuggestedLocalizationInfo in
@@ -40,7 +40,7 @@ public func suggestedLocalizationInfo(network: Network, languageCode: String, ex
         }
 }
 
-public func availableLocalizations(postbox: Postbox, network: Network, allowCached: Bool) -> Signal<[LocalizationInfo], NoError> {
+func _internal_availableLocalizations(postbox: Postbox, network: Network, allowCached: Bool) -> Signal<[LocalizationInfo], NoError> {
     let cached: Signal<[LocalizationInfo], NoError>
     if allowCached {
         cached = postbox.transaction { transaction -> Signal<[LocalizationInfo], NoError> in
@@ -69,7 +69,7 @@ public enum DownloadLocalizationError {
     case generic
 }
 
-public func downloadLocalization(network: Network, languageCode: String) -> Signal<Localization, DownloadLocalizationError> {
+func _internal_downloadLocalization(network: Network, languageCode: String) -> Signal<Localization, DownloadLocalizationError> {
     return network.request(Api.functions.langpack.getLangPack(langPack: "", langCode: languageCode))
     |> mapError { _ -> DownloadLocalizationError in
         return .generic
@@ -100,16 +100,16 @@ public enum DownloadAndApplyLocalizationError {
     case generic
 }
 
-public func downloadAndApplyLocalization(accountManager: AccountManager, postbox: Postbox, network: Network, languageCode: String) -> Signal<Void, DownloadAndApplyLocalizationError> {
-    return requestLocalizationPreview(network: network, identifier: languageCode)
+func _internal_downloadAndApplyLocalization(accountManager: AccountManager, postbox: Postbox, network: Network, languageCode: String) -> Signal<Void, DownloadAndApplyLocalizationError> {
+    return _internal_requestLocalizationPreview(network: network, identifier: languageCode)
     |> mapError { _ -> DownloadAndApplyLocalizationError in
         return .generic
     }
     |> mapToSignal { preview -> Signal<Void, DownloadAndApplyLocalizationError> in
         var primaryAndSecondaryLocalizations: [Signal<Localization, DownloadLocalizationError>] = []
-        primaryAndSecondaryLocalizations.append(downloadLocalization(network: network, languageCode: preview.languageCode))
+        primaryAndSecondaryLocalizations.append(_internal_downloadLocalization(network: network, languageCode: preview.languageCode))
         if let secondaryCode = preview.baseLanguageCode {
-            primaryAndSecondaryLocalizations.append(downloadLocalization(network: network, languageCode: secondaryCode))
+            primaryAndSecondaryLocalizations.append(_internal_downloadLocalization(network: network, languageCode: secondaryCode))
         }
         return combineLatest(primaryAndSecondaryLocalizations)
         |> mapError { _ -> DownloadAndApplyLocalizationError in
diff --git a/submodules/TelegramCore/Sources/SuggestedLocalizationEntry.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/SuggestedLocalizationEntry.swift
similarity index 83%
rename from submodules/TelegramCore/Sources/SuggestedLocalizationEntry.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Localization/SuggestedLocalizationEntry.swift
index 6ba5d1d739..f5e225ab4c 100644
--- a/submodules/TelegramCore/Sources/SuggestedLocalizationEntry.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/SuggestedLocalizationEntry.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func markSuggestedLocalizationAsSeenInteractively(postbox: Postbox, languageCode: String) -> Signal<Void, NoError> {
+func _internal_markSuggestedLocalizationAsSeenInteractively(postbox: Postbox, languageCode: String) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.updatePreferencesEntry(key: PreferencesKeys.suggestedLocalization, { current in
             if let current = current as? SuggestedLocalizationEntry {
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Localization/TelegramEngineLocalization.swift b/submodules/TelegramCore/Sources/TelegramEngine/Localization/TelegramEngineLocalization.swift
new file mode 100644
index 0000000000..699ffb7b3f
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Localization/TelegramEngineLocalization.swift
@@ -0,0 +1,63 @@
+import SwiftSignalKit
+import Postbox
+import SyncCore
+
+public extension TelegramEngine {
+    final class Localization {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func getCountriesList(accountManager: AccountManager, langCode: String?, forceUpdate: Bool = false) -> Signal<[Country], NoError> {
+            return _internal_getCountriesList(accountManager: accountManager, network: self.account.network, langCode: langCode, forceUpdate: forceUpdate)
+        }
+
+        public func markSuggestedLocalizationAsSeenInteractively(languageCode: String) -> Signal<Void, NoError> {
+            return _internal_markSuggestedLocalizationAsSeenInteractively(postbox: self.account.postbox, languageCode: languageCode)
+        }
+
+        public func synchronizedLocalizationListState() -> Signal<Never, NoError> {
+            return _internal_synchronizedLocalizationListState(postbox: self.account.postbox, network: self.account.network)
+        }
+
+        public func suggestedLocalizationInfo(languageCode: String, extractKeys: [String]) -> Signal<SuggestedLocalizationInfo, NoError> {
+            return _internal_suggestedLocalizationInfo(network: self.account.network, languageCode: languageCode, extractKeys: extractKeys)
+        }
+
+        public func requestLocalizationPreview(identifier: String) -> Signal<LocalizationInfo, RequestLocalizationPreviewError> {
+            return _internal_requestLocalizationPreview(network: self.account.network, identifier: identifier)
+        }
+
+        public func downloadAndApplyLocalization(accountManager: AccountManager, languageCode: String) -> Signal<Void, DownloadAndApplyLocalizationError> {
+            return _internal_downloadAndApplyLocalization(accountManager: accountManager, postbox: self.account.postbox, network: self.account.network, languageCode: languageCode)
+        }
+    }
+}
+
+public extension TelegramEngineUnauthorized {
+    final class Localization {
+        private let account: UnauthorizedAccount
+
+        init(account: UnauthorizedAccount) {
+            self.account = account
+        }
+
+        public func getCountriesList(accountManager: AccountManager, langCode: String?, forceUpdate: Bool = false) -> Signal<[Country], NoError> {
+        	return _internal_getCountriesList(accountManager: accountManager, network: self.account.network, langCode: langCode, forceUpdate: forceUpdate)
+	    }
+
+        public func markSuggestedLocalizationAsSeenInteractively(languageCode: String) -> Signal<Void, NoError> {
+            return _internal_markSuggestedLocalizationAsSeenInteractively(postbox: self.account.postbox, languageCode: languageCode)
+        }
+
+        public func currentlySuggestedLocalization(extractKeys: [String]) -> Signal<SuggestedLocalizationInfo?, NoError> {
+            return _internal_currentlySuggestedLocalization(network: self.account.network, extractKeys: extractKeys)
+        }
+
+        public func downloadAndApplyLocalization(accountManager: AccountManager, languageCode: String) -> Signal<Void, DownloadAndApplyLocalizationError> {
+            return _internal_downloadAndApplyLocalization(accountManager: accountManager, postbox: self.account.postbox, network: self.account.network, languageCode: languageCode)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ApplyMaxReadIndexInteractively.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ApplyMaxReadIndexInteractively.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/ApplyMaxReadIndexInteractively.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ApplyMaxReadIndexInteractively.swift
index c00e1ca67f..ea804adba5 100644
--- a/submodules/TelegramCore/Sources/ApplyMaxReadIndexInteractively.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ApplyMaxReadIndexInteractively.swift
@@ -5,13 +5,13 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func applyMaxReadIndexInteractively(postbox: Postbox, stateManager: AccountStateManager, index: MessageIndex) -> Signal<Void, NoError> {
+func _internal_applyMaxReadIndexInteractively(postbox: Postbox, stateManager: AccountStateManager, index: MessageIndex) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
-        applyMaxReadIndexInteractively(transaction: transaction, stateManager: stateManager, index: index)
+        _internal_applyMaxReadIndexInteractively(transaction: transaction, stateManager: stateManager, index: index)
     }
 }
     
-func applyMaxReadIndexInteractively(transaction: Transaction, stateManager: AccountStateManager, index: MessageIndex)  {
+func _internal_applyMaxReadIndexInteractively(transaction: Transaction, stateManager: AccountStateManager, index: MessageIndex)  {
     let messageIds = transaction.applyInteractiveReadMaxIndex(index)
     if index.id.peerId.namespace == Namespaces.Peer.SecretChat {
         let timestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970)
diff --git a/submodules/TelegramCore/Sources/ClearCloudDrafts.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ClearCloudDrafts.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/ClearCloudDrafts.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ClearCloudDrafts.swift
index 7a5038ce2e..4f1942760b 100644
--- a/submodules/TelegramCore/Sources/ClearCloudDrafts.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ClearCloudDrafts.swift
@@ -5,7 +5,7 @@ import TelegramApi
 
 import SyncCore
 
-public func clearCloudDraftsInteractively(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
+func _internal_clearCloudDraftsInteractively(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
     return network.request(Api.functions.messages.getAllDrafts())
     |> retryRequest
     |> mapToSignal { updates -> Signal<Void, NoError> in
diff --git a/submodules/TelegramCore/Sources/DeleteMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessages.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/DeleteMessages.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessages.swift
index d432d2f604..fc69b68f80 100644
--- a/submodules/TelegramCore/Sources/DeleteMessages.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessages.swift
@@ -23,7 +23,7 @@ func addMessageMediaResourceIdsToRemove(message: Message, resourceIds: inout [Wr
     }
 }
 
-public func deleteMessages(transaction: Transaction, mediaBox: MediaBox, ids: [MessageId], deleteMedia: Bool = true, manualAddMessageThreadStatsDifference: ((MessageId, Int, Int) -> Void)? = nil) {
+func _internal_deleteMessages(transaction: Transaction, mediaBox: MediaBox, ids: [MessageId], deleteMedia: Bool = true, manualAddMessageThreadStatsDifference: ((MessageId, Int, Int) -> Void)? = nil) {
     var resourceIds: [WrappedMediaResourceId] = []
     if deleteMedia {
         for id in ids {
@@ -35,7 +35,7 @@ public func deleteMessages(transaction: Transaction, mediaBox: MediaBox, ids: [M
         }
     }
     if !resourceIds.isEmpty {
-        let _ = mediaBox.removeCachedResources(Set(resourceIds)).start()
+        let _ = mediaBox.removeCachedResources(Set(resourceIds), force: true).start()
     }
     for id in ids {
         if id.peerId.namespace == Namespaces.Peer.CloudChannel && id.namespace == Namespaces.Message.Cloud {
@@ -57,7 +57,7 @@ public func deleteMessages(transaction: Transaction, mediaBox: MediaBox, ids: [M
     })
 }
 
-public func deleteAllMessagesWithAuthor(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, authorId: PeerId, namespace: MessageId.Namespace) {
+func _internal_deleteAllMessagesWithAuthor(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, authorId: PeerId, namespace: MessageId.Namespace) {
     var resourceIds: [WrappedMediaResourceId] = []
     transaction.removeAllMessagesWithAuthor(peerId, authorId: authorId, namespace: namespace, forEachMedia: { media in
         addMessageMediaResourceIdsToRemove(media: media, resourceIds: &resourceIds)
@@ -67,17 +67,17 @@ public func deleteAllMessagesWithAuthor(transaction: Transaction, mediaBox: Medi
     }
 }
 
-public func deleteAllMessagesWithForwardAuthor(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace) {
+func _internal_deleteAllMessagesWithForwardAuthor(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace) {
     var resourceIds: [WrappedMediaResourceId] = []
     transaction.removeAllMessagesWithForwardAuthor(peerId, forwardAuthorId: forwardAuthorId, namespace: namespace, forEachMedia: { media in
         addMessageMediaResourceIdsToRemove(media: media, resourceIds: &resourceIds)
     })
     if !resourceIds.isEmpty {
-        let _ = mediaBox.removeCachedResources(Set(resourceIds)).start()
+        let _ = mediaBox.removeCachedResources(Set(resourceIds), force: true).start()
     }
 }
 
-public func clearHistory(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, namespaces: MessageIdNamespaces) {
+func _internal_clearHistory(transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, namespaces: MessageIdNamespaces) {
     if peerId.namespace == Namespaces.Peer.SecretChat {
         var resourceIds: [WrappedMediaResourceId] = []
         transaction.withAllMessages(peerId: peerId, { message in
@@ -85,7 +85,7 @@ public func clearHistory(transaction: Transaction, mediaBox: MediaBox, peerId: P
             return true
         })
         if !resourceIds.isEmpty {
-            let _ = mediaBox.removeCachedResources(Set(resourceIds)).start()
+            let _ = mediaBox.removeCachedResources(Set(resourceIds), force: true).start()
         }
     }
     transaction.clearHistory(peerId, namespaces: namespaces, forEachMedia: { _ in
@@ -96,7 +96,7 @@ public enum ClearCallHistoryError {
     case generic
 }
 
-public func clearCallHistory(account: Account, forEveryone: Bool) -> Signal<Never, ClearCallHistoryError> {
+func _internal_clearCallHistory(account: Account, forEveryone: Bool) -> Signal<Never, ClearCallHistoryError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         var flags: Int32 = 0
         if forEveryone {
@@ -146,7 +146,7 @@ public enum SetChatMessageAutoremoveTimeoutError {
     case generic
 }
 
-public func setChatMessageAutoremoveTimeoutInteractively(account: Account, peerId: PeerId, timeout: Int32?) -> Signal<Never, SetChatMessageAutoremoveTimeoutError> {
+func _internal_setChatMessageAutoremoveTimeoutInteractively(account: Account, peerId: PeerId, timeout: Int32?) -> Signal<Never, SetChatMessageAutoremoveTimeoutError> {
     return account.postbox.transaction { transaction -> Api.InputPeer? in
         return transaction.getPeer(peerId).flatMap(apiInputPeer)
     }
diff --git a/submodules/TelegramCore/Sources/DeleteMessagesInteractively.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift
similarity index 85%
rename from submodules/TelegramCore/Sources/DeleteMessagesInteractively.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift
index e5f8730294..4dd24abec2 100644
--- a/submodules/TelegramCore/Sources/DeleteMessagesInteractively.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/DeleteMessagesInteractively.swift
@@ -6,7 +6,7 @@ import MtProtoKit
 
 import SyncCore
 
-public func deleteMessagesInteractively(account: Account, messageIds: [MessageId], type: InteractiveMessagesDeletionType, deleteAllInGroup: Bool = false) -> Signal<Void, NoError> {
+func _internal_deleteMessagesInteractively(account: Account, messageIds: [MessageId], type: InteractiveMessagesDeletionType, deleteAllInGroup: Bool = false) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         deleteMessagesInteractively(transaction: transaction, stateManager: account.stateManager, postbox: account.postbox, messageIds: messageIds, type: type, removeIfPossiblyDelivered: true)
     }
@@ -80,7 +80,7 @@ func deleteMessagesInteractively(transaction: Transaction, stateManager: Account
                             globallyUniqueIds.append(globallyUniqueId)
                         }
                     }
-                    let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.deleteMessages(layer: layer, actionGloballyUniqueId: arc4random64(), globallyUniqueIds: globallyUniqueIds), state: state)
+                    let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.deleteMessages(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), globallyUniqueIds: globallyUniqueIds), state: state)
                     if updatedState != state {
                         transaction.setPeerChatState(peerId, state: updatedState)
                     }
@@ -88,7 +88,7 @@ func deleteMessagesInteractively(transaction: Transaction, stateManager: Account
             }
         }
     }
-    deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: messageIds)
+    _internal_deleteMessages(transaction: transaction, mediaBox: postbox.mediaBox, ids: messageIds)
     
     stateManager?.notifyDeletedMessages(messageIds: messageIds)
     
@@ -97,22 +97,22 @@ func deleteMessagesInteractively(transaction: Transaction, stateManager: Account
     }
 }
 
-public func clearHistoryInteractively(postbox: Postbox, peerId: PeerId, type: InteractiveHistoryClearingType) -> Signal<Void, NoError> {
+func _internal_clearHistoryInteractively(postbox: Postbox, peerId: PeerId, type: InteractiveHistoryClearingType) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         if peerId.namespace == Namespaces.Peer.CloudUser || peerId.namespace == Namespaces.Peer.CloudGroup || peerId.namespace == Namespaces.Peer.CloudChannel {
             cloudChatAddClearHistoryOperation(transaction: transaction, peerId: peerId, explicitTopMessageId: nil, type: CloudChatClearHistoryType(type))
             if type == .scheduledMessages {
-                clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .just(Namespaces.Message.allScheduled))
+                _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .just(Namespaces.Message.allScheduled))
             } else {
                 var topIndex: MessageIndex?
                 if let topMessageId = transaction.getTopPeerMessageId(peerId: peerId, namespace: Namespaces.Message.Cloud), let topMessage = transaction.getMessage(topMessageId) {
                     topIndex = topMessage.index
                 }
             
-                clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .not(Namespaces.Message.allScheduled))
+                _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .not(Namespaces.Message.allScheduled))
                 if let cachedData = transaction.getPeerCachedData(peerId: peerId) as? CachedChannelData, let migrationReference = cachedData.migrationReference {
                     cloudChatAddClearHistoryOperation(transaction: transaction, peerId: migrationReference.maxMessageId.peerId, explicitTopMessageId: MessageId(peerId: migrationReference.maxMessageId.peerId, namespace: migrationReference.maxMessageId.namespace, id: migrationReference.maxMessageId.id + 1), type: CloudChatClearHistoryType(type))
-                    clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: migrationReference.maxMessageId.peerId, namespaces: .all)
+                    _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: migrationReference.maxMessageId.peerId, namespaces: .all)
                 }
                 if let topIndex = topIndex {
                     if peerId.namespace == Namespaces.Peer.CloudUser {
@@ -123,7 +123,7 @@ public func clearHistoryInteractively(postbox: Postbox, peerId: PeerId, type: In
                 }
             }
         } else if peerId.namespace == Namespaces.Peer.SecretChat {
-            clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .all)
+            _internal_clearHistory(transaction: transaction, mediaBox: postbox.mediaBox, peerId: peerId, namespaces: .all)
             
             if let state = transaction.getPeerChatState(peerId) as? SecretChatState {
                 var layer: SecretChatLayer?
@@ -137,7 +137,7 @@ public func clearHistoryInteractively(postbox: Postbox, peerId: PeerId, type: In
                 }
                 
                 if let layer = layer {
-                    let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.clearHistory(layer: layer, actionGloballyUniqueId: arc4random64()), state: state)
+                    let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.clearHistory(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max)), state: state)
                     if updatedState != state {
                         transaction.setPeerChatState(peerId, state: updatedState)
                     }
@@ -147,7 +147,7 @@ public func clearHistoryInteractively(postbox: Postbox, peerId: PeerId, type: In
     }
 }
 
-public func clearAuthorHistory(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
+func _internal_clearAuthorHistory(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId), let memberPeer = transaction.getPeer(memberId), let inputChannel = apiInputChannel(peer), let inputUser = apiInputUser(memberPeer) {
             
@@ -178,7 +178,7 @@ public func clearAuthorHistory(account: Account, peerId: PeerId, memberId: PeerI
             |> `catch` { success -> Signal<Void, NoError> in
                 if success {
                     return account.postbox.transaction { transaction -> Void in
-                        deleteAllMessagesWithAuthor(transaction: transaction, mediaBox: account.postbox.mediaBox, peerId: peerId, authorId: memberId, namespace: Namespaces.Message.Cloud)
+                        _internal_deleteAllMessagesWithAuthor(transaction: transaction, mediaBox: account.postbox.mediaBox, peerId: peerId, authorId: memberId, namespace: Namespaces.Message.Cloud)
                     }
                 } else {
                     return .complete()
diff --git a/submodules/TelegramCore/Sources/EarliestUnseenPersonalMentionMessage.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/EarliestUnseenPersonalMentionMessage.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/EarliestUnseenPersonalMentionMessage.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/EarliestUnseenPersonalMentionMessage.swift
index 54c5a0b320..d3aa62b2bf 100644
--- a/submodules/TelegramCore/Sources/EarliestUnseenPersonalMentionMessage.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/EarliestUnseenPersonalMentionMessage.swift
@@ -10,7 +10,7 @@ public enum EarliestUnseenPersonalMentionMessageResult: Equatable {
     case result(MessageId?)
 }
 
-public func earliestUnseenPersonalMentionMessage(account: Account, peerId: PeerId) -> Signal<EarliestUnseenPersonalMentionMessageResult, NoError> {
+func _internal_earliestUnseenPersonalMentionMessage(account: Account, peerId: PeerId) -> Signal<EarliestUnseenPersonalMentionMessageResult, NoError> {
     return account.viewTracker.aroundMessageHistoryViewForLocation(.peer(peerId), index: .lowerBound, anchorIndex: .lowerBound, count: 4, fixedCombinedReadStates: nil, tagMask: .unseenPersonalMessage, additionalData: [.peerChatState(peerId)])
     |> mapToSignal { view -> Signal<EarliestUnseenPersonalMentionMessageResult, NoError> in
         if view.0.isLoading {
diff --git a/submodules/TelegramCore/Sources/ExportMessageLink.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ExportMessageLink.swift
similarity index 89%
rename from submodules/TelegramCore/Sources/ExportMessageLink.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ExportMessageLink.swift
index 2d32877418..66c64fce1e 100644
--- a/submodules/TelegramCore/Sources/ExportMessageLink.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ExportMessageLink.swift
@@ -3,7 +3,7 @@ import Postbox
 import TelegramApi
 import SwiftSignalKit
 
-public func exportMessageLink(account: Account, peerId: PeerId, messageId: MessageId, isThread: Bool = false) -> Signal<String?, NoError> {
+func _internal_exportMessageLink(account: Account, peerId: PeerId, messageId: MessageId, isThread: Bool = false) -> Signal<String?, NoError> {
     return account.postbox.transaction { transaction -> (Peer, MessageId)? in
         var peer: Peer? = transaction.getPeer(messageId.peerId)
         if let peer = peer {
diff --git a/submodules/TelegramCore/Sources/ForwardGame.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ForwardGame.swift
similarity index 80%
rename from submodules/TelegramCore/Sources/ForwardGame.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ForwardGame.swift
index 6627125458..7a592178fa 100644
--- a/submodules/TelegramCore/Sources/ForwardGame.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ForwardGame.swift
@@ -3,10 +3,10 @@ import Postbox
 import TelegramApi
 import SwiftSignalKit
 
-public func forwardGameWithScore(account: Account, messageId: MessageId, to peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_forwardGameWithScore(account: Account, messageId: MessageId, to peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let _ = transaction.getMessage(messageId), let fromPeer = transaction.getPeer(messageId.peerId), let fromInputPeer = apiInputPeer(fromPeer), let toPeer = transaction.getPeer(peerId), let toInputPeer = apiInputPeer(toPeer) {
-            return account.network.request(Api.functions.messages.forwardMessages(flags: 1 << 8, fromPeer: fromInputPeer, id: [messageId.id], randomId: [arc4random64()], toPeer: toInputPeer, scheduleDate: nil))
+            return account.network.request(Api.functions.messages.forwardMessages(flags: 1 << 8, fromPeer: fromInputPeer, id: [messageId.id], randomId: [Int64.random(in: Int64.min ... Int64.max)], toPeer: toInputPeer, scheduleDate: nil))
             |> map(Optional.init)
             |> `catch` { _ -> Signal<Api.Updates?, NoError> in
                 return .single(nil)
diff --git a/submodules/TelegramCore/Sources/InstallInteractiveReadMessagesAction.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/InstallInteractiveReadMessagesAction.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/InstallInteractiveReadMessagesAction.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/InstallInteractiveReadMessagesAction.swift
index ec862edad0..4b853a0b0f 100644
--- a/submodules/TelegramCore/Sources/InstallInteractiveReadMessagesAction.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/InstallInteractiveReadMessagesAction.swift
@@ -5,7 +5,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func installInteractiveReadMessagesAction(postbox: Postbox, stateManager: AccountStateManager, peerId: PeerId) -> Disposable {
+func _internal_installInteractiveReadMessagesAction(postbox: Postbox, stateManager: AccountStateManager, peerId: PeerId) -> Disposable {
     return postbox.installStoreMessageAction(peerId: peerId, { messages, transaction in
         var consumeMessageIds: [MessageId] = []
         
@@ -56,7 +56,7 @@ public func installInteractiveReadMessagesAction(postbox: Postbox, stateManager:
         }
         
         for (_, index) in readMessageIndexByNamespace {
-            applyMaxReadIndexInteractively(transaction: transaction, stateManager: stateManager, index: index)
+            _internal_applyMaxReadIndexInteractively(transaction: transaction, stateManager: stateManager, index: index)
         }
     })
 }
diff --git a/submodules/TelegramCore/Sources/LoadMessagesIfNecessary.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/LoadMessagesIfNecessary.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/LoadMessagesIfNecessary.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/LoadMessagesIfNecessary.swift
index 66ffa33865..f2e4bd052f 100644
--- a/submodules/TelegramCore/Sources/LoadMessagesIfNecessary.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/LoadMessagesIfNecessary.swift
@@ -11,7 +11,7 @@ public enum GetMessagesStrategy  {
     case cloud
 }
 
-public func getMessagesLoadIfNecessary(_ messageIds: [MessageId], postbox: Postbox, network: Network, accountPeerId: PeerId, strategy: GetMessagesStrategy = .cloud) -> Signal <[Message], NoError> {
+func _internal_getMessagesLoadIfNecessary(_ messageIds: [MessageId], postbox: Postbox, network: Network, accountPeerId: PeerId, strategy: GetMessagesStrategy = .cloud) -> Signal <[Message], NoError> {
     let postboxSignal = postbox.transaction { transaction -> ([Message], Set<MessageId>, SimpleDictionary<PeerId, Peer>) in
         var ids = messageIds
         
diff --git a/submodules/TelegramCore/Sources/MarkAllChatsAsRead.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkAllChatsAsRead.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/MarkAllChatsAsRead.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkAllChatsAsRead.swift
index 8a3481c9e5..69dbd159a7 100644
--- a/submodules/TelegramCore/Sources/MarkAllChatsAsRead.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkAllChatsAsRead.swift
@@ -6,7 +6,7 @@ import MtProtoKit
 
 import SyncCore
 
-public func markAllChatsAsRead(postbox: Postbox, network: Network, stateManager: AccountStateManager) -> Signal<Void, NoError> {
+func _internal_markAllChatsAsRead(postbox: Postbox, network: Network, stateManager: AccountStateManager) -> Signal<Void, NoError> {
     return network.request(Api.functions.messages.getDialogUnreadMarks())
     |> map(Optional.init)
     |> `catch` { _ -> Signal<[Api.DialogPeer]?, NoError> in
diff --git a/submodules/TelegramCore/Sources/MarkMessageContentAsConsumedInteractively.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkMessageContentAsConsumedInteractively.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/MarkMessageContentAsConsumedInteractively.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkMessageContentAsConsumedInteractively.swift
index c302433985..7a39d5bb17 100644
--- a/submodules/TelegramCore/Sources/MarkMessageContentAsConsumedInteractively.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/MarkMessageContentAsConsumedInteractively.swift
@@ -5,7 +5,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageId: MessageId) -> Signal<Void, NoError> {
+func _internal_markMessageContentAsConsumedInteractively(postbox: Postbox, messageId: MessageId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         if let message = transaction.getMessage(messageId), message.flags.contains(.Incoming) {
             var updateMessage = false
@@ -32,7 +32,7 @@ public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageI
                                     var globallyUniqueIds: [Int64] = []
                                     if let globallyUniqueId = message.globallyUniqueId {
                                         globallyUniqueIds.append(globallyUniqueId)
-                                        let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: message.id.peerId, operation: SecretChatOutgoingOperationContents.readMessagesContent(layer: layer, actionGloballyUniqueId: arc4random64(), globallyUniqueIds: globallyUniqueIds), state: state)
+                                        let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: message.id.peerId, operation: SecretChatOutgoingOperationContents.readMessagesContent(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), globallyUniqueIds: globallyUniqueIds), state: state)
                                         if updatedState != state {
                                             transaction.setPeerChatState(message.id.peerId, state: updatedState)
                                         }
@@ -75,7 +75,7 @@ public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageI
                             }
                             
                             if let state = state, let layer = layer, let globallyUniqueId = message.globallyUniqueId {
-                                let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: messageId.peerId, operation: .readMessagesContent(layer: layer, actionGloballyUniqueId: arc4random64(), globallyUniqueIds: [globallyUniqueId]), state: state)
+                                let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: messageId.peerId, operation: .readMessagesContent(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), globallyUniqueIds: [globallyUniqueId]), state: state)
                                 if updatedState != state {
                                     transaction.setPeerChatState(messageId.peerId, state: updatedState)
                                 }
@@ -106,7 +106,7 @@ public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageI
                             }
                             
                             if let state = state, let layer = layer, let globallyUniqueId = message.globallyUniqueId {
-                                let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: messageId.peerId, operation: .readMessagesContent(layer: layer, actionGloballyUniqueId: arc4random64(), globallyUniqueIds: [globallyUniqueId]), state: state)
+                                let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: messageId.peerId, operation: .readMessagesContent(layer: layer, actionGloballyUniqueId: Int64.random(in: Int64.min ... Int64.max), globallyUniqueIds: [globallyUniqueId]), state: state)
                                 if updatedState != state {
                                     transaction.setPeerChatState(messageId.peerId, state: updatedState)
                                 }
diff --git a/submodules/TelegramCore/Sources/OutgoingMessageWithChatContextResult.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/OutgoingMessageWithChatContextResult.swift
similarity index 75%
rename from submodules/TelegramCore/Sources/OutgoingMessageWithChatContextResult.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/OutgoingMessageWithChatContextResult.swift
index c800fb9793..51b5b930f5 100644
--- a/submodules/TelegramCore/Sources/OutgoingMessageWithChatContextResult.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/OutgoingMessageWithChatContextResult.swift
@@ -3,8 +3,15 @@ import Postbox
 import SwiftSignalKit
 import SyncCore
 
+func _internal_enqueueOutgoingMessageWithChatContextResult(account: Account, to peerId: PeerId, results: ChatContextResultCollection, result: ChatContextResult, replyToMessageId: MessageId?, hideVia: Bool, silentPosting: Bool, scheduleTime: Int32?, correlationId: Int64?) -> Bool {
+    guard let message = outgoingMessageWithChatContextResult(to: peerId, results: results, result: result, replyToMessageId: replyToMessageId, hideVia: hideVia, silentPosting: silentPosting, scheduleTime: scheduleTime, correlationId: correlationId) else {
+        return false
+    }
+    let _ = enqueueMessages(account: account, peerId: peerId, messages: [message]).start()
+    return true
+}
 
-public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: ChatContextResultCollection, result: ChatContextResult, hideVia: Bool = false, scheduleTime: Int32? = nil) -> EnqueueMessage? {
+private func outgoingMessageWithChatContextResult(to peerId: PeerId, results: ChatContextResultCollection, result: ChatContextResult, replyToMessageId: MessageId?, hideVia: Bool, silentPosting: Bool, scheduleTime: Int32?, correlationId: Int64?) -> EnqueueMessage? {
     var attributes: [MessageAttribute] = []
     attributes.append(OutgoingChatContextResultMessageAttribute(queryId: result.queryId, id: result.id, hideVia: hideVia))
     if !hideVia {
@@ -13,6 +20,9 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
     if let scheduleTime = scheduleTime {
         attributes.append(OutgoingScheduleInfoMessageAttribute(scheduleTime: scheduleTime))
     }
+    if silentPosting {
+        attributes.append(NotificationInfoMessageAttribute(flags: .muted))
+    }
     switch result.message {
         case let .auto(caption, entities, replyMarkup):
             if let entities = entities {
@@ -32,19 +42,19 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
                                 return true
                             }
                             if let media: Media = internalReference.file ?? internalReference.image {
-                                return .message(text: caption, attributes: filteredAttributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil)
+                                return .message(text: caption, attributes: filteredAttributes, mediaReference: .standalone(media: media), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                             } else {
-                                return .message(text: caption, attributes: filteredAttributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)
+                                return .message(text: caption, attributes: filteredAttributes, mediaReference: nil, replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                             }
                         } else {
-                            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: TelegramMediaGame(gameId: 0, accessHash: 0, name: "", title: internalReference.title ?? "", description: internalReference.description ?? "", image: internalReference.image, file: internalReference.file)), replyToMessageId: nil, localGroupingKey: nil)
+                            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: TelegramMediaGame(gameId: 0, accessHash: 0, name: "", title: internalReference.title ?? "", description: internalReference.description ?? "", image: internalReference.image, file: internalReference.file)), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                         }
                     } else if let file = internalReference.file, internalReference.type == "gif" {
-                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                     } else if let image = internalReference.image {
-                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: image), replyToMessageId: nil, localGroupingKey: nil)
+                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: image), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                     } else if let file = internalReference.file {
-                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                     } else {
                         return nil
                     }
@@ -55,10 +65,10 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
                             arc4random_buf(&randomId, 8)
                             let thumbnailResource = thumbnail.resource
                             let imageDimensions = thumbnail.dimensions ?? PixelDimensions(width: 128, height: 128)
-                            let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: randomId), representations: [TelegramMediaImageRepresentation(dimensions: imageDimensions, resource: thumbnailResource, progressiveSizes: [])], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
-                            return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: tmpImage), replyToMessageId: nil, localGroupingKey: nil)
+                            let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.LocalImage, id: randomId), representations: [TelegramMediaImageRepresentation(dimensions: imageDimensions, resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil)], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
+                            return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: tmpImage), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                         } else {
-                            return .message(text: caption, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)
+                            return .message(text: caption, attributes: attributes, mediaReference: nil, replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                         }
                     } else if externalReference.type == "document" || externalReference.type == "gif" || externalReference.type == "audio" || externalReference.type == "voice" {
                         var videoThumbnails: [TelegramMediaFile.VideoThumbnail] = []
@@ -71,7 +81,7 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
                             if thumbnail.mimeType.hasPrefix("video/") {
                                 videoThumbnails.append(TelegramMediaFile.VideoThumbnail(dimensions: thumbnail.dimensions ?? PixelDimensions(width: 128, height: 128), resource: thumbnailResource))
                             } else {
-                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: thumbnail.dimensions ?? PixelDimensions(width: 128, height: 128), resource: thumbnailResource, progressiveSizes: []))
+                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: thumbnail.dimensions ?? PixelDimensions(width: 128, height: 128), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
                             }
                         }
                         var fileName = "file"
@@ -118,9 +128,9 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
                         }
                         
                         let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: videoThumbnails, immediateThumbnailData: nil, mimeType: externalReference.content?.mimeType ?? "application/binary", size: nil, attributes: fileAttributes)
-                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                        return .message(text: caption, attributes: attributes, mediaReference: .standalone(media: file), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                     } else {
-                        return .message(text: caption, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)
+                        return .message(text: caption, attributes: attributes, mediaReference: nil, replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
                     }
             }
         case let .text(text, entities, disableUrlPreview, replyMarkup):
@@ -130,16 +140,21 @@ public func outgoingMessageWithChatContextResult(to peerId: PeerId, results: Cha
             if let replyMarkup = replyMarkup {
                 attributes.append(replyMarkup)
             }
-            return .message(text: text, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)
+            return .message(text: text, attributes: attributes, mediaReference: nil, replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
         case let .mapLocation(media, replyMarkup):
             if let replyMarkup = replyMarkup {
                 attributes.append(replyMarkup)
             }
-            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil)
+            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
         case let .contact(media, replyMarkup):
             if let replyMarkup = replyMarkup {
                 attributes.append(replyMarkup)
             }
-            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil)
+            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
+        case let .invoice(media, replyMarkup):
+            if let replyMarkup = replyMarkup {
+                attributes.append(replyMarkup)
+            }
+            return .message(text: "", attributes: attributes, mediaReference: .standalone(media: media), replyToMessageId: replyToMessageId, localGroupingKey: nil, correlationId: correlationId)
     }
 }
diff --git a/submodules/TelegramCore/Sources/PeerLiveLocationsContext.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/PeerLiveLocationsContext.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/PeerLiveLocationsContext.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/PeerLiveLocationsContext.swift
index 3609e85ced..04be82ce54 100644
--- a/submodules/TelegramCore/Sources/PeerLiveLocationsContext.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/PeerLiveLocationsContext.swift
@@ -2,10 +2,9 @@ import Foundation
 import Postbox
 import SwiftSignalKit
 import TelegramApi
-
 import SyncCore
 
-public func topPeerActiveLiveLocationMessages(viewTracker: AccountViewTracker, accountPeerId: PeerId, peerId: PeerId) -> Signal<(Peer?, [Message]), NoError> {
+func _internal_topPeerActiveLiveLocationMessages(viewTracker: AccountViewTracker, accountPeerId: PeerId, peerId: PeerId) -> Signal<(Peer?, [Message]), NoError> {
     return viewTracker.aroundMessageHistoryViewForLocation(.peer(peerId), index: .upperBound, anchorIndex: .upperBound, count: 50, fixedCombinedReadStates: nil, tagMask: .liveLocation, orderStatistics: [], additionalData: [.peer(accountPeerId)])
     |> map { (view, _, _) -> (Peer?, [Message]) in
         var accountPeer: Peer?
diff --git a/submodules/TelegramCore/Sources/Polls.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/Polls.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/Polls.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/Polls.swift
index 9c20e6b9c7..6aefb2b7eb 100644
--- a/submodules/TelegramCore/Sources/Polls.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/Polls.swift
@@ -10,7 +10,7 @@ public enum RequestMessageSelectPollOptionError {
     case generic
 }
 
-public func requestMessageSelectPollOption(account: Account, messageId: MessageId, opaqueIdentifiers: [Data]) -> Signal<TelegramMediaPoll?, RequestMessageSelectPollOptionError> {
+func _internal_requestMessageSelectPollOption(account: Account, messageId: MessageId, opaqueIdentifiers: [Data]) -> Signal<TelegramMediaPoll?, RequestMessageSelectPollOptionError> {
     return account.postbox.loadedPeerWithId(messageId.peerId)
     |> take(1)
     |> castError(RequestMessageSelectPollOptionError.self)
@@ -80,7 +80,7 @@ public func requestMessageSelectPollOption(account: Account, messageId: MessageI
     }
 }
 
-public func requestClosePoll(postbox: Postbox, network: Network, stateManager: AccountStateManager, messageId: MessageId) -> Signal<Void, NoError> {
+func _internal_requestClosePoll(postbox: Postbox, network: Network, stateManager: AccountStateManager, messageId: MessageId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> (TelegramMediaPoll, Api.InputPeer)? in
         guard let inputPeer = transaction.getPeer(messageId.peerId).flatMap(apiInputPeer) else {
             return nil
@@ -286,11 +286,11 @@ private final class PollResultsOptionContext {
                                 let peerId: PeerId
                                 switch vote {
                                 case let .messageUserVote(userId, _, _):
-                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                 case let .messageUserVoteInputOption(userId, _):
-                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                 case let .messageUserVoteMultiple(userId, _, _):
-                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                 }
                                 if let peer = transaction.getPeer(peerId) {
                                     resultPeers.append(RenderedPeer(peer: peer))
@@ -419,7 +419,7 @@ public final class PollResultsContext {
         }
     }
     
-    public init(account: Account, messageId: MessageId, poll: TelegramMediaPoll) {
+    init(account: Account, messageId: MessageId, poll: TelegramMediaPoll) {
         let queue = self.queue
         self.impl = QueueLocalObject(queue: queue, generate: {
             return PollResultsContextImpl(queue: queue, account: account, messageId: messageId, poll: poll)
diff --git a/submodules/TelegramCore/Sources/RecentlyUsedHashtags.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RecentlyUsedHashtags.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/RecentlyUsedHashtags.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/RecentlyUsedHashtags.swift
index 0bd04d68a4..9c313facbe 100644
--- a/submodules/TelegramCore/Sources/RecentlyUsedHashtags.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RecentlyUsedHashtags.swift
@@ -30,7 +30,7 @@ func addRecentlyUsedHashtag(transaction: Transaction, string: String) {
     }
 }
 
-public func removeRecentlyUsedHashtag(postbox: Postbox, string: String) -> Signal<Void, NoError> {
+func _internal_removeRecentlyUsedHashtag(postbox: Postbox, string: String) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         if let itemId = RecentHashtagItemId(string) {
             transaction.removeOrderedItemListItem(collectionId: Namespaces.OrderedItemList.RecentlyUsedHashtags, itemId: itemId.rawValue)
@@ -38,7 +38,7 @@ public func removeRecentlyUsedHashtag(postbox: Postbox, string: String) -> Signa
     }
 }
 
-public func recentlyUsedHashtags(postbox: Postbox) -> Signal<[String], NoError> {
+func _internal_recentlyUsedHashtags(postbox: Postbox) -> Signal<[String], NoError> {
     return postbox.combinedView(keys: [.orderedItemList(id: Namespaces.OrderedItemList.RecentlyUsedHashtags)])
         |> mapToSignal { view -> Signal<[String], NoError> in
             return postbox.transaction { transaction -> [String] in
diff --git a/submodules/TelegramCore/Sources/ReplyThreadHistory.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ReplyThreadHistory.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/ReplyThreadHistory.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ReplyThreadHistory.swift
index c9626ed73d..38df1cb764 100644
--- a/submodules/TelegramCore/Sources/ReplyThreadHistory.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ReplyThreadHistory.swift
@@ -453,7 +453,7 @@ public enum FetchChannelReplyThreadMessageError {
     case generic
 }
 
-public func fetchChannelReplyThreadMessage(account: Account, messageId: MessageId, atMessageId: MessageId?) -> Signal<ChatReplyThreadMessage, FetchChannelReplyThreadMessageError> {
+func _internal_fetchChannelReplyThreadMessage(account: Account, messageId: MessageId, atMessageId: MessageId?) -> Signal<ChatReplyThreadMessage, FetchChannelReplyThreadMessageError> {
     return account.postbox.transaction { transaction -> Api.InputPeer? in
         return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
     }
diff --git a/submodules/TelegramCore/Sources/RequestChatContextResults.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestChatContextResults.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/RequestChatContextResults.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestChatContextResults.swift
index 20ef3a4b63..39f0488710 100644
--- a/submodules/TelegramCore/Sources/RequestChatContextResults.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestChatContextResults.swift
@@ -51,7 +51,7 @@ public struct RequestChatContextResultsResult {
     }
 }
 
-public func requestChatContextResults(account: Account, botId: PeerId, peerId: PeerId, query: String, location: Signal<(Double, Double)?, NoError> = .single(nil), offset: String, incompleteResults: Bool = false, staleCachedResults: Bool = false) -> Signal<RequestChatContextResultsResult?, RequestChatContextResultsError> {
+func _internal_requestChatContextResults(account: Account, botId: PeerId, peerId: PeerId, query: String, location: Signal<(Double, Double)?, NoError> = .single(nil), offset: String, incompleteResults: Bool = false, staleCachedResults: Bool = false) -> Signal<RequestChatContextResultsResult?, RequestChatContextResultsError> {
     return account.postbox.transaction { transaction -> (bot: Peer, peer: Peer)? in
         if let bot = transaction.getPeer(botId), let peer = transaction.getPeer(peerId) {
             return (bot, peer)
diff --git a/submodules/TelegramCore/Sources/RequestMessageActionCallback.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestMessageActionCallback.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/RequestMessageActionCallback.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestMessageActionCallback.swift
index edfeaa6777..6bfa85422f 100644
--- a/submodules/TelegramCore/Sources/RequestMessageActionCallback.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestMessageActionCallback.swift
@@ -24,7 +24,7 @@ public enum MessageActionCallbackError {
     case userBlocked
 }
 
-public func requestMessageActionCallbackPasswordCheck(account: Account, messageId: MessageId, isGame: Bool, data: MemoryBuffer?) -> Signal<Never, MessageActionCallbackError> {
+func _internal_requestMessageActionCallbackPasswordCheck(account: Account, messageId: MessageId, isGame: Bool, data: MemoryBuffer?) -> Signal<Never, MessageActionCallbackError> {
     return account.postbox.loadedPeerWithId(messageId.peerId)
      |> castError(MessageActionCallbackError.self)
      |> take(1)
@@ -72,7 +72,7 @@ public func requestMessageActionCallbackPasswordCheck(account: Account, messageI
     }
 }
 
-public func requestMessageActionCallback(account: Account, messageId: MessageId, isGame :Bool, password: String?, data: MemoryBuffer?) -> Signal<MessageActionCallbackResult, MessageActionCallbackError> {
+func _internal_requestMessageActionCallback(account: Account, messageId: MessageId, isGame :Bool, password: String?, data: MemoryBuffer?) -> Signal<MessageActionCallbackResult, MessageActionCallbackError> {
     return account.postbox.loadedPeerWithId(messageId.peerId)
     |> castError(MessageActionCallbackError.self)
     |> take(1)
@@ -92,7 +92,7 @@ public func requestMessageActionCallback(account: Account, messageId: MessageId,
             if let password = password, !password.isEmpty {
                 flags |= Int32(1 << 2)
                 
-                checkPassword = twoStepAuthData(account.network)
+                checkPassword = _internal_twoStepAuthData(account.network)
                 |> mapError { error -> MessageActionCallbackError in
                     if error.errorDescription.hasPrefix("FLOOD_WAIT") {
                         return .limitExceeded
@@ -179,7 +179,7 @@ public enum MessageActionUrlSubject {
     case url(String)
 }
 
-public func requestMessageActionUrlAuth(account: Account, subject: MessageActionUrlSubject) -> Signal<MessageActionUrlAuthResult, NoError> {
+func _internal_requestMessageActionUrlAuth(account: Account, subject: MessageActionUrlSubject) -> Signal<MessageActionUrlAuthResult, NoError> {
     let request: Signal<Api.UrlAuthResult?, MTRpcError>
     var flags: Int32 = 0
     switch subject {
@@ -221,7 +221,7 @@ public func requestMessageActionUrlAuth(account: Account, subject: MessageAction
     }
 }
 
-public func acceptMessageActionUrlAuth(account: Account, subject: MessageActionUrlSubject, allowWriteAccess: Bool) -> Signal<MessageActionUrlAuthResult, NoError> {
+func _internal_acceptMessageActionUrlAuth(account: Account, subject: MessageActionUrlSubject, allowWriteAccess: Bool) -> Signal<MessageActionUrlAuthResult, NoError> {
     var flags: Int32 = 0
     if allowWriteAccess {
         flags |= Int32(1 << 0)
diff --git a/submodules/TelegramCore/Sources/RequestStartBot.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestStartBot.swift
similarity index 82%
rename from submodules/TelegramCore/Sources/RequestStartBot.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestStartBot.swift
index 44e6b1118b..9b46a05b71 100644
--- a/submodules/TelegramCore/Sources/RequestStartBot.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/RequestStartBot.swift
@@ -6,12 +6,12 @@ import MtProtoKit
 
 import SyncCore
 
-public func requestStartBot(account: Account, botPeerId: PeerId, payload: String?) -> Signal<Void, NoError> {
+func _internal_requestStartBot(account: Account, botPeerId: PeerId, payload: String?) -> Signal<Void, NoError> {
     if let payload = payload, !payload.isEmpty {
         return account.postbox.loadedPeerWithId(botPeerId)
             |> mapToSignal { botPeer -> Signal<Void, NoError> in
                 if let inputUser = apiInputUser(botPeer) {
-                    let r = account.network.request(Api.functions.messages.startBot(bot: inputUser, peer: .inputPeerEmpty, randomId: arc4random64(), startParam: payload))
+                    let r = account.network.request(Api.functions.messages.startBot(bot: inputUser, peer: .inputPeerEmpty, randomId: Int64.random(in: Int64.min ... Int64.max), startParam: payload))
                         |> mapToSignal { result -> Signal<Void, MTRpcError> in
                             account.stateManager.addUpdates(result)
                             return .complete()
@@ -26,7 +26,7 @@ public func requestStartBot(account: Account, botPeerId: PeerId, payload: String
                 }
             }
     } else {
-        return enqueueMessages(account: account, peerId: botPeerId, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]) |> mapToSignal { _ -> Signal<Void, NoError> in
+        return enqueueMessages(account: account, peerId: botPeerId, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)]) |> mapToSignal { _ -> Signal<Void, NoError> in
             return .complete()
         }
     }
@@ -41,21 +41,21 @@ public enum StartBotInGroupResult {
     case channelParticipant(RenderedChannelParticipant)
 }
 
-public func requestStartBotInGroup(account: Account, botPeerId: PeerId, groupPeerId: PeerId, payload: String?) -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> {
+func _internal_requestStartBotInGroup(account: Account, botPeerId: PeerId, groupPeerId: PeerId, payload: String?) -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> {
     return account.postbox.transaction { transaction -> (Peer?, Peer?) in
         return (transaction.getPeer(botPeerId), transaction.getPeer(groupPeerId))
     }
     |> mapError { _ -> RequestStartBotInGroupError in return .generic }
     |> mapToSignal { botPeer, groupPeer -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> in
         if let botPeer = botPeer, let inputUser = apiInputUser(botPeer), let groupPeer = groupPeer, let inputGroup = apiInputPeer(groupPeer) {
-            let request = account.network.request(Api.functions.messages.startBot(bot: inputUser, peer: inputGroup, randomId: arc4random64(), startParam: payload ?? ""))
+            let request = account.network.request(Api.functions.messages.startBot(bot: inputUser, peer: inputGroup, randomId: Int64.random(in: Int64.min ... Int64.max), startParam: payload ?? ""))
             |> mapError { _ -> RequestStartBotInGroupError in
                 return .generic
             }
             |> mapToSignal { result -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> in
                 account.stateManager.addUpdates(result)
                 if groupPeerId.namespace == Namespaces.Peer.CloudChannel {
-                    return fetchChannelParticipant(account: account, peerId: groupPeerId, participantId: botPeerId)
+                    return _internal_fetchChannelParticipant(account: account, peerId: groupPeerId, participantId: botPeerId)
                     |> mapError { _ -> RequestStartBotInGroupError in return .generic
                     }
                     |> mapToSignal { participant -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> in
diff --git a/submodules/TelegramCore/Sources/ScheduledMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ScheduledMessages.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/ScheduledMessages.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/ScheduledMessages.swift
index f8500bb722..65d6906e20 100644
--- a/submodules/TelegramCore/Sources/ScheduledMessages.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/ScheduledMessages.swift
@@ -5,7 +5,7 @@ import TelegramApi
 
 import SyncCore
 
-public func sendScheduledMessageNowInteractively(postbox: Postbox, messageId: MessageId) -> Signal<Never, NoError> {
+func _internal_sendScheduledMessageNowInteractively(postbox: Postbox, messageId: MessageId) -> Signal<Never, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.setPendingMessageAction(type: .sendScheduledMessageImmediately, id: messageId, action: SendScheduledMessageImmediatelyAction())
     }
diff --git a/submodules/TelegramCore/Sources/SearchMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/SearchMessages.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/SearchMessages.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/SearchMessages.swift
index 6e89ef2414..0d70dc6986 100644
--- a/submodules/TelegramCore/Sources/SearchMessages.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/SearchMessages.swift
@@ -184,7 +184,7 @@ private func mergedResult(_ state: SearchMessagesState) -> SearchMessagesResult
     return SearchMessagesResult(messages: messages, readStates: readStates, totalCount: state.main.totalCount + (state.additional?.totalCount ?? 0), completed: state.main.completed && (state.additional?.completed ?? true))
 }
 
-public func searchMessages(account: Account, location: SearchMessagesLocation, query: String, state: SearchMessagesState?, limit: Int32 = 100) -> Signal<(SearchMessagesResult, SearchMessagesState), NoError> {
+func _internal_searchMessages(account: Account, location: SearchMessagesLocation, query: String, state: SearchMessagesState?, limit: Int32 = 100) -> Signal<(SearchMessagesResult, SearchMessagesState), NoError> {
     let remoteSearchResult: Signal<(Api.messages.Messages?, Api.messages.Messages?), NoError>
     switch location {
         case let .peer(peerId, fromId, tags, topMsgId, minDate, maxDate):
@@ -379,7 +379,7 @@ public func searchMessages(account: Account, location: SearchMessagesLocation, q
     }
 }
 
-public func downloadMessage(postbox: Postbox, network: Network, messageId: MessageId) -> Signal<Message?, NoError> {
+func _internal_downloadMessage(postbox: Postbox, network: Network, messageId: MessageId) -> Signal<Message?, NoError> {
     return postbox.transaction { transaction -> Message? in
         return transaction.getMessage(messageId)
     } |> mapToSignal { message in
@@ -562,7 +562,7 @@ func fetchRemoteMessage(postbox: Postbox, source: FetchMessageHistoryHoleSource,
     }
 }
 
-public func searchMessageIdByTimestamp(account: Account, peerId: PeerId, threadId: Int64?, timestamp: Int32) -> Signal<MessageId?, NoError> {
+func _internal_searchMessageIdByTimestamp(account: Account, peerId: PeerId, threadId: Int64?, timestamp: Int32) -> Signal<MessageId?, NoError> {
     return account.postbox.transaction { transaction -> Signal<MessageId?, NoError> in
         if peerId.namespace == Namespaces.Peer.SecretChat {
             return .single(transaction.findClosestMessageIdByTimestamp(peerId: peerId, timestamp: timestamp))
@@ -672,7 +672,7 @@ public enum UpdatedRemotePeerError {
     case generic
 }
 
-public func updatedRemotePeer(postbox: Postbox, network: Network, peer: PeerReference) -> Signal<Peer, UpdatedRemotePeerError> {
+func _internal_updatedRemotePeer(postbox: Postbox, network: Network, peer: PeerReference) -> Signal<Peer, UpdatedRemotePeerError> {
     if let inputUser = peer.inputUser {
         return network.request(Api.functions.users.getUsers(id: [inputUser]))
         |> mapError { _ -> UpdatedRemotePeerError in
@@ -721,7 +721,6 @@ public func updatedRemotePeer(postbox: Postbox, network: Network, peer: PeerRefe
                     return updatedPeer
                 }
                 |> mapError { _ -> UpdatedRemotePeerError in
-                    return .generic
                 }
             } else {
                 return .fail(.generic)
@@ -748,7 +747,6 @@ public func updatedRemotePeer(postbox: Postbox, network: Network, peer: PeerRefe
                     return updatedPeer
                 }
                 |> mapError { _ -> UpdatedRemotePeerError in
-                    return .generic
                 }
             } else {
                 return .fail(.generic)
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Messages/TelegramEngineMessages.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/TelegramEngineMessages.swift
new file mode 100644
index 0000000000..6dc415b280
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/TelegramEngineMessages.swift
@@ -0,0 +1,175 @@
+import Foundation
+import SwiftSignalKit
+import Postbox
+import SyncCore
+
+public extension TelegramEngine {
+    final class Messages {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func clearCloudDraftsInteractively() -> Signal<Void, NoError> {
+        	return _internal_clearCloudDraftsInteractively(postbox: self.account.postbox, network: self.account.network, accountPeerId: self.account.peerId)
+        }
+
+        public func applyMaxReadIndexInteractively(index: MessageIndex) -> Signal<Void, NoError> {
+            return _internal_applyMaxReadIndexInteractively(postbox: self.account.postbox, stateManager: self.account.stateManager, index: index)
+        }
+
+        public func sendScheduledMessageNowInteractively(messageId: MessageId) -> Signal<Never, NoError> {
+            return _internal_sendScheduledMessageNowInteractively(postbox: self.account.postbox, messageId: messageId)
+        }
+
+        public func requestMessageActionCallbackPasswordCheck(messageId: MessageId, isGame: Bool, data: MemoryBuffer?) -> Signal<Never, MessageActionCallbackError> {
+            return _internal_requestMessageActionCallbackPasswordCheck(account: self.account, messageId: messageId, isGame: isGame, data: data)
+        }
+
+        public func requestMessageActionCallback(messageId: MessageId, isGame: Bool, password: String?, data: MemoryBuffer?) -> Signal<MessageActionCallbackResult, MessageActionCallbackError> {
+            return _internal_requestMessageActionCallback(account: self.account, messageId: messageId, isGame: isGame, password: password, data: data)
+        }
+
+        public func requestMessageActionUrlAuth(subject: MessageActionUrlSubject) -> Signal<MessageActionUrlAuthResult, NoError> {
+            _internal_requestMessageActionUrlAuth(account: self.account, subject: subject)
+        }
+
+        public func acceptMessageActionUrlAuth(subject: MessageActionUrlSubject, allowWriteAccess: Bool) -> Signal<MessageActionUrlAuthResult, NoError> {
+            return _internal_acceptMessageActionUrlAuth(account: self.account, subject: subject, allowWriteAccess: allowWriteAccess)
+        }
+
+        public func searchMessages(location: SearchMessagesLocation, query: String, state: SearchMessagesState?, limit: Int32 = 100) -> Signal<(SearchMessagesResult, SearchMessagesState), NoError> {
+            return _internal_searchMessages(account: self.account, location: location, query: query, state: state, limit: limit)
+        }
+
+        public func downloadMessage(messageId: MessageId) -> Signal<Message?, NoError> {
+            return _internal_downloadMessage(postbox: self.account.postbox, network: self.account.network, messageId: messageId)
+        }
+
+        public func searchMessageIdByTimestamp(peerId: PeerId, threadId: Int64?, timestamp: Int32) -> Signal<MessageId?, NoError> {
+            return _internal_searchMessageIdByTimestamp(account: self.account, peerId: peerId, threadId: threadId, timestamp: timestamp)
+        }
+
+        public func deleteMessages(transaction: Transaction, ids: [MessageId], deleteMedia: Bool = true, manualAddMessageThreadStatsDifference: ((MessageId, Int, Int) -> Void)? = nil) {
+            return _internal_deleteMessages(transaction: transaction, mediaBox: self.account.postbox.mediaBox, ids: ids, deleteMedia: deleteMedia, manualAddMessageThreadStatsDifference: manualAddMessageThreadStatsDifference)
+        }
+
+        public func deleteAllMessagesWithAuthor(transaction: Transaction, peerId: PeerId, authorId: PeerId, namespace: MessageId.Namespace) {
+            return _internal_deleteAllMessagesWithAuthor(transaction: transaction, mediaBox: self.account.postbox.mediaBox, peerId: peerId, authorId: authorId, namespace: namespace)
+        }
+
+        public func deleteAllMessagesWithForwardAuthor(transaction: Transaction, peerId: PeerId, forwardAuthorId: PeerId, namespace: MessageId.Namespace) {
+            return _internal_deleteAllMessagesWithForwardAuthor(transaction: transaction, mediaBox: self.account.postbox.mediaBox, peerId: peerId, forwardAuthorId: forwardAuthorId, namespace: namespace)
+        }
+
+        public func clearCallHistory(forEveryone: Bool) -> Signal<Never, ClearCallHistoryError> {
+            return _internal_clearCallHistory(account: self.account, forEveryone: forEveryone)
+        }
+
+        public func deleteMessagesInteractively(messageIds: [MessageId], type: InteractiveMessagesDeletionType, deleteAllInGroup: Bool = false) -> Signal<Void, NoError> {
+            return _internal_deleteMessagesInteractively(account: self.account, messageIds: messageIds, type: type, deleteAllInGroup: deleteAllInGroup)
+        }
+
+        public func clearHistoryInteractively(peerId: PeerId, type: InteractiveHistoryClearingType) -> Signal<Void, NoError> {
+            return _internal_clearHistoryInteractively(postbox: self.account.postbox, peerId: peerId, type: type)
+        }
+
+        public func clearAuthorHistory(peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
+            return _internal_clearAuthorHistory(account: self.account, peerId: peerId, memberId: memberId)
+        }
+
+        public func requestEditMessage(messageId: MessageId, text: String, media: RequestEditMessageMedia, entities: TextEntitiesMessageAttribute? = nil, disableUrlPreview: Bool = false, scheduleTime: Int32? = nil) -> Signal<RequestEditMessageResult, RequestEditMessageError> {
+            return _internal_requestEditMessage(account: self.account, messageId: messageId, text: text, media: media, entities: entities, disableUrlPreview: disableUrlPreview, scheduleTime: scheduleTime)
+        }
+
+        public func requestEditLiveLocation(messageId: MessageId, stop: Bool, coordinate: (latitude: Double, longitude: Double, accuracyRadius: Int32?)?, heading: Int32?, proximityNotificationRadius: Int32?) -> Signal<Void, NoError> {
+            return _internal_requestEditLiveLocation(postbox: self.account.postbox, network: self.account.network, stateManager: self.account.stateManager, messageId: messageId, stop: stop, coordinate: coordinate, heading: heading, proximityNotificationRadius: proximityNotificationRadius)
+        }
+
+        public func addSecretChatMessageScreenshot(peerId: PeerId) -> Signal<Never, NoError> {
+            return _internal_addSecretChatMessageScreenshot(account: self.account, peerId: peerId)
+            |> ignoreValues
+        }
+
+        public func forwardGameWithScore(messageId: MessageId, to peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_forwardGameWithScore(account: self.account, messageId: messageId, to: peerId)
+        }
+
+        public func requestUpdatePinnedMessage(peerId: PeerId, update: PinnedMessageUpdate) -> Signal<Void, UpdatePinnedMessageError> {
+            return _internal_requestUpdatePinnedMessage(account: self.account, peerId: peerId, update: update)
+        }
+
+        public func requestUnpinAllMessages(peerId: PeerId) -> Signal<Never, UpdatePinnedMessageError> {
+            return _internal_requestUnpinAllMessages(account: self.account, peerId: peerId)
+        }
+
+        public func fetchChannelReplyThreadMessage(messageId: MessageId, atMessageId: MessageId?) -> Signal<ChatReplyThreadMessage, FetchChannelReplyThreadMessageError> {
+            return _internal_fetchChannelReplyThreadMessage(account: self.account, messageId: messageId, atMessageId: atMessageId)
+        }
+
+        public func requestStartBot(botPeerId: PeerId, payload: String?) -> Signal<Void, NoError> {
+            return _internal_requestStartBot(account: self.account, botPeerId: botPeerId, payload: payload)
+        }
+
+        public func requestStartBotInGroup(botPeerId: PeerId, groupPeerId: PeerId, payload: String?) -> Signal<StartBotInGroupResult, RequestStartBotInGroupError> {
+            return _internal_requestStartBotInGroup(account: self.account, botPeerId: botPeerId, groupPeerId: groupPeerId, payload: payload)
+        }
+
+        public func markAllChatsAsRead() -> Signal<Void, NoError> {
+            return _internal_markAllChatsAsRead(postbox: self.account.postbox, network: self.account.network, stateManager: self.account.stateManager)
+        }
+
+        public func getMessagesLoadIfNecessary(_ messageIds: [MessageId], strategy: GetMessagesStrategy = .cloud) -> Signal <[Message], NoError> {
+            return _internal_getMessagesLoadIfNecessary(messageIds, postbox: self.account.postbox, network: self.account.network, accountPeerId: self.account.peerId, strategy: strategy)
+        }
+
+        public func markMessageContentAsConsumedInteractively(messageId: MessageId) -> Signal<Void, NoError> {
+            return _internal_markMessageContentAsConsumedInteractively(postbox: self.account.postbox, messageId: messageId)
+        }
+
+        public func installInteractiveReadMessagesAction(peerId: PeerId) -> Disposable {
+            return _internal_installInteractiveReadMessagesAction(postbox: self.account.postbox, stateManager: self.account.stateManager, peerId: peerId)
+        }
+
+        public func requestMessageSelectPollOption(messageId: MessageId, opaqueIdentifiers: [Data]) -> Signal<TelegramMediaPoll?, RequestMessageSelectPollOptionError> {
+            return _internal_requestMessageSelectPollOption(account: self.account, messageId: messageId, opaqueIdentifiers: opaqueIdentifiers)
+        }
+
+        public func requestClosePoll(messageId: MessageId) -> Signal<Void, NoError> {
+            return _internal_requestClosePoll(postbox: self.account.postbox, network: self.account.network, stateManager: self.account.stateManager, messageId: messageId)
+        }
+
+        public func pollResults(messageId: MessageId, poll: TelegramMediaPoll) -> PollResultsContext {
+            return PollResultsContext(account: self.account, messageId: messageId, poll: poll)
+        }
+
+        public func earliestUnseenPersonalMentionMessage(peerId: PeerId) -> Signal<EarliestUnseenPersonalMentionMessageResult, NoError> {
+            return _internal_earliestUnseenPersonalMentionMessage(account: self.account, peerId: peerId)
+        }
+
+        public func exportMessageLink(peerId: PeerId, messageId: MessageId, isThread: Bool = false) -> Signal<String?, NoError> {
+            return _internal_exportMessageLink(account: self.account, peerId: peerId, messageId: messageId, isThread: isThread)
+        }
+
+        public func enqueueOutgoingMessageWithChatContextResult(to peerId: PeerId, results: ChatContextResultCollection, result: ChatContextResult, replyToMessageId: MessageId? = nil, hideVia: Bool = false, silentPosting: Bool = false, scheduleTime: Int32? = nil, correlationId: Int64? = nil) -> Bool {
+            return _internal_enqueueOutgoingMessageWithChatContextResult(account: self.account, to: peerId, results: results, result: result, replyToMessageId: replyToMessageId, hideVia: hideVia, silentPosting: silentPosting, scheduleTime: scheduleTime, correlationId: correlationId)
+        }
+
+        public func requestChatContextResults(botId: PeerId, peerId: PeerId, query: String, location: Signal<(Double, Double)?, NoError> = .single(nil), offset: String, incompleteResults: Bool = false, staleCachedResults: Bool = false) -> Signal<RequestChatContextResultsResult?, RequestChatContextResultsError> {
+            return _internal_requestChatContextResults(account: self.account, botId: botId, peerId: peerId, query: query, location: location, offset: offset, incompleteResults: incompleteResults, staleCachedResults: staleCachedResults)
+        }
+
+        public func removeRecentlyUsedHashtag(string: String) -> Signal<Void, NoError> {
+            return _internal_removeRecentlyUsedHashtag(postbox: self.account.postbox, string: string)
+        }
+
+        public func recentlyUsedHashtags() -> Signal<[String], NoError> {
+            return _internal_recentlyUsedHashtags(postbox: self.account.postbox)
+        }
+
+        public func topPeerActiveLiveLocationMessages(peerId: PeerId) -> Signal<(Peer?, [Message]), NoError> {
+            return _internal_topPeerActiveLiveLocationMessages(viewTracker: self.account.viewTracker, accountPeerId: self.account.peerId, peerId: peerId)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/UpdatePinnedMessage.swift b/submodules/TelegramCore/Sources/TelegramEngine/Messages/UpdatePinnedMessage.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/UpdatePinnedMessage.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Messages/UpdatePinnedMessage.swift
index 869f3ba0c2..f7a140da28 100644
--- a/submodules/TelegramCore/Sources/UpdatePinnedMessage.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Messages/UpdatePinnedMessage.swift
@@ -15,7 +15,7 @@ public enum PinnedMessageUpdate {
     case clear(id: MessageId)
 }
 
-public func requestUpdatePinnedMessage(account: Account, peerId: PeerId, update: PinnedMessageUpdate) -> Signal<Void, UpdatePinnedMessageError> {
+func _internal_requestUpdatePinnedMessage(account: Account, peerId: PeerId, update: PinnedMessageUpdate) -> Signal<Void, UpdatePinnedMessageError> {
     return account.postbox.transaction { transaction -> (Peer?, CachedPeerData?) in
         return (transaction.getPeer(peerId), transaction.getPeerCachedData(peerId: peerId))
     }
@@ -112,7 +112,7 @@ public func requestUpdatePinnedMessage(account: Account, peerId: PeerId, update:
     }
 }
 
-public func requestUnpinAllMessages(account: Account, peerId: PeerId) -> Signal<Never, UpdatePinnedMessageError> {
+func _internal_requestUnpinAllMessages(account: Account, peerId: PeerId) -> Signal<Never, UpdatePinnedMessageError> {
     return account.postbox.transaction { transaction -> (Peer?, CachedPeerData?) in
         return (transaction.getPeer(peerId), transaction.getPeerCachedData(peerId: peerId))
     }
diff --git a/submodules/TelegramCore/Sources/BankCards.swift b/submodules/TelegramCore/Sources/TelegramEngine/Payments/BankCards.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/BankCards.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Payments/BankCards.swift
index b600491d83..f756b95b71 100644
--- a/submodules/TelegramCore/Sources/BankCards.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Payments/BankCards.swift
@@ -5,17 +5,7 @@ import SyncCore
 import MtProtoKit
 import SwiftSignalKit
 
-public struct BankCardUrl {
-    public let title: String
-    public let url: String
-}
-
-public struct BankCardInfo {
-    public let title: String
-    public let urls: [BankCardUrl]
-}
-
-public func getBankCardInfo(account: Account, cardNumber: String) -> Signal<BankCardInfo?, NoError> {
+func _internal_getBankCardInfo(account: Account, cardNumber: String) -> Signal<BankCardInfo?, NoError> {
     return currentWebDocumentsHostDatacenterId(postbox: account.postbox, isTestingEnvironment: false)
     |> mapToSignal { datacenterId in
         let signal: Signal<Api.payments.BankCardData, MTRpcError>
@@ -38,6 +28,16 @@ public func getBankCardInfo(account: Account, cardNumber: String) -> Signal<Bank
     }
 }
 
+public struct BankCardUrl {
+    public let title: String
+    public let url: String
+}
+
+public struct BankCardInfo {
+    public let title: String
+    public let urls: [BankCardUrl]
+}
+
 extension BankCardUrl {
     init(apiBankCardOpenUrl: Api.BankCardOpenUrl) {
         switch apiBankCardOpenUrl {
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Payments/BotPaymentForm.swift b/submodules/TelegramCore/Sources/TelegramEngine/Payments/BotPaymentForm.swift
new file mode 100644
index 0000000000..b5a7c60e04
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Payments/BotPaymentForm.swift
@@ -0,0 +1,561 @@
+import Foundation
+import Postbox
+import MtProtoKit
+import SwiftSignalKit
+import TelegramApi
+
+import SyncCore
+
+public struct BotPaymentInvoiceFields: OptionSet {
+    public var rawValue: Int32
+    
+    public init(rawValue: Int32) {
+        self.rawValue = rawValue
+    }
+    
+    public init() {
+        self.rawValue = 0
+    }
+    
+    public static let name = BotPaymentInvoiceFields(rawValue: 1 << 0)
+    public static let phone = BotPaymentInvoiceFields(rawValue: 1 << 1)
+    public static let email = BotPaymentInvoiceFields(rawValue: 1 << 2)
+    public static let shippingAddress = BotPaymentInvoiceFields(rawValue: 1 << 3)
+    public static let flexibleShipping = BotPaymentInvoiceFields(rawValue: 1 << 4)
+    public static let phoneAvailableToProvider = BotPaymentInvoiceFields(rawValue: 1 << 5)
+    public static let emailAvailableToProvider = BotPaymentInvoiceFields(rawValue: 1 << 6)
+}
+
+public struct BotPaymentPrice : Equatable {
+    public let label: String
+    public let amount: Int64
+    
+    public init(label: String, amount: Int64) {
+        self.label = label
+        self.amount = amount
+    }
+}
+
+public struct BotPaymentInvoice : Equatable {
+    public struct Tip: Equatable {
+        public var max: Int64
+        public var suggested: [Int64]
+    }
+
+    public let isTest: Bool
+    public let requestedFields: BotPaymentInvoiceFields
+    public let currency: String
+    public let prices: [BotPaymentPrice]
+    public let tip: Tip?
+}
+
+public struct BotPaymentNativeProvider : Equatable {
+    public let name: String
+    public let params: String
+}
+
+public struct BotPaymentShippingAddress: Equatable {
+    public let streetLine1: String
+    public let streetLine2: String
+    public let city: String
+    public let state: String
+    public let countryIso2: String
+    public let postCode: String
+    
+    public init(streetLine1: String, streetLine2: String, city: String, state: String, countryIso2: String, postCode: String) {
+        self.streetLine1 = streetLine1
+        self.streetLine2 = streetLine2
+        self.city = city
+        self.state = state
+        self.countryIso2 = countryIso2
+        self.postCode = postCode
+    }
+}
+
+public struct BotPaymentRequestedInfo: Equatable {
+    public var name: String?
+    public var phone: String?
+    public var email: String?
+    public var shippingAddress: BotPaymentShippingAddress?
+    
+    public init(name: String?, phone: String?, email: String?, shippingAddress: BotPaymentShippingAddress?) {
+        self.name = name
+        self.phone = phone
+        self.email = email
+        self.shippingAddress = shippingAddress
+    }
+}
+
+public enum BotPaymentSavedCredentials: Equatable {
+    case card(id: String, title: String)
+    
+    public static func ==(lhs: BotPaymentSavedCredentials, rhs: BotPaymentSavedCredentials) -> Bool {
+        switch lhs {
+            case let .card(id, title):
+                if case .card(id, title) = rhs {
+                    return true
+                } else {
+                    return false
+                }
+        }
+    }
+}
+
+public struct BotPaymentForm : Equatable {
+    public let id: Int64
+    public let canSaveCredentials: Bool
+    public let passwordMissing: Bool
+    public let invoice: BotPaymentInvoice
+    public let paymentBotId: PeerId
+    public let providerId: PeerId
+    public let url: String
+    public let nativeProvider: BotPaymentNativeProvider?
+    public let savedInfo: BotPaymentRequestedInfo?
+    public let savedCredentials: BotPaymentSavedCredentials?
+}
+
+public enum BotPaymentFormRequestError {
+    case generic
+}
+
+extension BotPaymentInvoice {
+    init(apiInvoice: Api.Invoice) {
+        switch apiInvoice {
+            case let .invoice(flags, currency, prices, maxTipAmount, suggestedTipAmounts):
+                var fields = BotPaymentInvoiceFields()
+                if (flags & (1 << 1)) != 0 {
+                    fields.insert(.name)
+                }
+                if (flags & (1 << 2)) != 0 {
+                    fields.insert(.phone)
+                }
+                if (flags & (1 << 3)) != 0 {
+                    fields.insert(.email)
+                }
+                if (flags & (1 << 4)) != 0 {
+                    fields.insert(.shippingAddress)
+                }
+                if (flags & (1 << 5)) != 0 {
+                    fields.insert(.flexibleShipping)
+                }
+                if (flags & (1 << 6)) != 0 {
+                    fields.insert(.phoneAvailableToProvider)
+                }
+                if (flags & (1 << 7)) != 0 {
+                    fields.insert(.emailAvailableToProvider)
+                }
+                var parsedTip: BotPaymentInvoice.Tip?
+                if let maxTipAmount = maxTipAmount, let suggestedTipAmounts = suggestedTipAmounts {
+                    parsedTip = BotPaymentInvoice.Tip(max: maxTipAmount, suggested: suggestedTipAmounts)
+                }
+                self.init(isTest: (flags & (1 << 0)) != 0, requestedFields: fields, currency: currency, prices: prices.map {
+                    switch $0 {
+                        case let .labeledPrice(label, amount):
+                            return BotPaymentPrice(label: label, amount: amount)
+                    }
+                }, tip: parsedTip)
+        }
+    }
+}
+
+extension BotPaymentRequestedInfo {
+    init(apiInfo: Api.PaymentRequestedInfo) {
+        switch apiInfo {
+            case let .paymentRequestedInfo(_, name, phone, email, shippingAddress):
+                var parsedShippingAddress: BotPaymentShippingAddress?
+                if let shippingAddress = shippingAddress {
+                    switch shippingAddress {
+                    case let .postAddress(streetLine1, streetLine2, city, state, countryIso2, postCode):
+                        parsedShippingAddress = BotPaymentShippingAddress(streetLine1: streetLine1, streetLine2: streetLine2, city: city, state: state, countryIso2: countryIso2, postCode: postCode)
+                    }
+                }
+                self.init(name: name, phone: phone, email: email, shippingAddress: parsedShippingAddress)
+        }
+    }
+}
+
+func _internal_fetchBotPaymentForm(postbox: Postbox, network: Network, messageId: MessageId, themeParams: [String: Any]?) -> Signal<BotPaymentForm, BotPaymentFormRequestError> {
+    return postbox.transaction { transaction -> Api.InputPeer? in
+        return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
+    }
+    |> castError(BotPaymentFormRequestError.self)
+    |> mapToSignal { inputPeer -> Signal<BotPaymentForm, BotPaymentFormRequestError> in
+        guard let inputPeer = inputPeer else {
+            return .fail(.generic)
+        }
+        var flags: Int32 = 0
+        var serializedThemeParams: Api.DataJSON?
+        if let themeParams = themeParams, let data = try? JSONSerialization.data(withJSONObject: themeParams, options: []), let dataString = String(data: data, encoding: .utf8) {
+            serializedThemeParams = Api.DataJSON.dataJSON(data: dataString)
+        }
+        if serializedThemeParams != nil {
+            flags |= 1 << 0
+        }
+
+        return network.request(Api.functions.payments.getPaymentForm(flags: flags, peer: inputPeer, msgId: messageId.id, themeParams: serializedThemeParams))
+        |> `catch` { _ -> Signal<Api.payments.PaymentForm, BotPaymentFormRequestError> in
+            return .fail(.generic)
+        }
+        |> mapToSignal { result -> Signal<BotPaymentForm, BotPaymentFormRequestError> in
+            return postbox.transaction { transaction -> BotPaymentForm in
+                switch result {
+                    case let .paymentForm(flags, id, botId, invoice, providerId, url, nativeProvider, nativeParams, savedInfo, savedCredentials, apiUsers):
+                        var peers: [Peer] = []
+                        for user in apiUsers {
+                            let parsed = TelegramUser(user: user)
+                            peers.append(parsed)
+                        }
+                        updatePeers(transaction: transaction, peers: peers, update: { _, updated in
+                            return updated
+                        })
+
+                        let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice)
+                        var parsedNativeProvider: BotPaymentNativeProvider?
+                        if let nativeProvider = nativeProvider, let nativeParams = nativeParams {
+                            switch nativeParams {
+                                case let .dataJSON(data):
+                                parsedNativeProvider = BotPaymentNativeProvider(name: nativeProvider, params: data)
+                            }
+                        }
+                        let parsedSavedInfo = savedInfo.flatMap(BotPaymentRequestedInfo.init)
+                        var parsedSavedCredentials: BotPaymentSavedCredentials?
+                        if let savedCredentials = savedCredentials {
+                            switch savedCredentials {
+                                case let .paymentSavedCredentialsCard(id, title):
+                                    parsedSavedCredentials = .card(id: id, title: title)
+                            }
+                        }
+                        return BotPaymentForm(id: id, canSaveCredentials: (flags & (1 << 2)) != 0, passwordMissing: (flags & (1 << 3)) != 0, invoice: parsedInvoice, paymentBotId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)), providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(providerId)), url: url, nativeProvider: parsedNativeProvider, savedInfo: parsedSavedInfo, savedCredentials: parsedSavedCredentials)
+                }
+            }
+            |> mapError { _ -> BotPaymentFormRequestError in }
+        }
+    }
+}
+
+public enum ValidateBotPaymentFormError {
+    case generic
+    case shippingNotAvailable
+    case addressStateInvalid
+    case addressPostcodeInvalid
+    case addressCityInvalid
+    case nameInvalid
+    case emailInvalid
+    case phoneInvalid
+}
+
+public struct BotPaymentShippingOption : Equatable {
+    public let id: String
+    public let title: String
+    public let prices: [BotPaymentPrice]
+}
+
+public struct BotPaymentValidatedFormInfo : Equatable {
+    public let id: String?
+    public let shippingOptions: [BotPaymentShippingOption]?
+}
+
+extension BotPaymentShippingOption {
+    init(apiOption: Api.ShippingOption) {
+        switch apiOption {
+            case let .shippingOption(id, title, prices):
+                self.init(id: id, title: title, prices: prices.map {
+                    switch $0 {
+                        case let .labeledPrice(label, amount):
+                            return BotPaymentPrice(label: label, amount: amount)
+                        }
+                })
+        }
+    }
+}
+
+func _internal_validateBotPaymentForm(account: Account, saveInfo: Bool, messageId: MessageId, formInfo: BotPaymentRequestedInfo) -> Signal<BotPaymentValidatedFormInfo, ValidateBotPaymentFormError> {
+    return account.postbox.transaction { transaction -> Api.InputPeer? in
+        return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
+    }
+    |> castError(ValidateBotPaymentFormError.self)
+    |> mapToSignal { inputPeer -> Signal<BotPaymentValidatedFormInfo, ValidateBotPaymentFormError> in
+        guard let inputPeer = inputPeer else {
+            return .fail(.generic)
+        }
+
+        var flags: Int32 = 0
+        if saveInfo {
+            flags |= (1 << 0)
+        }
+        var infoFlags: Int32 = 0
+        if let _ = formInfo.name {
+            infoFlags |= (1 << 0)
+        }
+        if let _ = formInfo.phone {
+            infoFlags |= (1 << 1)
+        }
+        if let _ = formInfo.email {
+            infoFlags |= (1 << 2)
+        }
+        var apiShippingAddress: Api.PostAddress?
+        if let address = formInfo.shippingAddress {
+            infoFlags |= (1 << 3)
+            apiShippingAddress = .postAddress(streetLine1: address.streetLine1, streetLine2: address.streetLine2, city: address.city, state: address.state, countryIso2: address.countryIso2, postCode: address.postCode)
+        }
+        return account.network.request(Api.functions.payments.validateRequestedInfo(flags: flags, peer: inputPeer, msgId: messageId.id, info: .paymentRequestedInfo(flags: infoFlags, name: formInfo.name, phone: formInfo.phone, email: formInfo.email, shippingAddress: apiShippingAddress)))
+        |> mapError { error -> ValidateBotPaymentFormError in
+            if error.errorDescription == "SHIPPING_NOT_AVAILABLE" {
+                return .shippingNotAvailable
+            } else if error.errorDescription == "ADDRESS_STATE_INVALID" {
+                return .addressStateInvalid
+            } else if error.errorDescription == "ADDRESS_POSTCODE_INVALID" {
+                return .addressPostcodeInvalid
+            } else if error.errorDescription == "ADDRESS_CITY_INVALID" {
+                return .addressCityInvalid
+            } else if error.errorDescription == "REQ_INFO_NAME_INVALID" {
+                return .nameInvalid
+            } else if error.errorDescription == "REQ_INFO_EMAIL_INVALID" {
+                return .emailInvalid
+            } else if error.errorDescription == "REQ_INFO_PHONE_INVALID" {
+                return .phoneInvalid
+            } else {
+                return .generic
+            }
+        }
+        |> map { result -> BotPaymentValidatedFormInfo in
+            switch result {
+                case let .validatedRequestedInfo(_, id, shippingOptions):
+                    return BotPaymentValidatedFormInfo(id: id, shippingOptions: shippingOptions.flatMap {
+                        return $0.map(BotPaymentShippingOption.init)
+                    })
+            }
+        }
+    }
+}
+
+public enum BotPaymentCredentials {
+    case generic(data: String, saveOnServer: Bool)
+    case saved(id: String, tempPassword: Data)
+    case applePay(data: String)
+}
+
+public enum SendBotPaymentFormError {
+    case generic
+    case precheckoutFailed
+    case paymentFailed
+    case alreadyPaid
+}
+
+public enum SendBotPaymentResult {
+    case done(receiptMessageId: MessageId?)
+    case externalVerificationRequired(url: String)
+}
+
+func _internal_sendBotPaymentForm(account: Account, messageId: MessageId, formId: Int64, validatedInfoId: String?, shippingOptionId: String?, tipAmount: Int64?, credentials: BotPaymentCredentials) -> Signal<SendBotPaymentResult, SendBotPaymentFormError> {
+    return account.postbox.transaction { transaction -> Api.InputPeer? in
+        return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
+    }
+    |> castError(SendBotPaymentFormError.self)
+    |> mapToSignal { inputPeer -> Signal<SendBotPaymentResult, SendBotPaymentFormError> in
+        guard let inputPeer = inputPeer else {
+            return .fail(.generic)
+        }
+
+        let apiCredentials: Api.InputPaymentCredentials
+        switch credentials {
+            case let .generic(data, saveOnServer):
+                var credentialsFlags: Int32 = 0
+                if saveOnServer {
+                    credentialsFlags |= (1 << 0)
+                }
+                apiCredentials = .inputPaymentCredentials(flags: credentialsFlags, data: .dataJSON(data: data))
+            case let .saved(id, tempPassword):
+                apiCredentials = .inputPaymentCredentialsSaved(id: id, tmpPassword: Buffer(data: tempPassword))
+            case let .applePay(data):
+                apiCredentials = .inputPaymentCredentialsApplePay(paymentData: .dataJSON(data: data))
+        }
+        var flags: Int32 = 0
+        if validatedInfoId != nil {
+            flags |= (1 << 0)
+        }
+        if shippingOptionId != nil {
+            flags |= (1 << 1)
+        }
+        if tipAmount != nil {
+            flags |= (1 << 2)
+        }
+        return account.network.request(Api.functions.payments.sendPaymentForm(flags: flags, formId: formId, peer: inputPeer, msgId: messageId.id, requestedInfoId: validatedInfoId, shippingOptionId: shippingOptionId, credentials: apiCredentials, tipAmount: tipAmount))
+        |> map { result -> SendBotPaymentResult in
+            switch result {
+                case let .paymentResult(updates):
+                    account.stateManager.addUpdates(updates)
+                    var receiptMessageId: MessageId?
+                    for apiMessage in updates.messages {
+                        if let message = StoreMessage(apiMessage: apiMessage) {
+                            for media in message.media {
+                                if let action = media as? TelegramMediaAction {
+                                    if case .paymentSent = action.action {
+                                        for attribute in message.attributes {
+                                            if let reply = attribute as? ReplyMessageAttribute {
+                                                if reply.messageId == messageId {
+                                                    if case let .Id(id) = message.id {
+                                                        receiptMessageId = id
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    return .done(receiptMessageId: receiptMessageId)
+                case let .paymentVerificationNeeded(url):
+                    return .externalVerificationRequired(url: url)
+            }
+        }
+        |> `catch` { error -> Signal<SendBotPaymentResult, SendBotPaymentFormError> in
+            if error.errorDescription == "BOT_PRECHECKOUT_FAILED" {
+                return .fail(.precheckoutFailed)
+            } else if error.errorDescription == "PAYMENT_FAILED" {
+                return .fail(.paymentFailed)
+            } else if error.errorDescription == "INVOICE_ALREADY_PAID" {
+                return .fail(.alreadyPaid)
+            }
+            return .fail(.generic)
+        }
+    }
+}
+
+public struct BotPaymentReceipt : Equatable {
+    public let invoice: BotPaymentInvoice
+    public let info: BotPaymentRequestedInfo?
+    public let shippingOption: BotPaymentShippingOption?
+    public let credentialsTitle: String
+    public let invoiceMedia: TelegramMediaInvoice
+    public let tipAmount: Int64?
+    public let botPaymentId: PeerId
+    public static func ==(lhs: BotPaymentReceipt, rhs: BotPaymentReceipt) -> Bool {
+        if lhs.invoice != rhs.invoice {
+            return false
+        }
+        if lhs.info != rhs.info {
+            return false
+        }
+        if lhs.shippingOption != rhs.shippingOption {
+            return false
+        }
+        if lhs.credentialsTitle != rhs.credentialsTitle {
+            return false
+        }
+        if !lhs.invoiceMedia.isEqual(to: rhs.invoiceMedia) {
+            return false
+        }
+        if lhs.tipAmount != rhs.tipAmount {
+            return false
+        }
+        if lhs.botPaymentId != rhs.botPaymentId {
+            return false
+        }
+        return true
+    }
+}
+
+public enum RequestBotPaymentReceiptError {
+    case generic
+}
+
+func _internal_requestBotPaymentReceipt(account: Account, messageId: MessageId) -> Signal<BotPaymentReceipt, RequestBotPaymentReceiptError> {
+    return account.postbox.transaction { transaction -> Api.InputPeer? in
+        return transaction.getPeer(messageId.peerId).flatMap(apiInputPeer)
+    }
+    |> castError(RequestBotPaymentReceiptError.self)
+    |> mapToSignal { inputPeer -> Signal<BotPaymentReceipt, RequestBotPaymentReceiptError> in
+        guard let inputPeer = inputPeer else {
+            return .fail(.generic)
+        }
+
+        return account.network.request(Api.functions.payments.getPaymentReceipt(peer: inputPeer, msgId: messageId.id))
+        |> mapError { _ -> RequestBotPaymentReceiptError in
+            return .generic
+        }
+        |> mapToSignal { result -> Signal<BotPaymentReceipt, RequestBotPaymentReceiptError> in
+            return account.postbox.transaction { transaction -> BotPaymentReceipt in
+                switch result {
+                case let .paymentReceipt(flags, date, botId, providerId, title, description, photo, invoice, info, shipping, tipAmount, currency, totalAmount, credentialsTitle, users):
+                    var peers: [Peer] = []
+                    for user in users {
+                        peers.append(TelegramUser(user: user))
+                    }
+                    updatePeers(transaction: transaction, peers: peers, update: { _, updated in return updated })
+
+                    let parsedInvoice = BotPaymentInvoice(apiInvoice: invoice)
+                    let parsedInfo = info.flatMap(BotPaymentRequestedInfo.init)
+                    let shippingOption = shipping.flatMap(BotPaymentShippingOption.init)
+
+                    /*let fields = BotPaymentInvoiceFields()
+
+                    let form = BotPaymentForm(
+                        id: 0,
+                        canSaveCredentials: false,
+                        passwordMissing: false,
+                        invoice: BotPaymentInvoice(
+                            isTest: false,
+                            requestedFields: fields,
+                            currency: currency,
+                            prices: [],
+                            tip: nil
+                        ),
+                        providerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(providerId)),
+                        url: "",
+                        nativeProvider: nil,
+                        savedInfo: nil,
+                        savedCredentials: nil
+                    )*/
+
+                    let invoiceMedia = TelegramMediaInvoice(
+                        title: title,
+                        description: description,
+                        photo: photo.flatMap(TelegramMediaWebFile.init),
+                        receiptMessageId: nil,
+                        currency: currency,
+                        totalAmount: totalAmount,
+                        startParam: "",
+                        flags: []
+                    )
+                    
+                    let botPaymentId = PeerId.init(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId))
+
+                    return BotPaymentReceipt(invoice: parsedInvoice, info: parsedInfo, shippingOption: shippingOption, credentialsTitle: credentialsTitle, invoiceMedia: invoiceMedia, tipAmount: tipAmount, botPaymentId: botPaymentId)
+                }
+            }
+            |> castError(RequestBotPaymentReceiptError.self)
+        }
+    }
+}
+
+public struct BotPaymentInfo: OptionSet {
+    public var rawValue: Int32
+    
+    public init(rawValue: Int32) {
+        self.rawValue = rawValue
+    }
+    
+    public init() {
+        self.rawValue = 0
+    }
+    
+    public static let paymentInfo = BotPaymentInfo(rawValue: 1 << 0)
+    public static let shippingInfo = BotPaymentInfo(rawValue: 1 << 1)
+}
+
+func _internal_clearBotPaymentInfo(network: Network, info: BotPaymentInfo) -> Signal<Void, NoError> {
+    var flags: Int32 = 0
+    if info.contains(.paymentInfo) {
+        flags |= (1 << 0)
+    }
+    if info.contains(.shippingInfo) {
+        flags |= (1 << 1)
+    }
+    return network.request(Api.functions.payments.clearSavedInfo(flags: flags))
+    |> retryRequest
+    |> mapToSignal { _ -> Signal<Void, NoError> in
+        return .complete()
+    }
+}
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Payments/TelegramEnginePayments.swift b/submodules/TelegramCore/Sources/TelegramEngine/Payments/TelegramEnginePayments.swift
new file mode 100644
index 0000000000..7bde71b986
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Payments/TelegramEnginePayments.swift
@@ -0,0 +1,36 @@
+import SwiftSignalKit
+import Postbox
+
+public extension TelegramEngine {
+    final class Payments {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func getBankCardInfo(cardNumber: String) -> Signal<BankCardInfo?, NoError> {
+            return _internal_getBankCardInfo(account: self.account, cardNumber: cardNumber)
+        }
+
+        public func fetchBotPaymentForm(messageId: MessageId, themeParams: [String: Any]?) -> Signal<BotPaymentForm, BotPaymentFormRequestError> {
+            return _internal_fetchBotPaymentForm(postbox: self.account.postbox, network: self.account.network, messageId: messageId, themeParams: themeParams)
+        }
+
+        public func validateBotPaymentForm(saveInfo: Bool, messageId: MessageId, formInfo: BotPaymentRequestedInfo) -> Signal<BotPaymentValidatedFormInfo, ValidateBotPaymentFormError> {
+            return _internal_validateBotPaymentForm(account: self.account, saveInfo: saveInfo, messageId: messageId, formInfo: formInfo)
+        }
+
+        public func sendBotPaymentForm(messageId: MessageId, formId: Int64, validatedInfoId: String?, shippingOptionId: String?, tipAmount: Int64?, credentials: BotPaymentCredentials) -> Signal<SendBotPaymentResult, SendBotPaymentFormError> {
+            return _internal_sendBotPaymentForm(account: self.account, messageId: messageId, formId: formId, validatedInfoId: validatedInfoId, shippingOptionId: shippingOptionId, tipAmount: tipAmount, credentials: credentials)
+        }
+
+        public func requestBotPaymentReceipt(messageId: MessageId) -> Signal<BotPaymentReceipt, RequestBotPaymentReceiptError> {
+            return _internal_requestBotPaymentReceipt(account: self.account, messageId: messageId)
+        }
+
+        public func clearBotPaymentInfo(info: BotPaymentInfo) -> Signal<Void, NoError> {
+            return _internal_clearBotPaymentInfo(network: self.account.network, info: info)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/AddPeerMember.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/AddPeerMember.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/AddPeerMember.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/AddPeerMember.swift
index 5edaa1c553..fffb6cc578 100644
--- a/submodules/TelegramCore/Sources/AddPeerMember.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/AddPeerMember.swift
@@ -14,11 +14,11 @@ public enum AddGroupMemberError {
     case tooManyChannels
 }
 
-public func addGroupMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, AddGroupMemberError> {
+func _internal_addGroupMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, AddGroupMemberError> {
     return account.postbox.transaction { transaction -> Signal<Void, AddGroupMemberError> in
         if let peer = transaction.getPeer(peerId), let memberPeer = transaction.getPeer(memberId), let inputUser = apiInputUser(memberPeer) {
             if let group = peer as? TelegramGroup {
-                return account.network.request(Api.functions.messages.addChatUser(chatId: group.id.id, userId: inputUser, fwdLimit: 100))
+                return account.network.request(Api.functions.messages.addChatUser(chatId: group.id.id._internalGetInt32Value(), userId: inputUser, fwdLimit: 100))
                 |> mapError { error -> AddGroupMemberError in
                     switch error.errorDescription {
                     case "USERS_TOO_MUCH":
@@ -57,7 +57,7 @@ public func addGroupMember(account: Account, peerId: PeerId, memberId: PeerId) -
                             })
                         }
                     }
-                    |> mapError { _ -> AddGroupMemberError in return .generic }
+                    |> mapError { _ -> AddGroupMemberError in }
                 }
             } else {
                 return .fail(.generic)
@@ -65,7 +65,7 @@ public func addGroupMember(account: Account, peerId: PeerId, memberId: PeerId) -
         } else {
             return .fail(.generic)
         }
-    } |> mapError { _ -> AddGroupMemberError in return .generic } |> switchToLatest
+    } |> mapError { _ -> AddGroupMemberError in } |> switchToLatest
 }
 
 public enum AddChannelMemberError {
@@ -79,10 +79,9 @@ public enum AddChannelMemberError {
     case tooMuchBots
 }
 
-public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), AddChannelMemberError> {
-    return fetchChannelParticipant(account: account, peerId: peerId, participantId: memberId)
+func _internal_addChannelMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), AddChannelMemberError> {
+    return _internal_fetchChannelParticipant(account: account, peerId: peerId, participantId: memberId)
     |> mapError { error -> AddChannelMemberError in
-        return .generic
     }
     |> mapToSignal { currentParticipant -> Signal<(ChannelParticipant?, RenderedChannelParticipant), AddChannelMemberError> in
         return account.postbox.transaction { transaction -> Signal<(ChannelParticipant?, RenderedChannelParticipant), AddChannelMemberError> in
@@ -158,7 +157,7 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId)
                             if let presence = transaction.getPeerPresence(peerId: memberPeer.id) {
                                 presences[memberPeer.id] = presence
                             }
-                            if case let .member(_, _, maybeAdminInfo, maybeBannedInfo, _) = updatedParticipant {
+                            if case let .member(_, _, maybeAdminInfo, _, _) = updatedParticipant {
                                 if let adminInfo = maybeAdminInfo {
                                     if let peer = transaction.getPeer(adminInfo.promotedBy) {
                                         peers[peer.id] = peer
@@ -167,7 +166,7 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId)
                             }
                             return (currentParticipant, RenderedChannelParticipant(participant: updatedParticipant, peer: memberPeer, peers: peers, presences: presences))
                         }
-                        |> mapError { _ -> AddChannelMemberError in return .generic }
+                        |> mapError { _ -> AddChannelMemberError in }
                     }
                 } else {
                     return .fail(.generic)
@@ -176,12 +175,12 @@ public func addChannelMember(account: Account, peerId: PeerId, memberId: PeerId)
                 return .fail(.generic)
             }
         }
-        |> mapError { _ -> AddChannelMemberError in return .generic }
+        |> mapError { _ -> AddChannelMemberError in }
         |> switchToLatest
     }
 }
 
-public func addChannelMembers(account: Account, peerId: PeerId, memberIds: [PeerId]) -> Signal<Void, AddChannelMemberError> {
+func _internal_addChannelMembers(account: Account, peerId: PeerId, memberIds: [PeerId]) -> Signal<Void, AddChannelMemberError> {
     let signal = account.postbox.transaction { transaction -> Signal<Void, AddChannelMemberError> in
         var memberPeerIds: [PeerId:Peer] = [:]
         var inputUsers: [Api.InputUser] = []
diff --git a/submodules/TelegramCore/Sources/AddressNames.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/AddressNames.swift
similarity index 91%
rename from submodules/TelegramCore/Sources/AddressNames.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/AddressNames.swift
index 4f14c18d00..017cd4ba21 100644
--- a/submodules/TelegramCore/Sources/AddressNames.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/AddressNames.swift
@@ -26,7 +26,7 @@ public enum AddressNameDomain {
     case theme(TelegramTheme)
 }
 
-public func checkAddressNameFormat(_ value: String, canEmpty: Bool = false) -> AddressNameFormatError? {
+func _internal_checkAddressNameFormat(_ value: String, canEmpty: Bool = false) -> AddressNameFormatError? {
     var index = 0
     let length = value.count
     for char in value {
@@ -52,7 +52,7 @@ public func checkAddressNameFormat(_ value: String, canEmpty: Bool = false) -> A
     return nil
 }
 
-public func addressNameAvailability(account: Account, domain: AddressNameDomain, name: String) -> Signal<AddressNameAvailability, NoError> {
+func _internal_addressNameAvailability(account: Account, domain: AddressNameDomain, name: String) -> Signal<AddressNameAvailability, NoError> {
     return account.postbox.transaction { transaction -> Signal<AddressNameAvailability, NoError> in
         switch domain {
             case .account:
@@ -120,7 +120,7 @@ public enum UpdateAddressNameError {
     case generic
 }
 
-public func updateAddressName(account: Account, domain: AddressNameDomain, name: String?) -> Signal<Void, UpdateAddressNameError> {
+func _internal_updateAddressName(account: Account, domain: AddressNameDomain, name: String?) -> Signal<Void, UpdateAddressNameError> {
     return account.postbox.transaction { transaction -> Signal<Void, UpdateAddressNameError> in
         switch domain {
             case .account:
@@ -134,7 +134,7 @@ public func updateAddressName(account: Account, domain: AddressNameDomain, name:
                         updatePeers(transaction: transaction, peers: [user], update: { _, updated in
                             return updated
                         })
-                    } |> mapError { _ -> UpdateAddressNameError in return .generic }
+                    } |> mapError { _ -> UpdateAddressNameError in }
                 }
             case let .peer(peerId):
                 if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer) {
@@ -155,7 +155,7 @@ public func updateAddressName(account: Account, domain: AddressNameDomain, name:
                                         })
                                     }
                                 }
-                            } |> mapError { _ -> UpdateAddressNameError in return .generic }
+                            } |> mapError { _ -> UpdateAddressNameError in }
                     }
                 } else {
                     return .fail(.generic)
@@ -170,10 +170,10 @@ public func updateAddressName(account: Account, domain: AddressNameDomain, name:
                     return Void()
                 }
         }
-    } |> mapError { _ -> UpdateAddressNameError in return .generic } |> switchToLatest
+    } |> mapError { _ -> UpdateAddressNameError in } |> switchToLatest
 }
 
-public func checkPublicChannelCreationAvailability(account: Account, location: Bool = false) -> Signal<Bool, NoError> {
+func _internal_checkPublicChannelCreationAvailability(account: Account, location: Bool = false) -> Signal<Bool, NoError> {
     var flags: Int32 = (1 << 1)
     if location {
         flags |= (1 << 0)
@@ -194,7 +194,7 @@ public enum AdminedPublicChannelsScope {
     case forVoiceChat
 }
 
-public func adminedPublicChannels(account: Account, scope: AdminedPublicChannelsScope = .all) -> Signal<[Peer], NoError> {
+func _internal_adminedPublicChannels(account: Account, scope: AdminedPublicChannelsScope = .all) -> Signal<[Peer], NoError> {
     var flags: Int32 = 0
     switch scope {
     case .all:
@@ -238,7 +238,7 @@ public enum ChannelAddressNameAssignmentAvailability {
     case addressNameLimitReached
 }
 
-public func channelAddressNameAssignmentAvailability(account: Account, peerId: PeerId?) -> Signal<ChannelAddressNameAssignmentAvailability, NoError> {
+func _internal_channelAddressNameAssignmentAvailability(account: Account, peerId: PeerId?) -> Signal<ChannelAddressNameAssignmentAvailability, NoError> {
     return account.postbox.transaction { transaction -> Signal<ChannelAddressNameAssignmentAvailability, NoError> in
         var inputChannel: Api.InputChannel?
         if let peerId = peerId {
diff --git a/submodules/TelegramCore/Sources/ChangePeerNotificationSettings.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChangePeerNotificationSettings.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/ChangePeerNotificationSettings.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChangePeerNotificationSettings.swift
index 33df953355..1836f8e221 100644
--- a/submodules/TelegramCore/Sources/ChangePeerNotificationSettings.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChangePeerNotificationSettings.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func togglePeerMuted(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_togglePeerMuted(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         if let peer = transaction.getPeer(peerId) {
             var notificationPeerId = peerId
@@ -39,13 +39,13 @@ public func togglePeerMuted(account: Account, peerId: PeerId) -> Signal<Void, No
     }
 }
 
-public func updatePeerMuteSetting(account: Account, peerId: PeerId, muteInterval: Int32?) -> Signal<Void, NoError> {
+func _internal_updatePeerMuteSetting(account: Account, peerId: PeerId, muteInterval: Int32?) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         updatePeerMuteSetting(transaction: transaction, peerId: peerId, muteInterval: muteInterval)
     }
 }
 
-public func updatePeerMuteSetting(transaction: Transaction, peerId: PeerId, muteInterval: Int32?) {
+func updatePeerMuteSetting(transaction: Transaction, peerId: PeerId, muteInterval: Int32?) {
     if let peer = transaction.getPeer(peerId) {
         var notificationPeerId = peerId
         if let associatedPeerId = peer.associatedPeerId {
@@ -82,13 +82,13 @@ public func updatePeerMuteSetting(transaction: Transaction, peerId: PeerId, mute
     }
 }
 
-public func updatePeerDisplayPreviewsSetting(account: Account, peerId: PeerId, displayPreviews: PeerNotificationDisplayPreviews) -> Signal<Void, NoError> {
+func _internal_updatePeerDisplayPreviewsSetting(account: Account, peerId: PeerId, displayPreviews: PeerNotificationDisplayPreviews) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         updatePeerDisplayPreviewsSetting(transaction: transaction, peerId: peerId, displayPreviews: displayPreviews)
     }
 }
 
-public func updatePeerDisplayPreviewsSetting(transaction: Transaction, peerId: PeerId, displayPreviews: PeerNotificationDisplayPreviews) {
+func updatePeerDisplayPreviewsSetting(transaction: Transaction, peerId: PeerId, displayPreviews: PeerNotificationDisplayPreviews) {
     if let peer = transaction.getPeer(peerId) {
         var notificationPeerId = peerId
         if let associatedPeerId = peer.associatedPeerId {
@@ -108,13 +108,13 @@ public func updatePeerDisplayPreviewsSetting(transaction: Transaction, peerId: P
     }
 }
 
-public func updatePeerNotificationSoundInteractive(account: Account, peerId: PeerId, sound: PeerMessageSound) -> Signal<Void, NoError> {
+func _internal_updatePeerNotificationSoundInteractive(account: Account, peerId: PeerId, sound: PeerMessageSound) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
         updatePeerNotificationSoundInteractive(transaction: transaction, peerId: peerId, sound: sound)
     }
 }
 
-public func updatePeerNotificationSoundInteractive(transaction: Transaction, peerId: PeerId, sound: PeerMessageSound) {
+func updatePeerNotificationSoundInteractive(transaction: Transaction, peerId: PeerId, sound: PeerMessageSound) {
     if let peer = transaction.getPeer(peerId) {
         var notificationPeerId = peerId
         if let associatedPeerId = peer.associatedPeerId {
diff --git a/submodules/TelegramCore/Sources/ChannelAdminEventLogContext.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogContext.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/ChannelAdminEventLogContext.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogContext.swift
index 5a158a671e..5568220adc 100644
--- a/submodules/TelegramCore/Sources/ChannelAdminEventLogContext.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogContext.swift
@@ -96,7 +96,7 @@ public final class ChannelAdminEventLogContext {
     
     private let loadMoreDisposable = MetaDisposable()
     
-    public init(postbox: Postbox, network: Network, peerId: PeerId) {
+    init(postbox: Postbox, network: Network, peerId: PeerId) {
         self.postbox = postbox
         self.network = network
         self.peerId = peerId
diff --git a/submodules/TelegramCore/Sources/ChannelAdminEventLogs.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogs.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/ChannelAdminEventLogs.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogs.swift
index 3a38204a5d..180244ebb2 100644
--- a/submodules/TelegramCore/Sources/ChannelAdminEventLogs.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelAdminEventLogs.swift
@@ -114,7 +114,7 @@ private func boolFromApiValue(_ value: Api.Bool) -> Bool {
     }
 }
 
-public func channelAdminLogEvents(postbox: Postbox, network: Network, peerId: PeerId, maxId: AdminLogEventId, minId: AdminLogEventId, limit: Int32 = 100, query: String? = nil, filter: AdminLogEventsFlags? = nil, admins: [PeerId]? = nil) -> Signal<AdminLogEventsResult, ChannelAdminLogEventError> {
+func channelAdminLogEvents(postbox: Postbox, network: Network, peerId: PeerId, maxId: AdminLogEventId, minId: AdminLogEventId, limit: Int32 = 100, query: String? = nil, filter: AdminLogEventsFlags? = nil, admins: [PeerId]? = nil) -> Signal<AdminLogEventsResult, ChannelAdminLogEventError> {
     return postbox.transaction { transaction -> (Peer?, [Peer]?) in
         return (transaction.getPeer(peerId), admins?.compactMap { transaction.getPeer($0) })
     }
@@ -220,7 +220,7 @@ public func channelAdminLogEvents(postbox: Postbox, network: Network, peerId: Pe
                                             action = .pollStopped(rendered)
                                         }
                                     case let .channelAdminLogEventActionChangeLinkedChat(prevValue, newValue):
-                                        action = .linkedPeerUpdated(previous: prevValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: prevValue)], updated: newValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: newValue)])
+                                        action = .linkedPeerUpdated(previous: prevValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(prevValue))], updated: newValue == 0 ? nil : peers[PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(newValue))])
                                     case let .channelAdminLogEventActionChangeLocation(prevValue, newValue):
                                         action = .changeGeoLocation(previous: PeerGeoLocation(apiLocation: prevValue), updated: PeerGeoLocation(apiLocation: newValue))
                                     case let .channelAdminLogEventActionToggleSlowMode(prevValue, newValue):
@@ -251,7 +251,7 @@ public func channelAdminLogEvents(postbox: Postbox, network: Network, peerId: Pe
                                     case let .channelAdminLogEventActionChangeHistoryTTL(prevValue, newValue):
                                         action = .changeHistoryTTL(previousValue: prevValue, updatedValue: newValue)
                                 }
-                                let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                 if let action = action {
                                     events.append(AdminLogEvent(id: id, peerId: peerId, date: date, action: action))
                                 }
diff --git a/submodules/TelegramCore/Sources/ChannelBlacklist.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelBlacklist.swift
similarity index 60%
rename from submodules/TelegramCore/Sources/ChannelBlacklist.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelBlacklist.swift
index cb735a667d..91bd5c9ef3 100644
--- a/submodules/TelegramCore/Sources/ChannelBlacklist.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelBlacklist.swift
@@ -3,137 +3,13 @@ import Postbox
 import SwiftSignalKit
 import TelegramApi
 import MtProtoKit
-
 import SyncCore
 
-private enum ChannelBlacklistFilter {
-    case restricted
-    case banned
-}
-
-private func fetchChannelBlacklist(account: Account, peerId: PeerId, filter: ChannelBlacklistFilter) -> Signal<[RenderedChannelParticipant], NoError> {
-    return account.postbox.transaction { transaction -> Signal<[RenderedChannelParticipant], NoError> in
-        if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer) {
-            let apiFilter: Api.ChannelParticipantsFilter
-            switch filter {
-                case .restricted:
-                    apiFilter = .channelParticipantsBanned(q: "")
-                case .banned:
-                    apiFilter = .channelParticipantsKicked(q: "")
-            }
-            return account.network.request(Api.functions.channels.getParticipants(channel: inputChannel, filter: apiFilter, offset: 0, limit: 100, hash: 0))
-                |> retryRequest
-                |> map { result -> [RenderedChannelParticipant] in
-                    var items: [RenderedChannelParticipant] = []
-                    switch result {
-                        case let .channelParticipants(_, participants, users):
-                            var peers: [PeerId: Peer] = [:]
-                            var presences:[PeerId: PeerPresence] = [:]
-                            for user in users {
-                                let peer = TelegramUser(user: user)
-                                peers[peer.id] = peer
-                                if let presence = TelegramUserPresence(apiUser: user) {
-                                    presences[peer.id] = presence
-                                }
-                            }
-                            
-                            for participant in CachedChannelParticipants(apiParticipants: participants).participants {
-                                    if let peer = peers[participant.peerId] {
-                                        items.append(RenderedChannelParticipant(participant: participant, peer: peer, peers: peers, presences: presences))
-                                    }
-                                
-                                }
-                        case .channelParticipantsNotModified:
-                            assertionFailure()
-                            break
-                    }
-                    return items
-            }
-        } else {
-            return .single([])
-        }
-    } |> switchToLatest
-}
-
-public struct ChannelBlacklist {
-    public let banned: [RenderedChannelParticipant]
-    public let restricted: [RenderedChannelParticipant]
-    
-    public init(banned: [RenderedChannelParticipant], restricted: [RenderedChannelParticipant]) {
-        self.banned = banned
-        self.restricted = restricted
-    }
-    
-    public var isEmpty: Bool {
-        return banned.isEmpty && restricted.isEmpty
-    }
-    
-    public func withRemovedPeerId(_ memberId:PeerId) -> ChannelBlacklist {
-        var updatedRestricted = restricted
-        var updatedBanned = banned
-
-        for i in 0 ..< updatedBanned.count {
-            if updatedBanned[i].peer.id == memberId {
-                updatedBanned.remove(at: i)
-                break
-            }
-        }
-        for i in 0 ..< updatedRestricted.count {
-            if updatedRestricted[i].peer.id == memberId {
-                updatedRestricted.remove(at: i)
-                break
-            }
-        }
-        return ChannelBlacklist(banned: updatedBanned, restricted: updatedRestricted)
-    }
-    
-    public func withRemovedParticipant(_ participant:RenderedChannelParticipant) -> ChannelBlacklist {
-        let updated = self.withRemovedPeerId(participant.participant.peerId)
-        var updatedRestricted = updated.restricted
-        var updatedBanned = updated.banned
-        
-        if case let .member(_, _, _, maybeBanInfo, _) = participant.participant, let banInfo = maybeBanInfo {
-            if banInfo.rights.flags.contains(.banReadMessages) {
-                updatedBanned.insert(participant, at: 0)
-            } else {
-                if !banInfo.rights.flags.isEmpty {
-                    updatedRestricted.insert(participant, at: 0)
-                }
-            }
-        }
-    
-        
-        return ChannelBlacklist(banned: updatedBanned, restricted: updatedRestricted)
-    }
-}
-
-public func channelBlacklistParticipants(account: Account, peerId: PeerId) -> Signal<ChannelBlacklist, NoError> {
-    return combineLatest(fetchChannelBlacklist(account: account, peerId: peerId, filter: .restricted), fetchChannelBlacklist(account: account, peerId: peerId, filter: .banned))
-        |> map { restricted, banned in
-            var r: [RenderedChannelParticipant] = []
-            var b: [RenderedChannelParticipant] = []
-            var peerIds = Set<PeerId>()
-            for participant in restricted {
-                if !peerIds.contains(participant.peer.id) {
-                    peerIds.insert(participant.peer.id)
-                    r.append(participant)
-                }
-            }
-            for participant in banned {
-                if !peerIds.contains(participant.peer.id) {
-                    peerIds.insert(participant.peer.id)
-                    b.append(participant)
-                }
-            }
-            return ChannelBlacklist(banned: b, restricted: r)
-        }
-}
-
-public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, memberId: PeerId, rights: TelegramChatBannedRights?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> {
-    return fetchChannelParticipant(account: account, peerId: peerId, participantId: memberId)
+func _internal_updateChannelMemberBannedRights(account: Account, peerId: PeerId, memberId: PeerId, rights: TelegramChatBannedRights?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> {
+    return _internal_fetchChannelParticipant(account: account, peerId: peerId, participantId: memberId)
     |> mapToSignal { currentParticipant -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> in
         return account.postbox.transaction { transaction -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> in
-            if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer), let _ = transaction.getPeer(account.peerId), let memberPeer = transaction.getPeer(memberId), let inputUser = apiInputUser(memberPeer) {
+            if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer), let _ = transaction.getPeer(account.peerId), let memberPeer = transaction.getPeer(memberId), let inputPeer = apiInputPeer(memberPeer) {
                 let updatedParticipant: ChannelParticipant
                 if let currentParticipant = currentParticipant, case let .member(_, invitedAt, _, currentBanInfo, _) = currentParticipant {
                     let banInfo: ChannelParticipantBannedInfo?
@@ -152,8 +28,15 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me
                     }
                     updatedParticipant = ChannelParticipant.member(id: memberId, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: nil, banInfo: banInfo, rank: nil)
                 }
+
+                let apiRights: Api.ChatBannedRights
+                if let rights = rights, !rights.flags.isEmpty {
+                    apiRights = rights.apiBannedRights
+                } else {
+                    apiRights = .chatBannedRights(flags: 0, untilDate: 0)
+                }
                 
-                return account.network.request(Api.functions.channels.editBanned(channel: inputChannel, userId: inputUser, bannedRights: rights?.apiBannedRights ?? Api.ChatBannedRights.chatBannedRights(flags: 0, untilDate: 0)))
+                return account.network.request(Api.functions.channels.editBanned(channel: inputChannel, participant: inputPeer, bannedRights: apiRights))
                 |> retryRequest
                 |> mapToSignal { result -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> in
                     account.stateManager.addUpdates(result)
@@ -251,7 +134,7 @@ public func updateChannelMemberBannedRights(account: Account, peerId: PeerId, me
     }
 }
 
-public func updateDefaultChannelMemberBannedRights(account: Account, peerId: PeerId, rights: TelegramChatBannedRights) -> Signal<Never, NoError> {
+func _internal_updateDefaultChannelMemberBannedRights(account: Account, peerId: PeerId, rights: TelegramChatBannedRights) -> Signal<Never, NoError> {
     return account.postbox.transaction { transaction -> Signal<Never, NoError> in
         guard let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer), let _ = transaction.getPeer(account.peerId) else {
             return .complete()
diff --git a/submodules/TelegramCore/Sources/ChannelCreation.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelCreation.swift
similarity index 89%
rename from submodules/TelegramCore/Sources/ChannelCreation.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelCreation.swift
index 9066882f6d..afb9dfcbe6 100644
--- a/submodules/TelegramCore/Sources/ChannelCreation.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelCreation.swift
@@ -71,11 +71,11 @@ private func createChannel(account: Account, title: String, description: String?
     |> switchToLatest
 }
 
-public func createChannel(account: Account, title: String, description: String?) -> Signal<PeerId, CreateChannelError> {
+func _internal_createChannel(account: Account, title: String, description: String?) -> Signal<PeerId, CreateChannelError> {
     return createChannel(account: account, title: title, description: description, isSupergroup: false)
 }
 
-public func createSupergroup(account: Account, title: String, description: String?, location: (latitude: Double, longitude: Double, address: String)? = nil, isForHistoryImport: Bool = false) -> Signal<PeerId, CreateChannelError> {
+func _internal_createSupergroup(account: Account, title: String, description: String?, location: (latitude: Double, longitude: Double, address: String)? = nil, isForHistoryImport: Bool = false) -> Signal<PeerId, CreateChannelError> {
     return createChannel(account: account, title: title, description: description, isSupergroup: true, location: location, isForHistoryImport: isForHistoryImport)
 }
 
@@ -83,7 +83,7 @@ public enum DeleteChannelError {
     case generic
 }
 
-public func deleteChannel(account: Account, peerId: PeerId) -> Signal<Void, DeleteChannelError> {
+func _internal_deleteChannel(account: Account, peerId: PeerId) -> Signal<Void, DeleteChannelError> {
     return account.postbox.transaction { transaction -> Api.InputChannel? in
         return transaction.getPeer(peerId).flatMap(apiInputChannel)
     }
diff --git a/submodules/TelegramCore/Sources/ChannelHistoryAvailabilitySettings.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelHistoryAvailabilitySettings.swift
similarity index 88%
rename from submodules/TelegramCore/Sources/ChannelHistoryAvailabilitySettings.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelHistoryAvailabilitySettings.swift
index 3d05721897..dd66a2d550 100644
--- a/submodules/TelegramCore/Sources/ChannelHistoryAvailabilitySettings.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelHistoryAvailabilitySettings.swift
@@ -9,7 +9,7 @@ public enum ChannelHistoryAvailabilityError {
     case hasNotPermissions
 }
 
-public func updateChannelHistoryAvailabilitySettingsInteractively(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, peerId: PeerId, historyAvailableForNewMembers: Bool) -> Signal<Void, ChannelHistoryAvailabilityError> {
+func _internal_updateChannelHistoryAvailabilitySettingsInteractively(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, peerId: PeerId, historyAvailableForNewMembers: Bool) -> Signal<Void, ChannelHistoryAvailabilityError> {
     return postbox.transaction { transaction -> Peer? in
         return transaction.getPeer(peerId)
     }
diff --git a/submodules/TelegramCore/Sources/ChannelMembers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelMembers.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/ChannelMembers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelMembers.swift
index 2fe9cbed67..bcfee6c545 100644
--- a/submodules/TelegramCore/Sources/ChannelMembers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelMembers.swift
@@ -21,7 +21,7 @@ public enum ChannelMembersCategory {
     case mentions(threadId: MessageId?, filter: ChannelMembersCategoryFilter)
 }
 
-public func channelMembers(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, category: ChannelMembersCategory = .recent(.all), offset: Int32 = 0, limit: Int32 = 64, hash: Int32 = 0) -> Signal<[RenderedChannelParticipant]?, NoError> {
+func _internal_channelMembers(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, category: ChannelMembersCategory = .recent(.all), offset: Int32 = 0, limit: Int32 = 64, hash: Int32 = 0) -> Signal<[RenderedChannelParticipant]?, NoError> {
     return postbox.transaction { transaction -> Signal<[RenderedChannelParticipant]?, NoError> in
         if let peer = transaction.getPeer(peerId), let inputChannel = apiInputChannel(peer) {
             let apiFilter: Api.ChannelParticipantsFilter
@@ -83,7 +83,7 @@ public func channelMembers(postbox: Postbox, network: Network, accountPeerId: Pe
                     return postbox.transaction { transaction -> [RenderedChannelParticipant]? in
                         var items: [RenderedChannelParticipant] = []
                         switch result {
-                            case let .channelParticipants(_, participants, users):
+                            case let .channelParticipants(_, participants, chats, users):
                                 var peers: [PeerId: Peer] = [:]
                                 var presences: [PeerId: PeerPresence] = [:]
                                 for user in users {
@@ -93,6 +93,11 @@ public func channelMembers(postbox: Postbox, network: Network, accountPeerId: Pe
                                         presences[peer.id] = presence
                                     }
                                 }
+                                for chat in chats {
+                                    if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) {
+                                        peers[groupOrChannel.id] = groupOrChannel
+                                    }
+                                }
                                 updatePeers(transaction: transaction, peers: Array(peers.values), update: { _, updated in
                                     return updated
                                 })
diff --git a/submodules/TelegramCore/Sources/ChannelOwnershipTransfer.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelOwnershipTransfer.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/ChannelOwnershipTransfer.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelOwnershipTransfer.swift
index 976766c460..8d57c103a8 100644
--- a/submodules/TelegramCore/Sources/ChannelOwnershipTransfer.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelOwnershipTransfer.swift
@@ -21,7 +21,7 @@ public enum ChannelOwnershipTransferError {
     case userBlocked
 }
 
-public func checkOwnershipTranfserAvailability(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, memberId: PeerId) -> Signal<Never, ChannelOwnershipTransferError> {
+func _internal_checkOwnershipTranfserAvailability(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, memberId: PeerId) -> Signal<Never, ChannelOwnershipTransferError> {
     return postbox.transaction { transaction -> Peer? in
         return transaction.getPeer(memberId)
     }
@@ -72,12 +72,12 @@ public func checkOwnershipTranfserAvailability(postbox: Postbox, network: Networ
     }
 }
 
-public func updateChannelOwnership(account: Account, accountStateManager: AccountStateManager, channelId: PeerId, memberId: PeerId, password: String) -> Signal<[(ChannelParticipant?, RenderedChannelParticipant)], ChannelOwnershipTransferError> {
+func _internal_updateChannelOwnership(account: Account, accountStateManager: AccountStateManager, channelId: PeerId, memberId: PeerId, password: String) -> Signal<[(ChannelParticipant?, RenderedChannelParticipant)], ChannelOwnershipTransferError> {
     guard !password.isEmpty else {
         return .fail(.invalidPassword)
     }
     
-    return combineLatest(fetchChannelParticipant(account: account, peerId: channelId, participantId: account.peerId), fetchChannelParticipant(account: account, peerId: channelId, participantId: memberId))
+    return combineLatest(_internal_fetchChannelParticipant(account: account, peerId: channelId, participantId: account.peerId), _internal_fetchChannelParticipant(account: account, peerId: channelId, participantId: memberId))
     |> mapError { error -> ChannelOwnershipTransferError in
         return .generic
     }
@@ -95,7 +95,7 @@ public func updateChannelOwnership(account: Account, accountStateManager: Accoun
                 let updatedParticipant = ChannelParticipant.creator(id: user.id, adminInfo: nil, rank: currentParticipant?.rank)
                 let updatedPreviousCreator = ChannelParticipant.member(id: accountUser.id, invitedAt: Int32(Date().timeIntervalSince1970), adminInfo: ChannelParticipantAdminInfo(rights: TelegramChatAdminRights(rights: flags), promotedBy: accountUser.id, canBeEditedByAccountPeer: false), banInfo: nil, rank: currentCreator?.rank)
                 
-                let checkPassword = twoStepAuthData(account.network)
+                let checkPassword = _internal_twoStepAuthData(account.network)
                 |> mapError { error -> ChannelOwnershipTransferError in
                     if error.errorDescription.hasPrefix("FLOOD_WAIT") {
                         return .limitExceeded
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelParticipants.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelParticipants.swift
new file mode 100644
index 0000000000..6f975acb71
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChannelParticipants.swift
@@ -0,0 +1,25 @@
+import Foundation
+import Postbox
+import SwiftSignalKit
+import TelegramApi
+import MtProtoKit
+
+import SyncCore
+
+public struct RenderedChannelParticipant: Equatable {
+    public let participant: ChannelParticipant
+    public let peer: Peer
+    public let peers: [PeerId: Peer]
+    public let presences: [PeerId: PeerPresence]
+    
+    public init(participant: ChannelParticipant, peer: Peer, peers: [PeerId: Peer] = [:], presences: [PeerId: PeerPresence] = [:]) {
+        self.participant = participant
+        self.peer = peer
+        self.peers = peers
+        self.presences = presences
+    }
+    
+    public static func ==(lhs: RenderedChannelParticipant, rhs: RenderedChannelParticipant) -> Bool {
+        return lhs.participant == rhs.participant && lhs.peer.isEqual(rhs.peer)
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ChatListFiltering.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatListFiltering.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/ChatListFiltering.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatListFiltering.swift
index 363bf5e38b..d94bb2b995 100644
--- a/submodules/TelegramCore/Sources/ChatListFiltering.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatListFiltering.swift
@@ -298,22 +298,22 @@ extension ChatListFilter {
                     includePeers: ChatListFilterIncludePeers(rawPeers: includePeers.compactMap { peer -> PeerId? in
                         switch peer {
                         case let .inputPeerUser(userId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                         case let .inputPeerChat(chatId):
-                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         case let .inputPeerChannel(channelId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         default:
                             return nil
                         }
                     }, rawPinnedPeers: pinnedPeers.compactMap { peer -> PeerId? in
                         switch peer {
                         case let .inputPeerUser(userId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                         case let .inputPeerChat(chatId):
-                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         case let .inputPeerChannel(channelId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         default:
                             return nil
                         }
@@ -321,11 +321,11 @@ extension ChatListFilter {
                     excludePeers: excludePeers.compactMap { peer -> PeerId? in
                         switch peer {
                         case let .inputPeerUser(userId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                            return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                         case let .inputPeerChat(chatId):
-                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                            return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         case let .inputPeerChannel(channelId, _):
-                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                            return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         default:
                             return nil
                         }
@@ -367,7 +367,7 @@ public enum RequestUpdateChatListFilterError {
     case generic
 }
 
-public func requestUpdateChatListFilter(postbox: Postbox, network: Network, id: Int32, filter: ChatListFilter?) -> Signal<Never, RequestUpdateChatListFilterError> {
+func _internal_requestUpdateChatListFilter(postbox: Postbox, network: Network, id: Int32, filter: ChatListFilter?) -> Signal<Never, RequestUpdateChatListFilterError> {
     return postbox.transaction { transaction -> Api.DialogFilter? in
         return filter?.apiFilter(transaction: transaction)
     }
@@ -391,7 +391,7 @@ public enum RequestUpdateChatListFilterOrderError {
     case generic
 }
 
-public func requestUpdateChatListFilterOrder(account: Account, ids: [Int32]) -> Signal<Never, RequestUpdateChatListFilterOrderError> {
+func _internal_requestUpdateChatListFilterOrder(account: Account, ids: [Int32]) -> Signal<Never, RequestUpdateChatListFilterOrderError> {
     return account.network.request(Api.functions.messages.updateDialogFiltersOrder(order: ids))
     |> mapError { _ -> RequestUpdateChatListFilterOrderError in
         return .generic
@@ -426,11 +426,11 @@ private func requestChatListFilters(accountPeerId: PeerId, postbox: Postbox, net
                         var peerId: PeerId?
                         switch peer {
                         case let .inputPeerUser(userId, _):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                         case let .inputPeerChat(chatId):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         case let .inputPeerChannel(channelId, _):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         default:
                             break
                         }
@@ -446,11 +446,11 @@ private func requestChatListFilters(accountPeerId: PeerId, postbox: Postbox, net
                         var peerId: PeerId?
                         switch peer {
                         case let .inputPeerUser(userId, _):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                         case let .inputPeerChat(chatId):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                         case let .inputPeerChannel(channelId, _):
-                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                         default:
                             break
                         }
@@ -781,7 +781,7 @@ struct ChatListFiltersState: PreferencesEntry, Equatable {
     }
 }
 
-public func generateNewChatListFilterId(filters: [ChatListFilter]) -> Int32 {
+func _internal_generateNewChatListFilterId(filters: [ChatListFilter]) -> Int32 {
     while true {
         let id = Int32(2 + arc4random_uniform(255 - 2))
         if !filters.contains(where: { $0.id == id }) {
@@ -790,7 +790,7 @@ public func generateNewChatListFilterId(filters: [ChatListFilter]) -> Int32 {
     }
 }
 
-public func updateChatListFiltersInteractively(postbox: Postbox, _ f: @escaping ([ChatListFilter]) -> [ChatListFilter]) -> Signal<[ChatListFilter], NoError> {
+func _internal_updateChatListFiltersInteractively(postbox: Postbox, _ f: @escaping ([ChatListFilter]) -> [ChatListFilter]) -> Signal<[ChatListFilter], NoError> {
     return postbox.transaction { transaction -> [ChatListFilter] in
         var updated: [ChatListFilter] = []
         var hasUpdates = false
@@ -811,7 +811,7 @@ public func updateChatListFiltersInteractively(postbox: Postbox, _ f: @escaping
     }
 }
 
-public func updateChatListFiltersInteractively(transaction: Transaction, _ f: ([ChatListFilter]) -> [ChatListFilter]) {
+func _internal_updateChatListFiltersInteractively(transaction: Transaction, _ f: ([ChatListFilter]) -> [ChatListFilter]) {
     var hasUpdates = false
     transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFilters, { entry in
         var state = entry as? ChatListFiltersState ?? ChatListFiltersState.default
@@ -828,7 +828,7 @@ public func updateChatListFiltersInteractively(transaction: Transaction, _ f: ([
 }
 
 
-public func updatedChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
+func _internal_updatedChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
     return postbox.preferencesView(keys: [PreferencesKeys.chatListFilters])
     |> map { preferences -> [ChatListFilter] in
         let filtersState = preferences.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default
@@ -837,7 +837,7 @@ public func updatedChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter],
     |> distinctUntilChanged
 }
 
-public func updatedChatListFiltersInfo(postbox: Postbox) -> Signal<(filters: [ChatListFilter], synchronized: Bool), NoError> {
+func _internal_updatedChatListFiltersInfo(postbox: Postbox) -> Signal<(filters: [ChatListFilter], synchronized: Bool), NoError> {
     return postbox.preferencesView(keys: [PreferencesKeys.chatListFilters])
     |> map { preferences -> (filters: [ChatListFilter], synchronized: Bool) in
         let filtersState = preferences.values[PreferencesKeys.chatListFilters] as? ChatListFiltersState ?? ChatListFiltersState.default
@@ -854,7 +854,7 @@ public func updatedChatListFiltersInfo(postbox: Postbox) -> Signal<(filters: [Ch
     })
 }
 
-public func currentChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
+func _internal_currentChatListFilters(postbox: Postbox) -> Signal<[ChatListFilter], NoError> {
     return postbox.transaction { transaction -> [ChatListFilter] in
         let settings = transaction.getPreferencesEntry(key: PreferencesKeys.chatListFilters) as? ChatListFiltersState ?? ChatListFiltersState.default
         return settings.filters
@@ -941,7 +941,7 @@ public struct ChatListFiltersFeaturedState: PreferencesEntry, Equatable {
     }
 }
 
-public func markChatListFeaturedFiltersAsSeen(postbox: Postbox) -> Signal<Never, NoError> {
+func _internal_markChatListFeaturedFiltersAsSeen(postbox: Postbox) -> Signal<Never, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState, { entry in
             guard var state = entry as? ChatListFiltersFeaturedState else {
@@ -954,7 +954,7 @@ public func markChatListFeaturedFiltersAsSeen(postbox: Postbox) -> Signal<Never,
     |> ignoreValues
 }
 
-public func unmarkChatListFeaturedFiltersAsSeen(transaction: Transaction) {
+func _internal_unmarkChatListFeaturedFiltersAsSeen(transaction: Transaction) {
     transaction.updatePreferencesEntry(key: PreferencesKeys.chatListFiltersFeaturedState, { entry in
         guard var state = entry as? ChatListFiltersFeaturedState else {
             return entry
@@ -964,7 +964,7 @@ public func unmarkChatListFeaturedFiltersAsSeen(transaction: Transaction) {
     })
 }
 
-public func updateChatListFeaturedFilters(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
+func _internal_updateChatListFeaturedFilters(postbox: Postbox, network: Network) -> Signal<Never, NoError> {
     return network.request(Api.functions.messages.getSuggestedDialogFilters())
     |> `catch` { _ -> Signal<[Api.DialogFilterSuggested], NoError> in
         return .single([])
@@ -1092,7 +1092,7 @@ private func withTakenOperation(postbox: Postbox, peerId: PeerId, tag: PeerOpera
 
 func requestChatListFiltersSync(transaction: Transaction) {
     let tag: PeerOperationLogTag = OperationLogTags.SynchronizeChatListFilters
-    let peerId = PeerId(namespace: 0, id: 0)
+    let peerId = PeerId(0)
     
     var topOperation: (SynchronizeChatListFiltersOperation, Int32)?
     transaction.operationLogEnumerateEntries(peerId: peerId, tag: tag, { entry in
@@ -1111,7 +1111,7 @@ func requestChatListFiltersSync(transaction: Transaction) {
 
 func managedChatListFilters(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
     return Signal { _ in
-        let updateFeaturedDisposable = updateChatListFeaturedFilters(postbox: postbox, network: network).start()
+        let updateFeaturedDisposable = _internal_updateChatListFeaturedFilters(postbox: postbox, network: network).start()
         let _ = postbox.transaction({ transaction in
             requestChatListFiltersSync(transaction: transaction)
         }).start()
@@ -1218,7 +1218,7 @@ private func synchronizeChatListFilters(transaction: Transaction, accountPeerId:
                 if !mergedFilterIds.contains(where: { $0 == filter.id }) {
                     deleteSignals = deleteSignals
                     |> then(
-                        requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: nil)
+                        _internal_requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: nil)
                         |> `catch` { _ -> Signal<Never, NoError> in
                             return .complete()
                         }
@@ -1238,7 +1238,7 @@ private func synchronizeChatListFilters(transaction: Transaction, accountPeerId:
                 if updated {
                     addSignals = addSignals
                     |> then(
-                        requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: filter)
+                        _internal_requestUpdateChatListFilter(postbox: postbox, network: network, id: filter.id, filter: filter)
                         |> `catch` { _ -> Signal<Never, NoError> in
                             return .complete()
                         }
diff --git a/submodules/TelegramCore/Sources/ChatOnlineMembers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatOnlineMembers.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/ChatOnlineMembers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatOnlineMembers.swift
index 6be97c6046..aeb9e8593e 100644
--- a/submodules/TelegramCore/Sources/ChatOnlineMembers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ChatOnlineMembers.swift
@@ -3,7 +3,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramApi
 
-public func chatOnlineMembers(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<Int32, NoError> {
+func _internal_chatOnlineMembers(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<Int32, NoError> {
     return postbox.transaction { transaction -> Api.InputPeer? in
         return transaction.getPeer(peerId).flatMap(apiInputPeer)
     }
diff --git a/submodules/TelegramCore/Sources/CheckPeerChatServiceActions.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CheckPeerChatServiceActions.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/CheckPeerChatServiceActions.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/CheckPeerChatServiceActions.swift
index d72f1b809a..01b5acd4ce 100644
--- a/submodules/TelegramCore/Sources/CheckPeerChatServiceActions.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CheckPeerChatServiceActions.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func checkPeerChatServiceActions(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_checkPeerChatServiceActions(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.applyMarkUnread(peerId: peerId, namespace: Namespaces.Message.SecretIncoming, value: false, interactive: true)
         
diff --git a/submodules/TelegramCore/Sources/ConvertGroupToSupergroup.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ConvertGroupToSupergroup.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/ConvertGroupToSupergroup.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ConvertGroupToSupergroup.swift
index a91862c0d2..2edaf4434c 100644
--- a/submodules/TelegramCore/Sources/ConvertGroupToSupergroup.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ConvertGroupToSupergroup.swift
@@ -9,8 +9,8 @@ public enum ConvertGroupToSupergroupError {
     case tooManyChannels
 }
 
-public func convertGroupToSupergroup(account: Account, peerId: PeerId) -> Signal<PeerId, ConvertGroupToSupergroupError> {
-    return account.network.request(Api.functions.messages.migrateChat(chatId: peerId.id))
+func _internal_convertGroupToSupergroup(account: Account, peerId: PeerId) -> Signal<PeerId, ConvertGroupToSupergroupError> {
+    return account.network.request(Api.functions.messages.migrateChat(chatId: peerId.id._internalGetInt32Value()))
     |> mapError { error -> ConvertGroupToSupergroupError in
         if error.errorDescription == "CHANNELS_TOO_MUCH" {
             return .tooManyChannels
diff --git a/submodules/TelegramCore/Sources/CreateGroup.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateGroup.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/CreateGroup.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateGroup.swift
index ec68df3240..4245f6cb52 100644
--- a/submodules/TelegramCore/Sources/CreateGroup.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateGroup.swift
@@ -13,7 +13,7 @@ public enum CreateGroupError {
     case serverProvided(String)
 }
 
-public func createGroup(account: Account, title: String, peerIds: [PeerId]) -> Signal<PeerId?, CreateGroupError> {
+func _internal_createGroup(account: Account, title: String, peerIds: [PeerId]) -> Signal<PeerId?, CreateGroupError> {
     return account.postbox.transaction { transaction -> Signal<PeerId?, CreateGroupError> in
         var inputUsers: [Api.InputUser] = []
         for peerId in peerIds {
diff --git a/submodules/TelegramCore/Sources/CreateSecretChat.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateSecretChat.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/CreateSecretChat.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateSecretChat.swift
index 9ce1c2b48b..7d57209fb7 100644
--- a/submodules/TelegramCore/Sources/CreateSecretChat.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/CreateSecretChat.swift
@@ -9,7 +9,7 @@ public enum CreateSecretChatError {
     case limitExceeded
 }
 
-public func createSecretChat(account: Account, peerId: PeerId) -> Signal<PeerId, CreateSecretChatError> {
+func _internal_createSecretChat(account: Account, peerId: PeerId) -> Signal<PeerId, CreateSecretChatError> {
     return account.postbox.transaction { transaction -> Signal<PeerId, CreateSecretChatError> in
         if let peer = transaction.getPeer(peerId), let inputUser = apiInputUser(peer) {
             return validatedEncryptionConfig(postbox: account.postbox, network: account.network)
diff --git a/submodules/TelegramCore/Sources/FindChannelById.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/FindChannelById.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/FindChannelById.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/FindChannelById.swift
index ec269da970..9d288f6278 100644
--- a/submodules/TelegramCore/Sources/FindChannelById.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/FindChannelById.swift
@@ -3,7 +3,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramApi
 
-public func findChannelById(postbox: Postbox, network: Network, channelId: Int32) -> Signal<Peer?, NoError> {
+func _internal_findChannelById(postbox: Postbox, network: Network, channelId: Int32) -> Signal<Peer?, NoError> {
     return network.request(Api.functions.channels.getChannels(id: [.inputChannel(channelId: channelId, accessHash: 0)]))
     |> map(Optional.init)
     |> `catch` { _ -> Signal<Api.messages.Chats?, NoError> in
diff --git a/submodules/TelegramCore/Sources/GroupsInCommon.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/GroupsInCommon.swift
similarity index 78%
rename from submodules/TelegramCore/Sources/GroupsInCommon.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/GroupsInCommon.swift
index 85e72c3aac..9fad743857 100644
--- a/submodules/TelegramCore/Sources/GroupsInCommon.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/GroupsInCommon.swift
@@ -58,7 +58,7 @@ private final class GroupsInCommonContextImpl {
                 guard let inputUser = inputUser else {
                     return .single(([], 0))
                 }
-                return network.request(Api.functions.messages.getCommonChats(userId: inputUser, maxId: maxId ?? 0, limit: limit))
+                return network.request(Api.functions.messages.getCommonChats(userId: inputUser, maxId: maxId?._internalGetInt32Value() ?? 0, limit: limit))
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<Api.messages.Chats?, NoError> in
                     return .single(nil)
@@ -154,36 +154,3 @@ public final class GroupsInCommonContext {
         }
     }
 }
-
-public func groupsInCommon(account: Account, peerId: PeerId) -> Signal<[Peer], NoError> {
-    return account.postbox.transaction { transaction -> Signal<[Peer], NoError> in
-        if let peer = transaction.getPeer(peerId), let inputUser = apiInputUser(peer) {
-            return account.network.request(Api.functions.messages.getCommonChats(userId: inputUser, maxId: 0, limit: 100))
-            |> retryRequest
-            |> mapToSignal {  result -> Signal<[Peer], NoError> in
-                let chats: [Api.Chat]
-                switch result {
-                    case let .chats(chats: apiChats):
-                        chats = apiChats
-                    case let .chatsSlice(count: _, chats: apiChats):
-                        chats = apiChats
-                }
-                
-                return account.postbox.transaction { transaction -> [Peer] in
-                    var peers: [Peer] = []
-                    for chat in chats {
-                        if let peer = parseTelegramGroupOrChannel(chat: chat) {
-                            peers.append(peer)
-                        }
-                    }
-                    updatePeers(transaction: transaction, peers: peers, update: { _, updated -> Peer? in
-                        return updated
-                    })
-                    return peers
-                }
-            }
-        } else {
-            return .single([])
-        }
-    } |> switchToLatest
-}
diff --git a/submodules/TelegramCore/Sources/InactiveChannels.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InactiveChannels.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/InactiveChannels.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/InactiveChannels.swift
index 9d36592941..718fd44925 100644
--- a/submodules/TelegramCore/Sources/InactiveChannels.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InactiveChannels.swift
@@ -19,7 +19,7 @@ public struct InactiveChannel : Equatable {
     }
 }
 
-public func inactiveChannelList(network: Network) -> Signal<[InactiveChannel], NoError> {
+func _internal_inactiveChannelList(network: Network) -> Signal<[InactiveChannel], NoError> {
     return network.request(Api.functions.channels.getInactiveChannels())
     |> retryRequest
     |> map { result in
diff --git a/submodules/TelegramCore/Sources/InvitationLinks.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/InvitationLinks.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift
index d5d048ddaf..840afb6ce2 100644
--- a/submodules/TelegramCore/Sources/InvitationLinks.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/InvitationLinks.swift
@@ -3,11 +3,9 @@ import Postbox
 import SwiftSignalKit
 import TelegramApi
 import MtProtoKit
-
 import SyncCore
 
-
-public func revokePersistentPeerExportedInvitation(account: Account, peerId: PeerId) -> Signal<ExportedInvitation?, NoError> {
+func _internal_revokePersistentPeerExportedInvitation(account: Account, peerId: PeerId) -> Signal<ExportedInvitation?, NoError> {
     return account.postbox.transaction { transaction -> Signal<ExportedInvitation?, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             let flags: Int32 = (1 << 2)
@@ -58,7 +56,7 @@ public enum CreatePeerExportedInvitationError {
     case generic
 }
 
-public func createPeerExportedInvitation(account: Account, peerId: PeerId, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, CreatePeerExportedInvitationError> {
+func _internal_createPeerExportedInvitation(account: Account, peerId: PeerId, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, CreatePeerExportedInvitationError> {
     return account.postbox.transaction { transaction -> Signal<ExportedInvitation?, CreatePeerExportedInvitationError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             var flags: Int32 = 0
@@ -85,7 +83,7 @@ public enum EditPeerExportedInvitationError {
     case generic
 }
 
-public func editPeerExportedInvitation(account: Account, peerId: PeerId, link: String, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, EditPeerExportedInvitationError> {
+func _internal_editPeerExportedInvitation(account: Account, peerId: PeerId, link: String, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, EditPeerExportedInvitationError> {
     return account.postbox.transaction { transaction -> Signal<ExportedInvitation?, EditPeerExportedInvitationError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             var flags: Int32 = 0
@@ -131,7 +129,7 @@ public enum RevokeExportedInvitationResult {
     case replace(ExportedInvitation, ExportedInvitation)
 }
 
-public func revokePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<RevokeExportedInvitationResult?, RevokePeerExportedInvitationError> {
+func _internal_revokePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<RevokeExportedInvitationResult?, RevokePeerExportedInvitationError> {
     return account.postbox.transaction { transaction -> Signal<RevokeExportedInvitationResult?, RevokePeerExportedInvitationError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             let flags: Int32 = (1 << 2)
@@ -197,7 +195,7 @@ public struct ExportedInvitations : Equatable {
     public let totalCount: Int32
 }
 
-public func peerExportedInvitations(account: Account, peerId: PeerId, revoked: Bool, adminId: PeerId? = nil, offsetLink: ExportedInvitation? = nil) -> Signal<ExportedInvitations?, NoError> {
+func _internal_peerExportedInvitations(account: Account, peerId: PeerId, revoked: Bool, adminId: PeerId? = nil, offsetLink: ExportedInvitation? = nil) -> Signal<ExportedInvitations?, NoError> {
     return account.postbox.transaction { transaction -> Signal<ExportedInvitations?, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer), let adminPeer = transaction.getPeer(adminId ?? account.peerId), let adminId = apiInputUser(adminPeer) {
             var flags: Int32 = 0
@@ -244,7 +242,7 @@ public enum DeletePeerExportedInvitationError {
     case generic
 }
 
-public func deletePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<Never, DeletePeerExportedInvitationError> {
+func _internal_deletePeerExportedInvitation(account: Account, peerId: PeerId, link: String) -> Signal<Never, DeletePeerExportedInvitationError> {
     return account.postbox.transaction { transaction -> Signal<Never, DeletePeerExportedInvitationError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             return account.network.request(Api.functions.messages.deleteExportedChatInvite(peer: inputPeer, link: link))
@@ -258,7 +256,7 @@ public func deletePeerExportedInvitation(account: Account, peerId: PeerId, link:
     |> switchToLatest
 }
 
-public func deleteAllRevokedPeerExportedInvitations(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Never, NoError> {
+func _internal_deleteAllRevokedPeerExportedInvitations(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Never, NoError> {
     return account.postbox.transaction { transaction -> Signal<Never, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer), let adminPeer = transaction.getPeer(adminId), let inputAdminId = apiInputUser(adminPeer) {
             return account.network.request(Api.functions.messages.deleteRevokedExportedChatInvites(peer: inputPeer, adminId: inputAdminId))
@@ -304,7 +302,7 @@ final class CachedPeerExportedInvitations: PostboxCoding {
     let canLoadMore: Bool
     let count: Int32
     
-    public static func key(peerId: PeerId, revoked: Bool) -> ValueBoxKey {
+    static func key(peerId: PeerId, revoked: Bool) -> ValueBoxKey {
         let key = ValueBoxKey(length: 8 + 4)
         key.setInt64(0, value: peerId.toInt64())
         key.setInt32(8, value: revoked ? 1 : 0)
@@ -317,13 +315,13 @@ final class CachedPeerExportedInvitations: PostboxCoding {
         self.count = count
     }
     
-    public init(decoder: PostboxDecoder) {
+    init(decoder: PostboxDecoder) {
         self.invitations = decoder.decodeObjectArrayForKey("invitations")
         self.canLoadMore = decoder.decodeBoolForKey("canLoadMore", orElse: false)
         self.count = decoder.decodeInt32ForKey("count", orElse: 0)
     }
     
-    public func encode(_ encoder: PostboxEncoder) {
+    func encode(_ encoder: PostboxEncoder) {
         encoder.encodeObjectArray(self.invitations, forKey: "invitations")
         encoder.encodeBool(self.canLoadMore, forKey: "canLoadMore")
         encoder.encodeInt32(self.count, forKey: "count")
@@ -494,7 +492,7 @@ private final class PeerExportedInvitationsContextImpl {
         self.updateState()
     }
     
-    public func add(_ invite: ExportedInvitation) {
+    func add(_ invite: ExportedInvitation) {
         var results = self.results
         results.removeAll(where: { $0.link == invite.link})
         results.insert(invite, at: 0)
@@ -503,7 +501,7 @@ private final class PeerExportedInvitationsContextImpl {
         self.updateCache()
     }
     
-    public func update(_ invite: ExportedInvitation) {
+    func update(_ invite: ExportedInvitation) {
         var results = self.results
         if let index = self.results.firstIndex(where: { $0.link == invite.link }) {
             results[index] = invite
@@ -513,7 +511,7 @@ private final class PeerExportedInvitationsContextImpl {
         self.updateCache()
     }
     
-    public func remove(_ invite: ExportedInvitation) {
+    func remove(_ invite: ExportedInvitation) {
         var results = self.results
         results.removeAll(where: { $0.link == invite.link})
         self.results = results
@@ -521,7 +519,7 @@ private final class PeerExportedInvitationsContextImpl {
         self.updateCache()
     }
     
-    public func clear() {
+    func clear() {
         self.results = []
         self.count = 0
         self.updateState()
@@ -564,7 +562,7 @@ public final class PeerExportedInvitationsContext {
         }
     }
     
-    public init(account: Account, peerId: PeerId, adminId: PeerId?, revoked: Bool, forceUpdate: Bool) {
+    init(account: Account, peerId: PeerId, adminId: PeerId?, revoked: Bool, forceUpdate: Bool) {
         let queue = self.queue
         self.impl = QueueLocalObject(queue: queue, generate: {
             return PeerExportedInvitationsContextImpl(queue: queue, account: account, peerId: peerId, adminId: adminId, revoked: revoked, forceUpdate: forceUpdate)
@@ -629,7 +627,7 @@ final class CachedPeerInvitationImporters: PostboxCoding {
     let dates: [PeerId: Int32]
     let count: Int32
     
-    public static func key(peerId: PeerId, link: String) -> ValueBoxKey {
+    static func key(peerId: PeerId, link: String) -> ValueBoxKey {
         let key = ValueBoxKey(length: 8 + 4)
         key.setInt64(0, value: peerId.toInt64())
         key.setInt32(8, value: Int32(HashFunctions.murMurHash32(link)))
@@ -644,13 +642,13 @@ final class CachedPeerInvitationImporters: PostboxCoding {
         self.count = count
     }
     
-    public init(peerIds: [PeerId], dates: [PeerId: Int32], count: Int32) {
+    init(peerIds: [PeerId], dates: [PeerId: Int32], count: Int32) {
         self.peerIds = peerIds
         self.dates = dates
         self.count = count
     }
     
-    public init(decoder: PostboxDecoder) {
+    init(decoder: PostboxDecoder) {
         self.peerIds = decoder.decodeInt64ArrayForKey("peerIds").map(PeerId.init)
         
         var dates: [PeerId: Int32] = [:]
@@ -658,7 +656,7 @@ final class CachedPeerInvitationImporters: PostboxCoding {
         for index in stride(from: 0, to: datesArray.endIndex, by: 2) {
             let userId = datesArray[index]
             let date = datesArray[index + 1]
-            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+            let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
             dates[peerId] = date
         }
         self.dates = dates
@@ -666,12 +664,12 @@ final class CachedPeerInvitationImporters: PostboxCoding {
         self.count = decoder.decodeInt32ForKey("count", orElse: 0)
     }
     
-    public func encode(_ encoder: PostboxEncoder) {
+    func encode(_ encoder: PostboxEncoder) {
         encoder.encodeInt64Array(self.peerIds.map { $0.toInt64() }, forKey: "peerIds")
         
         var dates: [Int32] = []
         for (peerId, date) in self.dates {
-            dates.append(peerId.id)
+            dates.append(peerId.id._internalGetInt32Value())
             dates.append(date)
         }
         encoder.encodeInt32Array(dates, forKey: "dates")
@@ -791,7 +789,7 @@ private final class PeerInvitationImportersContextImpl {
                                 let date: Int32
                                 switch importer {
                                     case let .chatInviteImporter(userId, dateValue):
-                                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                         date = dateValue
                                 }
                                 if let peer = transaction.getPeer(peerId) {
@@ -859,7 +857,7 @@ public final class PeerInvitationImportersContext {
         }
     }
     
-    public init(account: Account, peerId: PeerId, invite: ExportedInvitation) {
+    init(account: Account, peerId: PeerId, invite: ExportedInvitation) {
         let queue = self.queue
         self.impl = QueueLocalObject(queue: queue, generate: {
             return PeerInvitationImportersContextImpl(queue: queue, account: account, peerId: peerId, invite: invite)
@@ -879,7 +877,7 @@ public struct ExportedInvitationCreator : Equatable {
     public let revokedCount: Int32
 }
 
-public func peerExportedInvitationsCreators(account: Account, peerId: PeerId) -> Signal<[ExportedInvitationCreator], NoError> {
+func _internal_peerExportedInvitationsCreators(account: Account, peerId: PeerId) -> Signal<[ExportedInvitationCreator], NoError> {
     return account.postbox.transaction { transaction -> Signal<[ExportedInvitationCreator], NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             var isCreator = false
@@ -911,7 +909,7 @@ public func peerExportedInvitationsCreators(account: Account, peerId: PeerId) ->
                             for admin in admins {
                                 switch admin {
                                 case let .chatAdminWithInvites(adminId, invitesCount, revokedInvitesCount):
-                                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: adminId)
+                                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(adminId))
                                     if let peer = peersMap[peerId], peerId != account.peerId {
                                         creators.append(ExportedInvitationCreator(peer: RenderedPeer(peer: peer), count: invitesCount, revokedCount: revokedInvitesCount))
                                     }
diff --git a/submodules/TelegramCore/Sources/JoinChannel.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinChannel.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/JoinChannel.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinChannel.swift
index 579ec090bf..88d2950e9f 100644
--- a/submodules/TelegramCore/Sources/JoinChannel.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinChannel.swift
@@ -12,7 +12,7 @@ public enum JoinChannelError {
     case tooMuchUsers
 }
 
-public func joinChannel(account: Account, peerId: PeerId, hash: String?) -> Signal<RenderedChannelParticipant?, JoinChannelError> {
+func _internal_joinChannel(account: Account, peerId: PeerId, hash: String?) -> Signal<RenderedChannelParticipant?, JoinChannelError> {
     return account.postbox.loadedPeerWithId(peerId)
     |> take(1)
     |> castError(JoinChannelError.self)
@@ -38,7 +38,7 @@ public func joinChannel(account: Account, peerId: PeerId, hash: String?) -> Sign
             |> mapToSignal { updates -> Signal<RenderedChannelParticipant?, JoinChannelError> in
                 account.stateManager.addUpdates(updates)
                 
-                return account.network.request(Api.functions.channels.getParticipant(channel: inputChannel, userId: .inputUserSelf))
+                return account.network.request(Api.functions.channels.getParticipant(channel: inputChannel, participant: .inputPeerSelf))
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<Api.channels.ChannelParticipant?, JoinChannelError> in
                     return .single(nil)
@@ -59,7 +59,7 @@ public func joinChannel(account: Account, peerId: PeerId, hash: String?) -> Sign
                         }
                         let updatedParticipant: ChannelParticipant
                         switch result {
-                            case let .channelParticipant(participant, _):
+                            case let .channelParticipant(participant, _, _):
                                 updatedParticipant = ChannelParticipant(apiParticipant: participant)
                         }
                         if case let .member(_, _, maybeAdminInfo, _, _) = updatedParticipant {
diff --git a/submodules/TelegramCore/Sources/JoinLink.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinLink.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/JoinLink.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinLink.swift
index cd8fbc8486..fccad10f9c 100644
--- a/submodules/TelegramCore/Sources/JoinLink.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/JoinLink.swift
@@ -29,7 +29,7 @@ public enum ExternalJoiningChatState {
     case peek(PeerId, Int32)
 }
 
-public func joinChatInteractively(with hash: String, account: Account) -> Signal <PeerId?, JoinLinkError> {
+func _internal_joinChatInteractively(with hash: String, account: Account) -> Signal <PeerId?, JoinLinkError> {
     return account.network.request(Api.functions.messages.importChatInvite(hash: hash))
     |> mapError { error -> JoinLinkError in
         switch error.errorDescription {
@@ -59,7 +59,7 @@ public func joinChatInteractively(with hash: String, account: Account) -> Signal
     }
 }
 
-public func joinLinkInformation(_ hash: String, account: Account) -> Signal<ExternalJoiningChatState, NoError> {
+func _internal_joinLinkInformation(_ hash: String, account: Account) -> Signal<ExternalJoiningChatState, NoError> {
     return account.network.request(Api.functions.messages.checkChatInvite(hash: hash))
     |> map(Optional.init)
     |> `catch` { _ -> Signal<Api.ChatInvite?, NoError> in
diff --git a/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ManageChannelDiscussionGroup.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ManageChannelDiscussionGroup.swift
index e8fc694411..db0cd8f7d0 100644
--- a/submodules/TelegramCore/Sources/ManageChannelDiscussionGroup.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ManageChannelDiscussionGroup.swift
@@ -9,7 +9,7 @@ public enum AvailableChannelDiscussionGroupError {
     case generic
 }
 
-public func availableGroupsForChannelDiscussion(postbox: Postbox, network: Network) -> Signal<[Peer], AvailableChannelDiscussionGroupError> {
+func _internal_availableGroupsForChannelDiscussion(postbox: Postbox, network: Network) -> Signal<[Peer], AvailableChannelDiscussionGroupError> {
     return network.request(Api.functions.channels.getGroupsForDiscussion())
     |> mapError { error in
         return .generic
@@ -39,7 +39,7 @@ public enum ChannelDiscussionGroupError {
     case tooManyChannels
 }
 
-public func updateGroupDiscussionForChannel(network: Network, postbox: Postbox, channelId: PeerId?, groupId: PeerId?) -> Signal<Bool, ChannelDiscussionGroupError> {
+func _internal_updateGroupDiscussionForChannel(network: Network, postbox: Postbox, channelId: PeerId?, groupId: PeerId?) -> Signal<Bool, ChannelDiscussionGroupError> {
     return postbox.transaction { transaction -> (channel: Peer?, group: Peer?) in
         return (channel: channelId.flatMap(transaction.getPeer), group: groupId.flatMap(transaction.getPeer))
     }
diff --git a/submodules/TelegramCore/Sources/NotificationExceptionsList.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/NotificationExceptionsList.swift
similarity index 89%
rename from submodules/TelegramCore/Sources/NotificationExceptionsList.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/NotificationExceptionsList.swift
index e5fb3f8934..1c43e7a60f 100644
--- a/submodules/TelegramCore/Sources/NotificationExceptionsList.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/NotificationExceptionsList.swift
@@ -19,7 +19,7 @@ public final class NotificationExceptionsList: Equatable {
     }
 }
 
-public func notificationExceptionsList(postbox: Postbox, network: Network) -> Signal<NotificationExceptionsList, NoError> {
+func _internal_notificationExceptionsList(postbox: Postbox, network: Network) -> Signal<NotificationExceptionsList, NoError> {
     return network.request(Api.functions.account.getNotifyExceptions(flags: 1 << 1, peer: nil))
     |> retryRequest
     |> mapToSignal { result -> Signal<NotificationExceptionsList, NoError> in
@@ -49,11 +49,11 @@ public func notificationExceptionsList(postbox: Postbox, network: Network) -> Si
                             let peerId: PeerId
                             switch notifyPeer {
                             case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                             case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(chatId))
                             case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId))
                             }
                             settings[peerId] = TelegramPeerNotificationSettings(apiSettings: notifySettings)
                         default:
diff --git a/submodules/TelegramCore/Sources/PeerAdmins.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerAdmins.swift
similarity index 91%
rename from submodules/TelegramCore/Sources/PeerAdmins.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerAdmins.swift
index f259e0b50f..9a8eea7fdf 100644
--- a/submodules/TelegramCore/Sources/PeerAdmins.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerAdmins.swift
@@ -10,11 +10,11 @@ public enum RemoveGroupAdminError {
     case generic
 }
 
-public func removeGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Void, RemoveGroupAdminError> {
+func _internal_removeGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Void, RemoveGroupAdminError> {
     return account.postbox.transaction { transaction -> Signal<Void, RemoveGroupAdminError> in
         if let peer = transaction.getPeer(peerId), let adminPeer = transaction.getPeer(adminId), let inputUser = apiInputUser(adminPeer) {
             if let group = peer as? TelegramGroup {
-                return account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id, userId: inputUser, isAdmin: .boolFalse))
+                return account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id._internalGetInt32Value(), userId: inputUser, isAdmin: .boolFalse))
                     |> mapError { _ -> RemoveGroupAdminError in return .generic }
                     |> mapToSignal { result -> Signal<Void, RemoveGroupAdminError> in
                         return account.postbox.transaction { transaction -> Void in
@@ -58,14 +58,14 @@ public enum AddGroupAdminError {
     case adminsTooMuch
 }
 
-public func addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Void, AddGroupAdminError> {
+func _internal_addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) -> Signal<Void, AddGroupAdminError> {
     return account.postbox.transaction { transaction -> Signal<Void, AddGroupAdminError> in
         if let peer = transaction.getPeer(peerId), let adminPeer = transaction.getPeer(adminId), let inputUser = apiInputUser(adminPeer) {
             if let group = peer as? TelegramGroup {
-                return account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id, userId: inputUser, isAdmin: .boolTrue))
+                return account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id._internalGetInt32Value(), userId: inputUser, isAdmin: .boolTrue))
                 |> `catch` { error -> Signal<Api.Bool, AddGroupAdminError> in
                     if error.errorDescription == "USER_NOT_PARTICIPANT" {
-                        return addGroupMember(account: account, peerId: peerId, memberId: adminId)
+                        return _internal_addGroupMember(account: account, peerId: peerId, memberId: adminId)
                         |> mapError { error -> AddGroupAdminError in
                             return .addMemberError(error)
                         }
@@ -73,7 +73,7 @@ public func addGroupAdmin(account: Account, peerId: PeerId, adminId: PeerId) ->
                             return .complete()
                         }
                         |> then(
-                            account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id, userId: inputUser, isAdmin: .boolTrue))
+                            account.network.request(Api.functions.messages.editChatAdmin(chatId: group.id.id._internalGetInt32Value(), userId: inputUser, isAdmin: .boolTrue))
                             |> mapError { error -> AddGroupAdminError in
                                 return .generic
                             }
@@ -127,14 +127,14 @@ public enum UpdateChannelAdminRightsError {
     case adminsTooMuch
 }
 
-public func fetchChannelParticipant(account: Account, peerId: PeerId, participantId: PeerId) -> Signal<ChannelParticipant?, NoError> {
+func _internal_fetchChannelParticipant(account: Account, peerId: PeerId, participantId: PeerId) -> Signal<ChannelParticipant?, NoError> {
     return account.postbox.transaction { transaction -> Signal<ChannelParticipant?, NoError> in
-        if let peer = transaction.getPeer(peerId), let adminPeer = transaction.getPeer(participantId), let inputUser = apiInputUser(adminPeer) {
+        if let peer = transaction.getPeer(peerId), let adminPeer = transaction.getPeer(participantId), let inputPeer = apiInputPeer(adminPeer) {
             if let channel = peer as? TelegramChannel, let inputChannel = apiInputChannel(channel) {
-                return account.network.request(Api.functions.channels.getParticipant(channel: inputChannel, userId: inputUser))
+                return account.network.request(Api.functions.channels.getParticipant(channel: inputChannel, participant: inputPeer))
                 |> map { result -> ChannelParticipant? in
                     switch result {
-                        case let .channelParticipant(participant, _):
+                        case let .channelParticipant(participant, _, _):
                             return ChannelParticipant(apiParticipant: participant)
                     }
                 }
@@ -150,8 +150,8 @@ public func fetchChannelParticipant(account: Account, peerId: PeerId, participan
     } |> switchToLatest
 }
 
-public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId: PeerId, rights: TelegramChatAdminRights?, rank: String?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> {
-    return fetchChannelParticipant(account: account, peerId: peerId, participantId: adminId)
+func _internal_updateChannelAdminRights(account: Account, peerId: PeerId, adminId: PeerId, rights: TelegramChatAdminRights?, rank: String?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> {
+    return _internal_fetchChannelParticipant(account: account, peerId: peerId, participantId: adminId)
     |> mapError { error -> UpdateChannelAdminRightsError in
     }
     |> mapToSignal { currentParticipant -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> in
@@ -188,7 +188,7 @@ public func updateChannelAdminRights(account: Account, peerId: PeerId, adminId:
                     |> map { [$0] }
                     |> `catch` { error -> Signal<[Api.Updates], UpdateChannelAdminRightsError> in
                         if error.errorDescription == "USER_NOT_PARTICIPANT" {
-                            return addChannelMember(account: account, peerId: peerId, memberId: adminId)
+                            return _internal_addChannelMember(account: account, peerId: peerId, memberId: adminId)
                             |> map { _ -> [Api.Updates] in
                                 return []
                             }
diff --git a/submodules/TelegramCore/Sources/PeerCommands.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerCommands.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/PeerCommands.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerCommands.swift
index 3f6686ae98..f4be8281bd 100644
--- a/submodules/TelegramCore/Sources/PeerCommands.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerCommands.swift
@@ -26,7 +26,7 @@ public struct PeerCommands: Equatable {
     }
 }
 
-public func peerCommands(account: Account, id: PeerId) -> Signal<PeerCommands, NoError> {
+func _internal_peerCommands(account: Account, id: PeerId) -> Signal<PeerCommands, NoError> {
     return account.postbox.peerView(id: id) |> map { view -> PeerCommands in
         if let cachedUserData = view.cachedData as? CachedUserData {
             if let botInfo = cachedUserData.botInfo {
@@ -39,8 +39,7 @@ public func peerCommands(account: Account, id: PeerId) -> Signal<PeerCommands, N
                 }
             }
             return PeerCommands(commands: [])
-        }
-        else if let cachedGroupData = view.cachedData as? CachedGroupData {
+        } else if let cachedGroupData = view.cachedData as? CachedGroupData {
             var commands: [PeerCommand] = []
             for cachedBotInfo in cachedGroupData.botInfos {
                 if let botPeer = view.peers[cachedBotInfo.peerId] {
diff --git a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerPhotoUpdater.swift
similarity index 81%
rename from submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerPhotoUpdater.swift
index 32325fe91c..8a2a04e011 100644
--- a/submodules/TelegramCore/Sources/PeerPhotoUpdater.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerPhotoUpdater.swift
@@ -15,8 +15,8 @@ public enum UploadPeerPhotoError {
     case generic
 }
 
-public func updateAccountPhoto(account: Account, resource: MediaResource?, videoResource: MediaResource?, videoStartTimestamp: Double?, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
-    return updatePeerPhoto(postbox: account.postbox, network: account.network, stateManager: account.stateManager, accountPeerId: account.peerId, peerId: account.peerId, photo: resource.flatMap({ uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: $0) }), video: videoResource.flatMap({ uploadedPeerVideo(postbox: account.postbox, network: account.network, messageMediaPreuploadManager: account.messageMediaPreuploadManager, resource: $0) |> map(Optional.init) }), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
+func _internal_updateAccountPhoto(account: Account, resource: MediaResource?, videoResource: MediaResource?, videoStartTimestamp: Double?, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
+    return _internal_updatePeerPhoto(postbox: account.postbox, network: account.network, stateManager: account.stateManager, accountPeerId: account.peerId, peerId: account.peerId, photo: resource.flatMap({ _internal_uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: $0) }), video: videoResource.flatMap({ _internal_uploadedPeerVideo(postbox: account.postbox, network: account.network, messageMediaPreuploadManager: account.messageMediaPreuploadManager, resource: $0) |> map(Optional.init) }), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
 }
 
 public struct UploadedPeerPhotoData {
@@ -37,7 +37,7 @@ enum UploadedPeerPhotoDataContent {
     case error
 }
 
-public func uploadedPeerPhoto(postbox: Postbox, network: Network, resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
+func _internal_uploadedPeerPhoto(postbox: Postbox, network: Network, resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
     return multipartUpload(network: network, postbox: postbox, source: .resource(.standalone(resource: resource)), encrypt: false, tag: TelegramMediaResourceFetchTag(statsCategory: .image), hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: false)
     |> map { result -> UploadedPeerPhotoData in
         return UploadedPeerPhotoData(resource: resource, content: .result(result))
@@ -47,7 +47,7 @@ public func uploadedPeerPhoto(postbox: Postbox, network: Network, resource: Medi
     }
 }
 
-public func uploadedPeerVideo(postbox: Postbox, network: Network, messageMediaPreuploadManager: MessageMediaPreuploadManager?, resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
+func _internal_uploadedPeerVideo(postbox: Postbox, network: Network, messageMediaPreuploadManager: MessageMediaPreuploadManager?, resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
     if let messageMediaPreuploadManager = messageMediaPreuploadManager {
         return messageMediaPreuploadManager.upload(network: network, postbox: postbox, source: .resource(.standalone(resource: resource)), encrypt: false, tag: TelegramMediaResourceFetchTag(statsCategory: .video), hintFileSize: nil, hintFileIsLarge: false)
         |> map { result -> UploadedPeerPhotoData in
@@ -67,11 +67,11 @@ public func uploadedPeerVideo(postbox: Postbox, network: Network, messageMediaPr
     }
 }
 
-public func updatePeerPhoto(postbox: Postbox, network: Network, stateManager: AccountStateManager?, accountPeerId: PeerId, peerId: PeerId, photo: Signal<UploadedPeerPhotoData, NoError>?, video: Signal<UploadedPeerPhotoData?, NoError>? = nil, videoStartTimestamp: Double? = nil, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
-    return updatePeerPhotoInternal(postbox: postbox, network: network, stateManager: stateManager, accountPeerId: accountPeerId, peer: postbox.loadedPeerWithId(peerId), photo: photo, video: video, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
+func _internal_updatePeerPhoto(postbox: Postbox, network: Network, stateManager: AccountStateManager?, accountPeerId: PeerId, peerId: PeerId, photo: Signal<UploadedPeerPhotoData, NoError>?, video: Signal<UploadedPeerPhotoData?, NoError>? = nil, videoStartTimestamp: Double? = nil, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
+    return _internal_updatePeerPhotoInternal(postbox: postbox, network: network, stateManager: stateManager, accountPeerId: accountPeerId, peer: postbox.loadedPeerWithId(peerId), photo: photo, video: video, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
 }
     
-public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateManager: AccountStateManager?, accountPeerId: PeerId, peer: Signal<Peer, NoError>, photo: Signal<UploadedPeerPhotoData, NoError>?, video: Signal<UploadedPeerPhotoData?, NoError>?, videoStartTimestamp: Double?, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
+func _internal_updatePeerPhotoInternal(postbox: Postbox, network: Network, stateManager: AccountStateManager?, accountPeerId: PeerId, peer: Signal<Peer, NoError>, photo: Signal<UploadedPeerPhotoData, NoError>?, video: Signal<UploadedPeerPhotoData?, NoError>?, videoStartTimestamp: Double?, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
     return peer
     |> mapError { _ in return .generic }
     |> mapToSignal { peer -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> in
@@ -158,16 +158,10 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
                                                     }
                                                     for size in sizes {
                                                         switch size {
-                                                            case let .photoSize(_, location, w, h, _):
-                                                                switch location {
-                                                                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                                                                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: w <= 200 ? .small : .fullSize, volumeId: volumeId, localId: localId), progressiveSizes: []))
-                                                                }
-                                                            case let .photoSizeProgressive(_, location, w, h, sizes):
-                                                                switch location {
-                                                                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                                                                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudPeerPhotoSizeMediaResource(datacenterId: dcId, sizeSpec: w <= 200 ? .small : .fullSize, volumeId: volumeId, localId: localId), progressiveSizes: sizes))
-                                                                }
+                                                            case let .photoSize(_, w, h, _):
+                                                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: id, sizeSpec: w <= 200 ? .small : .fullSize, volumeId: nil, localId: nil), progressiveSizes: [], immediateThumbnailData: nil))
+                                                            case let .photoSizeProgressive(_, w, h, sizes):
+                                                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: CloudPeerPhotoSizeMediaResource(datacenterId: dcId, photoId: id, sizeSpec: w <= 200 ? .small : .fullSize, volumeId: nil, localId: nil), progressiveSizes: sizes, immediateThumbnailData: nil))
                                                             default:
                                                                 break
                                                         }
@@ -176,12 +170,9 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
                                                     if let videoSizes = videoSizes {
                                                         for size in videoSizes {
                                                             switch size {
-                                                                case let .videoSize(_, type, location, w, h, size, videoStartTs):
+                                                                case let .videoSize(_, type, w, h, size, videoStartTs):
                                                                     let resource: TelegramMediaResource
-                                                                    switch location {
-                                                                        case let .fileLocationToBeDeprecated(volumeId, localId):
-                                                                            resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: Int(size), fileReference: fileReference.makeData())
-                                                                    }
+                                                                    resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, size: Int(size), fileReference: fileReference.makeData())
                                                                     
                                                                     videoRepresentations.append(TelegramMediaImage.VideoRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, startTimestamp: videoStartTs))
                                                             }
@@ -223,7 +214,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
                                     
                                     let request: Signal<Api.Updates, MTRpcError>
                                     if let peer = peer as? TelegramGroup {
-                                        request = network.request(Api.functions.messages.editChatPhoto(chatId: peer.id.id, photo: .inputChatUploadedPhoto(flags: flags, file: file, video: videoFile, videoStartTs: videoStartTimestamp)))
+                                        request = network.request(Api.functions.messages.editChatPhoto(chatId: peer.id.id._internalGetInt32Value(), photo: .inputChatUploadedPhoto(flags: flags, file: file, video: videoFile, videoStartTs: videoStartTimestamp)))
                                     } else if let peer = peer as? TelegramChannel, let inputChannel = apiInputChannel(peer) {
                                         request = network.request(Api.functions.channels.editPhoto(channel: inputChannel, photo: .inputChatUploadedPhoto(flags: flags, file: file, video: videoFile, videoStartTs: videoStartTimestamp)))
                                     } else {
@@ -269,7 +260,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
             }
             |> mapToSignal { result, resource, videoResource -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> in
                 if case .complete = result {
-                    return fetchAndUpdateCachedPeerData(accountPeerId: accountPeerId, peerId: peer.id, network: network, postbox: postbox)
+                    return _internal_fetchAndUpdateCachedPeerData(accountPeerId: accountPeerId, peerId: peer.id, network: network, postbox: postbox)
                     |> castError(UploadPeerPhotoError.self)
                     |> mapToSignal { status -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> in
                         return postbox.transaction { transaction in
@@ -311,7 +302,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
             } else {
                 let request: Signal<Api.Updates, MTRpcError>
                 if let peer = peer as? TelegramGroup {
-                    request = network.request(Api.functions.messages.editChatPhoto(chatId: peer.id.id, photo: .inputChatPhotoEmpty))
+                    request = network.request(Api.functions.messages.editChatPhoto(chatId: peer.id.id._internalGetInt32Value(), photo: .inputChatPhotoEmpty))
                 } else if let peer = peer as? TelegramChannel, let inputChannel = apiInputChannel(peer) {
                     request = network.request(Api.functions.channels.editPhoto(channel: inputChannel, photo: .inputChatPhotoEmpty))
                 } else {
@@ -344,7 +335,7 @@ public func updatePeerPhotoInternal(postbox: Postbox, network: Network, stateMan
     }
 }
 
-public func updatePeerPhotoExisting(network: Network, reference: TelegramMediaImageReference) -> Signal<TelegramMediaImage?, NoError> {
+func _internal_updatePeerPhotoExisting(network: Network, reference: TelegramMediaImageReference) -> Signal<TelegramMediaImage?, NoError> {
     switch reference {
         case let .cloud(imageId, accessHash, fileReference):
             return network.request(Api.functions.photos.updateProfilePhoto(id: .inputPhoto(id: imageId, accessHash: accessHash, fileReference: Buffer(data: fileReference))))
@@ -361,7 +352,7 @@ public func updatePeerPhotoExisting(network: Network, reference: TelegramMediaIm
     }
 }
 
-public func removeAccountPhoto(network: Network, reference: TelegramMediaImageReference?) -> Signal<Void, NoError> {
+func _internal_removeAccountPhoto(network: Network, reference: TelegramMediaImageReference?) -> Signal<Void, NoError> {
     if let reference = reference {
         switch reference {
         case let .cloud(imageId, accessHash, fileReference):
diff --git a/submodules/TelegramCore/Sources/PeerSpecificStickerPack.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerSpecificStickerPack.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/PeerSpecificStickerPack.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerSpecificStickerPack.swift
index 0a9cea6eb7..c50de3ef03 100644
--- a/submodules/TelegramCore/Sources/PeerSpecificStickerPack.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/PeerSpecificStickerPack.swift
@@ -17,7 +17,7 @@ public struct PeerSpecificStickerPackData {
     public let canSetup: Bool
 }
 
-public func peerSpecificStickerPack(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<PeerSpecificStickerPackData, NoError> {
+func _internal_peerSpecificStickerPack(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<PeerSpecificStickerPackData, NoError> {
     if peerId.namespace == Namespaces.Peer.CloudChannel {
         let signal: Signal<(WrappedStickerPackCollectionInfo, Bool), NoError> = postbox.combinedView(keys: [.cachedPeerData(peerId: peerId)])
         |> map { view -> (WrappedStickerPackCollectionInfo, Bool) in
@@ -31,7 +31,7 @@ public func peerSpecificStickerPack(postbox: Postbox, network: Network, peerId:
         return signal
         |> mapToSignal { info, canInstall -> Signal<PeerSpecificStickerPackData, NoError> in
             if let info = info.info {
-                return cachedStickerPack(postbox: postbox, network: network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceRemote: false)
+                return _internal_cachedStickerPack(postbox: postbox, network: network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceRemote: false)
                 |> map { result -> PeerSpecificStickerPackData in
                     if case let .result(info, items, _) = result {
                         return PeerSpecificStickerPackData(packInfo: (info, items), canSetup: canInstall)
diff --git a/submodules/TelegramCore/Sources/RecentPeers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentPeers.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/RecentPeers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentPeers.swift
index 88108ac206..11926c1364 100644
--- a/submodules/TelegramCore/Sources/RecentPeers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentPeers.swift
@@ -16,7 +16,7 @@ private func cachedRecentPeersEntryId() -> ItemCacheEntryId {
     return ItemCacheEntryId(collectionId: 101, key: CachedRecentPeers.cacheKey())
 }
 
-public func recentPeers(account: Account) -> Signal<RecentPeers, NoError> {
+func _internal_recentPeers(account: Account) -> Signal<RecentPeers, NoError> {
     let key = PostboxViewKey.cachedItem(cachedRecentPeersEntryId())
     return account.postbox.combinedView(keys: [key])
     |> mapToSignal { views -> Signal<RecentPeers, NoError> in
@@ -41,14 +41,14 @@ public func recentPeers(account: Account) -> Signal<RecentPeers, NoError> {
     }
 }
 
-public func getRecentPeers(transaction: Transaction) -> [PeerId] {
+public func _internal_getRecentPeers(transaction: Transaction) -> [PeerId] {
     guard let entry = transaction.retrieveItemCacheEntry(id: cachedRecentPeersEntryId()) as? CachedRecentPeers else {
         return []
     }
     return entry.ids
 }
 
-public func managedUpdatedRecentPeers(accountPeerId: PeerId, postbox: Postbox, network: Network) -> Signal<Void, NoError> {
+func _internal_managedUpdatedRecentPeers(accountPeerId: PeerId, postbox: Postbox, network: Network) -> Signal<Void, NoError> {
     let key = PostboxViewKey.cachedItem(cachedRecentPeersEntryId())
     let peersEnabled = postbox.combinedView(keys: [key])
     |> map { views -> Bool in
@@ -96,7 +96,7 @@ public func managedUpdatedRecentPeers(accountPeerId: PeerId, postbox: Postbox, n
     }
 }
 
-public func removeRecentPeer(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_removeRecentPeer(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         guard let entry = transaction.retrieveItemCacheEntry(id: cachedRecentPeersEntryId()) as? CachedRecentPeers else {
             return .complete()
@@ -121,7 +121,7 @@ public func removeRecentPeer(account: Account, peerId: PeerId) -> Signal<Void, N
     } |> switchToLatest
 }
 
-public func updateRecentPeersEnabled(postbox: Postbox, network: Network, enabled: Bool) -> Signal<Void, NoError> {
+func _internal_updateRecentPeersEnabled(postbox: Postbox, network: Network, enabled: Bool) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Signal<Void, NoError> in
         var currentValue = true
         if let entry = transaction.retrieveItemCacheEntry(id: cachedRecentPeersEntryId()) as? CachedRecentPeers {
@@ -149,7 +149,7 @@ public func updateRecentPeersEnabled(postbox: Postbox, network: Network, enabled
     } |> switchToLatest
 }
 
-public func managedRecentlyUsedInlineBots(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
+func _internal_managedRecentlyUsedInlineBots(postbox: Postbox, network: Network, accountPeerId: PeerId) -> Signal<Void, NoError> {
     let remotePeers = network.request(Api.functions.contacts.getTopPeers(flags: 1 << 2, offset: 0, limit: 16, hash: 0))
         |> retryRequest
         |> map { result -> ([Peer], [PeerId: PeerPresence], [(PeerId, Double)])? in
@@ -207,7 +207,7 @@ public func managedRecentlyUsedInlineBots(postbox: Postbox, network: Network, ac
     return updatedRemotePeers
 }
 
-public func addRecentlyUsedInlineBot(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_addRecentlyUsedInlineBot(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         var maxRating = 1.0
         for entry in transaction.getOrderedListItems(collectionId: Namespaces.OrderedItemList.CloudRecentInlineBots) {
@@ -219,7 +219,7 @@ public func addRecentlyUsedInlineBot(postbox: Postbox, peerId: PeerId) -> Signal
     }
 }
 
-public func recentlyUsedInlineBots(postbox: Postbox) -> Signal<[(Peer, Double)], NoError> {
+func _internal_recentlyUsedInlineBots(postbox: Postbox) -> Signal<[(Peer, Double)], NoError> {
     return postbox.combinedView(keys: [.orderedItemList(id: Namespaces.OrderedItemList.CloudRecentInlineBots)])
         |> take(1)
         |> mapToSignal { view -> Signal<[(Peer, Double)], NoError> in
@@ -238,7 +238,7 @@ public func recentlyUsedInlineBots(postbox: Postbox) -> Signal<[(Peer, Double)],
     }
 }
 
-public func removeRecentlyUsedInlineBot(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_removeRecentlyUsedInlineBot(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         transaction.removeOrderedItemListItem(collectionId: Namespaces.OrderedItemList.CloudRecentInlineBots, itemId: RecentPeerItemId(peerId).rawValue)
         
diff --git a/submodules/TelegramCore/Sources/RecentlySearchedPeerIds.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentlySearchedPeerIds.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/RecentlySearchedPeerIds.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentlySearchedPeerIds.swift
index ad9544f4dc..f54fc35884 100644
--- a/submodules/TelegramCore/Sources/RecentlySearchedPeerIds.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RecentlySearchedPeerIds.swift
@@ -4,19 +4,19 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func addRecentlySearchedPeer(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_addRecentlySearchedPeer(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.addOrMoveToFirstPositionOrderedItemListItem(collectionId: Namespaces.OrderedItemList.RecentlySearchedPeerIds, item: OrderedItemListEntry(id: RecentPeerItemId(peerId).rawValue, contents: RecentPeerItem(rating: 0.0)), removeTailIfCountExceeds: 20)
     }
 }
 
-public func removeRecentlySearchedPeer(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_removeRecentlySearchedPeer(postbox: Postbox, peerId: PeerId) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.removeOrderedItemListItem(collectionId: Namespaces.OrderedItemList.RecentlySearchedPeerIds, itemId: RecentPeerItemId(peerId).rawValue)
     }
 }
 
-public func clearRecentlySearchedPeers(postbox: Postbox) -> Signal<Void, NoError> {
+func _internal_clearRecentlySearchedPeers(postbox: Postbox) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         transaction.replaceOrderedItemListItems(collectionId: Namespaces.OrderedItemList.RecentlySearchedPeerIds, items: [])
     }
@@ -34,7 +34,7 @@ public struct RecentlySearchedPeer: Equatable {
     public let subpeerSummary: RecentlySearchedPeerSubpeerSummary?
 }
 
-public func recentlySearchedPeers(postbox: Postbox) -> Signal<[RecentlySearchedPeer], NoError> {
+func _internal_recentlySearchedPeers(postbox: Postbox) -> Signal<[RecentlySearchedPeer], NoError> {
     return postbox.combinedView(keys: [.orderedItemList(id: Namespaces.OrderedItemList.RecentlySearchedPeerIds)])
     |> mapToSignal { view -> Signal<[RecentlySearchedPeer], NoError> in
         var peerIds: [PeerId] = []
diff --git a/submodules/TelegramCore/Sources/RemovePeerChat.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerChat.swift
similarity index 78%
rename from submodules/TelegramCore/Sources/RemovePeerChat.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerChat.swift
index 0cae498d09..3858dcf79e 100644
--- a/submodules/TelegramCore/Sources/RemovePeerChat.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerChat.swift
@@ -4,13 +4,13 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func removePeerChat(account: Account, peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool = false) -> Signal<Void, NoError> {
+func _internal_removePeerChat(account: Account, peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool = false) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Void in
-        removePeerChat(account: account, transaction: transaction, mediaBox: account.postbox.mediaBox, peerId: peerId, reportChatSpam: reportChatSpam, deleteGloballyIfPossible: deleteGloballyIfPossible)
+        _internal_removePeerChat(account: account, transaction: transaction, mediaBox: account.postbox.mediaBox, peerId: peerId, reportChatSpam: reportChatSpam, deleteGloballyIfPossible: deleteGloballyIfPossible)
     }
 }
 
-public func terminateSecretChat(transaction: Transaction, peerId: PeerId, requestRemoteHistoryRemoval: Bool) {
+func _internal_terminateSecretChat(transaction: Transaction, peerId: PeerId, requestRemoteHistoryRemoval: Bool) {
     if let state = transaction.getPeerChatState(peerId) as? SecretChatState, state.embeddedState != .terminated {
         let updatedState = addSecretChatOutgoingOperation(transaction: transaction, peerId: peerId, operation: SecretChatOutgoingOperationContents.terminate(reportSpam: false, requestRemoteHistoryRemoval: requestRemoteHistoryRemoval), state: state).withUpdatedEmbeddedState(.terminated)
         if updatedState != state {
@@ -24,7 +24,7 @@ public func terminateSecretChat(transaction: Transaction, peerId: PeerId, reques
     }
 }
 
-public func removePeerChat(account: Account, transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool) {
+func _internal_removePeerChat(account: Account, transaction: Transaction, mediaBox: MediaBox, peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool) {
     if let _ = transaction.getPeerChatInterfaceState(peerId) {
         transaction.updatePeerChatInterfaceState(peerId, update: { current in
             if let current = current {
@@ -34,7 +34,7 @@ public func removePeerChat(account: Account, transaction: Transaction, mediaBox:
             }
         })
     }
-    updateChatListFiltersInteractively(transaction: transaction, { filters in
+    _internal_updateChatListFiltersInteractively(transaction: transaction, { filters in
         var filters = filters
         for i in 0 ..< filters.count {
             if filters[i].data.includePeers.peers.contains(peerId) {
@@ -58,17 +58,17 @@ public func removePeerChat(account: Account, transaction: Transaction, mediaBox:
                 }
             }
         }
-        clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
+        _internal_clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
         transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
         transaction.removeOrderedItemListItem(collectionId: Namespaces.OrderedItemList.RecentlySearchedPeerIds, itemId: RecentPeerItemId(peerId).rawValue)
     } else {
         cloudChatAddRemoveChatOperation(transaction: transaction, peerId: peerId, reportChatSpam: reportChatSpam, deleteGloballyIfPossible: deleteGloballyIfPossible)
         if peerId.namespace == Namespaces.Peer.CloudUser  {
             transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
-            clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
+            _internal_clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
         } else if peerId.namespace == Namespaces.Peer.CloudGroup {
             transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
-            clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
+            _internal_clearHistory(transaction: transaction, mediaBox: mediaBox, peerId: peerId, namespaces: .all)
         } else {
             transaction.updatePeerChatListInclusion(peerId, inclusion: .notIncluded)
         }
diff --git a/submodules/TelegramCore/Sources/RemovePeerMember.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerMember.swift
similarity index 85%
rename from submodules/TelegramCore/Sources/RemovePeerMember.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerMember.swift
index f07ba2ccaf..c8cf17ba4b 100644
--- a/submodules/TelegramCore/Sources/RemovePeerMember.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RemovePeerMember.swift
@@ -6,9 +6,9 @@ import MtProtoKit
 
 import SyncCore
 
-public func removePeerMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
+func _internal_removePeerMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
     if peerId.namespace == Namespaces.Peer.CloudChannel {
-        return updateChannelMemberBannedRights(account: account, peerId: peerId, memberId: memberId, rights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: 0))
+        return _internal_updateChannelMemberBannedRights(account: account, peerId: peerId, memberId: memberId, rights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: 0))
         |> mapToSignal { _ -> Signal<Void, NoError> in
             return .complete()
         }
@@ -17,7 +17,7 @@ public func removePeerMember(account: Account, peerId: PeerId, memberId: PeerId)
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId), let memberPeer = transaction.getPeer(memberId), let inputUser = apiInputUser(memberPeer) {
             if let group = peer as? TelegramGroup {
-                return account.network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: group.id.id, userId: inputUser))
+                return account.network.request(Api.functions.messages.deleteChatUser(flags: 0, chatId: group.id.id._internalGetInt32Value(), userId: inputUser))
                 |> mapError { error -> Void in
                     return Void()
                 }
diff --git a/submodules/TelegramCore/Sources/ReportPeer.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ReportPeer.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/ReportPeer.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ReportPeer.swift
index 2438920e0d..f37a6edf10 100644
--- a/submodules/TelegramCore/Sources/ReportPeer.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ReportPeer.swift
@@ -6,11 +6,11 @@ import MtProtoKit
 
 import SyncCore
 
-public func reportPeer(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_reportPeer(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId) {
             if let peer = peer as? TelegramSecretChat {
-                return account.network.request(Api.functions.messages.reportEncryptedSpam(peer: Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id, accessHash: peer.accessHash)))
+                return account.network.request(Api.functions.messages.reportEncryptedSpam(peer: Api.InputEncryptedChat.inputEncryptedChat(chatId: peer.id.id._internalGetInt32Value(), accessHash: peer.accessHash)))
                 |> map(Optional.init)
                 |> `catch` { _ -> Signal<Api.Bool?, NoError> in
                     return .single(nil)
@@ -110,7 +110,7 @@ private extension ReportReason {
     }
 }
 
-public func reportPeer(account: Account, peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
+func _internal_reportPeer(account: Account, peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             return account.network.request(Api.functions.account.reportPeer(peer: inputPeer, reason: reason.apiReason, message: message))
@@ -126,7 +126,7 @@ public func reportPeer(account: Account, peerId: PeerId, reason: ReportReason, m
     } |> switchToLatest
 }
 
-public func reportPeerPhoto(account: Account, peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
+func _internal_reportPeerPhoto(account: Account, peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             return account.network.request(Api.functions.account.reportProfilePhoto(peer: inputPeer, photoId: .inputPhotoEmpty, reason: reason.apiReason, message: message))
@@ -142,7 +142,7 @@ public func reportPeerPhoto(account: Account, peerId: PeerId, reason: ReportReas
     } |> switchToLatest
 }
 
-public func reportPeerMessages(account: Account, messageIds: [MessageId], reason: ReportReason, message: String) -> Signal<Void, NoError> {
+func _internal_reportPeerMessages(account: Account, messageIds: [MessageId], reason: ReportReason, message: String) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         let groupedIds = messagesIdsGroupedByPeerId(messageIds)
         let signals = groupedIds.values.compactMap { ids -> Signal<Void, NoError>? in
@@ -165,7 +165,7 @@ public func reportPeerMessages(account: Account, messageIds: [MessageId], reason
     } |> switchToLatest
 }
 
-public func dismissPeerStatusOptions(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
+func _internal_dismissPeerStatusOptions(account: Account, peerId: PeerId) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         transaction.updatePeerCachedData(peerIds: Set([peerId]), update: { _, current in
             if let current = current as? CachedUserData {
@@ -203,7 +203,7 @@ public func dismissPeerStatusOptions(account: Account, peerId: PeerId) -> Signal
     } |> switchToLatest
 }
 
-public func reportRepliesMessage(account: Account, messageId: MessageId, deleteMessage: Bool, deleteHistory: Bool, reportSpam: Bool) -> Signal<Never, NoError> {
+func _internal_reportRepliesMessage(account: Account, messageId: MessageId, deleteMessage: Bool, deleteHistory: Bool, reportSpam: Bool) -> Signal<Never, NoError> {
     if messageId.namespace != Namespaces.Message.Cloud {
         return .complete()
     }
diff --git a/submodules/TelegramCore/Sources/RequestUserPhotos.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RequestUserPhotos.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/RequestUserPhotos.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/RequestUserPhotos.swift
index 9124bde8b2..a108b0b35c 100644
--- a/submodules/TelegramCore/Sources/RequestUserPhotos.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/RequestUserPhotos.swift
@@ -24,7 +24,7 @@ public struct TelegramPeerPhoto {
     }
 }
 
-public func requestPeerPhotos(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<[TelegramPeerPhoto], NoError> {
+func _internal_requestPeerPhotos(postbox: Postbox, network: Network, peerId: PeerId) -> Signal<[TelegramPeerPhoto], NoError> {
     return postbox.transaction{ transaction -> Peer? in
         return transaction.getPeer(peerId)
     }
diff --git a/submodules/TelegramCore/Sources/ResolvePeerByName.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ResolvePeerByName.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/ResolvePeerByName.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ResolvePeerByName.swift
index 2e4f7ec625..1b0c01f0b4 100644
--- a/submodules/TelegramCore/Sources/ResolvePeerByName.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ResolvePeerByName.swift
@@ -18,7 +18,7 @@ public enum ResolvePeerByNameOptionRemote {
     case update
 }
 
-public func resolvePeerByName(account: Account, name: String, ageLimit: Int32 = 2 * 60 * 60 * 24) -> Signal<PeerId?, NoError> {
+func _internal_resolvePeerByName(account: Account, name: String, ageLimit: Int32 = 2 * 60 * 60 * 24) -> Signal<PeerId?, NoError> {
     var normalizedName = name
     if normalizedName.hasPrefix("@") {
        normalizedName = String(normalizedName[name.index(after: name.startIndex)...])
diff --git a/submodules/TelegramCore/Sources/SearchGroupMembers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchGroupMembers.swift
similarity index 61%
rename from submodules/TelegramCore/Sources/SearchGroupMembers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchGroupMembers.swift
index 378e41837c..1a2f83e841 100644
--- a/submodules/TelegramCore/Sources/SearchGroupMembers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchGroupMembers.swift
@@ -4,6 +4,41 @@ import SwiftSignalKit
 
 import SyncCore
 
+private struct PeerParticipants: Equatable {
+    let peers: [Peer]
+
+    static func ==(lhs: PeerParticipants, rhs: PeerParticipants) -> Bool {
+        if lhs.peers.count != rhs.peers.count {
+            return false
+        }
+        for i in 0 ..< lhs.peers.count {
+            if !lhs.peers[i].isEqual(rhs.peers[i]) {
+                return false
+            }
+        }
+        return true
+    }
+}
+
+private func peerParticipants(postbox: Postbox, id: PeerId) -> Signal<[Peer], NoError> {
+    return postbox.peerView(id: id) |> map { view -> PeerParticipants in
+        if let cachedGroupData = view.cachedData as? CachedGroupData, let participants = cachedGroupData.participants {
+            var peers: [Peer] = []
+            for participant in participants.participants {
+                if let peer = view.peers[participant.peerId] {
+                    peers.append(peer)
+                }
+            }
+            return PeerParticipants(peers: peers)
+        } else {
+            return PeerParticipants(peers: [])
+        }
+    }
+    |> distinctUntilChanged |> map { participants in
+        return participants.peers
+    }
+}
+
 private func searchLocalGroupMembers(postbox: Postbox, peerId: PeerId, query: String) -> Signal<[Peer], NoError> {
     return peerParticipants(postbox: postbox, id: peerId)
     |> map { peers -> [Peer] in
@@ -28,7 +63,7 @@ private func searchLocalGroupMembers(postbox: Postbox, peerId: PeerId, query: St
     }
 }
 
-public func searchGroupMembers(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, query: String) -> Signal<[Peer], NoError> {
+func _internal_searchGroupMembers(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, query: String) -> Signal<[Peer], NoError> {
     if peerId.namespace == Namespaces.Peer.CloudChannel && !query.isEmpty {
         return searchLocalGroupMembers(postbox: postbox, peerId: peerId, query: query)
         |> mapToSignal { local -> Signal<[Peer], NoError> in
@@ -40,7 +75,7 @@ public func searchGroupMembers(postbox: Postbox, network: Network, accountPeerId
             }
             return localResult
             |> then(
-                channelMembers(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, category: .recent(.search(query)))
+                _internal_channelMembers(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, category: .recent(.search(query)))
                 |> map { participants -> [Peer] in
                     var result: [Peer] = local
                     let existingIds = Set(local.map { $0.id })
diff --git a/submodules/TelegramCore/Sources/SearchPeers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchPeers.swift
similarity index 73%
rename from submodules/TelegramCore/Sources/SearchPeers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchPeers.swift
index ab6b93a3e7..0cd869c7d2 100644
--- a/submodules/TelegramCore/Sources/SearchPeers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SearchPeers.swift
@@ -20,7 +20,7 @@ public struct FoundPeer: Equatable {
     }
 }
 
-public func searchPeers(account: Account, query: String) -> Signal<([FoundPeer], [FoundPeer]), NoError> {
+func _internal_searchPeers(account: Account, query: String) -> Signal<([FoundPeer], [FoundPeer]), NoError> {
     let searchResult = account.network.request(Api.functions.contacts.search(q: query, limit: 20), automaticFloodWait: false)
     |> map(Optional.init)
     |> `catch` { _ in
@@ -61,15 +61,7 @@ public func searchPeers(account: Account, query: String) -> Signal<([FoundPeer],
                     
                     var renderedMyPeers: [FoundPeer] = []
                     for result in myResults {
-                        let peerId: PeerId
-                        switch result {
-                            case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                            case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                            case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                        }
+                        let peerId: PeerId = result.peerId
                         if let peer = peers[peerId] {
                             if let group = peer as? TelegramGroup, group.migrationReference != nil {
                                 continue
@@ -80,15 +72,7 @@ public func searchPeers(account: Account, query: String) -> Signal<([FoundPeer],
                     
                     var renderedPeers: [FoundPeer] = []
                     for result in results {
-                        let peerId: PeerId
-                        switch result {
-                            case let .peerUser(userId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
-                            case let .peerChat(chatId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: chatId)
-                            case let .peerChannel(channelId):
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId)
-                        }
+                        let peerId: PeerId = result.peerId
                         if let peer = peers[peerId] {
                             if let group = peer as? TelegramGroup, group.migrationReference != nil {
                                 continue
diff --git a/submodules/TelegramCore/Sources/SlowMode.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SlowMode.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/SlowMode.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/SlowMode.swift
index 7134b47d08..a2f3ee94f0 100644
--- a/submodules/TelegramCore/Sources/SlowMode.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SlowMode.swift
@@ -9,7 +9,7 @@ public enum UpdateChannelSlowModeError {
     case tooManyChannels
 }
 
-public func updateChannelSlowModeInteractively(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, peerId: PeerId, timeout: Int32?) -> Signal<Void, UpdateChannelSlowModeError> {
+func _internal_updateChannelSlowModeInteractively(postbox: Postbox, network: Network, accountStateManager: AccountStateManager, peerId: PeerId, timeout: Int32?) -> Signal<Void, UpdateChannelSlowModeError> {
     return postbox.transaction { transaction -> Peer? in
         return transaction.getPeer(peerId)
     }
diff --git a/submodules/TelegramCore/Sources/SupportPeerId.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SupportPeerId.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/SupportPeerId.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/SupportPeerId.swift
index 783c7c8552..afa575bc0e 100644
--- a/submodules/TelegramCore/Sources/SupportPeerId.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/SupportPeerId.swift
@@ -5,7 +5,7 @@ import MtProtoKit
 
 import SyncCore
 
-public func supportPeerId(account:Account) -> Signal<PeerId?, NoError> {
+func _internal_supportPeerId(account: Account) -> Signal<PeerId?, NoError> {
     return account.network.request(Api.functions.help.getSupport())
     |> map(Optional.init)
     |> `catch` { _ in
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift
new file mode 100644
index 0000000000..00f3ddddb6
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TelegramEnginePeers.swift
@@ -0,0 +1,463 @@
+import Foundation
+import SwiftSignalKit
+import Postbox
+import SyncCore
+
+public enum AddressNameValidationStatus: Equatable {
+    case checking
+    case invalidFormat(AddressNameFormatError)
+    case availability(AddressNameAvailability)
+}
+
+public extension TelegramEngine {
+    final class Peers {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func addressNameAvailability(domain: AddressNameDomain, name: String) -> Signal<AddressNameAvailability, NoError> {
+            return _internal_addressNameAvailability(account: self.account, domain: domain, name: name)
+        }
+
+        public func updateAddressName(domain: AddressNameDomain, name: String?) -> Signal<Void, UpdateAddressNameError> {
+            return _internal_updateAddressName(account: self.account, domain: domain, name: name)
+        }
+
+        public func checkPublicChannelCreationAvailability(location: Bool = false) -> Signal<Bool, NoError> {
+            return _internal_checkPublicChannelCreationAvailability(account: self.account, location: location)
+        }
+
+        public func adminedPublicChannels(scope: AdminedPublicChannelsScope = .all) -> Signal<[Peer], NoError> {
+            return _internal_adminedPublicChannels(account: self.account, scope: scope)
+        }
+
+        public func channelAddressNameAssignmentAvailability(peerId: PeerId?) -> Signal<ChannelAddressNameAssignmentAvailability, NoError> {
+            return _internal_channelAddressNameAssignmentAvailability(account: self.account, peerId: peerId)
+        }
+
+        public func validateAddressNameInteractive(domain: AddressNameDomain, name: String) -> Signal<AddressNameValidationStatus, NoError> {
+            if let error = _internal_checkAddressNameFormat(name) {
+                return .single(.invalidFormat(error))
+            } else {
+                return .single(.checking)
+                |> then(
+                    self.addressNameAvailability(domain: domain, name: name)
+                    |> delay(0.3, queue: Queue.concurrentDefaultQueue())
+                    |> map { result -> AddressNameValidationStatus in
+                        .availability(result)
+                    }
+                )
+            }
+        }
+
+        public func findChannelById(channelId: Int32) -> Signal<Peer?, NoError> {
+            return _internal_findChannelById(postbox: self.account.postbox, network: self.account.network, channelId: channelId)
+        }
+
+        public func supportPeerId() -> Signal<PeerId?, NoError> {
+            return _internal_supportPeerId(account: self.account)
+        }
+
+        public func inactiveChannelList() -> Signal<[InactiveChannel], NoError> {
+            return _internal_inactiveChannelList(network: self.account.network)
+        }
+
+        public func resolvePeerByName(name: String, ageLimit: Int32 = 2 * 60 * 60 * 24) -> Signal<PeerId?, NoError> {
+            return _internal_resolvePeerByName(account: self.account, name: name, ageLimit: ageLimit)
+        }
+
+        public func searchPeers(query: String) -> Signal<([FoundPeer], [FoundPeer]), NoError> {
+            return _internal_searchPeers(account: self.account, query: query)
+        }
+
+        public func updatedRemotePeer(peer: PeerReference) -> Signal<Peer, UpdatedRemotePeerError> {
+            return _internal_updatedRemotePeer(postbox: self.account.postbox, network: self.account.network, peer: peer)
+        }
+
+        public func chatOnlineMembers(peerId: PeerId) -> Signal<Int32, NoError> {
+            return _internal_chatOnlineMembers(postbox: self.account.postbox, network: self.account.network, peerId: peerId)
+        }
+
+        public func convertGroupToSupergroup(peerId: PeerId) -> Signal<PeerId, ConvertGroupToSupergroupError> {
+            return _internal_convertGroupToSupergroup(account: self.account, peerId: peerId)
+        }
+
+        public func createGroup(title: String, peerIds: [PeerId]) -> Signal<PeerId?, CreateGroupError> {
+            return _internal_createGroup(account: self.account, title: title, peerIds: peerIds)
+        }
+
+        public func createSecretChat(peerId: PeerId) -> Signal<PeerId, CreateSecretChatError> {
+            return _internal_createSecretChat(account: self.account, peerId: peerId)
+        }
+
+        public func setChatMessageAutoremoveTimeoutInteractively(peerId: PeerId, timeout: Int32?) -> Signal<Never, SetChatMessageAutoremoveTimeoutError> {
+            if peerId.namespace == Namespaces.Peer.SecretChat {
+                return _internal_setSecretChatMessageAutoremoveTimeoutInteractively(account: self.account, peerId: peerId, timeout: timeout)
+                |> ignoreValues
+                    |> castError(SetChatMessageAutoremoveTimeoutError.self)
+            } else {
+                return _internal_setChatMessageAutoremoveTimeoutInteractively(account: self.account, peerId: peerId, timeout: timeout)
+            }
+        }
+
+        public func updateChannelSlowModeInteractively(peerId: PeerId, timeout: Int32?) -> Signal<Void, UpdateChannelSlowModeError> {
+            return _internal_updateChannelSlowModeInteractively(postbox: self.account.postbox, network: self.account.network, accountStateManager: self.account.stateManager, peerId: peerId, timeout: timeout)
+        }
+
+        public func reportPeer(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_reportPeer(account: self.account, peerId: peerId)
+        }
+
+        public func reportPeer(peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
+            return _internal_reportPeer(account: self.account, peerId: peerId, reason: reason, message: message)
+        }
+
+        public func reportPeerPhoto(peerId: PeerId, reason: ReportReason, message: String) -> Signal<Void, NoError> {
+            return _internal_reportPeerPhoto(account: self.account, peerId: peerId, reason: reason, message: message)
+        }
+
+        public func reportPeerMessages(messageIds: [MessageId], reason: ReportReason, message: String) -> Signal<Void, NoError> {
+            return _internal_reportPeerMessages(account: account, messageIds: messageIds, reason: reason, message: message)
+        }
+
+        public func dismissPeerStatusOptions(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_dismissPeerStatusOptions(account: self.account, peerId: peerId)
+        }
+
+        public func reportRepliesMessage(messageId: MessageId, deleteMessage: Bool, deleteHistory: Bool, reportSpam: Bool) -> Signal<Never, NoError> {
+            return _internal_reportRepliesMessage(account: self.account, messageId: messageId, deleteMessage: deleteMessage, deleteHistory: deleteHistory, reportSpam: reportSpam)
+        }
+
+        public func togglePeerMuted(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_togglePeerMuted(account: self.account, peerId: peerId)
+        }
+
+        public func updatePeerMuteSetting(peerId: PeerId, muteInterval: Int32?) -> Signal<Void, NoError> {
+            return _internal_updatePeerMuteSetting(account: self.account, peerId: peerId, muteInterval: muteInterval)
+        }
+
+        public func updatePeerDisplayPreviewsSetting(peerId: PeerId, displayPreviews: PeerNotificationDisplayPreviews) -> Signal<Void, NoError> {
+            return _internal_updatePeerDisplayPreviewsSetting(account: self.account, peerId: peerId, displayPreviews: displayPreviews)
+        }
+
+        public func updatePeerNotificationSoundInteractive(peerId: PeerId, sound: PeerMessageSound) -> Signal<Void, NoError> {
+            return _internal_updatePeerNotificationSoundInteractive(account: self.account, peerId: peerId, sound: sound)
+        }
+
+        public func removeCustomNotificationSettings(peerIds: [PeerId]) -> Signal<Never, NoError> {
+            return self.account.postbox.transaction { transaction -> Void in
+                for peerId in peerIds {
+                    TelegramCore.updatePeerNotificationSoundInteractive(transaction: transaction, peerId: peerId, sound: .default)
+                    TelegramCore.updatePeerMuteSetting(transaction: transaction, peerId: peerId, muteInterval: nil)
+                    TelegramCore.updatePeerDisplayPreviewsSetting(transaction: transaction, peerId: peerId, displayPreviews: .default)
+                }
+            }
+            |> ignoreValues
+        }
+
+        public func channelAdminEventLog(peerId: PeerId) -> ChannelAdminEventLogContext {
+            return ChannelAdminEventLogContext(postbox: self.account.postbox, network: self.account.network, peerId: peerId)
+        }
+
+        public func updateChannelMemberBannedRights(peerId: PeerId, memberId: PeerId, rights: TelegramChatBannedRights?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant?, Bool), NoError> {
+            return _internal_updateChannelMemberBannedRights(account: self.account, peerId: peerId, memberId: memberId, rights: rights)
+        }
+
+        public func updateDefaultChannelMemberBannedRights(peerId: PeerId, rights: TelegramChatBannedRights) -> Signal<Never, NoError> {
+            return _internal_updateDefaultChannelMemberBannedRights(account: self.account, peerId: peerId, rights: rights)
+        }
+
+        public func createChannel(title: String, description: String?) -> Signal<PeerId, CreateChannelError> {
+            return _internal_createChannel(account: self.account, title: title, description: description)
+        }
+
+        public func createSupergroup(title: String, description: String?, location: (latitude: Double, longitude: Double, address: String)? = nil, isForHistoryImport: Bool = false) -> Signal<PeerId, CreateChannelError> {
+            return _internal_createSupergroup(account: self.account, title: title, description: description, location: location, isForHistoryImport: isForHistoryImport)
+        }
+
+        public func deleteChannel(peerId: PeerId) -> Signal<Void, DeleteChannelError> {
+            return _internal_deleteChannel(account: self.account, peerId: peerId)
+        }
+
+        public func updateChannelHistoryAvailabilitySettingsInteractively(peerId: PeerId, historyAvailableForNewMembers: Bool) -> Signal<Void, ChannelHistoryAvailabilityError> {
+            return _internal_updateChannelHistoryAvailabilitySettingsInteractively(postbox: self.account.postbox, network: self.account.network, accountStateManager: self.account.stateManager, peerId: peerId, historyAvailableForNewMembers: historyAvailableForNewMembers)
+        }
+
+        public func channelMembers(peerId: PeerId, category: ChannelMembersCategory = .recent(.all), offset: Int32 = 0, limit: Int32 = 64, hash: Int32 = 0) -> Signal<[RenderedChannelParticipant]?, NoError> {
+            return _internal_channelMembers(postbox: self.account.postbox, network: self.account.network, accountPeerId: self.account.peerId, peerId: peerId, category: category, offset: offset, limit: limit, hash: hash)
+        }
+
+        public func checkOwnershipTranfserAvailability(memberId: PeerId) -> Signal<Never, ChannelOwnershipTransferError> {
+            return _internal_checkOwnershipTranfserAvailability(postbox: self.account.postbox, network: self.account.network, accountStateManager: self.account.stateManager, memberId: memberId)
+        }
+
+        public func updateChannelOwnership(channelId: PeerId, memberId: PeerId, password: String) -> Signal<[(ChannelParticipant?, RenderedChannelParticipant)], ChannelOwnershipTransferError> {
+            return _internal_updateChannelOwnership(account: self.account, accountStateManager: self.account.stateManager, channelId: channelId, memberId: memberId, password: password)
+        }
+
+        public func searchGroupMembers(peerId: PeerId, query: String) -> Signal<[Peer], NoError> {
+            return _internal_searchGroupMembers(postbox: self.account.postbox, network: self.account.network, accountPeerId: self.account.peerId, peerId: peerId, query: query)
+        }
+
+        public func toggleShouldChannelMessagesSignatures(peerId: PeerId, enabled: Bool) -> Signal<Void, NoError> {
+            return _internal_toggleShouldChannelMessagesSignatures(account: self.account, peerId: peerId, enabled: enabled)
+        }
+
+        public func requestPeerPhotos(peerId: PeerId) -> Signal<[TelegramPeerPhoto], NoError> {
+            return _internal_requestPeerPhotos(postbox: self.account.postbox, network: self.account.network, peerId: peerId)
+        }
+
+        public func updateGroupSpecificStickerset(peerId: PeerId, info: StickerPackCollectionInfo?) -> Signal<Void, UpdateGroupSpecificStickersetError> {
+            return _internal_updateGroupSpecificStickerset(postbox: self.account.postbox, network: self.account.network, peerId: peerId, info: info)
+        }
+
+        public func joinChannel(peerId: PeerId, hash: String?) -> Signal<RenderedChannelParticipant?, JoinChannelError> {
+            return _internal_joinChannel(account: self.account, peerId: peerId, hash: hash)
+        }
+
+        public func removePeerMember(peerId: PeerId, memberId: PeerId) -> Signal<Void, NoError> {
+            return _internal_removePeerMember(account: self.account, peerId: peerId, memberId: memberId)
+        }
+
+        public func availableGroupsForChannelDiscussion() -> Signal<[Peer], AvailableChannelDiscussionGroupError> {
+            return _internal_availableGroupsForChannelDiscussion(postbox: self.account.postbox, network: self.account.network)
+        }
+
+        public func updateGroupDiscussionForChannel(channelId: PeerId?, groupId: PeerId?) -> Signal<Bool, ChannelDiscussionGroupError> {
+            return _internal_updateGroupDiscussionForChannel(network: self.account.network, postbox: self.account.postbox, channelId: channelId, groupId: groupId)
+        }
+
+        public func peerCommands(id: PeerId) -> Signal<PeerCommands, NoError> {
+            return _internal_peerCommands(account: self.account, id: id)
+        }
+
+        public func addGroupAdmin(peerId: PeerId, adminId: PeerId) -> Signal<Void, AddGroupAdminError> {
+            return _internal_addGroupAdmin(account: self.account, peerId: peerId, adminId: adminId)
+        }
+
+        public func removeGroupAdmin(peerId: PeerId, adminId: PeerId) -> Signal<Void, RemoveGroupAdminError> {
+            return _internal_removeGroupAdmin(account: self.account, peerId: peerId, adminId: adminId)
+        }
+
+        public func fetchChannelParticipant(peerId: PeerId, participantId: PeerId) -> Signal<ChannelParticipant?, NoError> {
+            return _internal_fetchChannelParticipant(account: self.account, peerId: peerId, participantId: participantId)
+        }
+
+        public func updateChannelAdminRights(peerId: PeerId, adminId: PeerId, rights: TelegramChatAdminRights?, rank: String?) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), UpdateChannelAdminRightsError> {
+            return _internal_updateChannelAdminRights(account: self.account, peerId: peerId, adminId: adminId, rights: rights, rank: rank)
+        }
+
+        public func peerSpecificStickerPack(peerId: PeerId) -> Signal<PeerSpecificStickerPackData, NoError> {
+            return _internal_peerSpecificStickerPack(postbox: self.account.postbox, network: self.account.network, peerId: peerId)
+        }
+
+        public func addRecentlySearchedPeer(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_addRecentlySearchedPeer(postbox: self.account.postbox, peerId: peerId)
+        }
+
+        public func removeRecentlySearchedPeer(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_removeRecentlySearchedPeer(postbox: self.account.postbox, peerId: peerId)
+        }
+
+        public func clearRecentlySearchedPeers() -> Signal<Void, NoError> {
+            return _internal_clearRecentlySearchedPeers(postbox: self.account.postbox)
+        }
+
+        public func recentlySearchedPeers() -> Signal<[RecentlySearchedPeer], NoError> {
+            return _internal_recentlySearchedPeers(postbox: self.account.postbox)
+        }
+
+        public func removePeerChat(peerId: PeerId, reportChatSpam: Bool, deleteGloballyIfPossible: Bool = false) -> Signal<Void, NoError> {
+            return _internal_removePeerChat(account: self.account, peerId: peerId, reportChatSpam: reportChatSpam, deleteGloballyIfPossible: deleteGloballyIfPossible)
+        }
+
+        public func removePeerChats(peerIds: [PeerId]) -> Signal<Never, NoError> {
+            return self.account.postbox.transaction { transaction -> Void in
+                for peerId in peerIds {
+                    _internal_removePeerChat(account: self.account, transaction: transaction, mediaBox: self.account.postbox.mediaBox, peerId: peerId, reportChatSpam: false, deleteGloballyIfPossible: peerId.namespace == Namespaces.Peer.SecretChat)
+                }
+            }
+            |> ignoreValues
+        }
+
+        public func terminateSecretChat(peerId: PeerId, requestRemoteHistoryRemoval: Bool) -> Signal<Never, NoError> {
+            return self.account.postbox.transaction { transaction -> Void in
+                _internal_terminateSecretChat(transaction: transaction, peerId: peerId, requestRemoteHistoryRemoval: requestRemoteHistoryRemoval)
+            }
+            |> ignoreValues
+        }
+
+        public func addGroupMember(peerId: PeerId, memberId: PeerId) -> Signal<Void, AddGroupMemberError> {
+            return _internal_addGroupMember(account: self.account, peerId: peerId, memberId: memberId)
+        }
+
+        public func addChannelMember(peerId: PeerId, memberId: PeerId) -> Signal<(ChannelParticipant?, RenderedChannelParticipant), AddChannelMemberError> {
+            return _internal_addChannelMember(account: self.account, peerId: peerId, memberId: memberId)
+        }
+
+        public func addChannelMembers(peerId: PeerId, memberIds: [PeerId]) -> Signal<Void, AddChannelMemberError> {
+            return _internal_addChannelMembers(account: self.account, peerId: peerId, memberIds: memberIds)
+        }
+
+        public func recentPeers() -> Signal<RecentPeers, NoError> {
+            return _internal_recentPeers(account: self.account)
+        }
+
+        public func managedUpdatedRecentPeers() -> Signal<Void, NoError> {
+            return _internal_managedUpdatedRecentPeers(accountPeerId: self.account.peerId, postbox: self.account.postbox, network: self.account.network)
+        }
+
+        public func removeRecentPeer(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_removeRecentPeer(account: self.account, peerId: peerId)
+        }
+
+        public func updateRecentPeersEnabled(enabled: Bool) -> Signal<Void, NoError> {
+            return _internal_updateRecentPeersEnabled(postbox: self.account.postbox, network: self.account.network, enabled: enabled)
+        }
+
+        public func addRecentlyUsedInlineBot(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_addRecentlyUsedInlineBot(postbox: self.account.postbox, peerId: peerId)
+        }
+
+        public func recentlyUsedInlineBots() -> Signal<[(Peer, Double)], NoError> {
+            return _internal_recentlyUsedInlineBots(postbox: self.account.postbox)
+        }
+
+        public func removeRecentlyUsedInlineBot(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_removeRecentlyUsedInlineBot(account: self.account, peerId: peerId)
+        }
+
+        public func uploadedPeerPhoto(resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
+            return _internal_uploadedPeerPhoto(postbox: self.account.postbox, network: self.account.network, resource: resource)
+        }
+
+        public func uploadedPeerVideo(resource: MediaResource) -> Signal<UploadedPeerPhotoData, NoError> {
+            return _internal_uploadedPeerVideo(postbox: self.account.postbox, network: self.account.network, messageMediaPreuploadManager: self.account.messageMediaPreuploadManager, resource: resource)
+        }
+
+        public func updatePeerPhoto(peerId: PeerId, photo: Signal<UploadedPeerPhotoData, NoError>?, video: Signal<UploadedPeerPhotoData?, NoError>? = nil, videoStartTimestamp: Double? = nil, mapResourceToAvatarSizes: @escaping (MediaResource, [TelegramMediaImageRepresentation]) -> Signal<[Int: Data], NoError>) -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> {
+            return _internal_updatePeerPhoto(postbox: self.account.postbox, network: self.account.network, stateManager: self.account.stateManager, accountPeerId: self.account.peerId, peerId: peerId, photo: photo, video: video, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: mapResourceToAvatarSizes)
+        }
+
+        public func requestUpdateChatListFilter(id: Int32, filter: ChatListFilter?) -> Signal<Never, RequestUpdateChatListFilterError> {
+            return _internal_requestUpdateChatListFilter(postbox: self.account.postbox, network: self.account.network, id: id, filter: filter)
+        }
+
+        public func requestUpdateChatListFilterOrder(ids: [Int32]) -> Signal<Never, RequestUpdateChatListFilterOrderError> {
+            return _internal_requestUpdateChatListFilterOrder(account: self.account, ids: ids)
+        }
+
+        public func generateNewChatListFilterId(filters: [ChatListFilter]) -> Int32 {
+            return _internal_generateNewChatListFilterId(filters: filters)
+        }
+
+        public func updateChatListFiltersInteractively(_ f: @escaping ([ChatListFilter]) -> [ChatListFilter]) -> Signal<[ChatListFilter], NoError> {
+            return _internal_updateChatListFiltersInteractively(postbox: self.account.postbox, f)
+        }
+
+        public func updatedChatListFilters() -> Signal<[ChatListFilter], NoError> {
+            return _internal_updatedChatListFilters(postbox: self.account.postbox)
+        }
+
+        public func updatedChatListFiltersInfo() -> Signal<(filters: [ChatListFilter], synchronized: Bool), NoError> {
+            return _internal_updatedChatListFiltersInfo(postbox: self.account.postbox)
+        }
+
+        public func currentChatListFilters() -> Signal<[ChatListFilter], NoError> {
+            return _internal_currentChatListFilters(postbox: self.account.postbox)
+        }
+
+        public func markChatListFeaturedFiltersAsSeen() -> Signal<Never, NoError> {
+            return _internal_markChatListFeaturedFiltersAsSeen(postbox: self.account.postbox)
+        }
+
+        public func updateChatListFeaturedFilters() -> Signal<Never, NoError> {
+            return _internal_updateChatListFeaturedFilters(postbox: self.account.postbox, network: self.account.network)
+        }
+
+        public func unmarkChatListFeaturedFiltersAsSeen() -> Signal<Never, NoError> {
+            return self.account.postbox.transaction { transaction in
+                _internal_unmarkChatListFeaturedFiltersAsSeen(transaction: transaction)
+            }
+            |> ignoreValues
+        }
+
+        public func checkPeerChatServiceActions(peerId: PeerId) -> Signal<Void, NoError> {
+            return _internal_checkPeerChatServiceActions(postbox: self.account.postbox, peerId: peerId)
+        }
+
+        public func createPeerExportedInvitation(peerId: PeerId, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, CreatePeerExportedInvitationError> {
+            return _internal_createPeerExportedInvitation(account: self.account, peerId: peerId, expireDate: expireDate, usageLimit: usageLimit)
+        }
+
+        public func editPeerExportedInvitation(peerId: PeerId, link: String, expireDate: Int32?, usageLimit: Int32?) -> Signal<ExportedInvitation?, EditPeerExportedInvitationError> {
+            return _internal_editPeerExportedInvitation(account: self.account, peerId: peerId, link: link, expireDate: expireDate, usageLimit: usageLimit)
+        }
+
+        public func revokePeerExportedInvitation(peerId: PeerId, link: String) -> Signal<RevokeExportedInvitationResult?, RevokePeerExportedInvitationError> {
+            return _internal_revokePeerExportedInvitation(account: self.account, peerId: peerId, link: link)
+        }
+
+        public func deletePeerExportedInvitation(peerId: PeerId, link: String) -> Signal<Never, DeletePeerExportedInvitationError> {
+            return _internal_deletePeerExportedInvitation(account: self.account, peerId: peerId, link: link)
+        }
+
+        public func deleteAllRevokedPeerExportedInvitations(peerId: PeerId, adminId: PeerId) -> Signal<Never, NoError> {
+            return _internal_deleteAllRevokedPeerExportedInvitations(account: self.account, peerId: peerId, adminId: adminId)
+        }
+
+        public func peerExportedInvitationsCreators(peerId: PeerId) -> Signal<[ExportedInvitationCreator], NoError> {
+            return _internal_peerExportedInvitationsCreators(account: self.account, peerId: peerId)
+        }
+
+        public func peerExportedInvitations(peerId: PeerId, adminId: PeerId?, revoked: Bool, forceUpdate: Bool) -> PeerExportedInvitationsContext {
+            return PeerExportedInvitationsContext(account: self.account, peerId: peerId, adminId: adminId, revoked: revoked, forceUpdate: forceUpdate)
+        }
+
+        public func peerInvitationImporters(peerId: PeerId, invite: ExportedInvitation) -> PeerInvitationImportersContext {
+            return PeerInvitationImportersContext(account: self.account, peerId: peerId, invite: invite)
+        }
+
+        public func notificationExceptionsList() -> Signal<NotificationExceptionsList, NoError> {
+            return _internal_notificationExceptionsList(postbox: self.account.postbox, network: self.account.network)
+        }
+
+        public func fetchAndUpdateCachedPeerData(peerId: PeerId) -> Signal<Bool, NoError> {
+            return _internal_fetchAndUpdateCachedPeerData(accountPeerId: self.account.peerId, peerId: peerId, network: self.account.network, postbox: self.account.postbox)
+        }
+
+        public func toggleItemPinned(location: TogglePeerChatPinnedLocation, itemId: PinnedItemId) -> Signal<TogglePeerChatPinnedResult, NoError> {
+            return _internal_toggleItemPinned(postbox: self.account.postbox, location: location, itemId: itemId)
+        }
+
+        public func getPinnedItemIds(location: TogglePeerChatPinnedLocation) -> Signal<[PinnedItemId], NoError> {
+            return self.account.postbox.transaction { transaction -> [PinnedItemId] in
+                return _internal_getPinnedItemIds(transaction: transaction, location: location)
+            }
+        }
+
+        public func reorderPinnedItemIds(location: TogglePeerChatPinnedLocation, itemIds: [PinnedItemId]) -> Signal<Bool, NoError> {
+            return self.account.postbox.transaction { transaction -> Bool in
+                return _internal_reorderPinnedItemIds(transaction: transaction, location: location, itemIds: itemIds)
+            }
+        }
+
+        public func joinChatInteractively(with hash: String) -> Signal <PeerId?, JoinLinkError> {
+            return _internal_joinChatInteractively(with: hash, account: self.account)
+        }
+
+        public func joinLinkInformation(_ hash: String) -> Signal<ExternalJoiningChatState, NoError> {
+            return _internal_joinLinkInformation(hash, account: self.account)
+        }
+
+        public func updatePeerTitle(peerId: PeerId, title: String) -> Signal<Void, UpdatePeerTitleError> {
+            return _internal_updatePeerTitle(account: self.account, peerId: peerId, title: title)
+        }
+
+        public func updatePeerDescription(peerId: PeerId, description: String?) -> Signal<Void, UpdatePeerDescriptionError> {
+            return _internal_updatePeerDescription(account: self.account, peerId: peerId, description: description)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ToggleChannelSignatures.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ToggleChannelSignatures.swift
similarity index 83%
rename from submodules/TelegramCore/Sources/ToggleChannelSignatures.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/ToggleChannelSignatures.swift
index 9505ce02db..27dc326ffc 100644
--- a/submodules/TelegramCore/Sources/ToggleChannelSignatures.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/ToggleChannelSignatures.swift
@@ -6,7 +6,7 @@ import MtProtoKit
 
 import SyncCore
 
-public func toggleShouldChannelMessagesSignatures(account:Account, peerId:PeerId, enabled: Bool) -> Signal<Void, NoError> {
+func _internal_toggleShouldChannelMessagesSignatures(account:Account, peerId:PeerId, enabled: Bool) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId) as? TelegramChannel, let inputChannel = apiInputChannel(peer) {
             return account.network.request(Api.functions.channels.toggleSignatures(channel: inputChannel, enabled: enabled ? .boolTrue : .boolFalse)) |> retryRequest |> map { updates -> Void in
diff --git a/submodules/TelegramCore/Sources/TogglePeerChatPinned.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
similarity index 86%
rename from submodules/TelegramCore/Sources/TogglePeerChatPinned.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
index ab3a0de39e..a49b9b445d 100644
--- a/submodules/TelegramCore/Sources/TogglePeerChatPinned.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/TogglePeerChatPinned.swift
@@ -14,7 +14,7 @@ public enum TogglePeerChatPinnedResult {
     case limitExceeded(Int)
 }
 
-public func toggleItemPinned(postbox: Postbox, location: TogglePeerChatPinnedLocation, itemId: PinnedItemId) -> Signal<TogglePeerChatPinnedResult, NoError> {
+func _internal_toggleItemPinned(postbox: Postbox, location: TogglePeerChatPinnedLocation, itemId: PinnedItemId) -> Signal<TogglePeerChatPinnedResult, NoError> {
     return postbox.transaction { transaction -> TogglePeerChatPinnedResult in
         switch location {
         case let .group(groupId):
@@ -60,7 +60,7 @@ public func toggleItemPinned(postbox: Postbox, location: TogglePeerChatPinnedLoc
             }
         case let .filter(filterId):
             var result: TogglePeerChatPinnedResult = .done
-            updateChatListFiltersInteractively(transaction: transaction, { filters in
+            _internal_updateChatListFiltersInteractively(transaction: transaction, { filters in
                 var filters = filters
                 if let index = filters.firstIndex(where: { $0.id == filterId }) {
                     switch itemId {
@@ -81,13 +81,13 @@ public func toggleItemPinned(postbox: Postbox, location: TogglePeerChatPinnedLoc
     }
 }
 
-public func getPinnedItemIds(transaction: Transaction, location: TogglePeerChatPinnedLocation) -> [PinnedItemId] {
+func _internal_getPinnedItemIds(transaction: Transaction, location: TogglePeerChatPinnedLocation) -> [PinnedItemId] {
     switch location {
     case let .group(groupId):
         return transaction.getPinnedItemIds(groupId: groupId)
     case let .filter(filterId):
         var itemIds: [PinnedItemId] = []
-        let _ = updateChatListFiltersInteractively(transaction: transaction, { filters in
+        let _ = _internal_updateChatListFiltersInteractively(transaction: transaction, { filters in
             if let index = filters.firstIndex(where: { $0.id == filterId }) {
                 itemIds = filters[index].data.includePeers.pinnedPeers.map { peerId in
                     return .peer(peerId)
@@ -99,7 +99,7 @@ public func getPinnedItemIds(transaction: Transaction, location: TogglePeerChatP
     }
 }
 
-public func reorderPinnedItemIds(transaction: Transaction, location: TogglePeerChatPinnedLocation, itemIds: [PinnedItemId]) -> Bool {
+func _internal_reorderPinnedItemIds(transaction: Transaction, location: TogglePeerChatPinnedLocation, itemIds: [PinnedItemId]) -> Bool {
     switch location {
     case let .group(groupId):
         if transaction.getPinnedItemIds(groupId: groupId) != itemIds {
@@ -111,7 +111,7 @@ public func reorderPinnedItemIds(transaction: Transaction, location: TogglePeerC
         }
     case let .filter(filterId):
         var result: Bool = false
-        updateChatListFiltersInteractively(transaction: transaction, { filters in
+        _internal_updateChatListFiltersInteractively(transaction: transaction, { filters in
             var filters = filters
             if let index = filters.firstIndex(where: { $0.id == filterId }) {
                 let peerIds: [PeerId] = itemIds.map { itemId -> PeerId in
diff --git a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateCachedPeerData.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/UpdateCachedPeerData.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateCachedPeerData.swift
index 61a7faea29..a4e378fbb8 100644
--- a/submodules/TelegramCore/Sources/UpdateCachedPeerData.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateCachedPeerData.swift
@@ -124,7 +124,7 @@ func fetchAndUpdateSupplementalCachedPeerData(peerId rawPeerId: PeerId, network:
     }
 }
 
-func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerId, network: Network, postbox: Postbox) -> Signal<Bool, NoError> {
+func _internal_fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerId, network: Network, postbox: Postbox) -> Signal<Bool, NoError> {
     return postbox.combinedView(keys: [.basicPeer(rawPeerId)])
     |> mapToSignal { views -> Signal<Bool, NoError> in
         if accountPeerId == rawPeerId {
@@ -133,7 +133,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
         guard let view = views.views[.basicPeer(rawPeerId)] as? BasicPeerView else {
             return .complete()
         }
-        guard let peer = view.peer else {
+        guard let _ = view.peer else {
             return .complete()
         }
         return .single(true)
@@ -217,7 +217,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                     }
                 }
             } else if peerId.namespace == Namespaces.Peer.CloudGroup {
-                return network.request(Api.functions.messages.getFullChat(chatId: peerId.id))
+                return network.request(Api.functions.messages.getFullChat(chatId: peerId.id._internalGetInt32Value()))
                 |> retryRequest
                 |> mapToSignal { result -> Signal<Bool, NoError> in
                     return postbox.transaction { transaction -> Bool in
@@ -236,7 +236,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                 for botInfo in chatFull.botInfo ?? [] {
                                     switch botInfo {
                                     case let .botInfo(userId, _, _):
-                                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                        let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                         let parsedBotInfo = BotInfo(apiBotInfo: botInfo)
                                         botInfos.append(CachedPeerBotInfo(peerId: peerId, botInfo: parsedBotInfo))
                                     }
@@ -306,7 +306,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                     if let inputCall = chatFull.call {
                                         switch inputCall {
                                         case let .inputGroupCall(id, accessHash):
-                                            updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title)
+                                            updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title, scheduleTimestamp: previous.activeCall?.scheduleTimestamp, subscribedToScheduled: previous.activeCall?.subscribedToScheduled ?? false)
                                         }
                                     }
                                     
@@ -338,7 +338,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                     }
                     return .single(nil)
                 }
-                let participantSignal = network.request(Api.functions.channels.getParticipant(channel: inputChannel, userId: .inputUserSelf))
+                let participantSignal = network.request(Api.functions.channels.getParticipant(channel: inputChannel, participant: .inputPeerSelf))
                 |> map(Optional.init)
                 |> `catch` { error -> Signal<Api.channels.ChannelParticipant?, NoError> in
                     return .single(nil)
@@ -381,7 +381,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             
                                             let linkedDiscussionPeerId: PeerId?
                                             if let linkedChatId = linkedChatId, linkedChatId != 0 {
-                                                linkedDiscussionPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: linkedChatId)
+                                                linkedDiscussionPeerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(linkedChatId))
                                             } else {
                                                 linkedDiscussionPeerId = nil
                                             }
@@ -399,7 +399,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             for botInfo in apiBotInfos {
                                                 switch botInfo {
                                                 case let .botInfo(userId, _, _):
-                                                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: userId)
+                                                    let peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId))
                                                     let parsedBotInfo = BotInfo(apiBotInfo: botInfo)
                                                     botInfos.append(CachedPeerBotInfo(peerId: peerId, botInfo: parsedBotInfo))
                                                 }
@@ -421,7 +421,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             
                                             var migrationReference: ChannelMigrationReference?
                                             if let migratedFromChatId = migratedFromChatId, let migratedFromMaxId = migratedFromMaxId {
-                                                migrationReference = ChannelMigrationReference(maxMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: migratedFromChatId), namespace: Namespaces.Message.Cloud, id: migratedFromMaxId))
+                                                migrationReference = ChannelMigrationReference(maxMessageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(migratedFromChatId)), namespace: Namespaces.Message.Cloud, id: migratedFromMaxId))
                                             }
                                             
                                             var peers: [Peer] = []
@@ -442,7 +442,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             
                                             if let participantResult = participantResult {
                                                 switch participantResult {
-                                                case let .channelParticipant(_, users):
+                                                case let .channelParticipant(_, chats, users):
                                                     for user in users {
                                                         if let telegramUser = TelegramUser.merge(transaction.getPeer(user.peerId) as? TelegramUser, rhs: user) {
                                                             peers.append(telegramUser)
@@ -451,6 +451,11 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                                             }
                                                         }
                                                     }
+                                                    for chat in chats {
+                                                        if let groupOrChannel = parseTelegramGroupOrChannel(chat: chat) {
+                                                            peers.append(groupOrChannel)
+                                                        }
+                                                    }
                                                 }
                                             }
                                             
@@ -463,7 +468,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             let stickerPack: StickerPackCollectionInfo? = stickerSet.flatMap { apiSet -> StickerPackCollectionInfo in
                                                 let namespace: ItemCollectionId.Namespace
                                                 switch apiSet {
-                                                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _):
+                                                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _, _):
                                                         if (flags & (1 << 3)) != 0 {
                                                             namespace = Namespaces.ItemCollection.CloudMaskPacks
                                                         } else {
@@ -482,10 +487,10 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                             var invitedBy: PeerId?
                                             if let participantResult = participantResult {
                                                 switch participantResult {
-                                                case let.channelParticipant(participant, _):
+                                                case let.channelParticipant(participant, _, _):
                                                     switch participant {
                                                     case let .channelParticipantSelf(_, inviterId, _):
-                                                        invitedBy = PeerId(namespace: Namespaces.Peer.CloudUser, id: inviterId)
+                                                        invitedBy = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(inviterId))
                                                     default:
                                                         break
                                                     }
@@ -511,7 +516,7 @@ func fetchAndUpdateCachedPeerData(accountPeerId: PeerId, peerId rawPeerId: PeerI
                                                 if let inputCall = inputCall {
                                                     switch inputCall {
                                                     case let .inputGroupCall(id, accessHash):
-                                                        updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title)
+                                                        updatedActiveCall = CachedChannelData.ActiveCall(id: id, accessHash: accessHash, title: previous.activeCall?.title, scheduleTimestamp: previous.activeCall?.scheduleTimestamp, subscribedToScheduled: previous.activeCall?.subscribedToScheduled ?? false)
                                                     }
                                                 }
                                                 
diff --git a/submodules/TelegramCore/Sources/UpdateGroupSpecificStickerset.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateGroupSpecificStickerset.swift
similarity index 89%
rename from submodules/TelegramCore/Sources/UpdateGroupSpecificStickerset.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateGroupSpecificStickerset.swift
index 860cdea9cc..22f063f1d4 100644
--- a/submodules/TelegramCore/Sources/UpdateGroupSpecificStickerset.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdateGroupSpecificStickerset.swift
@@ -9,7 +9,7 @@ public enum UpdateGroupSpecificStickersetError {
     case generic
 }
 
-public func updateGroupSpecificStickerset(postbox: Postbox, network: Network, peerId: PeerId, info: StickerPackCollectionInfo?) -> Signal<Void, UpdateGroupSpecificStickersetError> {
+func _internal_updateGroupSpecificStickerset(postbox: Postbox, network: Network, peerId: PeerId, info: StickerPackCollectionInfo?) -> Signal<Void, UpdateGroupSpecificStickersetError> {
     return postbox.loadedPeerWithId(peerId)
     |> castError(UpdateGroupSpecificStickersetError.self)
     |> mapToSignal { peer -> Signal<Void, UpdateGroupSpecificStickersetError> in
diff --git a/submodules/TelegramCore/Sources/UpdatePeerInfo.swift b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdatePeerInfo.swift
similarity index 92%
rename from submodules/TelegramCore/Sources/UpdatePeerInfo.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdatePeerInfo.swift
index d70ded671a..6eaba7a6ae 100644
--- a/submodules/TelegramCore/Sources/UpdatePeerInfo.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Peers/UpdatePeerInfo.swift
@@ -10,7 +10,7 @@ public enum UpdatePeerTitleError {
     case generic
 }
 
-public func updatePeerTitle(account: Account, peerId: PeerId, title: String) -> Signal<Void, UpdatePeerTitleError> {
+func _internal_updatePeerTitle(account: Account, peerId: PeerId, title: String) -> Signal<Void, UpdatePeerTitleError> {
     return account.postbox.transaction { transaction -> Signal<Void, UpdatePeerTitleError> in
         if let peer = transaction.getPeer(peerId) {
             if let peer = peer as? TelegramChannel, let inputChannel = apiInputChannel(peer) {
@@ -27,10 +27,10 @@ public func updatePeerTitle(account: Account, peerId: PeerId, title: String) ->
                                     return updated
                                 })
                             }
-                        } |> mapError { _ -> UpdatePeerTitleError in return .generic }
+                        } |> mapError { _ -> UpdatePeerTitleError in }
                     }
             } else if let peer = peer as? TelegramGroup {
-                return account.network.request(Api.functions.messages.editChatTitle(chatId: peer.id.id, title: title))
+                return account.network.request(Api.functions.messages.editChatTitle(chatId: peer.id.id._internalGetInt32Value(), title: title))
                     |> mapError { _ -> UpdatePeerTitleError in
                         return .generic
                     }
@@ -58,7 +58,7 @@ public enum UpdatePeerDescriptionError {
     case generic
 }
 
-public func updatePeerDescription(account: Account, peerId: PeerId, description: String?) -> Signal<Void, UpdatePeerDescriptionError> {
+func _internal_updatePeerDescription(account: Account, peerId: PeerId, description: String?) -> Signal<Void, UpdatePeerDescriptionError> {
     return account.postbox.transaction { transaction -> Signal<Void, UpdatePeerDescriptionError> in
         if let peer = transaction.getPeer(peerId) {
             if (peer is TelegramChannel || peer is TelegramGroup), let inputPeer = apiInputPeer(peer) {
diff --git a/submodules/TelegramCore/Sources/PeersNearby.swift b/submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/PeersNearby.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/PeersNearby.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/PeersNearby.swift
index 6823782443..e7c766a80b 100644
--- a/submodules/TelegramCore/Sources/PeersNearby.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/PeersNearby.swift
@@ -25,7 +25,7 @@ public enum PeerNearbyVisibilityUpdate {
     case invisible
 }
 
-public func updatePeersNearbyVisibility(account: Account, update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal<Void, NoError> {
+func _internal_updatePeersNearbyVisibility(account: Account, update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal<Void, NoError> {
     var flags: Int32 = 0
     var geoPoint: Api.InputGeoPoint
     var selfExpires: Int32?
@@ -138,7 +138,6 @@ public final class PeersNearbyContext {
         }
         |> restartIfError
         |> `catch` { _ -> Signal<[PeerNearby], NoError> in
-            return .single([])
         }
         
         self.disposable.set((combined
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/TelegramEnginePeersNearby.swift b/submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/TelegramEnginePeersNearby.swift
new file mode 100644
index 0000000000..3117401c2c
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/PeersNearby/TelegramEnginePeersNearby.swift
@@ -0,0 +1,15 @@
+import SwiftSignalKit
+
+public extension TelegramEngine {
+    final class PeersNearby {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func updatePeersNearbyVisibility(update: PeerNearbyVisibilityUpdate, background: Bool) -> Signal<Void, NoError> {
+            return _internal_updatePeersNearbyVisibility(account: self.account, update: update, background: background)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/ActiveSessionsContext.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/ActiveSessionsContext.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/ActiveSessionsContext.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/ActiveSessionsContext.swift
index c060382a5a..637e075d18 100644
--- a/submodules/TelegramCore/Sources/ActiveSessionsContext.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/ActiveSessionsContext.swift
@@ -136,7 +136,7 @@ public final class ActiveSessionsContext {
         }
     }
     
-    public init(account: Account) {
+    init(account: Account) {
         self.impl = QueueLocalObject(queue: Queue.mainQueue(), generate: {
             return ActiveSessionsContextImpl(account: account)
         })
@@ -218,7 +218,7 @@ public final class WebSessionsContext {
     
     private let disposable = MetaDisposable()
     
-    public init(account: Account) {
+    init(account: Account) {
         assert(Queue.mainQueue().isCurrent())
         
         self.account = account
diff --git a/submodules/TelegramCore/Sources/BlockedPeers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeers.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/BlockedPeers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeers.swift
index c671ed35a4..bd5794c41c 100644
--- a/submodules/TelegramCore/Sources/BlockedPeers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeers.swift
@@ -41,7 +41,7 @@ public func requestBlockedPeers(account: Account) -> Signal<[Peer], NoError> {
         }
 }
 
-public func requestUpdatePeerIsBlocked(account: Account, peerId: PeerId, isBlocked: Bool) -> Signal<Void, NoError> {
+func _internal_requestUpdatePeerIsBlocked(account: Account, peerId: PeerId, isBlocked: Bool) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         if let peer = transaction.getPeer(peerId), let inputPeer = apiInputPeer(peer) {
             let signal: Signal<Api.Bool, MTRpcError>
diff --git a/submodules/TelegramCore/Sources/BlockedPeersContext.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeersContext.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/BlockedPeersContext.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeersContext.swift
index 06985ae459..fae1f08062 100644
--- a/submodules/TelegramCore/Sources/BlockedPeersContext.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/BlockedPeersContext.swift
@@ -3,7 +3,6 @@ import TelegramApi
 import Postbox
 import SwiftSignalKit
 import MtProtoKit
-
 import SyncCore
 
 public struct BlockedPeersContextState: Equatable {
diff --git a/submodules/TelegramCore/Sources/RecentAccountSession.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentAccountSession.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/RecentAccountSession.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentAccountSession.swift
diff --git a/submodules/TelegramCore/Sources/RecentAccountSessions.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentAccountSessions.swift
similarity index 83%
rename from submodules/TelegramCore/Sources/RecentAccountSessions.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentAccountSessions.swift
index 68ee35add2..3ceba550e1 100644
--- a/submodules/TelegramCore/Sources/RecentAccountSessions.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentAccountSessions.swift
@@ -3,7 +3,7 @@ import Postbox
 import TelegramApi
 import SwiftSignalKit
 
-public func requestRecentAccountSessions(account: Account) -> Signal<[RecentAccountSession], NoError> {
+func requestRecentAccountSessions(account: Account) -> Signal<[RecentAccountSession], NoError> {
     return account.network.request(Api.functions.account.getAuthorizations())
     |> retryRequest
     |> map { result -> [RecentAccountSession] in
@@ -23,7 +23,7 @@ public enum TerminateSessionError {
     case freshReset
 }
 
-public func terminateAccountSession(account: Account, hash: Int64) -> Signal<Void, TerminateSessionError> {
+func terminateAccountSession(account: Account, hash: Int64) -> Signal<Void, TerminateSessionError> {
     return account.network.request(Api.functions.account.resetAuthorization(hash: hash))
     |> mapError { error -> TerminateSessionError in
         if error.errorCode == 406 {
@@ -36,7 +36,7 @@ public func terminateAccountSession(account: Account, hash: Int64) -> Signal<Voi
     }
 }
 
-public func terminateOtherAccountSessions(account: Account) -> Signal<Void, TerminateSessionError> {
+func terminateOtherAccountSessions(account: Account) -> Signal<Void, TerminateSessionError> {
     return account.network.request(Api.functions.auth.resetAuthorizations())
     |> mapError { error -> TerminateSessionError in
         if error.errorCode == 406 {
diff --git a/submodules/TelegramCore/Sources/RecentWebSessions.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentWebSessions.swift
similarity index 81%
rename from submodules/TelegramCore/Sources/RecentWebSessions.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentWebSessions.swift
index 5c8d25baa9..d36c953a57 100644
--- a/submodules/TelegramCore/Sources/RecentWebSessions.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/RecentWebSessions.swift
@@ -21,7 +21,7 @@ public struct WebAuthorization : Equatable {
     }
 }
 
-public func webSessions(network: Network) -> Signal<([WebAuthorization], [PeerId: Peer]), NoError> {
+func webSessions(network: Network) -> Signal<([WebAuthorization], [PeerId: Peer]), NoError> {
     return network.request(Api.functions.account.getWebAuthorizations())
         |> retryRequest
         |> map { result -> ([WebAuthorization], [PeerId : Peer]) in
@@ -32,7 +32,7 @@ public func webSessions(network: Network) -> Signal<([WebAuthorization], [PeerId
                 for authorization in authorizations {
                     switch authorization {
                     case let .webAuthorization(hash, botId, domain, browser, platform, dateCreated, dateActive, ip, region):
-                        sessions.append(WebAuthorization(hash: hash, botId: PeerId(namespace: Namespaces.Peer.CloudUser, id: botId), domain: domain, browser: browser, platform: platform, dateCreated: dateCreated, dateActive: dateActive, ip: ip, region: region))
+                        sessions.append(WebAuthorization(hash: hash, botId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)), domain: domain, browser: browser, platform: platform, dateCreated: dateCreated, dateActive: dateActive, ip: ip, region: region))
                         
                     }
                 }
@@ -46,7 +46,7 @@ public func webSessions(network: Network) -> Signal<([WebAuthorization], [PeerId
 }
 
 
-public func terminateWebSession(network: Network, hash: Int64) -> Signal<Bool, NoError> {
+func terminateWebSession(network: Network, hash: Int64) -> Signal<Bool, NoError> {
     return network.request(Api.functions.account.resetWebAuthorization(hash: hash))
     |> retryRequest
     |> map { result in
@@ -61,7 +61,7 @@ public func terminateWebSession(network: Network, hash: Int64) -> Signal<Bool, N
 
 
 
-public func terminateAllWebSessions(network: Network) -> Signal<Void, NoError> {
+func terminateAllWebSessions(network: Network) -> Signal<Void, NoError> {
     return network.request(Api.functions.account.resetWebAuthorizations())
     |> retryRequest
     |> map { _ in }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Privacy/TelegramEnginePrivacy.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/TelegramEnginePrivacy.swift
new file mode 100644
index 0000000000..19533db705
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/TelegramEnginePrivacy.swift
@@ -0,0 +1,44 @@
+import SwiftSignalKit
+import Postbox
+
+public extension TelegramEngine {
+    final class Privacy {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func requestUpdatePeerIsBlocked(peerId: PeerId, isBlocked: Bool) -> Signal<Void, NoError> {
+            return _internal_requestUpdatePeerIsBlocked(account: self.account, peerId: peerId, isBlocked: isBlocked)
+        }
+
+        public func activeSessions() -> ActiveSessionsContext {
+            return ActiveSessionsContext(account: self.account)
+        }
+
+        public func webSessions() -> WebSessionsContext {
+            return WebSessionsContext(account: self.account)
+        }
+
+        public func requestAccountPrivacySettings() -> Signal<AccountPrivacySettings, NoError> {
+            return _internal_requestAccountPrivacySettings(account: self.account)
+        }
+
+        public func updateAccountAutoArchiveChats(value: Bool) -> Signal<Never, NoError> {
+            return _internal_updateAccountAutoArchiveChats(account: self.account, value: value)
+        }
+
+        public func updateAccountRemovalTimeout(timeout: Int32) -> Signal<Void, NoError> {
+            return _internal_updateAccountRemovalTimeout(account: self.account, timeout: timeout)
+        }
+
+        public func updatePhoneNumberDiscovery(value: Bool) -> Signal<Void, NoError> {
+            return _internal_updatePhoneNumberDiscovery(account: self.account, value: value)
+        }
+
+        public func updateSelectiveAccountPrivacySettings(type: UpdateSelectiveAccountPrivacySettingsType, settings: SelectivePrivacySettings) -> Signal<Void, NoError> {
+            return _internal_updateSelectiveAccountPrivacySettings(account: self.account, type: type, settings: settings)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/UpdatedAccountPrivacySettings.swift b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/UpdatedAccountPrivacySettings.swift
similarity index 94%
rename from submodules/TelegramCore/Sources/UpdatedAccountPrivacySettings.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Privacy/UpdatedAccountPrivacySettings.swift
index 0f8c5b47a6..b0e7daf71a 100644
--- a/submodules/TelegramCore/Sources/UpdatedAccountPrivacySettings.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Privacy/UpdatedAccountPrivacySettings.swift
@@ -5,7 +5,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func requestAccountPrivacySettings(account: Account) -> Signal<AccountPrivacySettings, NoError> {
+func _internal_requestAccountPrivacySettings(account: Account) -> Signal<AccountPrivacySettings, NoError> {
     let lastSeenPrivacy = account.network.request(Api.functions.account.getPrivacy(key: .inputPrivacyKeyStatusTimestamp))
     let groupPrivacy = account.network.request(Api.functions.account.getPrivacy(key: .inputPrivacyKeyChatInvite))
     let voiceCallPrivacy = account.network.request(Api.functions.account.getPrivacy(key: .inputPrivacyKeyPhoneCall))
@@ -140,8 +140,7 @@ public func requestAccountPrivacySettings(account: Account) -> Signal<AccountPri
     }
 }
 
-public func updateAccountAutoArchiveChats(account: Account, value: Bool) -> Signal<Never, NoError> {
-    
+func _internal_updateAccountAutoArchiveChats(account: Account, value: Bool) -> Signal<Never, NoError> {
     return account.network.request(Api.functions.account.setGlobalPrivacySettings(
         settings: .globalPrivacySettings(flags: 1 << 0, archiveAndMuteNewNoncontactPeers: value ? .boolTrue : .boolFalse)
     ))
@@ -149,7 +148,7 @@ public func updateAccountAutoArchiveChats(account: Account, value: Bool) -> Sign
     |> ignoreValues
 }
 
-public func updateAccountRemovalTimeout(account: Account, timeout: Int32) -> Signal<Void, NoError> {
+func _internal_updateAccountRemovalTimeout(account: Account, timeout: Int32) -> Signal<Void, NoError> {
     return account.network.request(Api.functions.account.setAccountTTL(ttl: .accountDaysTTL(days: timeout / (24 * 60 * 60))))
         |> retryRequest
         |> mapToSignal { _ -> Signal<Void, NoError> in
@@ -157,7 +156,7 @@ public func updateAccountRemovalTimeout(account: Account, timeout: Int32) -> Sig
         }
 }
 
-public func updatePhoneNumberDiscovery(account: Account, value: Bool) -> Signal<Void, NoError> {
+func _internal_updatePhoneNumberDiscovery(account: Account, value: Bool) -> Signal<Void, NoError> {
     var rules: [Api.InputPrivacyRule] = []
     if value {
         rules.append(.inputPrivacyValueAllowAll)
@@ -223,7 +222,7 @@ private func apiUserAndGroupIds(peerIds: [PeerId: SelectivePrivacyPeer]) -> (use
     return (users, groups)
 }
 
-public func updateSelectiveAccountPrivacySettings(account: Account, type: UpdateSelectiveAccountPrivacySettingsType, settings: SelectivePrivacySettings) -> Signal<Void, NoError> {
+func _internal_updateSelectiveAccountPrivacySettings(account: Account, type: UpdateSelectiveAccountPrivacySettingsType, settings: SelectivePrivacySettings) -> Signal<Void, NoError> {
     return account.postbox.transaction { transaction -> Signal<Void, NoError> in
         var rules: [Api.InputPrivacyRule] = []
         switch settings {
@@ -234,7 +233,7 @@ public func updateSelectiveAccountPrivacySettings(account: Account, type: Update
                     rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowUsers(users: apiInputUsers(transaction: transaction, peerIds: enablePeers.users)))
                 }
                 if !enablePeers.groups.isEmpty {
-                    rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowChatParticipants(chats: enablePeers.groups.map({ $0.id })))
+                    rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowChatParticipants(chats: enablePeers.groups.map({ $0.id._internalGetInt32Value() })))
                 }
                 
                 rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowAll)
@@ -246,14 +245,14 @@ public func updateSelectiveAccountPrivacySettings(account: Account, type: Update
                     rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowUsers(users: apiInputUsers(transaction: transaction, peerIds: enablePeers.users)))
                 }
                 if !enablePeers.groups.isEmpty {
-                    rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowChatParticipants(chats: enablePeers.groups.map({ $0.id })))
+                    rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowChatParticipants(chats: enablePeers.groups.map({ $0.id._internalGetInt32Value() })))
                 }
                 
                 if !disablePeers.users.isEmpty {
                     rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowUsers(users: apiInputUsers(transaction: transaction, peerIds: disablePeers.users)))
                 }
                 if !disablePeers.groups.isEmpty {
-                    rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowChatParticipants(chats: disablePeers.groups.map({ $0.id })))
+                    rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowChatParticipants(chats: disablePeers.groups.map({ $0.id._internalGetInt32Value() })))
                 }
             
                 rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowContacts)
@@ -264,7 +263,7 @@ public func updateSelectiveAccountPrivacySettings(account: Account, type: Update
                     rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowUsers(users: apiInputUsers(transaction: transaction, peerIds: disablePeers.users)))
                 }
                 if !disablePeers.groups.isEmpty {
-                    rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowChatParticipants(chats: disablePeers.groups.map({ $0.id })))
+                    rules.append(Api.InputPrivacyRule.inputPrivacyValueDisallowChatParticipants(chats: disablePeers.groups.map({ $0.id._internalGetInt32Value() })))
                 }
 
                 rules.append(Api.InputPrivacyRule.inputPrivacyValueAllowAll)
diff --git a/submodules/TelegramCore/Sources/DeepLinkInfo.swift b/submodules/TelegramCore/Sources/TelegramEngine/Resolve/DeepLinkInfo.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/DeepLinkInfo.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Resolve/DeepLinkInfo.swift
index c56272ad08..c517df7d6c 100644
--- a/submodules/TelegramCore/Sources/DeepLinkInfo.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Resolve/DeepLinkInfo.swift
@@ -10,7 +10,7 @@ public struct DeepLinkInfo {
     public let updateApp: Bool
 }
 
-public func getDeepLinkInfo(network: Network, path: String) -> Signal<DeepLinkInfo?, NoError> {
+func _internal_getDeepLinkInfo(network: Network, path: String) -> Signal<DeepLinkInfo?, NoError> {
     return network.request(Api.functions.help.getDeepLinkInfo(path: path)) |> retryRequest
     |> map { value -> DeepLinkInfo? in
         switch value {
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Resolve/TelegramEngineResolve.swift b/submodules/TelegramCore/Sources/TelegramEngine/Resolve/TelegramEngineResolve.swift
new file mode 100644
index 0000000000..909b39dda8
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Resolve/TelegramEngineResolve.swift
@@ -0,0 +1,16 @@
+import SwiftSignalKit
+import Postbox
+
+public extension TelegramEngine {
+    final class Resolve {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func getDeepLinkInfo(path: String) -> Signal<DeepLinkInfo?, NoError> {
+            return _internal_getDeepLinkInfo(network: self.account.network, path: path)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/CollectCacheUsageStats.swift b/submodules/TelegramCore/Sources/TelegramEngine/Resources/CollectCacheUsageStats.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/CollectCacheUsageStats.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Resources/CollectCacheUsageStats.swift
index 1c3bc503de..f668e7e65f 100644
--- a/submodules/TelegramCore/Sources/CollectCacheUsageStats.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Resources/CollectCacheUsageStats.swift
@@ -53,7 +53,7 @@ private final class CacheUsageStatsState {
     var upperBound: MessageIndex?
 }
 
-public func collectCacheUsageStats(account: Account, peerId: PeerId? = nil, additionalCachePaths: [String] = [], logFilesPath: String? = nil) -> Signal<CacheUsageStatsResult, NoError> {
+func _internal_collectCacheUsageStats(account: Account, peerId: PeerId? = nil, additionalCachePaths: [String] = [], logFilesPath: String? = nil) -> Signal<CacheUsageStatsResult, NoError> {
     var initialState = CacheUsageStatsState()
     if let peerId = peerId {
         initialState.lowerBound = MessageIndex.lowerBound(peerId: peerId)
@@ -291,6 +291,6 @@ public func collectCacheUsageStats(account: Account, peerId: PeerId? = nil, addi
     }
 }
 
-public func clearCachedMediaResources(account: Account, mediaResourceIds: Set<WrappedMediaResourceId>) -> Signal<Void, NoError> {
+func _internal_clearCachedMediaResources(account: Account, mediaResourceIds: Set<WrappedMediaResourceId>) -> Signal<Void, NoError> {
     return account.postbox.mediaBox.removeCachedResources(mediaResourceIds)
 }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Resources/TelegramEngineResources.swift b/submodules/TelegramCore/Sources/TelegramEngine/Resources/TelegramEngineResources.swift
new file mode 100644
index 0000000000..726005cae6
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Resources/TelegramEngineResources.swift
@@ -0,0 +1,24 @@
+import SwiftSignalKit
+import Postbox
+
+public extension TelegramEngine {
+    final class Resources {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func preUpload(id: Int64, encrypt: Bool, tag: MediaResourceFetchTag?, source: Signal<MediaResourceData, NoError>, onComplete: (()->Void)? = nil) {
+            return self.account.messageMediaPreuploadManager.add(network: self.account.network, postbox: self.account.postbox, id: id, encrypt: encrypt, tag: tag, source: source, onComplete: onComplete)
+        }
+
+        public func collectCacheUsageStats(peerId: PeerId? = nil, additionalCachePaths: [String] = [], logFilesPath: String? = nil) -> Signal<CacheUsageStatsResult, NoError> {
+            return _internal_collectCacheUsageStats(account: self.account, peerId: peerId, additionalCachePaths: additionalCachePaths, logFilesPath: logFilesPath)
+        }
+
+        public func clearCachedMediaResources(mediaResourceIds: Set<WrappedMediaResourceId>) -> Signal<Void, NoError> {
+            return _internal_clearCachedMediaResources(account: self.account, mediaResourceIds: mediaResourceIds)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/AccessSecureId.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/AccessSecureId.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/AccessSecureId.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/AccessSecureId.swift
index 11bdaadc44..96e678f46e 100644
--- a/submodules/TelegramCore/Sources/AccessSecureId.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/AccessSecureId.swift
@@ -153,8 +153,8 @@ public enum SecureIdAccessError {
     case secretPasswordMismatch
 }
 
-public func accessSecureId(network: Network, password: String) -> Signal<(context: SecureIdAccessContext, settings: TwoStepVerificationSettings), SecureIdAccessError> {
-    return requestTwoStepVerifiationSettings(network: network, password: password)
+func _internal_accessSecureId(network: Network, password: String) -> Signal<(context: SecureIdAccessContext, settings: TwoStepVerificationSettings), SecureIdAccessError> {
+    return _internal_requestTwoStepVerifiationSettings(network: network, password: password)
     |> mapError { error -> SecureIdAccessError in
         return .passwordError(error)
     }
diff --git a/submodules/TelegramCore/Sources/GrantSecureIdAccess.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/GrantSecureIdAccess.swift
similarity index 97%
rename from submodules/TelegramCore/Sources/GrantSecureIdAccess.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/GrantSecureIdAccess.swift
index ef93a7ac0f..c191a5b09b 100644
--- a/submodules/TelegramCore/Sources/GrantSecureIdAccess.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/GrantSecureIdAccess.swift
@@ -333,7 +333,7 @@ public func grantSecureIdAccess(network: Network, peerId: PeerId, publicKey: Str
         valueHashes.append(.secureValueHash(type: apiSecureValueType(value: value.value), hash: Buffer(data: value.opaqueHash)))
     }
     
-    return network.request(Api.functions.account.acceptAuthorization(botId: peerId.id, scope: scope, publicKey: publicKey, valueHashes: valueHashes, credentials: .secureCredentialsEncrypted(data: Buffer(data: encryptedCredentialsData), hash: Buffer(data: decryptedCredentialsHash), secret: Buffer(data: encryptedSecretData))))
+    return network.request(Api.functions.account.acceptAuthorization(botId: peerId.id._internalGetInt32Value(), scope: scope, publicKey: publicKey, valueHashes: valueHashes, credentials: .secureCredentialsEncrypted(data: Buffer(data: encryptedCredentialsData), hash: Buffer(data: decryptedCredentialsHash), secret: Buffer(data: encryptedSecretData))))
     |> mapError { error -> GrantSecureIdAccessError in
         return .generic
     }
diff --git a/submodules/TelegramCore/Sources/RequestSecureIdForm.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/RequestSecureIdForm.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/RequestSecureIdForm.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/RequestSecureIdForm.swift
index 6a79f35ff1..e7d82f7a20 100644
--- a/submodules/TelegramCore/Sources/RequestSecureIdForm.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/RequestSecureIdForm.swift
@@ -251,7 +251,7 @@ public func requestSecureIdForm(postbox: Postbox, network: Network, peerId: Peer
     if publicKey.isEmpty {
         return .fail(.serverError("PUBLIC_KEY_REQUIRED"))
     }
-    return network.request(Api.functions.account.getAuthorizationForm(botId: peerId.id, scope: scope, publicKey: publicKey))
+    return network.request(Api.functions.account.getAuthorizationForm(botId: peerId.id._internalGetInt32Value(), scope: scope, publicKey: publicKey))
     |> mapError { error -> RequestSecureIdFormError in
         switch error.errorDescription {
             case "APP_VERSION_OUTDATED":
diff --git a/submodules/TelegramCore/Sources/SaveSecureIdValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SaveSecureIdValue.swift
similarity index 99%
rename from submodules/TelegramCore/Sources/SaveSecureIdValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SaveSecureIdValue.swift
index 06fb9d5cdb..1523513f4c 100644
--- a/submodules/TelegramCore/Sources/SaveSecureIdValue.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SaveSecureIdValue.swift
@@ -276,7 +276,7 @@ public func deleteSecureIdValues(network: Network, keys: Set<SecureIdValueKey>)
 }
 
 public func dropSecureId(network: Network, currentPassword: String) -> Signal<Void, AuthorizationPasswordVerificationError> {
-    return twoStepAuthData(network)
+    return _internal_twoStepAuthData(network)
     |> mapError { _ -> AuthorizationPasswordVerificationError in
         return .generic
     }
diff --git a/submodules/TelegramCore/Sources/SecureFileMediaResource.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureFileMediaResource.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureFileMediaResource.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureFileMediaResource.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdAddressValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdAddressValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdAddressValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdAddressValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdBankStatementValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdBankStatementValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdBankStatementValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdBankStatementValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdConfiguration.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdConfiguration.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdConfiguration.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdConfiguration.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdDataTypes.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdDataTypes.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdDataTypes.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdDataTypes.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdDriversLicenseValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdDriversLicenseValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdDriversLicenseValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdDriversLicenseValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdEmailValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdEmailValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdEmailValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdEmailValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdForm.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdForm.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdForm.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdForm.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdIDCardValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdIDCardValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdIDCardValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdIDCardValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdInternalPassportValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdInternalPassportValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdInternalPassportValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdInternalPassportValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdPadding.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPadding.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdPadding.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPadding.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdPassportRegistrationValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPassportRegistrationValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdPassportRegistrationValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPassportRegistrationValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdPassportValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPassportValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdPassportValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPassportValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdPersonalDetailsValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPersonalDetailsValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdPersonalDetailsValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPersonalDetailsValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdPhoneValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPhoneValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdPhoneValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdPhoneValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdRentalAgreementValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdRentalAgreementValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdRentalAgreementValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdRentalAgreementValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdTemporaryRegistrationValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdTemporaryRegistrationValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdTemporaryRegistrationValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdTemporaryRegistrationValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdUtilityBillValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdUtilityBillValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdUtilityBillValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdUtilityBillValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValue.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdValueAccessContext.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValueAccessContext.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdValueAccessContext.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValueAccessContext.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdValueContentError.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValueContentError.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdValueContentError.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdValueContentError.swift
diff --git a/submodules/TelegramCore/Sources/SecureIdVerificationDocumentReference.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdVerificationDocumentReference.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/SecureIdVerificationDocumentReference.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/SecureIdVerificationDocumentReference.swift
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/SecureId/TelegramEngineSecureId.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/TelegramEngineSecureId.swift
new file mode 100644
index 0000000000..935ac07d37
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/TelegramEngineSecureId.swift
@@ -0,0 +1,15 @@
+import SwiftSignalKit
+
+public extension TelegramEngine {
+    final class SecureId {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func accessSecureId(password: String) -> Signal<(context: SecureIdAccessContext, settings: TwoStepVerificationSettings), SecureIdAccessError> {
+            return _internal_accessSecureId(network: self.account.network, password: password)
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/UploadSecureIdFile.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/UploadSecureIdFile.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/UploadSecureIdFile.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/UploadSecureIdFile.swift
diff --git a/submodules/TelegramCore/Sources/VerifySecureIdValue.swift b/submodules/TelegramCore/Sources/TelegramEngine/SecureId/VerifySecureIdValue.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/VerifySecureIdValue.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/SecureId/VerifySecureIdValue.swift
diff --git a/submodules/TelegramCore/Sources/ArchivedStickerPacks.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/ArchivedStickerPacks.swift
similarity index 87%
rename from submodules/TelegramCore/Sources/ArchivedStickerPacks.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/ArchivedStickerPacks.swift
index 5ffd9cb9b8..dac1149970 100644
--- a/submodules/TelegramCore/Sources/ArchivedStickerPacks.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/ArchivedStickerPacks.swift
@@ -29,7 +29,7 @@ public final class ArchivedStickerPackItem {
     }
 }
 
-public func archivedStickerPacks(account: Account, namespace: ArchivedStickerPacksNamespace = .stickers) -> Signal<[ArchivedStickerPackItem], NoError> {
+func _internal_archivedStickerPacks(account: Account, namespace: ArchivedStickerPacksNamespace = .stickers) -> Signal<[ArchivedStickerPackItem], NoError> {
     var flags: Int32 = 0
     if case .masks = namespace {
         flags |= 1 << 0
@@ -50,7 +50,7 @@ public func archivedStickerPacks(account: Account, namespace: ArchivedStickerPac
     }
 }
 
-public func removeArchivedStickerPack(account: Account, info: StickerPackCollectionInfo) -> Signal<Void, NoError> {
+func _internal_removeArchivedStickerPack(account: Account, info: StickerPackCollectionInfo) -> Signal<Void, NoError> {
     return account.network.request(Api.functions.messages.uninstallStickerSet(stickerset: Api.InputStickerSet.inputStickerSetID(id: info.id.id, accessHash: info.accessHash)))
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .single(.boolFalse)
diff --git a/submodules/TelegramCore/Sources/CachedStickerPack.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/CachedStickerPack.swift
similarity index 98%
rename from submodules/TelegramCore/Sources/CachedStickerPack.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/CachedStickerPack.swift
index 3362bb657f..f9b31ebe8a 100644
--- a/submodules/TelegramCore/Sources/CachedStickerPack.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/CachedStickerPack.swift
@@ -36,7 +36,7 @@ func cacheStickerPack(transaction: Transaction, info: StickerPackCollectionInfo,
     }
 }
 
-public func cachedStickerPack(postbox: Postbox, network: Network, reference: StickerPackReference, forceRemote: Bool) -> Signal<CachedStickerPackResult, NoError> {
+func _internal_cachedStickerPack(postbox: Postbox, network: Network, reference: StickerPackReference, forceRemote: Bool) -> Signal<CachedStickerPackResult, NoError> {
     return postbox.transaction { transaction -> CachedStickerPackResult? in
         if let (info, items, local) = cachedStickerPack(transaction: transaction, reference: reference) {
             if local {
diff --git a/submodules/TelegramCore/Sources/EmojiKeywords.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/EmojiKeywords.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/EmojiKeywords.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/EmojiKeywords.swift
index 03f7d35eb8..7dd137a10f 100644
--- a/submodules/TelegramCore/Sources/EmojiKeywords.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/EmojiKeywords.swift
@@ -11,7 +11,7 @@ private enum SearchEmojiKeywordsIntermediateResult {
     case completed([EmojiKeywordItem])
 }
 
-public func searchEmojiKeywords(postbox: Postbox, inputLanguageCode: String, query: String, completeMatch: Bool) -> Signal<[EmojiKeywordItem], NoError> {
+func _internal_searchEmojiKeywords(postbox: Postbox, inputLanguageCode: String, query: String, completeMatch: Bool) -> Signal<[EmojiKeywordItem], NoError> {
     guard !query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty else {
         return .single([])
     }
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Stickers/ImportStickers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/ImportStickers.swift
new file mode 100644
index 0000000000..78423d64e7
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/ImportStickers.swift
@@ -0,0 +1,253 @@
+import Foundation
+import Postbox
+import SwiftSignalKit
+import TelegramApi
+
+import SyncCore
+
+public enum UploadStickerStatus {
+    case progress(Float)
+    case complete(CloudDocumentMediaResource, String)
+}
+
+public enum UploadStickerError {
+    case generic
+}
+
+private struct UploadedStickerData {
+    fileprivate let resource: MediaResource
+    fileprivate let content: UploadedStickerDataContent
+}
+
+private enum UploadedStickerDataContent {
+    case result(MultipartUploadResult)
+    case error
+}
+
+private func uploadedSticker(postbox: Postbox, network: Network, resource: MediaResource) -> Signal<UploadedStickerData, NoError> {
+    return multipartUpload(network: network, postbox: postbox, source: .resource(.standalone(resource: resource)), encrypt: false, tag: TelegramMediaResourceFetchTag(statsCategory: .file), hintFileSize: nil, hintFileIsLarge: false, forceNoBigParts: false)
+    |> map { result -> UploadedStickerData in
+        return UploadedStickerData(resource: resource, content: .result(result))
+    }
+    |> `catch` { _ -> Signal<UploadedStickerData, NoError> in
+        return .single(UploadedStickerData(resource: resource, content: .error))
+    }
+}
+
+func _internal_uploadSticker(account: Account, peer: Peer, resource: MediaResource, alt: String, dimensions: PixelDimensions, isAnimated: Bool) -> Signal<UploadStickerStatus, UploadStickerError> {
+    guard let inputPeer = apiInputPeer(peer) else {
+        return .fail(.generic)
+    }
+    return uploadedSticker(postbox: account.postbox, network: account.network, resource: resource)
+    |> mapError { _ -> UploadStickerError in return .generic }
+    |> mapToSignal { result -> Signal<UploadStickerStatus, UploadStickerError> in
+        switch result.content {
+            case .error:
+                return .fail(.generic)
+            case let .result(resultData):
+                switch resultData {
+                    case let .progress(progress):
+                        return .single(.progress(progress))
+                    case let .inputFile(file):
+                        var flags: Int32 = 0
+                        flags |= (1 << 4)
+                        var attributes: [Api.DocumentAttribute] = []
+                        attributes.append(.documentAttributeSticker(flags: 0, alt: alt, stickerset: .inputStickerSetEmpty, maskCoords: nil))
+                        attributes.append(.documentAttributeImageSize(w: dimensions.width, h: dimensions.height))
+                        return account.network.request(Api.functions.messages.uploadMedia(peer: inputPeer, media: Api.InputMedia.inputMediaUploadedDocument(flags: flags, file: file, thumb: nil, mimeType: isAnimated ? "application/x-tgsticker": "image/png", attributes: attributes, stickers: nil, ttlSeconds: nil)))
+                        |> mapError { _ -> UploadStickerError in return .generic }
+                        |> mapToSignal { media -> Signal<UploadStickerStatus, UploadStickerError> in
+                            switch media {
+                                case let .messageMediaDocument(_, document, _):
+                                    if let document = document, let file = telegramMediaFileFromApiDocument(document), let resource = file.resource as? CloudDocumentMediaResource {
+                                        return .single(.complete(resource, file.mimeType))
+                                    }
+                                default:
+                                    break
+                            }
+                            return .fail(.generic)
+                        }
+                    default:
+                        return .fail(.generic)
+                }
+        }
+    }
+}
+
+public enum CreateStickerSetError {
+    case generic
+}
+
+public struct ImportSticker {
+    public let resource: MediaResource
+    let emojis: [String]
+    public let dimensions: PixelDimensions
+    
+    public init(resource: MediaResource, emojis: [String], dimensions: PixelDimensions) {
+        self.resource = resource
+        self.emojis = emojis
+        self.dimensions = dimensions
+    }
+}
+
+public enum CreateStickerSetStatus {
+    case progress(Float, Int32, Int32)
+    case complete(StickerPackCollectionInfo, [ItemCollectionItem])
+}
+
+func _internal_createStickerSet(account: Account, title: String, shortName: String, stickers: [ImportSticker], thumbnail: ImportSticker?, isAnimated: Bool, software: String?) -> Signal<CreateStickerSetStatus, CreateStickerSetError> {
+    return account.postbox.loadedPeerWithId(account.peerId)
+    |> castError(CreateStickerSetError.self)
+    |> mapToSignal { peer -> Signal<CreateStickerSetStatus, CreateStickerSetError> in
+        guard let inputUser = apiInputUser(peer) else {
+            return .fail(.generic)
+        }
+        var uploadStickers: [Signal<UploadStickerStatus, CreateStickerSetError>] = []
+        var stickers = stickers
+        if let thumbnail = thumbnail {
+            stickers.append(thumbnail)
+        }
+        for sticker in stickers {
+            if let resource = sticker.resource as? CloudDocumentMediaResource {
+                uploadStickers.append(.single(.complete(resource, isAnimated ? "application/x-tgsticker": "image/png")))
+            } else {
+                uploadStickers.append(_internal_uploadSticker(account: account, peer: peer, resource: sticker.resource, alt: sticker.emojis.first ?? "", dimensions: sticker.dimensions, isAnimated: isAnimated)
+                |> mapError { _ -> CreateStickerSetError in
+                    return .generic
+                })
+            }
+        }
+        return combineLatest(uploadStickers)
+        |> mapToSignal { uploadedStickers -> Signal<CreateStickerSetStatus, CreateStickerSetError> in
+            var resources: [CloudDocumentMediaResource] = []
+            for sticker in uploadedStickers {
+                if case let .complete(resource, _) = sticker {
+                    resources.append(resource)
+                }
+            }
+            if resources.count == stickers.count {
+                var flags: Int32 = 0
+                if isAnimated {
+                    flags |= (1 << 1)
+                }
+                var inputStickers: [Api.InputStickerSetItem] = []
+                let stickerDocuments = thumbnail != nil ? resources.dropLast() : resources
+                for i in 0 ..< stickerDocuments.count {
+                    let sticker = stickers[i]
+                    let resource = resources[i]
+                    inputStickers.append(.inputStickerSetItem(flags: 0, document: .inputDocument(id: resource.fileId, accessHash: resource.accessHash, fileReference: Buffer(data: resource.fileReference ?? Data())), emoji: sticker.emojis.first ?? "", maskCoords: nil))
+                }
+                var thumbnailDocument: Api.InputDocument?
+                if thumbnail != nil, let resource = resources.last {
+                    flags |= (1 << 2)
+                    thumbnailDocument = .inputDocument(id: resource.fileId, accessHash: resource.accessHash, fileReference: Buffer(data: resource.fileReference ?? Data()))
+                }
+                if let software = software, !software.isEmpty {
+                    flags |= (1 << 3)
+                }
+                return account.network.request(Api.functions.stickers.createStickerSet(flags: flags, userId: inputUser, title: title, shortName: shortName, thumb: thumbnailDocument, stickers: inputStickers, software: software))
+                |> mapError { error -> CreateStickerSetError in
+                    return .generic
+                }
+                |> mapToSignal { result -> Signal<CreateStickerSetStatus, CreateStickerSetError> in
+                    let info: StickerPackCollectionInfo
+                    var items: [ItemCollectionItem] = []
+                    
+                    switch result {
+                    case let .stickerSet(set, packs, documents):
+                        let namespace: ItemCollectionId.Namespace
+                        switch set {
+                            case let .stickerSet(flags, _, _, _, _, _, _, _, _, _, _):
+                                if (flags & (1 << 3)) != 0 {
+                                    namespace = Namespaces.ItemCollection.CloudMaskPacks
+                                } else {
+                                    namespace = Namespaces.ItemCollection.CloudStickerPacks
+                                }
+                        }
+                        info = StickerPackCollectionInfo(apiSet: set, namespace: namespace)
+                        var indexKeysByFile: [MediaId: [MemoryBuffer]] = [:]
+                        for pack in packs {
+                            switch pack {
+                                case let .stickerPack(text, fileIds):
+                                    let key = ValueBoxKey(text).toMemoryBuffer()
+                                    for fileId in fileIds {
+                                        let mediaId = MediaId(namespace: Namespaces.Media.CloudFile, id: fileId)
+                                        if indexKeysByFile[mediaId] == nil {
+                                            indexKeysByFile[mediaId] = [key]
+                                        } else {
+                                            indexKeysByFile[mediaId]!.append(key)
+                                        }
+                                    }
+                            }
+                        }
+                        
+                        for apiDocument in documents {
+                            if let file = telegramMediaFileFromApiDocument(apiDocument), let id = file.id {
+                                let fileIndexKeys: [MemoryBuffer]
+                                if let indexKeys = indexKeysByFile[id] {
+                                    fileIndexKeys = indexKeys
+                                } else {
+                                    fileIndexKeys = []
+                                }
+                                items.append(StickerPackItem(index: ItemCollectionItemIndex(index: Int32(items.count), id: id.id), file: file, indexKeys: fileIndexKeys))
+                            }
+                        }
+                    }
+                    return .single(.complete(info, items))
+                }
+            } else {
+                var totalProgress: Float = 0.0
+                var completeCount: Int32 = 0
+                for sticker in uploadedStickers {
+                    switch sticker {
+                        case .complete:
+                            totalProgress += 1.0
+                            completeCount += 1
+                        case let .progress(progress):
+                            totalProgress += progress
+                            if progress == 1.0 {
+                                completeCount += 1
+                            }
+                    }
+                }
+                let normalizedProgress = min(1.0, max(0.0, totalProgress / Float(stickers.count)))
+                return .single(.progress(normalizedProgress, completeCount, Int32(uploadedStickers.count)))
+            }
+        }
+    }
+}
+
+func _internal_getStickerSetShortNameSuggestion(account: Account, title: String) -> Signal<String?, NoError> {
+    return account.network.request(Api.functions.stickers.suggestShortName(title: title))
+    |> map (Optional.init)
+    |> `catch` { _ in
+        return .single(nil)
+    }
+    |> map { result in
+        guard let result = result else {
+            return nil
+        }
+        switch result {
+            case let .suggestedShortName(shortName):
+                return shortName
+        }
+    }
+}
+
+func _internal_stickerSetShortNameAvailability(account: Account, shortName: String) -> Signal<AddressNameAvailability, NoError> {
+    return account.network.request(Api.functions.stickers.checkShortName(shortName: shortName))
+    |> map { result -> AddressNameAvailability in
+        switch result {
+            case .boolTrue:
+                return .available
+            case .boolFalse:
+                return .taken
+        }
+    }
+    |> `catch` { error -> Signal<AddressNameAvailability, NoError> in
+        if error.errorDescription == "SHORT_NAME_OCCUPIED" {
+            return .single(.taken)
+        }
+        return .single(.invalid)
+    }
+}
diff --git a/submodules/TelegramCore/Sources/LoadedStickerPack.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/LoadedStickerPack.swift
similarity index 93%
rename from submodules/TelegramCore/Sources/LoadedStickerPack.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/LoadedStickerPack.swift
index c793a70259..f3349c812e 100644
--- a/submodules/TelegramCore/Sources/LoadedStickerPack.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/LoadedStickerPack.swift
@@ -47,7 +47,7 @@ func updatedRemoteStickerPack(postbox: Postbox, network: Network, reference: Sti
             case let .stickerSet(set, packs, documents):
                 let namespace: ItemCollectionId.Namespace
                 switch set {
-                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _):
+                    case let .stickerSet(flags, _, _, _, _, _, _, _, _, _, _):
                         if (flags & (1 << 3)) != 0 {
                             namespace = Namespaces.ItemCollection.CloudMaskPacks
                         } else {
@@ -95,8 +95,8 @@ func updatedRemoteStickerPack(postbox: Postbox, network: Network, reference: Sti
         }
 }
 
-public func loadedStickerPack(postbox: Postbox, network: Network, reference: StickerPackReference, forceActualized: Bool) -> Signal<LoadedStickerPack, NoError> {
-    return cachedStickerPack(postbox: postbox, network: network, reference: reference, forceRemote: forceActualized)
+func _internal_loadedStickerPack(postbox: Postbox, network: Network, reference: StickerPackReference, forceActualized: Bool) -> Signal<LoadedStickerPack, NoError> {
+    return _internal_cachedStickerPack(postbox: postbox, network: network, reference: reference, forceRemote: forceActualized)
     |> map { result -> LoadedStickerPack in
         switch result {
             case .none:
diff --git a/submodules/TelegramCore/Sources/SearchStickers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/SearchStickers.swift
similarity index 90%
rename from submodules/TelegramCore/Sources/SearchStickers.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/SearchStickers.swift
index 4f2e712a6e..0f1464fbf8 100644
--- a/submodules/TelegramCore/Sources/SearchStickers.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/SearchStickers.swift
@@ -58,19 +58,29 @@ public struct SearchStickersScope: OptionSet {
     public static let remote = SearchStickersScope(rawValue: 1 << 1)
 }
 
-public func randomGreetingSticker(account: Account) -> Signal<FoundStickerItem?, NoError> {
-    return account.postbox.transaction { transaction -> FoundStickerItem? in
-        var stickerItems: [FoundStickerItem] = []
-        for entry in transaction.getOrderedListItems(collectionId: Namespaces.OrderedItemList.CloudGreetingStickers) {
-            if let item = entry.contents as? RecentMediaItem, let file = item.media as? TelegramMediaFile {
-                stickerItems.append(FoundStickerItem(file: file, stringRepresentations: []))
-            }
+func _internal_randomGreetingSticker(account: Account) -> Signal<FoundStickerItem?, NoError> {
+    let key: PostboxViewKey = .orderedItemList(id: Namespaces.OrderedItemList.CloudGreetingStickers)
+    return account.postbox.combinedView(keys: [key])
+    |> map { views -> [OrderedItemListEntry]? in
+        if let view = views.views[key] as? OrderedItemListView, !view.items.isEmpty {
+            return view.items
+        } else {
+            return nil
         }
-        return stickerItems.randomElement()
+    }
+    |> filter { items in
+        return items != nil
+    }
+    |> take(1)
+    |> map { items -> FoundStickerItem? in
+        if let randomItem = items?.randomElement(), let item = randomItem.contents as? RecentMediaItem, let file = item.media as? TelegramMediaFile {
+            return FoundStickerItem(file: file, stringRepresentations: [])
+        }
+        return nil
     }
 }
 
-public func searchStickers(account: Account, query: String, scope: SearchStickersScope = [.installed, .remote]) -> Signal<[FoundStickerItem], NoError> {
+func _internal_searchStickers(account: Account, query: String, scope: SearchStickersScope = [.installed, .remote]) -> Signal<[FoundStickerItem], NoError> {
     if scope.isEmpty {
         return .single([])
     }
@@ -265,7 +275,7 @@ public struct FoundStickerSets {
     }
 }
 
-public func searchStickerSetsRemotely(network: Network, query: String) -> Signal<FoundStickerSets, NoError> {
+func _internal_searchStickerSetsRemotely(network: Network, query: String) -> Signal<FoundStickerSets, NoError> {
     return network.request(Api.functions.messages.searchStickerSets(flags: 0, q: query, hash: 0))
         |> mapError {_ in}
         |> mapToSignal { value in
@@ -291,7 +301,7 @@ public func searchStickerSetsRemotely(network: Network, query: String) -> Signal
     }
 }
 
-public func searchStickerSets(postbox: Postbox, query: String) -> Signal<FoundStickerSets, NoError> {
+func _internal_searchStickerSets(postbox: Postbox, query: String) -> Signal<FoundStickerSets, NoError> {
     return postbox.transaction { transaction -> Signal<FoundStickerSets, NoError> in
         let infos = transaction.getItemCollectionsInfos(namespace: Namespaces.ItemCollection.CloudStickerPacks)
         
@@ -324,19 +334,19 @@ public func searchStickerSets(postbox: Postbox, query: String) -> Signal<FoundSt
     } |> switchToLatest
 }
 
-public func searchGifs(account: Account, query: String, nextOffset: String = "") -> Signal<ChatContextResultCollection?, NoError> {
+func _internal_searchGifs(account: Account, query: String, nextOffset: String = "") -> Signal<ChatContextResultCollection?, NoError> {
    return account.postbox.transaction { transaction -> String in
         let configuration = currentSearchBotsConfiguration(transaction: transaction)
         return configuration.gifBotUsername ?? "gif"
     } |> mapToSignal {
-         return resolvePeerByName(account: account, name: $0)
+         return _internal_resolvePeerByName(account: account, name: $0)
     } |> filter { $0 != nil }
     |> map { $0! }
     |> mapToSignal { peerId -> Signal<Peer, NoError> in
         return account.postbox.loadedPeerWithId(peerId)
     }
     |> mapToSignal { peer -> Signal<ChatContextResultCollection?, NoError> in
-        return requestChatContextResults(account: account, botId: peer.id, peerId: account.peerId, query: query, offset: nextOffset)
+        return _internal_requestChatContextResults(account: account, botId: peer.id, peerId: account.peerId, query: query, offset: nextOffset)
         |> map { results -> ChatContextResultCollection? in
             return results?.results
         }
diff --git a/submodules/TelegramCore/Sources/StickerPack.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPack.swift
similarity index 73%
rename from submodules/TelegramCore/Sources/StickerPack.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPack.swift
index c885316fdf..61e247260f 100644
--- a/submodules/TelegramCore/Sources/StickerPack.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPack.swift
@@ -5,29 +5,20 @@ import SwiftSignalKit
 import SyncCore
 import MtProtoKit
 
-func telegramStickerPackThumbnailRepresentationFromApiSizes(datacenterId: Int32, sizes: [Api.PhotoSize]) -> (immediateThumbnail: Data?, representations: [TelegramMediaImageRepresentation]) {
+func telegramStickerPackThumbnailRepresentationFromApiSizes(datacenterId: Int32, thumbVersion: Int32?, sizes: [Api.PhotoSize]) -> (immediateThumbnail: Data?, representations: [TelegramMediaImageRepresentation]) {
     var immediateThumbnailData: Data?
     var representations: [TelegramMediaImageRepresentation] = []
     for size in sizes {
         switch size {
-            case let .photoCachedSize(_, location, w, h, _):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, volumeId: volumeId, localId: localId)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSize(_, location, w, h, _):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, volumeId: volumeId, localId: localId)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSizeProgressive(_, location, w, h, sizes):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, volumeId: volumeId, localId: localId)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes))
-                }
+            case let .photoCachedSize(_, w, h, _):
+                let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, thumbVersion: thumbVersion, volumeId: nil, localId: nil)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSize(_, w, h, _):
+                let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, thumbVersion: thumbVersion, volumeId: nil, localId: nil)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
+            case let .photoSizeProgressive(_, w, h, sizes):
+                let resource = CloudStickerPackThumbnailMediaResource(datacenterId: datacenterId, thumbVersion: thumbVersion, volumeId: nil, localId: nil)
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes, immediateThumbnailData: nil))
             case let .photoPathSize(_, data):
                 immediateThumbnailData = data.makeData()
             case .photoStrippedSize:
@@ -42,7 +33,7 @@ func telegramStickerPackThumbnailRepresentationFromApiSizes(datacenterId: Int32,
 extension StickerPackCollectionInfo {
     convenience init(apiSet: Api.StickerSet, namespace: ItemCollectionId.Namespace) {
         switch apiSet {
-            case let .stickerSet(flags, _, id, accessHash, title, shortName, thumbs, thumbDcId, count, nHash):
+            case let .stickerSet(flags, _, id, accessHash, title, shortName, thumbs, thumbDcId, thumbVersion, count, nHash):
                 var setFlags: StickerPackCollectionInfoFlags = StickerPackCollectionInfoFlags()
                 if (flags & (1 << 2)) != 0 {
                     setFlags.insert(.isOfficial)
@@ -57,7 +48,7 @@ extension StickerPackCollectionInfo {
                 var thumbnailRepresentation: TelegramMediaImageRepresentation?
                 var immediateThumbnailData: Data?
                 if let thumbs = thumbs, let thumbDcId = thumbDcId {
-                    let (data, representations) = telegramStickerPackThumbnailRepresentationFromApiSizes(datacenterId: thumbDcId, sizes: thumbs)
+                    let (data, representations) = telegramStickerPackThumbnailRepresentationFromApiSizes(datacenterId: thumbDcId, thumbVersion: thumbVersion, sizes: thumbs)
                     thumbnailRepresentation = representations.first
                     immediateThumbnailData = data
                 }
@@ -67,7 +58,7 @@ extension StickerPackCollectionInfo {
     }
 }
 
-public func stickerPacksAttachedToMedia(account: Account, media: AnyMediaReference) -> Signal<[StickerPackReference], NoError> {
+func _internal_stickerPacksAttachedToMedia(account: Account, media: AnyMediaReference) -> Signal<[StickerPackReference], NoError> {
     let inputMedia: Api.InputStickeredMedia
     let resourceReference: MediaResourceReference
     if let imageReference = media.concrete(TelegramMediaImage.self), let reference = imageReference.media.reference, case let .cloud(imageId, accessHash, fileReference) = reference, let representation = largestImageRepresentation(imageReference.media.representations) {
@@ -88,7 +79,7 @@ public func stickerPacksAttachedToMedia(account: Account, media: AnyMediaReferen
         |> mapToSignal { reference -> Signal<[Api.StickerSetCovered], MTRpcError> in
             let inputMedia: Api.InputStickeredMedia
             if let resource = reference.updatedResource as? TelegramCloudMediaResourceWithFileReference, let updatedReference = resource.fileReference {
-                if let imageReference = media.concrete(TelegramMediaImage.self), let reference = imageReference.media.reference, case let .cloud(imageId, accessHash, _) = reference, let representation = largestImageRepresentation(imageReference.media.representations) {
+                if let imageReference = media.concrete(TelegramMediaImage.self), let reference = imageReference.media.reference, case let .cloud(imageId, accessHash, _) = reference, let _ = largestImageRepresentation(imageReference.media.representations) {
                     inputMedia = .inputStickeredMediaPhoto(id: Api.InputPhoto.inputPhoto(id: imageId, accessHash: accessHash, fileReference: Buffer(data: updatedReference)))
                 } else if let fileReference = media.concrete(TelegramMediaFile.self), let resource = fileReference.media.resource as? CloudDocumentMediaResource {
                     inputMedia = .inputStickeredMediaDocument(id: Api.InputDocument.inputDocument(id: resource.fileId, accessHash: resource.accessHash, fileReference: Buffer(data: updatedReference)))
diff --git a/submodules/TelegramCore/Sources/StickerPackInteractiveOperations.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPackInteractiveOperations.swift
similarity index 84%
rename from submodules/TelegramCore/Sources/StickerPackInteractiveOperations.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPackInteractiveOperations.swift
index d923975fe1..6ac55d9bed 100644
--- a/submodules/TelegramCore/Sources/StickerPackInteractiveOperations.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerPackInteractiveOperations.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 
 import SyncCore
 
-public func addStickerPackInteractively(postbox: Postbox, info: StickerPackCollectionInfo, items: [ItemCollectionItem], positionInList: Int? = nil) -> Signal<Void, NoError> {
+func _internal_addStickerPackInteractively(postbox: Postbox, info: StickerPackCollectionInfo, items: [ItemCollectionItem], positionInList: Int? = nil) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         let namespace: SynchronizeInstalledStickerPacksOperationNamespace?
         switch info.id.namespace {
@@ -44,11 +44,11 @@ public enum RemoveStickerPackOption {
     case archive
 }
 
-public func removeStickerPackInteractively(postbox: Postbox, id: ItemCollectionId, option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
-    return removeStickerPacksInteractively(postbox: postbox, ids: [id], option: option)
+func _internal_removeStickerPackInteractively(postbox: Postbox, id: ItemCollectionId, option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
+    return _internal_removeStickerPacksInteractively(postbox: postbox, ids: [id], option: option)
 }
 
-public func removeStickerPacksInteractively(postbox: Postbox, ids: [ItemCollectionId], option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
+func _internal_removeStickerPacksInteractively(postbox: Postbox, ids: [ItemCollectionId], option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
     return postbox.transaction { transaction -> (Int, [ItemCollectionItem])? in
         var commonNamespace: SynchronizeInstalledStickerPacksOperationNamespace?
         for id in ids { 
@@ -80,7 +80,9 @@ public func removeStickerPacksInteractively(postbox: Postbox, ids: [ItemCollecti
                 let items = transaction.getItemCollectionItems(collectionId: id)
                 
                 addSynchronizeInstalledStickerPacksOperation(transaction: transaction, namespace: namespace, content: content, noDelay: false)
-                transaction.removeItemCollection(collectionId: id)
+                for id in ids {
+                    transaction.removeItemCollection(collectionId: id)
+                }
                 return index.flatMap { ($0, items) }
             } else {
                 return nil
@@ -91,7 +93,7 @@ public func removeStickerPacksInteractively(postbox: Postbox, ids: [ItemCollecti
     }
 }
 
-public func markFeaturedStickerPacksAsSeenInteractively(postbox: Postbox, ids: [ItemCollectionId]) -> Signal<Void, NoError> {
+func _internal_markFeaturedStickerPacksAsSeenInteractively(postbox: Postbox, ids: [ItemCollectionId]) -> Signal<Void, NoError> {
     return postbox.transaction { transaction -> Void in
         let idsSet = Set(ids)
         var items = transaction.getOrderedListItems(collectionId: Namespaces.OrderedItemList.CloudFeaturedStickerPacks)
diff --git a/submodules/TelegramCore/Sources/StickerSetInstallation.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerSetInstallation.swift
similarity index 95%
rename from submodules/TelegramCore/Sources/StickerSetInstallation.swift
rename to submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerSetInstallation.swift
index 9c65ddb251..18318676ee 100644
--- a/submodules/TelegramCore/Sources/StickerSetInstallation.swift
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/StickerSetInstallation.swift
@@ -24,7 +24,7 @@ public enum RequestStickerSetResult {
     }
 }
 
-public func requestStickerSet(postbox: Postbox, network: Network, reference: StickerPackReference) -> Signal<RequestStickerSetResult, RequestStickerSetError> {
+func _internal_requestStickerSet(postbox: Postbox, network: Network, reference: StickerPackReference) -> Signal<RequestStickerSetResult, RequestStickerSetError> {
     let collectionId: ItemCollectionId?
     let input: Api.InputStickerSet
     
@@ -133,8 +133,7 @@ public final class CoveredStickerSet : Equatable {
     }
 }
 
-public func installStickerSetInteractively(account: Account, info: StickerPackCollectionInfo, items: [ItemCollectionItem]) -> Signal<InstallStickerSetResult, InstallStickerSetError> {
-    
+func _internal_installStickerSetInteractively(account: Account, info: StickerPackCollectionInfo, items: [ItemCollectionItem]) -> Signal<InstallStickerSetResult, InstallStickerSetError> {
     return account.network.request(Api.functions.messages.installStickerSet(stickerset: .inputStickerSetID(id: info.id.id, accessHash: info.accessHash), archived: .boolFalse)) |> mapError { _ -> InstallStickerSetError in
         return .generic
         } |> mapToSignal { result -> Signal<InstallStickerSetResult, InstallStickerSetError> in
@@ -199,7 +198,7 @@ public func installStickerSetInteractively(account: Account, info: StickerPackCo
 }
 
 
-public func uninstallStickerSetInteractively(account: Account, info: StickerPackCollectionInfo) -> Signal<Void, NoError> {
+func _internal_uninstallStickerSetInteractively(account: Account, info: StickerPackCollectionInfo) -> Signal<Void, NoError> {
     return account.network.request(Api.functions.messages.uninstallStickerSet(stickerset: .inputStickerSetID(id: info.id.id, accessHash: info.accessHash)))
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .single(.boolFalse)
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/Stickers/TelegramEngineStickers.swift b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/TelegramEngineStickers.swift
new file mode 100644
index 0000000000..56cd62570d
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/Stickers/TelegramEngineStickers.swift
@@ -0,0 +1,100 @@
+import SwiftSignalKit
+import SyncCore
+import Postbox
+
+public extension TelegramEngine {
+    final class Stickers {
+        private let account: Account
+
+        init(account: Account) {
+            self.account = account
+        }
+
+        public func archivedStickerPacks(namespace: ArchivedStickerPacksNamespace = .stickers) -> Signal<[ArchivedStickerPackItem], NoError> {
+            return _internal_archivedStickerPacks(account: account, namespace: namespace)
+        }
+
+        public func removeArchivedStickerPack(info: StickerPackCollectionInfo) -> Signal<Void, NoError> {
+            return _internal_removeArchivedStickerPack(account: self.account, info: info)
+        }
+
+        public func cachedStickerPack(reference: StickerPackReference, forceRemote: Bool) -> Signal<CachedStickerPackResult, NoError> {
+            return _internal_cachedStickerPack(postbox: self.account.postbox, network: self.account.network, reference: reference, forceRemote: forceRemote)
+        }
+
+        public func loadedStickerPack(reference: StickerPackReference, forceActualized: Bool) -> Signal<LoadedStickerPack, NoError> {
+            return _internal_loadedStickerPack(postbox: self.account.postbox, network: self.account.network, reference: reference, forceActualized: forceActualized)
+        }
+
+        public func randomGreetingSticker() -> Signal<FoundStickerItem?, NoError> {
+            return _internal_randomGreetingSticker(account: self.account)
+        }
+
+        public func searchStickers(query: String, scope: SearchStickersScope = [.installed, .remote]) -> Signal<[FoundStickerItem], NoError> {
+            return _internal_searchStickers(account: self.account, query: query, scope: scope)
+        }
+
+        public func searchStickerSetsRemotely(query: String) -> Signal<FoundStickerSets, NoError> {
+            return _internal_searchStickerSetsRemotely(network: self.account.network, query: query)
+        }
+
+        public func searchStickerSets(query: String) -> Signal<FoundStickerSets, NoError> {
+            return _internal_searchStickerSets(postbox: self.account.postbox, query: query)
+        }
+
+        public func searchGifs(query: String, nextOffset: String = "") -> Signal<ChatContextResultCollection?, NoError> {
+            return _internal_searchGifs(account: self.account, query: query, nextOffset: nextOffset)
+        }
+
+        public func addStickerPackInteractively(info: StickerPackCollectionInfo, items: [ItemCollectionItem], positionInList: Int? = nil) -> Signal<Void, NoError> {
+            return _internal_addStickerPackInteractively(postbox: self.account.postbox, info: info, items: items, positionInList: positionInList)
+        }
+
+        public func removeStickerPackInteractively(id: ItemCollectionId, option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
+            return _internal_removeStickerPackInteractively(postbox: self.account.postbox, id: id, option: option)
+        }
+
+        public func removeStickerPacksInteractively(ids: [ItemCollectionId], option: RemoveStickerPackOption) -> Signal<(Int, [ItemCollectionItem])?, NoError> {
+            return _internal_removeStickerPacksInteractively(postbox: self.account.postbox, ids: ids, option: option)
+        }
+
+        public func markFeaturedStickerPacksAsSeenInteractively(ids: [ItemCollectionId]) -> Signal<Void, NoError> {
+            return _internal_markFeaturedStickerPacksAsSeenInteractively(postbox: self.account.postbox, ids: ids)
+        }
+
+        public func searchEmojiKeywords(inputLanguageCode: String, query: String, completeMatch: Bool) -> Signal<[EmojiKeywordItem], NoError> {
+            return _internal_searchEmojiKeywords(postbox: self.account.postbox, inputLanguageCode: inputLanguageCode, query: query, completeMatch: completeMatch)
+        }
+
+        public func stickerPacksAttachedToMedia(media: AnyMediaReference) -> Signal<[StickerPackReference], NoError> {
+            return _internal_stickerPacksAttachedToMedia(account: self.account, media: media)
+        }
+        
+        public func uploadSticker(peer: Peer, resource: MediaResource, alt: String, dimensions: PixelDimensions, isAnimated: Bool) -> Signal<UploadStickerStatus, UploadStickerError> {
+            return _internal_uploadSticker(account: self.account, peer: peer, resource: resource, alt: alt, dimensions: dimensions, isAnimated: isAnimated)
+        }
+        
+        public func createStickerSet(title: String, shortName: String, stickers: [ImportSticker], thumbnail: ImportSticker?, isAnimated: Bool, software: String?) -> Signal<CreateStickerSetStatus, CreateStickerSetError> {
+            return _internal_createStickerSet(account: self.account, title: title, shortName: shortName, stickers: stickers, thumbnail: thumbnail, isAnimated: isAnimated, software: software)
+        }
+        
+        public func getStickerSetShortNameSuggestion(title: String) -> Signal<String?, NoError> {
+            return _internal_getStickerSetShortNameSuggestion(account: self.account, title: title)
+        }
+        
+        public func validateStickerSetShortNameInteractive(shortName: String) -> Signal<AddressNameValidationStatus, NoError> {
+            if let error = _internal_checkAddressNameFormat(shortName) {
+                return .single(.invalidFormat(error))
+            } else {
+                return .single(.checking)
+                |> then(
+                    _internal_stickerSetShortNameAvailability(account: self.account, shortName: shortName)
+                    |> delay(0.3, queue: Queue.concurrentDefaultQueue())
+                    |> map { result -> AddressNameValidationStatus in
+                        .availability(result)
+                    }
+                )
+            }
+        }
+    }
+}
diff --git a/submodules/TelegramCore/Sources/TelegramEngine/TelegramEngine.swift b/submodules/TelegramCore/Sources/TelegramEngine/TelegramEngine.swift
new file mode 100644
index 0000000000..d4902923e1
--- /dev/null
+++ b/submodules/TelegramCore/Sources/TelegramEngine/TelegramEngine.swift
@@ -0,0 +1,91 @@
+import SwiftSignalKit
+import Postbox
+
+public final class TelegramEngine {
+    public let account: Account
+
+    public init(account: Account) {
+        self.account = account
+    }
+
+    public lazy var secureId: SecureId = {
+        return SecureId(account: self.account)
+    }()
+
+    public lazy var peersNearby: PeersNearby = {
+        return PeersNearby(account: self.account)
+    }()
+
+    public lazy var payments: Payments = {
+        return Payments(account: self.account)
+    }()
+
+    public lazy var peers: Peers = {
+        return Peers(account: self.account)
+    }()
+
+    public lazy var auth: Auth = {
+        return Auth(account: self.account)
+    }()
+
+    public lazy var accountData: AccountData = {
+        return AccountData(account: self.account)
+    }()
+
+    public lazy var stickers: Stickers = {
+        return Stickers(account: self.account)
+    }()
+
+    public lazy var localization: Localization = {
+        return Localization(account: self.account)
+    }()
+
+    public lazy var messages: Messages = {
+        return Messages(account: self.account)
+    }()
+
+    public lazy var privacy: Privacy = {
+        return Privacy(account: self.account)
+    }()
+
+    public lazy var calls: Calls = {
+        return Calls(account: self.account)
+    }()
+
+    public lazy var historyImport: HistoryImport = {
+        return HistoryImport(account: self.account)
+    }()
+
+    public lazy var contacts: Contacts = {
+        return Contacts(account: self.account)
+    }()
+
+    public lazy var resources: Resources = {
+        return Resources(account: self.account)
+    }()
+
+    public lazy var resolve: Resolve = {
+        return Resolve(account: self.account)
+    }()
+}
+
+public final class TelegramEngineUnauthorized {
+    public let account: UnauthorizedAccount
+
+    public init(account: UnauthorizedAccount) {
+        self.account = account
+    }
+
+    public lazy var auth: Auth = {
+        return Auth(account: self.account)
+    }()
+
+    public lazy var localization: Localization = {
+        return Localization(account: self.account)
+    }()
+}
+
+public enum SomeTelegramEngine {
+    case unauthorized(TelegramEngineUnauthorized)
+    case authorized(TelegramEngine)
+}
diff --git a/submodules/TelegramCore/Sources/TelegramMediaImage.swift b/submodules/TelegramCore/Sources/TelegramMediaImage.swift
deleted file mode 100644
index 5dca93ac69..0000000000
--- a/submodules/TelegramCore/Sources/TelegramMediaImage.swift
+++ /dev/null
@@ -1,73 +0,0 @@
-import Foundation
-import Postbox
-import TelegramApi
-
-import SyncCore
-
-func telegramMediaImageRepresentationsFromApiSizes(datacenterId: Int32, photoId: Int64, accessHash: Int64, fileReference: Data?, sizes: [Api.PhotoSize]) -> (immediateThumbnail: Data?, representations:  [TelegramMediaImageRepresentation]) {
-    var immediateThumbnailData: Data?
-    var representations: [TelegramMediaImageRepresentation] = []
-    for size in sizes {
-        switch size {
-            case let .photoCachedSize(type, location, w, h, _):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: nil, fileReference: fileReference)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSize(type, location, w, h, size):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: Int(size), fileReference: fileReference)
-                        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: []))
-                }
-            case let .photoSizeProgressive(type, location, w, h, sizes):
-                switch location {
-                    case let .fileLocationToBeDeprecated(volumeId, localId):
-                        if !sizes.isEmpty {
-                            let resource = CloudPhotoSizeMediaResource(datacenterId: datacenterId, photoId: photoId, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: Int(sizes[sizes.count - 1]), fileReference: fileReference)
-                            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, progressiveSizes: sizes))
-                        }
-                }
-            case let .photoStrippedSize(_, data):
-                immediateThumbnailData = data.makeData()
-            case .photoPathSize:
-                break
-            case .photoSizeEmpty:
-                break
-        }
-    }
-    return (immediateThumbnailData, representations)
-}
-
-func telegramMediaImageFromApiPhoto(_ photo: Api.Photo) -> TelegramMediaImage? {
-    switch photo {
-        case let .photo(flags, id, accessHash, fileReference, _, sizes, videoSizes, dcId):
-            let (immediateThumbnailData, representations) = telegramMediaImageRepresentationsFromApiSizes(datacenterId: dcId, photoId: id, accessHash: accessHash, fileReference: fileReference.makeData(), sizes: sizes)
-            var imageFlags: TelegramMediaImageFlags = []
-            let hasStickers = (flags & (1 << 0)) != 0
-            if hasStickers {
-                imageFlags.insert(.hasStickers)
-            }
-            
-            var videoRepresentations: [TelegramMediaImage.VideoRepresentation] = []
-            if let videoSizes = videoSizes {
-                for size in videoSizes {
-                    switch size {
-                        case let .videoSize(_, type, location, w, h, size, videoStartTs):
-                            let resource: TelegramMediaResource
-                            switch location {
-                                case let .fileLocationToBeDeprecated(volumeId, localId):
-                                    resource = CloudPhotoSizeMediaResource(datacenterId: dcId, photoId: id, accessHash: accessHash, sizeSpec: type, volumeId: volumeId, localId: localId, size: Int(size), fileReference: fileReference.makeData())
-                            }
-                            
-                            videoRepresentations.append(TelegramMediaImage.VideoRepresentation(dimensions: PixelDimensions(width: w, height: h), resource: resource, startTimestamp: videoStartTs))
-                    }
-                }
-            }
-            
-            return TelegramMediaImage(imageId: MediaId(namespace: Namespaces.Media.CloudImage, id: id), representations: representations, videoRepresentations: videoRepresentations, immediateThumbnailData: immediateThumbnailData, reference: .cloud(imageId: id, accessHash: accessHash, fileReference: fileReference.makeData()), partialReference: nil, flags: imageFlags)
-        case .photoEmpty:
-            return nil
-    }
-}
diff --git a/submodules/TelegramCore/Sources/Unixtime.swift b/submodules/TelegramCore/Sources/Unixtime.swift
deleted file mode 100644
index 090a84723b..0000000000
--- a/submodules/TelegramCore/Sources/Unixtime.swift
+++ /dev/null
@@ -1,126 +0,0 @@
-import Foundation
-
-public struct DateTime {
-    public let seconds: Int32 // 0 ... 59
-    public let minutes: Int32 // 0 ... 59
-    public let hours: Int32 // 0 ... 23
-    public let dayOfMonth: Int32 // 1 ... 31
-    public let month: Int32 // 0 ... 11
-    public let year: Int32 // since 1900
-    public let dayOfWeek: Int32 // 0 ... 6
-    public let dayOfYear: Int32  // 0 ... 365
-}
-
-private let daysSinceJan1st: [[UInt32]] =
-[
-    [0,31,59,90,120,151,181,212,243,273,304,334,365], // 365 days, non-leap
-    [0,31,60,91,121,152,182,213,244,274,305,335,366]  // 366 days, leap
-]
-
-public func secondsSinceEpochToDateTime(_ secondsSinceEpoch: Int64) -> DateTime {
-    var sec: UInt64
-    let quadricentennials: UInt32
-    var centennials: UInt32
-    var quadrennials: UInt32
-    var annuals: UInt32
-    let year: UInt32
-    let leap: UInt32
-    let yday: UInt32
-    let hour: UInt32
-    let min: UInt32
-    var month: UInt32
-    var mday: UInt32
-    let wday: UInt32
-    
-    /*
-     400 years:
-     
-     1st hundred, starting immediately after a leap year that's a multiple of 400:
-     n n n l  \
-     n n n l   } 24 times
-     ...      /
-     n n n l /
-     n n n n
-     
-     2nd hundred:
-     n n n l  \
-     n n n l   } 24 times
-     ...      /
-     n n n l /
-     n n n n
-     
-     3rd hundred:
-     n n n l  \
-     n n n l   } 24 times
-     ...      /
-     n n n l /
-     n n n n
-     
-     4th hundred:
-     n n n l  \
-     n n n l   } 24 times
-     ...      /
-     n n n l /
-     n n n L <- 97'th leap year every 400 years
-     */
-    
-    // Re-bias from 1970 to 1601:
-    // 1970 - 1601 = 369 = 3*100 + 17*4 + 1 years (incl. 89 leap days) =
-    // (3*100*(365+24/100) + 17*4*(365+1/4) + 1*365)*24*3600 seconds
-    sec = UInt64(secondsSinceEpoch) + (11644473600 as UInt64)
-    
-    wday = (uint)((sec / 86400 + 1) % 7); // day of week
-    
-    // Remove multiples of 400 years (incl. 97 leap days)
-    quadricentennials = UInt32((UInt64(sec) / (12622780800 as UInt64))) // 400*365.2425*24*3600
-    sec %= 12622780800 as UInt64
-    
-    // Remove multiples of 100 years (incl. 24 leap days), can't be more than 3
-    // (because multiples of 4*100=400 years (incl. leap days) have been removed)
-    centennials = UInt32(UInt64(sec) / (3155673600 as UInt64)) // 100*(365+24/100)*24*3600
-    if centennials > 3 {
-        centennials = 3
-    }
-    sec -= UInt64(centennials) * (3155673600 as UInt64)
-    
-    // Remove multiples of 4 years (incl. 1 leap day), can't be more than 24
-    // (because multiples of 25*4=100 years (incl. leap days) have been removed)
-    quadrennials = UInt32((UInt64(sec) / (126230400 as UInt64))) // 4*(365+1/4)*24*3600
-    if quadrennials > 24 {
-        quadrennials = 24
-    }
-    sec -= UInt64(quadrennials) * (126230400 as UInt64)
-    
-    // Remove multiples of years (incl. 0 leap days), can't be more than 3
-    // (because multiples of 4 years (incl. leap days) have been removed)
-    annuals = UInt32(sec / (31536000 as UInt64)) // 365*24*3600
-    if annuals > 3 {
-        annuals = 3
-    }
-    sec -= UInt64(annuals) * (31536000 as UInt64)
-    
-    // Calculate the year and find out if it's leap
-    year = 1601 + quadricentennials * 400 + centennials * 100 + quadrennials * 4 + annuals;
-    leap = (!(year % UInt32(4) != 0) && ((year % UInt32(100) != 0) || !(year % UInt32(400) != 0))) ? 1 : 0
-    
-    // Calculate the day of the year and the time
-    yday = UInt32(sec / (86400 as UInt64))
-    sec %= 86400;
-    hour = UInt32(sec / 3600);
-    sec %= 3600;
-    min = UInt32(sec / 60);
-    sec %= 60;
-    
-    mday = 1
-    month = 1
-    while month < 13 {
-        if (yday < daysSinceJan1st[Int(leap)][Int(month)]) {
-            mday += yday - daysSinceJan1st[Int(leap)][Int(month - 1)]
-            break
-        }
-        
-        month += 1
-    }
-    
-    return DateTime(seconds: Int32(sec), minutes: Int32(min), hours: Int32(hour), dayOfMonth: Int32(mday), month: Int32(month - 1), year: Int32(year - 1900), dayOfWeek: Int32(wday), dayOfYear: Int32(yday))
-}
diff --git a/submodules/TelegramCore/Sources/CanSendMessagesToPeer.swift b/submodules/TelegramCore/Sources/Utils/CanSendMessagesToPeer.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/CanSendMessagesToPeer.swift
rename to submodules/TelegramCore/Sources/Utils/CanSendMessagesToPeer.swift
diff --git a/submodules/TelegramCore/Sources/DecryptedResourceData.swift b/submodules/TelegramCore/Sources/Utils/DecryptedResourceData.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/DecryptedResourceData.swift
rename to submodules/TelegramCore/Sources/Utils/DecryptedResourceData.swift
diff --git a/submodules/TelegramCore/Sources/ImageRepresentationsUtils.swift b/submodules/TelegramCore/Sources/Utils/ImageRepresentationsUtils.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/ImageRepresentationsUtils.swift
rename to submodules/TelegramCore/Sources/Utils/ImageRepresentationsUtils.swift
diff --git a/submodules/TelegramCore/Sources/JSON.swift b/submodules/TelegramCore/Sources/Utils/JSON.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/JSON.swift
rename to submodules/TelegramCore/Sources/Utils/JSON.swift
diff --git a/submodules/TelegramCore/Sources/Log.swift b/submodules/TelegramCore/Sources/Utils/Log.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/Log.swift
rename to submodules/TelegramCore/Sources/Utils/Log.swift
diff --git a/submodules/TelegramCore/Sources/MD5.swift b/submodules/TelegramCore/Sources/Utils/MD5.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/MD5.swift
rename to submodules/TelegramCore/Sources/Utils/MD5.swift
diff --git a/submodules/TelegramCore/Sources/MediaResourceNetworkStatsTag.swift b/submodules/TelegramCore/Sources/Utils/MediaResourceNetworkStatsTag.swift
similarity index 81%
rename from submodules/TelegramCore/Sources/MediaResourceNetworkStatsTag.swift
rename to submodules/TelegramCore/Sources/Utils/MediaResourceNetworkStatsTag.swift
index 8518603109..8d008623d3 100644
--- a/submodules/TelegramCore/Sources/MediaResourceNetworkStatsTag.swift
+++ b/submodules/TelegramCore/Sources/Utils/MediaResourceNetworkStatsTag.swift
@@ -9,7 +9,7 @@ public enum MediaResourceStatsCategory {
     case call
 }
 
-public final class TelegramMediaResourceFetchTag: MediaResourceFetchTag {
+final class TelegramMediaResourceFetchTag: MediaResourceFetchTag {
     public let statsCategory: MediaResourceStatsCategory
     
     public init(statsCategory: MediaResourceStatsCategory) {
diff --git a/submodules/TelegramCore/Sources/MemoryBufferExtensions.swift b/submodules/TelegramCore/Sources/Utils/MemoryBufferExtensions.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/MemoryBufferExtensions.swift
rename to submodules/TelegramCore/Sources/Utils/MemoryBufferExtensions.swift
diff --git a/submodules/TelegramCore/Sources/MessageUtils.swift b/submodules/TelegramCore/Sources/Utils/MessageUtils.swift
similarity index 91%
rename from submodules/TelegramCore/Sources/MessageUtils.swift
rename to submodules/TelegramCore/Sources/Utils/MessageUtils.swift
index b771a11815..4ac9fb61f0 100644
--- a/submodules/TelegramCore/Sources/MessageUtils.swift
+++ b/submodules/TelegramCore/Sources/Utils/MessageUtils.swift
@@ -25,6 +25,22 @@ public extension Message {
         }
         return nil
     }
+
+    var visibleReplyMarkupPlaceholder: String? {
+        for attribute in self.attributes {
+            if let attribute = attribute as? ReplyMarkupMessageAttribute {
+                if !attribute.flags.contains(.inline) {
+                    if attribute.flags.contains(.personal) {
+                        if !personal {
+                            return nil
+                        }
+                    }
+                    return attribute.placeholder
+                }
+            }
+        }
+        return nil
+    }
     
     var muted: Bool {
         for attribute in self.attributes {
@@ -184,10 +200,15 @@ func locallyRenderedMessage(message: StoreMessage, peers: [PeerId: Peer]) -> Mes
             messagePeers[source.id] = source
         }
     }
+
+    var hasher = Hasher()
+    hasher.combine(id.id)
+    hasher.combine(id.peerId)
     
-    var hash: Int32 = id.id
-    hash = hash &* 31 &+ id.peerId.id
-    let stableId = UInt32(clamping: hash)
+    let hashValue = Int64(hasher.finalize())
+    let first = UInt32((hashValue >> 32) & 0xffffffff)
+    let second = UInt32(hashValue & 0xffffffff)
+    let stableId = first &+ second
     
     return Message(stableId: stableId, stableVersion: 0, id: id, globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: message.threadId, timestamp: message.timestamp, flags: MessageFlags(message.flags), tags: message.tags, globalTags: message.globalTags, localTags: message.localTags, forwardInfo: forwardInfo, author: author, text: message.text, attributes: message.attributes, media: message.media, peers: messagePeers, associatedMessages: SimpleDictionary(), associatedMessageIds: [])
 }
diff --git a/submodules/TelegramCore/Sources/PeerUtils.swift b/submodules/TelegramCore/Sources/Utils/PeerUtils.swift
similarity index 96%
rename from submodules/TelegramCore/Sources/PeerUtils.swift
rename to submodules/TelegramCore/Sources/Utils/PeerUtils.swift
index 9bee3aa061..c39e549776 100644
--- a/submodules/TelegramCore/Sources/PeerUtils.swift
+++ b/submodules/TelegramCore/Sources/Utils/PeerUtils.swift
@@ -241,7 +241,7 @@ public func isServicePeer(_ peer: Peer) -> Bool {
         if peer.id.isReplies {
             return true
         }
-        return (peer.id.namespace == Namespaces.Peer.CloudUser && (peer.id.id == 777000 || peer.id.id == 333000))
+        return (peer.id.namespace == Namespaces.Peer.CloudUser && (peer.id.id._internalGetInt32Value() == 777000 || peer.id.id._internalGetInt32Value() == 333000))
     }
     return false
 }
@@ -249,7 +249,7 @@ public func isServicePeer(_ peer: Peer) -> Bool {
 public extension PeerId {
     var isReplies: Bool {
         if self.namespace == Namespaces.Peer.CloudUser {
-            if self.id == 708513 || self.id == 1271266957 {
+            if self.id._internalGetInt32Value() == 708513 || self.id._internalGetInt32Value() == 1271266957 {
                 return true
             }
         }
@@ -268,7 +268,7 @@ public extension PeerId {
     
     var isImport: Bool {
         if self.namespace == Namespaces.Peer.CloudUser {
-            if self.id == 225079 {
+            if self.id._internalGetInt32Value() == 225079 {
                 return true
             }
         }
diff --git a/submodules/TelegramCore/Sources/Utils/StringFormat.swift b/submodules/TelegramCore/Sources/Utils/StringFormat.swift
new file mode 100644
index 0000000000..9d92b02743
--- /dev/null
+++ b/submodules/TelegramCore/Sources/Utils/StringFormat.swift
@@ -0,0 +1,52 @@
+import Foundation
+
+// Incuding at least one Objective-C class in a swift file ensures that it doesn't get stripped by the linker
+private final class LinkHelperClass: NSObject {
+}
+
+public func dataSizeString(_ size: Int, forceDecimal: Bool = false, formatting: DataSizeStringFormatting) -> String {
+    return dataSizeString(Int64(size), forceDecimal: forceDecimal, formatting: formatting)
+}
+
+public struct DataSizeStringFormatting {
+    let decimalSeparator: String
+    let byte: (String) -> (String, [(Int, NSRange)])
+    let kilobyte: (String) -> (String, [(Int, NSRange)])
+    let megabyte: (String) -> (String, [(Int, NSRange)])
+    let gigabyte: (String) -> (String, [(Int, NSRange)])
+    
+    public init(decimalSeparator: String, byte: @escaping (String) -> (String, [(Int, NSRange)]), kilobyte: @escaping (String) -> (String, [(Int, NSRange)]), megabyte: @escaping (String) -> (String, [(Int, NSRange)]), gigabyte: @escaping (String) -> (String, [(Int, NSRange)])) {
+        self.decimalSeparator = decimalSeparator
+        self.byte = byte
+        self.kilobyte = kilobyte
+        self.megabyte = megabyte
+        self.gigabyte = gigabyte
+    }
+}
+
+public func dataSizeString(_ size: Int64, forceDecimal: Bool = false, formatting: DataSizeStringFormatting) -> String {
+    if size >= 1024 * 1024 * 1024 {
+        let remainder = Int64((Double(size % (1024 * 1024 * 1024)) / (1024 * 1024 * 102.4)).rounded(.down))
+        if remainder != 0 || forceDecimal {
+            return formatting.gigabyte("\(size / (1024 * 1024 * 1024))\(formatting.decimalSeparator)\(remainder)").0
+        } else {
+            return formatting.gigabyte("\(size / (1024 * 1024 * 1024))").0
+        }
+    } else if size >= 1024 * 1024 {
+        let remainder = Int64((Double(size % (1024 * 1024)) / (1024.0 * 102.4)).rounded(.down))
+        if remainder != 0 || forceDecimal {
+            return formatting.megabyte( "\(size / (1024 * 1024))\(formatting.decimalSeparator)\(remainder)").0
+        } else {
+            return formatting.megabyte("\(size / (1024 * 1024))").0
+        }
+    } else if size >= 1024 {
+        let remainder = (size % (1024)) / (102)
+        if remainder != 0 || forceDecimal {
+            return formatting.kilobyte("\(size / 1024)\(formatting.decimalSeparator)\(remainder)").0
+        } else {
+            return formatting.kilobyte("\(size / 1024)").0
+        }
+    } else {
+        return formatting.byte("\(size)").0
+    }
+}
diff --git a/submodules/TelegramCore/Sources/UpdateMessageMedia.swift b/submodules/TelegramCore/Sources/Utils/UpdateMessageMedia.swift
similarity index 100%
rename from submodules/TelegramCore/Sources/UpdateMessageMedia.swift
rename to submodules/TelegramCore/Sources/Utils/UpdateMessageMedia.swift
diff --git a/submodules/TelegramCore/Sources/ValidateAddressNameInteractive.swift b/submodules/TelegramCore/Sources/ValidateAddressNameInteractive.swift
deleted file mode 100644
index 2b45f63e2e..0000000000
--- a/submodules/TelegramCore/Sources/ValidateAddressNameInteractive.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-
-public enum AddressNameValidationStatus: Equatable {
-    case checking
-    case invalidFormat(AddressNameFormatError)
-    case availability(AddressNameAvailability)
-}
-
-public func validateAddressNameInteractive(account: Account, domain: AddressNameDomain, name: String) -> Signal<AddressNameValidationStatus, NoError> {
-    if let error = checkAddressNameFormat(name) {
-        return .single(.invalidFormat(error))
-    } else {
-        return .single(.checking)
-        |> then(
-            addressNameAvailability(account: account, domain: domain, name: name)
-            |> delay(0.3, queue: Queue.concurrentDefaultQueue())
-            |> map { result -> AddressNameValidationStatus in
-                .availability(result)
-            }
-        )
-    }
-}
diff --git a/submodules/TelegramCore/Sources/Wallpaper.swift b/submodules/TelegramCore/Sources/Wallpaper.swift
deleted file mode 100644
index 4d41fa0368..0000000000
--- a/submodules/TelegramCore/Sources/Wallpaper.swift
+++ /dev/null
@@ -1,83 +0,0 @@
-import Foundation
-import Postbox
-import SwiftSignalKit
-import TelegramApi
-
-import SyncCore
-
-extension WallpaperSettings {
-    init(apiWallpaperSettings: Api.WallPaperSettings) {
-        switch apiWallpaperSettings {
-            case let .wallPaperSettings(flags, backgroundColor, secondBackgroundColor, intensity, rotation):
-                self = WallpaperSettings(blur: (flags & 1 << 1) != 0, motion: (flags & 1 << 2) != 0, color: backgroundColor.flatMap { UInt32(bitPattern: $0) }, bottomColor: secondBackgroundColor.flatMap { UInt32(bitPattern: $0) }, intensity: intensity, rotation: rotation)
-        }
-    }
-}
-
-func apiWallpaperSettings(_ wallpaperSettings: WallpaperSettings) -> Api.WallPaperSettings {
-    var flags: Int32 = 0
-    if let _ = wallpaperSettings.color {
-        flags |= (1 << 0)
-    }
-    if wallpaperSettings.blur {
-        flags |= (1 << 1)
-    }
-    if wallpaperSettings.motion {
-        flags |= (1 << 2)
-    }
-    if let _ = wallpaperSettings.intensity {
-        flags |= (1 << 3)
-    }
-    if let _ = wallpaperSettings.bottomColor {
-        flags |= (1 << 4)
-    }
-    return .wallPaperSettings(flags: flags, backgroundColor: wallpaperSettings.color.flatMap { Int32(bitPattern: $0) }, secondBackgroundColor: wallpaperSettings.bottomColor.flatMap { Int32(bitPattern: $0) }, intensity: wallpaperSettings.intensity, rotation: wallpaperSettings.rotation ?? 0)
-}
-
-extension TelegramWallpaper {
-    init(apiWallpaper: Api.WallPaper) {
-        switch apiWallpaper {
-            case let .wallPaper(id, flags, accessHash, slug, document, settings):
-                if let file = telegramMediaFileFromApiDocument(document) {
-                    let wallpaperSettings: WallpaperSettings
-                    if let settings = settings {
-                        wallpaperSettings = WallpaperSettings(apiWallpaperSettings: settings)
-                    } else {
-                        wallpaperSettings = WallpaperSettings()
-                    }
-                    self = .file(id: id, accessHash: accessHash, isCreator: (flags & 1 << 0) != 0, isDefault: (flags & 1 << 1) != 0, isPattern: (flags & 1 << 3) != 0, isDark: (flags & 1 << 4) != 0, slug: slug, file: file, settings: wallpaperSettings)
-                } else {
-                    //assertionFailure()
-                    self = .color(0xffffff)
-                }
-            case let .wallPaperNoFile(flags, settings):
-                if let settings = settings, case let .wallPaperSettings(flags, backgroundColor, secondBackgroundColor, intensity, rotation) = settings {
-                    if let color = backgroundColor, let bottomColor = secondBackgroundColor {
-                        self = .gradient(UInt32(bitPattern: color), UInt32(bitPattern: bottomColor), WallpaperSettings(rotation: rotation))
-                    } else if let color = backgroundColor {
-                        self = .color(UInt32(bitPattern: color))
-                    } else {
-                        self = .color(0xffffff)
-                    }
-                } else {
-                    self = .color(0xffffff)
-                }
-               
-        }
-    }
-    
-    var apiInputWallpaperAndSettings: (Api.InputWallPaper?, Api.WallPaperSettings)? {
-        switch self {
-            case .builtin:
-                return nil
-            case let .file(file):
-                return (.inputWallPaperSlug(slug: file.slug), apiWallpaperSettings(file.settings))
-            case let .color(color):
-                return (.inputWallPaperNoFile, apiWallpaperSettings(WallpaperSettings(color: color)))
-            case let .gradient(topColor, bottomColor, settings):
-                return (.inputWallPaperNoFile, apiWallpaperSettings(WallpaperSettings(color: topColor, bottomColor: bottomColor, rotation: settings.rotation)))
-            default:
-                return nil
-        }
-    }
-}
diff --git a/submodules/TelegramCore/Sources/Wallpapers.swift b/submodules/TelegramCore/Sources/Wallpapers.swift
index 4557a74894..59b32a0346 100644
--- a/submodules/TelegramCore/Sources/Wallpapers.swift
+++ b/submodules/TelegramCore/Sources/Wallpapers.swift
@@ -7,7 +7,7 @@ import SyncCore
 
 public func telegramWallpapers(postbox: Postbox, network: Network, forceUpdate: Bool = false) -> Signal<[TelegramWallpaper], NoError> {
     let fetch: ([TelegramWallpaper]?, Int32?) -> Signal<[TelegramWallpaper], NoError> = { current, hash in
-        network.request(Api.functions.account.getWallPapers(hash: hash ?? 0))
+        network.request(Api.functions.account.getWallPapers(hash: 0))
         |> retryRequest
         |> mapToSignal { result -> Signal<([TelegramWallpaper], Int32), NoError> in
             switch result {
@@ -162,10 +162,16 @@ private func saveUnsaveWallpaper(account: Account, wallpaper: TelegramWallpaper,
 }
 
 public func installWallpaper(account: Account, wallpaper: TelegramWallpaper) -> Signal<Void, NoError> {
-    guard case let .file(_, _, _, _, _, _, slug, _, settings) = wallpaper else {
+    guard case let .file(id, accessHash, _, _, _, _, slug, _, settings) = wallpaper else {
         return .complete()
     }
-    return account.network.request(Api.functions.account.installWallPaper(wallpaper: Api.InputWallPaper.inputWallPaperSlug(slug: slug), settings: apiWallpaperSettings(settings)))
+    let inputWallpaper: Api.InputWallPaper
+    if id != 0 && accessHash != 0 {
+        inputWallpaper = .inputWallPaper(id: id, accessHash: accessHash)
+    } else {
+        inputWallpaper = .inputWallPaperSlug(slug: slug)
+    }
+    return account.network.request(Api.functions.account.installWallPaper(wallpaper: inputWallpaper, settings: apiWallpaperSettings(settings)))
     |> `catch` { _ -> Signal<Api.Bool, NoError> in
         return .complete()
     }
diff --git a/submodules/TelegramCore/Sources/module.private.modulemap b/submodules/TelegramCore/Sources/module.private.modulemap
deleted file mode 100644
index 06df6c843a..0000000000
--- a/submodules/TelegramCore/Sources/module.private.modulemap
+++ /dev/null
@@ -1,3 +0,0 @@
-module TelegramCore.TelegramCorePrivate {
-    export *
-}
diff --git a/submodules/TelegramPermissionsUI/Sources/PermissionContentNode.swift b/submodules/TelegramPermissionsUI/Sources/PermissionContentNode.swift
index 6c53c5df9b..7d3a07c73f 100644
--- a/submodules/TelegramPermissionsUI/Sources/PermissionContentNode.swift
+++ b/submodules/TelegramPermissionsUI/Sources/PermissionContentNode.swift
@@ -233,7 +233,7 @@ public final class PermissionContentNode: ASDisplayNode {
         }
         if let _ = self.animationNode, size.width < size.height {
             imageSpacing = floor(availableHeight * 0.12)
-            imageSize = CGSize(width: 200.0, height: 200.0)
+            imageSize = CGSize(width: 240.0, height: 240.0)
             contentHeight += imageSize.height + imageSpacing
         }
         
diff --git a/submodules/TelegramPermissionsUI/Sources/PermissionController.swift b/submodules/TelegramPermissionsUI/Sources/PermissionController.swift
index 9639657c4c..4bd56eb471 100644
--- a/submodules/TelegramPermissionsUI/Sources/PermissionController.swift
+++ b/submodules/TelegramPermissionsUI/Sources/PermissionController.swift
@@ -39,7 +39,7 @@ public final class PermissionController: ViewController {
         
         let navigationBarPresentationData: NavigationBarPresentationData
         if splashScreen {
-            navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))
+            navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))
         } else {
             navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData)
         }
@@ -89,7 +89,7 @@ public final class PermissionController: ViewController {
         
         let navigationBarPresentationData: NavigationBarPresentationData
         if self.splashScreen {
-            navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))
+            navigationBarPresentationData = NavigationBarPresentationData(theme: NavigationBarTheme(buttonColor: self.presentationData.theme.rootController.navigationBar.accentTextColor, disabledButtonColor: self.presentationData.theme.rootController.navigationBar.disabledButtonColor, primaryTextColor: self.presentationData.theme.rootController.navigationBar.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear), strings: NavigationBarStrings(presentationStrings: self.presentationData.strings))
         } else {
             navigationBarPresentationData = NavigationBarPresentationData(presentationData: self.presentationData)
         }
@@ -253,7 +253,7 @@ public final class PermissionController: ViewController {
             self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed))
         }
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.splashScreen ? 0.0 : self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.splashScreen ? 0.0 : self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func nextPressed() {
diff --git a/submodules/TelegramPresentationData/BUILD b/submodules/TelegramPresentationData/BUILD
index 741b28c6b7..424efdb88a 100644
--- a/submodules/TelegramPresentationData/BUILD
+++ b/submodules/TelegramPresentationData/BUILD
@@ -17,6 +17,7 @@ swift_library(
         "//submodules/AppBundle:AppBundle",
         "//submodules/StringPluralization:StringPluralization",
         "//submodules/Sunrise:Sunrise",
+        "//submodules/TinyThumbnail:TinyThumbnail",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift
index f72ccd56f1..04a846ed1e 100644
--- a/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift
+++ b/submodules/TelegramPresentationData/Sources/ChatControllerBackgroundNode.swift
@@ -8,6 +8,7 @@ import SwiftSignalKit
 import Postbox
 import MediaResources
 import AppBundle
+import TinyThumbnail
 
 private var backgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)?
 
@@ -42,9 +43,9 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i
                     context.setFillColor(UIColor(argb: color).withAlphaComponent(1.0).cgColor)
                     context.fill(CGRect(origin: CGPoint(), size: size))
                 })
-            case let .gradient(topColor, bottomColor, settings):
+            case let .gradient(_, colors, settings):
                 backgroundImage = generateImage(CGSize(width: 640.0, height: 1280.0), rotatedContext: { size, context in
-                    let gradientColors = [UIColor(argb: topColor).cgColor, UIColor(argb: bottomColor).cgColor] as CFArray
+                    let gradientColors = [UIColor(argb: colors.count >= 1 ? colors[0] : 0).cgColor, UIColor(argb: colors.count >= 2 ? colors[1] : 0).cgColor] as CFArray
                        
                     var locations: [CGFloat] = [0.0, 1.0]
                     let colorSpace = CGColorSpaceCreateDeviceRGB()
@@ -73,14 +74,8 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i
                     }
                 }
             case let .file(file):
-                if wallpaper.isPattern, let color = file.settings.color, let intensity = file.settings.intensity {
-                    var image: UIImage?
-                    let _ = mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true, attemptSynchronously: true).start(next: { data in
-                        if data.complete {
-                            image = UIImage(contentsOfFile: data.path)?.precomposed()
-                        }
-                    })
-                    backgroundImage = image
+                if wallpaper.isPattern {
+                    backgroundImage = nil
                 } else {
                     if file.settings.blur && composed {
                         var image: UIImage?
@@ -107,7 +102,6 @@ public func chatControllerBackgroundImage(theme: PresentationTheme?, wallpaper i
 private var signalBackgroundImageForWallpaper: (TelegramWallpaper, Bool, UIImage)?
 
 public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, mediaBox: MediaBox, accountMediaBox: MediaBox) -> Signal<(UIImage?, Bool)?, NoError> {
-    var backgroundImage: UIImage?
     if wallpaper == signalBackgroundImageForWallpaper?.0, (wallpaper.settings?.blur ?? false) == signalBackgroundImageForWallpaper?.1, let image = signalBackgroundImageForWallpaper?.2 {
         return .single((image, true))
     } else {
@@ -135,17 +129,17 @@ public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, me
                 |> afterNext { image in
                     cacheWallpaper(image?.0)
                 }
-            case let .gradient(topColor, bottomColor, settings):
-                return .single((generateImage(CGSize(width: 640.0, height: 1280.0), rotatedContext: { size, context in
-                    let gradientColors = [UIColor(argb: topColor).cgColor, UIColor(argb: bottomColor).cgColor] as CFArray
+            case let .gradient(_, colors, settings):
+                return .single((generateImage(CGSize(width: 640.0, height: 1280.0).fitted(CGSize(width: 100.0, height: 100.0)), rotatedContext: { size, context in
+                    let gradientColors = [UIColor(rgb: colors.count >= 1 ? colors[0] : 0).cgColor, UIColor(rgb: colors.count >= 2 ? colors[1] : 0).cgColor] as CFArray
                        
                     var locations: [CGFloat] = [0.0, 1.0]
                     let colorSpace = CGColorSpaceCreateDeviceRGB()
                     let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
 
-                    context.translateBy(x: 320.0, y: 640.0)
+                    context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
                     context.rotate(by: CGFloat(settings.rotation ?? 0) * CGFloat.pi / 180.0)
-                    context.translateBy(x: -320.0, y: -640.0)
+                    context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
                     
                     context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
                 }), true))
@@ -174,76 +168,51 @@ public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, me
                     }
                 }
             case let .file(file):
-                if wallpaper.isPattern, let color = file.settings.color, let intensity = file.settings.intensity {
-                    let representation = CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation)
-                    
-                    let effectiveMediaBox: MediaBox
-                    if FileManager.default.fileExists(atPath: mediaBox.cachedRepresentationCompletePath(file.file.resource.id, representation: representation)) {
-                        effectiveMediaBox = mediaBox
-                    } else {
-                        effectiveMediaBox = accountMediaBox
-                    }
-                    
-                    return effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true)
-                    |> take(1)
-                    |> mapToSignal { data -> Signal<(UIImage?, Bool)?, NoError> in
-                        if data.complete {
-                            return .single((UIImage(contentsOfFile: data.path)?.precomposed(), true))
-                        } else {
-                            let interimWallpaper: TelegramWallpaper
-                            if let secondColor = file.settings.bottomColor {
-                                interimWallpaper = .gradient(color, secondColor, file.settings)
-                            } else {
-                                interimWallpaper = .color(color)
-                            }
-                            
-                            let settings = file.settings
-                            let interrimImage = generateImage(CGSize(width: 640.0, height: 1280.0), rotatedContext: { size, context in
-                                if let color = settings.color {
-                                    let gradientColors = [UIColor(argb: color).cgColor, UIColor(argb: settings.bottomColor ?? color).cgColor] as CFArray
-                                    
-                                    var locations: [CGFloat] = [0.0, 1.0]
-                                    let colorSpace = CGColorSpaceCreateDeviceRGB()
-                                    let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
-                                    
-                                    context.translateBy(x: 320.0, y: 640.0)
-                                    context.rotate(by: CGFloat(settings.rotation ?? 0) * CGFloat.pi / 180.0)
-                                    context.translateBy(x: -320.0, y: -640.0)
-                                    
-                                    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-                                }
-                            })
-
-                            return .single((interrimImage, false)) |> then(effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true, attemptSynchronously: false)
-                            |> map { data -> (UIImage?, Bool)? in
-                                return (UIImage(contentsOfFile: data.path)?.precomposed(), true)
-                            })
-                        }
-                    }
-                    |> afterNext { image in
-                        cacheWallpaper(image?.0)
-                    }
+                if wallpaper.isPattern {
+                    return .single((nil, true))
                 } else {
                     if file.settings.blur {
                         let representation = CachedBlurredWallpaperRepresentation()
-                        
-                        let effectiveMediaBox: MediaBox
+
                         if FileManager.default.fileExists(atPath: mediaBox.cachedRepresentationCompletePath(file.file.resource.id, representation: representation)) {
-                            effectiveMediaBox = mediaBox
-                        } else {
-                            effectiveMediaBox = accountMediaBox
-                        }
-                        
-                        return effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true)
-                        |> map { data -> (UIImage?, Bool)? in
-                            if data.complete {
-                                return (UIImage(contentsOfFile: data.path)?.precomposed(), true)
-                            } else {
-                                return nil
+                            let effectiveMediaBox = mediaBox
+
+                            return effectiveMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true)
+                            |> map { data -> (UIImage?, Bool)? in
+                                if data.complete {
+                                    return (UIImage(contentsOfFile: data.path)?.precomposed(), true)
+                                } else {
+                                    return nil
+                                }
+                            }
+                            |> afterNext { image in
+                                cacheWallpaper(image?.0)
+                            }
+                        } else {
+                            return Signal { subscriber in
+                                let fetch = fetchedMediaResource(mediaBox: accountMediaBox, reference: MediaResourceReference.wallpaper(wallpaper: WallpaperReference.slug(file.slug), resource: file.file.resource)).start()
+                                var didOutputBlurred = false
+                                let data = accountMediaBox.cachedResourceRepresentation(file.file.resource, representation: representation, complete: true, fetch: true, attemptSynchronously: true).start(next: { data in
+                                    if data.complete {
+                                        if let image = UIImage(contentsOfFile: data.path)?.precomposed() {
+                                            mediaBox.copyResourceData(file.file.resource.id, fromTempPath: data.path)
+                                            subscriber.putNext((image, true))
+                                        }
+                                    } else if !didOutputBlurred {
+                                        didOutputBlurred = true
+                                        if let immediateThumbnailData = file.file.immediateThumbnailData, let decodedData = decodeTinyThumbnail(data: immediateThumbnailData) {
+                                            if let image = UIImage(data: decodedData)?.precomposed() {
+                                                subscriber.putNext((image, false))
+                                            }
+                                        }
+                                    }
+                                })
+
+                                return ActionDisposable {
+                                    fetch.dispose()
+                                    data.dispose()
+                                }
                             }
-                        }
-                        |> afterNext { image in
-                            cacheWallpaper(image?.0)
                         }
                     } else {
                         var path: String?
@@ -257,6 +226,31 @@ public func chatControllerBackgroundImageSignal(wallpaper: TelegramWallpaper, me
                             |> afterNext { image in
                                 cacheWallpaper(image?.0)
                             }
+                        } else {
+                            return Signal { subscriber in
+                                let fetch = fetchedMediaResource(mediaBox: accountMediaBox, reference: MediaResourceReference.wallpaper(wallpaper: WallpaperReference.slug(file.slug), resource: file.file.resource)).start()
+                                var didOutputBlurred = false
+                                let data = accountMediaBox.resourceData(file.file.resource).start(next: { data in
+                                    if data.complete {
+                                        if let image = UIImage(contentsOfFile: data.path)?.precomposed() {
+                                            mediaBox.copyResourceData(file.file.resource.id, fromTempPath: data.path)
+                                            subscriber.putNext((image, true))
+                                        }
+                                    } else if !didOutputBlurred {
+                                        didOutputBlurred = true
+                                        if let immediateThumbnailData = file.file.immediateThumbnailData, let decodedData = decodeTinyThumbnail(data: immediateThumbnailData) {
+                                            if let image = UIImage(data: decodedData)?.precomposed() {
+                                                subscriber.putNext((image, false))
+                                            }
+                                        }
+                                    }
+                                })
+
+                                return ActionDisposable {
+                                    fetch.dispose()
+                                    data.dispose()
+                                }
+                            }
                         }
                     }
                 }
diff --git a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift
index 78ffaa5bad..4b3ad3a60e 100644
--- a/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift
+++ b/submodules/TelegramPresentationData/Sources/ChatMessageBubbleImages.swift
@@ -197,8 +197,8 @@ public func messageBubbleImage(maxCornerRadius: CGFloat, minCornerRadius: CGFloa
             borderWidth = UIScreenPixel + innerExtension
             borderOffset = -innerExtension / 2.0 + UIScreenPixel / 2.0
         } else {
-            borderWidth = UIScreenPixel * 2.0 + innerExtension
-            borderOffset = -innerExtension / 2.0 + UIScreenPixel * 2.0 / 2.0
+            borderWidth = UIScreenPixel + innerExtension
+            borderOffset = -innerExtension / 2.0// + UIScreenPixel * 2.0 / 2.0
         }
         context.setLineWidth(borderWidth)
         
diff --git a/submodules/TelegramPresentationData/Sources/ChatPresentationData.swift b/submodules/TelegramPresentationData/Sources/ChatPresentationData.swift
index 614ea5416e..4ed273afbf 100644
--- a/submodules/TelegramPresentationData/Sources/ChatPresentationData.swift
+++ b/submodules/TelegramPresentationData/Sources/ChatPresentationData.swift
@@ -66,6 +66,6 @@ public final class ChatPresentationData {
 
 extension ChatPresentationData {
     public convenience init(presentationData: PresentationData) {
-        self.init(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners)
+        self.init(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners)
     }
 }
diff --git a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
index 4467fbb77f..0168febaff 100644
--- a/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
+++ b/submodules/TelegramPresentationData/Sources/ComponentsThemes.swift
@@ -45,9 +45,9 @@ public extension TabBarControllerTheme {
 }
 
 public extension NavigationBarTheme {
-    convenience init(rootControllerTheme: PresentationTheme, hideBackground: Bool = false, hideBadge: Bool = false) {
+    convenience init(rootControllerTheme: PresentationTheme, enableBackgroundBlur: Bool = true, hideBackground: Bool = false, hideBadge: Bool = false) {
         let theme = rootControllerTheme.rootController.navigationBar
-        self.init(buttonColor: theme.buttonColor, disabledButtonColor: theme.disabledButtonColor, primaryTextColor: theme.primaryTextColor, backgroundColor: hideBackground ? .clear : theme.backgroundColor, separatorColor: hideBackground ? .clear : theme.separatorColor, badgeBackgroundColor: hideBadge ? .clear : theme.badgeBackgroundColor, badgeStrokeColor: hideBadge ? .clear : theme.badgeStrokeColor, badgeTextColor: hideBadge ? .clear : theme.badgeTextColor)
+        self.init(buttonColor: theme.buttonColor, disabledButtonColor: theme.disabledButtonColor, primaryTextColor: theme.primaryTextColor, backgroundColor: hideBackground ? .clear : theme.blurredBackgroundColor, enableBackgroundBlur: enableBackgroundBlur, separatorColor: hideBackground ? .clear : theme.separatorColor, badgeBackgroundColor: hideBadge ? .clear : theme.badgeBackgroundColor, badgeStrokeColor: hideBadge ? .clear : theme.badgeStrokeColor, badgeTextColor: hideBadge ? .clear : theme.badgeTextColor)
     }
 }
 
@@ -104,13 +104,6 @@ public extension AlertControllerTheme {
     }
 }
 
-extension PeekControllerTheme {
-    convenience public init(presentationTheme: PresentationTheme) {
-        let actionSheet = presentationTheme.actionSheet
-        self.init(isDark: actionSheet.backgroundType == .dark, menuBackgroundColor: actionSheet.opaqueItemBackgroundColor, menuItemHighligtedColor: actionSheet.opaqueItemHighlightedBackgroundColor, menuItemSeparatorColor: actionSheet.opaqueItemSeparatorColor, accentColor: actionSheet.controlAccentColor, destructiveColor: actionSheet.destructiveActionTextColor)
-    }
-}
-
 public extension NavigationControllerTheme {
     convenience init(presentationTheme: PresentationTheme) {
         let navigationStatusBar: NavigationStatusBarStyle
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
index f81fe6f02d..7580569fdc 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkPresentationTheme.swift
@@ -5,9 +5,56 @@ import SyncCore
 import TelegramUIPreferences
 
 public let defaultDarkPresentationTheme = makeDefaultDarkPresentationTheme(preview: false)
-public let defaultDarkColorPresentationTheme = customizeDefaultDarkPresentationTheme(theme: defaultDarkPresentationTheme, editing: false, title: nil, accentColor: UIColor(rgb: 0x007aff), backgroundColors: nil, bubbleColors: nil, wallpaper: nil)
+public let defaultDarkColorPresentationTheme = customizeDefaultDarkPresentationTheme(theme: defaultDarkPresentationTheme, editing: false, title: nil, accentColor: UIColor(rgb: 0x007aff), backgroundColors: [], bubbleColors: nil, wallpaper: nil, baseColor: nil)
 
-public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil) -> PresentationTheme {
+private extension PresentationThemeBaseColor {
+/*
+
+     Оранжевая с красным
+     https://t.me/bg/9LW_RcoOSVACAAAAFTk3DTyXN-M?bg_color=fec496~dd6cb9~962fbf~4f5bd5&intensity=-40
+
+     Голубая с розовым
+     https://t.me/bg/9iklpvIPQVABAAAAORQXKur_Eyc?bg_color=8adbf2~888dec~e39fea~679ced&intensity=-30
+
+     Мятная
+     https://t.me/bg/CJNyxPMgSVAEAAAAvW9sMwc51cw?bg_color=7fa381~fff5c5~336f55~fbe37d&intensity=-20
+
+     Синяя с розовым
+     https://t.me/bg/9LW_RcoOSVACAAAAFTk3DTyXN-M?bg_color=fec496~dd6cb9~962fbf~4f5bd5&intensity=-40
+
+*/
+
+    var colorWallpaper: (BuiltinWallpaperData, Int32, [UInt32])? {
+        switch self {
+        case .blue:
+            return nil
+        case .cyan:
+            return (.variant5, -30, [0xa4dbff, 0x009fdd, 0x527bdd])
+        case .green:
+            return (.variant3, -20, [0x7fa381, 0xfff5c5, 0x336f55, 0xfbe37d])
+        case .pink:
+            return (.variant9, -35, [0xe4b2ea, 0x8376c2, 0xeab9d9, 0xb493e6])
+        case .orange:
+            return (.variant2, -40, [0xfec496, 0xdd6cb9, 0x962fbf, 0x4f5bd5])
+        case .purple:
+            return (.variant6, -30, [0x8adbf2, 0x888dec, 0xe39fea, 0x679ced])
+        case .red:
+            return (.variant4, -35, [0xe4b2ea, 0x8376c2, 0xeab9d9, 0xb493e6])
+        case .yellow:
+            return (.variant1, -30, [0xeaa36e, 0xf0e486, 0xf29ebf, 0xe8c06e])
+        case .gray:
+            return nil
+        case .black:
+            return nil
+        case .white:
+            return nil
+        case .custom, .preset, .theme:
+            return nil
+        }
+    }
+}
+
+public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil) -> PresentationTheme {
     if (theme.referenceTheme != .night) {
         return theme
     }
@@ -82,11 +129,13 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit
     var defaultWallpaper: TelegramWallpaper?
     if let forcedWallpaper = forcedWallpaper {
         defaultWallpaper = forcedWallpaper
-    } else if let backgroundColors = backgroundColors {
-        if let secondColor = backgroundColors.1 {
-            defaultWallpaper = .gradient(backgroundColors.0.argb, secondColor.argb, WallpaperSettings())
+    } else if let baseColor = baseColor, let (variant, intensity, colors) = baseColor.colorWallpaper, !colors.isEmpty {
+        defaultWallpaper = defaultBuiltinWallpaper(data: variant, colors: colors, intensity: intensity)
+    } else if !backgroundColors.isEmpty {
+        if backgroundColors.count >= 2 {
+            defaultWallpaper = .gradient(nil, backgroundColors, WallpaperSettings())
         } else {
-            defaultWallpaper = .color(backgroundColors.0.argb)
+            defaultWallpaper = .color(backgroundColors[0])
         }
     }
     
@@ -231,18 +280,6 @@ public func customizeDefaultDarkPresentationTheme(theme: PresentationTheme, edit
 }
 
 public func makeDefaultDarkPresentationTheme(extendingThemeReference: PresentationThemeReference? = nil, preview: Bool) -> PresentationTheme {
-    let rootTabBar = PresentationThemeRootTabBar(
-        backgroundColor: UIColor(rgb: 0x1c1c1d),
-        separatorColor: UIColor(rgb: 0x3d3d40),
-        iconColor: UIColor(rgb: 0x828282),
-        selectedIconColor: UIColor(rgb: 0xffffff),
-        textColor: UIColor(rgb: 0x828282),
-        selectedTextColor: UIColor(rgb: 0xffffff),
-        badgeBackgroundColor:  UIColor(rgb: 0xffffff),
-        badgeStrokeColor: UIColor(rgb: 0x1c1c1d),
-        badgeTextColor:  UIColor(rgb: 0x000000)
-    )
-
     let rootNavigationBar = PresentationThemeRootNavigationBar(
         buttonColor: UIColor(rgb: 0xffffff),
         disabledButtonColor: UIColor(rgb: 0x525252),
@@ -250,7 +287,8 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5),
         controlColor: UIColor(rgb: 0x767676),
         accentTextColor: UIColor(rgb: 0xffffff),
-        backgroundColor: UIColor(rgb: 0x1c1c1d),
+        blurredBackgroundColor: UIColor(rgb: 0x1d1d1d, alpha: 0.9),
+        opaqueBackgroundColor: UIColor(rgb: 0x1d1d1d).mixedWith(UIColor(rgb: 0x000000), alpha: 0.1),
         separatorColor: UIColor(rgb: 0x3d3d40),
         badgeBackgroundColor:  UIColor(rgb: 0xffffff),
         badgeStrokeColor: UIColor(rgb: 0x1c1c1d),
@@ -263,6 +301,18 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         clearButtonForegroundColor: UIColor(rgb: 0xffffff)
     )
 
+    let rootTabBar = PresentationThemeRootTabBar(
+        backgroundColor: rootNavigationBar.blurredBackgroundColor,
+        separatorColor: UIColor(rgb: 0x3d3d40),
+        iconColor: UIColor(rgb: 0x828282),
+        selectedIconColor: UIColor(rgb: 0xffffff),
+        textColor: UIColor(rgb: 0x828282),
+        selectedTextColor: UIColor(rgb: 0xffffff),
+        badgeBackgroundColor:  UIColor(rgb: 0xffffff),
+        badgeStrokeColor: UIColor(rgb: 0x1c1c1d),
+        badgeTextColor:  UIColor(rgb: 0x000000)
+    )
+
     let navigationSearchBar = PresentationThemeNavigationSearchBar(
         backgroundColor: UIColor(rgb: 0x1c1c1d),
         accentColor: UIColor(rgb: 0xffffff),
@@ -341,25 +391,31 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         ),
         controlSecondaryColor: UIColor(rgb: 0xffffff, alpha: 0.5),
         freeInputField: PresentationInputFieldTheme(
-            backgroundColor: UIColor(rgb: 0xffffff, alpha: 0.5),
-            strokeColor: UIColor(rgb: 0xffffff, alpha: 0.5),
-            placeholderColor: UIColor(rgb: 0x4d4d4d),
+            backgroundColor: UIColor(rgb: 0x272728),
+            strokeColor: UIColor(rgb: 0x272728),
+            placeholderColor: UIColor(rgb: 0x98989e),
             primaryColor: UIColor(rgb: 0xffffff),
-            controlColor: UIColor(rgb: 0x4d4d4d)
+            controlColor: UIColor(rgb: 0x98989e)
         ),
         freePlainInputField: PresentationInputFieldTheme(
-            backgroundColor: UIColor(rgb: 0xffffff, alpha: 0.5),
-            strokeColor: UIColor(rgb: 0xffffff, alpha: 0.5),
-            placeholderColor: UIColor(rgb: 0x4d4d4d),
+            backgroundColor: UIColor(rgb: 0x272728),
+            strokeColor: UIColor(rgb: 0x272728),
+            placeholderColor: UIColor(rgb: 0x98989e),
             primaryColor: UIColor(rgb: 0xffffff),
-            controlColor: UIColor(rgb: 0x4d4d4d)
+            controlColor: UIColor(rgb: 0x98989e)
         ),
         mediaPlaceholderColor: UIColor(rgb: 0xffffff).mixedWith(UIColor(rgb: 0x1c1c1d), alpha: 0.9),
         scrollIndicatorColor: UIColor(rgb: 0xffffff, alpha: 0.3),
         pageIndicatorInactiveColor: UIColor(white: 1.0, alpha: 0.3),
         inputClearButtonColor: UIColor(rgb: 0x8b9197),
         itemBarChart: PresentationThemeItemBarChart(color1: UIColor(rgb: 0xffffff), color2: UIColor(rgb: 0x929196), color3: UIColor(rgb: 0x333333)),
-        itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0x0f0f0f), strokeColor: UIColor(rgb: 0x0f0f0f), placeholderColor: UIColor(rgb: 0x8f8f8f), primaryColor: UIColor(rgb: 0xffffff), controlColor: UIColor(rgb: 0x8f8f8f))
+        itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0x0f0f0f), strokeColor: UIColor(rgb: 0x0f0f0f), placeholderColor: UIColor(rgb: 0x8f8f8f), primaryColor: UIColor(rgb: 0xffffff), controlColor: UIColor(rgb: 0x8f8f8f)),
+        paymentOption: PresentationThemeList.PaymentOption(
+            inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.3),
+            inactiveForegroundColor: UIColor(rgb: 0x00A650),
+            activeFillColor: UIColor(rgb: 0x00A650),
+            activeForegroundColor: UIColor(rgb: 0xffffff)
+        )
     )
 
     let chatList = PresentationThemeChatList(
@@ -397,10 +453,12 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
         unpinnedArchiveAvatarColor: PresentationThemeArchiveAvatarColors(backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x666666), bottomColor: UIColor(rgb: 0x666666)), foregroundColor: UIColor(rgb: 0x000000)),
         onlineDotColor: UIColor(rgb: 0x4cc91f)
     )
+
+    let incomingBubbleAlpha: CGFloat = 0.9
     
     let message = PresentationThemeChatMessage(
-        incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x262628), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.4), mediaControlInnerBackgroundColor: UIColor(rgb: 0x262628), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff, alpha: 0.12), separator: UIColor(rgb: 0x000000), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)),
-        outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill:  UIColor(rgb: 0x313131), gradientFill:  UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke:  UIColor(rgb: 0x313131), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill:  UIColor(rgb: 0x313131), gradientFill:  UIColor(rgb: 0x313131), highlightedFill: UIColor(rgb: 0x464646), stroke:  UIColor(rgb: 0x313131), shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaControlInnerBackgroundColor:  UIColor(rgb: 0x313131), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xffffff), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff).withAlphaComponent(0.12), separator: UIColor(rgb: 0xffffff, alpha: 0.5), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0xffffff), barNegative: UIColor(rgb: 0xffffff)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)),
+        incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1D1D1D, alpha: incomingBubbleAlpha), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1D1D1D, alpha: incomingBubbleAlpha), highlightedFill: UIColor(rgb: 0x353539), stroke: UIColor(rgb: 0x262628), shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.4), mediaControlInnerBackgroundColor: UIColor(rgb: 0x262628), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x1f1f1f).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0x737373), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff, alpha: 0.12), separator: UIColor(rgb: 0x000000), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)),
+        outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x61BCF9), gradientFill:  UIColor(rgb: 0x007AFF), highlightedFill: UIColor(rgb: 0x61BCF9), stroke: .clear, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x61BCF9), gradientFill: UIColor(rgb: 0x007AFF), highlightedFill: UIColor(rgb: 0x61BCF9), stroke: .clear, shadow: nil)), primaryTextColor: UIColor(rgb: 0xffffff), secondaryTextColor: UIColor(rgb: 0xffffff, alpha: 0.5), linkTextColor: UIColor(rgb: 0xffffff), linkHighlightColor: UIColor(rgb: 0xffffff, alpha: 0.5), scamColor: UIColor(rgb: 0xeb5545), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: UIColor(rgb: 0xffffff), accentControlColor: UIColor(rgb: 0xffffff), accentControlDisabledColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaActiveControlColor: UIColor(rgb: 0xffffff), mediaInactiveControlColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaControlInnerBackgroundColor:  UIColor(rgb: 0x313131), pendingActivityColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileTitleColor: UIColor(rgb: 0xffffff), fileDescriptionColor: UIColor(rgb: 0xffffff, alpha: 0.5), fileDurationColor: UIColor(rgb: 0xffffff, alpha: 0.5), mediaPlaceholderColor: UIColor(rgb: 0x313131).mixedWith(UIColor(rgb: 0xffffff), alpha: 0.05), polls: PresentationThemeChatBubblePolls(radioButton: UIColor(rgb: 0xffffff), radioProgress: UIColor(rgb: 0xffffff), highlight: UIColor(rgb: 0xffffff).withAlphaComponent(0.12), separator: UIColor(rgb: 0xffffff, alpha: 0.5), bar: UIColor(rgb: 0xffffff), barIconForeground: .clear, barPositive: UIColor(rgb: 0xffffff), barNegative: UIColor(rgb: 0xffffff)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0x000000, alpha: 0.5), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xb2b2b2, alpha: 0.18)), actionButtonsTextColor: PresentationThemeVariableColor(color: UIColor(rgb: 0xffffff)), textSelectionColor: UIColor(rgb: 0xffffff, alpha: 0.2), textSelectionKnobColor: UIColor(rgb: 0xffffff)),
         freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f), shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: UIColor(rgb: 0x1f1f1f), highlightedFill: UIColor(rgb: 0x2a2a2a), stroke: UIColor(rgb: 0x1f1f1f), shadow: nil)),
         infoPrimaryTextColor: UIColor(rgb: 0xffffff),
         infoLinkTextColor: UIColor(rgb: 0xffffff),
@@ -433,15 +491,15 @@ public func makeDefaultDarkPresentationTheme(extendingThemeReference: Presentati
     )
 
     let inputPanel = PresentationThemeChatInputPanel(
-        panelBackgroundColor: UIColor(rgb: 0x1c1c1d),
-        panelBackgroundColorNoWallpaper: UIColor(rgb: 0x000000),
+        panelBackgroundColor: rootNavigationBar.blurredBackgroundColor,
+        panelBackgroundColorNoWallpaper: UIColor(rgb: 0x000000, alpha: 0.94),
         panelSeparatorColor: UIColor(rgb: 0x3d3d40),
         panelControlAccentColor: UIColor(rgb: 0xffffff),
         panelControlColor: UIColor(rgb: 0x808080),
         panelControlDisabledColor: UIColor(rgb: 0x808080, alpha: 0.5),
         panelControlDestructiveColor: UIColor(rgb: 0xff3b30),
         inputBackgroundColor: UIColor(rgb: 0x060606),
-        inputStrokeColor: UIColor(rgb: 0x353537),
+        inputStrokeColor: UIColor(rgb: 0xffffff, alpha: 0.1),
         inputPlaceholderColor: UIColor(rgb: 0x7b7b7b),
         inputTextColor: UIColor(rgb: 0xffffff),
         inputControlColor: UIColor(rgb: 0x7b7b7b),
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
index 9a9326fe19..1d1ebd05a6 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDarkTintedPresentationTheme.swift
@@ -3,11 +3,43 @@ import UIKit
 import TelegramCore
 import SyncCore
 import TelegramUIPreferences
+import Postbox
 
 private let defaultDarkTintedAccentColor = UIColor(rgb: 0x2ea6ff)
 public let defaultDarkTintedPresentationTheme = makeDefaultDarkTintedPresentationTheme(preview: false)
 
-public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil) -> PresentationTheme {
+private extension PresentationThemeBaseColor {
+    var colorWallpaper: (BuiltinWallpaperData, Int32, [UInt32])? {
+        switch self {
+        case .blue:
+            return (.variant7, 40, [0x1e3557, 0x182036, 0x1c4352, 0x16263a])
+        case .cyan:
+            return (.variant3, 40, [0x1e3557, 0x151a36, 0x1c4352, 0x2a4541])
+        case .green:
+            return (.variant3, 40, [0x2d4836, 0x172b19, 0x364331, 0x103231])
+        case .pink:
+            return (.variant9, 40, [0x2c0b22, 0x290020, 0x160a22, 0x3b1834])
+        case .orange:
+            return (.variant10, 40, [0x2c211b, 0x442917, 0x22191f, 0x3b2714])
+        case .purple:
+            return (.variant11, 40, [0x3a1c3a, 0x24193c, 0x392e3e, 0x1a1632])
+        case .red:
+            return (.variant4, 40, [0x2c211b, 0x44332a, 0x22191f, 0x3b2d36])
+        case .yellow:
+            return (.variant2, 40, [0x2c2512, 0x45360b, 0x221d08, 0x3b2f13])
+        case .gray:
+            return (.variant6, 40, [0x1c2731, 0x1a1c25, 0x27303b, 0x1b1b21])
+        case .black:
+            return nil
+        case .white:
+            return nil
+        case .custom, .preset, .theme:
+            return nil
+        }
+    }
+}
+
+public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil) -> PresentationTheme {
     if (theme.referenceTheme != .nightAccent) {
         return theme
     }
@@ -46,8 +78,12 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
     var bubbleColors = bubbleColors
     if bubbleColors == nil, editing {
         if let accentColor = accentColor {
-            let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18)
-            suggestedWallpaper = .color(color.argb)
+            if let baseColor = baseColor, let (variant, intensity, colors) = baseColor.colorWallpaper, !colors.isEmpty {
+                suggestedWallpaper = defaultBuiltinWallpaper(data: variant, colors: colors, intensity: intensity)
+            } else {
+                let color = accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18)
+                suggestedWallpaper = .color(color.argb)
+            }
         }
         
         let accentColor = accentColor ?? defaultDarkTintedAccentColor
@@ -87,7 +123,7 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
         passcode = passcode.withUpdated(backgroundColors: passcode.backgroundColors.withUpdated(topColor: accentColor?.withMultiplied(hue: 1.049, saturation: 0.573, brightness: 0.47), bottomColor: additionalBackgroundColor), buttonColor: mainBackgroundColor)
         rootController = rootController.withUpdated(
             tabBar: rootController.tabBar.withUpdated(
-                backgroundColor: mainBackgroundColor,
+                backgroundColor: mainBackgroundColor?.withAlphaComponent(0.9),
                 separatorColor: mainSeparatorColor,
                 iconColor: mainForegroundColor,
                 selectedIconColor: accentColor,
@@ -100,7 +136,8 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
                 secondaryTextColor: mainSecondaryColor,
                 controlColor: mainSecondaryColor,
                 accentTextColor: accentColor,
-                backgroundColor: mainBackgroundColor,
+                blurredBackgroundColor: mainBackgroundColor?.withAlphaComponent(0.9),
+                opaqueBackgroundColor: mainBackgroundColor,
                 separatorColor: mainSeparatorColor,
                 segmentedBackgroundColor: mainInputColor,
                 segmentedForegroundColor: mainBackgroundColor,
@@ -147,12 +184,12 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
             ),
             controlSecondaryColor: mainSecondaryTextColor?.withAlphaComponent(0.5),
             freeInputField: list.freeInputField.withUpdated(
-                backgroundColor: mainSecondaryTextColor?.withAlphaComponent(0.5),
-                strokeColor: mainSecondaryTextColor?.withAlphaComponent(0.5)
+                backgroundColor: accentColor?.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+                strokeColor: accentColor?.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12)
             ),
             freePlainInputField: list.freePlainInputField.withUpdated(
-                backgroundColor: mainSecondaryTextColor?.withAlphaComponent(0.5),
-                strokeColor: mainSecondaryTextColor?.withAlphaComponent(0.5)
+                backgroundColor: accentColor?.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+                strokeColor: accentColor?.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12)
             ),
             mediaPlaceholderColor: UIColor(rgb: 0xffffff).mixedWith(mainBackgroundColor ?? list.itemBlocksBackgroundColor, alpha: 0.9),
             pageIndicatorInactiveColor: mainSecondaryTextColor?.withAlphaComponent(0.4),
@@ -222,11 +259,11 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
     var defaultWallpaper: TelegramWallpaper?
     if let forcedWallpaper = forcedWallpaper {
         defaultWallpaper = forcedWallpaper
-    } else if let backgroundColors = backgroundColors {
-        if let secondColor = backgroundColors.1 {
-            defaultWallpaper = .gradient(backgroundColors.0.argb, secondColor.argb, WallpaperSettings())
+    } else if !backgroundColors.isEmpty {
+        if backgroundColors.count >= 2 {
+            defaultWallpaper = .gradient(nil, backgroundColors, WallpaperSettings())
         } else {
-            defaultWallpaper = .color(backgroundColors.0.argb)
+            defaultWallpaper = .color(backgroundColors[0])
         }
     } else if let forcedWallpaper = suggestedWallpaper {
         defaultWallpaper = forcedWallpaper
@@ -264,6 +301,8 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
         highlightedIncomingBubbleColor = accentColor?.withMultiplied(hue: 1.03, saturation: 0.463, brightness: 0.29)
         highlightedOutgoingBubbleColor = outgoingBubbleFillColor?.withMultiplied(hue: 1.019, saturation: 0.609, brightness: 0.63)
     }
+
+    let incomingFillColor = mainBackgroundColor?.withMultipliedAlpha(0.9)
         
     chat = chat.withUpdated(
         defaultWallpaper: defaultWallpaper,
@@ -271,14 +310,14 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
             incoming: chat.message.incoming.withUpdated(
                 bubble: chat.message.incoming.bubble.withUpdated(
                     withWallpaper: chat.message.outgoing.bubble.withWallpaper.withUpdated(
-                        fill: mainBackgroundColor,
-                        gradientFill: mainBackgroundColor,
+                        fill: incomingFillColor,
+                        gradientFill: incomingFillColor,
                         highlightedFill: highlightedIncomingBubbleColor,
                         stroke: mainBackgroundColor
                     ),
                     withoutWallpaper: chat.message.outgoing.bubble.withoutWallpaper.withUpdated(
-                        fill: mainBackgroundColor,
-                        gradientFill: mainBackgroundColor,
+                        fill: incomingFillColor,
+                        gradientFill: incomingFillColor,
                         highlightedFill: highlightedIncomingBubbleColor,
                         stroke: mainBackgroundColor
                     )
@@ -379,7 +418,7 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
             unreadBarStrokeColor: mainBackgroundColor
         ),
         inputPanel: chat.inputPanel.withUpdated(
-            panelBackgroundColor: mainBackgroundColor,
+            panelBackgroundColor: mainBackgroundColor?.withAlphaComponent(0.9),
             panelSeparatorColor: mainSeparatorColor,
             panelControlAccentColor: accentColor,
             panelControlColor: mainSecondaryTextColor?.withAlphaComponent(0.5),
@@ -414,7 +453,7 @@ public func customizeDefaultDarkTintedPresentationTheme(theme: PresentationTheme
             buttonHighlightedStrokeColor: accentColor?.withMultiplied(hue: 1.019, saturation: 0.39, brightness: 0.07)
         ),
         historyNavigation: chat.historyNavigation.withUpdated(
-            fillColor: mainBackgroundColor,
+            fillColor: mainBackgroundColor?.withAlphaComponent(0.9),
             strokeColor: mainSeparatorColor,
             foregroundColor: mainSecondaryTextColor?.withAlphaComponent(0.5),
             badgeBackgroundColor: accentColor,
@@ -503,7 +542,8 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
         secondaryTextColor: mainSecondaryColor,
         controlColor: mainSecondaryColor,
         accentTextColor: accentColor,
-        backgroundColor: mainBackgroundColor,
+        blurredBackgroundColor: mainBackgroundColor.withAlphaComponent(0.9),
+        opaqueBackgroundColor: mainBackgroundColor,
         separatorColor: mainSeparatorColor,
         badgeBackgroundColor: UIColor(rgb: 0xef5b5b),
         badgeStrokeColor: UIColor(rgb: 0xef5b5b),
@@ -594,25 +634,31 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
         ),
         controlSecondaryColor: mainSecondaryTextColor.withAlphaComponent(0.5),
         freeInputField: PresentationInputFieldTheme(
-            backgroundColor: mainSecondaryTextColor.withAlphaComponent(0.5),
-            strokeColor: mainSecondaryTextColor.withAlphaComponent(0.5),
-            placeholderColor: UIColor(rgb: 0x4d4d4d),
+            backgroundColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+            strokeColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+            placeholderColor: mainSecondaryTextColor.withAlphaComponent(0.5),
             primaryColor: .white,
-            controlColor: UIColor(rgb: 0x4d4d4d)
+            controlColor: mainSecondaryTextColor.withAlphaComponent(0.5)
         ),
         freePlainInputField: PresentationInputFieldTheme(
-            backgroundColor: mainSecondaryTextColor.withAlphaComponent(0.5),
-            strokeColor: mainSecondaryTextColor.withAlphaComponent(0.5),
-            placeholderColor: UIColor(rgb: 0x4d4d4d),
+            backgroundColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+            strokeColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
+            placeholderColor: mainSecondaryTextColor.withAlphaComponent(0.5),
             primaryColor: .white,
-            controlColor: UIColor(rgb: 0x4d4d4d)
+            controlColor: mainSecondaryTextColor.withAlphaComponent(0.5)
         ),
         mediaPlaceholderColor: UIColor(rgb: 0xffffff).mixedWith(mainBackgroundColor, alpha: 0.9),
         scrollIndicatorColor: UIColor(white: 1.0, alpha: 0.3),
         pageIndicatorInactiveColor: mainSecondaryTextColor.withAlphaComponent(0.4),
         inputClearButtonColor: mainSecondaryColor,
         itemBarChart: PresentationThemeItemBarChart(color1: accentColor, color2: mainSecondaryTextColor.withAlphaComponent(0.5), color3: accentColor.withMultiplied(hue: 1.038, saturation: 0.329, brightness: 0.33)),
-        itemInputField: PresentationInputFieldTheme(backgroundColor: mainInputColor, strokeColor: mainInputColor, placeholderColor: mainSecondaryColor, primaryColor: UIColor(rgb: 0xffffff), controlColor: mainSecondaryColor)
+        itemInputField: PresentationInputFieldTheme(backgroundColor: mainInputColor, strokeColor: mainInputColor, placeholderColor: mainSecondaryColor, primaryColor: UIColor(rgb: 0xffffff), controlColor: mainSecondaryColor),
+        paymentOption: PresentationThemeList.PaymentOption(
+            inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.3),
+            inactiveForegroundColor: UIColor(rgb: 0x00A650),
+            activeFillColor: UIColor(rgb: 0x00A650),
+            activeForegroundColor: UIColor(rgb: 0xffffff)
+        )
     )
     
     let chatList = PresentationThemeChatList(
@@ -639,7 +685,7 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
         unreadBadgeInactiveBackgroundColor: mainSecondaryTextColor.withAlphaComponent(0.4),
         unreadBadgeInactiveTextColor: additionalBackgroundColor,
         pinnedBadgeColor: mainSecondaryTextColor.withAlphaComponent(0.5),
-        pinnedSearchBarColor: mainInputColor,
+        pinnedSearchBarColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
         regularSearchBarColor: accentColor.withMultiplied(hue: 1.029, saturation: 0.609, brightness: 0.12),
         sectionHeaderFillColor: mainBackgroundColor,
         sectionHeaderTextColor: mainSecondaryTextColor.withAlphaComponent(0.5),
@@ -652,9 +698,10 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
     )
     
     let buttonStrokeColor = accentColor.withMultiplied(hue: 1.014, saturation: 0.56, brightness: 0.64).withAlphaComponent(0.15)
+    let incomingFillColor = mainBackgroundColor.withMultipliedAlpha(0.9)
     
     let message = PresentationThemeChatMessage(
-        incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: UIColor(rgb: 0xff6767), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), mediaControlInnerBackgroundColor: mainBackgroundColor, pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: accentColor, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), polls: PresentationThemeChatBubblePolls(radioButton: accentColor.withMultiplied(hue: 0.995, saturation: 0.317, brightness: 0.51), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor, barIconForeground: .white, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
+        incoming: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: incomingFillColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: incomingFillColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil)), primaryTextColor: .white, secondaryTextColor: mainSecondaryTextColor.withAlphaComponent(0.5), linkTextColor: accentColor, linkHighlightColor: accentColor.withAlphaComponent(0.5), scamColor: UIColor(rgb: 0xff6767), textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: accentColor, accentControlColor: accentColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: accentColor, mediaInactiveControlColor: accentColor.withAlphaComponent(0.5), mediaControlInnerBackgroundColor: mainBackgroundColor, pendingActivityColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileTitleColor: accentColor, fileDescriptionColor: mainSecondaryTextColor.withAlphaComponent(0.5), fileDurationColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.585, brightness: 0.23), polls: PresentationThemeChatBubblePolls(radioButton: accentColor.withMultiplied(hue: 0.995, saturation: 0.317, brightness: 0.51), radioProgress: accentColor, highlight: accentColor.withAlphaComponent(0.12), separator: mainSeparatorColor, bar: accentColor, barIconForeground: .white, barPositive: UIColor(rgb: 0x00A700), barNegative: UIColor(rgb: 0xFE3824)), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: accentColor.withAlphaComponent(0.2), textSelectionKnobColor: accentColor),
         outgoing: PresentationThemePartedColors(bubble: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: outgoingBubbleFillColor, gradientFill: outgoingBubbleFillGradientColor, highlightedFill: highlightedOutgoingBubbleColor, stroke: outgoingBubbleFillColor, shadow: nil)), primaryTextColor: outgoingPrimaryTextColor, secondaryTextColor: outgoingSecondaryTextColor, linkTextColor: outgoingLinkTextColor, linkHighlightColor: UIColor.white.withAlphaComponent(0.5), scamColor: outgoingScamColor, textHighlightColor: UIColor(rgb: 0xf5c038), accentTextColor: outgoingPrimaryTextColor, accentControlColor: outgoingPrimaryTextColor, accentControlDisabledColor: mainSecondaryTextColor.withAlphaComponent(0.5), mediaActiveControlColor: outgoingPrimaryTextColor, mediaInactiveControlColor: outgoingSecondaryTextColor, mediaControlInnerBackgroundColor: outgoingBubbleFillColor, pendingActivityColor: outgoingSecondaryTextColor, fileTitleColor: outgoingPrimaryTextColor, fileDescriptionColor: outgoingSecondaryTextColor, fileDurationColor: outgoingSecondaryTextColor, mediaPlaceholderColor: accentColor.withMultiplied(hue: 1.019, saturation: 0.804, brightness: 0.51), polls: PresentationThemeChatBubblePolls(radioButton: outgoingPrimaryTextColor, radioProgress: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0), highlight: accentColor.withMultiplied(hue: 0.99, saturation: 0.56, brightness: 1.0).withAlphaComponent(0.12), separator: mainSeparatorColor, bar: outgoingPrimaryTextColor, barIconForeground: .clear, barPositive: outgoingPrimaryTextColor, barNegative: outgoingPrimaryTextColor), actionButtonsFillColor: PresentationThemeVariableColor(withWallpaper: additionalBackgroundColor.withAlphaComponent(0.5), withoutWallpaper: additionalBackgroundColor.withAlphaComponent(0.5)), actionButtonsStrokeColor: PresentationThemeVariableColor(color: buttonStrokeColor), actionButtonsTextColor: PresentationThemeVariableColor(color: .white), textSelectionColor: UIColor.white.withAlphaComponent(0.2), textSelectionKnobColor: UIColor.white),
         freeform: PresentationThemeBubbleColor(withWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil), withoutWallpaper: PresentationThemeBubbleColorComponents(fill: mainBackgroundColor, highlightedFill: highlightedIncomingBubbleColor, stroke: mainBackgroundColor, shadow: nil)),
         infoPrimaryTextColor: UIColor(rgb: 0xffffff),
@@ -741,7 +788,7 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
     )
 
     let chat = PresentationThemeChat(
-        defaultWallpaper: .color(accentColor.withMultiplied(hue: 1.024, saturation: 0.573, brightness: 0.18).argb),
+        defaultWallpaper: defaultBuiltinWallpaper(data: .default, colors: [0x1b2836, 0x121a22, 0x1b2836, 0x121a22]),
         message: message,
         serviceMessage: serviceMessage,
         inputPanel: inputPanel,
@@ -775,7 +822,7 @@ public func makeDefaultDarkTintedPresentationTheme(extendingThemeReference: Pres
     
     let contextMenu = PresentationThemeContextMenu(
         dimColor: UIColor(rgb: 0x000000, alpha: 0.6),
-        backgroundColor: rootNavigationBar.backgroundColor.withAlphaComponent(0.78),
+        backgroundColor: rootNavigationBar.opaqueBackgroundColor.withAlphaComponent(0.78),
         itemSeparatorColor: UIColor(rgb: 0xffffff, alpha: 0.15),
         sectionSeparatorColor: UIColor(rgb: 0x000000, alpha: 0.2),
         itemBackgroundColor: UIColor(rgb: 0x000000, alpha: 0.0),
diff --git a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
index a980bbbb11..c46547f639 100644
--- a/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/DefaultDayPresentationTheme.swift
@@ -3,12 +3,40 @@ import UIKit
 import TelegramCore
 import SyncCore
 import TelegramUIPreferences
+import Postbox
+import SwiftSignalKit
 
-public let defaultServiceBackgroundColor = UIColor(rgb: 0x000000, alpha: 0.3)
+public func selectDateFillStaticColor(theme: PresentationTheme, wallpaper: TelegramWallpaper) -> UIColor {
+    if case .color(0xffffff) = wallpaper {
+        return theme.chat.serviceMessage.components.withDefaultWallpaper.dateFillStatic
+    } else if case .builtin = wallpaper {
+        return UIColor(rgb: 0x748391, alpha: 0.45)
+    } else {
+        return theme.chat.serviceMessage.components.withCustomWallpaper.dateFillStatic
+    }
+}
+
+public func dateFillNeedsBlur(theme: PresentationTheme, wallpaper: TelegramWallpaper) -> Bool {
+    if case .builtin = wallpaper {
+        return false
+    } else if case .color = wallpaper {
+        return false
+    } else if case let .file(_, _, _, _, isPattern, _, _, _, settings) = wallpaper {
+        if isPattern, let intensity = settings.intensity, intensity < 0 {
+            return false
+        } else {
+            return true
+        }
+    } else {
+        return true
+    }
+}
+
+public let defaultServiceBackgroundColor = UIColor(rgb: 0x000000, alpha: 0.2)
 public let defaultPresentationTheme = makeDefaultDayPresentationTheme(serviceBackgroundColor: defaultServiceBackgroundColor, day: false, preview: false)
 public let defaultDayAccentColor = UIColor(rgb: 0x007ee5)
 
-public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor?) -> PresentationTheme {
+public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, title: String?, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: (UIColor, UIColor?)?, wallpaper forcedWallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor?) -> PresentationTheme {
     if (theme.referenceTheme != .day && theme.referenceTheme != .dayClassic) {
         return theme
     }
@@ -30,7 +58,7 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ti
             let accentColor = accentColor ?? defaultDayAccentColor
             bubbleColors = (accentColor.withMultiplied(hue: 0.966, saturation: 0.61, brightness: 0.98), accentColor)
         } else {
-            if let accentColor = accentColor {
+            if let accentColor = accentColor, !accentColor.alpha.isZero {
                 let hsb = accentColor.hsb
                 bubbleColors = (UIColor(hue: hsb.0, saturation: (hsb.1 > 0.0 && hsb.2 > 0.0) ? 0.14 : 0.0, brightness: 0.79 + hsb.2 * 0.21, alpha: 1.0), nil)
                 if accentColor.lightness > 0.705 {
@@ -38,13 +66,11 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ti
                 } else {
                     outgoingAccent = accentColor
                 }
-                
-                let topColor = accentColor.withMultiplied(hue: 1.010, saturation: 0.414, brightness: 0.957)
-                let bottomColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.867, brightness: 0.965)
-                suggestedWallpaper = .gradient(topColor.argb, bottomColor.argb, WallpaperSettings())
+
+                suggestedWallpaper = .gradient(nil, defaultBuiltinWallpaperGradientColors.map(\.rgb), WallpaperSettings())
             } else {
                 bubbleColors = (UIColor(rgb: 0xe1ffc7), nil)
-                suggestedWallpaper = .builtin(WallpaperSettings())
+                suggestedWallpaper = .gradient(nil, defaultBuiltinWallpaperGradientColors.map(\.rgb), WallpaperSettings())
             }
         }
     }
@@ -201,11 +227,11 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ti
     var defaultWallpaper: TelegramWallpaper?
     if let forcedWallpaper = forcedWallpaper {
         defaultWallpaper = forcedWallpaper
-    } else if let backgroundColors = backgroundColors {
-        if let secondColor = backgroundColors.1 {
-            defaultWallpaper = .gradient(backgroundColors.0.argb, secondColor.argb, WallpaperSettings())
+    } else if !backgroundColors.isEmpty {
+        if backgroundColors.count >= 2 {
+            defaultWallpaper = .gradient(nil, backgroundColors, WallpaperSettings())
         } else {
-            defaultWallpaper = .color(backgroundColors.0.argb)
+            defaultWallpaper = .color(backgroundColors[0])
         }
     } else if let forcedWallpaper = suggestedWallpaper {
         defaultWallpaper = forcedWallpaper
@@ -319,6 +345,10 @@ public func customizeDefaultDayTheme(theme: PresentationTheme, editing: Bool, ti
 
 public func makeDefaultDayPresentationTheme(extendingThemeReference: PresentationThemeReference? = nil, serviceBackgroundColor: UIColor?, day: Bool, preview: Bool) -> PresentationTheme {
     var serviceBackgroundColor = serviceBackgroundColor ?? defaultServiceBackgroundColor
+
+    if !day {
+        serviceBackgroundColor = UIColor(white: 0.0, alpha: 0.2)
+    }
     
     let intro = PresentationThemeIntro(
         statusBarStyle: .black,
@@ -333,9 +363,30 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         backgroundColors: PresentationThemeGradientColors(topColor: UIColor(rgb: 0x46739e), bottomColor: UIColor(rgb: 0x2a5982)),
         buttonColor: .clear
     )
-     
+    
+    let rootNavigationBar = PresentationThemeRootNavigationBar(
+        buttonColor: UIColor(rgb: 0x007ee5),
+        disabledButtonColor: UIColor(rgb: 0xd0d0d0),
+        primaryTextColor: UIColor(rgb: 0x000000),
+        secondaryTextColor: UIColor(rgb: 0x787878),
+        controlColor: UIColor(rgb: 0x7e8791),
+        accentTextColor: UIColor(rgb: 0x007ee5),
+        blurredBackgroundColor: UIColor(rgb: 0xf2f2f2, alpha: 0.9),
+        opaqueBackgroundColor: UIColor(rgb: 0xf7f7f7).mixedWith(.white, alpha: 0.14),
+        separatorColor: UIColor(rgb: 0xc8c7cc),
+        badgeBackgroundColor: UIColor(rgb: 0xff3b30),
+        badgeStrokeColor: UIColor(rgb: 0xff3b30),
+        badgeTextColor: UIColor(rgb: 0xffffff),
+        segmentedBackgroundColor: UIColor(rgb: 0x000000, alpha: 0.06),
+        segmentedForegroundColor: UIColor(rgb: 0xf7f7f7),
+        segmentedTextColor: UIColor(rgb: 0x000000),
+        segmentedDividerColor: UIColor(rgb: 0xd6d6dc),
+        clearButtonBackgroundColor: UIColor(rgb: 0xE3E3E3, alpha: 0.78),
+        clearButtonForegroundColor: UIColor(rgb: 0x7f7f7f)
+    )
+
     let rootTabBar = PresentationThemeRootTabBar(
-        backgroundColor: UIColor(rgb: 0xf7f7f7),
+        backgroundColor: rootNavigationBar.blurredBackgroundColor,
         separatorColor: UIColor(rgb: 0xa3a3a3),
         iconColor: UIColor(rgb: 0x959595),
         selectedIconColor: UIColor(rgb: 0x007ee5),
@@ -346,30 +397,10 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         badgeTextColor: UIColor(rgb: 0xffffff)
     )
     
-    let rootNavigationBar = PresentationThemeRootNavigationBar(
-        buttonColor: UIColor(rgb: 0x007ee5),
-        disabledButtonColor: UIColor(rgb: 0xd0d0d0),
-        primaryTextColor: UIColor(rgb: 0x000000),
-        secondaryTextColor: UIColor(rgb: 0x787878),
-        controlColor: UIColor(rgb: 0x7e8791),
-        accentTextColor: UIColor(rgb: 0x007ee5),
-        backgroundColor: UIColor(rgb: 0xf7f7f7),
-        separatorColor: UIColor(rgb: 0xc8c7cc),
-        badgeBackgroundColor: UIColor(rgb: 0xff3b30),
-        badgeStrokeColor: UIColor(rgb: 0xff3b30),
-        badgeTextColor: UIColor(rgb: 0xffffff),
-        segmentedBackgroundColor: UIColor(rgb: 0xe9e9e9),
-        segmentedForegroundColor: UIColor(rgb: 0xf7f7f7),
-        segmentedTextColor: UIColor(rgb: 0x000000),
-        segmentedDividerColor: UIColor(rgb: 0xd6d6dc),
-        clearButtonBackgroundColor: UIColor(rgb: 0xE3E3E3, alpha: 0.78),
-        clearButtonForegroundColor: UIColor(rgb: 0x7f7f7f)
-    )
-    
     let navigationSearchBar = PresentationThemeNavigationSearchBar(
         backgroundColor: UIColor(rgb: 0xffffff),
         accentColor: UIColor(rgb: 0x007ee5),
-        inputFillColor: UIColor(rgb: 0xe9e9e9),
+        inputFillColor: UIColor(rgb: 0x000000, alpha: 0.06),
         inputTextColor: UIColor(rgb: 0x000000),
         inputPlaceholderTextColor: UIColor(rgb: 0x8e8e93),
         inputIconColor: UIColor(rgb: 0x8e8e93),
@@ -448,7 +479,13 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         pageIndicatorInactiveColor: UIColor(rgb: 0xe3e3e7),
         inputClearButtonColor: UIColor(rgb: 0xcccccc),
         itemBarChart: PresentationThemeItemBarChart(color1: UIColor(rgb: 0x007ee5), color2: UIColor(rgb: 0xc8c7cc), color3: UIColor(rgb: 0xf2f1f7)),
-        itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0xf2f2f7), strokeColor: UIColor(rgb: 0xf2f2f7), placeholderColor: UIColor(rgb: 0xb6b6bb), primaryColor: UIColor(rgb: 0x000000), controlColor: UIColor(rgb: 0xb6b6bb))
+        itemInputField: PresentationInputFieldTheme(backgroundColor: UIColor(rgb: 0xf2f2f7), strokeColor: UIColor(rgb: 0xf2f2f7), placeholderColor: UIColor(rgb: 0xb6b6bb), primaryColor: UIColor(rgb: 0x000000), controlColor: UIColor(rgb: 0xb6b6bb)),
+        paymentOption: PresentationThemeList.PaymentOption(
+            inactiveFillColor: UIColor(rgb: 0x00A650).withMultipliedAlpha(0.1),
+            inactiveForegroundColor: UIColor(rgb: 0x00A650),
+            activeFillColor: UIColor(rgb: 0x00A650),
+            activeForegroundColor: UIColor(rgb: 0xffffff)
+        )
     )
     
     let chatList = PresentationThemeChatList(
@@ -487,7 +524,12 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         onlineDotColor: UIColor(rgb: 0x4cc91f)
     )
     
-    let bubbleStrokeColor = serviceBackgroundColor.withMultiplied(hue: 0.999, saturation: 1.667, brightness: 1.1).withAlphaComponent(0.2)
+    let bubbleStrokeColor: UIColor
+    if day {
+        bubbleStrokeColor = serviceBackgroundColor.withMultiplied(hue: 0.999, saturation: 1.667, brightness: 1.1).withAlphaComponent(0.2)
+    } else {
+        bubbleStrokeColor = UIColor(white: 0.0, alpha: 0.2)
+    }
 
     let message = PresentationThemeChatMessage(
         incoming: PresentationThemePartedColors(
@@ -550,7 +592,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         selectionControlColors: PresentationThemeFillStrokeForeground(fillColor: UIColor(rgb: 0x007ee5), strokeColor: UIColor(rgb: 0xc7c7cc), foregroundColor: UIColor(rgb: 0xffffff)),
         deliveryFailedColors: PresentationThemeFillForeground(fillColor: UIColor(rgb: 0xff3b30), foregroundColor: UIColor(rgb: 0xffffff)),
         mediaHighlightOverlayColor: UIColor(white: 1.0, alpha: 0.6),
-        stickerPlaceholderColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor.withAlphaComponent(0.3), withoutWallpaper: UIColor(rgb: 0x748391, alpha: 0.25)),
+        stickerPlaceholderColor: PresentationThemeVariableColor(withWallpaper: serviceBackgroundColor, withoutWallpaper: UIColor(rgb: 0x748391, alpha: 0.25)),
         stickerPlaceholderShimmerColor: PresentationThemeVariableColor(withWallpaper: UIColor(rgb: 0xffffff, alpha: 0.2), withoutWallpaper: UIColor(rgb: 0x000000, alpha: 0.1))
     )
     
@@ -623,7 +665,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
     )
     
     let serviceMessage = PresentationThemeServiceMessage(
-        components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0x939fab, alpha: 0.5), primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xffffff), dateFillStatic: UIColor(rgb: 0x748391, alpha: 0.45), dateFillFloating: UIColor(rgb: 0x939fab, alpha: 0.5)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: serviceBackgroundColor, primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xffffff), dateFillStatic: serviceBackgroundColor, dateFillFloating: serviceBackgroundColor.withAlphaComponent(serviceBackgroundColor.alpha * 0.6667))),
+        components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0x939fab, alpha: 0.5), primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xffffff), dateFillStatic: UIColor(rgb: 0x000000, alpha: 0.2), dateFillFloating: UIColor(rgb: 0x939fab, alpha: 0.5)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: serviceBackgroundColor, primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xffffff), dateFillStatic: UIColor(rgb: 0x000000, alpha: 0.2), dateFillFloating: serviceBackgroundColor.withAlphaComponent(serviceBackgroundColor.alpha * 0.6667))),
         unreadBarFillColor: UIColor(white: 1.0, alpha: 0.9),
         unreadBarStrokeColor: UIColor(white: 0.0, alpha: 0.2),
         unreadBarTextColor: UIColor(rgb: 0x86868d),
@@ -631,7 +673,7 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
     )
     
     let serviceMessageDay = PresentationThemeServiceMessage(
-        components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0xffffff, alpha: 0.8), primaryText: UIColor(rgb: 0x8d8e93), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xff3b30), dateFillStatic: UIColor(rgb: 0xffffff, alpha: 0.8), dateFillFloating: UIColor(rgb: 0xffffff, alpha: 0.8)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: serviceBackgroundColor, primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xff3b30), dateFillStatic: serviceBackgroundColor, dateFillFloating: serviceBackgroundColor.withAlphaComponent(serviceBackgroundColor.alpha * 0.6667))),
+        components: PresentationThemeServiceMessageColor(withDefaultWallpaper: PresentationThemeServiceMessageColorComponents(fill: UIColor(rgb: 0xffffff, alpha: 0.8), primaryText: UIColor(rgb: 0x8d8e93), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xff3b30), dateFillStatic: UIColor(rgb: 0xffffff, alpha: 0.8), dateFillFloating: UIColor(rgb: 0xffffff, alpha: 0.8)), withCustomWallpaper: PresentationThemeServiceMessageColorComponents(fill: serviceBackgroundColor, primaryText: UIColor(rgb: 0xffffff), linkHighlight: UIColor(rgb: 0x748391, alpha: 0.25), scam: UIColor(rgb: 0xff3b30), dateFillStatic: UIColor(rgb: 0x000000, alpha: 0.2), dateFillFloating: serviceBackgroundColor.withAlphaComponent(serviceBackgroundColor.alpha * 0.6667))),
         unreadBarFillColor: UIColor(rgb: 0xffffff),
         unreadBarStrokeColor: UIColor(rgb: 0xffffff),
         unreadBarTextColor: UIColor(rgb: 0x8d8e93),
@@ -645,15 +687,15 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
     )
     
     let inputPanel = PresentationThemeChatInputPanel(
-        panelBackgroundColor: UIColor(rgb: 0xf7f7f7),
-        panelBackgroundColorNoWallpaper: UIColor(rgb: 0xffffff),
+        panelBackgroundColor: rootNavigationBar.blurredBackgroundColor,
+        panelBackgroundColorNoWallpaper: rootNavigationBar.blurredBackgroundColor,
         panelSeparatorColor: UIColor(rgb: 0xb2b2b2),
         panelControlAccentColor: UIColor(rgb: 0x007ee5),
         panelControlColor: UIColor(rgb: 0x858e99),
         panelControlDisabledColor: UIColor(rgb: 0x727b87, alpha: 0.5),
         panelControlDestructiveColor: UIColor(rgb: 0xff3b30),
         inputBackgroundColor: UIColor(rgb: 0xffffff),
-        inputStrokeColor: UIColor(rgb: 0xd9dcdf),
+        inputStrokeColor: UIColor(rgb: 0x000000, alpha: 0.1),
         inputPlaceholderColor: UIColor(rgb: 0xbebec0),
         inputTextColor: UIColor(rgb: 0x000000),
         inputControlColor: UIColor(rgb: 0xa0a7b0),
@@ -696,9 +738,11 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         badgeStrokeColor: UIColor(rgb: 0x007ee5),
         badgeTextColor: UIColor(rgb: 0xffffff)
     )
-    
+
+    let defaultPatternWallpaper: TelegramWallpaper = defaultBuiltinWallpaper(data: .default, colors: defaultBuiltinWallpaperGradientColors.map(\.rgb))
+
     let chat = PresentationThemeChat(
-        defaultWallpaper: day ? .color(0xffffff) : .builtin(WallpaperSettings()),
+        defaultWallpaper: day ? .color(0xffffff) : defaultPatternWallpaper,
         message: day ? messageDay : message,
         serviceMessage: day ? serviceMessageDay : serviceMessage,
         inputPanel: inputPanel,
@@ -791,3 +835,269 @@ public func makeDefaultDayPresentationTheme(extendingThemeReference: Presentatio
         preview: preview
     )
 }
+
+public let defaultBuiltinWallpaperGradientColors: [UIColor] = [
+    UIColor(rgb: 0xdbddbb),
+    UIColor(rgb: 0x6ba587),
+    UIColor(rgb: 0xd5d88d),
+    UIColor(rgb: 0x88b884)
+]
+
+public struct BuiltinWallpaperData {
+    var wallpaperId: Int64
+    var wallpaperAccessHash: Int64
+    var slug: String
+    var fileId: Int64
+    var fileAccessHash: Int64
+    var datacenterId: Int
+    var fileSize: Int
+}
+
+public extension BuiltinWallpaperData {
+    static let `default` = BuiltinWallpaperData(
+        wallpaperId: 5951821522514477057,
+        wallpaperAccessHash: 542913527008942388,
+        slug: "fqv01SQemVIBAAAApND8LDRUhRU",
+        fileId: 5789658100176783156,
+        fileAccessHash: 2106033778341319685,
+        datacenterId: 4,
+        fileSize: 183832
+    )
+    static let variant1 = BuiltinWallpaperData(
+        wallpaperId: 5784984711902265347,
+        wallpaperAccessHash: -7073897034484875424,
+        slug: "RlZs2PJkSFADAAAAElGaGwgJBgU",
+        fileId: 5924571028763183790,
+        fileAccessHash: 8131740629580593134,
+        datacenterId: 4,
+        fileSize: 175995
+    )
+    static let variant2 = BuiltinWallpaperData(
+        wallpaperId: 5785171457080295426,
+        wallpaperAccessHash: 7299737721761177260,
+        slug: "9LW_RcoOSVACAAAAFTk3DTyXN-M",
+        fileId: 5927041584146156278,
+        fileAccessHash: -5921024951834087382,
+        datacenterId: 4,
+        fileSize: 134539
+    )
+    static let variant3 = BuiltinWallpaperData(
+        wallpaperId: 5785191424383254532,
+        wallpaperAccessHash: 6428855567842967483,
+        slug: "CJNyxPMgSVAEAAAAvW9sMwc51cw",
+        fileId: 5785343895722264360,
+        fileAccessHash: 3407562549390786397,
+        datacenterId: 4,
+        fileSize: 312605
+    )
+    static let variant4 = BuiltinWallpaperData(
+        wallpaperId: 5785123761468473345,
+        wallpaperAccessHash: -6430405714673464374,
+        slug: "BQqgrGnjSFABAAAA8mQDBXQcARE",
+        fileId: 5924847998319201207,
+        fileAccessHash: 6746675725325490532,
+        datacenterId: 4,
+        fileSize: 55699
+    )
+    static let variant5 = BuiltinWallpaperData(
+        wallpaperId: 5785021373743104005,
+        wallpaperAccessHash: -1374597781576365315,
+        slug: "MIo6r0qGSFAFAAAAtL8TsDzNX60",
+        fileId: 5782630687571969871,
+        fileAccessHash: 8944679612701303524,
+        datacenterId: 4,
+        fileSize: 100992
+    )
+    static let variant6 = BuiltinWallpaperData(
+        wallpaperId: 5782920928576929793,
+        wallpaperAccessHash: -2397741670740938317,
+        slug: "9iklpvIPQVABAAAAORQXKur_Eyc",
+        fileId: 5924714386181589959,
+        fileAccessHash: -316419094644368953,
+        datacenterId: 4,
+        fileSize: 106249
+    )
+    static let variant7 = BuiltinWallpaperData(
+        wallpaperId: 5931406765567508492,
+        wallpaperAccessHash: 7991333610111953175,
+        slug: "H6rz6geXUFIMAAAAuUs7m6cXbcc",
+        fileId: 5931433527508732666,
+        fileAccessHash: -8637914243010610774,
+        datacenterId: 4,
+        fileSize: 76332
+    )
+    static let variant8 = BuiltinWallpaperData(
+        wallpaperId: 5785007509588672513,
+        wallpaperAccessHash: 8437532349638900210,
+        slug: "kO4jyq55SFABAAAA0WEpcLfahXk",
+        fileId: 5925009274341165314,
+        fileAccessHash: 5091210796362176800,
+        datacenterId: 4,
+        fileSize: 78338
+    )
+    static let variant9 = BuiltinWallpaperData(
+        wallpaperId: 5785068300555780101,
+        wallpaperAccessHash: -4335874468273472323,
+        slug: "mP3FG_iwSFAFAAAA2AklJO978pA",
+        fileId: 5924664689115007842,
+        fileAccessHash: -4490072684673383370,
+        datacenterId: 4,
+        fileSize: 51705
+    )
+    static let variant10 = BuiltinWallpaperData(
+        wallpaperId: 5785165465600917506,
+        wallpaperAccessHash: 4563443115749434444,
+        slug: "Ujx2TFcJSVACAAAARJ4vLa50MkM",
+        fileId: 5924792752154872619,
+        fileAccessHash: -2210879717040856036,
+        datacenterId: 4,
+        fileSize: 114694
+    )
+    static let variant11 = BuiltinWallpaperData(
+        wallpaperId: 5785225431934304257,
+        wallpaperAccessHash: 3814946612408881045,
+        slug: "RepJ5uE_SVABAAAAr4d0YhgB850",
+        fileId: 5927262354055105101,
+        fileAccessHash: -435932841948252811,
+        datacenterId: 4,
+        fileSize: 66465
+    )
+    static let variant12 = BuiltinWallpaperData(
+        wallpaperId: 5785328386595356675,
+        wallpaperAccessHash: -5900784223259948847,
+        slug: "9GcNVISdSVADAAAAUcw5BYjELW4",
+        fileId: 5926924928539429325,
+        fileAccessHash: -5306472339097647861,
+        datacenterId: 4,
+        fileSize: 57262
+    )
+    static let variant13 = BuiltinWallpaperData(
+        wallpaperId: 6041986402319597570,
+        wallpaperAccessHash: -8909137552203056986,
+        slug: "-Xc-np9y2VMCAAAARKr0yNNPYW0",
+        fileId: 5789856918507882132,
+        fileAccessHash: 2327344847690632249,
+        datacenterId: 4,
+        fileSize: 104932
+    )
+    static let variant14 = BuiltinWallpaperData(
+        wallpaperId: 5784981280223395841,
+        wallpaperAccessHash: 8334701614156015552,
+        slug: "JrNEYdNhSFABAAAA9WtRdJkPRbY",
+        fileId: 5924784243824658746,
+        fileAccessHash: -2563505106174626287,
+        datacenterId: 4,
+        fileSize: 122246
+    )
+
+    static func generate(account: Account) {
+        let slugToName: [(String, String)] = [
+            ("fqv01SQemVIBAAAApND8LDRUhRU", "`default`"),
+            ("RlZs2PJkSFADAAAAElGaGwgJBgU", "variant1"),
+            ("9LW_RcoOSVACAAAAFTk3DTyXN-M", "variant2"),
+            ("CJNyxPMgSVAEAAAAvW9sMwc51cw", "variant3"),
+            ("BQqgrGnjSFABAAAA8mQDBXQcARE", "variant4"),
+            ("MIo6r0qGSFAFAAAAtL8TsDzNX60", "variant5"),
+            ("9iklpvIPQVABAAAAORQXKur_Eyc", "variant6"),
+            ("H6rz6geXUFIMAAAAuUs7m6cXbcc", "variant7"),
+            ("kO4jyq55SFABAAAA0WEpcLfahXk", "variant8"),
+            ("mP3FG_iwSFAFAAAA2AklJO978pA", "variant9"),
+            ("Ujx2TFcJSVACAAAARJ4vLa50MkM", "variant10"),
+            ("RepJ5uE_SVABAAAAr4d0YhgB850", "variant11"),
+            ("9GcNVISdSVADAAAAUcw5BYjELW4", "variant12"),
+            ("-Xc-np9y2VMCAAAARKr0yNNPYW0", "variant13"),
+            ("JrNEYdNhSFABAAAA9WtRdJkPRbY", "variant14"),
+        ]
+
+        var signals: [Signal<String?, GetWallpaperError>] = []
+        for (slug, name) in slugToName {
+            signals.append(getWallpaper(network: account.network, slug: slug)
+            |> map { wallpaper -> String? in
+                switch wallpaper {
+                case let .file(id, accessHash, _, _, _, _, _, file, _):
+                    guard let resource = file.resource as? CloudDocumentMediaResource else {
+                        return nil
+                    }
+                    guard let size = file.size else {
+                        return nil
+                    }
+                    return """
+static let \(name) = BuiltinWallpaperData(
+    wallpaperId: \(id),
+    wallpaperAccessHash: \(accessHash),
+    slug: "\(slug)",
+    fileId: \(file.fileId.id),
+    fileAccessHash: \(resource.accessHash),
+    datacenterId: \(resource.datacenterId),
+    fileSize: \(size)
+)
+"""
+                default:
+                    return nil
+                }
+            })
+        }
+
+        let _ = (combineLatest(signals)
+        |> map { strings -> String in
+            var result = ""
+            for case let string? in strings {
+                if !result.isEmpty {
+                    result.append("\n")
+                }
+                result.append(string)
+            }
+            return result
+        }
+        |> deliverOnMainQueue).start(next: { result in
+            print("\(result)")
+        })
+    }
+}
+
+public func defaultBuiltinWallpaper(data: BuiltinWallpaperData, colors: [UInt32], intensity: Int32 = 50, rotation: Int32? = nil) -> TelegramWallpaper {
+    return .file(
+        id: data.wallpaperId,
+        accessHash: data.wallpaperAccessHash,
+        isCreator: false,
+        isDefault: false,
+        isPattern: true,
+        isDark: false,
+        slug: data.slug,
+        file: TelegramMediaFile(
+            fileId: MediaId(namespace: Namespaces.Media.CloudFile, id: data.fileId),
+            partialReference: nil,
+            resource: CloudDocumentMediaResource(
+                datacenterId: data.datacenterId,
+                fileId: data.fileId,
+                accessHash: data.fileAccessHash,
+                size: data.fileSize,
+                fileReference: Data(),
+                fileName: "pattern.tgv"
+            ),
+            previewRepresentations: [
+                TelegramMediaImageRepresentation(
+                    dimensions: PixelDimensions(width: 155, height: 320),
+                    resource: CloudDocumentSizeMediaResource(
+                        datacenterId: 1,
+                        documentId: data.fileId,
+                        accessHash: data.fileAccessHash,
+                        sizeSpec: "m",
+                        fileReference: Data()
+                    ),
+                    progressiveSizes: [],
+                    immediateThumbnailData: nil
+                )
+            ],
+            videoThumbnails: [],
+            immediateThumbnailData: nil,
+            mimeType: "application/x-tgwallpattern",
+            size: data.fileSize,
+            attributes: [
+                .ImageSize(size: PixelDimensions(width: 1440, height: 2960)),
+                .FileName(fileName: "pattern.tgv")
+            ]
+        ),
+        settings: WallpaperSettings(colors: colors, intensity: intensity, rotation: rotation)
+    )
+}
diff --git a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift
index 6bd5dbfcec..7d505441a3 100644
--- a/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/MakePresentationTheme.swift
@@ -19,33 +19,31 @@ public func makeDefaultPresentationTheme(reference: PresentationBuiltinThemeRefe
     return theme
 }
 
-public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool, title: String? = nil, accentColor: UIColor?, backgroundColors: (UIColor, UIColor?)?, bubbleColors: (UIColor, UIColor?)?, wallpaper: TelegramWallpaper? = nil) -> PresentationTheme {
-    if accentColor == nil && bubbleColors == nil && backgroundColors == nil && wallpaper == nil {
+public func customizePresentationTheme(_ theme: PresentationTheme, editing: Bool, title: String? = nil, accentColor: UIColor?, backgroundColors: [UInt32], bubbleColors: (UIColor, UIColor?)?, wallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil) -> PresentationTheme {
+    if accentColor == nil && bubbleColors == nil && backgroundColors.isEmpty && wallpaper == nil {
         return theme
     }
     switch theme.referenceTheme {
         case .day, .dayClassic:
             return customizeDefaultDayTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper, serviceBackgroundColor: nil)
         case .night:
-            return customizeDefaultDarkPresentationTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper)
+            return customizeDefaultDarkPresentationTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper, baseColor: baseColor)
         case .nightAccent:
-            return customizeDefaultDarkTintedPresentationTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper)
+            return customizeDefaultDarkTintedPresentationTheme(theme: theme, editing: editing, title: title, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper, baseColor: baseColor)
     }
-    
-    return theme
 }
 
 public func makePresentationTheme(settings: TelegramThemeSettings, title: String? = nil, serviceBackgroundColor: UIColor? = nil) -> PresentationTheme? {
     let defaultTheme = makeDefaultPresentationTheme(reference: PresentationBuiltinThemeReference(baseTheme: settings.baseTheme), extendingThemeReference: nil, serviceBackgroundColor: serviceBackgroundColor, preview: false)
-    return customizePresentationTheme(defaultTheme, editing: true, title: title, accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper)
+    return customizePresentationTheme(defaultTheme, editing: true, title: title, accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper)
 }
 
-public func makePresentationTheme(mediaBox: MediaBox, themeReference: PresentationThemeReference, extendingThemeReference: PresentationThemeReference? = nil, accentColor: UIColor? = nil, backgroundColors: (UIColor, UIColor?)? = nil, bubbleColors: (UIColor, UIColor?)? = nil, wallpaper: TelegramWallpaper? = nil, serviceBackgroundColor: UIColor? = nil, preview: Bool = false) -> PresentationTheme? {
+public func makePresentationTheme(mediaBox: MediaBox, themeReference: PresentationThemeReference, extendingThemeReference: PresentationThemeReference? = nil, accentColor: UIColor? = nil, backgroundColors: [UInt32] = [], bubbleColors: (UIColor, UIColor?)? = nil, wallpaper: TelegramWallpaper? = nil, baseColor: PresentationThemeBaseColor? = nil, serviceBackgroundColor: UIColor? = nil, preview: Bool = false) -> PresentationTheme? {
     let theme: PresentationTheme
     switch themeReference {
         case let .builtin(reference):
             let defaultTheme = makeDefaultPresentationTheme(reference: reference, extendingThemeReference: extendingThemeReference, serviceBackgroundColor: serviceBackgroundColor, preview: preview)
-            theme = customizePresentationTheme(defaultTheme, editing: true, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper)
+            theme = customizePresentationTheme(defaultTheme, editing: true, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper, baseColor: baseColor)
         case let .local(info):
             if let path = mediaBox.completedResourcePath(info.resource), let data = try? Data(contentsOf: URL(fileURLWithPath: path), options: .mappedRead), let loadedTheme = makePresentationTheme(data: data, themeReference: themeReference, resolvedWallpaper: info.resolvedWallpaper) {
                 theme = customizePresentationTheme(loadedTheme, editing: false, accentColor: accentColor, backgroundColors: backgroundColors, bubbleColors: bubbleColors, wallpaper: wallpaper)
@@ -54,7 +52,7 @@ public func makePresentationTheme(mediaBox: MediaBox, themeReference: Presentati
             }
         case let .cloud(info):
             if let settings = info.theme.settings {
-                if let loadedTheme = makePresentationTheme(mediaBox: mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), extendingThemeReference: themeReference, accentColor: accentColor ?? UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: bubbleColors ?? settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper:  wallpaper ?? settings.wallpaper, serviceBackgroundColor: serviceBackgroundColor, preview: preview) {
+                if let loadedTheme = makePresentationTheme(mediaBox: mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), extendingThemeReference: themeReference, accentColor: accentColor ?? UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: bubbleColors ?? settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper:  wallpaper ?? settings.wallpaper, serviceBackgroundColor: serviceBackgroundColor, preview: preview) {
                     theme = loadedTheme
                 } else {
                     return nil
diff --git a/submodules/TelegramPresentationData/Sources/NumericFormat.swift b/submodules/TelegramPresentationData/Sources/NumericFormat.swift
index 0dc29280e3..0b67ddc0db 100644
--- a/submodules/TelegramPresentationData/Sources/NumericFormat.swift
+++ b/submodules/TelegramPresentationData/Sources/NumericFormat.swift
@@ -37,7 +37,7 @@ public func presentationStringsFormattedNumber(_ count: Int32, _ groupingSeparat
     }
 }
 
-public func timeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false, roundToNearest: Bool = false) -> String {
+public func timeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false) -> String {
     if preferLowerValue {
         if value <= 60 {
             return strings.MessageTimer_Seconds(max(1, value))
@@ -69,6 +69,38 @@ public func timeIntervalString(strings: PresentationStrings, value: Int32, prefe
     }
 }
 
+public func scheduledTimeIntervalString(strings: PresentationStrings, value: Int32, preferLowerValue: Bool = false) -> String {
+    if preferLowerValue {
+        if value <= 60 {
+            return strings.ScheduledIn_Seconds(max(1, value))
+        } else if value <= 60 * 60 {
+            return strings.ScheduledIn_Minutes(max(1, value / 60))
+        } else if value <= 60 * 60 * 24 {
+            return strings.ScheduledIn_Hours(max(1, value / (60 * 60)))
+        } else if value <= 60 * 60 * 24 * 7 {
+            return strings.ScheduledIn_Days(max(1, value / (60 * 60 * 24)))
+        } else if value <= 60 * 60 * 24 * 30 {
+            return strings.ScheduledIn_Weeks(max(1, value / (60 * 60 * 24 * 7)))
+        } else {
+            return strings.ScheduledIn_Months(max(1, value / (60 * 60 * 24 * 30)))
+        }
+    } else {
+        if value < 60 {
+            return strings.ScheduledIn_Seconds(max(1, value))
+        } else if value < 60 * 60 {
+            return strings.ScheduledIn_Minutes(max(1, value / 60))
+        } else if value < 60 * 60 * 24 {
+            return strings.ScheduledIn_Hours(max(1, value / (60 * 60)))
+        } else if value < 60 * 60 * 24 * 7 {
+            return strings.ScheduledIn_Days(max(1, value / (60 * 60 * 24)))
+        } else if value < 60 * 60 * 24 * 30 {
+            return strings.ScheduledIn_Weeks(max(1, value / (60 * 60 * 24 * 7)))
+        } else {
+            return strings.ScheduledIn_Months(max(1, value / (60 * 60 * 24 * 30)))
+        }
+    }
+}
+
 public func shortTimeIntervalString(strings: PresentationStrings, value: Int32) -> String {
     if value < 60 {
         return strings.MessageTimer_ShortSeconds(max(1, value))
diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift
index f3ec3dfcb2..9a007fe03d 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationData.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift
@@ -16,6 +16,7 @@ public struct PresentationDateTimeFormat: Equatable {
     public let dateFormat: PresentationDateFormat
     public let dateSeparator: String
     public let dateSuffix: String
+    public let requiresFullYear: Bool
     public let decimalSeparator: String
     public let groupingSeparator: String
     
@@ -24,15 +25,17 @@ public struct PresentationDateTimeFormat: Equatable {
         self.dateFormat = .monthFirst
         self.dateSeparator = "."
         self.dateSuffix = ""
+        self.requiresFullYear = false
         self.decimalSeparator = "."
         self.groupingSeparator = "."
     }
     
-    public init(timeFormat: PresentationTimeFormat, dateFormat: PresentationDateFormat, dateSeparator: String, dateSuffix: String, decimalSeparator: String, groupingSeparator: String) {
+    public init(timeFormat: PresentationTimeFormat, dateFormat: PresentationDateFormat, dateSeparator: String, dateSuffix: String, requiresFullYear: Bool, decimalSeparator: String, groupingSeparator: String) {
         self.timeFormat = timeFormat
         self.dateFormat = dateFormat
         self.dateSeparator = dateSeparator
         self.dateSuffix = dateSuffix
+        self.requiresFullYear = requiresFullYear
         self.decimalSeparator = decimalSeparator
         self.groupingSeparator = groupingSeparator
     }
@@ -83,10 +86,10 @@ public final class PresentationData: Equatable {
     public let dateTimeFormat: PresentationDateTimeFormat
     public let nameDisplayOrder: PresentationPersonNameOrder
     public let nameSortOrder: PresentationPersonNameOrder
-    public let disableAnimations: Bool
+    public let reduceMotion: Bool
     public let largeEmoji: Bool
     
-    public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, disableAnimations: Bool, largeEmoji: Bool) {
+    public init(strings: PresentationStrings, theme: PresentationTheme, autoNightModeTriggered: Bool, chatWallpaper: TelegramWallpaper, chatFontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, listsFontSize: PresentationFontSize, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, nameSortOrder: PresentationPersonNameOrder, reduceMotion: Bool, largeEmoji: Bool) {
         self.strings = strings
         self.theme = theme
         self.autoNightModeTriggered = autoNightModeTriggered
@@ -97,16 +100,16 @@ public final class PresentationData: Equatable {
         self.dateTimeFormat = dateTimeFormat
         self.nameDisplayOrder = nameDisplayOrder
         self.nameSortOrder = nameSortOrder
-        self.disableAnimations = disableAnimations
+        self.reduceMotion = reduceMotion
         self.largeEmoji = largeEmoji
     }
     
     public func withUpdated(theme: PresentationTheme) -> PresentationData {
-        return PresentationData(strings: self.strings, theme: theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji)
+        return PresentationData(strings: self.strings, theme: theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, reduceMotion: self.reduceMotion, largeEmoji: self.largeEmoji)
     }
     
     public static func ==(lhs: PresentationData, rhs: PresentationData) -> Bool {
-        return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.chatBubbleCorners == rhs.chatBubbleCorners && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.disableAnimations == rhs.disableAnimations && lhs.largeEmoji == rhs.largeEmoji
+        return lhs.strings === rhs.strings && lhs.theme === rhs.theme && lhs.autoNightModeTriggered == rhs.autoNightModeTriggered && lhs.chatWallpaper == rhs.chatWallpaper && lhs.chatFontSize == rhs.chatFontSize && lhs.chatBubbleCorners == rhs.chatBubbleCorners && lhs.listsFontSize == rhs.listsFontSize && lhs.dateTimeFormat == rhs.dateTimeFormat && lhs.reduceMotion == rhs.reduceMotion && lhs.largeEmoji == rhs.largeEmoji
     }
 }
 
@@ -157,13 +160,17 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat {
     let dateFormat: PresentationDateFormat
     var dateSeparator = "/"
     var dateSuffix = ""
+    var requiresFullYear = false
     if let dateString = DateFormatter.dateFormat(fromTemplate: "MdY", options: 0, locale: locale) {
         for separator in [". ", ".", "/", "-", "/"] {
             if dateString.contains(separator) {
                 if separator == ". " {
                     dateSuffix = "."
+                    dateSeparator = "."
+                    requiresFullYear = true
+                } else {
+                    dateSeparator = separator
                 }
-                dateSeparator = separator
                 break
             }
         }
@@ -178,7 +185,7 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat {
 
     let decimalSeparator = locale.decimalSeparator ?? "."
     let groupingSeparator = locale.groupingSeparator ?? ""
-    return PresentationDateTimeFormat(timeFormat: timeFormat, dateFormat: dateFormat, dateSeparator: dateSeparator, dateSuffix: dateSuffix, decimalSeparator: decimalSeparator, groupingSeparator: groupingSeparator)
+    return PresentationDateTimeFormat(timeFormat: timeFormat, dateFormat: dateFormat, dateSeparator: dateSeparator, dateSuffix: dateSuffix, requiresFullYear: requiresFullYear, decimalSeparator: decimalSeparator, groupingSeparator: groupingSeparator)
 }
 
 private func currentPersonNameSortOrder() -> PresentationPersonNameOrder {
@@ -285,7 +292,7 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s
         }
         
         let effectiveColors = themeSettings.themeSpecificAccentColors[effectiveTheme.index]
-        let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: effectiveTheme, accentColor: effectiveColors?.color, bubbleColors: effectiveColors?.customBubbleColors) ?? defaultPresentationTheme
+        let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: effectiveTheme, accentColor: effectiveColors?.color, bubbleColors: effectiveColors?.customBubbleColors, baseColor: effectiveColors?.baseColor) ?? defaultPresentationTheme
         
         
         let effectiveChatWallpaper: TelegramWallpaper = (themeSettings.themeSpecificChatWallpapers[coloredThemeIndex(reference: effectiveTheme, accentColor: effectiveColors)] ?? themeSettings.themeSpecificChatWallpapers[effectiveTheme.index]) ?? theme.chat.defaultWallpaper
@@ -304,7 +311,7 @@ public func currentPresentationDataAndSettings(accountManager: AccountManager, s
         
         let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners)
         
-        return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings)
+        return InitialPresentationDataAndSettings(presentationData: PresentationData(strings: stringsValue, theme: theme, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, reduceMotion: themeSettings.reduceMotion, largeEmoji: themeSettings.largeEmoji), automaticMediaDownloadSettings: automaticMediaDownloadSettings, autodownloadSettings: autodownloadSettings, callListSettings: callListSettings, inAppNotificationSettings: inAppNotificationSettings, mediaInputSettings: mediaInputSettings, experimentalUISettings: experimentalUISettings)
     }
 }
 
@@ -437,9 +444,13 @@ public func serviceColor(for wallpaper: (TelegramWallpaper, UIImage?)) -> UIColo
             return UIColor(rgb: 0x748391, alpha: 0.45)
         case let .color(color):
             return serviceColor(with: UIColor(argb: color))
-        case let .gradient(topColor, bottomColor, _):
-            let mixedColor = UIColor(argb: topColor).mixedWith(UIColor(argb: bottomColor), alpha: 0.5)
-            return serviceColor(with: mixedColor)
+        case let .gradient(_, colors, _):
+            if colors.count == 2 {
+                let mixedColor = UIColor(argb: colors[0]).mixedWith(UIColor(argb: colors[1]), alpha: 0.5)
+                return serviceColor(with: mixedColor)
+            } else {
+                return UIColor(rgb: 0x000000, alpha: 0.3)
+            }
         case .image:
             if let image = wallpaper.1 {
                 return serviceColor(with: averageColor(from: image))
@@ -448,10 +459,10 @@ public func serviceColor(for wallpaper: (TelegramWallpaper, UIImage?)) -> UIColo
             }
         case let .file(file):
             if wallpaper.0.isPattern {
-                if let color = file.settings.color {
-                    var mixedColor = UIColor(argb: color)
-                    if let bottomColor = file.settings.bottomColor {
-                        mixedColor = mixedColor.mixedWith(UIColor(argb: bottomColor), alpha: 0.5)
+                if file.settings.colors.count >= 1 && file.settings.colors.count <= 2 {
+                    var mixedColor = UIColor(argb: file.settings.colors[0])
+                    if file.settings.colors.count >= 2 {
+                        mixedColor = mixedColor.mixedWith(UIColor(argb: file.settings.colors[1]), alpha: 0.5)
                     }
                     return serviceColor(with: mixedColor)
                 } else {
@@ -489,12 +500,17 @@ public func chatServiceBackgroundColor(wallpaper: TelegramWallpaper, mediaBox: M
     } else {
         switch wallpaper {
         case .builtin:
-            return .single(UIColor(rgb: 0x748391, alpha: 0.45))
+            return .single(UIColor(rgb: 0x000000, alpha: 0.2))
         case let .color(color):
             return .single(serviceColor(with: UIColor(argb: color)))
-        case let .gradient(topColor, bottomColor, _):
-            let mixedColor = UIColor(argb: topColor).mixedWith(UIColor(rgb: bottomColor), alpha: 0.5)
-            return .single(serviceColor(with: mixedColor))
+        case let .gradient(_, colors, _):
+            if colors.count == 2 {
+                let mixedColor = UIColor(argb: colors[0]).mixedWith(UIColor(argb: colors[1]), alpha: 0.5)
+                return .single(
+                    serviceColor(with: mixedColor))
+            } else {
+                return .single(UIColor(rgb: 0x000000, alpha: 0.3))
+            }
         case let .image(representations, _):
             if let largest = largestImageRepresentation(representations) {
                 return Signal<UIColor, NoError> { subscriber in
@@ -517,10 +533,10 @@ public func chatServiceBackgroundColor(wallpaper: TelegramWallpaper, mediaBox: M
             }
         case let .file(file):
             if wallpaper.isPattern {
-                if let color = file.settings.color {
-                    var mixedColor = UIColor(argb: color)
-                    if let bottomColor = file.settings.bottomColor {
-                        mixedColor = mixedColor.mixedWith(UIColor(rgb: bottomColor), alpha: 0.5)
+                if file.settings.colors.count >= 1 && file.settings.colors.count <= 2 {
+                    var mixedColor = UIColor(argb: file.settings.colors[0])
+                    if file.settings.colors.count >= 2 {
+                        mixedColor = mixedColor.mixedWith(UIColor(argb: file.settings.colors[1]), alpha: 0.5)
                     }
                     return .single(serviceColor(with: mixedColor))
                 } else {
@@ -567,7 +583,7 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI
         if let themeSpecificWallpaper = themeSpecificWallpaper {
             currentWallpaper = themeSpecificWallpaper
         } else {
-            let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: themeSettings.theme, accentColor: currentColors?.color, bubbleColors: currentColors?.customBubbleColors, wallpaper: currentColors?.wallpaper) ?? defaultPresentationTheme
+            let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: themeSettings.theme, accentColor: currentColors?.color, bubbleColors: currentColors?.customBubbleColors, wallpaper: currentColors?.wallpaper, baseColor: currentColors?.baseColor) ?? defaultPresentationTheme
             currentWallpaper = theme.chat.defaultWallpaper
         }
         
@@ -603,7 +619,7 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI
                             effectiveColors = nil
                         }
                         
-                        let themeValue = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: effectiveTheme, accentColor: effectiveColors?.color, bubbleColors: effectiveColors?.customBubbleColors, wallpaper: effectiveColors?.wallpaper, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme
+                        let themeValue = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: effectiveTheme, accentColor: effectiveColors?.color, bubbleColors: effectiveColors?.customBubbleColors, wallpaper: effectiveColors?.wallpaper, baseColor: effectiveColors?.baseColor, serviceBackgroundColor: serviceBackgroundColor) ?? defaultPresentationTheme
                         
                         if autoNightModeTriggered && !switchedToNightModeWallpaper {
                             switch effectiveChatWallpaper {
@@ -639,7 +655,7 @@ public func updatedPresentationData(accountManager: AccountManager, applicationI
                         
                         let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners)
                         
-                        return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
+                        return PresentationData(strings: stringsValue, theme: themeValue, autoNightModeTriggered: autoNightModeTriggered, chatWallpaper: effectiveChatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, reduceMotion: themeSettings.reduceMotion, largeEmoji: themeSettings.largeEmoji)
                     }
                 } else {
                     return .complete()
@@ -674,19 +690,19 @@ public func defaultPresentationData() -> PresentationData {
     
     let chatBubbleCorners = PresentationChatBubbleCorners(mainRadius: CGFloat(themeSettings.chatBubbleSettings.mainRadius), auxiliaryRadius: CGFloat(themeSettings.chatBubbleSettings.auxiliaryRadius), mergeBubbleCorners: themeSettings.chatBubbleSettings.mergeBubbleCorners)
     
-    return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: .builtin(WallpaperSettings()), chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, disableAnimations: themeSettings.disableAnimations, largeEmoji: themeSettings.largeEmoji)
+    return PresentationData(strings: defaultPresentationStrings, theme: defaultPresentationTheme, autoNightModeTriggered: false, chatWallpaper: defaultPresentationTheme.chat.defaultWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: dateTimeFormat, nameDisplayOrder: nameDisplayOrder, nameSortOrder: nameSortOrder, reduceMotion: themeSettings.reduceMotion, largeEmoji: themeSettings.largeEmoji)
 }
 
 public extension PresentationData {
     func withFontSizes(chatFontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationData {
-        return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji)
+        return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: chatFontSize, chatBubbleCorners: self.chatBubbleCorners, listsFontSize: listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, reduceMotion: self.reduceMotion, largeEmoji: self.largeEmoji)
     }
     
     func withChatBubbleCorners(_ chatBubbleCorners: PresentationChatBubbleCorners) -> PresentationData {
-        return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji)
+        return PresentationData(strings: self.strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, reduceMotion: self.reduceMotion, largeEmoji: self.largeEmoji)
     }
     
     func withStrings(_ strings: PresentationStrings) -> PresentationData {
-        return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, disableAnimations: self.disableAnimations, largeEmoji: self.largeEmoji)
+        return PresentationData(strings: strings, theme: self.theme, autoNightModeTriggered: self.autoNightModeTriggered, chatWallpaper: self.chatWallpaper, chatFontSize: self.chatFontSize, chatBubbleCorners: chatBubbleCorners, listsFontSize: self.listsFontSize, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, nameSortOrder: self.nameSortOrder, reduceMotion: self.reduceMotion, largeEmoji: self.largeEmoji)
     }
 }
diff --git a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
index 6993d86a4e..e701e90889 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationStrings.swift
@@ -208,5441 +208,5680 @@ public final class PresentationStrings: Equatable {
     public var ChatListFolder_CategoryNonContacts: String { return self._s[18]! }
     public var Gif_NoGifsPlaceholder: String { return self._s[19]! }
     public var Conversation_ShareInlineBotLocationConfirmation: String { return self._s[20]! }
-    public var AutoNightTheme_ScheduleSection: String { return self._s[21]! }
-    public var Map_LiveLocationTitle: String { return self._s[22]! }
-    public var Passport_PasswordCreate: String { return self._s[23]! }
-    public var Settings_ProxyConnected: String { return self._s[24]! }
+    public func VoiceChat_StatusLateBy(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[21]!, self._r[21]!, [_0])
+    }
+    public var AutoNightTheme_ScheduleSection: String { return self._s[22]! }
+    public var Map_LiveLocationTitle: String { return self._s[23]! }
+    public var Passport_PasswordCreate: String { return self._s[24]! }
+    public var Settings_ProxyConnected: String { return self._s[25]! }
     public func PUSH_PINNED_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[25]!, self._r[25]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[26]!, self._r[26]!, [_1, _2])
     }
-    public var Channel_Management_LabelOwner: String { return self._s[26]! }
-    public var ApplyLanguage_ApplySuccess: String { return self._s[27]! }
-    public var Group_Setup_HistoryHidden: String { return self._s[28]! }
-    public var Month_ShortNovember: String { return self._s[29]! }
-    public var Call_ReportIncludeLog: String { return self._s[30]! }
-    public var ChatList_RemoveFolder: String { return self._s[31]! }
-    public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[32]! }
-    public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[33]! }
-    public var Checkout_Receipt_Title: String { return self._s[34]! }
+    public var Channel_Management_LabelOwner: String { return self._s[27]! }
+    public var ApplyLanguage_ApplySuccess: String { return self._s[28]! }
+    public var Group_Setup_HistoryHidden: String { return self._s[29]! }
+    public var ImportStickerPack_ChooseLinkDescription: String { return self._s[30]! }
+    public var Month_ShortNovember: String { return self._s[31]! }
+    public var ImportStickerPack_CheckingLink: String { return self._s[32]! }
+    public var Call_ReportIncludeLog: String { return self._s[33]! }
+    public var ChatList_RemoveFolder: String { return self._s[34]! }
+    public var PrivacyPhoneNumberSettings_CustomHelp: String { return self._s[35]! }
+    public var Appearance_ThemePreview_ChatList_5_Text: String { return self._s[36]! }
+    public var Checkout_Receipt_Title: String { return self._s[37]! }
     public func Conversation_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[35]!, self._r[35]!, [_0])
+        return formatWithArgumentRanges(self._s[38]!, self._r[38]!, [_0])
     }
-    public var AuthSessions_LogOutApplicationsHelp: String { return self._s[36]! }
-    public var SearchImages_Title: String { return self._s[37]! }
-    public var Notification_PaymentSent: String { return self._s[38]! }
-    public var Appearance_TintAllColors: String { return self._s[39]! }
-    public var Group_Setup_TypePublicHelp: String { return self._s[40]! }
-    public var ChatSettings_Cache: String { return self._s[41]! }
-    public var InviteLink_RevokedLinks: String { return self._s[42]! }
-    public var Login_InvalidLastNameError: String { return self._s[43]! }
-    public var PeerInfo_PaneMedia: String { return self._s[44]! }
-    public var InviteLink_Revoked: String { return self._s[45]! }
-    public var StickerPacks_ActionShare: String { return self._s[46]! }
-    public var GroupPermission_PermissionGloballyDisabled: String { return self._s[47]! }
-    public var LiveLocationUpdated_JustNow: String { return self._s[48]! }
+    public var AuthSessions_LogOutApplicationsHelp: String { return self._s[39]! }
+    public var SearchImages_Title: String { return self._s[40]! }
+    public var Notification_PaymentSent: String { return self._s[41]! }
+    public var Appearance_TintAllColors: String { return self._s[42]! }
+    public var Group_Setup_TypePublicHelp: String { return self._s[43]! }
+    public var ChatSettings_Cache: String { return self._s[44]! }
+    public var InviteLink_RevokedLinks: String { return self._s[45]! }
+    public var Login_InvalidLastNameError: String { return self._s[46]! }
+    public var PeerInfo_PaneMedia: String { return self._s[47]! }
+    public var InviteLink_Revoked: String { return self._s[48]! }
+    public var StickerPacks_ActionShare: String { return self._s[49]! }
+    public var GroupPermission_PermissionGloballyDisabled: String { return self._s[50]! }
+    public var LiveLocationUpdated_JustNow: String { return self._s[51]! }
     public func Map_LiveLocationPrivateDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[49]!, self._r[49]!, [_0])
+        return formatWithArgumentRanges(self._s[52]!, self._r[52]!, [_0])
     }
-    public var Channel_Info_Members: String { return self._s[50]! }
+    public var Channel_Info_Members: String { return self._s[53]! }
     public func Channel_CommentsGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[51]!, self._r[51]!, [_0])
+        return formatWithArgumentRanges(self._s[54]!, self._r[54]!, [_0])
     }
-    public var Common_edit: String { return self._s[52]! }
-    public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[54]! }
-    public var OldChannels_GroupEmptyFormat: String { return self._s[55]! }
+    public var Common_edit: String { return self._s[55]! }
+    public var ChatList_DeleteSavedMessagesConfirmationText: String { return self._s[57]! }
+    public var OldChannels_GroupEmptyFormat: String { return self._s[58]! }
     public func PUSH_PINNED_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[56]!, self._r[56]!, [_1])
+        return formatWithArgumentRanges(self._s[59]!, self._r[59]!, [_1])
     }
-    public var Passport_DiscardMessageAction: String { return self._s[57]! }
-    public var VoiceChat_StopRecordingTitle: String { return self._s[58]! }
-    public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[59]! }
-    public var Stickers_SuggestNone: String { return self._s[60]! }
+    public var Passport_DiscardMessageAction: String { return self._s[60]! }
+    public var VoiceChat_StopRecordingTitle: String { return self._s[61]! }
+    public var Passport_FieldOneOf_FinalDelimeter: String { return self._s[62]! }
+    public var Stickers_SuggestNone: String { return self._s[63]! }
     public func Channel_AdminLog_JoinedViaInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[61]!, self._r[61]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[64]!, self._r[64]!, [_1, _2])
     }
-    public var Channel_AdminLog_CanPinMessages: String { return self._s[62]! }
-    public var Stickers_Search: String { return self._s[64]! }
-    public var Passport_Identity_EditPersonalDetails: String { return self._s[65]! }
-    public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[66]! }
-    public var Login_ContinueWithLocalization: String { return self._s[67]! }
-    public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[68]! }
-    public var TextFormat_Italic: String { return self._s[70]! }
-    public var ChatList_Search_NoResultsFitlerLinks: String { return self._s[72]! }
-    public var Stickers_GroupChooseStickerPack: String { return self._s[73]! }
-    public var Notification_MessageLifetime1w: String { return self._s[74]! }
-    public var Channel_Management_AddModerator: String { return self._s[75]! }
-    public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[76]! }
-    public var Gif_Search: String { return self._s[77]! }
-    public var Checkout_ErrorGeneric: String { return self._s[78]! }
-    public var Conversation_ContextMenuSendMessage: String { return self._s[79]! }
-    public var Map_SetThisLocation: String { return self._s[80]! }
-    public var Notifications_ExceptionsDefaultSound: String { return self._s[81]! }
-    public var PrivacySettings_AutoArchiveInfo: String { return self._s[82]! }
-    public var Stats_NotificationsTitle: String { return self._s[83]! }
-    public var Conversation_ClearSecretHistory: String { return self._s[85]! }
+    public var Channel_AdminLog_CanPinMessages: String { return self._s[65]! }
+    public var Stickers_Search: String { return self._s[67]! }
+    public var Passport_Identity_EditPersonalDetails: String { return self._s[68]! }
+    public var NotificationSettings_ShowNotificationsAllAccounts: String { return self._s[69]! }
+    public var Login_ContinueWithLocalization: String { return self._s[70]! }
+    public var Privacy_ProfilePhoto_NeverShareWith_Title: String { return self._s[71]! }
+    public var TextFormat_Italic: String { return self._s[73]! }
+    public var ChatList_Search_NoResultsFitlerLinks: String { return self._s[75]! }
+    public var Stickers_GroupChooseStickerPack: String { return self._s[76]! }
+    public var Notification_MessageLifetime1w: String { return self._s[77]! }
+    public var Channel_Management_AddModerator: String { return self._s[78]! }
+    public var Conversation_UnsupportedMediaPlaceholder: String { return self._s[79]! }
+    public var Gif_Search: String { return self._s[80]! }
+    public var Checkout_ErrorGeneric: String { return self._s[81]! }
+    public var Conversation_ContextMenuSendMessage: String { return self._s[82]! }
+    public var Map_SetThisLocation: String { return self._s[83]! }
+    public var Notifications_ExceptionsDefaultSound: String { return self._s[84]! }
+    public var PrivacySettings_AutoArchiveInfo: String { return self._s[85]! }
+    public var Stats_NotificationsTitle: String { return self._s[86]! }
+    public var Conversation_ClearSecretHistory: String { return self._s[88]! }
     public func Conversation_DeleteAllMessagesInChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[86]!, self._r[86]!, [_0])
+        return formatWithArgumentRanges(self._s[89]!, self._r[89]!, [_0])
     }
     public func Notification_CallFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[87]!, self._r[87]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[90]!, self._r[90]!, [_1, _2])
     }
-    public var ChatListFolder_DiscardDiscard: String { return self._s[88]! }
-    public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[89]! }
-    public var Contacts_InviteFriends: String { return self._s[90]! }
-    public var Group_LinkedChannel: String { return self._s[91]! }
-    public var ChatList_DeleteForAllMembers: String { return self._s[92]! }
-    public var Notification_PassportValuePhone: String { return self._s[94]! }
+    public var ChatListFolder_DiscardDiscard: String { return self._s[91]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith: String { return self._s[92]! }
+    public var Contacts_InviteFriends: String { return self._s[93]! }
+    public var Group_LinkedChannel: String { return self._s[94]! }
+    public var ChatList_DeleteForAllMembers: String { return self._s[95]! }
+    public var Notification_PassportValuePhone: String { return self._s[97]! }
     public func InviteText_SingleContact(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[95]!, self._r[95]!, [_0])
+        return formatWithArgumentRanges(self._s[98]!, self._r[98]!, [_0])
     }
-    public var UserInfo_BotHelp: String { return self._s[97]! }
-    public var Passport_Identity_MainPage: String { return self._s[99]! }
-    public var LogoutOptions_ContactSupportText: String { return self._s[100]! }
+    public var UserInfo_BotHelp: String { return self._s[100]! }
+    public var Passport_Identity_MainPage: String { return self._s[102]! }
+    public var LogoutOptions_ContactSupportText: String { return self._s[103]! }
     public func VoiceOver_Chat_Title(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[101]!, self._r[101]!, [_0])
+        return formatWithArgumentRanges(self._s[104]!, self._r[104]!, [_0])
     }
-    public var StickerPack_ShowStickers: String { return self._s[103]! }
-    public var AttachmentMenu_PhotoOrVideo: String { return self._s[104]! }
-    public var Map_Satellite: String { return self._s[105]! }
-    public var Passport_Identity_MainPageHelp: String { return self._s[106]! }
-    public var Profile_About: String { return self._s[108]! }
-    public var Group_Setup_TypePrivate: String { return self._s[109]! }
-    public var Notifications_ChannelNotifications: String { return self._s[110]! }
-    public var Call_VoiceOver_VoiceCallIncoming: String { return self._s[111]! }
+    public var StickerPack_ShowStickers: String { return self._s[106]! }
+    public var AttachmentMenu_PhotoOrVideo: String { return self._s[107]! }
+    public var Map_Satellite: String { return self._s[108]! }
+    public var Passport_Identity_MainPageHelp: String { return self._s[109]! }
+    public var Profile_About: String { return self._s[111]! }
+    public var Group_Setup_TypePrivate: String { return self._s[112]! }
+    public func ScheduleVoiceChat_ChannelText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[113]!, self._r[113]!, [_0])
+    }
+    public var Notifications_ChannelNotifications: String { return self._s[114]! }
+    public var Call_VoiceOver_VoiceCallIncoming: String { return self._s[115]! }
     public func Login_WillCallYou(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[112]!, self._r[112]!, [_0])
+        return formatWithArgumentRanges(self._s[116]!, self._r[116]!, [_0])
     }
-    public var WallpaperPreview_Motion: String { return self._s[113]! }
-    public var Message_VideoMessage: String { return self._s[114]! }
-    public var SharedMedia_CategoryOther: String { return self._s[115]! }
-    public var Passport_FieldIdentityUploadHelp: String { return self._s[116]! }
-    public var PUSH_REMINDER_TITLE: String { return self._s[117]! }
-    public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[119]! }
-    public var Login_ResetAccountProtected_Reset: String { return self._s[121]! }
-    public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[122]! }
+    public var WallpaperPreview_Motion: String { return self._s[117]! }
+    public var Message_VideoMessage: String { return self._s[118]! }
+    public var SharedMedia_CategoryOther: String { return self._s[120]! }
+    public var Passport_FieldIdentityUploadHelp: String { return self._s[121]! }
+    public var PUSH_REMINDER_TITLE: String { return self._s[122]! }
+    public var Appearance_ThemePreview_Chat_3_Text: String { return self._s[124]! }
+    public var Login_ResetAccountProtected_Reset: String { return self._s[126]! }
+    public var Passport_Identity_TypeInternalPassportUploadScan: String { return self._s[127]! }
     public func Location_ProximityNotification_Notify(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[123]!, self._r[123]!, [_0])
+        return formatWithArgumentRanges(self._s[128]!, self._r[128]!, [_0])
     }
-    public var ChatList_PeerTypeContact: String { return self._s[124]! }
-    public var Stickers_SuggestAll: String { return self._s[126]! }
-    public var EmptyGroupInfo_Line3: String { return self._s[127]! }
-    public var Login_InvalidPhoneError: String { return self._s[128]! }
-    public var MediaPicker_GroupDescription: String { return self._s[129]! }
-    public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[130]! }
-    public var Conversation_PrivateChannelTimeLimitedAlertText: String { return self._s[131]! }
-    public var PrivateDataSettings_Title: String { return self._s[132]! }
-    public var SecretChat_Title: String { return self._s[133]! }
-    public var Privacy_ChatsTitle: String { return self._s[134]! }
-    public var EditProfile_NameAndPhotoHelp: String { return self._s[135]! }
-    public var Watch_MessageView_Forward: String { return self._s[137]! }
-    public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[138]! }
+    public var ChatList_PeerTypeContact: String { return self._s[129]! }
+    public var Stickers_SuggestAll: String { return self._s[131]! }
+    public var EmptyGroupInfo_Line3: String { return self._s[132]! }
+    public var Login_InvalidPhoneError: String { return self._s[133]! }
+    public var MediaPicker_GroupDescription: String { return self._s[134]! }
+    public func UserInfo_LinkForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[135]!, self._r[135]!, [_0])
+    }
+    public var NetworkUsageSettings_MediaDocumentDataSection: String { return self._s[136]! }
+    public var Conversation_PrivateChannelTimeLimitedAlertText: String { return self._s[137]! }
+    public var PrivateDataSettings_Title: String { return self._s[138]! }
+    public var SecretChat_Title: String { return self._s[139]! }
+    public var Privacy_ChatsTitle: String { return self._s[140]! }
+    public var EditProfile_NameAndPhotoHelp: String { return self._s[141]! }
+    public var Watch_MessageView_Forward: String { return self._s[143]! }
+    public var ChannelMembers_WhoCanAddMembers_AllMembers: String { return self._s[144]! }
     public func PUSH_PINNED_QUIZ(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[139]!, self._r[139]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[145]!, self._r[145]!, [_1, _2])
     }
     public func Channel_AdminLog_EndedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[140]!, self._r[140]!, [_1])
+        return formatWithArgumentRanges(self._s[146]!, self._r[146]!, [_1])
     }
-    public var InviteLink_ExpiredLink: String { return self._s[141]! }
-    public var PhotoEditor_DiscardChanges: String { return self._s[142]! }
-    public var SocksProxySetup_AdNoticeHelp: String { return self._s[143]! }
-    public var Date_DialogDateFormat: String { return self._s[144]! }
-    public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[145]! }
-    public var Notifications_AlertTones: String { return self._s[146]! }
-    public var Permissions_SiriAllow_v0: String { return self._s[147]! }
-    public var Tour_StartButton: String { return self._s[148]! }
-    public var Stats_InstantViewInteractionsTitle: String { return self._s[149]! }
-    public var UserInfo_ScamUserWarning: String { return self._s[152]! }
-    public var NotificationsSound_Chime: String { return self._s[153]! }
-    public var Update_Skip: String { return self._s[154]! }
+    public var InviteLink_ExpiredLink: String { return self._s[147]! }
+    public var PhotoEditor_DiscardChanges: String { return self._s[148]! }
+    public var SocksProxySetup_AdNoticeHelp: String { return self._s[149]! }
+    public var Date_DialogDateFormat: String { return self._s[150]! }
+    public var SettingsSearch_Synonyms_Proxy_Title: String { return self._s[151]! }
+    public var Notifications_AlertTones: String { return self._s[152]! }
+    public var Permissions_SiriAllow_v0: String { return self._s[153]! }
+    public var Tour_StartButton: String { return self._s[154]! }
+    public var Stats_InstantViewInteractionsTitle: String { return self._s[155]! }
+    public var UserInfo_ScamUserWarning: String { return self._s[158]! }
+    public var NotificationsSound_Chime: String { return self._s[159]! }
+    public var Update_Skip: String { return self._s[160]! }
     public func ChannelInfo_ChannelForbidden(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[155]!, self._r[155]!, [_0])
+        return formatWithArgumentRanges(self._s[161]!, self._r[161]!, [_0])
     }
-    public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[156]! }
-    public var Notifications_PermissionsTitle: String { return self._s[157]! }
-    public var Channel_AdminLog_BanSendMedia: String { return self._s[158]! }
-    public var Notifications_Badge_CountUnreadMessages: String { return self._s[159]! }
-    public var Appearance_AppIcon: String { return self._s[160]! }
-    public var Passport_Identity_FilesUploadNew: String { return self._s[161]! }
+    public var SettingsSearch_Synonyms_EditProfile_PhoneNumber: String { return self._s[162]! }
+    public var Notifications_PermissionsTitle: String { return self._s[163]! }
+    public var Channel_AdminLog_BanSendMedia: String { return self._s[164]! }
+    public var Notifications_Badge_CountUnreadMessages: String { return self._s[165]! }
+    public var Appearance_AppIcon: String { return self._s[166]! }
+    public var Passport_Identity_FilesUploadNew: String { return self._s[167]! }
     public func Passport_Email_UseTelegramEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[162]!, self._r[162]!, [_0])
+        return formatWithArgumentRanges(self._s[168]!, self._r[168]!, [_0])
     }
-    public var CreatePoll_QuizTitle: String { return self._s[163]! }
-    public var DialogList_DeleteConversationConfirmation: String { return self._s[164]! }
-    public var NotificationsSound_Calypso: String { return self._s[165]! }
-    public var ChannelMembers_GroupAdminsTitle: String { return self._s[166]! }
-    public var Checkout_NewCard_PaymentCard: String { return self._s[167]! }
-    public var Wallpaper_SetCustomBackground: String { return self._s[169]! }
-    public var Conversation_ContextMenuOpenProfile: String { return self._s[170]! }
+    public var CreatePoll_QuizTitle: String { return self._s[169]! }
+    public var DialogList_DeleteConversationConfirmation: String { return self._s[170]! }
+    public var NotificationsSound_Calypso: String { return self._s[171]! }
+    public var ChannelMembers_GroupAdminsTitle: String { return self._s[173]! }
+    public var Checkout_NewCard_PaymentCard: String { return self._s[174]! }
+    public var Wallpaper_SetCustomBackground: String { return self._s[176]! }
+    public var Conversation_ContextMenuOpenProfile: String { return self._s[177]! }
     public func PUSH_MESSAGE_VIDEO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[172]!, self._r[172]!, [_1])
+        return formatWithArgumentRanges(self._s[179]!, self._r[179]!, [_1])
     }
-    public var AuthSessions_Terminate: String { return self._s[173]! }
-    public var ShareFileTip_CloseTip: String { return self._s[174]! }
-    public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[175]! }
-    public var Channel_Moderator_AccessLevelRevoke: String { return self._s[176]! }
-    public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[177]! }
-    public var Passport_Language_fr: String { return self._s[178]! }
+    public var AuthSessions_Terminate: String { return self._s[180]! }
+    public var ShareFileTip_CloseTip: String { return self._s[181]! }
+    public var ChatSettings_DownloadInBackgroundInfo: String { return self._s[182]! }
+    public var Channel_Moderator_AccessLevelRevoke: String { return self._s[183]! }
+    public var Channel_AdminLogFilter_EventsDeletedMessages: String { return self._s[184]! }
+    public var Passport_Language_fr: String { return self._s[185]! }
     public func Watch_Time_ShortTodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[180]!, self._r[180]!, [_0])
+        return formatWithArgumentRanges(self._s[187]!, self._r[187]!, [_0])
     }
-    public var Passport_Identity_TypeIdentityCard: String { return self._s[181]! }
-    public var VoiceChat_MuteForMe: String { return self._s[182]! }
+    public var Passport_Identity_TypeIdentityCard: String { return self._s[188]! }
+    public var VoiceChat_MuteForMe: String { return self._s[189]! }
     public func Conversation_OpenBotLinkAllowMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[183]!, self._r[183]!, [_0])
+        return formatWithArgumentRanges(self._s[190]!, self._r[190]!, [_0])
     }
-    public var ReportPeer_ReasonCopyright: String { return self._s[184]! }
-    public var Permissions_PeopleNearbyText_v0: String { return self._s[186]! }
-    public var Channel_Stickers_NotFoundHelp: String { return self._s[187]! }
-    public var Passport_Identity_AddDriversLicense: String { return self._s[188]! }
-    public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[189]! }
-    public var Permissions_SiriAllowInSettings_v0: String { return self._s[190]! }
+    public var ReportPeer_ReasonCopyright: String { return self._s[191]! }
+    public var Permissions_PeopleNearbyText_v0: String { return self._s[193]! }
+    public var Channel_Stickers_NotFoundHelp: String { return self._s[194]! }
+    public var Passport_Identity_AddDriversLicense: String { return self._s[195]! }
+    public var AutoDownloadSettings_AutodownloadFiles: String { return self._s[196]! }
+    public var Permissions_SiriAllowInSettings_v0: String { return self._s[197]! }
     public func Conversation_ForwardTooltip_ManyChats_Many(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[191]!, self._r[191]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[198]!, self._r[198]!, [_0, _1])
     }
-    public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[192]! }
-    public var Map_LocatingError: String { return self._s[194]! }
-    public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[195]! }
+    public var ApplyLanguage_ChangeLanguageTitle: String { return self._s[199]! }
+    public var Map_LocatingError: String { return self._s[201]! }
+    public var ChatSettings_AutoDownloadSettings_TypePhoto: String { return self._s[202]! }
     public func VoiceOver_Chat_MusicFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[197]!, self._r[197]!, [_0])
+        return formatWithArgumentRanges(self._s[204]!, self._r[204]!, [_0])
     }
     public func Contacts_AccessDeniedHelpLandscape(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[198]!, self._r[198]!, [_0])
-    }
-    public var Channel_AdminLog_EmptyFilterText: String { return self._s[199]! }
-    public var Login_SmsRequestState2: String { return self._s[200]! }
-    public var Conversation_Unmute: String { return self._s[202]! }
-    public var TwoFactorSetup_Intro_Text: String { return self._s[203]! }
-    public var Channel_AdminLog_BanSendMessages: String { return self._s[204]! }
-    public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[205]!, self._r[205]!, [_0])
     }
-    public var AccessDenied_LocationDenied: String { return self._s[206]! }
-    public var Share_AuthTitle: String { return self._s[207]! }
-    public var Month_ShortAugust: String { return self._s[208]! }
+    public var Channel_AdminLog_EmptyFilterText: String { return self._s[206]! }
+    public var Login_SmsRequestState2: String { return self._s[207]! }
+    public var Conversation_Unmute: String { return self._s[209]! }
+    public var TwoFactorSetup_Intro_Text: String { return self._s[210]! }
+    public var Channel_AdminLog_BanSendMessages: String { return self._s[211]! }
+    public func Channel_Management_RemovedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[212]!, self._r[212]!, [_0])
+    }
+    public var AccessDenied_LocationDenied: String { return self._s[213]! }
+    public var Share_AuthTitle: String { return self._s[214]! }
+    public var Month_ShortAugust: String { return self._s[215]! }
     public func Notification_PinnedDeletedMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[209]!, self._r[209]!, [_0])
+        return formatWithArgumentRanges(self._s[216]!, self._r[216]!, [_0])
     }
-    public var Channel_BanUser_PermissionSendMedia: String { return self._s[210]! }
-    public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[211]! }
+    public var Channel_BanUser_PermissionSendMedia: String { return self._s[217]! }
+    public var SettingsSearch_Synonyms_Data_DownloadInBackground: String { return self._s[218]! }
     public func PUSH_CONTACT_JOINED(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[212]!, self._r[212]!, [_1])
+        return formatWithArgumentRanges(self._s[219]!, self._r[219]!, [_1])
     }
-    public var WallpaperSearch_ColorTitle: String { return self._s[214]! }
-    public var Wallpaper_Search: String { return self._s[215]! }
-    public var ClearCache_StorageUsage: String { return self._s[216]! }
-    public var CreatePoll_TextPlaceholder: String { return self._s[217]! }
-    public var Conversation_EditingMessagePanelTitle: String { return self._s[218]! }
-    public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[219]! }
-    public var OldChannels_NoticeCreateText: String { return self._s[220]! }
-    public var ProfilePhoto_MainVideo: String { return self._s[221]! }
-    public var VoiceChat_StatusListening: String { return self._s[222]! }
-    public var InviteLink_DeleteLinkAlert_Text: String { return self._s[223]! }
-    public var UserInfo_NotificationsDisabled: String { return self._s[224]! }
-    public var Map_Unknown: String { return self._s[225]! }
-    public var Notifications_MessageNotificationsAlert: String { return self._s[226]! }
-    public var Conversation_StopQuiz: String { return self._s[227]! }
-    public var Checkout_LiabilityAlertTitle: String { return self._s[228]! }
+    public var WallpaperSearch_ColorTitle: String { return self._s[221]! }
+    public var Wallpaper_Search: String { return self._s[222]! }
+    public var ClearCache_StorageUsage: String { return self._s[223]! }
+    public var CreatePoll_TextPlaceholder: String { return self._s[224]! }
+    public var Conversation_EditingMessagePanelTitle: String { return self._s[225]! }
+    public var Channel_EditAdmin_PermissionBanUsers: String { return self._s[226]! }
+    public var OldChannels_NoticeCreateText: String { return self._s[227]! }
+    public var ProfilePhoto_MainVideo: String { return self._s[228]! }
+    public var VoiceChat_StatusListening: String { return self._s[229]! }
+    public var InviteLink_DeleteLinkAlert_Text: String { return self._s[230]! }
+    public var UserInfo_NotificationsDisabled: String { return self._s[231]! }
+    public var Map_Unknown: String { return self._s[232]! }
+    public var Notifications_MessageNotificationsAlert: String { return self._s[233]! }
+    public var Conversation_StopQuiz: String { return self._s[234]! }
+    public var Checkout_LiabilityAlertTitle: String { return self._s[235]! }
     public func Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[229]!, self._r[229]!, [_0])
+        return formatWithArgumentRanges(self._s[236]!, self._r[236]!, [_0])
     }
-    public var CreatePoll_OptionPlaceholder: String { return self._s[230]! }
-    public var Conversation_RestrictedStickers: String { return self._s[231]! }
-    public var MemberSearch_BotSection: String { return self._s[233]! }
-    public var Channel_Management_AddModeratorHelp: String { return self._s[235]! }
-    public var Widget_ShortcutsGalleryDescription: String { return self._s[236]! }
-    public var MaskStickerSettings_Title: String { return self._s[237]! }
-    public var ShareMenu_Comment: String { return self._s[238]! }
-    public var GroupInfo_Notifications: String { return self._s[239]! }
-    public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[240]! }
+    public var CreatePoll_OptionPlaceholder: String { return self._s[237]! }
+    public var Conversation_RestrictedStickers: String { return self._s[238]! }
+    public var MemberSearch_BotSection: String { return self._s[240]! }
+    public var Channel_Management_AddModeratorHelp: String { return self._s[242]! }
+    public var Widget_ShortcutsGalleryDescription: String { return self._s[243]! }
+    public var MaskStickerSettings_Title: String { return self._s[244]! }
+    public var ShareMenu_Comment: String { return self._s[245]! }
+    public var GroupInfo_Notifications: String { return self._s[246]! }
+    public var CheckoutInfo_ReceiverInfoTitle: String { return self._s[247]! }
     public func DialogList_EncryptedChatStartedOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[241]!, self._r[241]!, [_0])
-    }
-    public var Conversation_ContextMenuCopyLink: String { return self._s[242]! }
-    public var VoiceChat_MutedHelp: String { return self._s[245]! }
-    public var ChatListFolder_CategoryMuted: String { return self._s[246]! }
-    public var TwoStepAuth_AddHintDescription: String { return self._s[247]! }
-    public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[248]!, self._r[248]!, [_0])
     }
-    public var Conversation_ClousStorageInfo_Description3: String { return self._s[249]! }
-    public var BroadcastGroups_LimitAlert_SettingsTip: String { return self._s[250]! }
-    public var Contacts_SortByPresence: String { return self._s[251]! }
-    public var Watch_Location_Access: String { return self._s[252]! }
-    public var WallpaperPreview_CustomColorTopText: String { return self._s[253]! }
-    public var Passport_Address_TypeBankStatement: String { return self._s[254]! }
-    public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[255]! }
-    public var Conversation_ClearPrivateHistory: String { return self._s[256]! }
-    public var ChatList_Mute: String { return self._s[259]! }
-    public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[260]! }
-    public var Stats_PostsTitle: String { return self._s[261]! }
+    public var Conversation_ContextMenuCopyLink: String { return self._s[249]! }
+    public var VoiceChat_MutedHelp: String { return self._s[252]! }
+    public var ChatListFolder_CategoryMuted: String { return self._s[253]! }
+    public var TwoStepAuth_AddHintDescription: String { return self._s[254]! }
+    public func VoiceOver_Chat_Duration(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[255]!, self._r[255]!, [_0])
+    }
+    public var Conversation_ClousStorageInfo_Description3: String { return self._s[256]! }
+    public var BroadcastGroups_LimitAlert_SettingsTip: String { return self._s[257]! }
+    public var Contacts_SortByPresence: String { return self._s[258]! }
+    public var Watch_Location_Access: String { return self._s[259]! }
+    public var WallpaperPreview_CustomColorTopText: String { return self._s[260]! }
+    public var Passport_Address_TypeBankStatement: String { return self._s[261]! }
+    public var Group_Username_RevokeExistingUsernamesInfo: String { return self._s[262]! }
+    public var Conversation_ClearPrivateHistory: String { return self._s[263]! }
+    public var ChatList_Mute: String { return self._s[266]! }
+    public var Channel_AdminLog_CanDeleteMessagesOfOthers: String { return self._s[267]! }
+    public var Stats_PostsTitle: String { return self._s[268]! }
     public func Conversation_AutoremoveTimerSetGroup(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[262]!, self._r[262]!, [_1])
+        return formatWithArgumentRanges(self._s[269]!, self._r[269]!, [_1])
     }
-    public var Paint_Masks: String { return self._s[264]! }
-    public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[266]! }
-    public var Chat_AttachmentLimitReached: String { return self._s[267]! }
-    public var StickerPackActionInfo_ArchivedTitle: String { return self._s[268]! }
-    public var Watch_Stickers_StickerPacks: String { return self._s[270]! }
-    public var Channel_Setup_Title: String { return self._s[271]! }
-    public var GroupInfo_Administrators: String { return self._s[272]! }
-    public var InviteLink_PublicLink: String { return self._s[273]! }
-    public var InviteLink_DeleteLinkAlert_Action: String { return self._s[275]! }
-    public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[276]! }
-    public var Conversation_ContextMenuDiscuss: String { return self._s[277]! }
-    public var StickerPack_BuiltinPackName: String { return self._s[278]! }
-    public var Conversation_GreetingText: String { return self._s[280]! }
-    public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[282]! }
-    public var Checkout_ShippingMethod: String { return self._s[284]! }
-    public var ClearCache_FreeSpace: String { return self._s[285]! }
-    public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[286]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[289]! }
+    public var Paint_Masks: String { return self._s[271]! }
+    public var PasscodeSettings_TryAgainIn1Minute: String { return self._s[274]! }
+    public var Chat_AttachmentLimitReached: String { return self._s[275]! }
+    public var StickerPackActionInfo_ArchivedTitle: String { return self._s[276]! }
+    public var Watch_Stickers_StickerPacks: String { return self._s[278]! }
+    public var Channel_Setup_Title: String { return self._s[279]! }
+    public var GroupInfo_Administrators: String { return self._s[280]! }
+    public var InviteLink_PublicLink: String { return self._s[281]! }
+    public var InviteLink_DeleteLinkAlert_Action: String { return self._s[283]! }
+    public var NotificationSettings_ShowNotificationsAllAccountsInfoOff: String { return self._s[284]! }
+    public var Conversation_ContextMenuDiscuss: String { return self._s[285]! }
+    public var StickerPack_BuiltinPackName: String { return self._s[286]! }
+    public var Conversation_GreetingText: String { return self._s[288]! }
+    public var TwoStepAuth_RecoveryEmailChangeDescription: String { return self._s[290]! }
+    public var Checkout_ShippingMethod: String { return self._s[292]! }
+    public var ClearCache_FreeSpace: String { return self._s[293]! }
+    public var EditTheme_Expand_Preview_IncomingReplyText: String { return self._s[294]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsSound: String { return self._s[297]! }
     public func TwoStepAuth_ConfirmEmailDescription(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[290]!, self._r[290]!, [_1])
+        return formatWithArgumentRanges(self._s[298]!, self._r[298]!, [_1])
     }
-    public var Conversation_typing: String { return self._s[291]! }
+    public var Conversation_typing: String { return self._s[299]! }
     public func PrivacySettings_LastSeenContactsMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[293]!, self._r[293]!, [_0])
+        return formatWithArgumentRanges(self._s[301]!, self._r[301]!, [_0])
     }
-    public var WebSearch_RecentSectionTitle: String { return self._s[294]! }
-    public var VoiceChat_EndConfirmationTitle: String { return self._s[295]! }
-    public var ChatList_UnhideAction: String { return self._s[297]! }
-    public var PasscodeSettings_6DigitCode: String { return self._s[298]! }
-    public var CallFeedback_AddComment: String { return self._s[299]! }
-    public var LoginPassword_PasswordHelp: String { return self._s[300]! }
-    public var Call_Flip: String { return self._s[301]! }
-    public var Weekday_ShortWednesday: String { return self._s[303]! }
-    public var VoiceOver_Chat_PollFinalResults: String { return self._s[304]! }
-    public var PeerInfo_ButtonAddMember: String { return self._s[305]! }
-    public var Call_Decline: String { return self._s[307]! }
-    public var VoiceChat_InviteMemberToGroupFirstAdd: String { return self._s[308]! }
-    public var Join_ChannelsTooMuch: String { return self._s[310]! }
+    public var WebSearch_RecentSectionTitle: String { return self._s[302]! }
+    public var VoiceChat_EndConfirmationTitle: String { return self._s[303]! }
+    public var VoiceChat_TapToAddPhoto: String { return self._s[304]! }
+    public var ChatList_UnhideAction: String { return self._s[306]! }
+    public var PasscodeSettings_6DigitCode: String { return self._s[307]! }
+    public var CallFeedback_AddComment: String { return self._s[308]! }
+    public var LoginPassword_PasswordHelp: String { return self._s[309]! }
+    public var Call_Flip: String { return self._s[310]! }
+    public var Weekday_ShortWednesday: String { return self._s[312]! }
+    public var VoiceOver_Chat_PollFinalResults: String { return self._s[313]! }
+    public var ScheduleVoiceChat_Title: String { return self._s[314]! }
+    public var PeerInfo_ButtonAddMember: String { return self._s[315]! }
+    public var ImportStickerPack_ChooseNameDescription: String { return self._s[316]! }
+    public var Call_Decline: String { return self._s[318]! }
+    public var VoiceChat_InviteMemberToGroupFirstAdd: String { return self._s[319]! }
+    public var Join_ChannelsTooMuch: String { return self._s[321]! }
     public func PUSH_CHANNEL_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[311]!, self._r[311]!, [_1])
+        return formatWithArgumentRanges(self._s[322]!, self._r[322]!, [_1])
     }
-    public var Passport_Identity_Selfie: String { return self._s[312]! }
-    public var Privacy_ContactsTitle: String { return self._s[313]! }
-    public var GroupInfo_InviteLink_Title: String { return self._s[315]! }
-    public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[316]! }
+    public var Passport_Identity_Selfie: String { return self._s[323]! }
+    public var Privacy_ContactsTitle: String { return self._s[324]! }
+    public var GroupInfo_InviteLink_Title: String { return self._s[326]! }
+    public var TwoFactorSetup_Password_PlaceholderPassword: String { return self._s[327]! }
     public func Channel_AdminLog_UpdatedParticipantVolume(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[317]!, self._r[317]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[328]!, self._r[328]!, [_1, _2, _3])
     }
-    public var Conversation_OpenFile: String { return self._s[318]! }
-    public var Map_SetThisPlace: String { return self._s[319]! }
-    public var Channel_Info_Management: String { return self._s[320]! }
-    public var Passport_Language_hr: String { return self._s[321]! }
-    public var VoiceChat_Title: String { return self._s[322]! }
-    public var EditTheme_Edit_Preview_IncomingText: String { return self._s[325]! }
-    public var OpenFile_Proceed: String { return self._s[326]! }
-    public var Conversation_SecretChatContextBotAlert: String { return self._s[328]! }
-    public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[329]! }
-    public var Privacy_Calls_P2PContacts: String { return self._s[330]! }
-    public var Appearance_PickAccentColor: String { return self._s[331]! }
-    public var MediaPicker_TapToUngroupDescription: String { return self._s[332]! }
-    public var Localization_EnglishLanguageName: String { return self._s[333]! }
-    public var Stickers_SuggestStickers: String { return self._s[334]! }
-    public var Passport_Language_ko: String { return self._s[335]! }
-    public var Settings_ProxyDisabled: String { return self._s[336]! }
-    public var PrivacySettings_PasscodeOff: String { return self._s[337]! }
-    public var Undo_LeftChannel: String { return self._s[338]! }
-    public var Appearance_AutoNightThemeDisabled: String { return self._s[339]! }
-    public var TextFormat_Bold: String { return self._s[340]! }
-    public var Login_InfoTitle: String { return self._s[341]! }
-    public var Channel_BanUser_PermissionSendPolls: String { return self._s[342]! }
-    public var Settings_AddAnotherAccount: String { return self._s[343]! }
-    public var GroupPermission_NewTitle: String { return self._s[344]! }
-    public var Login_SelectCountry_Title: String { return self._s[345]! }
-    public var Cache_ServiceFiles: String { return self._s[346]! }
+    public var TwoFactorSetup_PasswordRecovery_SkipAlertAction: String { return self._s[330]! }
+    public var Conversation_OpenFile: String { return self._s[331]! }
+    public var Map_SetThisPlace: String { return self._s[332]! }
+    public var Channel_Info_Management: String { return self._s[333]! }
+    public var Passport_Language_hr: String { return self._s[334]! }
+    public var VoiceChat_Title: String { return self._s[335]! }
+    public var EditTheme_Edit_Preview_IncomingText: String { return self._s[339]! }
+    public var VoiceChat_EditBioSave: String { return self._s[340]! }
+    public var OpenFile_Proceed: String { return self._s[341]! }
+    public var Conversation_SecretChatContextBotAlert: String { return self._s[343]! }
+    public var GroupInfo_Permissions_SlowmodeValue_Off: String { return self._s[344]! }
+    public var Privacy_Calls_P2PContacts: String { return self._s[345]! }
+    public var Appearance_PickAccentColor: String { return self._s[346]! }
+    public var TwoFactorSetup_PasswordRecovery_Title: String { return self._s[347]! }
+    public var MediaPicker_TapToUngroupDescription: String { return self._s[348]! }
+    public var Localization_EnglishLanguageName: String { return self._s[349]! }
+    public var Stickers_SuggestStickers: String { return self._s[350]! }
+    public var Passport_Language_ko: String { return self._s[351]! }
+    public var Settings_ProxyDisabled: String { return self._s[352]! }
+    public var PrivacySettings_PasscodeOff: String { return self._s[353]! }
+    public var Undo_LeftChannel: String { return self._s[354]! }
+    public var Appearance_AutoNightThemeDisabled: String { return self._s[355]! }
+    public var TextFormat_Bold: String { return self._s[356]! }
+    public var Login_InfoTitle: String { return self._s[357]! }
+    public var Channel_BanUser_PermissionSendPolls: String { return self._s[358]! }
+    public var Settings_AddAnotherAccount: String { return self._s[359]! }
+    public var GroupPermission_NewTitle: String { return self._s[360]! }
+    public var Login_SelectCountry_Title: String { return self._s[361]! }
+    public var Cache_ServiceFiles: String { return self._s[362]! }
     public func AutoremoveSetup_TimerValueAfter(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[347]!, self._r[347]!, [_0])
+        return formatWithArgumentRanges(self._s[363]!, self._r[363]!, [_0])
     }
-    public var Passport_Language_nl: String { return self._s[348]! }
-    public var Contacts_TopSection: String { return self._s[349]! }
-    public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[350]! }
-    public var VoiceChat_StatusInvited: String { return self._s[352]! }
-    public var Conversation_ContextMenuReport: String { return self._s[353]! }
+    public var Passport_Language_nl: String { return self._s[364]! }
+    public var Contacts_TopSection: String { return self._s[365]! }
+    public var Passport_Identity_DateOfBirthPlaceholder: String { return self._s[366]! }
+    public var VoiceChat_StatusInvited: String { return self._s[368]! }
+    public var Conversation_ContextMenuReport: String { return self._s[369]! }
     public func Login_BannedPhoneBody(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[354]!, self._r[354]!, [_0])
-    }
-    public var Conversation_Search: String { return self._s[355]! }
-    public var Group_Setup_HistoryVisibleHelp: String { return self._s[357]! }
-    public var ReportPeer_AlertSuccess: String { return self._s[359]! }
-    public var AutoNightTheme_Title: String { return self._s[361]! }
-    public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[363]!, self._r[363]!, [_0, _1])
-    }
-    public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[364]!, self._r[364]!, [_0])
-    }
-    public var Conversation_ShareBotContactConfirmation: String { return self._s[365]! }
-    public var TwoStepAuth_RecoveryCode: String { return self._s[366]! }
-    public var GroupInfo_Permissions_BroadcastTitle: String { return self._s[367]! }
-    public var SocksProxySetup_ConnectAndSave: String { return self._s[368]! }
-    public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[369]!, self._r[369]!, [_1, _2])
-    }
-    public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[370]!, self._r[370]!, [_0])
     }
+    public var Conversation_Search: String { return self._s[371]! }
+    public var Group_Setup_HistoryVisibleHelp: String { return self._s[373]! }
+    public var ReportPeer_AlertSuccess: String { return self._s[375]! }
+    public var AutoNightTheme_Title: String { return self._s[377]! }
+    public func Notification_PinnedTextMessage(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[379]!, self._r[379]!, [_0, _1])
+    }
+    public func Conversation_OpenBotLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[380]!, self._r[380]!, [_0])
+    }
+    public var Conversation_ShareBotContactConfirmation: String { return self._s[381]! }
+    public var TwoStepAuth_RecoveryCode: String { return self._s[382]! }
+    public var GroupInfo_Permissions_BroadcastTitle: String { return self._s[383]! }
+    public var SocksProxySetup_ConnectAndSave: String { return self._s[384]! }
+    public func MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[385]!, self._r[385]!, [_1, _2])
+    }
+    public func Channel_AdminLog_MessageChangedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[386]!, self._r[386]!, [_0])
+    }
     public func BroadcastGroups_LimitAlert_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[371]!, self._r[371]!, [_0])
+        return formatWithArgumentRanges(self._s[387]!, self._r[387]!, [_0])
     }
-    public var Replies_BlockAndDeleteRepliesActionTitle: String { return self._s[373]! }
+    public var Replies_BlockAndDeleteRepliesActionTitle: String { return self._s[389]! }
     public func Notification_GroupInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[374]!, self._r[374]!, [_0])
+        return formatWithArgumentRanges(self._s[390]!, self._r[390]!, [_0])
     }
-    public var VoiceChat_CopyInviteLink: String { return self._s[375]! }
-    public var Conversation_InfoGroup: String { return self._s[376]! }
+    public var VoiceChat_CopyInviteLink: String { return self._s[391]! }
+    public var Conversation_InfoGroup: String { return self._s[392]! }
     public func Map_AccurateTo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[378]!, self._r[378]!, [_0])
+        return formatWithArgumentRanges(self._s[394]!, self._r[394]!, [_0])
     }
-    public var Conversation_ChatBackground: String { return self._s[379]! }
-    public var PhotoEditor_Set: String { return self._s[380]! }
+    public var Conversation_ChatBackground: String { return self._s[395]! }
+    public var PhotoEditor_Set: String { return self._s[396]! }
     public func Channel_Management_PromotedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[382]!, self._r[382]!, [_0])
+        return formatWithArgumentRanges(self._s[398]!, self._r[398]!, [_0])
     }
-    public var IntentsSettings_SuggestedChatsContacts: String { return self._s[383]! }
-    public var Passport_Phone_Title: String { return self._s[385]! }
-    public var Conversation_EditingMessageMediaChange: String { return self._s[386]! }
-    public var Channel_LinkItem: String { return self._s[387]! }
-    public var VoiceChat_EndConfirmationText: String { return self._s[388]! }
+    public var TwoStepAuth_CancelResetTitle: String { return self._s[399]! }
+    public var IntentsSettings_SuggestedChatsContacts: String { return self._s[400]! }
+    public var Passport_Phone_Title: String { return self._s[402]! }
+    public var Conversation_EditingMessageMediaChange: String { return self._s[403]! }
+    public var Channel_LinkItem: String { return self._s[404]! }
+    public var VoiceChat_EndConfirmationText: String { return self._s[405]! }
     public func PUSH_CHAT_DELETE_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[389]!, self._r[389]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[406]!, self._r[406]!, [_1, _2, _3])
     }
-    public var Conversation_DeleteManyMessages: String { return self._s[391]! }
-    public var Notifications_Badge_IncludeMutedChats: String { return self._s[392]! }
-    public var Channel_AddUserLeftError: String { return self._s[394]! }
-    public var AuthSessions_AddedDeviceTitle: String { return self._s[396]! }
-    public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[397]! }
-    public var Settings_ProxyConnecting: String { return self._s[398]! }
-    public var Theme_Colors_Accent: String { return self._s[399]! }
-    public var Theme_Colors_ColorWallpaperWarning: String { return self._s[400]! }
+    public var Conversation_DeleteManyMessages: String { return self._s[408]! }
+    public var Notifications_Badge_IncludeMutedChats: String { return self._s[409]! }
+    public var Channel_AddUserLeftError: String { return self._s[411]! }
+    public var AuthSessions_AddedDeviceTitle: String { return self._s[413]! }
+    public var Privacy_Calls_NeverAllow_Placeholder: String { return self._s[414]! }
+    public var Settings_ProxyConnecting: String { return self._s[415]! }
+    public var Theme_Colors_Accent: String { return self._s[417]! }
+    public var Theme_Colors_ColorWallpaperWarning: String { return self._s[418]! }
     public func PUSH_PHONE_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[402]!, self._r[402]!, [_1])
+        return formatWithArgumentRanges(self._s[420]!, self._r[420]!, [_1])
     }
-    public var Passport_Language_lo: String { return self._s[403]! }
+    public var Passport_Language_lo: String { return self._s[421]! }
     public func Watch_Time_ShortWeekdayAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[405]!, self._r[405]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[423]!, self._r[423]!, [_1, _2])
     }
-    public var Permissions_NotificationsText_v0: String { return self._s[406]! }
-    public var BroadcastGroups_LimitAlert_Title: String { return self._s[407]! }
-    public var ChatList_Context_RemoveFromRecents: String { return self._s[408]! }
-    public var Watch_GroupInfo_Title: String { return self._s[409]! }
-    public var Settings_AddDevice: String { return self._s[411]! }
-    public var WallpaperPreview_SwipeColorsTopText: String { return self._s[412]! }
+    public var Permissions_NotificationsText_v0: String { return self._s[424]! }
+    public var BroadcastGroups_LimitAlert_Title: String { return self._s[425]! }
+    public var Settings_CheckPasswordText: String { return self._s[426]! }
+    public var ChatList_Context_RemoveFromRecents: String { return self._s[427]! }
+    public var Watch_GroupInfo_Title: String { return self._s[428]! }
+    public var Settings_AddDevice: String { return self._s[430]! }
+    public var WallpaperPreview_SwipeColorsTopText: String { return self._s[431]! }
     public func PUSH_CHANNEL_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[413]!, self._r[413]!, [_1])
+        return formatWithArgumentRanges(self._s[432]!, self._r[432]!, [_1])
     }
-    public var Conversation_AutoremoveActionEdit: String { return self._s[414]! }
-    public var TwoStepAuth_Disable: String { return self._s[416]! }
+    public var ImportStickerPack_Create: String { return self._s[433]! }
+    public var Conversation_AutoremoveActionEdit: String { return self._s[434]! }
+    public var TwoStepAuth_Disable: String { return self._s[436]! }
     public func Conversation_AddNameToContacts(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[417]!, self._r[417]!, [_0])
+        return formatWithArgumentRanges(self._s[437]!, self._r[437]!, [_0])
     }
     public func Time_PreciseDate_m10(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[418]!, self._r[418]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[438]!, self._r[438]!, [_1, _2, _3])
     }
     public func Login_WillSendSms(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[419]!, self._r[419]!, [_0])
+        return formatWithArgumentRanges(self._s[439]!, self._r[439]!, [_0])
     }
-    public var Channel_AdminLog_BanReadMessages: String { return self._s[420]! }
-    public var Undo_ChatDeleted: String { return self._s[421]! }
-    public var ContactInfo_URLLabelHomepage: String { return self._s[422]! }
+    public var Channel_AdminLog_BanReadMessages: String { return self._s[440]! }
+    public var Undo_ChatDeleted: String { return self._s[441]! }
+    public var ContactInfo_URLLabelHomepage: String { return self._s[442]! }
     public func PUSH_CHAT_MESSAGE_STICKER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[423]!, self._r[423]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[443]!, self._r[443]!, [_1, _2, _3])
     }
-    public var FastTwoStepSetup_EmailHelp: String { return self._s[424]! }
-    public var Contacts_SelectAll: String { return self._s[425]! }
-    public var Privacy_ContactsReset: String { return self._s[426]! }
-    public var AttachmentMenu_File: String { return self._s[428]! }
-    public var PasscodeSettings_EncryptData: String { return self._s[429]! }
-    public var EditTheme_ThemeTemplateAlertText: String { return self._s[430]! }
+    public var FastTwoStepSetup_EmailHelp: String { return self._s[444]! }
+    public var Contacts_SelectAll: String { return self._s[445]! }
+    public var Privacy_ContactsReset: String { return self._s[446]! }
+    public var AttachmentMenu_File: String { return self._s[448]! }
+    public var PasscodeSettings_EncryptData: String { return self._s[449]! }
+    public var EditTheme_ThemeTemplateAlertText: String { return self._s[450]! }
     public func Privacy_GroupsAndChannels_InviteToChannelError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[432]!, self._r[432]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[452]!, self._r[452]!, [_0, _1])
     }
     public func Profile_CreateEncryptedChatOutdatedError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[433]!, self._r[433]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[453]!, self._r[453]!, [_0, _1])
     }
-    public var PhotoEditor_ShadowsTint: String { return self._s[435]! }
-    public var GroupInfo_ChatAdmins: String { return self._s[436]! }
-    public var ArchivedChats_IntroTitle2: String { return self._s[437]! }
-    public var Cache_LowDiskSpaceText: String { return self._s[438]! }
-    public var CreatePoll_Anonymous: String { return self._s[439]! }
-    public var Report_AdditionalDetailsText: String { return self._s[440]! }
-    public var Checkout_PaymentMethod_New: String { return self._s[441]! }
-    public var Invitation_JoinGroup: String { return self._s[442]! }
+    public var PhotoEditor_ShadowsTint: String { return self._s[455]! }
+    public var GroupInfo_ChatAdmins: String { return self._s[456]! }
+    public var ArchivedChats_IntroTitle2: String { return self._s[457]! }
+    public var Cache_LowDiskSpaceText: String { return self._s[458]! }
+    public var CreatePoll_Anonymous: String { return self._s[459]! }
+    public var Report_AdditionalDetailsText: String { return self._s[460]! }
+    public var Checkout_PaymentMethod_New: String { return self._s[461]! }
+    public var Invitation_JoinGroup: String { return self._s[462]! }
     public func Time_MonthOfYear_m4(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[445]!, self._r[445]!, [_0])
+        return formatWithArgumentRanges(self._s[465]!, self._r[465]!, [_0])
     }
-    public var CheckoutInfo_SaveInfoHelp: String { return self._s[446]! }
-    public var Notification_Reply: String { return self._s[448]! }
+    public var CheckoutInfo_SaveInfoHelp: String { return self._s[466]! }
+    public var Notification_Reply: String { return self._s[468]! }
     public func Login_PhoneBannedEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[449]!, self._r[449]!, [_0])
+        return formatWithArgumentRanges(self._s[469]!, self._r[469]!, [_0])
     }
-    public var Login_PhoneTitle: String { return self._s[450]! }
-    public var VoiceChat_UnmuteHelp: String { return self._s[451]! }
-    public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[452]! }
+    public var Login_PhoneTitle: String { return self._s[470]! }
+    public var VoiceChat_UnmuteHelp: String { return self._s[471]! }
+    public var VoiceOver_Media_PlaybackRateNormal: String { return self._s[472]! }
     public func PUSH_CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[453]!, self._r[453]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[473]!, self._r[473]!, [_1, _2, _3])
     }
-    public var Appearance_TextSize_Title: String { return self._s[454]! }
-    public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[456]! }
-    public var VoiceOver_Navigation_Compose: String { return self._s[457]! }
+    public var Appearance_TextSize_Title: String { return self._s[474]! }
+    public var NetworkUsageSettings_MediaImageDataSection: String { return self._s[476]! }
+    public var VoiceOver_Navigation_Compose: String { return self._s[477]! }
     public func Channel_AdminLog_MessageChangedAutoremoveTimeoutRemove(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[458]!, self._r[458]!, [_1])
+        return formatWithArgumentRanges(self._s[478]!, self._r[478]!, [_1])
     }
-    public var Passport_InfoText: String { return self._s[459]! }
-    public var ApplyLanguage_ApplyLanguageAction: String { return self._s[460]! }
-    public var MessagePoll_LabelClosed: String { return self._s[462]! }
-    public var AttachmentMenu_SendAsFiles: String { return self._s[463]! }
-    public var KeyCommand_FocusOnInputField: String { return self._s[464]! }
-    public var Conversation_ContextViewThread: String { return self._s[465]! }
-    public var ChatImport_SelectionErrorGroupGeneric: String { return self._s[466]! }
-    public var Privacy_SecretChatsLinkPreviews: String { return self._s[468]! }
-    public var Permissions_PeopleNearbyAllow_v0: String { return self._s[469]! }
-    public var Conversation_ContextMenuMention: String { return self._s[471]! }
-    public var CreatePoll_QuizInfo: String { return self._s[472]! }
-    public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[473]! }
-    public var Username_LinkCopied: String { return self._s[474]! }
-    public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[475]! }
-    public var TwoStepAuth_ChangePassword: String { return self._s[476]! }
-    public var Watch_Suggestion_Thanks: String { return self._s[477]! }
-    public var Channel_TitleInfo: String { return self._s[478]! }
-    public var ChatList_ChatTypesSection: String { return self._s[479]! }
+    public var Passport_InfoText: String { return self._s[479]! }
+    public var ApplyLanguage_ApplyLanguageAction: String { return self._s[480]! }
+    public var MessagePoll_LabelClosed: String { return self._s[482]! }
+    public var AttachmentMenu_SendAsFiles: String { return self._s[483]! }
+    public var KeyCommand_FocusOnInputField: String { return self._s[484]! }
+    public var Conversation_ContextViewThread: String { return self._s[485]! }
+    public var ChatImport_SelectionErrorGroupGeneric: String { return self._s[486]! }
+    public var Privacy_SecretChatsLinkPreviews: String { return self._s[488]! }
+    public var Permissions_PeopleNearbyAllow_v0: String { return self._s[489]! }
+    public var Conversation_ContextMenuMention: String { return self._s[491]! }
+    public var CreatePoll_QuizInfo: String { return self._s[492]! }
+    public var Appearance_ThemePreview_ChatList_2_Name: String { return self._s[493]! }
+    public var Username_LinkCopied: String { return self._s[494]! }
+    public var IntentsSettings_SuggestedAndSpotlightChatsInfo: String { return self._s[495]! }
+    public var TwoStepAuth_ChangePassword: String { return self._s[496]! }
+    public var Watch_Suggestion_Thanks: String { return self._s[497]! }
+    public var Channel_TitleInfo: String { return self._s[498]! }
+    public var ChatList_ChatTypesSection: String { return self._s[499]! }
     public func Watch_LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[480]!, self._r[480]!, [_0])
+        return formatWithArgumentRanges(self._s[500]!, self._r[500]!, [_0])
     }
     public func Channel_AdminLog_PollStopped(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[481]!, self._r[481]!, [_0])
+        return formatWithArgumentRanges(self._s[501]!, self._r[501]!, [_0])
     }
     public func Channel_AdminLog_MessageRemovedAdminNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[482]!, self._r[482]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[502]!, self._r[502]!, [_1, _2])
     }
-    public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[483]! }
+    public var AuthSessions_AddDevice_InvalidQRCode: String { return self._s[503]! }
     public func Call_MicrophoneOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[484]!, self._r[484]!, [_0])
+        return formatWithArgumentRanges(self._s[504]!, self._r[504]!, [_0])
     }
-    public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[485]! }
-    public var Profile_MessageLifetimeForever: String { return self._s[486]! }
-    public var ArchivedChats_IntroText1: String { return self._s[487]! }
-    public var Notifications_ChannelNotificationsPreview: String { return self._s[488]! }
-    public var Map_PullUpForPlaces: String { return self._s[490]! }
-    public var UserInfo_TelegramCall: String { return self._s[491]! }
-    public var Conversation_ShareMyContactInfo: String { return self._s[492]! }
-    public var ChatList_Tabs_All: String { return self._s[493]! }
-    public var Notification_PassportValueEmail: String { return self._s[494]! }
-    public var Notification_VideoCallIncoming: String { return self._s[495]! }
-    public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[496]! }
-    public var Channel_Username_InvalidTaken: String { return self._s[497]! }
-    public var GroupPermission_EditingDisabled: String { return self._s[498]! }
-    public var InviteLink_PeopleJoinedShortNone: String { return self._s[499]! }
-    public var ChatContextMenu_TextSelectionTip: String { return self._s[500]! }
-    public var Passport_Language_pl: String { return self._s[502]! }
-    public var Call_Accept: String { return self._s[503]! }
-    public var ChatListFolder_NameSectionHeader: String { return self._s[504]! }
-    public var InviteLink_ExpiredLinkStatus: String { return self._s[505]! }
+    public var Channel_AdminLogFilter_ChannelEventsInfo: String { return self._s[505]! }
+    public var Profile_MessageLifetimeForever: String { return self._s[506]! }
+    public var ArchivedChats_IntroText1: String { return self._s[507]! }
+    public var Notifications_ChannelNotificationsPreview: String { return self._s[508]! }
+    public var Map_PullUpForPlaces: String { return self._s[510]! }
+    public var UserInfo_TelegramCall: String { return self._s[511]! }
+    public var Conversation_ShareMyContactInfo: String { return self._s[512]! }
+    public var ChatList_Tabs_All: String { return self._s[513]! }
+    public var Notification_PassportValueEmail: String { return self._s[514]! }
+    public var Notification_VideoCallIncoming: String { return self._s[515]! }
+    public var SettingsSearch_Synonyms_Appearance_AutoNightTheme: String { return self._s[516]! }
+    public var Channel_Username_InvalidTaken: String { return self._s[517]! }
+    public var GroupPermission_EditingDisabled: String { return self._s[518]! }
+    public var InviteLink_PeopleJoinedShortNone: String { return self._s[519]! }
+    public var ChatContextMenu_TextSelectionTip: String { return self._s[520]! }
+    public var Passport_Language_pl: String { return self._s[522]! }
+    public var Call_Accept: String { return self._s[523]! }
+    public var ChatListFolder_NameSectionHeader: String { return self._s[524]! }
+    public var InviteLink_ExpiredLinkStatus: String { return self._s[525]! }
     public func Passport_Identity_NativeNameTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[506]!, self._r[506]!, [_0])
+        return formatWithArgumentRanges(self._s[526]!, self._r[526]!, [_0])
     }
-    public var ClearCache_Forever: String { return self._s[507]! }
+    public var ClearCache_Forever: String { return self._s[527]! }
+    public var VoiceChat_TapToEditTitle: String { return self._s[529]! }
     public func ChannelInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[509]!, self._r[509]!, [_0])
+        return formatWithArgumentRanges(self._s[530]!, self._r[530]!, [_0])
     }
-    public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[510]! }
-    public var Calls_SubmitRating: String { return self._s[511]! }
-    public var Location_LiveLocationRequired_ShareLocation: String { return self._s[512]! }
+    public var Group_EditAdmin_RankAdminPlaceholder: String { return self._s[531]! }
+    public var Calls_SubmitRating: String { return self._s[532]! }
+    public var Location_LiveLocationRequired_ShareLocation: String { return self._s[533]! }
     public func ChatList_AddedToFolderTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[513]!, self._r[513]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[534]!, self._r[534]!, [_1, _2])
     }
-    public var IntentsSettings_MainAccountInfo: String { return self._s[514]! }
-    public var Map_Hybrid: String { return self._s[516]! }
-    public var ChatList_Context_Archive: String { return self._s[517]! }
-    public var Message_PinnedDocumentMessage: String { return self._s[518]! }
-    public var State_ConnectingToProxyInfo: String { return self._s[519]! }
-    public var Passport_Identity_NativeNameGenericTitle: String { return self._s[521]! }
-    public var Settings_AppLanguage: String { return self._s[522]! }
+    public var IntentsSettings_MainAccountInfo: String { return self._s[535]! }
+    public var Map_Hybrid: String { return self._s[537]! }
+    public var ChatList_Context_Archive: String { return self._s[538]! }
+    public var Message_PinnedDocumentMessage: String { return self._s[539]! }
+    public var State_ConnectingToProxyInfo: String { return self._s[540]! }
+    public var Passport_Identity_NativeNameGenericTitle: String { return self._s[542]! }
+    public var Settings_AppLanguage: String { return self._s[543]! }
     public func Checkout_SavePasswordTimeoutAndFaceId(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[523]!, self._r[523]!, [_0])
+        return formatWithArgumentRanges(self._s[544]!, self._r[544]!, [_0])
     }
-    public var Notifications_PermissionsEnable: String { return self._s[525]! }
-    public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[526]! }
+    public var Notifications_PermissionsEnable: String { return self._s[546]! }
+    public var CheckoutInfo_ShippingInfoAddress1Placeholder: String { return self._s[547]! }
     public func UserInfo_BlockActionTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[527]!, self._r[527]!, [_0])
+        return formatWithArgumentRanges(self._s[548]!, self._r[548]!, [_0])
     }
     public func AuthSessions_Message(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[528]!, self._r[528]!, [_0])
+        return formatWithArgumentRanges(self._s[549]!, self._r[549]!, [_0])
     }
-    public var NotificationsSound_Aurora: String { return self._s[531]! }
-    public var ScheduledMessages_ClearAll: String { return self._s[534]! }
+    public var NotificationsSound_Aurora: String { return self._s[552]! }
+    public var ScheduledMessages_ClearAll: String { return self._s[555]! }
     public func CancelResetAccount_TextSMS(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[535]!, self._r[535]!, [_0])
+        return formatWithArgumentRanges(self._s[556]!, self._r[556]!, [_0])
     }
-    public var Settings_BlockedUsers: String { return self._s[537]! }
-    public var VoiceOver_Keyboard: String { return self._s[539]! }
+    public var Settings_BlockedUsers: String { return self._s[558]! }
+    public var Checkout_TipItem: String { return self._s[559]! }
+    public var VoiceOver_Keyboard: String { return self._s[561]! }
     public func UserInfo_StartSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[540]!, self._r[540]!, [_0])
+        return formatWithArgumentRanges(self._s[562]!, self._r[562]!, [_0])
     }
-    public var Passport_Language_hu: String { return self._s[541]! }
+    public var Passport_Language_hu: String { return self._s[563]! }
     public func Conversation_ScheduleMessage_SendTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[542]!, self._r[542]!, [_0])
+        return formatWithArgumentRanges(self._s[564]!, self._r[564]!, [_0])
     }
-    public var StickerPack_Share: String { return self._s[543]! }
-    public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[544]! }
+    public var StickerPack_Share: String { return self._s[565]! }
+    public var Checkout_NewCard_SaveInfoEnableHelp: String { return self._s[566]! }
     public func ForwardedAuthors2(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[545]!, self._r[545]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_0, _1])
     }
-    public var Privacy_ContactsResetConfirmation: String { return self._s[546]! }
-    public var VoiceChat_EditTitle: String { return self._s[547]! }
-    public var AppleWatch_ReplyPresets: String { return self._s[548]! }
-    public var Bot_GenericBotStatus: String { return self._s[549]! }
-    public var Appearance_ShareThemeColor: String { return self._s[550]! }
-    public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[551]! }
-    public var ReportGroupLocation_Title: String { return self._s[552]! }
+    public var Privacy_ContactsResetConfirmation: String { return self._s[568]! }
+    public var VoiceChat_EditTitle: String { return self._s[569]! }
+    public var AppleWatch_ReplyPresets: String { return self._s[570]! }
+    public var Bot_GenericBotStatus: String { return self._s[571]! }
+    public var Appearance_ShareThemeColor: String { return self._s[572]! }
+    public var AuthSessions_AddDevice_UrlLoginHint: String { return self._s[575]! }
+    public var ReportGroupLocation_Title: String { return self._s[576]! }
     public func Conversation_AutoremoveTimerSetUserYou(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[553]!, self._r[553]!, [_1])
+        return formatWithArgumentRanges(self._s[577]!, self._r[577]!, [_1])
     }
     public func Activity_RemindAboutUser(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[554]!, self._r[554]!, [_0])
+        return formatWithArgumentRanges(self._s[578]!, self._r[578]!, [_0])
     }
-    public var Profile_CreateEncryptedChatError: String { return self._s[555]! }
-    public var Channel_EditAdmin_TransferOwnership: String { return self._s[556]! }
-    public var Wallpaper_ErrorNotFound: String { return self._s[557]! }
-    public var Bot_GenericSupportStatus: String { return self._s[558]! }
-    public var Activity_UploadingPhoto: String { return self._s[560]! }
-    public var Intents_ErrorLockedTitle: String { return self._s[561]! }
-    public var Watch_UserInfo_Title: String { return self._s[563]! }
-    public var SocksProxySetup_ProxyTelegram: String { return self._s[564]! }
-    public var Appearance_ThemeDay: String { return self._s[565]! }
+    public var Profile_CreateEncryptedChatError: String { return self._s[579]! }
+    public var Channel_EditAdmin_TransferOwnership: String { return self._s[580]! }
+    public var Wallpaper_ErrorNotFound: String { return self._s[581]! }
+    public var Bot_GenericSupportStatus: String { return self._s[582]! }
+    public var Activity_UploadingPhoto: String { return self._s[584]! }
+    public var Intents_ErrorLockedTitle: String { return self._s[585]! }
+    public var Watch_UserInfo_Title: String { return self._s[587]! }
+    public var SocksProxySetup_ProxyTelegram: String { return self._s[588]! }
+    public var Appearance_ThemeDay: String { return self._s[589]! }
     public func ApplyLanguage_ChangeLanguageOfficialText(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[566]!, self._r[566]!, [_1])
+        return formatWithArgumentRanges(self._s[590]!, self._r[590]!, [_1])
     }
     public func FileSize_B(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[567]!, self._r[567]!, [_0])
+        return formatWithArgumentRanges(self._s[591]!, self._r[591]!, [_0])
     }
-    public var InviteLink_AdditionalLinks: String { return self._s[568]! }
-    public var Passport_Title: String { return self._s[571]! }
+    public var InviteLink_AdditionalLinks: String { return self._s[592]! }
+    public var Passport_Title: String { return self._s[596]! }
     public func Time_PreciseDate_m3(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[573]!, self._r[573]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[598]!, self._r[598]!, [_1, _2, _3])
     }
-    public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[574]! }
-    public var SocksProxySetup_ShareLink: String { return self._s[577]! }
-    public var AuthSessions_OtherDevices: String { return self._s[578]! }
-    public var IntentsSettings_SuggestedChatsGroups: String { return self._s[579]! }
-    public var Watch_MessageView_Reply: String { return self._s[580]! }
-    public var Camera_FlashOn: String { return self._s[582]! }
+    public var CheckoutInfo_ShippingInfoCountryPlaceholder: String { return self._s[599]! }
+    public var VoiceChat_OpenGroup: String { return self._s[601]! }
+    public var SocksProxySetup_ShareLink: String { return self._s[603]! }
+    public var AuthSessions_OtherDevices: String { return self._s[604]! }
+    public var IntentsSettings_SuggestedChatsGroups: String { return self._s[605]! }
+    public var Watch_MessageView_Reply: String { return self._s[606]! }
+    public var Camera_FlashOn: String { return self._s[608]! }
     public func PUSH_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[583]!, self._r[583]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[609]!, self._r[609]!, [_1, _2])
     }
-    public var Conversation_ContextMenuBlock: String { return self._s[584]! }
-    public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[586]! }
-    public var Privacy_Calls_NeverAllow: String { return self._s[587]! }
-    public var BroadcastGroups_Cancel: String { return self._s[588]! }
-    public var SharedMedia_CategoryLinks: String { return self._s[589]! }
-    public var Conversation_PinMessageAlertGroup: String { return self._s[592]! }
-    public var Passport_Identity_ScansHelp: String { return self._s[594]! }
-    public var ShareMenu_CopyShareLink: String { return self._s[595]! }
-    public var StickerSettings_MaskContextInfo: String { return self._s[596]! }
-    public var InviteLink_Create_EditTitle: String { return self._s[597]! }
-    public var SocksProxySetup_ProxyStatusChecking: String { return self._s[598]! }
-    public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[601]! }
-    public var ChatImportActivity_Success: String { return self._s[603]! }
-    public var Checkout_ErrorPrecheckoutFailed: String { return self._s[604]! }
-    public var NotificationsSound_Popcorn: String { return self._s[605]! }
-    public var FeatureDisabled_Oops: String { return self._s[606]! }
+    public var Conversation_ContextMenuBlock: String { return self._s[610]! }
+    public var Channel_EditAdmin_PermissionEditMessages: String { return self._s[612]! }
+    public var Privacy_Calls_NeverAllow: String { return self._s[613]! }
+    public var BroadcastGroups_Cancel: String { return self._s[614]! }
+    public var SharedMedia_CategoryLinks: String { return self._s[615]! }
+    public var Conversation_PinMessageAlertGroup: String { return self._s[618]! }
+    public var Passport_Identity_ScansHelp: String { return self._s[620]! }
+    public var ShareMenu_CopyShareLink: String { return self._s[621]! }
+    public var StickerSettings_MaskContextInfo: String { return self._s[622]! }
+    public var InviteLink_Create_EditTitle: String { return self._s[623]! }
+    public var SocksProxySetup_ProxyStatusChecking: String { return self._s[624]! }
+    public var TwoStepAuth_RecoveryEmailResetNoAccess: String { return self._s[625]! }
+    public var AutoDownloadSettings_AutodownloadPhotos: String { return self._s[628]! }
+    public var ChatImportActivity_Success: String { return self._s[630]! }
+    public var Checkout_ErrorPrecheckoutFailed: String { return self._s[631]! }
+    public var NotificationsSound_Popcorn: String { return self._s[632]! }
+    public var FeatureDisabled_Oops: String { return self._s[633]! }
     public func Channel_AdminLog_MessageChangedChannelAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[607]!, self._r[607]!, [_0])
+        return formatWithArgumentRanges(self._s[634]!, self._r[634]!, [_0])
     }
-    public var Notification_PinnedMessage: String { return self._s[608]! }
-    public var Tour_Title4: String { return self._s[609]! }
+    public var Notification_PinnedMessage: String { return self._s[635]! }
+    public var Tour_Title4: String { return self._s[636]! }
     public func Notification_VoiceChatInvitationForYou(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[610]!, self._r[610]!, [_1])
+        return formatWithArgumentRanges(self._s[637]!, self._r[637]!, [_1])
     }
-    public var Watch_Suggestion_OK: String { return self._s[611]! }
-    public var Compose_TokenListPlaceholder: String { return self._s[612]! }
-    public var InviteLink_PermanentLink: String { return self._s[613]! }
-    public var EditTheme_Edit_TopInfo: String { return self._s[614]! }
-    public var Gif_NoGifsFound: String { return self._s[615]! }
-    public var Login_InvalidCountryCode: String { return self._s[616]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[617]! }
-    public var Call_VoiceOver_VideoCallMissed: String { return self._s[618]! }
+    public var Watch_Suggestion_OK: String { return self._s[638]! }
+    public var Compose_TokenListPlaceholder: String { return self._s[639]! }
+    public var InviteLink_PermanentLink: String { return self._s[640]! }
+    public var EditTheme_Edit_TopInfo: String { return self._s[641]! }
+    public var Gif_NoGifsFound: String { return self._s[642]! }
+    public var Login_InvalidCountryCode: String { return self._s[643]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsExceptions: String { return self._s[644]! }
+    public var Call_VoiceOver_VideoCallMissed: String { return self._s[645]! }
+    public var VoiceChat_ChangeNameTitle: String { return self._s[647]! }
     public func PUSH_LOCKED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[620]!, self._r[620]!, [_1])
+        return formatWithArgumentRanges(self._s[648]!, self._r[648]!, [_1])
     }
-    public var Profile_CreateNewContact: String { return self._s[621]! }
-    public var AutoDownloadSettings_DataUsageLow: String { return self._s[622]! }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[623]! }
-    public var Group_Setup_TypePublic: String { return self._s[624]! }
-    public var Weekday_ShortSaturday: String { return self._s[625]! }
+    public var Profile_CreateNewContact: String { return self._s[649]! }
+    public var AutoDownloadSettings_DataUsageLow: String { return self._s[650]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsPreview: String { return self._s[651]! }
+    public var Group_Setup_TypePublic: String { return self._s[652]! }
+    public var Weekday_ShortSaturday: String { return self._s[653]! }
     public func Time_MonthOfYear_m12(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[626]!, self._r[626]!, [_0])
+        return formatWithArgumentRanges(self._s[654]!, self._r[654]!, [_0])
     }
-    public var LiveLocation_MenuStopAll: String { return self._s[627]! }
+    public var LiveLocation_MenuStopAll: String { return self._s[655]! }
     public func DialogList_EncryptedChatStartedIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[628]!, self._r[628]!, [_0])
+        return formatWithArgumentRanges(self._s[656]!, self._r[656]!, [_0])
     }
-    public var ChatListFolder_NamePlaceholder: String { return self._s[629]! }
-    public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[630]! }
+    public var ChatListFolder_NamePlaceholder: String { return self._s[657]! }
+    public var Channel_OwnershipTransfer_ErrorPublicChannelsTooMuch: String { return self._s[658]! }
     public func PUSH_CHAT_MESSAGE_GAME(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[631]!, self._r[631]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[659]!, self._r[659]!, [_1, _2, _3])
     }
-    public var VoiceChat_ChatFullAlertText: String { return self._s[632]! }
-    public var Chat_GenericPsaTooltip: String { return self._s[634]! }
-    public var ChannelInfo_CreateVoiceChat: String { return self._s[635]! }
+    public var VoiceChat_ChatFullAlertText: String { return self._s[660]! }
+    public var Chat_GenericPsaTooltip: String { return self._s[662]! }
+    public var ChannelInfo_CreateVoiceChat: String { return self._s[663]! }
     public func Message_ForwardedMessageShort(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[636]!, self._r[636]!, [_0])
+        return formatWithArgumentRanges(self._s[664]!, self._r[664]!, [_0])
     }
-    public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[637]! }
-    public var Login_PhoneAndCountryHelp: String { return self._s[638]! }
-    public var SaveIncomingPhotosSettings_From: String { return self._s[640]! }
-    public var Conversation_JumpToDate: String { return self._s[641]! }
-    public var AuthSessions_AddDevice: String { return self._s[642]! }
-    public var Settings_FAQ: String { return self._s[644]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith_Placeholder: String { return self._s[665]! }
+    public var Login_PhoneAndCountryHelp: String { return self._s[666]! }
+    public var SaveIncomingPhotosSettings_From: String { return self._s[668]! }
+    public var Conversation_JumpToDate: String { return self._s[669]! }
+    public var AuthSessions_AddDevice: String { return self._s[670]! }
+    public var Settings_FAQ: String { return self._s[672]! }
     public func ChatImport_CreateGroupAlertText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[645]!, self._r[645]!, [_0])
+        return formatWithArgumentRanges(self._s[673]!, self._r[673]!, [_0])
     }
-    public var Username_Title: String { return self._s[646]! }
-    public var DialogList_Read: String { return self._s[647]! }
-    public var Conversation_InstantPagePreview: String { return self._s[648]! }
-    public var Report_Succeed: String { return self._s[650]! }
-    public var Login_ResetAccountProtected_Title: String { return self._s[651]! }
-    public var CallFeedback_ReasonDistortedSpeech: String { return self._s[652]! }
-    public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[653]! }
+    public var Username_Title: String { return self._s[674]! }
+    public var DialogList_Read: String { return self._s[675]! }
+    public var Conversation_InstantPagePreview: String { return self._s[676]! }
+    public var Report_Succeed: String { return self._s[678]! }
+    public var Login_ResetAccountProtected_Title: String { return self._s[679]! }
+    public var CallFeedback_ReasonDistortedSpeech: String { return self._s[680]! }
+    public var Channel_EditAdmin_PermissionChangeInfo: String { return self._s[681]! }
     public func Channel_AdminLog_MessageRankUsername(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[654]!, self._r[654]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[682]!, self._r[682]!, [_1, _2, _3])
     }
-    public var WallpaperPreview_PreviewBottomText: String { return self._s[656]! }
-    public var Privacy_SecretChatsTitle: String { return self._s[659]! }
+    public var WallpaperPreview_PreviewBottomText: String { return self._s[684]! }
+    public var Privacy_SecretChatsTitle: String { return self._s[687]! }
     public func Notification_PassportValuesSentMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[660]!, self._r[660]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[688]!, self._r[688]!, [_1, _2])
     }
-    public var Checkout_NewCard_SaveInfoHelp: String { return self._s[661]! }
-    public var Conversation_ClousStorageInfo_Description4: String { return self._s[662]! }
-    public var PasscodeSettings_TurnPasscodeOn: String { return self._s[663]! }
-    public var Message_ReplyActionButtonShowReceipt: String { return self._s[664]! }
+    public var Checkout_NewCard_SaveInfoHelp: String { return self._s[689]! }
+    public var Conversation_ClousStorageInfo_Description4: String { return self._s[690]! }
+    public var PasscodeSettings_TurnPasscodeOn: String { return self._s[691]! }
+    public var Message_ReplyActionButtonShowReceipt: String { return self._s[692]! }
     public func PrivacyPolicy_AgeVerificationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[665]!, self._r[665]!, [_0])
+        return formatWithArgumentRanges(self._s[693]!, self._r[693]!, [_0])
     }
-    public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[667]! }
-    public var TwoStepAuth_ConfirmationAbort: String { return self._s[668]! }
-    public var PrivacySettings_LastSeenEverybody: String { return self._s[669]! }
-    public var CallFeedback_ReasonDropped: String { return self._s[670]! }
+    public var GroupInfo_DeleteAndExitConfirmation: String { return self._s[695]! }
+    public var TwoStepAuth_ConfirmationAbort: String { return self._s[696]! }
+    public var PrivacySettings_LastSeenEverybody: String { return self._s[697]! }
+    public var CallFeedback_ReasonDropped: String { return self._s[698]! }
     public func ScheduledMessages_ScheduledDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[671]!, self._r[671]!, [_0])
+        return formatWithArgumentRanges(self._s[699]!, self._r[699]!, [_0])
     }
-    public var WebSearch_Images: String { return self._s[672]! }
-    public var Passport_Identity_Surname: String { return self._s[673]! }
-    public var Channel_Stickers_CreateYourOwn: String { return self._s[674]! }
-    public var TwoFactorSetup_Email_Title: String { return self._s[675]! }
-    public var Cache_ClearEmpty: String { return self._s[676]! }
-    public var AuthSessions_AddDeviceIntro_Action: String { return self._s[677]! }
-    public var Theme_Context_Apply: String { return self._s[678]! }
-    public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[679]! }
-    public var CallList_DeleteAllForEveryone: String { return self._s[680]! }
+    public var WebSearch_Images: String { return self._s[700]! }
+    public var Passport_Identity_Surname: String { return self._s[701]! }
+    public var Channel_Stickers_CreateYourOwn: String { return self._s[702]! }
+    public var TwoFactorSetup_Email_Title: String { return self._s[703]! }
+    public var Cache_ClearEmpty: String { return self._s[704]! }
+    public var AuthSessions_AddDeviceIntro_Action: String { return self._s[705]! }
+    public var Theme_Context_Apply: String { return self._s[706]! }
+    public var GroupInfo_Permissions_SearchPlaceholder: String { return self._s[707]! }
+    public var CallList_DeleteAllForEveryone: String { return self._s[708]! }
     public func BroadcastGroups_Success(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[681]!, self._r[681]!, [_0])
+        return formatWithArgumentRanges(self._s[709]!, self._r[709]!, [_0])
     }
-    public var AutoDownloadSettings_DocumentsTitle: String { return self._s[682]! }
+    public var AutoDownloadSettings_DocumentsTitle: String { return self._s[710]! }
     public func NetworkUsageSettings_CellularUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[683]!, self._r[683]!, [_0])
+        return formatWithArgumentRanges(self._s[711]!, self._r[711]!, [_0])
     }
-    public var Call_StatusRinging: String { return self._s[684]! }
+    public var Call_StatusRinging: String { return self._s[712]! }
     public func Map_DistanceAway(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[685]!, self._r[685]!, [_0])
+        return formatWithArgumentRanges(self._s[713]!, self._r[713]!, [_0])
     }
     public func DialogList_SingleTypingSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[686]!, self._r[686]!, [_0])
+        return formatWithArgumentRanges(self._s[714]!, self._r[714]!, [_0])
     }
-    public var Cache_ClearNone: String { return self._s[687]! }
-    public var PrivacyPolicy_Accept: String { return self._s[688]! }
-    public var Contacts_PhoneNumber: String { return self._s[689]! }
-    public var Passport_Identity_OneOfTypePassport: String { return self._s[690]! }
-    public var PhotoEditor_HighlightsTint: String { return self._s[692]! }
-    public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[693]! }
-    public var Checkout_PaymentMethod_Title: String { return self._s[696]! }
-    public var Month_GenAugust: String { return self._s[698]! }
-    public var DialogList_Draft: String { return self._s[699]! }
-    public var ChatList_EmptyChatListFilterText: String { return self._s[700]! }
-    public var PeopleNearby_Description: String { return self._s[701]! }
-    public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[702]! }
-    public var VoiceChat_InviteLink_CopyListenerLink: String { return self._s[703]! }
-    public var VoiceChat_EditTitleRemoveSuccess: String { return self._s[704]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[706]! }
-    public var Watch_Message_ForwardedFrom: String { return self._s[707]! }
-    public var Notification_Mute1h: String { return self._s[708]! }
-    public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[709]! }
-    public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[711]! }
-    public var Channel_Edit_LinkItem: String { return self._s[712]! }
-    public var Presence_online: String { return self._s[713]! }
-    public var AutoDownloadSettings_Title: String { return self._s[714]! }
-    public var Conversation_MessageDialogRetry: String { return self._s[715]! }
-    public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[717]! }
-    public var Channel_About_Placeholder: String { return self._s[719]! }
-    public var Passport_Language_sl: String { return self._s[720]! }
-    public var AppleWatch_Title: String { return self._s[722]! }
-    public var RepliesChat_DescriptionText: String { return self._s[724]! }
-    public var Stats_Message_PrivateShares: String { return self._s[725]! }
-    public var Settings_ViewPhoto: String { return self._s[726]! }
-    public var Conversation_ForwardTooltip_SavedMessages_One: String { return self._s[727]! }
-    public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[728]! }
-    public var Cache_ClearProgress: String { return self._s[729]! }
-    public var Cache_Music: String { return self._s[730]! }
-    public var Conversation_ContextMenuShare: String { return self._s[732]! }
-    public var AutoDownloadSettings_Unlimited: String { return self._s[733]! }
-    public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[734]! }
-    public var Contacts_PermissionsAllow: String { return self._s[735]! }
-    public var Passport_Language_vi: String { return self._s[737]! }
+    public var Cache_ClearNone: String { return self._s[715]! }
+    public var PrivacyPolicy_Accept: String { return self._s[716]! }
+    public var Contacts_PhoneNumber: String { return self._s[717]! }
+    public var Passport_Identity_OneOfTypePassport: String { return self._s[718]! }
+    public var PhotoEditor_HighlightsTint: String { return self._s[720]! }
+    public var AutoDownloadSettings_AutodownloadVideos: String { return self._s[721]! }
+    public var Checkout_PaymentMethod_Title: String { return self._s[724]! }
+    public var Month_GenAugust: String { return self._s[726]! }
+    public var DialogList_Draft: String { return self._s[727]! }
+    public var ChatList_EmptyChatListFilterText: String { return self._s[728]! }
+    public var PeopleNearby_Description: String { return self._s[729]! }
+    public var WallpaperPreview_SwipeColorsBottomText: String { return self._s[730]! }
+    public var VoiceChat_InviteLink_CopyListenerLink: String { return self._s[731]! }
+    public var VoiceChat_EditTitleRemoveSuccess: String { return self._s[732]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_TopPeers: String { return self._s[734]! }
+    public var Watch_Message_ForwardedFrom: String { return self._s[735]! }
+    public var Notification_Mute1h: String { return self._s[736]! }
+    public var Appearance_ThemePreview_Chat_3_TextWithLink: String { return self._s[737]! }
+    public var SettingsSearch_Synonyms_Privacy_AuthSessions: String { return self._s[739]! }
+    public var Channel_Edit_LinkItem: String { return self._s[740]! }
+    public var Presence_online: String { return self._s[741]! }
+    public var AutoDownloadSettings_Title: String { return self._s[742]! }
+    public var Conversation_MessageDialogRetry: String { return self._s[743]! }
+    public var SettingsSearch_Synonyms_ChatSettings_OpenLinksIn: String { return self._s[745]! }
+    public var Channel_About_Placeholder: String { return self._s[747]! }
+    public var Passport_Language_sl: String { return self._s[748]! }
+    public var AppleWatch_Title: String { return self._s[750]! }
+    public var RepliesChat_DescriptionText: String { return self._s[752]! }
+    public var Stats_Message_PrivateShares: String { return self._s[753]! }
+    public var Settings_ViewPhoto: String { return self._s[754]! }
+    public var Conversation_ForwardTooltip_SavedMessages_One: String { return self._s[755]! }
+    public var ChatList_DeleteSavedMessagesConfirmation: String { return self._s[756]! }
+    public var Cache_ClearProgress: String { return self._s[757]! }
+    public var Cache_Music: String { return self._s[758]! }
+    public var Conversation_ContextMenuShare: String { return self._s[760]! }
+    public var AutoDownloadSettings_Unlimited: String { return self._s[761]! }
+    public var Channel_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[762]! }
+    public var Contacts_PermissionsAllow: String { return self._s[763]! }
+    public var Passport_Language_vi: String { return self._s[765]! }
+    public var TwoFactorSetup_PasswordRecovery_PlaceholderPassword: String { return self._s[766]! }
     public func PUSH_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[740]!, self._r[740]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[769]!, self._r[769]!, [_1, _2])
     }
-    public var Passport_Language_de: String { return self._s[741]! }
-    public var Notifications_PermissionsText: String { return self._s[743]! }
-    public var GroupRemoved_AddToGroup: String { return self._s[744]! }
-    public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[745]! }
-    public var ChangePhoneNumberCode_RequestingACall: String { return self._s[746]! }
-    public var Login_TermsOfServiceAgree: String { return self._s[747]! }
-    public var VoiceOver_Navigation_ProxySettings: String { return self._s[748]! }
+    public var Passport_Language_de: String { return self._s[770]! }
+    public var Notifications_PermissionsText: String { return self._s[772]! }
+    public var GroupRemoved_AddToGroup: String { return self._s[773]! }
+    public var Appearance_ThemePreview_ChatList_4_Text: String { return self._s[774]! }
+    public var ChangePhoneNumberCode_RequestingACall: String { return self._s[775]! }
+    public var Login_TermsOfServiceAgree: String { return self._s[776]! }
+    public var VoiceOver_Navigation_ProxySettings: String { return self._s[777]! }
     public func PUSH_CHAT_JOINED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[749]!, self._r[749]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[778]!, self._r[778]!, [_1, _2])
     }
-    public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[751]! }
+    public var SettingsSearch_Synonyms_Data_CallsUseLessData: String { return self._s[780]! }
+    public var VoiceChat_VideoPreviewStopScreenSharing: String { return self._s[781]! }
     public func PUSH_CHAT_VOICECHAT_START(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[752]!, self._r[752]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[782]!, self._r[782]!, [_1, _2])
     }
-    public var ChatListFolder_NameGroups: String { return self._s[753]! }
-    public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[754]! }
+    public var ChatListFolder_NameGroups: String { return self._s[783]! }
+    public var SocksProxySetup_ProxyDetailsTitle: String { return self._s[784]! }
+    public var VoiceChat_EditDescriptionSave: String { return self._s[785]! }
     public func Channel_AdminLog_MessageChangedLinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[755]!, self._r[755]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_1, _2])
     }
-    public var Watch_Suggestion_TalkLater: String { return self._s[756]! }
-    public var Checkout_ShippingOption_Title: String { return self._s[757]! }
-    public var Conversation_TitleRepliesEmpty: String { return self._s[758]! }
-    public var CreatePoll_TextHeader: String { return self._s[759]! }
-    public var VoiceOver_Chat_Message: String { return self._s[761]! }
-    public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[762]! }
-    public var ContactInfo_Note: String { return self._s[764]! }
-    public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[765]! }
-    public var Checkout_NewCard_CardholderNameTitle: String { return self._s[766]! }
-    public var AutoDownloadSettings_Photos: String { return self._s[767]! }
-    public var UserInfo_NotificationsDefaultDisabled: String { return self._s[768]! }
+    public var Watch_Suggestion_TalkLater: String { return self._s[787]! }
+    public var Checkout_ShippingOption_Title: String { return self._s[788]! }
+    public var Conversation_TitleRepliesEmpty: String { return self._s[789]! }
+    public var CreatePoll_TextHeader: String { return self._s[790]! }
+    public var VoiceOver_Chat_Message: String { return self._s[792]! }
+    public var InfoPlist_NSLocationWhenInUseUsageDescription: String { return self._s[793]! }
+    public var ContactInfo_Note: String { return self._s[795]! }
+    public var Channel_AdminLog_InfoPanelAlertText: String { return self._s[796]! }
+    public var Checkout_NewCard_CardholderNameTitle: String { return self._s[797]! }
+    public var AutoDownloadSettings_Photos: String { return self._s[798]! }
+    public var UserInfo_NotificationsDefaultDisabled: String { return self._s[799]! }
     public func Conversation_ForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[769]!, self._r[769]!, [_0])
+        return formatWithArgumentRanges(self._s[800]!, self._r[800]!, [_0])
     }
-    public var Channel_Info_Subscribers: String { return self._s[770]! }
-    public var ChatList_DeleteForCurrentUser: String { return self._s[771]! }
-    public var ChatListFolderSettings_FoldersSection: String { return self._s[772]! }
-    public var VoiceOver_ChatList_OutgoingMessage: String { return self._s[773]! }
+    public var Channel_Info_Subscribers: String { return self._s[801]! }
+    public var ChatList_DeleteForCurrentUser: String { return self._s[802]! }
+    public var ChatListFolderSettings_FoldersSection: String { return self._s[803]! }
+    public var ChannelInfo_ScheduleVoiceChat: String { return self._s[804]! }
+    public var VoiceOver_ChatList_OutgoingMessage: String { return self._s[805]! }
     public func Time_PreciseDate_m9(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[777]!, self._r[777]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[809]!, self._r[809]!, [_1, _2, _3])
     }
-    public var AutoNightTheme_System: String { return self._s[778]! }
-    public var Call_StatusWaiting: String { return self._s[779]! }
-    public var GroupInfo_GroupHistoryHidden: String { return self._s[780]! }
+    public var AutoNightTheme_System: String { return self._s[810]! }
+    public var Call_StatusWaiting: String { return self._s[811]! }
+    public var GroupInfo_GroupHistoryHidden: String { return self._s[812]! }
     public func CHAT_MESSAGE_INVOICE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[781]!, self._r[781]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[813]!, self._r[813]!, [_1, _2, _3])
     }
-    public var Conversation_ContextMenuCopy: String { return self._s[783]! }
-    public var Notifications_MessageNotificationsPreview: String { return self._s[784]! }
-    public var Notifications_InAppNotificationsVibrate: String { return self._s[785]! }
+    public var Conversation_ContextMenuCopy: String { return self._s[815]! }
+    public var Notifications_MessageNotificationsPreview: String { return self._s[816]! }
+    public var Notifications_InAppNotificationsVibrate: String { return self._s[817]! }
     public func Conversation_RestrictedTextTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[786]!, self._r[786]!, [_0])
+        return formatWithArgumentRanges(self._s[818]!, self._r[818]!, [_0])
     }
-    public var Group_Status: String { return self._s[788]! }
-    public var Group_Setup_HistoryVisible: String { return self._s[789]! }
-    public var Conversation_UploadFileTooLarge: String { return self._s[790]! }
-    public var Conversation_DiscardVoiceMessageAction: String { return self._s[791]! }
-    public var Paint_Edit: String { return self._s[792]! }
-    public var PeerInfo_AutoremoveMessages: String { return self._s[793]! }
+    public var Group_Status: String { return self._s[820]! }
+    public var Group_Setup_HistoryVisible: String { return self._s[821]! }
+    public var Conversation_UploadFileTooLarge: String { return self._s[822]! }
+    public var Conversation_DiscardVoiceMessageAction: String { return self._s[823]! }
+    public var Paint_Edit: String { return self._s[824]! }
+    public var PeerInfo_AutoremoveMessages: String { return self._s[825]! }
     public func ChatImport_SelectionConfirmationGroupWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[795]!, self._r[795]!, [_0])
+        return formatWithArgumentRanges(self._s[827]!, self._r[827]!, [_0])
     }
-    public var Channel_EditAdmin_CannotEdit: String { return self._s[796]! }
-    public var Username_InvalidTooShort: String { return self._s[797]! }
-    public var ClearCache_StorageOtherApps: String { return self._s[798]! }
-    public var Conversation_ViewMessage: String { return self._s[799]! }
-    public var GroupInfo_PublicLinkAdd: String { return self._s[801]! }
+    public var Channel_EditAdmin_CannotEdit: String { return self._s[828]! }
+    public var Username_InvalidTooShort: String { return self._s[829]! }
+    public var ClearCache_StorageOtherApps: String { return self._s[831]! }
+    public var Conversation_ViewMessage: String { return self._s[832]! }
+    public var GroupInfo_PublicLinkAdd: String { return self._s[834]! }
     public func Notification_RemovedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[802]!, self._r[802]!, [_0])
+        return formatWithArgumentRanges(self._s[835]!, self._r[835]!, [_0])
     }
-    public var CallSettings_Title: String { return self._s[803]! }
+    public var CallSettings_Title: String { return self._s[836]! }
     public func Conversation_BotInteractiveUrlAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[804]!, self._r[804]!, [_0])
-    }
-    public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[807]!, self._r[807]!, [_0])
-    }
-    public var PUSH_SENDER_YOU: String { return self._s[810]! }
-    public func Conversation_DeletedFromContacts(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[811]!, self._r[811]!, [_0])
-    }
-    public var Profile_ShareContactButton: String { return self._s[812]! }
-    public var GroupInfo_Permissions_SectionTitle: String { return self._s[813]! }
-    public func VoiceOver_Chat_StickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[814]!, self._r[814]!, [_0])
-    }
-    public var Map_ShareLiveLocation: String { return self._s[815]! }
-    public var ChatListFolder_TitleEdit: String { return self._s[816]! }
-    public func VoiceOver_Chat_AnimatedStickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[817]!, self._r[817]!, [_0])
-    }
-    public var Passport_Address_Address: String { return self._s[819]! }
-    public var LastSeen_JustNow: String { return self._s[821]! }
-    public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[822]!, self._r[822]!, [_0])
-    }
-    public var ContactInfo_PhoneLabelOther: String { return self._s[823]! }
-    public var PasscodeSettings_DoNotMatch: String { return self._s[824]! }
-    public var Weekday_Today: String { return self._s[827]! }
-    public var DialogList_Title: String { return self._s[828]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[829]! }
-    public var Cache_ClearCache: String { return self._s[830]! }
-    public var CreatePoll_ExplanationInfo: String { return self._s[831]! }
-    public var Notifications_ResetAllNotificationsHelp: String { return self._s[833]! }
-    public var Stats_MessageTitle: String { return self._s[834]! }
-    public var Passport_Address_Street: String { return self._s[836]! }
-    public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[837]!, self._r[837]!, [_0])
     }
-    public var Channel_AdminLog_ChannelEmptyText: String { return self._s[838]! }
-    public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[839]!, self._r[839]!, [_0])
+    public func VoiceOver_Chat_ContactFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[840]!, self._r[840]!, [_0])
     }
-    public var TwoStepAuth_Email: String { return self._s[841]! }
-    public var Conversation_SecretLinkPreviewAlert: String { return self._s[842]! }
-    public var PrivacySettings_PasscodeOn: String { return self._s[843]! }
-    public var Camera_SquareMode: String { return self._s[845]! }
-    public var SocksProxySetup_Port: String { return self._s[846]! }
-    public var Watch_LastSeen_JustNow: String { return self._s[848]! }
+    public var PUSH_SENDER_YOU: String { return self._s[843]! }
+    public func Conversation_DeletedFromContacts(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[844]!, self._r[844]!, [_0])
+    }
+    public var Profile_ShareContactButton: String { return self._s[845]! }
+    public var GroupInfo_Permissions_SectionTitle: String { return self._s[846]! }
+    public func VoiceOver_Chat_StickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[847]!, self._r[847]!, [_0])
+    }
+    public var Map_ShareLiveLocation: String { return self._s[848]! }
+    public var ChatListFolder_TitleEdit: String { return self._s[849]! }
+    public func VoiceOver_Chat_AnimatedStickerFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_0])
+    }
+    public var Passport_Address_Address: String { return self._s[852]! }
+    public var LastSeen_JustNow: String { return self._s[854]! }
+    public func SecretImage_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[855]!, self._r[855]!, [_0])
+    }
+    public var ContactInfo_PhoneLabelOther: String { return self._s[856]! }
+    public var PasscodeSettings_DoNotMatch: String { return self._s[857]! }
+    public var Weekday_Today: String { return self._s[860]! }
+    public var DialogList_Title: String { return self._s[861]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsPreview: String { return self._s[862]! }
+    public var Cache_ClearCache: String { return self._s[863]! }
+    public var CreatePoll_ExplanationInfo: String { return self._s[864]! }
+    public var Notifications_ResetAllNotificationsHelp: String { return self._s[866]! }
+    public var Stats_MessageTitle: String { return self._s[867]! }
+    public var Passport_Address_Street: String { return self._s[869]! }
+    public func Channel_AdminLog_MessageRemovedGroupUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_0])
+    }
+    public var Channel_AdminLog_ChannelEmptyText: String { return self._s[871]! }
+    public func Login_PhoneGenericEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[872]!, self._r[872]!, [_0])
+    }
+    public var TwoStepAuth_Email: String { return self._s[874]! }
+    public var Conversation_SecretLinkPreviewAlert: String { return self._s[875]! }
+    public var PrivacySettings_PasscodeOn: String { return self._s[876]! }
+    public var Camera_SquareMode: String { return self._s[878]! }
+    public var SocksProxySetup_Port: String { return self._s[879]! }
+    public var Watch_LastSeen_JustNow: String { return self._s[881]! }
     public func Location_ProximityAlertSetText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[849]!, self._r[849]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[882]!, self._r[882]!, [_1, _2])
     }
     public func PUSH_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[850]!, self._r[850]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[883]!, self._r[883]!, [_1, _2])
     }
     public func Watch_LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[851]!, self._r[851]!, [_0])
+        return formatWithArgumentRanges(self._s[884]!, self._r[884]!, [_0])
     }
-    public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[852]! }
-    public var Channel_AdminLogFilter_EventsTitle: String { return self._s[853]! }
-    public var Watch_Suggestion_HoldOn: String { return self._s[856]! }
+    public var VoiceChat_CancelVoiceChat: String { return self._s[885]! }
+    public var EditTheme_Expand_Preview_OutgoingText: String { return self._s[886]! }
+    public var Channel_AdminLogFilter_EventsTitle: String { return self._s[887]! }
+    public var Watch_Suggestion_HoldOn: String { return self._s[890]! }
     public func PUSH_CHANNEL_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[857]!, self._r[857]!, [_1])
+        return formatWithArgumentRanges(self._s[891]!, self._r[891]!, [_1])
     }
-    public var CallSettings_TabIcon: String { return self._s[858]! }
-    public var ScheduledMessages_SendNow: String { return self._s[859]! }
-    public var Stats_GroupTopWeekdaysTitle: String { return self._s[860]! }
-    public var UserInfo_PhoneCall: String { return self._s[861]! }
-    public var Month_GenMarch: String { return self._s[862]! }
-    public var Camera_Discard: String { return self._s[863]! }
-    public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[864]! }
-    public var Passport_RequestedInformation: String { return self._s[865]! }
-    public var VoiceChat_RecordingTitlePlaceholder: String { return self._s[867]! }
+    public var CallSettings_TabIcon: String { return self._s[892]! }
+    public var ScheduledMessages_SendNow: String { return self._s[893]! }
+    public var Stats_GroupTopWeekdaysTitle: String { return self._s[894]! }
+    public var ImportStickerPack_NamePlaceholder: String { return self._s[895]! }
+    public var UserInfo_PhoneCall: String { return self._s[896]! }
+    public var Month_GenMarch: String { return self._s[897]! }
+    public var Camera_Discard: String { return self._s[898]! }
+    public var InfoPlist_NSFaceIDUsageDescription: String { return self._s[899]! }
+    public var Passport_RequestedInformation: String { return self._s[900]! }
+    public var VoiceChat_RecordingTitlePlaceholder: String { return self._s[902]! }
     public func Notification_ProximityYouReached(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[868]!, self._r[868]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[903]!, self._r[903]!, [_1, _2])
     }
-    public var Passport_Language_ro: String { return self._s[869]! }
+    public var Passport_Language_ro: String { return self._s[904]! }
     public func PUSH_CHAT_MESSAGE_DOC(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[870]!, self._r[870]!, [_1, _2])
-    }
-    public var AutoDownloadSettings_ResetHelp: String { return self._s[871]! }
-    public var Passport_Identity_DocumentDetails: String { return self._s[873]! }
-    public var Passport_Address_ScansHelp: String { return self._s[874]! }
-    public var Location_LiveLocationRequired_Title: String { return self._s[875]! }
-    public var ClearCache_StorageCache: String { return self._s[876]! }
-    public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[877]! }
-    public var Conversation_RestrictedText: String { return self._s[878]! }
-    public var Notifications_MessageNotifications: String { return self._s[880]! }
-    public var Passport_Scans: String { return self._s[881]! }
-    public var TwoStepAuth_SetupHintTitle: String { return self._s[883]! }
-    public var LogoutOptions_ContactSupportTitle: String { return self._s[884]! }
-    public var Passport_Identity_SelfieHelp: String { return self._s[885]! }
-    public var Permissions_NotificationsUnreachableText_v0: String { return self._s[886]! }
-    public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[887]! }
-    public var ShareMenu_CopyShareLinkGame: String { return self._s[888]! }
-    public var PeerInfo_ButtonSearch: String { return self._s[889]! }
-    public func Notification_ProximityReachedYou(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[892]!, self._r[892]!, [_1, _2])
-    }
-    public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[893]! }
-    public var Passport_FieldIdentityTranslationHelp: String { return self._s[895]! }
-    public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[896]! }
-    public var Month_GenSeptember: String { return self._s[897]! }
-    public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[899]!, self._r[899]!, [_1, _2])
-    }
-    public var StickerPacksSettings_ArchivedPacks: String { return self._s[900]! }
-    public func Notification_VoiceChatInvitation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[902]!, self._r[902]!, [_1, _2])
-    }
-    public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[903]!, self._r[903]!, [_0])
-    }
-    public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[905]!, self._r[905]!, [_1, _2])
     }
+    public var AutoDownloadSettings_ResetHelp: String { return self._s[906]! }
+    public var Passport_Identity_DocumentDetails: String { return self._s[908]! }
+    public var Passport_Address_ScansHelp: String { return self._s[909]! }
+    public var Location_LiveLocationRequired_Title: String { return self._s[910]! }
+    public var WallpaperPreview_PreviewBottomTextAnimatable: String { return self._s[911]! }
+    public var ClearCache_StorageCache: String { return self._s[912]! }
+    public var Theme_Colors_ColorWallpaperWarningProceed: String { return self._s[913]! }
+    public var Conversation_RestrictedText: String { return self._s[914]! }
+    public var Notifications_MessageNotifications: String { return self._s[916]! }
+    public var Passport_Scans: String { return self._s[917]! }
+    public func VoiceChat_StatusStartsIn(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[919]!, self._r[919]!, [_0])
+    }
+    public var TwoStepAuth_SetupHintTitle: String { return self._s[920]! }
+    public var LogoutOptions_ContactSupportTitle: String { return self._s[921]! }
+    public var Passport_Identity_SelfieHelp: String { return self._s[922]! }
+    public var Permissions_NotificationsUnreachableText_v0: String { return self._s[923]! }
+    public var Privacy_PaymentsClear_PaymentInfo: String { return self._s[924]! }
+    public var ShareMenu_CopyShareLinkGame: String { return self._s[925]! }
+    public var PeerInfo_ButtonSearch: String { return self._s[926]! }
+    public func Notification_ProximityReachedYou(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[929]!, self._r[929]!, [_1, _2])
+    }
+    public var SettingsSearch_Synonyms_Privacy_Data_ClearPaymentsInfo: String { return self._s[930]! }
+    public var Passport_FieldIdentityTranslationHelp: String { return self._s[932]! }
+    public var Conversation_InputTextSilentBroadcastPlaceholder: String { return self._s[933]! }
+    public var Month_GenSeptember: String { return self._s[934]! }
+    public func Call_GroupFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[936]!, self._r[936]!, [_1, _2])
+    }
+    public var StickerPacksSettings_ArchivedPacks: String { return self._s[937]! }
+    public func Notification_VoiceChatInvitation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[939]!, self._r[939]!, [_1, _2])
+    }
+    public func Channel_Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[940]!, self._r[940]!, [_0])
+    }
+    public func PUSH_PINNED_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_1, _2])
+    }
     public func PUSH_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[906]!, self._r[906]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[943]!, self._r[943]!, [_1, _2])
     }
-    public var Calls_NotNow: String { return self._s[908]! }
-    public var Settings_ChatFolders: String { return self._s[912]! }
-    public var Login_PadPhoneHelpTitle: String { return self._s[913]! }
-    public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[914]! }
-    public var Widget_MessageAutoremoveTimerRemoved: String { return self._s[915]! }
-    public var VoiceChat_RecordingSaved: String { return self._s[916]! }
-    public var Settings_ChatBackground: String { return self._s[917]! }
+    public var Calls_NotNow: String { return self._s[945]! }
+    public var Settings_ChatFolders: String { return self._s[950]! }
+    public var Login_PadPhoneHelpTitle: String { return self._s[951]! }
+    public var TwoStepAuth_EnterPasswordInvalid: String { return self._s[952]! }
+    public var Widget_MessageAutoremoveTimerRemoved: String { return self._s[953]! }
+    public var VoiceChat_RecordingSaved: String { return self._s[954]! }
+    public var Settings_ChatBackground: String { return self._s[955]! }
     public func PUSH_CHAT_MESSAGE_CONTACT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[919]!, self._r[919]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[957]!, self._r[957]!, [_1, _2])
     }
-    public var ProxyServer_VoiceOver_Active: String { return self._s[920]! }
-    public var Call_StatusBusy: String { return self._s[921]! }
-    public var Conversation_MessageDeliveryFailed: String { return self._s[922]! }
-    public var Login_NetworkError: String { return self._s[924]! }
-    public var TwoStepAuth_SetupPasswordDescription: String { return self._s[925]! }
-    public var Privacy_Calls_Integration: String { return self._s[926]! }
-    public var DialogList_SearchSectionMessages: String { return self._s[927]! }
-    public var AutoDownloadSettings_VideosTitle: String { return self._s[928]! }
-    public var Preview_DeletePhoto: String { return self._s[929]! }
-    public var PrivacySettings_PhoneNumber: String { return self._s[931]! }
-    public var Forward_ErrorDisabledForChat: String { return self._s[932]! }
-    public var Watch_Compose_CurrentLocation: String { return self._s[933]! }
-    public var Settings_CallSettings: String { return self._s[934]! }
-    public var AutoDownloadSettings_TypePrivateChats: String { return self._s[935]! }
-    public var Conversation_StickerRemovedFromFavorites: String { return self._s[936]! }
-    public var ChatList_Context_MarkAllAsRead: String { return self._s[937]! }
-    public var ChatSettings_AutoPlayAnimations: String { return self._s[938]! }
-    public var SaveIncomingPhotosSettings_Title: String { return self._s[939]! }
-    public var OwnershipTransfer_SecurityRequirements: String { return self._s[940]! }
-    public var Map_LiveLocationFor1Hour: String { return self._s[941]! }
+    public var ProxyServer_VoiceOver_Active: String { return self._s[958]! }
+    public var Call_StatusBusy: String { return self._s[959]! }
+    public var Conversation_MessageDeliveryFailed: String { return self._s[960]! }
+    public var Login_NetworkError: String { return self._s[962]! }
+    public var TwoStepAuth_SetupPasswordDescription: String { return self._s[963]! }
+    public var Privacy_Calls_Integration: String { return self._s[964]! }
+    public var DialogList_SearchSectionMessages: String { return self._s[965]! }
+    public var AutoDownloadSettings_VideosTitle: String { return self._s[966]! }
+    public var Preview_DeletePhoto: String { return self._s[967]! }
+    public var VoiceChat_Video: String { return self._s[968]! }
+    public var PrivacySettings_PhoneNumber: String { return self._s[970]! }
+    public var Forward_ErrorDisabledForChat: String { return self._s[971]! }
+    public var Watch_Compose_CurrentLocation: String { return self._s[972]! }
+    public var Settings_CallSettings: String { return self._s[973]! }
+    public var TwoFactorRemember_Done_Action: String { return self._s[974]! }
+    public var AutoDownloadSettings_TypePrivateChats: String { return self._s[975]! }
+    public var Conversation_StickerRemovedFromFavorites: String { return self._s[976]! }
+    public var ChatList_Context_MarkAllAsRead: String { return self._s[977]! }
+    public var ChatSettings_AutoPlayAnimations: String { return self._s[978]! }
+    public var SaveIncomingPhotosSettings_Title: String { return self._s[979]! }
+    public var OwnershipTransfer_SecurityRequirements: String { return self._s[980]! }
+    public var Map_LiveLocationFor1Hour: String { return self._s[981]! }
     public func Privacy_GroupsAndChannels_InviteToGroupError(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[942]!, self._r[942]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[982]!, self._r[982]!, [_0, _1])
     }
-    public var VoiceChat_MutedByAdmin: String { return self._s[943]! }
+    public var VoiceChat_MutedByAdmin: String { return self._s[983]! }
     public func Notification_PinnedLiveLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[944]!, self._r[944]!, [_0])
+        return formatWithArgumentRanges(self._s[984]!, self._r[984]!, [_0])
     }
-    public var Conversation_UnvotePoll: String { return self._s[945]! }
-    public var TwoStepAuth_EnterEmailCode: String { return self._s[946]! }
+    public var Conversation_UnvotePoll: String { return self._s[985]! }
+    public var TwoStepAuth_EnterEmailCode: String { return self._s[986]! }
     public func LOCAL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[947]!, self._r[947]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[987]!, self._r[987]!, [_1, "\(_2)"])
     }
-    public var Passport_InfoTitle: String { return self._s[948]! }
+    public var Passport_InfoTitle: String { return self._s[988]! }
     public func Conversation_Bytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[949]!, self._r[949]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[989]!, self._r[989]!, ["\(_0)"])
     }
-    public var AccentColor_Title: String { return self._s[950]! }
+    public var AccentColor_Title: String { return self._s[990]! }
     public func PUSH_MESSAGE_INVOICE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[951]!, self._r[951]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[991]!, self._r[991]!, [_1, _2])
     }
     public func Notification_JoinedChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[954]!, self._r[954]!, [_0])
+        return formatWithArgumentRanges(self._s[994]!, self._r[994]!, [_0])
     }
-    public var AutoDownloadSettings_DataUsageCustom: String { return self._s[955]! }
-    public var Conversation_ShareBotLocationConfirmation: String { return self._s[956]! }
-    public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[957]! }
-    public var VoiceOver_Editing_ClearText: String { return self._s[958]! }
-    public var Conversation_Unarchive: String { return self._s[959]! }
-    public var Notification_CallOutgoing: String { return self._s[960]! }
-    public var Channel_Setup_PublicNoLink: String { return self._s[961]! }
-    public var Passport_Identity_GenderPlaceholder: String { return self._s[962]! }
-    public var Message_Animation: String { return self._s[963]! }
-    public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[964]! }
-    public var ChatSettings_ConnectionType_Title: String { return self._s[965]! }
+    public var AutoDownloadSettings_DataUsageCustom: String { return self._s[995]! }
+    public var Conversation_ShareBotLocationConfirmation: String { return self._s[996]! }
+    public var PrivacyPhoneNumberSettings_WhoCanSeeMyPhoneNumber: String { return self._s[997]! }
+    public var VoiceOver_Editing_ClearText: String { return self._s[998]! }
+    public var Conversation_Unarchive: String { return self._s[999]! }
+    public var Notification_CallOutgoing: String { return self._s[1000]! }
+    public var Channel_Setup_PublicNoLink: String { return self._s[1001]! }
+    public var Passport_Identity_GenderPlaceholder: String { return self._s[1002]! }
+    public var Message_Animation: String { return self._s[1003]! }
+    public var SettingsSearch_Synonyms_Appearance_Animations: String { return self._s[1004]! }
+    public var ChatSettings_ConnectionType_Title: String { return self._s[1005]! }
     public func Watch_Time_ShortFullAt(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[966]!, self._r[966]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1006]!, self._r[1006]!, [_1, _2])
     }
     public func VoiceChat_StatusSpeakingVolume(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[967]!, self._r[967]!, [_0])
+        return formatWithArgumentRanges(self._s[1007]!, self._r[1007]!, [_0])
     }
-    public var Notification_CallBack: String { return self._s[968]! }
-    public var Appearance_Title: String { return self._s[971]! }
-    public var NotificationsSound_Glass: String { return self._s[973]! }
-    public var AutoDownloadSettings_CellularTitle: String { return self._s[975]! }
-    public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[977]! }
-    public var ChatSearch_SearchPlaceholder: String { return self._s[978]! }
-    public var Passport_Identity_AddPassport: String { return self._s[979]! }
-    public var GroupPermission_NoAddMembers: String { return self._s[981]! }
-    public var ContactList_Context_SendMessage: String { return self._s[982]! }
-    public var PhotoEditor_GrainTool: String { return self._s[983]! }
-    public var Settings_CopyPhoneNumber: String { return self._s[984]! }
-    public var Passport_Address_City: String { return self._s[985]! }
-    public var ChannelRemoved_RemoveInfo: String { return self._s[986]! }
-    public var SocksProxySetup_Password: String { return self._s[988]! }
-    public var Settings_Passport: String { return self._s[989]! }
-    public var Channel_MessagePhotoUpdated: String { return self._s[991]! }
-    public var Stats_LanguagesTitle: String { return self._s[992]! }
-    public var ChatList_PeerTypeGroup: String { return self._s[993]! }
-    public var Privacy_Calls_P2PHelp: String { return self._s[994]! }
-    public var VoiceOver_Chat_PollNoVotes: String { return self._s[995]! }
-    public var Embed_PlayingInPIP: String { return self._s[996]! }
-    public var BlockedUsers_BlockUser: String { return self._s[999]! }
-    public var Login_CancelPhoneVerificationContinue: String { return self._s[1000]! }
+    public var Notification_CallBack: String { return self._s[1008]! }
+    public var Appearance_Title: String { return self._s[1011]! }
+    public var NotificationsSound_Glass: String { return self._s[1013]! }
+    public var AutoDownloadSettings_CellularTitle: String { return self._s[1015]! }
+    public var Notifications_PermissionsSuppressWarningTitle: String { return self._s[1017]! }
+    public var ChatSearch_SearchPlaceholder: String { return self._s[1018]! }
+    public var Passport_Identity_AddPassport: String { return self._s[1019]! }
+    public var GroupPermission_NoAddMembers: String { return self._s[1021]! }
+    public var ContactList_Context_SendMessage: String { return self._s[1022]! }
+    public var PhotoEditor_GrainTool: String { return self._s[1023]! }
+    public var Settings_CopyPhoneNumber: String { return self._s[1024]! }
+    public var Passport_Address_City: String { return self._s[1025]! }
+    public var VoiceChat_LeaveAndCancelVoiceChat: String { return self._s[1026]! }
+    public var ChannelRemoved_RemoveInfo: String { return self._s[1027]! }
+    public var SocksProxySetup_Password: String { return self._s[1029]! }
+    public var Settings_Passport: String { return self._s[1030]! }
+    public var Channel_MessagePhotoUpdated: String { return self._s[1032]! }
+    public var Stats_LanguagesTitle: String { return self._s[1033]! }
+    public var ChatList_PeerTypeGroup: String { return self._s[1034]! }
+    public var Privacy_Calls_P2PHelp: String { return self._s[1035]! }
+    public var VoiceOver_Chat_PollNoVotes: String { return self._s[1036]! }
+    public var Embed_PlayingInPIP: String { return self._s[1037]! }
+    public var ImportStickerPack_GeneratingLink: String { return self._s[1039]! }
+    public var BlockedUsers_BlockUser: String { return self._s[1041]! }
+    public var Login_CancelPhoneVerificationContinue: String { return self._s[1042]! }
     public func PUSH_CHANNEL_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1001]!, self._r[1001]!, [_1])
+        return formatWithArgumentRanges(self._s[1043]!, self._r[1043]!, [_1])
     }
-    public var AuthSessions_LoggedIn: String { return self._s[1002]! }
-    public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[1003]! }
-    public var Activity_UploadingDocument: String { return self._s[1004]! }
-    public var PeopleNearby_NoMembers: String { return self._s[1005]! }
-    public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1008]! }
-    public var ChatSettings_AutoPlayVideos: String { return self._s[1009]! }
-    public var VoiceOver_Chat_OpenLinkHint: String { return self._s[1010]! }
-    public var InstantPage_VoiceOver_IncreaseFontSize: String { return self._s[1011]! }
-    public var Settings_ViewVideo: String { return self._s[1012]! }
-    public var Map_ShowPlaces: String { return self._s[1014]! }
-    public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1015]! }
-    public var InviteLink_Create_Title: String { return self._s[1016]! }
-    public var Notification_CreatedGroup: String { return self._s[1017]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[1018]! }
+    public var AuthSessions_LoggedIn: String { return self._s[1044]! }
+    public var Channel_AdminLog_MessagePreviousCaption: String { return self._s[1045]! }
+    public var Activity_UploadingDocument: String { return self._s[1046]! }
+    public var PeopleNearby_NoMembers: String { return self._s[1047]! }
+    public var TwoFactorRemember_Text: String { return self._s[1049]! }
+    public var SettingsSearch_Synonyms_Stickers_Masks: String { return self._s[1051]! }
+    public var ChatSettings_AutoPlayVideos: String { return self._s[1052]! }
+    public var VoiceOver_Chat_OpenLinkHint: String { return self._s[1053]! }
+    public var InstantPage_VoiceOver_IncreaseFontSize: String { return self._s[1054]! }
+    public var Settings_ViewVideo: String { return self._s[1055]! }
+    public var Map_ShowPlaces: String { return self._s[1057]! }
+    public var Passport_Phone_UseTelegramNumberHelp: String { return self._s[1058]! }
+    public var InviteLink_Create_Title: String { return self._s[1059]! }
+    public var Notification_CreatedGroup: String { return self._s[1060]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground_Custom: String { return self._s[1061]! }
     public func PrivacySettings_LastSeenContactsPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1019]!, self._r[1019]!, [_0])
+        return formatWithArgumentRanges(self._s[1062]!, self._r[1062]!, [_0])
     }
-    public var Conversation_StatusLeftGroup: String { return self._s[1020]! }
-    public var Theme_Colors_Messages: String { return self._s[1021]! }
-    public var AuthSessions_EmptyText: String { return self._s[1022]! }
+    public var Conversation_StatusLeftGroup: String { return self._s[1063]! }
+    public var Theme_Colors_Messages: String { return self._s[1064]! }
+    public var AuthSessions_EmptyText: String { return self._s[1065]! }
     public func PUSH_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1023]!, self._r[1023]!, [_1])
+        return formatWithArgumentRanges(self._s[1066]!, self._r[1066]!, [_1])
     }
-    public var UserInfo_StartSecretChat: String { return self._s[1024]! }
-    public var ChatListFolderSettings_EditFoldersInfo: String { return self._s[1025]! }
-    public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[1026]! }
-    public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1027]! }
-    public var Conversation_PrivateMessageLinkCopied: String { return self._s[1029]! }
-    public var PeerInfo_PaneFiles: String { return self._s[1030]! }
-    public var VoiceChat_DisplayAs: String { return self._s[1031]! }
-    public var PrivacySettings_AutoArchive: String { return self._s[1032]! }
-    public var Camera_VideoMode: String { return self._s[1033]! }
-    public var NotificationsSound_Alert: String { return self._s[1034]! }
-    public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1035]! }
-    public var Appearance_AutoNightTheme: String { return self._s[1036]! }
-    public var Passport_Language_he: String { return self._s[1037]! }
-    public var Passport_InvalidPasswordError: String { return self._s[1038]! }
-    public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1039]! }
-    public var UserInfo_InviteBotToGroup: String { return self._s[1040]! }
-    public var Conversation_SilentBroadcastTooltipOff: String { return self._s[1041]! }
-    public var Common_TakePhoto: String { return self._s[1042]! }
+    public var UserInfo_StartSecretChat: String { return self._s[1067]! }
+    public var ChatListFolderSettings_EditFoldersInfo: String { return self._s[1068]! }
+    public var Channel_Edit_PrivatePublicLinkAlert: String { return self._s[1069]! }
+    public var TwoFactorSetup_ResetDone_Title: String { return self._s[1070]! }
+    public var Conversation_ReportSpamGroupConfirmation: String { return self._s[1071]! }
+    public var Conversation_PrivateMessageLinkCopied: String { return self._s[1073]! }
+    public var PeerInfo_PaneFiles: String { return self._s[1074]! }
+    public var VoiceChat_DisplayAs: String { return self._s[1075]! }
+    public var PrivacySettings_AutoArchive: String { return self._s[1076]! }
+    public var Camera_VideoMode: String { return self._s[1077]! }
+    public var NotificationsSound_Alert: String { return self._s[1078]! }
+    public var Privacy_Forwards_NeverAllow_Title: String { return self._s[1079]! }
+    public var Appearance_AutoNightTheme: String { return self._s[1080]! }
+    public var Passport_Language_he: String { return self._s[1081]! }
+    public var Passport_InvalidPasswordError: String { return self._s[1082]! }
+    public var Conversation_PinMessageAlert_OnlyPin: String { return self._s[1083]! }
+    public var UserInfo_InviteBotToGroup: String { return self._s[1084]! }
+    public var Conversation_SilentBroadcastTooltipOff: String { return self._s[1085]! }
+    public var Common_TakePhoto: String { return self._s[1086]! }
     public func Channel_AdminLog_RevokedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1043]!, self._r[1043]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1087]!, self._r[1087]!, [_1, _2])
     }
-    public var Passport_Email_UseTelegramEmailHelp: String { return self._s[1044]! }
-    public var ChatList_Context_JoinChannel: String { return self._s[1045]! }
-    public var MediaPlayer_UnknownArtist: String { return self._s[1046]! }
-    public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[1049]! }
-    public var Channel_OwnershipTransfer_Title: String { return self._s[1050]! }
-    public var EditTheme_UploadEditedTheme: String { return self._s[1051]! }
-    public var Settings_SetProfilePhotoOrVideo: String { return self._s[1053]! }
-    public var Passport_FieldOneOf_Delimeter: String { return self._s[1054]! }
-    public var MessagePoll_ViewResults: String { return self._s[1055]! }
-    public var Group_Setup_TypePrivateHelp: String { return self._s[1056]! }
-    public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1057]! }
-    public var ChatList_Search_ShowLess: String { return self._s[1058]! }
-    public var InviteLink_Create_UsersLimitNoLimit: String { return self._s[1059]! }
-    public var UserInfo_ShareBot: String { return self._s[1060]! }
-    public var Privacy_Calls_P2P: String { return self._s[1062]! }
-    public var WebBrowser_InAppSafari: String { return self._s[1063]! }
-    public var SharedMedia_EmptyFilesText: String { return self._s[1066]! }
-    public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[1067]! }
-    public var GroupInfo_SetSound: String { return self._s[1068]! }
-    public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1069]! }
+    public var Passport_Email_UseTelegramEmailHelp: String { return self._s[1088]! }
+    public var ChatList_Context_JoinChannel: String { return self._s[1089]! }
+    public var MediaPlayer_UnknownArtist: String { return self._s[1090]! }
+    public var VoiceChat_EditDescriptionText: String { return self._s[1091]! }
+    public var KeyCommand_JumpToPreviousUnreadChat: String { return self._s[1094]! }
+    public var Channel_OwnershipTransfer_Title: String { return self._s[1095]! }
+    public var EditTheme_UploadEditedTheme: String { return self._s[1096]! }
+    public var Settings_SetProfilePhotoOrVideo: String { return self._s[1098]! }
+    public var Passport_FieldOneOf_Delimeter: String { return self._s[1099]! }
+    public var MessagePoll_ViewResults: String { return self._s[1100]! }
+    public var Group_Setup_TypePrivateHelp: String { return self._s[1101]! }
+    public func UserInfo_ContactForwardTooltip_Chat_One(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1102]!, self._r[1102]!, [_0])
+    }
+    public var Passport_Address_OneOfTypeUtilityBill: String { return self._s[1103]! }
+    public var Privacy_PaymentsClear_ShippingInfoCleared: String { return self._s[1104]! }
+    public var ChatList_Search_ShowLess: String { return self._s[1105]! }
+    public var InviteLink_Create_UsersLimitNoLimit: String { return self._s[1106]! }
+    public var UserInfo_ShareBot: String { return self._s[1107]! }
+    public var Privacy_Calls_P2P: String { return self._s[1109]! }
+    public var WebBrowser_InAppSafari: String { return self._s[1110]! }
+    public var SharedMedia_EmptyFilesText: String { return self._s[1113]! }
+    public var Channel_AdminLog_MessagePreviousMessage: String { return self._s[1114]! }
+    public var GroupInfo_SetSound: String { return self._s[1115]! }
+    public var Permissions_PeopleNearbyAllowInSettings_v0: String { return self._s[1116]! }
     public func Conversation_AutoremoveRemainingTime(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1070]!, self._r[1070]!, [_0])
+        return formatWithArgumentRanges(self._s[1117]!, self._r[1117]!, [_0])
     }
-    public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1071]! }
-    public var Channel_AdminLogFilter_EventsAll: String { return self._s[1072]! }
-    public var CallSettings_UseLessData: String { return self._s[1073]! }
-    public var InfoPlist_NSCameraUsageDescription: String { return self._s[1074]! }
-    public var NotificationsSound_Chord: String { return self._s[1075]! }
-    public var PhotoEditor_CurvesTool: String { return self._s[1076]! }
-    public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1077]! }
-    public var Resolve_ErrorNotFound: String { return self._s[1078]! }
-    public var Activity_PlayingGame: String { return self._s[1079]! }
+    public var Channel_AdminLog_MessagePreviousDescription: String { return self._s[1118]! }
+    public var Channel_AdminLogFilter_EventsAll: String { return self._s[1119]! }
+    public var CallSettings_UseLessData: String { return self._s[1120]! }
+    public var InfoPlist_NSCameraUsageDescription: String { return self._s[1121]! }
+    public var NotificationsSound_Chord: String { return self._s[1122]! }
+    public var PhotoEditor_CurvesTool: String { return self._s[1123]! }
+    public var Appearance_ThemePreview_Chat_2_Text: String { return self._s[1124]! }
+    public var Resolve_ErrorNotFound: String { return self._s[1125]! }
+    public var Activity_PlayingGame: String { return self._s[1126]! }
     public func VoiceChat_InvitedPeerText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1082]!, self._r[1082]!, [_0])
-    }
-    public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1083]! }
-    public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1084]!, self._r[1084]!, [_1])
-    }
-    public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[1085]! }
-    public var Notification_CallIncoming: String { return self._s[1086]! }
-    public var Stats_EnabledNotifications: String { return self._s[1087]! }
-    public var Notification_VoiceChatStartedChannel: String { return self._s[1088]! }
-    public var Notifications_PermissionsOpenSettings: String { return self._s[1089]! }
-    public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1090]! }
-    public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1091]!, self._r[1091]!, [_0])
-    }
-    public var VoiceChat_StatusMutedYou: String { return self._s[1092]! }
-    public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[1093]! }
-    public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[1094]! }
-    public var StickerPacksSettings_Title: String { return self._s[1095]! }
-    public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1096]!, self._r[1096]!, [_0])
-    }
-    public var Watch_NoConnection: String { return self._s[1097]! }
-    public var EncryptionKey_Title: String { return self._s[1098]! }
-    public var Widget_AuthRequired: String { return self._s[1099]! }
-    public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1100]!, self._r[1100]!, [_1])
-    }
-    public var Notifications_ExceptionsTitle: String { return self._s[1101]! }
-    public var EditTheme_Expand_TopInfo: String { return self._s[1102]! }
-    public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1103]!, self._r[1103]!, [_0])
-    }
-    public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[1105]! }
-    public var Notifications_GroupNotificationsSound: String { return self._s[1106]! }
-    public var VoiceChat_SpeakPermissionAdmin: String { return self._s[1107]! }
-    public var Passport_Email_EnterOtherEmail: String { return self._s[1108]! }
-    public func VoiceChat_RemovePeerConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1111]!, self._r[1111]!, [_0])
-    }
-    public var Conversation_AddToContacts: String { return self._s[1112]! }
-    public var AutoDownloadSettings_DataUsageMedium: String { return self._s[1113]! }
-    public var AuthSessions_LogOutApplications: String { return self._s[1115]! }
-    public var VoiceChat_LeaveVoiceChat: String { return self._s[1116]! }
-    public var ChatList_Context_Unpin: String { return self._s[1117]! }
-    public var PeopleNearby_DiscoverDescription: String { return self._s[1118]! }
-    public var UserInfo_FakeBotWarning: String { return self._s[1119]! }
-    public var Notification_MessageLifetime1d: String { return self._s[1120]! }
-    public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[1121]! }
-    public var ChatListFolder_CategoryChannels: String { return self._s[1122]! }
-    public var VoiceOver_Chat_SeenByRecipient: String { return self._s[1123]! }
-    public var Notifications_PermissionsAllow: String { return self._s[1124]! }
-    public var Undo_ScheduledMessagesCleared: String { return self._s[1125]! }
-    public var AutoDownloadSettings_PrivateChats: String { return self._s[1127]! }
-    public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1128]! }
-    public var ChatImportActivity_ErrorInvalidChatType: String { return self._s[1129]! }
-    public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1130]!, self._r[1130]!, [_0])
     }
-    public var Conversation_AutoremoveTimerRemovedChannel: String { return self._s[1132]! }
-    public var Notifications_MessageNotificationsHelp: String { return self._s[1134]! }
-    public var WallpaperSearch_ColorPink: String { return self._s[1135]! }
-    public var ContactInfo_PhoneNumberHidden: String { return self._s[1136]! }
-    public var Passport_Identity_IssueDate: String { return self._s[1138]! }
+    public var StickerPacksSettings_AnimatedStickersInfo: String { return self._s[1131]! }
+    public func PUSH_CHANNEL_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1132]!, self._r[1132]!, [_1])
+    }
+    public var Conversation_ShareBotContactConfirmationTitle: String { return self._s[1133]! }
+    public var Notification_CallIncoming: String { return self._s[1134]! }
+    public var Stats_EnabledNotifications: String { return self._s[1135]! }
+    public var Notification_VoiceChatStartedChannel: String { return self._s[1136]! }
+    public var Notifications_PermissionsOpenSettings: String { return self._s[1137]! }
+    public var Checkout_ErrorProviderAccountTimeout: String { return self._s[1138]! }
+    public func Activity_RemindAboutChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1139]!, self._r[1139]!, [_0])
+    }
+    public var VoiceChat_StatusMutedYou: String { return self._s[1140]! }
+    public var VoiceOver_Chat_ReplyToYourMessage: String { return self._s[1141]! }
+    public var Channel_DiscussionGroup_MakeHistoryPublic: String { return self._s[1142]! }
+    public var StickerPacksSettings_Title: String { return self._s[1143]! }
+    public func Channel_AdminLog_MessageGroupPreHistoryVisible(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1144]!, self._r[1144]!, [_0])
+    }
+    public var Watch_NoConnection: String { return self._s[1145]! }
+    public var EncryptionKey_Title: String { return self._s[1146]! }
+    public var Widget_AuthRequired: String { return self._s[1147]! }
+    public func PUSH_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1148]!, self._r[1148]!, [_1])
+    }
+    public var Notifications_ExceptionsTitle: String { return self._s[1149]! }
+    public var EditTheme_Expand_TopInfo: String { return self._s[1150]! }
+    public func Contacts_AddPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1151]!, self._r[1151]!, [_0])
+    }
+    public var Channel_AdminLogFilter_EventsRestrictions: String { return self._s[1153]! }
+    public var Notifications_GroupNotificationsSound: String { return self._s[1154]! }
+    public var VoiceChat_SpeakPermissionAdmin: String { return self._s[1155]! }
+    public var Passport_Email_EnterOtherEmail: String { return self._s[1156]! }
+    public func VoiceChat_RemovePeerConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1159]!, self._r[1159]!, [_0])
+    }
+    public var Conversation_AddToContacts: String { return self._s[1160]! }
+    public var AutoDownloadSettings_DataUsageMedium: String { return self._s[1161]! }
+    public var AuthSessions_LogOutApplications: String { return self._s[1163]! }
+    public var VoiceChat_LeaveVoiceChat: String { return self._s[1164]! }
+    public var ChatList_Context_Unpin: String { return self._s[1165]! }
+    public var PeopleNearby_DiscoverDescription: String { return self._s[1166]! }
+    public var UserInfo_FakeBotWarning: String { return self._s[1167]! }
+    public var Notification_MessageLifetime1d: String { return self._s[1168]! }
+    public var PrivacyLastSeenSettings_NeverShareWith_Title: String { return self._s[1169]! }
+    public var ChatListFolder_CategoryChannels: String { return self._s[1170]! }
+    public var VoiceOver_Chat_SeenByRecipient: String { return self._s[1171]! }
+    public var Notifications_PermissionsAllow: String { return self._s[1172]! }
+    public var Undo_ScheduledMessagesCleared: String { return self._s[1173]! }
+    public var AutoDownloadSettings_PrivateChats: String { return self._s[1175]! }
+    public var VoiceChat_ImproveYourProfileText: String { return self._s[1176]! }
+    public var ApplyLanguage_ChangeLanguageAction: String { return self._s[1177]! }
+    public var ChatImportActivity_ErrorInvalidChatType: String { return self._s[1178]! }
+    public func Conversation_ScheduledVoiceChatStartsToday(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1179]!, self._r[1179]!, [_0])
+    }
+    public func PrivacySettings_LastSeenNobodyPlus(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1180]!, self._r[1180]!, [_0])
+    }
+    public var Conversation_AutoremoveTimerRemovedChannel: String { return self._s[1182]! }
+    public var Notifications_MessageNotificationsHelp: String { return self._s[1184]! }
+    public var WallpaperSearch_ColorPink: String { return self._s[1185]! }
+    public var ContactInfo_PhoneNumberHidden: String { return self._s[1186]! }
+    public var Passport_Identity_IssueDate: String { return self._s[1188]! }
     public func PUSH_CHAT_MESSAGE_GIF(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1139]!, self._r[1139]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1189]!, self._r[1189]!, [_1, _2])
     }
-    public var ChatList_DeleteForAllSubscribersConfirmationText: String { return self._s[1140]! }
-    public var Channel_Info_Description: String { return self._s[1141]! }
-    public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1142]! }
-    public var Weekday_ShortTuesday: String { return self._s[1143]! }
-    public var Common_Back: String { return self._s[1144]! }
-    public var Chat_PinnedMessagesHiddenTitle: String { return self._s[1146]! }
-    public var ChatListFolder_AddChats: String { return self._s[1147]! }
-    public var Common_Close: String { return self._s[1149]! }
-    public var Map_OpenIn: String { return self._s[1150]! }
-    public var Group_Setup_HistoryTitle: String { return self._s[1151]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1152]! }
-    public var Notification_MessageLifetime1h: String { return self._s[1153]! }
+    public var ChatList_DeleteForAllSubscribersConfirmationText: String { return self._s[1190]! }
+    public var Channel_Info_Description: String { return self._s[1191]! }
+    public var PrivacySettings_DeleteAccountIfAwayFor: String { return self._s[1192]! }
+    public var Weekday_ShortTuesday: String { return self._s[1193]! }
+    public var Common_Back: String { return self._s[1194]! }
+    public var Chat_PinnedMessagesHiddenTitle: String { return self._s[1196]! }
+    public var ChatListFolder_AddChats: String { return self._s[1197]! }
+    public var Common_Close: String { return self._s[1199]! }
+    public var Map_OpenIn: String { return self._s[1200]! }
+    public var Group_Setup_HistoryTitle: String { return self._s[1201]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingWifi: String { return self._s[1202]! }
+    public var Notification_MessageLifetime1h: String { return self._s[1203]! }
     public func CancelResetAccount_Success(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1154]!, self._r[1154]!, [_0])
+        return formatWithArgumentRanges(self._s[1204]!, self._r[1204]!, [_0])
     }
-    public var Watch_Contacts_NoResults: String { return self._s[1156]! }
-    public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1157]! }
-    public var Checkout_Phone: String { return self._s[1158]! }
-    public var OwnershipTransfer_ComeBackLater: String { return self._s[1159]! }
+    public var Watch_Contacts_NoResults: String { return self._s[1206]! }
+    public var TwoStepAuth_SetupResendEmailCode: String { return self._s[1207]! }
+    public var Checkout_Phone: String { return self._s[1208]! }
+    public var OwnershipTransfer_ComeBackLater: String { return self._s[1209]! }
     public func Channel_CommentsGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1160]!, self._r[1160]!, [_0])
+        return formatWithArgumentRanges(self._s[1210]!, self._r[1210]!, [_0])
     }
     public func DialogList_MultipleTypingSuffix(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1161]!, self._r[1161]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[1211]!, self._r[1211]!, ["\(_0)"])
     }
-    public var Conversation_AudioRateTooltipSpeedUp: String { return self._s[1162]! }
-    public var ChatAdmins_Title: String { return self._s[1163]! }
-    public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[1164]! }
+    public var Conversation_AudioRateTooltipSpeedUp: String { return self._s[1212]! }
+    public var ChatAdmins_Title: String { return self._s[1213]! }
+    public var Appearance_ThemePreview_Chat_7_Text: String { return self._s[1214]! }
     public func PUSH_CHANNEL_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1165]!, self._r[1165]!, [_1])
+        return formatWithArgumentRanges(self._s[1215]!, self._r[1215]!, [_1])
     }
-    public var Common_Done: String { return self._s[1166]! }
-    public var ChatList_HeaderImportIntoAnExistingGroup: String { return self._s[1167]! }
-    public var Appearance_ThemeCarouselNight: String { return self._s[1170]! }
+    public var Common_Done: String { return self._s[1216]! }
+    public var ChatList_HeaderImportIntoAnExistingGroup: String { return self._s[1217]! }
+    public var Appearance_AppIconNew2: String { return self._s[1218]! }
     public func PUSH_PINNED_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1172]!, self._r[1172]!, [_1])
+        return formatWithArgumentRanges(self._s[1222]!, self._r[1222]!, [_1])
     }
-    public var InviteLink_Expired: String { return self._s[1174]! }
-    public var Preview_OpenInInstagram: String { return self._s[1175]! }
-    public var Wallpaper_SetColor: String { return self._s[1179]! }
-    public var VoiceOver_Media_PlaybackRate: String { return self._s[1180]! }
-    public var ChatSettings_Groups: String { return self._s[1181]! }
+    public var Appearance_ThemeCarouselNight: String { return self._s[1223]! }
+    public var InviteLink_Expired: String { return self._s[1225]! }
+    public var Preview_OpenInInstagram: String { return self._s[1226]! }
+    public var Wallpaper_SetColor: String { return self._s[1231]! }
+    public var VoiceOver_Media_PlaybackRate: String { return self._s[1232]! }
+    public var ChatSettings_Groups: String { return self._s[1233]! }
     public func VoiceOver_Chat_VoiceMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1182]!, self._r[1182]!, [_0])
+        return formatWithArgumentRanges(self._s[1234]!, self._r[1234]!, [_0])
     }
-    public var Contacts_SortedByName: String { return self._s[1183]! }
-    public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1184]! }
-    public var Channel_Management_LabelCreator: String { return self._s[1185]! }
-    public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1186]! }
+    public var Contacts_SortedByName: String { return self._s[1235]! }
+    public var SettingsSearch_Synonyms_Notifications_ContactJoined: String { return self._s[1236]! }
+    public var Channel_Management_LabelCreator: String { return self._s[1237]! }
+    public var Contacts_PermissionsSuppressWarningTitle: String { return self._s[1238]! }
     public func PrivacySettings_LastSeenContactsMinusPlus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1187]!, self._r[1187]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[1239]!, self._r[1239]!, [_0, _1])
     }
-    public var Group_GroupMembersHeader: String { return self._s[1188]! }
-    public var Group_PublicLink_Title: String { return self._s[1189]! }
-    public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1190]! }
-    public var VoiceOver_Chat_Photo: String { return self._s[1191]! }
-    public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[1192]! }
-    public var IntentsSettings_SuggestBy: String { return self._s[1193]! }
-    public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[1194]! }
-    public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1195]! }
-    public var PhoneNumberHelp_ChangeNumber: String { return self._s[1196]! }
-    public var LogoutOptions_SetPasscodeText: String { return self._s[1197]! }
-    public var Map_OpenInMaps: String { return self._s[1198]! }
-    public var ContactInfo_PhoneLabelWorkFax: String { return self._s[1199]! }
-    public var BlockedUsers_Unblock: String { return self._s[1200]! }
+    public var Group_GroupMembersHeader: String { return self._s[1240]! }
+    public var Group_PublicLink_Title: String { return self._s[1241]! }
+    public var Channel_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[1242]! }
+    public var VoiceOver_Chat_Photo: String { return self._s[1243]! }
+    public var TwoFactorSetup_EmailVerification_Placeholder: String { return self._s[1244]! }
+    public var IntentsSettings_SuggestBy: String { return self._s[1245]! }
+    public var Privacy_Calls_AlwaysAllow_Placeholder: String { return self._s[1246]! }
+    public var Appearance_ThemePreview_ChatList_1_Name: String { return self._s[1247]! }
+    public var PhoneNumberHelp_ChangeNumber: String { return self._s[1248]! }
+    public var LogoutOptions_SetPasscodeText: String { return self._s[1249]! }
+    public var Map_OpenInMaps: String { return self._s[1250]! }
+    public var ContactInfo_PhoneLabelWorkFax: String { return self._s[1251]! }
+    public var BlockedUsers_Unblock: String { return self._s[1252]! }
     public func Settings_ApplyProxyAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1201]!, self._r[1201]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1253]!, self._r[1253]!, [_1, _2])
     }
     public func Channel_AdminLog_MessageRestrictedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1202]!, self._r[1202]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1254]!, self._r[1254]!, [_1, _2])
     }
-    public var ChatImport_CreateGroupAlertTitle: String { return self._s[1204]! }
-    public var Conversation_Block: String { return self._s[1205]! }
-    public var VoiceChat_PersonalAccount: String { return self._s[1206]! }
-    public var Passport_Scans_UploadNew: String { return self._s[1207]! }
-    public var Share_Title: String { return self._s[1208]! }
-    public var Conversation_ApplyLocalization: String { return self._s[1209]! }
-    public var SharedMedia_EmptyLinksText: String { return self._s[1210]! }
-    public var Settings_NotificationsAndSounds: String { return self._s[1211]! }
-    public var Stats_ViewsByHoursTitle: String { return self._s[1212]! }
-    public var PhotoEditor_QualityMedium: String { return self._s[1213]! }
-    public var Conversation_ContextMenuCancelSending: String { return self._s[1214]! }
+    public var ChatImport_CreateGroupAlertTitle: String { return self._s[1256]! }
+    public var Conversation_Block: String { return self._s[1257]! }
+    public var VoiceChat_PersonalAccount: String { return self._s[1258]! }
+    public var Passport_Scans_UploadNew: String { return self._s[1259]! }
+    public var Share_Title: String { return self._s[1260]! }
+    public var Conversation_ApplyLocalization: String { return self._s[1261]! }
+    public var SharedMedia_EmptyLinksText: String { return self._s[1262]! }
+    public var Settings_NotificationsAndSounds: String { return self._s[1263]! }
+    public var Stats_ViewsByHoursTitle: String { return self._s[1264]! }
+    public var PhotoEditor_QualityMedium: String { return self._s[1265]! }
+    public var Conversation_ContextMenuCancelSending: String { return self._s[1266]! }
     public func PUSH_CHANNEL_MESSAGE_GAME(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1215]!, self._r[1215]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1267]!, self._r[1267]!, [_1, _2])
     }
-    public var Conversation_RestrictedInline: String { return self._s[1216]! }
-    public var Passport_Language_tr: String { return self._s[1217]! }
-    public var Call_Mute: String { return self._s[1218]! }
+    public var Conversation_RestrictedInline: String { return self._s[1268]! }
+    public var Passport_Language_tr: String { return self._s[1269]! }
+    public var Call_Mute: String { return self._s[1270]! }
     public func Conversation_NoticeInvitedByInGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1219]!, self._r[1219]!, [_0])
+        return formatWithArgumentRanges(self._s[1271]!, self._r[1271]!, [_0])
     }
-    public var Passport_Language_bn: String { return self._s[1220]! }
-    public var Common_Save: String { return self._s[1222]! }
-    public var AccessDenied_LocationTracking: String { return self._s[1224]! }
-    public var Month_ShortOctober: String { return self._s[1225]! }
-    public var AutoDownloadSettings_WiFi: String { return self._s[1226]! }
-    public var ProfilePhoto_SetMainPhoto: String { return self._s[1228]! }
-    public var ChangePhoneNumberNumber_NewNumber: String { return self._s[1229]! }
+    public var Passport_Language_bn: String { return self._s[1272]! }
+    public var Common_Save: String { return self._s[1274]! }
+    public var AccessDenied_LocationTracking: String { return self._s[1276]! }
+    public var Month_ShortOctober: String { return self._s[1277]! }
+    public var AutoDownloadSettings_WiFi: String { return self._s[1278]! }
+    public var ProfilePhoto_SetMainPhoto: String { return self._s[1280]! }
+    public var ChangePhoneNumberNumber_NewNumber: String { return self._s[1281]! }
     public func Time_MonthOfYear_m3(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1230]!, self._r[1230]!, [_0])
+        return formatWithArgumentRanges(self._s[1282]!, self._r[1282]!, [_0])
     }
-    public var Watch_ChannelInfo_Title: String { return self._s[1231]! }
-    public var State_Updating: String { return self._s[1232]! }
-    public var Conversation_UnblockUser: String { return self._s[1233]! }
-    public var Notifications_ChannelNotificationsSound: String { return self._s[1234]! }
-    public var Map_GetDirections: String { return self._s[1235]! }
-    public var Watch_Compose_AddContact: String { return self._s[1237]! }
-    public var Conversation_Dice_u26BD: String { return self._s[1238]! }
-    public var AccessDenied_PhotosRestricted: String { return self._s[1239]! }
+    public var Watch_ChannelInfo_Title: String { return self._s[1283]! }
+    public var State_Updating: String { return self._s[1284]! }
+    public var Conversation_UnblockUser: String { return self._s[1285]! }
+    public var Notifications_ChannelNotificationsSound: String { return self._s[1286]! }
+    public var Map_GetDirections: String { return self._s[1287]! }
+    public var Watch_Compose_AddContact: String { return self._s[1289]! }
+    public var Conversation_Dice_u26BD: String { return self._s[1290]! }
+    public var AccessDenied_PhotosRestricted: String { return self._s[1291]! }
     public func Channel_AdminLog_MessageRank(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1240]!, self._r[1240]!, [_1])
+        return formatWithArgumentRanges(self._s[1292]!, self._r[1292]!, [_1])
     }
-    public var Map_LoadError: String { return self._s[1242]! }
-    public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[1243]! }
-    public var PhotoEditor_CropAuto: String { return self._s[1244]! }
+    public var Map_LoadError: String { return self._s[1294]! }
+    public var SettingsSearch_Synonyms_Privacy_Calls: String { return self._s[1295]! }
+    public var PhotoEditor_CropAuto: String { return self._s[1296]! }
     public func Target_ShareGameConfirmationPrivate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1247]!, self._r[1247]!, [_0])
+        return formatWithArgumentRanges(self._s[1299]!, self._r[1299]!, [_0])
     }
-    public var Username_TooManyPublicUsernamesError: String { return self._s[1249]! }
+    public var Username_TooManyPublicUsernamesError: String { return self._s[1301]! }
     public func PUSH_PINNED_GAME(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1250]!, self._r[1250]!, [_1])
+        return formatWithArgumentRanges(self._s[1302]!, self._r[1302]!, [_1])
     }
-    public var Settings_PhoneNumber: String { return self._s[1251]! }
+    public var Settings_PhoneNumber: String { return self._s[1303]! }
     public func Channel_AdminLog_MessageTransferedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1252]!, self._r[1252]!, [_1])
+        return formatWithArgumentRanges(self._s[1304]!, self._r[1304]!, [_1])
     }
-    public var Month_GenJune: String { return self._s[1254]! }
-    public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[1255]! }
-    public var ChatListFolder_CategoryRead: String { return self._s[1256]! }
-    public var LoginPassword_ResetAccount: String { return self._s[1257]! }
+    public var Month_GenJune: String { return self._s[1306]! }
+    public var Notifications_ExceptionsGroupPlaceholder: String { return self._s[1307]! }
+    public var ChatListFolder_CategoryRead: String { return self._s[1308]! }
+    public var LoginPassword_ResetAccount: String { return self._s[1309]! }
     public func DialogList_SingleUploadingFileSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1258]!, self._r[1258]!, [_0])
+        return formatWithArgumentRanges(self._s[1310]!, self._r[1310]!, [_0])
     }
-    public var Call_CameraConfirmationConfirm: String { return self._s[1259]! }
-    public var Notification_RenamedChannel: String { return self._s[1260]! }
+    public var Call_CameraConfirmationConfirm: String { return self._s[1311]! }
+    public var Notification_RenamedChannel: String { return self._s[1312]! }
     public func Channel_AdminLog_MessageUnpinned(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1261]!, self._r[1261]!, [_0])
+        return formatWithArgumentRanges(self._s[1313]!, self._r[1313]!, [_0])
     }
-    public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[1262]! }
-    public var IntentsSettings_Title: String { return self._s[1264]! }
-    public var CallList_DeleteAllForMe: String { return self._s[1265]! }
-    public var Settings_AppleWatch: String { return self._s[1266]! }
-    public var Conversation_LinkCopied: String { return self._s[1267]! }
-    public var DialogList_NoMessagesText: String { return self._s[1268]! }
-    public var GroupPermission_NoChangeInfo: String { return self._s[1269]! }
-    public var Channel_ErrorAccessDenied: String { return self._s[1271]! }
-    public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1272]! }
+    public var Channel_AdminLogFilter_EventsAdmins: String { return self._s[1314]! }
+    public var IntentsSettings_Title: String { return self._s[1316]! }
+    public var CallList_DeleteAllForMe: String { return self._s[1317]! }
+    public var Settings_AppleWatch: String { return self._s[1318]! }
+    public var Conversation_LinkCopied: String { return self._s[1319]! }
+    public var DialogList_NoMessagesText: String { return self._s[1320]! }
+    public func VoiceChat_SendPublicLinkText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1321]!, self._r[1321]!, [_1, _2])
+    }
+    public var GroupPermission_NoChangeInfo: String { return self._s[1322]! }
+    public var Channel_ErrorAccessDenied: String { return self._s[1324]! }
+    public var ScheduledMessages_EmptyPlaceholder: String { return self._s[1325]! }
     public func Message_StickerText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1273]!, self._r[1273]!, [_0])
+        return formatWithArgumentRanges(self._s[1326]!, self._r[1326]!, [_0])
     }
-    public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1274]! }
-    public var StickerPacksSettings_AnimatedStickers: String { return self._s[1275]! }
-    public var Month_ShortJanuary: String { return self._s[1276]! }
-    public var Conversation_UnreadMessages: String { return self._s[1277]! }
-    public var Conversation_PrivateChannelTooltip: String { return self._s[1279]! }
-    public var Call_VoiceOver_VideoCallCanceled: String { return self._s[1280]! }
-    public var PrivacySettings_DeleteAccountTitle: String { return self._s[1282]! }
-    public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1283]! }
+    public var AuthSessions_TerminateOtherSessionsHelp: String { return self._s[1327]! }
+    public var StickerPacksSettings_AnimatedStickers: String { return self._s[1328]! }
+    public var Month_ShortJanuary: String { return self._s[1329]! }
+    public var Conversation_UnreadMessages: String { return self._s[1330]! }
+    public var Conversation_PrivateChannelTooltip: String { return self._s[1332]! }
+    public var Call_VoiceOver_VideoCallCanceled: String { return self._s[1333]! }
+    public var PrivacySettings_DeleteAccountTitle: String { return self._s[1335]! }
+    public var Channel_Members_AddBannedErrorAdmin: String { return self._s[1336]! }
     public func Conversation_ShareMyPhoneNumberConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1287]!, self._r[1287]!, [_1, _2])
-    }
-    public var Widget_ApplicationLocked: String { return self._s[1288]! }
-    public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1289]!, self._r[1289]!, [_0])
-    }
-    public var Common_TakePhotoOrVideo: String { return self._s[1290]! }
-    public var Passport_Language_ru: String { return self._s[1291]! }
-    public var MediaPicker_VideoMuteDescription: String { return self._s[1292]! }
-    public var EditTheme_ErrorLinkTaken: String { return self._s[1293]! }
-    public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1295]!, self._r[1295]!, [_0])
-    }
-    public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[1296]! }
-    public var Conversation_Owner: String { return self._s[1298]! }
-    public var Settings_FAQ_Intro: String { return self._s[1299]! }
-    public var PhotoEditor_QualityLow: String { return self._s[1301]! }
-    public var Widget_GalleryTitle: String { return self._s[1302]! }
-    public var Call_End: String { return self._s[1303]! }
-    public var StickerPacksSettings_FeaturedPacks: String { return self._s[1305]! }
-    public var Privacy_ContactsSyncHelp: String { return self._s[1306]! }
-    public var OldChannels_NoticeUpgradeText: String { return self._s[1310]! }
-    public var Conversation_Call: String { return self._s[1312]! }
-    public var Watch_MessageView_Title: String { return self._s[1313]! }
-    public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1314]!, self._r[1314]!, [_0])
-    }
-    public var Passport_PasswordCompleteSetup: String { return self._s[1315]! }
-    public func Notification_ChangedGroupVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1316]!, self._r[1316]!, [_0])
-    }
-    public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1318]!, self._r[1318]!, [_0])
-    }
-    public var Map_Location: String { return self._s[1319]! }
-    public var Watch_MessageView_ViewOnPhone: String { return self._s[1320]! }
-    public var Login_CountryCode: String { return self._s[1321]! }
-    public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[1323]! }
-    public var ChatState_ConnectingToProxy: String { return self._s[1324]! }
-    public var Login_CallRequestState3: String { return self._s[1325]! }
-    public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[1328]! }
-    public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1329]! }
-    public var Widget_ChatsGalleryDescription: String { return self._s[1331]! }
-    public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[1333]! }
-    public var InstantPage_FontSanFrancisco: String { return self._s[1334]! }
-    public var Call_StatusEnded: String { return self._s[1335]! }
-    public var MusicPlayer_VoiceNote: String { return self._s[1338]! }
-    public var ChatImportActivity_ErrorUserBlocked: String { return self._s[1339]! }
-    public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1340]!, self._r[1340]!, [_1, _2])
     }
-    public var VoiceOver_MessageContextShare: String { return self._s[1341]! }
-    public var ProfilePhoto_SearchWeb: String { return self._s[1342]! }
-    public var EditProfile_Title: String { return self._s[1343]! }
+    public var Widget_ApplicationLocked: String { return self._s[1341]! }
+    public func TextFormat_AddLinkText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1342]!, self._r[1342]!, [_0])
+    }
+    public var Common_TakePhotoOrVideo: String { return self._s[1343]! }
+    public var Passport_Language_ru: String { return self._s[1345]! }
+    public var MediaPicker_VideoMuteDescription: String { return self._s[1346]! }
+    public var EditTheme_ErrorLinkTaken: String { return self._s[1347]! }
+    public func Group_EditAdmin_RankInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1349]!, self._r[1349]!, [_0])
+    }
+    public var VoiceChat_ShareShort: String { return self._s[1350]! }
+    public var Channel_Members_AddAdminErrorBlacklisted: String { return self._s[1351]! }
+    public var Conversation_Owner: String { return self._s[1353]! }
+    public var Settings_FAQ_Intro: String { return self._s[1354]! }
+    public var PhotoEditor_QualityLow: String { return self._s[1356]! }
+    public var Widget_GalleryTitle: String { return self._s[1357]! }
+    public var Call_End: String { return self._s[1358]! }
+    public var StickerPacksSettings_FeaturedPacks: String { return self._s[1360]! }
+    public var Privacy_ContactsSyncHelp: String { return self._s[1361]! }
+    public var OldChannels_NoticeUpgradeText: String { return self._s[1365]! }
+    public var Conversation_Call: String { return self._s[1367]! }
+    public var Watch_MessageView_Title: String { return self._s[1368]! }
+    public func Notification_RenamedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1369]!, self._r[1369]!, [_0])
+    }
+    public var Passport_PasswordCompleteSetup: String { return self._s[1370]! }
+    public func Notification_ChangedGroupVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1371]!, self._r[1371]!, [_0])
+    }
+    public func TwoFactorSetup_EmailVerification_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1373]!, self._r[1373]!, [_0])
+    }
+    public var Map_Location: String { return self._s[1374]! }
+    public var Watch_MessageView_ViewOnPhone: String { return self._s[1375]! }
+    public var Login_CountryCode: String { return self._s[1376]! }
+    public var Channel_DiscussionGroup_PrivateGroup: String { return self._s[1378]! }
+    public var ChatState_ConnectingToProxy: String { return self._s[1379]! }
+    public var Login_CallRequestState3: String { return self._s[1380]! }
+    public var NetworkUsageSettings_MediaAudioDataSection: String { return self._s[1383]! }
+    public var SocksProxySetup_ProxyStatusConnecting: String { return self._s[1384]! }
+    public var Widget_ChatsGalleryDescription: String { return self._s[1386]! }
+    public var PrivacyLastSeenSettings_NeverShareWith_Placeholder: String { return self._s[1388]! }
+    public var InstantPage_FontSanFrancisco: String { return self._s[1389]! }
+    public var Call_StatusEnded: String { return self._s[1390]! }
+    public func Checkout_SuccessfulTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1393]!, self._r[1393]!, [_1, _2])
+    }
+    public var MusicPlayer_VoiceNote: String { return self._s[1394]! }
+    public var ChatImportActivity_ErrorUserBlocked: String { return self._s[1395]! }
+    public func PUSH_CHANNEL_MESSAGE_TEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1396]!, self._r[1396]!, [_1, _2])
+    }
+    public var VoiceOver_MessageContextShare: String { return self._s[1397]! }
+    public var ProfilePhoto_SearchWeb: String { return self._s[1398]! }
+    public var EditProfile_Title: String { return self._s[1399]! }
     public func Notification_PinnedQuizMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1344]!, self._r[1344]!, [_0])
+        return formatWithArgumentRanges(self._s[1400]!, self._r[1400]!, [_0])
     }
-    public var VoiceChat_Unmute: String { return self._s[1345]! }
-    public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[1346]! }
-    public var NetworkUsageSettings_ResetStats: String { return self._s[1348]! }
-    public var NetworkUsageSettings_GeneralDataSection: String { return self._s[1349]! }
-    public var StickerPackActionInfo_AddedTitle: String { return self._s[1350]! }
-    public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[1351]! }
+    public var VoiceChat_Unmute: String { return self._s[1401]! }
+    public var ChangePhoneNumberCode_CodePlaceholder: String { return self._s[1402]! }
+    public var NetworkUsageSettings_ResetStats: String { return self._s[1404]! }
+    public var NetworkUsageSettings_GeneralDataSection: String { return self._s[1405]! }
+    public var StickerPackActionInfo_AddedTitle: String { return self._s[1406]! }
+    public var Channel_BanUser_PermissionSendStickersAndGifs: String { return self._s[1407]! }
     public func Call_ParticipantVideoVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1352]!, self._r[1352]!, [_0])
+        return formatWithArgumentRanges(self._s[1408]!, self._r[1408]!, [_0])
     }
-    public var Location_ProximityNotification_Title: String { return self._s[1353]! }
-    public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[1354]! }
-    public var Passport_Identity_LatinNameHelp: String { return self._s[1357]! }
-    public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[1358]! }
-    public var Stats_GroupMembersTitle: String { return self._s[1359]! }
-    public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[1360]! }
-    public var InviteLink_InviteLinkRevoked: String { return self._s[1361]! }
-    public var Contacts_PermissionsSuppressWarningText: String { return self._s[1362]! }
-    public var OpenFile_PotentiallyDangerousContentAlert: String { return self._s[1363]! }
-    public var Settings_SetUsername: String { return self._s[1364]! }
-    public var GroupInfo_ActionRestrict: String { return self._s[1365]! }
-    public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1366]! }
+    public var Location_ProximityNotification_Title: String { return self._s[1409]! }
+    public var AuthSessions_AddDeviceIntro_Text1: String { return self._s[1410]! }
+    public var Passport_Identity_LatinNameHelp: String { return self._s[1413]! }
+    public var AuthSessions_AddDeviceIntro_Text2: String { return self._s[1414]! }
+    public var Stats_GroupMembersTitle: String { return self._s[1415]! }
+    public var AuthSessions_AddDeviceIntro_Text3: String { return self._s[1416]! }
+    public var InviteLink_InviteLinkRevoked: String { return self._s[1417]! }
+    public var Contacts_PermissionsSuppressWarningText: String { return self._s[1418]! }
+    public var OpenFile_PotentiallyDangerousContentAlert: String { return self._s[1419]! }
+    public var Settings_SetUsername: String { return self._s[1420]! }
+    public var GroupInfo_ActionRestrict: String { return self._s[1421]! }
+    public var SettingsSearch_Synonyms_SavedMessages: String { return self._s[1422]! }
     public func Time_PreciseDate_m2(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1367]!, self._r[1367]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_1, _2, _3])
     }
-    public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1369]! }
-    public var Notification_Exceptions_AlwaysOff: String { return self._s[1370]! }
-    public var Conversation_ContextMenuDelete: String { return self._s[1371]! }
-    public var Privacy_Calls_WhoCanCallMe: String { return self._s[1372]! }
-    public var ChatList_PsaAlert_covid: String { return self._s[1375]! }
-    public var VoiceOver_SilentPostOn: String { return self._s[1376]! }
-    public var DialogList_Pin: String { return self._s[1377]! }
-    public var Channel_AdminLog_CanInviteUsersViaLink: String { return self._s[1378]! }
-    public var PrivacySettings_SecurityTitle: String { return self._s[1379]! }
-    public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[1380]! }
-    public var PeopleNearby_Groups: String { return self._s[1381]! }
-    public var Message_File: String { return self._s[1382]! }
-    public var Calls_NoCallsPlaceholder: String { return self._s[1383]! }
-    public var ChatList_GenericPsaLabel: String { return self._s[1385]! }
-    public var UserInfo_LastNamePlaceholder: String { return self._s[1386]! }
-    public var IntentsSettings_Reset: String { return self._s[1388]! }
-    public var Call_ConnectionErrorTitle: String { return self._s[1389]! }
-    public var PhotoEditor_SaturationTool: String { return self._s[1390]! }
-    public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[1391]! }
-    public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1392]! }
-    public var Conversation_SearchNoResults: String { return self._s[1393]! }
-    public var Channel_DiscussionGroup_PrivateChannel: String { return self._s[1394]! }
-    public var Map_OpenInWaze: String { return self._s[1395]! }
-    public var InviteLink_PeopleJoinedNone: String { return self._s[1396]! }
-    public var WallpaperPreview_Title: String { return self._s[1397]! }
+    public var Notifications_DisplayNamesOnLockScreenInfoWithLink: String { return self._s[1425]! }
+    public var Notification_Exceptions_AlwaysOff: String { return self._s[1426]! }
+    public var Conversation_ContextMenuDelete: String { return self._s[1427]! }
+    public var Privacy_Calls_WhoCanCallMe: String { return self._s[1428]! }
+    public var ChatList_PsaAlert_covid: String { return self._s[1431]! }
+    public var VoiceOver_SilentPostOn: String { return self._s[1432]! }
+    public var DialogList_Pin: String { return self._s[1433]! }
+    public var Channel_AdminLog_CanInviteUsersViaLink: String { return self._s[1434]! }
+    public var PrivacySettings_SecurityTitle: String { return self._s[1435]! }
+    public var GroupPermission_NotAvailableInPublicGroups: String { return self._s[1436]! }
+    public var PeopleNearby_Groups: String { return self._s[1437]! }
+    public var Message_File: String { return self._s[1438]! }
+    public var Calls_NoCallsPlaceholder: String { return self._s[1439]! }
+    public var ChatList_GenericPsaLabel: String { return self._s[1442]! }
+    public var UserInfo_LastNamePlaceholder: String { return self._s[1443]! }
+    public var IntentsSettings_Reset: String { return self._s[1445]! }
+    public var Call_ConnectionErrorTitle: String { return self._s[1446]! }
+    public var PhotoEditor_SaturationTool: String { return self._s[1447]! }
+    public var ChatSettings_AutomaticVideoMessageDownload: String { return self._s[1448]! }
+    public var SettingsSearch_Synonyms_Stickers_ArchivedPacks: String { return self._s[1449]! }
+    public var Conversation_SearchNoResults: String { return self._s[1450]! }
+    public var Channel_DiscussionGroup_PrivateChannel: String { return self._s[1451]! }
+    public var Map_OpenInWaze: String { return self._s[1452]! }
+    public var InviteLink_PeopleJoinedNone: String { return self._s[1453]! }
+    public var WallpaperPreview_Title: String { return self._s[1454]! }
     public func Passport_AcceptHelp(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1399]!, self._r[1399]!, [_1, _2])
-    }
-    public var AuthSessions_AddDeviceIntro_Title: String { return self._s[1400]! }
-    public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[1401]! }
-    public var VoiceOver_Chat_ChannelInfo: String { return self._s[1402]! }
-    public var Conversation_ImageCopied: String { return self._s[1403]! }
-    public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[1404]! }
-    public var Notifications_PermissionsUnreachableTitle: String { return self._s[1406]! }
-    public var Stats_Total: String { return self._s[1409]! }
-    public var Stats_GroupMessages: String { return self._s[1410]! }
-    public var TwoFactorSetup_Email_SkipAction: String { return self._s[1411]! }
-    public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[1412]! }
-    public var VoiceChat_DisplayAsInfoGroup: String { return self._s[1413]! }
-    public var Passport_Identity_Translation: String { return self._s[1414]! }
-    public var Notifications_TextTone: String { return self._s[1417]! }
-    public var Settings_RemoveConfirmation: String { return self._s[1419]! }
-    public var ScheduledMessages_Delete: String { return self._s[1420]! }
-    public var Channel_AdminLog_BanEmbedLinks: String { return self._s[1421]! }
-    public var Passport_PasswordNext: String { return self._s[1422]! }
-    public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1423]!, self._r[1423]!, [_1])
-    }
-    public var Passport_Address_EditBankStatement: String { return self._s[1424]! }
-    public var PhotoEditor_ShadowsTool: String { return self._s[1425]! }
-    public var Notification_VideoCallMissed: String { return self._s[1426]! }
-    public var AccessDenied_CameraDisabled: String { return self._s[1427]! }
-    public var AuthSessions_AddDevice_ScanInfo: String { return self._s[1428]! }
-    public var Notifications_ExceptionsMuted: String { return self._s[1429]! }
-    public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[1430]! }
-    public var Channel_BlackList_Title: String { return self._s[1431]! }
-    public var PasscodeSettings_4DigitCode: String { return self._s[1432]! }
-    public var NotificationsSound_Bamboo: String { return self._s[1433]! }
-    public var PrivacySettings_LastSeenContacts: String { return self._s[1434]! }
-    public var Passport_Address_TypeUtilityBill: String { return self._s[1435]! }
-    public var Passport_Address_CountryPlaceholder: String { return self._s[1436]! }
-    public var GroupPermission_SectionTitle: String { return self._s[1437]! }
-    public var InviteLink_ContextRevoke: String { return self._s[1438]! }
-    public func Notification_InvitedMultiple(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1439]!, self._r[1439]!, [_0, _1])
-    }
-    public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1440]! }
-    public var Channel_LeaveChannel: String { return self._s[1441]! }
-    public var Watch_Notification_Joined: String { return self._s[1442]! }
-    public var PeerInfo_ButtonMore: String { return self._s[1443]! }
-    public var Passport_FieldEmailHelp: String { return self._s[1444]! }
-    public var ChatList_Context_Pin: String { return self._s[1445]! }
-    public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1446]!, self._r[1446]!, [_0])
-    }
-    public var Group_Location_CreateInThisPlace: String { return self._s[1447]! }
-    public var PhotoEditor_QualityVeryHigh: String { return self._s[1448]! }
-    public var Tour_Title5: String { return self._s[1449]! }
-    public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1450]!, self._r[1450]!, [_1, _2])
-    }
-    public var Passport_Language_en: String { return self._s[1451]! }
-    public var Checkout_Name: String { return self._s[1452]! }
-    public var ChatImport_Title: String { return self._s[1453]! }
-    public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1454]!, self._r[1454]!, [_0])
-    }
-    public var PhotoEditor_EnhanceTool: String { return self._s[1455]! }
-    public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1456]!, self._r[1456]!, [_1, _2])
     }
-    public var PeerInfo_CustomizeNotifications: String { return self._s[1457]! }
-    public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1458]!, self._r[1458]!, [_0])
+    public var AuthSessions_AddDeviceIntro_Title: String { return self._s[1457]! }
+    public var VoiceOver_Chat_RecordModeVideoMessageInfo: String { return self._s[1458]! }
+    public var TwoFactorSetup_ResetDone_TextNoPassword: String { return self._s[1459]! }
+    public var VoiceOver_Chat_ChannelInfo: String { return self._s[1460]! }
+    public var Conversation_ImageCopied: String { return self._s[1461]! }
+    public var Passport_Identity_OneOfTypeInternalPassport: String { return self._s[1462]! }
+    public var Notifications_PermissionsUnreachableTitle: String { return self._s[1464]! }
+    public var Stats_Total: String { return self._s[1467]! }
+    public var Stats_GroupMessages: String { return self._s[1468]! }
+    public var TwoFactorSetup_Email_SkipAction: String { return self._s[1469]! }
+    public var CheckoutInfo_ErrorPhoneInvalid: String { return self._s[1470]! }
+    public var VoiceChat_You: String { return self._s[1471]! }
+    public var VoiceChat_DisplayAsInfoGroup: String { return self._s[1472]! }
+    public var Passport_Identity_Translation: String { return self._s[1473]! }
+    public var Notifications_TextTone: String { return self._s[1476]! }
+    public var Settings_RemoveConfirmation: String { return self._s[1478]! }
+    public var ScheduledMessages_Delete: String { return self._s[1479]! }
+    public var Channel_AdminLog_BanEmbedLinks: String { return self._s[1480]! }
+    public var Passport_PasswordNext: String { return self._s[1481]! }
+    public func PUSH_ENCRYPTED_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1482]!, self._r[1482]!, [_1])
     }
-    public var Group_ErrorSendRestrictedMedia: String { return self._s[1459]! }
-    public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1460]!, self._r[1460]!, [_0])
+    public var Passport_Address_EditBankStatement: String { return self._s[1483]! }
+    public var PhotoEditor_ShadowsTool: String { return self._s[1484]! }
+    public var Notification_VideoCallMissed: String { return self._s[1485]! }
+    public var AccessDenied_CameraDisabled: String { return self._s[1487]! }
+    public var AuthSessions_AddDevice_ScanInfo: String { return self._s[1488]! }
+    public var Notifications_ExceptionsMuted: String { return self._s[1489]! }
+    public var VoiceChat_TapToViewScreenVideo: String { return self._s[1490]! }
+    public var Conversation_ScheduleMessage_SendWhenOnline: String { return self._s[1491]! }
+    public var Channel_BlackList_Title: String { return self._s[1492]! }
+    public var PasscodeSettings_4DigitCode: String { return self._s[1493]! }
+    public var NotificationsSound_Bamboo: String { return self._s[1494]! }
+    public var Conversation_InputMenu: String { return self._s[1495]! }
+    public var PrivacySettings_LastSeenContacts: String { return self._s[1496]! }
+    public var Passport_Address_TypeUtilityBill: String { return self._s[1497]! }
+    public var Passport_Address_CountryPlaceholder: String { return self._s[1498]! }
+    public var GroupPermission_SectionTitle: String { return self._s[1499]! }
+    public var InviteLink_ContextRevoke: String { return self._s[1500]! }
+    public func Notification_InvitedMultiple(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1501]!, self._r[1501]!, [_0, _1])
     }
-    public var Login_UnknownError: String { return self._s[1461]! }
-    public var Conversation_ImportedMessageHint: String { return self._s[1463]! }
-    public func VoiceChat_ForwardTooltip_Chat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1464]!, self._r[1464]!, [_0])
+    public var CheckoutInfo_ShippingInfoStatePlaceholder: String { return self._s[1502]! }
+    public var Channel_LeaveChannel: String { return self._s[1503]! }
+    public var Watch_Notification_Joined: String { return self._s[1504]! }
+    public var PeerInfo_ButtonMore: String { return self._s[1505]! }
+    public var Passport_FieldEmailHelp: String { return self._s[1506]! }
+    public var ChatList_Context_Pin: String { return self._s[1507]! }
+    public func Time_MonthOfYear_m9(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1508]!, self._r[1508]!, [_0])
     }
-    public var Passport_Identity_TypeDriversLicense: String { return self._s[1466]! }
-    public var ChatList_AutoarchiveSuggestion_Title: String { return self._s[1467]! }
-    public var Watch_PhotoView_Title: String { return self._s[1468]! }
-    public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[1469]! }
-    public var Checkout_TotalAmount: String { return self._s[1470]! }
-    public var ChatList_RemoveFolderAction: String { return self._s[1471]! }
-    public func GroupInfo_Permissions_BroadcastConvertInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1472]!, self._r[1472]!, [_0])
+    public var Group_Location_CreateInThisPlace: String { return self._s[1509]! }
+    public var PhotoEditor_QualityVeryHigh: String { return self._s[1510]! }
+    public var Tour_Title5: String { return self._s[1511]! }
+    public func PUSH_CHAT_MESSAGE_FWD(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1512]!, self._r[1512]!, [_1, _2])
     }
-    public var GroupInfo_SetGroupPhoto: String { return self._s[1473]! }
-    public var Watch_AppName: String { return self._s[1474]! }
-    public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1475]!, self._r[1475]!, [_1])
-    }
-    public var Channel_Username_CheckingUsername: String { return self._s[1476]! }
-    public var ContactList_Context_Call: String { return self._s[1477]! }
-    public var ChatList_ReorderTabs: String { return self._s[1478]! }
-    public var Watch_ChatList_Compose: String { return self._s[1479]! }
-    public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1480]!, self._r[1480]!, [_0])
-    }
-    public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[1481]! }
-    public var ArchivedChats_IntroTitle1: String { return self._s[1482]! }
-    public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1483]!, self._r[1483]!, [_1])
-    }
-    public var Call_StatusRequesting: String { return self._s[1485]! }
-    public var Checkout_TotalPaidAmount: String { return self._s[1486]! }
-    public var Weekday_Friday: String { return self._s[1488]! }
-    public var CreateGroup_ChannelsTooMuch: String { return self._s[1489]! }
-    public func ChatImport_SelectionConfirmationUserWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1490]!, self._r[1490]!, [_0])
-    }
-    public var Watch_ChatList_NoConversationsText: String { return self._s[1491]! }
-    public var Group_Members_AddMembersHelp: String { return self._s[1492]! }
-    public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1493]!, self._r[1493]!, [_0])
-    }
-    public var SecretVideo_Title: String { return self._s[1494]! }
-    public func Notification_PinnedStickerMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1497]!, self._r[1497]!, [_0])
-    }
-    public var Undo_Undo: String { return self._s[1498]! }
-    public var Watch_Microphone_Access: String { return self._s[1499]! }
-    public func ChatImport_SelectionConfirmationGroupWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1500]!, self._r[1500]!, [_1, _2])
-    }
-    public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1501]!, self._r[1501]!, [_1, _2])
-    }
-    public func ChatList_Search_NoResultsQueryDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1502]!, self._r[1502]!, [_0])
-    }
-    public var Checkout_NewCard_PostcodeTitle: String { return self._s[1504]! }
-    public var TwoFactorSetup_Intro_Action: String { return self._s[1505]! }
-    public var Passport_Language_ne: String { return self._s[1506]! }
-    public var TwoStepAuth_EmailHelp: String { return self._s[1508]! }
-    public var Profile_MessageLifetime2s: String { return self._s[1509]! }
-    public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1510]!, self._r[1510]!, ["\(_1)"])
-    }
-    public func Items_NOfM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1511]!, self._r[1511]!, [_1, _2])
-    }
-    public var Media_LimitedAccessText: String { return self._s[1512]! }
-    public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1513]!, self._r[1513]!, [_1, _2])
-    }
-    public var GroupPermission_NoPinMessages: String { return self._s[1514]! }
-    public func Notification_VoiceChatStarted(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1515]!, self._r[1515]!, [_1])
-    }
-    public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Passport_Language_en: String { return self._s[1513]! }
+    public var Checkout_Name: String { return self._s[1514]! }
+    public var ChatImport_Title: String { return self._s[1515]! }
+    public func NetworkUsageSettings_WifiUsageSince(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1516]!, self._r[1516]!, [_0])
     }
-    public var FastTwoStepSetup_HintHelp: String { return self._s[1517]! }
-    public var VoiceOver_SilentPostOff: String { return self._s[1518]! }
-    public var WallpaperSearch_ColorRed: String { return self._s[1519]! }
-    public var Watch_ConnectionDescription: String { return self._s[1520]! }
-    public var Notification_Exceptions_AddException: String { return self._s[1521]! }
-    public var LocalGroup_IrrelevantWarning: String { return self._s[1522]! }
-    public var VoiceOver_MessageContextDelete: String { return self._s[1523]! }
-    public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1524]! }
-    public var Passport_PasswordPlaceholder: String { return self._s[1525]! }
-    public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[1526]! }
-    public var Stats_MessageInteractionsTitle: String { return self._s[1527]! }
-    public var Appearance_ThemeCarouselClassic: String { return self._s[1528]! }
-    public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1530]! }
-    public var Channel_AdminLog_PinMessages: String { return self._s[1531]! }
-    public var Passport_Address_AddRentalAgreement: String { return self._s[1533]! }
-    public var Watch_Message_Game: String { return self._s[1534]! }
-    public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1535]! }
-    public var PrivacyPolicy_DeclineLastWarning: String { return self._s[1536]! }
-    public var EditTheme_FileReadError: String { return self._s[1537]! }
-    public var Group_ErrorAddBlocked: String { return self._s[1538]! }
-    public var CallSettings_UseLessDataLongDescription: String { return self._s[1539]! }
+    public var PhotoEditor_EnhanceTool: String { return self._s[1517]! }
+    public func PUSH_CHAT_DELETE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1518]!, self._r[1518]!, [_1, _2])
+    }
+    public func VoiceChat_UserCanNowSpeak(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1519]!, self._r[1519]!, [_0])
+    }
+    public var PeerInfo_CustomizeNotifications: String { return self._s[1520]! }
+    public func Login_TermsOfService_ProceedBot(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1521]!, self._r[1521]!, [_0])
+    }
+    public var Group_ErrorSendRestrictedMedia: String { return self._s[1522]! }
+    public func UserInfo_NotificationsDefaultSound(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1523]!, self._r[1523]!, [_0])
+    }
+    public var Login_UnknownError: String { return self._s[1524]! }
+    public var Conversation_ImportedMessageHint: String { return self._s[1526]! }
+    public func VoiceChat_ForwardTooltip_Chat(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1527]!, self._r[1527]!, [_0])
+    }
+    public var Passport_Identity_TypeDriversLicense: String { return self._s[1529]! }
+    public var ChatList_AutoarchiveSuggestion_Title: String { return self._s[1530]! }
+    public var Watch_PhotoView_Title: String { return self._s[1531]! }
+    public var Appearance_ThemePreview_ChatList_3_Text: String { return self._s[1532]! }
+    public var Checkout_TotalAmount: String { return self._s[1533]! }
+    public var ChatList_RemoveFolderAction: String { return self._s[1534]! }
+    public func GroupInfo_Permissions_BroadcastConvertInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1535]!, self._r[1535]!, [_0])
+    }
+    public var GroupInfo_SetGroupPhoto: String { return self._s[1536]! }
+    public var Watch_AppName: String { return self._s[1537]! }
+    public func PUSH_PINNED_GAME_SCORE(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1538]!, self._r[1538]!, [_1])
+    }
+    public var Channel_Username_CheckingUsername: String { return self._s[1539]! }
+    public var ContactList_Context_Call: String { return self._s[1540]! }
+    public var ChatList_ReorderTabs: String { return self._s[1541]! }
+    public var Watch_ChatList_Compose: String { return self._s[1542]! }
+    public func Conversation_LiveLocationYouAnd(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1543]!, self._r[1543]!, [_0])
+    }
+    public var Channel_AdminLog_EmptyFilterTitle: String { return self._s[1544]! }
+    public var ArchivedChats_IntroTitle1: String { return self._s[1545]! }
+    public func PUSH_ENCRYPTION_ACCEPT(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1546]!, self._r[1546]!, [_1])
+    }
+    public var Call_StatusRequesting: String { return self._s[1548]! }
+    public var Checkout_TotalPaidAmount: String { return self._s[1549]! }
+    public var Weekday_Friday: String { return self._s[1551]! }
+    public var CreateGroup_ChannelsTooMuch: String { return self._s[1552]! }
+    public func ChatImport_SelectionConfirmationUserWithoutTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1553]!, self._r[1553]!, [_0])
+    }
+    public var Watch_ChatList_NoConversationsText: String { return self._s[1554]! }
+    public var Group_Members_AddMembersHelp: String { return self._s[1555]! }
+    public func Channel_AdminLog_MessageChangedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1556]!, self._r[1556]!, [_0])
+    }
+    public var SecretVideo_Title: String { return self._s[1557]! }
+    public func Notification_PinnedStickerMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1560]!, self._r[1560]!, [_0])
+    }
+    public var Undo_Undo: String { return self._s[1561]! }
+    public var Watch_Microphone_Access: String { return self._s[1562]! }
+    public func ChatImport_SelectionConfirmationGroupWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1563]!, self._r[1563]!, [_1, _2])
+    }
+    public func PUSH_CHAT_MESSAGE_PHOTO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1564]!, self._r[1564]!, [_1, _2])
+    }
+    public func ChatList_Search_NoResultsQueryDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1565]!, self._r[1565]!, [_0])
+    }
+    public var Checkout_NewCard_PostcodeTitle: String { return self._s[1567]! }
+    public var TwoFactorSetup_Intro_Action: String { return self._s[1568]! }
+    public var Passport_Language_ne: String { return self._s[1569]! }
+    public var TwoStepAuth_EmailHelp: String { return self._s[1571]! }
+    public var Profile_MessageLifetime2s: String { return self._s[1572]! }
+    public func Conversation_MessageDialogRetryAll(_ _1: Int) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1574]!, self._r[1574]!, ["\(_1)"])
+    }
+    public func Items_NOfM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1575]!, self._r[1575]!, [_1, _2])
+    }
+    public var VoiceChat_SendPublicLinkSend: String { return self._s[1576]! }
+    public var Media_LimitedAccessText: String { return self._s[1577]! }
+    public func PUSH_CHAT_TITLE_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1578]!, self._r[1578]!, [_1, _2])
+    }
+    public var GroupPermission_NoPinMessages: String { return self._s[1579]! }
+    public func Notification_VoiceChatStarted(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1580]!, self._r[1580]!, [_1])
+    }
+    public func Notification_CreatedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1581]!, self._r[1581]!, [_0])
+    }
+    public var FastTwoStepSetup_HintHelp: String { return self._s[1582]! }
+    public var VoiceOver_SilentPostOff: String { return self._s[1583]! }
+    public var WallpaperSearch_ColorRed: String { return self._s[1584]! }
+    public var Watch_ConnectionDescription: String { return self._s[1585]! }
+    public var Notification_Exceptions_AddException: String { return self._s[1586]! }
+    public var LocalGroup_IrrelevantWarning: String { return self._s[1587]! }
+    public var VoiceOver_MessageContextDelete: String { return self._s[1588]! }
+    public var LogoutOptions_AlternativeOptionsSection: String { return self._s[1589]! }
+    public var Passport_PasswordPlaceholder: String { return self._s[1590]! }
+    public var TwoStepAuth_RecoveryEmailAddDescription: String { return self._s[1591]! }
+    public var Stats_MessageInteractionsTitle: String { return self._s[1592]! }
+    public var Appearance_ThemeCarouselClassic: String { return self._s[1593]! }
+    public var TwoFactorSetup_Email_SkipConfirmationText: String { return self._s[1595]! }
+    public var Channel_AdminLog_PinMessages: String { return self._s[1596]! }
+    public var Passport_Address_AddRentalAgreement: String { return self._s[1598]! }
+    public var Watch_Message_Game: String { return self._s[1599]! }
+    public var PrivacyLastSeenSettings_NeverShareWith: String { return self._s[1600]! }
+    public var PrivacyPolicy_DeclineLastWarning: String { return self._s[1601]! }
+    public var EditTheme_FileReadError: String { return self._s[1602]! }
+    public var Group_ErrorAddBlocked: String { return self._s[1603]! }
+    public var CallSettings_UseLessDataLongDescription: String { return self._s[1604]! }
     public func PUSH_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1541]!, self._r[1541]!, [_1])
+        return formatWithArgumentRanges(self._s[1606]!, self._r[1606]!, [_1])
     }
+    public var GroupRemoved_ViewChannelInfo: String { return self._s[1607]! }
     public func UserInfo_BlockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1542]!, self._r[1542]!, [_0])
+        return formatWithArgumentRanges(self._s[1608]!, self._r[1608]!, [_0])
     }
-    public var CheckoutInfo_ShippingInfoAddress2Placeholder: String { return self._s[1543]! }
-    public var TwoFactorSetup_EmailVerification_Action: String { return self._s[1544]! }
+    public var CheckoutInfo_ShippingInfoAddress2Placeholder: String { return self._s[1609]! }
+    public var TwoFactorSetup_EmailVerification_Action: String { return self._s[1610]! }
     public func Username_LinkHint(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1545]!, self._r[1545]!, [_0])
+        return formatWithArgumentRanges(self._s[1611]!, self._r[1611]!, [_0])
     }
-    public var ConversationProfile_ErrorCreatingConversation: String { return self._s[1546]! }
-    public var Bot_GroupStatusReadsHistory: String { return self._s[1547]! }
-    public var PhotoEditor_CurvesRed: String { return self._s[1548]! }
-    public var InstantPage_TapToOpenLink: String { return self._s[1549]! }
-    public var InviteLink_PeopleJoinedShortNoneExpired: String { return self._s[1550]! }
-    public var FastTwoStepSetup_PasswordHelp: String { return self._s[1551]! }
-    public var Conversation_DiscussionNotStarted: String { return self._s[1552]! }
-    public var Notification_CallMissedShort: String { return self._s[1553]! }
+    public var ConversationProfile_ErrorCreatingConversation: String { return self._s[1612]! }
+    public var Bot_GroupStatusReadsHistory: String { return self._s[1613]! }
+    public var PhotoEditor_CurvesRed: String { return self._s[1614]! }
+    public var InstantPage_TapToOpenLink: String { return self._s[1615]! }
+    public var InviteLink_PeopleJoinedShortNoneExpired: String { return self._s[1616]! }
+    public var FastTwoStepSetup_PasswordHelp: String { return self._s[1617]! }
+    public var Conversation_DiscussionNotStarted: String { return self._s[1618]! }
+    public var Notification_CallMissedShort: String { return self._s[1619]! }
     public func Notification_JoinedGroupByLink(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1554]!, self._r[1554]!, [_0])
+        return formatWithArgumentRanges(self._s[1620]!, self._r[1620]!, [_0])
     }
-    public var Conversation_DeleteMessagesForEveryone: String { return self._s[1555]! }
-    public var Permissions_SiriTitle_v0: String { return self._s[1556]! }
-    public var GroupInfo_AddUserLeftError: String { return self._s[1557]! }
-    public var Conversation_SendMessage_SendSilently: String { return self._s[1558]! }
-    public var Paint_Duplicate: String { return self._s[1559]! }
-    public var AttachmentMenu_WebSearch: String { return self._s[1560]! }
-    public var Bot_Stop: String { return self._s[1562]! }
-    public var Conversation_PrivateChannelTimeLimitedAlertTitle: String { return self._s[1563]! }
-    public var ReportGroupLocation_Report: String { return self._s[1564]! }
-    public var Compose_Create: String { return self._s[1565]! }
-    public var Stats_GroupViewers: String { return self._s[1566]! }
-    public var AutoDownloadSettings_Channels: String { return self._s[1567]! }
-    public var PhotoEditor_QualityHigh: String { return self._s[1568]! }
-    public var VoiceChat_Leave: String { return self._s[1569]! }
-    public var Call_Speaker: String { return self._s[1570]! }
+    public var Conversation_DeleteMessagesForEveryone: String { return self._s[1621]! }
+    public var VoiceChat_UnpinVideo: String { return self._s[1622]! }
+    public var Permissions_SiriTitle_v0: String { return self._s[1623]! }
+    public var GroupInfo_AddUserLeftError: String { return self._s[1624]! }
+    public var Conversation_SendMessage_SendSilently: String { return self._s[1625]! }
+    public var Paint_Duplicate: String { return self._s[1626]! }
+    public var AttachmentMenu_WebSearch: String { return self._s[1627]! }
+    public var Bot_Stop: String { return self._s[1629]! }
+    public var Conversation_PrivateChannelTimeLimitedAlertTitle: String { return self._s[1630]! }
+    public var ReportGroupLocation_Report: String { return self._s[1631]! }
+    public var Compose_Create: String { return self._s[1632]! }
+    public var Stats_GroupViewers: String { return self._s[1633]! }
+    public var AutoDownloadSettings_Channels: String { return self._s[1634]! }
+    public var PhotoEditor_QualityHigh: String { return self._s[1635]! }
+    public var VoiceChat_Leave: String { return self._s[1636]! }
+    public var Call_Speaker: String { return self._s[1637]! }
     public func ChatList_LeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1571]!, self._r[1571]!, [_0])
+        return formatWithArgumentRanges(self._s[1638]!, self._r[1638]!, [_0])
     }
-    public var Conversation_CloudStorage_ChatStatus: String { return self._s[1572]! }
-    public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1573]! }
-    public var ChatList_Context_AddToFolder: String { return self._s[1574]! }
-    public var InviteLink_QRCode_Info: String { return self._s[1575]! }
-    public var AutoremoveSetup_Title: String { return self._s[1576]! }
-    public var ChatList_DeleteForAllMembersConfirmationText: String { return self._s[1577]! }
-    public var Conversation_Unblock: String { return self._s[1578]! }
-    public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[1579]! }
+    public var Conversation_CloudStorage_ChatStatus: String { return self._s[1639]! }
+    public var Chat_AttachmentMultipleFilesDisabled: String { return self._s[1640]! }
+    public var ChatList_Context_AddToFolder: String { return self._s[1641]! }
+    public var InviteLink_QRCode_Info: String { return self._s[1642]! }
+    public var AutoremoveSetup_Title: String { return self._s[1643]! }
+    public var ChatList_DeleteForAllMembersConfirmationText: String { return self._s[1644]! }
+    public var Conversation_Unblock: String { return self._s[1645]! }
+    public var SettingsSearch_Synonyms_Proxy_UseForCalls: String { return self._s[1646]! }
     public func Time_PreciseDate_m8(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1580]!, self._r[1580]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[1647]!, self._r[1647]!, [_1, _2, _3])
     }
-    public var Conversation_ContextMenuReply: String { return self._s[1581]! }
-    public var Contacts_SearchLabel: String { return self._s[1582]! }
-    public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[1583]! }
-    public var Stats_GroupMessagesTitle: String { return self._s[1585]! }
-    public var Notification_CallCanceled: String { return self._s[1586]! }
-    public var VoiceOver_Chat_Selected: String { return self._s[1587]! }
-    public var NotificationsSound_Tremolo: String { return self._s[1589]! }
-    public var VoiceOver_AuthSessions_CurrentSession: String { return self._s[1590]! }
-    public var ChatList_Search_NoResultsDescription: String { return self._s[1591]! }
-    public var AccessDenied_PhotosAndVideos: String { return self._s[1592]! }
-    public var LogoutOptions_ClearCacheText: String { return self._s[1593]! }
+    public var Conversation_ContextMenuReply: String { return self._s[1648]! }
+    public var Contacts_SearchLabel: String { return self._s[1649]! }
+    public var Forward_ErrorPublicQuizDisabledInChannels: String { return self._s[1650]! }
+    public var Stats_GroupMessagesTitle: String { return self._s[1652]! }
+    public var VoiceChat_NoiseSuppression: String { return self._s[1653]! }
+    public var Notification_CallCanceled: String { return self._s[1654]! }
+    public var VoiceOver_Chat_Selected: String { return self._s[1655]! }
+    public var NotificationsSound_Tremolo: String { return self._s[1657]! }
+    public var VoiceOver_AuthSessions_CurrentSession: String { return self._s[1658]! }
+    public var ChatList_Search_NoResultsDescription: String { return self._s[1659]! }
+    public var AccessDenied_PhotosAndVideos: String { return self._s[1660]! }
+    public var LogoutOptions_ClearCacheText: String { return self._s[1661]! }
     public func VoiceChat_DisplayAsSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1595]!, self._r[1595]!, [_0])
+        return formatWithArgumentRanges(self._s[1663]!, self._r[1663]!, [_0])
     }
-    public var VoiceOver_Chat_Sticker: String { return self._s[1596]! }
-    public var ChatListFolder_NameUnread: String { return self._s[1597]! }
-    public var PeerInfo_ButtonMessage: String { return self._s[1599]! }
-    public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[1600]! }
-    public var BlockedUsers_SelectUserTitle: String { return self._s[1601]! }
-    public var ChatSettings_Other: String { return self._s[1602]! }
-    public var UserInfo_NotificationsEnabled: String { return self._s[1603]! }
-    public var CreatePoll_OptionsHeader: String { return self._s[1604]! }
-    public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1607]! }
-    public var Channel_Moderator_Title: String { return self._s[1608]! }
+    public var VoiceOver_Chat_Sticker: String { return self._s[1664]! }
+    public var ChatListFolder_NameUnread: String { return self._s[1665]! }
+    public var PeerInfo_ButtonMessage: String { return self._s[1667]! }
+    public var InfoPlist_NSPhotoLibraryAddUsageDescription: String { return self._s[1668]! }
+    public var Settings_KeepPassword: String { return self._s[1669]! }
+    public var BlockedUsers_SelectUserTitle: String { return self._s[1670]! }
+    public var ChatSettings_Other: String { return self._s[1671]! }
+    public var UserInfo_NotificationsEnabled: String { return self._s[1672]! }
+    public var CreatePoll_OptionsHeader: String { return self._s[1673]! }
+    public var Appearance_RemoveThemeColorConfirmation: String { return self._s[1676]! }
+    public var Channel_Moderator_Title: String { return self._s[1677]! }
     public func Conversation_ForwardTooltip_Chat_Many(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1609]!, self._r[1609]!, [_0])
+        return formatWithArgumentRanges(self._s[1678]!, self._r[1678]!, [_0])
     }
-    public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[1610]! }
-    public var WallpaperColors_Title: String { return self._s[1611]! }
-    public var InviteLink_InviteLink: String { return self._s[1613]! }
-    public var PrivacyPolicy_DeclineMessage: String { return self._s[1614]! }
-    public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[1615]! }
-    public var Your_card_was_declined: String { return self._s[1616]! }
-    public var SettingsSearch_FAQ: String { return self._s[1618]! }
-    public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[1619]! }
-    public var Conversation_ReportSpamConfirmation: String { return self._s[1620]! }
-    public var OwnershipTransfer_SecurityCheck: String { return self._s[1622]! }
-    public var PrivacySettings_DataSettingsHelp: String { return self._s[1623]! }
-    public var Settings_About_Help: String { return self._s[1624]! }
+    public func UserInfo_ContactForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1679]!, self._r[1679]!, [_0, _1])
+    }
+    public var Channel_AdminLog_MessageRestrictedForever: String { return self._s[1680]! }
+    public var WallpaperColors_Title: String { return self._s[1681]! }
+    public var InviteLink_InviteLink: String { return self._s[1683]! }
+    public var PrivacyPolicy_DeclineMessage: String { return self._s[1684]! }
+    public var AutoDownloadSettings_VoiceMessagesTitle: String { return self._s[1685]! }
+    public var Your_card_was_declined: String { return self._s[1686]! }
+    public var SettingsSearch_FAQ: String { return self._s[1688]! }
+    public var EditTheme_Expand_Preview_IncomingReplyName: String { return self._s[1689]! }
+    public var Conversation_ReportSpamConfirmation: String { return self._s[1690]! }
+    public var OwnershipTransfer_SecurityCheck: String { return self._s[1692]! }
+    public var PrivacySettings_DataSettingsHelp: String { return self._s[1693]! }
+    public var Settings_About_Help: String { return self._s[1694]! }
     public func Channel_DiscussionGroup_HeaderGroupSet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1625]!, self._r[1625]!, [_0])
+        return formatWithArgumentRanges(self._s[1695]!, self._r[1695]!, [_0])
     }
-    public var Settings_Proxy: String { return self._s[1626]! }
-    public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1627]! }
-    public var Passport_Identity_TypePassportUploadScan: String { return self._s[1629]! }
-    public var NotificationsSound_Bell: String { return self._s[1630]! }
-    public var PrivacySettings_Title: String { return self._s[1632]! }
-    public var PrivacySettings_DataSettings: String { return self._s[1633]! }
-    public var ConversationMedia_Title: String { return self._s[1634]! }
+    public var Settings_Proxy: String { return self._s[1696]! }
+    public var TwoStepAuth_ResetAccountConfirmation: String { return self._s[1697]! }
+    public var Passport_Identity_TypePassportUploadScan: String { return self._s[1699]! }
+    public var NotificationsSound_Bell: String { return self._s[1700]! }
+    public var PrivacySettings_Title: String { return self._s[1702]! }
+    public var PrivacySettings_DataSettings: String { return self._s[1703]! }
+    public var ConversationMedia_Title: String { return self._s[1704]! }
     public func Channel_AdminLog_MessageAddedAdminName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1635]!, self._r[1635]!, [_1])
+        return formatWithArgumentRanges(self._s[1705]!, self._r[1705]!, [_1])
     }
     public func Conversation_EncryptedPlaceholderTitleIncoming(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1636]!, self._r[1636]!, [_0])
+        return formatWithArgumentRanges(self._s[1706]!, self._r[1706]!, [_0])
     }
-    public var PrivacySettings_BlockedPeersEmpty: String { return self._s[1637]! }
-    public var ReportPeer_ReasonPornography: String { return self._s[1639]! }
-    public var Privacy_Calls: String { return self._s[1640]! }
-    public var TwoFactorSetup_Email_Text: String { return self._s[1641]! }
-    public var Conversation_EncryptedDescriptionTitle: String { return self._s[1642]! }
+    public var PrivacySettings_BlockedPeersEmpty: String { return self._s[1707]! }
+    public var ReportPeer_ReasonPornography: String { return self._s[1709]! }
+    public var Privacy_Calls: String { return self._s[1711]! }
+    public var TwoFactorSetup_Email_Text: String { return self._s[1712]! }
+    public var Conversation_EncryptedDescriptionTitle: String { return self._s[1713]! }
     public func VoiceOver_Chat_MusicTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1643]!, self._r[1643]!, [_1, _2])
-    }
-    public var Passport_Identity_FrontSideHelp: String { return self._s[1644]! }
-    public var InstantPage_VoiceOver_DecreaseFontSize: String { return self._s[1645]! }
-    public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1647]! }
-    public var ContactList_Context_VideoCall: String { return self._s[1648]! }
-    public var Settings_SaveIncomingPhotos: String { return self._s[1649]! }
-    public var Passport_Identity_MiddleName: String { return self._s[1650]! }
-    public var MessagePoll_QuizNoUsers: String { return self._s[1651]! }
-    public func Channel_AdminLog_MutedParticipant(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1652]!, self._r[1652]!, [_1, _2])
-    }
-    public var OldChannels_ChannelFormat: String { return self._s[1653]! }
-    public var Watch_Message_Call: String { return self._s[1654]! }
-    public var VoiceChat_OpenChannel: String { return self._s[1655]! }
-    public var Wallpaper_Title: String { return self._s[1656]! }
-    public var PasscodeSettings_TurnPasscodeOff: String { return self._s[1657]! }
-    public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1658]! }
-    public var ReportGroupLocation_Text: String { return self._s[1659]! }
-    public var InviteText_URL: String { return self._s[1660]! }
-    public var ClearCache_StorageServiceFiles: String { return self._s[1661]! }
-    public var MessageTimer_Custom: String { return self._s[1662]! }
-    public var Message_PinnedLocationMessage: String { return self._s[1663]! }
-    public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1664]!, self._r[1664]!, [_0])
-    }
-    public var EditTheme_UploadNewTheme: String { return self._s[1665]! }
-    public var ChatImportActivity_ErrorLimitExceeded: String { return self._s[1668]! }
-    public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1669]!, self._r[1669]!, [_0])
-    }
-    public var Login_CodeSentCall: String { return self._s[1671]! }
-    public func Conversation_AutoremoveTimerSetUser(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1672]!, self._r[1672]!, [_1, _2])
-    }
-    public var Conversation_Report: String { return self._s[1673]! }
-    public var NotificationSettings_ContactJoined: String { return self._s[1674]! }
-    public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1675]!, self._r[1675]!, [_1])
-    }
-    public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[1676]! }
-    public var BroadcastGroups_IntroText: String { return self._s[1677]! }
-    public var IntentsSettings_SuggestByAll: String { return self._s[1679]! }
-    public var StickerPacksSettings_ShowStickersButton: String { return self._s[1680]! }
-    public var AuthSessions_Title: String { return self._s[1681]! }
-    public func Notification_VoiceChatEnded(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1682]!, self._r[1682]!, [_0])
-    }
-    public var Channel_AdminLog_TitleAllEvents: String { return self._s[1683]! }
-    public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1684]! }
-    public var VoiceChat_YouCanNowSpeak: String { return self._s[1687]! }
-    public var Passport_Address_AddPassportRegistration: String { return self._s[1689]! }
-    public var AutoDownloadSettings_MaxVideoSize: String { return self._s[1690]! }
-    public var ExplicitContent_AlertTitle: String { return self._s[1691]! }
-    public var Channel_UpdatePhotoItem: String { return self._s[1692]! }
-    public var ChatList_AutoarchiveSuggestion_Text: String { return self._s[1694]! }
-    public var Channel_DiscussionGroup_LinkGroup: String { return self._s[1695]! }
-    public func Call_BatteryLow(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1696]!, self._r[1696]!, [_0])
-    }
-    public var Login_HaveNotReceivedCodeInternal: String { return self._s[1697]! }
-    public var WallpaperPreview_PatternPaternApply: String { return self._s[1698]! }
-    public var Notifications_MessageNotificationsSound: String { return self._s[1699]! }
-    public var CommentsGroup_ErrorAccessDenied: String { return self._s[1700]! }
-    public var Appearance_AccentColor: String { return self._s[1702]! }
-    public var GroupInfo_SharedMedia: String { return self._s[1703]! }
-    public var Login_PhonePlaceholder: String { return self._s[1704]! }
-    public var Appearance_TextSize_Automatic: String { return self._s[1705]! }
-    public var EmptyGroupInfo_Line2: String { return self._s[1706]! }
-    public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1707]!, self._r[1707]!, [_1, _2])
-    }
-    public var Conversation_ClearChannel: String { return self._s[1708]! }
-    public var Appearance_AppIconDefaultX: String { return self._s[1710]! }
-    public var EditProfile_NameAndPhotoOrVideoHelp: String { return self._s[1711]! }
-    public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[1712]! }
-    public var Notifications_GroupNotificationsHelp: String { return self._s[1713]! }
-    public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1714]!, self._r[1714]!, [_1, _2])
     }
-    public var ChatList_EmptyChatListEditFilter: String { return self._s[1715]! }
-    public var ChatSettings_ConnectionType_UseProxy: String { return self._s[1718]! }
-    public var Chat_PinnedMessagesHiddenText: String { return self._s[1719]! }
-    public func Message_PinnedGenericMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1720]!, self._r[1720]!, [_0])
+    public var Passport_Identity_FrontSideHelp: String { return self._s[1715]! }
+    public var InstantPage_VoiceOver_DecreaseFontSize: String { return self._s[1716]! }
+    public var GroupInfo_Permissions_SlowmodeHeader: String { return self._s[1718]! }
+    public var ContactList_Context_VideoCall: String { return self._s[1719]! }
+    public var Settings_SaveIncomingPhotos: String { return self._s[1720]! }
+    public var Passport_Identity_MiddleName: String { return self._s[1721]! }
+    public var MessagePoll_QuizNoUsers: String { return self._s[1722]! }
+    public func Channel_AdminLog_MutedParticipant(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1723]!, self._r[1723]!, [_1, _2])
     }
-    public func Location_ProximityTip(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1721]!, self._r[1721]!, [_0])
+    public var OldChannels_ChannelFormat: String { return self._s[1724]! }
+    public var Watch_Message_Call: String { return self._s[1725]! }
+    public var VoiceChat_OpenChannel: String { return self._s[1726]! }
+    public var Wallpaper_Title: String { return self._s[1727]! }
+    public var PasscodeSettings_TurnPasscodeOff: String { return self._s[1728]! }
+    public var IntentsSettings_SuggestedChatsSavedMessages: String { return self._s[1729]! }
+    public var ReportGroupLocation_Text: String { return self._s[1730]! }
+    public var InviteText_URL: String { return self._s[1731]! }
+    public var ClearCache_StorageServiceFiles: String { return self._s[1732]! }
+    public var MessageTimer_Custom: String { return self._s[1733]! }
+    public var Message_PinnedLocationMessage: String { return self._s[1734]! }
+    public func VoiceOver_Chat_ContactOrganization(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1735]!, self._r[1735]!, [_0])
     }
-    public var UserInfo_NotificationsEnable: String { return self._s[1722]! }
-    public var Checkout_PayWithTouchId: String { return self._s[1723]! }
-    public var SharedMedia_ViewInChat: String { return self._s[1724]! }
-    public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1725]!, self._r[1725]!, [_0, _1])
+    public var EditTheme_UploadNewTheme: String { return self._s[1736]! }
+    public var TwoFactorRemember_CheckPassword: String { return self._s[1739]! }
+    public var ChatImportActivity_ErrorLimitExceeded: String { return self._s[1740]! }
+    public func AutoDownloadSettings_UpToForAll(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1741]!, self._r[1741]!, [_0])
     }
-    public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1726]! }
-    public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1727]!, self._r[1727]!, [_1, _2])
+    public var Login_CodeSentCall: String { return self._s[1743]! }
+    public func Conversation_AutoremoveTimerSetUser(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1744]!, self._r[1744]!, [_1, _2])
     }
-    public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1729]!, self._r[1729]!, [_0])
-    }
-    public var Conversation_PeerNearbyText: String { return self._s[1731]! }
-    public var Conversation_StopPollConfirmationTitle: String { return self._s[1732]! }
-    public var PhotoEditor_Skip: String { return self._s[1733]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[1734]! }
-    public var ChatList_EmptyChatList: String { return self._s[1735]! }
-    public var Channel_BanUser_Unban: String { return self._s[1736]! }
-    public func Message_GenericForwardedPsa(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1737]!, self._r[1737]!, [_0])
-    }
-    public var Appearance_TextSize_Apply: String { return self._s[1738]! }
-    public func Conversation_MessageViewCommentsFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1739]!, self._r[1739]!, [_1, _2])
-    }
-    public var Login_InfoFirstNamePlaceholder: String { return self._s[1740]! }
-    public var VoiceOver_Chat_YourSticker: String { return self._s[1741]! }
-    public var TwoStepAuth_HintPlaceholder: String { return self._s[1742]! }
-    public var TwoStepAuth_EmailSkip: String { return self._s[1744]! }
-    public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1745]! }
-    public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[1746]! }
-    public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
+    public var Conversation_Report: String { return self._s[1745]! }
+    public var NotificationSettings_ContactJoined: String { return self._s[1746]! }
+    public func PUSH_MESSAGE_SCREENSHOT(_ _1: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1747]!, self._r[1747]!, [_1])
     }
-    public var VoiceOver_Chat_GoToOriginalMessage: String { return self._s[1749]! }
-    public var State_WaitingForNetwork: String { return self._s[1750]! }
-    public var AccessDenied_CameraRestricted: String { return self._s[1751]! }
-    public var ChatSettings_Appearance: String { return self._s[1752]! }
-    public var ScheduledMessages_BotActionUnavailable: String { return self._s[1753]! }
-    public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[1754]! }
-    public var Channel_DiscussionGroupAdd: String { return self._s[1755]! }
-    public var Conversation_SelectMessages: String { return self._s[1757]! }
-    public var Map_NoPlacesNearby: String { return self._s[1758]! }
-    public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1759]! }
-    public var GroupRemoved_Title: String { return self._s[1760]! }
-    public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1762]! }
-    public var VoiceChat_Mute: String { return self._s[1763]! }
-    public var Paint_Marker: String { return self._s[1764]! }
-    public var Widget_ChatsGalleryTitle: String { return self._s[1765]! }
-    public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1766]!, self._r[1766]!, [_1])
+    public var StickerPacksSettings_ShowStickersButtonHelp: String { return self._s[1748]! }
+    public var BroadcastGroups_IntroText: String { return self._s[1749]! }
+    public var IntentsSettings_SuggestByAll: String { return self._s[1751]! }
+    public var StickerPacksSettings_ShowStickersButton: String { return self._s[1752]! }
+    public var AuthSessions_Title: String { return self._s[1753]! }
+    public func Notification_VoiceChatEnded(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1754]!, self._r[1754]!, [_0])
     }
-    public var SocksProxySetup_ShareProxyList: String { return self._s[1767]! }
-    public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[1768]! }
-    public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1769]!, self._r[1769]!, [_0])
+    public var Settings_Tips: String { return self._s[1755]! }
+    public var Channel_AdminLog_TitleAllEvents: String { return self._s[1756]! }
+    public var WallpaperPreview_WallpaperColors: String { return self._s[1757]! }
+    public var KeyCommand_JumpToNextUnreadChat: String { return self._s[1758]! }
+    public var VoiceChat_YouCanNowSpeak: String { return self._s[1761]! }
+    public var Passport_Address_AddPassportRegistration: String { return self._s[1763]! }
+    public func UserInfo_LinkForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1764]!, self._r[1764]!, [_0, _1])
     }
-    public var EditTheme_ErrorInvalidCharacters: String { return self._s[1770]! }
-    public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[1771]! }
-    public var Notifications_GroupNotificationsAlert: String { return self._s[1772]! }
-    public var SocksProxySetup_ShareQRCode: String { return self._s[1773]! }
-    public var Compose_NewGroup: String { return self._s[1774]! }
-    public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1775]!, self._r[1775]!, [_0])
+    public var AutoDownloadSettings_MaxVideoSize: String { return self._s[1765]! }
+    public var ExplicitContent_AlertTitle: String { return self._s[1766]! }
+    public var Channel_UpdatePhotoItem: String { return self._s[1768]! }
+    public var ChatList_AutoarchiveSuggestion_Text: String { return self._s[1770]! }
+    public var Channel_DiscussionGroup_LinkGroup: String { return self._s[1771]! }
+    public func Call_BatteryLow(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1772]!, self._r[1772]!, [_0])
     }
-    public var Location_LiveLocationRequired_Description: String { return self._s[1777]! }
-    public var Conversation_ClearGroupHistory: String { return self._s[1778]! }
-    public var GroupInfo_InviteLink_Help: String { return self._s[1781]! }
-    public var VoiceOver_BotKeyboard: String { return self._s[1782]! }
-    public var Channel_BanUser_BlockFor: String { return self._s[1783]! }
-    public var Bot_Start: String { return self._s[1784]! }
-    public var Your_card_has_expired: String { return self._s[1785]! }
-    public var Channel_About_Title: String { return self._s[1786]! }
-    public var VoiceChat_EditTitleTitle: String { return self._s[1787]! }
-    public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1788]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[1790]! }
-    public var Conversation_FileDropbox: String { return self._s[1791]! }
-    public var ChatList_Search_NoResultsFitlerMusic: String { return self._s[1792]! }
-    public var Month_GenNovember: String { return self._s[1793]! }
-    public var IntentsSettings_SuggestByShare: String { return self._s[1794]! }
-    public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1795]!, self._r[1795]!, [_0])
+    public var Login_HaveNotReceivedCodeInternal: String { return self._s[1773]! }
+    public var WallpaperPreview_PatternPaternApply: String { return self._s[1774]! }
+    public var Notifications_MessageNotificationsSound: String { return self._s[1775]! }
+    public var CommentsGroup_ErrorAccessDenied: String { return self._s[1776]! }
+    public var Appearance_AccentColor: String { return self._s[1778]! }
+    public var GroupInfo_SharedMedia: String { return self._s[1779]! }
+    public var Login_PhonePlaceholder: String { return self._s[1780]! }
+    public var Appearance_TextSize_Automatic: String { return self._s[1781]! }
+    public var EmptyGroupInfo_Line2: String { return self._s[1782]! }
+    public func PUSH_CHAT_CREATED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1783]!, self._r[1783]!, [_1, _2])
     }
-    public var StickerPack_Add: String { return self._s[1796]! }
-    public var Theme_ErrorNotFound: String { return self._s[1797]! }
-    public var Wallpaper_SearchShort: String { return self._s[1799]! }
-    public var Channel_BanUser_PermissionsHeader: String { return self._s[1800]! }
-    public var ConversationProfile_UsersTooMuchError: String { return self._s[1801]! }
-    public var ChatList_FolderAllChats: String { return self._s[1802]! }
-    public var VoiceChat_EndConfirmationEnd: String { return self._s[1803]! }
-    public var Passport_Authorize: String { return self._s[1804]! }
-    public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+    public var VoiceChat_TapToAddPhotoOrBio: String { return self._s[1784]! }
+    public var Conversation_ClearChannel: String { return self._s[1785]! }
+    public var Conversation_MessageDoesntExist: String { return self._s[1786]! }
+    public var Appearance_AppIconDefaultX: String { return self._s[1788]! }
+    public var EditProfile_NameAndPhotoOrVideoHelp: String { return self._s[1789]! }
+    public var CheckoutInfo_ShippingInfoPostcodePlaceholder: String { return self._s[1790]! }
+    public var Notifications_GroupNotificationsHelp: String { return self._s[1791]! }
+    public func PUSH_CHAT_MESSAGE_NOTEXT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1792]!, self._r[1792]!, [_1, _2])
+    }
+    public var ChatList_EmptyChatListEditFilter: String { return self._s[1793]! }
+    public var ChatSettings_ConnectionType_UseProxy: String { return self._s[1796]! }
+    public var Chat_PinnedMessagesHiddenText: String { return self._s[1797]! }
+    public func Message_PinnedGenericMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1798]!, self._r[1798]!, [_0])
+    }
+    public func Location_ProximityTip(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1799]!, self._r[1799]!, [_0])
+    }
+    public var UserInfo_NotificationsEnable: String { return self._s[1800]! }
+    public var Checkout_PayWithTouchId: String { return self._s[1801]! }
+    public var SharedMedia_ViewInChat: String { return self._s[1802]! }
+    public func Notification_CreatedChatWithTitle(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1803]!, self._r[1803]!, [_0, _1])
+    }
+    public var ChatSettings_AutoDownloadSettings_OffForAll: String { return self._s[1804]! }
+    public func Channel_DiscussionGroup_PublicChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[1805]!, self._r[1805]!, [_1, _2])
     }
-    public var GroupInfo_GroupHistoryVisible: String { return self._s[1806]! }
+    public func Cache_Clear(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1807]!, self._r[1807]!, [_0])
+    }
+    public var Conversation_PeerNearbyText: String { return self._s[1809]! }
+    public var Conversation_StopPollConfirmationTitle: String { return self._s[1810]! }
+    public var PhotoEditor_Skip: String { return self._s[1811]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground_SetColor: String { return self._s[1812]! }
+    public var ChatList_EmptyChatList: String { return self._s[1813]! }
+    public var Channel_BanUser_Unban: String { return self._s[1814]! }
+    public func Message_GenericForwardedPsa(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1815]!, self._r[1815]!, [_0])
+    }
+    public var Appearance_TextSize_Apply: String { return self._s[1816]! }
+    public func Conversation_MessageViewCommentsFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1817]!, self._r[1817]!, [_1, _2])
+    }
+    public var Login_InfoFirstNamePlaceholder: String { return self._s[1818]! }
+    public var VoiceOver_Chat_YourSticker: String { return self._s[1819]! }
+    public var TwoStepAuth_HintPlaceholder: String { return self._s[1820]! }
+    public var TwoStepAuth_EmailSkip: String { return self._s[1822]! }
+    public var ChatList_UndoArchiveMultipleTitle: String { return self._s[1823]! }
+    public var TwoFactorSetup_Email_SkipConfirmationTitle: String { return self._s[1824]! }
+    public func PUSH_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1825]!, self._r[1825]!, [_1])
+    }
+    public var VoiceOver_Chat_GoToOriginalMessage: String { return self._s[1827]! }
+    public var State_WaitingForNetwork: String { return self._s[1828]! }
+    public var AccessDenied_CameraRestricted: String { return self._s[1829]! }
+    public var ChatSettings_Appearance: String { return self._s[1830]! }
+    public var ScheduledMessages_BotActionUnavailable: String { return self._s[1831]! }
+    public var GroupInfo_InviteLink_CopyAlert_Success: String { return self._s[1832]! }
+    public var Channel_DiscussionGroupAdd: String { return self._s[1833]! }
+    public var Conversation_SelectMessages: String { return self._s[1835]! }
+    public var Map_NoPlacesNearby: String { return self._s[1836]! }
+    public var AuthSessions_IncompleteAttemptsInfo: String { return self._s[1837]! }
+    public var GroupRemoved_Title: String { return self._s[1838]! }
+    public var ImportStickerPack_RemoveFromImport: String { return self._s[1839]! }
+    public var TwoStepAuth_EnterPasswordHelp: String { return self._s[1841]! }
+    public var VoiceChat_Mute: String { return self._s[1842]! }
+    public var Paint_Marker: String { return self._s[1843]! }
+    public var Widget_ChatsGalleryTitle: String { return self._s[1844]! }
+    public func AddContact_ContactWillBeSharedAfterMutual(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1845]!, self._r[1845]!, [_1])
+    }
+    public var SocksProxySetup_ShareProxyList: String { return self._s[1846]! }
+    public var GroupInfo_InvitationLinkDoesNotExist: String { return self._s[1847]! }
+    public func VoiceOver_Chat_Size(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1848]!, self._r[1848]!, [_0])
+    }
+    public var EditTheme_ErrorInvalidCharacters: String { return self._s[1849]! }
+    public var Appearance_ThemePreview_ChatList_7_Name: String { return self._s[1850]! }
+    public var Settings_CheckPasswordTitle: String { return self._s[1851]! }
+    public var Notifications_GroupNotificationsAlert: String { return self._s[1852]! }
+    public var SocksProxySetup_ShareQRCode: String { return self._s[1853]! }
+    public var Compose_NewGroup: String { return self._s[1855]! }
+    public func Passport_Address_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1856]!, self._r[1856]!, [_0])
+    }
+    public var Location_LiveLocationRequired_Description: String { return self._s[1858]! }
+    public var Conversation_ClearGroupHistory: String { return self._s[1859]! }
+    public var GroupInfo_InviteLink_Help: String { return self._s[1862]! }
+    public var VoiceOver_BotKeyboard: String { return self._s[1863]! }
+    public var Channel_BanUser_BlockFor: String { return self._s[1864]! }
+    public var Bot_Start: String { return self._s[1865]! }
+    public var Your_card_has_expired: String { return self._s[1866]! }
+    public var Channel_About_Title: String { return self._s[1867]! }
+    public var VoiceChat_EditTitleTitle: String { return self._s[1868]! }
+    public var Passport_Identity_ExpiryDatePlaceholder: String { return self._s[1869]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsExceptions: String { return self._s[1871]! }
+    public var Conversation_FileDropbox: String { return self._s[1872]! }
+    public var ChatList_Search_NoResultsFitlerMusic: String { return self._s[1873]! }
+    public var Month_GenNovember: String { return self._s[1874]! }
+    public var IntentsSettings_SuggestByShare: String { return self._s[1875]! }
+    public func Call_PrivacyErrorMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1876]!, self._r[1876]!, [_0])
+    }
+    public var StickerPack_Add: String { return self._s[1877]! }
+    public var Theme_ErrorNotFound: String { return self._s[1878]! }
+    public var Wallpaper_SearchShort: String { return self._s[1880]! }
+    public var Channel_BanUser_PermissionsHeader: String { return self._s[1881]! }
+    public var ConversationProfile_UsersTooMuchError: String { return self._s[1882]! }
+    public var ChatList_FolderAllChats: String { return self._s[1883]! }
+    public var VoiceChat_EndConfirmationEnd: String { return self._s[1884]! }
+    public var Passport_Authorize: String { return self._s[1885]! }
+    public func Channel_AdminLog_MessageChangedLinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[1886]!, self._r[1886]!, [_1, _2])
+    }
+    public var GroupInfo_GroupHistoryVisible: String { return self._s[1887]! }
     public func PUSH_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1807]!, self._r[1807]!, [_1])
+        return formatWithArgumentRanges(self._s[1888]!, self._r[1888]!, [_1])
     }
-    public var LocalGroup_ButtonTitle: String { return self._s[1808]! }
-    public var VoiceOver_Stickers: String { return self._s[1810]! }
-    public var UserInfo_GroupsInCommon: String { return self._s[1811]! }
-    public var LoginPassword_Title: String { return self._s[1813]! }
-    public var Wallpaper_Set: String { return self._s[1814]! }
-    public var Stats_InteractionsTitle: String { return self._s[1815]! }
+    public var LocalGroup_ButtonTitle: String { return self._s[1889]! }
+    public var VoiceOver_Stickers: String { return self._s[1891]! }
+    public var UserInfo_GroupsInCommon: String { return self._s[1892]! }
+    public var LoginPassword_Title: String { return self._s[1894]! }
+    public var Wallpaper_Set: String { return self._s[1895]! }
+    public var Stats_InteractionsTitle: String { return self._s[1896]! }
     public func SecretGIF_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1817]!, self._r[1817]!, [_0])
+        return formatWithArgumentRanges(self._s[1898]!, self._r[1898]!, [_0])
     }
-    public var Conversation_MessageDialogEdit: String { return self._s[1818]! }
-    public var Paint_Outlined: String { return self._s[1819]! }
+    public var Conversation_MessageDialogEdit: String { return self._s[1899]! }
+    public var Paint_Outlined: String { return self._s[1900]! }
     public func Login_ResetAccountProtected_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1820]!, self._r[1820]!, [_0])
+        return formatWithArgumentRanges(self._s[1901]!, self._r[1901]!, [_0])
     }
     public func Conversation_SetReminder_RemindTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1821]!, self._r[1821]!, [_0])
+        return formatWithArgumentRanges(self._s[1902]!, self._r[1902]!, [_0])
     }
-    public var Invite_LargeRecipientsCountWarning: String { return self._s[1822]! }
-    public var Passport_Address_Street1Placeholder: String { return self._s[1823]! }
-    public var Appearance_ColorThemeNight: String { return self._s[1824]! }
-    public var ChannelInfo_Stats: String { return self._s[1825]! }
-    public var Widget_ShortcutsGalleryTitle: String { return self._s[1826]! }
-    public var TwoStepAuth_RecoveryTitle: String { return self._s[1827]! }
-    public var MediaPicker_TimerTooltip: String { return self._s[1828]! }
-    public var ChatImportActivity_ErrorNotAdmin: String { return self._s[1829]! }
-    public var Common_ChoosePhoto: String { return self._s[1830]! }
-    public var Media_LimitedAccessTitle: String { return self._s[1831]! }
-    public var ChatSettings_AutoDownloadVideos: String { return self._s[1832]! }
-    public var PeerInfo_PaneGroups: String { return self._s[1833]! }
-    public var SocksProxySetup_UsernamePlaceholder: String { return self._s[1835]! }
-    public var ChangePhoneNumberNumber_Title: String { return self._s[1836]! }
-    public var ContactInfo_PhoneLabelMobile: String { return self._s[1837]! }
-    public var OldChannels_ChannelsHeader: String { return self._s[1838]! }
-    public var MuteFor_Forever: String { return self._s[1839]! }
-    public var Passport_Address_PostcodePlaceholder: String { return self._s[1840]! }
-    public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1841]! }
-    public var MessagePoll_LabelAnonymous: String { return self._s[1842]! }
-    public var ContactInfo_Job: String { return self._s[1843]! }
-    public var Passport_Language_mk: String { return self._s[1844]! }
-    public var EditTheme_ShortLink: String { return self._s[1845]! }
-    public var AutoDownloadSettings_PhotosTitle: String { return self._s[1848]! }
-    public var Month_GenApril: String { return self._s[1850]! }
-    public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[1852]! }
-    public var NetworkUsageSettings_TotalSection: String { return self._s[1853]! }
-    public var EditTheme_Create_Preview_OutgoingText: String { return self._s[1854]! }
-    public var EditTheme_Title: String { return self._s[1855]! }
-    public var Conversation_LinkDialogCopy: String { return self._s[1856]! }
+    public var Invite_LargeRecipientsCountWarning: String { return self._s[1903]! }
+    public var Passport_Address_Street1Placeholder: String { return self._s[1904]! }
+    public var Appearance_ColorThemeNight: String { return self._s[1905]! }
+    public var ChannelInfo_Stats: String { return self._s[1906]! }
+    public var Widget_ShortcutsGalleryTitle: String { return self._s[1907]! }
+    public var TwoStepAuth_RecoveryTitle: String { return self._s[1908]! }
+    public var MediaPicker_TimerTooltip: String { return self._s[1909]! }
+    public var ChatImportActivity_ErrorNotAdmin: String { return self._s[1910]! }
+    public var TwoFactorRemember_Title: String { return self._s[1911]! }
+    public var Common_ChoosePhoto: String { return self._s[1912]! }
+    public var Media_LimitedAccessTitle: String { return self._s[1913]! }
+    public var ChatSettings_AutoDownloadVideos: String { return self._s[1914]! }
+    public var PeerInfo_PaneGroups: String { return self._s[1915]! }
+    public var SocksProxySetup_UsernamePlaceholder: String { return self._s[1917]! }
+    public var ChangePhoneNumberNumber_Title: String { return self._s[1918]! }
+    public var ContactInfo_PhoneLabelMobile: String { return self._s[1919]! }
+    public var OldChannels_ChannelsHeader: String { return self._s[1920]! }
+    public var MuteFor_Forever: String { return self._s[1921]! }
+    public var Passport_Address_PostcodePlaceholder: String { return self._s[1922]! }
+    public var SettingsSearch_Synonyms_Appearance_ChatBackground: String { return self._s[1924]! }
+    public var MessagePoll_LabelAnonymous: String { return self._s[1925]! }
+    public var ContactInfo_Job: String { return self._s[1926]! }
+    public var Passport_Language_mk: String { return self._s[1927]! }
+    public var EditTheme_ShortLink: String { return self._s[1928]! }
+    public var AutoDownloadSettings_PhotosTitle: String { return self._s[1931]! }
+    public var Month_GenApril: String { return self._s[1933]! }
+    public var Channel_DiscussionGroup_HeaderLabel: String { return self._s[1935]! }
+    public var NetworkUsageSettings_TotalSection: String { return self._s[1936]! }
+    public var EditTheme_Create_Preview_OutgoingText: String { return self._s[1937]! }
+    public var EditTheme_Title: String { return self._s[1938]! }
+    public var Conversation_LinkDialogCopy: String { return self._s[1939]! }
     public func Channel_AdminLog_MessageInvitedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1857]!, self._r[1857]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[1940]!, self._r[1940]!, [_1, _2])
     }
-    public var Passport_ForgottenPassword: String { return self._s[1858]! }
-    public var WallpaperSearch_Recent: String { return self._s[1859]! }
-    public var ChatSettings_Title: String { return self._s[1864]! }
-    public var Appearance_ReduceMotionInfo: String { return self._s[1865]! }
+    public var Passport_ForgottenPassword: String { return self._s[1941]! }
+    public var WallpaperSearch_Recent: String { return self._s[1942]! }
+    public var ChatSettings_Title: String { return self._s[1947]! }
+    public var Appearance_ReduceMotionInfo: String { return self._s[1948]! }
     public func StickerPackActionInfo_AddedText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1866]!, self._r[1866]!, [_0])
+        return formatWithArgumentRanges(self._s[1949]!, self._r[1949]!, [_0])
     }
-    public var SocksProxySetup_UseForCallsHelp: String { return self._s[1867]! }
-    public var LastSeen_WithinAMonth: String { return self._s[1868]! }
-    public var VoiceChat_Live: String { return self._s[1869]! }
-    public var PeerInfo_ButtonCall: String { return self._s[1870]! }
-    public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[1871]! }
-    public var Group_Username_InvalidStartsWithNumber: String { return self._s[1872]! }
-    public var Call_AudioRouteHide: String { return self._s[1873]! }
-    public var DialogList_SavedMessages: String { return self._s[1874]! }
-    public var ChatList_Context_Mute: String { return self._s[1875]! }
-    public var Conversation_StatusKickedFromChannel: String { return self._s[1876]! }
+    public var SocksProxySetup_UseForCallsHelp: String { return self._s[1950]! }
+    public var LastSeen_WithinAMonth: String { return self._s[1951]! }
+    public var VoiceChat_Live: String { return self._s[1952]! }
+    public var PeerInfo_ButtonCall: String { return self._s[1953]! }
+    public var SettingsSearch_Synonyms_Appearance_Title: String { return self._s[1954]! }
+    public var Group_Username_InvalidStartsWithNumber: String { return self._s[1955]! }
+    public var Call_AudioRouteHide: String { return self._s[1956]! }
+    public var DialogList_SavedMessages: String { return self._s[1957]! }
+    public var ChatList_Context_Mute: String { return self._s[1958]! }
+    public var Conversation_StatusKickedFromChannel: String { return self._s[1959]! }
     public func Notification_Exceptions_MutedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1877]!, self._r[1877]!, [_0])
+        return formatWithArgumentRanges(self._s[1960]!, self._r[1960]!, [_0])
     }
-    public var VoiceChat_StatusMutedForYou: String { return self._s[1878]! }
-    public var Passport_Language_et: String { return self._s[1879]! }
-    public var Conversation_MessageLeaveCommentShort: String { return self._s[1880]! }
-    public var PhotoEditor_CropReset: String { return self._s[1881]! }
-    public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[1882]! }
-    public var SocksProxySetup_HostnamePlaceholder: String { return self._s[1883]! }
-    public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[1884]! }
-    public var WallpaperSearch_ColorWhite: String { return self._s[1887]! }
-    public var Channel_AdminLog_CanEditMessages: String { return self._s[1889]! }
-    public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[1890]! }
-    public var Channel_Username_InvalidStartsWithNumber: String { return self._s[1892]! }
-    public var CheckoutInfo_ReceiverInfoName: String { return self._s[1894]! }
-    public var Map_YouAreHere: String { return self._s[1896]! }
-    public var Core_ServiceUserStatus: String { return self._s[1897]! }
-    public var Channel_Setup_TypePrivateHelp: String { return self._s[1900]! }
-    public var VoiceChat_StartRecording: String { return self._s[1901]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[1902]! }
-    public var MediaPicker_Videos: String { return self._s[1904]! }
-    public var Map_LiveLocationFor15Minutes: String { return self._s[1906]! }
-    public var Passport_Identity_TranslationsHelp: String { return self._s[1907]! }
-    public var SharedMedia_CategoryMedia: String { return self._s[1908]! }
+    public var VoiceChat_StatusMutedForYou: String { return self._s[1961]! }
+    public var Passport_Language_et: String { return self._s[1962]! }
+    public var Conversation_MessageLeaveCommentShort: String { return self._s[1963]! }
+    public var PhotoEditor_CropReset: String { return self._s[1964]! }
+    public var Privacy_GroupsAndChannels_AlwaysAllow: String { return self._s[1965]! }
+    public var SocksProxySetup_HostnamePlaceholder: String { return self._s[1966]! }
+    public var CreateGroup_ErrorLocatedGroupsTooMuch: String { return self._s[1967]! }
+    public var WallpaperSearch_ColorWhite: String { return self._s[1970]! }
+    public var Channel_AdminLog_CanEditMessages: String { return self._s[1972]! }
+    public var Privacy_PaymentsClearInfoDoneHelp: String { return self._s[1973]! }
+    public var Channel_Username_InvalidStartsWithNumber: String { return self._s[1975]! }
+    public var CheckoutInfo_ReceiverInfoName: String { return self._s[1977]! }
+    public var Map_YouAreHere: String { return self._s[1979]! }
+    public var Core_ServiceUserStatus: String { return self._s[1980]! }
+    public var Channel_Setup_TypePrivateHelp: String { return self._s[1983]! }
+    public var VoiceChat_StartRecording: String { return self._s[1984]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeCountUnreadMessages: String { return self._s[1985]! }
+    public var MediaPicker_Videos: String { return self._s[1987]! }
+    public var Map_LiveLocationFor15Minutes: String { return self._s[1989]! }
+    public var Passport_Identity_TranslationsHelp: String { return self._s[1990]! }
+    public var SharedMedia_CategoryMedia: String { return self._s[1991]! }
     public func MediaPicker_Nof(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1909]!, self._r[1909]!, [_0])
+        return formatWithArgumentRanges(self._s[1992]!, self._r[1992]!, [_0])
     }
-    public var ChatSettings_AutoPlayGifs: String { return self._s[1910]! }
-    public var Passport_Identity_CountryPlaceholder: String { return self._s[1911]! }
-    public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[1912]! }
-    public var Conversation_JoinVoiceChatAsListener: String { return self._s[1913]! }
-    public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1914]! }
+    public var ChatSettings_AutoPlayGifs: String { return self._s[1993]! }
+    public var Passport_Identity_CountryPlaceholder: String { return self._s[1994]! }
+    public var Bot_GroupStatusDoesNotReadHistory: String { return self._s[1995]! }
+    public var Conversation_JoinVoiceChatAsListener: String { return self._s[1996]! }
+    public var Notification_Exceptions_RemoveFromExceptions: String { return self._s[1997]! }
     public func Chat_SlowmodeTooltip(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1915]!, self._r[1915]!, [_0])
+        return formatWithArgumentRanges(self._s[1998]!, self._r[1998]!, [_0])
     }
-    public var Web_Error: String { return self._s[1916]! }
-    public var PhotoEditor_SkinTool: String { return self._s[1917]! }
-    public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[1918]! }
-    public var AutoremoveSetup_TimerInfoChat: String { return self._s[1919]! }
-    public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[1921]! }
-    public var PasscodeSettings_Help: String { return self._s[1922]! }
-    public var Appearance_ColorTheme: String { return self._s[1923]! }
+    public var Web_Error: String { return self._s[1999]! }
+    public var PhotoEditor_SkinTool: String { return self._s[2000]! }
+    public var ApplyLanguage_UnsufficientDataTitle: String { return self._s[2001]! }
+    public var AutoremoveSetup_TimerInfoChat: String { return self._s[2002]! }
+    public var ChatSettings_ConnectionType_UseSocks5: String { return self._s[2004]! }
+    public var PasscodeSettings_Help: String { return self._s[2005]! }
+    public var Appearance_ColorTheme: String { return self._s[2006]! }
     public func Channel_AdminLog_MessageRestrictedNewSetting(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1924]!, self._r[1924]!, [_0])
+        return formatWithArgumentRanges(self._s[2007]!, self._r[2007]!, [_0])
     }
-    public var InviteLink_DeleteAllRevokedLinks: String { return self._s[1925]! }
+    public var InviteLink_DeleteAllRevokedLinks: String { return self._s[2008]! }
     public func PUSH_PINNED_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1926]!, self._r[1926]!, [_1])
+        return formatWithArgumentRanges(self._s[2009]!, self._r[2009]!, [_1])
     }
-    public var InviteLink_QRCode_Title: String { return self._s[1927]! }
-    public var GroupInfo_LeftStatus: String { return self._s[1928]! }
-    public var EditTheme_Preview: String { return self._s[1929]! }
-    public var Watch_Suggestion_WhatsUp: String { return self._s[1930]! }
+    public var InviteLink_QRCode_Title: String { return self._s[2010]! }
+    public var GroupInfo_LeftStatus: String { return self._s[2011]! }
+    public var EditTheme_Preview: String { return self._s[2012]! }
+    public var Watch_Suggestion_WhatsUp: String { return self._s[2013]! }
     public func AutoDownloadSettings_PreloadVideoInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1931]!, self._r[1931]!, [_0])
+        return formatWithArgumentRanges(self._s[2014]!, self._r[2014]!, [_0])
     }
-    public var NotificationsSound_Keys: String { return self._s[1932]! }
-    public var VoiceChat_StatusWantsToSpeak: String { return self._s[1933]! }
-    public var PasscodeSettings_UnlockWithTouchId: String { return self._s[1934]! }
-    public var ChatList_Context_MarkAsUnread: String { return self._s[1935]! }
-    public var DialogList_AdNoticeAlert: String { return self._s[1936]! }
-    public var UserInfo_Invite: String { return self._s[1937]! }
-    public var Checkout_Email: String { return self._s[1938]! }
-    public var Stats_GroupActionsTitle: String { return self._s[1939]! }
-    public var Coub_TapForSound: String { return self._s[1940]! }
-    public var Conversation_AutoremoveTimerRemovedUserYou: String { return self._s[1941]! }
-    public var Theme_ThemeChangedText: String { return self._s[1942]! }
-    public var Call_ExternalCallInProgressMessage: String { return self._s[1943]! }
-    public var AutoremoveSetup_TimerInfoChannel: String { return self._s[1944]! }
-    public var Settings_ApplyProxyAlertEnable: String { return self._s[1945]! }
-    public var ScheduledMessages_ScheduledToday: String { return self._s[1946]! }
-    public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[1947]! }
+    public var NotificationsSound_Keys: String { return self._s[2015]! }
+    public var VoiceChat_StatusWantsToSpeak: String { return self._s[2016]! }
+    public var PasscodeSettings_UnlockWithTouchId: String { return self._s[2017]! }
+    public var ChatList_Context_MarkAsUnread: String { return self._s[2018]! }
+    public var DialogList_AdNoticeAlert: String { return self._s[2019]! }
+    public var UserInfo_Invite: String { return self._s[2020]! }
+    public var Checkout_Email: String { return self._s[2021]! }
+    public var Stats_GroupActionsTitle: String { return self._s[2022]! }
+    public var Coub_TapForSound: String { return self._s[2023]! }
+    public var Conversation_AutoremoveTimerRemovedUserYou: String { return self._s[2024]! }
+    public var Theme_ThemeChangedText: String { return self._s[2025]! }
+    public var Call_ExternalCallInProgressMessage: String { return self._s[2026]! }
+    public var AutoremoveSetup_TimerInfoChannel: String { return self._s[2027]! }
+    public var Settings_ApplyProxyAlertEnable: String { return self._s[2028]! }
+    public var ScheduledMessages_ScheduledToday: String { return self._s[2029]! }
+    public var Channel_AdminLog_DefaultRestrictionsUpdated: String { return self._s[2030]! }
     public func VoiceChat_InviteMemberToChannelFirstText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1948]!, self._r[1948]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2031]!, self._r[2031]!, [_1, _2])
     }
-    public var Call_ReportIncludeLogDescription: String { return self._s[1949]! }
-    public var Settings_FrequentlyAskedQuestions: String { return self._s[1951]! }
-    public var Call_VoiceOver_VoiceCallMissed: String { return self._s[1952]! }
-    public var Channel_MessagePhotoRemoved: String { return self._s[1953]! }
-    public var Passport_Email_Delete: String { return self._s[1954]! }
+    public var Call_ReportIncludeLogDescription: String { return self._s[2032]! }
+    public var Settings_FrequentlyAskedQuestions: String { return self._s[2034]! }
+    public var Call_VoiceOver_VoiceCallMissed: String { return self._s[2035]! }
+    public var Channel_MessagePhotoRemoved: String { return self._s[2036]! }
+    public var Passport_Email_Delete: String { return self._s[2037]! }
     public func PUSH_PINNED_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1955]!, self._r[1955]!, [_1])
+        return formatWithArgumentRanges(self._s[2038]!, self._r[2038]!, [_1])
     }
-    public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[1956]! }
+    public var NotificationSettings_ShowNotificationsAllAccountsInfoOn: String { return self._s[2039]! }
     public func Conversation_AutoremoveTimerRemovedUser(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1957]!, self._r[1957]!, [_1])
+        return formatWithArgumentRanges(self._s[2040]!, self._r[2040]!, [_1])
     }
-    public var Channel_AdminLog_CanAddAdmins: String { return self._s[1958]! }
-    public var SocksProxySetup_FailedToConnect: String { return self._s[1960]! }
-    public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[1961]! }
-    public var Common_of: String { return self._s[1962]! }
-    public var VoiceChat_CreateNewVoiceChatText: String { return self._s[1963]! }
-    public var VoiceChat_StartRecordingStart: String { return self._s[1964]! }
-    public var PeerInfo_ButtonUnmute: String { return self._s[1967]! }
+    public var Channel_AdminLog_CanAddAdmins: String { return self._s[2041]! }
+    public var SocksProxySetup_FailedToConnect: String { return self._s[2043]! }
+    public var SettingsSearch_Synonyms_Data_NetworkUsage: String { return self._s[2044]! }
+    public var Common_of: String { return self._s[2045]! }
+    public var VoiceChat_CreateNewVoiceChatText: String { return self._s[2046]! }
+    public var VoiceChat_StartRecordingStart: String { return self._s[2047]! }
+    public var PeerInfo_ButtonUnmute: String { return self._s[2050]! }
     public func ChatSettings_AutoDownloadSettings_TypeFile(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[1968]!, self._r[1968]!, [_0])
+        return formatWithArgumentRanges(self._s[2051]!, self._r[2051]!, [_0])
     }
-    public var ChatList_AddChatsToFolder: String { return self._s[1969]! }
-    public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[1970]! }
-    public var Settings_Title: String { return self._s[1972]! }
-    public var AutoDownloadSettings_Contacts: String { return self._s[1974]! }
-    public var Appearance_BubbleCornersSetting: String { return self._s[1975]! }
-    public var InviteLink_OtherAdminsLinks: String { return self._s[1976]! }
-    public var Privacy_Calls_AlwaysAllow: String { return self._s[1977]! }
-    public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[1979]! }
-    public var WallpaperPreview_CropBottomText: String { return self._s[1980]! }
-    public var SecretTimer_VideoDescription: String { return self._s[1981]! }
-    public var VoiceOver_Chat_AnimatedSticker: String { return self._s[1982]! }
-    public var WallpaperPreview_Blurred: String { return self._s[1983]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[1984]! }
-    public var ChatListFolder_ExcludedSectionHeader: String { return self._s[1986]! }
-    public var Conversation_CancelForwardSelectChat: String { return self._s[1987]! }
-    public var DialogList_PasscodeLockHelp: String { return self._s[1988]! }
-    public var SocksProxySetup_SecretPlaceholder: String { return self._s[1989]! }
-    public var NetworkUsageSettings_CallDataSection: String { return self._s[1990]! }
-    public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[1991]! }
-    public var Passport_FieldAddressTranslationHelp: String { return self._s[1992]! }
-    public var SocksProxySetup_Connection: String { return self._s[1993]! }
-    public var Passport_Address_TypePassportRegistration: String { return self._s[1994]! }
-    public var Contacts_PermissionsAllowInSettings: String { return self._s[1995]! }
-    public var Conversation_Unpin: String { return self._s[1996]! }
-    public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[1997]! }
-    public var TwoFactorSetup_Hint_Placeholder: String { return self._s[1998]! }
-    public var Call_ReportSkip: String { return self._s[1999]! }
+    public var Privacy_ContactsReset_ContactsDeleted: String { return self._s[2052]! }
+    public var ChatList_AddChatsToFolder: String { return self._s[2053]! }
+    public var Login_ResetAccountProtected_LimitExceeded: String { return self._s[2054]! }
+    public var Settings_Title: String { return self._s[2056]! }
+    public var AutoDownloadSettings_Contacts: String { return self._s[2058]! }
+    public var Appearance_BubbleCornersSetting: String { return self._s[2059]! }
+    public var InviteLink_OtherAdminsLinks: String { return self._s[2060]! }
+    public var Privacy_Calls_AlwaysAllow: String { return self._s[2061]! }
+    public var Privacy_Forwards_AlwaysAllow_Title: String { return self._s[2063]! }
+    public var WallpaperPreview_CropBottomText: String { return self._s[2064]! }
+    public var SecretTimer_VideoDescription: String { return self._s[2065]! }
+    public var VoiceOver_Chat_AnimatedSticker: String { return self._s[2066]! }
+    public var WallpaperPreview_Blurred: String { return self._s[2067]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsExceptions: String { return self._s[2068]! }
+    public var ChatListFolder_ExcludedSectionHeader: String { return self._s[2070]! }
+    public var Conversation_CancelForwardSelectChat: String { return self._s[2071]! }
+    public var DialogList_PasscodeLockHelp: String { return self._s[2072]! }
+    public var SocksProxySetup_SecretPlaceholder: String { return self._s[2073]! }
+    public var NetworkUsageSettings_CallDataSection: String { return self._s[2074]! }
+    public var TwoStepAuth_PasswordRemovePassportConfirmation: String { return self._s[2075]! }
+    public var Passport_FieldAddressTranslationHelp: String { return self._s[2076]! }
+    public var SocksProxySetup_Connection: String { return self._s[2077]! }
+    public var Passport_Address_TypePassportRegistration: String { return self._s[2078]! }
+    public var Contacts_PermissionsAllowInSettings: String { return self._s[2079]! }
+    public var Conversation_Unpin: String { return self._s[2080]! }
+    public var Notifications_MessageNotificationsExceptionsHelp: String { return self._s[2081]! }
+    public var TwoFactorSetup_Hint_Placeholder: String { return self._s[2082]! }
+    public var Call_ReportSkip: String { return self._s[2083]! }
     public func VoiceOver_Chat_PhotoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2000]!, self._r[2000]!, [_0])
+        return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, [_0])
     }
     public func VoiceOver_Chat_Caption(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2002]!, self._r[2002]!, [_0])
+        return formatWithArgumentRanges(self._s[2086]!, self._r[2086]!, [_0])
     }
-    public var AutoNightTheme_Automatic: String { return self._s[2003]! }
-    public var Passport_Language_az: String { return self._s[2005]! }
+    public var AutoNightTheme_Automatic: String { return self._s[2087]! }
+    public var Passport_Language_az: String { return self._s[2089]! }
     public func Conversation_AutoremoveChanged(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2006]!, self._r[2006]!, [_0])
+        return formatWithArgumentRanges(self._s[2090]!, self._r[2090]!, [_0])
     }
-    public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[2007]! }
-    public var Watch_UserInfo_Unmute: String { return self._s[2008]! }
-    public var Channel_Stickers_YourStickers: String { return self._s[2009]! }
-    public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2010]! }
-    public var PeerInfo_AutoremoveMessagesDisabled: String { return self._s[2011]! }
-    public var Tour_Text1: String { return self._s[2012]! }
-    public var Common_Delete: String { return self._s[2013]! }
-    public var Settings_EditPhoto: String { return self._s[2014]! }
-    public var Common_Edit: String { return self._s[2015]! }
+    public var SettingsSearch_Synonyms_Data_Storage_ClearCache: String { return self._s[2091]! }
+    public var Watch_UserInfo_Unmute: String { return self._s[2092]! }
+    public var Channel_Stickers_YourStickers: String { return self._s[2093]! }
+    public var Channel_DiscussionGroup_UnlinkChannel: String { return self._s[2094]! }
+    public var PeerInfo_AutoremoveMessagesDisabled: String { return self._s[2095]! }
+    public var Tour_Text1: String { return self._s[2096]! }
+    public var Common_Delete: String { return self._s[2097]! }
+    public var Settings_EditPhoto: String { return self._s[2098]! }
+    public var Common_Edit: String { return self._s[2099]! }
+    public var ShareMenu_ShareTo: String { return self._s[2101]! }
+    public var Passport_Identity_ExpiryDate: String { return self._s[2102]! }
     public func Channel_AdminLog_MutedNewMembers(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2017]!, self._r[2017]!, [_1])
+        return formatWithArgumentRanges(self._s[2103]!, self._r[2103]!, [_1])
     }
-    public var Passport_Identity_ExpiryDate: String { return self._s[2018]! }
-    public var ShareMenu_ShareTo: String { return self._s[2019]! }
-    public var Preview_DeleteGif: String { return self._s[2020]! }
-    public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2021]! }
-    public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2022]! }
-    public var Conversation_ViewReply: String { return self._s[2023]! }
-    public var Stats_LoadingText: String { return self._s[2024]! }
-    public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2025]! }
-    public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2026]! }
-    public var Channel_AdminLog_CanChangeInfo: String { return self._s[2027]! }
+    public var Preview_DeleteGif: String { return self._s[2104]! }
+    public var WallpaperPreview_PatternPaternDiscard: String { return self._s[2105]! }
+    public var ChatSettings_AutoDownloadUsingCellular: String { return self._s[2106]! }
+    public var Conversation_ViewReply: String { return self._s[2107]! }
+    public var Stats_LoadingText: String { return self._s[2108]! }
+    public var Channel_EditAdmin_PermissinAddAdminOn: String { return self._s[2109]! }
+    public var CheckoutInfo_ReceiverInfoEmailPlaceholder: String { return self._s[2110]! }
+    public var Channel_AdminLog_CanChangeInfo: String { return self._s[2111]! }
     public func Passport_Phone_UseTelegramNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2028]!, self._r[2028]!, [_0])
+        return formatWithArgumentRanges(self._s[2112]!, self._r[2112]!, [_0])
     }
     public func Time_MonthOfYear_m2(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2029]!, self._r[2029]!, [_0])
-    }
-    public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2031]!, self._r[2031]!, [_0])
-    }
-    public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[2032]! }
-    public var InviteLink_Share: String { return self._s[2034]! }
-    public func Conversation_ImportProgress(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2036]!, self._r[2036]!, [_0])
-    }
-    public var IntentsSettings_MainAccount: String { return self._s[2037]! }
-    public var Group_MessagePhotoRemoved: String { return self._s[2040]! }
-    public var Conversation_ContextMenuSelect: String { return self._s[2041]! }
-    public var GroupInfo_Permissions_Exceptions: String { return self._s[2043]! }
-    public var GroupRemoved_UsersSectionTitle: String { return self._s[2044]! }
-    public var Contacts_PermissionsEnable: String { return self._s[2045]! }
-    public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[2046]! }
-    public var Common_NotNow: String { return self._s[2047]! }
-    public var Notification_CreatedChannel: String { return self._s[2048]! }
-    public var Stats_ViewsBySourceTitle: String { return self._s[2050]! }
-    public var InviteLink_ContextShare: String { return self._s[2051]! }
-    public var Appearance_AppIconClassic: String { return self._s[2052]! }
-    public var PhotoEditor_QualityTool: String { return self._s[2053]! }
-    public var ClearCache_ClearCache: String { return self._s[2054]! }
-    public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[2055]! }
-    public var AutoDownloadSettings_Videos: String { return self._s[2056]! }
-    public var GroupPermission_Duration: String { return self._s[2057]! }
-    public var ChatList_Read: String { return self._s[2058]! }
-    public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2059]!, self._r[2059]!, [_1, _2])
-    }
-    public var CallFeedback_Send: String { return self._s[2060]! }
-    public var Channel_Stickers_Searching: String { return self._s[2061]! }
-    public var ScheduledMessages_ReminderNotification: String { return self._s[2062]! }
-    public var FastTwoStepSetup_HintSection: String { return self._s[2063]! }
-    public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2064]! }
-    public var EditTheme_CreateTitle: String { return self._s[2065]! }
-    public var Application_Name: String { return self._s[2066]! }
-    public var Paint_Stickers: String { return self._s[2067]! }
-    public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[2068]! }
-    public var Call_StatusFailed: String { return self._s[2069]! }
-    public var Stickers_FavoriteStickers: String { return self._s[2070]! }
-    public var ClearCache_Clear: String { return self._s[2071]! }
-    public var Passport_Language_mn: String { return self._s[2072]! }
-    public var WallpaperPreview_PreviewTopText: String { return self._s[2073]! }
-    public var LogoutOptions_ClearCacheTitle: String { return self._s[2074]! }
-    public var Call_VoiceOver_VideoCallOutgoing: String { return self._s[2076]! }
-    public var TwoFactorSetup_Hint_Text: String { return self._s[2078]! }
-    public var WallpaperPreview_PatternIntensity: String { return self._s[2079]! }
-    public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2080]! }
-    public var Passport_Address_AddBankStatement: String { return self._s[2081]! }
-    public func Conversation_TitleRepliesFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2084]!, self._r[2084]!, [_1, _2])
-    }
-    public var ChatListFolderSettings_RecommendedNewFolder: String { return self._s[2085]! }
-    public var UserInfo_ShareContact: String { return self._s[2086]! }
-    public var Passport_Identity_NamePlaceholder: String { return self._s[2087]! }
-    public var Channel_ErrorAdminsTooMuch: String { return self._s[2089]! }
-    public var Call_RateCall: String { return self._s[2090]! }
-    public var Contacts_AccessDeniedError: String { return self._s[2091]! }
-    public var Invite_ChannelsTooMuch: String { return self._s[2092]! }
-    public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[2093]! }
-    public var Channel_BanUser_PermissionReadMessages: String { return self._s[2094]! }
-    public var InviteLink_Create_TimeLimitInfo: String { return self._s[2095]! }
-    public var Cache_NoLimit: String { return self._s[2097]! }
-    public var Conversation_EmptyPlaceholder: String { return self._s[2101]! }
-    public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2102]! }
-    public var GroupRemoved_RemoveInfo: String { return self._s[2104]! }
-    public var Notification_Exceptions_MessagePreviewAlwaysOff: String { return self._s[2105]! }
-    public var Privacy_Calls_IntegrationHelp: String { return self._s[2106]! }
-    public func PUSH_VIDEO_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2107]!, self._r[2107]!, [_1])
-    }
-    public var VoiceOver_Media_PlaybackRateFast: String { return self._s[2108]! }
-    public var Theme_ThemeChanged: String { return self._s[2109]! }
-    public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2111]! }
-    public var AutoDownloadSettings_MediaTypes: String { return self._s[2112]! }
-    public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2113]!, self._r[2113]!, [_0])
     }
-    public var Channel_AdminLog_InfoPanelTitle: String { return self._s[2114]! }
-    public var Passport_Language_da: String { return self._s[2116]! }
-    public var Chat_SlowmodeSendError: String { return self._s[2117]! }
-    public var Application_Update: String { return self._s[2119]! }
-    public var SocksProxySetup_SaveProxy: String { return self._s[2120]! }
-    public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2121]!, self._r[2121]!, [_1, _2])
+    public func VoiceOver_Chat_VideoMessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2115]!, self._r[2115]!, [_0])
     }
-    public var Privacy_AddNewPeer: String { return self._s[2123]! }
-    public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[2125]! }
-    public var Channel_Members_Title: String { return self._s[2126]! }
-    public var StickerPacks_ActionDelete: String { return self._s[2127]! }
-    public var Settings_LogoutConfirmationText: String { return self._s[2128]! }
-    public var Chat_UnsendMyMessages: String { return self._s[2129]! }
-    public var PeerInfo_ReportProfilePhoto: String { return self._s[2130]! }
-    public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2132]! }
-    public var ChatListFilter_AddChatsTitle: String { return self._s[2133]! }
-    public var Passport_FloodError: String { return self._s[2134]! }
-    public var NotificationSettings_ContactJoinedInfo: String { return self._s[2135]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2136]! }
-    public var CallSettings_TabIconDescription: String { return self._s[2137]! }
-    public var Group_Setup_HistoryHeader: String { return self._s[2139]! }
-    public func Channel_AdminLog_AllowedNewMembersToSpeak(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2140]!, self._r[2140]!, [_1])
+    public var Passport_Address_OneOfTypeRentalAgreement: String { return self._s[2116]! }
+    public var InviteLink_Share: String { return self._s[2118]! }
+    public func Conversation_ImportProgress(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2120]!, self._r[2120]!, [_0])
     }
-    public var TwoStepAuth_EmailTitle: String { return self._s[2141]! }
-    public var GroupInfo_Permissions_Removed: String { return self._s[2142]! }
-    public var DialogList_ClearHistoryConfirmation: String { return self._s[2143]! }
-    public var Contacts_Title: String { return self._s[2145]! }
-    public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2146]!, self._r[2146]!, [_0, _1])
+    public var IntentsSettings_MainAccount: String { return self._s[2121]! }
+    public var Group_MessagePhotoRemoved: String { return self._s[2124]! }
+    public var Conversation_ContextMenuSelect: String { return self._s[2125]! }
+    public var GroupInfo_Permissions_Exceptions: String { return self._s[2127]! }
+    public var GroupRemoved_UsersSectionTitle: String { return self._s[2128]! }
+    public var Contacts_PermissionsEnable: String { return self._s[2129]! }
+    public var Channel_EditAdmin_PermissionDeleteMessagesOfOthers: String { return self._s[2130]! }
+    public var Common_NotNow: String { return self._s[2131]! }
+    public var Notification_CreatedChannel: String { return self._s[2132]! }
+    public var Stats_ViewsBySourceTitle: String { return self._s[2134]! }
+    public var InviteLink_ContextShare: String { return self._s[2135]! }
+    public var Appearance_AppIconClassic: String { return self._s[2136]! }
+    public var PhotoEditor_QualityTool: String { return self._s[2137]! }
+    public var ClearCache_ClearCache: String { return self._s[2138]! }
+    public var TwoFactorSetup_Password_PlaceholderConfirmPassword: String { return self._s[2139]! }
+    public var AutoDownloadSettings_Videos: String { return self._s[2140]! }
+    public var GroupPermission_Duration: String { return self._s[2141]! }
+    public var ChatList_Read: String { return self._s[2142]! }
+    public func Group_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2143]!, self._r[2143]!, [_1, _2])
     }
-    public var ChatList_PeerTypeBot: String { return self._s[2149]! }
-    public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2150]!, self._r[2150]!, [_1, _2])
+    public func ScheduleVoiceChat_ScheduleTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2144]!, self._r[2144]!, [_0])
     }
-    public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[2151]! }
-    public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2152]!, self._r[2152]!, [_1, _2, _3])
+    public var CallFeedback_Send: String { return self._s[2145]! }
+    public var Channel_Stickers_Searching: String { return self._s[2146]! }
+    public var ScheduledMessages_ReminderNotification: String { return self._s[2147]! }
+    public var FastTwoStepSetup_HintSection: String { return self._s[2148]! }
+    public var ChatSettings_AutoDownloadVideoMessages: String { return self._s[2149]! }
+    public var EditTheme_CreateTitle: String { return self._s[2151]! }
+    public var Application_Name: String { return self._s[2152]! }
+    public var Paint_Stickers: String { return self._s[2153]! }
+    public var Appearance_ThemePreview_Chat_1_Text: String { return self._s[2154]! }
+    public var Call_StatusFailed: String { return self._s[2155]! }
+    public var Stickers_FavoriteStickers: String { return self._s[2156]! }
+    public var ClearCache_Clear: String { return self._s[2157]! }
+    public var Passport_Language_mn: String { return self._s[2158]! }
+    public var WallpaperPreview_PreviewTopText: String { return self._s[2159]! }
+    public var LogoutOptions_ClearCacheTitle: String { return self._s[2160]! }
+    public var Call_VoiceOver_VideoCallOutgoing: String { return self._s[2162]! }
+    public var TwoFactorSetup_Hint_Text: String { return self._s[2164]! }
+    public var WallpaperPreview_PatternIntensity: String { return self._s[2165]! }
+    public var CheckoutInfo_ErrorShippingNotAvailable: String { return self._s[2166]! }
+    public var Passport_Address_AddBankStatement: String { return self._s[2167]! }
+    public func Conversation_TitleRepliesFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2170]!, self._r[2170]!, [_1, _2])
     }
-    public var Camera_PhotoMode: String { return self._s[2154]! }
-    public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2155]!, self._r[2155]!, [_1, _2, _3])
-    }
-    public var ContactInfo_PhoneLabelPager: String { return self._s[2156]! }
-    public var SettingsSearch_Synonyms_FAQ: String { return self._s[2157]! }
-    public var Call_CallAgain: String { return self._s[2158]! }
-    public var TwoStepAuth_PasswordSet: String { return self._s[2159]! }
-    public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2160]!, self._r[2160]!, [_0])
-    }
-    public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[2161]! }
-    public var ClearCache_FreeSpaceDescription: String { return self._s[2162]! }
-    public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2163]! }
-    public var Group_LeaveGroup: String { return self._s[2164]! }
-    public var Channel_Setup_LinkTypePrivate: String { return self._s[2166]! }
-    public var GroupInfo_LabelAdmin: String { return self._s[2168]! }
-    public var CheckoutInfo_ErrorStateInvalid: String { return self._s[2170]! }
-    public var Notification_PassportValuePersonalDetails: String { return self._s[2171]! }
-    public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2172]!, self._r[2172]!, [_0])
-    }
-    public var Stats_GroupNewMembersBySourceTitle: String { return self._s[2173]! }
-    public var Appearance_Preview: String { return self._s[2174]! }
-    public var VoiceOver_Chat_Contact: String { return self._s[2175]! }
-    public var Passport_Language_th: String { return self._s[2176]! }
-    public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2178]! }
-    public var LastSeen_Offline: String { return self._s[2181]! }
-    public var Map_OpenInHereMaps: String { return self._s[2182]! }
-    public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[2183]! }
-    public var InviteLink_ContextEdit: String { return self._s[2185]! }
-    public var AutoDownloadSettings_Reset: String { return self._s[2186]! }
-    public var Conversation_SendMessage_SetReminder: String { return self._s[2187]! }
-    public var Channel_AdminLog_EmptyMessageText: String { return self._s[2188]! }
-    public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2189]!, self._r[2189]!, [_0])
-    }
-    public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2190]!, self._r[2190]!, [_0])
-    }
-    public var Passport_Identity_EditDriversLicense: String { return self._s[2191]! }
-    public var ChatListFolder_NameNonMuted: String { return self._s[2192]! }
-    public var Username_Placeholder: String { return self._s[2193]! }
-    public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
+    public var ChatListFolderSettings_RecommendedNewFolder: String { return self._s[2171]! }
+    public var UserInfo_ShareContact: String { return self._s[2172]! }
+    public var Passport_Identity_NamePlaceholder: String { return self._s[2173]! }
+    public var Channel_ErrorAdminsTooMuch: String { return self._s[2175]! }
+    public var Call_RateCall: String { return self._s[2176]! }
+    public var Contacts_AccessDeniedError: String { return self._s[2177]! }
+    public var Invite_ChannelsTooMuch: String { return self._s[2178]! }
+    public var CheckoutInfo_ShippingInfoPostcode: String { return self._s[2179]! }
+    public var Channel_BanUser_PermissionReadMessages: String { return self._s[2180]! }
+    public var InviteLink_Create_TimeLimitInfo: String { return self._s[2181]! }
+    public var Cache_NoLimit: String { return self._s[2184]! }
+    public var Conversation_EmptyPlaceholder: String { return self._s[2185]! }
+    public var Privacy_GroupsAndChannels_AlwaysAllow_Placeholder: String { return self._s[2189]! }
+    public var Notification_Exceptions_MessagePreviewAlwaysOff: String { return self._s[2190]! }
+    public var GroupRemoved_RemoveInfo: String { return self._s[2191]! }
+    public var Privacy_PaymentsClear_AllInfoCleared: String { return self._s[2192]! }
+    public var Privacy_Calls_IntegrationHelp: String { return self._s[2193]! }
+    public func PUSH_VIDEO_CALL_MISSED(_ _1: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2194]!, self._r[2194]!, [_1])
     }
-    public var Passport_Language_it: String { return self._s[2195]! }
-    public var Checkout_NewCard_SaveInfo: String { return self._s[2196]! }
-    public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2197]!, self._r[2197]!, [_1, _2])
+    public var VoiceOver_Media_PlaybackRateFast: String { return self._s[2195]! }
+    public var Theme_ThemeChanged: String { return self._s[2196]! }
+    public var Privacy_GroupsAndChannels_NeverAllow: String { return self._s[2198]! }
+    public var AutoDownloadSettings_MediaTypes: String { return self._s[2199]! }
+    public func Notification_PinnedDocumentMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2200]!, self._r[2200]!, [_0])
     }
-    public var NotificationsSound_Pulse: String { return self._s[2198]! }
-    public var VoiceOver_DismissContextMenu: String { return self._s[2200]! }
-    public var MessagePoll_NoVotes: String { return self._s[2203]! }
-    public var Message_Wallpaper: String { return self._s[2204]! }
-    public var Conversation_JoinVoiceChat: String { return self._s[2205]! }
-    public var Appearance_Other: String { return self._s[2206]! }
-    public var Passport_Identity_NativeNameHelp: String { return self._s[2208]! }
-    public var Group_PublicLink_Placeholder: String { return self._s[2212]! }
-    public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2213]! }
-    public var VoiceOver_Recording_StopAndPreview: String { return self._s[2214]! }
-    public var ChatListFolder_NameBots: String { return self._s[2215]! }
-    public var Conversation_StopPollConfirmation: String { return self._s[2216]! }
-    public var UserInfo_DeleteContact: String { return self._s[2217]! }
-    public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2218]!, self._r[2218]!, [_0])
+    public var Channel_AdminLog_InfoPanelTitle: String { return self._s[2201]! }
+    public var Passport_Language_da: String { return self._s[2203]! }
+    public var Chat_SlowmodeSendError: String { return self._s[2204]! }
+    public var Application_Update: String { return self._s[2206]! }
+    public var SocksProxySetup_SaveProxy: String { return self._s[2207]! }
+    public func PUSH_AUTH_REGION(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2208]!, self._r[2208]!, [_1, _2])
     }
-    public var Wallpaper_Wallpaper: String { return self._s[2220]! }
-    public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2221]!, self._r[2221]!, [_1])
+    public var Privacy_AddNewPeer: String { return self._s[2210]! }
+    public var Channel_DiscussionGroup_MakeHistoryPublicProceed: String { return self._s[2212]! }
+    public var Channel_Members_Title: String { return self._s[2213]! }
+    public var StickerPacks_ActionDelete: String { return self._s[2214]! }
+    public var Conversation_ScheduledVoiceChat: String { return self._s[2215]! }
+    public var Settings_LogoutConfirmationText: String { return self._s[2217]! }
+    public var Chat_UnsendMyMessages: String { return self._s[2218]! }
+    public var PeerInfo_ReportProfilePhoto: String { return self._s[2219]! }
+    public var Conversation_EditingMessageMediaEditCurrentVideo: String { return self._s[2221]! }
+    public var ChatListFilter_AddChatsTitle: String { return self._s[2222]! }
+    public var Passport_FloodError: String { return self._s[2223]! }
+    public var NotificationSettings_ContactJoinedInfo: String { return self._s[2224]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_SecretChatLinkPreview: String { return self._s[2225]! }
+    public var CallSettings_TabIconDescription: String { return self._s[2226]! }
+    public var Group_Setup_HistoryHeader: String { return self._s[2228]! }
+    public func Channel_AdminLog_AllowedNewMembersToSpeak(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2229]!, self._r[2229]!, [_1])
     }
-    public var LoginPassword_ForgotPassword: String { return self._s[2222]! }
-    public var FeaturedStickerPacks_Title: String { return self._s[2223]! }
-    public var Paint_Pen: String { return self._s[2224]! }
-    public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2225]! }
-    public var ChatListFolderSettings_Info: String { return self._s[2226]! }
-    public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2227]! }
-    public var PhotoEditor_CurvesAll: String { return self._s[2229]! }
-    public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2231]!, self._r[2231]!, [_1, _2, _3])
+    public var TwoStepAuth_EmailTitle: String { return self._s[2230]! }
+    public var GroupInfo_Permissions_Removed: String { return self._s[2231]! }
+    public var DialogList_ClearHistoryConfirmation: String { return self._s[2232]! }
+    public var Contacts_Title: String { return self._s[2234]! }
+    public func Notification_Invited(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2235]!, self._r[2235]!, [_0, _1])
     }
-    public var Passport_Address_TypeRentalAgreement: String { return self._s[2233]! }
-    public var Message_ImageExpired: String { return self._s[2234]! }
-    public var Call_ConnectionErrorMessage: String { return self._s[2235]! }
-    public var SearchImages_NoImagesFound: String { return self._s[2237]! }
-    public var PeerInfo_PaneGifs: String { return self._s[2238]! }
-    public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2239]! }
-    public var EnterPasscode_RepeatNewPasscode: String { return self._s[2240]! }
-    public var PhotoEditor_VignetteTool: String { return self._s[2241]! }
-    public var Passport_Language_dz: String { return self._s[2242]! }
-    public var Notifications_ChannelNotificationsHelp: String { return self._s[2243]! }
-    public var Conversation_BlockUser: String { return self._s[2244]! }
-    public var GroupPermission_PermissionDisabledByDefault: String { return self._s[2247]! }
-    public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2249]! }
-    public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var ChatList_PeerTypeBot: String { return self._s[2238]! }
+    public func Channel_AdminLog_SetSlowmode(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2239]!, self._r[2239]!, [_1, _2])
+    }
+    public var Appearance_ThemePreview_Chat_6_Text: String { return self._s[2240]! }
+    public func Time_PreciseDate_m1(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2241]!, self._r[2241]!, [_1, _2, _3])
+    }
+    public var Camera_PhotoMode: String { return self._s[2243]! }
+    public func PUSH_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2244]!, self._r[2244]!, [_1, _2, _3])
+    }
+    public var ContactInfo_PhoneLabelPager: String { return self._s[2245]! }
+    public var SettingsSearch_Synonyms_FAQ: String { return self._s[2246]! }
+    public var Call_CallAgain: String { return self._s[2247]! }
+    public var TwoStepAuth_PasswordSet: String { return self._s[2248]! }
+    public var VoiceChat_EditDescriptionPlaceholder: String { return self._s[2249]! }
+    public func Channel_Management_RestrictedBy(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2250]!, self._r[2250]!, [_0])
     }
-    public var KeyCommand_NewMessage: String { return self._s[2251]! }
-    public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[2254]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Success: String { return self._s[2251]! }
+    public var ClearCache_FreeSpaceDescription: String { return self._s[2252]! }
+    public var Permissions_ContactsAllowInSettings_v0: String { return self._s[2253]! }
+    public var Group_LeaveGroup: String { return self._s[2254]! }
+    public var Channel_Setup_LinkTypePrivate: String { return self._s[2256]! }
+    public var GroupInfo_LabelAdmin: String { return self._s[2258]! }
+    public var CheckoutInfo_ErrorStateInvalid: String { return self._s[2260]! }
+    public var Notification_PassportValuePersonalDetails: String { return self._s[2261]! }
+    public func WebSearch_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2262]!, self._r[2262]!, [_0])
+    }
+    public var Stats_GroupNewMembersBySourceTitle: String { return self._s[2263]! }
+    public var Appearance_Preview: String { return self._s[2264]! }
+    public var VoiceOver_Chat_Contact: String { return self._s[2265]! }
+    public var Passport_Language_th: String { return self._s[2266]! }
+    public var PhotoEditor_CropAspectRatioOriginal: String { return self._s[2268]! }
+    public var LastSeen_Offline: String { return self._s[2271]! }
+    public var Map_OpenInHereMaps: String { return self._s[2272]! }
+    public var SettingsSearch_Synonyms_Data_AutoplayVideos: String { return self._s[2273]! }
+    public var InviteLink_ContextEdit: String { return self._s[2275]! }
+    public var AutoDownloadSettings_Reset: String { return self._s[2276]! }
+    public var Conversation_SendMessage_SetReminder: String { return self._s[2277]! }
+    public var Channel_AdminLog_EmptyMessageText: String { return self._s[2278]! }
+    public func AddContact_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2279]!, self._r[2279]!, [_0])
+    }
+    public func AuthCode_Alert(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2280]!, self._r[2280]!, [_0])
+    }
+    public var Passport_Identity_EditDriversLicense: String { return self._s[2281]! }
+    public var ChatListFolder_NameNonMuted: String { return self._s[2282]! }
+    public var Username_Placeholder: String { return self._s[2283]! }
+    public func PUSH_ALBUM(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2284]!, self._r[2284]!, [_1])
+    }
+    public var Passport_Language_it: String { return self._s[2285]! }
+    public var Checkout_NewCard_SaveInfo: String { return self._s[2286]! }
+    public func Channel_OwnershipTransfer_DescriptionInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2287]!, self._r[2287]!, [_1, _2])
+    }
+    public var NotificationsSound_Pulse: String { return self._s[2288]! }
+    public var VoiceOver_DismissContextMenu: String { return self._s[2290]! }
+    public var MessagePoll_NoVotes: String { return self._s[2293]! }
+    public var Message_Wallpaper: String { return self._s[2294]! }
+    public var Conversation_JoinVoiceChat: String { return self._s[2295]! }
+    public var Appearance_Other: String { return self._s[2296]! }
+    public var Passport_Identity_NativeNameHelp: String { return self._s[2298]! }
+    public var Group_PublicLink_Placeholder: String { return self._s[2302]! }
+    public var Appearance_ThemePreview_ChatList_2_Text: String { return self._s[2303]! }
+    public var VoiceOver_Recording_StopAndPreview: String { return self._s[2304]! }
+    public var ChatListFolder_NameBots: String { return self._s[2305]! }
+    public var Conversation_StopPollConfirmation: String { return self._s[2306]! }
+    public var UserInfo_DeleteContact: String { return self._s[2307]! }
+    public func Time_MonthOfYear_m11(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2308]!, self._r[2308]!, [_0])
+    }
+    public var Wallpaper_Wallpaper: String { return self._s[2310]! }
+    public func PUSH_MESSAGE_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2311]!, self._r[2311]!, [_1])
+    }
+    public var LoginPassword_ForgotPassword: String { return self._s[2312]! }
+    public var FeaturedStickerPacks_Title: String { return self._s[2313]! }
+    public var Paint_Pen: String { return self._s[2314]! }
+    public var Channel_AdminLogFilter_EventsInfo: String { return self._s[2315]! }
+    public var ChatListFolderSettings_Info: String { return self._s[2316]! }
+    public var FastTwoStepSetup_HintPlaceholder: String { return self._s[2317]! }
+    public var PhotoEditor_CurvesAll: String { return self._s[2319]! }
+    public func Time_PreciseDate_m12(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2321]!, self._r[2321]!, [_1, _2, _3])
+    }
+    public var Passport_Address_TypeRentalAgreement: String { return self._s[2323]! }
+    public var Message_ImageExpired: String { return self._s[2324]! }
+    public var Call_ConnectionErrorMessage: String { return self._s[2325]! }
+    public var SearchImages_NoImagesFound: String { return self._s[2327]! }
+    public var PeerInfo_PaneGifs: String { return self._s[2328]! }
+    public var Passport_DeletePersonalDetailsConfirmation: String { return self._s[2329]! }
+    public var EnterPasscode_RepeatNewPasscode: String { return self._s[2330]! }
+    public var PhotoEditor_VignetteTool: String { return self._s[2331]! }
+    public var Passport_Language_dz: String { return self._s[2332]! }
+    public var Notifications_ChannelNotificationsHelp: String { return self._s[2333]! }
+    public var Conversation_BlockUser: String { return self._s[2334]! }
+    public var GroupPermission_PermissionDisabledByDefault: String { return self._s[2337]! }
+    public var TwoStepAuth_CancelResetText: String { return self._s[2339]! }
+    public var Group_OwnershipTransfer_ErrorAdminsTooMuch: String { return self._s[2340]! }
+    public func Time_MonthOfYear_m8(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2341]!, self._r[2341]!, [_0])
+    }
+    public var KeyCommand_NewMessage: String { return self._s[2342]! }
+    public var EditTheme_Edit_Preview_IncomingReplyText: String { return self._s[2345]! }
     public func PUSH_CHAT_MESSAGE_GEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2256]!, self._r[2256]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2347]!, self._r[2347]!, [_1, _2])
     }
-    public var ContactList_Context_StartSecretChat: String { return self._s[2257]! }
-    public var VoiceOver_Chat_File: String { return self._s[2258]! }
-    public var ChatList_EditFolder: String { return self._s[2260]! }
-    public var Appearance_BubbleCorners_Title: String { return self._s[2261]! }
-    public var PeerInfo_PaneAudio: String { return self._s[2262]! }
-    public var ChatListFolder_CategoryContacts: String { return self._s[2264]! }
-    public var VoiceOver_ScheduledMessages: String { return self._s[2265]! }
+    public var ContactList_Context_StartSecretChat: String { return self._s[2348]! }
+    public var VoiceOver_Chat_File: String { return self._s[2349]! }
+    public var ChatList_EditFolder: String { return self._s[2351]! }
+    public var Appearance_BubbleCorners_Title: String { return self._s[2352]! }
+    public var PeerInfo_PaneAudio: String { return self._s[2353]! }
+    public var ChatListFolder_CategoryContacts: String { return self._s[2355]! }
+    public var VoiceOver_ScheduledMessages: String { return self._s[2356]! }
     public func Login_InvalidPhoneEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2266]!, self._r[2266]!, [_1, _2, _3, _4, _5])
+        return formatWithArgumentRanges(self._s[2357]!, self._r[2357]!, [_1, _2, _3, _4, _5])
     }
-    public var ChatList_PeerTypeChannel: String { return self._s[2267]! }
-    public var VoiceOver_Navigation_Search: String { return self._s[2268]! }
-    public var Settings_Search: String { return self._s[2269]! }
-    public var WallpaperSearch_ColorYellow: String { return self._s[2270]! }
-    public var Login_PhoneBannedError: String { return self._s[2271]! }
-    public var KeyCommand_JumpToNextChat: String { return self._s[2272]! }
-    public var Passport_Language_fa: String { return self._s[2273]! }
-    public var Settings_About: String { return self._s[2274]! }
-    public var AutoDownloadSettings_MaxFileSize: String { return self._s[2275]! }
-    public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[2276]! }
-    public var AutoDownloadSettings_DataUsageHigh: String { return self._s[2277]! }
+    public var ChatList_PeerTypeChannel: String { return self._s[2358]! }
+    public var VoiceOver_Navigation_Search: String { return self._s[2359]! }
+    public var Settings_Search: String { return self._s[2360]! }
+    public var WallpaperSearch_ColorYellow: String { return self._s[2361]! }
+    public var Login_PhoneBannedError: String { return self._s[2362]! }
+    public var KeyCommand_JumpToNextChat: String { return self._s[2363]! }
+    public var Passport_Language_fa: String { return self._s[2364]! }
+    public var Settings_About: String { return self._s[2365]! }
+    public var AutoDownloadSettings_MaxFileSize: String { return self._s[2366]! }
+    public var Channel_AdminLog_InfoPanelChannelAlertText: String { return self._s[2367]! }
+    public var AutoDownloadSettings_DataUsageHigh: String { return self._s[2368]! }
     public func PUSH_CHAT_MESSAGE_TEXT(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2278]!, self._r[2278]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_1, _2, _3])
     }
-    public var Common_OK: String { return self._s[2279]! }
-    public var Contacts_SortBy: String { return self._s[2280]! }
-    public var AutoNightTheme_PreferredTheme: String { return self._s[2281]! }
+    public var Common_OK: String { return self._s[2370]! }
+    public var Contacts_SortBy: String { return self._s[2371]! }
+    public var ImportStickerPack_LinkTaken: String { return self._s[2372]! }
+    public var AutoNightTheme_PreferredTheme: String { return self._s[2373]! }
     public func AutoDownloadSettings_OnFor(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2283]!, self._r[2283]!, [_0])
+        return formatWithArgumentRanges(self._s[2375]!, self._r[2375]!, [_0])
     }
-    public var CallFeedback_IncludeLogs: String { return self._s[2286]! }
+    public var CallFeedback_IncludeLogs: String { return self._s[2378]! }
     public func External_OpenIn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2287]!, self._r[2287]!, [_0])
+        return formatWithArgumentRanges(self._s[2379]!, self._r[2379]!, [_0])
     }
-    public var Passcode_AppLockedAlert: String { return self._s[2289]! }
-    public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2290]! }
-    public var Channel_NotificationLoading: String { return self._s[2292]! }
-    public var Passport_Identity_DocumentNumber: String { return self._s[2293]! }
-    public var VoiceOver_Chat_PagePreview: String { return self._s[2294]! }
-    public var VoiceOver_Chat_OpenHint: String { return self._s[2295]! }
-    public var Weekday_ShortFriday: String { return self._s[2296]! }
-    public var Conversation_TitleMute: String { return self._s[2297]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2298]! }
-    public var ScheduledMessages_PollUnavailable: String { return self._s[2299]! }
-    public var DialogList_LanguageTooltip: String { return self._s[2301]! }
-    public var BroadcastGroups_IntroTitle: String { return self._s[2302]! }
-    public var Channel_AdminLogFilter_EventsPinned: String { return self._s[2303]! }
+    public var ImportStickerPack_ChooseLink: String { return self._s[2381]! }
+    public var Passcode_AppLockedAlert: String { return self._s[2382]! }
+    public var TwoStepAuth_SetupPasswordTitle: String { return self._s[2383]! }
+    public var Channel_NotificationLoading: String { return self._s[2385]! }
+    public var Passport_Identity_DocumentNumber: String { return self._s[2386]! }
+    public var VoiceOver_Chat_PagePreview: String { return self._s[2387]! }
+    public var VoiceOver_Chat_OpenHint: String { return self._s[2388]! }
+    public var Weekday_ShortFriday: String { return self._s[2389]! }
+    public var Conversation_TitleMute: String { return self._s[2390]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsSound: String { return self._s[2391]! }
+    public var ScheduledMessages_PollUnavailable: String { return self._s[2392]! }
+    public var DialogList_LanguageTooltip: String { return self._s[2394]! }
+    public var BroadcastGroups_IntroTitle: String { return self._s[2395]! }
+    public var Channel_AdminLogFilter_EventsPinned: String { return self._s[2396]! }
     public func DialogList_SingleUploadingVideoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2304]!, self._r[2304]!, [_0])
+        return formatWithArgumentRanges(self._s[2397]!, self._r[2397]!, [_0])
     }
-    public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[2306]! }
-    public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[2307]! }
-    public var Settings_EditVideo: String { return self._s[2308]! }
-    public var VoiceOver_Common_Off: String { return self._s[2309]! }
-    public var Stickers_FrequentlyUsed: String { return self._s[2310]! }
-    public var GroupPermission_Title: String { return self._s[2311]! }
-    public var AccessDenied_VideoMessageCamera: String { return self._s[2312]! }
-    public var Appearance_ThemeCarouselDay: String { return self._s[2313]! }
+    public var TwoStepAuth_SetupResendEmailCodeAlert: String { return self._s[2399]! }
+    public var Privacy_Calls_AlwaysAllow_Title: String { return self._s[2400]! }
+    public var Settings_EditVideo: String { return self._s[2401]! }
+    public var VoiceOver_Common_Off: String { return self._s[2402]! }
+    public var Stickers_FrequentlyUsed: String { return self._s[2403]! }
+    public var GroupPermission_Title: String { return self._s[2404]! }
+    public var AccessDenied_VideoMessageCamera: String { return self._s[2405]! }
+    public var Appearance_ThemeCarouselDay: String { return self._s[2406]! }
     public func PUSH_CHAT_MESSAGE_AUDIO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2314]!, self._r[2314]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2407]!, self._r[2407]!, [_1, _2])
     }
-    public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2315]! }
-    public var Tour_Title6: String { return self._s[2316]! }
-    public var EmptyGroupInfo_Title: String { return self._s[2317]! }
+    public var Passport_Identity_DocumentNumberPlaceholder: String { return self._s[2408]! }
+    public var Tour_Title6: String { return self._s[2409]! }
+    public var EmptyGroupInfo_Title: String { return self._s[2410]! }
     public func Channel_AdminLog_MessageToggleSignaturesOn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2318]!, self._r[2318]!, [_0])
+        return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_0])
     }
-    public var Passport_Language_sk: String { return self._s[2319]! }
-    public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[2320]! }
-    public var Preview_SaveToCameraRoll: String { return self._s[2321]! }
+    public var Passport_Language_sk: String { return self._s[2412]! }
+    public var VoiceOver_Chat_YourAnonymousPoll: String { return self._s[2413]! }
+    public var TwoFactorRemember_WrongPassword: String { return self._s[2414]! }
+    public var Preview_SaveToCameraRoll: String { return self._s[2415]! }
     public func VoiceChat_YouCanNowSpeakIn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2322]!, self._r[2322]!, [_0])
+        return formatWithArgumentRanges(self._s[2416]!, self._r[2416]!, [_0])
     }
-    public var LogoutOptions_SetPasscodeTitle: String { return self._s[2323]! }
-    public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2324]! }
-    public var Conversation_ContextMenuMore: String { return self._s[2325]! }
-    public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2326]! }
-    public var Channel_AdminLog_CanBeAnonymous: String { return self._s[2327]! }
-    public var CallFeedback_ReasonSilentLocal: String { return self._s[2329]! }
+    public var LogoutOptions_SetPasscodeTitle: String { return self._s[2417]! }
+    public var Passport_Address_TypeUtilityBillUploadScan: String { return self._s[2418]! }
+    public var Conversation_ContextMenuMore: String { return self._s[2419]! }
+    public var Conversation_ForwardAuthorHiddenTooltip: String { return self._s[2420]! }
+    public var Channel_AdminLog_CanBeAnonymous: String { return self._s[2421]! }
+    public var CallFeedback_ReasonSilentLocal: String { return self._s[2423]! }
     public func Channel_AdminLog_UnmutedMutedParticipant(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2330]!, self._r[2330]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2424]!, self._r[2424]!, [_1, _2])
     }
-    public var UserInfo_NotificationsDisable: String { return self._s[2331]! }
+    public var UserInfo_NotificationsDisable: String { return self._s[2425]! }
     public func Channel_AdminLog_EmptyFilterQueryText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2333]!, self._r[2333]!, [_0])
+        return formatWithArgumentRanges(self._s[2427]!, self._r[2427]!, [_0])
     }
-    public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[2334]! }
+    public var SettingsSearch_Synonyms_EditProfile_Bio: String { return self._s[2428]! }
     public func Date_ChatDateHeader(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2336]!, self._r[2336]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2430]!, self._r[2430]!, [_1, _2])
     }
-    public var WallpaperSearch_ColorPrefix: String { return self._s[2337]! }
+    public var WallpaperSearch_ColorPrefix: String { return self._s[2431]! }
     public func Message_ForwardedPsa_covid(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2338]!, self._r[2338]!, [_0])
+        return formatWithArgumentRanges(self._s[2432]!, self._r[2432]!, [_0])
     }
-    public var Conversation_RestrictedMedia: String { return self._s[2340]! }
-    public var Group_MessageVideoUpdated: String { return self._s[2341]! }
-    public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2342]! }
-    public var GroupInfo_DeleteAndExit: String { return self._s[2343]! }
-    public var TwoFactorSetup_Email_Action: String { return self._s[2344]! }
-    public var Media_ShareThisVideo: String { return self._s[2346]! }
-    public var DialogList_Replies: String { return self._s[2348]! }
+    public var VoiceChat_NoiseSuppressionDisabled: String { return self._s[2434]! }
+    public var Conversation_RestrictedMedia: String { return self._s[2435]! }
+    public var Group_MessageVideoUpdated: String { return self._s[2436]! }
+    public var NetworkUsageSettings_ResetStatsConfirmation: String { return self._s[2437]! }
+    public var GroupInfo_DeleteAndExit: String { return self._s[2438]! }
+    public var TwoFactorSetup_Email_Action: String { return self._s[2439]! }
+    public var TwoFactorSetup_ResetDone_TitleNoPassword: String { return self._s[2440]! }
+    public var Media_ShareThisVideo: String { return self._s[2442]! }
+    public var DialogList_Replies: String { return self._s[2444]! }
     public func Conversation_Moderate_DeleteAllMessages(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2349]!, self._r[2349]!, [_0])
+        return formatWithArgumentRanges(self._s[2445]!, self._r[2445]!, [_0])
     }
-    public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2350]! }
-    public var Watch_Suggestion_OnMyWay: String { return self._s[2351]! }
-    public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2352]! }
+    public var CheckoutInfo_ShippingInfoAddress1: String { return self._s[2446]! }
+    public var Watch_Suggestion_OnMyWay: String { return self._s[2447]! }
+    public var ImportStickerPack_ImportingStickers: String { return self._s[2448]! }
+    public var CheckoutInfo_ShippingInfoAddress2: String { return self._s[2449]! }
     public func PUSH_PINNED_POLL(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2353]!, self._r[2353]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2450]!, self._r[2450]!, [_1, _2])
     }
     public func GroupInfo_InvitationLinkAcceptChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2354]!, self._r[2354]!, [_0])
-    }
-    public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[2355]! }
-    public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2356]! }
-    public var ChatList_Search_NoResultsFitlerMedia: String { return self._s[2357]! }
-    public var Channel_Members_InviteLink: String { return self._s[2358]! }
-    public var Conversation_TapAndHoldToRecord: String { return self._s[2359]! }
-    public var WatchRemote_AlertText: String { return self._s[2360]! }
-    public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2361]!, self._r[2361]!, [_1, _2])
-    }
-    public var Conversation_Pin: String { return self._s[2362]! }
-    public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2363]! }
-    public var Stickers_RemoveFromFavorites: String { return self._s[2364]! }
-    public var Conversation_CancelForwardTitle: String { return self._s[2365]! }
-    public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2366]!, self._r[2366]!, [_0])
-    }
-    public var Appearance_AppIconFilled: String { return self._s[2367]! }
-    public var StickerPack_ErrorNotFound: String { return self._s[2368]! }
-    public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2369]!, self._r[2369]!, [_1])
-    }
-    public var Passport_Identity_AddIdentityCard: String { return self._s[2370]! }
-    public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2372]!, self._r[2372]!, [_1])
-    }
-    public var Call_Camera: String { return self._s[2373]! }
-    public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2374]! }
-    public var Group_Location_Info: String { return self._s[2375]! }
-    public var Watch_LastSeen_WithinAMonth: String { return self._s[2376]! }
-    public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2377]! }
-    public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2378]!, self._r[2378]!, [_0])
-    }
-    public var Weekday_Yesterday: String { return self._s[2379]! }
-    public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[2380]! }
-    public var InviteLink_Create_UsersLimit: String { return self._s[2381]! }
-    public var ArchivedPacksAlert_Title: String { return self._s[2382]! }
-    public var PeerInfo_PaneMembers: String { return self._s[2383]! }
-    public var PhotoEditor_SelectCoverFrame: String { return self._s[2384]! }
-    public func Location_ProximityAlertSetTextGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2385]!, self._r[2385]!, [_0])
-    }
-    public var ContactInfo_PhoneLabelMain: String { return self._s[2386]! }
-    public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2387]!, self._r[2387]!, [_1, _2, _3])
-    }
-    public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[2388]! }
-    public var Channel_DiscussionGroup: String { return self._s[2389]! }
-    public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[2390]! }
-    public var InviteLink_Create_TimeLimit: String { return self._s[2392]! }
-    public var Channel_EditAdmin_PermissionsHeader: String { return self._s[2393]! }
-    public var VoiceOver_MessageContextForward: String { return self._s[2394]! }
-    public var SocksProxySetup_TypeNone: String { return self._s[2395]! }
-    public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[2397]! }
-    public var ProfilePhoto_OpenInEditor: String { return self._s[2399]! }
-    public var WallpaperSearch_ColorPurple: String { return self._s[2400]! }
-    public var ChatListFolder_IncludeChatsTitle: String { return self._s[2401]! }
-    public var Group_Username_InvalidTooShort: String { return self._s[2402]! }
-    public var Location_ProximityNotification_DistanceM: String { return self._s[2403]! }
-    public var VoiceChat_EditTitleText: String { return self._s[2404]! }
-    public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2405]!, self._r[2405]!, [_0, _1, _2])
-    }
-    public var Passport_Language_tk: String { return self._s[2406]! }
-    public var ConvertToSupergroup_Title: String { return self._s[2407]! }
-    public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[2408]! }
-    public var Cache_KeepMediaHelp: String { return self._s[2409]! }
-    public var Channel_Management_Title: String { return self._s[2410]! }
-    public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2411]!, self._r[2411]!, [_1])
-    }
-    public var Conversation_ForwardChats: String { return self._s[2412]! }
-    public var Passport_Language_bg: String { return self._s[2413]! }
-    public var SocksProxySetup_TypeSocks: String { return self._s[2414]! }
-    public var Permissions_PrivacyPolicy: String { return self._s[2415]! }
-    public var VoiceOver_Chat_YourMusic: String { return self._s[2416]! }
-    public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[2417]! }
-    public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2418]! }
-    public var Conversation_ContextMenuOpenChannel: String { return self._s[2419]! }
-    public var Report_AdditionalDetailsPlaceholder: String { return self._s[2420]! }
-    public var Activity_UploadingVideo: String { return self._s[2421]! }
-    public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[2423]! }
-    public var Widget_LongTapToEdit: String { return self._s[2424]! }
-    public var VoiceChat_InviteLink_Listener: String { return self._s[2426]! }
-    public var SocksProxySetup_Credentials: String { return self._s[2427]! }
-    public var Preview_SaveGif: String { return self._s[2428]! }
-    public var Cache_Photos: String { return self._s[2429]! }
-    public var Channel_AdminLogFilter_EventsCalls: String { return self._s[2430]! }
-    public var Conversation_ContextMenuCancelEditing: String { return self._s[2431]! }
-    public var Contacts_FailedToSendInvitesMessage: String { return self._s[2432]! }
-    public func VoiceChat_RemoveAndBanPeerConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2433]!, self._r[2433]!, [_1, _2])
-    }
-    public var Passport_Language_lt: String { return self._s[2434]! }
-    public var Passport_DeleteDocument: String { return self._s[2436]! }
-    public var GroupInfo_SetGroupPhotoStop: String { return self._s[2437]! }
-    public func Location_ProximityNotification_NotifyLong(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2438]!, self._r[2438]!, [_1, _2])
-    }
-    public var AccessDenied_VideoMessageMicrophone: String { return self._s[2439]! }
-    public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2440]!, self._r[2440]!, [_0])
-    }
-    public var AccessDenied_VideoCallCamera: String { return self._s[2441]! }
-    public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2442]!, self._r[2442]!, [_0])
-    }
-    public var PhotoEditor_SharpenTool: String { return self._s[2443]! }
-    public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2444]!, self._r[2444]!, [_1])
-    }
-    public var DialogList_Unpin: String { return self._s[2445]! }
-    public var Stickers_NoStickersFound: String { return self._s[2446]! }
-    public var UserInfo_AddContact: String { return self._s[2448]! }
-    public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2450]!, self._r[2450]!, [_0])
-    }
-    public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2451]!, self._r[2451]!, [_0])
     }
-    public var CallFeedback_VideoReasonDistorted: String { return self._s[2452]! }
-    public var Tour_Text2: String { return self._s[2453]! }
+    public var Channel_EditAdmin_PermissinAddAdminOff: String { return self._s[2452]! }
+    public var ChatAdmins_AllMembersAreAdminsOnHelp: String { return self._s[2453]! }
+    public var ChatList_Search_NoResultsFitlerMedia: String { return self._s[2454]! }
+    public var Channel_Members_InviteLink: String { return self._s[2455]! }
+    public var Conversation_TapAndHoldToRecord: String { return self._s[2456]! }
+    public var WatchRemote_AlertText: String { return self._s[2457]! }
+    public func Channel_DiscussionGroup_PrivateChannelLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2458]!, self._r[2458]!, [_1, _2])
+    }
+    public var Conversation_Pin: String { return self._s[2459]! }
+    public var InfoPlist_NSMicrophoneUsageDescription: String { return self._s[2460]! }
+    public var Stickers_RemoveFromFavorites: String { return self._s[2461]! }
+    public var Conversation_CancelForwardTitle: String { return self._s[2462]! }
+    public func Notification_PinnedPollMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2463]!, self._r[2463]!, [_0])
+    }
+    public var Appearance_AppIconFilled: String { return self._s[2464]! }
+    public var StickerPack_ErrorNotFound: String { return self._s[2465]! }
+    public func Channel_AdminLog_MessageRestrictedName(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2466]!, self._r[2466]!, [_1])
+    }
+    public var Passport_Identity_AddIdentityCard: String { return self._s[2467]! }
+    public func PUSH_CHANNEL_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2469]!, self._r[2469]!, [_1])
+    }
+    public var Call_Camera: String { return self._s[2470]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Text: String { return self._s[2471]! }
+    public var Group_Location_Info: String { return self._s[2472]! }
+    public var Watch_LastSeen_WithinAMonth: String { return self._s[2473]! }
+    public var UserInfo_NotificationsDefaultEnabled: String { return self._s[2474]! }
+    public func DialogList_PinLimitError(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2475]!, self._r[2475]!, [_0])
+    }
+    public var Weekday_Yesterday: String { return self._s[2476]! }
+    public var TwoStepAuth_SetupPasswordEnterPasswordNew: String { return self._s[2477]! }
+    public var InviteLink_Create_UsersLimit: String { return self._s[2478]! }
+    public func Notification_VoiceChatScheduledTodayChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2479]!, self._r[2479]!, [_0])
+    }
+    public var ArchivedPacksAlert_Title: String { return self._s[2480]! }
+    public var PeerInfo_PaneMembers: String { return self._s[2481]! }
+    public var PhotoEditor_SelectCoverFrame: String { return self._s[2482]! }
+    public func Location_ProximityAlertSetTextGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2483]!, self._r[2483]!, [_0])
+    }
+    public var ContactInfo_PhoneLabelMain: String { return self._s[2484]! }
+    public func Time_PreciseDate_m7(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2485]!, self._r[2485]!, [_1, _2, _3])
+    }
+    public var TwoFactorSetup_EmailVerification_ChangeAction: String { return self._s[2486]! }
+    public var Channel_DiscussionGroup: String { return self._s[2487]! }
+    public var EditTheme_Edit_Preview_IncomingReplyName: String { return self._s[2488]! }
+    public var InviteLink_Create_TimeLimit: String { return self._s[2490]! }
+    public var Channel_EditAdmin_PermissionsHeader: String { return self._s[2491]! }
+    public var VoiceOver_MessageContextForward: String { return self._s[2492]! }
+    public var SocksProxySetup_TypeNone: String { return self._s[2493]! }
+    public var CreatePoll_MultipleChoiceQuizAlert: String { return self._s[2495]! }
+    public var ProfilePhoto_OpenInEditor: String { return self._s[2497]! }
+    public var WallpaperSearch_ColorPurple: String { return self._s[2498]! }
+    public var ChatListFolder_IncludeChatsTitle: String { return self._s[2499]! }
+    public var Group_Username_InvalidTooShort: String { return self._s[2500]! }
+    public var Location_ProximityNotification_DistanceM: String { return self._s[2501]! }
+    public var VoiceChat_EditTitleText: String { return self._s[2502]! }
+    public func Login_EmailPhoneBody(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2503]!, self._r[2503]!, [_0, _1, _2])
+    }
+    public var Passport_Language_tk: String { return self._s[2504]! }
+    public var ConvertToSupergroup_Title: String { return self._s[2505]! }
+    public var Channel_BanUser_PermissionEmbedLinks: String { return self._s[2506]! }
+    public var Cache_KeepMediaHelp: String { return self._s[2507]! }
+    public var Channel_Management_Title: String { return self._s[2508]! }
+    public func PUSH_MESSAGE_PHOTO_SECRET(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2509]!, self._r[2509]!, [_1])
+    }
+    public var Conversation_ForwardChats: String { return self._s[2510]! }
+    public var Passport_Language_bg: String { return self._s[2511]! }
+    public var SocksProxySetup_TypeSocks: String { return self._s[2512]! }
+    public var Permissions_PrivacyPolicy: String { return self._s[2513]! }
+    public var VoiceOver_Chat_YourMusic: String { return self._s[2514]! }
+    public var SettingsSearch_Synonyms_Notifications_ResetAllNotifications: String { return self._s[2515]! }
+    public var Conversation_EmptyGifPanelPlaceholder: String { return self._s[2516]! }
+    public var Conversation_ContextMenuOpenChannel: String { return self._s[2517]! }
+    public var Report_AdditionalDetailsPlaceholder: String { return self._s[2518]! }
+    public var Activity_UploadingVideo: String { return self._s[2519]! }
+    public var PrivacyPolicy_AgeVerificationAgree: String { return self._s[2521]! }
+    public var Widget_LongTapToEdit: String { return self._s[2522]! }
+    public var VoiceChat_InviteLink_Listener: String { return self._s[2524]! }
+    public var SocksProxySetup_Credentials: String { return self._s[2525]! }
+    public var Preview_SaveGif: String { return self._s[2526]! }
+    public var Cache_Photos: String { return self._s[2527]! }
+    public var Channel_AdminLogFilter_EventsCalls: String { return self._s[2528]! }
+    public var Conversation_ContextMenuCancelEditing: String { return self._s[2529]! }
+    public var Contacts_FailedToSendInvitesMessage: String { return self._s[2530]! }
+    public func VoiceChat_RemoveAndBanPeerConfirmation(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2531]!, self._r[2531]!, [_1, _2])
+    }
+    public var Passport_Language_lt: String { return self._s[2532]! }
+    public var Passport_DeleteDocument: String { return self._s[2534]! }
+    public var GroupInfo_SetGroupPhotoStop: String { return self._s[2535]! }
+    public func Location_ProximityNotification_NotifyLong(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2536]!, self._r[2536]!, [_1, _2])
+    }
+    public var AccessDenied_VideoMessageMicrophone: String { return self._s[2537]! }
+    public func PeopleNearby_VisibleUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2538]!, self._r[2538]!, [_0])
+    }
+    public var AccessDenied_VideoCallCamera: String { return self._s[2539]! }
+    public func Channel_AdminLog_MessageDeleted(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2540]!, self._r[2540]!, [_0])
+    }
+    public var PhotoEditor_SharpenTool: String { return self._s[2541]! }
+    public func PUSH_CHANNEL_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2542]!, self._r[2542]!, [_1])
+    }
+    public var DialogList_Unpin: String { return self._s[2543]! }
+    public var Stickers_NoStickersFound: String { return self._s[2544]! }
+    public var UserInfo_AddContact: String { return self._s[2546]! }
+    public func AddContact_SharedContactExceptionInfo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2548]!, self._r[2548]!, [_0])
+    }
+    public func Notification_PinnedLocationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2549]!, self._r[2549]!, [_0])
+    }
+    public var CallFeedback_VideoReasonDistorted: String { return self._s[2550]! }
+    public var Tour_Text2: String { return self._s[2551]! }
     public func Conversation_TitleCommentsFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2455]!, self._r[2455]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2553]!, self._r[2553]!, [_1, _2])
     }
-    public var InviteLink_DeleteAllRevokedLinksAlert_Text: String { return self._s[2457]! }
-    public var Paint_Delete: String { return self._s[2458]! }
+    public var InviteLink_DeleteAllRevokedLinksAlert_Text: String { return self._s[2555]! }
+    public var Paint_Delete: String { return self._s[2556]! }
     public func Call_VoiceChatInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2459]!, self._r[2459]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2557]!, self._r[2557]!, [_1, _2])
     }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2460]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsVibrate: String { return self._s[2558]! }
     public func PrivacySettings_LastSeenEverybodyMinus(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2462]!, self._r[2462]!, [_0])
+        return formatWithArgumentRanges(self._s[2560]!, self._r[2560]!, [_0])
     }
-    public var Privacy_Calls_NeverAllow_Title: String { return self._s[2463]! }
-    public var Notification_CallOutgoingShort: String { return self._s[2464]! }
-    public var Checkout_PasswordEntry_Title: String { return self._s[2465]! }
-    public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2466]! }
-    public var Notification_MessageLifetime1m: String { return self._s[2467]! }
-    public var BlockedUsers_AddNew: String { return self._s[2469]! }
-    public var FastTwoStepSetup_EmailSection: String { return self._s[2470]! }
-    public var Settings_SaveEditedPhotos: String { return self._s[2471]! }
-    public var GroupInfo_GroupNamePlaceholder: String { return self._s[2472]! }
-    public var Channel_AboutItem: String { return self._s[2473]! }
-    public var GroupInfo_InviteLink_RevokeLink: String { return self._s[2474]! }
-    public var Privacy_Calls_P2PNever: String { return self._s[2476]! }
-    public var Passport_Language_uk: String { return self._s[2477]! }
-    public var NetworkUsageSettings_Wifi: String { return self._s[2478]! }
-    public var Conversation_Moderate_Report: String { return self._s[2479]! }
-    public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2480]! }
-    public var VoiceOver_Chat_SeenByRecipients: String { return self._s[2481]! }
-    public var Permissions_SiriText_v0: String { return self._s[2482]! }
-    public var Theme_Colors_Background: String { return self._s[2483]! }
-    public var Notification_CallMissed: String { return self._s[2484]! }
-    public var Stats_ZoomOut: String { return self._s[2485]! }
-    public var Profile_AddToExisting: String { return self._s[2486]! }
-    public var Passport_FieldAddressUploadHelp: String { return self._s[2489]! }
-    public var VoiceChat_RemovePeerRemove: String { return self._s[2490]! }
-    public var Undo_DeletedChannel: String { return self._s[2491]! }
+    public var Privacy_Calls_NeverAllow_Title: String { return self._s[2561]! }
+    public var Notification_CallOutgoingShort: String { return self._s[2562]! }
+    public var Checkout_PasswordEntry_Title: String { return self._s[2563]! }
+    public var Channel_AdminLogFilter_AdminsAll: String { return self._s[2564]! }
+    public var Notification_MessageLifetime1m: String { return self._s[2565]! }
+    public var BlockedUsers_AddNew: String { return self._s[2567]! }
+    public var FastTwoStepSetup_EmailSection: String { return self._s[2568]! }
+    public var Settings_SaveEditedPhotos: String { return self._s[2569]! }
+    public var GroupInfo_GroupNamePlaceholder: String { return self._s[2570]! }
+    public func ImportStickerPack_Of(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2571]!, self._r[2571]!, [_1, _2])
+    }
+    public var Channel_AboutItem: String { return self._s[2572]! }
+    public var GroupInfo_InviteLink_RevokeLink: String { return self._s[2573]! }
+    public var Privacy_Calls_P2PNever: String { return self._s[2575]! }
+    public var Passport_Language_uk: String { return self._s[2576]! }
+    public var NetworkUsageSettings_Wifi: String { return self._s[2577]! }
+    public var Conversation_Moderate_Report: String { return self._s[2578]! }
+    public var Wallpaper_ResetWallpapersConfirmation: String { return self._s[2579]! }
+    public var VoiceOver_Chat_SeenByRecipients: String { return self._s[2580]! }
+    public var Permissions_SiriText_v0: String { return self._s[2581]! }
+    public var Theme_Colors_Background: String { return self._s[2582]! }
+    public var Notification_CallMissed: String { return self._s[2583]! }
+    public var Stats_ZoomOut: String { return self._s[2584]! }
+    public var Profile_AddToExisting: String { return self._s[2585]! }
+    public var Passport_FieldAddressUploadHelp: String { return self._s[2588]! }
+    public var VoiceChat_RemovePeerRemove: String { return self._s[2589]! }
+    public var Undo_DeletedChannel: String { return self._s[2590]! }
     public func Channel_AdminLog_MessagePinned(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2492]!, self._r[2492]!, [_0])
+        return formatWithArgumentRanges(self._s[2591]!, self._r[2591]!, [_0])
     }
-    public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2493]! }
-    public var Map_LiveLocationGroupDescription: String { return self._s[2494]! }
-    public var Passport_InfoFAQ_URL: String { return self._s[2495]! }
-    public var IntentsSettings_SuggestedChats: String { return self._s[2498]! }
+    public var Login_ResetAccountProtected_TimerTitle: String { return self._s[2592]! }
+    public var Map_LiveLocationGroupDescription: String { return self._s[2593]! }
+    public var Passport_InfoFAQ_URL: String { return self._s[2594]! }
+    public var IntentsSettings_SuggestedChats: String { return self._s[2597]! }
     public func PUSH_MESSAGE_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2499]!, self._r[2499]!, [_1])
+        return formatWithArgumentRanges(self._s[2598]!, self._r[2598]!, [_1])
     }
-    public var State_connecting: String { return self._s[2500]! }
-    public var Passport_Identity_Country: String { return self._s[2501]! }
-    public var Passport_PasswordDescription: String { return self._s[2502]! }
-    public var ChatList_PsaLabel_covid: String { return self._s[2503]! }
+    public var State_connecting: String { return self._s[2599]! }
+    public var Passport_Identity_Country: String { return self._s[2600]! }
+    public var Passport_PasswordDescription: String { return self._s[2601]! }
+    public var ChatList_PsaLabel_covid: String { return self._s[2602]! }
     public func PUSH_MESSAGE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2504]!, self._r[2504]!, [_1])
+        return formatWithArgumentRanges(self._s[2603]!, self._r[2603]!, [_1])
     }
-    public var Contacts_AddPeopleNearby: String { return self._s[2505]! }
-    public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[2506]! }
-    public var ClearCache_Description: String { return self._s[2507]! }
-    public var Localization_LanguageName: String { return self._s[2508]! }
+    public var Contacts_AddPeopleNearby: String { return self._s[2604]! }
+    public var OwnershipTransfer_SetupTwoStepAuth: String { return self._s[2605]! }
+    public var ClearCache_Description: String { return self._s[2606]! }
+    public var Localization_LanguageName: String { return self._s[2607]! }
     public func UserInfo_UnblockConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2509]!, self._r[2509]!, [_0])
+        return formatWithArgumentRanges(self._s[2608]!, self._r[2608]!, [_0])
     }
-    public var Conversation_AddMembers: String { return self._s[2510]! }
-    public var ChatList_TabIconFoldersTooltipEmptyFolders: String { return self._s[2511]! }
-    public var UserInfo_CreateNewContact: String { return self._s[2512]! }
-    public var Channel_Stickers_NotFound: String { return self._s[2514]! }
-    public var Message_FakeAccount: String { return self._s[2515]! }
-    public var Watch_Message_Poll: String { return self._s[2516]! }
-    public var Group_Members_Title: String { return self._s[2517]! }
-    public var Privacy_Forwards_WhoCanForward: String { return self._s[2518]! }
+    public var Conversation_AddMembers: String { return self._s[2609]! }
+    public var ChatList_TabIconFoldersTooltipEmptyFolders: String { return self._s[2610]! }
+    public var UserInfo_CreateNewContact: String { return self._s[2611]! }
+    public var Channel_Stickers_NotFound: String { return self._s[2613]! }
+    public var Message_FakeAccount: String { return self._s[2614]! }
+    public var Watch_Message_Poll: String { return self._s[2615]! }
+    public var Group_Members_Title: String { return self._s[2616]! }
+    public var Privacy_Forwards_WhoCanForward: String { return self._s[2617]! }
     public func Notification_Kicked(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2519]!, self._r[2519]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[2618]!, self._r[2618]!, [_0, _1])
     }
-    public var BroadcastGroups_Convert: String { return self._s[2520]! }
-    public var Login_InfoDeletePhoto: String { return self._s[2521]! }
-    public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[2522]! }
-    public var InstantPage_FeedbackButton: String { return self._s[2523]! }
-    public var Appearance_PreviewReplyText: String { return self._s[2524]! }
-    public var Passport_FieldPhoneHelp: String { return self._s[2525]! }
-    public var Group_ErrorAddTooMuchBots: String { return self._s[2526]! }
-    public var Media_SendingOptionsTooltip: String { return self._s[2527]! }
-    public var ScheduledMessages_ScheduledOnline: String { return self._s[2528]! }
-    public var Notifications_Badge: String { return self._s[2529]! }
-    public var VoiceOver_Chat_VideoMessage: String { return self._s[2530]! }
-    public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2531]! }
+    public var VoiceChat_CancelConfirmationText: String { return self._s[2619]! }
+    public var BroadcastGroups_Convert: String { return self._s[2620]! }
+    public var Login_InfoDeletePhoto: String { return self._s[2621]! }
+    public var Appearance_ThemePreview_ChatList_6_Name: String { return self._s[2622]! }
+    public var InstantPage_FeedbackButton: String { return self._s[2623]! }
+    public var Appearance_PreviewReplyText: String { return self._s[2624]! }
+    public var Passport_FieldPhoneHelp: String { return self._s[2625]! }
+    public var Group_ErrorAddTooMuchBots: String { return self._s[2626]! }
+    public var Media_SendingOptionsTooltip: String { return self._s[2627]! }
+    public var ScheduledMessages_ScheduledOnline: String { return self._s[2628]! }
+    public var Notifications_Badge: String { return self._s[2629]! }
+    public var VoiceOver_Chat_VideoMessage: String { return self._s[2630]! }
+    public var TwoStepAuth_RecoveryCodeExpired: String { return self._s[2631]! }
     public func Notification_PinnedPhotoMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2533]!, self._r[2533]!, [_0])
+        return formatWithArgumentRanges(self._s[2633]!, self._r[2633]!, [_0])
     }
-    public var Passport_InfoLearnMore: String { return self._s[2534]! }
-    public var EnterPasscode_EnterTitle: String { return self._s[2535]! }
-    public var Appearance_EditTheme: String { return self._s[2536]! }
-    public var EditTheme_Expand_BottomInfo: String { return self._s[2537]! }
-    public var Stats_FollowersTitle: String { return self._s[2538]! }
-    public var Passport_Identity_SurnamePlaceholder: String { return self._s[2539]! }
-    public var Channel_Subscribers_Title: String { return self._s[2540]! }
-    public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2541]! }
-    public var ChatImportActivity_ErrorGeneric: String { return self._s[2542]! }
-    public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[2543]! }
-    public var EditTheme_Create_Preview_IncomingText: String { return self._s[2544]! }
-    public var Conversation_AddToReadingList: String { return self._s[2545]! }
+    public var Passport_InfoLearnMore: String { return self._s[2634]! }
+    public var EnterPasscode_EnterTitle: String { return self._s[2635]! }
+    public var Appearance_EditTheme: String { return self._s[2636]! }
+    public var EditTheme_Expand_BottomInfo: String { return self._s[2637]! }
+    public var Stats_FollowersTitle: String { return self._s[2638]! }
+    public var Passport_Identity_SurnamePlaceholder: String { return self._s[2639]! }
+    public var Channel_Subscribers_Title: String { return self._s[2640]! }
+    public var Group_ErrorSupergroupConversionNotPossible: String { return self._s[2641]! }
+    public var ChatImportActivity_ErrorGeneric: String { return self._s[2642]! }
+    public var EditTheme_ThemeTemplateAlertTitle: String { return self._s[2643]! }
+    public var EditTheme_Create_Preview_IncomingText: String { return self._s[2644]! }
+    public var Conversation_AddToReadingList: String { return self._s[2645]! }
+    public var VoiceChat_EditBioPlaceholder: String { return self._s[2646]! }
     public func Notifications_ExceptionsChangeSound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2546]!, self._r[2546]!, [_0])
+        return formatWithArgumentRanges(self._s[2647]!, self._r[2647]!, [_0])
     }
-    public var Group_AdminLog_EmptyText: String { return self._s[2547]! }
-    public var Passport_Identity_EditInternalPassport: String { return self._s[2548]! }
-    public var Watch_Location_Current: String { return self._s[2549]! }
-    public var PrivacyPolicy_Title: String { return self._s[2550]! }
-    public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2557]! }
-    public var Channel_TypeSetup_Title: String { return self._s[2561]! }
-    public var Appearance_PreviewReplyAuthor: String { return self._s[2562]! }
-    public var Passport_Language_ja: String { return self._s[2563]! }
-    public var ReportPeer_ReasonSpam: String { return self._s[2564]! }
-    public var Widget_GalleryDescription: String { return self._s[2565]! }
-    public var Privacy_PaymentsClearInfoHelp: String { return self._s[2566]! }
-    public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[2568]! }
-    public var Channel_AdminLog_ChangeInfo: String { return self._s[2569]! }
-    public var ChatListFolder_NameNonContacts: String { return self._s[2570]! }
+    public var Group_AdminLog_EmptyText: String { return self._s[2648]! }
+    public var Passport_Identity_EditInternalPassport: String { return self._s[2649]! }
+    public var Watch_Location_Current: String { return self._s[2650]! }
+    public var Appearance_AppIconNew1: String { return self._s[2651]! }
+    public var PrivacyPolicy_Title: String { return self._s[2652]! }
+    public var Privacy_GroupsAndChannels_CustomHelp: String { return self._s[2659]! }
+    public var Channel_TypeSetup_Title: String { return self._s[2663]! }
+    public var Appearance_PreviewReplyAuthor: String { return self._s[2664]! }
+    public var Passport_Language_ja: String { return self._s[2665]! }
+    public var ReportPeer_ReasonSpam: String { return self._s[2666]! }
+    public var Widget_GalleryDescription: String { return self._s[2667]! }
+    public var Privacy_PaymentsClearInfoHelp: String { return self._s[2668]! }
+    public var VoiceChat_ChangePhoto: String { return self._s[2670]! }
+    public var Conversation_EditingMessageMediaEditCurrentPhoto: String { return self._s[2671]! }
+    public var Channel_AdminLog_ChangeInfo: String { return self._s[2672]! }
+    public var ChatListFolder_NameNonContacts: String { return self._s[2673]! }
     public func InviteLink_ExpiresIn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2571]!, self._r[2571]!, [_0])
+        return formatWithArgumentRanges(self._s[2674]!, self._r[2674]!, [_0])
     }
-    public var Call_Audio: String { return self._s[2572]! }
-    public var PhotoEditor_CurvesGreen: String { return self._s[2573]! }
-    public var ChatList_Search_NoResultsFitlerFiles: String { return self._s[2574]! }
-    public var Settings_PrivacySettings: String { return self._s[2575]! }
-    public var InviteLink_UsageLimitReached: String { return self._s[2576]! }
-    public var Stats_Followers: String { return self._s[2577]! }
-    public var Notifications_AddExceptionTitle: String { return self._s[2578]! }
-    public var TwoFactorSetup_Password_Title: String { return self._s[2579]! }
-    public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2580]! }
-    public var OldChannels_NoticeText: String { return self._s[2581]! }
-    public var Conversation_SavedMessages: String { return self._s[2582]! }
-    public var Intents_ErrorLockedText: String { return self._s[2583]! }
+    public var Call_Audio: String { return self._s[2675]! }
+    public var PhotoEditor_CurvesGreen: String { return self._s[2676]! }
+    public var ChatList_Search_NoResultsFitlerFiles: String { return self._s[2677]! }
+    public var Settings_PrivacySettings: String { return self._s[2678]! }
+    public var InviteLink_UsageLimitReached: String { return self._s[2679]! }
+    public var Stats_Followers: String { return self._s[2680]! }
+    public var Notifications_AddExceptionTitle: String { return self._s[2681]! }
+    public var TwoFactorSetup_Password_Title: String { return self._s[2682]! }
+    public var ChannelMembers_WhoCanAddMembersAllHelp: String { return self._s[2683]! }
+    public var OldChannels_NoticeText: String { return self._s[2684]! }
+    public var Conversation_SavedMessages: String { return self._s[2685]! }
+    public var Intents_ErrorLockedText: String { return self._s[2686]! }
     public func Conversation_PeerNearbyTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2585]!, self._r[2585]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_1, _2])
     }
-    public var Passport_Address_TypeResidentialAddress: String { return self._s[2586]! }
-    public var Appearance_ThemeNightBlue: String { return self._s[2587]! }
-    public var Notification_ChannelInviterSelf: String { return self._s[2588]! }
-    public var Conversation_ForwardTooltip_SavedMessages_Many: String { return self._s[2589]! }
-    public var InviteLink_Create_TimeLimitExpiryDateNever: String { return self._s[2591]! }
-    public var Watch_UserInfo_Service: String { return self._s[2592]! }
-    public var ChatList_Context_Back: String { return self._s[2593]! }
-    public var Passport_Email_Title: String { return self._s[2594]! }
-    public var Stats_GroupTopAdmin_Promote: String { return self._s[2595]! }
+    public var Passport_Address_TypeResidentialAddress: String { return self._s[2689]! }
+    public var Appearance_ThemeNightBlue: String { return self._s[2690]! }
+    public var Notification_ChannelInviterSelf: String { return self._s[2691]! }
+    public var Conversation_ForwardTooltip_SavedMessages_Many: String { return self._s[2692]! }
+    public var InviteLink_Create_TimeLimitExpiryDateNever: String { return self._s[2694]! }
+    public var Watch_UserInfo_Service: String { return self._s[2695]! }
+    public var ChatList_Context_Back: String { return self._s[2696]! }
+    public var Passport_Email_Title: String { return self._s[2697]! }
+    public var ImportStickerPack_AddToExistingStickerSet: String { return self._s[2698]! }
+    public var Stats_GroupTopAdmin_Promote: String { return self._s[2699]! }
     public func PUSH_PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2596]!, self._r[2596]!, [_1])
+        return formatWithArgumentRanges(self._s[2700]!, self._r[2700]!, [_1])
     }
-    public var Conversation_UnsupportedMedia: String { return self._s[2597]! }
-    public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2598]! }
-    public var Privacy_TopPeersHelp: String { return self._s[2600]! }
-    public var Privacy_Forwards_AlwaysLink: String { return self._s[2601]! }
-    public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2602]! }
-    public var Permissions_NotificationsTitle_v0: String { return self._s[2603]! }
+    public var Conversation_UnsupportedMedia: String { return self._s[2701]! }
+    public var Passport_Address_OneOfTypePassportRegistration: String { return self._s[2702]! }
+    public var Privacy_TopPeersHelp: String { return self._s[2704]! }
+    public var Privacy_Forwards_AlwaysLink: String { return self._s[2705]! }
+    public var Notifications_Badge_CountUnreadMessages_InfoOn: String { return self._s[2706]! }
+    public var Permissions_NotificationsTitle_v0: String { return self._s[2707]! }
     public func Location_ProximityNotification_AlreadyClose(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2604]!, self._r[2604]!, [_0])
+        return formatWithArgumentRanges(self._s[2708]!, self._r[2708]!, [_0])
     }
-    public var Notification_PassportValueProofOfAddress: String { return self._s[2605]! }
-    public var Map_Map: String { return self._s[2606]! }
-    public var WallpaperSearch_ColorBlue: String { return self._s[2607]! }
-    public var Privacy_Calls_CustomShareHelp: String { return self._s[2608]! }
-    public var PhotoEditor_BlurToolRadial: String { return self._s[2609]! }
-    public var ChatList_Search_FilterMusic: String { return self._s[2610]! }
-    public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[2611]! }
-    public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2612]! }
-    public var Settings_LogoutConfirmationTitle: String { return self._s[2614]! }
+    public var Notification_PassportValueProofOfAddress: String { return self._s[2709]! }
+    public var Map_Map: String { return self._s[2710]! }
+    public var WallpaperSearch_ColorBlue: String { return self._s[2711]! }
+    public var Privacy_Calls_CustomShareHelp: String { return self._s[2712]! }
+    public var PhotoEditor_BlurToolRadial: String { return self._s[2713]! }
+    public var ChatList_Search_FilterMusic: String { return self._s[2714]! }
+    public var SettingsSearch_Synonyms_Data_AutoplayGifs: String { return self._s[2715]! }
+    public var Privacy_PaymentsClear_ShippingInfo: String { return self._s[2716]! }
+    public var Settings_LogoutConfirmationTitle: String { return self._s[2718]! }
     public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2615]!, self._r[2615]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2719]!, self._r[2719]!, [_1, _2])
     }
     public func Notification_ChangedGroupPhoto(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2616]!, self._r[2616]!, [_0])
+        return formatWithArgumentRanges(self._s[2720]!, self._r[2720]!, [_0])
     }
-    public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2617]! }
-    public var Group_Username_CreatePublicLinkHelp: String { return self._s[2618]! }
-    public var VoiceOver_ChatList_MessageEmpty: String { return self._s[2621]! }
-    public var GroupInfo_Location: String { return self._s[2622]! }
-    public var Passport_Language_ka: String { return self._s[2623]! }
+    public var Channel_Username_RevokeExistingUsernamesInfo: String { return self._s[2721]! }
+    public var Group_Username_CreatePublicLinkHelp: String { return self._s[2722]! }
+    public var VoiceOver_ChatList_MessageEmpty: String { return self._s[2724]! }
+    public var GroupInfo_Location: String { return self._s[2725]! }
+    public var Passport_Language_ka: String { return self._s[2726]! }
     public func TwoStepAuth_SetupPendingEmail(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2624]!, self._r[2624]!, [_0])
-    }
-    public var Conversation_ContextMenuOpenChannelProfile: String { return self._s[2625]! }
-    public var ChatImport_SelectionConfirmationAlertTitle: String { return self._s[2627]! }
-    public var ScheduledMessages_ClearAllConfirmation: String { return self._s[2629]! }
-    public var DialogList_SearchSectionRecent: String { return self._s[2630]! }
-    public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[2631]! }
-    public var Conversation_Timer_Send: String { return self._s[2632]! }
-    public func VoiceOver_ScrollStatus(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2634]!, self._r[2634]!, [_1, _2])
-    }
-    public var ChatState_Updating: String { return self._s[2635]! }
-    public var ChannelMembers_WhoCanAddMembers: String { return self._s[2636]! }
-    public var ChannelInfo_DeleteGroup: String { return self._s[2637]! }
-    public var TwoStepAuth_RecoveryFailed: String { return self._s[2638]! }
-    public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2639]! }
-    public var InviteLink_Create_TimeLimitExpiryTime: String { return self._s[2640]! }
-    public var ChannelInfo_InviteLink_RevokeAlert_Text: String { return self._s[2641]! }
-    public var ChatList_Search_NoResults: String { return self._s[2642]! }
-    public var ChatListFolderSettings_AddRecommended: String { return self._s[2644]! }
-    public var ChangePhoneNumberCode_Called: String { return self._s[2645]! }
-    public var PeerInfo_GroupAboutItem: String { return self._s[2646]! }
-    public var VoiceOver_SelfDestructTimerOff: String { return self._s[2648]! }
-    public func Channel_AdminLog_DeletedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2649]!, self._r[2649]!, [_1, _2])
-    }
-    public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2650]!, self._r[2650]!, [_0])
-    }
-    public var PrivacySettings_AuthSessions: String { return self._s[2651]! }
-    public var Passport_Address_Postcode: String { return self._s[2652]! }
-    public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2653]! }
-    public func VoiceChat_ForwardTooltip_ManyChats(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2654]!, self._r[2654]!, [_0, _1])
-    }
-    public var Passport_Address_Street2Placeholder: String { return self._s[2655]! }
-    public var Group_Location_Title: String { return self._s[2656]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[2657]! }
-    public var PeopleNearby_UsersEmpty: String { return self._s[2658]! }
-    public var Conversation_ContextMenuSpeak: String { return self._s[2660]! }
-    public var SettingsSearch_Synonyms_Data_Title: String { return self._s[2661]! }
-    public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2663]!, self._r[2663]!, [_0])
-    }
-    public var Proxy_TooltipUnavailable: String { return self._s[2664]! }
-    public var Map_Search: String { return self._s[2665]! }
-    public var AutoDownloadSettings_TypeContacts: String { return self._s[2666]! }
-    public var Conversation_SearchByName_Prefix: String { return self._s[2667]! }
-    public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2668]!, self._r[2668]!, [_0])
-    }
-    public var TwoStepAuth_EmailAddSuccess: String { return self._s[2669]! }
-    public var ProfilePhoto_MainPhoto: String { return self._s[2670]! }
-    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2671]! }
-    public var SharedMedia_EmptyMusicText: String { return self._s[2672]! }
-    public var ChatSettings_AutoDownloadPhotos: String { return self._s[2673]! }
-    public var NetworkUsageSettings_BytesReceived: String { return self._s[2674]! }
-    public var Channel_AdminLog_EmptyText: String { return self._s[2675]! }
-    public var Channel_BanUser_PermissionSendMessages: String { return self._s[2676]! }
-    public var Undo_ChatDeletedForBothSides: String { return self._s[2677]! }
-    public var Notifications_GroupNotifications: String { return self._s[2678]! }
-    public var AccessDenied_SaveMedia: String { return self._s[2679]! }
-    public var InviteLink_Create_Revoke: String { return self._s[2680]! }
-    public var GroupInfo_LabelOwner: String { return self._s[2681]! }
-    public var Passport_Language_id: String { return self._s[2682]! }
-    public var ChatSettings_AutoDownloadTitle: String { return self._s[2683]! }
-    public var Conversation_UnpinMessageAlert: String { return self._s[2684]! }
-    public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2685]!, self._r[2685]!, [_0])
-    }
-    public func Call_RemoteVideoPaused(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2686]!, self._r[2686]!, [_0])
-    }
-    public var TwoFactorSetup_Done_Text: String { return self._s[2687]! }
-    public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2688]!, self._r[2688]!, [_0])
-    }
-    public var NetworkUsageSettings_BytesSent: String { return self._s[2689]! }
-    public var Conversation_AudioRateTooltipNormal: String { return self._s[2690]! }
-    public var OwnershipTransfer_Transfer: String { return self._s[2691]! }
-    public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2692]!, self._r[2692]!, [_0])
-    }
-    public var Passport_Language_pt: String { return self._s[2693]! }
-    public var PrivacySettings_WebSessions: String { return self._s[2694]! }
-    public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[2696]! }
-    public var TwoFactorSetup_Hint_Title: String { return self._s[2697]! }
-    public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2698]!, self._r[2698]!, [_0])
-    }
-    public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2699]! }
-    public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2700]! }
-    public var AutoNightTheme_Scheduled: String { return self._s[2701]! }
-    public var CreatePoll_ExplanationHeader: String { return self._s[2702]! }
-    public var Calls_TabTitle: String { return self._s[2703]! }
-    public var VoiceChat_RecordingInProgress: String { return self._s[2704]! }
-    public var ChatList_UndoArchiveHiddenText: String { return self._s[2705]! }
-    public var Notification_VideoCallCanceled: String { return self._s[2706]! }
-    public var Login_CodeSentInternal: String { return self._s[2707]! }
-    public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[2708]! }
-    public var Call_RecordingDisabledMessage: String { return self._s[2710]! }
-    public func VoiceChat_RemovedPeerText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2711]!, self._r[2711]!, [_0])
-    }
-    public var Conversation_UsersTooMuchError: String { return self._s[2713]! }
-    public var AutoDownloadSettings_TypeChannels: String { return self._s[2714]! }
-    public var Channel_Info_Stickers: String { return self._s[2715]! }
-    public var Passport_DeleteAddressConfirmation: String { return self._s[2716]! }
-    public func Conversation_PeerNearbyDistance(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2717]!, self._r[2717]!, [_1, _2])
-    }
-    public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[2718]! }
-    public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2719]!, self._r[2719]!, [_0])
-    }
-    public var Passport_DiscardMessageTitle: String { return self._s[2720]! }
-    public var Call_VoiceOver_VideoCallIncoming: String { return self._s[2721]! }
-    public var Localization_LanguageOther: String { return self._s[2722]! }
-    public var Conversation_EncryptionCanceled: String { return self._s[2723]! }
-    public var ChatSettings_AutomaticPhotoDownload: String { return self._s[2724]! }
-    public var ReportPeer_ReasonFake: String { return self._s[2726]! }
-    public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2727]!, self._r[2727]!, [_0])
     }
-    public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2729]! }
-    public var SocksProxySetup_SavedProxies: String { return self._s[2730]! }
-    public var InviteLink_Create_UsersLimitNumberOfUsers: String { return self._s[2731]! }
-    public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2732]!, self._r[2732]!, [_1])
+    public var Conversation_ContextMenuOpenChannelProfile: String { return self._s[2728]! }
+    public var ChatImport_SelectionConfirmationAlertTitle: String { return self._s[2730]! }
+    public var ScheduledMessages_ClearAllConfirmation: String { return self._s[2732]! }
+    public var DialogList_SearchSectionRecent: String { return self._s[2733]! }
+    public var Passport_Address_OneOfTypeTemporaryRegistration: String { return self._s[2734]! }
+    public var Conversation_Timer_Send: String { return self._s[2735]! }
+    public func VoiceOver_ScrollStatus(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2737]!, self._r[2737]!, [_1, _2])
     }
-    public var Conversation_ScamWarning: String { return self._s[2734]! }
-    public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[2735]! }
-    public var LocalGroup_Title: String { return self._s[2736]! }
-    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[2738]! }
-    public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[2739]! }
-    public var VoiceChat_SelectAccount: String { return self._s[2740]! }
-    public var Login_PhoneFloodError: String { return self._s[2741]! }
-    public var Conversation_PinMessageAlert_PinAndNotifyMembers: String { return self._s[2742]! }
-    public var Username_InvalidTaken: String { return self._s[2744]! }
-    public var SocksProxySetup_AddProxy: String { return self._s[2746]! }
-    public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[2747]! }
-    public var MediaPicker_UngroupDescription: String { return self._s[2748]! }
-    public var Login_CodeExpired: String { return self._s[2749]! }
-    public var Localization_ChooseLanguage: String { return self._s[2750]! }
-    public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[2751]! }
-    public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2752]!, self._r[2752]!, [_0])
+    public var ChatState_Updating: String { return self._s[2738]! }
+    public var ChannelMembers_WhoCanAddMembers: String { return self._s[2739]! }
+    public var ChannelInfo_DeleteGroup: String { return self._s[2740]! }
+    public var TwoStepAuth_RecoveryFailed: String { return self._s[2741]! }
+    public var Channel_OwnershipTransfer_EnterPassword: String { return self._s[2742]! }
+    public var InviteLink_Create_TimeLimitExpiryTime: String { return self._s[2743]! }
+    public var ChannelInfo_InviteLink_RevokeAlert_Text: String { return self._s[2744]! }
+    public var ChatList_Search_NoResults: String { return self._s[2745]! }
+    public var ChatListFolderSettings_AddRecommended: String { return self._s[2747]! }
+    public var ChangePhoneNumberCode_Called: String { return self._s[2748]! }
+    public var PeerInfo_GroupAboutItem: String { return self._s[2749]! }
+    public var VoiceOver_SelfDestructTimerOff: String { return self._s[2751]! }
+    public func Channel_AdminLog_DeletedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2752]!, self._r[2752]!, [_1, _2])
     }
-    public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public func LiveLocationUpdated_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2753]!, self._r[2753]!, [_0])
     }
-    public var ReportPeer_ReasonOther_Title: String { return self._s[2755]! }
-    public var Conversation_ScheduleMessage_Title: String { return self._s[2756]! }
-    public func VoiceChat_UserInvited(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_0])
+    public var PrivacySettings_AuthSessions: String { return self._s[2754]! }
+    public var Passport_Address_Postcode: String { return self._s[2755]! }
+    public var VoiceOver_Chat_YourVideoMessage: String { return self._s[2756]! }
+    public func VoiceChat_ForwardTooltip_ManyChats(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2757]!, self._r[2757]!, [_0, _1])
     }
-    public var PeerInfo_ButtonDiscuss: String { return self._s[2758]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[2759]! }
-    public var Call_StatusNoAnswer: String { return self._s[2760]! }
-    public var ScheduledMessages_DeleteMany: String { return self._s[2762]! }
-    public var Channel_DiscussionGroupInfo: String { return self._s[2763]! }
-    public var Conversation_UnarchiveDone: String { return self._s[2764]! }
-    public var LogoutOptions_AddAccountText: String { return self._s[2765]! }
-    public var Message_PinnedContactMessage: String { return self._s[2766]! }
-    public func ChatList_DeleteAndLeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2767]!, self._r[2767]!, [_0])
+    public var Passport_Address_Street2Placeholder: String { return self._s[2758]! }
+    public var Group_Location_Title: String { return self._s[2759]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadReset: String { return self._s[2760]! }
+    public var PeopleNearby_UsersEmpty: String { return self._s[2761]! }
+    public var Conversation_ContextMenuSpeak: String { return self._s[2763]! }
+    public var SettingsSearch_Synonyms_Data_Title: String { return self._s[2764]! }
+    public func Checkout_PasswordEntry_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2766]!, self._r[2766]!, [_0])
     }
-    public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2769]!, self._r[2769]!, [_0])
+    public var Proxy_TooltipUnavailable: String { return self._s[2767]! }
+    public var Map_Search: String { return self._s[2768]! }
+    public var VoiceChat_CancelConfirmationTitle: String { return self._s[2769]! }
+    public var AutoDownloadSettings_TypeContacts: String { return self._s[2770]! }
+    public var Conversation_SearchByName_Prefix: String { return self._s[2771]! }
+    public func Channel_AdminLog_MessageToggleSignaturesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2772]!, self._r[2772]!, [_0])
     }
-    public var Stats_GroupLanguagesTitle: String { return self._s[2770]! }
-    public var Passport_FieldAddressHelp: String { return self._s[2771]! }
-    public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2772]!, self._r[2772]!, [_1, _2])
-    }
-    public var ChatSettings_OpenLinksIn: String { return self._s[2774]! }
-    public var TwoFactorSetup_Hint_SkipAction: String { return self._s[2775]! }
-    public var Message_Photo: String { return self._s[2776]! }
-    public var Media_LimitedAccessManage: String { return self._s[2778]! }
-    public var MediaPicker_AddCaption: String { return self._s[2779]! }
-    public var LogoutOptions_Title: String { return self._s[2780]! }
-    public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2781]!, self._r[2781]!, [_1])
-    }
-    public var Conversation_StatusKickedFromGroup: String { return self._s[2782]! }
-    public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[2783]! }
-    public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2784]! }
-    public var Channel_AdminLogFilter_Title: String { return self._s[2785]! }
-    public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2786]! }
-    public var Compose_GroupTokenListPlaceholder: String { return self._s[2787]! }
-    public var Notifications_MessageNotificationsExceptions: String { return self._s[2788]! }
-    public var ChannelIntro_Title: String { return self._s[2789]! }
-    public var Stats_Message_Views: String { return self._s[2790]! }
-    public var Stickers_Install: String { return self._s[2791]! }
-    public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var TwoStepAuth_EmailAddSuccess: String { return self._s[2773]! }
+    public var ProfilePhoto_MainPhoto: String { return self._s[2774]! }
+    public var SettingsSearch_Synonyms_Notifications_InAppNotificationsSound: String { return self._s[2775]! }
+    public var SharedMedia_EmptyMusicText: String { return self._s[2776]! }
+    public var ChatSettings_AutoDownloadPhotos: String { return self._s[2777]! }
+    public var NetworkUsageSettings_BytesReceived: String { return self._s[2778]! }
+    public var Channel_AdminLog_EmptyText: String { return self._s[2779]! }
+    public var ImportStickerPack_InProgress: String { return self._s[2780]! }
+    public var Channel_BanUser_PermissionSendMessages: String { return self._s[2781]! }
+    public var Undo_ChatDeletedForBothSides: String { return self._s[2782]! }
+    public var Notifications_GroupNotifications: String { return self._s[2783]! }
+    public var AccessDenied_SaveMedia: String { return self._s[2784]! }
+    public var InviteLink_Create_Revoke: String { return self._s[2785]! }
+    public var GroupInfo_LabelOwner: String { return self._s[2786]! }
+    public var TwoFactorSetup_PasswordRecovery_Action: String { return self._s[2787]! }
+    public var Passport_Language_id: String { return self._s[2789]! }
+    public var ChatSettings_AutoDownloadTitle: String { return self._s[2790]! }
+    public var Conversation_UnpinMessageAlert: String { return self._s[2791]! }
+    public func LiveLocationUpdated_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2792]!, self._r[2792]!, [_0])
     }
-    public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[2793]! }
-    public var Conversation_SwipeToReplyHintTitle: String { return self._s[2795]! }
-    public var Settings_Username: String { return self._s[2798]! }
-    public var FastTwoStepSetup_Title: String { return self._s[2799]! }
-    public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2800]! }
-    public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[2801]! }
-    public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2803]! }
-    public var CallFeedback_ReasonEcho: String { return self._s[2804]! }
-    public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2805]!, self._r[2805]!, [_0])
+    public func Call_RemoteVideoPaused(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2793]!, self._r[2793]!, [_0])
     }
-    public var Conversation_OpenBotLinkTitle: String { return self._s[2806]! }
-    public var SocksProxySetup_Title: String { return self._s[2807]! }
-    public var CallFeedback_Success: String { return self._s[2808]! }
-    public var WallpaperPreview_SwipeTopText: String { return self._s[2810]! }
-    public var InstantPage_AutoNightTheme: String { return self._s[2812]! }
-    public var Watch_Conversation_Reply: String { return self._s[2813]! }
-    public var VoiceChat_Share: String { return self._s[2815]! }
-    public var Chat_PanelUnpinAllMessages: String { return self._s[2816]! }
-    public var WallpaperPreview_Pattern: String { return self._s[2817]! }
-    public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[2818]! }
-    public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var TwoFactorSetup_Done_Text: String { return self._s[2794]! }
+    public func LastSeen_AtDate(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2795]!, self._r[2795]!, [_0])
+    }
+    public var NetworkUsageSettings_BytesSent: String { return self._s[2796]! }
+    public var Conversation_AudioRateTooltipNormal: String { return self._s[2797]! }
+    public var VoiceChat_EditDescriptionSuccess: String { return self._s[2798]! }
+    public var OwnershipTransfer_Transfer: String { return self._s[2799]! }
+    public func Notification_Exceptions_Sound(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2800]!, self._r[2800]!, [_0])
+    }
+    public var Passport_Language_pt: String { return self._s[2801]! }
+    public var PrivacySettings_WebSessions: String { return self._s[2802]! }
+    public var PrivacyPolicy_DeclineDeleteNow: String { return self._s[2804]! }
+    public var TwoFactorSetup_Hint_Title: String { return self._s[2805]! }
+    public func Notification_Joined(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2806]!, self._r[2806]!, [_0])
+    }
+    public var Group_Username_RemoveExistingUsernamesInfo: String { return self._s[2807]! }
+    public var PrivacyLastSeenSettings_CustomShareSettings_Delete: String { return self._s[2808]! }
+    public var AutoNightTheme_Scheduled: String { return self._s[2809]! }
+    public var CreatePoll_ExplanationHeader: String { return self._s[2810]! }
+    public var Calls_TabTitle: String { return self._s[2811]! }
+    public var VoiceChat_RecordingInProgress: String { return self._s[2812]! }
+    public var ChatList_UndoArchiveHiddenText: String { return self._s[2813]! }
+    public var Notification_VideoCallCanceled: String { return self._s[2814]! }
+    public var Login_CodeSentInternal: String { return self._s[2815]! }
+    public var SettingsSearch_Synonyms_Proxy_AddProxy: String { return self._s[2816]! }
+    public var Call_RecordingDisabledMessage: String { return self._s[2818]! }
+    public func VoiceChat_RemovedPeerText(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[2819]!, self._r[2819]!, [_0])
     }
-    public var AutoDownloadSettings_TypeGroupChats: String { return self._s[2820]! }
-    public var VoiceOver_Chat_GroupInfo: String { return self._s[2821]! }
-    public var DialogList_SavedMessagesTooltip: String { return self._s[2823]! }
-    public var Update_Title: String { return self._s[2824]! }
-    public var Conversation_ShareMyPhoneNumber: String { return self._s[2825]! }
-    public var WallpaperPreview_CropTopText: String { return self._s[2828]! }
-    public var Channel_EditMessageErrorGeneric: String { return self._s[2829]! }
-    public var AccessDenied_LocationAlwaysDenied: String { return self._s[2830]! }
-    public var ChatListFolder_DiscardCancel: String { return self._s[2831]! }
-    public var Message_PinnedPhotoMessage: String { return self._s[2832]! }
-    public var Appearance_ThemeDayClassic: String { return self._s[2833]! }
-    public var SocksProxySetup_ProxySocks5: String { return self._s[2834]! }
-    public var VoiceChat_DisplayAsInfo: String { return self._s[2836]! }
-    public var AccessDenied_Wallpapers: String { return self._s[2841]! }
+    public var Conversation_UsersTooMuchError: String { return self._s[2821]! }
+    public var AutoDownloadSettings_TypeChannels: String { return self._s[2822]! }
+    public var VoiceChat_StopScreenSharingShort: String { return self._s[2823]! }
+    public var Channel_Info_Stickers: String { return self._s[2824]! }
+    public var Passport_DeleteAddressConfirmation: String { return self._s[2825]! }
+    public func Conversation_PeerNearbyDistance(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2826]!, self._r[2826]!, [_1, _2])
+    }
+    public var ChannelMembers_WhoCanAddMembers_Admins: String { return self._s[2827]! }
+    public func Call_StatusOngoing(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2828]!, self._r[2828]!, [_0])
+    }
+    public var Passport_DiscardMessageTitle: String { return self._s[2829]! }
+    public var Call_VoiceOver_VideoCallIncoming: String { return self._s[2830]! }
+    public var Localization_LanguageOther: String { return self._s[2831]! }
+    public var Conversation_EncryptionCanceled: String { return self._s[2832]! }
+    public var ChatSettings_AutomaticPhotoDownload: String { return self._s[2833]! }
+    public var ReportPeer_ReasonFake: String { return self._s[2835]! }
+    public func Notification_SecretChatMessageScreenshot(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2836]!, self._r[2836]!, [_0])
+    }
+    public var Target_InviteToGroupErrorAlreadyInvited: String { return self._s[2838]! }
+    public var SocksProxySetup_SavedProxies: String { return self._s[2839]! }
+    public var InviteLink_Create_UsersLimitNumberOfUsers: String { return self._s[2840]! }
+    public func ApplyLanguage_ChangeLanguageAlreadyActive(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2841]!, self._r[2841]!, [_1])
+    }
+    public var Conversation_ScamWarning: String { return self._s[2843]! }
+    public var Channel_AdminLog_InfoPanelAlertTitle: String { return self._s[2844]! }
+    public var LocalGroup_Title: String { return self._s[2845]! }
+    public var SettingsSearch_Synonyms_Notifications_MessageNotificationsAlert: String { return self._s[2847]! }
+    public var SettingsSearch_Synonyms_Privacy_PasscodeAndFaceId: String { return self._s[2848]! }
+    public var VoiceChat_SelectAccount: String { return self._s[2849]! }
+    public var Login_PhoneFloodError: String { return self._s[2850]! }
+    public var Conversation_PinMessageAlert_PinAndNotifyMembers: String { return self._s[2851]! }
+    public var Username_InvalidTaken: String { return self._s[2853]! }
+    public var SocksProxySetup_AddProxy: String { return self._s[2855]! }
+    public var PrivacyLastSeenSettings_WhoCanSeeMyTimestamp: String { return self._s[2856]! }
+    public var MediaPicker_UngroupDescription: String { return self._s[2857]! }
+    public var Login_CodeExpired: String { return self._s[2858]! }
+    public var Localization_ChooseLanguage: String { return self._s[2859]! }
+    public var Checkout_NewCard_PostcodePlaceholder: String { return self._s[2860]! }
+    public func ChangePhone_ErrorOccupied(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2861]!, self._r[2861]!, [_0])
+    }
+    public func Channel_DiscussionGroup_HeaderSet(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2862]!, self._r[2862]!, [_0])
+    }
+    public var ReportPeer_ReasonOther_Title: String { return self._s[2864]! }
+    public var Conversation_ScheduleMessage_Title: String { return self._s[2865]! }
+    public func VoiceChat_UserInvited(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2866]!, self._r[2866]!, [_0])
+    }
+    public var PeerInfo_ButtonDiscuss: String { return self._s[2867]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedPublicGroups: String { return self._s[2868]! }
+    public var Call_StatusNoAnswer: String { return self._s[2869]! }
+    public var ScheduledMessages_DeleteMany: String { return self._s[2871]! }
+    public var Channel_DiscussionGroupInfo: String { return self._s[2872]! }
+    public var Conversation_UnarchiveDone: String { return self._s[2873]! }
+    public var LogoutOptions_AddAccountText: String { return self._s[2874]! }
+    public var Message_PinnedContactMessage: String { return self._s[2875]! }
+    public func ChatList_DeleteAndLeaveGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2876]!, self._r[2876]!, [_0])
+    }
+    public var VoiceChat_EditBioTitle: String { return self._s[2878]! }
+    public func FileSize_GB(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2879]!, self._r[2879]!, [_0])
+    }
+    public var Stats_GroupLanguagesTitle: String { return self._s[2880]! }
+    public var Passport_FieldAddressHelp: String { return self._s[2881]! }
+    public func Passport_FieldOneOf_Or(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2882]!, self._r[2882]!, [_1, _2])
+    }
+    public var ChatSettings_OpenLinksIn: String { return self._s[2884]! }
+    public var TwoFactorSetup_Hint_SkipAction: String { return self._s[2885]! }
+    public var Message_Photo: String { return self._s[2886]! }
+    public var Media_LimitedAccessManage: String { return self._s[2888]! }
+    public var MediaPicker_AddCaption: String { return self._s[2889]! }
+    public var LogoutOptions_Title: String { return self._s[2890]! }
+    public func PUSH_PINNED_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2891]!, self._r[2891]!, [_1])
+    }
+    public var Conversation_StatusKickedFromGroup: String { return self._s[2892]! }
+    public var Channel_AdminLogFilter_AdminsTitle: String { return self._s[2893]! }
+    public var ChatList_DeleteSavedMessagesConfirmationTitle: String { return self._s[2894]! }
+    public var Channel_AdminLogFilter_Title: String { return self._s[2895]! }
+    public var Passport_Address_TypeRentalAgreementUploadScan: String { return self._s[2896]! }
+    public var Compose_GroupTokenListPlaceholder: String { return self._s[2897]! }
+    public var Notifications_MessageNotificationsExceptions: String { return self._s[2898]! }
+    public var ChannelIntro_Title: String { return self._s[2899]! }
+    public var Stats_Message_Views: String { return self._s[2900]! }
+    public var Stickers_Install: String { return self._s[2901]! }
+    public func VoiceOver_Chat_FileFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2902]!, self._r[2902]!, [_0])
+    }
+    public var EditTheme_Create_Preview_IncomingReplyText: String { return self._s[2903]! }
+    public var Conversation_SwipeToReplyHintTitle: String { return self._s[2905]! }
+    public var Settings_Username: String { return self._s[2908]! }
+    public var FastTwoStepSetup_Title: String { return self._s[2909]! }
+    public var Notifications_Badge_CountUnreadMessages_InfoOff: String { return self._s[2910]! }
+    public var SettingsSearch_Synonyms_Privacy_Title: String { return self._s[2911]! }
+    public var Passport_Identity_IssueDatePlaceholder: String { return self._s[2913]! }
+    public var CallFeedback_ReasonEcho: String { return self._s[2914]! }
+    public func Time_MonthOfYear_m1(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2915]!, self._r[2915]!, [_0])
+    }
+    public var Conversation_OpenBotLinkTitle: String { return self._s[2916]! }
+    public var SocksProxySetup_Title: String { return self._s[2917]! }
+    public var CallFeedback_Success: String { return self._s[2918]! }
+    public var WallpaperPreview_SwipeTopText: String { return self._s[2920]! }
+    public var InstantPage_AutoNightTheme: String { return self._s[2922]! }
+    public var Watch_Conversation_Reply: String { return self._s[2923]! }
+    public var VoiceChat_Share: String { return self._s[2925]! }
+    public var VoiceChat_AddPhoto: String { return self._s[2926]! }
+    public var Chat_PanelUnpinAllMessages: String { return self._s[2927]! }
+    public var WallpaperPreview_Pattern: String { return self._s[2928]! }
+    public var CheckoutInfo_ReceiverInfoEmail: String { return self._s[2929]! }
+    public func Conversation_DeleteMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[2930]!, self._r[2930]!, [_0])
+    }
+    public var AutoDownloadSettings_TypeGroupChats: String { return self._s[2931]! }
+    public var VoiceOver_Chat_GroupInfo: String { return self._s[2932]! }
+    public var DialogList_SavedMessagesTooltip: String { return self._s[2934]! }
+    public var Update_Title: String { return self._s[2935]! }
+    public var Conversation_ShareMyPhoneNumber: String { return self._s[2936]! }
+    public var WallpaperPreview_CropTopText: String { return self._s[2939]! }
+    public var Channel_EditMessageErrorGeneric: String { return self._s[2940]! }
+    public var AccessDenied_LocationAlwaysDenied: String { return self._s[2941]! }
+    public var ChatListFolder_DiscardCancel: String { return self._s[2942]! }
+    public var Message_PinnedPhotoMessage: String { return self._s[2943]! }
+    public var Appearance_ThemeDayClassic: String { return self._s[2944]! }
+    public var VoiceChat_ChangeName: String { return self._s[2945]! }
+    public var SocksProxySetup_ProxySocks5: String { return self._s[2947]! }
+    public var VoiceChat_DisplayAsInfo: String { return self._s[2949]! }
+    public var AccessDenied_Wallpapers: String { return self._s[2954]! }
     public func Channel_AdminLog_MessageChangedGroupAbout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2842]!, self._r[2842]!, [_0])
+        return formatWithArgumentRanges(self._s[2955]!, self._r[2955]!, [_0])
     }
-    public var Weekday_Sunday: String { return self._s[2843]! }
-    public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[2845]! }
-    public var PeopleNearby_MakeVisibleDescription: String { return self._s[2846]! }
-    public var AccessDenied_LocationDisabled: String { return self._s[2847]! }
-    public var Tour_Text3: String { return self._s[2848]! }
-    public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2849]! }
+    public var Weekday_Sunday: String { return self._s[2956]! }
+    public var SettingsSearch_Synonyms_Privacy_GroupsAndChannels: String { return self._s[2958]! }
+    public var PeopleNearby_MakeVisibleDescription: String { return self._s[2959]! }
+    public var AccessDenied_LocationDisabled: String { return self._s[2960]! }
+    public var Tour_Text3: String { return self._s[2961]! }
+    public var AuthSessions_AddDevice_ScanTitle: String { return self._s[2962]! }
     public func Time_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2850]!, self._r[2850]!, [_0])
+        return formatWithArgumentRanges(self._s[2963]!, self._r[2963]!, [_0])
     }
-    public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2851]! }
-    public var Conversation_ClearCache: String { return self._s[2852]! }
-    public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[2853]! }
-    public var ChatList_Tabs_AllChats: String { return self._s[2854]! }
-    public var DialogList_RecentTitlePeople: String { return self._s[2855]! }
-    public var Stickers_AddToFavorites: String { return self._s[2856]! }
-    public var ChatList_Context_RemoveFromFolder: String { return self._s[2857]! }
-    public var VoiceChat_CancelSpeakRequest: String { return self._s[2858]! }
-    public var Settings_RemoveVideo: String { return self._s[2859]! }
-    public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2860]! }
-    public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[2861]! }
-    public var VoiceOver_Chat_YourFile: String { return self._s[2862]! }
-    public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[2864]! }
-    public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[2865]! }
-    public var Channel_AdminLog_AddMembers: String { return self._s[2866]! }
-    public var Map_SendThisLocation: String { return self._s[2868]! }
-    public var TwoStepAuth_EmailSkipAlert: String { return self._s[2870]! }
-    public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2871]! }
-    public var CloudStorage_Title: String { return self._s[2872]! }
-    public var TwoFactorSetup_Password_Action: String { return self._s[2873]! }
-    public var TwoStepAuth_ConfirmationText: String { return self._s[2874]! }
-    public var Passport_Address_EditTemporaryRegistration: String { return self._s[2876]! }
-    public var Undo_LeftGroup: String { return self._s[2877]! }
-    public var Conversation_StopLiveLocation: String { return self._s[2878]! }
-    public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[2879]! }
-    public var Message_PinnedInvoice: String { return self._s[2880]! }
-    public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[2881]! }
+    public var Privacy_SecretChatsLinkPreviewsHelp: String { return self._s[2964]! }
+    public var Conversation_ClearCache: String { return self._s[2965]! }
+    public var StickerPacksSettings_ArchivedMasks_Info: String { return self._s[2966]! }
+    public var ChatList_Tabs_AllChats: String { return self._s[2967]! }
+    public var DialogList_RecentTitlePeople: String { return self._s[2968]! }
+    public var Stickers_AddToFavorites: String { return self._s[2969]! }
+    public var ChatList_Context_RemoveFromFolder: String { return self._s[2970]! }
+    public var VoiceChat_CancelSpeakRequest: String { return self._s[2971]! }
+    public var Settings_RemoveVideo: String { return self._s[2972]! }
+    public var PhotoEditor_CropAspectRatioSquare: String { return self._s[2973]! }
+    public var ConversationProfile_LeaveDeleteAndExit: String { return self._s[2974]! }
+    public var VoiceOver_Chat_YourFile: String { return self._s[2975]! }
+    public var SettingsSearch_Synonyms_Privacy_Forwards: String { return self._s[2977]! }
+    public var Group_OwnershipTransfer_ErrorPrivacyRestricted: String { return self._s[2978]! }
+    public var VoiceChat_TapToAddBio: String { return self._s[2979]! }
+    public var Channel_AdminLog_AddMembers: String { return self._s[2980]! }
+    public var Map_SendThisLocation: String { return self._s[2982]! }
+    public var TwoStepAuth_EmailSkipAlert: String { return self._s[2984]! }
+    public var IntentsSettings_SuggestedChatsPrivateChats: String { return self._s[2985]! }
+    public var CloudStorage_Title: String { return self._s[2986]! }
+    public var TwoFactorSetup_Password_Action: String { return self._s[2987]! }
+    public var TwoStepAuth_ConfirmationText: String { return self._s[2988]! }
+    public var Passport_Address_EditTemporaryRegistration: String { return self._s[2990]! }
+    public var Undo_LeftGroup: String { return self._s[2991]! }
+    public var Conversation_StopLiveLocation: String { return self._s[2992]! }
+    public var NotificationSettings_ShowNotificationsFromAccountsSection: String { return self._s[2993]! }
+    public var Message_PinnedInvoice: String { return self._s[2994]! }
+    public var ApplyLanguage_LanguageNotSupportedError: String { return self._s[2995]! }
     public func PUSH_CHAT_MESSAGE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2883]!, self._r[2883]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[2997]!, self._r[2997]!, [_1, _2])
     }
     public func Notification_PinnedAudioMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2884]!, self._r[2884]!, [_0])
+        return formatWithArgumentRanges(self._s[2998]!, self._r[2998]!, [_0])
     }
-    public var Weekday_Tuesday: String { return self._s[2885]! }
-    public var ChangePhoneNumberCode_Code: String { return self._s[2886]! }
-    public var VoiceOver_Chat_YourMessage: String { return self._s[2887]! }
-    public var Calls_CallTabDescription: String { return self._s[2888]! }
-    public var ChatImport_SelectionErrorNotAdmin: String { return self._s[2889]! }
-    public var SocksProxySetup_UseProxy: String { return self._s[2891]! }
-    public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[2892]! }
-    public var PasscodeSettings_AlphanumericCode: String { return self._s[2893]! }
-    public var VoiceOver_Chat_YourVideo: String { return self._s[2894]! }
-    public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[2896]! }
-    public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[2897]! }
-    public var Exceptions_AddToExceptions: String { return self._s[2898]! }
-    public var UserInfo_Title: String { return self._s[2899]! }
-    public var Passport_DeleteDocumentConfirmation: String { return self._s[2901]! }
-    public var ChatList_Unmute: String { return self._s[2903]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[2904]! }
+    public var TwoStepAuth_RecoveryUnavailableResetTitle: String { return self._s[2999]! }
+    public var Weekday_Tuesday: String { return self._s[3000]! }
+    public var ChangePhoneNumberCode_Code: String { return self._s[3001]! }
+    public var VoiceOver_Chat_YourMessage: String { return self._s[3002]! }
+    public var Calls_CallTabDescription: String { return self._s[3003]! }
+    public var ChatImport_SelectionErrorNotAdmin: String { return self._s[3004]! }
+    public var SocksProxySetup_UseProxy: String { return self._s[3006]! }
+    public var SettingsSearch_Synonyms_Stickers_Title: String { return self._s[3007]! }
+    public var PasscodeSettings_AlphanumericCode: String { return self._s[3008]! }
+    public var VoiceOver_Chat_YourVideo: String { return self._s[3009]! }
+    public var ChannelMembers_WhoCanAddMembersAdminsHelp: String { return self._s[3011]! }
+    public var SettingsSearch_Synonyms_Privacy_DeleteAccountIfAwayFor: String { return self._s[3012]! }
+    public var Exceptions_AddToExceptions: String { return self._s[3013]! }
+    public var UserInfo_Title: String { return self._s[3014]! }
+    public var Passport_DeleteDocumentConfirmation: String { return self._s[3016]! }
+    public var VoiceChat_EditDescription: String { return self._s[3018]! }
+    public var ChatList_Unmute: String { return self._s[3019]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_ContactsSync: String { return self._s[3020]! }
     public func Channel_AdminLog_MessageChangedAutoremoveTimeoutSet(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2905]!, self._r[2905]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3021]!, self._r[3021]!, [_1, _2])
     }
-    public var Stats_GroupTopPostersTitle: String { return self._s[2906]! }
-    public var Username_CheckingUsername: String { return self._s[2907]! }
-    public var WallpaperColors_SetCustomColor: String { return self._s[2908]! }
-    public var PeerSelection_ImportIntoNewGroup: String { return self._s[2912]! }
-    public var Location_ProximityAlertSetTitle: String { return self._s[2913]! }
-    public var AuthSessions_AddedDeviceTerminate: String { return self._s[2914]! }
-    public var Conversation_JoinVoiceChatAsSpeaker: String { return self._s[2915]! }
-    public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[2916]! }
-    public var Settings_ChangePhoneNumber: String { return self._s[2917]! }
-    public var PeerInfo_PaneLinks: String { return self._s[2918]! }
-    public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[2921]! }
-    public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[2923]! }
-    public func PUSH_CHAT_VOICECHAT_INVITE_YOU(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2924]!, self._r[2924]!, [_1])
+    public var Stats_GroupTopPostersTitle: String { return self._s[3022]! }
+    public var Username_CheckingUsername: String { return self._s[3024]! }
+    public var WallpaperColors_SetCustomColor: String { return self._s[3025]! }
+    public var PeerSelection_ImportIntoNewGroup: String { return self._s[3029]! }
+    public var Location_ProximityAlertSetTitle: String { return self._s[3030]! }
+    public var AuthSessions_AddedDeviceTerminate: String { return self._s[3031]! }
+    public var Conversation_JoinVoiceChatAsSpeaker: String { return self._s[3032]! }
+    public var Privacy_ProfilePhoto_CustomHelp: String { return self._s[3033]! }
+    public var Settings_ChangePhoneNumber: String { return self._s[3034]! }
+    public var PeerInfo_PaneLinks: String { return self._s[3035]! }
+    public var Appearance_ThemePreview_ChatList_1_Text: String { return self._s[3038]! }
+    public var Channel_EditAdmin_PermissionInviteSubscribers: String { return self._s[3040]! }
+    public func PUSH_CHAT_VOICECHAT_INVITE_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3041]!, self._r[3041]!, [_1, _2])
     }
-    public var LogoutOptions_ChangePhoneNumberText: String { return self._s[2925]! }
-    public var VoiceOver_Media_PlaybackPause: String { return self._s[2926]! }
-    public var BroadcastGroups_ConfirmationAlert_Title: String { return self._s[2927]! }
-    public var Stats_FollowersBySourceTitle: String { return self._s[2929]! }
+    public var LogoutOptions_ChangePhoneNumberText: String { return self._s[3042]! }
+    public var VoiceOver_Media_PlaybackPause: String { return self._s[3043]! }
+    public var VoiceChat_CancelConfirmationEnd: String { return self._s[3044]! }
+    public var BroadcastGroups_ConfirmationAlert_Title: String { return self._s[3045]! }
+    public var Stats_FollowersBySourceTitle: String { return self._s[3047]! }
     public func Conversation_ScheduleMessage_SendOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2930]!, self._r[2930]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3048]!, self._r[3048]!, [_0, _1])
     }
-    public var Compose_NewEncryptedChatTitle: String { return self._s[2931]! }
-    public var Channel_CommentsGroup_Header: String { return self._s[2933]! }
+    public var Compose_NewEncryptedChatTitle: String { return self._s[3049]! }
+    public var Channel_CommentsGroup_Header: String { return self._s[3051]! }
     public func ShareFileTip_Text(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2937]!, self._r[2937]!, [_0])
+        return formatWithArgumentRanges(self._s[3055]!, self._r[3055]!, [_0])
     }
     public func PUSH_MESSAGE_AUDIO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2938]!, self._r[2938]!, [_1])
+        return formatWithArgumentRanges(self._s[3056]!, self._r[3056]!, [_1])
     }
-    public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[2940]! }
+    public var Group_Setup_BasicHistoryHiddenHelp: String { return self._s[3058]! }
     public func TwoStepAuth_RecoveryEmailUnavailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2941]!, self._r[2941]!, [_0])
-    }
-    public var Conversation_ReportMessages: String { return self._s[2942]! }
-    public var Conversation_OpenBotLinkOpen: String { return self._s[2943]! }
-    public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[2944]! }
-    public var PrivacySettings_LastSeen: String { return self._s[2946]! }
-    public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[2947]! }
-    public var Theme_Colors_Proceed: String { return self._s[2948]! }
-    public var UserInfo_ScamBotWarning: String { return self._s[2949]! }
-    public var LogoutOptions_LogOut: String { return self._s[2951]! }
-    public var Conversation_SendMessage: String { return self._s[2952]! }
-    public var Conversation_CancelForwardCancelForward: String { return self._s[2953]! }
-    public var Passport_Address_Region: String { return self._s[2955]! }
-    public var MediaPicker_CameraRoll: String { return self._s[2957]! }
-    public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2959]!, self._r[2959]!, [_0])
-    }
-    public var Call_ReportSend: String { return self._s[2961]! }
-    public var VoiceOver_ChatList_Message: String { return self._s[2962]! }
-    public var Month_ShortJune: String { return self._s[2963]! }
-    public var AutoDownloadSettings_GroupChats: String { return self._s[2964]! }
-    public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2967]!, self._r[2967]!, [_0])
-    }
-    public var TwoStepAuth_DisableSuccess: String { return self._s[2968]! }
-    public var Cache_KeepMedia: String { return self._s[2969]! }
-    public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2970]!, self._r[2970]!, [_1, _2, _3])
-    }
-    public var Appearance_LargeEmoji: String { return self._s[2971]! }
-    public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2972]!, self._r[2972]!, [_1, _2, _3, _4, _5, _6])
-    }
-    public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[2973]! }
-    public var Call_CameraConfirmationText: String { return self._s[2974]! }
-    public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2976]!, self._r[2976]!, [_0])
-    }
-    public var DialogList_SearchSectionChats: String { return self._s[2977]! }
-    public var VoiceOver_MessageContextReport: String { return self._s[2979]! }
-    public var VoiceChat_RemovePeer: String { return self._s[2980]! }
-    public var ChatListFolder_ExcludeChatsTitle: String { return self._s[2981]! }
-    public var InviteLink_ContextCopy: String { return self._s[2982]! }
-    public var NotificationsSound_Tritone: String { return self._s[2984]! }
-    public var Notifications_InAppNotificationsPreview: String { return self._s[2987]! }
-    public var Stats_GroupTopAdmin_Actions: String { return self._s[2988]! }
-    public var PeerInfo_AddToContacts: String { return self._s[2989]! }
-    public var VoiceChat_OpenChat: String { return self._s[2990]! }
-    public var AccessDenied_Title: String { return self._s[2991]! }
-    public var InviteLink_QRCode_InfoChannel: String { return self._s[2992]! }
-    public var Tour_Title1: String { return self._s[2993]! }
-    public var VoiceOver_AttachMedia: String { return self._s[2994]! }
-    public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2996]!, self._r[2996]!, [_0])
-    }
-    public var Chat_Gifs_SavedSectionHeader: String { return self._s[2997]! }
-    public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[2998]! }
-    public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[2999]!, self._r[2999]!, [_0])
-    }
-    public var Channel_AdminLog_MessagePreviousLink: String { return self._s[3000]! }
-    public var OldChannels_Title: String { return self._s[3001]! }
-    public var LoginPassword_FloodError: String { return self._s[3002]! }
-    public var ChatImportActivity_InProgress: String { return self._s[3004]! }
-    public var Checkout_ErrorPaymentFailed: String { return self._s[3005]! }
-    public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3006]!, self._r[3006]!, [_0])
-    }
-    public var VoiceOver_Media_PlaybackPlay: String { return self._s[3009]! }
-    public var Passport_CorrectErrors: String { return self._s[3011]! }
-    public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3012]!, self._r[3012]!, [_1, _2])
-    }
-    public var ChatListFolderSettings_Title: String { return self._s[3013]! }
-    public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3014]!, self._r[3014]!, [_1, _2])
-    }
-    public var PhotoEditor_HighlightsTool: String { return self._s[3015]! }
-    public var Contacts_NotRegisteredSection: String { return self._s[3018]! }
-    public func Call_VoiceChatInProgressCallMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3019]!, self._r[3019]!, [_1, _2])
-    }
-    public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3020]!, self._r[3020]!, [_1])
-    }
-    public var InviteLink_Create_UsersLimitInfo: String { return self._s[3021]! }
-    public var User_DeletedAccount: String { return self._s[3022]! }
-    public var Conversation_ViewContactDetails: String { return self._s[3023]! }
-    public var Conversation_Dice_u1F3B3: String { return self._s[3024]! }
-    public var WebSearch_GIFs: String { return self._s[3025]! }
-    public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[3026]! }
-    public var Appearance_PreviewOutgoingText: String { return self._s[3027]! }
-    public var Calls_CallTabTitle: String { return self._s[3028]! }
-    public var Call_VoiceChatInProgressTitle: String { return self._s[3029]! }
-    public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3030]!, self._r[3030]!, [_0])
-    }
-    public var Channel_Status: String { return self._s[3031]! }
-    public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[3033]! }
-    public var VoiceOver_Chat_OptionSelected: String { return self._s[3034]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3035]! }
-    public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3036]!, self._r[3036]!, [_0, _1])
-    }
-    public var Passport_Identity_ExpiryDateNone: String { return self._s[3038]! }
-    public var Your_cards_expiration_month_is_invalid: String { return self._s[3040]! }
-    public var Month_ShortDecember: String { return self._s[3041]! }
-    public var Username_Help: String { return self._s[3042]! }
-    public var Login_InfoAvatarAdd: String { return self._s[3043]! }
-    public var Month_ShortMay: String { return self._s[3044]! }
-    public var DialogList_UnknownPinLimitError: String { return self._s[3045]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[3046]! }
-    public var TwoStepAuth_EnabledSuccess: String { return self._s[3047]! }
-    public var VoiceChat_AskedToSpeak: String { return self._s[3048]! }
-    public var Weekday_ShortSunday: String { return self._s[3049]! }
-    public var Channel_Username_InvalidTooShort: String { return self._s[3050]! }
-    public var AuthSessions_TerminateSession: String { return self._s[3051]! }
-    public var Passport_Identity_FilesTitle: String { return self._s[3052]! }
-    public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3053]!, self._r[3053]!, [_0])
-    }
-    public var PeopleNearby_MakeVisible: String { return self._s[3055]! }
-    public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3056]!, self._r[3056]!, [_0])
-    }
-    public var Widget_UpdatedAt: String { return self._s[3057]! }
-    public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3058]!, self._r[3058]!, [_1, _2])
-    }
-    public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3059]!, self._r[3059]!, [_0])
     }
-    public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3060]! }
-    public var Conversation_ContextMenuForward: String { return self._s[3061]! }
-    public var Channel_AdminLog_CanManageCalls: String { return self._s[3062]! }
-    public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3064]!, self._r[3064]!, [_1, _2, _3])
-    }
-    public var Notification_GroupInviterSelf: String { return self._s[3066]! }
-    public var Privacy_Forwards_NeverLink: String { return self._s[3067]! }
-    public var AuthSessions_CurrentSession: String { return self._s[3068]! }
-    public var Passport_Address_EditPassportRegistration: String { return self._s[3069]! }
-    public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3070]! }
-    public var ChatSearch_ResultsTooltip: String { return self._s[3072]! }
-    public var CheckoutInfo_Pay: String { return self._s[3073]! }
-    public func Conversation_PinMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3075]!, self._r[3075]!, [_0])
-    }
-    public var GroupInfo_AddParticipant: String { return self._s[3076]! }
-    public var GroupPermission_ApplyAlertAction: String { return self._s[3077]! }
-    public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Conversation_ReportMessages: String { return self._s[3060]! }
+    public var Conversation_OpenBotLinkOpen: String { return self._s[3061]! }
+    public var VoiceOver_Chat_RecordModeVoiceMessage: String { return self._s[3062]! }
+    public var PrivacySettings_LastSeen: String { return self._s[3064]! }
+    public var SettingsSearch_Synonyms_Privacy_Passcode: String { return self._s[3065]! }
+    public var Theme_Colors_Proceed: String { return self._s[3066]! }
+    public var UserInfo_ScamBotWarning: String { return self._s[3067]! }
+    public var LogoutOptions_LogOut: String { return self._s[3069]! }
+    public var Conversation_SendMessage: String { return self._s[3070]! }
+    public var Conversation_CancelForwardCancelForward: String { return self._s[3071]! }
+    public var VoiceChat_Scheduled: String { return self._s[3073]! }
+    public var Passport_Address_Region: String { return self._s[3074]! }
+    public var MediaPicker_CameraRoll: String { return self._s[3076]! }
+    public func VoiceOver_Chat_ForwardedFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3078]!, self._r[3078]!, [_0])
     }
-    public var Localization_LanguageCustom: String { return self._s[3079]! }
-    public var SettingsSearch_Synonyms_Passport: String { return self._s[3080]! }
-    public var Settings_UsernameEmpty: String { return self._s[3081]! }
-    public var Settings_FAQ_URL: String { return self._s[3082]! }
-    public var ChatList_UndoArchiveText1: String { return self._s[3083]! }
-    public var Common_Select: String { return self._s[3085]! }
-    public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[3086]! }
-    public var Notification_PassportValueAddress: String { return self._s[3087]! }
-    public var Conversation_MessageDialogDelete: String { return self._s[3088]! }
-    public var Map_OpenInYandexNavigator: String { return self._s[3090]! }
-    public var DialogList_SearchSectionDialogs: String { return self._s[3091]! }
-    public var AccessDenied_Contacts: String { return self._s[3092]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[3094]! }
-    public var Passport_ScanPassportHelp: String { return self._s[3095]! }
-    public var Chat_PinnedListPreview_HidePinnedMessages: String { return self._s[3096]! }
-    public var ChatListFolder_NameChannels: String { return self._s[3097]! }
-    public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[3098]! }
+    public var Call_ReportSend: String { return self._s[3080]! }
+    public var VoiceOver_ChatList_Message: String { return self._s[3081]! }
+    public var Month_ShortJune: String { return self._s[3082]! }
+    public var AutoDownloadSettings_GroupChats: String { return self._s[3083]! }
+    public func Channel_AdminLog_CaptionEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3086]!, self._r[3086]!, [_0])
+    }
+    public var TwoStepAuth_DisableSuccess: String { return self._s[3087]! }
+    public var Cache_KeepMedia: String { return self._s[3088]! }
+    public func Date_ChatDateHeaderYear(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3089]!, self._r[3089]!, [_1, _2, _3])
+    }
+    public var Appearance_LargeEmoji: String { return self._s[3090]! }
+    public func Notification_NewAuthDetected(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3091]!, self._r[3091]!, [_1, _2, _3, _4, _5, _6])
+    }
+    public var Chat_AttachmentMultipleForwardDisabled: String { return self._s[3092]! }
+    public var Privacy_PaymentsClear_PaymentInfoCleared: String { return self._s[3093]! }
+    public var Call_CameraConfirmationText: String { return self._s[3094]! }
+    public func AuthSessions_AppUnofficial(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3096]!, self._r[3096]!, [_0])
+    }
+    public var DialogList_SearchSectionChats: String { return self._s[3097]! }
+    public var VoiceOver_MessageContextReport: String { return self._s[3099]! }
+    public var VoiceChat_RemovePeer: String { return self._s[3100]! }
+    public var ChatListFolder_ExcludeChatsTitle: String { return self._s[3101]! }
+    public var InviteLink_ContextCopy: String { return self._s[3102]! }
+    public var NotificationsSound_Tritone: String { return self._s[3104]! }
+    public var VoiceChat_YouAreSharingScreen: String { return self._s[3106]! }
+    public var Notifications_InAppNotificationsPreview: String { return self._s[3108]! }
+    public var Stats_GroupTopAdmin_Actions: String { return self._s[3109]! }
+    public var TwoFactorSetup_PasswordRecovery_SkipAlertText: String { return self._s[3110]! }
+    public var TwoStepAuth_ResetAction: String { return self._s[3111]! }
+    public var PeerInfo_AddToContacts: String { return self._s[3112]! }
+    public var VoiceChat_OpenChat: String { return self._s[3113]! }
+    public var AccessDenied_Title: String { return self._s[3114]! }
+    public var InviteLink_QRCode_InfoChannel: String { return self._s[3115]! }
+    public var Tour_Title1: String { return self._s[3116]! }
+    public var VoiceOver_AttachMedia: String { return self._s[3117]! }
+    public func SharedMedia_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3119]!, self._r[3119]!, [_0])
+    }
+    public var Chat_Gifs_SavedSectionHeader: String { return self._s[3120]! }
+    public var Privacy_DeleteDrafts_DraftsDeleted: String { return self._s[3121]! }
+    public var LogoutOptions_ChangePhoneNumberTitle: String { return self._s[3122]! }
+    public func Passport_Scans_ScanIndex(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3123]!, self._r[3123]!, [_0])
+    }
+    public var Channel_AdminLog_MessagePreviousLink: String { return self._s[3124]! }
+    public var OldChannels_Title: String { return self._s[3125]! }
+    public var LoginPassword_FloodError: String { return self._s[3126]! }
+    public var ChatImportActivity_InProgress: String { return self._s[3128]! }
+    public var Checkout_ErrorPaymentFailed: String { return self._s[3129]! }
+    public func Time_MonthOfYear_m7(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3130]!, self._r[3130]!, [_0])
+    }
+    public var VoiceOver_Media_PlaybackPlay: String { return self._s[3133]! }
+    public var Passport_CorrectErrors: String { return self._s[3135]! }
+    public func PUSH_CHAT_PHOTO_EDITED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3136]!, self._r[3136]!, [_1, _2])
+    }
+    public var ChatListFolderSettings_Title: String { return self._s[3137]! }
+    public func AutoDownloadSettings_UpToFor(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3138]!, self._r[3138]!, [_1, _2])
+    }
+    public var PhotoEditor_HighlightsTool: String { return self._s[3139]! }
+    public var Contacts_NotRegisteredSection: String { return self._s[3142]! }
+    public func Call_VoiceChatInProgressCallMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3143]!, self._r[3143]!, [_1, _2])
+    }
+    public func PUSH_PINNED_DOC(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3144]!, self._r[3144]!, [_1])
+    }
+    public var InviteLink_Create_UsersLimitInfo: String { return self._s[3145]! }
+    public var User_DeletedAccount: String { return self._s[3146]! }
+    public var Conversation_ViewContactDetails: String { return self._s[3147]! }
+    public var Conversation_Dice_u1F3B3: String { return self._s[3148]! }
+    public var WebSearch_GIFs: String { return self._s[3149]! }
+    public var ChatList_DeleteSavedMessagesConfirmationAction: String { return self._s[3150]! }
+    public var Appearance_PreviewOutgoingText: String { return self._s[3151]! }
+    public var Calls_CallTabTitle: String { return self._s[3152]! }
+    public var Call_VoiceChatInProgressTitle: String { return self._s[3153]! }
+    public var Checkout_OptionalTipItem: String { return self._s[3154]! }
+    public func LastSeen_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3155]!, self._r[3155]!, [_0])
+    }
+    public var Channel_Status: String { return self._s[3156]! }
+    public var Conversation_SendMessageErrorGroupRestricted: String { return self._s[3158]! }
+    public var VoiceOver_Chat_OptionSelected: String { return self._s[3159]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsAlert: String { return self._s[3160]! }
+    public func ClearCache_Success(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3161]!, self._r[3161]!, [_0, _1])
+    }
+    public var Passport_Identity_ExpiryDateNone: String { return self._s[3163]! }
+    public var Your_cards_expiration_month_is_invalid: String { return self._s[3165]! }
+    public var Month_ShortDecember: String { return self._s[3166]! }
+    public var Username_Help: String { return self._s[3167]! }
+    public var Login_InfoAvatarAdd: String { return self._s[3168]! }
+    public var Month_ShortMay: String { return self._s[3169]! }
+    public var DialogList_UnknownPinLimitError: String { return self._s[3170]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_5hours: String { return self._s[3171]! }
+    public var TwoStepAuth_EnabledSuccess: String { return self._s[3172]! }
+    public var VoiceChat_StopScreenSharing: String { return self._s[3173]! }
+    public var VoiceChat_AskedToSpeak: String { return self._s[3174]! }
+    public var Weekday_ShortSunday: String { return self._s[3175]! }
+    public var Channel_Username_InvalidTooShort: String { return self._s[3176]! }
+    public var AuthSessions_TerminateSession: String { return self._s[3177]! }
+    public var Passport_Identity_FilesTitle: String { return self._s[3178]! }
+    public func Notification_PinnedRoundMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3179]!, self._r[3179]!, [_0])
+    }
+    public var PeopleNearby_MakeVisible: String { return self._s[3181]! }
+    public func Conversation_RestrictedMediaTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3182]!, self._r[3182]!, [_0])
+    }
+    public var Widget_UpdatedAt: String { return self._s[3183]! }
+    public func Notification_MessageLifetimeChanged(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3184]!, self._r[3184]!, [_1, _2])
+    }
+    public func GroupInfo_AddParticipantConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3185]!, self._r[3185]!, [_0])
+    }
+    public var PrivacyPolicy_DeclineDeclineAndDelete: String { return self._s[3186]! }
+    public var VoiceChat_VideoPreviewShareScreen: String { return self._s[3187]! }
+    public var ImportStickerPack_ChooseStickerSet: String { return self._s[3189]! }
+    public var Conversation_ContextMenuForward: String { return self._s[3190]! }
+    public var Channel_AdminLog_CanManageCalls: String { return self._s[3191]! }
+    public func PUSH_CHAT_MESSAGE_QUIZ(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3193]!, self._r[3193]!, [_1, _2, _3])
+    }
+    public var Notification_GroupInviterSelf: String { return self._s[3195]! }
+    public var Privacy_Forwards_NeverLink: String { return self._s[3196]! }
+    public var AuthSessions_CurrentSession: String { return self._s[3197]! }
+    public var Passport_Address_EditPassportRegistration: String { return self._s[3198]! }
+    public var ChannelInfo_DeleteChannelConfirmation: String { return self._s[3199]! }
+    public var ChatSearch_ResultsTooltip: String { return self._s[3201]! }
+    public var CheckoutInfo_Pay: String { return self._s[3202]! }
+    public func Conversation_PinMessagesFor(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3204]!, self._r[3204]!, [_0])
+    }
+    public var GroupInfo_AddParticipant: String { return self._s[3205]! }
+    public var GroupPermission_ApplyAlertAction: String { return self._s[3206]! }
+    public func Channel_AdminLog_MessageChangedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3207]!, self._r[3207]!, [_0])
+    }
+    public var Localization_LanguageCustom: String { return self._s[3208]! }
+    public var SettingsSearch_Synonyms_Passport: String { return self._s[3209]! }
+    public var Settings_UsernameEmpty: String { return self._s[3210]! }
+    public var Settings_FAQ_URL: String { return self._s[3211]! }
+    public var ChatList_UndoArchiveText1: String { return self._s[3212]! }
+    public var Common_Select: String { return self._s[3214]! }
+    public var Notification_MessageLifetimeRemovedOutgoing: String { return self._s[3215]! }
+    public var Notification_PassportValueAddress: String { return self._s[3216]! }
+    public var Conversation_MessageDialogDelete: String { return self._s[3217]! }
+    public var Map_OpenInYandexNavigator: String { return self._s[3219]! }
+    public var DialogList_SearchSectionDialogs: String { return self._s[3220]! }
+    public var AccessDenied_Contacts: String { return self._s[3221]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_DeleteDrafts: String { return self._s[3223]! }
+    public var Passport_ScanPassportHelp: String { return self._s[3224]! }
+    public var Chat_PinnedListPreview_HidePinnedMessages: String { return self._s[3225]! }
+    public var ChatListFolder_NameChannels: String { return self._s[3226]! }
+    public var Appearance_ThemePreview_Chat_5_Text: String { return self._s[3227]! }
     public func Channel_OwnershipTransfer_TransferCompleted(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3099]!, self._r[3099]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3228]!, self._r[3228]!, [_1, _2])
     }
-    public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[3100]! }
+    public var Checkout_ErrorInvoiceAlreadyPaid: String { return self._s[3229]! }
     public func VoiceChat_InviteMemberToGroupFirstText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3101]!, self._r[3101]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3230]!, self._r[3230]!, [_1, _2])
     }
-    public var Conversation_GifTooltip: String { return self._s[3102]! }
-    public var Widget_MessageAutoremoveTimerUpdated: String { return self._s[3103]! }
-    public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3105]! }
-    public var VoiceChat_Connecting: String { return self._s[3106]! }
-    public var AutoDownloadSettings_OffForAll: String { return self._s[3107]! }
+    public var Conversation_GifTooltip: String { return self._s[3231]! }
+    public var Widget_MessageAutoremoveTimerUpdated: String { return self._s[3232]! }
+    public var Passport_Identity_TypeDriversLicenseUploadScan: String { return self._s[3234]! }
+    public var VoiceChat_Connecting: String { return self._s[3235]! }
+    public var AutoDownloadSettings_OffForAll: String { return self._s[3236]! }
     public func Channel_AdminLog_CreatedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3108]!, self._r[3108]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_1, _2])
     }
-    public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3109]! }
-    public var AutoDownloadSettings_PreloadVideo: String { return self._s[3110]! }
-    public var CreatePoll_Quiz: String { return self._s[3111]! }
-    public var TwoFactorSetup_Email_Placeholder: String { return self._s[3113]! }
-    public var Watch_Message_Invoice: String { return self._s[3114]! }
-    public var Settings_AddAnotherAccount_Help: String { return self._s[3115]! }
-    public var Watch_Message_Unsupported: String { return self._s[3116]! }
+    public var Privacy_GroupsAndChannels_InviteToChannelMultipleError: String { return self._s[3238]! }
+    public var AutoDownloadSettings_PreloadVideo: String { return self._s[3239]! }
+    public var CreatePoll_Quiz: String { return self._s[3240]! }
+    public var TwoFactorSetup_Email_Placeholder: String { return self._s[3242]! }
+    public var Watch_Message_Invoice: String { return self._s[3243]! }
+    public var Settings_AddAnotherAccount_Help: String { return self._s[3244]! }
+    public var Watch_Message_Unsupported: String { return self._s[3245]! }
     public func Call_CameraOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3118]!, self._r[3118]!, [_0])
+        return formatWithArgumentRanges(self._s[3247]!, self._r[3247]!, [_0])
     }
-    public var AuthSessions_TerminateOtherSessions: String { return self._s[3119]! }
-    public var CreatePoll_AllOptionsAdded: String { return self._s[3121]! }
-    public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[3122]! }
-    public var Call_IncomingVoiceCall: String { return self._s[3123]! }
+    public var AuthSessions_TerminateOtherSessions: String { return self._s[3248]! }
+    public var CreatePoll_AllOptionsAdded: String { return self._s[3250]! }
+    public var TwoStepAuth_RecoveryEmailTitle: String { return self._s[3251]! }
+    public var Call_IncomingVoiceCall: String { return self._s[3252]! }
     public func Channel_AdminLog_MessageTransferedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3124]!, self._r[3124]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3253]!, self._r[3253]!, [_1, _2])
     }
-    public var PrivacySettings_DeleteAccountHelp: String { return self._s[3125]! }
-    public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[3126]! }
-    public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[3127]! }
-    public var Group_ErrorAccessDenied: String { return self._s[3128]! }
-    public var PasscodeSettings_HelpTop: String { return self._s[3129]! }
-    public var Watch_ChatList_NoConversationsTitle: String { return self._s[3130]! }
-    public var AddContact_SharedContactException: String { return self._s[3131]! }
-    public var AccessDenied_MicrophoneRestricted: String { return self._s[3132]! }
-    public var Privacy_TopPeers: String { return self._s[3133]! }
-    public var Web_OpenExternal: String { return self._s[3134]! }
-    public var Group_ErrorSendRestrictedStickers: String { return self._s[3135]! }
-    public var Channel_Management_LabelAdministrator: String { return self._s[3136]! }
+    public var PrivacySettings_DeleteAccountHelp: String { return self._s[3254]! }
+    public var Passport_Address_TypePassportRegistrationUploadScan: String { return self._s[3255]! }
+    public var Group_EditAdmin_RankOwnerPlaceholder: String { return self._s[3256]! }
+    public var Group_ErrorAccessDenied: String { return self._s[3257]! }
+    public var PasscodeSettings_HelpTop: String { return self._s[3258]! }
+    public var Watch_ChatList_NoConversationsTitle: String { return self._s[3259]! }
+    public var AddContact_SharedContactException: String { return self._s[3260]! }
+    public var AccessDenied_MicrophoneRestricted: String { return self._s[3261]! }
+    public var Privacy_TopPeers: String { return self._s[3262]! }
+    public var Web_OpenExternal: String { return self._s[3263]! }
+    public var Group_ErrorSendRestrictedStickers: String { return self._s[3264]! }
+    public var Channel_Management_LabelAdministrator: String { return self._s[3265]! }
     public func ChangePhoneNumberCode_CallTimer(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3137]!, self._r[3137]!, [_0])
+        return formatWithArgumentRanges(self._s[3266]!, self._r[3266]!, [_0])
     }
-    public var Conversation_PhoneCopied: String { return self._s[3138]! }
-    public var Permissions_Skip: String { return self._s[3139]! }
-    public var Notifications_GroupNotificationsExceptions: String { return self._s[3140]! }
+    public var Conversation_PhoneCopied: String { return self._s[3267]! }
+    public var Permissions_Skip: String { return self._s[3268]! }
+    public var Notifications_GroupNotificationsExceptions: String { return self._s[3269]! }
     public func VoiceChat_ForwardTooltip_TwoChats(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3141]!, self._r[3141]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[3270]!, self._r[3270]!, [_0, _1])
     }
-    public var PeopleNearby_Title: String { return self._s[3142]! }
-    public var GroupInfo_SharedMediaNone: String { return self._s[3143]! }
+    public var PeopleNearby_Title: String { return self._s[3271]! }
+    public var GroupInfo_SharedMediaNone: String { return self._s[3272]! }
     public func PUSH_MESSAGE_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3145]!, self._r[3145]!, [_1])
+        return formatWithArgumentRanges(self._s[3274]!, self._r[3274]!, [_1])
     }
-    public var Profile_MessageLifetime1w: String { return self._s[3146]! }
+    public var Profile_MessageLifetime1w: String { return self._s[3275]! }
     public func Time_PreciseDate_m6(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3147]!, self._r[3147]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[3276]!, self._r[3276]!, [_1, _2, _3])
     }
-    public var WebBrowser_DefaultBrowser: String { return self._s[3148]! }
-    public var Conversation_PinOlderMessageAlertTitle: String { return self._s[3150]! }
-    public var EditTheme_Edit_BottomInfo: String { return self._s[3151]! }
-    public var Privacy_Forwards_Preview: String { return self._s[3152]! }
-    public var Settings_EditAccount: String { return self._s[3153]! }
+    public var WebBrowser_DefaultBrowser: String { return self._s[3277]! }
+    public var Conversation_PinOlderMessageAlertTitle: String { return self._s[3279]! }
+    public var EditTheme_Edit_BottomInfo: String { return self._s[3280]! }
+    public var Privacy_Forwards_Preview: String { return self._s[3281]! }
+    public var Settings_EditAccount: String { return self._s[3282]! }
     public func Conversation_RestrictedInlineTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3154]!, self._r[3154]!, [_0])
+        return formatWithArgumentRanges(self._s[3283]!, self._r[3283]!, [_0])
     }
-    public var TwoFactorSetup_Intro_Title: String { return self._s[3155]! }
+    public var TwoFactorSetup_Intro_Title: String { return self._s[3284]! }
     public func Channel_AdminLog_MessagePromotedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3157]!, self._r[3157]!, [_1])
+        return formatWithArgumentRanges(self._s[3286]!, self._r[3286]!, [_1])
     }
-    public var PeerInfo_ButtonVideoCall: String { return self._s[3158]! }
+    public var PeerInfo_ButtonVideoCall: String { return self._s[3287]! }
     public func DialogList_SingleUploadingPhotoSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3159]!, self._r[3159]!, [_0])
-    }
-    public var Login_InfoHelp: String { return self._s[3160]! }
-    public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[3161]! }
-    public var VoiceChat_SpeakPermissionEveryone: String { return self._s[3162]! }
-    public var Profile_MessageLifetime1d: String { return self._s[3163]! }
-    public var Group_UpgradeConfirmation: String { return self._s[3164]! }
-    public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3165]!, self._r[3165]!, [_1, _2])
-    }
-    public var Appearance_RemoveThemeColor: String { return self._s[3166]! }
-    public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3167]! }
-    public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3168]!, self._r[3168]!, [_0])
-    }
-    public var UserInfo_BotSettings: String { return self._s[3169]! }
-    public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3171]!, self._r[3171]!, [_0])
-    }
-    public var Permissions_ContactsText_v0: String { return self._s[3172]! }
-    public var Conversation_PinMessagesForMe: String { return self._s[3173]! }
-    public var VoiceChat_PanelJoin: String { return self._s[3174]! }
-    public var Conversation_DiscussionStarted: String { return self._s[3176]! }
-    public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[3177]! }
-    public var SharedMedia_SearchNoResults: String { return self._s[3179]! }
-    public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3181]!, self._r[3181]!, [_0])
-    }
-    public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3183]!, self._r[3183]!, [_0])
-    }
-    public var ReportPeer_ReasonOther_Placeholder: String { return self._s[3184]! }
-    public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3185]! }
-    public var Call_AudioRouteHeadphones: String { return self._s[3186]! }
-    public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3188]!, self._r[3188]!, [_1])
-    }
-    public var Passport_Identity_FilesView: String { return self._s[3189]! }
-    public var TwoStepAuth_SetupEmail: String { return self._s[3190]! }
-    public var Widget_ApplicationStartRequired: String { return self._s[3191]! }
-    public var PhotoEditor_Original: String { return self._s[3192]! }
-    public var Call_YourMicrophoneOff: String { return self._s[3193]! }
-    public var Permissions_ContactsAllow_v0: String { return self._s[3194]! }
-    public var Conversation_CardNumberCopied: String { return self._s[3195]! }
-    public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[3196]! }
-    public var PrivacyPolicy_Decline: String { return self._s[3197]! }
-    public var SettingsSearch_Synonyms_ChatFolders: String { return self._s[3198]! }
-    public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[3199]! }
-    public var ChatListFolder_IncludeSectionInfo: String { return self._s[3200]! }
-    public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3201]!, self._r[3201]!, [_0])
-    }
-    public var Passport_Identity_Name: String { return self._s[3202]! }
-    public var WallpaperPreview_PatternTitle: String { return self._s[3204]! }
-    public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[3205]! }
-    public var WallpaperSearch_ColorOrange: String { return self._s[3207]! }
-    public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[3208]! }
-    public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[3209]! }
-    public var Your_cards_security_code_is_invalid: String { return self._s[3210]! }
-    public var IntentsSettings_ResetAll: String { return self._s[3211]! }
-    public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3213]! }
-    public var Group_EditAdmin_TransferOwnership: String { return self._s[3214]! }
-    public var ChatList_DeleteForAllSubscribers: String { return self._s[3215]! }
-    public var Notification_Exceptions_Add: String { return self._s[3216]! }
-    public var Group_DeleteGroup: String { return self._s[3217]! }
-    public var Cache_Help: String { return self._s[3218]! }
-    public var Call_AudioRouteMute: String { return self._s[3219]! }
-    public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[3220]! }
-    public var SocksProxySetup_ProxyEnabled: String { return self._s[3221]! }
-    public func VoiceChat_Status_MembersFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3222]!, self._r[3222]!, [_1, _2])
-    }
-    public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3223]!, self._r[3223]!, [_1])
-    }
-    public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3224]!, self._r[3224]!, [_1, _2])
-    }
-    public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3225]! }
-    public var Channel_BanUser_PermissionAddMembers: String { return self._s[3226]! }
-    public func PUSH_CHAT_VOICECHAT_INVITE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3227]!, self._r[3227]!, [_1, _2, _3])
-    }
-    public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[3228]! }
-    public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[3229]! }
-    public var ClearCache_StorageFree: String { return self._s[3230]! }
-    public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3231]!, self._r[3231]!, [_0])
-    }
-    public var Privacy_Forwards_CustomHelp: String { return self._s[3232]! }
-    public func Channel_AdminLog_EditedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3234]!, self._r[3234]!, [_1, _2])
-    }
-    public var Group_ErrorAddTooMuchAdmins: String { return self._s[3235]! }
-    public var DialogList_Typing: String { return self._s[3236]! }
-    public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3237]!, self._r[3237]!, [_0])
-    }
-    public var Target_SelectGroup: String { return self._s[3238]! }
-    public var AuthSessions_IncompleteAttempts: String { return self._s[3239]! }
-    public func Notification_ProximityReached(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3240]!, self._r[3240]!, [_1, _2, _3])
-    }
-    public var Chat_PinnedListPreview_ShowAllMessages: String { return self._s[3241]! }
-    public var TwoStepAuth_EmailChangeSuccess: String { return self._s[3242]! }
-    public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3243]!, self._r[3243]!, [_0])
-    }
-    public var Channel_AdminLog_CanSendMessages: String { return self._s[3244]! }
-    public var TwoFactorSetup_EmailVerification_Title: String { return self._s[3245]! }
-    public var ChatSettings_TextSize: String { return self._s[3246]! }
-    public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[3248]! }
-    public var Map_SendThisPlace: String { return self._s[3249]! }
-    public var Conversation_TextCopied: String { return self._s[3250]! }
-    public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3251]! }
-    public var ContactInfo_BirthdayLabel: String { return self._s[3252]! }
-    public var Call_ShareStats: String { return self._s[3253]! }
-    public var ChatList_UndoArchiveRevealedText: String { return self._s[3255]! }
-    public var Notifications_GroupNotificationsPreview: String { return self._s[3256]! }
-    public var Settings_Support: String { return self._s[3257]! }
-    public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[3258]! }
-    public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3260]!, self._r[3260]!, [_0])
-    }
-    public var Watch_Conversation_GroupInfo: String { return self._s[3261]! }
-    public var Tour_Text4: String { return self._s[3262]! }
-    public var UserInfo_FakeUserWarning: String { return self._s[3264]! }
-    public var PasscodeSettings_AutoLock: String { return self._s[3265]! }
-    public var Channel_BanList_BlockedTitle: String { return self._s[3266]! }
-    public var Bot_DescriptionTitle: String { return self._s[3267]! }
-    public var Map_LocationTitle: String { return self._s[3268]! }
-    public var ChatListFolder_ExcludeSectionInfo: String { return self._s[3269]! }
-    public var Conversation_HashtagCopied: String { return self._s[3270]! }
-    public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3271]!, self._r[3271]!, [_1])
-    }
-    public var Login_EmailNotConfiguredError: String { return self._s[3272]! }
-    public var AutoDownloadSettings_LimitBySize: String { return self._s[3273]! }
-    public var PrivacySettings_LastSeenNobody: String { return self._s[3274]! }
-    public var Permissions_CellularDataText_v0: String { return self._s[3275]! }
-    public var Conversation_EncryptionProcessing: String { return self._s[3276]! }
-    public var GroupPermission_Delete: String { return self._s[3277]! }
-    public var Contacts_SortByName: String { return self._s[3278]! }
-    public var TwoStepAuth_RecoveryUnavailable: String { return self._s[3279]! }
-    public var Compose_ChannelTokenListPlaceholder: String { return self._s[3280]! }
-    public var Group_Management_AddModeratorHelp: String { return self._s[3282]! }
-    public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[3283]! }
-    public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3284]! }
-    public var CallFeedback_IncludeLogsInfo: String { return self._s[3286]! }
-    public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3287]!, self._r[3287]!, [_1])
-    }
-    public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3288]!, self._r[3288]!, [_0])
     }
-    public var ChatList_Context_Delete: String { return self._s[3289]! }
-    public var VoiceChat_InviteMember: String { return self._s[3290]! }
-    public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[3291]! }
-    public var Conversation_Processing: String { return self._s[3292]! }
-    public var TwoStepAuth_EmailCodeExpired: String { return self._s[3293]! }
-    public var ChatSettings_Stickers: String { return self._s[3294]! }
-    public var AppleWatch_ReplyPresetsHelp: String { return self._s[3295]! }
-    public var Passport_Language_cs: String { return self._s[3296]! }
-    public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3298]! }
-    public var Conversation_Contact: String { return self._s[3299]! }
-    public var Passport_Identity_ReverseSideHelp: String { return self._s[3300]! }
-    public var SocksProxySetup_PasteFromClipboard: String { return self._s[3301]! }
-    public var Theme_Unsupported: String { return self._s[3302]! }
-    public var Privacy_TopPeersWarning: String { return self._s[3303]! }
-    public var InviteLink_Title: String { return self._s[3305]! }
+    public var Login_InfoHelp: String { return self._s[3289]! }
+    public var Notification_SecretChatMessageScreenshotSelf: String { return self._s[3290]! }
+    public var VoiceChat_SpeakPermissionEveryone: String { return self._s[3291]! }
+    public var Profile_MessageLifetime1d: String { return self._s[3292]! }
+    public var Group_UpgradeConfirmation: String { return self._s[3293]! }
+    public func PUSH_PINNED_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3294]!, self._r[3294]!, [_1, _2])
+    }
+    public var Appearance_RemoveThemeColor: String { return self._s[3295]! }
+    public var Channel_AdminLog_TitleSelectedEvents: String { return self._s[3296]! }
+    public func Call_AnsweringWithAccount(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3297]!, self._r[3297]!, [_0])
+    }
+    public var UserInfo_BotSettings: String { return self._s[3298]! }
+    public func Notification_ChannelInviter(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3300]!, self._r[3300]!, [_0])
+    }
+    public var Permissions_ContactsText_v0: String { return self._s[3301]! }
+    public var Conversation_PinMessagesForMe: String { return self._s[3302]! }
+    public var VoiceChat_PanelJoin: String { return self._s[3303]! }
+    public var Conversation_DiscussionStarted: String { return self._s[3305]! }
+    public var SettingsSearch_Synonyms_Privacy_TwoStepAuth: String { return self._s[3306]! }
+    public var SharedMedia_SearchNoResults: String { return self._s[3308]! }
+    public func Login_EmailPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3310]!, self._r[3310]!, [_0])
+    }
+    public func Conversation_ShareMyPhoneNumber_StatusSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3312]!, self._r[3312]!, [_0])
+    }
+    public var ReportPeer_ReasonOther_Placeholder: String { return self._s[3313]! }
+    public func TwoStepAuth_ResetPendingText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3314]!, self._r[3314]!, [_0])
+    }
+    public var ContactInfo_PhoneLabelHomeFax: String { return self._s[3315]! }
+    public var Call_AudioRouteHeadphones: String { return self._s[3316]! }
+    public func Notification_VoiceChatScheduledTomorrowChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_0])
+    }
+    public func PUSH_AUTH_UNKNOWN(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3319]!, self._r[3319]!, [_1])
+    }
+    public var Passport_Identity_FilesView: String { return self._s[3320]! }
+    public var TwoStepAuth_SetupEmail: String { return self._s[3321]! }
+    public var Widget_ApplicationStartRequired: String { return self._s[3322]! }
+    public var PhotoEditor_Original: String { return self._s[3323]! }
+    public var Call_YourMicrophoneOff: String { return self._s[3324]! }
+    public var Permissions_ContactsAllow_v0: String { return self._s[3325]! }
+    public var Conversation_CardNumberCopied: String { return self._s[3326]! }
+    public var Notification_Exceptions_PreviewAlwaysOn: String { return self._s[3327]! }
+    public var PrivacyPolicy_Decline: String { return self._s[3328]! }
+    public var SettingsSearch_Synonyms_ChatFolders: String { return self._s[3329]! }
+    public var TwoStepAuth_PasswordRemoveConfirmation: String { return self._s[3330]! }
+    public var ChatListFolder_IncludeSectionInfo: String { return self._s[3331]! }
+    public func Map_DirectionsDriveEta(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3332]!, self._r[3332]!, [_0])
+    }
+    public var Passport_Identity_Name: String { return self._s[3333]! }
+    public var WallpaperPreview_PatternTitle: String { return self._s[3335]! }
+    public var VoiceOver_Chat_RecordModeVideoMessage: String { return self._s[3336]! }
+    public var WallpaperSearch_ColorOrange: String { return self._s[3338]! }
+    public var Appearance_ThemePreview_ChatList_5_Name: String { return self._s[3339]! }
+    public var GroupInfo_Permissions_SlowmodeInfo: String { return self._s[3340]! }
+    public var Your_cards_security_code_is_invalid: String { return self._s[3341]! }
+    public var IntentsSettings_ResetAll: String { return self._s[3342]! }
+    public var SettingsSearch_Synonyms_Calls_CallTab: String { return self._s[3344]! }
+    public var Group_EditAdmin_TransferOwnership: String { return self._s[3345]! }
+    public var ChatList_DeleteForAllSubscribers: String { return self._s[3346]! }
+    public var Notification_Exceptions_Add: String { return self._s[3347]! }
+    public var Group_DeleteGroup: String { return self._s[3348]! }
+    public var Cache_Help: String { return self._s[3349]! }
+    public var Call_AudioRouteMute: String { return self._s[3350]! }
+    public var VoiceOver_Chat_YourVoiceMessage: String { return self._s[3351]! }
+    public var SocksProxySetup_ProxyEnabled: String { return self._s[3352]! }
+    public func VoiceChat_Status_MembersFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3353]!, self._r[3353]!, [_1, _2])
+    }
+    public func ApplyLanguage_UnsufficientDataText(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3354]!, self._r[3354]!, [_1])
+    }
+    public func Call_CallInProgressMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3355]!, self._r[3355]!, [_1, _2])
+    }
+    public var AutoDownloadSettings_VideoMessagesTitle: String { return self._s[3356]! }
+    public var Channel_BanUser_PermissionAddMembers: String { return self._s[3357]! }
+    public func PUSH_CHAT_VOICECHAT_INVITE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3358]!, self._r[3358]!, [_1, _2, _3])
+    }
+    public var Contacts_MemberSearchSectionTitleGroup: String { return self._s[3359]! }
+    public var TwoStepAuth_RecoveryCodeHelp: String { return self._s[3360]! }
+    public var ClearCache_StorageFree: String { return self._s[3361]! }
+    public func DialogList_SingleRecordingVideoMessageSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3362]!, self._r[3362]!, [_0])
+    }
+    public var Privacy_Forwards_CustomHelp: String { return self._s[3363]! }
+    public func Channel_AdminLog_EditedInviteLink(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3365]!, self._r[3365]!, [_1, _2])
+    }
+    public var Group_ErrorAddTooMuchAdmins: String { return self._s[3366]! }
+    public var DialogList_Typing: String { return self._s[3367]! }
+    public func Login_EmailCodeSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3368]!, self._r[3368]!, [_0])
+    }
+    public var Target_SelectGroup: String { return self._s[3369]! }
+    public var AuthSessions_IncompleteAttempts: String { return self._s[3370]! }
+    public var TwoStepAuth_RecoveryEmailResetText: String { return self._s[3371]! }
+    public var TwoFactorRemember_Done_Text: String { return self._s[3372]! }
+    public func Notification_ProximityReached(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3373]!, self._r[3373]!, [_1, _2, _3])
+    }
+    public var Chat_PinnedListPreview_ShowAllMessages: String { return self._s[3374]! }
+    public var TwoStepAuth_EmailChangeSuccess: String { return self._s[3375]! }
+    public func Settings_CheckPhoneNumberTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3376]!, self._r[3376]!, [_0])
+    }
+    public var Channel_AdminLog_CanSendMessages: String { return self._s[3377]! }
+    public var TwoFactorSetup_EmailVerification_Title: String { return self._s[3378]! }
+    public var ChatSettings_TextSize: String { return self._s[3379]! }
+    public var Channel_AdminLogFilter_EventsEditedMessages: String { return self._s[3381]! }
+    public var Map_SendThisPlace: String { return self._s[3382]! }
+    public var Conversation_TextCopied: String { return self._s[3383]! }
+    public var Login_PhoneNumberAlreadyAuthorized: String { return self._s[3384]! }
+    public var ContactInfo_BirthdayLabel: String { return self._s[3385]! }
+    public var Call_ShareStats: String { return self._s[3386]! }
+    public func PUSH_CHAT_VOICECHAT_END(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3388]!, self._r[3388]!, [_1, _2])
+    }
+    public var ChatList_UndoArchiveRevealedText: String { return self._s[3389]! }
+    public var Notifications_GroupNotificationsPreview: String { return self._s[3390]! }
+    public var Settings_Support: String { return self._s[3391]! }
+    public var GroupInfo_ChannelListNamePlaceholder: String { return self._s[3392]! }
+    public func EmptyGroupInfo_Line1(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3394]!, self._r[3394]!, [_0])
+    }
+    public var Watch_Conversation_GroupInfo: String { return self._s[3395]! }
+    public var Tour_Text4: String { return self._s[3396]! }
+    public var VoiceChat_CancelReminder: String { return self._s[3397]! }
+    public var Calls_StartNewCall: String { return self._s[3398]! }
+    public var UserInfo_FakeUserWarning: String { return self._s[3400]! }
+    public var PasscodeSettings_AutoLock: String { return self._s[3401]! }
+    public var Channel_BanList_BlockedTitle: String { return self._s[3402]! }
+    public var Bot_DescriptionTitle: String { return self._s[3404]! }
+    public var Map_LocationTitle: String { return self._s[3405]! }
+    public var ChatListFolder_ExcludeSectionInfo: String { return self._s[3406]! }
+    public var Conversation_HashtagCopied: String { return self._s[3407]! }
+    public func Notification_MessageLifetimeChangedOutgoing(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3408]!, self._r[3408]!, [_1])
+    }
+    public var VoiceChat_ReminderNotify: String { return self._s[3409]! }
+    public var Login_EmailNotConfiguredError: String { return self._s[3410]! }
+    public var AutoDownloadSettings_LimitBySize: String { return self._s[3411]! }
+    public var PrivacySettings_LastSeenNobody: String { return self._s[3412]! }
+    public var Permissions_CellularDataText_v0: String { return self._s[3413]! }
+    public var Conversation_EncryptionProcessing: String { return self._s[3414]! }
+    public var GroupPermission_Delete: String { return self._s[3416]! }
+    public var Contacts_SortByName: String { return self._s[3417]! }
+    public var TwoStepAuth_RecoveryUnavailable: String { return self._s[3418]! }
+    public var Compose_ChannelTokenListPlaceholder: String { return self._s[3419]! }
+    public var Group_Management_AddModeratorHelp: String { return self._s[3421]! }
+    public var SettingsSearch_Synonyms_EditProfile_Logout: String { return self._s[3422]! }
+    public var Forward_ErrorPublicPollDisabledInChannels: String { return self._s[3423]! }
+    public var CallFeedback_IncludeLogsInfo: String { return self._s[3425]! }
+    public func PUSH_CHANNEL_MESSAGE_QUIZ(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3426]!, self._r[3426]!, [_1])
+    }
+    public func SecretVideo_NotViewedYet(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3427]!, self._r[3427]!, [_0])
+    }
+    public var ChatList_Context_Delete: String { return self._s[3428]! }
+    public var VoiceChat_InviteMember: String { return self._s[3429]! }
+    public var PrivacyPhoneNumberSettings_CustomDisabledHelp: String { return self._s[3430]! }
+    public var Conversation_Processing: String { return self._s[3431]! }
+    public var TwoStepAuth_EmailCodeExpired: String { return self._s[3432]! }
+    public var ChatSettings_Stickers: String { return self._s[3433]! }
+    public var AppleWatch_ReplyPresetsHelp: String { return self._s[3434]! }
+    public var Passport_Language_cs: String { return self._s[3435]! }
+    public var GroupInfo_InvitationLinkGroupFull: String { return self._s[3437]! }
+    public var Conversation_Contact: String { return self._s[3438]! }
+    public var Passport_Identity_ReverseSideHelp: String { return self._s[3439]! }
+    public var SocksProxySetup_PasteFromClipboard: String { return self._s[3441]! }
+    public var Theme_Unsupported: String { return self._s[3442]! }
+    public var Privacy_TopPeersWarning: String { return self._s[3443]! }
+    public func Conversation_ScheduledVoiceChatStartsTodayShort(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3444]!, self._r[3444]!, [_0])
+    }
+    public var InviteLink_Title: String { return self._s[3446]! }
     public func UserInfo_BlockConfirmationTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3306]!, self._r[3306]!, [_0])
+        return formatWithArgumentRanges(self._s[3447]!, self._r[3447]!, [_0])
     }
-    public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3307]! }
-    public var TwoStepAuth_RemovePassword: String { return self._s[3308]! }
-    public var Settings_CheckPhoneNumberText: String { return self._s[3309]! }
-    public var PeopleNearby_Users: String { return self._s[3310]! }
-    public var Appearance_TextSize_UseSystem: String { return self._s[3311]! }
-    public var Settings_SetProfilePhoto: String { return self._s[3312]! }
-    public var Conversation_ContextMenuBan: String { return self._s[3313]! }
-    public var KeyCommand_ScrollUp: String { return self._s[3314]! }
-    public var Settings_ChatSettings: String { return self._s[3316]! }
-    public var CallList_RecentCallsHeader: String { return self._s[3317]! }
+    public var Conversation_SilentBroadcastTooltipOn: String { return self._s[3448]! }
+    public var TwoStepAuth_RemovePassword: String { return self._s[3449]! }
+    public var Settings_CheckPhoneNumberText: String { return self._s[3450]! }
+    public var PeopleNearby_Users: String { return self._s[3451]! }
+    public var Appearance_TextSize_UseSystem: String { return self._s[3452]! }
+    public var Settings_SetProfilePhoto: String { return self._s[3453]! }
+    public var Conversation_ContextMenuBan: String { return self._s[3454]! }
+    public var KeyCommand_ScrollUp: String { return self._s[3455]! }
+    public var Settings_ChatSettings: String { return self._s[3457]! }
+    public var CallList_RecentCallsHeader: String { return self._s[3458]! }
     public func PUSH_CHAT_MESSAGE_VIDEO(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3318]!, self._r[3318]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3459]!, self._r[3459]!, [_1, _2])
     }
-    public var Stats_GroupTopInvitersTitle: String { return self._s[3319]! }
-    public var Passport_Phone_EnterOtherNumber: String { return self._s[3320]! }
-    public var VoiceChat_StartRecordingTitle: String { return self._s[3321]! }
-    public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[3323]! }
-    public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3324]! }
-    public var VoiceOver_ChatList_MessageRead: String { return self._s[3325]! }
-    public var Stats_GroupTopPoster_Promote: String { return self._s[3326]! }
-    public var Cache_Title: String { return self._s[3327]! }
+    public var Stats_GroupTopInvitersTitle: String { return self._s[3460]! }
+    public var Passport_Phone_EnterOtherNumber: String { return self._s[3461]! }
+    public var VoiceChat_StartRecordingTitle: String { return self._s[3462]! }
+    public func Notification_VoiceChatScheduledToday(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3463]!, self._r[3463]!, [_1, _2])
+    }
+    public var Passport_Identity_MiddleNamePlaceholder: String { return self._s[3465]! }
+    public var Passport_Address_OneOfTypeBankStatement: String { return self._s[3466]! }
+    public var VoiceOver_ChatList_MessageRead: String { return self._s[3468]! }
+    public var Stats_GroupTopPoster_Promote: String { return self._s[3471]! }
+    public var Cache_Title: String { return self._s[3472]! }
     public func Conversation_AutoremoveTimerSetToastText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3328]!, self._r[3328]!, [_0])
+        return formatWithArgumentRanges(self._s[3473]!, self._r[3473]!, [_0])
     }
-    public var Clipboard_SendPhoto: String { return self._s[3329]! }
-    public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[3331]! }
-    public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3332]! }
-    public var WatchRemote_AlertTitle: String { return self._s[3335]! }
-    public var Appearance_ReduceMotion: String { return self._s[3336]! }
+    public var Clipboard_SendPhoto: String { return self._s[3474]! }
+    public var Notifications_ExceptionsMessagePlaceholder: String { return self._s[3476]! }
+    public var TwoStepAuth_EnterPasswordForgot: String { return self._s[3477]! }
+    public var WatchRemote_AlertTitle: String { return self._s[3480]! }
+    public var Appearance_ReduceMotion: String { return self._s[3481]! }
     public func PUSH_CHAT_MESSAGE_ROUND(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3339]!, self._r[3339]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3484]!, self._r[3484]!, [_1, _2])
     }
-    public var Notifications_PermissionsSuppressWarningText: String { return self._s[3340]! }
-    public var ChatList_UndoArchiveHiddenTitle: String { return self._s[3341]! }
-    public var Passport_Identity_TypePersonalDetails: String { return self._s[3342]! }
+    public var Notifications_PermissionsSuppressWarningText: String { return self._s[3485]! }
+    public var ChatList_UndoArchiveHiddenTitle: String { return self._s[3486]! }
+    public var Passport_Identity_TypePersonalDetails: String { return self._s[3487]! }
     public func Call_CallInProgressVoiceChatMessage(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3343]!, self._r[3343]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3488]!, self._r[3488]!, [_1, _2])
     }
     public func Passport_Identity_UploadOneOfScan(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3345]!, self._r[3345]!, [_0])
+        return formatWithArgumentRanges(self._s[3490]!, self._r[3490]!, [_0])
     }
-    public var ChatListFolder_DiscardConfirmation: String { return self._s[3346]! }
+    public var ChatListFolder_DiscardConfirmation: String { return self._s[3491]! }
     public func Conversation_RestrictedStickersTimed(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3347]!, self._r[3347]!, [_0])
+        return formatWithArgumentRanges(self._s[3493]!, self._r[3493]!, [_0])
     }
-    public var InstantPage_Search: String { return self._s[3348]! }
-    public var ChatState_WaitingForNetwork: String { return self._s[3349]! }
-    public var GroupInfo_Sound: String { return self._s[3350]! }
-    public var NotificationsSound_Telegraph: String { return self._s[3351]! }
-    public var NotificationsSound_Hello: String { return self._s[3352]! }
-    public var VoiceChat_LeaveConfirmation: String { return self._s[3353]! }
-    public var Passport_FieldIdentityDetailsHelp: String { return self._s[3354]! }
-    public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[3355]! }
-    public var Conversation_HoldForVideo: String { return self._s[3356]! }
-    public var Conversation_PinOlderMessageAlertText: String { return self._s[3357]! }
-    public var Appearance_ShareTheme: String { return self._s[3358]! }
-    public var TwoStepAuth_SetupHint: String { return self._s[3359]! }
-    public var Stats_GrowthTitle: String { return self._s[3362]! }
-    public var GroupInfo_InviteLink_ShareLink: String { return self._s[3363]! }
-    public var Conversation_DefaultRestrictedMedia: String { return self._s[3364]! }
-    public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[3365]! }
-    public var GroupPermission_NoSendMessages: String { return self._s[3368]! }
-    public var Conversation_SetReminder_Title: String { return self._s[3369]! }
-    public var Privacy_Calls_CustomHelp: String { return self._s[3370]! }
-    public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3371]! }
+    public var InstantPage_Search: String { return self._s[3494]! }
+    public var ChatState_WaitingForNetwork: String { return self._s[3495]! }
+    public var GroupInfo_Sound: String { return self._s[3496]! }
+    public var NotificationsSound_Telegraph: String { return self._s[3497]! }
+    public func VoiceChat_ParticipantIsSpeaking(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3498]!, self._r[3498]!, [_1])
+    }
+    public var NotificationsSound_Hello: String { return self._s[3499]! }
+    public var VoiceChat_LeaveConfirmation: String { return self._s[3500]! }
+    public var UserInfo_LinkForwardTooltip_SavedMessages_One: String { return self._s[3501]! }
+    public var Passport_FieldIdentityDetailsHelp: String { return self._s[3502]! }
+    public var Group_Members_AddMemberBotErrorNotAllowed: String { return self._s[3503]! }
+    public var Conversation_HoldForVideo: String { return self._s[3504]! }
+    public var Conversation_PinOlderMessageAlertText: String { return self._s[3505]! }
+    public var Appearance_ShareTheme: String { return self._s[3506]! }
+    public var TwoStepAuth_SetupHint: String { return self._s[3507]! }
+    public var Stats_GrowthTitle: String { return self._s[3510]! }
+    public var GroupInfo_InviteLink_ShareLink: String { return self._s[3511]! }
+    public var Conversation_DefaultRestrictedMedia: String { return self._s[3512]! }
+    public var Channel_EditAdmin_PermissionPostMessages: String { return self._s[3513]! }
+    public var GroupPermission_NoSendMessages: String { return self._s[3516]! }
+    public var Conversation_SetReminder_Title: String { return self._s[3517]! }
+    public var Privacy_Calls_CustomHelp: String { return self._s[3518]! }
+    public var CheckoutInfo_ErrorPostcodeInvalid: String { return self._s[3519]! }
     public func ClearCache_StorageTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3372]!, self._r[3372]!, [_0])
+        return formatWithArgumentRanges(self._s[3520]!, self._r[3520]!, [_0])
     }
-    public var InviteLinks_InviteLinkExpired: String { return self._s[3374]! }
-    public var Undo_SecretChatDeleted: String { return self._s[3375]! }
-    public var PhotoEditor_ContrastTool: String { return self._s[3376]! }
-    public var Privacy_Forwards: String { return self._s[3377]! }
-    public var AuthSessions_LoggedInWithTelegram: String { return self._s[3378]! }
-    public var KeyCommand_SendMessage: String { return self._s[3380]! }
-    public var Conversation_PrivateMessageLinkCopiedLong: String { return self._s[3381]! }
+    public var InviteLinks_InviteLinkExpired: String { return self._s[3522]! }
+    public var Undo_SecretChatDeleted: String { return self._s[3523]! }
+    public var PhotoEditor_ContrastTool: String { return self._s[3524]! }
+    public var Privacy_Forwards: String { return self._s[3525]! }
+    public var AuthSessions_LoggedInWithTelegram: String { return self._s[3526]! }
+    public var KeyCommand_SendMessage: String { return self._s[3528]! }
+    public var Conversation_PrivateMessageLinkCopiedLong: String { return self._s[3529]! }
     public func InstantPage_RelatedArticleAuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3382]!, self._r[3382]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3530]!, self._r[3530]!, [_1, _2])
     }
-    public var GroupPermission_NoSendGifs: String { return self._s[3383]! }
-    public var Notification_MessageLifetime2s: String { return self._s[3384]! }
-    public var Message_Theme: String { return self._s[3385]! }
-    public var Conversation_Dice_u1F3AF: String { return self._s[3388]! }
+    public var VoiceChat_VideoPaused: String { return self._s[3531]! }
+    public var GroupPermission_NoSendGifs: String { return self._s[3532]! }
+    public func Notification_VoiceChatEndedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3533]!, self._r[3533]!, [_1, _2])
+    }
+    public var Notification_MessageLifetime2s: String { return self._s[3534]! }
+    public var Message_Theme: String { return self._s[3535]! }
+    public var Conversation_Dice_u1F3AF: String { return self._s[3538]! }
     public func DialogList_SinglePlayingGameSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3389]!, self._r[3389]!, [_0])
+        return formatWithArgumentRanges(self._s[3539]!, self._r[3539]!, [_0])
     }
-    public var Group_UpgradeNoticeHeader: String { return self._s[3391]! }
-    public var PeerInfo_BioExpand: String { return self._s[3392]! }
-    public var Passport_DeletePersonalDetails: String { return self._s[3393]! }
-    public var Widget_NoUsers: String { return self._s[3394]! }
-    public var TwoStepAuth_AddHintTitle: String { return self._s[3395]! }
-    public var Login_TermsOfServiceDecline: String { return self._s[3396]! }
-    public var CreatePoll_QuizTip: String { return self._s[3398]! }
-    public var Watch_LastSeen_WithinAWeek: String { return self._s[3399]! }
-    public var MessagePoll_SubmitVote: String { return self._s[3401]! }
-    public var ChatSettings_AutoDownloadEnabled: String { return self._s[3402]! }
-    public var Passport_Address_EditRentalAgreement: String { return self._s[3403]! }
-    public var Conversation_SearchByName_Placeholder: String { return self._s[3404]! }
-    public var Conversation_UpdateTelegram: String { return self._s[3405]! }
+    public var Group_UpgradeNoticeHeader: String { return self._s[3541]! }
+    public var PeerInfo_BioExpand: String { return self._s[3542]! }
+    public var Passport_DeletePersonalDetails: String { return self._s[3543]! }
+    public var Widget_NoUsers: String { return self._s[3544]! }
+    public var TwoStepAuth_AddHintTitle: String { return self._s[3545]! }
+    public var VoiceChat_VideoPreviewDescription: String { return self._s[3546]! }
+    public var Login_TermsOfServiceDecline: String { return self._s[3547]! }
+    public var VoiceChat_UnmuteSuggestion: String { return self._s[3548]! }
+    public var CreatePoll_QuizTip: String { return self._s[3550]! }
+    public var Watch_LastSeen_WithinAWeek: String { return self._s[3551]! }
+    public var MessagePoll_SubmitVote: String { return self._s[3553]! }
+    public var ChatSettings_AutoDownloadEnabled: String { return self._s[3554]! }
+    public var Passport_Address_EditRentalAgreement: String { return self._s[3555]! }
+    public var Conversation_SearchByName_Placeholder: String { return self._s[3556]! }
+    public var Conversation_UpdateTelegram: String { return self._s[3557]! }
     public func FileSize_KB(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3406]!, self._r[3406]!, [_0])
-    }
-    public var UserInfo_About_Placeholder: String { return self._s[3407]! }
-    public var CallSettings_Always: String { return self._s[3408]! }
-    public var ChannelInfo_ScamChannelWarning: String { return self._s[3409]! }
-    public var VoiceChat_MutedByAdminHelp: String { return self._s[3410]! }
-    public var Login_TermsOfServiceHeader: String { return self._s[3411]! }
-    public var KeyCommand_ChatInfo: String { return self._s[3412]! }
-    public var MessagePoll_LabelPoll: String { return self._s[3413]! }
-    public var Paint_Clear: String { return self._s[3414]! }
-    public var PeerInfo_ButtonMute: String { return self._s[3415]! }
-    public var LastSeen_WithinAWeek: String { return self._s[3416]! }
-    public var Invitation_JoinVoiceChatAsSpeaker: String { return self._s[3417]! }
-    public var Passport_Identity_FrontSide: String { return self._s[3418]! }
-    public var Stickers_GroupStickers: String { return self._s[3419]! }
-    public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[3420]! }
-    public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3421]!, self._r[3421]!, [_0])
-    }
-    public var VoiceOver_BotCommands: String { return self._s[3422]! }
-    public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3425]!, self._r[3425]!, [_1])
-    }
-    public var SocksProxySetup_ProxyStatusConnected: String { return self._s[3426]! }
-    public var Chat_MultipleTextMessagesDisabled: String { return self._s[3427]! }
-    public var InviteLink_ContextDelete: String { return self._s[3428]! }
-    public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3429]!, self._r[3429]!, [_0])
-    }
-    public var WebSearch_SearchNoResults: String { return self._s[3431]! }
-    public var Channel_DiscussionGroup_Create: String { return self._s[3432]! }
-    public var Passport_Language_es: String { return self._s[3433]! }
-    public var EnterPasscode_EnterCurrentPasscode: String { return self._s[3434]! }
-    public var Map_LiveLocationShowAll: String { return self._s[3435]! }
-    public var Cache_MaximumCacheSizeHelp: String { return self._s[3437]! }
-    public var Map_OpenInGoogleMaps: String { return self._s[3438]! }
-    public var CheckoutInfo_ErrorNameInvalid: String { return self._s[3440]! }
-    public var EditTheme_Create_BottomInfo: String { return self._s[3441]! }
-    public var PhotoEditor_BlurToolLinear: String { return self._s[3442]! }
-    public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3443]!, self._r[3443]!, [_0])
-    }
-    public var Passport_Phone_Delete: String { return self._s[3444]! }
-    public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[3445]! }
-    public var PrivacySettings_PrivacyTitle: String { return self._s[3446]! }
-    public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[3447]! }
-    public func EncryptionKey_Description(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3448]!, self._r[3448]!, [_1, _2])
-    }
-    public var LogoutOptions_LogOutInfo: String { return self._s[3449]! }
-    public var Cache_ByPeerHeader: String { return self._s[3451]! }
-    public var Username_InvalidCharacters: String { return self._s[3452]! }
-    public var Checkout_ShippingAddress: String { return self._s[3453]! }
-    public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3454]!, self._r[3454]!, [_1, _2, _3, _4])
-    }
-    public var VoiceChat_LeaveAndEndVoiceChat: String { return self._s[3456]! }
-    public var Conversation_AddContact: String { return self._s[3457]! }
-    public var Passport_Address_EditUtilityBill: String { return self._s[3458]! }
-    public var InviteLink_ContextGetQRCode: String { return self._s[3459]! }
-    public var Conversation_ChecksTooltip_Delivered: String { return self._s[3461]! }
-    public func Channel_AdminLog_MessageAddedAdminNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3462]!, self._r[3462]!, [_1, _2])
-    }
-    public var Message_Video: String { return self._s[3463]! }
-    public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3464]!, self._r[3464]!, [_0])
-    }
-    public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3465]!, self._r[3465]!, ["\(_0)"])
-    }
-    public var InviteLink_ReactivateLink: String { return self._s[3466]! }
-    public var Passport_Language_km: String { return self._s[3467]! }
-    public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3468]!, self._r[3468]!, [_1, _2, _3])
-    }
-    public var EmptyGroupInfo_Line4: String { return self._s[3469]! }
-    public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3471]! }
-    public var Notification_CallCanceledShort: String { return self._s[3472]! }
-    public var PhotoEditor_FadeTool: String { return self._s[3473]! }
-    public var Group_PublicLink_Info: String { return self._s[3474]! }
-    public var Contacts_DeselectAll: String { return self._s[3475]! }
-    public var Conversation_Moderate_Delete: String { return self._s[3476]! }
-    public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3477]! }
-    public var NotificationsSound_Note: String { return self._s[3480]! }
-    public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3481]!, self._r[3481]!, [_0])
-    }
-    public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[3482]! }
-    public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3484]! }
-    public var DialogList_SearchSectionGlobal: String { return self._s[3485]! }
-    public var AccessDenied_Settings: String { return self._s[3486]! }
-    public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3487]! }
-    public var AuthSessions_EmptyTitle: String { return self._s[3488]! }
-    public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[3489]! }
-    public var GroupInfo_GroupType: String { return self._s[3490]! }
-    public var Calls_Missed: String { return self._s[3491]! }
-    public var Contacts_VoiceOver_AddContact: String { return self._s[3492]! }
-    public var UserInfo_GenericPhoneLabel: String { return self._s[3494]! }
-    public var Passport_Language_uz: String { return self._s[3495]! }
-    public var Conversation_StopQuizConfirmationTitle: String { return self._s[3496]! }
-    public var PhotoEditor_BlurToolPortrait: String { return self._s[3497]! }
-    public var Map_ChooseLocationTitle: String { return self._s[3498]! }
-    public var Checkout_EnterPassword: String { return self._s[3499]! }
-    public var GroupInfo_ConvertToSupergroup: String { return self._s[3500]! }
-    public var AutoNightTheme_UpdateLocation: String { return self._s[3501]! }
-    public var NetworkUsageSettings_Title: String { return self._s[3502]! }
-    public var Location_ProximityAlertCancelled: String { return self._s[3503]! }
-    public var SettingsSearch_Synonyms_ChatSettings_IntentsSettings: String { return self._s[3504]! }
-    public var Message_PinnedLiveLocationMessage: String { return self._s[3505]! }
-    public var Compose_NewChannel: String { return self._s[3506]! }
-    public var Privacy_PaymentsClearInfo: String { return self._s[3508]! }
-    public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3509]!, self._r[3509]!, [_1])
-    }
-    public var Notification_Exceptions_AlwaysOn: String { return self._s[3510]! }
-    public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3511]! }
-    public var AutoNightTheme_AutomaticSection: String { return self._s[3514]! }
-    public var WallpaperSearch_ColorBrown: String { return self._s[3515]! }
-    public var Appearance_AppIconDefault: String { return self._s[3516]! }
-    public var StickerSettings_ContextInfo: String { return self._s[3519]! }
-    public var Channel_AddBotErrorNoRights: String { return self._s[3520]! }
-    public var Passport_FieldPhone: String { return self._s[3522]! }
-    public var Contacts_PermissionsTitle: String { return self._s[3523]! }
-    public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3524]! }
-    public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3525]!, self._r[3525]!, [_0])
-    }
-    public var Bot_Unblock: String { return self._s[3526]! }
-    public var PasscodeSettings_SimplePasscode: String { return self._s[3527]! }
-    public var InviteLink_InviteLinkCopiedText: String { return self._s[3528]! }
-    public var Passport_PasswordHelp: String { return self._s[3529]! }
-    public var Watch_Conversation_UserInfo: String { return self._s[3530]! }
-    public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3534]!, self._r[3534]!, [_0])
-    }
-    public var State_Connecting: String { return self._s[3536]! }
-    public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3537]! }
-    public var TextFormat_AddLinkPlaceholder: String { return self._s[3538]! }
-    public var Conversation_Dice_u1F3B2: String { return self._s[3539]! }
-    public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3540]!, self._r[3540]!, [_0])
-    }
-    public var Conversation_SendingOptionsTooltip: String { return self._s[3541]! }
-    public var ChatList_UndoArchiveTitle: String { return self._s[3542]! }
-    public var ChatList_EmptyChatListNewMessage: String { return self._s[3543]! }
-    public var WallpaperSearch_ColorGreen: String { return self._s[3545]! }
-    public var PhotoEditor_BlurToolOff: String { return self._s[3546]! }
-    public var Conversation_AutoremoveOff: String { return self._s[3547]! }
-    public var SocksProxySetup_PortPlaceholder: String { return self._s[3548]! }
-    public var Weekday_Saturday: String { return self._s[3549]! }
-    public var DialogList_Unread: String { return self._s[3550]! }
-    public var Watch_LastSeen_ALongTimeAgo: String { return self._s[3551]! }
-    public var Stats_GroupPosters: String { return self._s[3552]! }
-    public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3553]!, self._r[3553]!, [_1])
-    }
-    public var Conversation_AlsoClearCacheTitle: String { return self._s[3554]! }
-    public func Conversation_ForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3555]!, self._r[3555]!, [_0, _1])
-    }
-    public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3558]!, self._r[3558]!, [_0])
     }
-    public var ReportPeer_ReasonChildAbuse: String { return self._s[3559]! }
+    public var UserInfo_About_Placeholder: String { return self._s[3559]! }
+    public var CallSettings_Always: String { return self._s[3560]! }
+    public var ChannelInfo_ScamChannelWarning: String { return self._s[3561]! }
+    public var VoiceChat_MutedByAdminHelp: String { return self._s[3562]! }
+    public var Login_TermsOfServiceHeader: String { return self._s[3563]! }
+    public var KeyCommand_ChatInfo: String { return self._s[3564]! }
+    public var MessagePoll_LabelPoll: String { return self._s[3565]! }
+    public var Paint_Clear: String { return self._s[3566]! }
+    public var PeerInfo_ButtonMute: String { return self._s[3567]! }
+    public var LastSeen_WithinAWeek: String { return self._s[3568]! }
+    public var Invitation_JoinVoiceChatAsSpeaker: String { return self._s[3569]! }
+    public var Passport_Identity_FrontSide: String { return self._s[3570]! }
+    public var Stickers_GroupStickers: String { return self._s[3571]! }
+    public var ChangePhoneNumberNumber_NumberPlaceholder: String { return self._s[3572]! }
+    public func Map_SearchNoResultsDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3573]!, self._r[3573]!, [_0])
+    }
+    public var VoiceOver_BotCommands: String { return self._s[3574]! }
+    public func PUSH_MESSAGE_GEO(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3577]!, self._r[3577]!, [_1])
+    }
+    public var SocksProxySetup_ProxyStatusConnected: String { return self._s[3578]! }
+    public var Chat_MultipleTextMessagesDisabled: String { return self._s[3579]! }
+    public var InviteLink_ContextDelete: String { return self._s[3580]! }
+    public func Notification_LeftChat(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3581]!, self._r[3581]!, [_0])
+    }
+    public var WebSearch_SearchNoResults: String { return self._s[3583]! }
+    public var Channel_DiscussionGroup_Create: String { return self._s[3584]! }
+    public var Passport_Language_es: String { return self._s[3585]! }
+    public var EnterPasscode_EnterCurrentPasscode: String { return self._s[3586]! }
+    public var Map_LiveLocationShowAll: String { return self._s[3587]! }
+    public var Cache_MaximumCacheSizeHelp: String { return self._s[3589]! }
+    public var Map_OpenInGoogleMaps: String { return self._s[3590]! }
+    public var CheckoutInfo_ErrorNameInvalid: String { return self._s[3592]! }
+    public var EditTheme_Create_BottomInfo: String { return self._s[3593]! }
+    public var PhotoEditor_BlurToolLinear: String { return self._s[3594]! }
+    public func Channel_AdminLog_MessageEdited(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3595]!, self._r[3595]!, [_0])
+    }
+    public var Passport_Phone_Delete: String { return self._s[3596]! }
+    public var Channel_Username_CreatePrivateLinkHelp: String { return self._s[3597]! }
+    public var PrivacySettings_PrivacyTitle: String { return self._s[3598]! }
+    public var CheckoutInfo_ReceiverInfoNamePlaceholder: String { return self._s[3599]! }
+    public func EncryptionKey_Description(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_1, _2])
+    }
+    public var LogoutOptions_LogOutInfo: String { return self._s[3601]! }
+    public var Cache_ByPeerHeader: String { return self._s[3603]! }
+    public var Username_InvalidCharacters: String { return self._s[3604]! }
+    public var Checkout_ShippingAddress: String { return self._s[3606]! }
+    public func PUSH_CHAT_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3607]!, self._r[3607]!, [_1, _2, _3, _4])
+    }
+    public var VoiceChat_LeaveAndEndVoiceChat: String { return self._s[3609]! }
+    public var Conversation_AddContact: String { return self._s[3610]! }
+    public var Passport_Address_EditUtilityBill: String { return self._s[3611]! }
+    public var InviteLink_ContextGetQRCode: String { return self._s[3612]! }
+    public var Conversation_ChecksTooltip_Delivered: String { return self._s[3614]! }
+    public func Channel_AdminLog_MessageAddedAdminNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3615]!, self._r[3615]!, [_1, _2])
+    }
+    public var Message_Video: String { return self._s[3616]! }
+    public func Watch_Time_ShortYesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3617]!, self._r[3617]!, [_0])
+    }
+    public func Conversation_Megabytes(_ _0: Float) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3618]!, self._r[3618]!, ["\(_0)"])
+    }
+    public var InviteLink_ReactivateLink: String { return self._s[3619]! }
+    public var Passport_Language_km: String { return self._s[3621]! }
+    public func PUSH_MESSAGE_CHANNEL_MESSAGE_GAME_SCORE(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3622]!, self._r[3622]!, [_1, _2, _3])
+    }
+    public var EmptyGroupInfo_Line4: String { return self._s[3623]! }
+    public var Conversation_SendMessageErrorTooMuchScheduled: String { return self._s[3625]! }
+    public var Notification_CallCanceledShort: String { return self._s[3626]! }
+    public var PhotoEditor_FadeTool: String { return self._s[3627]! }
+    public var Group_PublicLink_Info: String { return self._s[3628]! }
+    public var Contacts_DeselectAll: String { return self._s[3629]! }
+    public var Conversation_Moderate_Delete: String { return self._s[3631]! }
+    public var TwoStepAuth_RecoveryCodeInvalid: String { return self._s[3632]! }
+    public var NotificationsSound_Note: String { return self._s[3635]! }
+    public func Message_PaymentSent(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3636]!, self._r[3636]!, [_0])
+    }
+    public var Appearance_ThemePreview_ChatList_7_Text: String { return self._s[3637]! }
+    public var Channel_EditAdmin_PermissionInviteViaLink: String { return self._s[3639]! }
+    public var DialogList_SearchSectionGlobal: String { return self._s[3640]! }
+    public var AccessDenied_Settings: String { return self._s[3641]! }
+    public var Passport_Identity_TypeIdentityCardUploadScan: String { return self._s[3642]! }
+    public var AuthSessions_EmptyTitle: String { return self._s[3643]! }
+    public var TwoStepAuth_PasswordChangeSuccess: String { return self._s[3644]! }
+    public var GroupInfo_GroupType: String { return self._s[3645]! }
+    public var Calls_Missed: String { return self._s[3646]! }
+    public var Contacts_VoiceOver_AddContact: String { return self._s[3647]! }
+    public var UserInfo_GenericPhoneLabel: String { return self._s[3649]! }
+    public var Passport_Language_uz: String { return self._s[3650]! }
+    public var Conversation_StopQuizConfirmationTitle: String { return self._s[3651]! }
+    public var PhotoEditor_BlurToolPortrait: String { return self._s[3652]! }
+    public var VoiceChat_CreateNewVoiceChatStartNow: String { return self._s[3653]! }
+    public var Map_ChooseLocationTitle: String { return self._s[3654]! }
+    public var Checkout_EnterPassword: String { return self._s[3655]! }
+    public var GroupInfo_ConvertToSupergroup: String { return self._s[3656]! }
+    public var AutoNightTheme_UpdateLocation: String { return self._s[3657]! }
+    public var NetworkUsageSettings_Title: String { return self._s[3658]! }
+    public var Location_ProximityAlertCancelled: String { return self._s[3659]! }
+    public var SettingsSearch_Synonyms_ChatSettings_IntentsSettings: String { return self._s[3660]! }
+    public var Message_PinnedLiveLocationMessage: String { return self._s[3661]! }
+    public var Compose_NewChannel: String { return self._s[3662]! }
+    public var Privacy_PaymentsClearInfo: String { return self._s[3664]! }
+    public func PUSH_MESSAGE_POLL(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3665]!, self._r[3665]!, [_1])
+    }
+    public var Notification_Exceptions_AlwaysOn: String { return self._s[3666]! }
+    public var Privacy_GroupsAndChannels_WhoCanAddMe: String { return self._s[3667]! }
+    public var AutoNightTheme_AutomaticSection: String { return self._s[3670]! }
+    public var WallpaperSearch_ColorBrown: String { return self._s[3671]! }
+    public var Appearance_AppIconDefault: String { return self._s[3672]! }
+    public var StickerSettings_ContextInfo: String { return self._s[3675]! }
+    public var Channel_AddBotErrorNoRights: String { return self._s[3676]! }
+    public var Passport_FieldPhone: String { return self._s[3678]! }
+    public var Contacts_PermissionsTitle: String { return self._s[3679]! }
+    public var TwoFactorSetup_Email_SkipConfirmationSkip: String { return self._s[3680]! }
+    public func Notification_JoinedChat(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3681]!, self._r[3681]!, [_0])
+    }
+    public var Bot_Unblock: String { return self._s[3682]! }
+    public var PasscodeSettings_SimplePasscode: String { return self._s[3683]! }
+    public var InviteLink_InviteLinkCopiedText: String { return self._s[3684]! }
+    public var Passport_PasswordHelp: String { return self._s[3685]! }
+    public var TwoFactorSetup_PasswordRecovery_PlaceholderConfirmPassword: String { return self._s[3686]! }
+    public var Watch_Conversation_UserInfo: String { return self._s[3687]! }
+    public func Channel_AdminLog_MessageChangedGroupGeoLocation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3691]!, self._r[3691]!, [_0])
+    }
+    public var State_Connecting: String { return self._s[3693]! }
+    public var Passport_Address_TypeTemporaryRegistration: String { return self._s[3694]! }
+    public var TextFormat_AddLinkPlaceholder: String { return self._s[3695]! }
+    public var Conversation_Dice_u1F3B2: String { return self._s[3696]! }
+    public func Call_StatusBar(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3697]!, self._r[3697]!, [_0])
+    }
+    public var Conversation_SendingOptionsTooltip: String { return self._s[3698]! }
+    public var ChatList_UndoArchiveTitle: String { return self._s[3699]! }
+    public var ChatList_EmptyChatListNewMessage: String { return self._s[3700]! }
+    public var WallpaperSearch_ColorGreen: String { return self._s[3702]! }
+    public var PhotoEditor_BlurToolOff: String { return self._s[3703]! }
+    public var Conversation_AutoremoveOff: String { return self._s[3704]! }
+    public var SocksProxySetup_PortPlaceholder: String { return self._s[3705]! }
+    public var Weekday_Saturday: String { return self._s[3706]! }
+    public var DialogList_Unread: String { return self._s[3707]! }
+    public var Watch_LastSeen_ALongTimeAgo: String { return self._s[3708]! }
+    public var Stats_GroupPosters: String { return self._s[3709]! }
+    public func PUSH_ENCRYPTION_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3710]!, self._r[3710]!, [_1])
+    }
+    public var Conversation_AlsoClearCacheTitle: String { return self._s[3711]! }
+    public func Conversation_ForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3712]!, self._r[3712]!, [_0, _1])
+    }
+    public func Target_ShareGameConfirmationGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3715]!, self._r[3715]!, [_0])
+    }
+    public var ReportPeer_ReasonChildAbuse: String { return self._s[3716]! }
     public func Channel_AdminLog_MessageUnkickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3560]!, self._r[3560]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3717]!, self._r[3717]!, [_1, _2])
     }
-    public var InfoPlist_NSContactsUsageDescription: String { return self._s[3561]! }
-    public var Conversation_EmailCopied: String { return self._s[3563]! }
-    public var AutoNightTheme_UseSunsetSunrise: String { return self._s[3564]! }
-    public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[3565]! }
-    public var Call_VoiceOver_VoiceCallCanceled: String { return self._s[3566]! }
-    public var Passport_Language_dv: String { return self._s[3567]! }
-    public var GroupPermission_AddSuccess: String { return self._s[3569]! }
-    public var Passport_Email_Help: String { return self._s[3570]! }
-    public var Call_ReportPlaceholder: String { return self._s[3571]! }
-    public var CreatePoll_AddOption: String { return self._s[3572]! }
-    public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3574]! }
-    public var PeerInfo_ButtonLeave: String { return self._s[3575]! }
-    public var PhotoEditor_TiltShift: String { return self._s[3578]! }
-    public var SecretGif_Title: String { return self._s[3580]! }
-    public var GroupInfo_InviteLinks: String { return self._s[3581]! }
-    public var PhotoEditor_QualityVeryLow: String { return self._s[3582]! }
-    public var SocksProxySetup_Connecting: String { return self._s[3584]! }
-    public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3585]! }
-    public var ContactInfo_PhoneLabelWork: String { return self._s[3586]! }
-    public var Stats_GroupTopHoursTitle: String { return self._s[3587]! }
-    public var Compose_NewMessage: String { return self._s[3588]! }
-    public var VoiceOver_Common_SwitchHint: String { return self._s[3589]! }
-    public var NotificationsSound_Synth: String { return self._s[3590]! }
-    public var ChatImport_UserErrorNotMutual: String { return self._s[3591]! }
-    public var Conversation_FileOpenIn: String { return self._s[3592]! }
-    public var AutoDownloadSettings_WifiTitle: String { return self._s[3593]! }
-    public var UserInfo_SendMessage: String { return self._s[3594]! }
-    public var Checkout_PayWithFaceId: String { return self._s[3595]! }
+    public var InfoPlist_NSContactsUsageDescription: String { return self._s[3718]! }
+    public var Conversation_EmailCopied: String { return self._s[3720]! }
+    public var AutoNightTheme_UseSunsetSunrise: String { return self._s[3721]! }
+    public var Channel_OwnershipTransfer_ChangeOwner: String { return self._s[3722]! }
+    public var Call_VoiceOver_VoiceCallCanceled: String { return self._s[3723]! }
+    public var VoiceChat_LateBy: String { return self._s[3724]! }
+    public var Passport_Language_dv: String { return self._s[3725]! }
+    public var TwoFactorSetup_PasswordRecovery_Text: String { return self._s[3726]! }
+    public var GroupPermission_AddSuccess: String { return self._s[3728]! }
+    public var Passport_Email_Help: String { return self._s[3729]! }
+    public var Call_ReportPlaceholder: String { return self._s[3730]! }
+    public var CreatePoll_AddOption: String { return self._s[3731]! }
+    public var MessagePoll_LabelAnonymousQuiz: String { return self._s[3733]! }
+    public var PeerInfo_ButtonLeave: String { return self._s[3734]! }
+    public var PhotoEditor_TiltShift: String { return self._s[3737]! }
+    public var SecretGif_Title: String { return self._s[3739]! }
+    public var GroupInfo_InviteLinks: String { return self._s[3740]! }
+    public var PhotoEditor_QualityVeryLow: String { return self._s[3741]! }
+    public var SocksProxySetup_Connecting: String { return self._s[3743]! }
+    public var PrivacySettings_PasscodeAndFaceId: String { return self._s[3744]! }
+    public var ContactInfo_PhoneLabelWork: String { return self._s[3745]! }
+    public var Stats_GroupTopHoursTitle: String { return self._s[3746]! }
+    public var Compose_NewMessage: String { return self._s[3747]! }
+    public var VoiceOver_Common_SwitchHint: String { return self._s[3748]! }
+    public var NotificationsSound_Synth: String { return self._s[3749]! }
+    public var ChatImport_UserErrorNotMutual: String { return self._s[3750]! }
+    public var Conversation_FileOpenIn: String { return self._s[3751]! }
+    public var AutoDownloadSettings_WifiTitle: String { return self._s[3752]! }
+    public var UserInfo_SendMessage: String { return self._s[3753]! }
+    public var Checkout_PayWithFaceId: String { return self._s[3754]! }
     public func Map_LiveLocationShortHour(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3596]!, self._r[3596]!, [_0])
+        return formatWithArgumentRanges(self._s[3755]!, self._r[3755]!, [_0])
     }
-    public var TextFormat_Strikethrough: String { return self._s[3597]! }
-    public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[3598]! }
-    public var Conversation_ViewChannel: String { return self._s[3599]! }
+    public var TextFormat_Strikethrough: String { return self._s[3756]! }
+    public var SettingsSearch_Synonyms_Notifications_DisplayNamesOnLockScreen: String { return self._s[3757]! }
+    public var Conversation_ViewChannel: String { return self._s[3758]! }
     public func Message_ForwardedMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3600]!, self._r[3600]!, [_0])
+        return formatWithArgumentRanges(self._s[3759]!, self._r[3759]!, [_0])
     }
-    public var Channel_Stickers_Placeholder: String { return self._s[3601]! }
-    public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3602]! }
-    public var Message_ScamAccount: String { return self._s[3603]! }
-    public var Camera_FlashAuto: String { return self._s[3604]! }
-    public var Conversation_EncryptedDescription1: String { return self._s[3605]! }
-    public var LocalGroup_Text: String { return self._s[3606]! }
-    public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[3607]! }
-    public var UserInfo_FirstNamePlaceholder: String { return self._s[3608]! }
-    public var Conversation_SendMessageErrorFlood: String { return self._s[3609]! }
-    public var Conversation_EncryptedDescription2: String { return self._s[3610]! }
-    public var Conversation_CancelForwardText: String { return self._s[3611]! }
-    public var Notification_GroupActivated: String { return self._s[3612]! }
-    public var LastSeen_Lately: String { return self._s[3613]! }
-    public var Conversation_EncryptedDescription3: String { return self._s[3614]! }
-    public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[3615]! }
-    public var Conversation_SwipeToReplyHintText: String { return self._s[3616]! }
-    public var Conversation_EncryptedDescription4: String { return self._s[3617]! }
-    public var SharedMedia_EmptyTitle: String { return self._s[3618]! }
-    public var Appearance_CreateTheme: String { return self._s[3619]! }
-    public var Stats_SharesPerPost: String { return self._s[3620]! }
-    public var Contacts_TabTitle: String { return self._s[3621]! }
-    public var Weekday_ShortThursday: String { return self._s[3622]! }
-    public var MessageTimer_Forever: String { return self._s[3623]! }
-    public var ChatListFolder_CategoryArchived: String { return self._s[3624]! }
-    public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3625]! }
-    public var EditTheme_Create_TopInfo: String { return self._s[3627]! }
+    public var Channel_Stickers_Placeholder: String { return self._s[3760]! }
+    public var Channel_OwnershipTransfer_PasswordPlaceholder: String { return self._s[3761]! }
+    public var Message_ScamAccount: String { return self._s[3762]! }
+    public var Camera_FlashAuto: String { return self._s[3763]! }
+    public var Conversation_EncryptedDescription1: String { return self._s[3764]! }
+    public var LocalGroup_Text: String { return self._s[3765]! }
+    public var SettingsSearch_Synonyms_Data_Storage_KeepMedia: String { return self._s[3766]! }
+    public var UserInfo_FirstNamePlaceholder: String { return self._s[3767]! }
+    public var Conversation_SendMessageErrorFlood: String { return self._s[3768]! }
+    public var Conversation_EncryptedDescription2: String { return self._s[3769]! }
+    public var Conversation_CancelForwardText: String { return self._s[3770]! }
+    public var Notification_GroupActivated: String { return self._s[3771]! }
+    public var LastSeen_Lately: String { return self._s[3772]! }
+    public var Conversation_EncryptedDescription3: String { return self._s[3773]! }
+    public var SettingsSearch_Synonyms_Privacy_ProfilePhoto: String { return self._s[3774]! }
+    public var TwoStepAuth_RecoveryUnavailableResetText: String { return self._s[3775]! }
+    public var Conversation_SwipeToReplyHintText: String { return self._s[3776]! }
+    public var Conversation_EncryptedDescription4: String { return self._s[3777]! }
+    public var SharedMedia_EmptyTitle: String { return self._s[3778]! }
+    public var Appearance_CreateTheme: String { return self._s[3780]! }
+    public var Stats_SharesPerPost: String { return self._s[3781]! }
+    public var Contacts_TabTitle: String { return self._s[3782]! }
+    public var Weekday_ShortThursday: String { return self._s[3783]! }
+    public var MessageTimer_Forever: String { return self._s[3784]! }
+    public var ChatListFolder_CategoryArchived: String { return self._s[3785]! }
+    public var Channel_EditAdmin_PermissionDeleteMessages: String { return self._s[3786]! }
+    public var EditTheme_Create_TopInfo: String { return self._s[3788]! }
+    public var TwoFactorRemember_Forgot: String { return self._s[3789]! }
     public func VoiceOver_ChatList_MessageFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3628]!, self._r[3628]!, [_0])
+        return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_0])
     }
-    public var Month_GenDecember: String { return self._s[3629]! }
-    public var EnterPasscode_EnterPasscode: String { return self._s[3630]! }
-    public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3631]! }
-    public var PeopleNearby_CreateGroup: String { return self._s[3633]! }
-    public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3634]! }
-    public var Paint_ClearConfirm: String { return self._s[3635]! }
-    public var ChatList_ReadAll: String { return self._s[3636]! }
-    public var ChatSettings_IntentsSettings: String { return self._s[3637]! }
-    public var Passport_PassportInformation: String { return self._s[3639]! }
-    public var Login_CheckOtherSessionMessages: String { return self._s[3641]! }
-    public var Location_ProximityNotification_DistanceMI: String { return self._s[3644]! }
-    public var PhotoEditor_ExposureTool: String { return self._s[3645]! }
-    public var Group_Username_CreatePrivateLinkHelp: String { return self._s[3646]! }
-    public var SettingsSearch_Synonyms_Watch: String { return self._s[3647]! }
-    public var Stats_GroupTopPoster_History: String { return self._s[3648]! }
-    public var UserInfo_AddPhone: String { return self._s[3649]! }
-    public var Media_SendWithTimer: String { return self._s[3651]! }
-    public var SettingsSearch_Synonyms_Notifications_Title: String { return self._s[3652]! }
-    public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3653]! }
-    public var GroupInfo_GroupHistoryShort: String { return self._s[3654]! }
-    public var PasscodeSettings_AutoLock_Disabled: String { return self._s[3655]! }
-    public var ChatList_Context_Unarchive: String { return self._s[3657]! }
+    public var Month_GenDecember: String { return self._s[3791]! }
+    public var EnterPasscode_EnterPasscode: String { return self._s[3792]! }
+    public var SettingsSearch_Synonyms_Appearance_LargeEmoji: String { return self._s[3793]! }
+    public var PeopleNearby_CreateGroup: String { return self._s[3795]! }
+    public var Group_EditAdmin_PermissionChangeInfo: String { return self._s[3796]! }
+    public var Paint_ClearConfirm: String { return self._s[3797]! }
+    public var ChatList_ReadAll: String { return self._s[3798]! }
+    public var ChatSettings_IntentsSettings: String { return self._s[3799]! }
+    public var Passport_PassportInformation: String { return self._s[3801]! }
+    public var Login_CheckOtherSessionMessages: String { return self._s[3803]! }
+    public var Location_ProximityNotification_DistanceMI: String { return self._s[3806]! }
+    public var PhotoEditor_ExposureTool: String { return self._s[3807]! }
+    public var Group_Username_CreatePrivateLinkHelp: String { return self._s[3808]! }
+    public var SettingsSearch_Synonyms_Watch: String { return self._s[3809]! }
+    public var Stats_GroupTopPoster_History: String { return self._s[3810]! }
+    public var UserInfo_AddPhone: String { return self._s[3811]! }
+    public var Media_SendWithTimer: String { return self._s[3813]! }
+    public var SettingsSearch_Synonyms_Notifications_Title: String { return self._s[3814]! }
+    public var Channel_EditAdmin_PermissionEnabledByDefault: String { return self._s[3815]! }
+    public var GroupInfo_GroupHistoryShort: String { return self._s[3816]! }
+    public var PasscodeSettings_AutoLock_Disabled: String { return self._s[3817]! }
+    public var ChatList_Context_Unarchive: String { return self._s[3819]! }
     public func DialogList_LiveLocationSharingTo(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3658]!, self._r[3658]!, [_0])
+        return formatWithArgumentRanges(self._s[3820]!, self._r[3820]!, [_0])
     }
-    public var BlockedUsers_Title: String { return self._s[3660]! }
-    public var TwoStepAuth_EmailPlaceholder: String { return self._s[3661]! }
-    public var Media_ShareThisPhoto: String { return self._s[3662]! }
-    public var Notifications_DisplayNamesOnLockScreen: String { return self._s[3663]! }
-    public var Conversation_FilePhotoOrVideo: String { return self._s[3664]! }
-    public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3668]! }
-    public var CallFeedback_ReasonNoise: String { return self._s[3670]! }
-    public var WebBrowser_Title: String { return self._s[3671]! }
+    public var BlockedUsers_Title: String { return self._s[3822]! }
+    public var TwoStepAuth_EmailPlaceholder: String { return self._s[3823]! }
+    public var Media_ShareThisPhoto: String { return self._s[3824]! }
+    public var Notifications_DisplayNamesOnLockScreen: String { return self._s[3825]! }
+    public var Conversation_FilePhotoOrVideo: String { return self._s[3826]! }
+    public var Appearance_ThemePreview_Chat_2_ReplyName: String { return self._s[3830]! }
+    public var CallFeedback_ReasonNoise: String { return self._s[3832]! }
+    public var WebBrowser_Title: String { return self._s[3833]! }
     public func Checkout_SavePasswordTimeoutAndTouchId(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3672]!, self._r[3672]!, [_0])
+        return formatWithArgumentRanges(self._s[3834]!, self._r[3834]!, [_0])
     }
-    public var Notification_MessageLifetime5s: String { return self._s[3674]! }
-    public var Passport_Address_AddResidentialAddress: String { return self._s[3675]! }
-    public var Profile_MessageLifetime1m: String { return self._s[3677]! }
-    public var Passport_ScanPassport: String { return self._s[3678]! }
-    public var Stats_LoadingTitle: String { return self._s[3679]! }
-    public var Passport_Address_AddTemporaryRegistration: String { return self._s[3681]! }
-    public var Permissions_NotificationsAllow_v0: String { return self._s[3682]! }
-    public var Login_InvalidFirstNameError: String { return self._s[3683]! }
-    public var Undo_ChatCleared: String { return self._s[3685]! }
+    public var Notification_MessageLifetime5s: String { return self._s[3836]! }
+    public var Passport_Address_AddResidentialAddress: String { return self._s[3837]! }
+    public var Profile_MessageLifetime1m: String { return self._s[3839]! }
+    public var Passport_ScanPassport: String { return self._s[3840]! }
+    public var Stats_LoadingTitle: String { return self._s[3841]! }
+    public var Passport_Address_AddTemporaryRegistration: String { return self._s[3843]! }
+    public var Permissions_NotificationsAllow_v0: String { return self._s[3844]! }
+    public var Login_InvalidFirstNameError: String { return self._s[3845]! }
+    public var Undo_ChatCleared: String { return self._s[3847]! }
     public func ApplyLanguage_ChangeLanguageUnofficialText(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3687]!, self._r[3687]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[3849]!, self._r[3849]!, [_1, _2])
     }
-    public var Conversation_PinMessageAlertPin: String { return self._s[3688]! }
+    public var Conversation_PinMessageAlertPin: String { return self._s[3850]! }
     public func Login_PhoneBannedEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3689]!, self._r[3689]!, [_1, _2, _3, _4, _5])
+        return formatWithArgumentRanges(self._s[3851]!, self._r[3851]!, [_1, _2, _3, _4, _5])
     }
     public func PUSH_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3690]!, self._r[3690]!, [_1])
+        return formatWithArgumentRanges(self._s[3852]!, self._r[3852]!, [_1])
     }
-    public var Share_MultipleMessagesDisabled: String { return self._s[3691]! }
-    public var TwoStepAuth_EmailInvalid: String { return self._s[3692]! }
-    public var EnterPasscode_ChangeTitle: String { return self._s[3694]! }
-    public var VoiceChat_InviteLink_Speaker: String { return self._s[3695]! }
-    public var CallSettings_RecentCalls: String { return self._s[3696]! }
-    public var GroupInfo_DeactivatedStatus: String { return self._s[3697]! }
-    public var AuthSessions_OtherSessions: String { return self._s[3698]! }
-    public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3699]! }
-    public var Tour_Text5: String { return self._s[3700]! }
-    public var Login_PadPhoneHelp: String { return self._s[3701]! }
-    public var Wallpaper_PhotoLibrary: String { return self._s[3703]! }
-    public var Conversation_ViewGroup: String { return self._s[3704]! }
-    public var PeopleNearby_MakeVisibleTitle: String { return self._s[3706]! }
-    public var VoiceOver_Chat_YourContact: String { return self._s[3707]! }
-    public var Watch_AuthRequired: String { return self._s[3708]! }
-    public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[3710]! }
-    public var Conversation_ForwardContacts: String { return self._s[3711]! }
-    public var Conversation_InputTextPlaceholder: String { return self._s[3712]! }
+    public var Share_MultipleMessagesDisabled: String { return self._s[3853]! }
+    public var TwoStepAuth_EmailInvalid: String { return self._s[3854]! }
+    public var EnterPasscode_ChangeTitle: String { return self._s[3856]! }
+    public var VoiceChat_InviteLink_Speaker: String { return self._s[3857]! }
+    public var CallSettings_RecentCalls: String { return self._s[3858]! }
+    public var GroupInfo_DeactivatedStatus: String { return self._s[3859]! }
+    public var AuthSessions_OtherSessions: String { return self._s[3860]! }
+    public var PrivacyLastSeenSettings_CustomHelp: String { return self._s[3861]! }
+    public var Tour_Text5: String { return self._s[3862]! }
+    public var Login_PadPhoneHelp: String { return self._s[3863]! }
+    public var Wallpaper_PhotoLibrary: String { return self._s[3866]! }
+    public var Conversation_ViewGroup: String { return self._s[3867]! }
+    public var PeopleNearby_MakeVisibleTitle: String { return self._s[3869]! }
+    public var VoiceOver_Chat_YourContact: String { return self._s[3870]! }
+    public var Watch_AuthRequired: String { return self._s[3871]! }
+    public var VoiceOver_Chat_ForwardedFromYou: String { return self._s[3873]! }
+    public var Conversation_ForwardContacts: String { return self._s[3874]! }
+    public var Conversation_InputTextPlaceholder: String { return self._s[3875]! }
     public func PUSH_CHANNEL_MESSAGE_PHOTO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3713]!, self._r[3713]!, [_1])
+        return formatWithArgumentRanges(self._s[3876]!, self._r[3876]!, [_1])
     }
     public func Conversation_MessageViaUser(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3714]!, self._r[3714]!, [_0])
+        return formatWithArgumentRanges(self._s[3877]!, self._r[3877]!, [_0])
     }
-    public var Channel_Setup_TypePrivate: String { return self._s[3715]! }
+    public var Channel_Setup_TypePrivate: String { return self._s[3878]! }
     public func Conversation_NoticeInvitedByInChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3716]!, self._r[3716]!, [_0])
+        return formatWithArgumentRanges(self._s[3879]!, self._r[3879]!, [_0])
     }
-    public var InviteLink_Create_TimeLimitExpiryDate: String { return self._s[3717]! }
-    public var InfoPlist_NSSiriUsageDescription: String { return self._s[3718]! }
-    public var AutoDownloadSettings_Delimeter: String { return self._s[3719]! }
-    public var EmptyGroupInfo_Subtitle: String { return self._s[3720]! }
-    public var UserInfo_StartSecretChatStart: String { return self._s[3721]! }
+    public var Checkout_OptionalTipItemPlaceholder: String { return self._s[3880]! }
+    public var InviteLink_Create_TimeLimitExpiryDate: String { return self._s[3881]! }
+    public var InfoPlist_NSSiriUsageDescription: String { return self._s[3882]! }
+    public var AutoDownloadSettings_Delimeter: String { return self._s[3883]! }
+    public var EmptyGroupInfo_Subtitle: String { return self._s[3884]! }
+    public var UserInfo_StartSecretChatStart: String { return self._s[3885]! }
     public func GroupPermission_AddedInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3722]!, self._r[3722]!, [_1, _2])
-    }
-    public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3723]!, self._r[3723]!, [_0, _1, _2])
-    }
-    public func Conversation_ForwardTooltip_TwoChats_Many(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3724]!, self._r[3724]!, [_0, _1])
-    }
-    public var PrivacySettings_AutoArchiveTitle: String { return self._s[3725]! }
-    public var GroupInfo_InviteLink_LinkSection: String { return self._s[3726]! }
-    public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[3727]! }
-    public var StickerPacksSettings_ArchivedMasks: String { return self._s[3729]! }
-    public var NewContact_Title: String { return self._s[3732]! }
-    public var Appearance_ThemeCarouselTintedNight: String { return self._s[3733]! }
-    public var VoiceChat_StatusSpeaking: String { return self._s[3734]! }
-    public var Notifications_PermissionsKeepDisabled: String { return self._s[3735]! }
-    public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3736]!, self._r[3736]!, [_0])
-    }
-    public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3737]!, self._r[3737]!, [_0, _1])
-    }
-    public var Chat_SlowmodeTooltipPending: String { return self._s[3738]! }
-    public func Time_MediumDate(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3740]!, self._r[3740]!, [_1, _2])
-    }
-    public var ContactInfo_PhoneLabelHome: String { return self._s[3741]! }
-    public var CallFeedback_ReasonInterruption: String { return self._s[3742]! }
-    public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[3743]! }
-    public func PUSH_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3746]!, self._r[3746]!, [_1, "\(_2)"])
-    }
-    public var Conversation_MessageEditedLabel: String { return self._s[3747]! }
-    public var CallList_ActiveVoiceChatsHeader: String { return self._s[3748]! }
-    public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3749]! }
-    public var ChatList_Context_AddToContacts: String { return self._s[3750]! }
-    public var Passport_Language_is: String { return self._s[3751]! }
-    public var Notification_PassportValueProofOfIdentity: String { return self._s[3752]! }
-    public var PhotoEditor_CurvesBlue: String { return self._s[3753]! }
-    public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3754]!, self._r[3754]!, [_0])
-    }
-    public var SocksProxySetup_Username: String { return self._s[3755]! }
-    public var Login_SmsRequestState3: String { return self._s[3756]! }
-    public var Message_PinnedVideoMessage: String { return self._s[3757]! }
-    public var SharedMedia_TitleLink: String { return self._s[3758]! }
-    public var Passport_FieldIdentity: String { return self._s[3759]! }
-    public var GroupInfo_Permissions_BroadcastConvert: String { return self._s[3761]! }
-    public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3764]!, self._r[3764]!, [_0])
-    }
-    public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[3767]! }
-    public var ReportSpam_DeleteThisChat: String { return self._s[3768]! }
-    public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3769]! }
-    public var Passport_Identity_DateOfBirth: String { return self._s[3770]! }
-    public var Call_StatusIncoming: String { return self._s[3771]! }
-    public var ChatAdmins_AdminLabel: String { return self._s[3772]! }
-    public func InstantPage_OpenInBrowser(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3773]!, self._r[3773]!, [_0])
-    }
-    public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3775]!, self._r[3775]!, [_0])
-    }
-    public var Message_PinnedAnimationMessage: String { return self._s[3776]! }
-    public var Conversation_ReportSpamAndLeave: String { return self._s[3777]! }
-    public var Preview_CopyAddress: String { return self._s[3778]! }
-    public var MediaPlayer_UnknownTrack: String { return self._s[3780]! }
-    public var Login_CancelSignUpConfirmation: String { return self._s[3781]! }
-    public var Map_OpenInYandexMaps: String { return self._s[3783]! }
-    public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3786]!, self._r[3786]!, [_1, _2, _3])
-    }
-    public var GroupRemoved_Remove: String { return self._s[3787]! }
-    public var ChatListFolder_TitleCreate: String { return self._s[3788]! }
-    public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3790]!, self._r[3790]!, [_1, _2])
-    }
-    public var Watch_UserInfo_MuteTitle: String { return self._s[3791]! }
-    public var Group_UpgradeNoticeText2: String { return self._s[3793]! }
-    public var Stats_GroupGrowthTitle: String { return self._s[3794]! }
-    public var CreatePoll_CancelConfirmation: String { return self._s[3797]! }
-    public var Month_GenOctober: String { return self._s[3798]! }
-    public var Conversation_TitleCommentsEmpty: String { return self._s[3799]! }
-    public var Settings_Appearance: String { return self._s[3800]! }
-    public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3801]!, self._r[3801]!, [_0])
-    }
-    public var UserInfo_AddToExisting: String { return self._s[3802]! }
-    public var Call_PhoneCallInProgressMessage: String { return self._s[3804]! }
-    public var Map_HomeAndWorkInfo: String { return self._s[3805]! }
-    public var InstantPage_VoiceOver_ResetFontSize: String { return self._s[3806]! }
-    public var Paint_Arrow: String { return self._s[3807]! }
-    public var InviteLink_CreatePrivateLinkHelp: String { return self._s[3808]! }
-    public func DialogList_MultipleTypingPair(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3809]!, self._r[3809]!, [_0, _1])
-    }
-    public var CancelResetAccount_Title: String { return self._s[3810]! }
-    public var NotificationsSound_Circles: String { return self._s[3811]! }
-    public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[3812]! }
-    public var ChatState_Connecting: String { return self._s[3814]! }
-    public var Profile_MessageLifetime5s: String { return self._s[3815]! }
-    public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3816]!, self._r[3816]!, [_0])
-    }
-    public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[3817]! }
-    public var Channel_Username_CreatePublicLinkHelp: String { return self._s[3818]! }
-    public var AutoNightTheme_ScheduledTo: String { return self._s[3819]! }
-    public var Conversation_DefaultRestrictedStickers: String { return self._s[3821]! }
-    public var TwoStepAuth_ConfirmationTitle: String { return self._s[3822]! }
-    public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3823]!, self._r[3823]!, [_0])
-    }
-    public var Passport_Phone_Help: String { return self._s[3824]! }
-    public var Privacy_ContactsSync: String { return self._s[3825]! }
-    public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3826]! }
-    public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[3828]! }
-    public var Map_SendMyCurrentLocation: String { return self._s[3829]! }
-    public var Map_AddressOnMap: String { return self._s[3830]! }
-    public var BroadcastGroups_ConfirmationAlert_Convert: String { return self._s[3832]! }
-    public var DialogList_SearchLabel: String { return self._s[3833]! }
-    public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[3834]! }
-    public var GroupInfo_FakeGroupWarning: String { return self._s[3835]! }
-    public var Conversation_ChecksTooltip_Read: String { return self._s[3837]! }
-    public var ConversationProfile_UnknownAddMemberError: String { return self._s[3838]! }
-    public var ChatList_Search_ShowMore: String { return self._s[3839]! }
-    public var DialogList_EncryptionRejected: String { return self._s[3840]! }
-    public var VoiceChat_InviteLinkCopiedText: String { return self._s[3841]! }
-    public var DialogList_DeleteBotConfirmation: String { return self._s[3842]! }
-    public var VoiceChat_StartRecordingText: String { return self._s[3843]! }
-    public var Privacy_TopPeersDelete: String { return self._s[3844]! }
-    public var AttachmentMenu_SendAsFile: String { return self._s[3846]! }
-    public var ChatList_GenericPsaAlert: String { return self._s[3848]! }
-    public var SecretTimer_ImageDescription: String { return self._s[3850]! }
-    public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3851]!, self._r[3851]!, [_0, _1])
-    }
-    public var ChatSettings_TextSizeUnits: String { return self._s[3852]! }
-    public var Notification_RenamedGroup: String { return self._s[3854]! }
-    public var Tour_Title2: String { return self._s[3855]! }
-    public var Settings_CopyUsername: String { return self._s[3856]! }
-    public var Compose_NewEncryptedChat: String { return self._s[3857]! }
-    public var Conversation_CloudStorageInfo_Title: String { return self._s[3858]! }
-    public var Month_ShortSeptember: String { return self._s[3859]! }
-    public var AutoDownloadSettings_OnForAll: String { return self._s[3860]! }
-    public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[3861]! }
-    public var Call_StatusConnecting: String { return self._s[3863]! }
-    public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[3864]! }
-    public var Map_ShareLiveLocationHelp: String { return self._s[3865]! }
-    public var Cache_Files: String { return self._s[3866]! }
-    public var Notifications_Reset: String { return self._s[3867]! }
-    public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3868]!, self._r[3868]!, [_0])
-    }
-    public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[3869]! }
-    public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3870]!, self._r[3870]!, [_1, _2])
-    }
-    public var Notification_CallIncomingShort: String { return self._s[3871]! }
-    public var UserInfo_BotPrivacy: String { return self._s[3874]! }
-    public var Appearance_BubbleCorners_Apply: String { return self._s[3875]! }
-    public var WebSearch_RecentClearConfirmation: String { return self._s[3876]! }
-    public var Conversation_ContextMenuLookUp: String { return self._s[3878]! }
-    public var Calls_RatingTitle: String { return self._s[3879]! }
-    public var SecretImage_Title: String { return self._s[3880]! }
-    public var Weekday_Monday: String { return self._s[3881]! }
-    public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3882]!, self._r[3882]!, [_1, _2])
-    }
-    public var KeyCommand_JumpToPreviousChat: String { return self._s[3883]! }
-    public var VoiceChat_InviteLink_CopySpeakerLink: String { return self._s[3884]! }
-    public var Invitation_JoinVoiceChatAsListener: String { return self._s[3885]! }
-    public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3886]!, self._r[3886]!, [_1, _2])
     }
-    public var Stats_GroupMembers: String { return self._s[3887]! }
-    public var Camera_Retake: String { return self._s[3888]! }
-    public var Conversation_SearchPlaceholder: String { return self._s[3890]! }
-    public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3891]!, self._r[3891]!, [_0])
+    public func Channel_AdminLog_MessageRestricted(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3887]!, self._r[3887]!, [_0, _1, _2])
     }
-    public var Channel_DiscussionGroup_Info: String { return self._s[3892]! }
-    public var SocksProxySetup_Hostname: String { return self._s[3893]! }
-    public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[3894]! }
-    public var Privacy_DeleteDrafts: String { return self._s[3896]! }
-    public func Checkout_LiabilityAlert(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3897]!, self._r[3897]!, [_1, _1, _1, _2])
+    public func Conversation_ForwardTooltip_TwoChats_Many(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3888]!, self._r[3888]!, [_0, _1])
     }
-    public var Login_CancelPhoneVerification: String { return self._s[3899]! }
-    public var TwoStepAuth_ResetAccountHelp: String { return self._s[3900]! }
-    public var VoiceOver_Chat_Profile: String { return self._s[3901]! }
-    public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3902]!, self._r[3902]!, [_0])
+    public var PrivacySettings_AutoArchiveTitle: String { return self._s[3889]! }
+    public var GroupInfo_InviteLink_LinkSection: String { return self._s[3890]! }
+    public var FastTwoStepSetup_EmailPlaceholder: String { return self._s[3891]! }
+    public var StickerPacksSettings_ArchivedMasks: String { return self._s[3893]! }
+    public var NewContact_Title: String { return self._s[3896]! }
+    public var Appearance_ThemeCarouselTintedNight: String { return self._s[3897]! }
+    public var VoiceChat_StatusSpeaking: String { return self._s[3898]! }
+    public var Notifications_PermissionsKeepDisabled: String { return self._s[3899]! }
+    public func Time_YesterdayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3900]!, self._r[3900]!, [_0])
     }
-    public var TwoStepAuth_EmailSent: String { return self._s[3903]! }
-    public var Cache_Indexing: String { return self._s[3904]! }
-    public var Notifications_ExceptionsNone: String { return self._s[3905]! }
-    public var MessagePoll_LabelQuiz: String { return self._s[3906]! }
-    public var Call_EncryptionKey_Title: String { return self._s[3907]! }
-    public var Common_Yes: String { return self._s[3908]! }
-    public var Channel_ErrorAddBlocked: String { return self._s[3909]! }
-    public var Month_GenJanuary: String { return self._s[3910]! }
-    public var Checkout_NewCard_Title: String { return self._s[3911]! }
-    public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3912]!, self._r[3912]!, [_0])
+    public func AutoNightTheme_LocationHelp(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3901]!, self._r[3901]!, [_0, _1])
     }
-    public var Conversation_InputTextPlaceholderReply: String { return self._s[3914]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[3915]! }
-    public var Conversation_SendDice: String { return self._s[3916]! }
-    public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Chat_SlowmodeTooltipPending: String { return self._s[3902]! }
+    public func Time_MediumDate(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3904]!, self._r[3904]!, [_1, _2])
+    }
+    public var ContactInfo_PhoneLabelHome: String { return self._s[3905]! }
+    public var CallFeedback_ReasonInterruption: String { return self._s[3906]! }
+    public var Passport_Identity_OneOfTypeDriversLicense: String { return self._s[3907]! }
+    public var Conversation_MessageEditedLabel: String { return self._s[3910]! }
+    public var CallList_ActiveVoiceChatsHeader: String { return self._s[3911]! }
+    public var SocksProxySetup_PasswordPlaceholder: String { return self._s[3912]! }
+    public var ChatList_Context_AddToContacts: String { return self._s[3913]! }
+    public var Passport_Language_is: String { return self._s[3914]! }
+    public var Notification_PassportValueProofOfIdentity: String { return self._s[3915]! }
+    public var PhotoEditor_CurvesBlue: String { return self._s[3916]! }
+    public func FileSize_MB(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3917]!, self._r[3917]!, [_0])
     }
-    public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3918]!, self._r[3918]!, [_0])
+    public var SocksProxySetup_Username: String { return self._s[3918]! }
+    public var Login_SmsRequestState3: String { return self._s[3919]! }
+    public var Message_PinnedVideoMessage: String { return self._s[3920]! }
+    public var SharedMedia_TitleLink: String { return self._s[3921]! }
+    public var Passport_FieldIdentity: String { return self._s[3922]! }
+    public var GroupInfo_Permissions_BroadcastConvert: String { return self._s[3924]! }
+    public func Conversation_EncryptedPlaceholderTitleOutgoing(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3927]!, self._r[3927]!, [_0])
     }
-    public var Weekday_Wednesday: String { return self._s[3919]! }
-    public var ReportPeer_ReasonOther_Send: String { return self._s[3920]! }
-    public var PasscodeSettings_EncryptDataHelp: String { return self._s[3921]! }
-    public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[3922]! }
-    public var OldChannels_NoticeTitle: String { return self._s[3923]! }
-    public var TwoStepAuth_ChangeEmail: String { return self._s[3924]! }
-    public var PasscodeSettings_PasscodeOptions: String { return self._s[3925]! }
-    public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[3926]! }
-    public var Passport_Address_AddUtilityBill: String { return self._s[3927]! }
-    public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3929]!, self._r[3929]!, [_1, _2, _3])
+    public var DialogList_ProxyConnectionIssuesTooltip: String { return self._s[3930]! }
+    public var ReportSpam_DeleteThisChat: String { return self._s[3931]! }
+    public var Checkout_NewCard_CardholderNamePlaceholder: String { return self._s[3932]! }
+    public var Passport_Identity_DateOfBirth: String { return self._s[3933]! }
+    public var Call_StatusIncoming: String { return self._s[3934]! }
+    public var ChatAdmins_AdminLabel: String { return self._s[3935]! }
+    public func InstantPage_OpenInBrowser(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3936]!, self._r[3936]!, [_0])
     }
-    public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[3931]! }
-    public var Stats_GroupTopAdminsTitle: String { return self._s[3932]! }
-    public var Paint_Regular: String { return self._s[3933]! }
-    public var Message_Contact: String { return self._s[3934]! }
-    public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[3935]! }
-    public var VoiceOver_Chat_YourPhoto: String { return self._s[3936]! }
-    public var Notification_Mute1hMin: String { return self._s[3937]! }
-    public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public func Time_MonthOfYear_m10(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[3938]!, self._r[3938]!, [_0])
     }
-    public var Profile_MessageLifetime1h: String { return self._s[3939]! }
-    public var TwoStepAuth_GenericHelp: String { return self._s[3940]! }
-    public var TextFormat_Monospace: String { return self._s[3941]! }
-    public var VoiceOver_Media_PlaybackRateChange: String { return self._s[3943]! }
-    public var Conversation_DeleteMessagesForMe: String { return self._s[3944]! }
-    public var ChatList_DeleteChat: String { return self._s[3945]! }
-    public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[3948]! }
+    public var Message_PinnedAnimationMessage: String { return self._s[3939]! }
+    public var VoiceChat_TapToViewCameraVideo: String { return self._s[3940]! }
+    public var Conversation_ReportSpamAndLeave: String { return self._s[3941]! }
+    public var Preview_CopyAddress: String { return self._s[3942]! }
+    public var MediaPlayer_UnknownTrack: String { return self._s[3944]! }
+    public var Login_CancelSignUpConfirmation: String { return self._s[3945]! }
+    public var Map_OpenInYandexMaps: String { return self._s[3947]! }
+    public func Time_PreciseDate_m11(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3950]!, self._r[3950]!, [_1, _2, _3])
+    }
+    public var GroupRemoved_Remove: String { return self._s[3951]! }
+    public var ChatListFolder_TitleCreate: String { return self._s[3952]! }
+    public func InstantPage_AuthorAndDateTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3954]!, self._r[3954]!, [_1, _2])
+    }
+    public var Watch_UserInfo_MuteTitle: String { return self._s[3955]! }
+    public func UserInfo_LinkForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3957]!, self._r[3957]!, [_0, _1])
+    }
+    public var Group_UpgradeNoticeText2: String { return self._s[3958]! }
+    public var Stats_GroupGrowthTitle: String { return self._s[3959]! }
+    public var CreatePoll_CancelConfirmation: String { return self._s[3962]! }
+    public var Month_GenOctober: String { return self._s[3963]! }
+    public var Conversation_TitleCommentsEmpty: String { return self._s[3964]! }
+    public var Settings_Appearance: String { return self._s[3965]! }
+    public func Time_MonthOfYear_m6(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3966]!, self._r[3966]!, [_0])
+    }
+    public var UserInfo_AddToExisting: String { return self._s[3967]! }
+    public var Call_PhoneCallInProgressMessage: String { return self._s[3969]! }
+    public var Map_HomeAndWorkInfo: String { return self._s[3970]! }
+    public var VoiceChat_ContextAudio: String { return self._s[3971]! }
+    public var InstantPage_VoiceOver_ResetFontSize: String { return self._s[3972]! }
+    public var Paint_Arrow: String { return self._s[3973]! }
+    public var InviteLink_CreatePrivateLinkHelp: String { return self._s[3974]! }
+    public func DialogList_MultipleTypingPair(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3975]!, self._r[3975]!, [_0, _1])
+    }
+    public var CancelResetAccount_Title: String { return self._s[3976]! }
+    public var NotificationsSound_Circles: String { return self._s[3977]! }
+    public var Notifications_GroupNotificationsExceptionsHelp: String { return self._s[3978]! }
+    public var ChatState_Connecting: String { return self._s[3980]! }
+    public var Profile_MessageLifetime5s: String { return self._s[3981]! }
+    public func DialogList_AwaitingEncryption(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3982]!, self._r[3982]!, [_0])
+    }
+    public var PrivacyPolicy_AgeVerificationTitle: String { return self._s[3983]! }
+    public var Channel_Username_CreatePublicLinkHelp: String { return self._s[3984]! }
+    public var AutoNightTheme_ScheduledTo: String { return self._s[3985]! }
+    public var Conversation_DefaultRestrictedStickers: String { return self._s[3987]! }
+    public var TwoStepAuth_ConfirmationTitle: String { return self._s[3988]! }
+    public func Chat_UnsendMyMessagesAlertTitle(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[3989]!, self._r[3989]!, [_0])
+    }
+    public var Passport_Phone_Help: String { return self._s[3990]! }
+    public var Privacy_ContactsSync: String { return self._s[3991]! }
+    public var CheckoutInfo_ReceiverInfoPhone: String { return self._s[3992]! }
+    public var Channel_AdminLogFilter_EventsLeavingSubscribers: String { return self._s[3994]! }
+    public var Map_SendMyCurrentLocation: String { return self._s[3995]! }
+    public var Map_AddressOnMap: String { return self._s[3996]! }
+    public var BroadcastGroups_ConfirmationAlert_Convert: String { return self._s[3998]! }
+    public var DialogList_SearchLabel: String { return self._s[3999]! }
+    public var Notification_Exceptions_NewException_NotificationHeader: String { return self._s[4000]! }
+    public var GroupInfo_FakeGroupWarning: String { return self._s[4001]! }
+    public var Conversation_ChecksTooltip_Read: String { return self._s[4003]! }
+    public var TwoFactorRemember_Placeholder: String { return self._s[4005]! }
+    public var ConversationProfile_UnknownAddMemberError: String { return self._s[4006]! }
+    public var ChatList_Search_ShowMore: String { return self._s[4007]! }
+    public var DialogList_EncryptionRejected: String { return self._s[4008]! }
+    public var VoiceChat_InviteLinkCopiedText: String { return self._s[4009]! }
+    public var DialogList_DeleteBotConfirmation: String { return self._s[4010]! }
+    public var VoiceChat_StartRecordingText: String { return self._s[4011]! }
+    public var Privacy_TopPeersDelete: String { return self._s[4012]! }
+    public var AttachmentMenu_SendAsFile: String { return self._s[4014]! }
+    public var ChatList_GenericPsaAlert: String { return self._s[4016]! }
+    public var SecretTimer_ImageDescription: String { return self._s[4018]! }
+    public func Conversation_SetReminder_RemindOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4019]!, self._r[4019]!, [_0, _1])
+    }
+    public var VoiceChat_EditNameSuccess: String { return self._s[4020]! }
+    public var ChatSettings_TextSizeUnits: String { return self._s[4021]! }
+    public var Notification_RenamedGroup: String { return self._s[4023]! }
+    public var Tour_Title2: String { return self._s[4024]! }
+    public var Settings_CopyUsername: String { return self._s[4025]! }
+    public var Compose_NewEncryptedChat: String { return self._s[4026]! }
+    public var Conversation_CloudStorageInfo_Title: String { return self._s[4027]! }
+    public var VoiceChat_SetReminder: String { return self._s[4028]! }
+    public var Month_ShortSeptember: String { return self._s[4029]! }
+    public var AutoDownloadSettings_OnForAll: String { return self._s[4030]! }
+    public var ChatList_DeleteForEveryoneConfirmationText: String { return self._s[4031]! }
+    public var VoiceChat_StartNow: String { return self._s[4032]! }
+    public var Call_StatusConnecting: String { return self._s[4034]! }
+    public var Privacy_GroupsAndChannels_NeverAllow_Placeholder: String { return self._s[4035]! }
+    public var Map_ShareLiveLocationHelp: String { return self._s[4036]! }
+    public var Cache_Files: String { return self._s[4037]! }
+    public var Notifications_Reset: String { return self._s[4038]! }
+    public func Settings_KeepPhoneNumber(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4039]!, self._r[4039]!, [_0])
+    }
+    public var Privacy_GroupsAndChannels_AlwaysAllow_Title: String { return self._s[4040]! }
+    public func Conversation_OpenBotLinkLogin(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4041]!, self._r[4041]!, [_1, _2])
+    }
+    public var Notification_CallIncomingShort: String { return self._s[4042]! }
+    public var UserInfo_BotPrivacy: String { return self._s[4045]! }
+    public var Appearance_BubbleCorners_Apply: String { return self._s[4046]! }
+    public var WebSearch_RecentClearConfirmation: String { return self._s[4047]! }
+    public var Conversation_ContextMenuLookUp: String { return self._s[4049]! }
+    public var Calls_RatingTitle: String { return self._s[4050]! }
+    public var SecretImage_Title: String { return self._s[4051]! }
+    public var Weekday_Monday: String { return self._s[4052]! }
+    public func Passport_PrivacyPolicy(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4053]!, self._r[4053]!, [_1, _2])
+    }
+    public var KeyCommand_JumpToPreviousChat: String { return self._s[4054]! }
+    public var VoiceChat_InviteLink_CopySpeakerLink: String { return self._s[4055]! }
+    public var Invitation_JoinVoiceChatAsListener: String { return self._s[4056]! }
+    public func DialogList_SearchSubtitleFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4057]!, self._r[4057]!, [_1, _2])
+    }
+    public var Stats_GroupMembers: String { return self._s[4058]! }
+    public var Camera_Retake: String { return self._s[4059]! }
+    public var Conversation_SearchPlaceholder: String { return self._s[4061]! }
+    public func Passport_Identity_NativeNameGenericHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4062]!, self._r[4062]!, [_0])
+    }
+    public var Channel_DiscussionGroup_Info: String { return self._s[4063]! }
+    public var SocksProxySetup_Hostname: String { return self._s[4064]! }
+    public var PrivacyLastSeenSettings_EmpryUsersPlaceholder: String { return self._s[4065]! }
+    public var Privacy_DeleteDrafts: String { return self._s[4067]! }
+    public var Login_CancelPhoneVerification: String { return self._s[4069]! }
+    public var TwoStepAuth_ResetAccountHelp: String { return self._s[4070]! }
+    public var VoiceOver_Chat_Profile: String { return self._s[4071]! }
+    public func SocksProxySetup_ProxyStatusPing(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4072]!, self._r[4072]!, [_0])
+    }
+    public var TwoStepAuth_EmailSent: String { return self._s[4073]! }
+    public var Cache_Indexing: String { return self._s[4074]! }
+    public var Notifications_ExceptionsNone: String { return self._s[4075]! }
+    public var MessagePoll_LabelQuiz: String { return self._s[4076]! }
+    public var Call_EncryptionKey_Title: String { return self._s[4077]! }
+    public var Common_Yes: String { return self._s[4078]! }
+    public var Channel_ErrorAddBlocked: String { return self._s[4079]! }
+    public var Month_GenJanuary: String { return self._s[4080]! }
+    public var Checkout_NewCard_Title: String { return self._s[4081]! }
+    public func TwoStepAuth_EnterPasswordHint(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4082]!, self._r[4082]!, [_0])
+    }
+    public var Conversation_InputTextPlaceholderReply: String { return self._s[4084]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_1hour: String { return self._s[4085]! }
+    public var Conversation_SendDice: String { return self._s[4086]! }
+    public func ChatSettings_AutoDownloadSettings_TypeVideo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4087]!, self._r[4087]!, [_0])
+    }
+    public func VoiceOver_Chat_VideoFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4088]!, self._r[4088]!, [_0])
+    }
+    public var Weekday_Wednesday: String { return self._s[4089]! }
+    public var ReportPeer_ReasonOther_Send: String { return self._s[4090]! }
+    public var PasscodeSettings_EncryptDataHelp: String { return self._s[4091]! }
+    public var PrivacyLastSeenSettings_CustomShareSettingsHelp: String { return self._s[4092]! }
+    public var OldChannels_NoticeTitle: String { return self._s[4093]! }
+    public var TwoStepAuth_ChangeEmail: String { return self._s[4094]! }
+    public var PasscodeSettings_PasscodeOptions: String { return self._s[4095]! }
+    public var InfoPlist_NSPhotoLibraryUsageDescription: String { return self._s[4096]! }
+    public var Passport_Address_AddUtilityBill: String { return self._s[4097]! }
+    public func Time_PreciseDate_m5(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4099]!, self._r[4099]!, [_1, _2, _3])
+    }
+    public var TwoFactorSetup_EmailVerification_ResendAction: String { return self._s[4101]! }
+    public var Stats_GroupTopAdminsTitle: String { return self._s[4102]! }
+    public var Paint_Regular: String { return self._s[4104]! }
+    public var Message_Contact: String { return self._s[4105]! }
+    public var NetworkUsageSettings_MediaVideoDataSection: String { return self._s[4106]! }
+    public var VoiceOver_Chat_YourPhoto: String { return self._s[4107]! }
+    public var Notification_Mute1hMin: String { return self._s[4108]! }
+    public func Login_BannedPhoneSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4109]!, self._r[4109]!, [_0])
+    }
+    public var Profile_MessageLifetime1h: String { return self._s[4110]! }
+    public var TwoStepAuth_GenericHelp: String { return self._s[4111]! }
+    public var TwoFactorSetup_PasswordRecovery_Skip: String { return self._s[4112]! }
+    public var TextFormat_Monospace: String { return self._s[4113]! }
+    public var VoiceOver_Media_PlaybackRateChange: String { return self._s[4115]! }
+    public var Conversation_DeleteMessagesForMe: String { return self._s[4116]! }
+    public var ChatList_DeleteChat: String { return self._s[4117]! }
+    public var Channel_OwnershipTransfer_EnterPasswordText: String { return self._s[4120]! }
     public func Settings_ApplyProxyAlertCredentials(_ _1: String, _ _2: String, _ _3: String, _ _4: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3949]!, self._r[3949]!, [_1, _2, _3, _4])
+        return formatWithArgumentRanges(self._s[4121]!, self._r[4121]!, [_1, _2, _3, _4])
     }
-    public var Login_CancelPhoneVerificationStop: String { return self._s[3950]! }
-    public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[3951]! }
-    public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[3952]! }
+    public var Login_CancelPhoneVerificationStop: String { return self._s[4122]! }
+    public var Appearance_ThemePreview_ChatList_4_Name: String { return self._s[4123]! }
+    public var MediaPicker_MomentsDateRangeSameMonthYearFormat: String { return self._s[4124]! }
     public func Channel_AdminLog_MessageToggleInvitesOn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3953]!, self._r[3953]!, [_0])
-    }
-    public var Notifications_Badge_IncludeChannels: String { return self._s[3954]! }
-    public var InviteLink_CreatePrivateLinkHelpChannel: String { return self._s[3955]! }
-    public var StickerPack_ViewPack: String { return self._s[3958]! }
-    public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[3960]! }
-    public var EditTheme_Expand_Preview_IncomingText: String { return self._s[3961]! }
-    public var Notifications_Title: String { return self._s[3962]! }
-    public var Conversation_InputTextPlaceholderComment: String { return self._s[3963]! }
-    public var GroupInfo_PublicLink: String { return self._s[3964]! }
-    public var VoiceOver_DiscardPreparedContent: String { return self._s[3965]! }
-    public var Conversation_Moderate_Ban: String { return self._s[3969]! }
-    public var InviteLink_Manage: String { return self._s[3970]! }
-    public var InstantPage_FontNewYork: String { return self._s[3971]! }
-    public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3972]!, self._r[3972]!, [_0])
-    }
-    public var TextFormat_Underline: String { return self._s[3973]! }
-    public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3974]!, self._r[3974]!, [_0, _1])
-    }
-    public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3975]!, self._r[3975]!, [_1])
-    }
-    public var PollResults_Collapse: String { return self._s[3977]! }
-    public var Contacts_GlobalSearch: String { return self._s[3978]! }
-    public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3980]!, self._r[3980]!, [_0])
-    }
-    public var Channel_Management_LabelEditor: String { return self._s[3981]! }
-    public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[3983]! }
-    public var Conversation_Theme: String { return self._s[3984]! }
-    public func PUSH_CHANNEL_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3985]!, self._r[3985]!, [_1, "\(_2)"])
-    }
-    public var Conversation_LinkDialogSave: String { return self._s[3986]! }
-    public var EnterPasscode_TouchId: String { return self._s[3987]! }
-    public var Conversation_VoiceChatMediaRecordingRestricted: String { return self._s[3988]! }
-    public var Group_ErrorAdminsTooMuch: String { return self._s[3989]! }
-    public var Stats_MessageOverview: String { return self._s[3990]! }
-    public var Privacy_Calls_P2PAlways: String { return self._s[3992]! }
-    public var Message_Sticker: String { return self._s[3993]! }
-    public var Conversation_Mute: String { return self._s[3996]! }
-    public var VoiceChat_AnonymousDisabledAlertText: String { return self._s[3997]! }
-    public var ContactInfo_Title: String { return self._s[3998]! }
-    public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[3999]!, self._r[3999]!, [_1])
-    }
-    public var Channel_Setup_TypeHeader: String { return self._s[4000]! }
-    public var AuthSessions_LogOut: String { return self._s[4001]! }
-    public var ChatSettings_AutoDownloadReset: String { return self._s[4002]! }
-    public var Group_Info_Members: String { return self._s[4004]! }
-    public var ChatListFolderSettings_NewFolder: String { return self._s[4005]! }
-    public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[4006]! }
-    public var CreatePoll_Title: String { return self._s[4007]! }
-    public var EditTheme_EditTitle: String { return self._s[4008]! }
-    public var ChatListFolderSettings_RecommendedFoldersSection: String { return self._s[4009]! }
-    public var TwoStepAuth_SetPassword: String { return self._s[4010]! }
-    public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4011]!, self._r[4011]!, [_0])
-    }
-    public var BlockedUsers_Info: String { return self._s[4012]! }
-    public var AuthSessions_Sessions: String { return self._s[4013]! }
-    public var Group_EditAdmin_RankTitle: String { return self._s[4014]! }
-    public var Common_ActionNotAllowedError: String { return self._s[4015]! }
-    public var WebPreview_GettingLinkInfo: String { return self._s[4016]! }
-    public var Appearance_AppIconFilledX: String { return self._s[4017]! }
-    public var Passport_Email_EmailPlaceholder: String { return self._s[4018]! }
-    public var FeaturedStickers_OtherSection: String { return self._s[4019]! }
-    public var VoiceChat_RecordingStarted: String { return self._s[4020]! }
-    public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[4021]! }
-    public var Profile_Username: String { return self._s[4022]! }
-    public var Appearance_RemoveTheme: String { return self._s[4023]! }
-    public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[4024]! }
-    public var Message_PinnedStickerMessage: String { return self._s[4025]! }
-    public var AccessDenied_VideoMicrophone: String { return self._s[4026]! }
-    public var WallpaperPreview_CustomColorBottomText: String { return self._s[4027]! }
-    public var Passport_Address_RegionPlaceholder: String { return self._s[4028]! }
-    public var Conversation_VoiceChat: String { return self._s[4029]! }
-    public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[4030]! }
-    public var TwoStepAuth_Title: String { return self._s[4031]! }
-    public var VoiceOver_Chat_YourAnimatedSticker: String { return self._s[4032]! }
-    public var Checkout_WebConfirmation_Title: String { return self._s[4033]! }
-    public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[4034]! }
-    public var ChatListFolder_CategoryGroups: String { return self._s[4036]! }
-    public var Stats_GroupTopInviter_Promote: String { return self._s[4037]! }
-    public var Conversation_EditingPhotoPanelTitle: String { return self._s[4038]! }
-    public var Month_GenJuly: String { return self._s[4039]! }
-    public var Passport_Identity_Gender: String { return self._s[4040]! }
-    public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[4041]! }
-    public var Notification_Exceptions_DeleteAll: String { return self._s[4042]! }
-    public var VoiceChat_StopRecording: String { return self._s[4043]! }
-    public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4044]!, self._r[4044]!, [_0])
-    }
-    public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4045]!, self._r[4045]!, [_0, _1, _2])
-    }
-    public var Login_CodeSentSms: String { return self._s[4046]! }
-    public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4047]!, self._r[4047]!, [_0])
-    }
-    public var Login_CallRequestState2: String { return self._s[4048]! }
-    public var Channel_DiscussionGroup_Header: String { return self._s[4049]! }
-    public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4050]!, self._r[4050]!, [_0])
-    }
-    public var Passport_Language_ms: String { return self._s[4051]! }
-    public var PeopleNearby_MakeInvisible: String { return self._s[4053]! }
-    public var ChatList_Search_FilterVoice: String { return self._s[4055]! }
-    public var Camera_TapAndHoldForVideo: String { return self._s[4057]! }
-    public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[4058]! }
-    public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4059]!, self._r[4059]!, [_0])
-    }
-    public func Call_VoiceChatInProgressMessageCall(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4060]!, self._r[4060]!, [_1, _2])
-    }
-    public var Map_Locating: String { return self._s[4061]! }
-    public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4063]!, self._r[4063]!, [_0])
-    }
-    public var Passport_Identity_TypeInternalPassport: String { return self._s[4065]! }
-    public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[4066]! }
-    public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[4067]! }
-    public var Stickers_Installed: String { return self._s[4068]! }
-    public var Notifications_PermissionsAllowInSettings: String { return self._s[4069]! }
-    public var StickerPackActionInfo_RemovedTitle: String { return self._s[4070]! }
-    public var CallSettings_Never: String { return self._s[4072]! }
-    public var Channel_Setup_TypePublicHelp: String { return self._s[4073]! }
-    public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4075]!, self._r[4075]!, [_0])
-    }
-    public var Message_Game: String { return self._s[4076]! }
-    public var Call_Message: String { return self._s[4077]! }
-    public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4078]!, self._r[4078]!, [_1])
-    }
-    public var ChannelIntro_Text: String { return self._s[4079]! }
-    public var StickerPack_Send: String { return self._s[4080]! }
-    public var Share_AuthDescription: String { return self._s[4081]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[4082]! }
-    public var CallFeedback_WhatWentWrong: String { return self._s[4083]! }
-    public var Common_Create: String { return self._s[4086]! }
-    public var Passport_Language_hy: String { return self._s[4087]! }
-    public var CreatePoll_Explanation: String { return self._s[4088]! }
-    public var GroupPermission_AddMembersNotAvailable: String { return self._s[4089]! }
-    public var ChatImport_CreateGroupAlertImportAction: String { return self._s[4090]! }
-    public var PeerInfo_ButtonVoiceChat: String { return self._s[4091]! }
-    public var Undo_ChatClearedForBothSides: String { return self._s[4092]! }
-    public var DialogList_NoMessagesTitle: String { return self._s[4093]! }
-    public var GroupInfo_Title: String { return self._s[4095]! }
-    public var Channel_AdminLog_CanBanUsers: String { return self._s[4096]! }
-    public var PhoneNumberHelp_Help: String { return self._s[4097]! }
-    public var TwoStepAuth_AdditionalPassword: String { return self._s[4098]! }
-    public var Settings_Logout: String { return self._s[4099]! }
-    public var Privacy_PaymentsTitle: String { return self._s[4100]! }
-    public var StickerPacksSettings_StickerPacksSection: String { return self._s[4101]! }
-    public var Tour_Text6: String { return self._s[4102]! }
-    public var ChatImportActivity_Title: String { return self._s[4104]! }
-    public var Channel_Username_Help: String { return self._s[4105]! }
-    public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[4106]! }
-    public var AttachmentMenu_Poll: String { return self._s[4107]! }
-    public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[4108]! }
-    public var Conversation_ReportSpamChannelConfirmation: String { return self._s[4109]! }
-    public var Passport_DeletePassport: String { return self._s[4110]! }
-    public var Login_Code: String { return self._s[4111]! }
-    public var Notification_SecretChatScreenshot: String { return self._s[4112]! }
-    public var Login_CodeFloodError: String { return self._s[4113]! }
-    public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4114]!, self._r[4114]!, [_0])
-    }
-    public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4115]!, self._r[4115]!, [_0])
-    }
-    public var Watch_Stickers_Recents: String { return self._s[4116]! }
-    public var Generic_ErrorMoreInfo: String { return self._s[4117]! }
-    public func Call_AccountIsLoggedOnCurrentDevice(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4118]!, self._r[4118]!, [_0])
-    }
-    public var AutoDownloadSettings_DataUsage: String { return self._s[4119]! }
-    public var Conversation_ViewTheme: String { return self._s[4120]! }
-    public var Contacts_InviteSearchLabel: String { return self._s[4121]! }
-    public var Settings_CancelUpload: String { return self._s[4123]! }
-    public var Settings_AppLanguage_Unofficial: String { return self._s[4124]! }
-    public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[4125]!, self._r[4125]!, [_0])
     }
-    public var ChatList_AddFolder: String { return self._s[4126]! }
-    public var Conversation_Location: String { return self._s[4128]! }
-    public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[4129]! }
-    public var DialogList_AdLabel: String { return self._s[4130]! }
-    public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4132]!, self._r[4132]!, [_0])
+    public var Notifications_Badge_IncludeChannels: String { return self._s[4126]! }
+    public var InviteLink_CreatePrivateLinkHelpChannel: String { return self._s[4127]! }
+    public var StickerPack_ViewPack: String { return self._s[4130]! }
+    public var FastTwoStepSetup_PasswordConfirmationPlaceholder: String { return self._s[4132]! }
+    public var EditTheme_Expand_Preview_IncomingText: String { return self._s[4133]! }
+    public var Notifications_Title: String { return self._s[4134]! }
+    public var Conversation_InputTextPlaceholderComment: String { return self._s[4135]! }
+    public var GroupInfo_PublicLink: String { return self._s[4136]! }
+    public func ScheduleVoiceChat_GroupText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4137]!, self._r[4137]!, [_0])
     }
-    public var Message_InvoiceLabel: String { return self._s[4133]! }
-    public var Channel_TooMuchBots: String { return self._s[4134]! }
-    public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4136]!, self._r[4136]!, [_0])
+    public var VoiceOver_DiscardPreparedContent: String { return self._s[4138]! }
+    public var Conversation_Moderate_Ban: String { return self._s[4142]! }
+    public var InviteLink_Manage: String { return self._s[4143]! }
+    public var InstantPage_FontNewYork: String { return self._s[4144]! }
+    public func Activity_RemindAboutGroup(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4145]!, self._r[4145]!, [_0])
     }
-    public var Call_IncomingVideoCall: String { return self._s[4137]! }
-    public var Conversation_LiveLocation: String { return self._s[4138]! }
-    public var VoiceChat_AskedToSpeakHelp: String { return self._s[4139]! }
-    public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[4140]! }
-    public var Passport_Identity_EditPassport: String { return self._s[4141]! }
-    public var Permissions_CellularDataTitle_v0: String { return self._s[4143]! }
-    public var ChatList_Search_NoResultsFitlerVoice: String { return self._s[4144]! }
-    public var GroupInfo_Permissions_AddException: String { return self._s[4145]! }
-    public func VoiceChat_RemovePeerConfirmationChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4147]!, self._r[4147]!, [_0])
+    public var TextFormat_Underline: String { return self._s[4146]! }
+    public func DownloadingStatus(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4147]!, self._r[4147]!, [_0, _1])
     }
-    public var Channel_AdminLog_CanInviteUsers: String { return self._s[4148]! }
-    public var Channel_MessageVideoUpdated: String { return self._s[4149]! }
-    public var GroupInfo_Permissions_EditingDisabled: String { return self._s[4150]! }
-    public var AutoremoveSetup_TimeSectionHeader: String { return self._s[4153]! }
-    public var AccessDenied_Camera: String { return self._s[4154]! }
-    public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4155]!, self._r[4155]!, [_0])
+    public func PUSH_PINNED_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4148]!, self._r[4148]!, [_1])
     }
-    public var Theme_Context_ChangeColors: String { return self._s[4156]! }
-    public var PrivacySettings_TwoStepAuth: String { return self._s[4157]! }
-    public var Privacy_Forwards_PreviewMessageText: String { return self._s[4158]! }
-    public var Login_CodeExpiredError: String { return self._s[4159]! }
-    public var State_ConnectingToProxy: String { return self._s[4160]! }
-    public var TextFormat_Link: String { return self._s[4161]! }
-    public var Passport_Language_lv: String { return self._s[4163]! }
-    public var Conversation_AutoremoveTimerRemovedGroup: String { return self._s[4164]! }
-    public var AccessDenied_VoiceMicrophone: String { return self._s[4165]! }
-    public var WallpaperPreview_SwipeBottomText: String { return self._s[4166]! }
-    public var ProfilePhoto_SetMainVideo: String { return self._s[4167]! }
-    public var AutoDownloadSettings_Cellular: String { return self._s[4169]! }
-    public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[4170]! }
-    public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4171]!, self._r[4171]!, [_1, _2])
+    public var PollResults_Collapse: String { return self._s[4150]! }
+    public var Contacts_GlobalSearch: String { return self._s[4151]! }
+    public func Conversation_EncryptionWaiting(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4153]!, self._r[4153]!, [_0])
     }
-    public var ChatList_EmptyChatListFilterTitle: String { return self._s[4172]! }
-    public var Checkout_PayNone: String { return self._s[4173]! }
-    public var NotificationsSound_Complete: String { return self._s[4175]! }
-    public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[4176]! }
-    public var InviteLink_CreateInfo: String { return self._s[4177]! }
-    public var AuthSessions_DevicesTitle: String { return self._s[4178]! }
-    public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4179]!, self._r[4179]!, [_0, _1])
+    public var Channel_Management_LabelEditor: String { return self._s[4154]! }
+    public var SettingsSearch_Synonyms_Stickers_FeaturedPacks: String { return self._s[4156]! }
+    public var Conversation_Theme: String { return self._s[4157]! }
+    public func PUSH_CHANNEL_MESSAGE_DOCS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4158]!, self._r[4158]!, [_1, "\(_2)"])
     }
-    public var Message_LiveLocation: String { return self._s[4180]! }
-    public var Watch_Suggestion_BRB: String { return self._s[4181]! }
-    public var Channel_BanUser_Title: String { return self._s[4182]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[4183]! }
-    public var Conversation_Dice_u1F3C0: String { return self._s[4184]! }
-    public var Conversation_ClearSelfHistory: String { return self._s[4185]! }
-    public var ProfilePhoto_OpenGallery: String { return self._s[4186]! }
-    public var PrivacySettings_LastSeenTitle: String { return self._s[4187]! }
-    public var Weekday_Thursday: String { return self._s[4188]! }
-    public var BroadcastListInfo_AddRecipient: String { return self._s[4189]! }
-    public var Privacy_ProfilePhoto: String { return self._s[4191]! }
-    public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[4192]! }
-    public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4193]!, self._r[4193]!, [_1, _2])
+    public var Conversation_LinkDialogSave: String { return self._s[4159]! }
+    public var EnterPasscode_TouchId: String { return self._s[4160]! }
+    public var Conversation_VoiceChatMediaRecordingRestricted: String { return self._s[4161]! }
+    public var Group_ErrorAdminsTooMuch: String { return self._s[4162]! }
+    public var Stats_MessageOverview: String { return self._s[4163]! }
+    public var Privacy_Calls_P2PAlways: String { return self._s[4165]! }
+    public var Message_Sticker: String { return self._s[4166]! }
+    public var TwoFactorSetup_PasswordRecovery_SkipAlertTitle: String { return self._s[4167]! }
+    public var Conversation_Mute: String { return self._s[4170]! }
+    public var VoiceChat_AnonymousDisabledAlertText: String { return self._s[4171]! }
+    public var ContactInfo_Title: String { return self._s[4172]! }
+    public func PUSH_CHANNEL_MESSAGE_CONTACT(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4173]!, self._r[4173]!, [_1])
     }
-    public var Message_Audio: String { return self._s[4194]! }
-    public var Conversation_Info: String { return self._s[4195]! }
-    public var Cache_Videos: String { return self._s[4196]! }
-    public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[4197]! }
-    public var Channel_ErrorAddTooMuch: String { return self._s[4198]! }
-    public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4199]!, self._r[4199]!, [_0])
+    public var Channel_Setup_TypeHeader: String { return self._s[4174]! }
+    public var AuthSessions_LogOut: String { return self._s[4175]! }
+    public var ChatSettings_AutoDownloadReset: String { return self._s[4176]! }
+    public var VoiceChat_PinVideo: String { return self._s[4177]! }
+    public var Group_Info_Members: String { return self._s[4179]! }
+    public var ChatListFolderSettings_NewFolder: String { return self._s[4180]! }
+    public var Appearance_ThemePreview_ChatList_3_AuthorName: String { return self._s[4181]! }
+    public var CreatePoll_Title: String { return self._s[4182]! }
+    public var EditTheme_EditTitle: String { return self._s[4183]! }
+    public var ChatListFolderSettings_RecommendedFoldersSection: String { return self._s[4184]! }
+    public var TwoStepAuth_SetPassword: String { return self._s[4185]! }
+    public func Login_InvalidPhoneEmailSubject(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4186]!, self._r[4186]!, [_0])
     }
-    public var ChannelMembers_ChannelAdminsTitle: String { return self._s[4201]! }
-    public var ScheduledMessages_Title: String { return self._s[4203]! }
-    public var ShareFileTip_Title: String { return self._s[4206]! }
-    public var Chat_Gifs_TrendingSectionHeader: String { return self._s[4207]! }
-    public var ChatList_RemoveFolderConfirmation: String { return self._s[4208]! }
-    public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4209]!, self._r[4209]!, [_1, _2])
+    public var BlockedUsers_Info: String { return self._s[4187]! }
+    public var AuthSessions_Sessions: String { return self._s[4188]! }
+    public var Group_EditAdmin_RankTitle: String { return self._s[4189]! }
+    public var Common_ActionNotAllowedError: String { return self._s[4190]! }
+    public var WebPreview_GettingLinkInfo: String { return self._s[4191]! }
+    public var Appearance_AppIconFilledX: String { return self._s[4192]! }
+    public var Passport_Email_EmailPlaceholder: String { return self._s[4193]! }
+    public var FeaturedStickers_OtherSection: String { return self._s[4194]! }
+    public var VoiceChat_RecordingStarted: String { return self._s[4195]! }
+    public var EditTheme_Edit_Preview_OutgoingText: String { return self._s[4196]! }
+    public var Profile_Username: String { return self._s[4197]! }
+    public var TwoFactorRemember_Done_Title: String { return self._s[4198]! }
+    public var Settings_TipsUsername: String { return self._s[4199]! }
+    public var Appearance_RemoveTheme: String { return self._s[4200]! }
+    public var TwoStepAuth_SetupPasswordConfirmPassword: String { return self._s[4201]! }
+    public var Message_PinnedStickerMessage: String { return self._s[4202]! }
+    public var AccessDenied_VideoMicrophone: String { return self._s[4203]! }
+    public var WallpaperPreview_CustomColorBottomText: String { return self._s[4204]! }
+    public var Passport_Address_RegionPlaceholder: String { return self._s[4205]! }
+    public var Conversation_VoiceChat: String { return self._s[4206]! }
+    public var VoiceChat_EditBioSuccess: String { return self._s[4207]! }
+    public var ImportStickerPack_LinkAvailable: String { return self._s[4208]! }
+    public var SettingsSearch_Synonyms_Data_Storage_Title: String { return self._s[4209]! }
+    public var TwoStepAuth_Title: String { return self._s[4210]! }
+    public var VoiceOver_Chat_YourAnimatedSticker: String { return self._s[4211]! }
+    public var Checkout_WebConfirmation_Title: String { return self._s[4212]! }
+    public var AutoDownloadSettings_VoiceMessagesInfo: String { return self._s[4213]! }
+    public var ChatListFolder_CategoryGroups: String { return self._s[4215]! }
+    public var Stats_GroupTopInviter_Promote: String { return self._s[4216]! }
+    public var Conversation_EditingPhotoPanelTitle: String { return self._s[4217]! }
+    public var Month_GenJuly: String { return self._s[4218]! }
+    public var Passport_Identity_Gender: String { return self._s[4219]! }
+    public var Channel_DiscussionGroup_UnlinkGroup: String { return self._s[4220]! }
+    public var Notification_Exceptions_DeleteAll: String { return self._s[4221]! }
+    public var VoiceChat_StopRecording: String { return self._s[4222]! }
+    public func Conversation_FileHowToText(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4223]!, self._r[4223]!, [_0])
     }
-    public var Conversation_ContextViewStats: String { return self._s[4211]! }
-    public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[4212]! }
-    public var PasscodeSettings_Title: String { return self._s[4213]! }
-    public var Channel_AdminLog_SendPolls: String { return self._s[4214]! }
-    public var LastSeen_ALongTimeAgo: String { return self._s[4215]! }
-    public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4216]!, self._r[4216]!, [_1])
+    public func Channel_AdminLog_MessageAdmin(_ _0: String, _ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4224]!, self._r[4224]!, [_0, _1, _2])
     }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4217]! }
-    public var ChannelInfo_FakeChannelWarning: String { return self._s[4218]! }
-    public var CallFeedback_VideoReasonLowQuality: String { return self._s[4219]! }
-    public var Conversation_PinnedPreviousMessage: String { return self._s[4220]! }
-    public var SocksProxySetup_AddProxyTitle: String { return self._s[4221]! }
-    public var Passport_Identity_AddInternalPassport: String { return self._s[4222]! }
-    public func ChatList_RemovedFromFolderTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4223]!, self._r[4223]!, [_1, _2])
+    public var Login_CodeSentSms: String { return self._s[4225]! }
+    public func VoiceOver_Chat_ReplyFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4226]!, self._r[4226]!, [_0])
     }
-    public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4224]!, self._r[4224]!, [_0])
+    public var Login_CallRequestState2: String { return self._s[4227]! }
+    public var Channel_DiscussionGroup_Header: String { return self._s[4228]! }
+    public func Channel_AdminLog_MessageToggleInvitesOff(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4229]!, self._r[4229]!, [_0])
     }
-    public var Passport_Identity_GenderFemale: String { return self._s[4225]! }
-    public var Location_ProximityNotification_DistanceKM: String { return self._s[4228]! }
-    public var ConvertToSupergroup_HelpTitle: String { return self._s[4229]! }
-    public func Message_ImportedDateFormat(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4230]!, self._r[4230]!, [_1, _2, _3])
-    }
-    public var VoiceChat_Audio: String { return self._s[4231]! }
-    public var SharedMedia_TitleAll: String { return self._s[4232]! }
-    public var Settings_Context_Logout: String { return self._s[4233]! }
-    public var GroupInfo_SetGroupPhotoDelete: String { return self._s[4236]! }
-    public var Settings_About_Title: String { return self._s[4237]! }
-    public var StickerSettings_ContextHide: String { return self._s[4238]! }
-    public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Passport_Language_ms: String { return self._s[4230]! }
+    public var PeopleNearby_MakeInvisible: String { return self._s[4232]! }
+    public var ImportStickerPack_CreateStickerSet: String { return self._s[4234]! }
+    public var ChatList_Search_FilterVoice: String { return self._s[4235]! }
+    public var Camera_TapAndHoldForVideo: String { return self._s[4237]! }
+    public var Permissions_NotificationsAllowInSettings_v0: String { return self._s[4238]! }
+    public func Notification_LeftChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[4239]!, self._r[4239]!, [_0])
     }
-    public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4240]!, self._r[4240]!, [_0])
+    public func Call_VoiceChatInProgressMessageCall(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4240]!, self._r[4240]!, [_1, _2])
     }
-    public var ChatImport_SelectionConfirmationAlertImportAction: String { return self._s[4242]! }
-    public var Common_Cancel: String { return self._s[4243]! }
-    public var CallFeedback_Title: String { return self._s[4245]! }
-    public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4246]!, self._r[4246]!, [_0])
+    public var Map_Locating: String { return self._s[4241]! }
+    public func Checkout_SavePasswordTimeout(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4243]!, self._r[4243]!, [_0])
     }
-    public var Conversation_StickerAddedToFavorites: String { return self._s[4247]! }
-    public var Activity_UploadingVideoMessage: String { return self._s[4249]! }
-    public var MediaPicker_Send: String { return self._s[4250]! }
-    public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[4251]! }
-    public var Conversation_LiveLocationYou: String { return self._s[4252]! }
-    public var Notifications_ExceptionsUnmuted: String { return self._s[4253]! }
-    public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) {
+    public var Passport_Identity_TypeInternalPassport: String { return self._s[4245]! }
+    public var Appearance_ThemePreview_Chat_4_Text: String { return self._s[4246]! }
+    public var SettingsSearch_Synonyms_EditProfile_Username: String { return self._s[4247]! }
+    public var Stickers_Installed: String { return self._s[4248]! }
+    public var Notifications_PermissionsAllowInSettings: String { return self._s[4249]! }
+    public var StickerPackActionInfo_RemovedTitle: String { return self._s[4250]! }
+    public var CallSettings_Never: String { return self._s[4252]! }
+    public var Channel_Setup_TypePublicHelp: String { return self._s[4253]! }
+    public func ChatList_DeleteForEveryone(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[4255]!, self._r[4255]!, [_0])
     }
+    public var Message_Game: String { return self._s[4256]! }
+    public var Call_Message: String { return self._s[4257]! }
+    public func PUSH_CHANNEL_MESSAGE_VIDEO(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4258]!, self._r[4258]!, [_1])
+    }
+    public var ChannelIntro_Text: String { return self._s[4259]! }
+    public var VoiceChat_NoiseSuppressionEnabled: String { return self._s[4260]! }
+    public var StickerPack_Send: String { return self._s[4261]! }
+    public var Share_AuthDescription: String { return self._s[4262]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_5minutes: String { return self._s[4263]! }
+    public var CallFeedback_WhatWentWrong: String { return self._s[4264]! }
+    public var Common_Create: String { return self._s[4267]! }
+    public var Passport_Language_hy: String { return self._s[4268]! }
+    public var CreatePoll_Explanation: String { return self._s[4269]! }
+    public var GroupPermission_AddMembersNotAvailable: String { return self._s[4270]! }
+    public var ChatImport_CreateGroupAlertImportAction: String { return self._s[4271]! }
+    public var PeerInfo_ButtonVoiceChat: String { return self._s[4272]! }
+    public var Undo_ChatClearedForBothSides: String { return self._s[4273]! }
+    public var DialogList_NoMessagesTitle: String { return self._s[4274]! }
+    public var GroupInfo_Title: String { return self._s[4276]! }
+    public func ScheduleVoiceChat_ScheduleToday(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4277]!, self._r[4277]!, [_0])
+    }
+    public var UserInfo_ContactForwardTooltip_SavedMessages_One: String { return self._s[4278]! }
+    public var Channel_AdminLog_CanBanUsers: String { return self._s[4279]! }
+    public var PhoneNumberHelp_Help: String { return self._s[4280]! }
+    public var TwoStepAuth_AdditionalPassword: String { return self._s[4281]! }
+    public var Settings_Logout: String { return self._s[4282]! }
+    public var Privacy_PaymentsTitle: String { return self._s[4283]! }
+    public var StickerPacksSettings_StickerPacksSection: String { return self._s[4284]! }
+    public var Tour_Text6: String { return self._s[4285]! }
+    public var ChatImportActivity_Title: String { return self._s[4287]! }
+    public var Channel_Username_Help: String { return self._s[4288]! }
+    public var VoiceOver_Chat_RecordModeVoiceMessageInfo: String { return self._s[4289]! }
+    public var AttachmentMenu_Poll: String { return self._s[4290]! }
+    public var EditTheme_Create_Preview_IncomingReplyName: String { return self._s[4291]! }
+    public var Conversation_ReportSpamChannelConfirmation: String { return self._s[4292]! }
+    public var Passport_DeletePassport: String { return self._s[4293]! }
+    public var Login_Code: String { return self._s[4294]! }
+    public var Notification_SecretChatScreenshot: String { return self._s[4295]! }
+    public var VoiceChat_AddBio: String { return self._s[4296]! }
+    public var Login_CodeFloodError: String { return self._s[4297]! }
+    public func Notification_PinnedAnimationMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4298]!, self._r[4298]!, [_0])
+    }
+    public func Channel_Username_UsernameIsAvailable(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4299]!, self._r[4299]!, [_0])
+    }
+    public var Watch_Stickers_Recents: String { return self._s[4300]! }
+    public var Generic_ErrorMoreInfo: String { return self._s[4301]! }
+    public func Call_AccountIsLoggedOnCurrentDevice(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4302]!, self._r[4302]!, [_0])
+    }
+    public var AutoDownloadSettings_DataUsage: String { return self._s[4303]! }
+    public var Conversation_ViewTheme: String { return self._s[4304]! }
+    public var Contacts_InviteSearchLabel: String { return self._s[4305]! }
+    public var Settings_CancelUpload: String { return self._s[4307]! }
+    public var Settings_AppLanguage_Unofficial: String { return self._s[4308]! }
+    public func ChatList_ClearChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4309]!, self._r[4309]!, [_0])
+    }
+    public var ChatList_AddFolder: String { return self._s[4310]! }
+    public var Conversation_Location: String { return self._s[4312]! }
+    public var Appearance_BubbleCorners_AdjustAdjacent: String { return self._s[4313]! }
+    public var DialogList_AdLabel: String { return self._s[4314]! }
+    public func Time_TomorrowAt(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4316]!, self._r[4316]!, [_0])
+    }
+    public var Message_InvoiceLabel: String { return self._s[4317]! }
+    public var Channel_TooMuchBots: String { return self._s[4318]! }
+    public func Channel_AdminLog_MessageRemovedChannelUsername(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4320]!, self._r[4320]!, [_0])
+    }
+    public var Call_IncomingVideoCall: String { return self._s[4321]! }
+    public var Conversation_LiveLocation: String { return self._s[4322]! }
+    public var VoiceChat_AskedToSpeakHelp: String { return self._s[4323]! }
+    public var TwoStepAuth_SetupPasswordEnterPasswordChange: String { return self._s[4324]! }
+    public var Passport_Identity_EditPassport: String { return self._s[4325]! }
+    public var Permissions_CellularDataTitle_v0: String { return self._s[4327]! }
+    public var ChatList_Search_NoResultsFitlerVoice: String { return self._s[4328]! }
+    public var GroupInfo_Permissions_AddException: String { return self._s[4329]! }
+    public func VoiceChat_RemovePeerConfirmationChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4331]!, self._r[4331]!, [_0])
+    }
+    public var Channel_AdminLog_CanInviteUsers: String { return self._s[4332]! }
+    public var Channel_MessageVideoUpdated: String { return self._s[4333]! }
+    public var GroupInfo_Permissions_EditingDisabled: String { return self._s[4334]! }
+    public var AutoremoveSetup_TimeSectionHeader: String { return self._s[4337]! }
+    public var AccessDenied_Camera: String { return self._s[4338]! }
+    public func Target_InviteToGroupConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4339]!, self._r[4339]!, [_0])
+    }
+    public var Theme_Context_ChangeColors: String { return self._s[4340]! }
+    public var PrivacySettings_TwoStepAuth: String { return self._s[4341]! }
+    public var Privacy_Forwards_PreviewMessageText: String { return self._s[4342]! }
+    public var Login_CodeExpiredError: String { return self._s[4343]! }
+    public var State_ConnectingToProxy: String { return self._s[4344]! }
+    public var TextFormat_Link: String { return self._s[4345]! }
+    public var Passport_Language_lv: String { return self._s[4347]! }
+    public var Conversation_AutoremoveTimerRemovedGroup: String { return self._s[4348]! }
+    public var AccessDenied_VoiceMicrophone: String { return self._s[4349]! }
+    public var WallpaperPreview_SwipeBottomText: String { return self._s[4350]! }
+    public var ProfilePhoto_SetMainVideo: String { return self._s[4351]! }
+    public var AutoDownloadSettings_Cellular: String { return self._s[4353]! }
+    public var ChatSettings_AutoDownloadVoiceMessages: String { return self._s[4354]! }
+    public var Calls_NoVoiceAndVideoCallsPlaceholder: String { return self._s[4355]! }
+    public func Channel_AdminLog_MessageKickedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4356]!, self._r[4356]!, [_1, _2])
+    }
+    public var ChatList_EmptyChatListFilterTitle: String { return self._s[4357]! }
+    public var Checkout_PayNone: String { return self._s[4358]! }
+    public var NotificationsSound_Complete: String { return self._s[4360]! }
+    public var TwoStepAuth_ConfirmEmailCodePlaceholder: String { return self._s[4361]! }
+    public var InviteLink_CreateInfo: String { return self._s[4362]! }
+    public var AuthSessions_DevicesTitle: String { return self._s[4363]! }
+    public func DialogList_MultipleTyping(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4364]!, self._r[4364]!, [_0, _1])
+    }
+    public var Message_LiveLocation: String { return self._s[4365]! }
+    public var Watch_Suggestion_BRB: String { return self._s[4366]! }
+    public var Channel_BanUser_Title: String { return self._s[4367]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_Title: String { return self._s[4368]! }
+    public var Conversation_Dice_u1F3C0: String { return self._s[4369]! }
+    public var Conversation_ClearSelfHistory: String { return self._s[4370]! }
+    public var ProfilePhoto_OpenGallery: String { return self._s[4371]! }
+    public var PrivacySettings_LastSeenTitle: String { return self._s[4372]! }
+    public var Weekday_Thursday: String { return self._s[4373]! }
+    public var BroadcastListInfo_AddRecipient: String { return self._s[4374]! }
+    public var Privacy_ProfilePhoto: String { return self._s[4376]! }
+    public var StickerPacksSettings_ArchivedPacks_Info: String { return self._s[4377]! }
+    public func Channel_AdminLog_MessageChangedUnlinkedGroup(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4378]!, self._r[4378]!, [_1, _2])
+    }
+    public var Message_Audio: String { return self._s[4379]! }
+    public var Conversation_Info: String { return self._s[4380]! }
+    public var Cache_Videos: String { return self._s[4381]! }
+    public var Appearance_ThemePreview_ChatList_6_Text: String { return self._s[4382]! }
+    public var Channel_ErrorAddTooMuch: String { return self._s[4383]! }
+    public var TwoFactorSetup_ResetDone_Text: String { return self._s[4384]! }
+    public func ChatList_DeleteSecretChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4385]!, self._r[4385]!, [_0])
+    }
+    public var VoiceChat_EditBio: String { return self._s[4386]! }
+    public var ChannelMembers_ChannelAdminsTitle: String { return self._s[4388]! }
+    public var VoiceChat_ShareScreen: String { return self._s[4391]! }
+    public var ScheduledMessages_Title: String { return self._s[4392]! }
+    public var ShareFileTip_Title: String { return self._s[4395]! }
+    public var Chat_Gifs_TrendingSectionHeader: String { return self._s[4396]! }
+    public var ChatList_RemoveFolderConfirmation: String { return self._s[4397]! }
+    public func PUSH_CHAT_MESSAGE_GEOLIVE(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4398]!, self._r[4398]!, [_1, _2])
+    }
+    public var Conversation_ContextViewStats: String { return self._s[4400]! }
+    public var Channel_DiscussionGroup_SearchPlaceholder: String { return self._s[4401]! }
+    public var PasscodeSettings_Title: String { return self._s[4402]! }
+    public var Channel_AdminLog_SendPolls: String { return self._s[4403]! }
+    public var LastSeen_ALongTimeAgo: String { return self._s[4404]! }
+    public func PUSH_CHANNEL_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4405]!, self._r[4405]!, [_1])
+    }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChannels: String { return self._s[4406]! }
+    public var ChannelInfo_FakeChannelWarning: String { return self._s[4407]! }
+    public var CallFeedback_VideoReasonLowQuality: String { return self._s[4408]! }
+    public var Conversation_PinnedPreviousMessage: String { return self._s[4409]! }
+    public var SocksProxySetup_AddProxyTitle: String { return self._s[4410]! }
+    public var Passport_Identity_AddInternalPassport: String { return self._s[4411]! }
+    public func ChatList_RemovedFromFolderTooltip(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4412]!, self._r[4412]!, [_1, _2])
+    }
+    public func Conversation_SetReminder_RemindToday(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4413]!, self._r[4413]!, [_0])
+    }
+    public var Passport_Identity_GenderFemale: String { return self._s[4414]! }
+    public var Location_ProximityNotification_DistanceKM: String { return self._s[4417]! }
+    public var ConvertToSupergroup_HelpTitle: String { return self._s[4418]! }
+    public func Message_ImportedDateFormat(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4419]!, self._r[4419]!, [_1, _2, _3])
+    }
+    public var VoiceChat_Audio: String { return self._s[4420]! }
+    public var SharedMedia_TitleAll: String { return self._s[4421]! }
+    public var Settings_Context_Logout: String { return self._s[4422]! }
+    public var GroupInfo_SetGroupPhotoDelete: String { return self._s[4425]! }
+    public var Settings_About_Title: String { return self._s[4426]! }
+    public var StickerSettings_ContextHide: String { return self._s[4427]! }
+    public func AutoDownloadSettings_UpTo(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4428]!, self._r[4428]!, [_0])
+    }
+    public func Conversation_LiveLocationYouAndOther(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4429]!, self._r[4429]!, [_0])
+    }
+    public var ChatImport_SelectionConfirmationAlertImportAction: String { return self._s[4431]! }
+    public var Common_Cancel: String { return self._s[4432]! }
+    public var CallFeedback_Title: String { return self._s[4434]! }
+    public func Notification_PinnedContactMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4435]!, self._r[4435]!, [_0])
+    }
+    public var Conversation_StickerAddedToFavorites: String { return self._s[4436]! }
+    public var Activity_UploadingVideoMessage: String { return self._s[4438]! }
+    public var MediaPicker_Send: String { return self._s[4439]! }
+    public var PasscodeSettings_AutoLock_IfAwayFor_1minute: String { return self._s[4440]! }
+    public var Conversation_LiveLocationYou: String { return self._s[4441]! }
+    public var Notifications_ExceptionsUnmuted: String { return self._s[4442]! }
+    public func Channel_AdminLog_MessageGroupPreHistoryHidden(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4444]!, self._r[4444]!, [_0])
+    }
     public func PUSH_CHAT_ADD_YOU(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4256]!, self._r[4256]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4445]!, self._r[4445]!, [_1, _2])
     }
-    public var Conversation_ViewBackground: String { return self._s[4257]! }
-    public var ChatSettings_PrivateChats: String { return self._s[4260]! }
-    public var Conversation_ErrorInaccessibleMessage: String { return self._s[4261]! }
-    public var BroadcastGroups_LimitAlert_LearnMore: String { return self._s[4262]! }
-    public var Appearance_ThemeNight: String { return self._s[4263]! }
-    public var Common_Search: String { return self._s[4264]! }
-    public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[4265]! }
-    public var ChangePhoneNumberNumber_Help: String { return self._s[4267]! }
-    public var InviteLink_QRCode_Share: String { return self._s[4268]! }
-    public var Stickers_SuggestAdded: String { return self._s[4270]! }
-    public var Conversation_DiscardVoiceMessageDescription: String { return self._s[4273]! }
-    public var Widget_UpdatedTodayAt: String { return self._s[4274]! }
-    public var NetworkUsageSettings_Cellular: String { return self._s[4275]! }
-    public var CheckoutInfo_Title: String { return self._s[4276]! }
-    public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[4277]! }
-    public var Channel_BotDoesntSupportGroups: String { return self._s[4278]! }
+    public var Checkout_PaymentLiabilityAlert: String { return self._s[4446]! }
+    public var Conversation_ViewBackground: String { return self._s[4447]! }
+    public var ChatSettings_PrivateChats: String { return self._s[4450]! }
+    public var Conversation_ErrorInaccessibleMessage: String { return self._s[4451]! }
+    public var BroadcastGroups_LimitAlert_LearnMore: String { return self._s[4452]! }
+    public var Appearance_ThemeNight: String { return self._s[4453]! }
+    public var Common_Search: String { return self._s[4454]! }
+    public var TwoStepAuth_ReEnterPasswordTitle: String { return self._s[4455]! }
+    public var ChangePhoneNumberNumber_Help: String { return self._s[4457]! }
+    public var InviteLink_QRCode_Share: String { return self._s[4458]! }
+    public var Stickers_SuggestAdded: String { return self._s[4460]! }
+    public func VoiceChat_VideoParticipantsLimitExceeded(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4462]!, self._r[4462]!, [_0])
+    }
+    public var Conversation_DiscardVoiceMessageDescription: String { return self._s[4464]! }
+    public var Widget_UpdatedTodayAt: String { return self._s[4465]! }
+    public var NetworkUsageSettings_Cellular: String { return self._s[4466]! }
+    public var CheckoutInfo_Title: String { return self._s[4467]! }
+    public var Conversation_ShareBotLocationConfirmationTitle: String { return self._s[4468]! }
+    public var Channel_BotDoesntSupportGroups: String { return self._s[4469]! }
     public func DialogList_SingleRecordingAudioSuffix(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4279]!, self._r[4279]!, [_0])
+        return formatWithArgumentRanges(self._s[4470]!, self._r[4470]!, [_0])
     }
-    public var MaskStickerSettings_Info: String { return self._s[4281]! }
-    public var GroupRemoved_DeleteUser: String { return self._s[4283]! }
-    public var Contacts_ShareTelegram: String { return self._s[4284]! }
-    public var Group_UpgradeNoticeText1: String { return self._s[4285]! }
+    public var MaskStickerSettings_Info: String { return self._s[4472]! }
+    public var GroupRemoved_DeleteUser: String { return self._s[4474]! }
+    public var Contacts_ShareTelegram: String { return self._s[4475]! }
+    public var Group_UpgradeNoticeText1: String { return self._s[4476]! }
     public func PUSH_PHONE_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4286]!, self._r[4286]!, [_1])
+        return formatWithArgumentRanges(self._s[4477]!, self._r[4477]!, [_1])
     }
-    public var PrivacyLastSeenSettings_Title: String { return self._s[4287]! }
-    public var SettingsSearch_Synonyms_Support: String { return self._s[4291]! }
-    public var PhotoEditor_TintTool: String { return self._s[4292]! }
-    public var ChatImportActivity_OpenApp: String { return self._s[4294]! }
-    public var GroupPermission_NoSendPolls: String { return self._s[4295]! }
-    public var NotificationsSound_None: String { return self._s[4296]! }
+    public var PrivacyLastSeenSettings_Title: String { return self._s[4478]! }
+    public var SettingsSearch_Synonyms_Support: String { return self._s[4482]! }
+    public var PhotoEditor_TintTool: String { return self._s[4483]! }
+    public var ChatImportActivity_OpenApp: String { return self._s[4485]! }
+    public var GroupPermission_NoSendPolls: String { return self._s[4486]! }
+    public var NotificationsSound_None: String { return self._s[4487]! }
     public func LOCAL_CHANNEL_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4297]!, self._r[4297]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[4488]!, self._r[4488]!, [_1, "\(_2)"])
     }
-    public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[4300]! }
+    public var CheckoutInfo_ShippingInfoCityPlaceholder: String { return self._s[4491]! }
     public func Conversation_AutoremoveTimerSetChannel(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4302]!, self._r[4302]!, [_1])
+        return formatWithArgumentRanges(self._s[4493]!, self._r[4493]!, [_1])
     }
-    public var ExplicitContent_AlertChannel: String { return self._s[4303]! }
-    public var Conversation_ClousStorageInfo_Description1: String { return self._s[4304]! }
-    public var Contacts_SortedByPresence: String { return self._s[4305]! }
-    public var WallpaperSearch_ColorGray: String { return self._s[4306]! }
-    public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[4307]! }
-    public var Conversation_ReportSpam: String { return self._s[4308]! }
-    public var ChatList_Search_NoResultsFilter: String { return self._s[4311]! }
-    public var WallpaperSearch_ColorBlack: String { return self._s[4312]! }
-    public var ArchivedChats_IntroTitle3: String { return self._s[4313]! }
-    public var InviteLink_DeleteAllRevokedLinksAlert_Action: String { return self._s[4314]! }
+    public var ExplicitContent_AlertChannel: String { return self._s[4494]! }
+    public var Conversation_ClousStorageInfo_Description1: String { return self._s[4495]! }
+    public var Contacts_SortedByPresence: String { return self._s[4496]! }
+    public var WallpaperSearch_ColorGray: String { return self._s[4497]! }
+    public var Channel_AdminLogFilter_EventsNewSubscribers: String { return self._s[4498]! }
+    public var Conversation_ReportSpam: String { return self._s[4499]! }
+    public var ChatList_Search_NoResultsFilter: String { return self._s[4502]! }
+    public var WallpaperSearch_ColorBlack: String { return self._s[4503]! }
+    public var ArchivedChats_IntroTitle3: String { return self._s[4504]! }
+    public var InviteLink_DeleteAllRevokedLinksAlert_Action: String { return self._s[4505]! }
     public func VoiceChat_PeerJoinedText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4315]!, self._r[4315]!, [_0])
+        return formatWithArgumentRanges(self._s[4506]!, self._r[4506]!, [_0])
     }
-    public var Conversation_DefaultRestrictedText: String { return self._s[4316]! }
-    public var Settings_Devices: String { return self._s[4317]! }
-    public var Call_AudioRouteSpeaker: String { return self._s[4318]! }
-    public var GroupInfo_InviteLink_CopyLink: String { return self._s[4319]! }
-    public var Passport_Address_Country: String { return self._s[4321]! }
-    public var Cache_MaximumCacheSize: String { return self._s[4322]! }
-    public var Chat_PanelHidePinnedMessages: String { return self._s[4323]! }
-    public var Notifications_Badge_IncludePublicGroups: String { return self._s[4324]! }
-    public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[4326]! }
-    public var Login_TermsOfServiceLabel: String { return self._s[4327]! }
-    public var Calls_NoMissedCallsPlacehoder: String { return self._s[4328]! }
-    public var SocksProxySetup_RequiredCredentials: String { return self._s[4329]! }
-    public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[4330]! }
-    public var AutoNightTheme_ScheduledFrom: String { return self._s[4331]! }
-    public var ChatSettings_AutoDownloadDocuments: String { return self._s[4332]! }
-    public var ConvertToSupergroup_Note: String { return self._s[4334]! }
-    public var Settings_SetNewProfilePhotoOrVideo: String { return self._s[4335]! }
-    public var PrivacySettings_PasscodeAndTouchId: String { return self._s[4336]! }
-    public var Common_More: String { return self._s[4337]! }
-    public var ShareMenu_SelectChats: String { return self._s[4339]! }
+    public var Conversation_DefaultRestrictedText: String { return self._s[4507]! }
+    public var Settings_Devices: String { return self._s[4508]! }
+    public var Call_AudioRouteSpeaker: String { return self._s[4509]! }
+    public var GroupInfo_InviteLink_CopyLink: String { return self._s[4510]! }
+    public var VoiceChat_StartsIn: String { return self._s[4511]! }
+    public var VoiceChat_CreateNewVoiceChatSchedule: String { return self._s[4512]! }
+    public var VoiceChat_EditDescriptionTitle: String { return self._s[4514]! }
+    public var Passport_Address_Country: String { return self._s[4515]! }
+    public var Cache_MaximumCacheSize: String { return self._s[4516]! }
+    public var Chat_PanelHidePinnedMessages: String { return self._s[4517]! }
+    public var Notifications_Badge_IncludePublicGroups: String { return self._s[4518]! }
+    public var ChatSettings_AutoDownloadUsingWiFi: String { return self._s[4520]! }
+    public var Login_TermsOfServiceLabel: String { return self._s[4521]! }
+    public var Calls_NoMissedCallsPlacehoder: String { return self._s[4522]! }
+    public var SocksProxySetup_RequiredCredentials: String { return self._s[4523]! }
+    public var VoiceOver_MessageContextOpenMessageMenu: String { return self._s[4524]! }
+    public var AutoNightTheme_ScheduledFrom: String { return self._s[4525]! }
+    public var ChatSettings_AutoDownloadDocuments: String { return self._s[4526]! }
+    public var ConvertToSupergroup_Note: String { return self._s[4528]! }
+    public var Settings_SetNewProfilePhotoOrVideo: String { return self._s[4529]! }
+    public var PrivacySettings_PasscodeAndTouchId: String { return self._s[4530]! }
+    public var Common_More: String { return self._s[4531]! }
+    public var ShareMenu_SelectChats: String { return self._s[4533]! }
     public func Conversation_ScheduleMessage_SendToday(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4340]!, self._r[4340]!, [_0])
+        return formatWithArgumentRanges(self._s[4534]!, self._r[4534]!, [_0])
     }
     public func Channel_AdminLog_MessageRemovedGroupStickerPack(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4341]!, self._r[4341]!, [_0])
+        return formatWithArgumentRanges(self._s[4535]!, self._r[4535]!, [_0])
     }
-    public var Contacts_PermissionsKeepDisabled: String { return self._s[4343]! }
+    public var Contacts_PermissionsKeepDisabled: String { return self._s[4537]! }
+    public var VoiceChat_EditBioText: String { return self._s[4538]! }
     public func Call_ParticipantVersionOutdatedError(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4344]!, self._r[4344]!, [_0])
+        return formatWithArgumentRanges(self._s[4539]!, self._r[4539]!, [_0])
     }
-    public var WatchRemote_AlertOpen: String { return self._s[4345]! }
+    public var WatchRemote_AlertOpen: String { return self._s[4540]! }
     public func PUSH_CHAT_ADD_MEMBER(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4346]!, self._r[4346]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4541]!, self._r[4541]!, [_1, _2, _3])
     }
-    public var Channel_Members_AddMembersHelp: String { return self._s[4347]! }
-    public var Shortcut_SwitchAccount: String { return self._s[4348]! }
-    public var Map_LiveLocationFor8Hours: String { return self._s[4349]! }
+    public var Channel_Members_AddMembersHelp: String { return self._s[4542]! }
+    public var Shortcut_SwitchAccount: String { return self._s[4543]! }
+    public var Map_LiveLocationFor8Hours: String { return self._s[4544]! }
     public func AutoNightTheme_AutomaticHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4350]!, self._r[4350]!, [_0])
+        return formatWithArgumentRanges(self._s[4545]!, self._r[4545]!, [_0])
     }
-    public var Compose_NewGroupTitle: String { return self._s[4351]! }
-    public var DialogList_You: String { return self._s[4352]! }
-    public var Call_VoiceOver_VoiceCallOutgoing: String { return self._s[4353]! }
-    public var ReportPeer_ReasonViolence: String { return self._s[4354]! }
+    public var Compose_NewGroupTitle: String { return self._s[4546]! }
+    public var DialogList_You: String { return self._s[4547]! }
+    public var Call_VoiceOver_VoiceCallOutgoing: String { return self._s[4548]! }
+    public var ReportPeer_ReasonViolence: String { return self._s[4549]! }
     public func PUSH_CHANNEL_MESSAGE_STICKER(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4355]!, self._r[4355]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4550]!, self._r[4550]!, [_1, _2])
     }
-    public var VoiceChat_Reconnecting: String { return self._s[4357]! }
-    public var KeyCommand_ScrollDown: String { return self._s[4360]! }
-    public var ChatSettings_DownloadInBackground: String { return self._s[4361]! }
-    public var Wallpaper_ResetWallpapers: String { return self._s[4362]! }
-    public var Channel_BanList_RestrictedTitle: String { return self._s[4363]! }
-    public var ArchivedChats_IntroText3: String { return self._s[4364]! }
-    public var HashtagSearch_AllChats: String { return self._s[4366]! }
-    public var VoiceChat_EndVoiceChat: String { return self._s[4367]! }
-    public var Conversation_MessageCopied: String { return self._s[4369]! }
-    public var Channel_Info_BlackList: String { return self._s[4370]! }
-    public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[4371]! }
-    public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[4372]! }
-    public var Paint_Neon: String { return self._s[4374]! }
-    public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[4375]! }
-    public var AutoDownloadSettings_AutoDownload: String { return self._s[4376]! }
+    public var VoiceChat_Reconnecting: String { return self._s[4552]! }
+    public var KeyCommand_ScrollDown: String { return self._s[4555]! }
+    public var ChatSettings_DownloadInBackground: String { return self._s[4556]! }
+    public var Wallpaper_ResetWallpapers: String { return self._s[4557]! }
+    public var Channel_BanList_RestrictedTitle: String { return self._s[4558]! }
+    public var ArchivedChats_IntroText3: String { return self._s[4559]! }
+    public var HashtagSearch_AllChats: String { return self._s[4561]! }
+    public var VoiceChat_EndVoiceChat: String { return self._s[4562]! }
+    public var Conversation_MessageCopied: String { return self._s[4564]! }
+    public var Channel_Info_BlackList: String { return self._s[4565]! }
+    public var Contacts_SearchUsersAndGroupsLabel: String { return self._s[4566]! }
+    public var PrivacyPhoneNumberSettings_DiscoveryHeader: String { return self._s[4567]! }
+    public var Paint_Neon: String { return self._s[4569]! }
+    public var SettingsSearch_Synonyms_AppLanguage: String { return self._s[4570]! }
+    public var AutoDownloadSettings_AutoDownload: String { return self._s[4571]! }
+    public var ImportStickerPack_CreateNewStickerSet: String { return self._s[4572]! }
     public func Notification_PinnedVideoMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4378]!, self._r[4378]!, [_0])
+        return formatWithArgumentRanges(self._s[4574]!, self._r[4574]!, [_0])
     }
-    public var Map_StopLiveLocation: String { return self._s[4379]! }
-    public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[4380]! }
-    public var Channel_Username_InvalidCharacters: String { return self._s[4381]! }
-    public var InstantPage_Reference: String { return self._s[4383]! }
-    public var Group_Members_AddMembers: String { return self._s[4385]! }
-    public var ChatList_HideAction: String { return self._s[4386]! }
-    public var Conversation_FileICloudDrive: String { return self._s[4388]! }
+    public var Map_StopLiveLocation: String { return self._s[4575]! }
+    public var SettingsSearch_Synonyms_Data_SaveEditedPhotos: String { return self._s[4576]! }
+    public var Channel_Username_InvalidCharacters: String { return self._s[4577]! }
+    public var InstantPage_Reference: String { return self._s[4579]! }
+    public var Group_Members_AddMembers: String { return self._s[4581]! }
+    public func Conversation_ScheduledVoiceChatStartsOn(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4582]!, self._r[4582]!, [_0])
+    }
+    public var ChatList_HideAction: String { return self._s[4583]! }
+    public var Conversation_FileICloudDrive: String { return self._s[4585]! }
     public func PUSH_PINNED_GEOLIVE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4389]!, self._r[4389]!, [_1])
+        return formatWithArgumentRanges(self._s[4586]!, self._r[4586]!, [_1])
     }
-    public var Passport_PasswordReset: String { return self._s[4391]! }
-    public var ChatList_Context_UnhideArchive: String { return self._s[4393]! }
-    public var ConvertToSupergroup_HelpText: String { return self._s[4394]! }
-    public var Calls_AddTab: String { return self._s[4395]! }
-    public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[4396]! }
-    public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[4397]! }
-    public var Privacy_GroupsAndChannels: String { return self._s[4400]! }
-    public var Conversation_UsernameCopied: String { return self._s[4401]! }
-    public var AutoNightTheme_Disabled: String { return self._s[4402]! }
-    public var CreatePoll_MultipleChoice: String { return self._s[4403]! }
+    public var Passport_PasswordReset: String { return self._s[4588]! }
+    public var ChatList_Context_UnhideArchive: String { return self._s[4590]! }
+    public var ConvertToSupergroup_HelpText: String { return self._s[4591]! }
+    public var Calls_AddTab: String { return self._s[4592]! }
+    public var TwoStepAuth_ConfirmEmailResendCode: String { return self._s[4594]! }
+    public var SettingsSearch_Synonyms_Stickers_SuggestStickers: String { return self._s[4595]! }
+    public var Privacy_GroupsAndChannels: String { return self._s[4598]! }
+    public var Conversation_UsernameCopied: String { return self._s[4599]! }
+    public var AutoNightTheme_Disabled: String { return self._s[4600]! }
+    public var CreatePoll_MultipleChoice: String { return self._s[4601]! }
     public func PINNED_INVOICE(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4404]!, self._r[4404]!, [_1])
+        return formatWithArgumentRanges(self._s[4602]!, self._r[4602]!, [_1])
     }
-    public var Watch_Bot_Restart: String { return self._s[4406]! }
+    public var Watch_Bot_Restart: String { return self._s[4604]! }
     public func Conversation_Kilobytes(_ _0: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4407]!, self._r[4407]!, ["\(_0)"])
+        return formatWithArgumentRanges(self._s[4605]!, self._r[4605]!, ["\(_0)"])
     }
-    public var GroupInfo_ScamGroupWarning: String { return self._s[4409]! }
-    public var Conversation_EditingMessagePanelMedia: String { return self._s[4410]! }
-    public var Appearance_PreviewIncomingText: String { return self._s[4411]! }
-    public var ChatSettings_WidgetSettings: String { return self._s[4412]! }
-    public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[4413]! }
-    public var ChatList_UndoArchiveRevealedTitle: String { return self._s[4415]! }
-    public var Stats_GroupOverview: String { return self._s[4417]! }
-    public var ScheduledMessages_EditTime: String { return self._s[4420]! }
-    public var Month_GenFebruary: String { return self._s[4421]! }
-    public var ChatList_AutoarchiveSuggestion_OpenSettings: String { return self._s[4422]! }
-    public var Stickers_ClearRecent: String { return self._s[4423]! }
-    public var InviteLink_Create_UsersLimitNumberOfUsersUnlimited: String { return self._s[4424]! }
-    public var TwoStepAuth_EnterPasswordPassword: String { return self._s[4425]! }
-    public var Stats_Message_PublicShares: String { return self._s[4426]! }
+    public var GroupInfo_ScamGroupWarning: String { return self._s[4607]! }
+    public var Conversation_EditingMessagePanelMedia: String { return self._s[4608]! }
+    public var Appearance_PreviewIncomingText: String { return self._s[4609]! }
+    public var ChatSettings_WidgetSettings: String { return self._s[4610]! }
+    public var Notifications_ChannelNotificationsExceptionsHelp: String { return self._s[4611]! }
+    public var ChatList_UndoArchiveRevealedTitle: String { return self._s[4613]! }
+    public var Stats_GroupOverview: String { return self._s[4615]! }
+    public var ScheduledMessages_EditTime: String { return self._s[4618]! }
+    public var Month_GenFebruary: String { return self._s[4619]! }
+    public var ChatList_AutoarchiveSuggestion_OpenSettings: String { return self._s[4620]! }
+    public var Stickers_ClearRecent: String { return self._s[4621]! }
+    public var InviteLink_Create_UsersLimitNumberOfUsersUnlimited: String { return self._s[4622]! }
+    public var TwoStepAuth_EnterPasswordPassword: String { return self._s[4623]! }
+    public var Stats_Message_PublicShares: String { return self._s[4624]! }
     public func Checkout_PayPrice(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4427]!, self._r[4427]!, [_0])
+        return formatWithArgumentRanges(self._s[4625]!, self._r[4625]!, [_0])
     }
-    public var Login_TermsOfServiceSignupDecline: String { return self._s[4428]! }
-    public var CheckoutInfo_ErrorCityInvalid: String { return self._s[4429]! }
-    public var VoiceOver_Chat_PlayHint: String { return self._s[4430]! }
-    public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[4431]! }
-    public var CheckoutInfo_ShippingInfoTitle: String { return self._s[4433]! }
-    public var CreatePoll_Create: String { return self._s[4434]! }
-    public var ChatList_Search_FilterLinks: String { return self._s[4435]! }
-    public var Your_cards_number_is_invalid: String { return self._s[4436]! }
-    public var Month_ShortApril: String { return self._s[4437]! }
-    public var SocksProxySetup_UseForCalls: String { return self._s[4438]! }
-    public var Conversation_EditingCaptionPanelTitle: String { return self._s[4439]! }
-    public var SocksProxySetup_Status: String { return self._s[4440]! }
-    public var VoiceChat_UnmuteForMe: String { return self._s[4441]! }
-    public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[4442]! }
-    public var ChatListFolder_CategoryBots: String { return self._s[4443]! }
-    public var Passport_FieldIdentitySelfieHelp: String { return self._s[4445]! }
-    public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[4446]! }
-    public var Chat_PinnedListPreview_UnpinAllMessages: String { return self._s[4447]! }
-    public var Wallpaper_ResetWallpapersInfo: String { return self._s[4448]! }
-    public var Conversation_TitleUnmute: String { return self._s[4449]! }
-    public var Group_Setup_TypeHeader: String { return self._s[4450]! }
+    public var Login_TermsOfServiceSignupDecline: String { return self._s[4626]! }
+    public var CheckoutInfo_ErrorCityInvalid: String { return self._s[4627]! }
+    public var VoiceOver_Chat_PlayHint: String { return self._s[4628]! }
+    public var ChatAdmins_AllMembersAreAdminsOffHelp: String { return self._s[4629]! }
+    public var CheckoutInfo_ShippingInfoTitle: String { return self._s[4631]! }
+    public var CreatePoll_Create: String { return self._s[4632]! }
+    public var ChatList_Search_FilterLinks: String { return self._s[4633]! }
+    public var Your_cards_number_is_invalid: String { return self._s[4634]! }
+    public var Month_ShortApril: String { return self._s[4635]! }
+    public var SocksProxySetup_UseForCalls: String { return self._s[4636]! }
+    public var Conversation_EditingCaptionPanelTitle: String { return self._s[4637]! }
+    public var SocksProxySetup_Status: String { return self._s[4638]! }
+    public var VoiceChat_UnmuteForMe: String { return self._s[4639]! }
+    public var ChannelInfo_DeleteGroupConfirmation: String { return self._s[4640]! }
+    public var ChatListFolder_CategoryBots: String { return self._s[4641]! }
+    public var Passport_FieldIdentitySelfieHelp: String { return self._s[4643]! }
+    public var GroupInfo_BroadcastListNamePlaceholder: String { return self._s[4644]! }
+    public var Chat_PinnedListPreview_UnpinAllMessages: String { return self._s[4645]! }
+    public var Wallpaper_ResetWallpapersInfo: String { return self._s[4646]! }
+    public var Conversation_TitleUnmute: String { return self._s[4647]! }
+    public var Group_Setup_TypeHeader: String { return self._s[4648]! }
     public func Conversation_ForwardTooltip_ManyChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4451]!, self._r[4451]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[4649]!, self._r[4649]!, [_0, _1])
     }
-    public var Stats_ViewsPerPost: String { return self._s[4452]! }
-    public var CheckoutInfo_ShippingInfoCountry: String { return self._s[4453]! }
-    public var Passport_Identity_TranslationHelp: String { return self._s[4454]! }
+    public var Stats_ViewsPerPost: String { return self._s[4650]! }
+    public var CheckoutInfo_ShippingInfoCountry: String { return self._s[4651]! }
+    public var Passport_Identity_TranslationHelp: String { return self._s[4652]! }
     public func PUSH_CHANNEL_MESSAGE_FWD(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4455]!, self._r[4455]!, [_1])
+        return formatWithArgumentRanges(self._s[4653]!, self._r[4653]!, [_1])
     }
-    public var GroupInfo_Administrators_Title: String { return self._s[4456]! }
+    public var GroupInfo_Administrators_Title: String { return self._s[4654]! }
     public func Channel_AdminLog_MessageRankName(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4457]!, self._r[4457]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4655]!, self._r[4655]!, [_1, _2])
     }
     public func PUSH_CHAT_MESSAGE_POLL(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4458]!, self._r[4458]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4656]!, self._r[4656]!, [_1, _2, _3])
     }
-    public var CheckoutInfo_ShippingInfoState: String { return self._s[4459]! }
-    public var Passport_Language_my: String { return self._s[4461]! }
-    public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[4462]! }
-    public var Map_PlacesNearby: String { return self._s[4463]! }
-    public var Channel_About_Help: String { return self._s[4464]! }
-    public var LogoutOptions_AddAccountTitle: String { return self._s[4465]! }
-    public var ChatSettings_AutomaticAudioDownload: String { return self._s[4466]! }
-    public var Channel_Username_Title: String { return self._s[4467]! }
-    public var Activity_RecordingVideoMessage: String { return self._s[4468]! }
+    public var CheckoutInfo_ShippingInfoState: String { return self._s[4657]! }
+    public var Passport_Language_my: String { return self._s[4659]! }
+    public var PrivacyLastSeenSettings_AlwaysShareWith_Title: String { return self._s[4660]! }
+    public var VoiceChat_Unpin: String { return self._s[4661]! }
+    public var Map_PlacesNearby: String { return self._s[4662]! }
+    public var Channel_About_Help: String { return self._s[4663]! }
+    public var LogoutOptions_AddAccountTitle: String { return self._s[4664]! }
+    public var ChatSettings_AutomaticAudioDownload: String { return self._s[4665]! }
+    public var Channel_Username_Title: String { return self._s[4666]! }
+    public var Activity_RecordingVideoMessage: String { return self._s[4667]! }
     public func StickerPackActionInfo_RemovedText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4469]!, self._r[4469]!, [_0])
+        return formatWithArgumentRanges(self._s[4668]!, self._r[4668]!, [_0])
     }
-    public var CheckoutInfo_ShippingInfoCity: String { return self._s[4470]! }
-    public var Passport_DiscardMessageDescription: String { return self._s[4471]! }
-    public var Conversation_LinkDialogOpen: String { return self._s[4472]! }
-    public var ChatList_Context_HideArchive: String { return self._s[4473]! }
+    public var CheckoutInfo_ShippingInfoCity: String { return self._s[4669]! }
+    public var Passport_DiscardMessageDescription: String { return self._s[4670]! }
+    public var Conversation_LinkDialogOpen: String { return self._s[4671]! }
+    public var ChatList_Context_HideArchive: String { return self._s[4672]! }
     public func Message_AuthorPinnedGame(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4474]!, self._r[4474]!, [_0])
+        return formatWithArgumentRanges(self._s[4673]!, self._r[4673]!, [_0])
     }
-    public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[4475]! }
-    public var Conversation_Admin: String { return self._s[4476]! }
-    public var DialogList_TabTitle: String { return self._s[4477]! }
+    public var Privacy_GroupsAndChannels_CustomShareHelp: String { return self._s[4674]! }
+    public var Conversation_Admin: String { return self._s[4675]! }
+    public var DialogList_TabTitle: String { return self._s[4676]! }
     public func PUSH_CHAT_ALBUM(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4478]!, self._r[4478]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4677]!, self._r[4677]!, [_1, _2])
     }
-    public var Notifications_PermissionsUnreachableText: String { return self._s[4479]! }
-    public var Passport_Identity_GenderMale: String { return self._s[4481]! }
+    public var Notifications_PermissionsUnreachableText: String { return self._s[4678]! }
+    public var Passport_Identity_GenderMale: String { return self._s[4680]! }
     public func VoiceChat_EditTitleSuccess(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4483]!, self._r[4483]!, [_0])
+        return formatWithArgumentRanges(self._s[4682]!, self._r[4682]!, [_0])
     }
-    public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4484]! }
-    public var PhoneNumberHelp_Alert: String { return self._s[4485]! }
-    public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[4486]! }
-    public var Notifications_InAppNotifications: String { return self._s[4487]! }
+    public var SettingsSearch_Synonyms_Privacy_BlockedUsers: String { return self._s[4683]! }
+    public var PhoneNumberHelp_Alert: String { return self._s[4684]! }
+    public var EnterPasscode_EnterNewPasscodeChange: String { return self._s[4685]! }
+    public var Notifications_InAppNotifications: String { return self._s[4686]! }
     public func Update_AppVersion(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4488]!, self._r[4488]!, [_0])
-    }
-    public var Notification_VideoCallOutgoing: String { return self._s[4489]! }
-    public var Login_InvalidCodeError: String { return self._s[4490]! }
-    public var Conversation_PrivateChannelTimeLimitedAlertJoin: String { return self._s[4491]! }
-    public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4493]!, self._r[4493]!, [_0])
-    }
-    public var Conversation_InputTextCaptionPlaceholder: String { return self._s[4494]! }
-    public var ReportPeer_Report: String { return self._s[4495]! }
-    public var Camera_FlashOff: String { return self._s[4498]! }
-    public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[4501]! }
-    public var PrivacyPolicy_DeclineTitle: String { return self._s[4504]! }
-    public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[4505]! }
-    public var Passport_FieldEmail: String { return self._s[4506]! }
-    public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4507]!, self._r[4507]!, [_1])
-    }
-    public var Notifications_ExceptionsResetToDefaults: String { return self._s[4508]! }
-    public var PeerInfo_PaneVoiceAndVideo: String { return self._s[4509]! }
-    public var Group_OwnershipTransfer_Title: String { return self._s[4510]! }
-    public var Conversation_DefaultRestrictedInline: String { return self._s[4511]! }
-    public var Login_PhoneNumberHelp: String { return self._s[4513]! }
-    public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[4514]! }
-    public var Conversation_PinnedQuiz: String { return self._s[4515]! }
-    public var CreateGroup_SoftUserLimitAlert: String { return self._s[4516]! }
-    public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[4517]! }
-    public var Group_MessagePhotoUpdated: String { return self._s[4518]! }
-    public var LoginPassword_PasswordPlaceholder: String { return self._s[4519]! }
-    public var BroadcastGroups_ConfirmationAlert_Text: String { return self._s[4520]! }
-    public var Passport_Identity_Translations: String { return self._s[4522]! }
-    public var ChatAdmins_AllMembersAreAdmins: String { return self._s[4523]! }
-    public var ChannelInfo_DeleteChannel: String { return self._s[4525]! }
-    public var PasscodeSettings_HelpBottom: String { return self._s[4526]! }
-    public var Channel_Members_AddMembers: String { return self._s[4527]! }
-    public var AutoDownloadSettings_LastDelimeter: String { return self._s[4528]! }
-    public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[4530]! }
-    public var Conversation_HoldForAudio: String { return self._s[4531]! }
-    public var Media_LimitedAccessChangeSettings: String { return self._s[4533]! }
-    public var Watch_LastSeen_Lately: String { return self._s[4534]! }
-    public var ChatList_Context_MarkAsRead: String { return self._s[4535]! }
-    public var Conversation_PinnedMessage: String { return self._s[4536]! }
-    public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[4537]! }
-    public var VoiceChat_StopRecordingStop: String { return self._s[4539]! }
-    public var Passport_UpdateRequiredError: String { return self._s[4540]! }
-    public var PrivacySettings_Passcode: String { return self._s[4541]! }
-    public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4542]!, self._r[4542]!, [_0])
-    }
-    public var AutoNightTheme_NotAvailable: String { return self._s[4543]! }
-    public var Conversation_PressVolumeButtonForSound: String { return self._s[4544]! }
-    public var VoiceOver_Common_On: String { return self._s[4545]! }
-    public var LoginPassword_InvalidPasswordError: String { return self._s[4546]! }
-    public var ChatListFolder_IncludedSectionHeader: String { return self._s[4547]! }
-    public var Channel_SignMessages_Help: String { return self._s[4548]! }
-    public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[4549]! }
-    public var Conversation_TitleNoComments: String { return self._s[4550]! }
-    public var MediaPicker_LivePhotoDescription: String { return self._s[4551]! }
-    public var GroupInfo_Permissions: String { return self._s[4552]! }
-    public var GroupPermission_NoSendLinks: String { return self._s[4555]! }
-    public var Passport_Identity_ResidenceCountry: String { return self._s[4556]! }
-    public var Appearance_ThemeCarouselNightBlue: String { return self._s[4558]! }
-    public var ChatList_ArchiveAction: String { return self._s[4559]! }
-    public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4560]!, self._r[4560]!, [_0])
-    }
-    public var GroupInfo_GroupHistory: String { return self._s[4561]! }
-    public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4563]!, self._r[4563]!, [_0])
-    }
-    public var Privacy_Forwards_LinkIfAllowed: String { return self._s[4565]! }
-    public var Channel_Info_Banned: String { return self._s[4566]! }
-    public var Paint_RecentStickers: String { return self._s[4567]! }
-    public var VoiceOver_MessageContextSend: String { return self._s[4568]! }
-    public var Group_ErrorNotMutualContact: String { return self._s[4569]! }
-    public var ReportPeer_ReasonOther: String { return self._s[4571]! }
-    public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[4572]! }
-    public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[4574]! }
-    public var KeyCommand_Find: String { return self._s[4575]! }
-    public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4576]!, self._r[4576]!, [_0])
-    }
-    public var ChatList_Context_Unmute: String { return self._s[4577]! }
-    public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[4578]! }
-    public var Stickers_GroupStickersHelp: String { return self._s[4579]! }
-    public var Checkout_Title: String { return self._s[4580]! }
-    public var Activity_RecordingAudio: String { return self._s[4581]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[4582]! }
-    public var BlockedUsers_BlockTitle: String { return self._s[4583]! }
-    public var DialogList_SavedMessagesHelp: String { return self._s[4585]! }
-    public var Calls_All: String { return self._s[4586]! }
-    public var Settings_FAQ_Button: String { return self._s[4588]! }
-    public var Conversation_Dice_u1F3B0: String { return self._s[4590]! }
-    public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4591]!, self._r[4591]!, [_0])
-    }
-    public var Conversation_ReportGroupLocation: String { return self._s[4592]! }
-    public var Passport_Scans_Upload: String { return self._s[4593]! }
-    public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[4595]! }
-    public var ChatList_UnarchiveAction: String { return self._s[4596]! }
-    public var Stats_GroupTopInviter_History: String { return self._s[4597]! }
-    public var GroupInfo_Permissions_Title: String { return self._s[4598]! }
-    public var VoiceChat_CreateNewVoiceChatStart: String { return self._s[4599]! }
-    public var Passport_Language_el: String { return self._s[4600]! }
-    public var Channel_DiscussionMessageUnavailable: String { return self._s[4601]! }
-    public var GroupInfo_ActionPromote: String { return self._s[4602]! }
-    public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[4603]! }
-    public var Media_LimitedAccessSelectMore: String { return self._s[4604]! }
-    public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4605]!, self._r[4605]!, [_0])
-    }
-    public var VoiceOver_Chat_Reply: String { return self._s[4606]! }
-    public var Month_GenMay: String { return self._s[4607]! }
-    public var DialogList_DeleteBotConversationConfirmation: String { return self._s[4608]! }
-    public var Chat_PsaTooltip_covid: String { return self._s[4609]! }
-    public var Watch_Suggestion_CantTalk: String { return self._s[4610]! }
-    public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[4611]! }
-    public var AppUpgrade_Running: String { return self._s[4612]! }
-    public var PasscodeSettings_UnlockWithFaceId: String { return self._s[4615]! }
-    public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[4616]! }
-    public var SharedMedia_EmptyText: String { return self._s[4617]! }
-    public var Passport_Address_EditResidentialAddress: String { return self._s[4618]! }
-    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[4619]! }
-    public var Message_PinnedGame: String { return self._s[4620]! }
-    public var KeyCommand_SearchInChat: String { return self._s[4621]! }
-    public var Appearance_ThemeCarouselNewNight: String { return self._s[4622]! }
-    public var ChatList_Search_FilterMedia: String { return self._s[4623]! }
-    public var Message_PinnedAudioMessage: String { return self._s[4624]! }
-    public var ChannelInfo_ConfirmLeave: String { return self._s[4626]! }
-    public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4627]!, self._r[4627]!, [_1, _2])
-    }
-    public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4628]! }
-    public var InviteLink_Create: String { return self._s[4629]! }
-    public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4630]!, self._r[4630]!, [_0])
-    }
-    public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4631]!, self._r[4631]!, [_0])
-    }
-    public var Settings_AddAccount: String { return self._s[4632]! }
-    public var Channel_AdminLog_CanDeleteMessages: String { return self._s[4633]! }
-    public var Conversation_DiscardVoiceMessageTitle: String { return self._s[4634]! }
-    public var Channel_JoinChannel: String { return self._s[4635]! }
-    public var Watch_UserInfo_Unblock: String { return self._s[4636]! }
-    public var PhoneLabel_Title: String { return self._s[4637]! }
-    public var VoiceChat_EditPermissions: String { return self._s[4639]! }
-    public var Group_Setup_HistoryHiddenHelp: String { return self._s[4640]! }
-    public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[4641]! }
-    public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4642]!, self._r[4642]!, [_1, _2, _3, _4, _5, _6])
-    }
-    public var Channel_AddBotErrorHaveRights: String { return self._s[4643]! }
-    public var ChatList_TabIconFoldersTooltipNonEmptyFolders: String { return self._s[4644]! }
-    public var DialogList_EncryptionProcessing: String { return self._s[4645]! }
-    public var ChatList_Search_FilterChats: String { return self._s[4646]! }
-    public var WatchRemote_NotificationText: String { return self._s[4647]! }
-    public var EditTheme_ChangeColors: String { return self._s[4648]! }
-    public var GroupRemoved_ViewUserInfo: String { return self._s[4649]! }
-    public var CallSettings_OnMobile: String { return self._s[4651]! }
-    public var Month_ShortFebruary: String { return self._s[4653]! }
-    public var VoiceOver_MessageContextReply: String { return self._s[4654]! }
-    public var AutoremoveSetup_TimerValueNever: String { return self._s[4655]! }
-    public var Group_Location_ChangeLocation: String { return self._s[4657]! }
-    public func PUSH_VIDEO_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4658]!, self._r[4658]!, [_1])
-    }
-    public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[4659]! }
-    public var VoiceOver_Media_PlaybackStop: String { return self._s[4660]! }
-    public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[4661]! }
-    public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4663]!, self._r[4663]!, [_0])
-    }
-    public var PhotoEditor_WarmthTool: String { return self._s[4664]! }
-    public var Login_InfoAvatarPhoto: String { return self._s[4665]! }
-    public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[4666]! }
-    public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[4667]! }
-    public var Map_PlacesInThisArea: String { return self._s[4668]! }
-    public var VoiceOver_Chat_ContactEmail: String { return self._s[4669]! }
-    public var Notifications_InAppNotificationsSounds: String { return self._s[4670]! }
-    public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4671]!, self._r[4671]!, [_1])
-    }
-    public var PeerInfo_ReportProfileVideo: String { return self._s[4672]! }
-    public var ShareMenu_Send: String { return self._s[4673]! }
-    public var Username_InvalidStartsWithNumber: String { return self._s[4674]! }
-    public func Channel_AdminLog_StartedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4675]!, self._r[4675]!, [_1])
-    }
-    public var Appearance_AppIconClassicX: String { return self._s[4676]! }
-    public var Report_Report: String { return self._s[4677]! }
-    public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4678]!, self._r[4678]!, [_1])
-    }
-    public var Conversation_StopPoll: String { return self._s[4679]! }
-    public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[4681]! }
-    public var Passport_Identity_EditIdentityCard: String { return self._s[4682]! }
-    public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[4683]! }
-    public var Conversation_Timer_Title: String { return self._s[4684]! }
-    public var Common_Next: String { return self._s[4685]! }
-    public var Notification_Exceptions_NewException: String { return self._s[4686]! }
-    public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
         return formatWithArgumentRanges(self._s[4687]!, self._r[4687]!, [_0])
     }
-    public var AccessDenied_CallMicrophone: String { return self._s[4688]! }
-    public var VoiceChat_UnmutePeer: String { return self._s[4689]! }
-    public var ChatImportActivity_Retry: String { return self._s[4690]! }
-    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[4691]! }
-    public var ChangePhoneNumberCode_Help: String { return self._s[4692]! }
-    public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[4693]! }
-    public var Channel_AdminLogFilter_EventsLeaving: String { return self._s[4694]! }
-    public var BlockedUsers_LeavePrefix: String { return self._s[4695]! }
+    public var Notification_VideoCallOutgoing: String { return self._s[4688]! }
+    public var Login_InvalidCodeError: String { return self._s[4689]! }
+    public var Conversation_PrivateChannelTimeLimitedAlertJoin: String { return self._s[4690]! }
+    public func LastSeen_TodayAt(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4692]!, self._r[4692]!, [_0])
+    }
+    public var Conversation_InputTextCaptionPlaceholder: String { return self._s[4693]! }
+    public var ReportPeer_Report: String { return self._s[4694]! }
+    public var Camera_FlashOff: String { return self._s[4697]! }
+    public var Conversation_InputTextBroadcastPlaceholder: String { return self._s[4700]! }
+    public func Notification_VoiceChatScheduledTomorrow(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4701]!, self._r[4701]!, [_1, _2])
+    }
+    public var PrivacyPolicy_DeclineTitle: String { return self._s[4704]! }
+    public var SettingsSearch_Synonyms_Privacy_PasscodeAndTouchId: String { return self._s[4705]! }
+    public var Passport_FieldEmail: String { return self._s[4706]! }
+    public func Channel_AdminLog_MessageKickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4707]!, self._r[4707]!, [_1])
+    }
+    public var Notifications_ExceptionsResetToDefaults: String { return self._s[4708]! }
+    public var PeerInfo_PaneVoiceAndVideo: String { return self._s[4709]! }
+    public var Group_OwnershipTransfer_Title: String { return self._s[4710]! }
+    public var Conversation_DefaultRestrictedInline: String { return self._s[4711]! }
+    public var Login_PhoneNumberHelp: String { return self._s[4713]! }
+    public var Channel_AdminLogFilter_EventsNewMembers: String { return self._s[4714]! }
+    public var Conversation_PinnedQuiz: String { return self._s[4715]! }
+    public var CreateGroup_SoftUserLimitAlert: String { return self._s[4716]! }
+    public var Login_PhoneNumberAlreadyAuthorizedSwitch: String { return self._s[4717]! }
+    public var Group_MessagePhotoUpdated: String { return self._s[4718]! }
+    public var LoginPassword_PasswordPlaceholder: String { return self._s[4719]! }
+    public var BroadcastGroups_ConfirmationAlert_Text: String { return self._s[4720]! }
+    public var Passport_Identity_Translations: String { return self._s[4722]! }
+    public var ChatAdmins_AllMembersAreAdmins: String { return self._s[4723]! }
+    public var ChannelInfo_DeleteChannel: String { return self._s[4725]! }
+    public var PasscodeSettings_HelpBottom: String { return self._s[4726]! }
+    public var Channel_Members_AddMembers: String { return self._s[4727]! }
+    public var AutoDownloadSettings_LastDelimeter: String { return self._s[4728]! }
+    public var Notification_Exceptions_DeleteAllConfirmation: String { return self._s[4730]! }
+    public var Conversation_HoldForAudio: String { return self._s[4731]! }
+    public var Media_LimitedAccessChangeSettings: String { return self._s[4733]! }
+    public var Watch_LastSeen_Lately: String { return self._s[4734]! }
+    public var ChatList_Context_MarkAsRead: String { return self._s[4735]! }
+    public var Conversation_PinnedMessage: String { return self._s[4736]! }
+    public var SettingsSearch_Synonyms_Appearance_ColorTheme: String { return self._s[4737]! }
+    public var VoiceChat_StopRecordingStop: String { return self._s[4739]! }
+    public var Passport_UpdateRequiredError: String { return self._s[4740]! }
+    public var PrivacySettings_Passcode: String { return self._s[4741]! }
+    public func Call_EmojiDescription(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4742]!, self._r[4742]!, [_0])
+    }
+    public var AutoNightTheme_NotAvailable: String { return self._s[4743]! }
+    public var Conversation_PressVolumeButtonForSound: String { return self._s[4744]! }
+    public var VoiceOver_Common_On: String { return self._s[4745]! }
+    public var LoginPassword_InvalidPasswordError: String { return self._s[4746]! }
+    public var ChatListFolder_IncludedSectionHeader: String { return self._s[4747]! }
+    public var Channel_SignMessages_Help: String { return self._s[4748]! }
+    public var ChatList_DeleteForEveryoneConfirmationTitle: String { return self._s[4749]! }
+    public var Conversation_TitleNoComments: String { return self._s[4750]! }
+    public var MediaPicker_LivePhotoDescription: String { return self._s[4751]! }
+    public var GroupInfo_Permissions: String { return self._s[4752]! }
+    public var GroupPermission_NoSendLinks: String { return self._s[4755]! }
+    public func Conversation_ScheduledVoiceChatStartsTomorrow(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4756]!, self._r[4756]!, [_0])
+    }
+    public var Passport_Identity_ResidenceCountry: String { return self._s[4757]! }
+    public var Appearance_ThemeCarouselNightBlue: String { return self._s[4759]! }
+    public var ChatList_ArchiveAction: String { return self._s[4760]! }
+    public func Channel_AdminLog_DisabledSlowmode(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4761]!, self._r[4761]!, [_0])
+    }
+    public var GroupInfo_GroupHistory: String { return self._s[4762]! }
+    public func Channel_Management_ErrorNotMember(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4764]!, self._r[4764]!, [_0])
+    }
+    public var Privacy_Forwards_LinkIfAllowed: String { return self._s[4766]! }
+    public var Channel_Info_Banned: String { return self._s[4767]! }
+    public var Paint_RecentStickers: String { return self._s[4768]! }
+    public var VoiceOver_MessageContextSend: String { return self._s[4769]! }
+    public var Group_ErrorNotMutualContact: String { return self._s[4770]! }
+    public var ReportPeer_ReasonOther: String { return self._s[4772]! }
+    public var Channel_BanUser_PermissionChangeGroupInfo: String { return self._s[4773]! }
+    public var SocksProxySetup_ShareQRCodeInfo: String { return self._s[4775]! }
+    public var KeyCommand_Find: String { return self._s[4776]! }
+    public func Channel_MessageTitleUpdated(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4777]!, self._r[4777]!, [_0])
+    }
+    public var ChatList_Context_Unmute: String { return self._s[4778]! }
+    public var Chat_SlowmodeAttachmentLimitReached: String { return self._s[4779]! }
+    public var TwoFactorSetup_ResetDone_Action: String { return self._s[4780]! }
+    public var Stickers_GroupStickersHelp: String { return self._s[4781]! }
+    public var Checkout_Title: String { return self._s[4782]! }
+    public var Activity_RecordingAudio: String { return self._s[4783]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsPreview: String { return self._s[4784]! }
+    public var BlockedUsers_BlockTitle: String { return self._s[4785]! }
+    public var DialogList_SavedMessagesHelp: String { return self._s[4787]! }
+    public var Calls_All: String { return self._s[4788]! }
+    public var Settings_FAQ_Button: String { return self._s[4790]! }
+    public var Conversation_Dice_u1F3B0: String { return self._s[4792]! }
+    public func Time_MonthOfYear_m5(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4793]!, self._r[4793]!, [_0])
+    }
+    public var Conversation_ReportGroupLocation: String { return self._s[4794]! }
+    public var Passport_Scans_Upload: String { return self._s[4795]! }
+    public var Channel_EditAdmin_PermissionPinMessages: String { return self._s[4797]! }
+    public var ChatList_UnarchiveAction: String { return self._s[4798]! }
+    public var Stats_GroupTopInviter_History: String { return self._s[4799]! }
+    public var GroupInfo_Permissions_Title: String { return self._s[4800]! }
+    public var VoiceChat_CreateNewVoiceChatStart: String { return self._s[4801]! }
+    public var Passport_Language_el: String { return self._s[4802]! }
+    public var Channel_DiscussionMessageUnavailable: String { return self._s[4803]! }
+    public func UserInfo_ContactForwardTooltip_TwoChats_One(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4804]!, self._r[4804]!, [_0, _1])
+    }
+    public var GroupInfo_ActionPromote: String { return self._s[4805]! }
+    public var Group_OwnershipTransfer_ErrorLocatedGroupsTooMuch: String { return self._s[4806]! }
+    public var Media_LimitedAccessSelectMore: String { return self._s[4807]! }
+    public func TwoStepAuth_PendingEmailHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4808]!, self._r[4808]!, [_0])
+    }
+    public var VoiceOver_Chat_Reply: String { return self._s[4809]! }
+    public var Month_GenMay: String { return self._s[4810]! }
+    public var DialogList_DeleteBotConversationConfirmation: String { return self._s[4811]! }
+    public var Chat_PsaTooltip_covid: String { return self._s[4812]! }
+    public var Watch_Suggestion_CantTalk: String { return self._s[4813]! }
+    public var Privacy_GroupsAndChannels_NeverAllow_Title: String { return self._s[4814]! }
+    public var AppUpgrade_Running: String { return self._s[4815]! }
+    public var PasscodeSettings_UnlockWithFaceId: String { return self._s[4818]! }
+    public var Notification_Exceptions_PreviewAlwaysOff: String { return self._s[4819]! }
+    public var SharedMedia_EmptyText: String { return self._s[4820]! }
+    public var Passport_Address_EditResidentialAddress: String { return self._s[4821]! }
+    public var SettingsSearch_Synonyms_Notifications_GroupNotificationsAlert: String { return self._s[4822]! }
+    public var Message_PinnedGame: String { return self._s[4823]! }
+    public var KeyCommand_SearchInChat: String { return self._s[4824]! }
+    public var Appearance_ThemeCarouselNewNight: String { return self._s[4825]! }
+    public var ChatList_Search_FilterMedia: String { return self._s[4826]! }
+    public var Message_PinnedAudioMessage: String { return self._s[4827]! }
+    public var ChannelInfo_ConfirmLeave: String { return self._s[4829]! }
+    public func Channel_AdminLog_MessagePromotedNameUsername(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4830]!, self._r[4830]!, [_1, _2])
+    }
+    public var SocksProxySetup_ProxyStatusUnavailable: String { return self._s[4831]! }
+    public var InviteLink_Create: String { return self._s[4832]! }
+    public func Passport_Email_CodeHelp(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4833]!, self._r[4833]!, [_0])
+    }
+    public func Message_PinnedTextMessage(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4834]!, self._r[4834]!, [_0])
+    }
+    public var Settings_AddAccount: String { return self._s[4835]! }
+    public var Channel_AdminLog_CanDeleteMessages: String { return self._s[4836]! }
+    public var Conversation_DiscardVoiceMessageTitle: String { return self._s[4837]! }
+    public var Channel_JoinChannel: String { return self._s[4838]! }
+    public var Watch_UserInfo_Unblock: String { return self._s[4839]! }
+    public var PhoneLabel_Title: String { return self._s[4840]! }
+    public var VoiceChat_EditPermissions: String { return self._s[4842]! }
+    public var Group_Setup_HistoryHiddenHelp: String { return self._s[4843]! }
+    public var Privacy_ProfilePhoto_AlwaysShareWith_Title: String { return self._s[4844]! }
+    public func Login_PhoneGenericEmailBody(_ _1: String, _ _2: String, _ _3: String, _ _4: String, _ _5: String, _ _6: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4845]!, self._r[4845]!, [_1, _2, _3, _4, _5, _6])
+    }
+    public var Channel_AddBotErrorHaveRights: String { return self._s[4846]! }
+    public var ChatList_TabIconFoldersTooltipNonEmptyFolders: String { return self._s[4847]! }
+    public var DialogList_EncryptionProcessing: String { return self._s[4848]! }
+    public var ChatList_Search_FilterChats: String { return self._s[4849]! }
+    public var WatchRemote_NotificationText: String { return self._s[4850]! }
+    public var EditTheme_ChangeColors: String { return self._s[4852]! }
+    public var GroupRemoved_ViewUserInfo: String { return self._s[4853]! }
+    public var CallSettings_OnMobile: String { return self._s[4855]! }
+    public var Month_ShortFebruary: String { return self._s[4857]! }
+    public var VoiceOver_MessageContextReply: String { return self._s[4858]! }
+    public var AutoremoveSetup_TimerValueNever: String { return self._s[4859]! }
+    public var Group_Location_ChangeLocation: String { return self._s[4861]! }
+    public func PUSH_VIDEO_CALL_REQUEST(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4862]!, self._r[4862]!, [_1])
+    }
+    public var Passport_Address_TypeBankStatementUploadScan: String { return self._s[4863]! }
+    public var VoiceOver_Media_PlaybackStop: String { return self._s[4864]! }
+    public var SettingsSearch_Synonyms_Data_SaveIncomingPhotos: String { return self._s[4865]! }
+    public func Channel_AdminLog_MessageRestrictedUntil(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4867]!, self._r[4867]!, [_0])
+    }
+    public var PhotoEditor_WarmthTool: String { return self._s[4868]! }
+    public var Login_InfoAvatarPhoto: String { return self._s[4869]! }
+    public var Notification_Exceptions_NewException_MessagePreviewHeader: String { return self._s[4870]! }
+    public var Permissions_CellularDataAllowInSettings_v0: String { return self._s[4871]! }
+    public var Map_PlacesInThisArea: String { return self._s[4872]! }
+    public var VoiceOver_Chat_ContactEmail: String { return self._s[4873]! }
+    public var Notifications_InAppNotificationsSounds: String { return self._s[4874]! }
+    public func PUSH_PINNED_NOTEXT(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4875]!, self._r[4875]!, [_1])
+    }
+    public var PeerInfo_ReportProfileVideo: String { return self._s[4876]! }
+    public var ShareMenu_Send: String { return self._s[4877]! }
+    public var Username_InvalidStartsWithNumber: String { return self._s[4878]! }
+    public func Channel_AdminLog_StartedVoiceChat(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4879]!, self._r[4879]!, [_1])
+    }
+    public var Appearance_AppIconClassicX: String { return self._s[4880]! }
+    public var Report_Report: String { return self._s[4881]! }
+    public func PUSH_CHANNEL_MESSAGE_ROUND(_ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4882]!, self._r[4882]!, [_1])
+    }
+    public var Conversation_StopPoll: String { return self._s[4883]! }
+    public var InfoPlist_NSLocationAlwaysUsageDescription: String { return self._s[4885]! }
+    public var Passport_Identity_EditIdentityCard: String { return self._s[4886]! }
+    public var Appearance_ThemePreview_ChatList_3_Name: String { return self._s[4887]! }
+    public var Conversation_Timer_Title: String { return self._s[4888]! }
+    public var Common_Next: String { return self._s[4889]! }
+    public var Notification_Exceptions_NewException: String { return self._s[4890]! }
+    public func Generic_OpenHiddenLinkAlert(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4891]!, self._r[4891]!, [_0])
+    }
+    public var AccessDenied_CallMicrophone: String { return self._s[4892]! }
+    public var VoiceChat_UnmutePeer: String { return self._s[4893]! }
+    public var ChatImportActivity_Retry: String { return self._s[4894]! }
+    public var SettingsSearch_Synonyms_Data_AutoDownloadUsingCellular: String { return self._s[4895]! }
+    public var ChangePhoneNumberCode_Help: String { return self._s[4896]! }
+    public var Passport_Identity_OneOfTypeIdentityCard: String { return self._s[4897]! }
+    public var Channel_AdminLogFilter_EventsLeaving: String { return self._s[4898]! }
+    public var BlockedUsers_LeavePrefix: String { return self._s[4899]! }
     public func Passport_RequestHeader(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4696]!, self._r[4696]!, [_0])
+        return formatWithArgumentRanges(self._s[4900]!, self._r[4900]!, [_0])
     }
-    public var Group_About_Help: String { return self._s[4697]! }
-    public var TwoStepAuth_ChangePasswordDescription: String { return self._s[4698]! }
-    public var Tour_Title3: String { return self._s[4699]! }
-    public var Watch_Conversation_Unblock: String { return self._s[4700]! }
-    public var Watch_UserInfo_Block: String { return self._s[4701]! }
-    public var Notifications_ChannelNotificationsAlert: String { return self._s[4702]! }
-    public var TwoFactorSetup_Hint_Action: String { return self._s[4703]! }
-    public var IntentsSettings_SuggestedChatsInfo: String { return self._s[4704]! }
-    public var TextFormat_AddLinkTitle: String { return self._s[4705]! }
-    public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[4706]! }
-    public var TwoStepAuth_EnterPasswordTitle: String { return self._s[4707]! }
-    public var FastTwoStepSetup_PasswordSection: String { return self._s[4709]! }
-    public var Compose_ChannelMembers: String { return self._s[4710]! }
-    public var Conversation_ForwardTitle: String { return self._s[4711]! }
-    public var Conversation_PinnedPoll: String { return self._s[4714]! }
+    public var Group_About_Help: String { return self._s[4901]! }
+    public var TwoStepAuth_ChangePasswordDescription: String { return self._s[4902]! }
+    public var Tour_Title3: String { return self._s[4903]! }
+    public var Watch_Conversation_Unblock: String { return self._s[4904]! }
+    public var Watch_UserInfo_Block: String { return self._s[4905]! }
+    public var Notifications_ChannelNotificationsAlert: String { return self._s[4906]! }
+    public var TwoFactorSetup_Hint_Action: String { return self._s[4907]! }
+    public var IntentsSettings_SuggestedChatsInfo: String { return self._s[4908]! }
+    public var TextFormat_AddLinkTitle: String { return self._s[4909]! }
+    public var GroupInfo_InviteLink_RevokeAlert_Revoke: String { return self._s[4910]! }
+    public func Notification_VoiceChatScheduled(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4911]!, self._r[4911]!, [_1, _2])
+    }
+    public var TwoStepAuth_EnterPasswordTitle: String { return self._s[4912]! }
+    public var FastTwoStepSetup_PasswordSection: String { return self._s[4914]! }
+    public var Compose_ChannelMembers: String { return self._s[4915]! }
+    public var Conversation_ForwardTitle: String { return self._s[4916]! }
+    public var Conversation_PinnedPoll: String { return self._s[4919]! }
     public func VoiceOver_Chat_AnonymousPollFrom(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4715]!, self._r[4715]!, [_0])
+        return formatWithArgumentRanges(self._s[4920]!, self._r[4920]!, [_0])
     }
-    public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4716]! }
-    public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4717]! }
-    public var Stats_Overview: String { return self._s[4718]! }
-    public var Map_HomeAndWorkTitle: String { return self._s[4719]! }
+    public var SettingsSearch_Synonyms_EditProfile_AddAccount: String { return self._s[4921]! }
+    public var Conversation_ContextMenuStickerPackAdd: String { return self._s[4923]! }
+    public var Stats_Overview: String { return self._s[4924]! }
+    public var Map_HomeAndWorkTitle: String { return self._s[4925]! }
     public func Time_PreciseDate_m4(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4720]!, self._r[4720]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4926]!, self._r[4926]!, [_1, _2, _3])
     }
-    public var Passport_Address_CityPlaceholder: String { return self._s[4721]! }
-    public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[4722]! }
-    public var Privacy_PhoneNumber: String { return self._s[4723]! }
-    public var ChatList_Search_FilterFiles: String { return self._s[4724]! }
-    public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[4725]! }
-    public var ChannelIntro_CreateChannel: String { return self._s[4726]! }
-    public var Conversation_InputTextAnonymousPlaceholder: String { return self._s[4727]! }
+    public var Passport_Address_CityPlaceholder: String { return self._s[4927]! }
+    public var InfoPlist_NSLocationAlwaysAndWhenInUseUsageDescription: String { return self._s[4928]! }
+    public var Privacy_PhoneNumber: String { return self._s[4929]! }
+    public var ChatList_Search_FilterFiles: String { return self._s[4930]! }
+    public var ChatList_DeleteForEveryoneConfirmationAction: String { return self._s[4931]! }
+    public var ChannelIntro_CreateChannel: String { return self._s[4932]! }
+    public var Conversation_InputTextAnonymousPlaceholder: String { return self._s[4933]! }
     public func Login_EmailCodeBody(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4728]!, self._r[4728]!, [_0])
+        return formatWithArgumentRanges(self._s[4934]!, self._r[4934]!, [_0])
     }
-    public var Weekday_ShortMonday: String { return self._s[4729]! }
-    public var Passport_Language_ar: String { return self._s[4731]! }
-    public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[4732]! }
-    public var TwoFactorSetup_Done_Title: String { return self._s[4733]! }
-    public var Calls_RatingFeedback: String { return self._s[4734]! }
-    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[4735]! }
-    public var AutoDownloadSettings_ResetSettings: String { return self._s[4738]! }
+    public var Weekday_ShortMonday: String { return self._s[4935]! }
+    public var Passport_Language_ar: String { return self._s[4937]! }
+    public var SettingsSearch_Synonyms_EditProfile_Title: String { return self._s[4938]! }
+    public var TwoFactorSetup_Done_Title: String { return self._s[4939]! }
+    public var Calls_RatingFeedback: String { return self._s[4940]! }
+    public var SettingsSearch_Synonyms_Notifications_ChannelNotificationsPreview: String { return self._s[4941]! }
+    public var AutoDownloadSettings_ResetSettings: String { return self._s[4944]! }
     public func VoiceOver_SelfDestructTimerOn(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4739]!, self._r[4739]!, [_0])
+        return formatWithArgumentRanges(self._s[4945]!, self._r[4945]!, [_0])
     }
-    public var Watch_Compose_Send: String { return self._s[4740]! }
-    public var PasscodeSettings_ChangePasscode: String { return self._s[4741]! }
-    public var WebSearch_RecentSectionClear: String { return self._s[4742]! }
+    public var Watch_Compose_Send: String { return self._s[4946]! }
+    public var PasscodeSettings_ChangePasscode: String { return self._s[4947]! }
+    public var WebSearch_RecentSectionClear: String { return self._s[4948]! }
     public func Contacts_AccessDeniedHelpPortrait(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4743]!, self._r[4743]!, [_0])
+        return formatWithArgumentRanges(self._s[4949]!, self._r[4949]!, [_0])
     }
-    public var WallpaperSearch_ColorTeal: String { return self._s[4744]! }
-    public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[4745]! }
-    public var Permissions_ContactsTitle_v0: String { return self._s[4746]! }
-    public var Checkout_PasswordEntry_Pay: String { return self._s[4748]! }
-    public var Settings_SavedMessages: String { return self._s[4749]! }
-    public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[4750]! }
-    public var Month_ShortMarch: String { return self._s[4751]! }
-    public var Message_Location: String { return self._s[4752]! }
+    public var WallpaperSearch_ColorTeal: String { return self._s[4950]! }
+    public var Wallpaper_SetCustomBackgroundInfo: String { return self._s[4951]! }
+    public var Permissions_ContactsTitle_v0: String { return self._s[4952]! }
+    public var Checkout_PasswordEntry_Pay: String { return self._s[4954]! }
+    public var Settings_SavedMessages: String { return self._s[4955]! }
+    public var TwoStepAuth_ReEnterPasswordDescription: String { return self._s[4956]! }
+    public var Month_ShortMarch: String { return self._s[4957]! }
+    public var Message_Location: String { return self._s[4958]! }
     public func PUSH_MESSAGE_GIF(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4753]!, self._r[4753]!, [_1])
+        return formatWithArgumentRanges(self._s[4959]!, self._r[4959]!, [_1])
     }
     public func Channel_AdminLog_MessageRemovedAdminName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4754]!, self._r[4754]!, [_1])
+        return formatWithArgumentRanges(self._s[4960]!, self._r[4960]!, [_1])
     }
     public func Notification_CallTimeFormat(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4755]!, self._r[4755]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4961]!, self._r[4961]!, [_1, _2])
     }
-    public var VoiceOver_Chat_VoiceMessage: String { return self._s[4757]! }
+    public var VoiceOver_Chat_VoiceMessage: String { return self._s[4963]! }
     public func Channel_AdminLog_MessageChangedUnlinkedChannel(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4758]!, self._r[4758]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4964]!, self._r[4964]!, [_1, _2])
     }
-    public var GroupPermission_NoSendMedia: String { return self._s[4759]! }
-    public var Conversation_ClousStorageInfo_Description2: String { return self._s[4760]! }
-    public var SharedMedia_CategoryDocs: String { return self._s[4761]! }
-    public var Appearance_RemoveThemeConfirmation: String { return self._s[4762]! }
-    public var Paint_Framed: String { return self._s[4763]! }
-    public var Channel_Setup_LinkTypePublic: String { return self._s[4764]! }
-    public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[4765]! }
-    public var Passport_Identity_DoesNotExpire: String { return self._s[4766]! }
+    public var GroupPermission_NoSendMedia: String { return self._s[4965]! }
+    public var Conversation_ClousStorageInfo_Description2: String { return self._s[4966]! }
+    public var SharedMedia_CategoryDocs: String { return self._s[4967]! }
+    public var Appearance_RemoveThemeConfirmation: String { return self._s[4968]! }
+    public var Paint_Framed: String { return self._s[4969]! }
+    public var Channel_Setup_LinkTypePublic: String { return self._s[4970]! }
+    public var Channel_EditAdmin_PermissionAddAdmins: String { return self._s[4971]! }
+    public var Passport_Identity_DoesNotExpire: String { return self._s[4972]! }
     public func ChatImport_SelectionConfirmationUserWithTitle(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4767]!, self._r[4767]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4973]!, self._r[4973]!, [_1, _2])
     }
-    public var Channel_SignMessages: String { return self._s[4768]! }
-    public var Contacts_AccessDeniedHelpON: String { return self._s[4769]! }
-    public var Conversation_ContextMenuStickerPackInfo: String { return self._s[4770]! }
+    public var TwoStepAuth_RecoveryUnavailableResetAction: String { return self._s[4974]! }
+    public var Channel_SignMessages: String { return self._s[4975]! }
+    public var Contacts_AccessDeniedHelpON: String { return self._s[4976]! }
+    public var Conversation_ContextMenuStickerPackInfo: String { return self._s[4977]! }
     public func PUSH_CHAT_LEFT(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4771]!, self._r[4771]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[4978]!, self._r[4978]!, [_1, _2])
     }
-    public var InviteLink_Create_TimeLimitNoLimit: String { return self._s[4772]! }
-    public var GroupInfo_UpgradeButton: String { return self._s[4773]! }
-    public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[4774]! }
-    public var AutoDownloadSettings_Files: String { return self._s[4775]! }
+    public var InviteLink_Create_TimeLimitNoLimit: String { return self._s[4979]! }
+    public var ImportStickerPack_ChooseName: String { return self._s[4980]! }
+    public var GroupInfo_UpgradeButton: String { return self._s[4981]! }
+    public var Channel_EditAdmin_PermissionInviteMembers: String { return self._s[4982]! }
+    public func Conversation_ScheduledVoiceChatStartsTomorrowShort(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[4983]!, self._r[4983]!, [_0])
+    }
+    public var AutoDownloadSettings_Files: String { return self._s[4984]! }
     public func Notification_ChangedGroupName(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4776]!, self._r[4776]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[4985]!, self._r[4985]!, [_0, _1])
     }
-    public var Login_SendCodeViaSms: String { return self._s[4778]! }
-    public var Update_UpdateApp: String { return self._s[4779]! }
-    public var Channel_Setup_TypePublic: String { return self._s[4780]! }
-    public var Watch_Compose_CreateMessage: String { return self._s[4781]! }
+    public var Login_SendCodeViaSms: String { return self._s[4987]! }
+    public var Update_UpdateApp: String { return self._s[4988]! }
+    public var Channel_Setup_TypePublic: String { return self._s[4989]! }
+    public var Watch_Compose_CreateMessage: String { return self._s[4990]! }
     public func PUSH_CHAT_MESSAGE_VIDEOS(_ _1: String, _ _2: String, _ _3: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4782]!, self._r[4782]!, [_1, _2, _3])
+        return formatWithArgumentRanges(self._s[4991]!, self._r[4991]!, [_1, _2, _3])
     }
-    public var StickerPacksSettings_ManagingHelp: String { return self._s[4783]! }
-    public var VoiceOver_Chat_Video: String { return self._s[4784]! }
-    public var Forward_ChannelReadOnly: String { return self._s[4785]! }
-    public var StickerPack_HideStickers: String { return self._s[4786]! }
-    public var ChatListFolder_NameContacts: String { return self._s[4787]! }
-    public var Profile_BotInfo: String { return self._s[4788]! }
-    public var Document_TargetConfirmationFormat: String { return self._s[4789]! }
-    public var GroupInfo_InviteByLink: String { return self._s[4790]! }
-    public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[4791]! }
-    public var Watch_Stickers_RecentPlaceholder: String { return self._s[4792]! }
-    public var Broadcast_AdminLog_EmptyText: String { return self._s[4793]! }
-    public var Passport_NotLoggedInMessage: String { return self._s[4794]! }
-    public var Conversation_StopQuizConfirmation: String { return self._s[4795]! }
-    public var Checkout_PaymentMethod: String { return self._s[4796]! }
-    public var ChatList_ArchivedChatsTitle: String { return self._s[4800]! }
-    public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[4801]! }
-    public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[4802]! }
-    public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[4803]! }
-    public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[4804]! }
-    public var Conversation_GigagroupDescription: String { return self._s[4805]! }
-    public var Camera_Title: String { return self._s[4806]! }
-    public var Map_Directions: String { return self._s[4807]! }
-    public var Stats_MessagePublicForwardsTitle: String { return self._s[4809]! }
-    public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[4810]! }
-    public var Profile_EncryptionKey: String { return self._s[4811]! }
+    public var StickerPacksSettings_ManagingHelp: String { return self._s[4992]! }
+    public var VoiceOver_Chat_Video: String { return self._s[4993]! }
+    public var Forward_ChannelReadOnly: String { return self._s[4994]! }
+    public var StickerPack_HideStickers: String { return self._s[4995]! }
+    public var ChatListFolder_NameContacts: String { return self._s[4996]! }
+    public var Profile_BotInfo: String { return self._s[4997]! }
+    public var Document_TargetConfirmationFormat: String { return self._s[4998]! }
+    public var GroupInfo_InviteByLink: String { return self._s[4999]! }
+    public var Channel_AdminLog_BanSendStickersAndGifs: String { return self._s[5000]! }
+    public var Watch_Stickers_RecentPlaceholder: String { return self._s[5001]! }
+    public var Broadcast_AdminLog_EmptyText: String { return self._s[5002]! }
+    public var Passport_NotLoggedInMessage: String { return self._s[5003]! }
+    public var Conversation_StopQuizConfirmation: String { return self._s[5004]! }
+    public var Checkout_PaymentMethod: String { return self._s[5005]! }
+    public var ChatList_ArchivedChatsTitle: String { return self._s[5010]! }
+    public var TwoStepAuth_SetupPasswordConfirmFailed: String { return self._s[5011]! }
+    public var VoiceOver_Chat_RecordPreviewVoiceMessage: String { return self._s[5012]! }
+    public var PrivacyLastSeenSettings_GroupsAndChannelsHelp: String { return self._s[5013]! }
+    public var SettingsSearch_Synonyms_Privacy_Data_ContactsReset: String { return self._s[5014]! }
+    public var Conversation_GigagroupDescription: String { return self._s[5015]! }
+    public var Camera_Title: String { return self._s[5016]! }
+    public var Map_Directions: String { return self._s[5017]! }
+    public var Stats_MessagePublicForwardsTitle: String { return self._s[5019]! }
+    public var Privacy_ProfilePhoto_WhoCanSeeMyPhoto: String { return self._s[5020]! }
+    public var Profile_EncryptionKey: String { return self._s[5021]! }
     public func LOCAL_CHAT_MESSAGE_FWDS(_ _1: String, _ _2: Int) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4812]!, self._r[4812]!, [_1, "\(_2)"])
+        return formatWithArgumentRanges(self._s[5022]!, self._r[5022]!, [_1, "\(_2)"])
     }
+    public var VoiceChat_VideoPreviewShareCamera: String { return self._s[5023]! }
     public func Compatibility_SecretMediaVersionTooLow(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4813]!, self._r[4813]!, [_0, _1])
+        return formatWithArgumentRanges(self._s[5024]!, self._r[5024]!, [_0, _1])
+    }
+    public var Passport_Identity_TypePassport: String { return self._s[5025]! }
+    public var CreatePoll_QuizOptionsHeader: String { return self._s[5027]! }
+    public var Common_No: String { return self._s[5028]! }
+    public var Conversation_SendMessage_ScheduleMessage: String { return self._s[5029]! }
+    public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[5030]! }
+    public var Settings_AboutEmpty: String { return self._s[5031]! }
+    public var TwoStepAuth_FloodError: String { return self._s[5033]! }
+    public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[5034]! }
+    public func Notification_VoiceChatScheduledChannel(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[5035]!, self._r[5035]!, [_0])
     }
-    public var Passport_Identity_TypePassport: String { return self._s[4814]! }
-    public var CreatePoll_QuizOptionsHeader: String { return self._s[4816]! }
-    public var Common_No: String { return self._s[4817]! }
-    public var Conversation_SendMessage_ScheduleMessage: String { return self._s[4818]! }
-    public var SettingsSearch_Synonyms_Privacy_LastSeen: String { return self._s[4819]! }
-    public var Settings_AboutEmpty: String { return self._s[4820]! }
-    public var TwoStepAuth_FloodError: String { return self._s[4822]! }
-    public var SettingsSearch_Synonyms_Appearance_TextSize: String { return self._s[4823]! }
     public func Channel_AdminLog_MessageUnkickedName(_ _1: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4825]!, self._r[4825]!, [_1])
+        return formatWithArgumentRanges(self._s[5037]!, self._r[5037]!, [_1])
     }
-    public var Notification_Exceptions_MessagePreviewAlwaysOn: String { return self._s[4828]! }
-    public var Conversation_Edit: String { return self._s[4829]! }
-    public var CheckoutInfo_SaveInfo: String { return self._s[4831]! }
-    public var VoiceOver_Chat_AnonymousPoll: String { return self._s[4832]! }
-    public var Call_CameraTooltip: String { return self._s[4834]! }
-    public var InstantPage_FeedbackButtonShort: String { return self._s[4835]! }
-    public var Contacts_InviteToTelegram: String { return self._s[4836]! }
-    public var Notifications_ResetAllNotifications: String { return self._s[4837]! }
-    public var Calls_NewCall: String { return self._s[4838]! }
-    public var VoiceOver_Chat_Music: String { return self._s[4841]! }
-    public var Channel_AdminLogFilter_EventsInviteLinks: String { return self._s[4842]! }
-    public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[4843]! }
-    public var Channel_Edit_AboutItem: String { return self._s[4844]! }
-    public var Message_VideoExpired: String { return self._s[4845]! }
-    public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[4846]! }
+    public var Notification_Exceptions_MessagePreviewAlwaysOn: String { return self._s[5040]! }
+    public var Conversation_Edit: String { return self._s[5041]! }
+    public var CheckoutInfo_SaveInfo: String { return self._s[5043]! }
+    public var VoiceOver_Chat_AnonymousPoll: String { return self._s[5044]! }
+    public var Call_CameraTooltip: String { return self._s[5046]! }
+    public var InstantPage_FeedbackButtonShort: String { return self._s[5047]! }
+    public var Contacts_InviteToTelegram: String { return self._s[5048]! }
+    public var Notifications_ResetAllNotifications: String { return self._s[5049]! }
+    public var Calls_NewCall: String { return self._s[5050]! }
+    public var VoiceOver_Chat_Music: String { return self._s[5053]! }
+    public var Channel_AdminLogFilter_EventsInviteLinks: String { return self._s[5054]! }
+    public var Channel_Members_AddAdminErrorNotAMember: String { return self._s[5055]! }
+    public var Channel_Edit_AboutItem: String { return self._s[5056]! }
+    public var Message_VideoExpired: String { return self._s[5057]! }
+    public var Passport_Address_TypeTemporaryRegistrationUploadScan: String { return self._s[5058]! }
+    public var Settings_TryEnterPassword: String { return self._s[5059]! }
     public func PUSH_CHAT_RETURNED(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4847]!, self._r[4847]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[5060]!, self._r[5060]!, [_1, _2])
     }
-    public var NotificationsSound_Input: String { return self._s[4849]! }
-    public var Notifications_ClassicTones: String { return self._s[4850]! }
-    public var Conversation_StatusTyping: String { return self._s[4851]! }
-    public var Checkout_ErrorProviderAccountInvalid: String { return self._s[4852]! }
-    public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[4853]! }
-    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[4854]! }
-    public var Conversation_MessageLeaveComment: String { return self._s[4855]! }
-    public var UserInfo_TapToCall: String { return self._s[4856]! }
-    public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[4857]! }
-    public var Conversation_ClearAll: String { return self._s[4859]! }
-    public var UserInfo_NotificationsDefault: String { return self._s[4860]! }
-    public var Location_ProximityGroupTip: String { return self._s[4861]! }
-    public var Map_ChooseAPlace: String { return self._s[4862]! }
-    public var GroupInfo_AddParticipantTitle: String { return self._s[4864]! }
-    public var ChatList_PeerTypeNonContact: String { return self._s[4865]! }
-    public var Conversation_SlideToCancel: String { return self._s[4866]! }
-    public var Month_ShortJuly: String { return self._s[4867]! }
-    public var SocksProxySetup_ProxyType: String { return self._s[4868]! }
+    public var NotificationsSound_Input: String { return self._s[5062]! }
+    public var Notifications_ClassicTones: String { return self._s[5063]! }
+    public var Conversation_StatusTyping: String { return self._s[5064]! }
+    public var Checkout_ErrorProviderAccountInvalid: String { return self._s[5065]! }
+    public var ChatSettings_AutoDownloadSettings_Delimeter: String { return self._s[5066]! }
+    public var SettingsSearch_Synonyms_Notifications_BadgeIncludeMutedChats: String { return self._s[5067]! }
+    public var Conversation_MessageLeaveComment: String { return self._s[5068]! }
+    public var UserInfo_TapToCall: String { return self._s[5069]! }
+    public var EnterPasscode_EnterNewPasscodeNew: String { return self._s[5070]! }
+    public func ScheduleVoiceChat_ScheduleOn(_ _0: String, _ _1: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[5071]!, self._r[5071]!, [_0, _1])
+    }
+    public var Conversation_ClearAll: String { return self._s[5073]! }
+    public var UserInfo_NotificationsDefault: String { return self._s[5074]! }
+    public func TwoFactorSetup_ResetFloodWait(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[5075]!, self._r[5075]!, [_0])
+    }
+    public var Location_ProximityGroupTip: String { return self._s[5076]! }
+    public var Map_ChooseAPlace: String { return self._s[5077]! }
+    public var GroupInfo_AddParticipantTitle: String { return self._s[5079]! }
+    public var ChatList_PeerTypeNonContact: String { return self._s[5080]! }
+    public var Conversation_SlideToCancel: String { return self._s[5081]! }
+    public var Month_ShortJuly: String { return self._s[5082]! }
+    public var SocksProxySetup_ProxyType: String { return self._s[5083]! }
     public func ChatList_DeleteChatConfirmation(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4869]!, self._r[4869]!, [_0])
+        return formatWithArgumentRanges(self._s[5084]!, self._r[5084]!, [_0])
     }
-    public var StickerPacks_ActionArchive: String { return self._s[4870]! }
-    public var ChatList_EditFolders: String { return self._s[4871]! }
-    public var TwoStepAuth_SetPasswordHelp: String { return self._s[4872]! }
-    public var ScheduledMessages_RemindersTitle: String { return self._s[4874]! }
+    public var StickerPacks_ActionArchive: String { return self._s[5085]! }
+    public var ChatList_EditFolders: String { return self._s[5086]! }
+    public var TwoStepAuth_SetPasswordHelp: String { return self._s[5087]! }
+    public var ScheduledMessages_RemindersTitle: String { return self._s[5089]! }
     public func GroupPermission_ApplyAlertText(_ _0: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4875]!, self._r[4875]!, [_0])
+        return formatWithArgumentRanges(self._s[5090]!, self._r[5090]!, [_0])
     }
-    public var Permissions_PeopleNearbyTitle_v0: String { return self._s[4876]! }
-    public var Your_cards_expiration_year_is_invalid: String { return self._s[4877]! }
-    public var UserInfo_ShareMyContactInfo: String { return self._s[4879]! }
-    public var Passport_DeleteAddress: String { return self._s[4881]! }
-    public var Passport_DeletePassportConfirmation: String { return self._s[4882]! }
-    public var Passport_Identity_ReverseSide: String { return self._s[4883]! }
-    public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[4884]! }
-    public var Login_InfoLastNamePlaceholder: String { return self._s[4885]! }
-    public var InviteLink_CreatedBy: String { return self._s[4886]! }
-    public var Passport_FieldAddress: String { return self._s[4887]! }
-    public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[4888]! }
-    public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[4891]! }
-    public var VoiceChat_Panel_TapToJoin: String { return self._s[4892]! }
-    public var Map_Home: String { return self._s[4893]! }
-    public var PollResults_Title: String { return self._s[4896]! }
+    public var Permissions_PeopleNearbyTitle_v0: String { return self._s[5091]! }
+    public var Your_cards_expiration_year_is_invalid: String { return self._s[5092]! }
+    public var UserInfo_ShareMyContactInfo: String { return self._s[5094]! }
+    public func Conversation_ScheduledVoiceChatStartsOnShort(_ _0: String) -> (String, [(Int, NSRange)]) {
+        return formatWithArgumentRanges(self._s[5096]!, self._r[5096]!, [_0])
+    }
+    public var Passport_DeleteAddress: String { return self._s[5097]! }
+    public var Passport_DeletePassportConfirmation: String { return self._s[5098]! }
+    public var Passport_Identity_ReverseSide: String { return self._s[5099]! }
+    public var CheckoutInfo_ErrorEmailInvalid: String { return self._s[5101]! }
+    public var Login_InfoLastNamePlaceholder: String { return self._s[5102]! }
+    public var InviteLink_CreatedBy: String { return self._s[5103]! }
+    public var Passport_FieldAddress: String { return self._s[5104]! }
+    public var SettingsSearch_Synonyms_Calls_Title: String { return self._s[5105]! }
+    public var Passport_Identity_ResidenceCountryPlaceholder: String { return self._s[5108]! }
+    public var VoiceChat_Panel_TapToJoin: String { return self._s[5109]! }
+    public var Map_Home: String { return self._s[5110]! }
+    public var PollResults_Title: String { return self._s[5113]! }
     public func InviteLink_OtherPermanentLinkInfo(_ _1: String, _ _2: String) -> (String, [(Int, NSRange)]) {
-        return formatWithArgumentRanges(self._s[4897]!, self._r[4897]!, [_1, _2])
+        return formatWithArgumentRanges(self._s[5114]!, self._r[5114]!, [_1, _2])
     }
-    public var ArchivedChats_IntroText2: String { return self._s[4899]! }
-    public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[4900]! }
-    public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[4901]! }
-    public var VoiceChat_Muted: String { return self._s[4903]! }
-    public var CallFeedback_ReasonSilentRemote: String { return self._s[4904]! }
-    public var Passport_Identity_AddPersonalDetails: String { return self._s[4905]! }
-    public var Conversation_AutoremoveActionEnable: String { return self._s[4907]! }
-    public var Group_Info_AdminLog: String { return self._s[4908]! }
-    public var ChatSettings_AutoPlayTitle: String { return self._s[4909]! }
-    public var Appearance_Animations: String { return self._s[4910]! }
-    public var Appearance_TextSizeSetting: String { return self._s[4911]! }
-    public func Chat_MessagesUnpinned(_ value: Int32) -> String {
+    public var ArchivedChats_IntroText2: String { return self._s[5116]! }
+    public var VoiceChat_VideoPreviewTitle: String { return self._s[5117]! }
+    public var PasscodeSettings_SimplePasscodeHelp: String { return self._s[5118]! }
+    public var VoiceOver_Chat_ContactPhoneNumber: String { return self._s[5119]! }
+    public var VoiceChat_Muted: String { return self._s[5121]! }
+    public var CallFeedback_ReasonSilentRemote: String { return self._s[5122]! }
+    public var Passport_Identity_AddPersonalDetails: String { return self._s[5123]! }
+    public var Conversation_AutoremoveActionEnable: String { return self._s[5125]! }
+    public var Group_Info_AdminLog: String { return self._s[5126]! }
+    public var ChatSettings_AutoPlayTitle: String { return self._s[5127]! }
+    public var Appearance_Animations: String { return self._s[5128]! }
+    public var Appearance_TextSizeSetting: String { return self._s[5129]! }
+    public func Conversation_StatusOnline(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Media_ShareItem(_ value: Int32) -> String {
+    public func Watch_UserInfo_Mute(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MessageTimer_ShortDays(_ value: Int32) -> String {
+    public func ForwardedPolls(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[2 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, _1, _2)
+    public func Contacts_InviteContacts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[3 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
+    public func Call_Hours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[4 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Watch_UserInfo_Mute(_ value: Int32) -> String {
+    public func AttachmentMenu_SendItem(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[5 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
+    public func ChatList_DeleteConfirmation(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[6 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func SharedMedia_File(_ value: Int32) -> String {
+    public func Map_ETAHours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[7 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Notification_GameScoreSimple(_ value: Int32) -> String {
+    public func Media_SharePhoto(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[8 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func StickerPack_AddStickerCount(_ value: Int32) -> String {
+    public func Conversation_AutoremoveRemainingDays(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[9 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String {
+    public func Stats_MessageForwards(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[10 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String {
+    public func StickerPacks_ArchiveStickerPacksConfirmation(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[11 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ForwardedPhotos(_ value: Int32) -> String {
+    public func InviteLink_PeopleCanJoin(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[12 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Chat_TitlePinnedMessages(_ value: Int32) -> String {
+    public func ChatList_MessageVideos(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[13 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ChatList_MessageMusic(_ value: Int32) -> String {
+    public func Call_ShortMinutes(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[14 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopInviterInvites(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func AttachmentMenu_SendVideo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Media_SharePhoto(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+    public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
         let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_MessageViewComments(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func Map_ETAMinutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteText_ContactsCountText(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LastSeen_HoursAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notification_GameScoreSelfExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func UserCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func Stats_MessageForwards(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedAudios(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusSubscribers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_MessageFiles(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func QuickSend_Photos(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[15 * 6 + Int(form.rawValue)]!, _1, _2)
     }
     public func Chat_DeleteMessagesConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[16 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func GroupInfo_ParticipantCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[17 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[18 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceChat_InviteLink_InviteSpeakers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[19 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ScheduledIn_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[20 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[21 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_PollVotes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[22 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InviteText_ContactsCountText(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[23 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatListFilter_ShowMoreChats(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[24 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InviteLink_PeopleJoinedShort(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[25 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Link(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[26 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[27 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[28 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func ScheduledIn_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[29 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func LiveLocation_MenuChatsCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[30 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[31 * 6 + Int(form.rawValue)]!, _0, _1)
+    }
+    public func PUSH_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[32 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func UserCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[33 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_StickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[34 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupTopPosterMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[35 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func AttachmentMenu_SendGif(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[36 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHAT_MESSAGE_DOCS_FIX1(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[37 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func OldChannels_InactiveWeek(_ value: Int32) -> String {
+    public func MuteFor_Hours(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[38 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String {
+    public func MessageTimer_Weeks(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[39 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Theme_UsersCount(_ value: Int32) -> String {
+    public func Stats_GroupTopInviterInvites(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[40 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ForwardedGifs(_ value: Int32) -> String {
+    public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[41 * 6 + Int(form.rawValue)]!, stringValue)
@@ -5652,621 +5891,660 @@ public final class PresentationStrings: Equatable {
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[42 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ForwardedVideos(_ value: Int32) -> String {
+    public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[43 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Notification_GameScoreSelfSimple(_ value: Int32) -> String {
+    public func Conversation_ContextMenuSelectAll(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[44 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func Notifications_Exceptions(_ value: Int32) -> String {
+    public func Watch_LastSeen_MinutesAgo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[45 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ServiceMessage_GameScoreSelfSimple(_ value: Int32) -> String {
+    public func InstantPage_Views(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Minutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func StickerPack_RemoveMaskCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceChat_Panel_Members(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[46 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Stats_GroupShowMoreTopAdmins(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func AttachmentMenu_SendPhoto(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func AttachmentMenu_SendGif(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceOver_Chat_MessagesSelected(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_GroupFormat(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Days(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_Photo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Media_ShareVideo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatListFilter_ShowMoreChats(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusOnline(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LastSeen_MinutesAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceOver_Chat_UnreadMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func Stats_GroupShowMoreTopInviters(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Months(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LiveLocationUpdated_MinutesAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_DeleteConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedVideoMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_Search_Messages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteLink_PeopleJoinedShort(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteLink_PeopleJoined(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PasscodeSettings_FailedAttempts(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func Conversation_AutoremoveRemainingDays(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedAuthorsOthers(_ selector: Int32, _ _0: String, _ _1: String) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, _0, _1)
+        return String(format: self._ps[47 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func SharedMedia_Generic(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[48 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func MuteExpires_Hours(_ value: Int32) -> String {
+    public func GroupInfo_ShowMoreMembers(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func AttachmentMenu_SendItem(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Invitation_Members(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_ShortSeconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_TitleComments(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopPosterChars(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopPosterMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedFiles(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Contacts_InviteContacts(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceChat_InviteLink_InviteListeners(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[49 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func PUSH_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
         let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, _1, _2)
+        return String(format: self._ps[50 * 6 + Int(form.rawValue)]!, _1, _2)
     }
-    public func Notification_GameScoreExtended(_ value: Int32) -> String {
+    public func AttachmentMenu_SendVideo(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PollResults_ShowMore(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_ContextViewReplies(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func Passport_Scans(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteLink_InviteLinks(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPack_StickerCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_ShortMinutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_InactiveMonth(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func LiveLocation_MenuChatsCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MuteFor_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteLink_PeopleCanJoin(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedLocations(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Notifications_ExceptionMuteExpires_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_StatusMembers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_MessageVideos(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MuteExpires_Minutes(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_DeletedChats(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Watch_LastSeen_HoursAgo(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessagePoll_VotedCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_TitleReplies(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceChat_InviteLink_InviteSpeakers(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func MessageTimer_ShortHours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Map_ETAHours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopAdminKicks(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopAdminDeletions(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func OldChannels_Leave(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func OldChannels_InactiveYear(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func VoiceChat_Status_Members(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_ShortSeconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[128 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPack_RemoveStickerCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[129 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InviteLink_PeopleRemaining(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[130 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessagePoll_QuizCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[131 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_Hours(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[132 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPacks_ArchiveStickerPacksConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[133 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_MessageViews(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[134 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[135 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_Seconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[136 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[137 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupTopAdminBans(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[138 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[139 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[51 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func Call_Minutes(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[140 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[52 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+    public func LastSeen_MinutesAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[53 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteExpires_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[54 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedPhotos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[55 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_AddStickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[56 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_StatusMembers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[57 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_InactiveWeek(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[58 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupTopAdminBans(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[59 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_UnreadMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[60 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupTopPosterChars(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[61 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_DeletedChats(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[62 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func DialogList_LiveLocationChatsCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[63 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGE_PHOTOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
         let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[141 * 6 + Int(form.rawValue)]!, _1, _2)
-    }
-    public func ForwardedMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[142 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func InstantPage_Views(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[143 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedPolls(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[144 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Stats_GroupShowMoreTopPosters(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[145 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Years(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[146 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[147 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ChatList_SelectedChats(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[148 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func SharedMedia_Link(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[149 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[150 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGE_PHOTOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[151 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[152 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Conversation_ContextMenuSelectAll(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[153 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Call_Days(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[154 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func Contacts_ImportersCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[155 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPack_AddMaskCount(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[156 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Seconds(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[157 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
-        let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[158 * 6 + Int(form.rawValue)]!, _2, _1, _3)
-    }
-    public func Conversation_SelectedMessages(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[159 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MuteExpires_Days(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[160 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func MessageTimer_Weeks(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[161 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func ForwardedContacts(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[162 * 6 + Int(form.rawValue)]!, stringValue)
-    }
-    public func StickerPacks_DeleteStickerPacksConfirmation(_ value: Int32) -> String {
-        let form = getPluralizationForm(self.lc, value)
-        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[163 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[64 * 6 + Int(form.rawValue)]!, _1, _2)
     }
     public func SharedMedia_Video(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[164 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[65 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func ForwardedStickers(_ value: Int32) -> String {
+    public func PUSH_MESSAGE_FILES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[66 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[67 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func VoiceChat_InviteLink_InviteListeners(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
-        return String(format: self._ps[165 * 6 + Int(form.rawValue)]!, stringValue)
+        return String(format: self._ps[68 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHANNEL_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+    public func Stats_GroupTopAdminDeletions(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[69 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ImportStickerPack_StickerCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[70 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_Seconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[71 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedVideoMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[72 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedGifs(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[73 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[74 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
         let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[166 * 6 + Int(form.rawValue)]!, _1, _2)
+        return String(format: self._ps[75 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func Call_ShortSeconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[76 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Seconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[77 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Chat_TitlePinnedMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[78 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ScheduledIn_Seconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[79 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Media_ShareVideo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[80 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedContacts(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[81 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_ContextViewReplies(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[82 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_DOCS_FIX1(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[83 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func MessagePoll_QuizCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[84 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Months(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[85 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_File(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[86 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupShowMoreTopPosters(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[87 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notifications_ExceptionMuteExpires_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[88 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_StatusSubscribers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[89 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PollResults_ShowMore(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[90 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Forward_ConfirmMultipleFiles(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[91 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_ContactEmailCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[92 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_InactiveYear(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[93 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_TitleReplies(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[94 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupShowMoreTopInviters(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[95 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func AttachmentMenu_SendPhoto(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[96 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessagePoll_VotedCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[97 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortWeeks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[98 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_Photo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[99 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_MessagesSelected(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[100 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_MessageViewComments(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[101 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_TitleComments(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[102 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortHours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[103 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[104 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func Theme_UsersCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[105 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ScheduledIn_Years(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[106 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_SelectedChats(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[107 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Map_ETAMinutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[108 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_RemoveMaskCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[109 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceChat_Status_Members(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[110 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedFiles(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[111 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Passport_Scans(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[112 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Call_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[113 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedAudios(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[114 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_Hours(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[115 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Invitation_Members(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[116 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedLocations(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[117 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_Search_Messages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[118 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteExpires_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[119 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_PollOptionCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[120 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_GroupFormat(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[121 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ScheduledIn_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[122 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ScheduledIn_Weeks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[123 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InviteLink_PeopleJoined(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[124 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortDays(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[125 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_VIDEOS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[126 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func Notifications_ExceptionMuteExpires_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[127 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_LiveLocationMembersCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[128 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MessageTimer_ShortMinutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[129 * 6 + Int(form.rawValue)]!, stringValue)
     }
     public func ChatList_MessagePhotos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[130 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[131 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreSelfSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[132 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceChat_Panel_Members(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[133 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InviteLink_InviteLinks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[134 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedVideos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[135 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func QuickSend_Photos(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[136 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_MESSAGE_FWDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[137 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func MessageTimer_Years(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[138 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[139 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Wallpaper_DeleteConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[140 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func InviteLink_PeopleRemaining(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[141 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func MuteExpires_Days(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[142 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notifications_Exceptions(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[143 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreSimple(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[144 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGES(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[145 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func Stats_MessageViews(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[146 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_ROUNDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[147 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func MessageTimer_Minutes(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[148 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedStickers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[149 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Contacts_ImportersCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[150 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_InactiveMonth(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[151 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_MessageMusic(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[152 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func OldChannels_Leave(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[153 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PrivacyLastSeenSettings_AddUsers(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[154 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHAT_MESSAGE_FWDS(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[155 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func MessageTimer_ShortSeconds(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[156 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PeopleNearby_ShowMorePeople(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[157 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Conversation_SelectedMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[158 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ChatList_MessageFiles(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[159 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ServiceMessage_GameScoreSelfExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[160 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func ForwardedMessages(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[161 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPacks_DeleteStickerPacksConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[162 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func SharedMedia_DeleteItemsConfirmation(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[163 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGE_VIDEOS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[164 * 6 + Int(form.rawValue)]!, _1, _2)
+    }
+    public func PUSH_CHAT_MESSAGES(_ selector: Int32, _ _2: String, _ _1: String, _ _3: Int32) -> String {
+        let form = getPluralizationForm(self.lc, selector)
+        return String(format: self._ps[165 * 6 + Int(form.rawValue)]!, _2, _1, _3)
+    }
+    public func ScheduledIn_Months(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[166 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func StickerPack_RemoveStickerCount(_ value: Int32) -> String {
         let form = getPluralizationForm(self.lc, value)
         let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
         return String(format: self._ps[167 * 6 + Int(form.rawValue)]!, stringValue)
     }
-    public func PUSH_CHANNEL_MESSAGE_ROUNDS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
+    public func StickerPack_AddMaskCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[168 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func CreatePoll_AddMoreOptions(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[169 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Chat_MessagesUnpinned(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[170 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func LastSeen_HoursAgo(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[171 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Notification_GameScoreSelfExtended(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[172 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Media_ShareItem(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[173 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func VoiceOver_Chat_ContactPhoneNumberCount(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[174 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func Stats_GroupTopAdminKicks(_ value: Int32) -> String {
+        let form = getPluralizationForm(self.lc, value)
+        let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
+        return String(format: self._ps[175 * 6 + Int(form.rawValue)]!, stringValue)
+    }
+    public func PUSH_CHANNEL_MESSAGE_DOCS(_ selector: Int32, _ _1: String, _ _2: Int32) -> String {
         let form = getPluralizationForm(self.lc, selector)
-        return String(format: self._ps[168 * 6 + Int(form.rawValue)]!, _1, _2)
+        return String(format: self._ps[176 * 6 + Int(form.rawValue)]!, _1, _2)
     }
         
     public init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) {
diff --git a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
index 6a170942b0..c80310bd04 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationTheme.swift
@@ -117,7 +117,8 @@ public final class PresentationThemeRootNavigationBar {
     public let secondaryTextColor: UIColor
     public let controlColor: UIColor
     public let accentTextColor: UIColor
-    public let backgroundColor: UIColor
+    public let blurredBackgroundColor: UIColor
+    public let opaqueBackgroundColor: UIColor
     public let separatorColor: UIColor
     public let badgeBackgroundColor: UIColor
     public let badgeStrokeColor: UIColor
@@ -129,14 +130,15 @@ public final class PresentationThemeRootNavigationBar {
     public let clearButtonBackgroundColor: UIColor
     public let clearButtonForegroundColor: UIColor
     
-    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlColor: UIColor, accentTextColor: UIColor, backgroundColor: UIColor, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor, segmentedBackgroundColor: UIColor, segmentedForegroundColor: UIColor, segmentedTextColor: UIColor, segmentedDividerColor: UIColor, clearButtonBackgroundColor: UIColor, clearButtonForegroundColor: UIColor) {
+    public init(buttonColor: UIColor, disabledButtonColor: UIColor, primaryTextColor: UIColor, secondaryTextColor: UIColor, controlColor: UIColor, accentTextColor: UIColor, blurredBackgroundColor: UIColor, opaqueBackgroundColor: UIColor, separatorColor: UIColor, badgeBackgroundColor: UIColor, badgeStrokeColor: UIColor, badgeTextColor: UIColor, segmentedBackgroundColor: UIColor, segmentedForegroundColor: UIColor, segmentedTextColor: UIColor, segmentedDividerColor: UIColor, clearButtonBackgroundColor: UIColor, clearButtonForegroundColor: UIColor) {
         self.buttonColor = buttonColor
         self.disabledButtonColor = disabledButtonColor
         self.primaryTextColor = primaryTextColor
         self.secondaryTextColor = secondaryTextColor
         self.controlColor = controlColor
         self.accentTextColor = accentTextColor
-        self.backgroundColor = backgroundColor
+        self.blurredBackgroundColor = blurredBackgroundColor
+        self.opaqueBackgroundColor = opaqueBackgroundColor
         self.separatorColor = separatorColor
         self.badgeBackgroundColor = badgeBackgroundColor
         self.badgeStrokeColor = badgeStrokeColor
@@ -149,10 +151,10 @@ public final class PresentationThemeRootNavigationBar {
         self.clearButtonForegroundColor = clearButtonForegroundColor
     }
     
-    public func withUpdated(buttonColor: UIColor? = nil, disabledButtonColor: UIColor? = nil, primaryTextColor: UIColor? = nil, secondaryTextColor: UIColor? = nil, controlColor: UIColor? = nil, accentTextColor: UIColor? = nil, backgroundColor: UIColor? = nil, separatorColor: UIColor? = nil, badgeBackgroundColor: UIColor? = nil, badgeStrokeColor: UIColor? = nil, badgeTextColor: UIColor? = nil, segmentedBackgroundColor: UIColor? = nil, segmentedForegroundColor: UIColor? = nil, segmentedTextColor: UIColor? = nil, segmentedDividerColor: UIColor? = nil, clearButtonBackgroundColor: UIColor? = nil, clearButtonForegroundColor: UIColor? = nil) -> PresentationThemeRootNavigationBar {
+    public func withUpdated(buttonColor: UIColor? = nil, disabledButtonColor: UIColor? = nil, primaryTextColor: UIColor? = nil, secondaryTextColor: UIColor? = nil, controlColor: UIColor? = nil, accentTextColor: UIColor? = nil, blurredBackgroundColor: UIColor? = nil, opaqueBackgroundColor: UIColor? = nil, separatorColor: UIColor? = nil, badgeBackgroundColor: UIColor? = nil, badgeStrokeColor: UIColor? = nil, badgeTextColor: UIColor? = nil, segmentedBackgroundColor: UIColor? = nil, segmentedForegroundColor: UIColor? = nil, segmentedTextColor: UIColor? = nil, segmentedDividerColor: UIColor? = nil, clearButtonBackgroundColor: UIColor? = nil, clearButtonForegroundColor: UIColor? = nil) -> PresentationThemeRootNavigationBar {
         let resolvedClearButtonBackgroundColor = clearButtonBackgroundColor ?? self.clearButtonBackgroundColor
         let resolvedClearButtonForegroundColor = clearButtonForegroundColor ?? self.clearButtonForegroundColor
-        return PresentationThemeRootNavigationBar(buttonColor: buttonColor ?? self.buttonColor, disabledButtonColor: disabledButtonColor ?? self.disabledButtonColor, primaryTextColor: primaryTextColor ?? self.primaryTextColor, secondaryTextColor: secondaryTextColor ?? self.secondaryTextColor, controlColor: controlColor ?? self.controlColor, accentTextColor: accentTextColor ?? self.accentTextColor, backgroundColor: backgroundColor ?? self.backgroundColor, separatorColor: separatorColor ?? self.separatorColor, badgeBackgroundColor: badgeBackgroundColor ?? self.badgeBackgroundColor, badgeStrokeColor: badgeStrokeColor ?? self.badgeStrokeColor, badgeTextColor: badgeTextColor ?? self.badgeTextColor, segmentedBackgroundColor: segmentedBackgroundColor ?? self.segmentedBackgroundColor, segmentedForegroundColor: segmentedForegroundColor ?? self.segmentedForegroundColor, segmentedTextColor: segmentedTextColor ?? self.segmentedTextColor, segmentedDividerColor: segmentedDividerColor ?? self.segmentedDividerColor, clearButtonBackgroundColor: resolvedClearButtonBackgroundColor, clearButtonForegroundColor: resolvedClearButtonForegroundColor)
+        return PresentationThemeRootNavigationBar(buttonColor: buttonColor ?? self.buttonColor, disabledButtonColor: disabledButtonColor ?? self.disabledButtonColor, primaryTextColor: primaryTextColor ?? self.primaryTextColor, secondaryTextColor: secondaryTextColor ?? self.secondaryTextColor, controlColor: controlColor ?? self.controlColor, accentTextColor: accentTextColor ?? self.accentTextColor, blurredBackgroundColor: blurredBackgroundColor ?? self.blurredBackgroundColor, opaqueBackgroundColor: opaqueBackgroundColor ?? self.opaqueBackgroundColor, separatorColor: separatorColor ?? self.separatorColor, badgeBackgroundColor: badgeBackgroundColor ?? self.badgeBackgroundColor, badgeStrokeColor: badgeStrokeColor ?? self.badgeStrokeColor, badgeTextColor: badgeTextColor ?? self.badgeTextColor, segmentedBackgroundColor: segmentedBackgroundColor ?? self.segmentedBackgroundColor, segmentedForegroundColor: segmentedForegroundColor ?? self.segmentedForegroundColor, segmentedTextColor: segmentedTextColor ?? self.segmentedTextColor, segmentedDividerColor: segmentedDividerColor ?? self.segmentedDividerColor, clearButtonBackgroundColor: resolvedClearButtonBackgroundColor, clearButtonForegroundColor: resolvedClearButtonForegroundColor)
     }
 }
 
@@ -406,6 +408,25 @@ public final class PresentationInputFieldTheme {
 }
 
 public final class PresentationThemeList {
+    public final class PaymentOption {
+        public let inactiveFillColor: UIColor
+        public let inactiveForegroundColor: UIColor
+        public let activeFillColor: UIColor
+        public let activeForegroundColor: UIColor
+
+        public init(
+            inactiveFillColor: UIColor,
+            inactiveForegroundColor: UIColor,
+            activeFillColor: UIColor,
+            activeForegroundColor: UIColor
+        ) {
+            self.inactiveFillColor = inactiveFillColor
+            self.inactiveForegroundColor = inactiveForegroundColor
+            self.activeFillColor = activeFillColor
+            self.activeForegroundColor = activeForegroundColor
+        }
+    }
+
     public let blocksBackgroundColor: UIColor
     public let plainBackgroundColor: UIColor
     public let itemPrimaryTextColor: UIColor
@@ -437,8 +458,42 @@ public final class PresentationThemeList {
     public let inputClearButtonColor: UIColor
     public let itemBarChart: PresentationThemeItemBarChart
     public let itemInputField: PresentationInputFieldTheme
+    public let paymentOption: PaymentOption
     
-    public init(blocksBackgroundColor: UIColor, plainBackgroundColor: UIColor, itemPrimaryTextColor: UIColor, itemSecondaryTextColor: UIColor, itemDisabledTextColor: UIColor, itemAccentColor: UIColor, itemHighlightedColor: UIColor, itemDestructiveColor: UIColor, itemPlaceholderTextColor: UIColor, itemBlocksBackgroundColor: UIColor, itemHighlightedBackgroundColor: UIColor, itemBlocksSeparatorColor: UIColor, itemPlainSeparatorColor: UIColor, disclosureArrowColor: UIColor, sectionHeaderTextColor: UIColor, freeTextColor: UIColor, freeTextErrorColor: UIColor, freeTextSuccessColor: UIColor, freeMonoIconColor: UIColor, itemSwitchColors: PresentationThemeSwitch, itemDisclosureActions: PresentationThemeItemDisclosureActions, itemCheckColors: PresentationThemeFillStrokeForeground, controlSecondaryColor: UIColor, freeInputField: PresentationInputFieldTheme, freePlainInputField: PresentationInputFieldTheme, mediaPlaceholderColor: UIColor, scrollIndicatorColor: UIColor, pageIndicatorInactiveColor: UIColor, inputClearButtonColor: UIColor, itemBarChart: PresentationThemeItemBarChart, itemInputField: PresentationInputFieldTheme) {
+    public init(
+        blocksBackgroundColor: UIColor,
+        plainBackgroundColor: UIColor,
+        itemPrimaryTextColor: UIColor,
+        itemSecondaryTextColor: UIColor,
+        itemDisabledTextColor: UIColor,
+        itemAccentColor: UIColor,
+        itemHighlightedColor: UIColor,
+        itemDestructiveColor: UIColor,
+        itemPlaceholderTextColor: UIColor,
+        itemBlocksBackgroundColor: UIColor,
+        itemHighlightedBackgroundColor: UIColor,
+        itemBlocksSeparatorColor: UIColor,
+        itemPlainSeparatorColor: UIColor,
+        disclosureArrowColor: UIColor,
+        sectionHeaderTextColor: UIColor,
+        freeTextColor: UIColor,
+        freeTextErrorColor: UIColor,
+        freeTextSuccessColor: UIColor,
+        freeMonoIconColor: UIColor,
+        itemSwitchColors: PresentationThemeSwitch,
+        itemDisclosureActions: PresentationThemeItemDisclosureActions,
+        itemCheckColors: PresentationThemeFillStrokeForeground,
+        controlSecondaryColor: UIColor,
+        freeInputField: PresentationInputFieldTheme,
+        freePlainInputField: PresentationInputFieldTheme,
+        mediaPlaceholderColor: UIColor,
+        scrollIndicatorColor: UIColor,
+        pageIndicatorInactiveColor: UIColor,
+        inputClearButtonColor: UIColor,
+        itemBarChart: PresentationThemeItemBarChart,
+        itemInputField: PresentationInputFieldTheme,
+        paymentOption: PaymentOption
+    ) {
         self.blocksBackgroundColor = blocksBackgroundColor
         self.plainBackgroundColor = plainBackgroundColor
         self.itemPrimaryTextColor = itemPrimaryTextColor
@@ -470,10 +525,11 @@ public final class PresentationThemeList {
         self.inputClearButtonColor = inputClearButtonColor
         self.itemBarChart = itemBarChart
         self.itemInputField = itemInputField
+        self.paymentOption = paymentOption
     }
     
-    public func withUpdated(blocksBackgroundColor: UIColor? = nil, plainBackgroundColor: UIColor? = nil, itemPrimaryTextColor: UIColor? = nil, itemSecondaryTextColor: UIColor? = nil, itemDisabledTextColor: UIColor? = nil, itemAccentColor: UIColor? = nil, itemHighlightedColor: UIColor? = nil, itemDestructiveColor: UIColor? = nil, itemPlaceholderTextColor: UIColor? = nil, itemBlocksBackgroundColor: UIColor? = nil, itemHighlightedBackgroundColor: UIColor? = nil, itemBlocksSeparatorColor: UIColor? = nil, itemPlainSeparatorColor: UIColor? = nil, disclosureArrowColor: UIColor? = nil, sectionHeaderTextColor: UIColor? = nil, freeTextColor: UIColor? = nil, freeTextErrorColor: UIColor? = nil, freeTextSuccessColor: UIColor? = nil, freeMonoIconColor: UIColor? = nil, itemSwitchColors: PresentationThemeSwitch? = nil, itemDisclosureActions: PresentationThemeItemDisclosureActions? = nil, itemCheckColors: PresentationThemeFillStrokeForeground? = nil, controlSecondaryColor: UIColor? = nil, freeInputField: PresentationInputFieldTheme? = nil, freePlainInputField: PresentationInputFieldTheme? = nil, mediaPlaceholderColor: UIColor? = nil, scrollIndicatorColor: UIColor? = nil, pageIndicatorInactiveColor: UIColor? = nil, inputClearButtonColor: UIColor? = nil, itemBarChart: PresentationThemeItemBarChart? = nil, itemInputField: PresentationInputFieldTheme? = nil) -> PresentationThemeList {
-        return PresentationThemeList(blocksBackgroundColor: blocksBackgroundColor ?? self.blocksBackgroundColor, plainBackgroundColor: plainBackgroundColor ?? self.plainBackgroundColor, itemPrimaryTextColor: itemPrimaryTextColor ?? self.itemPrimaryTextColor, itemSecondaryTextColor: itemSecondaryTextColor ?? self.itemSecondaryTextColor, itemDisabledTextColor: itemDisabledTextColor ?? self.itemDisabledTextColor, itemAccentColor: itemAccentColor ?? self.itemAccentColor, itemHighlightedColor: itemHighlightedColor ?? self.itemHighlightedColor, itemDestructiveColor: itemDestructiveColor ?? self.itemDestructiveColor, itemPlaceholderTextColor: itemPlaceholderTextColor ?? self.itemPlaceholderTextColor, itemBlocksBackgroundColor: itemBlocksBackgroundColor ?? self.itemBlocksBackgroundColor, itemHighlightedBackgroundColor: itemHighlightedBackgroundColor ?? self.itemHighlightedBackgroundColor, itemBlocksSeparatorColor: itemBlocksSeparatorColor ?? self.itemBlocksSeparatorColor, itemPlainSeparatorColor: itemPlainSeparatorColor ?? self.itemPlainSeparatorColor, disclosureArrowColor: disclosureArrowColor ?? self.disclosureArrowColor, sectionHeaderTextColor: sectionHeaderTextColor ?? self.sectionHeaderTextColor, freeTextColor: freeTextColor ?? self.freeTextColor, freeTextErrorColor: freeTextErrorColor ?? self.freeTextErrorColor, freeTextSuccessColor: freeTextSuccessColor ?? self.freeTextSuccessColor, freeMonoIconColor: freeMonoIconColor ?? self.freeMonoIconColor, itemSwitchColors: itemSwitchColors ?? self.itemSwitchColors, itemDisclosureActions: itemDisclosureActions ?? self.itemDisclosureActions, itemCheckColors: itemCheckColors ?? self.itemCheckColors, controlSecondaryColor: controlSecondaryColor ?? self.controlSecondaryColor, freeInputField: freeInputField ?? self.freeInputField, freePlainInputField: freePlainInputField ?? self.freePlainInputField, mediaPlaceholderColor: mediaPlaceholderColor ?? self.mediaPlaceholderColor, scrollIndicatorColor: scrollIndicatorColor ?? self.scrollIndicatorColor, pageIndicatorInactiveColor: pageIndicatorInactiveColor ?? self.pageIndicatorInactiveColor, inputClearButtonColor: inputClearButtonColor ?? self.inputClearButtonColor, itemBarChart: itemBarChart ?? self.itemBarChart, itemInputField: itemInputField ?? self.itemInputField)
+    public func withUpdated(blocksBackgroundColor: UIColor? = nil, plainBackgroundColor: UIColor? = nil, itemPrimaryTextColor: UIColor? = nil, itemSecondaryTextColor: UIColor? = nil, itemDisabledTextColor: UIColor? = nil, itemAccentColor: UIColor? = nil, itemHighlightedColor: UIColor? = nil, itemDestructiveColor: UIColor? = nil, itemPlaceholderTextColor: UIColor? = nil, itemBlocksBackgroundColor: UIColor? = nil, itemHighlightedBackgroundColor: UIColor? = nil, itemBlocksSeparatorColor: UIColor? = nil, itemPlainSeparatorColor: UIColor? = nil, disclosureArrowColor: UIColor? = nil, sectionHeaderTextColor: UIColor? = nil, freeTextColor: UIColor? = nil, freeTextErrorColor: UIColor? = nil, freeTextSuccessColor: UIColor? = nil, freeMonoIconColor: UIColor? = nil, itemSwitchColors: PresentationThemeSwitch? = nil, itemDisclosureActions: PresentationThemeItemDisclosureActions? = nil, itemCheckColors: PresentationThemeFillStrokeForeground? = nil, controlSecondaryColor: UIColor? = nil, freeInputField: PresentationInputFieldTheme? = nil, freePlainInputField: PresentationInputFieldTheme? = nil, mediaPlaceholderColor: UIColor? = nil, scrollIndicatorColor: UIColor? = nil, pageIndicatorInactiveColor: UIColor? = nil, inputClearButtonColor: UIColor? = nil, itemBarChart: PresentationThemeItemBarChart? = nil, itemInputField: PresentationInputFieldTheme? = nil, paymentOption: PaymentOption? = nil) -> PresentationThemeList {
+        return PresentationThemeList(blocksBackgroundColor: blocksBackgroundColor ?? self.blocksBackgroundColor, plainBackgroundColor: plainBackgroundColor ?? self.plainBackgroundColor, itemPrimaryTextColor: itemPrimaryTextColor ?? self.itemPrimaryTextColor, itemSecondaryTextColor: itemSecondaryTextColor ?? self.itemSecondaryTextColor, itemDisabledTextColor: itemDisabledTextColor ?? self.itemDisabledTextColor, itemAccentColor: itemAccentColor ?? self.itemAccentColor, itemHighlightedColor: itemHighlightedColor ?? self.itemHighlightedColor, itemDestructiveColor: itemDestructiveColor ?? self.itemDestructiveColor, itemPlaceholderTextColor: itemPlaceholderTextColor ?? self.itemPlaceholderTextColor, itemBlocksBackgroundColor: itemBlocksBackgroundColor ?? self.itemBlocksBackgroundColor, itemHighlightedBackgroundColor: itemHighlightedBackgroundColor ?? self.itemHighlightedBackgroundColor, itemBlocksSeparatorColor: itemBlocksSeparatorColor ?? self.itemBlocksSeparatorColor, itemPlainSeparatorColor: itemPlainSeparatorColor ?? self.itemPlainSeparatorColor, disclosureArrowColor: disclosureArrowColor ?? self.disclosureArrowColor, sectionHeaderTextColor: sectionHeaderTextColor ?? self.sectionHeaderTextColor, freeTextColor: freeTextColor ?? self.freeTextColor, freeTextErrorColor: freeTextErrorColor ?? self.freeTextErrorColor, freeTextSuccessColor: freeTextSuccessColor ?? self.freeTextSuccessColor, freeMonoIconColor: freeMonoIconColor ?? self.freeMonoIconColor, itemSwitchColors: itemSwitchColors ?? self.itemSwitchColors, itemDisclosureActions: itemDisclosureActions ?? self.itemDisclosureActions, itemCheckColors: itemCheckColors ?? self.itemCheckColors, controlSecondaryColor: controlSecondaryColor ?? self.controlSecondaryColor, freeInputField: freeInputField ?? self.freeInputField, freePlainInputField: freePlainInputField ?? self.freePlainInputField, mediaPlaceholderColor: mediaPlaceholderColor ?? self.mediaPlaceholderColor, scrollIndicatorColor: scrollIndicatorColor ?? self.scrollIndicatorColor, pageIndicatorInactiveColor: pageIndicatorInactiveColor ?? self.pageIndicatorInactiveColor, inputClearButtonColor: inputClearButtonColor ?? self.inputClearButtonColor, itemBarChart: itemBarChart ?? self.itemBarChart, itemInputField: itemInputField ?? self.itemInputField, paymentOption: paymentOption ?? self.paymentOption)
     }
 }
 
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
index 850e04a645..6cee46cdab 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
@@ -65,11 +65,10 @@ extension TelegramWallpaper: Codable {
                                 }
                             }
                             
-                            self = .gradient(topColor.argb, bottomColor.argb, WallpaperSettings(blur: blur, motion: motion, rotation: rotation))
+                            self = .gradient(nil, [topColor.argb, bottomColor.argb], WallpaperSettings(blur: blur, motion: motion, rotation: rotation))
                         } else {
                             var slug: String?
-                            var color: UInt32?
-                            var bottomColor: UInt32?
+                            var colors: [UInt32] = []
                             var intensity: Int32?
                             var rotation: Int32?
 
@@ -83,11 +82,7 @@ extension TelegramWallpaper: Codable {
                                         continue
                                     }
                                     if [6, 8].contains(component.count), let value = UIColor(hexString: component) {
-                                        if color == nil {
-                                            color = value.argb
-                                        } else if bottomColor == nil {
-                                            bottomColor = value.argb
-                                        }
+                                        colors.append(value.rgb)
                                     } else if component.count <= 3, let value = Int32(component) {
                                         if intensity == nil {
                                             if value >= 0 && value <= 100 {
@@ -104,7 +99,7 @@ extension TelegramWallpaper: Codable {
                                 }
                             }
                             if let slug = slug {
-                                self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: color != nil, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: LocalFileMediaResource(fileId: 0), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: blur, motion: motion, color: color, bottomColor: bottomColor, intensity: intensity, rotation: rotation))
+                                self = .file(id: 0, accessHash: 0, isCreator: false, isDefault: false, isPattern: !colors.isEmpty, isDark: false, slug: slug, file: TelegramMediaFile(fileId: MediaId(namespace: 0, id: 0), partialReference: nil, resource: WallpaperDataResource(slug: slug), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "", size: nil, attributes: []), settings: WallpaperSettings(blur: blur, motion: motion, colors: colors, intensity: intensity, rotation: rotation))
                             } else {
                                 throw PresentationThemeDecodingError.generic
                             }
@@ -123,10 +118,11 @@ extension TelegramWallpaper: Codable {
                 try container.encode("builtin")
             case let .color(color):
                 try container.encode(String(format: "%06x", color))
-            case let .gradient(topColor, bottomColor, settings):
+            case let .gradient(_, colors, settings):
                 var components: [String] = []
-                components.append(String(format: "%06x", topColor))
-                components.append(String(format: "%06x", bottomColor))
+                for color in colors {
+                    components.append(String(format: "%06x", color))
+                }
                 if let rotation = settings.rotation {
                     components.append("\(rotation)")
                 }
@@ -141,14 +137,20 @@ extension TelegramWallpaper: Codable {
                 var components: [String] = []
                 components.append(file.slug)
                 if self.isPattern {
-                    if let color = file.settings.color {
-                        components.append(String(format: "%06x", color))
+                    if file.settings.colors.count >= 1 {
+                        components.append(String(format: "%06x", file.settings.colors[0]))
                     }
                     if let intensity = file.settings.intensity {
                         components.append("\(intensity)")
                     }
-                    if let bottomColor = file.settings.bottomColor {
-                        components.append(String(format: "%06x", bottomColor))
+                    if file.settings.colors.count >= 2 {
+                        components.append(String(format: "%06x", file.settings.colors[1]))
+                    }
+                    if file.settings.colors.count >= 3 {
+                        components.append(String(format: "%06x", file.settings.colors[2]))
+                    }
+                    if file.settings.colors.count >= 4 {
+                        components.append(String(format: "%06x", file.settings.colors[3]))
                     }
                     if let rotation = file.settings.rotation, rotation != 0 {
                         components.append("\(rotation)")
@@ -407,10 +409,19 @@ extension PresentationThemeRootNavigationBar: Codable {
         case segmentedDivider
         case clearButtonBackground
         case clearButtonForeground
+        case opaqueBackground
     }
     
     public convenience init(from decoder: Decoder) throws {
         let values = try decoder.container(keyedBy: CodingKeys.self)
+        let blurredBackgroundColor = try decodeColor(values, .background)
+
+        let opaqueBackgroundColor: UIColor
+        if blurredBackgroundColor.alpha >= 0.99 {
+            opaqueBackgroundColor = blurredBackgroundColor
+        } else {
+            opaqueBackgroundColor = (try? decodeColor(values, .opaqueBackground)) ?? blurredBackgroundColor
+        }
 
         self.init(
             buttonColor: try decodeColor(values, .button),
@@ -419,7 +430,8 @@ extension PresentationThemeRootNavigationBar: Codable {
             secondaryTextColor: try decodeColor(values, .secondaryText),
             controlColor: try decodeColor(values, .control),
             accentTextColor: try decodeColor(values, .accentText),
-            backgroundColor: try decodeColor(values, .background),
+            blurredBackgroundColor: blurredBackgroundColor,
+            opaqueBackgroundColor: opaqueBackgroundColor,
             separatorColor: try decodeColor(values, .separator),
             badgeBackgroundColor: try decodeColor(values, .badgeFill),
             badgeStrokeColor: try decodeColor(values, .badgeStroke),
@@ -441,7 +453,8 @@ extension PresentationThemeRootNavigationBar: Codable {
         try encodeColor(&values, self.secondaryTextColor, .secondaryText)
         try encodeColor(&values, self.controlColor, .control)
         try encodeColor(&values, self.accentTextColor, .accentText)
-        try encodeColor(&values, self.backgroundColor, .background)
+        try encodeColor(&values, self.blurredBackgroundColor, .background)
+        try encodeColor(&values, self.opaqueBackgroundColor, .opaqueBackground)
         try encodeColor(&values, self.separatorColor, .separator)
         try encodeColor(&values, self.badgeBackgroundColor, .badgeFill)
         try encodeColor(&values, self.badgeStrokeColor, .badgeStroke)
@@ -745,6 +758,33 @@ extension PresentationInputFieldTheme: Codable {
     }
 }
 
+extension PresentationThemeList.PaymentOption: Codable {
+    enum CodingKeys: String, CodingKey {
+        case inactiveFill
+        case inactiveForeground
+        case activeFill
+        case activeForeground
+    }
+
+    public convenience init(from decoder: Decoder) throws {
+        let values = try decoder.container(keyedBy: CodingKeys.self)
+        self.init(
+            inactiveFillColor: try decodeColor(values, .inactiveFill),
+            inactiveForegroundColor: try decodeColor(values, .inactiveForeground),
+            activeFillColor: try decodeColor(values, .activeFill),
+            activeForegroundColor: try decodeColor(values, .activeForeground)
+        )
+    }
+
+    public func encode(to encoder: Encoder) throws {
+        var values = encoder.container(keyedBy: CodingKeys.self)
+        try encodeColor(&values, self.activeFillColor, .inactiveFill)
+        try encodeColor(&values, self.activeForegroundColor, .inactiveForeground)
+        try encodeColor(&values, self.activeFillColor, .activeFill)
+        try encodeColor(&values, self.activeForegroundColor, .activeForeground)
+    }
+}
+
 extension PresentationThemeList: Codable {
     enum CodingKeys: String, CodingKey {
         case blocksBg
@@ -778,6 +818,7 @@ extension PresentationThemeList: Codable {
         case inputClearButton
         case itemBarChart
         case itemInputField
+        case paymentOption
     }
     
     public convenience init(from decoder: Decoder) throws {
@@ -789,6 +830,8 @@ extension PresentationThemeList: Codable {
         } else {
             freePlainInputField = try values.decode(PresentationInputFieldTheme.self, forKey: .freeInputField)
         }
+
+        let freeTextSuccessColor = try decodeColor(values, .freeTextSuccess)
         
         self.init(
             blocksBackgroundColor: try decodeColor(values, .blocksBg),
@@ -808,7 +851,7 @@ extension PresentationThemeList: Codable {
             sectionHeaderTextColor: try decodeColor(values, .sectionHeaderText),
             freeTextColor: try decodeColor(values, .freeText),
             freeTextErrorColor: try decodeColor(values, .freeTextError),
-            freeTextSuccessColor: try decodeColor(values, .freeTextSuccess),
+            freeTextSuccessColor: freeTextSuccessColor,
             freeMonoIconColor: try decodeColor(values, .freeMonoIcon),
             itemSwitchColors: try values.decode(PresentationThemeSwitch.self, forKey: .switch),
             itemDisclosureActions: try values.decode(PresentationThemeItemDisclosureActions.self, forKey: .disclosureActions),
@@ -821,7 +864,13 @@ extension PresentationThemeList: Codable {
             pageIndicatorInactiveColor: try decodeColor(values, .pageIndicatorInactive),
             inputClearButtonColor: try decodeColor(values, .inputClearButton),
             itemBarChart: try values.decode(PresentationThemeItemBarChart.self, forKey: .itemBarChart),
-            itemInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .itemInputField)
+            itemInputField: try values.decode(PresentationInputFieldTheme.self, forKey: .itemInputField),
+            paymentOption: (try? values.decode(PresentationThemeList.PaymentOption.self, forKey: .paymentOption)) ?? PresentationThemeList.PaymentOption(
+                inactiveFillColor: freeTextSuccessColor.withMultipliedAlpha(0.3),
+                inactiveForegroundColor: freeTextSuccessColor,
+                activeFillColor: freeTextSuccessColor,
+                activeForegroundColor: UIColor(rgb: 0xffffff)
+            )
         )
     }
     
@@ -1846,9 +1895,9 @@ extension PresentationTheme: Codable {
         if let decoder = decoder as? PresentationThemeDecoding {
             let serviceBackgroundColor = decoder.serviceBackgroundColor ?? defaultServiceBackgroundColor
             decoder.referenceTheme = makeDefaultPresentationTheme(reference: referenceTheme, serviceBackgroundColor: serviceBackgroundColor)
-            index = decoder.reference?.index ?? arc4random64()
+            index = decoder.reference?.index ?? Int64.random(in: Int64.min ... Int64.max)
         } else {
-            index = arc4random64()
+            index = Int64.random(in: Int64.min ... Int64.max)
         }
         
         self.init(name: (try? values.decode(PresentationThemeName.self, forKey: .name)) ?? .custom("Untitled"),
diff --git a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
index 66b3464aab..b898ce12f1 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationThemeEssentialGraphics.swift
@@ -192,55 +192,50 @@ public final class PrincipalThemeEssentialGraphics {
     
     public let hasWallpaper: Bool
     
-    init(mediaBox: MediaBox, presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, knockoutMode: Bool, bubbleCorners: PresentationChatBubbleCorners) {
+    init(presentationTheme: PresentationTheme, wallpaper initialWallpaper: TelegramWallpaper, preview: Bool = false, bubbleCorners: PresentationChatBubbleCorners) {
         let theme = presentationTheme.chat
-        var wallpaper = initialWallpaper
+        let wallpaper = initialWallpaper
         self.hasWallpaper = !wallpaper.isEmpty
         
         let incoming: PresentationThemeBubbleColorComponents = wallpaper.isEmpty ? theme.message.incoming.bubble.withoutWallpaper : theme.message.incoming.bubble.withWallpaper
         let outgoing: PresentationThemeBubbleColorComponents = wallpaper.isEmpty ? theme.message.outgoing.bubble.withoutWallpaper : theme.message.outgoing.bubble.withWallpaper
-        
-        if knockoutMode {
-            let wallpaperImage = chatControllerBackgroundImage(theme: presentationTheme, wallpaper: wallpaper, mediaBox: mediaBox, knockoutMode: false)
-            self.incomingBubbleGradientImage = wallpaperImage
-            self.outgoingBubbleGradientImage = wallpaperImage
-            wallpaper = presentationTheme.chat.defaultWallpaper
+
+        var incomingGradientColors: (UIColor, UIColor)?
+        if incoming.fill.rgb != incoming.gradientFill.rgb {
+            incomingGradientColors = (incoming.fill, incoming.gradientFill)
+        }
+        if let incomingGradientColors = incomingGradientColors {
+            self.incomingBubbleGradientImage = generateImage(CGSize(width: 1.0, height: 512.0), opaque: true, scale: 1.0, rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                var locations: [CGFloat] = [0.0, 1.0]
+                let colors = [incomingGradientColors.0.cgColor, incomingGradientColors.1.cgColor] as NSArray
+
+                let colorSpace = deviceColorSpace
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors, locations: &locations)!
+
+                context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+            })
         } else {
-            var incomingGradientColors: (UIColor, UIColor)?
-            if incoming.fill.rgb != incoming.gradientFill.rgb {
-                incomingGradientColors = (incoming.fill, incoming.gradientFill)
-            }
-            if let incomingGradientColors = incomingGradientColors {
-                self.incomingBubbleGradientImage = generateImage(CGSize(width: 1.0, height: 512.0), opaque: true, scale: 1.0, rotatedContext: { size, context in
-                    var locations: [CGFloat] = [0.0, 1.0]
-                    let colors = [incomingGradientColors.0.cgColor, incomingGradientColors.1.cgColor] as NSArray
-                    
-                    let colorSpace = deviceColorSpace
-                    let gradient = CGGradient(colorsSpace: colorSpace, colors: colors, locations: &locations)!
-                    
-                    context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
-                })
-            } else {
-                self.incomingBubbleGradientImage = nil
-            }
-            
-            var outgoingGradientColors: (UIColor, UIColor)?
-            if outgoing.fill.rgb != outgoing.gradientFill.rgb {
-                outgoingGradientColors = (outgoing.fill, outgoing.gradientFill)
-            }
-            if let outgoingGradientColors = outgoingGradientColors {
-                self.outgoingBubbleGradientImage = generateImage(CGSize(width: 1.0, height: 512.0), opaque: true, scale: 1.0, rotatedContext: { size, context in
-                    var locations: [CGFloat] = [0.0, 1.0]
-                    let colors = [outgoingGradientColors.0.cgColor, outgoingGradientColors.1.cgColor] as NSArray
-                    
-                    let colorSpace = deviceColorSpace
-                    let gradient = CGGradient(colorsSpace: colorSpace, colors: colors, locations: &locations)!
-                    
-                    context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
-                })
-            } else {
-                self.outgoingBubbleGradientImage = nil
-            }
+            self.incomingBubbleGradientImage = nil
+        }
+
+        var outgoingGradientColors: (UIColor, UIColor)?
+        if outgoing.fill.rgb != outgoing.gradientFill.rgb {
+            outgoingGradientColors = (outgoing.fill, outgoing.gradientFill)
+        }
+        if let outgoingGradientColors = outgoingGradientColors {
+            self.outgoingBubbleGradientImage = generateImage(CGSize(width: 1.0, height: 512.0), opaque: true, scale: 1.0, rotatedContext: { size, context in
+                context.clear(CGRect(origin: CGPoint(), size: size))
+                var locations: [CGFloat] = [0.0, 1.0]
+                let colors = [outgoingGradientColors.0.cgColor, outgoingGradientColors.1.cgColor] as NSArray
+
+                let colorSpace = deviceColorSpace
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors, locations: &locations)!
+
+                context.drawLinearGradient(gradient, start: CGPoint(), end: CGPoint(x: 0.0, y: size.height), options: CGGradientDrawingOptions())
+            })
+        } else {
+            self.outgoingBubbleGradientImage = nil
         }
         
         let incomingKnockout = self.incomingBubbleGradientImage != nil
@@ -253,7 +248,7 @@ public final class PrincipalThemeEssentialGraphics {
         
         let emptyImage = UIImage()
         if preview {
-            self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
+            self.chatMessageBackgroundIncomingMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .none, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundIncomingExtractedMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: UIColor.black, strokeColor: UIColor.clear, neighbors: .extracted, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundIncomingImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .none, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
             self.chatMessageBackgroundIncomingExtractedImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .extracted, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
@@ -270,30 +265,33 @@ public final class PrincipalThemeEssentialGraphics {
             self.checkBubbleFullImage = generateCheckImage(partial: false, color: theme.message.outgoingCheckColor, width: 11.0)!
             self.checkBubblePartialImage = generateCheckImage(partial: true, color: theme.message.outgoingCheckColor, width: 11.0)!
             self.chatMessageBackgroundIncomingHighlightedImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedTopMaskImage = emptyImage
+            self.chatMessageBackgroundIncomingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundIncomingMergedTopImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
             self.chatMessageBackgroundIncomingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true)
             self.chatMessageBackgroundIncomingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundIncomingMergedTopHighlightedImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedTopSideMaskImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedTopSideImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedTopSideShadowImage = emptyImage
+            self.chatMessageBackgroundIncomingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
+            self.chatMessageBackgroundIncomingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
+            self.chatMessageBackgroundIncomingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true)
+            self.chatMessageBackgroundIncomingMergedTopSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundIncomingMergedTopSideHighlightedImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedBottomMaskImage = emptyImage
+            self.chatMessageBackgroundIncomingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundIncomingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
             self.chatMessageBackgroundIncomingMergedBottomOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true)
             self.chatMessageBackgroundIncomingMergedBottomShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundIncomingMergedBottomHighlightedImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedBothMaskImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedBothImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedBothOutlineImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedBothShadowImage = emptyImage
+            self.chatMessageBackgroundIncomingMergedBothMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .both, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
+
+            self.chatMessageBackgroundIncomingMergedBothImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true)
+            self.chatMessageBackgroundIncomingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyOutline: true)
+            self.chatMessageBackgroundIncomingMergedBothShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: incomingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundIncomingMergedBothHighlightedImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedSideMaskImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedSideImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedSideOutlineImage = emptyImage
-            self.chatMessageBackgroundIncomingMergedSideShadowImage = emptyImage
+            self.chatMessageBackgroundIncomingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
+            self.chatMessageBackgroundIncomingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true)
+
+            self.chatMessageBackgroundIncomingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true)
+            self.chatMessageBackgroundIncomingMergedSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: true, fillColor: incoming.fill, strokeColor: incoming.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true)
+            self.chatMessageBackgroundOutgoingMergedSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .side, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundIncomingMergedSideHighlightedImage = emptyImage
             self.chatMessageBackgroundOutgoingHighlightedImage = emptyImage
             self.chatMessageBackgroundOutgoingMergedTopMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: false), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
@@ -301,10 +299,10 @@ public final class PrincipalThemeEssentialGraphics {
             self.chatMessageBackgroundOutgoingMergedTopOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true)
             self.chatMessageBackgroundOutgoingMergedTopShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: false), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundOutgoingMergedTopHighlightedImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedTopSideImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedTopSideShadowImage = emptyImage
+            self.chatMessageBackgroundOutgoingMergedTopSideMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .top(side: true), theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
+            self.chatMessageBackgroundOutgoingMergedTopSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true)
+            self.chatMessageBackgroundOutgoingMergedTopSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true)
+            self.chatMessageBackgroundOutgoingMergedTopSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .top(side: true), theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundOutgoingMergedTopSideHighlightedImage = emptyImage
             self.chatMessageBackgroundOutgoingMergedBottomMaskImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: .black, strokeColor: .clear, neighbors: .bottom, theme: theme, wallpaper: .color(0xffffff), knockout: true, mask: true, extendedEdges: true)
             self.chatMessageBackgroundOutgoingMergedBottomImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .bottom, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true)
@@ -316,10 +314,9 @@ public final class PrincipalThemeEssentialGraphics {
             self.chatMessageBackgroundOutgoingMergedBothOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true)
             self.chatMessageBackgroundOutgoingMergedBothShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .both, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundOutgoingMergedBothHighlightedImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedSideMaskImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedSideImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedSideOutlineImage = emptyImage
-            self.chatMessageBackgroundOutgoingMergedSideShadowImage = emptyImage
+            self.chatMessageBackgroundOutgoingMergedSideImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true)
+            self.chatMessageBackgroundOutgoingMergedSideOutlineImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyOutline: true)
+            self.chatMessageBackgroundOutgoingMergedSideShadowImage = messageBubbleImage(maxCornerRadius: maxCornerRadius, minCornerRadius: minCornerRadius, incoming: false, fillColor: outgoing.fill, strokeColor: outgoing.stroke, neighbors: .side, theme: theme, wallpaper: wallpaper, knockout: outgoingKnockout, extendedEdges: true, onlyShadow: true)
             self.chatMessageBackgroundOutgoingMergedSideHighlightedImage = emptyImage
             self.checkMediaFullImage = emptyImage
             self.checkMediaPartialImage = emptyImage
@@ -505,12 +502,16 @@ public final class PrincipalThemeAdditionalGraphics {
     public let chatEmptyItemBackgroundImage: UIImage
     public let chatLoadingIndicatorBackgroundImage: UIImage
     
-    public let chatBubbleShareButtonImage: UIImage
+
     public let chatBubbleNavigateButtonImage: UIImage
     public let chatBubbleActionButtonIncomingMiddleImage: UIImage
+    public let chatBubbleActionButtonMiddleMaskImage: UIImage
     public let chatBubbleActionButtonIncomingBottomLeftImage: UIImage
+    public let chatBubbleActionButtonBottomLeftMaskImage: UIImage
     public let chatBubbleActionButtonIncomingBottomRightImage: UIImage
+    public let chatBubbleActionButtonBottomRightMaskImage: UIImage
     public let chatBubbleActionButtonIncomingBottomSingleImage: UIImage
+    public let chatBubbleActionButtonBottomSingleMaskImage: UIImage
     public let chatBubbleActionButtonOutgoingMiddleImage: UIImage
     public let chatBubbleActionButtonOutgoingBottomLeftImage: UIImage
     public let chatBubbleActionButtonOutgoingBottomRightImage: UIImage
@@ -521,12 +522,14 @@ public final class PrincipalThemeAdditionalGraphics {
     public let chatBubbleActionButtonIncomingShareIconImage: UIImage
     public let chatBubbleActionButtonIncomingPhoneIconImage: UIImage
     public let chatBubbleActionButtonIncomingLocationIconImage: UIImage
+    public let chatBubbleActionButtonIncomingPaymentIconImage: UIImage
     
     public let chatBubbleActionButtonOutgoingMessageIconImage: UIImage
     public let chatBubbleActionButtonOutgoingLinkIconImage: UIImage
     public let chatBubbleActionButtonOutgoingShareIconImage: UIImage
     public let chatBubbleActionButtonOutgoingPhoneIconImage: UIImage
     public let chatBubbleActionButtonOutgoingLocationIconImage: UIImage
+    public let chatBubbleActionButtonOutgoingPaymentIconImage: UIImage
     
     public let chatEmptyItemLockIcon: UIImage
     public let emptyChatListCheckIcon: UIImage
@@ -550,12 +553,15 @@ public final class PrincipalThemeAdditionalGraphics {
         self.chatEmptyItemBackgroundImage = generateStretchableFilledCircleImage(radius: 14.0, color: serviceColor.fill)!
         self.chatLoadingIndicatorBackgroundImage = generateStretchableFilledCircleImage(diameter: 30.0, color: serviceColor.fill)!
         
-        self.chatBubbleShareButtonImage = chatBubbleActionButtonImage(fillColor: bubbleVariableColor(variableColor: theme.message.shareButtonFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.shareButtonStrokeColor, wallpaper: wallpaper), foregroundColor: bubbleVariableColor(variableColor: theme.message.shareButtonForegroundColor, wallpaper: wallpaper), image: UIImage(bundleImageName: "Chat/Message/ShareIcon"))!
         self.chatBubbleNavigateButtonImage = chatBubbleActionButtonImage(fillColor: bubbleVariableColor(variableColor: theme.message.shareButtonFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.shareButtonStrokeColor, wallpaper: wallpaper), foregroundColor: bubbleVariableColor(variableColor: theme.message.shareButtonForegroundColor, wallpaper: wallpaper), image: UIImage(bundleImageName: "Chat/Message/NavigateToMessageIcon"), iconOffset: CGPoint(x: 0.0, y: 1.0))!
         self.chatBubbleActionButtonIncomingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle, bubbleCorners: bubbleCorners)
+        self.chatBubbleActionButtonMiddleMaskImage = messageBubbleActionButtonImage(color: .white, strokeColor: .clear, position: .middle, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonIncomingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft, bubbleCorners: bubbleCorners)
+        self.chatBubbleActionButtonBottomLeftMaskImage = messageBubbleActionButtonImage(color: .black, strokeColor: .clear, position: .bottomLeft, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonIncomingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight, bubbleCorners: bubbleCorners)
+        self.chatBubbleActionButtonBottomRightMaskImage = messageBubbleActionButtonImage(color: .black, strokeColor: .clear, position: .bottomRight, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonIncomingBottomSingleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomSingle, bubbleCorners: bubbleCorners)
+        self.chatBubbleActionButtonBottomSingleMaskImage = messageBubbleActionButtonImage(color: .black, strokeColor: .clear, position: .bottomSingle, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonOutgoingMiddleImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .middle, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonOutgoingBottomLeftImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomLeft, bubbleCorners: bubbleCorners)
         self.chatBubbleActionButtonOutgoingBottomRightImage = messageBubbleActionButtonImage(color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsFillColor, wallpaper: wallpaper), strokeColor: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsStrokeColor, wallpaper: wallpaper), position: .bottomRight, bubbleCorners: bubbleCorners)
@@ -565,11 +571,13 @@ public final class PrincipalThemeAdditionalGraphics {
         self.chatBubbleActionButtonIncomingShareIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotShare"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonIncomingPhoneIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPhone"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonIncomingLocationIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLocation"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))!
+        self.chatBubbleActionButtonIncomingPaymentIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPayment"), color: bubbleVariableColor(variableColor: theme.message.incoming.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonOutgoingMessageIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotMessage"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonOutgoingLinkIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLink"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonOutgoingShareIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotShare"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonOutgoingPhoneIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPhone"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
         self.chatBubbleActionButtonOutgoingLocationIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotLocation"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
+        self.chatBubbleActionButtonOutgoingPaymentIconImage = generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/BotPayment"), color: bubbleVariableColor(variableColor: theme.message.outgoing.actionButtonsTextColor, wallpaper: wallpaper))!
         
         self.chatEmptyItemLockIcon = generateImage(CGSize(width: 9.0, height: 13.0), rotatedContext: { size, context in
             context.clear(CGRect(origin: CGPoint(), size: size))
diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
index b9a7ae0f89..c065b4ce41 100644
--- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
+++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
@@ -239,9 +239,10 @@ public enum PresentationResourceKey: Int32 {
     case groupInfoMembersIcon
     
     case emptyChatListCheckIcon
-    
-    case chatFreeCommentButtonBackground
+
     case chatFreeCommentButtonIcon
+    case chatFreeNavigateButtonIcon
+    case chatFreeShareButtonIcon
 }
 
 public enum PresentationResourceParameterKey: Hashable {
diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift
index 30634afe59..6de22efbc3 100644
--- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift
+++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift
@@ -86,10 +86,10 @@ public struct PresentationResourcesChat {
         })
     }
     
-    public static func principalGraphics(mediaBox: MediaBox, knockoutWallpaper: Bool, theme: PresentationTheme, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) -> PrincipalThemeEssentialGraphics {
+    public static func principalGraphics(theme: PresentationTheme, wallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) -> PrincipalThemeEssentialGraphics {
         let hasWallpaper = !wallpaper.isEmpty
         return theme.object(PresentationResourceParameterKey.chatPrincipalThemeEssentialGraphics(hasWallpaper: hasWallpaper, bubbleCorners: bubbleCorners), { theme in
-            return PrincipalThemeEssentialGraphics(mediaBox: mediaBox, presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, knockoutMode: knockoutWallpaper, bubbleCorners: bubbleCorners)
+            return PrincipalThemeEssentialGraphics(presentationTheme: theme, wallpaper: wallpaper, preview: theme.preview, bubbleCorners: bubbleCorners)
         }) as! PrincipalThemeEssentialGraphics
     }
     
@@ -532,7 +532,14 @@ public struct PresentationResourcesChat {
     
     public static func chatInputTextFieldTimerImage(_ theme: PresentationTheme) -> UIImage? {
         return theme.image(PresentationResourceKey.chatInputTextFieldTimerImage.rawValue, { theme in
-            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Text/AccessoryIconTimer"), color: theme.chat.inputPanel.inputControlColor)
+            if let image = generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Text/AccessoryIconTimer"), color: theme.chat.inputPanel.inputControlColor) {
+                return generateImage(CGSize(width: image.size.width, height: image.size.height + 1.0), contextGenerator: { size, context in
+                    context.clear(CGRect(origin: CGPoint(), size: size))
+                    context.draw(image.cgImage!, in: CGRect(origin: CGPoint(x: 0.0, y: 2.0), size: image.size))
+                })
+            } else {
+                return nil
+            }
         })
     }
     
@@ -546,8 +553,6 @@ public struct PresentationResourcesChat {
         return theme.image(PresentationResourceKey.chatHistoryNavigationButtonImage.rawValue, { theme in
             return generateImage(CGSize(width: 38.0, height: 38.0), contextGenerator: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
-                context.setFillColor(theme.chat.historyNavigation.fillColor.cgColor)
-                context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.5, y: 0.5), size: CGSize(width: size.width - 1.0, height: size.height - 1.0)))
                 context.setLineWidth(0.5)
                 context.setStrokeColor(theme.chat.historyNavigation.strokeColor.cgColor)
                 context.strokeEllipse(in: CGRect(origin: CGPoint(x: 0.25, y: 0.25), size: CGSize(width: size.width - 0.5, height: size.height - 0.5)))
@@ -658,7 +663,7 @@ public struct PresentationResourcesChat {
         return theme.image(PresentationResourceKey.chatInstantMessageInfoBackgroundImage.rawValue, { theme in
             return generateImage(CGSize(width: 24.0, height: 24.0), rotatedContext: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
-                context.setFillColor(theme.chat.message.mediaDateAndStatusFillColor.cgColor)
+                context.setFillColor(theme.chat.message.mediaDateAndStatusFillColor.withAlphaComponent(0.3).cgColor)
                 context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
             })?.stretchableImage(withLeftCapWidth: 12, topCapHeight: 12)
         })
@@ -1088,16 +1093,21 @@ public struct PresentationResourcesChat {
         })
     }
     
-    public static func chatFreeCommentButtonBackground(_ theme: PresentationTheme, wallpaper: TelegramWallpaper) -> UIImage? {
-        return theme.image(PresentationResourceKey.chatFreeCommentButtonBackground.rawValue, { _ in
-            let strokeColor = bubbleVariableColor(variableColor: theme.chat.message.shareButtonStrokeColor, wallpaper: wallpaper)
-            return generateStretchableFilledCircleImage(diameter: 30.0, color: bubbleVariableColor(variableColor: theme.chat.message.shareButtonFillColor, wallpaper: wallpaper), strokeColor: strokeColor, strokeWidth: strokeColor.alpha.isZero ? nil : 1.0)
-        })
-    }
-    
     public static func chatFreeCommentButtonIcon(_ theme: PresentationTheme, wallpaper: TelegramWallpaper) -> UIImage? {
         return theme.image(PresentationResourceKey.chatFreeCommentButtonIcon.rawValue, { _ in
             return generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/FreeRepliesIcon"), color: bubbleVariableColor(variableColor: theme.chat.message.shareButtonForegroundColor, wallpaper: wallpaper))
         })
     }
+
+    public static func chatFreeNavigateButtonIcon(_ theme: PresentationTheme, wallpaper: TelegramWallpaper) -> UIImage? {
+        return theme.image(PresentationResourceKey.chatFreeNavigateButtonIcon.rawValue, { _ in
+            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/NavigateToMessageIcon"), color: bubbleVariableColor(variableColor: theme.chat.message.shareButtonForegroundColor, wallpaper: wallpaper))
+        })
+    }
+
+    public static func chatFreeShareButtonIcon(_ theme: PresentationTheme, wallpaper: TelegramWallpaper) -> UIImage? {
+        return theme.image(PresentationResourceKey.chatFreeShareButtonIcon.rawValue, { _ in
+            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Message/ShareIcon"), color: bubbleVariableColor(variableColor: theme.chat.message.shareButtonForegroundColor, wallpaper: wallpaper))
+        })
+    }
 }
diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift
index 3ae4d727d1..21d6342e2f 100644
--- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift
+++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift
@@ -56,6 +56,7 @@ public struct PresentationResourcesSettings {
     
     public static let support = renderIcon(name: "Settings/MenuIcons/Support")
     public static let faq = renderIcon(name: "Settings/MenuIcons/Faq")
+    public static let tips = renderIcon(name: "Settings/MenuIcons/Tips")
     
     public static let addAccount = renderIcon(name: "Settings/MenuIcons/AddAccount")
     public static let setPasscode = renderIcon(name: "Settings/MenuIcons/SetPasscode")
diff --git a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift
index 23bc0158dc..f3afab6527 100644
--- a/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift
+++ b/submodules/TelegramPresentationData/Sources/WallpaperUtils.swift
@@ -8,8 +8,8 @@ public extension TelegramWallpaper {
         switch self {
         case .image:
             return false
-        case let .file(file):
-            if self.isPattern, file.settings.color == 0xffffff || file.settings.color == 0xffffffff {
+        case let .file(_, _, _, _, _, _, _, _, settings):
+            if self.isPattern, settings.colors.count == 1 && (settings.colors[0] == 0xffffff || settings.colors[0] == 0xffffffff) {
                 return true
             } else {
                 return false
diff --git a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift
index c673cecd03..b4aab4c33d 100644
--- a/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift
+++ b/submodules/TelegramStringFormatting/Sources/CurrencyFormat.swift
@@ -46,6 +46,83 @@ private func loadCurrencyFormatterEntries() -> [String: CurrencyFormatterEntry]
 
 private let currencyFormatterEntries = loadCurrencyFormatterEntries()
 
+public func setupCurrencyNumberFormatter(currency: String) -> NumberFormatter {
+    guard let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] else {
+        preconditionFailure()
+    }
+
+    var result = ""
+    if entry.symbolOnLeft {
+        result.append("¤")
+        if entry.spaceBetweenAmountAndSymbol {
+            result.append(" ")
+        }
+    }
+
+    result.append("#")
+
+    if entry.decimalDigits != 0 {
+        result.append(entry.decimalSeparator)
+    }
+
+    for _ in 0 ..< entry.decimalDigits {
+        result.append("#")
+    }
+    if entry.decimalDigits != 0 {
+        result.append("0")
+    }
+
+    if !entry.symbolOnLeft {
+        if entry.spaceBetweenAmountAndSymbol {
+            result.append(" ")
+        }
+        result.append("¤")
+    }
+
+    let numberFormatter = NumberFormatter()
+
+    numberFormatter.numberStyle = .currency
+
+    numberFormatter.positiveFormat = result
+    numberFormatter.negativeFormat = "-\(result)"
+
+    numberFormatter.currencySymbol = ""
+    numberFormatter.currencyDecimalSeparator = entry.decimalSeparator
+    numberFormatter.currencyGroupingSeparator = entry.thousandsSeparator
+
+    numberFormatter.minimumFractionDigits = entry.decimalDigits
+    numberFormatter.maximumFractionDigits = entry.decimalDigits
+    numberFormatter.minimumIntegerDigits = 1
+
+    return numberFormatter
+}
+
+public func fractionalToCurrencyAmount(value: Double, currency: String) -> Int64? {
+    guard let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] else {
+        return nil
+    }
+    var factor: Double = 1.0
+    for _ in 0 ..< entry.decimalDigits {
+        factor *= 10.0
+    }
+    if value > Double(Int64.max) / factor {
+        return nil
+    } else {
+        return Int64(value * factor)
+    }
+}
+
+public func currencyToFractionalAmount(value: Int64, currency: String) -> Double? {
+    guard let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] else {
+        return nil
+    }
+    var factor: Double = 1.0
+    for _ in 0 ..< entry.decimalDigits {
+        factor *= 10.0
+    }
+    return Double(value) / factor
+}
+
 public func formatCurrencyAmount(_ amount: Int64, currency: String) -> String {
     if let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] {
         var result = ""
@@ -68,7 +145,9 @@ public func formatCurrencyAmount(_ amount: Int64, currency: String) -> String {
             }
         }
         result.append("\(integerPart)")
-        result.append(entry.decimalSeparator)
+        if !fractional.isEmpty {
+            result.append(entry.decimalSeparator)
+        }
         for i in 0 ..< fractional.count {
             result.append(fractional[fractional.count - i - 1])
         }
@@ -89,3 +168,61 @@ public func formatCurrencyAmount(_ amount: Int64, currency: String) -> String {
         return formatter.string(from: (Float(amount) * 0.01) as NSNumber) ?? ""
     }
 }
+
+public func formatCurrencyAmountCustom(_ amount: Int64, currency: String) -> (String, String, Bool) {
+    if let entry = currencyFormatterEntries[currency] ?? currencyFormatterEntries["USD"] {
+        var result = ""
+        if amount < 0 {
+            result.append("-")
+        }
+        /*if entry.symbolOnLeft {
+            result.append(entry.symbol)
+            if entry.spaceBetweenAmountAndSymbol {
+                result.append(" ")
+            }
+        }*/
+        var integerPart = abs(amount)
+        var fractional: [Character] = []
+        for _ in 0 ..< entry.decimalDigits {
+            let part = integerPart % 10
+            integerPart /= 10
+            if let scalar = UnicodeScalar(UInt32(part + 48)) {
+                fractional.append(Character(scalar))
+            }
+        }
+        result.append("\(integerPart)")
+        if !fractional.isEmpty {
+            result.append(entry.decimalSeparator)
+        }
+        for i in 0 ..< fractional.count {
+            result.append(fractional[fractional.count - i - 1])
+        }
+        /*if !entry.symbolOnLeft {
+            if entry.spaceBetweenAmountAndSymbol {
+                result.append(" ")
+            }
+            result.append(entry.symbol)
+        }*/
+
+        return (result, entry.symbol, entry.symbolOnLeft)
+    } else {
+        return ("", "", false)
+    }
+}
+
+public struct CurrencyFormat {
+    public var symbol: String
+    public var symbolOnLeft: Bool
+    public var decimalSeparator: String
+    public var decimalDigits: Int
+
+    public init?(currency: String) {
+        guard let entry = currencyFormatterEntries[currency] else {
+            return nil
+        }
+        self.symbol = entry.symbol
+        self.symbolOnLeft = entry.symbolOnLeft
+        self.decimalSeparator = entry.decimalSeparator
+        self.decimalDigits = entry.decimalDigits
+    }
+}
diff --git a/submodules/TelegramStringFormatting/Sources/DataSizeFormat.swift b/submodules/TelegramStringFormatting/Sources/DataSizeFormat.swift
new file mode 100644
index 0000000000..576b4baf43
--- /dev/null
+++ b/submodules/TelegramStringFormatting/Sources/DataSizeFormat.swift
@@ -0,0 +1,17 @@
+import Foundation
+import TelegramCore
+import TelegramPresentationData
+
+public extension DataSizeStringFormatting {
+    init(presentationData: PresentationData) {
+        self.init(decimalSeparator: presentationData.dateTimeFormat.decimalSeparator, byte: presentationData.strings.FileSize_B(_:), kilobyte: presentationData.strings.FileSize_KB(_:), megabyte: presentationData.strings.FileSize_MB(_:), gigabyte: presentationData.strings.FileSize_GB(_:))
+    }
+    
+    init (chatPresentationData: ChatPresentationData) {
+        self.init(decimalSeparator: chatPresentationData.dateTimeFormat.decimalSeparator, byte: chatPresentationData.strings.FileSize_B(_:), kilobyte: chatPresentationData.strings.FileSize_KB(_:), megabyte: chatPresentationData.strings.FileSize_MB(_:), gigabyte: chatPresentationData.strings.FileSize_GB(_:))
+    }
+    
+    init (strings: PresentationStrings, decimalSeparator: String) {
+        self.init(decimalSeparator: decimalSeparator, byte: strings.FileSize_B(_:), kilobyte: strings.FileSize_KB(_:), megabyte: strings.FileSize_MB(_:), gigabyte: strings.FileSize_GB(_:))
+    }
+}
diff --git a/submodules/TelegramStringFormatting/Sources/DateFormat.swift b/submodules/TelegramStringFormatting/Sources/DateFormat.swift
index fedb29e4d1..ebf1f1c351 100644
--- a/submodules/TelegramStringFormatting/Sources/DateFormat.swift
+++ b/submodules/TelegramStringFormatting/Sources/DateFormat.swift
@@ -54,11 +54,12 @@ public func stringForMediumDate(timestamp: Int32, strings: PresentationStrings,
     let dateString: String
     let separator = dateTimeFormat.dateSeparator
     let suffix = dateTimeFormat.dateSuffix
+    let displayYear = dateTimeFormat.requiresFullYear ? year - 100 + 2000 : year - 100
     switch dateTimeFormat.dateFormat {
         case .monthFirst:
-            dateString = String(format: "%02d%@%02d%@%02d%@", month, separator, day, separator, year - 100, suffix)
+            dateString = String(format: "%02d%@%02d%@%02d%@", month, separator, day, separator, displayYear, suffix)
         case .dayFirst:
-            dateString = String(format: "%02d%@%02d%@%02d%@", day, separator, month, separator, year - 100, suffix)
+            dateString = String(format: "%02d%@%02d%@%02d%@", day, separator, month, separator, displayYear, suffix)
     }
     
     let timeString = stringForShortTimestamp(hours: Int32(timeinfo.tm_hour), minutes: Int32(timeinfo.tm_min), dateTimeFormat: dateTimeFormat)
diff --git a/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift b/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift
index 6b0549106e..d2689b2a6b 100644
--- a/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift
+++ b/submodules/TelegramStringFormatting/Sources/MessageContentKind.swift
@@ -24,6 +24,7 @@ public enum MessageContentKindKey {
     case poll
     case restricted
     case dice
+    case invoice
 }
 
 public enum MessageContentKind: Equatable {
@@ -44,6 +45,7 @@ public enum MessageContentKind: Equatable {
     case poll(String)
     case restricted(String)
     case dice(String)
+    case invoice(String)
     
     public var key: MessageContentKindKey {
         switch self {
@@ -81,11 +83,13 @@ public enum MessageContentKind: Equatable {
             return .restricted
         case .dice:
             return .dice
+        case .invoice:
+            return .invoice
         }
     }
 }
 
-public func messageContentKind(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId) -> MessageContentKind {
+public func messageContentKind(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId) -> MessageContentKind {
     for attribute in message.attributes {
         if let attribute = attribute as? RestrictedContentMessageAttribute {
             if let text = attribute.platformText(platform: "ios", contentSettings: contentSettings) {
@@ -95,14 +99,14 @@ public func messageContentKind(contentSettings: ContentSettings, message: Messag
         }
     }
     for media in message.media {
-        if let kind = mediaContentKind(media, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId) {
+        if let kind = mediaContentKind(media, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId) {
             return kind
         }
     }
     return .text(message.text)
 }
 
-public func mediaContentKind(_ media: Media, message: Message? = nil, strings: PresentationStrings? = nil, nameDisplayOrder: PresentationPersonNameOrder? = nil, accountPeerId: PeerId? = nil) -> MessageContentKind? {
+public func mediaContentKind(_ media: Media, message: Message? = nil, strings: PresentationStrings? = nil, nameDisplayOrder: PresentationPersonNameOrder? = nil, dateTimeFormat: PresentationDateTimeFormat? = nil, accountPeerId: PeerId? = nil) -> MessageContentKind? {
     switch media {
     case let expiredMedia as TelegramMediaExpiredContent:
         switch expiredMedia.data {
@@ -163,7 +167,7 @@ public func mediaContentKind(_ media: Media, message: Message? = nil, strings: P
         }
     case _ as TelegramMediaAction:
         if let message = message, let strings = strings, let nameDisplayOrder = nameDisplayOrder, let accountPeerId = accountPeerId {
-            return .text(plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: false) ?? "")
+            return .text(plainServiceMessageString(strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat ?? PresentationDateTimeFormat(timeFormat: .military, dateFormat: .dayFirst, dateSeparator: ".", dateSuffix: "", requiresFullYear: false, decimalSeparator: ".", groupingSeparator: ""), message: message, accountPeerId: accountPeerId, forChatList: false) ?? "")
         } else {
             return nil
         }
@@ -171,6 +175,8 @@ public func mediaContentKind(_ media: Media, message: Message? = nil, strings: P
         return .poll(poll.text)
     case let dice as TelegramMediaDice:
         return .dice(dice.emoji)
+    case let invoice as TelegramMediaInvoice:
+        return .invoice(invoice.title)
     default:
         return nil
     }
@@ -220,11 +226,13 @@ public func stringForMediaKind(_ kind: MessageContentKind, strings: Presentation
         return (text, false)
     case let .dice(emoji):
         return (emoji, true)
+    case let .invoice(text):
+        return (text, true)
     }
 }
 
-public func descriptionStringForMessage(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId) -> (String, Bool) {
-    let contentKind = messageContentKind(contentSettings: contentSettings, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId)
+public func descriptionStringForMessage(contentSettings: ContentSettings, message: Message, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId) -> (String, Bool) {
+    let contentKind = messageContentKind(contentSettings: contentSettings, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId)
     if !message.text.isEmpty && ![.expiredImage, .expiredVideo].contains(contentKind.key) {
         return (foldLineBreaks(message.text), false)
     }
diff --git a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift
index 5a30f40144..6847f5cd6d 100644
--- a/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift
+++ b/submodules/TelegramStringFormatting/Sources/PresenceStrings.swift
@@ -7,11 +7,12 @@ import TelegramPresentationData
 public func stringForTimestamp(day: Int32, month: Int32, year: Int32, dateTimeFormat: PresentationDateTimeFormat) -> String {
     let separator = dateTimeFormat.dateSeparator
     let suffix = dateTimeFormat.dateSuffix
+    let displayYear = dateTimeFormat.requiresFullYear ? year - 100 + 2000 : year - 100
     switch dateTimeFormat.dateFormat {
     case .monthFirst:
-        return String(format: "%02d%@%02d%@%02d%@", month, separator, day, separator, year - 100, suffix)
+        return String(format: "%02d%@%02d%@%02d%@", month, separator, day, separator, displayYear, suffix)
     case .dayFirst:
-        return String(format: "%02d%@%02d%@%02d%@", day, separator, month, separator, year - 100, suffix)
+        return String(format: "%02d%@%02d%@%02d%@", day, separator, month, separator, displayYear, suffix)
     }
 }
 
@@ -125,21 +126,38 @@ public func stringForUserPresence(strings: PresentationStrings, day: RelativeTim
     return dayString
 }
 
-private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32) -> String {
-    let dayString: String
+private func humanReadableStringForTimestamp(strings: PresentationStrings, day: RelativeTimestampFormatDay, dateTimeFormat: PresentationDateTimeFormat, hours: Int32, minutes: Int32, format: HumanReadableStringFormat? = nil) -> (String, [(Int, NSRange)]) {
+    let result: (String, [(Int, NSRange)])
     switch day {
         case .today:
-            dayString = strings.Time_TodayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+            let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)
+            result = format?.todayFormatString(string) ?? strings.Time_TodayAt(string)
         case .yesterday:
-            dayString = strings.Time_YesterdayAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+            let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)
+            result = format?.yesterdayFormatString(string) ?? strings.Time_YesterdayAt(string)
         case .tomorrow:
-            dayString = strings.Time_TomorrowAt(stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)).0
+            let string = stringForShortTimestamp(hours: hours, minutes: minutes, dateTimeFormat: dateTimeFormat)
+            result = format?.tomorrowFormatString(string) ?? strings.Time_TomorrowAt(string)
         
     }
-    return dayString
+    return result
 }
 
-public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32) -> String {
+public struct HumanReadableStringFormat {
+    let dateFormatString: (String) -> (String, [(Int, NSRange)])
+    let tomorrowFormatString: (String) -> (String, [(Int, NSRange)])
+    let todayFormatString: (String) -> (String, [(Int, NSRange)])
+    let yesterdayFormatString: (String) -> (String, [(Int, NSRange)])
+    
+    public init(dateFormatString: @escaping (String) -> (String, [(Int, NSRange)]), tomorrowFormatString:  @escaping (String) -> (String, [(Int, NSRange)]), todayFormatString: @escaping (String) -> (String, [(Int, NSRange)]), yesterdayFormatString:  @escaping (String) -> (String, [(Int, NSRange)]) = { ($0, []) }) {
+        self.dateFormatString = dateFormatString
+        self.tomorrowFormatString = tomorrowFormatString
+        self.todayFormatString = todayFormatString
+        self.yesterdayFormatString = yesterdayFormatString
+    }
+}
+
+public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, timestamp: Int32, alwaysShowTime: Bool = false, allowYesterday: Bool = true, format: HumanReadableStringFormat? = nil) -> (String, [(Int, NSRange)]) {
     var t: time_t = time_t(timestamp)
     var timeinfo: tm = tm()
     localtime_r(&t, &timeinfo)
@@ -150,11 +168,17 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi
     localtime_r(&now, &timeinfoNow)
     
     if timeinfo.tm_year != timeinfoNow.tm_year {
-        return "\(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat))"
+        let string: String
+        if alwaysShowTime {
+            string = stringForMediumDate(timestamp: timestamp, strings: strings, dateTimeFormat: dateTimeFormat)
+        } else {
+            string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)
+        }
+        return format?.dateFormatString(string) ?? (string, [])
     }
     
     let dayDifference = timeinfo.tm_yday - timeinfoNow.tm_yday
-    if dayDifference == 0 || dayDifference == -1 || dayDifference == 1 {
+    if dayDifference == 0 || (dayDifference == -1 && allowYesterday) || dayDifference == 1 {
         let day: RelativeTimestampFormatDay
         if dayDifference == 0 {
             day = .today
@@ -163,9 +187,15 @@ public func humanReadableStringForTimestamp(strings: PresentationStrings, dateTi
         } else {
             day = .tomorrow
         }
-        return humanReadableStringForTimestamp(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min)
+        return humanReadableStringForTimestamp(strings: strings, day: day, dateTimeFormat: dateTimeFormat, hours: timeinfo.tm_hour, minutes: timeinfo.tm_min, format: format)
     } else {
-        return "\(stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat))"
+        let string: String
+        if alwaysShowTime {
+            string = stringForMediumDate(timestamp: timestamp, strings: strings, dateTimeFormat: dateTimeFormat)
+        } else {
+            string = stringForTimestamp(day: timeinfo.tm_mday, month: timeinfo.tm_mon + 1, year: timeinfo.tm_year, dateTimeFormat: dateTimeFormat)
+        }
+        return format?.dateFormatString(string) ?? (string, [])
     }
 }
 
diff --git a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
index 80778fe1ff..71fa764773 100644
--- a/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
+++ b/submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
@@ -27,11 +27,11 @@ private func peerMentionsAttributes(primaryTextColor: UIColor, peerIds: [(Int, P
     return result
 }
 
-public func plainServiceMessageString(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId, forChatList: Bool) -> String? {
-    return universalServiceMessageString(presentationData: nil, strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: forChatList)?.string
+public func plainServiceMessageString(strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId, forChatList: Bool) -> String? {
+    return universalServiceMessageString(presentationData: nil, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: forChatList)?.string
 }
 
-public func universalServiceMessageString(presentationData: (PresentationTheme, TelegramWallpaper)?, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId, forChatList: Bool) -> NSAttributedString? {
+public func universalServiceMessageString(presentationData: (PresentationTheme, TelegramWallpaper)?, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId, forChatList: Bool) -> NSAttributedString? {
     var attributedString: NSAttributedString?
     
     let primaryTextColor: UIColor
@@ -446,10 +446,25 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
                     }
                 }
                 attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor)
-            case let .groupPhoneCall(_, _, duration):
-                if let duration = duration {
-                    let titleString = strings.Notification_VoiceChatEnded(callDurationString(strings: strings, value: duration)).0
-                    attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor)
+            case let .groupPhoneCall(_, _, scheduleDate, duration):
+                if let scheduleDate = scheduleDate {
+                    if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
+                        let titleString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate, alwaysShowTime: true, allowYesterday: false, format: HumanReadableStringFormat(dateFormatString: { strings.Notification_VoiceChatScheduledChannel($0) }, tomorrowFormatString: { strings.Notification_VoiceChatScheduledTomorrowChannel($0) }, todayFormatString: { strings.Notification_VoiceChatScheduledTodayChannel($0) }))
+                        attributedString = NSAttributedString(string: titleString.0, font: titleFont, textColor: primaryTextColor)
+                    } else {
+                        let titleString = humanReadableStringForTimestamp(strings: strings, dateTimeFormat: dateTimeFormat, timestamp: scheduleDate, alwaysShowTime: true, allowYesterday: false, format: HumanReadableStringFormat(dateFormatString: { strings.Notification_VoiceChatScheduled(authorName, $0) }, tomorrowFormatString: { strings.Notification_VoiceChatScheduledTomorrow(authorName, $0) }, todayFormatString: { strings.Notification_VoiceChatScheduledToday(authorName, $0) }))
+                        let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
+                        attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                    }
+                } else if let duration = duration {
+                    if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
+                        let titleString = strings.Notification_VoiceChatEnded(callDurationString(strings: strings, value: duration)).0
+                        attributedString = NSAttributedString(string: titleString, font: titleFont, textColor: primaryTextColor)
+                    } else {
+                        let attributePeerIds: [(Int, PeerId?)] = [(0, message.author?.id)]
+                        let titleString = strings.Notification_VoiceChatEndedGroup(authorName, callDurationString(strings: strings, value: duration))
+                        attributedString = addAttributesToStringWithRanges(titleString, body: bodyAttributes, argumentAttributes: peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: attributePeerIds))
+                    }
                 } else {
                     if message.author?.id.namespace == Namespaces.Peer.CloudChannel {
                         let titleString = strings.Notification_VoiceChatStartedChannel
diff --git a/submodules/TelegramUI/BUILD b/submodules/TelegramUI/BUILD
index cb39ede213..e3bd8fe635 100644
--- a/submodules/TelegramUI/BUILD
+++ b/submodules/TelegramUI/BUILD
@@ -1,5 +1,11 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
+load(
+    "@build_configuration//:variables.bzl",
+    "telegram_bundle_id",
+)
+
+
 filegroup(
     name = "TelegramUIResources",
     srcs = glob([
@@ -15,6 +21,17 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
+internal_bundle_ids = [
+    "org.telegram.Telegram-iOS",
+]
+
+available_appcenter_targets = [
+    "@appcenter_sdk//:AppCenter",
+    "@appcenter_sdk//:AppCenterCrashes",
+]
+
+appcenter_targets = available_appcenter_targets if telegram_bundle_id in internal_bundle_ids else []
+
 swift_library(
     name = "TelegramUI",
     module_name = "TelegramUI",
@@ -180,7 +197,6 @@ swift_library(
         "//submodules/GridMessageSelectionNode:GridMessageSelectionNode",
         "//submodules/InstantPageCache:InstantPageCache",
         "//submodules/PersistentStringHash:PersistentStringHash",
-        "//submodules/MessageReactionListUI:MessageReactionListUI",
         "//submodules/SegmentedControlNode:SegmentedControlNode",
         "//submodules/AppBundle:AppBundle",
         "//submodules/Markdown:Markdown",
@@ -218,7 +234,17 @@ swift_library(
         "//submodules/DatePickerNode:DatePickerNode",
         "//submodules/ConfettiEffect:ConfettiEffect",
         "//submodules/Speak:Speak",
-    ],
+        "//submodules/PeerInfoAvatarListNode:PeerInfoAvatarListNode",
+        "//submodules/DebugSettingsUI:DebugSettingsUI",
+        "//submodules/ImportStickerPackUI:ImportStickerPackUI",
+        "//submodules/GradientBackground:GradientBackground",
+        "//submodules/WallpaperBackgroundNode:WallpaperBackgroundNode",
+    ] + select({
+        "@build_bazel_rules_apple//apple:ios_armv7": [],
+        "@build_bazel_rules_apple//apple:ios_arm64": appcenter_targets,
+        "//build-system:ios_sim_arm64": [],
+        "@build_bazel_rules_apple//apple:ios_x86_64": [],
+    }),
     visibility = [
         "//visibility:public",
     ],
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/Contents.json
similarity index 75%
rename from submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/Contents.json
rename to submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/Contents.json
index 8c4a6d824e..274390d56b 100644
--- a/submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/Contents.json	
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_menu_hdon.pdf",
+      "filename" : "callstab_2.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/callstab_2.pdf b/submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/callstab_2.pdf
new file mode 100644
index 0000000000..4c8932027d
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call List/AlertAccentIcon.imageset/callstab_2.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@2x.png b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@2x.png
deleted file mode 100644
index 9e3bf3bdab..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@3x.png b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@3x.png
deleted file mode 100644
index a566321806..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/CallsTabBarInfo@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/Contents.json
index 3ce0fe0ea8..5b72b42397 100644
--- a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/Contents.json	
+++ b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/Contents.json	
@@ -1,22 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "CallsTabBarInfo@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "CallsTabBarInfo@3x.png",
-      "scale" : "3x"
+      "filename" : "callstab_1.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/callstab_1.pdf b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/callstab_1.pdf
new file mode 100644
index 0000000000..3c229852b6
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call List/AlertIcon.imageset/callstab_1.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call List/Contents.json b/submodules/TelegramUI/Images.xcassets/Call List/Contents.json
index 38f0c81fc2..6e965652df 100644
--- a/submodules/TelegramUI/Images.xcassets/Call List/Contents.json	
+++ b/submodules/TelegramUI/Images.xcassets/Call List/Contents.json	
@@ -1,9 +1,9 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "provides-namespace" : true
   }
-}
\ No newline at end of file
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/Contents.json
new file mode 100644
index 0000000000..795a18ba91
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_call_airpodsmax.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/ic_call_airpodsmax.pdf b/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/ic_call_airpodsmax.pdf
new file mode 100644
index 0000000000..3661b17240
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/CallAirpodsMaxButton.imageset/ic_call_airpodsmax.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json
similarity index 75%
rename from submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/Contents.json
rename to submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json
index 9deae5fa49..7a8982f200 100644
--- a/submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_menu_hdoff.pdf",
+      "filename" : "callshare (1).pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_wallet.pdf b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf
similarity index 63%
rename from submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_wallet.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf
index 768f6dadc4..03f94787bb 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/ic_wallet.pdf and b/submodules/TelegramUI/Images.xcassets/Call/CallShareButton.imageset/callshare (1).pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/Contents.json
index 958ae1e032..5c38ab0966 100644
--- a/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_call_flip.pdf",
+      "filename" : "ic_flip (1).pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_flip (1).pdf b/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_flip (1).pdf
new file mode 100644
index 0000000000..da09156412
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_flip (1).pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/Contents.json
similarity index 74%
rename from submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/Contents.json
rename to submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/Contents.json
index 05d9903d16..0355088028 100644
--- a/submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/Contents.json	
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_call_camerahd.pdf",
+      "filename" : "ic_menuaudio.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/ic_call_camerahd.pdf b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/ic_menuaudio.pdf
similarity index 61%
rename from submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/ic_call_camerahd.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/ic_menuaudio.pdf
index 51d0299b88..045166f1fb 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Call/CallCameraHDButton.imageset/ic_call_camerahd.pdf and b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Audio.imageset/ic_menuaudio.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/Contents.json
new file mode 100644
index 0000000000..11bfc73127
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_changename.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/ic_menu_hdoff.pdf b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/ic_changename.pdf
similarity index 65%
rename from submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/ic_menu_hdoff.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/ic_changename.pdf
index ccb2a9a6bf..fc6696b38e 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Call/CallDisableHD.imageset/ic_menu_hdoff.pdf and b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ChangeName.imageset/ic_changename.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/Contents.json
new file mode 100644
index 0000000000..d4b4c572fd
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_noisecancellation.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/ic_noisecancellation.pdf b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/ic_noisecancellation.pdf
new file mode 100644
index 0000000000..aa4ab67532
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/Noise.imageset/ic_noisecancellation.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/Contents.json
new file mode 100644
index 0000000000..d3d53e234f
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_sharescreen.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/ic_sharescreen.pdf b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/ic_sharescreen.pdf
new file mode 100644
index 0000000000..bbaa0f43e8
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/Context Menu/ShareScreen.imageset/ic_sharescreen.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/Contents.json
similarity index 77%
rename from submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/Contents.json
rename to submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/Contents.json
index affbec4133..8919c4d81a 100644
--- a/submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/Contents.json
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "volsmall.pdf",
+      "filename" : "ic_panel.pdf",
       "idiom" : "universal"
     }
   ],
diff --git a/submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/ic_panel.pdf b/submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/ic_panel.pdf
new file mode 100644
index 0000000000..71666d9684
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/PanelIcon.imageset/ic_panel.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/Contents.json
new file mode 100644
index 0000000000..3aaecc1942
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "wait.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/wait.pdf b/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/wait.pdf
new file mode 100644
index 0000000000..8173b4d777
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/Pause.imageset/wait.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/Contents.json
new file mode 100644
index 0000000000..ed8e0a0bf5
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "pin.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/pin.pdf b/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/pin.pdf
new file mode 100644
index 0000000000..b9d4123329
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/Pin.imageset/pin.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/Contents.json
new file mode 100644
index 0000000000..80dbbc8204
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "sharingscreen (1).pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/sharingscreen (1).pdf b/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/sharingscreen (1).pdf
new file mode 100644
index 0000000000..9ef729b5ca
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/ScreenSharePhone.imageset/sharingscreen (1).pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/Contents.json
new file mode 100644
index 0000000000..f9643c7932
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "sharingscreenipad (1).pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/sharingscreenipad (1).pdf b/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/sharingscreenipad (1).pdf
new file mode 100644
index 0000000000..5929efeb34
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/ScreenShareTablet.imageset/sharingscreenipad (1).pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/Contents.json
new file mode 100644
index 0000000000..d18942689f
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_vc_volume.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_call_flip.pdf b/submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/ic_vc_volume.pdf
similarity index 57%
rename from submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_call_flip.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/ic_vc_volume.pdf
index 3a34ee5aa7..bbebd6cba6 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Call/CallSwitchCameraButton.imageset/ic_call_flip.pdf and b/submodules/TelegramUI/Images.xcassets/Call/Speaking.imageset/ic_vc_volume.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/Contents.json
new file mode 100644
index 0000000000..a12e93d182
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_voicesharing.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/ic_voicesharing.pdf b/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/ic_voicesharing.pdf
new file mode 100644
index 0000000000..e19c33373d
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/StatusScreen.imageset/ic_voicesharing.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/Contents.json
new file mode 100644
index 0000000000..9acec56798
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_voicecamera.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/ic_menu_hdon.pdf b/submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/ic_voicecamera.pdf
similarity index 69%
rename from submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/ic_menu_hdon.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/ic_voicecamera.pdf
index 374497845e..9302da2be7 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Call/CallEnableHD.imageset/ic_menu_hdon.pdf and b/submodules/TelegramUI/Images.xcassets/Call/StatusVideo.imageset/ic_voicecamera.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/Contents.json
new file mode 100644
index 0000000000..7f670ccc62
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_voicevolumeon.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/ic_voicevolumeon.pdf b/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/ic_voicevolumeon.pdf
new file mode 100644
index 0000000000..c6c6fd8475
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/StatusVolume.imageset/ic_voicevolumeon.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/Contents.json
new file mode 100644
index 0000000000..95ca49b9d3
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_voicevolumeoff.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/ic_voicevolumeoff.pdf b/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/ic_voicevolumeoff.pdf
new file mode 100644
index 0000000000..bcc068ce30
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/StatusVolumeOff.imageset/ic_voicevolumeoff.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/Contents.json
new file mode 100644
index 0000000000..e6f1b93d3e
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_cam_flip.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/volsmall.pdf b/submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/ic_cam_flip.pdf
similarity index 69%
rename from submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/volsmall.pdf
rename to submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/ic_cam_flip.pdf
index 49993ba2bf..5084218a29 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Call/Volume.imageset/volsmall.pdf and b/submodules/TelegramUI/Images.xcassets/Call/SwitchCameraIcon.imageset/ic_cam_flip.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/Contents.json
new file mode 100644
index 0000000000..9e8d864ed6
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "unpin.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/unpin.pdf b/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/unpin.pdf
new file mode 100644
index 0000000000..fd3566cc37
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/Unpin.imageset/unpin.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/CameraOff (1).pdf b/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/CameraOff (1).pdf
new file mode 100644
index 0000000000..a126545177
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/CameraOff (1).pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/Contents.json
new file mode 100644
index 0000000000..0fa6f58cca
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Call/VideoUnavailable.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "CameraOff (1).pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/Contents.json
new file mode 100644
index 0000000000..d23d380699
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_menu_camera.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/ic_menu_camera.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/ic_menu_camera.pdf
new file mode 100644
index 0000000000..d5ca0a2949
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/Camera.imageset/ic_menu_camera.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/Contents.json
deleted file mode 100644
index eba3e80b71..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/Contents.json	
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_favesticker@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_favesticker@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@2x.png b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@2x.png
deleted file mode 100644
index 1a2b5d1035..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@3x.png b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@3x.png
deleted file mode 100644
index b8aa993271..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconEmpty.imageset/ic_favesticker@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/Contents.json
deleted file mode 100644
index 7d96366e1c..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/Contents.json	
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_favedsticker@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "ic_favedsticker@3x.png",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@2x.png b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@2x.png
deleted file mode 100644
index 46f6daf33e..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@2x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@3x.png b/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@3x.png
deleted file mode 100644
index 16beedb0ec..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Context Menu/StarIconFilled.imageset/ic_favedsticker@3x.png and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json
new file mode 100644
index 0000000000..8d74185285
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "card.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf
new file mode 100644
index 0000000000..3e219e9e05
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat/Message/BotPayment.imageset/card.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/Contents.json
index b3a939aaae..cf3c0409f8 100644
--- a/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/Contents.json	
+++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/Contents.json	
@@ -1,12 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "ic_goback15.pdf"
+      "filename" : "back.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/ic_goback15.pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/back.pdf
similarity index 51%
rename from submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/ic_goback15.pdf
rename to submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/back.pdf
index 4f2e9efd40..6d608954d4 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/ic_goback15.pdf and b/submodules/TelegramUI/Images.xcassets/Media Gallery/BackwardButton.imageset/back.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/Contents.json
index 8d6aff79d8..925c41a2a6 100644
--- a/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/Contents.json	
+++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/Contents.json	
@@ -1,12 +1,12 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "ic_go15.pdf"
+      "filename" : "forward.pdf",
+      "idiom" : "universal"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/ic_go15.pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/forward.pdf
similarity index 51%
rename from submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/ic_go15.pdf
rename to submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/forward.pdf
index 181570be22..b9c89b04b3 100644
Binary files a/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/ic_go15.pdf and b/submodules/TelegramUI/Images.xcassets/Media Gallery/ForwardButton.imageset/forward.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/Contents.json
new file mode 100644
index 0000000000..5ef9354a34
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_fullscreen.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/ic_fullscreen.pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/ic_fullscreen.pdf
new file mode 100644
index 0000000000..a0a4542075
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Media Gallery/Fullscreen.imageset/ic_fullscreen.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/Contents.json
new file mode 100644
index 0000000000..657bd7f7bb
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ic_smallscreen.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/ic_smallscreen.pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/ic_smallscreen.pdf
new file mode 100644
index 0000000000..f743475ce6
Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Media Gallery/Minimize.imageset/ic_smallscreen.pdf differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json
deleted file mode 100644
index d2ce704e18..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/Contents.json	
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "soundoff (2).pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf
deleted file mode 100644
index 8051a2a4e0..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOff.imageset/soundoff (2).pdf and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json
deleted file mode 100644
index 1d93d33a26..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/Contents.json	
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "soundon (2).pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).pdf b/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).pdf
deleted file mode 100644
index 20236a226b..0000000000
Binary files a/submodules/TelegramUI/Images.xcassets/Media Gallery/SoundOn.imageset/soundon (2).pdf and /dev/null differ
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Contents.json
index 38f0c81fc2..6e965652df 100644
--- a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Contents.json
+++ b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Contents.json
@@ -1,9 +1,9 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   },
   "properties" : {
     "provides-namespace" : true
   }
-}
\ No newline at end of file
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/Contents.json
new file mode 100644
index 0000000000..d64de0bbcb
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "tips_30.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/tips_30.pdf b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/tips_30.pdf
new file mode 100644
index 0000000000..4c56ae4a56
--- /dev/null
+++ b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Tips.imageset/tips_30.pdf
@@ -0,0 +1,113 @@
+%PDF-1.7
+
+1 0 obj
+  << >>
+endobj
+
+2 0 obj
+  << /Length 3 0 R >>
+stream
+/DeviceRGB CS
+/DeviceRGB cs
+q
+1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm
+0.964706 0.768627 0.262745 scn
+0.000000 18.799999 m
+0.000000 22.720367 0.000000 24.680552 0.762954 26.177933 c
+1.434068 27.495068 2.504932 28.565931 3.822066 29.237045 c
+5.319448 30.000000 7.279633 30.000000 11.200000 30.000000 c
+18.799999 30.000000 l
+22.720367 30.000000 24.680552 30.000000 26.177933 29.237045 c
+27.495068 28.565931 28.565931 27.495068 29.237045 26.177933 c
+30.000000 24.680552 30.000000 22.720367 30.000000 18.799999 c
+30.000000 11.200001 l
+30.000000 7.279633 30.000000 5.319448 29.237045 3.822067 c
+28.565931 2.504932 27.495068 1.434069 26.177933 0.762955 c
+24.680552 0.000000 22.720367 0.000000 18.799999 0.000000 c
+11.200000 0.000000 l
+7.279633 0.000000 5.319448 0.000000 3.822066 0.762955 c
+2.504932 1.434069 1.434068 2.504932 0.762954 3.822067 c
+0.000000 5.319448 0.000000 7.279633 0.000000 11.200001 c
+0.000000 18.799999 l
+h
+f
+n
+Q
+q
+1.000000 0.000000 -0.000000 1.000000 8.500000 5.000000 cm
+1.000000 1.000000 1.000000 scn
+0.000000 12.500000 m
+0.000000 16.089851 2.910149 19.000000 6.500000 19.000000 c
+10.089851 19.000000 13.000000 16.089851 13.000000 12.500000 c
+13.000000 9.326989 11.698906 7.884006 10.621044 6.688600 c
+10.292052 6.323730 9.983858 5.981926 9.739806 5.621033 c
+9.164136 4.769756 8.876301 4.344118 8.752400 4.243239 c
+8.663695 4.171017 8.625642 4.138249 8.582385 4.115283 c
+8.539128 4.092316 8.490668 4.079148 8.381149 4.046125 c
+8.228177 4.000000 7.977118 4.000000 7.475001 4.000000 c
+5.525000 4.000000 l
+5.022882 4.000000 4.771823 4.000000 4.618851 4.046125 c
+4.509332 4.079148 4.460872 4.092316 4.417615 4.115283 c
+4.374358 4.138249 4.336305 4.171017 4.247600 4.243239 c
+4.123699 4.344119 3.835864 4.769756 3.260195 5.621032 c
+3.016143 5.981926 2.707948 6.323730 2.378956 6.688601 c
+1.301094 7.884007 0.000000 9.326990 0.000000 12.500000 c
+h
+5.500000 3.000000 m
+4.947715 3.000000 4.500000 2.552284 4.500000 2.000000 c
+4.500000 0.895432 5.395431 0.000000 6.500000 0.000000 c
+7.604569 0.000000 8.500000 0.895430 8.500000 2.000000 c
+8.500000 2.552284 8.052285 3.000000 7.500000 3.000000 c
+5.500000 3.000000 l
+h
+f*
+n
+Q
+
+endstream
+endobj
+
+3 0 obj
+  2149
+endobj
+
+4 0 obj
+  << /Annots []
+     /Type /Page
+     /MediaBox [ 0.000000 0.000000 30.000000 30.000000 ]
+     /Resources 1 0 R
+     /Contents 2 0 R
+     /Parent 5 0 R
+  >>
+endobj
+
+5 0 obj
+  << /Kids [ 4 0 R ]
+     /Count 1
+     /Type /Pages
+  >>
+endobj
+
+6 0 obj
+  << /Type /Catalog
+     /Pages 5 0 R
+  >>
+endobj
+
+xref
+0 7
+0000000000 65535 f
+0000000010 00000 n
+0000000034 00000 n
+0000002239 00000 n
+0000002262 00000 n
+0000002435 00000 n
+0000002509 00000 n
+trailer
+<< /ID [ (some) (id) ]
+   /Root 6 0 R
+   /Size 7
+>>
+startxref
+2568
+%%EOF
\ No newline at end of file
diff --git a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json
deleted file mode 100644
index 490f9cdd8e..0000000000
--- a/submodules/TelegramUI/Images.xcassets/Settings/MenuIcons/Wallet.imageset/Contents.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_wallet.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/5789658100176783156-m.resource b/submodules/TelegramUI/Resources/5789658100176783156-m.resource
new file mode 100644
index 0000000000..ba42f37225
Binary files /dev/null and b/submodules/TelegramUI/Resources/5789658100176783156-m.resource differ
diff --git a/submodules/TelegramUI/Resources/Animations/CallsPlaceholder.tgs b/submodules/TelegramUI/Resources/Animations/CallsPlaceholder.tgs
new file mode 100644
index 0000000000..8f3ab56cc9
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/CallsPlaceholder.tgs differ
diff --git a/submodules/TelegramUI/Resources/Animations/anim_cameraoff.json b/submodules/TelegramUI/Resources/Animations/anim_cameraoff.json
new file mode 100644
index 0000000000..42acbe0966
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_cameraoff.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":11,"w":100,"h":100,"nm":"Camera Off","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":2,"ty":4,"nm":"Line","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[-37.845,-19,0],"to":[0,0,0],"ti":[0,0,0]},{"t":10,"s":[-20.845,0,0]}],"ix":2},"a":{"a":0,"k":[-20.845,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-148.295,-127.55],[106.605,127.55]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":20,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Lens","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[129.155,0,0],"ix":2},"a":{"a":0,"k":[129.155,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.175,-4.14],[0,-3.645],[0,0],[6.627,0],[2.277,2.847],[0,0],[0,6.812],[0,0],[-4.256,5.319],[0,0]],"o":[[2.847,2.277],[0,0],[0,6.627],[-3.645,0],[0,0],[-4.256,-5.319],[0,0],[0,-6.812],[0,0],[4.14,-5.175]],"v":[[154.651,-72.661],[159.155,-63.291],[159.155,63.291],[147.155,75.291],[137.785,70.787],[105.729,30.717],[99.155,11.977],[99.155,-11.977],[105.729,-30.717],[137.785,-70.787]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":5,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-42.326,21.481,0],"ix":2},"a":{"a":0,"k":[-42.326,21.481,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[{"i":[[-0.356,4.018],[-7.24,7.49],[-29.064,-26.935],[-4.055,-3.802],[-16.419,-20.572],[7.432,0.162],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.418,-1.467],[3.856,3.573],[47.36,44.399],[-5.621,7.372],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-116.76,-87.24],[-64.836,-40.48],[-52.953,-29.401],[68.996,93.003],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[{"i":[[-0.356,4.018],[0,0],[-2.914,-3.02],[3.203,18.901],[-16.419,-20.572],[7.432,0.162],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[0,0],[7.336,7.48],[47.36,44.399],[-5.621,7.372],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-125.26,-62.49],[-101.586,-39.98],[-78.203,-53.401],[68.996,93.003],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[{"i":[[-0.356,4.018],[0,0],[-2.914,-3.02],[3.203,18.901],[-16.419,-20.572],[7.432,0.162],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[0,0],[7.336,7.48],[47.36,44.399],[-5.621,7.372],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-125.26,-62.49],[-44.586,20.02],[-17.703,6.599],[68.996,93.003],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[-0.356,4.018],[0,0],[-2.914,-3.02],[3.203,18.901],[-16.419,-20.572],[7.432,0.162],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[0,0],[7.336,7.48],[47.36,44.399],[-5.621,7.372],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-125.26,-62.49],[6.914,71.02],[32.297,54.599],[68.996,93.003],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"t":6,"s":[{"i":[[-0.356,4.018],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-4.018,0.356],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-125.143,-61.873],[-63.893,-0.623],[-61.477,1.793],[40.474,103.744],[41.193,104.463],[-68.158,105],[-102.824,98.989],[-119.835,81.979],[-125.845,47.313]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[245.702,245.695,0],"ix":2},"a":{"a":0,"k":[-10.298,-10.305,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[{"i":[[-0.17,0.322],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515],[40.241,37.623],[5.139,4.807]],"o":[[9,-17.056],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-5.054,-4.726],[-48.111,-45.004]],"v":[[-119.25,-83.569],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69,93.015],[-6.846,22.171],[-22.167,7.843]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[{"i":[[-0.171,0.322],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515],[40.241,37.623],[4.273,5.592]],"o":[[7,-13.181],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-5.054,-4.726],[-38.083,-49.843]],"v":[[-116,-86.069],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69,93.015],[-6.846,22.171],[-22.167,7.843]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[{"i":[[-0.151,0.328],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515],[42.676,39.907],[3.439,3.217]],"o":[[5.25,-11.431],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-3.414,-3.192],[-47.763,-44.68]],"v":[[-113.75,-86.569],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69,93.015],[-12.959,16.456],[-22.747,0.083]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[-0.139,0.337],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515],[40.241,37.623],[5.139,4.807]],"o":[[5.75,-13.931],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-5.054,-4.726],[-48.111,-45.004]],"v":[[-113.75,-85.569],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69,93.015],[-6.846,22.171],[-22.167,7.843]],"c":true}]},{"t":6,"s":[{"i":[[-0.309,0.192],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[6,-9.099],[38.889,38.884],[4.966,4.968]],"o":[[9,-5.583],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-4.885,-4.884],[-46.487,-46.506]],"v":[[-104.75,-97.944],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[77,84.39],[3.682,11.151],[-11.124,-3.656]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Pre-comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[256,256,0],"ix":1},"s":{"a":0,"k":[13.6,13.6,100],"ix":6}},"ao":0,"w":512,"h":512,"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_cameraon.json b/submodules/TelegramUI/Resources/Animations/anim_cameraon.json
new file mode 100644
index 0000000000..b10d3f1c7a
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_cameraon.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":10,"w":100,"h":100,"nm":"Camera On","ddd":0,"assets":[{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[-20.845,0,0],"to":[0,0,0],"ti":[0,0,0]},{"t":21,"s":[-24.845,-5,0]}],"ix":2},"a":{"a":0,"k":[-20.845,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-148.295,-127.55],[106.605,127.55]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":20,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.4],"y":[0]},"t":0,"s":[0]},{"t":10,"s":[100]}],"ix":1},"e":{"a":0,"k":100,"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":9,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Lens","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[129.155,0,0],"ix":2},"a":{"a":0,"k":[129.155,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-5.175,-4.14],[0,-3.645],[0,0],[6.627,0],[2.277,2.847],[0,0],[0,6.812],[0,0],[-4.256,5.319],[0,0]],"o":[[2.847,2.277],[0,0],[0,6.627],[-3.645,0],[0,0],[-4.256,-5.319],[0,0],[0,-6.812],[0,0],[4.14,-5.175]],"v":[[154.651,-72.661],[159.155,-63.291],[159.155,63.291],[147.155,75.291],[137.785,70.787],[105.729,30.717],[99.155,11.977],[99.155,-11.977],[105.729,-30.717],[137.785,-70.787]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Bottom","parent":4,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-42.326,21.481,0],"ix":2},"a":{"a":0,"k":[-42.326,21.481,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[{"i":[[-0.356,4.018],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[-4.018,0.356],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-125.143,-61.873],[-63.893,-0.623],[-61.477,1.793],[40.474,103.744],[41.193,104.463],[-68.158,105],[-102.824,98.989],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[{"i":[[-0.356,4.018],[-7.615,8.365],[-29.064,-26.935],[-15.579,-17.792],[0,0],[-0.193,0.287],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.374,-1.509],[-10.414,-0.27],[11.953,13.651],[0,0],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-117.135,-86.615],[-74.336,-55.98],[-86.953,-23.151],[41.746,104.378],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[{"i":[[-0.356,4.018],[-8.24,8.99],[-29.064,-26.935],[-12.968,-13.455],[0,0],[-0.193,0.287],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.379,-1.504],[-10.414,-0.27],[11.953,12.401],[0,0],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-116.385,-86.865],[-19.336,1.77],[-30.953,31.099],[41.746,104.378],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[-0.356,4.018],[-7.24,7.49],[-29.064,-26.935],[-12.568,-13.829],[0,0],[-0.193,0.287],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.418,-1.467],[-10.414,-0.27],[9.453,10.401],[0,0],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-116.51,-87.24],[26.664,47.27],[15.047,76.599],[41.746,104.378],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[{"i":[[-0.356,4.018],[-8.615,9.49],[-29.064,-26.935],[-6.797,-11.099],[0,0],[-0.193,0.287],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.371,-1.511],[-10.414,-0.27],[1.518,2.478],[0,0],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-116.385,-86.99],[57.414,76.77],[40.297,101.849],[41.746,104.378],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]},{"t":7,"s":[{"i":[[-0.356,4.018],[-7.24,7.49],[-29.064,-26.935],[-4.055,-3.802],[-16.419,-20.572],[7.432,0.162],[0,0],[7.333,3.922],[3.922,7.333],[0,20.059]],"o":[[0,0],[1.418,-1.467],[3.856,3.573],[47.36,44.399],[-5.621,7.372],[-4.82,-0.105],[-20.059,0],[-7.333,-3.922],[-3.922,-7.333],[0,0]],"v":[[-125.308,-62.038],[-116.76,-87.24],[-64.836,-40.48],[-52.953,-29.401],[68.996,93.003],[41.193,104.463],[-68.158,105],[-102.824,98.99],[-119.835,81.979],[-125.845,47.313]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[245.702,245.695,0],"ix":2},"a":{"a":0,"k":[-10.298,-10.305,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":2,"s":[{"i":[[-0.606,0.376],[-5.516,1.066],[-10.029,0],[0,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[6,-9.099]],"o":[[4.5,-2.791],[5.516,-1.066],[0,0],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0]],"v":[[-104.75,-97.944],[-90.601,-103.566],[-68.158,-105],[-20.845,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[77,84.39]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":3,"s":[{"i":[[-0.333,0.63],[-8.797,2.851],[-10.029,0],[0,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515]],"o":[[4.5,-8.528],[8.797,-2.851],[0,0],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0]],"v":[[-117.875,-85.069],[-97.164,-101.43],[-68.158,-105],[-20.845,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69.5,93.515]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":4,"s":[{"i":[[-0.333,0.63],[-8.641,2.663],[-10.029,0],[0,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515]],"o":[[4.5,-8.528],[8.641,-2.663],[0,0],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0]],"v":[[-117.25,-85.819],[-96.851,-101.805],[-68.158,-105],[-20.845,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69.5,93.515]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[-0.333,0.63],[-8.766,2.726],[-10.029,0],[0,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515]],"o":[[4.5,-8.528],[8.766,-2.726],[0,0],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0]],"v":[[-117.75,-85.569],[-97.101,-101.68],[-68.158,-105],[-20.845,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69.5,93.515]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":6,"s":[{"i":[[-0.399,0.59],[-8.531,2.898],[-10.029,0],[0,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515]],"o":[[5.813,-8.591],[8.531,-2.898],[0,0],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0]],"v":[[-118.125,-84.819],[-96.304,-101.352],[-68.158,-105],[-20.845,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69.5,93.515]],"c":true}]},{"t":7,"s":[{"i":[[-0.17,0.322],[-20.059,0],[0,0],[-7.333,-3.922],[-3.922,-7.333],[0,-20.059],[0,0],[10.875,-10.515],[40.241,37.623],[5.139,4.807]],"o":[[9,-17.056],[0,0],[20.059,0],[7.333,3.922],[3.922,7.333],[0,0],[0,20.059],[0,0],[-5.054,-4.726],[-48.111,-45.004]],"v":[[-119.25,-83.569],[-68.158,-105],[26.468,-105],[61.134,-98.99],[78.145,-81.979],[84.155,-47.313],[84.155,47.313],[69,93.015],[-6.846,22.171],[-22.167,7.843]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":0,"nm":"Pre-comp 1","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[50,50,0],"ix":2},"a":{"a":0,"k":[256,256,0],"ix":1},"s":{"a":0,"k":[13.6,13.6,100],"ix":6}},"ao":0,"w":512,"h":512,"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_closemenu.json b/submodules/TelegramUI/Resources/Animations/anim_closemenu.json
new file mode 100644
index 0000000000..09ad0b611c
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_closemenu.json
@@ -0,0 +1 @@
+{"v":"5.7.8","fr":60,"ip":0,"op":20,"w":30,"h":30,"nm":"CloseMenu","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"3","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[180]},{"t":15,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[0,5,0],"ti":[0,-5,0]},{"t":15,"s":[0,30,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,5],[5,-5]],"c":false}]},{"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false}]}],"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":20,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[90]},{"t":15,"s":[0]}],"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[16.667,16.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false},"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[50]},{"t":5,"s":[0]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[50]},{"t":5,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Обрезать контуры 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":20,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"1","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[90]},{"t":15,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,0,0],"to":[0,-5,0],"ti":[0,5,0]},{"t":15,"s":[0,-30,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,5],[5,-5]],"c":false}]},{"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false}]}],"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_menuclose.json b/submodules/TelegramUI/Resources/Animations/anim_menuclose.json
new file mode 100644
index 0000000000..c29ed679ce
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_menuclose.json
@@ -0,0 +1 @@
+{"v":"5.7.8","fr":60,"ip":0,"op":20,"w":30,"h":30,"nm":"MenuClose","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"3","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[180]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,30,0],"to":[0,-5,0],"ti":[0,5,0]},{"t":15,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false}]},{"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,5],[5,-5]],"c":false}]}],"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":20,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[90]}],"ix":10},"p":{"a":0,"k":[15,15,0],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[16.667,16.667,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false},"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":5,"s":[50]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[100]},{"t":5,"s":[50]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Обрезать контуры 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":20,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"1","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":15,"s":[90]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[0,-30,0],"to":[0,5,0],"ti":[0,-5,0]},{"t":15,"s":[0,0,0]}],"ix":2,"l":2},"a":{"a":0,"k":[0,0,0],"ix":1,"l":2},"s":{"a":0,"k":[100,100,100],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0,"y":1},"o":{"x":0.333,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-6.5,0],[6.5,0]],"c":false}]},{"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-5,5],[5,-5]],"c":false}]}],"ix":2},"nm":"Контур 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[1,1,1,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":1.66,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Обводка 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[600,600],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Преобразовать"}],"nm":"1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":20,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_payment.json b/submodules/TelegramUI/Resources/Animations/anim_payment.json
new file mode 100644
index 0000000000..d0dee855cb
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_payment.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":63,"w":512,"h":512,"nm":"Card 3","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Coin 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":14,"s":[50]},{"t":62,"s":[140.566]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.848},"o":{"x":0.05,"y":0},"t":17,"s":[270.605,259.865,0],"to":[0,0,0],"ti":[40.605,0.865,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.053},"t":42,"s":[215.605,71.865,0],"to":[-40.605,-0.865,0],"ti":[0,0,0]},{"t":62,"s":[165.605,457.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":59,"s":[-100,100,100]},{"t":62,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":17,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":27,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":37,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":47,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":57,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":62,"s":[{"i":[[0,-19.405],[14.995,0.275],[0,19.405],[-14.284,0.398]],"o":[[0,19.405],[-14.284,-0.238],[0,-19.405],[14.234,-0.393]],"v":[[65.256,127.865],[43.395,163],[21.534,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":19,"op":194,"st":12,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Coin 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":2,"s":[0]},{"t":55,"s":[200]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.872},"o":{"x":0.05,"y":0},"t":5,"s":[197.605,259.865,0],"to":[0,0,0],"ti":[57.605,-1.135,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.048},"t":30,"s":[132.605,40.865,0],"to":[-57.605,1.135,0],"ti":[0,0,0]},{"t":50,"s":[33.605,459.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":47,"s":[-100,100,100]},{"t":50,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":5,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,-19.405],[13.231,0.385],[0,19.405],[-12.236,0.557]],"o":[[0,19.405],[-12.236,-0.333],[0,-19.405],[12.166,-0.551]],"v":[[59.946,127.865],[44.829,157.471],[26.844,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":25,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":35,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":45,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":55,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":12,"op":182,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Coin","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":11,"s":[0]},{"t":61,"s":[178]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.3,"y":0.872},"o":{"x":0.05,"y":0},"t":11,"s":[314.395,259.865,0],"to":[0,0,0],"ti":[-57.605,-1.135,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.048},"t":36,"s":[379.395,40.865,0],"to":[57.605,1.135,0],"ti":[0,0,0]},{"t":56,"s":[478.395,459.865,0]}],"ix":2},"a":{"a":0,"k":[43.395,127.865,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":53,"s":[100,100,100]},{"t":56,"s":[0,0,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":15,"s":[{"i":[[0.921,-19.383],[15.877,0.22],[0,19.405],[-15.308,0.318]],"o":[[-0.423,8.902],[-15.308,-0.19],[0,-19.405],[15.268,-0.315]],"v":[[67.911,127.865],[40.876,136.815],[18.879,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":17,"s":[{"i":[[0.614,-19.39],[14.113,0.33],[0,19.405],[-13.26,0.477]],"o":[[-0.282,12.403],[-13.26,-0.285],[0,-19.405],[13.2,-0.472]],"v":[[62.601,127.865],[42.796,162.033],[24.189,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":21,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":31,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":41,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":51,"s":[{"i":[[0,-19.405],[19.405,0],[0,19.405],[-19.405,0]],"o":[[0,19.405],[-19.405,0],[0,-19.405],[19.405,0]],"v":[[78.53,127.865],[43.395,163],[8.259,127.865],[43.395,92.729]],"c":true}]},{"t":61,"s":[{"i":[[0,-19.405],[10.585,0.549],[0,19.405],[-9.164,0.795]],"o":[[0,19.405],[-9.164,-0.476],[0,-19.405],[9.063,-0.787]],"v":[[51.981,127.865],[43.395,163],[34.809,127.865],[43.395,92.729]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":15,"op":183,"st":1,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Card","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.29,"y":0},"t":0,"s":[256,376,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.71,"y":1},"o":{"x":0.6,"y":0},"t":8,"s":[256,350,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":0.587},"o":{"x":0.2,"y":0},"t":18,"s":[256,448,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.6,"y":0.058},"t":40,"s":[256,424,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.71,"y":1},"o":{"x":0.3,"y":0},"t":50,"s":[256,357,0],"to":[0,0,0],"ti":[0,0,0]},{"t":59,"s":[256,376,0]}],"ix":2},"a":{"a":0,"k":[256,376,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.2,0.2,0.2],"y":[1,1,1]},"o":{"x":[0.29,0.29,0.29],"y":[0,0,0]},"t":0,"s":[60,0,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0,0,0]},"t":10,"s":[98,102,100]},{"i":{"x":[0.42,0.42,0.42],"y":[1,1,1]},"o":{"x":[0.2,0.2,0.2],"y":[0,0,0]},"t":20,"s":[102,97,100]},{"i":{"x":[0.3,0.3,0.3],"y":[1.413,1.413,1.413]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":32,"s":[100,100,100]},{"i":{"x":[0.7,0.7,0.7],"y":[1,1,1]},"o":{"x":[0.6,0.6,0.6],"y":[0.058,0.058,-0.058]},"t":42,"s":[100,100,100]},{"i":{"x":[0.71,0.71,0.71],"y":[1,1,1]},"o":{"x":[0.3,0.3,0.3],"y":[0,0,0]},"t":52,"s":[98,102,100]},{"t":61,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.142,0],[0,0],[0,4.142],[0,0],[15.188,0],[0,0],[0,-15.188],[0,0]],"o":[[0,0],[4.142,0],[0,0],[0,-15.188],[0,0],[-15.188,0],[0,0],[0,4.142]],"v":[[-150,-65],[150,-65],[157.5,-72.5],[157.5,-92.5],[130,-120],[-130,-120],[-157.5,-92.5],[-157.5,-72.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle-Copy","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[256,163.5],"ix":2},"a":{"a":0,"k":[0,-92.5],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Card Top","np":1,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-4.142,0],[0,0],[0,-4.142],[0,0],[19.33,0],[0,0],[0,19.33],[0,0]],"o":[[0,0],[4.142,0],[0,0],[0,19.33],[0,0],[-19.33,0],[0,0],[0,-4.142]],"v":[[-150,-20],[150,-20],[157.5,-12.5],[157.5,85],[122.5,120],[-122.5,120],[-157.5,85],[-157.5,-12.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Rectangle","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tr","p":{"a":0,"k":[256,267],"ix":2},"a":{"a":0,"k":[0,11],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Card Bottom","np":1,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":183,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_playpause.tgs b/submodules/TelegramUI/Resources/Animations/anim_playpause.tgs
new file mode 100644
index 0000000000..d6e7b0953d
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/anim_playpause.tgs differ
diff --git a/submodules/TelegramUI/Resources/Animations/anim_profileleave.json b/submodules/TelegramUI/Resources/Animations/anim_profileleave.json
new file mode 100644
index 0000000000..cb43bdf987
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_profileleave.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":48,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Arrow","parent":2,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0},"t":0,"s":[43.05,-0.05,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.5,"y":1},"o":{"x":0.6,"y":0},"t":19,"s":[76.129,-5.159,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.37,"y":1},"o":{"x":0.3,"y":0},"t":33,"s":[22.05,-0.05,0],"to":[0,0,0],"ti":[0,0,0]},{"t":41,"s":[43.05,-0.05,0]}],"ix":2},"a":{"a":0,"k":[43.05,-0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0},"t":0,"s":[{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[75.8,-38.2],[113.3,-0.3],[75.3,38.1]],"c":false}]},{"i":{"x":0.5,"y":1},"o":{"x":0.6,"y":0},"t":22,"s":[{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[76.192,-36.598],[101.074,-7.417],[86.947,28.824]],"c":false}]},{"t":35,"s":[{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[75.8,-38.2],[113.3,-0.3],[75.3,38.1]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":26,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-27.2,-0.1],[113.3,-0.1]],"c":false}]},{"i":{"x":0.5,"y":1},"o":{"x":0.6,"y":0},"t":22,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[30.629,7.629],[98.926,-7.724]],"c":false}]},{"t":35,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-27.2,-0.1],[113.3,-0.1]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":26,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"bm":0,"ix":2,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Door","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":0,"s":[0]},{"i":{"x":[0.1],"y":[1]},"o":{"x":[0.1],"y":[0]},"t":5,"s":[2]},{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.6],"y":[0]},"t":24,"s":[-1]},{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":34,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.167],"y":[0]},"t":42,"s":[2]},{"t":47,"s":[0]}],"ix":10},"p":{"a":0,"k":[222.55,376.8,0],"ix":2},"a":{"a":0,"k":[-33.45,120.8,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.1,"y":1},"o":{"x":0.05,"y":0},"t":0,"s":[{"i":[[0,0],[0,0],[14,0],[0,0],[0,-14],[0,0],[-14,0],[0,0],[0,13.6],[0,0]],"o":[[0,0],[0,-14],[0,0],[-14,0],[0,0],[0,14],[0,0],[13.6,0],[0,0],[0,0]],"v":[[43.3,-76.5],[43.3,-89.6],[17.9,-115],[-84.9,-115],[-110.3,-89.6],[-110.3,89.5],[-85,114.8],[18.7,114.8],[43.4,90.1],[43.4,76.3]],"c":false}]},{"i":{"x":0.5,"y":1},"o":{"x":0.6,"y":0},"t":21,"s":[{"i":[[0,0],[0,0],[9.861,0],[0,0],[0,-14],[0,0],[-9.861,0],[0,0],[0,13.6],[0,0]],"o":[[0,0],[0,-14],[0,0],[-9.861,0],[0,0],[0,14],[0,0],[9.58,0],[0,0],[0,0]],"v":[[25.262,-46.7],[25.33,-89.8],[7.438,-115.2],[-65.109,-85.2],[-83,-59.8],[-83,119.3],[-65.179,144.6],[8.002,114.6],[25.4,89.9],[25.044,47.1]],"c":false}]},{"i":{"x":0.5,"y":1},"o":{"x":0.3,"y":0},"t":33,"s":[{"i":[[0,0],[0,0],[13.034,0],[0,0],[0,-14.731],[0,0],[-13.034,0],[0,0],[0,14.31],[0,0]],"o":[[0,0],[0,-14.731],[0,0],[-13.034,0],[0,0],[0,14.731],[0,0],[12.662,0],[0,0],[0,0]],"v":[[38.007,-80.49],[38.007,-94.274],[14.359,-121],[-81.352,-121],[-105,-94.274],[-105,94.179],[-81.445,120.8],[15.103,120.8],[38.1,94.81],[38.1,80.29]],"c":false}]},{"t":41,"s":[{"i":[[0,0],[0,0],[14,0],[0,0],[0,-14],[0,0],[-14,0],[0,0],[0,13.6],[0,0]],"o":[[0,0],[0,-14],[0,0],[-14,0],[0,0],[0,14],[0,0],[13.6,0],[0,0],[0,0]],"v":[[43.3,-76.5],[43.3,-89.6],[17.9,-115],[-84.9,-115],[-110.3,-89.6],[-110.3,89.5],[-85,114.8],[18.7,114.8],[43.4,90.1],[43.4,76.3]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":26,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_profilemore.json b/submodules/TelegramUI/Resources/Animations/anim_profilemore.json
new file mode 100644
index 0000000000..92fdec58c1
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_profilemore.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":45,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Point 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[153.6,256,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":10,"s":[153.6,204,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":20,"s":[153.6,276,0],"to":[0,0,0],"ti":[0,0,0]},{"t":30,"s":[153.6,256,0]}],"ix":2},"a":{"a":0,"k":[-102.4,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":5,"s":[100,100,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":15,"s":[125,125,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":25,"s":[95,95,100]},{"t":35,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-17.673,0],[0,-17.673],[17.673,0],[0,17.673]],"o":[[17.673,0],[0,17.673],[-17.673,0],[0,-17.673]],"v":[[-102.4,-32],[-70.4,0],[-102.4,32],[-134.4,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Point 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":5,"s":[256,256,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":15,"s":[256,204,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":25,"s":[256,276,0],"to":[0,0,0],"ti":[0,0,0]},{"t":35,"s":[256,256,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":10,"s":[100,100,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":20,"s":[125,125,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":30,"s":[95,95,100]},{"t":40,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-17.673,0],[0,-17.673],[17.673,0],[0,17.673]],"o":[[17.673,0],[0,17.673],[-17.673,0],[0,-17.673]],"v":[[0,-32],[32,0],[0,32],[-32,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Point 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":10,"s":[358.4,256,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":20,"s":[358.4,204,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":30,"s":[358.4,276,0],"to":[0,0,0],"ti":[0,0,0]},{"t":40,"s":[358.4,256,0]}],"ix":2},"a":{"a":0,"k":[102.4,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":15,"s":[100,100,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":25,"s":[125,125,100]},{"i":{"x":[0.6,0.6,0.6],"y":[1,1,1]},"o":{"x":[0.4,0.4,0.4],"y":[0,0,0]},"t":35,"s":[95,95,100]},{"t":44,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-17.673,0],[0,-17.673],[17.673,0],[0,17.673]],"o":[[17.673,0],[0,17.673],[-17.673,0],[0,-17.673]],"v":[[102.4,-32],[134.4,0],[102.4,32],[70.4,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_profilemute.json b/submodules/TelegramUI/Resources/Animations/anim_profilemute.json
new file mode 100644
index 0000000000..dd68bee0b7
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_profilemute.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":3,"s":[-14.236,-12.181,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[18.2,19.9,0],"to":[0,0,0],"ti":[0,0,0]},{"t":25,"s":[6.2,8.4,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":3,"s":[0]},{"t":17,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[-3.653,-3.294],[-5.525,13.962],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[3.653,3.294],[4.195,2.447],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.034,-46.903],[-53.116,-21.384],[-29.754,-30.355],[79.924,87.426],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[-0.456,-0.411],[-8.27,20.578],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-16.001,19.968],[12.155,10.038],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[0,0],[-2.767,-2.505],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[6.956,6.247],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.323,65.744],[35.335,71.99],[53.148,87.283],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.5],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":2,"s":[0]},{"i":{"x":[0.302],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":8,"s":[-3]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":19,"s":[5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":28,"s":[-3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":6,"s":[255.082,241,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":17,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":26,"s":[255.082,247,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":8,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[3.7,-22.8],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[71.672,87.301],[50.558,76.645],[47.845,74.129],[-77.95,-53.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[2.996,5.407],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[-3.828,-2.942],[0,0],[2.866,-12.122],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.248,87.333],[-20.395,-19.416],[-32.09,-33.406],[-68.304,-69.815],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[1.015,-4.019],[0,0],[2.283,-4.664],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[13.203,11.744],[6.417,-2.958],[-67.338,-75.841],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[4.232,-6.783],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[40.339,31.849],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[93.023,87.394],[76.068,68.529],[72.041,63.833],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[95.3,87.4],[79.202,71.144],[76.303,68.216],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":7,"op":180,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"EXAMPLE","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.232,0.2,0],"ix":2},"a":{"a":0,"k":[0.232,0.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-18.9,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3],[0,0],[-18.3,7.3],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0],[1.4,-19.6],[0,0],[-0.1,-19]],"v":[[0.2,-130.4],[34.3,-98.4],[34.4,-96.2],[47.3,-91],[79.4,-47.1],[83.8,15],[104.4,57.6],[112.6,65.1],[113.4,83.2],[104,87.4],[-103.5,87.4],[-116.3,74.6],[-112.1,65.2],[-103.9,57.7],[-83.3,15.1],[-78.9,-47],[-46.8,-90.9],[-33.9,-96.1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":7,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json b/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json
new file mode 100644
index 0000000000..ebfea4f952
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_profileunmute.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":37,"w":512,"h":512,"nm":"Comp 1","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":1,"s":[6.2,8.4,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":7,"s":[17.813,19.808,0],"to":[0,0,0],"ti":[0,0,0]},{"t":18,"s":[-8.985,-6.628,0]}],"ix":2},"a":{"a":0,"k":[6.2,8.4,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.6,-100.5],[115,117.3]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"tm","s":{"a":0,"k":0,"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[100]},{"t":18,"s":[0]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":18,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":136,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Middle","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-34.15,23.2,0],"ix":2},"a":{"a":0,"k":[-34.15,23.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[27.741,66.641],[29.641,68.541],[48.3,87.2],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[0,0],[0,0],[-11.064,22.792],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[7.543,4.4],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.7,-40.8],[13.701,50.721],[44.112,42.695],[81.297,87.764],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[0,0],[-0.456,-0.411],[-7.14,22.508],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.456,0.411],[7.125,4.156],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.617,-41.562],[-36.617,-1.022],[-8.461,-10.952],[81.126,87.722],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[0,0],[-0.304,-0.274],[-3.842,19.542],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0.304,0.274],[4.75,2.771],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-79.145,-45.891],[-67.552,-34.675],[-46.665,-45.462],[79.017,87.614],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]},{"t":13,"s":[{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3]],"o":[[0,0],[0,0],[0,0],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0]],"v":[[-78.2,-54.55],[50.226,64.601],[52.497,66.708],[74.8,87.4],[-103.8,87.2],[-116.6,74.4],[-112.4,65],[-104.2,57.5],[-83.6,14.9]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":13,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Top","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":1,"s":[0]},{"i":{"x":[0.3],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":7,"s":[3]},{"i":{"x":[0.4],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":20,"s":[-5]},{"i":{"x":[0.7],"y":[1]},"o":{"x":[0.3],"y":[0]},"t":29,"s":[3]},{"t":36,"s":[0]}],"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":0,"s":[255.082,261,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.3,"y":1},"o":{"x":0.3,"y":0},"t":5,"s":[255.082,281,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.3,"y":0},"t":18,"s":[255.082,237,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.7,"y":1},"o":{"x":0.3,"y":0},"t":27,"s":[255.082,283,0],"to":[0,0,0],"ti":[0,0,0]},{"t":34,"s":[255.082,261,0]}],"ix":2},"a":{"a":0,"k":[-0.918,5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":9,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[95.3,87.4],[79.202,71.144],[76.303,68.216],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":10,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.386,9.724],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[4.232,-6.783],[0,0],[2.2,-3.6],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.8,87.36],[42.716,46.351],[40.339,31.849],[-67.2,-76.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":11,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[5.088,9.185],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[1.015,-4.019],[0,0],[2.283,-4.664],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[79.481,87.357],[-8.726,-11.611],[-10.415,-21.132],[-67.338,-75.841],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"t":12,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[3.392,6.123],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0.676,-2.679],[0,0],[2.755,-10.709],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[77.671,87.338],[10.934,17.854],[2.793,9.156],[-70.875,-68.461],[-47.1,-91],[-34.2,-96.2]],"c":true}]},{"t":13,"s":[{"i":[[-18.8,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,0],[0,0],[0,0],[-6.9,2.6],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[0,0],[0,0],[0,0],[3.7,-22.8],[0,0],[-0.1,-18.9]],"v":[[-0.2,-130.4],[33.9,-98.4],[34,-96.2],[46.9,-91],[79,-47.1],[83.4,15],[104,57.6],[112.2,65.1],[113,83.2],[103.6,87.4],[74.05,87.3],[58.993,73.332],[56.28,70.816],[-77.95,-53.7],[-47.1,-91],[-34.2,-96.2]],"c":true}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":13,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Bottom","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[-0.2,117.55,0],"ix":2},"a":{"a":0,"k":[-0.2,117.55,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[17.8,0],[6.4,15.6]],"o":[[-6.4,15.5],[-17.8,0],[0,0]],"v":[[39.3,104.3],[-0.2,130.8],[-39.7,104.3]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"EXAMPLE","parent":3,"sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[0.232,0.2,0],"ix":2},"a":{"a":0,"k":[0.232,0.2,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-18.9,0],[-1.1,-17.9],[0,0],[0,0],[-1.4,-19.6],[0,0],[-12.1,-11],[0,0],[4.8,-5.2],[3.6,0],[0,0],[0,7.1],[-2.7,2.4],[0,0],[-1.2,16.3],[0,0],[-18.3,7.3],[0,0]],"o":[[18.1,0],[0,0],[0,0],[18.2,7.3],[0,0],[1.2,16.3],[0,0],[5.2,4.8],[-2.4,2.6],[0,0],[-7.1,0],[0,-3.6],[0,0],[12.1,-11.1],[0,0],[1.4,-19.6],[0,0],[-0.1,-19]],"v":[[0.2,-130.4],[34.3,-98.4],[34.4,-96.2],[47.3,-91],[79.4,-47.1],[83.8,15],[104.4,57.6],[112.6,65.1],[113.4,83.2],[104,87.4],[-103.5,87.4],[-116.3,74.6],[-112.1,65.2],[-103.9,57.7],[-83.3,15.1],[-78.9,-47],[-46.8,-90.9],[-33.9,-96.1]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0,0,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":13,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_profilevc.json b/submodules/TelegramUI/Resources/Animations/anim_profilevc.json
new file mode 100644
index 0000000000..66ae10a5fa
--- /dev/null
+++ b/submodules/TelegramUI/Resources/Animations/anim_profilevc.json
@@ -0,0 +1 @@
+{"v":"5.5.7","meta":{"g":"LottieFiles AE 0.1.20","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":27,"w":512,"h":512,"nm":"VoiceChat 2","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Line 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[153.7,256.05,0],"ix":2},"a":{"a":0,"k":[-102.3,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":0,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":11,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.1,-133],[-102.1,132.6]],"c":false}]},{"t":23,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[-102.3,-50.8],[-102.3,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Line 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[256,256,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":2,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":13,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-45],[0,45]],"c":false}]},{"t":25,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-115.5],[0,115.5]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Line 3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[358.5,256.05,0],"ix":2},"a":{"a":0,"k":[102.5,0.05,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.6,"y":1},"o":{"x":0.4,"y":0},"t":4,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]},{"i":{"x":0.4,"y":1},"o":{"x":0.4,"y":0},"t":15,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-131.4],[102.5,131]],"c":false}]},{"t":26,"s":[{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[102.5,-50.8],[102.5,50.9]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0,0,0,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":43,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":180,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file
diff --git a/submodules/TelegramUI/Resources/Animations/anim_savemedia.tgs b/submodules/TelegramUI/Resources/Animations/anim_savemedia.tgs
new file mode 100644
index 0000000000..83f2104743
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/anim_savemedia.tgs differ
diff --git a/submodules/TelegramUI/Resources/Animations/anim_shareddownload.tgs b/submodules/TelegramUI/Resources/Animations/anim_shareddownload.tgs
new file mode 100644
index 0000000000..51384f078e
Binary files /dev/null and b/submodules/TelegramUI/Resources/Animations/anim_shareddownload.tgs differ
diff --git a/submodules/TelegramUI/Resources/PresentationStrings.mapping b/submodules/TelegramUI/Resources/PresentationStrings.mapping
index 567c315a5f..72fa0b81fc 100644
Binary files a/submodules/TelegramUI/Resources/PresentationStrings.mapping and b/submodules/TelegramUI/Resources/PresentationStrings.mapping differ
diff --git a/submodules/TelegramUI/Resources/currencies.json b/submodules/TelegramUI/Resources/currencies.json
index 5e332a88fa..93730660d1 100644
--- a/submodules/TelegramUI/Resources/currencies.json
+++ b/submodules/TelegramUI/Resources/currencies.json
@@ -267,7 +267,7 @@
 		"decimalSeparator": ",",
 		"symbolOnLeft": true,
 		"spaceBetweenAmountAndSymbol": true,
-		"decimalDigits": 2
+		"decimalDigits": 0
 	},
 	"CNY": {
 		"code": "CNY",
@@ -1356,7 +1356,7 @@
 		"decimalSeparator": ",",
 		"symbolOnLeft": false,
 		"spaceBetweenAmountAndSymbol": true,
-		"decimalDigits": 1
+		"decimalDigits": 0
 	},
 	"VUV": {
 		"code": "VUV",
diff --git a/submodules/TelegramUI/Resources/fqv01SQemVIBAAAApND8LDRUhRU.tgv b/submodules/TelegramUI/Resources/fqv01SQemVIBAAAApND8LDRUhRU.tgv
new file mode 100644
index 0000000000..a106f042d6
Binary files /dev/null and b/submodules/TelegramUI/Resources/fqv01SQemVIBAAAApND8LDRUhRU.tgv differ
diff --git a/submodules/TelegramUI/Sounds/MessageSent.caf b/submodules/TelegramUI/Sounds/MessageSent.caf
deleted file mode 100644
index 68164c0ea9..0000000000
Binary files a/submodules/TelegramUI/Sounds/MessageSent.caf and /dev/null differ
diff --git a/submodules/TelegramUI/Sounds/MessageSent.mp3 b/submodules/TelegramUI/Sounds/MessageSent.mp3
new file mode 100644
index 0000000000..0a25e8bf23
Binary files /dev/null and b/submodules/TelegramUI/Sounds/MessageSent.mp3 differ
diff --git a/submodules/TelegramUI/Sounds/notification.caf b/submodules/TelegramUI/Sounds/notification.caf
deleted file mode 100644
index f3f16ae66f..0000000000
Binary files a/submodules/TelegramUI/Sounds/notification.caf and /dev/null differ
diff --git a/submodules/TelegramUI/Sounds/notification.mp3 b/submodules/TelegramUI/Sounds/notification.mp3
new file mode 100644
index 0000000000..46480d6da1
Binary files /dev/null and b/submodules/TelegramUI/Sounds/notification.mp3 differ
diff --git a/submodules/TelegramUI/Sources/AccessoryPanelNode.swift b/submodules/TelegramUI/Sources/AccessoryPanelNode.swift
index 067fe48fc8..28f7651ef3 100644
--- a/submodules/TelegramUI/Sources/AccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/AccessoryPanelNode.swift
@@ -4,6 +4,7 @@ import AsyncDisplayKit
 import TelegramPresentationData
 
 class AccessoryPanelNode: ASDisplayNode {
+    var originalFrameBeforeDismissed: CGRect?
     var dismiss: (() -> Void)?
     var interfaceInteraction: ChatPanelInterfaceInteraction?
     
diff --git a/submodules/TelegramUI/Sources/AccountContext.swift b/submodules/TelegramUI/Sources/AccountContext.swift
index 2429cb67fe..ad8e0acac8 100644
--- a/submodules/TelegramUI/Sources/AccountContext.swift
+++ b/submodules/TelegramUI/Sources/AccountContext.swift
@@ -109,9 +109,10 @@ public final class AccountContextImpl: AccountContext {
         return self.sharedContextImpl
     }
     public let account: Account
+    public let engine: TelegramEngine
     
     public let fetchManager: FetchManager
-    private let prefetchManager: PrefetchManager?
+    public let prefetchManager: PrefetchManager?
     
     public var keyShortcutsController: KeyShortcutsController?
     
@@ -156,21 +157,22 @@ public final class AccountContextImpl: AccountContext {
     
     public let cachedGroupCallContexts: AccountGroupCallContextCache
     
-    public init(sharedContext: SharedAccountContextImpl, account: Account, /*tonContext: StoredTonContext?, */limitsConfiguration: LimitsConfiguration, contentSettings: ContentSettings, appConfiguration: AppConfiguration, temp: Bool = false)
+    public init(sharedContext: SharedAccountContextImpl, account: Account, limitsConfiguration: LimitsConfiguration, contentSettings: ContentSettings, appConfiguration: AppConfiguration, temp: Bool = false)
     {
         self.sharedContextImpl = sharedContext
         self.account = account
+        self.engine = TelegramEngine(account: account)
         
         self.downloadedMediaStoreManager = DownloadedMediaStoreManagerImpl(postbox: account.postbox, accountManager: sharedContext.accountManager)
         
         if let locationManager = self.sharedContextImpl.locationManager {
-            self.liveLocationManager = LiveLocationManagerImpl(postbox: account.postbox, network: account.network, accountPeerId: account.peerId, viewTracker: account.viewTracker, stateManager: account.stateManager, locationManager: locationManager, inForeground: sharedContext.applicationBindings.applicationInForeground)
+            self.liveLocationManager = LiveLocationManagerImpl(engine: self.engine, account: account, locationManager: locationManager, inForeground: sharedContext.applicationBindings.applicationInForeground)
         } else {
             self.liveLocationManager = nil
         }
         self.fetchManager = FetchManagerImpl(postbox: account.postbox, storeManager: self.downloadedMediaStoreManager)
         if sharedContext.applicationBindings.isMainApp && !temp {
-            self.prefetchManager = PrefetchManager(sharedContext: sharedContext, account: account, fetchManager: self.fetchManager)
+            self.prefetchManager = PrefetchManagerImpl(sharedContext: sharedContext, account: account, engine: self.engine, fetchManager: self.fetchManager)
             self.wallpaperUploadManager = WallpaperUploadManagerImpl(sharedContext: sharedContext, account: account, presentationData: sharedContext.presentationData)
             self.themeUpdateManager = ThemeUpdateManagerImpl(sharedContext: sharedContext, account: account)
         } else {
@@ -180,7 +182,7 @@ public final class AccountContextImpl: AccountContext {
         }
         
         if let locationManager = self.sharedContextImpl.locationManager, sharedContext.applicationBindings.isMainApp && !temp {
-            self.peersNearbyManager = PeersNearbyManagerImpl(account: account, locationManager: locationManager, inForeground: sharedContext.applicationBindings.applicationInForeground)
+            self.peersNearbyManager = PeersNearbyManagerImpl(account: account, engine: self.engine, locationManager: locationManager, inForeground: sharedContext.applicationBindings.applicationInForeground)
         } else {
             self.peersNearbyManager = nil
         }
@@ -236,7 +238,7 @@ public final class AccountContextImpl: AccountContext {
             })
         }
         
-        account.callSessionManager.updateVersions(versions: PresentationCallManagerImpl.voipVersions(includeExperimental: true, includeReference: false).map { version, supportsVideo -> CallSessionManagerImplementationVersion in
+        account.callSessionManager.updateVersions(versions: PresentationCallManagerImpl.voipVersions(includeExperimental: true, includeReference: sharedContext.immediateExperimentalUISettings.experimentalCompatibility).map { version, supportsVideo -> CallSessionManagerImplementationVersion in
             CallSessionManagerImplementationVersion(version: version, supportsVideo: supportsVideo)
         })
     }
@@ -293,13 +295,17 @@ public final class AccountContextImpl: AccountContext {
     public func applyMaxReadIndex(for location: ChatLocation, contextHolder: Atomic<ChatLocationContextHolder?>, messageIndex: MessageIndex) {
         switch location {
         case .peer:
-            let _ = applyMaxReadIndexInteractively(postbox: self.account.postbox, stateManager: self.account.stateManager, index: messageIndex).start()
+            let _ = self.engine.messages.applyMaxReadIndexInteractively(index: messageIndex).start()
         case let .replyThread(data):
             let context = chatLocationContext(holder: contextHolder, account: self.account, data: data)
             context.applyMaxReadIndex(messageIndex: messageIndex)
         }
     }
     
+    public func scheduleGroupCall(peerId: PeerId) {
+        let _ = self.sharedContext.callManager?.scheduleGroupCall(context: self, peerId: peerId, endCurrentIfAny: true)
+    }
+    
     public func joinGroupCall(peerId: PeerId, invite: String?, requestJoinAsPeerId: ((@escaping (PeerId?) -> Void) -> Void)?, activeCall: CachedChannelData.ActiveCall) {
         let callResult = self.sharedContext.callManager?.joinGroupCall(context: self, peerId: peerId, invite: invite, requestJoinAsPeerId: requestJoinAsPeerId, initialCall: activeCall, endCurrentIfAny: false)
         if let callResult = callResult, case let .alreadyInProgress(currentPeerId) = callResult {
diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift
index e4b387d2d8..91aec62095 100644
--- a/submodules/TelegramUI/Sources/AppDelegate.swift
+++ b/submodules/TelegramUI/Sources/AppDelegate.swift
@@ -32,33 +32,48 @@ import TelegramIntents
 import AccountUtils
 import CoreSpotlight
 import LightweightAccountData
-
-#if canImport(BackgroundTasks)
+import TelegramAudio
+import DebugSettingsUI
 import BackgroundTasks
+
+#if canImport(AppCenter)
+import AppCenter
+import AppCenterCrashes
 #endif
 
 private let handleVoipNotifications = false
 
 private var testIsLaunched = false
 
-private func encodeText(_ string: String, _ key: Int) -> String {
-    var result = ""
-    for c in string.unicodeScalars {
-        result.append(Character(UnicodeScalar(UInt32(Int(c.value) + key))!))
+private func isKeyboardWindow(window: NSObject) -> Bool {
+    let typeName = NSStringFromClass(type(of: window))
+    if #available(iOS 9.0, *) {
+        if typeName.hasPrefix("UI") && typeName.hasSuffix("RemoteKeyboardWindow") {
+            return true
+        }
+    } else {
+        if typeName.hasPrefix("UI") && typeName.hasSuffix("TextEffectsWindow") {
+            return true
+        }
     }
-    return result
+    return false
 }
 
-private let keyboardViewClass: AnyClass? = NSClassFromString(encodeText("VJJoqvuTfuIptuWjfx", -1))!
-private let keyboardViewContainerClass: AnyClass? = NSClassFromString(encodeText("VJJoqvuTfuDpoubjofsWjfx", -1))!
-
-private let keyboardWindowClass: AnyClass? = {
-    if #available(iOS 9.0, *) {
-        return NSClassFromString(encodeText("VJSfnpufLfzcpbseXjoepx", -1))
-    } else {
-        return NSClassFromString(encodeText("VJUfyuFggfdutXjoepx", -1))
+private func isKeyboardView(view: NSObject) -> Bool {
+    let typeName = NSStringFromClass(type(of: view))
+    if typeName.hasPrefix("UI") && typeName.hasSuffix("InputSetHostView") {
+        return true
     }
-}()
+    return false
+}
+
+private func isKeyboardViewContainer(view: NSObject) -> Bool {
+    let typeName = NSStringFromClass(type(of: view))
+    if typeName.hasPrefix("UI") && typeName.hasSuffix("InputSetContainerView") {
+        return true
+    }
+    return false
+}
 
 private class ApplicationStatusBarHost: StatusBarHost {
     private let application = UIApplication.shared
@@ -84,20 +99,20 @@ private class ApplicationStatusBarHost: StatusBarHost {
     }
     
     func setStatusBarStyle(_ style: UIStatusBarStyle, animated: Bool) {
-        self.application.setStatusBarStyle(style, animated: animated)
+        if self.shouldChangeStatusBarStyle?(style) ?? true {
+            self.application.setStatusBarStyle(style, animated: animated)
+        }
     }
     
+    var shouldChangeStatusBarStyle: ((UIStatusBarStyle) -> Bool)?
+    
     func setStatusBarHidden(_ value: Bool, animated: Bool) {
         self.application.setStatusBarHidden(value, with: animated ? .fade : .none)
     }
     
     var keyboardWindow: UIWindow? {
-        guard let keyboardWindowClass = keyboardWindowClass else {
-            return nil
-        }
-        
         for window in UIApplication.shared.windows {
-            if window.isKind(of: keyboardWindowClass) {
+            if isKeyboardWindow(window: window) {
                 return window
             }
         }
@@ -105,14 +120,14 @@ private class ApplicationStatusBarHost: StatusBarHost {
     }
     
     var keyboardView: UIView? {
-        guard let keyboardWindow = self.keyboardWindow, let keyboardViewContainerClass = keyboardViewContainerClass, let keyboardViewClass = keyboardViewClass else {
+        guard let keyboardWindow = self.keyboardWindow else {
             return nil
         }
         
         for view in keyboardWindow.subviews {
-            if view.isKind(of: keyboardViewContainerClass) {
+            if isKeyboardViewContainer(view: view) {
                 for subview in view.subviews {
-                    if subview.isKind(of: keyboardViewClass) {
+                    if isKeyboardView(view: subview) {
                         return subview
                     }
                 }
@@ -276,13 +291,13 @@ final class SharedApplicationContext {
                             var peerId: PeerId?
                             if let fromId = payload["from_id"] {
                                 let fromIdValue = fromId as! NSString
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(fromIdValue.intValue))
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                             } else if let fromId = payload["chat_id"] {
                                 let fromIdValue = fromId as! NSString
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(fromIdValue.intValue))
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                             } else if let fromId = payload["channel_id"] {
                                 let fromIdValue = fromId as! NSString
-                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(fromIdValue.intValue))
+                                peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                             }
                             
                             if let msgId = payload["msg_id"] {
@@ -433,11 +448,16 @@ final class SharedApplicationContext {
         let deviceSpecificEncryptionParameters = BuildConfig.deviceSpecificEncryptionParameters(rootPath, baseAppBundleId: baseAppBundleId)
         let encryptionParameters = ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: deviceSpecificEncryptionParameters.key)!, salt: ValueBoxEncryptionParameters.Salt(data: deviceSpecificEncryptionParameters.salt)!)
         
-        TempBox.initializeShared(basePath: rootPath, processType: "app", launchSpecificId: arc4random64())
+        TempBox.initializeShared(basePath: rootPath, processType: "app", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
         
         let logsPath = rootPath + "/logs"
         let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
         Logger.setSharedLogger(Logger(rootPath: rootPath, basePath: logsPath))
+
+        setManagedAudioSessionLogger({ s in
+            Logger.shared.log("ManagedAudioSession", s)
+            Logger.shared.shortLog("ManagedAudioSession", s)
+        })
         
         if let contents = try? FileManager.default.contentsOfDirectory(at: URL(fileURLWithPath: rootPath + "/accounts-metadata"), includingPropertiesForKeys: nil, options: [.skipsSubdirectoryDescendants]) {
             for url in contents {
@@ -479,14 +499,7 @@ final class SharedApplicationContext {
         telegramUIDeclareEncodables()
         
         GlobalExperimentalSettings.isAppStoreBuild = buildConfig.isAppStoreBuild
-        
         GlobalExperimentalSettings.enableFeed = false
-        #if DEBUG
-            //GlobalExperimentalSettings.enableFeed = true
-            #if targetEnvironment(simulator)
-                //GlobalTelegramCoreConfiguration.readMessages = false
-            #endif
-        #endif
         
         self.window?.makeKeyAndVisible()
         
@@ -494,7 +507,7 @@ final class SharedApplicationContext {
         
         initializeAccountManagement()
         
-        let applicationBindings = TelegramApplicationBindings(isMainApp: true, containerPath: appGroupUrl.path, appSpecificScheme: buildConfig.appSpecificUrlScheme, openUrl: { url in
+        let applicationBindings = TelegramApplicationBindings(isMainApp: true, appBundleId: baseAppBundleId, containerPath: appGroupUrl.path, appSpecificScheme: buildConfig.appSpecificUrlScheme, openUrl: { url in
             var parsedUrl = URL(string: url)
             if let parsed = parsedUrl {
                 if parsed.scheme == nil || parsed.scheme!.isEmpty {
@@ -633,6 +646,8 @@ final class SharedApplicationContext {
         }, getAvailableAlternateIcons: {
             if #available(iOS 10.3, *) {
                 var icons = [PresentationAppIcon(name: "Blue", imageName: "BlueIcon", isDefault: buildConfig.isAppStoreBuild),
+                        PresentationAppIcon(name: "New2", imageName: "New2_180x180"),
+                        PresentationAppIcon(name: "New1", imageName: "New1_180x180"),
                         PresentationAppIcon(name: "Black", imageName: "BlackIcon"),
                         PresentationAppIcon(name: "BlueClassic", imageName: "BlueClassicIcon"),
                         PresentationAppIcon(name: "BlackClassic", imageName: "BlackClassicIcon"),
@@ -662,6 +677,10 @@ final class SharedApplicationContext {
             } else {
                 completion(false)
             }
+        }, forceOrientation: { orientation in
+            let value = orientation.rawValue
+            UIDevice.current.setValue(value, forKey: "orientation")
+            UINavigationController.attemptRotationToDeviceOrientation()
         })
         
         let accountManagerSignal = Signal<AccountManager, NoError> { subscriber in
@@ -774,7 +793,6 @@ final class SharedApplicationContext {
             self.mainWindow?.hostView.containerView.backgroundColor =  initialPresentationDataAndSettings.presentationData.theme.chatList.backgroundColor
             
             let legacyBasePath = appGroupUrl.path
-            let legacyCache = LegacyCache(path: legacyBasePath + "/Caches")
             
             let presentationDataPromise = Promise<PresentationData>()
             let appLockContext = AppLockContextImpl(rootPath: rootPath, window: self.mainWindow!, rootController: self.window?.rootViewController, applicationBindings: applicationBindings, accountManager: accountManager, presentationDataSignal: presentationDataPromise.get(), lockIconInitialFrame: {
@@ -782,7 +800,7 @@ final class SharedApplicationContext {
             })
             
             var setPresentationCall: ((PresentationCall?) -> Void)?
-            let sharedContext = SharedAccountContextImpl(mainWindow: self.mainWindow, basePath: rootPath, encryptionParameters: encryptionParameters, accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings, networkArguments: networkArguments, rootPath: rootPath, legacyBasePath: legacyBasePath, legacyCache: legacyCache, apsNotificationToken: self.notificationTokenPromise.get() |> map(Optional.init), voipNotificationToken: self.voipTokenPromise.get() |> map(Optional.init), setNotificationCall: { call in
+            let sharedContext = SharedAccountContextImpl(mainWindow: self.mainWindow, sharedContainerPath: legacyBasePath, basePath: rootPath, encryptionParameters: encryptionParameters, accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings, networkArguments: networkArguments, rootPath: rootPath, legacyBasePath: legacyBasePath, apsNotificationToken: self.notificationTokenPromise.get() |> map(Optional.init), voipNotificationToken: self.voipTokenPromise.get() |> map(Optional.init), setNotificationCall: { call in
                 setPresentationCall?(call)
             }, navigateToChat: { accountId, peerId, messageId in
                 self.openChatWhenReady(accountId: accountId, peerId: peerId, messageId: messageId)
@@ -803,6 +821,15 @@ final class SharedApplicationContext {
                     }
                 }
             })
+
+            /*self.mainWindow.debugAction = {
+                self.mainWindow.debugAction = nil
+                
+                let presentationData = sharedContext.currentPresentationData.with { $0 }
+                let navigationController = NavigationController(mode: .single, theme: NavigationControllerTheme(presentationTheme: presentationData.theme))
+                navigationController.viewControllers = [debugController(sharedContext: sharedContext, context: nil)]
+                self.mainWindow.present(navigationController, on: .root)
+            }*/
             
             presentationDataPromise.set(sharedContext.presentationData)
             
@@ -832,7 +859,7 @@ final class SharedApplicationContext {
                 }
                 var exists = false
                 strongSelf.mainWindow.forEachViewController({ controller in
-                    if controller is ThemeSettingsCrossfadeController || controller is ThemeSettingsController {
+                    if controller is ThemeSettingsCrossfadeController || controller is ThemeSettingsController || controller is ThemePreviewController {
                         exists = true
                     }
                     return true
@@ -1073,6 +1100,8 @@ final class SharedApplicationContext {
                         print("Application: context took \(readyTime) to become ready")
                     }
                     print("Launch to ready took \((CFAbsoluteTimeGetCurrent() - launchStartTime) * 1000.0) ms")
+
+                    self.mainWindow.debugAction = nil
                     
                     self.mainWindow.viewController = context.rootController
                     if firstTime {
@@ -1312,6 +1341,14 @@ final class SharedApplicationContext {
         }*/
         
         self.maybeCheckForUpdates()
+
+        #if canImport(AppCenter)
+        if !buildConfig.isAppStoreBuild, let appCenterId = buildConfig.appCenterId, !appCenterId.isEmpty {
+            AppCenter.start(withAppSecret: buildConfig.appCenterId, services: [
+                Crashes.self
+            ])
+        }
+        #endif
         
         return true
     }
@@ -1672,7 +1709,7 @@ final class SharedApplicationContext {
             
             if let startCallContacts = startCallContacts {
                 let startCall: (Int32) -> Void = { userId in
-                    self.startCallWhenReady(accountId: nil, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), isVideo: startCallIsVideo)
+                    self.startCallWhenReady(accountId: nil, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), isVideo: startCallIsVideo)
                 }
                 
                 func cleanPhoneNumber(_ text: String) -> String {
@@ -1734,7 +1771,7 @@ final class SharedApplicationContext {
                                         return result
                                     } |> deliverOnMainQueue).start(next: { peerId in
                                         if let peerId = peerId {
-                                            startCall(peerId.id)
+                                            startCall(peerId.id._internalGetInt32Value())
                                         }
                                     })
                                     processed = true
@@ -1749,7 +1786,7 @@ final class SharedApplicationContext {
                 if let contact = sendMessageIntent.recipients?.first, let handle = contact.customIdentifier, handle.hasPrefix("tg") {
                     let string = handle.suffix(from: handle.index(handle.startIndex, offsetBy: 2))
                     if let userId = Int32(string) {
-                        self.openChatWhenReady(accountId: nil, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: userId), activateInput: true)
+                        self.openChatWhenReady(accountId: nil, peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(userId)), activateInput: true)
                     }
                 }
             }
@@ -1950,9 +1987,9 @@ final class SharedApplicationContext {
                     |> deliverOnMainQueue
                     |> mapToSignal { account -> Signal<Void, NoError> in
                         if let messageId = messageIdFromNotification(peerId: peerId, notification: response.notification) {
-                            let _ = applyMaxReadIndexInteractively(postbox: account.postbox, stateManager: account.stateManager, index: MessageIndex(id: messageId, timestamp: 0)).start()
+                            let _ = TelegramEngine(account: account).messages.applyMaxReadIndexInteractively(index: MessageIndex(id: messageId, timestamp: 0)).start()
                         }
-                        return enqueueMessages(account: account, peerId: peerId, messages: [EnqueueMessage.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)])
+                        return enqueueMessages(account: account, peerId: peerId, messages: [EnqueueMessage.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
                         |> map { messageIds -> MessageId? in
                             if messageIds.isEmpty {
                                 return nil
@@ -2293,7 +2330,7 @@ private func accountIdFromNotification(_ notification: UNNotification, sharedCon
                 |> take(1)
                 |> map { _, accounts, _ -> AccountRecordId? in
                     for (_, account, _) in accounts {
-                        if Int(account.peerId.id) == userId {
+                        if Int(account.peerId.id._internalGetInt32Value()) == userId {
                             return account.id
                         }
                     }
@@ -2315,16 +2352,16 @@ private func peerIdFromNotification(_ notification: UNNotification) -> PeerId? {
         var peerId: PeerId?
         if let fromId = payload["from_id"] {
             let fromIdValue = fromId as! NSString
-            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(fromIdValue.intValue))
+            peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
         } else if let fromId = payload["chat_id"] {
             let fromIdValue = fromId as! NSString
-            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(fromIdValue.intValue))
+            peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
         } else if let fromId = payload["channel_id"] {
             let fromIdValue = fromId as! NSString
-            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(fromIdValue.intValue))
+            peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
         } else if let fromId = payload["encryption_id"] {
             let fromIdValue = fromId as! NSString
-            peerId = PeerId(namespace: Namespaces.Peer.SecretChat, id: Int32(fromIdValue.intValue))
+            peerId = PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
         }
         return peerId
     }
diff --git a/submodules/TelegramUI/Sources/ApplicationContext.swift b/submodules/TelegramUI/Sources/ApplicationContext.swift
index e401742013..20adc4ffc6 100644
--- a/submodules/TelegramUI/Sources/ApplicationContext.swift
+++ b/submodules/TelegramUI/Sources/ApplicationContext.swift
@@ -36,6 +36,8 @@ final class UnauthorizedApplicationContext {
     let isReady = Promise<Bool>()
     
     var authorizationCompleted: Bool = false
+
+    private var serviceNotificationEventsDisposable: Disposable?
     
     init(apiId: Int32, apiHash: String, sharedContext: SharedAccountContextImpl, account: UnauthorizedAccount, otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)])) {
         self.sharedContext = sharedContext
@@ -71,6 +73,20 @@ final class UnauthorizedApplicationContext {
         }, { result in
             ApplicationSpecificNotice.setPermissionWarning(accountManager: sharedContext.accountManager, permission: .cellularData, value: 0)
         })
+
+        self.serviceNotificationEventsDisposable = (account.serviceNotificationEvents
+        |> deliverOnMainQueue).start(next: { [weak self] text in
+            if let strongSelf = self {
+                let presentationData = strongSelf.sharedContext.currentPresentationData.with { $0 }
+                let alertController = textAlertController(sharedContext: strongSelf.sharedContext, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})])
+
+                (strongSelf.rootController.viewControllers.last as? ViewController)?.present(alertController, in: .window(.root))
+            }
+        })
+    }
+
+    deinit {
+        self.serviceNotificationEventsDisposable?.dispose()
     }
 }
 
@@ -356,7 +372,7 @@ final class AuthorizedApplicationContext {
                             
                             if inAppNotificationSettings.displayPreviews {
                                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                strongSelf.notificationController.enqueue(ChatMessageNotificationItem(context: strongSelf.context, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, messages: messages, tapAction: {
+                                strongSelf.notificationController.enqueue(ChatMessageNotificationItem(context: strongSelf.context, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, messages: messages, tapAction: {
                                     if let strongSelf = self {
                                         var foundOverlay = false
                                         strongSelf.mainWindow.forEachViewController({ controller in
@@ -445,11 +461,11 @@ final class AuthorizedApplicationContext {
                     guard let strongSelf = self else {
                         return
                     }
-                    let _ = (acceptTermsOfService(account: strongSelf.context.account, id: termsOfServiceUpdate.id)
+                    let _ = (strongSelf.context.engine.accountData.acceptTermsOfService(id: termsOfServiceUpdate.id)
                     |> deliverOnMainQueue).start(completed: {
                         controller?.dismiss()
                         if let strongSelf = self, let botName = botName {
-                            strongSelf.termsOfServiceProceedToBotDisposable.set((resolvePeerByName(account: strongSelf.context.account, name: botName, ageLimit: 10) |> take(1) |> deliverOnMainQueue).start(next: { peerId in
+                            strongSelf.termsOfServiceProceedToBotDisposable.set((strongSelf.context.engine.peers.resolvePeerByName(name: botName, ageLimit: 10) |> take(1) |> deliverOnMainQueue).start(next: { peerId in
                                 if let strongSelf = self, let peerId = peerId {
                                     self?.rootController.pushViewController(ChatControllerImpl(context: strongSelf.context, chatLocation: .peer(peerId)))
                                 }
@@ -464,7 +480,7 @@ final class AuthorizedApplicationContext {
                     }
                     let accountId = strongSelf.context.account.id
                     let accountManager = strongSelf.context.sharedContext.accountManager
-                    let _ = (deleteAccount(account: strongSelf.context.account)
+                    let _ = (strongSelf.context.engine.auth.deleteAccount()
                     |> deliverOnMainQueue).start(error: { _ in
                         guard let strongSelf = self else {
                             return
@@ -743,7 +759,7 @@ final class AuthorizedApplicationContext {
                         }
                         
                         let navigateToMessage = {
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: strongSelf.rootController, context: strongSelf.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true)))
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: strongSelf.rootController, context: strongSelf.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true, timecode: nil)))
                         }
                         
                         if chatIsVisible {
@@ -763,6 +779,7 @@ final class AuthorizedApplicationContext {
         self.rootController.setForceInCallStatusBar((self.context.sharedContext as! SharedAccountContextImpl).currentCallStatusBarNode)
         if let groupCallController = self.context.sharedContext.currentGroupCallController as? VoiceChatController {
             if let overlayController = groupCallController.currentOverlayController {
+                groupCallController.parentNavigationController = self.rootController
                 self.rootController.presentOverlay(controller: overlayController, inGlobal: true, blockInteraction: false)
             }
         }
@@ -821,7 +838,7 @@ final class AuthorizedApplicationContext {
         
         if visiblePeerId != peerId || messageId != nil {
             if self.rootController.rootTabController != nil {
-                self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: self.rootController, context: self.context, chatLocation: .peer(peerId), subject: messageId.flatMap { .message(id: $0, highlight: true) }, activateInput: activateInput))
+                self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: self.rootController, context: self.context, chatLocation: .peer(peerId), subject: messageId.flatMap { .message(id: $0, highlight: true, timecode: nil) }, activateInput: activateInput))
             } else {
                 self.scheduledOpenChatWithPeerId = (peerId, messageId, activateInput)
             }
diff --git a/submodules/TelegramUI/Sources/ApplicationShortcutItem.swift b/submodules/TelegramUI/Sources/ApplicationShortcutItem.swift
index ad690d29d0..6579fe691b 100644
--- a/submodules/TelegramUI/Sources/ApplicationShortcutItem.swift
+++ b/submodules/TelegramUI/Sources/ApplicationShortcutItem.swift
@@ -1,6 +1,7 @@
 import Foundation
 import UIKit
 import TelegramPresentationData
+import DeviceAccess
 
 enum ApplicationShortcutItemType: String {
     case search
@@ -44,12 +45,18 @@ func applicationShortcutItems(strings: PresentationStrings, otherAccountName: St
             ApplicationShortcutItem(type: .savedMessages, title: strings.Conversation_SavedMessages, subtitle: nil),
             ApplicationShortcutItem(type: .account, title: strings.Shortcut_SwitchAccount, subtitle: otherAccountName)
         ]
-    } else {
+    } else if DeviceAccess.isCameraAccessAuthorized() {
         return [
             ApplicationShortcutItem(type: .search, title: strings.Common_Search, subtitle: nil),
             ApplicationShortcutItem(type: .compose, title: strings.Compose_NewMessage, subtitle: nil),
             ApplicationShortcutItem(type: .camera, title: strings.Camera_Title, subtitle: nil),
             ApplicationShortcutItem(type: .savedMessages, title: strings.Conversation_SavedMessages, subtitle: nil)
         ]
+    } else {
+        return [
+            ApplicationShortcutItem(type: .search, title: strings.Common_Search, subtitle: nil),
+            ApplicationShortcutItem(type: .compose, title: strings.Compose_NewMessage, subtitle: nil),
+            ApplicationShortcutItem(type: .savedMessages, title: strings.Conversation_SavedMessages, subtitle: nil)
+        ]
     }
 }
diff --git a/submodules/TelegramUI/Sources/AudioRecordningToneData.swift b/submodules/TelegramUI/Sources/AudioRecordningToneData.swift
index 36fc878c01..1241bb3d97 100644
--- a/submodules/TelegramUI/Sources/AudioRecordningToneData.swift
+++ b/submodules/TelegramUI/Sources/AudioRecordningToneData.swift
@@ -11,7 +11,7 @@ private func loadAudioRecordingToneData() -> Data? {
         AVLinearPCMIsBigEndianKey: false as NSNumber
     ]
     
-    guard let url = Bundle.main.url(forResource: "begin_record", withExtension: "caf") else {
+    guard let url = Bundle.main.url(forResource: "begin_record", withExtension: "mp3") else {
         return nil
     }
     
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift
index 9f5b6e184c..360fe2ba62 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceAwaitingAccountResetController.swift
@@ -85,7 +85,7 @@ final class AuthorizationSequenceAwaitingAccountResetController: ViewController
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func logoutPressed() {
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift
index 8841d92eb3..c3df7fed14 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceCodeEntryController.swift
@@ -119,7 +119,7 @@ final class AuthorizationSequenceCodeEntryController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func nextPressed() {
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
index 99808d4147..8d1675a6a4 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceController.swift
@@ -17,6 +17,7 @@ import SettingsUI
 import PhoneNumberFormat
 import LegacyComponents
 import LegacyMediaPickerUI
+import PasswordSetupUI
 
 private enum InnerState: Equatable {
     case state(UnauthorizedAccountStateContents)
@@ -25,7 +26,7 @@ private enum InnerState: Equatable {
 
 public final class AuthorizationSequenceController: NavigationController, MFMailComposeViewControllerDelegate {
     static func navigationBarTheme(_ theme: PresentationTheme) -> NavigationBarTheme {
-        return NavigationBarTheme(buttonColor: theme.intro.accentTextColor, disabledButtonColor: theme.intro.disabledTextColor, primaryTextColor: theme.intro.primaryTextColor, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: theme.rootController.navigationBar.badgeBackgroundColor, badgeStrokeColor: theme.rootController.navigationBar.badgeStrokeColor, badgeTextColor: theme.rootController.navigationBar.badgeTextColor)
+        return NavigationBarTheme(buttonColor: theme.intro.accentTextColor, disabledButtonColor: theme.intro.disabledTextColor, primaryTextColor: theme.intro.primaryTextColor, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: theme.rootController.navigationBar.badgeBackgroundColor, badgeStrokeColor: theme.rootController.navigationBar.badgeStrokeColor, badgeTextColor: theme.rootController.navigationBar.badgeTextColor)
     }
     
     private let sharedContext: SharedAccountContext
@@ -110,7 +111,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
         if let currentController = currentController {
             controller = currentController
         } else {
-            controller = AuthorizationSequenceSplashController(accountManager: self.sharedContext.accountManager, postbox: self.account.postbox, network: self.account.network, theme: self.presentationData.theme)
+            controller = AuthorizationSequenceSplashController(accountManager: self.sharedContext.accountManager, account: self.account, theme: self.presentationData.theme)
             controller.nextPressed = { [weak self] strings in
                 if let strongSelf = self {
                     if let strings = strings {
@@ -177,14 +178,14 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                             controller.inProgress = false
                             
                             let text: String
-                            var actions: [TextAlertAction] = [
-                                TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})
-                            ]
+                            var actions: [TextAlertAction] = []
                             switch error {
                                 case .limitExceeded:
                                     text = strongSelf.presentationData.strings.Login_CodeFloodError
+                                    actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                 case .invalidPhoneNumber:
                                     text = strongSelf.presentationData.strings.Login_InvalidPhoneError
+                                    actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                     actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in
                                         guard let strongSelf = self, let controller = controller else {
                                             return
@@ -200,8 +201,10 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                                     }))
                                 case .phoneLimitExceeded:
                                     text = strongSelf.presentationData.strings.Login_PhoneFloodError
+                                    actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                 case .phoneBanned:
                                     text = strongSelf.presentationData.strings.Login_PhoneBannedError
+                                    actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                     actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in
                                         guard let strongSelf = self, let controller = controller else {
                                             return
@@ -217,6 +220,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                                     }))
                                 case let .generic(info):
                                     text = strongSelf.presentationData.strings.Login_UnknownError
+                                    actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                     actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Login_PhoneNumberHelp, action: { [weak controller] in
                                         guard let strongSelf = self, let controller = controller else {
                                             return
@@ -238,6 +242,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                                     }))
                                 case .timeout:
                                     text = strongSelf.presentationData.strings.Login_NetworkError
+                                    actions.append(TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {}))
                                     actions.append(TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.ChatSettings_ConnectionType_UseProxy, action: { [weak controller] in
                                         guard let strongSelf = self, let controller = controller else {
                                             return
@@ -481,26 +486,26 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
         controller.forgot = { [weak self, weak controller] in
             if let strongSelf = self, let strongController = controller {
                 strongController.inProgress = true
-                strongSelf.actionDisposable.set((requestPasswordRecovery(account: strongSelf.account)
-                |> deliverOnMainQueue).start(next: { option in
+                strongSelf.actionDisposable.set((TelegramEngineUnauthorized(account: strongSelf.account).auth.requestTwoStepVerificationPasswordRecoveryCode()
+                |> deliverOnMainQueue).start(next: { pattern in
                     if let strongSelf = self, let strongController = controller {
                         strongController.inProgress = false
-                        switch option {
-                            case let .email(pattern):
-                                let _ = (strongSelf.account.postbox.transaction { transaction -> Void in
-                                    if let state = transaction.getState() as? UnauthorizedAccountState, case let .passwordEntry(hint, number, code, _, syncContacts) = state.contents {
-                                        transaction.setState(UnauthorizedAccountState(isTestingEnvironment: strongSelf.account.testingEnvironment, masterDatacenterId: strongSelf.account.masterDatacenterId, contents: .passwordRecovery(hint: hint, number: number, code: code, emailPattern: pattern, syncContacts: syncContacts)))
-                                    }
-                                }).start()
-                            case .none:
-                                strongController.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_RecoveryUnavailable, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                                strongController.didForgotWithNoRecovery = true
-                        }
+
+                        let _ = (strongSelf.account.postbox.transaction { transaction -> Void in
+                            if let state = transaction.getState() as? UnauthorizedAccountState, case let .passwordEntry(hint, number, code, _, syncContacts) = state.contents {
+                                transaction.setState(UnauthorizedAccountState(isTestingEnvironment: strongSelf.account.testingEnvironment, masterDatacenterId: strongSelf.account.masterDatacenterId, contents: .passwordRecovery(hint: hint, number: number, code: code, emailPattern: pattern, syncContacts: syncContacts)))
+                            }
+                        }).start()
                     }
                 }, error: { error in
-                    if let strongController = controller {
-                        strongController.inProgress = false
+                    guard let strongController = controller else {
+                        return
                     }
+
+                    strongController.inProgress = false
+
+                    strongController.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_RecoveryUnavailable, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
+                    strongController.didForgotWithNoRecovery = true
                 }))
             }
         }
@@ -537,66 +542,32 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
         return controller
     }
     
-    private func passwordRecoveryController(emailPattern: String, syncContacts: Bool) -> AuthorizationSequencePasswordRecoveryController {
-        var currentController: AuthorizationSequencePasswordRecoveryController?
+    private func passwordRecoveryController(emailPattern: String, syncContacts: Bool) -> TwoFactorDataInputScreen {
+        var currentController: TwoFactorDataInputScreen?
         for c in self.viewControllers {
-            if let c = c as? AuthorizationSequencePasswordRecoveryController {
+            if let c = c as? TwoFactorDataInputScreen {
                 currentController = c
                 break
             }
         }
-        let controller: AuthorizationSequencePasswordRecoveryController
+        let controller: TwoFactorDataInputScreen
         if let currentController = currentController {
             controller = currentController
         } else {
-            controller = AuthorizationSequencePasswordRecoveryController(strings: self.presentationData.strings, theme: self.presentationData.theme, back: { [weak self] in
-                guard let strongSelf = self else {
-                    return
-                }
-                let countryCode = defaultCountryCode()
-                
-                let _ = (strongSelf.account.postbox.transaction { transaction -> Void in
-                    transaction.setState(UnauthorizedAccountState(isTestingEnvironment: strongSelf.account.testingEnvironment, masterDatacenterId: strongSelf.account.masterDatacenterId, contents: .phoneEntry(countryCode: countryCode, number: "")))
-                }).start()
-            })
-            controller.recoverWithCode = { [weak self, weak controller] code in
-                if let strongSelf = self {
-                    controller?.inProgress = true
-                    
-                    strongSelf.actionDisposable.set((performPasswordRecovery(accountManager: strongSelf.sharedContext.accountManager, account: strongSelf.account, code: code, syncContacts: syncContacts) |> deliverOnMainQueue).start(error: { error in
-                        Queue.mainQueue().async {
-                            if let strongSelf = self, let controller = controller {
-                                controller.inProgress = false
-                                
-                                let text: String
-                                switch error {
-                                    case .limitExceeded:
-                                        text = strongSelf.presentationData.strings.LoginPassword_FloodError
-                                    case .invalidCode:
-                                        text = strongSelf.presentationData.strings.Login_InvalidCodeError
-                                    case .expired:
-                                        text = strongSelf.presentationData.strings.Login_CodeExpiredError
-                                }
-                                
-                                controller.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                            }
-                        }
-                    }))
-                }
-            }
-            controller.noAccess = { [weak self, weak controller] in
-                if let strongSelf = self, let controller = controller {
-                    controller.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: strongSelf.presentationData), title: nil, text: strongSelf.presentationData.strings.TwoStepAuth_RecoveryFailed, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                    let account = strongSelf.account
-                    let _ = (strongSelf.account.postbox.transaction { transaction -> Void in
-                        if let state = transaction.getState() as? UnauthorizedAccountState, case let .passwordRecovery(hint, number, code, _, syncContacts) = state.contents {
-                            transaction.setState(UnauthorizedAccountState(isTestingEnvironment: account.testingEnvironment, masterDatacenterId: account.masterDatacenterId, contents: .passwordEntry(hint: hint, number: number, code: code, suggestReset: true, syncContacts: syncContacts)))
-                        }
-                    }).start()
-                }
-            }
+            controller = TwoFactorDataInputScreen(sharedContext: self.sharedContext, engine: .unauthorized(TelegramEngineUnauthorized(account: self.account)), mode: .passwordRecoveryEmail(emailPattern: emailPattern, mode: .notAuthorized(syncContacts: syncContacts)), stateUpdated: { _ in
+            }, presentation: .default)
+        }
+        controller.passwordRecoveryFailed = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+
+            let _ = (strongSelf.account.postbox.transaction { transaction -> Void in
+                if let state = transaction.getState() as? UnauthorizedAccountState, case let .passwordRecovery(hint, number, code, _, syncContacts) = state.contents {
+                    transaction.setState(UnauthorizedAccountState(isTestingEnvironment: strongSelf.account.testingEnvironment, masterDatacenterId: strongSelf.account.masterDatacenterId, contents: .passwordEntry(hint: hint, number: number, code: code, suggestReset: true, syncContacts: syncContacts)))
+                }
+            }).start()
         }
-        controller.updateData(emailPattern: emailPattern)
         return controller
     }
     
@@ -714,7 +685,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                                     var value = stat()
                                     if stat(result.fileURL.path, &value) == 0 {
                                         if let data = try? Data(contentsOf: result.fileURL) {
-                                            let resource = LocalFileMediaResource(fileId: arc4random64())
+                                            let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                             account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                                             subscriber.putNext(resource)
                                         }
@@ -734,7 +705,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                         }
                         |> mapToSignal { resource -> Signal<UploadedPeerPhotoData?, NoError> in
                             if let resource = resource {
-                                return uploadedPeerVideo(postbox: account.postbox, network: account.network, messageMediaPreuploadManager: nil, resource: resource) |> map(Optional.init)
+                                return TelegramEngineUnauthorized(account: account).auth.uploadedPeerVideo(resource: resource) |> map(Optional.init)
                             } else {
                                 return .single(nil)
                             }
@@ -813,7 +784,7 @@ public final class AuthorizationSequenceController: NavigationController, MFMail
                     }
                     controllers.append(self.passwordEntryController(hint: hint, suggestReset: suggestReset, syncContacts: syncContacts))
                     self.setViewControllers(controllers, animated: !self.viewControllers.isEmpty)
-                case let .passwordRecovery(_, _, _, emailPattern, syncContacts):
+                case let .passwordRecovery(hint, _, _, emailPattern, syncContacts):
                     var controllers: [ViewController] = []
                     if !self.otherAccountPhoneNumbers.1.isEmpty {
                         controllers.append(self.splashController())
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift
index 1f40397b78..76cac93c42 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordEntryController.swift
@@ -116,7 +116,7 @@ final class AuthorizationSequencePasswordEntryController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func nextPressed() {
@@ -129,9 +129,9 @@ final class AuthorizationSequencePasswordEntryController: ViewController {
     }
     
     func forgotPressed() {
-        if self.suggestReset {
+        /*if self.suggestReset {
             self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: nil, text: self.presentationData.strings.TwoStepAuth_RecoveryFailed, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-        } else if self.didForgotWithNoRecovery {
+        } else*/ if self.didForgotWithNoRecovery {
             self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: nil, text: self.presentationData.strings.TwoStepAuth_RecoveryUnavailable, actions: [TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
         } else {
             self.forgot?()
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift
index 4b9a2bc5a4..7897059ee7 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequencePasswordRecoveryController.swift
@@ -93,7 +93,7 @@ final class AuthorizationSequencePasswordRecoveryController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func nextPressed() {
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift
index 9ad2b45410..e8d01d97ed 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryController.swift
@@ -12,6 +12,7 @@ import AccountContext
 import CountrySelectionUI
 import SettingsUI
 import PhoneNumberFormat
+import DebugSettingsUI
 
 final class AuthorizationSequencePhoneEntryController: ViewController {
     private var controllerNode: AuthorizationSequencePhoneEntryControllerNode {
@@ -139,7 +140,7 @@ final class AuthorizationSequencePhoneEntryController: ViewController {
             self?.nextPressed()
         }
         
-        loadServerCountryCodes(accountManager: sharedContext.accountManager, network: account.network, completion: { [weak self] in
+        loadServerCountryCodes(accountManager: sharedContext.accountManager, engine: TelegramEngineUnauthorized(account: self.account), completion: { [weak self] in
             if let strongSelf = self {
                 strongSelf.controllerNode.updateCountryCode()
             }
@@ -161,7 +162,7 @@ final class AuthorizationSequencePhoneEntryController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func nextPressed() {
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
index d6320febd5..cf198be15b 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequencePhoneEntryControllerNode.swift
@@ -438,14 +438,14 @@ final class AuthorizationSequencePhoneEntryControllerNode: ASDisplayNode {
             |> castError(ExportAuthTransferTokenError.self)
         |> take(1)
         |> mapToSignal { activeAccountsAndInfo -> Signal<ExportAuthTransferTokenResult, ExportAuthTransferTokenError> in
-            let (primary, activeAccounts, _) = activeAccountsAndInfo
-            var activeProductionUserIds = activeAccounts.map({ $0.1 }).filter({ !$0.testingEnvironment }).map({ $0.peerId.id })
-            var activeTestingUserIds = activeAccounts.map({ $0.1 }).filter({ $0.testingEnvironment }).map({ $0.peerId.id })
+            let (_, activeAccounts, _) = activeAccountsAndInfo
+            let activeProductionUserIds = activeAccounts.map({ $0.1 }).filter({ !$0.testingEnvironment }).map({ $0.peerId.id })
+            let activeTestingUserIds = activeAccounts.map({ $0.1 }).filter({ $0.testingEnvironment }).map({ $0.peerId.id })
             
             let allProductionUserIds = activeProductionUserIds
             let allTestingUserIds = activeTestingUserIds
             
-            return exportAuthTransferToken(accountManager: sharedContext.accountManager, account: account, otherAccountUserIds: account.testingEnvironment ? allTestingUserIds : allProductionUserIds, syncContacts: true)
+            return TelegramEngineUnauthorized(account: account).auth.exportAuthTransferToken(accountManager: sharedContext.accountManager, otherAccountUserIds: account.testingEnvironment ? allTestingUserIds : allProductionUserIds, syncContacts: true)
         }
         
         self.exportTokenDisposable.set((tokenSignal
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift
index 6b5a18f1b6..ddba34b80a 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceSignUpController.swift
@@ -138,7 +138,7 @@ final class AuthorizationSequenceSignUpController: ViewController {
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func nextPressed() {
diff --git a/submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift b/submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift
index 184601231f..26cc9a83cd 100644
--- a/submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift
+++ b/submodules/TelegramUI/Sources/AuthorizationSequenceSplashController.swift
@@ -17,8 +17,7 @@ final class AuthorizationSequenceSplashController: ViewController {
     }
     
     private let accountManager: AccountManager
-    private let postbox: Postbox
-    private let network: Network
+    private let account: UnauthorizedAccount
     private let theme: PresentationTheme
     
     private let controller: RMIntroViewController
@@ -30,14 +29,13 @@ final class AuthorizationSequenceSplashController: ViewController {
     private let suggestedLocalization = Promise<SuggestedLocalizationInfo?>()
     private let activateLocalizationDisposable = MetaDisposable()
     
-    init(accountManager: AccountManager, postbox: Postbox, network: Network, theme: PresentationTheme) {
+    init(accountManager: AccountManager, account: UnauthorizedAccount, theme: PresentationTheme) {
         self.accountManager = accountManager
-        self.postbox = postbox
-        self.network = network
+        self.account = account
         self.theme = theme
         
         self.suggestedLocalization.set(.single(nil)
-        |> then(currentlySuggestedLocalization(network: network, extractKeys: ["Login.ContinueWithLocalization"])))
+        |> then(TelegramEngineUnauthorized(account: self.account).localization.currentlySuggestedLocalization(extractKeys: ["Login.ContinueWithLocalization"])))
         let suggestedLocalization = self.suggestedLocalization
         
         let localizationSignal = SSignal(generator: { subscriber in
@@ -176,7 +174,7 @@ final class AuthorizationSequenceSplashController: ViewController {
             }
             
             if let suggestedCode = suggestedCode {
-                _ = markSuggestedLocalizationAsSeenInteractively(postbox: strongSelf.postbox, languageCode: suggestedCode).start()
+                _ = TelegramEngineUnauthorized(account: strongSelf.account).localization.markSuggestedLocalizationAsSeenInteractively(languageCode: suggestedCode).start()
             }
             
             if currentCode == code {
@@ -186,9 +184,8 @@ final class AuthorizationSequenceSplashController: ViewController {
             
             strongSelf.controller.isEnabled = false
             let accountManager = strongSelf.accountManager
-            let postbox = strongSelf.postbox
             
-            strongSelf.activateLocalizationDisposable.set(downloadAndApplyLocalization(accountManager: accountManager, postbox: postbox, network: strongSelf.network, languageCode: code).start(completed: {
+            strongSelf.activateLocalizationDisposable.set(TelegramEngineUnauthorized(account: strongSelf.account).localization.downloadAndApplyLocalization(accountManager: accountManager, languageCode: code).start(completed: {
                 let _ = (accountManager.transaction { transaction -> PresentationStrings? in
                     let localizationSettings: LocalizationSettings?
                     if let current = transaction.getSharedData(SharedDataKeys.localizationSettings) as? LocalizationSettings {
diff --git a/submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift
index 66d808929d..8c7a5d526d 100644
--- a/submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatChannelSubscriberInputPanelNode.swift
@@ -38,7 +38,7 @@ private func titleAndColorForAction(_ action: SubscriberAction, theme: Presentat
     }
 }
 
-private func actionForPeer(peer: Peer, interfaceState: ChatPresentationInterfaceState, isMuted: Bool) -> SubscriberAction? {
+private func actionForPeer(peer: Peer, interfaceState: ChatPresentationInterfaceState, isJoining: Bool, isMuted: Bool) -> SubscriberAction? {
     if case .pinnedMessages = interfaceState.subject {
         var canManagePin = false
         if let channel = peer as? TelegramChannel {
@@ -64,6 +64,13 @@ private func actionForPeer(peer: Peer, interfaceState: ChatPresentationInterface
         }
     } else {
         if let channel = peer as? TelegramChannel {
+            if case .broadcast = channel.info, isJoining {
+                if isMuted {
+                    return .unmuteNotifications
+                } else {
+                    return .muteNotifications
+                }
+            }
             switch channel.participationStatus {
                 case .kicked:
                     return .kicked
@@ -102,10 +109,11 @@ final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
     
     private let actionDisposable = MetaDisposable()
     private let badgeDisposable = MetaDisposable()
+    private var isJoining: Bool = false
     
     private var presentationInterfaceState: ChatPresentationInterfaceState?
     
-    private var layoutData: (CGFloat, CGFloat, CGFloat)?
+    private var layoutData: (CGFloat, CGFloat, CGFloat, UIEdgeInsets, CGFloat, Bool, LayoutMetrics)?
     
     override init() {
         self.button = HighlightableButtonNode()
@@ -168,14 +176,34 @@ final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
         
         switch action {
         case .join:
-            self.activityIndicator.isHidden = false
-            self.activityIndicator.startAnimating()
-            self.actionDisposable.set((context.peerChannelMemberCategoriesContextsManager.join(account: context.account, peerId: peer.id, hash: nil)
+            var delayActivity = false
+            if let peer = peer as? TelegramChannel, case .broadcast = peer.info {
+                delayActivity = true
+            }
+            
+            if delayActivity {
+                Queue.mainQueue().after(1.5) {
+                    if self.isJoining {
+                        self.activityIndicator.isHidden = false
+                        self.activityIndicator.startAnimating()
+                    }
+                }
+            } else {
+                self.activityIndicator.isHidden = false
+                self.activityIndicator.startAnimating()
+            }
+            
+            self.isJoining = true
+            if let (width, leftInset, rightInset, additionalSideInsets, maxHeight, isSecondary, metrics) = self.layoutData, let presentationInterfaceState = self.presentationInterfaceState {
+                let _ = self.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, additionalSideInsets: additionalSideInsets, maxHeight: maxHeight, isSecondary: isSecondary, transition: .immediate, interfaceState: presentationInterfaceState, metrics: metrics, force: true)
+            }
+            self.actionDisposable.set((context.peerChannelMemberCategoriesContextsManager.join(engine: context.engine, peerId: peer.id, hash: nil)
             |> afterDisposed { [weak self] in
                 Queue.mainQueue().async {
                     if let strongSelf = self {
                         strongSelf.activityIndicator.isHidden = true
                         strongSelf.activityIndicator.stopAnimating()
+                        strongSelf.isJoining = false
                     }
                 }
             }).start(error: { [weak self] error in
@@ -206,7 +234,7 @@ final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
             break
         case .muteNotifications, .unmuteNotifications:
             if let context = self.context, let presentationInterfaceState = self.presentationInterfaceState, let peer = presentationInterfaceState.renderedPeer?.peer {
-                self.actionDisposable.set(togglePeerMuted(account: context.account, peerId: peer.id).start())
+                self.actionDisposable.set(context.engine.peers.togglePeerMuted(peerId: peer.id).start())
             }
         case .hidePinnedMessages, .unpinMessages:
             self.interfaceInteraction?.unpinAllMessages()
@@ -220,9 +248,13 @@ final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
     }
     
     override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, maxHeight: CGFloat, isSecondary: Bool, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
-        self.layoutData = (width, leftInset, rightInset)
+        return self.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, additionalSideInsets: additionalSideInsets, maxHeight: maxHeight, isSecondary: isSecondary, transition: transition, interfaceState: interfaceState, metrics: metrics, force: false)
+    }
+    
+    private func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, maxHeight: CGFloat, isSecondary: Bool, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics, force: Bool) -> CGFloat {
+        self.layoutData = (width, leftInset, rightInset, additionalSideInsets, maxHeight, isSecondary, metrics)
         
-        if self.presentationInterfaceState != interfaceState {
+        if self.presentationInterfaceState != interfaceState || force {
             let previousState = self.presentationInterfaceState
             self.presentationInterfaceState = interfaceState
             
@@ -231,16 +263,17 @@ final class ChatChannelSubscriberInputPanelNode: ChatInputPanelNode {
                 self.helpButton.setImage(generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Accessory Panels/Help"), color: interfaceState.theme.chat.inputPanel.panelControlAccentColor), for: .normal)
             }
             
-            if let peer = interfaceState.renderedPeer?.peer, previousState?.renderedPeer?.peer == nil || !peer.isEqual(previousState!.renderedPeer!.peer!) || previousState?.theme !== interfaceState.theme || previousState?.strings !== interfaceState.strings || previousState?.peerIsMuted != interfaceState.peerIsMuted || previousState?.pinnedMessage != interfaceState.pinnedMessage {
+            if let peer = interfaceState.renderedPeer?.peer, previousState?.renderedPeer?.peer == nil || !peer.isEqual(previousState!.renderedPeer!.peer!) || previousState?.theme !== interfaceState.theme || previousState?.strings !== interfaceState.strings || previousState?.peerIsMuted != interfaceState.peerIsMuted || previousState?.pinnedMessage != interfaceState.pinnedMessage || force {
                 
-                if let action = actionForPeer(peer: peer, interfaceState: interfaceState, isMuted: interfaceState.peerIsMuted) {
+                if let action = actionForPeer(peer: peer, interfaceState: interfaceState, isJoining: self.isJoining, isMuted: interfaceState.peerIsMuted) {
                     let previousAction = self.action
                     self.action = action
                     let (title, color) = titleAndColorForAction(action, theme: interfaceState.theme, strings: interfaceState.strings)
                     
                     var offset: CGFloat = 30.0
-                    if let previousAction = previousAction, previousAction == .muteNotifications && action == .unmuteNotifications || previousAction == .unmuteNotifications && action == .muteNotifications {
-                        if previousAction == .muteNotifications {
+                    
+                    if let previousAction = previousAction, [.join, .muteNotifications].contains(previousAction) && action == .unmuteNotifications || [.join, .unmuteNotifications].contains(previousAction) && action == .muteNotifications {
+                        if [.join, .muteNotifications].contains(previousAction) {
                             offset *= -1.0
                         }
                         if let snapshotView = self.button.view.snapshotContentTree() {
diff --git a/submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift b/submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift
index 4c2703271f..eaced07470 100644
--- a/submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatContextResultPeekContentNode.swift
@@ -9,13 +9,14 @@ import SwiftSignalKit
 import AVFoundation
 import PhotoResources
 import AppBundle
+import ContextUI
 
 final class ChatContextResultPeekContent: PeekControllerContent {
     let account: Account
     let contextResult: ChatContextResult
-    let menu: [PeekControllerMenuItem]
+    let menu: [ContextMenuItem]
     
-    init(account: Account, contextResult: ChatContextResult, menu: [PeekControllerMenuItem]) {
+    init(account: Account, contextResult: ChatContextResult, menu: [ContextMenuItem]) {
         self.account = account
         self.contextResult = contextResult
         self.menu = menu
@@ -25,11 +26,11 @@ final class ChatContextResultPeekContent: PeekControllerContent {
         return .contained
     }
     
-    func menuActivation() -> PeerkControllerMenuActivation {
+    func menuActivation() -> PeerControllerMenuActivation {
         return .drag
     }
     
-    func menuItems() -> [PeekControllerMenuItem] {
+    func menuItems() -> [ContextMenuItem] {
         return self.menu
     }
     
@@ -162,7 +163,7 @@ private final class ChatContextResultPeekNode: ASDisplayNode, PeekControllerCont
                 imageDimensions = externalReference.content?.dimensions?.cgSize
                 if let content = externalReference.content, externalReference.type == "gif", let thumbnailResource = imageResource
                     , let dimensions = content.dimensions {
-                    videoFileReference = .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: content.resource, previewRepresentations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: thumbnailResource, progressiveSizes: [])], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])]))
+                    videoFileReference = .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: content.resource, previewRepresentations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil)], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])]))
                     imageResource = nil
                 }
             case let .internalReference(internalReference):
@@ -224,7 +225,7 @@ private final class ChatContextResultPeekNode: ASDisplayNode, PeekControllerCont
         
         if updatedImageResource {
             if let imageResource = imageResource {
-                let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: Int32(fittedImageDimensions.width * 2.0), height: Int32(fittedImageDimensions.height * 2.0)), resource: imageResource, progressiveSizes: [])
+                let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: Int32(fittedImageDimensions.width * 2.0), height: Int32(fittedImageDimensions.height * 2.0)), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil)
                 let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [tmpRepresentation], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                 updateImageSignal = chatMessagePhoto(postbox: self.account.postbox, photoReference: .standalone(media: tmpImage))
             } else {
diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift
index f39b397e6a..85de671d29 100644
--- a/submodules/TelegramUI/Sources/ChatController.swift
+++ b/submodules/TelegramUI/Sources/ChatController.swift
@@ -47,7 +47,6 @@ import RaiseToListen
 import UrlHandling
 import ReactionSelectionNode
 import AvatarNode
-import MessageReactionListUI
 import AppBundle
 import LocalizedPeerData
 import PhoneNumberFormat
@@ -64,6 +63,12 @@ import ChatHistoryImportTasks
 import Markdown
 import TelegramPermissionsUI
 import Speak
+import UniversalMediaPlayer
+import WallpaperBackgroundNode
+
+#if DEBUG
+import os.signpost
+#endif
 
 extension ChatLocation {
     var peerId: PeerId {
@@ -101,13 +106,13 @@ private enum ChatRecordingActivity {
 }
 
 public enum NavigateToMessageLocation {
-    case id(MessageId)
+    case id(MessageId, Double?)
     case index(MessageIndex)
     case upperBound(PeerId)
     
     var messageId: MessageId? {
         switch self {
-            case let .id(id):
+            case let .id(id, _):
                 return id
             case let .index(index):
                 return index.id
@@ -118,7 +123,7 @@ public enum NavigateToMessageLocation {
     
     var peerId: PeerId {
         switch self {
-            case let .id(id):
+            case let .id(id, _):
                 return id.peerId
             case let .index(index):
                 return index.id.peerId
@@ -173,6 +178,37 @@ enum ChatLoadingMessageSubject {
     case pinnedMessage
 }
 
+#if DEBUG
+private final class SignpostData {
+    @available(iOSApplicationExtension 12.0, iOS 12.0, *)
+    final class Impl {
+        let signpostLog: OSLog
+        let signpostId: OSSignpostID
+
+        init() {
+            self.signpostLog = OSLog(
+                subsystem: "org.telegram.Telegram-iOS",
+                category: "ChatAppear"
+            )
+            self.signpostId = OSSignpostID(log: self.signpostLog)
+        }
+    }
+
+    private static var _impl: AnyObject? = {
+        if #available(iOSApplicationExtension 12.0, iOS 12.0, *) {
+            return Impl()
+        } else {
+            return nil
+        }
+    }()
+
+    @available(iOSApplicationExtension 12.0, iOS 12.0, *)
+    static var impl: Impl {
+        return self._impl! as! Impl
+    }
+}
+#endif
+
 public final class ChatControllerImpl: TelegramBaseController, ChatController, GalleryHiddenMediaTarget, UIDropInteractionDelegate {
     private var validLayout: ContainerViewLayout?
     
@@ -199,6 +235,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     
     private let cachedDataReady = Promise<Bool>()
     private var didSetCachedDataReady = false
+
+    private let wallpaperReady = Promise<Bool>()
     
     private var presentationInterfaceState: ChatPresentationInterfaceState
     private var presentationInterfaceStatePromise: ValuePromise<ChatPresentationInterfaceState>
@@ -214,7 +252,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     
     private let galleryHiddenMesageAndMediaDisposable = MetaDisposable()
     private let temporaryHiddenGalleryMediaDisposable = MetaDisposable()
-    
+
+    private let chatBackgroundNode: WallpaperBackgroundNode
     private var controllerInteraction: ChatControllerInteraction?
     private var interfaceInteraction: ChatPanelInterfaceInteraction?
     
@@ -355,6 +394,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     
     private weak var sendMessageActionsController: ChatSendMessageActionSheetController?
     private var searchResultsController: ChatSearchResultsController?
+
+    private weak var currentPinchController: PinchController?
+    private weak var currentPinchSourceItemNode: ListViewItemNode?
     
     private var screenCaptureManager: ScreenCaptureDetectionManager?
     private let chatAdditionalDataDisposable = MetaDisposable()
@@ -414,7 +456,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     
     private var importStateDisposable: Disposable?
     
-    public init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, mode: ChatControllerPresentationMode = .standard(previewing: false), peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, greetingData: ChatGreetingData? = nil) {
+    public init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, mode: ChatControllerPresentationMode = .standard(previewing: false), peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil) {
         let _ = ChatControllerCount.modify { value in
             return value + 1
         }
@@ -425,6 +467,16 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         self.subject = subject
         self.botStart = botStart
         self.peekData = peekData
+
+        var useSharedAnimationPhase = false
+        switch mode {
+        case .standard(false):
+            useSharedAnimationPhase = true
+        default:
+            break
+        }
+        self.chatBackgroundNode = WallpaperBackgroundNode(context: context, useSharedAnimationPhase: useSharedAnimationPhase)
+        self.wallpaperReady.set(self.chatBackgroundNode.isReady)
         
         var locationBroadcastPanelSource: LocationBroadcastPanelSource
         var groupCallPanelSource: GroupCallPanelSource
@@ -459,7 +511,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         self.stickerSettings = ChatInterfaceStickerSettings(loopAnimatedStickers: false)
         
-        self.presentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: context.currentLimitsConfiguration.with { $0 }, fontSize: self.presentationData.chatFontSize, bubbleCorners: self.presentationData.chatBubbleCorners, accountPeerId: context.account.peerId, mode: mode, chatLocation: chatLocation, subject: subject, peerNearbyData: peerNearbyData, greetingData: greetingData, pendingUnpinnedAllMessages: false, activeGroupCallInfo: nil, hasActiveGroupCall: false, importState: nil)
+        self.presentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: context.currentLimitsConfiguration.with { $0 }, fontSize: self.presentationData.chatFontSize, bubbleCorners: self.presentationData.chatBubbleCorners, accountPeerId: context.account.peerId, mode: mode, chatLocation: chatLocation, subject: subject, peerNearbyData: peerNearbyData, greetingData: context.prefetchManager?.preloadedGreetingSticker, pendingUnpinnedAllMessages: false, activeGroupCallInfo: nil, hasActiveGroupCall: false, importState: nil)
         self.presentationInterfaceStatePromise = ValuePromise(self.presentationInterfaceState)
         
         var mediaAccessoryPanelVisibility = MediaAccessoryPanelVisibility.none
@@ -514,12 +566,18 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             var openMessageByAction: Bool = false
 
             for media in message.media {
+                if let file = media as? TelegramMediaFile, file.isInstantVideo {
+                    if strongSelf.chatDisplayNode.isInputViewFocused {
+                        strongSelf.returnInputViewFocus = true
+                        strongSelf.chatDisplayNode.dismissInput()
+                    }
+                }
                 if let action = media as? TelegramMediaAction {
                     switch action.action {
                         case .pinnedMessageUpdated:
                             for attribute in message.attributes {
                                 if let attribute = attribute as? ReplyMessageAttribute {
-                                    strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId))
+                                    strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId, nil))
                                     break
                                 }
                             }
@@ -528,13 +586,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         case .gameScore:
                             for attribute in message.attributes {
                                 if let attribute = attribute as? ReplyMessageAttribute {
-                                    strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId))
+                                    strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId, nil))
                                     break
                                 }
                             }
                         case .groupPhoneCall, .inviteToGroupPhoneCall:
                             if let activeCall = strongSelf.presentationInterfaceState.activeGroupCallInfo?.activeCall {
-                                strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: activeCall.id, accessHash: activeCall.accessHash, title: activeCall.title))
+                                strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: activeCall.id, accessHash: activeCall.accessHash, title: activeCall.title, scheduleTimestamp: activeCall.scheduleTimestamp, subscribedToScheduled: activeCall.subscribedToScheduled))
                             } else {
                                 var canManageGroupCalls = false
                                 if let channel = strongSelf.presentationInterfaceState.renderedPeer?.chatMainPeer as? TelegramChannel {
@@ -552,7 +610,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                                 
                                 if canManageGroupCalls {
-                                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatText, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {}), TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatStart, action: {
+                                    strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatText, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatStartNow, action: {
                                         if let strongSelf = self {
                                             var dismissStatus: (() -> Void)?
                                             let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: {
@@ -563,12 +621,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                                 statusController?.dismiss()
                                             }
                                             strongSelf.present(statusController, in: .window(.root))
-                                            strongSelf.createVoiceChatDisposable.set((createGroupCall(account: strongSelf.context.account, peerId: message.id.peerId)
+                                            strongSelf.createVoiceChatDisposable.set((strongSelf.context.engine.calls.createGroupCall(peerId: message.id.peerId, title: nil, scheduleDate: nil)
                                             |> deliverOnMainQueue).start(next: { [weak self] info in
                                                 guard let strongSelf = self else {
                                                     return
                                                 }
-                                                strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title))
+                                                strongSelf.joinGroupCall(peerId: message.id.peerId, invite: nil, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: info.scheduleTimestamp, subscribedToScheduled: info.subscribedToScheduled))
                                             }, error: { [weak self] error in
                                                 dismissStatus?()
                                                 
@@ -578,7 +636,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                             
                                                 let text: String
                                                 switch error {
-                                                case .generic:
+                                                case .generic, .scheduledTooLate:
                                                     text = strongSelf.presentationData.strings.Login_UnknownError
                                                 case .anonymousNotAllowed:
                                                     text = strongSelf.presentationData.strings.VoiceChat_AnonymousDisabledAlertText
@@ -588,7 +646,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                                 dismissStatus?()
                                             }))
                                         }
-                                    })]), in: .window(.root))
+                                    }), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.VoiceChat_CreateNewVoiceChatSchedule, action: {
+                                        if let strongSelf = self {
+                                            strongSelf.context.scheduleGroupCall(peerId: message.id.peerId)
+                                        }
+                                    }), TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})], actionLayout: .vertical), in: .window(.root))
                                 }
                             }
                             return true
@@ -618,6 +680,15 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             if canSetupAutoremoveTimeout {
                                 strongSelf.presentAutoremoveSetup()
                             }
+                        case .paymentSent:
+                            strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: message.id), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                            /*for attribute in message.attributes {
+                                if let attribute = attribute as? ReplyMessageAttribute {
+                                    //strongSelf.navigateToMessage(from: message.id, to: .id(attribute.messageId))
+                                    break
+                                }
+                            }*/
+                            return true
                         default:
                             break
                     }
@@ -664,7 +735,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }, enqueueMessage: { message in
                 self?.sendMessages([message])
             }, sendSticker: canSendMessagesToChat(strongSelf.presentationInterfaceState) ? { fileReference, sourceNode, sourceRect in
-                return self?.controllerInteraction?.sendSticker(fileReference, nil, false, sourceNode, sourceRect) ?? false
+                return self?.controllerInteraction?.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect) ?? false
             } : nil, setupTemporaryHiddenMedia: { signal, centralIndex, galleryMedia in
                 if let strongSelf = self {
                     strongSelf.temporaryHiddenGalleryMediaDisposable.set((signal |> deliverOnMainQueue).start(next: { entry in
@@ -812,7 +883,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         break
                     }
                 }
-                let _ = combineLatest(queue: .mainQueue(), contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState: strongSelf.presentationInterfaceState, context: strongSelf.context, messages: updatedMessages, controllerInteraction: strongSelf.controllerInteraction, selectAll: selectAll, interfaceInteraction: strongSelf.interfaceInteraction), loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .animatedEmoji, forceActualized: false), ApplicationSpecificNotice.getChatTextSelectionTips(accountManager: strongSelf.context.sharedContext.accountManager)
+                let _ = combineLatest(queue: .mainQueue(), contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState: strongSelf.presentationInterfaceState, context: strongSelf.context, messages: updatedMessages, controllerInteraction: strongSelf.controllerInteraction, selectAll: selectAll, interfaceInteraction: strongSelf.interfaceInteraction), strongSelf.context.engine.stickers.loadedStickerPack(reference: .animatedEmoji, forceActualized: false), ApplicationSpecificNotice.getChatTextSelectionTips(accountManager: strongSelf.context.sharedContext.accountManager)
                 ).start(next: { actions, animatedEmojiStickers, chatTextSelectionTips in
                     guard let strongSelf = self, !actions.isEmpty else {
                         return
@@ -903,12 +974,37 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     strongSelf.window?.presentInGlobalOverlay(controller)
                 })
             }
+        }, activateMessagePinch: { [weak self] sourceNode in
+            guard let strongSelf = self else {
+                return
+            }
+
+            var sourceItemNode: ListViewItemNode?
+            strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
+                guard let itemNode = itemNode as? ListViewItemNode else {
+                    return
+                }
+                if sourceNode.view.isDescendant(of: itemNode.view) {
+                    sourceItemNode = itemNode
+                }
+            }
+
+            let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                guard let strongSelf = self else {
+                    return CGRect()
+                }
+
+                return strongSelf.chatDisplayNode.view.convert(strongSelf.chatDisplayNode.frameForVisibleArea(), to: nil)
+            })
+            strongSelf.currentPinchController = pinchController
+            strongSelf.currentPinchSourceItemNode = sourceItemNode
+            strongSelf.window?.presentInGlobalOverlay(pinchController)
         }, openMessageContextActions: { message, node, rect, gesture in
             gesture?.cancel()
         }, navigateToMessage: { [weak self] fromId, id in
-            self?.navigateToMessage(from: fromId, to: .id(id), forceInCurrentChat: fromId.peerId == id.peerId)
+            self?.navigateToMessage(from: fromId, to: .id(id, nil), forceInCurrentChat: fromId.peerId == id.peerId)
         }, navigateToMessageStandalone: { [weak self] id in
-            self?.navigateToMessage(from: nil, to: .id(id), forceInCurrentChat: false)
+            self?.navigateToMessage(from: nil, to: .id(id, nil), forceInCurrentChat: false)
         }, tapMessage: nil, clickThroughMessage: { [weak self] in
             self?.chatDisplayNode.dismissInput()
         }, toggleMessagesSelection: { [weak self] ids, value in
@@ -918,12 +1014,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withToggledSelectedMessages(ids, value: value) } })
             if let selectionState = strongSelf.presentationInterfaceState.interfaceState.selectionState {
                 let count = selectionState.selectedIds.count
-                let text: String
-                if count == 1 {
-                    text = "1 message selected"
-                } else {
-                    text = "\(count) messages selected"
-                }
+                let text = strongSelf.presentationData.strings.VoiceOver_Chat_MessagesSelected(Int32(count))
                 DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 0.1, execute: {
                     UIAccessibility.post(notification: UIAccessibility.Notification.announcement, argument: text as NSString)
                 })
@@ -956,14 +1047,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                     })
                 }
-            })
+            }, nil)
             var attributes: [MessageAttribute] = []
             let entities = generateTextEntities(text, enabledTypes: .all)
             if !entities.isEmpty {
                 attributes.append(TextEntitiesMessageAttribute(entities: entities))
             }
-            strongSelf.sendMessages([.message(text: text, attributes: attributes, mediaReference: nil, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)])
-        }, sendSticker: { [weak self] fileReference, query, clearInput, sourceNode, sourceRect in
+            strongSelf.sendMessages([.message(text: text, attributes: attributes, mediaReference: nil, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: nil)])
+        }, sendSticker: { [weak self] fileReference, silentPosting, schedule, query, clearInput, sourceNode, sourceRect in
             guard let strongSelf = self else {
                 return false
             }
@@ -972,7 +1063,24 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 strongSelf.interfaceInteraction?.displaySlowmodeTooltip(sourceNode, sourceRect)
                 return false
             }
-                
+            
+            var attributes: [MessageAttribute] = []
+            if let query = query {
+                attributes.append(EmojiSearchQueryMessageAttribute(query: query))
+            }
+
+            let correlationId = Int64.random(in: 0 ..< Int64.max)
+
+            var replyPanel: ReplyAccessoryPanelNode?
+            if let accessoryPanelNode = strongSelf.chatDisplayNode.accessoryPanelNode as? ReplyAccessoryPanelNode {
+                replyPanel = accessoryPanelNode
+            }
+
+            var shouldAnimateMessageTransition = strongSelf.chatDisplayNode.shouldAnimateMessageTransition
+            if sourceNode is ChatEmptyNodeStickerContentNode {
+                shouldAnimateMessageTransition = true
+            }
+
             strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, { current in
@@ -990,20 +1098,55 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             }
                             return current
                         }
-                        
+
                         return current
                     })
                 }
-            })
-            
-            var attributes: [MessageAttribute] = []
-            if let query = query {
-                attributes.append(EmojiSearchQueryMessageAttribute(query: query))
+            }, shouldAnimateMessageTransition ? correlationId : nil)
+
+            if shouldAnimateMessageTransition {
+                if let sourceNode = sourceNode as? ChatMediaInputStickerGridItemNode {
+                    strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .stickerMediaInput(input: .inputPanel(itemNode: sourceNode), replyPanel: replyPanel), initiated: {
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, { current in
+                            var current = current
+                            current = current.updatedInputMode { current in
+                                if case let .media(mode, maybeExpanded) = current, maybeExpanded != nil {
+                                    return .media(mode: mode, expanded: nil)
+                                }
+                                return current
+                            }
+
+                            return current
+                        })
+                    })
+                } else if let sourceNode = sourceNode as? HorizontalStickerGridItemNode {
+                    strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .stickerMediaInput(input: .mediaPanel(itemNode: sourceNode), replyPanel: replyPanel), initiated: {})
+                } else if let sourceNode = sourceNode as? StickerPaneSearchStickerItemNode {
+                    strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .stickerMediaInput(input: .inputPanelSearch(itemNode: sourceNode), replyPanel: replyPanel), initiated: {})
+                } else if let sourceNode = sourceNode as? ChatEmptyNodeStickerContentNode {
+                    strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .stickerMediaInput(input: .emptyPanel(itemNode: sourceNode), replyPanel: nil), initiated: {})
+                }
             }
             
-            strongSelf.sendMessages([.message(text: "", attributes: attributes, mediaReference: fileReference.abstract, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)])
+            let messages: [EnqueueMessage]  = [.message(text: "", attributes: attributes, mediaReference: fileReference.abstract, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: correlationId)]
+            if silentPosting {
+                let transformedMessages = strongSelf.transformEnqueueMessages(messages, silentPosting: silentPosting)
+                strongSelf.sendMessages(transformedMessages)
+            } else if schedule {
+                strongSelf.presentScheduleTimePicker(completion: { [weak self] scheduleTime in
+                    if let strongSelf = self {
+                        let transformedMessages = strongSelf.transformEnqueueMessages(messages, silentPosting: false, scheduleTime: scheduleTime)
+                        strongSelf.sendMessages(transformedMessages)
+                    }
+                })
+            } else {
+                strongSelf.sendMessages(messages)
+            }
             return true
-        }, sendGif: { [weak self] fileReference, sourceNode, sourceRect in
+        }, sendGif: { [weak self] fileReference, sourceNode, sourceRect, silentPosting, schedule in
             if let strongSelf = self {
                 if let _ = strongSelf.presentationInterfaceState.slowmodeState, strongSelf.presentationInterfaceState.subject != .scheduledMessages {
                     strongSelf.interfaceInteraction?.displaySlowmodeTooltip(sourceNode, sourceRect)
@@ -1021,11 +1164,25 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             }
                         })
                     }
-                })
-                strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: fileReference.abstract, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)])
+                }, nil)
+                
+                var messages = [EnqueueMessage.message(text: "", attributes: [], mediaReference: fileReference.abstract, replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: nil)]
+                if silentPosting {
+                    messages = strongSelf.transformEnqueueMessages(messages, silentPosting: true)
+                    strongSelf.sendMessages(messages)
+                } else if schedule {
+                    strongSelf.presentScheduleTimePicker(completion: { [weak self] scheduleTime in
+                        if let strongSelf = self {
+                            let transformedMessages = strongSelf.transformEnqueueMessages(messages, silentPosting: false, scheduleTime: scheduleTime)
+                            strongSelf.sendMessages(transformedMessages)
+                        }
+                    })
+                } else {
+                    strongSelf.sendMessages(messages)
+                }
             }
             return true
-        }, sendBotContextResultAsGif: { [weak self] collection, result, sourceNode, sourceRect in
+        }, sendBotContextResultAsGif: { [weak self] collection, result, sourceNode, sourceRect, silentPosting in
             guard let strongSelf = self else {
                 return false
             }
@@ -1037,7 +1194,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 return false
             }
             
-            strongSelf.enqueueChatContextResult(collection, result, hideVia: true, closeMediaInput: true)
+            strongSelf.enqueueChatContextResult(collection, result, hideVia: true, closeMediaInput: true, silentPosting: silentPosting)
             
             return true
         }, requestMessageActionCallback: { [weak self] messageId, data, isGame, requiresPassword in
@@ -1142,9 +1299,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                     }
                     
-                    let account = strongSelf.context.account
+                    let context = strongSelf.context
                     if requiresPassword {
-                        strongSelf.messageActionCallbackDisposable.set(((requestMessageActionCallbackPasswordCheck(account: account, messageId: messageId, isGame: isGame, data: data)
+                        strongSelf.messageActionCallbackDisposable.set(((strongSelf.context.engine.messages.requestMessageActionCallbackPasswordCheck(messageId: messageId, isGame: isGame, data: data)
                         |> afterDisposed {
                             updateProgress()
                         })
@@ -1152,7 +1309,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 let controller = ownershipTransferController(context: context, initialError: error, present: { c, a in
                                     strongSelf.present(c, in: .window(.root), with: a)
                                 }, commit: { password in
-                                    return requestMessageActionCallback(account: account, messageId: messageId, isGame: isGame, password: password, data: data)
+                                    return context.engine.messages.requestMessageActionCallback(messageId: messageId, isGame: isGame, password: password, data: data)
                                     |> afterDisposed {
                                         updateProgress()
                                     }
@@ -1162,7 +1319,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 strongSelf.present(controller, in: .window(.root))
                             }))
                     } else {
-                        strongSelf.messageActionCallbackDisposable.set(((requestMessageActionCallback(account: account, messageId: messageId, isGame: isGame, password: nil, data: data)
+                        strongSelf.messageActionCallbackDisposable.set(((context.engine.messages.requestMessageActionCallback(messageId: messageId, isGame: isGame, password: nil, data: data)
                         |> afterDisposed {
                             updateProgress()
                         })
@@ -1195,7 +1352,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return $0
                     }
                 })
-                strongSelf.messageActionUrlAuthDisposable.set(((combineLatest(strongSelf.context.account.postbox.loadedPeerWithId(strongSelf.context.account.peerId), requestMessageActionUrlAuth(account: strongSelf.context.account, subject: subject) |> afterDisposed {
+                strongSelf.messageActionUrlAuthDisposable.set(((combineLatest(strongSelf.context.account.postbox.loadedPeerWithId(strongSelf.context.account.peerId), strongSelf.context.engine.messages.requestMessageActionUrlAuth(subject: subject) |> afterDisposed {
                     Queue.mainQueue().async {
                         if let strongSelf = self {
                             strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
@@ -1244,7 +1401,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                                 }
                                             })
                                             
-                                            strongSelf.messageActionUrlAuthDisposable.set(((acceptMessageActionUrlAuth(account: strongSelf.context.account, subject: subject, allowWriteAccess: allowWriteAccess) |> afterDisposed {
+                                            strongSelf.messageActionUrlAuthDisposable.set(((strongSelf.context.engine.messages.acceptMessageActionUrlAuth(subject: subject, allowWriteAccess: allowWriteAccess) |> afterDisposed {
                                                 Queue.mainQueue().async {
                                                     if let strongSelf = self {
                                                         strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, {
@@ -1321,7 +1478,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         |> deliverOnMainQueue).start(next: { coordinate in
                             if let strongSelf = self {
                                 if let coordinate = coordinate {
-                                    strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaMap(latitude: coordinate.latitude, longitude: coordinate.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil)), replyToMessageId: nil, localGroupingKey: nil)])
+                                    strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaMap(latitude: coordinate.latitude, longitude: coordinate.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: nil, liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
                                 } else {
                                     strongSelf.present(textAlertController(context: strongSelf.context, title: nil, text: strongSelf.presentationData.strings.Login_UnknownError, actions: [TextAlertAction(type: .genericAction, title: strongSelf.presentationData.strings.Common_Cancel, action: {})]), in: .window(.root))
                                 }
@@ -1345,7 +1502,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         let _ = (strongSelf.context.account.postbox.loadedPeerWithId(strongSelf.context.account.peerId)
                         |> deliverOnMainQueue).start(next: { peer in
                             if let peer = peer as? TelegramUser, let phone = peer.phone, !phone.isEmpty {
-                                strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)), replyToMessageId: nil, localGroupingKey: nil)])
+                                strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
                             }
                         })
                     }
@@ -1353,7 +1510,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
         }, sendBotCommand: { [weak self] messageId, command in
             if let strongSelf = self, canSendMessagesToChat(strongSelf.presentationInterfaceState) {
-                strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({})
+                strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({}, nil)
                 var postAsReply = false
                 if !command.contains("@") {
                     switch strongSelf.chatLocation {
@@ -1364,6 +1521,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         case .replyThread:
                             postAsReply = true
                     }
+                    
+                    if let messageId = messageId, let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(messageId) {
+                        if let author = message.author as? TelegramUser, author.botInfo != nil {
+                        } else {
+                            postAsReply = false
+                        }
+                    }
                 }
                 
                 strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
@@ -1372,13 +1536,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil).withUpdatedComposeInputState(ChatTextInputState(inputText: NSAttributedString(string: ""))).withUpdatedComposeDisableUrlPreview(nil) }
                         })
                     }
-                })
+                }, nil)
                 var attributes: [MessageAttribute] = []
                 let entities = generateTextEntities(command, enabledTypes: .all)
                 if !entities.isEmpty {
                     attributes.append(TextEntitiesMessageAttribute(entities: entities))
                 }
-                strongSelf.sendMessages([.message(text: command, attributes: attributes, mediaReference: nil, replyToMessageId: (postAsReply && messageId != nil) ? messageId! : nil, localGroupingKey: nil)])
+                strongSelf.sendMessages([.message(text: command, attributes: attributes, mediaReference: nil, replyToMessageId: (postAsReply && messageId != nil) ? messageId! : nil, localGroupingKey: nil, correlationId: nil)])
             }
         }, openInstantPage: { [weak self] message, associatedData in
             if let strongSelf = self, strongSelf.isNodeLoaded, let navigationController = strongSelf.effectiveNavigationController, let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(message.id) {
@@ -1436,6 +1600,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         self?.commitPurposefulAction()
                     }
                 }
+                shareController.actionCompleted = { [weak self] in
+                    if let strongSelf = self {
+                        strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .linkCopied(text: strongSelf.presentationData.strings.Conversation_LinkCopied), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
+                    }
+                }
                 shareController.completed = { [weak self] peerIds in
                     if let strongSelf = self {
                         let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
@@ -1449,7 +1618,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         } |> deliverOnMainQueue).start(next: { [weak self] peers in
                             if let strongSelf = self {
                                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                
                                 let text: String
                                 var savedMessages = false
                                 if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId {
@@ -1615,7 +1783,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 actionSheet?.dismissAnimated()
                                 UIPasteboard.general.string = mention
                                 
-                                let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_UsernameCopied)
+                                let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_TextCopied)
                                 self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
                             }))
                         }
@@ -1640,7 +1808,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 actionSheet?.dismissAnimated()
                                 UIPasteboard.general.string = mention
                                 
-                                let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_TextCopied)
+                                let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_UsernameCopied)
                                 self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
                             })
                         ]), ActionSheetItemGroup(items: [
@@ -1658,7 +1826,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.ShareMenu_Send, color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
                                 if let strongSelf = self {
-                                    strongSelf.sendMessages([.message(text: command, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)])
+                                    strongSelf.sendMessages([.message(text: command, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
                                 }
                             }))
                         }
@@ -1713,7 +1881,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         guard let message = message else {
                             return
                         }
+                        let context = strongSelf.context
+                        let chatPresentationInterfaceState = strongSelf.presentationInterfaceState
                         let actionSheet = ActionSheetController(presentationData: strongSelf.presentationData)
+                        
+                        let isCopyLink: Bool
+                        if message.id.namespace == Namespaces.Message.Cloud, let _ = message.peers[message.id.peerId] as? TelegramChannel, !(message.media.first is TelegramMediaAction) {
+                            isCopyLink = true
+                        } else {
+                            isCopyLink = false
+                        }
+                        
                         actionSheet.setItemGroups([ActionSheetItemGroup(items: [
                             ActionSheetTextItem(title: text),
                             ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogOpen, color: .accent, action: { [weak actionSheet] in
@@ -1722,12 +1900,52 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     strongSelf.controllerInteraction?.seekToTimecode(message, timecode, true)
                                 }
                             }),
-                            ActionSheetButtonItem(title: strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in
+                            ActionSheetButtonItem(title: isCopyLink ? strongSelf.presentationData.strings.Conversation_ContextMenuCopyLink : strongSelf.presentationData.strings.Conversation_LinkDialogCopy, color: .accent, action: { [weak actionSheet] in
                                 actionSheet?.dismissAnimated()
-                                UIPasteboard.general.string = text
-                                
-                                let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_TextCopied)
-                                self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
+                                if isCopyLink, let channel = message.peers[message.id.peerId] as? TelegramChannel {
+                                    var threadMessageId: MessageId?
+                                   
+                                    if case let .replyThread(replyThreadMessage) = chatPresentationInterfaceState.chatLocation {
+                                        threadMessageId = replyThreadMessage.messageId
+                                    }
+                                    let _ = (context.engine.messages.exportMessageLink(peerId: message.id.peerId, messageId: message.id, isThread: threadMessageId != nil)
+                                    |> map { result -> String? in
+                                        return result
+                                    }
+                                    |> deliverOnMainQueue).start(next: { link in
+                                        if let link = link {
+                                            UIPasteboard.general.string = link + "?t=\(Int32(timecode))"
+                                            
+                                            let presentationData = context.sharedContext.currentPresentationData.with { $0 }
+                                            
+                                            var warnAboutPrivate = false
+                                            if case .peer = chatPresentationInterfaceState.chatLocation {
+                                                if channel.addressName == nil {
+                                                    warnAboutPrivate = true
+                                                }
+                                            }
+                                            Queue.mainQueue().after(0.2, {
+                                                let content: UndoOverlayContent
+                                                if warnAboutPrivate {
+                                                    content = .linkCopied(text: presentationData.strings.Conversation_PrivateMessageLinkCopiedLong)
+                                                } else {
+                                                    content = .linkCopied(text: presentationData.strings.Conversation_LinkCopied)
+                                                }
+                                                self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
+                                            })
+                                        } else {
+                                            UIPasteboard.general.string = text
+                                            
+                                            let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_TextCopied)
+                                            self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
+                                        }
+                                    })
+                                } else {
+                                    UIPasteboard.general.string = text
+                                    
+                                    let content: UndoOverlayContent = .copy(text: presentationData.strings.Conversation_TextCopied)
+                                    self?.present(UndoOverlayController(presentationData: presentationData, content: content, elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .current)
+                                }
                             })
                             ]), ActionSheetItemGroup(items: [
                                 ActionSheetButtonItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { [weak actionSheet] in
@@ -1741,7 +1959,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             return
                         }
                         
-                        var signal = getBankCardInfo(account: strongSelf.context.account, cardNumber: number)
+                        var signal = strongSelf.context.engine.payments.getBankCardInfo(cardNumber: number)
                         let disposable: MetaDisposable
                         if let current = strongSelf.bankCardDisposable {
                             disposable = current
@@ -1817,9 +2035,30 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         if let invoice = media as? TelegramMediaInvoice {
                             strongSelf.chatDisplayNode.dismissInput()
                             if let receiptMessageId = invoice.receiptMessageId {
-                                strongSelf.present(BotReceiptController(context: strongSelf.context, invoice: invoice, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
                             } else {
-                                strongSelf.present(BotCheckoutController(context: strongSelf.context, invoice: invoice, messageId: messageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                let inputData = Promise<BotCheckoutController.InputData?>()
+                                inputData.set(BotCheckoutController.InputData.fetch(context: strongSelf.context, messageId: message.id)
+                                |> map(Optional.init)
+                                |> `catch` { _ -> Signal<BotCheckoutController.InputData?, NoError> in
+                                    return .single(nil)
+                                })
+                                strongSelf.present(BotCheckoutController(context: strongSelf.context, invoice: invoice, messageId: messageId, inputData: inputData, completed: { currencyValue, receiptMessageId in
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .paymentSent(currencyValue: currencyValue, itemTitle: invoice.title), elevatedLayout: false, action: { action in
+                                        guard let strongSelf = self, let receiptMessageId = receiptMessageId else {
+                                            return false
+                                        }
+
+                                        if case .info = action {
+                                            strongSelf.present(BotReceiptController(context: strongSelf.context, messageId: receiptMessageId), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
+                                            return true
+                                        }
+                                        return false
+                                    }), in: .current)
+                                }), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
                             }
                         }
                     }
@@ -1987,7 +2226,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.actionSheet.destructiveActionTextColor)
                     }, action: { [weak self] controller, f in
                         if let strongSelf = self {
-                            let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: [id], type: .forLocalPeer).start()
+                            let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: [id], type: .forLocalPeer).start()
                         }
                         f(.dismissWithoutContent)
                     })))
@@ -2048,7 +2287,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     disposables = DisposableDict()
                     strongSelf.selectMessagePollOptionDisposables = disposables
                 }
-                let signal = requestMessageSelectPollOption(account: strongSelf.context.account, messageId: id, opaqueIdentifiers: opaqueIdentifiers)
+                let signal = strongSelf.context.engine.messages.requestMessageSelectPollOption(messageId: id, opaqueIdentifiers: opaqueIdentifiers)
                 disposables.set((signal
                 |> deliverOnMainQueue).start(next: { resultPoll in
                     guard let strongSelf = self, let resultPoll = resultPoll else {
@@ -2218,7 +2457,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                     return
                 } else {
-                    let _ = sendScheduledMessageNowInteractively(postbox: strongSelf.context.account.postbox, messageId: messageIds.first!).start()
+                    let _ = strongSelf.context.engine.messages.sendScheduledMessageNowInteractively(messageId: messageIds.first!).start()
                 }
             }
         }, editScheduledMessagesTime: { [weak self] messageIds in
@@ -2239,7 +2478,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                         break
                                     }
                                 }
-                                strongSelf.editMessageDisposable.set((requestEditMessage(account: strongSelf.context.account, messageId: messageId, text: message.text, media: .keep, entities: entities, disableUrlPreview: false, scheduleTime: time) |> deliverOnMainQueue).start(next: { result in
+                                strongSelf.editMessageDisposable.set((strongSelf.context.engine.messages.requestEditMessage(messageId: messageId, text: message.text, media: .keep, entities: entities, disableUrlPreview: false, scheduleTime: time) |> deliverOnMainQueue).start(next: { result in
                                 }, error: { error in
                                 }))
                             }
@@ -2291,29 +2530,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             } else {
                 let _ = updateMessageReactionsInteractively(postbox: strongSelf.context.account.postbox, messageId: messageId, reaction: nil).start()
             }
-        }, openMessageReactions: { [weak self] messageId in
-            guard let strongSelf = self else {
-                return
-            }
-            let _ = (strongSelf.context.account.postbox.transaction { transaction -> Message? in
-                return transaction.getMessage(messageId)
-            }
-            |> deliverOnMainQueue).start(next: { message in
-                guard let strongSelf = self, let message = message else {
-                    return
-                }
-                var initialReactions: [MessageReaction] = []
-                for attribute in message.attributes {
-                    if let attribute = attribute as? ReactionsMessageAttribute {
-                        initialReactions = attribute.reactions
-                    }
-                }
-                
-                if !initialReactions.isEmpty {
-                    strongSelf.chatDisplayNode.dismissInput()
-                    strongSelf.present(MessageReactionListController(context: strongSelf.context, messageId: message.id, initialReactions: initialReactions), in: .window(.root))
-                }
-            })
+        }, openMessageReactions: { _ in
         }, displayImportedMessageTooltip: { [weak self] _ in
             guard let strongSelf = self else {
                 return
@@ -2337,6 +2554,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     $0.withUpdatedMessageActionsState({ value in
                         var value = value
                         value.closedButtonKeyboardMessageId = message.id
+                        value.dismissedButtonKeyboardMessageId = message.id
                         return value
                     })
                 })
@@ -2385,8 +2603,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             if !onlyHaptic {
                 strongSelf.chatDisplayNode.animateQuizCorrectOptionSelected()
             }
-        }, greetingStickerNode: { [weak self] in
-            return self?.chatDisplayNode.greetingStickerNode
         }, openPeerContextMenu: { [weak self] peer, messageId, node, rect, gesture in
             guard let strongSelf = self else {
                 return
@@ -2418,7 +2634,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                     var items: [ContextMenuItem] = [
                         .action(ContextMenuActionItem(text: isChannel ? strongSelf.presentationData.strings.Conversation_ContextMenuOpenChannelProfile : strongSelf.presentationData.strings.Conversation_ContextMenuOpenProfile, icon: { theme in
-                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Info"), color: theme.actionSheet.primaryTextColor)
+                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/User"), color: theme.actionSheet.primaryTextColor)
                         }, action: { _, f in
                             f(.dismissWithoutContent)
                             self?.openPeer(peerId: peer.id, navigation: .info, fromMessage: nil)
@@ -2481,7 +2697,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             strongSelf.openMessageReplies(messageId: threadMessageId, displayProgressInMessage: message.id, isChannelPost: true, atMessage: attribute.messageId, displayModalProgress: false)
                         }
                     } else {
-                        strongSelf.navigateToMessage(from: nil, to: .id(attribute.messageId))
+                        strongSelf.navigateToMessage(from: nil, to: .id(attribute.messageId, nil))
                     }
                     break
                 }
@@ -2571,6 +2787,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return true
                 }), in: .current)
             }
+        }, isAnimatingMessage: { [weak self] stableId in
+            guard let strongSelf = self else {
+                return false
+            }
+            return strongSelf.chatDisplayNode.messageTransitionNode.isAnimatingMessage(stableId: stableId)
         }, requestMessageUpdate: { [weak self] id in
             if let strongSelf = self {
                 strongSelf.chatDisplayNode.historyNode.requestMessageUpdate(id)
@@ -2578,7 +2799,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }, cancelInteractiveKeyboardGestures: { [weak self] in
             (self?.view.window as? WindowHost)?.cancelInteractiveKeyboardGestures()
             self?.chatDisplayNode.cancelInteractiveKeyboardGestures()
-        }, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, pollActionState: ChatInterfacePollActionState(), stickerSettings: self.stickerSettings)
+        }, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, pollActionState: ChatInterfacePollActionState(), stickerSettings: self.stickerSettings, presentationContext: ChatPresentationContext(backgroundNode: self.chatBackgroundNode))
         
         self.controllerInteraction = controllerInteraction
         
@@ -2590,11 +2811,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 self.navigationBar?.userInfo = PeerInfoNavigationSourceTag(peerId: peerId)
             }
         }
-        self.navigationBar?.allowsCustomTransition = { [weak self] in
-            guard let strongSelf = self else {
-                return false
-            }
-            return !strongSelf.chatDisplayNode.hasEmbeddedTitleContent
+        self.navigationBar?.allowsCustomTransition = {
+            return true
         }
         
         self.chatTitleView = ChatTitleView(account: self.context.account, theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder)
@@ -2734,10 +2952,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     |> mapToSignal { isLarge -> Signal<Int32?, NoError> in
                         if let isLarge = isLarge {
                             if isLarge {
-                                return context.peerChannelMemberCategoriesContextsManager.recentOnline(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
+                                return context.peerChannelMemberCategoriesContextsManager.recentOnline(account: context.account, accountPeerId: context.account.peerId, peerId: peerId)
                                 |> map(Optional.init)
                             } else {
-                                return context.peerChannelMemberCategoriesContextsManager.recentOnlineSmall(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
+                                return context.peerChannelMemberCategoriesContextsManager.recentOnlineSmall(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
                                 |> map(Optional.init)
                             }
                         } else {
@@ -2896,8 +3114,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         strongSelf.peerView = peerView
                         if wasGroupChannel != isGroupChannel {
                             if let isGroupChannel = isGroupChannel, isGroupChannel {
-                                let (recentDisposable, _) = strongSelf.context.peerChannelMemberCategoriesContextsManager.recent(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { _ in })
-                                let (adminsDisposable, _) = strongSelf.context.peerChannelMemberCategoriesContextsManager.admins(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { _ in })
+                                let (recentDisposable, _) = strongSelf.context.peerChannelMemberCategoriesContextsManager.recent(engine: strongSelf.context.engine, postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { _ in })
+                                let (adminsDisposable, _) = strongSelf.context.peerChannelMemberCategoriesContextsManager.admins(engine: strongSelf.context.engine, postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, accountPeerId: context.account.peerId, peerId: peerView.peerId, updated: { _ in })
                                 let disposable = DisposableSet()
                                 disposable.add(recentDisposable)
                                 disposable.add(adminsDisposable)
@@ -2974,6 +3192,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                         
                         var hasBots: Bool = false
+                        var hasBotCommands: Bool = false
                         var autoremoveTimeout: Int32?
                         if let peer = peerView.peers[peerView.peerId] {
                             if let cachedGroupData = peerView.cachedData as? CachedGroupData {
@@ -2996,6 +3215,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 if case let .known(value) = cachedUserData.autoremoveTimeout {
                                     autoremoveTimeout = value?.effectiveValue
                                 }
+                                if let botInfo = cachedUserData.botInfo, !botInfo.commands.isEmpty {
+                                    hasBotCommands = true
+                                }
                             }
                         }
                         
@@ -3071,7 +3293,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         strongSelf.updateChatPresentationInterfaceState(animated: animated, interactive: false, {
                             return $0.updatedPeer { _ in
                                 return renderedPeer
-                            }.updatedIsNotAccessible(isNotAccessible).updatedContactStatus(contactStatus).updatedHasBots(hasBots).updatedIsArchived(isArchived).updatedPeerIsMuted(peerIsMuted).updatedPeerDiscussionId(peerDiscussionId).updatedPeerGeoLocation(peerGeoLocation).updatedExplicitelyCanPinMessages(explicitelyCanPinMessages).updatedHasScheduledMessages(hasScheduledMessages)
+                            }.updatedIsNotAccessible(isNotAccessible).updatedContactStatus(contactStatus).updatedHasBots(hasBots).updatedHasBotCommands(hasBotCommands).updatedIsArchived(isArchived).updatedPeerIsMuted(peerIsMuted).updatedPeerDiscussionId(peerDiscussionId).updatedPeerGeoLocation(peerGeoLocation).updatedExplicitelyCanPinMessages(explicitelyCanPinMessages).updatedHasScheduledMessages(hasScheduledMessages)
                                 .updatedAutoremoveTimeout(autoremoveTimeout)
                         })
                         if !strongSelf.didSetChatLocationInfoReady {
@@ -3709,13 +3931,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 var isScrolled: Bool
             }
             
-            let messageRangeEdge: Signal<Bool, NoError> = self.context.sharedContext.accountManager.sharedData(keys: Set([ApplicationSpecificSharedDataKeys.experimentalUISettings]))
-            |> map { sharedData -> Bool in
-                let experimentalSettings: ExperimentalUISettings = (sharedData.entries[ApplicationSpecificSharedDataKeys.experimentalUISettings] as? ExperimentalUISettings) ?? ExperimentalUISettings.defaultSettings
-                return experimentalSettings.snapPinListToTop
-            }
-            |> distinctUntilChanged
-            
             let referenceMessage: Signal<ReferenceMessage?, NoError>
             if latest {
                 referenceMessage = .single(nil)
@@ -3723,16 +3938,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 referenceMessage = combineLatest(
                     queue: Queue.mainQueue(),
                     self.scrolledToMessageId.get(),
-                    self.chatDisplayNode.historyNode.topVisibleMessageRange.get(),
-                    messageRangeEdge
+                    self.chatDisplayNode.historyNode.topVisibleMessageRange.get()
                 )
-                |> map { scrolledToMessageId, topVisibleMessageRange, messageRangeEdge -> ReferenceMessage? in
+                |> map { scrolledToMessageId, topVisibleMessageRange -> ReferenceMessage? in
                     let topVisibleMessage: MessageId?
-                    if messageRangeEdge {
-                        topVisibleMessage = topVisibleMessageRange?.lowerBound
-                    } else {
-                        topVisibleMessage = topVisibleMessageRange?.upperBound
-                    }
+                    topVisibleMessage = topVisibleMessageRange?.upperBound
                     
                     if let scrolledToMessageId = scrolledToMessageId {
                         if let topVisibleMessage = topVisibleMessage {
@@ -3986,27 +4196,18 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     }
     
     override public func loadDisplayNode() {
-        self.displayNode = ChatControllerNode(context: self.context, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, subject: self.subject, controllerInteraction: self.controllerInteraction!, chatPresentationInterfaceState: self.presentationInterfaceState, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, navigationBar: self.navigationBar, controller: self)
+        self.displayNode = ChatControllerNode(context: self.context, chatLocation: self.chatLocation, chatLocationContextHolder: self.chatLocationContextHolder, subject: self.subject, controllerInteraction: self.controllerInteraction!, chatPresentationInterfaceState: self.presentationInterfaceState, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings, navigationBar: self.navigationBar, backgroundNode: self.chatBackgroundNode, controller: self)
+        
+        if let currentItem = self.tempVoicePlaylistCurrentItem {
+            self.chatDisplayNode.historyNode.voicePlaylistItemChanged(nil, currentItem)
+        }
         
         self.chatDisplayNode.historyNode.didScrollWithOffset = { [weak self] offset, transition, itemNode in
             guard let strongSelf = self else {
                 return
             }
-            for (tooltipScreen, tooltipItemNode) in strongSelf.currentMessageTooltipScreens {
-                if let itemNode = itemNode {
-                    if itemNode === tooltipItemNode {
-                        tooltipScreen.addRelativeScrollingOffset(-offset, transition: transition)
-                    }
-                } else {
-                    tooltipScreen.addRelativeScrollingOffset(-offset, transition: transition)
-                }
-            }
-        }
-        
-        self.chatDisplayNode.historyNode.didScrollWithOffset = { [weak self] offset, _, _ in
-            guard let strongSelf = self else {
-                return
-            }
+
+            //print("didScrollWithOffset offset: \(offset), itemNode: \(String(describing: itemNode))")
             
             if offset > 0.0 {
                 if var scrolledToMessageIdValue = strongSelf.scrolledToMessageIdValue {
@@ -4016,6 +4217,25 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             } else if offset < 0.0 {
                 strongSelf.scrolledToMessageIdValue = nil
             }
+
+            if let currentPinchSourceItemNode = strongSelf.currentPinchSourceItemNode {
+                if let itemNode = itemNode {
+                    if itemNode === currentPinchSourceItemNode {
+                        strongSelf.currentPinchController?.addRelativeContentOffset(CGPoint(x: 0.0, y: -offset), transition: transition)
+                    }
+                } else {
+                    strongSelf.currentPinchController?.addRelativeContentOffset(CGPoint(x: 0.0, y: -offset), transition: transition)
+                }
+            }
+
+            strongSelf.chatDisplayNode.messageTransitionNode.addExternalOffset(offset: offset, transition: transition, itemNode: itemNode)
+        }
+
+        self.chatDisplayNode.historyNode.addContentOffset = { [weak self] offset, itemNode in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.chatDisplayNode.messageTransitionNode.addContentOffset(offset: offset, itemNode: itemNode)
         }
         
         if case .pinnedMessages = self.presentationInterfaceState.subject {
@@ -4322,9 +4542,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             //effectiveCachedDataReady = .single(true)
             effectiveCachedDataReady = self.cachedDataReady.get()
         }
-        self.ready.set(combineLatest(self.chatDisplayNode.historyNode.historyState.get(), self._chatLocationInfoReady.get(), effectiveCachedDataReady, initialData) |> map { _, chatLocationInfoReady, cachedDataReady, _ in
-            return chatLocationInfoReady && cachedDataReady
-        })
+        self.ready.set(combineLatest(queue: .mainQueue(),
+            self.chatDisplayNode.historyNode.historyState.get(),
+            self._chatLocationInfoReady.get(),
+            effectiveCachedDataReady,
+            initialData,
+            self.wallpaperReady.get()
+        )
+        |> map { _, chatLocationInfoReady, cachedDataReady, _, wallpaperReady in
+            return chatLocationInfoReady && cachedDataReady && wallpaperReady
+        }
+        |> distinctUntilChanged)
         
         if self.context.sharedContext.immediateExperimentalUISettings.crashOnLongQueries {
             let _ = (self.ready.get()
@@ -4365,9 +4593,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             strongSelf.chatDisplayNode.updatePlainInputSeparatorAlpha(plainInputSeparatorAlpha, transition: .animated(duration: 0.2, curve: .easeInOut))
         }
         
-        self.chatDisplayNode.historyNode.scrolledToIndex = { [weak self] toIndex in
+        self.chatDisplayNode.historyNode.scrolledToIndex = { [weak self] toIndex, initial in
             if let strongSelf = self, case let .message(index) = toIndex {
-                if let controllerInteraction = strongSelf.controllerInteraction {
+                if case let .message(messageId, _, _) = strongSelf.subject, initial, messageId != index.id {
+                    strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .info(text: strongSelf.presentationData.strings.Conversation_MessageDoesntExist), elevatedLayout: false, action: { _ in return true }), in: .current)
+                } else if let controllerInteraction = strongSelf.controllerInteraction {
                     if let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(index.id) {
                         let highlightedState = ChatInterfaceHighlightedState(messageStableId: message.stableId)
                         controllerInteraction.highlightedState = highlightedState
@@ -4382,6 +4612,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                             }
                         }))
+                        
+                        if case let .message(_, _, maybeTimecode) = strongSelf.subject, let timecode = maybeTimecode, initial {
+                            Queue.mainQueue().after(0.2) {
+                                let _ = strongSelf.controllerInteraction?.openMessage(message, .timecode(timecode))
+                            }
+                        }
                     }
                 }
             }
@@ -4404,8 +4640,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             self?.requestLayout(transition: transition)
         }
         
-        self.chatDisplayNode.setupSendActionOnViewUpdate = { [weak self] f in
-            self?.chatDisplayNode.historyNode.layoutActionOnViewTransition = { [weak self] transition in
+        self.chatDisplayNode.setupSendActionOnViewUpdate = { [weak self] f, messageCorrelationId in
+            //print("setup layoutActionOnViewTransition")
+
+            self?.chatDisplayNode.historyNode.layoutActionOnViewTransition = ({ [weak self] transition in
                 f()
                 if let strongSelf = self, let validLayout = strongSelf.validLayout {
                     var mappedTransition: (ChatHistoryListViewTransition, ListViewUpdateSizeAndInsets?)?
@@ -4416,7 +4654,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     } else {
                         isScheduledMessages = false
                     }
-                    strongSelf.chatDisplayNode.containerLayoutUpdated(validLayout, navigationBarHeight: strongSelf.navigationHeight, transition: .animated(duration: 0.2, curve: .easeInOut), listViewTransaction: { updateSizeAndInsets, _, _, _ in
+                    let duration: Double = strongSelf.chatDisplayNode.messageTransitionNode.hasScheduledTransitions ? ChatMessageTransitionNode.animationDuration : 0.18
+                    let curve: ContainedViewLayoutTransitionCurve = strongSelf.chatDisplayNode.messageTransitionNode.hasScheduledTransitions ? ChatMessageTransitionNode.verticalAnimationCurve : .easeInOut
+                    let controlPoints: (Float, Float, Float, Float) = strongSelf.chatDisplayNode.messageTransitionNode.hasScheduledTransitions ? ChatMessageTransitionNode.verticalAnimationControlPoints : (0.5, 0.33, 0.0, 0.0)
+                    
+                    strongSelf.chatDisplayNode.containerLayoutUpdated(validLayout, navigationBarHeight: strongSelf.navigationLayout(layout: validLayout).navigationFrame.maxY, transition: .animated(duration: duration, curve: curve), listViewTransaction: { updateSizeAndInsets, _, _, _ in
                         var options = transition.options
                         let _ = options.insert(.Synchronous)
                         let _ = options.insert(.LowLatency)
@@ -4442,9 +4684,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         
                         var scrollToItem: ListViewScrollToItem?
                         if isScheduledMessages, let insertedIndex = insertedIndex {
-                            scrollToItem = ListViewScrollToItem(index: insertedIndex, position: .visible, animated: true, curve: .Default(duration: 0.2), directionHint: .Down)
+                            scrollToItem = ListViewScrollToItem(index: insertedIndex, position: .visible, animated: true, curve: .Custom(duration: duration, controlPoints.0, controlPoints.1, controlPoints.2, controlPoints.3), directionHint: .Down)
                         } else if transition.historyView.originalView.laterId == nil {
-                            scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: 0.2), directionHint: .Up)
+                            scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Custom(duration: duration, controlPoints.0, controlPoints.1, controlPoints.2, controlPoints.3), directionHint: .Up)
                         }
                         
                         var stationaryItemRange: (Int, Int)?
@@ -4453,6 +4695,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                         
                         mappedTransition = (ChatHistoryListViewTransition(historyView: transition.historyView, deleteItems: deleteItems, insertItems: insertItems, updateItems: transition.updateItems, options: options, scrollToItem: scrollToItem, stationaryItemRange: stationaryItemRange, initialData: transition.initialData, keyboardButtonsMessage: transition.keyboardButtonsMessage, cachedData: transition.cachedData, cachedDataMessages: transition.cachedDataMessages, readStateData: transition.readStateData, scrolledToIndex: transition.scrolledToIndex, scrolledToSomeIndex: transition.scrolledToSomeIndex, peerType: transition.peerType, networkType: transition.networkType, animateIn: false, reason: transition.reason, flashIndicators: transition.flashIndicators), updateSizeAndInsets)
+                    }, updateExtraNavigationBarBackgroundHeight: { value in
+                        strongSelf.additionalNavigationBarBackgroundHeight = value
                     })
                     
                     if let mappedTransition = mappedTransition {
@@ -4460,11 +4704,23 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                 }
                 return (transition, nil)
-            }
+            }, messageCorrelationId)
         }
         
         self.chatDisplayNode.sendMessages = { [weak self] messages, silentPosting, scheduleTime, isAnyMessageTextPartitioned in
             if let strongSelf = self {
+                var correlationIds: [Int64] = []
+                for message in messages {
+                    switch message {
+                    case let .message(_, _, _, _, _, correlationId):
+                        if let correlationId = correlationId {
+                            correlationIds.append(correlationId)
+                        }
+                    default:
+                        break
+                    }
+                }
+                //print("sendMessages \(correlationIds)")
                 let peerId = strongSelf.chatLocation.peerId
                 strongSelf.commitPurposefulAction()
                 
@@ -4502,12 +4758,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 var forwardedMessages: [[EnqueueMessage]] = []
                 var forwardSourcePeerIds = Set<PeerId>()
                 for message in transformedMessages {
-                    if case let .forward(source, _, _) = message {
+                    if case let .forward(source, _, _, _) = message {
                         forwardSourcePeerIds.insert(source.peerId)
                         
                         var added = false
                         if var last = forwardedMessages.last {
-                            if let currentMessage = last.first, case let .forward(currentSource, _, _) = currentMessage, currentSource.peerId == source.peerId {
+                            if let currentMessage = last.first, case let .forward(currentSource, _, _, _) = currentMessage, currentSource.peerId == source.peerId {
                                 last.append(message)
                                 added = true
                             }
@@ -4547,11 +4803,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 })
                 
                 donateSendMessageIntent(account: strongSelf.context.account, sharedContext: strongSelf.context.sharedContext, intentContext: .chat, peerIds: [peerId])
+                
+                strongSelf.updateChatPresentationInterfaceState(interactive: true, { $0.updatedShowCommands(false) })
             }
         }
         
-        self.chatDisplayNode.requestUpdateChatInterfaceState = { [weak self] animated, saveInterfaceState, f in
-            self?.updateChatPresentationInterfaceState(animated: animated, interactive: true, saveInterfaceState: saveInterfaceState, { $0.updatedInterfaceState(f) })
+        self.chatDisplayNode.requestUpdateChatInterfaceState = { [weak self] transition, saveInterfaceState, f in
+            self?.updateChatPresentationInterfaceState(transition: transition, interactive: true, saveInterfaceState: saveInterfaceState, { $0.updatedInterfaceState(f) })
         }
         
         self.chatDisplayNode.requestUpdateInterfaceState = { [weak self] transition, interactive, f in
@@ -4644,7 +4902,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         self.chatDisplayNode.navigateButtons.downPressed = { [weak self] in
             if let strongSelf = self, strongSelf.isNodeLoaded {
                 if let messageId = strongSelf.historyNavigationStack.removeLast() {
-                    strongSelf.navigateToMessage(from: nil, to: .id(messageId.id), rememberInStack: false)
+                    strongSelf.navigateToMessage(from: nil, to: .id(messageId.id, nil), rememberInStack: false)
                 } else {
                     if case .known = strongSelf.chatDisplayNode.historyNode.visibleContentOffset() {
                         strongSelf.chatDisplayNode.historyNode.scrollToEndOfHistory()
@@ -4661,13 +4919,13 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         self.chatDisplayNode.navigateButtons.mentionsPressed = { [weak self] in
             if let strongSelf = self, strongSelf.isNodeLoaded, case let .peer(peerId) = strongSelf.chatLocation {
-                let signal = earliestUnseenPersonalMentionMessage(account: strongSelf.context.account, peerId: peerId)
+                let signal = strongSelf.context.engine.messages.earliestUnseenPersonalMentionMessage(peerId: peerId)
                 strongSelf.navigationActionDisposable.set((signal |> deliverOnMainQueue).start(next: { result in
                     if let strongSelf = self {
                         switch result {
                             case let .result(messageId):
                                 if let messageId = messageId {
-                                    strongSelf.navigateToMessage(from: nil, to: .id(messageId))
+                                    strongSelf.navigateToMessage(from: nil, to: .id(messageId, nil))
                                 }
                             case .loading:
                                 break
@@ -4700,20 +4958,27 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
         
         let interfaceInteraction = ChatPanelInterfaceInteraction(setupReplyMessage: { [weak self] messageId, completion in
-            if let strongSelf = self, strongSelf.isNodeLoaded, canSendMessagesToChat(strongSelf.presentationInterfaceState) {
-                let _ = strongSelf.presentVoiceMessageDiscardAlert(action: {
-                    if let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(messageId) {
-                        strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState({ $0.withUpdatedReplyMessageId(message.id) }).updatedSearch(nil) }, completion: completion)
-                        strongSelf.updateItemNodesSearchTextHighlightStates()
-                        strongSelf.chatDisplayNode.ensureInputViewFocused()
-                    } else {
+            guard let strongSelf = self, strongSelf.isNodeLoaded else {
+                return
+            }
+            if let messageId = messageId {
+                if canSendMessagesToChat(strongSelf.presentationInterfaceState) {
+                    let _ = strongSelf.presentVoiceMessageDiscardAlert(action: {
+                        if let message = strongSelf.chatDisplayNode.historyNode.messageInCurrentHistoryView(messageId) {
+                            strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState({ $0.withUpdatedReplyMessageId(message.id) }).updatedSearch(nil).updatedShowCommands(false) }, completion: completion)
+                            strongSelf.updateItemNodesSearchTextHighlightStates()
+                            strongSelf.chatDisplayNode.ensureInputViewFocused()
+                        } else {
+                            completion(.immediate)
+                        }
+                    }, alertAction: {
                         completion(.immediate)
-                    }
-                }, alertAction: {
+                    }, delay: true)
+                } else {
                     completion(.immediate)
-                }, delay: true)
+                }
             } else {
-                completion(.immediate)
+                strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState({ $0.withUpdatedReplyMessageId(nil) }) }, completion: completion)
             }
         }, setupEditMessage: { [weak self] messageId, completion in
             if let strongSelf = self, strongSelf.isNodeLoaded {
@@ -4761,6 +5026,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             updated = updated.updatedInputMode({ _ in
                                 return .text
                             })
+                            updated = updated.updatedShowCommands(false)
                             
                             return updated
                         }, completion: completion)
@@ -4772,7 +5038,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }, beginMessageSelection: { [weak self] messageIds, completion in
             if let strongSelf = self, strongSelf.isNodeLoaded {
                 let _ = strongSelf.presentVoiceMessageDiscardAlert(action: {
-                    strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withUpdatedSelectedMessages(messageIds) } }, completion: completion)
+                    strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withUpdatedSelectedMessages(messageIds) }.updatedShowCommands(false) }, completion: completion)
                     
                     if let selectionState = strongSelf.presentationInterfaceState.interfaceState.selectionState {
                         let count = selectionState.selectedIds.count
@@ -4822,7 +5088,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     items.append(ActionSheetButtonItem(title: presentationData.strings.Report_Report, color: .accent, font: .bold, enabled: true, action: {
                         dismissAction()
                         strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } }, completion: { _ in
-                            let _ = (reportPeerMessages(account: strongSelf.context.account, messageIds: Array(messageIds), reason: reportReason, message: message)
+                            let _ = (strongSelf.context.engine.peers.reportPeerMessages(messageIds: Array(messageIds), reason: reportReason, message: message)
                             |> deliverOnMainQueue).start(completed: { [weak self] in
                                 if let strongSelf = self, let path = getAppBundle().path(forResource: "PoliceCar", ofType: "tgs") {
                                     strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .emoji(path: path, text: presentationData.strings.Report_Succeed), elevatedLayout: false, action: { _ in return false }), in: .current)
@@ -4887,12 +5153,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         guard let strongSelf = self else {
                             return
                         }
-                        let _ = requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start()
-                        let account = strongSelf.context.account
-                        let _ = (strongSelf.context.account.postbox.transaction { transasction -> Void in
-                            deleteAllMessagesWithForwardAuthor(transaction: transasction, mediaBox: account.postbox.mediaBox, peerId: message.id.peerId, forwardAuthorId: peer.id, namespace: Namespaces.Message.Cloud)
+                        let _ = strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.id, isBlocked: true).start()
+                        let context = strongSelf.context
+                        let _ = (context.account.postbox.transaction { transasction -> Void in
+                            context.engine.messages.deleteAllMessagesWithForwardAuthor(transaction: transasction, peerId: message.id.peerId, forwardAuthorId: peer.id, namespace: Namespaces.Message.Cloud)
                         }).start()
-                        let _ = reportRepliesMessage(account: strongSelf.context.account, messageId: message.id, deleteMessage: true, deleteHistory: true, reportSpam: reportSpam).start()
+                        let _ = strongSelf.context.engine.peers.reportRepliesMessage(messageId: message.id, deleteMessage: true, deleteHistory: true, reportSpam: reportSpam).start()
                     })
                 ] as [ActionSheetItem])
                 
@@ -4921,10 +5187,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 }
                             }
                             if isAction && (actions.options == .deleteGlobally || actions.options == .deleteLocally) {
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: actions.options == .deleteLocally ? .forLocalPeer : .forEveryone).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: actions.options == .deleteLocally ? .forLocalPeer : .forEveryone).start()
                                 completion(.dismissWithoutContent)
                             } else if (messages.first?.flags.isSending ?? false) {
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone, deleteAllInGroup: true).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone, deleteAllInGroup: true).start()
                                 completion(.dismissWithoutContent)
                             } else {
                                 if actions.options.intersection([.deleteLocally, .deleteGlobally]).isEmpty {
@@ -5218,11 +5484,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         threadId = makeMessageThreadId(replyThreadMessage.messageId)
                     }
                     
-                    strongSelf.messageIndexDisposable.set((searchMessageIdByTimestamp(account: strongSelf.context.account, peerId: peerId, threadId: threadId, timestamp: timestamp) |> deliverOnMainQueue).start(next: { messageId in
+                    strongSelf.messageIndexDisposable.set((strongSelf.context.engine.messages.searchMessageIdByTimestamp(peerId: peerId, threadId: threadId, timestamp: timestamp) |> deliverOnMainQueue).start(next: { messageId in
                         if let strongSelf = self {
                             strongSelf.loadingMessage.set(.single(nil))
                             if let messageId = messageId {
-                                strongSelf.navigateToMessage(from: nil, to: .id(messageId), forceInCurrentChat: true)
+                                strongSelf.navigateToMessage(from: nil, to: .id(messageId, nil), forceInCurrentChat: true)
                             }
                         }
                     }))
@@ -5250,7 +5516,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 strongSelf.updateItemNodesSearchTextHighlightStates()
             }
         }, navigateToMessage: { [weak self] messageId, dropStack, forceInCurrentChat, statusSubject in
-            self?.navigateToMessage(from: nil, to: .id(messageId), forceInCurrentChat: forceInCurrentChat, dropStack: dropStack, statusSubject: statusSubject)
+            self?.navigateToMessage(from: nil, to: .id(messageId, nil), forceInCurrentChat: forceInCurrentChat, dropStack: dropStack, statusSubject: statusSubject)
         }, navigateToChat: { [weak self] peerId in
             guard let strongSelf = self else {
                 return
@@ -5268,7 +5534,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }, togglePeerNotifications: { [weak self] in
             if let strongSelf = self {
                 let peerId = strongSelf.chatLocation.peerId
-                let _ = togglePeerMuted(account: strongSelf.context.account, peerId: peerId).start()
+                let _ = strongSelf.context.engine.peers.togglePeerMuted(peerId: peerId).start()
             }
         }, sendContextResult: { [weak self] results, result, node, rect in
             guard let strongSelf = self else {
@@ -5301,13 +5567,16 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil).withUpdatedComposeInputState(ChatTextInputState(inputText: NSAttributedString(string: ""))).withUpdatedComposeDisableUrlPreview(nil) }
                             })
                         }
-                    })
+                    }, nil)
                     var attributes: [MessageAttribute] = []
                     let entities = generateTextEntities(messageText, enabledTypes: .all)
                     if !entities.isEmpty {
                         attributes.append(TextEntitiesMessageAttribute(entities: entities))
                     }
-                    strongSelf.sendMessages([.message(text: messageText, attributes: attributes, mediaReference: nil, replyToMessageId: replyMessageId, localGroupingKey: nil)])
+                    strongSelf.sendMessages([.message(text: messageText, attributes: attributes, mediaReference: nil, replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)])
+                    strongSelf.interfaceInteraction?.updateShowCommands { _ in
+                        return false
+                    }
                 }
             }
         }, sendBotStart: { [weak self] payload in
@@ -5517,7 +5786,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 return
             }
             
-            if let location = location, location.y < strongSelf.navigationHeight {
+            if let location = location, location.y < strongSelf.navigationLayout(layout: layout).navigationFrame.maxY {
                 return
             }
             
@@ -5589,7 +5858,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 if let peer = peer as? TelegramSecretChat {
                     let controller = ChatSecretAutoremoveTimerActionSheetController(context: strongSelf.context, currentValue: peer.messageAutoremoveTimeout == nil ? 0 : peer.messageAutoremoveTimeout!, applyValue: { value in
                         if let strongSelf = self {
-                            let _ = setSecretChatMessageAutoremoveTimeoutInteractively(account: strongSelf.context.account, peerId: peer.id, timeout: value == 0 ? nil : value).start()
+                            let _ = strongSelf.context.engine.peers.setChatMessageAutoremoveTimeoutInteractively(peerId: peer.id, timeout: value == 0 ? nil : value).start()
                         }
                     })
                     strongSelf.present(controller, in: .window(.root))
@@ -5647,9 +5916,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                 }
             }
-        }, sendSticker: { [weak self] file, sourceNode, sourceRect in
+        }, sendSticker: { [weak self] file, clearInput, sourceNode, sourceRect in
             if let strongSelf = self, canSendMessagesToChat(strongSelf.presentationInterfaceState) {
-                return strongSelf.controllerInteraction?.sendSticker(file, nil, true, sourceNode, sourceRect) ?? false
+                return strongSelf.controllerInteraction?.sendSticker(file, false, false, nil, clearInput, sourceNode, sourceRect) ?? false
             } else {
                 return false
             }
@@ -5668,7 +5937,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     disposable = MetaDisposable()
                                     strongSelf.unpinMessageDisposable = disposable
                                 }
-                                disposable.set(requestUpdatePinnedMessage(account: strongSelf.context.account, peerId: currentPeerId, update: .pin(id: messageId, silent: !notify, forThisPeerOnlyIfPossible: forThisPeerOnlyIfPossible)).start(completed: {
+                                disposable.set(strongSelf.context.engine.messages.requestUpdatePinnedMessage(peerId: currentPeerId, update: .pin(id: messageId, silent: !notify, forThisPeerOnlyIfPossible: forThisPeerOnlyIfPossible)).start(completed: {
                                     guard let strongSelf = self else {
                                         return
                                     }
@@ -5837,7 +6106,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                         action: { action in
                                             switch action {
                                             case .commit:
-                                                disposable.set((requestUpdatePinnedMessage(account: strongSelf.context.account, peerId: peer.id, update: .clear(id: id))
+                                                disposable.set((strongSelf.context.engine.messages.requestUpdatePinnedMessage(peerId: peer.id, update: .clear(id: id))
                                                 |> deliverOnMainQueue).start(error: { _ in
                                                     guard let strongSelf = self else {
                                                         return
@@ -5887,7 +6156,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                                 }
                                                 switch action {
                                                 case .commit:
-                                                    let _ = (requestUpdatePinnedMessage(account: strongSelf.context.account, peerId: peer.id, update: .clear(id: id))
+                                                    let _ = (strongSelf.context.engine.messages.requestUpdatePinnedMessage(peerId: peer.id, update: .clear(id: id))
                                                     |> deliverOnMainQueue).start(completed: {
                                                         Queue.mainQueue().after(1.0, {
                                                             guard let strongSelf = self else {
@@ -5907,7 +6176,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                         in: .current
                                     )
                                 } else {
-                                    disposable.set((requestUpdatePinnedMessage(account: strongSelf.context.account, peerId: peer.id, update: .clear(id: id))
+                                    disposable.set((strongSelf.context.engine.messages.requestUpdatePinnedMessage(peerId: peer.id, update: .clear(id: id))
                                     |> deliverOnMainQueue).start())
                                 }
                             }
@@ -6048,7 +6317,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     |> switchToLatest
                     |> deliverOnMainQueue).start(next: { [weak self] added in
                         if let strongSelf = self {
-                            strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(account: strongSelf.context.account, file: stickerFile, text: added ? strongSelf.presentationData.strings.Conversation_StickerAddedToFavorites : strongSelf.presentationData.strings.Conversation_StickerRemovedFromFavorites), elevatedLayout: false, action: { _ in return false }), in: .current)
+                            strongSelf.present(UndoOverlayController(presentationData: strongSelf.presentationData, content: .sticker(context: strongSelf.context, file: stickerFile, text: added ? strongSelf.presentationData.strings.Conversation_StickerAddedToFavorites : strongSelf.presentationData.strings.Conversation_StickerRemovedFromFavorites), elevatedLayout: false, action: { _ in return false }), in: .current)
                         }
                     })
                 }
@@ -6126,7 +6395,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
             let controller = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
             strongSelf.present(controller, in: .window(.root))
-            let signal = requestMessageSelectPollOption(account: strongSelf.context.account, messageId: id, opaqueIdentifiers: [])
+            let signal = strongSelf.context.engine.messages.requestMessageSelectPollOption(messageId: id, opaqueIdentifiers: [])
             |> afterDisposed { [weak controller] in
                 Queue.mainQueue().async {
                     controller?.dismiss()
@@ -6188,7 +6457,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                     let controller = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: nil))
                     strongSelf.present(controller, in: .window(.root))
-                    let signal = requestClosePoll(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, stateManager: strongSelf.context.account.stateManager, messageId: id)
+                    let signal = strongSelf.context.engine.messages.requestClosePoll(messageId: id)
                     |> afterDisposed { [weak controller] in
                         Queue.mainQueue().async {
                             controller?.dismiss()
@@ -6285,7 +6554,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 guard let strongSelf = self else {
                     return
                 }
-                strongSelf.reportIrrelvantGeoDisposable = (TelegramCore.reportPeer(account: strongSelf.context.account, peerId: peerId, reason: .irrelevantLocation, message: "")
+                strongSelf.reportIrrelvantGeoDisposable = (strongSelf.context.engine.peers.reportPeer(peerId: peerId, reason: .irrelevantLocation, message: "")
                 |> deliverOnMainQueue).start(completed: { [weak self] in
                     if let strongSelf = self {
                         strongSelf.reportIrrelvantGeoNoticePromise.set(.single(true))
@@ -6335,7 +6604,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 
                 let _ = ApplicationSpecificNotice.incrementChatMessageOptionsTip(accountManager: strongSelf.context.sharedContext.accountManager, count: 4).start()
                 
-                let controller = ChatSendMessageActionSheetController(context: strongSelf.context, controllerInteraction: strongSelf.controllerInteraction, interfaceState: strongSelf.presentationInterfaceState, gesture: gesture, sendButtonFrame: node.view.convert(node.bounds, to: nil), textInputNode: textInputNode, completion: { [weak self] in
+                let controller = ChatSendMessageActionSheetController(context: strongSelf.context, controllerInteraction: strongSelf.controllerInteraction, interfaceState: strongSelf.presentationInterfaceState, gesture: gesture, sourceSendButton: node, textInputNode: textInputNode, completion: { [weak self] in
                     if let strongSelf = self {
                         strongSelf.supportedOrientations = previousSupportedOrientations
                     }
@@ -6395,7 +6664,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
             
             if let navigationController = strongSelf.effectiveNavigationController {
-                let subject: ChatControllerSubject? = sourceMessageId.flatMap { ChatControllerSubject.message(id: $0, highlight: true) }
+                let subject: ChatControllerSubject? = sourceMessageId.flatMap { ChatControllerSubject.message(id: $0, highlight: true, timecode: nil) }
                 strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .replyThread(replyThreadResult), subject: subject, keepStack: .always))
             }
         }, activatePinnedListPreview: { [weak self] node, gesture in
@@ -6471,6 +6740,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             if let strongSelf = self {
                 strongSelf.controllerInteraction?.editMessageMedia(messageId, draw)
             }
+        }, updateShowCommands: { [weak self] f in
+            if let strongSelf = self {
+                strongSelf.updateChatPresentationInterfaceState(interactive: true, {
+                    return $0.updatedShowCommands(f($0.showCommands))
+                })
+            }
         }, statuses: ChatPanelInterfaceInteractionStatuses(editingMessage: self.editingMessage.get(), startingBot: self.startingBot.get(), unblockingPeer: self.unblockingPeer.get(), searching: self.searching.get(), loadingMessage: self.loadingMessage.get(), inlineSearch: self.performingInlineSearch.get()))
         
         do {
@@ -6631,45 +6906,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }))
         }
         
-        self.chatDisplayNode.updateHasEmbeddedTitleContent = { [weak self] in
-            guard let strongSelf = self else {
-                return
-            }
-            
-            let hasEmbeddedTitleContent = strongSelf.chatDisplayNode.hasEmbeddedTitleContent
-            let isEmbeddedTitleContentHidden = strongSelf.chatDisplayNode.isEmbeddedTitleContentHidden
-            
-            if strongSelf.hasEmbeddedTitleContent != hasEmbeddedTitleContent {
-                strongSelf.hasEmbeddedTitleContent = hasEmbeddedTitleContent
-                
-                if strongSelf.hasEmbeddedTitleContent {
-                    strongSelf.statusBar.statusBarStyle = .White
-                } else {
-                    strongSelf.statusBar.statusBarStyle = strongSelf.presentationData.theme.rootController.statusBarStyle.style
-                }
-                
-                if let navigationBar = strongSelf.navigationBar {
-                    if let navigationBarCopy = navigationBar.view.snapshotContentTree() {
-                        navigationBar.view.superview?.insertSubview(navigationBarCopy, aboveSubview: navigationBar.view)
-                        navigationBarCopy.alpha = 0.0
-                        navigationBarCopy.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.25, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak navigationBarCopy] _ in
-                            navigationBarCopy?.removeFromSuperview()
-                        })
-                    }
-                }
-                strongSelf.updateNavigationBarPresentation()
-            }
-            
-            if strongSelf.isEmbeddedTitleContentHidden != isEmbeddedTitleContentHidden {
-                strongSelf.isEmbeddedTitleContentHidden = isEmbeddedTitleContentHidden
-                
-                if let navigationBar = strongSelf.navigationBar {
-                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .easeInOut)
-                    transition.updateAlpha(node: navigationBar, alpha: isEmbeddedTitleContentHidden ? 0.0 : 1.0)
-                }
-            }
-        }
-        
         self.interfaceInteraction = interfaceInteraction
         
         if let search = self.focusOnSearchAfterAppearance {
@@ -6773,6 +7009,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     }
     
     override public func viewWillAppear(_ animated: Bool) {
+        #if DEBUG
+        if #available(iOSApplicationExtension 12.0, iOS 12.0, *) {
+            os_signpost(
+                .begin,
+                log: SignpostData.impl.signpostLog,
+                name: "Appear",
+                signpostID: SignpostData.impl.signpostId
+            )
+        }
+        #endif
+
         super.viewWillAppear(animated)
         
         if self.willAppear {
@@ -6795,7 +7042,20 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
     }
     
+    private var returnInputViewFocus = false
+    
     override public func viewDidAppear(_ animated: Bool) {
+        #if DEBUG
+        if #available(iOSApplicationExtension 12.0, iOS 12.0, *) {
+            os_signpost(
+                .end,
+                log: SignpostData.impl.signpostLog,
+                name: "Appear",
+                signpostID: SignpostData.impl.signpostId
+            )
+        }
+        #endif
+
         super.viewDidAppear(animated)
         
         self.didAppear = true
@@ -6808,7 +7068,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         self.chatDisplayNode.loadInputPanels(theme: self.presentationInterfaceState.theme, strings: self.presentationInterfaceState.strings, fontSize: self.presentationInterfaceState.fontSize)
         
-        self.recentlyUsedInlineBotsDisposable = (recentlyUsedInlineBots(postbox: self.context.account.postbox) |> deliverOnMainQueue).start(next: { [weak self] peers in
+        self.recentlyUsedInlineBotsDisposable = (self.context.engine.peers.recentlyUsedInlineBots() |> deliverOnMainQueue).start(next: { [weak self] peers in
             self?.recentlyUsedInlineBotsValue = peers.filter({ $0.1 >= 0.14 }).map({ $0.0 })
         })
         
@@ -6862,16 +7122,26 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     strongSelf.voicePlaylistDidEndTimestamp = CACurrentMediaTime()
                     raiseToListen.activateBasedOnProximity(delay: 0.0)
                 }
+                
+                if strongSelf.returnInputViewFocus {
+                    strongSelf.returnInputViewFocus = false
+                    strongSelf.chatDisplayNode.ensureInputViewFocused()
+                }
             }
             self.tempVoicePlaylistItemChanged = { [weak self] previousItem, currentItem in
                 guard let strongSelf = self, case let .peer(peerId) = strongSelf.chatLocation else {
                     return
                 }
-                if let currentItem = currentItem?.id as? PeerMessagesMediaPlaylistItemId, let previousItem = previousItem?.id as? PeerMessagesMediaPlaylistItemId, previousItem.messageId.peerId == peerId, currentItem.messageId.peerId == peerId, currentItem.messageId != previousItem.messageId {
-                    if strongSelf.chatDisplayNode.historyNode.isMessageVisibleOnScreen(currentItem.messageId) {
-                        strongSelf.navigateToMessage(from: nil, to: .id(currentItem.messageId), scrollPosition: .center(.bottom), rememberInStack: false, animated: true, completion: nil)
-                    }
-                }
+                
+                strongSelf.chatDisplayNode.historyNode.voicePlaylistItemChanged(previousItem, currentItem)
+//                if let currentItem = currentItem?.id as? PeerMessagesMediaPlaylistItemId {
+//                    self.controllerInteraction?.currentlyPlayingMessageId = currentItem.messageId
+//                    if let previousItem = previousItem?.id as? PeerMessagesMediaPlaylistItemId, previousItem.messageId.peerId == peerId, currentItem.messageId.peerId == peerId, currentItem.messageId != previousItem.messageId {
+//                        if strongSelf.chatDisplayNode.historyNode.isMessageVisibleOnScreen(currentItem.messageId) {
+//                            strongSelf.navigateToMessage(from: nil, to: .id(currentItem.messageId, nil), scrollPosition: .center(.bottom), rememberInStack: false, animated: true, completion: nil)
+//                        }
+//                    }
+//                }
             }
         }
         
@@ -6896,7 +7166,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             if case let .peer(peerId) = self.chatLocation, peerId.namespace == Namespaces.Peer.SecretChat, self.screenCaptureManager == nil {
                 self.screenCaptureManager = ScreenCaptureDetectionManager(check: { [weak self] in
                     if let strongSelf = self, strongSelf.canReadHistoryValue, strongSelf.traceVisibility() {
-                        let _ = addSecretChatMessageScreenshot(account: strongSelf.context.account, peerId: peerId).start()
+                        let _ = strongSelf.context.engine.messages.addSecretChatMessageScreenshot(peerId: peerId).start()
                         return true
                     } else {
                         return false
@@ -6905,7 +7175,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
             
             if case let .peer(peerId) = self.chatLocation {
-                let _ = checkPeerChatServiceActions(postbox: self.context.account.postbox, peerId: peerId).start()
+                let _ = self.context.engine.peers.checkPeerChatServiceActions(peerId: peerId).start()
             }
             
             if self.chatDisplayNode.frameForInputActionButton() != nil {
@@ -7032,7 +7302,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 return
                             }
                             strongSelf.peekTimerDisposable.set(
-                                (joinChatInteractively(with: peekData.linkData, account: strongSelf.context.account)
+                                (strongSelf.context.engine.peers.joinChatInteractively(with: peekData.linkData)
                                 |> deliverOnMainQueue).start(next: { peerId in
                                     guard let strongSelf = self else {
                                         return
@@ -7061,7 +7331,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }))
         }
         
-        self.checksTooltipDisposable.set((getServerProvidedSuggestions(postbox: self.context.account.postbox)
+        self.checksTooltipDisposable.set((getServerProvidedSuggestions(account: self.context.account)
         |> deliverOnMainQueue).start(next: { [weak self] values in
             guard let strongSelf = self else {
                 return
@@ -7233,8 +7503,21 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         return canManagePin
     }
+
+    private var suspendNavigationBarLayout: Bool = false
+    private var suspendedNavigationBarLayout: ContainerViewLayout?
+    private var additionalNavigationBarBackgroundHeight: CGFloat = 0.0
+
+    override public func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        if self.suspendNavigationBarLayout {
+            self.suspendedNavigationBarLayout = layout
+            return
+        }
+        self.applyNavigationBarLayout(layout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+    }
     
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.suspendNavigationBarLayout = true
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.validLayout = layout
@@ -7252,25 +7535,30 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             }
         }
         
-        self.chatDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition, listViewTransaction: { updateSizeAndInsets, additionalScrollDistance, scrollToTop, completion in
+        self.chatDisplayNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition, listViewTransaction: { updateSizeAndInsets, additionalScrollDistance, scrollToTop, completion in
             self.chatDisplayNode.historyNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets, additionalScrollDistance: additionalScrollDistance, scrollToTop: scrollToTop, completion: completion)
+        }, updateExtraNavigationBarBackgroundHeight: { value in
+            self.additionalNavigationBarBackgroundHeight = value
         })
-    }
-    
-    override public func updateToInterfaceOrientation(_ orientation: UIInterfaceOrientation) {
-        guard let layout = self.validLayout, case .compact = layout.metrics.widthClass else {
-            return
-        }
-        let hasOverlayNodes = self.context.sharedContext.mediaManager.overlayMediaManager.controller?.hasNodes ?? false
-        if self.validLayout != nil && orientation.isLandscape && !hasOverlayNodes && self.traceVisibility() && isTopmostChatController(self) {
-            var completed = false
-            self.chatDisplayNode.historyNode.forEachVisibleItemNode { itemNode in
-                if !completed, let itemNode = itemNode as? ChatMessageItemView, let message = itemNode.item?.message,  let (_, soundEnabled, _, _, _) = itemNode.playMediaWithSound(), soundEnabled {
-                    let _ = self.controllerInteraction?.openMessage(message, .landscape)
-                    completed = true
+        
+        if case .compact = layout.metrics.widthClass {
+            let hasOverlayNodes = self.context.sharedContext.mediaManager.overlayMediaManager.controller?.hasNodes ?? false
+            if self.validLayout != nil && layout.size.width > layout.size.height && !hasOverlayNodes && self.traceVisibility() && isTopmostChatController(self) {
+                var completed = false
+                self.chatDisplayNode.historyNode.forEachVisibleItemNode { itemNode in
+                    if !completed, let itemNode = itemNode as? ChatMessageItemView, let message = itemNode.item?.message, let (_, soundEnabled, _, _, _) = itemNode.playMediaWithSound(), soundEnabled {
+                        let _ = self.controllerInteraction?.openMessage(message, .landscape)
+                        completed = true
+                    }
                 }
             }
         }
+
+        self.suspendNavigationBarLayout = false
+        if let suspendedNavigationBarLayout = self.suspendedNavigationBarLayout {
+            self.suspendedNavigationBarLayout = suspendedNavigationBarLayout
+            self.applyNavigationBarLayout(suspendedNavigationBarLayout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+        }
     }
     
     func updateChatPresentationInterfaceState(animated: Bool = true, interactive: Bool, saveInterfaceState: Bool = false, _ f: (ChatPresentationInterfaceState) -> ChatPresentationInterfaceState, completion: @escaping (ContainedViewLayoutTransition) -> Void = { _ in }) {
@@ -7281,9 +7569,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         var completion = externalCompletion
         var temporaryChatPresentationInterfaceState = f(self.presentationInterfaceState)
         
-        if self.presentationInterfaceState.keyboardButtonsMessage?.visibleButtonKeyboardMarkup != temporaryChatPresentationInterfaceState.keyboardButtonsMessage?.visibleButtonKeyboardMarkup {
+        if self.presentationInterfaceState.keyboardButtonsMessage?.visibleButtonKeyboardMarkup != temporaryChatPresentationInterfaceState.keyboardButtonsMessage?.visibleButtonKeyboardMarkup || self.presentationInterfaceState.keyboardButtonsMessage?.id != temporaryChatPresentationInterfaceState.keyboardButtonsMessage?.id {
             if let keyboardButtonsMessage = temporaryChatPresentationInterfaceState.keyboardButtonsMessage, let _ = keyboardButtonsMessage.visibleButtonKeyboardMarkup {
-                if self.presentationInterfaceState.interfaceState.editMessage == nil && self.presentationInterfaceState.interfaceState.composeInputState.inputText.length == 0 && keyboardButtonsMessage.id != temporaryChatPresentationInterfaceState.interfaceState.messageActionsState.closedButtonKeyboardMessageId && temporaryChatPresentationInterfaceState.botStartPayload == nil {
+                if self.presentationInterfaceState.interfaceState.editMessage == nil && self.presentationInterfaceState.interfaceState.composeInputState.inputText.length == 0 && keyboardButtonsMessage.id != temporaryChatPresentationInterfaceState.interfaceState.messageActionsState.closedButtonKeyboardMessageId && keyboardButtonsMessage.id != temporaryChatPresentationInterfaceState.interfaceState.messageActionsState.dismissedButtonKeyboardMessageId && temporaryChatPresentationInterfaceState.botStartPayload == nil {
                     temporaryChatPresentationInterfaceState = temporaryChatPresentationInterfaceState.updatedInputMode({ _ in
                         return .inputButtons
                     })
@@ -7661,6 +7949,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 itemNode.updateSelectionState(animated: animated)
             }
         }
+
+        self.chatDisplayNode.historyNode.forEachItemHeaderNode{ itemHeaderNode in
+            if let avatarNode = itemHeaderNode as? ChatMessageAvatarHeaderNode {
+                avatarNode.updateSelectionState(animated: animated)
+            }
+        }
     }
     
     private func updatePollTooltipMessageState(animated: Bool) {
@@ -7725,7 +8019,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             self.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
         case .clearHistory:
             if case let .peer(peerId) = self.chatLocation {
-                let account = self.context.account
+                let context = self.context
                 
                 let beginClear: (InteractiveHistoryClearingType) -> Void = { [weak self] type in
                     guard let strongSelf = self else {
@@ -7745,7 +8039,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     
                     strongSelf.present(UndoOverlayController(presentationData: strongSelf.context.sharedContext.currentPresentationData.with { $0 }, content: .removedChat(text: statusText), elevatedLayout: false, action: { value in
                         if value == .commit {
-                            let _ = clearHistoryInteractively(postbox: account.postbox, peerId: peerId, type: type).start(completed: {
+                            let _ = context.engine.messages.clearHistoryInteractively(peerId: peerId, type: type).start(completed: {
                                 self?.chatDisplayNode.historyNode.historyAppearsCleared = false
                             })
                             return true
@@ -8042,7 +8336,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }
                     let peerId = peer.id
                     
-                    let _ = (collectCacheUsageStats(account: strongSelf.context.account, peerId: peer.id)
+                    let _ = (strongSelf.context.engine.resources.collectCacheUsageStats(peerId: peer.id)
                     |> deliverOnMainQueue).start(next: { [weak self, weak controller] result in
                         controller?.dismiss()
                         
@@ -8069,7 +8363,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 if filteredSize == 0 {
                                     title = presentationData.strings.Cache_ClearNone
                                 } else {
-                                    title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0
+                                    title = presentationData.strings.Cache_Clear("\(dataSizeString(filteredSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0
                                 }
                                 
                                 if let item = item as? ActionSheetButtonItem {
@@ -8122,7 +8416,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 totalSize += categorySize
                                 if categorySize > 1024 {
                                     let index = itemIndex
-                                    items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator), value: true, action: { value in
+                                    items.append(ActionSheetCheckboxItem(title: stringForCategory(strings: presentationData.strings, category: categoryId), label: dataSizeString(categorySize, formatting: DataSizeStringFormatting(presentationData: presentationData)), value: true, action: { value in
                                         toggleCheck(categoryId, index)
                                     }))
                                     itemIndex += 1
@@ -8134,7 +8428,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         if items.isEmpty {
                             strongSelf.presentClearCacheSuggestion()
                         } else {
-                            items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))").0, action: {
+                            items.append(ActionSheetButtonItem(title: presentationData.strings.Cache_Clear("\(dataSizeString(totalSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))").0, action: {
                                 let clearCategories = sizeIndex.keys.filter({ sizeIndex[$0]!.0 })
                                 var clearMediaIds = Set<MediaId>()
                                 
@@ -8161,7 +8455,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     }
                                 }
                                 
-                                var signal = clearCachedMediaResources(account: strongSelf.context.account, mediaResourceIds: clearResourceIds)
+                                var signal = strongSelf.context.engine.resources.clearCachedMediaResources(mediaResourceIds: clearResourceIds)
                                 
                                 var cancelImpl: (() -> Void)?
                                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
@@ -8192,7 +8486,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 disposable.set((signal
                                 |> deliverOnMainQueue).start(completed: { [weak self] in
                                     if let strongSelf = self, let _ = strongSelf.validLayout {
-                                        strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), in: .current)
+                                        strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .succeed(text: presentationData.strings.ClearCache_Success("\(dataSizeString(selectedSize, formatting: DataSizeStringFormatting(presentationData: presentationData)))", stringForDeviceType()).0), elevatedLayout: false, action: { _ in return false }), in: .current)
                                     }
                                 }))
 
@@ -8247,7 +8541,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     }
     
     private func editMessageMediaWithMessages(_ messages: [EnqueueMessage]) {
-        if let message = messages.first, case let .message(text, _, maybeMediaReference, _, _) = message, let mediaReference = maybeMediaReference {
+        if let message = messages.first, case let .message(text, _, maybeMediaReference, _, _, _) = message, let mediaReference = maybeMediaReference {
             self.updateChatPresentationInterfaceState(animated: true, interactive: true, { state in
                 var state = state
                 if let editMessageState = state.editMessageState, case let .media(options) = editMessageState.content, !options.isEmpty {
@@ -8270,7 +8564,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     private func editMessageMediaWithLegacySignals(_ signals: [Any]) {
         let _ = (legacyAssetPickerEnqueueMessages(account: self.context.account, signals: signals)
         |> deliverOnMainQueue).start(next: { [weak self] messages in
-            self?.editMessageMediaWithMessages(messages)
+            self?.editMessageMediaWithMessages(messages.map { $0.message })
         })
     }
     
@@ -8479,14 +8773,27 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         done(time)
                     })
                 }
-            }, sendMessagesWithSignals: { [weak self] signals, silentPosting, scheduleTime in
+            }, sendMessagesWithSignals: { [weak self] signals, silentPosting, scheduleTime, getAnimatedTransitionSource, completion in
+                guard let strongSelf = self else {
+                    completion()
+                    return
+                }
                 if !inputText.string.isEmpty {
                     //strongSelf.clearInputText()
                 }
                 if editMediaOptions != nil {
-                    self?.editMessageMediaWithLegacySignals(signals!)
+                    strongSelf.editMessageMediaWithLegacySignals(signals!)
+                    completion()
                 } else {
-                    self?.enqueueMediaMessages(signals: signals, silentPosting: silentPosting, scheduleTime: scheduleTime > 0 ? scheduleTime : nil)
+                    let immediateCompletion = getAnimatedTransitionSource == nil
+                    strongSelf.enqueueMediaMessages(signals: signals, silentPosting: silentPosting, scheduleTime: scheduleTime > 0 ? scheduleTime : nil, getAnimatedTransitionSource: getAnimatedTransitionSource, completion: {
+                        if !immediateCompletion {
+                            completion()
+                        }
+                    })
+                    if immediateCompletion {
+                        completion()
+                    }
                 }
             }, selectRecentlyUsedInlineBot: { [weak self] peer in
                 if let strongSelf = self, let addressName = peer.addressName {
@@ -8523,7 +8830,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             
             let presentationDisposable = strongSelf.context.sharedContext.presentationData.start(next: { [weak controller] presentationData in
                 if let controller = controller {
-                    controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme)
+                    controller.pallete = legacyMenuPaletteFromTheme(presentationData.theme, forceDark: false)
                 }
             })
             legacyController.disposables.add(presentationDisposable)
@@ -8581,17 +8888,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                         }
                                     }
                                     if fileTypes.music != fileTypes.other {
-                                        groupingKey = arc4random64()
+                                        groupingKey = Int64.random(in: Int64.min ... Int64.max)
                                     }
                                     
                                     var messages: [EnqueueMessage] = []
                                     for item in results {
                                         if let item = item {
-                                            let fileId = arc4random64()
+                                            let fileId = Int64.random(in: Int64.min ... Int64.max)
                                             let mimeType = guessMimeTypeByFileExtension((item.fileName as NSString).pathExtension)
                                             var previewRepresentations: [TelegramMediaImageRepresentation] = []
                                             if mimeType.hasPrefix("image/") || mimeType == "application/pdf" {
-                                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 320, height: 320), resource: ICloudFileResource(urlData: item.urlData, thumbnail: true), progressiveSizes: []))
+                                                previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 320, height: 320), resource: ICloudFileResource(urlData: item.urlData, thumbnail: true), progressiveSizes: [], immediateThumbnailData: nil))
                                             }
                                             var attributes: [TelegramMediaFileAttribute] = []
                                             attributes.append(.FileName(fileName: item.fileName))
@@ -8600,11 +8907,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                             }
                                             
                                             let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: fileId), partialReference: nil, resource: ICloudFileResource(urlData: item.urlData, thumbnail: false), previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: mimeType, size: item.fileSize, attributes: attributes)
-                                            let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: replyMessageId, localGroupingKey: groupingKey)
+                                            let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: replyMessageId, localGroupingKey: groupingKey, correlationId: nil)
                                             messages.append(message)
                                         }
                                         if let _ = groupingKey, messages.count % 10 == 0 {
-                                            groupingKey = arc4random64()
+                                            groupingKey = Int64.random(in: Int64.min ... Int64.max)
                                         }
                                     }
                                     
@@ -8618,7 +8925,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                                         $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                                                     })
                                                 }
-                                            })
+                                            }, nil)
                                             strongSelf.sendMessages(messages)
                                         }
                                     }
@@ -8838,14 +9145,14 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return
                     }
                     let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
-                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: replyMessageId, localGroupingKey: nil)
+                    let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)
                     strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                         if let strongSelf = self {
                             strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
                                 $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                             })
                         }
-                    })
+                    }, nil)
                     strongSelf.sendMessages([message])
                 })
                 strongSelf.effectiveNavigationController?.pushViewController(controller)
@@ -8854,58 +9161,37 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
     }
     
     private func presentContactPicker() {
-        let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: self.context, title: { $0.Contacts_Title }, displayDeviceContacts: true))
+        let contactsController = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: self.context, title: { $0.Contacts_Title }, displayDeviceContacts: true, multipleSelection: true))
         contactsController.navigationPresentation = .modal
         self.chatDisplayNode.dismissInput()
         self.effectiveNavigationController?.pushViewController(contactsController)
         self.controllerNavigationDisposable.set((contactsController.result
-        |> deliverOnMainQueue).start(next: { [weak self] peer in
-            if let strongSelf = self, let (peer, _) = peer {
-                let dataSignal: Signal<(Peer?,  DeviceContactExtendedData?), NoError>
-                switch peer {
-                    case let .peer(contact, _, _):
-                        guard let contact = contact as? TelegramUser, let phoneNumber = contact.phone else {
-                            return
-                        }
-                        let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: contact.firstName ?? "", lastName: contact.lastName ?? "", phoneNumbers: [DeviceContactPhoneNumberData(label: "_$!<Mobile>!$_", value: phoneNumber)]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: "")
-                        let context = strongSelf.context
-                        dataSignal = (strongSelf.context.sharedContext.contactDataManager?.basicData() ?? .single([:]))
-                        |> take(1)
-                        |> mapToSignal { basicData -> Signal<(Peer?,  DeviceContactExtendedData?), NoError> in
-                            var stableId: String?
-                            let queryPhoneNumber = formatPhoneNumber(phoneNumber)
-                            outer: for (id, data) in basicData {
-                                for phoneNumber in data.phoneNumbers {
-                                    if formatPhoneNumber(phoneNumber.value) == queryPhoneNumber {
-                                        stableId = id
-                                        break outer
-                                    }
+        |> deliverOnMainQueue).start(next: { [weak self] peers in
+            if let strongSelf = self, let (peers, _) = peers {
+                if peers.count > 1 {
+                    var enqueueMessages: [EnqueueMessage] = []
+                    for peer in peers {
+                        var media: TelegramMediaContact?
+                        switch peer {
+                            case let .peer(contact, _, _):
+                                guard let contact = contact as? TelegramUser, let phoneNumber = contact.phone else {
+                                    continue
                                 }
-                            }
-                            
-                            if let stableId = stableId {
-                                return (context.sharedContext.contactDataManager?.extendedData(stableId: stableId) ?? .single(nil))
-                                |> take(1)
-                                |> map { extendedData -> (Peer?,  DeviceContactExtendedData?) in
-                                    return (contact, extendedData)
+                                let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: contact.firstName ?? "", lastName: contact.lastName ?? "", phoneNumbers: [DeviceContactPhoneNumberData(label: "_$!<Mobile>!$_", value: phoneNumber)]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: "")
+                                
+                                let phone = contactData.basicData.phoneNumbers[0].value
+                                media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: contact.id, vCardData: nil)
+                            case let .deviceContact(_, basicData):
+                                guard !basicData.phoneNumbers.isEmpty else {
+                                    continue
                                 }
-                            } else {
-                                return .single((contact, contactData))
-                            }
+                                let contactData = DeviceContactExtendedData(basicData: basicData, middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: "")
+                                
+                                let phone = contactData.basicData.phoneNumbers[0].value
+                                media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: nil, vCardData: nil)
                         }
-                    case let .deviceContact(id, _):
-                        dataSignal = (strongSelf.context.sharedContext.contactDataManager?.extendedData(stableId: id) ?? .single(nil))
-                        |> take(1)
-                        |> map { extendedData -> (Peer?,  DeviceContactExtendedData?) in
-                            return (nil, extendedData)
-                        }
-                }
-                strongSelf.controllerNavigationDisposable.set((dataSignal
-                |> deliverOnMainQueue).start(next: { peerAndContactData in
-                    if let strongSelf = self, let contactData = peerAndContactData.1, contactData.basicData.phoneNumbers.count != 0 {
-                        if contactData.isPrimitive {
-                            let phone = contactData.basicData.phoneNumbers[0].value
-                            let media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: peerAndContactData.0?.id, vCardData: nil)
+
+                        if let media = media {
                             let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
                             strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                                 if let strongSelf = self {
@@ -8913,33 +9199,93 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                         $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                                     })
                                 }
-                            })
-                            let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: replyMessageId, localGroupingKey: nil)
-                            strongSelf.sendMessages([message])
-                        } else {
-                            let contactController = strongSelf.context.sharedContext.makeDeviceContactInfoController(context: strongSelf.context, subject: .filter(peer: peerAndContactData.0, contactId: nil, contactData: contactData, completion: { peer, contactData in
-                                guard let strongSelf = self, !contactData.basicData.phoneNumbers.isEmpty else {
-                                    return
-                                }
-                                let phone = contactData.basicData.phoneNumbers[0].value
-                                if let vCardData = contactData.serializedVCard() {
-                                    let media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: peer?.id, vCardData: vCardData)
-                                    let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
-                                    strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
-                                        if let strongSelf = self {
-                                            strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
-                                                $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
-                                            })
-                                        }
-                                    })
-                                    let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: replyMessageId, localGroupingKey: nil)
-                                    strongSelf.sendMessages([message])
-                                }
-                            }), completed: nil, cancelled: nil)
-                            strongSelf.effectiveNavigationController?.pushViewController(contactController)
+                            }, nil)
+                            let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)
+                            enqueueMessages.append(message)
                         }
                     }
-                }))
+                    strongSelf.sendMessages(enqueueMessages)
+                } else if let peer = peers.first {
+                    let dataSignal: Signal<(Peer?,  DeviceContactExtendedData?), NoError>
+                    switch peer {
+                        case let .peer(contact, _, _):
+                            guard let contact = contact as? TelegramUser, let phoneNumber = contact.phone else {
+                                return
+                            }
+                            let contactData = DeviceContactExtendedData(basicData: DeviceContactBasicData(firstName: contact.firstName ?? "", lastName: contact.lastName ?? "", phoneNumbers: [DeviceContactPhoneNumberData(label: "_$!<Mobile>!$_", value: phoneNumber)]), middleName: "", prefix: "", suffix: "", organization: "", jobTitle: "", department: "", emailAddresses: [], urls: [], addresses: [], birthdayDate: nil, socialProfiles: [], instantMessagingProfiles: [], note: "")
+                            let context = strongSelf.context
+                            dataSignal = (strongSelf.context.sharedContext.contactDataManager?.basicData() ?? .single([:]))
+                            |> take(1)
+                            |> mapToSignal { basicData -> Signal<(Peer?,  DeviceContactExtendedData?), NoError> in
+                                var stableId: String?
+                                let queryPhoneNumber = formatPhoneNumber(phoneNumber)
+                                outer: for (id, data) in basicData {
+                                    for phoneNumber in data.phoneNumbers {
+                                        if formatPhoneNumber(phoneNumber.value) == queryPhoneNumber {
+                                            stableId = id
+                                            break outer
+                                        }
+                                    }
+                                }
+                                
+                                if let stableId = stableId {
+                                    return (context.sharedContext.contactDataManager?.extendedData(stableId: stableId) ?? .single(nil))
+                                    |> take(1)
+                                    |> map { extendedData -> (Peer?,  DeviceContactExtendedData?) in
+                                        return (contact, extendedData)
+                                    }
+                                } else {
+                                    return .single((contact, contactData))
+                                }
+                            }
+                        case let .deviceContact(id, _):
+                            dataSignal = (strongSelf.context.sharedContext.contactDataManager?.extendedData(stableId: id) ?? .single(nil))
+                            |> take(1)
+                            |> map { extendedData -> (Peer?,  DeviceContactExtendedData?) in
+                                return (nil, extendedData)
+                            }
+                    }
+                    strongSelf.controllerNavigationDisposable.set((dataSignal
+                    |> deliverOnMainQueue).start(next: { peerAndContactData in
+                        if let strongSelf = self, let contactData = peerAndContactData.1, contactData.basicData.phoneNumbers.count != 0 {
+                            if contactData.isPrimitive {
+                                let phone = contactData.basicData.phoneNumbers[0].value
+                                let media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: peerAndContactData.0?.id, vCardData: nil)
+                                let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
+                                strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
+                                    if let strongSelf = self {
+                                        strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
+                                            $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
+                                        })
+                                    }
+                                }, nil)
+                                let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)
+                                strongSelf.sendMessages([message])
+                            } else {
+                                let contactController = strongSelf.context.sharedContext.makeDeviceContactInfoController(context: strongSelf.context, subject: .filter(peer: peerAndContactData.0, contactId: nil, contactData: contactData, completion: { peer, contactData in
+                                    guard let strongSelf = self, !contactData.basicData.phoneNumbers.isEmpty else {
+                                        return
+                                    }
+                                    let phone = contactData.basicData.phoneNumbers[0].value
+                                    if let vCardData = contactData.serializedVCard() {
+                                        let media = TelegramMediaContact(firstName: contactData.basicData.firstName, lastName: contactData.basicData.lastName, phoneNumber: phone, peerId: peer?.id, vCardData: vCardData)
+                                        let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
+                                        strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
+                                            if let strongSelf = self {
+                                                strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
+                                                    $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
+                                                })
+                                            }
+                                        }, nil)
+                                        let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)
+                                        strongSelf.sendMessages([message])
+                                    }
+                                }), completed: nil, cancelled: nil)
+                                strongSelf.effectiveNavigationController?.pushViewController(contactController)
+                            }
+                        }
+                    }))
+                }
             }
         }))
     }
@@ -9250,7 +9596,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                         })
                     }
-                })
+                }, nil)
                 strongSelf.sendMessages([message.withUpdatedReplyToMessageId(replyMessageId)])
             }))
         }
@@ -9304,9 +9650,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 }
         }
         if let value = value {
-            self.present(UndoOverlayController(presentationData: self.presentationData, content: .dice(dice: dice, account: self.context.account, text: value, action: canSendMessagesToChat(self.presentationInterfaceState) ? self.presentationData.strings.Conversation_SendDice : nil), elevatedLayout: false, action: { [weak self] action in
+            self.present(UndoOverlayController(presentationData: self.presentationData, content: .dice(dice: dice, context: self.context, text: value, action: canSendMessagesToChat(self.presentationInterfaceState) ? self.presentationData.strings.Conversation_SendDice : nil), elevatedLayout: false, action: { [weak self] action in
                 if let strongSelf = self, canSendMessagesToChat(strongSelf.presentationInterfaceState), action == .undo {
-                    strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: AnyMediaReference.standalone(media: TelegramMediaDice(emoji: dice.emoji)), replyToMessageId: nil, localGroupingKey: nil)])
+                    strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: AnyMediaReference.standalone(media: TelegramMediaDice(emoji: dice.emoji)), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)])
                 }
                 return false
             }), in: .current)
@@ -9327,9 +9673,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             
             if let defaultReplyMessageId = defaultReplyMessageId {
                 switch message {
-                case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey):
+                case let .message(text, attributes, mediaReference, replyToMessageId, localGroupingKey, correlationId):
                     if replyToMessageId == nil {
-                        message = .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: defaultReplyMessageId, localGroupingKey: localGroupingKey)
+                        message = .message(text: text, attributes: attributes, mediaReference: mediaReference, replyToMessageId: defaultReplyMessageId, localGroupingKey: localGroupingKey, correlationId: correlationId)
                     }
                 case .forward:
                     break
@@ -9379,6 +9725,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             })
             
             donateSendMessageIntent(account: self.context.account, sharedContext: self.context.sharedContext, intentContext: .chat, peerIds: [peerId])
+            
+            self.updateChatPresentationInterfaceState(interactive: true, { $0.updatedShowCommands(false) })
         } else {
             self.presentScheduleTimePicker(dismissByTapOutside: false, completion: { [weak self] time in
                 if let strongSelf = self {
@@ -9388,11 +9736,35 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
     }
     
-    private func enqueueMediaMessages(signals: [Any]?, silentPosting: Bool, scheduleTime: Int32? = nil) {
+    private func enqueueMediaMessages(signals: [Any]?, silentPosting: Bool, scheduleTime: Int32? = nil, getAnimatedTransitionSource: ((String) -> UIView?)? = nil, completion: @escaping () -> Void = {}) {
         self.enqueueMediaMessageDisposable.set((legacyAssetPickerEnqueueMessages(account: self.context.account, signals: signals!)
-        |> deliverOnMainQueue).start(next: { [weak self] messages in
+        |> deliverOnMainQueue).start(next: { [weak self] items in
             if let strongSelf = self {
-                let messages = strongSelf.transformEnqueueMessages(messages, silentPosting: silentPosting, scheduleTime: scheduleTime)
+                var completionImpl: (() -> Void)? = completion
+
+                var usedCorrelationId: Int64?
+
+                var mappedMessages: [EnqueueMessage] = []
+                for item in items {
+                    var message = item.message
+                    if let uniqueId = item.uniqueId {
+                        let correlationId = Int64.random(in: 0 ..< Int64.max)
+                        message = message.withUpdatedCorrelationId(correlationId)
+
+                        if items.count == 1, let getAnimatedTransitionSource = getAnimatedTransitionSource {
+                            usedCorrelationId = correlationId
+                            completionImpl = nil
+                            strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .mediaInput(ChatMessageTransitionNode.Source.MediaInput(extractSnapshot: {
+                                return getAnimatedTransitionSource(uniqueId)
+                            })), initiated: {
+                                completion()
+                            })
+                        }
+                    }
+                    mappedMessages.append(message)
+                }
+
+                let messages = strongSelf.transformEnqueueMessages(mappedMessages, silentPosting: silentPosting, scheduleTime: scheduleTime)
                 let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
                 strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                     if let strongSelf = self {
@@ -9400,7 +9772,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                         })
                     }
-                })
+                    completionImpl?()
+                }, usedCorrelationId)
+
                 strongSelf.sendMessages(messages.map { $0.withUpdatedReplyToMessageId(replyMessageId) })
             }
         }))
@@ -9463,7 +9837,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                         })
                     }
-                })
+                }, nil)
                 strongSelf.sendMessages([message].map { $0.withUpdatedReplyToMessageId(replyMessageId) })
             }
         }))
@@ -9479,7 +9853,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                         })
                     }
-                })
+                }, nil)
                 strongSelf.sendMessages([message].map { $0.withUpdatedReplyToMessageId(replyMessageId) })
             }
         }))
@@ -9489,7 +9863,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         let size = image.size.aspectFitted(CGSize(width: 512.0, height: 512.0))
         self.enqueueMediaMessageDisposable.set((convertToWebP(image: image, targetSize: size, targetBoundingSize: size, quality: 0.9) |> deliverOnMainQueue).start(next: { [weak self] data in
             if let strongSelf = self, !data.isEmpty {
-                let resource = LocalFileMediaResource(fileId: arc4random64())
+                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                 strongSelf.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
                 
                 var fileAttributes: [TelegramMediaFileAttribute] = []
@@ -9497,8 +9871,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 fileAttributes.append(.Sticker(displayText: "", packReference: nil, maskData: nil))
                 fileAttributes.append(.ImageSize(size: PixelDimensions(size)))
                 
-                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "image/webp", size: data.count, attributes: fileAttributes)
-                let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil)
+                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "image/webp", size: data.count, attributes: fileAttributes)
+                let message = EnqueueMessage.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                 
                 let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
                 strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
@@ -9507,17 +9881,22 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                         })
                     }
-                })
+                }, nil)
                 strongSelf.sendMessages([message].map { $0.withUpdatedReplyToMessageId(replyMessageId) })
             }
         }))
     }
     
-    private func enqueueChatContextResult(_ results: ChatContextResultCollection, _ result: ChatContextResult, hideVia: Bool = false, closeMediaInput: Bool = false) {
+    private func enqueueChatContextResult(_ results: ChatContextResultCollection, _ result: ChatContextResult, hideVia: Bool = false, closeMediaInput: Bool = false, silentPosting: Bool = false) {
+        if !canSendMessagesToChat(self.presentationInterfaceState) {
+            return
+        }
+
         let peerId = self.chatLocation.peerId
-        
-        if let message = outgoingMessageWithChatContextResult(to: peerId, results: results, result: result, hideVia: hideVia), canSendMessagesToChat(self.presentationInterfaceState) {
-            let replyMessageId = self.presentationInterfaceState.interfaceState.replyMessageId
+
+        let replyMessageId = self.presentationInterfaceState.interfaceState.replyMessageId
+
+        if self.context.engine.messages.enqueueOutgoingMessageWithChatContextResult(to: peerId, results: results, result: result, replyToMessageId: replyMessageId, hideVia: hideVia, silentPosting: silentPosting) {
             self.chatDisplayNode.setupSendActionOnViewUpdate({ [weak self] in
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { state in
@@ -9538,8 +9917,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         return state
                     })
                 }
-            })
-            self.sendMessages([message.withUpdatedReplyToMessageId(replyMessageId)])
+            }, nil)
         }
     }
     
@@ -9608,17 +9986,42 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     isScheduledMessages = true
                 }
                 
-                self.videoRecorder.set(.single(legacyInstantVideoController(theme: self.presentationData.theme, panelFrame: self.view.convert(currentInputPanelFrame, to: nil), context: self.context, peerId: peerId, slowmodeState: !isScheduledMessages ? self.presentationInterfaceState.slowmodeState : nil, hasSchedule: !isScheduledMessages && peerId.namespace != Namespaces.Peer.SecretChat, send: { [weak self] message in
+                self.videoRecorder.set(.single(legacyInstantVideoController(theme: self.presentationData.theme, panelFrame: self.view.convert(currentInputPanelFrame, to: nil), context: self.context, peerId: peerId, slowmodeState: !isScheduledMessages ? self.presentationInterfaceState.slowmodeState : nil, hasSchedule: !isScheduledMessages && peerId.namespace != Namespaces.Peer.SecretChat, send: { [weak self] videoController, message in
                     if let strongSelf = self {
+                        guard let message = message else {
+                            strongSelf.videoRecorder.set(.single(nil))
+                            return
+                        }
+
                         let replyMessageId = strongSelf.presentationInterfaceState.interfaceState.replyMessageId
+                        let correlationId = Int64.random(in: 0 ..< Int64.max)
+                        let updatedMessage = message
+                            .withUpdatedReplyToMessageId(replyMessageId)
+                            .withUpdatedCorrelationId(correlationId)
+
+                        var usedCorrelationId = false
+
+                        if strongSelf.chatDisplayNode.shouldAnimateMessageTransition, let extractedView = videoController.extractVideoSnapshot() {
+                            usedCorrelationId = true
+                            strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source:  .videoMessage(ChatMessageTransitionNode.Source.VideoMessage(view: extractedView)), initiated: { [weak videoController] in
+                                videoController?.hideVideoSnapshot()
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.videoRecorder.set(.single(nil))
+                            })
+                        } else {
+                            strongSelf.videoRecorder.set(.single(nil))
+                        }
+
                         strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                             if let strongSelf = self {
                                 strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
                                     $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                                 })
                             }
-                        })
-                        let updatedMessage = message.withUpdatedReplyToMessageId(replyMessageId)
+                        }, usedCorrelationId ? correlationId : nil)
+
                         strongSelf.sendMessages([updatedMessage])
                     }
                 }, displaySlowmodeTooltip: { [weak self] node, rect in
@@ -9656,7 +10059,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             switch updatedAction {
                 case .dismiss:
                     self.chatDisplayNode.updateRecordedMediaDeleted(true)
-                    break
+                    self.audioRecorder.set(.single(nil))
                 case .preview:
                     self.updateChatPresentationInterfaceState(animated: true, interactive: true, {
                         $0.updatedInputTextPanelState { panelState in
@@ -9674,7 +10077,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                     }
                                 })
                             } else if let waveform = data.waveform {
-                                let resource = LocalFileMediaResource(fileId: arc4random64(), size: data.compressedData.count)
+                                let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max), size: data.compressedData.count)
                                 
                                 strongSelf.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data.compressedData)
                                 
@@ -9687,6 +10090,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             }
                         }
                     })
+                    self.audioRecorder.set(.single(nil))
                 case .send:
                     self.chatDisplayNode.updateRecordedMediaDeleted(false)
                     let _ = (audioRecorderValue.takenRecordedData()
@@ -9695,8 +10099,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             if data.duration < 0.5 {
                                 strongSelf.recorderFeedback?.error()
                                 strongSelf.recorderFeedback = nil
+                                strongSelf.audioRecorder.set(.single(nil))
                             } else {
-                                let randomId = arc4random64()
+                                let randomId = Int64.random(in: Int64.min ... Int64.max)
                                 
                                 let resource = LocalFileMediaResource(fileId: randomId)
                                 strongSelf.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data.compressedData)
@@ -9705,16 +10110,31 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 if let waveform = data.waveform {
                                     waveformBuffer = MemoryBuffer(data: waveform)
                                 }
-                                
+
+                                let correlationId = Int64.random(in: 0 ..< Int64.max)
+                                var usedCorrelationId = false
+
+                                if strongSelf.chatDisplayNode.shouldAnimateMessageTransition, let textInputPanelNode = strongSelf.chatDisplayNode.textInputPanelNode, let micButton = textInputPanelNode.micButton {
+                                    usedCorrelationId = true
+                                    strongSelf.chatDisplayNode.messageTransitionNode.add(correlationId: correlationId, source: .audioMicInput(ChatMessageTransitionNode.Source.AudioMicInput(micButton: micButton)), initiated: {
+                                        guard let strongSelf = self else {
+                                            return
+                                        }
+                                        strongSelf.audioRecorder.set(.single(nil))
+                                    })
+                                } else {
+                                    strongSelf.audioRecorder.set(.single(nil))
+                                }
+
                                 strongSelf.chatDisplayNode.setupSendActionOnViewUpdate({
                                     if let strongSelf = self {
                                         strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: false, {
                                             $0.updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                                         })
                                     }
-                                })
+                                }, usedCorrelationId ? correlationId : nil)
                                 
-                                strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: data.compressedData.count, attributes: [.Audio(isVoice: true, duration: Int(data.duration), title: nil, performer: nil, waveform: waveformBuffer)])), replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)])
+                                strongSelf.sendMessages([.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: data.compressedData.count, attributes: [.Audio(isVoice: true, duration: Int(data.duration), title: nil, performer: nil, waveform: waveformBuffer)])), replyToMessageId: strongSelf.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: correlationId)])
                                 
                                 strongSelf.recorderFeedback?.tap()
                                 strongSelf.recorderFeedback = nil
@@ -9722,12 +10142,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                     })
             }
-            self.audioRecorder.set(.single(nil))
         } else if let videoRecorderValue = self.videoRecorderValue {
             if case .send = updatedAction {
                 self.chatDisplayNode.updateRecordedMediaDeleted(false)
                 videoRecorderValue.completeVideo()
-                self.videoRecorder.set(.single(nil))
             } else {
                 if case .dismiss = updatedAction {
                     self.chatDisplayNode.updateRecordedMediaDeleted(true)
@@ -9808,9 +10226,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         $0.updatedRecordedMediaPreview(nil).updatedInterfaceState { $0.withUpdatedReplyMessageId(nil) }
                     })
                 }
-            })
+            }, nil)
             
-            let messages: [EnqueueMessage] = [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: recordedMediaPreview.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int(recordedMediaPreview.fileSize), attributes: [.Audio(isVoice: true, duration: Int(recordedMediaPreview.duration), title: nil, performer: nil, waveform: waveformBuffer)])), replyToMessageId: self.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil)]
+            let messages: [EnqueueMessage] = [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: recordedMediaPreview.resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: Int(recordedMediaPreview.fileSize), attributes: [.Audio(isVoice: true, duration: Int(recordedMediaPreview.duration), title: nil, performer: nil, waveform: waveformBuffer)])), replyToMessageId: self.presentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: nil)]
             
             let transformedMessages: [EnqueueMessage]
             if let silentPosting = silentPosting {
@@ -9899,7 +10317,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             self.searchDisposable = searchDisposable
                         }
 
-                        let search = searchMessages(account: self.context.account, location: searchState.location, query: searchState.query, state: nil, limit: limit)
+                        let search = self.context.engine.messages.searchMessages(location: searchState.location, query: searchState.query, state: nil, limit: limit)
                         |> delay(0.2, queue: Queue.mainQueue())
                         self.searchResult.set(search
                         |> map { (result, state) -> (SearchMessagesResult, SearchMessagesState, SearchMessagesLocation)? in
@@ -9953,7 +10371,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             searchDisposable = MetaDisposable()
                             self.searchDisposable = searchDisposable
                         }
-                        searchDisposable.set((searchMessages(account: self.context.account, location: searchState.location, query: searchState.query, state: loadMoreState, limit: limit)
+                        searchDisposable.set((self.context.engine.messages.searchMessages(location: searchState.location, query: searchState.query, state: loadMoreState, limit: limit)
                         |> delay(0.2, queue: Queue.mainQueue())
                         |> deliverOnMainQueue).start(next: { [weak self] results, updatedState in
                             guard let strongSelf = self else {
@@ -10205,9 +10623,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 
                 let subject: ChatControllerSubject?
                 if let atMessageId = atMessageId {
-                    subject = .message(id: atMessageId, highlight: true)
+                    subject = .message(id: atMessageId, highlight: true, timecode: nil)
                 } else if let index = result.scrollToLowerBoundMessage {
-                    subject = .message(id: index.id, highlight: false)
+                    subject = .message(id: index.id, highlight: false, timecode: nil)
                 } else {
                     subject = nil
                 }
@@ -10271,11 +10689,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             if isPinnedMessages, let messageId = messageLocation.messageId {
                 if let navigationController = self.effectiveNavigationController {
                     self.dismiss()
-                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true), keepStack: .always))
+                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true, timecode: nil), keepStack: .always))
                 }
             } else if case let .peer(peerId) = self.chatLocation, let messageId = messageLocation.messageId, (messageId.peerId != peerId && !forceInCurrentChat) || (isScheduledMessages && messageId.id != 0 && !Namespaces.Message.allScheduled.contains(messageId.namespace)) {
                 if let navigationController = self.effectiveNavigationController {
-                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true), keepStack: .always))
+                    self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageId.peerId), subject: .message(id: messageId, highlight: true, timecode: nil), keepStack: .always))
                 }
             } else if forceInCurrentChat {
                 if let _ = fromId, let fromIndex = fromIndex, rememberInStack {
@@ -10297,13 +10715,17 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         self.messageIndexDisposable.set(nil)
                         self.chatDisplayNode.historyNode.scrollToMessage(from: scrollFromIndex, to: message.index, animated: animated, scrollPosition: scrollPosition)
                         completion?()
+                        
+                        if case let .id(_, maybeTimecode) = messageLocation, let timecode = maybeTimecode {
+                            let _ = self.controllerInteraction?.openMessage(message, .timecode(timecode))
+                        }
                     } else if case let .index(index) = messageLocation, index.id.id == 0, index.timestamp > 0, case .scheduledMessages = self.presentationInterfaceState.subject {
                         self.chatDisplayNode.historyNode.scrollToMessage(from: scrollFromIndex, to: index, animated: animated, scrollPosition: scrollPosition)
                     } else {
                         self.loadingMessage.set(.single(statusSubject) |> delay(0.1, queue: .mainQueue()))
                         let searchLocation: ChatHistoryInitialSearchLocation
                         switch messageLocation {
-                            case let .id(id):
+                            case let .id(id, _):
                                 searchLocation = .id(id)
                             case let .index(index):
                                 searchLocation = .index(index)
@@ -10396,7 +10818,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 if let fromIndex = fromIndex {
                     let searchLocation: ChatHistoryInitialSearchLocation
                     switch messageLocation {
-                        case let .id(id):
+                        case let .id(id, _):
                             searchLocation = .id(id)
                         case let .index(index):
                             searchLocation = .index(index)
@@ -10430,7 +10852,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                                 completion?()
                             } else {
                                 if let navigationController = strongSelf.effectiveNavigationController {
-                                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(messageLocation.peerId), subject: messageLocation.messageId.flatMap { .message(id: $0, highlight: true) }))
+                                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(messageLocation.peerId), subject: messageLocation.messageId.flatMap { .message(id: $0, highlight: true, timecode: nil) }))
                                 }
                                 completion?()
                             }
@@ -10442,7 +10864,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }))
                 } else {
                     if let navigationController = self.effectiveNavigationController {
-                        self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageLocation.peerId), subject: messageLocation.messageId.flatMap { .message(id: $0, highlight: true) }))
+                        self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(messageLocation.peerId), subject: messageLocation.messageId.flatMap { .message(id: $0, highlight: true, timecode: nil) }))
                     }
                     completion?()
                 }
@@ -10481,7 +10903,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             var attemptSelectionImpl: ((Peer) -> Void)?
             let controller = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: filter, attemptSelection: { peer in
                 attemptSelectionImpl?(peer)
-            }))
+            }, multipleSelection: true))
             let context = self.context
             attemptSelectionImpl = { [weak controller] peer in
                 guard let controller = controller else {
@@ -10496,6 +10918,82 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 }
                 controller.present(textAlertController(context: context, title: nil, text: presentationData.strings.Forward_ErrorDisabledForChat, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.Common_OK, action: {})]), in: .window(.root))
             }
+            controller.multiplePeersSelected = { [weak self, weak controller] peers, messageText in
+                guard let strongSelf = self, let strongController = controller else {
+                    return
+                }
+                strongController.dismiss()
+                
+                for peer in peers {
+                    var result: [EnqueueMessage] = []
+                    if messageText.string.count > 0 {
+                        let inputText = convertMarkdownToAttributes(messageText)
+                        for text in breakChatInputText(trimChatInputText(inputText)) {
+                            if text.length != 0 {
+                                var attributes: [MessageAttribute] = []
+                                let entities = generateTextEntities(text.string, enabledTypes: .all, currentEntities: generateChatInputTextEntities(text))
+                                if !entities.isEmpty {
+                                    attributes.append(TextEntitiesMessageAttribute(entities: entities))
+                                }
+                                result.append(.message(text: text.string, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
+                            }
+                        }
+                    }
+                    
+                    result.append(contentsOf: messages.map { message -> EnqueueMessage in
+                        return .forward(source: message.id, grouping: .auto, attributes: [], correlationId: nil)
+                    })
+                    
+                    let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: result)
+                    |> deliverOnMainQueue).start(next: { messageIds in
+                        if let strongSelf = self {
+                            let signals: [Signal<Bool, NoError>] = messageIds.compactMap({ id -> Signal<Bool, NoError>? in
+                                guard let id = id else {
+                                    return nil
+                                }
+                                return strongSelf.context.account.pendingMessageManager.pendingMessageStatus(id)
+                                |> mapToSignal { status, _ -> Signal<Bool, NoError> in
+                                    if status != nil {
+                                        return .never()
+                                    } else {
+                                        return .single(true)
+                                    }
+                                }
+                                |> take(1)
+                            })
+                            if strongSelf.shareStatusDisposable == nil {
+                                strongSelf.shareStatusDisposable = MetaDisposable()
+                            }
+                            strongSelf.shareStatusDisposable?.set((combineLatest(signals)
+                            |> deliverOnMainQueue).start())
+                        }
+                    })
+                    
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    let text: String
+                    var savedMessages = false
+                    if peers.count == 1, let peerId = peers.first?.id, peerId == strongSelf.context.account.peerId {
+                        text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many
+                        savedMessages = true
+                    } else {
+                        if peers.count == 1, let peer = peers.first {
+                            let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).0 : presentationData.strings.Conversation_ForwardTooltip_Chat_Many(peerName).0
+                        } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                            let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0 : presentationData.strings.Conversation_ForwardTooltip_TwoChats_Many(firstPeerName, secondPeerName).0
+                        } else if let peer = peers.first {
+                            let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messages.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0 : presentationData.strings.Conversation_ForwardTooltip_ManyChats_Many(peerName, "\(peers.count - 1)").0
+                        } else {
+                            text = ""
+                        }
+                    }
+                    
+                    strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .current)
+                }
+            }
             controller.peerSelected = { [weak self, weak controller] peer in
                 let peerId = peer.id
                 
@@ -10528,7 +11026,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     }), in: .current)
                     
                     let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messages.map { message -> EnqueueMessage in
-                        return .forward(source: message.id, grouping: .auto, attributes: [])
+                        return .forward(source: message.id, grouping: .auto, attributes: [], correlationId: nil)
                     })
                     |> deliverOnMainQueue).start(next: { messageIds in
                         if let strongSelf = self {
@@ -10755,7 +11253,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 disposable = MetaDisposable()
                 self.resolvePeerByNameDisposable = disposable
             }
-            var resolveSignal = resolvePeerByName(account: self.context.account, name: name, ageLimit: 10)
+            var resolveSignal = self.context.engine.peers.resolvePeerByName(name: name, ageLimit: 10)
             
             var cancelImpl: (() -> Void)?
             let presentationData = self.presentationData
@@ -10821,7 +11319,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             let account = self.context.account
             var resolveSignal: Signal<Peer?, NoError>
             if let peerName = peerName {
-                resolveSignal = resolvePeerByName(account: self.context.account, name: peerName)
+                resolveSignal = self.context.engine.peers.resolvePeerByName(name: peerName)
                 |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                     if let peerId = peerId {
                         return account.postbox.loadedPeerWithId(peerId)
@@ -10881,12 +11379,12 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         if let user = self.presentationInterfaceState.renderedPeer?.peer as? TelegramUser, user.botInfo != nil {
             restartBot = true
         }
-        self.editMessageDisposable.set((requestUpdatePeerIsBlocked(account: self.context.account, peerId: peerId, isBlocked: false)
+        self.editMessageDisposable.set((self.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peerId, isBlocked: false)
         |> afterDisposed({ [weak self] in
             Queue.mainQueue().async {
                 unblockingPeer.set(false)
                 if let strongSelf = self, restartBot {
-                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
+                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)]).start()
                 }
             }
         })).start())
@@ -10951,17 +11449,15 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     guard let strongSelf = self else {
                         return
                     }
-                    let _ = requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start()
+                    let _ = strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.id, isBlocked: true).start()
                     if let _ = chatPeer as? TelegramSecretChat {
-                        let _ = (strongSelf.context.account.postbox.transaction { transaction in
-                            terminateSecretChat(transaction: transaction, peerId: chatPeer.id, requestRemoteHistoryRemoval: true)
-                        }).start()
+                        let _ = strongSelf.context.engine.peers.terminateSecretChat(peerId: chatPeer.id, requestRemoteHistoryRemoval: true).start()
                     }
                     if deleteChat {
-                        let _ = removePeerChat(account: strongSelf.context.account, peerId: chatPeer.id, reportChatSpam: reportSpam).start()
+                        let _ = strongSelf.context.engine.peers.removePeerChat(peerId: chatPeer.id, reportChatSpam: reportSpam).start()
                         strongSelf.effectiveNavigationController?.filterController(strongSelf, animated: true)
                     } else if reportSpam {
-                        let _ = TelegramCore.reportPeer(account: strongSelf.context.account, peerId: peer.id, reason: .spam, message: "").start()
+                        let _ = strongSelf.context.engine.peers.reportPeer(peerId: peer.id, reason: .spam, message: "").start()
                     }
                 })
             ] as [ActionSheetItem])
@@ -11031,7 +11527,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 guard let strongSelf = self else {
                     return
                 }
-                let _ = (acceptAndShareContact(account: strongSelf.context.account, peerId: peer.id)
+                let _ = (strongSelf.context.engine.contacts.acceptAndShareContact(peerId: peer.id)
                 |> deliverOnMainQueue).start(error: { _ in
                     guard let strongSelf = self else {
                         return
@@ -11081,7 +11577,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         } else {
             dismissPeerId = peerId
         }
-        self.editMessageDisposable.set((dismissPeerStatusOptions(account: self.context.account, peerId: dismissPeerId)
+        self.editMessageDisposable.set((self.context.engine.peers.dismissPeerStatusOptions(peerId: dismissPeerId)
         |> afterDisposed({
             Queue.mainQueue().async {
             }
@@ -11094,10 +11590,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
         self.commitPurposefulAction()
         self.chatDisplayNode.historyNode.disconnect()
-        let _ = removePeerChat(account: self.context.account, peerId: peerId, reportChatSpam: reportChatSpam).start()
+        let _ = self.context.engine.peers.removePeerChat(peerId: peerId, reportChatSpam: reportChatSpam).start()
         self.effectiveNavigationController?.popToRoot(animated: true)
         
-        let _ = requestUpdatePeerIsBlocked(account: self.context.account, peerId: peerId, isBlocked: true).start()
+        let _ = self.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peerId, isBlocked: true).start()
     }
     
     private func startBot(_ payload: String?) {
@@ -11107,7 +11603,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         
         let startingBot = self.startingBot
         startingBot.set(true)
-        self.editMessageDisposable.set((requestStartBot(account: self.context.account, botPeerId: peerId, payload: payload) |> deliverOnMainQueue |> afterDisposed({
+        self.editMessageDisposable.set((self.context.engine.messages.requestStartBot(botPeerId: peerId, payload: payload) |> deliverOnMainQueue |> afterDisposed({
             startingBot.set(false)
         })).start(completed: { [weak self] in
             if let strongSelf = self {
@@ -11124,8 +11620,8 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             switch navigation {
                 case let .chat(_, subject, peekData):
                     if case .peer(peerId) = strongSelf.chatLocation {
-                        if let subject = subject, case let .message(messageId, _) = subject {
-                            strongSelf.navigateToMessage(from: nil, to: .id(messageId))
+                        if let subject = subject, case let .message(messageId, _, timecode) = subject {
+                            strongSelf.navigateToMessage(from: nil, to: .id(messageId, timecode))
                         }
                     } else if let navigationController = strongSelf.effectiveNavigationController {
                         strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), subject: subject, keepStack: .always, peekData: peekData))
@@ -11151,9 +11647,9 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 default:
                     break
                 }
-            }, sendFile: nil,
-            sendSticker: { [weak self] f, sourceNode, sourceRect in
-            return self?.interfaceInteraction?.sendSticker(f, sourceNode, sourceRect) ?? false
+        }, sendFile: nil,
+        sendSticker: { [weak self] f, sourceNode, sourceRect in
+            return self?.interfaceInteraction?.sendSticker(f, true, sourceNode, sourceRect) ?? false
         }, requestMessageActionUrlAuth: { [weak self] subject in
             if case let .url(url) = subject {
                 self?.controllerInteraction?.requestMessageActionUrlAuth(url, subject)
@@ -11223,7 +11719,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 }
             }
             
-            openUserGeneratedUrl(context: self.context, url: url, concealed: concealed, skipUrlAuth: skipUrlAuth, present: { [weak self] c in
+            openUserGeneratedUrl(context: self.context, peerId: self.peerView?.peerId, url: url, concealed: concealed, skipUrlAuth: skipUrlAuth, present: { [weak self] c in
                 self?.present(c, in: .window(.root))
             }, openResolved: { [weak self] resolved in
                 self?.openResolved(resolved)
@@ -11325,7 +11821,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                             if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
                                 let controller = SFSafariViewController(url: parsedUrl)
                                 if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
-                                    controller.preferredBarTintColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+                                    controller.preferredBarTintColor = self.presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
                                     controller.preferredControlTintColor = self.presentationData.theme.rootController.navigationBar.accentTextColor
                                 }
                                 return (controller, sourceRect)
@@ -11337,52 +11833,10 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         return nil
     }
     
-    func previewingCommit(_ viewControllerToCommit: UIViewController) {
-        if let gallery = viewControllerToCommit as? AvatarGalleryController {
-            self.chatDisplayNode.dismissInput()
-            gallery.setHintWillBePresentedInPreviewingContext(false)
-            self.present(gallery, in: .window(.root), with: AvatarGalleryControllerPresentationArguments(animated: false, transitionArguments: { _ in
-                return nil
-            }))
-        } else if let gallery = viewControllerToCommit as? GalleryController {
-            self.chatDisplayNode.dismissInput()
-            gallery.setHintWillBePresentedInPreviewingContext(false)
-            
-            self.present(gallery, in: .window(.root), with: GalleryControllerPresentationArguments(animated: false, transitionArguments: { [weak self] messageId, media in
-                if let strongSelf = self {
-                    var selectedTransitionNode: (ASDisplayNode, CGRect, () -> (UIView?, UIView?))?
-                    strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
-                        if let itemNode = itemNode as? ChatMessageItemView {
-                            if let result = itemNode.transitionNode(id: messageId, media: media) {
-                                selectedTransitionNode = result
-                            }
-                        }
-                    }
-                    if let selectedTransitionNode = selectedTransitionNode {
-                        return GalleryTransitionArguments(transitionNode: selectedTransitionNode, addToTransitionSurface: { view in
-                            if let strongSelf = self {
-                                strongSelf.chatDisplayNode.historyNode.view.superview?.insertSubview(view, aboveSubview: strongSelf.chatDisplayNode.historyNode.view)
-                            }
-                        })
-                    }
-                }
-                return nil
-            }))
-        }
-        
-        if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
-            if let safariController = viewControllerToCommit as? SFSafariViewController {
-                if let window = self.effectiveNavigationController?.view.window {
-                    window.rootViewController?.present(safariController, animated: true)
-                }
-            }
-        }
-    }
-    
     private func presentBanMessageOptions(accountPeerId: PeerId, author: Peer, messageIds: Set<MessageId>, options: ChatAvailableMessageActionOptions) {
         let peerId = self.chatLocation.peerId
         do {
-            self.navigationActionDisposable.set((fetchChannelParticipant(account: self.context.account, peerId: peerId, participantId: author.id)
+            self.navigationActionDisposable.set((self.context.engine.peers.fetchChannelParticipant(peerId: peerId, participantId: author.id)
             |> deliverOnMainQueue).start(next: { [weak self] participant in
                 if let strongSelf = self {
                     let canBan = participant?.canBeBannedBy(peerId: accountPeerId) ?? true
@@ -11436,16 +11890,16 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         if let strongSelf = self {
                             strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
                             if actions.contains(3) {
-                                let mediaBox = strongSelf.context.account.postbox.mediaBox
-                                let _ = strongSelf.context.account.postbox.transaction({ transaction -> Void in
-                                    deleteAllMessagesWithAuthor(transaction: transaction, mediaBox: mediaBox, peerId: peerId, authorId: author.id, namespace: Namespaces.Message.Cloud)
+                                let context = strongSelf.context
+                                let _ = context.account.postbox.transaction({ transaction -> Void in
+                                    context.engine.messages.deleteAllMessagesWithAuthor(transaction: transaction, peerId: peerId, authorId: author.id, namespace: Namespaces.Message.Cloud)
                                 }).start()
-                                let _ = clearAuthorHistory(account: strongSelf.context.account, peerId: peerId, memberId: author.id).start()
+                                let _ = strongSelf.context.engine.messages.clearAuthorHistory(peerId: peerId, memberId: author.id).start()
                             } else if actions.contains(0) {
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                             }
                             if actions.contains(1) {
-                                let _ = removePeerMember(account: strongSelf.context.account, peerId: peerId, memberId: author.id).start()
+                                let _ = strongSelf.context.engine.peers.removePeerMember(peerId: peerId, memberId: author.id).start()
                             }
                         }
                     }))
@@ -11462,7 +11916,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
         }
     }
     
-    private func presentDeleteMessageOptions(messageIds: Set<MessageId>, options: ChatAvailableMessageActionOptions, contextController: ContextController?, completion: @escaping (ContextMenuActionResult) -> Void) {
+    private func presentDeleteMessageOptions(messageIds: Set<MessageId>, options: ChatAvailableMessageActionOptions, contextController: ContextControllerProtocol?, completion: @escaping (ContextMenuActionResult) -> Void) {
         let actionSheet = ActionSheetController(presentationData: self.presentationData)
         var items: [ActionSheetItem] = []
         var personalPeerName: String?
@@ -11480,7 +11934,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 actionSheet?.dismissAnimated()
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                 }
             }))
         }
@@ -11507,7 +11961,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             contextItems.append(.action(ContextMenuActionItem(text: globalTitle, textColor: .destructive, icon: { _ in nil }, action: { [weak self] _, f in
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                     f(.dismissWithoutContent)
                 }
             })))
@@ -11515,7 +11969,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 actionSheet?.dismissAnimated()
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                 }
             }))
         }
@@ -11537,7 +11991,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
             contextItems.append(.action(ContextMenuActionItem(text: localOptionText, textColor: .destructive, icon: { _ in nil }, action: { [weak self] _, f in
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: unsendPersonalMessages ? .forEveryone : .forLocalPeer).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: unsendPersonalMessages ? .forEveryone : .forLocalPeer).start()
                     f(.dismissWithoutContent)
                 }
             })))
@@ -11545,7 +11999,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                 actionSheet?.dismissAnimated()
                 if let strongSelf = self {
                     strongSelf.updateChatPresentationInterfaceState(animated: true, interactive: true, { $0.updatedInterfaceState { $0.withoutSelectionState() } })
-                    let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: unsendPersonalMessages ? .forEveryone : .forLocalPeer).start()
+                    let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: unsendPersonalMessages ? .forEveryone : .forLocalPeer).start()
                 }
             }))
         }
@@ -12122,7 +12576,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                     
                     switch action {
                     case .commit:
-                        let _ = (requestUnpinAllMessages(account: strongSelf.context.account, peerId: strongSelf.chatLocation.peerId)
+                        let _ = (strongSelf.context.engine.messages.requestUnpinAllMessages(peerId: strongSelf.chatLocation.peerId)
                         |> deliverOnMainQueue).start(error: { _ in
                         }, completed: {
                             guard let strongSelf = self else {
diff --git a/submodules/TelegramUI/Sources/ChatControllerInteraction.swift b/submodules/TelegramUI/Sources/ChatControllerInteraction.swift
index 2863f406e8..c842ab6271 100644
--- a/submodules/TelegramUI/Sources/ChatControllerInteraction.swift
+++ b/submodules/TelegramUI/Sources/ChatControllerInteraction.swift
@@ -53,6 +53,7 @@ public final class ChatControllerInteraction {
     let openPeer: (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void
     let openPeerMention: (String) -> Void
     let openMessageContextMenu: (Message, Bool, ASDisplayNode, CGRect, UIGestureRecognizer?) -> Void
+    let activateMessagePinch: (PinchSourceContainerNode) -> Void
     let openMessageContextActions: (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void
     let navigateToMessage: (MessageId, MessageId) -> Void
     let navigateToMessageStandalone: (MessageId) -> Void
@@ -61,9 +62,9 @@ public final class ChatControllerInteraction {
     let toggleMessagesSelection: ([MessageId], Bool) -> Void
     let sendCurrentMessage: (Bool) -> Void
     let sendMessage: (String) -> Void
-    let sendSticker: (FileMediaReference, String?, Bool, ASDisplayNode, CGRect) -> Bool
-    let sendGif: (FileMediaReference, ASDisplayNode, CGRect) -> Bool
-    let sendBotContextResultAsGif: (ChatContextResultCollection, ChatContextResult, ASDisplayNode, CGRect) -> Bool
+    let sendSticker: (FileMediaReference, Bool, Bool, String?, Bool, ASDisplayNode, CGRect) -> Bool
+    let sendGif: (FileMediaReference, ASDisplayNode, CGRect, Bool, Bool) -> Bool
+    let sendBotContextResultAsGif: (ChatContextResultCollection, ChatContextResult, ASDisplayNode, CGRect, Bool) -> Bool
     let requestMessageActionCallback: (MessageId, MemoryBuffer?, Bool, Bool) -> Void
     let requestMessageActionUrlAuth: (String, MessageActionUrlSubject) -> Void
     let activateSwitchInline: (PeerId?, String) -> Void
@@ -113,7 +114,6 @@ public final class ChatControllerInteraction {
     let displayPsa: (String, ASDisplayNode) -> Void
     let displayDiceTooltip: (TelegramMediaDice) -> Void
     let animateDiceSuccess: (Bool) -> Void
-    let greetingStickerNode: () -> (ASDisplayNode, ASDisplayNode, ASDisplayNode, (@escaping () -> Void) -> Void)?
     let openPeerContextMenu: (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void
     let openMessageReplies: (MessageId, Bool, Bool) -> Void
     let openReplyThreadOriginalMessage: (Message) -> Void
@@ -121,6 +121,7 @@ public final class ChatControllerInteraction {
     let editMessageMedia: (MessageId, Bool) -> Void
     let copyText: (String) -> Void
     let displayUndo: (UndoOverlayContent) -> Void
+    let isAnimatingMessage: (UInt32) -> Bool
     
     let requestMessageUpdate: (MessageId) -> Void
     let cancelInteractiveKeyboardGestures: () -> Void
@@ -138,12 +139,14 @@ public final class ChatControllerInteraction {
     var searchTextHighightState: (String, [MessageIndex])?
     var seenOneTimeAnimatedMedia = Set<MessageId>()
     var currentMessageWithLoadingReplyThread: MessageId?
+    let presentationContext: ChatPresentationContext
     
     init(
         openMessage: @escaping (Message, ChatControllerInteractionOpenMessageMode) -> Bool,
         openPeer: @escaping (PeerId?, ChatControllerInteractionNavigateToPeer, Message?) -> Void,
         openPeerMention: @escaping (String) -> Void,
         openMessageContextMenu: @escaping (Message, Bool, ASDisplayNode, CGRect, UIGestureRecognizer?) -> Void,
+        activateMessagePinch: @escaping (PinchSourceContainerNode) -> Void,
         openMessageContextActions: @escaping (Message, ASDisplayNode, CGRect, ContextGesture?) -> Void,
         navigateToMessage: @escaping (MessageId, MessageId) -> Void,
         navigateToMessageStandalone: @escaping (MessageId) -> Void,
@@ -152,9 +155,9 @@ public final class ChatControllerInteraction {
         toggleMessagesSelection: @escaping ([MessageId], Bool) -> Void,
         sendCurrentMessage: @escaping (Bool) -> Void,
         sendMessage: @escaping (String) -> Void,
-        sendSticker: @escaping (FileMediaReference, String?, Bool, ASDisplayNode, CGRect) -> Bool,
-        sendGif: @escaping (FileMediaReference, ASDisplayNode, CGRect) -> Bool,
-        sendBotContextResultAsGif: @escaping (ChatContextResultCollection, ChatContextResult, ASDisplayNode, CGRect) -> Bool,
+        sendSticker: @escaping (FileMediaReference, Bool, Bool, String?, Bool, ASDisplayNode, CGRect) -> Bool,
+        sendGif: @escaping (FileMediaReference, ASDisplayNode, CGRect, Bool, Bool) -> Bool,
+        sendBotContextResultAsGif: @escaping (ChatContextResultCollection, ChatContextResult, ASDisplayNode, CGRect, Bool) -> Bool,
         requestMessageActionCallback: @escaping (MessageId, MemoryBuffer?, Bool, Bool) -> Void,
         requestMessageActionUrlAuth: @escaping (String, MessageActionUrlSubject) -> Void,
         activateSwitchInline: @escaping (PeerId?, String) -> Void,
@@ -204,7 +207,6 @@ public final class ChatControllerInteraction {
         displayPsa: @escaping (String, ASDisplayNode) -> Void,
         displayDiceTooltip: @escaping (TelegramMediaDice) -> Void,
         animateDiceSuccess: @escaping (Bool) -> Void,
-        greetingStickerNode: @escaping () -> (ASDisplayNode, ASDisplayNode, ASDisplayNode, (@escaping () -> Void) -> Void)?,
         openPeerContextMenu: @escaping (Peer, MessageId?, ASDisplayNode, CGRect, ContextGesture?) -> Void,
         openMessageReplies: @escaping (MessageId, Bool, Bool) -> Void,
         openReplyThreadOriginalMessage: @escaping (Message) -> Void,
@@ -212,16 +214,19 @@ public final class ChatControllerInteraction {
         editMessageMedia: @escaping (MessageId, Bool) -> Void,
         copyText: @escaping (String) -> Void,
         displayUndo: @escaping (UndoOverlayContent) -> Void,
+        isAnimatingMessage: @escaping (UInt32) -> Bool,
         requestMessageUpdate: @escaping (MessageId) -> Void,
         cancelInteractiveKeyboardGestures: @escaping () -> Void,
         automaticMediaDownloadSettings: MediaAutoDownloadSettings,
         pollActionState: ChatInterfacePollActionState,
-        stickerSettings: ChatInterfaceStickerSettings
+        stickerSettings: ChatInterfaceStickerSettings,
+        presentationContext: ChatPresentationContext
     ) {
         self.openMessage = openMessage
         self.openPeer = openPeer
         self.openPeerMention = openPeerMention
         self.openMessageContextMenu = openMessageContextMenu
+        self.activateMessagePinch = activateMessagePinch
         self.openMessageContextActions = openMessageContextActions
         self.navigateToMessage = navigateToMessage
         self.navigateToMessageStandalone = navigateToMessageStandalone
@@ -282,7 +287,6 @@ public final class ChatControllerInteraction {
         self.openMessagePollResults = openMessagePollResults
         self.displayDiceTooltip = displayDiceTooltip
         self.animateDiceSuccess = animateDiceSuccess
-        self.greetingStickerNode = greetingStickerNode
         self.openPeerContextMenu = openPeerContextMenu
         self.openMessageReplies = openMessageReplies
         self.openReplyThreadOriginalMessage = openReplyThreadOriginalMessage
@@ -290,6 +294,7 @@ public final class ChatControllerInteraction {
         self.editMessageMedia = editMessageMedia
         self.copyText = copyText
         self.displayUndo = displayUndo
+        self.isAnimatingMessage = isAnimatingMessage
         self.requestMessageUpdate = requestMessageUpdate
         self.cancelInteractiveKeyboardGestures = cancelInteractiveKeyboardGestures
         
@@ -297,11 +302,13 @@ public final class ChatControllerInteraction {
         
         self.pollActionState = pollActionState
         self.stickerSettings = stickerSettings
+
+        self.presentationContext = presentationContext
     }
     
     static var `default`: ChatControllerInteraction {
         return ChatControllerInteraction(openMessage: { _, _ in
-            return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
+        return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _, _, _ in return false }, sendGif: { _, _, _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
         }, presentController: { _, _ in }, navigationController: {
             return nil
         }, chatControllerNode: {
@@ -335,8 +342,6 @@ public final class ChatControllerInteraction {
         }, displayPsa: { _, _ in
         }, displayDiceTooltip: { _ in
         }, animateDiceSuccess: { _ in
-        }, greetingStickerNode: {
-            return nil
         }, openPeerContextMenu: { _, _, _, _, _ in
         }, openMessageReplies: { _, _, _ in
         }, openReplyThreadOriginalMessage: { _ in
@@ -344,9 +349,14 @@ public final class ChatControllerInteraction {
         }, editMessageMedia: { _, _ in
         }, copyText: { _ in
         }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
         }, requestMessageUpdate: { _ in
         }, cancelInteractiveKeyboardGestures: {
         }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings,
-           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false))
+        pollActionState: ChatInterfacePollActionState(),
+        stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false),
+        presentationContext: ChatPresentationContext(backgroundNode: nil)
+        )
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatControllerNode.swift b/submodules/TelegramUI/Sources/ChatControllerNode.swift
index 3c4e4dbec0..19193334b4 100644
--- a/submodules/TelegramUI/Sources/ChatControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatControllerNode.swift
@@ -16,6 +16,7 @@ import TelegramUniversalVideoContent
 import ChatInterfaceState
 import FastBlur
 import ConfettiEffect
+import WallpaperBackgroundNode
 
 final class VideoNavigationControllerDropContentItem: NavigationControllerDropContentItem {
     let itemNode: OverlayMediaItemNode
@@ -55,227 +56,10 @@ private struct ChatControllerNodeDerivedLayoutState {
     var inputContextPanelsFrame: CGRect
     var inputContextPanelsOverMainPanelFrame: CGRect
     var inputNodeHeight: CGFloat?
+    var inputNodeAdditionalHeight: CGFloat?
     var upperInputPositionBound: CGFloat?
 }
 
-private final class ChatEmbeddedTitleContentNode: ASDisplayNode {
-    private let context: AccountContext
-    private let backgroundNode: ASDisplayNode
-    private let statusBarBackgroundNode: ASDisplayNode
-    private let videoNode: OverlayUniversalVideoNode
-    private let disableInternalAnimationIn: Bool
-    private let isUIHiddenUpdated: () -> Void
-    private let unembedWhenPortrait: (OverlayMediaItemNode) -> Bool
-    
-    private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)?
-    
-    private let dismissed: () -> Void
-    private let interactiveExtensionUpdated: (ContainedViewLayoutTransition) -> Void
-    
-    private(set) var interactiveExtension: CGFloat = 0.0
-    private var freezeInteractiveExtension = false
-    
-    private(set) var isUIHidden: Bool = false
-    
-    var unembedOnLeave: Bool = true
-    
-    init(context: AccountContext, videoNode: OverlayUniversalVideoNode, disableInternalAnimationIn: Bool, interactiveExtensionUpdated: @escaping (ContainedViewLayoutTransition) -> Void, dismissed: @escaping () -> Void, isUIHiddenUpdated: @escaping () -> Void, unembedWhenPortrait: @escaping (OverlayMediaItemNode) -> Bool) {
-        self.dismissed = dismissed
-        self.interactiveExtensionUpdated = interactiveExtensionUpdated
-        self.isUIHiddenUpdated = isUIHiddenUpdated
-        self.unembedWhenPortrait = unembedWhenPortrait
-        self.disableInternalAnimationIn = disableInternalAnimationIn
-        
-        self.context = context
-        
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.backgroundColor = .black
-        
-        self.statusBarBackgroundNode = ASDisplayNode()
-        self.statusBarBackgroundNode.backgroundColor = .black
-        
-        self.videoNode = videoNode
-        
-        super.init()
-        
-        self.clipsToBounds = true
-        
-        self.addSubnode(self.backgroundNode)
-        self.addSubnode(self.statusBarBackgroundNode)
-        
-        self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))))
-        
-        self.videoNode.controlsAreShowingUpdated = { [weak self] value in
-            guard let strongSelf = self else {
-                return
-            }
-            strongSelf.isUIHidden = !value
-            strongSelf.isUIHiddenUpdated()
-        }
-    }
-    
-    @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) {
-        switch recognizer.state {
-        case .began:
-            break
-        case .changed:
-            let translation = recognizer.translation(in: self.view)
-            
-            func rubberBandingOffset(offset: CGFloat, bandingStart: CGFloat) -> CGFloat {
-                let bandedOffset = offset - bandingStart
-                let range: CGFloat = 600.0
-                let coefficient: CGFloat = 0.4
-                return bandingStart + (1.0 - (1.0 / ((bandedOffset * coefficient / range) + 1.0))) * range
-            }
-            
-            let offset = rubberBandingOffset(offset: translation.y, bandingStart: 0.0)
-            
-            if translation.y > 80.0 {
-                self.freezeInteractiveExtension = true
-                self.expandIntoPiP()
-            } else {
-                self.interactiveExtension = max(0.0, offset)
-                self.interactiveExtensionUpdated(.immediate)
-            }
-        case .cancelled, .ended:
-            if !freezeInteractiveExtension {
-                self.interactiveExtension = 0.0
-                self.interactiveExtensionUpdated(.animated(duration: 0.3, curve: .spring))
-            }
-        default:
-            break
-        }
-    }
-    
-    func calculateHeight(width: CGFloat) -> CGFloat {
-        return self.videoNode.content.dimensions.aspectFilled(CGSize(width: width, height: 16.0)).height
-    }
-    
-    func updateLayout(size: CGSize, actualHeight: CGFloat, topInset: CGFloat, interactiveExtension: CGFloat, transition: ContainedViewLayoutTransition, transitionSurface: ASDisplayNode?, navigationBar: NavigationBar?) {
-        let isFirstTime = self.validLayout == nil
-        
-        self.validLayout = (size, actualHeight, topInset, interactiveExtension)
-        let videoSize = CGSize(width: size.width, height: actualHeight)
-        
-        let videoFrame = CGRect(origin: CGPoint(x: 0.0, y: topInset + interactiveExtension + floor((size.height - actualHeight) / 2.0)), size: CGSize(width: videoSize.width, height: videoSize.height - topInset - interactiveExtension))
-        
-        if isFirstTime, let transitionSurface = transitionSurface {
-            let sourceFrame = self.videoNode.view.convert(self.videoNode.bounds, to: transitionSurface.view)
-            let targetFrame = self.view.convert(videoFrame, to: transitionSurface.view)
-            
-            var navigationBarCopy: UIView?
-            var navigationBarContainer: UIView?
-            var nodeTransition = transition
-            if self.disableInternalAnimationIn {
-                nodeTransition = .immediate
-            } else {
-                self.context.sharedContext.mediaManager.setOverlayVideoNode(nil)
-                transitionSurface.addSubnode(self.videoNode)
-                
-                navigationBarCopy = navigationBar?.view.snapshotView(afterScreenUpdates: true)
-                let navigationBarContainerValue = UIView()
-                navigationBarContainer = navigationBarContainerValue
-                navigationBarContainerValue.frame = targetFrame
-                navigationBarContainerValue.clipsToBounds = true
-                transitionSurface.view.addSubview(navigationBarContainerValue)
-            }
-            
-            if !self.disableInternalAnimationIn {
-                navigationBarContainer?.layer.animateFrame(from: sourceFrame, to: targetFrame, duration: 0.25, timingFunction: kCAMediaTimingFunctionSpring)
-            }
-            
-            if !self.disableInternalAnimationIn {
-                if let navigationBar = navigationBar, let navigationBarCopy = navigationBarCopy {
-                    let navigationFrame = navigationBar.view.convert(navigationBar.bounds, to: transitionSurface.view)
-                    let navigationSourceFrame = navigationFrame.offsetBy(dx: -sourceFrame.minX, dy: -sourceFrame.minY)
-                    let navigationTargetFrame = navigationFrame.offsetBy(dx: -targetFrame.minX, dy: -targetFrame.minY)
-                    navigationBarCopy.frame = navigationTargetFrame
-                    navigationBarContainer?.addSubview(navigationBarCopy)
-                    
-                    navigationBarCopy.layer.animateFrame(from: navigationSourceFrame, to: navigationTargetFrame, duration: 0.25, timingFunction: kCAMediaTimingFunctionSpring)
-                    navigationBarCopy.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25, timingFunction: kCAMediaTimingFunctionSpring)
-                }
-            }
-            
-            self.videoNode.updateRoundCorners(false, transition: nodeTransition)
-            if !self.disableInternalAnimationIn {
-                self.videoNode.showControls()
-            }
-            
-            self.videoNode.updateLayout(targetFrame.size, transition: nodeTransition)
-            self.videoNode.frame = targetFrame
-            if self.disableInternalAnimationIn {
-                self.insertSubnode(self.videoNode, belowSubnode: self.statusBarBackgroundNode)
-            } else {
-                self.videoNode.layer.animateFrame(from: sourceFrame, to: targetFrame, duration: 0.25, timingFunction: kCAMediaTimingFunctionSpring, completion: { [weak self] _ in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    navigationBarContainer?.removeFromSuperview()
-                    strongSelf.insertSubnode(strongSelf.videoNode, belowSubnode: strongSelf.statusBarBackgroundNode)
-                    if let (size, actualHeight, topInset, interactiveExtension) = strongSelf.validLayout {
-                        strongSelf.updateLayout(size: size, actualHeight: actualHeight, topInset: topInset, interactiveExtension: interactiveExtension, transition: .immediate, transitionSurface: nil, navigationBar: nil)
-                    }
-                })
-                self.backgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-            }
-         
-            self.videoNode.customClose = { [weak self] in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.videoNode.customClose = nil
-                strongSelf.dismissed()
-            }
-        }
-        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size))
-        transition.updateFrame(node: self.statusBarBackgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: topInset)))
-        
-        if self.videoNode.supernode == self {
-            self.videoNode.layer.transform = CATransform3DIdentity
-            transition.updateFrame(node: self.videoNode, frame: videoFrame)
-        }
-    }
-    
-    func expand(intoLandscape: Bool) {
-        if intoLandscape {
-            let unembedWhenPortrait = self.unembedWhenPortrait
-            self.videoNode.customUnembedWhenPortrait = { videoNode in
-                unembedWhenPortrait(videoNode)
-            }
-        }
-        self.videoNode.expand()
-    }
-    
-    func expandIntoPiP() {
-        let transition: ContainedViewLayoutTransition = .animated(duration: 0.25, curve: .spring)
-        
-        self.videoNode.customExpand = nil
-        self.videoNode.customClose = nil
-        
-        let previousFrame = self.videoNode.frame
-        self.context.sharedContext.mediaManager.setOverlayVideoNode(self.videoNode)
-        self.videoNode.updateRoundCorners(true, transition: transition)
-        
-        if let targetSuperview = self.videoNode.view.superview {
-            let sourceFrame = self.view.convert(previousFrame, to: targetSuperview)
-            let targetFrame = self.videoNode.frame
-            self.videoNode.frame = sourceFrame
-            self.videoNode.updateLayout(sourceFrame.size, transition: .immediate)
-            
-            transition.updateFrame(node: self.videoNode, frame: targetFrame)
-            self.videoNode.updateLayout(targetFrame.size, transition: transition)
-        }
-        
-        self.dismissed()
-    }
-}
-
-enum ChatEmbeddedTitlePeekContent: Equatable {
-    case none
-    case peek
-}
-
 class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     let context: AccountContext
     let chatLocation: ChatLocation
@@ -283,8 +67,6 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private weak var controller: ChatControllerImpl?
     
     let navigationBar: NavigationBar?
-    private let navigationBarBackroundNode: ASDisplayNode
-    private let navigationBarSeparatorNode: ASDisplayNode
     
     private var backgroundEffectNode: ASDisplayNode?
     private var containerBackgroundNode: ASImageNode?
@@ -299,7 +81,6 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     }
     
     let backgroundNode: WallpaperBackgroundNode
-    let backgroundImageDisposable = MetaDisposable()
     let historyNode: ChatHistoryListNode
     var blurredHistoryNode: ASImageNode?
     let reactionContainerNode: ReactionSelectionParentNode
@@ -316,7 +97,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     
     private var searchNavigationNode: ChatSearchNavigationContentNode?
     
-    private let inputPanelBackgroundNode: ASDisplayNode
+    private let inputPanelBackgroundNode: NavigationBackgroundNode
     private let inputPanelBackgroundSeparatorNode: ASDisplayNode
     private var plainInputSeparatorAlpha: CGFloat?
     private var usePlainInputSeparator: Bool
@@ -329,7 +110,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var inputPanelNode: ChatInputPanelNode?
     private weak var currentDismissedInputPanelNode: ASDisplayNode?
     private var secondaryInputPanelNode: ChatInputPanelNode?
-    private var accessoryPanelNode: AccessoryPanelNode?
+    private(set) var accessoryPanelNode: AccessoryPanelNode?
     private var inputContextPanelNode: ChatInputContextPanelNode?
     private let inputContextPanelContainer: ChatControllerTitlePanelNodeContainer
     private var overlayContextPanelNode: ChatInputContextPanelNode?
@@ -337,12 +118,13 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var inputNode: ChatInputNode?
     private var disappearingNode: ChatInputNode?
     
-    private var textInputPanelNode: ChatTextInputPanelNode?
+    private(set) var textInputPanelNode: ChatTextInputPanelNode?
     private var inputMediaNode: ChatMediaInputNode?
     
     let navigateButtons: ChatHistoryNavigationButtons
     
     private var ignoreUpdateHeight = false
+    private var overrideUpdateTextInputHeightTransition: ContainedViewLayoutTransition?
     
     private var animateInAsOverlayCompletion: (() -> Void)?
     private var dismissAsOverlayCompletion: (() -> Void)?
@@ -377,14 +159,14 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
     }
     
-    var requestUpdateChatInterfaceState: (Bool, Bool, (ChatInterfaceState) -> ChatInterfaceState) -> Void = { _, _, _ in }
+    var requestUpdateChatInterfaceState: (ContainedViewLayoutTransition, Bool, (ChatInterfaceState) -> ChatInterfaceState) -> Void = { _, _, _ in }
     var requestUpdateInterfaceState: (ContainedViewLayoutTransition, Bool, (ChatPresentationInterfaceState) -> ChatPresentationInterfaceState) -> Void = { _, _, _ in }
     var sendMessages: ([EnqueueMessage], Bool?, Int32?, Bool) -> Void = { _, _, _, _ in }
     var displayAttachmentMenu: () -> Void = { }
     var paste: (ChatTextInputPanelPasteData) -> Void = { _ in }
     var updateTypingActivity: (Bool) -> Void = { _ in }
     var dismissUrlPreview: () -> Void = { }
-    var setupSendActionOnViewUpdate: (@escaping () -> Void) -> Void = { _ in }
+    var setupSendActionOnViewUpdate: (@escaping () -> Void, Int64?) -> Void = { _, _ in }
     var requestLayout: (ContainedViewLayoutTransition) -> Void = { _ in }
     var dismissAsOverlay: () -> Void = { }
     
@@ -393,6 +175,10 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var expandedInputDimNode: ASDisplayNode?
     
     private var dropDimNode: ASDisplayNode?
+
+    let messageTransitionNode: ChatMessageTransitionNode
+
+    private let presentationContextMarker = ASDisplayNode()
     
     private var containerLayoutAndNavigationBarHeight: (ContainerViewLayout, CGFloat)?
     
@@ -443,16 +229,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private var displayVideoUnmuteTipDisposable: Disposable?
     
     private var onLayoutCompletions: [(ContainedViewLayoutTransition) -> Void] = []
-    
-    private var embeddedTitlePeekContent: ChatEmbeddedTitlePeekContent = .none
-    private var embeddedTitleContentNode: ChatEmbeddedTitleContentNode?
-    private var dismissedEmbeddedTitleContentNode: ChatEmbeddedTitleContentNode?
-    var hasEmbeddedTitleContent: Bool {
-        return self.embeddedTitleContentNode != nil
-    }
-    private var didProcessExperimentalEmbedUrl: String?
-    
-    init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, subject: ChatControllerSubject?, controllerInteraction: ChatControllerInteraction, chatPresentationInterfaceState: ChatPresentationInterfaceState, automaticMediaDownloadSettings: MediaAutoDownloadSettings, navigationBar: NavigationBar?, controller: ChatControllerImpl?) {
+
+    init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, subject: ChatControllerSubject?, controllerInteraction: ChatControllerInteraction, chatPresentationInterfaceState: ChatPresentationInterfaceState, automaticMediaDownloadSettings: MediaAutoDownloadSettings, navigationBar: NavigationBar?, backgroundNode: WallpaperBackgroundNode, controller: ChatControllerImpl?) {
         self.context = context
         self.chatLocation = chatLocation
         self.controllerInteraction = controllerInteraction
@@ -461,33 +239,42 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.navigationBar = navigationBar
         self.controller = controller
         
-        self.backgroundNode = WallpaperBackgroundNode()
-        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode = backgroundNode
         
         self.titleAccessoryPanelContainer = ChatControllerTitlePanelNodeContainer()
         self.titleAccessoryPanelContainer.clipsToBounds = true
         
         self.inputContextPanelContainer = ChatControllerTitlePanelNodeContainer()
-        
-        self.historyNode = ChatHistoryListNode(context: context, chatLocation: chatLocation, chatLocationContextHolder: chatLocationContextHolder, tagMask: nil, subject: subject, controllerInteraction: controllerInteraction, selectedMessages: self.selectedMessagesPromise.get())
+
+        var getMessageTransitionNode: (() -> ChatMessageTransitionNode?)?
+        self.historyNode = ChatHistoryListNode(context: context, chatLocation: chatLocation, chatLocationContextHolder: chatLocationContextHolder, tagMask: nil, subject: subject, controllerInteraction: controllerInteraction, selectedMessages: self.selectedMessagesPromise.get(), messageTransitionNode: {
+            return getMessageTransitionNode?()
+        })
         self.historyNode.rotated = true
         self.historyNodeContainer = ASDisplayNode()
         self.historyNodeContainer.addSubnode(self.historyNode)
+
+        var getContentAreaInScreenSpaceImpl: (() -> CGRect)?
+        var onTransitionEventImpl: ((ContainedViewLayoutTransition) -> Void)?
+        self.messageTransitionNode = ChatMessageTransitionNode(listNode: self.historyNode, getContentAreaInScreenSpace: {
+            return getContentAreaInScreenSpaceImpl?() ?? CGRect()
+        }, onTransitionEvent: { transition in
+            onTransitionEventImpl?(transition)
+        })
         
         self.reactionContainerNode = ReactionSelectionParentNode(account: context.account, theme: chatPresentationInterfaceState.theme)
         
         self.loadingNode = ChatLoadingNode(theme: self.chatPresentationInterfaceState.theme, chatWallpaper: self.chatPresentationInterfaceState.chatWallpaper, bubbleCorners: self.chatPresentationInterfaceState.bubbleCorners)
-        
-        self.inputPanelBackgroundNode = ASDisplayNode()
+
         if case let .color(color) = self.chatPresentationInterfaceState.chatWallpaper, UIColor(rgb: color).isEqual(self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper) {
-            self.inputPanelBackgroundNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper
+            self.inputPanelBackgroundNode = NavigationBackgroundNode(color: self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper)
             self.usePlainInputSeparator = true
         } else {
-            self.inputPanelBackgroundNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColor
+            self.inputPanelBackgroundNode = NavigationBackgroundNode(color: self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColor)
             self.usePlainInputSeparator = false
             self.plainInputSeparatorAlpha = nil
         }
-        self.inputPanelBackgroundNode.isLayerBacked = true
+        self.inputPanelBackgroundNode.isUserInteractionEnabled = false
         
         self.inputPanelBackgroundSeparatorNode = ASDisplayNode()
         self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelSeparatorColor
@@ -496,19 +283,35 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.navigateButtons = ChatHistoryNavigationButtons(theme: self.chatPresentationInterfaceState.theme, dateTimeFormat: self.chatPresentationInterfaceState.dateTimeFormat)
         self.navigateButtons.accessibilityElementsHidden = true
         
-        self.navigationBarBackroundNode = ASDisplayNode()
-        self.navigationBarBackroundNode.backgroundColor = chatPresentationInterfaceState.theme.rootController.navigationBar.backgroundColor
-        
-        self.navigationBarSeparatorNode = ASDisplayNode()
-        self.navigationBarSeparatorNode.backgroundColor = chatPresentationInterfaceState.theme.rootController.navigationBar.separatorColor
-        
         super.init()
+
+        getContentAreaInScreenSpaceImpl = { [weak self] in
+            guard let strongSelf = self else {
+                return CGRect()
+            }
+
+            return strongSelf.view.convert(strongSelf.frameForVisibleArea(), to: nil)
+        }
+
+        onTransitionEventImpl = { [weak self] transition in
+            guard let strongSelf = self else {
+                return
+            }
+            if (strongSelf.context.sharedContext.currentPresentationData.with({ $0 })).reduceMotion {
+                return
+            }
+            strongSelf.backgroundNode.animateEvent(transition: transition)
+        }
+
+        getMessageTransitionNode = { [weak self] in
+            return self?.messageTransitionNode
+        }
         
         self.controller?.presentationContext.topLevelSubview = { [weak self] in
             guard let strongSelf = self else {
                 return nil
             }
-            return strongSelf.titleAccessoryPanelContainer.view
+            return strongSelf.presentationContextMarker.view
         }
         
         self.setViewBlock({
@@ -554,12 +357,6 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             }
         }
         
-        self.backgroundImageDisposable.set(chatControllerBackgroundImageSignal(wallpaper: chatPresentationInterfaceState.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, accountMediaBox: context.account.postbox.mediaBox).start(next: { [weak self] image in
-            if let strongSelf = self, let (image, _) = image {
-                strongSelf.backgroundNode.image = image
-            }
-        }))
-        
         self.interactiveEmojisDisposable = (self.context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration])
         |> map { preferencesView -> InteractiveEmojiConfiguration in
             let appConfiguration: AppConfiguration = preferencesView.values[PreferencesKeys.appConfiguration] as? AppConfiguration ?? .defaultValue
@@ -570,33 +367,52 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 strongSelf.interactiveEmojis = emojis
             }
         })
-        
-        if case .gradient = chatPresentationInterfaceState.chatWallpaper {
-            self.backgroundNode.imageContentMode = .scaleToFill
-        } else {
-            self.backgroundNode.imageContentMode = .scaleAspectFill
-        }
-        self.backgroundNode.motionEnabled = chatPresentationInterfaceState.chatWallpaper.settings?.motion ?? false
 
-        self.historyNode.verticalScrollIndicatorColor = UIColor(white: 0.5, alpha: 0.8)
+        self.backgroundNode.update(wallpaper: chatPresentationInterfaceState.chatWallpaper)
+        self.backgroundNode.updateBubbleTheme(bubbleTheme: chatPresentationInterfaceState.theme, bubbleCorners: chatPresentationInterfaceState.bubbleCorners)
+
+        var backgroundColors: [UInt32] = []
+        switch chatPresentationInterfaceState.chatWallpaper {
+        case let .file(_, _, _, _, isPattern, _, _, _, settings):
+            if isPattern {
+                backgroundColors = settings.colors
+            }
+        case let .gradient(_, colors, _):
+            backgroundColors = colors
+        case let .color(color):
+            backgroundColors = [color]
+        default:
+            break
+        }
+        if !backgroundColors.isEmpty {
+            let averageColor = UIColor.average(of: backgroundColors.map(UIColor.init(rgb:)))
+            if averageColor.hsb.b >= 0.3 {
+                self.historyNode.verticalScrollIndicatorColor = UIColor(white: 0.0, alpha: 0.3)
+            } else {
+                self.historyNode.verticalScrollIndicatorColor = UIColor(white: 1.0, alpha: 0.3)
+            }
+        } else {
+            self.historyNode.verticalScrollIndicatorColor = UIColor(white: 0.5, alpha: 0.8)
+        }
         self.historyNode.enableExtractedBackgrounds = true
     
         self.addSubnode(self.backgroundNode)
         self.addSubnode(self.historyNodeContainer)
         self.addSubnode(self.navigateButtons)
-        self.addSubnode(self.titleAccessoryPanelContainer)
-        
+
         self.addSubnode(self.inputPanelBackgroundNode)
         self.addSubnode(self.inputPanelBackgroundSeparatorNode)
-        
+
         self.addSubnode(self.inputContextPanelContainer)
-                
-        self.addSubnode(self.navigationBarBackroundNode)
-        self.addSubnode(self.navigationBarSeparatorNode)
-        if !self.context.sharedContext.immediateExperimentalUISettings.playerEmbedding {
-            self.navigationBarBackroundNode.isHidden = true
-            self.navigationBarSeparatorNode.isHidden = true
+
+        if let navigationBar = self.navigationBar {
+            self.addSubnode(navigationBar)
         }
+
+        self.addSubnode(self.messageTransitionNode)
+        self.addSubnode(self.presentationContextMarker)
+
+        self.navigationBar?.additionalContentNode.addSubnode(self.titleAccessoryPanelContainer)
         
         self.historyNode.view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
         
@@ -607,7 +423,15 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.textInputPanelNode?.updateHeight = { [weak self] animated in
             if let strongSelf = self, let _ = strongSelf.inputPanelNode as? ChatTextInputPanelNode, !strongSelf.ignoreUpdateHeight {
                 if strongSelf.scheduledLayoutTransitionRequest == nil {
-                    strongSelf.scheduleLayoutTransitionRequest(animated ? .animated(duration: 0.1, curve: .easeInOut) : .immediate)
+                    let transition: ContainedViewLayoutTransition
+                    if !animated {
+                        transition = .immediate
+                    } else if let overrideUpdateTextInputHeightTransition = strongSelf.overrideUpdateTextInputHeightTransition {
+                        transition = overrideUpdateTextInputHeightTransition
+                    } else {
+                        transition = .animated(duration: 0.1, curve: .easeInOut)
+                    }
+                    strongSelf.scheduleLayoutTransitionRequest(transition)
                 }
             }
         }
@@ -634,7 +458,6 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     }
     
     deinit {
-        self.backgroundImageDisposable.dispose()
         self.interactiveEmojisDisposable?.dispose()
         self.openStickersDisposable?.dispose()
         self.displayVideoUnmuteTipDisposable?.dispose()
@@ -721,7 +544,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     private func updateIsEmpty(_ emptyType: ChatHistoryNodeLoadState.EmptyType?, animated: Bool) {
         self.emptyType = emptyType
         if let emptyType = emptyType, self.emptyNode == nil {
-            let emptyNode = ChatEmptyNode(account: self.context.account, interaction: self.interfaceInteraction)
+            let emptyNode = ChatEmptyNode(context: self.context, interaction: self.interfaceInteraction)
             if let (size, insets) = self.validEmptyNodeLayout {
                 emptyNode.updateLayout(interfaceState: self.chatPresentationInterfaceState, emptyType: emptyType, size: size, insets: insets, transition: .immediate)
             }
@@ -743,37 +566,27 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
     }
     
-    var greetingStickerNode: (ASDisplayNode, ASDisplayNode, ASDisplayNode, (@escaping () -> Void) -> Void)? {
-        if let greetingStickerNode = self.emptyNode?.greetingStickerNode {
-            let historyNode = self.historyNode
-            historyNode.alpha = 0.0
-            return (greetingStickerNode, self, self.historyNode, { completion in
-                historyNode.alpha = 1.0
-                historyNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, completion: { _ in
-                    completion()
-                })
-            })
-        } else {
-            return nil
-        }
-    }
-    
     private var isInFocus: Bool = false
-    
     func inFocusUpdated(isInFocus: Bool) {
         self.isInFocus = isInFocus
         
         self.inputMediaNode?.simulateUpdateLayout(isVisible: isInFocus)
     }
     
-    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition protoTransition: ContainedViewLayoutTransition, listViewTransaction:
-        (ListViewUpdateSizeAndInsets, CGFloat, Bool, @escaping () -> Void) -> Void) {
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, transition protoTransition: ContainedViewLayoutTransition, listViewTransaction: (ListViewUpdateSizeAndInsets, CGFloat, Bool, @escaping () -> Void) -> Void, updateExtraNavigationBarBackgroundHeight: (CGFloat) -> Void) {
         let transition: ContainedViewLayoutTransition
         if let _ = self.scheduledAnimateInAsOverlayFromNode {
             transition = .immediate
         } else {
             transition = protoTransition
         }
+
+        var previousListBottomInset: CGFloat?
+        if !self.historyNode.frame.isEmpty {
+            previousListBottomInset = self.historyNode.insets.top
+        }
+
+        self.messageTransitionNode.frame = CGRect(origin: CGPoint(), size: layout.size)
         
         self.scheduledLayoutTransitionRequest = nil
         if case .overlay = self.chatPresentationInterfaceState.mode {
@@ -907,6 +720,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         var dismissedTitleAccessoryPanelNode: ChatTitleAccessoryPanelNode?
         var immediatelyLayoutTitleAccessoryPanelNodeAndAnimateAppearance = false
         var titleAccessoryPanelHeight: CGFloat?
+        var titleAccessoryPanelBackgroundHeight: CGFloat?
         if let titleAccessoryPanelNode = titlePanelForChatPresentationInterfaceState(self.chatPresentationInterfaceState, context: self.context, currentPanel: self.titleAccessoryPanelNode, interfaceInteraction: self.interfaceInteraction) {
             if self.titleAccessoryPanelNode != titleAccessoryPanelNode {
                  dismissedTitleAccessoryPanelNode = self.titleAccessoryPanelNode
@@ -915,7 +729,9 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 self.titleAccessoryPanelContainer.addSubnode(titleAccessoryPanelNode)
             }
             
-            titleAccessoryPanelHeight = titleAccessoryPanelNode.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: immediatelyLayoutTitleAccessoryPanelNodeAndAnimateAppearance ? .immediate : transition, interfaceState: self.chatPresentationInterfaceState)
+            let layoutResult = titleAccessoryPanelNode.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, transition: immediatelyLayoutTitleAccessoryPanelNodeAndAnimateAppearance ? .immediate : transition, interfaceState: self.chatPresentationInterfaceState)
+            titleAccessoryPanelHeight = layoutResult.insetHeight
+            titleAccessoryPanelBackgroundHeight = layoutResult.backgroundHeight
         } else if let titleAccessoryPanelNode = self.titleAccessoryPanelNode {
             dismissedTitleAccessoryPanelNode = titleAccessoryPanelNode
             self.titleAccessoryPanelNode = nil
@@ -951,7 +767,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             inputPanelNodeBaseHeight += secondaryInputPanelNode.minimalHeight(interfaceState: self.chatPresentationInterfaceState, metrics: layout.metrics)
         }
         
-        let maximumInputNodeHeight = layout.size.height - max(navigationBarHeight, layout.safeInsets.top) - inputPanelNodeBaseHeight
+        let maximumInputNodeHeight = layout.size.height - max(navigationBarHeight + (titleAccessoryPanelBackgroundHeight ?? 0.0), layout.safeInsets.top) - inputPanelNodeBaseHeight
         
         var dismissedInputNode: ChatInputNode?
         var immediatelyLayoutInputNodeAndAnimateAppearance = false
@@ -1007,135 +823,13 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         let statusBarHeight = layout.insets(options: [.statusBar]).top
         
-        func extractExperimentalPlaylistUrl(_ text: String) -> String? {
-            let prefix = "stream: "
-            if text.hasPrefix(prefix) {
-                if let url = URL(string: String(text[text.index(text.startIndex, offsetBy: prefix.count)...])), url.absoluteString.hasSuffix(".m3u8") {
-                    return url.absoluteString
-                } else {
-                    return nil
-                }
-            } else {
-                return nil
-            }
-        }
-        
-        if let pinnedMessage = self.chatPresentationInterfaceState.pinnedMessage, self.context.sharedContext.immediateExperimentalUISettings.playerEmbedding, self.context.sharedContext.immediateExperimentalUISettings.playlistPlayback, self.embeddedTitleContentNode == nil, let url = extractExperimentalPlaylistUrl(pinnedMessage.message.text), self.didProcessExperimentalEmbedUrl != url {
-            self.didProcessExperimentalEmbedUrl = url
-            let context = self.context
-            let baseNavigationController = self.controller?.navigationController as? NavigationController
-            let mediaManager = self.context.sharedContext.mediaManager
-            var expandImpl: (() -> Void)?
-            let content = PlatformVideoContent(id: .instantPage(MediaId(namespace: 0, id: 0), MediaId(namespace: 0, id: 0)), content: .url(url), streamVideo: true, loopVideo: false)
-            let overlayNode = OverlayUniversalVideoNode(postbox: self.context.account.postbox, audioSession: self.context.sharedContext.mediaManager.audioSession, manager: self.context.sharedContext.mediaManager.universalVideoManager, content: content, expand: {
-                expandImpl?()
-            }, close: { [weak mediaManager] in
-                mediaManager?.setOverlayVideoNode(nil)
-            })
-            self.embeddedTitleContentNode = ChatEmbeddedTitleContentNode(context: self.context, videoNode: overlayNode, disableInternalAnimationIn: true, interactiveExtensionUpdated: { [weak self] transition in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.requestLayout(transition)
-            }, dismissed: { [weak self] in
-                guard let strongSelf = self else {
-                    return
-                }
-                if let embeddedTitleContentNode = strongSelf.embeddedTitleContentNode {
-                    strongSelf.embeddedTitleContentNode = nil
-                    strongSelf.dismissedEmbeddedTitleContentNode = embeddedTitleContentNode
-                    strongSelf.requestLayout(.animated(duration: 0.25, curve: .spring))
-                    strongSelf.updateHasEmbeddedTitleContent?()
-                }
-            }, isUIHiddenUpdated: { [weak self] in
-                self?.updateHasEmbeddedTitleContent?()
-            }, unembedWhenPortrait: { [weak self] itemNode in
-                guard let strongSelf = self, let itemNode = itemNode as? OverlayUniversalVideoNode else {
-                    return false
-                }
-                strongSelf.unembedWhenPortrait(contentNode: itemNode)
-                return true
-            })
-            self.embeddedTitleContentNode?.unembedOnLeave = false
-            self.updateHasEmbeddedTitleContent?()
-            overlayNode.controlPlay()
-        }
-        
-        if self.chatPresentationInterfaceState.pinnedMessage == nil {
-            self.didProcessExperimentalEmbedUrl = nil
-        }
-        
-        if let embeddedTitleContentNode = self.embeddedTitleContentNode, embeddedTitleContentNode.supernode != nil {
-            if layout.size.width > layout.size.height {
-                self.embeddedTitleContentNode = nil
-                self.dismissedEmbeddedTitleContentNode = embeddedTitleContentNode
-                embeddedTitleContentNode.expand(intoLandscape: true)
-                self.updateHasEmbeddedTitleContent?()
-            }
-        }
-        
-        if let embeddedTitleContentNode = self.embeddedTitleContentNode {
-            let defaultEmbeddedSize = CGSize(width: layout.size.width, height: min(400.0, embeddedTitleContentNode.calculateHeight(width: layout.size.width)) + statusBarHeight + embeddedTitleContentNode.interactiveExtension)
-            
-            let embeddedSize: CGSize
-            if let inputHeight = layout.inputHeight, inputHeight > 100.0 {
-                embeddedSize = CGSize(width: defaultEmbeddedSize.width, height: floor(defaultEmbeddedSize.height * 0.6))
-            } else {
-                embeddedSize = defaultEmbeddedSize
-            }
-            
-            if embeddedTitleContentNode.supernode == nil {
-                self.insertSubnode(embeddedTitleContentNode, aboveSubnode: self.navigationBarBackroundNode)
-                
-                var previousTopInset = insets.top
-                if case .overlay = self.chatPresentationInterfaceState.mode {
-                    previousTopInset = 44.0
-                } else {
-                    previousTopInset += navigationBarHeight
-                }
-                
-                if case .peek = self.embeddedTitlePeekContent {
-                    previousTopInset += 32.0
-                }
-                
-                embeddedTitleContentNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: previousTopInset))
-                transition.updateFrame(node: embeddedTitleContentNode, frame: CGRect(origin: CGPoint(), size: embeddedSize))
-                embeddedTitleContentNode.updateLayout(size: embeddedSize, actualHeight: defaultEmbeddedSize.height, topInset: statusBarHeight, interactiveExtension: embeddedTitleContentNode.interactiveExtension, transition: .immediate, transitionSurface: self, navigationBar: self.navigationBar)
-            } else {
-                transition.updateFrame(node: embeddedTitleContentNode, frame: CGRect(origin: CGPoint(), size: embeddedSize))
-                embeddedTitleContentNode.updateLayout(size: embeddedSize, actualHeight: defaultEmbeddedSize.height, topInset: statusBarHeight, interactiveExtension: embeddedTitleContentNode.interactiveExtension, transition: transition, transitionSurface: self, navigationBar: self.navigationBar)
-            }
-            
-            insets.top += embeddedSize.height
+
+        if case .overlay = self.chatPresentationInterfaceState.mode {
+            insets.top = 44.0
         } else {
-            if case .overlay = self.chatPresentationInterfaceState.mode {
-                insets.top = 44.0
-            } else {
-                insets.top += navigationBarHeight
-            }
-            
-            if case .peek = self.embeddedTitlePeekContent {
-                insets.top += 32.0
-            }
+            insets.top += navigationBarHeight
         }
         
-        if let dismissedEmbeddedTitleContentNode = self.dismissedEmbeddedTitleContentNode {
-            self.dismissedEmbeddedTitleContentNode = nil
-            if transition.isAnimated {
-                dismissedEmbeddedTitleContentNode.alpha = 0.0
-                dismissedEmbeddedTitleContentNode.layer.allowsGroupOpacity = true
-                dismissedEmbeddedTitleContentNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, completion: { [weak dismissedEmbeddedTitleContentNode] _ in
-                    dismissedEmbeddedTitleContentNode?.removeFromSupernode()
-                })
-                transition.updateFrame(node: dismissedEmbeddedTitleContentNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: insets.top)))
-            } else {
-                dismissedEmbeddedTitleContentNode.removeFromSupernode()
-            }
-        }
-        
-        transition.updateFrame(node: self.navigationBarBackroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: insets.top)))
-        transition.updateFrame(node: self.navigationBarSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
-        
         var wrappingInsets = UIEdgeInsets()
         if case .overlay = self.chatPresentationInterfaceState.mode {
             let containerWidth = horizontalContainerFillingSizeForLayout(layout: layout, sideInset: 8.0 + layout.safeInsets.left)
@@ -1150,7 +844,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         var dismissedInputPanelNode: ASDisplayNode?
         var dismissedSecondaryInputPanelNode: ASDisplayNode?
-        var dismissedAccessoryPanelNode: ASDisplayNode?
+        var dismissedAccessoryPanelNode: AccessoryPanelNode?
         var dismissedInputContextPanelNode: ChatInputContextPanelNode?
         var dismissedOverlayContextPanelNode: ChatInputContextPanelNode?
         
@@ -1201,7 +895,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                     self.insertSubnode(inputPanelNode, aboveSubnode: self.inputPanelBackgroundNode)
                 }
             } else {
-                let inputPanelHeight = inputPanelNode.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, additionalSideInsets: layout.additionalInsets, maxHeight: layout.size.height - insets.top - insets.bottom, isSecondary: false, transition: transition, interfaceState: self.chatPresentationInterfaceState, metrics: layout.metrics)
+                let inputPanelHeight = inputPanelNode.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, additionalSideInsets: layout.additionalInsets, maxHeight: layout.size.height - insets.top - insets.bottom - 120.0, isSecondary: false, transition: transition, interfaceState: self.chatPresentationInterfaceState, metrics: layout.metrics)
                 inputPanelSize = CGSize(width: layout.size.width, height: inputPanelHeight)
             }
         } else {
@@ -1241,6 +935,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             titleAccessoryPanelFrame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: layout.size.width, height: panelHeight))
             insets.top += panelHeight
         }
+
+        updateExtraNavigationBarBackgroundHeight(titleAccessoryPanelBackgroundHeight ?? 0.0)
         
         var importStatusPanelFrame: CGRect?
         if let _ = self.chatImportStatusPanel, let panelHeight = importStatusPanelHeight {
@@ -1256,6 +952,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         transition.updateFrame(node: self.backgroundNode, frame: contentBounds)
         self.backgroundNode.updateLayout(size: contentBounds.size, transition: transition)
+
         transition.updateFrame(node: self.historyNodeContainer, frame: contentBounds)
         transition.updateBounds(node: self.historyNode, bounds: CGRect(origin: CGPoint(), size: contentBounds.size))
         transition.updatePosition(node: self.historyNode, position: CGPoint(x: contentBounds.size.width / 2.0, y: contentBounds.size.height / 2.0))
@@ -1286,15 +983,15 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 if let inputPanelNode = self.inputPanelNode {
                     self.insertSubnode(accessoryPanelNode, belowSubnode: inputPanelNode)
                 } else {
-                    self.insertSubnode(accessoryPanelNode, aboveSubnode: self.navigateButtons)
+                    self.insertSubnode(accessoryPanelNode, aboveSubnode: self.inputPanelBackgroundNode)
                 }
                 
                 accessoryPanelNode.dismiss = { [weak self, weak accessoryPanelNode] in
                     if let strongSelf = self, let accessoryPanelNode = accessoryPanelNode, strongSelf.accessoryPanelNode === accessoryPanelNode {
                         if let _ = accessoryPanelNode as? ReplyAccessoryPanelNode {
-                            strongSelf.requestUpdateChatInterfaceState(true, false, { $0.withUpdatedReplyMessageId(nil) })
+                            strongSelf.requestUpdateChatInterfaceState(.animated(duration: 0.4, curve: .spring), false, { $0.withUpdatedReplyMessageId(nil) })
                         } else if let _ = accessoryPanelNode as? ForwardAccessoryPanelNode {
-                            strongSelf.requestUpdateChatInterfaceState(true, false, { $0.withUpdatedForwardMessageIds(nil) })
+                            strongSelf.requestUpdateChatInterfaceState(.animated(duration: 0.4, curve: .spring), false, { $0.withUpdatedForwardMessageIds(nil) })
                         } else if let _ = accessoryPanelNode as? EditAccessoryPanelNode {
                             strongSelf.interfaceInteraction?.setupEditMessage(nil, { _ in })
                         } else if let _ = accessoryPanelNode as? WebpagePreviewAccessoryPanelNode {
@@ -1534,7 +1231,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
         
         var apparentInputPanelFrame = inputPanelFrame
-        var apparentSecondaryInputPanelFrame = secondaryInputPanelFrame
+        let apparentSecondaryInputPanelFrame = secondaryInputPanelFrame
         var apparentInputBackgroundFrame = inputBackgroundFrame
         var apparentNavigateButtonsFrame = navigateButtonsFrame
         if case let .media(_, maybeExpanded) = self.chatPresentationInterfaceState.inputMode, let expanded = maybeExpanded, case .search = expanded, let inputPanelFrame = inputPanelFrame {
@@ -1551,6 +1248,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         
         let previousInputPanelBackgroundFrame = self.inputPanelBackgroundNode.frame
         transition.updateFrame(node: self.inputPanelBackgroundNode, frame: apparentInputBackgroundFrame)
+        self.inputPanelBackgroundNode.update(size: CGSize(width: apparentInputBackgroundFrame.size.width, height: apparentInputBackgroundFrame.size.height + 41.0 + 31.0), transition: transition)
         transition.updateFrame(node: self.inputPanelBackgroundSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: apparentInputBackgroundFrame.origin.y), size: CGSize(width: apparentInputBackgroundFrame.size.width, height: UIScreenPixel)))
         transition.updateFrame(node: self.navigateButtons, frame: apparentNavigateButtonsFrame)
         
@@ -1743,6 +1441,9 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             if let inputPanelFrame = inputPanelFrame {
                 transitionTargetY = inputPanelFrame.minY
             }
+
+            dismissedAccessoryPanelNode.originalFrameBeforeDismissed = dismissedAccessoryPanelNode.frame
+
             transition.updateFrame(node: dismissedAccessoryPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: transitionTargetY), size: dismissedAccessoryPanelNode.frame.size), completion: { _ in
                 frameCompleted = true
                 completed()
@@ -1863,8 +1564,19 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
         
         self.updatePlainInputSeparator(transition: transition)
-        
-        self.derivedLayoutState = ChatControllerNodeDerivedLayoutState(inputContextPanelsFrame: inputContextPanelsFrame, inputContextPanelsOverMainPanelFrame: inputContextPanelsOverMainPanelFrame, inputNodeHeight: inputNodeHeightAndOverflow?.0, upperInputPositionBound: inputNodeHeightAndOverflow?.0 != nil ? self.upperInputPositionBound : nil)
+
+        let listBottomInset = self.historyNode.insets.top
+        if let previousListBottomInset = previousListBottomInset, listBottomInset != previousListBottomInset {
+            if abs(listBottomInset - previousListBottomInset) > 80.0 {
+                if (self.context.sharedContext.currentPresentationData.with({ $0 })).reduceMotion {
+                    return
+                }
+                self.backgroundNode.animateEvent(transition: transition)
+            }
+            //self.historyNode.didScrollWithOffset?(listBottomInset - previousListBottomInset, transition, nil)
+        }
+
+        self.derivedLayoutState = ChatControllerNodeDerivedLayoutState(inputContextPanelsFrame: inputContextPanelsFrame, inputContextPanelsOverMainPanelFrame: inputContextPanelsOverMainPanelFrame, inputNodeHeight: inputNodeHeightAndOverflow?.0, inputNodeAdditionalHeight: inputNodeHeightAndOverflow?.1, upperInputPositionBound: inputNodeHeightAndOverflow?.0 != nil ? self.upperInputPositionBound : nil)
         
         //self.notifyTransitionCompletionListeners(transition: transition)
     }
@@ -1905,18 +1617,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             let themeUpdated = self.chatPresentationInterfaceState.theme !== chatPresentationInterfaceState.theme
             
             if self.chatPresentationInterfaceState.chatWallpaper != chatPresentationInterfaceState.chatWallpaper {
-                self.backgroundImageDisposable.set(chatControllerBackgroundImageSignal(wallpaper: chatPresentationInterfaceState.chatWallpaper, mediaBox: self.context.sharedContext.accountManager.mediaBox, accountMediaBox: self.context.account.postbox.mediaBox).start(next: { [weak self] image in
-                    if let strongSelf = self, let (image, final) = image {
-                        strongSelf.backgroundNode.image = image
-                    }
-                }))
-                self.backgroundNode.image = chatControllerBackgroundImage(theme: chatPresentationInterfaceState.theme, wallpaper: chatPresentationInterfaceState.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: self.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper)
-                if case .gradient = chatPresentationInterfaceState.chatWallpaper {
-                    self.backgroundNode.imageContentMode = .scaleToFill
-                } else {
-                    self.backgroundNode.imageContentMode = .scaleAspectFill
-                }
-                self.backgroundNode.motionEnabled = chatPresentationInterfaceState.chatWallpaper.settings?.motion ?? false
+                self.backgroundNode.update(wallpaper: chatPresentationInterfaceState.chatWallpaper)
             }
             
             self.historyNode.verticalScrollIndicatorColor = UIColor(white: 0.5, alpha: 0.8)
@@ -1929,18 +1630,17 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             
             if themeUpdated {
                 if case let .color(color) = self.chatPresentationInterfaceState.chatWallpaper, UIColor(rgb: color).isEqual(self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper) {
-                    self.inputPanelBackgroundNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper
+                    self.inputPanelBackgroundNode.updateColor(color: self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper, transition: .immediate)
                     self.usePlainInputSeparator = true
                 } else {
-                    self.inputPanelBackgroundNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColor
+                    self.inputPanelBackgroundNode.updateColor(color: self.chatPresentationInterfaceState.theme.chat.inputPanel.panelBackgroundColor, transition: .immediate)
                     self.usePlainInputSeparator = false
                     self.plainInputSeparatorAlpha = nil
                 }
                 self.updatePlainInputSeparator(transition: .immediate)
                 self.inputPanelBackgroundSeparatorNode.backgroundColor = self.chatPresentationInterfaceState.theme.chat.inputPanel.panelSeparatorColor
-                
-                self.navigationBarBackroundNode.backgroundColor = chatPresentationInterfaceState.theme.rootController.navigationBar.backgroundColor
-                self.navigationBarSeparatorNode.backgroundColor = chatPresentationInterfaceState.theme.rootController.navigationBar.separatorColor
+
+                self.backgroundNode.updateBubbleTheme(bubbleTheme: chatPresentationInterfaceState.theme, bubbleCorners: chatPresentationInterfaceState.bubbleCorners)
             }
             
             let keepSendButtonEnabled = chatPresentationInterfaceState.interfaceState.forwardMessageIds != nil || chatPresentationInterfaceState.interfaceState.editMessage != nil
@@ -1953,7 +1653,10 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
             }
             
             if let textInputPanelNode = self.textInputPanelNode, updateInputTextState {
+                let previous = self.overrideUpdateTextInputHeightTransition
+                self.overrideUpdateTextInputHeightTransition = transition
                 textInputPanelNode.updateInputTextState(chatPresentationInterfaceState.interfaceState.effectiveInputState, keepSendButtonEnabled: keepSendButtonEnabled, extendedSearchLayout: extendedSearchLayout, accessoryItems: chatPresentationInterfaceState.inputTextPanelState.accessoryItems, animated: transition.isAnimated)
+                self.overrideUpdateTextInputHeightTransition = previous
             } else {
                 self.textInputPanelNode?.updateKeepSendButtonEnabled(keepSendButtonEnabled: keepSendButtonEnabled, extendedSearchLayout: extendedSearchLayout, animated: transition.isAnimated)
             }
@@ -2208,7 +1911,10 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     }
     
     func frameForVisibleArea() -> CGRect {
-        let rect = CGRect(origin: CGPoint(x: self.visibleAreaInset.left, y: self.visibleAreaInset.top), size: CGSize(width: self.bounds.size.width - self.visibleAreaInset.left - self.visibleAreaInset.right, height: self.bounds.size.height - self.visibleAreaInset.top - self.visibleAreaInset.bottom))
+        var rect = CGRect(origin: CGPoint(x: self.visibleAreaInset.left, y: self.visibleAreaInset.top), size: CGSize(width: self.bounds.size.width - self.visibleAreaInset.left - self.visibleAreaInset.right, height: self.bounds.size.height - self.visibleAreaInset.top - self.visibleAreaInset.bottom))
+        if let inputContextPanelNode = self.inputContextPanelNode, let topItemFrame = inputContextPanelNode.topItemFrame {
+            rect.size.height = topItemFrame.minY
+        }
         if let containerNode = self.containerNode {
             return containerNode.view.convert(rect, to: self.view)
         } else {
@@ -2468,6 +2174,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         if let (layout, navigationHeight) = self.validLayout {
             self.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, transition: transition, listViewTransaction: { updateSizeAndInsets, additionalScrollDistance, scrollToTop, completion in
                 self.historyNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets, additionalScrollDistance: additionalScrollDistance, scrollToTop: scrollToTop, completion: completion)
+            }, updateExtraNavigationBarBackgroundHeight: { _ in
             })
         }
     }
@@ -2569,8 +2276,8 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
     
     func sendCurrentMessage(silentPosting: Bool? = nil, scheduleTime: Int32? = nil, completion: @escaping () -> Void = {}) {
         if let textInputPanelNode = self.inputPanelNode as? ChatTextInputPanelNode {
-            if textInputPanelNode.textInputNode?.isFirstResponder() ?? false {
-                Keyboard.applyAutocorrection()
+            if let textInputNode = textInputPanelNode.textInputNode, textInputNode.isFirstResponder() {
+                Keyboard.applyAutocorrection(textView: textInputNode.textView)
             }
             
             var effectivePresentationInterfaceState = self.chatPresentationInterfaceState
@@ -2607,7 +2314,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 let trimmedInputText = effectiveInputText.string.trimmingCharacters(in: .whitespacesAndNewlines)
                 let peerId = effectivePresentationInterfaceState.chatLocation.peerId
                 if peerId.namespace != Namespaces.Peer.SecretChat, let interactiveEmojis = self.interactiveEmojis, interactiveEmojis.emojis.contains(trimmedInputText) {
-                    messages.append(.message(text: "", attributes: [], mediaReference: AnyMediaReference.standalone(media: TelegramMediaDice(emoji: trimmedInputText)), replyToMessageId: self.chatPresentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil))
+                    messages.append(.message(text: "", attributes: [], mediaReference: AnyMediaReference.standalone(media: TelegramMediaDice(emoji: trimmedInputText)), replyToMessageId: self.chatPresentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: nil))
                 } else {
                     let inputText = convertMarkdownToAttributes(effectiveInputText)
                     
@@ -2624,7 +2331,18 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                             } else {
                                 webpage = self.chatPresentationInterfaceState.urlPreview?.1
                             }
-                            messages.append(.message(text: text.string, attributes: attributes, mediaReference: webpage.flatMap(AnyMediaReference.standalone), replyToMessageId: self.chatPresentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil))
+
+                            messages.append(.message(text: text.string, attributes: attributes, mediaReference: webpage.flatMap(AnyMediaReference.standalone), replyToMessageId: self.chatPresentationInterfaceState.interfaceState.replyMessageId, localGroupingKey: nil, correlationId: nil))
+
+                            #if DEBUG
+                            if text.string == "sleep" {
+                                messages.removeAll()
+
+                                for i in 0 ..< 5 {
+                                    messages.append(.message(text: "sleep\(i)", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
+                                }
+                            }
+                            #endif
                         }
                     }
 
@@ -2642,22 +2360,40 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
                 }
                 
                 if !messages.isEmpty || self.chatPresentationInterfaceState.interfaceState.forwardMessageIds != nil {
+                    if let forwardMessageIds = self.chatPresentationInterfaceState.interfaceState.forwardMessageIds {
+                        for id in forwardMessageIds {
+                            messages.append(.forward(source: id, grouping: .auto, attributes: [], correlationId: nil))
+                        }
+                    }
+
+                    var usedCorrelationId: Int64?
+
+                    if !messages.isEmpty, case .message = messages[messages.count - 1] {
+                        let correlationId = Int64.random(in: 0 ..< Int64.max)
+                        messages[messages.count - 1] = messages[messages.count - 1].withUpdatedCorrelationId(correlationId)
+
+                        var replyPanel: ReplyAccessoryPanelNode?
+                        if let accessoryPanelNode = self.accessoryPanelNode as? ReplyAccessoryPanelNode {
+                            replyPanel = accessoryPanelNode
+                        }
+                        if self.shouldAnimateMessageTransition, let inputPanelNode = self.inputPanelNode as? ChatTextInputPanelNode, let textInput = inputPanelNode.makeSnapshotForTransition() {
+                            usedCorrelationId = correlationId
+                            let source: ChatMessageTransitionNode.Source = .textInput(textInput: textInput, replyPanel: replyPanel)
+                            self.messageTransitionNode.add(correlationId: correlationId, source: source, initiated: {
+                            })
+                        }
+                    }
+
                     self.setupSendActionOnViewUpdate({ [weak self] in
                         if let strongSelf = self, let textInputPanelNode = strongSelf.inputPanelNode as? ChatTextInputPanelNode {
                             strongSelf.ignoreUpdateHeight = true
                             textInputPanelNode.text = ""
-                            strongSelf.requestUpdateChatInterfaceState(false, true, { $0.withUpdatedReplyMessageId(nil).withUpdatedForwardMessageIds(nil).withUpdatedComposeDisableUrlPreview(nil) })
+                            strongSelf.requestUpdateChatInterfaceState(.immediate, true, { $0.withUpdatedReplyMessageId(nil).withUpdatedForwardMessageIds(nil).withUpdatedComposeDisableUrlPreview(nil) })
                             strongSelf.ignoreUpdateHeight = false
                         }
-                    })
+                    }, usedCorrelationId)
                     completion()
                     
-                    if let forwardMessageIds = self.chatPresentationInterfaceState.interfaceState.forwardMessageIds {
-                        for id in forwardMessageIds {
-                            messages.append(.forward(source: id, grouping: .auto, attributes: []))
-                        }
-                    }
-                    
                     self.sendMessages(messages, silentPosting, scheduleTime, messages.count > 1)
                 }
             }
@@ -2707,124 +2443,7 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         self.view.insertSubview(ConfettiView(frame: self.view.bounds), aboveSubview: self.historyNode.view)
     }
     
-    func updateEmbeddedTitlePeekContent(content: NavigationControllerDropContent?) {
-        if !self.context.sharedContext.immediateExperimentalUISettings.playerEmbedding {
-            return
-        }
-        
-        guard let (_, navigationHeight) = self.validLayout else {
-            return
-        }
-        var peekContent: ChatEmbeddedTitlePeekContent = .none
-        if let content = content, let item = content.item as? VideoNavigationControllerDropContentItem, let _ = item.itemNode as? OverlayUniversalVideoNode {
-            if content.position.y < navigationHeight + 32.0 {
-                peekContent = .peek
-            }
-        }
-        if self.embeddedTitlePeekContent != peekContent {
-            self.embeddedTitlePeekContent = peekContent
-            self.requestLayout(.animated(duration: 0.3, curve: .spring))
-        }
-    }
-    
-    var isEmbeddedTitleContentHidden: Bool {
-        if let embeddedTitleContentNode = self.embeddedTitleContentNode {
-            return embeddedTitleContentNode.isUIHidden
-        } else {
-            return false
-        }
-    }
-    
-    var updateHasEmbeddedTitleContent: (() -> Void)?
-    
-    func acceptEmbeddedTitlePeekContent(content: NavigationControllerDropContent) -> Bool {
-        if !self.context.sharedContext.immediateExperimentalUISettings.playerEmbedding {
-            return false
-        }
-        
-        guard let (_, navigationHeight) = self.validLayout else {
-            return false
-        }
-        if content.position.y >= navigationHeight + 32.0 {
-            return false
-        }
-        if let item = content.item as? VideoNavigationControllerDropContentItem, let itemNode = item.itemNode as? OverlayUniversalVideoNode {
-            let embeddedTitleContentNode = ChatEmbeddedTitleContentNode(context: self.context, videoNode: itemNode, disableInternalAnimationIn: false, interactiveExtensionUpdated: { [weak self] transition in
-                guard let strongSelf = self else {
-                    return
-                }
-                strongSelf.requestLayout(transition)
-            }, dismissed: { [weak self] in
-                guard let strongSelf = self else {
-                    return
-                }
-                if let embeddedTitleContentNode = strongSelf.embeddedTitleContentNode {
-                    strongSelf.embeddedTitleContentNode = nil
-                    strongSelf.dismissedEmbeddedTitleContentNode = embeddedTitleContentNode
-                    strongSelf.requestLayout(.animated(duration: 0.25, curve: .spring))
-                    strongSelf.updateHasEmbeddedTitleContent?()
-                }
-            }, isUIHiddenUpdated: { [weak self] in
-                self?.updateHasEmbeddedTitleContent?()
-            }, unembedWhenPortrait: { [weak self] itemNode in
-                guard let strongSelf = self, let itemNode = itemNode as? OverlayUniversalVideoNode else {
-                    return false
-                }
-                strongSelf.unembedWhenPortrait(contentNode: itemNode)
-                return true
-            })
-            self.embeddedTitleContentNode = embeddedTitleContentNode
-            self.embeddedTitlePeekContent = .none
-            self.updateHasEmbeddedTitleContent?()
-            DispatchQueue.main.async {
-                self.requestLayout(.animated(duration: 0.25, curve: .spring))
-            }
-            
-            return true
-        }
-        return false
-    }
-    
-    private func unembedWhenPortrait(contentNode: OverlayUniversalVideoNode) {
-        let embeddedTitleContentNode = ChatEmbeddedTitleContentNode(context: self.context, videoNode: contentNode, disableInternalAnimationIn: true, interactiveExtensionUpdated: { [weak self] transition in
-            guard let strongSelf = self else {
-                return
-            }
-            strongSelf.requestLayout(transition)
-        }, dismissed: { [weak self] in
-            guard let strongSelf = self else {
-                return
-            }
-            if let embeddedTitleContentNode = strongSelf.embeddedTitleContentNode {
-                strongSelf.embeddedTitleContentNode = nil
-                strongSelf.dismissedEmbeddedTitleContentNode = embeddedTitleContentNode
-                strongSelf.requestLayout(.animated(duration: 0.25, curve: .spring))
-                strongSelf.updateHasEmbeddedTitleContent?()
-            }
-        }, isUIHiddenUpdated: { [weak self] in
-            self?.updateHasEmbeddedTitleContent?()
-        }, unembedWhenPortrait: { [weak self] itemNode in
-            guard let strongSelf = self, let itemNode = itemNode as? OverlayUniversalVideoNode else {
-                return false
-            }
-            strongSelf.unembedWhenPortrait(contentNode: itemNode)
-            return true
-        })
-        
-        self.embeddedTitleContentNode = embeddedTitleContentNode
-        self.embeddedTitlePeekContent = .none
-        self.updateHasEmbeddedTitleContent?()
-        self.requestLayout(.immediate)
-    }
-    
     func willNavigateAway() {
-        if let embeddedTitleContentNode = self.embeddedTitleContentNode, embeddedTitleContentNode.unembedOnLeave {
-            self.embeddedTitleContentNode = nil
-            self.dismissedEmbeddedTitleContentNode = embeddedTitleContentNode
-            embeddedTitleContentNode.expandIntoPiP()
-            self.requestLayout(.animated(duration: 0.25, curve: .spring))
-            self.updateHasEmbeddedTitleContent?()
-        }
     }
     
     func updateIsBlurred(_ isBlurred: Bool) {
@@ -2861,4 +2480,23 @@ class ChatControllerNode: ASDisplayNode, UIScrollViewDelegate {
         }
         self.historyNode.isHidden = isBlurred
     }
+
+    var shouldAnimateMessageTransition: Bool {
+        if (self.context.sharedContext.currentPresentationData.with({ $0 })).reduceMotion {
+            return false
+        }
+        
+        if self.chatPresentationInterfaceState.showCommands {
+            return false
+        }
+
+        switch self.historyNode.visibleContentOffset() {
+        case let .known(value) where value < 20.0:
+            return true
+        case .none:
+            return true
+        default:
+            return false
+        }
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatEmptyNode.swift b/submodules/TelegramUI/Sources/ChatEmptyNode.swift
index 76bf2723ba..e5ea648a42 100644
--- a/submodules/TelegramUI/Sources/ChatEmptyNode.swift
+++ b/submodules/TelegramUI/Sources/ChatEmptyNode.swift
@@ -10,6 +10,7 @@ import TelegramPresentationData
 import AppBundle
 import LocalizedPeerData
 import TelegramStringFormatting
+import AccountContext
 
 private protocol ChatEmptyNodeContent {
     func updateLayout(interfaceState: ChatPresentationInterfaceState, size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize
@@ -66,34 +67,28 @@ private final class ChatEmptyNodeRegularChatContent: ASDisplayNode, ChatEmptyNod
     }
 }
 
-private final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate {
-    private let account: Account
+protocol ChatEmptyNodeStickerContentNode: ASDisplayNode {
+    var stickerNode: ChatMediaInputStickerGridItemNode { get }
+}
+
+final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate {
+    private let context: AccountContext
     private let interaction: ChatPanelInterfaceInteraction?
     
     private let titleNode: ImmediateTextNode
     private let textNode: ImmediateTextNode
     
     private var stickerItem: ChatMediaInputStickerGridItem?
-    private let stickerNode: ChatMediaInputStickerGridItemNode
+    let stickerNode: ChatMediaInputStickerGridItemNode
     
     private var currentTheme: PresentationTheme?
     private var currentStrings: PresentationStrings?
     
     private var didSetupSticker = false
     private let disposable = MetaDisposable()
-    
-    var greetingStickerNode: ASDisplayNode? {
-        if let animationNode = self.stickerNode.animationNode, animationNode.supernode === stickerNode {
-            return animationNode
-        } else if self.stickerNode.imageNode.supernode === stickerNode {
-            return self.stickerNode.imageNode
-        } else {
-            return nil
-        }
-    }
-    
-    init(account: Account, interaction: ChatPanelInterfaceInteraction?) {
-        self.account = account
+        
+    init(context: AccountContext, interaction: ChatPanelInterfaceInteraction?) {
+        self.context = context
         self.interaction = interaction
         
         self.titleNode = ImmediateTextNode()
@@ -139,7 +134,7 @@ private final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNo
         guard let stickerItem = self.stickerItem else {
             return
         }
-        let _ = self.interaction?.sendSticker(.standalone(media: stickerItem.stickerItem.file), self.stickerNode, self.stickerNode.bounds)
+        let _ = self.interaction?.sendSticker(.standalone(media: stickerItem.stickerItem.file), false, self, self.stickerNode.bounds)
     }
     
     func updateLayout(interfaceState: ChatPresentationInterfaceState, size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
@@ -160,9 +155,9 @@ private final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNo
         } else if !self.didSetupSticker {
             let sticker: Signal<TelegramMediaFile?, NoError>
             if let preloadedSticker = interfaceState.greetingData?.sticker {
-                sticker = .single(preloadedSticker)
+                sticker = preloadedSticker
             } else {
-                sticker = randomGreetingSticker(account: self.account)
+                sticker = self.context.engine.stickers.randomGreetingSticker()
                 |> map { item -> TelegramMediaFile? in
                     return item?.file
                 }
@@ -195,7 +190,7 @@ private final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNo
                     let index = ItemCollectionItemIndex(index: 0, id: 0)
                     let collectionId = ItemCollectionId(namespace: 0, id: 0)
                     let stickerPackItem = StickerPackItem(index: index, file: sticker, indexKeys: [])
-                    let item = ChatMediaInputStickerGridItem(account: strongSelf.account, collectionId: collectionId, stickerPackInfo: nil, index: ItemCollectionViewEntryIndex(collectionIndex: 0, collectionId: collectionId, itemIndex: index), stickerItem: stickerPackItem, canManagePeerSpecificPack: nil, interfaceInteraction: nil, inputNodeInteraction: inputNodeInteraction, hasAccessory: false, theme: interfaceState.theme, large: true, selected: {})
+                    let item = ChatMediaInputStickerGridItem(account: strongSelf.context.account, collectionId: collectionId, stickerPackInfo: nil, index: ItemCollectionViewEntryIndex(collectionIndex: 0, collectionId: collectionId, itemIndex: index), stickerItem: stickerPackItem, canManagePeerSpecificPack: nil, interfaceInteraction: nil, inputNodeInteraction: inputNodeInteraction, hasAccessory: false, theme: interfaceState.theme, large: true, selected: {})
                     strongSelf.stickerItem = item
                     strongSelf.stickerNode.updateLayout(item: item, size: stickerSize, isVisible: true, synchronousLoads: true)
                     strongSelf.stickerNode.isVisibleInGrid = true
@@ -233,15 +228,15 @@ private final class ChatEmptyNodeGreetingChatContent: ASDisplayNode, ChatEmptyNo
     }
 }
 
-private final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate {
-    private let account: Account
+final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNodeStickerContentNode, ChatEmptyNodeContent, UIGestureRecognizerDelegate {
+    private let context: AccountContext
     private let interaction: ChatPanelInterfaceInteraction?
     
     private let titleNode: ImmediateTextNode
     private let textNode: ImmediateTextNode
     
     private var stickerItem: ChatMediaInputStickerGridItem?
-    private let stickerNode: ChatMediaInputStickerGridItemNode
+    let stickerNode: ChatMediaInputStickerGridItemNode
     
     private var currentTheme: PresentationTheme?
     private var currentStrings: PresentationStrings?
@@ -249,18 +244,8 @@ private final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNode
     private var didSetupSticker = false
     private let disposable = MetaDisposable()
     
-    var greetingStickerNode: ASDisplayNode? {
-        if let animationNode = self.stickerNode.animationNode, animationNode.supernode === stickerNode {
-            return animationNode
-        } else if self.stickerNode.imageNode.supernode === stickerNode {
-            return self.stickerNode.imageNode
-        } else {
-            return nil
-        }
-    }
-    
-    init(account: Account, interaction: ChatPanelInterfaceInteraction?) {
-        self.account = account
+    init(context: AccountContext, interaction: ChatPanelInterfaceInteraction?) {
+        self.context = context
         self.interaction = interaction
         
         self.titleNode = ImmediateTextNode()
@@ -306,7 +291,7 @@ private final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNode
         guard let stickerItem = self.stickerItem else {
             return
         }
-        let _ = self.interaction?.sendSticker(.standalone(media: stickerItem.stickerItem.file), self.stickerNode, self.stickerNode.bounds)
+        let _ = self.interaction?.sendSticker(.standalone(media: stickerItem.stickerItem.file), false, self, self.stickerNode.bounds)
     }
     
     func updateLayout(interfaceState: ChatPresentationInterfaceState, size: CGSize, transition: ContainedViewLayoutTransition) -> CGSize {
@@ -337,9 +322,9 @@ private final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNode
         } else if !self.didSetupSticker {
             let sticker: Signal<TelegramMediaFile?, NoError>
             if let preloadedSticker = interfaceState.greetingData?.sticker {
-                sticker = .single(preloadedSticker)
+                sticker = preloadedSticker
             } else {
-                sticker = randomGreetingSticker(account: self.account)
+                sticker = self.context.engine.stickers.randomGreetingSticker()
                 |> map { item -> TelegramMediaFile? in
                     return item?.file
                 }
@@ -372,7 +357,7 @@ private final class ChatEmptyNodeNearbyChatContent: ASDisplayNode, ChatEmptyNode
                     let index = ItemCollectionItemIndex(index: 0, id: 0)
                     let collectionId = ItemCollectionId(namespace: 0, id: 0)
                     let stickerPackItem = StickerPackItem(index: index, file: sticker, indexKeys: [])
-                    let item = ChatMediaInputStickerGridItem(account: strongSelf.account, collectionId: collectionId, stickerPackInfo: nil, index: ItemCollectionViewEntryIndex(collectionIndex: 0, collectionId: collectionId, itemIndex: index), stickerItem: stickerPackItem, canManagePeerSpecificPack: nil, interfaceInteraction: nil, inputNodeInteraction: inputNodeInteraction, hasAccessory: false, theme: interfaceState.theme, large: true, selected: {})
+                    let item = ChatMediaInputStickerGridItem(account: strongSelf.context.account, collectionId: collectionId, stickerPackInfo: nil, index: ItemCollectionViewEntryIndex(collectionIndex: 0, collectionId: collectionId, itemIndex: index), stickerItem: stickerPackItem, canManagePeerSpecificPack: nil, interfaceInteraction: nil, inputNodeInteraction: inputNodeInteraction, hasAccessory: false, theme: interfaceState.theme, large: true, selected: {})
                     strongSelf.stickerItem = item
                     strongSelf.stickerNode.updateLayout(item: item, size: stickerSize, isVisible: true, synchronousLoads: true)
                     strongSelf.stickerNode.isVisibleInGrid = true
@@ -783,24 +768,21 @@ private enum ChatEmptyNodeContentType {
 }
 
 final class ChatEmptyNode: ASDisplayNode {
-    private let account: Account
+    private let context: AccountContext
     private let interaction: ChatPanelInterfaceInteraction?
     
-    private let backgroundNode: ASImageNode
+    private let backgroundNode: NavigationBackgroundNode
     
     private var currentTheme: PresentationTheme?
     private var currentStrings: PresentationStrings?
     
     private var content: (ChatEmptyNodeContentType, ASDisplayNode & ChatEmptyNodeContent)?
     
-    init(account: Account, interaction: ChatPanelInterfaceInteraction?) {
-        self.account = account
+    init(context: AccountContext, interaction: ChatPanelInterfaceInteraction?) {
+        self.context = context
         self.interaction = interaction
         
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode = NavigationBackgroundNode(color: .clear)
         
         super.init()
         
@@ -813,9 +795,8 @@ final class ChatEmptyNode: ASDisplayNode {
         if self.currentTheme !== interfaceState.theme || self.currentStrings !== interfaceState.strings {
             self.currentTheme = interfaceState.theme
             self.currentStrings = interfaceState.strings
-            
-            let graphics = PresentationResourcesChat.additionalGraphics(interfaceState.theme, wallpaper: interfaceState.chatWallpaper, bubbleCorners: interfaceState.bubbleCorners)
-            self.backgroundNode.image = graphics.chatEmptyItemBackgroundImage
+
+            self.backgroundNode.updateColor(color: selectDateFillStaticColor(theme: interfaceState.theme, wallpaper: interfaceState.chatWallpaper), enableBlur: dateFillNeedsBlur(theme: interfaceState.theme, wallpaper: interfaceState.chatWallpaper), transition: .immediate)
         }
         
         var isScheduledMessages = false
@@ -827,7 +808,7 @@ final class ChatEmptyNode: ASDisplayNode {
         if case .replyThread = interfaceState.chatLocation {
             contentType = .regular
         } else if let peer = interfaceState.renderedPeer?.peer, !isScheduledMessages {
-            if peer.id == self.account.peerId {
+            if peer.id == self.context.account.peerId {
                 contentType = .cloud
             } else if let _ = peer as? TelegramSecretChat {
                 contentType = .secret
@@ -852,6 +833,7 @@ final class ChatEmptyNode: ASDisplayNode {
             contentType = .regular
         }
         
+        var updateGreetingSticker = false
         var contentTransition = transition
         if self.content?.0 != contentType {
             var animateContentIn = false
@@ -872,9 +854,10 @@ final class ChatEmptyNode: ASDisplayNode {
                 case .cloud:
                     node = ChatEmptyNodeCloudChatContent()
                 case .peerNearby:
-                    node = ChatEmptyNodeNearbyChatContent(account: self.account, interaction: self.interaction)
+                    node = ChatEmptyNodeNearbyChatContent(context: self.context, interaction: self.interaction)
                 case .greeting:
-                    node = ChatEmptyNodeGreetingChatContent(account: self.account, interaction: self.interaction)
+                    node = ChatEmptyNodeGreetingChatContent(context: self.context, interaction: self.interaction)
+                    updateGreetingSticker = true
             }
             self.content = (contentType, node)
             self.addSubnode(node)
@@ -892,6 +875,10 @@ final class ChatEmptyNode: ASDisplayNode {
         var contentSize = CGSize()
         if let contentNode = self.content?.1 {
             contentSize = contentNode.updateLayout(interfaceState: interfaceState, size: displayRect.size, transition: contentTransition)
+            
+            if updateGreetingSticker {
+                self.context.prefetchManager?.prepareNextGreetingSticker()
+            }
         }
         
         let contentFrame = CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - contentSize.width) / 2.0), y: displayRect.minY + floor((displayRect.height - contentSize.height) / 2.0)), size: contentSize)
@@ -900,18 +887,6 @@ final class ChatEmptyNode: ASDisplayNode {
         }
         
         transition.updateFrame(node: self.backgroundNode, frame: contentFrame)
-    }
-    
-    var greetingStickerNode: ASDisplayNode? {
-        if let (_, node) = self.content {
-            if let node = node as? ChatEmptyNodeGreetingChatContent {
-                return node.greetingStickerNode
-            } else if let node = node as? ChatEmptyNodeNearbyChatContent {
-                return node.greetingStickerNode
-            }
-        }
-        return nil
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: min(20.0, self.backgroundNode.bounds.height / 2.0), transition: transition)
     }
 }
-
-
diff --git a/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift b/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
index 26c42c8961..99eaf5d0e5 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
@@ -99,7 +99,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
                 } else {
                     selection = .none
                 }
-                groupBucket.append((message, isRead, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id])))
+                groupBucket.append((message, isRead, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id], isPlaying: false)))
             } else {
                 let selection: ChatHistoryMessageSelection
                 if let selectedMessages = selectedMessages {
@@ -107,7 +107,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
                 } else {
                     selection = .none
                 }
-                entries.append(.MessageEntry(message, presentationData, isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id])))
+                entries.append(.MessageEntry(message, presentationData, isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id], isPlaying: message.index == associatedData.currentlyPlayingMessageId)))
             }
         } else {
             let selection: ChatHistoryMessageSelection
@@ -116,7 +116,7 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
             } else {
                 selection = .none
             }
-            entries.append(.MessageEntry(message, presentationData, isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id])))
+            entries.append(.MessageEntry(message, presentationData, isRead, entry.monthLocation, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: entry.attributes.authorIsContact, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id], isPlaying: message.index == associatedData.currentlyPlayingMessageId)))
         }
     }
     
@@ -167,11 +167,11 @@ func chatHistoryEntriesForView(location: ChatLocation, view: MessageHistoryView,
                     if messages.count > 1, let groupInfo = messages[0].groupInfo {
                         var groupMessages: [(Message, Bool, ChatHistoryMessageSelection, ChatMessageEntryAttributes)] = []
                         for message in messages {
-                            groupMessages.append((message, false, .none, ChatMessageEntryAttributes(rank: adminRank, isContact: false, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id])))
+                            groupMessages.append((message, false, .none, ChatMessageEntryAttributes(rank: adminRank, isContact: false, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[message.id], isPlaying: false)))
                         }
                         entries.insert(.MessageGroupEntry(groupInfo, groupMessages, presentationData), at: 0)
                     } else {
-                        entries.insert(.MessageEntry(messages[0], presentationData, false, nil, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: false, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[messages[0].id])), at: 0)
+                        entries.insert(.MessageEntry(messages[0], presentationData, false, nil, selection, ChatMessageEntryAttributes(rank: adminRank, isContact: false, contentTypeHint: contentTypeHint, updatingMedia: updatingMedia[messages[0].id], isPlaying: false)), at: 0)
                     }
                     
                     let replyCount = view.entries.isEmpty ? 0 : 1
diff --git a/submodules/TelegramUI/Sources/ChatHistoryEntry.swift b/submodules/TelegramUI/Sources/ChatHistoryEntry.swift
index a3ffe24b0a..95ae7fa8f8 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryEntry.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryEntry.swift
@@ -17,12 +17,14 @@ public struct ChatMessageEntryAttributes: Equatable {
     let isContact: Bool
     let contentTypeHint: ChatMessageEntryContentType
     let updatingMedia: ChatUpdatingMessageMedia?
+    let isPlaying: Bool
     
-    init(rank: CachedChannelAdminRank?, isContact: Bool, contentTypeHint: ChatMessageEntryContentType, updatingMedia: ChatUpdatingMessageMedia?) {
+    init(rank: CachedChannelAdminRank?, isContact: Bool, contentTypeHint: ChatMessageEntryContentType, updatingMedia: ChatUpdatingMessageMedia?, isPlaying: Bool) {
         self.rank = rank
         self.isContact = isContact
         self.contentTypeHint = contentTypeHint
         self.updatingMedia = updatingMedia
+        self.isPlaying = isPlaying
     }
     
     public init() {
@@ -30,6 +32,7 @@ public struct ChatMessageEntryAttributes: Equatable {
         self.isContact = false
         self.contentTypeHint = .generic
         self.updatingMedia = nil
+        self.isPlaying = false
     }
 }
 
diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
index 55e28543fe..74be953d83 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
@@ -17,6 +17,7 @@ import AppBundle
 import ListMessageItem
 import AccountContext
 import ChatInterfaceState
+import ChatListUI
 
 extension ChatReplyThreadMessage {
     var effectiveTopId: MessageId {
@@ -30,70 +31,6 @@ struct ChatTopVisibleMessageRange: Equatable {
     var isLast: Bool
 }
 
-private class ChatHistoryListSelectionRecognizer: UIPanGestureRecognizer {
-    private let selectionGestureActivationThreshold: CGFloat = 5.0
-    
-    var recognized: Bool? = nil
-    var initialLocation: CGPoint = CGPoint()
-    
-    var shouldBegin: (() -> Bool)?
-    
-    override init(target: Any?, action: Selector?) {
-        super.init(target: target, action: action)
-        
-        self.minimumNumberOfTouches = 2
-        self.maximumNumberOfTouches = 2
-    }
-    
-    override func reset() {
-        super.reset()
-        
-        self.recognized = nil
-    }
-    
-    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent) {
-        super.touchesBegan(touches, with: event)
-        
-        if let shouldBegin = self.shouldBegin, !shouldBegin() {
-            self.state = .failed
-        } else {
-            let touch = touches.first!
-            self.initialLocation = touch.location(in: self.view)
-            
-            let touchesArray = Array(touches)
-            if touchesArray.count == 2, let firstTouch = touchesArray.first, let secondTouch = touchesArray.last {
-                let firstLocation = firstTouch.location(in: self.view)
-                let secondLocation = secondTouch.location(in: self.view)
-                
-                func distance(_ v1: CGPoint, _ v2: CGPoint) -> CGFloat {
-                    let dx = v1.x - v2.x
-                    let dy = v1.y - v2.y
-                    return sqrt(dx * dx + dy * dy)
-                }
-                if distance(firstLocation, secondLocation) > 70 {
-                    self.state = .failed
-                }
-            }
-        }
-    }
-    
-    
-    override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent) {
-        let location = touches.first!.location(in: self.view)
-        let translation = location.offsetBy(dx: -self.initialLocation.x, dy: -self.initialLocation.y)
-        
-        if self.recognized == nil {
-            if (abs(translation.y) >= selectionGestureActivationThreshold) {
-                self.recognized = true
-            }
-        }
-        
-        if let recognized = self.recognized, recognized {
-            super.touchesMoved(touches, with: event)
-        }
-    }
-}
-
 private let historyMessageCount: Int = 90
 
 public enum ChatHistoryListDisplayHeaders {
@@ -168,45 +105,45 @@ struct ChatHistoryViewTransitionUpdateEntry {
 }
 
 struct ChatHistoryViewTransition {
-    let historyView: ChatHistoryView
-    let deleteItems: [ListViewDeleteItem]
-    let insertEntries: [ChatHistoryViewTransitionInsertEntry]
-    let updateEntries: [ChatHistoryViewTransitionUpdateEntry]
-    let options: ListViewDeleteAndInsertOptions
-    let scrollToItem: ListViewScrollToItem?
-    let stationaryItemRange: (Int, Int)?
-    let initialData: InitialMessageHistoryData?
-    let keyboardButtonsMessage: Message?
-    let cachedData: CachedPeerData?
-    let cachedDataMessages: [MessageId: Message]?
-    let readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?
-    let scrolledToIndex: MessageHistoryAnchorIndex?
-    let scrolledToSomeIndex: Bool
-    let animateIn: Bool
-    let reason: ChatHistoryViewTransitionReason
-    let flashIndicators: Bool
+    var historyView: ChatHistoryView
+    var deleteItems: [ListViewDeleteItem]
+    var insertEntries: [ChatHistoryViewTransitionInsertEntry]
+    var updateEntries: [ChatHistoryViewTransitionUpdateEntry]
+    var options: ListViewDeleteAndInsertOptions
+    var scrollToItem: ListViewScrollToItem?
+    var stationaryItemRange: (Int, Int)?
+    var initialData: InitialMessageHistoryData?
+    var keyboardButtonsMessage: Message?
+    var cachedData: CachedPeerData?
+    var cachedDataMessages: [MessageId: Message]?
+    var readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?
+    var scrolledToIndex: MessageHistoryAnchorIndex?
+    var scrolledToSomeIndex: Bool
+    var animateIn: Bool
+    var reason: ChatHistoryViewTransitionReason
+    var flashIndicators: Bool
 }
 
 struct ChatHistoryListViewTransition {
-    let historyView: ChatHistoryView
-    let deleteItems: [ListViewDeleteItem]
-    let insertItems: [ListViewInsertItem]
-    let updateItems: [ListViewUpdateItem]
-    let options: ListViewDeleteAndInsertOptions
-    let scrollToItem: ListViewScrollToItem?
-    let stationaryItemRange: (Int, Int)?
-    let initialData: InitialMessageHistoryData?
-    let keyboardButtonsMessage: Message?
-    let cachedData: CachedPeerData?
-    let cachedDataMessages: [MessageId: Message]?
-    let readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?
-    let scrolledToIndex: MessageHistoryAnchorIndex?
-    let scrolledToSomeIndex: Bool
-    let peerType: MediaAutoDownloadPeerType
-    let networkType: MediaAutoDownloadNetworkType
-    let animateIn: Bool
-    let reason: ChatHistoryViewTransitionReason
-    let flashIndicators: Bool
+    var historyView: ChatHistoryView
+    var deleteItems: [ListViewDeleteItem]
+    var insertItems: [ListViewInsertItem]
+    var updateItems: [ListViewUpdateItem]
+    var options: ListViewDeleteAndInsertOptions
+    var scrollToItem: ListViewScrollToItem?
+    var stationaryItemRange: (Int, Int)?
+    var initialData: InitialMessageHistoryData?
+    var keyboardButtonsMessage: Message?
+    var cachedData: CachedPeerData?
+    var cachedDataMessages: [MessageId: Message]?
+    var readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?
+    var scrolledToIndex: MessageHistoryAnchorIndex?
+    var scrolledToSomeIndex: Bool
+    var peerType: MediaAutoDownloadPeerType
+    var networkType: MediaAutoDownloadNetworkType
+    var animateIn: Bool
+    var reason: ChatHistoryViewTransitionReason
+    var flashIndicators: Bool
 }
 
 private func maxMessageIndexForEntries(_ view: ChatHistoryView, indexRange: (Int, Int)) -> (incoming: MessageIndex?, overall: MessageIndex?) {
@@ -306,7 +243,7 @@ private func mappedInsertEntries(context: AccountContext, chatLocation: ChatLoca
             case let .UnreadEntry(_, presentationData):
                 return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatUnreadItem(index: entry.entry.index, presentationData: presentationData, context: context), directionHint: entry.directionHint)
             case let .ReplyCountEntry(_, isComments, count, presentationData):
-                return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatReplyCountItem(index: entry.entry.index, isComments: isComments, count: count, presentationData: presentationData, context: context), directionHint: entry.directionHint)
+                return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatReplyCountItem(index: entry.entry.index, isComments: isComments, count: count, presentationData: presentationData, context: context, controllerInteraction: controllerInteraction), directionHint: entry.directionHint)
             case let .ChatInfoEntry(title, text, presentationData):
                 return ListViewInsertItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatBotInfoItem(title: title, text: text, controllerInteraction: controllerInteraction, presentationData: presentationData), directionHint: entry.directionHint)
             case let .SearchEntry(theme, strings):
@@ -351,7 +288,7 @@ private func mappedUpdateEntries(context: AccountContext, chatLocation: ChatLoca
             case let .UnreadEntry(_, presentationData):
                 return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatUnreadItem(index: entry.entry.index, presentationData: presentationData, context: context), directionHint: entry.directionHint)
             case let .ReplyCountEntry(_, isComments, count, presentationData):
-                return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatReplyCountItem(index: entry.entry.index, isComments: isComments, count: count, presentationData: presentationData, context: context), directionHint: entry.directionHint)
+                return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatReplyCountItem(index: entry.entry.index, isComments: isComments, count: count, presentationData: presentationData, context: context, controllerInteraction: controllerInteraction), directionHint: entry.directionHint)
             case let .ChatInfoEntry(title, text, presentationData):
                 return ListViewUpdateItem(index: entry.index, previousIndex: entry.previousIndex, item: ChatBotInfoItem(title: title, text: text, controllerInteraction: controllerInteraction, presentationData: presentationData), directionHint: entry.directionHint)
             case let .SearchEntry(theme, strings):
@@ -374,7 +311,7 @@ private final class ChatHistoryTransactionOpaqueState {
     }
 }
 
-private func extractAssociatedData(chatLocation: ChatLocation, view: MessageHistoryView, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, animatedEmojiStickers: [String: [StickerPackItem]], subject: ChatControllerSubject?) -> ChatMessageItemAssociatedData {
+private func extractAssociatedData(chatLocation: ChatLocation, view: MessageHistoryView, automaticDownloadNetworkType: MediaAutoDownloadNetworkType, animatedEmojiStickers: [String: [StickerPackItem]], subject: ChatControllerSubject?, currentlyPlayingMessageId: MessageIndex?) -> ChatMessageItemAssociatedData {
     var automaticMediaDownloadPeerType: MediaAutoDownloadPeerType = .channel
     var contactsPeerIds: Set<PeerId> = Set()
     var channelDiscussionGroup: ChatMessageItemAssociatedData.ChannelDiscussionGroupStatus = .unknown
@@ -423,8 +360,7 @@ private func extractAssociatedData(chatLocation: ChatLocation, view: MessageHist
         }
     }
     
-    let associatedData = ChatMessageItemAssociatedData(automaticDownloadPeerType: automaticMediaDownloadPeerType, automaticDownloadNetworkType: automaticDownloadNetworkType, isRecentActions: false, subject: subject, contactsPeerIds: contactsPeerIds, channelDiscussionGroup: channelDiscussionGroup, animatedEmojiStickers: animatedEmojiStickers)
-    return associatedData
+    return ChatMessageItemAssociatedData(automaticDownloadPeerType: automaticMediaDownloadPeerType, automaticDownloadNetworkType: automaticDownloadNetworkType, isRecentActions: false, subject: subject, contactsPeerIds: contactsPeerIds, channelDiscussionGroup: channelDiscussionGroup, animatedEmojiStickers: animatedEmojiStickers, currentlyPlayingMessageId: currentlyPlayingMessageId)
 }
 
 private extension ChatHistoryLocationInput {
@@ -481,12 +417,12 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
     private let historyDisposable = MetaDisposable()
     private let readHistoryDisposable = MetaDisposable()
     
-    private let messageViewQueue = Queue(name: "ChatHistoryListNode processing")
+    //private let messageViewQueue = Queue(name: "ChatHistoryListNode processing")
     
     private var dequeuedInitialTransitionOnLayout = false
     private var enqueuedHistoryViewTransitions: [ChatHistoryListViewTransition] = []
     private var hasActiveTransition = false
-    var layoutActionOnViewTransition: ((ChatHistoryListViewTransition) -> (ChatHistoryListViewTransition, ListViewUpdateSizeAndInsets?))?
+    var layoutActionOnViewTransition: ((ChatHistoryListViewTransition) -> (ChatHistoryListViewTransition, ListViewUpdateSizeAndInsets?), Int64?)?
     
     public let historyState = ValuePromise<ChatHistoryNodeHistoryState>()
     public var currentHistoryState: ChatHistoryNodeHistoryState?
@@ -512,6 +448,8 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
     let canReadHistory = Promise<Bool>()
     private var canReadHistoryValue: Bool = false
     private var canReadHistoryDisposable: Disposable?
+
+    private var messageIdsScheduledForMarkAsSeen = Set<MessageId>()
     
     private var chatHistoryLocationValue: ChatHistoryLocationInput? {
         didSet {
@@ -544,7 +482,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
     private var maxVisibleMessageIndexReported: MessageIndex?
     var maxVisibleMessageIndexUpdated: ((MessageIndex) -> Void)?
     
-    var scrolledToIndex: ((MessageHistoryAnchorIndex) -> Void)?
+    var scrolledToIndex: ((MessageHistoryAnchorIndex, Bool) -> Void)?
     var scrolledToSomeIndex: (() -> Void)?
     var beganDragging: (() -> Void)?
     
@@ -589,7 +527,10 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
             }
         }
     }
-        
+    
+    private let currentlyPlayingMessageIdPromise = ValuePromise<MessageIndex?>(nil)
+    private var appliedPlayingMessageId: MessageIndex? = nil
+    
     private(set) var isScrollAtBottomPosition = false
     public var isScrollAtBottomPositionUpdated: (() -> Void)?
     
@@ -609,7 +550,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
     
     private let clientId: Atomic<Int32>
     
-    public init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, tagMask: MessageTags?, source: ChatHistoryListSource = .default, subject: ChatControllerSubject?, controllerInteraction: ChatControllerInteraction, selectedMessages: Signal<Set<MessageId>?, NoError>, mode: ChatHistoryListMode = .bubbles) {
+    public init(context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?>, tagMask: MessageTags?, source: ChatHistoryListSource = .default, subject: ChatControllerSubject?, controllerInteraction: ChatControllerInteraction, selectedMessages: Signal<Set<MessageId>?, NoError>, mode: ChatHistoryListMode = .bubbles, messageTransitionNode: @escaping () -> ChatMessageTransitionNode? = { nil }) {
         var tagMask = tagMask
         var appendMessagesFromTheSameGroup = false
         if case .pinnedMessages = subject {
@@ -626,7 +567,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         self.mode = mode
         
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: 1.0)
+        self.currentPresentationData = ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: 1.0)
         
         self.chatPresentationDataPromise = Promise(self.currentPresentationData)
         
@@ -669,12 +610,11 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         
         self.messageMentionProcessingManager.process = { [weak self, weak context] messageIds in
             if let strongSelf = self {
-                let _ = (strongSelf.canReadHistory.get()
-                |> take(1)).start(next: { [weak context] canReadHistory in
-                    if canReadHistory {
-                        context?.account.viewTracker.updateMarkMentionsSeenForMessageIds(messageIds: messageIds)
-                    }
-                })
+                if strongSelf.canReadHistoryValue {
+                    context?.account.viewTracker.updateMarkMentionsSeenForMessageIds(messageIds: messageIds)
+                } else {
+                    strongSelf.messageIdsScheduledForMarkAsSeen.formUnion(messageIds)
+                }
             }
         }
         
@@ -750,7 +690,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                     scrollPosition = nil
                 }
                 
-                return (ChatHistoryViewUpdate.HistoryView(view: MessageHistoryView(tagMask: nil, namespaces: .all, entries: messages.reversed().map { MessageHistoryEntry(message: $0, isRead: false, location: nil, monthLocation: nil, attributes: MutableMessageHistoryEntryAttributes(authorIsContact: false)) }, holeEarlier: hasMore), type: .Generic(type: ViewUpdateType.Initial), scrollPosition: scrollPosition, flashIndicators: false, originalScrollPosition: nil, initialData: ChatHistoryCombinedInitialData(initialData: nil, buttonKeyboardMessage: nil, cachedData: nil, cachedDataMessages: nil, readStateData: nil), id: 0), version, nil)
+                return (ChatHistoryViewUpdate.HistoryView(view: MessageHistoryView(tagMask: nil, namespaces: .all, entries: messages.reversed().map { MessageHistoryEntry(message: $0, isRead: false, location: nil, monthLocation: nil, attributes: MutableMessageHistoryEntryAttributes(authorIsContact: false)) }, holeEarlier: hasMore, holeLater: false, isLoading: false), type: .Generic(type: ViewUpdateType.Initial), scrollPosition: scrollPosition, flashIndicators: false, originalScrollPosition: nil, initialData: ChatHistoryCombinedInitialData(initialData: nil, buttonKeyboardMessage: nil, cachedData: nil, cachedDataMessages: nil, readStateData: nil), id: 0), version, nil)
             }
         } else {
             historyViewUpdate = self.chatHistoryLocationPromise.get()
@@ -790,7 +730,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         }
         |> distinctUntilChanged
                 
-        let animatedEmojiStickers = loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .animatedEmoji, forceActualized: false)
+        let animatedEmojiStickers = context.engine.stickers.loadedStickerPack(reference: .animatedEmoji, forceActualized: false)
         |> map { animatedEmoji -> [String: [StickerPackItem]] in
             var animatedEmojiStickers: [String: [StickerPackItem]] = [:]
             switch animatedEmoji {
@@ -894,8 +834,9 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
             self.pendingRemovedMessagesPromise.get(),
             animatedEmojiStickers,
             customChannelDiscussionReadState,
-            customThreadOutgoingReadState
-        ).start(next: { [weak self] update, chatPresentationData, selectedMessages, updatingMedia, networkType, historyAppearsCleared, pendingUnpinnedAllMessages, pendingRemovedMessages, animatedEmojiStickers, customChannelDiscussionReadState, customThreadOutgoingReadState in
+            customThreadOutgoingReadState,
+            self.currentlyPlayingMessageIdPromise.get()
+        ).start(next: { [weak self] update, chatPresentationData, selectedMessages, updatingMedia, networkType, historyAppearsCleared, pendingUnpinnedAllMessages, pendingRemovedMessages, animatedEmojiStickers, customChannelDiscussionReadState, customThreadOutgoingReadState, currentlyPlayingMessageId in
             func applyHole() {
                 Queue.mainQueue().async {
                     if let strongSelf = self {
@@ -906,11 +847,11 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                         let historyView = (strongSelf.opaqueTransactionState as? ChatHistoryTransactionOpaqueState)?.historyView
                         let displayRange = strongSelf.displayedItemRange
                         if let filteredEntries = historyView?.filteredEntries, let visibleRange = displayRange.visibleRange {
-                            let lastEntry = filteredEntries[filteredEntries.count - 1 - visibleRange.lastIndex]
+                            let firstEntry = filteredEntries[filteredEntries.count - 1 - visibleRange.firstIndex]
                             
-                            strongSelf.chatHistoryLocationValue = ChatHistoryLocationInput(content: .Navigation(index: .message(lastEntry.index), anchorIndex: .message(lastEntry.index), count: historyMessageCount, highlight: false), id: (strongSelf.chatHistoryLocationValue?.id).flatMap({ $0 + 1 }) ?? 0)
+                            strongSelf.chatHistoryLocationValue = ChatHistoryLocationInput(content: .Navigation(index: .message(firstEntry.index), anchorIndex: .message(firstEntry.index), count: historyMessageCount, highlight: false), id: (strongSelf.chatHistoryLocationValue?.id).flatMap({ $0 + 1 }) ?? 0)
                         } else {
-                            if let subject = subject, case let .message(messageId, highlight) = subject {
+                            if let subject = subject, case let .message(messageId, highlight, _) = subject {
                                 strongSelf.chatHistoryLocationValue = ChatHistoryLocationInput(content: .InitialSearch(location: .id(messageId), count: 60, highlight: highlight), id: (strongSelf.chatHistoryLocationValue?.id).flatMap({ $0 + 1 }) ?? 0)
                             } else if let subject = subject, case let .pinnedMessages(maybeMessageId) = subject, let messageId = maybeMessageId {
                                 strongSelf.chatHistoryLocationValue = ChatHistoryLocationInput(content: .InitialSearch(location: .id(messageId), count: 60, highlight: true), id: (strongSelf.chatHistoryLocationValue?.id).flatMap({ $0 + 1 }) ?? 0)
@@ -978,7 +919,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                     reverse = reverseValue
                 }
                 
-                let associatedData = extractAssociatedData(chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, animatedEmojiStickers: animatedEmojiStickers, subject: subject)
+                let associatedData = extractAssociatedData(chatLocation: chatLocation, view: view, automaticDownloadNetworkType: networkType, animatedEmojiStickers: animatedEmojiStickers, subject: subject, currentlyPlayingMessageId: currentlyPlayingMessageId)
                 
                 let filteredEntries = chatHistoryEntriesForView(location: chatLocation, view: view, includeUnreadEntry: mode == .bubbles, includeEmptyEntry: mode == .bubbles && tagMask == nil, includeChatInfoEntry: mode == .bubbles, includeSearchEntry: includeSearchEntry && tagMask != nil, reverse: reverse, groupMessages: mode == .bubbles, selectedMessages: selectedMessages, presentationData: chatPresentationData, historyAppearsCleared: historyAppearsCleared, pendingUnpinnedAllMessages: pendingUnpinnedAllMessages, pendingRemovedMessages: pendingRemovedMessages, associatedData: associatedData, updatingMedia: updatingMedia, customChannelDiscussionReadState: customChannelDiscussionReadState, customThreadOutgoingReadState: customThreadOutgoingReadState)
                 let lastHeaderId = filteredEntries.last.flatMap { listMessageDateHeaderId(timestamp: $0.index.timestamp) } ?? 0
@@ -993,7 +934,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                     }
                     assert(update.1 >= previousVersion)
                 }
-                
+                                
                 if scrollPosition == nil, let originalScrollPosition = originalScrollPosition {
                     switch originalScrollPosition {
                     case let .index(index, position, _, _, highlight):
@@ -1032,12 +973,22 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                             }
                     }
                 }
-                let rawTransition = preparedChatHistoryViewTransition(from: previous, to: processedView, reason: reason, reverse: reverse, chatLocation: chatLocation, controllerInteraction: controllerInteraction, scrollPosition: updatedScrollPosition, initialData: initialData?.initialData, keyboardButtonsMessage: view.topTaggedMessages.first, cachedData: initialData?.cachedData, cachedDataMessages: initialData?.cachedDataMessages, readStateData: initialData?.readStateData, flashIndicators: flashIndicators, updatedMessageSelection: previousSelectedMessages != selectedMessages)
+                
+                var scrollAnimationCurve: ListViewAnimationCurve? = nil
+                if let strongSelf = self, strongSelf.appliedPlayingMessageId != currentlyPlayingMessageId, let currentlyPlayingMessageId = currentlyPlayingMessageId {
+                    updatedScrollPosition = .index(index: .message(currentlyPlayingMessageId), position: .center(.bottom), directionHint: .Down, animated: true, highlight: true)
+                    scrollAnimationCurve = .Spring(duration: 0.4)
+                }
+                
+                let rawTransition = preparedChatHistoryViewTransition(from: previous, to: processedView, reason: reason, reverse: reverse, chatLocation: chatLocation, controllerInteraction: controllerInteraction, scrollPosition: updatedScrollPosition, scrollAnimationCurve: scrollAnimationCurve, initialData: initialData?.initialData, keyboardButtonsMessage: view.topTaggedMessages.first, cachedData: initialData?.cachedData, cachedDataMessages: initialData?.cachedDataMessages, readStateData: initialData?.readStateData, flashIndicators: flashIndicators, updatedMessageSelection: previousSelectedMessages != selectedMessages, messageTransitionNode: messageTransitionNode())
                 let mappedTransition = mappedChatHistoryViewListTransition(context: context, chatLocation: chatLocation, associatedData: associatedData, controllerInteraction: controllerInteraction, mode: mode, lastHeaderId: lastHeaderId, transition: rawTransition)
                 Queue.mainQueue().async {
                     guard let strongSelf = self else {
                         return
                     }
+                    if strongSelf.appliedPlayingMessageId != currentlyPlayingMessageId {
+                        strongSelf.appliedPlayingMessageId = currentlyPlayingMessageId
+                    }
                     strongSelf.enqueueHistoryViewTransition(mappedTransition)
                 }
             }
@@ -1073,16 +1024,22 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         
         self.readHistoryDisposable.set(readHistory.start())
         
-        self.canReadHistoryDisposable = (self.canReadHistory.get() |> deliverOnMainQueue).start(next: { [weak self] value in
+        self.canReadHistoryDisposable = (self.canReadHistory.get() |> deliverOnMainQueue).start(next: { [weak self, weak context] value in
             if let strongSelf = self {
                 if strongSelf.canReadHistoryValue != value {
                     strongSelf.canReadHistoryValue = value
                     strongSelf.updateReadHistoryActions()
+
+                    if strongSelf.canReadHistoryValue && !strongSelf.messageIdsScheduledForMarkAsSeen.isEmpty {
+                        let messageIds = strongSelf.messageIdsScheduledForMarkAsSeen
+                        strongSelf.messageIdsScheduledForMarkAsSeen.removeAll()
+                        context?.account.viewTracker.updateMarkMentionsSeenForMessageIds(messageIds: messageIds)
+                    }
                 }
             }
         })
         
-        if let subject = subject, case let .message(messageId, highlight) = subject {
+        if let subject = subject, case let .message(messageId, highlight, _) = subject {
             self.chatHistoryLocationValue = ChatHistoryLocationInput(content: .InitialSearch(location: .id(messageId), count: 60, highlight: highlight), id: 0)
         } else if let subject = subject, case let .pinnedMessages(maybeMessageId) = subject, let messageId = maybeMessageId {
             self.chatHistoryLocationValue = ChatHistoryLocationInput(content: .InitialSearch(location: .id(messageId), count: 60, highlight: true), id: 0)
@@ -1132,16 +1089,18 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                 
                 let animatedEmojiConfig = ChatHistoryAnimatedEmojiConfiguration.with(appConfiguration: appConfiguration)
                 
-                if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings || previousWallpaper != presentationData.chatWallpaper || previousDisableAnimations != presentationData.disableAnimations || previousAnimatedEmojiScale != animatedEmojiConfig.scale {
+                if previousTheme !== presentationData.theme || previousStrings !== presentationData.strings || previousWallpaper != presentationData.chatWallpaper || previousAnimatedEmojiScale != animatedEmojiConfig.scale {
                     let themeData = ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper)
-                    let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: animatedEmojiConfig.scale)
+                    let chatPresentationData = ChatPresentationData(theme: themeData, fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners, animatedEmojiScale: animatedEmojiConfig.scale)
                     
                     strongSelf.currentPresentationData = chatPresentationData
-                    strongSelf.dynamicBounceEnabled = !presentationData.disableAnimations
+                    strongSelf.dynamicBounceEnabled = false
                     
                     strongSelf.forEachItemHeaderNode { itemHeaderNode in
                         if let dateNode = itemHeaderNode as? ChatMessageDateHeaderNode {
                             dateNode.updatePresentationData(chatPresentationData, context: context)
+                        } else if let avatarNode = itemHeaderNode as? ChatMessageAvatarHeaderNode {
+                            avatarNode.updatePresentationData(chatPresentationData, context: context)
                         } else if let dateNode = itemHeaderNode as? ListMessageDateHeaderNode {
                             dateNode.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings)
                         }
@@ -1181,13 +1140,13 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         } |> distinctUntilChanged(isEqual: { $0 == $1 })
         |> mapToSignal { messageId -> Signal<Void, NoError> in
             if let messageId = messageId {
-                return getMessagesLoadIfNecessary([messageId], postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId) |> map { _ -> Void in return Void() }
+                return context.engine.messages.getMessagesLoadIfNecessary([messageId]) |> map { _ -> Void in return Void() }
             } else {
                 return .complete()
             }
         }).start()
         
-        self.beganInteractiveDragging = { [weak self] in
+        self.beganInteractiveDragging = { [weak self] _ in
             self?.isInteractivelyScrollingValue = true
             self?.isInteractivelyScrollingPromise.set(true)
             self?.beganDragging?()
@@ -1582,7 +1541,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
     public func scrollToEndOfHistory() {
         self.beganDragging?()
         switch self.visibleContentOffset() {
-            case .known(0.0):
+            case let .known(value) where value <= CGFloat.ulpOfOne:
                 break
             default:
                 let locationInput = ChatHistoryLocationInput(content: .Scroll(index: .upperBound, anchorIndex: .upperBound, sourceIndex: .lowerBound, scrollPosition: .top(0.0), animated: true, highlight: false), id: self.takeNextHistoryLocationId())
@@ -1765,8 +1724,8 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         let transition = self.enqueuedHistoryViewTransitions.removeFirst()
         
         let animated = transition.options.contains(.AnimateInsertion)
-        
-        let completion: (ListViewDisplayedItemRange) -> Void = { [weak self] visibleRange in
+
+        let completion: (Bool, ListViewDisplayedItemRange) -> Void = { [weak self] wasTransformed, visibleRange in
             if let strongSelf = self {
                 strongSelf.historyView = transition.historyView
                 
@@ -1774,7 +1733,6 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                 if let historyView = strongSelf.historyView {
                     if historyView.filteredEntries.isEmpty {
                         if let firstEntry = historyView.originalView.entries.first {
-                            var isPeerJoined = false
                             var emptyType = ChatHistoryNodeLoadState.EmptyType.generic
                             for media in firstEntry.message.media {
                                 if let action = media as? TelegramMediaAction {
@@ -1882,24 +1840,79 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
                 
                 if let scrolledToIndex = transition.scrolledToIndex {
                     if let strongSelf = self {
-                        strongSelf.scrolledToIndex?(scrolledToIndex)
+                        let isInitial: Bool
+                        if case .Initial = transition.reason {
+                            isInitial = true
+                        } else {
+                            isInitial = false
+                        }
+                        strongSelf.scrolledToIndex?(scrolledToIndex, isInitial)
                     }
                 } else if transition.scrolledToSomeIndex {
                     self?.scrolledToSomeIndex?()
                 }
+
+                if let currentSendAnimationCorrelationId = strongSelf.currentSendAnimationCorrelationId {
+                    var foundItemNode: ChatMessageItemView?
+                    strongSelf.forEachItemNode { itemNode in
+                        if let itemNode = itemNode as? ChatMessageItemView, let item = itemNode.item {
+                            for (message, _) in item.content {
+                                for attribute in message.attributes {
+                                    if let attribute = attribute as? OutgoingMessageInfoAttribute {
+                                        if attribute.correlationId == currentSendAnimationCorrelationId {
+                                            foundItemNode = itemNode
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    if let foundItemNode = foundItemNode {
+                        strongSelf.currentSendAnimationCorrelationId = nil
+                        strongSelf.animationCorrelationMessageFound?(foundItemNode, currentSendAnimationCorrelationId)
+                    }
+                }
                 
                 strongSelf.hasActiveTransition = false
                 strongSelf.dequeueHistoryViewTransitions()
             }
         }
         
-        if let layoutActionOnViewTransition = self.layoutActionOnViewTransition {
-            self.layoutActionOnViewTransition = nil
+        if let (layoutActionOnViewTransition, layoutCorrelationId) = self.layoutActionOnViewTransition {
+            var foundCorrelationMessage = false
+            if let layoutCorrelationId = layoutCorrelationId {
+                itemSearch: for item in transition.insertItems {
+                    if let messageItem = item.item as? ChatMessageItem {
+                        for (message, _) in messageItem.content {
+                            for attribute in message.attributes {
+                                if let attribute = attribute as? OutgoingMessageInfoAttribute {
+                                    if attribute.correlationId == layoutCorrelationId {
+                                        foundCorrelationMessage = true
+                                        break itemSearch
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            } else {
+                foundCorrelationMessage = true
+            }
+
+            if foundCorrelationMessage {
+                self.layoutActionOnViewTransition = nil
+            }
+
             let (mappedTransition, updateSizeAndInsets) = layoutActionOnViewTransition(transition)
-            
-            self.transaction(deleteIndices: mappedTransition.deleteItems, insertIndicesAndItems: transition.insertItems, updateIndicesAndItems: transition.updateItems, options: mappedTransition.options, scrollToItem: mappedTransition.scrollToItem, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: mappedTransition.stationaryItemRange, updateOpaqueState: ChatHistoryTransactionOpaqueState(historyView: transition.historyView), completion: completion)
+
+            self.transaction(deleteIndices: mappedTransition.deleteItems, insertIndicesAndItems: transition.insertItems, updateIndicesAndItems: transition.updateItems, options: mappedTransition.options, scrollToItem: mappedTransition.scrollToItem, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: mappedTransition.stationaryItemRange, updateOpaqueState: ChatHistoryTransactionOpaqueState(historyView: transition.historyView), completion: { result in
+                completion(true, result)
+            })
         } else {
-            self.transaction(deleteIndices: transition.deleteItems, insertIndicesAndItems: transition.insertItems, updateIndicesAndItems: transition.updateItems, options: transition.options, scrollToItem: transition.scrollToItem, stationaryItemRange: transition.stationaryItemRange, updateOpaqueState: ChatHistoryTransactionOpaqueState(historyView: transition.historyView), completion: completion)
+            self.transaction(deleteIndices: transition.deleteItems, insertIndicesAndItems: transition.insertItems, updateIndicesAndItems: transition.updateItems, options: transition.options, scrollToItem: transition.scrollToItem, stationaryItemRange: transition.stationaryItemRange, updateOpaqueState: ChatHistoryTransactionOpaqueState(historyView: transition.historyView), completion: { result in
+                completion(false, result)
+            })
         }
         
         if transition.flashIndicators {
@@ -1941,7 +1954,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
             } else if self.interactiveReadActionDisposable == nil {
                 if case let .peer(peerId) = self.chatLocation {
                     if !self.context.sharedContext.immediateExperimentalUISettings.skipReadHistory {
-                        self.interactiveReadActionDisposable = installInteractiveReadMessagesAction(postbox: self.context.account.postbox, stateManager: self.context.account.stateManager, peerId: peerId)
+                        self.interactiveReadActionDisposable = self.context.engine.messages.installInteractiveReadMessagesAction(peerId: peerId)
                     }
                 }
             }
@@ -2105,6 +2118,56 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         }
     }
 
+    func requestMessageUpdate(stableId: UInt32) {
+        if let historyView = self.historyView {
+            var messageItem: ChatMessageItem?
+            self.forEachItemNode({ itemNode in
+                if let itemNode = itemNode as? ChatMessageItemView, let item = itemNode.item {
+                    for (message, _) in item.content {
+                        if message.stableId == stableId {
+                            messageItem = item
+                            break
+                        }
+                    }
+                }
+            })
+
+            if let messageItem = messageItem {
+                let associatedData = messageItem.associatedData
+
+                loop: for i in 0 ..< historyView.filteredEntries.count {
+                    switch historyView.filteredEntries[i] {
+                        case let .MessageEntry(message, presentationData, read, _, selection, attributes):
+                            if message.stableId == stableId {
+                                let index = historyView.filteredEntries.count - 1 - i
+                                let item: ListViewItem
+                                switch self.mode {
+                                    case .bubbles:
+                                        item = ChatMessageItem(presentationData: presentationData, context: self.context, chatLocation: self.chatLocation, associatedData: associatedData, controllerInteraction: self.controllerInteraction, content: .message(message: message, read: read, selection: selection, attributes: attributes))
+                                    case let .list(_, _, displayHeaders, hintLinks, isGlobalSearch):
+                                        let displayHeader: Bool
+                                        switch displayHeaders {
+                                        case .none:
+                                            displayHeader = false
+                                        case .all:
+                                            displayHeader = true
+                                        case .allButLast:
+                                            displayHeader = listMessageDateHeaderId(timestamp: message.timestamp) != historyView.lastHeaderId
+                                        }
+                                        item = ListMessageItem(presentationData: presentationData, context: self.context, chatLocation: self.chatLocation, interaction: ListMessageItemInteraction(controllerInteraction: self.controllerInteraction), message: message, selection: selection, displayHeader: displayHeader, hintIsLink: hintLinks, isGlobalSearchResult: isGlobalSearch)
+                                }
+                                let updateItem = ListViewUpdateItem(index: index, previousIndex: index, item: item, directionHint: nil)
+                                self.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [updateItem], options: [.AnimateInsertion], scrollToItem: nil, additionalScrollDistance: 0.0, updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+                                break loop
+                            }
+                        default:
+                            break
+                    }
+                }
+            }
+        }
+    }
+
     private func messagesAtPoint(_ point: CGPoint) -> [Message]? {
         var resultMessages: [Message]?
         self.forEachVisibleItemNode { itemNode in
@@ -2239,4 +2302,20 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode {
         })
         self.selectionScrollDisplayLink?.isPaused = false
     }
+
+    
+    func voicePlaylistItemChanged(_ previousItem: SharedMediaPlaylistItem?, _ currentItem: SharedMediaPlaylistItem?) -> Void {
+        if let currentItem = currentItem?.id as? PeerMessagesMediaPlaylistItemId {
+            self.currentlyPlayingMessageIdPromise.set(currentItem.messageIndex)
+        } else {
+            self.currentlyPlayingMessageIdPromise.set(nil)
+        }
+    }
+
+    private var currentSendAnimationCorrelationId: Int64?
+    func setCurrentSendAnimationCorrelationId(_ value: Int64?) {
+        self.currentSendAnimationCorrelationId = value
+    }
+
+    var animationCorrelationMessageFound: ((ChatMessageItemView, Int64?) -> Void)?
 }
diff --git a/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
index 4105b4aeea..ed35ecf4e2 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtonNode.swift
@@ -12,6 +12,7 @@ enum ChatHistoryNavigationButtonType {
 }
 
 class ChatHistoryNavigationButtonNode: ASControlNode {
+    private let backgroundNode: NavigationBackgroundNode
     private let imageNode: ASImageNode
     private let badgeBackgroundNode: ASImageNode
     private let badgeTextNode: ASTextNode
@@ -42,6 +43,8 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
     init(theme: PresentationTheme, type: ChatHistoryNavigationButtonType) {
         self.theme = theme
         self.type = type
+
+        self.backgroundNode = NavigationBackgroundNode(color: theme.chat.inputPanel.panelBackgroundColor)
         
         self.imageNode = ASImageNode()
         self.imageNode.displayWithoutProcessing = true
@@ -65,7 +68,11 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
         self.badgeTextNode.displaysAsynchronously = false
         
         super.init()
-        
+
+        self.addSubnode(self.backgroundNode)
+        self.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 38.0, height: 38.0))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: 38.0 / 2.0, transition: .immediate)
+
         self.addSubnode(self.imageNode)
         self.imageNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 38.0, height: 38.0))
         
@@ -78,7 +85,8 @@ class ChatHistoryNavigationButtonNode: ASControlNode {
     func updateTheme(theme: PresentationTheme) {
         if self.theme !== theme {
             self.theme = theme
-            
+
+            self.backgroundNode.updateColor(color: theme.chat.inputPanel.panelBackgroundColor, transition: .immediate)
             switch self.type {
                 case .down:
                     self.imageNode.image = PresentationResourcesChat.chatHistoryNavigationButtonImage(theme)
diff --git a/submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift
index 0cbd2d86a5..888f2dcfe1 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryNavigationButtons.swift
@@ -59,10 +59,12 @@ final class ChatHistoryNavigationButtons: ASDisplayNode {
         
         self.mentionsButton = ChatHistoryNavigationButtonNode(theme: theme, type: .mentions)
         self.mentionsButton.alpha = 0.0
+        self.mentionsButton.isHidden = true
         self.mentionsButtonTapNode = ASDisplayNode()
         
         self.downButton = ChatHistoryNavigationButtonNode(theme: theme, type: .down)
         self.downButton.alpha = 0.0
+        self.downButton.isHidden = true
         
         super.init()
         
@@ -100,19 +102,32 @@ final class ChatHistoryNavigationButtons: ASDisplayNode {
         
         if self.displayDownButton {
             mentionsOffset = buttonSize.height + 12.0
+
+            self.downButton.isHidden = false
             transition.updateAlpha(node: self.downButton, alpha: 1.0)
             transition.updateTransformScale(node: self.downButton, scale: 1.0)
         } else {
-            transition.updateAlpha(node: self.downButton, alpha: 0.0)
+            transition.updateAlpha(node: self.downButton, alpha: 0.0, completion: { [weak self] completed in
+                guard let strongSelf = self, completed else {
+                    return
+                }
+                strongSelf.downButton.isHidden = true
+            })
             transition.updateTransformScale(node: self.downButton, scale: 0.2)
         }
         
         if self.mentionCount != 0 {
+            self.mentionsButton.isHidden = false
             transition.updateAlpha(node: self.mentionsButton, alpha: 1.0)
             transition.updateTransformScale(node: self.mentionsButton, scale: 1.0)
             self.mentionsButtonTapNode.isHidden = false
         } else {
-            transition.updateAlpha(node: self.mentionsButton, alpha: 0.0)
+            transition.updateAlpha(node: self.mentionsButton, alpha: 0.0, completion: { [weak self] completed in
+                guard let strongSelf = self, completed else {
+                    return
+                }
+                strongSelf.mentionsButton.isHidden = true
+            })
             transition.updateTransformScale(node: self.mentionsButton, scale: 0.2)
             self.mentionsButtonTapNode.isHidden = true
         }
diff --git a/submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift b/submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift
index 7f99889553..50ef7caa52 100644
--- a/submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatHistorySearchContainerNode.swift
@@ -194,7 +194,7 @@ final class ChatHistorySearchContainerNode: SearchDisplayControllerContentNode {
             if let strongSelf = self {
                 let signal: Signal<([ChatHistorySearchEntry], [MessageId: Message])?, NoError>
                 if let query = query, !query.isEmpty {
-                    let foundRemoteMessages: Signal<[Message], NoError> = searchMessages(account: context.account, location: .peer(peerId: peerId, fromId: nil, tags: tagMask, topMsgId: nil, minDate: nil, maxDate: nil), query: query, state: nil)
+                    let foundRemoteMessages: Signal<[Message], NoError> = context.engine.messages.searchMessages(location: .peer(peerId: peerId, fromId: nil, tags: tagMask, topMsgId: nil, minDate: nil, maxDate: nil), query: query, state: nil)
                     |> map { $0.0.messages }
                     |> delay(0.2, queue: Queue.concurrentDefaultQueue())
                     
@@ -231,7 +231,7 @@ final class ChatHistorySearchContainerNode: SearchDisplayControllerContentNode {
             }
         }))
         
-        self.listNode.beganInteractiveDragging = { [weak self] in
+        self.listNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
         
diff --git a/submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift b/submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift
index 85e1547ae8..ce80e0760b 100644
--- a/submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift
+++ b/submodules/TelegramUI/Sources/ChatHistoryViewForLocation.swift
@@ -153,6 +153,12 @@ func chatHistoryViewForLocation(_ location: ChatHistoryLocationInput, context: A
                         } else if view.isAddedToChatList, let historyScrollState = (initialData?.chatInterfaceState as? ChatInterfaceState)?.historyScrollState, tagMask == nil {
                             scrollPosition = .positionRestoration(index: historyScrollState.messageIndex, relativeOffset: CGFloat(historyScrollState.relativeOffset))
                         } else {
+                            if case .peer = chatLocation, !view.isAddedToChatList {
+                                if view.holeEarlier && view.entries.count <= 2 {
+                                    fadeIn = true
+                                    return .Loading(initialData: combinedInitialData, type: .Generic(type: updateType))
+                                }
+                            }
                             if view.entries.isEmpty && (view.holeEarlier || view.holeLater) {
                                 fadeIn = true
                                 return .Loading(initialData: combinedInitialData, type: .Generic(type: updateType))
@@ -335,7 +341,7 @@ func fetchAndPreloadReplyThreadInfo(context: AccountContext, subject: ReplyThrea
     let message: Signal<ChatReplyThreadMessage, FetchChannelReplyThreadMessageError>
     switch subject {
     case .channelPost(let messageId), .groupMessage(let messageId):
-        message = fetchChannelReplyThreadMessage(account: context.account, messageId: messageId, atMessageId: atMessageId)
+        message = context.engine.messages.fetchChannelReplyThreadMessage(messageId: messageId, atMessageId: atMessageId)
     }
     
     return message
diff --git a/submodules/TelegramUI/Sources/ChatHoleItem.swift b/submodules/TelegramUI/Sources/ChatHoleItem.swift
index b88cf37698..761ec425b4 100644
--- a/submodules/TelegramUI/Sources/ChatHoleItem.swift
+++ b/submodules/TelegramUI/Sources/ChatHoleItem.swift
@@ -108,14 +108,6 @@ class ChatHoleItemNode: ListViewItemNode {
         }
     }
     
-    /*override public func header() -> ListViewItemHeader? {
-        if let item = self.item {
-            return item.header
-        } else {
-            return nil
-        }
-    }*/
-    
     override public func animateAdded(_ currentTimestamp: Double, duration: Double) {
         self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
     }
diff --git a/submodules/TelegramUI/Sources/ChatImportStatusPanel.swift b/submodules/TelegramUI/Sources/ChatImportStatusPanel.swift
index f3f3653ec6..0af27ac9e3 100644
--- a/submodules/TelegramUI/Sources/ChatImportStatusPanel.swift
+++ b/submodules/TelegramUI/Sources/ChatImportStatusPanel.swift
@@ -28,7 +28,7 @@ final class ChatImportStatusPanel: ASDisplayNode {
         if self.theme !== presentationData.theme.theme {
             self.theme = presentationData.theme.theme
             
-            let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
+            let graphics = PresentationResourcesChat.principalGraphics(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
             self.backgroundNode.image = graphics.dateFloatingBackground
             self.secondaryBackgroundNode.image = graphics.dateFloatingBackground
         }
diff --git a/submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift
index 6d54ce28f0..811fd6b4eb 100644
--- a/submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatInfoTitlePanelNode.swift
@@ -126,33 +126,27 @@ private final class ChatInfoTitlePanelButtonNode: HighlightableButtonNode {
 
 final class ChatInfoTitlePanelNode: ChatTitleAccessoryPanelNode {
     private var theme: PresentationTheme?
-    
-    private let backgroundNode: ASDisplayNode
+
     private let separatorNode: ASDisplayNode
     private var buttons: [(ChatInfoTitleButton, ChatInfoTitlePanelButtonNode)] = []
     
     override init() {
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.isLayerBacked = true
-        
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
         
         super.init()
-        
-        self.addSubnode(self.backgroundNode)
+
         self.addSubnode(self.separatorNode)
     }
     
-    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
         let themeUpdated = self.theme !== interfaceState.theme
         self.theme = interfaceState.theme
         
         let panelHeight: CGFloat = 55.0
         
         if themeUpdated {
-            self.backgroundNode.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor
-            self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor
+            self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor
         }
         
         let updatedButtons: [ChatInfoTitleButton]
@@ -205,11 +199,9 @@ final class ChatInfoTitlePanelNode: ChatTitleAccessoryPanelNode {
             }
         }
         
-        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: panelHeight)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)))
-        
-        return panelHeight
+        return LayoutResult(backgroundHeight: panelHeight, insetHeight: panelHeight)
     }
     
     @objc func buttonPressed(_ node: HighlightableButtonNode) {
diff --git a/submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift
index 60c68d88c1..1d8c0129e0 100644
--- a/submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatInputContextPanelNode.swift
@@ -34,4 +34,8 @@ class ChatInputContextPanelNode: ASDisplayNode {
     func animateOut(completion: @escaping () -> Void) {
         completion()
     }
+    
+    var topItemFrame: CGRect? {
+        return nil
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift b/submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift
index 49b16264d4..0387adf15b 100644
--- a/submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift
+++ b/submodules/TelegramUI/Sources/ChatInstantVideoMessageDurationNode.swift
@@ -5,7 +5,7 @@ import SwiftSignalKit
 import Display
 import UniversalMediaPlayer
 
-private let textFont = Font.regular(11.0)
+private let textFont = Font.with(size: 11.0, design: .regular, weight: .regular, traits: [.monospacedNumbers])
 
 private struct ChatInstantVideoMessageDurationNodeState: Equatable {
     let hours: Int32?
@@ -35,28 +35,25 @@ private struct ChatInstantVideoMessageDurationNodeState: Equatable {
 private final class ChatInstantVideoMessageDurationNodeParameters: NSObject {
     let state: ChatInstantVideoMessageDurationNodeState
     let isSeen: Bool
-    let backgroundColor: UIColor
     let textColor: UIColor
     
-    init(state: ChatInstantVideoMessageDurationNodeState, isSeen: Bool, backgroundColor: UIColor, textColor: UIColor) {
+    init(state: ChatInstantVideoMessageDurationNodeState, isSeen: Bool, textColor: UIColor) {
         self.state = state
         self.isSeen = isSeen
-        self.backgroundColor = backgroundColor
         self.textColor = textColor
         
         super.init()
     }
 }
 
-final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
+final class ChatInstantVideoMessageDurationNode: ASImageNode {
     private var textColor: UIColor
-    private var fillColor: UIColor
     
     var defaultDuration: Double? {
         didSet {
             if self.defaultDuration != oldValue {
                 self.updateTimestamp()
-                self.setNeedsDisplay()
+                self.updateContents()
             }
         }
     }
@@ -64,7 +61,7 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
     var isSeen: Bool = false {
         didSet {
             if self.isSeen != oldValue {
-                self.setNeedsDisplay()
+                self.updateContents()
             }
         }
     }
@@ -87,7 +84,7 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
     private var state = ChatInstantVideoMessageDurationNodeState() {
         didSet {
             if self.state != oldValue {
-                self.setNeedsDisplay()
+                self.updateContents()
             }
         }
     }
@@ -104,10 +101,12 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
             }
         }
     }
+
+    var size: CGSize = CGSize()
+    var sizeUpdated: ((CGSize) -> Void)?
     
-    init(textColor: UIColor, fillColor: UIColor) {
+    init(textColor: UIColor) {
         self.textColor = textColor
-        self.fillColor = fillColor
         
         super.init()
         
@@ -128,11 +127,10 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
         self.updateTimer?.invalidate()
     }
     
-    func updateTheme(textColor: UIColor, fillColor: UIColor) {
-        if !self.textColor.isEqual(textColor) || !self.fillColor.isEqual(textColor) {
+    func updateTheme(textColor: UIColor) {
+        if !self.textColor.isEqual(textColor) {
             self.textColor = textColor
-            self.fillColor = fillColor
-            self.setNeedsDisplay()
+            self.updateContents()
         }
     }
     
@@ -168,12 +166,22 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
             self.state = ChatInstantVideoMessageDurationNodeState()
         }
     }
-    
-    override func drawParameters(forAsyncLayer layer: _ASDisplayLayer) -> NSObjectProtocol? {
-        return ChatInstantVideoMessageDurationNodeParameters(state: self.state, isSeen: self.isSeen, backgroundColor: self.fillColor, textColor: self.textColor)
+
+    private func updateContents() {
+        let image = self.generateContents(withParameters: self.getParameters(), isCancelled: { return false })
+        let previousSize = self.image?.size
+        self.image = image
+        if let image = image, previousSize != image.size {
+            self.size = image.size
+            self.sizeUpdated?(image.size)
+        }
     }
     
-    @objc override public class func display(withParameters: Any?, isCancelled: () -> Bool) -> UIImage? {
+    private func getParameters() -> NSObjectProtocol? {
+        return ChatInstantVideoMessageDurationNodeParameters(state: self.state, isSeen: self.isSeen, textColor: self.textColor)
+    }
+    
+    private func generateContents(withParameters: Any?, isCancelled: () -> Bool) -> UIImage? {
         guard let parameters = withParameters as? ChatInstantVideoMessageDurationNodeParameters else {
             return nil
         }
@@ -196,20 +204,14 @@ final class ChatInstantVideoMessageDurationNode: ASDisplayNode {
         
         return generateImage(imageSize, rotatedContext: { size, context in
             context.clear(CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: size))
-            context.setBlendMode(.copy)
-            context.setFillColor(parameters.backgroundColor.cgColor)
-            
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: size.height, height: size.height)))
-            context.fillEllipse(in: CGRect(origin: CGPoint(x: size.width - size.height, y: 0.0), size: CGSize(width: size.height, height: size.height)))
-            context.fill(CGRect(origin: CGPoint(x: size.height / 2.0, y: 0.0), size: CGSize(width: size.width - size.height, height: size.height)))
+            context.setBlendMode(.normal)
             
             if !parameters.isSeen {
                 context.setFillColor(parameters.textColor.cgColor)
                 let diameter: CGFloat = 4.0
                 context.fillEllipse(in: CGRect(origin: CGPoint(x: size.width - size.height + floor((size.height - diameter) / 2.0), y: floor((size.height - diameter) / 2.0)), size: CGSize(width: diameter, height: diameter)))
             }
-        
-            context.setBlendMode(.normal)
+
             UIGraphicsPushContext(context)
             string.draw(at: CGPoint(x: floor((size.width - unseenInset - textRect.size.width) / 2.0) + textRect.origin.x, y: 2.0 + textRect.origin.y + UIScreenPixel))
             UIGraphicsPopContext()
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift
index 9c72469569..4171fca4b1 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceInputContextPanels.swift
@@ -30,8 +30,17 @@ func inputContextPanelForChatPresentationIntefaceState(_ chatPresentationInterfa
         return nil
     }
     
+    if chatPresentationInterfaceState.showCommands, let renderedPeer = chatPresentationInterfaceState.renderedPeer {
+        if let currentPanel = currentPanel as? CommandMenuChatInputContextPanelNode {
+            return currentPanel
+        } else {
+            let panel = CommandMenuChatInputContextPanelNode(context: context, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, fontSize: chatPresentationInterfaceState.fontSize, peerId: renderedPeer.peerId)
+            panel.interfaceInteraction = interfaceInteraction
+            return panel
+        }
+    }
+    
     guard let inputQueryResult = chatPresentationInterfaceState.inputQueryResults.values.sorted(by: { lhs, rhs in
-        
         let (lhsP, lhsHasItems) = inputQueryResultPriority(lhs)
         let (rhsP, rhsHasItems) = inputQueryResultPriority(rhs)
         if lhsHasItems != rhsHasItems {
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift b/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift
index f52460975e..fbe8b8c8fd 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceInputContexts.swift
@@ -208,7 +208,7 @@ func inputTextPanelStateForChatPresentationInterfaceState(_ chatPresentationInte
             let inputQueries = inputContextQueriesForChatPresentationIntefaceState(chatPresentationInterfaceState)
             for inputQuery in inputQueries {
                 if case let .contextRequest(addressName, query) = inputQuery, query.isEmpty {
-                    let baseFontSize: CGFloat = max(17.0, chatPresentationInterfaceState.fontSize.baseDisplaySize)
+                    let baseFontSize: CGFloat = max(chatTextInputMinFontSize, chatPresentationInterfaceState.fontSize.baseDisplaySize)
                     
                     let string = NSMutableAttributedString()
                     string.append(NSAttributedString(string: "@" + addressName, font: Font.regular(baseFontSize), textColor: UIColor.clear))
@@ -286,7 +286,7 @@ func inputTextPanelStateForChatPresentationInterfaceState(_ chatPresentationInte
                 if !extendedSearchLayout {
                     if case .scheduledMessages = chatPresentationInterfaceState.subject {
                     } else if chatPresentationInterfaceState.renderedPeer?.peerId != context.account.peerId {
-                        if let peer = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramSecretChat {
+                        if let peer = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramSecretChat, chatPresentationInterfaceState.interfaceState.composeInputState.inputText.length == 0 {
                             accessoryItems.append(.messageAutoremoveTimeout(peer.messageAutoremoveTimeout))
                         } else if currentAutoremoveTimeout != nil && chatPresentationInterfaceState.interfaceState.composeInputState.inputText.length == 0 {
                             accessoryItems.append(.messageAutoremoveTimeout(currentAutoremoveTimeout))
@@ -312,13 +312,14 @@ func inputTextPanelStateForChatPresentationInterfaceState(_ chatPresentationInte
                             stickersEnabled = false
                         }
                     }
-                    if let peer = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramUser, let _ = peer.botInfo {
-                        accessoryItems.append(.commands)
-                    } else if chatPresentationInterfaceState.hasBots {
+//                    if let peer = chatPresentationInterfaceState.renderedPeer?.peer as? TelegramUser, let _ = peer.botInfo {
+//                        accessoryItems.append(.commands)
+//                    } else
+                    if chatPresentationInterfaceState.hasBots {
                         accessoryItems.append(.commands)
                     }
                     accessoryItems.append(.stickers(stickersEnabled))
-                    if let message = chatPresentationInterfaceState.keyboardButtonsMessage, let _ = message.visibleButtonKeyboardMarkup {
+                    if let message = chatPresentationInterfaceState.keyboardButtonsMessage, let _ = message.visibleButtonKeyboardMarkup, chatPresentationInterfaceState.interfaceState.messageActionsState.dismissedButtonKeyboardMessageId != message.id {
                         accessoryItems.append(.inputButtons)
                     }
                 }
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift
index 38957c8645..85c468508d 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceStateAccessoryPanels.swift
@@ -32,7 +32,7 @@ func accessoryPanelForChatPresentationIntefaceState(_ chatPresentationInterfaceS
             editPanelNode.updateThemeAndStrings(theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings)
             return editPanelNode
         } else {
-            let panelNode = EditAccessoryPanelNode(context: context, messageId: editMessage.messageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder)
+            let panelNode = EditAccessoryPanelNode(context: context, messageId: editMessage.messageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder, dateTimeFormat: chatPresentationInterfaceState.dateTimeFormat)
             panelNode.interfaceInteraction = interfaceInteraction
             return panelNode
         }
@@ -63,7 +63,7 @@ func accessoryPanelForChatPresentationIntefaceState(_ chatPresentationInterfaceS
             replyPanelNode.updateThemeAndStrings(theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings)
             return replyPanelNode
         } else {
-            let panelNode = ReplyAccessoryPanelNode(context: context, messageId: replyMessageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder)
+            let panelNode = ReplyAccessoryPanelNode(context: context, messageId: replyMessageId, theme: chatPresentationInterfaceState.theme, strings: chatPresentationInterfaceState.strings, nameDisplayOrder: chatPresentationInterfaceState.nameDisplayOrder, dateTimeFormat: chatPresentationInterfaceState.dateTimeFormat)
             panelNode.interfaceInteraction = interfaceInteraction
             return panelNode
         }
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
index 8716e00cf2..06abbb38fd 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceStateContextMenus.swift
@@ -137,10 +137,6 @@ private func canEditMessage(accountPeerId: PeerId, limitsConfiguration: LimitsCo
     return false
 }
 
-
-private let starIconEmpty = UIImage(bundleImageName: "Chat/Context Menu/StarIconEmpty")?.precomposed()
-private let starIconFilled = UIImage(bundleImageName: "Chat/Context Menu/StarIconFilled")?.precomposed()
-
 func canReplyInChat(_ chatPresentationInterfaceState: ChatPresentationInterfaceState) -> Bool {
     guard let peer = chatPresentationInterfaceState.renderedPeer?.peer else {
         return false
@@ -473,9 +469,9 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
                                     if let strongController = controller {
                                         strongController.dismiss()
                                         
-                                        let id = arc4random64()
+                                        let id = Int64.random(in: Int64.min ... Int64.max)
                                         let file = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: id), partialReference: nil, resource: LocalFileReferenceMediaResource(localFilePath: logPath, randomId: id), previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "application/text", size: nil, attributes: [.FileName(fileName: "CallStats.log")])
-                                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil)
+                                        let message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: file), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                                         
                                         let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [message]).start()
                                     }
@@ -554,13 +550,21 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
                     } else {
                         let copyTextWithEntities = {
                             var messageEntities: [MessageTextEntity]?
+                            var restrictedText: String?
                             for attribute in message.attributes {
                                 if let attribute = attribute as? TextEntitiesMessageAttribute {
                                     messageEntities = attribute.entities
-                                    break
+                                }
+                                if let attribute = attribute as? RestrictedContentMessageAttribute {
+                                    restrictedText = attribute.platformText(platform: "ios", contentSettings: context.currentContentSettings.with { $0 }) ?? ""
                                 }
                             }
-                            storeMessageTextInPasteboard(message.text, entities: messageEntities)
+                            
+                            if let restrictedText = restrictedText {
+                                storeMessageTextInPasteboard(restrictedText, entities: nil)
+                            } else {
+                                storeMessageTextInPasteboard(message.text, entities: messageEntities)
+                            }
                             
                             Queue.mainQueue().after(0.2, {
                                 let content: UndoOverlayContent = .copy(text: chatPresentationInterfaceState.strings.Conversation_MessageCopied)
@@ -793,7 +797,7 @@ func contextMenuForChatPresentationInterfaceState(chatPresentationInterfaceState
                 if case let .replyThread(replyThreadMessage) = chatPresentationInterfaceState.chatLocation {
                     threadMessageId = replyThreadMessage.messageId
                 }
-                let _ = (exportMessageLink(account: context.account, peerId: message.id.peerId, messageId: message.id, isThread: threadMessageId != nil)
+                let _ = (context.engine.messages.exportMessageLink(peerId: message.id.peerId, messageId: message.id, isThread: threadMessageId != nil)
                 |> map { result -> String? in
                     return result
                 }
@@ -1219,7 +1223,7 @@ func chatAvailableMessageActionsImpl(postbox: Postbox, accountPeerId: PeerId, me
                         if canDeleteGlobally {
                             optionsMap[id]!.insert(.deleteGlobally)
                         }
-                        if user.botInfo != nil && !user.id.isReplies && !isAction {
+                        if user.botInfo != nil && message.flags.contains(.Incoming) && !user.id.isReplies && !isAction {
                             optionsMap[id]!.insert(.report)
                         }
                     } else if let _ = peer as? TelegramSecretChat {
@@ -1264,14 +1268,14 @@ func chatAvailableMessageActionsImpl(postbox: Postbox, accountPeerId: PeerId, me
 
 final class ChatDeleteMessageContextItem: ContextMenuCustomItem {
     fileprivate let timestamp: Double
-    fileprivate let action: (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void
+    fileprivate let action: (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void
     
-    init(timestamp: Double, action: @escaping (ContextController, @escaping (ContextMenuActionResult) -> Void) -> Void) {
+    init(timestamp: Double, action: @escaping (ContextControllerProtocol, @escaping (ContextMenuActionResult) -> Void) -> Void) {
         self.timestamp = timestamp
         self.action = action
     }
     
-    func node(presentationData: PresentationData, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
+    func node(presentationData: PresentationData, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) -> ContextMenuCustomNode {
         return ChatDeleteMessageContextItemNode(presentationData: presentationData, item: self, getController: getController, actionSelected: actionSelected)
     }
 }
@@ -1281,7 +1285,7 @@ private let textFont = Font.regular(17.0)
 private final class ChatDeleteMessageContextItemNode: ASDisplayNode, ContextMenuCustomNode, ContextActionNodeProtocol {
     private let item: ChatDeleteMessageContextItem
     private let presentationData: PresentationData
-    private let getController: () -> ContextController?
+    private let getController: () -> ContextControllerProtocol?
     private let actionSelected: (ContextMenuActionResult) -> Void
     
     private let backgroundNode: ASDisplayNode
@@ -1296,7 +1300,7 @@ private final class ChatDeleteMessageContextItemNode: ASDisplayNode, ContextMenu
     
     private var pointerInteraction: PointerInteraction?
 
-    init(presentationData: PresentationData, item: ChatDeleteMessageContextItem, getController: @escaping () -> ContextController?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
+    init(presentationData: PresentationData, item: ChatDeleteMessageContextItem, getController: @escaping () -> ContextControllerProtocol?, actionSelected: @escaping (ContextMenuActionResult) -> Void) {
         self.item = item
         self.presentationData = presentationData
         self.getController = getController
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift b/submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift
index 32ceb31d47..3863d95b40 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceStateContextQueries.swift
@@ -127,7 +127,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
                     case .installed:
                         scope = [.installed]
                 }
-                return searchStickers(account: context.account, query: query.basicEmoji.0, scope: scope)
+                return context.engine.stickers.searchStickers(query: query.basicEmoji.0, scope: scope)
                 |> castError(ChatContextQueryError.self)
             }
             |> map { stickers -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
@@ -149,7 +149,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
                 signal = .single({ _ in return .hashtags([]) })
             }
             
-            let hashtags: Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, ChatContextQueryError> = recentlyUsedHashtags(postbox: context.account.postbox)
+            let hashtags: Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, ChatContextQueryError> = context.engine.messages.recentlyUsedHashtags()
                 |> map { hashtags -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
                 let normalizedQuery = query.lowercased()
                 var result: [String] = []
@@ -178,7 +178,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
                 signal = .single({ _ in return .mentions([]) })
             }
             
-            let inlineBots: Signal<[(Peer, Double)], NoError> = types.contains(.contextBots) ? recentlyUsedInlineBots(postbox: context.account.postbox) : .single([])
+            let inlineBots: Signal<[(Peer, Double)], NoError> = types.contains(.contextBots) ? context.engine.peers.recentlyUsedInlineBots() : .single([])
             let participants = combineLatest(inlineBots, searchPeerMembers(context: context, peerId: peer.id, chatLocation: chatLocation, query: query, scope: .mention))
             |> map { inlineBots, peers -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
                 let filteredInlineBots = inlineBots.sorted(by: { $0.1 > $1.1 }).filter { peer, rating in
@@ -233,7 +233,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
                 signal = .single({ _ in return .commands([]) })
             }
             
-            let commands = peerCommands(account: context.account, id: peer.id)
+            let commands = context.engine.peers.peerCommands(id: peer.id)
             |> map { commands -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
                 let filteredCommands = commands.commands.filter { command in
                     if command.command.text.hasPrefix(normalizedQuery) {
@@ -264,7 +264,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
             }
             
             let chatPeer = peer
-            let contextBot = resolvePeerByName(account: context.account, name: addressName)
+            let contextBot = context.engine.peers.resolvePeerByName(name: addressName)
             |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                 if let peerId = peerId {
                     return context.account.postbox.loadedPeerWithId(peerId)
@@ -279,7 +279,7 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
             |> castError(ChatContextQueryError.self)
             |> mapToSignal { peer -> Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, ChatContextQueryError> in
                 if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder {
-                    let contextResults = requestChatContextResults(account: context.account, botId: user.id, peerId: chatPeer.id, query: query, location: context.sharedContext.locationManager.flatMap { locationManager -> Signal<(Double, Double)?, NoError> in
+                    let contextResults = context.engine.messages.requestChatContextResults(botId: user.id, peerId: chatPeer.id, query: query, location: context.sharedContext.locationManager.flatMap { locationManager -> Signal<(Double, Double)?, NoError> in
                         return `deferred` {
                             Queue.mainQueue().async {
                                 requestBotLocationStatus(user.id)
@@ -338,13 +338,13 @@ private func updatedContextQueryResultStateForQuery(context: AccountContext, pee
             
             return signal |> then(contextBot)
         case let .emojiSearch(query, languageCode, range):
-            var signal = searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: languageCode, query: query, completeMatch: query.count < 2)
+            var signal = context.engine.stickers.searchEmojiKeywords(inputLanguageCode: languageCode, query: query, completeMatch: query.count < 2)
             if !languageCode.lowercased().hasPrefix("en") {
                 signal = signal
                 |> mapToSignal { keywords in
                     return .single(keywords)
                     |> then(
-                        searchEmojiKeywords(postbox: context.account.postbox, inputLanguageCode: "en-US", query: query, completeMatch: query.count < 3)
+                        context.engine.stickers.searchEmojiKeywords(inputLanguageCode: "en-US", query: query, completeMatch: query.count < 3)
                         |> map { englishKeywords in
                             return keywords + englishKeywords
                         }
diff --git a/submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift b/submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift
index 87f4587397..84830a68a0 100644
--- a/submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift
+++ b/submodules/TelegramUI/Sources/ChatInterfaceTitlePanelNodes.swift
@@ -32,9 +32,12 @@ func titlePanelForChatPresentationInterfaceState(_ chatPresentationInterfaceStat
         loop: for context in chatPresentationInterfaceState.titlePanelContexts.reversed() {
             switch context {
                 case .pinnedMessage:
-                    if let pinnedMessage = chatPresentationInterfaceState.pinnedMessage, pinnedMessage.topMessageId != chatPresentationInterfaceState.interfaceState.messageActionsState.closedPinnedMessageId, !chatPresentationInterfaceState.pendingUnpinnedAllMessages {
-                        selectedContext = context
-                        break loop
+                    if case .pinnedMessages = chatPresentationInterfaceState.subject {
+                    } else {
+                        if let pinnedMessage = chatPresentationInterfaceState.pinnedMessage, pinnedMessage.topMessageId != chatPresentationInterfaceState.interfaceState.messageActionsState.closedPinnedMessageId, !chatPresentationInterfaceState.pendingUnpinnedAllMessages {
+                            selectedContext = context
+                            break loop
+                        }
                     }
                 case .chatInfo, .requestInProgress, .toastAlert:
                     selectedContext = context
diff --git a/submodules/TelegramUI/Sources/ChatLoadingNode.swift b/submodules/TelegramUI/Sources/ChatLoadingNode.swift
index 6cb7638a0b..fac49f4b8b 100644
--- a/submodules/TelegramUI/Sources/ChatLoadingNode.swift
+++ b/submodules/TelegramUI/Sources/ChatLoadingNode.swift
@@ -8,18 +8,12 @@ import TelegramPresentationData
 import ActivityIndicator
 
 final class ChatLoadingNode: ASDisplayNode {
-    private let backgroundNode: ASImageNode
+    private let backgroundNode: NavigationBackgroundNode
     private let activityIndicator: ActivityIndicator
     private let offset: CGPoint
     
     init(theme: PresentationTheme, chatWallpaper: TelegramWallpaper, bubbleCorners: PresentationChatBubbleCorners) {
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.displaysAsynchronously = false
-        
-        let graphics = PresentationResourcesChat.additionalGraphics(theme, wallpaper: chatWallpaper, bubbleCorners: bubbleCorners)
-        self.backgroundNode.image = graphics.chatLoadingIndicatorBackgroundImage
+        self.backgroundNode = NavigationBackgroundNode(color: selectDateFillStaticColor(theme: theme, wallpaper: chatWallpaper), enableBlur: dateFillNeedsBlur(theme: theme, wallpaper: chatWallpaper))
         
         let serviceColor = serviceMessageColorComponents(theme: theme, wallpaper: chatWallpaper)
         self.activityIndicator = ActivityIndicator(type: .custom(serviceColor.primaryText, 22.0, 2.0, false), speed: .regular)
@@ -37,10 +31,10 @@ final class ChatLoadingNode: ASDisplayNode {
     
     func updateLayout(size: CGSize, insets: UIEdgeInsets, transition: ContainedViewLayoutTransition) {
         let displayRect = CGRect(origin: CGPoint(x: 0.0, y: insets.top), size: CGSize(width: size.width, height: size.height - insets.top - insets.bottom))
-        
-        if let image = self.backgroundNode.image {
-            transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - image.size.width) / 2.0), y: displayRect.minY + floor((displayRect.height - image.size.height) / 2.0)), size: image.size))
-        }
+
+        let backgroundSize: CGFloat = 30.0
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - backgroundSize) / 2.0), y: displayRect.minY + floor((displayRect.height - backgroundSize) / 2.0)), size: CGSize(width: backgroundSize, height: backgroundSize)))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: self.backgroundNode.bounds.height / 2.0, transition: transition)
         
         let activitySize = self.activityIndicator.measure(size)
         transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: displayRect.minX + floor((displayRect.width - activitySize.width) / 2.0) + self.offset.x, y: displayRect.minY + floor((displayRect.height - activitySize.height) / 2.0) + self.offset.y), size: activitySize))
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift
index e87bfc7406..df19a573e0 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputGifPane.swift
@@ -8,6 +8,7 @@ import SyncCore
 import SwiftSignalKit
 import TelegramPresentationData
 import ContextUI
+import AccountContext
 
 private func fixListScrolling(_ multiplexedNode: MultiplexedVideoNode) {
     let searchBarHeight: CGFloat = 56.0
@@ -35,7 +36,7 @@ final class ChatMediaInputGifPaneTrendingState {
 }
 
 final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
-    private let account: Account
+    private let context: AccountContext
     private var theme: PresentationTheme
     private var strings: PresentationStrings
     private let controllerInteraction: ChatControllerInteraction
@@ -70,8 +71,8 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
     private var isLoadingMore: Bool = false
     private var nextOffset: String?
     
-    init(account: Account, theme: PresentationTheme, strings: PresentationStrings, controllerInteraction: ChatControllerInteraction, paneDidScroll: @escaping (ChatMediaInputPane, ChatMediaInputPaneScrollState, ContainedViewLayoutTransition) -> Void, fixPaneScroll: @escaping  (ChatMediaInputPane, ChatMediaInputPaneScrollState) -> Void, openGifContextMenu: @escaping (MultiplexedVideoNodeFile, ASDisplayNode, CGRect, ContextGesture, Bool) -> Void) {
-        self.account = account
+    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, controllerInteraction: ChatControllerInteraction, paneDidScroll: @escaping (ChatMediaInputPane, ChatMediaInputPaneScrollState, ContainedViewLayoutTransition) -> Void, fixPaneScroll: @escaping  (ChatMediaInputPane, ChatMediaInputPaneScrollState) -> Void, openGifContextMenu: @escaping (MultiplexedVideoNodeFile, ASDisplayNode, CGRect, ContextGesture, Bool) -> Void) {
+        self.context = context
         self.theme = theme
         self.strings = strings
         self.controllerInteraction = controllerInteraction
@@ -208,7 +209,7 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
     
     func initializeIfNeeded() {
         if self.multiplexedNode == nil {
-            self.trendingPromise.set(paneGifSearchForQuery(account: account, query: "", offset: nil, incompleteResults: true, delayRequest: false, updateActivity: nil)
+            self.trendingPromise.set(paneGifSearchForQuery(context: self.context, query: "", offset: nil, incompleteResults: true, delayRequest: false, updateActivity: nil)
             |> map { items -> ChatMediaInputGifPaneTrendingState? in
                 if let items = items {
                     return ChatMediaInputGifPaneTrendingState(files: items.files, nextOffset: items.nextOffset)
@@ -217,7 +218,7 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
                 }
             })
             
-            let multiplexedNode = MultiplexedVideoNode(account: self.account, theme: self.theme, strings: self.strings)
+            let multiplexedNode = MultiplexedVideoNode(account: self.context.account, theme: self.theme, strings: self.strings)
             self.multiplexedNode = multiplexedNode
             if let layout = self.validLayout {
                 multiplexedNode.frame = CGRect(origin: CGPoint(), size: layout.0)
@@ -235,9 +236,9 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
             
             multiplexedNode.fileSelected = { [weak self] file, sourceNode, sourceRect in
                 if let (collection, result) = file.contextResult {
-                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect, false)
                 } else {
-                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect, false, false)
                 }
             }
             
@@ -289,7 +290,7 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
         let filesSignal: Signal<(MultiplexedVideoNodeFiles, String?), NoError>
         switch self.mode {
         case .recent:
-            filesSignal = combineLatest(self.trendingPromise.get(), self.account.postbox.combinedView(keys: [.orderedItemList(id: Namespaces.OrderedItemList.CloudRecentGifs)]))
+            filesSignal = combineLatest(self.trendingPromise.get(), self.context.account.postbox.combinedView(keys: [.orderedItemList(id: Namespaces.OrderedItemList.CloudRecentGifs)]))
             |> map { trending, view -> (MultiplexedVideoNodeFiles, String?) in
                 var recentGifs: OrderedItemListView?
                 if let orderedView = view.views[.orderedItemList(id: Namespaces.OrderedItemList.CloudRecentGifs)] {
@@ -311,7 +312,7 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
             }
         case .trending:
             if let searchOffset = searchOffset {
-                filesSignal = paneGifSearchForQuery(account: self.account, query: "", offset: searchOffset, incompleteResults: true, delayRequest: false, updateActivity: nil)
+                filesSignal = paneGifSearchForQuery(context: self.context, query: "", offset: searchOffset, incompleteResults: true, delayRequest: false, updateActivity: nil)
                 |> map { result -> (MultiplexedVideoNodeFiles, String?) in
                     let canLoadMore: Bool
                     if let result = result {
@@ -328,7 +329,7 @@ final class ChatMediaInputGifPane: ChatMediaInputPane, UIScrollViewDelegate {
                 }
             }
         case let .emojiSearch(emoji):
-            filesSignal = paneGifSearchForQuery(account: self.account, query: emoji, offset: searchOffset, incompleteResults: true, staleCachedResults: searchOffset == nil, delayRequest: false, updateActivity: nil)
+            filesSignal = paneGifSearchForQuery(context: self.context, query: emoji, offset: searchOffset, incompleteResults: true, staleCachedResults: searchOffset == nil, delayRequest: false, updateActivity: nil)
             |> map { result -> (MultiplexedVideoNodeFiles, String?) in
                 let canLoadMore: Bool
                 if let result = result {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift
index 4df8a95697..3490c85396 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputMetaSectionItemNode.swift
@@ -21,17 +21,19 @@ final class ChatMediaInputMetaSectionItem: ListViewItem {
     let inputNodeInteraction: ChatMediaInputNodeInteraction
     let type: ChatMediaInputMetaSectionItemType
     let theme: PresentationTheme
+    let expanded: Bool
     let selectedItem: () -> Void
     
     var selectable: Bool {
         return true
     }
     
-    init(inputNodeInteraction: ChatMediaInputNodeInteraction, type: ChatMediaInputMetaSectionItemType, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(inputNodeInteraction: ChatMediaInputNodeInteraction, type: ChatMediaInputMetaSectionItemType, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.inputNodeInteraction = inputNodeInteraction
         self.type = type
         self.selectedItem = selected
         self.theme = theme
+        self.expanded = expanded
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
@@ -40,11 +42,11 @@ final class ChatMediaInputMetaSectionItem: ListViewItem {
             Queue.mainQueue().async {
                 node.inputNodeInteraction = self.inputNodeInteraction
                 node.setItem(item: self)
-                node.updateTheme(theme: self.theme)
+                node.updateTheme(theme: self.theme, expanded: self.expanded)
                 node.updateIsHighlighted()
                 node.updateAppearanceTransition(transition: .immediate)
                 
-                node.contentSize = CGSize(width: 41.0, height: 41.0)
+                node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
                 node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
                 
                 completion(node, {
@@ -58,9 +60,9 @@ final class ChatMediaInputMetaSectionItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: node().insets), { _ in
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: node().insets), { _ in
                 (node() as? ChatMediaInputMetaSectionItemNode)?.setItem(item: self)
-                (node() as? ChatMediaInputMetaSectionItemNode)?.updateTheme(theme: self.theme)
+                (node() as? ChatMediaInputMetaSectionItemNode)?.updateTheme(theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -70,16 +72,22 @@ final class ChatMediaInputMetaSectionItem: ListViewItem {
     }
 }
 
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 30.0, height: 30.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageScale: CGFloat = 0.625
+private let highlightSize = CGSize(width: 56.0, height: 56.0)
 private let verticalOffset: CGFloat = 3.0 + UIScreenPixel
 
 final class ChatMediaInputMetaSectionItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let imageNode: ASImageNode
     private let textNodeContainer: ASDisplayNode
     private let textNode: ImmediateTextNode
     private let highlightNode: ASImageNode
+    private let titleNode: ImmediateTextNode
+    
+    private var currentExpanded = false
     
     var item: ChatMediaInputMetaSectionItem?
     var currentCollectionId: ItemCollectionId?
@@ -88,6 +96,11 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode {
     var theme: PresentationTheme?
     
     init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.highlightNode = ASImageNode()
         self.highlightNode.isLayerBacked = true
         self.highlightNode.isHidden = true
@@ -105,22 +118,17 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode {
         self.textNodeContainer.addSubnode(self.textNode)
         self.textNodeContainer.isUserInteractionEnabled = false
         
-        self.highlightNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - highlightSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - highlightSize.height) / 2.0)), size: highlightSize)
-        
-        self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
-        
-        self.textNodeContainer.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        self.titleNode = ImmediateTextNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.imageNode)
-        self.addSubnode(self.textNodeContainer)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
         
-        let imageSize = CGSize(width: 26.0, height: 26.0)
-        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
-        
-        self.textNodeContainer.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0) + 1.0), size: imageSize)
+        self.scalingNode.addSubnode(self.highlightNode)
+        self.scalingNode.addSubnode(self.titleNode)
+        self.scalingNode.addSubnode(self.imageNode)
+        self.scalingNode.addSubnode(self.textNodeContainer)
     }
     
     override func didLoad() {
@@ -139,25 +147,60 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode {
         }
     }
     
-    func updateTheme(theme: PresentationTheme) {
+    func updateTheme(theme: PresentationTheme, expanded: Bool) {
+        let imageSize = CGSize(width: 26.0 * 1.6, height: 26.0 * 1.6)
+        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((expandedBoundingSize.width - imageSize.width) / 2.0), y: floor((expandedBoundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
+        
+        self.textNodeContainer.frame = CGRect(origin: CGPoint(x: floor((expandedBoundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((expandedBoundingSize.height - imageSize.height) / 2.0) + 1.0), size: imageSize)
+        
         if self.theme !== theme {
             self.theme = theme
             
             self.highlightNode.image = PresentationResourcesChat.chatMediaInputPanelHighlightedIconImage(theme)
+            var title = ""
             if let item = self.item {
                 switch item.type {
                 case .savedStickers:
                     self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelSavedStickersIcon(theme)
+                    title = "Favorites"
                 case .recentStickers:
                     self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelRecentStickersIcon(theme)
+                    title = "Recent"
                 case .stickersMode:
                     self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelStickersModeIcon(theme)
+                    title = "Stickers"
                 case .savedGifs:
                     self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelRecentStickersIcon(theme)
+                    title = "GIFs"
                 case .trendingGifs:
                     self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelTrendingGifsIcon(theme)
+                    title = "Trending"
                 case let .gifEmoji(emoji):
                     var emoji = emoji
+                    switch emoji {
+                        case "😡":
+                            title = "Angry"
+                        case "😮":
+                            title = "Surprised"
+                        case "😂":
+                            title = "Joy"
+                        case "😘":
+                            title = "Kiss"
+                        case "😍":
+                            title = "Hearts"
+                        case "👍":
+                            title = "Thumbs Up"
+                        case "👎":
+                            title = "Thumbs Down"
+                        case "🙄":
+                            title = "Roll-eyes"
+                        case "😎":
+                            title = "Cool"
+                        case "🥳":
+                            title = "Party"
+                        default:
+                            break
+                    }
                     if emoji == "🥳" {
                         if #available(iOSApplicationExtension 12.1, iOS 12.1, *) {
                         } else {
@@ -165,12 +208,34 @@ final class ChatMediaInputMetaSectionItemNode: ListViewItemNode {
                         }
                     }
                     self.imageNode.image = nil
-                    self.textNode.attributedText = NSAttributedString(string: emoji, font: Font.regular(27.0), textColor: .black)
+                    self.textNode.attributedText = NSAttributedString(string: emoji, font: Font.regular(43.0), textColor: .black)
                     let textSize = self.textNode.updateLayout(CGSize(width: 100.0, height: 100.0))
                     self.textNode.frame = CGRect(origin: CGPoint(x: floor((self.textNodeContainer.bounds.width - textSize.width) / 2.0), y: floor((self.textNodeContainer.bounds.height - textSize.height) / 2.0)), size: textSize)
                 }
             }
+            self.titleNode.attributedText = NSAttributedString(string: title, font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
         }
+                
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.imageNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        expandTransition.updateTransformScale(node: self.titleNode, scale: expanded ? 1.0 : 0.001)
+        
+        self.currentExpanded = expanded
+        
+        expandTransition.updateFrame(node: self.highlightNode, frame: expanded ? titleFrame.insetBy(dx: -7.0, dy: -2.0) : CGRect(origin: CGPoint(x: self.imageNode.position.x - highlightSize.width / 2.0, y: self.imageNode.position.y - highlightSize.height / 2.0), size: highlightSize))
     }
     
     func updateIsHighlighted() {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
index 96404e4872..c514206dbb 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputNode.swift
@@ -34,6 +34,7 @@ struct ChatMediaInputPanelTransition {
     let deletions: [ListViewDeleteItem]
     let insertions: [ListViewInsertItem]
     let updates: [ListViewUpdateItem]
+    let scrollToItem: ListViewScrollToItem?
 }
 
 struct ChatMediaInputGridTransition {
@@ -47,14 +48,14 @@ struct ChatMediaInputGridTransition {
     let animated: Bool
 }
 
-func preparedChatMediaInputPanelEntryTransition(context: AccountContext, from fromEntries: [ChatMediaInputPanelEntry], to toEntries: [ChatMediaInputPanelEntry], inputNodeInteraction: ChatMediaInputNodeInteraction) -> ChatMediaInputPanelTransition {
+func preparedChatMediaInputPanelEntryTransition(context: AccountContext, from fromEntries: [ChatMediaInputPanelEntry], to toEntries: [ChatMediaInputPanelEntry], inputNodeInteraction: ChatMediaInputNodeInteraction, scrollToItem: ListViewScrollToItem?) -> ChatMediaInputPanelTransition {
     let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
     
     let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
     let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, inputNodeInteraction: inputNodeInteraction), directionHint: nil) }
     let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, inputNodeInteraction: inputNodeInteraction), directionHint: nil) }
     
-    return ChatMediaInputPanelTransition(deletions: deletions, insertions: insertions, updates: updates)
+    return ChatMediaInputPanelTransition(deletions: deletions, insertions: insertions, updates: updates, scrollToItem: scrollToItem)
 }
 
 func preparedChatMediaInputGridEntryTransition(account: Account, view: ItemCollectionsView, from fromEntries: [ChatMediaInputGridEntry], to toEntries: [ChatMediaInputGridEntry], update: StickerPacksCollectionUpdate, interfaceInteraction: ChatControllerInteraction, inputNodeInteraction: ChatMediaInputNodeInteraction, trendingInteraction: TrendingPaneInteraction) -> ChatMediaInputGridTransition {
@@ -152,16 +153,16 @@ func preparedChatMediaInputGridEntryTransition(account: Account, view: ItemColle
     return ChatMediaInputGridTransition(deletions: deletions, insertions: insertions, updates: updates, updateFirstIndexInSectionOffset: firstIndexInSectionOffset, stationaryItems: stationaryItems, scrollToItem: scrollToItem, updateOpaqueState: opaqueState, animated: animated)
 }
 
-func chatMediaInputPanelEntries(view: ItemCollectionsView, savedStickers: OrderedItemListView?, recentStickers: OrderedItemListView?, peerSpecificPack: PeerSpecificPackData?, canInstallPeerSpecificPack: CanInstallPeerSpecificPack, hasUnreadTrending: Bool?, theme: PresentationTheme, hasGifs: Bool = true, hasSettings: Bool = true) -> [ChatMediaInputPanelEntry] {
+func chatMediaInputPanelEntries(view: ItemCollectionsView, savedStickers: OrderedItemListView?, recentStickers: OrderedItemListView?, peerSpecificPack: PeerSpecificPackData?, canInstallPeerSpecificPack: CanInstallPeerSpecificPack, hasUnreadTrending: Bool?, theme: PresentationTheme, hasGifs: Bool = true, hasSettings: Bool = true, expanded: Bool = false) -> [ChatMediaInputPanelEntry] {
     var entries: [ChatMediaInputPanelEntry] = []
     if hasGifs {
-        entries.append(.recentGifs(theme))
+        entries.append(.recentGifs(theme, expanded))
     }
     if let hasUnreadTrending = hasUnreadTrending {
-        entries.append(.trending(hasUnreadTrending, theme))
+        entries.append(.trending(hasUnreadTrending, theme, expanded))
     }
     if let savedStickers = savedStickers, !savedStickers.items.isEmpty {
-        entries.append(.savedStickers(theme))
+        entries.append(.savedStickers(theme, expanded))
     }
     var savedStickerIds = Set<Int64>()
     if let savedStickers = savedStickers, !savedStickers.items.isEmpty {
@@ -182,40 +183,40 @@ func chatMediaInputPanelEntries(view: ItemCollectionsView, savedStickers: Ordere
             }
         }
         if found {
-            entries.append(.recentPacks(theme))
+            entries.append(.recentPacks(theme, expanded))
         }
     }
     if let peerSpecificPack = peerSpecificPack {
-        entries.append(.peerSpecific(theme: theme, peer: peerSpecificPack.peer))
+        entries.append(.peerSpecific(theme: theme, peer: peerSpecificPack.peer, expanded: expanded))
     } else if case let .available(peer, false) = canInstallPeerSpecificPack {
-        entries.append(.peerSpecific(theme: theme, peer: peer))
+        entries.append(.peerSpecific(theme: theme, peer: peer, expanded: expanded))
     }
     var index = 0
     for (_, info, item) in view.collectionInfos {
         if let info = info as? StickerPackCollectionInfo, item != nil {
-            entries.append(.stickerPack(index: index, info: info, topItem: item as? StickerPackItem, theme: theme))
+            entries.append(.stickerPack(index: index, info: info, topItem: item as? StickerPackItem, theme: theme, expanded: expanded))
             index += 1
         }
     }
     
     if peerSpecificPack == nil, case let .available(peer, true) = canInstallPeerSpecificPack {
-        entries.append(.peerSpecific(theme: theme, peer: peer))
+        entries.append(.peerSpecific(theme: theme, peer: peer, expanded: expanded))
     }
     
     if hasSettings {
-        entries.append(.settings(theme))
+        entries.append(.settings(theme, expanded))
     }
     return entries
 }
 
-func chatMediaInputPanelGifModeEntries(theme: PresentationTheme, reactions: [String]) -> [ChatMediaInputPanelEntry] {
+func chatMediaInputPanelGifModeEntries(theme: PresentationTheme, reactions: [String], expanded: Bool) -> [ChatMediaInputPanelEntry] {
     var entries: [ChatMediaInputPanelEntry] = []
-    entries.append(.stickersMode(theme))
-    entries.append(.savedGifs(theme))
-    entries.append(.trendingGifs(theme))
+    entries.append(.stickersMode(theme, expanded))
+    entries.append(.savedGifs(theme, expanded))
+    entries.append(.trendingGifs(theme, expanded))
     
     for reaction in reactions {
-        entries.append(.gifEmotion(entries.count, theme, reaction))
+        entries.append(.gifEmotion(entries.count, theme, reaction, expanded))
     }
     
     return entries
@@ -422,23 +423,26 @@ final class ChatMediaInputNode: ChatInputNode {
     
     private var inputNodeInteraction: ChatMediaInputNodeInteraction!
     private var trendingInteraction: TrendingPaneInteraction?
-    
+
     private let collectionListPanel: ASDisplayNode
     private let collectionListSeparator: ASDisplayNode
     private let collectionListContainer: CollectionListContainerNode
     
+    private weak var peekController: PeekController?
+    
     private let disposable = MetaDisposable()
     
     private let listView: ListView
     private let gifListView: ListView
     private var searchContainerNode: PaneSearchContainerNode?
     private let searchContainerNodeLoadedDisposable = MetaDisposable()
-    
+
+    private let paneClippingContainer: ASDisplayNode
+    private let panesBackgroundNode: ASDisplayNode
     private let stickerPane: ChatMediaInputStickerPane
     private var animatingStickerPaneOut = false
     private let gifPane: ChatMediaInputGifPane
     private var animatingGifPaneOut = false
-    //private let trendingPane: ChatMediaInputTrendingPane
     private var animatingTrendingPaneOut = false
     
     private var panRecognizer: UIPanGestureRecognizer?
@@ -448,6 +452,15 @@ final class ChatMediaInputNode: ChatInputNode {
     private var currentView: ItemCollectionsView?
     private let dismissedPeerSpecificStickerPack = Promise<Bool>()
     
+    private var panelCollapseScrollToIndex: Int?
+    private let panelExpandedPromise = ValuePromise<Bool>(false)
+    private var panelExpanded: Bool = false {
+        didSet {
+            self.panelExpandedPromise.set(self.panelExpanded)
+        }
+    }
+    private var panelCollapseTimer: SwiftSignalKit.Timer?
+    
     var requestDisableStickerAnimations: ((Bool) -> Void)?
     
     private var validLayout: (CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, CGFloat, ChatPresentationInterfaceState, DeviceMetrics, Bool)?
@@ -473,18 +486,17 @@ final class ChatMediaInputNode: ChatInputNode {
         self.strings = strings
         self.fontSize = fontSize
         self.gifPaneIsActiveUpdated = gifPaneIsActiveUpdated
+
+        self.paneClippingContainer = ASDisplayNode()
+        self.paneClippingContainer.clipsToBounds = true
+
+        self.panesBackgroundNode = ASDisplayNode()
         
         self.themeAndStringsPromise = Promise((theme, strings))
-        
+
         self.collectionListPanel = ASDisplayNode()
         self.collectionListPanel.clipsToBounds = true
         
-        if case let .color(color) = chatWallpaper, UIColor(rgb: color).isEqual(theme.chat.inputPanel.panelBackgroundColorNoWallpaper) {
-            self.collectionListPanel.backgroundColor = theme.chat.inputPanel.panelBackgroundColorNoWallpaper
-        } else {
-            self.collectionListPanel.backgroundColor = theme.chat.inputPanel.panelBackgroundColor
-        }
-        
         self.collectionListSeparator = ASDisplayNode()
         self.collectionListSeparator.isLayerBacked = true
         self.collectionListSeparator.backgroundColor = theme.chat.inputMediaPanel.panelSeparatorColor
@@ -493,6 +505,7 @@ final class ChatMediaInputNode: ChatInputNode {
         self.collectionListContainer.clipsToBounds = true
         
         self.listView = ListView()
+//        self.listView.clipsToBounds = false
         self.listView.transform = CATransform3DMakeRotation(-CGFloat(Double.pi / 2.0), 0.0, 0.0, 1.0)
         self.listView.scroller.panGestureRecognizer.cancelsTouchesInView = false
         self.listView.accessibilityPageScrolledString = { row, count in
@@ -500,6 +513,7 @@ final class ChatMediaInputNode: ChatInputNode {
         }
         
         self.gifListView = ListView()
+//        self.gifListView.clipsToBounds = false
         self.gifListView.transform = CATransform3DMakeRotation(-CGFloat(Double.pi / 2.0), 0.0, 0.0, 1.0)
         self.gifListView.scroller.panGestureRecognizer.cancelsTouchesInView = false
         self.gifListView.accessibilityPageScrolledString = { row, count in
@@ -515,7 +529,7 @@ final class ChatMediaInputNode: ChatInputNode {
         }, fixPaneScroll: { pane, state in
             fixPaneScrollImpl?(pane, state)
         })
-        self.gifPane = ChatMediaInputGifPane(account: context.account, theme: theme, strings: strings, controllerInteraction: controllerInteraction, paneDidScroll: { pane, state, transition in
+        self.gifPane = ChatMediaInputGifPane(context: context, theme: theme, strings: strings, controllerInteraction: controllerInteraction, paneDidScroll: { pane, state, transition in
             paneDidScrollImpl?(pane, state, transition)
         }, fixPaneScroll: { pane, state in
             fixPaneScrollImpl?(pane, state)
@@ -524,11 +538,8 @@ final class ChatMediaInputNode: ChatInputNode {
         })
         
         var getItemIsPreviewedImpl: ((StickerPackItem) -> Bool)?
-        /*self.trendingPane = ChatMediaInputTrendingPane(context: context, controllerInteraction: controllerInteraction, getItemIsPreviewed: { item in
-            return getItemIsPreviewedImpl?(item) ?? false
-        }, isPane: true)*/
         
-        self.paneArrangement = ChatMediaInputPaneArrangement(panes: [.gifs, .stickers, /*.trending*/], currentIndex: 1, indexTransition: 0.0)
+        self.paneArrangement = ChatMediaInputPaneArrangement(panes: [.gifs, .stickers], currentIndex: 1, indexTransition: 0.0)
         
         super.init()
         
@@ -543,13 +554,12 @@ final class ChatMediaInputNode: ChatInputNode {
                         sendSticker: {
                             fileReference, sourceNode, sourceRect in
                             if let strongSelf = self {
-                                return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                                return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                             } else {
                                 return false
                             }
                         }
                     ))
-                    //strongSelf.setCurrentPane(.trending, transition: .animated(duration: 0.25, curve: .spring))
                 } else if collectionId.namespace == ChatMediaInputPanelAuxiliaryNamespace.savedStickers.rawValue {
                     strongSelf.setCurrentPane(.stickers, transition: .animated(duration: 0.25, curve: .spring), collectionIdHint: collectionId.namespace)
                     strongSelf.currentStickerPacksCollectionPosition = .navigate(index: nil, collectionId: collectionId)
@@ -689,8 +699,10 @@ final class ChatMediaInputNode: ChatInputNode {
             return false
         }
         
-        self.backgroundColor = theme.chat.inputMediaPanel.stickersBackgroundColor.withAlphaComponent(1.0)
-        
+        self.panesBackgroundNode.backgroundColor = theme.chat.inputMediaPanel.stickersBackgroundColor.withAlphaComponent(1.0)
+
+        self.addSubnode(self.paneClippingContainer)
+        self.paneClippingContainer.addSubnode(panesBackgroundNode)
         self.collectionListPanel.addSubnode(self.listView)
         self.collectionListPanel.addSubnode(self.gifListView)
         self.gifListView.isHidden = true
@@ -760,7 +772,7 @@ final class ChatMediaInputNode: ChatInputNode {
                 
                 return false
             })
-            peerSpecificPack = combineLatest(peerSpecificStickerPack(postbox: context.account.postbox, network: context.account.network, peerId: peerId), context.account.postbox.multiplePeersView([peerId]), self.dismissedPeerSpecificStickerPack.get())
+            peerSpecificPack = combineLatest(context.engine.peers.peerSpecificStickerPack(peerId: peerId), context.account.postbox.multiplePeersView([peerId]), self.dismissedPeerSpecificStickerPack.get())
             |> map { packData, peersView, dismissedPeerSpecificPack -> (PeerSpecificPackData?, CanInstallPeerSpecificPack) in
                 if let peer = peersView.peers[peerId] {
                     var canInstall: CanInstallPeerSpecificPack = .none
@@ -780,17 +792,17 @@ final class ChatMediaInputNode: ChatInputNode {
         }
         
         let trendingInteraction = TrendingPaneInteraction(installPack: { [weak self] info in
-            guard let strongSelf = self, let info = info as? StickerPackCollectionInfo else {
+            guard let info = info as? StickerPackCollectionInfo else {
                 return
             }
-            let _ = (loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
+            let _ = (context.engine.stickers.loadedStickerPack(reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
             |> mapToSignal { result -> Signal<Void, NoError> in
                 switch result {
                     case let .result(info, items, installed):
                         if installed {
                             return .complete()
                         } else {
-                            return addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items)
+                            return context.engine.stickers.addStickerPackInteractively(info: info, items: items)
                         }
                     case .fetching:
                         break
@@ -814,7 +826,7 @@ final class ChatMediaInputNode: ChatInputNode {
             let packReference: StickerPackReference = .id(id: info.id.id, accessHash: info.accessHash)
             let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { fileReference, sourceNode, sourceRect in
                 if let strongSelf = self {
-                    return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                    return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                 } else {
                     return false
                 }
@@ -845,8 +857,8 @@ final class ChatMediaInputNode: ChatInputNode {
         
         let previousView = Atomic<ItemCollectionsView?>(value: nil)
         let transitionQueue = Queue()
-        let transitions = combineLatest(queue: transitionQueue, itemCollectionsView, peerSpecificPack, context.account.viewTracker.featuredStickerPacks(), self.themeAndStringsPromise.get(), reactions)
-        |> map { viewAndUpdate, peerSpecificPack, trendingPacks, themeAndStrings, reactions -> (ItemCollectionsView, ChatMediaInputPanelTransition, ChatMediaInputPanelTransition, Bool, ChatMediaInputGridTransition, Bool) in
+        let transitions = combineLatest(queue: transitionQueue, itemCollectionsView, peerSpecificPack, context.account.viewTracker.featuredStickerPacks(), self.themeAndStringsPromise.get(), reactions, self.panelExpandedPromise.get())
+        |> map { viewAndUpdate, peerSpecificPack, trendingPacks, themeAndStrings, reactions, panelExpanded -> (ItemCollectionsView, ChatMediaInputPanelTransition, ChatMediaInputPanelTransition, Bool, ChatMediaInputGridTransition, Bool) in
             let (view, viewUpdate) = viewAndUpdate
             let previous = previousView.swap(view)
             var update = viewUpdate
@@ -881,8 +893,8 @@ final class ChatMediaInputNode: ChatInputNode {
                 }
             }
             
-            let panelEntries = chatMediaInputPanelEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: peerSpecificPack.0, canInstallPeerSpecificPack: peerSpecificPack.1, hasUnreadTrending: hasUnreadTrending, theme: theme)
-            let gifPaneEntries = chatMediaInputPanelGifModeEntries(theme: theme, reactions: reactions)
+            let panelEntries = chatMediaInputPanelEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: peerSpecificPack.0, canInstallPeerSpecificPack: peerSpecificPack.1, hasUnreadTrending: hasUnreadTrending, theme: theme, expanded: panelExpanded)
+            let gifPaneEntries = chatMediaInputPanelGifModeEntries(theme: theme, reactions: reactions, expanded: panelExpanded)
             var gridEntries = chatMediaInputGridEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: peerSpecificPack.0, canInstallPeerSpecificPack: peerSpecificPack.1, strings: strings, theme: theme)
             
             if view.higher == nil {
@@ -900,9 +912,9 @@ final class ChatMediaInputNode: ChatInputNode {
                     }
                 }
             }
-            
+
             let (previousPanelEntries, previousGifPaneEntries, previousGridEntries) = previousEntries.swap((panelEntries, gifPaneEntries, gridEntries))
-            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: inputNodeInteraction), preparedChatMediaInputPanelEntryTransition(context: context, from: previousGifPaneEntries, to: gifPaneEntries, inputNodeInteraction: inputNodeInteraction), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: inputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
+            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: inputNodeInteraction, scrollToItem: nil), preparedChatMediaInputPanelEntryTransition(context: context, from: previousGifPaneEntries, to: gifPaneEntries, inputNodeInteraction: inputNodeInteraction, scrollToItem: nil), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: inputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
         }
         
         self.disposable.set((transitions
@@ -969,7 +981,6 @@ final class ChatMediaInputNode: ChatInputNode {
         
         self.stickerPane.inputNodeInteraction = self.inputNodeInteraction
         self.gifPane.inputNodeInteraction = self.inputNodeInteraction
-        //self.trendingPane.inputNodeInteraction = self.inputNodeInteraction
         
         paneDidScrollImpl = { [weak self] pane, state, transition in
             self?.updatePaneDidScroll(pane: pane, state: state, transition: transition)
@@ -982,11 +993,59 @@ final class ChatMediaInputNode: ChatInputNode {
         openGifContextMenuImpl = { [weak self] file, sourceNode, sourceRect, gesture, isSaved in
             self?.openGifContextMenu(file: file, sourceNode: sourceNode, sourceRect: sourceRect, gesture: gesture, isSaved: isSaved)
         }
+        
+        self.listView.beganInteractiveDragging = { [weak self] position in
+            if let strongSelf = self, false {
+                if !strongSelf.panelExpanded, let index = strongSelf.listView.itemIndexAtPoint(CGPoint(x: 0.0, y: position.y)) {
+                    strongSelf.panelCollapseScrollToIndex = index
+                }
+                strongSelf.updateIsExpanded(true)
+            }
+        }
+        
+        self.listView.didEndScrolling = { [weak self] in
+            if let strongSelf = self, false {
+                strongSelf.setupCollapseTimer()
+            }
+        }
+        
+        self.gifListView.beganInteractiveDragging = { [weak self] position in
+            if let strongSelf = self, false {
+                if !strongSelf.panelExpanded, let index = strongSelf.gifListView.itemIndexAtPoint(CGPoint(x: 0.0, y: position.y)) {
+                    strongSelf.panelCollapseScrollToIndex = index
+                }
+                strongSelf.updateIsExpanded(true)
+            }
+        }
+        
+        self.gifListView.didEndScrolling = { [weak self] in
+            if let strongSelf = self, false {
+                strongSelf.setupCollapseTimer()
+            }
+        }
     }
     
     deinit {
         self.disposable.dispose()
         self.searchContainerNodeLoadedDisposable.dispose()
+        self.panelCollapseTimer?.invalidate()
+    }
+    
+    private func updateIsExpanded(_ isExpanded: Bool) {
+        self.panelCollapseTimer?.invalidate()
+        
+        self.panelExpanded = isExpanded
+        self.updatePaneClippingContainer(size: self.paneClippingContainer.bounds.size, offset: self.currentCollectionListPanelOffset(), transition: .animated(duration: 0.3, curve: .spring))
+    }
+    
+    private func setupCollapseTimer() {
+        self.panelCollapseTimer?.invalidate()
+        
+        let timer = SwiftSignalKit.Timer(timeout: 1.5, repeat: false, completion: { [weak self] in
+            self?.updateIsExpanded(false)
+        }, queue: Queue.mainQueue())
+        self.panelCollapseTimer = timer
+        timer.start()
     }
     
     private func openGifContextMenu(file: MultiplexedVideoNodeFile, sourceNode: ASDisplayNode, sourceRect: CGRect, gesture: ContextGesture, isSaved: Bool) {
@@ -1008,7 +1067,7 @@ final class ChatMediaInputNode: ChatInputNode {
                 return
             }
             
-            let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: PeerId(namespace: 0, id: 0), namespace: Namespaces.Message.Local, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [file.file.media], peers: SimpleDictionary(), associatedMessages: SimpleDictionary(), associatedMessageIds: [])
+            let message = Message(stableId: 0, stableVersion: 0, id: MessageId(peerId: PeerId(0), namespace: Namespaces.Message.Local, id: 0), globallyUniqueId: nil, groupingKey: nil, groupInfo: nil, threadId: nil, timestamp: 0, flags: [], tags: [], globalTags: [], localTags: [], forwardInfo: nil, author: nil, text: "", attributes: [], media: [file.file.media], peers: SimpleDictionary(), associatedMessages: SimpleDictionary(), associatedMessageIds: [])
             
             let gallery = GalleryController(context: strongSelf.context, source: .standaloneMessage(message), streamSingleVideo: true, replaceRootController: { _, _ in
             }, baseNavigationController: nil)
@@ -1020,11 +1079,45 @@ final class ChatMediaInputNode: ChatInputNode {
             }, action: { _, f in
                 f(.default)
                 if isSaved {
-                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect, false, false)
                 } else if let (collection, result) = file.contextResult {
-                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect, false)
                 }
             })))
+            
+            if let (_, _, _, _, _, _, _, _, interfaceState, _, _) = strongSelf.validLayout {
+                var isScheduledMessages = false
+                if case .scheduledMessages = interfaceState.subject {
+                    isScheduledMessages = true
+                }
+                if !isScheduledMessages {
+                    if case let .peer(peerId) = interfaceState.chatLocation {
+                        if peerId != self?.context.account.peerId && peerId.namespace != Namespaces.Peer.SecretChat  {
+                            items.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_SendSilently, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/SilentIcon"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                f(.default)
+                                if isSaved {
+                                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect, true, false)
+                                } else if let (collection, result) = file.contextResult {
+                                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect, true)
+                                }
+                            })))
+                        }
+                    
+                        if isSaved {
+                            items.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                f(.default)
+                                
+                                let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect, false, true)
+                            })))
+                        }
+                    }
+                }
+            }
+            
             if isSaved || isGifSaved {
                 items.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_ContextMenuDelete, textColor: .destructive, icon: { theme in
                     return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.actionSheet.destructiveActionTextColor)
@@ -1061,20 +1154,13 @@ final class ChatMediaInputNode: ChatInputNode {
             self.theme = theme
             self.strings = strings
             
-            if case let .color(color) = chatWallpaper, UIColor(rgb: color).isEqual(theme.chat.inputPanel.panelBackgroundColorNoWallpaper) {
-                self.collectionListPanel.backgroundColor = theme.chat.inputPanel.panelBackgroundColorNoWallpaper
-            } else {
-                self.collectionListPanel.backgroundColor = theme.chat.inputPanel.panelBackgroundColor
-            }
-            
             self.collectionListSeparator.backgroundColor = theme.chat.inputMediaPanel.panelSeparatorColor
-            self.backgroundColor = theme.chat.inputMediaPanel.stickersBackgroundColor.withAlphaComponent(1.0)
+            self.panesBackgroundNode.backgroundColor = theme.chat.inputMediaPanel.stickersBackgroundColor.withAlphaComponent(1.0)
             
             self.searchContainerNode?.updateThemeAndStrings(theme: theme, strings: strings)
             
             self.stickerPane.updateThemeAndStrings(theme: theme, strings: strings)
             self.gifPane.updateThemeAndStrings(theme: theme, strings: strings)
-            //self.trendingPane.updateThemeAndStrings(theme: theme, strings: strings)
             
             self.themeAndStringsPromise.set(.single((theme, strings)))
         }
@@ -1098,16 +1184,48 @@ final class ChatMediaInputNode: ChatInputNode {
                             |> deliverOnMainQueue
                             |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                                 if let strongSelf = self {
-                                    var menuItems: [PeekControllerMenuItem] = []
-                                    menuItems = [
-                                        PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { node, rect in
-                                            if let strongSelf = self {
-                                                return strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), nil, false, node, rect)
-                                            } else {
-                                                return false
+                                    var menuItems: [ContextMenuItem] = []                                    
+                                    if let (_, _, _, _, _, _, _, _, interfaceState, _, _) = strongSelf.validLayout {
+                                        var isScheduledMessages = false
+                                        if case .scheduledMessages = interfaceState.subject {
+                                            isScheduledMessages = true
+                                        }
+                                        if !isScheduledMessages {
+                                            if case let .peer(peerId) = interfaceState.chatLocation {
+                                                if peerId != self?.context.account.peerId && peerId.namespace != Namespaces.Peer.SecretChat  {
+                                                    menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_SendSilently, icon: { theme in
+                                                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/SilentIcon"), color: theme.actionSheet.primaryTextColor)
+                                                    }, action: { _, f in
+                                                        if let strongSelf = self, let peekController = strongSelf.peekController {
+                                                            if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                                let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), true, false, nil, false, animationNode, animationNode.bounds)
+                                                            } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                                let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), true, false, nil, false, imageNode, imageNode.bounds)
+                                                            }
+                                                        }
+                                                        f(.default)
+                                                    })))
+                                                }
+                                            
+                                                menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
+                                                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
+                                                }, action: { _, f in
+                                                    if let strongSelf = self, let peekController = strongSelf.peekController {
+                                                        if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                            let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), false, true, nil, false, animationNode, animationNode.bounds)
+                                                        } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                            let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), false, true, nil, false, imageNode, imageNode.bounds)
+                                                        }
+                                                    }
+                                                    f(.default)
+                                                })))
                                             }
-                                        }),
-                                        PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                        }
+                                    }
+                                    menuItems.append(
+                                        .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                            f(.default)
+                                            
                                             if let strongSelf = self {
                                                 if isStarred {
                                                     let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -1115,9 +1233,13 @@ final class ChatMediaInputNode: ChatInputNode {
                                                     let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                                 }
                                             }
-                                            return true
-                                        }),
-                                        PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                        }))
+                                    )
+                                    menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in
+                                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.actionSheet.primaryTextColor)
+                                        }, action: { _, f in
+                                            f(.default)
+                                            
                                             if let strongSelf = self {
                                                 loop: for attribute in item.file.attributes {
                                                     switch attribute {
@@ -1125,7 +1247,7 @@ final class ChatMediaInputNode: ChatInputNode {
                                                         if let packReference = packReference {
                                                             let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
                                                                 if let strongSelf = self {
-                                                                    return strongSelf.controllerInteraction.sendSticker(file, nil, false, sourceNode, sourceRect)
+                                                                    return strongSelf.controllerInteraction.sendSticker(file, false, false, nil, false, sourceNode, sourceRect)
                                                                 } else {
                                                                     return false
                                                                 }
@@ -1140,10 +1262,7 @@ final class ChatMediaInputNode: ChatInputNode {
                                                     }
                                                 }
                                             }
-                                            return true
-                                        }),
-                                        PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
-                                    ]
+                                    })))
                                     return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: item, menu: menuItems))
                                 } else {
                                     return nil
@@ -1154,7 +1273,7 @@ final class ChatMediaInputNode: ChatInputNode {
                         }
                     }
                 } else {
-                    panes = [strongSelf.gifPane, strongSelf.stickerPane/*, strongSelf.trendingPane*/]
+                    panes = [strongSelf.gifPane, strongSelf.stickerPane]
                 }
                 let panelPoint = strongSelf.view.convert(point, to: strongSelf.collectionListPanel.view)
                 if panelPoint.y < strongSelf.collectionListPanel.frame.maxY {
@@ -1182,16 +1301,49 @@ final class ChatMediaInputNode: ChatInputNode {
                                 |> deliverOnMainQueue
                                 |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                                     if let strongSelf = self {
-                                        var menuItems: [PeekControllerMenuItem] = []
-                                        menuItems = [
-                                            PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { node, rect in
-                                                if let strongSelf = self {
-                                                    return strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), nil, false, node, rect)
-                                                } else {
-                                                    return false
+                                        var menuItems: [ContextMenuItem] = []
+                                        if let (_, _, _, _, _, _, _, _, interfaceState, _, _) = strongSelf.validLayout {
+                                            var isScheduledMessages = false
+                                            if case .scheduledMessages = interfaceState.subject {
+                                                isScheduledMessages = true
+                                            }
+                                            if !isScheduledMessages {
+                                                if case let .peer(peerId) = interfaceState.chatLocation {
+                                                    if peerId != self?.context.account.peerId && peerId.namespace != Namespaces.Peer.SecretChat  {
+                                                        menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_SendSilently, icon: { theme in
+                                                            return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/SilentIcon"), color: theme.actionSheet.primaryTextColor)
+                                                        }, action: { _, f in
+                                                            if let strongSelf = self, let peekController = strongSelf.peekController {
+                                                                if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                                    let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), true, false, nil, false, animationNode, animationNode.bounds)
+                                                                } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                                    let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), true, false, nil, false, imageNode, imageNode.bounds)
+                                                                }
+                                                            }
+                                                            f(.default)
+                                                        })))
+                                                    }
+                                                
+                                                    menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Conversation_SendMessage_ScheduleMessage, icon: { theme in
+                                                        return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Menu/ScheduleIcon"), color: theme.actionSheet.primaryTextColor)
+                                                    }, action: { _, f in
+                                                        if let strongSelf = self, let peekController = strongSelf.peekController {
+                                                            if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                                let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), false, true, nil, false, animationNode, animationNode.bounds)
+                                                            } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                                let _ = strongSelf.controllerInteraction.sendSticker(.standalone(media: item.file), false, true, nil, false, imageNode, imageNode.bounds)
+                                                            }
+                                                        }
+                                                        f(.default)
+                                                    })))
                                                 }
-                                            }),
-                                            PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                            }
+                                        }
+                                        
+                                        menuItems.append(
+                                            .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                                f(.default)
+                                                
                                                 if let strongSelf = self {
                                                     if isStarred {
                                                         let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -1199,35 +1351,38 @@ final class ChatMediaInputNode: ChatInputNode {
                                                         let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                                     }
                                                 }
-                                                return true
-                                            }),
-                                            PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                            }))
+                                        )
+                                        menuItems.append(
+                                            .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in
+                                                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.actionSheet.primaryTextColor)
+                                            }, action: { _, f in
+                                                f(.default)
+                                                
                                                 if let strongSelf = self {
                                                     loop: for attribute in item.file.attributes {
                                                         switch attribute {
-                                                            case let .Sticker(_, packReference, _):
-                                                                if let packReference = packReference {
-                                                                    let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
-                                                                                                                                               if let strongSelf = self {
-                                                                                                                                                   return strongSelf.controllerInteraction.sendSticker(file, nil, false, sourceNode, sourceRect)
-                                                                                                                                               } else {
-                                                                                                                                                   return false
-                                                                                                                                               }
-                                                                    })
-                                                          
-                                                                    strongSelf.controllerInteraction.navigationController()?.view.window?.endEditing(true)
-                                                                    strongSelf.controllerInteraction.presentController(controller, nil)
-                                                                }
-                                                                break loop
-                                                            default:
-                                                                break
+                                                        case let .Sticker(_, packReference, _):
+                                                            if let packReference = packReference {
+                                                                let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
+                                                                    if let strongSelf = self {
+                                                                        return strongSelf.controllerInteraction.sendSticker(file, false, false, nil, false, sourceNode, sourceRect)
+                                                                    } else {
+                                                                        return false
+                                                                    }
+                                                                })
+                                                                
+                                                                strongSelf.controllerInteraction.navigationController()?.view.window?.endEditing(true)
+                                                                strongSelf.controllerInteraction.presentController(controller, nil)
+                                                            }
+                                                            break loop
+                                                        default:
+                                                            break
                                                         }
                                                     }
                                                 }
-                                                return true
-                                            }),
-                                            PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
-                                        ]
+                                            }))
+                                        )
                                         return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                                     } else {
                                         return nil
@@ -1241,13 +1396,15 @@ final class ChatMediaInputNode: ChatInputNode {
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: {
+                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                let controller = PeekController(presentationData: presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
                 controller.visibilityUpdated = { [weak self] visible in
                     self?.requestDisableStickerAnimations?(visible)
                     self?.simulateUpdateLayout(isVisible: !visible)
                 }
+                strongSelf.peekController = controller
                 strongSelf.controllerInteraction.presentGlobalOverlayController(controller, nil)
                 return controller
             }
@@ -1268,19 +1425,11 @@ final class ChatMediaInputNode: ChatInputNode {
     }
     
     private func setCurrentPane(_ pane: ChatMediaInputPaneType, transition: ContainedViewLayoutTransition, collectionIdHint: Int32? = nil) {
-        var transition = transition
-        
         if let index = self.paneArrangement.panes.firstIndex(of: pane), index != self.paneArrangement.currentIndex {
             let previousGifPanelWasActive = self.paneArrangement.panes[self.paneArrangement.currentIndex] == .gifs
-            //let previousTrendingPanelWasActive = self.paneArrangement.panes[self.paneArrangement.currentIndex] == .trending
             self.paneArrangement = self.paneArrangement.withIndexTransition(0.0).withCurrentIndex(index)
             let updatedGifPanelWasActive = self.paneArrangement.panes[self.paneArrangement.currentIndex] == .gifs
-            //let updatedTrendingPanelIsActive = self.paneArrangement.panes[self.paneArrangement.currentIndex] == .trending
-            
-            /*if updatedTrendingPanelIsActive != previousTrendingPanelWasActive {
-                transition = .immediate
-            }*/
-            
+  
             if let (width, leftInset, rightInset, bottomInset, standardInputHeight, inputHeight, maximumHeight, inputPanelHeight, interfaceState, deviceMetrics, isVisible) = self.validLayout {
                 let _ = self.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, bottomInset: bottomInset, standardInputHeight: standardInputHeight, inputHeight: inputHeight, maximumHeight: maximumHeight, inputPanelHeight: inputPanelHeight, transition: transition, interfaceState: interfaceState, deviceMetrics: deviceMetrics, isVisible: isVisible)
                 self.updateAppearanceTransition(transition: transition)
@@ -1297,23 +1446,7 @@ final class ChatMediaInputNode: ChatInputNode {
                     } else if let collectionIdHint = collectionIdHint {
                         self.setHighlightedItemCollectionId(ItemCollectionId(namespace: collectionIdHint, id: 0))
                     }
-                /*case .trending:
-                    self.setHighlightedItemCollectionId(ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.trending.rawValue, id: 0))*/
             }
-            /*if updatedTrendingPanelIsActive != previousTrendingPanelWasActive {
-                self.controllerInteraction.updateInputMode { current in
-                    switch current {
-                    case let .media(mode, _):
-                        if updatedTrendingPanelIsActive {
-                            return .media(mode: mode, expanded: .content)
-                        } else {
-                            return .media(mode: mode, expanded: nil)
-                        }
-                    default:
-                        return current
-                    }
-                }
-            }*/
         } else {
             if let (width, leftInset, rightInset, bottomInset, standardInputHeight, inputHeight, maximumHeight, inputPanelHeight, interfaceState, deviceMetrics, isVisible) = self.validLayout {
                 let _ = self.updateLayout(width: width, leftInset: leftInset, rightInset: rightInset, bottomInset: bottomInset, standardInputHeight: standardInputHeight, inputHeight: inputHeight, maximumHeight: maximumHeight, inputPanelHeight: inputPanelHeight, transition: .animated(duration: 0.25, curve: .spring), interfaceState: interfaceState, deviceMetrics: deviceMetrics, isVisible: isVisible)
@@ -1326,10 +1459,6 @@ final class ChatMediaInputNode: ChatInputNode {
             if self.paneArrangement.panes[self.paneArrangement.currentIndex] == .gifs {
                 self.inputNodeInteraction.highlightedItemCollectionId = collectionId
             }
-        } else if collectionId.namespace == ChatMediaInputPanelAuxiliaryNamespace.trending.rawValue {
-            /*if self.paneArrangement.panes[self.paneArrangement.currentIndex] == .trending {
-                self.inputNodeInteraction.highlightedItemCollectionId = collectionId
-            }*/
         } else {
             self.inputNodeInteraction.highlightedStickerItemCollectionId = collectionId
             if self.paneArrangement.panes[self.paneArrangement.currentIndex] == .stickers {
@@ -1370,31 +1499,56 @@ final class ChatMediaInputNode: ChatInputNode {
                 }
                 itemNode.updateIsHighlighted()
                 if itemNode.currentCollectionId == collectionId {
-                    self.listView.ensureItemNodeVisible(itemNode)
+                    if self.panelExpanded, let targetIndex = self.listView.indexOf(itemNode: itemNode) {
+                        self.panelCollapseScrollToIndex = targetIndex
+                        self.updateIsExpanded(false)
+                    } else {
+                        self.listView.ensureItemNodeVisible(itemNode)
+                    }
                     ensuredNodeVisible = true
                 }
             } else if let itemNode = itemNode as? ChatMediaInputMetaSectionItemNode {
                 itemNode.updateIsHighlighted()
                 if itemNode.currentCollectionId == collectionId {
-                    self.listView.ensureItemNodeVisible(itemNode)
+                    if self.panelExpanded, let targetIndex = self.listView.indexOf(itemNode: itemNode) {
+                        self.panelCollapseScrollToIndex = targetIndex
+                        self.updateIsExpanded(false)
+                    } else {
+                        self.listView.ensureItemNodeVisible(itemNode)
+                    }
                     ensuredNodeVisible = true
                 }
             } else if let itemNode = itemNode as? ChatMediaInputRecentGifsItemNode {
                 itemNode.updateIsHighlighted()
                 if itemNode.currentCollectionId == collectionId {
-                    self.listView.ensureItemNodeVisible(itemNode)
+                    if self.panelExpanded, let targetIndex = self.listView.indexOf(itemNode: itemNode) {
+                        self.panelCollapseScrollToIndex = targetIndex
+                        self.updateIsExpanded(false)
+                    } else {
+                        self.listView.ensureItemNodeVisible(itemNode)
+                    }
                     ensuredNodeVisible = true
                 }
             } else if let itemNode = itemNode as? ChatMediaInputTrendingItemNode {
                 itemNode.updateIsHighlighted()
                 if itemNode.currentCollectionId == collectionId {
-                    self.listView.ensureItemNodeVisible(itemNode)
+                    if self.panelExpanded, let targetIndex = self.listView.indexOf(itemNode: itemNode) {
+                        self.panelCollapseScrollToIndex = targetIndex
+                        self.updateIsExpanded(false)
+                    } else {
+                        self.listView.ensureItemNodeVisible(itemNode)
+                    }
                     ensuredNodeVisible = true
                 }
             } else if let itemNode = itemNode as? ChatMediaInputPeerSpecificItemNode {
                 itemNode.updateIsHighlighted()
                 if itemNode.currentCollectionId == collectionId {
-                    self.listView.ensureItemNodeVisible(itemNode)
+                    if self.panelExpanded, let targetIndex = self.listView.indexOf(itemNode: itemNode) {
+                        self.panelCollapseScrollToIndex = targetIndex
+                        self.updateIsExpanded(false)
+                    } else {
+                        self.listView.ensureItemNodeVisible(itemNode)
+                    }
                     ensuredNodeVisible = true
                 }
             }
@@ -1405,7 +1559,12 @@ final class ChatMediaInputNode: ChatInputNode {
             let firstVisibleIndex = currentView.collectionInfos.firstIndex(where: { id, _, _ in return id == firstVisibleCollectionId })
             if let targetIndex = targetIndex, let firstVisibleIndex = firstVisibleIndex {
                 let toRight = targetIndex > firstVisibleIndex
-                self.listView.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [], scrollToItem: ListViewScrollToItem(index: targetIndex, position: toRight ? .bottom(0.0) : .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: toRight ? .Down : .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil)
+                if self.panelExpanded {
+                    self.panelCollapseScrollToIndex = targetIndex
+                    self.updateIsExpanded(false)
+                } else {
+                    self.listView.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [], scrollToItem: ListViewScrollToItem(index: targetIndex, position: toRight ? .bottom(0.0) : .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: toRight ? .Down : .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil)
+                }
             }
         }
     }
@@ -1417,8 +1576,6 @@ final class ChatMediaInputNode: ChatInputNode {
                     return self.stickerPane.collectionListPanelOffset
                 case .gifs:
                     return self.gifPane.collectionListPanelOffset
-                /*case .trending:
-                    return self.trendingPane.collectionListPanelOffset*/
             }
         }
         
@@ -1512,7 +1669,6 @@ final class ChatMediaInputNode: ChatInputNode {
             }
             self.stickerPane.collectionListPanelOffset = 0.0
             self.gifPane.collectionListPanelOffset = 0.0
-            //self.trendingPane.collectionListPanelOffset = 0.0
             self.updateAppearanceTransition(transition: transition)
         } else {
             panelHeight = standardInputHeight
@@ -1543,11 +1699,6 @@ final class ChatMediaInputNode: ChatInputNode {
                                 }
                             }
                         case .trending:
-                            /*self.trendingPane.gridNode.forEachItemNode { itemNode in
-                                if let itemNode = itemNode as? PaneSearchBarPlaceholderNode {
-                                    placeholderNode = itemNode
-                                }
-                            }*/
                             break
                         }
                     }
@@ -1567,14 +1718,14 @@ final class ChatMediaInputNode: ChatInputNode {
         transition.updateFrame(node: self.collectionListPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: collectionListPanelOffset), size: CGSize(width: width, height: 41.0)))
         transition.updateFrame(node: self.collectionListSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 41.0 + collectionListPanelOffset), size: CGSize(width: width, height: separatorHeight)))
         
-        self.listView.bounds = CGRect(x: 0.0, y: 0.0, width: 41.0, height: width)
+        self.listView.bounds = CGRect(x: 0.0, y: 0.0, width: 41.0 + 31.0 + 20.0, height: width)
         transition.updatePosition(node: self.listView, position: CGPoint(x: width / 2.0, y: (41.0 - collectionListPanelOffset) / 2.0))
         
-        self.gifListView.bounds = CGRect(x: 0.0, y: 0.0, width: 41.0, height: width)
+        self.gifListView.bounds = CGRect(x: 0.0, y: 0.0, width: 41.0 + 31.0 + 20.0, height: width)
         transition.updatePosition(node: self.gifListView, position: CGPoint(x: width / 2.0, y: (41.0 - collectionListPanelOffset) / 2.0))
         
         let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
-        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: CGSize(width: 41.0, height: width), insets: UIEdgeInsets(top: 4.0 + leftInset, left: 0.0, bottom: 4.0 + rightInset, right: 0.0), duration: duration, curve: curve)
+        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: CGSize(width: 41.0 + 31.0 + 20.0, height: width), insets: UIEdgeInsets(top: 4.0 + leftInset, left: 0.0, bottom: 4.0 + rightInset, right: 0.0), duration: duration, curve: curve)
         
         self.listView.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
         
@@ -1597,11 +1748,7 @@ final class ChatMediaInputNode: ChatInputNode {
                 case .gifs:
                     if self.gifPane.supernode == nil  {
                         if !displaySearch {
-                            if let searchContainerNode = self.searchContainerNode {
-                                self.insertSubnode(self.gifPane, belowSubnode: searchContainerNode)
-                            } else {
-                                self.insertSubnode(self.gifPane, belowSubnode: self.collectionListContainer)
-                            }
+                            self.paneClippingContainer.addSubnode(self.gifPane)
                             if self.searchContainerNode == nil {
                                 self.gifPane.frame = CGRect(origin: CGPoint(x: -width, y: 0.0), size: CGSize(width: width, height: panelHeight))
                             }
@@ -1613,11 +1760,7 @@ final class ChatMediaInputNode: ChatInputNode {
                     }
                 case .stickers:
                     if self.stickerPane.supernode == nil {
-                        if let searchContainerNode = self.searchContainerNode {
-                            self.insertSubnode(self.stickerPane, belowSubnode: searchContainerNode)
-                        } else {
-                            self.insertSubnode(self.stickerPane, belowSubnode: self.collectionListContainer)
-                        }
+                        self.paneClippingContainer.addSubnode(self.stickerPane)
                         self.stickerPane.frame = CGRect(origin: CGPoint(x: width, y: 0.0), size: CGSize(width: width, height: panelHeight))
                     }
                     if self.stickerPane.frame != paneFrame {
@@ -1630,7 +1773,6 @@ final class ChatMediaInputNode: ChatInputNode {
         self.gifPane.updateLayout(size: CGSize(width: width - leftInset - rightInset, height: panelHeight), topInset: 41.0, bottomInset: bottomInset, isExpanded: isExpanded, isVisible: isVisible, deviceMetrics: deviceMetrics, transition: transition)
         self.trendingInteraction?.itemContext.canPlayMedia = isVisible
         self.stickerPane.updateLayout(size: CGSize(width: width - leftInset - rightInset, height: panelHeight), topInset: 41.0, bottomInset: bottomInset, isExpanded: isExpanded, isVisible: isVisible && visiblePanes.contains(where: { $0.0 == .stickers }), deviceMetrics: deviceMetrics, transition: transition)
-        //self.trendingPane.updateLayout(size: CGSize(width: width - leftInset - rightInset, height: panelHeight), topInset: 41.0, bottomInset: bottomInset, isExpanded: isExpanded, isVisible: isVisible, deviceMetrics: deviceMetrics, transition: transition)
         
         if self.gifPane.supernode != nil {
             if !visiblePanes.contains(where: { $0.0 == .gifs }) {
@@ -1682,31 +1824,6 @@ final class ChatMediaInputNode: ChatInputNode {
             self.animatingStickerPaneOut = false
         }
         
-        /*if self.trendingPane.supernode != nil {
-            if !visiblePanes.contains(where: { $0.0 == .trending }) {
-                if case .animated = transition {
-                    if !self.animatingTrendingPaneOut {
-                        self.animatingTrendingPaneOut = true
-                        var toLeft = false
-                        if let index = self.paneArrangement.panes.firstIndex(of: .trending), index < self.paneArrangement.currentIndex {
-                            toLeft = true
-                        }
-                        transition.animatePosition(node: self.trendingPane, to: CGPoint(x: (toLeft ? -width : width) + width / 2.0, y: self.trendingPane.layer.position.y), removeOnCompletion: false, completion: { [weak self] value in
-                            if let strongSelf = self, value {
-                                strongSelf.animatingTrendingPaneOut = false
-                                strongSelf.trendingPane.removeFromSupernode()
-                            }
-                        })
-                    }
-                } else {
-                    self.animatingTrendingPaneOut = false
-                    self.trendingPane.removeFromSupernode()
-                }
-            }
-        } else {
-            self.animatingTrendingPaneOut = false
-        }*/
-        
         if !displaySearch, let searchContainerNode = self.searchContainerNode {
             self.searchContainerNode = nil
             self.searchContainerNodeLoadedDisposable.set(nil)
@@ -1729,12 +1846,6 @@ final class ChatMediaInputNode: ChatInputNode {
                         }
                     }
                 case .trending:
-                    /*self.trendingPane.gridNode.forEachItemNode { itemNode in
-                        if let itemNode = itemNode as? PaneSearchBarPlaceholderNode {
-                            placeholderNode = itemNode
-                        }
-                    }
-                    paneIsEmpty = true*/
                     break
                 }
             }
@@ -1759,6 +1870,10 @@ final class ChatMediaInputNode: ChatInputNode {
                 self?.gifPane.initializeIfNeeded()
             })
         }
+
+        self.updatePaneClippingContainer(size: CGSize(width: width, height: panelHeight), offset: self.currentCollectionListPanelOffset(), transition: transition)
+
+        transition.updateFrame(node: self.panesBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: panelHeight)))
         
         return (standardInputHeight, max(0.0, panelHeight - standardInputHeight))
     }
@@ -1771,7 +1886,20 @@ final class ChatMediaInputNode: ChatInputNode {
         } else {
             options.insert(.AnimateInsertion)
         }
-        self.listView.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateOpaqueState: nil, completion: { [weak self] _ in
+        
+        var scrollToItem: ListViewScrollToItem?
+        if let targetIndex = self.panelCollapseScrollToIndex {
+            var position: ListViewScrollPosition
+            if self.panelExpanded {
+                position = .center(.top)
+            } else {
+                position = .top(self.listView.frame.height / 2.0 + 96.0)
+            }
+            scrollToItem = ListViewScrollToItem(index: targetIndex, position: position, animated: true, curve: .Default(duration: nil), directionHint: .Down)
+            self.panelCollapseScrollToIndex = nil
+        }
+        
+        self.listView.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, scrollToItem: scrollToItem, updateOpaqueState: nil, completion: { [weak self] _ in
             if let strongSelf = self {
                 strongSelf.enqueueGridTransition(gridTransition, firstTime: gridFirstTime)
                 if !strongSelf.didSetReady {
@@ -1809,7 +1937,6 @@ final class ChatMediaInputNode: ChatInputNode {
             }
             
             self.searchContainerNode?.contentNode.updatePreviewing(animated: animated)
-            //self.trendingPane.updatePreviewing(animated: animated)
         }
     }
     
@@ -1826,11 +1953,6 @@ final class ChatMediaInputNode: ChatInputNode {
                     self.animatingStickerPaneOut = false
                     self.stickerPane.removeFromSupernode()
                 }
-                /*self.trendingPane.layer.removeAllAnimations()
-                if self.animatingTrendingPaneOut {
-                    self.animatingTrendingPaneOut = false
-                    self.trendingPane.removeFromSupernode()
-                }*/
             case .changed:
                 if let (width, leftInset, rightInset, bottomInset, standardInputHeight, inputHeight, maximumHeight, inputPanelHeight, interfaceState, deviceMetrics, isVisible) = self.validLayout {
                     let translationX = -recognizer.translation(in: self.view).x
@@ -1895,13 +2017,31 @@ final class ChatMediaInputNode: ChatInputNode {
             }
         }
         
-        let collectionListPanelOffset = self.currentCollectionListPanelOffset()
+        var collectionListPanelOffset = self.currentCollectionListPanelOffset()
+        if self.panelExpanded {
+            collectionListPanelOffset = 0.0
+        }
+        
+        var listPanelOffset = collectionListPanelOffset * 2.0
         
         self.updateAppearanceTransition(transition: transition)
-        transition.updateFrame(node: self.collectionListPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: collectionListPanelOffset), size: self.collectionListPanel.bounds.size))
-        transition.updateFrame(node: self.collectionListSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 41.0 + collectionListPanelOffset), size: self.collectionListSeparator.bounds.size))
-        transition.updatePosition(node: self.listView, position: CGPoint(x: self.listView.position.x, y: (41.0 - collectionListPanelOffset) / 2.0))
-        transition.updatePosition(node: self.gifListView, position: CGPoint(x: self.gifListView.position.x, y: (41.0 - collectionListPanelOffset) / 2.0))
+        transition.updateFrame(node: self.collectionListPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: listPanelOffset), size: self.collectionListPanel.bounds.size))
+        transition.updatePosition(node: self.listView, position: CGPoint(x: self.listView.position.x, y: (41.0 - listPanelOffset) / 2.0))
+        transition.updatePosition(node: self.gifListView, position: CGPoint(x: self.gifListView.position.x, y: (41.0 - listPanelOffset) / 2.0))
+
+        self.updatePaneClippingContainer(size: self.paneClippingContainer.bounds.size, offset: collectionListPanelOffset, transition: transition)
+    }
+
+    private func updatePaneClippingContainer(size: CGSize, offset: CGFloat, transition: ContainedViewLayoutTransition) {
+        var offset = offset
+        var additionalOffset: CGFloat = 0.0
+        if self.panelExpanded {
+            offset = 0.0
+            additionalOffset = 31.0
+        }
+        transition.updateFrame(node: self.collectionListSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: offset + 41.0 + additionalOffset), size: self.collectionListSeparator.bounds.size))
+        transition.updateFrame(node: self.paneClippingContainer, frame: CGRect(origin: CGPoint(x: 0.0, y: offset + 41.0 + additionalOffset), size: size))
+        transition.updateSublayerTransformOffset(layer: self.paneClippingContainer.layer, offset: CGPoint(x: 0.0, y: -offset - 41.0 - additionalOffset))
     }
     
     private func fixPaneScroll(pane: ChatMediaInputPane, state: ChatMediaInputPaneScrollState) {
@@ -1915,14 +2055,18 @@ final class ChatMediaInputNode: ChatInputNode {
             }
         }
         
-        let collectionListPanelOffset = self.currentCollectionListPanelOffset()
+        var collectionListPanelOffset = self.currentCollectionListPanelOffset()
+        if self.panelExpanded {
+            collectionListPanelOffset = 0.0
+        }
         
         let transition = ContainedViewLayoutTransition.animated(duration: 0.25, curve: .spring)
         self.updateAppearanceTransition(transition: transition)
         transition.updateFrame(node: self.collectionListPanel, frame: CGRect(origin: CGPoint(x: 0.0, y: collectionListPanelOffset), size: self.collectionListPanel.bounds.size))
-        transition.updateFrame(node: self.collectionListSeparator, frame: CGRect(origin: CGPoint(x: 0.0, y: 41.0 + collectionListPanelOffset), size: self.collectionListSeparator.bounds.size))
         transition.updatePosition(node: self.listView, position: CGPoint(x: self.listView.position.x, y: (41.0 - collectionListPanelOffset) / 2.0))
         transition.updatePosition(node: self.gifListView, position: CGPoint(x: self.gifListView.position.x, y: (41.0 - collectionListPanelOffset) / 2.0))
+
+        self.updatePaneClippingContainer(size: self.paneClippingContainer.bounds.size, offset: collectionListPanelOffset, transition: transition)
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift b/submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift
index 25336491a5..bb8b80ea07 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputPanelEntries.swift
@@ -32,18 +32,18 @@ enum ChatMediaInputPanelEntryStableId: Hashable {
 }
 
 enum ChatMediaInputPanelEntry: Comparable, Identifiable {
-    case recentGifs(PresentationTheme)
-    case savedStickers(PresentationTheme)
-    case recentPacks(PresentationTheme)
-    case trending(Bool, PresentationTheme)
-    case settings(PresentationTheme)
-    case peerSpecific(theme: PresentationTheme, peer: Peer)
-    case stickerPack(index: Int, info: StickerPackCollectionInfo, topItem: StickerPackItem?, theme: PresentationTheme)
+    case recentGifs(PresentationTheme, Bool)
+    case savedStickers(PresentationTheme, Bool)
+    case recentPacks(PresentationTheme, Bool)
+    case trending(Bool, PresentationTheme, Bool)
+    case settings(PresentationTheme, Bool)
+    case peerSpecific(theme: PresentationTheme, peer: Peer, expanded: Bool)
+    case stickerPack(index: Int, info: StickerPackCollectionInfo, topItem: StickerPackItem?, theme: PresentationTheme, expanded: Bool)
     
-    case stickersMode(PresentationTheme)
-    case savedGifs(PresentationTheme)
-    case trendingGifs(PresentationTheme)
-    case gifEmotion(Int, PresentationTheme, String)
+    case stickersMode(PresentationTheme, Bool)
+    case savedGifs(PresentationTheme, Bool)
+    case trendingGifs(PresentationTheme, Bool)
+    case gifEmotion(Int, PresentationTheme, String, Bool)
     
     var stableId: ChatMediaInputPanelEntryStableId {
         switch self {
@@ -59,7 +59,7 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
             return .settings
         case .peerSpecific:
             return .peerSpecific
-        case let .stickerPack(_, info, _, _):
+        case let .stickerPack(_, info, _, _, _):
             return .stickerPack(info.id.id)
         case .stickersMode:
             return .stickersMode
@@ -67,75 +67,75 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
             return .savedGifs
         case .trendingGifs:
             return .trendingGifs
-        case let .gifEmotion(_, _, emoji):
+        case let .gifEmotion(_, _, emoji, _):
             return .gifEmotion(emoji)
         }
     }
     
     static func ==(lhs: ChatMediaInputPanelEntry, rhs: ChatMediaInputPanelEntry) -> Bool {
         switch lhs {
-            case let .recentGifs(lhsTheme):
-                if case let .recentGifs(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .recentGifs(lhsTheme, lhsExpanded):
+                if case let .recentGifs(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .savedStickers(lhsTheme):
-                if case let .savedStickers(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .savedStickers(lhsTheme, lhsExpanded):
+                if case let .savedStickers(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .recentPacks(lhsTheme):
-                if case let .recentPacks(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .recentPacks(lhsTheme, lhsExpanded):
+                if case let .recentPacks(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .trending(lhsElevated, lhsTheme):
-                if case let .trending(rhsElevated, rhsTheme) = rhs, lhsTheme === rhsTheme, lhsElevated == rhsElevated {
+            case let .trending(lhsElevated, lhsTheme, lhsExpanded):
+                if case let .trending(rhsElevated, rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsElevated == rhsElevated, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .settings(lhsTheme):
-                if case let .settings(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .settings(lhsTheme, lhsExpanded):
+                if case let .settings(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .peerSpecific(lhsTheme, lhsPeer):
-                if case let .peerSpecific(rhsTheme, rhsPeer) = rhs, lhsTheme === rhsTheme, lhsPeer.isEqual(rhsPeer) {
+            case let .peerSpecific(lhsTheme, lhsPeer, lhsExpanded):
+                if case let .peerSpecific(rhsTheme, rhsPeer, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsPeer.isEqual(rhsPeer), lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .stickerPack(index, info, topItem, lhsTheme):
-                if case let .stickerPack(rhsIndex, rhsInfo, rhsTopItem, rhsTheme) = rhs, index == rhsIndex, info == rhsInfo, topItem == rhsTopItem, lhsTheme === rhsTheme {
+            case let .stickerPack(index, info, topItem, lhsTheme, lhsExpanded):
+                if case let .stickerPack(rhsIndex, rhsInfo, rhsTopItem, rhsTheme, rhsExpanded) = rhs, index == rhsIndex, info == rhsInfo, topItem == rhsTopItem, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .stickersMode(lhsTheme):
-                if case let .stickersMode(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .stickersMode(lhsTheme, lhsExpanded):
+                if case let .stickersMode(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .savedGifs(lhsTheme):
-                if case let .savedGifs(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .savedGifs(lhsTheme, lhsExpanded):
+                if case let .savedGifs(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .trendingGifs(lhsTheme):
-                if case let .trendingGifs(rhsTheme) = rhs, lhsTheme === rhsTheme {
+            case let .trendingGifs(lhsTheme, lhsExpanded):
+                if case let .trendingGifs(rhsTheme, rhsExpanded) = rhs, lhsTheme === rhsTheme, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
                 }
-            case let .gifEmotion(lhsIndex, lhsTheme, lhsEmoji):
-                if case let .gifEmotion(rhsIndex, rhsTheme, rhsEmoji) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsEmoji == rhsEmoji {
+            case let .gifEmotion(lhsIndex, lhsTheme, lhsEmoji, lhsExpanded):
+                if case let .gifEmotion(rhsIndex, rhsTheme, rhsEmoji, rhsExpanded) = rhs, lhsIndex == rhsIndex, lhsTheme === rhsTheme, lhsEmoji == rhsEmoji, lhsExpanded == rhsExpanded {
                     return true
                 } else {
                     return false
@@ -156,7 +156,7 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                 switch rhs {
                     case .recentGifs, savedStickers:
                         return false
-                    case let .trending(elevated, _) where elevated:
+                    case let .trending(elevated, _, _) where elevated:
                         return false
                     default:
                         return true
@@ -165,7 +165,7 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                 switch rhs {
                     case .recentGifs, .savedStickers, recentPacks:
                         return false
-                    case let .trending(elevated, _) where elevated:
+                    case let .trending(elevated, _, _) where elevated:
                         return false
                     default:
                         return true
@@ -174,16 +174,16 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                 switch rhs {
                     case .recentGifs, .savedStickers, recentPacks, .peerSpecific:
                         return false
-                    case let .trending(elevated, _) where elevated:
+                    case let .trending(elevated, _, _) where elevated:
                         return false
                     default:
                         return true
                 }
-            case let .stickerPack(lhsIndex, lhsInfo, _, _):
+            case let .stickerPack(lhsIndex, lhsInfo, _, _, _):
                 switch rhs {
                     case .recentGifs, .savedStickers, .recentPacks, .peerSpecific:
                         return false
-                    case let .trending(elevated, _):
+                    case let .trending(elevated, _, _):
                         if elevated {
                             return false
                         } else {
@@ -191,7 +191,7 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                         }
                     case .settings:
                         return true
-                    case let .stickerPack(rhsIndex, rhsInfo, _, _):
+                    case let .stickerPack(rhsIndex, rhsInfo, _, _, _):
                         if lhsIndex == rhsIndex {
                             return lhsInfo.id.id < rhsInfo.id.id
                         } else {
@@ -200,7 +200,7 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                     default:
                         return true
                 }
-            case let .trending(elevated, _):
+            case let .trending(elevated, _, _):
                 if elevated {
                     switch rhs {
                         case .recentGifs, .trending:
@@ -231,11 +231,11 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
                 default:
                     return true
                 }
-            case let .gifEmotion(lhsIndex, _, _):
+            case let .gifEmotion(lhsIndex, _, _, _):
                 switch rhs {
                     case .stickersMode, .savedGifs, .trendingGifs:
                         return false
-                    case let .gifEmotion(rhsIndex, _, _):
+                    case let .gifEmotion(rhsIndex, _, _, _):
                         return lhsIndex < rhsIndex
                     default:
                         return true
@@ -251,53 +251,53 @@ enum ChatMediaInputPanelEntry: Comparable, Identifiable {
     
     func item(context: AccountContext, inputNodeInteraction: ChatMediaInputNodeInteraction) -> ListViewItem {
         switch self {
-            case let .recentGifs(theme):
-                return ChatMediaInputRecentGifsItem(inputNodeInteraction: inputNodeInteraction, theme: theme, selected: {
+            case let .recentGifs(theme, expanded):
+                return ChatMediaInputRecentGifsItem(inputNodeInteraction: inputNodeInteraction, theme: theme, expanded: expanded, selected: {
                     let collectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.recentGifs.rawValue, id: 0)
                     inputNodeInteraction.navigateToCollectionId(collectionId)
                 })
-            case let .savedStickers(theme):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .savedStickers, theme: theme, selected: {
+            case let .savedStickers(theme, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .savedStickers, theme: theme, expanded: expanded, selected: {
                     let collectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.savedStickers.rawValue, id: 0)
                     inputNodeInteraction.navigateToCollectionId(collectionId)
                 })
-            case let .recentPacks(theme):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .recentStickers, theme: theme, selected: {
+            case let .recentPacks(theme, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .recentStickers, theme: theme, expanded: expanded, selected: {
                     let collectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.recentStickers.rawValue, id: 0)
                     inputNodeInteraction.navigateToCollectionId(collectionId)
                 })
-            case let .trending(elevated, theme):
-                return ChatMediaInputTrendingItem(inputNodeInteraction: inputNodeInteraction, elevated: elevated, theme: theme, selected: {
+            case let .trending(elevated, theme, expanded):
+                return ChatMediaInputTrendingItem(inputNodeInteraction: inputNodeInteraction, elevated: elevated, theme: theme, expanded: expanded, selected: {
                     let collectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.trending.rawValue, id: 0)
                     inputNodeInteraction.navigateToCollectionId(collectionId)
                 })
-            case let .settings(theme):
-                return ChatMediaInputSettingsItem(inputNodeInteraction: inputNodeInteraction, theme: theme, selected: {
+            case let .settings(theme, expanded):
+                return ChatMediaInputSettingsItem(inputNodeInteraction: inputNodeInteraction, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.openSettings()
                 })
-            case let .peerSpecific(theme, peer):
+            case let .peerSpecific(theme, peer, expanded):
                 let collectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.peerSpecific.rawValue, id: 0)
-                return ChatMediaInputPeerSpecificItem(context: context, inputNodeInteraction: inputNodeInteraction, collectionId: collectionId, peer: peer, theme: theme, selected: {
+                return ChatMediaInputPeerSpecificItem(context: context, inputNodeInteraction: inputNodeInteraction, collectionId: collectionId, peer: peer, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.navigateToCollectionId(collectionId)
                 })
-            case let .stickerPack(index, info, topItem, theme):
-                return ChatMediaInputStickerPackItem(account: context.account, inputNodeInteraction: inputNodeInteraction, collectionId: info.id, collectionInfo: info, stickerPackItem: topItem, index: index, theme: theme, selected: {
+            case let .stickerPack(index, info, topItem, theme, expanded):
+                return ChatMediaInputStickerPackItem(account: context.account, inputNodeInteraction: inputNodeInteraction, collectionId: info.id, collectionInfo: info, stickerPackItem: topItem, index: index, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.navigateToCollectionId(info.id)
                 })
-            case let .stickersMode(theme):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .stickersMode, theme: theme, selected: {
+            case let .stickersMode(theme, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .stickersMode, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.navigateBackToStickers()
                 })
-            case let .savedGifs(theme):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .savedGifs, theme: theme, selected: {
+            case let .savedGifs(theme, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .savedGifs, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.setGifMode(.recent)
                 })
-            case let .trendingGifs(theme):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .trendingGifs, theme: theme, selected: {
+            case let .trendingGifs(theme, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .trendingGifs, theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.setGifMode(.trending)
                 })
-            case let .gifEmotion(_, theme, emoji):
-                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .gifEmoji(emoji), theme: theme, selected: {
+            case let .gifEmotion(_, theme, emoji, expanded):
+                return ChatMediaInputMetaSectionItem(inputNodeInteraction: inputNodeInteraction, type: .gifEmoji(emoji), theme: theme, expanded: expanded, selected: {
                     inputNodeInteraction.setGifMode(.emojiSearch(emoji))
                 })
         }
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift
index 834fcb7b06..c2945daf59 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputPeerSpecificItem.swift
@@ -15,6 +15,7 @@ final class ChatMediaInputPeerSpecificItem: ListViewItem {
     let inputNodeInteraction: ChatMediaInputNodeInteraction
     let collectionId: ItemCollectionId
     let peer: Peer
+    let expanded: Bool
     let selectedItem: () -> Void
     let theme: PresentationTheme
     
@@ -22,25 +23,26 @@ final class ChatMediaInputPeerSpecificItem: ListViewItem {
         return true
     }
     
-    init(context: AccountContext, inputNodeInteraction: ChatMediaInputNodeInteraction, collectionId: ItemCollectionId, peer: Peer, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(context: AccountContext, inputNodeInteraction: ChatMediaInputNodeInteraction, collectionId: ItemCollectionId, peer: Peer, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.context = context
         self.inputNodeInteraction = inputNodeInteraction
         self.collectionId = collectionId
         self.peer = peer
         self.selectedItem = selected
+        self.expanded = expanded
         self.theme = theme
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatMediaInputPeerSpecificItemNode()
-            node.contentSize = boundingSize
+            node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
             node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
             node.inputNodeInteraction = self.inputNodeInteraction
             Queue.mainQueue().async {
                 completion(node, {
                     return (nil, { _ in
-                        node.updateItem(context: self.context, peer: self.peer, collectionId: self.collectionId, theme: self.theme)
+                        node.updateItem(context: self.context, peer: self.peer, collectionId: self.collectionId, theme: self.theme, expanded: self.expanded)
                         node.updateAppearanceTransition(transition: .immediate)
                     })
                 })
@@ -50,8 +52,8 @@ final class ChatMediaInputPeerSpecificItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
-                (node() as? ChatMediaInputPeerSpecificItemNode)?.updateItem(context: self.context, peer: self.peer, collectionId: self.collectionId, theme: self.theme)
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
+                (node() as? ChatMediaInputPeerSpecificItemNode)?.updateItem(context: self.context, peer: self.peer, collectionId: self.collectionId, theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -61,55 +63,94 @@ final class ChatMediaInputPeerSpecificItem: ListViewItem {
     }
 }
 
-private let avatarFont = avatarPlaceholderFont(size: 12.0)
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 28.0, height: 28.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
+private let avatarFont = avatarPlaceholderFont(size: 19.0)
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageSize = CGSize(width: 45.0, height: 45.0)
+private let boundingImageScale: CGFloat = 0.625
+private let highlightSize = CGSize(width: 56.0, height: 56.0)
 private let verticalOffset: CGFloat = 3.0
 
 final class ChatMediaInputPeerSpecificItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let avatarNode: AvatarNode
     private let highlightNode: ASImageNode
+    private let titleNode: ImmediateTextNode
     
     var inputNodeInteraction: ChatMediaInputNodeInteraction?
     var currentCollectionId: ItemCollectionId?
+    private var currentExpanded = false
     private var theme: PresentationTheme?
     
     private let stickerFetchedDisposable = MetaDisposable()
     
-    init() {        
+    init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.highlightNode = ASImageNode()
         self.highlightNode.isLayerBacked = true
         self.highlightNode.isHidden = true
         
         self.avatarNode = AvatarNode(font: avatarFont)
         self.avatarNode.isLayerBacked = !smartInvertColorsEnabled()
-        self.avatarNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
-        
-        let imageSize = CGSize(width: 26.0, height: 26.0)
-        self.avatarNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize)
-        
-        self.highlightNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - highlightSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - highlightSize.height) / 2.0)), size: highlightSize)
+
+        self.titleNode = ImmediateTextNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.avatarNode)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
+        
+        self.scalingNode.addSubnode(self.highlightNode)
+        self.scalingNode.addSubnode(self.titleNode)
+        self.scalingNode.addSubnode(self.avatarNode)
     }
     
     deinit {
         self.stickerFetchedDisposable.dispose()
     }
     
-    func updateItem(context: AccountContext, peer: Peer, collectionId: ItemCollectionId, theme: PresentationTheme) {
+    func updateItem(context: AccountContext, peer: Peer, collectionId: ItemCollectionId, theme: PresentationTheme, expanded: Bool) {
         self.currentCollectionId = collectionId
         
         if self.theme !== theme {
             self.theme = theme
             
             self.highlightNode.image = PresentationResourcesChat.chatMediaInputPanelHighlightedIconImage(theme)
+            
+            self.titleNode.attributedText = NSAttributedString(string: peer.compactDisplayTitle, font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
         }
         
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        let imageSize = CGSize(width: 26.0 * 1.6, height: 26.0 * 1.6)
+        
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.avatarNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        expandTransition.updateTransformScale(node: self.titleNode, scale: expanded ? 1.0 : 0.001)
+        
+        self.currentExpanded = expanded
+        
+        self.avatarNode.bounds = CGRect(origin: CGPoint(), size: imageSize)
+        self.avatarNode.position = CGPoint(x: expandedBoundingSize.height / 2.0, y: expandedBoundingSize.width / 2.0)
+        self.avatarNode.frame = self.avatarNode.frame
+        expandTransition.updateFrame(node: self.highlightNode, frame: expanded ? titleFrame.insetBy(dx: -7.0, dy: -2.0) : CGRect(origin: CGPoint(x: self.avatarNode.position.x - highlightSize.width / 2.0, y: self.avatarNode.position.y - highlightSize.height / 2.0), size: highlightSize))
+        
         self.avatarNode.setPeer(context: context, theme: theme, peer: peer)
     }
     
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift
index d0926be1a2..76ae81d613 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputRecentGifsItem.swift
@@ -11,28 +11,30 @@ import TelegramPresentationData
 final class ChatMediaInputRecentGifsItem: ListViewItem {
     let inputNodeInteraction: ChatMediaInputNodeInteraction
     let selectedItem: () -> Void
+    let expanded: Bool
     let theme: PresentationTheme
     
     var selectable: Bool {
         return true
     }
     
-    init(inputNodeInteraction: ChatMediaInputNodeInteraction, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(inputNodeInteraction: ChatMediaInputNodeInteraction, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.inputNodeInteraction = inputNodeInteraction
         self.selectedItem = selected
         self.theme = theme
+        self.expanded = expanded
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatMediaInputRecentGifsItemNode()
-            node.contentSize = CGSize(width: 41.0, height: 41.0)
+            node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
             node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
             node.inputNodeInteraction = self.inputNodeInteraction
-            node.updateTheme(theme: self.theme)
             node.updateIsHighlighted()
             node.updateAppearanceTransition(transition: .immediate)
             Queue.mainQueue().async {
+                node.updateTheme(theme: self.theme, expanded: self.expanded)
                 completion(node, {
                     return (nil, { _ in })
                 })
@@ -42,8 +44,8 @@ final class ChatMediaInputRecentGifsItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
-                (node() as? ChatMediaInputRecentGifsItemNode)?.updateTheme(theme: self.theme)
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
+                (node() as? ChatMediaInputRecentGifsItemNode)?.updateTheme(theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -53,14 +55,20 @@ final class ChatMediaInputRecentGifsItem: ListViewItem {
     }
 }
 
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 30.0, height: 30.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageScale: CGFloat = 0.625
+private let highlightSize = CGSize(width: 56.0, height: 56.0)
 private let verticalOffset: CGFloat = 3.0 + UIScreenPixel
 
 final class ChatMediaInputRecentGifsItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let imageNode: ASImageNode
     private let highlightNode: ASImageNode
+    private let titleNode: ImmediateTextNode
+    
+    private var currentExpanded = false
     
     var currentCollectionId: ItemCollectionId?
     var inputNodeInteraction: ChatMediaInputNodeInteraction?
@@ -68,40 +76,68 @@ final class ChatMediaInputRecentGifsItemNode: ListViewItemNode {
     var theme: PresentationTheme?
     
     init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.highlightNode = ASImageNode()
         self.highlightNode.isLayerBacked = true
         self.highlightNode.isHidden = true
         
         self.imageNode = ASImageNode()
         self.imageNode.isLayerBacked = true
-        self.imageNode.contentMode = .center
-        self.imageNode.contentsScale = UIScreenScale
         
-        self.highlightNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - highlightSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - highlightSize.height) / 2.0)), size: highlightSize)
-        
-        self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        self.titleNode = ImmediateTextNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.imageNode)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
+        
+        self.scalingNode.addSubnode(self.highlightNode)
+        self.scalingNode.addSubnode(self.titleNode)
+        self.scalingNode.addSubnode(self.imageNode)
         
         self.currentCollectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.recentGifs.rawValue, id: 0)
-        
-        let imageSize = CGSize(width: 26.0, height: 26.0)
-        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
     }
     
     deinit {
     }
     
-    func updateTheme(theme: PresentationTheme) {
+    func updateTheme(theme: PresentationTheme, expanded: Bool) {
         if self.theme !== theme {
             self.theme = theme
             
             self.highlightNode.image = PresentationResourcesChat.chatMediaInputPanelHighlightedIconImage(theme)
             self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelRecentGifsIconImage(theme)
+            
+            self.titleNode.attributedText = NSAttributedString(string: "GIFs", font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
         }
+        
+        let imageSize = CGSize(width: 26.0 * 1.6, height: 26.0 * 1.6)
+        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((expandedBoundingSize.width - imageSize.width) / 2.0), y: floor((expandedBoundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
+        
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.imageNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        expandTransition.updateTransformScale(node: self.titleNode, scale: expanded ? 1.0 : 0.001)
+        
+        self.currentExpanded = expanded
+        
+        expandTransition.updateFrame(node: self.highlightNode, frame: expanded ? titleFrame.insetBy(dx: -7.0, dy: -2.0) : CGRect(origin: CGPoint(x: self.imageNode.position.x - highlightSize.width / 2.0, y: self.imageNode.position.y - highlightSize.height / 2.0), size: highlightSize))
     }
     
     func updateIsHighlighted() {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift
index 15a69c1d51..a1e60e847a 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputSettingsItem.swift
@@ -11,27 +11,29 @@ import TelegramPresentationData
 final class ChatMediaInputSettingsItem: ListViewItem {
     let inputNodeInteraction: ChatMediaInputNodeInteraction
     let selectedItem: () -> Void
+    let expanded: Bool
     let theme: PresentationTheme
     
     var selectable: Bool {
         return true
     }
     
-    init(inputNodeInteraction: ChatMediaInputNodeInteraction, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(inputNodeInteraction: ChatMediaInputNodeInteraction, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.inputNodeInteraction = inputNodeInteraction
         self.selectedItem = selected
         self.theme = theme
+        self.expanded = expanded
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatMediaInputSettingsItemNode()
-            node.contentSize = CGSize(width: 41.0, height: 41.0)
+            node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
             node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
             node.inputNodeInteraction = self.inputNodeInteraction
-            node.updateTheme(theme: self.theme)
             node.updateAppearanceTransition(transition: .immediate)
             Queue.mainQueue().async {
+                node.updateTheme(theme: self.theme, expanded: self.expanded)
                 completion(node, {
                     return (nil, { _ in })
                 })
@@ -41,8 +43,8 @@ final class ChatMediaInputSettingsItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
-                (node() as? ChatMediaInputSettingsItemNode)?.updateTheme(theme: self.theme)
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
+                (node() as? ChatMediaInputSettingsItemNode)?.updateTheme(theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -52,14 +54,19 @@ final class ChatMediaInputSettingsItem: ListViewItem {
     }
 }
 
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 30.0, height: 30.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageScale: CGFloat = 0.625
 private let verticalOffset: CGFloat = 3.0 + UIScreenPixel
 
 final class ChatMediaInputSettingsItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let buttonNode: HighlightableButtonNode
     private let imageNode: ASImageNode
+    private let titleNode: ImmediateTextNode
+    
+    private var currentExpanded = false
     
     var currentCollectionId: ItemCollectionId?
     var inputNodeInteraction: ChatMediaInputNodeInteraction?
@@ -67,37 +74,59 @@ final class ChatMediaInputSettingsItemNode: ListViewItemNode {
     var theme: PresentationTheme?
     
     init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.buttonNode = HighlightableButtonNode()
         
         self.imageNode = ASImageNode()
         self.imageNode.isLayerBacked = true
-        self.imageNode.contentMode = .center
-        self.imageNode.contentsScale = UIScreenScale
-        
-        self.buttonNode.frame = CGRect(origin: CGPoint(), size: boundingSize)
-        
-        self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
-        self.imageNode.contentMode = .center
-        self.imageNode.contentsScale = UIScreenScale
         
+        self.titleNode = ImmediateTextNode()
+                
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.buttonNode)
-        self.buttonNode.addSubnode(self.imageNode)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
         
-        let imageSize = CGSize(width: 26.0, height: 26.0)
-        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
+        self.scalingNode.addSubnode(self.buttonNode)
+        self.scalingNode.addSubnode(self.imageNode)
     }
-    
-    deinit {
-    }
-    
-    func updateTheme(theme: PresentationTheme) {
+        
+    func updateTheme(theme: PresentationTheme, expanded: Bool) {
+        let imageSize = CGSize(width: 26.0 * 1.6, height: 26.0 * 1.6)
+        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((expandedBoundingSize.width - imageSize.width) / 2.0), y: floor((expandedBoundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
+        
         if self.theme !== theme {
             self.theme = theme
             
             self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelSettingsIconImage(theme)
+            
+            self.titleNode.attributedText = NSAttributedString(string: "Settings", font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
         }
+        
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        self.buttonNode.frame = self.scalingNode.bounds
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.imageNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        expandTransition.updateTransformScale(node: self.titleNode, scale: expanded ? 1.0 : 0.001)
+        
+        self.currentExpanded = expanded
+
     }
     
     func updateAppearanceTransition(transition: ContainedViewLayoutTransition) {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift
index e4aa206ec3..96b8f7ebc8 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputStickerGridItem.swift
@@ -174,8 +174,8 @@ final class ChatMediaInputStickerGridItemNode: GridItemNode {
     private var currentState: (Account, StickerPackItem, CGSize)?
     private var currentSize: CGSize?
     let imageNode: TransformImageNode
-    var animationNode: AnimatedStickerNode?
-    private var placeholderNode: StickerShimmerEffectNode?
+    private(set) var animationNode: AnimatedStickerNode?
+    private(set) var placeholderNode: StickerShimmerEffectNode?
     private var didSetUpAnimationNode = false
     private var item: ChatMediaInputStickerGridItem?
     
@@ -308,9 +308,13 @@ final class ChatMediaInputStickerGridItemNode: GridItemNode {
             if let (_, _, mediaDimensions) = self.currentState {
                 let imageSize = mediaDimensions.aspectFitted(boundingSize)
                 self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))()
-                self.imageNode.frame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: (size.height - imageSize.height) / 2.0), size: imageSize)
+                if self.imageNode.supernode === self {
+                    self.imageNode.frame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: (size.height - imageSize.height) / 2.0), size: imageSize)
+                }
                 if let animationNode = self.animationNode {
-                    animationNode.frame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: (size.height - imageSize.height) / 2.0), size: imageSize)
+                    if animationNode.supernode === self {
+                        animationNode.frame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: (size.height - imageSize.height) / 2.0), size: imageSize)
+                    }
                     animationNode.updateLayout(size: imageSize)
                 }
             }
@@ -318,7 +322,9 @@ final class ChatMediaInputStickerGridItemNode: GridItemNode {
         
         if let placeholderNode = self.placeholderNode {
             let placeholderFrame = CGRect(origin: CGPoint(x: floor((size.width - boundingSize.width) / 2.0), y: floor((size.height - boundingSize.height) / 2.0)), size: boundingSize)
-            placeholderNode.frame = placeholderFrame
+            if placeholderNode.supernode === self {
+                placeholderNode.frame = placeholderFrame
+            }
             
             let theme = item.theme
             placeholderNode.update(backgroundColor: theme.chat.inputMediaPanel.stickersBackgroundColor.withAlphaComponent(1.0), foregroundColor: theme.chat.inputMediaPanel.stickersSectionTextColor.blitOver(theme.chat.inputMediaPanel.stickersBackgroundColor, alpha: 0.15), shimmeringColor: theme.list.itemBlocksBackgroundColor.withAlphaComponent(0.3), data: item.stickerItem.file.immediateThumbnailData, size: placeholderFrame.size)
@@ -336,7 +342,7 @@ final class ChatMediaInputStickerGridItemNode: GridItemNode {
             return
         }
         if let interfaceInteraction = self.interfaceInteraction, let (_, item, _) = self.currentState, case .ended = recognizer.state {
-            let _ = interfaceInteraction.sendSticker(.standalone(media: item.file), nil, false, self, self.bounds)
+            let _ = interfaceInteraction.sendSticker(.standalone(media: item.file), false, false, nil, false, self, self.bounds)
             self.imageNode.layer.animateAlpha(from: 0.5, to: 1.0, duration: 1.0)
         }
     }
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
index cc1ce57342..49aea9ed90 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputStickerPackItem.swift
@@ -22,12 +22,13 @@ final class ChatMediaInputStickerPackItem: ListViewItem {
     let selectedItem: () -> Void
     let index: Int
     let theme: PresentationTheme
+    let expanded: Bool
     
     var selectable: Bool {
         return true
     }
     
-    init(account: Account, inputNodeInteraction: ChatMediaInputNodeInteraction, collectionId: ItemCollectionId, collectionInfo: StickerPackCollectionInfo, stickerPackItem: StickerPackItem?, index: Int, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(account: Account, inputNodeInteraction: ChatMediaInputNodeInteraction, collectionId: ItemCollectionId, collectionInfo: StickerPackCollectionInfo, stickerPackItem: StickerPackItem?, index: Int, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.account = account
         self.inputNodeInteraction = inputNodeInteraction
         self.collectionId = collectionId
@@ -36,18 +37,19 @@ final class ChatMediaInputStickerPackItem: ListViewItem {
         self.selectedItem = selected
         self.index = index
         self.theme = theme
+        self.expanded = expanded
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatMediaInputStickerPackItemNode()
-            node.contentSize = boundingSize
+            node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
             node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
             node.inputNodeInteraction = self.inputNodeInteraction
             Queue.mainQueue().async {
                 completion(node, {
                     return (nil, { _ in
-                        node.updateStickerPackItem(account: self.account, info: self.collectionInfo, item: self.stickerPackItem, collectionId: self.collectionId, theme: self.theme)
+                        node.updateStickerPackItem(account: self.account, info: self.collectionInfo, item: self.stickerPackItem, collectionId: self.collectionId, theme: self.theme, expanded: self.expanded)
                         node.updateAppearanceTransition(transition: .immediate)
                     })
                 })
@@ -57,8 +59,8 @@ final class ChatMediaInputStickerPackItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
-                (node() as? ChatMediaInputStickerPackItemNode)?.updateStickerPackItem(account: self.account, info: self.collectionInfo, item: self.stickerPackItem, collectionId: self.collectionId, theme: self.theme)
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
+                (node() as? ChatMediaInputStickerPackItemNode)?.updateStickerPackItem(account: self.account, info: self.collectionInfo, item: self.stickerPackItem, collectionId: self.collectionId, theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -68,20 +70,26 @@ final class ChatMediaInputStickerPackItem: ListViewItem {
     }
 }
 
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 28.0, height: 28.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
-private let verticalOffset: CGFloat = 3.0
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageSize = CGSize(width: 45.0, height: 45.0)
+private let boundingImageScale: CGFloat = 0.625
+private let highlightSize = CGSize(width: 56.0, height: 56.0)
+private let verticalOffset: CGFloat = -3.0
 
 final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let imageNode: TransformImageNode
     private var animatedStickerNode: AnimatedStickerNode?
     private var placeholderNode: StickerShimmerEffectNode?
     private let highlightNode: ASImageNode
+    private let titleNode: ImmediateTextNode
     
     var inputNodeInteraction: ChatMediaInputNodeInteraction?
     var currentCollectionId: ItemCollectionId?
     private var currentThumbnailItem: StickerPackThumbnailItem?
+    private var currentExpanded = false
     private var theme: PresentationTheme?
     
     private let stickerFetchedDisposable = MetaDisposable()
@@ -102,6 +110,11 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
     }
     
     init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.highlightNode = ASImageNode()
         self.highlightNode.isLayerBacked = true
         self.highlightNode.isHidden = true
@@ -110,18 +123,19 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
         self.imageNode.isLayerBacked = !smartInvertColorsEnabled()
                 
         self.placeholderNode = StickerShimmerEffectNode()
-        self.placeholderNode?.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
-        
-        self.highlightNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - highlightSize.width) / 2.0) + verticalOffset - UIScreenPixel, y: floor((boundingSize.height - highlightSize.height) / 2.0) - UIScreenPixel), size: highlightSize)
-        
-        self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
-        
+       
+        self.titleNode = ImmediateTextNode()
+                        
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.imageNode)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
+        
+        self.scalingNode.addSubnode(self.highlightNode)
+        self.scalingNode.addSubnode(self.titleNode)
+        self.scalingNode.addSubnode(self.imageNode)
         if let placeholderNode = self.placeholderNode {
-            self.addSubnode(placeholderNode)
+            self.scalingNode.addSubnode(placeholderNode)
         }
         
         var firstTime = true
@@ -157,11 +171,13 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
         }
     }
     
-    func updateStickerPackItem(account: Account, info: StickerPackCollectionInfo, item: StickerPackItem?, collectionId: ItemCollectionId, theme: PresentationTheme) {
+    func updateStickerPackItem(account: Account, info: StickerPackCollectionInfo, item: StickerPackItem?, collectionId: ItemCollectionId, theme: PresentationTheme, expanded: Bool) {
         self.currentCollectionId = collectionId
         
+        var themeUpdated = false
         if self.theme !== theme {
             self.theme = theme
+            themeUpdated = true
             
             self.highlightNode.image = PresentationResourcesChat.chatMediaInputPanelHighlightedIconImage(theme)
         }
@@ -181,27 +197,31 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
                 thumbnailItem = .animated(item.file.resource)
                 resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: item.file.resource)
             } else if let dimensions = item.file.dimensions, let resource = chatMessageStickerResource(file: item.file, small: true) as? TelegramMediaResource {
-                thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: []))
+                thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                 resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: resource)
             }
         }
         
+        if themeUpdated || self.titleNode.attributedText?.string != info.title {
+            self.titleNode.attributedText = NSAttributedString(string: info.title, font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
+        }
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        var imageSize = boundingImageSize
+        
         if self.currentThumbnailItem != thumbnailItem {
             self.currentThumbnailItem = thumbnailItem
             if let thumbnailItem = thumbnailItem {
                 switch thumbnailItem {
                     case let .still(representation):
-                        let imageSize = representation.dimensions.cgSize.aspectFitted(boundingImageSize)
+                        imageSize = representation.dimensions.cgSize.aspectFitted(boundingImageSize)
                         let imageApply = self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))
                         imageApply()
                         self.imageNode.setSignal(chatMessageStickerPackThumbnail(postbox: account.postbox, resource: representation.resource, nilIfEmpty: true))
-                        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize)
                     case let .animated(resource):
-                        let imageSize = boundingImageSize
                         let imageApply = self.imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))
                         imageApply()
                         self.imageNode.setSignal(chatMessageStickerPackThumbnail(postbox: account.postbox, resource: resource, animated: true, nilIfEmpty: true))
-                        self.imageNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize)
                         
                         let loopAnimatedStickers = self.inputNodeInteraction?.stickerSettings?.loopAnimatedStickers ?? false
                         self.imageNode.isHidden = loopAnimatedStickers
@@ -212,18 +232,14 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
                         } else {
                             animatedStickerNode = AnimatedStickerNode()
                             self.animatedStickerNode = animatedStickerNode
-                            animatedStickerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
                             if let placeholderNode = self.placeholderNode {
-                                self.insertSubnode(animatedStickerNode, belowSubnode: placeholderNode)
+                                self.scalingNode.insertSubnode(animatedStickerNode, belowSubnode: placeholderNode)
                             } else {
-                                self.addSubnode(animatedStickerNode)
+                                self.scalingNode.addSubnode(animatedStickerNode)
                             }
                             animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: 80, height: 80, mode: .cached)
                         }
                         animatedStickerNode.visibility = self.visibilityStatus && loopAnimatedStickers
-                        if let animatedStickerNode = self.animatedStickerNode {
-                            animatedStickerNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize)
-                        }
                 }
                 if let resourceReference = resourceReference {
                     self.stickerFetchedDisposable.set(fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: resourceReference).start())
@@ -232,16 +248,43 @@ final class ChatMediaInputStickerPackItemNode: ListViewItemNode {
                         
             if let placeholderNode = self.placeholderNode {
                 let imageSize = boundingImageSize
-                let placeholderFrame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0)), size: imageSize)
-                placeholderNode.frame = placeholderFrame
-                
                 placeholderNode.update(backgroundColor: nil, foregroundColor: theme.chat.inputMediaPanel.stickersSectionTextColor.blitOver(theme.chat.inputPanel.panelBackgroundColor, alpha: 0.4), shimmeringColor: theme.chat.inputMediaPanel.panelHighlightedIconBackgroundColor.withMultipliedAlpha(0.2), data: info.immediateThumbnailData, size: imageSize, imageSize: CGSize(width: 100.0, height: 100.0))
             }
             
             self.updateIsHighlighted()
         }
+        
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.imageNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        expandTransition.updateTransformScale(node: self.titleNode, scale: expanded ? 1.0 : 0.001)
+        
+        self.currentExpanded = expanded
+        
+        self.imageNode.bounds = CGRect(origin: CGPoint(), size: imageSize)
+        self.imageNode.position = CGPoint(x: expandedBoundingSize.height / 2.0, y: expandedBoundingSize.width / 2.0)
+        if let animatedStickerNode = self.animatedStickerNode {
+            animatedStickerNode.frame = self.imageNode.frame
+            animatedStickerNode.updateLayout(size: self.imageNode.frame.size)
+        }
+        if let placeholderNode = self.placeholderNode {
+            placeholderNode.bounds = CGRect(origin: CGPoint(), size: boundingImageSize)
+            placeholderNode.position = self.imageNode.position
+        }
+        expandTransition.updateFrame(node: self.highlightNode, frame: expanded ? titleFrame.insetBy(dx: -7.0, dy: -2.0) : CGRect(origin: CGPoint(x: self.imageNode.position.x - highlightSize.width / 2.0, y: self.imageNode.position.y - highlightSize.height / 2.0), size: highlightSize))
     }
-    
+        
     override func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
         if let placeholderNode = self.placeholderNode {
             placeholderNode.updateAbsoluteRect(rect, within: containerSize)
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift b/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift
index 4b25c0ab63..1c25f037f8 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputTrendingItem.swift
@@ -12,29 +12,31 @@ final class ChatMediaInputTrendingItem: ListViewItem {
     let inputNodeInteraction: ChatMediaInputNodeInteraction
     let selectedItem: () -> Void
     let elevated: Bool
+    let expanded: Bool
     let theme: PresentationTheme
     
     var selectable: Bool {
         return true
     }
     
-    init(inputNodeInteraction: ChatMediaInputNodeInteraction, elevated: Bool, theme: PresentationTheme, selected: @escaping () -> Void) {
+    init(inputNodeInteraction: ChatMediaInputNodeInteraction, elevated: Bool, theme: PresentationTheme, expanded: Bool, selected: @escaping () -> Void) {
         self.inputNodeInteraction = inputNodeInteraction
         self.elevated = elevated
         self.selectedItem = selected
+        self.expanded = expanded
         self.theme = theme
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatMediaInputTrendingItemNode()
-            node.contentSize = CGSize(width: 41.0, height: 41.0)
+            node.contentSize = self.expanded ? expandedBoundingSize : boundingSize
             node.insets = ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)
             node.inputNodeInteraction = self.inputNodeInteraction
-            node.updateTheme(elevated: self.elevated, theme: self.theme)
             node.updateIsHighlighted()
             node.updateAppearanceTransition(transition: .immediate)
             Queue.mainQueue().async {
+                node.updateTheme(elevated: self.elevated, theme: self.theme, expanded: self.expanded)
                 completion(node, {
                     return (nil, { _ in })
                 })
@@ -44,8 +46,8 @@ final class ChatMediaInputTrendingItem: ListViewItem {
     
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
-            completion(ListViewItemNodeLayout(contentSize: node().contentSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
-                (node() as? ChatMediaInputTrendingItemNode)?.updateTheme(elevated: self.elevated, theme: self.theme)
+            completion(ListViewItemNodeLayout(contentSize: self.expanded ? expandedBoundingSize : boundingSize, insets: ChatMediaInputNode.setupPanelIconInsets(item: self, previousItem: previousItem, nextItem: nextItem)), { _ in
+                (node() as? ChatMediaInputTrendingItemNode)?.updateTheme(elevated: self.elevated, theme: self.theme, expanded: self.expanded)
             })
         }
     }
@@ -55,14 +57,20 @@ final class ChatMediaInputTrendingItem: ListViewItem {
     }
 }
 
-private let boundingSize = CGSize(width: 41.0, height: 41.0)
-private let boundingImageSize = CGSize(width: 30.0, height: 30.0)
-private let highlightSize = CGSize(width: 35.0, height: 35.0)
+private let boundingSize = CGSize(width: 72.0, height: 41.0)
+private let expandedBoundingSize = CGSize(width: 72.0, height: 72.0)
+private let boundingImageScale: CGFloat = 0.625
+private let highlightSize = CGSize(width: 56.0, height: 56.0)
 private let verticalOffset: CGFloat = 3.0 + UIScreenPixel
 
 final class ChatMediaInputTrendingItemNode: ListViewItemNode {
+    private let containerNode: ASDisplayNode
+    private let scalingNode: ASDisplayNode
     private let imageNode: ASImageNode
     private let highlightNode: ASImageNode
+    private let titleNode: ImmediateTextNode
+    
+    private var currentExpanded = false
     
     var currentCollectionId: ItemCollectionId?
     var inputNodeInteraction: ChatMediaInputNodeInteraction?
@@ -73,37 +81,43 @@ final class ChatMediaInputTrendingItemNode: ListViewItemNode {
     let badgeBackground: ASImageNode
     
     init() {
+        self.containerNode = ASDisplayNode()
+        self.containerNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        
+        self.scalingNode = ASDisplayNode()
+        
         self.highlightNode = ASImageNode()
         self.highlightNode.isLayerBacked = true
         self.highlightNode.isHidden = true
         
         self.imageNode = ASImageNode()
         self.imageNode.isLayerBacked = true
-        self.imageNode.contentMode = .center
-        self.imageNode.contentsScale = UIScreenScale
         
         self.badgeBackground = ASImageNode()
         self.badgeBackground.displaysAsynchronously = false
         self.badgeBackground.displayWithoutProcessing = true
         self.badgeBackground.isHidden = true
         
-        self.highlightNode.frame = CGRect(origin: CGPoint(x: floor((boundingSize.width - highlightSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - highlightSize.height) / 2.0)), size: highlightSize)
-        
-        self.imageNode.transform = CATransform3DMakeRotation(CGFloat.pi / 2.0, 0.0, 0.0, 1.0)
+        self.titleNode = ImmediateTextNode()
         
         super.init(layerBacked: false, dynamicBounce: false)
         
-        self.addSubnode(self.highlightNode)
-        self.addSubnode(self.imageNode)
-        self.addSubnode(self.badgeBackground)
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.scalingNode)
+        
+        self.scalingNode.addSubnode(self.highlightNode)
+        self.scalingNode.addSubnode(self.titleNode)
+        self.scalingNode.addSubnode(self.imageNode)
+        self.scalingNode.addSubnode(self.badgeBackground)
         
         self.currentCollectionId = ItemCollectionId(namespace: ChatMediaInputPanelAuxiliaryNamespace.trending.rawValue, id: 0)
     }
     
-    deinit {
-    }
-    
-    func updateTheme(elevated: Bool, theme: PresentationTheme) {
+    func updateTheme(elevated: Bool, theme: PresentationTheme, expanded: Bool) {
+        let imageSize = CGSize(width: 26.0 * 1.85, height: 26.0 * 1.85)
+        let imageFrame = CGRect(origin: CGPoint(x: floor((expandedBoundingSize.width - imageSize.width) / 2.0), y: floor((expandedBoundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
+        self.imageNode.frame = imageFrame
+        
         if self.theme !== theme {
             self.theme = theme
             
@@ -111,19 +125,37 @@ final class ChatMediaInputTrendingItemNode: ListViewItemNode {
             self.imageNode.image = PresentationResourcesChat.chatInputMediaPanelTrendingIconImage(theme)
             self.badgeBackground.image = generateFilledCircleImage(diameter: 10.0, color: theme.chat.inputPanel.mediaRecordingDotColor)
             
-            let imageSize = CGSize(width: 26.0, height: 26.0)
-            let imageFrame = CGRect(origin: CGPoint(x: floor((boundingSize.width - imageSize.width) / 2.0) + verticalOffset, y: floor((boundingSize.height - imageSize.height) / 2.0) + UIScreenPixel), size: imageSize)
-            self.imageNode.frame = imageFrame
-            
             if let image = self.badgeBackground.image {
-                self.badgeBackground.frame = CGRect(origin: CGPoint(x: imageFrame.maxX - image.size.width - 1.0, y: imageFrame.maxY - image.size.width + 1.0), size: image.size)
+                self.badgeBackground.frame = CGRect(origin: CGPoint(x: floor(imageFrame.maxX - image.size.width - 7.0), y: 18.0), size: image.size)
             }
+            
+            self.titleNode.attributedText = NSAttributedString(string: "Trending", font: Font.regular(11.0), textColor: theme.chat.inputPanel.primaryTextColor)
         }
         
         if self.elevated != elevated {
             self.elevated = elevated
             self.badgeBackground.isHidden = !self.elevated
         }
+        
+        self.containerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: expandedBoundingSize)
+        self.scalingNode.bounds = CGRect(origin: CGPoint(), size: expandedBoundingSize)
+        
+        let boundsSize = expanded ? expandedBoundingSize : CGSize(width: boundingSize.height, height: boundingSize.height)
+        let expandScale: CGFloat = expanded ? 1.0 : boundingImageScale
+        let expandTransition: ContainedViewLayoutTransition = self.currentExpanded != expanded ? .animated(duration: 0.3, curve: .spring) : .immediate
+        expandTransition.updateTransformScale(node: self.scalingNode, scale: expandScale)
+        expandTransition.updatePosition(node: self.scalingNode, position: CGPoint(x: boundsSize.width / 2.0, y: boundsSize.height / 2.0 + (expanded ? -2.0 : 3.0)))
+
+        expandTransition.updateAlpha(node: self.titleNode, alpha: expanded ? 1.0 : 0.0)
+        let titleSize = self.titleNode.updateLayout(CGSize(width: expandedBoundingSize.width - 8.0, height: expandedBoundingSize.height))
+        
+        let titleFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((expandedBoundingSize.width - titleSize.width) / 2.0), y: expandedBoundingSize.height - titleSize.height + 2.0), size: titleSize)
+        let displayTitleFrame = expanded ? titleFrame : CGRect(origin: CGPoint(x: titleFrame.minX, y: self.imageNode.position.y - titleFrame.size.height), size: titleFrame.size)
+        expandTransition.updateFrameAsPositionAndBounds(node: self.titleNode, frame: displayTitleFrame)
+        
+        self.currentExpanded = expanded
+        
+        expandTransition.updateFrame(node: self.highlightNode, frame: expanded ? titleFrame.insetBy(dx: -7.0, dy: -2.0) : CGRect(origin: CGPoint(x: self.imageNode.position.x - highlightSize.width / 2.0, y: self.imageNode.position.y - highlightSize.height / 2.0), size: highlightSize))
     }
     
     func updateIsHighlighted() {
diff --git a/submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift b/submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift
index dd111fbed5..603f0fb294 100644
--- a/submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift
+++ b/submodules/TelegramUI/Sources/ChatMediaInputTrendingPane.swift
@@ -245,23 +245,22 @@ final class ChatMediaInputTrendingPane: ChatMediaInputPane {
         
         let interaction = TrendingPaneInteraction(installPack: { [weak self] info in
             if let strongSelf = self, let info = info as? StickerPackCollectionInfo {
-                let account = strongSelf.context.account
-                var installSignal = loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
+                let context = strongSelf.context
+                var installSignal = context.engine.stickers.loadedStickerPack(reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
                 |> mapToSignal { result -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
                     switch result {
                     case let .result(info, items, installed):
                         if installed {
                             return .complete()
                         } else {
-                            return preloadedStickerPackThumbnail(account: account, info: info, items: items)
+                            return preloadedStickerPackThumbnail(account: context.account, info: info, items: items)
                             |> filter { $0 }
                             |> ignoreValues
                             |> then(
-                                addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items)
+                                context.engine.stickers.addStickerPackInteractively(info: info, items: items)
                                 |> ignoreValues
                             )
                             |> mapToSignal { _ -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                                return .complete()
                             }
                             |> then(.single((info, items)))
                         }
@@ -273,8 +272,7 @@ final class ChatMediaInputTrendingPane: ChatMediaInputPane {
                     return .complete()
                 }
                 |> deliverOnMainQueue
-                
-                let context = strongSelf.context
+
                 var cancelImpl: (() -> Void)?
                 let progressSignal = Signal<Never, NoError> { subscriber in
                     let presentationData = context.sharedContext.currentPresentationData.with { $0 }
@@ -318,7 +316,7 @@ final class ChatMediaInputTrendingPane: ChatMediaInputPane {
                     }
                     
                     let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                    strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: strongSelf.context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
+                    strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, context: strongSelf.context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
                         return true
                     }))
                 }))
@@ -329,7 +327,7 @@ final class ChatMediaInputTrendingPane: ChatMediaInputPane {
                 let packReference: StickerPackReference = .id(id: info.id.id, accessHash: info.accessHash)
                 let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { fileReference, sourceNode, sourceRect in
                     if let strongSelf = self {
-                        return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                        return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                     } else {
                         return false
                     }
@@ -340,6 +338,7 @@ final class ChatMediaInputTrendingPane: ChatMediaInputPane {
         openSearch: { [weak self] in
             self?.inputNodeInteraction?.toggleSearch(true, .trending, "")
         })
+        interaction.itemContext.canPlayMedia = true
         
         let isPane = self.isPane
         let previousEntries = Atomic<[TrendingPaneEntry]?>(value: nil)
diff --git a/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift
index ab5189f89b..6bc1c9f14f 100644
--- a/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageActionButtonsNode.swift
@@ -11,7 +11,8 @@ import AccountContext
 private let titleFont = Font.medium(16.0)
 
 private final class ChatMessageActionButtonNode: ASDisplayNode {
-    private let backgroundNode: ASImageNode
+    private let backgroundBlurNode: NavigationBackgroundNode
+    private let backgroundMaskNode: ASImageNode
     private var titleNode: TextNode?
     private var iconNode: ASImageNode?
     private var buttonView: HighlightTrackingButton?
@@ -25,20 +26,21 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
     private let accessibilityArea: AccessibilityAreaNode
     
     override init() {
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.displaysAsynchronously = false
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.alpha = 1.0
-        self.backgroundNode.isUserInteractionEnabled = false
+        self.backgroundBlurNode = NavigationBackgroundNode(color: .clear)
+        self.backgroundBlurNode.isUserInteractionEnabled = false
+
+        self.backgroundMaskNode = ASImageNode()
+        self.backgroundMaskNode.isUserInteractionEnabled = false
         
         self.accessibilityArea = AccessibilityAreaNode()
         self.accessibilityArea.accessibilityTraits = .button
         
         super.init()
         
-        self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.backgroundBlurNode)
         self.addSubnode(self.accessibilityArea)
+
+        //self.backgroundBlurNode.view.mask = backgroundMaskNode.view
         
         self.accessibilityArea.activate = { [weak self] in
             self?.buttonPressed()
@@ -57,11 +59,11 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
         buttonView.highligthedChanged = { [weak self] highlighted in
             if let strongSelf = self {
                 if highlighted {
-                    strongSelf.backgroundNode.layer.removeAnimation(forKey: "opacity")
-                    strongSelf.backgroundNode.alpha = 0.55
+                    strongSelf.backgroundBlurNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.backgroundBlurNode.alpha = 0.55
                 } else {
-                    strongSelf.backgroundNode.alpha = 1.0
-                    strongSelf.backgroundNode.layer.animateAlpha(from: 0.55, to: 1.0, duration: 0.2)
+                    strongSelf.backgroundBlurNode.alpha = 1.0
+                    strongSelf.backgroundBlurNode.layer.animateAlpha(from: 0.55, to: 1.0, duration: 0.2)
                 }
             }
         }
@@ -98,11 +100,13 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
                 case .url, .urlAuth:
                     iconImage = incoming ? graphics.chatBubbleActionButtonIncomingLinkIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage
                 case .requestPhone:
-                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingPhoneIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage
+                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingPhoneIconImage : graphics.chatBubbleActionButtonOutgoingPhoneIconImage
                 case .requestMap:
-                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingLocationIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage
+                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingLocationIconImage : graphics.chatBubbleActionButtonOutgoingLocationIconImage
                 case .switchInline:
-                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingShareIconImage : graphics.chatBubbleActionButtonOutgoingLinkIconImage
+                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingShareIconImage : graphics.chatBubbleActionButtonOutgoingShareIconImage
+                case .payment:
+                    iconImage = incoming ? graphics.chatBubbleActionButtonIncomingPaymentIconImage : graphics.chatBubbleActionButtonOutgoingPaymentIconImage
                 default:
                     iconImage = nil
             }
@@ -123,17 +127,17 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
             
             let messageTheme = incoming ? theme.theme.chat.message.incoming : theme.theme.chat.message.outgoing
             let (titleSize, titleApply) = titleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: title, font: titleFont, textColor:  bubbleVariableColor(variableColor: messageTheme.actionButtonsTextColor, wallpaper: theme.wallpaper)), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: max(44.0, constrainedWidth - minimumSideInset - minimumSideInset), height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets(top: 1.0, left: 0.0, bottom: 1.0, right: 0.0)))
-            
-            let backgroundImage: UIImage?
+
+            let backgroundMaskImage: UIImage?
             switch position {
-                case .middle:
-                    backgroundImage = incoming ? graphics.chatBubbleActionButtonIncomingMiddleImage : graphics.chatBubbleActionButtonOutgoingMiddleImage
-                case .bottomLeft:
-                    backgroundImage = incoming ? graphics.chatBubbleActionButtonIncomingBottomLeftImage : graphics.chatBubbleActionButtonOutgoingBottomLeftImage
-                case .bottomRight:
-                    backgroundImage = incoming ? graphics.chatBubbleActionButtonIncomingBottomRightImage : graphics.chatBubbleActionButtonOutgoingBottomRightImage
-                case .bottomSingle:
-                    backgroundImage = incoming ? graphics.chatBubbleActionButtonIncomingBottomSingleImage : graphics.chatBubbleActionButtonOutgoingBottomSingleImage
+            case .middle:
+                backgroundMaskImage = graphics.chatBubbleActionButtonMiddleMaskImage
+            case .bottomLeft:
+                backgroundMaskImage = graphics.chatBubbleActionButtonBottomLeftMaskImage
+            case .bottomRight:
+                backgroundMaskImage = graphics.chatBubbleActionButtonBottomRightMaskImage
+            case .bottomSingle:
+                backgroundMaskImage = graphics.chatBubbleActionButtonBottomSingleMaskImage
             }
             
             return (titleSize.size.width + sideInset + sideInset, { width in
@@ -154,8 +158,12 @@ private final class ChatMessageActionButtonNode: ASDisplayNode {
                             node.longTapRecognizer?.isEnabled = false
                     }
                     
-                    node.backgroundNode.image = backgroundImage
-                    node.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: max(0.0, width), height: 42.0))
+                    node.backgroundMaskNode.image = backgroundMaskImage
+                    node.backgroundMaskNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: max(0.0, width), height: 42.0))
+
+                    node.backgroundBlurNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: max(0.0, width), height: 42.0))
+                    node.backgroundBlurNode.update(size: node.backgroundBlurNode.bounds.size, cornerRadius: bubbleCorners.auxiliaryRadius, transition: .immediate)
+                    node.backgroundBlurNode.updateColor(color: selectDateFillStaticColor(theme: theme.theme, wallpaper: theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: theme.theme, wallpaper: theme.wallpaper), transition: .immediate)
                     
                     if iconImage != nil {
                         if node.iconNode == nil {
diff --git a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
index 4eb1e5df7a..1c098b049b 100644
--- a/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageActionItemNode.swift
@@ -17,14 +17,17 @@ import TelegramStringFormatting
 import UniversalMediaPlayer
 import TelegramUniversalVideoContent
 import GalleryUI
+import WallpaperBackgroundNode
 
-private func attributedServiceMessageString(theme: ChatPresentationThemeData, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, message: Message, accountPeerId: PeerId) -> NSAttributedString? {
-    return universalServiceMessageString(presentationData: (theme.theme, theme.wallpaper), strings: strings, nameDisplayOrder: nameDisplayOrder, message: message, accountPeerId: accountPeerId, forChatList: false)
+private func attributedServiceMessageString(theme: ChatPresentationThemeData, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, message: Message, accountPeerId: PeerId) -> NSAttributedString? {
+    return universalServiceMessageString(presentationData: (theme.theme, theme.wallpaper), strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, message: message, accountPeerId: accountPeerId, forChatList: false)
 }
 
 class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
     let labelNode: TextNode
-    let filledBackgroundNode: LinkHighlightingNode
+    var backgroundNode: WallpaperBackgroundNode.BubbleBackgroundNode?
+    var backgroundColorNode: ASDisplayNode
+    let backgroundMaskNode: ASImageNode
     var linkHighlightingNode: LinkHighlightingNode?
     
     private let mediaBackgroundNode: ASImageNode
@@ -33,21 +36,24 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
     private var videoContent: NativeVideoContent?
     private var videoStartTimestamp: Double?
     private let fetchDisposable = MetaDisposable()
+
+    private var cachedMaskBackgroundImage: (CGPoint, UIImage, [CGRect])?
+    private var absoluteRect: (CGRect, CGSize)?
     
     required init() {
         self.labelNode = TextNode()
         self.labelNode.isUserInteractionEnabled = false
         self.labelNode.displaysAsynchronously = false
-        
-        self.filledBackgroundNode = LinkHighlightingNode(color: .clear)
+
+        self.backgroundColorNode = ASDisplayNode()
+        self.backgroundMaskNode = ASImageNode()
         
         self.mediaBackgroundNode = ASImageNode()
         self.mediaBackgroundNode.displaysAsynchronously = false
         self.mediaBackgroundNode.displayWithoutProcessing = true
         
         super.init()
-        
-        self.addSubnode(self.filledBackgroundNode)
+
         self.addSubnode(self.labelNode)
     }
     
@@ -124,7 +130,8 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
     
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, unboundSize: CGSize?, maxWidth: CGFloat, layout: (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
-        let backgroundLayout = self.filledBackgroundNode.asyncLayout()
+
+        let cachedMaskBackgroundImage = self.cachedMaskBackgroundImage
         
         return { item, layoutConstants, _, _, _ in
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: true, headerSpacing: 0.0, hidesBackground: .always, forceFullCorners: false, forceAlignment: .center)
@@ -132,7 +139,7 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
             let backgroundImage = PresentationResourcesChat.chatActionPhotoBackgroundImage(item.presentationData.theme.theme, wallpaper: !item.presentationData.theme.wallpaper.isEmpty)
             
             return (contentProperties, nil, CGFloat.greatestFiniteMagnitude, { constrainedSize, position in
-                let attributedString = attributedServiceMessageString(theme: item.presentationData.theme, strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, message: item.message, accountPeerId: item.context.account.peerId)
+                let attributedString = attributedServiceMessageString(theme: item.presentationData.theme, strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, message: item.message, accountPeerId: item.context.account.peerId)
             
                 var image: TelegramMediaImage?
                 for media in item.message.media {
@@ -172,7 +179,15 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
                 }
             
                 let serviceColor = serviceMessageColorComponents(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper)
-                let backgroundApply = backgroundLayout(serviceColor.fill, labelRects, 10.0, 10.0, 0.0)
+
+                let backgroundMaskImage: (CGPoint, UIImage)?
+                var backgroundMaskUpdated = false
+                if let (currentOffset, currentImage, currentRects) = cachedMaskBackgroundImage, currentRects == labelRects {
+                    backgroundMaskImage = (currentOffset, currentImage)
+                } else {
+                    backgroundMaskImage = LinkHighlightingNode.generateImage(color: .black, inset: 0.0, innerRadius: 10.0, outerRadius: 10.0, rects: labelRects)
+                    backgroundMaskUpdated = true
+                }
             
                 var backgroundSize = CGSize(width: labelLayout.size.width + 8.0 + 8.0, height: labelLayout.size.height + 4.0)
                 
@@ -260,17 +275,76 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
                             }
                                                         
                             let _ = apply()
-                            let _ = backgroundApply()
                             
                             let labelFrame = CGRect(origin: CGPoint(x: 8.0, y: image != nil ? 2 : floorToScreenPixels((backgroundSize.height - labelLayout.size.height) / 2.0) - 1.0), size: labelLayout.size)
                             strongSelf.labelNode.frame = labelFrame
-                            strongSelf.filledBackgroundNode.frame = labelFrame.offsetBy(dx: 0.0, dy: -11.0)
+                            strongSelf.backgroundColorNode.backgroundColor = selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper)
+
+                            let baseBackgroundFrame = labelFrame.offsetBy(dx: 0.0, dy: -11.0)
+
+                            if let (offset, image) = backgroundMaskImage {
+                                if strongSelf.backgroundNode == nil {
+                                    if let backgroundNode = item.controllerInteraction.presentationContext.backgroundNode?.makeBubbleBackground(for: .free) {
+                                        strongSelf.backgroundNode = backgroundNode
+                                        backgroundNode.addSubnode(strongSelf.backgroundColorNode)
+                                        strongSelf.insertSubnode(backgroundNode, at: 0)
+                                    }
+                                }
+
+                                if backgroundMaskUpdated, let backgroundNode = strongSelf.backgroundNode {
+                                    if labelRects.count == 1 {
+                                        backgroundNode.clipsToBounds = true
+                                        backgroundNode.cornerRadius = labelRects[0].height / 2.0
+                                        backgroundNode.view.mask = nil
+                                    } else {
+                                        backgroundNode.clipsToBounds = false
+                                        backgroundNode.cornerRadius = 0.0
+                                        backgroundNode.view.mask = strongSelf.backgroundMaskNode.view
+                                    }
+                                }
+
+                                if let backgroundNode = strongSelf.backgroundNode {
+                                    backgroundNode.frame = CGRect(origin: CGPoint(x: baseBackgroundFrame.minX + offset.x, y: baseBackgroundFrame.minY + offset.y), size: image.size)
+                                    if let (rect, size) = strongSelf.absoluteRect {
+                                        strongSelf.updateAbsoluteRect(rect, within: size)
+                                    }
+                                }
+                                strongSelf.backgroundMaskNode.image = image
+                                strongSelf.backgroundMaskNode.frame = CGRect(origin: CGPoint(), size: image.size)
+
+                                strongSelf.backgroundColorNode.frame = CGRect(origin: CGPoint(), size: image.size)
+
+                                strongSelf.cachedMaskBackgroundImage = (offset, image, labelRects)
+                            }
                         }
                     })
                 })
             })
         }
     }
+
+    override func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        self.absoluteRect = (rect, containerSize)
+
+        if let backgroundNode = self.backgroundNode {
+            var backgroundFrame = backgroundNode.frame
+            backgroundFrame.origin.x += rect.minX
+            backgroundFrame.origin.y += rect.minY
+            backgroundNode.update(rect: backgroundFrame, within: containerSize)
+        }
+    }
+
+    override func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.offset(value: value, animationCurve: animationCurve, duration: duration)
+        }
+    }
+
+    override func applyAbsoluteOffsetSpring(value: CGFloat, duration: Double, damping: CGFloat) {
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.offsetSpring(value: value, duration: duration, damping: damping)
+        }
+    }
     
     override func updateTouchesAtPoint(_ point: CGPoint?) {
         if let item = self.item {
@@ -347,7 +421,7 @@ class ChatMessageActionBubbleContentNode: ChatMessageBubbleContentNode {
             return .openMessage
         }
         
-        if self.filledBackgroundNode.frame.contains(point.offsetBy(dx: 0.0, dy: -10.0)) {
+        if let backgroundNode = self.backgroundNode, backgroundNode.frame.contains(point.offsetBy(dx: 0.0, dy: -10.0)) {
             return .openMessage
         } else {
             return .none
diff --git a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
index fe7c0e93fa..9735da77e8 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
@@ -22,6 +22,7 @@ import ManagedAnimationNode
 import SlotMachineAnimationNode
 import UniversalMediaPlayer
 import ShimmerEffect
+import WallpaperBackgroundNode
 
 private let nameFont = Font.medium(14.0)
 private let inlineBotPrefixFont = Font.regular(14.0)
@@ -29,19 +30,31 @@ private let inlineBotNameFont = nameFont
 
 protocol GenericAnimatedStickerNode: ASDisplayNode {
     func setOverlayColor(_ color: UIColor?, animated: Bool)
+
+    var currentFrameIndex: Int { get }
+    func setFrameIndex(_ frameIndex: Int)
 }
 
 extension AnimatedStickerNode: GenericAnimatedStickerNode {
-    
+    func setFrameIndex(_ frameIndex: Int) {
+        self.stop()
+        self.play(fromIndex: frameIndex)
+    }
 }
 
 extension SlotMachineAnimationNode: GenericAnimatedStickerNode {
-    
+    var currentFrameIndex: Int {
+        return 0
+    }
+
+    func setFrameIndex(_ frameIndex: Int) {
+    }
 }
 
 class ChatMessageShareButton: HighlightableButtonNode {
-    private let backgroundNode: ASImageNode
+    private let backgroundNode: NavigationBackgroundNode
     private let iconNode: ASImageNode
+    private var iconOffset = CGPoint()
     
     private var theme: PresentationTheme?
     private var isReplies: Bool = false
@@ -49,7 +62,7 @@ class ChatMessageShareButton: HighlightableButtonNode {
     private var textNode: ImmediateTextNode?
     
     init() {
-        self.backgroundNode = ASImageNode()
+        self.backgroundNode = NavigationBackgroundNode(color: .clear)
         self.iconNode = ASImageNode()
         
         super.init(pointerStyle: nil)
@@ -62,7 +75,7 @@ class ChatMessageShareButton: HighlightableButtonNode {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func update(presentationData: ChatPresentationData, chatLocation: ChatLocation, subject: ChatControllerSubject?, message: Message, account: Account) -> CGSize {
+    func update(presentationData: ChatPresentationData, chatLocation: ChatLocation, subject: ChatControllerSubject?, message: Message, account: Account, disableComments: Bool = false) -> CGSize {
         var isReplies = false
         var replyCount = 0
         if let channel = message.peers[message.id.peerId] as? TelegramChannel, case .broadcast = channel.info {
@@ -78,26 +91,30 @@ class ChatMessageShareButton: HighlightableButtonNode {
             replyCount = 0
             isReplies = false
         }
+        if disableComments {
+            replyCount = 0
+            isReplies = false
+        }
         
         if self.theme !== presentationData.theme.theme || self.isReplies != isReplies {
             self.theme = presentationData.theme.theme
             self.isReplies = isReplies
-            
-            let graphics = PresentationResourcesChat.additionalGraphics(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
-            var updatedShareButtonBackground: UIImage?
+
             var updatedIconImage: UIImage?
+            var updatedIconOffset = CGPoint()
             if case .pinnedMessages = subject {
-                updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage
+                updatedIconImage = PresentationResourcesChat.chatFreeNavigateButtonIcon(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
             } else if isReplies {
-                updatedShareButtonBackground = PresentationResourcesChat.chatFreeCommentButtonBackground(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
                 updatedIconImage = PresentationResourcesChat.chatFreeCommentButtonIcon(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
             } else if message.id.peerId.isRepliesOrSavedMessages(accountPeerId: account.peerId) {
-                updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage
+                updatedIconImage = PresentationResourcesChat.chatFreeNavigateButtonIcon(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
+                updatedIconOffset = CGPoint(x: UIScreenPixel, y: 1.0)
             } else {
-                updatedShareButtonBackground = graphics.chatBubbleShareButtonImage
+                updatedIconImage = PresentationResourcesChat.chatFreeShareButtonIcon(presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
             }
-            self.backgroundNode.image = updatedShareButtonBackground
+            self.backgroundNode.updateColor(color: selectDateFillStaticColor(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), transition: .immediate)
             self.iconNode.image = updatedIconImage
+            self.iconOffset = updatedIconOffset
         }
         var size = CGSize(width: 30.0, height: 30.0)
         var offsetIcon = false
@@ -133,27 +150,25 @@ class ChatMessageShareButton: HighlightableButtonNode {
             textNode.removeFromSupernode()
         }
         self.backgroundNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: min(self.backgroundNode.bounds.width, self.backgroundNode.bounds.height) / 2.0, transition: .immediate)
         if let image = self.iconNode.image {
-            self.iconNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.width - image.size.width) / 2.0) - (offsetIcon ? 1.0 : 0.0)), size: image.size)
+            self.iconNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0) + self.iconOffset.x, y: floor((size.width - image.size.width) / 2.0) - (offsetIcon ? 1.0 : 0.0) + self.iconOffset.y), size: image.size)
         }
         return size
     }
 }
 
 class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
-    private let contextSourceNode: ContextExtractedContentContainingNode
+    let contextSourceNode: ContextExtractedContentContainingNode
     private let containerNode: ContextControllerSourceNode
     let imageNode: TransformImageNode
-    private var placeholderNode: StickerShimmerEffectNode
-    private var animationNode: GenericAnimatedStickerNode?
+    private var enableSynchronousImageApply: Bool = false
+    private var backgroundNode: WallpaperBackgroundNode.BubbleBackgroundNode?
+    private(set) var placeholderNode: StickerShimmerEffectNode
+    private(set) var animationNode: GenericAnimatedStickerNode?
     private var didSetUpAnimationNode = false
     private var isPlaying = false
-    private var animateGreeting = false
-    private var animatingGreeting = false
-    private weak var greetingStickerParentNode: ASDisplayNode?
-    private weak var greetingStickerListNode: ASDisplayNode?
-    private var greetingCompletion: ((@escaping () -> Void) -> Void)?
-    
+  
     private var swipeToReplyNode: ChatMessageSwipeToReplyNode?
     private var swipeToReplyFeedback: HapticFeedback?
     
@@ -167,12 +182,12 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
     private let disposable = MetaDisposable()
     
     private var forwardInfoNode: ChatMessageForwardInfoNode?
-    private var forwardBackgroundNode: ASImageNode?
+    private var forwardBackgroundNode: NavigationBackgroundNode?
     
     private var viaBotNode: TextNode?
     private let dateAndStatusNode: ChatMessageDateAndStatusNode
     private var replyInfoNode: ChatMessageReplyInfoNode?
-    private var replyBackgroundNode: ASImageNode?
+    private var replyBackgroundNode: NavigationBackgroundNode?
     
     private var actionButtonsNode: ChatMessageActionButtonsNode?
     
@@ -249,11 +264,16 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                 return
             }
             if image != nil {
-                if firstTime && !strongSelf.placeholderNode.isEmpty && !strongSelf.animateGreeting && !strongSelf.animatingGreeting {
-                    strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-                    strongSelf.removePlaceholder(animated: true)
+                if firstTime && !strongSelf.placeholderNode.isEmpty {
+                    if strongSelf.enableSynchronousImageApply {
+                        strongSelf.removePlaceholder(animated: false)
+                    } else {
+                        strongSelf.imageNode.alpha = 0.0
+                    }
                 } else {
-                    strongSelf.removePlaceholder(animated: true)
+                    if strongSelf.setupTimestamp == nil {
+                        strongSelf.removePlaceholder(animated: true)
+                    }
                 }
                 firstTime = false
             }
@@ -290,10 +310,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
     }
     
     private func removePlaceholder(animated: Bool) {
+        self.placeholderNode.alpha = 0.0
         if !animated {
             self.placeholderNode.removeFromSupernode()
         } else {
-            self.placeholderNode.alpha = 0.0
             self.placeholderNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, completion: { [weak self] _ in
                 self?.placeholderNode.removeFromSupernode()
             })
@@ -377,6 +397,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
         }
     }
     
+    private var setupTimestamp: Double?
     private func setupNode(item: ChatMessageItem) {
         guard self.animationNode == nil else {
             return
@@ -405,46 +426,46 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                 self.animationNode = animationNode
             }
         } else {
-            let animationNode: AnimatedStickerNode
-            if let (node, parentNode, listNode, greetingCompletion)  = item.controllerInteraction.greetingStickerNode(), let greetingStickerNode = node as? AnimatedStickerNode {
-                animationNode = greetingStickerNode
-                self.imageNode.alpha = 0.0
-                self.animateGreeting = true
-                self.greetingStickerParentNode = parentNode
-                self.greetingStickerListNode = listNode
-                self.greetingCompletion = greetingCompletion
-            } else {
-                animationNode = AnimatedStickerNode()
-                animationNode.started = { [weak self] in
-                    if let strongSelf = self {
-                        strongSelf.imageNode.alpha = 0.0
-                        
-                        if let item = strongSelf.item {
-                            if let _ = strongSelf.emojiFile {
-                                item.controllerInteraction.seenOneTimeAnimatedMedia.insert(item.message.id)
+            let animationNode = AnimatedStickerNode()
+            animationNode.started = { [weak self] in
+                if let strongSelf = self {
+                    strongSelf.imageNode.alpha = 0.0
+                    if !strongSelf.enableSynchronousImageApply {
+                        let current = CACurrentMediaTime()
+                        if let setupTimestamp = strongSelf.setupTimestamp, current - setupTimestamp > 0.3 {
+                            if !strongSelf.placeholderNode.alpha.isZero {
+                                strongSelf.animationNode?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                                strongSelf.removePlaceholder(animated: true)
                             }
+                        } else {
+                            strongSelf.removePlaceholder(animated: false)
+                        }
+                    }
+                    
+                    if let item = strongSelf.item {
+                        if let _ = strongSelf.emojiFile {
+                            item.controllerInteraction.seenOneTimeAnimatedMedia.insert(item.message.id)
                         }
                     }
                 }
             }
-            
             self.animationNode = animationNode
         }
         
-        if let animationNode = self.animationNode, !self.animateGreeting {
+        if let animationNode = self.animationNode {
             self.contextSourceNode.contentNode.insertSubnode(animationNode, aboveSubnode: self.placeholderNode)
         }
     }
     
-    override func setupItem(_ item: ChatMessageItem) {
-        super.setupItem(item)
+    override func setupItem(_ item: ChatMessageItem, synchronousLoad: Bool) {
+        super.setupItem(item, synchronousLoad: synchronousLoad)
                 
         for media in item.message.media {
             if let telegramFile = media as? TelegramMediaFile {
                 if self.telegramFile?.id != telegramFile.id {
                     self.telegramFile = telegramFile
                     let dimensions = telegramFile.dimensions ?? PixelDimensions(width: 512, height: 512)
-                    self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: telegramFile, small: false, size: dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0)), thumbnail: false))
+                    self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: telegramFile, small: false, size: dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0)), thumbnail: false, synchronousLoad: synchronousLoad), attemptSynchronously: synchronousLoad)
                     self.updateVisibility()
                     self.disposable.set(freeMediaFileInteractiveFetched(account: item.context.account, fileReference: .message(message: MessageReference(item.message), media: telegramFile)).start())
                 }
@@ -485,7 +506,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                     if let fitz = fitz {
                         fitzModifier = EmojiFitzModifier(emoji: fitz)
                     }
-                    self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: emojiFile, small: false, size: dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)), fitzModifier: fitzModifier, thumbnail: false))
+                    self.imageNode.setSignal(chatMessageAnimatedSticker(postbox: item.context.account.postbox, file: emojiFile, small: false, size: dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)), fitzModifier: fitzModifier, thumbnail: false, synchronousLoad: synchronousLoad), attemptSynchronously: synchronousLoad)
                     self.disposable.set(freeMediaFileInteractiveFetched(account: item.context.account, fileReference: .standalone(media: emojiFile)).start())
                 }
                 self.updateVisibility()
@@ -510,7 +531,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                     }
                 }
                 
-                animationNode.visibility = isPlaying && !alreadySeen
+                if isPlaying && self.setupTimestamp == nil {
+                    self.setupTimestamp = CACurrentMediaTime()
+                }
+                animationNode.visibility = isPlaying
                 
                 if self.didSetUpAnimationNode && alreadySeen {
                     if let emojiFile = self.emojiFile, emojiFile.resource is LocalFileReferenceMediaResource {
@@ -545,7 +569,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                             fitzModifier = EmojiFitzModifier(emoji: fitz)
                         }
                     }
-                    
+
                     if let file = file {
                         let dimensions = file.dimensions ?? PixelDimensions(width: 512, height: 512)
                         let fittedSize = isEmoji ? dimensions.cgSize.aspectFilled(CGSize(width: 384.0, height: 384.0)) : dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0))
@@ -574,6 +598,16 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             rect.origin.y = containerSize.height - rect.maxY + self.insets.top
 
             self.placeholderNode.updateAbsoluteRect(CGRect(origin: CGPoint(x: rect.minX + self.placeholderNode.frame.minX, y: rect.minY + self.placeholderNode.frame.minY), size: self.placeholderNode.frame.size), within: containerSize)
+            
+            if let backgroundNode = self.backgroundNode {
+                backgroundNode.update(rect: CGRect(origin: CGPoint(x: rect.minX + self.placeholderNode.frame.minX, y: rect.minY + self.placeholderNode.frame.minY), size: self.placeholderNode.frame.size), within: containerSize)
+            }
+        }
+    }
+    
+    override func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.offset(value: value, animationCurve: animationCurve, duration: duration)
         }
     }
     
@@ -619,13 +653,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
         let actionButtonsLayout = ChatMessageActionButtonsNode.asyncLayout(self.actionButtonsNode)
         
         let makeForwardInfoLayout = ChatMessageForwardInfoNode.asyncLayout(self.forwardInfoNode)
-        let currentForwardBackgroundNode = self.forwardBackgroundNode
         
         let viaBotLayout = TextNode.asyncLayout(self.viaBotNode)
         let makeReplyInfoLayout = ChatMessageReplyInfoNode.asyncLayout(self.replyInfoNode)
-        let currentReplyBackgroundNode = self.replyBackgroundNode
         let currentShareButtonNode = self.shareButtonNode
-        let currentItem = self.item
         let currentForwardInfo = self.appliedForwardInfo
         
         return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in
@@ -820,8 +851,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             
             var viaBotApply: (TextNodeLayout, () -> TextNode)?
             var replyInfoApply: (CGSize, () -> ChatMessageReplyInfoNode)?
-            var updatedReplyBackgroundNode: ASImageNode?
-            var replyBackgroundImage: UIImage?
+            var needsReplyBackground = false
             var replyMarkup: ReplyMarkupMessageAttribute?
             
             var ignoreForward = self.telegramDice == nil
@@ -887,14 +917,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             }
             
             if replyInfoApply != nil || viaBotApply != nil {
-                if let currentReplyBackgroundNode = currentReplyBackgroundNode {
-                    updatedReplyBackgroundNode = currentReplyBackgroundNode
-                } else {
-                    updatedReplyBackgroundNode = ASImageNode()
-                }
-                
-                let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
-                replyBackgroundImage = graphics.chatFreeformContentAdditionalInfoBackgroundImage
+                needsReplyBackground = true
             }
             
             var updatedShareButtonNode: ChatMessageShareButton?
@@ -914,8 +937,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             var forwardPsaType: String?
             
             var forwardInfoSizeApply: (CGSize, (CGFloat) -> ChatMessageForwardInfoNode)?
-            var updatedForwardBackgroundNode: ASImageNode?
-            var forwardBackgroundImage: UIImage?
+            var needsForwardBackground = false
             
             if !ignoreForward, let forwardInfo = item.message.forwardInfo {
                 forwardPsaType = forwardInfo.psaType
@@ -940,15 +962,8 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                 }
                 let availableWidth = max(60.0, availableContentWidth + 6.0)
                 forwardInfoSizeApply = makeForwardInfoLayout(item.presentationData, item.presentationData.strings, .standalone, forwardSource, forwardAuthorSignature, forwardPsaType, CGSize(width: availableWidth, height: CGFloat.greatestFiniteMagnitude))
-                
-                if let currentForwardBackgroundNode = currentForwardBackgroundNode {
-                    updatedForwardBackgroundNode = currentForwardBackgroundNode
-                } else {
-                    updatedForwardBackgroundNode = ASImageNode()
-                }
-                
-                let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
-                forwardBackgroundImage = graphics.chatServiceBubbleFillImage
+
+                needsForwardBackground = true
             }
             
             var maxContentWidth = imageSize.width
@@ -1002,65 +1017,33 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                     }
                     
                     if let file = file, let immediateThumbnailData = file.immediateThumbnailData {
+                        if strongSelf.backgroundNode == nil {
+                            if let backgroundNode = item.controllerInteraction.presentationContext.backgroundNode?.makeBubbleBackground(for: .free) {
+                                strongSelf.backgroundNode = backgroundNode
+                                strongSelf.placeholderNode.addBackdropNode(backgroundNode)
+                                
+                                if let (rect, size) = strongSelf.absoluteRect {
+                                    strongSelf.updateAbsoluteRect(rect, within: size)
+                                }
+                            }
+                        }
+                        
                         let foregroundColor = bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.stickerPlaceholderColor, wallpaper: item.presentationData.theme.wallpaper)
                         let shimmeringColor = bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.stickerPlaceholderShimmerColor, wallpaper: item.presentationData.theme.wallpaper)
                         strongSelf.placeholderNode.update(backgroundColor: nil, foregroundColor: foregroundColor, shimmeringColor: shimmeringColor, data: immediateThumbnailData, size: animationNodeFrame.size, imageSize: file.dimensions?.cgSize ?? CGSize(width: 512.0, height: 512.0))
                         strongSelf.placeholderNode.frame = animationNodeFrame
                     }
                     
-                    if let animationNode = strongSelf.animationNode, let parentNode = strongSelf.greetingStickerParentNode, strongSelf.animateGreeting {
-                        strongSelf.animateGreeting = false
-                        strongSelf.animatingGreeting = true
-                        
-                        let initialFrame = animationNode.view.convert(animationNode.bounds, to: parentNode.view)
-                        parentNode.addSubnode(animationNode)
-                        animationNode.frame = initialFrame
-                                                
-                        var targetPositionY = initialFrame.center.y
-                        if let listNode = strongSelf.greetingStickerListNode as? ListView {
-                            targetPositionY = listNode.frame.height - listNode.insets.top - animationNodeFrame.height / 2.0 - 12.0
-                        }
-                        let targetPosition = CGPoint(x: animationNodeFrame.midX, y: targetPositionY)
-                        
-                        let targetScale = animationNodeFrame.width / initialFrame.width
-                        animationNode.layer.animateScale(from: 1.0, to: targetScale, duration: 0.3, removeOnCompletion: false)
-                        
-                        animationNode.layer.animatePosition(from: initialFrame.center, to: targetPosition, duration: 0.4, mediaTimingFunction: CAMediaTimingFunction(controlPoints: 0.3, 0.0, 0.0, 1.0), removeOnCompletion: false, completion: { [weak self] finished in
-                            if let strongSelf = self {
-                                let initialDateNodeFrame = strongSelf.dateAndStatusNode.frame
-                                if strongSelf.animatingGreeting {
-                                    if strongSelf.dateAndStatusNode.supernode !== parentNode {
-                                        let dateNodeFrame = strongSelf.dateAndStatusNode.view.convert(strongSelf.dateAndStatusNode.bounds, to: parentNode.view)
-                                        parentNode.addSubnode(strongSelf.dateAndStatusNode)
-                                        strongSelf.dateAndStatusNode.frame = dateNodeFrame
-                                        
-                                        strongSelf.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
-                                    }
-                                }
-                                
-                                strongSelf.greetingCompletion?({
-                                    animationNode.layer.removeAllAnimations()
-                                    strongSelf.animationNode?.frame = animationNodeFrame
-                                    strongSelf.contextSourceNode.contentNode.insertSubnode(animationNode, aboveSubnode: strongSelf.imageNode)
-                                    
-                                    strongSelf.contextSourceNode.contentNode.addSubnode(strongSelf.dateAndStatusNode)
-                                    strongSelf.dateAndStatusNode.frame = initialDateNodeFrame
-                                    
-                                    if let animationNode = strongSelf.animationNode as? AnimatedStickerNode {
-                                        animationNode.updateLayout(size: updatedContentFrame.insetBy(dx: imageInset, dy: imageInset).size)
-                                    }
-                                    strongSelf.animatingGreeting = false
-                                })
-                            }
-                        })
-                        
-                    } else if strongSelf.animationNode?.supernode === strongSelf.contextSourceNode.contentNode {
+                    if strongSelf.animationNode?.supernode === strongSelf.contextSourceNode.contentNode {
                         strongSelf.animationNode?.frame = animationNodeFrame
                     }
                     if let animationNode = strongSelf.animationNode as? AnimatedStickerNode, strongSelf.animationNode?.supernode === strongSelf.contextSourceNode.contentNode {
                         animationNode.updateLayout(size: updatedContentFrame.insetBy(dx: imageInset, dy: imageInset).size)
                     }
+
+                    strongSelf.enableSynchronousImageApply = true
                     imageApply()
+                    strongSelf.enableSynchronousImageApply = false
                     
                     strongSelf.contextSourceNode.contentRect = strongSelf.imageNode.frame
                     strongSelf.containerNode.targetNodeForActivationProgressContentRect = strongSelf.contextSourceNode.contentRect
@@ -1082,22 +1065,19 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                     }
                     
                     dateAndStatusApply(false)
-                    let dateAndStatusFrame = CGRect(origin: CGPoint(x: max(displayLeftInset, updatedImageFrame.maxX - dateAndStatusSize.width - 4.0), y: updatedImageFrame.maxY - dateAndStatusSize.height - 4.0), size: dateAndStatusSize)
-                    if strongSelf.dateAndStatusNode.supernode != strongSelf.greetingStickerParentNode {
-                        strongSelf.dateAndStatusNode.frame = dateAndStatusFrame
-                    }
-                    
-                    if let updatedReplyBackgroundNode = updatedReplyBackgroundNode {
-                        if strongSelf.replyBackgroundNode == nil {
-                            strongSelf.replyBackgroundNode = updatedReplyBackgroundNode
-                            strongSelf.addSubnode(updatedReplyBackgroundNode)
-                            updatedReplyBackgroundNode.image = replyBackgroundImage
+                    strongSelf.dateAndStatusNode.frame = CGRect(origin: CGPoint(x: max(displayLeftInset, updatedImageFrame.maxX - dateAndStatusSize.width - 4.0), y: updatedImageFrame.maxY - dateAndStatusSize.height - 4.0), size: dateAndStatusSize)
+
+                    if needsReplyBackground {
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode {
+                            replyBackgroundNode.updateColor(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), transition: .immediate)
                         } else {
-                            strongSelf.replyBackgroundNode?.image = replyBackgroundImage
+                            let replyBackgroundNode = NavigationBackgroundNode(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper))
+                            strongSelf.replyBackgroundNode = replyBackgroundNode
+                            strongSelf.contextSourceNode.contentNode.addSubnode(replyBackgroundNode)
                         }
                     } else if let replyBackgroundNode = strongSelf.replyBackgroundNode {
-                        replyBackgroundNode.removeFromSupernode()
                         strongSelf.replyBackgroundNode = nil
+                        replyBackgroundNode.removeFromSupernode()
                     }
                     
                     if let (viaBotLayout, viaBotApply) = viaBotApply {
@@ -1108,7 +1088,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                         }
                         let viaBotFrame = CGRect(origin: CGPoint(x: (!incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + 15.0) : (params.width - params.rightInset - viaBotLayout.size.width - layoutConstants.bubble.edgeInset - 14.0)), y: 8.0), size: viaBotLayout.size)
                         viaBotNode.frame = viaBotFrame
-                        strongSelf.replyBackgroundNode?.frame = CGRect(origin: CGPoint(x: viaBotFrame.minX - 6.0, y: viaBotFrame.minY - 2.0 - UIScreenPixel), size: CGSize(width: viaBotFrame.size.width + 11.0, height: viaBotFrame.size.height + 5.0))
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode {
+                            replyBackgroundNode.frame = CGRect(origin: CGPoint(x: viaBotFrame.minX - 6.0, y: viaBotFrame.minY - 2.0 - UIScreenPixel), size: CGSize(width: viaBotFrame.size.width + 11.0, height: viaBotFrame.size.height + 5.0))
+                            replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: 8.0, transition: .immediate)
+                        }
                     } else if let viaBotNode = strongSelf.viaBotNode {
                         viaBotNode.removeFromSupernode()
                         strongSelf.viaBotNode = nil
@@ -1118,7 +1101,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                         let replyInfoNode = replyInfoApply()
                         if strongSelf.replyInfoNode == nil {
                             strongSelf.replyInfoNode = replyInfoNode
-                            strongSelf.addSubnode(replyInfoNode)
+                            strongSelf.contextSourceNode.contentNode.addSubnode(replyInfoNode)
                         }
                         var viaBotSize = CGSize()
                         if let viaBotNode = strongSelf.viaBotNode {
@@ -1131,7 +1114,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                             }
                         }
                         replyInfoNode.frame = replyInfoFrame
-                        strongSelf.replyBackgroundNode?.frame = CGRect(origin: CGPoint(x: replyInfoFrame.minX - 4.0, y: replyInfoFrame.minY - viaBotSize.height - 2.0), size: CGSize(width: max(replyInfoFrame.size.width, viaBotSize.width) + 8.0, height: replyInfoFrame.size.height + viaBotSize.height + 5.0))
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode {
+                            replyBackgroundNode.frame = CGRect(origin: CGPoint(x: replyInfoFrame.minX - 4.0, y: replyInfoFrame.minY - viaBotSize.height - 2.0), size: CGSize(width: max(replyInfoFrame.size.width, viaBotSize.width) + 8.0, height: replyInfoFrame.size.height + viaBotSize.height + 5.0))
+                            replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: 8.0, transition: .immediate)
+                        }
                         
                         if let _ = item.controllerInteraction.selectionState, isEmoji {
                             replyInfoNode.alpha = 0.0
@@ -1172,16 +1158,15 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                             deliveryFailedNode?.removeFromSupernode()
                         })
                     }
-                    
-                    if let updatedForwardBackgroundNode = updatedForwardBackgroundNode {
-                        if strongSelf.forwardBackgroundNode == nil {
-                            strongSelf.forwardBackgroundNode = updatedForwardBackgroundNode
-                            strongSelf.addSubnode(updatedForwardBackgroundNode)
-                            updatedForwardBackgroundNode.image = forwardBackgroundImage
+
+                    if needsForwardBackground {
+                        if let forwardBackgroundNode = strongSelf.forwardBackgroundNode {
+                            forwardBackgroundNode.updateColor(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), transition: .immediate)
+                        } else {
+                            let forwardBackgroundNode = NavigationBackgroundNode(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper))
+                            strongSelf.forwardBackgroundNode = forwardBackgroundNode
+                            strongSelf.addSubnode(forwardBackgroundNode)
                         }
-                    } else if let forwardBackgroundNode = strongSelf.forwardBackgroundNode {
-                        forwardBackgroundNode.removeFromSupernode()
-                        strongSelf.forwardBackgroundNode = nil
                     }
                     
                     if let (forwardInfoSize, forwardInfoApply) = forwardInfoSizeApply {
@@ -1192,7 +1177,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                         }
                         let forwardInfoFrame = CGRect(origin: CGPoint(x: (!incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + 12.0) : (params.width - params.rightInset - forwardInfoSize.width - layoutConstants.bubble.edgeInset - 12.0)), y: 8.0), size: forwardInfoSize)
                         forwardInfoNode.frame = forwardInfoFrame
-                        strongSelf.forwardBackgroundNode?.frame = CGRect(origin: CGPoint(x: forwardInfoFrame.minX - 6.0, y: forwardInfoFrame.minY - 2.0), size: CGSize(width: forwardInfoFrame.size.width + 10.0, height: forwardInfoFrame.size.height + 4.0))
+                        if let forwardBackgroundNode = strongSelf.forwardBackgroundNode {
+                            forwardBackgroundNode.frame = CGRect(origin: CGPoint(x: forwardInfoFrame.minX - 6.0, y: forwardInfoFrame.minY - 2.0), size: CGSize(width: forwardInfoFrame.size.width + 10.0, height: forwardInfoFrame.size.height + 4.0))
+                            forwardBackgroundNode.update(size: forwardBackgroundNode.bounds.size, cornerRadius: 8.0, transition: .immediate)
+                        }
                     } else if let forwardInfoNode = strongSelf.forwardInfoNode {
                         forwardInfoNode.removeFromSupernode()
                         strongSelf.forwardInfoNode = nil
@@ -1290,7 +1278,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                         for attribute in item.content.firstMessage.attributes {
                             if let attribute = attribute as? SourceReferenceMessageAttribute {
                                 openPeerId = attribute.messageId.peerId
-                                navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true), peekData: nil)
+                                navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true, timecode: nil), peekData: nil)
                             }
                         }
                         
@@ -1510,7 +1498,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
                 if translation.x < -45.0, self.swipeToReplyNode == nil, let item = self.item {
                     self.swipeToReplyFeedback?.impact()
                     
-                    let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonFillColor, wallpaper: item.presentationData.theme.wallpaper), strokeColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonStrokeColor, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
+                    let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
                     self.swipeToReplyNode = swipeToReplyNode
                     self.addSubnode(swipeToReplyNode)
                     animateReplyNodeIn = true
@@ -1583,6 +1571,15 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
         if case let .replyThread(replyThreadMessage) = item.chatLocation, replyThreadMessage.effectiveTopId == item.message.id {
             return
         }
+
+        let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+        let replyAlpha: CGFloat = item.controllerInteraction.selectionState == nil ? 1.0 : 0.0
+        if let replyInfoNode = self.replyInfoNode {
+            transition.updateAlpha(node: replyInfoNode, alpha: replyAlpha)
+        }
+        if let replyBackgroundNode = self.replyBackgroundNode {
+            transition.updateAlpha(node: replyBackgroundNode, alpha: replyAlpha)
+        }
         
         if let selectionState = item.controllerInteraction.selectionState {
             var selected = false
@@ -1669,6 +1666,10 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
             }
         }
     }
+
+    override func cancelInsertionAnimations() {
+        self.layer.removeAllAnimations()
+    }
     
     override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         super.animateInsertion(currentTimestamp, duration: duration, short: short)
@@ -1707,6 +1708,168 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
     override func addAccessoryItemNode(_ accessoryItemNode: ListViewAccessoryItemNode) {
         self.contextSourceNode.contentNode.addSubnode(accessoryItemNode)
     }
+
+    func animateContentFromTextInputField(textInput: ChatMessageTransitionNode.Source.TextInput, transition: CombinedTransition) {
+        guard let _ = self.item else {
+            return
+        }
+
+        let localSourceContentFrame = self.contextSourceNode.contentNode.view.convert(textInput.contentView.frame.offsetBy(dx: self.contextSourceNode.contentRect.minX, dy: self.contextSourceNode.contentRect.minY), to: self.contextSourceNode.contentNode.view)
+        textInput.contentView.frame = localSourceContentFrame
+
+        self.contextSourceNode.contentNode.view.addSubview(textInput.contentView)
+
+        let sourceCenter = CGPoint(
+            x: localSourceContentFrame.minX + 11.2,
+            y: localSourceContentFrame.midY - 1.8
+        )
+        let localSourceCenter = CGPoint(
+            x: sourceCenter.x - localSourceContentFrame.minX,
+            y: sourceCenter.y - localSourceContentFrame.minY
+        )
+        let localSourceOffset = CGPoint(
+            x: localSourceCenter.x - localSourceContentFrame.width / 2.0,
+            y: localSourceCenter.y - localSourceContentFrame.height / 2.0
+        )
+
+        let sourceScale: CGFloat = 28.0 / self.imageNode.frame.height
+
+        let offset = CGPoint(
+            x: sourceCenter.x - self.imageNode.frame.midX,
+            y: sourceCenter.y - self.imageNode.frame.midY
+        )
+
+        transition.animatePositionAdditive(layer: self.imageNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.imageNode, from: sourceScale)
+        if let animationNode = self.animationNode {
+            transition.animatePositionAdditive(layer: animationNode.layer, offset: offset)
+            transition.horizontal.animateTransformScale(node: animationNode, from: sourceScale)
+        }
+        transition.animatePositionAdditive(layer: self.placeholderNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.placeholderNode, from: sourceScale)
+
+        let inverseScale = 1.0 / sourceScale
+
+        transition.animatePositionAdditive(layer: textInput.contentView.layer, offset: CGPoint(), to: CGPoint(
+            x: -offset.x - localSourceOffset.x * (inverseScale - 1.0),
+            y: -offset.y - localSourceOffset.y * (inverseScale - 1.0)
+        ), removeOnCompletion: false)
+        transition.horizontal.updateTransformScale(layer: textInput.contentView.layer, scale: 1.0 / sourceScale)
+
+        textInput.contentView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { _ in
+            textInput.contentView.removeFromSuperview()
+        })
+
+        self.imageNode.layer.animateAlpha(from: 0.0, to: self.imageNode.alpha, duration: 0.1)
+        if let animationNode = self.animationNode {
+            animationNode.layer.animateAlpha(from: 0.0, to: animationNode.alpha, duration: 0.1)
+        }
+        self.placeholderNode.layer.animateAlpha(from: 0.0, to: self.placeholderNode.alpha, duration: 0.1)
+
+        self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: self.dateAndStatusNode.alpha, duration: 0.15, delay: 0.16)
+    }
+
+    func animateContentFromStickerGridItem(stickerSource: ChatMessageTransitionNode.Sticker, transition: CombinedTransition) {
+        guard let _ = self.item else {
+            return
+        }
+
+        let localSourceContentFrame = CGRect(
+            origin: CGPoint(
+                x: self.imageNode.frame.minX + self.imageNode.frame.size.width / 2.0 - stickerSource.imageNode.frame.size.width / 2.0,
+                y: self.imageNode.frame.minY + self.imageNode.frame.size.height / 2.0 - stickerSource.imageNode.frame.size.height / 2.0
+            ),
+            size: stickerSource.imageNode.frame.size
+        )
+
+        var snapshotView: UIView?
+        if let animationNode = stickerSource.animationNode {
+            snapshotView = animationNode.view.snapshotContentTree()
+        } else {
+            snapshotView = stickerSource.imageNode.view.snapshotContentTree()
+        }
+        snapshotView?.frame = localSourceContentFrame
+
+        if let snapshotView = snapshotView {
+            self.contextSourceNode.contentNode.view.addSubview(snapshotView)
+        }
+
+        let sourceCenter = CGPoint(
+            x: localSourceContentFrame.midX,
+            y: localSourceContentFrame.midY
+        )
+        let localSourceCenter = CGPoint(
+            x: sourceCenter.x - localSourceContentFrame.minX,
+            y: sourceCenter.y - localSourceContentFrame.minY
+        )
+        let localSourceOffset = CGPoint(
+            x: localSourceCenter.x - localSourceContentFrame.width / 2.0,
+            y: localSourceCenter.y - localSourceContentFrame.height / 2.0
+        )
+
+        let sourceScale: CGFloat = stickerSource.imageNode.frame.height / self.imageNode.frame.height
+
+        let offset = CGPoint(
+            x: sourceCenter.x - self.imageNode.frame.midX,
+            y: sourceCenter.y - self.imageNode.frame.midY
+        )
+
+        transition.animatePositionAdditive(layer: self.imageNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.imageNode, from: sourceScale)
+        if let animationNode = self.animationNode {
+            transition.animatePositionAdditive(layer: animationNode.layer, offset: offset)
+            transition.horizontal.animateTransformScale(node: animationNode, from: sourceScale)
+        }
+        transition.animatePositionAdditive(layer: self.placeholderNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.placeholderNode, from: sourceScale)
+
+        let inverseScale = 1.0 / sourceScale
+
+        if let snapshotView = snapshotView {
+            transition.animatePositionAdditive(layer: snapshotView.layer, offset: CGPoint(), to: CGPoint(
+                x: -offset.x - localSourceOffset.x * (inverseScale - 1.0),
+                y: -offset.y - localSourceOffset.y * (inverseScale - 1.0)
+            ), removeOnCompletion: false)
+            transition.horizontal.updateTransformScale(layer: snapshotView.layer, scale: 1.0 / sourceScale)
+
+            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.08, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                snapshotView?.removeFromSuperview()
+            })
+
+            self.imageNode.layer.animateAlpha(from: 0.0, to: self.imageNode.alpha, duration: 0.05)
+            if let animationNode = self.animationNode {
+                animationNode.layer.animateAlpha(from: 0.0, to: animationNode.alpha, duration: 0.05)
+            }
+            self.placeholderNode.layer.animateAlpha(from: 0.0, to: self.placeholderNode.alpha, duration: 0.05)
+        }
+
+        self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: self.dateAndStatusNode.alpha, duration: 0.15, delay: 0.16)
+
+        if let animationNode = stickerSource.animationNode {
+            animationNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+            animationNode.layer.animateAlpha(from: 0.0, to: animationNode.alpha, duration: 0.4)
+        }
+
+        stickerSource.imageNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+        stickerSource.imageNode.layer.animateAlpha(from: 0.0, to: stickerSource.imageNode.alpha, duration: 0.4)
+
+        if let placeholderNode = stickerSource.placeholderNode {
+            placeholderNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+            placeholderNode.layer.animateAlpha(from: 0.0, to: placeholderNode.alpha, duration: 0.4)
+        }
+    }
+
+    func animateReplyPanel(sourceReplyPanel: ChatMessageTransitionNode.ReplyPanel, transition: CombinedTransition) {
+        if let replyInfoNode = self.replyInfoNode {
+            let localRect = self.contextSourceNode.contentNode.view.convert(sourceReplyPanel.relativeSourceRect, to: replyInfoNode.view)
+
+            let offset = replyInfoNode.animateFromInputPanel(sourceReplyPanel: sourceReplyPanel, localRect: localRect, transition: transition)
+            if let replyBackgroundNode = self.replyBackgroundNode {
+                transition.animatePositionAdditive(layer: replyBackgroundNode.layer, offset: offset)
+                replyBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+            }
+        }
+    }
 }
 
 struct AnimatedEmojiSoundsConfiguration {
diff --git a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
index 12e233aa60..d01b40ed2e 100644
--- a/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageAttachedContentNode.swift
@@ -271,7 +271,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
         self.addSubnode(self.statusNode)
     }
     
-    func asyncLayout() -> (_ presentationData: ChatPresentationData, _ automaticDownloadSettings: MediaAutoDownloadSettings, _ associatedData: ChatMessageItemAssociatedData, _ attributes: ChatMessageEntryAttributes, _ context: AccountContext, _ controllerInteraction: ChatControllerInteraction, _ message: Message, _ messageRead: Bool, _ chatLocation: ChatLocation, _ title: String?, _ subtitle: NSAttributedString?, _ text: String?, _ entities: [MessageTextEntity]?, _ media: (Media, ChatMessageAttachedContentNodeMediaFlags)?, _ mediaBadge: String?, _ actionIcon: ChatMessageAttachedContentActionIcon?, _ actionTitle: String?, _ displayLine: Bool, _ layoutConstants: ChatMessageItemLayoutConstants, _ constrainedSize: CGSize) -> (CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
+    func asyncLayout() -> (_ presentationData: ChatPresentationData, _ automaticDownloadSettings: MediaAutoDownloadSettings, _ associatedData: ChatMessageItemAssociatedData, _ attributes: ChatMessageEntryAttributes, _ context: AccountContext, _ controllerInteraction: ChatControllerInteraction, _ message: Message, _ messageRead: Bool, _ chatLocation: ChatLocation, _ title: String?, _ subtitle: NSAttributedString?, _ text: String?, _ entities: [MessageTextEntity]?, _ media: (Media, ChatMessageAttachedContentNodeMediaFlags)?, _ mediaBadge: String?, _ actionIcon: ChatMessageAttachedContentActionIcon?, _ actionTitle: String?, _ displayLine: Bool, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ constrainedSize: CGSize) -> (CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let textAsyncLayout = TextNode.asyncLayout(self.textNode)
         let currentImage = self.media as? TelegramMediaImage
         let imageLayout = self.inlineImageNode.asyncLayout()
@@ -284,7 +284,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
         
         let currentAdditionalImageBadgeNode = self.additionalImageBadgeNode
         
-        return { presentationData, automaticDownloadSettings, associatedData, attributes, context, controllerInteraction, message, messageRead, chatLocation, title, subtitle, text, entities, mediaAndFlags, mediaBadge, actionIcon, actionTitle, displayLine, layoutConstants, constrainedSize in
+        return { presentationData, automaticDownloadSettings, associatedData, attributes, context, controllerInteraction, message, messageRead, chatLocation, title, subtitle, text, entities, mediaAndFlags, mediaBadge, actionIcon, actionTitle, displayLine, layoutConstants, preparePosition, constrainedSize in
             let isPreview = presentationData.isPreview
             let fontSize: CGFloat = floor(presentationData.fontSize.baseDisplaySize * 15.0 / 17.0)
             
@@ -412,24 +412,117 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                 textString = string.attributedSubstring(from: NSMakeRange(0, 1000))
             }
             
-            var automaticPlayback = false
-            
-            var skipStandardStatus = false
-            
             var isReplyThread = false
             if case .replyThread = chatLocation {
                 isReplyThread = true
             }
+
+            var skipStandardStatus = false
+            var isImage = false
+            var isFile = false
+            
+            var automaticPlayback = false
+            
+            var textStatusType: ChatMessageDateAndStatusType?
+            var imageStatusType: ChatMessageDateAndStatusType?
+            var additionalImageBadgeContent: ChatMessageInteractiveMediaBadgeContent?
+
+            if let (media, flags) = mediaAndFlags {
+                if let file = media as? TelegramMediaFile {
+                    if file.mimeType == "application/x-tgtheme-ios", let size = file.size, size < 16 * 1024 {
+                        isImage = true
+                    } else if file.isInstantVideo {
+                        isImage = true
+                    } else if file.isVideo {
+                        isImage = true
+                    } else if file.isSticker || file.isAnimatedSticker {
+                        isImage = true
+                    } else {
+                        isFile = true
+                    }
+                } else if let _ = media as? TelegramMediaImage {
+                    if !flags.contains(.preferMediaInline) {
+                        isImage = true
+                    }
+                } else if let _ = media as? TelegramMediaWebFile {
+                    isImage = true
+                } else if let _ = media as? WallpaperPreviewMedia {
+                    isImage = true
+                }
+            }
+
+            if preferMediaBeforeText {
+                isImage = false
+            }
+
+            let statusInText = !isImage
+
+            switch preparePosition {
+                case .linear(_, .None), .linear(_, .Neighbour(true, _, _)):
+                    if let count = webpageGalleryMediaCount {
+                        additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: presentationData.strings.Items_NOfM("1", "\(count)").0))
+                        skipStandardStatus = isImage
+                    } else if let mediaBadge = mediaBadge {
+                        additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: mediaBadge))
+                    } else {
+                        skipStandardStatus = isFile
+                    }
+
+                    if !skipStandardStatus {
+                        if message.effectivelyIncoming(context.account.peerId) {
+                            if isImage {
+                                imageStatusType = .ImageIncoming
+                            } else {
+                                textStatusType = .BubbleIncoming
+                            }
+                        } else {
+                            if message.flags.contains(.Failed) {
+                                if isImage {
+                                    imageStatusType = .ImageOutgoing(.Failed)
+                                } else {
+                                    textStatusType = .BubbleOutgoing(.Failed)
+                                }
+                            } else if (message.flags.isSending && !message.isSentOrAcknowledged) || attributes.updatingMedia != nil {
+                                if isImage {
+                                    imageStatusType = .ImageOutgoing(.Sending)
+                                } else {
+                                    textStatusType = .BubbleOutgoing(.Sending)
+                                }
+                            } else {
+                                if isImage {
+                                    imageStatusType = .ImageOutgoing(.Sent(read: messageRead))
+                                } else {
+                                    textStatusType = .BubbleOutgoing(.Sent(read: messageRead))
+                                }
+                            }
+                        }
+                    }
+                default:
+                    break
+            }
+
+            let imageDateAndStatus = imageStatusType.flatMap { statusType -> ChatMessageDateAndStatus in
+                ChatMessageDateAndStatus(
+                    type: statusType,
+                    edited: edited,
+                    viewCount: viewCount,
+                    dateReplies: dateReplies,
+                    dateReactions: dateReactions,
+                    isPinned: message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread,
+                    dateText: dateText
+                )
+            }
             
             if let (media, flags) = mediaAndFlags {
                 if let file = media as? TelegramMediaFile {
                     if file.mimeType == "application/x-tgtheme-ios", let size = file.size, size < 16 * 1024 {
-                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                         initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                         refineContentImageLayout = refineLayout
                     } else if file.isInstantVideo {
+                        let displaySize = CGSize(width: 212.0, height: 212.0)
                         let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: file)
-                        let (videoLayout, apply) = contentInstantVideoLayout(ChatMessageBubbleContentItem(context: context, controllerInteraction: controllerInteraction, message: message, read: messageRead, chatLocation: chatLocation, presentationData: presentationData, associatedData: associatedData, attributes: attributes, isItemPinned: message.tags.contains(.pinned) && !isReplyThread, isItemEdited: false), constrainedSize.width - horizontalInsets.left - horizontalInsets.right, CGSize(width: 212.0, height: 212.0), .bubble, automaticDownload)
+                        let (videoLayout, apply) = contentInstantVideoLayout(ChatMessageBubbleContentItem(context: context, controllerInteraction: controllerInteraction, message: message, read: messageRead, chatLocation: chatLocation, presentationData: presentationData, associatedData: associatedData, attributes: attributes, isItemPinned: message.tags.contains(.pinned) && !isReplyThread, isItemEdited: false), constrainedSize.width - horizontalInsets.left - horizontalInsets.right, displaySize, displaySize, 0.0, .bubble, automaticDownload)
                         initialWidth = videoLayout.contentSize.width + videoLayout.overflowLeft + videoLayout.overflowRight
                         contentInstantVideoSizeAndApply = (videoLayout, apply)
                     } else if file.isVideo {
@@ -455,12 +548,12 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                             }
                         }
 
-                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, automaticDownload, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, automaticDownload, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                         initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                         refineContentImageLayout = refineLayout
                     } else if file.isSticker || file.isAnimatedSticker {
                         let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: file)
-                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, file, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, file, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                         initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                         refineContentImageLayout = refineLayout
                     } else {
@@ -485,7 +578,7 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                 } else if let image = media as? TelegramMediaImage {
                     if !flags.contains(.preferMediaInline) {
                         let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: image)
-                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, image, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                        let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, image, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                         initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                         refineContentImageLayout = refineLayout
                     } else if let dimensions = largestImageRepresentation(image.representations)?.dimensions {
@@ -497,11 +590,11 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                     }
                 } else if let image = media as? TelegramMediaWebFile {
                     let automaticDownload = shouldDownloadMediaAutomatically(settings: automaticDownloadSettings, peerType: associatedData.automaticDownloadPeerType, networkType: associatedData.automaticDownloadNetworkType, authorPeerId: message.author?.id, contactsPeerIds: associatedData.contactsPeerIds, media: image)
-                    let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, image, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                    let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, image, imageDateAndStatus, automaticDownload ? .full : .none, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                     initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                     refineContentImageLayout = refineLayout
                 } else if let wallpaper = media as? WallpaperPreviewMedia {
-                    let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData.theme.theme, presentationData.strings, presentationData.dateTimeFormat, message, attributes, wallpaper, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
+                    let (_, initialImageWidth, refineLayout) = contentImageLayout(context, presentationData, presentationData.dateTimeFormat, message, attributes, wallpaper, imageDateAndStatus, .full, associatedData.automaticDownloadPeerType, .constrained(CGSize(width: constrainedSize.width - horizontalInsets.left - horizontalInsets.right, height: constrainedSize.height)), layoutConstants, contentMode)
                     initialWidth = initialImageWidth + horizontalInsets.left + horizontalInsets.right
                     refineContentImageLayout = refineLayout
                     if case let .file(_, _, _, _, isTheme, _) = wallpaper.content, isTheme {
@@ -527,60 +620,12 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                         break
                 }
                 
-                var statusInText = false
-                
                 var statusSizeAndApply: (CGSize, (Bool) -> Void)?
-                
+
                 let textConstrainedSize = CGSize(width: constrainedSize.width - insets.left - insets.right, height: constrainedSize.height - insets.top - insets.bottom)
-                
-                var additionalImageBadgeContent: ChatMessageInteractiveMediaBadgeContent?
-                
-                switch position {
-                    case .linear(_, .None), .linear(_, .Neighbour(true, _, _)):
-                        let imageMode = !((refineContentImageLayout == nil && refineContentFileLayout == nil && contentInstantVideoSizeAndApply == nil) || preferMediaBeforeText)
-                        statusInText = !imageMode
-                        
-                        if let count = webpageGalleryMediaCount {
-                            additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: presentationData.strings.Items_NOfM("1", "\(count)").0))
-                            skipStandardStatus = imageMode
-                        } else if let mediaBadge = mediaBadge {
-                            additionalImageBadgeContent = .text(inset: 0.0, backgroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusFillColor, foregroundColor: presentationData.theme.theme.chat.message.mediaDateAndStatusTextColor, text: NSAttributedString(string: mediaBadge))
-                        }
-                        
-                        if !skipStandardStatus {
-                            let statusType: ChatMessageDateAndStatusType
-                            if message.effectivelyIncoming(context.account.peerId) {
-                                if imageMode {
-                                    statusType = .ImageIncoming
-                                } else {
-                                    statusType = .BubbleIncoming
-                                }
-                            } else {
-                                if message.flags.contains(.Failed) {
-                                    if imageMode {
-                                        statusType = .ImageOutgoing(.Failed)
-                                    } else {
-                                        statusType = .BubbleOutgoing(.Failed)
-                                    }
-                                } else if (message.flags.isSending && !message.isSentOrAcknowledged) || attributes.updatingMedia != nil {
-                                    if imageMode {
-                                        statusType = .ImageOutgoing(.Sending)
-                                    } else {
-                                        statusType = .BubbleOutgoing(.Sending)
-                                    }
-                                } else {
-                                    if imageMode {
-                                        statusType = .ImageOutgoing(.Sent(read: messageRead))
-                                    } else {
-                                        statusType = .BubbleOutgoing(.Sent(read: messageRead))
-                                    }
-                                }
-                            }
-                        
-                            statusSizeAndApply = statusLayout(context, presentationData, edited, viewCount, dateText, statusType, textConstrainedSize, dateReactions, dateReplies, message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread, message.isSelfExpiring)
-                        }
-                    default:
-                        break
+
+                if let textStatusType = textStatusType {
+                    statusSizeAndApply = statusLayout(context, presentationData, edited, viewCount, dateText, textStatusType, textConstrainedSize, dateReactions, dateReplies, message.tags.contains(.pinned) && !associatedData.isInPinnedListMode && !isReplyThread, message.isSelfExpiring)
                 }
                 
                 var updatedAdditionalImageBadge: ChatMessageInteractiveMediaBadge?
@@ -823,6 +868,9 @@ final class ChatMessageAttachedContentNode: ASDisplayNode {
                                 let contentImageNode = contentImageApply(transition, synchronousLoads)
                                 if strongSelf.contentImageNode !== contentImageNode {
                                     strongSelf.contentImageNode = contentImageNode
+                                    contentImageNode.activatePinch = { sourceNode in
+                                        controllerInteraction.activateMessagePinch(sourceNode)
+                                    }
                                     strongSelf.addSubnode(contentImageNode)
                                     contentImageNode.activateLocalContent = { [weak strongSelf] mode in
                                         if let strongSelf = strongSelf {
diff --git a/submodules/TelegramUI/Sources/ChatMessageBackground.swift b/submodules/TelegramUI/Sources/ChatMessageBackground.swift
index 36bcc4941c..c618c7d7b9 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBackground.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBackground.swift
@@ -3,6 +3,7 @@ import UIKit
 import AsyncDisplayKit
 import Display
 import TelegramPresentationData
+import WallpaperBackgroundNode
 
 enum ChatMessageBackgroundMergeType: Equatable {
     case None, Side, Top(side: Bool), Bottom, Both, Extracted
@@ -65,6 +66,7 @@ class ChatMessageBackground: ASDisplayNode {
     private var maskMode: Bool?
     private let imageNode: ASImageNode
     private let outlineImageNode: ASImageNode
+    private weak var backgroundNode: WallpaperBackgroundNode?
     
     var hasImage: Bool {
         self.imageNode.image != nil
@@ -92,19 +94,20 @@ class ChatMessageBackground: ASDisplayNode {
     }
     
     func setMaskMode(_ maskMode: Bool) {
-        if let type = self.type, let hasWallpaper = self.hasWallpaper, let highlighted = self.currentHighlighted, let graphics = self.graphics {
-            self.setType(type: type, highlighted: highlighted, graphics: graphics, maskMode: maskMode, hasWallpaper: hasWallpaper, transition: .immediate)
+        if let type = self.type, let hasWallpaper = self.hasWallpaper, let highlighted = self.currentHighlighted, let graphics = self.graphics, let backgroundNode = self.backgroundNode {
+            self.setType(type: type, highlighted: highlighted, graphics: graphics, maskMode: maskMode, hasWallpaper: hasWallpaper, transition: .immediate, backgroundNode: backgroundNode)
         }
     }
     
-    func setType(type: ChatMessageBackgroundType, highlighted: Bool, graphics: PrincipalThemeEssentialGraphics, maskMode: Bool, hasWallpaper: Bool, transition: ContainedViewLayoutTransition) {
+    func setType(type: ChatMessageBackgroundType, highlighted: Bool, graphics: PrincipalThemeEssentialGraphics, maskMode: Bool, hasWallpaper: Bool, transition: ContainedViewLayoutTransition, backgroundNode: WallpaperBackgroundNode?) {
         let previousType = self.type
-        if let currentType = previousType, currentType == type, self.currentHighlighted == highlighted, self.graphics === graphics, self.maskMode == maskMode, self.hasWallpaper == hasWallpaper {
+        if let currentType = previousType, currentType == type, self.currentHighlighted == highlighted, self.graphics === graphics, backgroundNode === self.backgroundNode, self.maskMode == maskMode, self.hasWallpaper == hasWallpaper {
             return
         }
         self.type = type
         self.currentHighlighted = highlighted
         self.graphics = graphics
+        self.backgroundNode = backgroundNode
         self.hasWallpaper = hasWallpaper
         
         let image: UIImage?
@@ -113,7 +116,7 @@ class ChatMessageBackground: ASDisplayNode {
         case .none:
             image = nil
         case let .incoming(mergeType):
-            if maskMode && graphics.incomingBubbleGradientImage != nil {
+            if maskMode, let backgroundNode = backgroundNode, backgroundNode.hasBubbleBackground(for: .incoming) {
                 image = nil
             } else {
                 switch mergeType {
@@ -136,7 +139,7 @@ class ChatMessageBackground: ASDisplayNode {
                 }
             }
         case let .outgoing(mergeType):
-            if maskMode && graphics.outgoingBubbleGradientImage != nil {
+            if maskMode, let backgroundNode = backgroundNode, backgroundNode.hasBubbleBackground(for: .outgoing) {
                 image = nil
             } else {
                 switch mergeType {
@@ -226,13 +229,32 @@ class ChatMessageBackground: ASDisplayNode {
             }
         } else if transition.isAnimated {
             if let previousContents = self.imageNode.layer.contents, let image = image {
-                self.imageNode.layer.animate(from: previousContents as AnyObject, to: image.cgImage! as AnyObject, keyPath: "contents", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.42)
+                if (previousContents as AnyObject) !== image.cgImage {
+                    self.imageNode.layer.animate(from: previousContents as AnyObject, to: image.cgImage! as AnyObject, keyPath: "contents", timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, duration: 0.42)
+                }
             }
         }
         
         self.imageNode.image = image
         self.outlineImageNode.image = outlineImage
     }
+
+    func animateFrom(sourceView: UIView, transition: CombinedTransition) {
+        if transition.isAnimated {
+            self.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+            self.outlineImageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+
+            self.view.addSubview(sourceView)
+
+            sourceView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak sourceView] _ in
+                sourceView?.removeFromSuperview()
+            })
+
+            transition.animateFrame(layer: self.imageNode.layer, from: sourceView.frame)
+            transition.animateFrame(layer: self.outlineImageNode.layer, from: sourceView.frame)
+            transition.updateFrame(layer: sourceView.layer, frame: CGRect(origin: self.imageNode.frame.origin, size: CGSize(width: self.imageNode.frame.width - 7.0, height: self.imageNode.frame.height)))
+        }
+    }
 }
 
 final class ChatMessageShadowNode: ASDisplayNode {
diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift
index 925d55c693..f4a2c7d66b 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBubbleBackdrop.swift
@@ -3,6 +3,7 @@ import AsyncDisplayKit
 import Display
 import Postbox
 import TelegramPresentationData
+import WallpaperBackgroundNode
 
 private let maskInset: CGFloat = 1.0
 
@@ -54,17 +55,21 @@ func bubbleMaskForType(_ type: ChatMessageBackgroundType, graphics: PrincipalThe
 }
 
 final class ChatMessageBubbleBackdrop: ASDisplayNode {
-    private let backgroundContent: ASDisplayNode
+    private var backgroundContent: WallpaperBackgroundNode.BubbleBackgroundNode?
     
     private var currentType: ChatMessageBackgroundType?
     private var currentMaskMode: Bool?
     private var theme: ChatPresentationThemeData?
     private var essentialGraphics: PrincipalThemeEssentialGraphics?
+    private weak var backgroundNode: WallpaperBackgroundNode?
     
     private var maskView: UIImageView?
+    private var fixedMaskMode: Bool?
+
+    private var absolutePosition: (CGRect, CGSize)?
     
     var hasImage: Bool {
-        return self.backgroundContent.contents != nil
+        return self.backgroundContent != nil
     }
     
     override var frame: CGRect {
@@ -75,30 +80,40 @@ final class ChatMessageBubbleBackdrop: ASDisplayNode {
                     maskView.frame = maskFrame
                 }
             }
+            if let backgroundContent = self.backgroundContent {
+                backgroundContent.frame = self.bounds
+                if let (rect, containerSize) = self.absolutePosition {
+                    var backgroundFrame = backgroundContent.frame
+                    backgroundFrame.origin.x += rect.minX
+                    backgroundFrame.origin.y += rect.minY
+                    backgroundContent.update(rect: backgroundFrame, within: containerSize)
+                }
+            }
         }
     }
     
     override init() {
-        self.backgroundContent = ASDisplayNode()
-        
         super.init()
         
         self.clipsToBounds = true
-        
-        self.addSubnode(self.backgroundContent)
     }
     
     func setMaskMode(_ maskMode: Bool, mediaBox: MediaBox) {
-        if let currentType = self.currentType, let theme = self.theme, let essentialGraphics = self.essentialGraphics {
-            self.setType(type: currentType, theme: theme, mediaBox: mediaBox, essentialGraphics: essentialGraphics, maskMode: maskMode)
+        if let currentType = self.currentType, let theme = self.theme, let essentialGraphics = self.essentialGraphics, let backgroundNode = self.backgroundNode {
+            self.setType(type: currentType, theme: theme, essentialGraphics: essentialGraphics, maskMode: maskMode, backgroundNode: backgroundNode)
         }
     }
     
-    func setType(type: ChatMessageBackgroundType, theme: ChatPresentationThemeData, mediaBox: MediaBox, essentialGraphics: PrincipalThemeEssentialGraphics, maskMode: Bool) {
-        if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode || self.essentialGraphics !== essentialGraphics {
+    func setType(type: ChatMessageBackgroundType, theme: ChatPresentationThemeData, essentialGraphics: PrincipalThemeEssentialGraphics, maskMode inputMaskMode: Bool, backgroundNode: WallpaperBackgroundNode?) {
+        let maskMode = self.fixedMaskMode ?? inputMaskMode
+
+        if self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode || self.essentialGraphics !== essentialGraphics || self.backgroundNode !== backgroundNode {
+            let typeUpdated = self.currentType != type || self.theme != theme || self.currentMaskMode != maskMode || self.backgroundNode !== backgroundNode
+
             self.currentType = type
             self.theme = theme
             self.essentialGraphics = essentialGraphics
+            self.backgroundNode = backgroundNode
             
             if maskMode != self.currentMaskMode {
                 self.currentMaskMode = maskMode
@@ -120,14 +135,51 @@ final class ChatMessageBubbleBackdrop: ASDisplayNode {
                     }
                 }
             }
-            
-            switch type {
-            case .none:
-                self.backgroundContent.contents = nil
-            case .incoming:
-                self.backgroundContent.contents = essentialGraphics.incomingBubbleGradientImage?.cgImage
-            case .outgoing:
-                self.backgroundContent.contents = essentialGraphics.outgoingBubbleGradientImage?.cgImage
+
+            if let backgroundContent = self.backgroundContent {
+                backgroundContent.frame = self.bounds
+                if let (rect, containerSize) = self.absolutePosition {
+                    var backgroundFrame = backgroundContent.frame
+                    backgroundFrame.origin.x += rect.minX
+                    backgroundFrame.origin.y += rect.minY
+                    backgroundContent.update(rect: backgroundFrame, within: containerSize)
+                }
+            }
+
+            if typeUpdated {
+                if let backgroundContent = self.backgroundContent {
+                    self.backgroundContent = nil
+                    backgroundContent.removeFromSupernode()
+                }
+
+                switch type {
+                case .none:
+                    break
+                case .incoming:
+                    if let backgroundContent = backgroundNode?.makeBubbleBackground(for: .incoming) {
+                        backgroundContent.frame = self.bounds
+                        if let (rect, containerSize) = self.absolutePosition {
+                            var backgroundFrame = backgroundContent.frame
+                            backgroundFrame.origin.x += rect.minX
+                            backgroundFrame.origin.y += rect.minY
+                            backgroundContent.update(rect: backgroundFrame, within: containerSize)
+                        }
+                        self.backgroundContent = backgroundContent
+                        self.insertSubnode(backgroundContent, at: 0)
+                    }
+                case .outgoing:
+                    if let backgroundContent = backgroundNode?.makeBubbleBackground(for: .outgoing) {
+                        backgroundContent.frame = self.bounds
+                        if let (rect, containerSize) = self.absolutePosition {
+                            var backgroundFrame = backgroundContent.frame
+                            backgroundFrame.origin.x += rect.minX
+                            backgroundFrame.origin.y += rect.minY
+                            backgroundContent.update(rect: backgroundFrame, within: containerSize)
+                        }
+                        self.backgroundContent = backgroundContent
+                        self.insertSubnode(backgroundContent, at: 0)
+                    }
+                }
             }
             
             if let maskView = self.maskView {
@@ -137,22 +189,66 @@ final class ChatMessageBubbleBackdrop: ASDisplayNode {
     }
     
     func update(rect: CGRect, within containerSize: CGSize) {
-        self.backgroundContent.frame = CGRect(origin: CGPoint(x: -rect.minX, y: -rect.minY), size: containerSize)
+        self.absolutePosition = (rect, containerSize)
+        if let backgroundContent = self.backgroundContent {
+            var backgroundFrame = backgroundContent.frame
+            backgroundFrame.origin.x += rect.minX
+            backgroundFrame.origin.y += rect.minY
+            backgroundContent.update(rect: backgroundFrame, within: containerSize)
+        }
     }
     
-    func offset(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
-        let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: animationCurve)
-        transition.animatePositionAdditive(node: self.backgroundContent, offset: CGPoint(x: 0.0, y: -value))
+    func offset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        self.backgroundContent?.offset(value: value, animationCurve: animationCurve, duration: duration)
     }
     
     func offsetSpring(value: CGFloat, duration: Double, damping: CGFloat) {
-        self.backgroundContent.layer.animateSpring(from: NSValue(cgPoint: CGPoint(x: 0.0, y: value)), to: NSValue(cgPoint: CGPoint()), keyPath: "position", duration: duration, initialVelocity: 0.0, damping: damping, additive: true)
+        self.backgroundContent?.offsetSpring(value: value, duration: duration, damping: damping)
     }
     
-    func updateFrame(_ value: CGRect, transition: ContainedViewLayoutTransition) {
+    func updateFrame(_ value: CGRect, transition: ContainedViewLayoutTransition, completion: @escaping () -> Void = {}) {
         if let maskView = self.maskView {
-            transition.updateFrame(view: maskView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: value.size.width + maskInset * 2.0, height: value.size.height + maskInset * 2.0)))
+            transition.updateFrame(view: maskView, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: value.size.width, height: value.size.height)).insetBy(dx: -maskInset, dy: -maskInset))
+        }
+        if let backgroundContent = self.backgroundContent {
+            transition.updateFrame(layer: backgroundContent.layer, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: value.size.width, height: value.size.height)))
+            if let (rect, containerSize) = self.absolutePosition {
+                var backgroundFrame = backgroundContent.frame
+                backgroundFrame.origin.x += rect.minX
+                backgroundFrame.origin.y += rect.minY
+                backgroundContent.update(rect: backgroundFrame, within: containerSize, transition: transition)
+            }
+        }
+        transition.updateFrame(node: self, frame: value, completion: { _ in
+            completion()
+        })
+    }
+
+    func updateFrame(_ value: CGRect, transition: CombinedTransition, completion: @escaping () -> Void = {}) {
+        if let maskView = self.maskView {
+            transition.updateFrame(layer: maskView.layer, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: value.size.width, height: value.size.height)).insetBy(dx: -maskInset, dy: -maskInset))
+        }
+        if let backgroundContent = self.backgroundContent {
+            transition.updateFrame(layer: backgroundContent.layer, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: value.size.width, height: value.size.height)))
+            if let (rect, containerSize) = self.absolutePosition {
+                var backgroundFrame = backgroundContent.frame
+                backgroundFrame.origin.x += rect.minX
+                backgroundFrame.origin.y += rect.minY
+                backgroundContent.update(rect: backgroundFrame, within: containerSize, transition: transition)
+            }
+        }
+        transition.updateFrame(layer: self.layer, frame: value, completion: { _ in
+            completion()
+        })
+    }
+
+    func animateFrom(sourceView: UIView, mediaBox: MediaBox, transition: CombinedTransition) {
+        if transition.isAnimated {
+            let previousFrame = self.frame
+            self.updateFrame(CGRect(origin: CGPoint(x: previousFrame.minX, y: sourceView.frame.minY), size: sourceView.frame.size), transition: .immediate)
+            self.updateFrame(previousFrame, transition: transition)
+
+            self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
         }
-        transition.updateFrame(node: self, frame: value)
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift
index 8f716ff1eb..c91e035fe0 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBubbleContentNode.swift
@@ -201,6 +201,15 @@ class ChatMessageBubbleContentNode: ASDisplayNode {
     
     func updateIsExtractedToContextPreview(_ value: Bool) {
     }
+
+    func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+    }
+
+    func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+    }
+
+    func applyAbsoluteOffsetSpring(value: CGFloat, duration: Double, damping: CGFloat) {
+    }
     
     func reactionTargetNode(value: String) -> (ASDisplayNode, ASDisplayNode)? {
         return nil
diff --git a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
index 820fecee5a..20c41358ed 100644
--- a/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageBubbleItemNode.swift
@@ -22,6 +22,8 @@ import PersistentStringHash
 import GridMessageSelectionNode
 import AppBundle
 import Markdown
+import WallpaperBackgroundNode
+import SwiftSignalKit
 
 enum InternalBubbleTapAction {
     case action(() -> Void)
@@ -35,6 +37,17 @@ private struct BubbleItemAttributes {
     var neighborSpacing: ChatMessageBubbleRelativePosition.NeighbourSpacing
 }
 
+private final class ChatMessageBubbleClippingNode: ASDisplayNode {
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let result = self.view.hitTest(point, with: event)
+        if result === self.view {
+            return nil
+        } else {
+            return result
+        }
+    }
+}
+
 private func contentNodeMessagesAndClassesForItem(_ item: ChatMessageItem) -> ([(Message, AnyClass, ChatMessageEntryAttributes, BubbleItemAttributes)], Bool) {
     var result: [(Message, AnyClass, ChatMessageEntryAttributes, BubbleItemAttributes)] = []
     var skipText = false
@@ -217,6 +230,14 @@ private enum ContentNodeOperation {
     case insert(index: Int, node: ChatMessageBubbleContentNode)
 }
 
+class ChatPresentationContext {
+    weak var backgroundNode: WallpaperBackgroundNode?
+
+    init(backgroundNode: WallpaperBackgroundNode?) {
+        self.backgroundNode = backgroundNode
+    }
+}
+
 class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode {
     class ContentContainer {
         let contentMessageStableId: UInt32
@@ -226,7 +247,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         var backgroundNode: ChatMessageBackground?
         var selectionBackgroundNode: ASDisplayNode?
         
-        private var currentParams: (size: CGSize, contentOrigin: CGPoint, presentationData: ChatPresentationData, graphics: PrincipalThemeEssentialGraphics, backgroundType: ChatMessageBackgroundType, mediaBox: MediaBox, messageSelection: Bool?, selectionInsets: UIEdgeInsets)?
+        private var currentParams: (size: CGSize, contentOrigin: CGPoint, presentationData: ChatPresentationData, graphics: PrincipalThemeEssentialGraphics, backgroundType: ChatMessageBackgroundType, presentationContext: ChatPresentationContext, mediaBox: MediaBox, messageSelection: Bool?, selectionInsets: UIEdgeInsets)?
         
         init(contentMessageStableId: UInt32) {
             self.contentMessageStableId = contentMessageStableId
@@ -245,7 +266,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             backgroundWallpaperNode.update(rect: mappedRect, within: containerSize)
         }
         
-        fileprivate func applyAbsoluteOffset(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        fileprivate func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
             guard let backgroundWallpaperNode = self.backgroundWallpaperNode else {
                 return
             }
@@ -290,8 +311,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     transition.updateAlpha(node: backgroundNode, alpha: 1.0)
                     transition.updateAlpha(node: backgroundWallpaperNode, alpha: 1.0)
                     
-                    backgroundNode.setType(type: type, highlighted: false, graphics: currentParams.graphics, maskMode: true, hasWallpaper: currentParams.presentationData.theme.wallpaper.hasWallpaper, transition: .immediate)
-                    backgroundWallpaperNode.setType(type: type, theme: currentParams.presentationData.theme, mediaBox: currentParams.mediaBox, essentialGraphics: currentParams.graphics, maskMode: true)
+                    backgroundNode.setType(type: type, highlighted: false, graphics: currentParams.graphics, maskMode: true, hasWallpaper: currentParams.presentationData.theme.wallpaper.hasWallpaper, transition: .immediate, backgroundNode: currentParams.presentationContext.backgroundNode)
+                    backgroundWallpaperNode.setType(type: type, theme: currentParams.presentationData.theme, essentialGraphics: currentParams.graphics, maskMode: true, backgroundNode: currentParams.presentationContext.backgroundNode)
                 }
                 
                 if let currentParams = self.currentParams {
@@ -324,8 +345,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         fileprivate func isExtractedToContextPreviewUpdated(_ isExtractedToContextPreview: Bool) {
         }
         
-        fileprivate func update(size: CGSize, contentOrigin: CGPoint, selectionInsets: UIEdgeInsets, index: Int, presentationData: ChatPresentationData, graphics: PrincipalThemeEssentialGraphics, backgroundType: ChatMessageBackgroundType, mediaBox: MediaBox, messageSelection: Bool?) {
-            self.currentParams = (size, contentOrigin, presentationData, graphics, backgroundType, mediaBox, messageSelection, selectionInsets)
+        fileprivate func update(size: CGSize, contentOrigin: CGPoint, selectionInsets: UIEdgeInsets, index: Int, presentationData: ChatPresentationData, graphics: PrincipalThemeEssentialGraphics, backgroundType: ChatMessageBackgroundType, presentationContext: ChatPresentationContext, mediaBox: MediaBox, messageSelection: Bool?) {
+            self.currentParams = (size, contentOrigin, presentationData, graphics, backgroundType, presentationContext, mediaBox, messageSelection, selectionInsets)
             let bounds = CGRect(origin: CGPoint(), size: size)
             
             var incoming: Bool = false
@@ -362,12 +383,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         }
     }
      
-    private let mainContextSourceNode: ContextExtractedContentContainingNode
+    let mainContextSourceNode: ContextExtractedContentContainingNode
     private let mainContainerNode: ContextControllerSourceNode
     private let backgroundWallpaperNode: ChatMessageBubbleBackdrop
     private let backgroundNode: ChatMessageBackground
     private let shadowNode: ChatMessageShadowNode
-    private var transitionClippingNode: ASDisplayNode?
+    private var clippingNode: ChatMessageBubbleClippingNode
     
     override var extractedBackgroundNode: ASDisplayNode? {
         return self.shadowNode
@@ -393,7 +414,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
     private var mosaicStatusNode: ChatMessageDateAndStatusNode?
     private var actionButtonsNode: ChatMessageActionButtonsNode?
     
-    private var shareButtonNode: HighlightableButtonNode?
+    private var shareButtonNode: ChatMessageShareButton?
     
     private let messageAccessibilityArea: AccessibilityAreaNode
 
@@ -430,6 +451,10 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         
         self.backgroundNode = ChatMessageBackground()
         self.shadowNode = ChatMessageShadowNode()
+
+        self.clippingNode = ChatMessageBubbleClippingNode()
+        self.clippingNode.clipsToBounds = true
+
         self.messageAccessibilityArea = AccessibilityAreaNode()
         
         super.init(layerBacked: false)
@@ -481,7 +506,8 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         
         self.mainContextSourceNode.contentNode.addSubnode(self.backgroundWallpaperNode)
         self.mainContextSourceNode.contentNode.addSubnode(self.backgroundNode)
-        self.mainContextSourceNode.contentNode.addSubnode(self.contentContainersWrapperNode)
+        self.mainContextSourceNode.contentNode.addSubnode(self.clippingNode)
+        self.clippingNode.addSubnode(self.contentContainersWrapperNode)
         self.addSubnode(self.messageAccessibilityArea)
         
         self.messageAccessibilityArea.activate = { [weak self] in
@@ -553,6 +579,40 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
     required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
+
+    override func cancelInsertionAnimations() {
+        self.shadowNode.layer.removeAllAnimations()
+
+        func process(node: ASDisplayNode) {
+            if node === self.accessoryItemNode {
+                return
+            }
+
+            if node !== self {
+                switch node {
+                case let node as ContextExtractedContentContainingNode:
+                    process(node: node.contentNode)
+                    return
+                case _ as ContextControllerSourceNode, _ as ContextExtractedContentNode:
+                    break
+                default:
+                    node.layer.removeAllAnimations()
+                    node.layer.allowsGroupOpacity = false
+                    return
+                }
+            }
+
+            guard let subnodes = node.subnodes else {
+                return
+            }
+
+            for subnode in subnodes {
+                process(node: subnode)
+            }
+        }
+
+        process(node: self)
+    }
     
     override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         super.animateInsertion(currentTimestamp, duration: duration, short: short)
@@ -614,6 +674,63 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             }
         }
     }
+
+    func animateContentFromTextInputField(textInput: ChatMessageTransitionNode.Source.TextInput, transition: CombinedTransition) {
+        guard let item = self.item else {
+            return
+        }
+        let widthDifference = self.backgroundNode.frame.width - textInput.backgroundView.frame.width
+        let heightDifference = self.backgroundNode.frame.height - textInput.backgroundView.frame.height
+
+        transition.animateFrame(layer: self.clippingNode.layer, from: CGRect(origin: CGPoint(x: self.clippingNode.frame.minX, y: textInput.backgroundView.frame.minY), size: textInput.backgroundView.frame.size))
+
+        transition.vertical.animateOffsetAdditive(layer: self.clippingNode.layer, offset: textInput.backgroundView.frame.minY - self.clippingNode.frame.minY)
+
+        self.backgroundWallpaperNode.animateFrom(sourceView: textInput.backgroundView, mediaBox: item.context.account.postbox.mediaBox, transition: transition)
+        self.backgroundNode.animateFrom(sourceView: textInput.backgroundView, transition: transition)
+
+        for contentNode in self.contentNodes {
+            if let contentNode = contentNode as? ChatMessageTextBubbleContentNode {
+                let localSourceContentFrame = self.mainContextSourceNode.contentNode.view.convert(textInput.contentView.frame.offsetBy(dx: self.mainContextSourceNode.contentRect.minX, dy: self.mainContextSourceNode.contentRect.minY), to: contentNode.view)
+                textInput.contentView.frame = localSourceContentFrame
+                contentNode.animateFrom(sourceView: textInput.contentView, scrollOffset: textInput.scrollOffset, widthDifference: widthDifference, transition: transition)
+            } else if let contentNode = contentNode as? ChatMessageWebpageBubbleContentNode {
+                transition.vertical.animatePositionAdditive(node: contentNode, offset: CGPoint(x: 0.0, y: heightDifference))
+            }
+        }
+    }
+
+    func animateReplyPanel(sourceReplyPanel: ChatMessageTransitionNode.ReplyPanel, transition: CombinedTransition) {
+        if let replyInfoNode = self.replyInfoNode {
+            let localRect = self.mainContextSourceNode.contentNode.view.convert(sourceReplyPanel.relativeSourceRect, to: replyInfoNode.view)
+            let _ = replyInfoNode.animateFromInputPanel(sourceReplyPanel: sourceReplyPanel, unclippedTransitionNode: self.mainContextSourceNode.contentNode, localRect: localRect, transition: transition)
+        }
+    }
+
+    func animateFromMicInput(micInputNode: UIView, transition: CombinedTransition) -> ContextExtractedContentContainingNode? {
+        for contentNode in self.contentNodes {
+            if let contentNode = contentNode as? ChatMessageFileBubbleContentNode {
+                let statusContainerNode = contentNode.interactiveFileNode.statusContainerNode
+                let scale = statusContainerNode.contentRect.height / 100.0
+                micInputNode.transform = CGAffineTransform(scaleX: scale, y: scale)
+                micInputNode.center = CGPoint(x: statusContainerNode.contentRect.midX, y: statusContainerNode.contentRect.midY)
+                statusContainerNode.contentNode.view.addSubview(micInputNode)
+
+                transition.horizontal.updateAlpha(layer: micInputNode.layer, alpha: 0.0, completion: { [weak micInputNode] _ in
+                    micInputNode?.removeFromSuperview()
+                })
+
+                transition.horizontal.animateTransformScale(node: statusContainerNode.contentNode, from: 1.0 / scale)
+
+                return statusContainerNode
+            }
+        }
+        return nil
+    }
+
+    func animateContentFromMediaInput(snapshotView: UIView, transition: CombinedTransition) {
+        self.mainContextSourceNode.contentNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+    }
     
     override func didLoad() {
         super.didLoad()
@@ -950,8 +1067,6 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         
         let mosaicStatusLayout = ChatMessageDateAndStatusNode.asyncLayout(self.mosaicStatusNode)
         
-        let currentShareButtonNode = self.shareButtonNode
-        
         let layoutConstants = self.layoutConstants
         
         let currentItem = self.appliedItem
@@ -971,7 +1086,6 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 replyInfoLayout: replyInfoLayout,
                 actionButtonsLayout: actionButtonsLayout,
                 mosaicStatusLayout: mosaicStatusLayout,
-                currentShareButtonNode: currentShareButtonNode,
                 layoutConstants: layoutConstants,
                 currentItem: currentItem,
                 currentForwardInfo: currentForwardInfo,
@@ -988,7 +1102,6 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         replyInfoLayout: (ChatPresentationData, PresentationStrings, AccountContext, ChatMessageReplyInfoType, Message, CGSize) -> (CGSize, () -> ChatMessageReplyInfoNode),
         actionButtonsLayout: (AccountContext, ChatPresentationThemeData, PresentationChatBubbleCorners, PresentationStrings, ReplyMarkupMessageAttribute, Message, CGFloat) -> (minWidth: CGFloat, layout: (CGFloat) -> (CGSize, (Bool) -> ChatMessageActionButtonsNode)),
         mosaicStatusLayout: (AccountContext, ChatPresentationData, Bool, Int?, String, ChatMessageDateAndStatusType, CGSize, [MessageReaction], Int, Bool, Bool) -> (CGSize, (Bool) -> ChatMessageDateAndStatusNode),
-        currentShareButtonNode: HighlightableButtonNode?,
         layoutConstants: ChatMessageItemLayoutConstants,
         currentItem: ChatMessageItem?,
         currentForwardInfo: (Peer?, String?)?,
@@ -1041,7 +1154,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     ignoreForward = true
                     effectiveAuthor = forwardInfo.author
                     if effectiveAuthor == nil, let authorSignature = forwardInfo.authorSignature  {
-                        effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: Int32(clamping: authorSignature.persistentHashValue)), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
+                        effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: PeerId.Id._internalFromInt32Value(Int32(clamping: authorSignature.persistentHashValue))), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
                     }
                 }
                 displayAuthorInfo = !mergedTop.merged && incoming && effectiveAuthor != nil
@@ -1057,7 +1170,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 displayAuthorInfo = !mergedTop.merged && incoming
             } else if let forwardInfo = item.content.firstMessage.forwardInfo, forwardInfo.flags.contains(.isImported), let authorSignature = forwardInfo.authorSignature {
                 ignoreForward = true
-                effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: Int32(clamping: authorSignature.persistentHashValue)), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
+                effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: PeerId.Id._internalFromInt32Value(Int32(clamping: authorSignature.persistentHashValue))), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
                 displayAuthorInfo = !mergedTop.merged && incoming
             } else {
                 effectiveAuthor = firstMessage.author
@@ -1282,8 +1395,10 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         var backgroundHiding: ChatMessageBubbleContentBackgroundHiding?
         var hasSolidWallpaper = false
         switch item.presentationData.theme.wallpaper {
-        case .color, .gradient:
+        case .color:
             hasSolidWallpaper = true
+        case let .gradient(_, colors, _):
+            hasSolidWallpaper = colors.count <= 2
         default:
             break
         }
@@ -1437,12 +1552,12 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         if initialDisplayHeader && displayAuthorInfo {
             if let peer = firstMessage.peers[firstMessage.id.peerId] as? TelegramChannel, case .broadcast = peer.info {
                 authorNameString = peer.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)
-                authorNameColor = chatMessagePeerIdColors[Int(peer.id.id % 7)]
+                authorNameColor = chatMessagePeerIdColors[Int(peer.id.id._internalGetInt32Value() % 7)]
             } else if let effectiveAuthor = effectiveAuthor {
                 authorNameString = effectiveAuthor.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)
                 
                 if incoming {
-                    authorNameColor = chatMessagePeerIdColors[Int(effectiveAuthor.id.id % 7)]
+                    authorNameColor = chatMessagePeerIdColors[Int(effectiveAuthor.id.id._internalGetInt32Value() % 7)]
                 } else {
                     authorNameColor = item.presentationData.theme.theme.chat.message.outgoing.accentTextColor
                 }
@@ -2035,41 +2150,9 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             layoutInsets.top += layoutConstants.timestampHeaderHeight
         }
         
-        var updatedShareButtonBackground: UIImage?
-        
-        var updatedShareButtonNode: HighlightableButtonNode?
-        if needShareButton {
-            if currentShareButtonNode != nil {
-                updatedShareButtonNode = currentShareButtonNode
-                if item.presentationData.theme !== currentItem?.presentationData.theme {
-                    let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
-                    if case .pinnedMessages = item.associatedData.subject {
-                        updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage
-                    } else if item.message.id.peerId.isRepliesOrSavedMessages(accountPeerId: item.context.account.peerId) {
-                        updatedShareButtonBackground = graphics.chatBubbleNavigateButtonImage
-                    } else {
-                        updatedShareButtonBackground = graphics.chatBubbleShareButtonImage
-                    }
-                }
-            } else {
-                let buttonNode = HighlightableButtonNode()
-                let buttonIcon: UIImage?
-                let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
-                if case .pinnedMessages = item.associatedData.subject {
-                    buttonIcon = graphics.chatBubbleNavigateButtonImage
-                } else if item.message.id.peerId.isRepliesOrSavedMessages(accountPeerId: item.context.account.peerId) {
-                    buttonIcon = graphics.chatBubbleNavigateButtonImage
-                } else {
-                    buttonIcon = graphics.chatBubbleShareButtonImage
-                }
-                buttonNode.setBackgroundImage(buttonIcon, for: [.normal])
-                updatedShareButtonNode = buttonNode
-            }
-        }
-        
         let layout = ListViewItemNodeLayout(contentSize: layoutSize, insets: layoutInsets)
         
-        let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
+        let graphics = PresentationResourcesChat.principalGraphics(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
         
         var updatedMergedTop = mergedBottom
         var updatedMergedBottom = mergedTop
@@ -2099,6 +2182,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 hideBackground: hideBackground,
                 incoming: incoming,
                 graphics: graphics,
+                presentationContext: item.controllerInteraction.presentationContext,
                 bubbleContentWidth: bubbleContentWidth,
                 backgroundFrame: backgroundFrame,
                 deliveryFailedInset: deliveryFailedInset,
@@ -2120,8 +2204,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 contentContainerNodeFrames: contentContainerNodeFrames,
                 mosaicStatusOrigin: mosaicStatusOrigin,
                 mosaicStatusSizeAndApply: mosaicStatusSizeAndApply,
-                updatedShareButtonNode: updatedShareButtonNode,
-                updatedShareButtonBackground: updatedShareButtonBackground
+                needsShareButton: needShareButton
             )
         })
     }
@@ -2139,6 +2222,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         hideBackground: Bool,
         incoming: Bool,
         graphics: PrincipalThemeEssentialGraphics,
+        presentationContext: ChatPresentationContext,
         bubbleContentWidth: CGFloat,
         backgroundFrame: CGRect,
         deliveryFailedInset: CGFloat,
@@ -2160,8 +2244,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         contentContainerNodeFrames: [(UInt32, CGRect, Bool?, CGFloat)],
         mosaicStatusOrigin: CGPoint?,
         mosaicStatusSizeAndApply: (CGSize, (Bool) -> ChatMessageDateAndStatusNode)?,
-        updatedShareButtonNode: HighlightableButtonNode?,
-        updatedShareButtonBackground: UIImage?
+        needsShareButton: Bool
     ) -> Void {
         guard let strongSelf = selfReference.value else {
             return
@@ -2197,9 +2280,14 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             backgroundType = .incoming(mergeType)
         }
         let hasWallpaper = item.presentationData.theme.wallpaper.hasWallpaper
-        strongSelf.backgroundNode.setType(type: backgroundType, highlighted: strongSelf.highlightedState, graphics: graphics, maskMode: strongSelf.backgroundMaskMode, hasWallpaper: hasWallpaper, transition: transition)
-        strongSelf.backgroundWallpaperNode.setType(type: backgroundType, theme: item.presentationData.theme, mediaBox: item.context.account.postbox.mediaBox, essentialGraphics: graphics, maskMode: strongSelf.backgroundMaskMode)
+        strongSelf.backgroundNode.setType(type: backgroundType, highlighted: strongSelf.highlightedState, graphics: graphics, maskMode: strongSelf.backgroundMaskMode, hasWallpaper: hasWallpaper, transition: transition, backgroundNode: presentationContext.backgroundNode)
+        strongSelf.backgroundWallpaperNode.setType(type: backgroundType, theme: item.presentationData.theme, essentialGraphics: graphics, maskMode: strongSelf.backgroundMaskMode, backgroundNode: presentationContext.backgroundNode)
         strongSelf.shadowNode.setType(type: backgroundType, hasWallpaper: hasWallpaper, graphics: graphics)
+        if case .none = backgroundType {
+            strongSelf.clippingNode.clipsToBounds = false
+        } else {
+            strongSelf.clippingNode.clipsToBounds = true
+        }
         
         strongSelf.backgroundType = backgroundType
         
@@ -2241,7 +2329,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 if !nameNode.isNodeLoaded {
                     nameNode.isUserInteractionEnabled = false
                 }
-                strongSelf.mainContextSourceNode.contentNode.addSubnode(nameNode)
+                strongSelf.clippingNode.addSubnode(nameNode)
             }
             nameNode.frame = CGRect(origin: CGPoint(x: contentOrigin.x + layoutConstants.text.bubbleInsets.left, y: layoutConstants.bubble.contentInsets.top + nameNodeOriginY), size: nameNodeSizeApply.0)
             nameNode.displaysAsynchronously = !item.presentationData.isPreview
@@ -2253,7 +2341,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 } else {
                     credibilityIconNode = ASImageNode()
                     strongSelf.credibilityIconNode = credibilityIconNode
-                    strongSelf.mainContextSourceNode.contentNode.addSubnode(credibilityIconNode)
+                    strongSelf.clippingNode.addSubnode(credibilityIconNode)
                 }
                 credibilityIconNode.frame = CGRect(origin: CGPoint(x: nameNode.frame.maxX + 4.0, y: nameNode.frame.minY), size: credibilityIconImage.size)
                 credibilityIconNode.image = credibilityIconImage
@@ -2269,7 +2357,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     if !adminBadgeNode.isNodeLoaded {
                         adminBadgeNode.isUserInteractionEnabled = false
                     }
-                    strongSelf.mainContextSourceNode.contentNode.addSubnode(adminBadgeNode)
+                    strongSelf.clippingNode.addSubnode(adminBadgeNode)
                     adminBadgeNode.frame = adminBadgeFrame
                 } else {
                     let previousAdminBadgeFrame = adminBadgeNode.frame
@@ -2291,7 +2379,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             strongSelf.forwardInfoNode = forwardInfoNode
             var animateFrame = true
             if forwardInfoNode.supernode == nil {
-                strongSelf.mainContextSourceNode.contentNode.addSubnode(forwardInfoNode)
+                strongSelf.clippingNode.addSubnode(forwardInfoNode)
                 animateFrame = false
                 forwardInfoNode.openPsa = { [weak strongSelf] type, sourceNode in
                     guard let strongSelf = strongSelf, let item = strongSelf.item else {
@@ -2316,7 +2404,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             strongSelf.replyInfoNode = replyInfoNode
             var animateFrame = true
             if replyInfoNode.supernode == nil {
-                strongSelf.mainContextSourceNode.contentNode.addSubnode(replyInfoNode)
+                strongSelf.clippingNode.addSubnode(replyInfoNode)
                 animateFrame = false
             }
             let previousReplyInfoNodeFrame = replyInfoNode.frame
@@ -2474,7 +2562,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                 selectionInsets.bottom = groupOverlap / 2.0
             }
             
-            contentContainer?.update(size: relativeFrame.size, contentOrigin: contentOrigin, selectionInsets: selectionInsets, index: index, presentationData: item.presentationData, graphics: graphics, backgroundType: backgroundType, mediaBox: item.context.account.postbox.mediaBox, messageSelection: itemSelection)
+            contentContainer?.update(size: relativeFrame.size, contentOrigin: contentOrigin, selectionInsets: selectionInsets, index: index, presentationData: item.presentationData, graphics: graphics, backgroundType: backgroundType, presentationContext: item.controllerInteraction.presentationContext, mediaBox: item.context.account.postbox.mediaBox, messageSelection: itemSelection)
                         
             index += 1
         }
@@ -2518,12 +2606,15 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     updatedContentNodes.append(contentNode)
                     
                     let contextSourceNode: ContextExtractedContentContainingNode
+                    let containerSupernode: ASDisplayNode
                     if isAttachent {
                         contextSourceNode = strongSelf.mainContextSourceNode
+                        containerSupernode = strongSelf.clippingNode
                     } else {
                         contextSourceNode = strongSelf.contentContainers.first(where: { $0.contentMessageStableId == contentNodeMessage.stableId })?.sourceNode ?? strongSelf.mainContextSourceNode
+                        containerSupernode = strongSelf.contentContainers.first(where: { $0.contentMessageStableId == contentNodeMessage.stableId })?.sourceNode.contentNode ?? strongSelf.clippingNode
                     }
-                    contextSourceNode.contentNode.addSubnode(contentNode)
+                    containerSupernode.addSubnode(contentNode)
                     
                     contentNode.visibility = strongSelf.visibility
                     contentNode.updateIsTextSelectionActive = { [weak contextSourceNode] value in
@@ -2599,7 +2690,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             if mosaicStatusNode !== strongSelf.mosaicStatusNode {
                 strongSelf.mosaicStatusNode?.removeFromSupernode()
                 strongSelf.mosaicStatusNode = mosaicStatusNode
-                strongSelf.mainContextSourceNode.contentNode.addSubnode(mosaicStatusNode)
+                strongSelf.clippingNode.addSubnode(mosaicStatusNode)
             }
             let absoluteOrigin = mosaicStatusOrigin.offsetBy(dx: contentOrigin.x, dy: contentOrigin.y)
             mosaicStatusNode.frame = CGRect(origin: CGPoint(x: absoluteOrigin.x - layoutConstants.image.statusInsets.right - size.width, y: absoluteOrigin.y - layoutConstants.image.statusInsets.bottom - size.height), size: size)
@@ -2607,32 +2698,28 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             strongSelf.mosaicStatusNode = nil
             mosaicStatusNode.removeFromSupernode()
         }
-        
-        if let updatedShareButtonNode = updatedShareButtonNode {
-            if updatedShareButtonNode !== strongSelf.shareButtonNode {
-                if let shareButtonNode = strongSelf.shareButtonNode {
-                    shareButtonNode.removeFromSupernode()
-                }
-                strongSelf.shareButtonNode = updatedShareButtonNode
-                strongSelf.insertSubnode(updatedShareButtonNode, belowSubnode: strongSelf.messageAccessibilityArea)
-                updatedShareButtonNode.addTarget(strongSelf, action: #selector(strongSelf.shareButtonPressed), forControlEvents: .touchUpInside)
-            }
-            if let updatedShareButtonBackground = updatedShareButtonBackground {
-                strongSelf.shareButtonNode?.setBackgroundImage(updatedShareButtonBackground, for: [.normal])
+
+        if needsShareButton {
+            if strongSelf.shareButtonNode == nil {
+                let shareButtonNode = ChatMessageShareButton()
+                strongSelf.shareButtonNode = shareButtonNode
+                strongSelf.insertSubnode(shareButtonNode, belowSubnode: strongSelf.messageAccessibilityArea)
+                shareButtonNode.addTarget(strongSelf, action: #selector(strongSelf.shareButtonPressed), forControlEvents: .touchUpInside)
             }
+
         } else if let shareButtonNode = strongSelf.shareButtonNode {
-            shareButtonNode.removeFromSupernode()
             strongSelf.shareButtonNode = nil
+            shareButtonNode.removeFromSupernode()
         }
         
         if case .System = animation, !strongSelf.mainContextSourceNode.isExtractedToContextPreview {
             if !strongSelf.backgroundNode.frame.equalTo(backgroundFrame) {
                 strongSelf.backgroundFrameTransition = (strongSelf.backgroundNode.frame, backgroundFrame)
-                strongSelf.enableTransitionClippingNode()
             }
             if let shareButtonNode = strongSelf.shareButtonNode {
                 let currentBackgroundFrame = strongSelf.backgroundNode.frame
-                shareButtonNode.frame = CGRect(origin: CGPoint(x: currentBackgroundFrame.maxX + 8.0, y: currentBackgroundFrame.maxY - 30.0), size: CGSize(width: 29.0, height: 29.0))
+                let buttonSize = shareButtonNode.update(presentationData: item.presentationData, chatLocation: item.chatLocation, subject: item.associatedData.subject, message: item.message, account: item.context.account, disableComments: true)
+                shareButtonNode.frame = CGRect(origin: CGPoint(x: currentBackgroundFrame.maxX + 8.0, y: currentBackgroundFrame.maxY - buttonSize.width - 1.0), size: buttonSize)
             }
         } else {
             if let _ = strongSelf.backgroundFrameTransition {
@@ -2641,17 +2728,23 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             }
             strongSelf.messageAccessibilityArea.frame = backgroundFrame
             if let shareButtonNode = strongSelf.shareButtonNode {
-                shareButtonNode.frame = CGRect(origin: CGPoint(x: backgroundFrame.maxX + 8.0, y: backgroundFrame.maxY - 30.0), size: CGSize(width: 29.0, height: 29.0))
+                let buttonSize = shareButtonNode.update(presentationData: item.presentationData, chatLocation: item.chatLocation, subject: item.associatedData.subject, message: item.message, account: item.context.account, disableComments: true)
+                shareButtonNode.frame = CGRect(origin: CGPoint(x: backgroundFrame.maxX + 8.0, y: backgroundFrame.maxY - buttonSize.width - 1.0), size: buttonSize)
             }
-            strongSelf.disableTransitionClippingNode()
             
             if case .System = animation, strongSelf.mainContextSourceNode.isExtractedToContextPreview {
                 transition.updateFrame(node: strongSelf.backgroundNode, frame: backgroundFrame)
+
+                transition.updateFrame(node: strongSelf.clippingNode, frame: backgroundFrame)
+                transition.updateBounds(node: strongSelf.clippingNode, bounds: CGRect(origin: CGPoint(x: backgroundFrame.minX, y: backgroundFrame.minY), size: backgroundFrame.size))
+
                 strongSelf.backgroundNode.updateLayout(size: backgroundFrame.size, transition: transition)
                 strongSelf.backgroundWallpaperNode.updateFrame(backgroundFrame, transition: transition)
                 strongSelf.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: transition)
             } else {
                 strongSelf.backgroundNode.frame = backgroundFrame
+                strongSelf.clippingNode.frame = backgroundFrame
+                strongSelf.clippingNode.bounds = CGRect(origin: CGPoint(x: backgroundFrame.minX, y: backgroundFrame.minY), size: backgroundFrame.size)
                 strongSelf.backgroundNode.updateLayout(size: backgroundFrame.size, transition: .immediate)
                 strongSelf.backgroundWallpaperNode.frame = backgroundFrame
                 strongSelf.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: .immediate)
@@ -2709,7 +2802,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         
         strongSelf.updateSearchTextHighlightState()
         
-        if let (awaitingAppliedReaction, f) = strongSelf.awaitingAppliedReaction {
+        /*if let (awaitingAppliedReaction, f) = strongSelf.awaitingAppliedReaction {
             var bounds = strongSelf.bounds
             let offset = bounds.origin.x
             bounds.origin.x = 0.0
@@ -2746,7 +2839,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             }
             strongSelf.reactionRecognizer?.complete(into: targetNode, hideTarget: hideTarget)*/
             f()
-        }
+        }*/
     }
     
     override func updateAccessibilityData(_ accessibilityData: ChatMessageAccessibilityData) {
@@ -2789,52 +2882,6 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         }
     }
     
-    private func enableTransitionClippingNode() {
-        if self.transitionClippingNode == nil {
-            let node = ASDisplayNode()
-            node.clipsToBounds = true
-            var backgroundFrame = self.backgroundNode.frame
-            backgroundFrame = backgroundFrame.insetBy(dx: 0.0, dy: 1.0)
-            node.frame = backgroundFrame
-            node.bounds = CGRect(origin: CGPoint(x: backgroundFrame.origin.x, y: backgroundFrame.origin.y), size: backgroundFrame.size)
-            if let forwardInfoNode = self.forwardInfoNode {
-                node.addSubnode(forwardInfoNode)
-            }
-            if let replyInfoNode = self.replyInfoNode {
-                node.addSubnode(replyInfoNode)
-            }
-            if !self.contentContainers.isEmpty {
-                node.addSubnode(self.contentContainersWrapperNode)
-            } else {
-                for contentNode in self.contentNodes {
-                    node.addSubnode(contentNode)
-                }
-            }
-            self.mainContextSourceNode.contentNode.addSubnode(node)
-            self.transitionClippingNode = node
-        }
-    }
-    
-    private func disableTransitionClippingNode() {
-        if let transitionClippingNode = self.transitionClippingNode {
-            if let forwardInfoNode = self.forwardInfoNode {
-                self.mainContextSourceNode.contentNode.addSubnode(forwardInfoNode)
-            }
-            if let replyInfoNode = self.replyInfoNode {
-                self.mainContextSourceNode.contentNode.addSubnode(replyInfoNode)
-            }
-            if !self.contentContainers.isEmpty {
-                self.mainContextSourceNode.contentNode.addSubnode(self.contentContainersWrapperNode)
-            } else {
-                for contentNode in self.contentNodes {
-                    self.mainContextSourceNode.contentNode.addSubnode(contentNode)
-                }
-            }
-            transitionClippingNode.removeFromSupernode()
-            self.transitionClippingNode = nil
-        }
-    }
-    
     override func shouldAnimateHorizontalFrameTransition() -> Bool {
         if let _ = self.backgroundFrameTransition {
             return true
@@ -2849,6 +2896,10 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         if let backgroundFrameTransition = self.backgroundFrameTransition {
             let backgroundFrame = CGRect.interpolator()(backgroundFrameTransition.0, backgroundFrameTransition.1, progress) as! CGRect
             self.backgroundNode.frame = backgroundFrame
+
+            self.clippingNode.frame = backgroundFrame
+            self.clippingNode.bounds = CGRect(origin: CGPoint(x: backgroundFrame.minX, y: backgroundFrame.minY), size: backgroundFrame.size)
+
             self.backgroundNode.updateLayout(size: backgroundFrame.size, transition: .immediate)
             self.backgroundWallpaperNode.frame = backgroundFrame
             self.shadowNode.updateLayout(backgroundFrame: backgroundFrame, transition: .immediate)
@@ -2871,20 +2922,9 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
             }
             self.messageAccessibilityArea.frame = backgroundFrame
             
-            if let shareButtonNode = self.shareButtonNode {
-                shareButtonNode.frame = CGRect(origin: CGPoint(x: backgroundFrame.maxX + 8.0, y: backgroundFrame.maxY - 30.0), size: CGSize(width: 29.0, height: 29.0))
-            }
-            
-            if let transitionClippingNode = self.transitionClippingNode {
-                var fixedBackgroundFrame = backgroundFrame
-                fixedBackgroundFrame = fixedBackgroundFrame.insetBy(dx: 0.0, dy: self.backgroundNode.type == ChatMessageBackgroundType.none ? 0.0 : 1.0)
-                
-                transitionClippingNode.frame = fixedBackgroundFrame
-                transitionClippingNode.bounds = CGRect(origin: CGPoint(x: fixedBackgroundFrame.origin.x, y: fixedBackgroundFrame.origin.y), size: fixedBackgroundFrame.size)
-                
-                if progress >= 1.0 - CGFloat.ulpOfOne {
-                    self.disableTransitionClippingNode()
-                }
+            if let item = self.item, let shareButtonNode = self.shareButtonNode {
+                let buttonSize = shareButtonNode.update(presentationData: item.presentationData, chatLocation: item.chatLocation, subject: item.associatedData.subject, message: item.message, account: item.context.account, disableComments: true)
+                shareButtonNode.frame = CGRect(origin: CGPoint(x: backgroundFrame.maxX + 8.0, y: backgroundFrame.maxY - buttonSize.width - 1.0), size: buttonSize)
             }
             
             if CGFloat(1.0).isLessThanOrEqualTo(progress) {
@@ -2971,7 +3011,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                             for attribute in item.content.firstMessage.attributes {
                                 if let attribute = attribute as? SourceReferenceMessageAttribute {
                                     openPeerId = attribute.messageId.peerId
-                                    navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true), peekData: nil)
+                                    navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true, timecode: nil), peekData: nil)
                                 }
                             }
                             
@@ -3564,10 +3604,10 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
         if self.highlightedState != highlighted {
             self.highlightedState = highlighted
             if let backgroundType = self.backgroundType {
-                let graphics = PresentationResourcesChat.principalGraphics(mediaBox: item.context.account.postbox.mediaBox, knockoutWallpaper: item.context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
+                let graphics = PresentationResourcesChat.principalGraphics(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
                 
                 let hasWallpaper = item.presentationData.theme.wallpaper.hasWallpaper
-                self.backgroundNode.setType(type: backgroundType, highlighted: highlighted, graphics: graphics, maskMode: self.mainContextSourceNode.isExtractedToContextPreview, hasWallpaper: hasWallpaper, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate)
+                self.backgroundNode.setType(type: backgroundType, highlighted: highlighted, graphics: graphics, maskMode: self.mainContextSourceNode.isExtractedToContextPreview, hasWallpaper: hasWallpaper, transition: animated ? .animated(duration: 0.3, curve: .easeInOut) : .immediate, backgroundNode: item.controllerInteraction.presentationContext.backgroundNode)
             }
         }
     }
@@ -3606,7 +3646,7 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
                     if translation.x < -45.0, self.swipeToReplyNode == nil, let item = self.item {
                         self.swipeToReplyFeedback?.impact()
 
-                        let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonFillColor, wallpaper: item.presentationData.theme.wallpaper), strokeColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonStrokeColor, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
+                        let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
                         self.swipeToReplyNode = swipeToReplyNode
                         self.insertSubnode(swipeToReplyNode, belowSubnode: self.messageAccessibilityArea)
                         animateReplyNodeIn = true
@@ -3683,22 +3723,35 @@ class ChatMessageBubbleItemNode: ChatMessageItemView, ChatMessagePreviewItemNode
     }
     
     private func updateAbsoluteRectInternal(_ rect: CGRect, within containerSize: CGSize) {
-        let mappedRect = CGRect(origin: CGPoint(x: rect.minX + self.backgroundWallpaperNode.frame.minX, y: rect.minY + self.backgroundWallpaperNode.frame.minY), size: rect.size)
-        self.backgroundWallpaperNode.update(rect: mappedRect, within: containerSize)
-    }
-    
-    override func applyAbsoluteOffset(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
-        if !self.mainContextSourceNode.isExtractedToContextPreview {
-            self.applyAbsoluteOffsetInternal(value: -value, animationCurve: animationCurve, duration: duration)
+        var backgroundWallpaperFrame = self.backgroundWallpaperNode.frame
+        backgroundWallpaperFrame.origin.x += rect.minX
+        backgroundWallpaperFrame.origin.y += rect.minY
+        self.backgroundWallpaperNode.update(rect: backgroundWallpaperFrame, within: containerSize)
+        for contentNode in self.contentNodes {
+            contentNode.updateAbsoluteRect(CGRect(origin: CGPoint(x: rect.minX + contentNode.frame.minX, y: rect.minY + contentNode.frame.minY), size: rect.size), within: containerSize)
         }
     }
     
-    private func applyAbsoluteOffsetInternal(value: CGFloat, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+    override func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        if !self.mainContextSourceNode.isExtractedToContextPreview {
+            self.applyAbsoluteOffsetInternal(value: CGPoint(x: -value.x, y: -value.y), animationCurve: animationCurve, duration: duration)
+        }
+    }
+    
+    private func applyAbsoluteOffsetInternal(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
         self.backgroundWallpaperNode.offset(value: value, animationCurve: animationCurve, duration: duration)
+
+        for contentNode in self.contentNodes {
+            contentNode.applyAbsoluteOffset(value: value, animationCurve: animationCurve, duration: duration)
+        }
     }
     
     private func applyAbsoluteOffsetSpringInternal(value: CGFloat, duration: Double, damping: CGFloat) {
         self.backgroundWallpaperNode.offsetSpring(value: value, duration: duration, damping: damping)
+
+        for contentNode in self.contentNodes {
+            contentNode.applyAbsoluteOffsetSpring(value: value, duration: duration, damping: damping)
+        }
     }
     
     override func getMessageContextSourceNode(stableId: UInt32?) -> ContextExtractedContentContainingNode? {
diff --git a/submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift
index 8f475534f7..becd445ba4 100644
--- a/submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageContactBubbleContentNode.swift
@@ -90,6 +90,9 @@ class ChatMessageContactBubbleContentNode: ChatMessageBubbleContentNode {
                 } else {
                     displayName = selectedContact.lastName
                 }
+                if displayName.isEmpty {
+                    displayName = item.presentationData.strings.Message_Contact
+                }
                 
                 let info: String
                 if let previousContact = previousContact, previousContact.isEqual(to: selectedContact), let contactInfo = previousContactInfo {
diff --git a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
index 2803acb223..d7856d1496 100644
--- a/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageDateAndStatusNode.swift
@@ -151,6 +151,7 @@ private final class StatusReactionNode: ASDisplayNode {
 
 class ChatMessageDateAndStatusNode: ASDisplayNode {
     private var backgroundNode: ASImageNode?
+    private var blurredBackgroundNode: NavigationBackgroundNode?
     private var checkSentNode: ASImageNode?
     private var checkReadNode: ASImageNode?
     private var clockFrameNode: ASImageNode?
@@ -227,6 +228,7 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
         return { context, presentationData, edited, impressionCount, dateText, type, constrainedSize, reactions, replyCount, isPinned, hasAutoremove in
             let dateColor: UIColor
             var backgroundImage: UIImage?
+            var blurredBackgroundColor: (UIColor, Bool)?
             var outgoingStatus: ChatMessageDateAndStatusOutgoingType?
             var leftInset: CGFloat
             
@@ -236,11 +238,10 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
             let clockMinImage: UIImage?
             var impressionImage: UIImage?
             var repliesImage: UIImage?
-            var selfExpiringImage: UIImage?
             
             let themeUpdated = presentationData.theme != currentTheme || type != currentType
             
-            let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
+            let graphics = PresentationResourcesChat.principalGraphics(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
             let isDefaultWallpaper = serviceMessageColorHasDefaultWallpaper(presentationData.theme.wallpaper)
             let offset: CGFloat = -UIScreenPixel
             
@@ -326,7 +327,8 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                 case .FreeIncoming:
                     let serviceColor = serviceMessageColorComponents(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
                     dateColor = serviceColor.primaryText
-                    backgroundImage = graphics.dateAndStatusFreeBackground
+
+                    blurredBackgroundColor = (selectDateFillStaticColor(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), dateFillNeedsBlur(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper))
                     leftInset = 0.0
                     loadedCheckFullImage = PresentationResourcesChat.chatFreeFullCheck(presentationData.theme.theme, size: checkSize, isDefaultWallpaper: isDefaultWallpaper)
                     loadedCheckPartialImage = PresentationResourcesChat.chatFreePartialCheck(presentationData.theme.theme, size: checkSize, isDefaultWallpaper: isDefaultWallpaper)
@@ -347,7 +349,8 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                     let serviceColor = serviceMessageColorComponents(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper)
                     dateColor = serviceColor.primaryText
                     outgoingStatus = status
-                    backgroundImage = graphics.dateAndStatusFreeBackground
+                    //backgroundImage = graphics.dateAndStatusFreeBackground
+                    blurredBackgroundColor = (selectDateFillStaticColor(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), dateFillNeedsBlur(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper))
                     leftInset = 0.0
                     loadedCheckFullImage = PresentationResourcesChat.chatFreeFullCheck(presentationData.theme.theme, size: checkSize, isDefaultWallpaper: isDefaultWallpaper)
                     loadedCheckPartialImage = PresentationResourcesChat.chatFreePartialCheck(presentationData.theme.theme, size: checkSize, isDefaultWallpaper: isDefaultWallpaper)
@@ -416,24 +419,10 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                 currentRepliesIcon = nil
             }
             
-            var selfExpiringIconSize = CGSize()
-            if let selfExpiringImage = selfExpiringImage {
-                if currentSelfExpiringIcon == nil {
-                    let iconNode = ASImageNode()
-                    iconNode.isLayerBacked = true
-                    iconNode.displayWithoutProcessing = true
-                    iconNode.displaysAsynchronously = false
-                    currentSelfExpiringIcon = iconNode
-                }
-                selfExpiringIconSize = selfExpiringImage.size
-            } else {
-                currentSelfExpiringIcon = nil
-            }
-            
             if let outgoingStatus = outgoingStatus {
                 switch outgoingStatus {
                     case .Sending:
-                        statusWidth = 13.0
+                        statusWidth = floor(floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))
                         
                         if checkReadNode == nil {
                             checkReadNode = ASImageNode()
@@ -536,6 +525,8 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                     currentBackgroundNode = backgroundNode
                 }
                 backgroundInsets = UIEdgeInsets(top: 2.0, left: 7.0, bottom: 2.0, right: 7.0)
+            } else if blurredBackgroundColor != nil {
+                backgroundInsets = UIEdgeInsets(top: 2.0, left: 7.0, bottom: 2.0, right: 7.0)
             }
             
             let reactionSize: CGFloat = 14.0
@@ -584,10 +575,6 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                 reactionInset += 12.0
             }
             
-            if !selfExpiringIconSize.width.isZero {
-                reactionInset += selfExpiringIconSize.width + 1.0
-            }
-            
             leftInset += reactionInset
             
             let layoutSize = CGSize(width: leftInset + impressionWidth + date.size.width + statusWidth + backgroundInsets.left + backgroundInsets.right, height: date.size.height + backgroundInsets.top + backgroundInsets.bottom)
@@ -621,6 +608,27 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                             strongSelf.backgroundNode = nil
                         }
                     }
+
+                    if let blurredBackgroundColor = blurredBackgroundColor {
+                        if let blurredBackgroundNode = strongSelf.blurredBackgroundNode {
+                            blurredBackgroundNode.updateColor(color: blurredBackgroundColor.0, enableBlur: blurredBackgroundColor.1, transition: .immediate)
+                            let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.4, curve: .spring) : .immediate
+                            if let previousLayoutSize = previousLayoutSize {
+                                blurredBackgroundNode.frame = blurredBackgroundNode.frame.offsetBy(dx: layoutSize.width - previousLayoutSize.width, dy: 0.0)
+                            }
+                            transition.updateFrame(node: blurredBackgroundNode, frame: CGRect(origin: CGPoint(), size: layoutSize))
+                            blurredBackgroundNode.update(size: blurredBackgroundNode.bounds.size, cornerRadius: blurredBackgroundNode.bounds.height / 2.0, transition: transition)
+                        } else {
+                            let blurredBackgroundNode = NavigationBackgroundNode(color: blurredBackgroundColor.0, enableBlur: blurredBackgroundColor.1)
+                            strongSelf.blurredBackgroundNode = blurredBackgroundNode
+                            strongSelf.insertSubnode(blurredBackgroundNode, at: 0)
+                            blurredBackgroundNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
+                            blurredBackgroundNode.update(size: blurredBackgroundNode.bounds.size, cornerRadius: blurredBackgroundNode.bounds.height / 2.0, transition: .immediate)
+                        }
+                    } else if let blurredBackgroundNode = strongSelf.blurredBackgroundNode {
+                        strongSelf.blurredBackgroundNode = nil
+                        blurredBackgroundNode.removeFromSupernode()
+                    }
                     
                     strongSelf.dateNode.displaysAsynchronously = !presentationData.isPreview
                     let _ = dateApply()
@@ -834,34 +842,6 @@ class ChatMessageDateAndStatusNode: ASDisplayNode {
                         }
                     }
                     
-                    if let currentSelfExpiringIcon = currentSelfExpiringIcon {
-                        currentSelfExpiringIcon.displaysAsynchronously = !presentationData.isPreview
-                        if currentSelfExpiringIcon.image !== selfExpiringImage {
-                            currentSelfExpiringIcon.image = selfExpiringImage
-                        }
-                        if currentSelfExpiringIcon.supernode == nil {
-                            strongSelf.selfExpiringIcon = currentSelfExpiringIcon
-                            strongSelf.addSubnode(currentSelfExpiringIcon)
-                            if animated {
-                                currentSelfExpiringIcon.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15)
-                            }
-                        }
-                        currentSelfExpiringIcon.frame = CGRect(origin: CGPoint(x: reactionOffset - 2.0, y: backgroundInsets.top + offset + floor((date.size.height - selfExpiringIconSize.height) / 2.0)), size: selfExpiringIconSize)
-                        reactionOffset += 9.0
-                    } else if let selfExpiringIcon = strongSelf.selfExpiringIcon {
-                        strongSelf.selfExpiringIcon = nil
-                        if animated {
-                            if let previousLayoutSize = previousLayoutSize {
-                                selfExpiringIcon.frame = selfExpiringIcon.frame.offsetBy(dx: layoutSize.width - previousLayoutSize.width, dy: 0.0)
-                            }
-                            selfExpiringIcon.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak selfExpiringIcon] _ in
-                                selfExpiringIcon?.removeFromSupernode()
-                            })
-                        } else {
-                            selfExpiringIcon.removeFromSupernode()
-                        }
-                    }
-                    
                     if let (layout, apply) = replyCountLayoutAndApply {
                         let node = apply()
                         if strongSelf.replyCountNode !== node {
diff --git a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
index 61eb90e62c..4dec9bcd94 100644
--- a/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageDateHeader.swift
@@ -6,6 +6,7 @@ import TelegramPresentationData
 import Postbox
 import SyncCore
 import AccountContext
+import AvatarNode
 
 private let timezoneOffset: Int32 = {
     let nowTimestamp = Int32(CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970)
@@ -22,7 +23,7 @@ final class ChatMessageDateHeader: ListViewItemHeader {
     private let roundedTimestamp: Int32
     private let scheduled: Bool
     
-    let id: Int64
+    let id: ListViewItemNode.HeaderId
     let presentationData: ChatPresentationData
     let context: AccountContext
     let action: ((Int32) -> Void)?
@@ -33,21 +34,16 @@ final class ChatMessageDateHeader: ListViewItemHeader {
         self.presentationData = presentationData
         self.context = context
         self.action = action
-        if timestamp == scheduleWhenOnlineTimestamp {
-            self.roundedTimestamp = scheduleWhenOnlineTimestamp
-        } else if timestamp == Int32.max {
-            self.roundedTimestamp = timestamp / (granularity) * (granularity)
-        } else {
-            self.roundedTimestamp = ((timestamp + timezoneOffset) / (granularity)) * (granularity)
-        }
-        self.id = Int64(self.roundedTimestamp)
+        self.roundedTimestamp = dateHeaderTimestampId(timestamp: timestamp)
+        self.id = ListViewItemNode.HeaderId(space: 0, id: Int64(self.roundedTimestamp))
     }
     
     let stickDirection: ListViewItemHeaderStickDirection = .bottom
+    let stickOverInsets: Bool = true
     
     let height: CGFloat = 34.0
     
-    func node() -> ListViewItemHeaderNode {
+    func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
         return ChatMessageDateHeaderNode(localTimestamp: self.roundedTimestamp, scheduled: self.scheduled, presentationData: self.presentationData, context: self.context, action: self.action)
     }
     
@@ -90,9 +86,19 @@ private func monthAtIndex(_ index: Int, strings: PresentationStrings) -> String
     }
 }
 
+private func dateHeaderTimestampId(timestamp: Int32) -> Int32 {
+    if timestamp == scheduleWhenOnlineTimestamp {
+        return timestamp
+    } else if timestamp == Int32.max {
+        return timestamp / (granularity) * (granularity)
+    } else {
+        return ((timestamp + timezoneOffset) / (granularity)) * (granularity)
+    }
+}
+
 final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
     let labelNode: TextNode
-    let backgroundNode: ASImageNode
+    let backgroundNode: NavigationBackgroundNode
     let stickBackgroundNode: ASImageNode
     let activateArea: AccessibilityAreaNode
     
@@ -116,10 +122,8 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         self.labelNode.isUserInteractionEnabled = false
         self.labelNode.displaysAsynchronously = !presentationData.isPreview
         
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.displayWithoutProcessing = true
-        self.backgroundNode.displaysAsynchronously = false
+        self.backgroundNode = NavigationBackgroundNode(color: .clear)
+        self.backgroundNode.isUserInteractionEnabled = false
         
         self.stickBackgroundNode = ASImageNode()
         self.stickBackgroundNode.isLayerBacked = true
@@ -165,12 +169,12 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         
         self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0)
         
-        let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
-        
-        self.backgroundNode.image = graphics.dateStaticBackground
+        let graphics = PresentationResourcesChat.principalGraphics(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
+
+        self.backgroundNode.updateColor(color: selectDateFillStaticColor(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), transition: .immediate)
         self.stickBackgroundNode.image = graphics.dateFloatingBackground
         self.stickBackgroundNode.alpha = 0.0
-        self.backgroundNode.addSubnode(self.stickBackgroundNode)
+
         self.addSubnode(self.backgroundNode)
         self.addSubnode(self.labelNode)
         
@@ -198,9 +202,9 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         let previousPresentationData = self.presentationData
         self.presentationData = presentationData
         
-        let graphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
-        
-        self.backgroundNode.image = graphics.dateStaticBackground
+        let graphics = PresentationResourcesChat.principalGraphics(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
+
+        self.backgroundNode.updateColor(color: selectDateFillStaticColor(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper), transition: .immediate)
         self.stickBackgroundNode.image = graphics.dateFloatingBackground
         
         let titleFont = Font.medium(min(18.0, floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0)))
@@ -218,13 +222,8 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         self.setNeedsLayout()
     }
     
-    func updateBackgroundColor(_ color: UIColor) {
-        let chatDateSize: CGFloat = 20.0
-        self.backgroundNode.image = generateImage(CGSize(width: chatDateSize, height: chatDateSize), contextGenerator: { size, context -> Void in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(color.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
-        })!.stretchableImage(withLeftCapWidth: Int(chatDateSize) / 2, topCapHeight: Int(chatDateSize) / 2)
+    func updateBackgroundColor(color: UIColor, enableBlur: Bool) {
+        self.backgroundNode.updateColor(color: color, enableBlur: enableBlur, transition: .immediate)
     }
     
     override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
@@ -237,6 +236,7 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         let backgroundFrame = CGRect(origin: CGPoint(x: floorToScreenPixels((size.width - backgroundSize.width) / 2.0), y: (34.0 - chatDateSize) / 2.0), size: backgroundSize)
         self.stickBackgroundNode.frame = CGRect(origin: CGPoint(), size: backgroundFrame.size)
         self.backgroundNode.frame = backgroundFrame
+        self.backgroundNode.update(size: backgroundFrame.size, cornerRadius: backgroundFrame.size.height / 2.0, transition: .immediate)
         self.labelNode.frame = CGRect(origin: CGPoint(x: backgroundFrame.origin.x + chatDateInset, y: backgroundFrame.origin.y + floorToScreenPixels((backgroundSize.height - labelSize.height) / 2.0)), size: labelSize)
         
         self.activateArea.frame = backgroundFrame
@@ -305,3 +305,173 @@ final class ChatMessageDateHeaderNode: ListViewItemHeaderNode {
         }
     }
 }
+
+final class ChatMessageAvatarHeader: ListViewItemHeader {
+    struct Id: Hashable {
+        var peerId: PeerId
+        var timestampId: Int32
+    }
+
+    let id: ListViewItemNode.HeaderId
+    let peerId: PeerId
+    let peer: Peer?
+    let messageReference: MessageReference?
+    let presentationData: ChatPresentationData
+    let context: AccountContext
+    let controllerInteraction: ChatControllerInteraction
+
+    init(timestamp: Int32, peerId: PeerId, peer: Peer?, messageReference: MessageReference?, presentationData: ChatPresentationData, context: AccountContext, controllerInteraction: ChatControllerInteraction) {
+        self.peerId = peerId
+        self.peer = peer
+        self.messageReference = messageReference
+        self.presentationData = presentationData
+        self.context = context
+        self.controllerInteraction = controllerInteraction
+        self.id = ListViewItemNode.HeaderId(space: 1, id: Id(peerId: peerId, timestampId: dateHeaderTimestampId(timestamp: timestamp)))
+    }
+
+    let stickDirection: ListViewItemHeaderStickDirection = .top
+    let stickOverInsets: Bool = false
+
+    let height: CGFloat = 38.0
+
+    func node(synchronousLoad: Bool) -> ListViewItemHeaderNode {
+        return ChatMessageAvatarHeaderNode(peerId: self.peerId, peer: self.peer, messageReference: self.messageReference, presentationData: self.presentationData, context: self.context, controllerInteraction: self.controllerInteraction, synchronousLoad: synchronousLoad)
+    }
+
+    func updateNode(_ node: ListViewItemHeaderNode, previous: ListViewItemHeader?, next: ListViewItemHeader?) {
+        guard let node = node as? ChatMessageAvatarHeaderNode, let next = next as? ChatMessageAvatarHeader else {
+            return
+        }
+        node.updatePresentationData(next.presentationData, context: next.context)
+    }
+}
+
+private let avatarFont = avatarPlaceholderFont(size: 16.0)
+
+final class ChatMessageAvatarHeaderNode: ListViewItemHeaderNode {
+    private let peerId: PeerId
+    private let messageReference: MessageReference?
+    private let peer: Peer?
+
+    private let containerNode: ContextControllerSourceNode
+    private let avatarNode: AvatarNode
+    private var presentationData: ChatPresentationData
+    private let context: AccountContext
+    private let controllerInteraction: ChatControllerInteraction
+
+    init(peerId: PeerId, peer: Peer?, messageReference: MessageReference?, presentationData: ChatPresentationData, context: AccountContext, controllerInteraction: ChatControllerInteraction, synchronousLoad: Bool) {
+        self.peerId = peerId
+        self.peer = peer
+        self.messageReference = messageReference
+        self.presentationData = presentationData
+        self.context = context
+        self.controllerInteraction = controllerInteraction
+
+        self.containerNode = ContextControllerSourceNode()
+
+        self.avatarNode = AvatarNode(font: avatarFont)
+
+        super.init(layerBacked: false, dynamicBounce: true, isRotated: true, seeThrough: false)
+
+        self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0)
+
+        self.addSubnode(self.containerNode)
+        self.containerNode.addSubnode(self.avatarNode)
+
+        if let peer = peer {
+            self.setPeer(context: context, theme: presentationData.theme.theme, synchronousLoad: synchronousLoad, peer: peer, authorOfMessage: messageReference, emptyColor: .black)
+        }
+
+        self.containerNode.activated = { [weak self] gesture, _ in
+            guard let strongSelf = self, let peer = strongSelf.peer else {
+                return
+            }
+            var messageId: MessageId?
+            if let messageReference = messageReference, case let .message(m) = messageReference.content {
+                messageId = m.id
+            }
+            strongSelf.controllerInteraction.openPeerContextMenu(peer, messageId, strongSelf.containerNode, strongSelf.containerNode.bounds, gesture)
+        }
+
+        self.updateSelectionState(animated: false)
+    }
+
+    func setCustomLetters(context: AccountContext, theme: PresentationTheme, synchronousLoad: Bool, letters: [String], emptyColor: UIColor) {
+        self.containerNode.isGestureEnabled = false
+
+        self.avatarNode.setCustomLetters(letters, icon: !letters.isEmpty ? nil : .phone)
+    }
+
+    func setPeer(context: AccountContext, theme: PresentationTheme, synchronousLoad: Bool, peer: Peer, authorOfMessage: MessageReference?, emptyColor: UIColor) {
+        self.containerNode.isGestureEnabled = peer.smallProfileImage != nil
+
+        var overrideImage: AvatarNodeImageOverride?
+        if peer.isDeleted {
+            overrideImage = .deletedIcon
+        }
+        self.avatarNode.setPeer(context: context, theme: theme, peer: peer, authorOfMessage: authorOfMessage, overrideImage: overrideImage, emptyColor: emptyColor, synchronousLoad: synchronousLoad, displayDimensions: CGSize(width: 38.0, height: 38.0))
+    }
+
+    override func didLoad() {
+        super.didLoad()
+
+        self.avatarNode.view.addGestureRecognizer(ListViewTapGestureRecognizer(target: self, action: #selector(self.tapGesture(_:))))
+    }
+
+    func updatePresentationData(_ presentationData: ChatPresentationData, context: AccountContext) {
+        self.presentationData = presentationData
+
+        self.setNeedsLayout()
+    }
+
+    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat) {
+        self.containerNode.frame = CGRect(origin: CGPoint(x: leftInset + 3.0, y: 0.0), size: CGSize(width: 38.0, height: 38.0))
+        self.avatarNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 38.0, height: 38.0))
+    }
+
+    override func animateRemoved(duration: Double) {
+        self.alpha = 0.0
+        self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration, removeOnCompletion: false)
+        self.avatarNode.layer.animateScale(from: 1.0, to: 0.2, duration: duration, removeOnCompletion: false)
+    }
+
+    override func animateAdded(duration: Double) {
+        self.layer.animateAlpha(from: 0.0, to: self.alpha, duration: 0.2)
+        self.avatarNode.layer.animateScale(from: 0.2, to: 1.0, duration: 0.2)
+    }
+
+    override func updateStickDistanceFactor(_ factor: CGFloat, transition: ContainedViewLayoutTransition) {
+    }
+
+    override func updateFlashingOnScrolling(_ isFlashingOnScrolling: Bool, animated: Bool) {
+    }
+
+    func updateSelectionState(animated: Bool) {
+        let offset: CGFloat = self.controllerInteraction.selectionState != nil ? 42.0 : 0.0
+
+        let previousSubnodeTransform = self.subnodeTransform
+        self.subnodeTransform = CATransform3DMakeTranslation(offset, 0.0, 0.0);
+        if animated {
+            self.layer.animate(from: NSValue(caTransform3D: previousSubnodeTransform), to: NSValue(caTransform3D: self.subnodeTransform), keyPath: "sublayerTransform", timingFunction: CAMediaTimingFunctionName.easeOut.rawValue, duration: 0.2)
+        }
+    }
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        if !self.bounds.contains(point) {
+            return nil
+        }
+        let result = self.containerNode.view.hitTest(self.view.convert(point, to: self.containerNode.view), with: event)
+        return result
+    }
+
+    override func touchesCancelled(_ touches: Set<UITouch>?, with event: UIEvent?) {
+        super.touchesCancelled(touches, with: event)
+    }
+
+    @objc func tapGesture(_ recognizer: ListViewTapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.controllerInteraction.openPeer(self.peerId, .info, nil)
+        }
+    }
+}
diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift
index 110dc38a36..5b3cbb1970 100644
--- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousDescriptionContentNode.swift
@@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousDescriptionContentNode: ChatMessageBubble
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var messageEntities: [MessageTextEntity]?
             
             for attribute in item.message.attributes {
@@ -44,7 +44,7 @@ final class ChatMessageEventLogPreviousDescriptionContentNode: ChatMessageBubble
             }
             let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift
index c0ff0ffa39..c481ff165c 100644
--- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousLinkContentNode.swift
@@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousLinkContentNode: ChatMessageBubbleContent
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var messageEntities: [MessageTextEntity]?
             
             for attribute in item.message.attributes {
@@ -39,7 +39,7 @@ final class ChatMessageEventLogPreviousLinkContentNode: ChatMessageBubbleContent
             let text: String = item.message.text
             let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift
index 0d638f3fd4..b0e5ba0891 100644
--- a/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageEventLogPreviousMessageContentNode.swift
@@ -25,7 +25,7 @@ final class ChatMessageEventLogPreviousMessageContentNode: ChatMessageBubbleCont
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var messageEntities: [MessageTextEntity]?
             
             for attribute in item.message.attributes {
@@ -44,7 +44,7 @@ final class ChatMessageEventLogPreviousMessageContentNode: ChatMessageBubbleCont
             }
             let mediaAndFlags: (Media, ChatMessageAttachedContentNodeMediaFlags)? = nil
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, true, .peer(item.message.id.peerId), title, nil, text, messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift
index 749a02796f..4e374f4aa3 100644
--- a/submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageFileBubbleContentNode.swift
@@ -9,7 +9,7 @@ import SyncCore
 import TelegramUIPreferences
 
 class ChatMessageFileBubbleContentNode: ChatMessageBubbleContentNode {
-    private let interactiveFileNode: ChatMessageInteractiveFileNode
+    let interactiveFileNode: ChatMessageInteractiveFileNode
     
     override var visibility: ListViewItemNodeVisibility {
         didSet {
diff --git a/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift
index de1c237da2..240ee141fa 100644
--- a/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageGameBubbleContentNode.swift
@@ -45,7 +45,7 @@ final class ChatMessageGameBubbleContentNode: ChatMessageBubbleContentNode {
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var game: TelegramMediaGame?
             var messageEntities: [MessageTextEntity]?
             
@@ -78,7 +78,7 @@ final class ChatMessageGameBubbleContentNode: ChatMessageBubbleContentNode {
                 }
             }
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, .peer(item.message.id.peerId), title, nil, item.message.text.isEmpty ? text : item.message.text, item.message.text.isEmpty ? nil : messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, .peer(item.message.id.peerId), title, nil, item.message.text.isEmpty ? text : item.message.text, item.message.text.isEmpty ? nil : messageEntities, mediaAndFlags, nil, nil, nil, true, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
index 30c9380450..9dc3b1afb5 100644
--- a/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
@@ -20,7 +20,7 @@ private let inlineBotPrefixFont = Font.regular(14.0)
 private let inlineBotNameFont = nameFont
 
 class ChatMessageInstantVideoItemNode: ChatMessageItemView {
-    private let contextSourceNode: ContextExtractedContentContainingNode
+    let contextSourceNode: ContextExtractedContentContainingNode
     private let containerNode: ContextControllerSourceNode
     private let interactiveVideoNode: ChatMessageInteractiveInstantVideoNode
     
@@ -31,8 +31,12 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
     private var swipeToReplyNode: ChatMessageSwipeToReplyNode?
     private var swipeToReplyFeedback: HapticFeedback?
     
+    private var appliedParams: ListViewItemLayoutParams?
     private var appliedItem: ChatMessageItem?
     private var appliedForwardInfo: (Peer?, String?)?
+    private var appliedHasAvatar = false
+    private var appliedCurrentlyPlaying = false
+    private var appliedAutomaticDownload = false
     
     private var forwardInfoNode: ChatMessageForwardInfoNode?
     private var forwardBackgroundNode: ASImageNode?
@@ -217,6 +221,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
         
         let currentItem = self.appliedItem
         let currentForwardInfo = self.appliedForwardInfo
+        let currentPlaying = self.appliedCurrentlyPlaying
         
         return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in
             let accessibilityData = ChatMessageAccessibilityData(item: item, isSelected: nil)
@@ -318,7 +323,13 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
                 deliveryFailedInset += 24.0
             }
             
-            let displaySize = layoutConstants.instantVideo.dimensions
+            var isPlaying = false
+            var displaySize = layoutConstants.instantVideo.dimensions
+            let maximumDisplaySize = CGSize(width: params.width - 20.0, height: params.width - 20.0)
+            if item.associatedData.currentlyPlayingMessageId == item.message.index {
+                isPlaying = true
+                displaySize = maximumDisplaySize
+            }
             
             var automaticDownload = true
             for media in item.message.media {
@@ -332,7 +343,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
                 isReplyThread = true
             }
             
-            let (videoLayout, videoApply) = makeVideoLayout(ChatMessageBubbleContentItem(context: item.context, controllerInteraction: item.controllerInteraction, message: item.message, read: item.read, chatLocation: item.chatLocation, presentationData: item.presentationData, associatedData: item.associatedData, attributes: item.content.firstMessageAttributes, isItemPinned: item.message.tags.contains(.pinned) && !isReplyThread, isItemEdited: false), params.width - params.leftInset - params.rightInset - avatarInset, displaySize, .free, automaticDownload)
+            let (videoLayout, videoApply) = makeVideoLayout(ChatMessageBubbleContentItem(context: item.context, controllerInteraction: item.controllerInteraction, message: item.message, read: item.read, chatLocation: item.chatLocation, presentationData: item.presentationData, associatedData: item.associatedData, attributes: item.content.firstMessageAttributes, isItemPinned: item.message.tags.contains(.pinned) && !isReplyThread, isItemEdited: false), params.width - params.leftInset - params.rightInset - avatarInset, displaySize, maximumDisplaySize, isPlaying ? 1.0 : 0.0, .free, automaticDownload)
             
             let videoFrame = CGRect(origin: CGPoint(x: (incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + avatarInset + layoutConstants.bubble.contentInsets.left) : (params.width - params.rightInset - videoLayout.contentSize.width - layoutConstants.bubble.edgeInset - layoutConstants.bubble.contentInsets.left - deliveryFailedInset)), y: 0.0), size: videoLayout.contentSize)
             
@@ -495,30 +506,40 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
             
             return (ListViewItemNodeLayout(contentSize: layoutSize, insets: layoutInsets), { [weak self] animation, _ in
                 if let strongSelf = self {
-                    strongSelf.contextSourceNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
-                    strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
-                    strongSelf.contextSourceNode.contentNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
-                    strongSelf.messageAccessibilityArea.frame = CGRect(origin: CGPoint(), size: layoutSize)
-                    
-                    strongSelf.appliedItem = item
-                    strongSelf.appliedForwardInfo = (forwardSource, forwardAuthorSignature)
-                
-                    strongSelf.updateAccessibilityData(accessibilityData)
-                    
                     let transition: ContainedViewLayoutTransition
                     if animation.isAnimated {
                         transition = .animated(duration: 0.2, curve: .spring)
                     } else {
                         transition = .immediate
                     }
-                    strongSelf.interactiveVideoNode.frame = videoFrame
+                    
+                    strongSelf.contextSourceNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
+                    strongSelf.containerNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
+                    strongSelf.contextSourceNode.contentNode.frame = CGRect(origin: CGPoint(), size: layoutSize)
+                    strongSelf.messageAccessibilityArea.frame = CGRect(origin: CGPoint(), size: layoutSize)
+                    
+                    strongSelf.appliedParams = params
+                    strongSelf.appliedItem = item
+                    strongSelf.appliedHasAvatar = hasAvatar
+                    strongSelf.appliedForwardInfo = (forwardSource, forwardAuthorSignature)
+                    strongSelf.appliedCurrentlyPlaying = isPlaying
+                    
+                    strongSelf.updateAccessibilityData(accessibilityData)
+                                        
+                    
+                    
                     let videoLayoutData: ChatMessageInstantVideoItemLayoutData
                     if incoming {
                         videoLayoutData = .constrained(left: 0.0, right: max(0.0, availableContentWidth - videoFrame.width))
                     } else {
                         videoLayoutData = .constrained(left: max(0.0, availableContentWidth - videoFrame.width), right: 0.0)
                     }
-                    videoApply(videoLayoutData, transition)
+                    
+                    if currentItem != nil && currentPlaying != isPlaying {
+                    } else {
+                        strongSelf.interactiveVideoNode.frame = videoFrame
+                        videoApply(videoLayoutData, transition)
+                    }
                     
                     strongSelf.contextSourceNode.contentRect = videoFrame
                     strongSelf.containerNode.targetNodeForActivationProgressContentRect = strongSelf.contextSourceNode.contentRect
@@ -731,7 +752,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
                     for attribute in item.content.firstMessage.attributes {
                         if let attribute = attribute as? SourceReferenceMessageAttribute {
                             openPeerId = attribute.messageId.peerId
-                            navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true), peekData: nil)
+                            navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true, timecode: nil), peekData: nil)
                         }
                     }
                     
@@ -850,7 +871,7 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
                 if translation.x < -45.0, self.swipeToReplyNode == nil, let item = self.item {
                     self.swipeToReplyFeedback?.impact()
                     
-                    let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonFillColor, wallpaper: item.presentationData.theme.wallpaper), strokeColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonStrokeColor, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
+                    let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
                     self.swipeToReplyNode = swipeToReplyNode
                     self.addSubnode(swipeToReplyNode)
                     animateReplyNodeIn = true
@@ -985,6 +1006,10 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
             }
         }
     }
+
+    override func cancelInsertionAnimations() {
+        self.layer.removeAllAnimations()
+    }
     
     override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         super.animateInsertion(currentTimestamp, duration: duration, short: short)
@@ -1003,7 +1028,12 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
         
         self.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
     }
-    
+
+    func animateFromSnapshot(snapshotView: UIView, transition: CombinedTransition) {
+        snapshotView.frame = self.interactiveVideoNode.view.convert(snapshotView.frame, from: self.contextSourceNode.contentNode.view)
+        self.interactiveVideoNode.animateFromSnapshot(snapshotView: snapshotView, transition: transition)
+    }
+
     override func playMediaWithSound() -> ((Double?) -> Void, Bool, Bool, Bool, ASDisplayNode?)? {
         return self.interactiveVideoNode.playMediaWithSound()
     }
@@ -1015,4 +1045,75 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView {
     override func addAccessoryItemNode(_ accessoryItemNode: ListViewAccessoryItemNode) {
         self.contextSourceNode.contentNode.addSubnode(accessoryItemNode)
     }
+    
+    override func animateFrameTransition(_ progress: CGFloat, _ currentValue: CGFloat) {
+        super.animateFrameTransition(progress, currentValue)
+        
+        guard let item = self.appliedItem, let params = self.appliedParams, progress > 0.0, let (initialHeight, targetHeight) = self.apparentHeightTransition else {
+            return
+        }
+        
+        let layoutConstants = chatMessageItemLayoutConstants(self.layoutConstants, params: params, presentationData: item.presentationData)
+        let incoming = item.message.effectivelyIncoming(item.context.account.peerId)
+        
+        var isReplyThread = false
+        if case .replyThread = item.chatLocation {
+            isReplyThread = true
+        }
+        
+        var isPlaying = false
+        var displaySize = layoutConstants.instantVideo.dimensions
+        let maximumDisplaySize = CGSize(width: params.width - 20.0, height: params.width - 20.0)
+        if item.associatedData.currentlyPlayingMessageId == item.message.index {
+            isPlaying = true
+        }
+        
+        let avatarInset: CGFloat
+        if self.appliedHasAvatar {
+            avatarInset = layoutConstants.avatarDiameter
+        } else {
+            avatarInset = 0.0
+        }
+        
+        let isFailed = item.content.firstMessage.effectivelyFailed(timestamp: item.context.account.network.getApproximateRemoteTimestamp())
+        var deliveryFailedInset: CGFloat = 0.0
+        if isFailed {
+            deliveryFailedInset += 24.0
+        }
+        
+        let makeVideoLayout = self.interactiveVideoNode.asyncLayout()
+        
+        let initialSize: CGSize
+        let targetSize: CGSize
+        let animationProgress: CGFloat = (currentValue - initialHeight) / (targetHeight - initialHeight)
+        let scaleProgress: CGFloat
+        if currentValue < targetHeight {
+            initialSize = displaySize
+            targetSize = maximumDisplaySize
+            scaleProgress = animationProgress
+        } else if currentValue > targetHeight {
+            initialSize = maximumDisplaySize
+            targetSize = displaySize
+            scaleProgress = 1.0 - animationProgress
+        } else {
+            initialSize = isPlaying ? maximumDisplaySize : displaySize
+            targetSize = initialSize
+            scaleProgress = isPlaying ? 1.0 : 0.0
+        }
+        displaySize = CGSize(width: initialSize.width + (targetSize.width - initialSize.width) * animationProgress, height: initialSize.height + (targetSize.height - initialSize.height) * animationProgress)
+        
+        let (videoLayout, videoApply) = makeVideoLayout(ChatMessageBubbleContentItem(context: item.context, controllerInteraction: item.controllerInteraction, message: item.message, read: item.read, chatLocation: item.chatLocation, presentationData: item.presentationData, associatedData: item.associatedData, attributes: item.content.firstMessageAttributes, isItemPinned: item.message.tags.contains(.pinned) && !isReplyThread, isItemEdited: false), params.width - params.leftInset - params.rightInset - avatarInset, displaySize, maximumDisplaySize, scaleProgress, .free, self.appliedAutomaticDownload)
+        
+        let availableContentWidth = params.width - params.leftInset - params.rightInset - layoutConstants.bubble.edgeInset * 2.0 - avatarInset - layoutConstants.bubble.contentInsets.left
+        let videoFrame = CGRect(origin: CGPoint(x: (incoming ? (params.leftInset + layoutConstants.bubble.edgeInset + avatarInset + layoutConstants.bubble.contentInsets.left) : (params.width - params.rightInset - videoLayout.contentSize.width - layoutConstants.bubble.edgeInset - layoutConstants.bubble.contentInsets.left - deliveryFailedInset)), y: 0.0), size: videoLayout.contentSize)
+        self.interactiveVideoNode.frame = videoFrame
+        
+        let videoLayoutData: ChatMessageInstantVideoItemLayoutData
+        if incoming {
+            videoLayoutData = .constrained(left: 0.0, right: max(0.0, availableContentWidth - videoFrame.width))
+        } else {
+            videoLayoutData = .constrained(left: max(0.0, availableContentWidth - videoFrame.width), right: 0.0)
+        }
+        videoApply(videoLayoutData, .immediate)
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
index 357d812b1b..6cdc96120a 100644
--- a/submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
@@ -17,6 +17,7 @@ import FileMediaResourceStatus
 import CheckNode
 import MusicAlbumArtResources
 import AudioBlob
+import ContextUI
 
 private struct FetchControls {
     let fetch: () -> Void
@@ -38,8 +39,9 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
     private let consumableContentNode: ASImageNode
     
     private var iconNode: TransformImageNode?
+    let statusContainerNode: ContextExtractedContentContainingNode
     private var statusNode: SemanticStatusNode?
-    private var playbackAudioLevelView: VoiceBlobView?
+    private var playbackAudioLevelNode: VoiceBlobNode?
     private var streamingStatusNode: SemanticStatusNode?
     private var tapRecognizer: UITapGestureRecognizer?
     
@@ -71,7 +73,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
             guard self.visibility != oldValue else { return }
             
             if !self.visibility {
-                self.playbackAudioLevelView?.stopAnimating()
+                self.playbackAudioLevelNode?.stopAnimating()
             }
         }
     }
@@ -129,6 +131,8 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
         self.dateAndStatusNode = ChatMessageDateAndStatusNode()
         
         self.consumableContentNode = ASImageNode()
+
+        self.statusContainerNode = ContextExtractedContentContainingNode()
         
         super.init()
         
@@ -136,6 +140,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
         self.addSubnode(self.descriptionNode)
         self.addSubnode(self.fetchingTextNode)
         self.addSubnode(self.fetchingCompactTextNode)
+        self.addSubnode(self.statusContainerNode)
     }
     
     deinit {
@@ -175,7 +180,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 case let .fetchStatus(fetchStatus):
                     if let context = self.context, let message = self.message, message.flags.isSending {
                         let _ = context.account.postbox.transaction({ transaction -> Void in
-                            deleteMessages(transaction: transaction, mediaBox: context.account.postbox.mediaBox, ids: [message.id])
+                            context.engine.messages.deleteMessages(transaction: transaction, ids: [message.id])
                         }).start()
                     } else {
                         switch fetchStatus {
@@ -222,7 +227,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
         return { context, presentationData, message, associatedData, chatLocation, attributes, isPinned, forcedIsEdited, file, automaticDownload, incoming, isRecentActions, forcedResourceStatus, dateAndStatusType, messageSelection, constrainedSize in
             return (CGFloat.greatestFiniteMagnitude, { constrainedSize in
                 let titleFont = Font.regular(floor(presentationData.fontSize.baseDisplaySize * 16.0 / 17.0))
-                let descriptionFont = Font.regular(floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))
+                let descriptionFont = Font.with(size: floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0), design: .regular, weight: .regular, traits: [.monospacedNumbers])
                 let durationFont = Font.regular(floor(presentationData.fontSize.baseDisplaySize * 11.0 / 17.0))
                 
                 var updateImageSignal: Signal<(TransformImageArguments) -> DrawingContext?, NoError>?
@@ -384,7 +389,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                             if let performer = performer {
                                 descriptionText = performer
                             } else if let size = file.size {
-                                descriptionText = dataSizeString(size, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)
+                                descriptionText = dataSizeString(size, formatting: DataSizeStringFormatting(chatPresentationData: presentationData))
                             } else {
                                 descriptionText = ""
                             }
@@ -408,7 +413,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 } else if !isVoice {
                     let descriptionText: String
                     if let size = file.size {
-                        descriptionText = dataSizeString(size, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)
+                        descriptionText = dataSizeString(size, formatting: DataSizeStringFormatting(chatPresentationData: presentationData))
                     } else {
                         descriptionText = ""
                     }
@@ -463,7 +468,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 if hasThumbnail {
                     fileIconImage = nil
                 } else {
-                    let principalGraphics = PresentationResourcesChat.principalGraphics(mediaBox: context.account.postbox.mediaBox, knockoutWallpaper: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper, theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
+                    let principalGraphics = PresentationResourcesChat.principalGraphics(theme: presentationData.theme.theme, wallpaper: presentationData.theme.wallpaper, bubbleCorners: presentationData.chatBubbleCorners)
                     
                     fileIconImage = incoming ? principalGraphics.radialIndicatorFileIconIncoming : principalGraphics.radialIndicatorFileIconOutgoing
                 }
@@ -666,7 +671,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                                         return
                                     }
                                     strongSelf.inputAudioLevel = CGFloat(value)
-                                    strongSelf.playbackAudioLevelView?.updateLevel(CGFloat(value))
+                                    strongSelf.playbackAudioLevelNode?.updateLevel(CGFloat(value))
                                 }))
                             }
                             
@@ -683,12 +688,17 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                                                         
                             strongSelf.waveformNode.displaysAsynchronously = !presentationData.isPreview
                             strongSelf.statusNode?.displaysAsynchronously = !presentationData.isPreview
-                            strongSelf.statusNode?.frame = progressFrame
-                            strongSelf.playbackAudioLevelView?.frame = progressFrame.insetBy(dx: -12.0, dy: -12.0)
+                            strongSelf.statusNode?.frame = CGRect(origin: CGPoint(), size: progressFrame.size)
+
+                            strongSelf.statusContainerNode.frame = progressFrame
+                            strongSelf.statusContainerNode.contentRect = CGRect(origin: CGPoint(), size: progressFrame.size)
+                            strongSelf.statusContainerNode.contentNode.frame = CGRect(origin: CGPoint(), size: progressFrame.size)
+
+                            strongSelf.playbackAudioLevelNode?.frame = progressFrame.insetBy(dx: -12.0, dy: -12.0)
                             strongSelf.progressFrame = progressFrame
                             strongSelf.streamingCacheStatusFrame = streamingCacheStatusFrame
                             strongSelf.fileIconImage = fileIconImage
-                            
+
                             if let updatedFetchControls = updatedFetchControls {
                                 let _ = strongSelf.fetchControls.swap(updatedFetchControls)
                                 if automaticDownload {
@@ -818,9 +828,9 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
                 switch fetchStatus {
                     case let .Fetching(_, progress):
                         if let size = file.size {
-                            let compactString = dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)
-                            let descriptionFont = Font.regular(floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0))
-                            downloadingStrings = ("\(compactString) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator))", compactString, descriptionFont)
+                            let compactString = dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: DataSizeStringFormatting(chatPresentationData: presentationData))
+                            let descriptionFont = Font.with(size: floor(presentationData.fontSize.baseDisplaySize * 13.0 / 17.0), design: .regular, weight: .regular, traits: [.monospacedNumbers])
+                            downloadingStrings = ("\(compactString) / \(dataSizeString(size, forceDecimal: true, formatting: DataSizeStringFormatting(chatPresentationData: presentationData)))", compactString, descriptionFont)
                         }
                     default:
                         break
@@ -937,23 +947,28 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
             }
             let statusNode = SemanticStatusNode(backgroundNodeColor: backgroundNodeColor, foregroundNodeColor: foregroundNodeColor, image: image, overlayForegroundNodeColor:  presentationData.theme.theme.chat.message.mediaOverlayControlColors.foregroundColor)
             self.statusNode = statusNode
-            statusNode.frame = progressFrame
-            self.addSubnode(statusNode)
+
+            self.statusContainerNode.contentNode.insertSubnode(statusNode, at: 0)
+            self.statusContainerNode.frame = progressFrame
+            self.statusContainerNode.contentRect = CGRect(origin: CGPoint(), size: progressFrame.size)
+            self.statusContainerNode.contentNode.frame = CGRect(origin: CGPoint(), size: progressFrame.size)
+            statusNode.frame = CGRect(origin: CGPoint(), size: progressFrame.size)
         } else if let statusNode = self.statusNode {
             statusNode.backgroundNodeColor = backgroundNodeColor
         }
         
-        if state != .none && isVoice && self.playbackAudioLevelView == nil && false {
+        if state != .none && isVoice && self.playbackAudioLevelNode == nil {
             let blobFrame = progressFrame.insetBy(dx: -12.0, dy: -12.0)
-            let playbackAudioLevelView = VoiceBlobView(
-                frame: blobFrame,
+            let playbackAudioLevelNode = VoiceBlobNode(
                 maxLevel: 0.3,
                 smallBlobRange: (0, 0),
                 mediumBlobRange: (0.7, 0.8),
                 bigBlobRange: (0.8, 0.9)
             )
-            self.playbackAudioLevelView = playbackAudioLevelView
-            self.view.addSubview(playbackAudioLevelView)
+            playbackAudioLevelNode.isUserInteractionEnabled = false
+            playbackAudioLevelNode.frame = blobFrame
+            self.playbackAudioLevelNode = playbackAudioLevelNode
+            self.insertSubnode(playbackAudioLevelNode, belowSubnode: self.statusContainerNode)
             
             let maskRect = CGRect(origin: .zero, size: blobFrame.size)
             let playbackMaskLayer = CAShapeLayer()
@@ -963,9 +978,9 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
             maskPath.append(UIBezierPath(roundedRect: maskRect.insetBy(dx: 12, dy: 12), cornerRadius: 22))
             maskPath.append(UIBezierPath(rect: maskRect))
             playbackMaskLayer.path = maskPath.cgPath
-            playbackAudioLevelView.layer.mask = playbackMaskLayer
+            playbackAudioLevelNode.layer.mask = playbackMaskLayer
         }
-        self.playbackAudioLevelView?.setColor(presentationData.theme.theme.chat.inputPanel.actionControlFillColor)
+        self.playbackAudioLevelNode?.setColor(messageTheme.mediaActiveControlColor)
         
         if streamingState != .none && self.streamingStatusNode == nil {
             let streamingStatusNode = SemanticStatusNode(backgroundNodeColor: backgroundNodeColor, foregroundNodeColor: foregroundNodeColor)
@@ -992,9 +1007,9 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
             
             switch state {
             case .pause:
-                self.playbackAudioLevelView?.startAnimating()
+                self.playbackAudioLevelNode?.startAnimating()
             default:
-                self.playbackAudioLevelView?.stopAnimating()
+                self.playbackAudioLevelNode?.stopAnimating()
             }
         }
         
diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
index b11555a80f..b263ed4117 100644
--- a/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveInstantVideoNode.swift
@@ -39,7 +39,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
     
     private var statusNode: RadialStatusNode?
     private var playbackStatusNode: InstantVideoRadialStatusNode?
-    private var videoFrame: CGRect?
+    private(set) var videoFrame: CGRect?
     
     private var item: ChatMessageBubbleContentItem?
     private var automaticDownload: Bool?
@@ -47,7 +47,8 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
     private var secretProgressIcon: UIImage?
     
     private let fetchDisposable = MetaDisposable()
-    
+
+    private var durationBackgroundNode: NavigationBackgroundNode?
     private var durationNode: ChatInstantVideoMessageDurationNode?
     private let dateAndStatusNode: ChatMessageDateAndStatusNode
     
@@ -82,6 +83,8 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
         }
     }
     
+    private var animating = false
+    
     override init() {
         self.secretVideoPlaceholderBackground = ASImageNode()
         self.secretVideoPlaceholderBackground.isLayerBacked = true
@@ -129,7 +132,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
         self.view.addGestureRecognizer(recognizer)
     }
     
-    func asyncLayout() -> (_ item: ChatMessageBubbleContentItem, _ width: CGFloat, _ displaySize: CGSize, _ statusType: ChatMessageInteractiveInstantVideoNodeStatusType, _ automaticDownload: Bool) -> (ChatMessageInstantVideoItemLayoutResult, (ChatMessageInstantVideoItemLayoutData, ContainedViewLayoutTransition) -> Void) {
+    func asyncLayout() -> (_ item: ChatMessageBubbleContentItem, _ width: CGFloat, _ displaySize: CGSize, _ maximumDisplaySize: CGSize, _ scaleProgress: CGFloat, _ statusType: ChatMessageInteractiveInstantVideoNodeStatusType, _ automaticDownload: Bool) -> (ChatMessageInstantVideoItemLayoutResult, (ChatMessageInstantVideoItemLayoutData, ContainedViewLayoutTransition) -> Void) {
         let previousFile = self.media
         
         let currentItem = self.item
@@ -137,7 +140,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
         
         let makeDateAndStatusLayout = self.dateAndStatusNode.asyncLayout()
         
-        return { item, width, displaySize, statusDisplayType, automaticDownload in
+        return { item, width, displaySize, maximumDisplaySize, scaleProgress, statusDisplayType, automaticDownload in
             var secretVideoPlaceholderBackgroundImage: UIImage?
             var updatedInfoBackgroundImage: UIImage?
             var updatedMuteIconImage: UIImage?
@@ -162,7 +165,8 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
                 secretVideoPlaceholderBackgroundImage = PresentationResourcesChat.chatInstantVideoBackgroundImage(theme.theme, wallpaper: !theme.wallpaper.isEmpty)
             }
             
-            let imageSize = displaySize
+            let imageSize = maximumDisplaySize
+            let imageScale = displaySize.width / maximumDisplaySize.width
             
             let updatedMessageId = item.message.id != currentItem?.message.id
             
@@ -293,20 +297,24 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
             
             let (dateAndStatusSize, dateAndStatusApply) = makeDateAndStatusLayout(item.context, item.presentationData, edited && !sentViaBot, viewCount, dateText, statusType, CGSize(width: max(1.0, maxDateAndStatusWidth), height: CGFloat.greatestFiniteMagnitude), dateReactions, dateReplies, item.message.tags.contains(.pinned) && !item.associatedData.isInPinnedListMode && !isReplyThread, item.message.isSelfExpiring)
             
-            var contentSize = imageSize
+            var displayVideoFrame = videoFrame
+            displayVideoFrame.size.width *= imageScale
+            displayVideoFrame.size.height *= imageScale
+            
+            var contentSize = displayVideoFrame.size
             var dateAndStatusOverflow = false
-            if case .bubble = statusDisplayType, videoFrame.maxX + dateAndStatusSize.width > width {
+            if case .bubble = statusDisplayType, displayVideoFrame.maxX + dateAndStatusSize.width > width {
                 contentSize.height += dateAndStatusSize.height + 2.0
                 contentSize.width = max(contentSize.width, dateAndStatusSize.width)
                 dateAndStatusOverflow = true
             }
             
-            let result = ChatMessageInstantVideoItemLayoutResult(contentSize: contentSize, overflowLeft: 0.0, overflowRight: dateAndStatusOverflow ? 0.0 : (max(0.0, floor(videoFrame.midX) + 55.0 + dateAndStatusSize.width - videoFrame.width)))
+            let result = ChatMessageInstantVideoItemLayoutResult(contentSize: contentSize, overflowLeft: 0.0, overflowRight: dateAndStatusOverflow ? 0.0 : (max(0.0, floorToScreenPixels(videoFrame.midX) + 55.0 + dateAndStatusSize.width - videoFrame.width)))
             
             return (result, { [weak self] layoutData, transition in
                 if let strongSelf = self {
                     strongSelf.item = item
-                    strongSelf.videoFrame = videoFrame
+                    strongSelf.videoFrame = displayVideoFrame
                     strongSelf.secretProgressIcon = secretProgressIcon
                     strongSelf.automaticDownload = automaticDownload
                     
@@ -326,10 +334,10 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
                     
                     if let infoBackgroundImage = strongSelf.infoBackgroundNode.image, let muteImage = strongSelf.muteIconNode.image {
                         let infoWidth = muteImage.size.width
-                        let infoBackgroundFrame = CGRect(origin: CGPoint(x: floor(videoFrame.minX + (videoFrame.size.width - infoWidth) / 2.0), y: videoFrame.maxY - infoBackgroundImage.size.height - 8.0), size: CGSize(width: infoWidth, height: infoBackgroundImage.size.height))
-                        transition.updateFrame(node: strongSelf.infoBackgroundNode, frame: infoBackgroundFrame)
+                        let infoBackgroundFrame = CGRect(origin: CGPoint(x: floorToScreenPixels(displayVideoFrame.minX + (displayVideoFrame.size.width - infoWidth) / 2.0), y: displayVideoFrame.maxY - infoBackgroundImage.size.height - 8.0), size: CGSize(width: infoWidth, height: infoBackgroundImage.size.height))
+                        strongSelf.infoBackgroundNode.frame = infoBackgroundFrame
                         let muteIconFrame = CGRect(origin: CGPoint(x: infoBackgroundFrame.width - muteImage.size.width, y: 0.0), size: muteImage.size)
-                        transition.updateFrame(node: strongSelf.muteIconNode, frame: muteIconFrame)
+                        strongSelf.muteIconNode.frame = muteIconFrame
                     }
                     
                     if let updatedFile = updatedFile, updatedMedia {
@@ -339,47 +347,70 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
                             strongSelf.fetchedThumbnailDisposable.set(nil)
                         }
                     }
-                    
+                                        
                     dateAndStatusApply(false)
                     switch layoutData {
                         case let .unconstrained(width):
                             let dateAndStatusOrigin: CGPoint
                             if dateAndStatusOverflow {
-                                dateAndStatusOrigin = CGPoint(x: videoFrame.minX - 4.0, y: videoFrame.maxY + 2.0)
+                                dateAndStatusOrigin = CGPoint(x: displayVideoFrame.minX - 4.0, y: displayVideoFrame.maxY + 2.0)
                             } else {
-                                dateAndStatusOrigin = CGPoint(x: min(floor(videoFrame.midX) + 55.0, width - dateAndStatusSize.width - 4.0), y: videoFrame.height - dateAndStatusSize.height)
+                                dateAndStatusOrigin = CGPoint(x: min(floorToScreenPixels(displayVideoFrame.midX) + 55.0 + 25.0 * scaleProgress, width - dateAndStatusSize.width - 4.0), y: displayVideoFrame.height - dateAndStatusSize.height)
                             }
                             strongSelf.dateAndStatusNode.frame = CGRect(origin: dateAndStatusOrigin, size: dateAndStatusSize)
                         case let .constrained(_, right):
-                            strongSelf.dateAndStatusNode.frame = CGRect(origin: CGPoint(x: min(floor(videoFrame.midX) + 55.0, videoFrame.maxX + right - dateAndStatusSize.width - 4.0), y: videoFrame.maxY - dateAndStatusSize.height), size: dateAndStatusSize)
+                            strongSelf.dateAndStatusNode.frame = CGRect(origin: CGPoint(x: min(floorToScreenPixels(displayVideoFrame.midX) + 55.0 + 25.0 * scaleProgress, displayVideoFrame.maxX + right - dateAndStatusSize.width - 4.0), y: displayVideoFrame.maxY - dateAndStatusSize.height), size: dateAndStatusSize)
                     }
-                    
+                                        
                     var updatedPlayerStatusSignal: Signal<MediaPlayerStatus?, NoError>?
                     if let telegramFile = updatedFile {
                         if updatedMedia {
                             let durationTextColor: UIColor
-                            let durationFillColor: UIColor
+                            let durationBlurColor: (UIColor, Bool)?
                             switch statusDisplayType {
                                 case .free:
                                      let serviceColor = serviceMessageColorComponents(theme: theme.theme, wallpaper: theme.wallpaper)
                                     durationTextColor = serviceColor.primaryText
-                                    durationFillColor = serviceColor.fill
+                                    durationBlurColor = (selectDateFillStaticColor(theme: theme.theme, wallpaper: theme.wallpaper), dateFillNeedsBlur(theme: theme.theme, wallpaper: theme.wallpaper))
                                 case .bubble:
-                                    durationFillColor = .clear
+                                    durationBlurColor = nil
                                     if item.message.effectivelyIncoming(item.context.account.peerId) {
                                         durationTextColor = theme.theme.chat.message.incoming.secondaryTextColor
                                     } else {
                                         durationTextColor = theme.theme.chat.message.outgoing.secondaryTextColor
                                     }
                             }
+
+                            if let durationBlurColor = durationBlurColor {
+                                if let durationBackgroundNode = strongSelf.durationBackgroundNode {
+                                    durationBackgroundNode.updateColor(color: durationBlurColor.0, enableBlur: durationBlurColor.1, transition: .immediate)
+                                } else {
+                                    let durationBackgroundNode = NavigationBackgroundNode(color: durationBlurColor.0, enableBlur: durationBlurColor.1)
+                                    strongSelf.durationBackgroundNode = durationBackgroundNode
+                                    strongSelf.addSubnode(durationBackgroundNode)
+                                }
+                            } else if let durationBackgroundNode = strongSelf.durationBackgroundNode {
+                                strongSelf.durationBackgroundNode = nil
+                                durationBackgroundNode.removeFromSupernode()
+                            }
+
                             let durationNode: ChatInstantVideoMessageDurationNode
                             if let current = strongSelf.durationNode {
                                 durationNode = current
-                                current.updateTheme(textColor: durationTextColor, fillColor: durationFillColor)
+                                current.updateTheme(textColor: durationTextColor)
                             } else {
-                                durationNode = ChatInstantVideoMessageDurationNode(textColor: durationTextColor, fillColor: durationFillColor)
+                                durationNode = ChatInstantVideoMessageDurationNode(textColor: durationTextColor)
                                 strongSelf.durationNode = durationNode
                                 strongSelf.addSubnode(durationNode)
+                                durationNode.sizeUpdated = { [weak strongSelf] size in
+                                    guard let strongSelf = strongSelf else {
+                                        return
+                                    }
+                                    if let durationBackgroundNode = strongSelf.durationBackgroundNode, let durationNode = strongSelf.durationNode {
+                                        durationBackgroundNode.frame = CGRect(origin: CGPoint(x: durationNode.frame.maxX - size.width, y: durationNode.frame.minY), size: size)
+                                        durationBackgroundNode.update(size: size, cornerRadius: size.height / 2.0, transition: .immediate)
+                                    }
+                                }
                             }
                             durationNode.defaultDuration = telegramFile.duration.flatMap(Double.init)
                             
@@ -447,17 +478,24 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
                     }
                     
                     if let durationNode = strongSelf.durationNode {
-                        durationNode.frame = CGRect(origin: CGPoint(x: videoFrame.midX - 56.0, y: videoFrame.maxY - 18.0), size: CGSize(width: 1.0, height: 1.0))
+                        durationNode.frame = CGRect(origin: CGPoint(x: displayVideoFrame.midX - 56.0 - 25.0 * scaleProgress, y: displayVideoFrame.maxY - 18.0), size: CGSize(width: 1.0, height: 1.0))
                         durationNode.isSeen = !notConsumed
+                        let size = durationNode.size
+                        if let durationBackgroundNode = strongSelf.durationBackgroundNode, size.width > 1.0 {
+                            durationBackgroundNode.frame = CGRect(origin: CGPoint(x: durationNode.frame.maxX - size.width, y: durationNode.frame.minY), size: size)
+                            durationBackgroundNode.update(size: size, cornerRadius: size.height / 2.0, transition: .immediate)
+                        }
                     }
                     
                     if let videoNode = strongSelf.videoNode {
-                        videoNode.frame = videoFrame
+                        videoNode.bounds = CGRect(origin: CGPoint(), size: videoFrame.size)
+                        videoNode.transform = CATransform3DMakeScale(imageScale, imageScale, 1.0)
+                        videoNode.position = displayVideoFrame.center
                         videoNode.updateLayout(size: arguments.boundingSize, transition: .immediate)
                     }
-                    strongSelf.secretVideoPlaceholderBackground.frame = videoFrame
+                    strongSelf.secretVideoPlaceholderBackground.frame = displayVideoFrame
                     
-                    let placeholderFrame = videoFrame.insetBy(dx: 2.0, dy: 2.0)
+                    let placeholderFrame = displayVideoFrame.insetBy(dx: 2.0, dy: 2.0)
                     strongSelf.secretVideoPlaceholder.frame = placeholderFrame
                     let makeSecretPlaceholderLayout = strongSelf.secretVideoPlaceholder.asyncLayout()
                     let arguments = TransformImageArguments(corners: ImageCorners(radius: placeholderFrame.size.width / 2.0), imageSize: placeholderFrame.size, boundingSize: placeholderFrame.size, intrinsicInsets: UIEdgeInsets())
@@ -570,7 +608,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
             if self.statusNode == nil {
                 let statusNode = RadialStatusNode(backgroundNodeColor: item.presentationData.theme.theme.chat.message.mediaOverlayControlColors.fillColor)
                 self.isUserInteractionEnabled = false
-                statusNode.frame = CGRect(origin: CGPoint(x: videoFrame.origin.x + floor((videoFrame.size.width - 50.0) / 2.0), y: videoFrame.origin.y + floor((videoFrame.size.height - 50.0) / 2.0)), size: CGSize(width: 50.0, height: 50.0))
+                statusNode.frame = CGRect(origin: CGPoint(x: videoFrame.origin.x + floorToScreenPixels((videoFrame.size.width - 50.0) / 2.0), y: videoFrame.origin.y + floorToScreenPixels((videoFrame.size.height - 50.0) / 2.0)), size: CGSize(width: 50.0, height: 50.0))
                 self.statusNode = statusNode
                 self.addSubnode(statusNode)
             }
@@ -642,7 +680,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
             if let current = self.playbackStatusNode {
                 playbackStatusNode = current
             } else {
-                playbackStatusNode = InstantVideoRadialStatusNode(color: UIColor(white: 1.0, alpha: 0.8))
+                playbackStatusNode = InstantVideoRadialStatusNode(color: UIColor(white: 1.0, alpha: 0.6))
                 self.addSubnode(playbackStatusNode)
                 self.playbackStatusNode = playbackStatusNode
             }
@@ -741,7 +779,7 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
                             if item.message.flags.isSending {
                                 let messageId = item.message.id
                                 let _ = item.context.account.postbox.transaction({ transaction -> Void in
-                                    deleteMessages(transaction: transaction, mediaBox: item.context.account.postbox.mediaBox, ids: [messageId])
+                                    item.context.engine.messages.deleteMessages(transaction: transaction, ids: [messageId])
                                 }).start()
                             } else {
                                 messageMediaFileCancelInteractiveFetch(context: item.context, messageId: item.message.id, file: file)
@@ -771,16 +809,16 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
         return nil
     }
 
-    static func asyncLayout(_ node: ChatMessageInteractiveInstantVideoNode?) -> (_ item: ChatMessageBubbleContentItem, _ width: CGFloat, _ displaySize: CGSize, _ statusType: ChatMessageInteractiveInstantVideoNodeStatusType, _ automaticDownload: Bool) -> (ChatMessageInstantVideoItemLayoutResult, (ChatMessageInstantVideoItemLayoutData, ContainedViewLayoutTransition) -> ChatMessageInteractiveInstantVideoNode) {
+    static func asyncLayout(_ node: ChatMessageInteractiveInstantVideoNode?) -> (_ item: ChatMessageBubbleContentItem, _ width: CGFloat, _ displaySize: CGSize, _ maximumDisplaySize: CGSize, _ scaleProgress: CGFloat, _ statusType: ChatMessageInteractiveInstantVideoNodeStatusType, _ automaticDownload: Bool) -> (ChatMessageInstantVideoItemLayoutResult, (ChatMessageInstantVideoItemLayoutData, ContainedViewLayoutTransition) -> ChatMessageInteractiveInstantVideoNode) {
         let makeLayout = node?.asyncLayout()
-        return { item, width, displaySize, statusType, automaticDownload in
+        return { item, width, displaySize, maximumDisplaySize, scaleProgress, statusType, automaticDownload in
             var createdNode: ChatMessageInteractiveInstantVideoNode?
             let sizeAndApplyLayout: (ChatMessageInstantVideoItemLayoutResult, (ChatMessageInstantVideoItemLayoutData, ContainedViewLayoutTransition) -> Void)
             if let makeLayout = makeLayout {
-                sizeAndApplyLayout = makeLayout(item, width, displaySize, statusType, automaticDownload)
+                sizeAndApplyLayout = makeLayout(item, width, displaySize, maximumDisplaySize, scaleProgress, statusType, automaticDownload)
             } else {
                 let node = ChatMessageInteractiveInstantVideoNode()
-                sizeAndApplyLayout = node.asyncLayout()(item, width, displaySize, statusType, automaticDownload)
+                sizeAndApplyLayout = node.asyncLayout()(item, width, displaySize, maximumDisplaySize, scaleProgress, statusType, automaticDownload)
                 createdNode = node
             }
             return (sizeAndApplyLayout.0, { [weak node] layoutData, transition in
@@ -832,5 +870,28 @@ class ChatMessageInteractiveInstantVideoNode: ASDisplayNode {
             return nil
         }
     }
+
+    func animateFromSnapshot(snapshotView: UIView, transition: CombinedTransition) {
+        guard let videoFrame = self.videoFrame else {
+            return
+        }
+
+        let scale = videoFrame.height / snapshotView.frame.height
+        snapshotView.transform = CGAffineTransform(scaleX: scale, y: scale)
+        snapshotView.center = CGPoint(x: videoFrame.midX, y: videoFrame.midY)
+
+        self.view.addSubview(snapshotView)
+
+        transition.horizontal.updateAlpha(layer: snapshotView.layer, alpha: 0.0, completion: { [weak snapshotView] _ in
+            snapshotView?.removeFromSuperview()
+        })
+
+        transition.horizontal.animateTransformScale(node: self, from: 1.0 / scale)
+
+        self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: self.dateAndStatusNode.alpha, duration: 0.15, delay: 0.18)
+        if let durationNode = self.durationNode {
+            durationNode.layer.animateAlpha(from: 0.0, to: durationNode.alpha, duration: 0.15, delay: 0.18)
+        }
+    }
 }
 
diff --git a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift
index 845d91e9e9..37419dec04 100644
--- a/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInteractiveMediaNode.swift
@@ -22,6 +22,7 @@ import TelegramAnimatedStickerNode
 import LocalMediaResources
 import WallpaperResources
 import ChatMessageInteractiveMediaBadge
+import ContextUI
 
 private struct FetchControls {
     let fetch: (Bool) -> Void
@@ -64,9 +65,23 @@ enum InteractiveMediaNodePlayWithSoundMode {
     case loop
 }
 
+struct ChatMessageDateAndStatus {
+    var type: ChatMessageDateAndStatusType
+    var edited: Bool
+    var viewCount: Int?
+    var dateReplies: Int
+    var dateReactions: [MessageReaction]
+    var isPinned: Bool
+    var dateText: String
+}
+
 final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitionNode {
+    private let pinchContainerNode: PinchSourceContainerNode
     private let imageNode: TransformImageNode
     private var currentImageArguments: TransformImageArguments?
+    private var currentHighQualityImageSignal: (Signal<(TransformImageArguments) -> DrawingContext?, NoError>, CGSize)?
+    private var highQualityImageNode: TransformImageNode?
+
     private var videoNode: UniversalVideoNode?
     private var videoContent: NativeVideoContent?
     private var animatedStickerNode: AnimatedStickerNode?
@@ -75,6 +90,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
     var decoration: UniversalVideoDecoration? {
         return self.videoNodeDecoration
     }
+    let dateAndStatusNode: ChatMessageDateAndStatusNode
     private var badgeNode: ChatMessageInteractiveMediaBadge?
     private var tapRecognizer: UITapGestureRecognizer?
     
@@ -134,15 +150,103 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
     }
     
     var activateLocalContent: (InteractiveMediaNodeActivateContent) -> Void = { _ in }
+    var activatePinch: ((PinchSourceContainerNode) -> Void)?
     
     override init() {
+        self.pinchContainerNode = PinchSourceContainerNode()
+
+        self.dateAndStatusNode = ChatMessageDateAndStatusNode()
+
         self.imageNode = TransformImageNode()
         self.imageNode.contentAnimations = [.subsequentUpdates]
         
         super.init()
+
+        self.addSubnode(self.pinchContainerNode)
         
         self.imageNode.displaysAsynchronously = false
-        self.addSubnode(self.imageNode)
+        self.pinchContainerNode.contentNode.addSubnode(self.imageNode)
+
+        self.pinchContainerNode.activate = { [weak self] sourceNode in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.activatePinch?(sourceNode)
+        }
+
+        self.pinchContainerNode.scaleUpdated = { [weak self] scale, transition in
+            guard let strongSelf = self else {
+                return
+            }
+
+            let factor: CGFloat = max(0.0, min(1.0, (scale - 1.0) * 8.0))
+
+            transition.updateAlpha(node: strongSelf.dateAndStatusNode, alpha: 1.0 - factor)
+
+            if abs(scale - 1.0) > CGFloat.ulpOfOne {
+                var highQualityImageNode: TransformImageNode?
+                if let current = strongSelf.highQualityImageNode {
+                    highQualityImageNode = current
+                } else if let (currentHighQualityImageSignal, nativeImageSize) = strongSelf.currentHighQualityImageSignal, let currentImageArguments = strongSelf.currentImageArguments {
+                    let imageNode = TransformImageNode()
+                    imageNode.frame = strongSelf.imageNode.frame
+
+                    let corners = currentImageArguments.corners
+                    if isRoundEqualCorners(corners) {
+                        imageNode.cornerRadius = corners.topLeft.radius
+                        imageNode.layer.mask = nil
+                    } else {
+                        imageNode.cornerRadius = 0
+
+                        let boundingSize: CGSize = CGSize(width: max(corners.topLeft.radius, corners.bottomLeft.radius) + max(corners.topRight.radius, corners.bottomRight.radius), height: max(corners.topLeft.radius, corners.topRight.radius) + max(corners.bottomLeft.radius, corners.bottomRight.radius))
+                        let size: CGSize = CGSize(width: boundingSize.width + corners.extendedEdges.left + corners.extendedEdges.right, height: boundingSize.height + corners.extendedEdges.top + corners.extendedEdges.bottom)
+                        let arguments = TransformImageArguments(corners: corners, imageSize: size, boundingSize: boundingSize, intrinsicInsets: UIEdgeInsets())
+                        let context = DrawingContext(size: size, clear: true)
+                        context.withContext { ctx in
+                            ctx.setFillColor(UIColor.black.cgColor)
+                            ctx.fill(arguments.drawingRect)
+                        }
+                        addCorners(context, arguments: arguments)
+
+                        if let maskImage = context.generateImage() {
+                            let mask = CALayer()
+                            mask.contents = maskImage.cgImage
+                            mask.contentsScale = maskImage.scale
+                            mask.contentsCenter = CGRect(x: max(corners.topLeft.radius, corners.bottomLeft.radius) / maskImage.size.width, y: max(corners.topLeft.radius, corners.topRight.radius) / maskImage.size.height, width: (maskImage.size.width - max(corners.topLeft.radius, corners.bottomLeft.radius) - max(corners.topRight.radius, corners.bottomRight.radius)) / maskImage.size.width, height: (maskImage.size.height - max(corners.topLeft.radius, corners.topRight.radius) - max(corners.bottomLeft.radius, corners.bottomRight.radius)) / maskImage.size.height)
+
+                            imageNode.layer.mask = mask
+                            imageNode.layer.mask?.frame = imageNode.bounds
+                        }
+                    }
+
+                    strongSelf.pinchContainerNode.contentNode.insertSubnode(imageNode, aboveSubnode: strongSelf.imageNode)
+
+                    let scaleFactor = nativeImageSize.height / currentImageArguments.imageSize.height
+
+                    let apply = imageNode.asyncLayout()(TransformImageArguments(corners: ImageCorners(), imageSize: CGSize(width: currentImageArguments.imageSize.width * scaleFactor, height: currentImageArguments.imageSize.height * scaleFactor), boundingSize: CGSize(width: currentImageArguments.boundingSize.width * scaleFactor, height: currentImageArguments.boundingSize.height * scaleFactor), intrinsicInsets: UIEdgeInsets(top: currentImageArguments.intrinsicInsets.top * scaleFactor, left: currentImageArguments.intrinsicInsets.left * scaleFactor, bottom: currentImageArguments.intrinsicInsets.bottom * scaleFactor, right: currentImageArguments.intrinsicInsets.right * scaleFactor)))
+                    let _ = apply()
+                    imageNode.setSignal(currentHighQualityImageSignal, attemptSynchronously: false)
+
+                    highQualityImageNode = imageNode
+                    strongSelf.highQualityImageNode = imageNode
+                }
+                if let highQualityImageNode = highQualityImageNode {
+                    transition.updateAlpha(node: highQualityImageNode, alpha: factor)
+                }
+            } else if let highQualityImageNode = strongSelf.highQualityImageNode {
+                strongSelf.highQualityImageNode = nil
+                transition.updateAlpha(node: highQualityImageNode, alpha: 0.0, completion: { [weak highQualityImageNode] _ in
+                    highQualityImageNode?.removeFromSupernode()
+                })
+            }
+
+            if let badgeNode = strongSelf.badgeNode {
+                transition.updateAlpha(node: badgeNode, alpha: 1.0 - factor)
+            }
+            if let statusNode = strongSelf.statusNode {
+                transition.updateAlpha(node: statusNode, alpha: 1.0 - factor)
+            }
+        }
     }
     
     deinit {
@@ -195,7 +299,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                 case .Fetching:
                     if let context = self.context, let message = self.message, message.flags.isSending {
                        let _ = context.account.postbox.transaction({ transaction -> Void in
-                            deleteMessages(transaction: transaction, mediaBox: context.account.postbox.mediaBox, ids: [message.id])
+                            context.engine.messages.deleteMessages(transaction: transaction, ids: [message.id])
                         }).start()
                     } else if let media = media, let context = self.context, let message = message {
                         if let media = media as? TelegramMediaFile {
@@ -242,10 +346,11 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
         }
     }
     
-    func asyncLayout() -> (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) {
+    func asyncLayout() -> (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void))) {
         let currentMessage = self.message
         let currentMedia = self.media
         let imageLayout = self.imageNode.asyncLayout()
+        let statusLayout = self.dateAndStatusNode.asyncLayout()
         
         let currentVideoNode = self.videoNode
         let currentAnimatedStickerNode = self.animatedStickerNode
@@ -255,7 +360,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
         let currentAutomaticDownload = self.automaticDownload
         let currentAutomaticPlayback = self.automaticPlayback
         
-        return { [weak self] context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in
+        return { [weak self] context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in
             var nativeSize: CGSize
             
             let isSecretMedia = message.containsSecretMedia
@@ -359,6 +464,15 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                 case .unconstrained:
                     nativeSize = unboundSize
             }
+
+            var statusSize = CGSize()
+            var statusApply: ((Bool) -> Void)?
+
+            if let dateAndStatus = dateAndStatus {
+                let (size, apply) = statusLayout(context, presentationData, dateAndStatus.edited, dateAndStatus.viewCount, dateAndStatus.dateText, dateAndStatus.type, CGSize(width: nativeSize.width - 30.0, height: CGFloat.greatestFiniteMagnitude), dateAndStatus.dateReactions, dateAndStatus.dateReplies, dateAndStatus.isPinned, message.isSelfExpiring)
+                statusSize = size
+                statusApply = apply
+            }
             
             let maxWidth: CGFloat
             if isSecretMedia {
@@ -367,7 +481,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                 maxWidth = maxDimensions.width
             }
             if isSecretMedia {
-                let _ = PresentationResourcesChat.chatBubbleSecretMediaIcon(theme)
+                let _ = PresentationResourcesChat.chatBubbleSecretMediaIcon(presentationData.theme.theme)
             }
             
             return (nativeSize, maxWidth, { constrainedSize, automaticPlayback, wideLayout, corners in
@@ -416,7 +530,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             drawingSize = nativeSize.aspectFilled(boundingSize)
                     }
                     
-                    var updateImageSignal: ((Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError>)?
+                    var updateImageSignal: ((Bool, Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError>)?
                     var updatedStatusSignal: Signal<(MediaResourceStatus, MediaResourceStatus?), NoError>?
                     var updatedFetchControls: FetchControls?
                     
@@ -453,16 +567,31 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                     if isSticker {
                         emptyColor = .clear
                     } else {
-                        emptyColor = message.effectivelyIncoming(context.account.peerId) ? theme.chat.message.incoming.mediaPlaceholderColor : theme.chat.message.outgoing.mediaPlaceholderColor
+                        emptyColor = message.effectivelyIncoming(context.account.peerId) ? presentationData.theme.theme.chat.message.incoming.mediaPlaceholderColor : presentationData.theme.theme.chat.message.outgoing.mediaPlaceholderColor
                     }
                     if let wallpaper = media as? WallpaperPreviewMedia {
-                        if case let .file(_, patternColor, patternBottomColor, rotation, _, _) = wallpaper.content {
+                        if case let .file(_, patternColors, rotation, intensity, _, _) = wallpaper.content {
                             var colors: [UIColor] = []
-                            colors.append(patternColor ?? UIColor(rgb: 0xd6e2ee, alpha: 0.5))
-                            if let patternBottomColor = patternBottomColor {
-                                colors.append(patternBottomColor)
+                            var customPatternColor: UIColor? = nil
+                            var bakePatternAlpha: CGFloat = 1.0
+                            if let intensity = intensity, intensity < 0 {
+                                if patternColors.isEmpty {
+                                    colors.append(UIColor(rgb: 0xd6e2ee, alpha: 0.5))
+                                } else {
+                                    colors.append(contentsOf: patternColors.map(UIColor.init(rgb:)))
+                                }
+                                customPatternColor = UIColor(white: 0.0, alpha: 1.0 - CGFloat(abs(intensity)))
+                            } else {
+                                if patternColors.isEmpty {
+                                    colors.append(UIColor(rgb: 0xd6e2ee, alpha: 0.5))
+                                } else {
+                                    colors.append(contentsOf: patternColors.map(UIColor.init(rgb:)))
+                                }
+                                let isLight = UIColor.average(of: patternColors.map(UIColor.init(rgb:))).hsb.b > 0.3
+                                customPatternColor = isLight ? .black : .white
+                                bakePatternAlpha = CGFloat(intensity ?? 50) / 100.0
                             }
-                            patternArguments = PatternWallpaperArguments(colors: colors, rotation: rotation)
+                            patternArguments = PatternWallpaperArguments(colors: colors, rotation: rotation, customPatternColor: customPatternColor, bakePatternAlpha: bakePatternAlpha)
                         }
                     }
                     
@@ -475,12 +604,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                 replaceAnimatedStickerNode = true
                             }
                             if isSecretMedia {
-                                updateImageSignal = { synchronousLoad in
+                                updateImageSignal = { synchronousLoad, _ in
                                     return chatSecretPhoto(account: context.account, photoReference: .message(message: MessageReference(message), media: image))
                                 }
                             } else {
-                                updateImageSignal = { synchronousLoad in
-                                    return chatMessagePhoto(postbox: context.account.postbox, photoReference: .message(message: MessageReference(message), media: image), synchronousLoad: synchronousLoad)
+                                updateImageSignal = { synchronousLoad, highQuality in
+                                    return chatMessagePhoto(postbox: context.account.postbox, photoReference: .message(message: MessageReference(message), media: image), synchronousLoad: synchronousLoad, highQuality: highQuality)
                                 }
                             }
                             
@@ -505,7 +634,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             if hasCurrentAnimatedStickerNode {
                                 replaceAnimatedStickerNode = true
                             }
-                            updateImageSignal = { synchronousLoad in
+                            updateImageSignal = { synchronousLoad, _ in
                                 return chatWebFileImage(account: context.account, file: image)
                             }
                             
@@ -518,22 +647,22 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             })
                         } else if let file = media as? TelegramMediaFile {
                             if isSecretMedia {
-                                updateImageSignal = { synchronousLoad in
+                                updateImageSignal = { synchronousLoad, _ in
                                     return chatSecretMessageVideo(account: context.account, videoReference: .message(message: MessageReference(message), media: file))
                                 }
                             } else {
                                 if file.isAnimatedSticker {
                                     let dimensions = file.dimensions ?? PixelDimensions(width: 512, height: 512)
-                                    updateImageSignal = { synchronousLoad in
+                                    updateImageSignal = { synchronousLoad, _ in
                                         return chatMessageAnimatedSticker(postbox: context.account.postbox, file: file, small: false, size: dimensions.cgSize.aspectFitted(CGSize(width: 400.0, height: 400.0)))
                                     }
                                 } else if file.isSticker {
-                                    updateImageSignal = { synchronousLoad in
+                                    updateImageSignal = { synchronousLoad, _ in
                                         return chatMessageSticker(account: context.account, file: file, small: false)
                                     }
                                 } else {
                                     onlyFullSizeVideoThumbnail = isSendingUpdated
-                                    updateImageSignal = { synchronousLoad in
+                                    updateImageSignal = { synchronousLoad, _ in
                                         return mediaGridMessageVideo(postbox: context.account.postbox, videoReference: .message(message: MessageReference(message), media: file), onlyFullSize: currentMedia?.id?.namespace == Namespaces.Media.LocalFile, autoFetchFullSizeThumbnail: true)
                                     }
                                 }
@@ -598,7 +727,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                 }
                             })
                         } else if let wallpaper = media as? WallpaperPreviewMedia {
-                            updateImageSignal = { synchronousLoad in
+                            updateImageSignal = { synchronousLoad, _ in
                                 switch wallpaper.content {
                                     case let .file(file, _, _, _, isTheme, _):
                                         if isTheme {
@@ -606,10 +735,17 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                         } else {
                                             var representations: [ImageRepresentationWithReference] = file.previewRepresentations.map({ ImageRepresentationWithReference(representation: $0, reference: AnyMediaReference.message(message: MessageReference(message), media: file).resourceReference($0.resource)) })
                                             if file.mimeType == "image/svg+xml" || file.mimeType == "application/x-tgwallpattern" {
-                                                representations.append(ImageRepresentationWithReference(representation: .init(dimensions: PixelDimensions(width: 1440, height: 2960), resource: file.resource, progressiveSizes: []), reference: AnyMediaReference.message(message: MessageReference(message), media: file).resourceReference(file.resource)))
+                                                representations.append(ImageRepresentationWithReference(representation: .init(dimensions: PixelDimensions(width: 1440, height: 2960), resource: file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: AnyMediaReference.message(message: MessageReference(message), media: file).resourceReference(file.resource)))
                                             }
                                             if ["image/png", "image/svg+xml", "application/x-tgwallpattern"].contains(file.mimeType) {
-                                                return patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: representations, mode: .thumbnail)
+                                                return patternWallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, representations: representations, mode: .screen)
+                                                |> mapToSignal { value -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> in
+                                                    if let value = value {
+                                                        return .single(value)
+                                                    } else {
+                                                        return .complete()
+                                                    }
+                                                }
                                             } else {
                                                 return wallpaperImage(account: context.account, accountManager: context.sharedContext.accountManager, fileReference: FileMediaReference.message(message: MessageReference(message), media: file), representations: representations, alwaysShowThumbnailFirst: false, thumbnail: true, autoFetchFullSize: true)
                                             }
@@ -618,8 +754,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                         return themeImage(account: context.account, accountManager: context.sharedContext.accountManager, source: .settings(settings))
                                     case let .color(color):
                                         return solidColorImage(color)
-                                    case let .gradient(topColor, bottomColor, rotation):
-                                        return gradientImage([topColor, bottomColor], rotation: rotation ?? 0)
+                                    case let .gradient(colors, rotation):
+                                        return gradientImage(colors.map(UIColor.init(rgb:)), rotation: rotation ?? 0)
                                 }
                             }
                             
@@ -692,27 +828,52 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             strongSelf.attributes = attributes
                             strongSelf.media = media
                             strongSelf.wideLayout = wideLayout
-                            strongSelf.themeAndStrings = (theme, strings, dateTimeFormat.decimalSeparator)
+                            strongSelf.themeAndStrings = (presentationData.theme.theme, presentationData.strings, dateTimeFormat.decimalSeparator)
                             strongSelf.sizeCalculation = sizeCalculation
                             strongSelf.automaticPlayback = automaticPlayback
                             strongSelf.automaticDownload = automaticDownload
                             
                             if let previousArguments = strongSelf.currentImageArguments {
                                 if previousArguments.imageSize == arguments.imageSize {
-                                    strongSelf.imageNode.frame = imageFrame
+                                    strongSelf.pinchContainerNode.frame = imageFrame
+                                    strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: .immediate)
+                                    strongSelf.imageNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size)
                                 } else {
-                                    transition.updateFrame(node: strongSelf.imageNode, frame: imageFrame)
+                                    transition.updateFrame(node: strongSelf.pinchContainerNode, frame: imageFrame)
+                                    transition.updateFrame(node: strongSelf.imageNode, frame: CGRect(origin: CGPoint(), size: imageFrame.size))
+                                    strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: transition)
+                                    
                                 }
                             } else {
-                                strongSelf.imageNode.frame = imageFrame
+                                strongSelf.pinchContainerNode.frame = imageFrame
+                                strongSelf.pinchContainerNode.update(size: imageFrame.size, transition: .immediate)
+                                strongSelf.imageNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size)
                             }
                             strongSelf.currentImageArguments = arguments
                             imageApply()
+
+                            if let statusApply = statusApply {
+                                if strongSelf.dateAndStatusNode.supernode == nil {
+                                    strongSelf.pinchContainerNode.contentNode.addSubnode(strongSelf.dateAndStatusNode)
+                                }
+                                var hasAnimation = true
+                                if transition.isAnimated {
+                                    hasAnimation = false
+                                }
+                                statusApply(hasAnimation)
+
+                                let dateAndStatusFrame = CGRect(origin: CGPoint(x: imageFrame.width - layoutConstants.image.statusInsets.right - statusSize.width, y: imageFrame.height - layoutConstants.image.statusInsets.bottom - statusSize.height), size: statusSize)
+
+                                strongSelf.dateAndStatusNode.frame = dateAndStatusFrame
+                                strongSelf.dateAndStatusNode.bounds = CGRect(origin: CGPoint(), size: dateAndStatusFrame.size)
+                            } else if strongSelf.dateAndStatusNode.supernode != nil {
+                                strongSelf.dateAndStatusNode.removeFromSupernode()
+                            }
                             
                             if let statusNode = strongSelf.statusNode {
                                 var statusFrame = statusNode.frame
-                                statusFrame.origin.x = floor(imageFrame.midX - statusFrame.width / 2.0)
-                                statusFrame.origin.y = floor(imageFrame.midY - statusFrame.height / 2.0)
+                                statusFrame.origin.x = floor(imageFrame.width / 2.0 - statusFrame.width / 2.0)
+                                statusFrame.origin.y = floor(imageFrame.height / 2.0 - statusFrame.height / 2.0)
                                 statusNode.frame = statusFrame
                             }
                             
@@ -776,7 +937,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                     let dimensions = updatedAnimatedStickerFile.dimensions ?? PixelDimensions(width: 512, height: 512)
                                     let fittedDimensions = dimensions.cgSize.aspectFitted(CGSize(width: 384.0, height: 384.0))
                                     animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: context.account, resource: updatedAnimatedStickerFile.resource), width: Int(fittedDimensions.width), height: Int(fittedDimensions.height), mode: .cached)
-                                    strongSelf.insertSubnode(animatedStickerNode, aboveSubnode: strongSelf.imageNode)
+                                    strongSelf.pinchContainerNode.contentNode.insertSubnode(animatedStickerNode, aboveSubnode: strongSelf.imageNode)
                                     animatedStickerNode.visibility = strongSelf.visibility
                                 }
                             }
@@ -787,7 +948,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                 }
                                 
                                 videoNode.updateLayout(size: arguments.drawingSize, transition: .immediate)
-                                videoNode.frame = imageFrame
+                                videoNode.frame = CGRect(origin: CGPoint(), size: imageFrame.size)
                                 
                                 if strongSelf.visibility {
                                     if !videoNode.canAttachContent {
@@ -807,7 +968,20 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             }
                             
                             if let updateImageSignal = updateImageSignal {
-                                strongSelf.imageNode.setSignal(updateImageSignal(synchronousLoads), attemptSynchronously: synchronousLoads)
+                                strongSelf.imageNode.setSignal(updateImageSignal(synchronousLoads, false), attemptSynchronously: synchronousLoads)
+
+                                var imageDimensions: CGSize?
+                                if let image = media as? TelegramMediaImage, let dimensions = largestImageRepresentation(image.representations)?.dimensions {
+                                    imageDimensions = dimensions.cgSize
+                                } else if let file = media as? TelegramMediaFile, let dimensions = file.dimensions {
+                                    imageDimensions = dimensions.cgSize
+                                } else if let image = media as? TelegramMediaWebFile, let dimensions = image.dimensions {
+                                    imageDimensions = dimensions.cgSize
+                                }
+
+                                if let imageDimensions = imageDimensions {
+                                    strongSelf.currentHighQualityImageSignal = (updateImageSignal(false, true), imageDimensions)
+                                }
                             }
                             
                             if let _ = secretBeginTimeAndTimeout {
@@ -837,7 +1011,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                 |> deliverOnMainQueue).start(next: { [weak strongSelf] status in
                                     displayLinkDispatcher.dispatch {
                                         if let strongSelf = strongSelf, let videoNode = strongSelf.videoNode {
-                                            strongSelf.insertSubnode(videoNode, aboveSubnode: strongSelf.imageNode)
+                                            strongSelf.pinchContainerNode.contentNode.insertSubnode(videoNode, aboveSubnode: strongSelf.imageNode)
                                         }
                                     }
                                 }))
@@ -898,6 +1072,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             }
                             
                             strongSelf.updateStatus(animated: synchronousLoads)
+
+                            strongSelf.pinchContainerNode.isPinchGestureEnabled = !isSecretMedia
                         }
                     })
                 })
@@ -997,10 +1173,10 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
         if progressRequired {
             if self.statusNode == nil {
                 let statusNode = RadialStatusNode(backgroundNodeColor: theme.chat.message.mediaOverlayControlColors.fillColor)
-                let imagePosition = self.imageNode.position
-                statusNode.frame = CGRect(origin: CGPoint(x: floor(imagePosition.x - radialStatusSize / 2.0), y: floor(imagePosition.y - radialStatusSize / 2.0)), size: CGSize(width: radialStatusSize, height: radialStatusSize))
+                let imageSize = self.imageNode.bounds.size
+                statusNode.frame = CGRect(origin: CGPoint(x: floor(imageSize.width / 2.0 - radialStatusSize / 2.0), y: floor(imageSize.height / 2.0 - radialStatusSize / 2.0)), size: CGSize(width: radialStatusSize, height: radialStatusSize))
                 self.statusNode = statusNode
-                self.addSubnode(statusNode)
+                self.pinchContainerNode.contentNode.addSubnode(statusNode)
             }
         } else {
             if let statusNode = self.statusNode {
@@ -1077,6 +1253,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
             
             let gifTitle = game != nil ? strings.Message_Game.uppercased() : strings.Message_Animation.uppercased()
             
+            let formatting = DataSizeStringFormatting(strings: strings, decimalSeparator: decimalSeparator)
+            
             switch fetchStatus {
                 case let .Fetching(_, progress):
                     let adjustedProgress = max(progress, 0.027)
@@ -1093,11 +1271,8 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                     if let file = self.media as? TelegramMediaFile {
                         if wideLayout {
                             if let size = file.size {
-                                 let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: decimalSeparator)) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: decimalSeparator))"
-                                if file.isAnimated {
-                                    badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: "\(gifTitle)", size: nil, muted: false, active: false)
-                                }
-                                else if let duration = file.duration, !message.flags.contains(.Unsent) {
+                                 let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: formatting)) / \(dataSizeString(size, forceDecimal: true, formatting: formatting))"
+                                if let duration = file.duration, !message.flags.contains(.Unsent) {
                                     let durationString = file.isAnimated ? gifTitle : stringForDuration(playerDuration > 0 ? playerDuration : duration, position: playerPosition)
                                     if isMediaStreamable(message: message, media: file) {
                                         badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: durationString, size: active ? sizeString : nil, muted: muted, active: active)
@@ -1116,7 +1291,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                         state = automaticPlayback ? .none : state
                                     }
                                 } else {
-                                    badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: decimalSeparator)) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: decimalSeparator))", size: nil, muted: false, active: false)
+                                    badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: formatting)) / \(dataSizeString(size, forceDecimal: true, formatting: formatting))", size: nil, muted: false, active: false)
                                 }
                             } else if let _ = file.duration {
                                 if file.isAnimated {
@@ -1130,7 +1305,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                             }
                         } else {
                             if isMediaStreamable(message: message, media: file), let size = file.size {
-                                let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: decimalSeparator)) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: decimalSeparator))"
+                                let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: formatting)) / \(dataSizeString(size, forceDecimal: true, formatting: formatting))"
                                 
                                 if message.flags.contains(.Unsent), let duration = file.duration {
                                     let durationString = stringForDuration(playerDuration > 0 ? playerDuration : duration, position: playerPosition)
@@ -1158,7 +1333,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                                     let durationString = stringForDuration(playerDuration > 0 ? playerDuration : duration, position: playerPosition)
                                     
                                     if automaticPlayback, let size = file.size {
-                                        let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, decimalSeparator: decimalSeparator)) / \(dataSizeString(size, forceDecimal: true, decimalSeparator: decimalSeparator))"
+                                        let sizeString = "\(dataSizeString(Int(Float(size) * progress), forceDecimal: true, formatting: formatting)) / \(dataSizeString(size, forceDecimal: true, formatting: formatting))"
                                         mediaDownloadState = .fetching(progress: progress)
                                         badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: durationString, size: active ? sizeString : nil, muted: muted, active: active)
                                     } else {
@@ -1205,15 +1380,15 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                 case .Remote:
                     state = .download(messageTheme.mediaOverlayControlColors.foregroundColor)
                     if let file = self.media as? TelegramMediaFile {
-                        if file.isAnimated && (!automaticDownload || !automaticPlayback) {
-                            let string = "\(gifTitle) " + dataSizeString(file.size ?? 0, decimalSeparator: decimalSeparator)
+                        if false, file.isAnimated && (!automaticDownload || !automaticPlayback) {
+                            let string = "\(gifTitle) " + dataSizeString(file.size ?? 0, formatting: formatting)
                             badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: string, size: nil, muted: false, active: false)
                         } else {
                             let durationString = file.isAnimated ? gifTitle : stringForDuration(playerDuration > 0 ? playerDuration : (file.duration ?? 0), position: playerPosition)
                             if wideLayout {
                                 if isMediaStreamable(message: message, media: file) {
                                     state = automaticPlayback ? .none : .play(messageTheme.mediaOverlayControlColors.foregroundColor)
-                                    badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: durationString, size: dataSizeString(file.size ?? 0, decimalSeparator: decimalSeparator), muted: muted, active: true)
+                                    badgeContent = .mediaDownload(backgroundColor: messageTheme.mediaDateAndStatusFillColor, foregroundColor: messageTheme.mediaDateAndStatusTextColor, duration: durationString, size: dataSizeString(file.size ?? 0, formatting: formatting), muted: muted, active: true)
                                     mediaDownloadState = .remote
                                 } else {
                                     state = automaticPlayback ? .none : state
@@ -1276,7 +1451,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                     }
                 }
                 self.badgeNode = badgeNode
-                self.addSubnode(badgeNode)
+                self.pinchContainerNode.contentNode.addSubnode(badgeNode)
                 
                 animated = false
             }
@@ -1301,12 +1476,12 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
         }
     }
     
-    static func asyncLayout(_ node: ChatMessageInteractiveMediaNode?) -> (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> ChatMessageInteractiveMediaNode))) {
+    static func asyncLayout(_ node: ChatMessageInteractiveMediaNode?) -> (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> ChatMessageInteractiveMediaNode))) {
         let currentAsyncLayout = node?.asyncLayout()
         
-        return { context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in
+        return { context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode in
             var imageNode: ChatMessageInteractiveMediaNode
-            var imageLayout: (_ context: AccountContext, _ theme: PresentationTheme, _ strings: PresentationStrings, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void)))
+            var imageLayout: (_ context: AccountContext, _ presentationData: ChatPresentationData, _ dateTimeFormat: PresentationDateTimeFormat, _ message: Message, _ attributes: ChatMessageEntryAttributes, _ media: Media, _ dateAndStatus: ChatMessageDateAndStatus?, _ automaticDownload: InteractiveMediaNodeAutodownloadMode, _ peerType: MediaAutoDownloadPeerType, _ sizeCalculation: InteractiveMediaNodeSizeCalculation, _ layoutConstants: ChatMessageItemLayoutConstants, _ contentMode: InteractiveMediaNodeContentMode) -> (CGSize, CGFloat, (CGSize, Bool, Bool, ImageCorners) -> (CGFloat, (CGFloat) -> (CGSize, (ContainedViewLayoutTransition, Bool) -> Void)))
             
             if let node = node, let currentAsyncLayout = currentAsyncLayout {
                 imageNode = node
@@ -1316,7 +1491,7 @@ final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTransitio
                 imageLayout = imageNode.asyncLayout()
             }
             
-            let (unboundSize, initialWidth, continueLayout) = imageLayout(context, theme, strings, dateTimeFormat, message, attributes, media, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode)
+            let (unboundSize, initialWidth, continueLayout) = imageLayout(context, presentationData, dateTimeFormat, message, attributes, media, dateAndStatus, automaticDownload, peerType, sizeCalculation, layoutConstants, contentMode)
             
             return (unboundSize, initialWidth, { constrainedSize, automaticPlayback, wideLayout, corners in
                 let (finalWidth, finalLayout) = continueLayout(constrainedSize, automaticPlayback, wideLayout, corners)
diff --git a/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift
index c30749172b..b38c677bcc 100644
--- a/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageInvoiceBubbleContentNode.swift
@@ -38,7 +38,7 @@ final class ChatMessageInvoiceBubbleContentNode: ChatMessageBubbleContentNode {
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var invoice: TelegramMediaInvoice?
             for media in item.message.media {
                 if let media = media as? TelegramMediaInvoice {
@@ -74,7 +74,7 @@ final class ChatMessageInvoiceBubbleContentNode: ChatMessageBubbleContentNode {
                 }
             }
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, automaticDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, nil, mediaAndFlags, nil, nil, nil, false, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, automaticDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, nil, mediaAndFlags, nil, nil, nil, false, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatMessageItem.swift b/submodules/TelegramUI/Sources/ChatMessageItem.swift
index d699fd11a9..897e312c27 100644
--- a/submodules/TelegramUI/Sources/ChatMessageItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageItem.swift
@@ -192,9 +192,8 @@ func chatItemsHaveCommonDateHeader(_ lhs: ListViewItem, _ rhs: ListViewItem?)  -
     let lhsHeader: ChatMessageDateHeader?
     let rhsHeader: ChatMessageDateHeader?
     if let lhs = lhs as? ChatMessageItem {
-        lhsHeader = lhs.header
+        lhsHeader = lhs.dateHeader
     } else if let _ = lhs as? ChatHoleItem {
-        //lhsHeader = lhs.header
         lhsHeader = nil
     } else if let lhs = lhs as? ChatUnreadItem {
         lhsHeader = lhs.header
@@ -205,7 +204,7 @@ func chatItemsHaveCommonDateHeader(_ lhs: ListViewItem, _ rhs: ListViewItem?)  -
     }
     if let rhs = rhs {
         if let rhs = rhs as? ChatMessageItem {
-            rhsHeader = rhs.header
+            rhsHeader = rhs.dateHeader
         } else if let _ = rhs as? ChatHoleItem {
             //rhsHeader = rhs.header
             rhsHeader = nil
@@ -257,8 +256,11 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
     let effectiveAuthorId: PeerId?
     let additionalContent: ChatMessageItemAdditionalContent?
     
-    public let accessoryItem: ListViewAccessoryItem?
-    let header: ChatMessageDateHeader
+    //public let accessoryItem: ListViewAccessoryItem?
+    let dateHeader: ChatMessageDateHeader
+    let avatarHeader: ChatMessageAvatarHeader?
+
+    let headers: [ListViewItemHeader]
     
     var message: Message {
         switch self.content {
@@ -288,7 +290,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
         self.disableDate = disableDate
         self.additionalContent = additionalContent
         
-        var accessoryItem: ListViewAccessoryItem?
+        var avatarHeader: ChatMessageAvatarHeader?
         let incoming = content.effectivelyIncoming(self.context.account.peerId)
         
         var effectiveAuthor: Peer?
@@ -302,7 +304,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
                 if let forwardInfo = content.firstMessage.forwardInfo {
                     effectiveAuthor = forwardInfo.author
                     if effectiveAuthor == nil, let authorSignature = forwardInfo.authorSignature  {
-                        effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: Int32(clamping: authorSignature.persistentHashValue)), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
+                        effectiveAuthor = TelegramUser(id: PeerId(namespace: Namespaces.Peer.Empty, id: PeerId.Id._internalFromInt32Value(Int32(clamping: authorSignature.persistentHashValue))), accessHash: nil, firstName: authorSignature, lastName: nil, username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: UserInfoFlags())
                     }
                 }
                 displayAuthorInfo = incoming && effectiveAuthor != nil
@@ -325,7 +327,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
             isScheduledMessages = true
         }
         
-        self.header = ChatMessageDateHeader(timestamp: content.index.timestamp, scheduled: isScheduledMessages, presentationData: presentationData, context: context, action: { timestamp in
+        self.dateHeader = ChatMessageDateHeader(timestamp: content.index.timestamp, scheduled: isScheduledMessages, presentationData: presentationData, context: context, action: { timestamp in
             var calendar = NSCalendar.current
             calendar.timeZone = TimeZone(abbreviation: "UTC")!
             let date = Date(timeIntervalSince1970: TimeInterval(timestamp))
@@ -355,11 +357,18 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
             }
             if !hasActionMedia && !isBroadcastChannel {
                 if let effectiveAuthor = effectiveAuthor {
-                    accessoryItem = ChatMessageAvatarAccessoryItem(context: context, peerId: effectiveAuthor.id, peer: effectiveAuthor, messageReference: MessageReference(message), messageTimestamp: content.index.timestamp, forwardInfo: message.forwardInfo, emptyColor: presentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper.fill, controllerInteraction: controllerInteraction)
+                    //accessoryItem = ChatMessageAvatarAccessoryItem(context: context, peerId: effectiveAuthor.id, peer: effectiveAuthor, messageReference: MessageReference(message), messageTimestamp: content.index.timestamp, forwardInfo: message.forwardInfo, emptyColor: presentationData.theme.theme.chat.message.incoming.bubble.withoutWallpaper.fill, controllerInteraction: controllerInteraction)
+                    avatarHeader = ChatMessageAvatarHeader(timestamp: content.index.timestamp, peerId: effectiveAuthor.id, peer: effectiveAuthor, messageReference: MessageReference(message), presentationData: presentationData, context: context, controllerInteraction: controllerInteraction)
                 }
             }
         }
-        self.accessoryItem = accessoryItem
+        self.avatarHeader = avatarHeader
+
+        var headers: [ListViewItemHeader] = [self.dateHeader]
+        if let avatarHeader = self.avatarHeader {
+            headers.append(avatarHeader)
+        }
+        self.headers = headers
     }
     
     public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
@@ -434,7 +443,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
         
         let configure = {
             let node = (viewClassName as! ChatMessageItemView.Type).init()
-            node.setupItem(self)
+            node.setupItem(self, synchronousLoad: synchronousLoads)
             
             let nodeLayout = node.asyncLayout()
             let (top, bottom, dateAtBottom) = self.mergedWithItems(top: previousItem, bottom: nextItem)
@@ -467,25 +476,25 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
         var mergedBottom: ChatMessageMerge = .none
         var dateAtBottom = false
         if let top = top as? ChatMessageItem {
-            if top.header.id != self.header.id {
+            if top.dateHeader.id != self.dateHeader.id {
                 mergedBottom = .none
             } else {
                 mergedBottom = messagesShouldBeMerged(accountPeerId: self.context.account.peerId, message, top.message)
             }
         }
         if let bottom = bottom as? ChatMessageItem {
-            if bottom.header.id != self.header.id {
+            if bottom.dateHeader.id != self.dateHeader.id {
                 mergedTop = .none
                 dateAtBottom = true
             } else {
                 mergedTop = messagesShouldBeMerged(accountPeerId: self.context.account.peerId, bottom.message, message)
             }
         } else if let bottom = bottom as? ChatUnreadItem {
-            if bottom.header.id != self.header.id {
+            if bottom.header.id != self.dateHeader.id {
                 dateAtBottom = true
             }
         } else if let bottom = bottom as? ChatReplyCountItem {
-            if bottom.header.id != self.header.id {
+            if bottom.header.id != self.dateHeader.id {
                 dateAtBottom = true
             }
         } else if let _ = bottom as? ChatHoleItem {
@@ -500,7 +509,7 @@ public final class ChatMessageItem: ListViewItem, CustomStringConvertible {
     public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
         Queue.mainQueue().async {
             if let nodeValue = node() as? ChatMessageItemView {
-                nodeValue.setupItem(self)
+                nodeValue.setupItem(self, synchronousLoad: false)
                 
                 let nodeLayout = nodeValue.asyncLayout()
                 
diff --git a/submodules/TelegramUI/Sources/ChatMessageItemView.swift b/submodules/TelegramUI/Sources/ChatMessageItemView.swift
index d4a3177ae2..c335e2e79a 100644
--- a/submodules/TelegramUI/Sources/ChatMessageItemView.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageItemView.swift
@@ -207,7 +207,7 @@ final class ChatMessageAccessibilityData {
             if let chatPeer = message.peers[item.message.id.peerId] {
                 let authorName = message.author?.displayTitle(strings: item.presentationData.strings, displayOrder: item.presentationData.nameDisplayOrder)
                 
-                let (_, _, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, messages: [message], chatPeer: RenderedPeer(peer: chatPeer), accountPeerId: item.context.account.peerId)
+                let (_, _, messageText) = chatListItemStrings(strings: item.presentationData.strings, nameDisplayOrder: item.presentationData.nameDisplayOrder, dateTimeFormat: item.presentationData.dateTimeFormat, messages: [message], chatPeer: RenderedPeer(peer: chatPeer), accountPeerId: item.context.account.peerId)
                 
                 var text = messageText
                 
@@ -705,7 +705,7 @@ public class ChatMessageItemView: ListViewItemNode {
         self.frame = CGRect()
     }
     
-    func setupItem(_ item: ChatMessageItem) {
+    func setupItem(_ item: ChatMessageItem, synchronousLoad: Bool) {
         self.item = item
     }
     
@@ -729,6 +729,9 @@ public class ChatMessageItemView: ListViewItemNode {
             avatarNode.frame = CGRect(origin: CGPoint(x: leftInset + 3.0, y: self.apparentFrame.height - 38.0 - self.insets.top - 2.0 - UIScreenPixel), size: CGSize(width: 38.0, height: 38.0))
         }
     }
+
+    func cancelInsertionAnimations() {
+    }
     
     override public func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         if short {
@@ -798,9 +801,9 @@ public class ChatMessageItemView: ListViewItemNode {
         return nil
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.headers
         } else {
             return nil
         }
diff --git a/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift
index 9a6d8bd125..d564507543 100644
--- a/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageMediaBubbleContentNode.swift
@@ -17,7 +17,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
     }
     
     private let interactiveImageNode: ChatMessageInteractiveMediaNode
-    private let dateAndStatusNode: ChatMessageDateAndStatusNode
     private var selectionNode: GridMessageSelectionNode?
     private var highlightedState: Bool = false
     
@@ -32,7 +31,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
     
     required init() {
         self.interactiveImageNode = ChatMessageInteractiveMediaNode()
-        self.dateAndStatusNode = ChatMessageDateAndStatusNode()
         
         super.init()
         
@@ -54,6 +52,13 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                 }
             }
         }
+
+        self.interactiveImageNode.activatePinch = { [weak self] sourceNode in
+            guard let strongSelf = self, let _ = strongSelf.item else {
+                return
+            }
+            strongSelf.item?.controllerInteraction.activateMessagePinch(sourceNode)
+        }
     }
     
     required init?(coder aDecoder: NSCoder) {
@@ -62,7 +67,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
     
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let interactiveImageLayout = self.interactiveImageNode.asyncLayout()
-        let statusLayout = self.dateAndStatusNode.asyncLayout()
         
         return { item, layoutConstants, preparePosition, selection, constrainedSize in
             var selectedMedia: Media?
@@ -142,8 +146,81 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                     bubbleInsets = UIEdgeInsets()
                     sizeCalculation = .unconstrained
             }
+
+            var edited = false
+            if item.attributes.updatingMedia != nil {
+                edited = true
+            }
+            var viewCount: Int?
+            var dateReplies = 0
+            for attribute in item.message.attributes {
+                if let attribute = attribute as? EditedMessageAttribute {
+                    if case .mosaic = preparePosition {
+                    } else {
+                        edited = !attribute.isHidden
+                    }
+                } else if let attribute = attribute as? ViewCountMessageAttribute {
+                    viewCount = attribute.count
+                } else if let attribute = attribute as? ReplyThreadMessageAttribute, case .peer = item.chatLocation {
+                    if let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, case .group = channel.info {
+                        dateReplies = Int(attribute.count)
+                    }
+                }
+            }
+
+            var dateReactions: [MessageReaction] = []
+            var dateReactionCount = 0
+            if let reactionsAttribute = mergedMessageReactions(attributes: item.message.attributes), !reactionsAttribute.reactions.isEmpty {
+                for reaction in reactionsAttribute.reactions {
+                    if reaction.isSelected {
+                        dateReactions.insert(reaction, at: 0)
+                    } else {
+                        dateReactions.append(reaction)
+                    }
+                    dateReactionCount += Int(reaction.count)
+                }
+            }
+
+            let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, reactionCount: dateReactionCount)
+
+            let statusType: ChatMessageDateAndStatusType?
+            switch preparePosition {
+                case .linear(_, .None), .linear(_, .Neighbour(true, _, _)):
+                    if item.message.effectivelyIncoming(item.context.account.peerId) {
+                        statusType = .ImageIncoming
+                    } else {
+                        if item.message.flags.contains(.Failed) {
+                            statusType = .ImageOutgoing(.Failed)
+                        } else if (item.message.flags.isSending && !item.message.isSentOrAcknowledged) || item.attributes.updatingMedia != nil {
+                            statusType = .ImageOutgoing(.Sending)
+                        } else {
+                            statusType = .ImageOutgoing(.Sent(read: item.read))
+                        }
+                    }
+                case .mosaic:
+                    statusType = nil
+                default:
+                    statusType = nil
+            }
+
+            var isReplyThread = false
+            if case .replyThread = item.chatLocation {
+                isReplyThread = true
+            }
+
+            let dateAndStatus = statusType.flatMap { statusType -> ChatMessageDateAndStatus in
+                ChatMessageDateAndStatus(
+                    type: statusType,
+                    edited: edited,
+                    viewCount: viewCount,
+                    dateReplies: dateReplies,
+                    dateReactions: dateReactions,
+                    isPinned: item.message.tags.contains(.pinned) && !item.associatedData.isInPinnedListMode && !isReplyThread,
+                    dateText: dateText
+                )
+            }
             
-            let (unboundSize, initialWidth, refineLayout) = interactiveImageLayout(item.context, item.presentationData.theme.theme, item.presentationData.strings, item.presentationData.dateTimeFormat, item.message, item.attributes, selectedMedia!, automaticDownload, item.associatedData.automaticDownloadPeerType, sizeCalculation, layoutConstants, contentMode)
+            let (unboundSize, initialWidth, refineLayout) = interactiveImageLayout(item.context, item.presentationData, item.presentationData.dateTimeFormat, item.message, item.attributes, selectedMedia!, dateAndStatus, automaticDownload, item.associatedData.automaticDownloadPeerType, sizeCalculation, layoutConstants, contentMode)
             
             let forceFullCorners = false
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: true, headerSpacing: 7.0, hidesBackground: .emptyWallpaper, forceFullCorners: forceFullCorners, forceAlignment: .none)
@@ -169,82 +246,9 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                 return (refinedWidth + bubbleInsets.left + bubbleInsets.right, { boundingWidth in
                     let (imageSize, imageApply) = finishLayout(boundingWidth - bubbleInsets.left - bubbleInsets.right)
                     
-                    var edited = false
-                    if item.attributes.updatingMedia != nil {
-                        edited = true
-                    }
-                    var viewCount: Int?
-                    var dateReplies = 0
-                    for attribute in item.message.attributes {
-                        if let attribute = attribute as? EditedMessageAttribute {
-                            if case .mosaic = preparePosition {
-                            } else {
-                                edited = !attribute.isHidden
-                            }
-                        } else if let attribute = attribute as? ViewCountMessageAttribute {
-                            viewCount = attribute.count
-                        } else if let attribute = attribute as? ReplyThreadMessageAttribute, case .peer = item.chatLocation {
-                            if let channel = item.message.peers[item.message.id.peerId] as? TelegramChannel, case .group = channel.info {
-                                dateReplies = Int(attribute.count)
-                            }
-                        }
-                    }
-                    
-                    var dateReactions: [MessageReaction] = []
-                    var dateReactionCount = 0
-                    if let reactionsAttribute = mergedMessageReactions(attributes: item.message.attributes), !reactionsAttribute.reactions.isEmpty {
-                        for reaction in reactionsAttribute.reactions {
-                            if reaction.isSelected {
-                                dateReactions.insert(reaction, at: 0)
-                            } else {
-                                dateReactions.append(reaction)
-                            }
-                            dateReactionCount += Int(reaction.count)
-                        }
-                    }
-                    
-                    let dateText = stringForMessageTimestampStatus(accountPeerId: item.context.account.peerId, message: item.message, dateTimeFormat: item.presentationData.dateTimeFormat, nameDisplayOrder: item.presentationData.nameDisplayOrder, strings: item.presentationData.strings, reactionCount: dateReactionCount)
-                    
-                    let statusType: ChatMessageDateAndStatusType?
-                    switch position {
-                        case .linear(_, .None), .linear(_, .Neighbour(true, _, _)):
-                            if item.message.effectivelyIncoming(item.context.account.peerId) {
-                                statusType = .ImageIncoming
-                            } else {
-                                if item.message.flags.contains(.Failed) {
-                                    statusType = .ImageOutgoing(.Failed)
-                                } else if (item.message.flags.isSending && !item.message.isSentOrAcknowledged) || item.attributes.updatingMedia != nil {
-                                    statusType = .ImageOutgoing(.Sending)
-                                } else {
-                                    statusType = .ImageOutgoing(.Sent(read: item.read))
-                                }
-                            }
-                        case .mosaic:
-                            statusType = nil
-                        default:
-                            statusType = nil
-                    }
-                    
                     let imageLayoutSize = CGSize(width: imageSize.width + bubbleInsets.left + bubbleInsets.right, height: imageSize.height + bubbleInsets.top + bubbleInsets.bottom)
                     
-                    var statusSize = CGSize()
-                    var statusApply: ((Bool) -> Void)?
-                    
-                    if let statusType = statusType {
-                        var isReplyThread = false
-                        if case .replyThread = item.chatLocation {
-                            isReplyThread = true
-                        }
-                        
-                        let (size, apply) = statusLayout(item.context, item.presentationData, edited, viewCount, dateText, statusType, CGSize(width: imageSize.width - 30.0, height: CGFloat.greatestFiniteMagnitude), dateReactions, dateReplies, item.message.tags.contains(.pinned) && !item.associatedData.isInPinnedListMode && !isReplyThread, item.message.isSelfExpiring)
-                        statusSize = size
-                        statusApply = apply
-                    }
-                    
-                    var layoutWidth = imageLayoutSize.width
-                    if case .constrained = sizeCalculation {
-                        layoutWidth = max(layoutWidth, statusSize.width + bubbleInsets.left + bubbleInsets.right + layoutConstants.image.statusInsets.left + layoutConstants.image.statusInsets.right)
-                    }
+                    let layoutWidth = imageLayoutSize.width
                     
                     let layoutSize = CGSize(width: layoutWidth, height: imageLayoutSize.height)
                     
@@ -262,24 +266,6 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                             
                             transition.updateFrame(node: strongSelf.interactiveImageNode, frame: imageFrame)
                             
-                            if let statusApply = statusApply {
-                                if strongSelf.dateAndStatusNode.supernode == nil {
-                                    strongSelf.interactiveImageNode.addSubnode(strongSelf.dateAndStatusNode)
-                                }
-                                var hasAnimation = true
-                                if case .None = animation {
-                                    hasAnimation = false
-                                }
-                                statusApply(hasAnimation)
- 
-                                let dateAndStatusFrame = CGRect(origin: CGPoint(x: layoutSize.width - bubbleInsets.right - layoutConstants.image.statusInsets.right - statusSize.width, y: layoutSize.height -  bubbleInsets.bottom - layoutConstants.image.statusInsets.bottom - statusSize.height), size: statusSize)
-                                
-                                strongSelf.dateAndStatusNode.frame = dateAndStatusFrame
-                                strongSelf.dateAndStatusNode.bounds = CGRect(origin: CGPoint(), size: dateAndStatusFrame.size)
-                            } else if strongSelf.dateAndStatusNode.supernode != nil {
-                                strongSelf.dateAndStatusNode.removeFromSupernode()
-                            }
-                            
                             imageApply(transition, synchronousLoads)
                             
                             if let selection = selection {
@@ -310,14 +296,14 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                             }
                             
                             if let forwardInfo = item.message.forwardInfo, forwardInfo.flags.contains(.isImported) {
-                                strongSelf.dateAndStatusNode.pressed = {
+                                strongSelf.interactiveImageNode.dateAndStatusNode.pressed = {
                                     guard let strongSelf = self else {
                                         return
                                     }
-                                    item.controllerInteraction.displayImportedMessageTooltip(strongSelf.dateAndStatusNode)
+                                    item.controllerInteraction.displayImportedMessageTooltip(strongSelf.interactiveImageNode.dateAndStatusNode)
                                 }
                             } else {
-                                strongSelf.dateAndStatusNode.pressed = nil
+                                strongSelf.interactiveImageNode.dateAndStatusNode.pressed = nil
                             }
                         }
                     })
@@ -356,7 +342,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
         self.interactiveImageNode.isHidden = mediaHidden
         self.interactiveImageNode.updateIsHidden(mediaHidden)
         
-        if let automaticPlayback = self.automaticPlayback {
+        /*if let automaticPlayback = self.automaticPlayback {
             if !automaticPlayback {
                 self.dateAndStatusNode.isHidden = false
             } else if self.dateAndStatusNode.isHidden != mediaHidden {
@@ -367,7 +353,7 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
                     self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
                 }
             }
-        }
+        }*/
         
         return mediaHidden
     }
@@ -416,9 +402,9 @@ class ChatMessageMediaBubbleContentNode: ChatMessageBubbleContentNode {
     }
     
     override func reactionTargetNode(value: String) -> (ASDisplayNode, ASDisplayNode)? {
-        if !self.dateAndStatusNode.isHidden {
+        /*if !self.dateAndStatusNode.isHidden {
             return self.dateAndStatusNode.reactionNode(value: value)
-        }
+        }*/
         return nil
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift b/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift
index 97ceb3beed..a6c20c8cb8 100644
--- a/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageNotificationItem.swift
@@ -18,6 +18,7 @@ import TelegramStringFormatting
 public final class ChatMessageNotificationItem: NotificationItem {
     let context: AccountContext
     let strings: PresentationStrings
+    let dateTimeFormat: PresentationDateTimeFormat
     let nameDisplayOrder: PresentationPersonNameOrder
     let messages: [Message]
     let tapAction: () -> Bool
@@ -27,9 +28,10 @@ public final class ChatMessageNotificationItem: NotificationItem {
         return messages.first?.id.peerId
     }
     
-    public init(context: AccountContext, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], tapAction: @escaping () -> Bool, expandAction: @escaping (() -> (ASDisplayNode?, () -> Void)) -> Void) {
+    public init(context: AccountContext, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, messages: [Message], tapAction: @escaping () -> Bool, expandAction: @escaping (() -> (ASDisplayNode?, () -> Void)) -> Void) {
         self.context = context
         self.strings = strings
+        self.dateTimeFormat = dateTimeFormat
         self.nameDisplayOrder = nameDisplayOrder
         self.messages = messages
         self.tapAction = tapAction
@@ -181,7 +183,7 @@ final class ChatMessageNotificationItemNode: NotificationItemNode {
             if message.containsSecretMedia {
                 imageDimensions = nil
             }
-            messageText = descriptionStringForMessage(contentSettings: item.context.currentContentSettings.with { $0 }, message: message, strings: item.strings, nameDisplayOrder: item.nameDisplayOrder, accountPeerId: item.context.account.peerId).0
+            messageText = descriptionStringForMessage(contentSettings: item.context.currentContentSettings.with { $0 }, message: message, strings: item.strings, nameDisplayOrder: item.nameDisplayOrder, dateTimeFormat: item.dateTimeFormat, accountPeerId: item.context.account.peerId).0
         } else if item.messages.count > 1, let peer = item.messages[0].peers[item.messages[0].id.peerId] {
             var displayAuthor = true
             if let channel = peer as? TelegramChannel {
@@ -218,9 +220,9 @@ final class ChatMessageNotificationItemNode: NotificationItemNode {
                     }
                 }
             } else if item.messages[0].groupingKey != nil {
-                var kind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[0], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: item.context.account.peerId).key
+                var kind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[0], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId).key
                 for i in 1 ..< item.messages.count {
-                    let nextKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[i], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: item.context.account.peerId)
+                    let nextKind = messageContentKind(contentSettings: item.context.currentContentSettings.with { $0 }, message: item.messages[i], strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: item.context.account.peerId)
                     if kind != nextKind.key {
                         kind = .text
                         break
@@ -339,7 +341,7 @@ final class ChatMessageNotificationItemNode: NotificationItemNode {
                                 messageText = rawText
                             }
                         case .file:
-                            let rawText = presentationData.strings.PUSH_MESSAGE_DOCS(Int32(item.messages.count), peer.displayTitle(strings: item.strings, displayOrder: item.nameDisplayOrder), Int32(item.messages.count))
+                            let rawText = presentationData.strings.PUSH_MESSAGE_FILES(Int32(item.messages.count), peer.displayTitle(strings: item.strings, displayOrder: item.nameDisplayOrder), Int32(item.messages.count))
                             if let index = rawText.firstIndex(of: "|") {
                                 title = String(rawText[rawText.startIndex ..< index])
                                 messageText = String(rawText[rawText.index(after: index)...])
diff --git a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
index af0467d891..240ba43779 100644
--- a/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageReplyInfoNode.swift
@@ -65,7 +65,7 @@ class ChatMessageReplyInfoNode: ASDisplayNode {
                 }
             }
             
-            let (textString, isMedia) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: presentationData.nameDisplayOrder, accountPeerId: context.account.peerId)
+            let (textString, isMedia) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: presentationData.nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: context.account.peerId)
             
             let placeholderColor: UIColor =  message.effectivelyIncoming(context.account.peerId) ? presentationData.theme.theme.chat.message.incoming.mediaPlaceholderColor : presentationData.theme.theme.chat.message.outgoing.mediaPlaceholderColor
             let titleColor: UIColor
@@ -229,4 +229,115 @@ class ChatMessageReplyInfoNode: ASDisplayNode {
             })
         }
     }
+
+    func animateFromInputPanel(sourceReplyPanel: ChatMessageTransitionNode.ReplyPanel, unclippedTransitionNode: ASDisplayNode? = nil, localRect: CGRect, transition: CombinedTransition) -> CGPoint {
+        let sourceParentNode = ASDisplayNode()
+
+        let sourceParentOffset: CGPoint
+
+        if let unclippedTransitionNode = unclippedTransitionNode {
+            unclippedTransitionNode.addSubnode(sourceParentNode)
+            sourceParentNode.frame = sourceReplyPanel.relativeSourceRect
+            sourceParentOffset = self.view.convert(CGPoint(), to: sourceParentNode.view)
+            sourceParentNode.clipsToBounds = true
+
+            let panelOffset = sourceReplyPanel.relativeTargetRect.minY - sourceReplyPanel.relativeSourceRect.minY
+
+            sourceParentNode.frame = sourceParentNode.frame.offsetBy(dx: 0.0, dy: panelOffset)
+            sourceParentNode.bounds = sourceParentNode.bounds.offsetBy(dx: 0.0, dy: panelOffset)
+            transition.vertical.animatePositionAdditive(layer: sourceParentNode.layer, offset: CGPoint(x: 0.0, y: -panelOffset))
+            transition.vertical.animateOffsetAdditive(layer: sourceParentNode.layer, offset: -panelOffset)
+        } else {
+            self.addSubnode(sourceParentNode)
+            sourceParentOffset = CGPoint()
+        }
+
+        sourceParentNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { [weak sourceParentNode] _ in
+            sourceParentNode?.removeFromSupernode()
+        })
+
+        if let titleNode = self.titleNode {
+            let offset = CGPoint(
+                x: localRect.minX + sourceReplyPanel.titleNode.frame.minX - titleNode.frame.minX,
+                y: localRect.minY + sourceReplyPanel.titleNode.frame.midY - titleNode.frame.midY
+            )
+
+            transition.horizontal.animatePositionAdditive(node: titleNode, offset: CGPoint(x: offset.x, y: 0.0))
+            transition.vertical.animatePositionAdditive(node: titleNode, offset: CGPoint(x: 0.0, y: offset.y))
+
+            sourceParentNode.addSubnode(sourceReplyPanel.titleNode)
+
+            titleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+
+            sourceReplyPanel.titleNode.frame = sourceReplyPanel.titleNode.frame
+                .offsetBy(dx: sourceParentOffset.x, dy: sourceParentOffset.y)
+                .offsetBy(dx: localRect.minX - offset.x, dy: localRect.minY - offset.y)
+            transition.horizontal.animatePositionAdditive(node: sourceReplyPanel.titleNode, offset: CGPoint(x: offset.x, y: 0.0), removeOnCompletion: false)
+            transition.vertical.animatePositionAdditive(node: sourceReplyPanel.titleNode, offset: CGPoint(x: 0.0, y: offset.y), removeOnCompletion: false)
+        }
+
+        if let textNode = self.textNode {
+            let offset = CGPoint(
+                x: localRect.minX + sourceReplyPanel.textNode.frame.minX - textNode.frame.minX,
+                y: localRect.minY + sourceReplyPanel.textNode.frame.midY - textNode.frame.midY
+            )
+
+            transition.horizontal.animatePositionAdditive(node: textNode, offset: CGPoint(x: offset.x, y: 0.0))
+            transition.vertical.animatePositionAdditive(node: textNode, offset: CGPoint(x: 0.0, y: offset.y))
+
+            sourceParentNode.addSubnode(sourceReplyPanel.textNode)
+
+            textNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+
+            sourceReplyPanel.textNode.frame = sourceReplyPanel.textNode.frame
+                .offsetBy(dx: sourceParentOffset.x, dy: sourceParentOffset.y)
+                .offsetBy(dx: localRect.minX - offset.x, dy: localRect.minY - offset.y)
+            transition.horizontal.animatePositionAdditive(node: sourceReplyPanel.textNode, offset: CGPoint(x: offset.x, y: 0.0), removeOnCompletion: false)
+            transition.vertical.animatePositionAdditive(node: sourceReplyPanel.textNode, offset: CGPoint(x: 0.0, y: offset.y), removeOnCompletion: false)
+        }
+
+        if let imageNode = self.imageNode {
+            let offset = CGPoint(
+                x: localRect.minX + sourceReplyPanel.imageNode.frame.midX - imageNode.frame.midX,
+                y: localRect.minY + sourceReplyPanel.imageNode.frame.midY - imageNode.frame.midY
+            )
+
+            transition.horizontal.animatePositionAdditive(node: imageNode, offset: CGPoint(x: offset.x, y: 0.0))
+            transition.vertical.animatePositionAdditive(node: imageNode, offset: CGPoint(x: 0.0, y: offset.y))
+
+            sourceParentNode.addSubnode(sourceReplyPanel.imageNode)
+
+            imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+
+            sourceReplyPanel.imageNode.frame = sourceReplyPanel.imageNode.frame
+                .offsetBy(dx: sourceParentOffset.x, dy: sourceParentOffset.y)
+                .offsetBy(dx: localRect.minX - offset.x, dy: localRect.minY - offset.y)
+            transition.horizontal.animatePositionAdditive(node: sourceReplyPanel.imageNode, offset: CGPoint(x: offset.x, y: 0.0), removeOnCompletion: false)
+            transition.vertical.animatePositionAdditive(node: sourceReplyPanel.imageNode, offset: CGPoint(x: 0.0, y: offset.y), removeOnCompletion: false)
+        }
+
+        do {
+            let lineNode = self.lineNode
+
+            let offset = CGPoint(
+                x: localRect.minX + sourceReplyPanel.lineNode.frame.minX - lineNode.frame.minX,
+                y: localRect.minY + sourceReplyPanel.lineNode.frame.minY - lineNode.frame.minY
+            )
+
+            transition.horizontal.animatePositionAdditive(node: lineNode, offset: CGPoint(x: offset.x, y: 0.0))
+            transition.vertical.animatePositionAdditive(node: lineNode, offset: CGPoint(x: 0.0, y: offset.y))
+
+            sourceParentNode.addSubnode(sourceReplyPanel.lineNode)
+
+            lineNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+
+            sourceReplyPanel.lineNode.frame = sourceReplyPanel.lineNode.frame
+                .offsetBy(dx: sourceParentOffset.x, dy: sourceParentOffset.y)
+                .offsetBy(dx: localRect.minX - offset.x, dy: localRect.minY - offset.y)
+            transition.horizontal.animatePositionAdditive(node: sourceReplyPanel.lineNode, offset: CGPoint(x: offset.x, y: 0.0), removeOnCompletion: false)
+            transition.vertical.animatePositionAdditive(node: sourceReplyPanel.lineNode, offset: CGPoint(x: 0.0, y: offset.y), removeOnCompletion: false)
+
+            return offset
+        }
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
index 3a5ee9c215..43b041813b 100644
--- a/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageStickerItemNode.swift
@@ -13,15 +13,17 @@ import StickerResources
 import ContextUI
 import Markdown
 import ShimmerEffect
+import WallpaperBackgroundNode
 
 private let nameFont = Font.medium(14.0)
 private let inlineBotPrefixFont = Font.regular(14.0)
 private let inlineBotNameFont = nameFont
 
 class ChatMessageStickerItemNode: ChatMessageItemView {
-    private let contextSourceNode: ContextExtractedContentContainingNode
+    let contextSourceNode: ContextExtractedContentContainingNode
     private let containerNode: ContextControllerSourceNode
     let imageNode: TransformImageNode
+    private var backgroundNode: WallpaperBackgroundNode.BubbleBackgroundNode?
     private var placeholderNode: StickerShimmerEffectNode
     var textNode: TextNode?
     
@@ -38,7 +40,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
     private var viaBotNode: TextNode?
     private let dateAndStatusNode: ChatMessageDateAndStatusNode
     private var replyInfoNode: ChatMessageReplyInfoNode?
-    private var replyBackgroundNode: ASImageNode?
+    private var replyBackgroundNode: NavigationBackgroundNode?
     
     private var actionButtonsNode: ChatMessageActionButtonsNode?
     
@@ -49,6 +51,8 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
     private var currentSwipeToReplyTranslation: CGFloat = 0.0
     
     private var currentSwipeAction: ChatControllerInteractionSwipeAction?
+
+    private var enableSynchronousImageApply: Bool = false
     
     required init() {
         self.contextSourceNode = ContextExtractedContentContainingNode()
@@ -68,9 +72,13 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
             }
             if image != nil {
                 if firstTime && !strongSelf.placeholderNode.isEmpty {
-                    strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, completion: { [weak self] _ in
-                        self?.removePlaceholder(animated: false)
-                    })
+                    if strongSelf.enableSynchronousImageApply {
+                        strongSelf.removePlaceholder(animated: false)
+                    } else {
+                        strongSelf.imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, completion: { [weak self] _ in
+                            self?.removePlaceholder(animated: false)
+                        })
+                    }
                 } else {
                     strongSelf.removePlaceholder(animated: true)
                 }
@@ -214,15 +222,15 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
         self.view.addGestureRecognizer(replyRecognizer)
     }
     
-    override func setupItem(_ item: ChatMessageItem) {
-        super.setupItem(item)
+    override func setupItem(_ item: ChatMessageItem, synchronousLoad: Bool) {
+        super.setupItem(item, synchronousLoad: synchronousLoad)
         
         for media in item.message.media {
             if let telegramFile = media as? TelegramMediaFile {
                 if self.telegramFile != telegramFile {
-                    let signal = chatMessageSticker(account: item.context.account, file: telegramFile, small: false, onlyFullSize: self.telegramFile != nil)
+                    let signal = chatMessageSticker(account: item.context.account, file: telegramFile, small: false, onlyFullSize: self.telegramFile != nil, synchronousLoad: synchronousLoad)
                     self.telegramFile = telegramFile
-                    self.imageNode.setSignal(signal)
+                    self.imageNode.setSignal(signal, attemptSynchronously: synchronousLoad)
                     self.fetchDisposable.set(freeMediaFileInteractiveFetched(account: item.context.account, fileReference: .message(message: MessageReference(item.message), media: telegramFile)).start())
                 }
                 
@@ -243,6 +251,16 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
             rect.origin.y = containerSize.height - rect.maxY + self.insets.top
 
             self.placeholderNode.updateAbsoluteRect(CGRect(origin: CGPoint(x: rect.minX + placeholderNode.frame.minX, y: rect.minY + placeholderNode.frame.minY), size: placeholderNode.frame.size), within: containerSize)
+            
+            if let backgroundNode = self.backgroundNode {
+                backgroundNode.update(rect: CGRect(origin: CGPoint(x: rect.minX + self.placeholderNode.frame.minX, y: rect.minY + self.placeholderNode.frame.minY), size: self.placeholderNode.frame.size), within: containerSize)
+            }
+        }
+    }
+    
+    override func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.offset(value: value, animationCurve: animationCurve, duration: duration)
         }
     }
     
@@ -288,9 +306,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
         
         let viaBotLayout = TextNode.asyncLayout(self.viaBotNode)
         let makeReplyInfoLayout = ChatMessageReplyInfoNode.asyncLayout(self.replyInfoNode)
-        let currentReplyBackgroundNode = self.replyBackgroundNode
         let currentShareButtonNode = self.shareButtonNode
-        let currentItem = self.item
         
         return { item, params, mergedTop, mergedBottom, dateHeaderAtBottom in
             let accessibilityData = ChatMessageAccessibilityData(item: item, isSelected: nil)
@@ -479,8 +495,6 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
             
             var viaBotApply: (TextNodeLayout, () -> TextNode)?
             var replyInfoApply: (CGSize, () -> ChatMessageReplyInfoNode)?
-            var updatedReplyBackgroundNode: ASImageNode?
-            var replyBackgroundImage: UIImage?
             var replyMarkup: ReplyMarkupMessageAttribute?
             
             var availableWidth = max(60.0, params.width - params.leftInset - params.rightInset - max(imageSize.width, 160.0) - 20.0 - layoutConstants.bubble.edgeInset * 2.0 - avatarInset - layoutConstants.bubble.contentInsets.left)
@@ -529,16 +543,11 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                     }
                 }
             }
+
+            var needsReplyBackground = false
             
             if replyInfoApply != nil || viaBotApply != nil {
-                if let currentReplyBackgroundNode = currentReplyBackgroundNode {
-                    updatedReplyBackgroundNode = currentReplyBackgroundNode
-                } else {
-                    updatedReplyBackgroundNode = ASImageNode()
-                }
-                
-                let graphics = PresentationResourcesChat.additionalGraphics(item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper, bubbleCorners: item.presentationData.chatBubbleCorners)
-                replyBackgroundImage = graphics.chatFreeformContentAdditionalInfoBackgroundImage
+                needsReplyBackground = true
             }
             
             var updatedShareButtonNode: ChatMessageShareButton?
@@ -642,9 +651,22 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                     strongSelf.updateAccessibilityData(accessibilityData)
                     
                     transition.updateFrame(node: strongSelf.imageNode, frame: updatedImageFrame)
+                    strongSelf.enableSynchronousImageApply = true
                     imageApply()
+                    strongSelf.enableSynchronousImageApply = false
                     
                     if let immediateThumbnailData = telegramFile?.immediateThumbnailData {
+                        if strongSelf.backgroundNode == nil {
+                            if let backgroundNode = item.controllerInteraction.presentationContext.backgroundNode?.makeBubbleBackground(for: .free) {
+                                strongSelf.backgroundNode = backgroundNode
+                                strongSelf.placeholderNode.addBackdropNode(backgroundNode)
+                                
+                                if let (rect, size) = strongSelf.absoluteRect {
+                                    strongSelf.updateAbsoluteRect(rect, within: size)
+                                }
+                            }
+                        }
+                        
                         let foregroundColor = bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.stickerPlaceholderColor, wallpaper: item.presentationData.theme.wallpaper)
                         let shimmeringColor = bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.stickerPlaceholderShimmerColor, wallpaper: item.presentationData.theme.wallpaper)
                         
@@ -681,13 +703,13 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                         strongSelf.shareButtonNode = nil
                     }
                     
-                    if let updatedReplyBackgroundNode = updatedReplyBackgroundNode {
-                        if strongSelf.replyBackgroundNode == nil {
-                            strongSelf.replyBackgroundNode = updatedReplyBackgroundNode
-                            strongSelf.addSubnode(updatedReplyBackgroundNode)
-                            updatedReplyBackgroundNode.image = replyBackgroundImage
+                    if needsReplyBackground {
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode {
+                            replyBackgroundNode.updateColor(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), transition: .immediate)
                         } else {
-                            strongSelf.replyBackgroundNode?.image = replyBackgroundImage
+                            let replyBackgroundNode = NavigationBackgroundNode(color: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper))
+                            strongSelf.replyBackgroundNode = replyBackgroundNode
+                            strongSelf.contextSourceNode.contentNode.addSubnode(replyBackgroundNode)
                         }
                     } else if let replyBackgroundNode = strongSelf.replyBackgroundNode {
                         replyBackgroundNode.removeFromSupernode()
@@ -701,7 +723,10 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                             strongSelf.addSubnode(viaBotNode)
                         }
                         viaBotNode.frame = viaBotFrame
-                        strongSelf.replyBackgroundNode?.frame = CGRect(origin: CGPoint(x: viaBotFrame.minX - 6.0, y: viaBotFrame.minY - 2.0 - UIScreenPixel), size: CGSize(width: viaBotFrame.size.width + 11.0, height: viaBotFrame.size.height + 5.0))
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode {
+                            replyBackgroundNode.frame = CGRect(origin: CGPoint(x: viaBotFrame.minX - 6.0, y: viaBotFrame.minY - 2.0 - UIScreenPixel), size: CGSize(width: viaBotFrame.size.width + 11.0, height: viaBotFrame.size.height + 5.0))
+                            replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: 8.0, transition: .immediate)
+                        }
                     } else if let viaBotNode = strongSelf.viaBotNode {
                         viaBotNode.removeFromSupernode()
                         strongSelf.viaBotNode = nil
@@ -711,10 +736,13 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                         let replyInfoNode = replyInfoApply()
                         if strongSelf.replyInfoNode == nil {
                             strongSelf.replyInfoNode = replyInfoNode
-                            strongSelf.addSubnode(replyInfoNode)
+                            strongSelf.contextSourceNode.contentNode.addSubnode(replyInfoNode)
                         }
                         replyInfoNode.frame = replyInfoFrame
-                        strongSelf.replyBackgroundNode?.frame = replyBackgroundFrame ?? CGRect()
+                        if let replyBackgroundNode = strongSelf.replyBackgroundNode, let replyBackgroundFrame = replyBackgroundFrame {
+                            replyBackgroundNode.frame = replyBackgroundFrame
+                            replyBackgroundNode.update(size: replyBackgroundNode.bounds.size, cornerRadius: 8.0, transition: .immediate)
+                        }
                         
                         if isEmoji && !incoming {
                             if let _ = item.controllerInteraction.selectionState {
@@ -856,7 +884,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                             for attribute in item.content.firstMessage.attributes {
                                 if let attribute = attribute as? SourceReferenceMessageAttribute {
                                     openPeerId = attribute.messageId.peerId
-                                    navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true), peekData: nil)
+                                    navigate = .chat(textInputState: nil, subject: .message(id: attribute.messageId, highlight: true, timecode: nil), peekData: nil)
                                 }
                             }
                             
@@ -980,7 +1008,7 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
                     if translation.x < -45.0, self.swipeToReplyNode == nil, let item = self.item {
                         self.swipeToReplyFeedback?.impact()
                         
-                        let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonFillColor, wallpaper: item.presentationData.theme.wallpaper), strokeColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonStrokeColor, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
+                        let swipeToReplyNode = ChatMessageSwipeToReplyNode(fillColor: selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), enableBlur: dateFillNeedsBlur(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper), foregroundColor: bubbleVariableColor(variableColor: item.presentationData.theme.theme.chat.message.shareButtonForegroundColor, wallpaper: item.presentationData.theme.wallpaper), action: ChatMessageSwipeToReplyNode.Action(self.currentSwipeAction))
                         self.swipeToReplyNode = swipeToReplyNode
                         self.addSubnode(swipeToReplyNode)
                         animateReplyNodeIn = true
@@ -1059,6 +1087,15 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
         if let item = self.item, item.presentationData.largeEmoji && messageIsElligibleForLargeEmoji(item.message) {
             isEmoji = true
         }
+
+        let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+        let replyAlpha: CGFloat = item.controllerInteraction.selectionState == nil ? 1.0 : 0.0
+        if let replyInfoNode = self.replyInfoNode {
+            transition.updateAlpha(node: replyInfoNode, alpha: replyAlpha)
+        }
+        if let replyBackgroundNode = self.replyBackgroundNode {
+            transition.updateAlpha(node: replyBackgroundNode, alpha: replyAlpha)
+        }
         
         if let selectionState = item.controllerInteraction.selectionState {
             let selected = selectionState.selectedIds.contains(item.message.id)
@@ -1160,6 +1197,10 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
             }
         }
     }
+
+    override func cancelInsertionAnimations() {
+        self.layer.removeAllAnimations()
+    }
     
     override func animateInsertion(_ currentTimestamp: Double, duration: Double, short: Bool) {
         super.animateInsertion(currentTimestamp, duration: duration, short: short)
@@ -1186,4 +1227,152 @@ class ChatMessageStickerItemNode: ChatMessageItemView {
     override func addAccessoryItemNode(_ accessoryItemNode: ListViewAccessoryItemNode) {
         self.contextSourceNode.contentNode.addSubnode(accessoryItemNode)
     }
+
+    func animateContentFromTextInputField(textInput: ChatMessageTransitionNode.Source.TextInput, transition: CombinedTransition) {
+        guard let _ = self.item else {
+            return
+        }
+
+        let localSourceContentFrame = self.contextSourceNode.contentNode.view.convert(textInput.contentView.frame.offsetBy(dx: self.contextSourceNode.contentRect.minX, dy: self.contextSourceNode.contentRect.minY), to: self.contextSourceNode.contentNode.view)
+        textInput.contentView.frame = localSourceContentFrame
+
+        self.contextSourceNode.contentNode.view.addSubview(textInput.contentView)
+
+        let sourceCenter = CGPoint(
+            x: localSourceContentFrame.minX + 11.2,
+            y: localSourceContentFrame.midY - 1.8
+        )
+        let localSourceCenter = CGPoint(
+            x: sourceCenter.x - localSourceContentFrame.minX,
+            y: sourceCenter.y - localSourceContentFrame.minY
+        )
+        let localSourceOffset = CGPoint(
+            x: localSourceCenter.x - localSourceContentFrame.width / 2.0,
+            y: localSourceCenter.y - localSourceContentFrame.height / 2.0
+        )
+
+        let sourceScale: CGFloat = 28.0 / self.imageNode.frame.height
+
+        let offset = CGPoint(
+            x: sourceCenter.x - self.imageNode.frame.midX,
+            y: sourceCenter.y - self.imageNode.frame.midY
+        )
+
+        transition.animatePositionAdditive(layer: self.imageNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.imageNode, from: sourceScale)
+        transition.animatePositionAdditive(layer: self.placeholderNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.placeholderNode, from: sourceScale)
+
+        let inverseScale = 1.0 / sourceScale
+
+        transition.animatePositionAdditive(layer: textInput.contentView.layer, offset: CGPoint(), to: CGPoint(
+            x: -offset.x - localSourceOffset.x * (inverseScale - 1.0),
+            y: -offset.y - localSourceOffset.y * (inverseScale - 1.0)
+        ), removeOnCompletion: false)
+        transition.horizontal.updateTransformScale(layer: textInput.contentView.layer, scale: 1.0 / sourceScale)
+
+        textInput.contentView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false, completion: { _ in
+            textInput.contentView.removeFromSuperview()
+        })
+
+        self.imageNode.layer.animateAlpha(from: 0.0, to: self.imageNode.alpha, duration: 0.1)
+        self.placeholderNode.layer.animateAlpha(from: 0.0, to: self.placeholderNode.alpha, duration: 0.1)
+
+        self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: self.dateAndStatusNode.alpha, duration: 0.15, delay: 0.16)
+    }
+
+    func animateContentFromStickerGridItem(stickerSource: ChatMessageTransitionNode.Sticker, transition: CombinedTransition) {
+        guard let _ = self.item else {
+            return
+        }
+
+        let localSourceContentFrame = CGRect(
+            origin: CGPoint(
+                x: self.imageNode.frame.minX + self.imageNode.frame.size.width / 2.0 - stickerSource.imageNode.frame.size.width / 2.0,
+                y: self.imageNode.frame.minY + self.imageNode.frame.size.height / 2.0 - stickerSource.imageNode.frame.size.height / 2.0
+            ),
+            size: stickerSource.imageNode.frame.size
+        )
+
+        var snapshotView: UIView?
+        if let animationNode = stickerSource.animationNode {
+            snapshotView = animationNode.view.snapshotContentTree()
+        } else {
+            snapshotView = stickerSource.imageNode.view.snapshotContentTree()
+        }
+        snapshotView?.frame = localSourceContentFrame
+
+        if let snapshotView = snapshotView {
+            self.contextSourceNode.contentNode.view.addSubview(snapshotView)
+        }
+
+        let sourceCenter = CGPoint(
+            x: localSourceContentFrame.midX,
+            y: localSourceContentFrame.midY
+        )
+        let localSourceCenter = CGPoint(
+            x: sourceCenter.x - localSourceContentFrame.minX,
+            y: sourceCenter.y - localSourceContentFrame.minY
+        )
+        let localSourceOffset = CGPoint(
+            x: localSourceCenter.x - localSourceContentFrame.width / 2.0,
+            y: localSourceCenter.y - localSourceContentFrame.height / 2.0
+        )
+
+        let sourceScale: CGFloat = stickerSource.imageNode.frame.height / self.imageNode.frame.height
+
+        let offset = CGPoint(
+            x: sourceCenter.x - self.imageNode.frame.midX,
+            y: sourceCenter.y - self.imageNode.frame.midY
+        )
+
+        transition.animatePositionAdditive(layer: self.imageNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.imageNode, from: sourceScale)
+        transition.animatePositionAdditive(layer: self.placeholderNode.layer, offset: offset)
+        transition.horizontal.animateTransformScale(node: self.placeholderNode, from: sourceScale)
+
+        let inverseScale = 1.0 / sourceScale
+
+        if let snapshotView = snapshotView {
+            transition.animatePositionAdditive(layer: snapshotView.layer, offset: CGPoint(), to: CGPoint(
+                x: -offset.x - localSourceOffset.x * (inverseScale - 1.0),
+                y: -offset.y - localSourceOffset.y * (inverseScale - 1.0)
+            ), removeOnCompletion: false)
+            transition.horizontal.updateTransformScale(layer: snapshotView.layer, scale: 1.0 / sourceScale)
+
+            snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.06, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                snapshotView?.removeFromSuperview()
+            })
+
+            self.imageNode.layer.animateAlpha(from: 0.0, to: self.imageNode.alpha, duration: 0.03)
+            self.placeholderNode.layer.animateAlpha(from: 0.0, to: self.placeholderNode.alpha, duration: 0.03)
+        }
+
+        self.dateAndStatusNode.layer.animateAlpha(from: 0.0, to: self.dateAndStatusNode.alpha, duration: 0.15, delay: 0.16)
+
+        if let animationNode = stickerSource.animationNode {
+            animationNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+            animationNode.layer.animateAlpha(from: 0.0, to: animationNode.alpha, duration: 0.4)
+        }
+
+        stickerSource.imageNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+        stickerSource.imageNode.layer.animateAlpha(from: 0.0, to: stickerSource.imageNode.alpha, duration: 0.4)
+
+        if let placeholderNode = stickerSource.placeholderNode {
+            placeholderNode.layer.animateScale(from: 0.1, to: 1.0, duration: 0.5, timingFunction: kCAMediaTimingFunctionSpring)
+            placeholderNode.layer.animateAlpha(from: 0.0, to: placeholderNode.alpha, duration: 0.4)
+        }
+    }
+
+    func animateReplyPanel(sourceReplyPanel: ChatMessageTransitionNode.ReplyPanel, transition: CombinedTransition) {
+        if let replyInfoNode = self.replyInfoNode {
+            let localRect = self.contextSourceNode.contentNode.view.convert(sourceReplyPanel.relativeSourceRect, to: replyInfoNode.view)
+
+            let offset = replyInfoNode.animateFromInputPanel(sourceReplyPanel: sourceReplyPanel, localRect: localRect, transition: transition)
+            if let replyBackgroundNode = self.replyBackgroundNode {
+                transition.animatePositionAdditive(layer: replyBackgroundNode.layer, offset: offset)
+                replyBackgroundNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.1)
+            }
+        }
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift b/submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift
index 4d9041526b..6ba2ffb591 100644
--- a/submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageSwipeToReplyNode.swift
@@ -11,25 +11,18 @@ final class ChatMessageSwipeToReplyNode: ASDisplayNode {
         case unlike
     }
     
-    private let backgroundNode: ASImageNode
+    private let backgroundNode: NavigationBackgroundNode
+    private let foregroundNode: ASImageNode
     
-    init(fillColor: UIColor, strokeColor: UIColor, foregroundColor: UIColor, action: ChatMessageSwipeToReplyNode.Action) {
-        self.backgroundNode = ASImageNode()
-        self.backgroundNode.isLayerBacked = true
-        self.backgroundNode.image = generateImage(CGSize(width: 33.0, height: 33.0), rotatedContext: { size, context in
+    init(fillColor: UIColor, enableBlur: Bool, foregroundColor: UIColor, action: ChatMessageSwipeToReplyNode.Action) {
+        self.backgroundNode = NavigationBackgroundNode(color: fillColor, enableBlur: enableBlur)
+        self.backgroundNode.isUserInteractionEnabled = false
+
+        self.foregroundNode = ASImageNode()
+        self.foregroundNode.isUserInteractionEnabled = false
+
+        self.foregroundNode.image = generateImage(CGSize(width: 33.0, height: 33.0), rotatedContext: { size, context in
             context.clear(CGRect(origin: CGPoint(), size: size))
-            context.setFillColor(fillColor.cgColor)
-            context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
-            
-            let lineWidth: CGFloat = 1.0
-            let halfLineWidth = lineWidth / 2.0
-            var strokeAlpha: CGFloat = 0.0
-            strokeColor.getRed(nil, green: nil, blue: nil, alpha: &strokeAlpha)
-            if !strokeAlpha.isZero {
-                context.setStrokeColor(strokeColor.cgColor)
-                context.setLineWidth(lineWidth)
-                context.strokeEllipse(in: CGRect(origin: CGPoint(x: halfLineWidth, y: halfLineWidth), size: CGSize(width: size.width - lineWidth, height: size.width - lineWidth)))
-            }
             
             switch action {
             case .reply:
@@ -65,7 +58,10 @@ final class ChatMessageSwipeToReplyNode: ASDisplayNode {
         super.init()
         
         self.addSubnode(self.backgroundNode)
+        self.addSubnode(self.foregroundNode)
         self.backgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 33.0, height: 33.0))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: self.backgroundNode.bounds.height / 2.0, transition: .immediate)
+        self.foregroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: 33.0, height: 33.0))
     }
 }
 
diff --git a/submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift
index c018521b50..d63be62314 100644
--- a/submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageTextBubbleContentNode.swift
@@ -640,4 +640,24 @@ class ChatMessageTextBubbleContentNode: ChatMessageBubbleContentNode {
     override func getStatusNode() -> ASDisplayNode? {
         return self.statusNode
     }
+
+    func animateFrom(sourceView: UIView, scrollOffset: CGFloat, widthDifference: CGFloat, transition: CombinedTransition) {
+        self.view.addSubview(sourceView)
+
+        sourceView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.1, removeOnCompletion: false, completion: { [weak sourceView] _ in
+            sourceView?.removeFromSuperview()
+        })
+        self.textNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08)
+
+        let offset = CGPoint(
+            x: sourceView.frame.minX - (self.textNode.frame.minX - 0.0),
+            y: sourceView.frame.minY - (self.textNode.frame.minY - 3.0) - scrollOffset
+        )
+
+        transition.vertical.animatePositionAdditive(node: self.textNode, offset: offset)
+        transition.updatePosition(layer: sourceView.layer, position: CGPoint(x: sourceView.layer.position.x - offset.x, y: sourceView.layer.position.y - offset.y))
+
+        self.statusNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
+        transition.horizontal.animatePositionAdditive(node: self.statusNode, offset: CGPoint(x: -widthDifference, y: 0.0))
+    }
 }
diff --git a/submodules/TelegramUI/Sources/ChatMessageTransitionNode.swift b/submodules/TelegramUI/Sources/ChatMessageTransitionNode.swift
new file mode 100644
index 0000000000..ab733459c0
--- /dev/null
+++ b/submodules/TelegramUI/Sources/ChatMessageTransitionNode.swift
@@ -0,0 +1,694 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import ContextUI
+import AnimatedStickerNode
+import SwiftSignalKit
+
+private final class OverlayTransitionContainerNode: ViewControllerTracingNode {
+    override init() {
+        super.init()
+    }
+
+    deinit {
+    }
+
+    override func didLoad() {
+        super.didLoad()
+    }
+
+    func updateLayout(layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+    }
+
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return nil
+    }
+}
+
+private final class OverlayTransitionContainerController: ViewController, StandalonePresentableController {
+    private let _ready = Promise<Bool>()
+    override public var ready: Promise<Bool> {
+        return self._ready
+    }
+
+    private var controllerNode: OverlayTransitionContainerNode {
+        return self.displayNode as! OverlayTransitionContainerNode
+    }
+
+    private var wasDismissed: Bool = false
+
+    init() {
+        super.init(navigationBarPresentationData: nil)
+
+        self.statusBar.statusBarStyle = .Ignore
+    }
+
+    required init(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    deinit {
+    }
+
+    override public func loadDisplayNode() {
+        self.displayNode = OverlayTransitionContainerNode()
+
+        self.displayNodeDidLoad()
+
+        self._ready.set(.single(true))
+    }
+
+    override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        super.containerLayoutUpdated(layout, transition: transition)
+
+        self.controllerNode.updateLayout(layout: layout, transition: transition)
+    }
+
+    override public func viewDidAppear(_ animated: Bool) {
+        if self.ignoreAppearanceMethodInvocations() {
+            return
+        }
+        super.viewDidAppear(animated)
+    }
+
+    override public func dismiss(completion: (() -> Void)? = nil) {
+        if !self.wasDismissed {
+            self.wasDismissed = true
+            self.presentingViewController?.dismiss(animated: false, completion: nil)
+            completion?()
+        }
+    }
+}
+
+public final class ChatMessageTransitionNode: ASDisplayNode {
+    static let animationDuration: Double = 0.3
+
+    static let verticalAnimationControlPoints: (Float, Float, Float, Float) = (0.19919472913616398, 0.010644531250000006, 0.27920937042459737, 0.91025390625)
+    static let verticalAnimationCurve: ContainedViewLayoutTransitionCurve = .custom(verticalAnimationControlPoints.0, verticalAnimationControlPoints.1, verticalAnimationControlPoints.2, verticalAnimationControlPoints.3)
+    static let horizontalAnimationCurve: ContainedViewLayoutTransitionCurve = .custom(0.23, 1.0, 0.32, 1.0)
+
+    final class ReplyPanel {
+        let titleNode: ASDisplayNode
+        let textNode: ASDisplayNode
+        let lineNode: ASDisplayNode
+        let imageNode: ASDisplayNode
+        let relativeSourceRect: CGRect
+        let relativeTargetRect: CGRect
+
+        init(titleNode: ASDisplayNode, textNode: ASDisplayNode, lineNode: ASDisplayNode, imageNode: ASDisplayNode, relativeSourceRect: CGRect, relativeTargetRect: CGRect) {
+            self.titleNode = titleNode
+            self.textNode = textNode
+            self.lineNode = lineNode
+            self.imageNode = imageNode
+            self.relativeSourceRect = relativeSourceRect
+            self.relativeTargetRect = relativeTargetRect
+        }
+    }
+
+    final class Sticker {
+        let imageNode: TransformImageNode
+        let animationNode: GenericAnimatedStickerNode?
+        let placeholderNode: ASDisplayNode?
+        let relativeSourceRect: CGRect
+
+        init(imageNode: TransformImageNode, animationNode: GenericAnimatedStickerNode?, placeholderNode: ASDisplayNode?, relativeSourceRect: CGRect) {
+            self.imageNode = imageNode
+            self.animationNode = animationNode
+            self.placeholderNode = placeholderNode
+            self.relativeSourceRect = relativeSourceRect
+        }
+    }
+
+    enum Source {
+        final class TextInput {
+            let backgroundView: UIView
+            let contentView: UIView
+            let sourceRect: CGRect
+            let scrollOffset: CGFloat
+
+            init(backgroundView: UIView, contentView: UIView, sourceRect: CGRect, scrollOffset: CGFloat) {
+                self.backgroundView = backgroundView
+                self.contentView = contentView
+                self.sourceRect = sourceRect
+                self.scrollOffset = scrollOffset
+            }
+        }
+
+        enum StickerInput {
+            case inputPanel(itemNode: ChatMediaInputStickerGridItemNode)
+            case mediaPanel(itemNode: HorizontalStickerGridItemNode)
+            case inputPanelSearch(itemNode: StickerPaneSearchStickerItemNode)
+            case emptyPanel(itemNode: ChatEmptyNodeStickerContentNode)
+        }
+
+        final class AudioMicInput {
+            let micButton: ChatTextInputMediaRecordingButton
+
+            init(micButton: ChatTextInputMediaRecordingButton) {
+                self.micButton = micButton
+            }
+        }
+
+        final class VideoMessage {
+            let view: UIView
+
+            init(view: UIView) {
+                self.view = view
+            }
+        }
+
+        final class MediaInput {
+            let extractSnapshot: () -> UIView?
+
+            init(extractSnapshot: @escaping () -> UIView?) {
+                self.extractSnapshot = extractSnapshot
+            }
+        }
+
+        case textInput(textInput: TextInput, replyPanel: ReplyAccessoryPanelNode?)
+        case stickerMediaInput(input: StickerInput, replyPanel: ReplyAccessoryPanelNode?)
+        case audioMicInput(AudioMicInput)
+        case videoMessage(VideoMessage)
+        case mediaInput(MediaInput)
+    }
+
+    private final class AnimatingItemNode: ASDisplayNode {
+        let itemNode: ChatMessageItemView
+        private let contextSourceNode: ContextExtractedContentContainingNode
+        private let source: ChatMessageTransitionNode.Source
+        private let getContentAreaInScreenSpace: () -> CGRect
+
+        private let scrollingContainer: ASDisplayNode
+        private let containerNode: ASDisplayNode
+        private let clippingNode: ASDisplayNode
+
+        weak var overlayController: OverlayTransitionContainerController?
+
+        var animationEnded: (() -> Void)?
+        var updateAfterCompletion: Bool = false
+
+        init(itemNode: ChatMessageItemView, contextSourceNode: ContextExtractedContentContainingNode, source: ChatMessageTransitionNode.Source, getContentAreaInScreenSpace: @escaping () -> CGRect) {
+            self.itemNode = itemNode
+            self.getContentAreaInScreenSpace = getContentAreaInScreenSpace
+
+            self.clippingNode = ASDisplayNode()
+            self.clippingNode.clipsToBounds = true
+
+            self.scrollingContainer = ASDisplayNode()
+            self.containerNode = ASDisplayNode()
+            self.contextSourceNode = contextSourceNode
+            self.source = source
+
+            super.init()
+
+            self.addSubnode(self.clippingNode)
+            self.clippingNode.addSubnode(self.scrollingContainer)
+            self.scrollingContainer.addSubnode(self.containerNode)
+        }
+
+        deinit {
+            self.contextSourceNode.addSubnode(self.contextSourceNode.contentNode)
+        }
+
+        func updateLayout(size: CGSize) {
+            self.clippingNode.frame = CGRect(origin: CGPoint(), size: size)
+        }
+
+        func beginAnimation() {
+            let verticalDuration: Double = ChatMessageTransitionNode.animationDuration
+            let horizontalDuration: Double = verticalDuration
+            let delay: Double = 0.0
+
+            var updatedContentAreaInScreenSpace = self.getContentAreaInScreenSpace()
+            updatedContentAreaInScreenSpace.size.width = updatedContentAreaInScreenSpace.origin.x + self.clippingNode.bounds.width
+            updatedContentAreaInScreenSpace.origin.x = 0.0
+
+            let clippingOffset = updatedContentAreaInScreenSpace.minY - self.clippingNode.frame.minY
+            self.clippingNode.frame = CGRect(origin: CGPoint(x: 0.0, y: updatedContentAreaInScreenSpace.minY), size: CGSize(width: updatedContentAreaInScreenSpace.size.width, height: self.clippingNode.bounds.height))
+            self.clippingNode.bounds = CGRect(origin: CGPoint(x: 0.0, y: clippingOffset), size: self.clippingNode.bounds.size)
+
+            switch self.source {
+            case let .textInput(initialTextInput, replyPanel):
+                self.contextSourceNode.isExtractedToContextPreview = true
+                self.contextSourceNode.isExtractedToContextPreviewUpdated?(true)
+
+                var currentContentRect = self.contextSourceNode.contentRect
+                let contextSourceNode = self.contextSourceNode
+                self.contextSourceNode.layoutUpdated = { [weak self, weak contextSourceNode] size in
+                    guard let strongSelf = self, let contextSourceNode = contextSourceNode, strongSelf.contextSourceNode === contextSourceNode else {
+                        return
+                    }
+                    let updatedContentRect = contextSourceNode.contentRect
+                    let deltaY = updatedContentRect.height - currentContentRect.height
+                    if !deltaY.isZero {
+                        currentContentRect = updatedContentRect
+                        strongSelf.addContentOffset(offset: deltaY, itemNode: nil)
+                    }
+                }
+
+                self.containerNode.addSubnode(self.contextSourceNode.contentNode)
+
+                let targetAbsoluteRect = self.contextSourceNode.view.convert(self.contextSourceNode.contentRect, to: self.view)
+
+                let sourceRect = self.view.convert(initialTextInput.sourceRect, from: nil)
+                let sourceBackgroundAbsoluteRect = initialTextInput.backgroundView.frame.offsetBy(dx: sourceRect.minX, dy: sourceRect.minY)
+                let sourceAbsoluteRect = CGRect(origin: CGPoint(x: sourceBackgroundAbsoluteRect.minX, y: sourceBackgroundAbsoluteRect.maxY - self.contextSourceNode.contentRect.height), size: self.contextSourceNode.contentRect.size)
+
+                let textInput = ChatMessageTransitionNode.Source.TextInput(backgroundView: initialTextInput.backgroundView, contentView: initialTextInput.contentView, sourceRect: sourceRect, scrollOffset: initialTextInput.scrollOffset)
+
+                textInput.backgroundView.frame = CGRect(origin: CGPoint(x: 0.0, y: sourceAbsoluteRect.height - sourceBackgroundAbsoluteRect.height), size: textInput.backgroundView.bounds.size)
+                textInput.contentView.frame = textInput.contentView.frame.offsetBy(dx: 0.0, dy: sourceAbsoluteRect.height - sourceBackgroundAbsoluteRect.height)
+
+                var sourceReplyPanel: ReplyPanel?
+                if let replyPanel = replyPanel, let replyPanelParentView = replyPanel.view.superview {
+                    let replyPanelFrame = replyPanel.originalFrameBeforeDismissed ?? replyPanel.frame
+                    var replySourceAbsoluteFrame = replyPanelParentView.convert(replyPanelFrame, to: self.view)
+
+                    replySourceAbsoluteFrame.origin.x -= sourceAbsoluteRect.minX - self.contextSourceNode.contentRect.minX
+                    replySourceAbsoluteFrame.origin.y -= sourceAbsoluteRect.minY - self.contextSourceNode.contentRect.minY
+
+                    var globalTargetFrame = replySourceAbsoluteFrame.offsetBy(dx: 0.0, dy: replyPanelFrame.height)
+
+                    globalTargetFrame.origin.x += sourceAbsoluteRect.minX - targetAbsoluteRect.minX
+                    globalTargetFrame.origin.y += sourceAbsoluteRect.minY - targetAbsoluteRect.minY
+
+                    sourceReplyPanel = ReplyPanel(titleNode: replyPanel.titleNode, textNode: replyPanel.textNode, lineNode: replyPanel.lineNode, imageNode: replyPanel.imageNode, relativeSourceRect: replySourceAbsoluteFrame, relativeTargetRect: globalTargetFrame)
+                }
+
+                self.itemNode.cancelInsertionAnimations()
+
+                let horizontalCurve = ChatMessageTransitionNode.horizontalAnimationCurve
+                let horizontalTransition: ContainedViewLayoutTransition = .animated(duration: horizontalDuration, curve: horizontalCurve)
+                let verticalCurve = ChatMessageTransitionNode.verticalAnimationCurve
+                let verticalTransition: ContainedViewLayoutTransition = .animated(duration: verticalDuration, curve: verticalCurve)
+
+                let combinedTransition = CombinedTransition(horizontal: horizontalTransition, vertical: verticalTransition)
+
+                self.containerNode.frame = targetAbsoluteRect.offsetBy(dx: -self.contextSourceNode.contentRect.minX, dy: -self.contextSourceNode.contentRect.minY)
+                self.contextSourceNode.updateAbsoluteRect?(self.containerNode.frame, UIScreen.main.bounds.size)
+                self.containerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: sourceAbsoluteRect.maxY - targetAbsoluteRect.maxY), to: CGPoint(), duration: verticalDuration, delay: delay, mediaTimingFunction: verticalCurve.mediaTimingFunction, additive: true, force: true, completion: { [weak self] _ in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.endAnimation()
+                })
+                self.containerNode.layer.animatePosition(from: CGPoint(x: sourceAbsoluteRect.minX - targetAbsoluteRect.minX, y: 0.0), to: CGPoint(), duration: horizontalDuration, delay: delay, mediaTimingFunction: horizontalCurve.mediaTimingFunction, additive: true)
+                self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: sourceAbsoluteRect.minX - targetAbsoluteRect.minX, y: 0.0), horizontalCurve, horizontalDuration)
+                self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: 0.0, y: sourceAbsoluteRect.maxY - targetAbsoluteRect.maxY), verticalCurve, verticalDuration)
+
+                if let itemNode = self.itemNode as? ChatMessageBubbleItemNode {
+                    itemNode.animateContentFromTextInputField(textInput: textInput, transition: combinedTransition)
+                    if let sourceReplyPanel = sourceReplyPanel {
+                        itemNode.animateReplyPanel(sourceReplyPanel: sourceReplyPanel, transition: combinedTransition)
+                    }
+                } else if let itemNode = self.itemNode as? ChatMessageAnimatedStickerItemNode {
+                    itemNode.animateContentFromTextInputField(textInput: textInput, transition: combinedTransition)
+                    if let sourceReplyPanel = sourceReplyPanel {
+                        itemNode.animateReplyPanel(sourceReplyPanel: sourceReplyPanel, transition: combinedTransition)
+                    }
+                } else if let itemNode = self.itemNode as? ChatMessageStickerItemNode {
+                    itemNode.animateContentFromTextInputField(textInput: textInput, transition: combinedTransition)
+                    if let sourceReplyPanel = sourceReplyPanel {
+                        itemNode.animateReplyPanel(sourceReplyPanel: sourceReplyPanel, transition: combinedTransition)
+                    }
+                }
+            case let .stickerMediaInput(stickerMediaInput, replyPanel):
+                self.itemNode.cancelInsertionAnimations()
+
+                self.contextSourceNode.isExtractedToContextPreview = true
+                self.contextSourceNode.isExtractedToContextPreviewUpdated?(true)
+
+                self.containerNode.addSubnode(self.contextSourceNode.contentNode)
+
+                let stickerSource: Sticker
+                let sourceAbsoluteRect: CGRect
+                switch stickerMediaInput {
+                case let .inputPanel(sourceItemNode):
+                    stickerSource = Sticker(imageNode: sourceItemNode.imageNode, animationNode: sourceItemNode.animationNode, placeholderNode: sourceItemNode.placeholderNode, relativeSourceRect: sourceItemNode.imageNode.frame)
+                    sourceAbsoluteRect = sourceItemNode.view.convert(stickerSource.imageNode.frame, to: self.view)
+                case let .mediaPanel(sourceItemNode):
+                    stickerSource = Sticker(imageNode: sourceItemNode.imageNode, animationNode: sourceItemNode.animationNode, placeholderNode: sourceItemNode.placeholderNode, relativeSourceRect: sourceItemNode.imageNode.frame)
+                    sourceAbsoluteRect = sourceItemNode.view.convert(stickerSource.imageNode.frame, to: self.view)
+                case let .inputPanelSearch(sourceItemNode):
+                    stickerSource = Sticker(imageNode: sourceItemNode.imageNode, animationNode: sourceItemNode.animationNode, placeholderNode: nil, relativeSourceRect: sourceItemNode.imageNode.frame)
+                    sourceAbsoluteRect = sourceItemNode.view.convert(stickerSource.imageNode.frame, to: self.view)
+                case let .emptyPanel(sourceItemNode):
+                    stickerSource = Sticker(imageNode: sourceItemNode.stickerNode.imageNode, animationNode: sourceItemNode.stickerNode.animationNode, placeholderNode: nil, relativeSourceRect: sourceItemNode.stickerNode.imageNode.frame)
+                    sourceAbsoluteRect = sourceItemNode.stickerNode.view.convert(sourceItemNode.stickerNode.imageNode.frame, to: self.view)
+                }
+
+                let targetAbsoluteRect = self.contextSourceNode.view.convert(self.contextSourceNode.contentRect, to: self.view)
+
+                var sourceReplyPanel: ReplyPanel?
+                if let replyPanel = replyPanel, let replyPanelParentView = replyPanel.view.superview {
+                    var replySourceAbsoluteFrame = replyPanelParentView.convert(replyPanel.originalFrameBeforeDismissed ?? replyPanel.frame, to: self.view)
+                    replySourceAbsoluteFrame.origin.x -= sourceAbsoluteRect.midX - self.contextSourceNode.contentRect.midX
+                    replySourceAbsoluteFrame.origin.y -= sourceAbsoluteRect.midY - self.contextSourceNode.contentRect.midY
+
+                    sourceReplyPanel = ReplyPanel(titleNode: replyPanel.titleNode, textNode: replyPanel.textNode, lineNode: replyPanel.lineNode, imageNode: replyPanel.imageNode, relativeSourceRect: replySourceAbsoluteFrame, relativeTargetRect: replySourceAbsoluteFrame.offsetBy(dx: 0.0, dy: replySourceAbsoluteFrame.height))
+                }
+
+                let combinedTransition = CombinedTransition(horizontal: .animated(duration: horizontalDuration, curve: ChatMessageTransitionNode.horizontalAnimationCurve), vertical: .animated(duration: verticalDuration, curve: ChatMessageTransitionNode.verticalAnimationCurve))
+
+                if let itemNode = self.itemNode as? ChatMessageAnimatedStickerItemNode {
+                    itemNode.animateContentFromStickerGridItem(stickerSource: stickerSource, transition: combinedTransition)
+                    if let sourceAnimationNode = stickerSource.animationNode {
+                        itemNode.animationNode?.setFrameIndex(sourceAnimationNode.currentFrameIndex)
+                    }
+                    if let sourceReplyPanel = sourceReplyPanel {
+                        itemNode.animateReplyPanel(sourceReplyPanel: sourceReplyPanel, transition: combinedTransition)
+                    }
+                } else if let itemNode = self.itemNode as? ChatMessageStickerItemNode {
+                    itemNode.animateContentFromStickerGridItem(stickerSource: stickerSource, transition: combinedTransition)
+                    if let sourceReplyPanel = sourceReplyPanel {
+                        itemNode.animateReplyPanel(sourceReplyPanel: sourceReplyPanel, transition: combinedTransition)
+                    }
+                }
+
+                self.containerNode.frame = targetAbsoluteRect.offsetBy(dx: -self.contextSourceNode.contentRect.minX, dy: -self.contextSourceNode.contentRect.minY)
+                self.contextSourceNode.updateAbsoluteRect?(self.containerNode.frame, UIScreen.main.bounds.size)
+                self.containerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: sourceAbsoluteRect.midY - targetAbsoluteRect.midY), to: CGPoint(), duration: verticalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.verticalAnimationCurve.mediaTimingFunction, additive: true, force: true, completion: { [weak self] _ in
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    strongSelf.endAnimation()
+                })
+                self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: sourceAbsoluteRect.midX - targetAbsoluteRect.midX, y: 0.0), ChatMessageTransitionNode.horizontalAnimationCurve, horizontalDuration)
+                self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: 0.0, y: sourceAbsoluteRect.midY - targetAbsoluteRect.midY), ChatMessageTransitionNode.verticalAnimationCurve, verticalDuration)
+                self.containerNode.layer.animatePosition(from: CGPoint(x: sourceAbsoluteRect.midX - targetAbsoluteRect.midX, y: 0.0), to: CGPoint(), duration: horizontalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.horizontalAnimationCurve.mediaTimingFunction, additive: true)
+
+                switch stickerMediaInput {
+                case .inputPanel:
+                    break
+                case let .mediaPanel(sourceItemNode):
+                    sourceItemNode.isHidden = true
+                case let .inputPanelSearch(sourceItemNode):
+                    sourceItemNode.isHidden = true
+                case let .emptyPanel(sourceItemNode):
+                    sourceItemNode.isHidden = true
+                }
+            case let .audioMicInput(audioMicInput):
+                if let (container, localRect) = audioMicInput.micButton.contentContainer {
+                    let snapshotView = container.snapshotView(afterScreenUpdates: false)
+                    if let snapshotView = snapshotView {
+                        let sourceAbsoluteRect = container.convert(localRect, to: self.view)
+                        snapshotView.frame = sourceAbsoluteRect
+
+                        container.isHidden = true
+
+                        let combinedTransition = CombinedTransition(horizontal: .animated(duration: horizontalDuration, curve: ChatMessageTransitionNode.horizontalAnimationCurve), vertical: .animated(duration: verticalDuration, curve: ChatMessageTransitionNode.verticalAnimationCurve))
+
+                        if let itemNode = self.itemNode as? ChatMessageBubbleItemNode {
+                            if let contextContainer = itemNode.animateFromMicInput(micInputNode: snapshotView, transition: combinedTransition) {
+                                self.containerNode.addSubnode(contextContainer.contentNode)
+
+                                let targetAbsoluteRect = contextContainer.view.convert(contextContainer.contentRect, to: self.view)
+
+                                self.containerNode.frame = targetAbsoluteRect.offsetBy(dx: -contextContainer.contentRect.minX, dy: -contextContainer.contentRect.minY)
+                                contextContainer.updateAbsoluteRect?(self.containerNode.frame, UIScreen.main.bounds.size)
+                                self.containerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: sourceAbsoluteRect.midY - targetAbsoluteRect.midY), to: CGPoint(), duration: verticalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.verticalAnimationCurve.mediaTimingFunction, additive: true, force: true, completion: { [weak self, weak contextContainer, weak container] _ in
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
+                                    if let contextContainer = contextContainer {
+                                        contextContainer.isExtractedToContextPreview = false
+                                        contextContainer.isExtractedToContextPreviewUpdated?(false)
+                                        contextContainer.addSubnode(contextContainer.contentNode)
+                                    }
+
+                                    container?.isHidden = false
+
+                                    strongSelf.endAnimation()
+                                })
+
+                                self.containerNode.layer.animatePosition(from: CGPoint(x: sourceAbsoluteRect.midX - targetAbsoluteRect.midX, y: 0.0), to: CGPoint(), duration: horizontalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.horizontalAnimationCurve.mediaTimingFunction, additive: true)
+                            }
+                        }
+                    }
+                }
+            case let .videoMessage(videoMessage):
+                let combinedTransition = CombinedTransition(horizontal: .animated(duration: horizontalDuration, curve: ChatMessageTransitionNode.horizontalAnimationCurve), vertical: .animated(duration: verticalDuration, curve: ChatMessageTransitionNode.verticalAnimationCurve))
+
+                if let itemNode = self.itemNode as? ChatMessageInstantVideoItemNode {
+                    itemNode.cancelInsertionAnimations()
+
+                    self.contextSourceNode.isExtractedToContextPreview = true
+                    self.contextSourceNode.isExtractedToContextPreviewUpdated?(true)
+
+                    self.containerNode.addSubnode(self.contextSourceNode.contentNode)
+
+                    let sourceAbsoluteRect = videoMessage.view.frame
+                    let targetAbsoluteRect = self.contextSourceNode.view.convert(self.contextSourceNode.contentRect, to: self.view)
+
+                    videoMessage.view.frame = videoMessage.view.frame.offsetBy(dx: targetAbsoluteRect.midX - sourceAbsoluteRect.midX, dy: targetAbsoluteRect.midY - sourceAbsoluteRect.midY)
+
+                    self.containerNode.frame = targetAbsoluteRect.offsetBy(dx: -self.contextSourceNode.contentRect.minX, dy: -self.contextSourceNode.contentRect.minY)
+                    self.containerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: sourceAbsoluteRect.midY - targetAbsoluteRect.midY), to: CGPoint(), duration: horizontalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.horizontalAnimationCurve.mediaTimingFunction, additive: true, force: true)
+
+                    self.containerNode.layer.animatePosition(from: CGPoint(x: sourceAbsoluteRect.midX - targetAbsoluteRect.midX, y: 0.0), to: CGPoint(), duration: verticalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.verticalAnimationCurve.mediaTimingFunction, additive: true, completion: { [weak self] _ in
+                        guard let strongSelf = self else {
+                            return
+                        }
+
+                        strongSelf.endAnimation()
+                    })
+
+                    itemNode.animateFromSnapshot(snapshotView: videoMessage.view, transition: combinedTransition)
+                }
+            case let .mediaInput(mediaInput):
+                if let snapshotView = mediaInput.extractSnapshot() {
+                    if let itemNode = self.itemNode as? ChatMessageBubbleItemNode {
+                        itemNode.cancelInsertionAnimations()
+
+                        self.contextSourceNode.isExtractedToContextPreview = true
+                        self.contextSourceNode.isExtractedToContextPreviewUpdated?(true)
+
+                        self.containerNode.addSubnode(self.contextSourceNode.contentNode)
+
+                        let targetAbsoluteRect = self.contextSourceNode.view.convert(self.contextSourceNode.contentRect, to: self.view)
+                        let sourceBackgroundAbsoluteRect = snapshotView.frame
+                        let sourceAbsoluteRect = CGRect(origin: CGPoint(x: sourceBackgroundAbsoluteRect.midX - self.contextSourceNode.contentRect.size.width / 2.0, y: sourceBackgroundAbsoluteRect.midY - self.contextSourceNode.contentRect.size.height / 2.0), size: self.contextSourceNode.contentRect.size)
+
+                        let combinedTransition = CombinedTransition(horizontal: .animated(duration: horizontalDuration, curve: ChatMessageTransitionNode.horizontalAnimationCurve), vertical: .animated(duration: verticalDuration, curve: ChatMessageTransitionNode.verticalAnimationCurve))
+
+                        if let itemNode = self.itemNode as? ChatMessageBubbleItemNode {
+                            itemNode.animateContentFromMediaInput(snapshotView: snapshotView, transition: combinedTransition)
+                        }
+
+                        self.containerNode.frame = targetAbsoluteRect.offsetBy(dx: -self.contextSourceNode.contentRect.minX, dy: -self.contextSourceNode.contentRect.minY)
+
+                        snapshotView.center = targetAbsoluteRect.center.offsetBy(dx: -self.containerNode.frame.minX, dy: -self.containerNode.frame.minY)
+                        self.containerNode.view.addSubview(snapshotView)
+
+                        self.contextSourceNode.updateAbsoluteRect?(self.containerNode.frame, UIScreen.main.bounds.size)
+
+                        self.containerNode.layer.animatePosition(from: CGPoint(x: 0.0, y: sourceAbsoluteRect.midY - targetAbsoluteRect.midY), to: CGPoint(), duration: horizontalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.horizontalAnimationCurve.mediaTimingFunction, additive: true, force: true)
+                        self.containerNode.layer.animatePosition(from: CGPoint(x: sourceAbsoluteRect.midX - targetAbsoluteRect.midX, y: 0.0), to: CGPoint(), duration: verticalDuration, delay: delay, mediaTimingFunction: ChatMessageTransitionNode.verticalAnimationCurve.mediaTimingFunction, additive: true, force: true, completion: { [weak self] _ in
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            strongSelf.endAnimation()
+                        })
+
+                        combinedTransition.horizontal.animateTransformScale(node: self.contextSourceNode.contentNode, from: CGPoint(x: sourceBackgroundAbsoluteRect.width / targetAbsoluteRect.width, y: sourceBackgroundAbsoluteRect.height / targetAbsoluteRect.height))
+
+                        combinedTransition.horizontal.updateTransformScale(layer: snapshotView.layer, scale: CGPoint(x: 1.0 / (sourceBackgroundAbsoluteRect.width / targetAbsoluteRect.width), y: 1.0 / (sourceBackgroundAbsoluteRect.height / targetAbsoluteRect.height)))
+
+                        snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.12, removeOnCompletion: false, completion: { [weak snapshotView] _ in
+                            snapshotView?.removeFromSuperview()
+                        })
+
+                        self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: sourceAbsoluteRect.minX - targetAbsoluteRect.minX, y: 0.0), ChatMessageTransitionNode.horizontalAnimationCurve, horizontalDuration)
+                        self.contextSourceNode.applyAbsoluteOffset?(CGPoint(x: 0.0, y: sourceAbsoluteRect.maxY - targetAbsoluteRect.maxY), ChatMessageTransitionNode.verticalAnimationCurve, verticalDuration)
+                    }
+                }
+            }
+        }
+
+        private func endAnimation() {
+            self.contextSourceNode.isExtractedToContextPreview = false
+            self.contextSourceNode.isExtractedToContextPreviewUpdated?(false)
+            
+            self.animationEnded?()
+        }
+
+        func addExternalOffset(offset: CGFloat, transition: ContainedViewLayoutTransition, itemNode: ListViewItemNode?) {
+            var applyOffset = false
+            if let itemNode = itemNode {
+                if itemNode === self.itemNode {
+                    applyOffset = true
+                }
+            } else {
+                applyOffset = true
+            }
+            if applyOffset {
+                if transition.isAnimated {
+                    assert(true)
+                }
+                self.scrollingContainer.bounds = self.scrollingContainer.bounds.offsetBy(dx: 0.0, dy: -offset)
+                transition.animateOffsetAdditive(node: self.scrollingContainer, offset: offset)
+            }
+        }
+
+        func addContentOffset(offset: CGFloat, itemNode: ListViewItemNode?) {
+            var applyOffset = false
+            if let itemNode = itemNode {
+                if itemNode === self.itemNode {
+                    applyOffset = true
+                }
+            } else {
+                applyOffset = true
+            }
+            if applyOffset {
+                self.scrollingContainer.bounds = self.scrollingContainer.bounds.offsetBy(dx: 0.0, dy: offset)
+            }
+        }
+    }
+
+    private let listNode: ChatHistoryListNode
+    private let getContentAreaInScreenSpace: () -> CGRect
+    private let onTransitionEvent: (ContainedViewLayoutTransition) -> Void
+
+    private var currentPendingItem: (Int64, Source, () -> Void)?
+
+    private var animatingItemNodes: [AnimatingItemNode] = []
+
+    var hasScheduledTransitions: Bool {
+        return self.currentPendingItem != nil
+    }
+
+    var hasOngoingTransitions: Bool {
+        return !self.animatingItemNodes.isEmpty
+    }
+
+    init(listNode: ChatHistoryListNode, getContentAreaInScreenSpace: @escaping () -> CGRect, onTransitionEvent: @escaping (ContainedViewLayoutTransition) -> Void) {
+        self.listNode = listNode
+        self.getContentAreaInScreenSpace = getContentAreaInScreenSpace
+        self.onTransitionEvent = onTransitionEvent
+
+        super.init()
+
+        self.listNode.animationCorrelationMessageFound = { [weak self] itemNode, correlationId in
+            guard let strongSelf = self, let (currentId, currentSource, initiated) = strongSelf.currentPendingItem else {
+                return
+            }
+            if currentId == correlationId {
+                strongSelf.currentPendingItem = nil
+                strongSelf.beginAnimation(itemNode: itemNode, source: currentSource)
+                initiated()
+            }
+        }
+    }
+
+    func add(correlationId: Int64, source: Source, initiated: @escaping () -> Void) {
+        self.currentPendingItem = (correlationId, source, initiated)
+        self.listNode.setCurrentSendAnimationCorrelationId(correlationId)
+    }
+
+    private func beginAnimation(itemNode: ChatMessageItemView, source: Source) {
+        var contextSourceNode: ContextExtractedContentContainingNode?
+        if let itemNode = itemNode as? ChatMessageBubbleItemNode {
+            contextSourceNode = itemNode.mainContextSourceNode
+        } else if let itemNode = itemNode as? ChatMessageStickerItemNode {
+            contextSourceNode = itemNode.contextSourceNode
+        } else if let itemNode = itemNode as? ChatMessageAnimatedStickerItemNode {
+            contextSourceNode = itemNode.contextSourceNode
+        } else if let itemNode = itemNode as? ChatMessageInstantVideoItemNode {
+            contextSourceNode = itemNode.contextSourceNode
+        }
+
+        if let contextSourceNode = contextSourceNode {
+            let animatingItemNode = AnimatingItemNode(itemNode: itemNode, contextSourceNode: contextSourceNode, source: source, getContentAreaInScreenSpace: self.getContentAreaInScreenSpace)
+            animatingItemNode.updateLayout(size: self.bounds.size)
+            
+            self.animatingItemNodes.append(animatingItemNode)
+            switch source {
+            case .audioMicInput, .videoMessage, .mediaInput:
+                let overlayController = OverlayTransitionContainerController()
+                overlayController.displayNode.addSubnode(animatingItemNode)
+                animatingItemNode.overlayController = overlayController
+                itemNode.item?.context.sharedContext.mainWindow?.presentInGlobalOverlay(overlayController)
+            default:
+                self.addSubnode(animatingItemNode)
+            }
+
+            animatingItemNode.animationEnded = { [weak self, weak animatingItemNode] in
+                guard let strongSelf = self, let animatingItemNode = animatingItemNode else {
+                    return
+                }
+                animatingItemNode.removeFromSupernode()
+                animatingItemNode.overlayController?.dismiss()
+                if let index = strongSelf.animatingItemNodes.firstIndex(where: { $0 === animatingItemNode }) {
+                    strongSelf.animatingItemNodes.remove(at: index)
+                }
+
+                if animatingItemNode.updateAfterCompletion, let item = animatingItemNode.itemNode.item {
+                    for (message, _) in item.content {
+                        strongSelf.listNode.requestMessageUpdate(stableId: message.stableId)
+                        break
+                    }
+                }
+            }
+
+            animatingItemNode.frame = self.bounds
+            animatingItemNode.beginAnimation()
+
+            self.onTransitionEvent(.animated(duration: ChatMessageTransitionNode.animationDuration, curve: ChatMessageTransitionNode.verticalAnimationCurve))
+        }
+    }
+
+    override public func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        return nil
+    }
+
+    func addExternalOffset(offset: CGFloat, transition: ContainedViewLayoutTransition, itemNode: ListViewItemNode?) {
+        for animatingItemNode in self.animatingItemNodes {
+            animatingItemNode.addExternalOffset(offset: offset, transition: transition, itemNode: itemNode)
+        }
+    }
+
+    func addContentOffset(offset: CGFloat, itemNode: ListViewItemNode?) {
+        for animatingItemNode in self.animatingItemNodes {
+            animatingItemNode.addContentOffset(offset: offset, itemNode: itemNode)
+        }
+    }
+
+    func isAnimatingMessage(stableId: UInt32) -> Bool {
+        for itemNode in self.animatingItemNodes {
+            if let item = itemNode.itemNode.item {
+                for (message, _) in item.content {
+                    if message.stableId == stableId {
+                        return true
+                    }
+                }
+            }
+        }
+        return false
+    }
+
+    func scheduleUpdateMessageAfterAnimationCompleted(stableId: UInt32) {
+        for itemNode in self.animatingItemNodes {
+            if let item = itemNode.itemNode.item {
+                for (message, _) in item.content {
+                    if message.stableId == stableId {
+                        itemNode.updateAfterCompletion = true
+                    }
+                }
+            }
+        }
+    }
+
+    func hasScheduledUpdateMessageAfterAnimationCompleted(stableId: UInt32) -> Bool {
+        for itemNode in self.animatingItemNodes {
+            if let item = itemNode.itemNode.item {
+                for (message, _) in item.content {
+                    if message.stableId == stableId {
+                        return itemNode.updateAfterCompletion
+                    }
+                }
+            }
+        }
+        return false
+    }
+}
diff --git a/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift b/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift
index 2fefe2b11c..e40eecd6e8 100644
--- a/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatMessageWebpageBubbleContentNode.swift
@@ -86,7 +86,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
     override func asyncLayoutContent() -> (_ item: ChatMessageBubbleContentItem, _ layoutConstants: ChatMessageItemLayoutConstants, _ preparePosition: ChatMessageBubblePreparePosition, _ messageSelection: Bool?, _ constrainedSize: CGSize) -> (ChatMessageBubbleContentProperties, CGSize?, CGFloat, (CGSize, ChatMessageBubbleContentPosition) -> (CGFloat, (CGFloat) -> (CGSize, (ListViewItemUpdateAnimation, Bool) -> Void))) {
         let contentNodeLayout = self.contentNode.asyncLayout()
         
-        return { item, layoutConstants, _, _, constrainedSize in
+        return { item, layoutConstants, preparePosition, _, constrainedSize in
             var webPage: TelegramMediaWebpage?
             var webPageContent: TelegramMediaWebpageLoadedContent?
             for media in item.message.media {
@@ -171,18 +171,18 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
                             mediaAndFlags = (webpage.image ?? file, [.preferMediaBeforeText])
                         }
                     } else if webpage.type == "telegram_background" {
-                        var topColor: UIColor?
-                        var bottomColor: UIColor?
+                        var colors: [UInt32] = []
                         var rotation: Int32?
-                        if let wallpaper = parseWallpaperUrl(webpage.url), case let .slug(_, _, firstColor, secondColor, intensity, rotationValue) = wallpaper {
-                            topColor = firstColor?.withAlphaComponent(CGFloat(intensity ?? 50) / 100.0)
-                            bottomColor = secondColor?.withAlphaComponent(CGFloat(intensity ?? 50) / 100.0)
+                        var intensity: Int32?
+                        if let wallpaper = parseWallpaperUrl(webpage.url), case let .slug(_, _, colorsValue, intensityValue, rotationValue) = wallpaper {
+                            colors = colorsValue
                             rotation = rotationValue
+                            intensity = intensityValue
                         }
-                        let media = WallpaperPreviewMedia(content: .file(file, topColor, bottomColor, rotation, false, false))
+                        let media = WallpaperPreviewMedia(content: .file(file: file, colors: colors, rotation: rotation, intensity: intensity, false, false))
                         mediaAndFlags = (media, [.preferMediaAspectFilled])
                         if let fileSize = file.size {
-                            badge = dataSizeString(fileSize, decimalSeparator: item.presentationData.dateTimeFormat.decimalSeparator)
+                            badge = dataSizeString(fileSize, formatting: DataSizeStringFormatting(chatPresentationData: item.presentationData))
                         }
                     } else {
                         mediaAndFlags = (file, [])
@@ -207,25 +207,24 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
                     }
                 } else if let type = webpage.type {
                     if type == "telegram_background" {
-                        var topColor: UIColor?
+                        var colors: [UInt32] = []
                         var bottomColor: UIColor?
                         var rotation: Int32?
                         if let wallpaper = parseWallpaperUrl(webpage.url) {
                             if case let .color(color) = wallpaper {
-                                topColor = color
-                            } else if case let .gradient(topColorValue, bottomColorValue, rotationValue) = wallpaper {
-                                topColor = topColorValue
-                                bottomColor = bottomColorValue
+                                colors = [color.rgb]
+                            } else if case let .gradient(colorsValue, rotationValue) = wallpaper {
+                                colors = colorsValue
                                 rotation = rotationValue
                             }
                         }
                         
                         var content: WallpaperPreviewMediaContent?
-                        if let topColor = topColor {
-                            if let bottomColor = bottomColor {
-                                content = .gradient(topColor, bottomColor, rotation)
+                        if !colors.isEmpty {
+                            if colors.count >= 2 {
+                                content = .gradient(colors, rotation)
                             } else {
-                                content = .color(topColor)
+                                content = .color(UIColor(rgb: colors[0]))
                             }
                         }
                         if let content = content {
@@ -254,7 +253,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
                             file = contentFile
                         }
                         if let file = file {
-                            let media = WallpaperPreviewMedia(content: .file(file, nil, nil, nil, true, isSupported))
+                            let media = WallpaperPreviewMedia(content: .file(file: file, colors: [],  rotation: nil, intensity: nil, true, isSupported))
                             mediaAndFlags = (media, ChatMessageAttachedContentNodeMediaFlags())
                         } else if let settings = settings {
                             let media = WallpaperPreviewMedia(content: .themeSettings(settings))
@@ -301,7 +300,7 @@ final class ChatMessageWebpageBubbleContentNode: ChatMessageBubbleContentNode {
                 }
             }
             
-            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, entities, mediaAndFlags, badge, actionIcon, actionTitle, true, layoutConstants, constrainedSize)
+            let (initialWidth, continueLayout) = contentNodeLayout(item.presentationData, item.controllerInteraction.automaticMediaDownloadSettings, item.associatedData, item.attributes, item.context, item.controllerInteraction, item.message, item.read, item.chatLocation, title, subtitle, text, entities, mediaAndFlags, badge, actionIcon, actionTitle, true, layoutConstants, preparePosition, constrainedSize)
             
             let contentProperties = ChatMessageBubbleContentProperties(hidesSimpleAuthorHeader: false, headerSpacing: 8.0, hidesBackground: .never, forceFullCorners: false, forceAlignment: .none)
             
diff --git a/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift b/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
index a3866669e2..34d50532be 100644
--- a/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
+++ b/submodules/TelegramUI/Sources/ChatPanelInterfaceInteraction.swift
@@ -50,14 +50,14 @@ enum ChatPanelRestrictionInfoDisplayType {
 }
 
 final class ChatPanelInterfaceInteraction {
-    let setupReplyMessage: (MessageId, @escaping (ContainedViewLayoutTransition) -> Void) -> Void
+    let setupReplyMessage: (MessageId?, @escaping (ContainedViewLayoutTransition) -> Void) -> Void
     let setupEditMessage: (MessageId?, @escaping (ContainedViewLayoutTransition) -> Void) -> Void
     let beginMessageSelection: ([MessageId], @escaping (ContainedViewLayoutTransition) -> Void) -> Void
     let deleteSelectedMessages: () -> Void
     let reportSelectedMessages: () -> Void
-    let reportMessages: ([Message], ContextController?) -> Void
-    let blockMessageAuthor: (Message, ContextController?) -> Void
-    let deleteMessages: ([Message], ContextController?, @escaping (ContextMenuActionResult) -> Void) -> Void
+    let reportMessages: ([Message], ContextControllerProtocol?) -> Void
+    let blockMessageAuthor: (Message, ContextControllerProtocol?) -> Void
+    let deleteMessages: ([Message], ContextControllerProtocol?, @escaping (ContextMenuActionResult) -> Void) -> Void
     let forwardSelectedMessages: () -> Void
     let forwardCurrentForwardMessages: () -> Void
     let forwardMessages: ([Message]) -> Void
@@ -92,10 +92,10 @@ final class ChatPanelInterfaceInteraction {
     let displayVideoUnmuteTip: (CGPoint?) -> Void
     let switchMediaRecordingMode: () -> Void
     let setupMessageAutoremoveTimeout: () -> Void
-    let sendSticker: (FileMediaReference, ASDisplayNode, CGRect) -> Bool
+    let sendSticker: (FileMediaReference, Bool, ASDisplayNode, CGRect) -> Bool
     let unblockPeer: () -> Void
-    let pinMessage: (MessageId, ContextController?) -> Void
-    let unpinMessage: (MessageId, Bool, ContextController?) -> Void
+    let pinMessage: (MessageId, ContextControllerProtocol?) -> Void
+    let unpinMessage: (MessageId, Bool, ContextControllerProtocol?) -> Void
     let unpinAllMessages: () -> Void
     let openPinnedList: (MessageId) -> Void
     let shareAccountContact: () -> Void
@@ -130,17 +130,18 @@ final class ChatPanelInterfaceInteraction {
     let joinGroupCall: (CachedChannelData.ActiveCall) -> Void
     let presentInviteMembers: () -> Void
     let presentGigagroupHelp: () -> Void
+    let updateShowCommands: ((Bool) -> Bool) -> Void
     let statuses: ChatPanelInterfaceInteractionStatuses?
     
     init(
-        setupReplyMessage: @escaping (MessageId, @escaping (ContainedViewLayoutTransition) -> Void) -> Void,
+        setupReplyMessage: @escaping (MessageId?, @escaping (ContainedViewLayoutTransition) -> Void) -> Void,
         setupEditMessage: @escaping (MessageId?, @escaping (ContainedViewLayoutTransition) -> Void) -> Void,
         beginMessageSelection: @escaping ([MessageId], @escaping (ContainedViewLayoutTransition) -> Void) -> Void,
         deleteSelectedMessages: @escaping () -> Void,
         reportSelectedMessages: @escaping () -> Void,
-        reportMessages: @escaping ([Message], ContextController?) -> Void,
-        blockMessageAuthor: @escaping (Message, ContextController?) -> Void,
-        deleteMessages: @escaping ([Message], ContextController?, @escaping (ContextMenuActionResult) -> Void) -> Void,
+        reportMessages: @escaping ([Message], ContextControllerProtocol?) -> Void,
+        blockMessageAuthor: @escaping (Message, ContextControllerProtocol?) -> Void,
+        deleteMessages: @escaping ([Message], ContextControllerProtocol?, @escaping (ContextMenuActionResult) -> Void) -> Void,
         forwardSelectedMessages: @escaping () -> Void,
         forwardCurrentForwardMessages: @escaping () -> Void,
         forwardMessages: @escaping ([Message]) -> Void,
@@ -175,10 +176,10 @@ final class ChatPanelInterfaceInteraction {
         displayVideoUnmuteTip: @escaping (CGPoint?) -> Void,
         switchMediaRecordingMode: @escaping () -> Void,
         setupMessageAutoremoveTimeout: @escaping () -> Void,
-        sendSticker: @escaping (FileMediaReference, ASDisplayNode, CGRect) -> Bool,
+        sendSticker: @escaping (FileMediaReference, Bool, ASDisplayNode, CGRect) -> Bool,
         unblockPeer: @escaping () -> Void,
-        pinMessage: @escaping (MessageId, ContextController?) -> Void,
-        unpinMessage: @escaping (MessageId, Bool, ContextController?) -> Void,
+        pinMessage: @escaping (MessageId, ContextControllerProtocol?) -> Void,
+        unpinMessage: @escaping (MessageId, Bool, ContextControllerProtocol?) -> Void,
         unpinAllMessages: @escaping () -> Void,
         openPinnedList: @escaping (MessageId) -> Void,
         shareAccountContact: @escaping () -> Void,
@@ -213,6 +214,7 @@ final class ChatPanelInterfaceInteraction {
         presentInviteMembers: @escaping () -> Void,
         presentGigagroupHelp: @escaping () -> Void,
         editMessageMedia: @escaping (MessageId, Bool) -> Void,
+        updateShowCommands: @escaping ((Bool) -> Bool) -> Void,
         statuses: ChatPanelInterfaceInteractionStatuses?
     ) {
         self.setupReplyMessage = setupReplyMessage
@@ -295,6 +297,7 @@ final class ChatPanelInterfaceInteraction {
         self.joinGroupCall = joinGroupCall
         self.presentInviteMembers = presentInviteMembers
         self.presentGigagroupHelp = presentGigagroupHelp
+        self.updateShowCommands = updateShowCommands
         self.statuses = statuses
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
index ac47ca0360..dd30292821 100644
--- a/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatPinnedMessageTitlePanelNode.swift
@@ -54,7 +54,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
     
     private let imageNode: TransformImageNode
     private let imageNodeContainer: ASDisplayNode
-    
+
     private let separatorNode: ASDisplayNode
 
     private var currentLayout: (CGFloat, CGFloat, CGFloat)?
@@ -182,7 +182,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
     
     private var theme: PresentationTheme?
     
-    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
         let panelHeight: CGFloat = 50.0
         var themeUpdated = false
         
@@ -193,8 +193,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
             self.theme = interfaceState.theme
             self.closeButton.setImage(PresentationResourcesChat.chatInputPanelCloseIconImage(interfaceState.theme), for: [])
             self.listButton.setImage(PresentationResourcesChat.chatInputPanelPinnedListIconImage(interfaceState.theme), for: [])
-            self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor
-            self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor
+            self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor
         }
         
         if self.statusDisposable == nil, let interfaceInteraction = self.interfaceInteraction, let statuses = interfaceInteraction.statuses {
@@ -269,7 +268,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
             self.currentMessage = interfaceState.pinnedMessage
             
             if let currentMessage = self.currentMessage, let currentLayout = self.currentLayout {
-                self.enqueueTransition(width: currentLayout.0, panelHeight: panelHeight, leftInset: currentLayout.1, rightInset: currentLayout.2, transition: .immediate, animation: messageUpdatedAnimation, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, accountPeerId: self.context.account.peerId, firstTime: previousMessageWasNil, isReplyThread: isReplyThread)
+                self.enqueueTransition(width: currentLayout.0, panelHeight: panelHeight, leftInset: currentLayout.1, rightInset: currentLayout.2, transition: .immediate, animation: messageUpdatedAnimation, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, dateTimeFormat: interfaceState.dateTimeFormat, accountPeerId: self.context.account.peerId, firstTime: previousMessageWasNil, isReplyThread: isReplyThread)
             }
         }
         
@@ -295,7 +294,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
         self.buttonsContainer.frame = CGRect(origin: CGPoint(x: width - buttonsContainerSize.width - rightInset, y: 0.0), size: buttonsContainerSize)
         
         let closeButtonSize = self.closeButton.measure(CGSize(width: 100.0, height: 100.0))
-        transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: buttonsContainerSize.width - closeButtonSize.width, y: 19.0), size: closeButtonSize))
+        transition.updateFrame(node: self.closeButton, frame: CGRect(origin: CGPoint(x: buttonsContainerSize.width - closeButtonSize.width + 1.0, y: 19.0), size: closeButtonSize))
         
         let listButtonSize = self.listButton.measure(CGSize(width: 100.0, height: 100.0))
         transition.updateFrame(node: self.listButton, frame: CGRect(origin: CGPoint(x: buttonsContainerSize.width - listButtonSize.width + 4.0, y: 13.0), size: listButtonSize))
@@ -304,7 +303,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
         transition.updateFrame(node: self.activityIndicatorContainer, frame: CGRect(origin: CGPoint(x: width - rightInset - indicatorSize.width + 5.0, y: 15.0), size: indicatorSize))
         transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(), size: indicatorSize))
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         self.tapButton.frame = CGRect(origin: CGPoint(), size: CGSize(width: width - rightInset - closeButtonSize.width - 4.0, height: panelHeight))
         
         self.clippingContainer.frame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: panelHeight))
@@ -314,14 +313,14 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
             self.currentLayout = (width, leftInset, rightInset)
             
             if let currentMessage = self.currentMessage {
-                self.enqueueTransition(width: width, panelHeight: panelHeight, leftInset: leftInset, rightInset: rightInset, transition: .immediate, animation: .none, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, accountPeerId: interfaceState.accountPeerId, firstTime: true, isReplyThread: isReplyThread)
+                self.enqueueTransition(width: width, panelHeight: panelHeight, leftInset: leftInset, rightInset: rightInset, transition: .immediate, animation: .none, pinnedMessage: currentMessage, theme: interfaceState.theme, strings: interfaceState.strings, nameDisplayOrder: interfaceState.nameDisplayOrder, dateTimeFormat: interfaceState.dateTimeFormat, accountPeerId: interfaceState.accountPeerId, firstTime: true, isReplyThread: isReplyThread)
             }
         }
         
-        return panelHeight
+        return LayoutResult(backgroundHeight: panelHeight, insetHeight: panelHeight)
     }
     
-    private func enqueueTransition(width: CGFloat, panelHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, animation: PinnedMessageAnimation?, pinnedMessage: ChatPinnedMessage, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, accountPeerId: PeerId, firstTime: Bool, isReplyThread: Bool) {
+    private func enqueueTransition(width: CGFloat, panelHeight: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, animation: PinnedMessageAnimation?, pinnedMessage: ChatPinnedMessage, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat, accountPeerId: PeerId, firstTime: Bool, isReplyThread: Bool) {
         let message = pinnedMessage.message
         
         var animationTransition: ContainedViewLayoutTransition = .immediate
@@ -470,7 +469,7 @@ final class ChatPinnedMessageTitlePanelNode: ChatTitleAccessoryPanelNode {
             }
             let (titleLayout, titleApply) = makeTitleLayout(CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), titleStrings)
             
-            let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: foldLineBreaks(descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: accountPeerId).0), font: Font.regular(15.0), textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets(top: 2.0, left: 0.0, bottom: 2.0, right: 0.0)))
+            let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: foldLineBreaks(descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: accountPeerId).0), font: Font.regular(15.0), textColor: message.media.isEmpty || message.media.first is TelegramMediaWebpage ? theme.chat.inputPanel.primaryTextColor : theme.chat.inputPanel.secondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: width - textLineInset - contentLeftInset - rightInset - textRightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets(top: 2.0, left: 0.0, bottom: 2.0, right: 0.0)))
             
             Queue.mainQueue().async {
                 if let strongSelf = self {
diff --git a/submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift b/submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift
index 75d15bebdc..27475b3b98 100644
--- a/submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift
+++ b/submodules/TelegramUI/Sources/ChatPresentationInterfaceState.swift
@@ -352,6 +352,8 @@ final class ChatPresentationInterfaceState: Equatable {
     let hasActiveGroupCall: Bool
     let importState: ChatPresentationImportState?
     let reportReason: ReportReason?
+    let showCommands: Bool
+    let hasBotCommands: Bool
     
     init(chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, bubbleCorners: PresentationChatBubbleCorners, accountPeerId: PeerId, mode: ChatControllerPresentationMode, chatLocation: ChatLocation, subject: ChatControllerSubject?, peerNearbyData: ChatPeerNearbyData?, greetingData: ChatGreetingData?, pendingUnpinnedAllMessages: Bool, activeGroupCallInfo: ChatActiveGroupCallInfo?, hasActiveGroupCall: Bool, importState: ChatPresentationImportState?) {
         self.interfaceState = ChatInterfaceState()
@@ -404,9 +406,11 @@ final class ChatPresentationInterfaceState: Equatable {
         self.hasActiveGroupCall = hasActiveGroupCall
         self.importState = importState
         self.reportReason = nil
+        self.showCommands = false
+        self.hasBotCommands = false
     }
     
-    init(interfaceState: ChatInterfaceState, chatLocation: ChatLocation, renderedPeer: RenderedPeer?, isNotAccessible: Bool, explicitelyCanPinMessages: Bool, contactStatus: ChatContactStatus?, hasBots: Bool, isArchived: Bool, inputTextPanelState: ChatTextInputPanelState, editMessageState: ChatEditInterfaceMessageState?, recordedMediaPreview: ChatRecordedMediaPreview?, inputQueryResults: [ChatPresentationInputQueryKind: ChatPresentationInputQueryResult], inputMode: ChatInputMode, titlePanelContexts: [ChatTitlePanelContext], keyboardButtonsMessage: Message?, pinnedMessageId: MessageId?, pinnedMessage: ChatPinnedMessage?, peerIsBlocked: Bool, peerIsMuted: Bool, peerDiscussionId: PeerId?, peerGeoLocation: PeerGeoLocation?, callsAvailable: Bool, callsPrivate: Bool, slowmodeState: ChatSlowmodeState?, chatHistoryState: ChatHistoryNodeHistoryState?, botStartPayload: String?, urlPreview: (String, TelegramMediaWebpage)?, editingUrlPreview: (String, TelegramMediaWebpage)?, search: ChatSearchData?, searchQuerySuggestionResult: ChatPresentationInputQueryResult?, chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, bubbleCorners: PresentationChatBubbleCorners, accountPeerId: PeerId, mode: ChatControllerPresentationMode, hasScheduledMessages: Bool, autoremoveTimeout: Int32?, subject: ChatControllerSubject?, peerNearbyData: ChatPeerNearbyData?, greetingData: ChatGreetingData?, pendingUnpinnedAllMessages: Bool, activeGroupCallInfo: ChatActiveGroupCallInfo?, hasActiveGroupCall: Bool, importState: ChatPresentationImportState?, reportReason: ReportReason?) {
+    init(interfaceState: ChatInterfaceState, chatLocation: ChatLocation, renderedPeer: RenderedPeer?, isNotAccessible: Bool, explicitelyCanPinMessages: Bool, contactStatus: ChatContactStatus?, hasBots: Bool, isArchived: Bool, inputTextPanelState: ChatTextInputPanelState, editMessageState: ChatEditInterfaceMessageState?, recordedMediaPreview: ChatRecordedMediaPreview?, inputQueryResults: [ChatPresentationInputQueryKind: ChatPresentationInputQueryResult], inputMode: ChatInputMode, titlePanelContexts: [ChatTitlePanelContext], keyboardButtonsMessage: Message?, pinnedMessageId: MessageId?, pinnedMessage: ChatPinnedMessage?, peerIsBlocked: Bool, peerIsMuted: Bool, peerDiscussionId: PeerId?, peerGeoLocation: PeerGeoLocation?, callsAvailable: Bool, callsPrivate: Bool, slowmodeState: ChatSlowmodeState?, chatHistoryState: ChatHistoryNodeHistoryState?, botStartPayload: String?, urlPreview: (String, TelegramMediaWebpage)?, editingUrlPreview: (String, TelegramMediaWebpage)?, search: ChatSearchData?, searchQuerySuggestionResult: ChatPresentationInputQueryResult?, chatWallpaper: TelegramWallpaper, theme: PresentationTheme, strings: PresentationStrings, dateTimeFormat: PresentationDateTimeFormat, nameDisplayOrder: PresentationPersonNameOrder, limitsConfiguration: LimitsConfiguration, fontSize: PresentationFontSize, bubbleCorners: PresentationChatBubbleCorners, accountPeerId: PeerId, mode: ChatControllerPresentationMode, hasScheduledMessages: Bool, autoremoveTimeout: Int32?, subject: ChatControllerSubject?, peerNearbyData: ChatPeerNearbyData?, greetingData: ChatGreetingData?, pendingUnpinnedAllMessages: Bool, activeGroupCallInfo: ChatActiveGroupCallInfo?, hasActiveGroupCall: Bool, importState: ChatPresentationImportState?, reportReason: ReportReason?, showCommands: Bool, hasBotCommands: Bool) {
         self.interfaceState = interfaceState
         self.chatLocation = chatLocation
         self.renderedPeer = renderedPeer
@@ -457,6 +461,8 @@ final class ChatPresentationInterfaceState: Equatable {
         self.hasActiveGroupCall = hasActiveGroupCall
         self.importState = importState
         self.reportReason = reportReason
+        self.showCommands = showCommands
+        self.hasBotCommands = hasBotCommands
     }
     
     static func ==(lhs: ChatPresentationInterfaceState, rhs: ChatPresentationInterfaceState) -> Bool {
@@ -622,35 +628,41 @@ final class ChatPresentationInterfaceState: Equatable {
         if lhs.reportReason != rhs.reportReason {
             return false
         }
+        if lhs.showCommands != rhs.showCommands {
+            return false
+        }
+        if lhs.hasBotCommands != rhs.hasBotCommands {
+            return false
+        }
         return true
     }
     
     func updatedInterfaceState(_ f: (ChatInterfaceState) -> ChatInterfaceState) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: f(self.interfaceState), chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: f(self.interfaceState), chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPeer(_ f: (RenderedPeer?) -> RenderedPeer?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: f(self.renderedPeer), isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: f(self.renderedPeer), isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedIsNotAccessible(_ isNotAccessible: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedExplicitelyCanPinMessages(_ explicitelyCanPinMessages: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedContactStatus(_ contactStatus: ChatContactStatus?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedHasBots(_ hasBots: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedIsArchived(_ isArchived: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedInputQueryResult(queryKind: ChatPresentationInputQueryKind, _ f: (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?) -> ChatPresentationInterfaceState {
@@ -662,143 +674,151 @@ final class ChatPresentationInterfaceState: Equatable {
             inputQueryResults.removeValue(forKey: queryKind)
         }
 
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedInputTextPanelState(_ f: (ChatTextInputPanelState) -> ChatTextInputPanelState) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: f(self.inputTextPanelState), editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: f(self.inputTextPanelState), editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedEditMessageState(_ editMessageState: ChatEditInterfaceMessageState?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedRecordedMediaPreview(_ recordedMediaPreview: ChatRecordedMediaPreview?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedInputMode(_ f: (ChatInputMode) -> ChatInputMode) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: f(self.inputMode), titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: f(self.inputMode), titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedTitlePanelContext(_ f: ([ChatTitlePanelContext]) -> [ChatTitlePanelContext]) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: f(self.titlePanelContexts), keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: f(self.titlePanelContexts), keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedKeyboardButtonsMessage(_ message: Message?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: message, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: message, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPinnedMessageId(_ pinnedMessageId: MessageId?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPinnedMessage(_ pinnedMessage: ChatPinnedMessage?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPeerIsBlocked(_ peerIsBlocked: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPeerIsMuted(_ peerIsMuted: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPeerDiscussionId(_ peerDiscussionId: PeerId?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPeerGeoLocation(_ peerGeoLocation: PeerGeoLocation?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedCallsAvailable(_ callsAvailable: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedCallsPrivate(_ callsPrivate: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedSlowmodeState(_ slowmodeState: ChatSlowmodeState?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedBotStartPayload(_ botStartPayload: String?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedChatHistoryState(_ chatHistoryState: ChatHistoryNodeHistoryState?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedUrlPreview(_ urlPreview: (String, TelegramMediaWebpage)?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedEditingUrlPreview(_ editingUrlPreview: (String, TelegramMediaWebpage)?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedSearch(_ search: ChatSearchData?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedSearchQuerySuggestionResult(_ f: (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: f(self.searchQuerySuggestionResult), chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: f(self.searchQuerySuggestionResult), chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedMode(_ mode: ChatControllerPresentationMode) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedTheme(_ theme: PresentationTheme) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedStrings(_ strings: PresentationStrings) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedDateTimeFormat(_ dateTimeFormat: PresentationDateTimeFormat) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedChatWallpaper(_ chatWallpaper: TelegramWallpaper) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedBubbleCorners(_ bubbleCorners: PresentationChatBubbleCorners) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedHasScheduledMessages(_ hasScheduledMessages: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedAutoremoveTimeout(_ autoremoveTimeout: Int32?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedPendingUnpinnedAllMessages(_ pendingUnpinnedAllMessages: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedActiveGroupCallInfo(_ activeGroupCallInfo: ChatActiveGroupCallInfo?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedHasActiveGroupCall(_ hasActiveGroupCall: Bool) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedImportState(_ importState: ChatPresentationImportState?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: importState, reportReason: self.reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
     }
     
     func updatedReportReason(_ reportReason: ReportReason?) -> ChatPresentationInterfaceState {
-        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: reportReason)
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: reportReason, showCommands: self.showCommands, hasBotCommands: self.hasBotCommands)
+    }
+    
+    func updatedShowCommands(_ showCommands: Bool) -> ChatPresentationInterfaceState {
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState,  chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: showCommands, hasBotCommands: self.hasBotCommands)
+    }
+    
+    func updatedHasBotCommands(_ hasBotCommands: Bool) -> ChatPresentationInterfaceState {
+        return ChatPresentationInterfaceState(interfaceState: self.interfaceState, chatLocation: self.chatLocation, renderedPeer: self.renderedPeer, isNotAccessible: self.isNotAccessible, explicitelyCanPinMessages: self.explicitelyCanPinMessages, contactStatus: self.contactStatus, hasBots: self.hasBots, isArchived: self.isArchived, inputTextPanelState: self.inputTextPanelState, editMessageState: self.editMessageState, recordedMediaPreview: self.recordedMediaPreview, inputQueryResults: self.inputQueryResults, inputMode: self.inputMode, titlePanelContexts: self.titlePanelContexts, keyboardButtonsMessage: self.keyboardButtonsMessage, pinnedMessageId: self.pinnedMessageId, pinnedMessage: self.pinnedMessage, peerIsBlocked: self.peerIsBlocked, peerIsMuted: self.peerIsMuted, peerDiscussionId: self.peerDiscussionId, peerGeoLocation: self.peerGeoLocation, callsAvailable: self.callsAvailable, callsPrivate: self.callsPrivate, slowmodeState: self.slowmodeState, chatHistoryState: self.chatHistoryState, botStartPayload: self.botStartPayload, urlPreview: self.urlPreview, editingUrlPreview: self.editingUrlPreview, search: self.search, searchQuerySuggestionResult: self.searchQuerySuggestionResult, chatWallpaper: self.chatWallpaper, theme: self.theme, strings: self.strings, dateTimeFormat: self.dateTimeFormat, nameDisplayOrder: self.nameDisplayOrder, limitsConfiguration: self.limitsConfiguration, fontSize: self.fontSize, bubbleCorners: self.bubbleCorners, accountPeerId: self.accountPeerId, mode: self.mode, hasScheduledMessages: self.hasScheduledMessages, autoremoveTimeout: self.autoremoveTimeout, subject: self.subject, peerNearbyData: self.peerNearbyData, greetingData: self.greetingData, pendingUnpinnedAllMessages: self.pendingUnpinnedAllMessages, activeGroupCallInfo: self.activeGroupCallInfo, hasActiveGroupCall: self.hasActiveGroupCall, importState: self.importState, reportReason: self.reportReason, showCommands: self.showCommands, hasBotCommands: hasBotCommands)
     }
 }
 
diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsController.swift b/submodules/TelegramUI/Sources/ChatRecentActionsController.swift
index de27437a8d..b601fbe5de 100644
--- a/submodules/TelegramUI/Sources/ChatRecentActionsController.swift
+++ b/submodules/TelegramUI/Sources/ChatRecentActionsController.swift
@@ -98,7 +98,7 @@ final class ChatRecentActionsController: TelegramBaseController {
         }, displayVideoUnmuteTip: { _ in
         }, switchMediaRecordingMode: {
         }, setupMessageAutoremoveTimeout: {
-        }, sendSticker: { _, _, _ in
+        }, sendSticker: { _, _, _, _ in
             return false
         }, unblockPeer: {
         }, pinMessage: { _, _ in
@@ -138,7 +138,7 @@ final class ChatRecentActionsController: TelegramBaseController {
         }, presentInviteMembers: {
         }, presentGigagroupHelp: {
         }, editMessageMedia: { _, _ in
-        }, statuses: nil)
+        }, updateShowCommands: { _ in }, statuses: nil)
         
         self.navigationItem.titleView = self.titleView
         
@@ -204,7 +204,7 @@ final class ChatRecentActionsController: TelegramBaseController {
         childrenLayout.intrinsicInsets.bottom += 49.0
         self.presentationContext.containerLayoutUpdated(childrenLayout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc func activateSearch() {
diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
index ef144d46f8..b24da72856 100644
--- a/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRecentActionsControllerNode.swift
@@ -23,6 +23,7 @@ import PeerInfoUI
 import InviteLinksUI
 import UndoUI
 import TelegramCallsUI
+import WallpaperBackgroundNode
 
 private final class ChatRecentActionsListOpaqueState {
     let entries: [ChatRecentActionsEntry]
@@ -57,8 +58,8 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
     private var state: ChatRecentActionsControllerState
     private var containerLayout: (ContainerViewLayout, CGFloat)?
     
-    private let backgroundNode: ASDisplayNode
-    private let panelBackgroundNode: ASDisplayNode
+    private let backgroundNode: WallpaperBackgroundNode
+    private let panelBackgroundNode: NavigationBackgroundNode
     private let panelSeparatorNode: ASDisplayNode
     private let panelButtonNode: HighlightableButtonNode
     
@@ -98,18 +99,17 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         
         self.automaticMediaDownloadSettings = context.sharedContext.currentAutomaticMediaDownloadSettings.with { $0 }
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.isLayerBacked = true
+        self.backgroundNode = WallpaperBackgroundNode(context: context)
+        self.backgroundNode.isUserInteractionEnabled = false
         
-        self.panelBackgroundNode = ASDisplayNode()
-        self.panelBackgroundNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor
+        self.panelBackgroundNode = NavigationBackgroundNode(color: self.presentationData.theme.chat.inputPanel.panelBackgroundColor)
         self.panelSeparatorNode = ASDisplayNode()
         self.panelSeparatorNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelSeparatorColor
         self.panelButtonNode = HighlightableButtonNode()
         self.panelButtonNode.setTitle(self.presentationData.strings.Channel_AdminLog_InfoPanelTitle, with: Font.regular(17.0), with: self.presentationData.theme.chat.inputPanel.panelControlAccentColor, for: [])
         
         self.listNode = ListView()
-        self.listNode.dynamicBounceEnabled = !self.presentationData.disableAnimations
+        self.listNode.dynamicBounceEnabled = false
         self.listNode.transform = CATransform3DMakeRotation(CGFloat(Double.pi), 0.0, 0.0, 1.0)
         self.listNode.accessibilityPageScrolledString = { row, count in
             return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
@@ -121,13 +121,14 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         
         self.state = ChatRecentActionsControllerState(chatWallpaper: self.presentationData.chatWallpaper, theme: self.presentationData.theme, strings: self.presentationData.strings, fontSize: self.presentationData.chatFontSize)
         
-        self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations, largeEmoji: self.presentationData.largeEmoji, chatBubbleCorners: self.presentationData.chatBubbleCorners))
+        self.chatPresentationDataPromise = Promise(ChatPresentationData(theme: ChatPresentationThemeData(theme: self.presentationData.theme, wallpaper: self.presentationData.chatWallpaper), fontSize: self.presentationData.chatFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: self.presentationData.largeEmoji, chatBubbleCorners: self.presentationData.chatBubbleCorners))
         
-        self.eventLogContext = ChannelAdminEventLogContext(postbox: self.context.account.postbox, network: self.context.account.network, peerId: self.peer.id)
+        self.eventLogContext = self.context.engine.peers.channelAdminEventLog(peerId: self.peer.id)
         
         super.init()
         
-        self.backgroundNode.contents = chatControllerBackgroundImage(theme: self.state.theme, wallpaper: self.state.chatWallpaper, mediaBox: context.sharedContext.accountManager.mediaBox, knockoutMode: context.sharedContext.immediateExperimentalUISettings.knockoutWallpaper)?.cgImage
+        self.backgroundNode.update(wallpaper: self.state.chatWallpaper)
+        self.backgroundNode.updateBubbleTheme(bubbleTheme: self.presentationData.theme, bubbleCorners: self.presentationData.chatBubbleCorners)
         
         self.addSubnode(self.backgroundNode)
         self.addSubnode(self.listNode)
@@ -139,7 +140,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         
         self.panelButtonNode.addTarget(self, action: #selector(self.infoButtonPressed), forControlEvents: .touchUpInside)
         
-        let (adminsDisposable, _) = self.context.peerChannelMemberCategoriesContextsManager.admins(postbox: self.context.account.postbox, network: self.context.account.network, accountPeerId: context.account.peerId, peerId: self.peer.id, searchQuery: nil, updated: { [weak self] state in
+        let (adminsDisposable, _) = self.context.peerChannelMemberCategoriesContextsManager.admins(engine: self.context.engine, postbox: self.context.account.postbox, network: self.context.account.network, accountPeerId: context.account.peerId, peerId: self.peer.id, searchQuery: nil, updated: { [weak self] state in
             self?.adminsState = state
         })
         self.adminsDisposable = adminsDisposable
@@ -167,8 +168,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
                                         items.append(ActionSheetButtonItem(title: strongSelf.presentationData.strings.InviteLink_ContextRevoke, color: .destructive, action: { [weak actionSheet] in
                                             actionSheet?.dismissAnimated()
                                             if let strongSelf = self {
-                                                let _ = (revokePeerExportedInvitation(account: strongSelf.context.account, peerId: peer.id, link: invite.link)
-                                                
+                                                let _ = (strongSelf.context.engine.peers.revokePeerExportedInvitation(peerId: peer.id, link: invite.link)
                                                 |> deliverOnMainQueue).start(completed: { [weak self] in
                                                     self?.eventLogContext.reload()
                                                 })
@@ -260,9 +260,10 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
             self?.openPeerMention(name)
         }, openMessageContextMenu: { [weak self] message, selectAll, node, frame, _ in
             self?.openMessageContextMenu(message: message, selectAll: selectAll, node: node, frame: frame)
+        }, activateMessagePinch: { _ in
         }, openMessageContextActions: { _, _, _, _ in
         }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in
-        }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { [weak self] url, _, _, _ in
+        }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _, _, _ in return false }, sendGif: { _, _, _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { [weak self] url, _, _, _ in
             self?.openUrl(url)
         }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { [weak self] message, associatedData in
             if let strongSelf = self, let navigationController = strongSelf.getNavigationController() {
@@ -281,7 +282,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
             }
             let resolveSignal: Signal<Peer?, NoError>
             if let peerName = peerName {
-                resolveSignal = resolvePeerByName(account: strongSelf.context.account, name: peerName)
+                resolveSignal = strongSelf.context.engine.peers.resolvePeerByName(name: peerName)
                     |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                         if let peerId = peerId {
                             return context.account.postbox.loadedPeerWithId(peerId)
@@ -527,8 +528,6 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         }, displayPsa: { _, _ in
         }, displayDiceTooltip: { _ in
         }, animateDiceSuccess: { _ in
-        }, greetingStickerNode: {
-            return nil
         }, openPeerContextMenu: { _, _, _, _, _ in
         }, openMessageReplies: { _, _, _ in
         }, openReplyThreadOriginalMessage: { _ in
@@ -536,10 +535,12 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         }, editMessageMedia: { _, _ in  
         }, copyText: { _ in
         }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
         }, requestMessageUpdate: { _ in
         }, cancelInteractiveKeyboardGestures: {
         }, automaticMediaDownloadSettings: self.automaticMediaDownloadSettings,
-           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false))
+        pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false), presentationContext: ChatPresentationContext(backgroundNode: self.backgroundNode))
         self.controllerInteraction = controllerInteraction
         
         self.listNode.displayedItemRangeChanged = { [weak self] displayedRange, opaqueTransactionState in
@@ -611,7 +612,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         |> deliverOnMainQueue).start(next: { [weak self] presentationData in
             if let strongSelf = self {
                 strongSelf.presentationData = presentationData
-                strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners)))
+                strongSelf.chatPresentationDataPromise.set(.single(ChatPresentationData(theme: ChatPresentationThemeData(theme: presentationData.theme, wallpaper: presentationData.chatWallpaper), fontSize: presentationData.chatFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true, largeEmoji: presentationData.largeEmoji, chatBubbleCorners: presentationData.chatBubbleCorners)))
                 
                 strongSelf.updateThemeAndStrings(theme: presentationData.theme, strings: presentationData.strings)
             }
@@ -630,7 +631,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
     }
     
     func updateThemeAndStrings(theme: PresentationTheme, strings: PresentationStrings) {
-        self.panelBackgroundNode.backgroundColor = theme.chat.inputPanel.panelBackgroundColor
+        self.panelBackgroundNode.updateColor(color: theme.chat.inputPanel.panelBackgroundColor, transition: .immediate)
         self.panelSeparatorNode.backgroundColor = theme.chat.inputPanel.panelSeparatorColor
         self.panelButtonNode.setTitle(presentationData.strings.Channel_AdminLog_InfoPanelTitle, with: Font.regular(17.0), with: theme.chat.inputPanel.panelControlAccentColor, for: [])
     }
@@ -646,10 +647,12 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
         let cleanInsets = layout.insets(options: [])
         
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: layout.size))
+        self.backgroundNode.updateLayout(size: self.backgroundNode.bounds.size, transition: transition)
         
         let intrinsicPanelHeight: CGFloat = 47.0
         let panelHeight = intrinsicPanelHeight + cleanInsets.bottom
         transition.updateFrame(node: self.panelBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - panelHeight), size: CGSize(width: layout.size.width, height: panelHeight)))
+        self.panelBackgroundNode.update(size: self.panelBackgroundNode.bounds.size, transition: transition)
         transition.updateFrame(node: self.panelSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - panelHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
         transition.updateFrame(node: self.panelButtonNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - panelHeight), size: CGSize(width: layout.size.width, height: intrinsicPanelHeight)))
         
@@ -785,7 +788,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
     
     private func openPeerMention(_ name: String) {
         let postbox = self.context.account.postbox
-        self.navigationActionDisposable.set((resolvePeerByName(account: self.context.account, name: name, ageLimit: 10)
+        self.navigationActionDisposable.set((self.context.engine.peers.resolvePeerByName(name: name, ageLimit: 10)
         |> take(1)
         |> mapToSignal { peerId -> Signal<Peer?, NoError> in
             if let peerId = peerId {
@@ -835,7 +838,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
             if canBan {
                 actions.append(ContextMenuAction(content: .text(title: self.presentationData.strings.Conversation_ContextMenuBan, accessibilityLabel: self.presentationData.strings.Conversation_ContextMenuBan), action: { [weak self] in
                     if let strongSelf = self {
-                        strongSelf.banDisposables.set((fetchChannelParticipant(account: strongSelf.context.account, peerId: strongSelf.peer.id, participantId: author.id)
+                        strongSelf.banDisposables.set((strongSelf.context.engine.peers.fetchChannelParticipant(peerId: strongSelf.peer.id, participantId: author.id)
                         |> deliverOnMainQueue).start(next: { participant in
                             if let strongSelf = self {
                                 strongSelf.presentController(channelBannedMemberController(context: strongSelf.context, peerId: strongSelf.peer.id, memberId: author.id, initialParticipant: participant, updated: { _ in }, upgradedToSupergroup: { _, f in f() }), .window(.root), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
@@ -880,7 +883,7 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
     }
     
     private func openUrl(_ url: String) {
-        self.navigationActionDisposable.set((self.context.sharedContext.resolveUrl(account: self.context.account, url: url, skipUrlAuth: true) |> deliverOnMainQueue).start(next: { [weak self] result in
+        self.navigationActionDisposable.set((self.context.sharedContext.resolveUrl(context: self.context, peerId: nil, url: url, skipUrlAuth: true) |> deliverOnMainQueue).start(next: { [weak self] result in
             if let strongSelf = self {
                 switch result {
                     case let .externalUrl(url):
@@ -901,13 +904,13 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
                         break
                     case .groupBotStart:
                         break
-                    case let .channelMessage(peerId, messageId):
+                    case let .channelMessage(peerId, messageId, timecode):
                         if let navigationController = strongSelf.getNavigationController() {
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true)))
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true, timecode: timecode)))
                         }
                    case let .replyThreadMessage(replyThreadMessage, messageId):
                         if let navigationController = strongSelf.getNavigationController() {
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .replyThread(replyThreadMessage), subject: .message(id: messageId, highlight: true)))
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .replyThread(replyThreadMessage), subject: .message(id: messageId, highlight: true, timecode: nil)))
                         }
                     case let .stickerPack(name):
                         let packReference: StickerPackReference = .name(name)
@@ -948,8 +951,9 @@ final class ChatRecentActionsControllerNode: ViewControllerTracingNode {
                         break
                     case let .joinVoiceChat(peerId, invite):
                         strongSelf.presentController(VoiceChatJoinScreen(context: strongSelf.context, peerId: peerId, invite: invite, join: { call in
-                            
                         }), .window(.root), nil)
+                    case .importStickers:
+                        break
                 }
             }
         }))
diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift b/submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
index d4ee155c36..c667bf02b1 100644
--- a/submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
+++ b/submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
@@ -449,7 +449,7 @@ public func channelRecentActionsFilterController(context: AccountContext, peer:
     
     adminsPromise.set(.single(nil))
     
-    let (membersDisposable, _) = context.peerChannelMemberCategoriesContextsManager.admins(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peer.id) { membersState in
+    let (membersDisposable, _) = context.peerChannelMemberCategoriesContextsManager.admins(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peer.id) { membersState in
         if case .loading = membersState.loadingState, membersState.list.isEmpty {
             adminsPromise.set(.single(nil))
         } else {
diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift b/submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
index 1197ebff43..5cc933f1a5 100644
--- a/submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
+++ b/submodules/TelegramUI/Sources/ChatRecentActionsHistoryTransition.swift
@@ -286,7 +286,7 @@ struct ChatRecentActionsEntry: Comparable, Identifiable {
                     case .header:
                         var peers = SimpleDictionary<PeerId, Peer>()
                         var author: Peer?
-                        if self.entry.event.peerId == PeerId(namespace: Namespaces.Peer.CloudUser, id: 136817688) {
+                        if self.entry.event.peerId == PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(136817688)) {
                             author = message?.effectiveAuthor
                         } else if let peer = self.entry.peers[self.entry.event.peerId] {
                             author = peer
diff --git a/submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift b/submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift
index e591d1c031..b052b828fc 100644
--- a/submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRecentActionsSearchNavigationContentNode.swift
@@ -26,7 +26,7 @@ final class ChatRecentActionsSearchNavigationContentNode: NavigationBarContentNo
         
         self.cancel = cancel
         
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern)
+        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern, displayBackground: false)
         let placeholderText = strings.Common_Search
         self.searchBar.placeholderString = NSAttributedString(string: placeholderText, font: searchBarFont, textColor: theme.rootController.navigationSearchBar.inputPlaceholderTextColor)
         
diff --git a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
index b00eec3f7c..5be394c3cd 100644
--- a/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRecordingPreviewInputPanelNode.swift
@@ -11,14 +11,7 @@ import UniversalMediaPlayer
 import AppBundle
 import ContextUI
 import AnimationUI
-
-private func generatePauseIcon(_ theme: PresentationTheme) -> UIImage? {
-    return generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/MinimizedPause"), color: theme.chat.inputPanel.actionControlForegroundColor)
-}
-
-private func generatePlayIcon(_ theme: PresentationTheme) -> UIImage? {
-    return generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/MinimizedPlay"), color: theme.chat.inputPanel.actionControlForegroundColor)
-}
+import ManagedAnimationNode
 
 extension AudioWaveformNode: CustomMediaPlayerScrubbingForegroundNode {
     
@@ -30,7 +23,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
     let sendButton: HighlightTrackingButtonNode
     private var sendButtonRadialStatusNode: ChatSendButtonRadialStatusNode?
     let playButton: HighlightableButtonNode
-    let pauseButton: HighlightableButtonNode
+    private let playPauseIconNode: PlayPauseIconNode
     private let waveformButton: ASButtonNode
     let waveformBackgroundNode: ASImageNode
     
@@ -76,13 +69,10 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         
         self.playButton = HighlightableButtonNode()
         self.playButton.displaysAsynchronously = false
-        self.playButton.setImage(generatePlayIcon(theme), for: [])
-        self.playButton.isUserInteractionEnabled = false
-        self.pauseButton = HighlightableButtonNode()
-        self.pauseButton.displaysAsynchronously = false
-        self.pauseButton.setImage(generatePauseIcon(theme), for: [])
-        self.pauseButton.isHidden = true
-        self.pauseButton.isUserInteractionEnabled = false
+        
+        self.playPauseIconNode = PlayPauseIconNode()
+        self.playPauseIconNode.enqueueState(.play, animated: false)
+        self.playPauseIconNode.customColor = theme.chat.inputPanel.actionControlForegroundColor
         
         self.waveformButton = ASButtonNode()
         self.waveformButton.accessibilityTraits.insert(.startsMediaSession)
@@ -106,9 +96,9 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         self.addSubnode(self.sendButton)
         self.addSubnode(self.waveformScubberNode)
         self.addSubnode(self.playButton)
-        self.addSubnode(self.pauseButton)
         self.addSubnode(self.durationLabel)
         self.addSubnode(self.waveformButton)
+        self.playButton.addSubnode(self.playPauseIconNode)
         
         self.sendButton.highligthedChanged = { [weak self] highlighted in
             if let strongSelf = self {
@@ -168,6 +158,9 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
                 if let context = self.context {
                     let mediaManager = context.sharedContext.mediaManager
                     let mediaPlayer = MediaPlayer(audioSessionManager: mediaManager.audioSession, postbox: context.account.postbox, resourceReference: .standalone(resource: recordedMediaPreview.resource), streamable: .none, video: false, preferSoftwareDecoding: false, enableSound: true, fetchAutomatically: true)
+                    mediaPlayer.actionAtEnd = .action{ [weak mediaPlayer] in
+                        mediaPlayer?.seek(timestamp: 0.0)
+                    }
                     self.mediaPlayer = mediaPlayer
                     self.durationLabel.defaultDuration = Double(recordedMediaPreview.duration)
                     self.durationLabel.status = mediaPlayer.status
@@ -177,11 +170,10 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
                         if let strongSelf = self {
                             switch status.status {
                                 case .playing, .buffering(_, true, _, _):
-                                    strongSelf.playButton.isHidden = true
+                                    strongSelf.playPauseIconNode.enqueueState(.pause, animated: true)
                                 default:
-                                    strongSelf.playButton.isHidden = false
+                                    strongSelf.playPauseIconNode.enqueueState(.play, animated: true)
                             }
-                            strongSelf.pauseButton.isHidden = !strongSelf.playButton.isHidden
                         }
                     }))
                 }
@@ -223,7 +215,8 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         }
         
         transition.updateFrame(node: self.playButton, frame: CGRect(origin: CGPoint(x: leftInset + 52.0, y: 10.0), size: CGSize(width: 26.0, height: 26.0)))
-        transition.updateFrame(node: self.pauseButton, frame: CGRect(origin: CGPoint(x: leftInset + 50.0, y: 10.0), size: CGSize(width: 26.0, height: 26.0)))
+        self.playPauseIconNode.frame = CGRect(origin: CGPoint(x: -2.0, y: -1.0), size: CGSize(width: 26.0, height: 26.0))
+
         let waveformBackgroundFrame = CGRect(origin: CGPoint(x: leftInset + 45.0, y: 7.0 - UIScreenPixel), size: CGSize(width: width - leftInset - rightInset - 90.0, height: 33.0))
         transition.updateFrame(node: self.waveformBackgroundNode, frame: waveformBackgroundFrame)
         transition.updateFrame(node: self.waveformButton, frame: CGRect(origin: CGPoint(x: leftInset + 45.0, y: 0.0), size: CGSize(width: width - leftInset - rightInset - 90.0, height: panelHeight)))
@@ -231,7 +224,7 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
         transition.updateFrame(node: self.durationLabel, frame: CGRect(origin: CGPoint(x: width - rightInset - 90.0 - 4.0, y: 15.0), size: CGSize(width: 35.0, height: 20.0)))
         
         prevInputPanelNode?.frame = CGRect(origin: .zero, size: CGSize(width: width, height: panelHeight))
-        if let prevTextInputPanelNode = prevInputPanelNode as? ChatTextInputPanelNode {
+        if let prevTextInputPanelNode = self.prevInputPanelNode as? ChatTextInputPanelNode {
             self.prevInputPanelNode = nil
             
             if let audioRecordingDotNode = prevTextInputPanelNode.audioRecordingDotNode {
@@ -259,11 +252,8 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
             
             self.playButton.layer.animateScale(from: 0.01, to: 1.0, duration: 0.3, delay: 0.1)
             self.playButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.1)
-            
-            self.pauseButton.layer.animateScale(from: 0.01, to: 1.0, duration: 0.3, delay: 0.1)
-            self.pauseButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.1)
-            
-            self.durationLabel.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3)
+                        
+            self.durationLabel.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, delay: 0.1)
             
             self.waveformScubberNode.layer.animateScaleY(from: 0.1, to: 1.0, duration: 0.3, delay: 0.1)
             self.waveformScubberNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2, delay: 0.1)
@@ -312,3 +302,52 @@ final class ChatRecordingPreviewInputPanelNode: ChatInputPanelNode {
     }
 }
 
+private enum PlayPauseIconNodeState: Equatable {
+    case play
+    case pause
+}
+
+private final class PlayPauseIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.35
+    private var iconState: PlayPauseIconNodeState = .pause
+    
+    init() {
+        super.init(size: CGSize(width: 28.0, height: 28.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: PlayPauseIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .play:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 83), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .play:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 41), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+                        }
+                    case .play:
+                        break
+                }
+        }
+    }
+}
diff --git a/submodules/TelegramUI/Sources/ChatReplyCountItem.swift b/submodules/TelegramUI/Sources/ChatReplyCountItem.swift
index 5d99ecb98a..36aee95303 100644
--- a/submodules/TelegramUI/Sources/ChatReplyCountItem.swift
+++ b/submodules/TelegramUI/Sources/ChatReplyCountItem.swift
@@ -6,6 +6,7 @@ import Display
 import SwiftSignalKit
 import TelegramPresentationData
 import AccountContext
+import WallpaperBackgroundNode
 
 private let titleFont = UIFont.systemFont(ofSize: 13.0)
 
@@ -15,20 +16,22 @@ class ChatReplyCountItem: ListViewItem {
     let count: Int
     let presentationData: ChatPresentationData
     let header: ChatMessageDateHeader
+    let controllerInteraction: ChatControllerInteraction
     
-    init(index: MessageIndex, isComments: Bool, count: Int, presentationData: ChatPresentationData, context: AccountContext) {
+    init(index: MessageIndex, isComments: Bool, count: Int, presentationData: ChatPresentationData, context: AccountContext, controllerInteraction: ChatControllerInteraction) {
         self.index = index
         self.isComments = isComments
         self.count = count
         self.presentationData = presentationData
         self.header = ChatMessageDateHeader(timestamp: index.timestamp, scheduled: false, presentationData: presentationData, context: context)
+        self.controllerInteraction = controllerInteraction
     }
     
     func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
         async {
             let node = ChatReplyCountItemNode()
-            node.layoutForParams(params, item: self, previousItem: previousItem, nextItem: nextItem)
             Queue.mainQueue().async {
+                node.layoutForParams(params, item: self, previousItem: previousItem, nextItem: nextItem)
                 completion(node, {
                     return (nil, { _ in })
                 })
@@ -60,22 +63,24 @@ class ChatReplyCountItem: ListViewItem {
 
 class ChatReplyCountItemNode: ListViewItemNode {
     var item: ChatReplyCountItem?
-    let labelNode: TextNode
-    let filledBackgroundNode: LinkHighlightingNode
+    private let labelNode: TextNode
+    private var backgroundNode: WallpaperBackgroundNode.BubbleBackgroundNode?
+    private let backgroundColorNode: ASDisplayNode
     
     private var theme: ChatPresentationThemeData?
     
     private let layoutConstants = ChatMessageItemLayoutConstants.default
+
+    private var absoluteRect: (CGRect, CGSize)?
     
     init() {
         self.labelNode = TextNode()
         self.labelNode.isUserInteractionEnabled = false
-        
-        self.filledBackgroundNode = LinkHighlightingNode(color: .clear)
+
+        self.backgroundColorNode = ASDisplayNode()
         
         super.init(layerBacked: false, dynamicBounce: true, rotated: true)
-        
-        self.addSubnode(self.filledBackgroundNode)
+
         self.addSubnode(self.labelNode)
         
         self.transform = CATransform3DMakeRotation(CGFloat.pi, 0.0, 0.0, 1.0)
@@ -106,7 +111,6 @@ class ChatReplyCountItemNode: ListViewItemNode {
     
     func asyncLayout() -> (_ item: ChatReplyCountItem, _ params: ListViewItemLayoutParams, _ dateAtBottom: Bool) -> (ListViewItemNodeLayout, () -> Void) {
         let makeLabelLayout = TextNode.asyncLayout(self.labelNode)
-        let backgroundLayout = self.filledBackgroundNode.asyncLayout()
         
         let layoutConstants = self.layoutConstants
         
@@ -145,9 +149,6 @@ class ChatReplyCountItemNode: ListViewItemNode {
                 labelRects[i].origin.x = floor((labelLayout.size.width - labelRects[i].width) / 2.0)
             }
             
-            let serviceColor = serviceMessageColorComponents(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper)
-            let backgroundApply = backgroundLayout(serviceColor.fill, labelRects, 10.0, 10.0, 0.0)
-            
             let backgroundSize = CGSize(width: labelLayout.size.width + 8.0 + 8.0, height: labelLayout.size.height + 4.0)
             
             return (ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: backgroundSize.height), insets: UIEdgeInsets(top: 6.0 + (dateAtBottom ? layoutConstants.timestampHeaderHeight : 0.0), left: 0.0, bottom: 5.0, right: 0.0)), { [weak self] in
@@ -156,19 +157,63 @@ class ChatReplyCountItemNode: ListViewItemNode {
                     strongSelf.theme = item.presentationData.theme
                     
                     let _ = apply()
-                    let _ = backgroundApply()
+
+                    if strongSelf.backgroundNode == nil {
+                        if let backgroundNode = item.controllerInteraction.presentationContext.backgroundNode?.makeBubbleBackground(for: .free) {
+                            strongSelf.backgroundNode = backgroundNode
+                            backgroundNode.addSubnode(strongSelf.backgroundColorNode)
+                            strongSelf.insertSubnode(backgroundNode, at: 0)
+                        }
+                    }
                     
                     let labelFrame = CGRect(origin: CGPoint(x: floor((params.width - backgroundSize.width) / 2.0) + 8.0, y: floorToScreenPixels((backgroundSize.height - labelLayout.size.height) / 2.0) - 1.0), size: labelLayout.size)
                     strongSelf.labelNode.frame = labelFrame
-                    strongSelf.filledBackgroundNode.frame = labelFrame.offsetBy(dx: 0.0, dy: -11.0)
+
+                    strongSelf.backgroundColorNode.backgroundColor = selectDateFillStaticColor(theme: item.presentationData.theme.theme, wallpaper: item.presentationData.theme.wallpaper)
+
+                    let baseBackgroundFrame = CGRect(origin: CGPoint(x: labelFrame.minX - 6.0, y: labelFrame.minY - 2.0), size: CGSize(width: labelFrame.width + 6.0 * 2.0, height: labelFrame.height + 2.0 * 2.0))
+
+                    if let backgroundNode = strongSelf.backgroundNode {
+                        backgroundNode.frame = baseBackgroundFrame
+
+                        backgroundNode.clipsToBounds = true
+                        backgroundNode.cornerRadius = baseBackgroundFrame.height / 2.0
+
+                        if let (rect, size) = strongSelf.absoluteRect {
+                            strongSelf.updateAbsoluteRect(rect, within: size)
+                        }
+                    }
+
+                    strongSelf.backgroundColorNode.frame = CGRect(origin: CGPoint(), size: baseBackgroundFrame.size)
                 }
             })
         }
     }
+
+    override func updateAbsoluteRect(_ rect: CGRect, within containerSize: CGSize) {
+        var rect = rect
+        rect.origin.y = containerSize.height - rect.maxY + self.insets.top
+        
+        self.absoluteRect = (rect, containerSize)
+
+        if let backgroundNode = self.backgroundNode {
+            var backgroundFrame = backgroundNode.frame
+            backgroundFrame.origin.x += rect.minX
+            backgroundFrame.origin.y += rect.minY
+            
+            backgroundNode.update(rect: backgroundFrame, within: containerSize)
+        }
+    }
+
+    override func applyAbsoluteOffset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+        if let backgroundNode = self.backgroundNode {
+            backgroundNode.offset(value: CGPoint(x: value.x, y: -value.y), animationCurve: animationCurve, duration: duration)
+        }
+    }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return [item.header]
         } else {
             return nil
         }
diff --git a/submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift
index 38e200a72b..e9aa05efae 100644
--- a/submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatReportPeerTitlePanelNode.swift
@@ -106,21 +106,19 @@ private final class ChatInfoTitlePanelInviteInfoNode: ASDisplayNode {
     private var theme: PresentationTheme?
     
     private let labelNode: ImmediateTextNode
-    private let filledBackgroundFillNode: LinkHighlightingNode
-    private let filledBackgroundNode: LinkHighlightingNode
+
+    private let backgroundNode: NavigationBackgroundNode
     
     init(openInvitePeer: @escaping () -> Void) {
         self.labelNode = ImmediateTextNode()
         self.labelNode.maximumNumberOfLines = 1
         self.labelNode.textAlignment = .center
-        
-        self.filledBackgroundFillNode = LinkHighlightingNode(color: .clear)
-        self.filledBackgroundNode = LinkHighlightingNode(color: .clear)
+
+        self.backgroundNode = NavigationBackgroundNode(color: .clear)
         
         super.init()
         
-        self.addSubnode(self.filledBackgroundFillNode)
-        self.addSubnode(self.filledBackgroundNode)
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.labelNode)
         
         self.labelNode.highlightAttributeAction = { attributes in
@@ -191,19 +189,15 @@ private final class ChatInfoTitlePanelInviteInfoNode: ASDisplayNode {
             labelRects[i].origin.x = floor((labelLayout.size.width - labelRects[i].width) / 2.0)
         }
         
-        let backgroundLayout = self.filledBackgroundNode.asyncLayout()
-        let backgroundFillLayout = self.filledBackgroundFillNode.asyncLayout()
-        let backgroundApply = backgroundLayout(theme.chat.serviceMessage.components.withDefaultWallpaper.dateFillStatic, labelRects, 10.0, 10.0, 0.0)
-        let backgroundFillApply = backgroundFillLayout(theme.chat.serviceMessage.components.withDefaultWallpaper.dateFillFloating, labelRects, 10.0, 10.0, 0.0)
-        backgroundApply()
-        backgroundFillApply()
-        
         let backgroundSize = CGSize(width: labelLayout.size.width + 8.0 + 8.0, height: labelLayout.size.height + 4.0)
         
         let labelFrame = CGRect(origin: CGPoint(x: floor((width - labelLayout.size.width) / 2.0), y: topInset + floorToScreenPixels((backgroundSize.height - labelLayout.size.height) / 2.0) - 1.0), size: labelLayout.size)
         self.labelNode.frame = labelFrame
-        self.filledBackgroundNode.frame = labelFrame.offsetBy(dx: 0.0, dy: -11.0)
-        self.filledBackgroundFillNode.frame = labelFrame.offsetBy(dx: 0.0, dy: -11.0)
+
+        let backgroundFrame = labelFrame.offsetBy(dx: 0.0, dy: 1.0).insetBy(dx: -5.0, dy: -2.0)
+        self.backgroundNode.updateColor(color: selectDateFillStaticColor(theme: theme, wallpaper: wallpaper), enableBlur: dateFillNeedsBlur(theme: theme, wallpaper: wallpaper), transition: .immediate)
+        transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, cornerRadius: self.backgroundNode.bounds.size.height / 2.0, transition: transition)
         
         return topInset + backgroundSize.height + bottomInset
     }
@@ -305,7 +299,6 @@ private final class ChatInfoTitlePanelPeerNearbyInfoNode: ASDisplayNode {
 }
 
 final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
-    private let backgroundNode: ASDisplayNode
     private let separatorNode: ASDisplayNode
     
     private let closeButton: HighlightableButtonNode
@@ -317,8 +310,6 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
     private var peerNearbyInfoNode: ChatInfoTitlePanelPeerNearbyInfoNode?
     
     override init() {
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.isLayerBacked = true
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
         
@@ -327,23 +318,21 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
         self.closeButton.displaysAsynchronously = false
         
         super.init()
-        
-        self.addSubnode(self.backgroundNode)
+
         self.addSubnode(self.separatorNode)
         
         self.closeButton.addTarget(self, action: #selector(self.closePressed), forControlEvents: [.touchUpInside])
         self.addSubnode(self.closeButton)
     }
     
-    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
         if interfaceState.theme !== self.theme {
             self.theme = interfaceState.theme
             
             self.closeButton.setImage(PresentationResourcesChat.chatInputPanelEncircledCloseIconImage(interfaceState.theme), for: [])
-            self.backgroundNode.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor
-            self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor
+            self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor
         }
-        
+
         var panelHeight: CGFloat = 40.0
         
         let contentRightInset: CGFloat = 14.0 + rightInset
@@ -437,10 +426,9 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
                 }
             }
         }
-        
-        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: panelHeight)))
-        
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)))
+
+        let initialPanelHeight = panelHeight
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         
         var chatPeer: Peer?
         if let renderedPeer = interfaceState.renderedPeer {
@@ -502,7 +490,7 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
             })
         }
         
-        return panelHeight
+        return LayoutResult(backgroundHeight: initialPanelHeight, insetHeight: panelHeight)
     }
     
     @objc func buttonPressed(_ view: UIButton) {
@@ -535,6 +523,11 @@ final class ChatReportPeerTitlePanelNode: ChatTitleAccessoryPanelNode {
         if let result = self.closeButton.hitTest(CGPoint(x: point.x - self.closeButton.frame.minX, y: point.y - self.closeButton.frame.minY), with: event) {
             return result
         }
+        if let inviteInfoNode = self.inviteInfoNode {
+            if let result = inviteInfoNode.view.hitTest(self.view.convert(point, to: inviteInfoNode.view), with: event) {
+                return result
+            }
+        }
         return super.hitTest(point, with: event)
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift b/submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift
index 8d3795cad8..f7e0421690 100644
--- a/submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatRequestInProgressTitlePanelNode.swift
@@ -19,12 +19,12 @@ final class ChatRequestInProgressTitlePanelNode: ChatTitleAccessoryPanelNode {
         self.titleNode.maximumNumberOfLines = 1
         
         super.init()
-        
+
         self.addSubnode(self.titleNode)
         self.addSubnode(self.separatorNode)
     }
     
-    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
         if interfaceState.strings !== self.strings {
             self.strings = interfaceState.strings
             
@@ -34,8 +34,8 @@ final class ChatRequestInProgressTitlePanelNode: ChatTitleAccessoryPanelNode {
         if interfaceState.theme !== self.theme {
             self.theme = interfaceState.theme
             
-            self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor
-            self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor
+
+            self.separatorNode.backgroundColor = interfaceState.theme.rootController.navigationBar.separatorColor
         }
         
         let panelHeight: CGFloat = 40.0
@@ -43,8 +43,8 @@ final class ChatRequestInProgressTitlePanelNode: ChatTitleAccessoryPanelNode {
         let titleSize = self.titleNode.updateLayout(CGSize(width: width - leftInset - rightInset, height: 100.0))
         transition.updateFrame(node: self.titleNode, frame: CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: floor((panelHeight - titleSize.height) / 2.0)), size: titleSize))
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         
-        return panelHeight
+        return LayoutResult(backgroundHeight: panelHeight, insetHeight: panelHeight)
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatScheduleTimeController.swift b/submodules/TelegramUI/Sources/ChatScheduleTimeController.swift
index c310880aa2..f60cd888f2 100644
--- a/submodules/TelegramUI/Sources/ChatScheduleTimeController.swift
+++ b/submodules/TelegramUI/Sources/ChatScheduleTimeController.swift
@@ -107,6 +107,6 @@ final class ChatScheduleTimeController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift b/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift
index 7324f017ea..fee537ce93 100644
--- a/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatScheduleTimeControllerNode.swift
@@ -262,12 +262,12 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel
         }
     }
     
+    private let calendar = Calendar(identifier: .gregorian)
     private func updateButtonTitle() {
         guard let date = self.pickerView?.date else {
             return
         }
         
-        let calendar = Calendar(identifier: .gregorian)
         let time = stringForMessageTimestamp(timestamp: Int32(date.timeIntervalSince1970), dateTimeFormat: self.presentationData.dateTimeFormat)
         switch mode {
             case .scheduledMessages:
@@ -314,10 +314,16 @@ class ChatScheduleTimeControllerNode: ViewControllerTracingNode, UIScrollViewDel
         self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
         
         let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
-        
         let dimPosition = self.dimNode.layer.position
-        self.dimNode.layer.animatePosition(from: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), to: dimPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-        self.layer.animateBoundsOriginYAdditive(from: -offset, to: 0.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+        
+        let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+        let targetBounds = self.bounds
+        self.bounds = self.bounds.offsetBy(dx: 0.0, dy: -offset)
+        self.dimNode.position = CGPoint(x: dimPosition.x, y: dimPosition.y - offset)
+        transition.animateView({
+            self.bounds = targetBounds
+            self.dimNode.position = dimPosition
+        })
     }
     
     func animateOut(completion: (() -> Void)? = nil) {
diff --git a/submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift b/submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift
index 733969305f..5875966f27 100644
--- a/submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift
+++ b/submodules/TelegramUI/Sources/ChatSearchNavigationContentNode.swift
@@ -29,7 +29,7 @@ final class ChatSearchNavigationContentNode: NavigationBarContentNode {
         self.chatLocation = chatLocation
         self.interaction = interaction
         
-        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasSeparator: false), strings: strings, fieldStyle: .modern)
+        self.searchBar = SearchBarNode(theme: SearchBarNodeTheme(theme: theme, hasBackground: false, hasSeparator: false), strings: strings, fieldStyle: .modern)
         let placeholderText: String
         switch chatLocation {
             case .peer, .replyThread:
@@ -96,7 +96,7 @@ final class ChatSearchNavigationContentNode: NavigationBarContentNode {
     
     func update(presentationInterfaceState: ChatPresentationInterfaceState) {
         if let search = presentationInterfaceState.search {
-            self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: presentationInterfaceState.theme, hasSeparator: false), strings: presentationInterfaceState.strings)
+            self.searchBar.updateThemeAndStrings(theme: SearchBarNodeTheme(theme: presentationInterfaceState.theme, hasBackground: false, hasSeparator: false), strings: presentationInterfaceState.strings)
             
             switch search.domain {
                 case .everything:
diff --git a/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
index 645f19bec5..fb249f2872 100644
--- a/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatSearchResultsContollerNode.swift
@@ -140,7 +140,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
          
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.presentationData = presentationData
-        self.presentationDataPromise = Promise(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations))
+        self.presentationDataPromise = Promise(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true))
         
         self.listNode = ListView()
         self.listNode.verticalScrollIndicatorColor = self.presentationData.theme.list.scrollIndicatorColor
@@ -175,6 +175,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
         }, peerSelected: { _, _ in
         }, disabledPeerSelected: { _ in
         }, togglePeerSelected: { _ in
+        }, togglePeersSelection: { _, _ in
         }, additionalCategorySelected: { _ in
         }, messageSelected: { [weak self] peer, message, _ in
             if let strongSelf = self {
@@ -205,7 +206,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
             switch item.content {
             case let .peer(peer):
                 if let message = peer.messages.first {
-                    let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.peer.peerId), subject: .message(id: message.id, highlight: true), botStart: nil, mode: .standard(previewing: true))
+                    let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(peer.peer.peerId), subject: .message(id: message.id, highlight: true, timecode: nil), botStart: nil, mode: .standard(previewing: true))
                     chatController.canReadHistory.set(false)
                     let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node)), items: .single([]), reactionItems: [], gesture: gesture)
                     presentInGlobalOverlay(contextController)
@@ -256,7 +257,7 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
     private func loadMore() {
         self.isLoadingMore = true
         
-        self.loadMoreDisposable.set((searchMessages(account: self.context.account, location: self.location, query: self.searchQuery, state: self.searchState)
+        self.loadMoreDisposable.set((self.context.engine.messages.searchMessages(location: self.location, query: self.searchQuery, state: self.searchState)
         |> deliverOnMainQueue).start(next: { [weak self] (updatedResult, updatedState) in
             guard let strongSelf = self else {
                 return
@@ -303,9 +304,8 @@ class ChatSearchResultsControllerNode: ViewControllerTracingNode, UIScrollViewDe
     }
     
     func updatePresentationData(_ presentationData: PresentationData) {
-        let previousTheme = self.presentationData.theme
         self.presentationData = presentationData
-        self.presentationDataPromise.set(.single(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations)))
+        self.presentationDataPromise.set(.single(ChatListPresentationData(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)))
 
         self.listNode.forEachItemHeaderNode({ itemHeaderNode in
             if let itemHeaderNode = itemHeaderNode as? ChatListSearchItemHeaderNode {
diff --git a/submodules/TelegramUI/Sources/ChatSearchResultsController.swift b/submodules/TelegramUI/Sources/ChatSearchResultsController.swift
index 313a5eb0dd..09b180cb4e 100644
--- a/submodules/TelegramUI/Sources/ChatSearchResultsController.swift
+++ b/submodules/TelegramUI/Sources/ChatSearchResultsController.swift
@@ -79,7 +79,7 @@ final class ChatSearchResultsController: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     @objc private func donePressed() {
diff --git a/submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift
index 0123da2cd2..f434f57f5a 100644
--- a/submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift
+++ b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetController.swift
@@ -17,7 +17,7 @@ final class ChatSendMessageActionSheetController: ViewController {
     private let controllerInteraction: ChatControllerInteraction?
     private let interfaceState: ChatPresentationInterfaceState
     private let gesture: ContextGesture
-    private let sendButtonFrame: CGRect
+    private let sourceSendButton: ASDisplayNode
     private let textInputNode: EditableTextNode
     private let completion: () -> Void
     
@@ -29,12 +29,12 @@ final class ChatSendMessageActionSheetController: ViewController {
     
     private let hapticFeedback = HapticFeedback()
 
-    init(context: AccountContext, controllerInteraction: ChatControllerInteraction?, interfaceState: ChatPresentationInterfaceState, gesture: ContextGesture, sendButtonFrame: CGRect, textInputNode: EditableTextNode, completion: @escaping () -> Void) {
+    init(context: AccountContext, controllerInteraction: ChatControllerInteraction?, interfaceState: ChatPresentationInterfaceState, gesture: ContextGesture, sourceSendButton: ASDisplayNode, textInputNode: EditableTextNode, completion: @escaping () -> Void) {
         self.context = context
         self.controllerInteraction = controllerInteraction
         self.interfaceState = interfaceState
         self.gesture = gesture
-        self.sendButtonFrame = sendButtonFrame
+        self.sourceSendButton = sourceSendButton
         self.textInputNode = textInputNode
         self.completion = completion
                 
@@ -76,7 +76,7 @@ final class ChatSendMessageActionSheetController: ViewController {
             canSchedule = !isSecret
         }
         
-        self.displayNode = ChatSendMessageActionSheetControllerNode(context: self.context, reminders: reminders, gesture: gesture, sendButtonFrame: self.sendButtonFrame, textInputNode: self.textInputNode, forwardedCount: forwardedCount, send: { [weak self] in
+        self.displayNode = ChatSendMessageActionSheetControllerNode(context: self.context, reminders: reminders, gesture: gesture, sourceSendButton: self.sourceSendButton, textInputNode: self.textInputNode, forwardedCount: forwardedCount, send: { [weak self] in
             self?.controllerInteraction?.sendCurrentMessage(false)
             self?.dismiss(cancel: false)
         }, sendSilently: { [weak self] in
diff --git a/submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift
index d12f9fd3ca..eb103b5b12 100644
--- a/submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ChatSendMessageActionSheetControllerNode.swift
@@ -154,7 +154,7 @@ private final class ActionSheetItemNode: ASDisplayNode {
 final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode, UIScrollViewDelegate {
     private let context: AccountContext
     private var presentationData: PresentationData
-    private let sendButtonFrame: CGRect
+    private let sourceSendButton: ASDisplayNode
     private let textFieldFrame: CGRect
     private let textInputNode: EditableTextNode
     private let accessoryPanelNode: AccessoryPanelNode?
@@ -163,9 +163,6 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
     private let send: (() -> Void)?
     private let cancel: (() -> Void)?
     
-    private let textCoverNode: ASDisplayNode
-    private let buttonCoverNode: ASDisplayNode
-    
     private let effectView: UIVisualEffectView
     private let dimNode: ASDisplayNode
     
@@ -181,10 +178,14 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
     
     private var validLayout: ContainerViewLayout?
     
-    init(context: AccountContext, reminders: Bool, gesture: ContextGesture, sendButtonFrame: CGRect, textInputNode: EditableTextNode, forwardedCount: Int?, send: (() -> Void)?, sendSilently: (() -> Void)?, schedule: (() -> Void)?, cancel: (() -> Void)?) {
+    private var sendButtonFrame: CGRect {
+        return self.sourceSendButton.view.convert(self.sourceSendButton.bounds, to: nil)
+    }
+    
+    init(context: AccountContext, reminders: Bool, gesture: ContextGesture, sourceSendButton: ASDisplayNode, textInputNode: EditableTextNode, forwardedCount: Int?, send: (() -> Void)?, sendSilently: (() -> Void)?, schedule: (() -> Void)?, cancel: (() -> Void)?) {
         self.context = context
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
-        self.sendButtonFrame = sendButtonFrame
+        self.sourceSendButton = sourceSendButton
         self.textFieldFrame = textInputNode.convert(textInputNode.bounds, to: nil)
         self.textInputNode = textInputNode
         self.accessoryPanelNode = nil
@@ -192,10 +193,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
         
         self.send = send
         self.cancel = cancel
-        
-        self.textCoverNode = ASDisplayNode()
-        self.buttonCoverNode = ASDisplayNode()
-        
+                
         self.effectView = UIVisualEffectView()
         if #available(iOS 9.0, *) {
         } else {
@@ -249,13 +247,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
         self.contentNodes = contentNodes
         
         super.init()
-        
-        self.textCoverNode.backgroundColor = self.presentationData.theme.chat.inputPanel.inputBackgroundColor
-        self.addSubnode(self.textCoverNode)
-        
-        self.buttonCoverNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor
-        self.addSubnode(self.buttonCoverNode)
-        
+                
         self.sendButtonNode.setImage(PresentationResourcesChat.chatInputPanelSendButtonImage(self.presentationData.theme), for: [])
         self.sendButtonNode.addTarget(self, action: #selector(sendButtonPressed), forControlEvents: .touchUpInside)
         
@@ -370,8 +362,6 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
         self.dimNode.backgroundColor = presentationData.theme.contextMenu.dimColor
         
         self.contentContainerNode.backgroundColor = self.presentationData.theme.contextMenu.backgroundColor
-        self.textCoverNode.backgroundColor = self.presentationData.theme.chat.inputPanel.inputBackgroundColor
-        self.buttonCoverNode.backgroundColor = self.presentationData.theme.chat.inputPanel.panelBackgroundColor
         self.sendButtonNode.setImage(PresentationResourcesChat.chatInputPanelSendButtonImage(self.presentationData.theme), for: [])
         
         if let toAttributedText = self.textInputNode.attributedText?.mutableCopy() as? NSMutableAttributedString {
@@ -406,6 +396,9 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
         self.fromMessageTextNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false)
         self.toMessageTextNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.3, removeOnCompletion: false)
         
+        self.textInputNode.isHidden = true
+        self.sourceSendButton.isHidden = true
+        
         if let layout = self.validLayout {
             let duration = 0.4
             
@@ -466,8 +459,8 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
         
         let intermediateCompletion: () -> Void = { [weak self] in
             if completedEffect && completedButton && completedBubble && completedAlpha {
-                self?.textCoverNode.isHidden = true
-                self?.buttonCoverNode.isHidden = true
+                self?.textInputNode.isHidden = false
+                self?.sourceSendButton.isHidden = false
                 completion()
             }
         }
@@ -494,7 +487,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
                 intermediateCompletion()
             })
         } else {
-            self.textCoverNode.isHidden = true
+            self.textInputNode.isHidden = false
             self.messageClipNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { _ in
                 completedAlpha = true
                 intermediateCompletion()
@@ -510,7 +503,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
             })
             
             if !cancel {
-                self.buttonCoverNode.isHidden = true
+                self.sourceSendButton.isHidden = false
                 self.sendButtonNode.layer.animateScale(from: 1.0, to: 0.2, duration: 0.2, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false)
                 self.sendButtonNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, timingFunction: CAMediaTimingFunctionName.linear.rawValue, removeOnCompletion: false)
             }
@@ -565,10 +558,7 @@ final class ChatSendMessageActionSheetControllerNode: ViewControllerTracingNode,
     
     func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         self.validLayout = layout
-        
-        transition.updateFrame(node: self.textCoverNode, frame: self.textFieldFrame)
-        transition.updateFrame(node: self.buttonCoverNode, frame: self.sendButtonFrame.offsetBy(dx: 1.0, dy: 1.0))
-        
+                
         transition.updateFrame(view: self.effectView, frame: CGRect(origin: CGPoint(), size: layout.size))
         transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
         
diff --git a/submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift b/submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift
index d476cb3509..144f3db74e 100644
--- a/submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputMediaRecordingButton.swift
@@ -97,7 +97,7 @@ private final class ChatTextInputMediaRecordingButtonPresenterControllerNode: Vi
 private final class ChatTextInputMediaRecordingButtonPresenter : NSObject, TGModernConversationInputMicButtonPresentation {
     private let account: Account?
     private let presentController: (ViewController) -> Void
-    private let container: ChatTextInputMediaRecordingButtonPresenterContainer
+    let container: ChatTextInputMediaRecordingButtonPresenterContainer
     private var presentationController: ChatTextInputMediaRecordingButtonPresenterController?
     
     init(account: Account, presentController: @escaping (ViewController) -> Void) {
@@ -176,6 +176,16 @@ final class ChatTextInputMediaRecordingButton: TGModernConversationInputMicButto
     private(set) var cancelTranslation: CGFloat = 0.0
     
     private var micLevelDisposable: MetaDisposable?
+
+    private weak var currentPresenter: UIView?
+
+    var contentContainer: (UIView, CGRect)? {
+        if let _ = self.currentPresenter {
+            return (self.micDecoration, self.micDecoration.bounds)
+        } else {
+            return nil
+        }
+    }
     
     var audioRecorder: ManagedAudioRecorder? {
         didSet {
@@ -410,7 +420,9 @@ final class ChatTextInputMediaRecordingButton: TGModernConversationInputMicButto
     }
     
     func micButtonPresenter() -> TGModernConversationInputMicButtonPresentation! {
-        return ChatTextInputMediaRecordingButtonPresenter(account: self.account!, presentController: self.presentController)
+        let presenter = ChatTextInputMediaRecordingButtonPresenter(account: self.account!, presentController: self.presentController)
+        self.currentPresenter = presenter.view()
+        return presenter
     }
     
     func micButtonDecoration() -> (UIView & TGModernConversationInputMicButtonDecoration)! {
@@ -427,7 +439,8 @@ final class ChatTextInputMediaRecordingButton: TGModernConversationInputMicButto
     
     override func animateIn() {
         super.animateIn()
-        
+
+        micDecoration.isHidden = false
         micDecoration.startAnimating()
 
         innerIconView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
diff --git a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
index b764d05659..fe1c49909e 100644
--- a/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTextInputPanelNode.swift
@@ -105,7 +105,7 @@ private final class AccessoryItemIconButtonNode: HighlightTrackingButtonNode {
                 if let timeout = timeout {
                     return (nil, shortTimeIntervalString(strings: strings, value: timeout), strings.VoiceOver_SelfDestructTimerOn(timeIntervalString(strings: strings, value: timeout)).0, 1.0, UIEdgeInsets())
                 } else {
-                    return (PresentationResourcesChat.chatInputTextFieldTimerImage(theme), nil, strings.VoiceOver_SelfDestructTimerOff, 1.0, UIEdgeInsets(top: 0.0, left: 0.0, bottom: 1.0, right: 0.0))
+                    return (PresentationResourcesChat.chatInputTextFieldTimerImage(theme), nil, strings.VoiceOver_SelfDestructTimerOff, 1.0, UIEdgeInsets(top: 0.0, left: 0.0, bottom: 0.0, right: 0.0))
                 }
             case .scheduledMessages:
                 return (PresentationResourcesChat.chatInputTextFieldScheduleImage(theme), nil, strings.VoiceOver_ScheduledMessages, 1.0, UIEdgeInsets())
@@ -128,7 +128,9 @@ private final class AccessoryItemIconButtonNode: HighlightTrackingButtonNode {
     
     func updateLayout(size: CGSize) {
         if let image = self.imageNode.image {
-            self.imageNode.frame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0) - self.imageEdgeInsets.bottom), size: image.size)
+            let bottomInset: CGFloat = 0.0
+            let imageFrame = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0) - bottomInset), size: image.size)
+            self.imageNode.frame = imageFrame
         }
     }
     
@@ -137,8 +139,12 @@ private final class AccessoryItemIconButtonNode: HighlightTrackingButtonNode {
     }
 }
 
+let chatTextInputMinFontSize: CGFloat = 5.0
+
+private let minInputFontSize = chatTextInputMinFontSize
+
 private func calclulateTextFieldMinHeight(_ presentationInterfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
-    let baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+    let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
     var result: CGFloat
     if baseFontSize.isEqual(to: 26.0) {
         result = 42.0
@@ -161,21 +167,46 @@ private func calclulateTextFieldMinHeight(_ presentationInterfaceState: ChatPres
     return result
 }
 
+private func calculateTextFieldRealInsets(_ presentationInterfaceState: ChatPresentationInterfaceState) -> UIEdgeInsets {
+    let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+    let top: CGFloat
+    let bottom: CGFloat
+    if baseFontSize.isEqual(to: 14.0) {
+        top = 2.0
+        bottom = 1.0
+    } else if baseFontSize.isEqual(to: 15.0) {
+        top = 1.0
+        bottom = 1.0
+    } else if baseFontSize.isEqual(to: 16.0) {
+        top = 0.5
+        bottom = 0.0
+    } else {
+        top = 0.0
+        bottom = 0.0
+    }
+    return UIEdgeInsets(top: 4.5 + top, left: 0.0, bottom: 5.5 + bottom, right: 0.0)
+}
+
 private var currentTextInputBackgroundImage: (UIColor, UIColor, CGFloat, UIImage)?
-private func textInputBackgroundImage(backgroundColor: UIColor, strokeColor: UIColor, diameter: CGFloat) -> UIImage? {
-    if let current = currentTextInputBackgroundImage {
+private func textInputBackgroundImage(backgroundColor: UIColor?, inputBackgroundColor: UIColor?, strokeColor: UIColor, diameter: CGFloat) -> UIImage? {
+    if let backgroundColor = backgroundColor, let current = currentTextInputBackgroundImage {
         if current.0.isEqual(backgroundColor) && current.1.isEqual(strokeColor) && current.2.isEqual(to: diameter) {
             return current.3
         }
     }
     
     let image = generateImage(CGSize(width: diameter, height: diameter), rotatedContext: { size, context in
-        context.setFillColor(backgroundColor.cgColor)
-        context.fill(CGRect(x: 0.0, y: 0.0, width: diameter, height: diameter))
-        
-        context.setBlendMode(.clear)
-        context.setFillColor(UIColor.clear.cgColor)
+        context.clear(CGRect(x: 0.0, y: 0.0, width: diameter, height: diameter))
+
+        if let inputBackgroundColor = inputBackgroundColor {
+            context.setBlendMode(.normal)
+            context.setFillColor(inputBackgroundColor.cgColor)
+        } else {
+            context.setBlendMode(.clear)
+            context.setFillColor(UIColor.clear.cgColor)
+        }
         context.fillEllipse(in: CGRect(x: 0.0, y: 0.0, width: diameter, height: diameter))
+            
         context.setBlendMode(.normal)
         context.setStrokeColor(strokeColor.cgColor)
         let strokeWidth: CGFloat = 1.0
@@ -183,7 +214,9 @@ private func textInputBackgroundImage(backgroundColor: UIColor, strokeColor: UIC
         context.strokeEllipse(in: CGRect(x: strokeWidth / 2.0, y: strokeWidth / 2.0, width: diameter - strokeWidth, height: diameter - strokeWidth))
     })?.stretchableImage(withLeftCapWidth: Int(diameter) / 2, topCapHeight: Int(diameter) / 2)
     if let image = image {
-        currentTextInputBackgroundImage = (backgroundColor, strokeColor, diameter, image)
+        if let backgroundColor = backgroundColor {
+            currentTextInputBackgroundImage = (backgroundColor, strokeColor, diameter, image)
+        }
         return image
     } else {
         return nil
@@ -201,14 +234,22 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     var textPlaceholderNode: ImmediateTextNode
     var contextPlaceholderNode: TextNode?
     var slowmodePlaceholderNode: ChatTextInputSlowmodePlaceholderNode?
+    let textInputContainerBackgroundNode: ASImageNode
     let textInputContainer: ASDisplayNode
     var textInputNode: EditableTextNode?
     
     let textInputBackgroundNode: ASImageNode
+    private var transparentTextInputBackgroundImage: UIImage?
     let actionButtons: ChatTextInputActionButtonsNode
     var mediaRecordingAccessibilityArea: AccessibilityAreaNode?
     private let counterTextNode: ImmediateTextNode
     
+    let menuButton: HighlightTrackingButtonNode
+    private let menuButtonBackgroundNode: ASDisplayNode
+    private let menuButtonClippingNode: ASDisplayNode
+    private let menuButtonIconNode: AnimationNode
+    private let menuButtonTextNode: ImmediateTextNode
+    
     let attachmentButton: HighlightableButtonNode
     let attachmentButtonDisabledNode: HighlightableButtonNode
     let searchLayoutClearButton: HighlightableButton
@@ -216,6 +257,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     private var searchActivityIndicator: ActivityIndicator?
     var audioRecordingInfoContainerNode: ASDisplayNode?
     var audioRecordingDotNode: AnimationNode?
+    var audioRecordingDotNodeDismissed = false
     var audioRecordingTimeNode: ChatTextInputAudioRecordingTimeNode?
     var audioRecordingCancelIndicator: ChatTextInputAudioRecordingCancelIndicator?
     var animatingBinNode: AnimationNode?
@@ -223,6 +265,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     private var accessoryItemButtons: [(ChatTextInputAccessoryItem, AccessoryItemIconButtonNode)] = []
     
     private var validLayout: (CGFloat, CGFloat, CGFloat, UIEdgeInsets, CGFloat, LayoutMetrics, Bool)?
+    private var leftMenuInset: CGFloat = 0.0
     
     var displayAttachmentMenu: () -> Void = { }
     var sendMessage: () -> Void = { }
@@ -281,6 +324,10 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             self.actionButtons.micButton.account = self.context?.account
         }
     }
+
+    var micButton: ChatTextInputMediaRecordingButton? {
+        return self.actionButtons.micButton
+    }
     
     private let statusDisposable = MetaDisposable()
     override var interfaceInteraction: ChatPanelInterfaceInteraction? {
@@ -345,7 +392,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             if let presentationInterfaceState = self.presentationInterfaceState {
                 textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
                 accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
-                baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+                baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
             }
             textInputNode.attributedText = textAttributedStringForStateText(state.inputText, fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil)
             textInputNode.selectedRange = NSMakeRange(state.selectionRange.lowerBound, state.selectionRange.count)
@@ -373,7 +420,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 var baseFontSize: CGFloat = 17.0
                 if let presentationInterfaceState = self.presentationInterfaceState {
                     textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
-                    baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+                    baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
                 }
                 textInputNode.attributedText = NSAttributedString(string: value, font: Font.regular(baseFontSize), textColor: textColor)
                 self.editableTextNodeDidUpdateText(textInputNode)
@@ -382,16 +429,19 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     }
     
     private let textInputViewInternalInsets = UIEdgeInsets(top: 1.0, left: 13.0, bottom: 1.0, right: 13.0)
-    private let textInputViewRealInsets = UIEdgeInsets(top: 4.5, left: 0.0, bottom: 5.5, right: 0.0)
     private let accessoryButtonSpacing: CGFloat = 0.0
     private let accessoryButtonInset: CGFloat = 2.0
     
     init(presentationInterfaceState: ChatPresentationInterfaceState, presentController: @escaping (ViewController) -> Void) {
         self.presentationInterfaceState = presentationInterfaceState
+
+        self.textInputContainerBackgroundNode = ASImageNode()
+        self.textInputContainerBackgroundNode.isUserInteractionEnabled = false
+        self.textInputContainerBackgroundNode.displaysAsynchronously = false
         
         self.textInputContainer = ASDisplayNode()
+        self.textInputContainer.addSubnode(self.textInputContainerBackgroundNode)
         self.textInputContainer.clipsToBounds = true
-        self.textInputContainer.backgroundColor = presentationInterfaceState.theme.chat.inputPanel.inputBackgroundColor
         
         self.textInputBackgroundNode = ASImageNode()
         self.textInputBackgroundNode.displaysAsynchronously = false
@@ -399,6 +449,18 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         self.textPlaceholderNode = ImmediateTextNode()
         self.textPlaceholderNode.maximumNumberOfLines = 1
         self.textPlaceholderNode.isUserInteractionEnabled = false
+        
+        self.menuButton = HighlightTrackingButtonNode()
+        self.menuButton.clipsToBounds = true
+        self.menuButton.cornerRadius = 16.0
+        self.menuButton.accessibilityLabel = presentationInterfaceState.strings.Conversation_InputMenu
+        self.menuButtonBackgroundNode = ASDisplayNode()
+        self.menuButtonClippingNode = ASDisplayNode()
+        self.menuButtonClippingNode.clipsToBounds = true
+        
+        self.menuButtonIconNode = AnimationNode(animation: "anim_menuclose", colors: ["1.1.Обводка 1": presentationInterfaceState.theme.chat.inputPanel.actionControlForegroundColor, "2.2.Обводка 1": presentationInterfaceState.theme.chat.inputPanel.actionControlForegroundColor, "3.1.Обводка 1": presentationInterfaceState.theme.chat.inputPanel.actionControlForegroundColor])
+        self.menuButtonTextNode = ImmediateTextNode()
+        
         self.attachmentButton = HighlightableButtonNode(pointerStyle: .circle)
         self.attachmentButton.accessibilityLabel = presentationInterfaceState.strings.VoiceOver_AttachMedia
         self.attachmentButton.accessibilityTraits = [.button]
@@ -415,6 +477,19 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         
         super.init()
         
+        self.menuButton.addTarget(self, action: #selector(self.menuButtonPressed), forControlEvents: .touchUpInside)
+        self.menuButton.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.3, curve: .spring)
+                    transition.updateTransformScale(node: strongSelf.menuButton, scale: 0.85)
+                } else {
+                    let transition: ContainedViewLayoutTransition = .animated(duration: 0.5, curve: .spring)
+                    transition.updateTransformScale(node: strongSelf.menuButton, scale: 1.0)
+                }
+            }
+        }
+        
         self.attachmentButton.addTarget(self, action: #selector(self.attachmentButtonPressed), forControlEvents: .touchUpInside)
         self.attachmentButtonDisabledNode.addTarget(self, action: #selector(self.attachmentButtonPressed), forControlEvents: .touchUpInside)
   
@@ -496,6 +571,12 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         
         self.addSubnode(self.textPlaceholderNode)
         
+        self.menuButton.addSubnode(self.menuButtonBackgroundNode)
+        self.menuButton.addSubnode(self.menuButtonClippingNode)
+        self.menuButtonClippingNode.addSubnode(self.menuButtonTextNode)
+        self.menuButton.addSubnode(self.menuButtonIconNode)
+        
+        self.addSubnode(self.menuButton)
         self.addSubnode(self.attachmentButton)
         self.addSubnode(self.attachmentButtonDisabledNode)
           
@@ -539,7 +620,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         if let presentationInterfaceState = self.presentationInterfaceState {
             textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
             tintColor = presentationInterfaceState.theme.list.itemAccentColor
-            baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+            baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
             keyboardAppearance = presentationInterfaceState.theme.rootController.keyboardColor.keyboardAppearance
         }
         
@@ -550,13 +631,12 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         paragraphStyle.maximumLineHeight = 20.0
         paragraphStyle.minimumLineHeight = 20.0
         
-        textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(max(17.0, baseFontSize)), NSAttributedString.Key.foregroundColor.rawValue: textColor, NSAttributedString.Key.paragraphStyle.rawValue: paragraphStyle]
+        textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(max(minInputFontSize, baseFontSize)), NSAttributedString.Key.foregroundColor.rawValue: textColor, NSAttributedString.Key.paragraphStyle.rawValue: paragraphStyle]
         textInputNode.clipsToBounds = false
         textInputNode.textView.clipsToBounds = false
         textInputNode.delegate = self
         textInputNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
         textInputNode.keyboardAppearance = keyboardAppearance
-        textInputNode.textContainerInset = UIEdgeInsets(top: self.textInputViewRealInsets.top, left: 0.0, bottom: self.textInputViewRealInsets.bottom, right: 0.0)
         textInputNode.tintColor = tintColor
         textInputNode.textView.scrollIndicatorInsets = UIEdgeInsets(top: 9.0, left: 0.0, bottom: 9.0, right: -13.0)
         self.textInputContainer.addSubnode(textInputNode)
@@ -565,6 +645,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         
         if let presentationInterfaceState = self.presentationInterfaceState {
             refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
+            textInputNode.textContainerInset = calculateTextFieldRealInsets(presentationInterfaceState)
         }
         
         if !self.textInputContainer.bounds.size.width.isZero {
@@ -582,7 +663,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 accessoryButtonsWidth += button.buttonWidth
             }
             
-            textInputNode.frame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right + accessoryButtonsWidth), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - self.textInputViewInternalInsets.bottom))
+            textInputNode.frame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - self.textInputViewInternalInsets.bottom))
         }
         
         self.textInputBackgroundNode.isUserInteractionEnabled = false
@@ -631,12 +712,13 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         
         let textFieldHeight: CGFloat
         if let textInputNode = self.textInputNode {
-            let measuredHeight = textInputNode.measure(CGSize(width: width - textFieldInsets.left - textFieldInsets.right - self.textInputViewInternalInsets.left - self.textInputViewInternalInsets.right - accessoryButtonsWidth, height: CGFloat.greatestFiniteMagnitude))
+            let maxTextWidth = width - textFieldInsets.left - textFieldInsets.right - self.textInputViewInternalInsets.left - self.textInputViewInternalInsets.right
+            let measuredHeight = textInputNode.measure(CGSize(width: maxTextWidth, height: CGFloat.greatestFiniteMagnitude))
             let unboundTextFieldHeight = max(textFieldMinHeight, ceil(measuredHeight.height))
             
             let maxNumberOfLines = min(12, (Int(fieldMaxHeight - 11.0) - 33) / 22)
             
-            let updatedMaxHeight = (CGFloat(maxNumberOfLines) * 22.0 + 10.0)
+            let updatedMaxHeight = (CGFloat(maxNumberOfLines) * (22.0 + 2.0) + 10.0)
             
             textFieldHeight = max(textFieldMinHeight, min(updatedMaxHeight, unboundTextFieldHeight))
         } else {
@@ -673,8 +755,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, maxHeight: CGFloat, isSecondary: Bool, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
         let previousAdditionalSideInsets = self.validLayout?.3
         self.validLayout = (width, leftInset, rightInset, additionalSideInsets, maxHeight, metrics, isSecondary)
-        let baseWidth = width - leftInset - rightInset
-        
+    
         var transition = transition
         var additionalOffset: CGFloat = 0.0
         if let previousAdditionalSideInsets = previousAdditionalSideInsets, previousAdditionalSideInsets.right != additionalSideInsets.right {
@@ -720,12 +801,22 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         self.attachmentButton.accessibilityTraits = (!isSlowmodeActive || isMediaEnabled) ? [.button] : [.button, .notEnabled]
         self.attachmentButtonDisabledNode.isHidden = !isSlowmodeActive || isMediaEnabled
         
+        var menuTextSize = self.menuButtonTextNode.frame.size
         if self.presentationInterfaceState != interfaceState {
             let previousState = self.presentationInterfaceState
             self.presentationInterfaceState = interfaceState
             
             let themeUpdated = previousState?.theme !== interfaceState.theme
             
+            if let previousShowCommands = previousState?.showCommands, previousShowCommands != interfaceState.showCommands {
+                if interfaceState.showCommands {
+                    self.menuButtonIconNode.setAnimation(name: "anim_menuclose", colors: ["1.1.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor, "2.2.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor, "3.1.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor])
+                } else {
+                    self.menuButtonIconNode.setAnimation(name: "anim_closemenu", colors: ["1.1.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor, "2.2.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor, "3.1.Обводка 1": interfaceState.theme.chat.inputPanel.actionControlForegroundColor])
+                }
+                self.menuButtonIconNode.playOnce()
+            }
+            
             var updateSendButtonIcon = false
             if (previousState?.interfaceState.editMessage != nil) != (interfaceState.interfaceState.editMessage != nil) {
                 updateSendButtonIcon = true
@@ -735,7 +826,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 
                 if self.theme == nil || !self.theme!.chat.inputPanel.inputTextColor.isEqual(interfaceState.theme.chat.inputPanel.inputTextColor) {
                     let textColor = interfaceState.theme.chat.inputPanel.inputTextColor
-                    let baseFontSize = max(17.0, interfaceState.fontSize.baseDisplaySize)
+                    let baseFontSize = max(minInputFontSize, interfaceState.fontSize.baseDisplaySize)
                     
                     if let textInputNode = self.textInputNode {
                         if let text = textInputNode.attributedText?.string {
@@ -756,10 +847,12 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                     textInputNode.keyboardAppearance = keyboardAppearance
                 }
                 
-                self.textInputContainer.backgroundColor = interfaceState.theme.chat.inputPanel.inputBackgroundColor
-                
                 self.theme = interfaceState.theme
                 
+                self.menuButtonBackgroundNode.backgroundColor = interfaceState.theme.chat.inputPanel.actionControlFillColor
+                self.menuButtonTextNode.attributedText = NSAttributedString(string: interfaceState.strings.Conversation_InputMenu, font: Font.with(size: 16.0, design: .round, weight: .medium, traits: []), textColor: interfaceState.theme.chat.inputPanel.actionControlForegroundColor)
+                self.menuButton.accessibilityLabel = interfaceState.strings.Conversation_InputMenu
+                menuTextSize = self.menuButtonTextNode.updateLayout(CGSize(width: width, height: 44.0))
                 
                 if isEditingMedia {
                     self.attachmentButton.setImage(PresentationResourcesChat.chatInputPanelEditAttachmentButtonImage(interfaceState.theme), for: [])
@@ -779,7 +872,9 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                     backgroundColor = interfaceState.theme.chat.inputPanel.panelBackgroundColor
                 }
                 
-                self.textInputBackgroundNode.image = textInputBackgroundImage(backgroundColor: backgroundColor, strokeColor: interfaceState.theme.chat.inputPanel.inputStrokeColor, diameter: minimalInputHeight)
+                self.textInputBackgroundNode.image = textInputBackgroundImage(backgroundColor: backgroundColor, inputBackgroundColor: nil, strokeColor: interfaceState.theme.chat.inputPanel.inputStrokeColor, diameter: minimalInputHeight)
+                self.transparentTextInputBackgroundImage = textInputBackgroundImage(backgroundColor: nil, inputBackgroundColor: interfaceState.theme.chat.inputPanel.inputBackgroundColor, strokeColor: interfaceState.theme.chat.inputPanel.inputStrokeColor, diameter: minimalInputHeight)
+                self.textInputContainerBackgroundNode.image = generateStretchableFilledCircleImage(diameter: minimalInputHeight, color: interfaceState.theme.chat.inputPanel.inputBackgroundColor)
                 
                 self.searchLayoutClearImageNode.image = PresentationResourcesChat.chatInputTextFieldClearImage(interfaceState.theme)
                 
@@ -807,11 +902,14 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                     }
                 }
             }
+
+            let dismissedButtonMessageUpdated = interfaceState.interfaceState.messageActionsState.dismissedButtonKeyboardMessageId != previousState?.interfaceState.messageActionsState.dismissedButtonKeyboardMessageId
+            let replyMessageUpdated = interfaceState.interfaceState.replyMessageId != previousState?.interfaceState.replyMessageId
             
-            if let peer = interfaceState.renderedPeer?.peer, previousState?.renderedPeer?.peer == nil || !peer.isEqual(previousState!.renderedPeer!.peer!) || previousState?.interfaceState.silentPosting != interfaceState.interfaceState.silentPosting || themeUpdated || !self.initializedPlaceholder {
+            if let peer = interfaceState.renderedPeer?.peer, previousState?.renderedPeer?.peer == nil || !peer.isEqual(previousState!.renderedPeer!.peer!) || previousState?.interfaceState.silentPosting != interfaceState.interfaceState.silentPosting || themeUpdated || !self.initializedPlaceholder || previousState?.keyboardButtonsMessage?.id != interfaceState.keyboardButtonsMessage?.id || previousState?.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder != interfaceState.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder || dismissedButtonMessageUpdated || replyMessageUpdated {
                 self.initializedPlaceholder = true
                 
-                let placeholder: String
+                var placeholder: String
                 if let channel = peer as? TelegramChannel, case .broadcast = channel.info {
                     if interfaceState.interfaceState.silentPosting {
                         placeholder = interfaceState.strings.Conversation_InputTextSilentBroadcastPlaceholder
@@ -829,9 +927,19 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 } else {
                     placeholder = interfaceState.strings.Conversation_InputTextPlaceholder
                 }
+
+                if let keyboardButtonsMessage = interfaceState.keyboardButtonsMessage, interfaceState.interfaceState.messageActionsState.dismissedButtonKeyboardMessageId != keyboardButtonsMessage.id {
+                    if keyboardButtonsMessage.requestsSetupReply && keyboardButtonsMessage.id != interfaceState.interfaceState.replyMessageId {
+                    } else {
+                        if let placeholderValue = interfaceState.keyboardButtonsMessage?.visibleReplyMarkupPlaceholder, !placeholderValue.isEmpty {
+                            placeholder = placeholderValue
+                        }
+                    }
+                }
+
                 if self.currentPlaceholder != placeholder || themeUpdated {
                     self.currentPlaceholder = placeholder
-                    let baseFontSize = max(17.0, interfaceState.fontSize.baseDisplaySize)
+                    let baseFontSize = max(minInputFontSize, interfaceState.fontSize.baseDisplaySize)
                     self.textPlaceholderNode.attributedText = NSAttributedString(string: placeholder, font: Font.regular(baseFontSize), textColor: interfaceState.theme.chat.inputPanel.inputPlaceholderColor)
                     self.textInputNode?.textView.accessibilityHint = placeholder
                     let placeholderSize = self.textPlaceholderNode.updateLayout(CGSize(width: 320.0, height: CGFloat.greatestFiniteMagnitude))
@@ -936,14 +1044,68 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             self.accessoryItemButtons = updatedButtons
         }
         
+        let mediaRecordingState = interfaceState.inputTextPanelState.mediaRecordingState
+        
+        var inputHasText = false
+        if let textInputNode = self.textInputNode, let attributedText = textInputNode.attributedText, attributedText.length != 0 {
+            inputHasText = true
+        }
+        
+        var hasMenuButton = false
+        var menuButtonExpanded = false
+        if let peer = interfaceState.renderedPeer?.peer as? TelegramUser, let _ = peer.botInfo, interfaceState.hasBotCommands && interfaceState.editMessageState == nil {
+            hasMenuButton = true
+            
+            if !inputHasText {
+                switch interfaceState.inputMode {
+                case .none, .inputButtons:
+                    menuButtonExpanded = true
+                default:
+                    break
+                }
+            }
+        }
+        if mediaRecordingState != nil {
+            hasMenuButton = false
+        }
+        
+        let leftMenuInset: CGFloat
+        let menuCollapsedButtonWidth: CGFloat = 38.0
+        let menuButtonWidth = menuTextSize.width + 47.0
+        if hasMenuButton {
+            let menuButtonSpacing: CGFloat = 10.0
+            if menuButtonExpanded {
+                leftMenuInset = menuButtonWidth + menuButtonSpacing
+            } else {
+                leftMenuInset = menuCollapsedButtonWidth + menuButtonSpacing
+            }
+        } else {
+            leftMenuInset = 0.0
+        }
+        self.leftMenuInset = leftMenuInset
+        
+        let baseWidth = width - leftInset - leftMenuInset - rightInset
         let (accessoryButtonsWidth, textFieldHeight) = self.calculateTextFieldMetrics(width: baseWidth, maxHeight: maxHeight, metrics: metrics)
         let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
+                
+        let menuButtonHeight: CGFloat = 33.0
+        let menuButtonFrame = CGRect(x: leftInset + 10.0, y: panelHeight - minimalHeight + floorToScreenPixels((minimalHeight - menuButtonHeight) / 2.0), width: menuButtonExpanded ? menuButtonWidth : menuCollapsedButtonWidth, height: menuButtonHeight)
+        transition.updateFrameAsPositionAndBounds(node: self.menuButton, frame: menuButtonFrame)
+        transition.updateFrame(node: self.menuButtonBackgroundNode, frame: CGRect(origin: CGPoint(), size: menuButtonFrame.size))
+        transition.updateFrame(node: self.menuButtonClippingNode, frame: CGRect(origin: CGPoint(x: 19.0, y: 0.0), size: CGSize(width: menuButtonWidth - 19.0, height: menuButtonFrame.height)))
+        transition.updateFrame(node: self.menuButtonTextNode, frame: CGRect(origin: CGPoint(x: 16.0, y: 7.0 - UIScreenPixel), size: menuTextSize))
+        transition.updateAlpha(node: self.menuButtonTextNode, alpha: menuButtonExpanded ? 1.0 : 0.0)
+        transition.updateFrame(node: self.menuButtonIconNode, frame: CGRect(x: 4.0 + UIScreenPixel, y: 1.0 + UIScreenPixel, width: 30.0, height: 30.0))
         
+        let showMenuButton = hasMenuButton && interfaceState.recordedMediaPreview == nil
+        transition.updateTransformScale(node: self.menuButton, scale: showMenuButton ? 1.0 : 0.001)
+        transition.updateAlpha(node: self.menuButton, alpha: showMenuButton ? 1.0 : 0.0)
+        self.menuButton.isUserInteractionEnabled = hasMenuButton
+                    
         self.actionButtons.micButton.updateMode(mode: interfaceState.interfaceState.mediaRecordingMode, animated: transition.isAnimated)
         
         var hideMicButton = false
         var audioRecordingItemsAlpha: CGFloat = 1
-        let mediaRecordingState = interfaceState.inputTextPanelState.mediaRecordingState
         if mediaRecordingState != nil || interfaceState.recordedMediaPreview != nil {
             audioRecordingItemsAlpha = 0
         
@@ -970,7 +1132,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 }
             }
             
-            
             var animateCancelSlideIn = false
             let audioRecordingCancelIndicator: ChatTextInputAudioRecordingCancelIndicator
             if let currentAudioRecordingCancelIndicator = self.audioRecordingCancelIndicator {
@@ -1090,7 +1251,8 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 self.audioRecordingDotNode?.removeFromSupernode()
                 audioRecordingDotNode = AnimationNode(animation: "BinRed")
                 self.audioRecordingDotNode = audioRecordingDotNode
-                self.addSubnode(audioRecordingDotNode)
+                self.audioRecordingDotNodeDismissed = false
+                self.insertSubnode(audioRecordingDotNode, belowSubnode: self.menuButton)
                 self.animatingBinNode?.removeFromSupernode()
                 self.animatingBinNode = nil
             }
@@ -1128,6 +1290,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 audioRecordingCancelIndicator.layer.animateAlpha(from: CGFloat(audioRecordingCancelIndicator.layer.presentation()?.opacity ?? 1), to: 0, duration: 0.15, delay: 0, removeOnCompletion: false)
             }
         } else {
+            var update = self.actionButtons.micButton.audioRecorder != nil || self.actionButtons.micButton.videoRecordingStatus != nil
             self.actionButtons.micButton.audioRecorder = nil
             self.actionButtons.micButton.videoRecordingStatus = nil
             transition.updateAlpha(layer: self.textInputBackgroundNode.layer, alpha: 1.0)
@@ -1146,7 +1309,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             }
             
             if let audioRecordingDotNode = self.audioRecordingDotNode {
-                let dismissDotNode = { [weak audioRecordingDotNode, weak attachmentButton, weak self] in
+                let dismissDotNode = { [weak audioRecordingDotNode, weak self] in
                     guard let audioRecordingDotNode = audioRecordingDotNode, audioRecordingDotNode === self?.audioRecordingDotNode else { return }
                     
                     self?.audioRecordingDotNode = nil
@@ -1156,23 +1319,34 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                         audioRecordingDotNode?.removeFromSupernode()
                     }
                     
-                    attachmentButton?.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
-                    attachmentButton?.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+                    self?.attachmentButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+                    self?.attachmentButton.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
                 }
                 
-                audioRecordingDotNode.layer.removeAllAnimations()
+                if update && !self.audioRecordingDotNodeDismissed {
+                    audioRecordingDotNode.layer.removeAllAnimations()
+                }
                 
                 if self.isMediaDeleted {
                     if self.prevInputPanelNode is ChatRecordingPreviewInputPanelNode {
                         self.audioRecordingDotNode?.removeFromSupernode()
                         self.audioRecordingDotNode = nil
                     } else {
+                        if !self.audioRecordingDotNodeDismissed {
+                            audioRecordingDotNode.layer.removeAllAnimations()
+                        }
                         audioRecordingDotNode.completion = dismissDotNode
                         audioRecordingDotNode.play()
+                        update = true
                     }
                 } else {
                     dismissDotNode()
                 }
+                
+                if update && !self.audioRecordingDotNodeDismissed {
+                    self.audioRecordingDotNode?.layer.animatePosition(from: CGPoint(), to: CGPoint(x: leftMenuInset, y: 0.0), duration: 0.15, removeOnCompletion: false, additive: true)
+                    self.audioRecordingDotNodeDismissed = true
+                }
             }
             
             if let audioRecordingTimeNode = self.audioRecordingTimeNode {
@@ -1195,6 +1369,9 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             }
         }
         
+        var leftInset = leftInset
+        leftInset += leftMenuInset
+        
         transition.updateFrame(layer: self.attachmentButton.layer, frame: CGRect(origin: CGPoint(x: leftInset + 2.0 - UIScreenPixel, y: panelHeight - minimalHeight), size: CGSize(width: 40.0, height: minimalHeight)))
         transition.updateFrame(node: self.attachmentButtonDisabledNode, frame: self.attachmentButton.frame)
         
@@ -1260,13 +1437,19 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         if let image = self.searchLayoutClearImageNode.image {
             self.searchLayoutClearImageNode.frame = CGRect(origin: CGPoint(x: floor((searchLayoutClearButtonSize.width - image.size.width) / 2.0), y: floor((searchLayoutClearButtonSize.height - image.size.height) / 2.0)), size: image.size)
         }
+
+        var textInputViewRealInsets = UIEdgeInsets()
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            textInputViewRealInsets = calculateTextFieldRealInsets(presentationInterfaceState)
+        }
         
         let textInputFrame = CGRect(x: leftInset + textFieldInsets.left, y: textFieldInsets.top, width: baseWidth - textFieldInsets.left - textFieldInsets.right + textInputBackgroundWidthOffset, height: panelHeight - textFieldInsets.top - textFieldInsets.bottom)
         transition.updateFrame(node: self.textInputContainer, frame: textInputFrame)
+        transition.updateFrame(node: self.textInputContainerBackgroundNode, frame: CGRect(origin: CGPoint(), size: textInputFrame.size))
         transition.updateAlpha(node: self.textInputContainer, alpha: audioRecordingItemsAlpha)
         
         if let textInputNode = self.textInputNode {
-            let textFieldFrame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right + accessoryButtonsWidth), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - textInputViewInternalInsets.bottom))
+            let textFieldFrame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - textInputViewInternalInsets.bottom))
             let shouldUpdateLayout = textFieldFrame.size != textInputNode.frame.size
             transition.updateFrame(node: textInputNode, frame: textFieldFrame)
             if shouldUpdateLayout {
@@ -1292,7 +1475,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             
             let _ = placeholderApply()
             
-            contextPlaceholderNode.frame = CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + self.textInputViewRealInsets.top + UIScreenPixel), size: placeholderSize.size)
+            contextPlaceholderNode.frame = CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + textInputViewRealInsets.top + UIScreenPixel), size: placeholderSize.size)
             contextPlaceholderNode.alpha = audioRecordingItemsAlpha
         } else if let contextPlaceholderNode = self.contextPlaceholderNode {
             self.contextPlaceholderNode = nil
@@ -1309,7 +1492,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 self.slowmodePlaceholderNode = slowmodePlaceholderNode
                 self.insertSubnode(slowmodePlaceholderNode, aboveSubnode: self.textPlaceholderNode)
             }
-            let placeholderFrame = CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + self.textInputViewRealInsets.top + UIScreenPixel), size: CGSize(width: width - leftInset - rightInset - textFieldInsets.left - textFieldInsets.right - self.textInputViewInternalInsets.left - self.textInputViewInternalInsets.right - accessoryButtonsWidth, height: 30.0))
+            let placeholderFrame = CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + textInputViewRealInsets.top + UIScreenPixel), size: CGSize(width: width - leftInset - rightInset - textFieldInsets.left - textFieldInsets.right - self.textInputViewInternalInsets.left - self.textInputViewInternalInsets.right - accessoryButtonsWidth, height: 30.0))
             slowmodePlaceholderNode.updateState(slowmodeState)
             slowmodePlaceholderNode.frame = placeholderFrame
             slowmodePlaceholderNode.alpha = audioRecordingItemsAlpha
@@ -1318,12 +1501,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             self.slowmodePlaceholderNode = nil
             slowmodePlaceholderNode.removeFromSupernode()
         }
-        
-        var inputHasText = false
-        if let textInputNode = self.textInputNode, let attributedText = textInputNode.attributedText, attributedText.length != 0 {
-            inputHasText = true
-        }
-        
+
         if (interfaceState.slowmodeState != nil && !isScheduledMessages && interfaceState.editMessageState == nil) || interfaceState.inputTextPanelState.contextPlaceholder != nil {
             self.textPlaceholderNode.isHidden = true
             self.slowmodePlaceholderNode?.isHidden = inputHasText
@@ -1332,7 +1510,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             self.slowmodePlaceholderNode?.isHidden = true
         }
         
-        transition.updateFrame(node: self.textPlaceholderNode, frame: CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + self.textInputViewRealInsets.top + UIScreenPixel), size: self.textPlaceholderNode.frame.size))
+        transition.updateFrame(node: self.textPlaceholderNode, frame: CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + textInputViewRealInsets.top + UIScreenPixel), size: self.textPlaceholderNode.frame.size))
         transition.updateAlpha(node: self.textPlaceholderNode, alpha: audioRecordingItemsAlpha)
         
         transition.updateFrame(layer: self.textInputBackgroundNode.layer, frame: CGRect(x: leftInset + textFieldInsets.left, y: textFieldInsets.top, width: baseWidth - textFieldInsets.left - textFieldInsets.right + textInputBackgroundWidthOffset, height: panelHeight - textFieldInsets.top - textFieldInsets.bottom))
@@ -1369,13 +1547,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             }
         }
         
-        var hasText = false
-        if let textInputNode = self.textInputNode, let attributedText = textInputNode.attributedText, attributedText.length != 0 {
-            hasText = true
-            hideMicButton = true
-        }
-        
-        if self.extendedSearchLayout {
+        if inputHasText || self.extendedSearchLayout {
             hideMicButton = true
         }
         
@@ -1391,9 +1563,9 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         }
         self.actionButtons.micButton.fadeDisabled = mediaInputDisabled
         
-        self.updateActionButtons(hasText: hasText, hideMicButton: hideMicButton, animated: transition.isAnimated)
+        self.updateActionButtons(hasText: inputHasText, hideMicButton: hideMicButton, animated: transition.isAnimated)
         
-        if let prevInputPanelNode = prevInputPanelNode {
+        if let prevInputPanelNode = self.prevInputPanelNode {
             prevInputPanelNode.frame = CGRect(origin: .zero, size: prevInputPanelNode.frame.size)
         }
         if let prevPreviewInputPanelNode = self.prevInputPanelNode as? ChatRecordingPreviewInputPanelNode {
@@ -1406,7 +1578,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 func animatePosition(for previewSubnode: ASDisplayNode) {
                     previewSubnode.layer.animatePosition(
                         from: previewSubnode.position,
-                        to: CGPoint(x: previewSubnode.position.x - 20, y: previewSubnode.position.y),
+                        to: CGPoint(x: leftMenuInset.isZero ? previewSubnode.position.x - 20 : leftMenuInset + previewSubnode.frame.width / 2.0, y: previewSubnode.position.y),
                         duration: 0.15
                     )
                 }
@@ -1415,7 +1587,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 animatePosition(for: prevPreviewInputPanelNode.waveformScubberNode)
                 animatePosition(for: prevPreviewInputPanelNode.durationLabel)
                 animatePosition(for: prevPreviewInputPanelNode.playButton)
-                animatePosition(for: prevPreviewInputPanelNode.pauseButton)
             }
             
             func animateAlpha(for previewSubnode: ASDisplayNode) {
@@ -1430,7 +1601,6 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             animateAlpha(for: prevPreviewInputPanelNode.waveformScubberNode)
             animateAlpha(for: prevPreviewInputPanelNode.durationLabel)
             animateAlpha(for: prevPreviewInputPanelNode.playButton)
-            animateAlpha(for: prevPreviewInputPanelNode.pauseButton)
             
             let binNode = prevPreviewInputPanelNode.binNode
             self.animatingBinNode = binNode
@@ -1456,12 +1626,21 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             } else {
                 dismissBin()
             }
+            
+            prevPreviewInputPanelNode.deleteButton.layer.animatePosition(from: CGPoint(), to: CGPoint(x: leftMenuInset, y: 0.0), duration: 0.15, removeOnCompletion: false, additive: true)
 
             prevPreviewInputPanelNode.sendButton.layer.animateScale(from: 1.0, to: 0.3, duration: 0.15, removeOnCompletion: false)
             prevPreviewInputPanelNode.sendButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
             
-            actionButtons.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
-            actionButtons.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+            self.actionButtons.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+            self.actionButtons.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+            
+            if hasMenuButton {
+                self.menuButton.alpha = 1.0
+                self.menuButton.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+                self.menuButton.transform = CATransform3DIdentity
+                self.menuButton.layer.animateScale(from: 0.3, to: 1.0, duration: 0.15, delay: 0, removeOnCompletion: false)
+            }
             
             prevPreviewInputPanelNode.sendButton.layer.animateScale(from: 1.0, to: 0.3, duration: 0.15, removeOnCompletion: false)
             prevPreviewInputPanelNode.sendButton.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15, removeOnCompletion: false)
@@ -1476,7 +1655,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     
     @objc func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) {
         if let textInputNode = self.textInputNode, let presentationInterfaceState = self.presentationInterfaceState {
-            let baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+            let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
             refreshChatTextInputAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
             refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
             
@@ -1508,7 +1687,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 composeButtonsOffset = 44.0
             }
             
-            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset, maxHeight: maxHeight, metrics: metrics)
+            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset - self.leftMenuInset, maxHeight: maxHeight, metrics: metrics)
             let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
             var textFieldMinHeight: CGFloat = 33.0
             if let presentationInterfaceState = self.presentationInterfaceState {
@@ -1695,7 +1874,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
     
     private func updateTextHeight(animated: Bool) {
         if let (width, leftInset, rightInset, additionalSideInsets, maxHeight, metrics, _) = self.validLayout {
-            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset - additionalSideInsets.right, maxHeight: maxHeight, metrics: metrics)
+            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset - additionalSideInsets.right - self.leftMenuInset, maxHeight: maxHeight, metrics: metrics)
             let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
             if !self.bounds.size.height.isEqual(to: panelHeight) {
                 self.updateHeight(animated)
@@ -1760,7 +1939,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
                 UIMenuController.shared.update()
             }
             
-            let baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+            let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
             refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
         }
     }
@@ -1903,7 +2082,7 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
             if let presentationInterfaceState = self.presentationInterfaceState {
                 textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
                 accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
-                baseFontSize = max(17.0, presentationInterfaceState.fontSize.baseDisplaySize)
+                baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
             }
             let cleanReplacementString = textAttributedStringForStateText(NSAttributedString(string: cleanText), fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil)
             string.replaceCharacters(in: range, with: cleanReplacementString)
@@ -2009,6 +2188,13 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         self.sendMessage()
     }
     
+    @objc func menuButtonPressed() {
+        self.hapticFeedback.impact(.light)
+        self.interfaceInteraction?.updateShowCommands { value in
+            return !value
+        }
+    }
+
     @objc func attachmentButtonPressed() {
         self.displayAttachmentMenu()
     }
@@ -2154,5 +2340,46 @@ class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
         }
         return nil
     }
+
+    func makeSnapshotForTransition() -> ChatMessageTransitionNode.Source.TextInput? {
+        guard let backgroundImage = self.transparentTextInputBackgroundImage else {
+            return nil
+        }
+        guard let textInputNode = self.textInputNode else {
+            return nil
+        }
+
+        let backgroundView = UIImageView(image: backgroundImage)
+        backgroundView.frame = self.textInputBackgroundNode.frame
+
+        func updateIsCaretHidden(view: UIView, isHidden: Bool) {
+            return;
+            if String(describing: type(of: view)).contains("TextSelectionView") {
+                view.isHidden = isHidden
+            } else {
+                for subview in view.subviews {
+                    updateIsCaretHidden(view: subview, isHidden: isHidden)
+                }
+            }
+        }
+
+        updateIsCaretHidden(view: textInputNode.view, isHidden: true)
+
+        guard let contentView = textInputNode.view.snapshotView(afterScreenUpdates: true) else {
+            updateIsCaretHidden(view: textInputNode.view, isHidden: false)
+            return nil
+        }
+
+        updateIsCaretHidden(view: textInputNode.view, isHidden: false)
+
+        contentView.frame = textInputNode.frame
+
+        return ChatMessageTransitionNode.Source.TextInput(
+            backgroundView: backgroundView,
+            contentView: contentView,
+            sourceRect: self.view.convert(self.bounds, to: nil),
+            scrollOffset: textInputNode.textView.contentOffset.y
+        )
+    }
 }
 
diff --git a/submodules/TelegramUI/Sources/ChatTimerScreen.swift b/submodules/TelegramUI/Sources/ChatTimerScreen.swift
index 2ccb917a2b..b229c1e287 100644
--- a/submodules/TelegramUI/Sources/ChatTimerScreen.swift
+++ b/submodules/TelegramUI/Sources/ChatTimerScreen.swift
@@ -101,7 +101,7 @@ final class ChatTimerScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
@@ -401,10 +401,16 @@ class ChatTimerScreenNode: ViewControllerTracingNode, UIScrollViewDelegate, UIPi
         self.dimNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.4)
         
         let offset = self.bounds.size.height - self.contentBackgroundNode.frame.minY
-        
         let dimPosition = self.dimNode.layer.position
-        self.dimNode.layer.animatePosition(from: CGPoint(x: dimPosition.x, y: dimPosition.y - offset), to: dimPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-        self.layer.animateBoundsOriginYAdditive(from: -offset, to: 0.0, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+        
+        let transition = ContainedViewLayoutTransition.animated(duration: 0.4, curve: .spring)
+        let targetBounds = self.bounds
+        self.bounds = self.bounds.offsetBy(dx: 0.0, dy: -offset)
+        self.dimNode.position = CGPoint(x: dimPosition.x, y: dimPosition.y - offset)
+        transition.animateView({
+            self.bounds = targetBounds
+            self.dimNode.position = dimPosition
+        })
     }
     
     func animateOut(completion: (() -> Void)? = nil) {
diff --git a/submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift
index 7fa5e72cd4..1f26975cf2 100644
--- a/submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatTitleAccessoryPanelNode.swift
@@ -4,9 +4,14 @@ import Display
 import AsyncDisplayKit
 
 class ChatTitleAccessoryPanelNode: ASDisplayNode {
+    struct LayoutResult {
+        var backgroundHeight: CGFloat
+        var insetHeight: CGFloat
+    }
+
     var interfaceInteraction: ChatPanelInterfaceInteraction?
     
-    func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
-        return 0.0
+    func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
+        preconditionFailure()
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatTitleView.swift b/submodules/TelegramUI/Sources/ChatTitleView.swift
index fc9cefb143..f55c4a9b95 100644
--- a/submodules/TelegramUI/Sources/ChatTitleView.swift
+++ b/submodules/TelegramUI/Sources/ChatTitleView.swift
@@ -18,6 +18,9 @@ import PhoneNumberFormat
 import ChatTitleActivityNode
 import AnimatedCountLabelNode
 
+private let titleFont = Font.with(size: 17.0, design: .regular, weight: .semibold, traits: [.monospacedNumbers])
+private let subtitleFont = Font.regular(13.0)
+
 enum ChatTitleContent {
     enum ReplyThreadType {
         case comments
@@ -111,24 +114,24 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                     case let .peer(peerView, _, isScheduledMessages):
                         if peerView.peerId.isReplies {
                             let typeText: String = self.strings.DialogList_Replies
-                            segments = [.text(0, NSAttributedString(string: typeText, font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                            segments = [.text(0, NSAttributedString(string: typeText, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                             isEnabled = false
                         } else if isScheduledMessages {
                             if peerView.peerId == self.account.peerId {
-                                segments = [.text(0, NSAttributedString(string: self.strings.ScheduledMessages_RemindersTitle, font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                                segments = [.text(0, NSAttributedString(string: self.strings.ScheduledMessages_RemindersTitle, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                             } else {
-                                segments = [.text(0, NSAttributedString(string: self.strings.ScheduledMessages_Title, font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                                segments = [.text(0, NSAttributedString(string: self.strings.ScheduledMessages_Title, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                             }
                             isEnabled = false
                         } else {
                             if let peer = peerViewMainPeer(peerView) {
                                 if peerView.peerId == self.account.peerId {
-                                    segments = [.text(0, NSAttributedString(string: self.strings.Conversation_SavedMessages, font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                                    segments = [.text(0, NSAttributedString(string: self.strings.Conversation_SavedMessages, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                                 } else {
                                     if !peerView.peerIsContact, let user = peer as? TelegramUser, !user.flags.contains(.isSupport), user.botInfo == nil, let phone = user.phone, !phone.isEmpty {
-                                        segments = [.text(0, NSAttributedString(string: formatPhoneNumber(phone), font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                                        segments = [.text(0, NSAttributedString(string: formatPhoneNumber(phone), font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                                     } else {
-                                        segments = [.text(0, NSAttributedString(string: peer.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder), font: Font.medium(17.0), textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                                        segments = [.text(0, NSAttributedString(string: peer.displayTitle(strings: self.strings, displayOrder: self.nameDisplayOrder), font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                                     }
                                 }
                                 if peer.isFake {
@@ -147,7 +150,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                             }
                         }
                     case let .replyThread(type, count):
-                        let textFont = Font.medium(17.0)
+                        let textFont = titleFont
                         let textColor = titleTheme.rootController.navigationBar.primaryTextColor
                         
                         if count > 0 {
@@ -215,8 +218,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                         
                         isEnabled = false
                     case let .custom(text, _, enabled):
-                        let font = Font.with(size: 17.0, design: .regular, weight: .medium, traits: .monospacedNumbers)
-                        segments = [.text(0, NSAttributedString(string: text, font: font, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
+                        segments = [.text(0, NSAttributedString(string: text, font: titleFont, textColor: titleTheme.rootController.navigationBar.primaryTextColor))]
                         isEnabled = enabled
                 }
                 
@@ -306,7 +308,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
             case .online:
                 infoText = ""
             }
-            state = .info(NSAttributedString(string: infoText, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor), .generic)
+            state = .info(NSAttributedString(string: infoText, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor), .generic)
         case .online:
             if let (peerId, inputActivities) = self.inputActivities, !inputActivities.isEmpty, inputActivitiesAllowed {
                 var stringValue = ""
@@ -353,7 +355,7 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                     }
                 }
                 let color = titleTheme.rootController.navigationBar.accentTextColor
-                let string = NSAttributedString(string: stringValue, font: Font.regular(13.0), textColor: color)
+                let string = NSAttributedString(string: stringValue, font: subtitleFont, textColor: color)
                 switch mergedActivity {
                     case .typingText:
                         state = .typingText(string, color)
@@ -375,23 +377,23 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                             if let peer = peerViewMainPeer(peerView) {
                                 let servicePeer = isServicePeer(peer)
                                 if peer.id == self.account.peerId || isScheduledMessages || peer.id.isReplies {
-                                    let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                    let string = NSAttributedString(string: "", font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                     state = .info(string, .generic)
                                 } else if let user = peer as? TelegramUser {
                                     if user.isDeleted {
                                         state = .none
                                     } else if servicePeer {
-                                        let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let string = NSAttributedString(string: "", font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(string, .generic)
                                     } else if user.flags.contains(.isSupport) {
                                         let statusText = self.strings.Bot_GenericSupportStatus
                                         
-                                        let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let string = NSAttributedString(string: statusText, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(string, .generic)
                                     } else if let _ = user.botInfo {
                                         let statusText = self.strings.Bot_GenericBotStatus
                                         
-                                        let string = NSAttributedString(string: statusText, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let string = NSAttributedString(string: statusText, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(string, .generic)
                                     } else if let peer = peerViewMainPeer(peerView) {
                                         let timestamp = CFAbsoluteTimeGetCurrent() + NSTimeIntervalSince1970
@@ -403,10 +405,10 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                                             userPresence = TelegramUserPresence(status: .none, lastActivity: 0)
                                         }
                                         let (string, activity) = stringAndActivityForUserPresence(strings: self.strings, dateTimeFormat: self.dateTimeFormat, presence: userPresence, relativeTo: Int32(timestamp))
-                                        let attributedString = NSAttributedString(string: string, font: Font.regular(13.0), textColor: activity ? titleTheme.rootController.navigationBar.accentTextColor : titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let attributedString = NSAttributedString(string: string, font: subtitleFont, textColor: activity ? titleTheme.rootController.navigationBar.accentTextColor : titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(attributedString, activity ? .online : .lastSeenTime)
                                     } else {
-                                        let string = NSAttributedString(string: "", font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let string = NSAttributedString(string: "", font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(string, .generic)
                                     }
                                 } else if let group = peer as? TelegramGroup {
@@ -428,11 +430,11 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                                     if onlineCount > 1 {
                                         let string = NSMutableAttributedString()
                                         
-                                        string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(group.participantCount))), ", font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
-                                        string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineCount)), font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
+                                        string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(group.participantCount))), ", font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
+                                        string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineCount)), font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
                                         state = .info(string, .generic)
                                     } else {
-                                        let string = NSAttributedString(string: strings.Conversation_StatusMembers(Int32(group.participantCount)), font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                        let string = NSAttributedString(string: strings.Conversation_StatusMembers(Int32(group.participantCount)), font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                         state = .info(string, .generic)
                                     }
                                 } else if let channel = peer as? TelegramChannel {
@@ -440,17 +442,17 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                                         if memberCount == 0 {
                                             let string: NSAttributedString
                                             if case .group = channel.info {
-                                                string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                                string = NSAttributedString(string: strings.Group_Status, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                             } else {
-                                                string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                                string = NSAttributedString(string: strings.Channel_Status, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                             }
                                             state = .info(string, .generic)
                                         } else {
                                             if case .group = channel.info, let onlineMemberCount = onlineMemberCount, onlineMemberCount > 1 {
                                                 let string = NSMutableAttributedString()
                                                 
-                                                string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(memberCount))), ", font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
-                                                string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineMemberCount)), font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
+                                                string.append(NSAttributedString(string: "\(strings.Conversation_StatusMembers(Int32(memberCount))), ", font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
+                                                string.append(NSAttributedString(string: strings.Conversation_StatusOnline(Int32(onlineMemberCount)), font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor))
                                                 state = .info(string, .generic)
                                             } else {
                                                 let membersString: String
@@ -459,24 +461,24 @@ final class ChatTitleView: UIView, NavigationBarTitleView {
                                                 } else {
                                                     membersString = strings.Conversation_StatusSubscribers(memberCount)
                                                 }
-                                                let string = NSAttributedString(string: membersString, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                                let string = NSAttributedString(string: membersString, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                                 state = .info(string, .generic)
                                             }
                                         }
                                     } else {
                                         switch channel.info {
                                             case .group:
-                                                let string = NSAttributedString(string: strings.Group_Status, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                                let string = NSAttributedString(string: strings.Group_Status, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                                 state = .info(string, .generic)
                                             case .broadcast:
-                                                let string = NSAttributedString(string: strings.Channel_Status, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                                                let string = NSAttributedString(string: strings.Channel_Status, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                                                 state = .info(string, .generic)
                                         }
                                     }
                                 }
                             }
                         case let .custom(_, subtitle?, _):
-                            let string = NSAttributedString(string: subtitle, font: Font.regular(13.0), textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
+                            let string = NSAttributedString(string: subtitle, font: subtitleFont, textColor: titleTheme.rootController.navigationBar.secondaryTextColor)
                             state = .info(string, .generic)
                         default:
                             break
diff --git a/submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift b/submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift
index 66eea3e6ab..a29e529ead 100644
--- a/submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ChatToastAlertPanelNode.swift
@@ -34,23 +34,22 @@ final class ChatToastAlertPanelNode: ChatTitleAccessoryPanelNode {
         self.titleNode.insets = UIEdgeInsets(top: 2.0, left: 2.0, bottom: 2.0, right: 2.0)
         
         super.init()
-        
+
         self.addSubnode(self.titleNode)
         self.addSubnode(self.separatorNode)
     }
     
-    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> CGFloat {
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) -> LayoutResult {
         let panelHeight: CGFloat = 40.0
 
         self.textColor = interfaceState.theme.rootController.navigationBar.primaryTextColor
-        self.backgroundColor = interfaceState.theme.chat.historyNavigation.fillColor
         self.separatorNode.backgroundColor = interfaceState.theme.chat.historyNavigation.strokeColor
         
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: panelHeight - UIScreenPixel), size: CGSize(width: width, height: UIScreenPixel)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         
         let titleSize = self.titleNode.updateLayout(CGSize(width: width - leftInset - rightInset - 20.0, height: 100.0))
         self.titleNode.frame = CGRect(origin: CGPoint(x: floor((width - titleSize.width) / 2.0), y: floor((panelHeight - titleSize.height) / 2.0)), size: titleSize)
         
-        return panelHeight
+        return LayoutResult(backgroundHeight: panelHeight, insetHeight: panelHeight)
     }
 }
diff --git a/submodules/TelegramUI/Sources/ChatUnreadItem.swift b/submodules/TelegramUI/Sources/ChatUnreadItem.swift
index e36c4d07fa..23a2f37304 100644
--- a/submodules/TelegramUI/Sources/ChatUnreadItem.swift
+++ b/submodules/TelegramUI/Sources/ChatUnreadItem.swift
@@ -147,9 +147,9 @@ class ChatUnreadItemNode: ListViewItemNode {
         }
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return [item.header]
         } else {
             return nil
         }
diff --git a/submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift
index abecef6dfa..a215268547 100644
--- a/submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/CommandChatInputContextPanelNode.swift
@@ -174,7 +174,10 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode {
                     
                     if let topItemOffset = topItemOffset {
                         let position = strongSelf.listView.layer.position
-                        strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
                     }
                 }
             })
@@ -239,4 +242,14 @@ final class CommandChatInputContextPanelNode: ChatInputContextPanelNode {
         let listViewFrame = self.listView.frame
         return self.listView.hitTest(CGPoint(x: point.x - listViewFrame.minX, y: point.y - listViewFrame.minY), with: event)
     }
+    
+    override var topItemFrame: CGRect? {
+        var topItemFrame: CGRect?
+        self.listView.forEachItemNode { itemNode in
+            if topItemFrame == nil {
+                topItemFrame = itemNode.frame
+            }
+        }
+        return topItemFrame
+    }
 }
diff --git a/submodules/TelegramUI/Sources/CommandMenuChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/CommandMenuChatInputContextPanelNode.swift
new file mode 100644
index 0000000000..dfd628d004
--- /dev/null
+++ b/submodules/TelegramUI/Sources/CommandMenuChatInputContextPanelNode.swift
@@ -0,0 +1,273 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Postbox
+import SwiftSignalKit
+import TelegramCore
+import SyncCore
+import Display
+import TelegramPresentationData
+import TelegramUIPreferences
+import MergeLists
+import AccountContext
+
+private struct CommandMenuChatInputContextPanelEntryStableId: Hashable {
+    let command: PeerCommand
+}
+
+private struct CommandMenuChatInputContextPanelEntry: Comparable, Identifiable {
+    let index: Int
+    let command: PeerCommand
+    let theme: PresentationTheme
+    
+    var stableId: CommandMenuChatInputContextPanelEntryStableId {
+        return CommandMenuChatInputContextPanelEntryStableId(command: self.command)
+    }
+    
+    func withUpdatedTheme(_ theme: PresentationTheme) -> CommandMenuChatInputContextPanelEntry {
+        return CommandMenuChatInputContextPanelEntry(index: self.index, command: self.command, theme: theme)
+    }
+    
+    static func ==(lhs: CommandMenuChatInputContextPanelEntry, rhs: CommandMenuChatInputContextPanelEntry) -> Bool {
+        return lhs.index == rhs.index && lhs.command == rhs.command && lhs.theme === rhs.theme
+    }
+    
+    static func <(lhs: CommandMenuChatInputContextPanelEntry, rhs: CommandMenuChatInputContextPanelEntry) -> Bool {
+        return lhs.index < rhs.index
+    }
+    
+    func item(context: AccountContext, fontSize: PresentationFontSize, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> ListViewItem {
+        return CommandMenuChatInputPanelItem(context: context, theme: self.theme, fontSize: fontSize, command: self.command, commandSelected: commandSelected)
+    }
+}
+
+private struct CommandMenuChatInputContextPanelTransition {
+    let deletions: [ListViewDeleteItem]
+    let insertions: [ListViewInsertItem]
+    let updates: [ListViewUpdateItem]
+}
+
+private func preparedTransition(from fromEntries: [CommandMenuChatInputContextPanelEntry], to toEntries: [CommandMenuChatInputContextPanelEntry], context: AccountContext, fontSize: PresentationFontSize, commandSelected: @escaping (PeerCommand, Bool) -> Void) -> CommandMenuChatInputContextPanelTransition {
+    let (deleteIndices, indicesAndItems, updateIndices) = mergeListsStableWithUpdates(leftList: fromEntries, rightList: toEntries)
+    
+    let deletions = deleteIndices.map { ListViewDeleteItem(index: $0, directionHint: nil) }
+    let insertions = indicesAndItems.map { ListViewInsertItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, fontSize: fontSize, commandSelected: commandSelected), directionHint: nil) }
+    let updates = updateIndices.map { ListViewUpdateItem(index: $0.0, previousIndex: $0.2, item: $0.1.item(context: context, fontSize: fontSize, commandSelected: commandSelected), directionHint: nil) }
+    
+    return CommandMenuChatInputContextPanelTransition(deletions: deletions, insertions: insertions, updates: updates)
+}
+
+final class CommandMenuChatInputContextPanelNode: ChatInputContextPanelNode {
+    private let listView: ListView
+    private var currentEntries: [CommandMenuChatInputContextPanelEntry]?
+    
+    private var enqueuedTransitions: [(CommandMenuChatInputContextPanelTransition, Bool)] = []
+    private var validLayout: (CGSize, CGFloat, CGFloat, CGFloat)?
+    
+    private let disposable = MetaDisposable()
+    
+    init(context: AccountContext, theme: PresentationTheme, strings: PresentationStrings, fontSize: PresentationFontSize, peerId: PeerId) {
+        self.listView = ListView()
+        self.listView.clipsToBounds = false
+        self.listView.isOpaque = false
+        self.listView.stackFromBottom = true
+//        self.listView.keepBottomItemOverscrollBackground = theme.list.plainBackgroundColor
+        self.listView.limitHitTestToNodes = true
+        self.listView.view.disablesInteractiveTransitionGestureRecognizer = true
+        self.listView.accessibilityPageScrolledString = { row, count in
+            return strings.VoiceOver_ScrollStatus(row, count).0
+        }
+        
+        super.init(context: context, theme: theme, strings: strings, fontSize: fontSize)
+        
+        self.isOpaque = false
+        self.clipsToBounds = true
+        
+        self.addSubnode(self.listView)
+        
+        self.disposable.set((context.engine.peers.peerCommands(id: peerId)
+        |> deliverOnMainQueue).start(next: { [weak self] results in
+            if let strongSelf = self {
+                strongSelf.updateResults(results.commands)
+            }
+        }))
+    }
+    
+    deinit {
+        self.disposable.dispose()
+    }
+    
+    func updateResults(_ results: [PeerCommand]) {
+        var entries: [CommandMenuChatInputContextPanelEntry] = []
+        var index = 0
+        var stableIds = Set<CommandMenuChatInputContextPanelEntryStableId>()
+        for command in results {
+            let entry = CommandMenuChatInputContextPanelEntry(index: index, command: command, theme: self.theme)
+            if stableIds.contains(entry.stableId) {
+                continue
+            }
+            stableIds.insert(entry.stableId)
+            entries.append(entry)
+            index += 1
+        }
+        self.prepareTransition(from: self.currentEntries ?? [], to: entries)
+    }
+    
+    private func prepareTransition(from: [CommandMenuChatInputContextPanelEntry]? , to: [CommandMenuChatInputContextPanelEntry]) {
+        let firstTime = self.currentEntries == nil
+        let transition = preparedTransition(from: from ?? [], to: to, context: self.context, fontSize: self.fontSize, commandSelected: { [weak self] command, sendImmediately in
+            if let strongSelf = self, let interfaceInteraction = strongSelf.interfaceInteraction {
+                if sendImmediately {
+                    interfaceInteraction.sendBotCommand(command.peer, "/" + command.command.text)
+                } else {
+                    interfaceInteraction.updateShowCommands { _ in return false }
+                    interfaceInteraction.updateTextInputStateAndMode { textInputState, inputMode in
+                        var commandQueryRange: NSRange?
+                        inner: for (range, type, _) in textInputStateContextQueryRangeAndType(textInputState) {
+                            if type == [.command] {
+                                commandQueryRange = range
+                                break inner
+                            }
+                        }
+                        if let range = commandQueryRange {
+                            let inputText = NSMutableAttributedString(attributedString: textInputState.inputText)
+                            
+                            let replacementText = command.command.text + " "
+                            inputText.replaceCharacters(in: range, with: replacementText)
+                            
+                            let selectionPosition = range.lowerBound + (replacementText as NSString).length
+                            
+                            return (ChatTextInputState(inputText: inputText, selectionRange: selectionPosition ..< selectionPosition), inputMode)
+                        } else {
+                            let inputText = NSMutableAttributedString(string: "/" + command.command.text + " ")
+                            let selectionPosition = (inputText.string as NSString).length + 1
+                            return (ChatTextInputState(inputText: inputText, selectionRange: selectionPosition ..< selectionPosition), inputMode)
+                        }
+                    }
+                }
+            }
+        })
+        self.currentEntries = to
+        self.enqueueTransition(transition, firstTime: firstTime)
+    }
+    
+    private func enqueueTransition(_ transition: CommandMenuChatInputContextPanelTransition, firstTime: Bool) {
+        enqueuedTransitions.append((transition, firstTime))
+        
+        if self.validLayout != nil {
+            while !self.enqueuedTransitions.isEmpty {
+                self.dequeueTransition()
+            }
+        }
+    }
+    
+    private func dequeueTransition() {
+        if let validLayout = self.validLayout, let (transition, firstTime) = self.enqueuedTransitions.first {
+            self.enqueuedTransitions.remove(at: 0)
+            
+            var options = ListViewDeleteAndInsertOptions()
+            if firstTime {
+                //options.insert(.Synchronous)
+                //options.insert(.LowLatency)
+            } else {
+                options.insert(.AnimateTopItemPosition)
+                options.insert(.AnimateCrossfade)
+            }
+            
+            var insets = UIEdgeInsets()
+            insets.top = topInsetForLayout(size: validLayout.0)
+            insets.left = validLayout.1
+            insets.right = validLayout.2
+            
+            let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: self.listView.bounds.size, insets: insets, duration: 0.0, curve: .Default(duration: nil))
+            
+            self.listView.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: updateSizeAndInsets, updateOpaqueState: nil, completion: { [weak self] _ in
+                if let strongSelf = self, firstTime {
+                    var topItemOffset: CGFloat?
+                    strongSelf.listView.forEachItemNode { itemNode in
+                        if topItemOffset == nil {
+                            topItemOffset = itemNode.frame.minY
+                        }
+                    }
+                    
+                    if let topItemOffset = topItemOffset {
+                        let position = strongSelf.listView.layer.position
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
+                    }
+                }
+            })
+        }
+    }
+    
+    private func topInsetForLayout(size: CGSize) -> CGFloat {
+        let minimumItemHeights: CGFloat = floor(MentionChatInputPanelItemNode.itemHeight * 4.7)
+        return max(size.height - minimumItemHeights, 0.0)
+    }
+    
+    override func updateLayout(size: CGSize, leftInset: CGFloat, rightInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState) {
+        let hadValidLayout = self.validLayout != nil
+        self.validLayout = (size, leftInset, rightInset, bottomInset)
+        
+        var insets = UIEdgeInsets()
+        insets.top = self.topInsetForLayout(size: size)
+        insets.left = leftInset
+        insets.right = rightInset
+        
+        transition.updateFrame(node: self.listView, frame: CGRect(x: 0.0, y: 0.0, width: size.width, height: size.height))
+        
+        let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
+        let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: size, insets: insets, duration: duration, curve: curve)
+        
+        self.listView.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: nil, updateSizeAndInsets: updateSizeAndInsets, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
+        
+        if !hadValidLayout {
+            while !self.enqueuedTransitions.isEmpty {
+                self.dequeueTransition()
+            }
+        }
+        
+        if self.theme !== interfaceState.theme {
+            self.theme = interfaceState.theme
+            self.listView.keepBottomItemOverscrollBackground = self.theme.list.plainBackgroundColor
+            
+            let new = self.currentEntries?.map({$0.withUpdatedTheme(interfaceState.theme)}) ?? []
+            prepareTransition(from: self.currentEntries, to: new)
+        }
+    }
+    
+    override func animateOut(completion: @escaping () -> Void) {
+        var topItemOffset: CGFloat?
+        self.listView.forEachItemNode { itemNode in
+            if topItemOffset == nil {
+                topItemOffset = itemNode.frame.minY
+            }
+        }
+        
+        if let topItemOffset = topItemOffset {
+            let position = self.listView.layer.position
+            self.listView.layer.animatePosition(from: position, to: CGPoint(x: position.x, y: position.y + (self.listView.bounds.size.height - topItemOffset)), duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring, removeOnCompletion: false, completion: { _ in
+                completion()
+            })
+        } else {
+            completion()
+        }
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let listViewFrame = self.listView.frame
+        return self.listView.hitTest(CGPoint(x: point.x - listViewFrame.minX, y: point.y - listViewFrame.minY), with: event)
+    }
+    
+    override var topItemFrame: CGRect? {
+        var topItemFrame: CGRect?
+        self.listView.forEachItemNode { itemNode in
+            if topItemFrame == nil {
+                topItemFrame = itemNode.frame
+            }
+        }
+        return topItemFrame
+    }
+}
diff --git a/submodules/TelegramUI/Sources/CommandMenuChatInputPanelItem.swift b/submodules/TelegramUI/Sources/CommandMenuChatInputPanelItem.swift
new file mode 100644
index 0000000000..6f7c52ec01
--- /dev/null
+++ b/submodules/TelegramUI/Sources/CommandMenuChatInputPanelItem.swift
@@ -0,0 +1,273 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramCore
+import SyncCore
+import SwiftSignalKit
+import Postbox
+import TelegramPresentationData
+import TelegramUIPreferences
+import AccountContext
+
+final class CommandMenuChatInputPanelItem: ListViewItem {
+    fileprivate let context: AccountContext
+    fileprivate let theme: PresentationTheme
+    fileprivate let fontSize: PresentationFontSize
+    fileprivate let command: PeerCommand
+    fileprivate let commandSelected: (PeerCommand, Bool) -> Void
+    
+    let selectable: Bool = true
+    
+    public init(context: AccountContext, theme: PresentationTheme, fontSize: PresentationFontSize, command: PeerCommand, commandSelected: @escaping (PeerCommand, Bool) -> Void) {
+        self.context = context
+        self.theme = theme
+        self.fontSize = fontSize
+        self.command = command
+        self.commandSelected = commandSelected
+    }
+    
+    public func nodeConfiguredForParams(async: @escaping (@escaping () -> Void) -> Void, params: ListViewItemLayoutParams, synchronousLoads: Bool, previousItem: ListViewItem?, nextItem: ListViewItem?, completion: @escaping (ListViewItemNode, @escaping () -> (Signal<Void, NoError>?, (ListViewItemApply) -> Void)) -> Void) {
+        let configure = { () -> Void in
+            let node = CommandMenuChatInputPanelItemNode()
+            
+            let nodeLayout = node.asyncLayout()
+            let (top, bottom) = (previousItem != nil, nextItem != nil)
+            let (layout, apply) = nodeLayout(self, params, top, bottom)
+            
+            node.contentSize = layout.contentSize
+            node.insets = layout.insets
+            
+            Queue.mainQueue().async {
+                completion(node, {
+                    return (nil, { _ in apply(.None) })
+                })
+            }
+        }
+        if Thread.isMainThread {
+            async {
+                configure()
+            }
+        } else {
+            configure()
+        }
+    }
+    
+    public func updateNode(async: @escaping (@escaping () -> Void) -> Void, node: @escaping () -> ListViewItemNode, params: ListViewItemLayoutParams, previousItem: ListViewItem?, nextItem: ListViewItem?, animation: ListViewItemUpdateAnimation, completion: @escaping (ListViewItemNodeLayout, @escaping (ListViewItemApply) -> Void) -> Void) {
+        Queue.mainQueue().async {
+            if let nodeValue = node() as? CommandMenuChatInputPanelItemNode {
+                let nodeLayout = nodeValue.asyncLayout()
+                
+                async {
+                    let (top, bottom) = (previousItem != nil, nextItem != nil)
+                    
+                    let (layout, apply) = nodeLayout(self, params, top, bottom)
+                    Queue.mainQueue().async {
+                        completion(layout, { _ in
+                            apply(animation)
+                        })
+                    }
+                }
+            } else {
+                assertionFailure()
+            }
+        }
+    }
+    
+    func selected(listView: ListView) {
+        self.commandSelected(self.command, true)
+    }
+}
+
+private extension String {
+    func capitalizeFirstLetter() -> String {
+        return self.prefix(1).capitalized + self.dropFirst()
+    }
+}
+
+private let backgroundCornerRadius: CGFloat = 10.0
+private let shadowBlur: CGFloat = 10.0
+
+let shadowImage = generateImage(CGSize(width: (backgroundCornerRadius + shadowBlur) * 2.0, height: backgroundCornerRadius + shadowBlur), rotatedContext: { size, context in
+    let diameter = backgroundCornerRadius * 2.0
+    let shadow = UIColor(white: 0.0, alpha: 0.5)
+    context.clear(CGRect(origin: CGPoint(), size: size))
+    
+    context.saveGState()
+    context.setFillColor(shadow.cgColor)
+    context.setShadow(offset: CGSize(), blur: shadowBlur, color: shadow.cgColor)
+    
+    context.fillEllipse(in: CGRect(origin: CGPoint(x: shadowBlur, y: shadowBlur), size: CGSize(width: diameter, height: diameter)))
+    
+    context.setFillColor(UIColor.clear.cgColor)
+    context.setBlendMode(.copy)
+    
+    context.fillEllipse(in: CGRect(origin: CGPoint(x: shadowBlur, y: shadowBlur), size: CGSize(width: diameter, height: diameter)))
+    
+    context.restoreGState()
+})?.stretchableImage(withLeftCapWidth: Int(backgroundCornerRadius + shadowBlur), topCapHeight: 0)
+
+final class CommandMenuChatInputPanelItemNode: ListViewItemNode {
+    static let itemHeight: CGFloat = 44.0
+    
+    private var item: CommandMenuChatInputPanelItem?
+    private let textNode: TextNode
+    private let commandNode: TextNode
+    private let separatorNode: ASDisplayNode
+    private let clippingNode: ASDisplayNode
+    private let shadowNode: ASImageNode
+    private let backgroundNode: ASDisplayNode
+    private let highlightedBackgroundNode: ASDisplayNode
+        
+    init() {
+        self.textNode = TextNode()
+        self.commandNode = TextNode()
+                
+        self.separatorNode = ASDisplayNode()
+        self.separatorNode.isLayerBacked = true
+        
+        self.highlightedBackgroundNode = ASDisplayNode()
+        self.highlightedBackgroundNode.isLayerBacked = true
+        
+        self.clippingNode = ASDisplayNode()
+        self.clippingNode.clipsToBounds = true
+        
+        self.shadowNode = ASImageNode()
+        self.shadowNode.displaysAsynchronously = false
+        self.shadowNode.contentMode = .scaleToFill
+        self.shadowNode.image = shadowImage
+        
+        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode.clipsToBounds = true
+        
+        super.init(layerBacked: false, dynamicBounce: false)
+                
+        self.addSubnode(self.clippingNode)
+        self.clippingNode.addSubnode(self.shadowNode)
+        self.clippingNode.addSubnode(self.backgroundNode)
+        
+        self.backgroundNode.addSubnode(self.textNode)
+        self.backgroundNode.addSubnode(self.commandNode)
+        self.backgroundNode.addSubnode(self.separatorNode)
+    }
+    
+    override func didLoad() {
+        super.didLoad()
+        
+        let gestureRecognizer = UILongPressGestureRecognizer(target: self, action: #selector(self.longPressed(_:)))
+        gestureRecognizer.minimumPressDuration = 0.3
+        self.view.addGestureRecognizer(gestureRecognizer)
+    }
+    
+    @objc private func longPressed(_ gestureRecognizer: UILongPressGestureRecognizer) {
+        switch gestureRecognizer.state {
+            case .began:
+                if let item = self.item {
+                    item.commandSelected(item.command, false)
+                }
+            default:
+                break
+        }
+    }
+    
+    override func layoutForParams(_ params: ListViewItemLayoutParams, item: ListViewItem, previousItem: ListViewItem?, nextItem: ListViewItem?) {
+        if let item = item as? CommandMenuChatInputPanelItem {
+            let doLayout = self.asyncLayout()
+            let merged = (top: previousItem != nil, bottom: nextItem != nil)
+            let (layout, apply) = doLayout(item, params, merged.top, merged.bottom)
+            self.contentSize = layout.contentSize
+            self.insets = layout.insets
+            apply(.None)
+        }
+    }
+    
+    func asyncLayout() -> (_ item: CommandMenuChatInputPanelItem, _ params: ListViewItemLayoutParams, _ mergedTop: Bool, _ mergedBottom: Bool) -> (ListViewItemNodeLayout, (ListViewItemUpdateAnimation) -> Void) {
+        let makeTextLayout = TextNode.asyncLayout(self.textNode)
+        let makeCommandLayout = TextNode.asyncLayout(self.commandNode)
+        
+        return { [weak self] item, params, mergedTop, mergedBottom in
+            let textFont = Font.regular(floor(item.fontSize.baseDisplaySize))
+            let commandFont = Font.regular(floor(item.fontSize.baseDisplaySize * 14.0 / 17.0))
+            
+            let leftInset: CGFloat = 16.0 + params.leftInset
+            let rightInset: CGFloat = 16.0 + params.rightInset
+            
+            let textString: NSAttributedString
+            let commandString: NSAttributedString
+            if item.command.command.description.isEmpty {
+                textString = NSAttributedString(string: item.command.command.text.capitalizeFirstLetter(), font: textFont, textColor: item.theme.list.itemPrimaryTextColor)
+                commandString = NSAttributedString(string: "/" + item.command.command.text, font: commandFont, textColor: item.theme.list.itemSecondaryTextColor)
+            } else {
+                textString = NSAttributedString(string: item.command.command.description.capitalizeFirstLetter(), font: textFont, textColor: item.theme.list.itemPrimaryTextColor)
+                commandString = NSAttributedString(string: "/" + item.command.command.text, font: commandFont, textColor: item.theme.list.itemSecondaryTextColor)
+            }
+            
+            let (textLayout, textApply) = makeTextLayout(TextNodeLayoutArguments(attributedString: textString, backgroundColor: nil, maximumNumberOfLines: 2, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - rightInset - 130.0, height: 100.0), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let (commandLayout, commandApply) = makeCommandLayout(TextNodeLayoutArguments(attributedString: commandString, backgroundColor: nil, maximumNumberOfLines: 2, truncationType: .end, constrainedSize: CGSize(width: 120.0, height: 100.0), alignment: .natural, cutout: nil, insets: UIEdgeInsets()))
+            
+            let nodeLayout = ListViewItemNodeLayout(contentSize: CGSize(width: params.width, height: max(CommandMenuChatInputPanelItemNode.itemHeight, textLayout.size.height + 14.0)), insets: UIEdgeInsets())
+                        
+            return (nodeLayout, { _ in
+                if let strongSelf = self {
+                    strongSelf.item = item
+                    
+                    strongSelf.separatorNode.backgroundColor = item.theme.list.itemPlainSeparatorColor
+                    strongSelf.backgroundNode.backgroundColor = item.theme.list.plainBackgroundColor
+                    strongSelf.highlightedBackgroundNode.backgroundColor = item.theme.list.itemHighlightedBackgroundColor
+                    
+                    let _ = textApply()
+                    let _ = commandApply()
+                    
+                    strongSelf.textNode.frame = CGRect(origin: CGPoint(x: leftInset, y: floor((nodeLayout.contentSize.height - textLayout.size.height) / 2.0)), size: textLayout.size)
+                    strongSelf.commandNode.frame = CGRect(origin: CGPoint(x: params.width - rightInset - commandLayout.size.width, y: floor((nodeLayout.contentSize.height - commandLayout.size.height) / 2.0)), size: commandLayout.size)
+                                        
+                    strongSelf.separatorNode.isHidden = !mergedBottom
+                    
+                    strongSelf.separatorNode.frame = CGRect(origin: CGPoint(x: leftInset, y: nodeLayout.contentSize.height - UIScreenPixel), size: CGSize(width: params.width - leftInset, height: UIScreenPixel))
+                    
+                    strongSelf.highlightedBackgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: params.width, height: nodeLayout.size.height + UIScreenPixel))
+                    
+                    if !mergedTop {
+                        strongSelf.shadowNode.isHidden = false
+                        strongSelf.shadowNode.frame = CGRect(origin: CGPoint(x: -shadowBlur, y: 0.0), size: CGSize(width: nodeLayout.size.width + shadowBlur * 2.0, height: backgroundCornerRadius + shadowBlur))
+                        strongSelf.clippingNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -shadowBlur), size: CGSize(width: nodeLayout.size.width, height: nodeLayout.size.height + shadowBlur))
+                        strongSelf.backgroundNode.cornerRadius = backgroundCornerRadius
+                        strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(x: 0.0, y: shadowBlur), size: CGSize(width: nodeLayout.size.width, height: nodeLayout.size.height + backgroundCornerRadius))
+                    } else {
+                        strongSelf.shadowNode.isHidden = true
+                        strongSelf.clippingNode.frame = CGRect(origin: CGPoint(), size: nodeLayout.size)
+                        strongSelf.backgroundNode.cornerRadius = 0.0
+                        strongSelf.backgroundNode.frame = CGRect(origin: CGPoint(), size: nodeLayout.size)
+                    }
+                }
+            })
+        }
+    }
+    
+    override func setHighlighted(_ highlighted: Bool, at point: CGPoint, animated: Bool) {
+        super.setHighlighted(highlighted, at: point, animated: animated)
+        
+        if highlighted {
+            self.highlightedBackgroundNode.alpha = 1.0
+            if self.highlightedBackgroundNode.supernode == nil {
+                self.backgroundNode.insertSubnode(self.highlightedBackgroundNode, at: 0)
+            }
+        } else {
+            if self.highlightedBackgroundNode.supernode != nil {
+                if animated {
+                    self.highlightedBackgroundNode.layer.animateAlpha(from: self.highlightedBackgroundNode.alpha, to: 0.0, duration: 0.4, completion: { [weak self] completed in
+                        if let strongSelf = self {
+                            if completed {
+                                strongSelf.highlightedBackgroundNode.removeFromSupernode()
+                            }
+                        }
+                    })
+                    self.highlightedBackgroundNode.alpha = 0.0
+                } else {
+                    self.highlightedBackgroundNode.removeFromSupernode()
+                }
+            }
+        }
+    }
+}
diff --git a/submodules/TelegramUI/Sources/ComposeController.swift b/submodules/TelegramUI/Sources/ComposeController.swift
index 584bcbe4e6..cf1f47b27f 100644
--- a/submodules/TelegramUI/Sources/ComposeController.swift
+++ b/submodules/TelegramUI/Sources/ComposeController.swift
@@ -157,11 +157,11 @@ public class ComposeControllerImpl: ViewController, ComposeController {
                 let controller = ContactSelectionControllerImpl(ContactSelectionControllerParams(context: strongSelf.context, autoDismiss: false, title: { $0.Compose_NewEncryptedChatTitle }))
                 strongSelf.createActionDisposable.set((controller.result
                     |> take(1)
-                    |> deliverOnMainQueue).start(next: { [weak controller] peer in
-                    if let strongSelf = self, let (contactPeer, _) = peer, case let .peer(peer, _, _) = contactPeer {
+                    |> deliverOnMainQueue).start(next: { [weak controller] result in
+                    if let strongSelf = self, let (contactPeers, _) = result, case let .peer(peer, _, _) = contactPeers.first {
                         controller?.dismissSearch()
                         controller?.displayNavigationActivity = true
-                        strongSelf.createActionDisposable.set((createSecretChat(account: strongSelf.context.account, peerId: peer.id) |> deliverOnMainQueue).start(next: { peerId in
+                        strongSelf.createActionDisposable.set((strongSelf.context.engine.peers.createSecretChat(peerId: peer.id) |> deliverOnMainQueue).start(next: { peerId in
                             if let strongSelf = self, let controller = controller {
                                 controller.displayNavigationActivity = false
                                 (controller.navigationController as? NavigationController)?.replaceAllButRootController(ChatControllerImpl(context: strongSelf.context, chatLocation: .peer(peerId)), animated: true)
@@ -284,7 +284,7 @@ public class ComposeControllerImpl: ViewController, ComposeController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
     
     private func activateSearch() {
diff --git a/submodules/TelegramUI/Sources/ContactMultiselectionController.swift b/submodules/TelegramUI/Sources/ContactMultiselectionController.swift
index d3f55ee3e1..9f7af80a89 100644
--- a/submodules/TelegramUI/Sources/ContactMultiselectionController.swift
+++ b/submodules/TelegramUI/Sources/ContactMultiselectionController.swift
@@ -216,7 +216,7 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
     }
     
     override func loadDisplayNode() {
-        self.displayNode = ContactMultiselectionControllerNode(context: self.context, mode: self.mode, options: self.options, filters: self.filters)
+        self.displayNode = ContactMultiselectionControllerNode(navigationBar: self.navigationBar, context: self.context, mode: self.mode, options: self.options, filters: self.filters)
         switch self.contactsNode.contentNode {
         case let .contacts(contactsNode):
             self._listReady.set(contactsNode.ready)
@@ -525,11 +525,31 @@ class ContactMultiselectionControllerImpl: ViewController, ContactMultiselection
             break
         }
     }
+
+    private var suspendNavigationBarLayout: Bool = false
+    private var suspendedNavigationBarLayout: ContainerViewLayout?
+    private var additionalNavigationBarBackgroundHeight: CGFloat = 0.0
+
+    override public func updateNavigationBarLayout(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        if self.suspendNavigationBarLayout {
+            self.suspendedNavigationBarLayout = layout
+            return
+        }
+        self.applyNavigationBarLayout(layout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+    }
     
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
+        self.suspendNavigationBarLayout = true
+        
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.additionalNavigationBarBackgroundHeight = self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+
+        self.suspendNavigationBarLayout = false
+        if let suspendedNavigationBarLayout = self.suspendedNavigationBarLayout {
+            self.suspendedNavigationBarLayout = suspendedNavigationBarLayout
+            self.applyNavigationBarLayout(suspendedNavigationBarLayout, navigationLayout: self.navigationLayout(layout: layout), additionalBackgroundHeight: self.additionalNavigationBarBackgroundHeight, transition: transition)
+        }
     }
     
     @objc func cancelPressed() {
diff --git a/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift b/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
index 7c42ff4435..c96e0e47d2 100644
--- a/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ContactMultiselectionControllerNode.swift
@@ -43,6 +43,7 @@ enum ContactMultiselectionContentNode {
 }
 
 final class ContactMultiselectionControllerNode: ASDisplayNode {
+    private let navigationBar: NavigationBar?
     let contentNode: ContactMultiselectionContentNode
     let tokenListNode: EditableTokenListNode
     var searchResultsNode: ContactListNode?
@@ -67,7 +68,9 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
     private var presentationData: PresentationData
     private var presentationDataDisposable: Disposable?
     
-    init(context: AccountContext, mode: ContactMultiselectionControllerMode, options: [ContactListAdditionalOption], filters: [ContactListFilter]) {
+    init(navigationBar: NavigationBar?, context: AccountContext, mode: ContactMultiselectionControllerMode, options: [ContactListAdditionalOption], filters: [ContactListFilter]) {
+        self.navigationBar = navigationBar
+        
         self.context = context
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.presentationData = presentationData
@@ -109,7 +112,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
             self.contentNode = .contacts(ContactListNode(context: context, presentation: .single(.natural(options: options, includeChatList: includeChatList)), filters: filters, selectionState: ContactListNodeGroupSelectionState()))
         }
         
-        self.tokenListNode = EditableTokenListNode(theme: EditableTokenListNodeTheme(backgroundColor: self.presentationData.theme.rootController.navigationBar.backgroundColor, separatorColor: self.presentationData.theme.rootController.navigationBar.separatorColor, placeholderTextColor: self.presentationData.theme.list.itemPlaceholderTextColor, primaryTextColor: self.presentationData.theme.list.itemPrimaryTextColor, selectedTextColor: self.presentationData.theme.list.itemCheckColors.foregroundColor, selectedBackgroundColor: self.presentationData.theme.list.itemCheckColors.fillColor, accentColor: self.presentationData.theme.list.itemAccentColor, keyboardColor: self.presentationData.theme.rootController.keyboardColor), placeholder: placeholder)
+        self.tokenListNode = EditableTokenListNode(theme: EditableTokenListNodeTheme(backgroundColor: .clear, separatorColor: self.presentationData.theme.rootController.navigationBar.separatorColor, placeholderTextColor: self.presentationData.theme.list.itemPlaceholderTextColor, primaryTextColor: self.presentationData.theme.list.itemPrimaryTextColor, selectedTextColor: self.presentationData.theme.list.itemCheckColors.foregroundColor, selectedBackgroundColor: self.presentationData.theme.list.itemCheckColors.fillColor, accentColor: self.presentationData.theme.list.itemAccentColor, keyboardColor: self.presentationData.theme.rootController.keyboardColor), placeholder: placeholder)
         
         super.init()
         
@@ -120,7 +123,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         
         self.addSubnode(self.contentNode.node)
-        self.addSubnode(self.tokenListNode)
+        self.navigationBar?.additionalContentNode.addSubnode(self.tokenListNode)
         
         switch self.contentNode {
         case let .contacts(contactsNode):
@@ -255,7 +258,7 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
         }
     }
     
-    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
+    func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
         self.containerLayout = (layout, navigationBarHeight, actualNavigationBarHeight)
         
         var insets = layout.insets(options: [.input])
@@ -288,6 +291,8 @@ final class ContactMultiselectionControllerNode: ASDisplayNode {
             searchResultsNode.containerLayoutUpdated(ContainerViewLayout(size: layout.size, metrics: layout.metrics, deviceMetrics: layout.deviceMetrics, intrinsicInsets: insets, safeInsets: layout.safeInsets, additionalInsets: layout.additionalInsets, statusBarHeight: layout.statusBarHeight, inputHeight: layout.inputHeight, inputHeightIsInteractivellyChanging: layout.inputHeightIsInteractivellyChanging, inVoiceOver: layout.inVoiceOver), headerInsets: headerInsets, transition: transition)
             searchResultsNode.frame = CGRect(origin: CGPoint(), size: layout.size)
         }
+
+        return tokenListHeight
     }
     
     func animateIn() {
diff --git a/submodules/TelegramUI/Sources/ContactSelectionController.swift b/submodules/TelegramUI/Sources/ContactSelectionController.swift
index f677f76506..317f3cfeef 100644
--- a/submodules/TelegramUI/Sources/ContactSelectionController.swift
+++ b/submodules/TelegramUI/Sources/ContactSelectionController.swift
@@ -35,14 +35,15 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
     private let options: [ContactListAdditionalOption]
     private let displayDeviceContacts: Bool
     private let displayCallIcons: Bool
+    private let multipleSelection: Bool
     
     private var _ready = Promise<Bool>()
     override var ready: Promise<Bool> {
         return self._ready
     }
     
-    private let _result = Promise<(ContactListPeer, ContactListAction)?>()
-    var result: Signal<(ContactListPeer, ContactListAction)?, NoError> {
+    private let _result = Promise<([ContactListPeer], ContactListAction)?>()
+    var result: Signal<([ContactListPeer], ContactListAction)?, NoError> {
         return self._result.get()
     }
     
@@ -77,6 +78,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
         self.displayDeviceContacts = params.displayDeviceContacts
         self.displayCallIcons = params.displayCallIcons
         self.confirmation = params.confirmation
+        self.multipleSelection = params.multipleSelection
         
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
@@ -118,6 +120,10 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
             self?.activateSearch()
         })
         self.navigationBar?.setContentNode(self.searchContentNode, animated: false)
+        
+        if params.multipleSelection {
+            self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Select, style: .plain, target: self, action: #selector(self.beginSelection))
+        }
     }
     
     required init(coder aDecoder: NSCoder) {
@@ -129,6 +135,11 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
         self.presentationDataDisposable?.dispose()
     }
     
+    @objc private func beginSelection() {
+        self.navigationItem.rightBarButtonItem = nil
+        self.contactsNode.beginSelection()
+    }
+    
     private func updateThemeAndStrings() {
         self.statusBar.statusBarStyle = self.presentationData.theme.rootController.statusBarStyle.style
         self.navigationBar?.updatePresentationData(NavigationBarPresentationData(presentationData: self.presentationData))
@@ -145,7 +156,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
     }
     
     override func loadDisplayNode() {
-        self.displayNode = ContactSelectionControllerNode(context: self.context, options: self.options, displayDeviceContacts: self.displayDeviceContacts, displayCallIcons: self.displayCallIcons)
+        self.displayNode = ContactSelectionControllerNode(context: self.context, options: self.options, displayDeviceContacts: self.displayDeviceContacts, displayCallIcons: self.displayCallIcons, multipleSelection: self.multipleSelection)
         self._ready.set(self.contactsNode.contactListNode.ready)
         
         self.contactsNode.navigationBar = self.navigationBar
@@ -165,7 +176,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
         self.contactsNode.contactListNode.openPeer = { [weak self] peer, action in
             self?.openPeer(peer: peer, action: action)
         }
-        
+                
         self.contactsNode.contactListNode.suppressPermissionWarning = { [weak self] in
             if let strongSelf = self {
                 strongSelf.context.sharedContext.presentContactsWarningSuppression(context: strongSelf.context, present: { c, a in
@@ -191,6 +202,16 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
                 return false
             }
         }
+
+        self.contactsNode.requestMultipleAction = { [weak self] in
+            if let strongSelf = self {
+                let selectedPeers = strongSelf.contactsNode.contactListNode.selectedPeers
+                strongSelf._result.set(.single((selectedPeers, .generic)))
+                if strongSelf.autoDismiss {
+                    strongSelf.dismiss()
+                }
+            }
+        }
         
         self.displayNodeDidLoad()
     }
@@ -236,7 +257,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
     override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight,  transition: transition)
+        self.contactsNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY,  transition: transition)
     }
     
     private func activateSearch() {
@@ -263,7 +284,7 @@ class ContactSelectionControllerImpl: ViewController, ContactSelectionController
         self.confirmationDisposable.set((self.confirmation(peer) |> deliverOnMainQueue).start(next: { [weak self] value in
             if let strongSelf = self {
                 if value {
-                    strongSelf._result.set(.single((peer, action)))
+                    strongSelf._result.set(.single(([peer], action)))
                     if strongSelf.autoDismiss {
                         strongSelf.dismiss()
                     }
diff --git a/submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift b/submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift
index 629a327409..acf802b1bf 100644
--- a/submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift
+++ b/submodules/TelegramUI/Sources/ContactSelectionControllerNode.swift
@@ -10,6 +10,7 @@ import AccountContext
 import SearchBarNode
 import ContactListUI
 import SearchUI
+import SolidRoundedButtonNode
 
 final class ContactSelectionControllerNode: ASDisplayNode {
     var displayProgress: Bool = false {
@@ -30,27 +31,37 @@ final class ContactSelectionControllerNode: ASDisplayNode {
     private let context: AccountContext
     private var searchDisplayController: SearchDisplayController?
     
-    private var containerLayout: (ContainerViewLayout, CGFloat)?
+    private var containerLayout: (ContainerViewLayout, CGFloat, CGFloat)?
     
     var navigationBar: NavigationBar?
     
     var requestDeactivateSearch: (() -> Void)?
     var requestOpenPeerFromSearch: ((ContactListPeer) -> Void)?
+    var requestMultipleAction: (() -> Void)?
     var dismiss: (() -> Void)?
     
     var presentationData: PresentationData
     var presentationDataDisposable: Disposable?
     
-    init(context: AccountContext, options: [ContactListAdditionalOption], displayDeviceContacts: Bool, displayCallIcons: Bool) {
+    private let countPanelNode: ContactSelectionCountPanelNode
+    
+    private var selectionState: ContactListNodeGroupSelectionState?
+    
+    init(context: AccountContext, options: [ContactListAdditionalOption], displayDeviceContacts: Bool, displayCallIcons: Bool, multipleSelection: Bool) {
         self.context = context
         self.presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.displayDeviceContacts = displayDeviceContacts
         self.displayCallIcons = displayCallIcons
         
-        self.contactListNode = ContactListNode(context: context, presentation: .single(.natural(options: options, includeChatList: false)), displayCallIcons: displayCallIcons)
+        self.contactListNode = ContactListNode(context: context, presentation: .single(.natural(options: options, includeChatList: false)), displayCallIcons: displayCallIcons, multipleSelection: multipleSelection)
         
         self.dimNode = ASDisplayNode()
         
+        var shareImpl: (() -> Void)?
+        self.countPanelNode = ContactSelectionCountPanelNode(theme: self.presentationData.theme, strings: self.presentationData.strings, action: {
+            shareImpl?()
+        })
+        
         super.init()
         
         self.setViewBlock({
@@ -76,12 +87,37 @@ final class ContactSelectionControllerNode: ASDisplayNode {
         self.dimNode.alpha = 0.0
         self.dimNode.isUserInteractionEnabled = false
         self.addSubnode(self.dimNode)
+        
+        self.addSubnode(self.countPanelNode)
+        
+        self.contactListNode.selectionStateUpdated = { [weak self] selectionState in
+            if let strongSelf = self {
+                strongSelf.countPanelNode.count = selectionState?.selectedPeerIndices.count ?? 0
+                let previousState = strongSelf.selectionState
+                strongSelf.selectionState = selectionState
+                if previousState?.selectedPeerIndices.isEmpty != strongSelf.selectionState?.selectedPeerIndices.isEmpty {
+                    if let (layout, navigationHeight, actualNavigationHeight) = strongSelf.containerLayout {
+                        strongSelf.containerLayoutUpdated(layout, navigationBarHeight: navigationHeight, actualNavigationBarHeight: actualNavigationHeight, transition: .animated(duration: 0.3, curve: .spring))
+                    }
+                }
+            }
+        }
+        
+        shareImpl = { [weak self] in
+            self?.requestMultipleAction?()
+        }
     }
     
     deinit {
         self.presentationDataDisposable?.dispose()
     }
     
+    func beginSelection() {
+        self.contactListNode.updateSelectionState({ _ in
+            return ContactListNodeGroupSelectionState()
+        })
+    }
+    
     private func updateTheme() {
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         self.searchDisplayController?.updatePresentationData(presentationData)
@@ -89,7 +125,7 @@ final class ContactSelectionControllerNode: ASDisplayNode {
     }
     
     func containerLayoutUpdated(_ layout: ContainerViewLayout, navigationBarHeight: CGFloat, actualNavigationBarHeight: CGFloat, transition: ContainedViewLayoutTransition) {
-        self.containerLayout = (layout, navigationBarHeight)
+        self.containerLayout = (layout, navigationBarHeight, actualNavigationBarHeight)
         
         transition.updateFrame(node: self.dimNode, frame: CGRect(origin: CGPoint(), size: layout.size))
         
@@ -107,13 +143,21 @@ final class ContactSelectionControllerNode: ASDisplayNode {
         
         self.contactListNode.frame = CGRect(origin: CGPoint(), size: layout.size)
         
+        let countPanelHeight = self.countPanelNode.updateLayout(width: layout.size.width, sideInset: layout.safeInsets.left, bottomInset: layout.intrinsicInsets.bottom, transition: transition)
+        if (self.selectionState?.selectedPeerIndices.isEmpty ?? true) {
+            transition.updateFrame(node: self.countPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height), size: CGSize(width: layout.size.width, height: countPanelHeight)))
+        } else {
+            insets.bottom += countPanelHeight
+            transition.updateFrame(node: self.countPanelNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - countPanelHeight), size: CGSize(width: layout.size.width, height: countPanelHeight)))
+        }
+        
         if let searchDisplayController = self.searchDisplayController {
             searchDisplayController.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, transition: transition)
         }
     }
     
     func activateSearch(placeholderNode: SearchBarPlaceholderNode) {
-        guard let (containerLayout, navigationBarHeight) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else {
+        guard let (containerLayout, navigationBarHeight, _) = self.containerLayout, let navigationBar = self.navigationBar, self.searchDisplayController == nil else {
             return
         }
         
@@ -124,7 +168,35 @@ final class ContactSelectionControllerNode: ASDisplayNode {
             categories.insert(.global)
         }
         self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: false, categories: categories, addContact: nil, openPeer: { [weak self] peer in
-            self?.requestOpenPeerFromSearch?(peer)
+            if let strongSelf = self {
+                var updated = false
+                strongSelf.contactListNode.updateSelectionState { state -> ContactListNodeGroupSelectionState? in
+                    if let state = state {
+                        updated = true
+                        var foundPeers = state.foundPeers
+                        var selectedPeerMap = state.selectedPeerMap
+                        selectedPeerMap[peer.id] = peer
+                        var exists = false
+                        for foundPeer in foundPeers {
+                            if peer.id == foundPeer.id {
+                                exists = true
+                                break
+                            }
+                        }
+                        if !exists {
+                            foundPeers.insert(peer, at: 0)
+                        }
+                        return state.withToggledPeerId(peer.id).withFoundPeers(foundPeers).withSelectedPeerMap(selectedPeerMap)
+                    } else {
+                        return nil
+                    }
+                }
+                if updated {
+                    strongSelf.requestDeactivateSearch?()
+                } else {
+                    strongSelf.requestOpenPeerFromSearch?(peer)
+                }
+            }
         }, contextAction: nil), cancel: { [weak self] in
             if let requestDeactivateSearch = self?.requestDeactivateSearch {
                 requestDeactivateSearch()
@@ -169,3 +241,123 @@ final class ContactSelectionControllerNode: ASDisplayNode {
         })
     }
 }
+
+final class ContactSelectionCountPanelNode: ASDisplayNode {
+    private let theme: PresentationTheme
+    private let strings: PresentationStrings
+    
+    private let separatorNode: ASDisplayNode
+    
+    private let button: HighlightTrackingButtonNode
+    private let badgeLabel: TextNode
+    private var badgeText: NSAttributedString?
+    private let badgeBackground: ASImageNode
+    
+    private let action: (() -> Void)
+    
+    private var validLayout: (CGFloat, CGFloat, CGFloat)?
+    
+    var count: Int = 0 {
+        didSet {
+            if self.count != oldValue && self.count > 0 {
+                self.badgeText = NSAttributedString(string: "\(count)", font: Font.regular(14.0), textColor: self.theme.actionSheet.opaqueItemBackgroundColor, paragraphAlignment: .center)
+                self.badgeLabel.isHidden = false
+                self.badgeBackground.isHidden = false
+                
+                if let (width, sideInset, bottomInset) = self.validLayout {
+                    let _ = self.updateLayout(width: width, sideInset: sideInset, bottomInset: bottomInset, transition: .immediate)
+                }
+            }
+        }
+    }
+        
+    init(theme: PresentationTheme, strings: PresentationStrings, action: @escaping () -> Void) {
+        self.theme = theme
+        self.strings = strings
+        self.action = action
+
+        self.separatorNode = ASDisplayNode()
+        self.separatorNode.backgroundColor = theme.rootController.navigationBar.separatorColor
+        
+        self.badgeLabel = TextNode()
+        self.badgeLabel.isHidden = true
+        self.badgeLabel.isUserInteractionEnabled = false
+        self.badgeLabel.displaysAsynchronously = false
+        
+        self.badgeBackground = ASImageNode()
+        self.badgeBackground.isHidden = true
+        self.badgeBackground.isLayerBacked = true
+        self.badgeBackground.displaysAsynchronously = false
+        self.badgeBackground.displayWithoutProcessing = true
+        
+        self.badgeBackground.image = generateStretchableFilledCircleImage(diameter: 22.0, color: theme.actionSheet.controlAccentColor)
+        
+        self.button = HighlightTrackingButtonNode()
+        self.button.setTitle(strings.ShareMenu_Send, with: Font.medium(17.0), with: theme.actionSheet.controlAccentColor, for: .normal)
+        
+        super.init()
+        
+        self.backgroundColor = theme.rootController.navigationBar.opaqueBackgroundColor
+        
+        self.addSubnode(self.badgeBackground)
+        self.addSubnode(self.badgeLabel)
+        self.addSubnode(self.button)
+        
+        self.addSubnode(self.separatorNode)
+        
+        self.button.highligthedChanged = { [weak self] highlighted in
+            if let strongSelf = self {
+                if highlighted {
+                    strongSelf.badgeBackground.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.badgeBackground.alpha = 0.4
+                    
+                    strongSelf.badgeLabel.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.badgeLabel.alpha = 0.4
+                    
+                    strongSelf.button.titleNode.layer.removeAnimation(forKey: "opacity")
+                    strongSelf.button.titleNode.alpha = 0.4
+                } else {
+                    strongSelf.badgeBackground.alpha = 1.0
+                    strongSelf.badgeBackground.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    
+                    strongSelf.badgeLabel.alpha = 1.0
+                    strongSelf.badgeLabel.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                    
+                    strongSelf.button.titleNode.alpha = 1.0
+                    strongSelf.button.titleNode.layer.animateAlpha(from: 0.4, to: 1.0, duration: 0.2)
+                }
+            }
+        }
+        self.button.addTarget(self, action: #selector(self.pressed), forControlEvents: .touchUpInside)
+    }
+    
+    @objc private func pressed() {
+        self.action()
+    }
+    
+    func updateLayout(width: CGFloat, sideInset: CGFloat, bottomInset: CGFloat, transition: ContainedViewLayoutTransition) -> CGFloat {
+        self.validLayout = (width, sideInset, bottomInset)
+        let topInset: CGFloat = 9.0
+        var bottomInset = bottomInset
+        bottomInset += topInset - (bottomInset.isZero ? 0.0 : 4.0)
+            
+        let height = 44.0 + bottomInset
+        
+        self.button.frame = CGRect(x: sideInset, y: 0.0, width: width - sideInset * 2.0, height: 44.0)
+        
+        if !self.badgeLabel.isHidden {
+            let (badgeLayout, badgeApply) = TextNode.asyncLayout(self.badgeLabel)(TextNodeLayoutArguments(attributedString: self.badgeText, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: 100.0, height: 100.0), alignment: .left, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets()))
+            let _ = badgeApply()
+            
+            let backgroundSize = CGSize(width: max(22.0, badgeLayout.size.width + 10.0 + 1.0), height: 22.0)
+            let backgroundFrame = CGRect(origin: CGPoint(x: self.button.titleNode.frame.maxX + 6.0, y: self.button.bounds.size.height - 33.0), size: backgroundSize)
+            
+            self.badgeBackground.frame = backgroundFrame
+            self.badgeLabel.frame = CGRect(origin: CGPoint(x: floorToScreenPixels(backgroundFrame.midX - badgeLayout.size.width / 2.0), y: backgroundFrame.minY + 3.0), size: badgeLayout.size)
+        }
+        
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
+        
+        return height
+    }
+}
diff --git a/submodules/TelegramUI/Sources/CreateChannelController.swift b/submodules/TelegramUI/Sources/CreateChannelController.swift
index 2e57f10698..d93801c7bf 100644
--- a/submodules/TelegramUI/Sources/CreateChannelController.swift
+++ b/submodules/TelegramUI/Sources/CreateChannelController.swift
@@ -197,7 +197,7 @@ private func CreateChannelEntries(presentationData: PresentationData, state: Cre
     
     let groupInfoState = ItemListAvatarAndNameInfoItemState(editingName: state.editingName, updatingName: nil)
     
-    let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
+    let peer = TelegramGroup(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
     
     entries.append(.channelInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar))
     
@@ -258,7 +258,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
             }
             
             endEditingImpl?()
-            actionsDisposable.add((createChannel(account: context.account, title: title, description: description.isEmpty ? nil : description)
+            actionsDisposable.add((context.engine.peers.createChannel(title: title, description: description.isEmpty ? nil : description)
             |> deliverOnMainQueue
             |> afterDisposed {
                 Queue.mainQueue().async {
@@ -273,7 +273,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
                     return $0.avatar
                 }
                 if let _ = updatingAvatar {
-                    let _ = updatePeerPhoto(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, accountPeerId: context.account.peerId, peerId: peerId, photo: uploadedAvatar.get(), video: uploadedVideoAvatar?.0.get(), videoStartTimestamp: uploadedVideoAvatar?.1, mapResourceToAvatarSizes: { resource, representations in
+                    let _ = context.engine.peers.updatePeerPhoto(peerId: peerId, photo: uploadedAvatar.get(), video: uploadedVideoAvatar?.0.get(), videoStartTimestamp: uploadedVideoAvatar?.1, mapResourceToAvatarSizes: { resource, representations in
                         return mapResourceToAvatarSizes(postbox: context.account.postbox, resource: resource, representations: representations)
                     }).start()
                 }
@@ -326,10 +326,10 @@ public func createChannelController(context: AccountContext) -> ViewController {
             
             let completedChannelPhotoImpl: (UIImage) -> Void = { image in
                 if let data = image.jpegData(compressionQuality: 0.6) {
-                    let resource = LocalFileMediaResource(fileId: arc4random64())
+                    let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
-                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [])
-                    uploadedAvatar.set(uploadedPeerPhoto(postbox: context.account.postbox, network: context.account.network, resource: resource))
+                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)
+                    uploadedAvatar.set(context.engine.peers.uploadedPeerPhoto(resource: resource))
                     uploadedVideoAvatar = nil
                     updateState { current in
                         var current = current
@@ -341,9 +341,9 @@ public func createChannelController(context: AccountContext) -> ViewController {
             
             let completedChannelVideoImpl: (UIImage, Any?, TGVideoEditAdjustments?) -> Void = { image, asset, adjustments in
                 if let data = image.jpegData(compressionQuality: 0.6) {
-                    let photoResource = LocalFileMediaResource(fileId: arc4random64())
+                    let photoResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     context.account.postbox.mediaBox.storeResourceData(photoResource.id, data: data)
-                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [])
+                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [], immediateThumbnailData: nil)
                     updateState { state in
                         var state = state
                         state.avatar = .image(representation, true)
@@ -363,7 +363,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
                                 return nil
                             }
                         }
-                        let uploadInterface = LegacyLiveUploadInterface(account: context.account)
+                        let uploadInterface = LegacyLiveUploadInterface(context: context)
                         let signal: SSignal
                         if let asset = asset as? AVAsset {
                             signal = TGMediaVideoConverter.convert(asset, adjustments: adjustments, watcher: uploadInterface, entityRenderer: entityRenderer)!
@@ -407,7 +407,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
                                         if let liveUploadData = result.liveUploadData as? LegacyLiveUploadInterfaceResult {
                                             resource = LocalFileMediaResource(fileId: liveUploadData.id)
                                         } else {
-                                            resource = LocalFileMediaResource(fileId: arc4random64())
+                                            resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                         }
                                         context.account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                                         subscriber.putNext(resource)
@@ -427,7 +427,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
                         }
                     }
                     
-                    uploadedAvatar.set(uploadedPeerPhoto(postbox: context.account.postbox, network: context.account.network, resource: photoResource))
+                    uploadedAvatar.set(context.engine.peers.uploadedPeerPhoto(resource: photoResource))
                     
                     let promise = Promise<UploadedPeerPhotoData?>()
                     promise.set(signal
@@ -436,7 +436,7 @@ public func createChannelController(context: AccountContext) -> ViewController {
                     }
                     |> mapToSignal { resource -> Signal<UploadedPeerPhotoData?, NoError> in
                         if let resource = resource {
-                            return uploadedPeerVideo(postbox: context.account.postbox, network: context.account.network, messageMediaPreuploadManager: context.account.messageMediaPreuploadManager, resource: resource) |> map(Optional.init)
+                            return context.engine.peers.uploadedPeerVideo(resource: resource) |> map(Optional.init)
                         } else {
                             return .single(nil)
                         }
diff --git a/submodules/TelegramUI/Sources/CreateGroupController.swift b/submodules/TelegramUI/Sources/CreateGroupController.swift
index 3fe9f78ff9..daf2740e82 100644
--- a/submodules/TelegramUI/Sources/CreateGroupController.swift
+++ b/submodules/TelegramUI/Sources/CreateGroupController.swift
@@ -298,7 +298,7 @@ private func createGroupEntries(presentationData: PresentationData, state: Creat
     
     let groupInfoState = ItemListAvatarAndNameInfoItemState(editingName: state.editingName, updatingName: nil)
     
-    let peer = TelegramGroup(id: PeerId(namespace: -1, id: 0), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
+    let peer = TelegramGroup(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), title: state.editingName.composedTitle, photo: [], participantCount: 0, role: .creator(rank: nil), membership: .Member, flags: [], defaultBannedRights: nil, migrationReference: nil, creationDate: 0, version: 0)
     
     entries.append(.groupInfo(presentationData.theme, presentationData.strings, presentationData.dateTimeFormat, peer, groupInfoState, state.avatar))
     
@@ -398,7 +398,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
             })
         }
         
-        venuesPromise.set(nearbyVenues(account: context.account, latitude: latitude, longitude: longitude)
+        venuesPromise.set(nearbyVenues(context: context, latitude: latitude, longitude: longitude)
         |> map(Optional.init))
     }
     
@@ -425,9 +425,9 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
             let createSignal: Signal<PeerId?, CreateGroupError>
             switch mode {
                 case .generic:
-                    createSignal = createGroup(account: context.account, title: title, peerIds: peerIds)
+                    createSignal = context.engine.peers.createGroup(title: title, peerIds: peerIds)
                 case .supergroup:
-                    createSignal = createSupergroup(account: context.account, title: title, description: nil)
+                    createSignal = context.engine.peers.createSupergroup(title: title, description: nil)
                     |> map(Optional.init)
                     |> mapError { error -> CreateGroupError in
                         switch error {
@@ -454,7 +454,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                         guard let address = address else {
                             return .complete()
                         }
-                        return createSupergroup(account: context.account, title: title, description: nil, location: (location.latitude, location.longitude, address))
+                        return context.engine.peers.createSupergroup(title: title, description: nil, location: (location.latitude, location.longitude, address))
                         |> map(Optional.init)
                         |> mapError { error -> CreateGroupError in
                             switch error {
@@ -482,7 +482,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                     return $0.avatar
                 }
                 if let _ = updatingAvatar {
-                    return updatePeerPhoto(postbox: context.account.postbox, network: context.account.network, stateManager: context.account.stateManager, accountPeerId: context.account.peerId, peerId: peerId, photo: uploadedAvatar.get(), video: uploadedVideoAvatar?.0.get(), videoStartTimestamp: uploadedVideoAvatar?.1, mapResourceToAvatarSizes: { resource, representations in
+                    return context.engine.peers.updatePeerPhoto(peerId: peerId, photo: uploadedAvatar.get(), video: uploadedVideoAvatar?.0.get(), videoStartTimestamp: uploadedVideoAvatar?.1, mapResourceToAvatarSizes: { resource, representations in
                         return mapResourceToAvatarSizes(postbox: context.account.postbox, resource: resource, representations: representations)
                     })
                     |> ignoreValues
@@ -573,10 +573,10 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
             
             let completedGroupPhotoImpl: (UIImage) -> Void = { image in
                 if let data = image.jpegData(compressionQuality: 0.6) {
-                    let resource = LocalFileMediaResource(fileId: arc4random64())
+                    let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
-                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [])
-                    uploadedAvatar.set(uploadedPeerPhoto(postbox: context.account.postbox, network: context.account.network, resource: resource))
+                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)
+                    uploadedAvatar.set(context.engine.peers.uploadedPeerPhoto(resource: resource))
                     uploadedVideoAvatar = nil
                     updateState { current in
                         var current = current
@@ -588,9 +588,9 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
             
             let completedGroupVideoImpl: (UIImage, Any?, TGVideoEditAdjustments?) -> Void = { image, asset, adjustments in
                 if let data = image.jpegData(compressionQuality: 0.6) {
-                    let photoResource = LocalFileMediaResource(fileId: arc4random64())
+                    let photoResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     context.account.postbox.mediaBox.storeResourceData(photoResource.id, data: data)
-                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [])
+                    let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [], immediateThumbnailData: nil)
                     updateState { state in
                         var state = state
                         state.avatar = .image(representation, true)
@@ -611,7 +611,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                                 return nil
                             }
                         }
-                        let uploadInterface = LegacyLiveUploadInterface(account: context.account)
+                        let uploadInterface = LegacyLiveUploadInterface(context: context)
                         let signal: SSignal
                         if let asset = asset as? AVAsset {
                             signal = TGMediaVideoConverter.convert(asset, adjustments: adjustments, watcher: uploadInterface, entityRenderer: entityRenderer)!
@@ -655,7 +655,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                                         if let liveUploadData = result.liveUploadData as? LegacyLiveUploadInterfaceResult {
                                             resource = LocalFileMediaResource(fileId: liveUploadData.id)
                                         } else {
-                                            resource = LocalFileMediaResource(fileId: arc4random64())
+                                            resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                         }
                                         context.account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                                         subscriber.putNext(resource)
@@ -675,7 +675,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                         }
                     }
                     
-                    uploadedAvatar.set(uploadedPeerPhoto(postbox: context.account.postbox, network: context.account.network, resource: photoResource))
+                    uploadedAvatar.set(context.engine.peers.uploadedPeerPhoto(resource: photoResource))
                     
                     let promise = Promise<UploadedPeerPhotoData?>()
                     promise.set(signal
@@ -684,7 +684,7 @@ public func createGroupControllerImpl(context: AccountContext, peerIds: [PeerId]
                     }
                     |> mapToSignal { resource -> Signal<UploadedPeerPhotoData?, NoError> in
                         if let resource = resource {
-                            return uploadedPeerVideo(postbox: context.account.postbox, network: context.account.network, messageMediaPreuploadManager: context.account.messageMediaPreuploadManager, resource: resource) |> map(Optional.init)
+                            return context.engine.peers.uploadedPeerVideo(resource: resource) |> map(Optional.init)
                         } else {
                             return .single(nil)
                         }
diff --git a/submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift
index cb96e43f19..a97efe5ac4 100644
--- a/submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/DisabledContextResultsChatInputContextPanelNode.swift
@@ -72,7 +72,10 @@ final class DisabledContextResultsChatInputContextPanelNode: ChatInputContextPan
     
     func animateIn() {
         let position = self.containerNode.layer.position
-        self.containerNode.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (self.containerNode.bounds.height)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+        self.containerNode.position = CGPoint(x: position.x, y: position.y + (self.containerNode.bounds.height))
+        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+            self.containerNode.position = position
+        }
     }
     
     override func animateOut(completion: @escaping () -> Void) {
diff --git a/submodules/TelegramUI/Sources/DocumentPreviewController.swift b/submodules/TelegramUI/Sources/DocumentPreviewController.swift
index c389573d96..971ca25c4e 100644
--- a/submodules/TelegramUI/Sources/DocumentPreviewController.swift
+++ b/submodules/TelegramUI/Sources/DocumentPreviewController.swift
@@ -40,7 +40,7 @@ final class DocumentPreviewController: UINavigationController, QLPreviewControll
         
         super.init(nibName: nil, bundle: nil)
         
-        self.navigationBar.barTintColor = theme.rootController.navigationBar.backgroundColor
+        self.navigationBar.barTintColor = theme.rootController.navigationBar.opaqueBackgroundColor
         self.navigationBar.tintColor = theme.rootController.navigationBar.accentTextColor
         self.navigationBar.shadowImage = generateImage(CGSize(width: 1.0, height: 1.0), rotatedContext: { size, context in
             context.clear(CGRect(origin: CGPoint(), size: size))
@@ -51,8 +51,7 @@ final class DocumentPreviewController: UINavigationController, QLPreviewControll
         self.navigationBar.titleTextAttributes = [NSAttributedString.Key.font: Font.semibold(17.0), NSAttributedString.Key.foregroundColor: theme.rootController.navigationBar.primaryTextColor]
         
         let controller = QLPreviewController(nibName: nil, bundle: nil)
-        controller.navigation_setDismiss({ [weak self] in
-            //self?.cancelPressed()
+        controller.navigation_setDismiss({
         }, rootController: self)
         controller.delegate = self
         controller.dataSource = self
@@ -201,9 +200,9 @@ final class CompactDocumentPreviewController: QLPreviewController, QLPreviewCont
 func presentDocumentPreviewController(rootController: UIViewController, theme: PresentationTheme, strings: PresentationStrings, postbox: Postbox, file: TelegramMediaFile) {
     if #available(iOSApplicationExtension 9.0, iOS 9.0, *) {
         let navigationBar = UINavigationBar.appearance(whenContainedInInstancesOf: [QLPreviewController.self])
-        navigationBar.barTintColor = theme.rootController.navigationBar.backgroundColor
+        navigationBar.barTintColor = theme.rootController.navigationBar.opaqueBackgroundColor
         navigationBar.setBackgroundImage(generateImage(CGSize(width: 1.0, height: 1.0), rotatedContext: { size, context in
-            context.setFillColor(theme.rootController.navigationBar.backgroundColor.cgColor)
+            context.setFillColor(theme.rootController.navigationBar.opaqueBackgroundColor.cgColor)
             context.fill(CGRect(origin: CGPoint(), size: size))
         }), for: .default)
         navigationBar.isTranslucent = true
diff --git a/submodules/TelegramUI/Sources/DrawingStickersScreen.swift b/submodules/TelegramUI/Sources/DrawingStickersScreen.swift
index 3e53710d0a..9aebe8dbb9 100644
--- a/submodules/TelegramUI/Sources/DrawingStickersScreen.swift
+++ b/submodules/TelegramUI/Sources/DrawingStickersScreen.swift
@@ -109,8 +109,9 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
         var selectStickerImpl: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?
         
         self.controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in
-            return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in
-            }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { fileReference, _, _, node, rect in return selectStickerImpl?(fileReference, node, rect) ?? false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
+            return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in
+            }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in
+            }, tapMessage: nil, clickThroughMessage: { }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { fileReference, _, _, _, _, node, rect in return selectStickerImpl?(fileReference, node, rect) ?? false }, sendGif: { _, _, _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _, _ in return false }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
         }, presentController: { _, _ in }, navigationController: {
             return nil
         }, chatControllerNode: {
@@ -144,8 +145,6 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
         }, displayPsa: { _, _ in
         }, displayDiceTooltip: { _ in
         }, animateDiceSuccess: { _ in
-        }, greetingStickerNode: {
-            return nil
         }, openPeerContextMenu: { _, _, _, _, _ in
         }, openMessageReplies: { _, _, _ in
         }, openReplyThreadOriginalMessage: { _ in
@@ -153,10 +152,12 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
         }, editMessageMedia: { _, _ in
         }, copyText: { _ in
         }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
         }, requestMessageUpdate: { _ in
         }, cancelInteractiveKeyboardGestures: {
         }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings,
-           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: true))
+        pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: true), presentationContext: ChatPresentationContext(backgroundNode: nil))
         
         self.blurView = UIVisualEffectView(effect: UIBlurEffect(style: .dark))
         
@@ -227,7 +228,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
                         sendSticker: {
                             fileReference, sourceNode, sourceRect in
                             if let strongSelf = self {
-                                return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                                return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                             } else {
                                 return false
                             }
@@ -344,7 +345,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
                         sendSticker: {
                             fileReference, sourceNode, sourceRect in
                             if let strongSelf = self {
-                                return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                                return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                             } else {
                                 return false
                             }
@@ -607,24 +608,8 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
             let panelEntries = chatMediaInputPanelEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasUnreadTrending: nil, theme: theme, hasGifs: false, hasSettings: false)
             let gridEntries = chatMediaInputGridEntries(view: view, savedStickers: savedStickers, recentStickers: recentStickers, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasSearch: false, hasAccessories: false, strings: strings, theme: theme)
             
-//                if view.higher == nil {
-//                    var hasTopSeparator = true
-//                    if gridEntries.count == 1, case .search = gridEntries[0] {
-//                        hasTopSeparator = false
-//                    }
-//
-//                    var index = 0
-//                    for item in trendingPacks {
-//                        if !installedPacks.contains(item.info.id) {
-//                            gridEntries.append(.trending(TrendingPanePackEntry(index: index, info: item.info, theme: theme, strings: strings, topItems: item.topItems, installed: installedPacks.contains(item.info.id), unread: item.unread, topSeparator: hasTopSeparator)))
-//                            hasTopSeparator = true
-//                            index += 1
-//                        }
-//                    }
-//                }
-            
             let (previousPanelEntries, previousGridEntries) = previousStickerEntries.swap((panelEntries, gridEntries))
-            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: stickersInputNodeInteraction), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: stickersInputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
+            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: stickersInputNodeInteraction, scrollToItem: nil), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: stickersInputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
         }
         
         self.disposable.set((stickerTransitions
@@ -659,7 +644,7 @@ private final class DrawingStickersScreenNode: ViewControllerTracingNode {
             let gridEntries = chatMediaInputGridEntries(view: view, savedStickers: nil, recentStickers: nil, peerSpecificPack: nil, canInstallPeerSpecificPack: .none, hasSearch: false, hasAccessories: false, strings: strings, theme: theme)
                         
             let (previousPanelEntries, previousGridEntries) = previousMaskEntries.swap((panelEntries, gridEntries))
-            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: masksInputNodeInteraction), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: masksInputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
+            return (view, preparedChatMediaInputPanelEntryTransition(context: context, from: previousPanelEntries, to: panelEntries, inputNodeInteraction: masksInputNodeInteraction, scrollToItem: nil), previousPanelEntries.isEmpty, preparedChatMediaInputGridEntryTransition(account: context.account, view: view, from: previousGridEntries, to: gridEntries, update: update, interfaceInteraction: controllerInteraction, inputNodeInteraction: masksInputNodeInteraction, trendingInteraction: trendingInteraction), previousGridEntries.isEmpty)
         }
         
         self.maskDisposable.set((maskTransitions
diff --git a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
index e13b940f39..50eab52af5 100644
--- a/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/EditAccessoryPanelNode.swift
@@ -15,6 +15,7 @@ import PhotoResources
 import TelegramStringFormatting
 
 final class EditAccessoryPanelNode: AccessoryPanelNode {
+    let dateTimeFormat: PresentationDateTimeFormat
     let messageId: MessageId
     
     let closeButton: ASButtonNode
@@ -67,12 +68,13 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
     var strings: PresentationStrings
     var nameDisplayOrder: PresentationPersonNameOrder
     
-    init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) {
+    init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat) {
         self.context = context
         self.messageId = messageId
         self.theme = theme
         self.strings = strings
         self.nameDisplayOrder = nameDisplayOrder
+        self.dateTimeFormat = dateTimeFormat
         
         self.closeButton = ASButtonNode()
         self.closeButton.accessibilityLabel = strings.VoiceOver_DiscardPreparedContent
@@ -159,7 +161,7 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
             if let currentEditMediaReference = self.currentEditMediaReference {
                 effectiveMessage = effectiveMessage.withUpdatedMedia([currentEditMediaReference.media])
             }
-            (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, accountPeerId: self.context.account.peerId)
+            (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: self.strings, nameDisplayOrder: self.nameDisplayOrder, dateTimeFormat: self.dateTimeFormat, accountPeerId: self.context.account.peerId)
         }
         
         var updatedMediaReference: AnyMediaReference?
@@ -231,7 +233,8 @@ final class EditAccessoryPanelNode: AccessoryPanelNode {
             if let currentEditMediaReference = self.currentEditMediaReference {
                 effectiveMessage = effectiveMessage.withUpdatedMedia([currentEditMediaReference.media])
             }
-            switch messageContentKind(contentSettings: self.context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: self.context.account.peerId) {
+            let presentationData = self.context.sharedContext.currentPresentationData.with { $0 }
+            switch messageContentKind(contentSettings: self.context.currentContentSettings.with { $0 }, message: effectiveMessage, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: presentationData.dateTimeFormat, accountPeerId: self.context.account.peerId) {
                 case .text:
                     isMedia = false
                 default:
diff --git a/submodules/TelegramUI/Sources/EditableTokenListNode.swift b/submodules/TelegramUI/Sources/EditableTokenListNode.swift
index 15ae33ed4b..440a6a7e3f 100644
--- a/submodules/TelegramUI/Sources/EditableTokenListNode.swift
+++ b/submodules/TelegramUI/Sources/EditableTokenListNode.swift
@@ -112,6 +112,7 @@ private final class CaretIndicatorNode: ASImageNode {
 
 final class EditableTokenListNode: ASDisplayNode, UITextFieldDelegate {
     private let theme: EditableTokenListNodeTheme
+    private let backgroundNode: NavigationBackgroundNode
     private let scrollNode: ASScrollNode
     private let placeholderNode: ASTextNode
     private var tokenNodes: [TokenNode] = []
@@ -127,6 +128,8 @@ final class EditableTokenListNode: ASDisplayNode, UITextFieldDelegate {
     
     init(theme: EditableTokenListNodeTheme, placeholder: String) {
         self.theme = theme
+
+        self.backgroundNode = NavigationBackgroundNode(color: theme.backgroundColor)
         
         self.scrollNode = ASScrollNode()
         self.scrollNode.view.alwaysBounceVertical = true
@@ -157,9 +160,9 @@ final class EditableTokenListNode: ASDisplayNode, UITextFieldDelegate {
         self.separatorNode.backgroundColor = theme.separatorColor
         
         super.init()
+        self.addSubnode(self.backgroundNode)
         self.addSubnode(self.scrollNode)
-        
-        self.backgroundColor = theme.backgroundColor
+
         self.addSubnode(self.separatorNode)
         self.scrollNode.addSubnode(self.placeholderNode)
         self.scrollNode.addSubnode(self.textFieldScrollNode)
@@ -306,8 +309,7 @@ final class EditableTokenListNode: ASDisplayNode, UITextFieldDelegate {
         let contentHeight = currentOffset.y + 29.0 + verticalInset
         let nodeHeight = min(contentHeight, 110.0)
         
-        let separatorHeight = UIScreenPixel
-        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: nodeHeight - separatorHeight), size: CGSize(width: width, height: separatorHeight)))
+        transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: width, height: UIScreenPixel)))
         transition.updateFrame(node: self.scrollNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: nodeHeight)))
         
         if !abs(previousContentHeight - contentHeight).isLess(than: CGFloat.ulpOfOne) {
@@ -322,6 +324,9 @@ final class EditableTokenListNode: ASDisplayNode, UITextFieldDelegate {
             }
         }
         self.scrollNode.view.contentSize = CGSize(width: width, height: contentHeight)
+
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: width, height: nodeHeight)))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
         
         return nodeHeight
     }
diff --git a/submodules/TelegramUI/Sources/EmojiResources.swift b/submodules/TelegramUI/Sources/EmojiResources.swift
index 730c085b42..4396a939f9 100644
--- a/submodules/TelegramUI/Sources/EmojiResources.swift
+++ b/submodules/TelegramUI/Sources/EmojiResources.swift
@@ -9,6 +9,7 @@ import WebPBinding
 import MediaResources
 import Emoji
 import AppBundle
+import AccountContext
 
 public struct EmojiThumbnailResourceId: MediaResourceId {
     public let emoji: String
@@ -284,17 +285,17 @@ private final class Buffer {
     var data = Data()
 }
 
-func fetchEmojiSpriteResource(postbox: Postbox, network: Network, resource: EmojiSpriteResource) -> Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> {
+func fetchEmojiSpriteResource(account: Account, resource: EmojiSpriteResource) -> Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> {
     let packName = "P\(resource.packId)_by_AEStickerBot"
     
-    return loadedStickerPack(postbox: postbox, network: network, reference: .name(packName), forceActualized: false)
+    return TelegramEngine(account: account).stickers.loadedStickerPack(reference: .name(packName), forceActualized: false)
     |> castError(MediaResourceDataFetchError.self)
     |> mapToSignal { result -> Signal<MediaResourceDataFetchResult, MediaResourceDataFetchError> in
         switch result {
             case let .result(_, items, _):
                 if let sticker = items[Int(resource.stickerId)] as? StickerPackItem {
                     return Signal { subscriber in
-                        guard let fetchResource = postbox.mediaBox.fetchResource else {
+                        guard let fetchResource = account.postbox.mediaBox.fetchResource else {
                             return EmptyDisposable
                         }
 
diff --git a/submodules/TelegramUI/Sources/FeaturedStickersScreen.swift b/submodules/TelegramUI/Sources/FeaturedStickersScreen.swift
index 44b44075f2..66a14b33b4 100644
--- a/submodules/TelegramUI/Sources/FeaturedStickersScreen.swift
+++ b/submodules/TelegramUI/Sources/FeaturedStickersScreen.swift
@@ -15,6 +15,7 @@ import OverlayStatusController
 import PresentationDataUtils
 import SearchBarNode
 import UndoUI
+import ContextUI
 
 private final class FeaturedInteraction {
     let installPack: (ItemCollectionInfo, Bool) -> Void
@@ -212,6 +213,8 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
     
     private var searchNode: FeaturedPaneSearchContentNode?
     
+    private weak var peekController: PeekController?
+    
     private let _ready = Promise<Bool>()
     var ready: Promise<Bool> {
         return self._ready
@@ -258,7 +261,7 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                     }
                 }
                 if !addedRead.isEmpty {
-                    let _ = markFeaturedStickerPacksAsSeenInteractively(postbox: strongSelf.context.account.postbox, ids: addedRead).start()
+                    let _ = strongSelf.context.engine.stickers.markFeaturedStickerPacksAsSeenInteractively(ids: addedRead).start()
                 }
                 
                 if bottomIndex >= strongSelf.gridNode.items.count - 15 {
@@ -295,84 +298,9 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                 }
                 let account = strongSelf.context.account
                 if install {
-                    let _ = addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: []).start()
-                    /*var installSignal = loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
-                    |> mapToSignal { result -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                        switch result {
-                        case let .result(info, items, installed):
-                            if installed {
-                                return .complete()
-                            } else {
-                                return preloadedStickerPackThumbnail(account: account, info: info, items: items)
-                                |> filter { $0 }
-                                |> ignoreValues
-                                |> then(
-                                    addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items)
-                                    |> ignoreValues
-                                )
-                                |> mapToSignal { _ -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                                }
-                                |> then(.single((info, items)))
-                            }
-                        case .fetching:
-                            break
-                        case .none:
-                            break
-                        }
-                        return .complete()
-                    }
-                    |> deliverOnMainQueue
-                    
-                    let context = strongSelf.context
-                    var cancelImpl: (() -> Void)?
-                    let progressSignal = Signal<Never, NoError> { subscriber in
-                        let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                        let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                            cancelImpl?()
-                        }))
-                        self?.controller?.present(controller, in: .window(.root))
-                        return ActionDisposable { [weak controller] in
-                            Queue.mainQueue().async() {
-                                controller?.dismiss()
-                            }
-                        }
-                    }
-                    |> runOn(Queue.mainQueue())
-                    |> delay(1.0, queue: Queue.mainQueue())
-                    let progressDisposable = progressSignal.start()
-                    
-                    installSignal = installSignal
-                    |> afterDisposed {
-                        Queue.mainQueue().async {
-                            progressDisposable.dispose()
-                        }
-                    }
-                    cancelImpl = {
-                        self?.installDisposable.set(nil)
-                    }
-                        
-                    strongSelf.installDisposable.set(installSignal.start(next: { info, items in
-                        guard let strongSelf = self else {
-                            return
-                        }
-                        
-                        /*var animateInAsReplacement = false
-                        if let navigationController = strongSelf.controllerInteraction.navigationController() {
-                            for controller in navigationController.overlayControllers {
-                                if let controller = controller as? UndoOverlayController {
-                                    controller.dismissWithCommitActionAndReplacementAnimation()
-                                    animateInAsReplacement = true
-                                }
-                            }
-                        }
-                        
-                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                        strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: strongSelf.context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
-                            return true
-                        }))*/
-                    }))*/
+                    let _ = strongSelf.context.engine.stickers.addStickerPackInteractively(info: info, items: []).start()
                 } else {
-                    let _ = (removeStickerPackInteractively(postbox: account.postbox, id: info.id, option: .delete)
+                    let _ = (strongSelf.context.engine.stickers.removeStickerPackInteractively(id: info.id, option: .delete)
                     |> deliverOnMainQueue).start(next: { _ in
                     })
                 }
@@ -535,16 +463,21 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                         |> deliverOnMainQueue
                         |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                             if let strongSelf = self {
-                                var menuItems: [PeekControllerMenuItem] = []
+                                var menuItems: [ContextMenuItem] = []
                                 menuItems = [
-                                    PeekControllerMenuItem(title: strongSelf.presentationData.strings.StickerPack_Send, color: .accent, font: .bold, action: { node, rect in
-                                        if let strongSelf = self {
-                                            return strongSelf.sendSticker?(.standalone(media: item.file), node, rect) ?? false
-                                        } else {
-                                            return false
+                                    .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                        if let strongSelf = self, let peekController = strongSelf.peekController {
+                                            if let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                                let _ = strongSelf.sendSticker?(.standalone(media: item.file), animationNode, animationNode.bounds)
+                                            } else if let imageNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.imageNode {
+                                                let _ = strongSelf.sendSticker?(.standalone(media: item.file), imageNode, imageNode.bounds)
+                                            }
                                         }
-                                    }),
-                                    PeekControllerMenuItem(title: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                        f(.default)
+                                    })),
+                                    .action(ContextMenuActionItem(text: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                        f(.default)
+                                        
                                         if let strongSelf = self {
                                             if isStarred {
                                                 let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -552,9 +485,10 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                                                 let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                             }
                                         }
-                                        return true
-                                    }),
-                                    PeekControllerMenuItem(title: strongSelf.presentationData.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                    })),
+                                    .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                        f(.default)
+                                        
                                         if let strongSelf = self {
                                             loop: for attribute in item.file.attributes {
                                                 switch attribute {
@@ -577,9 +511,7 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                                                 }
                                             }
                                         }
-                                        return true
-                                    }),
-                                    PeekControllerMenuItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
+                                    }))
                                 ]
                                 return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: item, menu: menuItems))
                             } else {
@@ -599,16 +531,17 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                 |> deliverOnMainQueue
                 |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                     if let strongSelf = self {
-                        var menuItems: [PeekControllerMenuItem] = []
+                        var menuItems: [ContextMenuItem] = []
                         menuItems = [
-                            PeekControllerMenuItem(title: strongSelf.presentationData.strings.StickerPack_Send, color: .accent, font: .bold, action: { node, rect in
-                                if let strongSelf = self {
-                                    return strongSelf.sendSticker?(.standalone(media: item.file), node, rect) ?? false
-                                } else {
-                                    return false
+                            .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                if let strongSelf = self, let peekController = strongSelf.peekController, let animationNode = (peekController.contentNode as? StickerPreviewPeekContentNode)?.animationNode {
+                                    let _ = strongSelf.sendSticker?(.standalone(media: item.file), animationNode, animationNode.bounds)
                                 }
-                            }),
-                            PeekControllerMenuItem(title: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                f(.default)
+                            })),
+                            .action(ContextMenuActionItem(text: isStarred ? strongSelf.presentationData.strings.Stickers_RemoveFromFavorites : strongSelf.presentationData.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                f(.default)
+                                
                                 if let strongSelf = self {
                                     if isStarred {
                                         let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -616,34 +549,33 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
                                         let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                     }
                                 }
-                                return true
-                            }),
-                            PeekControllerMenuItem(title: strongSelf.presentationData.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                            })),
+                            .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                f(.default)
+                                
                                 if let strongSelf = self {
                                     loop: for attribute in item.file.attributes {
                                         switch attribute {
-                                            case let .Sticker(_, packReference, _):
-                                                if let packReference = packReference {
-                                                    let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controller?.navigationController as? NavigationController, sendSticker: { file, sourceNode, sourceRect in
-                                                        if let strongSelf = self {
-                                                            return strongSelf.sendSticker?(file, sourceNode, sourceRect) ?? false
-                                                        } else {
-                                                            return false
-                                                        }
-                                                    })
-                                          
-                                                    strongSelf.controller?.view.endEditing(true)
-                                                    strongSelf.controller?.present(controller, in: .window(.root))
-                                                }
-                                                break loop
-                                            default:
-                                                break
+                                        case let .Sticker(_, packReference, _):
+                                            if let packReference = packReference {
+                                                let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controller?.navigationController as? NavigationController, sendSticker: { file, sourceNode, sourceRect in
+                                                    if let strongSelf = self {
+                                                        return strongSelf.sendSticker?(file, sourceNode, sourceRect) ?? false
+                                                    } else {
+                                                        return false
+                                                    }
+                                                })
+                                                
+                                                strongSelf.controller?.view.endEditing(true)
+                                                strongSelf.controller?.present(controller, in: .window(.root))
+                                            }
+                                            break loop
+                                        default:
+                                            break
                                         }
                                     }
                                 }
-                                return true
-                            }),
-                            PeekControllerMenuItem(title: strongSelf.presentationData.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
+                            }))
                         ]
                         return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                     } else {
@@ -654,9 +586,10 @@ private final class FeaturedStickersScreenNode: ViewControllerTracingNode {
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.presentationData.theme), content: content, sourceNode: {
+                let controller = PeekController(presentationData: strongSelf.presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
+                strongSelf.peekController = controller
                 strongSelf.controller?.presentInGlobalOverlay(controller)
                 return controller
             }
@@ -885,7 +818,7 @@ final class FeaturedStickersScreen: ViewController {
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
 
@@ -1165,85 +1098,9 @@ private final class FeaturedPaneSearchContentNode: ASDisplayNode {
             }
             let account = strongSelf.context.account
             if install {
-                let _ = addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: []).start()
-                /*var installSignal = loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
-                |> mapToSignal { result -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                    switch result {
-                    case let .result(info, items, installed):
-                        if installed {
-                            return .complete()
-                        } else {
-                            return preloadedStickerPackThumbnail(account: account, info: info, items: items)
-                            |> filter { $0 }
-                            |> ignoreValues
-                            |> then(
-                                addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items)
-                                |> ignoreValues
-                            )
-                            |> mapToSignal { _ -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                                return .complete()
-                            }
-                            |> then(.single((info, items)))
-                        }
-                    case .fetching:
-                        break
-                    case .none:
-                        break
-                    }
-                    return .complete()
-                }
-                |> deliverOnMainQueue
-                
-                let context = strongSelf.context
-                var cancelImpl: (() -> Void)?
-                let progressSignal = Signal<Never, NoError> { subscriber in
-                    let presentationData = context.sharedContext.currentPresentationData.with { $0 }
-                    let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: {
-                        cancelImpl?()
-                    }))
-                    self?.controller?.present(controller, in: .window(.root))
-                    return ActionDisposable { [weak controller] in
-                        Queue.mainQueue().async() {
-                            controller?.dismiss()
-                        }
-                    }
-                }
-                |> runOn(Queue.mainQueue())
-                |> delay(0.12, queue: Queue.mainQueue())
-                let progressDisposable = progressSignal.start()
-                
-                installSignal = installSignal
-                |> afterDisposed {
-                    Queue.mainQueue().async {
-                        progressDisposable.dispose()
-                    }
-                }
-                cancelImpl = {
-                    self?.installDisposable.set(nil)
-                }
-                    
-                strongSelf.installDisposable.set(installSignal.start(next: { info, items in
-                    guard let strongSelf = self else {
-                        return
-                    }
-                    
-                    var animateInAsReplacement = false
-                    if let navigationController = strongSelf.controller?.navigationController as? NavigationController {
-                        for controller in navigationController.overlayControllers {
-                            if let controller = controller as? UndoOverlayController {
-                                controller.dismissWithCommitActionAndReplacementAnimation()
-                                animateInAsReplacement = true
-                            }
-                        }
-                    }
-                    
-                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                    /*strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: strongSelf.context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
-                        return true
-                    }))*/
-                }))*/
+                let _ = strongSelf.context.engine.stickers.addStickerPackInteractively(info: info, items: []).start()
             } else {
-                let _ = (removeStickerPackInteractively(postbox: account.postbox, id: info.id, option: .delete)
+                let _ = (strongSelf.context.engine.stickers.removeStickerPackInteractively(id: info.id, option: .delete)
                 |> deliverOnMainQueue).start(next: { _ in
                 })
             }
@@ -1268,22 +1125,22 @@ private final class FeaturedPaneSearchContentNode: ASDisplayNode {
     func updateText(_ text: String, languageCode: String?) {
         let signal: Signal<([(String?, FoundStickerItem)], FoundStickerSets, Bool, FoundStickerSets?)?, NoError>
         if !text.isEmpty {
-            let account = self.context.account
+            let context = self.context
             let stickers: Signal<[(String?, FoundStickerItem)], NoError> = Signal { subscriber in
                 var signals: Signal<[Signal<(String?, [FoundStickerItem]), NoError>], NoError> = .single([])
                 
                 let query = text.trimmingCharacters(in: .whitespacesAndNewlines)
                 if query.isSingleEmoji {
-                    signals = .single([searchStickers(account: account, query: text.basicEmoji.0)
+                    signals = .single([context.engine.stickers.searchStickers(query: text.basicEmoji.0)
                     |> map { (nil, $0) }])
                 } else if query.count > 1, let languageCode = languageCode, !languageCode.isEmpty && languageCode != "emoji" {
-                    var signal = searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3)
+                    var signal = context.engine.stickers.searchEmojiKeywords(inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3)
                     if !languageCode.lowercased().hasPrefix("en") {
                         signal = signal
                         |> mapToSignal { keywords in
                             return .single(keywords)
                             |> then(
-                                searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: "en-US", query: query.lowercased(), completeMatch: query.count < 3)
+                                context.engine.stickers.searchEmojiKeywords(inputLanguageCode: "en-US", query: query.lowercased(), completeMatch: query.count < 3)
                                 |> map { englishKeywords in
                                     return keywords + englishKeywords
                                 }
@@ -1296,7 +1153,7 @@ private final class FeaturedPaneSearchContentNode: ASDisplayNode {
                         var signals: [Signal<(String?, [FoundStickerItem]), NoError>] = []
                         let emoticons = keywords.flatMap { $0.emoticons }
                         for emoji in emoticons {
-                            signals.append(searchStickers(account: self.context.account, query: emoji.basicEmoji.0)
+                            signals.append(context.engine.stickers.searchStickers(query: emoji.basicEmoji.0)
                             |> take(1)
                             |> map { (emoji, $0) })
                         }
@@ -1320,8 +1177,8 @@ private final class FeaturedPaneSearchContentNode: ASDisplayNode {
                 })
             }
             
-            let local = searchStickerSets(postbox: context.account.postbox, query: text)
-            let remote = searchStickerSetsRemotely(network: context.account.network, query: text)
+            let local = context.engine.stickers.searchStickerSets(query: text)
+            let remote = context.engine.stickers.searchStickerSetsRemotely(query: text)
             |> delay(0.2, queue: Queue.mainQueue())
             let rawPacks = local
             |> mapToSignal { result -> Signal<(FoundStickerSets, Bool, FoundStickerSets?), NoError> in
diff --git a/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift b/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
index 71a0c3e920..3c67d897f4 100644
--- a/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
+++ b/submodules/TelegramUI/Sources/FetchCachedRepresentations.swift
@@ -16,9 +16,9 @@ import LocationResources
 import ImageBlur
 import TelegramAnimatedStickerNode
 import WallpaperResources
-import Svg
 import GZip
 import TelegramUniversalVideoContent
+import GradientBackground
 
 public func fetchCachedResourceRepresentation(account: Account, resource: MediaResource, representation: CachedMediaResourceRepresentation) -> Signal<CachedMediaResourceRepresentationResult, NoError> {
     if let representation = representation as? CachedStickerAJpegRepresentation {
@@ -67,22 +67,6 @@ public func fetchCachedResourceRepresentation(account: Account, resource: MediaR
             }
             return fetchCachedBlurredWallpaperRepresentation(resource: resource, resourceData: data, representation: representation)
         }
-    } else if let representation = representation as? CachedPatternWallpaperMaskRepresentation {
-        return account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
-        |> mapToSignal { data -> Signal<CachedMediaResourceRepresentationResult, NoError> in
-            if !data.complete {
-                return .complete()
-            }
-            return fetchCachedPatternWallpaperMaskRepresentation(resource: resource, resourceData: data, representation: representation)
-        }
-    } else if let representation = representation as? CachedPatternWallpaperRepresentation {
-        return account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
-        |> mapToSignal { data -> Signal<CachedMediaResourceRepresentationResult, NoError> in
-            if !data.complete {
-                return .complete()
-            }
-            return fetchCachedPatternWallpaperRepresentation(resource: resource, resourceData: data, representation: representation)
-        } 
     } else if let representation = representation as? CachedAlbumArtworkRepresentation {
         return account.postbox.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
         |> mapToSignal { data -> Signal<CachedMediaResourceRepresentationResult, NoError> in
@@ -167,8 +151,14 @@ private func videoFirstFrameData(account: Account, resource: MediaResource, chun
 private func fetchCachedStickerAJpegRepresentation(account: Account, resource: MediaResource, resourceData: MediaResourceData, representation: CachedStickerAJpegRepresentation) -> Signal<CachedMediaResourceRepresentationResult, NoError> {
     return Signal({ subscriber in
         if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
-            if let image = WebP.convert(fromWebP: data) {
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+            var image: UIImage?
+            if let webpImage = WebP.convert(fromWebP: data) {
+                image = webpImage
+            } else if let pngImage = UIImage(data: data) {
+                image = pngImage
+            }
+            if let image = image {
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
                 
                 let colorData = NSMutableData()
@@ -245,7 +235,7 @@ private func fetchCachedScaledImageRepresentation(resource: MediaResource, resou
     return Signal({ subscriber in
         if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
             if let image = UIImage(data: data) {
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
 
                 let size: CGSize
@@ -318,7 +308,7 @@ private func fetchCachedVideoFirstFrameRepresentation(account: Account, resource
                 
                 let fullSizeImage = try imageGenerator.copyCGImage(at: CMTime(seconds: 0.0, preferredTimescale: asset.duration.timescale), actualTime: nil)
                 
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
                 
                 if let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
@@ -352,7 +342,7 @@ private func fetchCachedScaledVideoFirstFrameRepresentation(account: Account, re
             return Signal({ subscriber in
                 if let data = try? Data(contentsOf: URL(fileURLWithPath: firstFrame.path), options: [.mappedIfSafe]) {
                     if let image = UIImage(data: data) {
-                        let path = NSTemporaryDirectory() + "\(arc4random64())"
+                        let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                         let url = URL(fileURLWithPath: path)
                         
                         let size = representation.size
@@ -387,7 +377,7 @@ private func fetchCachedBlurredWallpaperRepresentation(resource: MediaResource,
     return Signal({ subscriber in
         if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
             if let image = UIImage(data: data) {
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
                 
                 if let colorImage = blurredImage(image, radius: 45.0), let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
@@ -410,173 +400,6 @@ private func fetchCachedBlurredWallpaperRepresentation(resource: MediaResource,
     }) |> runOn(Queue.concurrentDefaultQueue())
 }
 
-private func fetchCachedPatternWallpaperMaskRepresentation(resource: MediaResource, resourceData: MediaResourceData, representation: CachedPatternWallpaperMaskRepresentation) -> Signal<CachedMediaResourceRepresentationResult, NoError> {
-    return Signal({ subscriber in
-        if var data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
-            let path = NSTemporaryDirectory() + "\(arc4random64())"
-            let url = URL(fileURLWithPath: path)
-            
-            if let unzippedData = TGGUnzipData(data, 2 * 1024 * 1024) {
-                data = unzippedData
-            }
-            
-            if data.count > 5, let string = String(data: data.subdata(in: 0 ..< 5), encoding: .utf8), string == "<?xml" {
-                let size = representation.size ?? CGSize(width: 1440.0, height: 2960.0)
-                
-                if let image = drawSvgImage(data, size, .black, .white) {
-                    if let alphaDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
-                        CGImageDestinationSetProperties(alphaDestination, [:] as CFDictionary)
-                        
-                        let colorQuality: Float = 0.87
-                        
-                        let options = NSMutableDictionary()
-                        options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString)
-                        
-                        CGImageDestinationAddImage(alphaDestination, image.cgImage!, options as CFDictionary)
-                        if CGImageDestinationFinalize(alphaDestination) {
-                            subscriber.putNext(.temporaryPath(path))
-                            subscriber.putCompletion()
-                        }
-                    }
-                }
-            } else if let image = UIImage(data: data) {
-                let size = representation.size.flatMap { image.size.aspectFitted($0) } ?? CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale)
-                
-                let alphaImage = generateImage(size, contextGenerator: { size, context in
-                    context.setFillColor(UIColor.black.cgColor)
-                    context.fill(CGRect(origin: CGPoint(), size: size))
-                    context.clip(to: CGRect(origin: CGPoint(), size: size), mask: image.cgImage!)
-                    context.setFillColor(UIColor.white.cgColor)
-                    context.fill(CGRect(origin: CGPoint(), size: size))
-                }, scale: 1.0)
-                   
-                if let alphaImage = alphaImage, let alphaDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
-                    CGImageDestinationSetProperties(alphaDestination, [:] as CFDictionary)
-                    
-                    let colorQuality: Float = 0.87
-                    
-                    let options = NSMutableDictionary()
-                    options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString)
-                    
-                    CGImageDestinationAddImage(alphaDestination, alphaImage.cgImage!, options as CFDictionary)
-                    if CGImageDestinationFinalize(alphaDestination) {
-                        subscriber.putNext(.temporaryPath(path))
-                        subscriber.putCompletion()
-                    }
-                }
-            }
-        }
-        return EmptyDisposable
-    }) |> runOn(Queue.concurrentDefaultQueue())
-}
-
-private func fetchCachedPatternWallpaperRepresentation(resource: MediaResource, resourceData: MediaResourceData, representation: CachedPatternWallpaperRepresentation) -> Signal<CachedMediaResourceRepresentationResult, NoError> {
-    return Signal({ subscriber in
-        if var data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
-            if let unzippedData = TGGUnzipData(data, 2 * 1024 * 1024) {
-                data = unzippedData
-            }
-            
-            let path = NSTemporaryDirectory() + "\(arc4random64())"
-            let url = URL(fileURLWithPath: path)
-            
-            var colors: [UIColor] = []
-            if let bottomColor = representation.bottomColor {
-                colors.append(UIColor(rgb: bottomColor))
-            }
-            colors.append(UIColor(rgb: representation.color))
-            
-            let intensity = CGFloat(representation.intensity) / 100.0
-            
-            var size: CGSize?
-            var maskImage: UIImage?
-            if data.count > 5, let string = String(data: data.subdata(in: 0 ..< 5), encoding: .utf8), string == "<?xml" {
-                let defaultSize = CGSize(width: 1440.0, height: 2960.0)
-                size = defaultSize
-                if let image = drawSvgImage(data, defaultSize, .black, .white) {
-                    maskImage = image
-                }
-            } else if let image = UIImage(data: data) {
-                size = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale)
-                maskImage = image
-            }
-            
-            var colorImage: UIImage?
-            if let size = size {
-                colorImage = generateImage(size, contextGenerator: { size, c in
-                    let rect = CGRect(origin: CGPoint(), size: size)
-                    c.setBlendMode(.copy)
-                    
-                    if colors.count == 1, let color = colors.first {
-                        c.setFillColor(color.cgColor)
-                        c.fill(rect)
-                    } else {
-                        let gradientColors = colors.map { $0.cgColor } as CFArray
-                        let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
-                        
-                        var locations: [CGFloat] = []
-                        for i in 0 ..< colors.count {
-                            locations.append(delta * CGFloat(i))
-                        }
-                        let colorSpace = CGColorSpaceCreateDeviceRGB()
-                        let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
-                        
-                        c.saveGState()
-                        c.translateBy(x: rect.width / 2.0, y: rect.height / 2.0)
-                        c.rotate(by: CGFloat(representation.rotation ?? 0) * CGFloat.pi / -180.0)
-                        c.translateBy(x: -rect.width / 2.0, y: -rect.height / 2.0)
-                        
-                        c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: rect.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-                        c.restoreGState()
-                    }
-                    
-                    c.setBlendMode(.normal)
-                    if let cgImage = maskImage?.cgImage {
-                        c.clip(to: rect, mask: cgImage)
-                    }
-
-                    if colors.count == 1, let color = colors.first {
-                        c.setFillColor(patternColor(for: color, intensity: intensity).cgColor)
-                        c.fill(rect)
-                    } else {
-                        let gradientColors = colors.map { patternColor(for: $0, intensity: intensity).cgColor } as CFArray
-                        let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
-                        
-                        var locations: [CGFloat] = []
-                        for i in 0 ..< colors.count {
-                            locations.append(delta * CGFloat(i))
-                        }
-                        let colorSpace = CGColorSpaceCreateDeviceRGB()
-                        let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
-                        
-                        c.translateBy(x: rect.width / 2.0, y: rect.height / 2.0)
-                        c.rotate(by: CGFloat(representation.rotation ?? 0) * CGFloat.pi / -180.0)
-                        c.translateBy(x: -rect.width / 2.0, y: -rect.height / 2.0)
-                        
-                        c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: rect.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-                    }
-                }, scale: 1.0)
-            }
-            
-            if let colorImage = colorImage, let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
-                CGImageDestinationSetProperties(colorDestination, [:] as CFDictionary)
-                
-                let colorQuality: Float = 0.9
-                
-                let options = NSMutableDictionary()
-                options.setObject(colorQuality as NSNumber, forKey: kCGImageDestinationLossyCompressionQuality as NSString)
-                
-                CGImageDestinationAddImage(colorDestination, colorImage.cgImage!, options as CFDictionary)
-                if CGImageDestinationFinalize(colorDestination) {
-                    subscriber.putNext(.temporaryPath(path))
-                    subscriber.putCompletion()
-                }
-            }
-        }
-        return EmptyDisposable
-    }) |> runOn(Queue.concurrentDefaultQueue())
-}
-
 public func fetchCachedSharedResourceRepresentation(accountManager: AccountManager, resource: MediaResource, representation: CachedMediaResourceRepresentation) -> Signal<CachedMediaResourceRepresentationResult, NoError> {
     if let representation = representation as? CachedScaledImageRepresentation {
         return accountManager.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
@@ -594,22 +417,6 @@ public func fetchCachedSharedResourceRepresentation(accountManager: AccountManag
             }
             return fetchCachedBlurredWallpaperRepresentation(resource: resource, resourceData: data, representation: representation)
         }
-    } else if let representation = representation as? CachedPatternWallpaperMaskRepresentation {
-        return accountManager.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
-        |> mapToSignal { data -> Signal<CachedMediaResourceRepresentationResult, NoError> in
-            if !data.complete {
-                return .complete()
-            }
-            return fetchCachedPatternWallpaperMaskRepresentation(resource: resource, resourceData: data, representation: representation)
-        }
-    } else if let representation = representation as? CachedPatternWallpaperRepresentation {
-        return accountManager.mediaBox.resourceData(resource, option: .complete(waitUntilFetchStatus: false))
-        |> mapToSignal { data -> Signal<CachedMediaResourceRepresentationResult, NoError> in
-            if !data.complete {
-                return .complete()
-            }
-            return fetchCachedPatternWallpaperRepresentation(resource: resource, resourceData: data, representation: representation)
-        }
     } else {
         return .never()
     }
@@ -619,7 +426,7 @@ private func fetchCachedBlurredWallpaperRepresentation(account: Account, resourc
     return Signal({ subscriber in
         if let data = try? Data(contentsOf: URL(fileURLWithPath: resourceData.path), options: [.mappedIfSafe]) {
             if let image = UIImage(data: data) {
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
                 
                 if let colorImage = blurredImage(image, radius: 45.0), let colorDestination = CGImageDestinationCreateWithURL(url as CFURL, kUTTypeJPEG, 1, nil) {
@@ -652,7 +459,7 @@ private func fetchCachedAlbumArtworkRepresentation(account: Account, resource: M
         switch result {
             case let .artworkData(data):
                 if let image = UIImage(data: data) {
-                    let path = NSTemporaryDirectory() + "\(arc4random64())"
+                    let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                     let url = URL(fileURLWithPath: path)
                     
                     var size = image.size
@@ -694,7 +501,7 @@ private func fetchEmojiThumbnailRepresentation(account: Account, resource: Media
         return .never()
     }
     return Signal({ subscriber in
-        let path = NSTemporaryDirectory() + "\(arc4random64())"
+        let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
         let url = URL(fileURLWithPath: path)
         
         let nsString = (resource.emoji as NSString)
@@ -803,7 +610,7 @@ private func fetchEmojiRepresentation(account: Account, resource: MediaResource,
     |> mapToSignal { data in
         return Signal({ subscriber in
             if let data = data, let image = UIImage(data: data) {
-                let path = NSTemporaryDirectory() + "\(arc4random64())"
+                let path = NSTemporaryDirectory() + "\(Int64.random(in: Int64.min ... Int64.max))"
                 let url = URL(fileURLWithPath: path)
                 
                 let size = CGSize(width: 160.0, height: 160.0)
diff --git a/submodules/TelegramUI/Sources/FetchManager.swift b/submodules/TelegramUI/Sources/FetchManager.swift
index b14f780da1..b6a80bd23b 100644
--- a/submodules/TelegramUI/Sources/FetchManager.swift
+++ b/submodules/TelegramUI/Sources/FetchManager.swift
@@ -6,6 +6,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramUIPreferences
 import AccountContext
+import UniversalMediaPlayer
 
 private struct FetchManagerLocationEntryId: Hashable {
     let location: FetchManagerLocation
diff --git a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
index cf920d8030..74f6ab3e69 100644
--- a/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ForwardAccessoryPanelNode.swift
@@ -65,6 +65,8 @@ func textStringForForwardedMessage(_ message: Message, strings: PresentationStri
                 return (strings.ForwardedPolls(1), true)
             case let dice as TelegramMediaDice:
                 return (dice.emoji, true)
+            case let invoice as TelegramMediaInvoice:
+                return (invoice.title, true)
             default:
                 break
         }
@@ -86,6 +88,8 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
     let context: AccountContext
     var theme: PresentationTheme
     var strings: PresentationStrings
+
+    private var validLayout: (size: CGSize, interfaceState: ChatPresentationInterfaceState)?
     
     init(context: AccountContext, messageIds: [MessageId], theme: PresentationTheme, strings: PresentationStrings) {
         self.context = context
@@ -100,7 +104,7 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
         self.closeButton.displaysAsynchronously = false
         
         self.lineNode = ASImageNode()
-        self.lineNode.displayWithoutProcessing = true
+        self.lineNode.displayWithoutProcessing = false
         self.lineNode.displaysAsynchronously = false
         self.lineNode.image = PresentationResourcesChat.chatInputPanelVerticalSeparatorLineImage(theme)
         
@@ -156,8 +160,10 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
                     headerString = "Forward messages"
                 }
                 strongSelf.actionArea.accessibilityLabel = "\(headerString). From: \(authors).\n\(text)"
-                
-                strongSelf.setNeedsLayout()
+
+                if let (size, interfaceState) = strongSelf.validLayout {
+                    strongSelf.updateState(size: size, interfaceState: interfaceState)
+                }
             }
         }))
     }
@@ -189,34 +195,36 @@ final class ForwardAccessoryPanelNode: AccessoryPanelNode {
                 self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: self.theme.chat.inputPanel.primaryTextColor)
             }
             
-            self.setNeedsLayout()
+            if let (size, interfaceState) = self.validLayout {
+                self.updateState(size: size, interfaceState: interfaceState)
+            }
         }
     }
-    
+
     override func calculateSizeThatFits(_ constrainedSize: CGSize) -> CGSize {
         return CGSize(width: constrainedSize.width, height: 45.0)
     }
-    
-    override func layout() {
-        super.layout()
-        
-        let bounds = self.bounds
+
+    override func updateState(size: CGSize, interfaceState: ChatPresentationInterfaceState) {
+        self.validLayout = (size, interfaceState)
+
+        let bounds = CGRect(origin: CGPoint(), size: CGSize(width: size.width, height: 45.0))
         let leftInset: CGFloat = 55.0
         let textLineInset: CGFloat = 10.0
         let rightInset: CGFloat = 55.0
         let textRightInset: CGFloat = 20.0
-        
+
         let closeButtonSize = CGSize(width: 44.0, height: bounds.height)
         let closeButtonFrame = CGRect(origin: CGPoint(x: bounds.width - rightInset - closeButtonSize.width + 12.0, y: 2.0), size: closeButtonSize)
         self.closeButton.frame = closeButtonFrame
-        
+
         self.actionArea.frame = CGRect(origin: CGPoint(x: leftInset, y: 2.0), size: CGSize(width: closeButtonFrame.minX - leftInset, height: bounds.height))
-        
+
         self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
-        
+
         let titleSize = self.titleNode.updateLayout(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset, height: bounds.size.height))
         self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset, y: 7.0), size: titleSize)
-        
+
         let textSize = self.textNode.updateLayout(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset, height: bounds.size.height))
         self.textNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset, y: 25.0), size: textSize)
     }
diff --git a/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift b/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
index 69b9cbf440..6c79d3ebfc 100644
--- a/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
+++ b/submodules/TelegramUI/Sources/GifPaneSearchContentNode.swift
@@ -25,17 +25,17 @@ class PaneGifSearchForQueryResult {
     }
 }
 
-func paneGifSearchForQuery(account: Account, query: String, offset: String?, incompleteResults: Bool = false, staleCachedResults: Bool = false, delayRequest: Bool = true, updateActivity: ((Bool) -> Void)?) -> Signal<PaneGifSearchForQueryResult?, NoError> {
-    let contextBot = account.postbox.transaction { transaction -> String in
+func paneGifSearchForQuery(context: AccountContext, query: String, offset: String?, incompleteResults: Bool = false, staleCachedResults: Bool = false, delayRequest: Bool = true, updateActivity: ((Bool) -> Void)?) -> Signal<PaneGifSearchForQueryResult?, NoError> {
+    let contextBot = context.account.postbox.transaction { transaction -> String in
         let configuration = currentSearchBotsConfiguration(transaction: transaction)
         return configuration.gifBotUsername ?? "gif"
     }
     |> mapToSignal { botName -> Signal<PeerId?, NoError> in
-        return resolvePeerByName(account: account, name: botName)
+        return context.engine.peers.resolvePeerByName(name: botName)
     }
     |> mapToSignal { peerId -> Signal<Peer?, NoError> in
         if let peerId = peerId {
-            return account.postbox.loadedPeerWithId(peerId)
+            return context.account.postbox.loadedPeerWithId(peerId)
             |> map { peer -> Peer? in
                 return peer
             }
@@ -46,7 +46,7 @@ func paneGifSearchForQuery(account: Account, query: String, offset: String?, inc
     }
     |> mapToSignal { peer -> Signal<(ChatPresentationInputQueryResult?, Bool, Bool), NoError> in
         if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder {
-            let results = requestContextResults(account: account, botId: user.id, query: query, peerId: account.peerId, offset: offset ?? "", incompleteResults: incompleteResults, staleCachedResults: staleCachedResults, limit: 1)
+            let results = requestContextResults(context: context, botId: user.id, query: query, peerId: context.account.peerId, offset: offset ?? "", incompleteResults: incompleteResults, staleCachedResults: staleCachedResults, limit: 1)
             |> map { results -> (ChatPresentationInputQueryResult?, Bool, Bool) in
                 return (.contextRequestResult(user, results?.results), results != nil, results?.isStale ?? false)
             }
@@ -101,7 +101,8 @@ func paneGifSearchForQuery(account: Account, query: String, offset: String?, inc
                                 previews.append(TelegramMediaImageRepresentation(
                                     dimensions: dimensions,
                                     resource: thumbnailResource,
-                                    progressiveSizes: []
+                                    progressiveSizes: [],
+                                    immediateThumbnailData: nil
                                 ))
                             }
                         }
@@ -202,7 +203,7 @@ final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
         
         let signal: Signal<([MultiplexedVideoNodeFile], String?)?, NoError>
         if !text.isEmpty {
-            signal = paneGifSearchForQuery(account: self.context.account, query: text, offset: "", updateActivity: self.updateActivity)
+            signal = paneGifSearchForQuery(context: self.context, query: text, offset: "", updateActivity: self.updateActivity)
             |> map { result -> ([MultiplexedVideoNodeFile], String?)? in
                 if let result = result {
                     return (result.files, result.nextOffset)
@@ -251,7 +252,7 @@ final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
         self.isLoadingNextResults = true
         
         let signal: Signal<([MultiplexedVideoNodeFile], String?)?, NoError>
-        signal = paneGifSearchForQuery(account: self.context.account, query: text, offset: nextOffsetValue, updateActivity: self.updateActivity)
+        signal = paneGifSearchForQuery(context: self.context, query: text, offset: nextOffsetValue, updateActivity: self.updateActivity)
         |> map { result -> ([MultiplexedVideoNodeFile], String?)? in
             if let result = result {
                 return (result.files, result.nextOffset)
@@ -344,9 +345,9 @@ final class GifPaneSearchContentNode: ASDisplayNode & PaneSearchContentNode {
             
             multiplexedNode.fileSelected = { [weak self] file, sourceNode, sourceRect in
                 if let (collection, result) = file.contextResult {
-                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendBotContextResultAsGif(collection, result, sourceNode, sourceRect, false)
                 } else {
-                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect)
+                    let _ = self?.controllerInteraction.sendGif(file.file, sourceNode, sourceRect, false, false)
                 }
             }
             
diff --git a/submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift
index c462c8fdc3..13d813efca 100644
--- a/submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/HashtagChatInputContextPanelNode.swift
@@ -141,7 +141,7 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode {
             }
         }, removeRequested: { [weak self] text in
             if let strongSelf = self {
-                let _ = removeRecentlyUsedHashtag(postbox: strongSelf.context.account.postbox, string: text).start()
+                let _ = strongSelf.context.engine.messages.removeRecentlyUsedHashtag(string: text).start()
                 strongSelf.revealedHashtag = nil
             }
         })
@@ -190,7 +190,10 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode {
                     
                     if let topItemOffset = topItemOffset {
                         let position = strongSelf.listView.layer.position
-                        strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
                     }
                 }
             })
@@ -256,5 +259,14 @@ final class HashtagChatInputContextPanelNode: ChatInputContextPanelNode {
         let listViewFrame = self.listView.frame
         return self.listView.hitTest(CGPoint(x: point.x - listViewFrame.minX, y: point.y - listViewFrame.minY), with: event)
     }
+    
+    override var topItemFrame: CGRect? {
+        var topItemFrame: CGRect?
+        self.listView.forEachItemNode { itemNode in
+            if topItemFrame == nil {
+                topItemFrame = itemNode.frame
+            }
+        }
+        return topItemFrame
+    }
 }
-
diff --git a/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift
index 962fb53c3a..81340bfc95 100644
--- a/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputContextPanelNode.swift
@@ -11,6 +11,7 @@ import TelegramUIPreferences
 import MergeLists
 import AccountContext
 import StickerPackPreviewUI
+import ContextUI
 
 private struct ChatContextResultStableId: Hashable {
     let result: ChatContextResult
@@ -145,19 +146,23 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
                 strongSelf.listView.forEachItemNode { itemNode in
                     if itemNode.frame.contains(convertedPoint), let itemNode = itemNode as? HorizontalListContextResultsChatInputPanelItemNode, let item = itemNode.item {
                         if case let .internalReference(internalReference) = item.result, let file = internalReference.file, file.isSticker {
-                            var menuItems: [PeekControllerMenuItem] = []
-                            menuItems.append(PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { _, _ in
-                                return item.resultSelected(item.result, itemNode, itemNode.bounds)
-                            }))
+                            var menuItems: [ContextMenuItem] = []
+                            menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                f(.default)
+                                
+                                let _ = item.resultSelected(item.result, itemNode, itemNode.bounds)
+                            })))
                             for case let .Sticker(_, packReference, _) in file.attributes {
                                 guard let packReference = packReference else {
                                     continue
                                 }
-                                menuItems.append(PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                    
                                     if let strongSelf = self {
                                         let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.interfaceInteraction?.getNavigationController(), sendSticker: { file, sourceNode, sourceRect in
                                             if let strongSelf = self {
-                                                return strongSelf.interfaceInteraction?.sendSticker(file, sourceNode, sourceRect) ?? false
+                                                return strongSelf.interfaceInteraction?.sendSticker(file, false, sourceNode, sourceRect) ?? false
                                             } else {
                                                 return false
                                             }
@@ -166,21 +171,29 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
                                         strongSelf.interfaceInteraction?.getNavigationController()?.view.window?.endEditing(true)
                                         strongSelf.interfaceInteraction?.presentController(controller, nil)
                                     }
-                                    return true
-                                }))
+                                })))
                             }
                             selectedItemNodeAndContent = (itemNode, StickerPreviewPeekContent(account: item.account, item: .found(FoundStickerItem(file: file, stringRepresentations: [])), menu: menuItems))
                         } else {
-                            var menuItems: [PeekControllerMenuItem] = []
+                            var menuItems: [ContextMenuItem] = []
                             if case let .internalReference(internalReference) = item.result, let file = internalReference.file, file.isAnimated {
-                                menuItems.append(PeekControllerMenuItem(title: strongSelf.strings.Preview_SaveGif, color: .accent, action: { _, _ in
+                                menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.Preview_SaveGif, icon: { theme in
+                                    return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Save"), color: theme.actionSheet.primaryTextColor)
+                                }, action: { _, f in
+                                    f(.dismissWithoutContent)
+                                    
+                                    guard let strongSelf = self else {
+                                        return
+                                    }
                                     let _ = addSavedGif(postbox: strongSelf.context.account.postbox, fileReference: .standalone(media: file)).start()
-                                    return true
-                                }))
+                                })))
                             }
-                            menuItems.append(PeekControllerMenuItem(title: strongSelf.strings.ShareMenu_Send, color: .accent, font: .bold, action: { _, _ in
-                                return item.resultSelected(item.result, itemNode, itemNode.bounds)
-                            }))
+                            menuItems.append(.action(ContextMenuActionItem(text: strongSelf.strings.ShareMenu_Send, icon: { theme in
+                                return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.actionSheet.primaryTextColor)
+                            }, action: { _, f in
+                                f(.default)
+                                item.resultSelected(item.result, itemNode, itemNode.bounds)
+                            })))
                             selectedItemNodeAndContent = (itemNode, ChatContextResultPeekContent(account: item.account, contextResult: item.result, menu: menuItems))
                         }
                     }
@@ -190,7 +203,8 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: {
+                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                let controller = PeekController(presentationData: presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
                 strongSelf.interfaceInteraction?.presentGlobalOverlayController(controller, nil)
@@ -220,7 +234,7 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
         let geoPoint = currentProcessedResults.geoPoint.flatMap { geoPoint -> (Double, Double) in
             return (geoPoint.latitude, geoPoint.longitude)
         }
-        self.loadMoreDisposable.set((requestChatContextResults(account: self.context.account, botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
+        self.loadMoreDisposable.set((self.context.engine.messages.requestChatContextResults(botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
         |> map { results -> ChatContextResultCollection? in
             return results?.results
         }
@@ -303,12 +317,17 @@ final class HorizontalListContextResultsChatInputContextPanelNode: ChatInputCont
             self.listView.transaction(deleteIndices: transition.deletions, insertIndicesAndItems: transition.insertions, updateIndicesAndItems: transition.updates, options: options, updateSizeAndInsets: nil, updateOpaqueState: HorizontalListContextResultsOpaqueState(entryCount: transition.entryCount, hasMore: transition.hasMore), completion: { [weak self] _ in
                 if let strongSelf = self, firstTime {
                     let position = strongSelf.listView.position
-                    strongSelf.listView.isHidden = false
-                    strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + strongSelf.listView.bounds.size.width), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
-                    
-                    strongSelf.separatorNode.isHidden = false
                     let separatorPosition = strongSelf.separatorNode.layer.position
-                    strongSelf.separatorNode.layer.animatePosition(from: CGPoint(x: separatorPosition.x, y: separatorPosition.y + strongSelf.listView.bounds.size.width), to: separatorPosition, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                    
+                    strongSelf.listView.isHidden = false
+                    strongSelf.separatorNode.isHidden = false
+                    
+                    strongSelf.listView.position = CGPoint(x: position.x, y: position.y + strongSelf.listView.bounds.size.width)
+                    strongSelf.separatorNode.position = CGPoint(x: separatorPosition.x, y: separatorPosition.y + strongSelf.listView.bounds.size.width)
+                    ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                        strongSelf.listView.position = position
+                        strongSelf.separatorNode.position = separatorPosition
+                    }
                 }
             })
         }
diff --git a/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift
index b02346b004..840fa30b8d 100644
--- a/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift
+++ b/submodules/TelegramUI/Sources/HorizontalListContextResultsChatInputPanelItem.swift
@@ -352,7 +352,7 @@ final class HorizontalListContextResultsChatInputPanelItemNode: ListViewItemNode
                     if let stickerFile = stickerFile {
                         updateImageSignal = chatMessageSticker(account: item.account, file: stickerFile, small: false, fetched: true)
                     } else {
-                        let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(CGSize(width: fittedImageDimensions.width * 2.0, height: fittedImageDimensions.height * 2.0)), resource: imageResource, progressiveSizes: [])
+                        let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(CGSize(width: fittedImageDimensions.width * 2.0, height: fittedImageDimensions.height * 2.0)), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil)
                         let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [tmpRepresentation], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                         updateImageSignal = chatMessagePhoto(postbox: item.account.postbox, photoReference: .standalone(media: tmpImage), synchronousLoad: true)
                     }
diff --git a/submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift b/submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift
index 3f7d1c7fe6..c8072be6b2 100755
--- a/submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift
+++ b/submodules/TelegramUI/Sources/HorizontalStickerGridItem.swift
@@ -49,9 +49,9 @@ final class HorizontalStickerGridItem: GridItem {
 
 final class HorizontalStickerGridItemNode: GridItemNode {
     private var currentState: (Account, HorizontalStickerGridItem, CGSize)?
-    private let imageNode: TransformImageNode
-    private var animationNode: AnimatedStickerNode?
-    private var placeholderNode: StickerShimmerEffectNode?
+    let imageNode: TransformImageNode
+    private(set) var animationNode: AnimatedStickerNode?
+    private(set) var placeholderNode: StickerShimmerEffectNode?
     
     private let stickerFetchedDisposable = MetaDisposable()
     
diff --git a/submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift b/submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift
index 462ba94af1..0ab47cce87 100755
--- a/submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/HorizontalStickersChatContextPanelNode.swift
@@ -11,6 +11,7 @@ import TelegramUIPreferences
 import MergeLists
 import AccountContext
 import StickerPackPreviewUI
+import ContextUI
 
 final class HorizontalStickersChatContextPanelInteraction {
     var previewedStickerItem: StickerPackItem?
@@ -69,7 +70,7 @@ private struct StickerEntry: Identifiable, Comparable {
         return HorizontalStickerGridItem(account: account, file: self.file, theme: theme, isPreviewed: { item in
             return false//stickersInteraction.previewedStickerItem == item
         }, sendSticker: { file, node, rect in
-            let _ = interfaceInteraction.sendSticker(file, node, rect)
+            let _ = interfaceInteraction.sendSticker(file, true, node, rect)
         })
     }
 }
@@ -174,12 +175,16 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
                     |> deliverOnMainQueue
                     |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                         if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
-                            var menuItems: [PeekControllerMenuItem] = []
+                            var menuItems: [ContextMenuItem] = []
                             menuItems = [
-                                PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { _, _ in
-                                    return controllerInteraction.sendSticker(.standalone(media: item.file), nil, true, itemNode, itemNode.bounds)
-                                }),
-                                PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                    f(.default)
+                                
+                                    let _ = controllerInteraction.sendSticker(.standalone(media: item.file), false, false, nil, true, itemNode, itemNode.bounds)
+                                })),
+                                .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                    
                                     if let strongSelf = self {
                                         if isStarred {
                                             let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -187,9 +192,10 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
                                             let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                         }
                                     }
-                                    return true
-                                }),
-                                PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                })),
+                                .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                
                                     if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
                                         loop: for attribute in item.file.attributes {
                                             switch attribute {
@@ -197,7 +203,7 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
                                                 if let packReference = packReference {
                                                     let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
                                                         if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
-                                                            return controllerInteraction.sendSticker(file, nil, true, sourceNode, sourceRect)
+                                                            return controllerInteraction.sendSticker(file, false, false, nil, true, sourceNode, sourceRect)
                                                         } else {
                                                             return false
                                                         }
@@ -211,11 +217,8 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
                                                 break
                                             }
                                         }
-                                        return true
                                     }
-                                    return true
-                                }),
-                                PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
+                                }))
                             ]
                             return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                         } else {
@@ -227,7 +230,8 @@ final class HorizontalStickersChatContextPanelNode: ChatInputContextPanelNode {
             return nil
             }, present: { [weak self] content, sourceNode in
                 if let strongSelf = self {
-                    let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: {
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    let controller = PeekController(presentationData: presentationData, content: content, sourceNode: {
                         return sourceNode
                     })
                     strongSelf.interfaceInteraction?.presentGlobalOverlayController(controller, nil)
diff --git a/submodules/TelegramUI/Sources/InChatPrefetchManager.swift b/submodules/TelegramUI/Sources/InChatPrefetchManager.swift
index ad8384ef9e..0c22fb6851 100644
--- a/submodules/TelegramUI/Sources/InChatPrefetchManager.swift
+++ b/submodules/TelegramUI/Sources/InChatPrefetchManager.swift
@@ -6,6 +6,7 @@ import SyncCore
 import TelegramUIPreferences
 import AccountContext
 import PhotoResources
+import UniversalMediaPlayer
 
 private final class PrefetchMediaContext {
     let fetchDisposable = MetaDisposable()
diff --git a/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift b/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift
index 817dcfd341..83151604e4 100644
--- a/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift
+++ b/submodules/TelegramUI/Sources/InlineReactionSearchPanel.swift
@@ -10,6 +10,7 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import AccountContext
 import StickerPackPreviewUI
+import ContextUI
 
 private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollViewDelegate {
     private final class DisplayItem {
@@ -38,7 +39,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
     
     var previewedStickerItem: StickerPackItem?
     
-    var updateBackgroundOffset: ((CGFloat, ContainedViewLayoutTransition) -> Void)?
+    var updateBackgroundOffset: ((CGFloat, Bool, ContainedViewLayoutTransition) -> Void)?
     var sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Void)?
     
     var getControllerInteraction: (() -> ChatControllerInteraction?)?
@@ -88,12 +89,16 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
                     |> deliverOnMainQueue
                     |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                         if let strongSelf = self, let controllerInteraction = strongSelf.getControllerInteraction?() {
-                            var menuItems: [PeekControllerMenuItem] = []
+                            var menuItems: [ContextMenuItem] = []
                             menuItems = [
-                                PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: { _, _ in
-                                    return controllerInteraction.sendSticker(.standalone(media: item.file), nil, true, itemNode, itemNode.bounds)
-                                }),
-                                PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                f(.default)
+                                
+                                let _ = controllerInteraction.sendSticker(.standalone(media: item.file), false, false, nil, true, itemNode, itemNode.bounds)
+                                })),
+                                .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                    
                                     if let strongSelf = self {
                                         if isStarred {
                                             let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -101,9 +106,10 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
                                             let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                         }
                                     }
-                                    return true
-                                }),
-                                PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                })),
+                                .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                    f(.default)
+                                
                                     if let strongSelf = self, let controllerInteraction = strongSelf.getControllerInteraction?() {
                                         loop: for attribute in item.file.attributes {
                                             switch attribute {
@@ -111,7 +117,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
                                                 if let packReference = packReference {
                                                     let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
                                                         if let strongSelf = self, let controllerInteraction = strongSelf.getControllerInteraction?() {
-                                                            return controllerInteraction.sendSticker(file, nil, true, sourceNode, sourceRect)
+                                                            return controllerInteraction.sendSticker(file, false, false, nil, true, sourceNode, sourceRect)
                                                         } else {
                                                             return false
                                                         }
@@ -125,12 +131,8 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
                                                 break
                                             }
                                         }
-                                        return true
                                     }
-                                    return true
-                                }),
-                                PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
-                            ]
+                            }))]
                             return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                         } else {
                             return nil
@@ -141,7 +143,8 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
             return nil
             }, present: { [weak self] content, sourceNode in
                 if let strongSelf = self {
-                    let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: {
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    let controller = PeekController(presentationData: presentationData, content: content, sourceNode: {
                         return sourceNode
                     })
                     strongSelf.getControllerInteraction?()?.presentGlobalOverlayController(controller, nil)
@@ -172,13 +175,13 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if !self.ignoreScrolling {
             self.updateVisibleItems(synchronous: false)
-            self.updateBackground(transition: .immediate)
+            self.updateBackground(animateIn: false, transition: .immediate)
         }
     }
     
-    private func updateBackground(transition: ContainedViewLayoutTransition) {
+    private func updateBackground(animateIn: Bool, transition: ContainedViewLayoutTransition) {
         if let topInset = self.topInset {
-            self.updateBackgroundOffset?(max(0.0, -self.scrollNode.view.contentOffset.y + topInset), transition)
+            self.updateBackgroundOffset?(max(0.0, -self.scrollNode.view.contentOffset.y + topInset), animateIn, transition)
         }
     }
     
@@ -225,7 +228,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
             let currentBackgroundOffset = max(0.0, -self.scrollNode.view.contentOffset.y + topInset)
             if abs(currentBackgroundOffset - previousBackgroundOffset) > .ulpOfOne {
                 transition.animateOffsetAdditive(node: self.scrollNode, offset: currentBackgroundOffset - previousBackgroundOffset)
-                self.updateBackground(transition: transition)
+                self.updateBackground(animateIn: false, transition: transition)
             }
         } else {
             self.animateInOnLayout = true
@@ -244,7 +247,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
         self.validLayout = size
         
         if self.animateInOnLayout {
-            self.updateBackgroundOffset?(size.height, .immediate)
+            self.updateBackgroundOffset?(size.height, false, .immediate)
         }
         
         var synchronous = false
@@ -262,12 +265,18 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
         
         var backgroundTransition = transition
         
+        var animateIn = false
         if self.animateInOnLayout {
+            animateIn = true
             self.animateInOnLayout = false
             backgroundTransition = .animated(duration: 0.3, curve: .spring)
             if let topInset = self.topInset {
                 let currentBackgroundOffset = max(0.0, -self.scrollNode.view.contentOffset.y + topInset)
-                backgroundTransition.animateOffsetAdditive(node: self.scrollNode, offset: currentBackgroundOffset - size.height)
+                let bounds = self.scrollNode.bounds
+                self.scrollNode.bounds = bounds.offsetBy(dx: 0.0, dy: currentBackgroundOffset - size.height)
+                backgroundTransition.animateView {
+                    self.scrollNode.bounds = bounds
+                }
             }
         } else {
             if let previousBackgroundOffset = previousBackgroundOffset, let topInset = self.topInset {
@@ -278,7 +287,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
             }
         }
         
-        self.updateBackground(transition: backgroundTransition)
+        self.updateBackground(animateIn: animateIn, transition: backgroundTransition)
     }
     
     private func updateItemsLayout(width: CGFloat) {
@@ -376,7 +385,7 @@ private final class InlineReactionSearchStickersNode: ASDisplayNode, UIScrollVie
     }
 }
 
-private let backroundDiameter: CGFloat = 20.0
+private let backgroundDiameter: CGFloat = 20.0
 private let shadowBlur: CGFloat = 6.0
 
 final class InlineReactionSearchPanel: ChatInputContextPanelNode {
@@ -399,8 +408,8 @@ final class InlineReactionSearchPanel: ChatInputContextPanelNode {
         
         self.backgroundNode = ASDisplayNode()
         
-        let shadowImage = generateImage(CGSize(width: backroundDiameter + shadowBlur * 2.0, height: floor(backroundDiameter / 2.0 + shadowBlur)), rotatedContext: { size, context in
-            let diameter = backroundDiameter
+        let shadowImage = generateImage(CGSize(width: backgroundDiameter + shadowBlur * 2.0, height: floor(backgroundDiameter / 2.0 + shadowBlur)), rotatedContext: { size, context in
+            let diameter = backgroundDiameter
             let shadow = UIColor(white: 0.0, alpha: 0.5)
             context.clear(CGRect(origin: CGPoint(), size: size))
             
@@ -419,7 +428,7 @@ final class InlineReactionSearchPanel: ChatInputContextPanelNode {
             
             context.setFillColor(theme.list.plainBackgroundColor.cgColor)
             context.fillEllipse(in: CGRect(origin: CGPoint(x: shadowBlur, y: shadowBlur), size: CGSize(width: diameter, height: diameter)))
-        })?.stretchableImage(withLeftCapWidth: Int(backroundDiameter / 2.0 + shadowBlur), topCapHeight: 0)
+        })?.stretchableImage(withLeftCapWidth: Int(backgroundDiameter / 2.0 + shadowBlur), topCapHeight: 0)
         
         self.backgroundTopLeftNode = ASImageNode()
         self.backgroundTopLeftNode.image = shadowImage
@@ -457,23 +466,28 @@ final class InlineReactionSearchPanel: ChatInputContextPanelNode {
             return self?.controllerInteraction
         }
         
-        self.stickersNode.updateBackgroundOffset = { [weak self] offset, transition in
+        self.stickersNode.updateBackgroundOffset = { [weak self] offset, animateIn, transition in
             guard let strongSelf = self, let (_, _) = strongSelf.validLayout else {
                 return
             }
-            transition.updateFrame(node: strongSelf.backgroundContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: offset), size: CGSize()), beginWithCurrentState: false)
-            
+            if animateIn {
+                transition.animateView {
+                    strongSelf.backgroundContainerNode.frame = CGRect(origin: CGPoint(x: 0.0, y: offset), size: CGSize())
+                }
+            } else {
+                transition.updateFrame(node: strongSelf.backgroundContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: offset), size: CGSize()), beginWithCurrentState: false)
+            }
             let cornersTransitionDistance: CGFloat = 20.0
             let cornersTransition: CGFloat = max(0.0, min(1.0, (cornersTransitionDistance - offset) / cornersTransitionDistance))
-            transition.updateSublayerTransformScaleAndOffset(node: strongSelf.backgroundTopLeftContainerNode, scale: 1.0, offset: CGPoint(x: -cornersTransition * backroundDiameter, y: 0.0), beginWithCurrentState: true)
-            transition.updateSublayerTransformScaleAndOffset(node: strongSelf.backgroundTopRightContainerNode, scale: 1.0, offset: CGPoint(x: cornersTransition * backroundDiameter, y: 0.0), beginWithCurrentState: true)
+            transition.updateSublayerTransformScaleAndOffset(node: strongSelf.backgroundTopLeftContainerNode, scale: 1.0, offset: CGPoint(x: -cornersTransition * backgroundDiameter, y: 0.0), beginWithCurrentState: true)
+            transition.updateSublayerTransformScaleAndOffset(node: strongSelf.backgroundTopRightContainerNode, scale: 1.0, offset: CGPoint(x: cornersTransition * backgroundDiameter, y: 0.0), beginWithCurrentState: true)
         }
         
         self.stickersNode.sendSticker = { [weak self] file, node, rect in
             guard let strongSelf = self else {
                 return
             }
-            let _ = strongSelf.controllerInteraction?.sendSticker(file, strongSelf.query, true, node, rect)
+            let _ = strongSelf.controllerInteraction?.sendSticker(file, false, false, strongSelf.query, true, node, rect)
         }
         
         self.view.disablesInteractiveTransitionGestureRecognizer = true
@@ -495,13 +509,13 @@ final class InlineReactionSearchPanel: ChatInputContextPanelNode {
         
         transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: size))
         
-        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: backroundDiameter / 2.0), size: size))
+        transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: backgroundDiameter / 2.0), size: size))
         
-        transition.updateFrame(node: self.backgroundTopLeftContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -shadowBlur), size: CGSize(width: size.width / 2.0, height: backroundDiameter / 2.0 + shadowBlur)))
-        transition.updateFrame(node: self.backgroundTopRightContainerNode, frame: CGRect(origin: CGPoint(x: size.width / 2.0, y: -shadowBlur), size: CGSize(width: size.width - size.width / 2.0, height: backroundDiameter / 2.0 + shadowBlur)))
+        transition.updateFrame(node: self.backgroundTopLeftContainerNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -shadowBlur), size: CGSize(width: size.width / 2.0, height: backgroundDiameter / 2.0 + shadowBlur)))
+        transition.updateFrame(node: self.backgroundTopRightContainerNode, frame: CGRect(origin: CGPoint(x: size.width / 2.0, y: -shadowBlur), size: CGSize(width: size.width - size.width / 2.0, height: backgroundDiameter / 2.0 + shadowBlur)))
         
-        transition.updateFrame(node: self.backgroundTopLeftNode, frame: CGRect(origin: CGPoint(x: -shadowBlur, y: 0.0), size: CGSize(width: size.width + shadowBlur * 2.0, height: backroundDiameter / 2.0 + shadowBlur)))
-        transition.updateFrame(node: self.backgroundTopRightNode, frame: CGRect(origin: CGPoint(x: -shadowBlur - size.width / 2.0, y: 0.0), size: CGSize(width: size.width + shadowBlur * 2.0, height: backroundDiameter / 2.0 + shadowBlur)))
+        transition.updateFrame(node: self.backgroundTopLeftNode, frame: CGRect(origin: CGPoint(x: -shadowBlur, y: 0.0), size: CGSize(width: size.width + shadowBlur * 2.0, height: backgroundDiameter / 2.0 + shadowBlur)))
+        transition.updateFrame(node: self.backgroundTopRightNode, frame: CGRect(origin: CGPoint(x: -shadowBlur - size.width / 2.0, y: 0.0), size: CGSize(width: size.width + shadowBlur * 2.0, height: backgroundDiameter / 2.0 + shadowBlur)))
         
         transition.updateFrame(node: self.stickersNode, frame: CGRect(origin: CGPoint(x: leftInset, y: 0.0), size: CGSize(width: size.width - leftInset * 2.0, height: size.height)))
         self.stickersNode.update(size: CGSize(width: size.width - leftInset * 2.0, height: size.height), transition: transition)
diff --git a/submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift b/submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift
index fdf26c0233..ff02ac1547 100644
--- a/submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift
+++ b/submodules/TelegramUI/Sources/InstantVideoRadialStatusNode.swift
@@ -93,7 +93,7 @@ final class InstantVideoRadialStatusNode: ASDisplayNode {
             
             let lineWidth: CGFloat = 4.0
             
-            let pathDiameter = bounds.size.width - lineWidth
+            let pathDiameter = bounds.size.width - lineWidth - 8.0
             
             let path = UIBezierPath(arcCenter: CGPoint(x: bounds.size.width / 2.0, y: bounds.size.height / 2.0), radius: pathDiameter / 2.0, startAngle: startAngle, endAngle: endAngle, clockwise:true)
             path.lineWidth = lineWidth
diff --git a/submodules/TelegramUI/Sources/LegacyCache.swift b/submodules/TelegramUI/Sources/LegacyCache.swift
deleted file mode 100644
index 947b6e4b55..0000000000
--- a/submodules/TelegramUI/Sources/LegacyCache.swift
+++ /dev/null
@@ -1,14 +0,0 @@
-import Foundation
-import LegacyComponents
-
-public final class LegacyCache {
-    private let impl: TGCache
-    
-    public init(path: String) {
-        self.impl = TGCache(cachesPath: path)
-    }
-    
-    public func path(forCachedData id: String) -> String? {
-        return self.impl.path(forCachedData: id)
-    }
-}
diff --git a/submodules/TelegramUI/Sources/LegacyCamera.swift b/submodules/TelegramUI/Sources/LegacyCamera.swift
index c253078988..6a92bb8726 100644
--- a/submodules/TelegramUI/Sources/LegacyCamera.swift
+++ b/submodules/TelegramUI/Sources/LegacyCamera.swift
@@ -123,7 +123,10 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, chatLocation: Ch
     
     controller.finishedWithResults = { [weak menuController, weak legacyController] overlayController, selectionContext, editingContext, currentItem, silentPosting, scheduleTime in
         if let selectionContext = selectionContext, let editingContext = editingContext {
-            let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedPhotos && !isSecretChat, saveEditedPhotos: saveCapturedPhotos && !isSecretChat, descriptionGenerator: legacyAssetPickerItemGenerator())
+            let nativeGenerator = legacyAssetPickerItemGenerator()
+            let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedPhotos && !isSecretChat, saveEditedPhotos: saveCapturedPhotos && !isSecretChat, descriptionGenerator: { _1, _2, _3, _4 in
+                nativeGenerator(_1, _2, _3, _4, nil)
+            })
             sendMessagesWithSignals(signals, silentPosting, scheduleTime)
         }
         
@@ -139,7 +142,7 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, chatLocation: Ch
             if let timer = timer {
                 description["timer"] = timer
             }
-            if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil) {
+            if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil, nil) {
                 sendMessagesWithSignals([SSignal.single(item)], false, 0)
             }
         }
@@ -164,7 +167,7 @@ func presentedLegacyCamera(context: AccountContext, peer: Peer, chatLocation: Ch
             if let timer = timer {
                 description["timer"] = timer
             }
-            if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil) {
+            if let item = legacyAssetPickerItemGenerator()(description, caption, entities, nil, nil) {
                 sendMessagesWithSignals([SSignal.single(item)], false, 0)
             }
         }
@@ -217,16 +220,19 @@ func presentedLegacyShortcutCamera(context: AccountContext, saveCapturedMedia: B
     
     controller.finishedWithResults = { [weak controller, weak parentController, weak legacyController] overlayController, selectionContext, editingContext, currentItem, _, _ in
         if let selectionContext = selectionContext, let editingContext = editingContext {
-            let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedMedia, saveEditedPhotos: saveEditedPhotos, descriptionGenerator: legacyAssetPickerItemGenerator())
+            let nativeGenerator = legacyAssetPickerItemGenerator()
+            let signals = TGCameraController.resultSignals(for: selectionContext, editingContext: editingContext, currentItem: currentItem, storeAssets: saveCapturedMedia, saveEditedPhotos: saveEditedPhotos, descriptionGenerator: { _1, _2, _3, _4 in
+                nativeGenerator(_1, _2, _3, _4, nil)
+            })
             if let parentController = parentController {
                 parentController.present(ShareController(context: context, subject: .fromExternal({ peerIds, text, account in
                     return legacyAssetPickerEnqueueMessages(account: account, signals: signals!)
-                    |> `catch` { _ -> Signal<[EnqueueMessage], NoError> in
+                    |> `catch` { _ -> Signal<[LegacyAssetPickerEnqueueMessage], NoError> in
                         return .single([])
                     }
                     |> mapToSignal { messages -> Signal<ShareControllerExternalStatus, NoError> in
                         let resultSignals = peerIds.map({ peerId in
-                            return enqueueMessages(account: account, peerId: peerId, messages: messages)
+                            return enqueueMessages(account: account, peerId: peerId, messages: messages.map { $0.message })
                             |> mapToSignal { _ -> Signal<ShareControllerExternalStatus, NoError> in
                                 return .complete()
                             }
diff --git a/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift b/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
index 85d02cb3e2..ce69f1bad7 100644
--- a/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
+++ b/submodules/TelegramUI/Sources/LegacyInstantVideoController.swift
@@ -35,8 +35,9 @@ final class InstantVideoController: LegacyController, StandalonePresentableContr
     private let micLevelValue = ValuePromise<Float>(0.0)
     private let durationValue = ValuePromise<TimeInterval>(0.0)
     let audioStatus: InstantVideoControllerRecordingStatus
-    
-    private var dismissedVideo = false
+
+    private var completed = false
+    private var dismissed = false
     
     override init(presentation: LegacyControllerPresentation, theme: PresentationTheme?, strings: PresentationStrings? = nil, initialLayout: ContainerViewLayout? = nil) {
         self.audioStatus = InstantVideoControllerRecordingStatus(micLevel: self.micLevelValue.get(), duration: self.durationValue.get())
@@ -53,6 +54,9 @@ final class InstantVideoController: LegacyController, StandalonePresentableContr
     func bindCaptureController(_ captureController: TGVideoMessageCaptureController?) {
         self.captureController = captureController
         if let captureController = captureController {
+            captureController.view.disablesInteractiveKeyboardGestureRecognizer = true
+            captureController.view.disablesInteractiveTransitionGestureRecognizer = true
+
             captureController.micLevel = { [weak self] (level: CGFloat) -> Void in
                 self?.micLevelValue.set(Float(level))
             }
@@ -61,8 +65,8 @@ final class InstantVideoController: LegacyController, StandalonePresentableContr
             }
             captureController.onDismiss = { [weak self] _, isCancelled in
                 guard let strongSelf = self else { return }
-                if !strongSelf.dismissedVideo {
-                    self?.dismissedVideo = true
+                if !strongSelf.dismissed {
+                    self?.dismissed = true
                     self?.onDismiss?(isCancelled)
                 }
             }
@@ -73,18 +77,33 @@ final class InstantVideoController: LegacyController, StandalonePresentableContr
     }
     
     func dismissVideo() {
-        if let captureController = self.captureController, !self.dismissedVideo {
-            self.dismissedVideo = true
-            captureController.dismiss()
+        if let captureController = self.captureController, !self.dismissed {
+            self.dismissed = true
+            captureController.dismiss(true)
         }
     }
+
+    func extractVideoSnapshot() -> UIView? {
+        self.captureController?.extractVideoContent()
+    }
+
+    func hideVideoSnapshot() {
+        self.captureController?.hideVideoContent()
+    }
     
     func completeVideo() {
-        if let captureController = self.captureController, !self.dismissedVideo {
-            self.dismissedVideo = true
+        if let captureController = self.captureController, !self.completed {
+            self.completed = true
             captureController.complete()
         }
     }
+
+    func dismissAnimated() {
+        if let captureController = self.captureController, !self.dismissed {
+            self.dismissed = true
+            captureController.dismiss(false)
+        }
+    }
     
     func stopVideo() -> Bool {
         if let captureController = self.captureController {
@@ -108,10 +127,10 @@ final class InstantVideoController: LegacyController, StandalonePresentableContr
 
 func legacyInputMicPalette(from theme: PresentationTheme) -> TGModernConversationInputMicPallete {
     let inputPanelTheme = theme.chat.inputPanel
-    return TGModernConversationInputMicPallete(dark: theme.overallDarkAppearance, buttonColor: inputPanelTheme.actionControlFillColor, iconColor: inputPanelTheme.actionControlForegroundColor, backgroundColor: inputPanelTheme.panelBackgroundColor, borderColor: inputPanelTheme.panelSeparatorColor, lock: inputPanelTheme.panelControlAccentColor, textColor: inputPanelTheme.primaryTextColor, secondaryTextColor: inputPanelTheme.secondaryTextColor, recording: inputPanelTheme.mediaRecordingDotColor)
+    return TGModernConversationInputMicPallete(dark: theme.overallDarkAppearance, buttonColor: inputPanelTheme.actionControlFillColor, iconColor: inputPanelTheme.actionControlForegroundColor, backgroundColor: theme.rootController.navigationBar.opaqueBackgroundColor, borderColor: inputPanelTheme.panelSeparatorColor, lock: inputPanelTheme.panelControlAccentColor, textColor: inputPanelTheme.primaryTextColor, secondaryTextColor: inputPanelTheme.secondaryTextColor, recording: inputPanelTheme.mediaRecordingDotColor)
 }
 
-func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect, context: AccountContext, peerId: PeerId, slowmodeState: ChatSlowmodeState?, hasSchedule: Bool, send: @escaping (EnqueueMessage) -> Void, displaySlowmodeTooltip: @escaping (ASDisplayNode, CGRect) -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void) -> InstantVideoController {
+func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect, context: AccountContext, peerId: PeerId, slowmodeState: ChatSlowmodeState?, hasSchedule: Bool, send: @escaping (InstantVideoController, EnqueueMessage?) -> Void, displaySlowmodeTooltip: @escaping (ASDisplayNode, CGRect) -> Void, presentSchedulePicker: @escaping (@escaping (Int32) -> Void) -> Void) -> InstantVideoController {
     let isSecretChat = peerId.namespace == Namespaces.Peer.SecretChat
     
     let legacyController = InstantVideoController(presentation: .custom, theme: theme)
@@ -125,7 +144,7 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
             legacyController.view.disablesInteractiveTransitionGestureRecognizer = true
             var uploadInterface: LegacyLiveUploadInterface?
             if peerId.namespace != Namespaces.Peer.SecretChat {
-                uploadInterface = LegacyLiveUploadInterface(account: context.account)
+                uploadInterface = LegacyLiveUploadInterface(context: context)
             }
             
             var slowmodeValidUntil: Int32 = 0
@@ -147,8 +166,13 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
                     done?(time)
                 }
             }
-            controller.finishedWithVideo = { videoUrl, previewImage, _, duration, dimensions, liveUploadData, adjustments, isSilent, scheduleTimestamp in
+            controller.finishedWithVideo = { [weak legacyController] videoUrl, previewImage, _, duration, dimensions, liveUploadData, adjustments, isSilent, scheduleTimestamp in
+                guard let legacyController = legacyController else {
+                    return
+                }
+
                 guard let videoUrl = videoUrl else {
+                    send(legacyController, nil)
                     return
                 }
                 
@@ -157,12 +181,12 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
                 
                 var previewRepresentations: [TelegramMediaImageRepresentation] = []
                 if let previewImage = previewImage {
-                    let resource = LocalFileMediaResource(fileId: arc4random64())
+                    let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                     let thumbnailSize = finalDimensions.aspectFitted(CGSize(width: 320.0, height: 320.0))
                     let thumbnailImage = TGScaleImageToPixelSize(previewImage, thumbnailSize)!
                     if let thumbnailData = thumbnailImage.jpegData(compressionQuality: 0.4) {
                         context.account.postbox.mediaBox.storeResourceData(resource.id, data: thumbnailData)
-                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: []))
+                        previewRepresentations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailSize), resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                     }
                 }
                 
@@ -188,7 +212,7 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
                     resource = LocalFileMediaResource(fileId: liveUploadData.id)
                     context.account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                 } else {
-                    resource = LocalFileVideoMediaResource(randomId: arc4random64(), path: videoUrl.path, adjustments: resourceAdjustments)
+                    resource = LocalFileVideoMediaResource(randomId: Int64.random(in: Int64.min ... Int64.max), path: videoUrl.path, adjustments: resourceAdjustments)
                 }
                 
                 if let previewImage = previewImage {
@@ -197,8 +221,8 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
                     }
                 }
                 
-                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: arc4random64()), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.FileName(fileName: "video.mp4"), .Video(duration: Int(finalDuration), size: PixelDimensions(finalDimensions), flags: [.instantRoundVideo])])
-                var message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil)
+                let media = TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: Int64.random(in: Int64.min ... Int64.max)), partialReference: nil, resource: resource, previewRepresentations: previewRepresentations, videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.FileName(fileName: "video.mp4"), .Video(duration: Int(finalDuration), size: PixelDimensions(finalDimensions), flags: [.instantRoundVideo])])
+                var message: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                 
                 let scheduleTime: Int32? = scheduleTimestamp > 0 ? scheduleTimestamp : nil
                 
@@ -220,7 +244,7 @@ func legacyInstantVideoController(theme: PresentationTheme, panelFrame: CGRect,
                     return attributes
                 }
                 
-                send(message)
+                send(legacyController, message)
             }
             controller.didDismiss = { [weak legacyController] in
                 if let legacyController = legacyController {
diff --git a/submodules/TelegramUI/Sources/ManagedAudioRecorder.swift b/submodules/TelegramUI/Sources/ManagedAudioRecorder.swift
index 58c481129a..2bbd55a7a9 100644
--- a/submodules/TelegramUI/Sources/ManagedAudioRecorder.swift
+++ b/submodules/TelegramUI/Sources/ManagedAudioRecorder.swift
@@ -136,7 +136,7 @@ private func rendererInputProc(refCon: UnsafeMutableRawPointer, ioActionFlags: U
 }
 
 private let beginToneData: TonePlayerData? = {
-    guard let url = Bundle.main.url(forResource: "begin_record", withExtension: "caf") else {
+    guard let url = Bundle.main.url(forResource: "begin_record", withExtension: "mp3") else {
         return nil
     }
     return loadTonePlayerData(path: url.path)
diff --git a/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift b/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
index 40b9492a53..6fb6235cb3 100644
--- a/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
+++ b/submodules/TelegramUI/Sources/ManagedDiceAnimationNode.swift
@@ -137,7 +137,7 @@ final class ManagedDiceAnimationNode: ManagedAnimationNode, GenericAnimatedStick
             let appConfiguration: AppConfiguration = preferencesView.values[PreferencesKeys.appConfiguration] as? AppConfiguration ?? .defaultValue
             return InteractiveEmojiConfiguration.with(appConfiguration: appConfiguration)
         })
-        self.emojis.set(loadedStickerPack(postbox: context.account.postbox, network: context.account.network, reference: .dice(emoji), forceActualized: false)
+        self.emojis.set(context.engine.stickers.loadedStickerPack(reference: .dice(emoji), forceActualized: false)
         |> mapToSignal { stickerPack -> Signal<[TelegramMediaFile], NoError> in
             switch stickerPack {
                 case let .result(_, items, _):
@@ -206,4 +206,11 @@ final class ManagedDiceAnimationNode: ManagedAnimationNode, GenericAnimatedStick
     
     func setOverlayColor(_ color: UIColor?, animated: Bool) {
     }
+
+    func setFrameIndex(_ frameIndex: Int) {
+    }
+
+    var currentFrameIndex: Int {
+        return 0
+    }
 }
diff --git a/submodules/TelegramUI/Sources/MediaManager.swift b/submodules/TelegramUI/Sources/MediaManager.swift
index 717f765e27..3a1d3e1b1f 100644
--- a/submodules/TelegramUI/Sources/MediaManager.swift
+++ b/submodules/TelegramUI/Sources/MediaManager.swift
@@ -417,7 +417,7 @@ public final class MediaManagerImpl: NSObject, MediaManager {
             if let (account, stateOrLoading, type) = accountStateAndType {
                 switch type {
                     case .music:
-                        minimumStoreDuration = 15.0 * 60.0
+                        minimumStoreDuration = 10.0 * 60.0
                     case .voice:
                         minimumStoreDuration = 5.0 * 60.0
                     case .file:
diff --git a/submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift
index 09d87b239e..1e908b3475 100644
--- a/submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/MentionChatInputContextPanelNode.swift
@@ -165,7 +165,7 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode {
             }
         }, removeRequested: { [weak self] peerId in
             if let strongSelf = self {
-                let _ = removeRecentlyUsedInlineBot(account: strongSelf.context.account, peerId: peerId).start()
+                let _ = strongSelf.context.engine.peers.removeRecentlyUsedInlineBot(peerId: peerId).start()
                 
                 strongSelf.revealedPeerId = nil
                 strongSelf.currentResults = strongSelf.currentResults.filter { $0.id != peerId }
@@ -217,7 +217,10 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode {
                     
                     if let topItemOffset = topItemOffset {
                         let position = strongSelf.listView.layer.position
-                        strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
                     }
                 }
             })
@@ -284,4 +287,14 @@ final class MentionChatInputContextPanelNode: ChatInputContextPanelNode {
         let listViewFrame = self.listView.frame
         return self.listView.hitTest(CGPoint(x: point.x - listViewFrame.minX, y: point.y - listViewFrame.minY), with: event)
     }
+    
+    override var topItemFrame: CGRect? {
+        var topItemFrame: CGRect?
+        self.listView.forEachItemNode { itemNode in
+            if topItemFrame == nil {
+                topItemFrame = itemNode.frame
+            }
+        }
+        return topItemFrame
+    }
 }
diff --git a/submodules/TelegramUI/Sources/NavigateToChatController.swift b/submodules/TelegramUI/Sources/NavigateToChatController.swift
index 4f6e15974f..f464fc7811 100644
--- a/submodules/TelegramUI/Sources/NavigateToChatController.swift
+++ b/submodules/TelegramUI/Sources/NavigateToChatController.swift
@@ -20,10 +20,10 @@ public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParam
                 if let updateTextInputState = params.updateTextInputState {
                     controller.updateTextInputState(updateTextInputState)
                 }
-                if let subject = params.subject, case let .message(messageId, _) = subject {
+                if let subject = params.subject, case let .message(messageId, _, timecode) = subject {
                     let navigationController = params.navigationController
                     let animated = params.animated
-                    controller.navigateToMessage(messageLocation: .id(messageId), animated: isFirst, completion: { [weak navigationController, weak controller] in
+                    controller.navigateToMessage(messageLocation: .id(messageId, timecode), animated: isFirst, completion: { [weak navigationController, weak controller] in
                         if let navigationController = navigationController, let controller = controller {
                             let _ = navigationController.popToViewController(controller, animated: animated)
                         }
@@ -71,7 +71,7 @@ public func navigateToChatControllerImpl(_ params: NavigateToChatControllerParam
                 })
             }
         } else {
-            controller = ChatControllerImpl(context: params.context, chatLocation: params.chatLocation, chatLocationContextHolder: params.chatLocationContextHolder, subject: params.subject, botStart: params.botStart, peekData: params.peekData, peerNearbyData: params.peerNearbyData, greetingData: params.greetingData)
+            controller = ChatControllerImpl(context: params.context, chatLocation: params.chatLocation, chatLocationContextHolder: params.chatLocationContextHolder, subject: params.subject, botStart: params.botStart, peekData: params.peekData, peerNearbyData: params.peerNearbyData)
         }
         controller.purposefulAction = params.purposefulAction
         if let search = params.activateMessageSearch {
diff --git a/submodules/TelegramUI/Sources/NotificationContentContext.swift b/submodules/TelegramUI/Sources/NotificationContentContext.swift
index d09f5968b0..e2e5e653f5 100644
--- a/submodules/TelegramUI/Sources/NotificationContentContext.swift
+++ b/submodules/TelegramUI/Sources/NotificationContentContext.swift
@@ -32,27 +32,8 @@ private func setupSharedLogger(rootPath: String, path: String) {
     }
 }
 
-private func parseFileLocationResource(_ dict: [AnyHashable: Any]) -> TelegramMediaResource? {
-    guard let datacenterId = dict["datacenterId"] as? Int32 else {
-        return nil
-    }
-    guard let volumeId = dict["volumeId"] as? Int64 else {
-        return nil
-    }
-    guard let localId = dict["localId"] as? Int32 else {
-        return nil
-    }
-    guard let secret = dict["secret"] as? Int64 else {
-        return nil
-    }
-    var fileReference: Data?
-    if let fileReferenceString = dict["fileReference"] as? String {
-        fileReference = dataWithHexString(fileReferenceString)
-    }
-    return CloudFileMediaResource(datacenterId: Int(datacenterId), volumeId: volumeId, localId: localId, secret: secret, size: nil, fileReference: fileReference)
-}
-
 public struct NotificationViewControllerInitializationData {
+    public let appBundleId: String
     public let appGroupPath: String
     public let apiId: Int32
     public let apiHash: String
@@ -61,7 +42,8 @@ public struct NotificationViewControllerInitializationData {
     public let appVersion: String
     public let bundleData: Data?
     
-    public init(appGroupPath: String, apiId: Int32, apiHash: String, languagesCategory: String, encryptionParameters: (Data, Data), appVersion: String, bundleData: Data?) {
+    public init(appBundleId: String, appGroupPath: String, apiId: Int32, apiHash: String, languagesCategory: String, encryptionParameters: (Data, Data), appVersion: String, bundleData: Data?) {
+        self.appBundleId = appBundleId
         self.appGroupPath = appGroupPath
         self.apiId = apiId
         self.apiHash = apiHash
@@ -102,7 +84,7 @@ public final class NotificationViewControllerImpl {
         let rootPath = rootPathForBasePath(self.initializationData.appGroupPath)
         performAppGroupUpgrades(appGroupPath: self.initializationData.appGroupPath, rootPath: rootPath)
         
-        TempBox.initializeShared(basePath: rootPath, processType: "notification-content", launchSpecificId: arc4random64())
+        TempBox.initializeShared(basePath: rootPath, processType: "notification-content", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
         
         let logsPath = rootPath + "/notificationcontent-logs"
         let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
@@ -123,7 +105,7 @@ public final class NotificationViewControllerImpl {
             })
             semaphore.wait()
             
-            let applicationBindings = TelegramApplicationBindings(isMainApp: false, containerPath: self.initializationData.appGroupPath, appSpecificScheme: "tgapp", openUrl: { _ in
+            let applicationBindings = TelegramApplicationBindings(isMainApp: false, appBundleId: self.initializationData.appBundleId, containerPath: self.initializationData.appGroupPath, appSpecificScheme: "tgapp", openUrl: { _ in
             }, openUniversalUrl: { _, completion in
                 completion.completion(false)
                 return
@@ -146,6 +128,7 @@ public final class NotificationViewControllerImpl {
                 return nil
             }, requestSetAlternateIconName: { _, f in
                 f(false)
+            }, forceOrientation: { _ in
             })
             
             let presentationDataPromise = Promise<PresentationData>()
@@ -154,7 +137,7 @@ public final class NotificationViewControllerImpl {
                 return nil
             })
             
-            sharedAccountContext = SharedAccountContextImpl(mainWindow: nil, basePath: rootPath, encryptionParameters: ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: self.initializationData.encryptionParameters.0)!, salt: ValueBoxEncryptionParameters.Salt(data: self.initializationData.encryptionParameters.1)!), accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: NetworkInitializationArguments(apiId: self.initializationData.apiId, apiHash: self.initializationData.apiHash, languagesCategory: self.initializationData.languagesCategory, appVersion: self.initializationData.appVersion, voipMaxLayer: 0, voipVersions: [], appData: .single(self.initializationData.bundleData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider()), rootPath: rootPath, legacyBasePath: nil, legacyCache: nil, apsNotificationToken: .never(), voipNotificationToken: .never(), setNotificationCall: { _ in }, navigateToChat: { _, _, _ in })
+            sharedAccountContext = SharedAccountContextImpl(mainWindow: nil, sharedContainerPath: self.initializationData.appGroupPath, basePath: rootPath, encryptionParameters: ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: self.initializationData.encryptionParameters.0)!, salt: ValueBoxEncryptionParameters.Salt(data: self.initializationData.encryptionParameters.1)!), accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: NetworkInitializationArguments(apiId: self.initializationData.apiId, apiHash: self.initializationData.apiHash, languagesCategory: self.initializationData.languagesCategory, appVersion: self.initializationData.appVersion, voipMaxLayer: 0, voipVersions: [], appData: .single(self.initializationData.bundleData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider()), rootPath: rootPath, legacyBasePath: nil, apsNotificationToken: .never(), voipNotificationToken: .never(), setNotificationCall: { _ in }, navigateToChat: { _, _, _ in })
             
             presentationDataPromise.set(sharedAccountContext!.presentationData)
         }
diff --git a/submodules/TelegramUI/Sources/OpenChatMessage.swift b/submodules/TelegramUI/Sources/OpenChatMessage.swift
index 80e2087933..7d9a6c640d 100644
--- a/submodules/TelegramUI/Sources/OpenChatMessage.swift
+++ b/submodules/TelegramUI/Sources/OpenChatMessage.swift
@@ -67,7 +67,7 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool {
                 params.dismissInput()
                 
                 let controllerParams = LocationViewParams(sendLiveLocation: { location in
-                    let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil)
+                    let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
                     params.enqueueMessage(outMessage)
                 }, stopLiveLocation: { messageId in
                     params.context.liveLocationManager?.cancelLiveLocation(peerId: messageId?.peerId ?? params.message.id.peerId)
@@ -92,13 +92,13 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool {
                     }
                     switch action {
                     case .add:
-                        params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: params.context.account), elevatedLayout: true, animateInAsReplacement: animateInAsReplacement, action: { _ in
+                        params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, context: params.context), elevatedLayout: true, animateInAsReplacement: animateInAsReplacement, action: { _ in
                             return true
                         }))
                     case let .remove(positionInList):
-                        params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(info.title).0, undo: true, info: info, topItem: items.first, account: params.context.account), elevatedLayout: true, animateInAsReplacement: animateInAsReplacement, action: { action in
+                        params.navigationController?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_RemovedTitle, text: presentationData.strings.StickerPackActionInfo_RemovedText(info.title).0, undo: true, info: info, topItem: items.first, context: params.context), elevatedLayout: true, animateInAsReplacement: animateInAsReplacement, action: { action in
                             if case .undo = action {
-                                let _ = addStickerPackInteractively(postbox: params.context.account.postbox, info: info, items: items, positionInList: positionInList).start()
+                                let _ = params.context.engine.stickers.addStickerPackInteractively(info: info, items: items, positionInList: positionInList).start()
                             }
                             return true
                         }))
@@ -166,6 +166,9 @@ func openChatMessageImpl(_ params: OpenChatMessageParams) -> Bool {
                 params.dismissInput()
                 let _ = (gallery
                 |> deliverOnMainQueue).start(next: { gallery in
+                    gallery.centralItemUpdated = { messageId in
+                        params.centralItemUpdated?(messageId)
+                    }
                     params.present(gallery, GalleryControllerPresentationArguments(transitionArguments: { messageId, media in
                         let selectedTransitionNode = params.transitionNode(messageId, media)
                         if let selectedTransitionNode = selectedTransitionNode {
@@ -250,17 +253,17 @@ func openChatInstantPage(context: AccountContext, message: Message, sourcePeerTy
 func openChatWallpaper(context: AccountContext, message: Message, present: @escaping (ViewController, Any?) -> Void) {
     for media in message.media {
         if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content {
-            let _ = (context.sharedContext.resolveUrl(account: context.account, url: content.url, skipUrlAuth: true)
+            let _ = (context.sharedContext.resolveUrl(context: context, peerId: nil, url: content.url, skipUrlAuth: true)
             |> deliverOnMainQueue).start(next: { resolvedUrl in
                 if case let .wallpaper(parameter) = resolvedUrl {
                     let source: WallpaperListSource
                     switch parameter {
-                        case let .slug(slug, options, firstColor, secondColor, intensity, rotation):
-                            source = .slug(slug, content.file, options, firstColor, secondColor, intensity, rotation, message)
+                        case let .slug(slug, options, colors, intensity, rotation):
+                            source = .slug(slug, content.file, options, colors, intensity, rotation, message)
                         case let .color(color):
-                            source = .wallpaper(.color(color.argb), nil, nil, nil, nil, nil, message)
-                        case let .gradient(topColor, bottomColor, rotation):
-                            source = .wallpaper(.gradient(topColor.argb, bottomColor.argb, WallpaperSettings(rotation: rotation)), nil, nil, nil, nil, rotation, message)
+                            source = .wallpaper(.color(color.argb), nil, [], nil, nil, message)
+                        case let .gradient(colors, rotation):
+                            source = .wallpaper(.gradient(nil, colors, WallpaperSettings(rotation: rotation)), nil, [], nil, rotation, message)
                     }
                     
                     let controller = WallpaperGalleryController(context: context, source: source)
@@ -274,7 +277,7 @@ func openChatWallpaper(context: AccountContext, message: Message, present: @esca
 func openChatTheme(context: AccountContext, message: Message, pushController: @escaping (ViewController) -> Void, present: @escaping (ViewController, Any?) -> Void) {
     for media in message.media {
         if let webpage = media as? TelegramMediaWebpage, case let .Loaded(content) = webpage.content {
-            let _ = (context.sharedContext.resolveUrl(account: context.account, url: content.url, skipUrlAuth: true)
+            let _ = (context.sharedContext.resolveUrl(context: context, peerId: nil, url: content.url, skipUrlAuth: true)
             |> deliverOnMainQueue).start(next: { resolvedUrl in
                 var file: TelegramMediaFile?
                 var settings: TelegramThemeSettings?
diff --git a/submodules/TelegramUI/Sources/OpenResolvedUrl.swift b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift
index ab9554b03b..b368cf9faf 100644
--- a/submodules/TelegramUI/Sources/OpenResolvedUrl.swift
+++ b/submodules/TelegramUI/Sources/OpenResolvedUrl.swift
@@ -23,6 +23,7 @@ import ShareController
 import ChatInterfaceState
 import TelegramCallsUI
 import UndoUI
+import ImportStickerPackUI
 
 private func defaultNavigationForPeerId(_ peerId: PeerId?, navigation: ChatControllerInteractionNavigateToPeer) -> ChatControllerInteractionNavigateToPeer {
     if case .default = navigation {
@@ -66,18 +67,18 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
                 
                 if payload.isEmpty {
                     if peerId.namespace == Namespaces.Peer.CloudGroup {
-                        let _ = (addGroupMember(account: context.account, peerId: peerId, memberId: botPeerId)
+                        let _ = (context.engine.peers.addGroupMember(peerId: peerId, memberId: botPeerId)
                         |> deliverOnMainQueue).start(completed: {
                             controller?.dismiss()
                         })
                     } else {
-                        let _ = (addChannelMember(account: context.account, peerId: peerId, memberId: botPeerId)
+                        let _ = (context.engine.peers.addChannelMember(peerId: peerId, memberId: botPeerId)
                         |> deliverOnMainQueue).start(completed: {
                             controller?.dismiss()
                         })
                     }
                 } else {
-                    let _ = (requestStartBotInGroup(account: context.account, botPeerId: botPeerId, groupPeerId: peerId, payload: payload)
+                    let _ = (context.engine.messages.requestStartBotInGroup(botPeerId: botPeerId, groupPeerId: peerId, payload: payload)
                     |> deliverOnMainQueue).start(next: { result in
                         if let navigationController = navigationController {
                             context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
@@ -96,8 +97,8 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
             }
             dismissInput()
             navigationController?.pushViewController(controller)
-        case let .channelMessage(peerId, messageId):
-            openPeer(peerId, .chat(textInputState: nil, subject: .message(id: messageId, highlight: true), peekData: nil))
+        case let .channelMessage(peerId, messageId, timecode):
+            openPeer(peerId, .chat(textInputState: nil, subject: .message(id: messageId, highlight: true, timecode: timecode), peekData: nil))
         case let .replyThreadMessage(replyThreadMessage, messageId):
             if let navigationController = navigationController {
                 let _ = ChatControllerImpl.openMessageReplies(context: context, navigationController: navigationController, present: { c, a in
@@ -184,7 +185,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
             let presentationData = context.sharedContext.currentPresentationData.with { $0 }
             let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
             present(controller, nil)
-            let _ = (requestCancelAccountResetData(network: context.account.network, hash: hash)
+            let _ = (context.engine.auth.requestCancelAccountResetData(hash: hash)
             |> deliverOnMainQueue).start(next: { [weak controller] data in
                 controller?.dismiss()
                 present(confirmPhoneNumberCodeController(context: context, phoneNumber: phone, codeData: data), ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
@@ -241,7 +242,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
             
             if let to = to {
                 if to.hasPrefix("@") {
-                    let _ = (resolvePeerByName(account: context.account, name: String(to[to.index(to.startIndex, offsetBy: 1)...]))
+                    let _ = (context.engine.peers.resolvePeerByName(name: String(to[to.index(to.startIndex, offsetBy: 1)...]))
                     |> deliverOnMainQueue).start(next: { peerId in
                         if let peerId = peerId {
                             let _ = (context.account.postbox.loadedPeerWithId(peerId)
@@ -293,30 +294,28 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
             
             let signal: Signal<TelegramWallpaper, GetWallpaperError>
             var options: WallpaperPresentationOptions?
-            var topColor: UIColor?
-            var bottomColor: UIColor?
+            var colors: [UInt32] = []
             var intensity: Int32?
             var rotation: Int32?
             switch parameter {
-                case let .slug(slug, wallpaperOptions, firstColor, secondColor, intensityValue, rotationValue):
+                case let .slug(slug, wallpaperOptions, colorsValue, intensityValue, rotationValue):
                     signal = getWallpaper(network: context.account.network, slug: slug)
                     options = wallpaperOptions
-                    topColor = firstColor
-                    bottomColor = secondColor
+                    colors = colorsValue
                     intensity = intensityValue
                     rotation = rotationValue
                     controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
                     present(controller!, nil)
                 case let .color(color):
                     signal = .single(.color(color.argb))
-                case let .gradient(topColor, bottomColor, rotation):
-                    signal = .single(.gradient(topColor.argb, bottomColor.argb, WallpaperSettings(rotation: rotation)))
+                case let .gradient(colors, rotation):
+                    signal = .single(.gradient(nil, colors, WallpaperSettings(rotation: rotation)))
             }
             
             let _ = (signal
             |> deliverOnMainQueue).start(next: { [weak controller] wallpaper in
                 controller?.dismiss()
-                let galleryController = WallpaperGalleryController(context: context, source: .wallpaper(wallpaper, options, topColor, bottomColor, intensity, rotation, nil))
+                let galleryController = WallpaperGalleryController(context: context, source: .wallpaper(wallpaper, options, colors, intensity, rotation, nil))
                 present(galleryController, nil)
             }, error: { [weak controller] error in
                 controller?.dismiss()
@@ -399,7 +398,7 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
                         navigationController?.pushViewController(previewController)
                     }
                 } else if let settings = dataAndTheme.1 {
-                    if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper) {
+                    if let theme = makePresentationTheme(mediaBox: context.sharedContext.accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper) {
                         let previewController = ThemePreviewController(context: context, previewTheme: theme, source: .theme(dataAndTheme.2))
                         navigationController?.pushViewController(previewController)
                     }
@@ -439,8 +438,8 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
                 case .devices:
                     if let navigationController = navigationController {
                         let activeSessions = deferred { () -> Signal<(ActiveSessionsContext, Int, WebSessionsContext), NoError> in
-                            let activeSessionsContext = ActiveSessionsContext(account: context.account)
-                            let webSessionsContext = WebSessionsContext(account: context.account)
+                            let activeSessionsContext = context.engine.privacy.activeSessions()
+                            let webSessionsContext = context.engine.privacy.webSessions()
                             let otherSessionCount = activeSessionsContext.state
                             |> map { state -> Int in
                                 return state.sessions.filter({ !$0.isCurrent }).count
@@ -480,5 +479,16 @@ func openResolvedUrlImpl(_ resolvedUrl: ResolvedUrl, context: AccountContext, ur
                     }), on: .root, blockInteraction: false, completion: {})
                 }))
             }
+        case .importStickers:
+            dismissInput()
+            if let navigationController = navigationController, let data = UIPasteboard.general.data(forPasteboardType: "org.telegram.third-party.stickerset"), let stickerPack = ImportStickerPack(data: data), !stickerPack.stickers.isEmpty {
+                for controller in navigationController.overlayControllers {
+                    if controller is ImportStickerPackController {
+                        controller.dismiss()
+                    }
+                }
+                let controller = ImportStickerPackController(context: context, stickerPack: stickerPack, parentNavigationController: navigationController)
+                present(controller, nil)
+            }
     }
 }
diff --git a/submodules/TelegramUI/Sources/OpenUrl.swift b/submodules/TelegramUI/Sources/OpenUrl.swift
index dca0401241..106fd25f93 100644
--- a/submodules/TelegramUI/Sources/OpenUrl.swift
+++ b/submodules/TelegramUI/Sources/OpenUrl.swift
@@ -96,7 +96,7 @@ public func parseSecureIdUrl(_ url: URL) -> ParsedSecureIdUrl? {
                         return nil
                     }
                     
-                    return ParsedSecureIdUrl(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: botId), scope: scope, publicKey: publicKey, callbackUrl: callbackUrl, opaquePayload: opaquePayload, opaqueNonce: opaqueNonce)
+                    return ParsedSecureIdUrl(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)), scope: scope, publicKey: publicKey, callbackUrl: callbackUrl, opaquePayload: opaquePayload, opaqueNonce: opaqueNonce)
                 }
             }
         }
@@ -229,7 +229,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
         }
         
         let handleInternalUrl: (String) -> Void = { url in
-            let _ = (context.sharedContext.resolveUrl(account: context.account, url: url, skipUrlAuth: true)
+            let _ = (context.sharedContext.resolveUrl(context: context, peerId: nil, url: url, skipUrlAuth: true)
             |> deliverOnMainQueue).start(next: handleResolvedUrl)
         }
         
@@ -439,7 +439,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
                         }
                         
                         if valid {
-                            if let botId = botId, let scope = scope, let publicKey = publicKey, let callbackUrl = callbackUrl {
+                            if let botId = botId, let scope = scope, let publicKey = publicKey {
                                 if scope.hasPrefix("{") && scope.hasSuffix("}") {
                                     opaquePayload = Data()
                                     if opaqueNonce.isEmpty {
@@ -451,7 +451,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
                                 if case .chat = urlContext {
                                     return
                                 }
-                                let controller = SecureIdAuthController(context: context, mode: .form(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: botId), scope: scope, publicKey: publicKey, callbackUrl: callbackUrl, opaquePayload: opaquePayload, opaqueNonce: opaqueNonce))
+                                let controller = SecureIdAuthController(context: context, mode: .form(peerId: PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(botId)), scope: scope, publicKey: publicKey, callbackUrl: callbackUrl, opaquePayload: opaquePayload, opaqueNonce: opaqueNonce))
                                 
                                 if let navigationController = navigationController {
                                     context.sharedContext.applicationBindings.dismissNativeController()
@@ -478,7 +478,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
                         
                         if let id = id, !id.isEmpty, let idValue = Int32(id), idValue > 0 {
                             let _ = (context.account.postbox.transaction { transaction -> Peer? in
-                                return transaction.getPeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: idValue))
+                                return transaction.getPeer(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(idValue)))
                             }
                             |> deliverOnMainQueue).start(next: { peer in
                                 if let peer = peer, let controller = context.sharedContext.makePeerInfoController(context: context, peer: peer, mode: .generic, avatarInitiallyExpanded: false, fromChat: false) {
@@ -678,7 +678,9 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
                     }
                 }
             } else {
-                if parsedUrl.host == "settings" {
+                if parsedUrl.host == "importStickers" {
+                    handleResolvedUrl(.importStickers)
+                } else if parsedUrl.host == "settings" {
                     if let path = parsedUrl.pathComponents.last {
                         var section: ResolvedUrlSettingsSection?
                         switch path {
@@ -730,7 +732,7 @@ func openExternalUrlImpl(context: AccountContext, urlContext: OpenURLContext, ur
                             if let window = navigationController?.view.window {
                                 let controller = SFSafariViewController(url: parsedUrl)
                                 if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
-                                    controller.preferredBarTintColor = presentationData.theme.rootController.navigationBar.backgroundColor
+                                    controller.preferredBarTintColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
                                     controller.preferredControlTintColor = presentationData.theme.rootController.navigationBar.accentTextColor
                                 }
                                 window.rootViewController?.present(controller, animated: true)
diff --git a/submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift
index 55908db048..c0050e3893 100644
--- a/submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift
+++ b/submodules/TelegramUI/Sources/OverlayAudioPlayerController.swift
@@ -8,6 +8,7 @@ import SwiftSignalKit
 import TelegramUIPreferences
 import AccountContext
 import ShareController
+import UndoUI
 
 final class OverlayAudioPlayerControllerImpl: ViewController, OverlayAudioPlayerController {
     private let context: AccountContext
@@ -68,6 +69,46 @@ final class OverlayAudioPlayerControllerImpl: ViewController, OverlayAudioPlayer
                                 strongSelf.dismiss()
                             }
                         }, externalShare: true)
+                        shareController.completed = { [weak self] peerIds in
+                            if let strongSelf = self {
+                                let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
+                                    var peers: [Peer] = []
+                                    for peerId in peerIds {
+                                        if let peer = transaction.getPeer(peerId) {
+                                            peers.append(peer)
+                                        }
+                                    }
+                                    return peers
+                                } |> deliverOnMainQueue).start(next: { [weak self] peers in
+                                    if let strongSelf = self {
+                                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                        
+                                        let text: String
+                                        var savedMessages = false
+                                        if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId {
+                                            text = presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One
+                                            savedMessages = true
+                                        } else {
+                                            if peers.count == 1, let peer = peers.first {
+                                                let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                text = presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).0
+                                            } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                                                let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                text = presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0
+                                            } else if let peer = peers.first {
+                                                let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                text = presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0
+                                            } else {
+                                                text = ""
+                                            }
+                                        }
+                                        
+                                        strongSelf.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .current)
+                                    }
+                                })
+                            }
+                        }
                         strongSelf.controllerNode.view.endEditing(true)
                         strongSelf.present(shareController, in: .window(.root))
                     }
diff --git a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift
index 193982ef4b..748d69ccf2 100644
--- a/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift
+++ b/submodules/TelegramUI/Sources/OverlayAudioPlayerControllerNode.swift
@@ -70,6 +70,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         }, openPeer: { _, _, _ in
         }, openPeerMention: { _ in
         }, openMessageContextMenu: { _, _, _, _, _ in
+        }, activateMessagePinch: { _ in
         }, openMessageContextActions: { _, _, _, _ in
         }, navigateToMessage: { _, _ in
         }, navigateToMessageStandalone: { _ in
@@ -77,11 +78,11 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         }, toggleMessagesSelection: { _, _ in
         }, sendCurrentMessage: { _ in
         }, sendMessage: { _ in
-        }, sendSticker: { _, _, _, _, _ in
+        }, sendSticker: { _, _, _, _, _, _, _ in
             return false
-        }, sendGif: { _, _, _ in
+        }, sendGif: { _, _, _, _, _ in
             return false
-        }, sendBotContextResultAsGif: { _, _, _, _ in
+        }, sendBotContextResultAsGif: { _, _, _, _, _ in
             return false
         }, requestMessageActionCallback: { _, _, _, _ in
         }, requestMessageActionUrlAuth: { _, _ in
@@ -136,8 +137,6 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         }, displayPsa: { _, _ in
         }, displayDiceTooltip: { _ in
         }, animateDiceSuccess: { _ in
-        }, greetingStickerNode: {
-            return nil
         }, openPeerContextMenu: { _, _, _, _, _ in
         }, openMessageReplies: { _, _, _ in
         }, openReplyThreadOriginalMessage: { _ in
@@ -145,9 +144,11 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         }, editMessageMedia: { _, _ in
         }, copyText: { _ in
         }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
         }, requestMessageUpdate: { _ in
         }, cancelInteractiveKeyboardGestures: {
-        }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false))
+        }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings, pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false), presentationContext: ChatPresentationContext(backgroundNode: nil))
         
         self.dimNode = ASDisplayNode()
         self.dimNode.backgroundColor = UIColor(white: 0.0, alpha: 0.5)
@@ -186,7 +187,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
             self.isGlobalSearch = false
         }
         
-        self.historyNode = ChatHistoryListNode(context: context, chatLocation: .peer(peerId), chatLocationContextHolder: chatLocationContextHolder, tagMask: tagMask, source: source,  subject: .message(id: initialMessageId, highlight: true), controllerInteraction: self.controllerInteraction, selectedMessages: .single(nil), mode: .list(search: false, reversed: self.currentIsReversed, displayHeaders: .none, hintLinks: false, isGlobalSearch: self.isGlobalSearch))
+        self.historyNode = ChatHistoryListNode(context: context, chatLocation: .peer(peerId), chatLocationContextHolder: chatLocationContextHolder, tagMask: tagMask, source: source,  subject: .message(id: initialMessageId, highlight: true, timecode: nil), controllerInteraction: self.controllerInteraction, selectedMessages: .single(nil), mode: .list(search: false, reversed: self.currentIsReversed, displayHeaders: .none, hintLinks: false, isGlobalSearch: self.isGlobalSearch))
         
         super.init()
         
@@ -262,7 +263,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         self.contentNode.addSubnode(self.historyNode)
         self.contentNode.addSubnode(self.controlsNode)
         
-        self.historyNode.beganInteractiveDragging = { [weak self] in
+        self.historyNode.beganInteractiveDragging = { [weak self] _ in
             self?.controlsNode.collapse()
         }
         
@@ -357,7 +358,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         let (duration, curve) = listViewAnimationDurationAndCurve(transition: transition)
         let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: listNodeSize, insets: insets, duration: duration, curve: curve)
         self.historyNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets)
-        if let replacementHistoryNode = replacementHistoryNode {
+        if let replacementHistoryNode = self.replacementHistoryNode {
             let updateSizeAndInsets = ListViewUpdateSizeAndInsets(size: listNodeSize, insets: insets, duration: 0.0, curve: .Default(duration: nil))
             replacementHistoryNode.updateLayout(transition: transition, updateSizeAndInsets: updateSizeAndInsets)
         }
@@ -527,7 +528,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
         }
         
         let chatLocationContextHolder = Atomic<ChatLocationContextHolder?>(value: nil)
-        let historyNode = ChatHistoryListNode(context: self.context, chatLocation: .peer(self.peerId), chatLocationContextHolder: chatLocationContextHolder, tagMask: tagMask, subject: .message(id: messageId, highlight: true), controllerInteraction: self.controllerInteraction, selectedMessages: .single(nil), mode: .list(search: false, reversed: self.currentIsReversed, displayHeaders: .none, hintLinks: false, isGlobalSearch: self.isGlobalSearch))
+        let historyNode = ChatHistoryListNode(context: self.context, chatLocation: .peer(self.peerId), chatLocationContextHolder: chatLocationContextHolder, tagMask: tagMask, subject: .message(id: messageId, highlight: true, timecode: nil), controllerInteraction: self.controllerInteraction, selectedMessages: .single(nil), mode: .list(search: false, reversed: self.currentIsReversed, displayHeaders: .none, hintLinks: false, isGlobalSearch: self.isGlobalSearch))
         historyNode.preloadPages = true
         historyNode.stackFromBottom = true
         historyNode.updateFloatingHeaderOffset = { [weak self] offset, _ in
@@ -627,7 +628,7 @@ final class OverlayAudioPlayerControllerNode: ViewControllerTracingNode, UIGestu
                 }
             }
             
-            self.historyNode.beganInteractiveDragging = { [weak self] in
+            self.historyNode.beganInteractiveDragging = { [weak self] _ in
                 self?.controlsNode.collapse()
             }
             
diff --git a/submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift b/submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift
index fb02894766..1cab57392c 100644
--- a/submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift
+++ b/submodules/TelegramUI/Sources/OverlayInstantVideoDecoration.swift
@@ -37,7 +37,7 @@ final class OverlayInstantVideoDecoration: UniversalVideoDecoration {
         self.contentContainerNode.clipsToBounds = true
         
         self.foregroundContainerNode = ASDisplayNode()
-        self.progressNode = InstantVideoRadialStatusNode(color: UIColor(white: 1.0, alpha: 0.8))
+        self.progressNode = InstantVideoRadialStatusNode(color: UIColor(white: 1.0, alpha: 0.6))
         self.foregroundContainerNode.addSubnode(self.progressNode)
         self.foregroundNode = self.foregroundContainerNode
     }
diff --git a/submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift b/submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift
index 6caa842a03..96391f630f 100644
--- a/submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift
+++ b/submodules/TelegramUI/Sources/OverlayPlayerControlsNode.swift
@@ -12,6 +12,7 @@ import TelegramUIPreferences
 import AccountContext
 import PhotoResources
 import AppBundle
+import ManagedAnimationNode
 
 private func generateBackground(theme: PresentationTheme) -> UIImage? {
     return generateImage(CGSize(width: 20.0, height: 10.0 + 8.0), rotatedContext: { size, context in
@@ -114,6 +115,7 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
     
     private var currentIsPaused: Bool?
     private let playPauseButton: IconButtonNode
+    private let playPauseIconNode: PlayPauseIconNode
     
     private var currentOrder: MusicPlaybackSettingsOrder?
     private let orderButton: IconButtonNode
@@ -211,6 +213,8 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         self.playPauseButton = IconButtonNode()
         self.playPauseButton.displaysAsynchronously = false
         
+        self.playPauseIconNode = PlayPauseIconNode()
+        
         self.backwardButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Previous"), color: presentationData.theme.list.itemPrimaryTextColor)
         self.forwardButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Next"), color: presentationData.theme.list.itemPrimaryTextColor)
         
@@ -240,6 +244,7 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         self.addSubnode(self.backwardButton)
         self.addSubnode(self.forwardButton)
         self.addSubnode(self.playPauseButton)
+        self.playPauseButton.addSubnode(self.playPauseIconNode)
         
         self.addSubnode(self.separatorNode)
         
@@ -323,10 +328,12 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
                 if strongSelf.wasPlaying {
                     isPaused = false
                 }
+                
+                let isFirstTime = strongSelf.currentIsPaused == nil
                 if strongSelf.currentIsPaused != isPaused {
                     strongSelf.currentIsPaused = isPaused
                     
-                    strongSelf.updatePlayPauseButton(paused: isPaused)
+                    strongSelf.updatePlayPauseButton(paused: isPaused, animated: !isFirstTime)
                 }
                 
                 strongSelf.playPauseButton.isEnabled = true
@@ -548,7 +555,7 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         self.backwardButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Previous"), color: presentationData.theme.list.itemPrimaryTextColor)
         self.forwardButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Next"), color: presentationData.theme.list.itemPrimaryTextColor)
         if let isPaused = self.currentIsPaused {
-            self.updatePlayPauseButton(paused: isPaused)
+            self.updatePlayPauseButton(paused: isPaused, animated: false)
         }
         if let order = self.currentOrder {
             self.updateOrderButton(order)
@@ -611,11 +618,12 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         }
     }
     
-    private func updatePlayPauseButton(paused: Bool) {
+    private func updatePlayPauseButton(paused: Bool, animated: Bool) {
+        self.playPauseIconNode.customColor = self.presentationData.theme.list.itemPrimaryTextColor
         if paused {
-            self.playPauseButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Play"), color: self.presentationData.theme.list.itemPrimaryTextColor)
+            self.playPauseIconNode.enqueueState(.play, animated: animated)
         } else {
-            self.playPauseButton.icon = generateTintedImage(image: UIImage(bundleImageName: "GlobalMusicPlayer/Pause"), color: self.presentationData.theme.list.itemPrimaryTextColor)
+            self.playPauseIconNode.enqueueState(.pause, animated: animated)
         }
     }
     
@@ -726,7 +734,7 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
                     copyView.frame = previousAlbumArtNodeFrame
                     copyView.center = largeAlbumArtFrame.center
                     self.view.insertSubview(copyView, belowSubview: largeAlbumArtNode.view)
-                    transition.animatePositionAdditive(layer: copyView.layer, offset: CGPoint(x: previousAlbumArtNodeFrame.center.x - largeAlbumArtFrame.center.x, y: previousAlbumArtNodeFrame.center.y - largeAlbumArtFrame.center.y), completion: { [weak copyView] in
+                    transition.animatePositionAdditive(layer: copyView.layer, offset: CGPoint(x: previousAlbumArtNodeFrame.center.x - largeAlbumArtFrame.center.x, y: previousAlbumArtNodeFrame.center.y - largeAlbumArtFrame.center.y), completion: { [weak copyView] _ in
                         copyView?.removeFromSuperview()
                     })
                     //copyView.layer.animatePosition(from: CGPoint(x: -50.0, y: 0.0), to: CGPoint(), duration: 0.15, timingFunction: CAMediaTimingFunctionName.easeInEaseOut.rawValue, additive: true)
@@ -779,7 +787,10 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         
         transition.updateFrame(node: self.backwardButton, frame: CGRect(origin: buttonsRect.origin, size: buttonSize))
         transition.updateFrame(node: self.forwardButton, frame: CGRect(origin: CGPoint(x: buttonsRect.maxX - buttonSize.width, y: buttonsRect.minY), size: buttonSize))
-        transition.updateFrame(node: self.playPauseButton, frame: CGRect(origin: CGPoint(x: buttonsRect.minX + floor((buttonsRect.width - buttonSize.width) / 2.0), y: buttonsRect.minY), size: buttonSize))
+        
+        let playPauseFrame = CGRect(origin: CGPoint(x: buttonsRect.minX + floor((buttonsRect.width - buttonSize.width) / 2.0), y: buttonsRect.minY), size: buttonSize)
+        transition.updateFrame(node: self.playPauseButton, frame: playPauseFrame)
+        transition.updateFrame(node: self.playPauseIconNode, frame: CGRect(origin: CGPoint(x: -6.0, y: -6.0), size: CGSize(width: 76.0, height: 76.0)))
         
         return panelHeight
     }
@@ -892,3 +903,53 @@ final class OverlayPlayerControlsNode: ASDisplayNode {
         return result
     }
 }
+
+private enum PlayPauseIconNodeState: Equatable {
+    case play
+    case pause
+}
+
+private final class PlayPauseIconNode: ManagedAnimationNode {
+    private let duration: Double = 0.35
+    private var iconState: PlayPauseIconNodeState = .pause
+    
+    init() {
+        super.init(size: CGSize(width: 76.0, height: 76.0))
+        
+        self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+    }
+    
+    func enqueueState(_ state: PlayPauseIconNodeState, animated: Bool) {
+        guard self.iconState != state else {
+            return
+        }
+        
+        let previousState = self.iconState
+        self.iconState = state
+        
+        switch previousState {
+            case .pause:
+                switch state {
+                    case .play:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 83), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 0), duration: 0.01))
+                        }
+                    case .pause:
+                        break
+                }
+            case .play:
+                switch state {
+                    case .pause:
+                        if animated {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 0, endFrame: 41), duration: self.duration))
+                        } else {
+                            self.trackTo(item: ManagedAnimationItem(source: .local("anim_playpause"), frames: .range(startFrame: 41, endFrame: 41), duration: 0.01))
+                        }
+                    case .play:
+                        break
+                }
+        }
+    }
+}
diff --git a/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
index 8b31b49345..959fa02d61 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenActionItem.swift
@@ -120,7 +120,11 @@ private final class PeerInfoScreenActionItemNode: PeerInfoScreenItemNode {
             self.iconNode.removeFromSupernode()
         }
         
-        transition.updateFrame(node: self.textNode, frame: textFrame)
+        if self.textNode.frame.width != textFrame.width {
+            self.textNode.frame = textFrame
+        } else {
+            transition.updateFrame(node: self.textNode, frame: textFrame)
+        }
         
         let highlightNodeOffset: CGFloat = topItem == nil ? 0.0 : UIScreenPixel
         self.selectionNode.update(size: CGSize(width: width, height: height + highlightNodeOffset), theme: presentationData.theme, transition: transition)
diff --git a/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenInfoItem.swift b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenInfoItem.swift
new file mode 100644
index 0000000000..9c345239af
--- /dev/null
+++ b/submodules/TelegramUI/Sources/PeerInfo/ListItems/PeerInfoScreenInfoItem.swift
@@ -0,0 +1,108 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import TelegramPresentationData
+import ItemListPeerItem
+import SwiftSignalKit
+import AccountContext
+import Postbox
+import SyncCore
+import TelegramCore
+import ItemListUI
+
+final class PeerInfoScreenInfoItem: PeerInfoScreenItem {
+    let id: AnyHashable
+    let title: String
+    let text: InfoListItemText
+    let linkAction: ((InfoListItemLinkAction) -> Void)?
+ 
+    init(
+        id: AnyHashable,
+        title: String,
+        text: InfoListItemText,
+        linkAction: ((InfoListItemLinkAction) -> Void)?
+    ) {
+        self.id = id
+        self.title = title
+        self.text = text
+        self.linkAction = linkAction
+    }
+    
+    func node() -> PeerInfoScreenItemNode {
+        return PeerInfoScreenInfoItemNode()
+    }
+}
+
+private final class PeerInfoScreenInfoItemNode: PeerInfoScreenItemNode {
+    private let bottomSeparatorNode: ASDisplayNode
+    
+    private var item: PeerInfoScreenInfoItem?
+    private var itemNode: InfoItemNode?
+    
+    override init() {
+        self.bottomSeparatorNode = ASDisplayNode()
+        self.bottomSeparatorNode.isLayerBacked = true
+        
+        super.init()
+        
+        self.addSubnode(self.bottomSeparatorNode)
+    }
+    
+    override func update(width: CGFloat, safeInsets: UIEdgeInsets, presentationData: PresentationData, item: PeerInfoScreenItem, topItem: PeerInfoScreenItem?, bottomItem: PeerInfoScreenItem?, transition: ContainedViewLayoutTransition) -> CGFloat {
+        guard let item = item as? PeerInfoScreenInfoItem else {
+            return 10.0
+        }
+        
+        self.item = item
+    
+        
+        let sideInset: CGFloat = 16.0 + safeInsets.left
+        
+        self.bottomSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor
+                
+        let infoItem = InfoListItem(presentationData: ItemListPresentationData(presentationData), title: item.title, text: item.text, style: .blocks, linkAction: { link in
+            item.linkAction?(link)
+        }, closeAction: nil)
+        let params = ListViewItemLayoutParams(width: width, leftInset: safeInsets.left, rightInset: safeInsets.right, availableHeight: 1000.0)
+        
+        let itemNode: InfoItemNode
+        if let current = self.itemNode {
+            itemNode = current
+            infoItem.updateNode(async: { $0() }, node: {
+                return itemNode
+            }, params: params, previousItem: nil, nextItem: nil, animation: .None, completion: { (layout, apply) in
+                let nodeFrame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: layout.size.height))
+                
+                itemNode.contentSize = layout.contentSize
+                itemNode.insets = layout.insets
+                itemNode.frame = nodeFrame
+                
+                apply(ListViewItemApply(isOnScreen: true))
+            })
+        } else {
+            var itemNodeValue: ListViewItemNode?
+            infoItem.nodeConfiguredForParams(async: { $0() }, params: params, synchronousLoads: false, previousItem: nil, nextItem: nil, completion: { node, apply in
+                itemNodeValue = node
+                apply().1(ListViewItemApply(isOnScreen: true))
+            })
+            itemNode = itemNodeValue as! InfoItemNode
+            self.itemNode = itemNode
+            self.addSubnode(itemNode)
+        }
+        
+        let height = itemNode.contentSize.height
+        
+        transition.updateFrame(node: itemNode, frame: CGRect(origin: CGPoint(), size: itemNode.bounds.size))
+            
+        var separatorInset: CGFloat = sideInset
+        if bottomItem != nil {
+            separatorInset += 49.0
+        }
+        
+        transition.updateFrame(node: self.bottomSeparatorNode, frame: CGRect(origin: CGPoint(x: separatorInset, y: height - UIScreenPixel), size: CGSize(width: width - sideInset, height: UIScreenPixel)))
+        transition.updateAlpha(node: self.bottomSeparatorNode, alpha: bottomItem == nil ? 0.0 : 1.0)
+        
+        return height
+    }
+}
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
index b2bc8455e3..f8ede6a784 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoGroupsInCommonPaneNode.swift
@@ -124,6 +124,9 @@ final class PeerInfoGroupsInCommonPaneNode: ASDisplayNode, PeerInfoPaneNode {
         self.disposable?.dispose()
     }
     
+    func ensureMessageIsVisible(id: MessageId) {    
+    }
+    
     func scrollToTop() -> Bool {
         if !self.listNode.scrollToOffsetFromTop(0.0) {
             self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
@@ -143,7 +146,7 @@ final class PeerInfoGroupsInCommonPaneNode: ASDisplayNode, PeerInfoPaneNode {
         var scrollToItem: ListViewScrollToItem?
         if isScrollingLockedAtTop {
             switch self.listNode.visibleContentOffset() {
-            case .known(0.0):
+            case let .known(value) where value <= CGFloat.ulpOfOne:
                 break
             default:
                 scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Spring(duration: duration), directionHint: .Up)
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
index d90a5a3c1d..8ed2fdda00 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoListPaneNode.swift
@@ -138,6 +138,10 @@ final class PeerInfoListPaneNode: ASDisplayNode, PeerInfoPaneNode {
         self.playlistPreloadDisposable?.dispose()
     }
     
+    func ensureMessageIsVisible(id: MessageId) {
+        
+    }
+    
     func scrollToTop() -> Bool {
         let offset = self.listNode.visibleContentOffset()
         switch offset {
@@ -201,7 +205,7 @@ final class PeerInfoListPaneNode: ASDisplayNode, PeerInfoPaneNode {
                     })
                 }
                 
-                let mediaAccessoryPanel = MediaNavigationAccessoryPanel(context: self.context)
+                let mediaAccessoryPanel = MediaNavigationAccessoryPanel(context: self.context, displayBackground: true)
                 mediaAccessoryPanel.containerNode.headerNode.displayScrubber = item.playbackData?.type != .instantVideo
                 mediaAccessoryPanel.close = { [weak self] in
                     if let strongSelf = self, let (_, _, _, _, type, _) = strongSelf.playlistStateAndType {
@@ -387,7 +391,9 @@ final class PeerInfoListPaneNode: ASDisplayNode, PeerInfoPaneNode {
         self.listNode.updateLayout(transition: transition, updateSizeAndInsets: ListViewUpdateSizeAndInsets(size: size, insets: UIEdgeInsets(top: topPanelHeight, left: sideInset, bottom: bottomInset, right: sideInset), duration: duration, curve: curve))
         if isScrollingLockedAtTop {
             switch self.listNode.visibleContentOffset() {
-            case .known(0.0), .none:
+            case let .known(value) where value <= CGFloat.ulpOfOne:
+                break
+            case .none:
                 break
             default:
                 self.listNode.scrollToEndOfHistory()
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift
index e7b27c8f4e..0cdb4c218b 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoMembersPane.swift
@@ -168,6 +168,9 @@ final class PeerInfoMembersPaneNode: ASDisplayNode, PeerInfoPaneNode {
     deinit {
     }
     
+    func ensureMessageIsVisible(id: MessageId) {   
+    }
+    
     func scrollToTop() -> Bool {
         if !self.listNode.scrollToOffsetFromTop(0.0) {
             self.listNode.transaction(deleteIndices: [], insertIndicesAndItems: [], updateIndicesAndItems: [], options: [.Synchronous, .LowLatency], scrollToItem: ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Default(duration: nil), directionHint: .Up), updateSizeAndInsets: nil, stationaryItemRange: nil, updateOpaqueState: nil, completion: { _ in })
@@ -188,7 +191,7 @@ final class PeerInfoMembersPaneNode: ASDisplayNode, PeerInfoPaneNode {
         var scrollToItem: ListViewScrollToItem?
         if isScrollingLockedAtTop {
             switch self.listNode.visibleContentOffset() {
-            case .known(0.0):
+            case let .known(value) where value <= CGFloat.ulpOfOne:
                 break
             default:
                 scrollToItem = ListViewScrollToItem(index: 0, position: .top(0.0), animated: true, curve: .Spring(duration: duration), directionHint: .Up)
diff --git a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
index 43b87e4f25..6dfd9daf04 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/Panes/PeerInfoVisualMediaPaneNode.swift
@@ -872,6 +872,21 @@ final class PeerInfoVisualMediaPaneNode: ASDisplayNode, PeerInfoPaneNode, UIScro
         self.animationTimer?.invalidate()
     }
     
+    func ensureMessageIsVisible(id: MessageId) {
+        let activeRect = self.scrollNode.bounds
+        for item in self.mediaItems {
+            if item.message.id == id {
+                if let itemNode = self.visibleMediaItems[item.message.stableId] {
+                    if !activeRect.contains(itemNode.frame) {
+                        let targetContentOffset = CGPoint(x: 0.0, y: max(-self.scrollNode.view.contentInset.top, itemNode.frame.minY - (self.scrollNode.frame.height - itemNode.frame.height) / 2.0))
+                        self.scrollNode.view.setContentOffset(targetContentOffset, animated: false)
+                    }
+                }
+                break
+            }
+        }
+    }
+    
     private func requestHistoryAroundVisiblePosition() {
         if self.isRequestingView {
             return
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
index 3d9378ce6d..c4b9964353 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoData.swift
@@ -112,6 +112,7 @@ final class PeerInfoState {
 
 final class TelegramGlobalSettings {
     let suggestPhoneNumberConfirmation: Bool
+    let suggestPasswordConfirmation: Bool
     let accountsAndPeers: [(Account, Peer, Int32)]
     let activeSessionsContext: ActiveSessionsContext?
     let webSessionsContext: WebSessionsContext?
@@ -130,6 +131,7 @@ final class TelegramGlobalSettings {
     
     init(
         suggestPhoneNumberConfirmation: Bool,
+        suggestPasswordConfirmation: Bool,
         accountsAndPeers: [(Account, Peer, Int32)],
         activeSessionsContext: ActiveSessionsContext?,
         webSessionsContext: WebSessionsContext?,
@@ -147,6 +149,7 @@ final class TelegramGlobalSettings {
         enableQRLogin: Bool
     ) {
         self.suggestPhoneNumberConfirmation = suggestPhoneNumberConfirmation
+        self.suggestPasswordConfirmation = suggestPasswordConfirmation
         self.accountsAndPeers = accountsAndPeers
         self.activeSessionsContext = activeSessionsContext
         self.webSessionsContext = webSessionsContext
@@ -338,40 +341,6 @@ private func peerInfoScreenInputData(context: AccountContext, peerId: PeerId, is
     |> distinctUntilChanged
 }
 
-private func peerInfoProfilePhotos(context: AccountContext, peerId: PeerId) -> Signal<Any, NoError> {
-    return context.account.postbox.combinedView(keys: [.basicPeer(peerId)])
-    |> mapToSignal { view -> Signal<AvatarGalleryEntry?, NoError> in
-        guard let peer = (view.views[.basicPeer(peerId)] as? BasicPeerView)?.peer else {
-            return .single(nil)
-        }
-        return initialAvatarGalleryEntries(account: context.account, peer: peer)
-        |> map { entries in
-            return entries.first
-        }
-    }
-    |> distinctUntilChanged
-    |> mapToSignal { firstEntry -> Signal<(Bool, [AvatarGalleryEntry]), NoError> in
-        if let firstEntry = firstEntry {
-            return context.account.postbox.loadedPeerWithId(peerId)
-            |> mapToSignal { peer -> Signal<(Bool, [AvatarGalleryEntry]), NoError>in
-                return fetchedAvatarGalleryEntries(account: context.account, peer: peer, firstEntry: firstEntry)
-            }
-        } else {
-            return .single((true, []))
-        }
-    }
-    |> map { items -> Any in
-        return items
-    }
-}
-
-func peerInfoProfilePhotosWithCache(context: AccountContext, peerId: PeerId) -> Signal<(Bool, [AvatarGalleryEntry]), NoError> {
-    return context.peerChannelMemberCategoriesContextsManager.profilePhotos(postbox: context.account.postbox, network: context.account.network, peerId: peerId, fetch: peerInfoProfilePhotos(context: context, peerId: peerId))
-    |> map { items -> (Bool, [AvatarGalleryEntry]) in
-        return items as? (Bool, [AvatarGalleryEntry]) ?? (true, [])
-    }
-}
-
 func keepPeerInfoScreenDataHot(context: AccountContext, peerId: PeerId) -> Signal<Never, NoError> {
     return peerInfoScreenInputData(context: context, peerId: peerId, isSettings: false)
     |> mapToSignal { inputData -> Signal<Never, NoError> in
@@ -431,9 +400,10 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: PeerId, account
         combineLatest(context.account.viewTracker.featuredStickerPacks(), archivedStickerPacks),
         hasPassport,
         (context.watchManager?.watchAppInstalled ?? .single(false)),
-        context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration])
+        context.account.postbox.preferencesView(keys: [PreferencesKeys.appConfiguration]),
+        getServerProvidedSuggestions(account: context.account)
         )
-        |> map { peerView, accountsAndPeers, accountSessions, privacySettings, sharedPreferences, notifications, stickerPacks, hasPassport, hasWatchApp, accountPreferences -> PeerInfoScreenData in
+        |> map { peerView, accountsAndPeers, accountSessions, privacySettings, sharedPreferences, notifications, stickerPacks, hasPassport, hasWatchApp, accountPreferences, suggestions -> PeerInfoScreenData in
             let (notificationExceptions, notificationsAuthorizationStatus, notificationsWarningSuppressed) = notifications
             let (featuredStickerPacks, archivedStickerPacks) = stickerPacks
             
@@ -450,7 +420,7 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: PeerId, account
                 enableQRLogin = true
             }
             
-            let globalSettings = TelegramGlobalSettings(suggestPhoneNumberConfirmation: false, accountsAndPeers: accountsAndPeers, activeSessionsContext: accountSessions?.0, webSessionsContext: accountSessions?.2, otherSessionsCount: accountSessions?.1, proxySettings: proxySettings, notificationAuthorizationStatus: notificationsAuthorizationStatus, notificationWarningSuppressed: notificationsWarningSuppressed, notificationExceptions: notificationExceptions, inAppNotificationSettings: inAppNotificationSettings, privacySettings: privacySettings, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedStickerPacks: archivedStickerPacks, hasPassport: hasPassport, hasWatchApp: hasWatchApp, enableQRLogin: enableQRLogin)
+            let globalSettings = TelegramGlobalSettings(suggestPhoneNumberConfirmation: suggestions.contains(.validatePhoneNumber), suggestPasswordConfirmation: suggestions.contains(.validatePassword), accountsAndPeers: accountsAndPeers, activeSessionsContext: accountSessions?.0, webSessionsContext: accountSessions?.2, otherSessionsCount: accountSessions?.1, proxySettings: proxySettings, notificationAuthorizationStatus: notificationsAuthorizationStatus, notificationWarningSuppressed: notificationsWarningSuppressed, notificationExceptions: notificationExceptions, inAppNotificationSettings: inAppNotificationSettings, privacySettings: privacySettings, unreadTrendingStickerPacks: unreadTrendingStickerPacks, archivedStickerPacks: archivedStickerPacks, hasPassport: hasPassport, hasWatchApp: hasWatchApp, enableQRLogin: enableQRLogin)
             
             return PeerInfoScreenData(
                 peer: peerView.peers[peerId],
@@ -679,7 +649,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
                         canManageInvitations = true
                     }
                     if canManageInvitations {
-                        let invitationsContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, adminId: nil, revoked: false, forceUpdate: true)
+                        let invitationsContext = context.engine.peers.peerExportedInvitations(peerId: peerId, adminId: nil, revoked: false, forceUpdate: true)
                         invitationsContextPromise.set(.single(invitationsContext))
                         invitationsStatePromise.set(invitationsContext.state |> map(Optional.init))
                     }
@@ -722,10 +692,10 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
                 |> mapToSignal { isLarge -> Signal<Int32?, NoError> in
                     if let isLarge = isLarge {
                         if isLarge {
-                            return context.peerChannelMemberCategoriesContextsManager.recentOnline(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
+                            return context.peerChannelMemberCategoriesContextsManager.recentOnline(account: context.account, accountPeerId: context.account.peerId, peerId: peerId)
                             |> map(Optional.init)
                         } else {
-                            return context.peerChannelMemberCategoriesContextsManager.recentOnlineSmall(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
+                            return context.peerChannelMemberCategoriesContextsManager.recentOnlineSmall(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId)
                             |> map(Optional.init)
                         }
                     } else {
@@ -842,7 +812,7 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
                         canManageInvitations = true
                     }
                     if canManageInvitations {
-                        let invitationsContext = PeerExportedInvitationsContext(account: context.account, peerId: peerId, adminId: nil, revoked: false, forceUpdate: true)
+                        let invitationsContext = context.engine.peers.peerExportedInvitations(peerId: peerId, adminId: nil, revoked: false, forceUpdate: true)
                         invitationsContextPromise.set(.single(invitationsContext))
                         invitationsStatePromise.set(invitationsContext.state |> map(Optional.init))
                     }
@@ -910,7 +880,9 @@ func availableActionsForMemberOfPeer(accountPeerId: PeerId, peer: Peer?, member:
     } else if member.id != accountPeerId {
         if let channel = peer as? TelegramChannel {
             if channel.flags.contains(.isCreator) {
-                result.insert(.restrict)
+                if !channel.flags.contains(.isGigagroup) {
+                    result.insert(.restrict)
+                }
                 result.insert(.promote)
             } else {
                 switch member {
@@ -921,13 +893,15 @@ func availableActionsForMemberOfPeer(accountPeerId: PeerId, peer: Peer?, member:
                     case let .member(member):
                         if let adminInfo = member.adminInfo {
                             if adminInfo.promotedBy == accountPeerId {
-                                result.insert(.restrict)
+                                if !channel.flags.contains(.isGigagroup) {
+                                    result.insert(.restrict)
+                                }
                                 if channel.hasPermission(.addAdmins) {
                                     result.insert(.promote)
                                 }
                             }
                         } else {
-                            if channel.hasPermission(.banMembers) {
+                            if channel.hasPermission(.banMembers) && !channel.flags.contains(.isGigagroup) {
                                 result.insert(.restrict)
                             }
                             if channel.hasPermission(.addAdmins) {
@@ -976,7 +950,27 @@ func availableActionsForMemberOfPeer(accountPeerId: PeerId, peer: Peer?, member:
     return result
 }
 
-func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFromChat: Bool, videoCallsEnabled: Bool, isSecretChat: Bool, isContact: Bool) -> [PeerInfoHeaderButtonKey] {
+func peerInfoHeaderButtonIsHiddenWhileExpanded(buttonKey: PeerInfoHeaderButtonKey, isOpenedFromChat: Bool) -> Bool {
+    var hiddenWhileExpanded = false
+    if isOpenedFromChat {
+        switch buttonKey {
+        case .message, .search, .videoCall, .addMember, .leave, .discussion:
+            hiddenWhileExpanded = true
+        default:
+            hiddenWhileExpanded = false
+        }
+    } else {
+        switch buttonKey {
+        case .search, .call, .videoCall, .addMember, .leave, .discussion:
+            hiddenWhileExpanded = true
+        default:
+            hiddenWhileExpanded = false
+        }
+    }
+    return hiddenWhileExpanded
+}
+
+func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFromChat: Bool, isExpanded: Bool, videoCallsEnabled: Bool, isSecretChat: Bool, isContact: Bool) -> [PeerInfoHeaderButtonKey] {
     var result: [PeerInfoHeaderButtonKey] = []
     if let user = peer as? TelegramUser {
         if !isOpenedFromChat {
@@ -1020,7 +1014,7 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         if channel.flags.contains(.hasVoiceChat) {
             hasVoiceChat = true
         }
-        if channel.flags.contains(.isCreator) || channel.hasPermission(.manageCalls) {
+        if channel.flags.contains(.isCreator) {
             displayMore = true
         }
         switch channel.info {
@@ -1032,7 +1026,6 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
                 hasDiscussion = true
             }
         case .group:
-            displayLeave = false
             if channel.flags.contains(.isCreator) || channel.hasPermission(.inviteMembers) {
                 result.append(.addMember)
             }
@@ -1049,30 +1042,22 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         default:
             displayLeave = false
         }
-        if canViewStats {
-            displayLeave = false
-        }
         result.append(.mute)
-        if hasVoiceChat {
+        if hasVoiceChat || canStartVoiceChat {
             result.append(.voiceChat)
         }
         if hasDiscussion {
             result.append(.discussion)
         }
         result.append(.search)
-        if displayLeave {
+        if displayLeave && result.count < 4 {
             result.append(.leave)
         }
-        if displayLeave && !channel.flags.contains(.isCreator) {
-            if let _ = channel.adminRights {
-                displayMore = false
-            }
-        }
         var canReport = true
         if channel.isVerified || channel.adminRights != nil || channel.flags.contains(.isCreator)  {
             canReport = false
         }
-        if !canReport && !canViewStats && !canStartVoiceChat {
+        if !canReport && !canViewStats {
             displayMore = false
         }
         if displayMore {
@@ -1085,10 +1070,18 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         var isPublic = false
         var isCreator = false
         var hasVoiceChat = false
+        var canStartVoiceChat = false
         
         if group.flags.contains(.hasVoiceChat) {
             hasVoiceChat = true
         }
+        if !hasVoiceChat {
+            if case .creator = group.role {
+                canStartVoiceChat = true
+            } else if case let .admin(rights, _) = group.role, rights.rights.contains(.canManageCalls) {
+                canStartVoiceChat = true
+            }
+        }
         
         if case .creator = group.role {
             isCreator = true
@@ -1107,18 +1100,22 @@ func peerInfoHeaderButtons(peer: Peer?, cachedData: CachedPeerData?, isOpenedFro
         if !group.hasBannedPermission(.banAddMembers) {
             canAddMembers = true
         }
-        
         if canAddMembers {
             result.append(.addMember)
         }
-        
         result.append(.mute)
-        if hasVoiceChat {
+        if hasVoiceChat || canStartVoiceChat {
             result.append(.voiceChat)
         }
         result.append(.search)
         result.append(.more)
     }
+    if isExpanded && result.count > 3 {
+        result = result.filter { !peerInfoHeaderButtonIsHiddenWhileExpanded(buttonKey: $0, isOpenedFromChat: isOpenedFromChat) }
+        if !result.contains(.more) {
+            result.append(.more)
+        }
+    }
     return result
 }
 
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
index 5a8ac7ecc5..662ae05eb1 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoHeaderNode.swift
@@ -19,6 +19,9 @@ import GalleryUI
 import UniversalMediaPlayer
 import RadialStatusNode
 import TelegramUIPreferences
+import PeerInfoAvatarListNode
+import AnimationUI
+import ContextUI
 
 enum PeerInfoHeaderButtonKey: Hashable {
     case message
@@ -52,7 +55,9 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
     let referenceNode: ContextReferenceContentNode
     let containerNode: ContextControllerSourceNode
     private let backgroundNode: ASImageNode
+    private let iconNode: ASImageNode
     private let textNode: ImmediateTextNode
+    private var animationNode: AnimationNode?
     
     private var theme: PresentationTheme?
     private var icon: PeerInfoHeaderButtonIcon?
@@ -70,6 +75,10 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
         self.backgroundNode.displaysAsynchronously = false
         self.backgroundNode.displayWithoutProcessing = true
         
+        self.iconNode = ASImageNode()
+        self.iconNode.displaysAsynchronously = false
+        self.iconNode.displayWithoutProcessing = true
+        
         self.textNode = ImmediateTextNode()
         self.textNode.displaysAsynchronously = false
         
@@ -79,6 +88,7 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
         
         self.containerNode.addSubnode(self.referenceNode)
         self.referenceNode.addSubnode(self.backgroundNode)
+        self.referenceNode.addSubnode(self.iconNode)
         self.addSubnode(self.containerNode)
         self.addSubnode(self.textNode)
         
@@ -104,49 +114,109 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
     }
     
     @objc private func buttonPressed() {
+        switch self.icon {
+            case .voiceChat, .more, .leave:
+                self.animationNode?.playOnce()
+            default:
+                break
+        }
         self.action(self, nil)
     }
     
     func update(size: CGSize, text: String, icon: PeerInfoHeaderButtonIcon, isActive: Bool, isExpanded: Bool, presentationData: PresentationData, transition: ContainedViewLayoutTransition) {
-        if self.theme != presentationData.theme || self.icon != icon || self.isActive != isActive {
+        let previousIcon = self.icon
+        let iconUpdated = self.icon != icon
+        let isActiveUpdated = self.isActive != isActive
+        self.isActive = isActive
+        if self.theme != presentationData.theme || self.icon != icon {
             self.theme = presentationData.theme
             self.icon = icon
             
-            let isActiveUpdated = self.isActive != isActive
-            self.isActive = isActive
-            
             var isGestureEnabled = false
             if [.mute, .voiceChat, .more].contains(icon) {
                 isGestureEnabled = true
             }
             self.containerNode.isGestureEnabled = isGestureEnabled
-            
-            if isActiveUpdated, !self.containerNode.alpha.isZero {
-                if let snapshotView = self.backgroundNode.view.snapshotContentTree() {
-                    snapshotView.frame = self.backgroundNode.view.frame
-                    self.view.addSubview(snapshotView)
-                    
-                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                        snapshotView?.removeFromSuperview()
-                    })
-                }
-                if !isExpanded, let snapshotView = self.textNode.view.snapshotContentTree() {
-                    snapshotView.frame = self.textNode.view.frame
-                    self.view.addSubview(snapshotView)
-                    
-                    snapshotView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, removeOnCompletion: false, completion: { [weak snapshotView] _ in
-                        snapshotView?.removeFromSuperview()
-                    })
-                }
+                        
+            let animationName: String?
+            var colors: [String: UIColor] = [:]
+            var playOnce = false
+            var seekToEnd = false
+            let iconColor = presentationData.theme.list.itemCheckColors.foregroundColor
+            switch icon {
+                case .voiceChat:
+                    animationName = "anim_profilevc"
+                    colors = ["Line 3.Group 1.Stroke 1": iconColor,
+                              "Line 1.Group 1.Stroke 1": iconColor,
+                              "Line 2.Group 1.Stroke 1": iconColor]
+                case .mute:
+                    animationName = "anim_profileunmute"
+                    colors = ["Middle.Group 1.Fill 1": iconColor,
+                              "Top.Group 1.Fill 1": iconColor,
+                              "Bottom.Group 1.Fill 1": iconColor,
+                              "EXAMPLE.Group 1.Fill 1": iconColor,
+                              "Line.Group 1.Stroke 1": iconColor]
+                    if previousIcon == .unmute {
+                        playOnce = true
+                    } else {
+                        seekToEnd = true
+                    }
+                case .unmute:
+                    animationName = "anim_profilemute"
+                    colors = ["Middle.Group 1.Fill 1": iconColor,
+                              "Top.Group 1.Fill 1": iconColor,
+                              "Bottom.Group 1.Fill 1": iconColor,
+                              "EXAMPLE.Group 1.Fill 1": iconColor,
+                              "Line.Group 1.Stroke 1": iconColor]
+                    if previousIcon == .mute {
+                        playOnce = true
+                    } else {
+                        seekToEnd = true
+                    }
+                case .more:
+                    animationName = "anim_profilemore"
+                    colors = ["Point 2.Group 1.Fill 1": iconColor,
+                              "Point 3.Group 1.Fill 1": iconColor,
+                              "Point 1.Group 1.Fill 1": iconColor]
+                case .leave:
+                    animationName = "anim_profileleave"
+                    colors = ["Arrow.Group 2.Stroke 1": iconColor,
+                              "Door.Group 1.Stroke 1": iconColor,
+                              "Arrow.Group 1.Stroke 1": iconColor]
+                default:
+                    animationName = nil
             }
             
-            self.backgroundNode.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in
+            if let animationName = animationName {
+                let animationNode: AnimationNode
+                if let current = self.animationNode {
+                    animationNode = current
+                    if iconUpdated {
+                        animationNode.setAnimation(name: animationName, colors: colors)
+                    }
+                } else {
+                    animationNode = AnimationNode(animation: animationName, colors: colors, scale: 1.0)
+                    self.referenceNode.addSubnode(animationNode)
+                    self.animationNode = animationNode
+                }
+                animationNode.frame = CGRect(origin: CGPoint(), size: size)
+            } else if let animationNode = self.animationNode {
+                self.animationNode = nil
+                animationNode.removeFromSupernode()
+            }
+            
+            if playOnce {
+                self.animationNode?.play()
+            } else if seekToEnd {
+                self.animationNode?.seekToEnd()
+            }
+                        
+            self.backgroundNode.image = generateFilledCircleImage(diameter: 40.0, color: presentationData.theme.list.itemAccentColor)
+            self.iconNode.image = generateImage(CGSize(width: 40.0, height: 40.0), contextGenerator: { size, context in
                 context.clear(CGRect(origin: CGPoint(), size: size))
-                context.setFillColor(isActive ? presentationData.theme.list.itemAccentColor.cgColor : presentationData.theme.list.itemDisabledTextColor.cgColor)
-                context.fillEllipse(in: CGRect(origin: CGPoint(), size: size))
                 context.setBlendMode(.normal)
                 context.setFillColor(presentationData.theme.list.itemCheckColors.foregroundColor.cgColor)
-                let imageName: String
+                let imageName: String?
                 switch icon {
                 case .message:
                     imageName = "Peer Info/ButtonMessage"
@@ -155,21 +225,21 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
                 case .videoCall:
                     imageName = "Peer Info/ButtonVideo"
                 case .voiceChat:
-                    imageName = "Peer Info/ButtonVoiceChat"
+                    imageName = nil
                 case .mute:
-                    imageName = "Peer Info/ButtonMute"
+                    imageName = nil
                 case .unmute:
-                    imageName = "Peer Info/ButtonUnmute"
+                    imageName = nil
                 case .more:
-                    imageName = "Peer Info/ButtonMore"
+                    imageName = nil
                 case .addMember:
                     imageName = "Peer Info/ButtonAddMember"
                 case .search:
                     imageName = "Peer Info/ButtonSearch"
                 case .leave:
-                    imageName = "Peer Info/ButtonLeave"
+                    imageName = nil
                 }
-                if let image = generateTintedImage(image: UIImage(bundleImageName: imageName), color: .white) {
+                if let imageName = imageName, let image = generateTintedImage(image: UIImage(bundleImageName: imageName), color: .white) {
                     let imageRect = CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0)), size: image.size)
                     context.clip(to: imageRect, mask: image.cgImage!)
                     context.fill(imageRect)
@@ -177,14 +247,24 @@ final class PeerInfoHeaderButtonNode: HighlightableButtonNode {
             })
         }
         
-        self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(12.0), textColor: isActive ? presentationData.theme.list.itemAccentColor : presentationData.theme.list.itemDisabledTextColor)
+        let alpha: CGFloat = isActive ? 1.0 : 0.3
+        if isActiveUpdated, !self.containerNode.alpha.isZero {
+            let alphaTransition = ContainedViewLayoutTransition.animated(duration: 0.2, curve: .easeInOut)
+            alphaTransition.updateAlpha(node: self.backgroundNode, alpha: isActive ? 1.0 : 0.3)
+            if !isExpanded {
+                alphaTransition.updateAlpha(node: self.textNode, alpha: isActive ? 1.0 : 0.3)
+            }
+        }
+        
+        self.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(12.0), textColor: presentationData.theme.list.itemAccentColor)
         self.accessibilityLabel = text
         let titleSize = self.textNode.updateLayout(CGSize(width: 120.0, height: .greatestFiniteMagnitude))
         
         transition.updateFrame(node: self.containerNode, frame: CGRect(origin: CGPoint(), size: size))
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: size))
+        transition.updateFrame(node: self.iconNode, frame: CGRect(origin: CGPoint(), size: size))
         transition.updateFrameAdditiveToCenter(node: self.textNode, frame: CGRect(origin: CGPoint(x: floor((size.width - titleSize.width) / 2.0), y: size.height + 6.0), size: titleSize))
-        transition.updateAlpha(node: self.textNode, alpha: isExpanded ? 0.0 : 1.0)
+        transition.updateAlpha(node: self.textNode, alpha: isExpanded ? 0.0 : alpha)
         
         self.referenceNode.frame = self.containerNode.bounds
     }
@@ -206,1095 +286,6 @@ final class PeerInfoHeaderNavigationTransition {
     }
 }
 
-enum PeerInfoAvatarListItem: Equatable {
-    case topImage([ImageRepresentationWithReference], [VideoRepresentationWithReference], Data?)
-    case image(TelegramMediaImageReference?, [ImageRepresentationWithReference], [VideoRepresentationWithReference], Data?)
-    
-    var id: WrappedMediaResourceId {
-        switch self {
-        case let .topImage(representations, _, _):
-            let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation
-            return WrappedMediaResourceId(representation.resource.id)
-        case let .image(_, representations, _, _):
-            let representation = largestImageRepresentation(representations.map { $0.representation }) ?? representations[representations.count - 1].representation
-            return WrappedMediaResourceId(representation.resource.id)
-        }
-    }
-    
-    var videoRepresentations: [VideoRepresentationWithReference] {
-        switch self {
-            case let .topImage(_, videoRepresentations, _):
-                return videoRepresentations
-            case let .image(_, _, videoRepresentations, _):
-                return videoRepresentations
-        }
-    }
-    
-    init(entry: AvatarGalleryEntry) {
-        switch entry {
-            case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
-                self = .topImage(representations, videoRepresentations, immediateThumbnailData)
-            case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
-                self = .image(reference, representations, videoRepresentations, immediateThumbnailData)
-        }
-    }
-}
-
-final class PeerInfoAvatarListItemNode: ASDisplayNode {
-    private let context: AccountContext
-    private let peer: Peer
-    let imageNode: TransformImageNode
-    private var videoNode: UniversalVideoNode?
-    private var videoContent: NativeVideoContent?
-    private var videoStartTimestamp: Double?
-    private let playbackStartDisposable = MetaDisposable()
-    private let statusDisposable = MetaDisposable()
-    private let preloadDisposable = MetaDisposable()
-    private let statusNode: RadialStatusNode
-    
-    private var playerStatus: MediaPlayerStatus?
-    private var isLoading = ValuePromise<Bool>(false)
-    private var loadingProgress = ValuePromise<Float?>(nil)
-    private var loadingProgressDisposable = MetaDisposable()
-    private var hasProgress = false
-    
-    let isReady = Promise<Bool>()
-    private var didSetReady: Bool = false
-    
-    var item: PeerInfoAvatarListItem?
-        
-    private var statusPromise = Promise<(MediaPlayerStatus?, Double?)?>()
-    var mediaStatus: Signal<(MediaPlayerStatus?, Double?)?, NoError> {
-        get {
-            return self.statusPromise.get()
-        }
-    }
-    
-    var delayCentralityLose = false
-    var isCentral: Bool? = nil {
-        didSet {
-            guard self.isCentral != oldValue, let isCentral = self.isCentral else {
-                return
-            }
-            if isCentral {
-                self.setupVideoPlayback()
-                self.preloadDisposable.set(nil)
-            } else {
-                if let videoNode = self.videoNode {
-                    self.playbackStartDisposable.set(nil)
-                    self.statusPromise.set(.single(nil))
-                    self.videoNode = nil
-                    if self.delayCentralityLose {
-                        Queue.mainQueue().after(0.5) {
-                            videoNode.removeFromSupernode()
-                        }
-                    } else {
-                        videoNode.removeFromSupernode()
-                    }
-                }
-                if let videoContent = self.videoContent {
-                    let duration: Double = (self.videoStartTimestamp ?? 0.0) + 4.0
-                    self.preloadDisposable.set(preloadVideoResource(postbox: self.context.account.postbox, resourceReference: videoContent.fileReference.resourceReference(videoContent.fileReference.media.resource), duration: duration).start())
-                }
-            }
-        }
-    }
-    
-    init(context: AccountContext, peer: Peer) {
-        self.context = context
-        self.peer = peer
-        self.imageNode = TransformImageNode()
-        
-        self.statusNode = RadialStatusNode(backgroundNodeColor: UIColor(rgb: 0x000000, alpha: 0.3))
-        self.statusNode.isUserInteractionEnabled = false
-   
-        super.init()
-        
-        self.clipsToBounds = true
-                
-        self.imageNode.contentAnimations = [.firstUpdate, .subsequentUpdates]
-        self.addSubnode(self.imageNode)
-        self.addSubnode(self.statusNode)
-                
-        self.loadingProgressDisposable.set((combineLatest(self.isLoading.get()
-        |> mapToSignal { value -> Signal<Bool, NoError> in
-            if value {
-                return .single(value) |> delay(0.5, queue: Queue.mainQueue())
-            } else {
-                return .single(value)
-            }
-        } |> distinctUntilChanged, self.loadingProgress.get() |> distinctUntilChanged)).start(next: { [weak self] isLoading, progress in
-            guard let strongSelf = self else {
-                return
-            }
-            if isLoading, let progress = progress {
-                strongSelf.hasProgress = true
-                strongSelf.statusNode.transitionToState(.progress(color: .white, lineWidth: nil, value: CGFloat(max(0.027, progress)), cancelEnabled: false, animateRotation: true), completion: {})
-            } else if strongSelf.hasProgress {
-                strongSelf.hasProgress = false
-                strongSelf.statusNode.transitionToState(.progress(color: .white, lineWidth: nil, value: 1.0, cancelEnabled: false, animateRotation: true), completion: { [weak self] in
-                     guard let strongSelf = self else {
-                        return
-                    }
-                    if !strongSelf.hasProgress {
-                        Queue.mainQueue().after(0.3) {
-                            strongSelf.statusNode.transitionToState(.none, completion: {})
-                        }
-                    }
-                })
-            }
-        }))
-    }
-    
-    deinit {
-        self.statusDisposable.dispose()
-        self.playbackStartDisposable.dispose()
-        self.preloadDisposable.dispose()
-    }
-    
-    private func updateStatus() {
-        guard let videoContent = self.videoContent else {
-            return
-        }
-             
-        var bufferingProgress: Float?
-        if isMediaStreamable(resource: videoContent.fileReference.media.resource) {
-            if let playerStatus = self.playerStatus {
-                if case let .buffering(_, _, progress, _) = playerStatus.status {
-                    bufferingProgress = progress
-                } else if case .playing = playerStatus.status {
-                    bufferingProgress = nil
-                }
-            } else {
-                bufferingProgress = nil
-            }
-        }
-        self.loadingProgress.set(bufferingProgress)
-        self.isLoading.set(bufferingProgress != nil)
-    }
-    
-    func updateTransitionFraction(_ fraction: CGFloat, transition: ContainedViewLayoutTransition) {
-        if let videoNode = self.videoNode {
-            if case .immediate = transition, fraction == 1.0 {
-                return
-            }
-            transition.updateAlpha(node: videoNode, alpha: 1.0 - fraction)
-        }
-    }
-    
-    private func setupVideoPlayback() {
-        guard let videoContent = self.videoContent, let isCentral = self.isCentral, isCentral, self.videoNode == nil else {
-            return
-        }
-        
-        let mediaManager = self.context.sharedContext.mediaManager
-        let videoNode = UniversalVideoNode(postbox: self.context.account.postbox, audioSession: mediaManager.audioSession, manager: mediaManager.universalVideoManager, decoration: GalleryVideoDecoration(), content: videoContent, priority: .secondaryOverlay)
-        videoNode.isUserInteractionEnabled = false
-        videoNode.canAttachContent = true
-        videoNode.isHidden = true
-        
-        if let _ = self.videoStartTimestamp {
-            self.playbackStartDisposable.set((videoNode.status
-            |> map { status -> Bool in
-                if let status = status, case .playing = status.status {
-                    return true
-                } else {
-                    return false
-                }
-            }
-            |> filter { playing in
-                return playing
-            }
-            |> take(1)
-            |> deliverOnMainQueue).start(completed: { [weak self] in
-                if let strongSelf = self {
-                    Queue.mainQueue().after(0.1) {
-                        strongSelf.videoNode?.isHidden = false
-                    }
-                }
-            }))
-        } else {
-            self.playbackStartDisposable.set(nil)
-            videoNode.isHidden = false
-        }
-        videoNode.play()
-        
-        self.videoNode = videoNode
-        let videoStartTimestamp = self.videoStartTimestamp
-        self.statusPromise.set(videoNode.status |> map { ($0, videoStartTimestamp) })
-        
-        self.statusDisposable.set((self.mediaStatus
-        |> deliverOnMainQueue).start(next: { [weak self] mediaStatus in
-            if let strongSelf = self {
-                if let mediaStatusAndStartTimestamp = mediaStatus {
-                    strongSelf.playerStatus = mediaStatusAndStartTimestamp.0
-                }
-                strongSelf.updateStatus()
-            }
-        }))
-        
-        self.insertSubnode(videoNode, belowSubnode: self.statusNode)
-        
-        self.isReady.set(videoNode.ready |> map { return true })
-    }
-    
-    func setup(item: PeerInfoAvatarListItem, synchronous: Bool) {
-        self.item = item
-        
-        let representations: [ImageRepresentationWithReference]
-        let videoRepresentations: [VideoRepresentationWithReference]
-        let immediateThumbnailData: Data?
-        var id: Int64
-        switch item {
-        case let .topImage(topRepresentations, videoRepresentationsValue, immediateThumbnail):
-            representations = topRepresentations
-            videoRepresentations = videoRepresentationsValue
-            immediateThumbnailData = immediateThumbnail
-            id = Int64(self.peer.id.id)
-            if let resource = videoRepresentations.first?.representation.resource as? CloudPhotoSizeMediaResource {
-                id = id &+ resource.photoId
-            }
-        case let .image(reference, imageRepresentations, videoRepresentationsValue, immediateThumbnail):
-            representations = imageRepresentations
-            videoRepresentations = videoRepresentationsValue
-            immediateThumbnailData = immediateThumbnail
-            if case let .cloud(imageId, _, _) = reference {
-                id = imageId
-            } else {
-                id = Int64(self.peer.id.id)
-            }
-        }
-        self.imageNode.setSignal(chatAvatarGalleryPhoto(account: self.context.account, representations: representations, immediateThumbnailData: immediateThumbnailData, autoFetchFullSize: true, attemptSynchronously: synchronous), attemptSynchronously: synchronous, dispatchOnDisplayLink: false)
-        
-        if let video = videoRepresentations.last, let peerReference = PeerReference(self.peer) {
-            let videoFileReference = FileMediaReference.avatarList(peer: peerReference, media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: video.representation.resource, previewRepresentations: representations.map { $0.representation }, videoThumbnails: [], immediateThumbnailData: immediateThumbnailData, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: video.representation.dimensions, flags: [])]))
-            let videoContent = NativeVideoContent(id: .profileVideo(id, nil), fileReference: videoFileReference, streamVideo: isMediaStreamable(resource: video.representation.resource) ? .conservative : .none, loopVideo: true, enableSound: false, fetchAutomatically: true, onlyFullSizeThumbnail: false, useLargeThumbnail: true, autoFetchFullSizeThumbnail: true, startTimestamp: video.representation.startTimestamp, continuePlayingWithoutSoundOnLostAudioSession: false, placeholderColor: .clear)
-            
-            if videoContent.id != self.videoContent?.id {                
-                self.videoContent = videoContent
-                self.videoStartTimestamp = video.representation.startTimestamp
-                self.setupVideoPlayback()
-            }
-        } else {
-            if let videoNode = self.videoNode {
-                self.videoContent = nil
-                self.videoStartTimestamp = nil
-                self.videoNode = nil
-                          
-                videoNode.removeFromSupernode()
-            }
-            
-            self.statusPromise.set(.single(nil))
-            
-            self.statusDisposable.set(nil)
-            
-            self.imageNode.imageUpdated = { [weak self] _ in
-                guard let strongSelf = self else {
-                    return
-                }
-                if !strongSelf.didSetReady {
-                    strongSelf.didSetReady = true
-                    strongSelf.isReady.set(.single(true))
-                }
-            }
-        }
-    }
-    
-    func update(size: CGSize, transition: ContainedViewLayoutTransition) {
-        let imageSize = CGSize(width: min(size.width, size.height), height: min(size.width, size.height))
-        let makeLayout = self.imageNode.asyncLayout()
-        let applyLayout = makeLayout(TransformImageArguments(corners: ImageCorners(), imageSize: imageSize, boundingSize: imageSize, intrinsicInsets: UIEdgeInsets()))
-        let _ = applyLayout()
-        let imageFrame = CGRect(origin: CGPoint(x: floor((size.width - imageSize.width) / 2.0), y: floor((size.height - imageSize.height) / 2.0)), size: imageSize)
-        transition.updateFrame(node: self.imageNode, frame: imageFrame)
-        
-        transition.updateFrame(node: self.statusNode, frame: CGRect(origin: CGPoint(x: floor((size.width - 50.0) / 2.0), y: floor((size.height - 50.0) / 2.0)), size: CGSize(width: 50.0, height: 50.0)))
-        
-        if let videoNode = self.videoNode {
-            videoNode.updateLayout(size: imageSize, transition: .immediate)
-            videoNode.frame = imageFrame
-        }
-    }
-}
-
-private class PeerInfoAvatarListLoadingStripNode: ASImageNode {
-    private var currentInHierarchy = false
-    
-    let imageNode = ASImageNode()
-    
-    override init() {
-        super.init()
-        
-        self.addSubnode(self.imageNode)
-    }
-    
-    override public var isHidden: Bool {
-        didSet {
-            self.updateAnimation()
-        }
-    }
-    private var isAnimating = false {
-        didSet {
-            if self.isAnimating != oldValue {
-                if self.isAnimating {
-                    let basicAnimation = CABasicAnimation(keyPath: "opacity")
-                    basicAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut)
-                    basicAnimation.duration = 0.45
-                    basicAnimation.fromValue = 0.1
-                    basicAnimation.toValue = 0.75
-                    basicAnimation.repeatCount = Float.infinity
-                    basicAnimation.autoreverses = true
-                    
-                    self.imageNode.layer.add(basicAnimation, forKey: "loading")
-                } else {
-                    self.imageNode.layer.removeAnimation(forKey: "loading")
-                }
-            }
-        }
-    }
-    
-    private func updateAnimation() {
-        self.isAnimating = !self.isHidden && self.currentInHierarchy
-    }
-    
-    override public func willEnterHierarchy() {
-        super.willEnterHierarchy()
-        
-        self.currentInHierarchy = true
-        self.updateAnimation()
-    }
-    
-    override public func didExitHierarchy() {
-        super.didExitHierarchy()
-        
-        self.currentInHierarchy = false
-        self.updateAnimation()
-    }
-    
-    override func layout() {
-        super.layout()
-        
-        self.imageNode.frame = self.bounds
-    }
-}
-
-final class PeerInfoAvatarListContainerNode: ASDisplayNode {
-    private let context: AccountContext
-    var peer: Peer?
-    
-    let controlsContainerNode: ASDisplayNode
-    let controlsClippingNode: ASDisplayNode
-    let controlsClippingOffsetNode: ASDisplayNode
-    let shadowNode: ASImageNode
-    
-    let contentNode: ASDisplayNode
-    let leftHighlightNode: ASImageNode
-    let rightHighlightNode: ASImageNode
-    var highlightedSide: Bool?
-    let stripContainerNode: ASDisplayNode
-    let highlightContainerNode: ASDisplayNode
-    private(set) var galleryEntries: [AvatarGalleryEntry] = []
-    private var items: [PeerInfoAvatarListItem] = []
-    private var itemNodes: [WrappedMediaResourceId: PeerInfoAvatarListItemNode] = [:]
-    private var stripNodes: [ASImageNode] = []
-    private var activeStripNode: ASImageNode
-    private var loadingStripNode: PeerInfoAvatarListLoadingStripNode
-    private let activeStripImage: UIImage
-    private var appliedStripNodeCurrentIndex: Int?
-    var currentIndex: Int = 0
-    private var transitionFraction: CGFloat = 0.0
-    
-    private var validLayout: CGSize?
-    var isCollapsing = false
-    private var isExpanded = false
-    
-    private let disposable = MetaDisposable()
-    private let positionDisposable = MetaDisposable()
-    private var initializedList = false
-    private var ignoreNextProfilePhotoUpdate = false
-    var itemsUpdated: (([PeerInfoAvatarListItem]) -> Void)?
-    var currentIndexUpdated: (() -> Void)?
-    
-    let isReady = Promise<Bool>()
-    private var didSetReady = false
-    
-    var currentItemNode: PeerInfoAvatarListItemNode? {
-        if self.currentIndex >= 0 && self.currentIndex < self.items.count {
-            return self.itemNodes[self.items[self.currentIndex].id]
-        } else {
-            return nil
-        }
-    }
-    
-    var currentEntry: AvatarGalleryEntry? {
-        if self.currentIndex >= 0 && self.currentIndex < self.galleryEntries.count {
-            return self.galleryEntries[self.currentIndex]
-        } else {
-            return nil
-        }
-    }
-    
-    private var playerUpdateTimer: SwiftSignalKit.Timer?
-    private var playerStatus: (MediaPlayerStatus?, Double?)? {
-        didSet {
-            if self.playerStatus?.0 != oldValue?.0 || self.playerStatus?.1 != oldValue?.1 {
-                if let (playerStatus, _) = self.playerStatus, let status = playerStatus, case .playing = status.status {
-                    self.ensureHasTimer()
-                } else {
-                    self.stopTimer()
-                }
-                self.updateStatus()
-            }
-        }
-    }
-    
-    private func ensureHasTimer() {
-        if self.playerUpdateTimer == nil {
-            let timer = SwiftSignalKit.Timer(timeout: 0.016, repeat: true, completion: { [weak self] in
-                self?.updateStatus()
-                }, queue: Queue.mainQueue())
-            self.playerUpdateTimer = timer
-            timer.start()
-        }
-    }
-    
-    private var playbackProgress: CGFloat?
-    private var loading: Bool = false
-    private func updateStatus() {
-        var position: CGFloat = 1.0
-        var loading = false
-        if let (status, videoStartTimestamp) = self.playerStatus, let playerStatus = status {
-            var playerPosition: Double
-            if case .buffering = playerStatus.status {
-                loading = true
-            }
-            if !playerStatus.generationTimestamp.isZero, case .playing = playerStatus.status {
-                playerPosition = playerStatus.timestamp + (CACurrentMediaTime() - playerStatus.generationTimestamp)
-            } else {
-                playerPosition = playerStatus.timestamp
-            }
-            
-            if let videoStartTimestamp = videoStartTimestamp, false {
-                playerPosition -= videoStartTimestamp
-                if playerPosition < 0.0 {
-                    playerPosition = playerStatus.duration + playerPosition
-                }
-            }
-            
-            if playerStatus.duration.isZero {
-                position = 0.0
-            } else {
-                position = CGFloat(playerPosition / playerStatus.duration)
-            }
-        } else {
-            self.playbackProgress = nil
-        }
-        
-        if let size = self.validLayout {
-            self.playbackProgress = position
-            self.loading = loading
-            self.updateStrips(size: size, itemsAdded: false, stripTransition: .animated(duration: 0.3, curve: .spring))
-        }
-    }
-    
-    private func stopTimer() {
-        self.playerUpdateTimer?.invalidate()
-        self.playerUpdateTimer = nil
-    }
-    
-    init(context: AccountContext) {
-        self.context = context
-        
-        self.contentNode = ASDisplayNode()
-        
-        self.leftHighlightNode = ASImageNode()
-        self.leftHighlightNode.displaysAsynchronously = false
-        self.leftHighlightNode.displayWithoutProcessing = true
-        self.leftHighlightNode.contentMode = .scaleToFill
-        self.leftHighlightNode.image = generateImage(CGSize(width: 88.0, height: 1.0), contextGenerator: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            
-            let topColor = UIColor(rgb: 0x000000, alpha: 0.1)
-            let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
-            
-            var locations: [CGFloat] = [0.0, 1.0]
-            let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
-            
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
-            
-            context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-        })
-        self.leftHighlightNode.alpha = 0.0
-        
-        self.rightHighlightNode = ASImageNode()
-        self.rightHighlightNode.displaysAsynchronously = false
-        self.rightHighlightNode.displayWithoutProcessing = true
-        self.rightHighlightNode.contentMode = .scaleToFill
-        self.rightHighlightNode.image = generateImage(CGSize(width: 88.0, height: 1.0), contextGenerator: { size, context in
-            context.clear(CGRect(origin: CGPoint(), size: size))
-            
-            let topColor = UIColor(rgb: 0x000000, alpha: 0.1)
-            let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
-            
-            var locations: [CGFloat] = [0.0, 1.0]
-            let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
-            
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
-            
-            context.drawLinearGradient(gradient, start: CGPoint(x: size.width, y: 0.0), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-        })
-        self.rightHighlightNode.alpha = 0.0
-        
-        self.stripContainerNode = ASDisplayNode()
-        self.contentNode.addSubnode(self.stripContainerNode)
-        self.activeStripImage = generateSmallHorizontalStretchableFilledCircleImage(diameter: 2.0, color: .white)!
-        
-        self.activeStripNode = ASImageNode()
-        self.activeStripNode.image = self.activeStripImage
-        
-        self.loadingStripNode = PeerInfoAvatarListLoadingStripNode()
-        self.loadingStripNode.imageNode.image = self.activeStripImage
-        
-        self.highlightContainerNode = ASDisplayNode()
-        self.highlightContainerNode.addSubnode(self.leftHighlightNode)
-        self.highlightContainerNode.addSubnode(self.rightHighlightNode)
-        
-        self.controlsContainerNode = ASDisplayNode()
-        self.controlsContainerNode.isUserInteractionEnabled = false
-        
-        self.controlsClippingOffsetNode = ASDisplayNode()
-        
-        self.controlsClippingNode = ASDisplayNode()
-        self.controlsClippingNode.isUserInteractionEnabled = false
-        self.controlsClippingNode.clipsToBounds = true
-        
-        self.shadowNode = ASImageNode()
-        self.shadowNode.displaysAsynchronously = false
-        self.shadowNode.displayWithoutProcessing = true
-        self.shadowNode.contentMode = .scaleToFill
-        
-        do {
-            let size = CGSize(width: 88.0, height: 88.0)
-            UIGraphicsBeginImageContextWithOptions(size, false, 0.0)
-            if let context = UIGraphicsGetCurrentContext() {
-                context.clip(to: CGRect(origin: CGPoint(), size: size))
-                
-                let topColor = UIColor(rgb: 0x000000, alpha: 0.4)
-                let bottomColor = UIColor(rgb: 0x000000, alpha: 0.0)
-                
-                var locations: [CGFloat] = [0.0, 1.0]
-                let colors: [CGColor] = [topColor.cgColor, bottomColor.cgColor]
-                
-                let colorSpace = CGColorSpaceCreateDeviceRGB()
-                let gradient = CGGradient(colorsSpace: colorSpace, colors: colors as CFArray, locations: &locations)!
-                
-                context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: size.width, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-                
-                let image = UIGraphicsGetImageFromCurrentImageContext()
-                UIGraphicsEndImageContext()
-                if let image = image {
-                    self.shadowNode.image = generateImage(image.size, contextGenerator: { size, context in
-                        context.clear(CGRect(origin: CGPoint(), size: size))
-                        context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
-                        context.rotate(by: -CGFloat.pi / 2.0)
-                        context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
-                        context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: size))
-                    })
-                }
-            }
-        }
-        
-        super.init()
-        
-        self.backgroundColor = .black
-        
-        self.addSubnode(self.contentNode)
-        
-        self.controlsContainerNode.addSubnode(self.highlightContainerNode)
-        self.controlsContainerNode.addSubnode(self.shadowNode)
-        self.controlsContainerNode.addSubnode(self.stripContainerNode)
-        self.controlsClippingNode.addSubnode(self.controlsContainerNode)
-        self.controlsClippingOffsetNode.addSubnode(self.controlsClippingNode)
-        
-        self.view.disablesInteractiveTransitionGestureRecognizerNow = { [weak self] in
-            guard let strongSelf = self else {
-                return false
-            }
-            return strongSelf.currentIndex != 0
-        }
-        self.view.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(self.panGesture(_:))))
-        
-        let recognizer = TapLongTapOrDoubleTapGestureRecognizer(target: self, action: #selector(self.tapLongTapOrDoubleTapGesture(_:)))
-        recognizer.tapActionAtPoint = { _ in
-            return .keepWithSingleTap
-        }
-        recognizer.highlight = { [weak self] point in
-            guard let strongSelf = self, let size = strongSelf.validLayout else {
-                return
-            }
-            var highlightedSide: Bool?
-            if let point = point {
-                if point.x < size.width * 1.0 / 5.0 {
-                    if strongSelf.items.count > 1 {
-                        highlightedSide = false
-                    }
-                } else {
-                    if strongSelf.items.count > 1 {
-                        highlightedSide = true
-                    }
-                }
-            }
-            if strongSelf.highlightedSide != highlightedSide {
-                strongSelf.highlightedSide = highlightedSide
-                let leftAlpha: CGFloat
-                let rightAlpha: CGFloat
-                if let highlightedSide = highlightedSide {
-                    leftAlpha = highlightedSide ? 0.0 : 1.0
-                    rightAlpha = highlightedSide ? 1.0 : 0.0
-                } else {
-                    leftAlpha = 0.0
-                    rightAlpha = 0.0
-                }
-                if strongSelf.leftHighlightNode.alpha != leftAlpha {
-                    strongSelf.leftHighlightNode.alpha = leftAlpha
-                    if leftAlpha.isZero {
-                        strongSelf.leftHighlightNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.16, timingFunction: kCAMediaTimingFunctionSpring)
-                    } else {
-                        strongSelf.leftHighlightNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08)
-                    }
-                }
-                if strongSelf.rightHighlightNode.alpha != rightAlpha {
-                    strongSelf.rightHighlightNode.alpha = rightAlpha
-                    if rightAlpha.isZero {
-                        strongSelf.rightHighlightNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.16, timingFunction: kCAMediaTimingFunctionSpring)
-                    } else {
-                        strongSelf.rightHighlightNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.08)
-                    }
-                }
-            }
-        }
-        self.view.addGestureRecognizer(recognizer)
-    }
-    
-    deinit {
-        self.disposable.dispose()
-        self.positionDisposable.dispose()
-    }
-    
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        return super.hitTest(point, with: event)
-    }
-    
-    func selectFirstItem() {
-        let previousIndex = self.currentIndex
-        self.currentIndex = 0
-        if self.currentIndex != previousIndex {
-            self.currentIndexUpdated?()
-        }
-        if let size = self.validLayout {
-            self.updateItems(size: size, transition: .immediate, stripTransition: .immediate)
-        }
-    }
-    
-    func updateEntryIsHidden(entry: AvatarGalleryEntry?) {
-        if let entry = entry, let index = self.galleryEntries.firstIndex(of: entry) {
-            self.currentItemNode?.isHidden = index == self.currentIndex
-        } else {
-            self.currentItemNode?.isHidden = false
-        }
-    }
-    
-    @objc private func tapLongTapOrDoubleTapGesture(_ recognizer: TapLongTapOrDoubleTapGestureRecognizer) {
-        switch recognizer.state {
-        case .ended:
-            if let (gesture, location) = recognizer.lastRecognizedGestureAndLocation {
-                if let size = self.validLayout, case .tap = gesture {
-                    if location.x < size.width * 1.0 / 5.0 {
-                        if self.currentIndex != 0 {
-                            let previousIndex = self.currentIndex
-                            self.currentIndex -= 1
-                            if self.currentIndex != previousIndex {
-                                self.currentIndexUpdated?()
-                            }
-                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
-                        } else if self.items.count > 1 {
-                            let previousIndex = self.currentIndex
-                            self.currentIndex = self.items.count - 1
-                            if self.currentIndex != previousIndex {
-                                self.currentIndexUpdated?()
-                            }
-                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
-                        }
-                    } else {
-                        if self.currentIndex < self.items.count - 1 {
-                            let previousIndex = self.currentIndex
-                            self.currentIndex += 1
-                            if self.currentIndex != previousIndex {
-                                self.currentIndexUpdated?()
-                            }
-                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
-                        } else if self.items.count > 1 {
-                            let previousIndex = self.currentIndex
-                            self.currentIndex = 0
-                            if self.currentIndex != previousIndex {
-                                self.currentIndexUpdated?()
-                            }
-                            self.updateItems(size: size, transition: .immediate, stripTransition: .animated(duration: 0.3, curve: .spring), synchronous: true)
-                        }
-                    }
-                }
-            }
-        default:
-            break
-        }
-    }
-    
-    private var pageChangedByPan = false
-    @objc private func panGesture(_ recognizer: UIPanGestureRecognizer) {
-        switch recognizer.state {
-        case .changed:
-            let translation = recognizer.translation(in: self.view)
-            var transitionFraction = translation.x / self.bounds.width
-            if self.currentIndex <= 0 {
-                transitionFraction = min(0.0, transitionFraction)
-            }
-            if self.currentIndex >= self.items.count - 1 {
-                transitionFraction = max(0.0, transitionFraction)
-            }
-            self.transitionFraction = transitionFraction
-            if let size = self.validLayout {
-                self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring), stripTransition: .animated(duration: 0.3, curve: .spring))
-            }
-        case .cancelled, .ended:
-            let translation = recognizer.translation(in: self.view)
-            let velocity = recognizer.velocity(in: self.view)
-            var directionIsToRight: Bool?
-            if abs(velocity.x) > 10.0 {
-                directionIsToRight = velocity.x < 0.0
-            } else if abs(self.transitionFraction) > 0.5 {
-                directionIsToRight = self.transitionFraction < 0.0
-            }
-            var updatedIndex = self.currentIndex
-            if let directionIsToRight = directionIsToRight {
-                if directionIsToRight {
-                    updatedIndex = min(updatedIndex + 1, self.items.count - 1)
-                } else {
-                    updatedIndex = max(updatedIndex - 1, 0)
-                }
-            }
-            let previousIndex = self.currentIndex
-            self.currentIndex = updatedIndex
-            if self.currentIndex != previousIndex {
-                self.pageChangedByPan = true
-                self.currentIndexUpdated?()
-            }
-            self.transitionFraction = 0.0
-            if let size = self.validLayout {
-                self.updateItems(size: size, transition: .animated(duration: 0.3, curve: .spring), stripTransition: .animated(duration: 0.3, curve: .spring))
-                self.pageChangedByPan = false
-            }
-        default:
-            break
-        }
-    }
-    
-    func setMainItem(_ item: PeerInfoAvatarListItem) {
-        guard case let .image(image) = item else {
-            return
-        }
-        var items: [PeerInfoAvatarListItem] = []
-        var entries: [AvatarGalleryEntry] = []
-        for entry in self.galleryEntries {
-            switch entry {
-                case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
-                    entries.append(entry)
-                    items.append(.topImage(representations, videoRepresentations, immediateThumbnailData))
-                case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
-                    if image.0 == reference {
-                        entries.insert(entry, at: 0)
-                        items.insert(.image(reference, representations, videoRepresentations, immediateThumbnailData), at: 0)
-                    } else {
-                        entries.append(entry)
-                        items.append(.image(reference, representations, videoRepresentations, immediateThumbnailData))
-                    }
-            }
-        }
-        self.galleryEntries = normalizeEntries(entries)
-        self.items = items
-        self.itemsUpdated?(items)
-        let previousIndex = self.currentIndex
-        self.currentIndex = 0
-        if self.currentIndex != previousIndex {
-            self.currentIndexUpdated?()
-        }
-        self.ignoreNextProfilePhotoUpdate = true
-        if let size = self.validLayout {
-            self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
-        }
-    }
-    
-    func deleteItem(_ item: PeerInfoAvatarListItem) -> Bool {
-        guard case let .image(image) = item else {
-            return false
-        }
-                
-        var items: [PeerInfoAvatarListItem] = []
-        var entries: [AvatarGalleryEntry] = []
-        let previousIndex = self.currentIndex
-        
-        var index = 0
-        var deletedIndex: Int?
-        for entry in self.galleryEntries {
-            switch entry {
-                case let .topImage(representations, videoRepresentations, _, _, immediateThumbnailData, _):
-                    entries.append(entry)
-                    items.append(.topImage(representations, videoRepresentations, immediateThumbnailData))
-                case let .image(_, reference, representations, videoRepresentations, _, _, _, _, immediateThumbnailData, _):
-                    if image.0 != reference {
-                        entries.append(entry)
-                        items.append(.image(reference, representations, videoRepresentations, immediateThumbnailData))
-                    } else {
-                        deletedIndex = index
-                    }
-            }
-            index += 1
-        }
-        
-        
-        if let peer = self.peer, peer is TelegramGroup || peer is TelegramChannel, deletedIndex == 0 {
-            self.galleryEntries = []
-            self.items = []
-            self.itemsUpdated?([])
-            self.currentIndex = 0
-            if let size = self.validLayout {
-                self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
-            }
-            return true
-        }
-        
-        self.galleryEntries = normalizeEntries(entries)
-        self.items = items
-        self.itemsUpdated?(items)
-        self.currentIndex = max(0, previousIndex - 1)
-        if self.currentIndex != previousIndex {
-            self.currentIndexUpdated?()
-        }
-        self.ignoreNextProfilePhotoUpdate = true
-        if let size = self.validLayout {
-            self.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: true)
-        }
-        
-        return items.count == 0
-    }
-    
-    func update(size: CGSize, peer: Peer?, isExpanded: Bool, transition: ContainedViewLayoutTransition) {
-        self.validLayout = size
-        let previousExpanded = self.isExpanded
-        self.isExpanded = isExpanded
-        if !isExpanded && previousExpanded {
-            self.isCollapsing = true
-        }
-        self.leftHighlightNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: floor(size.width * 1.0 / 5.0), height: size.height))
-        self.rightHighlightNode.frame = CGRect(origin: CGPoint(x: size.width - floor(size.width * 1.0 / 5.0), y: 0.0), size: CGSize(width: floor(size.width * 1.0 / 5.0), height: size.height))
-        
-        if let peer = peer, !self.initializedList {
-            self.initializedList = true
-            self.disposable.set((peerInfoProfilePhotosWithCache(context: self.context, peerId: peer.id)
-            |> deliverOnMainQueue).start(next: { [weak self] (complete, entries) in
-                guard let strongSelf = self else {
-                    return
-                }
-                
-                if strongSelf.galleryEntries.count > 1, entries.count == 1 && !complete {
-                    return
-                }
-                
-                var entries = entries
-                var synchronous = false
-                if !strongSelf.galleryEntries.isEmpty, let updated = entries.first, case let .image(image) = updated, !image.3.isEmpty, let previous = strongSelf.galleryEntries.first, case let .topImage(topImage) = previous {
-                    let firstEntry = AvatarGalleryEntry.image(image.0, image.1, topImage.0, image.3, image.4, image.5, image.6, image.7, image.8, image.9)
-                    entries.remove(at: 0)
-                    entries.insert(firstEntry, at: 0)
-                    synchronous = true
-                }
-                
-                if strongSelf.ignoreNextProfilePhotoUpdate {
-                    if entries.count == 1, let first = entries.first, case .topImage = first {
-                        return
-                    } else {
-                        strongSelf.ignoreNextProfilePhotoUpdate = false
-                        synchronous = true
-                    }
-                }
-                
-                var items: [PeerInfoAvatarListItem] = []
-                for entry in entries {
-                    items.append(PeerInfoAvatarListItem(entry: entry))
-                }
-                strongSelf.galleryEntries = entries
-                strongSelf.items = items
-                strongSelf.itemsUpdated?(items)
-                if let size = strongSelf.validLayout {
-                    strongSelf.updateItems(size: size, update: true, transition: .immediate, stripTransition: .immediate, synchronous: synchronous)
-                }
-                if items.isEmpty {
-                    if !strongSelf.didSetReady {
-                        strongSelf.didSetReady = true
-                        strongSelf.isReady.set(.single(true))
-                    }
-                }
-            }))
-        }
-        self.updateItems(size: size, transition: transition, stripTransition: transition)
-    }
-    
-    private func updateStrips(size: CGSize, itemsAdded: Bool, stripTransition: ContainedViewLayoutTransition) {
-        let hadOneStripNode = self.stripNodes.count == 1
-        if self.stripNodes.count != self.items.count {
-            if self.stripNodes.count < self.items.count {
-                for _ in 0 ..< self.items.count - self.stripNodes.count {
-                    let stripNode = ASImageNode()
-                    stripNode.displaysAsynchronously = false
-                    stripNode.displayWithoutProcessing = true
-                    stripNode.image = self.activeStripImage
-                    stripNode.alpha = 0.2
-                    self.stripNodes.append(stripNode)
-                    self.stripContainerNode.addSubnode(stripNode)
-                }
-            } else {
-                for i in (self.items.count ..< self.stripNodes.count).reversed() {
-                    self.stripNodes[i].removeFromSupernode()
-                    self.stripNodes.remove(at: i)
-                }
-            }
-            self.stripContainerNode.addSubnode(self.activeStripNode)
-            self.stripContainerNode.addSubnode(self.loadingStripNode)
-        }
-        if self.appliedStripNodeCurrentIndex != self.currentIndex || itemsAdded {
-            if !self.itemNodes.isEmpty {
-                self.appliedStripNodeCurrentIndex = self.currentIndex
-            }
-            
-            if let currentItemNode = self.currentItemNode {
-                self.positionDisposable.set((currentItemNode.mediaStatus
-                    |> deliverOnMainQueue).start(next: { [weak self] statusAndVideoStartTimestamp in
-                        if let strongSelf = self {
-                            strongSelf.playerStatus = statusAndVideoStartTimestamp
-                        }
-                    }))
-            } else {
-                self.positionDisposable.set(nil)
-            }
-        }
-        if hadOneStripNode && self.stripNodes.count > 1 {
-            self.stripContainerNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.25)
-        }
-        let stripInset: CGFloat = 8.0
-        let stripSpacing: CGFloat = 4.0
-        let stripWidth: CGFloat = max(5.0, floor((size.width - stripInset * 2.0 - stripSpacing * CGFloat(self.stripNodes.count - 1)) / CGFloat(self.stripNodes.count)))
-        let currentStripMinX = stripInset + CGFloat(self.currentIndex) * (stripWidth + stripSpacing)
-        let currentStripMidX = floor(currentStripMinX + stripWidth / 2.0)
-        let lastStripMaxX = stripInset + CGFloat(self.stripNodes.count - 1) * (stripWidth + stripSpacing) + stripWidth
-        let stripOffset: CGFloat = min(0.0, max(size.width - stripInset - lastStripMaxX, size.width / 2.0 - currentStripMidX))
-        for i in 0 ..< self.stripNodes.count {
-            let stripX: CGFloat = stripInset + CGFloat(i) * (stripWidth + stripSpacing)
-            if i == 0 && self.stripNodes.count == 1 {
-                self.stripNodes[i].isHidden = true
-            } else {
-                self.stripNodes[i].isHidden = false
-            }
-            let stripFrame = CGRect(origin: CGPoint(x: stripOffset + stripX, y: 0.0), size: CGSize(width: stripWidth + 1.0, height: 2.0))
-            stripTransition.updateFrame(node: self.stripNodes[i], frame: stripFrame)
-        }
-        
-        if self.currentIndex >= 0 && self.currentIndex < self.stripNodes.count {
-            var frame = self.stripNodes[self.currentIndex].frame
-            stripTransition.updateFrame(node: self.loadingStripNode, frame: frame)
-            if let playbackProgress = self.playbackProgress {
-                frame.size.width = max(frame.size.height, frame.size.width * playbackProgress)
-            }
-            stripTransition.updateFrameAdditive(node: self.activeStripNode, frame: frame)
-            stripTransition.updateAlpha(node: self.activeStripNode, alpha: self.loading ? 0.0 : 1.0)
-            stripTransition.updateAlpha(node: self.loadingStripNode, alpha: self.loading ? 1.0 : 0.0)
-            
-            self.activeStripNode.isHidden = self.stripNodes.count < 2
-            self.loadingStripNode.isHidden = self.stripNodes.count < 2 || !self.loading
-        }
-    }
-    
-    private func updateItems(size: CGSize, update: Bool = false, transition: ContainedViewLayoutTransition, stripTransition: ContainedViewLayoutTransition, synchronous: Bool = false) {
-        var validIds: [WrappedMediaResourceId] = []
-        var addedItemNodesForAdditiveTransition: [PeerInfoAvatarListItemNode] = []
-        var additiveTransitionOffset: CGFloat = 0.0
-        var itemsAdded = false
-        if self.currentIndex >= 0 && self.currentIndex < self.items.count {
-            let preloadSpan: Int = 2
-            for i in max(0, self.currentIndex - preloadSpan) ... min(self.currentIndex + preloadSpan, self.items.count - 1) {
-                validIds.append(self.items[i].id)
-                var itemNode: PeerInfoAvatarListItemNode?
-                var wasAdded = false
-                if let current = self.itemNodes[self.items[i].id] {
-                    itemNode = current
-                    if update {
-                        current.setup(item: self.items[i], synchronous: synchronous && i == self.currentIndex)
-                    }
-                } else if let peer = self.peer {
-                    wasAdded = true
-                    let addedItemNode = PeerInfoAvatarListItemNode(context: self.context, peer: peer)
-                    itemNode = addedItemNode
-                    addedItemNode.setup(item: self.items[i], synchronous: (i == 0 && i == self.currentIndex) || (synchronous && i == self.currentIndex))
-                    self.itemNodes[self.items[i].id] = addedItemNode
-                    self.contentNode.addSubnode(addedItemNode)
-                }
-                if let itemNode = itemNode {
-                    itemNode.delayCentralityLose = self.pageChangedByPan
-                    itemNode.isCentral = i == self.currentIndex
-                    itemNode.delayCentralityLose = false
-                    
-                    let indexOffset = CGFloat(i - self.currentIndex)
-                    let itemFrame = CGRect(origin: CGPoint(x: indexOffset * size.width + self.transitionFraction * size.width - size.width / 2.0, y: -size.height / 2.0), size: size)
-                    
-                    if wasAdded {
-                        itemsAdded = true
-                        addedItemNodesForAdditiveTransition.append(itemNode)
-                        itemNode.frame = itemFrame
-                        itemNode.update(size: size, transition: .immediate)
-                    } else {
-                        additiveTransitionOffset = itemNode.frame.minX - itemFrame.minX
-                        transition.updateFrame(node: itemNode, frame: itemFrame)
-                        itemNode.update(size: size, transition: .immediate)
-                    }
-                }
-            }
-        }
-        for itemNode in addedItemNodesForAdditiveTransition {
-            transition.animatePositionAdditive(node: itemNode, offset: CGPoint(x: additiveTransitionOffset, y: 0.0))
-        }
-        var removeIds: [WrappedMediaResourceId] = []
-        for (id, _) in self.itemNodes {
-            if !validIds.contains(id) {
-                removeIds.append(id)
-            }
-        }
-        for id in removeIds {
-            if let itemNode = self.itemNodes.removeValue(forKey: id) {
-                itemNode.removeFromSupernode()
-            }
-        }
-        
-        self.updateStrips(size: size, itemsAdded: itemsAdded, stripTransition: stripTransition)
-        
-        if let item = self.items.first, let itemNode = self.itemNodes[item.id] {
-            if !self.didSetReady {
-                self.didSetReady = true
-                self.isReady.set(itemNode.isReady.get())
-            }
-        }
-    }
-}
-
 final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
     let context: AccountContext
     
@@ -1374,7 +365,7 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
     }
         
     var removedPhotoResourceIds = Set<String>()
-    func update(peer: Peer?, item: PeerInfoAvatarListItem?, theme: PresentationTheme, avatarSize: CGFloat, isExpanded: Bool) {
+    func update(peer: Peer?, item: PeerInfoAvatarListItem?, theme: PresentationTheme, avatarSize: CGFloat, isExpanded: Bool, isSettings: Bool) {
         if let peer = peer {
             let previousItem = self.item
             var item = item
@@ -1415,11 +406,16 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
                 let immediateThumbnailData: Data?
                 var id: Int64
                 switch item {
+                case .custom:
+                    representations = []
+                    videoRepresentations = []
+                    immediateThumbnailData = nil
+                    id = 0
                 case let .topImage(topRepresentations, videoRepresentationsValue, immediateThumbnail):
                     representations = topRepresentations
                     videoRepresentations = videoRepresentationsValue
                     immediateThumbnailData = immediateThumbnail
-                    id = Int64(peer.id.id)
+                    id = Int64(peer.id.id._internalGetInt32Value())
                     if let resource = videoRepresentations.first?.representation.resource as? CloudPhotoSizeMediaResource {
                         id = id &+ resource.photoId
                     }
@@ -1430,11 +426,11 @@ final class PeerInfoAvatarTransformContainerNode: ASDisplayNode {
                     if case let .cloud(imageId, _, _) = reference {
                         id = imageId
                     } else {
-                        id = Int64(peer.id.id)
+                        id = Int64(peer.id.id._internalGetInt32Value())
                     }
                 }
                 
-                self.containerNode.isGestureEnabled = true
+                self.containerNode.isGestureEnabled = !isSettings
                 
                 if let video = videoRepresentations.last, let peerReference = PeerReference(peer) {
                     let videoFileReference = FileMediaReference.avatarList(peer: peerReference, media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: video.representation.resource, previewRepresentations: representations.map { $0.representation }, videoThumbnails: [], immediateThumbnailData: immediateThumbnailData, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: video.representation.dimensions, flags: [])]))
@@ -1705,11 +701,16 @@ final class PeerInfoEditingAvatarNode: ASDisplayNode {
             let immediateThumbnailData: Data?
             var id: Int64
             switch item {
+                case .custom:
+                    representations = []
+                    videoRepresentations = []
+                    immediateThumbnailData = nil
+                    id = 0
                 case let .topImage(topRepresentations, videoRepresentationsValue, immediateThumbnail):
                     representations = topRepresentations
                     videoRepresentations = videoRepresentationsValue
                     immediateThumbnailData = immediateThumbnail
-                    id = Int64(peer.id.id)
+                    id = Int64(peer.id.id._internalGetInt32Value())
                     if let resource = videoRepresentations.first?.representation.resource as? CloudPhotoSizeMediaResource {
                         id = id &+ resource.photoId
                     }
@@ -1720,7 +721,7 @@ final class PeerInfoEditingAvatarNode: ASDisplayNode {
                     if case let .cloud(imageId, _, _) = reference {
                         id = imageId
                     } else {
-                        id = Int64(peer.id.id)
+                        id = Int64(peer.id.id._internalGetInt32Value())
                     }
             }
             
@@ -1780,6 +781,8 @@ final class PeerInfoEditingAvatarNode: ASDisplayNode {
 }
 
 final class PeerInfoAvatarListNode: ASDisplayNode {
+    private let isSettings: Bool
+    let pinchSourceNode: PinchSourceContainerNode
     let avatarContainerNode: PeerInfoAvatarTransformContainerNode
     let listContainerTransformNode: ASDisplayNode
     let listContainerNode: PeerInfoAvatarListContainerNode
@@ -1790,8 +793,13 @@ final class PeerInfoAvatarListNode: ASDisplayNode {
     var item: PeerInfoAvatarListItem?
     
     var itemsUpdated: (([PeerInfoAvatarListItem]) -> Void)?
+    var animateOverlaysFadeIn: (() -> Void)?
     
-    init(context: AccountContext,  readyWhenGalleryLoads: Bool) {
+    init(context: AccountContext, readyWhenGalleryLoads: Bool, isSettings: Bool) {
+        self.isSettings = isSettings
+
+        self.pinchSourceNode = PinchSourceContainerNode()
+        
         self.avatarContainerNode = PeerInfoAvatarTransformContainerNode(context: context)
         self.listContainerTransformNode = ASDisplayNode()
         self.listContainerNode = PeerInfoAvatarListContainerNode(context: context)
@@ -1799,10 +807,11 @@ final class PeerInfoAvatarListNode: ASDisplayNode {
         self.listContainerNode.isHidden = true
         
         super.init()
-        
-        self.addSubnode(self.avatarContainerNode)
+
+        self.addSubnode(self.pinchSourceNode)
+        self.pinchSourceNode.contentNode.addSubnode(self.avatarContainerNode)
         self.listContainerTransformNode.addSubnode(self.listContainerNode)
-        self.addSubnode(self.listContainerTransformNode)
+        self.pinchSourceNode.contentNode.addSubnode(self.listContainerTransformNode)
         
         let avatarReady = (self.avatarContainerNode.avatarNode.ready
         |> mapToSignal { _ -> Signal<Bool, NoError> in
@@ -1840,15 +849,34 @@ final class PeerInfoAvatarListNode: ASDisplayNode {
                 strongSelf.item = items.first
                 strongSelf.itemsUpdated?(items)
                 if let (peer, theme, avatarSize, isExpanded) = strongSelf.arguments {
-                    strongSelf.avatarContainerNode.update(peer: peer, item: strongSelf.item, theme: theme, avatarSize: avatarSize, isExpanded: isExpanded)
+                    strongSelf.avatarContainerNode.update(peer: peer, item: strongSelf.item, theme: theme, avatarSize: avatarSize, isExpanded: isExpanded, isSettings: strongSelf.isSettings)
                 }
             }
         }
+
+        self.pinchSourceNode.activate = { [weak self] sourceNode in
+            guard let _ = self else {
+                return
+            }
+            let pinchController = PinchController(sourceNode: sourceNode, getContentAreaInScreenSpace: {
+                return UIScreen.main.bounds
+            })
+            context.sharedContext.mainWindow?.presentInGlobalOverlay(pinchController)
+        }
+
+        self.pinchSourceNode.animatedOut = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.animateOverlaysFadeIn?()
+        }
     }
     
     func update(size: CGSize, avatarSize: CGFloat, isExpanded: Bool, peer: Peer?, theme: PresentationTheme, transition: ContainedViewLayoutTransition) {
         self.arguments = (peer, theme, avatarSize, isExpanded)
-        self.avatarContainerNode.update(peer: peer, item: self.item, theme: theme, avatarSize: avatarSize, isExpanded: isExpanded)
+        self.pinchSourceNode.update(size: size, transition: transition)
+        self.pinchSourceNode.frame = CGRect(origin: CGPoint(), size: size)
+        self.avatarContainerNode.update(peer: peer, item: self.item, theme: theme, avatarSize: avatarSize, isExpanded: isExpanded, isSettings: self.isSettings)
     }
     
     override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
@@ -2627,10 +1655,11 @@ final class PeerInfoHeaderNode: ASDisplayNode {
     let usernameNodeRawContainer: ASDisplayNode
     let usernameNode: MultiScaleTextNode
     var buttonNodes: [PeerInfoHeaderButtonKey: PeerInfoHeaderButtonNode] = [:]
-    private let backgroundNode: ASDisplayNode
-    private let expandedBackgroundNode: ASDisplayNode
+    private let backgroundNode: NavigationBackgroundNode
+    private let expandedBackgroundNode: NavigationBackgroundNode
     let separatorNode: ASDisplayNode
     let navigationBackgroundNode: ASDisplayNode
+    let navigationBackgroundBackgroundNode: ASDisplayNode
     var navigationTitle: String?
     let navigationTitleNode: ImmediateTextNode
     let navigationSeparatorNode: ASDisplayNode
@@ -2641,6 +1670,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
     var requestOpenAvatarForEditing: ((Bool) -> Void)?
     var cancelUpload: (() -> Void)?
     var requestUpdateLayout: (() -> Void)?
+    var animateOverlaysFadeIn: (() -> Void)?
     
     var displayAvatarContextMenu: ((ASDisplayNode, ContextGesture?) -> Void)?
     var displayCopyContextMenu: ((ASDisplayNode, Bool, Bool) -> Void)?
@@ -2654,7 +1684,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         self.isSettings = isSettings
         self.videoCallsEnabled = VideoCallsConfiguration(appConfiguration: context.currentAppConfiguration.with { $0 }).areVideoCallsEnabled
         
-        self.avatarListNode = PeerInfoAvatarListNode(context: context, readyWhenGalleryLoads: avatarInitiallyExpanded)
+        self.avatarListNode = PeerInfoAvatarListNode(context: context, readyWhenGalleryLoads: avatarInitiallyExpanded, isSettings: isSettings)
         
         self.titleNodeContainer = ASDisplayNode()
         self.titleNodeRawContainer = ASDisplayNode()
@@ -2692,7 +1722,11 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         self.avatarOverlayNode.isUserInteractionEnabled = false
         
         self.navigationBackgroundNode = ASDisplayNode()
+        self.navigationBackgroundNode.isHidden = true
         self.navigationBackgroundNode.isUserInteractionEnabled = false
+
+        self.navigationBackgroundBackgroundNode = ASDisplayNode()
+        self.navigationBackgroundBackgroundNode.isUserInteractionEnabled = false
         
         self.navigationTitleNode = ImmediateTextNode()
         
@@ -2700,10 +1734,12 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         
         self.navigationButtonContainer = PeerInfoHeaderNavigationButtonContainerNode()
         
-        self.backgroundNode = ASDisplayNode()
-        self.backgroundNode.isLayerBacked = true
-        self.expandedBackgroundNode = ASDisplayNode()
-        self.expandedBackgroundNode.isLayerBacked = true
+        self.backgroundNode = NavigationBackgroundNode(color: .clear)
+        self.backgroundNode.isHidden = true
+        self.backgroundNode.isUserInteractionEnabled = false
+        self.expandedBackgroundNode = NavigationBackgroundNode(color: .clear)
+        self.expandedBackgroundNode.isHidden = false
+        self.expandedBackgroundNode.isUserInteractionEnabled = false
         
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
@@ -2730,6 +1766,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         self.addSubnode(self.editingContentNode)
         self.addSubnode(self.avatarOverlayNode)
         self.addSubnode(self.navigationBackgroundNode)
+        self.navigationBackgroundNode.addSubnode(self.navigationBackgroundBackgroundNode)
         self.navigationBackgroundNode.addSubnode(self.navigationTitleNode)
         self.navigationBackgroundNode.addSubnode(self.navigationSeparatorNode)
         self.addSubnode(self.navigationButtonContainer)
@@ -2755,6 +1792,17 @@ final class PeerInfoHeaderNode: ASDisplayNode {
             }
             strongSelf.editingContentNode.avatarNode.update(peer: peer, item: strongSelf.avatarListNode.item, updatingAvatar: state.updatingAvatar, uploadProgress: state.avatarUploadProgress, theme: presentationData.theme, avatarSize: avatarSize, isEditing: state.isEditing)
         }
+
+        self.avatarListNode.animateOverlaysFadeIn = { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+            strongSelf.navigationButtonContainer.layer.animateAlpha(from: 0.0, to: strongSelf.navigationButtonContainer.alpha, duration: 0.25)
+            strongSelf.avatarListNode.listContainerNode.shadowNode.layer.animateAlpha(from: 0.0, to: strongSelf.avatarListNode.listContainerNode.shadowNode.alpha, duration: 0.25)
+            strongSelf.avatarListNode.listContainerNode.controlsContainerNode.layer.animateAlpha(from: 0.0, to: strongSelf.avatarListNode.listContainerNode.controlsContainerNode.alpha, duration: 0.25)
+
+            strongSelf.animateOverlaysFadeIn?()
+        }
     }
     
     override func didLoad() {
@@ -2903,24 +1951,24 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         var transitionSourceTitleFrame = CGRect()
         var transitionSourceSubtitleFrame = CGRect()
         
-        self.backgroundNode.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor
-        self.expandedBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor, transition: .immediate)
         
         if let navigationTransition = self.navigationTransition, let sourceAvatarNode = (navigationTransition.sourceNavigationBar.rightButtonNode.singleCustomNode as? ChatAvatarNavigationNode)?.avatarNode {
-            transitionSourceHeight = navigationTransition.sourceNavigationBar.bounds.height
+            transitionSourceHeight = navigationTransition.sourceNavigationBar.backgroundNode.bounds.height
             transitionFraction = navigationTransition.fraction
             transitionSourceAvatarFrame = sourceAvatarNode.view.convert(sourceAvatarNode.view.bounds, to: navigationTransition.sourceNavigationBar.view)
             transitionSourceTitleFrame = navigationTransition.sourceTitleFrame
             transitionSourceSubtitleFrame = navigationTransition.sourceSubtitleFrame
-            
-            transition.updateAlpha(node: self.expandedBackgroundNode, alpha: transitionFraction)
+
+            self.expandedBackgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor.mixedWith(presentationData.theme.list.itemBlocksBackgroundColor, alpha: 1.0 - transitionFraction), forceKeepBlur: true, transition: transition)
             
             if self.isAvatarExpanded, case .animated = transition, transitionFraction == 1.0 {
                 self.avatarListNode.animateAvatarCollapse(transition: transition)
             }
         } else {
             let backgroundTransitionFraction: CGFloat = max(0.0, min(1.0, contentOffset / (112.0 + avatarSize)))
-            transition.updateAlpha(node: self.expandedBackgroundNode, alpha: backgroundTransitionFraction)
+
+            self.expandedBackgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.opaqueBackgroundColor.mixedWith(presentationData.theme.list.itemBlocksBackgroundColor, alpha: 1.0 - backgroundTransitionFraction), forceKeepBlur: true, transition: transition)
         }
         
         self.avatarListNode.avatarContainerNode.updateTransitionFraction(transitionFraction, transition: transition)
@@ -2928,17 +1976,22 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         self.avatarOverlayNode.updateTransitionFraction(transitionFraction, transition: transition)
         
         if self.navigationTitle != presentationData.strings.EditProfile_Title || themeUpdated {
-            self.navigationTitleNode.attributedText = NSAttributedString(string: presentationData.strings.EditProfile_Title, font: Font.bold(17.0), textColor: presentationData.theme.rootController.navigationBar.primaryTextColor)
+            self.navigationTitleNode.attributedText = NSAttributedString(string: presentationData.strings.EditProfile_Title, font: Font.semibold(17.0), textColor: presentationData.theme.rootController.navigationBar.primaryTextColor)
         }
         
         let navigationTitleSize = self.navigationTitleNode.updateLayout(CGSize(width: width, height: navigationHeight))
         self.navigationTitleNode.frame = CGRect(origin: CGPoint(x: floorToScreenPixels((width - navigationTitleSize.width) / 2.0), y: navigationHeight - 44.0 + floorToScreenPixels((44.0 - navigationTitleSize.height) / 2.0)), size: navigationTitleSize)
         
         self.navigationBackgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: navigationHeight))
+        self.navigationBackgroundBackgroundNode.frame = CGRect(origin: CGPoint(), size: CGSize(width: width, height: navigationHeight))
         self.navigationSeparatorNode.frame = CGRect(origin: CGPoint(x: 0.0, y: navigationHeight), size: CGSize(width: width, height: UIScreenPixel))
-        self.navigationBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.navigationBackgroundBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.opaqueBackgroundColor
         self.navigationSeparatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
-        transition.updateAlpha(node: self.navigationBackgroundNode, alpha: state.isEditing && self.isSettings ? min(1.0, contentOffset / (navigationHeight * 0.5)) : 0.0)
+
+        let separatorAlpha: CGFloat = state.isEditing && self.isSettings ? min(1.0, contentOffset / (navigationHeight * 0.5)) : 0.0
+        transition.updateAlpha(node: self.navigationBackgroundBackgroundNode, alpha: 1.0 - separatorAlpha)
+        transition.updateAlpha(node: self.navigationSeparatorNode, alpha: separatorAlpha)
+
         self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor
         
         let defaultButtonSize: CGFloat = 40.0
@@ -2946,7 +1999,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         let expandedAvatarListHeight = min(width, containerHeight - expandedAvatarControlsHeight)
         let expandedAvatarListSize = CGSize(width: width, height: expandedAvatarListHeight)
         
-        let buttonKeys: [PeerInfoHeaderButtonKey] = self.isSettings ? [] : peerInfoHeaderButtons(peer: peer, cachedData: cachedData, isOpenedFromChat: self.isOpenedFromChat, videoCallsEnabled: self.videoCallsEnabled, isSecretChat: isSecretChat, isContact: isContact)
+        let buttonKeys: [PeerInfoHeaderButtonKey] = self.isSettings ? [] : peerInfoHeaderButtons(peer: peer, cachedData: cachedData, isOpenedFromChat: self.isOpenedFromChat, isExpanded: false, videoCallsEnabled: self.videoCallsEnabled, isSecretChat: isSecretChat, isContact: isContact)
         
         var isVerified = false
         let titleString: NSAttributedString
@@ -2958,11 +2011,11 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         
         if let peer = peer {
             if peer.id == self.context.account.peerId && !self.isSettings {
-                titleString = NSAttributedString(string: presentationData.strings.Conversation_SavedMessages, font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+                titleString = NSAttributedString(string: presentationData.strings.Conversation_SavedMessages, font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
             } else if peer.id == self.context.account.peerId && !self.isSettings {
-                titleString = NSAttributedString(string: presentationData.strings.DialogList_Replies, font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+                titleString = NSAttributedString(string: presentationData.strings.DialogList_Replies, font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
             } else {
-                titleString = NSAttributedString(string: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+                titleString = NSAttributedString(string: peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder), font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
             }
             
             if self.isSettings, let user = peer as? TelegramUser {
@@ -2988,7 +2041,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
                 usernameString = NSAttributedString(string: "", font: Font.regular(15.0), textColor: presentationData.theme.list.itemSecondaryTextColor)
             }
         } else {
-            titleString = NSAttributedString(string: " ", font: Font.medium(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
+            titleString = NSAttributedString(string: " ", font: Font.semibold(24.0), textColor: presentationData.theme.list.itemPrimaryTextColor)
             subtitleString = NSAttributedString(string: " ", font: Font.regular(15.0), textColor: presentationData.theme.list.itemSecondaryTextColor)
             usernameString = NSAttributedString(string: "", font: Font.regular(15.0), textColor: presentationData.theme.list.itemSecondaryTextColor)
         }
@@ -3416,21 +2469,7 @@ final class PeerInfoHeaderNode: ASDisplayNode {
             
             let hiddenWhileExpanded: Bool
             if buttonKeys.count > 3 {
-                if self.isOpenedFromChat {
-                    switch buttonKey {
-                    case .message, .search, .mute:
-                        hiddenWhileExpanded = true
-                    default:
-                        hiddenWhileExpanded = false
-                    }
-                } else {
-                    switch buttonKey {
-                    case .mute, .search, .videoCall:
-                        hiddenWhileExpanded = true
-                    default:
-                        hiddenWhileExpanded = false
-                    }
-                }
+                hiddenWhileExpanded = peerInfoHeaderButtonIsHiddenWhileExpanded(buttonKey: buttonKey, isOpenedFromChat: self.isOpenedFromChat)
             } else {
                 hiddenWhileExpanded = false
             }
@@ -3491,11 +2530,15 @@ final class PeerInfoHeaderNode: ASDisplayNode {
         
         if additive {
             transition.updateFrameAdditive(node: self.backgroundNode, frame: backgroundFrame)
+            self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
             transition.updateFrameAdditive(node: self.expandedBackgroundNode, frame: backgroundFrame)
+            self.expandedBackgroundNode.update(size: self.expandedBackgroundNode.bounds.size, transition: transition)
             transition.updateFrameAdditive(node: self.separatorNode, frame: separatorFrame)
         } else {
             transition.updateFrame(node: self.backgroundNode, frame: backgroundFrame)
+            self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
             transition.updateFrame(node: self.expandedBackgroundNode, frame: backgroundFrame)
+            self.expandedBackgroundNode.update(size: self.expandedBackgroundNode.bounds.size, transition: transition)
             transition.updateFrame(node: self.separatorNode, frame: separatorFrame)
         }
         
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift
index a8c0ba2799..d2caec111c 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoMembers.swift
@@ -147,7 +147,7 @@ private final class PeerInfoMembersContextImpl {
         self.pushState()
         
         if peerId.namespace == Namespaces.Peer.CloudChannel {
-            let (disposable, control) = context.peerChannelMemberCategoriesContextsManager.recent(postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { [weak self] state in
+            let (disposable, control) = context.peerChannelMemberCategoriesContextsManager.recent(engine: context.engine, postbox: context.account.postbox, network: context.account.network, accountPeerId: context.account.peerId, peerId: peerId, updated: { [weak self] state in
                 queue.async {
                     guard let strongSelf = self else {
                         return
@@ -230,10 +230,10 @@ private final class PeerInfoMembersContextImpl {
         if removingMemberIds[memberId] == nil {
             let signal: Signal<Never, NoError>
             if self.peerId.namespace == Namespaces.Peer.CloudChannel {
-                signal = context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(account: self.context.account, peerId: self.peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
+                signal = context.peerChannelMemberCategoriesContextsManager.updateMemberBannedRights(engine: self.context.engine, peerId: self.peerId, memberId: memberId, bannedRights: TelegramChatBannedRights(flags: [.banReadMessages], untilDate: Int32.max))
                 |> ignoreValues
             } else {
-                signal = removePeerMember(account: self.context.account, peerId: self.peerId, memberId: memberId)
+                signal = self.context.engine.peers.removePeerMember(peerId: self.peerId, memberId: memberId)
                 |> ignoreValues
             }
             let completed: () -> Void = { [weak self] in
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
index 5a1e4ce3d1..22b50b5d73 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoPaneContainerNode.swift
@@ -24,6 +24,7 @@ protocol PeerInfoPaneNode: ASDisplayNode {
     func addToTransitionSurface(view: UIView)
     func updateHiddenMedia()
     func updateSelectedMessages(animated: Bool)
+    func ensureMessageIsVisible(id: MessageId)
 }
 
 final class PeerInfoPaneWrapper {
@@ -432,7 +433,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
     
     weak var parentController: ViewController?
     
-    private let coveringBackgroundNode: ASDisplayNode
+    private let coveringBackgroundNode: NavigationBackgroundNode
     private let separatorNode: ASDisplayNode
     private let tabsContainerNode: PeerInfoPaneTabsContainerNode
     private let tabsSeparatorNode: ASDisplayNode
@@ -476,8 +477,8 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
         self.separatorNode = ASDisplayNode()
         self.separatorNode.isLayerBacked = true
         
-        self.coveringBackgroundNode = ASDisplayNode()
-        self.coveringBackgroundNode.isLayerBacked = true
+        self.coveringBackgroundNode = NavigationBackgroundNode(color: .clear)
+        self.coveringBackgroundNode.isUserInteractionEnabled = false
         
         self.tabsContainerNode = PeerInfoPaneTabsContainerNode()
         
@@ -691,7 +692,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
         transition.updateAlpha(node: self.coveringBackgroundNode, alpha: expansionFraction)
         
         self.backgroundColor = presentationData.theme.list.itemBlocksBackgroundColor
-        self.coveringBackgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.coveringBackgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.opaqueBackgroundColor, transition: .immediate)
         self.separatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor
         self.tabsSeparatorNode.backgroundColor = presentationData.theme.list.itemBlocksSeparatorColor
         
@@ -699,6 +700,7 @@ final class PeerInfoPaneContainerNode: ASDisplayNode, UIGestureRecognizerDelegat
         
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
         transition.updateFrame(node: self.coveringBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: size.width, height: tabsHeight + UIScreenPixel)))
+        self.coveringBackgroundNode.update(size: self.coveringBackgroundNode.bounds.size, transition: transition)
         
         transition.updateFrame(node: self.tabsSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: tabsHeight - UIScreenPixel), size: CGSize(width: size.width, height: UIScreenPixel)))
         
diff --git a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
index 44d6c182a4..2ab5172acb 100644
--- a/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
+++ b/submodules/TelegramUI/Sources/PeerInfo/PeerInfoScreen.swift
@@ -59,6 +59,8 @@ import MediaResources
 import HashtagSearchUI
 import ActionSheetPeerItem
 import TelegramCallsUI
+import PeerInfoAvatarListNode
+import PasswordSetupUI
 
 protocol PeerInfoScreenItem: class {
     var id: AnyHashable { get }
@@ -345,7 +347,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
     
     let selectionPanel: ChatMessageSelectionInputPanelNode
     let separatorNode: ASDisplayNode
-    let backgroundNode: ASDisplayNode
+    let backgroundNode: NavigationBackgroundNode
     
     init(context: AccountContext, peerId: PeerId, deleteMessages: @escaping () -> Void, shareMessages: @escaping () -> Void, forwardMessages: @escaping () -> Void, reportMessages: @escaping () -> Void) {
         self.context = context
@@ -358,11 +360,10 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         
         self.separatorNode = ASDisplayNode()
-        self.backgroundNode = ASDisplayNode()
+        self.backgroundNode = NavigationBackgroundNode(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor)
         
         self.selectionPanel = ChatMessageSelectionInputPanelNode(theme: presentationData.theme, strings: presentationData.strings, peerMedia: true)
         self.selectionPanel.context = context
-        self.selectionPanel.backgroundColor = presentationData.theme.chat.inputPanel.panelBackgroundColor
         
         let interfaceInteraction = ChatPanelInterfaceInteraction(setupReplyMessage: { _, _ in
         }, setupEditMessage: { _, _ in
@@ -412,7 +413,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
         }, displayVideoUnmuteTip: { _ in
         }, switchMediaRecordingMode: {
         }, setupMessageAutoremoveTimeout: {
-        }, sendSticker: { _, _, _ in
+        }, sendSticker: { _, _, _, _ in
             return false
         }, unblockPeer: {
         }, pinMessage: { _, _ in
@@ -452,7 +453,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
         }, presentInviteMembers: {
         }, presentGigagroupHelp: {
         }, editMessageMedia: { _, _ in
-        }, statuses: nil)
+        }, updateShowCommands: { _ in }, statuses: nil)
         
         self.selectionPanel.interfaceInteraction = interfaceInteraction
         
@@ -464,7 +465,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
     }
     
     func update(layout: ContainerViewLayout, presentationData: PresentationData, transition: ContainedViewLayoutTransition) -> CGFloat {
-        self.backgroundNode.backgroundColor = presentationData.theme.rootController.navigationBar.backgroundColor
+        self.backgroundNode.updateColor(color: presentationData.theme.rootController.navigationBar.blurredBackgroundColor, transition: .immediate)
         self.separatorNode.backgroundColor = presentationData.theme.rootController.navigationBar.separatorColor
         
         let interfaceState = ChatPresentationInterfaceState(chatWallpaper: .color(0), theme: presentationData.theme, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameDisplayOrder: presentationData.nameDisplayOrder, limitsConfiguration: .defaultValue, fontSize: .regular, bubbleCorners: PresentationChatBubbleCorners(mainRadius: 16.0, auxiliaryRadius: 8.0, mergeBubbleCorners: true), accountPeerId: self.context.account.peerId, mode: .standard(previewing: false), chatLocation: .peer(self.peerId), subject: nil, peerNearbyData: nil, greetingData: nil, pendingUnpinnedAllMessages: false, activeGroupCallInfo: nil, hasActiveGroupCall: false, importState: nil)
@@ -475,6 +476,7 @@ final class PeerInfoSelectionPanelNode: ASDisplayNode {
         let panelHeightWithInset = panelHeight + layout.intrinsicInsets.bottom
         
         transition.updateFrame(node: self.backgroundNode, frame: CGRect(origin: CGPoint(), size: CGSize(width: layout.size.width, height: panelHeightWithInset)))
+        self.backgroundNode.update(size: self.backgroundNode.bounds.size, transition: transition)
         transition.updateFrame(node: self.separatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: -UIScreenPixel), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
         
         return panelHeightWithInset
@@ -523,10 +525,12 @@ private enum PeerInfoSettingsSection {
     case watch
     case support
     case faq
+    case tips
     case phoneNumber
     case username
     case addAccount
     case logout
+    case rememberPassword
 }
 
 private final class PeerInfoInteraction {
@@ -566,6 +570,7 @@ private final class PeerInfoInteraction {
     let accountContextMenu: (AccountRecordId, ASDisplayNode, ContextGesture?) -> Void
     let updateBio: (String) -> Void
     let openDeletePeer: () -> Void
+    let openFaq: (String?) -> Void
     
     init(
         openUsername: @escaping (String) -> Void,
@@ -603,7 +608,8 @@ private final class PeerInfoInteraction {
         logoutAccount: @escaping (AccountRecordId) -> Void,
         accountContextMenu: @escaping (AccountRecordId, ASDisplayNode, ContextGesture?) -> Void,
         updateBio: @escaping (String) -> Void,
-        openDeletePeer: @escaping () -> Void
+        openDeletePeer: @escaping () -> Void,
+        openFaq: @escaping (String?) -> Void
     ) {
         self.openUsername = openUsername
         self.openPhone = openPhone
@@ -641,6 +647,7 @@ private final class PeerInfoInteraction {
         self.accountContextMenu = accountContextMenu
         self.updateBio = updateBio
         self.openDeletePeer = openDeletePeer
+        self.openFaq = openFaq
     }
 }
 
@@ -690,16 +697,26 @@ private func settingsItems(data: PeerInfoScreenData?, context: AccountContext, p
     
     if let settings = data.globalSettings {
         if settings.suggestPhoneNumberConfirmation, let peer = data.peer as? TelegramUser {
-            //
-            //                           entries.append(.phoneInfo(presentationData.theme, presentationData.strings.Settings_CheckPhoneNumberTitle(phoneNumber).0, presentationData.strings.Settings_CheckPhoneNumberText))
-            //                           entries.append(.keepPhone(presentationData.theme, presentationData.strings.Settings_KeepPhoneNumber(phoneNumber).0))
-            //                           entries.append(.changePhone(presentationData.theme, presentationData.strings.Settings_ChangePhoneNumber))
             let phoneNumber = formatPhoneNumber(peer.phone ?? "")
-            items[.phone]!.append(PeerInfoScreenActionItem(id: 2, text: presentationData.strings.Settings_KeepPhoneNumber(phoneNumber).0, action: {
-                interaction.openSettings(.addAccount)
+            items[.phone]!.append(PeerInfoScreenInfoItem(id: 0, title: presentationData.strings.Settings_CheckPhoneNumberTitle(phoneNumber).0, text: .markdown(presentationData.strings.Settings_CheckPhoneNumberText), linkAction: { link in
+                if case .tap = link {
+                    interaction.openFaq("q-i-have-a-new-phone-number-what-do-i-do")
+                }
+            }))
+            items[.phone]!.append(PeerInfoScreenActionItem(id: 1, text: presentationData.strings.Settings_KeepPhoneNumber(phoneNumber).0, action: {
+                let _ = dismissServerProvidedSuggestion(account: context.account, suggestion: .validatePhoneNumber).start()
             }))
             items[.phone]!.append(PeerInfoScreenActionItem(id: 2, text: presentationData.strings.Settings_ChangePhoneNumber, action: {
-                interaction.openSettings(.addAccount)
+                interaction.openSettings(.phoneNumber)
+            }))
+        } else if settings.suggestPasswordConfirmation {
+            items[.phone]!.append(PeerInfoScreenInfoItem(id: 0, title: presentationData.strings.Settings_CheckPasswordTitle, text: .markdown(presentationData.strings.Settings_CheckPasswordText), linkAction: { _ in
+            }))
+            items[.phone]!.append(PeerInfoScreenActionItem(id: 1, text: presentationData.strings.Settings_KeepPassword, action: {
+                let _ = dismissServerProvidedSuggestion(account: context.account, suggestion: .validatePassword).start()
+            }))
+            items[.phone]!.append(PeerInfoScreenActionItem(id: 2, text: presentationData.strings.Settings_TryEnterPassword, action: {
+                interaction.openSettings(.rememberPassword)
             }))
         }
         
@@ -822,6 +839,9 @@ private func settingsItems(data: PeerInfoScreenData?, context: AccountContext, p
     items[.support]!.append(PeerInfoScreenDisclosureItem(id: 1, text: presentationData.strings.Settings_FAQ, icon: PresentationResourcesSettings.faq, action: {
         interaction.openSettings(.faq)
     }))
+    items[.support]!.append(PeerInfoScreenDisclosureItem(id: 2, text: presentationData.strings.Settings_Tips, icon: PresentationResourcesSettings.tips, action: {
+        interaction.openSettings(.tips)
+    }))
     
     var result: [(AnyHashable, [PeerInfoScreenItem])] = []
     for section in SettingsSection.allCases {
@@ -1216,7 +1236,7 @@ private func editingItems(data: PeerInfoScreenData?, context: AccountContext, pr
                     }))
                 }
                 
-                if channel.flags.contains(.isCreator) || (channel.adminRights != nil && channel.hasPermission(.pinMessages)) {
+                if channel.flags.contains(.isCreator) || (channel.adminRights != nil && channel.hasPermission(.sendMessages)) {
                     let messagesShouldHaveSignatures: Bool
                     switch channel.info {
                     case let .broadcast(info):
@@ -1284,7 +1304,7 @@ private func editingItems(data: PeerInfoScreenData?, context: AccountContext, pr
                             }
                         } else {
                             if cachedData.flags.contains(.canChangeUsername) {
-                                items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: .text(isPublic ? presentationData.strings.Channel_Setup_TypePublic : presentationData.strings.Channel_Setup_TypePrivate), text: presentationData.strings.GroupInfo_GroupType, icon: UIImage(bundleImageName: "Chat/Info/GroupTypeIcon"), action: {
+                                items[.peerPublicSettings]!.append(PeerInfoScreenDisclosureItem(id: ItemUsername, label: .text(isPublic ? presentationData.strings.Group_Setup_TypePublic : presentationData.strings.Group_Setup_TypePrivate), text: presentationData.strings.GroupInfo_GroupType, icon: UIImage(bundleImageName: "Chat/Info/GroupTypeIcon"), action: {
                                     interaction.editingOpenPublicLinkSetup()
                                 }))
                             }
@@ -1520,6 +1540,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     private let selectAddMemberDisposable = MetaDisposable()
     private let addMemberDisposable = MetaDisposable()
     private let preloadHistoryDisposable = MetaDisposable()
+    private var shareStatusDisposable: MetaDisposable?
     
     private let editAvatarDisposable = MetaDisposable()
     private let updateAvatarDisposable = MetaDisposable()
@@ -1527,9 +1548,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     private var groupMembersSearchContext: GroupMembersSearchContext?
     
-    private let preloadedSticker = Promise<TelegramMediaFile?>(nil)
-    private let preloadStickerDisposable = MetaDisposable()
-    
     private let displayAsPeersPromise = Promise<[FoundPeer]>([])
     
     fileprivate let accountsAndPeers = Promise<[(Account, Peer, Int32)]>()
@@ -1541,6 +1559,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     private let hasTwoStepAuth = Promise<Bool?>(nil)
     private let hasPassport = Promise<Bool>(false)
     private let supportPeerDisposable = MetaDisposable()
+    private let tipsPeerDisposable = MetaDisposable()
     private let cachedFaq = Promise<ResolvedUrl?>(nil)
     
     private let _ready = Promise<Bool>()
@@ -1680,6 +1699,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             },
             openDeletePeer: { [weak self] in
                 self?.openDeletePeer()
+            },
+            openFaq: { [weak self] anchor in
+                self?.openFaq(anchor: anchor)
             }
         )
         
@@ -1725,7 +1747,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     c.dismiss(completion: {
                         if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController {
                             let currentPeerId = strongSelf.peerId
-                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(currentPeerId), subject: .message(id: message.id, highlight: true), keepStack: .always, useExisting: false, purposefulAction: {
+                            strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(currentPeerId), subject: .message(id: message.id, highlight: true, timecode: nil), keepStack: .always, useExisting: false, purposefulAction: {
                                 var viewControllers = navigationController.viewControllers
                                 var indexesToRemove = Set<Int>()
                                 var keptCurrentChatController = false
@@ -1801,7 +1823,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                         c.dismiss(completion: {
                                             if let strongSelf = self {
                                                 strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                                             }
                                         })
                                     })))
@@ -1820,7 +1842,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                         c.dismiss(completion: {
                                             if let strongSelf = self {
                                                 strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start()
+                                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forLocalPeer).start()
                                             }
                                         })
                                     })))
@@ -1847,6 +1869,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(MessageContextExtractedContentSource(sourceNode: node)), items: .single(items), reactionItems: [], recognizer: nil, gesture: gesture)
                 strongSelf.controller?.window?.presentInGlobalOverlay(controller)
             })
+        }, activateMessagePinch: { _ in
         }, openMessageContextActions: { [weak self] message, node, rect, gesture in
             guard let strongSelf = self else {
                 gesture?.cancel()
@@ -1870,7 +1893,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             c.dismiss(completion: {
                                 if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController {
                                     let currentPeerId = strongSelf.peerId
-                                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(currentPeerId), subject: .message(id: message.id, highlight: true), keepStack: .always, useExisting: false, purposefulAction: {
+                                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(currentPeerId), subject: .message(id: message.id, highlight: true, timecode: nil), keepStack: .always, useExisting: false, purposefulAction: {
                                         var viewControllers = navigationController.viewControllers
                                         var indexesToRemove = Set<Int>()
                                         var keptCurrentChatController = false
@@ -1934,7 +1957,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                                 c.dismiss(completion: {
                                                     if let strongSelf = self {
                                                         strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                                        let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                                                        let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                                                     }
                                                 })
                                             })))
@@ -1953,7 +1976,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                                 c.dismiss(completion: {
                                                     if let strongSelf = self {
                                                         strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                                        let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start()
+                                                        let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forLocalPeer).start()
                                                     }
                                                 })
                                             })))
@@ -2016,11 +2039,11 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             strongSelf.paneContainerNode.updateSelectedMessageIds(strongSelf.state.selectedMessageIds, animated: true)
         }, sendCurrentMessage: { _ in
         }, sendMessage: { _ in
-        }, sendSticker: { _, _, _, _, _ in
+        }, sendSticker: { _, _, _, _, _, _, _ in
             return false
-        }, sendGif: { _, _, _ in
+        }, sendGif: { _, _, _, _, _ in
             return false
-        }, sendBotContextResultAsGif: { _, _, _, _ in
+        }, sendBotContextResultAsGif: { _, _, _, _, _ in
             return false
         }, requestMessageActionCallback: { _, _, _, _ in
         }, requestMessageActionUrlAuth: { _, _ in
@@ -2148,8 +2171,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         }, displayPsa: { _, _ in
         }, displayDiceTooltip: { _ in
         }, animateDiceSuccess: { _ in
-        }, greetingStickerNode: {
-            return nil
         }, openPeerContextMenu: { _, _, _, _, _ in
         }, openMessageReplies: { _, _, _ in
         }, openReplyThreadOriginalMessage: { _ in
@@ -2157,10 +2178,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         }, editMessageMedia: { _, _ in
         }, copyText: { _ in
         }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
         }, requestMessageUpdate: { _ in
         }, cancelInteractiveKeyboardGestures: {
         }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings,
-           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false))
+           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false), presentationContext: ChatPresentationContext(backgroundNode: nil))
         self.hiddenMediaDisposable = context.sharedContext.mediaManager.galleryHiddenMediaManager.hiddenIds().start(next: { [weak self] ids in
             guard let strongSelf = self else {
                 return
@@ -2331,7 +2354,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 self?.updateProfileVideo(image, asset: asset, adjustments: adjustments)
             }
             galleryController.removedEntry = { [weak self] entry in
-                let _ = self?.headerNode.avatarListNode.listContainerNode.deleteItem(PeerInfoAvatarListItem(entry: entry))
+                if let item = PeerInfoAvatarListItem(entry: entry) {
+                    let _ = self?.headerNode.avatarListNode.listContainerNode.deleteItem(item)
+                }
             }
             strongSelf.hiddenAvatarRepresentationDisposable.set((galleryController.hiddenMedia |> deliverOnMainQueue).start(next: { entry in
                 self?.headerNode.updateAvatarIsHidden(entry: entry)
@@ -2387,6 +2412,13 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 strongSelf.openAvatarForEditing()
             }
         }
+
+        self.headerNode.animateOverlaysFadeIn = { [weak self] in
+            guard let strongSelf = self, let navigationBar = strongSelf.controller?.navigationBar else {
+                return
+            }
+            navigationBar.layer.animateAlpha(from: 0.0, to: navigationBar.alpha, duration: 0.25)
+        }
         
         self.headerNode.requestUpdateLayout = { [weak self] in
             guard let strongSelf = self else {
@@ -2451,12 +2483,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                 var updateNameSignal: Signal<Void, NoError> = .complete()
                                 var hasProgress = false
                                 if peer.firstName != firstName || peer.lastName != lastName {
-                                    updateNameSignal = updateAccountPeerName(account: context.account, firstName: firstName, lastName: lastName)
+                                    updateNameSignal = context.engine.accountData.updateAccountPeerName(firstName: firstName, lastName: lastName)
                                     hasProgress = true
                                 }
                                 var updateBioSignal: Signal<Void, NoError> = .complete()
                                 if let bio = bio, bio != cachedData.about {
-                                    updateBioSignal = updateAbout(account: context.account, about: bio)
+                                    updateBioSignal = context.engine.accountData.updateAbout(about: bio)
                                     |> `catch` { _ -> Signal<Void, NoError> in
                                         return .complete()
                                     }
@@ -2515,7 +2547,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                     }
                                     strongSelf.controller?.present(statusController, in: .window(.root))
                                     
-                                    strongSelf.activeActionDisposable.set((updateContactName(account: context.account, peerId: peer.id, firstName: firstName, lastName: lastName)
+                                    strongSelf.activeActionDisposable.set((context.engine.contacts.updateContactName(peerId: peer.id, firstName: firstName, lastName: lastName)
                                     |> deliverOnMainQueue).start(error: { _ in
                                         dismissStatus?()
                                         
@@ -2577,7 +2609,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             var hasProgress = false
                             if title != group.title {
                                 updateDataSignals.append(
-                                    updatePeerTitle(account: strongSelf.context.account, peerId: group.id, title: title)
+                                    strongSelf.context.engine.peers.updatePeerTitle(peerId: group.id, title: title)
                                     |> ignoreValues
                                     |> mapError { _ in return Void() }
                                 )
@@ -2585,7 +2617,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             }
                             if description != (data.cachedData as? CachedGroupData)?.about {
                                 updateDataSignals.append(
-                                    updatePeerDescription(account: strongSelf.context.account, peerId: group.id, description: description.isEmpty ? nil : description)
+                                    strongSelf.context.engine.peers.updatePeerDescription(peerId: group.id, description: description.isEmpty ? nil : description)
                                     |> ignoreValues
                                     |> mapError { _ in return Void() }
                                 )
@@ -2635,7 +2667,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                 var hasProgress = false
                                 if title != channel.title {
                                     updateDataSignals.append(
-                                        updatePeerTitle(account: strongSelf.context.account, peerId: channel.id, title: title)
+                                        strongSelf.context.engine.peers.updatePeerTitle(peerId: channel.id, title: title)
                                         |> ignoreValues
                                         |> mapError { _ in return Void() }
                                     )
@@ -2643,7 +2675,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                 }
                                 if description != (data.cachedData as? CachedChannelData)?.about {
                                     updateDataSignals.append(
-                                        updatePeerDescription(account: strongSelf.context.account, peerId: channel.id, description: description.isEmpty ? nil : description)
+                                        strongSelf.context.engine.peers.updatePeerDescription(peerId: channel.id, description: description.isEmpty ? nil : description)
                                         |> ignoreValues
                                         |> mapError { _ in return Void() }
                                     )
@@ -2709,6 +2741,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 strongSelf.chatInterfaceInteraction.selectionState = strongSelf.state.selectedMessageIds.flatMap { ChatInterfaceSelectionState(selectedIds: $0) }
                 strongSelf.paneContainerNode.updateSelectedMessageIds(strongSelf.state.selectedMessageIds, animated: true)
             case .search:
+                strongSelf.headerNode.navigationButtonContainer.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.3, timingFunction: CAMediaTimingFunctionName.easeOut.rawValue)
                 strongSelf.activateSearch()
             case .editPhoto, .editVideo:
                 break
@@ -2719,12 +2752,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         if self.isSettings {
             self.notificationExceptions.set(.single(NotificationExceptionsList(peers: [:], settings: [:]))
             |> then(
-                notificationExceptionsList(postbox: context.account.postbox, network: context.account.network)
+                context.engine.peers.notificationExceptionsList()
                 |> map(Optional.init)
             ))
-            self.privacySettings.set(.single(nil) |> then(requestAccountPrivacySettings(account: context.account) |> map(Optional.init)))
-            self.archivedPacks.set(.single(nil) |> then(archivedStickerPacks(account: context.account) |> map(Optional.init)))
-            self.hasPassport.set(.single(false) |> then(twoStepAuthData(context.account.network)
+            self.privacySettings.set(.single(nil) |> then(context.engine.privacy.requestAccountPrivacySettings() |> map(Optional.init)))
+            self.archivedPacks.set(.single(nil) |> then(context.engine.stickers.archivedStickerPacks() |> map(Optional.init)))
+            self.hasPassport.set(.single(false) |> then(context.engine.auth.twoStepAuthData()
             |> map { value -> Bool in
                 return value.hasSecretValues
             }
@@ -2753,7 +2786,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 
                 if copyUsername, let username = user.username, !username.isEmpty {
                     actions.append(ContextMenuAction(content: .text(title: strongSelf.presentationData.strings.Settings_CopyUsername, accessibilityLabel: strongSelf.presentationData.strings.Settings_CopyUsername), action: { [weak self] in
-                        UIPasteboard.general.string = username
+                        UIPasteboard.general.string = "@\(username)"
                         
                         if let strongSelf = self {
                             let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
@@ -2773,14 +2806,20 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
         } else {
             screenData = peerInfoScreenData(context: context, peerId: peerId, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, isSettings: self.isSettings, ignoreGroupInCommon: ignoreGroupInCommon)
-            
+                        
             self.headerNode.displayAvatarContextMenu = { [weak self] node, gesture in
                 guard let strongSelf = self, let peer = strongSelf.data?.peer else {
                     return
                 }
                 
+                var currentIsVideo = false
+                let item = strongSelf.headerNode.avatarListNode.listContainerNode.currentItemNode?.item
+                if let item = item, case let .image(image) = item {
+                    currentIsVideo = !image.2.isEmpty
+                }
+                
                 let items: [ContextMenuItem] = [
-                    .action(ContextMenuActionItem(text: strongSelf.presentationData.strings.PeerInfo_ReportProfilePhoto, icon: { theme in
+                    .action(ContextMenuActionItem(text: currentIsVideo ? strongSelf.presentationData.strings.PeerInfo_ReportProfileVideo : strongSelf.presentationData.strings.PeerInfo_ReportProfilePhoto, icon: { theme in
                         return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Report"), color: theme.actionSheet.primaryTextColor)
                     }, action: { [weak self] c, f in                        
                         if let strongSelf = self, let parent = strongSelf.controller {
@@ -2798,7 +2837,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
             
             if [Namespaces.Peer.CloudGroup, Namespaces.Peer.CloudChannel].contains(peerId.namespace) {
-                self.displayAsPeersPromise.set(cachedGroupCallDisplayAsAvailablePeers(account: context.account, peerId: peerId))
+                self.displayAsPeersPromise.set(context.engine.calls.cachedGroupCallDisplayAsAvailablePeers(peerId: peerId))
             }
         }
         
@@ -2817,24 +2856,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         if let _ = nearbyPeerDistance {
             self.preloadHistoryDisposable.set(self.context.account.addAdditionalPreloadHistoryPeerId(peerId: peerId))
             
-            self.preloadedSticker.set(.single(nil)
-            |> then(randomGreetingSticker(account: context.account)
-            |> map { item in
-                return item?.file
-            }))
-            
-            self.preloadStickerDisposable.set((self.preloadedSticker.get()
-            |> mapToSignal { sticker -> Signal<Void, NoError> in
-                if let sticker = sticker {
-                    let _ = freeMediaFileInteractiveFetched(account: context.account, fileReference: .standalone(media: sticker)).start()
-                    return chatMessageAnimationData(postbox: context.account.postbox, resource: sticker.resource, fitzModifier: nil, width: 384, height: 384, synchronousLoad: false)
-                    |> mapToSignal { _ -> Signal<Void, NoError> in
-                        return .complete()
-                    }
-                } else {
-                    return .complete()
-                }
-            }).start())
+            self.context.prefetchManager?.prepareNextGreetingSticker()
         }
     }
     
@@ -2849,10 +2871,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.selectAddMemberDisposable.dispose()
         self.addMemberDisposable.dispose()
         self.preloadHistoryDisposable.dispose()
-        self.preloadStickerDisposable.dispose()
         self.resolvePeerByNameDisposable?.dispose()
         self.navigationActionDisposable.dispose()
         self.enqueueMediaMessageDisposable.dispose()
+        self.supportPeerDisposable.dispose()
+        self.tipsPeerDisposable.dispose()
+        self.shareStatusDisposable?.dispose()
     }
     
     override func didLoad() {
@@ -2916,19 +2940,24 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             var currentCallsPrivate: Bool?
             var previousVideoCallsAvailable: Bool? = true
             var currentVideoCallsAvailable: Bool?
-            
+                        
             if let previousCachedData = previousData?.cachedData as? CachedUserData, let cachedData = data.cachedData as? CachedUserData {
-                previousCallsPrivate = previousCachedData.callsPrivate ?? false
+                previousCallsPrivate = previousCachedData.callsPrivate
                 currentCallsPrivate = cachedData.callsPrivate
                 
-                previousVideoCallsAvailable = previousCachedData.videoCallsAvailable ?? true
+                previousVideoCallsAvailable = previousCachedData.videoCallsAvailable
                 currentVideoCallsAvailable = cachedData.videoCallsAvailable
             }
             
+            if let previousSuggestPhoneNumberConfirmation = previousData?.globalSettings?.suggestPhoneNumberConfirmation, previousSuggestPhoneNumberConfirmation != data.globalSettings?.suggestPhoneNumberConfirmation {
+                infoUpdated = true
+            }
+            if let previousSuggestPasswordConfirmation = previousData?.globalSettings?.suggestPasswordConfirmation, previousSuggestPasswordConfirmation != data.globalSettings?.suggestPasswordConfirmation {
+                infoUpdated = true
+            }
             if previousCallsPrivate != currentCallsPrivate || previousVideoCallsAvailable != currentVideoCallsAvailable {
                 infoUpdated = true
             }
-            
             if (previousCall == nil) != (currentCall == nil) {
                 infoUpdated = true
             }
@@ -3090,7 +3119,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             strongSelf.enqueueMediaMessageDisposable.set((legacyAssetPickerEnqueueMessages(account: strongSelf.context.account, signals: signals!)
                             |> deliverOnMainQueue).start(next: { [weak self] messages in
                                 if let strongSelf = self {
-                                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: strongSelf.peerId, messages: messages).start()
+                                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: strongSelf.peerId, messages: messages.map { $0.message }).start()
                                 }
                             }))
                         }
@@ -3099,7 +3128,10 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     })
                 }
             })
-        })))
+        }), centralItemUpdated: { [weak self] messageId in
+            self?.paneContainerNode.requestExpandTabs?()
+            self?.paneContainerNode.currentPane?.node.ensureMessageIsVisible(id: messageId)
+        }))
     }
     private func openResolved(_ result: ResolvedUrl) {
         guard let navigationController = self.controller?.navigationController as? NavigationController else {
@@ -3141,7 +3173,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     }
     
     private func openUrl(url: String, concealed: Bool, external: Bool) {
-        openUserGeneratedUrl(context: self.context, url: url, concealed: concealed, present: { [weak self] c in
+        openUserGeneratedUrl(context: self.context, peerId: self.peerId, url: url, concealed: concealed, present: { [weak self] c in
             self?.controller?.present(c, in: .window(.root))
         }, openResolved: { [weak self] tempResolved in
             guard let strongSelf = self else {
@@ -3211,7 +3243,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             disposable = MetaDisposable()
             self.resolvePeerByNameDisposable = disposable
         }
-        var resolveSignal = resolvePeerByName(account: self.context.account, name: name, ageLimit: 10)
+        var resolveSignal = self.context.engine.peers.resolvePeerByName(name: name, ageLimit: 10)
         
         var cancelImpl: (() -> Void)?
         let presentationData = self.presentationData
@@ -3275,7 +3307,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         let account = self.context.account
         var resolveSignal: Signal<Peer?, NoError>
         if let peerName = peerName {
-            resolveSignal = resolvePeerByName(account: self.context.account, name: peerName)
+            resolveSignal = self.context.engine.peers.resolvePeerByName(name: peerName)
             |> mapToSignal { peerId -> Signal<Peer?, NoError> in
                 if let peerId = peerId {
                     return account.postbox.loadedPeerWithId(peerId)
@@ -3330,24 +3362,18 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         switch key {
         case .message:
             if let navigationController = controller.navigationController as? NavigationController {
-                let _ = (self.preloadedSticker.get()
-                |> take(1)
-                |> deliverOnMainQueue).start(next: { [weak self] sticker in
-                    if let strongSelf = self {
-                        strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId), keepStack: strongSelf.nearbyPeerDistance != nil ? .always : .default, peerNearbyData: strongSelf.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), greetingData: strongSelf.nearbyPeerDistance != nil ? sticker.flatMap({ ChatGreetingData(sticker: $0) }) : nil, completion: { _ in
-                            if strongSelf.nearbyPeerDistance != nil {
-                                var viewControllers = navigationController.viewControllers
-                                viewControllers = viewControllers.filter { controller in
-                                    if controller is PeerInfoScreen {
-                                        return false
-                                    }
-                                    return true
-                                }
-                                navigationController.setViewControllers(viewControllers, animated: false)
+                self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(self.peerId), keepStack: self.nearbyPeerDistance != nil ? .always : .default, peerNearbyData: self.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), completion: { [weak self] _ in
+                    if let strongSelf = self, strongSelf.nearbyPeerDistance != nil {
+                        var viewControllers = navigationController.viewControllers
+                        viewControllers = viewControllers.filter { controller in
+                            if controller is PeerInfoScreen {
+                                return false
                             }
-                        }))
+                            return true
+                        }
+                        navigationController.setViewControllers(viewControllers, animated: false)
                     }
-                })
+                }))
             }
         case .discussion:
             if let cachedData = self.data?.cachedData as? CachedChannelData, case let .known(maybeLinkedDiscussionPeerId) = cachedData.linkedDiscussionPeerId, let linkedDiscussionPeerId = maybeLinkedDiscussionPeerId {
@@ -3360,10 +3386,10 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         case .videoCall:
             self.requestCall(isVideo: true)
         case .voiceChat:
-            self.requestCall(isVideo: false)
+            self.requestCall(isVideo: false, gesture: gesture)
         case .mute:
             if let notificationSettings = self.data?.notificationSettings, case .muted = notificationSettings.muteState {
-                let _ = updatePeerMuteSetting(account: self.context.account, peerId: self.peerId, muteInterval: nil).start()
+                let _ = self.context.engine.peers.updatePeerMuteSetting(peerId: self.peerId, muteInterval: nil).start()
             } else {
                 self.state = self.state.withHighlightedButton(.mute)
                 if let (layout, navigationHeight) = self.validLayout {
@@ -3389,7 +3415,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     }, action: { _, f in
                         f(.dismissWithoutContent)
                         
-                        let _ = updatePeerMuteSetting(account: self.context.account, peerId: self.peerId, muteInterval: delay).start()
+                        let _ = self.context.engine.peers.updatePeerMuteSetting(peerId: self.peerId, muteInterval: delay).start()
                     })))
                 }
                 
@@ -3406,16 +3432,16 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     
                     let context = strongSelf.context
                     let updatePeerSound: (PeerId, PeerMessageSound) -> Signal<Void, NoError> = { peerId, sound in
-                        return updatePeerNotificationSoundInteractive(account: context.account, peerId: peerId, sound: sound) |> deliverOnMainQueue
+                        return context.engine.peers.updatePeerNotificationSoundInteractive(peerId: peerId, sound: sound) |> deliverOnMainQueue
                     }
                     
                     let updatePeerNotificationInterval: (PeerId, Int32?) -> Signal<Void, NoError> = { peerId, muteInterval in
-                        return updatePeerMuteSetting(account: context.account, peerId: peerId, muteInterval: muteInterval) |> deliverOnMainQueue
+                        return context.engine.peers.updatePeerMuteSetting(peerId: peerId, muteInterval: muteInterval) |> deliverOnMainQueue
                     }
                     
                     let updatePeerDisplayPreviews:(PeerId, PeerNotificationDisplayPreviews) -> Signal<Void, NoError> = {
                         peerId, displayPreviews in
-                        return updatePeerDisplayPreviewsSetting(account: context.account, peerId: peerId, displayPreviews: displayPreviews) |> deliverOnMainQueue
+                        return context.engine.peers.updatePeerDisplayPreviewsSetting(peerId: peerId, displayPreviews: displayPreviews) |> deliverOnMainQueue
                     }
                     
                     let exceptionController = notificationPeerExceptionController(context: context, peer: peer, mode: .users([:]), edit: true, updatePeerSound: { peerId, sound in
@@ -3470,10 +3496,27 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             mainItemsImpl = {
                 var items: [ContextMenuItem] = []
                 
-                let headerButtons = peerInfoHeaderButtons(peer: peer, cachedData: data.cachedData, isOpenedFromChat: self.isOpenedFromChat, videoCallsEnabled: self.videoCallsEnabled, isSecretChat: self.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.data?.isContact ?? false)
+                let allHeaderButtons = Set(peerInfoHeaderButtons(peer: peer, cachedData: data.cachedData, isOpenedFromChat: self.isOpenedFromChat, isExpanded: false, videoCallsEnabled: self.videoCallsEnabled, isSecretChat: self.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.data?.isContact ?? false))
+                let headerButtons = Set(peerInfoHeaderButtons(peer: peer, cachedData: data.cachedData, isOpenedFromChat: self.isOpenedFromChat, isExpanded: self.headerNode.isAvatarExpanded, videoCallsEnabled: self.videoCallsEnabled, isSecretChat: self.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.data?.isContact ?? false))
                 
-                let hasSearch = !headerButtons.contains(.search) || (self.headerNode.isAvatarExpanded && self.peerId.namespace == Namespaces.Peer.CloudUser)
-                if hasSearch {
+                let filteredButtons = allHeaderButtons.subtracting(headerButtons)
+                if filteredButtons.contains(.addMember) {
+                    items.append(.action(ContextMenuActionItem(text: presentationData.strings.PeerInfo_ButtonAddMember, icon: { theme in
+                        generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/AddUser"), color: theme.contextMenu.primaryColor)
+                    }, action: { [weak self] _, f in
+                        f(.dismissWithoutContent)
+                        self?.openAddMember()
+                    })))
+                }
+                if filteredButtons.contains(.call) {
+                    items.append(.action(ContextMenuActionItem(text: presentationData.strings.PeerInfo_ButtonCall, icon: { theme in
+                        generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Call"), color: theme.contextMenu.primaryColor)
+                    }, action: { [weak self] _, f in
+                        f(.dismissWithoutContent)
+                        self?.requestCall(isVideo: false)
+                    })))
+                }
+                if filteredButtons.contains(.search) {
                     items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChatSearch_SearchPlaceholder, icon: { theme in
                         generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Search"), color: theme.contextMenu.primaryColor)
                     }, action: { [weak self] _, f in
@@ -3538,6 +3581,46 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             if let strongSelf = self, let peer = strongSelf.data?.peer as? TelegramUser, let phone = peer.phone {
                                 let contact = TelegramMediaContact(firstName: peer.firstName ?? "", lastName: peer.lastName ?? "", phoneNumber: phone, peerId: peer.id, vCardData: nil)
                                 let shareController = ShareController(context: strongSelf.context, subject: .media(.standalone(media: contact)))
+                                shareController.completed = { [weak self] peerIds in
+                                    if let strongSelf = self {
+                                        let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
+                                            var peers: [Peer] = []
+                                            for peerId in peerIds {
+                                                if let peer = transaction.getPeer(peerId) {
+                                                    peers.append(peer)
+                                                }
+                                            }
+                                            return peers
+                                        } |> deliverOnMainQueue).start(next: { [weak self] peers in
+                                            if let strongSelf = self {
+                                                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                                
+                                                let text: String
+                                                var savedMessages = false
+                                                if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId {
+                                                    text = presentationData.strings.UserInfo_ContactForwardTooltip_SavedMessages_One
+                                                    savedMessages = true
+                                                } else {
+                                                    if peers.count == 1, let peer = peers.first {
+                                                        let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                        text = presentationData.strings.UserInfo_ContactForwardTooltip_Chat_One(peerName).0
+                                                    } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                                                        let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                        let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                        text = presentationData.strings.UserInfo_ContactForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0
+                                                    } else if let peer = peers.first {
+                                                        let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                                        text = presentationData.strings.UserInfo_ContactForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0
+                                                    } else {
+                                                        text = ""
+                                                    }
+                                                }
+                                                
+                                                strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
+                                            }
+                                        })
+                                    }
+                                }
                                 strongSelf.controller?.present(shareController, in: .window(.root))
                             }
                         })))
@@ -3576,20 +3659,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         }
                     }
                 } else if let channel = peer as? TelegramChannel {
-                    if !channel.flags.contains(.hasVoiceChat) {
-                        if channel.flags.contains(.isCreator) || channel.hasPermission(.manageCalls) {
-                            items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in
-                                generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor)
-                            }, action: { [weak self] c, f in
-                                self?.requestCall(isVideo: false, contextController: c, result: f, backAction: { c in
-                                    if let mainItemsImpl = mainItemsImpl {
-                                        c.setItems(mainItemsImpl())
-                                    }
-                                })
-                            })))
-                        }
-                    }
-                    
                     if let cachedData = self.data?.cachedData as? CachedChannelData, cachedData.flags.contains(.canViewStats) {
                         items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_Stats, icon: { theme in
                             generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Statistics"), color: theme.contextMenu.primaryColor)
@@ -3636,19 +3705,17 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                 self?.openDeletePeer()
                             })))
                         } else {
-                            if !headerButtons.contains(.leave) {
-                                if case .member = channel.participationStatus {
-                                    if !items.isEmpty {
-                                        items.append(.separator)
-                                    }
-                                    items.append(.action(ContextMenuActionItem(text: presentationData.strings.Channel_LeaveChannel, textColor: .destructive, icon: { theme in
-                                        generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor)
-                                    }, action: { [weak self] _, f in
-                                        f(.dismissWithoutContent)
-                                        
-                                        self?.openLeavePeer()
-                                    })))
+                            if case .member = channel.participationStatus, !headerButtons.contains(.leave) {
+                                if !items.isEmpty {
+                                    items.append(.separator)
                                 }
+                                items.append(.action(ContextMenuActionItem(text: presentationData.strings.Channel_LeaveChannel, textColor: .destructive, icon: { theme in
+                                    generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Logout"), color: theme.contextMenu.destructiveColor)
+                                }, action: { [weak self] _, f in
+                                    f(.dismissWithoutContent)
+                                    
+                                    self?.openLeavePeer()
+                                })))
                             }
                         }
                     case .group:
@@ -3664,12 +3731,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                 self?.openDeletePeer()
                             })))
                         } else {
-                            if case .member = channel.participationStatus {
+                            if case .member = channel.participationStatus, !headerButtons.contains(.leave) {
                                 if !items.isEmpty {
                                     items.append(.separator)
                                 }
                                 items.append(.action(ContextMenuActionItem(text: presentationData.strings.Group_LeaveGroup, textColor: .destructive, icon: { theme in
-                                    generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor)
+                                    generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Logout"), color: theme.contextMenu.destructiveColor)
                                 }, action: { [weak self] _, f in
                                     f(.dismissWithoutContent)
                                     
@@ -3679,28 +3746,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         }
                     }
                 } else if let group = peer as? TelegramGroup {
-                    var canManageGroupCalls = false
-                    if case .creator = group.role {
-                        canManageGroupCalls = true
-                    } else if case let .admin(rights, _) = group.role {
-                        if rights.rights.contains(.canManageCalls) {
-                            canManageGroupCalls = true
-                        }
-                    }
-                    if canManageGroupCalls, !group.flags.contains(.hasVoiceChat) {
-                        items.append(.action(ContextMenuActionItem(text: presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in
-                            generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor)
-                        }, action: { [weak self] c, f in
-                            self?.requestCall(isVideo: false, contextController: c, result: f)
-                        })))
-                    }
-                    
-                    if case .Member = group.membership {
+                    if case .Member = group.membership, !headerButtons.contains(.leave) {
                         if !items.isEmpty {
                             items.append(.separator)
                         }
                         items.append(.action(ContextMenuActionItem(text: presentationData.strings.Group_LeaveGroup, textColor: .destructive, icon: { theme in
-                            generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Delete"), color: theme.contextMenu.destructiveColor)
+                            generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Logout"), color: theme.contextMenu.destructiveColor)
                         }, action: { [weak self] _, f in
                             f(.dismissWithoutContent)
                             
@@ -3737,24 +3788,18 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     private func openChatWithMessageSearch() {
         if let navigationController = (self.controller?.navigationController as? NavigationController) {
-            let _ = (self.preloadedSticker.get()
-            |> take(1)
-            |> deliverOnMainQueue).start(next: { [weak self] sticker in
-                if let strongSelf = self {
-                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId), keepStack: strongSelf.nearbyPeerDistance != nil ? .always : .default, activateMessageSearch: (.everything, ""), peerNearbyData: strongSelf.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), greetingData: strongSelf.nearbyPeerDistance != nil ? sticker.flatMap({ ChatGreetingData(sticker: $0) }) : nil, completion: { _ in
-                        if strongSelf.nearbyPeerDistance != nil {
-                            var viewControllers = navigationController.viewControllers
-                            viewControllers = viewControllers.filter { controller in
-                                if controller is PeerInfoScreen {
-                                    return false
-                                }
-                                return true
-                            }
-                            navigationController.setViewControllers(viewControllers, animated: false)
+            self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(self.peerId), keepStack: self.nearbyPeerDistance != nil ? .always : .default, activateMessageSearch: (.everything, ""), peerNearbyData: self.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), completion: { [weak self] _ in
+                if let strongSelf = self, strongSelf.nearbyPeerDistance != nil {
+                    var viewControllers = navigationController.viewControllers
+                    viewControllers = viewControllers.filter { controller in
+                        if controller is PeerInfoScreen {
+                            return false
                         }
-                    }))
+                        return true
+                    }
+                    navigationController.setViewControllers(viewControllers, animated: false)
                 }
-            })
+            }))
         }
     }
     
@@ -3800,7 +3845,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     guard let strongSelf = self else {
                         return
                     }
-                    var createSignal = createSecretChat(account: strongSelf.context.account, peerId: peerId)
+                    var createSignal = strongSelf.context.engine.peers.createSecretChat(peerId: peerId)
                     var cancelImpl: (() -> Void)?
                     let progressSignal = Signal<Never, NoError> { subscriber in
                         if let strongSelf = self {
@@ -3860,6 +3905,46 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     private func openUsername(value: String) {
         let shareController = ShareController(context: self.context, subject: .url("https://t.me/\(value)"))
+        shareController.completed = { [weak self] peerIds in
+            if let strongSelf = self {
+                let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
+                    var peers: [Peer] = []
+                    for peerId in peerIds {
+                        if let peer = transaction.getPeer(peerId) {
+                            peers.append(peer)
+                        }
+                    }
+                    return peers
+                } |> deliverOnMainQueue).start(next: { [weak self] peers in
+                    if let strongSelf = self {
+                        let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                        
+                        let text: String
+                        var savedMessages = false
+                        if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId {
+                            text = presentationData.strings.UserInfo_LinkForwardTooltip_SavedMessages_One
+                            savedMessages = true
+                        } else {
+                            if peers.count == 1, let peer = peers.first {
+                                let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                text = presentationData.strings.UserInfo_LinkForwardTooltip_Chat_One(peerName).0
+                            } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                                let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                text = presentationData.strings.UserInfo_LinkForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0
+                            } else if let peer = peers.first {
+                                let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                text = presentationData.strings.UserInfo_LinkForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0
+                            } else {
+                                text = ""
+                            }
+                        }
+                        
+                        strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
+                    }
+                })
+            }
+        }
         shareController.actionCompleted = { [weak self] in
             if let strongSelf = self {
                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
@@ -3870,7 +3955,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.controller?.present(shareController, in: .window(.root))
     }
     
-    private func requestCall(isVideo: Bool, gesture: ContextGesture? = nil, contextController: ContextController? = nil, result: ((ContextMenuActionResult) -> Void)? = nil, backAction: ((ContextController) -> Void)? = nil) {
+    private func requestCall(isVideo: Bool, gesture: ContextGesture? = nil, contextController: ContextControllerProtocol? = nil, result: ((ContextMenuActionResult) -> Void)? = nil, backAction: ((ContextControllerProtocol) -> Void)? = nil) {
         let peerId = self.peerId
         let requestCall: (PeerId?, CachedChannelData.ActiveCall?) -> Void = { [weak self] defaultJoinAsPeerId, activeCall in
             if let activeCall = activeCall {
@@ -3885,14 +3970,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     }
                 }, activeCall: activeCall)
             } else {
-                if let defaultJoinAsPeerId = defaultJoinAsPeerId {
-                    result?(.dismissWithoutContent)
-                    self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: defaultJoinAsPeerId)
-                } else {
-                    self?.openVoiceChatDisplayAsPeerSelection(completion: { joinAsPeerId in
-                        self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: joinAsPeerId)
-                    }, gesture: gesture, contextController: contextController, result: result, backAction: backAction)
-                }
+                self?.openVoiceChatOptions(defaultJoinAsPeerId: defaultJoinAsPeerId, gesture: gesture, contextController: contextController)
             }
         }
         
@@ -3915,6 +3993,10 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.context.requestCall(peerId: peer.id, isVideo: isVideo, completion: {})
     }
     
+    private func scheduleGroupCall() {
+        self.context.scheduleGroupCall(peerId: self.peerId)
+    }
+    
     private func createAndJoinGroupCall(peerId: PeerId, joinAsPeerId: PeerId?) {
         if let _ = self.context.sharedContext.callManager {
             let startCall: (Bool) -> Void = { [weak self] endCurrentIfAny in
@@ -3922,26 +4004,40 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     return
                 }
                 
-                var dismissStatus: (() -> Void)?
-                let statusController = OverlayStatusController(theme: strongSelf.presentationData.theme, type: .loading(cancelled: {
-                    dismissStatus?()
-                }))
-                dismissStatus = { [weak self, weak statusController] in
-                    self?.activeActionDisposable.set(nil)
-                    statusController?.dismiss()
+                var cancelImpl: (() -> Void)?
+                let presentationData = strongSelf.presentationData
+                let progressSignal = Signal<Never, NoError> { [weak self] subscriber in
+                    let controller = OverlayStatusController(theme: presentationData.theme,  type: .loading(cancelled: {
+                        cancelImpl?()
+                    }))
+                    self?.controller?.present(controller, in: .window(.root))
+                    return ActionDisposable { [weak controller] in
+                        Queue.mainQueue().async() {
+                            controller?.dismiss()
+                        }
+                    }
                 }
-                strongSelf.controller?.present(statusController, in: .window(.root))
-                strongSelf.activeActionDisposable.set((createGroupCall(account: strongSelf.context.account, peerId: peerId)
+                |> runOn(Queue.mainQueue())
+                |> delay(0.15, queue: Queue.mainQueue())
+                let progressDisposable = progressSignal.start()
+                let createSignal = strongSelf.context.engine.calls.createGroupCall(peerId: peerId, title: nil, scheduleDate: nil)
+                |> afterDisposed {
+                    Queue.mainQueue().async {
+                        progressDisposable.dispose()
+                    }
+                }
+                cancelImpl = { [weak self] in
+                    self?.activeActionDisposable.set(nil)
+                }
+                strongSelf.activeActionDisposable.set((createSignal
                 |> deliverOnMainQueue).start(next: { [weak self] info in
                     guard let strongSelf = self else {
                         return
                     }
                     strongSelf.context.joinGroupCall(peerId: peerId, invite: nil, requestJoinAsPeerId: { result in
                         result(joinAsPeerId)
-                    }, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title))
+                    }, activeCall: CachedChannelData.ActiveCall(id: info.id, accessHash: info.accessHash, title: info.title, scheduleTimestamp: nil, subscribedToScheduled: false))
                 }, error: { [weak self] error in
-                    dismissStatus?()
-                    
                     guard let strongSelf = self else {
                         return
                     }
@@ -3949,14 +4045,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     
                     let text: String
                     switch error {
-                    case .generic:
+                    case .generic, .scheduledTooLate:
                         text = strongSelf.presentationData.strings.Login_UnknownError
                     case .anonymousNotAllowed:
                         text = strongSelf.presentationData.strings.VoiceChat_AnonymousDisabledAlertText
                     }
                     strongSelf.controller?.present(textAlertController(context: strongSelf.context, title: nil, text: text, actions: [TextAlertAction(type: .defaultAction, title: strongSelf.presentationData.strings.Common_OK, action: {})]), in: .window(.root))
-                }, completed: { [weak self] in
-                    dismissStatus?()
                 }))
             }
             
@@ -4019,7 +4113,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     guard let strongSelf = self else {
                         return
                     }
-                    let _ = updatePeerNotificationSoundInteractive(account: strongSelf.context.account, peerId: strongSelf.peerId, sound: sound).start()
+                    let _ = strongSelf.context.engine.peers.updatePeerNotificationSoundInteractive(peerId: strongSelf.peerId, sound: sound).start()
                 })
                 soundController.navigationPresentation = .modal
                 strongSelf.controller?.push(soundController)
@@ -4027,7 +4121,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 guard let strongSelf = self else {
                     return
                 }
-                let _ = updatePeerMuteSetting(account: strongSelf.context.account, peerId: strongSelf.peerId, muteInterval: value).start()
+                let _ = strongSelf.context.engine.peers.updatePeerMuteSetting(peerId: strongSelf.peerId, muteInterval: value).start()
             })
             strongSelf.view.endEditing(true)
             strongSelf.controller?.present(muteSettingsController, in: .window(.root))
@@ -4050,7 +4144,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 guard let strongSelf = self else {
                     return
                 }
-                let _ = updatePeerNotificationSoundInteractive(account: strongSelf.context.account, peerId: strongSelf.peerId, sound: sound).start()
+                let _ = strongSelf.context.engine.peers.updatePeerNotificationSoundInteractive(peerId: strongSelf.peerId, sound: sound).start()
             })
             strongSelf.controller?.push(soundController)
         })
@@ -4062,7 +4156,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             guard let strongSelf = self, let peer = peer else {
                 return
             }
-            let _ = updatePeerDisplayPreviewsSetting(account: strongSelf.context.account, peerId: peer.id, displayPreviews: value ? .show : .hide).start()
+            let _ = strongSelf.context.engine.peers.updatePeerDisplayPreviewsSetting(peerId: peer.id, displayPreviews: value ? .show : .hide).start()
         })
     }
     
@@ -4090,7 +4184,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             deleteContactFromDevice = .complete()
                         }
                         
-                        var deleteSignal = deleteContactPeerInteractively(account: strongSelf.context.account, peerId: peer.id)
+                        var deleteSignal = strongSelf.context.engine.contacts.deleteContactPeerInteractively(peerId: peer.id)
                         |> then(deleteContactFromDevice)
                         
                         let progressSignal = Signal<Never, NoError> { subscriber in
@@ -4121,7 +4215,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         |> deliverOnMainQueue).start(completed: { [weak self] in
                             if let strongSelf = self, let peer = strongSelf.data?.peer {
                                 let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                                strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .info(text: presentationData.strings.Conversation_DeletedFromContacts(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false }), in: .window(.root))
+                                let controller = UndoOverlayController(presentationData: presentationData, content: .info(text: presentationData.strings.Conversation_DeletedFromContacts(peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), elevatedLayout: false, animateInAsReplacement: false, action: { _ in return false })
+                                controller.keepOnParentDismissal = true
+                                strongSelf.controller?.present(controller, in: .window(.root))
                                 
                                 strongSelf.controller?.dismiss()
                             }
@@ -4139,24 +4235,18 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     private func openChat() {
         if let navigationController = self.controller?.navigationController as? NavigationController {
-            let _ = (self.preloadedSticker.get()
-            |> take(1)
-            |> deliverOnMainQueue).start(next: { [weak self] sticker in
-                if let strongSelf = self {
-                    strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId), keepStack: strongSelf.nearbyPeerDistance != nil ? .always : .default, peerNearbyData: strongSelf.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), greetingData: strongSelf.nearbyPeerDistance != nil ? sticker.flatMap({ ChatGreetingData(sticker: $0) }) : nil, completion: { _ in
-                        if strongSelf.nearbyPeerDistance != nil {
-                            var viewControllers = navigationController.viewControllers
-                            viewControllers = viewControllers.filter { controller in
-                                if controller is PeerInfoScreen {
-                                    return false
-                                }
-                                return true
-                            }
-                            navigationController.setViewControllers(viewControllers, animated: false)
+            self.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: self.context, chatLocation: .peer(self.peerId), keepStack: self.nearbyPeerDistance != nil ? .always : .default, peerNearbyData: self.nearbyPeerDistance.flatMap({ ChatPeerNearbyData(distance: $0) }), completion: { [weak self] _ in
+                if let strongSelf = self, strongSelf.nearbyPeerDistance != nil {
+                    var viewControllers = navigationController.viewControllers
+                    viewControllers = viewControllers.filter { controller in
+                        if controller is PeerInfoScreen {
+                            return false
                         }
-                    }))
+                        return true
+                    }
+                    navigationController.setViewControllers(viewControllers, animated: false)
                 }
-            })
+            }))
         }
     }
     
@@ -4184,9 +4274,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             
             let presentationData = strongSelf.presentationData
             if let peer = peer as? TelegramUser, let _ = peer.botInfo {
-                strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: block).start())
+                strongSelf.activeActionDisposable.set(strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.id, isBlocked: block).start())
                 if !block {
-                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
+                    let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: "/start", attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)]).start()
                     if let navigationController = strongSelf.controller?.navigationController as? NavigationController {
                         strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(peer.id)))
                     }
@@ -4209,12 +4299,12 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                     return
                                 }
                                 
-                                strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: true).start())
+                                strongSelf.activeActionDisposable.set(strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.id, isBlocked: true).start())
                                 if deleteChat {
-                                    let _ = removePeerChat(account: strongSelf.context.account, peerId: strongSelf.peerId, reportChatSpam: reportSpam).start()
+                                    let _ = strongSelf.context.engine.peers.removePeerChat(peerId: strongSelf.peerId, reportChatSpam: reportSpam).start()
                                     (strongSelf.controller?.navigationController as? NavigationController)?.popToRoot(animated: true)
                                 } else if reportSpam {
-                                    let _ = reportPeer(account: strongSelf.context.account, peerId: strongSelf.peerId, reason: .spam, message: "").start()
+                                    let _ = strongSelf.context.engine.peers.reportPeer(peerId: strongSelf.peerId, reason: .spam, message: "").start()
                                 }
                                 
                                 deleteSendMessageIntents(peerId: strongSelf.peerId)
@@ -4235,7 +4325,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         guard let strongSelf = self else {
                             return
                         }
-                        strongSelf.activeActionDisposable.set(requestUpdatePeerIsBlocked(account: strongSelf.context.account, peerId: peer.id, isBlocked: block).start())
+                        strongSelf.activeActionDisposable.set(strongSelf.context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peer.id, isBlocked: block).start())
                     })]), in: .window(.root))
                 }
             }
@@ -4257,7 +4347,90 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         controller.push(statsController)
     }
     
-    private func openVoiceChatDisplayAsPeerSelection(completion: @escaping (PeerId) -> Void, gesture: ContextGesture? = nil, contextController: ContextController? = nil, result: ((ContextMenuActionResult) -> Void)? = nil, backAction: ((ContextController) -> Void)? = nil) {
+    private func openVoiceChatOptions(defaultJoinAsPeerId: PeerId?, gesture: ContextGesture? = nil, contextController: ContextControllerProtocol? = nil) {
+        let context = self.context
+        let peerId = self.peerId
+        let defaultJoinAsPeerId = defaultJoinAsPeerId ?? self.context.account.peerId
+        let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(self.context.account.peerId)
+        |> map { peer in
+            return [FoundPeer(peer: peer, subscribers: nil)]
+        }
+        let _ = (combineLatest(queue: Queue.mainQueue(), currentAccountPeer, self.displayAsPeersPromise.get() |> take(1))
+        |> map { currentAccountPeer, availablePeers -> [FoundPeer] in
+            var result = currentAccountPeer
+            result.append(contentsOf: availablePeers)
+            return result
+        }).start(next: { [weak self] peers in
+            guard let strongSelf = self else {
+                return
+            }
+            
+            var items: [ContextMenuItem] = []
+            
+            if peers.count > 1 {
+                var selectedPeer: FoundPeer?
+                for peer in peers {
+                    if peer.peer.id == defaultJoinAsPeerId {
+                        selectedPeer = peer
+                    }
+                }
+                if let peer = selectedPeer {
+                    let avatarSize = CGSize(width: 28.0, height: 28.0)
+                    items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.VoiceChat_DisplayAs, textLayout: .secondLineWithValue(peer.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)), icon: { _ in nil }, iconSource: ContextMenuActionItemIconSource(size: avatarSize, signal: peerAvatarCompleteImage(account: strongSelf.context.account, peer: peer.peer, size: avatarSize)), action: { c, f in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        
+                        strongSelf.openVoiceChatDisplayAsPeerSelection(completion: { joinAsPeerId in
+                            let _ = context.engine.calls.updateGroupCallJoinAsPeer(peerId: peerId, joinAs: joinAsPeerId).start()
+                            self?.openVoiceChatOptions(defaultJoinAsPeerId: joinAsPeerId, gesture: nil, contextController: c)
+                        }, gesture: gesture, contextController: c, result: f, backAction: { [weak self] c in
+                            self?.openVoiceChatOptions(defaultJoinAsPeerId: defaultJoinAsPeerId, gesture: nil, contextController: c)
+                        })
+                        
+                    })))
+                    items.append(.separator)
+                }
+            }
+            
+            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.ChannelInfo_CreateVoiceChat, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/VoiceChat"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                f(.dismissWithoutContent)
+                
+                self?.createAndJoinGroupCall(peerId: peerId, joinAsPeerId: defaultJoinAsPeerId)
+            })))
+            
+            items.append(.action(ContextMenuActionItem(text: strongSelf.presentationData.strings.ChannelInfo_ScheduleVoiceChat, icon: { theme in return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Schedule"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                f(.dismissWithoutContent)
+                
+                self?.scheduleGroupCall()
+            })))
+            
+            if let contextController = contextController {
+                contextController.setItems(.single(items))
+            } else {
+                strongSelf.state = strongSelf.state.withHighlightedButton(.voiceChat)
+                if let (layout, navigationHeight) = strongSelf.validLayout {
+                    strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false)
+                }
+                
+                if let sourceNode = strongSelf.headerNode.buttonNodes[.voiceChat]?.referenceNode, let controller = strongSelf.controller {
+                    let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .reference(PeerInfoContextReferenceContentSource(controller: controller, sourceNode: sourceNode)), items: .single(items), reactionItems: [], gesture: gesture)
+                    contextController.dismissed = { [weak self] in
+                        if let strongSelf = self {
+                            strongSelf.state = strongSelf.state.withHighlightedButton(nil)
+                            if let (layout, navigationHeight) = strongSelf.validLayout {
+                                strongSelf.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: .immediate, additive: false)
+                            }
+                        }
+                    }
+                    controller.presentInGlobalOverlay(contextController)
+                }
+            }
+        })
+    }
+    
+    private func openVoiceChatDisplayAsPeerSelection(completion: @escaping (PeerId) -> Void, gesture: ContextGesture? = nil, contextController: ContextControllerProtocol? = nil, result: ((ContextMenuActionResult) -> Void)? = nil, backAction: ((ContextControllerProtocol) -> Void)? = nil) {
+        let dismissOnSelection = contextController == nil
         let currentAccountPeer = self.context.account.postbox.loadedPeerWithId(context.account.peerId)
         |> map { peer in
             return [FoundPeer(peer: peer, subscribers: nil)]
@@ -4279,7 +4452,10 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 
                 var isGroup = false
                 for peer in peers {
-                    if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
+                    if peer.peer is TelegramGroup {
+                        isGroup = true
+                        break
+                    } else if let peer = peer.peer as? TelegramChannel, case .group = peer.info {
                         isGroup = true
                         break
                     }
@@ -4304,8 +4480,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     let avatarSize = CGSize(width: 28.0, height: 28.0)
                     let avatarSignal = peerAvatarCompleteImage(account: strongSelf.context.account, peer: peer.peer, size: avatarSize)
                     items.append(.action(ContextMenuActionItem(text: peer.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder), textLayout: subtitle.flatMap { .secondLineWithValue($0) } ?? .singleLine, icon: { _ in nil }, iconSource: ContextMenuActionItemIconSource(size: avatarSize, signal: avatarSignal), action: { _, f in
-                        f(.dismissWithoutContent)
-                        
+                        if dismissOnSelection {
+                            f(.dismissWithoutContent)
+                        }
                         completion(peer.peer.id)
                     })))
                     
@@ -4349,7 +4526,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         })
     }
     
-    private func openReport(user: Bool, contextController: ContextController?, backAction: ((ContextController) -> Void)?) {
+    private func openReport(user: Bool, contextController: ContextControllerProtocol?, backAction: ((ContextControllerProtocol) -> Void)?) {
         guard let controller = self.controller else {
             return
         }
@@ -4386,6 +4563,46 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
             if let peer = peer as? TelegramUser, let username = peer.username {
                 let shareController = ShareController(context: strongSelf.context, subject: .url("https://t.me/\(username)"))
+                shareController.completed = { [weak self] peerIds in
+                    if let strongSelf = self {
+                        let _ = (strongSelf.context.account.postbox.transaction { transaction -> [Peer] in
+                            var peers: [Peer] = []
+                            for peerId in peerIds {
+                                if let peer = transaction.getPeer(peerId) {
+                                    peers.append(peer)
+                                }
+                            }
+                            return peers
+                        } |> deliverOnMainQueue).start(next: { [weak self] peers in
+                            if let strongSelf = self {
+                                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                                
+                                let text: String
+                                var savedMessages = false
+                                if peerIds.count == 1, let peerId = peerIds.first, peerId == strongSelf.context.account.peerId {
+                                    text = presentationData.strings.UserInfo_LinkForwardTooltip_SavedMessages_One
+                                    savedMessages = true
+                                } else {
+                                    if peers.count == 1, let peer = peers.first {
+                                        let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                        text = presentationData.strings.UserInfo_LinkForwardTooltip_Chat_One(peerName).0
+                                    } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                                        let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                        let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                        text = presentationData.strings.UserInfo_LinkForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0
+                                    } else if let peer = peers.first {
+                                        let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                                        text = presentationData.strings.UserInfo_LinkForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0
+                                    } else {
+                                        text = ""
+                                    }
+                                }
+                                
+                                strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .window(.root))
+                            }
+                        })
+                    }
+                }
                 shareController.actionCompleted = { [weak self] in
                     if let strongSelf = self {
                         let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
@@ -4429,7 +4646,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             case .help:
                 text = "/help"
             }
-            let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil)]).start()
+            let _ = enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: [.message(text: text, attributes: [], mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)]).start()
             
             if let navigationController = strongSelf.controller?.navigationController as? NavigationController {
                 strongSelf.context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: strongSelf.context, chatLocation: .peer(strongSelf.peerId)))
@@ -4454,7 +4671,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     }
     
     private func editingToggleMessageSignatures(value: Bool) {
-        self.toggleShouldChannelMessagesSignaturesDisposable.set(toggleShouldChannelMessagesSignatures(account: self.context.account, peerId: self.peerId, enabled: value).start())
+        self.toggleShouldChannelMessagesSignaturesDisposable.set(self.context.engine.peers.toggleShouldChannelMessagesSignatures(peerId: self.peerId, enabled: value).start())
     }
     
     private func openParticipantsSection(section: PeerInfoParticipantsSection) {
@@ -4781,7 +4998,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             if case let .image(reference, _, _, _) = item {
                 if let reference = reference {
                     if remove {
-                        let _ = removeAccountPhoto(network: self.context.account.network, reference: reference).start()
+                        let _ = self.context.engine.accountData.removeAccountPhoto(reference: reference).start()
                     }
                     let dismiss = self.headerNode.avatarListNode.listContainerNode.deleteItem(item)
                     if dismiss {
@@ -4811,9 +5028,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         }
         self.scrollNode.view.setContentOffset(CGPoint(), animated: false)
         
-        let resource = LocalFileMediaResource(fileId: arc4random64())
+        let resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
         self.context.account.postbox.mediaBox.storeResourceData(resource.id, data: data)
-        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [])
+        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: resource, progressiveSizes: [], immediateThumbnailData: nil)
         
         self.state = self.state.withUpdatingAvatar(.image(representation))
         if let (layout, navigationHeight) = self.validLayout {
@@ -4822,9 +5039,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.headerNode.ignoreCollapse = false
         
         let postbox = self.context.account.postbox
-        let signal = self.isSettings ? updateAccountPhoto(account: self.context.account, resource: resource, videoResource: nil, videoStartTimestamp: nil, mapResourceToAvatarSizes: { resource, representations in
+        let signal = self.isSettings ? self.context.engine.accountData.updateAccountPhoto(resource: resource, videoResource: nil, videoStartTimestamp: nil, mapResourceToAvatarSizes: { resource, representations in
             return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
-        }) : updatePeerPhoto(postbox: postbox, network: self.context.account.network, stateManager: self.context.account.stateManager, accountPeerId: self.context.account.peerId, peerId: self.peerId, photo: uploadedPeerPhoto(postbox: postbox, network: self.context.account.network, resource: resource), mapResourceToAvatarSizes: { resource, representations in
+        }) : self.context.engine.peers.updatePeerPhoto(peerId: self.peerId, photo: self.context.engine.peers.uploadedPeerPhoto(resource: resource), mapResourceToAvatarSizes: { resource, representations in
             return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
         })
         self.updateAvatarDisposable.set((signal
@@ -4856,9 +5073,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         }
         self.scrollNode.view.setContentOffset(CGPoint(), animated: false)
         
-        let photoResource = LocalFileMediaResource(fileId: arc4random64())
+        let photoResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
         self.context.account.postbox.mediaBox.storeResourceData(photoResource.id, data: data)
-        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [])
+        let representation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 640, height: 640), resource: photoResource, progressiveSizes: [], immediateThumbnailData: nil)
         
         self.state = self.state.withUpdatingAvatar(.image(representation))
         if let (layout, navigationHeight) = self.validLayout {
@@ -4872,6 +5089,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         }
         
         let account = self.context.account
+        let context = self.context
         let signal = Signal<TelegramMediaResource, UploadPeerPhotoError> { [weak self] subscriber in
             let entityRenderer: LegacyPaintEntityRenderer? = adjustments.flatMap { adjustments in
                 if let paintingData = adjustments.paintingData, paintingData.hasAnimation {
@@ -4880,7 +5098,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     return nil
                 }
             }
-            let uploadInterface = LegacyLiveUploadInterface(account: account)
+            let uploadInterface = LegacyLiveUploadInterface(context: context)
             let signal: SSignal
             if let asset = asset as? AVAsset {
                 signal = TGMediaVideoConverter.convert(asset, adjustments: adjustments, watcher: uploadInterface, entityRenderer: entityRenderer)!
@@ -4924,7 +5142,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             if let liveUploadData = result.liveUploadData as? LegacyLiveUploadInterfaceResult {
                                 resource = LocalFileMediaResource(fileId: liveUploadData.id)
                             } else {
-                                resource = LocalFileMediaResource(fileId: arc4random64())
+                                resource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                             }
                             account.postbox.mediaBox.storeResourceData(resource.id, data: data, synchronous: true)
                             subscriber.putNext(resource)
@@ -4956,11 +5174,11 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         self.updateAvatarDisposable.set((signal
         |> mapToSignal { videoResource -> Signal<UpdatePeerPhotoStatus, UploadPeerPhotoError> in
             if isSettings {
-                return updateAccountPhoto(account: account, resource: photoResource, videoResource: videoResource, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
+                return context.engine.accountData.updateAccountPhoto(resource: photoResource, videoResource: videoResource, videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
                     return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations)
                 })
             } else {
-                return updatePeerPhoto(postbox: account.postbox, network: account.network, stateManager: account.stateManager, accountPeerId: account.peerId, peerId: peerId, photo: uploadedPeerPhoto(postbox: account.postbox, network: account.network, resource: photoResource), video: uploadedPeerVideo(postbox: account.postbox, network: account.network, messageMediaPreuploadManager: account.messageMediaPreuploadManager, resource: videoResource) |> map(Optional.init), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
+                return context.engine.peers.updatePeerPhoto(peerId: peerId, photo: context.engine.peers.uploadedPeerPhoto(resource: photoResource), video: context.engine.peers.uploadedPeerVideo(resource: videoResource) |> map(Optional.init), videoStartTimestamp: videoStartTimestamp, mapResourceToAvatarSizes: { resource, representations in
                     return mapResourceToAvatarSizes(postbox: account.postbox, resource: resource, representations: representations)
                 })
             }
@@ -5081,7 +5299,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         }
                     }
                     let postbox = strongSelf.context.account.postbox
-                    strongSelf.updateAvatarDisposable.set((updatePeerPhoto(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, stateManager: strongSelf.context.account.stateManager, accountPeerId: strongSelf.context.account.peerId, peerId: strongSelf.peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in
+                    strongSelf.updateAvatarDisposable.set((strongSelf.context.engine.peers.updatePeerPhoto(peerId: strongSelf.peerId, photo: nil, mapResourceToAvatarSizes: { resource, representations in
                         return mapResourceToAvatarSizes(postbox: postbox, resource: resource, representations: representations)
                     })
                     |> deliverOnMainQueue).start(next: { result in
@@ -5205,7 +5423,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 self.controller?.push(watchSettingsController(context: self.context))
             case .support:
                 let supportPeer = Promise<PeerId?>()
-                supportPeer.set(supportPeerId(account: context.account))
+                supportPeer.set(context.engine.peers.supportPeerId())
                 
                 self.controller?.present(textAlertController(context: self.context, title: nil, text: self.presentationData.strings.Settings_FAQ_Intro, actions: [
                 TextAlertAction(type: .genericAction, title: presentationData.strings.Settings_FAQ_Button, action: { [weak self] in
@@ -5219,6 +5437,8 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 })]), in: .window(.root))
             case .faq:
                 self.openFaq()
+            case .tips:
+                self.openTips()
             case .phoneNumber:
                 if let user = self.data?.peer as? TelegramUser, let phoneNumber = user.phone {
                     self.controller?.push(ChangePhoneNumberIntroController(context: self.context, phoneNumber: phoneNumber))
@@ -5233,16 +5453,39 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         self.controller?.push(logoutOptionsController(context: self.context, navigationController: navigationController, canAddAccounts: accounts.count + 1 < maximumNumberOfAccounts, phoneNumber: phoneNumber))
                     }
                 }
+            case .rememberPassword:
+                let context = self.context
+                let controller = TwoFactorDataInputScreen(sharedContext: self.context.sharedContext, engine: .authorized(self.context.engine), mode: .rememberPassword, stateUpdated: { _ in
+                }, presentation: .modalInLargeLayout)
+                controller.twoStepAuthSettingsController = { configuration in
+                    return twoStepVerificationUnlockSettingsController(context: context, mode: .access(intro: false, data: .single(TwoStepVerificationUnlockSettingsControllerData.access(configuration: TwoStepVerificationAccessConfiguration(configuration: configuration, password: nil)))))
+                }
+                controller.passwordRemembered = {
+                    let _ = dismissServerProvidedSuggestion(account: context.account, suggestion: .validatePassword).start()
+                }
+                self.controller?.push(controller)
         }
     }
     
     private func openFaq(anchor: String? = nil) {
-        let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
-        self.controller?.present(controller, in: .window(.root))
+        let presentationData = self.presentationData
+        let progressSignal = Signal<Never, NoError> { [weak self] subscriber in
+            let controller = OverlayStatusController(theme: presentationData.theme, type: .loading(cancelled: nil))
+            self?.controller?.present(controller, in: .window(.root))
+            return ActionDisposable { [weak controller] in
+                Queue.mainQueue().async() {
+                    controller?.dismiss()
+                }
+            }
+        }
+        |> runOn(Queue.mainQueue())
+        |> delay(0.15, queue: Queue.mainQueue())
+        let progressDisposable = progressSignal.start()
+        
         let _ = (self.cachedFaq.get()
         |> take(1)
-        |> deliverOnMainQueue).start(next: { [weak self, weak controller] resolvedUrl in
-            controller?.dismiss()
+        |> deliverOnMainQueue).start(next: { [weak self] resolvedUrl in
+            progressDisposable.dispose()
 
             if let strongSelf = self, let resolvedUrl = resolvedUrl {
                 var resolvedUrl = resolvedUrl
@@ -5257,6 +5500,20 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         })
     }
     
+    private func openTips() {
+        let controller = OverlayStatusController(theme: self.presentationData.theme, type: .loading(cancelled: nil))
+        self.controller?.present(controller, in: .window(.root))
+        
+        let context = self.context
+        let navigationController = self.controller?.navigationController as? NavigationController
+        self.tipsPeerDisposable.set((self.context.engine.peers.resolvePeerByName(name: self.presentationData.strings.Settings_TipsUsername) |> deliverOnMainQueue).start(next: { [weak controller] peerId in
+            controller?.dismiss()
+            if let peerId = peerId, let navigationController = navigationController {
+                context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId)))
+            }
+        }))
+    }
+    
     fileprivate func switchToAccount(id: AccountRecordId) {
         self.accountsAndPeers.set(.never())
         self.context.sharedContext.switchToAccount(id: id, fromSettingsController: nil, withChatListController: nil)
@@ -5368,7 +5625,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             actionSheet?.dismissAnimated()
                             if let strongSelf = self {
                                 strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forEveryone).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forEveryone).start()
                             }
                         }))
                     }
@@ -5385,7 +5642,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                             actionSheet?.dismissAnimated()
                             if let strongSelf = self {
                                 strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
-                                let _ = deleteMessagesInteractively(account: strongSelf.context.account, messageIds: Array(messageIds), type: .forLocalPeer).start()
+                                let _ = strongSelf.context.engine.messages.deleteMessagesInteractively(messageIds: Array(messageIds), type: .forLocalPeer).start()
                             }
                         }))
                     }
@@ -5403,7 +5660,83 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     func forwardMessages(messageIds: Set<MessageId>?) {
         if let messageIds = messageIds ?? self.state.selectedMessageIds, !messageIds.isEmpty {
-            let peerSelectionController = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: [.onlyWriteable, .excludeDisabled]))
+            let peerSelectionController = self.context.sharedContext.makePeerSelectionController(PeerSelectionControllerParams(context: self.context, filter: [.onlyWriteable, .excludeDisabled], multipleSelection: true))
+            peerSelectionController.multiplePeersSelected = { [weak self, weak peerSelectionController] peers, messageText in
+                guard let strongSelf = self, let strongController = peerSelectionController else {
+                    return
+                }
+                strongController.dismiss()
+                
+                for peer in peers {
+                    var result: [EnqueueMessage] = []
+                    if messageText.string.count > 0 {
+                        let inputText = convertMarkdownToAttributes(messageText)
+                        for text in breakChatInputText(trimChatInputText(inputText)) {
+                            if text.length != 0 {
+                                var attributes: [MessageAttribute] = []
+                                let entities = generateTextEntities(text.string, enabledTypes: .all, currentEntities: generateChatInputTextEntities(text))
+                                if !entities.isEmpty {
+                                    attributes.append(TextEntitiesMessageAttribute(entities: entities))
+                                }
+                                result.append(.message(text: text.string, attributes: attributes, mediaReference: nil, replyToMessageId: nil, localGroupingKey: nil, correlationId: nil))
+                            }
+                        }
+                    }
+                    
+                    result.append(contentsOf: messageIds.map { messageId -> EnqueueMessage in
+                        return .forward(source: messageId, grouping: .auto, attributes: [], correlationId: nil)
+                    })
+                    
+                    let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peer.id, messages: result)
+                    |> deliverOnMainQueue).start(next: { messageIds in
+                        if let strongSelf = self {
+                            let signals: [Signal<Bool, NoError>] = messageIds.compactMap({ id -> Signal<Bool, NoError>? in
+                                guard let id = id else {
+                                    return nil
+                                }
+                                return strongSelf.context.account.pendingMessageManager.pendingMessageStatus(id)
+                                |> mapToSignal { status, _ -> Signal<Bool, NoError> in
+                                    if status != nil {
+                                        return .never()
+                                    } else {
+                                        return .single(true)
+                                    }
+                                }
+                                |> take(1)
+                            })
+                            if strongSelf.shareStatusDisposable == nil {
+                                strongSelf.shareStatusDisposable = MetaDisposable()
+                            }
+                            strongSelf.shareStatusDisposable?.set((combineLatest(signals)
+                            |> deliverOnMainQueue).start())
+                        }
+                    })
+                    
+                    let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                    let text: String
+                    var savedMessages = false
+                    if peers.count == 1, let peerId = peers.first?.id, peerId == strongSelf.context.account.peerId {
+                        text = messageIds.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_SavedMessages_One : presentationData.strings.Conversation_ForwardTooltip_SavedMessages_Many
+                        savedMessages = true
+                    } else {
+                        if peers.count == 1, let peer = peers.first {
+                            let peerName = peer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messageIds.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_Chat_One(peerName).0 : presentationData.strings.Conversation_ForwardTooltip_Chat_Many(peerName).0
+                        } else if peers.count == 2, let firstPeer = peers.first, let secondPeer = peers.last {
+                            let firstPeerName = firstPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : firstPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            let secondPeerName = secondPeer.id == strongSelf.context.account.peerId ? presentationData.strings.DialogList_SavedMessages : secondPeer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messageIds.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_TwoChats_One(firstPeerName, secondPeerName).0 : presentationData.strings.Conversation_ForwardTooltip_TwoChats_Many(firstPeerName, secondPeerName).0
+                        } else if let peer = peers.first {
+                            let peerName = peer.displayTitle(strings: presentationData.strings, displayOrder: presentationData.nameDisplayOrder)
+                            text = messageIds.count == 1 ? presentationData.strings.Conversation_ForwardTooltip_ManyChats_One(peerName, "\(peers.count - 1)").0 : presentationData.strings.Conversation_ForwardTooltip_ManyChats_Many(peerName, "\(peers.count - 1)").0
+                        } else {
+                            text = ""
+                        }
+                    }
+
+                    strongSelf.controller?.present(UndoOverlayController(presentationData: presentationData, content: .forward(savedMessages: savedMessages, text: text), elevatedLayout: false, animateInAsReplacement: true, action: { _ in return false }), in: .current)
+                }
+            }
             peerSelectionController.peerSelected = { [weak self, weak peerSelectionController] peer in
                 let peerId = peer.id
                 
@@ -5415,7 +5748,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                         strongSelf.headerNode.navigationButtonContainer.performAction?(.selectionDone)
                         
                         let _ = (enqueueMessages(account: strongSelf.context.account, peerId: peerId, messages: messageIds.map { id -> EnqueueMessage in
-                            return .forward(source: id, grouping: .auto, attributes: [])
+                            return .forward(source: id, grouping: .auto, attributes: [], correlationId: nil)
                         })
                         |> deliverOnMainQueue).start(next: { [weak self] messageIds in
                             if let strongSelf = self {
@@ -5434,12 +5767,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                                         |> take(1)
                                 })
                                 strongSelf.activeActionDisposable.set((combineLatest(signals)
-                                |> deliverOnMainQueue).start(completed: {
-                                    guard let strongSelf = self else {
-                                        return
-                                    }
-                                    strongSelf.controller?.present(OverlayStatusController(theme: strongSelf.presentationData.theme, type: .success), in: .window(.root))
-                                }))
+                                |> deliverOnMainQueue).start())
                             }
                         })
                         if let peerSelectionController = peerSelectionController {
@@ -5482,7 +5810,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         
         if self.isSettings {
             if let settings = self.data?.globalSettings {
-                self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Settings_Search, hasSeparator: true, contentNode: SettingsSearchContainerNode(context: self.context, openResult: { [weak self] result in
+                self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Settings_Search, hasBackground: true, hasSeparator: true, contentNode: SettingsSearchContainerNode(context: self.context, openResult: { [weak self] result in
                     if let strongSelf = self, let navigationController = strongSelf.controller?.navigationController as? NavigationController {
                         result.present(strongSelf.context, navigationController, { [weak self] mode, controller in
                             if let strongSelf = self {
@@ -5512,7 +5840,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 })
             }
         } else if let currentPaneKey = self.paneContainerNode.currentPaneKey, case .members = currentPaneKey {
-            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, contentNode: ChannelMembersSearchContainerNode(context: self.context, forceTheme: nil, peerId: self.peerId, mode: .searchMembers, filters: [], searchContext: self.groupMembersSearchContext, openPeer: { [weak self] peer, participant in
+            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, hasBackground: true, hasSeparator: true, contentNode: ChannelMembersSearchContainerNode(context: self.context, forceTheme: nil, peerId: self.peerId, mode: .searchMembers, filters: [], searchContext: self.groupMembersSearchContext, openPeer: { [weak self] peer, participant in
                 self?.openPeer(peerId: peer.id, navigation: .info)
             }, updateActivity: { _ in
             }, pushController: { [weak self] c in
@@ -5533,7 +5861,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                 }
             }
             
-            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, contentNode: ChatHistorySearchContainerNode(context: self.context, peerId: self.peerId, tagMask: tagMask, interfaceInteraction: self.chatInterfaceInteraction), cancel: { [weak self] in
+            self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, mode: .list, placeholder: self.presentationData.strings.Common_Search, hasBackground: true, contentNode: ChatHistorySearchContainerNode(context: self.context, peerId: self.peerId, tagMask: tagMask, interfaceInteraction: self.chatInterfaceInteraction), cancel: { [weak self] in
                 self?.deactivateSearch()
             })
         }
@@ -5657,7 +5985,9 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
             }
             for sectionId in removeRegularSections {
                 if let sectionNode = self.regularSections.removeValue(forKey: sectionId) {
-                    sectionNode.removeFromSupernode()
+                    transition.updateAlpha(node: sectionNode, alpha: 0.0, completion: { [weak sectionNode] _ in
+                        sectionNode?.removeFromSupernode()
+                    })
                 }
             }
             
@@ -5928,8 +6258,6 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
     
     private var canOpenAvatarByDragging = false
     
-    private let velocityKey: String = encodeText("`wfsujdbmWfmpdjuz", -1)
-    
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
         if self.ignoreScrolling {
             return
@@ -5938,7 +6266,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
         if !self.state.isEditing {
             if self.canAddVelocity {
                 self.previousVelocityM1 = self.previousVelocity
-                if let value = (scrollView.value(forKey: self.velocityKey) as? NSNumber)?.doubleValue {
+                if let value = (scrollView.value(forKey: (["_", "verticalVelocity"] as [String]).joined()) as? NSNumber)?.doubleValue {
                     self.previousVelocity = CGFloat(value)
                 }
             }
@@ -6038,6 +6366,7 @@ private final class PeerInfoScreenNode: ViewControllerTracingNode, UIScrollViewD
                     disabledButtonColor: baseNavigationBarPresentationData.theme.disabledButtonColor,
                     primaryTextColor: baseNavigationBarPresentationData.theme.primaryTextColor,
                     backgroundColor: .clear,
+                    enableBackgroundBlur: false,
                     separatorColor: .clear,
                     badgeBackgroundColor: baseNavigationBarPresentationData.theme.badgeBackgroundColor,
                     badgeStrokeColor: baseNavigationBarPresentationData.theme.badgeStrokeColor,
@@ -6171,6 +6500,7 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen {
                 disabledButtonColor: baseNavigationBarPresentationData.theme.disabledButtonColor,
                 primaryTextColor: baseNavigationBarPresentationData.theme.primaryTextColor,
                 backgroundColor: .clear,
+                enableBackgroundBlur: false,
                 separatorColor: .clear,
                 badgeBackgroundColor: baseNavigationBarPresentationData.theme.badgeBackgroundColor,
                 badgeStrokeColor: baseNavigationBarPresentationData.theme.badgeStrokeColor,
@@ -6179,8 +6509,8 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen {
                 
         if isSettings {
             let activeSessionsContextAndCountSignal = deferred { () -> Signal<(ActiveSessionsContext, Int, WebSessionsContext)?, NoError> in
-                let activeSessionsContext = ActiveSessionsContext(account: context.account)
-                let webSessionsContext = WebSessionsContext(account: context.account)
+                let activeSessionsContext = context.engine.privacy.activeSessions()
+                let webSessionsContext = context.engine.privacy.webSessions()
                 let otherSessionCount = activeSessionsContext.state
                 |> map { state -> Int in
                     return state.sessions.filter({ !$0.isCurrent }).count
@@ -6336,14 +6666,16 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen {
                 icon = UIImage(bundleImageName: "Chat List/Tabs/IconSettings")
             }
             
-            let tabBarItem: Signal<(String, UIImage?, UIImage?, String?), NoError> = combineLatest(queue: .mainQueue(), self.context.sharedContext.presentationData, notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), accountTabBarAvatar, accountTabBarAvatarBadge)
-            |> map { presentationData, notificationsAuthorizationStatus, notificationsWarningSuppressed, accountTabBarAvatar, accountTabBarAvatarBadge -> (String, UIImage?, UIImage?, String?) in
+            let tabBarItem: Signal<(String, UIImage?, UIImage?, String?), NoError> = combineLatest(queue: .mainQueue(), self.context.sharedContext.presentationData, notificationsAuthorizationStatus.get(), notificationsWarningSuppressed.get(), getServerProvidedSuggestions(account: self.context.account), accountTabBarAvatar, accountTabBarAvatarBadge)
+            |> map { presentationData, notificationsAuthorizationStatus, notificationsWarningSuppressed, suggestions, accountTabBarAvatar, accountTabBarAvatarBadge -> (String, UIImage?, UIImage?, String?) in
                 let notificationsWarning = shouldDisplayNotificationsPermissionWarning(status: notificationsAuthorizationStatus, suppressed:  notificationsWarningSuppressed)
+                let phoneNumberWarning = suggestions.contains(.validatePhoneNumber)
+                let passwordWarning = suggestions.contains(.validatePassword)
                 var otherAccountsBadge: String?
                 if accountTabBarAvatarBadge > 0 {
                     otherAccountsBadge = compactNumericCountString(Int(accountTabBarAvatarBadge), decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)
                 }
-                return (presentationData.strings.Settings_Title, accountTabBarAvatar?.0 ?? icon, accountTabBarAvatar?.1 ?? icon, notificationsWarning ? "!" : otherAccountsBadge)
+                return (presentationData.strings.Settings_Title, accountTabBarAvatar?.0 ?? icon, accountTabBarAvatar?.1 ?? icon, notificationsWarning || phoneNumberWarning || passwordWarning ? "!" : otherAccountsBadge)
             }
             
             self.tabBarItemDisposable = (tabBarItem |> deliverOnMainQueue).start(next: { [weak self] title, image, selectedImage, badgeValue in
@@ -6440,10 +6772,30 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen {
         }
     }
     
+    private func dismissAllTooltips() {
+        self.window?.forEachController({ controller in
+            if let controller = controller as? UndoOverlayController, !controller.keepOnParentDismissal {
+                controller.dismissWithCommitAction()
+            }
+        })
+        self.forEachController({ controller in
+            if let controller = controller as? UndoOverlayController, !controller.keepOnParentDismissal {
+                controller.dismissWithCommitAction()
+            }
+            return true
+        })
+    }
+    
+    override public func viewWillDisappear(_ animated: Bool) {
+        super.viewWillDisappear(animated)
+        
+        self.dismissAllTooltips()
+    }
+    
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        let navigationHeight = self.isSettings ? (self.navigationBar?.frame.height ?? 0.0) : self.navigationHeight
+        let navigationHeight = self.isSettings ? (self.navigationBar?.frame.height ?? 0.0) : self.navigationLayout(layout: layout).navigationFrame.maxY
         self.validLayout = (layout, navigationHeight)
         
         self.controllerNode.containerLayoutUpdated(layout: layout, navigationHeight: navigationHeight, transition: transition)
@@ -6543,7 +6895,7 @@ final class PeerInfoNavigationSourceTag {
 private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavigationTransitionNode {
     private let screenNode: PeerInfoScreenNode
     private let presentationData: PresentationData
-    
+
     private var topNavigationBar: NavigationBar?
     private var bottomNavigationBar: NavigationBar?
     private var reverseFraction: Bool = false
@@ -6585,6 +6937,8 @@ private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavig
         bottomNavigationBar.isHidden = true
         
         if let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar {
+            self.addSubnode(bottomNavigationBar.additionalContentNode)
+
             if let previousBackButtonArrow = bottomNavigationBar.makeTransitionBackArrowNode(accentColor: self.presentationData.theme.rootController.navigationBar.accentTextColor) {
                 self.previousBackButtonArrow = previousBackButtonArrow
                 self.addSubnode(previousBackButtonArrow)
@@ -6667,8 +7021,9 @@ private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavig
             let previousStatusFrame = previousTitleView.activityNode.view.convert(previousTitleView.activityNode.bounds, to: bottomNavigationBar.view)
             
             self.headerNode.navigationTransition = PeerInfoHeaderNavigationTransition(sourceNavigationBar: bottomNavigationBar, sourceTitleView: previousTitleView, sourceTitleFrame: previousTitleFrame, sourceSubtitleFrame: previousStatusFrame, fraction: fraction)
+            var topHeight = topNavigationBar.backgroundNode.bounds.height
             if let (layout, _) = self.screenNode.validLayout {
-                let _ = self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: layout.safeInsets.left, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: topNavigationBar.bounds.height, isModalOverlay: layout.isModalOverlay, isMediaOnly: false, contentOffset: 0.0, presentationData: self.presentationData, peer: self.screenNode.data?.peer, cachedData: self.screenNode.data?.cachedData, notificationSettings: self.screenNode.data?.notificationSettings, statusData: self.screenNode.data?.status, isSecretChat: self.screenNode.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.screenNode.data?.isContact ?? false, isSettings: self.screenNode.isSettings, state: self.screenNode.state, transition: transition, additive: false)
+                topHeight = self.headerNode.update(width: layout.size.width, containerHeight: layout.size.height, containerInset: layout.safeInsets.left, statusBarHeight: layout.statusBarHeight ?? 0.0, navigationHeight: topNavigationBar.bounds.height, isModalOverlay: layout.isModalOverlay, isMediaOnly: false, contentOffset: 0.0, presentationData: self.presentationData, peer: self.screenNode.data?.peer, cachedData: self.screenNode.data?.cachedData, notificationSettings: self.screenNode.data?.notificationSettings, statusData: self.screenNode.data?.status, isSecretChat: self.screenNode.peerId.namespace == Namespaces.Peer.SecretChat, isContact: self.screenNode.data?.isContact ?? false, isSettings: self.screenNode.isSettings, state: self.screenNode.state, transition: transition, additive: false)
             }
             
             let titleScale = (fraction * previousTitleNode.bounds.height + (1.0 - fraction) * self.headerNode.titleNodeRawContainer.bounds.height) / previousTitleNode.bounds.height
@@ -6688,6 +7043,21 @@ private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavig
             transition.updateAlpha(node: previousStatusNode, alpha: fraction)
             
             transition.updateAlpha(node: self.headerNode.navigationButtonContainer, alpha: (1.0 - fraction))
+
+            if case let .animated(duration, _) = transition, (bottomNavigationBar.additionalContentNode.alpha.isZero || bottomNavigationBar.additionalContentNode.alpha == 1.0) {
+                bottomNavigationBar.additionalContentNode.alpha = fraction
+                if fraction.isZero {
+                    bottomNavigationBar.additionalContentNode.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.15)
+                } else {
+                    transition.updateAlpha(node: bottomNavigationBar.additionalContentNode, alpha: fraction)
+                }
+            } else {
+                transition.updateAlpha(node: bottomNavigationBar.additionalContentNode, alpha: fraction)
+            }
+
+            let bottomHeight = bottomNavigationBar.backgroundNode.bounds.height
+
+            transition.updateSublayerTransformOffset(layer: bottomNavigationBar.additionalContentNode.layer, offset: CGPoint(x: 0.0, y: (1.0 - fraction) * (topHeight - bottomHeight)))
         }
     }
     
@@ -6695,6 +7065,14 @@ private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavig
         guard let topNavigationBar = self.topNavigationBar, let bottomNavigationBar = self.bottomNavigationBar else {
             return
         }
+
+        topNavigationBar.additionalContentNode.alpha = 1.0
+        ContainedViewLayoutTransition.immediate.updateSublayerTransformOffset(layer: topNavigationBar.additionalContentNode.layer, offset: CGPoint())
+        topNavigationBar.reattachAdditionalContentNode()
+
+        bottomNavigationBar.additionalContentNode.alpha = 1.0
+        ContainedViewLayoutTransition.immediate.updateSublayerTransformOffset(layer: bottomNavigationBar.additionalContentNode.layer, offset: CGPoint())
+        bottomNavigationBar.reattachAdditionalContentNode()
         
         topNavigationBar.isHidden = false
         bottomNavigationBar.isHidden = false
@@ -6703,14 +7081,6 @@ private final class PeerInfoNavigationTransitionNode: ASDisplayNode, CustomNavig
     }
 }
 
-private func encodeText(_ string: String, _ key: Int) -> String {
-    var result = ""
-    for c in string.unicodeScalars {
-        result.append(Character(UnicodeScalar(UInt32(Int(c.value) + key))!))
-    }
-    return result
-}
-
 private final class ContextControllerContentSourceImpl: ContextControllerContentSource {
     let controller: ViewController
     weak var sourceNode: ASDisplayNode?
@@ -6859,14 +7229,14 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
             if case let .peer(selectedPeer, _, _) = memberPeer {
                 let memberId = selectedPeer.id
                 if groupPeer.id.namespace == Namespaces.Peer.CloudChannel {
-                    return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
+                    return context.peerChannelMemberCategoriesContextsManager.addMember(engine: context.engine, peerId: groupPeer.id, memberId: memberId)
                     |> map { _ -> Void in
                     }
                     |> `catch` { _ -> Signal<Void, NoError> in
                         return .complete()
                     }
                 } else {
-                    return addGroupMember(account: context.account, peerId: groupPeer.id, memberId: memberId)
+                    return context.engine.peers.addGroupMember(peerId: groupPeer.id, memberId: memberId)
                     |> deliverOnMainQueue
                     |> `catch` { error -> Signal<Void, NoError> in
                         switch error {
@@ -6897,7 +7267,7 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
                             })
                             return .complete()
                         case .groupFull:
-                            let signal = convertGroupToSupergroup(account: context.account, peerId: groupPeer.id)
+                            let signal = context.engine.peers.convertGroupToSupergroup(peerId: groupPeer.id)
                             |> map(Optional.init)
                             |> `catch` { error -> Signal<PeerId?, NoError> in
                                 switch error {
@@ -6914,7 +7284,7 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
                                 guard let upgradedPeerId = upgradedPeerId else {
                                     return .single(nil)
                                 }
-                                return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: upgradedPeerId, memberId: memberId)
+                                return context.peerChannelMemberCategoriesContextsManager.addMember(engine: context.engine, peerId: upgradedPeerId, memberId: memberId)
                                 |> `catch` { _ -> Signal<Never, NoError> in
                                     return .complete()
                                 }
@@ -6950,11 +7320,11 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
             |> castError(AddChannelMemberError.self)
             |> mapToSignal { view -> Signal<Void, AddChannelMemberError> in
                 if memberIds.count == 1 {
-                    return context.peerChannelMemberCategoriesContextsManager.addMember(account: context.account, peerId: groupPeer.id, memberId: memberIds[0])
+                    return context.peerChannelMemberCategoriesContextsManager.addMember(engine: context.engine, peerId: groupPeer.id, memberId: memberIds[0])
                     |> map { _ -> Void in
                     }
                 } else {
-                    return context.peerChannelMemberCategoriesContextsManager.addMembers(account: context.account, peerId: groupPeer.id, memberIds: memberIds) |> map { _ in
+                    return context.peerChannelMemberCategoriesContextsManager.addMembers(engine: context.engine, peerId: groupPeer.id, memberIds: memberIds) |> map { _ in
                     }
                 }
             }
@@ -6968,8 +7338,8 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
         parentController?.push(contactsController)
         if let contactsController = contactsController as? ContactSelectionController {
             selectAddMemberDisposable.set((contactsController.result
-            |> deliverOnMainQueue).start(next: { [weak contactsController] memberPeer in
-                guard let (memberPeer, _) = memberPeer else {
+            |> deliverOnMainQueue).start(next: { [weak contactsController] result in
+                guard let (peers, _) = result, let memberPeer = peers.first else {
                     return
                 }
                 
@@ -7019,7 +7389,7 @@ func presentAddMembers(context: AccountContext, parentController: ViewController
                     }
                     
                     contactsController?.dismiss()
-                },completed: {
+                }, completed: {
                     contactsController?.dismiss()
                 }))
             }))
diff --git a/submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift b/submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift
index 536bab0372..983769ee0e 100644
--- a/submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift
+++ b/submodules/TelegramUI/Sources/PeerMediaCollectionSectionsNode.swift
@@ -35,7 +35,7 @@ final class PeerMediaCollectionSectionsNode: ASDisplayNode {
         
         super.init()
         
-        self.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
+        self.backgroundColor = self.theme.rootController.navigationBar.opaqueBackgroundColor
         
         self.segmentedControlNode.selectedIndexChanged = { [weak self] index in
             self?.indexUpdated?(index)
@@ -57,7 +57,7 @@ final class PeerMediaCollectionSectionsNode: ASDisplayNode {
         if interfaceState.theme !== self.theme {
             self.theme = interfaceState.theme
             self.separatorNode.backgroundColor = self.theme.rootController.navigationBar.separatorColor
-            self.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
+            self.backgroundColor = self.theme.rootController.navigationBar.opaqueBackgroundColor
             self.segmentedControlNode.updateTheme(SegmentedControlTheme(theme: self.theme))
         }
         
diff --git a/submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift b/submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
index 28f65a474c..631e63ce85 100644
--- a/submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
+++ b/submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
@@ -59,7 +59,7 @@ final class MessageMediaPlaylistItem: SharedMediaPlaylistItem {
     let message: Message
     
     init(message: Message) {
-        self.id = PeerMessagesMediaPlaylistItemId(messageId: message.id)
+        self.id = PeerMessagesMediaPlaylistItemId(messageId: message.id, messageIndex: message.index)
         self.message = message
     }
     
@@ -808,7 +808,7 @@ final class PeerMessagesMediaPlaylist: SharedMediaPlaylist {
                 default:
                     break
             }
-            let _ = markMessageContentAsConsumedInteractively(postbox: self.context.account.postbox, messageId: item.message.id).start()
+            let _ = self.context.engine.messages.markMessageContentAsConsumedInteractively(messageId: item.message.id).start()
         }
     }
 }
diff --git a/submodules/TelegramUI/Sources/PeerSelectionController.swift b/submodules/TelegramUI/Sources/PeerSelectionController.swift
index bb319bd801..8a3a59fce2 100644
--- a/submodules/TelegramUI/Sources/PeerSelectionController.swift
+++ b/submodules/TelegramUI/Sources/PeerSelectionController.swift
@@ -20,6 +20,7 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
     private var customTitle: String?
     
     public var peerSelected: ((Peer) -> Void)?
+    public var multiplePeersSelected: (([Peer], NSAttributedString) -> Void)?
     private let filter: ChatListNodePeersFilter
     
     private let attemptSelection: ((Peer) -> Void)?
@@ -124,6 +125,10 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
             self?.activateSearch()
         })
         self.navigationBar?.setContentNode(self.searchContentNode, animated: false)
+        
+        if params.multipleSelection {
+            self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Select, style: .plain, target: self, action: #selector(self.beginSelection))
+        }
     }
     
     required public init(coder aDecoder: NSCoder) {
@@ -152,6 +157,10 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
         
         self.peerSelectionNode.navigationBar = self.navigationBar
         
+        self.peerSelectionNode.requestSend = { [weak self] peers, text in
+            self?.multiplePeersSelected?(peers, text)
+        }
+        
         self.peerSelectionNode.requestDeactivateSearch = { [weak self] in
             self?.deactivateSearch()
         }
@@ -217,7 +226,12 @@ public final class PeerSelectionControllerImpl: ViewController, PeerSelectionCon
     override public func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
         super.containerLayoutUpdated(layout, transition: transition)
         
-        self.peerSelectionNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationInsetHeight, actualNavigationBarHeight: self.navigationHeight, transition: transition)
+        self.peerSelectionNode.containerLayoutUpdated(layout, navigationBarHeight: self.cleanNavigationHeight, actualNavigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
+    }
+    
+    @objc private func beginSelection() {
+        self.navigationItem.rightBarButtonItem = nil
+        self.peerSelectionNode.beginSelection()
     }
     
     @objc func cancelPressed() {
diff --git a/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift b/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
index 63b2298c9f..39e7fdb50e 100644
--- a/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
+++ b/submodules/TelegramUI/Sources/PeerSelectionControllerNode.swift
@@ -21,6 +21,9 @@ final class PeerSelectionControllerNode: ASDisplayNode {
     private let filter: ChatListNodePeersFilter
     private let hasGlobalSearch: Bool
     
+    private var presentationInterfaceState: ChatPresentationInterfaceState
+    private var interfaceInteraction: ChatPanelInterfaceInteraction?
+    
     var inProgress: Bool = false {
         didSet {
             
@@ -29,10 +32,12 @@ final class PeerSelectionControllerNode: ASDisplayNode {
     
     var navigationBar: NavigationBar?
     
-    private let toolbarBackgroundNode: ASDisplayNode?
+    private let toolbarBackgroundNode: NavigationBackgroundNode?
     private let toolbarSeparatorNode: ASDisplayNode?
     private let segmentedControlNode: SegmentedControlNode?
     
+    private var textInputPanelNode: PeerSelectionTextInputPanelNode?
+    
     var contactListNode: ContactListNode?
     let chatListNode: ChatListNode
     
@@ -51,6 +56,7 @@ final class PeerSelectionControllerNode: ASDisplayNode {
     var requestOpenDisabledPeer: ((Peer) -> Void)?
     var requestOpenPeerFromSearch: ((Peer) -> Void)?
     var requestOpenMessageFromSearch: ((Peer, MessageId) -> Void)?
+    var requestSend: (([Peer], NSAttributedString) -> Void)?
     
     private var presentationData: PresentationData
     private var presentationDataDisposable: Disposable?
@@ -70,9 +76,10 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         let presentationData = context.sharedContext.currentPresentationData.with { $0 }
         self.presentationData = presentationData
         
+        self.presentationInterfaceState = ChatPresentationInterfaceState(chatWallpaper: .builtin(WallpaperSettings()), theme: self.presentationData.theme, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameDisplayOrder: self.presentationData.nameDisplayOrder, limitsConfiguration: self.context.currentLimitsConfiguration.with { $0 }, fontSize: self.presentationData.chatFontSize, bubbleCorners: self.presentationData.chatBubbleCorners, accountPeerId: self.context.account.peerId, mode: .standard(previewing: false), chatLocation: .peer(PeerId(0)), subject: nil, peerNearbyData: nil, greetingData: nil, pendingUnpinnedAllMessages: false, activeGroupCallInfo: nil, hasActiveGroupCall: false, importState: nil)
+        
         if hasChatListSelector && hasContactSelector {
-            self.toolbarBackgroundNode = ASDisplayNode()
-            self.toolbarBackgroundNode?.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+            self.toolbarBackgroundNode = NavigationBackgroundNode(color: self.presentationData.theme.rootController.navigationBar.blurredBackgroundColor)
             
             self.toolbarSeparatorNode = ASDisplayNode()
             self.toolbarSeparatorNode?.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
@@ -94,7 +101,7 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             chatListcategories.append(ChatListNodeAdditionalCategory(id: 0, icon: PresentationResourcesItemList.createGroupIcon(self.presentationData.theme), title: self.presentationData.strings.PeerSelection_ImportIntoNewGroup, appearance: .action))
         }
        
-        self.chatListNode = ChatListNode(context: context, groupId: .root, previewing: false, fillPreloadItems: false, mode: .peers(filter: filter, isSelecting: false, additionalCategories: chatListcategories, chatListFilters: nil), theme: self.presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: presentationData.disableAnimations)
+        self.chatListNode = ChatListNode(context: context, groupId: .root, previewing: false, fillPreloadItems: false, mode: .peers(filter: filter, isSelecting: false, additionalCategories: chatListcategories, chatListFilters: nil), theme: self.presentationData.theme, fontSize: presentationData.listsFontSize, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, nameSortOrder: presentationData.nameSortOrder, nameDisplayOrder: presentationData.nameDisplayOrder, disableAnimations: true)
         
         super.init()
         
@@ -108,6 +115,9 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         
+        self.chatListNode.selectionCountChanged = { [weak self] count in
+            self?.textInputPanelNode?.updateSendButtonEnabled(count > 0, animated: true)
+        }
         self.chatListNode.accessibilityPageScrolledString = { row, count in
             return presentationData.strings.VoiceOver_ScrollStatus(row, count).0
         }
@@ -164,6 +174,112 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         if !hasChatListSelector && hasContactSelector {
             self.indexChanged(1)
         }
+     
+        self.interfaceInteraction = ChatPanelInterfaceInteraction(setupReplyMessage: { _, _ in
+        }, setupEditMessage: { _, _ in
+        }, beginMessageSelection: { _, _ in
+        }, deleteSelectedMessages: {
+        }, reportSelectedMessages: {
+        }, reportMessages: { _, _ in
+        }, blockMessageAuthor: { _, _ in
+        }, deleteMessages: { _, _, f in
+            f(.default)
+        }, forwardSelectedMessages: {
+        }, forwardCurrentForwardMessages: {
+        }, forwardMessages: { _ in
+        }, shareSelectedMessages: {
+        }, updateTextInputStateAndMode: { [weak self] f in
+            if let strongSelf = self {
+                strongSelf.updateChatPresentationInterfaceState(animated: true, { state in
+                    let (updatedState, updatedMode) = f(state.interfaceState.effectiveInputState, state.inputMode)
+                    return state.updatedInterfaceState { interfaceState in
+                        return interfaceState.withUpdatedEffectiveInputState(updatedState)
+                    }.updatedInputMode({ _ in updatedMode })
+                })
+            }
+        }, updateInputModeAndDismissedButtonKeyboardMessageId: { [weak self] f in
+            if let strongSelf = self {
+                strongSelf.updateChatPresentationInterfaceState(animated: true, {
+                    let (updatedInputMode, updatedClosedButtonKeyboardMessageId) = f($0)
+                    return $0.updatedInputMode({ _ in return updatedInputMode }).updatedInterfaceState({
+                        $0.withUpdatedMessageActionsState({ value in
+                            var value = value
+                            value.closedButtonKeyboardMessageId = updatedClosedButtonKeyboardMessageId
+                            return value
+                        })
+                    })
+                })
+            }
+        }, openStickers: {
+        }, editMessage: {
+        }, beginMessageSearch: { _, _ in
+        }, dismissMessageSearch: {
+        }, updateMessageSearch: { _ in
+        }, openSearchResults: {
+        }, navigateMessageSearch: { _ in
+        }, openCalendarSearch: {
+        }, toggleMembersSearch: { _ in
+        }, navigateToMessage: { _, _, _, _ in
+        }, navigateToChat: { _ in
+        }, navigateToProfile: { _ in
+        }, openPeerInfo: {
+        }, togglePeerNotifications: {
+        }, sendContextResult: { _, _, _, _ in
+            return false
+        }, sendBotCommand: { _, _ in
+        }, sendBotStart: { _ in
+        }, botSwitchChatWithPayload: { _, _ in
+        }, beginMediaRecording: { _ in
+        }, finishMediaRecording: { _ in
+        }, stopMediaRecording: {
+        }, lockMediaRecording: {
+        }, deleteRecordedMedia: {
+        }, sendRecordedMedia: { _ in
+        }, displayRestrictedInfo: { _, _ in
+        }, displayVideoUnmuteTip: { _ in
+        }, switchMediaRecordingMode: {
+        }, setupMessageAutoremoveTimeout: {
+        }, sendSticker: { _, _, _, _ in
+            return false
+        }, unblockPeer: {
+        }, pinMessage: { _, _ in
+        }, unpinMessage: { _, _, _ in
+        }, unpinAllMessages: {
+        }, openPinnedList: { _ in
+        }, shareAccountContact: {
+        }, reportPeer: {
+        }, presentPeerContact: {
+        }, dismissReportPeer: {
+        }, deleteChat: {
+        }, beginCall: { _ in
+        }, toggleMessageStickerStarred: { _ in
+        }, presentController: { _, _ in
+        }, getNavigationController: {
+            return nil
+        }, presentGlobalOverlayController: { _, _ in
+        }, navigateFeed: {
+        }, openGrouping: {
+        }, toggleSilentPost: {
+        }, requestUnvoteInMessage: { _ in
+        }, requestStopPollInMessage: { _ in
+        }, updateInputLanguage: { _ in
+        }, unarchiveChat: {
+        }, openLinkEditing: {
+        }, reportPeerIrrelevantGeoLocation: {
+        }, displaySlowmodeTooltip: { _, _ in
+        }, displaySendMessageOptions: { _, _ in
+        }, openScheduledMessages: {
+        }, openPeersNearby: {
+        }, displaySearchResultsTooltip: { _, _ in
+        }, unarchivePeer: {
+        }, scrollToTop: {
+        }, viewReplies: { _, _ in
+        }, activatePinnedListPreview: { _, _ in
+        }, joinGroupCall: { _ in
+        }, presentInviteMembers: {
+        }, presentGigagroupHelp: {
+        }, editMessageMedia: { _, _ in
+        }, updateShowCommands: { _ in }, statuses: nil)
         
         self.readyValue.set(self.chatListNode.ready)
     }
@@ -172,12 +288,95 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         self.presentationDataDisposable?.dispose()
     }
     
+    private func updateChatPresentationInterfaceState(animated: Bool = true, _ f: (ChatPresentationInterfaceState) -> ChatPresentationInterfaceState, completion: @escaping (ContainedViewLayoutTransition) -> Void = { _ in }) {
+        self.updateChatPresentationInterfaceState(transition: animated ? .animated(duration: 0.4, curve: .spring) : .immediate, f, completion: completion)
+    }
+    
+    private func updateChatPresentationInterfaceState(transition: ContainedViewLayoutTransition, _ f: (ChatPresentationInterfaceState) -> ChatPresentationInterfaceState, completion externalCompletion: @escaping (ContainedViewLayoutTransition) -> Void = { _ in }) {
+        let presentationInterfaceState = f(self.presentationInterfaceState)
+        let updateInputTextState = self.presentationInterfaceState.interfaceState.effectiveInputState != presentationInterfaceState.interfaceState.effectiveInputState
+        
+        self.presentationInterfaceState = presentationInterfaceState
+        
+        if let textInputPanelNode = self.textInputPanelNode, updateInputTextState {
+            textInputPanelNode.updateInputTextState(presentationInterfaceState.interfaceState.effectiveInputState, animated: transition.isAnimated)
+        }
+        
+        if let (layout, navigationBarHeight, actualNavigationBarHeight) = self.containerLayout {
+            self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, actualNavigationBarHeight: actualNavigationBarHeight, transition: transition)
+        }
+    }
+    
+    func beginSelection() {
+        if let _ = self.textInputPanelNode {
+        } else {
+            let textInputPanelNode = PeerSelectionTextInputPanelNode(presentationInterfaceState: self.presentationInterfaceState, presentController: { [weak self] c in self?.present(c, nil) })
+            textInputPanelNode.interfaceInteraction = self.interfaceInteraction
+            textInputPanelNode.sendMessage = { [weak self] in
+                guard let strongSelf = self else {
+                    return
+                }
+                
+                if strongSelf.contactListActive {
+                    strongSelf.contactListNode?.multipleSelection = true
+                    let selectedContactPeers = strongSelf.contactListNode?.selectedPeers ?? []
+                    let effectiveInputText = strongSelf.presentationInterfaceState.interfaceState.composeInputState.inputText
+                    var selectedPeers: [Peer] = []
+                    for contactPeer in selectedContactPeers {
+                        if case let .peer(peer, _, _) = contactPeer {
+                            selectedPeers.append(peer)
+                        }
+                    }
+                    if !selectedPeers.isEmpty {
+                        strongSelf.requestSend?(selectedPeers, effectiveInputText)
+                    }
+                } else {
+                    var selectedPeerIds: [PeerId] = []
+                    var selectedPeerMap: [PeerId: Peer] = [:]
+                    strongSelf.chatListNode.updateState { state in
+                        selectedPeerIds = Array(state.selectedPeerIds)
+                        selectedPeerMap = state.selectedPeerMap
+                        return state
+                    }
+                    if !selectedPeerIds.isEmpty {
+                        let effectiveInputText = strongSelf.presentationInterfaceState.interfaceState.composeInputState.inputText
+                        var selectedPeers: [Peer] = []
+                        for peerId in selectedPeerIds {
+                            if let peer = selectedPeerMap[peerId] {
+                                selectedPeers.append(peer)
+                            }
+                        }
+                        strongSelf.requestSend?(selectedPeers, effectiveInputText)
+                    }
+                }
+            }
+            self.addSubnode(textInputPanelNode)
+            self.textInputPanelNode = textInputPanelNode
+            
+            if let (layout, navigationBarHeight, actualNavigationBarHeight) = self.containerLayout {
+                self.containerLayoutUpdated(layout, navigationBarHeight: navigationBarHeight, actualNavigationBarHeight: actualNavigationBarHeight, transition: .animated(duration: 0.3, curve: .spring))
+            }
+        }
+        
+        if self.contactListActive {
+            self.contactListNode?.updateSelectionState({ _ in
+                return ContactListNodeGroupSelectionState()
+            })
+        } else {
+            self.chatListNode.updateState { state in
+                var state = state
+                state.editing = true
+                return state
+            }
+        }
+    }
+    
     private func updateThemeAndStrings() {
         self.backgroundColor = self.presentationData.theme.chatList.backgroundColor
         self.searchDisplayController?.updatePresentationData(self.presentationData)
-        self.chatListNode.updateThemeAndStrings(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: self.presentationData.disableAnimations)
+        self.chatListNode.updateThemeAndStrings(theme: self.presentationData.theme, fontSize: self.presentationData.listsFontSize, strings: self.presentationData.strings, dateTimeFormat: self.presentationData.dateTimeFormat, nameSortOrder: self.presentationData.nameSortOrder, nameDisplayOrder: self.presentationData.nameDisplayOrder, disableAnimations: true)
         
-        self.toolbarBackgroundNode?.backgroundColor = self.presentationData.theme.rootController.navigationBar.backgroundColor
+        self.toolbarBackgroundNode?.updateColor(color: self.presentationData.theme.rootController.navigationBar.blurredBackgroundColor, transition: .immediate)
         self.toolbarSeparatorNode?.backgroundColor = self.presentationData.theme.rootController.navigationBar.separatorColor
         self.segmentedControlNode?.updateTheme(SegmentedControlTheme(theme: self.presentationData.theme))
     }
@@ -186,19 +385,48 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         self.containerLayout = (layout, navigationBarHeight, actualNavigationBarHeight)
         
         let cleanInsets = layout.insets(options: [])
+        var insets = layout.insets(options: [.input])
         
         var toolbarHeight: CGFloat = cleanInsets.bottom
-
+        var textPanelHeight: CGFloat?
+        
+        if let textInputPanelNode = self.textInputPanelNode {
+            var panelTransition = transition
+            if textInputPanelNode.frame.width.isZero {
+                panelTransition = .immediate
+            }
+            var panelHeight = textInputPanelNode.updateLayout(width: layout.size.width, leftInset: layout.safeInsets.left, rightInset: layout.safeInsets.right, additionalSideInsets: UIEdgeInsets(), maxHeight: layout.size.height / 2.0, isSecondary: false, transition: panelTransition, interfaceState: self.presentationInterfaceState, metrics: layout.metrics)
+            if self.searchDisplayController == nil {
+                panelHeight += insets.bottom
+            } else {
+                panelHeight += cleanInsets.bottom
+            }
+            textPanelHeight = panelHeight
+            
+            let panelFrame = CGRect(x: 0.0, y: layout.size.height - panelHeight, width: layout.size.width, height: panelHeight)
+            if textInputPanelNode.frame.width.isZero {
+                var initialPanelFrame = panelFrame
+                initialPanelFrame.origin.y = layout.size.height
+                textInputPanelNode.frame = initialPanelFrame
+            }
+            transition.updateFrame(node: textInputPanelNode, frame: panelFrame)
+        }
+        
         if let segmentedControlNode = self.segmentedControlNode, let toolbarBackgroundNode = self.toolbarBackgroundNode, let toolbarSeparatorNode = self.toolbarSeparatorNode {
-            toolbarHeight += 44.0
+            if let textPanelHeight = textPanelHeight {
+                toolbarHeight = textPanelHeight
+            } else {
+                toolbarHeight += 44.0
+            }
             transition.updateFrame(node: toolbarBackgroundNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), size: CGSize(width: layout.size.width, height: toolbarHeight)))
+            toolbarBackgroundNode.update(size: toolbarBackgroundNode.bounds.size, transition: transition)
             transition.updateFrame(node: toolbarSeparatorNode, frame: CGRect(origin: CGPoint(x: 0.0, y: layout.size.height - toolbarHeight), size: CGSize(width: layout.size.width, height: UIScreenPixel)))
             
             let controlSize = segmentedControlNode.updateLayout(.sizeToFit(maximumWidth: layout.size.width, minimumWidth: 200.0, height: 32.0), transition: transition)
-            transition.updateFrame(node: segmentedControlNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - controlSize.width) / 2.0), y: layout.size.height - toolbarHeight + floor((44.0 - controlSize.height) / 2.0)), size: controlSize))
+            let controlOrigin = layout.size.height - (textPanelHeight == nil ? toolbarHeight : 0.0) + floor((44.0 - controlSize.height) / 2.0)
+            transition.updateFrame(node: segmentedControlNode, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - controlSize.width) / 2.0), y: controlOrigin), size: controlSize))
         }
-        
-        var insets = layout.insets(options: [.input])
+                
         insets.top += navigationBarHeight
         insets.bottom = max(insets.bottom, cleanInsets.bottom + 44.0)
         insets.left += layout.safeInsets.left
@@ -239,7 +467,45 @@ final class PeerSelectionControllerNode: ASDisplayNode {
         
         if self.chatListNode.supernode != nil {
             self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ChatListSearchContainerNode(context: self.context, filter: self.filter, groupId: .root, displaySearchFilters: false, openPeer: { [weak self] peer, _ in
-                if let requestOpenPeerFromSearch = self?.requestOpenPeerFromSearch {
+                guard let strongSelf = self else {
+                    return
+                }
+                var updated = false
+                var count = 0
+                strongSelf.chatListNode.updateState { state in
+                    if state.editing {
+                        updated = true
+                        var state = state
+                        var foundPeers = state.foundPeers
+                        var selectedPeerMap = state.selectedPeerMap
+                        selectedPeerMap[peer.id] = peer
+                        var exists = false
+                        for foundPeer in foundPeers {
+                            if peer.id == foundPeer.id {
+                                exists = true
+                                break
+                            }
+                        }
+                        if !exists {
+                            foundPeers.insert(peer, at: 0)
+                        }
+                        if state.selectedPeerIds.contains(peer.id) {
+                            state.selectedPeerIds.remove(peer.id)
+                        } else {
+                            state.selectedPeerIds.insert(peer.id)
+                        }
+                        state.foundPeers = foundPeers
+                        state.selectedPeerMap = selectedPeerMap
+                        count = state.selectedPeerIds.count
+                        return state
+                    } else {
+                        return state
+                    }
+                }
+                if updated {
+                    strongSelf.textInputPanelNode?.updateSendButtonEnabled(count > 0, animated: true)
+                    strongSelf.requestDeactivateSearch?()
+                } else if let requestOpenPeerFromSearch = strongSelf.requestOpenPeerFromSearch {
                     requestOpenPeerFromSearch(peer)
                 }
             }, openDisabledPeer: { [weak self] peer in
@@ -276,17 +542,48 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             }
             self.searchDisplayController = SearchDisplayController(presentationData: self.presentationData, contentNode: ContactsSearchContainerNode(context: self.context, onlyWriteable: true, categories: categories, addContact: nil, openPeer: { [weak self] peer in
                 if let strongSelf = self {
-                    switch peer {
-                        case let .peer(peer, _, _):
-                            let _ = (strongSelf.context.account.postbox.transaction { transaction -> Peer? in
-                                return transaction.getPeer(peer.id)
-                            } |> deliverOnMainQueue).start(next: { peer in
-                                if let strongSelf = self, let peer = peer {
-                                    strongSelf.requestOpenPeerFromSearch?(peer)
+                    var updated = false
+                    var count = 0
+                    strongSelf.contactListNode?.updateSelectionState { state -> ContactListNodeGroupSelectionState? in
+                        if let state = state {
+                            updated = true
+                            var foundPeers = state.foundPeers
+                            var selectedPeerMap = state.selectedPeerMap
+                            selectedPeerMap[peer.id] = peer
+                            var exists = false
+                            for foundPeer in foundPeers {
+                                if peer.id == foundPeer.id {
+                                    exists = true
+                                    break
                                 }
-                            })
-                        case .deviceContact:
-                            break
+                            }
+                            if !exists {
+                                foundPeers.insert(peer, at: 0)
+                            }
+                            let updatedState = state.withToggledPeerId(peer.id).withFoundPeers(foundPeers).withSelectedPeerMap(selectedPeerMap)
+                            count = updatedState.selectedPeerIndices.count
+                            return updatedState
+                        } else {
+                            return nil
+                        }
+                    }
+                    
+                    if updated {
+                        strongSelf.textInputPanelNode?.updateSendButtonEnabled(count > 0, animated: true)
+                        strongSelf.requestDeactivateSearch?()
+                    } else {
+                        switch peer {
+                            case let .peer(peer, _, _):
+                                let _ = (strongSelf.context.account.postbox.transaction { transaction -> Peer? in
+                                    return transaction.getPeer(peer.id)
+                                } |> deliverOnMainQueue).start(next: { peer in
+                                    if let strongSelf = self, let peer = peer {
+                                        strongSelf.requestOpenPeerFromSearch?(peer)
+                                    }
+                                })
+                            case .deviceContact:
+                                break
+                        }
                     }
                 }
             }, contextAction: nil), cancel: { [weak self] in
@@ -342,6 +639,11 @@ final class PeerSelectionControllerNode: ASDisplayNode {
                     let contactListNode = ContactListNode(context: context, presentation: .single(.natural(options: [], includeChatList: false)))
                     self.contactListNode = contactListNode
                     contactListNode.enableUpdates = true
+                    contactListNode.selectionStateUpdated = { [weak self] selectionState in
+                        if let strongSelf = self {
+                            strongSelf.textInputPanelNode?.updateSendButtonEnabled((selectionState?.selectedPeerIndices.count ?? 0) > 0, animated: true)
+                        }
+                    }
                     contactListNode.activateSearch = { [weak self] in
                         self?.requestActivateSearch?()
                     }
@@ -394,7 +696,7 @@ final class PeerSelectionControllerNode: ASDisplayNode {
             } else if let contactListNode = self.contactListNode {
                 contactListNode.enableUpdates = false
                 
-                self.insertSubnode(chatListNode, aboveSubnode: contactListNode)
+                self.insertSubnode(self.chatListNode, aboveSubnode: contactListNode)
                 contactListNode.removeFromSupernode()
             }
         }
diff --git a/submodules/TelegramUI/Sources/PeerSelectionTextInputPanelNode.swift b/submodules/TelegramUI/Sources/PeerSelectionTextInputPanelNode.swift
new file mode 100644
index 0000000000..08e7a34f55
--- /dev/null
+++ b/submodules/TelegramUI/Sources/PeerSelectionTextInputPanelNode.swift
@@ -0,0 +1,935 @@
+import Foundation
+import UIKit
+import Display
+import AsyncDisplayKit
+import SwiftSignalKit
+import Postbox
+import TelegramCore
+import SyncCore
+import MobileCoreServices
+import TelegramPresentationData
+import TextFormat
+import AccountContext
+import TouchDownGesture
+import ActivityIndicator
+import Speak
+
+private let counterFont = Font.with(size: 14.0, design: .regular, traits: [.monospacedNumbers])
+private let minInputFontSize = chatTextInputMinFontSize
+
+private func calclulateTextFieldMinHeight(_ presentationInterfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
+    let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+    var result: CGFloat
+    if baseFontSize.isEqual(to: 26.0) {
+        result = 42.0
+    } else if baseFontSize.isEqual(to: 23.0) {
+        result = 38.0
+    } else if baseFontSize.isEqual(to: 17.0) {
+        result = 31.0
+    } else if baseFontSize.isEqual(to: 19.0) {
+        result = 33.0
+    } else if baseFontSize.isEqual(to: 21.0) {
+        result = 35.0
+    } else {
+        result = 31.0
+    }
+    
+    if case .regular = metrics.widthClass {
+        result = max(33.0, result)
+    }
+    
+    return result
+}
+
+private func calculateTextFieldRealInsets(_ presentationInterfaceState: ChatPresentationInterfaceState) -> UIEdgeInsets {
+    let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+    let top: CGFloat
+    let bottom: CGFloat
+    if baseFontSize.isEqual(to: 14.0) {
+        top = 2.0
+        bottom = 1.0
+    } else if baseFontSize.isEqual(to: 15.0) {
+        top = 1.0
+        bottom = 1.0
+    } else if baseFontSize.isEqual(to: 16.0) {
+        top = 0.5
+        bottom = 0.0
+    } else {
+        top = 0.0
+        bottom = 0.0
+    }
+    return UIEdgeInsets(top: 4.5 + top, left: 0.0, bottom: 5.5 + bottom, right: 0.0)
+}
+
+private var currentTextInputBackgroundImage: (UIColor, UIColor, CGFloat, UIImage)?
+private func textInputBackgroundImage(backgroundColor: UIColor?, inputBackgroundColor: UIColor?, strokeColor: UIColor, diameter: CGFloat) -> UIImage? {
+    if let backgroundColor = backgroundColor, let current = currentTextInputBackgroundImage {
+        if current.0.isEqual(backgroundColor) && current.1.isEqual(strokeColor) && current.2.isEqual(to: diameter) {
+            return current.3
+        }
+    }
+    
+    let image = generateImage(CGSize(width: diameter, height: diameter), rotatedContext: { size, context in
+        context.clear(CGRect(x: 0.0, y: 0.0, width: diameter, height: diameter))
+
+        if let inputBackgroundColor = inputBackgroundColor {
+            context.setBlendMode(.normal)
+            context.setFillColor(inputBackgroundColor.cgColor)
+        } else {
+            context.setBlendMode(.clear)
+            context.setFillColor(UIColor.clear.cgColor)
+        }
+        context.fillEllipse(in: CGRect(x: 0.0, y: 0.0, width: diameter, height: diameter))
+            
+        context.setBlendMode(.normal)
+        context.setStrokeColor(strokeColor.cgColor)
+        let strokeWidth: CGFloat = 1.0
+        context.setLineWidth(strokeWidth)
+        context.strokeEllipse(in: CGRect(x: strokeWidth / 2.0, y: strokeWidth / 2.0, width: diameter - strokeWidth, height: diameter - strokeWidth))
+    })?.stretchableImage(withLeftCapWidth: Int(diameter) / 2, topCapHeight: Int(diameter) / 2)
+    if let image = image {
+        if let backgroundColor = backgroundColor {
+            currentTextInputBackgroundImage = (backgroundColor, strokeColor, diameter, image)
+        }
+        return image
+    } else {
+        return nil
+    }
+}
+
+class PeerSelectionTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDelegate {
+    var textPlaceholderNode: ImmediateTextNode
+    let textInputContainerBackgroundNode: ASImageNode
+    let textInputContainer: ASDisplayNode
+    var textInputNode: EditableTextNode?
+    
+    let textInputBackgroundNode: ASImageNode
+    private var transparentTextInputBackgroundImage: UIImage?
+    let actionButtons: ChatTextInputActionButtonsNode
+    private let counterTextNode: ImmediateTextNode
+
+    private var validLayout: (CGFloat, CGFloat, CGFloat, UIEdgeInsets, CGFloat, LayoutMetrics, Bool)?
+    
+    var sendMessage: () -> Void = { }
+    var updateHeight: (Bool) -> Void = { _ in }
+
+    private var updatingInputState = false
+    
+    private var currentPlaceholder: String?
+    
+    private var presentationInterfaceState: ChatPresentationInterfaceState?
+    private var initializedPlaceholder = false
+        
+    private let inputMenu = ChatTextInputMenu()
+    
+    private var theme: PresentationTheme?
+    private var strings: PresentationStrings?
+    
+    private let hapticFeedback = HapticFeedback()
+    
+    var inputTextState: ChatTextInputState {
+        if let textInputNode = self.textInputNode {
+            let selectionRange: Range<Int> = textInputNode.selectedRange.location ..< (textInputNode.selectedRange.location + textInputNode.selectedRange.length)
+            return ChatTextInputState(inputText: stateAttributedStringForText(textInputNode.attributedText ?? NSAttributedString()), selectionRange: selectionRange)
+        } else {
+            return ChatTextInputState()
+        }
+    }
+    
+    var storedInputLanguage: String?
+    var effectiveInputLanguage: String? {
+        if let textInputNode = textInputNode, textInputNode.isFirstResponder() {
+            return textInputNode.textInputMode.primaryLanguage
+        } else {
+            return self.storedInputLanguage
+        }
+    }
+    
+    var enablePredictiveInput: Bool = true {
+        didSet {
+            if let textInputNode = self.textInputNode {
+                textInputNode.textView.autocorrectionType = self.enablePredictiveInput ? .default : .no
+            }
+        }
+    }
+    
+    override var context: AccountContext? {
+        didSet {
+            self.actionButtons.micButton.account = self.context?.account
+        }
+    }
+
+    var micButton: ChatTextInputMediaRecordingButton? {
+        return self.actionButtons.micButton
+    }
+    
+    func updateSendButtonEnabled(_ enabled: Bool, animated: Bool) {
+        self.actionButtons.isUserInteractionEnabled = enabled
+        
+        let transition: ContainedViewLayoutTransition = animated ? .animated(duration: 0.2, curve: .easeInOut) : .immediate
+        transition.updateAlpha(node: self.actionButtons, alpha: enabled ? 1.0 : 0.3)
+    }
+        
+    func updateInputTextState(_ state: ChatTextInputState, animated: Bool) {
+        if state.inputText.length != 0 && self.textInputNode == nil {
+            self.loadTextInputNode()
+        }
+        
+        if let textInputNode = self.textInputNode, let _ = self.presentationInterfaceState {
+            self.updatingInputState = true
+            
+            var textColor: UIColor = .black
+            var accentTextColor: UIColor = .blue
+            var baseFontSize: CGFloat = 17.0
+            if let presentationInterfaceState = self.presentationInterfaceState {
+                textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
+                accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
+                baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+            }
+            textInputNode.attributedText = textAttributedStringForStateText(state.inputText, fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil)
+            textInputNode.selectedRange = NSMakeRange(state.selectionRange.lowerBound, state.selectionRange.count)
+            self.updatingInputState = false
+            self.updateTextNodeText(animated: animated)
+        }
+    }
+    
+    var text: String {
+        get {
+            return self.textInputNode?.attributedText?.string ?? ""
+        } set(value) {
+            if let textInputNode = self.textInputNode {
+                var textColor: UIColor = .black
+                var baseFontSize: CGFloat = 17.0
+                if let presentationInterfaceState = self.presentationInterfaceState {
+                    textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
+                    baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+                }
+                textInputNode.attributedText = NSAttributedString(string: value, font: Font.regular(baseFontSize), textColor: textColor)
+                self.editableTextNodeDidUpdateText(textInputNode)
+            }
+        }
+    }
+    
+    private let textInputViewInternalInsets = UIEdgeInsets(top: 1.0, left: 13.0, bottom: 1.0, right: 13.0)
+    
+    init(presentationInterfaceState: ChatPresentationInterfaceState, presentController: @escaping (ViewController) -> Void) {
+        self.textInputContainerBackgroundNode = ASImageNode()
+        self.textInputContainerBackgroundNode.isUserInteractionEnabled = false
+        self.textInputContainerBackgroundNode.displaysAsynchronously = false
+        
+        self.textInputContainer = ASDisplayNode()
+        self.textInputContainer.addSubnode(self.textInputContainerBackgroundNode)
+        self.textInputContainer.clipsToBounds = true
+        
+        self.textInputBackgroundNode = ASImageNode()
+        self.textInputBackgroundNode.displaysAsynchronously = false
+        self.textInputBackgroundNode.displayWithoutProcessing = true
+        self.textPlaceholderNode = ImmediateTextNode()
+        self.textPlaceholderNode.maximumNumberOfLines = 1
+        self.textPlaceholderNode.isUserInteractionEnabled = false
+        
+        self.actionButtons = ChatTextInputActionButtonsNode(theme: presentationInterfaceState.theme, strings: presentationInterfaceState.strings, presentController: presentController)
+        self.counterTextNode = ImmediateTextNode()
+        self.counterTextNode.textAlignment = .center
+        
+        super.init()
+        
+        self.actionButtons.sendButtonLongPressed = { [weak self] node, gesture in
+            self?.interfaceInteraction?.displaySendMessageOptions(node, gesture)
+        }
+        
+        self.actionButtons.sendButton.addTarget(self, action: #selector(self.sendButtonPressed), forControlEvents: .touchUpInside)
+        self.actionButtons.sendButton.alpha = 1.0
+        self.actionButtons.micButton.alpha = 0.0
+        self.actionButtons.expandMediaInputButton.alpha = 0.0
+        self.actionButtons.updateAccessibility()
+        
+        self.addSubnode(self.textInputContainer)
+        self.addSubnode(self.textInputBackgroundNode)
+        
+        self.addSubnode(self.textPlaceholderNode)
+        
+        self.addSubnode(self.actionButtons)
+        self.addSubnode(self.counterTextNode)
+                
+        self.textInputBackgroundNode.clipsToBounds = true
+        let recognizer = TouchDownGestureRecognizer(target: self, action: #selector(self.textInputBackgroundViewTap(_:)))
+        recognizer.touchDown = { [weak self] in
+            if let strongSelf = self {
+                strongSelf.ensureFocused()
+            }
+        }
+        self.textInputBackgroundNode.isUserInteractionEnabled = true
+        self.textInputBackgroundNode.view.addGestureRecognizer(recognizer)
+        
+        self.updateSendButtonEnabled(false, animated: false)
+    }
+
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func loadTextInputNodeIfNeeded() {
+        if self.textInputNode == nil {
+            self.loadTextInputNode()
+        }
+    }
+    
+    private func loadTextInputNode() {
+        let textInputNode = EditableTextNode()
+        textInputNode.initialPrimaryLanguage = self.presentationInterfaceState?.interfaceState.inputLanguage
+        var textColor: UIColor = .black
+        var tintColor: UIColor = .blue
+        var baseFontSize: CGFloat = 17.0
+        var keyboardAppearance: UIKeyboardAppearance = UIKeyboardAppearance.default
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
+            tintColor = presentationInterfaceState.theme.list.itemAccentColor
+            baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+            keyboardAppearance = presentationInterfaceState.theme.rootController.keyboardColor.keyboardAppearance
+        }
+        
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 1.0
+        paragraphStyle.lineHeightMultiple = 1.0
+        paragraphStyle.paragraphSpacing = 1.0
+        paragraphStyle.maximumLineHeight = 20.0
+        paragraphStyle.minimumLineHeight = 20.0
+        
+        textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(max(minInputFontSize, baseFontSize)), NSAttributedString.Key.foregroundColor.rawValue: textColor, NSAttributedString.Key.paragraphStyle.rawValue: paragraphStyle]
+        textInputNode.clipsToBounds = false
+        textInputNode.textView.clipsToBounds = false
+        textInputNode.delegate = self
+        textInputNode.hitTestSlop = UIEdgeInsets(top: -5.0, left: -5.0, bottom: -5.0, right: -5.0)
+        textInputNode.keyboardAppearance = keyboardAppearance
+        textInputNode.tintColor = tintColor
+        textInputNode.textView.scrollIndicatorInsets = UIEdgeInsets(top: 9.0, left: 0.0, bottom: 9.0, right: -13.0)
+        self.textInputContainer.addSubnode(textInputNode)
+        textInputNode.view.disablesInteractiveTransitionGestureRecognizer = true
+        self.textInputNode = textInputNode
+        
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
+            textInputNode.textContainerInset = calculateTextFieldRealInsets(presentationInterfaceState)
+        }
+        
+        if !self.textInputContainer.bounds.size.width.isZero {
+            let textInputFrame = self.textInputContainer.frame
+            
+            textInputNode.frame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - self.textInputViewInternalInsets.bottom))
+        }
+        
+        self.textInputBackgroundNode.isUserInteractionEnabled = false
+        self.textInputBackgroundNode.view.removeGestureRecognizer(self.textInputBackgroundNode.view.gestureRecognizers![0])
+        
+        let recognizer = TouchDownGestureRecognizer(target: self, action: #selector(self.textInputBackgroundViewTap(_:)))
+        recognizer.touchDown = { [weak self] in
+            if let strongSelf = self {
+                strongSelf.ensureFocused()
+            }
+        }
+        textInputNode.view.addGestureRecognizer(recognizer)
+        
+        textInputNode.textView.accessibilityHint = self.textPlaceholderNode.attributedText?.string
+    }
+    
+    private func textFieldMaxHeight(_ maxHeight: CGFloat, metrics: LayoutMetrics) -> CGFloat {
+        let textFieldInsets = self.textFieldInsets(metrics: metrics)
+        return max(33.0, maxHeight - (textFieldInsets.top + textFieldInsets.bottom + self.textInputViewInternalInsets.top + self.textInputViewInternalInsets.bottom))
+    }
+    
+    private func calculateTextFieldMetrics(width: CGFloat, maxHeight: CGFloat, metrics: LayoutMetrics) -> (accessoryButtonsWidth: CGFloat, textFieldHeight: CGFloat) {
+        let textFieldInsets = self.textFieldInsets(metrics: metrics)
+        
+        let fieldMaxHeight = textFieldMaxHeight(maxHeight, metrics: metrics)
+        
+        var textFieldMinHeight: CGFloat = 35.0
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            textFieldMinHeight = calclulateTextFieldMinHeight(presentationInterfaceState, metrics: metrics)
+        }
+        
+        let textFieldHeight: CGFloat
+        if let textInputNode = self.textInputNode {
+            let maxTextWidth = width - textFieldInsets.left - textFieldInsets.right - self.textInputViewInternalInsets.left - self.textInputViewInternalInsets.right
+            let measuredHeight = textInputNode.measure(CGSize(width: maxTextWidth, height: CGFloat.greatestFiniteMagnitude))
+            let unboundTextFieldHeight = max(textFieldMinHeight, ceil(measuredHeight.height))
+            
+            let maxNumberOfLines = min(12, (Int(fieldMaxHeight - 11.0) - 33) / 22)
+            
+            let updatedMaxHeight = (CGFloat(maxNumberOfLines) * (22.0 + 2.0) + 10.0)
+            
+            textFieldHeight = max(textFieldMinHeight, min(updatedMaxHeight, unboundTextFieldHeight))
+        } else {
+            textFieldHeight = textFieldMinHeight
+        }
+        
+        return (0.0, textFieldHeight)
+    }
+    
+    private func textFieldInsets(metrics: LayoutMetrics) -> UIEdgeInsets {
+        var insets = UIEdgeInsets(top: 6.0, left: 6.0, bottom: 6.0, right: 42.0)
+        if case .regular = metrics.widthClass, case .regular = metrics.heightClass {
+            insets.top += 1.0
+            insets.bottom += 1.0
+        }
+        return insets
+    }
+    
+    private func panelHeight(textFieldHeight: CGFloat, metrics: LayoutMetrics) -> CGFloat {
+        let textFieldInsets = self.textFieldInsets(metrics: metrics)
+        let result = textFieldHeight + textFieldInsets.top + textFieldInsets.bottom + self.textInputViewInternalInsets.top + self.textInputViewInternalInsets.bottom
+        return result
+    }
+    
+    override func minimalHeight(interfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
+        let textFieldMinHeight = calclulateTextFieldMinHeight(interfaceState, metrics: metrics)
+        var minimalHeight: CGFloat = 14.0 + textFieldMinHeight
+        if case .regular = metrics.widthClass, case .regular = metrics.heightClass {
+            minimalHeight += 2.0
+        }
+        return minimalHeight
+    }
+    
+    override func updateLayout(width: CGFloat, leftInset: CGFloat, rightInset: CGFloat, additionalSideInsets: UIEdgeInsets, maxHeight: CGFloat, isSecondary: Bool, transition: ContainedViewLayoutTransition, interfaceState: ChatPresentationInterfaceState, metrics: LayoutMetrics) -> CGFloat {
+        let previousAdditionalSideInsets = self.validLayout?.3
+        self.validLayout = (width, leftInset, rightInset, additionalSideInsets, maxHeight, metrics, isSecondary)
+    
+        var transition = transition
+        var additionalOffset: CGFloat = 0.0
+        if let previousAdditionalSideInsets = previousAdditionalSideInsets, previousAdditionalSideInsets.right != additionalSideInsets.right {
+            additionalOffset = (previousAdditionalSideInsets.right - additionalSideInsets.right) / 3.0
+            
+            if case .animated = transition {
+                transition = .animated(duration: 0.2, curve: .easeInOut)
+            }
+        }
+                                
+        if self.presentationInterfaceState != interfaceState {
+            let previousState = self.presentationInterfaceState
+            self.presentationInterfaceState = interfaceState
+            
+            let themeUpdated = previousState?.theme !== interfaceState.theme
+            
+            var updateSendButtonIcon = false
+            if (previousState?.interfaceState.editMessage != nil) != (interfaceState.interfaceState.editMessage != nil) {
+                updateSendButtonIcon = true
+            }
+            if self.theme !== interfaceState.theme {
+                updateSendButtonIcon = true
+                
+                if self.theme == nil || !self.theme!.chat.inputPanel.inputTextColor.isEqual(interfaceState.theme.chat.inputPanel.inputTextColor) {
+                    let textColor = interfaceState.theme.chat.inputPanel.inputTextColor
+                    let baseFontSize = max(minInputFontSize, interfaceState.fontSize.baseDisplaySize)
+                    
+                    if let textInputNode = self.textInputNode {
+                        if let text = textInputNode.attributedText?.string {
+                            let range = textInputNode.selectedRange
+                            textInputNode.attributedText = NSAttributedString(string: text, font: Font.regular(baseFontSize), textColor: textColor)
+                            textInputNode.selectedRange = range
+                        }
+                        textInputNode.typingAttributes = [NSAttributedString.Key.font.rawValue: Font.regular(baseFontSize), NSAttributedString.Key.foregroundColor.rawValue: textColor]
+                    }
+                }
+                
+                let keyboardAppearance = interfaceState.theme.rootController.keyboardColor.keyboardAppearance
+                if let textInputNode = self.textInputNode, textInputNode.keyboardAppearance != keyboardAppearance, textInputNode.isFirstResponder() {
+                    if textInputNode.isCurrentlyEmoji() {
+                        textInputNode.initialPrimaryLanguage = "emoji"
+                        textInputNode.resetInitialPrimaryLanguage()
+                    }
+                    textInputNode.keyboardAppearance = keyboardAppearance
+                }
+                
+                self.theme = interfaceState.theme
+
+                self.actionButtons.updateTheme(theme: interfaceState.theme)
+                
+                let textFieldMinHeight = calclulateTextFieldMinHeight(interfaceState, metrics: metrics)
+                let minimalInputHeight: CGFloat = 2.0 + textFieldMinHeight
+                
+                let backgroundColor: UIColor
+                if case let .color(color) = interfaceState.chatWallpaper, UIColor(rgb: color).isEqual(interfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper) {
+                    backgroundColor = interfaceState.theme.chat.inputPanel.panelBackgroundColorNoWallpaper
+                } else {
+                    backgroundColor = interfaceState.theme.chat.inputPanel.panelBackgroundColor
+                }
+                
+                self.textInputBackgroundNode.image = textInputBackgroundImage(backgroundColor: backgroundColor, inputBackgroundColor: nil, strokeColor: interfaceState.theme.chat.inputPanel.inputStrokeColor, diameter: minimalInputHeight)
+                self.transparentTextInputBackgroundImage = textInputBackgroundImage(backgroundColor: nil, inputBackgroundColor: interfaceState.theme.chat.inputPanel.inputBackgroundColor, strokeColor: interfaceState.theme.chat.inputPanel.inputStrokeColor, diameter: minimalInputHeight)
+                self.textInputContainerBackgroundNode.image = generateStretchableFilledCircleImage(diameter: minimalInputHeight, color: interfaceState.theme.chat.inputPanel.inputBackgroundColor)
+            } else {
+                if self.strings !== interfaceState.strings {
+                    self.strings = interfaceState.strings
+                    self.inputMenu.updateStrings(interfaceState.strings)
+                }
+            }
+  
+            if themeUpdated || !self.initializedPlaceholder {
+                self.initializedPlaceholder = true
+                
+                let placeholder = interfaceState.strings.Conversation_InputTextPlaceholder
+               
+                if self.currentPlaceholder != placeholder || themeUpdated {
+                    self.currentPlaceholder = placeholder
+                    let baseFontSize = max(minInputFontSize, interfaceState.fontSize.baseDisplaySize)
+                    self.textPlaceholderNode.attributedText = NSAttributedString(string: placeholder, font: Font.regular(baseFontSize), textColor: interfaceState.theme.chat.inputPanel.inputPlaceholderColor)
+                    self.textInputNode?.textView.accessibilityHint = placeholder
+                    let placeholderSize = self.textPlaceholderNode.updateLayout(CGSize(width: 320.0, height: CGFloat.greatestFiniteMagnitude))
+                    if transition.isAnimated, let snapshotLayer = self.textPlaceholderNode.layer.snapshotContentTree() {
+                        self.textPlaceholderNode.supernode?.layer.insertSublayer(snapshotLayer, above: self.textPlaceholderNode.layer)
+                        snapshotLayer.animateAlpha(from: 1.0, to: 0.0, duration: 0.22, removeOnCompletion: false, completion: { [weak snapshotLayer] _ in
+                            snapshotLayer?.removeFromSuperlayer()
+                        })
+                        self.textPlaceholderNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.18)
+                    }
+                    self.textPlaceholderNode.frame = CGRect(origin: self.textPlaceholderNode.frame.origin, size: placeholderSize)
+                }
+                
+                self.actionButtons.sendButtonLongPressEnabled = true
+            }
+            
+            let sendButtonHasApplyIcon = interfaceState.interfaceState.editMessage != nil
+            
+            if updateSendButtonIcon {
+                if !self.actionButtons.animatingSendButton {
+                    let imageNode = self.actionButtons.sendButton.imageNode
+                    
+                    if transition.isAnimated && !self.actionButtons.sendButton.alpha.isZero && self.actionButtons.sendButton.layer.animation(forKey: "opacity") == nil, let previousImage = imageNode.image {
+                        let tempView = UIImageView(image: previousImage)
+                        self.actionButtons.sendButton.view.addSubview(tempView)
+                        tempView.frame = imageNode.frame
+                        tempView.layer.animateAlpha(from: 1.0, to: 0.0, duration: 0.2, removeOnCompletion: false, completion: { [weak tempView] _ in
+                            tempView?.removeFromSuperview()
+                        })
+                        tempView.layer.animateScale(from: 1.0, to: 0.2, duration: 0.2, removeOnCompletion: false)
+                        
+                        imageNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
+                        imageNode.layer.animateScale(from: 0.2, to: 1.0, duration: 0.2)
+                    }
+                    self.actionButtons.sendButtonHasApplyIcon = sendButtonHasApplyIcon
+                    if self.actionButtons.sendButtonHasApplyIcon {
+                        self.actionButtons.sendButton.setImage(PresentationResourcesChat.chatInputPanelApplyButtonImage(interfaceState.theme), for: [])
+                    } else {
+                        self.actionButtons.sendButton.setImage(PresentationResourcesChat.chatInputPanelSendButtonImage(interfaceState.theme), for: [])
+                    }
+                }
+            }
+        }
+        
+        var textFieldMinHeight: CGFloat = 33.0
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            textFieldMinHeight = calclulateTextFieldMinHeight(presentationInterfaceState, metrics: metrics)
+        }
+        let minimalHeight: CGFloat = 14.0 + textFieldMinHeight
+        let minimalInputHeight: CGFloat = 2.0 + textFieldMinHeight
+        
+        var animatedTransition = true
+        if case .immediate = transition {
+            animatedTransition = false
+        }
+        
+        let baseWidth = width - leftInset - rightInset
+        let (accessoryButtonsWidth, textFieldHeight) = self.calculateTextFieldMetrics(width: baseWidth, maxHeight: maxHeight, metrics: metrics)
+        let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
+                                    
+        var composeButtonsOffset: CGFloat = 0.0
+        var textInputBackgroundWidthOffset: CGFloat = 0.0
+        
+        self.updateCounterTextNode(transition: transition)
+       
+        let actionButtonsFrame = CGRect(origin: CGPoint(x: width - rightInset - 43.0 - UIScreenPixel + composeButtonsOffset, y: panelHeight - minimalHeight), size: CGSize(width: 44.0, height: minimalHeight))
+        transition.updateFrame(node: self.actionButtons, frame: actionButtonsFrame)
+        
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            self.actionButtons.updateLayout(size: CGSize(width: 44.0, height: minimalHeight), transition: transition, interfaceState: presentationInterfaceState)
+        }
+        
+        let searchLayoutClearButtonSize = CGSize(width: 44.0, height: minimalHeight)
+        var textFieldInsets = self.textFieldInsets(metrics: metrics)
+        if additionalSideInsets.right > 0.0 {
+            textFieldInsets.right += additionalSideInsets.right / 3.0
+        }
+
+        var textInputViewRealInsets = UIEdgeInsets()
+        if let presentationInterfaceState = self.presentationInterfaceState {
+            textInputViewRealInsets = calculateTextFieldRealInsets(presentationInterfaceState)
+        }
+        
+        let textInputFrame = CGRect(x: leftInset + textFieldInsets.left, y: textFieldInsets.top, width: baseWidth - textFieldInsets.left - textFieldInsets.right + textInputBackgroundWidthOffset, height: panelHeight - textFieldInsets.top - textFieldInsets.bottom)
+        transition.updateFrame(node: self.textInputContainer, frame: textInputFrame)
+        transition.updateFrame(node: self.textInputContainerBackgroundNode, frame: CGRect(origin: CGPoint(), size: textInputFrame.size))
+        
+        if let textInputNode = self.textInputNode {
+            let textFieldFrame = CGRect(origin: CGPoint(x: self.textInputViewInternalInsets.left, y: self.textInputViewInternalInsets.top), size: CGSize(width: textInputFrame.size.width - (self.textInputViewInternalInsets.left + self.textInputViewInternalInsets.right), height: textInputFrame.size.height - self.textInputViewInternalInsets.top - textInputViewInternalInsets.bottom))
+            let shouldUpdateLayout = textFieldFrame.size != textInputNode.frame.size
+            transition.updateFrame(node: textInputNode, frame: textFieldFrame)
+            if shouldUpdateLayout {
+                textInputNode.layout()
+            }
+        }
+        
+        var inputHasText = false
+        if let textInputNode = self.textInputNode, let attributedText = textInputNode.attributedText, attributedText.length != 0 {
+            inputHasText = true
+        }
+        
+        self.textPlaceholderNode.isHidden = inputHasText
+          
+        transition.updateFrame(node: self.textPlaceholderNode, frame: CGRect(origin: CGPoint(x: leftInset + textFieldInsets.left + self.textInputViewInternalInsets.left, y: textFieldInsets.top + self.textInputViewInternalInsets.top + textInputViewRealInsets.top + UIScreenPixel), size: self.textPlaceholderNode.frame.size))
+        transition.updateFrame(layer: self.textInputBackgroundNode.layer, frame: CGRect(x: leftInset + textFieldInsets.left, y: textFieldInsets.top, width: baseWidth - textFieldInsets.left - textFieldInsets.right + textInputBackgroundWidthOffset, height: panelHeight - textFieldInsets.top - textFieldInsets.bottom))
+        
+        self.actionButtons.updateAccessibility()
+        
+        if let prevInputPanelNode = self.prevInputPanelNode {
+            prevInputPanelNode.frame = CGRect(origin: .zero, size: prevInputPanelNode.frame.size)
+        }
+        
+        return panelHeight
+    }
+    
+    override func canHandleTransition(from prevInputPanelNode: ChatInputPanelNode?) -> Bool {
+        return false
+    }
+    
+    @objc func editableTextNodeDidUpdateText(_ editableTextNode: ASEditableTextNode) {
+        if let textInputNode = self.textInputNode, let presentationInterfaceState = self.presentationInterfaceState {
+            let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+            refreshChatTextInputAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
+            refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
+            
+            let inputTextState = self.inputTextState
+            
+            self.interfaceInteraction?.updateTextInputStateAndMode({ _, inputMode in return (inputTextState, inputMode) })
+            self.interfaceInteraction?.updateInputLanguage({ _ in return textInputNode.textInputMode.primaryLanguage })
+            self.updateTextNodeText(animated: true)
+            
+            self.updateCounterTextNode(transition: .immediate)
+        }
+    }
+    
+    private func updateCounterTextNode(transition: ContainedViewLayoutTransition) {
+        if let textInputNode = self.textInputNode, let presentationInterfaceState = self.presentationInterfaceState, let editMessage = presentationInterfaceState.interfaceState.editMessage, let inputTextMaxLength = editMessage.inputTextMaxLength {
+            let textCount = Int32(textInputNode.textView.text.count)
+            let counterColor: UIColor = textCount > inputTextMaxLength ? presentationInterfaceState.theme.chat.inputPanel.panelControlDestructiveColor : presentationInterfaceState.theme.chat.inputPanel.panelControlColor
+            
+            let remainingCount = max(-999, inputTextMaxLength - textCount)
+            let counterText = remainingCount >= 5 ? "" : "\(remainingCount)"
+            self.counterTextNode.attributedText = NSAttributedString(string: counterText, font: counterFont, textColor: counterColor)
+        } else {
+            self.counterTextNode.attributedText = NSAttributedString(string: "", font: counterFont, textColor: .black)
+        }
+        
+        if let (width, leftInset, rightInset, _, maxHeight, metrics, _) = self.validLayout {
+            var composeButtonsOffset: CGFloat = 0.0
+            
+            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset, maxHeight: maxHeight, metrics: metrics)
+            let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
+            var textFieldMinHeight: CGFloat = 33.0
+            if let presentationInterfaceState = self.presentationInterfaceState {
+                textFieldMinHeight = calclulateTextFieldMinHeight(presentationInterfaceState, metrics: metrics)
+            }
+            let minimalHeight: CGFloat = 14.0 + textFieldMinHeight
+            
+            let counterSize = self.counterTextNode.updateLayout(CGSize(width: 44.0, height: 44.0))
+            let actionButtonsOriginX = width - rightInset - 43.0 - UIScreenPixel + composeButtonsOffset
+            let counterFrame = CGRect(origin: CGPoint(x: actionButtonsOriginX, y: panelHeight - minimalHeight - counterSize.height + 3.0), size: CGSize(width: width - actionButtonsOriginX - rightInset, height: counterSize.height))
+            transition.updateFrame(node: self.counterTextNode, frame: counterFrame)
+        }
+    }
+    
+    private func updateTextNodeText(animated: Bool) {
+        var inputHasText = false
+        if let textInputNode = self.textInputNode, let attributedText = textInputNode.attributedText, attributedText.length != 0 {
+            inputHasText = true
+        }
+        
+        if let _ = self.presentationInterfaceState {
+            self.textPlaceholderNode.isHidden = inputHasText
+        }
+        
+        self.updateTextHeight(animated: animated)
+    }
+    
+    private func updateTextHeight(animated: Bool) {
+        if let (width, leftInset, rightInset, additionalSideInsets, maxHeight, metrics, _) = self.validLayout {
+            let (_, textFieldHeight) = self.calculateTextFieldMetrics(width: width - leftInset - rightInset - additionalSideInsets.right, maxHeight: maxHeight, metrics: metrics)
+            let panelHeight = self.panelHeight(textFieldHeight: textFieldHeight, metrics: metrics)
+            if !self.bounds.size.height.isEqual(to: panelHeight) {
+                self.updateHeight(animated)
+            }
+        }
+    }
+    
+    @objc func editableTextNodeShouldReturn(_ editableTextNode: ASEditableTextNode) -> Bool {
+        if self.actionButtons.sendButton.supernode != nil && !self.actionButtons.sendButton.isHidden && !self.actionButtons.sendButton.alpha.isZero {
+            self.sendButtonPressed()
+        }
+        return false
+    }
+    
+    private func applyUpdateSendButtonIcon() {
+        if let interfaceState = self.presentationInterfaceState {
+            let sendButtonHasApplyIcon = interfaceState.interfaceState.editMessage != nil
+            
+            if sendButtonHasApplyIcon != self.actionButtons.sendButtonHasApplyIcon {
+                self.actionButtons.sendButtonHasApplyIcon = sendButtonHasApplyIcon
+                if self.actionButtons.sendButtonHasApplyIcon {
+                    self.actionButtons.sendButton.setImage(PresentationResourcesChat.chatInputPanelApplyButtonImage(interfaceState.theme), for: [])
+                } else {
+                    if case .scheduledMessages = interfaceState.subject {
+                        self.actionButtons.sendButton.setImage(PresentationResourcesChat.chatInputPanelScheduleButtonImage(interfaceState.theme), for: [])
+                    } else {
+                        self.actionButtons.sendButton.setImage(PresentationResourcesChat.chatInputPanelSendButtonImage(interfaceState.theme), for: [])
+                    }
+                }
+            }
+        }
+    }
+    
+    @objc func editableTextNodeDidChangeSelection(_ editableTextNode: ASEditableTextNode, fromSelectedRange: NSRange, toSelectedRange: NSRange, dueToEditing: Bool) {
+        if !dueToEditing && !self.updatingInputState {
+            let inputTextState = self.inputTextState
+            self.interfaceInteraction?.updateTextInputStateAndMode({ _, inputMode in return (inputTextState, inputMode) })
+        }
+        
+        if let textInputNode = self.textInputNode, let presentationInterfaceState = self.presentationInterfaceState {
+            if case .format = self.inputMenu.state {
+                self.inputMenu.deactivate()
+                UIMenuController.shared.update()
+            }
+            
+            let baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+            refreshChatTextInputTypingAttributes(textInputNode, theme: presentationInterfaceState.theme, baseFontSize: baseFontSize)
+        }
+    }
+    
+    @objc func editableTextNodeDidBeginEditing(_ editableTextNode: ASEditableTextNode) {
+        self.interfaceInteraction?.updateInputModeAndDismissedButtonKeyboardMessageId({ state in
+            return (.text, state.keyboardButtonsMessage?.id)
+        })
+        self.inputMenu.activate()
+    }
+    
+    func editableTextNodeDidFinishEditing(_ editableTextNode: ASEditableTextNode) {
+        self.storedInputLanguage = editableTextNode.textInputMode.primaryLanguage
+        self.inputMenu.deactivate()
+    }
+    
+    func editableTextNodeTarget(forAction action: Selector) -> ASEditableTextNodeTargetForAction? {
+        if action == Selector(("_accessibilitySpeak:")) {
+            if case .format = self.inputMenu.state {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            } else if let textInputNode = self.textInputNode, textInputNode.selectedRange.length > 0 {
+                return ASEditableTextNodeTargetForAction(target: self)
+            } else {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            }
+        } else if action == Selector(("_accessibilitySpeakSpellOut:")) {
+            if case .format = self.inputMenu.state {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            } else if let textInputNode = self.textInputNode, textInputNode.selectedRange.length > 0 {
+                return nil
+            } else {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            }
+        }
+        else if action == Selector("_accessibilitySpeakLanguageSelection:") || action == Selector("_accessibilityPauseSpeaking:") || action == Selector("_accessibilitySpeakSentence:") {
+            return ASEditableTextNodeTargetForAction(target: nil)
+        } else if action == Selector(("_showTextStyleOptions:")) {
+            if case .general = self.inputMenu.state {
+                if let textInputNode = self.textInputNode, textInputNode.attributedText == nil || textInputNode.attributedText!.length == 0 || textInputNode.selectedRange.length == 0 {
+                    return ASEditableTextNodeTargetForAction(target: nil)
+                }
+                return ASEditableTextNodeTargetForAction(target: self)
+            } else {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            }
+        } else if action == #selector(self.formatAttributesBold(_:)) || action == #selector(self.formatAttributesItalic(_:)) || action == #selector(self.formatAttributesMonospace(_:)) || action == #selector(self.formatAttributesLink(_:)) || action == #selector(self.formatAttributesStrikethrough(_:)) || action == #selector(self.formatAttributesUnderline(_:)) {
+            if case .format = self.inputMenu.state {
+                return ASEditableTextNodeTargetForAction(target: self)
+            } else {
+                return ASEditableTextNodeTargetForAction(target: nil)
+            }
+        }
+        if case .format = self.inputMenu.state {
+            return ASEditableTextNodeTargetForAction(target: nil)
+        }
+        return nil
+    }
+    
+    @objc func _accessibilitySpeak(_ sender: Any) {
+        var text = ""
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            text = current.inputText.attributedSubstring(from: NSMakeRange(current.selectionRange.lowerBound, current.selectionRange.count)).string
+            return (current, inputMode)
+        }
+        speakText(text)
+        
+        if #available(iOS 13.0, *) {
+            UIMenuController.shared.hideMenu()
+        } else {
+            UIMenuController.shared.isMenuVisible = false
+            UIMenuController.shared.update()
+        }
+    }
+    
+    @objc func _showTextStyleOptions(_ sender: Any) {
+        if let textInputNode = self.textInputNode {
+            self.inputMenu.format(view: textInputNode.view, rect: textInputNode.selectionRect.offsetBy(dx: 0.0, dy: -textInputNode.textView.contentOffset.y).insetBy(dx: 0.0, dy: -1.0))
+        }
+    }
+    
+    @objc func formatAttributesBold(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            return (chatTextInputAddFormattingAttribute(current, attribute: ChatTextInputAttributes.bold), inputMode)
+        }
+    }
+    
+    @objc func formatAttributesItalic(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            return (chatTextInputAddFormattingAttribute(current, attribute: ChatTextInputAttributes.italic), inputMode)
+        }
+    }
+    
+    @objc func formatAttributesMonospace(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            return (chatTextInputAddFormattingAttribute(current, attribute: ChatTextInputAttributes.monospace), inputMode)
+        }
+    }
+    
+    @objc func formatAttributesLink(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.openLinkEditing()
+    }
+    
+    @objc func formatAttributesStrikethrough(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            return (chatTextInputAddFormattingAttribute(current, attribute: ChatTextInputAttributes.strikethrough), inputMode)
+        }
+    }
+    
+    @objc func formatAttributesUnderline(_ sender: Any) {
+        self.inputMenu.back()
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            return (chatTextInputAddFormattingAttribute(current, attribute: ChatTextInputAttributes.underline), inputMode)
+        }
+    }
+    
+    @objc func editableTextNode(_ editableTextNode: ASEditableTextNode, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
+        var cleanText = text
+        let removeSequences: [String] = ["\u{202d}", "\u{202c}"]
+        for sequence in removeSequences {
+            inner: while true {
+                if let range = cleanText.range(of: sequence) {
+                    cleanText.removeSubrange(range)
+                } else {
+                    break inner
+                }
+            }
+        }
+                
+        if cleanText != text {
+            let string = NSMutableAttributedString(attributedString: editableTextNode.attributedText ?? NSAttributedString())
+            var textColor: UIColor = .black
+            var accentTextColor: UIColor = .blue
+            var baseFontSize: CGFloat = 17.0
+            if let presentationInterfaceState = self.presentationInterfaceState {
+                textColor = presentationInterfaceState.theme.chat.inputPanel.inputTextColor
+                accentTextColor = presentationInterfaceState.theme.chat.inputPanel.panelControlAccentColor
+                baseFontSize = max(minInputFontSize, presentationInterfaceState.fontSize.baseDisplaySize)
+            }
+            let cleanReplacementString = textAttributedStringForStateText(NSAttributedString(string: cleanText), fontSize: baseFontSize, textColor: textColor, accentTextColor: accentTextColor, writingDirection: nil)
+            string.replaceCharacters(in: range, with: cleanReplacementString)
+            self.textInputNode?.attributedText = string
+            self.textInputNode?.selectedRange = NSMakeRange(range.lowerBound + cleanReplacementString.length, 0)
+            self.updateTextNodeText(animated: true)
+            return false
+        }
+        return true
+    }
+    
+    @objc func editableTextNodeShouldCopy(_ editableTextNode: ASEditableTextNode) -> Bool {
+        self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+            storeInputTextInPasteboard(current.inputText.attributedSubstring(from: NSMakeRange(current.selectionRange.lowerBound, current.selectionRange.count)))
+            return (current, inputMode)
+        }
+        return false
+    }
+    
+    @objc func editableTextNodeShouldPaste(_ editableTextNode: ASEditableTextNode) -> Bool {
+        let pasteboard = UIPasteboard.general
+        
+        var attributedString: NSAttributedString?
+        if let data = pasteboard.data(forPasteboardType: kUTTypeRTF as String) {
+            attributedString = chatInputStateStringFromRTF(data, type: NSAttributedString.DocumentType.rtf)
+        } else if let data = pasteboard.data(forPasteboardType: "com.apple.flat-rtfd") {
+            attributedString = chatInputStateStringFromRTF(data, type: NSAttributedString.DocumentType.rtfd)
+        }
+        
+        if let attributedString = attributedString {
+            self.interfaceInteraction?.updateTextInputStateAndMode { current, inputMode in
+                if let inputText = current.inputText.mutableCopy() as? NSMutableAttributedString {
+                    inputText.replaceCharacters(in: NSMakeRange(current.selectionRange.lowerBound, current.selectionRange.count), with: attributedString)
+                    let updatedRange = current.selectionRange.lowerBound + attributedString.length
+                    return (ChatTextInputState(inputText: inputText, selectionRange: updatedRange ..< updatedRange), inputMode)
+                } else {
+                    return (ChatTextInputState(inputText: attributedString), inputMode)
+                }
+            }
+            return false
+        }
+        return true
+    }
+    
+    @objc func sendButtonPressed() {
+        if let textInputNode = self.textInputNode, let presentationInterfaceState = self.presentationInterfaceState, let editMessage = presentationInterfaceState.interfaceState.editMessage, let inputTextMaxLength = editMessage.inputTextMaxLength {
+            let textCount = Int32(textInputNode.textView.text.count)
+            let remainingCount = inputTextMaxLength - textCount
+
+            if remainingCount < 0 {
+                textInputNode.layer.addShakeAnimation()
+                self.hapticFeedback.error()
+                return
+            }
+        }
+    
+        self.sendMessage()
+    }
+    
+    @objc func textInputBackgroundViewTap(_ recognizer: UITapGestureRecognizer) {
+        if case .ended = recognizer.state {
+            self.ensureFocused()
+        }
+    }
+    
+    var isFocused: Bool {
+        return self.textInputNode?.isFirstResponder() ?? false
+    }
+    
+    func ensureUnfocused() {
+        self.textInputNode?.resignFirstResponder()
+    }
+    
+    func ensureFocused() {
+        if self.textInputNode == nil {
+            self.loadTextInputNode()
+        }
+        
+        self.textInputNode?.becomeFirstResponder()
+    }
+
+    func frameForInputActionButton() -> CGRect? {
+        if !self.actionButtons.alpha.isZero {
+            if self.actionButtons.micButton.alpha.isZero {
+                return self.actionButtons.frame.insetBy(dx: 0.0, dy: 6.0).offsetBy(dx: 4.0, dy: 0.0)
+            } else {
+                return self.actionButtons.frame.insetBy(dx: 0.0, dy: 6.0).offsetBy(dx: 2.0, dy: 0.0)
+            }
+        }
+        return nil
+    }
+}
diff --git a/submodules/TelegramUI/Sources/PeersNearbyManager.swift b/submodules/TelegramUI/Sources/PeersNearbyManager.swift
index f16bb84040..ab79fd03b1 100644
--- a/submodules/TelegramUI/Sources/PeersNearbyManager.swift
+++ b/submodules/TelegramUI/Sources/PeersNearbyManager.swift
@@ -7,23 +7,27 @@ import TelegramApi
 import DeviceLocationManager
 import CoreLocation
 import AccountContext
+import DeviceAccess
 
 private let locationUpdateTimePeriod: Double = 1.0 * 60.0 * 60.0
 private let locationDistanceUpdateThreshold: Double = 1000
 
 final class PeersNearbyManagerImpl: PeersNearbyManager {
     private let account: Account
+    private let engine: TelegramEngine
     private let locationManager: DeviceLocationManager
     private let inForeground: Signal<Bool, NoError>
     
     private var preferencesDisposable: Disposable?
     private var locationDisposable = MetaDisposable()
     private var updateDisposable = MetaDisposable()
+    private var accessDisposable: Disposable?
     
     private var previousLocation: CLLocation?
     
-    init(account: Account, locationManager: DeviceLocationManager, inForeground: Signal<Bool, NoError>)  {
+    init(account: Account, engine: TelegramEngine, locationManager: DeviceLocationManager, inForeground: Signal<Bool, NoError>)  {
         self.account = account
+        self.engine = engine
         self.locationManager = locationManager
         self.inForeground = inForeground
         
@@ -32,17 +36,34 @@ final class PeersNearbyManagerImpl: PeersNearbyManager {
             let state = view.values[PreferencesKeys.peersNearby] as? PeersNearbyState ?? .default
             return state.visibilityExpires
         }
+        |> deliverOnMainQueue
         |> distinctUntilChanged).start(next: { [weak self] visibility in
             if let strongSelf = self {
                 strongSelf.visibilityUpdated(visible: visibility != nil)
             }
         })
+
+        self.accessDisposable = (DeviceAccess.authorizationStatus(applicationInForeground: nil, siriAuthorization: nil, subject: .location(.live))
+        |> deliverOnMainQueue).start(next: { [weak self] status in
+            guard let strongSelf = self else {
+                return
+            }
+            switch status {
+            case .denied:
+                let _ = strongSelf.engine.peersNearby.updatePeersNearbyVisibility(update: .invisible, background: false).start()
+                strongSelf.locationDisposable.set(nil)
+                strongSelf.updateDisposable.set(nil)
+            default:
+                break
+            }
+        })
     }
     
     deinit {
         self.preferencesDisposable?.dispose()
         self.locationDisposable.dispose()
         self.updateDisposable.dispose()
+        self.accessDisposable?.dispose()
     }
     
     private func visibilityUpdated(visible: Bool) {
@@ -77,9 +98,9 @@ final class PeersNearbyManagerImpl: PeersNearbyManager {
     }
     
     private func updateLocation(_ location: CLLocation) {
-        self.updateDisposable.set(updatePeersNearbyVisibility(account: self.account, update: .location(latitude: location.coordinate.latitude, longitude: location.coordinate.longitude), background: true).start(error: { [weak self] _ in
+        self.updateDisposable.set(self.engine.peersNearby.updatePeersNearbyVisibility(update: .location(latitude: location.coordinate.latitude, longitude: location.coordinate.longitude), background: true).start(error: { [weak self] _ in
             if let strongSelf = self {
-                let _ = updatePeersNearbyVisibility(account: strongSelf.account, update: .invisible, background: false).start()
+                let _ = strongSelf.engine.peersNearby.updatePeersNearbyVisibility(update: .invisible, background: false).start()
                 strongSelf.locationDisposable.set(nil)
                 strongSelf.updateDisposable.set(nil)
             }
diff --git a/submodules/TelegramUI/Sources/PollResultsController.swift b/submodules/TelegramUI/Sources/PollResultsController.swift
index a3c23ca54a..69c0c154b0 100644
--- a/submodules/TelegramUI/Sources/PollResultsController.swift
+++ b/submodules/TelegramUI/Sources/PollResultsController.swift
@@ -252,7 +252,7 @@ private func pollResultsControllerEntries(presentationData: PresentationData, po
                     displayCount = Int(voterCount)
                 }
                 for peerIndex in 0 ..< displayCount {
-                    let fakeUser = TelegramUser(id: PeerId(namespace: -1, id: 0), accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
+                    let fakeUser = TelegramUser(id: PeerId(namespace: .max, id: PeerId.Id._internalFromInt32Value(0)), accessHash: nil, firstName: "", lastName: "", username: nil, phone: nil, photo: [], botInfo: nil, restrictionInfo: nil, flags: [])
                     let peer = RenderedPeer(peer: fakeUser)
                     entries.append(.optionPeer(optionId: i, index: peerIndex, peer: peer, optionText: optionTextHeader, optionAdditionalText: optionAdditionalTextHeader, optionCount: voterCount, optionExpanded: false, opaqueIdentifier: option.opaqueIdentifier, shimmeringAlternation: peerIndex % 2, isFirstInOption: peerIndex == 0))
                 }
@@ -323,7 +323,7 @@ public func pollResultsController(context: AccountContext, messageId: MessageId,
     
     let actionsDisposable = DisposableSet()
     
-    let resultsContext = PollResultsContext(account: context.account, messageId: messageId, poll: poll)
+    let resultsContext = context.engine.messages.pollResults(messageId: messageId, poll: poll)
     
     let arguments = PollResultsControllerArguments(context: context,
     collapseOption: { optionId in
diff --git a/submodules/TelegramUI/Sources/PrefetchManager.swift b/submodules/TelegramUI/Sources/PrefetchManager.swift
index 6c0fa0a1e7..88d8f64684 100644
--- a/submodules/TelegramUI/Sources/PrefetchManager.swift
+++ b/submodules/TelegramUI/Sources/PrefetchManager.swift
@@ -6,7 +6,9 @@ import SyncCore
 import TelegramUIPreferences
 import AccountContext
 import PhotoResources
+import StickerResources
 import Emoji
+import UniversalMediaPlayer
 
 private final class PrefetchMediaContext {
     let fetchDisposable = MetaDisposable()
@@ -20,18 +22,23 @@ public enum PrefetchMediaItem {
     case animatedEmojiSticker(TelegramMediaFile)
 }
 
-private final class PrefetchManagerImpl {
+private final class PrefetchManagerInnerImpl {
     private let queue: Queue
     private let account: Account
+    private let engine: TelegramEngine
     private let fetchManager: FetchManager
     
     private var listDisposable: Disposable?
     
     private var contexts: [MediaId: PrefetchMediaContext] = [:]
-    
-    init(queue: Queue, sharedContext: SharedAccountContext, account: Account, fetchManager: FetchManager) {
+
+    private let preloadGreetingStickerDisposable = MetaDisposable()
+    fileprivate let preloadedGreetingStickerPromise = Promise<TelegramMediaFile?>(nil)
+
+    init(queue: Queue, sharedContext: SharedAccountContext, account: Account, engine: TelegramEngine, fetchManager: FetchManager) {
         self.queue = queue
         self.account = account
+        self.engine = engine
         self.fetchManager = fetchManager
         
         let networkType = account.networkType
@@ -51,7 +58,7 @@ private final class PrefetchManagerImpl {
             return view.values[PreferencesKeys.appConfiguration] as? AppConfiguration ?? .defaultValue
         }
         
-        let orderedPreloadMedia = combineLatest(account.viewTracker.orderedPreloadMedia, loadedStickerPack(postbox: account.postbox, network: account.network, reference: .animatedEmoji, forceActualized: false), appConfiguration)
+        let orderedPreloadMedia = combineLatest(account.viewTracker.orderedPreloadMedia, TelegramEngine(account: account).stickers.loadedStickerPack(reference: .animatedEmoji, forceActualized: false), appConfiguration)
         |> map { orderedPreloadMedia, stickerPack, appConfiguration -> [PrefetchMediaItem] in
             let emojiSounds = AnimatedEmojiSoundsConfiguration.with(appConfiguration: appConfiguration, account: account)
             let chatHistoryMediaItems = orderedPreloadMedia.map { PrefetchMediaItem.chatHistory($0) }
@@ -202,7 +209,7 @@ private final class PrefetchManagerImpl {
                         context = PrefetchMediaContext()
                         self.contexts[id] = context
                         
-                        let priority: FetchManagerPriority = .backgroundPrefetch(locationOrder: HistoryPreloadIndex(index: nil, hasUnread: false, isMuted: false, isPriority: true), localOrder: MessageIndex(id: MessageId(peerId: PeerId(namespace: 0, id: 0), namespace: 0, id: order), timestamp: 0))
+                        let priority: FetchManagerPriority = .backgroundPrefetch(locationOrder: HistoryPreloadIndex(index: nil, hasUnread: false, isMuted: false, isPriority: true), localOrder: MessageIndex(id: MessageId(peerId: PeerId(0), namespace: 0, id: order), timestamp: 0))
                         
                         if case .full = automaticDownload {
                             let fetchSignal = freeMediaFileInteractiveFetched(fetchManager: self.fetchManager, fileReference: .standalone(media: media), priority: priority)
@@ -225,18 +232,63 @@ private final class PrefetchManagerImpl {
             }
         }
     }
+    
+    fileprivate func prepareNextGreetingSticker() {
+        let account = self.account
+        let engine = self.engine
+        self.preloadedGreetingStickerPromise.set(.single(nil)
+        |> then(engine.stickers.randomGreetingSticker()
+        |> map { item in
+            return item?.file
+        }))
+        
+        self.preloadGreetingStickerDisposable.set((self.preloadedGreetingStickerPromise.get()
+        |> mapToSignal { sticker -> Signal<Void, NoError> in
+            if let sticker = sticker {
+                let _ = freeMediaFileInteractiveFetched(account: account, fileReference: .standalone(media: sticker)).start()
+                return chatMessageAnimationData(postbox: account.postbox, resource: sticker.resource, fitzModifier: nil, width: 384, height: 384, synchronousLoad: false)
+                |> mapToSignal { _ -> Signal<Void, NoError> in
+                    return .complete()
+                }
+            } else {
+                return .complete()
+            }
+        }).start())
+    }
 }
 
-final class PrefetchManager {
+final class PrefetchManagerImpl: PrefetchManager {
     private let queue: Queue
     
-    private let impl: QueueLocalObject<PrefetchManagerImpl>
+    private let impl: QueueLocalObject<PrefetchManagerInnerImpl>
+    private let uuid = Atomic<UUID>(value: UUID())
     
-    init(sharedContext: SharedAccountContext, account: Account, fetchManager: FetchManager) {
+    init(sharedContext: SharedAccountContext, account: Account, engine: TelegramEngine, fetchManager: FetchManager) {
         let queue = Queue.mainQueue()
         self.queue = queue
         self.impl = QueueLocalObject(queue: queue, generate: {
-            return PrefetchManagerImpl(queue: queue, sharedContext: sharedContext, account: account, fetchManager: fetchManager)
+            return PrefetchManagerInnerImpl(queue: queue, sharedContext: sharedContext, account: account, engine: engine, fetchManager: fetchManager)
         })
     }
+    
+    var preloadedGreetingSticker: ChatGreetingData {
+        let signal: Signal<TelegramMediaFile?, NoError> = Signal { subscriber in
+            let disposable = MetaDisposable()
+            self.impl.with { impl in
+                disposable.set((impl.preloadedGreetingStickerPromise.get() |> take(1)).start(next: { file in
+                    subscriber.putNext(file)
+                    subscriber.putCompletion()
+                }))
+            }
+            return disposable
+        }
+        return ChatGreetingData(uuid: uuid.with { $0 }, sticker: signal)
+    }
+    
+    func prepareNextGreetingSticker() {
+        let _ = uuid.swap(UUID())
+        self.impl.with { impl in
+            impl.prepareNextGreetingSticker()
+        }
+    }
 }
diff --git a/submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift b/submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift
index 2b11046ca0..386b553b7f 100644
--- a/submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift
+++ b/submodules/TelegramUI/Sources/PreparedChatHistoryViewTransition.swift
@@ -7,14 +7,60 @@ import Display
 import MergeLists
 import AccountContext
 
-func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toView: ChatHistoryView, reason: ChatHistoryViewTransitionReason, reverse: Bool, chatLocation: ChatLocation, controllerInteraction: ChatControllerInteraction, scrollPosition: ChatHistoryViewScrollPosition?, initialData: InitialMessageHistoryData?, keyboardButtonsMessage: Message?, cachedData: CachedPeerData?, cachedDataMessages: [MessageId: Message]?, readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?, flashIndicators: Bool, updatedMessageSelection: Bool) -> ChatHistoryViewTransition {
-    let mergeResult: (deleteIndices: [Int], indicesAndItems: [(Int, ChatHistoryEntry, Int?)], updateIndices: [(Int, ChatHistoryEntry, Int)])
+func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toView: ChatHistoryView, reason: ChatHistoryViewTransitionReason, reverse: Bool, chatLocation: ChatLocation, controllerInteraction: ChatControllerInteraction, scrollPosition: ChatHistoryViewScrollPosition?, scrollAnimationCurve: ListViewAnimationCurve?, initialData: InitialMessageHistoryData?, keyboardButtonsMessage: Message?, cachedData: CachedPeerData?, cachedDataMessages: [MessageId: Message]?, readStateData: [PeerId: ChatHistoryCombinedInitialReadStateData]?, flashIndicators: Bool, updatedMessageSelection: Bool, messageTransitionNode: ChatMessageTransitionNode?) -> ChatHistoryViewTransition {
+    var mergeResult: (deleteIndices: [Int], indicesAndItems: [(Int, ChatHistoryEntry, Int?)], updateIndices: [(Int, ChatHistoryEntry, Int)])
     let allUpdated = fromView?.associatedData != toView.associatedData
     if reverse {
         mergeResult = mergeListsStableWithUpdatesReversed(leftList: fromView?.filteredEntries ?? [], rightList: toView.filteredEntries, allUpdated: allUpdated)
     } else {
         mergeResult = mergeListsStableWithUpdates(leftList: fromView?.filteredEntries ?? [], rightList: toView.filteredEntries, allUpdated: allUpdated)
     }
+
+    if let messageTransitionNode = messageTransitionNode, messageTransitionNode.hasOngoingTransitions, let previousEntries = fromView?.filteredEntries {
+        for i in 0 ..< mergeResult.updateIndices.count {
+            switch mergeResult.updateIndices[i].1 {
+            case let .MessageEntry(message, presentationData, flag, monthLocation, messageSelection, entryAttributes):
+                if messageTransitionNode.isAnimatingMessage(stableId: message.stableId) {
+                    var updatedMessage = message
+                    mediaLoop: for media in message.media {
+                        if let webpage = media as? TelegramMediaWebpage, case .Loaded = webpage.content {
+                            var filterMedia = false
+                            switch previousEntries[mergeResult.updateIndices[i].2] {
+                            case let .MessageEntry(previousMessage, _, _, _, _, _):
+                                if previousMessage.media.contains(where: { value in
+                                    if let value = value as? TelegramMediaWebpage, case .Loaded = value.content {
+                                        return true
+                                    } else {
+                                        return false
+                                    }
+                                }) {
+                                    if messageTransitionNode.hasScheduledUpdateMessageAfterAnimationCompleted(stableId: message.stableId) {
+                                        filterMedia = true
+                                    }
+                                } else {
+                                    filterMedia = true
+                                }
+                            default:
+                                break
+                            }
+
+                            if filterMedia {
+                                updatedMessage = message.withUpdatedMedia(message.media.filter {
+                                    $0 !== media
+                                })
+                                messageTransitionNode.scheduleUpdateMessageAfterAnimationCompleted(stableId: message.stableId)
+                            }
+
+                            break mediaLoop
+                        }
+                    }
+                    mergeResult.updateIndices[i].1 = .MessageEntry(updatedMessage, presentationData, flag, monthLocation, messageSelection, entryAttributes)
+                }
+            default:
+                break
+            }
+        }
+    }
     
     var adjustedDeleteIndices: [ListViewDeleteItem] = []
     let previousCount: Int
@@ -91,13 +137,15 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
     var scrolledToIndex: MessageHistoryAnchorIndex?
     var scrolledToSomeIndex = false
     
+    let curve: ListViewAnimationCurve = scrollAnimationCurve ?? .Default(duration: nil)
+    
     if let scrollPosition = scrollPosition {
         switch scrollPosition {
             case let .unread(unreadIndex):
                 var index = toView.filteredEntries.count - 1
                 for entry in toView.filteredEntries {
                     if case .UnreadEntry = entry {
-                        scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Down)
+                        scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: curve, directionHint: .Down)
                         break
                     }
                     index -= 1
@@ -107,7 +155,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                     var index = toView.filteredEntries.count - 1
                     for entry in toView.filteredEntries {
                         if entry.index >= unreadIndex {
-                            scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: .Default(duration: nil),  directionHint: .Down)
+                            scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: curve,  directionHint: .Down)
                             break
                         }
                         index -= 1
@@ -118,7 +166,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                     var index = 0
                     for entry in toView.filteredEntries.reversed() {
                         if entry.index < unreadIndex {
-                            scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Down)
+                            scrollToItem = ListViewScrollToItem(index: index, position: .bottom(0.0), animated: false, curve: curve, directionHint: .Down)
                             break
                         }
                         index += 1
@@ -128,7 +176,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                 var index = toView.filteredEntries.count - 1
                 for entry in toView.filteredEntries {
                     if entry.index >= scrollIndex {
-                        scrollToItem = ListViewScrollToItem(index: index, position: .top(relativeOffset), animated: false, curve: .Default(duration: nil),  directionHint: .Down)
+                        scrollToItem = ListViewScrollToItem(index: index, position: .top(relativeOffset), animated: false, curve: curve,  directionHint: .Down)
                         break
                     }
                     index -= 1
@@ -138,7 +186,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                     var index = 0
                     for entry in toView.filteredEntries.reversed() {
                         if entry.index < scrollIndex {
-                            scrollToItem = ListViewScrollToItem(index: index, position: .top(0.0), animated: false, curve: .Default(duration: nil), directionHint: .Down)
+                            scrollToItem = ListViewScrollToItem(index: index, position: .top(0.0), animated: false, curve: curve, directionHint: .Down)
                             break
                         }
                         index += 1
@@ -151,7 +199,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                 var index = toView.filteredEntries.count - 1
                 for entry in toView.filteredEntries {
                     if scrollIndex.isLessOrEqual(to: entry.index) {
-                        scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: .Default(duration: nil), directionHint: directionHint)
+                        scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: curve, directionHint: directionHint)
                         break
                     }
                     index -= 1
@@ -162,7 +210,7 @@ func preparedChatHistoryViewTransition(from fromView: ChatHistoryView?, to toVie
                     for entry in toView.filteredEntries.reversed() {
                         if !scrollIndex.isLess(than: entry.index) {
                             scrolledToSomeIndex = true
-                            scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: .Default(duration: nil), directionHint: directionHint)
+                            scrollToItem = ListViewScrollToItem(index: index, position: position, animated: animated, curve: curve, directionHint: directionHint)
                             break
                         }
                         index += 1
diff --git a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
index 59fbe8fffb..afb5c86d93 100644
--- a/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
+++ b/submodules/TelegramUI/Sources/ReplyAccessoryPanelNode.swift
@@ -29,7 +29,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
     
     var theme: PresentationTheme
     
-    init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder) {
+    init(context: AccountContext, messageId: MessageId, theme: PresentationTheme, strings: PresentationStrings, nameDisplayOrder: PresentationPersonNameOrder, dateTimeFormat: PresentationDateTimeFormat) {
         self.messageId = messageId
         
         self.theme = theme
@@ -48,10 +48,12 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
         self.titleNode = ImmediateTextNode()
         self.titleNode.maximumNumberOfLines = 1
         self.titleNode.displaysAsynchronously = false
+        self.titleNode.insets = UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0)
         
         self.textNode = ImmediateTextNode()
         self.textNode.maximumNumberOfLines = 1
         self.textNode.displaysAsynchronously = false
+        self.textNode.insets = UIEdgeInsets(top: 3.0, left: 0.0, bottom: 3.0, right: 0.0)
         
         self.imageNode = TransformImageNode()
         self.imageNode.contentAnimations = [.subsequentUpdates]
@@ -73,7 +75,15 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
         self.messageDisposable.set((context.account.postbox.messageView(messageId)
         |> deliverOnMainQueue).start(next: { [weak self] messageView in
             if let strongSelf = self {
+                if messageView.message == nil {
+                    Queue.mainQueue().justDispatch {
+                        strongSelf.interfaceInteraction?.setupReplyMessage(nil, { _ in })
+                    }
+                    return
+                }
+
                 let message = messageView.message
+
                 var authorName = ""
                 var text = ""
                 if let forwardInfo = message?.forwardInfo, forwardInfo.flags.contains(.isImported) {
@@ -86,7 +96,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
                     authorName = author.displayTitle(strings: strings, displayOrder: nameDisplayOrder)
                 }
                 if let message = message {
-                    (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: context.account.peerId)
+                    (text, _) = descriptionStringForMessage(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: context.account.peerId)
                 }
                 
                 var updatedMediaReference: AnyMediaReference?
@@ -152,7 +162,7 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
                 
                 let isMedia: Bool
                 if let message = message {
-                    switch messageContentKind(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: context.account.peerId) {
+                    switch messageContentKind(contentSettings: context.currentContentSettings.with { $0 }, message: message, strings: strings, nameDisplayOrder: nameDisplayOrder, dateTimeFormat: dateTimeFormat, accountPeerId: context.account.peerId) {
                         case .text:
                             isMedia = false
                         default:
@@ -162,8 +172,8 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
                     isMedia = false
                 }
                 
-                strongSelf.titleNode.attributedText = NSAttributedString(string: authorName, font: Font.medium(15.0), textColor: strongSelf.theme.chat.inputPanel.panelControlAccentColor)
-                strongSelf.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(15.0), textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor)
+                strongSelf.titleNode.attributedText = NSAttributedString(string: authorName, font: Font.medium(14.0), textColor: strongSelf.theme.chat.inputPanel.panelControlAccentColor)
+                strongSelf.textNode.attributedText = NSAttributedString(string: text, font: Font.regular(14.0), textColor: isMedia ? strongSelf.theme.chat.inputPanel.secondaryTextColor : strongSelf.theme.chat.inputPanel.primaryTextColor)
                 
                 let headerString: String
                 if let message = message, message.flags.contains(.Incoming), let author = message.author {
@@ -239,20 +249,28 @@ final class ReplyAccessoryPanelNode: AccessoryPanelNode {
         self.closeButton.frame = closeButtonFrame
         
         self.actionArea.frame = CGRect(origin: CGPoint(x: leftInset, y: 2.0), size: CGSize(width: closeButtonFrame.minX - leftInset, height: bounds.height))
-        
-        self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
+
+        if self.lineNode.supernode == self {
+            self.lineNode.frame = CGRect(origin: CGPoint(x: leftInset, y: 8.0), size: CGSize(width: 2.0, height: bounds.size.height - 10.0))
+        }
         
         var imageTextInset: CGFloat = 0.0
         if !self.imageNode.isHidden {
             imageTextInset = 9.0 + 35.0
         }
-        self.imageNode.frame = CGRect(origin: CGPoint(x: leftInset + 9.0, y: 8.0), size: CGSize(width: 35.0, height: 35.0))
+        if self.imageNode.supernode == self {
+            self.imageNode.frame = CGRect(origin: CGPoint(x: leftInset + 9.0, y: 8.0), size: CGSize(width: 35.0, height: 35.0))
+        }
         
         let titleSize = self.titleNode.updateLayout(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset - imageTextInset, height: bounds.size.height))
-        self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset, y: 7.0), size: titleSize)
+        if self.titleNode.supernode == self {
+            self.titleNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset - self.titleNode.insets.left, y: 7.0 - self.titleNode.insets.top), size: titleSize)
+        }
         
         let textSize = self.textNode.updateLayout(CGSize(width: bounds.size.width - leftInset - textLineInset - rightInset - textRightInset - imageTextInset, height: bounds.size.height))
-        self.textNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset, y: 25.0), size: textSize)
+        if self.textNode.supernode == self {
+            self.textNode.frame = CGRect(origin: CGPoint(x: leftInset + textLineInset + imageTextInset - self.textNode.insets.left, y: 25.0 - self.textNode.insets.top), size: textSize)
+        }
     }
     
     @objc func closePressed() {
diff --git a/submodules/TelegramUI/Sources/ServiceSoundManager.swift b/submodules/TelegramUI/Sources/ServiceSoundManager.swift
index 6a856ca430..363c12ec75 100644
--- a/submodules/TelegramUI/Sources/ServiceSoundManager.swift
+++ b/submodules/TelegramUI/Sources/ServiceSoundManager.swift
@@ -20,8 +20,8 @@ public final class ServiceSoundManager {
     
     init() {
         self.queue.async {
-            self.messageDeliverySound = loadSystemSoundFromBundle(name: "MessageSent.caf")
-            self.incomingMessageSound = loadSystemSoundFromBundle(name: "notification.caf")
+            self.messageDeliverySound = loadSystemSoundFromBundle(name: "MessageSent.mp3")
+            self.incomingMessageSound = loadSystemSoundFromBundle(name: "notification.mp3")
         }
     }
     
diff --git a/submodules/TelegramUI/Sources/ShareExtensionContext.swift b/submodules/TelegramUI/Sources/ShareExtensionContext.swift
index 024c9efe42..99bb75a188 100644
--- a/submodules/TelegramUI/Sources/ShareExtensionContext.swift
+++ b/submodules/TelegramUI/Sources/ShareExtensionContext.swift
@@ -23,6 +23,7 @@ import PresentationDataUtils
 import ChatImportUI
 import ZipArchive
 import ActivityIndicator
+import DebugSettingsUI
 
 private let inForeground = ValuePromise<Bool>(false, ignoreRepeated: true)
 
@@ -54,6 +55,7 @@ private enum ShareAuthorizationError {
 }
 
 public struct ShareRootControllerInitializationData {
+    public let appBundleId: String
     public let appGroupPath: String
     public let apiId: Int32
     public let apiHash: String
@@ -62,7 +64,8 @@ public struct ShareRootControllerInitializationData {
     public let appVersion: String
     public let bundleData: Data?
     
-    public init(appGroupPath: String, apiId: Int32, apiHash: String, languagesCategory: String, encryptionParameters: (Data, Data), appVersion: String, bundleData: Data?) {
+    public init(appBundleId: String, appGroupPath: String, apiId: Int32, apiHash: String, languagesCategory: String, encryptionParameters: (Data, Data), appVersion: String, bundleData: Data?) {
+        self.appBundleId = appBundleId
         self.appGroupPath = appGroupPath
         self.apiId = apiId
         self.apiHash = apiHash
@@ -168,14 +171,14 @@ public class ShareRootControllerImpl {
             let rootPath = rootPathForBasePath(self.initializationData.appGroupPath)
             performAppGroupUpgrades(appGroupPath: self.initializationData.appGroupPath, rootPath: rootPath)
             
-            TempBox.initializeShared(basePath: rootPath, processType: "share", launchSpecificId: arc4random64())
+            TempBox.initializeShared(basePath: rootPath, processType: "share", launchSpecificId: Int64.random(in: Int64.min ... Int64.max))
             
             let logsPath = rootPath + "/share-logs"
             let _ = try? FileManager.default.createDirectory(atPath: logsPath, withIntermediateDirectories: true, attributes: nil)
             
             setupSharedLogger(rootPath: rootPath, path: logsPath)
             
-            let applicationBindings = TelegramApplicationBindings(isMainApp: false, containerPath: self.initializationData.appGroupPath, appSpecificScheme: "tg", openUrl: { _ in
+            let applicationBindings = TelegramApplicationBindings(isMainApp: false, appBundleId: self.initializationData.appBundleId, containerPath: self.initializationData.appGroupPath, appSpecificScheme: "tg", openUrl: { _ in
             }, openUniversalUrl: { _, completion in
                 completion.completion(false)
                 return
@@ -198,6 +201,7 @@ public class ShareRootControllerImpl {
                 return nil
             }, requestSetAlternateIconName: { _, f in
                 f(false)
+            }, forceOrientation: { _ in
             })
             
             let internalContext: InternalContext
@@ -228,7 +232,7 @@ public class ShareRootControllerImpl {
                     return nil
                 })
                 
-                let sharedContext = SharedAccountContextImpl(mainWindow: nil, basePath: rootPath, encryptionParameters: ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: self.initializationData.encryptionParameters.0)!, salt: ValueBoxEncryptionParameters.Salt(data: self.initializationData.encryptionParameters.1)!), accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: NetworkInitializationArguments(apiId: self.initializationData.apiId, apiHash: self.initializationData.apiHash, languagesCategory: self.initializationData.languagesCategory, appVersion: self.initializationData.appVersion, voipMaxLayer: 0, voipVersions: [], appData: .single(self.initializationData.bundleData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider()), rootPath: rootPath, legacyBasePath: nil, legacyCache: nil, apsNotificationToken: .never(), voipNotificationToken: .never(), setNotificationCall: { _ in }, navigateToChat: { _, _, _ in })
+                let sharedContext = SharedAccountContextImpl(mainWindow: nil, sharedContainerPath: self.initializationData.appGroupPath, basePath: rootPath, encryptionParameters: ValueBoxEncryptionParameters(forceEncryptionIfNoSet: false, key: ValueBoxEncryptionParameters.Key(data: self.initializationData.encryptionParameters.0)!, salt: ValueBoxEncryptionParameters.Salt(data: self.initializationData.encryptionParameters.1)!), accountManager: accountManager, appLockContext: appLockContext, applicationBindings: applicationBindings, initialPresentationDataAndSettings: initialPresentationDataAndSettings!, networkArguments: NetworkInitializationArguments(apiId: self.initializationData.apiId, apiHash: self.initializationData.apiHash, languagesCategory: self.initializationData.languagesCategory, appVersion: self.initializationData.appVersion, voipMaxLayer: 0, voipVersions: [], appData: .single(self.initializationData.bundleData), autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider()), rootPath: rootPath, legacyBasePath: nil, apsNotificationToken: .never(), voipNotificationToken: .never(), setNotificationCall: { _ in }, navigateToChat: { _, _, _ in })
                 presentationDataPromise.set(sharedContext.presentationData)
                 internalContext = InternalContext(sharedContext: sharedContext)
                 globalInternalContext = internalContext
@@ -392,6 +396,16 @@ public class ShareRootControllerImpl {
                         shareController.dismissed = { _ in
                             self?.getExtensionContext()?.completeRequest(returningItems: nil, completionHandler: nil)
                         }
+                        shareController.debugAction = {
+                            guard let strongSelf = self else {
+                                return
+                            }
+                            let presentationData = internalContext.sharedContext.currentPresentationData.with { $0 }
+                            let navigationController = NavigationController(mode: .single, theme: NavigationControllerTheme(presentationTheme: presentationData.theme))
+                            strongSelf.navigationController = navigationController
+                            navigationController.viewControllers = [debugController(sharedContext: context.sharedContext, context: context)]
+                            strongSelf.mainWindow?.present(navigationController, on: .root)
+                        }
                         
                         cancelImpl = { [weak shareController] in
                             shareController?.dismiss(completion: { [weak self] in
@@ -429,7 +443,7 @@ public class ShareRootControllerImpl {
                                         let fileExtension = (fileName as NSString).pathExtension
                                         
                                         var archivePathValue: String?
-                                        var otherEntries: [(SSZipEntry, String, ChatHistoryImport.MediaType)] = []
+                                        var otherEntries: [(SSZipEntry, String, TelegramEngine.HistoryImport.MediaType)] = []
                                         var mainFile: TempBoxFile?
                                         
                                         let appConfiguration = context.currentAppConfiguration.with({ $0 })
@@ -514,7 +528,7 @@ public class ShareRootControllerImpl {
                                                     } else {
                                                         let entryFileName = (entryPath as NSString).lastPathComponent
                                                         if !entryFileName.isEmpty {
-                                                            let mediaType: ChatHistoryImport.MediaType
+                                                            let mediaType: TelegramEngine.HistoryImport.MediaType
                                                             let fullRange = NSRange(entryFileName.startIndex ..< entryFileName.endIndex, in: entryFileName)
                                                             if photoRegex.firstMatch(in: entryFileName, options: [], range: fullRange) != nil {
                                                                 mediaType = .photo
@@ -616,7 +630,8 @@ public class ShareRootControllerImpl {
                                                     super.containerLayoutUpdated(layout, transition: transition)
                                                     
                                                     let indicatorSize = self.activityIndicator.measure(CGSize(width: 100.0, height: 100.0))
-                                                    transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - indicatorSize.width) / 2.0), y: self.navigationHeight + floor((layout.size.height - self.navigationHeight - indicatorSize.height) / 2.0)), size: indicatorSize))
+                                                    let navigationHeight = self.navigationLayout(layout: layout).navigationFrame.maxY
+                                                    transition.updateFrame(node: self.activityIndicator, frame: CGRect(origin: CGPoint(x: floor((layout.size.width - indicatorSize.width) / 2.0), y: navigationHeight + floor((layout.size.height - navigationHeight - indicatorSize.height) / 2.0)), size: indicatorSize))
                                                 }
                                             }
                                             
@@ -626,7 +641,7 @@ public class ShareRootControllerImpl {
                                             navigationController.viewControllers = [TempController(context: context)]
                                             strongSelf.mainWindow?.present(navigationController, on: .root)
                                             
-                                            let _ = (ChatHistoryImport.getInfo(account: context.account, header: mainFileHeader)
+                                            let _ = (context.engine.historyImport.getInfo(header: mainFileHeader)
                                             |> deliverOnMainQueue).start(next: { parseInfo in
                                                 switch parseInfo {
                                                 case let .group(groupTitle):
@@ -680,7 +695,7 @@ public class ShareRootControllerImpl {
                                                             strongSelf.mainWindow?.present(controller, on: .root)
                                                         } else {
                                                             controller.inProgress = true
-                                                            let _ = (ChatHistoryImport.checkPeerImport(account: context.account, peerId: peer.id)
+                                                            let _ = (context.engine.historyImport.checkPeerImport(peerId: peer.id)
                                                             |> deliverOnMainQueue).start(next: { result in
                                                                 controller.inProgress = false
                                                                 
@@ -763,7 +778,7 @@ public class ShareRootControllerImpl {
                                                             resolvedGroupTitle = "Group"
                                                         }
                                                         let controller = standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: presentationData.strings.ChatImport_CreateGroupAlertTitle, text: presentationData.strings.ChatImport_CreateGroupAlertText(resolvedGroupTitle).0, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.ChatImport_CreateGroupAlertImportAction, action: {
-                                                            var signal: Signal<PeerId?, NoError> = createSupergroup(account: context.account, title: resolvedGroupTitle, description: nil, isForHistoryImport: true)
+                                                            var signal: Signal<PeerId?, NoError> = context.engine.peers.createSupergroup(title: resolvedGroupTitle, description: nil, isForHistoryImport: true)
                                                             |> map(Optional.init)
                                                             |> `catch` { _ -> Signal<PeerId?, NoError> in
                                                                 return .single(nil)
@@ -831,7 +846,7 @@ public class ShareRootControllerImpl {
                                                     
                                                     attemptSelectionImpl = { [weak controller] peer in
                                                         controller?.inProgress = true
-                                                        let _ = (ChatHistoryImport.checkPeerImport(account: context.account, peerId: peer.id)
+                                                        let _ = (context.engine.historyImport.checkPeerImport(peerId: peer.id)
                                                         |> deliverOnMainQueue).start(next: { result in
                                                             controller?.inProgress = false
                                                             
@@ -906,7 +921,7 @@ public class ShareRootControllerImpl {
                                                     
                                                     attemptSelectionImpl = { [weak controller] peer in
                                                         controller?.inProgress = true
-                                                        let _ = (ChatHistoryImport.checkPeerImport(account: context.account, peerId: peer.id)
+                                                        let _ = (context.engine.historyImport.checkPeerImport(peerId: peer.id)
                                                         |> deliverOnMainQueue).start(next: { result in
                                                             controller?.inProgress = false
                                                             
@@ -1007,7 +1022,7 @@ public class ShareRootControllerImpl {
                                                             resolvedGroupTitle = "Group"
                                                         }
                                                         let controller = standardTextAlertController(theme: AlertControllerTheme(presentationData: presentationData), title: presentationData.strings.ChatImport_CreateGroupAlertTitle, text: presentationData.strings.ChatImport_CreateGroupAlertText(resolvedGroupTitle).0, actions: [TextAlertAction(type: .defaultAction, title: presentationData.strings.ChatImport_CreateGroupAlertImportAction, action: {
-                                                            var signal: Signal<PeerId?, NoError> = createSupergroup(account: context.account, title: resolvedGroupTitle, description: nil, isForHistoryImport: true)
+                                                            var signal: Signal<PeerId?, NoError> = context.engine.peers.createSupergroup(title: resolvedGroupTitle, description: nil, isForHistoryImport: true)
                                                             |> map(Optional.init)
                                                             |> `catch` { _ -> Signal<PeerId?, NoError> in
                                                                 return .single(nil)
diff --git a/submodules/TelegramUI/Sources/SharedAccountContext.swift b/submodules/TelegramUI/Sources/SharedAccountContext.swift
index e740766246..7e98762c38 100644
--- a/submodules/TelegramUI/Sources/SharedAccountContext.swift
+++ b/submodules/TelegramUI/Sources/SharedAccountContext.swift
@@ -24,6 +24,7 @@ import AlertUI
 import PresentationDataUtils
 import LocationUI
 import AppLock
+import WallpaperBackgroundNode
 
 private final class AccountUserInterfaceInUseContext {
     let subscribers = Bag<(Bool) -> Void>()
@@ -55,6 +56,7 @@ private var testHasInstance = false
 public final class SharedAccountContextImpl: SharedAccountContext {
     public let mainWindow: Window1?
     public let applicationBindings: TelegramApplicationBindings
+    public let sharedContainerPath: String
     public let basePath: String
     public let accountManager: AccountManager
     public let appLockContext: AppLockContext
@@ -160,7 +162,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
     private var spotlightDataContext: SpotlightDataContext?
     private var widgetDataContext: WidgetDataContext?
     
-    public init(mainWindow: Window1?, basePath: String, encryptionParameters: ValueBoxEncryptionParameters, accountManager: AccountManager, appLockContext: AppLockContext, applicationBindings: TelegramApplicationBindings, initialPresentationDataAndSettings: InitialPresentationDataAndSettings, networkArguments: NetworkInitializationArguments, rootPath: String, legacyBasePath: String?, legacyCache: LegacyCache?, apsNotificationToken: Signal<Data?, NoError>, voipNotificationToken: Signal<Data?, NoError>, setNotificationCall: @escaping (PresentationCall?) -> Void, navigateToChat: @escaping (AccountRecordId, PeerId, MessageId?) -> Void, displayUpgradeProgress: @escaping (Float?) -> Void = { _ in }) {
+    public init(mainWindow: Window1?, sharedContainerPath: String, basePath: String, encryptionParameters: ValueBoxEncryptionParameters, accountManager: AccountManager, appLockContext: AppLockContext, applicationBindings: TelegramApplicationBindings, initialPresentationDataAndSettings: InitialPresentationDataAndSettings, networkArguments: NetworkInitializationArguments, rootPath: String, legacyBasePath: String?, apsNotificationToken: Signal<Data?, NoError>, voipNotificationToken: Signal<Data?, NoError>, setNotificationCall: @escaping (PresentationCall?) -> Void, navigateToChat: @escaping (AccountRecordId, PeerId, MessageId?) -> Void, displayUpgradeProgress: @escaping (Float?) -> Void = { _ in }) {
         assert(Queue.mainQueue().isCurrent())
         
         precondition(!testHasInstance)
@@ -168,6 +170,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
         
         self.mainWindow = mainWindow
         self.applicationBindings = applicationBindings
+        self.sharedContainerPath = sharedContainerPath
         self.basePath = basePath
         self.accountManager = accountManager
         self.navigateToChatImpl = navigateToChat
@@ -864,7 +867,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                         guard let token = token else {
                             return .complete()
                         }
-                        return unregisterNotificationToken(account: account, token: token, type: .aps(encrypt: false), otherAccountUserIds: (account.testingEnvironment ? allTestingUserIds : allProductionUserIds).filter({ $0 != account.peerId.id }))
+                        return TelegramEngine(account: account).accountData.unregisterNotificationToken(token: token, type: .aps(encrypt: false), otherAccountUserIds: (account.testingEnvironment ? allTestingUserIds : allProductionUserIds).filter({ $0 != account.peerId.id }))
                     }
                     appliedVoip = self.voipNotificationToken
                     |> distinctUntilChanged(isEqual: { $0 == $1 })
@@ -872,7 +875,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                         guard let token = token else {
                             return .complete()
                         }
-                        return unregisterNotificationToken(account: account, token: token, type: .voip, otherAccountUserIds: (account.testingEnvironment ? allTestingUserIds : allProductionUserIds).filter({ $0 != account.peerId.id }))
+                        return TelegramEngine(account: account).accountData.unregisterNotificationToken(token: token, type: .voip, otherAccountUserIds: (account.testingEnvironment ? allTestingUserIds : allProductionUserIds).filter({ $0 != account.peerId.id }))
                     }
                 } else {
                     appliedAps = self.apsNotificationToken
@@ -887,7 +890,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                         } else {
                             encrypt = false
                         }
-                        return registerNotificationToken(account: account, token: token, type: .aps(encrypt: encrypt), sandbox: sandbox, otherAccountUserIds: (account.testingEnvironment ? activeTestingUserIds : activeProductionUserIds).filter({ $0 != account.peerId.id }), excludeMutedChats: !settings.includeMuted)
+                        return TelegramEngine(account: account).accountData.registerNotificationToken(token: token, type: .aps(encrypt: encrypt), sandbox: sandbox, otherAccountUserIds: (account.testingEnvironment ? activeTestingUserIds : activeProductionUserIds).filter({ $0 != account.peerId.id }), excludeMutedChats: !settings.includeMuted)
                     }
                     appliedVoip = self.voipNotificationToken
                     |> distinctUntilChanged(isEqual: { $0 == $1 })
@@ -895,7 +898,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                         guard let token = token else {
                             return .complete()
                         }
-                        return registerNotificationToken(account: account, token: token, type: .voip, sandbox: sandbox, otherAccountUserIds: (account.testingEnvironment ? activeTestingUserIds : activeProductionUserIds).filter({ $0 != account.peerId.id }), excludeMutedChats: !settings.includeMuted)
+                        return TelegramEngine(account: account).accountData.registerNotificationToken(token: token, type: .voip, sandbox: sandbox, otherAccountUserIds: (account.testingEnvironment ? activeTestingUserIds : activeProductionUserIds).filter({ $0 != account.peerId.id }), excludeMutedChats: !settings.includeMuted)
                     }
                 }
                 
@@ -1121,7 +1124,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
         
         if !found {
             let controllerParams = LocationViewParams(sendLiveLocation: { location in
-                let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil)
+                let outMessage: EnqueueMessage = .message(text: "", attributes: [], mediaReference: .standalone(media: location), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil)
 //                params.enqueueMessage(outMessage)
             }, stopLiveLocation: { messageId in
                 if let messageId = messageId {
@@ -1144,8 +1147,8 @@ public final class SharedAccountContextImpl: SharedAccountContext {
         }
     }
     
-    public func resolveUrl(account: Account, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError> {
-        return resolveUrlImpl(account: account, url: url, skipUrlAuth: skipUrlAuth)
+    public func resolveUrl(context: AccountContext, peerId: PeerId?, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError> {
+        return resolveUrlImpl(context: context, peerId: peerId, url: url, skipUrlAuth: skipUrlAuth)
     }
     
     public func openResolvedUrl(_ resolvedUrl: ResolvedUrl, context: AccountContext, urlContext: OpenURLContext, navigationController: NavigationController?, openPeer: @escaping (PeerId, ChatControllerInteractionNavigateToPeer) -> Void, sendFile: ((FileMediaReference) -> Void)?, sendSticker: ((FileMediaReference, ASDisplayNode, CGRect) -> Bool)?, requestMessageActionUrlAuth: ((MessageActionUrlSubject) -> Void)?, joinVoiceChat: ((PeerId, String?, CachedChannelData.ActiveCall) -> Void)?, present: @escaping (ViewController, Any?) -> Void, dismissInput: @escaping () -> Void, contentContext: Any?) {
@@ -1216,67 +1219,65 @@ public final class SharedAccountContextImpl: SharedAccountContext {
         return PeerSelectionControllerImpl(params)
     }
     
-    public func makeChatMessagePreviewItem(context: AccountContext, messages: [Message], theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)? = nil, clickThroughMessage: (() -> Void)? = nil) -> ListViewItem {
+    public func makeChatMessagePreviewItem(context: AccountContext, messages: [Message], theme: PresentationTheme, strings: PresentationStrings, wallpaper: TelegramWallpaper, fontSize: PresentationFontSize, chatBubbleCorners: PresentationChatBubbleCorners, dateTimeFormat: PresentationDateTimeFormat, nameOrder: PresentationPersonNameOrder, forcedResourceStatus: FileMediaResourceStatus?, tapMessage: ((Message) -> Void)? = nil, clickThroughMessage: (() -> Void)? = nil, backgroundNode: ASDisplayNode?) -> ListViewItem {
         let controllerInteraction: ChatControllerInteraction
-        if tapMessage != nil || clickThroughMessage != nil {
-            controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in
-                return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in
-                }, tapMessage: { message in
-                    tapMessage?(message)
-            }, clickThroughMessage: {
-                clickThroughMessage?()
-            }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _ in return false }, sendGif: { _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _ in
-                return false
-            }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
-            }, presentController: { _, _ in }, navigationController: {
-                return nil
-            }, chatControllerNode: {
-                return nil
-            }, reactionContainerNode: {
-                return nil
-            }, presentGlobalOverlayController: { _, _ in }, callPeer: { _, _ in }, longTap: { _, _ in }, openCheckoutOrReceipt: { _ in }, openSearch: { }, setupReply: { _ in
-            }, canSetupReply: { _ in
-                return .none
-            }, navigateToFirstDateMessage: { _ in
-            }, requestRedeliveryOfFailedMessages: { _ in
-            }, addContact: { _ in
-            }, rateCall: { _, _, _ in
-            }, requestSelectMessagePollOptions: { _, _ in
-            }, requestOpenMessagePollResults: { _, _ in
-            }, openAppStorePage: {
-            }, displayMessageTooltip: { _, _, _, _ in
-            }, seekToTimecode: { _, _, _ in
-            }, scheduleCurrentMessage: {
-            }, sendScheduledMessagesNow: { _ in
-            }, editScheduledMessagesTime: { _ in
-            }, performTextSelectionAction: { _, _, _ in
-            }, updateMessageLike: { _, _ in
-            }, openMessageReactions: { _ in
-            }, displayImportedMessageTooltip: { _ in
-            }, displaySwipeToReplyHint: {
-            }, dismissReplyMarkupMessage: { _ in
-            }, openMessagePollResults: { _, _ in
-            }, openPollCreation: { _ in
-            }, displayPollSolution: { _, _ in
-            }, displayPsa: { _, _ in
-            }, displayDiceTooltip: { _ in
-            }, animateDiceSuccess: { _ in
-            }, greetingStickerNode: {
-                return nil
-            }, openPeerContextMenu: { _, _, _, _, _ in
-            }, openMessageReplies: { _, _, _ in
-            }, openReplyThreadOriginalMessage: { _ in
-            }, openMessageStats: { _ in
-            }, editMessageMedia: { _, _ in
-            }, copyText: { _ in
-            }, displayUndo: { _ in
-            }, requestMessageUpdate: { _ in
-            }, cancelInteractiveKeyboardGestures: {
-            }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings,
-               pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false))
-        } else {
-            controllerInteraction = defaultChatControllerInteraction
-        }
+
+        controllerInteraction = ChatControllerInteraction(openMessage: { _, _ in
+            return false }, openPeer: { _, _, _ in }, openPeerMention: { _ in }, openMessageContextMenu: { _, _, _, _, _ in }, activateMessagePinch: { _ in
+            }, openMessageContextActions: { _, _, _, _ in }, navigateToMessage: { _, _ in }, navigateToMessageStandalone: { _ in
+            }, tapMessage: { message in
+                tapMessage?(message)
+        }, clickThroughMessage: {
+            clickThroughMessage?()
+        }, toggleMessagesSelection: { _, _ in }, sendCurrentMessage: { _ in }, sendMessage: { _ in }, sendSticker: { _, _, _, _, _, _, _ in return false }, sendGif: { _, _, _, _, _ in return false }, sendBotContextResultAsGif: { _, _, _, _, _ in
+            return false
+        }, requestMessageActionCallback: { _, _, _, _ in }, requestMessageActionUrlAuth: { _, _ in }, activateSwitchInline: { _, _ in }, openUrl: { _, _, _, _ in }, shareCurrentLocation: {}, shareAccountContact: {}, sendBotCommand: { _, _ in }, openInstantPage: { _, _ in  }, openWallpaper: { _ in  }, openTheme: { _ in  }, openHashtag: { _, _ in }, updateInputState: { _ in }, updateInputMode: { _ in }, openMessageShareMenu: { _ in
+        }, presentController: { _, _ in }, navigationController: {
+            return nil
+        }, chatControllerNode: {
+            return nil
+        }, reactionContainerNode: {
+            return nil
+        }, presentGlobalOverlayController: { _, _ in }, callPeer: { _, _ in }, longTap: { _, _ in }, openCheckoutOrReceipt: { _ in }, openSearch: { }, setupReply: { _ in
+        }, canSetupReply: { _ in
+            return .none
+        }, navigateToFirstDateMessage: { _ in
+        }, requestRedeliveryOfFailedMessages: { _ in
+        }, addContact: { _ in
+        }, rateCall: { _, _, _ in
+        }, requestSelectMessagePollOptions: { _, _ in
+        }, requestOpenMessagePollResults: { _, _ in
+        }, openAppStorePage: {
+        }, displayMessageTooltip: { _, _, _, _ in
+        }, seekToTimecode: { _, _, _ in
+        }, scheduleCurrentMessage: {
+        }, sendScheduledMessagesNow: { _ in
+        }, editScheduledMessagesTime: { _ in
+        }, performTextSelectionAction: { _, _, _ in
+        }, updateMessageLike: { _, _ in
+        }, openMessageReactions: { _ in
+        }, displayImportedMessageTooltip: { _ in
+        }, displaySwipeToReplyHint: {
+        }, dismissReplyMarkupMessage: { _ in
+        }, openMessagePollResults: { _, _ in
+        }, openPollCreation: { _ in
+        }, displayPollSolution: { _, _ in
+        }, displayPsa: { _, _ in
+        }, displayDiceTooltip: { _ in
+        }, animateDiceSuccess: { _ in
+        }, openPeerContextMenu: { _, _, _, _, _ in
+        }, openMessageReplies: { _, _, _ in
+        }, openReplyThreadOriginalMessage: { _ in
+        }, openMessageStats: { _ in
+        }, editMessageMedia: { _, _ in
+        }, copyText: { _ in
+        }, displayUndo: { _ in
+        }, isAnimatingMessage: { _ in
+            return false
+        }, requestMessageUpdate: { _ in
+        }, cancelInteractiveKeyboardGestures: {
+        }, automaticMediaDownloadSettings: MediaAutoDownloadSettings.defaultSettings,
+           pollActionState: ChatInterfacePollActionState(), stickerSettings: ChatInterfaceStickerSettings(loopAnimatedStickers: false), presentationContext: ChatPresentationContext(backgroundNode: backgroundNode as? WallpaperBackgroundNode))
         
         let content: ChatMessageItemContent
         let chatLocation: ChatLocation
@@ -1342,7 +1343,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
                                     present(WalletSplashScreen(context: WalletContextImpl(context: context, tonContext: tonContext), mode: .created(walletInfo, nil), walletCreatedPreloadState: nil))
                                 }
                             case let .send(address, amount, comment):
-                                present(walletSendScreen(context: WalletContextImpl(context: context, tonContext: tonContext), randomId: arc4random64(), walletInfo: walletInfo, address: address, amount: amount, comment: comment))
+                                present(walletSendScreen(context: WalletContextImpl(context: context, tonContext: tonContext), randomId: Int64.random(in: Int64.min ... Int64.max), walletInfo: walletInfo, address: address, amount: amount, comment: comment))
                             }
                             
                         })
@@ -1390,7 +1391,7 @@ public final class SharedAccountContextImpl: SharedAccountContext {
     }
     
     public func makeRecentSessionsController(context: AccountContext, activeSessionsContext: ActiveSessionsContext) -> ViewController & RecentSessionsController {
-        return recentSessionsController(context: context, activeSessionsContext: activeSessionsContext, webSessionsContext: WebSessionsContext(account: context.account), websitesOnly: false)
+        return recentSessionsController(context: context, activeSessionsContext: activeSessionsContext, webSessionsContext: context.engine.privacy.webSessions(), websitesOnly: false)
     }
     
     public func makePrivacyAndSecurityController(context: AccountContext) -> ViewController {
diff --git a/submodules/TelegramUI/Sources/SharedNotificationManager.swift b/submodules/TelegramUI/Sources/SharedNotificationManager.swift
index 2c6796bd7b..603a877a6f 100644
--- a/submodules/TelegramUI/Sources/SharedNotificationManager.swift
+++ b/submodules/TelegramUI/Sources/SharedNotificationManager.swift
@@ -250,13 +250,13 @@ public final class SharedNotificationManager {
                     var peerId: PeerId?
                     if let fromId = payload["from_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     } else if let fromId = payload["chat_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     } else if let fromId = payload["channel_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     }
                     if let peerId = peerId {
                         if let messageIds = payload["messages"] as? String {
@@ -314,13 +314,13 @@ public final class SharedNotificationManager {
                     
                     if let fromId = payload["from_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     } else if let fromId = payload["chat_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     } else if let fromId = payload["channel_id"] {
                         let fromIdValue = fromId as! NSString
-                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(fromIdValue.intValue))
+                        peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                     }
                     
                     if let msgId = payload["msg_id"] {
@@ -332,7 +332,7 @@ public final class SharedNotificationManager {
                         let randomIdValue = randomId as! NSString
                         var peerId: PeerId?
                         if let encryptionIdString = payload["encryption_id"] as? String, let encryptionId = Int32(encryptionIdString) {
-                            peerId = PeerId(namespace: Namespaces.Peer.SecretChat, id: encryptionId)
+                            peerId = PeerId(namespace: Namespaces.Peer.SecretChat, id: PeerId.Id._internalFromInt32Value(encryptionId))
                         }
                         notificationRequestId = .globallyUniqueId(randomIdValue.longLongValue, peerId)
                     } else {
@@ -344,13 +344,13 @@ public final class SharedNotificationManager {
                 
                 if let fromId = payload["from_id"] {
                     let fromIdValue = fromId as! NSString
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(fromIdValue.intValue))
+                    peerId = PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                 } else if let fromId = payload["chat_id"] {
                     let fromIdValue = fromId as! NSString
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(fromIdValue.intValue))
+                    peerId = PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                 } else if let fromId = payload["channel_id"] {
                     let fromIdValue = fromId as! NSString
-                    peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(fromIdValue.intValue))
+                    peerId = PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(fromIdValue.intValue)))
                 }
                 
                 if let peerId = peerId {
@@ -397,7 +397,7 @@ public final class SharedNotificationManager {
             
             if !messagesDeleted.isEmpty {
                 let _ = account.postbox.transaction(ignoreDisabled: true, { transaction -> Void in
-                    deleteMessages(transaction: transaction, mediaBox: account.postbox.mediaBox, ids: messagesDeleted)
+                    TelegramEngine(account: account).messages.deleteMessages(transaction: transaction, ids: messagesDeleted)
                 }).start()
             }
             
diff --git a/submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift b/submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift
index 6f585cf323..d02c198e72 100644
--- a/submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift
+++ b/submodules/TelegramUI/Sources/StickerPaneSearchContentNode.swift
@@ -227,7 +227,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
                 let packReference: StickerPackReference = .id(id: info.id.id, accessHash: info.accessHash)
                 let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: strongSelf.controllerInteraction.navigationController(), sendSticker: { [weak self] fileReference, sourceNode, sourceRect in
                     if let strongSelf = self {
-                        return strongSelf.controllerInteraction.sendSticker(fileReference, nil, false, sourceNode, sourceRect)
+                        return strongSelf.controllerInteraction.sendSticker(fileReference, false, false, nil, false, sourceNode, sourceRect)
                     } else {
                         return false
                     }
@@ -238,24 +238,23 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
             guard let strongSelf = self else {
                 return
             }
-            let account = strongSelf.context.account
+            let context = strongSelf.context
             if install {
-                var installSignal = loadedStickerPack(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
+                var installSignal = strongSelf.context.engine.stickers.loadedStickerPack(reference: .id(id: info.id.id, accessHash: info.accessHash), forceActualized: false)
                 |> mapToSignal { result -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
                     switch result {
                     case let .result(info, items, installed):
                         if installed {
                             return .complete()
                         } else {
-                            return preloadedStickerPackThumbnail(account: account, info: info, items: items)
+                            return preloadedStickerPackThumbnail(account: context.account, info: info, items: items)
                             |> filter { $0 }
                             |> ignoreValues
                             |> then(
-                                addStickerPackInteractively(postbox: strongSelf.context.account.postbox, info: info, items: items)
+                                context.engine.stickers.addStickerPackInteractively(info: info, items: items)
                                 |> ignoreValues
                             )
                             |> mapToSignal { _ -> Signal<(StickerPackCollectionInfo, [ItemCollectionItem]), NoError> in
-                                return .complete()
                             }
                             |> then(.single((info, items)))
                         }
@@ -312,18 +311,18 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
                     }
                     
                     let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
-                    strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, account: strongSelf.context.account), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
+                    strongSelf.controllerInteraction.navigationController()?.presentOverlay(controller: UndoOverlayController(presentationData: presentationData, content: .stickersModified(title: presentationData.strings.StickerPackActionInfo_AddedTitle, text: presentationData.strings.StickerPackActionInfo_AddedText(info.title).0, undo: false, info: info, topItem: items.first, context: strongSelf.context), elevatedLayout: false, animateInAsReplacement: animateInAsReplacement, action: { _ in
                         return true
                     }))
                 }))
             } else {
-                let _ = (removeStickerPackInteractively(postbox: account.postbox, id: info.id, option: .delete)
+                let _ = (context.engine.stickers.removeStickerPackInteractively(id: info.id, option: .delete)
                 |> deliverOnMainQueue).start(next: { _ in
                 })
             }
         }, sendSticker: { [weak self] file, sourceNode, sourceRect in
             if let strongSelf = self {
-                let _ = strongSelf.controllerInteraction.sendSticker(file, nil, false, sourceNode, sourceRect)
+                let _ = strongSelf.controllerInteraction.sendSticker(file, false, false, nil, false, sourceNode, sourceRect)
             }
         }, getItemIsPreviewed: { item in
             return inputNodeInteraction.previewedStickerPackItem == .pack(item)
@@ -343,22 +342,22 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
     func updateText(_ text: String, languageCode: String?) {
         let signal: Signal<([(String?, FoundStickerItem)], FoundStickerSets, Bool, FoundStickerSets?)?, NoError>
         if !text.isEmpty {
-            let account = self.context.account
+            let context = self.context
             let stickers: Signal<[(String?, FoundStickerItem)], NoError> = Signal { subscriber in
                 var signals: Signal<[Signal<(String?, [FoundStickerItem]), NoError>], NoError> = .single([])
                 
                 let query = text.trimmingCharacters(in: .whitespacesAndNewlines)
                 if query.isSingleEmoji {
-                    signals = .single([searchStickers(account: account, query: text.basicEmoji.0)
+                    signals = .single([context.engine.stickers.searchStickers(query: text.basicEmoji.0)
                     |> map { (nil, $0) }])
                 } else if query.count > 1, let languageCode = languageCode, !languageCode.isEmpty && languageCode != "emoji" {
-                    var signal = searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3)
+                    var signal = context.engine.stickers.searchEmojiKeywords(inputLanguageCode: languageCode, query: query.lowercased(), completeMatch: query.count < 3)
                     if !languageCode.lowercased().hasPrefix("en") {
                         signal = signal
                         |> mapToSignal { keywords in
                             return .single(keywords)
                             |> then(
-                                searchEmojiKeywords(postbox: account.postbox, inputLanguageCode: "en-US", query: query.lowercased(), completeMatch: query.count < 3)
+                                context.engine.stickers.searchEmojiKeywords(inputLanguageCode: "en-US", query: query.lowercased(), completeMatch: query.count < 3)
                                 |> map { englishKeywords in
                                     return keywords + englishKeywords
                                 }
@@ -371,7 +370,7 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
                         var signals: [Signal<(String?, [FoundStickerItem]), NoError>] = []
                         let emoticons = keywords.flatMap { $0.emoticons }
                         for emoji in emoticons {
-                            signals.append(searchStickers(account: self.context.account, query: emoji.basicEmoji.0)
+                            signals.append(context.engine.stickers.searchStickers(query: emoji.basicEmoji.0)
                             |> take(1)
                             |> map { (emoji, $0) })
                         }
@@ -395,8 +394,8 @@ final class StickerPaneSearchContentNode: ASDisplayNode, PaneSearchContentNode {
                 })
             }
             
-            let local = searchStickerSets(postbox: context.account.postbox, query: text)
-            let remote = searchStickerSetsRemotely(network: context.account.network, query: text)
+            let local = context.engine.stickers.searchStickerSets(query: text)
+            let remote = context.engine.stickers.searchStickerSetsRemotely(query: text)
             |> delay(0.2, queue: Queue.mainQueue())
             let rawPacks = local
             |> mapToSignal { result -> Signal<(FoundStickerSets, Bool, FoundStickerSets?), NoError> in
diff --git a/submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift b/submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift
index 3d729acda4..31c9514759 100644
--- a/submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift
+++ b/submodules/TelegramUI/Sources/StickerPaneSearchStickerItem.swift
@@ -107,8 +107,8 @@ private let textFont = Font.regular(20.0)
 
 final class StickerPaneSearchStickerItemNode: GridItemNode {
     private var currentState: (Account, FoundStickerItem, CGSize)?
-    private let imageNode: TransformImageNode
-    private var animationNode: AnimatedStickerNode?
+    let imageNode: TransformImageNode
+    private(set) var animationNode: AnimatedStickerNode?
     private let textNode: ASTextNode
     
     private let stickerFetchedDisposable = MetaDisposable()
diff --git a/submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift b/submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift
index 2431113e7e..b6d6abcde9 100644
--- a/submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift
+++ b/submodules/TelegramUI/Sources/StickersChatInputContextPanelItem.swift
@@ -126,7 +126,7 @@ final class StickersChatInputContextPanelItemNode: ListViewItemNode {
         for i in 0 ..< self.nodes.count {
             if self.nodes[i].frame.contains(location) {
                 let file = item.files[i]
-                item.interfaceInteraction.sendSticker(.standalone(media: file), self.nodes[i], self.nodes[i].bounds)
+                item.interfaceInteraction.sendSticker(.standalone(media: file), true, self.nodes[i], self.nodes[i].bounds)
                 break
             }
         }
diff --git a/submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift
index 7881a01849..1a3cf9a5f3 100644
--- a/submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/StickersChatInputContextPanelNode.swift
@@ -11,6 +11,7 @@ import TelegramUIPreferences
 import MergeLists
 import AccountContext
 import StickerPackPreviewUI
+import ContextUI
 
 private struct StickersChatInputContextPanelEntryStableId: Hashable {
     let ids: [MediaId]
@@ -130,12 +131,16 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                         |> deliverOnMainQueue
                         |> map { isStarred -> (ASDisplayNode, PeekControllerContent)? in
                             if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
-                                var menuItems: [PeekControllerMenuItem] = []
+                                var menuItems: [ContextMenuItem] = []
                                 menuItems = [
-                                    PeekControllerMenuItem(title: strongSelf.strings.StickerPack_Send, color: .accent, font: .bold, action: {  _, _ in
-                                        return controllerInteraction.sendSticker(.standalone(media: item.file), nil, true, itemNode, itemNode.bounds)
-                                    }),
-                                    PeekControllerMenuItem(title: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, color: isStarred ? .destructive : .accent, action: { _, _ in
+                                    .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_Send, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Resend"), color: theme.contextMenu.primaryColor) }, action: { _, f in
+                                    f(.default)
+                                    
+                                    let _ = controllerInteraction.sendSticker(.standalone(media: item.file), false, false, nil, true, itemNode, itemNode.bounds)
+                                    })),
+                                    .action(ContextMenuActionItem(text: isStarred ? strongSelf.strings.Stickers_RemoveFromFavorites : strongSelf.strings.Stickers_AddToFavorites, icon: { theme in generateTintedImage(image: isStarred ? UIImage(bundleImageName: "Chat/Context Menu/Unstar") : UIImage(bundleImageName: "Chat/Context Menu/Rate"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                        f(.default)
+                                        
                                         if let strongSelf = self {
                                             if isStarred {
                                                 let _ = removeSavedSticker(postbox: strongSelf.context.account.postbox, mediaId: item.file.fileId).start()
@@ -143,9 +148,10 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                                                 let _ = addSavedSticker(postbox: strongSelf.context.account.postbox, network: strongSelf.context.account.network, file: item.file).start()
                                             }
                                         }
-                                        return true
-                                    }),
-                                    PeekControllerMenuItem(title: strongSelf.strings.StickerPack_ViewPack, color: .accent, action: { _, _ in
+                                    })),
+                                    .action(ContextMenuActionItem(text: strongSelf.strings.StickerPack_ViewPack, icon: { theme in generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/Sticker"), color: theme.contextMenu.primaryColor) }, action: { [weak self] _, f in
+                                        f(.default)
+                                    
                                         if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
                                             loop: for attribute in item.file.attributes {
                                                 switch attribute {
@@ -153,11 +159,10 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                                                     if let packReference = packReference {
                                                         let controller = StickerPackScreen(context: strongSelf.context, mainStickerPack: packReference, stickerPacks: [packReference], parentNavigationController: controllerInteraction.navigationController(), sendSticker: { file, sourceNode, sourceRect in
                                                             if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
-                                                                return controllerInteraction.sendSticker(file, nil, true, sourceNode, sourceRect)
+                                                                return controllerInteraction.sendSticker(file, false, false, nil, true, sourceNode, sourceRect)
                                                             } else {
                                                                 return false
                                                             }
-                                                            
                                                         })
                                                         
                                                         controllerInteraction.navigationController()?.view.window?.endEditing(true)
@@ -169,9 +174,7 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                                                 }
                                             }
                                         }
-                                        return true
-                                    }),
-                                    PeekControllerMenuItem(title: strongSelf.strings.Common_Cancel, color: .accent, font: .bold, action: { _, _ in return true })
+                                    }))
                                 ]
                                 return (itemNode, StickerPreviewPeekContent(account: strongSelf.context.account, item: .pack(item), menu: menuItems))
                             } else {
@@ -184,7 +187,8 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
             return nil
         }, present: { [weak self] content, sourceNode in
             if let strongSelf = self {
-                let controller = PeekController(theme: PeekControllerTheme(presentationTheme: strongSelf.theme), content: content, sourceNode: {
+                let presentationData = strongSelf.context.sharedContext.currentPresentationData.with { $0 }
+                let controller = PeekController(presentationData: presentationData, content: content, sourceNode: {
                     return sourceNode
                 })
                 strongSelf.interfaceInteraction?.presentGlobalOverlayController(controller, nil)
@@ -299,7 +303,10 @@ final class StickersChatInputContextPanelNode: ChatInputContextPanelNode {
                     
                     if let topItemOffset = topItemOffset {
                         let position = strongSelf.listView.layer.position
-                        strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
                     }
                 }
             })
diff --git a/submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift b/submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift
index ecb2de7a00..f60e0f42f5 100644
--- a/submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift
+++ b/submodules/TelegramUI/Sources/TelegramAccountAuxiliaryMethods.swift
@@ -9,6 +9,9 @@ import MusicAlbumArtResources
 import LocalMediaResources
 import LocationResources
 import ChatInterfaceState
+import WallpaperResources
+import AppBundle
+import SwiftSignalKit
 
 public let telegramAccountAuxiliaryMethods = AccountAuxiliaryMethods(updatePeerChatInputState: { interfaceState, inputState -> PeerChatInterfaceState? in
     if interfaceState == nil {
@@ -36,9 +39,59 @@ public let telegramAccountAuxiliaryMethods = AccountAuxiliaryMethods(updatePeerC
     } else if let resource = resource as? OpenInAppIconResource {
         return fetchOpenInAppIconResource(resource: resource)
     } else if let resource = resource as? EmojiSpriteResource {
-        return fetchEmojiSpriteResource(postbox: account.postbox, network: account.network, resource: resource)
+        return fetchEmojiSpriteResource(account: account, resource: resource)
     } else if let resource = resource as? VenueIconResource {
         return fetchVenueIconResource(account: account, resource: resource)
+    } else if let wallpaperResource = resource as? WallpaperDataResource {
+        let builtinWallpapers: [String] = [
+            "fqv01SQemVIBAAAApND8LDRUhRU"
+        ]
+        if builtinWallpapers.contains(wallpaperResource.slug) {
+            if let url = getAppBundle().url(forResource: wallpaperResource.slug, withExtension: "tgv") {
+                return Signal { subscriber in
+                    subscriber.putNext(.reset)
+                    if let data = try? Data(contentsOf: url, options: .mappedRead) {
+                        subscriber.putNext(.dataPart(resourceOffset: 0, data: data, range: 0 ..< data.count, complete: true))
+                    }
+
+                    return EmptyDisposable
+                }
+            } else {
+                return nil
+            }
+        }
+        return nil
+    } else if let cloudDocumentMediaResource = resource as? CloudDocumentMediaResource {
+        if cloudDocumentMediaResource.fileId == 5789658100176783156 {
+            if let url = getAppBundle().url(forResource: "fqv01SQemVIBAAAApND8LDRUhRU", withExtension: "tgv") {
+                return Signal { subscriber in
+                    subscriber.putNext(.reset)
+                    if let data = try? Data(contentsOf: url, options: .mappedRead) {
+                        subscriber.putNext(.dataPart(resourceOffset: 0, data: data, range: 0 ..< data.count, complete: true))
+                    }
+
+                    return EmptyDisposable
+                }
+            } else {
+                return nil
+            }
+        }
+    } else if let cloudDocumentSizeMediaResource = resource as? CloudDocumentSizeMediaResource {
+        if cloudDocumentSizeMediaResource.documentId == 5789658100176783156 && cloudDocumentSizeMediaResource.sizeSpec == "m" {
+            if let url = getAppBundle().url(forResource: "5789658100176783156-m", withExtension: "resource") {
+                return Signal { subscriber in
+                    subscriber.putNext(.reset)
+                    if let data = try? Data(contentsOf: url, options: .mappedRead) {
+                        subscriber.putNext(.dataPart(resourceOffset: 0, data: data, range: 0 ..< data.count, complete: true))
+                    }
+
+                    return EmptyDisposable
+                }
+            } else {
+                return nil
+            }
+        }
+        return nil
     }
     return nil
 }, fetchResourceMediaReferenceHash: { resource in
diff --git a/submodules/TelegramUI/Sources/TelegramRootController.swift b/submodules/TelegramUI/Sources/TelegramRootController.swift
index 42f7e00bfc..2b96a8aa10 100644
--- a/submodules/TelegramUI/Sources/TelegramRootController.swift
+++ b/submodules/TelegramUI/Sources/TelegramRootController.swift
@@ -14,6 +14,7 @@ import ChatListUI
 import SettingsUI
 import AppBundle
 import DatePickerNode
+import DebugSettingsUI
 
 public final class TelegramRootController: NavigationController {
     private let context: AccountContext
diff --git a/submodules/TelegramUI/Sources/TextLinkHandling.swift b/submodules/TelegramUI/Sources/TextLinkHandling.swift
index 8d4a2796a4..3ae0393bb1 100644
--- a/submodules/TelegramUI/Sources/TextLinkHandling.swift
+++ b/submodules/TelegramUI/Sources/TextLinkHandling.swift
@@ -51,16 +51,16 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate
     }
     
     let openLinkImpl: (String) -> Void = { [weak controller] url in
-        navigateDisposable.set((context.sharedContext.resolveUrl(account: context.account, url: url, skipUrlAuth: true) |> deliverOnMainQueue).start(next: { result in
+        navigateDisposable.set((context.sharedContext.resolveUrl(context: context, peerId: peerId, url: url, skipUrlAuth: true) |> deliverOnMainQueue).start(next: { result in
             if let controller = controller {
                 switch result {
                     case let .externalUrl(url):
                         context.sharedContext.applicationBindings.openUrl(url)
                     case let .peer(peerId, navigation):
                         openResolvedPeerImpl(peerId, navigation)
-                    case let .channelMessage(peerId, messageId):
+                    case let .channelMessage(peerId, messageId, timecode):
                         if let navigationController = controller.navigationController as? NavigationController {
-                            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true)))
+                            context.sharedContext.navigateToChatController(NavigateToChatControllerParams(navigationController: navigationController, context: context, chatLocation: .peer(peerId), subject: .message(id: messageId, highlight: true, timecode: timecode)))
                         }
                     case let .replyThreadMessage(replyThreadMessage, messageId):
                         if let navigationController = controller.navigationController as? NavigationController {
@@ -91,7 +91,7 @@ func handleTextLinkActionImpl(context: AccountContext, peerId: PeerId?, navigate
     }
     
     let openPeerMentionImpl: (String) -> Void = { mention in
-        navigateDisposable.set((resolvePeerByName(account: context.account, name: mention, ageLimit: 10) |> take(1) |> deliverOnMainQueue).start(next: { peerId in
+        navigateDisposable.set((context.engine.peers.resolvePeerByName(name: mention, ageLimit: 10) |> take(1) |> deliverOnMainQueue).start(next: { peerId in
             openResolvedPeerImpl(peerId, .default)
         }))
     }
diff --git a/submodules/TelegramUI/Sources/ThemeUpdateManager.swift b/submodules/TelegramUI/Sources/ThemeUpdateManager.swift
index 3ac35c77b0..58dc72a6d5 100644
--- a/submodules/TelegramUI/Sources/ThemeUpdateManager.swift
+++ b/submodules/TelegramUI/Sources/ThemeUpdateManager.swift
@@ -104,7 +104,7 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager {
                             |> mapToSignal { wallpaper -> Signal<(PresentationThemeReference, PresentationTheme?), NoError> in
                                 if let wallpaper = wallpaper, case let .file(_, _, _, _, _, _, slug, file, _) = wallpaper {
                                     var convertedRepresentations: [ImageRepresentationWithReference] = []
-                                    convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(slug), resource: file.resource)))
+                                    convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(slug), resource: file.resource)))
                                     return wallpaperDatas(account: account, accountManager: accountManager, fileReference: .standalone(media: file), representations: convertedRepresentations, alwaysShowThumbnailFirst: false, thumbnail: false, onlyFullSize: true, autoFetchFullSize: true, synchronousLoad: false)
                                     |> mapToSignal { _, fullSizeData, complete -> Signal<(PresentationThemeReference, PresentationTheme?), NoError> in
                                         guard complete, let fullSizeData = fullSizeData else {
@@ -139,7 +139,7 @@ final class ThemeUpdateManagerImpl: ThemeUpdateManager {
                                         theme = updatedTheme
                                     }
                                     
-                                    return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                    return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: current.themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                 })
                             }).start()
                         }
diff --git a/submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift b/submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift
index 525586e6dc..39ae2767dd 100644
--- a/submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift
+++ b/submodules/TelegramUI/Sources/TransformOutgoingMessageMedia.swift
@@ -59,7 +59,7 @@ public func transformOutgoingMessageMedia(postbox: Postbox, network: Network, me
                                         }*/
                                         let imageDimensions = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale)
                                         
-                                        let thumbnailResource = LocalFileMediaResource(fileId: arc4random64())
+                                        let thumbnailResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                         postbox.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData)
                                         
                                         let scaledImageSize = CGSize(width: scaledImage.size.width * scaledImage.scale, height: scaledImage.size.height * scaledImage.scale)
@@ -75,7 +75,7 @@ public func transformOutgoingMessageMedia(postbox: Postbox, network: Network, me
                                             }
                                         }
                                         attributes.append(.ImageSize(size: PixelDimensions(imageDimensions)))
-                                        let updatedFile = file.withUpdatedSize(data.size).withUpdatedPreviewRepresentations([TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledImageSize), resource: thumbnailResource, progressiveSizes: [])]).withUpdatedAttributes(attributes)
+                                        let updatedFile = file.withUpdatedSize(data.size).withUpdatedPreviewRepresentations([TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledImageSize), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil)]).withUpdatedAttributes(attributes)
                                         subscriber.putNext(.standalone(media: updatedFile))
                                         subscriber.putCompletion()
                                     } else {
@@ -99,12 +99,12 @@ public func transformOutgoingMessageMedia(postbox: Postbox, network: Network, me
                     } else if file.mimeType.hasPrefix("video/") {
                         return Signal { subscriber in
                             if let scaledImage = generateVideoFirstFrame(data.path, maxDimensions: CGSize(width: 320.0, height: 320.0)), let thumbnailData = scaledImage.jpegData(compressionQuality: 0.6) {
-                                let thumbnailResource = LocalFileMediaResource(fileId: arc4random64())
+                                let thumbnailResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                 postbox.mediaBox.storeResourceData(thumbnailResource.id, data: thumbnailData)
                             
                                 let scaledImageSize = CGSize(width: scaledImage.size.width * scaledImage.scale, height: scaledImage.size.height * scaledImage.scale)
                             
-                                let updatedFile = file.withUpdatedSize(data.size).withUpdatedPreviewRepresentations([TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledImageSize), resource: thumbnailResource, progressiveSizes: [])])
+                                let updatedFile = file.withUpdatedSize(data.size).withUpdatedPreviewRepresentations([TelegramMediaImageRepresentation(dimensions: PixelDimensions(scaledImageSize), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil)])
                                 subscriber.putNext(.standalone(media: updatedFile))
                                 subscriber.putCompletion()
                             } else {
@@ -158,9 +158,9 @@ public func transformOutgoingMessageMedia(postbox: Postbox, network: Network, me
                             if let fullImage = UIImage(contentsOfFile: data.path), let smallestImage = generateScaledImage(image: fullImage, size: smallestSize, scale: 1.0), let smallestData = compressImageToJPEG(smallestImage, quality: 0.7) {
                                 var representations = image.representations
                                 
-                                let thumbnailResource = LocalFileMediaResource(fileId: arc4random64())
+                                let thumbnailResource = LocalFileMediaResource(fileId: Int64.random(in: Int64.min ... Int64.max))
                                 postbox.mediaBox.storeResourceData(thumbnailResource.id, data: smallestData)
-                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(smallestSize), resource: thumbnailResource, progressiveSizes: []))
+                                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(smallestSize), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
                                 let updatedImage = TelegramMediaImage(imageId: image.imageId, representations: representations, immediateThumbnailData: image.immediateThumbnailData, reference: image.reference, partialReference: image.partialReference, flags: [])
                                 return .single(.standalone(media: updatedImage))
                             }
diff --git a/submodules/TelegramUI/Sources/UpgradedAccounts.swift b/submodules/TelegramUI/Sources/UpgradedAccounts.swift
index 1198e7b2fb..765e2f7d7a 100644
--- a/submodules/TelegramUI/Sources/UpgradedAccounts.swift
+++ b/submodules/TelegramUI/Sources/UpgradedAccounts.swift
@@ -122,7 +122,6 @@ public func upgradedAccounts(accountManager: AccountManager, rootPath: String, e
             }
             |> ignoreValues
             |> mapToSignal { _ -> Signal<Float, NoError> in
-                return .complete()
             }
         }
         var signal: Signal<Float, NoError> = .complete()
@@ -166,9 +165,6 @@ public func upgradedAccounts(accountManager: AccountManager, rootPath: String, e
                                                     accountManager.mediaBox.storeResourceData(file.file.resource.id, data: data)
                                                     let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start()
                                                     if wallpaper.isPattern {
-                                                        if let color = file.settings.color, let intensity = file.settings.intensity {
-                                                            let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true).start()
-                                                        }
                                                     } else {
                                                         if file.settings.blur {
                                                             let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true).start()
diff --git a/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift
index 57e14a22fc..fd1c032325 100644
--- a/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift
+++ b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputContextPanelNode.swift
@@ -257,7 +257,10 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex
                     
                     if let topItemOffset = topItemOffset {
                         let position = strongSelf.listView.layer.position
-                        strongSelf.listView.layer.animatePosition(from: CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset)), to: position, duration: 0.3, timingFunction: kCAMediaTimingFunctionSpring)
+                        strongSelf.listView.position = CGPoint(x: position.x, y: position.y + (strongSelf.listView.bounds.size.height - topItemOffset))
+                        ContainedViewLayoutTransition.animated(duration: 0.3, curve: .spring).animateView {
+                            strongSelf.listView.position = position
+                        }
                     }
                     
                     strongSelf.listView.isHidden = false
@@ -337,7 +340,7 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex
         let geoPoint = currentProcessedResults.geoPoint.flatMap { geoPoint -> (Double, Double) in
             return (geoPoint.latitude, geoPoint.longitude)
         }
-        self.loadMoreDisposable.set((requestChatContextResults(account: self.context.account, botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
+        self.loadMoreDisposable.set((self.context.engine.messages.requestChatContextResults(botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
         |> map { results -> ChatContextResultCollection? in
             return results?.results
         }
@@ -363,4 +366,14 @@ final class VerticalListContextResultsChatInputContextPanelNode: ChatInputContex
             strongSelf.updateInternalResults(mergedResults)
         }))
     }
+    
+    override var topItemFrame: CGRect? {
+        var topItemFrame: CGRect?
+        self.listView.forEachItemNode { itemNode in
+            if topItemFrame == nil {
+                topItemFrame = itemNode.frame
+            }
+        }
+        return topItemFrame
+    }
 }
diff --git a/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift
index 3a3b06298e..a361ce4861 100644
--- a/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift
+++ b/submodules/TelegramUI/Sources/VerticalListContextResultsChatInputPanelItem.swift
@@ -251,7 +251,7 @@ final class VerticalListContextResultsChatInputPanelItemNode: ListViewItemNode {
                     if let stickerFile = stickerFile {
                         updateIconImageSignal = chatMessageSticker(account: item.account, file: stickerFile, small: false, fetched: true)
                     } else {
-                        let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 55, height: 55), resource: imageResource, progressiveSizes: [])
+                        let tmpRepresentation = TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 55, height: 55), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil)
                         let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: [tmpRepresentation], immediateThumbnailData: nil, reference: nil, partialReference: nil, flags: [])
                         updateIconImageSignal = chatWebpageSnippetPhoto(account: item.account, photoReference: .standalone(media: tmpImage))
                     }
diff --git a/submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift b/submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift
index 6d6433875d..7f32ba3261 100644
--- a/submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift
+++ b/submodules/TelegramUI/Sources/WallpaperPreviewMedia.swift
@@ -5,9 +5,9 @@ import TelegramCore
 import SyncCore
 
 enum WallpaperPreviewMediaContent: Equatable {
-    case file(TelegramMediaFile, UIColor?, UIColor?, Int32?, Bool, Bool)
+    case file(file: TelegramMediaFile, colors: [UInt32], rotation: Int32?, intensity: Int32?, Bool, Bool)
     case color(UIColor)
-    case gradient(UIColor, UIColor, Int32?)
+    case gradient([UInt32], Int32?)
     case themeSettings(TelegramThemeSettings)
 }
 
diff --git a/submodules/TelegramUI/Sources/WallpaperUploadManager.swift b/submodules/TelegramUI/Sources/WallpaperUploadManager.swift
index 3d5211e7f6..00a84853a5 100644
--- a/submodules/TelegramUI/Sources/WallpaperUploadManager.swift
+++ b/submodules/TelegramUI/Sources/WallpaperUploadManager.swift
@@ -130,7 +130,7 @@ final class WallpaperUploadManagerImpl: WallpaperUploadManager {
                                     var themeSpecificChatWallpapers = current.themeSpecificChatWallpapers
                                     themeSpecificChatWallpapers[themeReference.index] = updatedWallpaper
                                     themeSpecificChatWallpapers[coloredThemeIndex(reference: themeReference, accentColor: current.themeSpecificAccentColors[themeReference.index])] = updatedWallpaper
-                                    return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, disableAnimations: current.disableAnimations)
+                                    return PresentationThemeSettings(theme: current.theme, themeSpecificAccentColors: current.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: current.useSystemFont, fontSize: current.fontSize, listsFontSize: current.listsFontSize, chatBubbleSettings: current.chatBubbleSettings, automaticThemeSwitchSetting: current.automaticThemeSwitchSetting, largeEmoji: current.largeEmoji, reduceMotion: current.reduceMotion)
                                 })).start()
                             }
                             
diff --git a/submodules/TelegramUI/Sources/Weak.swift b/submodules/TelegramUI/Sources/Weak.swift
index 435c4bdb7e..fbf287572c 100644
--- a/submodules/TelegramUI/Sources/Weak.swift
+++ b/submodules/TelegramUI/Sources/Weak.swift
@@ -1,12 +1,2 @@
 import Foundation
 
-final class Weak<T: AnyObject> {
-    private weak var _value: T?
-    var value: T? {
-        return self._value
-    }
-    
-    init(_ value: T) {
-        self._value = value
-    }
-}
diff --git a/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift b/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift
index d685310c04..1ae9c83d4c 100644
--- a/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift
+++ b/submodules/TelegramUIPreferences/Sources/ExperimentalUISettings.swift
@@ -14,8 +14,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
     public var preferredVideoCodec: String?
     public var disableVideoAspectScaling: Bool
     public var enableVoipTcp: Bool
-    public var snapPinListToTop: Bool
-    public var demoAudioStream: Bool
+    public var demoVideoChats: Bool
+    public var experimentalCompatibility: Bool
+    public var enableNoiseSuppression: Bool
     
     public static var defaultSettings: ExperimentalUISettings {
         return ExperimentalUISettings(
@@ -30,8 +31,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
             preferredVideoCodec: nil,
             disableVideoAspectScaling: false,
             enableVoipTcp: false,
-            snapPinListToTop: false,
-            demoAudioStream: false
+            demoVideoChats: false,
+            experimentalCompatibility: false,
+            enableNoiseSuppression: false
         )
     }
     
@@ -47,8 +49,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
         preferredVideoCodec: String?,
         disableVideoAspectScaling: Bool,
         enableVoipTcp: Bool,
-        snapPinListToTop: Bool,
-        demoAudioStream: Bool
+        demoVideoChats: Bool,
+        experimentalCompatibility: Bool,
+        enableNoiseSuppression: Bool
     ) {
         self.keepChatNavigationStack = keepChatNavigationStack
         self.skipReadHistory = skipReadHistory
@@ -61,8 +64,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
         self.preferredVideoCodec = preferredVideoCodec
         self.disableVideoAspectScaling = disableVideoAspectScaling
         self.enableVoipTcp = enableVoipTcp
-        self.snapPinListToTop = snapPinListToTop
-        self.demoAudioStream = demoAudioStream
+        self.demoVideoChats = demoVideoChats
+        self.experimentalCompatibility = experimentalCompatibility
+        self.enableNoiseSuppression = enableNoiseSuppression
     }
     
     public init(decoder: PostboxDecoder) {
@@ -77,8 +81,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
         self.preferredVideoCodec = decoder.decodeOptionalStringForKey("preferredVideoCodec")
         self.disableVideoAspectScaling = decoder.decodeInt32ForKey("disableVideoAspectScaling", orElse: 0) != 0
         self.enableVoipTcp = decoder.decodeInt32ForKey("enableVoipTcp", orElse: 0) != 0
-        self.snapPinListToTop = decoder.decodeInt32ForKey("snapPinListToTop", orElse: 0) != 0
-        self.demoAudioStream = decoder.decodeInt32ForKey("demoAudioStream", orElse: 0) != 0
+        self.demoVideoChats = decoder.decodeInt32ForKey("demoVideoChats", orElse: 0) != 0
+        self.experimentalCompatibility = decoder.decodeInt32ForKey("experimentalCompatibility", orElse: 0) != 0
+        self.enableNoiseSuppression = decoder.decodeInt32ForKey("enableNoiseSuppression", orElse: 0) != 0
     }
     
     public func encode(_ encoder: PostboxEncoder) {
@@ -95,8 +100,9 @@ public struct ExperimentalUISettings: Equatable, PreferencesEntry {
         }
         encoder.encodeInt32(self.disableVideoAspectScaling ? 1 : 0, forKey: "disableVideoAspectScaling")
         encoder.encodeInt32(self.enableVoipTcp ? 1 : 0, forKey: "enableVoipTcp")
-        encoder.encodeInt32(self.snapPinListToTop ? 1 : 0, forKey: "snapPinListToTop")
-        encoder.encodeInt32(self.demoAudioStream ? 1 : 0, forKey: "demoAudioStream")
+        encoder.encodeInt32(self.demoVideoChats ? 1 : 0, forKey: "demoVideoChats")
+        encoder.encodeInt32(self.experimentalCompatibility ? 1 : 0, forKey: "experimentalCompatibility")
+        encoder.encodeInt32(self.enableNoiseSuppression ? 1 : 0, forKey: "enableNoiseSuppression")
     }
     
     public func isEqual(to: PreferencesEntry) -> Bool {
diff --git a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
index 57f98c02d8..8e6e92315a 100644
--- a/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
+++ b/submodules/TelegramUIPreferences/Sources/PresentationThemeSettings.swift
@@ -568,7 +568,7 @@ public struct PresentationThemeSettings: PreferencesEntry {
     public var chatBubbleSettings: PresentationChatBubbleSettings
     public var automaticThemeSwitchSetting: AutomaticThemeSwitchSetting
     public var largeEmoji: Bool
-    public var disableAnimations: Bool
+    public var reduceMotion: Bool
     
     private func wallpaperResources(_ wallpaper: TelegramWallpaper) -> [MediaResourceId] {
         switch wallpaper {
@@ -606,10 +606,10 @@ public struct PresentationThemeSettings: PreferencesEntry {
     }
     
     public static var defaultSettings: PresentationThemeSettings {
-        return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, chatBubbleSettings: .default, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, disableAnimations: true)
+        return PresentationThemeSettings(theme: .builtin(.dayClassic), themeSpecificAccentColors: [:], themeSpecificChatWallpapers: [:], useSystemFont: true, fontSize: .regular, listsFontSize: .regular, chatBubbleSettings: .default, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night)), largeEmoji: true, reduceMotion: false)
     }
     
-    public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, chatBubbleSettings: PresentationChatBubbleSettings, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, disableAnimations: Bool) {
+    public init(theme: PresentationThemeReference, themeSpecificAccentColors: [Int64: PresentationThemeAccentColor], themeSpecificChatWallpapers: [Int64: TelegramWallpaper], useSystemFont: Bool, fontSize: PresentationFontSize, listsFontSize: PresentationFontSize, chatBubbleSettings: PresentationChatBubbleSettings, automaticThemeSwitchSetting: AutomaticThemeSwitchSetting, largeEmoji: Bool, reduceMotion: Bool) {
         self.theme = theme
         self.themeSpecificAccentColors = themeSpecificAccentColors
         self.themeSpecificChatWallpapers = themeSpecificChatWallpapers
@@ -619,7 +619,7 @@ public struct PresentationThemeSettings: PreferencesEntry {
         self.chatBubbleSettings = chatBubbleSettings
         self.automaticThemeSwitchSetting = automaticThemeSwitchSetting
         self.largeEmoji = largeEmoji
-        self.disableAnimations = disableAnimations
+        self.reduceMotion = reduceMotion
     }
     
     public init(decoder: PostboxDecoder) {
@@ -644,7 +644,7 @@ public struct PresentationThemeSettings: PreferencesEntry {
         self.chatBubbleSettings = decoder.decodeObjectForKey("chatBubbleSettings", decoder: { PresentationChatBubbleSettings(decoder: $0) }) as? PresentationChatBubbleSettings ?? PresentationChatBubbleSettings.default
         self.automaticThemeSwitchSetting = (decoder.decodeObjectForKey("automaticThemeSwitchSetting", decoder: { AutomaticThemeSwitchSetting(decoder: $0) }) as? AutomaticThemeSwitchSetting) ?? AutomaticThemeSwitchSetting(trigger: .system, theme: .builtin(.night))
         self.largeEmoji = decoder.decodeBoolForKey("largeEmoji", orElse: true)
-        self.disableAnimations = decoder.decodeBoolForKey("disableAnimations", orElse: true)
+        self.reduceMotion = decoder.decodeBoolForKey("reduceMotion", orElse: false)
     }
     
     public func encode(_ encoder: PostboxEncoder) {
@@ -661,7 +661,7 @@ public struct PresentationThemeSettings: PreferencesEntry {
         encoder.encodeObject(self.chatBubbleSettings, forKey: "chatBubbleSettings")
         encoder.encodeObject(self.automaticThemeSwitchSetting, forKey: "automaticThemeSwitchSetting")
         encoder.encodeBool(self.largeEmoji, forKey: "largeEmoji")
-        encoder.encodeBool(self.disableAnimations, forKey: "disableAnimations")
+        encoder.encodeBool(self.reduceMotion, forKey: "reduceMotion")
     }
     
     public func isEqual(to: PreferencesEntry) -> Bool {
@@ -673,43 +673,43 @@ public struct PresentationThemeSettings: PreferencesEntry {
     }
     
     public static func ==(lhs: PresentationThemeSettings, rhs: PresentationThemeSettings) -> Bool {
-        return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.chatBubbleSettings == rhs.chatBubbleSettings && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.disableAnimations == rhs.disableAnimations
+        return lhs.theme == rhs.theme && lhs.themeSpecificAccentColors == rhs.themeSpecificAccentColors && lhs.themeSpecificChatWallpapers == rhs.themeSpecificChatWallpapers && lhs.useSystemFont == rhs.useSystemFont && lhs.fontSize == rhs.fontSize && lhs.listsFontSize == rhs.listsFontSize && lhs.chatBubbleSettings == rhs.chatBubbleSettings && lhs.automaticThemeSwitchSetting == rhs.automaticThemeSwitchSetting && lhs.largeEmoji == rhs.largeEmoji && lhs.reduceMotion == rhs.reduceMotion
     }
     
     public func withUpdatedTheme(_ theme: PresentationThemeReference) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedThemeSpecificAccentColors(_ themeSpecificAccentColors: [Int64: PresentationThemeAccentColor]) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedThemeSpecificChatWallpapers(_ themeSpecificChatWallpapers: [Int64: TelegramWallpaper]) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedUseSystemFont(_ useSystemFont: Bool) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedFontSizes(fontSize: PresentationFontSize, listsFontSize: PresentationFontSize) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: fontSize, listsFontSize: listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedChatBubbleSettings(_ chatBubbleSettings: PresentationChatBubbleSettings) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedAutomaticThemeSwitchSetting(_ automaticThemeSwitchSetting: AutomaticThemeSwitchSetting) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: self.reduceMotion)
     }
     
     public func withUpdatedLargeEmoji(_ largeEmoji: Bool) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, disableAnimations: self.disableAnimations)
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: largeEmoji, reduceMotion: self.reduceMotion)
     }
     
-    public func withUpdatedDisableAnimations(_ disableAnimations: Bool) -> PresentationThemeSettings {
-        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, disableAnimations: disableAnimations)
+    public func withUpdatedReduceMotion(_ reduceMotion: Bool) -> PresentationThemeSettings {
+        return PresentationThemeSettings(theme: self.theme, themeSpecificAccentColors: self.themeSpecificAccentColors, themeSpecificChatWallpapers: self.themeSpecificChatWallpapers, useSystemFont: self.useSystemFont, fontSize: self.fontSize, listsFontSize: self.listsFontSize, chatBubbleSettings: self.chatBubbleSettings, automaticThemeSwitchSetting: self.automaticThemeSwitchSetting, largeEmoji: self.largeEmoji, reduceMotion: reduceMotion)
     }
 }
 
diff --git a/submodules/TelegramUniversalVideoContent/Sources/NativeVideoContent.swift b/submodules/TelegramUniversalVideoContent/Sources/NativeVideoContent.swift
index 672c0e7060..3a2f8162b4 100644
--- a/submodules/TelegramUniversalVideoContent/Sources/NativeVideoContent.swift
+++ b/submodules/TelegramUniversalVideoContent/Sources/NativeVideoContent.swift
@@ -10,6 +10,7 @@ import TelegramAudio
 import UniversalMediaPlayer
 import AccountContext
 import PhotoResources
+import UIKitRuntimeUtils
 
 public enum NativeVideoContentId: Hashable {
     case message(UInt32, MediaId)
diff --git a/submodules/TelegramVoip/Sources/GroupCallContext.swift b/submodules/TelegramVoip/Sources/GroupCallContext.swift
index 728a7e8b4e..cea1f85d45 100644
--- a/submodules/TelegramVoip/Sources/GroupCallContext.swift
+++ b/submodules/TelegramVoip/Sources/GroupCallContext.swift
@@ -28,20 +28,20 @@ private final class ContextQueueImpl: NSObject, OngoingCallThreadLocalContextQue
     }
 }
 
-private protocol BroadcastPartSource: class {
+private protocol BroadcastPartSource: AnyObject {
     func requestPart(timestampMilliseconds: Int64, durationMilliseconds: Int64, completion: @escaping (OngoingGroupCallBroadcastPart) -> Void, rejoinNeeded: @escaping () -> Void) -> Disposable
 }
 
 private final class NetworkBroadcastPartSource: BroadcastPartSource {
     private let queue: Queue
-    private let account: Account
+    private let engine: TelegramEngine
     private let callId: Int64
     private let accessHash: Int64
     private var dataSource: AudioBroadcastDataSource?
     
-    init(queue: Queue, account: Account, callId: Int64, accessHash: Int64) {
+    init(queue: Queue, engine: TelegramEngine, callId: Int64, accessHash: Int64) {
         self.queue = queue
-        self.account = account
+        self.engine = engine
         self.callId = callId
         self.accessHash = accessHash
     }
@@ -58,12 +58,12 @@ private final class NetworkBroadcastPartSource: BroadcastPartSource {
         if let dataSourceValue = self.dataSource {
             dataSource = .single(dataSourceValue)
         } else {
-            dataSource = getAudioBroadcastDataSource(account: self.account, callId: self.callId, accessHash: self.accessHash)
+            dataSource = self.engine.calls.getAudioBroadcastDataSource(callId: self.callId, accessHash: self.accessHash)
         }
-        
-        let account = self.account
+
         let callId = self.callId
         let accessHash = self.accessHash
+        let engine = self.engine
         
         let queue = self.queue
         let signal = dataSource
@@ -71,7 +71,7 @@ private final class NetworkBroadcastPartSource: BroadcastPartSource {
         |> mapToSignal { [weak self] dataSource -> Signal<GetAudioBroadcastPartResult?, NoError> in
             if let dataSource = dataSource {
                 self?.dataSource = dataSource
-                return getAudioBroadcastPart(dataSource: dataSource, callId: callId, accessHash: accessHash, timestampIdMilliseconds: timestampIdMilliseconds, durationMilliseconds: durationMilliseconds)
+                return engine.calls.getAudioBroadcastPart(dataSource: dataSource, callId: callId, accessHash: accessHash, timestampIdMilliseconds: timestampIdMilliseconds, durationMilliseconds: durationMilliseconds)
                 |> map(Optional.init)
             } else {
                 return .single(nil)
@@ -117,12 +117,12 @@ private final class OngoingGroupCallBroadcastPartTaskImpl : NSObject, OngoingGro
 
 public final class OngoingGroupCallContext {
     public struct AudioStreamData {
-        public var account: Account
+        public var engine: TelegramEngine
         public var callId: Int64
         public var accessHash: Int64
         
-        public init(account: Account, callId: Int64, accessHash: Int64) {
-            self.account = account
+        public init(engine: TelegramEngine, callId: Int64, accessHash: Int64) {
+            self.engine = engine
             self.callId = callId
             self.accessHash = accessHash
         }
@@ -134,6 +134,12 @@ public final class OngoingGroupCallContext {
         case broadcast
     }
     
+    public enum VideoContentType {
+        case none
+        case generic
+        case screencast
+    }
+    
     public struct NetworkState: Equatable {
         public var isConnected: Bool
         public var isTransitioningFromBroadcastToRtc: Bool
@@ -143,6 +149,164 @@ public final class OngoingGroupCallContext {
         case local
         case source(UInt32)
     }
+
+    public struct MediaChannelDescription {
+        public enum Kind {
+            case audio
+            case video
+        }
+
+        public var kind: Kind
+        public var audioSsrc: UInt32
+        public var videoDescription: String?
+
+        public init(kind: Kind, audioSsrc: UInt32, videoDescription: String?) {
+            self.kind = kind
+            self.audioSsrc = audioSsrc
+            self.videoDescription = videoDescription
+        }
+    }
+
+    public struct VideoChannel: Equatable {
+        public enum Quality {
+            case thumbnail
+            case medium
+            case full
+        }
+
+        public struct SsrcGroup: Equatable {
+            public var semantics: String
+            public var ssrcs: [UInt32]
+
+            public init(semantics: String, ssrcs: [UInt32]) {
+                self.semantics = semantics
+                self.ssrcs = ssrcs
+            }
+        }
+
+        public var audioSsrc: UInt32
+        public var endpointId: String
+        public var ssrcGroups: [SsrcGroup]
+        public var minQuality: Quality
+        public var maxQuality: Quality
+
+        public init(audioSsrc: UInt32, endpointId: String, ssrcGroups: [SsrcGroup], minQuality: Quality, maxQuality: Quality) {
+            self.audioSsrc = audioSsrc
+            self.endpointId = endpointId
+            self.ssrcGroups = ssrcGroups
+            self.minQuality = minQuality
+            self.maxQuality = maxQuality
+        }
+    }
+
+    public final class VideoFrameData {
+        public final class NativeBuffer {
+            public let pixelBuffer: CVPixelBuffer
+
+            init(pixelBuffer: CVPixelBuffer) {
+                self.pixelBuffer = pixelBuffer
+            }
+        }
+
+        public final class NV12Buffer {
+            private let wrapped: CallVideoFrameNV12Buffer
+
+            public var width: Int {
+                return Int(self.wrapped.width)
+            }
+
+            public var height: Int {
+                return Int(self.wrapped.height)
+            }
+
+            public var y: Data {
+                return self.wrapped.y
+            }
+
+            public var strideY: Int {
+                return Int(self.wrapped.strideY)
+            }
+
+            public var uv: Data {
+                return self.wrapped.uv
+            }
+
+            public var strideUV: Int {
+                return Int(self.wrapped.strideUV)
+            }
+
+            init(wrapped: CallVideoFrameNV12Buffer) {
+                self.wrapped = wrapped
+            }
+        }
+
+        public final class I420Buffer {
+            private let wrapped: CallVideoFrameI420Buffer
+
+            public var width: Int {
+                return Int(self.wrapped.width)
+            }
+
+            public var height: Int {
+                return Int(self.wrapped.height)
+            }
+
+            public var y: Data {
+                return self.wrapped.y
+            }
+
+            public var strideY: Int {
+                return Int(self.wrapped.strideY)
+            }
+
+            public var u: Data {
+                return self.wrapped.u
+            }
+
+            public var strideU: Int {
+                return Int(self.wrapped.strideU)
+            }
+
+            public var v: Data {
+                return self.wrapped.v
+            }
+
+            public var strideV: Int {
+                return Int(self.wrapped.strideV)
+            }
+
+            init(wrapped: CallVideoFrameI420Buffer) {
+                self.wrapped = wrapped
+            }
+        }
+
+        public enum Buffer {
+            case native(NativeBuffer)
+            case nv12(NV12Buffer)
+            case i420(I420Buffer)
+        }
+
+        public let buffer: Buffer
+        public let width: Int
+        public let height: Int
+        public let orientation: OngoingCallVideoOrientation
+
+        init(frameData: CallVideoFrameData) {
+            if let nativeBuffer = frameData.buffer as? CallVideoFrameNativePixelBuffer {
+                self.buffer = .native(NativeBuffer(pixelBuffer: nativeBuffer.pixelBuffer))
+            } else if let nv12Buffer = frameData.buffer as? CallVideoFrameNV12Buffer {
+                self.buffer = .nv12(NV12Buffer(wrapped: nv12Buffer))
+            } else if let i420Buffer = frameData.buffer as? CallVideoFrameI420Buffer {
+                self.buffer = .i420(I420Buffer(wrapped: i420Buffer))
+            } else {
+                preconditionFailure()
+            }
+
+            self.width = Int(frameData.width)
+            self.height = Int(frameData.height)
+            self.orientation = OngoingCallVideoOrientation(frameData.orientation)
+        }
+    }
     
     private final class Impl {
         let queue: Queue
@@ -153,26 +317,36 @@ public final class OngoingGroupCallContext {
         let joinPayload = Promise<(String, UInt32)>()
         let networkState = ValuePromise<NetworkState>(NetworkState(isConnected: false, isTransitioningFromBroadcastToRtc: false), ignoreRepeated: true)
         let isMuted = ValuePromise<Bool>(true, ignoreRepeated: true)
+        let isNoiseSuppressionEnabled = ValuePromise<Bool>(true, ignoreRepeated: true)
         let audioLevels = ValuePipe<[(AudioLevelKey, Float, Bool)]>()
-        
-        let videoSources = ValuePromise<Set<UInt32>>(Set(), ignoreRepeated: true)
+
+        private var currentRequestedVideoChannels: [VideoChannel] = []
         
         private var broadcastPartsSource: BroadcastPartSource?
         
-        init(queue: Queue, inputDeviceId: String, outputDeviceId: String, video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set<UInt32>) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void) {
+        init(queue: Queue, inputDeviceId: String, outputDeviceId: String, video: OngoingCallVideoCapturer?, requestMediaChannelDescriptions: @escaping (Set<UInt32>, @escaping ([MediaChannelDescription]) -> Void) -> Disposable, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, videoContentType: VideoContentType, enableNoiseSuppression: Bool) {
             self.queue = queue
             
             var networkStateUpdatedImpl: ((GroupCallNetworkState) -> Void)?
             var audioLevelsUpdatedImpl: (([NSNumber]) -> Void)?
             
             if let audioStreamData = audioStreamData {
-                let broadcastPartsSource = NetworkBroadcastPartSource(queue: queue, account: audioStreamData.account, callId: audioStreamData.callId, accessHash: audioStreamData.accessHash)
+                let broadcastPartsSource = NetworkBroadcastPartSource(queue: queue, engine: audioStreamData.engine, callId: audioStreamData.callId, accessHash: audioStreamData.accessHash)
                 self.broadcastPartsSource = broadcastPartsSource
             }
             
             let broadcastPartsSource = self.broadcastPartsSource
             
-            let videoSources = self.videoSources
+            let _videoContentType: OngoingGroupCallVideoContentType
+            switch videoContentType {
+            case .generic:
+                _videoContentType = .generic
+            case .screencast:
+                _videoContentType = .screencast
+            case .none:
+                _videoContentType = .none
+            }
+
             self.context = GroupCallThreadLocalContext(
                 queue: ContextQueueImpl(queue: queue),
                 networkStateUpdated: { state in
@@ -184,11 +358,37 @@ public final class OngoingGroupCallContext {
                 inputDeviceId: inputDeviceId,
                 outputDeviceId: outputDeviceId,
                 videoCapturer: video?.impl,
-                incomingVideoSourcesUpdated: { ssrcs in
-                    videoSources.set(Set(ssrcs.map { $0.uint32Value }))
-                },
-                participantDescriptionsRequired: { ssrcs in
-                    participantDescriptionsRequired(Set(ssrcs.map { $0.uint32Value }))
+                requestMediaChannelDescriptions: { ssrcs, completion in
+                    final class OngoingGroupCallMediaChannelDescriptionTaskImpl : NSObject, OngoingGroupCallMediaChannelDescriptionTask {
+                        private let disposable: Disposable
+
+                        init(disposable: Disposable) {
+                            self.disposable = disposable
+                        }
+
+                        func cancel() {
+                            self.disposable.dispose()
+                        }
+                    }
+
+                    let disposable = requestMediaChannelDescriptions(Set(ssrcs.map { $0.uint32Value }), { channels in
+                        completion(channels.map { channel -> OngoingGroupCallMediaChannelDescription in
+                            let mappedType: OngoingGroupCallMediaChannelType
+                            switch channel.kind {
+                            case .audio:
+                                mappedType = .audio
+                            case .video:
+                                mappedType = .video
+                            }
+                            return OngoingGroupCallMediaChannelDescription(
+                                type: mappedType,
+                                audioSsrc: channel.audioSsrc,
+                                videoDescription: channel.videoDescription
+                            )
+                        })
+                    })
+
+                    return OngoingGroupCallMediaChannelDescriptionTaskImpl(disposable: disposable)
                 },
                 requestBroadcastPart: { timestampMilliseconds, durationMilliseconds, completion in
                     let disposable = MetaDisposable()
@@ -200,7 +400,10 @@ public final class OngoingGroupCallContext {
                     }
                     
                     return OngoingGroupCallBroadcastPartTaskImpl(disposable: disposable)
-                }
+                },
+                outgoingAudioBitrateKbit: outgoingAudioBitrateKbit ?? 32,
+                videoContentType: _videoContentType,
+                enableNoiseSuppression: enableNoiseSuppression
             )
             
             let queue = self.queue
@@ -247,10 +450,8 @@ public final class OngoingGroupCallContext {
         deinit {
         }
         
-        func setJoinResponse(payload: String, participants: [(UInt32, String?)]) {
-            self.context.setJoinResponsePayload(payload, participants: participants.map { participant -> OngoingGroupCallParticipantDescription in
-                return OngoingGroupCallParticipantDescription(audioSsrc: participant.0, jsonParams: participant.1)
-            })
+        func setJoinResponse(payload: String) {
+            self.context.setJoinResponsePayload(payload)
         }
         
         func addSsrcs(ssrcs: [UInt32]) {
@@ -264,22 +465,51 @@ public final class OngoingGroupCallContext {
                 return ssrc as NSNumber
             })
         }
+
+        func removeIncomingVideoSource(_ ssrc: UInt32) {
+            self.context.removeIncomingVideoSource(ssrc)
+        }
         
         func setVolume(ssrc: UInt32, volume: Double) {
             self.context.setVolumeForSsrc(ssrc, volume: volume)
         }
-        
-        func setFullSizeVideoSsrc(ssrc: UInt32?) {
-            self.context.setFullSizeVideoSsrc(ssrc ?? 0)
-        }
-        
-        func addParticipants(participants: [(UInt32, String?)]) {
-            if participants.isEmpty {
-                return
+
+        func setRequestedVideoChannels(_ channels: [VideoChannel]) {
+            if self.currentRequestedVideoChannels != channels {
+                self.currentRequestedVideoChannels = channels
+
+                self.context.setRequestedVideoChannels(channels.map { channel -> OngoingGroupCallRequestedVideoChannel in
+                    let mappedMinQuality: OngoingGroupCallRequestedVideoQuality
+                    switch channel.minQuality {
+                    case .thumbnail:
+                        mappedMinQuality = .thumbnail
+                    case .medium:
+                        mappedMinQuality = .medium
+                    case .full:
+                        mappedMinQuality = .full
+                    }
+                    let mappedMaxQuality: OngoingGroupCallRequestedVideoQuality
+                    switch channel.maxQuality {
+                    case .thumbnail:
+                        mappedMaxQuality = .thumbnail
+                    case .medium:
+                        mappedMaxQuality = .medium
+                    case .full:
+                        mappedMaxQuality = .full
+                    }
+                    return OngoingGroupCallRequestedVideoChannel(
+                        audioSsrc: channel.audioSsrc,
+                        endpointId: channel.endpointId,
+                        ssrcGroups: channel.ssrcGroups.map { group in
+                            return OngoingGroupCallSsrcGroup(
+                                semantics: group.semantics,
+                                ssrcs: group.ssrcs.map { $0 as NSNumber })
+                        },
+                        minQuality: mappedMinQuality,
+                        maxQuality: mappedMaxQuality
+                    )
+                })
             }
-            self.context.addParticipants(participants.map { participant -> OngoingGroupCallParticipantDescription in
-                return OngoingGroupCallParticipantDescription(audioSsrc: participant.0, jsonParams: participant.1)
-            })
         }
         
         func stop() {
@@ -317,6 +547,11 @@ public final class OngoingGroupCallContext {
             self.isMuted.set(isMuted)
             self.context.setIsMuted(isMuted)
         }
+
+        func setIsNoiseSuppressionEnabled(_ isNoiseSuppressionEnabled: Bool) {
+            self.isNoiseSuppressionEnabled.set(isNoiseSuppressionEnabled)
+            self.context.setIsNoiseSuppressionEnabled(isNoiseSuppressionEnabled)
+        }
         
         func requestVideo(_ capturer: OngoingCallVideoCapturer?) {
             let queue = self.queue
@@ -350,79 +585,149 @@ public final class OngoingGroupCallContext {
             self.context.switchAudioOutput(deviceId)
         }
         
-        func makeIncomingVideoView(source: UInt32, completion: @escaping (OngoingCallContextPresentationCallVideoView?) -> Void) {
-            self.context.makeIncomingVideoView(withSsrc: source, completion: { view in
-                if let view = view {
+        func makeIncomingVideoView(endpointId: String, requestClone: Bool, completion: @escaping (OngoingCallContextPresentationCallVideoView?, OngoingCallContextPresentationCallVideoView?) -> Void) {
+            self.context.makeIncomingVideoView(withEndpointId: endpointId, requestClone: requestClone, completion: { mainView, cloneView in
+                if let mainView = mainView {
                     #if os(iOS)
-                    completion(OngoingCallContextPresentationCallVideoView(
-                        view: view,
-                        setOnFirstFrameReceived: { [weak view] f in
-                            view?.setOnFirstFrameReceived(f)
+                    let mainVideoView = OngoingCallContextPresentationCallVideoView(
+                        view: mainView,
+                        setOnFirstFrameReceived: { [weak mainView] f in
+                            mainView?.setOnFirstFrameReceived(f)
                         },
-                        getOrientation: { [weak view] in
-                            if let view = view {
-                                return OngoingCallVideoOrientation(view.orientation)
+                        getOrientation: { [weak mainView] in
+                            if let mainView = mainView {
+                                return OngoingCallVideoOrientation(mainView.orientation)
                             } else {
                                 return .rotation0
                             }
                         },
-                        getAspect: { [weak view] in
-                            if let view = view {
-                                return view.aspect
+                        getAspect: { [weak mainView] in
+                            if let mainView = mainView {
+                                return mainView.aspect
                             } else {
                                 return 0.0
                             }
                         },
-                        setOnOrientationUpdated: { [weak view] f in
-                            view?.setOnOrientationUpdated { value, aspect in
+                        setOnOrientationUpdated: { [weak mainView] f in
+                            mainView?.setOnOrientationUpdated { value, aspect in
                                 f?(OngoingCallVideoOrientation(value), aspect)
                             }
                         },
-                        setOnIsMirroredUpdated: { [weak view] f in
-                            view?.setOnIsMirroredUpdated { value in
+                        setOnIsMirroredUpdated: { [weak mainView] f in
+                            mainView?.setOnIsMirroredUpdated { value in
                                 f?(value)
                             }
+                        },
+                        updateIsEnabled: { [weak mainView] value in
+                            mainView?.updateIsEnabled(value)
                         }
-                    ))
+                    )
+                    var cloneVideoView: OngoingCallContextPresentationCallVideoView?
+                    if let cloneView = cloneView {
+                        cloneVideoView = OngoingCallContextPresentationCallVideoView(
+                            view: cloneView,
+                            setOnFirstFrameReceived: { [weak cloneView] f in
+                                cloneView?.setOnFirstFrameReceived(f)
+                            },
+                            getOrientation: { [weak cloneView] in
+                                if let cloneView = cloneView {
+                                    return OngoingCallVideoOrientation(cloneView.orientation)
+                                } else {
+                                    return .rotation0
+                                }
+                            },
+                            getAspect: { [weak cloneView] in
+                                if let cloneView = cloneView {
+                                    return cloneView.aspect
+                                } else {
+                                    return 0.0
+                                }
+                            },
+                            setOnOrientationUpdated: { [weak cloneView] f in
+                                cloneView?.setOnOrientationUpdated { value, aspect in
+                                    f?(OngoingCallVideoOrientation(value), aspect)
+                                }
+                            },
+                            setOnIsMirroredUpdated: { [weak cloneView] f in
+                                cloneView?.setOnIsMirroredUpdated { value in
+                                    f?(value)
+                                }
+                            },
+                            updateIsEnabled: { [weak cloneView] value in
+                                cloneView?.updateIsEnabled(value)
+                            }
+                        )
+                    }
+                    completion(mainVideoView, cloneVideoView)
                     #else
-                    completion(OngoingCallContextPresentationCallVideoView(
-                        view: view,
-                        setOnFirstFrameReceived: { [weak view] f in
-                            view?.setOnFirstFrameReceived(f)
+                    let mainVideoView = OngoingCallContextPresentationCallVideoView(
+                        view: mainView,
+                        setOnFirstFrameReceived: { [weak mainView] f in
+                            mainView?.setOnFirstFrameReceived(f)
                         },
-                        getOrientation: { [weak view] in
-                            if let view = view {
-                                return OngoingCallVideoOrientation(view.orientation)
+                        getOrientation: { [weak mainView] in
+                            if let mainView = mainView {
+                                return OngoingCallVideoOrientation(mainView.orientation)
                             } else {
                                 return .rotation0
                             }
                         },
-                        getAspect: { [weak view] in
-                            if let view = view {
-                                return view.aspect
+                        getAspect: { [weak mainView] in
+                            if let mainView = mainView {
+                                return mainView.aspect
                             } else {
                                 return 0.0
                             }
                         },
-                        setOnOrientationUpdated: { [weak view] f in
-                            view?.setOnOrientationUpdated { value, aspect in
+                        setOnOrientationUpdated: { [weak mainView] f in
+                            mainView?.setOnOrientationUpdated { value, aspect in
                                 f?(OngoingCallVideoOrientation(value), aspect)
                             }
-                        }, setVideoContentMode: { [weak view] mode in
-                            view?.setVideoContentMode(mode)
+                        }, setVideoContentMode: { [weak mainView] mode in
+                            mainView?.setVideoContentMode(mode)
                         },
-                        setOnIsMirroredUpdated: { [weak view] f in
-                            view?.setOnIsMirroredUpdated { value in
+                        setOnIsMirroredUpdated: { [weak mainView] f in
+                            mainView?.setOnIsMirroredUpdated { value in
                                 f?(value)
                             }
+                        }, setIsPaused: { [weak mainView] paused in
+                            mainView?.setIsPaused(paused)
+                        }, renderToSize: { [weak mainView] size, animated in
+                            mainView?.render(to: size, animated: animated)
                         }
-                    ))
+                    )
+                    completion(mainVideoView, nil)
                     #endif
                 } else {
-                    completion(nil)
+                    completion(nil, nil)
                 }
             })
         }
+
+        func video(endpointId: String) -> Signal<OngoingGroupCallContext.VideoFrameData, NoError> {
+            let queue = self.queue
+            return Signal { [weak self] subscriber in
+                let disposable = MetaDisposable()
+
+                queue.async {
+                    guard let strongSelf = self else {
+                        return
+                    }
+                    let innerDisposable = strongSelf.context.addVideoOutput(withEndpointId: endpointId) { videoFrameData in
+                        subscriber.putNext(OngoingGroupCallContext.VideoFrameData(frameData: videoFrameData))
+                    }
+                    disposable.set(ActionDisposable {
+                        innerDisposable.dispose()
+                    })
+                }
+
+                return disposable
+            }
+        }
+
+        func addExternalAudioData(data: Data) {
+            self.context.addExternalAudioData(data)
+        }
     }
     
     private let queue = Queue()
@@ -475,12 +780,12 @@ public final class OngoingGroupCallContext {
             return disposable
         }
     }
-    
-    public var videoSources: Signal<Set<UInt32>, NoError> {
+
+    public var isNoiseSuppressionEnabled: Signal<Bool, NoError> {
         return Signal { subscriber in
             let disposable = MetaDisposable()
             self.impl.with { impl in
-                disposable.set(impl.videoSources.get().start(next: { value in
+                disposable.set(impl.isNoiseSuppressionEnabled.get().start(next: { value in
                     subscriber.putNext(value)
                 }))
             }
@@ -488,10 +793,10 @@ public final class OngoingGroupCallContext {
         }
     }
     
-    public init(inputDeviceId: String = "", outputDeviceId: String = "", video: OngoingCallVideoCapturer?, participantDescriptionsRequired: @escaping (Set<UInt32>) -> Void, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void) {
+    public init(inputDeviceId: String = "", outputDeviceId: String = "", video: OngoingCallVideoCapturer?, requestMediaChannelDescriptions: @escaping (Set<UInt32>, @escaping ([MediaChannelDescription]) -> Void) -> Disposable, audioStreamData: AudioStreamData?, rejoinNeeded: @escaping () -> Void, outgoingAudioBitrateKbit: Int32?, videoContentType: VideoContentType, enableNoiseSuppression: Bool) {
         let queue = self.queue
         self.impl = QueueLocalObject(queue: queue, generate: {
-            return Impl(queue: queue, inputDeviceId: inputDeviceId, outputDeviceId: outputDeviceId, video: video, participantDescriptionsRequired: participantDescriptionsRequired, audioStreamData: audioStreamData, rejoinNeeded: rejoinNeeded)
+            return Impl(queue: queue, inputDeviceId: inputDeviceId, outputDeviceId: outputDeviceId, video: video, requestMediaChannelDescriptions: requestMediaChannelDescriptions, audioStreamData: audioStreamData, rejoinNeeded: rejoinNeeded, outgoingAudioBitrateKbit: outgoingAudioBitrateKbit, videoContentType: videoContentType, enableNoiseSuppression: enableNoiseSuppression)
         })
     }
     
@@ -506,6 +811,12 @@ public final class OngoingGroupCallContext {
             impl.setIsMuted(isMuted)
         }
     }
+
+    public func setIsNoiseSuppressionEnabled(_ isNoiseSuppressionEnabled: Bool) {
+        self.impl.with { impl in
+            impl.setIsNoiseSuppressionEnabled(isNoiseSuppressionEnabled)
+        }
+    }
     
     public func requestVideo(_ capturer: OngoingCallVideoCapturer?) {
         self.impl.with { impl in
@@ -529,9 +840,9 @@ public final class OngoingGroupCallContext {
             impl.switchAudioOutput(deviceId)
         }
     }
-    public func setJoinResponse(payload: String, participants: [(UInt32, String?)]) {
+    public func setJoinResponse(payload: String) {
         self.impl.with { impl in
-            impl.setJoinResponse(payload: payload, participants: participants)
+            impl.setJoinResponse(payload: payload)
         }
     }
     
@@ -546,22 +857,22 @@ public final class OngoingGroupCallContext {
             impl.removeSsrcs(ssrcs: ssrcs)
         }
     }
+
+    public func removeIncomingVideoSource(_ ssrc: UInt32) {
+        self.impl.with { impl in
+            impl.removeIncomingVideoSource(ssrc)
+        }
+    }
     
     public func setVolume(ssrc: UInt32, volume: Double) {
         self.impl.with { impl in
             impl.setVolume(ssrc: ssrc, volume: volume)
         }
     }
-    
-    public func setFullSizeVideoSsrc(ssrc: UInt32?) {
+
+    public func setRequestedVideoChannels(_ channels: [VideoChannel]) {
         self.impl.with { impl in
-            impl.setFullSizeVideoSsrc(ssrc: ssrc)
-        }
-    }
-    
-    public func addParticipants(participants: [(UInt32, String?)]) {
-        self.impl.with { impl in
-            impl.addParticipants(participants: participants)
+            impl.setRequestedVideoChannels(channels)
         }
     }
     
@@ -571,9 +882,27 @@ public final class OngoingGroupCallContext {
         }
     }
     
-    public func makeIncomingVideoView(source: UInt32, completion: @escaping (OngoingCallContextPresentationCallVideoView?) -> Void) {
+    public func makeIncomingVideoView(endpointId: String, requestClone: Bool, completion: @escaping (OngoingCallContextPresentationCallVideoView?, OngoingCallContextPresentationCallVideoView?) -> Void) {
         self.impl.with { impl in
-            impl.makeIncomingVideoView(source: source, completion: completion)
+            impl.makeIncomingVideoView(endpointId: endpointId, requestClone: requestClone, completion: completion)
+        }
+    }
+
+    public func video(endpointId: String) -> Signal<OngoingGroupCallContext.VideoFrameData, NoError> {
+        return Signal { subscriber in
+            let disposable = MetaDisposable()
+            self.impl.with { impl in
+                disposable.set(impl.video(endpointId: endpointId).start(next: { value in
+                    subscriber.putNext(value)
+                }))
+            }
+            return disposable
+        }
+    }
+
+    public func addExternalAudioData(data: Data) {
+        self.impl.with { impl in
+            impl.addExternalAudioData(data: data)
         }
     }
 }
diff --git a/submodules/TelegramVoip/Sources/IpcGroupCallContext.swift b/submodules/TelegramVoip/Sources/IpcGroupCallContext.swift
new file mode 100644
index 0000000000..b8b123abbc
--- /dev/null
+++ b/submodules/TelegramVoip/Sources/IpcGroupCallContext.swift
@@ -0,0 +1,792 @@
+import Foundation
+import SwiftSignalKit
+import CoreMedia
+import ImageIO
+
+private struct PayloadDescription: Codable {
+    var id: UInt32
+    var timestamp: Int32
+}
+
+private struct JoinPayload: Codable {
+    var id: UInt32
+    var string: String
+}
+
+private struct JoinResponsePayload: Codable {
+    var id: UInt32
+    var string: String
+}
+
+private struct KeepaliveInfo: Codable {
+    var id: UInt32
+    var timestamp: Int32
+}
+
+private struct CutoffPayload: Codable {
+    var id: UInt32
+    var timestamp: Int32
+}
+
+private let checkInterval: Double = 0.2
+private let keepaliveTimeout: Double = 2.0
+
+private func payloadDescriptionPath(basePath: String) -> String {
+    return basePath + "/currentPayloadDescription.json"
+}
+
+private func joinPayloadPath(basePath: String) -> String {
+    return basePath + "/joinPayload.json"
+}
+
+private func joinResponsePayloadPath(basePath: String) -> String {
+    return basePath + "/joinResponsePayload.json"
+}
+
+private func keepaliveInfoPath(basePath: String) -> String {
+    return basePath + "/keepaliveInfo.json"
+}
+
+private func cutoffPayloadPath(basePath: String) -> String {
+    return basePath + "/cutoffPayload.json"
+}
+
+private func broadcastAppSocketPath(basePath: String) -> String {
+    return basePath + "/0"
+}
+
+private final class FdReadConnection {
+    private final class PendingData {
+        var data: Data
+        var offset: Int = 0
+
+        init(count: Int) {
+            self.data = Data(bytesNoCopy: malloc(count)!, count: count, deallocator: .free)
+        }
+    }
+
+    private let queue: Queue
+    let fd: Int32
+    private let didRead: ((Data) -> Void)?
+    private let channel: DispatchSourceRead
+
+    private var currendData: PendingData?
+
+    init(queue: Queue, fd: Int32, didRead: ((Data) -> Void)?) {
+        assert(queue.isCurrent())
+        self.queue = queue
+        self.fd = fd
+        self.didRead = didRead
+
+        self.channel = DispatchSource.makeReadSource(fileDescriptor: fd, queue: queue.queue)
+        self.channel.setEventHandler(handler: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+
+            while true {
+                if let currendData = strongSelf.currendData {
+                    let offset = currendData.offset
+                    let count = currendData.data.count - offset
+                    let bytesRead = currendData.data.withUnsafeMutableBytes { bytes -> Int in
+                        return Darwin.read(fd, bytes.baseAddress!.advanced(by: offset), min(8129, count))
+                    }
+                    if bytesRead <= 0 {
+                        break
+                    } else {
+                        currendData.offset += bytesRead
+                        if currendData.offset == currendData.data.count {
+                            strongSelf.currendData = nil
+                            strongSelf.didRead?(currendData.data)
+                        }
+                    }
+                } else {
+                    var length: Int32 = 0
+                    let bytesRead = read(fd, &length, 4)
+                    if bytesRead < 0 {
+                        break
+                    } else {
+                        assert(bytesRead == 4)
+                        assert(length > 0 && length <= 30 * 1024 * 1024)
+                        strongSelf.currendData = PendingData(count: Int(length))
+                    }
+                }
+            }
+        })
+        self.channel.resume()
+    }
+
+    deinit {
+        assert(self.queue.isCurrent())
+        self.channel.cancel()
+    }
+}
+
+private final class FdWriteConnection {
+    private final class PendingData {
+        let data: Data
+        var didWriteHeader: Bool = false
+        var offset: Int = 0
+
+        init(data: Data) {
+            self.data = data
+        }
+    }
+
+    private let queue: Queue
+    let fd: Int32
+    private let channel: DispatchSourceWrite
+    private var isResumed = false
+
+    private let bufferSize: Int
+    private let buffer: UnsafeMutableRawPointer
+
+    private var currentData: PendingData?
+    private var nextDataList: [Data] = []
+
+    init(queue: Queue, fd: Int32) {
+        assert(queue.isCurrent())
+        self.queue = queue
+        self.fd = fd
+
+        self.bufferSize = 8192
+        self.buffer = malloc(self.bufferSize)
+
+        self.channel = DispatchSource.makeWriteSource(fileDescriptor: fd, queue: queue.queue)
+        self.channel.setEventHandler(handler: { [weak self] in
+            guard let strongSelf = self else {
+                return
+            }
+
+            while true {
+                if let currentData = strongSelf.currentData {
+                    if !currentData.didWriteHeader {
+                        var length: Int32 = Int32(currentData.data.count)
+                        let writtenBytes = Darwin.write(fd, &length, 4)
+                        if writtenBytes > 0 {
+                            assert(writtenBytes == 4)
+                            currentData.didWriteHeader = true
+                        } else {
+                            strongSelf.channel.suspend()
+                            strongSelf.isResumed = false
+                            break
+                        }
+                    } else {
+                        let offset = currentData.offset
+                        let count = currentData.data.count - offset
+                        let writtenBytes = currentData.data.withUnsafeBytes { bytes -> Int in
+                            return Darwin.write(fd, bytes.baseAddress!.advanced(by: offset), min(count, strongSelf.bufferSize))
+                        }
+                        if writtenBytes > 0 {
+                            currentData.offset += writtenBytes
+                            if currentData.offset == currentData.data.count {
+                                strongSelf.currentData = nil
+
+                                if !strongSelf.nextDataList.isEmpty {
+                                    let nextData = strongSelf.nextDataList.removeFirst()
+                                    strongSelf.currentData = PendingData(data: nextData)
+                                } else {
+                                    strongSelf.channel.suspend()
+                                    strongSelf.isResumed = false
+                                    break
+                                }
+                            }
+                        } else {
+                            strongSelf.channel.suspend()
+                            strongSelf.isResumed = false
+                            break
+                        }
+                    }
+                } else {
+                    strongSelf.channel.suspend()
+                    strongSelf.isResumed = false
+                    break
+                }
+            }
+        })
+    }
+
+    deinit {
+        assert(self.queue.isCurrent())
+
+        if !self.isResumed {
+            self.channel.resume()
+        }
+        self.channel.cancel()
+
+        free(self.buffer)
+    }
+
+    func addData(data: Data) {
+        if self.currentData == nil {
+            self.currentData = PendingData(data: data)
+        } else {
+            var totalBytes = 0
+            for data in self.nextDataList {
+                totalBytes += data.count
+            }
+            if totalBytes < 1 * 1024 * 1024 {
+                self.nextDataList.append(data)
+            }
+        }
+
+        if !self.isResumed {
+            self.isResumed = true
+            self.channel.resume()
+        }
+    }
+}
+
+private final class NamedPipeReaderImpl {
+    private let queue: Queue
+    private var connection: FdReadConnection?
+    
+    init(queue: Queue, path: String, didRead: @escaping (Data) -> Void) {
+        self.queue = queue
+
+        unlink(path)
+        mkfifo(path, 0o666)
+        let fd = open(path, O_RDONLY | O_NONBLOCK, S_IRUSR | S_IWUSR)
+        if fd != -1 {
+            self.connection = FdReadConnection(queue: self.queue, fd: fd, didRead: { data in
+                didRead(data)
+            })
+        }
+    }
+}
+
+private final class NamedPipeReader {
+    private let queue = Queue()
+    let impl: QueueLocalObject<NamedPipeReaderImpl>
+
+    init(path: String, didRead: @escaping (Data) -> Void) {
+        let queue = self.queue
+        self.impl = QueueLocalObject(queue: queue, generate: {
+            return NamedPipeReaderImpl(queue: queue, path: path, didRead: didRead)
+        })
+    }
+}
+
+private final class NamedPipeWriterImpl {
+    private let queue: Queue
+    private var connection: FdWriteConnection?
+
+    init(queue: Queue, path: String) {
+        self.queue = queue
+
+        let fd = open(path, O_WRONLY | O_NONBLOCK, S_IRUSR | S_IWUSR)
+        if fd != -1 {
+            self.connection = FdWriteConnection(queue: self.queue, fd: fd)
+        }
+    }
+
+    func addData(data: Data) {
+        guard let connection = self.connection else {
+            return
+        }
+        connection.addData(data: data)
+    }
+}
+
+private final class NamedPipeWriter {
+    private let queue = Queue()
+    private let impl: QueueLocalObject<NamedPipeWriterImpl>
+
+    init(path: String) {
+        let queue = self.queue
+        self.impl = QueueLocalObject(queue: queue, generate: {
+            return NamedPipeWriterImpl(queue: queue, path: path)
+        })
+    }
+
+    func addData(data: Data) {
+        self.impl.with { impl in
+            impl.addData(data: data)
+        }
+    }
+}
+
+private final class MappedFile {
+    let path: String
+    private var handle: Int32
+    private var currentSize: Int
+    private(set) var memory: UnsafeMutableRawPointer
+
+    init?(path: String, createIfNotExists: Bool) {
+        self.path = path
+
+        var flags: Int32 = O_RDWR | O_APPEND
+        if createIfNotExists {
+            flags |= O_CREAT
+        }
+        self.handle = open(path, flags, S_IRUSR | S_IWUSR)
+
+        if self.handle < 0 {
+            return nil
+        }
+
+        var value = stat()
+        stat(path, &value)
+        self.currentSize = Int(value.st_size)
+
+        self.memory = mmap(nil, self.currentSize, PROT_READ | PROT_WRITE, MAP_SHARED, self.handle, 0)
+    }
+
+    deinit {
+        munmap(self.memory, self.currentSize)
+        close(self.handle)
+    }
+
+    var size: Int {
+        get {
+            return self.currentSize
+        } set(value) {
+            if value != self.currentSize {
+                munmap(self.memory, self.currentSize)
+                ftruncate(self.handle, off_t(value))
+                self.currentSize = value
+                self.memory = mmap(nil, self.currentSize, PROT_READ | PROT_WRITE, MAP_SHARED, self.handle, 0)
+            }
+        }
+    }
+
+    func synchronize() {
+        msync(self.memory, self.currentSize, MS_ASYNC)
+    }
+
+    func write(at range: Range<Int>, from data: UnsafeRawPointer) {
+        memcpy(self.memory.advanced(by: range.lowerBound), data, range.count)
+    }
+
+    func read(at range: Range<Int>, to data: UnsafeMutableRawPointer) {
+        memcpy(data, self.memory.advanced(by: range.lowerBound), range.count)
+    }
+
+    func clear() {
+        memset(self.memory, 0, self.currentSize)
+    }
+}
+
+public final class IpcGroupCallBufferAppContext {
+    private let basePath: String
+    private var audioServer: NamedPipeReader?
+
+    private let id: UInt32
+
+    private let isActivePromise = ValuePromise<Bool>(false, ignoreRepeated: true)
+    public var isActive: Signal<Bool, NoError> {
+        return self.isActivePromise.get()
+    }
+    private var isActiveCheckTimer: SwiftSignalKit.Timer?
+
+    private let framesPipe = ValuePipe<(CVPixelBuffer, CGImagePropertyOrientation)>()
+    public var frames: Signal<(CVPixelBuffer, CGImagePropertyOrientation), NoError> {
+        return self.framesPipe.signal()
+    }
+
+    private let audioDataPipe = ValuePipe<Data>()
+    public var audioData: Signal<Data, NoError> {
+        return self.audioDataPipe.signal()
+    }
+
+    private var framePollTimer: SwiftSignalKit.Timer?
+    private var mappedFile: MappedFile?
+
+    private var callActiveInfoTimer: SwiftSignalKit.Timer?
+
+    public init(basePath: String) {
+        self.basePath = basePath
+        let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil)
+
+        self.id = UInt32.random(in: 0 ..< UInt32.max)
+
+        let dataPath = broadcastAppSocketPath(basePath: basePath) + "-data-\(self.id)"
+        let audioDataPath = broadcastAppSocketPath(basePath: basePath) + "-audio-\(self.id)"
+
+        if let mappedFile = MappedFile(path: dataPath, createIfNotExists: true) {
+            self.mappedFile = mappedFile
+            if mappedFile.size < 10 * 1024 * 1024 {
+                mappedFile.size = 10 * 1024 * 1024
+            }
+        }
+
+        let audioDataPipe = self.audioDataPipe
+        self.audioServer = NamedPipeReader(path: audioDataPath, didRead: { data in
+            audioDataPipe.putNext(data)
+        })
+
+        let framePollTimer = SwiftSignalKit.Timer(timeout: 1.0 / 30.0, repeat: true, completion: { [weak self] in
+            guard let strongSelf = self, let mappedFile = strongSelf.mappedFile else {
+                return
+            }
+
+            var orientationValue: Int32 = 0
+            mappedFile.read(at: 0 ..< 4, to: &orientationValue)
+            let orientation = CGImagePropertyOrientation(rawValue: UInt32(bitPattern: orientationValue)) ?? .up
+            let data = Data(bytesNoCopy: mappedFile.memory.advanced(by: 4), count: mappedFile.size - 4, deallocator: .none)
+            if let frame = deserializePixelBuffer(data: data) {
+                strongSelf.framesPipe.putNext((frame, orientation))
+            }
+        }, queue: .mainQueue())
+        self.framePollTimer = framePollTimer
+        framePollTimer.start()
+
+        self.updateCallIsActive()
+
+        let callActiveInfoTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
+            self?.updateCallIsActive()
+        }, queue: .mainQueue())
+        self.callActiveInfoTimer = callActiveInfoTimer
+        callActiveInfoTimer.start()
+
+        let isActiveCheckTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
+            self?.updateKeepaliveInfo()
+        }, queue: .mainQueue())
+        self.isActiveCheckTimer = isActiveCheckTimer
+        isActiveCheckTimer.start()
+    }
+
+    deinit {
+        self.framePollTimer?.invalidate()
+        self.callActiveInfoTimer?.invalidate()
+        self.isActiveCheckTimer?.invalidate()
+        if let mappedFile = self.mappedFile {
+            self.mappedFile = nil
+            let _ = try? FileManager.default.removeItem(atPath: mappedFile.path)
+        }
+    }
+
+    private func updateCallIsActive() {
+        let timestamp = Int32(Date().timeIntervalSince1970)
+        let payloadDescription = PayloadDescription(
+            id: self.id,
+            timestamp: timestamp
+        )
+        guard let payloadDescriptionData = try? JSONEncoder().encode(payloadDescription) else {
+            return
+        }
+        guard let _ = try? payloadDescriptionData.write(to: URL(fileURLWithPath: payloadDescriptionPath(basePath: self.basePath)), options: .atomic) else {
+            return
+        }
+    }
+
+    private func updateKeepaliveInfo() {
+        let filePath = keepaliveInfoPath(basePath: self.basePath)
+        guard let keepaliveInfoData = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else {
+            return
+        }
+        guard let keepaliveInfo = try? JSONDecoder().decode(KeepaliveInfo.self, from: keepaliveInfoData) else {
+            return
+        }
+        if keepaliveInfo.id != self.id {
+            self.isActivePromise.set(false)
+            return
+        }
+        let timestamp = Int32(Date().timeIntervalSince1970)
+        if keepaliveInfo.timestamp < timestamp - Int32(keepaliveTimeout) {
+            self.isActivePromise.set(false)
+            return
+        }
+
+        self.isActivePromise.set(true)
+    }
+    
+    public func stopScreencast() {
+        let timestamp = Int32(Date().timeIntervalSince1970)
+        let cutoffPayload = CutoffPayload(
+            id: self.id,
+            timestamp: timestamp
+        )
+        guard let cutoffPayloadData = try? JSONEncoder().encode(cutoffPayload) else {
+            return
+        }
+        guard let _ = try? cutoffPayloadData.write(to: URL(fileURLWithPath: cutoffPayloadPath(basePath: self.basePath)), options: .atomic) else {
+            return
+        }
+    }
+}
+
+public final class IpcGroupCallBufferBroadcastContext {
+    public enum Status {
+        public enum FinishReason {
+            case screencastEnded
+            case callEnded
+            case error
+        }
+        case finished(FinishReason)
+    }
+
+    private let basePath: String
+    private let client: NamedPipeWriter
+    private var timer: SwiftSignalKit.Timer?
+
+    private let statusPromise = Promise<Status>()
+    public var status: Signal<Status, NoError> {
+        return self.statusPromise.get()
+    }
+
+    private var mappedFile: MappedFile?
+    private var currentId: UInt32?
+    private var audioClient: NamedPipeWriter?
+
+    private var callActiveInfoTimer: SwiftSignalKit.Timer?
+    private var keepaliveInfoTimer: SwiftSignalKit.Timer?
+    private var screencastCutoffTimer: SwiftSignalKit.Timer?
+    
+    public init(basePath: String) {
+        self.basePath = basePath
+        let _ = try? FileManager.default.createDirectory(atPath: basePath, withIntermediateDirectories: true, attributes: nil)
+
+        self.client = NamedPipeWriter(path: broadcastAppSocketPath(basePath: basePath))
+
+        let callActiveInfoTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
+            self?.updateCallIsActive()
+        }, queue: .mainQueue())
+        self.callActiveInfoTimer = callActiveInfoTimer
+        callActiveInfoTimer.start()
+        
+        let screencastCutoffTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
+            self?.updateScreencastCutoff()
+        }, queue: .mainQueue())
+        self.screencastCutoffTimer = screencastCutoffTimer
+        screencastCutoffTimer.start()
+    }
+
+    deinit {
+        self.endActiveIndication()
+
+        self.callActiveInfoTimer?.invalidate()
+        self.keepaliveInfoTimer?.invalidate()
+        self.screencastCutoffTimer?.invalidate()
+    }
+
+    private func updateScreencastCutoff() {
+        let filePath = cutoffPayloadPath(basePath: self.basePath)
+        guard let cutoffPayloadData = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else {
+            return
+        }
+        
+        guard let cutoffPayload = try? JSONDecoder().decode(CutoffPayload.self, from: cutoffPayloadData) else {
+            return
+        }
+        
+        let timestamp = Int32(Date().timeIntervalSince1970)
+        if let currentId = self.currentId, currentId == cutoffPayload.id && cutoffPayload.timestamp > timestamp - 10 {
+            self.statusPromise.set(.single(.finished(.screencastEnded)))
+            return
+        }
+    }
+    
+    private func updateCallIsActive() {
+        let filePath = payloadDescriptionPath(basePath: self.basePath)
+        guard let payloadDescriptionData = try? Data(contentsOf: URL(fileURLWithPath: filePath)) else {
+            self.statusPromise.set(.single(.finished(.error)))
+            return
+        }
+
+        guard let payloadDescription = try? JSONDecoder().decode(PayloadDescription.self, from: payloadDescriptionData) else {
+            self.statusPromise.set(.single(.finished(.error)))
+            return
+        }
+        let timestamp = Int32(Date().timeIntervalSince1970)
+        if payloadDescription.timestamp < timestamp - 4 {
+            self.statusPromise.set(.single(.finished(.callEnded)))
+            return
+        }
+
+        if let currentId = self.currentId {
+            if currentId != payloadDescription.id {
+                self.statusPromise.set(.single(.finished(.callEnded)))
+            }
+        } else {
+            self.currentId = payloadDescription.id
+
+            let dataPath = broadcastAppSocketPath(basePath: basePath) + "-data-\(payloadDescription.id)"
+            let audioDataPath = broadcastAppSocketPath(basePath: basePath) + "-audio-\(payloadDescription.id)"
+
+            if let mappedFile = MappedFile(path: dataPath, createIfNotExists: false) {
+                self.mappedFile = mappedFile
+                if mappedFile.size < 10 * 1024 * 1024 {
+                    mappedFile.size = 10 * 1024 * 1024
+                }
+            }
+
+            self.audioClient = NamedPipeWriter(path: audioDataPath)
+
+            self.writeKeepaliveInfo()
+
+            let keepaliveInfoTimer = SwiftSignalKit.Timer(timeout: 1.0, repeat: true, completion: { [weak self] in
+                self?.writeKeepaliveInfo()
+            }, queue: .mainQueue())
+            self.keepaliveInfoTimer = keepaliveInfoTimer
+            keepaliveInfoTimer.start()
+        }
+    }
+
+    public func setCurrentFrame(data: Data, orientation: CGImagePropertyOrientation) {
+        if let mappedFile = self.mappedFile, mappedFile.size >= data.count {
+            let _ = data.withUnsafeBytes { bytes in
+                var orientationValue = Int32(bitPattern: orientation.rawValue)
+                memmove(mappedFile.memory, &orientationValue, 4)
+                memcpy(mappedFile.memory.advanced(by: 4), bytes.baseAddress!, data.count)
+            }
+        }
+    }
+
+    public func writeAudioData(data: Data) {
+        self.audioClient?.addData(data: data)
+    }
+
+    private func writeKeepaliveInfo() {
+        guard let currentId = self.currentId else {
+            preconditionFailure()
+        }
+        let keepaliveInfo = KeepaliveInfo(
+            id: currentId,
+            timestamp: Int32(Date().timeIntervalSince1970)
+        )
+        guard let keepaliveInfoData = try? JSONEncoder().encode(keepaliveInfo) else {
+            preconditionFailure()
+        }
+        guard let _ = try? keepaliveInfoData.write(to: URL(fileURLWithPath: keepaliveInfoPath(basePath: self.basePath)), options: .atomic) else {
+            preconditionFailure()
+        }
+    }
+
+    private func endActiveIndication() {
+        let _ = try? FileManager.default.removeItem(atPath: keepaliveInfoPath(basePath: self.basePath))
+    }
+}
+
+public func serializePixelBuffer(buffer: CVPixelBuffer) -> Data? {
+    let pixelFormat = CVPixelBufferGetPixelFormatType(buffer)
+    switch pixelFormat {
+    case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+        let status = CVPixelBufferLockBaseAddress(buffer, .readOnly)
+        if status != kCVReturnSuccess {
+            return nil
+        }
+        defer {
+            CVPixelBufferUnlockBaseAddress(buffer, .readOnly)
+        }
+
+        let width = CVPixelBufferGetWidth(buffer)
+        let height = CVPixelBufferGetHeight(buffer)
+
+        guard let yPlane = CVPixelBufferGetBaseAddressOfPlane(buffer, 0) else {
+            return nil
+        }
+        let yStride = CVPixelBufferGetBytesPerRowOfPlane(buffer, 0)
+        let yPlaneSize = yStride * height
+
+        guard let uvPlane = CVPixelBufferGetBaseAddressOfPlane(buffer, 1) else {
+            return nil
+        }
+        let uvStride = CVPixelBufferGetBytesPerRowOfPlane(buffer, 1)
+        let uvPlaneSize = uvStride * (height / 2)
+
+        let headerSize: Int = 4 + 4 + 4 + 4 + 4
+
+        let dataSize = headerSize + yPlaneSize + uvPlaneSize
+        let resultBytes = malloc(dataSize)!
+
+        var pixelFormatValue = pixelFormat
+        memcpy(resultBytes.advanced(by: 0), &pixelFormatValue, 4)
+        var widthValue = Int32(width)
+        memcpy(resultBytes.advanced(by: 4), &widthValue, 4)
+        var heightValue = Int32(height)
+        memcpy(resultBytes.advanced(by: 4 + 4), &heightValue, 4)
+        var yStrideValue = Int32(yStride)
+        memcpy(resultBytes.advanced(by: 4 + 4 + 4), &yStrideValue, 4)
+        var uvStrideValue = Int32(uvStride)
+        memcpy(resultBytes.advanced(by: 4 + 4 + 4 + 4), &uvStrideValue, 4)
+
+        memcpy(resultBytes.advanced(by: headerSize), yPlane, yPlaneSize)
+        memcpy(resultBytes.advanced(by: headerSize + yPlaneSize), uvPlane, uvPlaneSize)
+
+        return Data(bytesNoCopy: resultBytes, count: dataSize, deallocator: .free)
+    default:
+        return nil
+    }
+}
+
+public func deserializePixelBuffer(data: Data) -> CVPixelBuffer? {
+    if data.count < 4 + 4 + 4 + 4 {
+        return nil
+    }
+    let count = data.count
+    return data.withUnsafeBytes { bytes -> CVPixelBuffer? in
+        let dataBytes = bytes.baseAddress!
+
+        var pixelFormat: UInt32 = 0
+        memcpy(&pixelFormat, dataBytes.advanced(by: 0), 4)
+
+        switch pixelFormat {
+        case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+            break
+        default:
+            return nil
+        }
+
+        var width: Int32 = 0
+        memcpy(&width, dataBytes.advanced(by: 4), 4)
+        var height: Int32 = 0
+        memcpy(&height, dataBytes.advanced(by: 4 + 4), 4)
+        var yStride: Int32 = 0
+        memcpy(&yStride, dataBytes.advanced(by: 4 + 4 + 4), 4)
+        var uvStride: Int32 = 0
+        memcpy(&uvStride, dataBytes.advanced(by: 4 + 4 + 4 + 4), 4)
+
+        if width < 0 || width > 8192 {
+            return nil
+        }
+        if height < 0 || height > 8192 {
+            return nil
+        }
+
+        let headerSize: Int = 4 + 4 + 4 + 4 + 4
+
+        let yPlaneSize = Int(yStride * height)
+        let uvPlaneSize = Int(uvStride * height / 2)
+        let dataSize = headerSize + yPlaneSize + uvPlaneSize
+
+        if dataSize > count {
+            return nil
+        }
+
+        var buffer: CVPixelBuffer? = nil
+        CVPixelBufferCreate(nil, Int(width), Int(height), pixelFormat, nil, &buffer)
+        if let buffer = buffer {
+            let status = CVPixelBufferLockBaseAddress(buffer, [])
+            if status != kCVReturnSuccess {
+                return nil
+            }
+            defer {
+                CVPixelBufferUnlockBaseAddress(buffer, [])
+            }
+
+            guard let destYPlane = CVPixelBufferGetBaseAddressOfPlane(buffer, 0) else {
+                return nil
+            }
+            let destYStride = CVPixelBufferGetBytesPerRowOfPlane(buffer, 0)
+            if destYStride != Int(yStride) {
+                return nil
+            }
+
+            guard let destUvPlane = CVPixelBufferGetBaseAddressOfPlane(buffer, 1) else {
+                return nil
+            }
+            let destUvStride = CVPixelBufferGetBytesPerRowOfPlane(buffer, 1)
+            if destUvStride != Int(uvStride) {
+                return nil
+            }
+
+            memcpy(destYPlane, dataBytes.advanced(by: headerSize), yPlaneSize)
+            memcpy(destUvPlane, dataBytes.advanced(by: headerSize + yPlaneSize), uvPlaneSize)
+
+            return buffer
+        } else {
+            return nil
+        }
+    }
+}
diff --git a/submodules/TelegramVoip/Sources/OngoingCallContext.swift b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
index 332f932042..f46761cea9 100644
--- a/submodules/TelegramVoip/Sources/OngoingCallContext.swift
+++ b/submodules/TelegramVoip/Sources/OngoingCallContext.swift
@@ -334,55 +334,144 @@ extension OngoingCallThreadLocalContext: OngoingCallThreadLocalContextProtocol {
 
 public final class OngoingCallVideoCapturer {
     internal let impl: OngoingCallThreadLocalContextVideoCapturer
+
+    private let isActivePromise = ValuePromise<Bool>(true, ignoreRepeated: true)
+    public var isActive: Signal<Bool, NoError> {
+        return self.isActivePromise.get()
+    }
     
-    public init(keepLandscape: Bool = false) {
-        self.impl = OngoingCallThreadLocalContextVideoCapturer(deviceId: "", keepLandscape: keepLandscape)
+    public init(keepLandscape: Bool = false, isCustom: Bool = false) {
+        if isCustom {
+            self.impl = OngoingCallThreadLocalContextVideoCapturer.withExternalSampleBufferProvider()
+        } else {
+            self.impl = OngoingCallThreadLocalContextVideoCapturer(deviceId: "", keepLandscape: keepLandscape)
+        }
+        let isActivePromise = self.isActivePromise
+        self.impl.setOnIsActiveUpdated({ value in
+            isActivePromise.set(value)
+        })
     }
     
     public func switchVideoInput(isFront: Bool) {
         self.impl.switchVideoInput(isFront ? "" : "back")
     }
     
-    public func makeOutgoingVideoView(completion: @escaping (OngoingCallContextPresentationCallVideoView?) -> Void) {
-        self.impl.makeOutgoingVideoView { view in
-            if let view = view {
-                completion(OngoingCallContextPresentationCallVideoView(
-                    view: view,
-                    setOnFirstFrameReceived: { [weak view] f in
-                        view?.setOnFirstFrameReceived(f)
+    public func makeOutgoingVideoView(requestClone: Bool, completion: @escaping (OngoingCallContextPresentationCallVideoView?, OngoingCallContextPresentationCallVideoView?) -> Void) {
+        self.impl.makeOutgoingVideoView(requestClone, completion: { mainView, cloneView in
+            if let mainView = mainView {
+                let mainVideoView = OngoingCallContextPresentationCallVideoView(
+                    view: mainView,
+                    setOnFirstFrameReceived: { [weak mainView] f in
+                        mainView?.setOnFirstFrameReceived(f)
                     },
-                    getOrientation: { [weak view] in
-                        if let view = view {
-                            return OngoingCallVideoOrientation(view.orientation)
+                    getOrientation: { [weak mainView] in
+                        if let mainView = mainView {
+                            return OngoingCallVideoOrientation(mainView.orientation)
                         } else {
                             return .rotation0
                         }
                     },
-                    getAspect: { [weak view] in
-                        if let view = view {
-                            return view.aspect
+                    getAspect: { [weak mainView] in
+                        if let mainView = mainView {
+                            return mainView.aspect
                         } else {
                             return 0.0
                         }
                     },
-                    setOnOrientationUpdated: { [weak view] f in
-                        view?.setOnOrientationUpdated { value, aspect in
+                    setOnOrientationUpdated: { [weak mainView] f in
+                        mainView?.setOnOrientationUpdated { value, aspect in
                             f?(OngoingCallVideoOrientation(value), aspect)
                         }
                     },
-                    setOnIsMirroredUpdated: { [weak view] f in
-                        view?.setOnIsMirroredUpdated(f)
+                    setOnIsMirroredUpdated: { [weak mainView] f in
+                        mainView?.setOnIsMirroredUpdated(f)
+                    },
+                    updateIsEnabled: { [weak mainView] value in
+                        mainView?.updateIsEnabled(value)
                     }
-                ))
+                )
+                var cloneVideoView: OngoingCallContextPresentationCallVideoView?
+                if let cloneView = cloneView {
+                    cloneVideoView = OngoingCallContextPresentationCallVideoView(
+                        view: cloneView,
+                        setOnFirstFrameReceived: { [weak cloneView] f in
+                            cloneView?.setOnFirstFrameReceived(f)
+                        },
+                        getOrientation: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                return OngoingCallVideoOrientation(cloneView.orientation)
+                            } else {
+                                return .rotation0
+                            }
+                        },
+                        getAspect: { [weak cloneView] in
+                            if let cloneView = cloneView {
+                                return cloneView.aspect
+                            } else {
+                                return 0.0
+                            }
+                        },
+                        setOnOrientationUpdated: { [weak cloneView] f in
+                            cloneView?.setOnOrientationUpdated { value, aspect in
+                                f?(OngoingCallVideoOrientation(value), aspect)
+                            }
+                        },
+                        setOnIsMirroredUpdated: { [weak cloneView] f in
+                            cloneView?.setOnIsMirroredUpdated(f)
+                        },
+                        updateIsEnabled: { [weak cloneView] value in
+                            cloneView?.updateIsEnabled(value)
+                        }
+                    )
+                }
+                completion(mainVideoView, cloneVideoView)
             } else {
-                completion(nil)
+                completion(nil, nil)
             }
-        }
+        })
     }
     
     public func setIsVideoEnabled(_ value: Bool) {
         self.impl.setIsVideoEnabled(value)
     }
+
+    public func injectPixelBuffer(_ pixelBuffer: CVPixelBuffer, rotation: CGImagePropertyOrientation) {
+        var videoRotation: OngoingCallVideoOrientation = .rotation0
+        switch rotation {
+            case .up:
+                videoRotation = .rotation0
+            case .left:
+                videoRotation = .rotation90
+            case .right:
+                videoRotation = .rotation270
+            case .down:
+                videoRotation = .rotation180
+            default:
+                videoRotation = .rotation0
+        }
+        self.impl.submitPixelBuffer(pixelBuffer, rotation: videoRotation.orientation)
+    }
+
+    public func video() -> Signal<OngoingGroupCallContext.VideoFrameData, NoError> {
+        let queue = Queue.mainQueue()
+        return Signal { [weak self] subscriber in
+            let disposable = MetaDisposable()
+
+            queue.async {
+                guard let strongSelf = self else {
+                    return
+                }
+                let innerDisposable = strongSelf.impl.addVideoOutput { videoFrameData in
+                    subscriber.putNext(OngoingGroupCallContext.VideoFrameData(frameData: videoFrameData))
+                }
+                disposable.set(ActionDisposable {
+                    innerDisposable.dispose()
+                })
+            }
+
+            return disposable
+        }
+    }
 }
 
 extension OngoingCallThreadLocalContextWebrtc: OngoingCallThreadLocalContextProtocol {
@@ -487,6 +576,21 @@ extension OngoingCallVideoOrientation {
             self = .rotation0
         }
     }
+    
+    var orientation: OngoingCallVideoOrientationWebrtc {
+        switch self {
+        case .rotation0:
+            return .orientation0
+        case .rotation90:
+            return .orientation90
+        case .rotation180:
+            return .orientation180
+        case  .rotation270:
+            return .orientation270
+        @unknown default:
+            return .orientation0
+        }
+    }
 }
 
 public final class OngoingCallContextPresentationCallVideoView {
@@ -496,6 +600,7 @@ public final class OngoingCallContextPresentationCallVideoView {
     public let getAspect: () -> CGFloat
     public let setOnOrientationUpdated: (((OngoingCallVideoOrientation, CGFloat) -> Void)?) -> Void
     public let setOnIsMirroredUpdated: (((Bool) -> Void)?) -> Void
+    public let updateIsEnabled: (Bool) -> Void
     
     public init(
         view: UIView,
@@ -503,7 +608,8 @@ public final class OngoingCallContextPresentationCallVideoView {
         getOrientation: @escaping () -> OngoingCallVideoOrientation,
         getAspect: @escaping () -> CGFloat,
         setOnOrientationUpdated: @escaping (((OngoingCallVideoOrientation, CGFloat) -> Void)?) -> Void,
-        setOnIsMirroredUpdated: @escaping (((Bool) -> Void)?) -> Void
+        setOnIsMirroredUpdated: @escaping (((Bool) -> Void)?) -> Void,
+        updateIsEnabled: @escaping (Bool) -> Void
     ) {
         self.view = view
         self.setOnFirstFrameReceived = setOnFirstFrameReceived
@@ -511,6 +617,7 @@ public final class OngoingCallContextPresentationCallVideoView {
         self.getAspect = getAspect
         self.setOnOrientationUpdated = setOnOrientationUpdated
         self.setOnIsMirroredUpdated = setOnIsMirroredUpdated
+        self.updateIsEnabled = updateIsEnabled
     }
 }
 
@@ -729,19 +836,20 @@ public final class OngoingCallContext {
                         }
                     })
                 }
+
+                strongSelf.signalingDataDisposable = callSessionManager.beginReceivingCallSignalingData(internalId: internalId, { [weak self] dataList in
+                    queue.async {
+                        self?.withContext { context in
+                            if let context = context as? OngoingCallThreadLocalContextWebrtc {
+                                for data in dataList {
+                                    context.addSignaling(data)
+                                }
+                            }
+                        }
+                    }
+                })
             }
         }))
-        
-        self.signalingDataDisposable = (callSessionManager.callSignalingData(internalId: internalId)).start(next: { [weak self] data in
-            print("data received")
-            queue.async {
-                self?.withContext { context in
-                    if let context = context as? OngoingCallThreadLocalContextWebrtc {
-                        context.addSignaling(data)
-                    }
-                }
-            }
-        })
     }
     
     deinit {
@@ -817,7 +925,7 @@ public final class OngoingCallContext {
                 if let callId = callId, !statsLogPath.isEmpty, let data = try? Data(contentsOf: URL(fileURLWithPath: statsLogPath)), let dataString = String(data: data, encoding: .utf8) {
                     debugLogValue.set(.single(dataString))
                     if sendDebugLogs {
-                        let _ = saveCallDebugLog(network: self.account.network, callId: callId, log: dataString).start()
+                        let _ = TelegramEngine(account: self.account).calls.saveCallDebugLog(callId: callId, log: dataString).start()
                     }
                 }
             }
@@ -905,6 +1013,9 @@ public final class OngoingCallContext {
                                 view?.setOnIsMirroredUpdated { value in
                                     f?(value)
                                 }
+                            },
+                            updateIsEnabled: { [weak view] value in
+                                view?.updateIsEnabled(value)
                             }
                         ))
                     } else {
diff --git a/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift b/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift
index 0b20956993..682d5ea4c6 100644
--- a/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift
+++ b/submodules/TemporaryCachedPeerDataManager/Sources/ChannelMemberCategoryListContext.swift
@@ -111,6 +111,7 @@ private extension CachedChannelAdminRank {
 }
 
 private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategoryListContext {
+    private let engine: TelegramEngine
     private let postbox: Postbox
     private let network: Network
     private let accountPeerId: PeerId
@@ -147,7 +148,8 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor
     
     private var headUpdateTimer: SwiftSignalKit.Timer?
     
-    init(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, category: ChannelMemberListCategory) {
+    init(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, category: ChannelMemberListCategory) {
+        self.engine = engine
         self.postbox = postbox
         self.network = network
         self.accountPeerId = accountPeerId
@@ -230,7 +232,7 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor
             case let .banned(query):
                 requestCategory = .banned(query.flatMap(ChannelMembersCategoryFilter.search) ?? .all)
         }
-        return channelMembers(postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: requestCategory, offset: offset, limit: count, hash: hash) |> map { members in
+        return self.engine.peers.channelMembers(peerId: self.peerId, category: requestCategory, offset: offset, limit: count, hash: hash) |> map { members in
             switch requestCategory {
                 case .admins:
                     if let query = adminQuery {
@@ -315,7 +317,7 @@ private final class ChannelMemberSingleCategoryListContext: ChannelMemberCategor
                 
                 for i in 0 ..< min(strongSelf.listStateValue.list.count, Int(initialBatchSize)) {
                     let peerId = strongSelf.listStateValue.list[i].peer.id
-                    hash = (hash &* 20261) &+ UInt32(peerId.id)
+                    hash = (hash &* 20261) &+ UInt32(bitPattern: peerId.id._internalGetInt32Value())
                 }
                 hash = hash % 0x7FFFFFFF
                 strongSelf.headUpdateDisposable.set((strongSelf.loadSignal(offset: 0, count: initialBatchSize, hash: Int32(bitPattern: hash))
@@ -590,9 +592,9 @@ private final class ChannelMemberMultiCategoryListContext: ChannelMemberCategory
         }
     }
     
-    init(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, categories: [ChannelMemberListCategory]) {
+    init(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, categories: [ChannelMemberListCategory]) {
         self.contexts = categories.map { category in
-            return ChannelMemberSingleCategoryListContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, category: category)
+            return ChannelMemberSingleCategoryListContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, category: category)
         }
     }
     
@@ -698,6 +700,7 @@ private final class PeerChannelMemberContextWithSubscribers {
 }
 
 final class PeerChannelMemberCategoriesContext {
+    private let engine: TelegramEngine
     private let postbox: Postbox
     private let network: Network
     private let accountPeerId: PeerId
@@ -706,7 +709,8 @@ final class PeerChannelMemberCategoriesContext {
     
     private var contexts: [PeerChannelMemberContextKey: PeerChannelMemberContextWithSubscribers] = [:]
     
-    init(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, becameEmpty: @escaping (Bool) -> Void) {
+    init(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, becameEmpty: @escaping (Bool) -> Void) {
+        self.engine = engine
         self.postbox = postbox
         self.network = network
         self.accountPeerId = accountPeerId
@@ -755,13 +759,13 @@ final class PeerChannelMemberCategoriesContext {
                     default:
                         mappedCategory = .recent
                 }
-                context = ChannelMemberSingleCategoryListContext(postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: mappedCategory)
+                context = ChannelMemberSingleCategoryListContext(engine: self.engine, postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: mappedCategory)
             case let .restrictedAndBanned(query):
-                context = ChannelMemberMultiCategoryListContext(postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, categories: [.restricted(query), .banned(query)])
+                context = ChannelMemberMultiCategoryListContext(engine: self.engine, postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, categories: [.restricted(query), .banned(query)])
             case let .restricted(query):
-                context = ChannelMemberSingleCategoryListContext(postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: .restricted(query))
+                context = ChannelMemberSingleCategoryListContext(engine: self.engine, postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: .restricted(query))
             case let .banned(query):
-                context = ChannelMemberSingleCategoryListContext(postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: .banned(query))
+                context = ChannelMemberSingleCategoryListContext(engine: self.engine, postbox: self.postbox, network: self.network, accountPeerId: self.accountPeerId, peerId: self.peerId, category: .banned(query))
         }
         let contextWithSubscribers = PeerChannelMemberContextWithSubscribers(context: context, emptyTimeout: emptyTimeout, becameEmpty: { [weak self] in
             assert(Queue.mainQueue().isCurrent())
diff --git a/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift b/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift
index 2f5b294faf..b9372785ab 100644
--- a/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift
+++ b/submodules/TemporaryCachedPeerDataManager/Sources/PeerChannelMemberCategoriesContextsManager.swift
@@ -57,12 +57,12 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl {
     fileprivate var profileDataPreloadContexts: [PeerId: ProfileDataPreloadContext] = [:]
     fileprivate var profileDataPhotoPreloadContexts: [PeerId: ProfileDataPhotoPreloadContext] = [:]
     
-    func getContext(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, key: PeerChannelMemberContextKey, requestUpdate: Bool, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl) {
+    func getContext(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, key: PeerChannelMemberContextKey, requestUpdate: Bool, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl) {
         if let current = self.contexts[peerId] {
             return current.getContext(key: key, requestUpdate: requestUpdate, updated: updated)
         } else {
             var becameEmptyImpl: ((Bool) -> Void)?
-            let context = PeerChannelMemberCategoriesContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, becameEmpty: { value in
+            let context = PeerChannelMemberCategoriesContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, becameEmpty: { value in
                 becameEmptyImpl?(value)
             })
             becameEmptyImpl = { [weak self, weak context] value in
@@ -78,7 +78,7 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl {
         }
     }
     
-    func recentOnline(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, updated: @escaping (Int32) -> Void) -> Disposable {
+    func recentOnline(account: Account, accountPeerId: PeerId, peerId: PeerId, updated: @escaping (Int32) -> Void) -> Disposable {
         let context: PeerChannelMembersOnlineContext
         if let current = self.onlineContexts[peerId] {
             context = current
@@ -88,7 +88,7 @@ private final class PeerChannelMemberCategoriesContextsManagerImpl {
             self.onlineContexts[peerId] = context
             
             let signal = (
-                chatOnlineMembers(postbox: postbox, network: network, peerId: peerId)
+                TelegramEngine(account: account).peers.chatOnlineMembers(peerId: peerId)
                 |> then(
                     .complete()
                     |> delay(30.0, queue: .mainQueue())
@@ -286,10 +286,10 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    private func getContext(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, key: PeerChannelMemberContextKey, requestUpdate: Bool, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+    private func getContext(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, key: PeerChannelMemberContextKey, requestUpdate: Bool, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
         assert(Queue.mainQueue().isCurrent())
         if let (disposable, control) = self.impl.syncWith({ impl in
-            return impl.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
+            return impl.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
         }) {
             return (disposable, control)
         } else {
@@ -317,47 +317,47 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    public func recent(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, requestUpdate: Bool = true, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+    public func recent(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, requestUpdate: Bool = true, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
         let key: PeerChannelMemberContextKey
         if let searchQuery = searchQuery {
             key = .recentSearch(searchQuery)
         } else {
             key = .recent
         }
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
     }
     
-    public func mentions(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, threadMessageId: MessageId?, searchQuery: String? = nil, requestUpdate: Bool = true, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+    public func mentions(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, threadMessageId: MessageId?, searchQuery: String? = nil, requestUpdate: Bool = true, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
         let key: PeerChannelMemberContextKey = .mentions(threadId: threadMessageId, query: searchQuery)
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: key, requestUpdate: requestUpdate, updated: updated)
     }
     
-    public func admins(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .admins(searchQuery), requestUpdate: true, updated: updated)
+    public func admins(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .admins(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func contacts(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .contacts(searchQuery), requestUpdate: true, updated: updated)
+    public func contacts(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .contacts(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func bots(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .bots(searchQuery), requestUpdate: true, updated: updated)
+    public func bots(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .bots(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func restricted(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .restricted(searchQuery), requestUpdate: true, updated: updated)
+    public func restricted(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .restricted(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func banned(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .banned(searchQuery), requestUpdate: true, updated: updated)
+    public func banned(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .banned(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func restrictedAndBanned(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
-        return self.getContext(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .restrictedAndBanned(searchQuery), requestUpdate: true, updated: updated)
+    public func restrictedAndBanned(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId, searchQuery: String? = nil, updated: @escaping (ChannelMemberListState) -> Void) -> (Disposable, PeerChannelMemberCategoryControl?) {
+        return self.getContext(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, key: .restrictedAndBanned(searchQuery), requestUpdate: true, updated: updated)
     }
     
-    public func updateMemberBannedRights(account: Account, peerId: PeerId, memberId: PeerId, bannedRights: TelegramChatBannedRights?) -> Signal<Void, NoError> {
-        return updateChannelMemberBannedRights(account: account, peerId: peerId, memberId: memberId, rights: bannedRights)
+    public func updateMemberBannedRights(engine: TelegramEngine, peerId: PeerId, memberId: PeerId, bannedRights: TelegramChatBannedRights?) -> Signal<Void, NoError> {
+        return engine.peers.updateChannelMemberBannedRights(peerId: peerId, memberId: memberId, rights: bannedRights)
         |> deliverOnMainQueue
         |> beforeNext { [weak self] (previous, updated, isMember) in
             if let strongSelf = self {
@@ -378,8 +378,8 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    public func updateMemberAdminRights(account: Account, peerId: PeerId, memberId: PeerId, adminRights: TelegramChatAdminRights?, rank: String?) -> Signal<Void, UpdateChannelAdminRightsError> {
-        return updateChannelAdminRights(account: account, peerId: peerId, adminId: memberId, rights: adminRights, rank: rank)
+    public func updateMemberAdminRights(engine: TelegramEngine, peerId: PeerId, memberId: PeerId, adminRights: TelegramChatAdminRights?, rank: String?) -> Signal<Void, UpdateChannelAdminRightsError> {
+        return engine.peers.updateChannelAdminRights(peerId: peerId, adminId: memberId, rights: adminRights, rank: rank)
         |> map(Optional.init)
         |> deliverOnMainQueue
         |> beforeNext { [weak self] result in
@@ -398,8 +398,8 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    public func transferOwnership(account: Account, peerId: PeerId, memberId: PeerId, password: String) -> Signal<Void, ChannelOwnershipTransferError> {
-        return updateChannelOwnership(account: account, accountStateManager: account.stateManager, channelId: peerId, memberId: memberId, password: password)
+    public func transferOwnership(engine: TelegramEngine, peerId: PeerId, memberId: PeerId, password: String) -> Signal<Void, ChannelOwnershipTransferError> {
+        return engine.peers.updateChannelOwnership(channelId: peerId, memberId: memberId, password: password)
         |> map(Optional.init)
         |> deliverOnMainQueue
         |> beforeNext { [weak self] results in
@@ -418,8 +418,8 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    public func join(account: Account, peerId: PeerId, hash: String?) -> Signal<Never, JoinChannelError> {
-        return joinChannel(account: account, peerId: peerId, hash: hash)
+    public func join(engine: TelegramEngine, peerId: PeerId, hash: String?) -> Signal<Never, JoinChannelError> {
+        return engine.peers.joinChannel(peerId: peerId, hash: hash)
         |> deliverOnMainQueue
         |> beforeNext { [weak self] result in
             if let strongSelf = self, let updated = result {
@@ -435,8 +435,8 @@ public final class PeerChannelMemberCategoriesContextsManager {
         |> ignoreValues
     }
     
-    public func addMember(account: Account, peerId: PeerId, memberId: PeerId) -> Signal<Never, AddChannelMemberError> {
-        return addChannelMember(account: account, peerId: peerId, memberId: memberId)
+    public func addMember(engine: TelegramEngine, peerId: PeerId, memberId: PeerId) -> Signal<Never, AddChannelMemberError> {
+        return engine.peers.addChannelMember(peerId: peerId, memberId: memberId)
         |> deliverOnMainQueue
         |> beforeNext { [weak self] result in
             if let strongSelf = self {
@@ -453,9 +453,9 @@ public final class PeerChannelMemberCategoriesContextsManager {
         |> ignoreValues
     }
     
-    public func addMembers(account: Account, peerId: PeerId, memberIds: [PeerId]) -> Signal<Void, AddChannelMemberError> {
+    public func addMembers(engine: TelegramEngine, peerId: PeerId, memberIds: [PeerId]) -> Signal<Void, AddChannelMemberError> {
         let signals: [Signal<(ChannelParticipant?, RenderedChannelParticipant)?, AddChannelMemberError>] = memberIds.map({ memberId in
-            return addChannelMember(account: account, peerId: peerId, memberId: memberId)
+            return engine.peers.addChannelMember(peerId: peerId, memberId: memberId)
             |> map(Optional.init)
             |> `catch` { error -> Signal<(ChannelParticipant?, RenderedChannelParticipant)?, AddChannelMemberError> in
                 return .fail(error)
@@ -483,7 +483,7 @@ public final class PeerChannelMemberCategoriesContextsManager {
         }
     }
     
-    public func recentOnline(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId) -> Signal<Int32, NoError> {
+    public func recentOnline(account: Account, accountPeerId: PeerId, peerId: PeerId) -> Signal<Int32, NoError> {
         return Signal { [weak self] subscriber in
             guard let strongSelf = self else {
                 subscriber.putNext(0)
@@ -491,7 +491,7 @@ public final class PeerChannelMemberCategoriesContextsManager {
                 return EmptyDisposable
             }
             let disposable = strongSelf.impl.syncWith({ impl -> Disposable in
-                return impl.recentOnline(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, updated: { value in
+                return impl.recentOnline(account: account, accountPeerId: accountPeerId, peerId: peerId, updated: { value in
                     subscriber.putNext(value)
                 })
             })
@@ -500,11 +500,11 @@ public final class PeerChannelMemberCategoriesContextsManager {
         |> runOn(Queue.mainQueue())
     }
     
-    public func recentOnlineSmall(postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId) -> Signal<Int32, NoError> {
+    public func recentOnlineSmall(engine: TelegramEngine, postbox: Postbox, network: Network, accountPeerId: PeerId, peerId: PeerId) -> Signal<Int32, NoError> {
         return Signal { [weak self] subscriber in
             var previousIds: Set<PeerId>?
             let statusesDisposable = MetaDisposable()
-            let disposableAndControl = self?.recent(postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, updated: { state in
+            let disposableAndControl = self?.recent(engine: engine, postbox: postbox, network: network, accountPeerId: accountPeerId, peerId: peerId, updated: { state in
                 var idList: [PeerId] = []
                 for item in state.list {
                     idList.append(item.peer.id)
diff --git a/submodules/TgVoipWebrtc/BUILD b/submodules/TgVoipWebrtc/BUILD
index 2a720c8217..e7da0a33c9 100644
--- a/submodules/TgVoipWebrtc/BUILD
+++ b/submodules/TgVoipWebrtc/BUILD
@@ -16,10 +16,19 @@ objc_library(
         "tgcalls/tgcalls/platform/tdesktop/**",
         "tgcalls/tgcalls/platform/android/**",
         "tgcalls/tgcalls/platform/windows/**",
+        "tgcalls/tgcalls/platform/uwp/**",
+        "tgcalls/tgcalls/platform/darwin/macOS/**",
         "tgcalls/tgcalls/platform/darwin/VideoCameraCapturerMac.*",
         "tgcalls/tgcalls/platform/darwin/VideoMetalViewMac.*",
+        "tgcalls/tgcalls/platform/darwin/VideoSampleBufferViewMac.*",
         "tgcalls/tgcalls/platform/darwin/GLVideoViewMac.*",
         "tgcalls/tgcalls/platform/darwin/ScreenCapturer.*",
+        "tgcalls/tgcalls/platform/darwin/DesktopSharingCapturer.*",
+        "tgcalls/tgcalls/platform/darwin/DesktopCaptureSourceViewMac.*",
+        "tgcalls/tgcalls/platform/darwin/DesktopCaptureSourceView.*",
+        "tgcalls/tgcalls/platform/darwin/TGCMIODevice.*",
+        "tgcalls/tgcalls/platform/darwin/TGCMIOCapturer.*",
+        "tgcalls/tgcalls/platform/darwin/VideoCMIOCapture.*",
         "tgcalls/tgcalls/desktop_capturer/**",
     ]),
     hdrs = glob([
@@ -55,6 +64,7 @@ objc_library(
         "//third-party/ogg:ogg",
         "//third-party/opusfile:opusfile",
         "//submodules/ffmpeg:ffmpeg",
+        "//third-party/rnnoise:rnnoise",
     ],
     sdk_frameworks = [
         "Foundation",
diff --git a/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h b/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h
index 9bc06c6265..87c1645925 100644
--- a/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h
+++ b/submodules/TgVoipWebrtc/PublicHeaders/TgVoipWebrtc/OngoingCallThreadLocalContext.h
@@ -5,6 +5,7 @@
 
 #if TARGET_OS_IOS
 #import <UIKit/UIKit.h>
+#import <CoreMedia/CoreMedia.h>
 #else
 #import <AppKit/AppKit.h>
 #define UIView NSView
@@ -100,20 +101,91 @@ typedef NS_ENUM(int32_t, OngoingCallDataSavingWebrtc) {
 - (void)setOnFirstFrameReceived:(void (^ _Nullable)(float))onFirstFrameReceived;
 - (void)setOnOrientationUpdated:(void (^ _Nullable)(OngoingCallVideoOrientationWebrtc, CGFloat))onOrientationUpdated;
 - (void)setOnIsMirroredUpdated:(void (^ _Nullable)(bool))onIsMirroredUpdated;
+- (void)updateIsEnabled:(bool)isEnabled;
 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
 - (void)setVideoContentMode:(CALayerContentsGravity _Nonnull )mode;
 - (void)setForceMirrored:(bool)forceMirrored;
+- (void)setIsPaused:(bool)paused;
+- (void)renderToSize:(NSSize)size animated: (bool)animated;
 #endif
 @end
 
+@interface GroupCallDisposable : NSObject
+
+- (void)dispose;
+
+@end
+
+@protocol CallVideoFrameBuffer
+
+@end
+
+@interface CallVideoFrameNativePixelBuffer : NSObject<CallVideoFrameBuffer>
+
+@property (nonatomic, readonly) CVPixelBufferRef _Nonnull pixelBuffer;
+
+@end
+
+@interface CallVideoFrameNV12Buffer : NSObject<CallVideoFrameBuffer>
+
+@property (nonatomic, readonly) int width;
+@property (nonatomic, readonly) int height;
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull y;
+@property (nonatomic, readonly) int strideY;
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull uv;
+@property (nonatomic, readonly) int strideUV;
+
+@end
+
+@interface CallVideoFrameI420Buffer : NSObject<CallVideoFrameBuffer>
+
+@property (nonatomic, readonly) int width;
+@property (nonatomic, readonly) int height;
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull y;
+@property (nonatomic, readonly) int strideY;
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull u;
+@property (nonatomic, readonly) int strideU;
+
+@property (nonatomic, strong, readonly) NSData * _Nonnull v;
+@property (nonatomic, readonly) int strideV;
+
+@end
+
+@interface CallVideoFrameData : NSObject
+
+@property (nonatomic, strong, readonly) id<CallVideoFrameBuffer> _Nonnull buffer;
+@property (nonatomic, readonly) int width;
+@property (nonatomic, readonly) int height;
+@property (nonatomic, readonly) OngoingCallVideoOrientationWebrtc orientation;
+
+@end
+
 @interface OngoingCallThreadLocalContextVideoCapturer : NSObject
 
 - (instancetype _Nonnull)initWithDeviceId:(NSString * _Nonnull)deviceId keepLandscape:(bool)keepLandscape;
 
+#if TARGET_OS_IOS
++ (instancetype _Nonnull)capturerWithExternalSampleBufferProvider;
+#endif
+
 - (void)switchVideoInput:(NSString * _Nonnull)deviceId;
 - (void)setIsVideoEnabled:(bool)isVideoEnabled;
 
-- (void)makeOutgoingVideoView:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion;
+- (void)makeOutgoingVideoView:(bool)requestClone completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable, UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion;
+
+- (void)setOnFatalError:(dispatch_block_t _Nullable)onError;
+- (void)setOnPause:(void (^ _Nullable)(bool))onPause;
+- (void)setOnIsActiveUpdated:(void (^_Nonnull)(bool))onIsActiveUpdated;
+
+#if TARGET_OS_IOS
+- (void)submitPixelBuffer:(CVPixelBufferRef _Nonnull)pixelBuffer rotation:(OngoingCallVideoOrientationWebrtc)rotation;
+#endif
+
+- (GroupCallDisposable * _Nonnull)addVideoOutput:(void (^_Nonnull)(CallVideoFrameData * _Nonnull))sink;
 
 @end
 
@@ -156,12 +228,20 @@ typedef struct {
     bool isTransitioningFromBroadcastToRtc;
 } GroupCallNetworkState;
 
-@interface OngoingGroupCallParticipantDescription : NSObject
+typedef NS_ENUM(int32_t, OngoingGroupCallMediaChannelType) {
+    OngoingGroupCallMediaChannelTypeAudio,
+    OngoingGroupCallMediaChannelTypeVideo
+};
 
+@interface OngoingGroupCallMediaChannelDescription : NSObject
+
+@property (nonatomic, readonly) OngoingGroupCallMediaChannelType type;
 @property (nonatomic, readonly) uint32_t audioSsrc;
-@property (nonatomic, strong, readonly) NSString * _Nullable jsonParams;
+@property (nonatomic, strong, readonly) NSString * _Nullable videoDescription;
 
-- (instancetype _Nonnull)initWithAudioSsrc:(uint32_t)audioSsrc jsonParams:(NSString * _Nullable)jsonParams;
+- (instancetype _Nonnull)initWithType:(OngoingGroupCallMediaChannelType)type
+    audioSsrc:(uint32_t)audioSsrc
+    videoDescription:(NSString * _Nullable)videoDescription;
 
 @end
 
@@ -171,6 +251,12 @@ typedef struct {
 
 @end
 
+@protocol OngoingGroupCallMediaChannelDescriptionTask <NSObject>
+
+- (void)cancel;
+
+@end
+
 typedef NS_ENUM(int32_t, OngoingCallConnectionMode) {
     OngoingCallConnectionModeNone,
     OngoingCallConnectionModeRtc,
@@ -183,6 +269,12 @@ typedef NS_ENUM(int32_t, OngoingGroupCallBroadcastPartStatus) {
     OngoingGroupCallBroadcastPartStatusResyncNeeded
 };
 
+typedef NS_ENUM(int32_t, OngoingGroupCallVideoContentType) {
+    OngoingGroupCallVideoContentTypeNone,
+    OngoingGroupCallVideoContentTypeGeneric,
+    OngoingGroupCallVideoContentTypeScreencast,
+};
+
 @interface OngoingGroupCallBroadcastPart : NSObject
 
 @property (nonatomic, readonly) int64_t timestampMilliseconds;
@@ -194,28 +286,70 @@ typedef NS_ENUM(int32_t, OngoingGroupCallBroadcastPartStatus) {
 
 @end
 
+typedef NS_ENUM(int32_t, OngoingGroupCallRequestedVideoQuality) {
+    OngoingGroupCallRequestedVideoQualityThumbnail,
+    OngoingGroupCallRequestedVideoQualityMedium,
+    OngoingGroupCallRequestedVideoQualityFull,
+};
+
+@interface OngoingGroupCallSsrcGroup : NSObject
+
+@property (nonatomic, strong, readonly) NSString * _Nonnull semantics;
+@property (nonatomic, strong, readonly) NSArray<NSNumber *> * _Nonnull ssrcs;
+
+- (instancetype _Nonnull)initWithSemantics:(NSString * _Nonnull)semantics ssrcs:(NSArray<NSNumber *> * _Nonnull)ssrcs;
+
+@end
+
+@interface OngoingGroupCallRequestedVideoChannel : NSObject
+
+@property (nonatomic, readonly) uint32_t audioSsrc;
+@property (nonatomic, strong, readonly) NSString * _Nonnull endpointId;
+@property (nonatomic, strong, readonly) NSArray<OngoingGroupCallSsrcGroup *> * _Nonnull ssrcGroups;
+
+@property (nonatomic, readonly) OngoingGroupCallRequestedVideoQuality minQuality;
+@property (nonatomic, readonly) OngoingGroupCallRequestedVideoQuality maxQuality;
+
+- (instancetype _Nonnull)initWithAudioSsrc:(uint32_t)audioSsrc endpointId:(NSString * _Nonnull)endpointId ssrcGroups:(NSArray<OngoingGroupCallSsrcGroup *> * _Nonnull)ssrcGroups minQuality:(OngoingGroupCallRequestedVideoQuality)minQuality maxQuality:(OngoingGroupCallRequestedVideoQuality)maxQuality;
+
+@end
+
 @interface GroupCallThreadLocalContext : NSObject
 
-- (instancetype _Nonnull)initWithQueue:(id<OngoingCallThreadLocalContextQueueWebrtc> _Nonnull)queue networkStateUpdated:(void (^ _Nonnull)(GroupCallNetworkState))networkStateUpdated audioLevelsUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))audioLevelsUpdated inputDeviceId:(NSString * _Nonnull)inputDeviceId outputDeviceId:(NSString * _Nonnull)outputDeviceId videoCapturer:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer incomingVideoSourcesUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))incomingVideoSourcesUpdated participantDescriptionsRequired:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))participantDescriptionsRequired requestBroadcastPart:(id<OngoingGroupCallBroadcastPartTask> _Nonnull (^ _Nonnull)(int64_t, int64_t, void (^ _Nonnull)(OngoingGroupCallBroadcastPart * _Nullable)))requestBroadcastPart;
+- (instancetype _Nonnull)initWithQueue:(id<OngoingCallThreadLocalContextQueueWebrtc> _Nonnull)queue
+    networkStateUpdated:(void (^ _Nonnull)(GroupCallNetworkState))networkStateUpdated
+    audioLevelsUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))audioLevelsUpdated
+    inputDeviceId:(NSString * _Nonnull)inputDeviceId
+    outputDeviceId:(NSString * _Nonnull)outputDeviceId
+    videoCapturer:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer
+    requestMediaChannelDescriptions:(id<OngoingGroupCallMediaChannelDescriptionTask> _Nonnull (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull, void (^ _Nonnull)(NSArray<OngoingGroupCallMediaChannelDescription *> * _Nonnull)))requestMediaChannelDescriptions
+    requestBroadcastPart:(id<OngoingGroupCallBroadcastPartTask> _Nonnull (^ _Nonnull)(int64_t, int64_t, void (^ _Nonnull)(OngoingGroupCallBroadcastPart * _Nullable)))requestBroadcastPart
+    outgoingAudioBitrateKbit:(int32_t)outgoingAudioBitrateKbit
+    videoContentType:(OngoingGroupCallVideoContentType)videoContentType
+    enableNoiseSuppression:(bool)enableNoiseSuppression;
 
 - (void)stop;
 
 - (void)setConnectionMode:(OngoingCallConnectionMode)connectionMode keepBroadcastConnectedIfWasEnabled:(bool)keepBroadcastConnectedIfWasEnabled;
 
 - (void)emitJoinPayload:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion;
-- (void)setJoinResponsePayload:(NSString * _Nonnull)payload participants:(NSArray<OngoingGroupCallParticipantDescription *> * _Nonnull)participants;
+- (void)setJoinResponsePayload:(NSString * _Nonnull)payload;
 - (void)removeSsrcs:(NSArray<NSNumber *> * _Nonnull)ssrcs;
-- (void)addParticipants:(NSArray<OngoingGroupCallParticipantDescription *> * _Nonnull)participants;
+- (void)removeIncomingVideoSource:(uint32_t)ssrc;
 - (void)setIsMuted:(bool)isMuted;
+- (void)setIsNoiseSuppressionEnabled:(bool)isNoiseSuppressionEnabled;
 - (void)requestVideo:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer completion:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion;
 - (void)disableVideo:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion;
 
 - (void)setVolumeForSsrc:(uint32_t)ssrc volume:(double)volume;
-- (void)setFullSizeVideoSsrc:(uint32_t)ssrc;
+- (void)setRequestedVideoChannels:(NSArray<OngoingGroupCallRequestedVideoChannel *> * _Nonnull)requestedVideoChannels;
 
 - (void)switchAudioOutput:(NSString * _Nonnull)deviceId;
 - (void)switchAudioInput:(NSString * _Nonnull)deviceId;
-- (void)makeIncomingVideoViewWithSsrc:(uint32_t)ssrc completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion;
+- (void)makeIncomingVideoViewWithEndpointId:(NSString * _Nonnull)endpointId requestClone:(bool)requestClone completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable, UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion;
+- (GroupCallDisposable * _Nonnull)addVideoOutputWithEndpointId:(NSString * _Nonnull)endpointId sink:(void (^_Nonnull)(CallVideoFrameData * _Nonnull))sink;
+
+- (void)addExternalAudioData:(NSData * _Nonnull)data;
 
 @end
 
diff --git a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
index 948fd87723..f78eae73ac 100644
--- a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
+++ b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm
@@ -6,25 +6,35 @@
 
 #import "Instance.h"
 #import "InstanceImpl.h"
-#import "reference/InstanceImplReference.h"
+#import "v2/InstanceV2Impl.h"
 #include "StaticThreads.h"
 
 #import "VideoCaptureInterface.h"
+#import "platform/darwin/VideoCameraCapturer.h"
 
 #ifndef WEBRTC_IOS
 #import "platform/darwin/VideoMetalViewMac.h"
 #import "platform/darwin/GLVideoViewMac.h"
+#import "platform/darwin/VideoSampleBufferViewMac.h"
 #define UIViewContentModeScaleAspectFill kCAGravityResizeAspectFill
 #define UIViewContentModeScaleAspect kCAGravityResizeAspect
 
 #else
 #import "platform/darwin/VideoMetalView.h"
 #import "platform/darwin/GLVideoView.h"
+#import "platform/darwin/VideoSampleBufferView.h"
+#import "platform/darwin/VideoCaptureView.h"
+#import "platform/darwin/CustomExternalCapturer.h"
 #endif
 
 #import "group/GroupInstanceImpl.h"
 #import "group/GroupInstanceCustomImpl.h"
 
+#import "VideoCaptureInterfaceImpl.h"
+
+#include "sdk/objc/native/src/objc_frame_buffer.h"
+#import "components/video_frame_buffer/RTCCVPixelBuffer.h"
+
 @implementation OngoingCallConnectionDescriptionWebrtc
 
 - (instancetype _Nonnull)initWithConnectionId:(int64_t)connectionId hasStun:(bool)hasStun hasTurn:(bool)hasTurn ip:(NSString * _Nonnull)ip port:(int32_t)port username:(NSString * _Nonnull)username password:(NSString * _Nonnull)password {
@@ -43,8 +53,26 @@
 
 @end
 
+@interface IsProcessingCustomSampleBufferFlag : NSObject
+
+@property (nonatomic) bool value;
+
+@end
+
+@implementation IsProcessingCustomSampleBufferFlag
+
+- (instancetype)init {
+    self = [super init];
+    if (self != nil) {
+    }
+    return self;
+}
+
+@end
+
 @interface OngoingCallThreadLocalContextVideoCapturer () {
     std::shared_ptr<tgcalls::VideoCaptureInterface> _interface;
+    IsProcessingCustomSampleBufferFlag *_isProcessingCustomSampleBuffer;
 }
 
 @end
@@ -97,6 +125,10 @@
     }
 }
 
+- (void)updateIsEnabled:(bool)isEnabled {
+    [self setEnabled:isEnabled];
+}
+
 @end
 
 @interface GLVideoView (VideoViewImpl) <OngoingCallThreadLocalContextWebrtcVideoView, OngoingCallThreadLocalContextWebrtcVideoViewImpl>
@@ -140,16 +172,284 @@
     }
 }
 
+- (void)updateIsEnabled:(bool)__unused isEnabled {
+}
+
+@end
+
+@interface VideoSampleBufferView (VideoViewImpl) <OngoingCallThreadLocalContextWebrtcVideoView, OngoingCallThreadLocalContextWebrtcVideoViewImpl>
+
+@property (nonatomic, readwrite) OngoingCallVideoOrientationWebrtc orientation;
+@property (nonatomic, readonly) CGFloat aspect;
+
+@end
+
+@implementation VideoSampleBufferView (VideoViewImpl)
+
+- (OngoingCallVideoOrientationWebrtc)orientation {
+    return (OngoingCallVideoOrientationWebrtc)self.internalOrientation;
+}
+
+- (CGFloat)aspect {
+    return self.internalAspect;
+}
+
+- (void)setOrientation:(OngoingCallVideoOrientationWebrtc)orientation {
+    [self setInternalOrientation:(int)orientation];
+}
+
+- (void)setOnOrientationUpdated:(void (^ _Nullable)(OngoingCallVideoOrientationWebrtc, CGFloat))onOrientationUpdated {
+    if (onOrientationUpdated) {
+        [self internalSetOnOrientationUpdated:^(int value, CGFloat aspect) {
+            onOrientationUpdated((OngoingCallVideoOrientationWebrtc)value, aspect);
+        }];
+    } else {
+        [self internalSetOnOrientationUpdated:nil];
+    }
+}
+
+- (void)setOnIsMirroredUpdated:(void (^ _Nullable)(bool))onIsMirroredUpdated {
+    if (onIsMirroredUpdated) {
+        [self internalSetOnIsMirroredUpdated:^(bool value) {
+            onIsMirroredUpdated(value);
+        }];
+    } else {
+        [self internalSetOnIsMirroredUpdated:nil];
+    }
+}
+
+- (void)updateIsEnabled:(bool)isEnabled {
+    [self setEnabled:isEnabled];
+}
+
+@end
+
+@interface GroupCallDisposable () {
+    dispatch_block_t _block;
+}
+
+@end
+
+@implementation GroupCallDisposable
+
+- (instancetype)initWithBlock:(dispatch_block_t _Nonnull)block {
+    self = [super init];
+    if (self != nil) {
+        _block = [block copy];
+    }
+    return self;
+}
+
+- (void)dispose {
+    if (_block) {
+        _block();
+    }
+}
+
+@end
+
+@implementation CallVideoFrameNativePixelBuffer
+
+- (instancetype)initWithPixelBuffer:(CVPixelBufferRef)pixelBuffer {
+    self = [super init];
+    if (self != nil) {
+        assert(pixelBuffer != nil);
+
+        _pixelBuffer = CVPixelBufferRetain(pixelBuffer);
+    }
+    return self;
+}
+
+- (void)dealloc {
+    CVPixelBufferRelease(_pixelBuffer);
+}
+
+@end
+
+@implementation CallVideoFrameNV12Buffer
+
+- (instancetype)initWithBuffer:(rtc::scoped_refptr<webrtc::NV12BufferInterface>)nv12Buffer {
+    self = [super init];
+    if (self != nil) {
+        _width = nv12Buffer->width();
+        _height = nv12Buffer->height();
+
+        _strideY = nv12Buffer->StrideY();
+        _strideUV = nv12Buffer->StrideUV();
+
+        _y = [[NSData alloc] initWithBytesNoCopy:(void *)nv12Buffer->DataY() length:nv12Buffer->StrideY() * _height deallocator:^(__unused void * _Nonnull bytes, __unused NSUInteger length) {
+            nv12Buffer.get();
+        }];
+
+        _uv = [[NSData alloc] initWithBytesNoCopy:(void *)nv12Buffer->DataUV() length:nv12Buffer->StrideUV() * _height deallocator:^(__unused void * _Nonnull bytes, __unused NSUInteger length) {
+            nv12Buffer.get();
+        }];
+    }
+    return self;
+}
+
+@end
+
+@implementation CallVideoFrameI420Buffer
+
+- (instancetype)initWithBuffer:(rtc::scoped_refptr<webrtc::I420BufferInterface>)i420Buffer {
+    self = [super init];
+    if (self != nil) {
+        _width = i420Buffer->width();
+        _height = i420Buffer->height();
+
+        _strideY = i420Buffer->StrideY();
+        _strideU = i420Buffer->StrideU();
+        _strideV = i420Buffer->StrideV();
+
+        _y = [[NSData alloc] initWithBytesNoCopy:(void *)i420Buffer->DataY() length:i420Buffer->StrideY() * _height deallocator:^(__unused void * _Nonnull bytes, __unused NSUInteger length) {
+            i420Buffer.get();
+        }];
+
+        _u = [[NSData alloc] initWithBytesNoCopy:(void *)i420Buffer->DataU() length:i420Buffer->StrideU() * _height deallocator:^(__unused void * _Nonnull bytes, __unused NSUInteger length) {
+            i420Buffer.get();
+        }];
+
+        _v = [[NSData alloc] initWithBytesNoCopy:(void *)i420Buffer->DataV() length:i420Buffer->StrideV() * _height deallocator:^(__unused void * _Nonnull bytes, __unused NSUInteger length) {
+            i420Buffer.get();
+        }];
+    }
+    return self;
+}
+
+@end
+
+@interface CallVideoFrameData () {
+}
+
+@end
+
+@implementation CallVideoFrameData
+
+- (instancetype)initWithBuffer:(id<CallVideoFrameBuffer>)buffer frame:(webrtc::VideoFrame const &)frame {
+    self = [super init];
+    if (self != nil) {
+        _buffer = buffer;
+
+        _width = frame.width();
+        _height = frame.height();
+
+        switch (frame.rotation()) {
+            case webrtc::kVideoRotation_0: {
+                _orientation = OngoingCallVideoOrientation0;
+                break;
+            }
+            case webrtc::kVideoRotation_90: {
+                _orientation = OngoingCallVideoOrientation90;
+                break;
+            }
+            case webrtc::kVideoRotation_180: {
+                _orientation = OngoingCallVideoOrientation180;
+                break;
+            }
+            case webrtc::kVideoRotation_270: {
+                _orientation = OngoingCallVideoOrientation270;
+                break;
+            }
+            default: {
+                _orientation = OngoingCallVideoOrientation0;
+                break;
+            }
+        }
+    }
+    return self;
+}
+
+@end
+
+namespace {
+
+class GroupCallVideoSinkAdapter : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
+public:
+    GroupCallVideoSinkAdapter(void (^frameReceived)(webrtc::VideoFrame const &)) {
+        _frameReceived = [frameReceived copy];
+    }
+
+    void OnFrame(const webrtc::VideoFrame& nativeVideoFrame) override {
+        @autoreleasepool {
+            if (_frameReceived) {
+                _frameReceived(nativeVideoFrame);
+            }
+        }
+    }
+
+private:
+    void (^_frameReceived)(webrtc::VideoFrame const &);
+};
+
+}
+
+@interface GroupCallVideoSink : NSObject {
+    std::shared_ptr<GroupCallVideoSinkAdapter> _adapter;
+}
+
+@end
+
+@implementation GroupCallVideoSink
+
+- (instancetype)initWithSink:(void (^_Nonnull)(CallVideoFrameData * _Nonnull))sink {
+    self = [super init];
+    if (self != nil) {
+        void (^storedSink)(CallVideoFrameData * _Nonnull) = [sink copy];
+
+        _adapter.reset(new GroupCallVideoSinkAdapter(^(webrtc::VideoFrame const &videoFrame) {
+            id<CallVideoFrameBuffer> mappedBuffer = nil;
+
+            if (videoFrame.video_frame_buffer()->type() == webrtc::VideoFrameBuffer::Type::kNative) {
+                id<RTC_OBJC_TYPE(RTCVideoFrameBuffer)> nativeBuffer = static_cast<webrtc::ObjCFrameBuffer *>(videoFrame.video_frame_buffer().get())->wrapped_frame_buffer();
+                if ([nativeBuffer isKindOfClass:[RTC_OBJC_TYPE(RTCCVPixelBuffer) class]]) {
+                    RTCCVPixelBuffer *pixelBuffer = (RTCCVPixelBuffer *)nativeBuffer;
+                    mappedBuffer = [[CallVideoFrameNativePixelBuffer alloc] initWithPixelBuffer:pixelBuffer.pixelBuffer];
+                }
+            } else if (videoFrame.video_frame_buffer()->type() == webrtc::VideoFrameBuffer::Type::kNV12) {
+                rtc::scoped_refptr<webrtc::NV12BufferInterface> nv12Buffer = (webrtc::NV12BufferInterface *)videoFrame.video_frame_buffer().get();
+                mappedBuffer = [[CallVideoFrameNV12Buffer alloc] initWithBuffer:nv12Buffer];
+            } else if (videoFrame.video_frame_buffer()->type() == webrtc::VideoFrameBuffer::Type::kI420) {
+                rtc::scoped_refptr<webrtc::I420BufferInterface> i420Buffer = (webrtc::I420BufferInterface *)videoFrame.video_frame_buffer().get();
+                mappedBuffer = [[CallVideoFrameI420Buffer alloc] initWithBuffer:i420Buffer];
+            }
+
+            if (storedSink && mappedBuffer) {
+                storedSink([[CallVideoFrameData alloc] initWithBuffer:mappedBuffer frame:videoFrame]);
+            }
+        }));
+    }
+    return self;
+}
+
+- (std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>>)sink {
+    return _adapter;
+}
+
 @end
 
 @interface OngoingCallThreadLocalContextVideoCapturer () {
     bool _keepLandscape;
+    std::shared_ptr<std::vector<uint8_t>> _croppingBuffer;
+
+    int _nextSinkId;
+    NSMutableDictionary<NSNumber *, GroupCallVideoSink *> *_sinks;
 }
 
 @end
 
 @implementation OngoingCallThreadLocalContextVideoCapturer
 
+- (instancetype _Nonnull)initWithInterface:(std::shared_ptr<tgcalls::VideoCaptureInterface>)interface {
+    self = [super init];
+    if (self != nil) {
+        _interface = interface;
+        _isProcessingCustomSampleBuffer = [[IsProcessingCustomSampleBufferFlag alloc] init];
+        _croppingBuffer = std::make_shared<std::vector<uint8_t>>();
+    }
+    return self;
+}
+
 - (instancetype _Nonnull)initWithDeviceId:(NSString * _Nonnull)deviceId keepLandscape:(bool)keepLandscape {
     self = [super init];
     if (self != nil) {
@@ -164,10 +464,89 @@
     return self;
 }
 
+#if TARGET_OS_IOS
+
+tgcalls::VideoCaptureInterfaceObject *GetVideoCaptureAssumingSameThread(tgcalls::VideoCaptureInterface *videoCapture) {
+    return videoCapture
+        ? static_cast<tgcalls::VideoCaptureInterfaceImpl*>(videoCapture)->object()->getSyncAssumingSameThread()
+        : nullptr;
+}
+
++ (instancetype _Nonnull)capturerWithExternalSampleBufferProvider {
+    std::shared_ptr<tgcalls::VideoCaptureInterface> interface = tgcalls::VideoCaptureInterface::Create(tgcalls::StaticThreads::getThreads(), ":ios_custom");
+    return [[OngoingCallThreadLocalContextVideoCapturer alloc] initWithInterface:interface];
+}
+#endif
 
 - (void)dealloc {
 }
 
+#if TARGET_OS_IOS
+- (void)submitPixelBuffer:(CVPixelBufferRef _Nonnull)pixelBuffer rotation:(OngoingCallVideoOrientationWebrtc)rotation {
+    if (!pixelBuffer) {
+        return;
+    }
+    
+    RTCVideoRotation videoRotation = RTCVideoRotation_0;
+    switch (rotation) {
+    case OngoingCallVideoOrientation0:
+        videoRotation = RTCVideoRotation_0;
+        break;
+    case OngoingCallVideoOrientation90:
+        videoRotation = RTCVideoRotation_90;
+        break;
+    case OngoingCallVideoOrientation180:
+        videoRotation = RTCVideoRotation_180;
+        break;
+    case OngoingCallVideoOrientation270:
+        videoRotation = RTCVideoRotation_270;
+        break;
+    }
+
+    if (_isProcessingCustomSampleBuffer.value) {
+        return;
+    }
+    _isProcessingCustomSampleBuffer.value = true;
+
+    tgcalls::StaticThreads::getThreads()->getMediaThread()->PostTask(RTC_FROM_HERE, [interface = _interface, pixelBuffer = CFRetain(pixelBuffer), croppingBuffer = _croppingBuffer, videoRotation = videoRotation, isProcessingCustomSampleBuffer = _isProcessingCustomSampleBuffer]() {
+        auto capture = GetVideoCaptureAssumingSameThread(interface.get());
+        auto source = capture->source();
+        if (source) {
+            [CustomExternalCapturer passPixelBuffer:(CVPixelBufferRef)pixelBuffer rotation:videoRotation toSource:source croppingBuffer:*croppingBuffer];
+        }
+        CFRelease(pixelBuffer);
+        isProcessingCustomSampleBuffer.value = false;
+    });
+}
+
+#endif
+
+- (GroupCallDisposable * _Nonnull)addVideoOutput:(void (^_Nonnull)(CallVideoFrameData * _Nonnull))sink {
+    int sinkId = _nextSinkId;
+    _nextSinkId += 1;
+
+    GroupCallVideoSink *storedSink = [[GroupCallVideoSink alloc] initWithSink:sink];
+    _sinks[@(sinkId)] = storedSink;
+
+    auto sinkReference = [storedSink sink];
+
+    tgcalls::StaticThreads::getThreads()->getMediaThread()->PostTask(RTC_FROM_HERE, [interface = _interface, sinkReference]() {
+        interface->setOutput(sinkReference);
+    });
+
+    __weak OngoingCallThreadLocalContextVideoCapturer *weakSelf = self;
+    return [[GroupCallDisposable alloc] initWithBlock:^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            __strong OngoingCallThreadLocalContextVideoCapturer *strongSelf = weakSelf;
+            if (!strongSelf) {
+                return;
+            }
+
+            [strongSelf->_sinks removeObjectForKey:@(sinkId)];
+        });
+    }];
+}
+
 - (void)switchVideoInput:(NSString * _Nonnull)deviceId {
     std::string resolvedId = deviceId.UTF8String;
     if (_keepLandscape) {
@@ -184,31 +563,93 @@
     return _interface;
 }
 
-- (void)makeOutgoingVideoView:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion {
-    std::shared_ptr<tgcalls::VideoCaptureInterface> interface = _interface;
-    dispatch_async(dispatch_get_main_queue(), ^{
-        if ([VideoMetalView isSupported]) {
-            VideoMetalView *remoteRenderer = [[VideoMetalView alloc] initWithFrame:CGRectZero];
-            remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
-            
-            std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
-            interface->setOutput(sink);
-            
-            completion(remoteRenderer);
-        } else {
-            GLVideoView *remoteRenderer = [[GLVideoView alloc] initWithFrame:CGRectZero];
-#ifndef WEBRTC_IOS
-            remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+-(void)setOnFatalError:(dispatch_block_t _Nullable)onError {
+#if TARGET_OS_IOS
+#else
+    _interface->setOnFatalError(onError);
 #endif
+}
 
-            std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
-            interface->setOutput(sink);
-            
-            completion(remoteRenderer);
+-(void)setOnPause:(void (^)(bool))onPause {
+#if TARGET_OS_IOS
+#else
+    _interface->setOnPause(onPause);
+#endif
+}
+
+- (void)setOnIsActiveUpdated:(void (^)(bool))onIsActiveUpdated {
+    _interface->setOnIsActiveUpdated([onIsActiveUpdated](bool isActive) {
+        if (onIsActiveUpdated) {
+            onIsActiveUpdated(isActive);
         }
     });
 }
 
+- (void)makeOutgoingVideoView:(bool)requestClone completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable, UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion {
+    __weak OngoingCallThreadLocalContextVideoCapturer *weakSelf = self;
+
+    void (^makeDefault)() = ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            __strong OngoingCallThreadLocalContextVideoCapturer *strongSelf = weakSelf;
+            if (!strongSelf) {
+                return;
+            }
+            std::shared_ptr<tgcalls::VideoCaptureInterface> interface = strongSelf->_interface;
+
+            if (false && requestClone) {
+                VideoSampleBufferView *remoteRenderer = [[VideoSampleBufferView alloc] initWithFrame:CGRectZero];
+                remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+
+                std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
+                interface->setOutput(sink);
+
+                VideoSampleBufferView *cloneRenderer = nil;
+                if (requestClone) {
+                    cloneRenderer = [[VideoSampleBufferView alloc] initWithFrame:CGRectZero];
+                    cloneRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+#ifdef WEBRTC_IOS
+                    [remoteRenderer setCloneTarget:cloneRenderer];
+#endif
+                }
+
+                completion(remoteRenderer, cloneRenderer);
+            } else if ([VideoMetalView isSupported]) {
+                VideoMetalView *remoteRenderer = [[VideoMetalView alloc] initWithFrame:CGRectZero];
+                remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+
+                VideoMetalView *cloneRenderer = nil;
+                if (requestClone) {
+                    cloneRenderer = [[VideoMetalView alloc] initWithFrame:CGRectZero];
+#ifdef WEBRTC_IOS
+                    cloneRenderer.videoContentMode = UIViewContentModeScaleToFill;
+                    [remoteRenderer setClone:cloneRenderer];
+#else
+                    cloneRenderer.videoContentMode = kCAGravityResizeAspectFill;
+#endif
+                }
+
+                std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
+
+                interface->setOutput(sink);
+
+                completion(remoteRenderer, cloneRenderer);
+            } else {
+                GLVideoView *remoteRenderer = [[GLVideoView alloc] initWithFrame:CGRectZero];
+    #ifndef WEBRTC_IOS
+                remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+    #endif
+
+                std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
+                interface->setOutput(sink);
+
+                completion(remoteRenderer, nil);
+            }
+        });
+    };
+
+    makeDefault();
+}
+
 @end
 
 @interface OngoingCallThreadLocalContextWebrtcTerminationResult : NSObject
@@ -332,8 +773,14 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL;
     return 92;
 }
 
-+ (NSArray<NSString *> * _Nonnull)versionsWithIncludeReference:(bool)__unused includeReference {
-    return @[@"2.7.7", @"3.0.0"];
++ (NSArray<NSString *> * _Nonnull)versionsWithIncludeReference:(bool)includeReference {
+    NSMutableArray<NSString *> *list = [[NSMutableArray alloc] init];
+    [list addObject:@"2.7.7"];
+    [list addObject:@"3.0.0"];
+    if (includeReference) {
+        [list addObject:@"4.0.0"];
+    }
+    return list;
 }
 
 + (tgcalls::ProtocolVersion)protocolVersionFromLibraryVersion:(NSString *)version {
@@ -427,7 +874,7 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL;
             .enableNS = true,
             .enableAGC = true,
             .enableCallUpgrade = false,
-            .logPath =  std::string(logPath.length == 0 ? "" : logPath.UTF8String),
+            .logPath = std::string(logPath.length == 0 ? "" : logPath.UTF8String),
             .statsLogPath = std::string(statsLogPath.length == 0 ? "" : statsLogPath.UTF8String),
             .maxApiLayer = [OngoingCallThreadLocalContextWebrtc maxLayer],
             .enableHighBitrateVideo = true,
@@ -444,10 +891,9 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL;
         static dispatch_once_t onceToken;
         dispatch_once(&onceToken, ^{
             tgcalls::Register<tgcalls::InstanceImpl>();
+            tgcalls::Register<tgcalls::InstanceV2Impl>();
         });
         
-        
-        
         _tgVoip = tgcalls::Meta::Create([version UTF8String], (tgcalls::Descriptor){
             .config = config,
             .persistentState = (tgcalls::PersistentState){ derivedStateValue },
@@ -839,32 +1285,96 @@ private:
     id<OngoingGroupCallBroadcastPartTask> _task;
 };
 
+class RequestMediaChannelDescriptionTaskImpl : public tgcalls::RequestMediaChannelDescriptionTask {
+public:
+    RequestMediaChannelDescriptionTaskImpl(id<OngoingGroupCallMediaChannelDescriptionTask> task) {
+        _task = task;
+    }
+
+    virtual ~RequestMediaChannelDescriptionTaskImpl() {
+    }
+
+    virtual void cancel() override {
+        [_task cancel];
+    }
+
+private:
+    id<OngoingGroupCallMediaChannelDescriptionTask> _task;
+};
+
 }
 
 @interface GroupCallThreadLocalContext () {
     id<OngoingCallThreadLocalContextQueueWebrtc> _queue;
-    
+
     std::unique_ptr<tgcalls::GroupInstanceInterface> _instance;
     OngoingCallThreadLocalContextVideoCapturer *_videoCapturer;
-    
+
     void (^_networkStateUpdated)(GroupCallNetworkState);
+
+    int _nextSinkId;
+    NSMutableDictionary<NSNumber *, GroupCallVideoSink *> *_sinks;
 }
 
 @end
 
 @implementation GroupCallThreadLocalContext
 
-- (instancetype _Nonnull)initWithQueue:(id<OngoingCallThreadLocalContextQueueWebrtc> _Nonnull)queue networkStateUpdated:(void (^ _Nonnull)(GroupCallNetworkState))networkStateUpdated audioLevelsUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))audioLevelsUpdated inputDeviceId:(NSString * _Nonnull)inputDeviceId outputDeviceId:(NSString * _Nonnull)outputDeviceId videoCapturer:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer incomingVideoSourcesUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))incomingVideoSourcesUpdated participantDescriptionsRequired:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))participantDescriptionsRequired requestBroadcastPart:(id<OngoingGroupCallBroadcastPartTask> _Nonnull (^ _Nonnull)(int64_t, int64_t, void (^ _Nonnull)(OngoingGroupCallBroadcastPart * _Nullable)))requestBroadcastPart {
+- (instancetype _Nonnull)initWithQueue:(id<OngoingCallThreadLocalContextQueueWebrtc> _Nonnull)queue
+    networkStateUpdated:(void (^ _Nonnull)(GroupCallNetworkState))networkStateUpdated
+    audioLevelsUpdated:(void (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull))audioLevelsUpdated
+    inputDeviceId:(NSString * _Nonnull)inputDeviceId
+    outputDeviceId:(NSString * _Nonnull)outputDeviceId
+    videoCapturer:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer
+    requestMediaChannelDescriptions:(id<OngoingGroupCallMediaChannelDescriptionTask> _Nonnull (^ _Nonnull)(NSArray<NSNumber *> * _Nonnull, void (^ _Nonnull)(NSArray<OngoingGroupCallMediaChannelDescription *> * _Nonnull)))requestMediaChannelDescriptions
+    requestBroadcastPart:(id<OngoingGroupCallBroadcastPartTask> _Nonnull (^ _Nonnull)(int64_t, int64_t, void (^ _Nonnull)(OngoingGroupCallBroadcastPart * _Nullable)))requestBroadcastPart
+    outgoingAudioBitrateKbit:(int32_t)outgoingAudioBitrateKbit
+    videoContentType:(OngoingGroupCallVideoContentType)videoContentType
+    enableNoiseSuppression:(bool)enableNoiseSuppression {
     self = [super init];
     if (self != nil) {
         _queue = queue;
+
+        _sinks = [[NSMutableDictionary alloc] init];
         
         _networkStateUpdated = [networkStateUpdated copy];
         _videoCapturer = videoCapturer;
         
+        tgcalls::VideoContentType _videoContentType;
+        switch (videoContentType) {
+            case OngoingGroupCallVideoContentTypeGeneric: {
+                _videoContentType = tgcalls::VideoContentType::Generic;
+                break;
+            }
+            case OngoingGroupCallVideoContentTypeScreencast: {
+                _videoContentType = tgcalls::VideoContentType::Screencast;
+                break;
+            }
+            case OngoingGroupCallVideoContentTypeNone: {
+                _videoContentType = tgcalls::VideoContentType::None;
+                break;
+            }
+            default: {
+                _videoContentType = tgcalls::VideoContentType::None;
+                break;
+            }
+        }
+        
+        std::vector<tgcalls::VideoCodecName> videoCodecPreferences;
+
+        int minOutgoingVideoBitrateKbit = 500;
+        bool disableOutgoingAudioProcessing = false;
+
+        tgcalls::GroupConfig config;
+        config.need_log = false;
+#if DEBUG
+        config.need_log = true;
+#endif
+
         __weak GroupCallThreadLocalContext *weakSelf = self;
         _instance.reset(new tgcalls::GroupInstanceCustomImpl((tgcalls::GroupInstanceDescriptor){
             .threads = tgcalls::StaticThreads::getThreads(),
+            .config = config,
             .networkStateUpdated = [weakSelf, queue, networkStateUpdated](tgcalls::GroupNetworkState networkState) {
                 [queue dispatch:^{
                     __strong GroupCallThreadLocalContext *strongSelf = weakSelf;
@@ -889,20 +1399,6 @@ private:
             .initialInputDeviceId = inputDeviceId.UTF8String,
             .initialOutputDeviceId = outputDeviceId.UTF8String,
             .videoCapture = [_videoCapturer getInterface],
-            .incomingVideoSourcesUpdated = [incomingVideoSourcesUpdated](std::vector<uint32_t> const &ssrcs) {
-                NSMutableArray<NSNumber *> *mappedSources = [[NSMutableArray alloc] init];
-                for (auto it : ssrcs) {
-                    [mappedSources addObject:@(it)];
-                }
-                incomingVideoSourcesUpdated(mappedSources);
-            },
-            .participantDescriptionsRequired = [participantDescriptionsRequired](std::vector<uint32_t> const &ssrcs) {
-                NSMutableArray<NSNumber *> *mappedSources = [[NSMutableArray alloc] init];
-                for (auto it : ssrcs) {
-                    [mappedSources addObject:@(it)];
-                }
-                participantDescriptionsRequired(mappedSources);
-            },
             .requestBroadcastPart = [requestBroadcastPart](int64_t timestampMilliseconds, int64_t durationMilliseconds, std::function<void(tgcalls::BroadcastPart &&)> completion) -> std::shared_ptr<tgcalls::BroadcastPartTask> {
                 id<OngoingGroupCallBroadcastPartTask> task = requestBroadcastPart(timestampMilliseconds, durationMilliseconds, ^(OngoingGroupCallBroadcastPart * _Nullable part) {
                     tgcalls::BroadcastPart parsedPart;
@@ -937,7 +1433,45 @@ private:
                     completion(std::move(parsedPart));
                 });
                 return std::make_shared<BroadcastPartTaskImpl>(task);
-            }
+            },
+            .outgoingAudioBitrateKbit = outgoingAudioBitrateKbit,
+            .disableOutgoingAudioProcessing = disableOutgoingAudioProcessing,
+            .videoContentType = _videoContentType,
+            .videoCodecPreferences = videoCodecPreferences,
+            .initialEnableNoiseSuppression = enableNoiseSuppression,
+            .requestMediaChannelDescriptions = [requestMediaChannelDescriptions](std::vector<uint32_t> const &ssrcs, std::function<void(std::vector<tgcalls::MediaChannelDescription> &&)> completion) -> std::shared_ptr<tgcalls::RequestMediaChannelDescriptionTask> {
+                NSMutableArray<NSNumber *> *mappedSsrcs = [[NSMutableArray alloc] init];
+                for (auto ssrc : ssrcs) {
+                    [mappedSsrcs addObject:[NSNumber numberWithUnsignedInt:ssrc]];
+                }
+                id<OngoingGroupCallMediaChannelDescriptionTask> task = requestMediaChannelDescriptions(mappedSsrcs, ^(NSArray<OngoingGroupCallMediaChannelDescription *> *channels) {
+                    std::vector<tgcalls::MediaChannelDescription> mappedChannels;
+                    for (OngoingGroupCallMediaChannelDescription *channel in channels) {
+                        tgcalls::MediaChannelDescription mappedChannel;
+                        switch (channel.type) {
+                            case OngoingGroupCallMediaChannelTypeAudio: {
+                                mappedChannel.type = tgcalls::MediaChannelDescription::Type::Audio;
+                                break;
+                            }
+                            case OngoingGroupCallMediaChannelTypeVideo: {
+                                mappedChannel.type = tgcalls::MediaChannelDescription::Type::Video;
+                                break;
+                            }
+                            default: {
+                                continue;
+                            }
+                        }
+                        mappedChannel.audioSsrc = channel.audioSsrc;
+                        mappedChannel.videoInformation = channel.videoDescription.UTF8String ?: "";
+                        mappedChannels.push_back(std::move(mappedChannel));
+                    }
+
+                    completion(std::move(mappedChannels));
+                });
+
+                return std::make_shared<RequestMediaChannelDescriptionTaskImpl>(task);
+            },
+            .minOutgoingVideoBitrateKbit = minOutgoingVideoBitrateKbit
         }));
     }
     return self;
@@ -950,102 +1484,6 @@ private:
     }
 }
 
-static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonnull completion)(NSString * _Nonnull, uint32_t)) {
-    NSMutableDictionary *dict = [[NSMutableDictionary alloc] init];
-    
-    int32_t signedSsrc = *(int32_t *)&payload.ssrc;
-    
-    dict[@"ssrc"] = @(signedSsrc);
-    dict[@"ufrag"] = [NSString stringWithUTF8String:payload.ufrag.c_str()];
-    dict[@"pwd"] = [NSString stringWithUTF8String:payload.pwd.c_str()];
-    
-    NSMutableArray *fingerprints = [[NSMutableArray alloc] init];
-    for (auto &fingerprint : payload.fingerprints) {
-        [fingerprints addObject:@{
-            @"hash": [NSString stringWithUTF8String:fingerprint.hash.c_str()],
-            @"fingerprint": [NSString stringWithUTF8String:fingerprint.fingerprint.c_str()],
-            @"setup": [NSString stringWithUTF8String:fingerprint.setup.c_str()]
-        }];
-    }
-    
-    dict[@"fingerprints"] = fingerprints;
-    
-    NSMutableArray *parsedVideoSsrcGroups = [[NSMutableArray alloc] init];
-    NSMutableArray *parsedVideoSources = [[NSMutableArray alloc] init];
-    for (auto &group : payload.videoSourceGroups) {
-        NSMutableDictionary *parsedGroup = [[NSMutableDictionary alloc] init];
-        parsedGroup[@"semantics"] = [NSString stringWithUTF8String:group.semantics.c_str()];
-        NSMutableArray *sources = [[NSMutableArray alloc] init];
-        for (auto &source : group.ssrcs) {
-            [sources addObject:@(source)];
-            if (![parsedVideoSources containsObject:@(source)]) {
-                [parsedVideoSources addObject:@(source)];
-            }
-        }
-        parsedGroup[@"sources"] = sources;
-        [parsedVideoSsrcGroups addObject:parsedGroup];
-    }
-    if (parsedVideoSsrcGroups.count != 0) {
-        dict[@"ssrc-groups"] = parsedVideoSsrcGroups;
-    }
-    
-    NSMutableArray *videoPayloadTypes = [[NSMutableArray alloc] init];
-    for (auto &payloadType : payload.videoPayloadTypes) {
-        NSMutableDictionary *parsedType = [[NSMutableDictionary alloc] init];
-        parsedType[@"id"] = @(payloadType.id);
-        NSString *name = [NSString stringWithUTF8String:payloadType.name.c_str()];
-        parsedType[@"name"] = name;
-        parsedType[@"clockrate"] = @(payloadType.clockrate);
-        if (![name isEqualToString:@"rtx"]) {
-            parsedType[@"channels"] = @(payloadType.channels);
-        }
-        
-        NSMutableDictionary *parsedParameters = [[NSMutableDictionary alloc] init];
-        for (auto &it : payloadType.parameters) {
-            NSString *key = [NSString stringWithUTF8String:it.first.c_str()];
-            NSString *value = [NSString stringWithUTF8String:it.second.c_str()];
-            parsedParameters[key] = value;
-        }
-        if (parsedParameters.count != 0) {
-            parsedType[@"parameters"] = parsedParameters;
-        }
-        
-        if (![name isEqualToString:@"rtx"]) {
-            NSMutableArray *parsedFbs = [[NSMutableArray alloc] init];
-            for (auto &it : payloadType.feedbackTypes) {
-                NSMutableDictionary *parsedFb = [[NSMutableDictionary alloc] init];
-                parsedFb[@"type"] = [NSString stringWithUTF8String:it.type.c_str()];
-                if (it.subtype.size() != 0) {
-                    parsedFb[@"subtype"] = [NSString stringWithUTF8String:it.subtype.c_str()];
-                }
-                [parsedFbs addObject:parsedFb];
-            }
-            parsedType[@"rtcp-fbs"] = parsedFbs;
-        }
-        
-        [videoPayloadTypes addObject:parsedType];
-    }
-    if (videoPayloadTypes.count != 0) {
-        dict[@"payload-types"] = videoPayloadTypes;
-    }
-    
-    NSMutableArray *parsedExtensions = [[NSMutableArray alloc] init];
-    for (auto &it : payload.videoExtensionMap) {
-        NSMutableDictionary *parsedExtension = [[NSMutableDictionary alloc] init];
-        parsedExtension[@"id"] = @(it.first);
-        parsedExtension[@"uri"] = [NSString stringWithUTF8String:it.second.c_str()];
-        [parsedExtensions addObject:parsedExtension];
-    }
-    if (parsedExtensions.count != 0) {
-        dict[@"rtp-hdrexts"] = parsedExtensions;
-    }
-    
-    NSData *data = [NSJSONSerialization dataWithJSONObject:dict options:0 error:nil];
-    NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-    
-    completion(string, payload.ssrc);
-}
-
 - (void)setConnectionMode:(OngoingCallConnectionMode)connectionMode keepBroadcastConnectedIfWasEnabled:(bool)keepBroadcastConnectedIfWasEnabled {
     if (_instance) {
         tgcalls::GroupConnectionMode mappedConnectionMode;
@@ -1073,168 +1511,15 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
 
 - (void)emitJoinPayload:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion {
     if (_instance) {
-        _instance->emitJoinPayload([completion](tgcalls::GroupJoinPayload payload) {
-            processJoinPayload(payload, completion);
+        _instance->emitJoinPayload([completion](tgcalls::GroupJoinPayload const &payload) {
+            completion([NSString stringWithUTF8String:payload.json.c_str()], payload.audioSsrc);
         });
     }
 }
 
-- (void)setJoinResponsePayload:(NSString * _Nonnull)payload participants:(NSArray<OngoingGroupCallParticipantDescription *> * _Nonnull)participants {
-    tgcalls::GroupJoinResponsePayload result;
-    
-    NSData *payloadData = [payload dataUsingEncoding:NSUTF8StringEncoding];
-    if (payloadData == nil) {
-        return;
-    }
-    
-    NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:payloadData options:0 error:nil];
-    if (![dict isKindOfClass:[NSDictionary class]]) {
-        return;
-    }
-    
-    NSDictionary *transport = dict[@"transport"];
-    if (![transport isKindOfClass:[NSDictionary class]]) {
-        return;
-    }
-    
-    NSString *pwd = transport[@"pwd"];
-    if (![pwd isKindOfClass:[NSString class]]) {
-        return;
-    }
-    
-    NSString *ufrag = transport[@"ufrag"];
-    if (![ufrag isKindOfClass:[NSString class]]) {
-        return;
-    }
-    
-    result.pwd = [pwd UTF8String];
-    result.ufrag = [ufrag UTF8String];
-    
-    NSArray *fingerprintsValue = transport[@"fingerprints"];
-    if (![fingerprintsValue isKindOfClass:[NSArray class]]) {
-        //return;
-    }
-    
-    for (NSDictionary *fingerprintValue in fingerprintsValue) {
-        if (![fingerprintValue isKindOfClass:[NSDictionary class]]) {
-            continue;
-        }
-        NSString *hashValue = fingerprintValue[@"hash"];
-        if (![hashValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *fingerprint = fingerprintValue[@"fingerprint"];
-        if (![fingerprint isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *setup = fingerprintValue[@"setup"];
-        if (![setup isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        tgcalls::GroupJoinPayloadFingerprint parsed;
-        parsed.fingerprint = [fingerprint UTF8String];
-        parsed.setup = [setup UTF8String];
-        parsed.hash = [hashValue UTF8String];
-        result.fingerprints.push_back(parsed);
-    }
-    
-    NSArray *candidatesValue = transport[@"candidates"];
-    if (![candidatesValue isKindOfClass:[NSArray class]]) {
-        return;
-    }
-    
-    for (NSDictionary *candidateValue in candidatesValue) {
-        if (![candidateValue isKindOfClass:[NSDictionary class]]) {
-            continue;
-        }
-        
-        NSString *portValue = candidateValue[@"port"];
-        if (![portValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *protocolValue = candidateValue[@"protocol"];
-        if (![protocolValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *networkValue = candidateValue[@"network"];
-        if (![networkValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *generationValue = candidateValue[@"generation"];
-        if (![generationValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *idValue = candidateValue[@"id"];
-        if (![idValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *componentValue = candidateValue[@"component"];
-        if (![componentValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *foundationValue = candidateValue[@"foundation"];
-        if (![foundationValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *priorityValue = candidateValue[@"priority"];
-        if (![priorityValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *ipValue = candidateValue[@"ip"];
-        if (![ipValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        NSString *typeValue = candidateValue[@"type"];
-        if (![typeValue isKindOfClass:[NSString class]]) {
-            continue;
-        }
-        
-        NSString *tcpTypeValue = candidateValue[@"tcptype"];
-        if (![tcpTypeValue isKindOfClass:[NSString class]]) {
-            tcpTypeValue = @"";
-        }
-        NSString *relAddrValue = candidateValue[@"rel-addr"];
-        if (![relAddrValue isKindOfClass:[NSString class]]) {
-            relAddrValue = @"";
-        }
-        NSString *relPortValue = candidateValue[@"rel-port"];
-        if (![relPortValue isKindOfClass:[NSString class]]) {
-            relPortValue = @"";
-        }
-        
-        tgcalls::GroupJoinResponseCandidate candidate;
-        
-        candidate.port = [portValue UTF8String];
-        candidate.protocol = [protocolValue UTF8String];
-        candidate.network = [networkValue UTF8String];
-        candidate.generation = [generationValue UTF8String];
-        candidate.id = [idValue UTF8String];
-        candidate.component = [componentValue UTF8String];
-        candidate.foundation = [foundationValue UTF8String];
-        candidate.priority = [priorityValue UTF8String];
-        candidate.ip = [ipValue UTF8String];
-        candidate.type = [typeValue UTF8String];
-        
-        candidate.tcpType = [tcpTypeValue UTF8String];
-        candidate.relAddr = [relAddrValue UTF8String];
-        candidate.relPort = [relPortValue UTF8String];
-        
-        result.candidates.push_back(candidate);
-    }
-    
-    std::vector<tgcalls::GroupParticipantDescription> parsedParticipants;
-    for (OngoingGroupCallParticipantDescription *participant in participants) {
-        tgcalls::GroupParticipantDescription parsedParticipant;
-        parsedParticipant.audioSsrc = participant.audioSsrc;
-        
-        if (participant.jsonParams.length != 0) {
-            [self parseJsonIntoParticipant:participant.jsonParams participant:parsedParticipant];
-        }
-        parsedParticipants.push_back(parsedParticipant);
-    }
-    
+- (void)setJoinResponsePayload:(NSString * _Nonnull)payload {
     if (_instance) {
-        _instance->setJoinResponsePayload(result, std::move(parsedParticipants));
+        _instance->setJoinResponsePayload(payload.UTF8String);
     }
 }
 
@@ -1248,152 +1533,9 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
     }
 }
 
-- (void)parseJsonIntoParticipant:(NSString *)payload participant:(tgcalls::GroupParticipantDescription &)participant {
-    NSData *payloadData = [payload dataUsingEncoding:NSUTF8StringEncoding];
-    if (payloadData == nil) {
-        return;
-    }
-    
-    NSDictionary *dict = [NSJSONSerialization JSONObjectWithData:payloadData options:0 error:nil];
-    if (![dict isKindOfClass:[NSDictionary class]]) {
-        return;
-    }
-    
-    NSString *endpointId = dict[@"endpoint"];
-    if (![endpointId isKindOfClass:[NSString class]]) {
-        return;
-    }
-    
-    participant.endpointId = [endpointId UTF8String];
-    
-    NSArray *ssrcGroups = dict[@"ssrc-groups"];
-    if ([ssrcGroups isKindOfClass:[NSArray class]]) {
-        for (NSDictionary *group in ssrcGroups) {
-            if (![group isKindOfClass:[NSDictionary class]]) {
-                continue;
-            }
-            NSString *semantics = group[@"semantics"];
-            if (![semantics isKindOfClass:[NSString class]]) {
-                continue;
-            }
-            NSArray *sources = group[@"sources"];
-            if (![sources isKindOfClass:[NSArray class]]) {
-                continue;
-            }
-            tgcalls::GroupJoinPayloadVideoSourceGroup groupDesc;
-            for (NSNumber *nSsrc in sources) {
-                if ([nSsrc isKindOfClass:[NSNumber class]]) {
-                    groupDesc.ssrcs.push_back([nSsrc unsignedIntValue]);
-                }
-            }
-            groupDesc.semantics = [semantics UTF8String];
-            participant.videoSourceGroups.push_back(groupDesc);
-        }
-    }
-    
-    NSArray *hdrExts = dict[@"rtp-hdrexts"];
-    if ([hdrExts isKindOfClass:[NSArray class]]) {
-        for (NSDictionary *extDict in hdrExts) {
-            if (![extDict isKindOfClass:[NSDictionary class]]) {
-                continue;
-            }
-            NSNumber *nId = extDict[@"id"];
-            if (![nId isKindOfClass:[NSNumber class]]) {
-                continue;
-            }
-            NSString *uri = extDict[@"uri"];
-            if (![uri isKindOfClass:[NSString class]]) {
-                continue;
-            }
-            participant.videoExtensionMap.push_back(std::make_pair((uint32_t)[nId unsignedIntValue], (std::string)[uri UTF8String]));
-        }
-    }
-    
-    NSArray *payloadTypes = dict[@"payload-types"];
-    if ([payloadTypes isKindOfClass:[NSArray class]]) {
-        for (NSDictionary *payloadDict in payloadTypes) {
-            if (![payloadDict isKindOfClass:[NSDictionary class]]) {
-                continue;
-            }
-            NSNumber *nId = payloadDict[@"id"];
-            if (![nId isKindOfClass:[NSNumber class]]) {
-                continue;
-            }
-            NSNumber *nClockrate = payloadDict[@"clockrate"];
-            if (nClockrate != nil && ![nClockrate isKindOfClass:[NSNumber class]]) {
-                continue;
-            }
-            NSNumber *nChannels = payloadDict[@"channels"];
-            if (nChannels != nil && ![nChannels isKindOfClass:[NSNumber class]]) {
-                continue;
-            }
-            NSString *name = payloadDict[@"name"];
-            if (![name isKindOfClass:[NSString class]]) {
-                continue;
-            }
-            
-            tgcalls::GroupJoinPayloadVideoPayloadType parsedPayload;
-            parsedPayload.id = [nId unsignedIntValue];
-            parsedPayload.clockrate = [nClockrate unsignedIntValue];
-            parsedPayload.channels = [nChannels unsignedIntValue];
-            parsedPayload.name = [name UTF8String];
-            
-            NSArray *fbs = payloadDict[@"rtcp-fbs"];
-            if ([fbs isKindOfClass:[NSArray class]]) {
-                for (NSDictionary *fbDict in fbs) {
-                    if (![fbDict isKindOfClass:[NSDictionary class]]) {
-                        continue;
-                    }
-                    NSString *type = fbDict[@"type"];
-                    if (![type isKindOfClass:[NSString class]]) {
-                        continue;
-                    }
-                    
-                    NSString *subtype = fbDict[@"subtype"];
-                    if (subtype != nil && ![subtype isKindOfClass:[NSString class]]) {
-                        continue;
-                    }
-                    
-                    tgcalls::GroupJoinPayloadVideoPayloadFeedbackType parsedFeedback;
-                    parsedFeedback.type = [type UTF8String];
-                    if (subtype != nil) {
-                        parsedFeedback.subtype = [subtype UTF8String];
-                    }
-                    parsedPayload.feedbackTypes.push_back(parsedFeedback);
-                }
-            }
-            
-            NSDictionary *parameters = payloadDict[@"parameters"];
-            if ([parameters isKindOfClass:[NSDictionary class]]) {
-                for (NSString *nKey in parameters) {
-                    if (![nKey isKindOfClass:[NSString class]]) {
-                        continue;
-                    }
-                    NSString *value = parameters[nKey];
-                    if (![value isKindOfClass:[NSString class]]) {
-                        continue;
-                    }
-                    parsedPayload.parameters.push_back(std::make_pair((std::string)[nKey UTF8String], (std::string)[value UTF8String]));
-                }
-            }
-            participant.videoPayloadTypes.push_back(parsedPayload);
-        }
-    }
-}
-
-- (void)addParticipants:(NSArray<OngoingGroupCallParticipantDescription *> * _Nonnull)participants {
+- (void)removeIncomingVideoSource:(uint32_t)ssrc {
     if (_instance) {
-        std::vector<tgcalls::GroupParticipantDescription> parsedParticipants;
-        for (OngoingGroupCallParticipantDescription *participant in participants) {
-            tgcalls::GroupParticipantDescription parsedParticipant;
-            parsedParticipant.audioSsrc = participant.audioSsrc;
-            
-            if (participant.jsonParams.length != 0) {
-                [self parseJsonIntoParticipant:participant.jsonParams participant:parsedParticipant];
-            }
-            parsedParticipants.push_back(parsedParticipant);
-        }
-        _instance->addParticipants(std::move(parsedParticipants));
+        _instance->removeIncomingVideoSource(ssrc);
     }
 }
 
@@ -1403,19 +1545,21 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
     }
 }
 
+- (void)setIsNoiseSuppressionEnabled:(bool)isNoiseSuppressionEnabled {
+    if (_instance) {
+        _instance->setIsNoiseSuppressionEnabled(isNoiseSuppressionEnabled);
+    }
+}
+
 - (void)requestVideo:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer completion:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion {
     if (_instance) {
-        _instance->setVideoCapture([videoCapturer getInterface], [completion](auto payload){
-            processJoinPayload(payload, completion);
-        });
+        _instance->setVideoCapture([videoCapturer getInterface]);
     }
 }
 
 - (void)disableVideo:(void (^ _Nonnull)(NSString * _Nonnull, uint32_t))completion {
     if (_instance) {
-        _instance->setVideoCapture(nullptr, [completion](auto payload){
-            processJoinPayload(payload, completion);
-        });
+        _instance->setVideoCapture(nullptr);
     }
 }
 
@@ -1425,9 +1569,58 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
     }
 }
 
-- (void)setFullSizeVideoSsrc:(uint32_t)ssrc {
+- (void)setRequestedVideoChannels:(NSArray<OngoingGroupCallRequestedVideoChannel *> * _Nonnull)requestedVideoChannels {
     if (_instance) {
-        _instance->setFullSizeVideoSsrc(ssrc);
+        std::vector<tgcalls::VideoChannelDescription> mappedChannels;
+        for (OngoingGroupCallRequestedVideoChannel *channel : requestedVideoChannels) {
+            tgcalls::VideoChannelDescription description;
+            description.audioSsrc = channel.audioSsrc;
+            description.endpointId = channel.endpointId.UTF8String ?: "";
+            for (OngoingGroupCallSsrcGroup *group in channel.ssrcGroups) {
+                tgcalls::MediaSsrcGroup parsedGroup;
+                parsedGroup.semantics = group.semantics.UTF8String ?: "";
+                for (NSNumber *ssrc in group.ssrcs) {
+                    parsedGroup.ssrcs.push_back([ssrc unsignedIntValue]);
+                }
+                description.ssrcGroups.push_back(std::move(parsedGroup));
+            }
+            switch (channel.minQuality) {
+                case OngoingGroupCallRequestedVideoQualityThumbnail: {
+                    description.minQuality = tgcalls::VideoChannelDescription::Quality::Thumbnail;
+                    break;
+                }
+                case OngoingGroupCallRequestedVideoQualityMedium: {
+                    description.minQuality = tgcalls::VideoChannelDescription::Quality::Medium;
+                    break;
+                }
+                case OngoingGroupCallRequestedVideoQualityFull: {
+                    description.minQuality = tgcalls::VideoChannelDescription::Quality::Full;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            switch (channel.maxQuality) {
+                case OngoingGroupCallRequestedVideoQualityThumbnail: {
+                    description.maxQuality = tgcalls::VideoChannelDescription::Quality::Thumbnail;
+                    break;
+                }
+                case OngoingGroupCallRequestedVideoQualityMedium: {
+                    description.maxQuality = tgcalls::VideoChannelDescription::Quality::Medium;
+                    break;
+                }
+                case OngoingGroupCallRequestedVideoQualityFull: {
+                    description.maxQuality = tgcalls::VideoChannelDescription::Quality::Full;
+                    break;
+                }
+                default: {
+                    break;
+                }
+            }
+            mappedChannels.push_back(std::move(description));
+        }
+        _instance->setRequestedVideoChannels(std::move(mappedChannels));
     }
 }
 
@@ -1442,29 +1635,70 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
     }
 }
 
-- (void)makeIncomingVideoViewWithSsrc:(uint32_t)ssrc completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion {
+- (void)makeIncomingVideoViewWithEndpointId:(NSString * _Nonnull)endpointId requestClone:(bool)requestClone completion:(void (^_Nonnull)(UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable, UIView<OngoingCallThreadLocalContextWebrtcVideoView> * _Nullable))completion {
     if (_instance) {
         __weak GroupCallThreadLocalContext *weakSelf = self;
         id<OngoingCallThreadLocalContextQueueWebrtc> queue = _queue;
         dispatch_async(dispatch_get_main_queue(), ^{
-            if ([VideoMetalView isSupported]) {
+            BOOL useSampleBuffer = NO;
+#ifdef WEBRTC_IOS
+            useSampleBuffer = YES;
+#endif
+            if (useSampleBuffer) {
+                VideoSampleBufferView *remoteRenderer = [[VideoSampleBufferView alloc] initWithFrame:CGRectZero];
+                remoteRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+
+                std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
+
+                VideoSampleBufferView *cloneRenderer = nil;
+                if (requestClone) {
+                    cloneRenderer = [[VideoSampleBufferView alloc] initWithFrame:CGRectZero];
+                    cloneRenderer.videoContentMode = UIViewContentModeScaleAspectFill;
+#ifdef WEBRTC_IOS
+                    [remoteRenderer setCloneTarget:cloneRenderer];
+#endif
+                }
+
+                [queue dispatch:^{
+                    __strong GroupCallThreadLocalContext *strongSelf = weakSelf;
+                    if (strongSelf && strongSelf->_instance) {
+                        strongSelf->_instance->addIncomingVideoOutput(endpointId.UTF8String, sink);
+                    }
+                }];
+
+                completion(remoteRenderer, cloneRenderer);
+            } else if ([VideoMetalView isSupported]) {
                 VideoMetalView *remoteRenderer = [[VideoMetalView alloc] initWithFrame:CGRectZero];
-#if TARGET_OS_IPHONE
+#ifdef WEBRTC_IOS
                 remoteRenderer.videoContentMode = UIViewContentModeScaleToFill;
 #else
-                remoteRenderer.videoContentMode = UIViewContentModeScaleAspect;
+                remoteRenderer.videoContentMode = kCAGravityResizeAspectFill;
 #endif
+
+                VideoMetalView *cloneRenderer = nil;
+                if (requestClone) {
+                    cloneRenderer = [[VideoMetalView alloc] initWithFrame:CGRectZero];
+#ifdef WEBRTC_IOS
+                    cloneRenderer.videoContentMode = UIViewContentModeScaleToFill;
+#else
+                    cloneRenderer.videoContentMode = kCAGravityResizeAspectFill;
+#endif
+                }
                 
                 std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> sink = [remoteRenderer getSink];
+                std::shared_ptr<rtc::VideoSinkInterface<webrtc::VideoFrame>> cloneSink = [cloneRenderer getSink];
                 
                 [queue dispatch:^{
                     __strong GroupCallThreadLocalContext *strongSelf = weakSelf;
                     if (strongSelf && strongSelf->_instance) {
-                        strongSelf->_instance->addIncomingVideoOutput(ssrc, sink);
+                        strongSelf->_instance->addIncomingVideoOutput(endpointId.UTF8String, sink);
+                        if (cloneSink) {
+                            strongSelf->_instance->addIncomingVideoOutput(endpointId.UTF8String, cloneSink);
+                        }
                     }
                 }];
                 
-                completion(remoteRenderer);
+                completion(remoteRenderer, cloneRenderer);
             } else {
                 GLVideoView *remoteRenderer = [[GLVideoView alloc] initWithFrame:CGRectZero];
              //   [remoteRenderer setVideoContentMode:kCAGravityResizeAspectFill];
@@ -1473,25 +1707,62 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
                 [queue dispatch:^{
                     __strong GroupCallThreadLocalContext *strongSelf = weakSelf;
                     if (strongSelf && strongSelf->_instance) {
-                        strongSelf->_instance->addIncomingVideoOutput(ssrc, sink);
+                        strongSelf->_instance->addIncomingVideoOutput(endpointId.UTF8String, sink);
                     }
                 }];
                 
-                completion(remoteRenderer);
+                completion(remoteRenderer, nil);
             }
         });
     }
 }
 
+- (GroupCallDisposable * _Nonnull)addVideoOutputWithEndpointId:(NSString * _Nonnull)endpointId sink:(void (^_Nonnull)(CallVideoFrameData * _Nonnull))sink {
+    int sinkId = _nextSinkId;
+    _nextSinkId += 1;
+
+    GroupCallVideoSink *storedSink = [[GroupCallVideoSink alloc] initWithSink:sink];
+    _sinks[@(sinkId)] = storedSink;
+
+    if (_instance) {
+        _instance->addIncomingVideoOutput(endpointId.UTF8String, [storedSink sink]);
+    }
+
+    __weak GroupCallThreadLocalContext *weakSelf = self;
+    id<OngoingCallThreadLocalContextQueueWebrtc> queue = _queue;
+    return [[GroupCallDisposable alloc] initWithBlock:^{
+        [queue dispatch:^{
+            __strong GroupCallThreadLocalContext *strongSelf = weakSelf;
+            if (!strongSelf) {
+                return;
+            }
+
+            [strongSelf->_sinks removeObjectForKey:@(sinkId)];
+        }];
+    }];
+}
+
+- (void)addExternalAudioData:(NSData * _Nonnull)data {
+    if (_instance) {
+        std::vector<uint8_t> samples;
+        samples.resize(data.length);
+        [data getBytes:samples.data() length:data.length];
+        _instance->addExternalAudioSamples(std::move(samples));
+    }
+}
+
 @end
 
-@implementation OngoingGroupCallParticipantDescription
+@implementation OngoingGroupCallMediaChannelDescription
 
-- (instancetype _Nonnull)initWithAudioSsrc:(uint32_t)audioSsrc jsonParams:(NSString * _Nullable)jsonParams {
+- (instancetype _Nonnull)initWithType:(OngoingGroupCallMediaChannelType)type
+    audioSsrc:(uint32_t)audioSsrc
+    videoDescription:(NSString * _Nullable)videoDescription {
     self = [super init];
     if (self != nil) {
+        _type = type;
         _audioSsrc = audioSsrc;
-        _jsonParams = jsonParams;
+        _videoDescription = videoDescription;
     }
     return self;
 }
@@ -1512,3 +1783,32 @@ static void processJoinPayload(tgcalls::GroupJoinPayload &payload, void (^ _Nonn
 }
 
 @end
+
+@implementation OngoingGroupCallSsrcGroup
+
+- (instancetype)initWithSemantics:(NSString * _Nonnull)semantics ssrcs:(NSArray<NSNumber *> * _Nonnull)ssrcs {
+    self = [super init];
+    if (self != nil) {
+        _semantics = semantics;
+        _ssrcs = ssrcs;
+    }
+    return self;
+}
+
+@end
+
+@implementation OngoingGroupCallRequestedVideoChannel
+
+- (instancetype)initWithAudioSsrc:(uint32_t)audioSsrc endpointId:(NSString * _Nonnull)endpointId ssrcGroups:(NSArray<OngoingGroupCallSsrcGroup *> * _Nonnull)ssrcGroups minQuality:(OngoingGroupCallRequestedVideoQuality)minQuality maxQuality:(OngoingGroupCallRequestedVideoQuality)maxQuality {
+    self = [super init];
+    if (self != nil) {
+        _audioSsrc = audioSsrc;
+        _endpointId = endpointId;
+        _ssrcGroups = ssrcGroups;
+        _minQuality = minQuality;
+        _maxQuality = maxQuality;
+    }
+    return self;
+}
+
+@end
diff --git a/submodules/TgVoipWebrtc/tgcalls b/submodules/TgVoipWebrtc/tgcalls
index 1c16a122c5..ef79634980 160000
--- a/submodules/TgVoipWebrtc/tgcalls
+++ b/submodules/TgVoipWebrtc/tgcalls
@@ -1 +1 @@
-Subproject commit 1c16a122c5cad736c4545fd1e37539adc4c4cb52
+Subproject commit ef796349808b187b80b75ea1876b940f2882fcbb
diff --git a/submodules/TooltipUI/Sources/TooltipScreen.swift b/submodules/TooltipUI/Sources/TooltipScreen.swift
index fab46460a7..49b47ecb42 100644
--- a/submodules/TooltipUI/Sources/TooltipScreen.swift
+++ b/submodules/TooltipUI/Sources/TooltipScreen.swift
@@ -44,6 +44,8 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
     private let backgroundContainerNode: ASDisplayNode
     private let backgroundNode: ASImageNode
     private var effectView: UIView?
+    private var gradientNode: ASDisplayNode?
+    private var arrowGradientNode: ASDisplayNode?
     private let arrowNode: ASImageNode
     private let arrowContainer: ASDisplayNode
     private var arrowEffectView: UIView?
@@ -121,7 +123,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
         self.arrowContainer = ASDisplayNode()
         
         let fontSize: CGFloat
-        if style == .light {
+        if case .light = style {
             self.effectView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
             self.backgroundContainerNode.clipsToBounds = true
             self.backgroundContainerNode.cornerRadius = 14.0
@@ -133,6 +135,38 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
             self.arrowEffectView = UIVisualEffectView(effect: UIBlurEffect(style: .light))
             self.arrowContainer.view.addSubview(self.arrowEffectView!)
             
+            let maskLayer = CAShapeLayer()
+            if let path = try? svgPath("M85.882251,0 C79.5170552,0 73.4125613,2.52817247 68.9116882,7.02834833 L51.4264069,24.5109211 C46.7401154,29.1964866 39.1421356,29.1964866 34.4558441,24.5109211 L16.9705627,7.02834833 C12.4696897,2.52817247 6.36519576,0 0,0 L85.882251,0 ", scale: CGPoint(x: 0.333333, y: 0.333333), offset: CGPoint()) {
+                maskLayer.path = path.cgPath
+            }
+            maskLayer.frame = CGRect(origin: CGPoint(), size: arrowSize)
+            self.arrowContainer.layer.mask = maskLayer
+        } else if case let .gradient(leftColor, rightColor) = style {
+            self.gradientNode = ASDisplayNode()
+            self.gradientNode?.setLayerBlock({
+                let layer = CAGradientLayer()
+                layer.colors = [leftColor.cgColor, rightColor.cgColor]
+                layer.startPoint = CGPoint()
+                layer.endPoint = CGPoint(x: 1.0, y: 0.0)
+                return layer
+            })
+            self.arrowGradientNode = ASDisplayNode()
+            self.arrowGradientNode?.setLayerBlock({
+                let layer = CAGradientLayer()
+                layer.colors = [leftColor.cgColor, rightColor.cgColor]
+                layer.startPoint = CGPoint()
+                layer.endPoint = CGPoint(x: 1.0, y: 0.0)
+                return layer
+            })
+            self.backgroundContainerNode.clipsToBounds = true
+            self.backgroundContainerNode.cornerRadius = 14.0
+            if #available(iOS 13.0, *) {
+                self.backgroundContainerNode.layer.cornerCurve = .continuous
+            }
+            fontSize = 17.0
+            
+            self.arrowContainer.addSubnode(self.arrowGradientNode!)
+            
             let maskLayer = CAShapeLayer()
             if let path = try? svgPath("M85.882251,0 C79.5170552,0 73.4125613,2.52817247 68.9116882,7.02834833 L51.4264069,24.5109211 C46.7401154,29.1964866 39.1421356,29.1964866 34.4558441,24.5109211 L16.9705627,7.02834833 C12.4696897,2.52817247 6.36519576,0 0,0 L85.882251,0 ", scale: CGPoint(x: 0.333333, y: 0.333333), offset: CGPoint()) {
                 maskLayer.path = path.cgPath
@@ -178,7 +212,12 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
         self.containerNode.addSubnode(self.backgroundContainerNode)
         self.arrowContainer.addSubnode(self.arrowNode)
         self.backgroundNode.addSubnode(self.arrowContainer)
-        if let effectView = self.effectView {
+        if let gradientNode = self.gradientNode {
+            self.backgroundContainerNode.addSubnode(gradientNode)
+            self.containerNode.addSubnode(self.arrowContainer)
+            self.arrowNode.removeFromSupernode()
+        }
+        else if let effectView = self.effectView {
             self.backgroundContainerNode.view.addSubview(effectView)
             if let _ = self.arrowEffectView {
                 self.containerNode.addSubnode(self.arrowContainer)
@@ -259,7 +298,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
         
         let sideInset: CGFloat = 13.0 + layout.safeInsets.left
         let bottomInset: CGFloat = 10.0
-        let contentInset: CGFloat = 9.0
+        let contentInset: CGFloat = 11.0
         let contentVerticalInset: CGFloat = 11.0
         let animationSize: CGSize
         let animationInset: CGFloat
@@ -288,7 +327,7 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
         
         let backgroundHeight: CGFloat
         switch self.tooltipStyle {
-            case .default:
+            case .default, .gradient:
                 backgroundHeight = max(animationSize.height, textSize.height) + contentVerticalInset * 2.0
             case .light:
                 backgroundHeight = max(28.0, max(animationSize.height, textSize.height) + 4.0 * 2.0)
@@ -331,6 +370,9 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
         if let effectView = self.effectView {
             transition.updateFrame(view: effectView, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
         }
+        if let gradientNode = self.gradientNode {
+            transition.updateFrame(node: gradientNode, frame: CGRect(origin: CGPoint(), size: backgroundFrame.size))
+        }
         if let image = self.arrowNode.image, case let .point(rect, arrowPosition) = self.location {
             let arrowSize = image.size
             let arrowCenterX = rect.midX
@@ -348,8 +390,10 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
                     
                     transition.updateFrame(node: self.arrowContainer, frame: arrowFrame.offsetBy(dx: -backgroundFrame.minX, dy: 0.0))
                     
-                    self.arrowNode.frame = CGRect(origin: CGPoint(), size: arrowSize)
-                    self.arrowEffectView?.frame = CGRect(origin: CGPoint(), size: arrowSize)
+                    let arrowBounds = CGRect(origin: CGPoint(), size: arrowSize)
+                    self.arrowNode.frame = arrowBounds
+                    self.arrowEffectView?.frame = arrowBounds
+                    self.arrowGradientNode?.frame = CGRect(origin: CGPoint(x: -arrowFrame.minX + backgroundFrame.minX, y: 0.0), size:  backgroundFrame.size)
                 case .right:
                     arrowFrame = CGRect(origin: CGPoint(x: backgroundFrame.width + arrowSize.height, y: rect.midY), size: CGSize(width: arrowSize.height, height: arrowSize.width))
                     
@@ -357,8 +401,10 @@ private final class TooltipScreenNode: ViewControllerTracingNode {
                     
                     transition.updateFrame(node: self.arrowContainer, frame: arrowFrame.offsetBy(dx: 0.0, dy: -backgroundFrame.minY - floorToScreenPixels((backgroundFrame.height - arrowSize.width) / 2.0)))
                     
-                    self.arrowNode.frame = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize)
-                    self.arrowEffectView?.frame = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize)
+                    let arrowBounds = CGRect(origin: CGPoint(x: 0.0, y: -0.5), size: arrowSize)
+                    self.arrowNode.frame = arrowBounds
+                    self.arrowEffectView?.frame = arrowBounds
+                    self.arrowGradientNode?.frame = arrowBounds
             }
         } else {
             self.arrowNode.isHidden = true
@@ -508,6 +554,7 @@ public final class TooltipScreen: ViewController {
     public enum Style {
         case `default`
         case light
+        case gradient(UIColor, UIColor)
     }
     
     public let text: String
diff --git a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
index 76eac05f37..0b33273d6b 100644
--- a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIKitUtils.m
@@ -84,38 +84,10 @@ CGFloat springAnimationValueAtImpl(CABasicAnimation * _Nonnull animation, CGFloa
 
 @interface CustomBlurEffect : UIBlurEffect
 
-/*@property (nonatomic) double blurRadius;
-@property (nonatomic) double colorBurnTintAlpha;
-@property (nonatomic) double colorBurnTintLevel;
-@property (nonatomic, retain) UIColor *colorTint;
-@property (nonatomic) double colorTintAlpha;
-@property (nonatomic) bool darkenWithSourceOver;
-@property (nonatomic) double darkeningTintAlpha;
-@property (nonatomic) double darkeningTintHue;
-@property (nonatomic) double darkeningTintSaturation;
-@property (nonatomic) double grayscaleTintAlpha;
-@property (nonatomic) double grayscaleTintLevel;
-@property (nonatomic) bool lightenGrayscaleWithSourceOver;
-@property (nonatomic) double saturationDeltaFactor;
-@property (nonatomic) double scale;
-@property (nonatomic) double zoom;*/
-
 + (id)effectWithStyle:(long long)arg1;
 
 @end
 
-static NSString *encodeText(NSString *string, int key) {
-    NSMutableString *result = [[NSMutableString alloc] init];
-    
-    for (int i = 0; i < (int)[string length]; i++) {
-        unichar c = [string characterAtIndex:i];
-        c += key;
-        [result appendString:[NSString stringWithCharacters:&c length:1]];
-    }
-    
-    return result;
-}
-
 static void setField(CustomBlurEffect *object, NSString *name, double value) {
     SEL selector = NSSelectorFromString(name);
     NSMethodSignature *signature = [[object class] instanceMethodSignatureForSelector:selector];
@@ -145,7 +117,7 @@ static void setNilField(CustomBlurEffect *object, NSString *name) {
     [inv invoke];
 }
 
-static void setBoolField(CustomBlurEffect *object, NSString *name, BOOL value) {
+static void setBoolField(NSObject *object, NSString *name, BOOL value) {
     SEL selector = NSSelectorFromString(name);
     NSMethodSignature *signature = [[object class] instanceMethodSignatureForSelector:selector];
     if (signature == nil) {
@@ -170,18 +142,17 @@ UIBlurEffect *makeCustomZoomBlurEffectImpl(bool isLight) {
         NSString *string = [@[@"_", @"UI", @"Custom", @"BlurEffect"] componentsJoinedByString:@""];
         CustomBlurEffect *result = (CustomBlurEffect *)[NSClassFromString(string) effectWithStyle:0];
         
-        setField(result, encodeText(@"tfuCmvsSbejvt;", -1), 10.0);
-        //setField(result, encodeText(@"tfu[ppn;", -1), 0.015);
-        setNilField(result, encodeText(@"tfuDpmpsUjou;", -1));
-        setField(result, encodeText(@"tfuDpmpsUjouBmqib;", -1), 0.0);
-        setField(result, encodeText(@"tfuEbslfojohUjouBmqib;", -1), 0.0);
-        setField(result, encodeText(@"tfuHsbztdbmfUjouBmqib;", -1), 0.0);
-        setField(result, encodeText(@"tfuTbuvsbujpoEfmubGbdups;", -1), 1.0);
+        setField(result, [@[@"set", @"BlurRadius", @":"] componentsJoinedByString:@""], 10.0);
+        setNilField(result, [@[@"set", @"Color", @"Tint", @":"] componentsJoinedByString:@""]);
+        setField(result, [@[@"set", @"Color", @"Tint", @"Alpha", @":"] componentsJoinedByString:@""], 0.0);
+        setField(result, [@[@"set", @"Darkening", @"Tint", @"Alpha", @":"] componentsJoinedByString:@""], 0.0);
+        setField(result, [@[@"set", @"Grayscale", @"Tint", @"Alpha", @":"] componentsJoinedByString:@""], 0.0);
+        setField(result, [@[@"set", @"Saturation", @"Delta", @"Factor", @":"] componentsJoinedByString:@""], 1.0);
         
         if ([UIScreen mainScreen].scale > 2.5f) {
-            setField(result, encodeText(@"setScale:", 0), 0.3);
+            setField(result, @"setScale:", 0.3);
         } else {
-            setField(result, encodeText(@"setScale:", 0), 0.5);
+            setField(result, @"setScale:", 0.5);
         }
         
         return result;
@@ -191,7 +162,9 @@ UIBlurEffect *makeCustomZoomBlurEffectImpl(bool isLight) {
 }
 
 void applySmoothRoundedCornersImpl(CALayer * _Nonnull layer) {
-    if (@available(iOS 11.0, *)) {
-        setBoolField(layer, encodeText(@"tfuDpoujovpvtDpsofst;", -1), true);
+    if (@available(iOS 13.0, *)) {
+        layer.cornerCurve = kCACornerCurveContinuous;
+    } else {
+        setBoolField(layer, [@[@"set", @"Continuous", @"Corners", @":"] componentsJoinedByString:@""], true);
     }
 }
diff --git a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h
index ac34185f2b..e34181f313 100644
--- a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.h
@@ -23,7 +23,7 @@ typedef NS_OPTIONS(NSUInteger, UIResponderDisableAutomaticKeyboardHandling) {
 @property (nonatomic) bool disablesInteractiveTransitionGestureRecognizer;
 @property (nonatomic) bool disablesInteractiveKeyboardGestureRecognizer;
 @property (nonatomic) bool disablesInteractiveModalDismiss;
-@property (nonatomic, copy) bool (^ disablesInteractiveTransitionGestureRecognizerNow)();
+@property (nonatomic, copy) bool (^ _Nullable disablesInteractiveTransitionGestureRecognizerNow)();
 
 @property (nonatomic) UIResponderDisableAutomaticKeyboardHandling disableAutomaticKeyboardHandling;
 
@@ -34,10 +34,24 @@ typedef NS_OPTIONS(NSUInteger, UIResponderDisableAutomaticKeyboardHandling) {
 
 @end
 
-void applyKeyboardAutocorrection();
+void applyKeyboardAutocorrection(UITextView * _Nonnull textView);
 
 @interface AboveStatusBarWindow : UIWindow
 
 @property (nonatomic, copy) UIInterfaceOrientationMask (^ _Nullable supportedOrientations)(void);
 
 @end
+
+/*@interface _UIPortalView : UIView
+
+- (void)setSourceView:(UIView * _Nullable)sourceView;
+- (bool)hidesSourceView;
+- (void)setHidesSourceView:(bool)arg1;
+- (void)setMatchesAlpha:(bool)arg1;
+- (void)setMatchesPosition:(bool)arg1;
+- (void)setMatchesTransform:(bool)arg1;
+- (bool)matchesTransform;
+- (bool)matchesPosition;
+- (bool)matchesAlpha;
+
+@end*/
diff --git a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
index a330e45585..4000be50b1 100644
--- a/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
+++ b/submodules/UIKitRuntimeUtils/Source/UIKitRuntimeUtils/UIViewController+Navigation.m
@@ -316,28 +316,15 @@ static NSString *TGEncodeText(NSString *string, int key)
     return result;
 }
 
-void applyKeyboardAutocorrection() {
-    static Class keyboardClass = NULL;
-    static SEL currentInstanceSelector = NULL;
-    static SEL applyVariantSelector = NULL;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        keyboardClass = NSClassFromString(TGEncodeText(@"VJLfzcpbse", -1));
-        
-        currentInstanceSelector = NSSelectorFromString(TGEncodeText(@"bdujwfLfzcpbse", -1));
-        applyVariantSelector = NSSelectorFromString(TGEncodeText(@"bddfquBvupdpssfdujpo", -1));
-    });
-    
-    if ([keyboardClass respondsToSelector:currentInstanceSelector])
-    {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-        id currentInstance = [keyboardClass performSelector:currentInstanceSelector];
-        if ([currentInstance respondsToSelector:applyVariantSelector])
-            [currentInstance performSelector:applyVariantSelector];
-#pragma clang diagnostic pop
+void applyKeyboardAutocorrection(UITextView * _Nonnull textView) {
+    NSRange rangeCopy = textView.selectedRange;
+    NSRange fakeRange = rangeCopy;
+    if (fakeRange.location != 0) {
+        fakeRange.location--;
     }
+    [textView unmarkText];
+    [textView setSelectedRange:fakeRange];
+    [textView setSelectedRange:rangeCopy];
 }
 
 @interface AboveStatusBarWindowController : UIViewController
diff --git a/submodules/UndoUI/Sources/UndoOverlayController.swift b/submodules/UndoUI/Sources/UndoOverlayController.swift
index ab34091394..124e6d17a8 100644
--- a/submodules/UndoUI/Sources/UndoOverlayController.swift
+++ b/submodules/UndoUI/Sources/UndoOverlayController.swift
@@ -17,8 +17,8 @@ public enum UndoOverlayContent {
     case emoji(path: String, text: String)
     case swipeToReply(title: String, text: String)
     case actionSucceeded(title: String, text: String, cancel: String)
-    case stickersModified(title: String, text: String, undo: Bool, info: StickerPackCollectionInfo, topItem: ItemCollectionItem?, account: Account)
-    case dice(dice: TelegramMediaDice, account: Account, text: String, action: String?)
+    case stickersModified(title: String, text: String, undo: Bool, info: StickerPackCollectionInfo, topItem: ItemCollectionItem?, context: AccountContext)
+    case dice(dice: TelegramMediaDice, context: AccountContext, text: String, action: String?)
     case chatAddedToFolder(chatTitle: String, folderTitle: String)
     case chatRemovedFromFolder(chatTitle: String, folderTitle: String)
     case messagesUnpinned(title: String, text: String, undo: Bool, isHidden: Bool)
@@ -35,8 +35,10 @@ public enum UndoOverlayContent {
     case voiceChatRecording(text: String)
     case voiceChatFlag(text: String)
     case voiceChatCanSpeak(text: String)
-    case sticker(account: Account, file: TelegramMediaFile, text: String)
+    case sticker(context: AccountContext, file: TelegramMediaFile, text: String)
     case copy(text: String)
+    case mediaSaved(text: String)
+    case paymentSent(currencyValue: String, itemTitle: String)
 }
 
 public enum UndoOverlayAction {
@@ -55,6 +57,8 @@ public final class UndoOverlayController: ViewController {
     private var didPlayPresentationAnimation = false
     private var dismissed = false
     
+    public var keepOnParentDismissal = false
+    
     public init(presentationData: PresentationData, content: UndoOverlayContent, elevatedLayout: Bool, animateInAsReplacement: Bool = false, action: @escaping (UndoOverlayAction) -> Bool) {
         self.presentationData = presentationData
         self.content = content
diff --git a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
index 3c9459503a..eca7b1c5a6 100644
--- a/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
+++ b/submodules/UndoUI/Sources/UndoOverlayControllerNode.swift
@@ -17,6 +17,7 @@ import SlotMachineAnimationNode
 import AnimationUI
 import StickerResources
 import AvatarNode
+import AccountContext
 
 final class UndoOverlayControllerNode: ViewControllerTracingNode {
     private let elevatedLayout: Bool
@@ -265,6 +266,23 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                     string.addAttribute(.font, value: Font.regular(14.0), range: range)
                 }
                 
+                self.textNode.attributedText = string
+                displayUndo = false
+                self.originalRemainingSeconds = 5
+            case let .paymentSent(currencyValue, itemTitle):
+                self.avatarNode = nil
+                self.iconNode = nil
+                self.iconCheckNode = nil
+                self.animationNode = AnimationNode(animation: "anim_payment", colors: ["info1.info1.stroke": self.animationBackgroundColor, "info2.info2.Fill": self.animationBackgroundColor], scale: 1.0)
+                self.animatedStickerNode = nil
+
+                let (rawString, attributes) = presentationData.strings.Checkout_SuccessfulTooltip(currencyValue, itemTitle)
+
+                let string = NSMutableAttributedString(attributedString: NSAttributedString(string: rawString, font: Font.regular(14.0), textColor: .white))
+                for (_, range) in attributes {
+                    string.addAttribute(.font, value: Font.semibold(14.0), range: range)
+                }
+
                 self.textNode.attributedText = string
                 displayUndo = false
                 self.originalRemainingSeconds = 5
@@ -313,7 +331,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 self.textNode.maximumNumberOfLines = 2
                 displayUndo = false
                 self.originalRemainingSeconds = 5
-            case let .stickersModified(title, text, undo, info, topItem, account):
+            case let .stickersModified(title, text, undo, info, topItem, context):
                 self.avatarNode = nil
                 self.iconNode = nil
                 self.iconCheckNode = nil
@@ -344,7 +362,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                         thumbnailItem = .animated(item.file.resource)
                         resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: item.file.resource)
                     } else if let dimensions = item.file.dimensions, let resource = chatMessageStickerResource(file: item.file, small: true) as? TelegramMediaResource {
-                        thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: []))
+                        thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                         resourceReference = MediaResourceReference.media(media: .standalone(media: item.file), resource: resource)
                     }
                 }
@@ -360,14 +378,14 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                         let stillImageSize = representation.dimensions.cgSize.aspectFitted(imageBoundingSize)
                         self.stickerImageSize = stillImageSize
                         
-                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: account.postbox, resource: representation.resource)
+                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: context.account.postbox, resource: representation.resource)
                     case let .animated(resource):
                         self.stickerImageSize = imageBoundingSize
                         
-                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: account.postbox, resource: resource, animated: true)
+                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: context.account.postbox, resource: resource, animated: true)
                     }
                     if let resourceReference = resourceReference {
-                        updatedFetchSignal = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: resourceReference)
+                        updatedFetchSignal = fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, reference: resourceReference)
                     }
                 } else {
                     updatedImageSignal = .single({ _ in return nil })
@@ -398,10 +416,10 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                     case let .animated(resource):
                         let animatedStickerNode = AnimatedStickerNode()
                         self.animatedStickerNode = animatedStickerNode
-                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: 80, height: 80, mode: .cached)
+                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: context.account, resource: resource), width: 80, height: 80, mode: .cached)
                     }
                 }
-            case let .dice(dice, account, text, action):
+            case let .dice(dice, context, text, action):
                 self.avatarNode = nil
                 self.iconNode = nil
                 self.iconCheckNode = nil
@@ -441,14 +459,14 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                     let animatedStickerNode = AnimatedStickerNode()
                     self.animatedStickerNode = animatedStickerNode
                     
-                    let _ = (loadedStickerPack(postbox: account.postbox, network: account.network, reference: .dice(dice.emoji), forceActualized: false)
+                    let _ = (context.engine.stickers.loadedStickerPack(reference: .dice(dice.emoji), forceActualized: false)
                     |> deliverOnMainQueue).start(next: { stickerPack in
                         if let value = dice.value {
                             switch stickerPack {
                                 case let .result(_, items, _):
                                     let item = items[Int(value)]
                                     if let item = item as? StickerPackItem {
-                                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: item.file.resource), width: 120, height: 120, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
+                                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: context.account, resource: item.file.resource), width: 120, height: 120, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
                                     }
                                 default:
                                     break
@@ -475,7 +493,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 displayUndo = false
                 self.originalRemainingSeconds = 3
             case let .invitedToVoiceChat(context, peer, text):
-                self.avatarNode = AvatarNode(font: avatarPlaceholderFont(size: 16.0))
+                self.avatarNode = AvatarNode(font: avatarPlaceholderFont(size: 15.0))
                 self.iconNode = nil
                 self.iconCheckNode = nil
                 self.animationNode = nil
@@ -596,7 +614,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 
                 displayUndo = false
                 self.originalRemainingSeconds = 3
-            case let .sticker(account, file, text):
+            case let .sticker(context, file, text):
                 self.avatarNode = nil
                 self.iconNode = nil
                 self.iconCheckNode = nil
@@ -618,7 +636,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                     thumbnailItem = .animated(file.resource)
                     resourceReference = MediaResourceReference.media(media: .standalone(media: file), resource: file.resource)
                 } else if let dimensions = file.dimensions, let resource = chatMessageStickerResource(file: file, small: true) as? TelegramMediaResource {
-                    thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: []))
+                    thumbnailItem = .still(TelegramMediaImageRepresentation(dimensions: dimensions, resource: resource, progressiveSizes: [], immediateThumbnailData: nil))
                     resourceReference = MediaResourceReference.media(media: .standalone(media: file), resource: resource)
                 }
                 
@@ -633,14 +651,14 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                         let stillImageSize = representation.dimensions.cgSize.aspectFitted(imageBoundingSize)
                         self.stickerImageSize = stillImageSize
                         
-                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: account.postbox, resource: representation.resource)
+                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: context.account.postbox, resource: representation.resource)
                     case let .animated(resource):
                         self.stickerImageSize = imageBoundingSize
                         
-                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: account.postbox, resource: resource, animated: true)
+                        updatedImageSignal = chatMessageStickerPackThumbnail(postbox: context.account.postbox, resource: resource, animated: true)
                     }
                     if let resourceReference = resourceReference {
-                        updatedFetchSignal = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: resourceReference)
+                        updatedFetchSignal = fetchedMediaResource(mediaBox: context.account.postbox.mediaBox, reference: resourceReference)
                     }
                 } else {
                     updatedImageSignal = .single({ _ in return nil })
@@ -671,7 +689,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                     case let .animated(resource):
                         let animatedStickerNode = AnimatedStickerNode()
                         self.animatedStickerNode = animatedStickerNode
-                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: account, resource: resource), width: 80, height: 80, mode: .cached)
+                        animatedStickerNode.setup(source: AnimatedStickerResourceSource(account: context.account, resource: resource), width: 80, height: 80, mode: .cached)
                     }
                 }
             case let .copy(text):
@@ -687,6 +705,27 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 self.textNode.attributedText = attributedText
                 self.textNode.maximumNumberOfLines = 2
                 
+                displayUndo = false
+                self.originalRemainingSeconds = 3
+            case let .mediaSaved(text):
+                self.avatarNode = nil
+                self.iconNode = nil
+                self.iconCheckNode = nil
+                self.animationNode = nil
+                
+                let animatedStickerNode = AnimatedStickerNode()
+                self.animatedStickerNode = animatedStickerNode
+                if let path = getAppBundle().path(forResource: "anim_savemedia", ofType: "tgs") {
+                    animatedStickerNode.setup(source: AnimatedStickerNodeLocalFileSource(path: path), width: 80, height: 80, playbackMode: .once, mode: .direct(cachePathPrefix: nil))
+                    animatedStickerNode.visibility = true
+                }
+                
+                let body = MarkdownAttributeSet(font: Font.regular(14.0), textColor: .white)
+                let bold = MarkdownAttributeSet(font: Font.semibold(14.0), textColor: .white)
+                let attributedText = parseMarkdownIntoAttributedString(text, attributes: MarkdownAttributes(body: body, bold: bold, link: body, linkAttribute: { _ in return nil }), textAlignment: .natural)
+                self.textNode.attributedText = attributedText
+                self.textNode.maximumNumberOfLines = 2
+                
                 displayUndo = false
                 self.originalRemainingSeconds = 3
         }
@@ -717,7 +756,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
         switch content {
             case .removedChat:
                 self.panelWrapperNode.addSubnode(self.timerTextNode)
-            case .archivedChat, .hidArchive, .revealedArchive, .autoDelete, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate, .forward, .gigagroupConversion, .linkRevoked, .voiceChatRecording, .voiceChatFlag, .voiceChatCanSpeak, .sticker, .copy:
+        case .archivedChat, .hidArchive, .revealedArchive, .autoDelete, .succeed, .emoji, .swipeToReply, .actionSucceeded, .stickersModified, .chatAddedToFolder, .chatRemovedFromFolder, .messagesUnpinned, .setProximityAlert, .invitedToVoiceChat, .linkCopied, .banned, .importedMessage, .audioRate, .forward, .gigagroupConversion, .linkRevoked, .voiceChatRecording, .voiceChatFlag, .voiceChatCanSpeak, .sticker, .copy, .mediaSaved, .paymentSent:
                 break
             case .dice:
                 self.panelWrapperNode.clipsToBounds = true
@@ -767,9 +806,8 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
     
     override func didLoad() {
         super.didLoad()
-        if self.panelNode.backgroundColor == .clear {
-            self.panelNode.view.addSubview(self.effectView)
-        }
+        
+        self.panelNode.view.addSubview(self.effectView)
     }
     
     @objc private func buttonPressed() {
@@ -843,6 +881,9 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
                 let factor: CGFloat = 0.07
                 verticalOffset = -3.0
                 preferredSize = CGSize(width: floor(iconSize.width * factor), height: floor(iconSize.height * factor))
+            } else if case .paymentSent = self.content {
+                let factor: CGFloat = 0.08
+                preferredSize = CGSize(width: floor(iconSize.width * factor), height: floor(iconSize.height * factor))
             } else {
                 preferredSize = iconSize
             }
@@ -894,7 +935,7 @@ final class UndoOverlayControllerNode: ViewControllerTracingNode {
         let undoButtonFrame = CGRect(origin: CGPoint(x: layout.size.width - layout.safeInsets.left - layout.safeInsets.right - rightInset - buttonTextSize.width - 8.0 - margin * 2.0, y: 0.0), size: CGSize(width: layout.safeInsets.right + rightInset + buttonTextSize.width + 8.0 + margin, height: contentHeight))
         self.undoButtonNode.frame = undoButtonFrame
         
-        self.buttonNode.frame = CGRect(origin: CGPoint(x: layout.safeInsets.left, y: 0.0), size: CGSize(width: undoButtonFrame.minX - layout.safeInsets.left, height: contentHeight))
+        self.buttonNode.frame = CGRect(origin: CGPoint(x: 0.0, y: 0.0), size: CGSize(width: undoButtonFrame.minX, height: contentHeight))
         
         var textContentHeight = textSize.height
         var textOffset: CGFloat = 0.0
diff --git a/submodules/UrlHandling/BUILD b/submodules/UrlHandling/BUILD
index f4a6173414..fbece7a1ec 100644
--- a/submodules/UrlHandling/BUILD
+++ b/submodules/UrlHandling/BUILD
@@ -14,6 +14,7 @@ swift_library(
         "//submodules/MtProtoKit:MtProtoKit",
         "//submodules/AccountContext:AccountContext",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
+        "//submodules/TelegramNotices:TelegramNotices",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/UrlHandling/Sources/UrlHandling.swift b/submodules/UrlHandling/Sources/UrlHandling.swift
index 0f832ef5b3..7bd01c2d33 100644
--- a/submodules/UrlHandling/Sources/UrlHandling.swift
+++ b/submodules/UrlHandling/Sources/UrlHandling.swift
@@ -7,6 +7,7 @@ import SyncCore
 import MtProtoKit
 import TelegramPresentationData
 import TelegramUIPreferences
+import TelegramNotices
 import AccountContext
 
 private let baseTelegramMePaths = ["telegram.me", "t.me", "telegram.dog"]
@@ -15,7 +16,7 @@ private let baseTelegraPhPaths = ["telegra.ph/", "te.legra.ph/", "graph.org/", "
 public enum ParsedInternalPeerUrlParameter {
     case botStart(String)
     case groupBotStart(String)
-    case channelMessage(Int32)
+    case channelMessage(Int32, Double?)
     case replyThread(Int32, Int32)
     case voiceChat(String?)
 }
@@ -23,7 +24,7 @@ public enum ParsedInternalPeerUrlParameter {
 public enum ParsedInternalUrl {
     case peerName(String, ParsedInternalPeerUrlParameter?)
     case peerId(PeerId)
-    case privateMessage(messageId: MessageId, threadId: Int32?)
+    case privateMessage(messageId: MessageId, threadId: Int32?, timecode: Double?)
     case stickerPack(String)
     case join(String)
     case localization(String)
@@ -145,7 +146,7 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                         }
                     }
                 } else if pathComponents[0].hasPrefix(phonebookUsernamePathPrefix), let idValue = Int32(String(pathComponents[0][pathComponents[0].index(pathComponents[0].startIndex, offsetBy: phonebookUsernamePathPrefix.count)...])) {
-                    return .peerId(PeerId(namespace: Namespaces.Peer.CloudUser, id: idValue))
+                    return .peerId(PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(idValue)))
                 } else if pathComponents[0].hasPrefix("+") || pathComponents[0].hasPrefix("%20") {
                     return .join(String(pathComponents[0].dropFirst()))
                 }
@@ -185,7 +186,7 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                     let parameter: WallpaperUrlParameter
                     if [6, 8].contains(component.count), component.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil, let color = UIColor(hexString: component) {
                         parameter = .color(color)
-                    } else if [13, 15, 17].contains(component.count), component.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF-").inverted) == nil {
+                    } else if [13, 15, 17].contains(component.count), component.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF-~").inverted) == nil {
                         var rotation: Int32?
                         if let queryItems = components.queryItems {
                             for queryItem in queryItems {
@@ -196,17 +197,43 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                                 }
                             }
                         }
-                        let components = component.components(separatedBy: "-")
-                        if components.count == 2, let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1])  {
-                            parameter = .gradient(topColor, bottomColor, rotation)
+                        if component.contains("~") {
+                            let components = component.components(separatedBy: "~")
+
+                            var colors: [UInt32] = []
+                            if components.count >= 2 && components.count <= 4 {
+                                colors = components.compactMap { component in
+                                    return UIColor(hexString: component)?.rgb
+                                }
+                            }
+
+                            if !colors.isEmpty {
+                                parameter = .gradient(colors, rotation)
+                            } else {
+                                return nil
+                            }
                         } else {
-                            return nil
+                            let components = component.components(separatedBy: "-")
+                            if components.count == 2, let topColor = UIColor(hexString: components[0]), let bottomColor = UIColor(hexString: components[1])  {
+                                parameter = .gradient([topColor.rgb, bottomColor.rgb], rotation)
+                            } else {
+                                return nil
+                            }
+                        }
+                    } else if component.contains("~") {
+                        let components = component.components(separatedBy: "~")
+                        if components.count >= 1 && components.count <= 4 {
+                            let colors = components.compactMap { component in
+                                return UIColor(hexString: component)?.rgb
+                            }
+                            parameter = .gradient(colors, nil)
+                        } else {
+                            parameter = .color(UIColor(rgb: 0xffffff))
                         }
                     } else {
                         var options: WallpaperPresentationOptions = []
                         var intensity: Int32?
-                        var topColor: UIColor?
-                        var bottomColor: UIColor?
+                        var colors: [UInt32] = []
                         var rotation: Int32?
                         if let queryItems = components.queryItems {
                             for queryItem in queryItems {
@@ -224,12 +251,18 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                                         }
                                     } else if queryItem.name == "bg_color" {
                                         if [6, 8].contains(value.count), value.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF").inverted) == nil, let color = UIColor(hexString: value) {
-                                            topColor = color
+                                            colors = [color.rgb]
                                         } else if [13, 15, 17].contains(value.count), value.rangeOfCharacter(from: CharacterSet(charactersIn: "0123456789abcdefABCDEF-").inverted) == nil {
                                             let components = value.components(separatedBy: "-")
                                             if components.count == 2, let topColorValue = UIColor(hexString: components[0]), let bottomColorValue = UIColor(hexString: components[1]) {
-                                                topColor = topColorValue
-                                                bottomColor = bottomColorValue
+                                                colors = [topColorValue.rgb, bottomColorValue.rgb]
+                                            }
+                                        } else if value.contains("~") {
+                                            let components = value.components(separatedBy: "~")
+                                            if components.count >= 2 && components.count <= 4 {
+                                                colors = components.compactMap { component in
+                                                    return UIColor(hexString: component)?.rgb
+                                                }
                                             }
                                         }
                                     } else if queryItem.name == "intensity" {
@@ -240,7 +273,7 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                                 }
                             }
                         }
-                        parameter = .slug(component, options, topColor, bottomColor, intensity, rotation)
+                        parameter = .slug(component, options, colors, intensity, rotation)
                     }
                     return .wallpaper(parameter)
                 } else if pathComponents[0] == "addtheme" {
@@ -248,48 +281,55 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
                 } else if pathComponents.count == 3 && pathComponents[0] == "c" {
                     if let channelId = Int32(pathComponents[1]), let messageId = Int32(pathComponents[2]) {
                         var threadId: Int32?
+                        var timecode: Double?
                         if let queryItems = components.queryItems {
                             for queryItem in queryItems {
                                 if let value = queryItem.value {
                                     if queryItem.name == "thread" {
                                         if let intValue = Int32(value) {
                                             threadId = intValue
-                                            break
+                                        }
+                                    } else if queryItem.name == "t" {
+                                        if let doubleValue = Double(value) {
+                                            timecode = doubleValue
                                         }
                                     }
                                 }
                             }
                         }
-                        return .privateMessage(messageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: channelId), namespace: Namespaces.Message.Cloud, id: messageId), threadId: threadId)
+                        return .privateMessage(messageId: MessageId(peerId: PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(channelId)), namespace: Namespaces.Message.Cloud, id: messageId), threadId: threadId, timecode: timecode)
                     } else {
                         return nil
                     }
-                } else if let value = Int(pathComponents[1]) {
+                } else if let value = Int32(pathComponents[1]) {
                     var threadId: Int32?
                     var commentId: Int32?
+                    var timecode: Double?
                     if let queryItems = components.queryItems {
                         for queryItem in queryItems {
                             if let value = queryItem.value {
                                 if queryItem.name == "thread" {
                                     if let intValue = Int32(value) {
                                         threadId = intValue
-                                        break
                                     }
                                 } else if queryItem.name == "comment" {
                                     if let intValue = Int32(value) {
                                         commentId = intValue
-                                        break
+                                    }
+                                } else if queryItem.name == "t" {
+                                    if let doubleValue = Double(value) {
+                                        timecode = doubleValue
                                     }
                                 }
                             }
                         }
                     }
                     if let threadId = threadId {
-                        return .peerName(peerName, .replyThread(threadId, Int32(value)))
+                        return .peerName(peerName, .replyThread(threadId, value))
                     } else if let commentId = commentId {
-                        return .peerName(peerName, .replyThread(Int32(value), commentId))
+                        return .peerName(peerName, .replyThread(value, commentId))
                     } else {
-                        return .peerName(peerName, .channelMessage(Int32(value)))
+                        return .peerName(peerName, .channelMessage(value, timecode))
                     }
                 } else {
                     return nil
@@ -302,13 +342,13 @@ public func parseInternalUrl(query: String) -> ParsedInternalUrl? {
     return nil
 }
 
-private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Signal<ResolvedUrl?, NoError> {
+private func resolveInternalUrl(context: AccountContext, url: ParsedInternalUrl) -> Signal<ResolvedUrl?, NoError> {
     switch url {
         case let .peerName(name, parameter):
-            return resolvePeerByName(account: account, name: name)
+            return context.engine.peers.resolvePeerByName(name: name)
             |> take(1)
             |> mapToSignal { peerId -> Signal<Peer?, NoError> in
-                return account.postbox.transaction { transaction -> Peer? in
+                return context.account.postbox.transaction { transaction -> Peer? in
                     if let peerId = peerId {
                         return transaction.getPeer(peerId)
                     } else {
@@ -324,18 +364,18 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
                                 return .single(.botStart(peerId: peer.id, payload: payload))
                             case let .groupBotStart(payload):
                                 return .single(.groupBotStart(peerId: peer.id, payload: payload))
-                            case let .channelMessage(id):
-                                return .single(.channelMessage(peerId: peer.id, messageId: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: id)))
+                            case let .channelMessage(id, timecode):
+                                return .single(.channelMessage(peerId: peer.id, messageId: MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: id), timecode: timecode))
                             case let .replyThread(id, replyId):
                                 let replyThreadMessageId = MessageId(peerId: peer.id, namespace: Namespaces.Message.Cloud, id: id)
-                                return fetchChannelReplyThreadMessage(account: account, messageId: replyThreadMessageId, atMessageId: nil)
+                                return context.engine.messages.fetchChannelReplyThreadMessage(messageId: replyThreadMessageId, atMessageId: nil)
                                 |> map(Optional.init)
                                 |> `catch` { _ -> Signal<ChatReplyThreadMessage?, NoError> in
                                     return .single(nil)
                                 }
                                 |> map { result -> ResolvedUrl? in
                                     guard let result = result else {
-                                        return .channelMessage(peerId: peer.id, messageId: replyThreadMessageId)
+                                        return .channelMessage(peerId: peer.id, messageId: replyThreadMessageId, timecode: nil)
                                     }
                                     return .replyThreadMessage(replyThreadMessage: result, messageId: MessageId(peerId: result.messageId.peerId, namespace: Namespaces.Message.Cloud, id: replyId))
                                 }
@@ -354,7 +394,7 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
                 }
             }
         case let .peerId(peerId):
-            return account.postbox.transaction { transaction -> Peer? in
+            return context.account.postbox.transaction { transaction -> Peer? in
                 return transaction.getPeer(peerId)
             }
             |> mapToSignal { peer -> Signal<ResolvedUrl?, NoError> in
@@ -364,8 +404,8 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
                     return .single(.inaccessiblePeer)
                 }
             }
-        case let .privateMessage(messageId, threadId):
-            return account.postbox.transaction { transaction -> Peer? in
+        case let .privateMessage(messageId, threadId, timecode):
+            return context.account.postbox.transaction { transaction -> Peer? in
                 return transaction.getPeer(messageId.peerId)
             }
             |> mapToSignal { peer -> Signal<ResolvedUrl?, NoError> in
@@ -373,26 +413,26 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
                 if let peer = peer {
                     foundPeer = .single(peer)
                 } else {
-                    foundPeer = findChannelById(postbox: account.postbox, network: account.network, channelId: messageId.peerId.id)
+                    foundPeer = TelegramEngine(account: context.account).peers.findChannelById(channelId: messageId.peerId.id._internalGetInt32Value())
                 }
                 return foundPeer
                 |> mapToSignal { foundPeer -> Signal<ResolvedUrl?, NoError> in
                     if let foundPeer = foundPeer {
                         if let threadId = threadId {
                             let replyThreadMessageId = MessageId(peerId: foundPeer.id, namespace: Namespaces.Message.Cloud, id: threadId)
-                            return fetchChannelReplyThreadMessage(account: account, messageId: replyThreadMessageId, atMessageId: nil)
+                            return context.engine.messages.fetchChannelReplyThreadMessage(messageId: replyThreadMessageId, atMessageId: nil)
                             |> map(Optional.init)
                             |> `catch` { _ -> Signal<ChatReplyThreadMessage?, NoError> in
                                 return .single(nil)
                             }
                             |> map { result -> ResolvedUrl? in
                                 guard let result = result else {
-                                    return .channelMessage(peerId: foundPeer.id, messageId: replyThreadMessageId)
+                                    return .channelMessage(peerId: foundPeer.id, messageId: replyThreadMessageId, timecode: timecode)
                                 }
                                 return .replyThreadMessage(replyThreadMessage: result, messageId: messageId)
                             }
                         } else {
-                            return .single(.peer(foundPeer.id, .chat(textInputState: nil, subject: .message(id: messageId, highlight: true), peekData: nil)))
+                            return .single(.peer(foundPeer.id, .chat(textInputState: nil, subject: .message(id: messageId, highlight: true, timecode: timecode), peekData: nil)))
                         }
                     } else {
                         return .single(.inaccessiblePeer)
@@ -408,7 +448,7 @@ private func resolveInternalUrl(account: Account, url: ParsedInternalUrl) -> Sig
         case let .proxy(host, port, username, password, secret):
             return .single(.proxy(host: host, port: port, username: username, password: password, secret: secret))
         case let .internalInstantView(url):
-            return resolveInstantViewUrl(account: account, url: url)
+            return resolveInstantViewUrl(account: context.account, url: url)
             |> map(Optional.init)
         case let .confirmationCode(code):
             return .single(.confirmationCode(code))
@@ -525,60 +565,72 @@ private struct UrlHandlingConfiguration {
     }
 }
 
-public func resolveUrlImpl(account: Account, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError> {
+public func resolveUrlImpl(context: AccountContext, peerId: PeerId?, url: String, skipUrlAuth: Bool) -> Signal<ResolvedUrl, NoError> {
     let schemes = ["http://", "https://", ""]
     
-    return account.postbox.transaction { transaction -> Signal<ResolvedUrl, NoError> in
-        let appConfiguration: AppConfiguration = transaction.getPreferencesEntry(key: PreferencesKeys.appConfiguration) as? AppConfiguration ?? AppConfiguration.defaultValue
-        let urlHandlingConfiguration = UrlHandlingConfiguration.with(appConfiguration: appConfiguration)
-        
-        var url = url
-        if !url.contains("://") && !url.hasPrefix("tel:") && !url.hasPrefix("mailto:") && !url.hasPrefix("calshow:") {
-            if !(url.hasPrefix("http") || url.hasPrefix("https")) {
-                url = "http://\(url)"
+    return ApplicationSpecificNotice.getSecretChatLinkPreviews(accountManager: context.sharedContext.accountManager)
+    |> mapToSignal { linkPreviews -> Signal<ResolvedUrl, NoError> in
+        return context.account.postbox.transaction { transaction -> Signal<ResolvedUrl, NoError> in
+            let appConfiguration: AppConfiguration = transaction.getPreferencesEntry(key: PreferencesKeys.appConfiguration) as? AppConfiguration ?? AppConfiguration.defaultValue
+            let urlHandlingConfiguration = UrlHandlingConfiguration.with(appConfiguration: appConfiguration)
+            
+            var skipUrlAuth = skipUrlAuth
+            if let peerId = peerId, peerId.namespace == Namespaces.Peer.SecretChat {
+                if let linkPreviews = linkPreviews, linkPreviews {
+                } else {
+                    skipUrlAuth = true
+                }
             }
-        }
-        if let urlValue = URL(string: url), let host = urlValue.host?.lowercased() {
-            if urlHandlingConfiguration.domains.contains(host), var components = URLComponents(string: url) {
-                components.scheme = "https"
-                var queryItems = components.queryItems ?? []
-                queryItems.append(URLQueryItem(name: "autologin_token", value: urlHandlingConfiguration.token))
-                components.queryItems = queryItems
-                url = components.url?.absoluteString ?? url
-            } else if !skipUrlAuth && urlHandlingConfiguration.urlAuthDomains.contains(host) {
-                return .single(.urlAuth(url))
+            
+            var url = url
+            if !url.contains("://") && !url.hasPrefix("tel:") && !url.hasPrefix("mailto:") && !url.hasPrefix("calshow:") {
+                if !(url.hasPrefix("http") || url.hasPrefix("https")) {
+                    url = "http://\(url)"
+                }
             }
-        }
-        
-        for basePath in baseTelegramMePaths {
-            for scheme in schemes {
-                let basePrefix = scheme + basePath + "/"
-                if url.lowercased().hasPrefix(basePrefix) {
-                    if let internalUrl = parseInternalUrl(query: String(url[basePrefix.endIndex...])) {
-                        return resolveInternalUrl(account: account, url: internalUrl)
-                        |> map { resolved -> ResolvedUrl in
-                            if let resolved = resolved {
-                                return resolved
-                            } else {
-                                return .externalUrl(url)
+            
+            if let urlValue = URL(string: url), let host = urlValue.host?.lowercased() {
+                if urlHandlingConfiguration.domains.contains(host), var components = URLComponents(string: url) {
+                    components.scheme = "https"
+                    var queryItems = components.queryItems ?? []
+                    queryItems.append(URLQueryItem(name: "autologin_token", value: urlHandlingConfiguration.token))
+                    components.queryItems = queryItems
+                    url = components.url?.absoluteString ?? url
+                } else if !skipUrlAuth && urlHandlingConfiguration.urlAuthDomains.contains(host) {
+                    return .single(.urlAuth(url))
+                }
+            }
+            
+            for basePath in baseTelegramMePaths {
+                for scheme in schemes {
+                    let basePrefix = scheme + basePath + "/"
+                    if url.lowercased().hasPrefix(basePrefix) {
+                        if let internalUrl = parseInternalUrl(query: String(url[basePrefix.endIndex...])) {
+                            return resolveInternalUrl(context: context, url: internalUrl)
+                            |> map { resolved -> ResolvedUrl in
+                                if let resolved = resolved {
+                                    return resolved
+                                } else {
+                                    return .externalUrl(url)
+                                }
                             }
+                        } else {
+                            return .single(.externalUrl(url))
                         }
-                    } else {
-                        return .single(.externalUrl(url))
                     }
                 }
             }
-        }
-        for basePath in baseTelegraPhPaths {
-            for scheme in schemes {
-                let basePrefix = scheme + basePath
-                if url.lowercased().hasPrefix(basePrefix) {
-                    return resolveInstantViewUrl(account: account, url: url)
+            for basePath in baseTelegraPhPaths {
+                for scheme in schemes {
+                    let basePrefix = scheme + basePath
+                    if url.lowercased().hasPrefix(basePrefix) {
+                        return resolveInstantViewUrl(account: context.account, url: url)
+                    }
                 }
             }
-        }
-        return .single(.externalUrl(url))
-    } |> switchToLatest
+            return .single(.externalUrl(url))
+        } |> switchToLatest
+    }
 }
 
 public func resolveInstantViewUrl(account: Account, url: String) -> Signal<ResolvedUrl, NoError> {
diff --git a/submodules/UrlWhitelist/Sources/UrlWhitelist.swift b/submodules/UrlWhitelist/Sources/UrlWhitelist.swift
index fac3604964..7f7c8ef7f3 100644
--- a/submodules/UrlWhitelist/Sources/UrlWhitelist.swift
+++ b/submodules/UrlWhitelist/Sources/UrlWhitelist.swift
@@ -31,7 +31,7 @@ public func parseUrl(url: String, wasConcealed: Bool) -> (string: String, concea
     latin.insert(charactersIn: "a"..."z")
     latin.insert(charactersIn: "0"..."9")
     var punctuation = CharacterSet()
-    punctuation.insert(charactersIn: ".-/+_")
+    punctuation.insert(charactersIn: ".-/+_?=")
     var hasLatin = false
     var hasNonLatin = false
     for c in rawHost {
diff --git a/submodules/MessageReactionListUI/BUILD b/submodules/WallpaperBackgroundNode/BUILD
similarity index 66%
rename from submodules/MessageReactionListUI/BUILD
rename to submodules/WallpaperBackgroundNode/BUILD
index 36ff8e35c1..65b2180e3e 100644
--- a/submodules/MessageReactionListUI/BUILD
+++ b/submodules/WallpaperBackgroundNode/BUILD
@@ -1,22 +1,25 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 swift_library(
-    name = "MessageReactionListUI",
-    module_name = "MessageReactionListUI",
+    name = "WallpaperBackgroundNode",
+    module_name = "WallpaperBackgroundNode",
     srcs = glob([
-		"Sources/**/*.swift",
+        "Sources/**/*.swift",
     ]),
+    copts = [
+    ],
     deps = [
-        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
-        "//submodules/TelegramCore:TelegramCore",
-        "//submodules/SyncCore:SyncCore",
-        "//submodules/Postbox:Postbox",
         "//submodules/AsyncDisplayKit:AsyncDisplayKit",
         "//submodules/Display:Display",
+        "//submodules/GradientBackground:GradientBackground",
         "//submodules/TelegramPresentationData:TelegramPresentationData",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/Postbox:Postbox",
         "//submodules/AccountContext:AccountContext",
-        "//submodules/MergeLists:MergeLists",
-        "//submodules/ItemListPeerItem:ItemListPeerItem",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/WallpaperResources:WallpaperResources",
+        "//submodules/FastBlur:FastBlur",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift
new file mode 100644
index 0000000000..830dd0505a
--- /dev/null
+++ b/submodules/WallpaperBackgroundNode/Sources/WallpaperBackgroundNode.swift
@@ -0,0 +1,818 @@
+import Foundation
+import UIKit
+import AsyncDisplayKit
+import Display
+import GradientBackground
+import TelegramPresentationData
+import SyncCore
+import TelegramCore
+import AccountContext
+import SwiftSignalKit
+import WallpaperResources
+import Postbox
+import FastBlur
+
+private let motionAmount: CGFloat = 32.0
+
+private func generateBlurredContents(image: UIImage) -> UIImage? {
+    let size = image.size.aspectFitted(CGSize(width: 64.0, height: 64.0))
+    let context = DrawingContext(size: size, scale: 1.0, opaque: true, clear: false)
+    context.withFlippedContext { c in
+        c.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: size))
+    }
+
+    telegramFastBlurMore(Int32(context.size.width), Int32(context.size.height), Int32(context.bytesPerRow), context.bytes)
+    telegramFastBlurMore(Int32(context.size.width), Int32(context.size.height), Int32(context.bytesPerRow), context.bytes)
+
+    adjustSaturationInContext(context: context, saturation: 1.7)
+
+    return context.generateImage()
+}
+
+public final class WallpaperBackgroundNode: ASDisplayNode {
+    public final class BubbleBackgroundNode: ASDisplayNode {
+        public enum BubbleType {
+            case incoming
+            case outgoing
+            case free
+        }
+
+        private let bubbleType: BubbleType
+        private let contentNode: ASImageNode
+
+        private var cleanWallpaperNode: ASDisplayNode?
+        private var gradientWallpaperNode: GradientBackgroundNode.CloneNode?
+        private weak var backgroundNode: WallpaperBackgroundNode?
+        private var index: SparseBag<BubbleBackgroundNode>.Index?
+
+        private var currentLayout: (rect: CGRect, containerSize: CGSize)?
+
+        public override var frame: CGRect {
+            didSet {
+                if oldValue.size != self.bounds.size {
+                    self.contentNode.frame = self.bounds
+                    if let cleanWallpaperNode = self.cleanWallpaperNode {
+                        cleanWallpaperNode.frame = self.bounds
+                    }
+                    if let gradientWallpaperNode = self.gradientWallpaperNode {
+                        gradientWallpaperNode.frame = self.bounds
+                    }
+                }
+            }
+        }
+
+        init(backgroundNode: WallpaperBackgroundNode, bubbleType: BubbleType) {
+            self.backgroundNode = backgroundNode
+            self.bubbleType = bubbleType
+
+            self.contentNode = ASImageNode()
+            self.contentNode.isUserInteractionEnabled = false
+
+            super.init()
+
+            self.addSubnode(self.contentNode)
+
+            self.index = backgroundNode.bubbleBackgroundNodeReferences.add(BubbleBackgroundNodeReference(node: self))
+        }
+
+        deinit {
+            if let index = self.index, let backgroundNode = self.backgroundNode {
+                backgroundNode.bubbleBackgroundNodeReferences.remove(index)
+            }
+        }
+
+        func updateContents() {
+            guard let backgroundNode = self.backgroundNode else {
+                return
+            }
+
+            if let bubbleTheme = backgroundNode.bubbleTheme, let bubbleCorners = backgroundNode.bubbleCorners {
+                let wallpaper = backgroundNode.wallpaper ?? bubbleTheme.chat.defaultWallpaper
+
+                let graphics = PresentationResourcesChat.principalGraphics(theme: bubbleTheme, wallpaper: wallpaper, bubbleCorners: bubbleCorners)
+                var needsCleanBackground = false
+                switch self.bubbleType {
+                case .incoming:
+                    self.contentNode.image = graphics.incomingBubbleGradientImage
+                    if graphics.incomingBubbleGradientImage == nil {
+                        self.contentNode.backgroundColor = bubbleTheme.chat.message.incoming.bubble.withWallpaper.fill
+                    } else {
+                        self.contentNode.backgroundColor = nil
+                    }
+                    needsCleanBackground = bubbleTheme.chat.message.incoming.bubble.withWallpaper.fill.alpha <= 0.99 || bubbleTheme.chat.message.incoming.bubble.withWallpaper.gradientFill.alpha <= 0.99
+                case .outgoing:
+                    self.contentNode.image = graphics.outgoingBubbleGradientImage
+                    if graphics.outgoingBubbleGradientImage == nil {
+                        self.contentNode.backgroundColor = bubbleTheme.chat.message.outgoing.bubble.withWallpaper.fill
+                    } else {
+                        self.contentNode.backgroundColor = nil
+                    }
+                    needsCleanBackground = bubbleTheme.chat.message.outgoing.bubble.withWallpaper.fill.alpha <= 0.99 || bubbleTheme.chat.message.outgoing.bubble.withWallpaper.gradientFill.alpha <= 0.99
+                case .free:
+                    self.contentNode.image = nil
+                    self.contentNode.backgroundColor = nil
+                    needsCleanBackground = true
+                }
+
+                var isInvertedGradient = false
+                var hasComplexGradient = false
+                switch wallpaper {
+                case let .file(_, _, _, _, _, _, _, _, settings):
+                    hasComplexGradient = settings.colors.count >= 3
+                    if let intensity = settings.intensity, intensity < 0 {
+                        isInvertedGradient = true
+                    }
+                case let .gradient(_, colors, _):
+                    hasComplexGradient = colors.count >= 3
+                default:
+                    break
+                }
+
+                var needsGradientBackground = false
+                var needsWallpaperBackground = false
+
+                if isInvertedGradient {
+                    switch self.bubbleType {
+                    case .free:
+                        needsCleanBackground = false
+                    case .incoming, .outgoing:
+                        break
+                    }
+                }
+
+                if needsCleanBackground {
+                    if hasComplexGradient {
+                        needsGradientBackground = backgroundNode.gradientBackgroundNode != nil
+                    } else {
+                        needsWallpaperBackground = true
+                    }
+                }
+
+                if needsWallpaperBackground {
+                    if self.cleanWallpaperNode == nil {
+                        let cleanWallpaperNode = ASImageNode()
+                        self.cleanWallpaperNode = cleanWallpaperNode
+                        cleanWallpaperNode.frame = self.bounds
+                        self.insertSubnode(cleanWallpaperNode, at: 0)
+                    }
+                    if let blurredBackgroundContents = backgroundNode.blurredBackgroundContents {
+                        self.cleanWallpaperNode?.contents = blurredBackgroundContents.cgImage
+                        self.cleanWallpaperNode?.backgroundColor = backgroundNode.contentNode.backgroundColor
+                    } else {
+                        self.cleanWallpaperNode?.contents = backgroundNode.contentNode.contents
+                        self.cleanWallpaperNode?.backgroundColor = backgroundNode.contentNode.backgroundColor
+                    }
+                } else {
+                    if let cleanWallpaperNode = self.cleanWallpaperNode {
+                        self.cleanWallpaperNode = nil
+                        cleanWallpaperNode.removeFromSupernode()
+                    }
+                }
+
+                if needsGradientBackground, let gradientBackgroundNode = backgroundNode.gradientBackgroundNode {
+                    if self.gradientWallpaperNode == nil {
+                        let gradientWallpaperNode = GradientBackgroundNode.CloneNode(parentNode: gradientBackgroundNode)
+                        gradientWallpaperNode.frame = self.bounds
+                        self.gradientWallpaperNode = gradientWallpaperNode
+                        self.insertSubnode(gradientWallpaperNode, at: 0)
+                    }
+                } else {
+                    if let gradientWallpaperNode = self.gradientWallpaperNode {
+                        self.gradientWallpaperNode = nil
+                        gradientWallpaperNode.removeFromSupernode()
+                    }
+                }
+            } else {
+                self.contentNode.image = nil
+                if let cleanWallpaperNode = self.cleanWallpaperNode {
+                    self.cleanWallpaperNode = nil
+                    cleanWallpaperNode.removeFromSupernode()
+                }
+            }
+
+            if let (rect, containerSize) = self.currentLayout {
+                self.update(rect: rect, within: containerSize)
+            }
+        }
+
+        public func update(rect: CGRect, within containerSize: CGSize, transition: ContainedViewLayoutTransition = .immediate) {
+            self.currentLayout = (rect, containerSize)
+
+            let shiftedContentsRect = CGRect(origin: CGPoint(x: rect.minX / containerSize.width, y: rect.minY / containerSize.height), size: CGSize(width: rect.width / containerSize.width, height: rect.height / containerSize.height))
+
+            transition.updateFrame(layer: self.contentNode.layer, frame: self.bounds)
+            self.contentNode.layer.contentsRect = shiftedContentsRect
+            if let cleanWallpaperNode = self.cleanWallpaperNode {
+                transition.updateFrame(layer: cleanWallpaperNode.layer, frame: self.bounds)
+                cleanWallpaperNode.layer.contentsRect = shiftedContentsRect
+            }
+            if let gradientWallpaperNode = self.gradientWallpaperNode {
+                transition.updateFrame(layer: gradientWallpaperNode.layer, frame: self.bounds)
+                gradientWallpaperNode.layer.contentsRect = shiftedContentsRect
+            }
+        }
+
+        public func update(rect: CGRect, within containerSize: CGSize, transition: CombinedTransition) {
+            self.currentLayout = (rect, containerSize)
+
+            let shiftedContentsRect = CGRect(origin: CGPoint(x: rect.minX / containerSize.width, y: rect.minY / containerSize.height), size: CGSize(width: rect.width / containerSize.width, height: rect.height / containerSize.height))
+
+            transition.updateFrame(layer: self.contentNode.layer, frame: self.bounds)
+            self.contentNode.layer.contentsRect = shiftedContentsRect
+            if let cleanWallpaperNode = self.cleanWallpaperNode {
+                transition.updateFrame(layer: cleanWallpaperNode.layer, frame: self.bounds)
+                cleanWallpaperNode.layer.contentsRect = shiftedContentsRect
+            }
+            if let gradientWallpaperNode = self.gradientWallpaperNode {
+                transition.updateFrame(layer: gradientWallpaperNode.layer, frame: self.bounds)
+                gradientWallpaperNode.layer.contentsRect = shiftedContentsRect
+            }
+        }
+
+        public func offset(value: CGPoint, animationCurve: ContainedViewLayoutTransitionCurve, duration: Double) {
+            guard let (_, containerSize) = self.currentLayout else {
+                return
+            }
+            let transition: ContainedViewLayoutTransition = .animated(duration: duration, curve: animationCurve)
+
+            let scaledOffset = CGPoint(x: value.x / containerSize.width, y: value.y / containerSize.height)
+            transition.animateContentsRectPositionAdditive(layer: self.contentNode.layer, offset: scaledOffset)
+
+            if let cleanWallpaperNode = self.cleanWallpaperNode {
+                transition.animateContentsRectPositionAdditive(layer: cleanWallpaperNode.layer, offset: scaledOffset)
+            }
+            if let gradientWallpaperNode = self.gradientWallpaperNode {
+                transition.animateContentsRectPositionAdditive(layer: gradientWallpaperNode.layer, offset: scaledOffset)
+            }
+        }
+
+        public func offsetSpring(value: CGFloat, duration: Double, damping: CGFloat) {
+            guard let (_, containerSize) = self.currentLayout else {
+                return
+            }
+
+            let scaledOffset = CGPoint(x: 0.0, y: -value / containerSize.height)
+
+            self.contentNode.layer.animateSpring(from: NSValue(cgPoint: scaledOffset), to: NSValue(cgPoint: CGPoint()), keyPath: "contentsRect.position", duration: duration, initialVelocity: 0.0, damping: damping, additive: true)
+            if let cleanWallpaperNode = self.cleanWallpaperNode {
+                cleanWallpaperNode.layer.animateSpring(from: NSValue(cgPoint: scaledOffset), to: NSValue(cgPoint: CGPoint()), keyPath: "contentsRect.position", duration: duration, initialVelocity: 0.0, damping: damping, additive: true)
+            }
+            if let gradientWallpaperNode = self.gradientWallpaperNode {
+                gradientWallpaperNode.layer.animateSpring(from: NSValue(cgPoint: scaledOffset), to: NSValue(cgPoint: CGPoint()), keyPath: "contentsRect.position", duration: duration, initialVelocity: 0.0, damping: damping, additive: true)
+            }
+        }
+    }
+
+    private final class BubbleBackgroundNodeReference {
+        weak var node: BubbleBackgroundNode?
+
+        init(node: BubbleBackgroundNode) {
+            self.node = node
+        }
+    }
+
+    private let context: AccountContext
+    private let useSharedAnimationPhase: Bool
+    
+    private let contentNode: ASDisplayNode
+    private var blurredBackgroundContents: UIImage?
+
+    private var gradientBackgroundNode: GradientBackgroundNode?
+    private let patternImageNode: ASImageNode
+    private var isGeneratingPatternImage: Bool = false
+
+    private var validLayout: CGSize?
+    private var wallpaper: TelegramWallpaper?
+    private var isSettingUpWallpaper: Bool = false
+
+    private struct CachedValidPatternImage {
+        let generate: (TransformImageArguments) -> DrawingContext?
+        let generated: ValidPatternGeneratedImage
+        let image: UIImage
+    }
+
+    private static var cachedValidPatternImage: CachedValidPatternImage?
+
+    private struct ValidPatternImage {
+        let wallpaper: TelegramWallpaper
+        let generate: (TransformImageArguments) -> DrawingContext?
+    }
+    private var validPatternImage: ValidPatternImage?
+
+    private struct ValidPatternGeneratedImage: Equatable {
+        let wallpaper: TelegramWallpaper
+        let size: CGSize
+        let patternColor: UInt32
+        let backgroundColor: UInt32
+        let invertPattern: Bool
+    }
+    private var validPatternGeneratedImage: ValidPatternGeneratedImage?
+
+    private let patternImageDisposable = MetaDisposable()
+
+    private var bubbleTheme: PresentationTheme?
+    private var bubbleCorners: PresentationChatBubbleCorners?
+    private var bubbleBackgroundNodeReferences = SparseBag<BubbleBackgroundNodeReference>()
+
+    private let wallpaperDisposable = MetaDisposable()
+
+    private let imageDisposable = MetaDisposable()
+    
+    private var motionEnabled: Bool = false {
+        didSet {
+            if oldValue != self.motionEnabled {
+                if self.motionEnabled {
+                    let horizontal = UIInterpolatingMotionEffect(keyPath: "center.x", type: .tiltAlongHorizontalAxis)
+                    horizontal.minimumRelativeValue = motionAmount
+                    horizontal.maximumRelativeValue = -motionAmount
+                    
+                    let vertical = UIInterpolatingMotionEffect(keyPath: "center.y", type: .tiltAlongVerticalAxis)
+                    vertical.minimumRelativeValue = motionAmount
+                    vertical.maximumRelativeValue = -motionAmount
+                    
+                    let group = UIMotionEffectGroup()
+                    group.motionEffects = [horizontal, vertical]
+                    self.contentNode.view.addMotionEffect(group)
+                } else {
+                    for effect in self.contentNode.view.motionEffects {
+                        self.contentNode.view.removeMotionEffect(effect)
+                    }
+                }
+                if !self.frame.isEmpty {
+                    self.updateScale()
+                }
+            }
+        }
+    }
+    
+    public var rotation: CGFloat = 0.0 {
+        didSet {
+            var fromValue: CGFloat = 0.0
+            if let value = (self.layer.value(forKeyPath: "transform.rotation.z") as? NSNumber)?.floatValue {
+                fromValue = CGFloat(value)
+            }
+            self.contentNode.layer.transform = CATransform3DMakeRotation(self.rotation, 0.0, 0.0, 1.0)
+            self.contentNode.layer.animateRotation(from: fromValue, to: self.rotation, duration: 0.3)
+        }
+    }
+    
+    private var imageContentMode: UIView.ContentMode {
+        didSet {
+            self.contentNode.contentMode = self.imageContentMode
+        }
+    }
+    
+    private func updateScale() {
+        if self.motionEnabled {
+            let scale = (self.frame.width + motionAmount * 2.0) / self.frame.width
+            self.contentNode.transform = CATransform3DMakeScale(scale, scale, 1.0)
+        } else {
+            self.contentNode.transform = CATransform3DIdentity
+        }
+    }
+
+    private struct PatternKey: Equatable {
+        var mediaId: MediaId
+        var isLight: Bool
+    }
+    private static var cachedSharedPattern: (PatternKey, UIImage)?
+
+    private let _isReady = ValuePromise<Bool>(false, ignoreRepeated: true)
+    public var isReady: Signal<Bool, NoError> {
+        return self._isReady.get()
+    }
+    
+    public init(context: AccountContext, useSharedAnimationPhase: Bool = false) {
+        self.context = context
+        self.useSharedAnimationPhase = useSharedAnimationPhase
+        self.imageContentMode = .scaleAspectFill
+        
+        self.contentNode = ASDisplayNode()
+        self.contentNode.contentMode = self.imageContentMode
+
+        self.patternImageNode = ASImageNode()
+        
+        super.init()
+        
+        self.clipsToBounds = true
+        self.contentNode.frame = self.bounds
+        self.addSubnode(self.contentNode)
+        self.addSubnode(self.patternImageNode)
+    }
+
+    deinit {
+        self.patternImageDisposable.dispose()
+        self.wallpaperDisposable.dispose()
+        self.imageDisposable.dispose()
+    }
+
+    public func update(wallpaper: TelegramWallpaper) {
+        if self.wallpaper == wallpaper {
+            return
+        }
+        self.wallpaper = wallpaper
+
+        var gradientColors: [UInt32] = []
+        var gradientAngle: Int32 = 0
+
+        if case let .color(color) = wallpaper {
+            gradientColors = [color]
+            self._isReady.set(true)
+        } else if case let .gradient(_, colors, settings) = wallpaper {
+            gradientColors = colors
+            gradientAngle = settings.rotation ?? 0
+            self._isReady.set(true)
+        } else if case let .file(_, _, _, _, isPattern, _, _, _, settings) = wallpaper, isPattern {
+            gradientColors = settings.colors
+            gradientAngle = settings.rotation ?? 0
+        }
+
+        if gradientColors.count >= 3 {
+            let mappedColors = gradientColors.map { color -> UIColor in
+                return UIColor(rgb: color)
+            }
+            if self.gradientBackgroundNode == nil {
+                let gradientBackgroundNode = createGradientBackgroundNode(colors: mappedColors, useSharedAnimationPhase: self.useSharedAnimationPhase)
+                self.gradientBackgroundNode = gradientBackgroundNode
+                self.insertSubnode(gradientBackgroundNode, aboveSubnode: self.contentNode)
+                gradientBackgroundNode.addSubnode(self.patternImageNode)
+            }
+            self.gradientBackgroundNode?.updateColors(colors: mappedColors)
+
+            self.contentNode.backgroundColor = nil
+            self.contentNode.contents = nil
+            self.blurredBackgroundContents = nil
+            self.motionEnabled = false
+            self.wallpaperDisposable.set(nil)
+        } else {
+            if let gradientBackgroundNode = self.gradientBackgroundNode {
+                self.gradientBackgroundNode = nil
+                gradientBackgroundNode.removeFromSupernode()
+                self.insertSubnode(self.patternImageNode, aboveSubnode: self.contentNode)
+            }
+
+            self.motionEnabled = wallpaper.settings?.motion ?? false
+
+            if gradientColors.count >= 2 {
+                self.contentNode.backgroundColor = nil
+                let image = generateImage(CGSize(width: 100.0, height: 200.0), rotatedContext: { size, context in
+                    let gradientColors = [UIColor(rgb: gradientColors[0]).cgColor, UIColor(rgb: gradientColors[1]).cgColor] as CFArray
+
+                    var locations: [CGFloat] = [0.0, 1.0]
+                    let colorSpace = CGColorSpaceCreateDeviceRGB()
+                    let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+
+                    context.translateBy(x: size.width / 2.0, y: size.height / 2.0)
+                    context.rotate(by: CGFloat(gradientAngle) * CGFloat.pi / 180.0)
+                    context.translateBy(x: -size.width / 2.0, y: -size.height / 2.0)
+
+                    context.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: size.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+                })
+                self.contentNode.contents = image?.cgImage
+                self.blurredBackgroundContents = image
+                self.wallpaperDisposable.set(nil)
+            } else if gradientColors.count >= 1 {
+                self.contentNode.backgroundColor = UIColor(rgb: gradientColors[0])
+                self.contentNode.contents = nil
+                self.blurredBackgroundContents = nil
+                self.wallpaperDisposable.set(nil)
+            } else {
+                self.contentNode.backgroundColor = .white
+                if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.sharedContext.accountManager.mediaBox, knockoutMode: false) {
+                    self.contentNode.contents = image.cgImage
+                    self.blurredBackgroundContents = generateBlurredContents(image: image)
+                    self.wallpaperDisposable.set(nil)
+                    Queue.mainQueue().justDispatch {
+                        self._isReady.set(true)
+                    }
+                } else if let image = chatControllerBackgroundImage(theme: nil, wallpaper: wallpaper, mediaBox: self.context.account.postbox.mediaBox, knockoutMode: false) {
+                    self.contentNode.contents = image.cgImage
+                    self.blurredBackgroundContents = generateBlurredContents(image: image)
+                    self.wallpaperDisposable.set(nil)
+                    Queue.mainQueue().justDispatch {
+                        self._isReady.set(true)
+                    }
+                } else {
+                    self.wallpaperDisposable.set((chatControllerBackgroundImageSignal(wallpaper: wallpaper, mediaBox: self.context.sharedContext.accountManager.mediaBox, accountMediaBox: self.context.account.postbox.mediaBox)
+                    |> deliverOnMainQueue).start(next: { [weak self] image in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        strongSelf.contentNode.contents = image?.0?.cgImage
+                        if let image = image?.0 {
+                            strongSelf.blurredBackgroundContents = generateBlurredContents(image: image)
+                        } else {
+                            strongSelf.blurredBackgroundContents = nil
+                        }
+                        strongSelf._isReady.set(true)
+                    }))
+                }
+                self.contentNode.isHidden = false
+            }
+        }
+
+        if let size = self.validLayout {
+            self.updateLayout(size: size, transition: .immediate)
+            self.updateBubbles()
+        }
+    }
+
+    public func _internalUpdateIsSettingUpWallpaper() {
+        self.isSettingUpWallpaper = true
+    }
+
+    private func updatePatternPresentation() {
+        guard let wallpaper = self.wallpaper else {
+            return
+        }
+
+        switch wallpaper {
+        case let .file(_, _, _, _, isPattern, _, _, _, settings) where isPattern:
+            let brightness = UIColor.average(of: settings.colors.map(UIColor.init(rgb:))).hsb.b
+            let patternIsBlack = brightness <= 0.01
+
+            let intensity = CGFloat(settings.intensity ?? 50) / 100.0
+            if intensity < 0 {
+                self.patternImageNode.alpha = 1.0
+                self.patternImageNode.layer.compositingFilter = nil
+            } else {
+                self.patternImageNode.alpha = intensity
+                if patternIsBlack {
+                    self.patternImageNode.layer.compositingFilter = nil
+                } else {
+                    self.patternImageNode.layer.compositingFilter = "softLightBlendMode"
+                }
+            }
+            self.patternImageNode.isHidden = false
+            let invertPattern = intensity < 0
+            if invertPattern {
+                self.backgroundColor = .black
+                let contentAlpha = abs(intensity)
+                self.gradientBackgroundNode?.contentView.alpha = contentAlpha
+                self.contentNode.alpha = contentAlpha
+                if self.patternImageNode.image != nil {
+                    self.patternImageNode.backgroundColor = nil
+                } else {
+                    self.patternImageNode.backgroundColor = .black
+                }
+            } else {
+                self.backgroundColor = nil
+                self.gradientBackgroundNode?.contentView.alpha = 1.0
+                self.contentNode.alpha = 1.0
+                self.patternImageNode.backgroundColor = nil
+            }
+        default:
+            self.patternImageDisposable.set(nil)
+            self.validPatternImage = nil
+            self.patternImageNode.isHidden = true
+            self.patternImageNode.backgroundColor = nil
+            self.backgroundColor = nil
+            self.gradientBackgroundNode?.contentView.alpha = 1.0
+            self.contentNode.alpha = 1.0
+        }
+    }
+
+    private func loadPatternForSizeIfNeeded(size: CGSize, transition: ContainedViewLayoutTransition) {
+        guard let wallpaper = self.wallpaper else {
+            return
+        }
+
+        var invertPattern: Bool = false
+        var patternIsLight: Bool = false
+
+        switch wallpaper {
+        case let .file(_, _, _, _, isPattern, _, slug, file, settings) where isPattern:
+            var updated = true
+            let brightness = UIColor.average(of: settings.colors.map(UIColor.init(rgb:))).hsb.b
+            patternIsLight = brightness > 0.3
+            if let previousWallpaper = self.validPatternImage?.wallpaper {
+                switch previousWallpaper {
+                case let .file(_, _, _, _, _, _, _, previousFile, _):
+                    if file.id == previousFile.id {
+                        updated = false
+                    }
+                default:
+                    break
+                }
+            }
+
+            if updated {
+                self.validPatternGeneratedImage = nil
+                self.validPatternImage = nil
+
+                if let cachedValidPatternImage = WallpaperBackgroundNode.cachedValidPatternImage, cachedValidPatternImage.generated.wallpaper == wallpaper {
+                    self.validPatternImage = ValidPatternImage(wallpaper: cachedValidPatternImage.generated.wallpaper, generate: cachedValidPatternImage.generate)
+                } else {
+                    func reference(for resource: MediaResource, media: Media, message: Message?) -> MediaResourceReference {
+                        if let message = message {
+                            return .media(media: .message(message: MessageReference(message), media: media), resource: resource)
+                        }
+                        return .wallpaper(wallpaper: .slug(slug), resource: resource)
+                    }
+
+                    var convertedRepresentations: [ImageRepresentationWithReference] = []
+                    for representation in file.previewRepresentations {
+                        convertedRepresentations.append(ImageRepresentationWithReference(representation: representation, reference: reference(for: representation.resource, media: file, message: nil)))
+                    }
+                    let dimensions = file.dimensions ?? PixelDimensions(width: 2000, height: 4000)
+                    convertedRepresentations.append(ImageRepresentationWithReference(representation: .init(dimensions: dimensions, resource: file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: reference(for: file.resource, media: file, message: nil)))
+
+                    let signal = patternWallpaperImage(account: self.context.account, accountManager: self.context.sharedContext.accountManager, representations: convertedRepresentations, mode: .screen, autoFetchFullSize: true)
+                    self.patternImageDisposable.set((signal
+                    |> deliverOnMainQueue).start(next: { [weak self] generator in
+                        guard let strongSelf = self else {
+                            return
+                        }
+                        if let generator = generator {
+                            strongSelf.validPatternImage = ValidPatternImage(wallpaper: wallpaper, generate: generator)
+                            strongSelf.validPatternGeneratedImage = nil
+                            if let size = strongSelf.validLayout {
+                                strongSelf.loadPatternForSizeIfNeeded(size: size, transition: .immediate)
+                            } else {
+                                strongSelf._isReady.set(true)
+                            }
+                        } else {
+                            strongSelf._isReady.set(true)
+                        }
+                    }))
+                }
+            }
+            let intensity = CGFloat(settings.intensity ?? 50) / 100.0
+            invertPattern = intensity < 0
+        default:
+            self.updatePatternPresentation()
+        }
+
+        if let validPatternImage = self.validPatternImage {
+            let patternBackgroundColor: UIColor
+            let patternColor: UIColor
+            if invertPattern {
+                patternColor = .clear
+                patternBackgroundColor = .clear
+                if self.patternImageNode.image == nil {
+                    self.patternImageNode.backgroundColor = .black
+                } else {
+                    self.patternImageNode.backgroundColor = nil
+                }
+            } else {
+                if patternIsLight {
+                    patternColor = .black
+                } else {
+                    patternColor = .white
+                }
+                patternBackgroundColor = .clear
+                self.patternImageNode.backgroundColor = nil
+            }
+
+            let updatedGeneratedImage = ValidPatternGeneratedImage(wallpaper: validPatternImage.wallpaper, size: size, patternColor: patternColor.rgb, backgroundColor: patternBackgroundColor.rgb, invertPattern: invertPattern)
+
+            if self.validPatternGeneratedImage != updatedGeneratedImage {
+                self.validPatternGeneratedImage = updatedGeneratedImage
+
+                if let cachedValidPatternImage = WallpaperBackgroundNode.cachedValidPatternImage, cachedValidPatternImage.generated == updatedGeneratedImage {
+                    self.patternImageNode.image = cachedValidPatternImage.image
+                    self.updatePatternPresentation()
+                } else {
+                    let patternArguments = TransformImageArguments(corners: ImageCorners(), imageSize: size, boundingSize: size, intrinsicInsets: UIEdgeInsets(), custom: PatternWallpaperArguments(colors: [patternBackgroundColor], rotation: nil, customPatternColor: patternColor, preview: false), scale: min(2.0, UIScreenScale))
+                    if self.useSharedAnimationPhase || self.patternImageNode.image == nil {
+                        if let drawingContext = validPatternImage.generate(patternArguments) {
+                            if let image = drawingContext.generateImage() {
+                                self.patternImageNode.image = image
+                                self.updatePatternPresentation()
+
+                                if self.useSharedAnimationPhase {
+                                    WallpaperBackgroundNode.cachedValidPatternImage = CachedValidPatternImage(generate: validPatternImage.generate, generated: updatedGeneratedImage, image: image)
+                                }
+                            } else {
+                                self.updatePatternPresentation()
+                            }
+                        } else {
+                            self.updatePatternPresentation()
+                        }
+                    } else {
+                        self.isGeneratingPatternImage = true
+                        DispatchQueue.global(qos: .userInteractive).async { [weak self] in
+                            let image = validPatternImage.generate(patternArguments)?.generateImage()
+                            Queue.mainQueue().async {
+                                guard let strongSelf = self else {
+                                    return
+                                }
+                                strongSelf.isGeneratingPatternImage = false
+                                strongSelf.patternImageNode.image = image
+                                strongSelf.updatePatternPresentation()
+
+                                if let image = image, strongSelf.useSharedAnimationPhase {
+                                    WallpaperBackgroundNode.cachedValidPatternImage = CachedValidPatternImage(generate: validPatternImage.generate, generated: updatedGeneratedImage, image: image)
+                                }
+                            }
+                        }
+                    }
+                }
+
+                self._isReady.set(true)
+            } else {
+                if !self.isGeneratingPatternImage {
+                    self.updatePatternPresentation()
+                }
+            }
+        } else {
+            if !self.isGeneratingPatternImage {
+                self.updatePatternPresentation()
+            }
+        }
+
+        transition.updateFrame(node: self.patternImageNode, frame: CGRect(origin: CGPoint(), size: size))
+    }
+    
+    public func updateLayout(size: CGSize, transition: ContainedViewLayoutTransition) {
+        let isFirstLayout = self.validLayout == nil
+        self.validLayout = size
+
+        transition.updatePosition(node: self.contentNode, position: CGPoint(x: size.width / 2.0, y: size.height / 2.0))
+        transition.updateBounds(node: self.contentNode, bounds: CGRect(origin: CGPoint(), size: size))
+
+        if let gradientBackgroundNode = self.gradientBackgroundNode {
+            transition.updateFrame(node: gradientBackgroundNode, frame: CGRect(origin: CGPoint(), size: size))
+            gradientBackgroundNode.updateLayout(size: size, transition: transition)
+        }
+
+        self.loadPatternForSizeIfNeeded(size: size, transition: transition)
+        
+        if isFirstLayout && !self.frame.isEmpty {
+            self.updateScale()
+        }
+    }
+
+    public func animateEvent(transition: ContainedViewLayoutTransition, extendAnimation: Bool = false) {
+        self.gradientBackgroundNode?.animateEvent(transition: transition, extendAnimation: extendAnimation)
+    }
+
+    public func updateBubbleTheme(bubbleTheme: PresentationTheme, bubbleCorners: PresentationChatBubbleCorners) {
+        if self.bubbleTheme !== bubbleTheme || self.bubbleCorners != bubbleCorners {
+            self.bubbleTheme = bubbleTheme
+            self.bubbleCorners = bubbleCorners
+
+            self.updateBubbles()
+        }
+    }
+
+    private func updateBubbles() {
+        for reference in self.bubbleBackgroundNodeReferences {
+            reference.node?.updateContents()
+        }
+    }
+
+    public func hasBubbleBackground(for type: WallpaperBackgroundNode.BubbleBackgroundNode.BubbleType) -> Bool {
+        guard let bubbleTheme = self.bubbleTheme, let bubbleCorners = self.bubbleCorners else {
+            return false
+        }
+        if self.wallpaper == nil && !self.isSettingUpWallpaper {
+            return false
+        }
+
+        var hasPlainWallpaper = false
+        let graphicsWallpaper: TelegramWallpaper
+        if let wallpaper = self.wallpaper {
+            switch wallpaper {
+            case .color:
+                hasPlainWallpaper = true
+            default:
+                break
+            }
+            graphicsWallpaper = wallpaper
+        } else {
+            graphicsWallpaper = bubbleTheme.chat.defaultWallpaper
+        }
+
+        let graphics = PresentationResourcesChat.principalGraphics(theme: bubbleTheme, wallpaper: graphicsWallpaper, bubbleCorners: bubbleCorners)
+        switch type {
+        case .incoming:
+            if graphics.incomingBubbleGradientImage != nil {
+                return true
+            }
+            if bubbleTheme.chat.message.incoming.bubble.withWallpaper.fill.alpha <= 0.99 {
+                return !hasPlainWallpaper
+            }
+        case .outgoing:
+            if graphics.outgoingBubbleGradientImage != nil {
+                return true
+            }
+            if bubbleTheme.chat.message.outgoing.bubble.withWallpaper.fill.alpha <= 0.99 {
+                return !hasPlainWallpaper
+            }
+        case .free:
+            return true
+        }
+
+        return false
+    }
+
+    public func makeBubbleBackground(for type: WallpaperBackgroundNode.BubbleBackgroundNode.BubbleType) -> WallpaperBackgroundNode.BubbleBackgroundNode? {
+        if !self.hasBubbleBackground(for: type) {
+            return nil
+        }
+        let node = WallpaperBackgroundNode.BubbleBackgroundNode(backgroundNode: self, bubbleType: type)
+        node.updateContents()
+        return node
+    }
+}
diff --git a/submodules/WallpaperResources/BUILD b/submodules/WallpaperResources/BUILD
index e5aa740c94..4a369c7786 100644
--- a/submodules/WallpaperResources/BUILD
+++ b/submodules/WallpaperResources/BUILD
@@ -20,6 +20,8 @@ swift_library(
         "//submodules/PersistentStringHash:PersistentStringHash",
         "//submodules/AppBundle:AppBundle",
         "//submodules/Svg:Svg",
+        "//submodules/GZip:GZip",
+        "//submodules/GradientBackground:GradientBackground",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/WallpaperResources/Sources/WallpaperCache.swift b/submodules/WallpaperResources/Sources/WallpaperCache.swift
index 5d01c54c3d..7c234b790f 100644
--- a/submodules/WallpaperResources/Sources/WallpaperCache.swift
+++ b/submodules/WallpaperResources/Sources/WallpaperCache.swift
@@ -47,7 +47,13 @@ public func cachedWallpaper(account: Account, slug: String, settings: WallpaperS
                     let key = ValueBoxKey(length: 8)
                     key.setInt64(0, value: Int64(bitPattern: slug.persistentHashValue))
                     let id = ItemCacheEntryId(collectionId: ApplicationSpecificItemCacheCollectionId.cachedWallpapers, key: key)
-                    if let wallpaper = wallpaper {
+                    if var wallpaper = wallpaper {
+                        switch wallpaper {
+                        case let .file(id, accessHash, isCreator, isDefault, isPattern, isDark, slug, file, settings):
+                            wallpaper = .file(id: id, accessHash: accessHash, isCreator: isCreator, isDefault: isDefault, isPattern: isPattern, isDark: isDark, slug: slug, file: file.withUpdatedResource(WallpaperDataResource(slug: slug)), settings: settings)
+                        default:
+                            break
+                        }
                         let entry = CachedWallpaper(wallpaper: wallpaper)
                         transaction.putItemCacheEntry(id: id, entry: entry, collectionSpec: collectionSpec)
                         if let settings = settings {
diff --git a/submodules/WallpaperResources/Sources/WallpaperResources.swift b/submodules/WallpaperResources/Sources/WallpaperResources.swift
index d98b166d07..d654e55376 100644
--- a/submodules/WallpaperResources/Sources/WallpaperResources.swift
+++ b/submodules/WallpaperResources/Sources/WallpaperResources.swift
@@ -15,6 +15,8 @@ import TelegramPresentationData
 import TelegramUIPreferences
 import AppBundle
 import Svg
+import GradientBackground
+import GZip
 
 public func wallpaperDatas(account: Account, accountManager: AccountManager, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, thumbnail: Bool = false, onlyFullSize: Bool = false, autoFetchFullSize: Bool = false, synchronousLoad: Bool = false) -> Signal<(Data?, Data?, Bool), NoError> {
     if let smallestRepresentation = smallestImageRepresentation(representations.map({ $0.representation })), let largestRepresentation = largestImageRepresentation(representations.map({ $0.representation })), let smallestIndex = representations.firstIndex(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.firstIndex(where: { $0.representation == largestRepresentation }) {
@@ -86,7 +88,7 @@ public func wallpaperDatas(account: Account, accountManager: AccountManager, fil
                 }
             } else {
                 let fetchedThumbnail: Signal<FetchResourceSourceType, FetchResourceError>
-                if let _ = decodedThumbnailData {
+                if let _ = decodedThumbnailData, false {
                     fetchedThumbnail = .complete()
                 } else {
                     fetchedThumbnail = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: representations[smallestIndex].reference)
@@ -95,7 +97,7 @@ public func wallpaperDatas(account: Account, accountManager: AccountManager, fil
                 let fetchedFullSize = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: representations[largestIndex].reference)
                 
                 let thumbnailData: Signal<Data?, NoError>
-                if let decodedThumbnailData = decodedThumbnailData {
+                if let decodedThumbnailData = decodedThumbnailData, false {
                     thumbnailData = .single(decodedThumbnailData)
                 } else {
                     thumbnailData = Signal<Data?, NoError> { subscriber in
@@ -174,7 +176,7 @@ public func wallpaperDatas(account: Account, accountManager: AccountManager, fil
     }
 }
 
-public func wallpaperImage(account: Account, accountManager: AccountManager, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, thumbnail: Bool = false, onlyFullSize: Bool = false, autoFetchFullSize: Bool = false, synchronousLoad: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func wallpaperImage(account: Account, accountManager: AccountManager, fileReference: FileMediaReference? = nil, representations: [ImageRepresentationWithReference], alwaysShowThumbnailFirst: Bool = false, thumbnail: Bool = false, onlyFullSize: Bool = false, autoFetchFullSize: Bool = false, blurred: Bool = false, synchronousLoad: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     let signal = wallpaperDatas(account: account, accountManager: accountManager, fileReference: fileReference, representations: representations, alwaysShowThumbnailFirst: alwaysShowThumbnailFirst, thumbnail: thumbnail, onlyFullSize: onlyFullSize, autoFetchFullSize: autoFetchFullSize, synchronousLoad: synchronousLoad)
     
     return signal
@@ -213,6 +215,39 @@ public func wallpaperImage(account: Account, accountManager: AccountManager, fil
                     }
                 }
             }
+
+            if blurred, let fullSizeImageValue = fullSizeImage {
+                let thumbnailSize = CGSize(width: fullSizeImageValue.width, height: fullSizeImageValue.height)
+
+                let initialThumbnailContextFittingSize = fittedSize.fitted(CGSize(width: 90.0, height: 90.0))
+
+                let thumbnailContextSize = thumbnailSize.aspectFitted(initialThumbnailContextFittingSize)
+                let thumbnailContext = DrawingContext(size: thumbnailContextSize, scale: 1.0)
+                thumbnailContext.withFlippedContext { c in
+                    c.draw(fullSizeImageValue, in: CGRect(origin: CGPoint(), size: thumbnailContextSize))
+                }
+                telegramFastBlurMore(Int32(thumbnailContextSize.width), Int32(thumbnailContextSize.height), Int32(thumbnailContext.bytesPerRow), thumbnailContext.bytes)
+
+                var thumbnailContextFittingSize = CGSize(width: floor(arguments.drawingSize.width * 0.5), height: floor(arguments.drawingSize.width * 0.5))
+                if thumbnailContextFittingSize.width < 150.0 || thumbnailContextFittingSize.height < 150.0 {
+                    thumbnailContextFittingSize = thumbnailContextFittingSize.aspectFilled(CGSize(width: 150.0, height: 150.0))
+                }
+
+                if false, thumbnailContextFittingSize.width > thumbnailContextSize.width {
+                    let additionalContextSize = thumbnailContextFittingSize
+                    let additionalBlurContext = DrawingContext(size: additionalContextSize, scale: 1.0)
+                    additionalBlurContext.withFlippedContext { c in
+                        c.interpolationQuality = .default
+                        if let image = thumbnailContext.generateImage()?.cgImage {
+                            c.draw(image, in: CGRect(origin: CGPoint(), size: additionalContextSize))
+                        }
+                    }
+                    imageFastBlur(Int32(additionalContextSize.width), Int32(additionalContextSize.height), Int32(additionalBlurContext.bytesPerRow), additionalBlurContext.bytes)
+                    fullSizeImage = additionalBlurContext.generateImage()?.cgImage
+                } else {
+                    fullSizeImage = thumbnailContext.generateImage()?.cgImage
+                }
+            }
             
             var thumbnailImage: CGImage?
             if let thumbnailData = thumbnailData, let imageSource = CGImageSourceCreateWithData(thumbnailData as CFData, nil), let image = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
@@ -300,75 +335,71 @@ public struct PatternWallpaperArguments: TransformImageCustomArguments {
     let colors: [UIColor]
     let rotation: Int32?
     let preview: Bool
+    let customPatternColor: UIColor?
+    let bakePatternAlpha: CGFloat
     
-    public init(colors: [UIColor], rotation: Int32?, preview: Bool = false) {
+    public init(colors: [UIColor], rotation: Int32?, customPatternColor: UIColor? = nil, preview: Bool = false, bakePatternAlpha: CGFloat = 1.0) {
         self.colors = colors
         self.rotation = rotation
+        self.customPatternColor = customPatternColor
         self.preview = preview
+        self.bakePatternAlpha = bakePatternAlpha
     }
     
     public func serialized() -> NSArray {
         let array = NSMutableArray()
         array.addObjects(from: self.colors)
         array.add(NSNumber(value: self.rotation ?? 0))
+        if let customPatternColor = customPatternColor {
+            array.add(NSNumber(value: customPatternColor.argb))
+        }
         array.add(NSNumber(value: self.preview))
+        array.add(NSNumber(value: Double(self.bakePatternAlpha)))
         return array
     }
 }
 
-private func patternWallpaperDatas(account: Account, accountManager: AccountManager, representations: [ImageRepresentationWithReference], mode: PatternWallpaperDrawMode, autoFetchFullSize: Bool = false) -> Signal<(Data?, Data?, Bool), NoError> {
-    if let smallestRepresentation = smallestImageRepresentation(representations.map({ $0.representation })), let largestRepresentation = largestImageRepresentation(representations.map({ $0.representation })), let smallestIndex = representations.firstIndex(where: { $0.representation == smallestRepresentation }), let largestIndex = representations.firstIndex(where: { $0.representation == largestRepresentation }) {
-        
-        let size: CGSize?
-        switch mode {
-            case .thumbnail:
-                size = largestRepresentation.dimensions.cgSize.fitted(CGSize(width: 640.0, height: 640.0))
-            default:
-                size = nil
+private func patternWallpaperDatas(account: Account, accountManager: AccountManager, representations: [ImageRepresentationWithReference], mode: PatternWallpaperDrawMode, autoFetchFullSize: Bool = false) -> Signal<(Data?, Bool), NoError> {
+    var targetRepresentation: ImageRepresentationWithReference?
+    switch mode {
+    case .thumbnail:
+        if let representation = smallestImageRepresentation(representations.map({ $0.representation })) {
+            targetRepresentation = representations[representations.firstIndex(where: { $0.representation == representation })!]
         }
-        let maybeFullSize = combineLatest(accountManager.mediaBox.cachedResourceRepresentation(largestRepresentation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: false), account.postbox.mediaBox.cachedResourceRepresentation(largestRepresentation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: false))
+    case .screen:
+        if let representation = largestImageRepresentation(representations.map({ $0.representation })) {
+            targetRepresentation = representations[representations.firstIndex(where: { $0.representation == representation })!]
+        }
+    }
+
+    if let targetRepresentation = targetRepresentation {
+        let maybeFullSize = combineLatest(
+            accountManager.mediaBox.resourceData(targetRepresentation.representation.resource),
+            account.postbox.mediaBox.resourceData(targetRepresentation.representation.resource)
+        )
         
         let signal = maybeFullSize
         |> take(1)
-        |> mapToSignal { maybeSharedData, maybeData -> Signal<(Data?, Data?, Bool), NoError> in
+        |> mapToSignal { maybeSharedData, maybeData -> Signal<(Data?, Bool), NoError> in
             if maybeSharedData.complete {
                 if let loadedData = try? Data(contentsOf: URL(fileURLWithPath: maybeSharedData.path), options: [.mappedRead]) {
-                    return .single((nil, loadedData, true))
+                    return .single((loadedData, true))
                 } else {
-                    return .single((nil, nil, true))
+                    return .single(( nil, true))
                 }
             } else if maybeData.complete {
                 let loadedData: Data? = try? Data(contentsOf: URL(fileURLWithPath: maybeData.path), options: [])
-                return .single((nil, loadedData, true))
+                return .single((loadedData, true))
             } else {
-                let fetchedThumbnail = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: representations[smallestIndex].reference)
-                let fetchedFullSize = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: representations[largestIndex].reference)
-                
-                let thumbnailData = Signal<Data?, NoError> { subscriber in
-                    let fetchedDisposable = fetchedThumbnail.start()
-                    let thumbnailDisposable = account.postbox.mediaBox.cachedResourceRepresentation(representations[smallestIndex].representation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: true).start(next: { next in
-                        subscriber.putNext(next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []))
-                        
-                        if next.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: next.path), options: .mappedRead) {
-                            accountManager.mediaBox.storeResourceData(representations[smallestIndex].representation.resource.id, data: data)
-                            let _ = accountManager.mediaBox.cachedResourceRepresentation(representations[smallestIndex].representation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: true).start()
-                        }
-                    }, error: subscriber.putError, completed: subscriber.putCompletion)
-                    
-                    return ActionDisposable {
-                        fetchedDisposable.dispose()
-                        thumbnailDisposable.dispose()
-                    }
-                }
-                
-                let fullSizeData = Signal<(Data?, Bool), NoError> { subscriber in
+                let fetchedFullSize = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: targetRepresentation.reference)
+
+                let accountFullSizeData = Signal<(Data?, Bool), NoError> { subscriber in
                     let fetchedFullSizeDisposable = fetchedFullSize.start()
-                    let fullSizeDisposable = account.postbox.mediaBox.cachedResourceRepresentation(representations[largestIndex].representation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: true).start(next: { next in
+                    let fullSizeDisposable = account.postbox.mediaBox.resourceData(targetRepresentation.representation.resource).start(next: { next in
                         subscriber.putNext((next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []), next.complete))
                         
                         if next.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: next.path), options: .mappedRead) {
-                            accountManager.mediaBox.storeResourceData(representations[largestIndex].representation.resource.id, data: data)
-                            let _ = accountManager.mediaBox.cachedResourceRepresentation(representations[largestIndex].representation.resource, representation: CachedPatternWallpaperMaskRepresentation(size: size), complete: false, fetch: true).start()
+                            accountManager.mediaBox.storeResourceData(targetRepresentation.representation.resource.id, data: data)
                         }
                     }, error: subscriber.putError, completed: subscriber.putCompletion)
                     
@@ -377,12 +408,41 @@ private func patternWallpaperDatas(account: Account, accountManager: AccountMana
                         fullSizeDisposable.dispose()
                     }
                 }
-                
-                return thumbnailData |> mapToSignal { thumbnailData in
-                    return fullSizeData |> map { (fullSizeData, complete) in
-                        return (thumbnailData, fullSizeData, complete)
+
+                let sharedFullSizeData = Signal<(Data?, Bool), NoError> { subscriber in
+                    let fullSizeDisposable = accountManager.mediaBox.resourceData(targetRepresentation.representation.resource).start(next: { next in
+                        subscriber.putNext((next.size == 0 ? nil : try? Data(contentsOf: URL(fileURLWithPath: next.path), options: []), next.complete))
+                    }, error: subscriber.putError, completed: subscriber.putCompletion)
+
+                    return ActionDisposable {
+                        fullSizeDisposable.dispose()
                     }
                 }
+
+                let fullSizeData = combineLatest(accountFullSizeData, sharedFullSizeData)
+                |> map { accountFullSizeData, sharedFullSizeData -> (Data?, Bool) in
+                    if accountFullSizeData.0 != nil {
+                        return accountFullSizeData
+                    } else {
+                        return sharedFullSizeData
+                    }
+                }
+                |> distinctUntilChanged(isEqual: { lhs, rhs in
+                    if lhs.0 == nil && rhs.0 == nil {
+                        return true
+                    } else {
+                        return false
+                    }
+                })
+                |> take(until: { value in
+                    if value.0 != nil {
+                        return SignalTakeAction(passthrough: true, complete: true)
+                    } else {
+                        return SignalTakeAction(passthrough: true, complete: false)
+                    }
+                })
+
+                return fullSizeData
             }
         }
     
@@ -392,42 +452,28 @@ private func patternWallpaperDatas(account: Account, accountManager: AccountMana
     }
 }
 
-public func patternWallpaperImage(account: Account, accountManager: AccountManager, representations: [ImageRepresentationWithReference], mode: PatternWallpaperDrawMode, autoFetchFullSize: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func patternWallpaperImage(account: Account, accountManager: AccountManager, representations: [ImageRepresentationWithReference], mode: PatternWallpaperDrawMode, autoFetchFullSize: Bool = false) -> Signal<((TransformImageArguments) -> DrawingContext?)?, NoError> {
     return patternWallpaperDatas(account: account, accountManager: accountManager, representations: representations, mode: mode, autoFetchFullSize: autoFetchFullSize)
-    |> mapToSignal { (thumbnailData, fullSizeData, fullSizeComplete) in
-        return patternWallpaperImageInternal(thumbnailData: thumbnailData, fullSizeData: fullSizeData, fullSizeComplete: fullSizeComplete, mode: mode)
+    |> mapToSignal { fullSizeData, fullSizeComplete in
+        return patternWallpaperImageInternal(fullSizeData: fullSizeData, fullSizeComplete: fullSizeComplete, mode: mode)
     }
 }
 
-public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Data?, fullSizeComplete: Bool, mode: PatternWallpaperDrawMode) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+private func patternWallpaperImageInternal(fullSizeData: Data?, fullSizeComplete: Bool, mode: PatternWallpaperDrawMode) -> Signal<((TransformImageArguments) -> DrawingContext?)?, NoError> {
     var prominent = false
     if case .thumbnail = mode {
         prominent = true
     }
     
-    var scale: CGFloat = 0.0
+    let scale: CGFloat = 0.0
     
-    return .single((thumbnailData, fullSizeData, fullSizeComplete))
-    |> map { (thumbnailData, fullSizeData, fullSizeComplete) in
-        var fullSizeImage: CGImage?
-        var scaledSizeImage: CGImage?
-        if let fullSizeData = fullSizeData, fullSizeComplete {
-            let options = NSMutableDictionary()
-            options[kCGImageSourceShouldCache as NSString] = false as NSNumber
-            if let imageSource = CGImageSourceCreateWithData(fullSizeData as CFData, nil), let image = CGImageSourceCreateImageAtIndex(imageSource, 0, options as CFDictionary) {
-                fullSizeImage = image
-                
-                let options = NSMutableDictionary()
-                options.setValue(960 as NSNumber, forKey: kCGImageSourceThumbnailMaxPixelSize as String)
-                options.setValue(true as NSNumber, forKey: kCGImageSourceCreateThumbnailFromImageAlways as String)
-                if let imageSource = CGImageSourceCreateWithData(fullSizeData as CFData, nil), let image = CGImageSourceCreateThumbnailAtIndex(imageSource, 0, options) {
-                    scaledSizeImage = image
-                }
-            }
-        }
-        
+    return .single((fullSizeData, fullSizeComplete))
+    |> map { fullSizeData, fullSizeComplete in
         return { arguments in
             var scale = scale
+            if scale.isZero {
+                scale = arguments.scale ?? UIScreenScale
+            }
             
             let drawingRect = arguments.drawingRect
          
@@ -441,13 +487,26 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da
                 let color = combinedColor.withAlphaComponent(1.0)
                 let intensity = combinedColor.alpha
                 
-                let context = DrawingContext(size: arguments.drawingSize, scale: fullSizeImage == nil ? 1.0 : scale, clear: !arguments.corners.isEmpty)
+                let context = DrawingContext(size: arguments.drawingSize, scale: scale, clear: !arguments.corners.isEmpty)
                 context.withFlippedContext { c in
                     c.setBlendMode(.copy)
-                    
+
                     if colors.count == 1 {
-                        c.setFillColor(color.cgColor)
-                        c.fill(arguments.drawingRect)
+                        if customArguments.colors[0].alpha.isZero {
+                            c.clear(arguments.drawingRect)
+                        } else {
+                            c.setFillColor(color.cgColor)
+                            c.fill(arguments.drawingRect)
+                        }
+                    } else if colors.count >= 3 {
+                        let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors)
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                        c.draw(image.cgImage!, in: drawingRect)
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
                     } else {
                         let gradientColors = colors.map { $0.cgColor } as CFArray
                         let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
@@ -467,44 +526,86 @@ public func patternWallpaperImageInternal(thumbnailData: Data?, fullSizeData: Da
                         c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
                         c.restoreGState()
                     }
-                    
-                    let image = customArguments.preview ? (scaledSizeImage ?? fullSizeImage) : fullSizeImage
-                    if let image = image {
-                        var fittedSize = CGSize(width: image.width, height: image.height)
-                        if abs(fittedSize.width - arguments.boundingSize.width).isLessThanOrEqualTo(CGFloat(1.0)) {
-                            fittedSize.width = arguments.boundingSize.width
+
+                    let overlayImage = generateImage(arguments.drawingRect.size, rotatedContext: { size, c in
+                        c.clear(CGRect(origin: CGPoint(), size: size))
+                        var image: UIImage?
+                        if let fullSizeData = fullSizeData, let unpackedData = TGGUnzipData(fullSizeData, 2 * 1024 * 1024) {
+                            image = drawSvgImage(unpackedData, CGSize(width: size.width * context.scale, height: size.height * context.scale), .black, .white)
+                        } else if let fullSizeData = fullSizeData {
+                            image = UIImage(data: fullSizeData)
                         }
-                        if abs(fittedSize.height - arguments.boundingSize.height).isLessThanOrEqualTo(CGFloat(1.0)) {
-                            fittedSize.height = arguments.boundingSize.height
-                        }
-                        fittedSize = fittedSize.aspectFilled(arguments.drawingRect.size)
-                        
-                        let fittedRect = CGRect(origin: CGPoint(x: drawingRect.origin.x + (drawingRect.size.width - fittedSize.width) / 2.0, y: drawingRect.origin.y + (drawingRect.size.height - fittedSize.height) / 2.0), size: fittedSize)
-                        
-                        c.setBlendMode(.normal)
-                        c.interpolationQuality = customArguments.preview ? .low : .medium
-                        c.clip(to: fittedRect, mask: image)
-                       
-                        if colors.count == 1 {
-                            c.setFillColor(patternColor(for: color, intensity: intensity, prominent: prominent).cgColor)
-                            c.fill(arguments.drawingRect)
+
+                        if let customPatternColor = customArguments.customPatternColor, customPatternColor.alpha < 1.0 {
+                            c.setBlendMode(.copy)
+                            c.setFillColor(UIColor.black.cgColor)
+                            c.fill(CGRect(origin: CGPoint(), size: size))
                         } else {
-                            let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray
-                            let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
-                            
-                            var locations: [CGFloat] = []
-                            for i in 0 ..< colors.count {
-                                locations.append(delta * CGFloat(i))
-                            }
-                            let colorSpace = CGColorSpaceCreateDeviceRGB()
-                            let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
-                            
-                            c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0)
-                            c.rotate(by: CGFloat(customArguments.rotation ?? 0) * CGFloat.pi / -180.0)
-                            c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0)
-                            
-                            c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+                            c.setBlendMode(.normal)
                         }
+
+                        if let image = image {
+                            var fittedSize = image.size
+                            if abs(fittedSize.width - arguments.boundingSize.width).isLessThanOrEqualTo(CGFloat(1.0)) {
+                                fittedSize.width = arguments.boundingSize.width
+                            }
+                            if abs(fittedSize.height - arguments.boundingSize.height).isLessThanOrEqualTo(CGFloat(1.0)) {
+                                fittedSize.height = arguments.boundingSize.height
+                            }
+                            fittedSize = fittedSize.aspectFilled(arguments.drawingRect.size)
+
+                            let fittedRect = CGRect(origin: CGPoint(x: drawingRect.origin.x + (drawingRect.size.width - fittedSize.width) / 2.0, y: drawingRect.origin.y + (drawingRect.size.height - fittedSize.height) / 2.0), size: fittedSize)
+
+                            c.interpolationQuality = customArguments.preview ? .low : .medium
+                            c.clip(to: fittedRect, mask: image.cgImage!)
+
+                            if let customPatternColor = customArguments.customPatternColor {
+                                c.setFillColor(customPatternColor.cgColor)
+                                c.fill(CGRect(origin: CGPoint(), size: arguments.drawingRect.size))
+                            } else if colors.count >= 3 && customArguments.customPatternColor == nil {
+                                c.setFillColor(UIColor(white: 0.0, alpha: 0.5).cgColor)
+                                c.fill(CGRect(origin: CGPoint(), size: arguments.drawingRect.size))
+                            } else if colors.count == 1 {
+                                c.setFillColor(customArguments.customPatternColor?.cgColor ?? patternColor(for: color, intensity: intensity, prominent: prominent).cgColor)
+                                c.fill(CGRect(origin: CGPoint(), size: arguments.drawingRect.size))
+                            } else {
+                                let gradientColors = colors.map { patternColor(for: $0, intensity: intensity, prominent: prominent).cgColor } as CFArray
+                                let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
+
+                                var locations: [CGFloat] = []
+                                for i in 0 ..< colors.count {
+                                    locations.append(delta * CGFloat(i))
+                                }
+                                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                                let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+
+                                c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0)
+                                c.rotate(by: CGFloat(customArguments.rotation ?? 0) * CGFloat.pi / -180.0)
+                                c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0)
+
+                                c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+                            }
+                        }
+                    })
+                    if let customPatternColor = customArguments.customPatternColor, customPatternColor.alpha < 1.0 {
+                        c.setBlendMode(.normal)
+                    } else if customArguments.colors.count == 1 && customArguments.colors[0].alpha.isZero {
+                        c.setBlendMode(.normal)
+                    } else {
+                        c.setBlendMode(.softLight)
+                    }
+                    if let overlayImage = overlayImage {
+                        if customArguments.bakePatternAlpha != 1.0 {
+                            c.setAlpha(customArguments.bakePatternAlpha)
+                        }
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                        c.draw(overlayImage.cgImage!, in: drawingRect)
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                        c.setAlpha(1.0)
                     }
                 }
                 addCorners(context, arguments: arguments)
@@ -550,6 +651,55 @@ public func solidColorImage(_ color: UIColor) -> Signal<(TransformImageArguments
     })
 }
 
+public func drawWallpaperGradientImage(_ colors: [UIColor], rotation: Int32? = nil, context: CGContext, size: CGSize) {
+    guard !colors.isEmpty else {
+        return
+    }
+    guard colors.count > 1 else {
+        context.setFillColor(colors[0].cgColor)
+        context.fill(CGRect(origin: CGPoint(), size: size))
+        return
+    }
+
+    let drawingRect = CGRect(origin: CGPoint(), size: size)
+
+    let c = context
+
+    if colors.count >= 3 {
+        let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors)
+        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+        c.scaleBy(x: 1.0, y: -1.0)
+        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+        c.draw(image.cgImage!, in: drawingRect)
+        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+        c.scaleBy(x: 1.0, y: -1.0)
+        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+    } else {
+        let gradientColors = colors.map { $0.withAlphaComponent(1.0).cgColor } as CFArray
+        let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
+
+        var locations: [CGFloat] = []
+        for i in 0 ..< colors.count {
+            locations.append(delta * CGFloat(i))
+        }
+        let colorSpace = CGColorSpaceCreateDeviceRGB()
+        let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+
+        if let rotation = rotation {
+            c.saveGState()
+            c.translateBy(x: drawingRect.width / 2.0, y: drawingRect.height / 2.0)
+            c.rotate(by: CGFloat(rotation) * CGFloat.pi / 180.0)
+            c.translateBy(x: -drawingRect.width / 2.0, y: -drawingRect.height / 2.0)
+        }
+
+        c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: drawingRect.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+
+        if rotation != nil {
+            c.restoreGState()
+        }
+    }
+}
+
 public func gradientImage(_ colors: [UIColor], rotation: Int32? = nil) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     guard !colors.isEmpty else {
         return .complete()
@@ -563,25 +713,38 @@ public func gradientImage(_ colors: [UIColor], rotation: Int32? = nil) -> Signal
     }
     return .single({ arguments in
         let context = DrawingContext(size: arguments.drawingSize, clear: !arguments.corners.isEmpty)
+
+        let drawingRect = arguments.drawingRect
         
         context.withContext { c in
-            let gradientColors = colors.map { $0.withAlphaComponent(1.0).cgColor } as CFArray
-            let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
-            
-            var locations: [CGFloat] = []
-            for i in 0 ..< colors.count {
-                locations.append(delta * CGFloat(i))
-            }
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+            if colors.count >= 3 {
+                let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors)
+                c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                c.scaleBy(x: 1.0, y: -1.0)
+                c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                c.draw(image.cgImage!, in: drawingRect)
+                c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                c.scaleBy(x: 1.0, y: -1.0)
+                c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+            } else {
+                let gradientColors = colors.map { $0.withAlphaComponent(1.0).cgColor } as CFArray
+                let delta: CGFloat = 1.0 / (CGFloat(colors.count) - 1.0)
 
-            if let rotation = rotation {
-                c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0)
-                c.rotate(by: CGFloat(rotation) * CGFloat.pi / 180.0)
-                c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0)
+                var locations: [CGFloat] = []
+                for i in 0 ..< colors.count {
+                    locations.append(delta * CGFloat(i))
+                }
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+
+                if let rotation = rotation {
+                    c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0)
+                    c.rotate(by: CGFloat(rotation) * CGFloat.pi / 180.0)
+                    c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0)
+                }
+
+                c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
             }
-            
-            c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
         }
         
         addCorners(context, arguments: arguments)
@@ -601,7 +764,7 @@ private func builtinWallpaperData() -> Signal<UIImage, NoError> {
         } |> runOn(Queue.concurrentDefaultQueue())
 }
 
-public func settingsBuiltinWallpaperImage(account: Account) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+public func settingsBuiltinWallpaperImage(account: Account, thumbnail: Bool = false) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
     return builtinWallpaperData() |> map { fullSizeImage in
         return { arguments in
             let context = DrawingContext(size: arguments.drawingSize, clear: true)
@@ -619,6 +782,11 @@ public func settingsBuiltinWallpaperImage(account: Account) -> Signal<(Transform
             
             context.withFlippedContext { c in
                 c.setBlendMode(.copy)
+                if thumbnail {
+                    c.translateBy(x: fittedRect.midX, y: fittedRect.midY)
+                    c.scaleBy(x: 3.4, y: 3.4)
+                    c.translateBy(x: -fittedRect.midX, y: -fittedRect.midY)
+                }
                 if let fullSizeImage = fullSizeImage.cgImage {
                     c.interpolationQuality = .medium
                     drawImage(context: c, image: fullSizeImage, orientation: .up, in: fittedRect)
@@ -759,25 +927,39 @@ public func drawThemeImage(context c: CGContext, theme: PresentationTheme, wallp
         case let .color(color):
             c.setFillColor(UIColor(rgb: color).cgColor)
             c.fill(drawingRect)
-        case let .gradient(topColor, bottomColor, _):
-            let gradientColors = [UIColor(rgb: topColor), UIColor(rgb: bottomColor)].map { $0.cgColor } as CFArray
-            var locations: [CGFloat] = [0.0, 1.0]
-            let colorSpace = CGColorSpaceCreateDeviceRGB()
-            let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
-            c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: drawingRect.height), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
-        case .file:
-            c.setFillColor(theme.chatList.backgroundColor.cgColor)
-            c.fill(drawingRect)
-        
-            if let image = wallpaperImage, let cgImage = image.cgImage {
-                let size = image.size.aspectFilled(drawingRect.size)
-                c.draw(cgImage, in: CGRect(origin: CGPoint(x: (drawingRect.size.width - size.width) / 2.0, y: (drawingRect.size.height - size.height) / 2.0), size: size))
+        case let .gradient(_, colors, _):
+            if colors.count >= 3 {
+                let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors.map(UIColor.init(rgb:)))
+                c.draw(image.cgImage!, in: drawingRect)
+            } else if colors.count >= 2 {
+                let gradientColors = colors.map({ UIColor(rgb: $0).cgColor }) as CFArray
+                var locations: [CGFloat] = [0.0, 1.0]
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+                c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: drawingRect.height), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+            } else if colors.count >= 1 {
+                let gradientColors = [UIColor(rgb: colors[0]), UIColor(rgb: colors[0])] as CFArray
+                var locations: [CGFloat] = [0.0, 1.0]
+                let colorSpace = CGColorSpaceCreateDeviceRGB()
+                let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+                c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: drawingRect.height), end: CGPoint(x: 0.0, y: 0.0), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
             }
+        case let .file(file):
+            if file.isPattern, let intensity = file.settings.intensity, intensity < 0 {
+                c.setFillColor(UIColor.black.cgColor)
+                c.fill(CGRect(origin: CGPoint(), size: size))
+            } else {
+                if let image = wallpaperImage, let cgImage = image.cgImage {
+                    let size = image.size.aspectFilled(drawingRect.size)
+                    c.draw(cgImage, in: CGRect(origin: CGPoint(x: (drawingRect.size.width - size.width) / 2.0, y: (drawingRect.size.height - size.height) / 2.0), size: size))
+                }
+            }
+            c.setFillColor(theme.chatList.backgroundColor.cgColor)
         default:
             break
     }
     
-    c.setFillColor(theme.rootController.navigationBar.backgroundColor.cgColor)
+    c.setFillColor(theme.rootController.navigationBar.opaqueBackgroundColor.cgColor)
     c.fill(CGRect(origin: CGPoint(x: 0.0, y: drawingRect.height - 42.0), size: CGSize(width: drawingRect.width, height: 42.0)))
     
     c.setFillColor(theme.rootController.navigationBar.separatorColor.cgColor)
@@ -960,31 +1142,36 @@ public func themeImage(account: Account, accountManager: AccountManager, source:
                 }
             }
         case let .settings(settings):
-            theme = .single((makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false), nil))
+            theme = .single((makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false), nil))
+    }
+
+    enum WallpaperImage {
+        case image(UIImage)
+        case pattern(data: Data, colors: [UInt32], intensity: Int32)
     }
     
     let data = theme
-    |> mapToSignal { (theme, thumbnailData) -> Signal<(PresentationTheme?, UIImage?, Data?), NoError> in
+    |> mapToSignal { (theme, thumbnailData) -> Signal<(PresentationTheme?, WallpaperImage?, Data?), NoError> in
         if let theme = theme {
             if case let .file(file) = theme.chat.defaultWallpaper {
                 return cachedWallpaper(account: account, slug: file.slug, settings: file.settings)
-                |> mapToSignal { wallpaper -> Signal<(PresentationTheme?, UIImage?, Data?), NoError> in
+                |> mapToSignal { wallpaper -> Signal<(PresentationTheme?, WallpaperImage?, Data?), NoError> in
                     if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper {
                         var convertedRepresentations: [ImageRepresentationWithReference] = []
-                        convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
+                        convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
                         return wallpaperDatas(account: account, accountManager: accountManager, fileReference: .standalone(media: file.file), representations: convertedRepresentations, alwaysShowThumbnailFirst: false, thumbnail: false, onlyFullSize: true, autoFetchFullSize: true, synchronousLoad: false)
-                        |> mapToSignal { _, fullSizeData, complete -> Signal<(PresentationTheme?, UIImage?, Data?), NoError> in
+                        |> mapToSignal { _, fullSizeData, complete -> Signal<(PresentationTheme?, WallpaperImage?, Data?), NoError> in
                             guard complete, let fullSizeData = fullSizeData else {
                                 return .complete()
                             }
                             accountManager.mediaBox.storeResourceData(file.file.resource.id, data: fullSizeData)
                             let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start()
                             
-                            if wallpaper.wallpaper.isPattern, let color = file.settings.color, let intensity = file.settings.intensity {
-                                return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true)
+                            if wallpaper.wallpaper.isPattern, !file.settings.colors.isEmpty, let intensity = file.settings.intensity {
+                                return accountManager.mediaBox.resourceData(file.file.resource)
                                 |> mapToSignal { data in
-                                    if data.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: data.path)), let image = UIImage(data: data) {
-                                        return .single((theme, image, thumbnailData))
+                                    if data.complete, let imageData = try? Data(contentsOf: URL(fileURLWithPath: data.path)) {
+                                        return .single((theme, .pattern(data: imageData, colors: file.settings.colors, intensity: intensity), thumbnailData))
                                     } else {
                                         return .complete()
                                     }
@@ -993,13 +1180,13 @@ public func themeImage(account: Account, accountManager: AccountManager, source:
                                 return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedBlurredWallpaperRepresentation(), complete: true, fetch: true)
                                 |> mapToSignal { data in
                                     if data.complete, let data = try? Data(contentsOf: URL(fileURLWithPath: data.path)), let image = UIImage(data: data) {
-                                        return .single((theme, image, thumbnailData))
+                                        return .single((theme, .image(image), thumbnailData))
                                     } else {
                                         return .complete()
                                     }
                                 }
                             } else if let image = UIImage(data: fullSizeData) {
-                                return .single((theme, image, thumbnailData))
+                                return .single((theme, .image(image), thumbnailData))
                             } else {
                                 return .complete()
                             }
@@ -1067,8 +1254,27 @@ public func themeImage(account: Account, accountManager: AccountManager, source:
             if let theme = theme {
                 context.withFlippedContext { c in
                     c.setBlendMode(.normal)
-                    
-                    drawThemeImage(context: c, theme: theme, wallpaperImage: wallpaperImage, size: arguments.drawingSize)
+
+                    switch wallpaperImage {
+                    case let .image(image):
+                        drawThemeImage(context: c, theme: theme, wallpaperImage: image, size: arguments.drawingSize)
+                    case let .pattern(data, colors, intensity):
+                        let wallpaperImage = generateImage(arguments.drawingSize, rotatedContext: { size, context in
+                            drawWallpaperGradientImage(colors.map(UIColor.init(rgb:)), context: context, size: size)
+                            if let unpackedData = TGGUnzipData(data, 2 * 1024 * 1024), let image = drawSvgImage(unpackedData, arguments.drawingSize, .clear, .black) {
+                                context.setBlendMode(.softLight)
+                                context.setAlpha(abs(CGFloat(intensity)) / 100.0)
+                                context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: arguments.drawingSize))
+                            } else if let image = UIImage(data: data) {
+                                context.setBlendMode(.softLight)
+                                context.setAlpha(abs(CGFloat(intensity)) / 100.0)
+                                context.draw(image.cgImage!, in: CGRect(origin: CGPoint(), size: arguments.drawingSize))
+                            }
+                        })
+                        drawThemeImage(context: c, theme: theme, wallpaperImage: wallpaperImage, size: arguments.drawingSize)
+                    case .none:
+                        drawThemeImage(context: c, theme: theme, wallpaperImage: nil, size: arguments.drawingSize)
+                    }
                     
                     c.setStrokeColor(theme.rootController.navigationBar.separatorColor.cgColor)
                     c.setLineWidth(2.0)
@@ -1084,8 +1290,8 @@ public func themeImage(account: Account, accountManager: AccountManager, source:
 }
 
 public func themeIconImage(account: Account, accountManager: AccountManager, theme: PresentationThemeReference, color: PresentationThemeAccentColor?, wallpaper: TelegramWallpaper? = nil) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
-    let colorsSignal: Signal<((UIColor, UIColor?), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError>
-    if case let .builtin(theme) = theme {
+    let colorsSignal: Signal<((UIColor, UIColor?, [UInt32]), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError>
+    if false, case let .builtin(theme) = theme {
         let incomingColor: UIColor
         let outgoingColor: (UIColor, UIColor)
         var accentColor = color?.color
@@ -1097,8 +1303,10 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
             incomingColor = UIColor(rgb: 0xffffff)
             if let accentColor = accentColor {
                 if let wallpaper = wallpaper, case let .file(file) = wallpaper {
-                    topBackgroundColor = file.settings.color.flatMap { UIColor(rgb: $0) } ?? UIColor(rgb: 0xd6e2ee)
-                    bottomBackgroundColor = file.settings.bottomColor.flatMap { UIColor(rgb: $0) }
+                    topBackgroundColor = file.settings.colors.first.flatMap { UIColor(rgb: $0) } ?? UIColor(rgb: 0xd6e2ee)
+                    if file.settings.colors.count >= 2 {
+                        bottomBackgroundColor = UIColor(rgb: file.settings.colors[1])
+                    }
                 } else {
                     if let bubbleColors = bubbleColors {
                         topBackgroundColor = UIColor(rgb: 0xd6e2ee)
@@ -1116,7 +1324,20 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
                     outgoingColor = (bubbleColor, bubbleColor)
                 }
             } else {
-                topBackgroundColor = UIColor(rgb: 0xd6e2ee)
+                if let wallpaper = wallpaper, case let .file(file) = wallpaper {
+                    topBackgroundColor = file.settings.colors.first.flatMap { UIColor(rgb: $0) } ?? UIColor(rgb: 0xd6e2ee)
+                    if file.settings.colors.count >= 2 {
+                        bottomBackgroundColor = UIColor(rgb: file.settings.colors[1])
+                    }
+                } else if let wallpaper = wallpaper, case let .gradient(_, colors, _) = wallpaper {
+                    topBackgroundColor = colors.first.flatMap { UIColor(rgb: $0) } ?? UIColor(rgb: 0xd6e2ee)
+                    if colors.count >= 2 {
+                        bottomBackgroundColor = UIColor(rgb: colors[1])
+                    }
+                } else {
+                    topBackgroundColor = defaultBuiltinWallpaperGradientColors[0]
+                    bottomBackgroundColor = defaultBuiltinWallpaperGradientColors[1]
+                }
                 outgoingColor = (UIColor(rgb: 0xe1ffc7), UIColor(rgb: 0xe1ffc7))
             }
         case .day:
@@ -1140,42 +1361,61 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
             let accentBubbleColor = accentColor.withMultiplied(hue: 1.019, saturation: 0.731, brightness: 0.59)
             outgoingColor = bubbleColors ?? (accentBubbleColor, accentBubbleColor)
         }
-        
+
+        var colors: [UInt32] = []
         var rotation: Int32?
         if let wallpaper = wallpaper {
             switch wallpaper {
                 case let .color(color):
+                    colors = [color]
                     topBackgroundColor = UIColor(rgb: color)
-                case let .gradient(topColor, bottomColor, settings):
-                    topBackgroundColor = UIColor(rgb: topColor)
-                    bottomBackgroundColor = UIColor(rgb: bottomColor)
+                case let .gradient(_, colorsValue, settings):
+                    colors = colorsValue
+                    if colors.count >= 1 {
+                        topBackgroundColor = UIColor(rgb: colors[0])
+                    }
+                    if colors.count >= 2 {
+                        bottomBackgroundColor = UIColor(rgb: colors[1])
+                    }
                     rotation = settings.rotation
                 case let .file(file):
-                    if let color = file.settings.color {
-                        topBackgroundColor = UIColor(rgb: color)
-                        bottomBackgroundColor = file.settings.bottomColor.flatMap { UIColor(rgb: $0) }
+                    if file.isPattern, let intensity = file.settings.intensity, intensity < 0 {
+                        colors = [0x000000]
+                        topBackgroundColor = .black
+                        bottomBackgroundColor = .black
+                    } else {
+                        colors = file.settings.colors
+                        if !file.settings.colors.isEmpty {
+                            topBackgroundColor = UIColor(rgb: file.settings.colors[0])
+                            if file.settings.colors.count >= 2 {
+                                bottomBackgroundColor = UIColor(rgb: file.settings.colors[1])
+                            }
+                        }
+                        rotation = file.settings.rotation
                     }
-                    rotation = file.settings.rotation
                 default:
+                    colors = [0xd6e2ee]
                     topBackgroundColor = UIColor(rgb: 0xd6e2ee)
             }
+        } else {
+            colors = defaultBuiltinWallpaperGradientColors.map(\.rgb)
         }
         
-        colorsSignal = .single(((topBackgroundColor, bottomBackgroundColor), (incomingColor, incomingColor), outgoingColor, nil, rotation))
+        colorsSignal = .single(((topBackgroundColor, bottomBackgroundColor, colors), (incomingColor, incomingColor), outgoingColor, nil, rotation))
     } else {
-        var resource: MediaResource?
         var reference: MediaResourceReference?
-        var defaultWallpaper: TelegramWallpaper?
         if case let .local(theme) = theme {
             reference = .standalone(resource: theme.resource)
         } else if case let .cloud(theme) = theme, let resource = theme.theme.file?.resource {
             reference = .theme(theme: .slug(theme.theme.slug), resource: resource)
         }
-        
+
         let themeSignal: Signal<PresentationTheme?, NoError>
-        if case let .cloud(theme) = theme, let settings = theme.theme.settings {
+        if case let .builtin(theme) = theme {
+            themeSignal = .single(makeDefaultPresentationTheme(reference: theme, serviceBackgroundColor: nil))
+        } else if case let .cloud(theme) = theme, let settings = theme.theme.settings {
             themeSignal = Signal { subscriber in
-                let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: nil, bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false)
+                let theme = makePresentationTheme(mediaBox: accountManager.mediaBox, themeReference: .builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme)), accentColor: UIColor(argb: settings.accentColor), backgroundColors: [], bubbleColors: settings.messageColors.flatMap { (UIColor(argb: $0.top), UIColor(argb: $0.bottom)) }, wallpaper: settings.wallpaper, serviceBackgroundColor: nil, preview: false)
                 subscriber.putNext(theme)
                 subscriber.putCompletion()
                 
@@ -1195,42 +1435,57 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
         }
             
         colorsSignal = themeSignal
-        |> mapToSignal { theme -> Signal<((UIColor, UIColor?), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> in
+        |> mapToSignal { theme -> Signal<((UIColor, UIColor?, [UInt32]), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> in
             if let theme = theme {
-                var wallpaperSignal: Signal<((UIColor, UIColor?), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> = .complete()
+                var wallpaperSignal: Signal<((UIColor, UIColor?, [UInt32]), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> = .complete()
                 var rotation: Int32?
-                var backgroundColor: (UIColor, UIColor?)
+                var backgroundColor: (UIColor, UIColor?, [UInt32])
                 let incomingColor = (theme.chat.message.incoming.bubble.withoutWallpaper.fill, theme.chat.message.incoming.bubble.withoutWallpaper.gradientFill)
                 let outgoingColor = (theme.chat.message.outgoing.bubble.withoutWallpaper.fill, theme.chat.message.outgoing.bubble.withoutWallpaper.gradientFill)
-                switch theme.chat.defaultWallpaper {
+                let wallpaper = wallpaper ?? theme.chat.defaultWallpaper
+                switch wallpaper {
                     case .builtin:
-                        backgroundColor = (UIColor(rgb: 0xd6e2ee), nil)
+                        backgroundColor = (UIColor(rgb: 0xd6e2ee), nil, [])
                     case let .color(color):
-                        backgroundColor = (UIColor(rgb: color), nil)
-                    case let .gradient(topColor, bottomColor, settings):
-                        backgroundColor = (UIColor(rgb: topColor), UIColor(rgb: bottomColor))
+                        backgroundColor = (UIColor(rgb: color), nil, [])
+                    case let .gradient(_, colors, settings):
+                        if colors.count >= 2 {
+                            backgroundColor = (UIColor(rgb: colors[0]), UIColor(rgb: colors[1]), colors)
+                        } else {
+                            backgroundColor = (.white, nil, [])
+                        }
                         rotation = settings.rotation
                     case .image:
-                        backgroundColor = (.black, nil)
+                        backgroundColor = (.black, nil, [])
                     case let .file(file):
                         rotation = file.settings.rotation
-                        if let color = file.settings.color {
-                            backgroundColor = (UIColor(rgb: color), file.settings.bottomColor.flatMap { UIColor(rgb: $0) })
+                        if file.isPattern, let intensity = file.settings.intensity, intensity < 0 {
+                            backgroundColor = (.black, nil, [])
+                        } else if !file.settings.colors.isEmpty {
+                            var bottomColor: UIColor?
+                            if file.settings.colors.count >= 2 {
+                                bottomColor = UIColor(rgb: file.settings.colors[1])
+                            }
+                            backgroundColor = (UIColor(rgb: file.settings.colors[0]), bottomColor, file.settings.colors)
                         } else {
-                            backgroundColor = (theme.chatList.backgroundColor, nil)
+                            backgroundColor = (theme.chatList.backgroundColor, nil, [])
                         }
                         wallpaperSignal = cachedWallpaper(account: account, slug: file.slug, settings: file.settings)
                         |> mapToSignal { wallpaper in
                             if let wallpaper = wallpaper, case let .file(file) = wallpaper.wallpaper {
                                 var effectiveBackgroundColor = backgroundColor
-                                if let color = file.settings.color {
-                                    effectiveBackgroundColor = (UIColor(rgb: color), file.settings.bottomColor.flatMap { UIColor(rgb: $0) })
+                                if !file.settings.colors.isEmpty {
+                                    var bottomColor: UIColor?
+                                    if file.settings.colors.count >= 2 {
+                                        bottomColor = UIColor(rgb: file.settings.colors[1])
+                                    }
+                                    effectiveBackgroundColor = (UIColor(rgb: file.settings.colors[0]), bottomColor, file.settings.colors)
                                 }
                                 
                                 var convertedRepresentations: [ImageRepresentationWithReference] = []
-                                convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: []), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
+                                convertedRepresentations.append(ImageRepresentationWithReference(representation: TelegramMediaImageRepresentation(dimensions: PixelDimensions(width: 100, height: 100), resource: file.file.resource, progressiveSizes: [], immediateThumbnailData: nil), reference: .wallpaper(wallpaper: .slug(file.slug), resource: file.file.resource)))
                                 return wallpaperDatas(account: account, accountManager: accountManager, fileReference: .standalone(media: file.file), representations: convertedRepresentations, alwaysShowThumbnailFirst: false, thumbnail: false, onlyFullSize: true, autoFetchFullSize: true, synchronousLoad: false)
-                                |> mapToSignal { _, fullSizeData, complete -> Signal<((UIColor, UIColor?), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> in
+                                |> mapToSignal { _, fullSizeData, complete -> Signal<((UIColor, UIColor?, [UInt32]), (UIColor, UIColor), (UIColor, UIColor), UIImage?, Int32?), NoError> in
                                     guard complete, let fullSizeData = fullSizeData else {
                                         return .complete()
                                     }
@@ -1238,9 +1493,10 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
                                     let _ = accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedScaledImageRepresentation(size: CGSize(width: 720.0, height: 720.0), mode: .aspectFit), complete: true, fetch: true).start()
                                     
                                     if wallpaper.wallpaper.isPattern {
-                                        if let color = file.settings.color, let intensity = file.settings.intensity {
-                                            return accountManager.mediaBox.cachedResourceRepresentation(file.file.resource, representation: CachedPatternWallpaperRepresentation(color: color, bottomColor: file.settings.bottomColor, intensity: intensity, rotation: file.settings.rotation), complete: true, fetch: true)
-                                            |> mapToSignal { _ in
+                                        if !file.settings.colors.isEmpty, let intensity = file.settings.intensity {
+                                            if intensity < 0 {
+                                                return .single(((.black, nil, []), incomingColor, outgoingColor, nil, rotation))
+                                            } else {
                                                 return .single((effectiveBackgroundColor, incomingColor, outgoingColor, nil, rotation))
                                             }
                                         } else {
@@ -1280,7 +1536,10 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
             let drawingRect = arguments.drawingRect
             
             context.withContext { c in
-                if let secondBackgroundColor = colors.0.1 {
+                if colors.0.2.count >= 3 {
+                    let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors.0.2.map(UIColor.init(rgb:)))
+                    c.draw(image.cgImage!, in: drawingRect)
+                } else if let secondBackgroundColor = colors.0.1 {
                     let gradientColors = [colors.0.0, secondBackgroundColor].map { $0.cgColor } as CFArray
                     var locations: [CGFloat] = [0.0, 1.0]
                     let colorSpace = CGColorSpaceCreateDeviceRGB()
@@ -1339,3 +1598,100 @@ public func themeIconImage(account: Account, accountManager: AccountManager, the
         }
     }
 }
+
+public func wallpaperThumbnail(account: Account, accountManager: AccountManager, fileReference: FileMediaReference, wallpaper: TelegramWallpaper, synchronousLoad: Bool) -> Signal<(TransformImageArguments) -> DrawingContext?, NoError> {
+    switch wallpaper {
+    case let .file(_, _, _, _, _, _, _, file, settings):
+        guard let thumbnail = smallestImageRepresentation(file.previewRepresentations) else {
+            return .single({ _ in nil })
+        }
+        let signal: Signal<Data?, NoError> = Signal { subscriber in
+            let data = account.postbox.mediaBox.resourceData(thumbnail.resource).start(next: { data in
+                if data.complete {
+                    if let fileData = try? Data(contentsOf: URL(fileURLWithPath: data.path)) {
+                        subscriber.putNext(fileData)
+                    }
+                }
+            })
+            let fetch = fetchedMediaResource(mediaBox: account.postbox.mediaBox, reference: fileReference.resourceReference(thumbnail.resource)).start()
+
+            return ActionDisposable {
+                data.dispose()
+                fetch.dispose()
+            }
+        }
+        return signal
+        |> map { thumbnailData in
+            return { arguments in
+                let drawingRect = arguments.drawingRect
+
+                var thumbnailImage: CGImage?
+                if let thumbnailData = thumbnailData {
+                    if let imageSource = CGImageSourceCreateWithData(thumbnailData as CFData, nil), let image = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
+                        thumbnailImage = image
+                    }
+                }
+
+                let context = DrawingContext(size: arguments.boundingSize, clear: true)
+
+                context.withFlippedContext { c in
+                    let colors = settings.colors.map(UIColor.init(rgb:))
+
+                    if colors.count == 1 {
+                        c.setFillColor(colors[0].cgColor)
+                        c.fill(arguments.drawingRect)
+                    } else if settings.colors.count >= 3 {
+                        let image = GradientBackgroundNode.generatePreview(size: CGSize(width: 60.0, height: 60.0), colors: colors)
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                        c.draw(image.cgImage!, in: drawingRect)
+                        c.translateBy(x: drawingRect.midX, y: drawingRect.midY)
+                        c.scaleBy(x: 1.0, y: -1.0)
+                        c.translateBy(x: -drawingRect.midX, y: -drawingRect.midY)
+                    } else if settings.colors.count >= 2 {
+                        let gradientColors = settings.colors.map { UIColor(rgb: $0).cgColor } as CFArray
+                        let delta: CGFloat = 1.0 / (CGFloat(settings.colors.count) - 1.0)
+
+                        var locations: [CGFloat] = []
+                        for i in 0 ..< settings.colors.count {
+                            locations.append(delta * CGFloat(i))
+                        }
+                        let colorSpace = CGColorSpaceCreateDeviceRGB()
+                        let gradient = CGGradient(colorsSpace: colorSpace, colors: gradientColors, locations: &locations)!
+
+                        c.saveGState()
+                        c.translateBy(x: arguments.drawingSize.width / 2.0, y: arguments.drawingSize.height / 2.0)
+                        c.rotate(by: CGFloat(settings.rotation ?? 0) * CGFloat.pi / -180.0)
+                        c.translateBy(x: -arguments.drawingSize.width / 2.0, y: -arguments.drawingSize.height / 2.0)
+
+                        c.drawLinearGradient(gradient, start: CGPoint(x: 0.0, y: 0.0), end: CGPoint(x: 0.0, y: arguments.drawingSize.height), options: [.drawsBeforeStartLocation, .drawsAfterEndLocation])
+                        c.restoreGState()
+                    }
+
+                    if let thumbnailImage = thumbnailImage {
+                        let fittedSize = CGSize(width: thumbnailImage.width, height: thumbnailImage.height).aspectFilled(arguments.boundingSize)
+                        let fittedRect = CGRect(origin: CGPoint(x: (arguments.boundingSize.width - fittedSize.width) / 2.0, y: (arguments.boundingSize.height - fittedSize.height) / 2.0), size: fittedSize)
+
+                        c.clip(to: fittedRect, mask: thumbnailImage)
+
+                        c.setBlendMode(.softLight)
+
+                        if UIColor.average(of: colors).hsb.b > 0.3 {
+                            c.setFillColor(UIColor(white: 0.0, alpha: 0.6).cgColor)
+                        } else {
+                            c.setFillColor(UIColor(white: 1.0, alpha: 0.6).cgColor)
+                        }
+                        c.fill(fittedRect)
+                    }
+                }
+
+                addCorners(context, arguments: arguments)
+
+                return context
+            }
+        }
+    default:
+        return .single({ _ in nil })
+    }
+}
diff --git a/submodules/WatchBridge/Sources/WatchBridge.swift b/submodules/WatchBridge/Sources/WatchBridge.swift
index e01c5941be..08a9ccc38c 100644
--- a/submodules/WatchBridge/Sources/WatchBridge.swift
+++ b/submodules/WatchBridge/Sources/WatchBridge.swift
@@ -9,11 +9,11 @@ import PhoneNumberFormat
 
 func makePeerIdFromBridgeIdentifier(_ identifier: Int64) -> PeerId? {
     if identifier < 0 && identifier > Int32.min {
-        return PeerId(namespace: Namespaces.Peer.CloudGroup, id: Int32(clamping: -identifier))
+        return PeerId(namespace: Namespaces.Peer.CloudGroup, id: PeerId.Id._internalFromInt32Value(Int32(clamping: -identifier)))
     } else if identifier < Int64(Int32.min) * 2 && identifier > Int64(Int32.min) * 3 {
-        return PeerId(namespace: Namespaces.Peer.CloudChannel, id: Int32(clamping: Int64(Int32.min) &* 2 &- identifier))
+        return PeerId(namespace: Namespaces.Peer.CloudChannel, id: PeerId.Id._internalFromInt32Value(Int32(clamping: Int64(Int32.min) &* 2 &- identifier)))
     } else if identifier > 0 && identifier < Int32.max {
-        return PeerId(namespace: Namespaces.Peer.CloudUser, id: Int32(clamping: identifier))
+        return PeerId(namespace: Namespaces.Peer.CloudUser, id: PeerId.Id._internalFromInt32Value(Int32(clamping: identifier)))
     } else {
         return nil
     }
@@ -22,11 +22,11 @@ func makePeerIdFromBridgeIdentifier(_ identifier: Int64) -> PeerId? {
 func makeBridgeIdentifier(_ peerId: PeerId) -> Int64 {
     switch peerId.namespace {
         case Namespaces.Peer.CloudGroup:
-            return -Int64(peerId.id)
+            return -Int64(peerId.id._internalGetInt32Value())
         case Namespaces.Peer.CloudChannel:
-            return Int64(Int32.min) * 2 - Int64(peerId.id)
+            return Int64(Int32.min) * 2 - Int64(peerId.id._internalGetInt32Value())
         default:
-            return Int64(peerId.id)
+            return Int64(peerId.id._internalGetInt32Value())
     }
 }
 
diff --git a/submodules/WatchBridge/Sources/WatchCommunicationManager.swift b/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
index 18b3f617ad..629b456a41 100644
--- a/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
+++ b/submodules/WatchBridge/Sources/WatchCommunicationManager.swift
@@ -89,7 +89,7 @@ public final class WatchCommunicationManager {
             }
             if let context = appContext {
                 strongSelf.accountContext.set(.single(context.context))
-                strongSelf.server.setAuthorized(true, userId: context.context.account.peerId.id)
+                strongSelf.server.setAuthorized(true, userId: context.context.account.peerId.id._internalGetInt32Value())
                 strongSelf.server.setMicAccessAllowed(false)
                 strongSelf.server.pushContext()
                 strongSelf.server.setMicAccessAllowed(true)
diff --git a/submodules/WatchBridge/Sources/WatchRequestHandlers.swift b/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
index 33c95fe481..81249019eb 100644
--- a/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
+++ b/submodules/WatchBridge/Sources/WatchRequestHandlers.swift
@@ -123,7 +123,7 @@ final class WatchChatMessagesHandler: WatchRequestHandler {
                 |> mapToSignal({ context -> Signal<Void, NoError> in
                     if let context = context {
                         let messageId = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: args.messageId)
-                        return applyMaxReadIndexInteractively(postbox: context.account.postbox, stateManager: context.account.stateManager, index: MessageIndex(id: messageId, timestamp: 0))
+                        return context.engine.messages.applyMaxReadIndexInteractively(index: MessageIndex(id: messageId, timestamp: 0))
                     } else {
                         return .complete()
                     }
@@ -144,7 +144,7 @@ final class WatchChatMessagesHandler: WatchRequestHandler {
                 |> take(1)
                 |> mapToSignal({ context -> Signal<(Message, PresentationData)?, NoError> in
                     if let context = context {
-                        let messageSignal = downloadMessage(postbox: context.account.postbox, network: context.account.network, messageId: MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: args.messageId))
+                        let messageSignal = context.engine.messages.downloadMessage(messageId: MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: args.messageId))
                         |> map { message -> (Message, PresentationData)? in
                             if let message = message {
                                 return (message, context.sharedContext.currentPresentationData.with { $0 })
@@ -200,17 +200,17 @@ final class WatchSendMessageHandler: WatchRequestHandler {
                         if args.replyToMid != 0, let peerId = peerId {
                             replyMessageId = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: args.replyToMid)
                         }
-                        messageSignal = .single((.message(text: args.text, attributes: [], mediaReference: nil, replyToMessageId: replyMessageId, localGroupingKey: nil), peerId))
+                        messageSignal = .single((.message(text: args.text, attributes: [], mediaReference: nil, replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil), peerId))
                     } else if let args = subscription as? TGBridgeSendLocationMessageSubscription, let location = args.location {
                         let peerId = makePeerIdFromBridgeIdentifier(args.peerId)
                         let map = TelegramMediaMap(latitude: location.latitude, longitude: location.longitude, heading: nil, accuracyRadius: nil, geoPlace: nil, venue: makeVenue(from: location.venue), liveBroadcastingTimeout: nil, liveProximityNotificationRadius: nil)
-                        messageSignal = .single((.message(text: "", attributes: [], mediaReference: .standalone(media: map), replyToMessageId: nil, localGroupingKey: nil), peerId))
+                        messageSignal = .single((.message(text: "", attributes: [], mediaReference: .standalone(media: map), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil), peerId))
                     } else if let args = subscription as? TGBridgeSendStickerMessageSubscription {
                         let peerId = makePeerIdFromBridgeIdentifier(args.peerId)
                         messageSignal = mediaForSticker(documentId: args.document.documentId, account: context.account)
                         |> map({ media -> (EnqueueMessage?, PeerId?) in
                             if let media = media {
-                                return (.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil), peerId)
+                                return (.message(text: "", attributes: [], mediaReference: .standalone(media: media), replyToMessageId: nil, localGroupingKey: nil, correlationId: nil), peerId)
                             } else {
                                 return (nil, nil)
                             }
@@ -218,7 +218,7 @@ final class WatchSendMessageHandler: WatchRequestHandler {
                     } else if let args = subscription as? TGBridgeSendForwardedMessageSubscription {
                         let peerId = makePeerIdFromBridgeIdentifier(args.targetPeerId)
                         if let forwardPeerId = makePeerIdFromBridgeIdentifier(args.peerId) {
-                            messageSignal = .single((.forward(source: MessageId(peerId: forwardPeerId, namespace: Namespaces.Message.Cloud, id: args.messageId), grouping: .none, attributes: []), peerId))
+                            messageSignal = .single((.forward(source: MessageId(peerId: forwardPeerId, namespace: Namespaces.Message.Cloud, id: args.messageId), grouping: .none, attributes: [], correlationId: nil), peerId))
                         }
                     }
                     
@@ -404,7 +404,7 @@ final class WatchMediaHandler: WatchRequestHandler {
                                 if let imageData = imageData {
                                     return imageData
                                     |> map { data -> UIImage? in
-                                        if let data = data, let image = generateImage(targetSize, contextGenerator: { size, context -> Void in
+                                        if let (data, _) = data, let image = generateImage(targetSize, contextGenerator: { size, context -> Void in
                                             if let imageSource = CGImageSourceCreateWithData(data as CFData, nil), let dataImage = CGImageSourceCreateImageAtIndex(imageSource, 0, nil) {
                                                 context.setBlendMode(.copy)
                                                 context.draw(dataImage, in: CGRect(origin: CGPoint(), size: targetSize))
@@ -728,7 +728,7 @@ final class WatchAudioHandler: WatchRequestHandler {
                         replyMessageId = MessageId(peerId: peerId, namespace: Namespaces.Message.Cloud, id: replyToMid)
                     }
                     
-                    let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: data.count, attributes: [.Audio(isVoice: true, duration: Int(duration), title: nil, performer: nil, waveform: nil)])), replyToMessageId: replyMessageId, localGroupingKey: nil)]).start()
+                    let _ = enqueueMessages(account: context.account, peerId: peerId, messages: [.message(text: "", attributes: [], mediaReference: .standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: randomId), partialReference: nil, resource: resource, previewRepresentations: [], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "audio/ogg", size: data.count, attributes: [.Audio(isVoice: true, duration: Int(duration), title: nil, performer: nil, waveform: nil)])), replyToMessageId: replyMessageId, localGroupingKey: nil, correlationId: nil)]).start()
                 }
             })
         } else {
@@ -749,13 +749,13 @@ final class WatchLocationHandler: WatchRequestHandler {
                 |> take(1)
                 |> mapToSignal({ context -> Signal<[ChatContextResultMessage], NoError> in
                     if let context = context {
-                        return resolvePeerByName(account: context.account, name: "foursquare")
+                        return context.engine.peers.resolvePeerByName(name: "foursquare")
                         |> take(1)
                         |> mapToSignal { peerId -> Signal<ChatContextResultCollection?, NoError> in
                             guard let peerId = peerId else {
                                 return .single(nil)
                             }
-                            return requestChatContextResults(account: context.account, botId: peerId, peerId: context.account.peerId, query: "", location: .single((args.coordinate.latitude, args.coordinate.longitude)), offset: "")
+                            return context.engine.messages.requestChatContextResults(botId: peerId, peerId: context.account.peerId, query: "", location: .single((args.coordinate.latitude, args.coordinate.longitude)), offset: "")
                             |> map { results -> ChatContextResultCollection? in
                                 return results?.results
                             }
@@ -841,9 +841,9 @@ final class WatchPeerSettingsHandler: WatchRequestHandler {
                         var signal: Signal<Void, NoError>?
                         
                         if let args = subscription as? TGBridgePeerUpdateNotificationSettingsSubscription, let peerId = makePeerIdFromBridgeIdentifier(args.peerId) {
-                            signal = togglePeerMuted(account: context.account, peerId: peerId)
+                            signal = context.engine.peers.togglePeerMuted(peerId: peerId)
                         } else if let args = subscription as? TGBridgePeerUpdateBlockStatusSubscription, let peerId = makePeerIdFromBridgeIdentifier(args.peerId) {
-                            signal = requestUpdatePeerIsBlocked(account: context.account, peerId: peerId, isBlocked: args.blocked)
+                            signal = context.engine.privacy.requestUpdatePeerIsBlocked(peerId: peerId, isBlocked: args.blocked)
                         }
                         
                         if let signal = signal {
diff --git a/submodules/WebPBinding/Sources/UIImage+WebP.m b/submodules/WebPBinding/Sources/UIImage+WebP.m
index 3f541a37c7..c4a07eed72 100644
--- a/submodules/WebPBinding/Sources/UIImage+WebP.m
+++ b/submodules/WebPBinding/Sources/UIImage+WebP.m
@@ -19,7 +19,7 @@
     
     const struct { int width, height; } targetContextSize = { width, height};
     
-    size_t targetBytesPerRow = ((4 * (int)targetContextSize.width) + 15) & (~15);
+    size_t targetBytesPerRow = ((4 * (int)targetContextSize.width) + 31) & (~31);
     
     void *targetMemory = malloc((int)(targetBytesPerRow * targetContextSize.height));
     
diff --git a/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift b/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift
index f30273f4a3..d45a671e63 100644
--- a/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift
+++ b/submodules/WebSearchUI/Sources/LegacyWebSearchGallery.swift
@@ -261,9 +261,9 @@ func legacyWebSearchItem(account: Account, result: ChatContextResult) -> LegacyW
         
         var representations: [TelegramMediaImageRepresentation] = []
         if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions {
-            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: []))
+            representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
         }
-        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: []))
+        representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil))
         let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
         thumbnailSignal = chatMessagePhotoDatas(postbox: account.postbox, photoReference: .standalone(media: tmpImage), autoFetchFullSize: false)
         |> mapToSignal { value -> Signal<UIImage, NoError> in
@@ -466,7 +466,7 @@ public func legacyEnqueueWebSearchMessages(_ selectionState: TGMediaSelectionCon
                                 }
                             }
                             
-                            return legacyAssetPickerItemGenerator()(dict, nil, nil, nil) as Any
+                            return legacyAssetPickerItemGenerator()(dict, nil, nil, nil, nil) as Any
                         } else {
                             return SSignal.complete()
                         }
diff --git a/submodules/WebSearchUI/Sources/WebSearchBadgeNode.swift b/submodules/WebSearchUI/Sources/WebSearchBadgeNode.swift
index 36dd99037d..c52090e332 100644
--- a/submodules/WebSearchUI/Sources/WebSearchBadgeNode.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchBadgeNode.swift
@@ -12,7 +12,7 @@ final class WebSearchBadgeNode: ASDisplayNode {
     private let textNode: ASTextNode
     private let backgroundNode: ASImageNode
     
-    private let font: UIFont = Font.with(size: 17.0, design: .round, traits: [.bold])
+    private let font: UIFont = Font.with(size: 17.0, design: .round, weight: .bold)
     
     var text: String = "" {
         didSet {
diff --git a/submodules/WebSearchUI/Sources/WebSearchController.swift b/submodules/WebSearchUI/Sources/WebSearchController.swift
index 2e872a9aa8..3fc012211b 100644
--- a/submodules/WebSearchUI/Sources/WebSearchController.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchController.swift
@@ -10,8 +10,8 @@ import LegacyComponents
 import TelegramUIPreferences
 import AccountContext
 
-public func requestContextResults(account: Account, botId: PeerId, query: String, peerId: PeerId, offset: String = "", existingResults: ChatContextResultCollection? = nil, incompleteResults: Bool = false, staleCachedResults: Bool = false, limit: Int = 60) -> Signal<RequestChatContextResultsResult?, NoError> {
-    return requestChatContextResults(account: account, botId: botId, peerId: peerId, query: query, offset: offset, incompleteResults: incompleteResults, staleCachedResults: staleCachedResults)
+public func requestContextResults(context: AccountContext, botId: PeerId, query: String, peerId: PeerId, offset: String = "", existingResults: ChatContextResultCollection? = nil, incompleteResults: Bool = false, staleCachedResults: Bool = false, limit: Int = 60) -> Signal<RequestChatContextResultsResult?, NoError> {
+    return context.engine.messages.requestChatContextResults(botId: botId, peerId: peerId, query: query, offset: offset, incompleteResults: incompleteResults, staleCachedResults: staleCachedResults)
     |> `catch` { error -> Signal<RequestChatContextResultsResult?, NoError> in
         return .single(nil)
     }
@@ -40,7 +40,7 @@ public func requestContextResults(account: Account, botId: PeerId, query: String
             updated = true
         }
         if let collection = collection, collection.results.count < limit, let nextOffset = collection.nextOffset, updated {
-            let nextResults = requestContextResults(account: account, botId: botId, query: query, peerId: peerId, offset: nextOffset, existingResults: collection, limit: limit)
+            let nextResults = requestContextResults(context: context, botId: botId, query: query, peerId: peerId, offset: nextOffset, existingResults: collection, limit: limit)
             if collection.results.count > 10 {
                 return .single(RequestChatContextResultsResult(results: collection, isStale: resultsStruct?.isStale ?? false))
                 |> then(nextResults)
@@ -172,7 +172,7 @@ public final class WebSearchController: ViewController {
             self.interfaceState = self.interfaceState.withUpdatedQuery(query)
         }
         
-        super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: presentationData.theme).withUpdatedSeparatorColor(presentationData.theme.rootController.navigationBar.backgroundColor), strings: NavigationBarStrings(presentationStrings: presentationData.strings)))
+        super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: NavigationBarTheme(rootControllerTheme: presentationData.theme).withUpdatedSeparatorColor(presentationData.theme.rootController.navigationBar.opaqueBackgroundColor), strings: NavigationBarStrings(presentationStrings: presentationData.strings)))
         self.statusBar.statusBarStyle = presentationData.theme.rootController.statusBarStyle.style
         
         self.scrollToTop = { [weak self] in
@@ -445,7 +445,8 @@ public final class WebSearchController: ViewController {
         }
         
         let account = self.context.account
-        let contextBot = resolvePeerByName(account: account, name: name)
+        let context = self.context
+        let contextBot = self.context.engine.peers.resolvePeerByName(name: name)
         |> mapToSignal { peerId -> Signal<Peer?, NoError> in
             if let peerId = peerId {
                 return account.postbox.loadedPeerWithId(peerId)
@@ -459,7 +460,7 @@ public final class WebSearchController: ViewController {
         }
         |> mapToSignal { peer -> Signal<(ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult?, NoError> in
             if let user = peer as? TelegramUser, let botInfo = user.botInfo, let _ = botInfo.inlinePlaceholder {
-                let results = requestContextResults(account: account, botId: user.id, query: query, peerId: peerId, limit: 64)
+                let results = requestContextResults(context: context, botId: user.id, query: query, peerId: peerId, limit: 64)
                 |> map { results -> (ChatPresentationInputQueryResult?) -> ChatPresentationInputQueryResult? in
                     return { _ in
                         return .contextRequestResult(user, results?.results)
@@ -509,6 +510,6 @@ public final class WebSearchController: ViewController {
         
         self.validLayout = layout
         
-        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift
index 8a13114399..450ee647df 100644
--- a/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchControllerNode.swift
@@ -284,7 +284,7 @@ class WebSearchControllerNode: ASDisplayNode {
             }
         })
         
-        self.recentQueriesNode.beganInteractiveDragging = { [weak self] in
+        self.recentQueriesNode.beganInteractiveDragging = { [weak self] _ in
             self?.dismissInput?()
         }
         
@@ -350,10 +350,10 @@ class WebSearchControllerNode: ASDisplayNode {
         }
         
         if themeUpdated {
-            self.segmentedBackgroundNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
+            self.segmentedBackgroundNode.backgroundColor = self.theme.rootController.navigationBar.opaqueBackgroundColor
             self.segmentedSeparatorNode.backgroundColor = self.theme.rootController.navigationBar.separatorColor
             self.segmentedControlNode.updateTheme(SegmentedControlTheme(theme: self.theme))
-            self.toolbarBackgroundNode.backgroundColor = self.theme.rootController.navigationBar.backgroundColor
+            self.toolbarBackgroundNode.backgroundColor = self.theme.rootController.navigationBar.opaqueBackgroundColor
             self.toolbarSeparatorNode.backgroundColor = self.theme.rootController.navigationBar.separatorColor
         }
         
@@ -577,7 +577,7 @@ class WebSearchControllerNode: ASDisplayNode {
         let geoPoint = currentProcessedResults.geoPoint.flatMap { geoPoint -> (Double, Double) in
             return (geoPoint.latitude, geoPoint.longitude)
         }
-        self.loadMoreDisposable.set((requestChatContextResults(account: self.context.account, botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
+        self.loadMoreDisposable.set((self.context.engine.messages.requestChatContextResults(botId: currentProcessedResults.botId, peerId: currentProcessedResults.peerId, query: currentProcessedResults.query, location: .single(geoPoint), offset: nextOffset)
             |> deliverOnMainQueue).start(next: { [weak self] nextResults in
                 guard let strongSelf = self, let nextResults = nextResults else {
                     return
diff --git a/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift b/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift
index 41aaa251b8..5f27d7b151 100644
--- a/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchGalleryController.swift
@@ -39,7 +39,7 @@ struct WebSearchGalleryEntry: Equatable {
         switch self.result {
             case let .externalReference(externalReference):
                 if let content = externalReference.content, externalReference.type == "gif", let thumbnailResource = externalReference.thumbnail?.resource, let dimensions = content.dimensions {
-                    let fileReference = FileMediaReference.standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: content.resource, previewRepresentations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: thumbnailResource, progressiveSizes: [])], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])]))
+                    let fileReference = FileMediaReference.standalone(media: TelegramMediaFile(fileId: MediaId(namespace: Namespaces.Media.LocalFile, id: 0), partialReference: nil, resource: content.resource, previewRepresentations: [TelegramMediaImageRepresentation(dimensions: dimensions, resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil)], videoThumbnails: [], immediateThumbnailData: nil, mimeType: "video/mp4", size: nil, attributes: [.Animated, .Video(duration: 0, size: dimensions, flags: [])]))
                     return WebSearchVideoGalleryItem(context: context, presentationData: presentationData, index: self.index, result: self.result, content: NativeVideoContent(id: .contextResult(self.result.queryId, self.result.id), fileReference: fileReference, loopVideo: true, enableSound: false, fetchAutomatically: true), controllerInteraction: controllerInteraction)
                 }
             case let .internalReference(internalReference):
@@ -62,7 +62,7 @@ final class WebSearchGalleryControllerPresentationArguments {
 }
 
 class WebSearchGalleryController: ViewController {
-    private static let navigationTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: UIColor(rgb: 0x525252), primaryTextColor: .white, backgroundColor: .clear, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
+    private static let navigationTheme = NavigationBarTheme(buttonColor: .white, disabledButtonColor: UIColor(rgb: 0x525252), primaryTextColor: .white, backgroundColor: .clear, enableBackgroundBlur: false, separatorColor: .clear, badgeBackgroundColor: .clear, badgeStrokeColor: .clear, badgeTextColor: .clear)
     
     private var galleryNode: GalleryControllerNode {
         return self.displayNode as! GalleryControllerNode
@@ -342,6 +342,6 @@ class WebSearchGalleryController: ViewController {
         super.containerLayoutUpdated(layout, transition: transition)
         
         self.galleryNode.frame = CGRect(origin: CGPoint(), size: layout.size)
-        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationHeight, transition: transition)
+        self.galleryNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
     }
 }
diff --git a/submodules/WebSearchUI/Sources/WebSearchItem.swift b/submodules/WebSearchUI/Sources/WebSearchItem.swift
index 519f74677d..cea2a3ec71 100644
--- a/submodules/WebSearchUI/Sources/WebSearchItem.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchItem.swift
@@ -132,10 +132,10 @@ final class WebSearchItemNode: GridItemNode {
             
             var representations: [TelegramMediaImageRepresentation] = []
             if let thumbnailResource = thumbnailResource, let thumbnailDimensions = thumbnailDimensions {
-                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: []))
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(thumbnailDimensions), resource: thumbnailResource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             if let imageResource = imageResource, let imageDimensions = imageDimensions {
-                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: []))
+                representations.append(TelegramMediaImageRepresentation(dimensions: PixelDimensions(imageDimensions), resource: imageResource, progressiveSizes: [], immediateThumbnailData: nil))
             }
             if !representations.isEmpty {
                 let tmpImage = TelegramMediaImage(imageId: MediaId(namespace: 0, id: 0), representations: representations, immediateThumbnailData: immediateThumbnailData, reference: nil, partialReference: nil, flags: [])
diff --git a/submodules/WebSearchUI/Sources/WebSearchRecentQueryItem.swift b/submodules/WebSearchUI/Sources/WebSearchRecentQueryItem.swift
index 2ee0f99011..d7cc659b6b 100644
--- a/submodules/WebSearchUI/Sources/WebSearchRecentQueryItem.swift
+++ b/submodules/WebSearchUI/Sources/WebSearchRecentQueryItem.swift
@@ -200,9 +200,9 @@ class WebSearchRecentQueryItemNode: ItemListRevealOptionsItemNode {
         self.layer.animateAlpha(from: 1.0, to: 0.0, duration: duration * 0.5, removeOnCompletion: false)
     }
     
-    override public func header() -> ListViewItemHeader? {
+    override public func headers() -> [ListViewItemHeader]? {
         if let item = self.item {
-            return item.header
+            return item.header.flatMap { [$0] }
         } else {
             return nil
         }
diff --git a/submodules/ffmpeg/BUILD b/submodules/ffmpeg/BUILD
index 34a373f3c7..441192876b 100644
--- a/submodules/ffmpeg/BUILD
+++ b/submodules/ffmpeg/BUILD
@@ -192,12 +192,12 @@ genrule(
 
         PATH="$$PATH:$$YASM_DIR" "$$SOURCE_PATH/build-ffmpeg-bazel.sh" "$$VARIANT" "$$BUILD_ARCH" "$$BUILD_DIR" "$$SOURCE_PATH"
     """ + "\n" + "\n".join([
-        "cp \"$$BUILD_DIR/FFmpeg-iOS/include/{header_path}\" \"$(location Public/ffmpeg/{header_path})\"".format(header_path = header_path) for header_path in ffmpeg_header_paths
+        "cp \"$$BUILD_DIR/FFmpeg-iOS/include/{header_path}\" \"$(location Public/third_party/ffmpeg/{header_path})\"".format(header_path = header_path) for header_path in ffmpeg_header_paths
     ]) + "\n" + "\n".join([
         "cp \"$$BUILD_DIR/FFmpeg-iOS/lib/{lib}\" \"$(location {lib})\"".format(lib = lib) for lib in ffmpeg_libs
     ]),
     outs = [
-        "Public/ffmpeg/{}".format(header_path) for header_path in ffmpeg_header_paths
+        "Public/third_party/ffmpeg/{}".format(header_path) for header_path in ffmpeg_header_paths
     ] + ffmpeg_libs,
     tools = [
         "//third-party/yasm:yasm.tar",
@@ -219,9 +219,10 @@ objc_library(
     name = "ffmpeg",
     module_name = "ffmpeg",
     enable_modules = True,
-    hdrs = ["Public/ffmpeg/" + x for x in ffmpeg_header_paths],
+    hdrs = ["Public/third_party/ffmpeg/" + x for x in ffmpeg_header_paths],
     includes = [
-        "Public/ffmpeg",
+        "Public",
+        "Public/third_party/ffmpeg",
     ],
     sdk_dylibs = [
         "libbz2",
diff --git a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh
index 7391972e92..8b4aff7cf7 100755
--- a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh
+++ b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg-bazel.sh
@@ -57,6 +57,8 @@ CONFIGURE_FLAGS="--enable-cross-compile --disable-programs \
 
 #--enable-hwaccel=h264_videotoolbox,hevc_videotoolbox \
 
+EXTRA_CFLAGS="-DCONFIG_SAFE_BITSTREAM_READER=1"
+
 if [ "$1" = "debug" ];
 then
 	CONFIGURE_FLAGS="$CONFIGURE_FLAGS --disable-optimizations --disable-stripping"
@@ -121,7 +123,7 @@ then
 
 		LIBOPUS_PATH="$SOURCE_DIR/libopus"
 
-		CFLAGS="-arch $ARCH"
+		CFLAGS="$EXTRA_CFLAGS -arch $ARCH"
 		if [ "$RAW_ARCH" = "i386" -o "$RAW_ARCH" = "x86_64" ]
 		then
 		    PLATFORM="iPhoneSimulator"
diff --git a/submodules/rlottie/rlottie b/submodules/rlottie/rlottie
index c567dad74f..7fdc010d9e 160000
--- a/submodules/rlottie/rlottie
+++ b/submodules/rlottie/rlottie
@@ -1 +1 @@
-Subproject commit c567dad74ffcea9df820809b2cdef90f544d68ca
+Subproject commit 7fdc010d9e71a0c39d3f63d421d1bef762b6a034
diff --git a/third-party/AppCenter/AppCenter.BUILD b/third-party/AppCenter/AppCenter.BUILD
new file mode 100644
index 0000000000..ce677b8e72
--- /dev/null
+++ b/third-party/AppCenter/AppCenter.BUILD
@@ -0,0 +1,15 @@
+load("@build_bazel_rules_apple//apple:apple.bzl",
+    "apple_static_framework_import",
+)
+
+apple_static_framework_import(
+    name = "AppCenter",
+    framework_imports = glob(["AppCenter-SDK-Apple/iOS/AppCenter.framework/**"]),
+    visibility = ["//visibility:public"],
+)
+
+apple_static_framework_import(
+    name = "AppCenterCrashes",
+    framework_imports = glob(["AppCenter-SDK-Apple/iOS/AppCenterCrashes.framework/**"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/third-party/AppCenter/BUILD b/third-party/AppCenter/BUILD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/third-party/libvpx/0001-Support-arm64-simulator.patch b/third-party/libvpx/0001-Support-arm64-simulator.patch
index d085a693f2..1a37c4aae6 100644
--- a/third-party/libvpx/0001-Support-arm64-simulator.patch
+++ b/third-party/libvpx/0001-Support-arm64-simulator.patch
@@ -1,113 +1,59 @@
-From 012fe706a281cc5e9586dc0ad7b0c59baf84feb1 Mon Sep 17 00:00:00 2001
+From 75cd2d63c8f39466706fcf635ddffa4686968a33 Mon Sep 17 00:00:00 2001
 From: Ali <>
-Date: Wed, 30 Dec 2020 00:13:06 +0400
-Subject: [PATCH] Support arm64 simulator
+Date: Mon, 17 May 2021 02:17:45 +0400
+Subject: [PATCH] Support arm64 iOS simulator
 
 ---
- build/make/configure.sh | 73 ++++++++++++++++++++++++++++++++++++++++-
- configure               |  3 +-
- 2 files changed, 74 insertions(+), 2 deletions(-)
+ build/make/configure.sh | 18 ++++++++++++++----
+ configure               |  1 +
+ 2 files changed, 15 insertions(+), 4 deletions(-)
 
 diff --git a/build/make/configure.sh b/build/make/configure.sh
-index c4e938fc7..ccd7066a5 100644
+index 81d30a16c..eb15e4b07 100644
 --- a/build/make/configure.sh
 +++ b/build/make/configure.sh
-@@ -852,6 +852,14 @@ process_common_toolchain() {
-   # Handle darwin variants. Newer SDKs allow targeting older
-   # platforms, so use the newest one available.
-   case ${toolchain} in
-+    arm64-iphonesimulator*)
-+      add_cflags "-miphonesimulator-version-min=${IOS_VERSION_MIN}"
-+      iphonesimulator_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
-+      if [ -d "${iphonesimulator_sdk_dir}" ]; then
-+        add_cflags  "-isysroot ${iphonesimulator_sdk_dir}"
-+        add_ldflags "-isysroot ${iphonesimulator_sdk_dir}"
-+      fi
-+      ;;
-     arm*-darwin-*)
-       add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
-       iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
-@@ -945,7 +953,7 @@ process_common_toolchain() {
- 
-   # Process ARM architecture variants
-   case ${toolchain} in
--    arm*)
-+    arm*|arm64-iphonesimulator-gcc)
-       # on arm, isa versions are supersets
-       case ${tgt_isa} in
-         arm64|armv8)
-@@ -1155,6 +1163,69 @@ EOF
-           asm_conversion_cmd="${source_path_mk}/build/make/ads2gas_apple.pl"
+@@ -1095,9 +1095,14 @@ EOF
+           soft_enable unit_tests
            ;;
  
-+        iphonesimulator*)
-+          if ! enabled external_build; then
-+            XCRUN_FIND="xcrun --sdk iphonesimulator --find"
-+            CXX="$(${XCRUN_FIND} clang++)"
-+            CC="$(${XCRUN_FIND} clang)"
-+            AR="$(${XCRUN_FIND} ar)"
-+            AS="$(${XCRUN_FIND} as)"
-+            STRIP="$(${XCRUN_FIND} strip)"
-+            NM="$(${XCRUN_FIND} nm)"
-+            RANLIB="$(${XCRUN_FIND} ranlib)"
-+            AS_SFX=.S
-+            LD="${CXX:-$(${XCRUN_FIND} ld)}"
-+
-+            # ASFLAGS is written here instead of using check_add_asflags
-+            # because we need to overwrite all of ASFLAGS and purge the
-+            # options that were put in above
-+            ASFLAGS="-arch ${tgt_isa} -g"
-+
-+            add_cflags -arch ${tgt_isa}
-+            add_ldflags -arch ${tgt_isa}
-+
-+            add_cflags --target=arm64-apple-ios7.0-simulator
-+            add_ldflags --target=arm64-apple-ios7.0-simulator
-+
-+            alt_libc="$(show_darwin_sdk_path iphonesimulator)"
-+            if [ -d "${alt_libc}" ]; then
-+              add_cflags -isysroot ${alt_libc}
+-        darwin)
++        darwin|iphonesimulator)
+           if ! enabled external_build; then
+-            XCRUN_FIND="xcrun --sdk iphoneos --find"
++            sdk_platform_name="iphoneos"
++            if [ "${tgt_os}" == "iphonesimulator" ]; then
++              sdk_platform_name="iphonesimulator"
 +            fi
 +
-+            if [ "${LD}" = "${CXX}" ]; then
-+              add_ldflags -miphonesimulator-version-min="${IOS_VERSION_MIN}"
-+            else
-+              add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
++            XCRUN_FIND="xcrun --sdk $sdk_platform_name --find"
+             CXX="$(${XCRUN_FIND} clang++)"
+             CC="$(${XCRUN_FIND} clang)"
+             AR="$(${XCRUN_FIND} ar)"
+@@ -1116,7 +1121,12 @@ EOF
+             add_cflags -arch ${tgt_isa}
+             add_ldflags -arch ${tgt_isa}
+ 
+-            alt_libc="$(show_darwin_sdk_path iphoneos)"
++            if [ "${tgt_os}" == "iphonesimulator" ]; then
++              add_cflags --target=arm64-apple-ios7.0-simulator
++              add_ldflags --target=arm64-apple-ios7.0-simulator
 +            fi
 +
-+            for d in lib usr/lib usr/lib/system; do
-+              try_dir="${alt_libc}/${d}"
-+              [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
-+            done
-+
-+            case ${tgt_isa} in
-+              armv7|armv7s|armv8|arm64)
-+                if enabled neon && ! check_xcode_minimum_version; then
-+                  soft_disable neon
-+                  log_echo "  neon disabled: upgrade Xcode (need v6.3+)."
-+                  if enabled neon_asm; then
-+                    soft_disable neon_asm
-+                    log_echo "  neon_asm disabled: upgrade Xcode (need v6.3+)."
-+                  fi
-+                fi
-+                ;;
-+            esac
-+
-+            if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
-+              check_add_cflags -fembed-bitcode
-+              check_add_asflags -fembed-bitcode
-+              check_add_ldflags -fembed-bitcode
-+            fi
-+          fi
-+
-+          asm_conversion_cmd="${source_path}/build/make/ads2gas_apple.pl"
-+          ;;
-+
-         linux*)
-           enable_feature linux
-           if enabled rvct; then
++            alt_libc="$(show_darwin_sdk_path $sdk_platform_name)"
+             if [ -d "${alt_libc}" ]; then
+               add_cflags -isysroot ${alt_libc}
+             fi
+@@ -1145,7 +1155,7 @@ EOF
+                 ;;
+             esac
+ 
+-            if [ "$(show_darwin_sdk_major_version iphoneos)" -gt 8 ]; then
++            if [ "$(show_darwin_sdk_major_version $sdk_platform_name)" -gt 8 ]; then
+               check_add_cflags -fembed-bitcode
+               check_add_asflags -fembed-bitcode
+               check_add_ldflags -fembed-bitcode
 diff --git a/configure b/configure
-index f7e11aaf2..af625ee35 100755
+index da631a45e..1c6042038 100755
 --- a/configure
 +++ b/configure
 @@ -100,6 +100,7 @@ EOF
@@ -118,15 +64,6 @@ index f7e11aaf2..af625ee35 100755
  all_platforms="${all_platforms} arm64-linux-gcc"
  all_platforms="${all_platforms} arm64-win64-gcc"
  all_platforms="${all_platforms} arm64-win64-vs15"
-@@ -735,7 +736,7 @@ process_toolchain() {
-             soft_enable libyuv
-             # GTestLog must be modified to use Android logging utilities.
-         ;;
--        *-darwin-*)
-+        *-darwin-*|arm64-iphonesimulator-*)
-             check_add_cxxflags -std=c++11
-             # iOS/ARM builds do not work with gtest. This does not match
-             # x86 targets.
 -- 
-2.24.3 (Apple Git-128)
+2.30.1 (Apple Git-130)
 
diff --git a/third-party/libvpx/BUILD b/third-party/libvpx/BUILD
index 9ca8530ae4..ed92e4eb38 100644
--- a/third-party/libvpx/BUILD
+++ b/third-party/libvpx/BUILD
@@ -75,7 +75,7 @@ genrule(
 
     mkdir -p "$$BUILD_DIR/Public/libvpx"
 
-    sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR"
+    PATH="$$PATH:$$ABS_YASM_DIR" sh $$BUILD_DIR/build-libvpx-bazel.sh $$BUILD_ARCH "$$BUILD_DIR/libvpx" "$$BUILD_DIR"
     """ +
     "\n".join([
         "cp -f \"$$BUILD_DIR/VPX.framework/Headers/vpx/{}\" \"$(location Public/vpx/{})\"".format(header, header) for header in headers
diff --git a/third-party/libvpx/build-libvpx-bazel.sh b/third-party/libvpx/build-libvpx-bazel.sh
index a2ac3011d2..4540198e99 100755
--- a/third-party/libvpx/build-libvpx-bazel.sh
+++ b/third-party/libvpx/build-libvpx-bazel.sh
@@ -16,8 +16,14 @@ devnull='> /dev/null 2>&1'
 BUILD_ROOT="_iosbuild"
 CONFIGURE_ARGS="--disable-docs
                 --disable-examples
-                --disable-libyuv
-                --disable-unit-tests"
+                --disable-postproc
+                --disable-webm-io
+                --disable-vp9-highbitdepth
+                --disable-vp9-postproc
+                --disable-vp9-temporal-denoising
+                --disable-unit-tests
+                --enable-realtime-only
+                --enable-multi-res-encoding"
 DIST_DIR="_dist"
 FRAMEWORK_DIR="VPX.framework"
 FRAMEWORK_LIB="VPX.framework/VPX"
diff --git a/third-party/libvpx/libvpx b/third-party/libvpx/libvpx
index 3a38edea2c..002f14078f 160000
--- a/third-party/libvpx/libvpx
+++ b/third-party/libvpx/libvpx
@@ -1 +1 @@
-Subproject commit 3a38edea2cd114d53914cab017cab2e43a600031
+Subproject commit 002f14078ff6aa1f0c1548aa1902b3af9d42087e
diff --git a/third-party/openh264/BUILD b/third-party/openh264/BUILD
new file mode 100644
index 0000000000..0fde708c6f
--- /dev/null
+++ b/third-party/openh264/BUILD
@@ -0,0 +1,270 @@
+
+arm64_specific_sources = [
+    "third_party/openh264/src/codec/encoder/core/arm64/intra_pred_aarch64_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm64/memory_aarch64_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm64/pixel_aarch64_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm64/reconstruct_aarch64_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S",
+    "third_party/openh264/src/codec/common/arm64/copy_mb_aarch64_neon.S",
+    "third_party/openh264/src/codec/common/arm64/deblocking_aarch64_neon.S",
+    "third_party/openh264/src/codec/common/arm64/expand_picture_aarch64_neon.S",
+    "third_party/openh264/src/codec/common/arm64/intra_pred_common_aarch64_neon.S",
+    "third_party/openh264/src/codec/common/arm64/mc_aarch64_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm64/down_sample_aarch64_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm64/pixel_sad_aarch64_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm64/vaa_calc_aarch64_neon.S",
+]
+
+arm64_specific_textual_hdrs = [
+    "third_party/openh264/src/codec/common/arm64/arm_arch64_common_macro.S",
+]
+
+arm_specific_sources = [
+    "third_party/openh264/src/codec/encoder/core/arm/intra_pred_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm/memory_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm/pixel_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm/reconstruct_neon.S",
+    "third_party/openh264/src/codec/encoder/core/arm/svc_motion_estimation.S",
+    "third_party/openh264/src/codec/common/arm/copy_mb_neon.S",
+    "third_party/openh264/src/codec/common/arm/deblocking_neon.S",
+    "third_party/openh264/src/codec/common/arm/expand_picture_neon.S",
+    "third_party/openh264/src/codec/common/arm/intra_pred_common_neon.S",
+    "third_party/openh264/src/codec/common/arm/mc_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm/adaptive_quantization.S",
+    "third_party/openh264/src/codec/processing/src/arm/down_sample_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm/pixel_sad_neon.S",
+    "third_party/openh264/src/codec/processing/src/arm/vaa_calc_neon.S",
+]
+
+arm_specific_textual_hdrs = [
+    "third_party/openh264/src/codec/common/arm/arm_arch_common_macro.S",
+]
+
+arm64_specific_copts = [
+    "-DHAVE_NEON_AARCH64=1",
+    "-Ithird-party/openh264/third_party/openh264/src/codec/common/arm64",
+]
+
+arm_specific_copts = [
+    "-DHAVE_NEON=1",
+    "-Ithird-party/openh264/third_party/openh264/src/codec/common/arm",
+]
+
+arch_specific_sources = select({
+    "@build_bazel_rules_apple//apple:ios_armv7": arm_specific_sources,
+    "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_sources,
+    "//build-system:ios_sim_arm64": arm64_specific_sources,
+    "@build_bazel_rules_apple//apple:ios_x86_64": [],
+})
+
+arch_specific_copts = select({
+    "@build_bazel_rules_apple//apple:ios_armv7": arm_specific_copts,
+    "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_copts,
+    "//build-system:ios_sim_arm64": arm64_specific_copts,
+    "@build_bazel_rules_apple//apple:ios_x86_64": [],
+})
+
+arch_specific_textual_hdrs = select({
+    "@build_bazel_rules_apple//apple:ios_armv7": arm_specific_textual_hdrs,
+    "@build_bazel_rules_apple//apple:ios_arm64": arm64_specific_textual_hdrs,
+    "//build-system:ios_sim_arm64": arm64_specific_textual_hdrs,
+    "@build_bazel_rules_apple//apple:ios_x86_64": [],
+})
+
+all_sources = arch_specific_sources + [
+    "third_party/openh264/src/codec/encoder/core/inc/as264_common.h",
+    "third_party/openh264/src/codec/encoder/core/inc/au_set.h",
+    "third_party/openh264/src/codec/encoder/core/inc/deblocking.h",
+    "third_party/openh264/src/codec/encoder/core/inc/decode_mb_aux.h",
+    "third_party/openh264/src/codec/encoder/core/inc/dq_map.h",
+    "third_party/openh264/src/codec/encoder/core/inc/encode_mb_aux.h",
+    "third_party/openh264/src/codec/encoder/core/inc/encoder_context.h",
+    "third_party/openh264/src/codec/encoder/core/inc/encoder.h",
+    "third_party/openh264/src/codec/encoder/core/inc/extern.h",
+    "third_party/openh264/src/codec/encoder/core/inc/get_intra_predictor.h",
+    "third_party/openh264/src/codec/encoder/core/inc/mb_cache.h",
+    "third_party/openh264/src/codec/encoder/core/inc/md.h",
+    "third_party/openh264/src/codec/encoder/core/inc/mt_defs.h",
+    "third_party/openh264/src/codec/encoder/core/inc/mv_pred.h",
+    "third_party/openh264/src/codec/encoder/core/inc/nal_encap.h",
+    "third_party/openh264/src/codec/encoder/core/inc/param_svc.h",
+    "third_party/openh264/src/codec/encoder/core/inc/parameter_sets.h",
+    "third_party/openh264/src/codec/encoder/core/inc/paraset_strategy.h",
+    "third_party/openh264/src/codec/encoder/core/inc/picture_handle.h",
+    "third_party/openh264/src/codec/encoder/core/inc/picture.h",
+    "third_party/openh264/src/codec/encoder/core/inc/rc.h",
+    "third_party/openh264/src/codec/encoder/core/inc/ref_list_mgr_svc.h",
+    "third_party/openh264/src/codec/encoder/core/inc/sample.h",
+    "third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cabac.h",
+    "third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cavlc.h",
+    "third_party/openh264/src/codec/encoder/core/inc/slice_multi_threading.h",
+    "third_party/openh264/src/codec/encoder/core/inc/slice.h",
+    "third_party/openh264/src/codec/encoder/core/inc/stat.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_base_layer_md.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_enc_frame.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_enc_golomb.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_enc_macroblock.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_enc_slice_segment.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_encode_mb.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_encode_slice.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_mode_decision.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_motion_estimate.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h",
+    "third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn.h",
+    "third_party/openh264/src/codec/encoder/core/inc/vlc_encoder.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_common_basis.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_const.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_func_ptr_def.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_preprocess.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_task_base.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_task_encoder.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_task_management.h",
+    "third_party/openh264/src/codec/encoder/core/inc/wels_transpose_matrix.h",
+    "third_party/openh264/src/codec/common/inc/crt_util_safe_x.h",
+    "third_party/openh264/src/codec/common/inc/typedefs.h",
+    "third_party/openh264/src/codec/common/inc/utils.h",
+    "third_party/openh264/src/codec/api/svc/codec_app_def.h",
+    "third_party/openh264/src/codec/api/svc/codec_def.h",
+    "third_party/openh264/src/codec/api/svc/codec_api.h",
+    "third_party/openh264/src/codec/common/inc/WelsTask.h",
+    "third_party/openh264/src/codec/common/inc/macros.h",
+    "third_party/openh264/src/codec/common/inc/wels_const_common.h",
+    "third_party/openh264/src/codec/common/inc/wels_common_defs.h",
+    "third_party/openh264/src/codec/common/inc/memory_align.h",
+    "third_party/openh264/src/codec/common/inc/expand_pic.h",
+    "third_party/openh264/src/codec/common/inc/mc.h",
+    "third_party/openh264/src/codec/common/inc/cpu_core.h",
+    "third_party/openh264/src/codec/common/inc/WelsThreadLib.h",
+    "third_party/openh264/src/codec/common/inc/WelsLock.h",
+    "third_party/openh264/src/codec/common/inc/WelsThreadPool.h",
+    "third_party/openh264/src/codec/common/inc/WelsTaskThread.h",
+    "third_party/openh264/src/codec/common/inc/WelsThread.h",
+    "third_party/openh264/src/codec/common/inc/WelsList.h",
+    "third_party/openh264/src/codec/common/inc/copy_mb.h",
+    "third_party/openh264/src/codec/common/inc/golomb_common.h",
+    "third_party/openh264/src/codec/common/inc/ls_defines.h",
+    "third_party/openh264/src/codec/common/inc/measure_time.h",
+    "third_party/openh264/src/codec/common/inc/deblocking_common.h",
+    "third_party/openh264/src/codec/common/inc/cpu.h",
+    "third_party/openh264/src/codec/api/svc/codec_ver.h",
+    "third_party/openh264/src/codec/common/inc/intra_pred_common.h",
+    "third_party/openh264/src/codec/common/inc/sad_common.h",
+] + [
+    "third_party/openh264/src/codec/encoder/core/src/au_set.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/deblocking.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/decode_mb_aux.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/encode_mb_aux.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/encoder_data_tables.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/encoder_ext.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/encoder.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/get_intra_predictor.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/md.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/mv_pred.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/nal_encap.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/paraset_strategy.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/picture_handle.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/ratectl.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/ref_list_mgr_svc.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/sample.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cabac.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cavlc.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/slice_multi_threading.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_base_layer_md.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_enc_slice_segment.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_encode_mb.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_encode_slice.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_mode_decision.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_motion_estimate.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cabac.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/wels_preprocess.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/wels_task_base.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/wels_task_encoder.cpp",
+    "third_party/openh264/src/codec/encoder/core/src/wels_task_management.cpp",
+] + [
+    "third_party/openh264/src/codec/encoder/plus/inc/welsEncoderExt.h",
+    "third_party/openh264/src/codec/common/inc/version.h",
+    "third_party/openh264/src/codec/common/inc/welsCodecTrace.h",
+    "third_party/openh264/src/codec/common/inc/asmdefs_mmi.h",
+] + [
+    "third_party/openh264/src/codec/encoder/plus/src/welsEncoderExt.cpp",
+    "third_party/openh264/src/codec/common/src/welsCodecTrace.cpp",
+    "third_party/openh264/src/codec/common/src/common_tables.cpp",
+    "third_party/openh264/src/codec/common/src/copy_mb.cpp",
+    "third_party/openh264/src/codec/common/src/cpu.cpp",
+    "third_party/openh264/src/codec/common/src/crt_util_safe_x.cpp",
+    "third_party/openh264/src/codec/common/src/deblocking_common.cpp",
+    "third_party/openh264/src/codec/common/src/expand_pic.cpp",
+    "third_party/openh264/src/codec/common/src/intra_pred_common.cpp",
+    "third_party/openh264/src/codec/common/src/mc.cpp",
+    "third_party/openh264/src/codec/common/src/memory_align.cpp",
+    "third_party/openh264/src/codec/common/src/sad_common.cpp",
+    "third_party/openh264/src/codec/common/src/WelsTaskThread.cpp",
+    "third_party/openh264/src/codec/common/src/WelsThread.cpp",
+    "third_party/openh264/src/codec/common/src/WelsThreadLib.cpp",
+    "third_party/openh264/src/codec/common/src/WelsThreadPool.cpp",
+    "third_party/openh264/src/codec/common/src/utils.cpp",
+] + [
+    "third_party/openh264/src/codec/processing/interface/IWelsVP.h",
+    "third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp",
+    "third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.h",
+    "third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.cpp",
+    "third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.h",
+    "third_party/openh264/src/codec/processing/src/common/common.h",
+    "third_party/openh264/src/codec/processing/src/common/memory.cpp",
+    "third_party/openh264/src/codec/processing/src/common/memory.h",
+    "third_party/openh264/src/codec/processing/src/common/resource.h",
+    "third_party/openh264/src/codec/processing/src/common/typedef.h",
+    "third_party/openh264/src/codec/processing/src/common/util.h",
+    "third_party/openh264/src/codec/processing/src/common/WelsFrameWork.cpp",
+    "third_party/openh264/src/codec/processing/src/common/WelsFrameWork.h",
+    "third_party/openh264/src/codec/processing/src/common/WelsFrameWorkEx.cpp",
+    "third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp",
+    "third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.h",
+    "third_party/openh264/src/codec/processing/src/denoise/denoise.cpp",
+    "third_party/openh264/src/codec/processing/src/denoise/denoise_filter.cpp",
+    "third_party/openh264/src/codec/processing/src/denoise/denoise.h",
+    "third_party/openh264/src/codec/processing/src/downsample/downsample.cpp",
+    "third_party/openh264/src/codec/processing/src/downsample/downsample.h",
+    "third_party/openh264/src/codec/processing/src/downsample/downsamplefuncs.cpp",
+    "third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.cpp",
+    "third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.h",
+    "third_party/openh264/src/codec/processing/src/imagerotate/imagerotatefuncs.cpp",
+    "third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp",
+    "third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.h",
+    "third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.cpp",
+    "third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.h",
+    "third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.cpp",
+    "third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.h",
+    "third_party/openh264/src/codec/processing/src/vaacalc/vaacalcfuncs.cpp",
+    "third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.cpp",
+    "third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.h",
+]
+
+cc_library(
+    name = "openh264",
+    srcs = all_sources,
+    hdrs = glob([
+    ]),
+    textual_hdrs = arch_specific_textual_hdrs,
+    includes = [
+    ],
+    copts = arch_specific_copts + [
+        "-Ithird-party/openh264/third_party/openh264/src/codec/encoder/core/inc",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/encoder/plus/inc",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/decoder/plus/inc",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/common/inc",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/api/svc",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/processing/interface",
+        "-Ithird-party/openh264/third_party/openh264/src/codec/processing/src/common",
+        "-Os",
+    ],
+    deps = [
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/meson.build b/third-party/openh264/third_party/openh264/src/codec/api/meson.build
new file mode 100644
index 0000000000..0f133adecd
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/meson.build
@@ -0,0 +1 @@
+subdir ('svc')
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_api.h b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_api.h
new file mode 100644
index 0000000000..a1326c8f05
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_api.h
@@ -0,0 +1,592 @@
+/*!
+ *@page License
+ *
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_VIDEO_CODEC_SVC_API_H__
+#define WELS_VIDEO_CODEC_SVC_API_H__
+
+#ifndef __cplusplus
+#if defined(_MSC_VER) && (_MSC_VER < 1800)
+typedef unsigned char bool;
+#else
+#include <stdbool.h>
+#endif
+#endif
+
+#include "codec_app_def.h"
+#include "codec_def.h"
+
+#if defined(_WIN32) || defined(__cdecl)
+#define EXTAPI __cdecl
+#else
+#define EXTAPI
+#endif
+
+/**
+  * @file codec_api.h
+*/
+
+/**
+  * @page Overview
+  *   * This page is for openh264 codec API usage.
+  *   * For how to use the encoder,please refer to page UsageExampleForEncoder
+  *   * For how to use the decoder,please refer to page UsageExampleForDecoder
+  *   * For more detail about ISVEncoder,please refer to page ISVCEncoder
+  *   * For more detail about ISVDecoder,please refer to page ISVCDecoder
+*/
+
+/**
+  * @page DecoderUsageExample
+  *
+  * @brief
+  *   * An example for using the decoder for Decoding only or Parsing only
+  *
+  * Step 1:decoder declaration
+  * @code
+  *
+  *  //decoder declaration
+  *  ISVCDecoder *pSvcDecoder;
+  *  //input: encoded bitstream start position; should include start code prefix
+  *  unsigned char *pBuf =...;
+  *  //input: encoded bit stream length; should include the size of start code prefix
+  *  int iSize =...;
+  *  //output: [0~2] for Y,U,V buffer for Decoding only
+  *  unsigned char *pData[3] =...;
+  *  //in-out: for Decoding only: declare and initialize the output buffer info, this should never co-exist with Parsing only
+  *  SBufferInfo sDstBufInfo;
+  *  memset(&sDstBufInfo, 0, sizeof(SBufferInfo));
+  *  //in-out: for Parsing only: declare and initialize the output bitstream buffer info for parse only, this should never co-exist with Decoding only
+  *  SParserBsInfo sDstParseInfo;
+  *  memset(&sDstParseInfo, 0, sizeof(SParserBsInfo));
+  *  sDstParseInfo.pDstBuff = new unsigned char[PARSE_SIZE]; //In Parsing only, allocate enough buffer to save transcoded bitstream for a frame
+  *
+  * @endcode
+  *
+  * Step 2:decoder creation
+  * @code
+  *  WelsCreateDecoder(&pSvcDecoder);
+  * @endcode
+  *
+  * Step 3:declare required parameter, used to differentiate Decoding only and Parsing only
+  * @code
+  *  SDecodingParam sDecParam = {0};
+  *  sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_AVC;
+  *  //for Parsing only, the assignment is mandatory
+  *  sDecParam.bParseOnly = true;
+  * @endcode
+  *
+  * Step 4:initialize the parameter and decoder context, allocate memory
+  * @code
+  *  pSvcDecoder->Initialize(&sDecParam);
+  * @endcode
+  *
+  * Step 5:do actual decoding process in slice level;
+  *        this can be done in a loop until data ends
+  * @code
+  *  //for Decoding only
+  *  iRet = pSvcDecoder->DecodeFrameNoDelay(pBuf, iSize, pData, &sDstBufInfo);
+  *  //or
+  *  iRet = pSvcDecoder->DecodeFrame2(pBuf, iSize, pData, &sDstBufInfo);
+  *  //for Parsing only
+  *  iRet = pSvcDecoder->DecodeParser(pBuf, iSize, &sDstParseInfo);
+  *  //decode failed
+  *  If (iRet != 0){
+  *      //error handling (RequestIDR or something like that)
+  *  }
+  *  //for Decoding only, pData can be used for render.
+  *  if (sDstBufInfo.iBufferStatus==1){
+  *      //output handling (pData[0], pData[1], pData[2])
+  *  }
+  * //for Parsing only, sDstParseInfo can be used for, e.g., HW decoding
+  *  if (sDstBufInfo.iNalNum > 0){
+  *      //Hardware decoding sDstParseInfo;
+  *  }
+  *  //no-delay decoding can be realized by directly calling DecodeFrameNoDelay(), which is the recommended usage.
+  *  //no-delay decoding can also be realized by directly calling DecodeFrame2() again with NULL input, as in the following. In this case, decoder would immediately reconstruct the input data. This can also be used similarly for Parsing only. Consequent decoding error and output indication should also be considered as above.
+  *  iRet = pSvcDecoder->DecodeFrame2(NULL, 0, pData, &sDstBufInfo);
+  *  //judge iRet, sDstBufInfo.iBufferStatus ...
+  * @endcode
+  *
+  * Step 6:uninitialize the decoder and memory free
+  * @code
+  *  pSvcDecoder->Uninitialize();
+  * @endcode
+  *
+  * Step 7:destroy the decoder
+  * @code
+  *  DestroyDecoder(pSvcDecoder);
+  * @endcode
+  *
+*/
+
+/**
+  * @page EncoderUsageExample1
+  *
+  * @brief
+  *  * An example for using encoder with basic parameter
+  *
+  * Step1:setup encoder
+  * @code
+  *  ISVCEncoder*  encoder_;
+  *  int rv = WelsCreateSVCEncoder (&encoder_);
+  *  assert (rv == 0);
+  *  assert (encoder_ != NULL);
+  * @endcode
+  *
+  * Step2:initilize with basic parameter
+  * @code
+  *  SEncParamBase param;
+  *  memset (&param, 0, sizeof (SEncParamBase));
+  *  param.iUsageType = usageType; //from EUsageType enum
+  *  param.fMaxFrameRate = frameRate;
+  *  param.iPicWidth = width;
+  *  param.iPicHeight = height;
+  *  param.iTargetBitrate = 5000000;
+  *  encoder_->Initialize (&param);
+  * @endcode
+  *
+  * Step3:set option, set option during encoding process
+  * @code
+  *  encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &g_LevelSetting);
+  *  int videoFormat = videoFormatI420;
+  *  encoder_->SetOption (ENCODER_OPTION_DATAFORMAT, &videoFormat);
+  * @endcode
+  *
+  * Step4: encode and  store ouput bistream
+  * @code
+  *  int frameSize = width * height * 3 / 2;
+  *  BufferedData buf;
+  *  buf.SetLength (frameSize);
+  *  assert (buf.Length() == (size_t)frameSize);
+  *  SFrameBSInfo info;
+  *  memset (&info, 0, sizeof (SFrameBSInfo));
+  *  SSourcePicture pic;
+  *  memset (&pic, 0, sizeof (SsourcePicture));
+  *  pic.iPicWidth = width;
+  *  pic.iPicHeight = height;
+  *  pic.iColorFormat = videoFormatI420;
+  *  pic.iStride[0] = pic.iPicWidth;
+  *  pic.iStride[1] = pic.iStride[2] = pic.iPicWidth >> 1;
+  *  pic.pData[0] = buf.data();
+  *  pic.pData[1] = pic.pData[0] + width * height;
+  *  pic.pData[2] = pic.pData[1] + (width * height >> 2);
+  *  for(int num = 0;num<total_num;num++) {
+  *     //prepare input data
+  *     rv = encoder_->EncodeFrame (&pic, &info);
+  *     assert (rv == cmResultSuccess);
+  *     if (info.eFrameType != videoFrameTypeSkip) {
+  *      //output bitstream handling
+  *     }
+  *  }
+  * @endcode
+  *
+  * Step5:teardown encoder
+  * @code
+  *  if (encoder_) {
+  *      encoder_->Uninitialize();
+  *      WelsDestroySVCEncoder (encoder_);
+  *  }
+  * @endcode
+  *
+  */
+
+/**
+  * @page EncoderUsageExample2
+  *
+  * @brief
+  *     * An example for using the encoder with extension parameter.
+  *     * The same operation on Step 1,3,4,5 with Example-1
+  *
+  * Step 2:initialize with extension parameter
+  * @code
+  *  SEncParamExt param;
+  *  encoder_->GetDefaultParams (&param);
+  *  param.iUsageType = usageType;
+  *  param.fMaxFrameRate = frameRate;
+  *  param.iPicWidth = width;
+  *  param.iPicHeight = height;
+  *  param.iTargetBitrate = 5000000;
+  *  param.bEnableDenoise = denoise;
+  *  param.iSpatialLayerNum = layers;
+  *  //SM_DYN_SLICE don't support multi-thread now
+  *  if (sliceMode != SM_SINGLE_SLICE && sliceMode != SM_DYN_SLICE)
+  *      param.iMultipleThreadIdc = 2;
+  *
+  *  for (int i = 0; i < param.iSpatialLayerNum; i++) {
+  *      param.sSpatialLayers[i].iVideoWidth = width >> (param.iSpatialLayerNum - 1 - i);
+  *      param.sSpatialLayers[i].iVideoHeight = height >> (param.iSpatialLayerNum - 1 - i);
+  *      param.sSpatialLayers[i].fFrameRate = frameRate;
+  *      param.sSpatialLayers[i].iSpatialBitrate = param.iTargetBitrate;
+  *
+  *      param.sSpatialLayers[i].sSliceCfg.uiSliceMode = sliceMode;
+  *      if (sliceMode == SM_DYN_SLICE) {
+  *          param.sSpatialLayers[i].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = 600;
+  *          param.uiMaxNalSize = 1500;
+  *      }
+  *  }
+  *  param.iTargetBitrate *= param.iSpatialLayerNum;
+  *  encoder_->InitializeExt (&param);
+  *  int videoFormat = videoFormatI420;
+  *  encoder_->SetOption (ENCODER_OPTION_DATAFORMAT, &videoFormat);
+  *
+  * @endcode
+  */
+
+
+
+
+#ifdef __cplusplus
+/**
+* @brief Endocder definition
+*/
+class ISVCEncoder {
+ public:
+  /**
+  * @brief  Initialize the encoder
+  * @param  pParam  basic encoder parameter
+  * @return CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI Initialize (const SEncParamBase* pParam) = 0;
+
+  /**
+  * @brief  Initilaize encoder by using extension parameters.
+  * @param  pParam  extension parameter for encoder
+  * @return CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI InitializeExt (const SEncParamExt* pParam) = 0;
+
+  /**
+  * @brief   Get the default extension parameters.
+  *          If you want to change some parameters of encoder, firstly you need to get the default encoding parameters,
+  *          after that you can change part of parameters you want to.
+  * @param   pParam  extension parameter for encoder
+  * @return  CM_RETURN: 0 - success; otherwise - failed;
+  * */
+  virtual int EXTAPI GetDefaultParams (SEncParamExt* pParam) = 0;
+  /// uninitialize the encoder
+  virtual int EXTAPI Uninitialize() = 0;
+
+  /**
+  * @brief Encode one frame
+  * @param kpSrcPic the pointer to the source luminance plane
+  *        chrominance data:
+  *        CbData = kpSrc  +  m_iMaxPicWidth * m_iMaxPicHeight;
+  *        CrData = CbData + (m_iMaxPicWidth * m_iMaxPicHeight)/4;
+  *        the application calling this interface needs to ensure the data validation between the location
+  * @param pBsInfo output bit stream
+  * @return  0 - success; otherwise -failed;
+  */
+  virtual int EXTAPI EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) = 0;
+
+  /**
+  * @brief  Encode the parameters from output bit stream
+  * @param  pBsInfo output bit stream
+  * @return 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo) = 0;
+
+  /**
+  * @brief  Force encoder to encoder frame as IDR if bIDR set as true
+  * @param  bIDR true: force encoder to encode frame as IDR frame;false, return 1 and nothing to do
+  * @return 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI ForceIntraFrame (bool bIDR, int iLayerId = -1) = 0;
+
+  /**
+  * @brief   Set option for encoder, detail option type, please refer to enumurate ENCODER_OPTION.
+  * @param   pOption option for encoder such as InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,...
+  * @return  CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI SetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
+
+  /**
+  * @brief   Get option for encoder, detail option type, please refer to enumurate ENCODER_OPTION.
+  * @param   pOption option for encoder such as InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,...
+  * @return  CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual int EXTAPI GetOption (ENCODER_OPTION eOptionId, void* pOption) = 0;
+  virtual ~ISVCEncoder() {}
+};
+
+
+
+/**
+* @brief Decoder definition
+*/
+class ISVCDecoder {
+ public:
+
+  /**
+  * @brief  Initilaize decoder
+  * @param  pParam  parameter for decoder
+  * @return 0 - success; otherwise - failed;
+  */
+  virtual long EXTAPI Initialize (const SDecodingParam* pParam) = 0;
+
+  /// Uninitialize the decoder
+  virtual long EXTAPI Uninitialize() = 0;
+
+  /**
+  * @brief   Decode one frame
+  * @param   pSrc the h264 stream to be decoded
+  * @param   iSrcLen the length of h264 stream
+  * @param   ppDst buffer pointer of decoded data (YUV)
+  * @param   pStride output stride
+  * @param   iWidth output width
+  * @param   iHeight output height
+  * @return  0 - success; otherwise -failed;
+  */
+  virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* pSrc,
+      const int iSrcLen,
+      unsigned char** ppDst,
+      int* pStride,
+      int& iWidth,
+      int& iHeight) = 0;
+
+  /**
+    * @brief    For slice level DecodeFrameNoDelay() (4 parameters input),
+    *           whatever the function return value is, the output data
+    *           of I420 format will only be available when pDstInfo->iBufferStatus == 1,.
+    *           This function will parse and reconstruct the input frame immediately if it is complete
+    *           It is recommended as the main decoding function for H.264/AVC format input
+    * @param   pSrc the h264 stream to be decoded
+    * @param   iSrcLen the length of h264 stream
+    * @param   ppDst buffer pointer of decoded data (YUV)
+    * @param   pDstInfo information provided to API(width, height, etc.)
+    * @return  0 - success; otherwise -failed;
+    */
+  virtual DECODING_STATE EXTAPI DecodeFrameNoDelay (const unsigned char* pSrc,
+      const int iSrcLen,
+      unsigned char** ppDst,
+      SBufferInfo* pDstInfo) = 0;
+
+  /**
+  * @brief    For slice level DecodeFrame2() (4 parameters input),
+  *           whatever the function return value is, the output data
+  *           of I420 format will only be available when pDstInfo->iBufferStatus == 1,.
+  *           (e.g., in multi-slice cases, only when the whole picture
+  *           is completely reconstructed, this variable would be set equal to 1.)
+  * @param   pSrc the h264 stream to be decoded
+  * @param   iSrcLen the length of h264 stream
+  * @param   ppDst buffer pointer of decoded data (YUV)
+  * @param   pDstInfo information provided to API(width, height, etc.)
+  * @return  0 - success; otherwise -failed;
+  */
+  virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* pSrc,
+      const int iSrcLen,
+      unsigned char** ppDst,
+      SBufferInfo* pDstInfo) = 0;
+
+
+  /**
+  * @brief   This function gets a decoded ready frame remaining in buffers after the last frame has been decoded.
+  * Use GetOption with option DECODER_OPTION_NUM_OF_FRAMES_REMAINING_IN_BUFFER to get the number of frames remaining in buffers.
+  * Note that it is only applicable for profile_idc != 66
+  * @param   ppDst buffer pointer of decoded data (YUV)
+  * @param   pDstInfo information provided to API(width, height, etc.)
+  * @return  0 - success; otherwise -failed;
+  */
+  virtual DECODING_STATE EXTAPI FlushFrame (unsigned char** ppDst,
+      SBufferInfo* pDstInfo) = 0;
+
+  /**
+  * @brief   This function parse input bitstream only, and rewrite possible SVC syntax to AVC syntax
+  * @param   pSrc the h264 stream to be decoded
+  * @param   iSrcLen the length of h264 stream
+  * @param   pDstInfo bit stream info
+  * @return  0 - success; otherwise -failed;
+  */
+  virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* pSrc,
+      const int iSrcLen,
+      SParserBsInfo* pDstInfo) = 0;
+
+  /**
+  * @brief   This API does not work for now!! This is for future use to support non-I420 color format output.
+  * @param   pSrc the h264 stream to be decoded
+  * @param   iSrcLen the length of h264 stream
+  * @param   pDst buffer pointer of decoded data (YUV)
+  * @param   iDstStride output stride
+  * @param   iDstLen bit stream info
+  * @param   iWidth output width
+  * @param   iHeight output height
+  * @param   iColorFormat output color format
+  * @return  to do ...
+  */
+  virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* pSrc,
+      const int iSrcLen,
+      unsigned char* pDst,
+      int iDstStride,
+      int& iDstLen,
+      int& iWidth,
+      int& iHeight,
+      int& iColorFormat) = 0;
+
+  /**
+  * @brief   Set option for decoder, detail option type, please refer to enumurate DECODER_OPTION.
+  * @param   pOption  option for decoder such as OutDataFormat, Eos Flag, EC method, ...
+  * @return  CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual long EXTAPI SetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
+
+  /**
+  * @brief   Get option for decoder, detail option type, please refer to enumurate DECODER_OPTION.
+  * @param   pOption  option for decoder such as OutDataFormat, Eos Flag, EC method, ...
+  * @return  CM_RETURN: 0 - success; otherwise - failed;
+  */
+  virtual long EXTAPI GetOption (DECODER_OPTION eOptionId, void* pOption) = 0;
+  virtual ~ISVCDecoder() {}
+};
+
+
+extern "C"
+{
+#else
+
+typedef struct ISVCEncoderVtbl ISVCEncoderVtbl;
+typedef const ISVCEncoderVtbl* ISVCEncoder;
+struct ISVCEncoderVtbl {
+
+int (*Initialize) (ISVCEncoder*, const SEncParamBase* pParam);
+int (*InitializeExt) (ISVCEncoder*, const SEncParamExt* pParam);
+
+int (*GetDefaultParams) (ISVCEncoder*, SEncParamExt* pParam);
+
+int (*Uninitialize) (ISVCEncoder*);
+
+int (*EncodeFrame) (ISVCEncoder*, const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
+int (*EncodeParameterSets) (ISVCEncoder*, SFrameBSInfo* pBsInfo);
+
+int (*ForceIntraFrame) (ISVCEncoder*, bool bIDR);
+
+int (*SetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);
+int (*GetOption) (ISVCEncoder*, ENCODER_OPTION eOptionId, void* pOption);
+};
+
+typedef struct ISVCDecoderVtbl ISVCDecoderVtbl;
+typedef const ISVCDecoderVtbl* ISVCDecoder;
+struct ISVCDecoderVtbl {
+long (*Initialize) (ISVCDecoder*, const SDecodingParam* pParam);
+long (*Uninitialize) (ISVCDecoder*);
+
+DECODING_STATE (*DecodeFrame) (ISVCDecoder*, const unsigned char* pSrc,
+                               const int iSrcLen,
+                               unsigned char** ppDst,
+                               int* pStride,
+                               int* iWidth,
+                               int* iHeight);
+
+DECODING_STATE (*DecodeFrameNoDelay) (ISVCDecoder*, const unsigned char* pSrc,
+                                      const int iSrcLen,
+                                      unsigned char** ppDst,
+                                      SBufferInfo* pDstInfo);
+
+DECODING_STATE (*DecodeFrame2) (ISVCDecoder*, const unsigned char* pSrc,
+                                const int iSrcLen,
+                                unsigned char** ppDst,
+                                SBufferInfo* pDstInfo);
+
+DECODING_STATE (*FlushFrame) (ISVCDecoder*, unsigned char** ppDst,
+                              SBufferInfo* pDstInfo);
+
+DECODING_STATE (*DecodeParser) (ISVCDecoder*, const unsigned char* pSrc,
+                                const int iSrcLen,
+                                SParserBsInfo* pDstInfo);
+
+DECODING_STATE (*DecodeFrameEx) (ISVCDecoder*, const unsigned char* pSrc,
+                                 const int iSrcLen,
+                                 unsigned char* pDst,
+                                 int iDstStride,
+                                 int* iDstLen,
+                                 int* iWidth,
+                                 int* iHeight,
+                                 int* iColorFormat);
+
+long (*SetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
+long (*GetOption) (ISVCDecoder*, DECODER_OPTION eOptionId, void* pOption);
+};
+#endif
+
+typedef void (*WelsTraceCallback) (void* ctx, int level, const char* string);
+
+/** @brief   Create encoder
+ *  @param   ppEncoder encoder
+ *  @return  0 - success; otherwise - failed;
+*/
+int  WelsCreateSVCEncoder (ISVCEncoder** ppEncoder);
+
+
+/** @brief   Destroy encoder
+*   @param   pEncoder encoder
+ *  @return  void
+*/
+void WelsDestroySVCEncoder (ISVCEncoder* pEncoder);
+
+
+/** @brief   Get the capability of decoder
+ *  @param   pDecCapability  decoder capability
+ *  @return  0 - success; otherwise - failed;
+*/
+int WelsGetDecoderCapability (SDecoderCapability* pDecCapability);
+
+
+/** @brief   Create decoder
+ *  @param   ppDecoder decoder
+ *  @return  0 - success; otherwise - failed;
+*/
+long WelsCreateDecoder (ISVCDecoder** ppDecoder);
+
+
+/** @brief   Destroy decoder
+ *  @param   pDecoder  decoder
+ *  @return  void
+*/
+void WelsDestroyDecoder (ISVCDecoder* pDecoder);
+
+/** @brief   Get codec version
+ *           Note, old versions of Mingw (GCC < 4.7) are buggy and use an
+ *           incorrect/different ABI for calling this function, making it
+ *           incompatible with MSVC builds.
+ *  @return  The linked codec version
+*/
+OpenH264Version WelsGetCodecVersion (void);
+
+/** @brief   Get codec version
+ *  @param   pVersion  struct to fill in with the version
+*/
+void WelsGetCodecVersionEx (OpenH264Version* pVersion);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//WELS_VIDEO_CODEC_SVC_API_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_app_def.h b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_app_def.h
new file mode 100644
index 0000000000..bb3c3d67b7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_app_def.h
@@ -0,0 +1,810 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+
+#ifndef WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__
+#define WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__
+/**
+  * @file  codec_app_def.h
+  * @brief Data and /or structures introduced in Cisco OpenH264 application
+*/
+
+#include "codec_def.h"
+/* Constants */
+#define MAX_TEMPORAL_LAYER_NUM          4
+#define MAX_SPATIAL_LAYER_NUM           4
+#define MAX_QUALITY_LAYER_NUM           4
+
+#define MAX_LAYER_NUM_OF_FRAME          128
+#define MAX_NAL_UNITS_IN_LAYER          128     ///< predetermined here, adjust it later if need
+
+#define MAX_RTP_PAYLOAD_LEN             1000
+#define AVERAGE_RTP_PAYLOAD_LEN         800
+
+
+#define SAVED_NALUNIT_NUM_TMP           ( (MAX_SPATIAL_LAYER_NUM*MAX_QUALITY_LAYER_NUM) + 1 + MAX_SPATIAL_LAYER_NUM )  ///< SPS/PPS + SEI/SSEI + PADDING_NAL
+#define MAX_SLICES_NUM_TMP              ( ( MAX_NAL_UNITS_IN_LAYER - SAVED_NALUNIT_NUM_TMP ) / 3 )
+
+
+#define AUTO_REF_PIC_COUNT  -1          ///< encoder selects the number of reference frame automatically
+#define UNSPECIFIED_BIT_RATE 0          ///< to do: add detail comment
+
+/**
+ * @brief Struct of OpenH264 version
+ */
+///
+/// E.g. SDK version is 1.2.0.0, major version number is 1, minor version number is 2, and revision number is 0.
+typedef struct  _tagVersion {
+  unsigned int uMajor;                  ///< The major version number
+  unsigned int uMinor;                  ///< The minor version number
+  unsigned int uRevision;               ///< The revision number
+  unsigned int uReserved;               ///< The reserved number, it should be 0.
+} OpenH264Version;
+
+/**
+* @brief Decoding status
+*/
+typedef enum {
+  /**
+  * Errors derived from bitstream parsing
+  */
+  dsErrorFree = 0x00,   ///< bit stream error-free
+  dsFramePending = 0x01,   ///< need more throughput to generate a frame output,
+  dsRefLost = 0x02,   ///< layer lost at reference frame with temporal id 0
+  dsBitstreamError = 0x04,   ///< error bitstreams(maybe broken internal frame) the decoder cared
+  dsDepLayerLost = 0x08,   ///< dependented layer is ever lost
+  dsNoParamSets = 0x10,   ///< no parameter set NALs involved
+  dsDataErrorConcealed = 0x20,   ///< current data error concealed specified
+  dsRefListNullPtrs = 0x40, ///<ref picure list contains null ptrs within uiRefCount range
+
+  /**
+  * Errors derived from logic level
+  */
+  dsInvalidArgument     = 0x1000, ///< invalid argument specified
+  dsInitialOptExpected  = 0x2000, ///< initializing operation is expected
+  dsOutOfMemory         = 0x4000, ///< out of memory due to new request
+  /**
+  * ANY OTHERS?
+  */
+  dsDstBufNeedExpan     = 0x8000  ///< actual picture size exceeds size of dst pBuffer feed in decoder, so need expand its size
+
+} DECODING_STATE;
+
+/**
+* @brief Option types introduced in SVC encoder application
+*/
+typedef enum {
+  ENCODER_OPTION_DATAFORMAT = 0,
+  ENCODER_OPTION_IDR_INTERVAL,               ///< IDR period,0/-1 means no Intra period (only the first frame); lager than 0 means the desired IDR period, must be multiple of (2^temporal_layer)
+  ENCODER_OPTION_SVC_ENCODE_PARAM_BASE,      ///< structure of Base Param
+  ENCODER_OPTION_SVC_ENCODE_PARAM_EXT,       ///< structure of Extension Param
+  ENCODER_OPTION_FRAME_RATE,                 ///< maximal input frame rate, current supported range: MAX_FRAME_RATE = 30,MIN_FRAME_RATE = 1
+  ENCODER_OPTION_BITRATE,
+  ENCODER_OPTION_MAX_BITRATE,
+  ENCODER_OPTION_INTER_SPATIAL_PRED,
+  ENCODER_OPTION_RC_MODE,
+  ENCODER_OPTION_RC_FRAME_SKIP,
+  ENCODER_PADDING_PADDING,                   ///< 0:disable padding;1:padding
+
+  ENCODER_OPTION_PROFILE,                    ///< assgin the profile for each layer
+  ENCODER_OPTION_LEVEL,                      ///< assgin the level for each layer
+  ENCODER_OPTION_NUMBER_REF,                 ///< the number of refererence frame
+  ENCODER_OPTION_DELIVERY_STATUS,            ///< the delivery info which is a feedback from app level
+
+  ENCODER_LTR_RECOVERY_REQUEST,
+  ENCODER_LTR_MARKING_FEEDBACK,
+  ENCODER_LTR_MARKING_PERIOD,
+  ENCODER_OPTION_LTR,                        ///< 0:disable LTR;larger than 0 enable LTR; LTR number is fixed to be 2 in current encoder
+  ENCODER_OPTION_COMPLEXITY,
+
+  ENCODER_OPTION_ENABLE_SSEI,                ///< enable SSEI: true--enable ssei; false--disable ssei
+  ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING,   ///< enable prefix: true--enable prefix; false--disable prefix
+  ENCODER_OPTION_SPS_PPS_ID_STRATEGY, ///< different stategy in adjust ID in SPS/PPS: 0- constant ID, 1-additional ID, 6-mapping and additional
+
+  ENCODER_OPTION_CURRENT_PATH,
+  ENCODER_OPTION_DUMP_FILE,                  ///< dump layer reconstruct frame to a specified file
+  ENCODER_OPTION_TRACE_LEVEL,                ///< trace info based on the trace level
+  ENCODER_OPTION_TRACE_CALLBACK,             ///< a void (*)(void* context, int level, const char* message) function which receives log messages
+  ENCODER_OPTION_TRACE_CALLBACK_CONTEXT,     ///< context info of trace callback
+
+  ENCODER_OPTION_GET_STATISTICS,             ///< read only
+  ENCODER_OPTION_STATISTICS_LOG_INTERVAL,    ///< log interval in millisecond
+
+  ENCODER_OPTION_IS_LOSSLESS_LINK,            ///< advanced algorithmetic settings
+
+  ENCODER_OPTION_BITS_VARY_PERCENTAGE        ///< bit vary percentage
+} ENCODER_OPTION;
+
+/**
+* @brief Option types introduced in decoder application
+*/
+typedef enum {
+  DECODER_OPTION_END_OF_STREAM = 1,     ///< end of stream flag
+  DECODER_OPTION_VCL_NAL,               ///< feedback whether or not have VCL NAL in current AU for application layer
+  DECODER_OPTION_TEMPORAL_ID,           ///< feedback temporal id for application layer
+  DECODER_OPTION_FRAME_NUM,             ///< feedback current decoded frame number
+  DECODER_OPTION_IDR_PIC_ID,            ///< feedback current frame belong to which IDR period
+  DECODER_OPTION_LTR_MARKING_FLAG,      ///< feedback wether current frame mark a LTR
+  DECODER_OPTION_LTR_MARKED_FRAME_NUM,  ///< feedback frame num marked by current Frame
+  DECODER_OPTION_ERROR_CON_IDC,         ///< indicate decoder error concealment method
+  DECODER_OPTION_TRACE_LEVEL,
+  DECODER_OPTION_TRACE_CALLBACK,        ///< a void (*)(void* context, int level, const char* message) function which receives log messages
+  DECODER_OPTION_TRACE_CALLBACK_CONTEXT,///< context info of trace callbac
+
+  DECODER_OPTION_GET_STATISTICS,        ///< feedback decoder statistics
+  DECODER_OPTION_GET_SAR_INFO,          ///< feedback decoder Sample Aspect Ratio info in Vui
+  DECODER_OPTION_PROFILE,               ///< get current AU profile info, only is used in GetOption
+  DECODER_OPTION_LEVEL,                 ///< get current AU level info,only is used in GetOption
+  DECODER_OPTION_STATISTICS_LOG_INTERVAL,///< set log output interval
+  DECODER_OPTION_IS_REF_PIC,             ///< feedback current frame is ref pic or not
+  DECODER_OPTION_NUM_OF_FRAMES_REMAINING_IN_BUFFER,  ///< number of frames remaining in decoder buffer when pictures are required to re-ordered into display-order.
+  DECODER_OPTION_NUM_OF_THREADS,         ///< number of decoding threads. The maximum thread count is equal or less than lesser of (cpu core counts and 16).
+} DECODER_OPTION;
+
+/**
+* @brief Enumerate the type of error concealment methods
+*/
+typedef enum {
+  ERROR_CON_DISABLE = 0,
+  ERROR_CON_FRAME_COPY,
+  ERROR_CON_SLICE_COPY,
+  ERROR_CON_FRAME_COPY_CROSS_IDR,
+  ERROR_CON_SLICE_COPY_CROSS_IDR,
+  ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE,
+  ERROR_CON_SLICE_MV_COPY_CROSS_IDR,
+  ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE
+} ERROR_CON_IDC;
+/**
+* @brief Feedback that whether or not have VCL NAL in current AU
+*/
+typedef enum {
+  FEEDBACK_NON_VCL_NAL = 0,
+  FEEDBACK_VCL_NAL,
+  FEEDBACK_UNKNOWN_NAL
+} FEEDBACK_VCL_NAL_IN_AU;
+
+/**
+* @brief Type of layer being encoded
+*/
+typedef enum {
+  NON_VIDEO_CODING_LAYER = 0,
+  VIDEO_CODING_LAYER = 1
+} LAYER_TYPE;
+
+/**
+* @brief Spatial layer num
+*/
+typedef enum {
+  SPATIAL_LAYER_0 = 0,
+  SPATIAL_LAYER_1 = 1,
+  SPATIAL_LAYER_2 = 2,
+  SPATIAL_LAYER_3 = 3,
+  SPATIAL_LAYER_ALL = 4
+} LAYER_NUM;
+
+/**
+* @brief Enumerate the type of video bitstream which is provided to decoder
+*/
+typedef enum {
+  VIDEO_BITSTREAM_AVC               = 0,
+  VIDEO_BITSTREAM_SVC               = 1,
+  VIDEO_BITSTREAM_DEFAULT           = VIDEO_BITSTREAM_SVC
+} VIDEO_BITSTREAM_TYPE;
+
+/**
+* @brief Enumerate the type of key frame request
+*/
+typedef enum {
+  NO_RECOVERY_REQUSET  = 0,
+  LTR_RECOVERY_REQUEST = 1,
+  IDR_RECOVERY_REQUEST = 2,
+  NO_LTR_MARKING_FEEDBACK = 3,
+  LTR_MARKING_SUCCESS = 4,
+  LTR_MARKING_FAILED = 5
+} KEY_FRAME_REQUEST_TYPE;
+
+/**
+* @brief Structure for LTR recover request
+*/
+typedef struct {
+  unsigned int uiFeedbackType;       ///< IDR request or LTR recovery request
+  unsigned int uiIDRPicId;           ///< distinguish request from different IDR
+  int          iLastCorrectFrameNum;
+  int          iCurrentFrameNum;     ///< specify current decoder frame_num.
+  int          iLayerId;           //specify the layer for recovery request
+} SLTRRecoverRequest;
+
+/**
+* @brief Structure for LTR marking feedback
+*/
+typedef struct {
+  unsigned int  uiFeedbackType; ///< mark failed or successful
+  unsigned int  uiIDRPicId;     ///< distinguish request from different IDR
+  int           iLTRFrameNum;   ///< specify current decoder frame_num
+  int           iLayerId;        //specify the layer for LTR marking feedback
+} SLTRMarkingFeedback;
+
+/**
+* @brief Structure for LTR configuration
+*/
+typedef struct {
+  bool   bEnableLongTermReference; ///< 1: on, 0: off
+  int    iLTRRefNum;               ///< TODO: not supported to set it arbitrary yet
+} SLTRConfig;
+
+/**
+* @brief Enumerate the type of rate control mode
+*/
+typedef enum {
+  RC_QUALITY_MODE = 0,     ///< quality mode
+  RC_BITRATE_MODE = 1,     ///< bitrate mode
+  RC_BUFFERBASED_MODE = 2, ///< no bitrate control,only using buffer status,adjust the video quality
+  RC_TIMESTAMP_MODE = 3, //rate control based timestamp
+  RC_BITRATE_MODE_POST_SKIP = 4, ///< this is in-building RC MODE, WILL BE DELETED after algorithm tuning!
+  RC_OFF_MODE = -1,         ///< rate control off mode
+} RC_MODES;
+
+/**
+* @brief Enumerate the type of profile id
+*/
+typedef enum {
+  PRO_UNKNOWN   = 0,
+  PRO_BASELINE  = 66,
+  PRO_MAIN      = 77,
+  PRO_EXTENDED  = 88,
+  PRO_HIGH      = 100,
+  PRO_HIGH10    = 110,
+  PRO_HIGH422   = 122,
+  PRO_HIGH444   = 144,
+  PRO_CAVLC444  = 244,
+
+  PRO_SCALABLE_BASELINE = 83,
+  PRO_SCALABLE_HIGH     = 86
+} EProfileIdc;
+
+/**
+* @brief Enumerate the type of level id
+*/
+typedef enum {
+  LEVEL_UNKNOWN = 0,
+  LEVEL_1_0 = 10,
+  LEVEL_1_B = 9,
+  LEVEL_1_1 = 11,
+  LEVEL_1_2 = 12,
+  LEVEL_1_3 = 13,
+  LEVEL_2_0 = 20,
+  LEVEL_2_1 = 21,
+  LEVEL_2_2 = 22,
+  LEVEL_3_0 = 30,
+  LEVEL_3_1 = 31,
+  LEVEL_3_2 = 32,
+  LEVEL_4_0 = 40,
+  LEVEL_4_1 = 41,
+  LEVEL_4_2 = 42,
+  LEVEL_5_0 = 50,
+  LEVEL_5_1 = 51,
+  LEVEL_5_2 = 52
+} ELevelIdc;
+
+/**
+* @brief Enumerate the type of wels log
+*/
+enum {
+  WELS_LOG_QUIET       = 0x00,          ///< quiet mode
+  WELS_LOG_ERROR       = 1 << 0,        ///< error log iLevel
+  WELS_LOG_WARNING     = 1 << 1,        ///< Warning log iLevel
+  WELS_LOG_INFO        = 1 << 2,        ///< information log iLevel
+  WELS_LOG_DEBUG       = 1 << 3,        ///< debug log, critical algo log
+  WELS_LOG_DETAIL      = 1 << 4,        ///< per packet/frame log
+  WELS_LOG_RESV        = 1 << 5,        ///< resversed log iLevel
+  WELS_LOG_LEVEL_COUNT = 6,
+  WELS_LOG_DEFAULT     = WELS_LOG_WARNING   ///< default log iLevel in Wels codec
+};
+
+/**
+ * @brief Enumerate the type of slice mode
+ */
+typedef enum {
+  SM_SINGLE_SLICE         = 0, ///< | SliceNum==1
+  SM_FIXEDSLCNUM_SLICE    = 1, ///< | according to SliceNum        | enabled dynamic slicing for multi-thread
+  SM_RASTER_SLICE         = 2, ///< | according to SlicesAssign    | need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
+  SM_SIZELIMITED_SLICE           = 3, ///< | according to SliceSize       | slicing according to size, the slicing will be dynamic(have no idea about slice_nums until encoding current frame)
+  SM_RESERVED             = 4
+} SliceModeEnum;
+
+/**
+ * @brief Structure for slice argument
+ */
+typedef struct {
+  SliceModeEnum uiSliceMode;    ///< by default, uiSliceMode will be SM_SINGLE_SLICE
+  unsigned int
+  uiSliceNum;     ///< only used when uiSliceMode=1, when uiSliceNum=0 means auto design it with cpu core number
+  unsigned int
+  uiSliceMbNum[MAX_SLICES_NUM_TMP]; ///< only used when uiSliceMode=2; when =0 means setting one MB row a slice
+  unsigned int  uiSliceSizeConstraint; ///< now only used when uiSliceMode=4
+} SSliceArgument;
+
+/**
+* @brief Enumerate the type of video format
+*/
+typedef enum {
+  VF_COMPONENT,
+  VF_PAL,
+  VF_NTSC,
+  VF_SECAM,
+  VF_MAC,
+  VF_UNDEF,
+  VF_NUM_ENUM
+} EVideoFormatSPS;  // EVideoFormat is already defined/used elsewhere!
+
+/**
+* @brief Enumerate the type of color primaries
+*/
+typedef enum {
+  CP_RESERVED0,
+  CP_BT709,
+  CP_UNDEF,
+  CP_RESERVED3,
+  CP_BT470M,
+  CP_BT470BG,
+  CP_SMPTE170M,
+  CP_SMPTE240M,
+  CP_FILM,
+  CP_BT2020,
+  CP_NUM_ENUM
+} EColorPrimaries;
+
+/**
+* @brief Enumerate the type of transfer characteristics
+*/
+typedef enum {
+  TRC_RESERVED0,
+  TRC_BT709,
+  TRC_UNDEF,
+  TRC_RESERVED3,
+  TRC_BT470M,
+  TRC_BT470BG,
+  TRC_SMPTE170M,
+  TRC_SMPTE240M,
+  TRC_LINEAR,
+  TRC_LOG100,
+  TRC_LOG316,
+  TRC_IEC61966_2_4,
+  TRC_BT1361E,
+  TRC_IEC61966_2_1,
+  TRC_BT2020_10,
+  TRC_BT2020_12,
+  TRC_NUM_ENUM
+} ETransferCharacteristics;
+
+/**
+* @brief Enumerate the type of color matrix
+*/
+typedef enum {
+  CM_GBR,
+  CM_BT709,
+  CM_UNDEF,
+  CM_RESERVED3,
+  CM_FCC,
+  CM_BT470BG,
+  CM_SMPTE170M,
+  CM_SMPTE240M,
+  CM_YCGCO,
+  CM_BT2020NC,
+  CM_BT2020C,
+  CM_NUM_ENUM
+} EColorMatrix;
+
+
+/**
+* @brief Enumerate the type of sample aspect ratio
+*/
+typedef enum {
+  ASP_UNSPECIFIED = 0,
+  ASP_1x1 = 1,
+  ASP_12x11 = 2,
+  ASP_10x11 = 3,
+  ASP_16x11 = 4,
+  ASP_40x33 = 5,
+  ASP_24x11 = 6,
+  ASP_20x11 = 7,
+  ASP_32x11 = 8,
+  ASP_80x33 = 9,
+  ASP_18x11 = 10,
+  ASP_15x11 = 11,
+  ASP_64x33 = 12,
+  ASP_160x99 = 13,
+
+  ASP_EXT_SAR = 255
+} ESampleAspectRatio;
+
+
+/**
+* @brief  Structure for spatial layer configuration
+*/
+typedef struct {
+  int   iVideoWidth;           ///< width of picture in luminance samples of a layer
+  int   iVideoHeight;          ///< height of picture in luminance samples of a layer
+  float fFrameRate;            ///< frame rate specified for a layer
+  int   iSpatialBitrate;       ///< target bitrate for a spatial layer, in unit of bps
+  int   iMaxSpatialBitrate;    ///< maximum  bitrate for a spatial layer, in unit of bps
+  EProfileIdc  uiProfileIdc;   ///< value of profile IDC (PRO_UNKNOWN for auto-detection)
+  ELevelIdc    uiLevelIdc;     ///< value of profile IDC (0 for auto-detection)
+  int          iDLayerQp;      ///< value of level IDC (0 for auto-detection)
+
+  SSliceArgument sSliceArgument;
+
+  // Note: members bVideoSignalTypePresent through uiColorMatrix below are also defined in SWelsSPS in parameter_sets.h.
+  bool      bVideoSignalTypePresent;  // false => do not write any of the following information to the header
+  unsigned char
+  uiVideoFormat;        // EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef
+  bool      bFullRange;         // false => analog video data range [16, 235]; true => full data range [0,255]
+  bool      bColorDescriptionPresent; // false => do not write any of the following three items to the header
+  unsigned char
+  uiColorPrimaries;     // EColorPrimaries; 8 bits in header; 0 - 9 => ???, bt709, undef, ???, bt470m, bt470bg,
+  //    smpte170m, smpte240m, film, bt2020
+  unsigned char
+  uiTransferCharacteristics;  // ETransferCharacteristics; 8 bits in header; 0 - 15 => ???, bt709, undef, ???, bt470m, bt470bg, smpte170m,
+  //   smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12
+  unsigned char
+  uiColorMatrix;        // EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709,
+  //   undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c
+
+  bool bAspectRatioPresent; ///< aspect ratio present in VUI
+  ESampleAspectRatio eAspectRatio; ///< aspect ratio idc
+  unsigned short sAspectRatioExtWidth; ///< use if aspect ratio idc == 255
+  unsigned short sAspectRatioExtHeight; ///< use if aspect ratio idc == 255
+
+} SSpatialLayerConfig;
+
+/**
+* @brief Encoder usage type
+*/
+typedef enum {
+  CAMERA_VIDEO_REAL_TIME,      ///< camera video for real-time communication
+  SCREEN_CONTENT_REAL_TIME,    ///< screen content signal
+  CAMERA_VIDEO_NON_REAL_TIME,
+  SCREEN_CONTENT_NON_REAL_TIME,
+  INPUT_CONTENT_TYPE_ALL,
+} EUsageType;
+
+/**
+* @brief Enumulate the complexity mode
+*/
+typedef enum {
+  LOW_COMPLEXITY = 0,              ///< the lowest compleixty,the fastest speed,
+  MEDIUM_COMPLEXITY,          ///< medium complexity, medium speed,medium quality
+  HIGH_COMPLEXITY             ///< high complexity, lowest speed, high quality
+} ECOMPLEXITY_MODE;
+
+/**
+ * @brief Enumulate for the stategy of SPS/PPS strategy
+ */
+typedef enum {
+  CONSTANT_ID = 0,           ///< constant id in SPS/PPS
+  INCREASING_ID = 0x01,      ///< SPS/PPS id increases at each IDR
+  SPS_LISTING  = 0x02,       ///< using SPS in the existing list if possible
+  SPS_LISTING_AND_PPS_INCREASING  = 0x03,
+  SPS_PPS_LISTING  = 0x06,
+} EParameterSetStrategy;
+
+// TODO:  Refine the parameters definition.
+/**
+* @brief SVC Encoding Parameters
+*/
+typedef struct TagEncParamBase {
+  EUsageType
+  iUsageType;                 ///< application type; please refer to the definition of EUsageType
+
+  int       iPicWidth;        ///< width of picture in luminance samples (the maximum of all layers if multiple spatial layers presents)
+  int       iPicHeight;       ///< height of picture in luminance samples((the maximum of all layers if multiple spatial layers presents)
+  int       iTargetBitrate;   ///< target bitrate desired, in unit of bps
+  RC_MODES  iRCMode;          ///< rate control mode
+  float     fMaxFrameRate;    ///< maximal input frame rate
+
+} SEncParamBase, *PEncParamBase;
+
+/**
+* @brief SVC Encoding Parameters extention
+*/
+typedef struct TagEncParamExt {
+  EUsageType
+  iUsageType;                          ///< same as in TagEncParamBase
+
+  int       iPicWidth;                 ///< same as in TagEncParamBase
+  int       iPicHeight;                ///< same as in TagEncParamBase
+  int       iTargetBitrate;            ///< same as in TagEncParamBase
+  RC_MODES  iRCMode;                   ///< same as in TagEncParamBase
+  float     fMaxFrameRate;             ///< same as in TagEncParamBase
+
+  int       iTemporalLayerNum;         ///< temporal layer number, max temporal layer = 4
+  int       iSpatialLayerNum;          ///< spatial layer number,1<= iSpatialLayerNum <= MAX_SPATIAL_LAYER_NUM, MAX_SPATIAL_LAYER_NUM = 4
+  SSpatialLayerConfig sSpatialLayers[MAX_SPATIAL_LAYER_NUM];
+
+  ECOMPLEXITY_MODE iComplexityMode;
+  unsigned int      uiIntraPeriod;     ///< period of Intra frame
+  int               iNumRefFrame;      ///< number of reference frame used
+  EParameterSetStrategy
+  eSpsPpsIdStrategy;       ///< different stategy in adjust ID in SPS/PPS: 0- constant ID, 1-additional ID, 6-mapping and additional
+  bool    bPrefixNalAddingCtrl;        ///< false:not use Prefix NAL; true: use Prefix NAL
+  bool    bEnableSSEI;                 ///< false:not use SSEI; true: use SSEI -- TODO: planning to remove the interface of SSEI
+  bool    bSimulcastAVC;               ///< (when encoding more than 1 spatial layer) false: use SVC syntax for higher layers; true: use Simulcast AVC
+  int     iPaddingFlag;                ///< 0:disable padding;1:padding
+  int     iEntropyCodingModeFlag;      ///< 0:CAVLC  1:CABAC.
+
+  /* rc control */
+  bool    bEnableFrameSkip;            ///< False: don't skip frame even if VBV buffer overflow.True: allow skipping frames to keep the bitrate within limits
+  int     iMaxBitrate;                 ///< the maximum bitrate, in unit of bps, set it to UNSPECIFIED_BIT_RATE if not needed
+  int     iMaxQp;                      ///< the maximum QP encoder supports
+  int     iMinQp;                      ///< the minmum QP encoder supports
+  unsigned int uiMaxNalSize;           ///< the maximum NAL size.  This value should be not 0 for dynamic slice mode
+
+  /*LTR settings*/
+  bool     bEnableLongTermReference;   ///< 1: on, 0: off
+  int      iLTRRefNum;                 ///< the number of LTR(long term reference),TODO: not supported to set it arbitrary yet
+  unsigned int      iLtrMarkPeriod;    ///< the LTR marked period that is used in feedback.
+  /* multi-thread settings*/
+  unsigned short
+  iMultipleThreadIdc;                  ///< 1 # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; lager than 1: count number of threads;
+  bool  bUseLoadBalancing; ///< only used when uiSliceMode=1 or 3, will change slicing of a picture during the run-time of multi-thread encoding, so the result of each run may be different
+
+  /* Deblocking loop filter */
+  int       iLoopFilterDisableIdc;     ///< 0: on, 1: off, 2: on except for slice boundaries
+  int       iLoopFilterAlphaC0Offset;  ///< AlphaOffset: valid range [-6, 6], default 0
+  int       iLoopFilterBetaOffset;     ///< BetaOffset: valid range [-6, 6], default 0
+  /*pre-processing feature*/
+  bool    bEnableDenoise;              ///< denoise control
+  bool    bEnableBackgroundDetection;  ///< background detection control //VAA_BACKGROUND_DETECTION //BGD cmd
+  bool    bEnableAdaptiveQuant;        ///< adaptive quantization control
+  bool    bEnableFrameCroppingFlag;    ///< enable frame cropping flag: TRUE always in application
+  bool    bEnableSceneChangeDetect;
+
+  bool    bIsLosslessLink;            ///<  LTR advanced setting
+} SEncParamExt;
+
+/**
+* @brief Define a new struct to show the property of video bitstream.
+*/
+typedef struct {
+  unsigned int          size;          ///< size of the struct
+  VIDEO_BITSTREAM_TYPE  eVideoBsType;  ///< video stream type (AVC/SVC)
+} SVideoProperty;
+
+/**
+* @brief SVC Decoding Parameters, reserved here and potential applicable in the future
+*/
+typedef struct TagSVCDecodingParam {
+  char*     pFileNameRestructed;       ///< file name of reconstructed frame used for PSNR calculation based debug
+
+  unsigned int  uiCpuLoad;             ///< CPU load
+  unsigned char uiTargetDqLayer;       ///< setting target dq layer id
+
+  ERROR_CON_IDC eEcActiveIdc;          ///< whether active error concealment feature in decoder
+  bool bParseOnly;                     ///< decoder for parse only, no reconstruction. When it is true, SPS/PPS size should not exceed SPS_PPS_BS_SIZE (128). Otherwise, it will return error info
+
+  SVideoProperty   sVideoProperty;    ///< video stream property
+} SDecodingParam, *PDecodingParam;
+
+/**
+* @brief Bitstream inforamtion of a layer being encoded
+*/
+typedef struct {
+  unsigned char uiTemporalId;
+  unsigned char uiSpatialId;
+  unsigned char uiQualityId;
+  EVideoFrameType eFrameType;
+  unsigned char uiLayerType;
+
+  /**
+   * The sub sequence layers are ordered hierarchically based on their dependency on each other so that any picture in a layer shall not be
+   * predicted from any picture on any higher layer.
+  */
+  int   iSubSeqId;                ///< refer to D.2.11 Sub-sequence information SEI message semantics
+  int   iNalCount;              ///< count number of NAL coded already
+  int*  pNalLengthInByte;       ///< length of NAL size in byte from 0 to iNalCount-1
+  unsigned char*  pBsBuf;       ///< buffer of bitstream contained
+} SLayerBSInfo, *PLayerBSInfo;
+
+/**
+* @brief Frame bit stream info
+*/
+typedef struct {
+  int           iLayerNum;
+  SLayerBSInfo  sLayerInfo[MAX_LAYER_NUM_OF_FRAME];
+
+  EVideoFrameType eFrameType;
+  int iFrameSizeInBytes;
+  long long uiTimeStamp;
+} SFrameBSInfo, *PFrameBSInfo;
+
+/**
+*  @brief Structure for source picture
+*/
+typedef struct Source_Picture_s {
+  int       iColorFormat;          ///< color space type
+  int       iStride[4];            ///< stride for each plane pData
+  unsigned char*  pData[4];        ///< plane pData
+  int       iPicWidth;             ///< luma picture width in x coordinate
+  int       iPicHeight;            ///< luma picture height in y coordinate
+  long long uiTimeStamp;           ///< timestamp of the source picture, unit: millisecond
+} SSourcePicture;
+/**
+* @brief Structure for bit rate info
+*/
+typedef struct TagBitrateInfo {
+  LAYER_NUM iLayer;
+  int iBitrate;                    ///< the maximum bitrate
+} SBitrateInfo;
+
+/**
+* @brief Structure for dump layer info
+*/
+typedef struct TagDumpLayer {
+  int iLayer;
+  char* pFileName;
+} SDumpLayer;
+
+/**
+* @brief Structure for profile info in layer
+*
+*/
+typedef struct TagProfileInfo {
+  int iLayer;
+  EProfileIdc uiProfileIdc;        ///< the profile info
+} SProfileInfo;
+
+/**
+* @brief  Structure for level info in layer
+*
+*/
+typedef struct TagLevelInfo {
+  int iLayer;
+  ELevelIdc uiLevelIdc;            ///< the level info
+} SLevelInfo;
+/**
+* @brief Structure for dilivery status
+*
+*/
+typedef struct TagDeliveryStatus {
+  bool bDeliveryFlag;              ///< 0: the previous frame isn't delivered,1: the previous frame is delivered
+  int iDropFrameType;              ///< the frame type that is dropped; reserved
+  int iDropFrameSize;              ///< the frame size that is dropped; reserved
+} SDeliveryStatus;
+
+/**
+* @brief The capability of decoder, for SDP negotiation
+*/
+typedef struct TagDecoderCapability {
+  int iProfileIdc;     ///< profile_idc
+  int iProfileIop;     ///< profile-iop
+  int iLevelIdc;       ///< level_idc
+  int iMaxMbps;        ///< max-mbps
+  int iMaxFs;          ///< max-fs
+  int iMaxCpb;         ///< max-cpb
+  int iMaxDpb;         ///< max-dpb
+  int iMaxBr;          ///< max-br
+  bool bRedPicCap;     ///< redundant-pic-cap
+} SDecoderCapability;
+
+/**
+* @brief Structure for parse only output
+*/
+typedef struct TagParserBsInfo {
+  int iNalNum;                                 ///< total NAL number in current AU
+  int* pNalLenInByte;  ///< each nal length
+  unsigned char* pDstBuff;                     ///< outputted dst buffer for parsed bitstream
+  int iSpsWidthInPixel;                        ///< required SPS width info
+  int iSpsHeightInPixel;                       ///< required SPS height info
+  unsigned long long uiInBsTimeStamp;               ///< input BS timestamp
+  unsigned long long uiOutBsTimeStamp;             ///< output BS timestamp
+} SParserBsInfo, *PParserBsInfo;
+
+/**
+* @brief Structure for encoder statistics
+*/
+typedef struct TagVideoEncoderStatistics {
+  unsigned int uiWidth;                        ///< the width of encoded frame
+  unsigned int uiHeight;                       ///< the height of encoded frame
+  //following standard, will be 16x aligned, if there are multiple spatial, this is of the highest
+  float fAverageFrameSpeedInMs;                ///< average_Encoding_Time
+
+  // rate control related
+  float fAverageFrameRate;                     ///< the average frame rate in, calculate since encoding starts, supposed that the input timestamp is in unit of ms
+  float fLatestFrameRate;                      ///< the frame rate in, in the last second, supposed that the input timestamp is in unit of ms (? useful for checking BR, but is it easy to calculate?
+  unsigned int uiBitRate;                      ///< sendrate in Bits per second, calculated within the set time-window
+  unsigned int uiAverageFrameQP;                    ///< the average QP of last encoded frame
+
+  unsigned int uiInputFrameCount;              ///< number of frames
+  unsigned int uiSkippedFrameCount;            ///< number of frames
+
+  unsigned int uiResolutionChangeTimes;        ///< uiResolutionChangeTimes
+  unsigned int uiIDRReqNum;                    ///< number of IDR requests
+  unsigned int uiIDRSentNum;                   ///< number of actual IDRs sent
+  unsigned int uiLTRSentNum;                   ///< number of LTR sent/marked
+
+  long long    iStatisticsTs;                  ///< Timestamp of updating the statistics
+
+  unsigned long iTotalEncodedBytes;
+  unsigned long iLastStatisticsBytes;
+  unsigned long iLastStatisticsFrameCount;
+} SEncoderStatistics;
+
+/**
+* @brief  Structure for decoder statistics
+*/
+typedef struct TagVideoDecoderStatistics {
+  unsigned int uiWidth;                        ///< the width of encode/decode frame
+  unsigned int uiHeight;                       ///< the height of encode/decode frame
+  float fAverageFrameSpeedInMs;                ///< average_Decoding_Time
+  float fActualAverageFrameSpeedInMs;          ///< actual average_Decoding_Time, including freezing pictures
+  unsigned int uiDecodedFrameCount;            ///< number of frames
+  unsigned int uiResolutionChangeTimes;        ///< uiResolutionChangeTimes
+  unsigned int uiIDRCorrectNum;                ///< number of correct IDR received
+  //EC on related
+  unsigned int
+  uiAvgEcRatio;                                ///< when EC is on, the average ratio of total EC areas, can be an indicator of reconstruction quality
+  unsigned int
+  uiAvgEcPropRatio;                            ///< when EC is on, the rough average ratio of propogate EC areas, can be an indicator of reconstruction quality
+  unsigned int uiEcIDRNum;                     ///< number of actual unintegrity IDR or not received but eced
+  unsigned int uiEcFrameNum;                   ///<
+  unsigned int uiIDRLostNum;                   ///< number of whole lost IDR
+  unsigned int
+  uiFreezingIDRNum;               ///< number of freezing IDR with error (partly received), under resolution change
+  unsigned int uiFreezingNonIDRNum;            ///< number of freezing non-IDR with error
+  int iAvgLumaQp;                              ///< average luma QP. default: -1, no correct frame outputted
+  int iSpsReportErrorNum;                      ///< number of Sps Invalid report
+  int iSubSpsReportErrorNum;                   ///< number of SubSps Invalid report
+  int iPpsReportErrorNum;                      ///< number of Pps Invalid report
+  int iSpsNoExistNalNum;                       ///< number of Sps NoExist Nal
+  int iSubSpsNoExistNalNum;                    ///< number of SubSps NoExist Nal
+  int iPpsNoExistNalNum;                       ///< number of Pps NoExist Nal
+
+  unsigned int uiProfile;                ///< Profile idc in syntax
+  unsigned int uiLevel;                  ///< level idc according to Annex A-1
+
+  int iCurrentActiveSpsId;                     ///< current active SPS id
+  int iCurrentActivePpsId;                     ///< current active PPS id
+
+  unsigned int iStatisticsLogInterval;                  ///< frame interval of statistics log
+} SDecoderStatistics; // in building, coming soon
+
+/**
+* @brief Structure for sample aspect ratio (SAR) info in VUI
+*/
+typedef struct TagVuiSarInfo {
+  unsigned int uiSarWidth;                     ///< SAR width
+  unsigned int uiSarHeight;                    ///< SAR height
+  bool bOverscanAppropriateFlag;               ///< SAR overscan flag
+} SVuiSarInfo, *PVuiSarInfo;
+
+#endif//WELS_VIDEO_CODEC_APPLICATION_DEFINITION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_def.h b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_def.h
new file mode 100644
index 0000000000..edde5f4a2e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_def.h
@@ -0,0 +1,216 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_VIDEO_CODEC_DEFINITION_H__
+#define WELS_VIDEO_CODEC_DEFINITION_H__
+
+/**
+  * @file  codec_def.h
+*/
+
+/**
+* @brief Enumerate the type of video format
+*/
+typedef enum {
+  videoFormatRGB        = 1,             ///< rgb color formats
+  videoFormatRGBA       = 2,
+  videoFormatRGB555     = 3,
+  videoFormatRGB565     = 4,
+  videoFormatBGR        = 5,
+  videoFormatBGRA       = 6,
+  videoFormatABGR       = 7,
+  videoFormatARGB       = 8,
+
+  videoFormatYUY2       = 20,            ///< yuv color formats
+  videoFormatYVYU       = 21,
+  videoFormatUYVY       = 22,
+  videoFormatI420       = 23,            ///< the same as IYUV
+  videoFormatYV12       = 24,
+  videoFormatInternal   = 25,            ///< only used in SVC decoder testbed
+
+  videoFormatNV12       = 26,            ///< new format for output by DXVA decoding
+
+  videoFormatVFlip      = 0x80000000
+} EVideoFormatType;
+
+/**
+* @brief Enumerate  video frame type
+*/
+typedef enum {
+  videoFrameTypeInvalid,    ///< encoder not ready or parameters are invalidate
+  videoFrameTypeIDR,        ///< IDR frame in H.264
+  videoFrameTypeI,          ///< I frame type
+  videoFrameTypeP,          ///< P frame type
+  videoFrameTypeSkip,       ///< skip the frame based encoder kernel
+  videoFrameTypeIPMixed     ///< a frame where I and P slices are mixing, not supported yet
+} EVideoFrameType;
+
+/**
+* @brief Enumerate  return type
+*/
+typedef enum {
+  cmResultSuccess,          ///< successful
+  cmInitParaError,          ///< parameters are invalid
+  cmUnknownReason,
+  cmMallocMemeError,        ///< malloc a memory error
+  cmInitExpected,           ///< initial action is expected
+  cmUnsupportedData
+} CM_RETURN;
+
+/**
+* @brief Enumulate the nal unit type
+*/
+enum ENalUnitType {
+  NAL_UNKNOWN     = 0,
+  NAL_SLICE       = 1,
+  NAL_SLICE_DPA   = 2,
+  NAL_SLICE_DPB   = 3,
+  NAL_SLICE_DPC   = 4,
+  NAL_SLICE_IDR   = 5,      ///< ref_idc != 0
+  NAL_SEI         = 6,      ///< ref_idc == 0
+  NAL_SPS         = 7,
+  NAL_PPS         = 8
+                    ///< ref_idc == 0 for 6,9,10,11,12
+};
+
+/**
+* @brief NRI: eNalRefIdc
+*/
+enum ENalPriority {
+  NAL_PRIORITY_DISPOSABLE = 0,
+  NAL_PRIORITY_LOW        = 1,
+  NAL_PRIORITY_HIGH       = 2,
+  NAL_PRIORITY_HIGHEST    = 3
+};
+
+#define IS_PARAMETER_SET_NAL(eNalRefIdc, eNalType) \
+( (eNalRefIdc == NAL_PRIORITY_HIGHEST) && (eNalType == (NAL_SPS|NAL_PPS) || eNalType == NAL_SPS) )
+
+#define IS_IDR_NAL(eNalRefIdc, eNalType) \
+( (eNalRefIdc == NAL_PRIORITY_HIGHEST) && (eNalType == NAL_SLICE_IDR) )
+
+#define FRAME_NUM_PARAM_SET     (-1)
+#define FRAME_NUM_IDR           0
+
+/**
+ * @brief eDeblockingIdc
+ */
+enum {
+  DEBLOCKING_IDC_0 = 0,
+  DEBLOCKING_IDC_1 = 1,
+  DEBLOCKING_IDC_2 = 2
+};
+#define DEBLOCKING_OFFSET (6)
+#define DEBLOCKING_OFFSET_MINUS (-6)
+
+/* Error Tools definition */
+typedef unsigned short ERR_TOOL;
+
+/**
+ @brief to do
+*/
+enum {
+  ET_NONE = 0x00,           ///< NONE Error Tools
+  ET_IP_SCALE = 0x01,       ///< IP Scalable
+  ET_FMO = 0x02,            ///< Flexible Macroblock Ordering
+  ET_IR_R1 = 0x04,          ///< Intra Refresh in predifined 2% MB
+  ET_IR_R2 = 0x08,          ///< Intra Refresh in predifined 5% MB
+  ET_IR_R3 = 0x10,          ///< Intra Refresh in predifined 10% MB
+  ET_FEC_HALF = 0x20,       ///< Forward Error Correction in 50% redundency mode
+  ET_FEC_FULL = 0x40,       ///< Forward Error Correction in 100% redundency mode
+  ET_RFS = 0x80             ///< Reference Frame Selection
+};
+
+/**
+* @brief Information of coded Slice(=NAL)(s)
+*/
+typedef struct SliceInformation {
+  unsigned char* pBufferOfSlices;    ///< base buffer of coded slice(s)
+  int            iCodedSliceCount;   ///< number of coded slices
+  unsigned int*  pLengthOfSlices;    ///< array of slices length accordingly by number of slice
+  int            iFecType;           ///< FEC type[0, 50%FEC, 100%FEC]
+  unsigned char  uiSliceIdx;         ///< index of slice in frame [FMO: 0,..,uiSliceCount-1; No FMO: 0]
+  unsigned char  uiSliceCount;       ///< count number of slice in frame [FMO: 2-8; No FMO: 1]
+  char           iFrameIndex;        ///< index of frame[-1, .., idr_interval-1]
+  unsigned char  uiNalRefIdc;        ///< NRI, priority level of slice(NAL)
+  unsigned char  uiNalType;          ///< NAL type
+  unsigned char
+  uiContainingFinalNal;              ///< whether final NAL is involved in buffer of coded slices, flag used in Pause feature in T27
+} SliceInfo, *PSliceInfo;
+
+/**
+* @brief thresholds of the initial, maximal and minimal rate
+*/
+typedef struct {
+  int   iWidth;                   ///< frame width
+  int   iHeight;                  ///< frame height
+  int   iThresholdOfInitRate;     ///< threshold of initial rate
+  int   iThresholdOfMaxRate;      ///< threshold of maximal rate
+  int   iThresholdOfMinRate;      ///< threshold of minimal rate
+  int   iMinThresholdFrameRate;   ///< min frame rate min
+  int   iSkipFrameRate;           ///< skip to frame rate min
+  int   iSkipFrameStep;           ///< how many frames to skip
+} SRateThresholds, *PRateThresholds;
+
+/**
+* @brief  Structure for decoder memery
+*/
+typedef struct TagSysMemBuffer {
+  int iWidth;                    ///< width of decoded pic for display
+  int iHeight;                   ///< height of decoded pic for display
+  int iFormat;                   ///< type is "EVideoFormatType"
+  int iStride[2];                ///< stride of 2 component
+} SSysMEMBuffer;
+
+/**
+* @brief  Buffer info
+*/
+typedef struct TagBufferInfo {
+  int iBufferStatus;             ///< 0: one frame data is not ready; 1: one frame data is ready
+  unsigned long long uiInBsTimeStamp;     ///< input BS timestamp
+  unsigned long long uiOutYuvTimeStamp;     ///< output YUV timestamp, when bufferstatus is 1
+  union {
+    SSysMEMBuffer sSystemBuffer; ///<  memory info for one picture
+  } UsrData;                     ///<  output buffer info
+  unsigned char* pDst[3];  //point to picture YUV data
+} SBufferInfo;
+
+
+/**
+* @brief In a GOP, multiple of the key frame number, derived from
+*        the number of layers(index or array below)
+*/
+static const char kiKeyNumMultiple[] = {
+  1, 1, 2, 4, 8, 16,
+};
+
+#endif//WELS_VIDEO_CODEC_DEFINITION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_ver.h b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_ver.h
new file mode 100644
index 0000000000..a4e494f6b0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/svc/codec_ver.h
@@ -0,0 +1,15 @@
+//The current file is auto-generated by script: generate_codec_ver.sh
+#ifndef CODEC_VER_H
+#define CODEC_VER_H
+
+#include "codec_app_def.h"
+
+static const OpenH264Version g_stCodecVersion  = {2, 1, 0, 2002};
+static const char* const g_strCodecVer  = "OpenH264 version:2.1.0.2002";
+
+#define OPENH264_MAJOR (2)
+#define OPENH264_MINOR (1)
+#define OPENH264_REVISION (0)
+#define OPENH264_RESERVED (2002)
+
+#endif  // CODEC_VER_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/api/svc/meson.build b/third-party/openh264/third_party/openh264/src/codec/api/svc/meson.build
new file mode 100644
index 0000000000..d1683fcaab
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/api/svc/meson.build
@@ -0,0 +1,13 @@
+headers = [
+  'codec_api.h',
+  'codec_app_def.h',
+  'codec_def.h',
+  'codec_ver.h',
+]
+
+foreach header : headers
+  api_headers += [[header, files(header)]]
+endforeach
+
+install_headers(headers,
+  subdir: 'wels')
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/.gitignore b/third-party/openh264/third_party/openh264/src/codec/build/android/.gitignore
new file mode 100644
index 0000000000..2c1dd5fcbc
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/.gitignore
@@ -0,0 +1,6 @@
+build.xml
+local.properties
+proguard-project.txt
+gen
+bin
+project.properties
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/AndroidManifest.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/AndroidManifest.xml
new file mode 100644
index 0000000000..84428273f3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.wels.dec"
+      android:versionCode="1"
+      android:versionName="1.0">
+<uses-sdk android:minSdkVersion="12"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+    <application android:label="@string/app_name">
+        <activity android:name=".WelsDecTest"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+
+</manifest> 
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Android.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Android.mk
new file mode 100644
index 0000000000..959de7c211
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Android.mk
@@ -0,0 +1,9 @@
+
+LOCAL_PATH := $(call my-dir)
+MY_LOCAL_PATH := $(LOCAL_PATH)
+
+# Step3
+#Generate the libwelsdecdemo.so file
+include $(LOCAL_PATH)/welsdecdemo.mk
+LOCAL_PATH := $(MY_LOCAL_PATH)
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Application.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Application.mk
new file mode 100644
index 0000000000..175295f48a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/Application.mk
@@ -0,0 +1,6 @@
+ifeq ($(NDK_TOOLCHAIN_VERSION), clang)
+APP_STL := c++_shared
+else
+APP_STL := stlport_shared
+endif
+APP_PLATFORM := android-12
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/myjni.cpp b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/myjni.cpp
new file mode 100644
index 0000000000..73edb6534c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/myjni.cpp
@@ -0,0 +1,24 @@
+#include <string.h>
+#include <stdlib.h>
+#include <jni.h>
+#include <android/log.h>
+
+#define LOG_TAG "welsdec"
+#define LOGI(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+
+extern int DecMain (int argc, char* argv[]);
+extern "C"
+JNIEXPORT void JNICALL Java_com_wels_dec_WelsDecTest_DoDecoderTest
+(JNIEnv* env, jobject thiz, jstring jsFileNameIn, jstring jsFileNameOut) {
+  /**************** Add the native codes/API *****************/
+  char* argv[3];
+  int  argc = 3;
+  argv[0] = (char*) ("decConsole.exe");
+  argv[1] = (char*) ((*env).GetStringUTFChars (jsFileNameIn, NULL));
+  argv[2] = (char*) ((*env).GetStringUTFChars (jsFileNameOut, NULL));
+  LOGI ("Start to run JNI module!+++");
+  DecMain (argc, argv);
+  LOGI ("End to run JNI module!+++");
+}
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/welsdecdemo.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/welsdecdemo.mk
new file mode 100644
index 0000000000..09f51e4b44
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/jni/welsdecdemo.mk
@@ -0,0 +1,47 @@
+# Generate the libwelsdecdemo.so file
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := wels
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
+ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
+include $(PREBUILT_SHARED_LIBRARY)
+endif
+
+
+
+include $(CLEAR_VARS)
+
+#
+# Module Settings
+#
+LOCAL_MODULE := welsdecdemo
+
+#
+# Source Files
+#
+CODEC_PATH := ../../../../
+CONSOLE_DEC_PATH := ../../../../console/dec
+CONSOLE_COMMON_PATH := ../../../../console/common
+LOCAL_SRC_FILES := \
+            $(CONSOLE_DEC_PATH)/src/h264dec.cpp \
+            $(CONSOLE_COMMON_PATH)/src/read_config.cpp \
+            $(CONSOLE_DEC_PATH)/src/d3d9_utils.cpp \
+            myjni.cpp
+#
+# Header Includes
+#
+LOCAL_C_INCLUDES := \
+            $(LOCAL_PATH)/../../../../api/svc \
+            $(LOCAL_PATH)/../../../../console/dec/inc \
+            $(LOCAL_PATH)/../../../../console/common/inc \
+            $(LOCAL_PATH)/../../../../common/inc
+#
+# Compile Flags and Link Libraries
+#
+LOCAL_CFLAGS := -DANDROID_NDK
+
+LOCAL_LDLIBS := -llog
+LOCAL_SHARED_LIBRARIES := wels
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/layout/main.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/layout/main.xml
new file mode 100644
index 0000000000..76326b16d6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/layout/main.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+	<LinearLayout
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal">
+	    <Button
+	        android:id="@+id/cfg"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:text="Load bitstreams" />
+	    <Button
+	        android:id="@+id/buttonSW"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:text="Test" />
+		</LinearLayout>
+</LinearLayout>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/values/strings.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/values/strings.xml
new file mode 100644
index 0000000000..f595682ca2
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">WelsDecoderTest</string>
+</resources>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
new file mode 100644
index 0000000000..f44c227419
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/dec/src/com/wels/dec/WelsDecTest.java
@@ -0,0 +1,151 @@
+package com.wels.dec;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Process;
+import android.util.Log;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import android.widget.Button;
+import android.widget.TextView;
+import java.io.*;
+import java.util.Vector;
+
+public class WelsDecTest extends Activity {
+  /** Called when the activity is first created. */
+  private OnClickListener OnClickEvent;
+  private Button mBtnLoad, mBtnStartSW;
+
+  final String   mStreamPath = "/sdcard/welsdec/";
+  Vector<String> mStreamFiles = new Vector<String>();
+
+  @Override
+  public void onCreate (Bundle savedInstanceState) {
+    super.onCreate (savedInstanceState);
+    final TextView  tv = new TextView (this);
+    System.out.println ("Here we go ...");
+    Log.i (TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+    setContentView (R.layout.main);
+
+    mBtnLoad = (Button)findViewById (R.id.cfg);
+    mBtnStartSW = (Button)findViewById (R.id.buttonSW);
+
+    OnClickEvent = new OnClickListener() {
+      public void onClick (View v) {
+        switch (v.getId()) {
+        case R.id.cfg: {
+          String cfgFile = mStreamPath + "BitStreams.txt";
+          try {
+            BufferedReader bufferedReader = new BufferedReader (new FileReader (cfgFile));
+            String text;
+            while ((text = bufferedReader.readLine()) != null) {
+              mStreamFiles.add (mStreamPath + text);
+              Log.i (TAG, mStreamPath + text);
+            }
+            bufferedReader.close();
+          } catch (IOException e) {
+            Log.e ("WELS_DEC", e.getMessage());
+          }
+        }
+        break;
+        case R.id.buttonSW: {
+          System.out.println ("decode sequence number = " + mStreamFiles.size());
+          Log.i ("WSE_DEC", "after click");
+          try {
+            for (int k = 0; k < mStreamFiles.size(); k++) {
+              String inFile =  mStreamFiles.get (k);
+              String outFile =  mStreamFiles.get (k) + ".yuv";
+              Log.i (TAG, "input file:" + inFile + "    output file:" + outFile);
+              DoDecoderTest (inFile, outFile);
+            }
+          } catch (Exception e) {
+            Log.e (TAG, e.getMessage());
+          }
+          mStreamFiles.clear();
+          tv.setText ("Decoder is completed!");
+        }
+        break;
+        }
+      }
+    };
+
+    mBtnLoad.setOnClickListener (OnClickEvent);
+    mBtnStartSW.setOnClickListener (OnClickEvent);
+
+    System.out.println ("Done!");
+    //if you want to run the demo manually, just comment following 2 lines
+    runAutoDec();
+  }
+  public void runAutoDec() {
+    Thread thread = new Thread() {
+
+      public void run() {
+        Log.i (TAG, "decoder performance test begin");
+
+        File bitstreams = new File (mStreamPath);
+        String[] list = bitstreams.list();
+        if (list == null || list.length == 0) {
+          Log.i (TAG, "have not find any coder resourse");
+          finish();
+        }
+        for (int i = 0; i < list.length; i++) {
+
+          String inFile = list[i];
+          inFile = mStreamPath + inFile;
+          String outFile = inFile + ".yuv";
+          DoDecoderTest (inFile, outFile);
+
+
+        }
+        Log.i (TAG, "decoder performance test finish");
+        finish();
+      }
+
+    };
+    thread.start();
+
+  }
+
+  @Override
+  public void onStart() {
+    Log.i ("WSE_DEC", "welsdecdemo onStart");
+    super.onStart();
+  }
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+
+    Log.i (TAG, "OnDestroy");
+
+    Process.killProcess (Process.myPid());
+
+  }
+
+  @Override
+  public boolean onKeyDown (int keyCode, KeyEvent event) {
+    switch (keyCode) {
+    case KeyEvent.KEYCODE_BACK:
+      return true;
+    default:
+      return super.onKeyDown (keyCode, event);
+    }
+  }
+
+  public native void  DoDecoderTest (String infilename, String outfilename);
+  private static final String TAG = "welsdec";
+  static {
+    try {
+      System.loadLibrary ("openh264");
+      System.loadLibrary ("stlport_shared");
+      System.loadLibrary ("welsdecdemo");
+      Log.v (TAG, "Load libwelsdec successful");
+    } catch (Exception e) {
+      Log.e (TAG, "Failed to load welsdec" + e.getMessage());
+    }
+  }
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/AndroidManifest.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/AndroidManifest.xml
new file mode 100644
index 0000000000..19e4253de5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.wels.enc"
+      android:versionCode="1"
+      android:versionName="1.0">
+<uses-sdk android:minSdkVersion="12"/>
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
+    <application android:label="@string/app_name">
+        <activity android:name=".WelsEncTest"
+                  android:label="@string/app_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+
+
+</manifest> 
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Android.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Android.mk
new file mode 100644
index 0000000000..a5742e2c7b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Android.mk
@@ -0,0 +1,9 @@
+
+LOCAL_PATH := $(call my-dir)
+MY_LOCAL_PATH := $(LOCAL_PATH)
+
+# Step3
+#Generate the libwelsdecdemo.so file
+include $(LOCAL_PATH)/welsencdemo.mk
+LOCAL_PATH := $(MY_LOCAL_PATH)
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Application.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Application.mk
new file mode 100644
index 0000000000..175295f48a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/Application.mk
@@ -0,0 +1,6 @@
+ifeq ($(NDK_TOOLCHAIN_VERSION), clang)
+APP_STL := c++_shared
+else
+APP_STL := stlport_shared
+endif
+APP_PLATFORM := android-12
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/myjni.cpp b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/myjni.cpp
new file mode 100644
index 0000000000..25d57549c3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/myjni.cpp
@@ -0,0 +1,45 @@
+#include <string.h>
+#include <stdlib.h>
+#include <jni.h>
+#include <android/log.h>
+
+#define LOG_TAG "welsdec"
+#define LOGI(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+
+extern "C" int EncMain (int argc, char* argv[]);
+extern "C"
+JNIEXPORT void JNICALL Java_com_wels_enc_WelsEncTest_DoEncoderAutoTest
+(JNIEnv* env, jobject thiz, jstring jsIncfgName, jstring jsInlayerName, jstring jsInyuvName, jstring jsOutbitName) {
+  /**************** Add the native codes/API *****************/
+  const char* argv[] = {
+    (char*) ("encConsole.exe"),
+    (char*) ((*env).GetStringUTFChars (jsIncfgName, NULL)),
+    (char*) ("-org"),
+    (char*) ((*env).GetStringUTFChars (jsInyuvName, NULL)),
+    (char*) ("-bf"),
+    (char*) ((*env).GetStringUTFChars (jsOutbitName, NULL)),
+    (char*) ("-numl"),
+    (char*) ("1"),
+    (char*) ("-lconfig"),
+    (char*) ("0"),
+    (char*) ((*env).GetStringUTFChars (jsInlayerName, NULL))
+  };
+  LOGI ("Start to run JNI module!+++");
+  EncMain (sizeof (argv) / sizeof (argv[0]), (char**)&argv[0]);
+  LOGI ("End to run JNI module!+++");
+}
+
+JNIEXPORT void JNICALL Java_com_wels_enc_WelsEncTest_DoEncoderTest
+(JNIEnv* env, jobject thiz, jstring jsFileNameIn) {
+  /**************** Add the native codes/API *****************/
+  char* argv[2];
+  int  argc = 2;
+  argv[0] = (char*) ("encConsole.exe");
+  argv[1] = (char*) ((*env).GetStringUTFChars (jsFileNameIn, NULL));
+  LOGI ("Start to run JNI module!+++");
+  EncMain (argc, argv);
+  LOGI ("End to run JNI module!+++");
+
+}
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/welsencdemo.mk b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/welsencdemo.mk
new file mode 100644
index 0000000000..72549aa6a2
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/jni/welsencdemo.mk
@@ -0,0 +1,51 @@
+# Generate the libwelsencdemo.so file
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := wels
+LOCAL_SRC_FILES := ../../../../../libopenh264.so
+ifneq (,$(wildcard $(LOCAL_PATH)/$(LOCAL_SRC_FILES)))
+include $(PREBUILT_SHARED_LIBRARY)
+endif
+
+
+
+include $(CLEAR_VARS)
+
+#
+# Module Settings
+#
+LOCAL_MODULE := welsencdemo
+
+#
+# Source Files
+#
+CODEC_PATH := ../../../../
+CONSOLE_ENC_PATH := ../../../../console/enc
+CONSOLE_COMMON_PATH := ../../../../console/common
+LOCAL_SRC_FILES := \
+            $(CONSOLE_ENC_PATH)/src/welsenc.cpp \
+            $(CONSOLE_COMMON_PATH)/src/read_config.cpp \
+            myjni.cpp
+
+#
+# Header Includes
+#
+LOCAL_C_INCLUDES := \
+            $(LOCAL_PATH)/../../../../api/svc \
+            $(LOCAL_PATH)/../../../../console/enc/inc \
+            $(LOCAL_PATH)/../../../../console/common/inc \
+            $(LOCAL_PATH)/../../../../encoder/core/inc \
+            $(LOCAL_PATH)/../../../../processing/interface \
+            $(LOCAL_PATH)/../../../../common/inc
+
+
+#
+# Compile Flags and Link Libraries
+#
+LOCAL_CFLAGS := -DANDROID_NDK
+
+LOCAL_LDLIBS := -llog
+LOCAL_SHARED_LIBRARIES := wels
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/layout/main.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/layout/main.xml
new file mode 100644
index 0000000000..76326b16d6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/layout/main.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+	<LinearLayout
+	    android:layout_width="wrap_content"
+	    android:layout_height="wrap_content"
+	    android:orientation="horizontal">
+	    <Button
+	        android:id="@+id/cfg"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:text="Load bitstreams" />
+	    <Button
+	        android:id="@+id/buttonSW"
+	        android:layout_width="wrap_content"
+	        android:layout_height="wrap_content"
+	        android:text="Test" />
+		</LinearLayout>
+</LinearLayout>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/values/strings.xml b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/values/strings.xml
new file mode 100644
index 0000000000..2be266b62c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">WelsEncoderTest</string>
+</resources>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
new file mode 100644
index 0000000000..19b784242b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/android/enc/src/com/wels/enc/WelsEncTest.java
@@ -0,0 +1,173 @@
+package com.wels.enc;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.Process;
+import android.util.Log;
+
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+
+import android.widget.Button;
+import android.widget.TextView;
+import java.io.*;
+import java.util.Vector;
+
+public class WelsEncTest extends Activity {
+  /** Called when the activity is first created. */
+  private OnClickListener OnClickEvent;
+  private Button mBtnLoad, mBtnStartSW;
+
+  final String   mStreamPath = "/sdcard/welsenc/";
+  Vector<String> mCfgFiles = new Vector<String>();
+
+  @Override
+  public void onCreate (Bundle savedInstanceState) {
+    super.onCreate (savedInstanceState);
+    final TextView  tv = new TextView (this);
+    System.out.println ("Here we go ...");
+    Log.i (TAG, "sdcard path:" + Environment.getExternalStorageDirectory().getAbsolutePath());
+    setContentView (R.layout.main);
+
+    mBtnLoad = (Button)findViewById (R.id.cfg);
+    mBtnStartSW = (Button)findViewById (R.id.buttonSW);
+
+
+    OnClickEvent = new OnClickListener() {
+      public void onClick (View v) {
+        switch (v.getId()) {
+        case R.id.cfg: {
+          String cfgFile = mStreamPath + "cfgs.txt";
+          try {
+            BufferedReader bufferedReader = new BufferedReader (new FileReader (cfgFile));
+            String text;
+            while ((text = bufferedReader.readLine()) != null) {
+              mCfgFiles.add (mStreamPath + text);
+              Log.i (TAG, mStreamPath + text);
+            }
+            bufferedReader.close();
+          } catch (IOException e) {
+            Log.e (TAG, e.getMessage());
+          }
+        }
+        break;
+        case R.id.buttonSW: {
+          System.out.println ("encode sequence number = " + mCfgFiles.size());
+          Log.i (TAG, "after click");
+          try {
+            for (int k = 0; k < mCfgFiles.size(); k++) {
+              String cfgFile =  mCfgFiles.get (k);
+              DoEncoderTest (cfgFile);
+            }
+          } catch (Exception e) {
+            Log.e (TAG, e.getMessage());
+          }
+          mCfgFiles.clear();
+          tv.setText ("Encoder is completed!");
+        }
+        break;
+        }
+      }
+    };
+
+    mBtnLoad.setOnClickListener (OnClickEvent);
+    mBtnStartSW.setOnClickListener (OnClickEvent);
+
+    System.out.println ("Done!");
+    //run the test automatically,if you not want to autotest, just comment this line
+    runAutoEnc();
+  }
+
+  public void runAutoEnc() {
+    Thread thread = new Thread() {
+
+      public void run() {
+        Log.i (TAG, "encoder performance test begin");
+        String inYuvfile = null, outBitfile = null, inOrgfile = null, inLayerfile = null;
+        File encCase = new File (mStreamPath);
+        String[] caseNum = encCase.list();
+        if (caseNum == null || caseNum.length == 0) {
+          Log.i (TAG, "have not find any encoder resourse");
+          finish();
+        }
+
+        for (int i = 0; i < caseNum.length; i++) {
+          String[] yuvName = null;
+          File yuvPath = null;
+          File encCaseNo = new File (mStreamPath + caseNum[i]);
+          String[] encFile = encCaseNo.list();
+
+          for (int k = 0; k < encFile.length; k++) {
+            if (encFile[k].compareToIgnoreCase ("welsenc.cfg") == 0)
+
+              inOrgfile = encCaseNo + File.separator + encFile[k];
+
+            else if (encFile[k].compareToIgnoreCase ("layer2.cfg") == 0)
+              inLayerfile = encCaseNo + File.separator + encFile[k];
+            else if (encFile[k].compareToIgnoreCase ("yuv") == 0) {
+              yuvPath = new File (encCaseNo + File.separator + encFile[k]);
+              yuvName = yuvPath.list();
+            }
+          }
+          for (int m = 0; m < yuvName.length; m++) {
+            inYuvfile = yuvPath + File.separator + yuvName[m];
+            outBitfile = inYuvfile + ".264";
+            Log.i (TAG, "enc yuv file:" + yuvName[m]);
+            DoEncoderAutoTest (inOrgfile, inLayerfile, inYuvfile, outBitfile);
+          }
+        }
+
+        Log.i (TAG, "encoder performance test finish");
+        finish();
+      }
+
+    };
+    thread.start();
+
+  }
+
+  @Override
+  public void onStart() {
+    Log.i (TAG, "welsencdemo onStart");
+    super.onStart();
+  }
+
+  @Override
+  public void onDestroy() {
+    super.onDestroy();
+
+    Log.i (TAG, "OnDestroy");
+
+    Process.killProcess (Process.myPid());
+
+  }
+
+  @Override
+  public boolean onKeyDown (int keyCode, KeyEvent event) {
+    switch (keyCode) {
+    case KeyEvent.KEYCODE_BACK:
+      return true;
+    default:
+      return super.onKeyDown (keyCode, event);
+    }
+  }
+
+  public native void  DoEncoderTest (String cfgFileName);
+  public native void  DoEncoderAutoTest (String cfgFileName, String layerFileName, String yuvFileName,
+                                         String outBitsName);
+  private static final String TAG = "welsenc";
+  static {
+    try {
+      System.loadLibrary ("openh264");
+      System.loadLibrary ("stlport_shared");
+      System.loadLibrary ("welsencdemo");
+      Log.v (TAG, "Load libwelsencdemo.so successful");
+    } catch (Exception e) {
+      Log.e (TAG, "Failed to load welsenc" + e.getMessage());
+    }
+  }
+
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/generate_codec_ver.sh b/third-party/openh264/third_party/openh264/src/codec/build/generate_codec_ver.sh
new file mode 100755
index 0000000000..63f88b54a5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/generate_codec_ver.sh
@@ -0,0 +1,62 @@
+# Run this to update the codec_ver.h at changes of api
+
+#!/bin/sh
+#
+
+if [ "$1"x = ""x ]; then
+        echo "Please input the version number as: major_ver.minor_ver.patch.reserve"
+        exit 127
+fi
+
+codec_ver=`echo "$1" | egrep  "^([0-9]+[.]){3}[0-9]+$"`
+
+if [ $? -ne 0 ]; then
+        echo "Please input the version number as: major_ver.minor_ver.patch.reserve"
+        exit 127
+fi
+
+revision=`git show | head -n 1`
+revision=`echo $revision|cut -d' ' -f2|sed -e 's#[ ]*\(.*\)[ ]*#\1#'`
+revision=${revision:0:7}
+
+echo "//The current file is auto-generated by script: generate_codec_ver.sh" >>codec_ver.h
+echo "#ifndef CODEC_VER_H" >>codec_ver.h
+echo "#define CODEC_VER_H" >>codec_ver.h
+echo "" >>codec_ver.h
+
+echo "#include \"codec_app_def.h\"" >>codec_ver.h
+echo "" >>codec_ver.h
+
+fullver="$1"
+major="${1%%.*}"
+tmp=${1#*.}
+minor="${tmp%%.*}"
+tmp=${tmp#*.}
+revnr="${tmp%%.*}"
+tmp=${tmp#*.}
+resnr="${tmp%%.*}"
+
+echo "static const OpenH264Version g_stCodecVersion  = {$major, $minor, $revnr, $resnr};" >>codec_ver.h
+echo "static const char* const g_strCodecVer  = \"OpenH264 version:$fullver\";" >>codec_ver.h
+#if [ "$2"x = ""x ]; then
+#echo "static const char* const g_strCodecBuildNum = \"OpenH264 revision:$revision\";" >> codec_ver.h
+#else
+#echo "static const char* const g_strCodecBuildNum = \"OpenH264 build:$2, OpenH264 revision:$revision\";" >> codec_ver.h
+#fi
+echo "" >>codec_ver.h
+
+#define OPENH264_MAJOR 1, #define OPENH264_MINOR 2 #define OPENH264_REVISION 3 #define OPENH264_RESERVED 0
+echo "#define OPENH264_MAJOR ($major)" >>codec_ver.h
+echo "#define OPENH264_MINOR ($minor)" >>codec_ver.h
+echo "#define OPENH264_REVISION ($revnr)" >>codec_ver.h
+echo "#define OPENH264_RESERVED ($resnr)" >>codec_ver.h
+echo "" >>codec_ver.h
+
+echo "#endif  // CODEC_VER_H" >>codec_ver.h
+
+mv -f codec_ver.h ../api/svc/codec_ver.h
+
+# Ignore non-utf8 chars in the input
+export LC_ALL=C
+cat ../../openh264.rc.template | sed "s/\$MAJOR/$major/g" | sed "s/\$MINOR/$minor/g" | sed "s/\$REVISION/$revnr/g" | sed "s/\$RESERVED/$resnr/g" > openh264.rc.tmp
+mv openh264.rc.tmp ../../openh264.rc
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/.gitignore b/third-party/openh264/third_party/openh264/src/codec/build/iOS/.gitignore
new file mode 100644
index 0000000000..16a3b15b38
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/.gitignore
@@ -0,0 +1,3 @@
+project.xcworkspace
+xcuserdata
+.DS_Store
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.h b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.h
new file mode 100644
index 0000000000..fa99e2a66a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.h
@@ -0,0 +1,39 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface DEMOAppDelegate : UIResponder <UIApplicationDelegate>
+
+  @property (strong, nonatomic) UIWindow* window;
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.m
new file mode 100644
index 0000000000..65db82869f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOAppDelegate.m
@@ -0,0 +1,68 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import "DEMOAppDelegate.h"
+
+@implementation DEMOAppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    //Override point for customization after application launch.
+    return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+    //Sent when the application is about to move from active to inactive state.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+    //Used to store application state information.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+    //Called as part of the transition from the background to the inactive state.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+    //Restart any tasks that were paused while the application was inactive.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+    //Called when the application is about to terminate.
+}
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.h b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.h
new file mode 100644
index 0000000000..63574c2598
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.h
@@ -0,0 +1,48 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface DEMOViewController : UIViewController {
+  BOOL bEnableFlag;
+}
+@property (strong, nonatomic) NSMutableArray* resFileArray;
+@property (retain, nonatomic)UIAlertView* statusIndication;
+@property (assign, nonatomic) NSUInteger selectedRow;
+
+- (IBAction)startDecoderAll: (id)sender;
+- (IBAction)startDecoderOne: (id)sender;
+@property (weak, nonatomic) IBOutlet UITextField* currentSelectedFileTF;
+
+//unwind segue
+- (IBAction)unwindSegueForShowResourceViewController: (UIStoryboardSegue*)segue;
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.m
new file mode 100644
index 0000000000..cc66534a4b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewController.m
@@ -0,0 +1,187 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#define ENDLESS_LOOP   //define to do the performance testing
+#define NO_OUTPUT_MODE //define to disable the output yuv file
+
+extern int DecMain(int argc, char * argv[]);
+
+#import "DEMOViewController.h"
+#import "DEMOViewControllerShowResource.h"
+
+@interface DEMOViewController ()
+
+@end
+
+@implementation DEMOViewController
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    // Do any additional setup after loading the view, typically from a nib.
+    //Add the testing codes
+    self.resFileArray = [[NSMutableArray alloc] init];
+    self.selectedRow = 0;
+    [self updateResourceArray];
+    //Init the status indication window
+    _statusIndication = [[UIAlertView alloc] initWithTitle: @"Decoding" message: @"Waiting the decoding" delegate: self cancelButtonTitle: @"Cancel" otherButtonTitles: nil];
+    if  ([self.resFileArray count] > self.selectedRow)
+        self.currentSelectedFileTF.text = [[self.resFileArray objectAtIndex:self.selectedRow] lastPathComponent];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (IBAction)startDecoderAll:(id)sender {
+    bEnableFlag = YES;
+    [_statusIndication show];
+    [NSThread detachNewThreadSelector:@selector(processDecoderAll) toTarget:self withObject:nil];
+}
+
+- (IBAction)startDecoderOne:(id)sender {
+    bEnableFlag = YES;
+    [_statusIndication show];
+    [NSThread detachNewThreadSelector:@selector(processDecoderOne) toTarget:self withObject:nil];
+}
+- (void)processDecoderAll
+{
+    [self updateResourceArray];
+    if (YES == [self DoDecoderAll]) {
+            [self performSelectorOnMainThread:@selector(showAlertWnd) withObject:nil waitUntilDone:NO];
+    }
+}
+- (void)processDecoderOne
+{
+    if (YES == [self DoDecoderOne:self.selectedRow]) {
+        [self performSelectorOnMainThread:@selector(showAlertWnd) withObject:nil waitUntilDone:NO];
+    }
+}
+
+- (void)showAlertWnd
+{
+    [_statusIndication dismissWithClickedButtonIndex:0 animated:(BOOL)YES];
+    [self showAlertWindowTitle:@"Successful" message: @"Decode is successful!"];
+}
+
+-(void)showAlertWindowTitle:(NSString*)title message:(NSString*)message
+{
+    UIAlertView *someError = [[UIAlertView alloc] initWithTitle: title message: message delegate: self cancelButtonTitle: @"Ok" otherButtonTitles: nil];
+    [someError show];
+}
+
+//Delegate for alertView
+- (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex
+{
+    if (_statusIndication == alertView) {
+        bEnableFlag = NO;
+    }
+}
+
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender
+{
+    if ([segue.identifier isEqualToString:@"segueShowResource"]) {
+        [self updateResourceArray];
+        UINavigationController *navigationController = [segue destinationViewController];
+        DEMOViewControllerShowResource *ViewControllerShowResource = (DEMOViewControllerShowResource *)[navigationController topViewController];
+        ViewControllerShowResource.resFileArray = self.resFileArray;
+    }
+}
+
+//unwind segue
+- (void)unwindSegueForShowResourceViewController:(UIStoryboardSegue *)segue
+{
+    DEMOViewControllerShowResource *ViewControllerShowResource = [segue sourceViewController];
+    self.selectedRow = ViewControllerShowResource.selectedRow;
+    if  ([self.resFileArray count] > self.selectedRow)
+        self.currentSelectedFileTF.text = [[self.resFileArray objectAtIndex:self.selectedRow] lastPathComponent];
+}
+
+//**************************************************************************/
+// Following codes is for demo testing input
+//**************************************************************************/
+- (BOOL) DoDecoderAll
+{
+    BOOL bResult;
+    for (NSUInteger index=0; index<[self.resFileArray count]; index++) {
+        if ((bResult = [self DoDecoderOne:index]) == NO) {
+            return NO;
+        }
+    }
+    return YES;
+}
+- (BOOL) DoDecoderOne:(NSUInteger)index
+{
+    char *argv[3];//0 for exe name, 1 for resource input, 2 for output yuvfile
+    int  argc = 3;
+    NSString *fileName = [[self.resFileArray objectAtIndex:index] lastPathComponent];
+    NSString *outputFileName = [[fileName stringByDeletingPathExtension] stringByAppendingPathExtension:@"yuv"];
+    NSString *outputFilePath = [[[self.resFileArray objectAtIndex:index] stringByDeletingLastPathComponent] stringByAppendingPathComponent:outputFileName];
+    argv[0] = (char *)("decConsole.exe");
+    argv[1] = (char *)[[self.resFileArray objectAtIndex:index] UTF8String]; //input resouce file path
+    argv[2] = (char *)[outputFilePath UTF8String]; //output file path
+    if (bEnableFlag == NO) {
+        return NO;
+    }
+    DecMain(argc, argv);
+    return YES;
+}
+
+- (void) updateResourceArray
+{
+    //Clear the resource array
+    if ([self.resFileArray count] > 0) {
+        [self.resFileArray removeAllObjects];
+    }
+    //get the sharing folder path
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *sharingFolderPath = [paths objectAtIndex:0];
+    //enumerate the h.264 files at sharing folder
+    NSFileManager *fileManager = [NSFileManager defaultManager];
+
+    NSError *error;
+    NSArray * directoryContents = [fileManager contentsOfDirectoryAtPath:sharingFolderPath error:&error];
+    for (NSUInteger index=0; index < [directoryContents count]; index++) {
+        NSString *fileName = [directoryContents objectAtIndex:index];
+        if (([fileName hasSuffix:@"264"] == YES) ||
+            ([fileName hasSuffix:@"h264"] == YES)||
+            ([fileName hasSuffix:@"H264"] == YES))
+        {
+            [self.resFileArray addObject:[sharingFolderPath stringByAppendingPathComponent:fileName]];
+        }
+    }
+}
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.h b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.h
new file mode 100644
index 0000000000..8e5952a4a4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.h
@@ -0,0 +1,38 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface DEMOViewControllerShowResource : UITableViewController
+  @property (strong, nonatomic) NSMutableArray* resFileArray;
+@property (assign, nonatomic) NSUInteger selectedRow;
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.m
new file mode 100644
index 0000000000..27bafce648
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/DEMOViewControllerShowResource.m
@@ -0,0 +1,93 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import "DEMOViewControllerShowResource.h"
+
+@interface DEMOViewControllerShowResource ()
+
+@end
+
+@implementation DEMOViewControllerShowResource
+
+- (id)initWithStyle:(UITableViewStyle)style
+{
+    self = [super initWithStyle:style];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    // Return the number of sections.
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    // Return the number of rows in the section.
+    return [self.resFileArray count];
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *CellIdentifier = @"resourcesListCell";
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier forIndexPath:indexPath];
+    // Configure the cell...
+    cell.textLabel.text = [[self.resFileArray objectAtIndex:indexPath.row] lastPathComponent];
+    return cell;
+}
+
+
+#pragma mark - Table view delegate
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    // Navigation logic may go here. Create and push another view controller.
+    self.selectedRow = indexPath.row;
+}
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default-568h@2x.png b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default-568h@2x.png
new file mode 100644
index 0000000000..0891b7aabf
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default-568h@2x.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default.png b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default.png
new file mode 100644
index 0000000000..4c8ca6f693
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default@2x.png b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default@2x.png
new file mode 100644
index 0000000000..35b84cffeb
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/Default@2x.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/demo-Info.plist b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/demo-Info.plist
new file mode 100644
index 0000000000..31bb6288f2
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/demo-Info.plist
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>hf.cisco.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>UIFileSharingEnabled</key>
+	<true/>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIMainStoryboardFile</key>
+	<string>MainStoryboard_iPhone</string>
+	<key>UIMainStoryboardFile~ipad</key>
+	<string>MainStoryboard_iPad</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/InfoPlist.strings b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/InfoPlist.strings
new file mode 100644
index 0000000000..477b28ff8f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPad.storyboard b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPad.storyboard
new file mode 100644
index 0000000000..b67609da43
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPad.storyboard
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4510" systemVersion="13A524d" targetRuntime="iOS.CocoaTouch.iPad" variant="6xAndEarlier" propertyAccessControl="none" useAutolayout="YES" initialViewController="yXx-eU-91T">
+    <dependencies>
+        <deployment defaultVersion="1552" identifier="iOS"/>
+        <development version="4600" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="jPS-ri-o6p">
+            <objects>
+                <viewController id="yXx-eU-91T" customClass="DEMOViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="hbu-fP-oM5">
+                        <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hYB-j2-40C">
+                                <rect key="frame" x="183" y="420" width="108" height="33"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Decoder All">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="startDecoderAll:" destination="yXx-eU-91T" eventType="touchUpInside" id="3MS-Cf-Adc"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2wb-SI-4H1">
+                                <rect key="frame" x="183" y="345" width="108" height="33"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="108" id="2v6-gF-smR"/>
+                                    <constraint firstAttribute="height" constant="32" id="eJ4-hy-WrG"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Select File">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <segue destination="8C7-cK-gmI" kind="modal" identifier="segueShowResource" id="hQX-Cl-38d"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="TYm-NZ-PYc">
+                                <rect key="frame" x="299" y="345" width="108" height="33"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Decoder">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="startDecoderOne:" destination="yXx-eU-91T" eventType="touchUpInside" id="QTx-lm-dBt"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="File:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MKn-UR-WQ1">
+                                <rect key="frame" x="183" y="283" width="32" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6we-jx-Qq3">
+                                <rect key="frame" x="223" y="274" width="323" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="323" id="4v5-6h-G72"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="width" secondItem="hYB-j2-40C" secondAttribute="width" type="user" id="6XQ-FA-Gxw"/>
+                            <constraint firstItem="6we-jx-Qq3" firstAttribute="leading" secondItem="MKn-UR-WQ1" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="A8k-85-yfT"/>
+                            <constraint firstItem="TYm-NZ-PYc" firstAttribute="baseline" secondItem="2wb-SI-4H1" secondAttribute="baseline" type="default" id="By0-sg-TgF"/>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="leading" secondItem="MKn-UR-WQ1" secondAttribute="leading" type="default" id="EOt-Ub-ktw"/>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="height" secondItem="TYm-NZ-PYc" secondAttribute="height" type="user" id="FEa-hl-Nkb"/>
+                            <constraint firstItem="6we-jx-Qq3" firstAttribute="centerX" secondItem="hbu-fP-oM5" secondAttribute="centerX" type="default" id="Kiw-Sc-FdU"/>
+                            <constraint firstItem="MKn-UR-WQ1" firstAttribute="bottom" secondItem="6we-jx-Qq3" secondAttribute="bottom" type="default" id="Lcn-Qu-3kM"/>
+                            <constraint firstItem="TYm-NZ-PYc" firstAttribute="leading" secondItem="2wb-SI-4H1" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="QIU-v5-1LW"/>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="height" secondItem="hYB-j2-40C" secondAttribute="height" type="user" id="QKo-Ly-odJ"/>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="width" secondItem="TYm-NZ-PYc" secondAttribute="width" type="user" id="ZsI-jv-vxw"/>
+                            <constraint firstItem="hYB-j2-40C" firstAttribute="leading" secondItem="2wb-SI-4H1" secondAttribute="leading" type="default" id="paU-W4-QEQ"/>
+                            <constraint firstItem="6we-jx-Qq3" firstAttribute="top" secondItem="hbu-fP-oM5" secondAttribute="top" constant="274" id="swb-OF-reU"/>
+                            <constraint firstItem="2wb-SI-4H1" firstAttribute="top" secondItem="hbu-fP-oM5" secondAttribute="top" constant="345" id="ty2-u6-bWv"/>
+                            <constraint firstItem="hYB-j2-40C" firstAttribute="top" secondItem="hbu-fP-oM5" secondAttribute="top" constant="420" id="zeL-FT-4Zf"/>
+                        </constraints>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics"/>
+                    <connections>
+                        <outlet property="currentSelectedFileTF" destination="6we-jx-Qq3" id="kXv-Fm-gM8"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ev2-Bg-nkw" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-885" y="74"/>
+        </scene>
+        <!--View Controller Show Resource - Resource List-->
+        <scene sceneID="0YF-PF-BUj">
+            <objects>
+                <tableViewController id="aiM-V0-4K8" customClass="DEMOViewControllerShowResource" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="wwS-SO-V2c">
+                        <rect key="frame" x="0.0" y="64" width="768" height="960"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="resourcesListCell" id="tKV-R7-KlD">
+                                <rect key="frame" x="0.0" y="22" width="768" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="768" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Resource List" id="nUp-VX-3WO">
+                        <barButtonItem key="leftBarButtonItem" title="Back" id="vnO-PI-39R">
+                            <connections>
+                                <segue destination="igZ-GB-DHn" kind="unwind" unwindAction="unwindSegueForShowResourceViewController:" id="PBk-bM-n1O"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ikd-br-I9X" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <exit id="igZ-GB-DHn" userLabel="Exit" sceneMemberID="exit"/>
+            </objects>
+            <point key="canvasLocation" x="783" y="79"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="n0I-kW-S3k">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="8C7-cK-gmI" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="dzH-BV-b40"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="40d-Zw-OWZ">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="aiM-V0-4K8" kind="relationship" relationship="rootViewController" id="W69-zP-VcW"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ZxZ-cF-kpk" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-51" y="74"/>
+        </scene>
+    </scenes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackTranslucent"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
+</document>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPhone.storyboard b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPhone.storyboard
new file mode 100644
index 0000000000..ffc00b3dd8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/en.lproj/MainStoryboard_iPhone.storyboard
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="4510" systemVersion="13A524d" targetRuntime="iOS.CocoaTouch" variant="6xAndEarlier" propertyAccessControl="none" useAutolayout="YES" initialViewController="2">
+    <dependencies>
+        <deployment defaultVersion="1552" identifier="iOS"/>
+        <development version="4600" identifier="xcode"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="5">
+            <objects>
+                <viewController id="2" customClass="DEMOViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="3">
+                        <rect key="frame" x="0.0" y="20" width="568" height="300"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O8J-C0-MbI">
+                                <rect key="frame" x="32" y="134" width="108" height="33"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Decoder All">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="startDecoderAll:" destination="2" eventType="touchUpInside" id="Hll-tC-Hss"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="abQ-CA-DAK">
+                                <rect key="frame" x="32" y="94" width="108" height="33"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="108" id="IqM-pe-lBv"/>
+                                    <constraint firstAttribute="height" constant="32" id="cem-8H-DBq"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Select File">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <segue destination="mcO-AN-z7a" kind="modal" identifier="segueShowResource" id="WLe-Im-zJ0"/>
+                                </connections>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ykW-2E-vCm">
+                                <rect key="frame" x="148" y="94" width="108" height="33"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Decoder">
+                                    <color key="titleColor" red="0.19607843137254902" green="0.30980392156862746" blue="0.52156862745098043" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <state key="highlighted">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="startDecoderOne:" destination="2" eventType="touchUpInside" id="q2K-s3-RgD"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="File:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rsq-r5-ON5">
+                                <rect key="frame" x="32" y="65" width="32" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Qve-7L-UkU">
+                                <rect key="frame" x="72" y="56" width="26" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                            </textField>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstItem="rsq-r5-ON5" firstAttribute="leading" secondItem="O8J-C0-MbI" secondAttribute="leading" type="user" id="29I-Xb-0ag"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="height" secondItem="O8J-C0-MbI" secondAttribute="height" type="user" id="OR0-zx-XNf"/>
+                            <constraint firstItem="rsq-r5-ON5" firstAttribute="leading" secondItem="abQ-CA-DAK" secondAttribute="leading" type="user" id="W38-q7-4nd"/>
+                            <constraint firstItem="ykW-2E-vCm" firstAttribute="baseline" secondItem="abQ-CA-DAK" secondAttribute="baseline" type="default" id="WZe-oK-YSo"/>
+                            <constraint firstItem="Qve-7L-UkU" firstAttribute="leading" secondItem="rsq-r5-ON5" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="b9u-gT-BF9"/>
+                            <constraint firstItem="O8J-C0-MbI" firstAttribute="centerY" secondItem="3" secondAttribute="centerY" type="default" id="cPq-Zs-v04"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="top" secondItem="Qve-7L-UkU" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="cgB-TX-pla"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="top" secondItem="rsq-r5-ON5" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="de6-nY-107"/>
+                            <constraint firstItem="O8J-C0-MbI" firstAttribute="top" secondItem="abQ-CA-DAK" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="fos-tl-P2o"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="width" secondItem="O8J-C0-MbI" secondAttribute="width" type="user" id="fxT-PS-wQq"/>
+                            <constraint firstItem="ykW-2E-vCm" firstAttribute="leading" secondItem="abQ-CA-DAK" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="hxv-KP-JUV"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="height" secondItem="ykW-2E-vCm" secondAttribute="height" type="user" id="jFb-R4-no1"/>
+                            <constraint firstItem="rsq-r5-ON5" firstAttribute="leading" secondItem="3" secondAttribute="leading" constant="32" id="nbA-ra-IBI"/>
+                            <constraint firstItem="abQ-CA-DAK" firstAttribute="width" secondItem="ykW-2E-vCm" secondAttribute="width" type="user" id="rEp-US-RsU"/>
+                        </constraints>
+                        <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="currentSelectedFileTF" destination="Qve-7L-UkU" id="Aua-id-o2H"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-383" y="79"/>
+        </scene>
+        <!--View Controller Show Resource - Resource List-->
+        <scene sceneID="3sV-NI-ybj">
+            <objects>
+                <tableViewController id="MBG-12-1iR" customClass="DEMOViewControllerShowResource" sceneMemberID="viewController">
+                    <tableView key="view" opaque="NO" clipsSubviews="YES" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="fij-4E-cXa">
+                        <rect key="frame" x="0.0" y="64" width="568" height="256"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                        <prototypes>
+                            <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="resourcesListCell" id="uxm-wK-Brx">
+                                <rect key="frame" x="0.0" y="22" width="568" height="44"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="568" height="43"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </tableViewCell>
+                        </prototypes>
+                    </tableView>
+                    <navigationItem key="navigationItem" title="Resource List" id="MFQ-Qp-f4f">
+                        <barButtonItem key="leftBarButtonItem" title="Back" id="eU8-kD-m0U">
+                            <connections>
+                                <segue destination="iD0-QE-VCb" kind="unwind" unwindAction="unwindSegueForShowResourceViewController:" id="ikx-lg-mCQ"/>
+                            </connections>
+                        </barButtonItem>
+                    </navigationItem>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="fdb-Ea-RUm" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <exit id="iD0-QE-VCb" userLabel="Exit" sceneMemberID="exit"/>
+            </objects>
+            <point key="canvasLocation" x="556" y="79"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="GZm-Tn-RdS">
+            <objects>
+                <navigationController definesPresentationContext="YES" id="mcO-AN-z7a" sceneMemberID="viewController">
+                    <navigationItem key="navigationItem" id="jLO-A7-sdU"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="Nee-ii-B3U">
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="MBG-12-1iR" kind="relationship" relationship="rootViewController" id="pLU-XE-NvG"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hNx-Nt-9ig" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="22" y="79"/>
+        </scene>
+    </scenes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/main.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/main.m
new file mode 100644
index 0000000000..99bec98e6d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/dec/demo/demo/main.m
@@ -0,0 +1,124 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+#import "DEMOAppDelegate.h"
+
+extern int DecMain (int argc, char* argv[]);
+
+//redirect NSLog and stdout to logfile
+void redirectLogToDocumentFile() {
+  NSArray* path = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
+  NSString* document = [path objectAtIndex:0];
+  NSString* fileName = [NSString stringWithFormat:@"decPerf.log"];
+  NSString* logPath = [document stringByAppendingPathComponent:fileName];
+
+  NSFileManager* defaultManager = [NSFileManager defaultManager];
+  [defaultManager removeItemAtPath:logPath error:nil];
+
+  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stdout);
+  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stderr);
+}
+
+
+//run auto test to get encoder performance
+int AutoTestDec() {
+
+
+  NSString* document = [[NSString alloc] init];
+  NSArray* paths = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
+  if ([paths count] == 0) {
+    NSLog (@"could not find document path");
+    return 2;
+  }
+  document = [paths objectAtIndex:0];
+
+
+  NSString* decFilePath = [document stringByAppendingString:@"/DecoderPerfTestRes"];
+  NSFileManager* manage = [NSFileManager defaultManager];
+
+  NSString* outYuvPath = [decFilePath stringByAppendingString:@"/yuv"];
+  [manage removeItemAtPath:outYuvPath error:nil];
+  [manage createDirectoryAtPath:outYuvPath withIntermediateDirectories:YES attributes:nil error: nil];
+
+
+  NSArray* bitstreams = [manage subpathsAtPath:decFilePath];
+  if (bitstreams == nil) {
+    NSLog (@"could not find any bitstream under decoderperfpath");
+    return 1;
+  }
+
+  redirectLogToDocumentFile(); //output to console, just comment this line
+
+  for (int caseNO = 0; caseNO < [bitstreams count]; caseNO++) {
+
+    NSString* caseName = [bitstreams objectAtIndex:caseNO];
+    if ([caseName  isEqual: @"yuv"]) {
+      break;
+    }
+    NSString* bitstream = [decFilePath stringByAppendingString:@"/"];
+    bitstream = [bitstream stringByAppendingString:caseName];
+    NSString* yuvFileName = [caseName stringByAppendingString:@".yuv"];
+    NSString* tmpyuvFileName = [outYuvPath stringByAppendingString:@"/"];
+    yuvFileName = [tmpyuvFileName stringByAppendingString:yuvFileName];
+
+    [manage createFileAtPath:yuvFileName contents:nil attributes:nil];
+
+    const char* argvv[] = {
+      "decConsole.exe",
+      [bitstream UTF8String],
+      [yuvFileName UTF8String]
+    };
+    DecMain (sizeof (argvv) / sizeof (argvv[0]), (char**)&argvv[0]);
+    [manage removeItemAtPath:yuvFileName error:nil];//FOR limited devices spaces
+    fflush (stdout); // flush the content of stdout instantly
+  }
+
+
+  return 0;
+}
+
+int main (int argc, char* argv[]) {
+  //***For auto testing of decoder performance, call auto test here, if you not want to do auto test, you can comment it manualy
+
+  if (AutoTestDec() == 0)
+    NSLog (@"Auto testing running sucessfully");
+  else
+    NSLog (@"Auto testing running failed");
+  abort();
+  //********
+
+  @autoreleasepool {
+    return UIApplicationMain (argc, argv, nil, NSStringFromClass ([DEMOAppDelegate class]));
+  }
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.h b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.h
new file mode 100644
index 0000000000..8f3a936a70
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.h
@@ -0,0 +1,39 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+  @property (strong, nonatomic) UIWindow* window;
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.m
new file mode 100644
index 0000000000..fcfab2110e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/AppDelegate.m
@@ -0,0 +1,63 @@
+
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import "AppDelegate.h"
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+    return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application
+{
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+}
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPad.storyboard b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPad.storyboard
new file mode 100644
index 0000000000..39c0b14343
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPad.storyboard
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="tne-QT-ifu">
+            <objects>
+                <viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="AP8-8w-0De"/>
+                        <viewControllerLayoutGuide type="bottom" id="c8g-3k-wFn"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zxO-df-3Nm">
+                                <rect key="frame" x="205" y="483" width="142" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Simple Encoder Test">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="buttonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="pzf-mY-PCn"/>
+                                </connections>
+                            </button>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Status:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mpw-Vf-v58">
+                                <rect key="frame" x="205" y="401" width="221" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <connections>
+                        <outlet property="statusText" destination="Mpw-Vf-v58" id="BbS-da-1lz"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="blackOpaque"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
+</document>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPhone.storyboard b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPhone.storyboard
new file mode 100644
index 0000000000..5d614171d7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Base.lproj/Main_iPhone.storyboard
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vXZ-lx-hvc">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="ufC-wZ-h7g">
+            <objects>
+                <viewController id="vXZ-lx-hvc" customClass="ViewController" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="DZT-bO-vZS"/>
+                        <viewControllerLayoutGuide type="bottom" id="mJc-f0-9sv"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Status:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HvX-56-M19">
+                                <rect key="frame" x="93" y="336" width="55" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="SXI-db-Dpk">
+                                <rect key="frame" x="93" y="379" width="136" height="30"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <state key="normal" title="Simple Encode Test">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="buttonPressed:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="1uY-7J-edO"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                    </view>
+                    <connections>
+                        <outlet property="statusText" destination="HvX-56-M19" id="KxK-QZ-DTo"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="x5A-6p-PRh" sceneMemberID="firstResponder"/>
+            </objects>
+        </scene>
+    </scenes>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000000..91bf9c14a7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,53 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "60x60",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "29x29",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "40x40",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "76x76",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
new file mode 100644
index 0000000000..6f870a4629
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/Images.xcassets/LaunchImage.launchimage/Contents.json
@@ -0,0 +1,51 @@
+{
+  "images" : [
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "iphone",
+      "subtype" : "retina4",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "1x"
+    },
+    {
+      "orientation" : "portrait",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    },
+    {
+      "orientation" : "landscape",
+      "idiom" : "ipad",
+      "extent" : "full-screen",
+      "minimum-system-version" : "7.0",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.h b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.h
new file mode 100644
index 0000000000..c4f7b52561
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.h
@@ -0,0 +1,44 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#import <UIKit/UIKit.h>
+
+@interface ViewController : UIViewController {
+  UILabel* statusText_;
+}
+
+@property (retain, nonatomic) IBOutlet UILabel* statusText;
+
+- (IBAction) buttonPressed: (id)sender;
+
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.m
new file mode 100644
index 0000000000..f2331beb17
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/ViewController.m
@@ -0,0 +1,89 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+extern int EncMain(int argc, char **argv);
+
+#import "ViewController.h"
+
+
+@interface ViewController ()
+
+@end
+
+@implementation ViewController
+@synthesize statusText=statusText_;
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    statusText_.text = @"Status: Ready for Go";
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+}
+
+- (IBAction) buttonPressed:(id)sender
+{
+    NSBundle * bundle = [NSBundle mainBundle];
+    NSString * encCfg = [bundle pathForResource:@"welsenc_ios" ofType:@"cfg"];
+    NSString * dlayerCfg = [bundle pathForResource:@"layer2" ofType:@"cfg"];
+    NSString * yuvFile = [bundle pathForResource:@"CiscoVT2people_320x192_12fps" ofType:@"yuv"];
+    NSString * bsfile = [NSString stringWithFormat:@"%@/%@", [self getPathForWrite], @"test.264"];
+    NSLog(@"WELS_INFO: enc config file: %@, yuv file %@", encCfg, yuvFile);
+    const char * argv[] = {
+        "dummy",
+        [encCfg UTF8String],
+        "-org",
+        [yuvFile UTF8String],
+        "-bf",
+        [bsfile UTF8String],
+        "-numl",
+        "1",
+        "-lconfig",
+        "0",
+        [dlayerCfg UTF8String],
+    };
+    NSLog(@"WELS_INFO: enc config file: %@", encCfg);
+    EncMain(sizeof(argv)/sizeof(argv[0]), (char**)&argv[0]);
+    statusText_.text = @"Status: Test Over";
+}
+
+- (NSString*) getPathForWrite {
+    NSArray * pathes =  NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString * documentDirectory = [pathes objectAtIndex:0];
+    return documentDirectory;
+}
+
+
+@end
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/en.lproj/InfoPlist.strings b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/en.lproj/InfoPlist.strings
new file mode 100644
index 0000000000..477b28ff8f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/encDemo-Info.plist b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/encDemo-Info.plist
new file mode 100644
index 0000000000..3c9aaf9010
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/encDemo-Info.plist
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>cisco.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIMainStoryboardFile</key>
+	<string>Main_iPhone</string>
+	<key>UIMainStoryboardFile~ipad</key>
+	<string>Main_iPad</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/main.m b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/main.m
new file mode 100644
index 0000000000..fd27f11418
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/iOS/enc/encDemo/encDemo/main.m
@@ -0,0 +1,175 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#import <UIKit/UIKit.h>
+
+#import "AppDelegate.h"
+
+extern int EncMain (int argc, char** argv);
+
+//redirect NSLog and stdout to logfile
+void redirectLogToDocumentFile() {
+  NSArray* path = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
+  NSString* document = [path objectAtIndex:0];
+  NSString* fileName = [NSString stringWithFormat:@"encPerf.log"];
+  NSString* logPath = [document stringByAppendingPathComponent:fileName];
+
+  NSFileManager* defaultManager = [NSFileManager defaultManager];
+  [defaultManager removeItemAtPath:logPath error:nil];
+
+  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stdout);
+  freopen ([logPath cStringUsingEncoding:NSASCIIStringEncoding], "a+", stderr);
+}
+
+//to judge whether the path is needed case path
+bool IsOneDeptDir (NSString* path) {
+  BOOL isDir = NO;
+  BOOL isOneDeptDir = NO;
+  NSFileManager* fileManager = [NSFileManager defaultManager];
+  NSArray* dirPathArray = [fileManager subpathsAtPath:path];
+  if ([dirPathArray count] == 0 || dirPathArray == nil)
+    isOneDeptDir = NO;
+  else {
+    for (NSString * dirPath in dirPathArray) {
+      NSString* tmpPath = [path stringByAppendingString:@"/"];
+      tmpPath = [tmpPath stringByAppendingString:dirPath];
+      [fileManager fileExistsAtPath:tmpPath isDirectory:&isDir];
+      if (isDir) {
+        isOneDeptDir = YES;
+        break;
+      }
+    }
+  }
+  return isOneDeptDir;
+}
+
+//run auto test to get encoder performance
+int AutoTestEnc() {
+  NSString* document = [[NSString alloc] init];
+  NSArray* paths = NSSearchPathForDirectoriesInDomains (NSDocumentDirectory, NSUserDomainMask, YES);
+  if ([paths count] == 0) {
+    NSLog (@"could not find document path");
+    return 2;
+  }
+  document = [paths objectAtIndex:0];
+
+  NSString* encFilePath = [document stringByAppendingString:@"/EncoderPerfTestRes"];
+  NSFileManager* manage = [NSFileManager defaultManager];
+
+  NSArray* cases = [manage subpathsAtPath:encFilePath];
+  if (cases == nil) {
+    NSLog (@"could not find any test case under encoderperftest");
+    return 1;
+
+  }
+  redirectLogToDocumentFile();
+  NSMutableArray* dirArray = [[NSMutableArray alloc] init];
+  for (NSString * casePath in cases) {
+
+    NSString* path = [encFilePath stringByAppendingPathComponent:casePath];
+    if (IsOneDeptDir (path)) {
+      [dirArray addObject:casePath];
+    }
+
+  }
+  for (int caseNO = 0; caseNO < [dirArray count]; caseNO++) {
+
+    NSString* caseName = [dirArray objectAtIndex:caseNO];
+    NSString* caseFilePath = [encFilePath stringByAppendingString:@"/"];
+    caseFilePath = [caseFilePath stringByAppendingString:caseName];
+    [manage changeCurrentDirectoryPath:[caseFilePath stringByExpandingTildeInPath]];
+
+    NSString* welscfg = [caseFilePath stringByAppendingString:@"/welsenc.cfg"];
+    NSString* layercfg = [caseFilePath stringByAppendingString:@"/layer2.cfg"];
+    NSString* yuvFilePath = [caseFilePath stringByAppendingString:@"/yuv"];
+    NSString* bitFilePath = [caseFilePath stringByAppendingString:@"/bit"];
+    [manage removeItemAtPath:bitFilePath error:nil];
+    [manage createDirectoryAtPath:bitFilePath withIntermediateDirectories:YES attributes:nil error:nil];
+
+
+    NSArray* files = [manage subpathsAtPath:yuvFilePath];
+
+    [manage changeCurrentDirectoryPath:[bitFilePath stringByExpandingTildeInPath]];
+
+    for (int i = 0; i < [files count]; i++) {
+      NSString* yuvFileName = [files objectAtIndex:i];
+      NSString* bitFileName = [yuvFileName stringByAppendingString:@".264"];
+
+      NSString*  bitFileNamePath = [bitFilePath stringByAppendingString:@"/"];
+      bitFileName = [bitFileNamePath stringByAppendingString:bitFileName];
+
+
+      [manage createFileAtPath:bitFileName contents:nil attributes:nil];
+      [manage changeCurrentDirectoryPath:[yuvFilePath stringByExpandingTildeInPath]];
+      const char* argvv[] = {
+        "dummy",
+        [welscfg UTF8String],
+        "-org",
+        [yuvFileName UTF8String],
+        "-bf",
+        [bitFileName UTF8String],
+        "-numl",
+        "1",
+          "-lconfig",
+          "0",
+        [layercfg UTF8String]
+      };
+
+      NSLog (@"WELS_INFO: enc config file: %@", welscfg);
+      NSLog (@"WELS_INFO: enc yuv file: %@", yuvFileName);
+      EncMain (sizeof (argvv) / sizeof (argvv[0]), (char**)&argvv[0]);
+      fflush (stdout); // flush the content of stdout instantly
+    }
+
+  }
+
+
+  return 0;
+}
+
+
+int main (int argc, char* argv[]) {
+
+
+  //***For auto testing of encoder performance, call auto test here, if you not want to do auto test, you can comment it manualy
+
+  if (AutoTestEnc() == 0)
+    NSLog (@"Auto testing running sucessfully");
+  else
+    NSLog (@"Auto testing running failed");
+  abort();
+  //************************
+  @autoreleasepool {
+    return UIApplicationMain (argc, argv, nil, NSStringFromClass ([AppDelegate class]));
+  }
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/.gitignore b/third-party/openh264/third_party/openh264/src/codec/build/win32/.gitignore
new file mode 100644
index 0000000000..95ce52f658
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/.gitignore
@@ -0,0 +1,15 @@
+# Files generated by Visual Studio 2008
+*.user
+*.ncb
+*.suo
+
+Win32
+x64
+
+# Files generated by upgrading the project files
+*.vcxproj*
+Backup
+UpgradeLog.htm
+
+# Files generated by Visual Studio 2012
+*.sdf
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecCore.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecCore.vcproj
new file mode 100644
index 0000000000..033522f244
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecCore.vcproj
@@ -0,0 +1,996 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WelsDecCore"
+	ProjectGUID="{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}"
+	RootNamespace="WelsDecCore"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<DefaultToolFile
+			FileName="masm.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc"
+				PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsdcore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc"
+				PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsdcore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc"
+				PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsdcore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\decoder\core\inc;..\..\..\common\inc;..\..\..\api\svc"
+				PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsdcore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="asm"
+			Filter="*.asm;*.inc"
+			>
+			<File
+				RelativePath="..\..\..\common\x86\cpuid.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\dct.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\x86\dct.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\deblock.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\expand_picture.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\x86\intra_pred.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mb_copy.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mc_chroma.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mc_luma.asm"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\au_parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\bit_stream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\cabac_decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\copy_mb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\cpu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\cpu_core.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\deblocking.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\deblocking_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\dec_frame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\dec_golomb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\decode_mb_aux.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\decode_slice.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\decoder_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\decoder_core.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\error_code.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\error_concealment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\expand_pic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\fmo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\get_intra_predictor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\ls_defines.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\macros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\manage_dec_ref.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\mb_cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\mc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\measure_time.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\memmgr_nal_unit.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\memory_align.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\mv_pred.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\nal_prefix.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\nalu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\parameter_sets.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cabac.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\parse_mb_syn_cavlc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\pic_queue.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\picture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\rec_mb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\slice.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\typedefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\vlc_decoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\wels_common_basis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\wels_common_defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\wels_const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\wels_const_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\inc\wels_decoder_thread.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\decoder\core\src\au_parser.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\bit_stream.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\cabac_decoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\common_tables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\copy_mb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\cpu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\crt_util_safe_x.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\deblocking.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\deblocking_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\decode_mb_aux.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\decode_slice.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\decoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\decoder_core.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\decoder_data_tables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\error_concealment.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\expand_pic.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\fmo.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\get_intra_predictor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\manage_dec_ref.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\mc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\memmgr_nal_unit.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\memory_align.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\mv_pred.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cabac.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\parse_mb_syn_cavlc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\pic_queue.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\rec_mb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsThreadLib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\core\src\wels_decoder_thread.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecPlus.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecPlus.vcproj
new file mode 100644
index 0000000000..d2006867ef
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecPlus.vcproj
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WelsDecPlus"
+	ProjectGUID="{1131558A-9986-4F4B-A13F-8B7F4C8438BF}"
+	RootNamespace="WelsDecPlus"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdcore.lib"
+				OutputFile="$(OutDir)\welsdec.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsdec.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdcore.lib"
+				OutputFile="$(OutDir)\welsdec.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsdec.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdcore.lib"
+				OutputFile="$(OutDir)\welsdec.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsdec.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\decoder\plus\inc;..\..\..\decoder\core\inc;..\..\..\api\svc;..\..\..\common\inc"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdcore.lib"
+				OutputFile="$(OutDir)\welsdec.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\decoder\plus\src\wels_dec_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsdec.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\common\inc\welsCodecTrace.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\plus\inc\welsDecoderExt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="..\..\..\..\openh264.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\decoder\plus\src\wels_dec_export.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\decoder\plus\src\welsDecoderExt.cpp"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecoder.sln b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecoder.sln
new file mode 100644
index 0000000000..d7aad3d67f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/WelsDecoder.sln
@@ -0,0 +1,52 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecCore", "WelsDecCore.vcproj", "{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsDecPlus", "WelsDecPlus.vcproj", "{1131558A-9986-4F4B-A13F-8B7F4C8438BF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5} = {01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decConsole", "decConsole.vcproj", "{71973A8E-103D-4FB7-951F-55E35E7F60FA}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF} = {1131558A-9986-4F4B-A13F-8B7F4C8438BF}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.ActiveCfg = Debug|Win32
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|Win32.Build.0 = Debug|Win32
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.ActiveCfg = Debug|x64
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Debug|x64.Build.0 = Debug|x64
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.ActiveCfg = Release|Win32
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|Win32.Build.0 = Release|Win32
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.ActiveCfg = Release|x64
+		{01B4AE41-6AD6-4CAF-AEB3-C42F7F9121D5}.Release|x64.Build.0 = Release|x64
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|Win32.Build.0 = Debug|Win32
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.ActiveCfg = Debug|x64
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Debug|x64.Build.0 = Debug|x64
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.ActiveCfg = Release|Win32
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|Win32.Build.0 = Release|Win32
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.ActiveCfg = Release|x64
+		{1131558A-9986-4F4B-A13F-8B7F4C8438BF}.Release|x64.Build.0 = Release|x64
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|Win32.Build.0 = Debug|Win32
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.ActiveCfg = Debug|x64
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Debug|x64.Build.0 = Debug|x64
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.ActiveCfg = Release|Win32
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|Win32.Build.0 = Release|Win32
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.ActiveCfg = Release|x64
+		{71973A8E-103D-4FB7-951F-55E35E7F60FA}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/decConsole.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/decConsole.vcproj
new file mode 100644
index 0000000000..2544cd4134
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/dec/decConsole.vcproj
@@ -0,0 +1,389 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="decConsole"
+	ProjectGUID="{71973A8E-103D-4FB7-951F-55E35E7F60FA}"
+	RootNamespace="decConsole"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\common\inc"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdec.lib"
+				OutputFile="$(OutDir)\decConsole.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\decConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\common\inc"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdec.lib"
+				OutputFile="$(OutDir)\decConsole.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\decConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\common\inc"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdec.lib"
+				OutputFile="$(OutDir)\decConsoled.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\decConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\console\dec\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\common\inc"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="2052"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsdec.lib"
+				OutputFile="$(OutDir)\decConsoled.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\decConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\console\dec\src\d3d9_utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\console\dec\src\h264dec.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\console\common\src\read_config.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\console\dec\inc\d3d9_utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\console\common\inc\read_config.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncCore.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncCore.vcproj
new file mode 100644
index 0000000000..b30272d74d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncCore.vcproj
@@ -0,0 +1,1498 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WelsEncCore"
+	ProjectGUID="{59208004-1774-4816-AC24-31FF44C324B4}"
+	RootNamespace="WelsEncCore"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<DefaultToolFile
+			FileName="masm.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsecore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\WelsEncCore.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_LIB;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsecore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\WelsEncCore.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsecore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\WelsEncCore.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\common\inc;..\..\..\encoder\core\inc,..\..\..\api\svc;..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_LIB;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)\welsecore.lib"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\WelsEncCore.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\encoder\core\src\au_set.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\common_tables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\copy_mb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\cpu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\crt_util_safe_x.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\deblocking.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\deblocking_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\decode_mb_aux.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\encode_mb_aux.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\encoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\encoder_data_tables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\encoder_ext.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\expand_pic.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\get_intra_predictor.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\intra_pred_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\mc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\md.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\memory_align.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\mv_pred.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\nal_encap.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\paraset_strategy.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\picture_handle.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\ratectl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\ref_list_mgr_svc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\sad_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\sample.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\set_mb_syn_cabac.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\set_mb_syn_cavlc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\slice_multi_threading.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_base_layer_md.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_enc_slice_segment.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_encode_mb.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_encode_slice.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_mode_decision.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_motion_estimate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_set_mb_syn_cabac.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\svc_set_mb_syn_cavlc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\utils.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\wels_task_base.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\wels_task_encoder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\wels_task_management.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsTaskThread.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsThread.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsThreadLib.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsThreadPool.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\as264_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\au_set.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\copy_mb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\cpu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\cpu_core.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\deblocking.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\deblocking_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\decode_mb_aux.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\dq_map.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\encode_mb_aux.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\encoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\encoder_context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\expand_pic.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\extern.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\get_intra_predictor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\golomb_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\ls_defines.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\macros.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\mb_cache.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\mc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\md.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\measure_time.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\memory_align.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\mt_defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\mv_pred.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\nal_encap.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\param_svc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\parameter_sets.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\paraset_strategy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\picture.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\picture_handle.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\rc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\ref_list_mgr_svc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\sad_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\sample.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\set_mb_syn_cabac.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\set_mb_syn_cavlc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\slice.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\slice_multi_threading.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\stat.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_base_layer_md.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_enc_frame.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_enc_golomb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_enc_macroblock.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_enc_slice_segment.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_encode_mb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_encode_slice.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_mode_decision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_motion_estimate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_set_mb_syn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\svc_set_mb_syn_cavlc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\typedefs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\utils.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\vlc_encoder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\wels_common_basis.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\wels_common_defs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\wels_const.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\wels_const_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\wels_func_ptr_def.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\WelsThreadLib.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="asm"
+			Filter="*.asm;*.inc"
+			>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\coeff.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\cpuid.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\dct.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName)_common.obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName)_common.obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\dct.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\deblock.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\expand_picture.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\intra_pred.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\intra_pred_com.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\matrix_transpose.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mb_copy.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mc_chroma.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\mc_luma.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\memzero.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\quant.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\sample_sc.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\satd_sad.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\x86\score.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\vaa.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="PreProcess"
+			>
+			<File
+				RelativePath="..\..\..\processing\interface\IWelsVP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\src\wels_preprocess.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\core\inc\wels_preprocess.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncPlus.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncPlus.vcproj
new file mode 100644
index 0000000000..ab769557bf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncPlus.vcproj
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WelsEncPlus"
+	ProjectGUID="{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}"
+	RootNamespace="WelsEncPlus"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
+				OutputFile="$(OutDir)\welsenc.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsenc.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/WelsEncPlus.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
+				OutputFile="$(OutDir)\welsenc.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsenc.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/WelsEncPlus.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
+				OutputFile="$(OutDir)\welsenc.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsenc.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/WelsEncPlus.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="..\..\..\encoder\plus\inc;..\..\..\encoder\core\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsecore.lib $(OutDir)\welsvp.lib"
+				OutputFile="$(OutDir)\welsenc.dll"
+				LinkIncremental="1"
+				ModuleDefinitionFile="..\..\..\encoder\plus\src\wels_enc_export.def"
+				GenerateDebugInformation="true"
+				RandomizedBaseAddress="2"
+				DataExecutionPrevention="2"
+				ImportLibrary="$(OutDir)\welsenc.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)/WelsEncPlus.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\encoder\plus\src\DllEntry.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\plus\src\wels_enc_export.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\welsCodecTrace.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\plus\src\welsEncoderExt.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\common\inc\welsCodecTrace.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\encoder\plus\inc\welsEncoderExt.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="..\..\..\..\openh264.rc"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncoder.sln b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncoder.sln
new file mode 100644
index 0000000000..b75cb695ee
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/WelsEncoder.sln
@@ -0,0 +1,66 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncCore", "WelsEncCore.vcproj", "{59208004-1774-4816-AC24-31FF44C324B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} = {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsEncPlus", "WelsEncPlus.vcproj", "{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{59208004-1774-4816-AC24-31FF44C324B4} = {59208004-1774-4816-AC24-31FF44C324B4}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encConsole", "encConsole.vcproj", "{8509E2A8-2CBD-49E2-B564-3EFF1E927459}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F} = {1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562} = {E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WelsVP", "..\..\..\processing\build\win32\WelsVP.vcproj", "{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{59208004-1774-4816-AC24-31FF44C324B4}.Debug|Win32.Build.0 = Debug|Win32
+		{59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.ActiveCfg = Debug|x64
+		{59208004-1774-4816-AC24-31FF44C324B4}.Debug|x64.Build.0 = Debug|x64
+		{59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.ActiveCfg = Release|Win32
+		{59208004-1774-4816-AC24-31FF44C324B4}.Release|Win32.Build.0 = Release|Win32
+		{59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.ActiveCfg = Release|x64
+		{59208004-1774-4816-AC24-31FF44C324B4}.Release|x64.Build.0 = Release|x64
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|Win32.Build.0 = Debug|Win32
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.ActiveCfg = Debug|x64
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Debug|x64.Build.0 = Debug|x64
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.ActiveCfg = Release|Win32
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|Win32.Build.0 = Release|Win32
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.ActiveCfg = Release|x64
+		{1E7B4E9A-986E-4167-8C70-6E4F60EAEE7F}.Release|x64.Build.0 = Release|x64
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|Win32.Build.0 = Debug|Win32
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.ActiveCfg = Debug|x64
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Debug|x64.Build.0 = Debug|x64
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.ActiveCfg = Release|Win32
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|Win32.Build.0 = Release|Win32
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.ActiveCfg = Release|x64
+		{8509E2A8-2CBD-49E2-B564-3EFF1E927459}.Release|x64.Build.0 = Release|x64
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|Win32.Build.0 = Debug|Win32
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.ActiveCfg = Debug|x64
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Debug|x64.Build.0 = Debug|x64
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.ActiveCfg = Release|Win32
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|Win32.Build.0 = Release|Win32
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.ActiveCfg = Release|x64
+		{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/encConsole.vcproj b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/encConsole.vcproj
new file mode 100644
index 0000000000..4714a24e45
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/win32/enc/encConsole.vcproj
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="encConsole"
+	ProjectGUID="{8509E2A8-2CBD-49E2-B564-3EFF1E927459}"
+	RootNamespace="encConsole"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsenc.lib"
+				OutputFile="$(OutDir)\encConsole.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\encConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
+				PreprocessorDefinitions="_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsenc.lib"
+				OutputFile="$(OutDir)\encConsole.exe"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\encConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE;X86_ASM;"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsenc.lib"
+				OutputFile="$(OutDir)\encConsole.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\encConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..\..\console\enc\inc,..\..\..\console\common\inc,..\..\..\api\svc,..\..\..\encoder\core\inc,..\..\..\common\inc,..\..\..\processing\interface"
+				PreprocessorDefinitions="NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="$(OutDir)\welsenc.lib"
+				OutputFile="$(OutDir)\encConsole.exe"
+				LinkIncremental="1"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+				OutputFile="$(OutDir)\encConsole.bsc"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\console\common\src\read_config.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\console\enc\src\welsenc.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\console\common\inc\read_config.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/.gitignore b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/.gitignore
new file mode 100644
index 0000000000..9cb17a9bda
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/.gitignore
@@ -0,0 +1,29 @@
+# Files generated by Visual Studio 2008
+*.user
+*.ncb
+*.suo
+*.opensdf
+
+Win32
+x64
+ARM
+Debug
+Release
+
+# Files generated by upgrading the project files
+Backup
+Generated Files
+UpgradeLog.htm
+
+# Files generated by Visual Studio 2013
+*.sdf
+ipch
+Draft
+
+# Files used in App
+Bin
+obj
+res
+*.dll
+*.yuv
+*.264
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp.sln b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp.sln
new file mode 100644
index 0000000000..3543986e35
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp.sln
@@ -0,0 +1,76 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CodecApp", "CodecApp\CodecApp.csproj", "{5424CF29-908E-417E-93F3-F1CD81E5372C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CodecRTComponent", "CodecRTComponent.vcxproj", "{FE5BF241-F4EA-4B94-B36A-23511E5908EC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM = Debug|ARM
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|Win32 = Debug|Win32
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|ARM = Release|ARM
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|Win32 = Release|Win32
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.ActiveCfg = Debug|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.Build.0 = Debug|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|ARM.Deploy.0 = Debug|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Mixed Platforms.Deploy.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.ActiveCfg = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.Build.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|Win32.Deploy.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.ActiveCfg = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.Build.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Debug|x86.Deploy.0 = Debug|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.ActiveCfg = Release|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.Build.0 = Release|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|ARM.Deploy.0 = Release|ARM
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.Build.0 = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Mixed Platforms.Deploy.0 = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.ActiveCfg = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.Build.0 = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|Win32.Deploy.0 = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.ActiveCfg = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.Build.0 = Release|x86
+		{5424CF29-908E-417E-93F3-F1CD81E5372C}.Release|x86.Deploy.0 = Release|x86
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|ARM.ActiveCfg = Debug|ARM
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|ARM.Build.0 = Debug|ARM
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|Win32.Build.0 = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|x86.ActiveCfg = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Debug|x86.Build.0 = Debug|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Any CPU.ActiveCfg = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|ARM.ActiveCfg = Release|ARM
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|ARM.Build.0 = Release|ARM
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Win32.ActiveCfg = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|Win32.Build.0 = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|x86.ActiveCfg = Release|Win32
+		{FE5BF241-F4EA-4B94-B36A-23511E5908EC}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml
new file mode 100644
index 0000000000..d1508a95bb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml
@@ -0,0 +1,20 @@
+<Application
+    x:Class="CodecApp.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone">
+
+    <!--Application Resources-->
+    <Application.Resources>
+        <local:LocalizedStrings xmlns:local="clr-namespace:CodecApp" x:Key="LocalizedStrings"/>
+    </Application.Resources>
+
+    <Application.ApplicationLifetimeObjects>
+        <!--Required object that handles lifetime events for the application-->
+        <shell:PhoneApplicationService
+            Launching="Application_Launching" Closing="Application_Closing"
+            Activated="Application_Activated" Deactivated="Application_Deactivated"/>
+    </Application.ApplicationLifetimeObjects>
+
+</Application>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml.cs b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml.cs
new file mode 100644
index 0000000000..97c1852c9b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/App.xaml.cs
@@ -0,0 +1,223 @@
+using System;
+using System.Diagnostics;
+using System.Resources;
+using System.Windows;
+using System.Windows.Markup;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using CodecApp.Resources;
+
+namespace CodecApp
+{
+    public partial class App : Application
+    {
+        /// <summary>
+        /// Provides easy access to the root frame of the Phone Application.
+        /// </summary>
+        /// <returns>The root frame of the Phone Application.</returns>
+        public static PhoneApplicationFrame RootFrame { get; private set; }
+
+        /// <summary>
+        /// Constructor for the Application object.
+        /// </summary>
+        public App()
+        {
+            // Global handler for uncaught exceptions.
+            UnhandledException += Application_UnhandledException;
+
+            // Standard XAML initialization
+            InitializeComponent();
+
+            // Phone-specific initialization
+            InitializePhoneApplication();
+
+            // Language display initialization
+            InitializeLanguage();
+
+            // Show graphics profiling information while debugging.
+            if (Debugger.IsAttached)
+            {
+                // Display the current frame rate counters.
+                Application.Current.Host.Settings.EnableFrameRateCounter = true;
+
+                // Show the areas of the app that are being redrawn in each frame.
+                //Application.Current.Host.Settings.EnableRedrawRegions = true;
+
+                // Enable non-production analysis visualization mode,
+                // which shows areas of a page that are handed off to GPU with a colored overlay.
+                //Application.Current.Host.Settings.EnableCacheVisualization = true;
+
+                // Prevent the screen from turning off while under the debugger by disabling
+                // the application's idle detection.
+                // Caution:- Use this under debug mode only. Application that disables user idle detection will continue to run
+                // and consume battery power when the user is not using the phone.
+                PhoneApplicationService.Current.UserIdleDetectionMode = IdleDetectionMode.Disabled;
+            }
+
+        }
+
+        // Code to execute when the application is launching (eg, from Start)
+        // This code will not execute when the application is reactivated
+        private void Application_Launching(object sender, LaunchingEventArgs e)
+        {
+        }
+
+        // Code to execute when the application is activated (brought to foreground)
+        // This code will not execute when the application is first launched
+        private void Application_Activated(object sender, ActivatedEventArgs e)
+        {
+        }
+
+        // Code to execute when the application is deactivated (sent to background)
+        // This code will not execute when the application is closing
+        private void Application_Deactivated(object sender, DeactivatedEventArgs e)
+        {
+        }
+
+        // Code to execute when the application is closing (eg, user hit Back)
+        // This code will not execute when the application is deactivated
+        private void Application_Closing(object sender, ClosingEventArgs e)
+        {
+        }
+
+        // Code to execute if a navigation fails
+        private void RootFrame_NavigationFailed(object sender, NavigationFailedEventArgs e)
+        {
+            if (Debugger.IsAttached)
+            {
+                // A navigation has failed; break into the debugger
+                Debugger.Break();
+            }
+        }
+
+        // Code to execute on Unhandled Exceptions
+        private void Application_UnhandledException(object sender, ApplicationUnhandledExceptionEventArgs e)
+        {
+            if (Debugger.IsAttached)
+            {
+                // An unhandled exception has occurred; break into the debugger
+                Debugger.Break();
+            }
+        }
+
+        #region Phone application initialization
+
+        // Avoid double-initialization
+        private bool phoneApplicationInitialized = false;
+
+        // Do not add any additional code to this method
+        private void InitializePhoneApplication()
+        {
+            if (phoneApplicationInitialized)
+                return;
+
+            // Create the frame but don't set it as RootVisual yet; this allows the splash
+            // screen to remain active until the application is ready to render.
+            RootFrame = new PhoneApplicationFrame();
+            RootFrame.Navigated += CompleteInitializePhoneApplication;
+
+            // Handle navigation failures
+            RootFrame.NavigationFailed += RootFrame_NavigationFailed;
+
+            // Handle reset requests for clearing the backstack
+            RootFrame.Navigated += CheckForResetNavigation;
+
+            // Ensure we don't initialize again
+            phoneApplicationInitialized = true;
+        }
+
+        // Do not add any additional code to this method
+        private void CompleteInitializePhoneApplication(object sender, NavigationEventArgs e)
+        {
+            // Set the root visual to allow the application to render
+            if (RootVisual != RootFrame)
+                RootVisual = RootFrame;
+
+            // Remove this handler since it is no longer needed
+            RootFrame.Navigated -= CompleteInitializePhoneApplication;
+        }
+
+        private void CheckForResetNavigation(object sender, NavigationEventArgs e)
+        {
+            // If the app has received a 'reset' navigation, then we need to check
+            // on the next navigation to see if the page stack should be reset
+            if (e.NavigationMode == NavigationMode.Reset)
+                RootFrame.Navigated += ClearBackStackAfterReset;
+        }
+
+        private void ClearBackStackAfterReset(object sender, NavigationEventArgs e)
+        {
+            // Unregister the event so it doesn't get called again
+            RootFrame.Navigated -= ClearBackStackAfterReset;
+
+            // Only clear the stack for 'new' (forward) and 'refresh' navigations
+            if (e.NavigationMode != NavigationMode.New && e.NavigationMode != NavigationMode.Refresh)
+                return;
+
+            // For UI consistency, clear the entire page stack
+            while (RootFrame.RemoveBackEntry() != null)
+            {
+                ; // do nothing
+            }
+        }
+
+        #endregion
+
+        // Initialize the app's font and flow direction as defined in its localized resource strings.
+        //
+        // To ensure that the font of your application is aligned with its supported languages and that the
+        // FlowDirection for each of those languages follows its traditional direction, ResourceLanguage
+        // and ResourceFlowDirection should be initialized in each resx file to match these values with that
+        // file's culture. For example:
+        //
+        // AppResources.es-ES.resx
+        //    ResourceLanguage's value should be "es-ES"
+        //    ResourceFlowDirection's value should be "LeftToRight"
+        //
+        // AppResources.ar-SA.resx
+        //     ResourceLanguage's value should be "ar-SA"
+        //     ResourceFlowDirection's value should be "RightToLeft"
+        //
+        // For more info on localizing Windows Phone apps see http://go.microsoft.com/fwlink/?LinkId=262072.
+        //
+        private void InitializeLanguage()
+        {
+            try
+            {
+                // Set the font to match the display language defined by the
+                // ResourceLanguage resource string for each supported language.
+                //
+                // Fall back to the font of the neutral language if the Display
+                // language of the phone is not supported.
+                //
+                // If a compiler error is hit then ResourceLanguage is missing from
+                // the resource file.
+                RootFrame.Language = XmlLanguage.GetLanguage(AppResources.ResourceLanguage);
+
+                // Set the FlowDirection of all elements under the root frame based
+                // on the ResourceFlowDirection resource string for each
+                // supported language.
+                //
+                // If a compiler error is hit then ResourceFlowDirection is missing from
+                // the resource file.
+                FlowDirection flow = (FlowDirection)Enum.Parse(typeof(FlowDirection), AppResources.ResourceFlowDirection);
+                RootFrame.FlowDirection = flow;
+            }
+            catch
+            {
+                // If an exception is caught here it is most likely due to either
+                // ResourceLangauge not being correctly set to a supported language
+                // code or ResourceFlowDirection is set to a value other than LeftToRight
+                // or RightToLeft.
+
+                if (Debugger.IsAttached)
+                {
+                    Debugger.Break();
+                }
+
+                throw;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/AlignmentGrid.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/AlignmentGrid.png
new file mode 100644
index 0000000000..f7d2e97804
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/AlignmentGrid.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/ApplicationIcon.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/ApplicationIcon.png
new file mode 100644
index 0000000000..7d95d4e081
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/ApplicationIcon.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/BadgeLogo.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/BadgeLogo.png
new file mode 100644
index 0000000000..eb5bb835e2
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/BadgeLogo.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Logo.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Logo.png
new file mode 100644
index 0000000000..f2e1f40a07
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Logo.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SplashScreen.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SplashScreen.png
new file mode 100644
index 0000000000..4b9072882a
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SplashScreen.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile150x150.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile150x150.png
new file mode 100644
index 0000000000..ec1d121551
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile150x150.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile71x71.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile71x71.png
new file mode 100644
index 0000000000..4754af3a7c
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/SquareTile71x71.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/StoreLogo.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/StoreLogo.png
new file mode 100644
index 0000000000..12c5f4f655
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/StoreLogo.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileLarge.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileLarge.png
new file mode 100644
index 0000000000..e0c59ac014
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileLarge.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileMedium.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileMedium.png
new file mode 100644
index 0000000000..e93b89d600
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileMedium.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileSmall.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileSmall.png
new file mode 100644
index 0000000000..550b1b5e8d
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/FlipCycleTileSmall.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileMediumLarge.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileMediumLarge.png
new file mode 100644
index 0000000000..686e6b53f0
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileMediumLarge.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileSmall.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileSmall.png
new file mode 100644
index 0000000000..d4b5ede1b5
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/Tiles/IconicTileSmall.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/WideLogo.png b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/WideLogo.png
new file mode 100644
index 0000000000..082197b62b
Binary files /dev/null and b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Assets/WideLogo.png differ
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/CodecApp.csproj b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/CodecApp.csproj
new file mode 100644
index 0000000000..6b219d8217
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/CodecApp.csproj
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5424CF29-908E-417E-93F3-F1CD81E5372C}</ProjectGuid>
+    <ProjectTypeGuids>{C089C8C0-30E0-4E22-80C0-CE093F111A43};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CodecApp</RootNamespace>
+    <AssemblyName>CodecApp</AssemblyName>
+    <TargetFrameworkIdentifier>WindowsPhone</TargetFrameworkIdentifier>
+    <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
+    <SilverlightVersion>
+    </SilverlightVersion>
+    <SilverlightApplication>true</SilverlightApplication>
+    <SupportedCultures>
+    </SupportedCultures>
+    <XapOutputs>true</XapOutputs>
+    <GenerateSilverlightManifest>true</GenerateSilverlightManifest>
+    <XapFilename>CodecApp_$(Configuration)_$(Platform).xap</XapFilename>
+    <SilverlightManifestTemplate>Properties\AppManifest.xml</SilverlightManifestTemplate>
+    <SilverlightAppEntry>CodecApp.App</SilverlightAppEntry>
+    <ValidateXaml>true</ValidateXaml>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <ThrowErrorsInValidation>true</ThrowErrorsInValidation>
+    <TargetFrameworkProfile />
+    <DefaultLanguage>en-US</DefaultLanguage>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\x86\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\x86\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|ARM' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Bin\ARM\Debug</OutputPath>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|ARM' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Bin\ARM\Release</OutputPath>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <NoStdLib>true</NoStdLib>
+    <NoConfig>true</NoConfig>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget />
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LocalizedStrings.cs" />
+    <Compile Include="MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Resources\AppResources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>AppResources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </ApplicationDefinition>
+    <Page Include="MainPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\BadgeLogo.png" />
+    <Content Include="Assets\Logo.png" />
+    <Content Include="Assets\SplashScreen.png" />
+    <Content Include="Assets\SquareTile150x150.png" />
+    <Content Include="Assets\SquareTile71x71.png" />
+    <Content Include="Assets\StoreLogo.png" />
+    <Content Include="Assets\WideLogo.png" />
+    <Content Include="BAMQ1_JVC_C.264">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="BA1_FT_C.264">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="BA_MW_D.264">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <None Include="CiscoVT2people_160x96_6fps.yuv">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="layer2.cfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+    <None Include="Properties\AppManifest.xml" />
+    <None Include="Properties\WMAppManifest.xml">
+      <SubType>Designer</SubType>
+    </None>
+    <Content Include="openh264.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="welsenc.cfg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\AlignmentGrid.png" />
+    <Content Include="Assets\ApplicationIcon.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileLarge.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileMedium.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\FlipCycleTileSmall.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\IconicTileMediumLarge.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Assets\Tiles\IconicTileSmall.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Resources\AppResources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>AppResources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CodecRTComponent.vcxproj">
+      <Project>{fe5bf241-f4ea-4b94-b36a-23511e5908ec}</Project>
+      <Name>CodecRTComponent</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).$(TargetFrameworkVersion).Overrides.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\$(TargetFrameworkIdentifier)\$(TargetFrameworkVersion)\Microsoft.$(TargetFrameworkIdentifier).CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+  <ProjectExtensions />
+  <PropertyGroup>
+    <PreBuildEvent>copy  /y   ..\..\..\..\..\..\..\..\bin\$(Platform)\$(Configuration)\openh264.dll    ..\..\..\
+copy  /y   ..\..\..\..\..\..\..\..\res\*.yuv    ..\..\..\
+copy  /y   ..\..\..\..\..\..\..\..\res\B*.264    ..\..\..\
+</PreBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/LocalizedStrings.cs b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/LocalizedStrings.cs
new file mode 100644
index 0000000000..e18e5b6786
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/LocalizedStrings.cs
@@ -0,0 +1,14 @@
+using CodecApp.Resources;
+
+namespace CodecApp
+{
+    /// <summary>
+    /// Provides access to string resources.
+    /// </summary>
+    public class LocalizedStrings
+    {
+        private static AppResources _localizedResources = new AppResources();
+
+        public AppResources LocalizedResources { get { return _localizedResources; } }
+    }
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml
new file mode 100644
index 0000000000..46191fa81b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml
@@ -0,0 +1,66 @@
+<phone:PhoneApplicationPage
+    x:Class="CodecApp.MainPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:phone="clr-namespace:Microsoft.Phone.Controls;assembly=Microsoft.Phone"
+    xmlns:shell="clr-namespace:Microsoft.Phone.Shell;assembly=Microsoft.Phone"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    FontFamily="{StaticResource PhoneFontFamilyNormal}"
+    FontSize="{StaticResource PhoneFontSizeNormal}"
+    Foreground="{StaticResource PhoneForegroundBrush}"
+    SupportedOrientations="Portrait" Orientation="Portrait"
+    shell:SystemTray.IsVisible="True">
+
+    <!--LayoutRoot is the root grid where all page content is placed-->
+    <Grid x:Name="LayoutRoot" Background="Transparent">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+
+        <!-- LOCALIZATION NOTE:
+            To localize the displayed strings copy their values to appropriately named
+            keys in the app's neutral language resource file (AppResources.resx) then
+            replace the hard-coded text value between the attributes' quotation marks
+            with the binding clause whose path points to that string name.
+
+            For example:
+
+                Text="{Binding Path=LocalizedResources.ApplicationTitle, Source={StaticResource LocalizedStrings}}"
+
+            This binding points to the template's string resource named "ApplicationTitle".
+
+            Adding supported languages in the Project Properties tab will create a
+            new resx file per language that can carry the translated values of your
+            UI strings. The binding in these examples will cause the value of the
+            attributes to be drawn from the .resx file that matches the
+            CurrentUICulture of the app at run time.
+         -->
+
+        <!--TitlePanel contains the name of the application and page title-->
+        <StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
+            <TextBlock Text="MY APPLICATION" Style="{StaticResource PhoneTextNormalStyle}" Margin="12,0"/>
+            <TextBlock Text="page name" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
+        </StackPanel>
+
+        <!--ContentPanel - place additional content here-->
+        <Grid x:Name="ContentPanel" Grid.Row="1" Margin="14,10,10,-10">
+            <Button Content="CallEncoder" HorizontalAlignment="Left" Margin="49,10,0,0" VerticalAlignment="Top" Width="340" Click="Button_Click_CallEncoder"/>
+            <Button Content="CallDecoder" HorizontalAlignment="Left" Margin="63,297,0,0" VerticalAlignment="Top" Width="326" Click="Button_Click__CallDecoder"/>
+            <TextBox x:Name="DecoderInfo" HorizontalAlignment="Left" Height="183" Margin="37,374,0,0" TextWrapping="Wrap" Text="Decoder info" VerticalAlignment="Top" Width="397"/>
+            <TextBox x:Name="EncoderInfo" HorizontalAlignment="Left" Height="191" Margin="37,82,0,0" TextWrapping="Wrap" Text="Encoder info" VerticalAlignment="Top" Width="397"/>
+
+        </Grid>
+
+        <!--Uncomment to see an alignment grid to help ensure your controls are
+            aligned on common boundaries.  The image has a top margin of -32px to
+            account for the System Tray. Set this to 0 (or remove the margin altogether)
+            if the System Tray is hidden.
+
+            Before shipping remove this XAML and the image itself.-->
+        <!--<Image Source="/Assets/AlignmentGrid.png" VerticalAlignment="Top" Height="800" Width="480" Margin="0,-32,0,0" Grid.Row="0" Grid.RowSpan="2" IsHitTestVisible="False" />-->
+    </Grid>
+
+</phone:PhoneApplicationPage>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml.cs b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml.cs
new file mode 100644
index 0000000000..d0a2ead660
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/MainPage.xaml.cs
@@ -0,0 +1,86 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Navigation;
+using Microsoft.Phone.Controls;
+using Microsoft.Phone.Shell;
+using CodecApp.Resources;
+using CodecRTComponent;
+
+namespace CodecApp {
+public partial class MainPage : PhoneApplicationPage {
+  // Constructor
+  private CodecRunTimeComponent vRTCCodec;
+  // Constructor
+  public MainPage() {
+    InitializeComponent();
+
+    vRTCCodec = new CodecRunTimeComponent();
+    // Sample code to localize the ApplicationBar
+    //BuildLocalizedApplicationBar();
+  }
+
+  private void Button_Click_CallEncoder (object sender, RoutedEventArgs e) {
+    int iRetVal         = 0;
+    float fFPS          = 0.0F;
+    double dEncoderTime = 0.0;
+    int iEncodedFrame   = 0;
+    string sEncoderInfo = "Encoder performance: \n";
+
+    iRetVal = vRTCCodec.Encode();
+
+    if (0 == iRetVal) {
+      fFPS = vRTCCodec.GetEncFPS();
+      dEncoderTime = vRTCCodec.GetEncTime();
+      iEncodedFrame = vRTCCodec.GetEncodedFrameNum();
+      sEncoderInfo += "FPS         : " + fFPS.ToString() + "\n";
+      sEncoderInfo += "EncTime(sec): " + dEncoderTime.ToString() + "\n";
+      sEncoderInfo += "EncodedNum  : " + iEncodedFrame.ToString() + "\n";
+      EncoderInfo.Text = sEncoderInfo;
+    } else {
+      EncoderInfo.Text = "ebcoded failed!...";
+    }
+  }
+
+  private void Button_Click__CallDecoder (object sender, RoutedEventArgs e) {
+    int iRetVal = 0;
+    float fFPS = 0.0F;
+    double dDecoderTime = 0.0;
+    int iDecodedFrame = 0;
+    string sDecoderInfo = "Decoder performance: \n";
+
+    iRetVal = vRTCCodec.Decode();
+
+    if (0 == iRetVal) {
+      fFPS = vRTCCodec.GetDecFPS();
+      dDecoderTime = vRTCCodec.GetDecTime();
+      iDecodedFrame = vRTCCodec.GetDecodedFrameNum();
+      sDecoderInfo += "FPS         : " + fFPS.ToString() + "\n";
+      sDecoderInfo += "DecTime(sec): " + dDecoderTime.ToString() + "\n";
+      sDecoderInfo += "DecodedNum  : " + iDecodedFrame.ToString() + "\n";
+      DecoderInfo.Text = sDecoderInfo;
+    } else {
+      DecoderInfo.Text = "decoded failed!...";
+    }
+  }
+
+  // Sample code for building a localized ApplicationBar
+  //private void BuildLocalizedApplicationBar()
+  //{
+  //    // Set the page's ApplicationBar to a new instance of ApplicationBar.
+  //    ApplicationBar = new ApplicationBar();
+
+  //    // Create a new button and set the text value to the localized string from AppResources.
+  //    ApplicationBarIconButton appBarButton = new ApplicationBarIconButton(new Uri("/Assets/AppBar/appbar.add.rest.png", UriKind.Relative));
+  //    appBarButton.Text = AppResources.AppBarButtonText;
+  //    ApplicationBar.Buttons.Add(appBarButton);
+
+  //    // Create a new menu item with the localized string from AppResources.
+  //    ApplicationBarMenuItem appBarMenuItem = new ApplicationBarMenuItem(AppResources.AppBarMenuItemText);
+  //    ApplicationBar.MenuItems.Add(appBarMenuItem);
+  //}
+}
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Package.appxmanifest b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Package.appxmanifest
new file mode 100644
index 0000000000..b6e8e84cb4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Package.appxmanifest
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest" xmlns:m3="http://schemas.microsoft.com/appx/2014/manifest" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest">
+
+  <Identity Name="f99aa5a5-a6ee-47ec-a093-390b78afba3c"
+            Publisher="CN=Openh264"
+            Version="1.0.0.0" />
+
+  <mp:PhoneIdentity PhoneProductId="5424cf29-908e-417e-93f3-f1cd81e5372c" PhonePublisherId="cb9bed24-05fd-451a-8736-6dad92946a6e"/>
+
+  <Properties>
+    <DisplayName>CodecApp</DisplayName>
+    <PublisherDisplayName>Openh264</PublisherDisplayName>
+    <Logo>Assets\StoreLogo.png</Logo>
+  </Properties>
+
+  <Prerequisites>
+    <OSMinVersion>6.3.1</OSMinVersion>
+    <OSMaxVersionTested>6.3.1</OSMaxVersionTested>
+  </Prerequisites>
+
+  <Resources>
+    <Resource Language="x-generate"/>
+  </Resources>
+
+  <Applications>
+    <Application Id="x5424cf29y908ey417ey93f3yf1cd81e5372cx"
+        Executable="AGHost.exe"
+        EntryPoint="MainPage.xaml">
+      <m3:VisualElements
+          DisplayName="CodecApp"
+          Square150x150Logo="Assets\SquareTile150x150.png"
+          Square44x44Logo="Assets\Logo.png"
+          Description="CodecApp"
+          ForegroundText="light"
+          BackgroundColor="#464646">
+        <m3:DefaultTile Square71x71Logo="Assets\SquareTile71x71.png"/>
+        <m3:SplashScreen Image="Assets\Splashscreen.png" />
+      </m3:VisualElements>
+      <Extensions>
+        <Extension Category="windows.backgroundTasks" EntryPoint="AgHost.BackgroundTask">
+          <BackgroundTasks>
+          <Task Type="systemEvent" />
+          </BackgroundTasks>
+        </Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+  <Capabilities>
+  </Capabilities>
+  <Extensions>
+    <Extension Category="windows.activatableClass.inProcessServer">
+      <InProcessServer>
+        <Path>AgHostSvcs.dll</Path>
+        <ActivatableClass ActivatableClassId="AgHost.BackgroundTask" ThreadingModel="both" />
+      </InProcessServer>
+    </Extension>
+  </Extensions>
+</Package>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AppManifest.xml b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AppManifest.xml
new file mode 100644
index 0000000000..6712a11783
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AppManifest.xml
@@ -0,0 +1,6 @@
+<Deployment xmlns="http://schemas.microsoft.com/client/2007/deployment"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+>
+    <Deployment.Parts>
+    </Deployment.Parts>
+</Deployment>
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AssemblyInfo.cs b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..095c5d66d0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Resources;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle ("CodecApp")]
+[assembly: AssemblyDescription ("")]
+[assembly: AssemblyConfiguration ("")]
+[assembly: AssemblyCompany ("")]
+[assembly: AssemblyProduct ("CodecApp")]
+[assembly: AssemblyCopyright ("Copyright ©  2015")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyCulture ("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible (false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid ("2bac46db-63e8-4c33-9be3-8e6b4638045c")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion ("1.0.0.0")]
+[assembly: AssemblyFileVersion ("1.0.0.0")]
+[assembly: NeutralResourcesLanguageAttribute ("en-US")]
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/WMAppManifest.xml b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/WMAppManifest.xml
new file mode 100644
index 0000000000..ef7a6cbd30
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Properties/WMAppManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Deployment xmlns="http://schemas.microsoft.com/windowsphone/2014/deployment" AppPlatformVersion="8.1">
+  <DefaultLanguage xmlns="" code="en-US" />
+  <App xmlns="" ProductID="{5424cf29-908e-417e-93f3-f1cd81e5372c}" Title="CodecApp" RuntimeType="Silverlight" Version="1.0.0.0" Genre="apps.normal" Author="CodecApp author" Description="Sample description" Publisher="CodecApp" PublisherID="{cb9bed24-05fd-451a-8736-6dad92946a6e}">
+    <IconPath IsRelative="true" IsResource="false">Assets\ApplicationIcon.png</IconPath>
+    <Capabilities>
+      <Capability Name="ID_CAP_NETWORKING" />
+      <Capability Name="ID_CAP_MEDIALIB_AUDIO" />
+      <Capability Name="ID_CAP_MEDIALIB_PLAYBACK" />
+      <Capability Name="ID_CAP_SENSORS" />
+      <Capability Name="ID_CAP_WEBBROWSERCOMPONENT" />
+    </Capabilities>
+    <Tasks>
+      <DefaultTask Name="_default" NavigationPage="MainPage.xaml" />
+    </Tasks>
+    <Tokens>
+      <PrimaryToken TokenID="CodecAppToken" TaskName="_default">
+        <TemplateFlip>
+          <SmallImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileSmall.png</SmallImageURI>
+          <Count>0</Count>
+          <BackgroundImageURI IsRelative="true" IsResource="false">Assets\Tiles\FlipCycleTileMedium.png</BackgroundImageURI>
+          <Title>CodecApp</Title>
+          <BackContent></BackContent>
+          <BackBackgroundImageURI></BackBackgroundImageURI>
+          <BackTitle></BackTitle>
+          <DeviceLockImageURI></DeviceLockImageURI>
+          <HasLarge></HasLarge>
+        </TemplateFlip>
+      </PrimaryToken>
+    </Tokens>
+    <ScreenResolutions>
+      <ScreenResolution Name="ID_RESOLUTION_WVGA" />
+      <ScreenResolution Name="ID_RESOLUTION_WXGA" />
+      <ScreenResolution Name="ID_RESOLUTION_HD720P" />
+    </ScreenResolutions>
+  </App>
+</Deployment>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.Designer.cs b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.Designer.cs
new file mode 100644
index 0000000000..05c3cbe215
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.Designer.cs
@@ -0,0 +1,110 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.34014
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace CodecApp.Resources {
+using System;
+
+
+/// <summary>
+///   A strongly-typed resource class, for looking up localized strings, etc.
+/// </summary>
+// This class was auto-generated by the StronglyTypedResourceBuilder
+// class via a tool like ResGen or Visual Studio.
+// To add or remove a member, edit your .ResX file then rerun ResGen
+// with the /str option, or rebuild your VS project.
+[global::System.CodeDom.Compiler.GeneratedCodeAttribute ("System.Resources.Tools.StronglyTypedResourceBuilder",
+    "4.0.0.0")]
+[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+public class AppResources {
+
+  private static global::System.Resources.ResourceManager resourceMan;
+
+  private static global::System.Globalization.CultureInfo resourceCulture;
+
+  [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute ("Microsoft.Performance",
+      "CA1811:AvoidUncalledPrivateCode")]
+  internal AppResources() {
+  }
+
+  /// <summary>
+  ///   Returns the cached ResourceManager instance used by this class.
+  /// </summary>
+  [global::System.ComponentModel.EditorBrowsableAttribute (global::System.ComponentModel.EditorBrowsableState.Advanced)]
+  public static global::System.Resources.ResourceManager ResourceManager {
+    get {
+      if (object.ReferenceEquals (resourceMan, null)) {
+        global::System.Resources.ResourceManager temp = new
+        global::System.Resources.ResourceManager ("CodecApp.Resources.AppResources", typeof (AppResources).Assembly);
+        resourceMan = temp;
+      }
+      return resourceMan;
+    }
+  }
+
+  /// <summary>
+  ///   Overrides the current thread's CurrentUICulture property for all
+  ///   resource lookups using this strongly typed resource class.
+  /// </summary>
+  [global::System.ComponentModel.EditorBrowsableAttribute (global::System.ComponentModel.EditorBrowsableState.Advanced)]
+  public static global::System.Globalization.CultureInfo Culture {
+    get {
+      return resourceCulture;
+    } set {
+      resourceCulture = value;
+    }
+  }
+
+  /// <summary>
+  ///   Looks up a localized string similar to add.
+  /// </summary>
+  public static string AppBarButtonText {
+    get {
+      return ResourceManager.GetString ("AppBarButtonText", resourceCulture);
+    }
+  }
+
+  /// <summary>
+  ///   Looks up a localized string similar to Menu Item.
+  /// </summary>
+  public static string AppBarMenuItemText {
+    get {
+      return ResourceManager.GetString ("AppBarMenuItemText", resourceCulture);
+    }
+  }
+
+  /// <summary>
+  ///   Looks up a localized string similar to MY APPLICATION.
+  /// </summary>
+  public static string ApplicationTitle {
+    get {
+      return ResourceManager.GetString ("ApplicationTitle", resourceCulture);
+    }
+  }
+
+  /// <summary>
+  ///   Looks up a localized string similar to LeftToRight.
+  /// </summary>
+  public static string ResourceFlowDirection {
+    get {
+      return ResourceManager.GetString ("ResourceFlowDirection", resourceCulture);
+    }
+  }
+
+  /// <summary>
+  ///   Looks up a localized string similar to en-US.
+  /// </summary>
+  public static string ResourceLanguage {
+    get {
+      return ResourceManager.GetString ("ResourceLanguage", resourceCulture);
+    }
+  }
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.resx b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.resx
new file mode 100644
index 0000000000..529a19431a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/Resources/AppResources.resx
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="ResourceFlowDirection" xml:space="preserve">
+    <value>LeftToRight</value>
+    <comment>Controls the FlowDirection for all elements in the RootFrame. Set to the traditional direction of this resource file's language</comment>
+  </data>
+  <data name="ResourceLanguage" xml:space="preserve">
+    <value>en-US</value>
+    <comment>Controls the Language and ensures that the font for all elements in the RootFrame aligns with the app's language. Set to the language code of this resource file's language.</comment>
+  </data>
+  <data name="ApplicationTitle" xml:space="preserve">
+    <value>MY APPLICATION</value>
+  </data>
+  <data name="AppBarButtonText" xml:space="preserve">
+    <value>add</value>
+  </data>
+  <data name="AppBarMenuItemText" xml:space="preserve">
+    <value>Menu Item</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/layer2.cfg b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/layer2.cfg
new file mode 100644
index 0000000000..ebffe25297
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/layer2.cfg
@@ -0,0 +1,39 @@
+# Layer Configuration File
+
+
+#============================== INPUT / OUTPUT ==============================
+FrameWidth     160                     # Input  frame width
+FrameHeight    96                    # Input  frame height
+FrameRateOut    12                     # Output frame rate [Hz]
+ReconFile       rec_layer2.yuv          # Reconstructed file
+
+#============================== CODING ==============================
+ProfileIdc      66          # value of profile_idc (or 0 for auto detection)
+
+InitialQP       24			# Quantization parameters for base quality layer
+#================================ RATE CONTROL ===============================
+SpatialBitrate		600		# Unit: kbps, controled by DisableRC also
+MaxSpatialBitrate   800     # Unit: kbps, max bitrate for current layer
+#============================== MultiSlice Slice Argument ==============================
+# for S/M Slice(s) mode settings
+SliceMode			0		# 0: sigle slice mode; >0: multiple slices mode, see below;
+SliceSize			1500
+SliceNum			1		# multiple slices number specified
+
+SlicesAssign0		960		# count number of MBs in slice #0
+SlicesAssign1		0		# count number of MBs in slice #1
+SlicesAssign2		0		# count number of MBs in slice #2
+SlicesAssign3		0		# count number of MBs in slice #3 -- seting here is for better testing
+SlicesAssign4		0		# count number of MBs in slice #4
+SlicesAssign5		0		# count number of MBs in slice #5
+SlicesAssign6		0		# count number of MBs in slice #6
+SlicesAssign7		0		# count number of MBs in slice #7
+
+### DESIGN OF SLICE MODE ####
+# 0 SM_SINGLE_SLICE			| SliceNum==1
+# 1 SM_FIXEDSLCNUM_SLICE	| according to SliceNum			| Enabled dynamic slicing for multi-thread
+# 2 SM_RASTER_SLICE			| according to SlicesAssign		| Need input of MB numbers each slice. In addition, if other constraint in slice_argument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
+# 3 SM_ROWMB_SLICE			| according to PictureMBHeight	| Typical of single row of mbs each slice?+ slice size constraint which including re-encoding
+# 4 SM_DYN_SLICE			| according to SliceSize		| Dynamic slicing (have no idea about slice_nums until encoding current frame)
+# 5 SM_AUTO_SLICE			| according to thread number	| the number of slices is decided by the number of threads,SliceNum is ignored
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/welsenc.cfg b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/welsenc.cfg
new file mode 100644
index 0000000000..62e01b929b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecApp/welsenc.cfg
@@ -0,0 +1,62 @@
+# Cisco Scalable H.264/AVC Extension Encoder Configuration File
+
+#============================== GENERAL ==============================
+UsageType        0            #0: camera video 1:screen content
+SourceWidth      160         #input video width
+SourceHeight     96          #input video height
+InputFile       CiscoVT2people_160x96_6fps.yuv # Input  file
+OutputFile              test.264               # Bitstream file
+MaxFrameRate            30                     # Maximum frame rate [Hz]
+FramesToBeEncoded       - 1                    # Number of frames (at input frame rate)
+
+TemporalLayerNum       2                     # temporal layer number(1--4)
+IntraPeriod            0                    # Intra Period ( multipler of GoP size or -1)
+EnableSpsPpsIDAddition  1
+
+EnableFrameCropping     1                # enable frame cropping flag
+EntropyCodingModeFlag   0                #0:cavlc 1:cabac
+MaxNalSize            0            # Unit:Byte, Maximum Nal size
+#============================== LOOP FILTER ==============================
+LoopFilterDisableIDC       0                   # Loop filter idc (0: on, 1: off,
+# 2: on except for slice boundaries,
+# 3: two stage. slice boundries on in second stage
+# 4: Luma on but Chroma off (w.r.t. idc=0)
+# 5: Luma on except on slice boundaries, but Chroma off in enh. layer (w.r.t. idc=2)
+# 6: Luma on in two stage. slice boundries on in second stage, but Chroma off (w.r.t. idc=3)
+    LoopFilterAlphaC0Offset	0                      # AlphaOffset(-6..+6): valid range
+    LoopFilterBetaOffset	0                      # BetaOffset (-6..+6): valid range
+#============================== SOFTWARE IMPLEMENTATION ==============================
+    MultipleThreadIdc			    1
+# 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
+
+#============================== RATE CONTROL ==============================
+    RCMode			        0
+# 0: quality mode;  1: bitrate mode;                                             # 2: buffer based mode,can't control bitrate; -1: rc off mode;
+    TargetBitrate			5000				    # Unit: kbps, controled by EnableRC also
+    MaxOverallBitrate       6000                    # Unit: kbps, max bitrate overall
+    EnableFrameSkip			1		#Enable Frame Skip
+
+#============================== DENOISE CONTROL ==============================
+    EnableDenoise                   0              # Enable Denoise (1: enable, 0: disable)
+
+#============================== SCENE CHANGE DETECTION CONTROL =======================
+    EnableSceneChangeDetection			1			# Enable Scene Change Detection (1: enable, 0: disable)
+
+#============================== BACKGROUND DETECTION CONTROL ==============================
+    EnableBackgroundDetection		 1     # BGD control(1: enable, 0: disable)
+
+#============================== ADAPTIVE QUANTIZATION CONTROL =======================
+    EnableAdaptiveQuantization			1			# Enable Adaptive Quantization (1: enable, 0: disable)
+
+#============================== LONG TERM REFERENCE CONTROL ==============================
+    EnableLongTermReference             1              # Enable Long Term Reference (1: enable, 0: disable)
+    LtrMarkPeriod                       30             # Long Term Reference Marking Period
+
+#============================== LAYER DEFINITION ==============================
+    PrefixNALAddingCtrl		0						# Control flag of adding prefix unit (0: off, 1: on)
+# It shall always be on in SVC contexts (i.e. when there are CGS/MGS/spatial enhancement layers)
+# Can be disabled when no inter spatial layer prediction in case of its value as 0
+    NumLayers              1                      # Number of layers
+    //LayerCfg                layer0.cfg		# Layer 0 configuration file
+    //LayerCfg                layer1.cfg		# Layer 1 configuration file
+    LayerCfg                layer2.cfg		# Layer 2 configuration file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.cpp b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.cpp
new file mode 100644
index 0000000000..1861fcd976
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.cpp
@@ -0,0 +1,181 @@
+// CodecRTComponent.cpp
+#include <string.h>
+#include <iostream>
+#include "typedefs.h"
+#include "CodecRTComponent.h"
+
+using namespace CodecRTComponent;
+using namespace Platform;
+using namespace Windows::Storage;
+
+extern "C" int EncMain (int argc, char** argv);
+extern int32_t DecMain (int32_t iArgC, char* pArgV[]);
+//encoder info
+extern float   g_fFPS;
+extern double  g_dEncoderTime;
+extern int     g_iEncodedFrame;
+
+//decoder info
+extern double g_dDecTime;
+extern float  g_fDecFPS;
+extern int    g_iDecodedFrameNum;
+
+
+CodecRunTimeComponent::CodecRunTimeComponent() {
+}
+
+float CodecRunTimeComponent::GetEncFPS() {
+  return g_fFPS;
+}
+double CodecRunTimeComponent::GetEncTime() {
+  return g_dEncoderTime;
+}
+int  CodecRunTimeComponent::GetEncodedFrameNum() {
+  return g_iEncodedFrame;
+}
+
+int CodecRunTimeComponent::Encode() {
+  int iRet = 0;
+  int argc = 6;
+  char* argv[6];
+  int iSize = 0;
+
+  //App test data files' path
+  char InputPath[256] = { 0 };
+  char InputWelsEncCfgPath[256] = { 0 };
+  char InputCfgPath[256] = { 0 };
+  char InputYUVPath[256] = { 0 };
+  char OutputPath[256] = { 0 };
+  char Output264Path[256] = { 0 };
+
+  //App data location
+  Windows::Storage::StorageFolder^ InputLocation;
+  Platform::String^ InputLocationPath;
+  Windows::Storage::StorageFolder^ OutputLocation;
+  Platform::String^ OutputLocationPath;
+
+  //set input file path
+  InputLocation = Windows::ApplicationModel::Package::Current->InstalledLocation;
+  InputLocationPath = Platform::String::Concat (InputLocation->Path, "\\");
+  const wchar_t* pWcharInputFile = InputLocationPath->Data();
+
+  iSize = wcslen (pWcharInputFile);
+  InputPath[iSize] = 0;
+  for (int y = 0; y < iSize; y++) {
+    InputPath[y] = (char)pWcharInputFile[y];
+  }
+
+  //set output file path
+  OutputLocation = ApplicationData::Current->LocalFolder;
+  OutputLocationPath = Platform::String::Concat (OutputLocation->Path, "\\");
+  const wchar_t* pWcharOutputFile = OutputLocationPath->Data();
+
+  iSize = wcslen (pWcharOutputFile);
+  OutputPath[iSize] = 0;
+  for (int y = 0; y < iSize; y++) {
+    OutputPath[y] = (char)pWcharOutputFile[y];
+  }
+
+  //App
+  strcpy (InputWelsEncCfgPath, InputPath);
+  strcat (InputWelsEncCfgPath, "welsenc.cfg");
+
+  strcpy (InputYUVPath, InputPath);
+  strcat (InputYUVPath, "CiscoVT2people_160x96_6fps.yuv");
+
+  // single layer only
+  strcpy (InputCfgPath, InputPath);
+  strcat (InputCfgPath, "layer2.cfg");
+  // for multiple layers
+  /*
+  strcpy(InputCfg0Path, InputPath);
+  strcat(InputCfg0Path, "layer0.cfg");
+  strcpy(InputCfg1Path, InputPath);
+  strcat(InputCfg1Path, "layer1.cfg");
+  ...
+  */
+
+  strcpy (Output264Path, OutputPath);
+  strcat (Output264Path, "WP8_Test_CiscoVT2people_160x96_6fps.264");
+
+  argv[0] = (char*) ("EncoderApp");
+  argv[1] = InputWelsEncCfgPath;
+  argv[2] = (char*) ("-org");
+  argv[3] = InputYUVPath;
+  argv[4] = (char*) ("-bf");
+  argv[5] = Output264Path;
+
+  argc = 6;
+  iRet = EncMain (argc, argv);
+
+  return iRet;
+}
+
+
+float CodecRunTimeComponent::GetDecFPS() {
+  return g_fDecFPS;
+}
+double CodecRunTimeComponent::GetDecTime() {
+  return g_dDecTime;
+}
+int CodecRunTimeComponent::GetDecodedFrameNum() {
+  return g_iDecodedFrameNum;
+}
+
+int CodecRunTimeComponent::Decode() {
+  int iRet = 0;
+  int argc = 3;
+  char* argv[3];
+  int size = 0;
+
+  //App data files' path
+  char InputPath[256] = { 0 };
+  char OutputPath[256] = { 0 };
+  char InputBitstreamPath[256] = { 0 };
+  char OutputYUVPath[256] = { 0 };
+
+  //App data location
+  Windows::Storage::StorageFolder^ InputLocation;
+  Platform::String^ InputLocationPath;
+
+  Windows::Storage::StorageFolder^ OutputLocation;
+  Platform::String^ OutputLocationPath;
+
+  //set input file path
+  InputLocation = Windows::ApplicationModel::Package::Current->InstalledLocation;
+  InputLocationPath = Platform::String::Concat (InputLocation->Path, "\\");
+  const wchar_t* pWcharInputFile = InputLocationPath->Data();
+
+  size = wcslen (pWcharInputFile);
+  InputPath[size] = 0;
+  for (int y = 0; y < size; y++) {
+    InputPath[y] = (char)pWcharInputFile[y];
+  }
+
+  //set output file path
+  OutputLocation = ApplicationData::Current->LocalFolder;
+  OutputLocationPath = Platform::String::Concat (OutputLocation->Path, "\\");
+  const wchar_t* pWcharOutputFile = OutputLocationPath->Data();
+
+  size = wcslen (pWcharOutputFile);
+  OutputPath[size] = 0;
+  for (int y = 0; y < size; y++) {
+    OutputPath[y] = (char)pWcharOutputFile[y];
+  }
+
+  //App test setting
+  strcpy_s (InputBitstreamPath, InputPath);
+  strcat_s (InputBitstreamPath, "BA_MW_D.264");
+
+  strcpy_s (OutputYUVPath, OutputPath);
+  strcat_s (OutputYUVPath, "WP8_Dec_BA_MW_D.yuv");
+
+  argv[0] = (char*) ("DecoderApp");
+  argv[1] = InputBitstreamPath;
+  argv[2] = OutputYUVPath;
+
+  argc = 3;
+  iRet = DecMain (argc, argv);
+
+  return iRet;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.h b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.h
new file mode 100644
index 0000000000..adbed0c6df
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.h
@@ -0,0 +1,22 @@
+#pragma once
+
+namespace CodecRTComponent {
+// public ref class WindowsPhoneRuntimeComponent  sealed
+public ref class CodecRunTimeComponent sealed {
+ public:
+  CodecRunTimeComponent();
+  int Encode();
+  int Decode();
+
+  //Get encoder info
+  float GetEncFPS();
+  double GetEncTime();
+  int  GetEncodedFrameNum();
+
+  //get decoder info
+  float GetDecFPS();
+  double GetDecTime();
+  int  GetDecodedFrameNum();
+
+};
+}
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj
new file mode 100644
index 0000000000..b2a2c412da
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{fe5bf241-f4ea-4b94-b36a-23511e5908ec}</ProjectGuid>
+    <RootNamespace>CodecRTComponent</RootNamespace>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
+    <WinMDAssembly>true</WinMDAssembly>
+    <ApplicationType>Windows Phone Silverlight</ApplicationType>
+    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v120</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <GenerateManifest>false</GenerateManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <OutDir>..\..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <OutDir>..\..\..\..\bin\$(Platform)\$(Configuration)\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WINRT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WINRT_DLL;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WINRT_DLL;WINDOWS_PHONE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <AdditionalIncludeDirectories>..\..\..\console\dec\inc;..\..\..\console\common\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\console\enc\inc;..\..\..\encoder\core\inc;..\..\..\processing\interface</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>_WINRT_DLL;WINDOWS_PHONE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <CompileAsWinRT>true</CompileAsWinRT>
+      <AdditionalIncludeDirectories>..\..\..\console\dec\inc;..\..\..\console\common\inc;..\..\..\api\svc;..\..\..\common\inc;..\..\..\console\enc\inc;..\..\..\encoder\core\inc;..\..\..\processing\interface</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>ole32.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>openh264.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <Reference Include="platform.winmd">
+      <IsWinMDFile>true</IsWinMDFile>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\console\common\inc\read_config.h" />
+    <ClInclude Include="CodecRTComponent.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\console\common\src\read_config.cpp" />
+    <ClCompile Include="..\..\..\console\dec\src\d3d9_utils.cpp" />
+    <ClCompile Include="..\..\..\console\dec\src\h264dec.cpp" />
+    <ClCompile Include="..\..\..\console\enc\src\welsenc.cpp" />
+    <ClCompile Include="CodecRTComponent.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsPhone\v$(TargetPlatformVersion)\Microsoft.Cpp.WindowsPhone.$(TargetPlatformVersion).targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj.filters b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj.filters
new file mode 100644
index 0000000000..90b64f274f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/build/windowsphone/all/CodecRTComponent.vcxproj.filters
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Encoder">
+      <UniqueIdentifier>{c79b8670-dc32-4fcc-9e17-780c1ba6e72e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Decoder">
+      <UniqueIdentifier>{798a0155-92f2-4321-9d5f-47ddb62db8c7}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="CodecRTComponent.cpp" />
+    <ClCompile Include="..\..\..\console\enc\src\welsenc.cpp">
+      <Filter>Encoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\console\common\src\read_config.cpp" />
+    <ClCompile Include="..\..\..\console\dec\src\d3d9_utils.cpp">
+      <Filter>Decoder</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\console\dec\src\h264dec.cpp">
+      <Filter>Decoder</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="CodecRTComponent.h" />
+    <ClInclude Include="..\..\..\console\common\inc\read_config.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/arm_arch_common_macro.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/arm_arch_common_macro.S
new file mode 100644
index 0000000000..361d2eb26e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/arm_arch_common_macro.S
@@ -0,0 +1,83 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+
+.syntax unified
+
+#ifdef __APPLE__
+
+.text
+
+.macro WELS_ASM_FUNC_BEGIN
+.align 2
+.arm
+.globl _$0
+_$0:
+.endm
+
+.macro WELS_ASM_FUNC_END
+mov pc, lr
+.endm
+#else
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits // Mark stack as non-executable
+#endif
+.text
+#ifdef __ELF__
+.arch armv7-a
+.fpu neon
+#endif
+
+.macro WELS_ASM_FUNC_BEGIN funcName
+.align 2
+.arm
+.global \funcName
+#ifdef __ELF__
+.type \funcName, %function
+#endif
+#ifndef __clang__
+.func \funcName
+#endif
+\funcName:
+.endm
+
+.macro WELS_ASM_FUNC_END
+mov pc, lr
+#ifndef __clang__
+.endfunc
+#endif
+.endm
+#endif
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/copy_mb_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/copy_mb_neon.S
new file mode 100644
index 0000000000..8b9877374c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/copy_mb_neon.S
@@ -0,0 +1,161 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro LOAD_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: \arg0~\arg3, src*, src_stride
+    vld1.64 {\arg0}, [\arg4,:128], \arg5
+    vld1.64 {\arg1}, [\arg4,:128], \arg5
+    vld1.64 {\arg2}, [\arg4,:128], \arg5
+    vld1.64 {\arg3}, [\arg4,:128], \arg5
+//  }
+.endm
+
+.macro STORE_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: \arg0~\arg3, dst*, dst_stride
+    vst1.64 {\arg0}, [\arg4,:128], \arg5
+    vst1.64 {\arg1}, [\arg4,:128], \arg5
+    vst1.64 {\arg2}, [\arg4,:128], \arg5
+    vst1.64 {\arg3}, [\arg4,:128], \arg5
+//  }
+.endm
+
+.macro LOAD_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: \arg0~\arg3, src*, src_stride
+    vld1.64 {\arg0}, [\arg4], \arg5
+    vld1.64 {\arg1}, [\arg4], \arg5
+    vld1.64 {\arg2}, [\arg4], \arg5
+    vld1.64 {\arg3}, [\arg4], \arg5
+//  }
+.endm
+
+.macro STORE_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: \arg0~\arg3, dst*, dst_stride
+    vst1.64 {\arg0}, [\arg4], \arg5
+    vst1.64 {\arg1}, [\arg4], \arg5
+    vst1.64 {\arg2}, [\arg4], \arg5
+    vst1.64 {\arg3}, [\arg4], \arg5
+//  }
+.endm
+
+
+WELS_ASM_FUNC_BEGIN WelsCopy8x8_neon
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d0, d1, d2, d3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d0, d1, d2, d3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d4, d5, d6, d7, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d4, d5, d6, d7, r0, r1
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsCopy16x16_neon
+
+    LOAD_ALIGNED_DATA_WITH_STRIDE   q0, q1, q2, q3, r2, r3
+
+    STORE_ALIGNED_DATA_WITH_STRIDE  q0, q1, q2, q3, r0, r1
+
+    LOAD_ALIGNED_DATA_WITH_STRIDE   q8, q9, q10, q11, r2, r3
+
+    STORE_ALIGNED_DATA_WITH_STRIDE  q8, q9, q10, q11, r0, r1
+
+    LOAD_ALIGNED_DATA_WITH_STRIDE   q0, q1, q2, q3, r2, r3
+
+    STORE_ALIGNED_DATA_WITH_STRIDE  q0, q1, q2, q3, r0, r1
+
+    LOAD_ALIGNED_DATA_WITH_STRIDE   q8, q9, q10, q11, r2, r3
+
+    STORE_ALIGNED_DATA_WITH_STRIDE  q8, q9, q10, q11, r0, r1
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsCopy16x16NotAligned_neon
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q0, q1, q2, q3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q0, q1, q2, q3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q8, q9, q10, q11, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q8, q9, q10, q11, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q0, q1, q2, q3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q0, q1, q2, q3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q8, q9, q10, q11, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q8, q9, q10, q11, r0, r1
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsCopy16x8NotAligned_neon
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q0, q1, q2, q3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q0, q1, q2, q3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE q8, q9, q10, q11, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    q8, q9, q10, q11, r0, r1
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsCopy8x16_neon
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d0, d1, d2, d3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d0, d1, d2, d3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d4, d5, d6, d7, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d4, d5, d6, d7, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d0, d1, d2, d3, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d0, d1, d2, d3, r0, r1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE d4, d5, d6, d7, r2, r3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    d4, d5, d6, d7, r0, r1
+
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/deblocking_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/deblocking_neon.S
new file mode 100644
index 0000000000..293c917652
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/deblocking_neon.S
@@ -0,0 +1,857 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+
+#include "arm_arch_common_macro.S"
+
+.macro JMP_IF_128BITS_IS_ZERO arg0, arg1, arg2
+    vorr.s16    \arg2, \arg0, \arg1
+    vmov        r3, r2, \arg2
+    orr         r3, r3, r2
+    cmp         r3, #0
+.endm
+
+.macro MASK_MATRIX arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vabd.u8 \arg6, \arg1, \arg2
+    vcgt.u8 \arg6, \arg4, \arg6
+
+    vabd.u8 \arg4, \arg0, \arg1
+    vclt.u8 \arg4, \arg4, \arg5
+    vand.u8 \arg6, \arg6, \arg4
+
+    vabd.u8 \arg4, \arg3, \arg2
+    vclt.u8 \arg4, \arg4, \arg5
+    vand.u8 \arg6, \arg6, \arg4
+.endm
+
+.macro DIFF_LUMA_LT4_P1_Q1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+    vmov.i8 \arg9, #128
+    vrhadd.u8   \arg8, \arg2, \arg3
+    vhadd.u8    \arg8, \arg0, \arg8
+    vsub.s8 \arg8, \arg8, \arg9
+    vsub.s8 \arg9, \arg1, \arg9
+    vqsub.s8    \arg8, \arg8, \arg9
+    vmax.s8 \arg8, \arg8, \arg5
+    vmin.s8 \arg8, \arg8, \arg6
+    vabd.u8 \arg9, \arg0, \arg2
+    vclt.u8 \arg9, \arg9, \arg4
+    vand.s8 \arg8, \arg8, \arg9
+    vand.s8 \arg8, \arg8, \arg7
+    vadd.u8 \arg8, \arg1, \arg8
+    vabs.s8 \arg9, \arg9
+.endm
+
+.macro DIFF_LUMA_LT4_P0_Q0 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vsubl.u8    \arg5, \arg0, \arg3
+    vsubl.u8    \arg6, \arg2, \arg1
+    vshl.s16    \arg6, \arg6, #2
+    vadd.s16    \arg5, \arg5, \arg6
+    vqrshrn.s16     \arg4, \arg5, #3
+.endm
+
+
+.macro DIFF_LUMA_EQ4_P2P1P0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+    vaddl.u8    q4, \arg1, \arg2
+    vaddl.u8    q5, \arg3, \arg4
+    vadd.u16    q5, q4, q5
+
+    vaddl.u8    q4, \arg0, \arg1
+    vshl.u16    q4, q4, #1
+    vadd.u16    q4, q5, q4
+
+    vrshrn.u16      \arg0, q5, #2
+    vrshrn.u16      \arg7, q4, #3
+
+    vshl.u16    q5, q5, #1
+    vsubl.u8    q4, \arg5, \arg1
+    vadd.u16    q5, q4,q5
+
+    vaddl.u8    q4, \arg2, \arg5
+    vaddw.u8    q4, q4, \arg2
+    vaddw.u8    q4, q4, \arg3
+
+    vrshrn.u16      d10,q5, #3
+    vrshrn.u16      d8, q4, #2
+    vbsl.u8     \arg6, d10, d8
+.endm
+
+.macro DIFF_LUMA_EQ4_MASK arg0, arg1, arg2, arg3
+    vmov    \arg3, \arg2
+    vbsl.u8 \arg3, \arg0, \arg1
+.endm
+
+.macro DIFF_CHROMA_EQ4_P0Q0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+    vaddl.u8    \arg4, \arg0, \arg3
+    vaddw.u8    \arg5, \arg4, \arg1
+    vaddw.u8    \arg6, \arg4, \arg2
+    vaddw.u8    \arg5, \arg5, \arg0
+    vaddw.u8    \arg6, \arg6, \arg3
+    vrshrn.u16      \arg7, \arg5, #2
+    vrshrn.u16      \arg8, \arg6, #2
+.endm
+
+.macro LOAD_CHROMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+    vld4.u8 {\arg0[\arg8],\arg1[\arg8],\arg2[\arg8],\arg3[\arg8]}, [r0], r2
+    vld4.u8 {\arg4[\arg8],\arg5[\arg8],\arg6[\arg8],\arg7[\arg8]}, [r1], r2
+.endm
+
+.macro STORE_CHROMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+    vst4.u8 {\arg0[\arg8],\arg1[\arg8],\arg2[\arg8],\arg3[\arg8]}, [r0], r2
+    vst4.u8 {\arg4[\arg8],\arg5[\arg8],\arg6[\arg8],\arg7[\arg8]}, [r1], r2
+.endm
+
+.macro LOAD_LUMA_DATA_3 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vld3.u8 {\arg0[\arg6],\arg1[\arg6],\arg2[\arg6]}, [r2], r1
+    vld3.u8 {\arg3[\arg6],\arg4[\arg6],\arg5[\arg6]}, [r0], r1
+.endm
+
+.macro STORE_LUMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5
+    vst4.u8 {\arg0[\arg4],\arg1[\arg4],\arg2[\arg4],\arg3[\arg4]}, [r0], r1
+    vst4.u8 {\arg0[\arg5],\arg1[\arg5],\arg2[\arg5],\arg3[\arg5]}, [r2], r1
+.endm
+
+.macro STORE_LUMA_DATA_3 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vst3.u8 {\arg0[\arg6],\arg1[\arg6],\arg2[\arg6]}, [r3], r1
+    vst3.u8 {\arg3[\arg6],\arg4[\arg6],\arg5[\arg6]}, [r0], r1
+.endm
+
+.macro EXTRACT_DELTA_INTO_TWO_PART arg0, arg1
+    vcge.s8 \arg1, \arg0, #0
+    vand    \arg1, \arg0, \arg1
+    vsub.s8 \arg0, \arg1, \arg0
+.endm
+
+WELS_ASM_FUNC_BEGIN DeblockLumaLt4V_neon
+    vpush   {q4-q7}
+    vdup.u8 q11, r2
+    vdup.u8 q9, r3
+
+    add         r2, r1, r1, lsl #1
+    sub         r2, r0, r2
+    vld1.u8 {q0}, [r2], r1
+    vld1.u8 {q3}, [r0], r1
+    vld1.u8 {q1}, [r2], r1
+    vld1.u8 {q4}, [r0], r1
+    vld1.u8 {q2}, [r2]
+    vld1.u8 {q5}, [r0]
+    sub         r2, r2, r1
+
+    ldr         r3, [sp, #64]
+    vld1.s8 {d31}, [r3]
+    vdup.s8 d28, d31[0]
+    vdup.s8 d30, d31[1]
+    vdup.s8 d29, d31[2]
+    vdup.s8 d31, d31[3]
+    vtrn.32 d28, d30
+    vtrn.32 d29, d31
+    vcge.s8 q10, q14, #0
+
+    MASK_MATRIX q1, q2, q3, q4, q11, q9, q15
+    vand.u8 q10, q10, q15
+
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    DIFF_LUMA_LT4_P1_Q1 q0, q1, q2, q3, q9, q15, q14, q10, q6, q12
+    vst1.u8 {q6}, [r2], r1
+
+    DIFF_LUMA_LT4_P1_Q1 q5, q4, q3, q2, q9, q15, q14, q10, q7, q13
+
+    vabs.s8 q12, q12
+    vabs.s8 q13, q13
+    vadd.u8 q14,q14,q12
+    vadd.u8 q14,q14,q13
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    DIFF_LUMA_LT4_P0_Q0 d2, d4, d6, d8, d16, q12, q13
+    DIFF_LUMA_LT4_P0_Q0 d3, d5, d7, d9, d17, q12, q13
+    vmax.s8 q8, q8, q15
+    vmin.s8 q8, q8, q14
+    vand.s8 q8, q8, q10
+    EXTRACT_DELTA_INTO_TWO_PART q8, q9
+    vqadd.u8    q2, q2, q9
+    vqsub.u8    q2, q2, q8
+    vst1.u8 {q2}, [r2], r1
+    vqsub.u8    q3, q3, q9
+    vqadd.u8    q3, q3, q8
+    vst1.u8 {q3}, [r2]  , r1
+    vst1.u8 {q7}, [r2]
+
+    vpop    {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DeblockLumaEq4V_neon
+    vpush   {q4-q7}
+
+    vdup.u8 q5, r2
+    vdup.u8 q4, r3
+
+    sub         r3, r0, r1, lsl #2
+    vld1.u8 {q8},  [r3], r1
+    vld1.u8 {q12}, [r0], r1
+    vld1.u8 {q9},  [r3], r1
+    vld1.u8 {q13}, [r0], r1
+    vld1.u8 {q10}, [r3], r1
+    vld1.u8 {q14}, [r0], r1
+    vld1.u8 {q11}, [r3]
+    vld1.u8 {q15}, [r0]
+    sub         r3, r3, r1  , lsl #1
+
+    MASK_MATRIX q10, q11, q12, q13, q5, q4, q6
+
+    mov         r2, r2, lsr #2
+    add         r2, r2, #2
+    vdup.u8 q5, r2
+    vabd.u8 q0, q11, q12
+    vclt.u8 q7, q0, q5
+
+    vabd.u8 q1, q9, q11
+    vclt.u8 q1, q1, q4
+    vand.s8 q1, q1, q7
+
+    vabd.u8 q2, q14,q12
+    vclt.u8 q2, q2, q4
+    vand.s8 q2, q2, q7
+    vand.u8 q7, q7, q6
+
+    vmov        q3, q1
+
+    DIFF_LUMA_EQ4_P2P1P0        d16, d18, d20, d22, d24, d26, d2, d0
+    DIFF_LUMA_EQ4_P2P1P0        d17, d19, d21, d23, d25, d27, d3, d1
+
+    vand.u8 q3, q7, q3
+    DIFF_LUMA_EQ4_MASK  q0, q9, q3, q4
+    vst1.u8 {q4}, [r3], r1
+    DIFF_LUMA_EQ4_MASK  q8,q10, q3, q4
+    vst1.u8 {q4}, [r3], r1
+    DIFF_LUMA_EQ4_MASK  q1,q11, q6, q4
+    vst1.u8 {q4}, [r3], r1
+
+    vmov        q0, q2
+    DIFF_LUMA_EQ4_P2P1P0        d30, d28, d26, d24, d22, d20, d4, d6
+    DIFF_LUMA_EQ4_P2P1P0        d31, d29, d27, d25, d23, d21, d5, d7
+
+    vand.u8 q0, q7, q0
+    DIFF_LUMA_EQ4_MASK  q2,  q12, q6, q4
+    vst1.u8 {q4}, [r3], r1
+    DIFF_LUMA_EQ4_MASK  q15, q13, q0, q4
+    vst1.u8 {q4}, [r3], r1
+    DIFF_LUMA_EQ4_MASK  q3,  q14, q0, q4
+    vst1.u8 {q4}, [r3], r1
+
+    vpop    {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DeblockLumaLt4H_neon
+    vpush   {q4-q7}
+
+    vdup.u8 q11, r2
+    vdup.u8 q9, r3
+
+    sub         r2, r0, #3
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 0
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 1
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 2
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 3
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 4
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 5
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 6
+    LOAD_LUMA_DATA_3        d0, d1, d2, d6, d7, d8, 7
+
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 0
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 1
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 2
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 3
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 4
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 5
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 6
+    LOAD_LUMA_DATA_3        d3, d4, d5, d9, d10, d11, 7
+
+    vswp        d1, d2
+    vswp        d3, d4
+    vswp        d1, d4
+    vswp        d7, d8
+    vswp        d9, d10
+    vswp        d7, d10
+
+    sub         r0, r0, r1, lsl #4
+
+    ldr         r3, [sp, #64]
+    vld1.s8 {d31}, [r3]
+    vdup.s8 d28, d31[0]
+    vdup.s8 d30, d31[1]
+    vdup.s8 d29, d31[2]
+    vdup.s8 d31, d31[3]
+    vtrn.32 d28, d30
+    vtrn.32 d29, d31
+    vcge.s8 q10, q14, #0
+
+    MASK_MATRIX q1, q2, q3, q4, q11, q9, q15
+    vand.u8 q10, q10, q15
+
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    DIFF_LUMA_LT4_P1_Q1 q0, q1, q2, q3, q9, q15, q14, q10, q6, q12
+    DIFF_LUMA_LT4_P1_Q1 q5, q4, q3, q2, q9, q15, q14, q10, q7, q13
+
+    vabs.s8 q12, q12
+    vabs.s8 q13, q13
+    vadd.u8 q14,q14,q12
+    vadd.u8 q14,q14,q13
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    DIFF_LUMA_LT4_P0_Q0 d2, d4, d6, d8, d16, q12, q13
+    DIFF_LUMA_LT4_P0_Q0 d3, d5, d7, d9, d17, q12, q13
+    vmax.s8 q8, q8, q15
+    vmin.s8 q8, q8, q14
+    vand.s8 q8, q8, q10
+    EXTRACT_DELTA_INTO_TWO_PART q8, q9
+    vqadd.u8    q2, q2, q9
+    vqsub.u8    q2, q2, q8
+
+    vqsub.u8    q3, q3, q9
+    vqadd.u8    q3, q3, q8
+
+    sub     r0, #2
+    add     r2, r0, r1
+    lsl     r1, #1
+
+    vmov        q1, q6
+    vmov        q4, q7
+
+    vswp        q2, q3
+    vswp        d3, d6
+    vswp        d5, d8
+
+    STORE_LUMA_DATA_4       d2, d3, d4, d5, 0, 1
+    STORE_LUMA_DATA_4       d2, d3, d4, d5, 2, 3
+    STORE_LUMA_DATA_4       d2, d3, d4, d5, 4, 5
+    STORE_LUMA_DATA_4       d2, d3, d4, d5, 6, 7
+
+    STORE_LUMA_DATA_4       d6, d7, d8, d9, 0, 1
+    STORE_LUMA_DATA_4       d6, d7, d8, d9, 2, 3
+    STORE_LUMA_DATA_4       d6, d7, d8, d9, 4, 5
+    STORE_LUMA_DATA_4       d6, d7, d8, d9, 6, 7
+
+    vpop    {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DeblockLumaEq4H_neon
+    vpush   {q4-q7}
+    vdup.u8 q5, r2
+    vdup.u8 q4, r3
+
+    sub         r3, r0, #4              //  pix -= 4
+
+    vld1.u8 {d16}, [r3], r1
+    vld1.u8 {d17}, [r3], r1
+    vld1.u8 {d18}, [r3], r1
+    vld1.u8 {d19}, [r3], r1
+    vld1.u8 {d20}, [r3], r1
+    vld1.u8 {d21}, [r3], r1
+    vld1.u8 {d22}, [r3], r1
+    vld1.u8 {d23}, [r3], r1
+    vld1.u8 {d24}, [r3], r1
+    vld1.u8 {d25}, [r3], r1
+    vld1.u8 {d26}, [r3], r1
+    vld1.u8 {d27}, [r3], r1
+    vld1.u8 {d28}, [r3], r1
+    vld1.u8 {d29}, [r3], r1
+    vld1.u8 {d30}, [r3], r1
+    vld1.u8 {d31}, [r3], r1
+
+    vtrn.u32    d16, d20
+    vtrn.u32    d17, d21
+    vtrn.u32    d18, d22
+    vtrn.u32    d19, d23
+    vtrn.u32    d24, d28
+    vtrn.u32    d25, d29
+    vtrn.u32    d26, d30
+    vtrn.u32    d27, d31
+
+    vtrn.u16    d16, d18
+    vtrn.u16    d17, d19
+    vtrn.u16    d20, d22
+    vtrn.u16    d21, d23
+    vtrn.u16    d24, d26
+    vtrn.u16    d25, d27
+    vtrn.u16    d28, d30
+    vtrn.u16    d29, d31
+
+    vtrn.u8 d16, d17
+    vtrn.u8 d18, d19
+    vtrn.u8 d20, d21
+    vtrn.u8 d22, d23
+    vtrn.u8 d24, d25
+    vtrn.u8 d26, d27
+    vtrn.u8 d28, d29
+    vtrn.u8 d30, d31
+
+    vswp    d17, d24
+    vswp    d19, d26
+    vswp    d21, d28
+    vswp    d23, d30
+
+    vswp    q12, q9
+    vswp    q14, q11
+
+    vswp    q12, q10
+    vswp    q13, q11
+
+    MASK_MATRIX q10, q11, q12, q13, q5, q4, q6
+
+    mov         r2, r2, lsr #2
+    add         r2, r2, #2
+    vdup.u8 q5, r2
+    vabd.u8 q0, q11, q12
+    vclt.u8 q7, q0, q5
+
+    vabd.u8 q1, q9, q11
+    vclt.u8 q1, q1, q4
+    vand.s8 q1, q1, q7
+
+    vabd.u8 q2, q14,q12
+    vclt.u8 q2, q2, q4
+    vand.s8 q2, q2, q7
+    vand.u8 q7, q7, q6
+
+    vmov        q3, q1
+
+    DIFF_LUMA_EQ4_P2P1P0        d16, d18, d20, d22, d24, d26, d2, d0
+    DIFF_LUMA_EQ4_P2P1P0        d17, d19, d21, d23, d25, d27, d3, d1
+
+    vand.u8 q3, q7, q3
+    DIFF_LUMA_EQ4_MASK  q0, q9, q3, q4
+    vmov        q9, q4
+    vbsl.u8 q3, q8, q10
+    DIFF_LUMA_EQ4_MASK  q1,q11, q6, q8
+
+    vand.u8 q7, q7, q2
+
+    DIFF_LUMA_EQ4_P2P1P0        d30, d28, d26, d24, d22, d20, d4, d0
+    DIFF_LUMA_EQ4_P2P1P0        d31, d29, d27, d25, d23, d21, d5, d1
+
+    vbsl.u8 q6, q2, q12
+    DIFF_LUMA_EQ4_MASK  q15, q13, q7, q4
+
+    vbsl.u8 q7, q0, q14
+
+    vmov        q5, q6
+    vmov        q2, q9
+    vmov        q6, q4
+    vmov        q4, q8
+
+    vswp    d8, d6
+    vswp    d5, d7
+    vswp    d5, d8
+    vswp    d14, d12
+    vswp    d11, d13
+    vswp    d11, d14
+
+    sub     r3, r0, #3
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,0
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,1
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,2
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,3
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,4
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,5
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,6
+    STORE_LUMA_DATA_3       d4,d5,d6,d10,d11,d12,7
+
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,0
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,1
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,2
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,3
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,4
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,5
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,6
+    STORE_LUMA_DATA_3       d7,d8,d9,d13,d14,d15,7
+
+    vpop    {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DeblockChromaLt4V_neon
+    vdup.u8 q11, r3
+    ldr         r3, [sp, #0]
+
+    sub         r0, r0, r2  , lsl #1
+    sub         r1, r1, r2, lsl #1
+    vdup.u8     q9, r3
+    ldr         r3, [sp, #4]
+
+    vld1.u8 {d0}, [r0], r2
+    vld1.u8 {d1}, [r1], r2
+    vld1.u8 {d2}, [r0], r2
+    vld1.u8 {d3}, [r1], r2
+    vld1.u8 {d4}, [r0], r2
+    vld1.u8 {d5}, [r1], r2
+    vld1.u8 {d6}, [r0]
+    vld1.u8 {d7}, [r1]
+
+    sub         r0, r0, r2, lsl #1
+    sub         r1, r1, r2, lsl #1
+
+    vld1.s8 {d31}, [r3]
+    vmovl.u8    q14,d31
+    vshl.u64    d29,d28,#8
+    vorr        d28,d29
+    vmov        d29, d28
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    MASK_MATRIX q0, q1, q2, q3, q11, q9, q10
+
+    DIFF_LUMA_LT4_P0_Q0 d0, d2, d4, d6, d16, q12, q13
+    DIFF_LUMA_LT4_P0_Q0 d1, d3, d5, d7, d17, q12, q13
+    vmax.s8 q8, q8, q15
+    vmin.s8 q8, q8, q14
+
+    vand.s8 q8, q8, q10
+    vcge.s8 q14, q14, #0
+    vand.s8 q8, q8, q14
+    EXTRACT_DELTA_INTO_TWO_PART q8, q10
+    vqadd.u8    q1, q1, q10
+    vqsub.u8    q1, q1, q8
+    vst1.u8 {d2}, [r0], r2
+    vst1.u8 {d3}, [r1], r2
+    vqsub.u8    q2, q2, q10
+    vqadd.u8    q2, q2, q8
+    vst1.u8 {d4}, [r0]
+    vst1.u8 {d5}, [r1]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DeblockChromaEq4V_neon
+    vpush   {q4-q5}
+
+    vdup.u8 q11, r3
+    ldr         r3, [sp, #32]
+
+    sub         r0, r0, r2  , lsl #1
+    sub         r1, r1, r2, lsl #1
+    vdup.u8 q9, r3
+    vld1.u8 {d0}, [r0], r2      //  q0::p1
+    vld1.u8 {d1}, [r1], r2
+    vld1.u8 {d2}, [r0], r2      //  q1::p0
+    vld1.u8 {d3}, [r1], r2
+    vld1.u8 {d4}, [r0], r2      //  q2::q0
+    vld1.u8 {d5}, [r1], r2
+    vld1.u8 {d6}, [r0]              //  q3::q1
+    vld1.u8 {d7}, [r1]
+
+    sub         r0, r0, r2, lsl #1  //  pix = [-1*src_stride]
+    sub         r1, r1, r2, lsl #1
+
+    MASK_MATRIX q0, q1, q2, q3, q11, q9, q10
+
+    vmov            q11, q10
+
+    DIFF_CHROMA_EQ4_P0Q0        d0, d2, d4, d6, q4, q5, q8, d30, d0     // Cb::p0' q0'
+    DIFF_CHROMA_EQ4_P0Q0        d1, d3, d5, d7, q12, q13, q14, d31, d1  // Cr::p0' q0'
+
+    vbsl.u8 q10, q15, q1
+    vst1.u8 {d20}, [r0], r2
+    vst1.u8 {d21}, [r1], r2
+
+    vbsl.u8 q11, q0, q2
+    vst1.u8 {d22}, [r0]
+    vst1.u8 {d23}, [r1]
+
+    vpop    {q4-q5}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN DeblockChromaLt4H_neon
+
+    vdup.u8 q11, r3
+    ldr         r3, [sp, #0]
+
+    sub         r0, r0, #2
+    vdup.u8 q9, r3
+    ldr         r3, [sp, #4]
+    sub         r1, r1, #2
+    vld1.s8 {d31}, [r3]
+
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 0
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 1
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 2
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 3
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 4
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 5
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 6
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 7
+    vswp        q1, q2
+    vswp        d1, d2
+    vswp        d6, d5
+
+    vmovl.u8    q14, d31
+    vshl.u64    d29,d28,#8
+    vorr        d28,d29
+    vmov        d29, d28
+    veor        q15, q15
+    vsub.i8 q15,q15,q14
+
+    MASK_MATRIX q0, q1, q2, q3, q11, q9, q10
+
+    DIFF_LUMA_LT4_P0_Q0 d0, d2, d4, d6, d16, q12, q13
+    DIFF_LUMA_LT4_P0_Q0 d1, d3, d5, d7, d17, q12, q13
+    vmax.s8 q8, q8, q15
+    vmin.s8 q8, q8, q14
+
+    vand.s8 q8, q8, q10
+    vcge.s8 q14, q14, #0
+    vand.s8 q8, q8, q14
+    EXTRACT_DELTA_INTO_TWO_PART q8, q10
+    vqadd.u8    q1, q1, q10
+    vqsub.u8    q1, q1, q8
+    vqsub.u8    q2, q2, q10
+    vqadd.u8    q2, q2, q8
+
+    sub         r0, r0, r2, lsl #3
+    sub         r1, r1, r2, lsl #3
+    vswp        d1, d2
+    vswp        d6, d5
+    vswp        q1, q2
+
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 0
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 1
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 2
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 3
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 4
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 5
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 6
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 7
+
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN DeblockChromaEq4H_neon
+    vpush   {q4-q5}
+    vdup.u8 q11, r3
+    ldr         r3, [sp, #32]
+
+    sub         r0, r0, #2
+    sub         r1, r1, #2
+
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 0
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 1
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 2
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 3
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 4
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 5
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 6
+    LOAD_CHROMA_DATA_4  d0, d1, d2, d3, d4, d5, d6, d7, 7
+    vswp        q1, q2
+    vswp        d1, d2
+    vswp        d6, d5
+
+    vdup.u8 q9, r3
+    MASK_MATRIX q0, q1, q2, q3, q11, q9, q10
+    vmov            q11, q10
+
+    DIFF_CHROMA_EQ4_P0Q0        d0, d2, d4, d6, q8, q9, q12, d8, d10
+    DIFF_CHROMA_EQ4_P0Q0        d1, d3, d5, d7, q13, q14, q15, d9, d11
+
+    vbsl.u8 q10, q4, q1
+    vbsl.u8 q11, q5, q2
+    sub         r0, r0, r2, lsl #3  //  pix: 0th row    [-2]
+    sub         r1, r1, r2, lsl #3
+
+    vmov        q1, q10
+    vmov        q2, q11
+    vswp        d1, d2
+    vswp        d6, d5
+    vswp        q1, q2
+    //  Cb:d0d1d2d3, Cr:d4d5d6d7
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 0
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 1
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 2
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 3
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 4
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 5
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 6
+    STORE_CHROMA_DATA_4 d0, d1, d2, d3, d4, d5, d6, d7, 7
+
+    vpop    {q4-q5}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsNonZeroCount_neon
+    mov       r1, #1
+    vdup.8    q2, r1
+    vld1.64   {d0,d1,d2}, [r0]
+    vmin.s8   q0, q0, q2
+    vmin.s8   d2, d2, d4
+    vst1.64   {d0,d1,d2}, [r0]
+WELS_ASM_FUNC_END
+
+.macro BS_NZC_CHECK  arg0, arg1, arg2, arg3, arg4
+    vld1.8   {d0,d1}, [\arg0]
+    /* Arrenge the input data --- TOP */
+    ands     r6, \arg1, #2
+    beq      bs_nzc_check_jump0
+
+    sub      r6, \arg0, \arg2, lsl #4
+    sub      r6, r6, \arg2, lsl #3
+    add      r6, #12
+    vld1.32  d3[1], [r6]
+
+bs_nzc_check_jump0:
+    vext.8   q1, q1, q0, #12
+    vadd.u8  \arg3, q0, q1
+
+
+    /* Arrenge the input data --- LEFT */
+    ands     r6, \arg1, #1
+    beq      bs_nzc_check_jump1
+
+    sub      r6, \arg0, #21
+    add      r7, r6, #4
+    vld1.8   d3[4], [r6]
+    add      r6, r7, #4
+    vld1.8   d3[5], [r7]
+    add      r7, r6, #4
+    vld1.8   d3[6], [r6]
+    vld1.8   d3[7], [r7]
+
+bs_nzc_check_jump1:
+    vzip.8   d0, d1
+    vzip.8   d0, d1
+    vext.8   q1, q1, q0, #12
+    vadd.u8  \arg4, q0, q1
+.endm
+
+.macro BS_COMPARE_MV  arg0, arg1, arg2, arg3, arg4, arg5, arg6 //in: $0,$1(const),$2(const),$3(const),$4(const); out:$5, $6
+    mov       r6, #4
+    vabd.s16  q8, \arg0, \arg1
+    vabd.s16  q9, \arg1, \arg2
+    vdup.s16  \arg0, r6
+    vabd.s16  q10, \arg2, \arg3
+    vabd.s16  q11, \arg3, \arg4
+
+    vcge.s16  q8, \arg0
+    vcge.s16  q9, \arg0
+    vcge.s16  q10, \arg0
+    vcge.s16  q11, \arg0
+
+    vpadd.i16 d16, d16, d17
+    vpadd.i16 d17, d18, d19
+    vpadd.i16 d18, d20, d21
+    vpadd.i16 d19, d22, d23
+
+    vaddhn.i16  \arg5, q8, q8
+    vaddhn.i16  \arg6, q9, q9
+.endm
+
+.macro BS_MV_CHECK  arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vldm   \arg0, {q0,q1,q2,q3}
+
+    /* Arrenge the input data --- TOP */
+    ands     r6, \arg1, #2
+    beq      bs_mv_check_jump0
+
+    sub      r6, \arg0, \arg2, lsl #6
+    add      r6, #48
+    vld1.8   {d8, d9}, [r6]
+
+bs_mv_check_jump0:
+    BS_COMPARE_MV  q4, q0, q1, q2, q3, \arg3, \arg4
+
+    /* Arrenge the input data --- LEFT */
+    ands     r6, \arg1, #1
+    beq      bs_mv_check_jump1
+
+    sub      r6, \arg0, #52
+    add      r7, r6, #16
+    vld1.32   d8[0], [r6]
+    add      r6, r7, #16
+    vld1.32   d8[1], [r7]
+    add      r7, r6, #16
+    vld1.32   d9[0], [r6]
+    vld1.32   d9[1], [r7]
+
+bs_mv_check_jump1:
+    vzip.32   q0, q2
+    vzip.32   q1, q3
+    vzip.32   q0, q1
+    vzip.32   q2, q3
+    BS_COMPARE_MV  q4, q0, q1, q2, q3, \arg5, \arg6
+.endm
+
+
+WELS_ASM_FUNC_BEGIN DeblockingBSCalcEnc_neon
+
+    stmdb sp!, {r5-r7}
+    vpush {q4}
+
+    ldr  r5, [sp, #28]  //Save BS to r5
+
+    /* Checking the nzc status */
+    BS_NZC_CHECK r0, r2, r3, q14, q15 //q14,q15 save the nzc status
+
+    /* For checking bS[I] = 2 */
+    mov      r6, #2
+    vcgt.s8  q14, q14, #0
+    vdup.u8  q0, r6
+    vcgt.s8  q15, q15, #0
+
+    vand.u8  q14, q14, q0 //q14 save the nzc check result all the time --- for dir is top
+    vand.u8  q15, q15, q0 //q15 save the nzc check result all the time --- for dir is left
+
+    /* Checking the mv status*/
+    BS_MV_CHECK r1, r2, r3, d24, d25, d26, d27//q12, q13 save the mv status
+
+    /* For checking bS[I] = 1 */
+    mov      r6, #1
+    vdup.u8  q0, r6
+
+    vand.u8  q12, q12, q0 //q12 save the nzc check result all the time --- for dir is top
+    vand.u8  q13, q13, q0 //q13 save the nzc check result all the time --- for dir is left
+
+
+    /* Check bS[I] is '1' or '2' */
+    vmax.u8 q1, q12, q14
+    vmax.u8 q0, q13, q15
+
+    //vstm r5, {q0, q1}
+    vst1.32 {q0, q1}, [r5]
+    vpop {q4}
+    ldmia sp!, {r5-r7}
+WELS_ASM_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/expand_picture_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/expand_picture_neon.S
new file mode 100644
index 0000000000..5dc403dac6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/expand_picture_neon.S
@@ -0,0 +1,154 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+WELS_ASM_FUNC_BEGIN ExpandPictureLuma_neon
+    stmdb sp!, {r4-r8}
+    //Save the dst
+    mov r7, r0
+    mov r8, r3
+
+    add r4, r7, r2
+    sub r4, #1
+    //For the left and right expand
+_expand_picture_luma_loop2:
+    sub r5, r7, #32
+    add r6, r4, #1
+
+    vld1.8 {d0[], d1[]}, [r7], r1
+    vld1.8 {d2[], d3[]}, [r4], r1
+
+    vst1.8 {q0}, [r5]!
+    vst1.8 {q0}, [r5]
+    vst1.8 {q1}, [r6]!
+    vst1.8 {q1}, [r6]
+    subs r8, #1
+    bne _expand_picture_luma_loop2
+
+    //for the top and bottom expand
+    add r2, #64
+    sub r0, #32
+    mla r4, r1, r3, r0
+    sub r4, r1
+_expand_picture_luma_loop0:
+    mov r5, #32
+    mls r5, r5, r1, r0
+    add r6, r4, r1
+    vld1.8 {q0}, [r0]!
+    vld1.8 {q1}, [r4]!
+
+    mov r8, #32
+_expand_picture_luma_loop1:
+    vst1.8 {q0}, [r5], r1
+    vst1.8 {q1}, [r6], r1
+    subs r8, #1
+    bne _expand_picture_luma_loop1
+
+    subs r2, #16
+    bne _expand_picture_luma_loop0
+
+    //vldreq.32 d0, [r0]
+
+    ldmia sp!, {r4-r8}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN ExpandPictureChroma_neon
+    stmdb sp!, {r4-r9}
+    //Save the dst
+    mov r7, r0
+    mov r8, r3
+
+    add r4, r7, r2
+    sub r4, #1
+    //For the left and right expand
+_expand_picture_chroma_loop2:
+    sub r5, r7, #16
+    add r6, r4, #1
+
+    vld1.8 {d0[], d1[]}, [r7], r1
+    vld1.8 {d2[], d3[]}, [r4], r1
+
+    vst1.8 {q0}, [r5]
+    vst1.8 {q1}, [r6]
+    subs r8, #1
+    bne _expand_picture_chroma_loop2
+
+    //for the top and bottom expand
+    add r2, #32
+    mov r9, r2
+    bic r2, #15
+    sub r0, #16
+    mla r4, r1, r3, r0
+    sub r4, r1
+_expand_picture_chroma_loop0:
+    mov r5, #16
+    mls r5, r5, r1, r0
+    add r6, r4, r1
+    vld1.8 {q0}, [r0]!
+    vld1.8 {q1}, [r4]!
+
+    mov r8, #16
+_expand_picture_chroma_loop1:
+    vst1.8 {q0}, [r5], r1
+    vst1.8 {q1}, [r6], r1
+    subs r8, #1
+    bne _expand_picture_chroma_loop1
+
+    subs r2, #16
+    bne _expand_picture_chroma_loop0
+
+    //vldreq.32 d0, [r0]
+
+    and r9, #15
+    cmp r9, #8
+    bne _expand_picture_chroma_end
+    mov r5, #16
+    mls r5, r5, r1, r0
+    add r6, r4, r1
+    vld1.8 {d0}, [r0]!
+    vld1.8 {d2}, [r4]!
+    mov r8, #16
+_expand_picture_chroma_loop3:
+    vst1.8 {d0}, [r5], r1
+    vst1.8 {d2}, [r6], r1
+    subs r8, #1
+    bne _expand_picture_chroma_loop3
+_expand_picture_chroma_end:
+
+    ldmia sp!, {r4-r9}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/intra_pred_common_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/intra_pred_common_neon.S
new file mode 100644
index 0000000000..66617a6a61
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/intra_pred_common_neon.S
@@ -0,0 +1,82 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredV_neon
+    //Get the top line data to 'q0'
+    sub  r3, r1, r2
+    vldm r3, {d0, d1}
+
+    //mov  r2, #16
+    mov  r3, #4
+    //Set the top line to the each line of MB(16*16)
+loop_0_get_i16x16_luma_pred_v:
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_v
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredH_neon
+    //stmdb sp!, {r4, lr}
+    sub  r1, r1, #1
+    mov  r3, #4
+loop_0_get_i16x16_luma_pred_h:
+    //Get one byte data from left side
+    vld1.8 {d0[],d1[]}, [r1], r2
+    vld1.8 {d2[],d3[]}, [r1], r2
+    vld1.8 {d4[],d5[]}, [r1], r2
+    vld1.8 {d6[],d7[]}, [r1], r2
+
+    //Set the line of MB using the left side byte data
+    vst1.8 {d0,d1}, [r0]!
+    //add r0, #16
+    vst1.8 {d2,d3}, [r0]!
+    //add r0, #16
+    vst1.8 {d4,d5}, [r0]!
+    //add r0, #16
+    vst1.8 {d6,d7}, [r0]!
+    //add r0, #16
+
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_h
+
+WELS_ASM_FUNC_END
+
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm/mc_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm/mc_neon.S
new file mode 100644
index 0000000000..8e1d2ba106
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm/mc_neon.S
@@ -0,0 +1,2283 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro AVERAGE_TWO_8BITS arg0, arg1, arg2
+//  {   // input:dst_d, src_d A and B; working: q13
+    vaddl.u8    q13, \arg2, \arg1
+    vrshrn.u16      \arg0, q13, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: q12, q13
+    vaddl.u8    q12, \arg0, \arg5   //q12=src[-2]+src[3]
+    vaddl.u8    q13, \arg2, \arg3   //src[0]+src[1]
+    vmla.u16    q12, q13, \arg7 //q12 += 20*(src[0]+src[1]), 2 cycles
+    vaddl.u8    q13, \arg1, \arg4   //src[-1]+src[2]
+    vmls.s16    q12, q13, \arg8 //q12 -= 5*(src[-1]+src[2]), 2 cycles
+    vqrshrun.s16        \arg6, q12, #5
+//  }
+.endm
+
+.macro FILTER_SINGLE_TAG_8BITS arg0, arg1,arg2, arg3, arg4     // when width=17/9, used
+//  {   // input: src_d{Y[0][1][2][3][4][5]X, the even of working_q2}
+    vrev64.8    \arg2, \arg0                // X[5][4][3][2][1][0]O
+    vaddl.u8    \arg3, \arg0, \arg2         // each 16bits, *[50][41][32][23][14][05]*
+    vmul.s16    \arg0, \arg2, \arg1         // 0+1*[50]-5*[41]+20[32]
+    vpadd.s16   \arg0, \arg0, \arg0
+    vpadd.s16   \arg0, \arg0, \arg0
+    vqrshrun.s16    \arg0, \arg4, #5
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS_AVERAGE_WITH_0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: q12, q13
+    vaddl.u8    q12, \arg0, \arg5   //q12=src[-2]+src[3]
+    vaddl.u8    q13, \arg2, \arg3   //src[0]+src[1]
+    vmla.u16    q12, q13, \arg7 //q12 += 20*(src[0]+src[1]), 2 cycles
+    vaddl.u8    q13, \arg1, \arg4   //src[-1]+src[2]
+    vmls.s16    q12, q13, \arg8 //q12 -= 5*(src[-1]+src[2]), 2 cycles
+    vqrshrun.s16        \arg6, q12, #5
+    vaddl.u8    q13, \arg2, \arg6
+    vrshrn.u16      \arg6, q13, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS_AVERAGE_WITH_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: q12, q13
+    vaddl.u8    q12, \arg0, \arg5   //q12=src[-2]+src[3]
+    vaddl.u8    q13, \arg2, \arg3   //src[0]+src[1]
+    vmla.u16    q12, q13, \arg7 //q12 += 20*(src[0]+src[1]), 2 cycles
+    vaddl.u8    q13, \arg1, \arg4   //src[-1]+src[2]
+    vmls.s16    q12, q13, \arg8 //q12 -= 5*(src[-1]+src[2]), 2 cycles
+    vqrshrun.s16        \arg6, q12, #5
+    vaddl.u8    q13, \arg3, \arg6
+    vrshrn.u16      \arg6, q13, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS_TO_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:d_src[-2], d_src[-1], d_src[0], d_src[1], d_src[2], d_src[3], dst_q, multiplier a/b; working:q13
+    vaddl.u8    \arg6, \arg0, \arg5     //dst_q=src[-2]+src[3]
+    vaddl.u8    q13, \arg2, \arg3   //src[0]+src[1]
+    vmla.u16    \arg6, q13, \arg7   //dst_q += 20*(src[0]+src[1]), 2 cycles
+    vaddl.u8    q13, \arg1, \arg4   //src[-1]+src[2]
+    vmls.s16    \arg6, q13, \arg8   //dst_q -= 5*(src[-1]+src[2]), 2 cycles
+//  }
+.endm
+
+.macro FILTER_3_IN_16BITS_TO_8BITS arg0, arg1, arg2, arg3
+//  {   // input:a, b, c, dst_d;
+    vsub.s16    \arg0, \arg0, \arg1         //a-b
+    vshr.s16    \arg0, \arg0, #2            //(a-b)/4
+    vsub.s16    \arg0, \arg0, \arg1         //(a-b)/4-b
+    vadd.s16    \arg0, \arg0, \arg2         //(a-b)/4-b+c
+    vshr.s16    \arg0, \arg0, #2            //((a-b)/4-b+c)/4
+    vadd.s16    \arg0, \arg0, \arg2         //((a-b)/4-b+c)/4+c = (a-5*b+20*c)/16
+    vqrshrun.s16    \arg3, \arg0, #6        //(+32)>>6
+//  }
+.endm
+
+.macro UNPACK_2_16BITS_TO_ABC arg0, arg1, arg2, arg3, arg4
+//  {   // input:q_src[-2:5], q_src[6:13](avail 8+5)/q_src[6:**](avail 4+5), dst_a, dst_b, dst_c;
+    vext.16 \arg4, \arg0, \arg1, #2     //src[0]
+    vext.16 \arg3, \arg0, \arg1, #3     //src[1]
+    vadd.s16    \arg4, \arg3                    //c=src[0]+src[1]
+
+    vext.16 \arg3, \arg0, \arg1, #1     //src[-1]
+    vext.16 \arg2, \arg0, \arg1, #4     //src[2]
+    vadd.s16    \arg3,\arg2                 //b=src[-1]+src[2]
+
+    vext.16 \arg2, \arg0, \arg1, #5     //src[3]
+    vadd.s16    \arg2, \arg0                    //a=src[-2]+src[3]
+//  }
+.endm
+
+.macro UNPACK_1_IN_8x16BITS_TO_8BITS arg0, arg1,arg2, arg3
+//  {   // each 16bits; input: d_dst, d_src[0:3] (even), d_src[4:5]+%% (odd)
+    vext.16 \arg3, \arg3, \arg3, #7 // 0x????, [0][1][2][3][4][5]
+    vrev64.16   \arg1, \arg1
+    vadd.u16    \arg2, \arg1                // C[2+3],B[1+4],A[0+5]
+    vshr.s64    \arg1, \arg2, #16
+    vshr.s64    \arg0, \arg2, #32       // Output: C \arg2, B \arg1, A \arg0
+
+    vsub.s16    \arg0, \arg0, \arg1         //a-b
+    vshr.s16    \arg0, \arg0, #2            //(a-b)/4
+    vsub.s16    \arg0, \arg0, \arg1         //(a-b)/4-b
+    vadd.s16    \arg0, \arg0, \arg2         //(a-b)/4-b+c
+    vshr.s16    \arg0, \arg0, #2            //((a-b)/4-b+c)/4
+    vadd.s16    \arg1, \arg0, \arg2         //((a-b)/4-b+c)/4+c = (a-5*b+20*c)/16
+    vqrshrun.s16    \arg0, \arg3, #6        //(+32)>>6
+//  }
+.endm
+
+WELS_ASM_FUNC_BEGIN McHorVer20WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w16_h_mc_luma_loop:
+    vld1.u8 {d0,d1,d2}, [r0], r1    //only use 21(16+5); q0=src[-2]
+    pld         [r0]
+    pld         [r0, #16]
+
+    vext.8      q2, q0, q1, #1      //q2=src[-1]
+    vext.8      q3, q0, q1, #2      //q3=src[0]
+    vext.8      q8, q0, q1, #3      //q8=src[1]
+    vext.8      q9, q0, q1, #4      //q9=src[2]
+    vext.8      q10, q0, q1, #5     //q10=src[3]
+
+    FILTER_6TAG_8BITS   d0, d4, d6, d16, d18, d20, d2, q14, q15
+
+    FILTER_6TAG_8BITS   d1, d5, d7, d17, d19, d21, d3, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d2, d3}, [r2], r3      //write 16Byte
+
+    cmp     r4, #0
+    bne     w16_h_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer20WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w8_h_mc_luma_loop:
+    vld1.u8 {d0,d1}, [r0], r1   //only use 13(8+5); q0=src[-2]
+    pld         [r0]
+
+    vext.8      d2, d0, d1, #1      //d2=src[-1]
+    vext.8      d3, d0, d1, #2      //d3=src[0]
+    vext.8      d4, d0, d1, #3      //d4=src[1]
+    vext.8      d5, d0, d1, #4      //d5=src[2]
+    vext.8      d6, d0, d1, #5      //d6=src[3]
+
+    FILTER_6TAG_8BITS   d0, d2, d3, d4, d5, d6, d1, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d1}, [r2], r3
+
+    cmp     r4, #0
+    bne     w8_h_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer20WidthEq4_neon
+    push        {r4, r5, r6}
+    ldr         r6, [sp, #12]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w4_h_mc_luma_loop:
+    vld1.u8 {d0, d1}, [r0], r1  //only use 9(4+5);d0: 1st row src[-2:5]
+    pld         [r0]
+    vld1.u8 {d2, d3}, [r0], r1  //d2: 2nd row src[-2:5]
+    pld         [r0]
+
+    vext.8      d4, d0, d1, #1      //d4: 1st row src[-1:6]
+    vext.8      d5, d2, d3, #1      //d5: 2nd row src[-1:6]
+    vext.8      q3, q2, q2, #1      //src[0:6 *]
+    vext.8      q8, q2, q2, #2      //src[1:6 * *]
+
+    vtrn.32 q3, q8                  //q3::d6:1st row [0:3]+[1:4]; d7:2nd row [0:3]+[1:4]
+    vtrn.32 d6, d7                  //d6:[0:3]; d7[1:4]
+    vtrn.32     d0, d2              //d0:[-2:1]; d2[2:5]
+    vtrn.32     d4, d5              //d4:[-1:2]; d5[3:6]
+
+    FILTER_6TAG_8BITS   d0, d4, d6, d7, d2, d5, d1, q14, q15
+
+    vmov        r4, r5, d1
+    str r4, [r2], r3
+    str r5, [r2], r3
+
+    sub     r6, #2
+    cmp     r6, #0
+    bne     w4_h_mc_luma_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer10WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w16_xy_10_mc_luma_loop:
+    vld1.u8 {d0,d1,d2}, [r0], r1    //only use 21(16+5); q0=src[-2]
+    pld         [r0]
+    pld         [r0, #16]
+
+    vext.8      q2, q0, q1, #1      //q2=src[-1]
+    vext.8      q3, q0, q1, #2      //q3=src[0]
+    vext.8      q8, q0, q1, #3      //q8=src[1]
+    vext.8      q9, q0, q1, #4      //q9=src[2]
+    vext.8      q10, q0, q1, #5     //q10=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d4, d6, d16, d18, d20, d2, q14, q15
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d1, d5, d7, d17, d19, d21, d3, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d2, d3}, [r2], r3      //write 16Byte
+
+    cmp     r4, #0
+    bne     w16_xy_10_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer10WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w8_xy_10_mc_luma_loop:
+    vld1.u8 {d0,d1}, [r0], r1   //only use 13(8+5); q0=src[-2]
+    pld         [r0]
+
+    vext.8      d2, d0, d1, #1      //d2=src[-1]
+    vext.8      d3, d0, d1, #2      //d3=src[0]
+    vext.8      d4, d0, d1, #3      //d4=src[1]
+    vext.8      d5, d0, d1, #4      //d5=src[2]
+    vext.8      d6, d0, d1, #5      //d6=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d2, d3, d4, d5, d6, d1, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d1}, [r2], r3
+
+    cmp     r4, #0
+    bne     w8_xy_10_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer10WidthEq4_neon
+    push        {r4, r5, r6}
+    ldr         r6, [sp, #12]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w4_xy_10_mc_luma_loop:
+    vld1.u8 {d0, d1}, [r0], r1  //only use 9(4+5);d0: 1st row src[-2:5]
+    pld         [r0]
+    vld1.u8 {d2, d3}, [r0], r1  //d2: 2nd row src[-2:5]
+    pld         [r0]
+
+    vext.8      d4, d0, d1, #1      //d4: 1st row src[-1:6]
+    vext.8      d5, d2, d3, #1      //d5: 2nd row src[-1:6]
+    vext.8      q3, q2, q2, #1      //src[0:6 *]
+    vext.8      q8, q2, q2, #2      //src[1:6 * *]
+
+    vtrn.32 q3, q8                  //q3::d6:1st row [0:3]+[1:4]; d7:2nd row [0:3]+[1:4]
+    vtrn.32 d6, d7                  //d6:[0:3]; d7[1:4]
+    vtrn.32     d0, d2              //d0:[-2:1]; d2[2:5]
+    vtrn.32     d4, d5              //d4:[-1:2]; d5[3:6]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d4, d6, d7, d2, d5, d1, q14, q15
+
+    vmov        r4, r5, d1
+    str r4, [r2], r3
+    str r5, [r2], r3
+
+    sub     r6, #2
+    cmp     r6, #0
+    bne     w4_xy_10_mc_luma_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer30WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w16_xy_30_mc_luma_loop:
+    vld1.u8 {d0,d1,d2}, [r0], r1    //only use 21(16+5); q0=src[-2]
+    pld         [r0]
+    pld         [r0, #16]
+
+    vext.8      q2, q0, q1, #1      //q2=src[-1]
+    vext.8      q3, q0, q1, #2      //q3=src[0]
+    vext.8      q8, q0, q1, #3      //q8=src[1]
+    vext.8      q9, q0, q1, #4      //q9=src[2]
+    vext.8      q10, q0, q1, #5     //q10=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d4, d6, d16, d18, d20, d2, q14, q15
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d1, d5, d7, d17, d19, d21, d3, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d2, d3}, [r2], r3      //write 16Byte
+
+    cmp     r4, #0
+    bne     w16_xy_30_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer30WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w8_xy_30_mc_luma_loop:
+    vld1.u8 {d0,d1}, [r0], r1   //only use 13(8+5); q0=src[-2]
+    pld         [r0]
+
+    vext.8      d2, d0, d1, #1      //d2=src[-1]
+    vext.8      d3, d0, d1, #2      //d3=src[0]
+    vext.8      d4, d0, d1, #3      //d4=src[1]
+    vext.8      d5, d0, d1, #4      //d5=src[2]
+    vext.8      d6, d0, d1, #5      //d6=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d2, d3, d4, d5, d6, d1, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d1}, [r2], r3
+
+    cmp     r4, #0
+    bne     w8_xy_30_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer30WidthEq4_neon
+    push        {r4, r5, r6}
+    ldr         r6, [sp, #12]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w4_xy_30_mc_luma_loop:
+    vld1.u8 {d0, d1}, [r0], r1  //only use 9(4+5);d0: 1st row src[-2:5]
+    pld         [r0]
+    vld1.u8 {d2, d3}, [r0], r1  //d2: 2nd row src[-2:5]
+    pld         [r0]
+
+    vext.8      d4, d0, d1, #1      //d4: 1st row src[-1:6]
+    vext.8      d5, d2, d3, #1      //d5: 2nd row src[-1:6]
+    vext.8      q3, q2, q2, #1      //src[0:6 *]
+    vext.8      q8, q2, q2, #2      //src[1:6 * *]
+
+    vtrn.32 q3, q8                  //q3::d6:1st row [0:3]+[1:4]; d7:2nd row [0:3]+[1:4]
+    vtrn.32 d6, d7                  //d6:[0:3]; d7[1:4]
+    vtrn.32     d0, d2              //d0:[-2:1]; d2[2:5]
+    vtrn.32     d4, d5              //d4:[-1:2]; d5[3:6]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d4, d6, d7, d2, d5, d1, q14, q15
+
+    vmov        r4, r5, d1
+    str r4, [r2], r3
+    str r5, [r2], r3
+
+    sub     r6, #2
+    cmp     r6, #0
+    bne     w4_xy_30_mc_luma_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer01WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {q0}, [r0], r1      //q0=src[-2]
+    vld1.u8 {q1}, [r0], r1      //q1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {q2}, [r0], r1      //q2=src[0]
+    vld1.u8 {q3}, [r0], r1      //q3=src[1]
+    vld1.u8 {q8}, [r0], r1      //q8=src[2]
+
+w16_xy_01_luma_loop:
+
+    vld1.u8 {q9}, [r0], r1      //q9=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    vst1.u8 {q10}, [r2], r3         //write 1st 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    vst1.u8 {q10}, [r2], r3         //write 2nd 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d4, d6, d16, d18, d0, d2, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d5, d7, d17, d19, d1, d3, d21, q14, q15
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    vst1.u8 {q10}, [r2], r3         //write 3rd 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d6, d16, d18, d0, d2, d4, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d7, d17, d19, d1, d3, d5, d21, q14, q15
+    vld1.u8 {q3}, [r0], r1      //read 5th row
+    vst1.u8 {q10}, [r2], r3         //write 4th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d16, d18, d0, d2, d4, d6, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d17, d19, d1, d3, d5, d7, d21, q14, q15
+    vld1.u8 {q8}, [r0], r1      //read 6th row
+    vst1.u8 {q10}, [r2], r3         //write 5th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d18, d0, d2, d4, d6, d16, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d19, d1, d3, d5, d7, d17, d21, q14, q15
+    vld1.u8 {q9}, [r0], r1      //read 7th row
+    vst1.u8 {q10}, [r2], r3         //write 6th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 8th row
+    vst1.u8 {q10}, [r2], r3         //write 7th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vst1.u8 {q10}, [r2], r3         //write 8th 16Byte
+
+    //q2, q3, q4, q5, q0 --> q0~q4
+    vswp    q0, q8
+    vswp    q0, q2
+    vmov    q1, q3
+    vmov    q3, q9                      //q0~q4
+
+    sub     r4, #8
+    cmp     r4, #0
+    bne     w16_xy_01_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer01WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0}, [r0], r1      //d0=src[-2]
+    vld1.u8 {d1}, [r0], r1      //d1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {d2}, [r0], r1      //d2=src[0]
+    vld1.u8 {d3}, [r0], r1      //d3=src[1]
+
+    vld1.u8 {d4}, [r0], r1      //d4=src[2]
+    vld1.u8 {d5}, [r0], r1      //d5=src[3]
+
+w8_xy_01_mc_luma_loop:
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vld1.u8 {d0}, [r0], r1      //read 2nd row
+    vst1.u8 {d16}, [r2], r3     //write 1st 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d1, d2, d3, d4, d5, d0, d16, q14, q15
+    vld1.u8 {d1}, [r0], r1      //read 3rd row
+    vst1.u8 {d16}, [r2], r3     //write 2nd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vld1.u8 {d2}, [r0], r1      //read 4th row
+    vst1.u8 {d16}, [r2], r3     //write 3rd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d3, d4, d5, d0, d1, d2, d16, q14, q15
+    vld1.u8 {d3}, [r0], r1      //read 5th row
+    vst1.u8 {d16}, [r2], r3     //write 4th 8Byte
+
+    //d4, d5, d0, d1, d2, d3 --> d0, d1, d2, d3, d4, d5
+    vswp    q0, q2
+    vswp    q1, q2
+
+    sub     r4, #4
+    cmp     r4, #0
+    bne     w8_xy_01_mc_luma_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer01WidthEq4_neon
+    push        {r4, r5, r6, r7}
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    ldr     r4, [r0], r1        //r4=src[-2]
+    ldr     r5, [r0], r1        //r5=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    ldr     r6, [r0], r1        //r6=src[0]
+    ldr     r7, [r0], r1        //r7=src[1]
+
+    vmov        d0, r4, r5
+    vmov        d1, r5, r6
+    vmov        d2, r6, r7
+
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d3, r7, r4
+    ldr         r7, [sp, #16]
+
+w4_xy_01_mc_luma_loop:
+
+//  pld         [r0]
+    //using reserving r4
+    ldr     r5, [r0], r1        //r5=src[3]
+    ldr     r6, [r0], r1        //r6=src[0]
+    vmov        d4, r4, r5
+    vmov        d5, r5, r6          //reserved r6
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vmov        r4, r5, d16
+    str r4, [r2], r3            //write 1st 4Byte
+    str r5, [r2], r3            //write 2nd 4Byte
+
+    ldr     r5, [r0], r1        //r5=src[1]
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d0, r6, r5
+    vmov        d1, r5, r4          //reserved r4
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_0    d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vmov        r5, r6, d16
+    str r5, [r2], r3            //write 3rd 4Byte
+    str r6, [r2], r3            //write 4th 4Byte
+
+    //d4, d5, d0, d1 --> d0, d1, d2, d3
+    vmov    q1, q0
+    vmov    q0, q2
+
+    sub     r7, #4
+    cmp     r7, #0
+    bne     w4_xy_01_mc_luma_loop
+
+    pop     {r4, r5, r6, r7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer03WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {q0}, [r0], r1      //q0=src[-2]
+    vld1.u8 {q1}, [r0], r1      //q1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {q2}, [r0], r1      //q2=src[0]
+    vld1.u8 {q3}, [r0], r1      //q3=src[1]
+    vld1.u8 {q8}, [r0], r1      //q8=src[2]
+
+w16_xy_03_luma_loop:
+
+    vld1.u8 {q9}, [r0], r1      //q9=src[3]
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    vst1.u8 {q10}, [r2], r3         //write 1st 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    vst1.u8 {q10}, [r2], r3         //write 2nd 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d4, d6, d16, d18, d0, d2, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d5, d7, d17, d19, d1, d3, d21, q14, q15
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    vst1.u8 {q10}, [r2], r3         //write 3rd 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d6, d16, d18, d0, d2, d4, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d7, d17, d19, d1, d3, d5, d21, q14, q15
+    vld1.u8 {q3}, [r0], r1      //read 5th row
+    vst1.u8 {q10}, [r2], r3         //write 4th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d16, d18, d0, d2, d4, d6, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d17, d19, d1, d3, d5, d7, d21, q14, q15
+    vld1.u8 {q8}, [r0], r1      //read 6th row
+    vst1.u8 {q10}, [r2], r3         //write 5th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d18, d0, d2, d4, d6, d16, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d19, d1, d3, d5, d7, d17, d21, q14, q15
+    vld1.u8 {q9}, [r0], r1      //read 7th row
+    vst1.u8 {q10}, [r2], r3         //write 6th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 8th row
+    vst1.u8 {q10}, [r2], r3         //write 7th 16Byte
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vst1.u8 {q10}, [r2], r3         //write 8th 16Byte
+
+    //q2, q3, q8, q9, q0 --> q0~q8
+    vswp    q0, q8
+    vswp    q0, q2
+    vmov    q1, q3
+    vmov    q3, q9                      //q0~q8
+
+    sub     r4, #8
+    cmp     r4, #0
+    bne     w16_xy_03_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer03WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0}, [r0], r1      //d0=src[-2]
+    vld1.u8 {d1}, [r0], r1      //d1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {d2}, [r0], r1      //d2=src[0]
+    vld1.u8 {d3}, [r0], r1      //d3=src[1]
+
+    vld1.u8 {d4}, [r0], r1      //d4=src[2]
+    vld1.u8 {d5}, [r0], r1      //d5=src[3]
+
+w8_xy_03_mc_luma_loop:
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vld1.u8 {d0}, [r0], r1      //read 2nd row
+    vst1.u8 {d16}, [r2], r3     //write 1st 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d1, d2, d3, d4, d5, d0, d16, q14, q15
+    vld1.u8 {d1}, [r0], r1      //read 3rd row
+    vst1.u8 {d16}, [r2], r3     //write 2nd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vld1.u8 {d2}, [r0], r1      //read 4th row
+    vst1.u8 {d16}, [r2], r3     //write 3rd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d3, d4, d5, d0, d1, d2, d16, q14, q15
+    vld1.u8 {d3}, [r0], r1      //read 5th row
+    vst1.u8 {d16}, [r2], r3     //write 4th 8Byte
+
+    //d4, d5, d0, d1, d2, d3 --> d0, d1, d2, d3, d4, d5
+    vswp    q0, q2
+    vswp    q1, q2
+
+    sub     r4, #4
+    cmp     r4, #0
+    bne     w8_xy_03_mc_luma_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer03WidthEq4_neon
+    push        {r4, r5, r6, r7}
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    ldr     r4, [r0], r1        //r4=src[-2]
+    ldr     r5, [r0], r1        //r5=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    ldr     r6, [r0], r1        //r6=src[0]
+    ldr     r7, [r0], r1        //r7=src[1]
+
+    vmov        d0, r4, r5
+    vmov        d1, r5, r6
+    vmov        d2, r6, r7
+
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d3, r7, r4
+    ldr         r7, [sp, #16]
+
+w4_xy_03_mc_luma_loop:
+
+//  pld         [r0]
+    //using reserving r4
+    ldr     r5, [r0], r1        //r5=src[3]
+    ldr     r6, [r0], r1        //r6=src[0]
+    vmov        d4, r4, r5
+    vmov        d5, r5, r6          //reserved r6
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vmov        r4, r5, d16
+    str r4, [r2], r3            //write 1st 4Byte
+    str r5, [r2], r3            //write 2nd 4Byte
+
+    ldr     r5, [r0], r1        //r5=src[1]
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d0, r6, r5
+    vmov        d1, r5, r4          //reserved r4
+
+    FILTER_6TAG_8BITS_AVERAGE_WITH_1    d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vmov        r5, r6, d16
+    str r5, [r2], r3            //write 3rd 4Byte
+    str r6, [r2], r3            //write 4th 4Byte
+
+    //d4, d5, d0, d1 --> d0, d1, d2, d3
+    vmov    q1, q0
+    vmov    q0, q2
+
+    sub     r7, #4
+    cmp     r7, #0
+    bne     w4_xy_03_mc_luma_loop
+
+    pop     {r4, r5, r6, r7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02WidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {q0}, [r0], r1      //q0=src[-2]
+    vld1.u8 {q1}, [r0], r1      //q1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {q2}, [r0], r1      //q2=src[0]
+    vld1.u8 {q3}, [r0], r1      //q3=src[1]
+    vld1.u8 {q8}, [r0], r1      //q8=src[2]
+
+w16_v_mc_luma_loop:
+
+    vld1.u8 {q9}, [r0], r1      //q9=src[3]
+
+    FILTER_6TAG_8BITS   d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    vst1.u8 {q10}, [r2], r3         //write 1st 16Byte
+
+    FILTER_6TAG_8BITS   d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    vst1.u8 {q10}, [r2], r3         //write 2nd 16Byte
+
+    FILTER_6TAG_8BITS   d4, d6, d16, d18, d0, d2, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d5, d7, d17, d19, d1, d3, d21, q14, q15
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    vst1.u8 {q10}, [r2], r3         //write 3rd 16Byte
+
+    FILTER_6TAG_8BITS   d6, d16, d18, d0, d2, d4, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d7, d17, d19, d1, d3, d5, d21, q14, q15
+    vld1.u8 {q3}, [r0], r1      //read 5th row
+    vst1.u8 {q10}, [r2], r3         //write 4th 16Byte
+
+    FILTER_6TAG_8BITS   d16, d18, d0, d2, d4, d6, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d17, d19, d1, d3, d5, d7, d21, q14, q15
+    vld1.u8 {q8}, [r0], r1      //read 6th row
+    vst1.u8 {q10}, [r2], r3         //write 5th 16Byte
+
+    FILTER_6TAG_8BITS   d18, d0, d2, d4, d6, d16, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d19, d1, d3, d5, d7, d17, d21, q14, q15
+    vld1.u8 {q9}, [r0], r1      //read 7th row
+    vst1.u8 {q10}, [r2], r3         //write 6th 16Byte
+
+    FILTER_6TAG_8BITS   d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 8th row
+    vst1.u8 {q10}, [r2], r3         //write 7th 16Byte
+
+    FILTER_6TAG_8BITS   d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vst1.u8 {q10}, [r2], r3         //write 8th 16Byte
+
+    //q2, q3, q8, q9, q0 --> q0~q8
+    vswp    q0, q8
+    vswp    q0, q2
+    vmov    q1, q3
+    vmov    q3, q9                      //q0~q8
+
+    sub     r4, #8
+    cmp     r4, #0
+    bne     w16_v_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02WidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0}, [r0], r1      //d0=src[-2]
+    vld1.u8 {d1}, [r0], r1      //d1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {d2}, [r0], r1      //d2=src[0]
+    vld1.u8 {d3}, [r0], r1      //d3=src[1]
+
+    vld1.u8 {d4}, [r0], r1      //d4=src[2]
+    vld1.u8 {d5}, [r0], r1      //d5=src[3]
+
+w8_v_mc_luma_loop:
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vld1.u8 {d0}, [r0], r1      //read 2nd row
+    vst1.u8 {d16}, [r2], r3     //write 1st 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d2, d3, d4, d5, d0, d16, q14, q15
+    vld1.u8 {d1}, [r0], r1      //read 3rd row
+    vst1.u8 {d16}, [r2], r3     //write 2nd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vld1.u8 {d2}, [r0], r1      //read 4th row
+    vst1.u8 {d16}, [r2], r3     //write 3rd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d4, d5, d0, d1, d2, d16, q14, q15
+    vld1.u8 {d3}, [r0], r1      //read 5th row
+    vst1.u8 {d16}, [r2], r3     //write 4th 8Byte
+
+    //d4, d5, d0, d1, d2, d3 --> d0, d1, d2, d3, d4, d5
+    vswp    q0, q2
+    vswp    q1, q2
+
+    sub     r4, #4
+    cmp     r4, #0
+    bne     w8_v_mc_luma_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02WidthEq4_neon
+    push        {r4, r5, r6, r7}
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    ldr     r4, [r0], r1        //r4=src[-2]
+    ldr     r5, [r0], r1        //r5=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    ldr     r6, [r0], r1        //r6=src[0]
+    ldr     r7, [r0], r1        //r7=src[1]
+
+    vmov        d0, r4, r5
+    vmov        d1, r5, r6
+    vmov        d2, r6, r7
+
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d3, r7, r4
+    ldr         r7, [sp, #16]
+
+w4_v_mc_luma_loop:
+
+//  pld         [r0]
+    //using reserving r4
+    ldr     r5, [r0], r1        //r5=src[3]
+    ldr     r6, [r0], r1        //r6=src[0]
+    vmov        d4, r4, r5
+    vmov        d5, r5, r6          //reserved r6
+
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vmov        r4, r5, d16
+    str r4, [r2], r3            //write 1st 4Byte
+    str r5, [r2], r3            //write 2nd 4Byte
+
+    ldr     r5, [r0], r1        //r5=src[1]
+    ldr     r4, [r0], r1        //r4=src[2]
+    vmov        d0, r6, r5
+    vmov        d1, r5, r4          //reserved r4
+
+    FILTER_6TAG_8BITS   d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vmov        r5, r6, d16
+    str r5, [r2], r3            //write 3rd 4Byte
+    str r6, [r2], r3            //write 4th 4Byte
+
+    //d4, d5, d0, d1 --> d0, d1, d2, d3
+    vmov    q1, q0
+    vmov    q0, q2
+
+    sub     r7, #4
+    cmp     r7, #0
+    bne     w4_v_mc_luma_loop
+
+    pop     {r4, r5, r6, r7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22WidthEq16_neon
+    push        {r4}
+    vpush       {q4-q7}
+    ldr         r4, [sp, #68]
+
+    sub         r0, #2                  //src[-2]
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0-d2}, [r0], r1       //use 21(16+5), =src[-2]
+    vld1.u8 {d3-d5}, [r0], r1       //use 21(16+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+
+    vld1.u8 {d6-d8}, [r0], r1       //use 21(16+5), =src[0]
+    vld1.u8 {d9-d11}, [r0], r1  //use 21(16+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {d12-d14}, [r0], r1 //use 21(16+5), =src[2]
+
+w16_hv_mc_luma_loop:
+
+    vld1.u8 {d15-d17}, [r0], r1 //use 21(16+5), =src[3]
+    //the 1st row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d3, d6, d9, d12, d15, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d4, d7,d10, d13, d16,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d0   //output to q0[0]
+
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d5, d8,d11, d14, d17,q11, q14, q15  // only 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d1    //output to q0[1]
+    vst1.u8 {q0}, [r2], r3      //write 16Byte
+
+
+    vld1.u8 {d0-d2}, [r0], r1       //read 2nd row
+    //the 2nd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d6, d9, d12, d15, d0, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d7,d10, d13, d16, d1,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d3   //output to d3
+
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d8,d11, d14, d17, d2,q11, q14, q15  // only 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d4    //output to d4
+
+    vst1.u8 {d3, d4}, [r2], r3      //write 16Byte
+
+    vld1.u8 {d3-d5}, [r0], r1       //read 3rd row
+    //the 3rd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d9, d12, d15, d0, d3, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d7,d10, d13, d16, d1, d4,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d6   //output to d6
+
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d8,d11, d14, d17, d2, d5,q11, q14, q15  // only 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d7    //output to d7
+    vst1.u8 {d6, d7}, [r2], r3      //write 16Byte
+
+    vld1.u8 {d6-d8}, [r0], r1       //read 4th row
+    //the 4th row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS      d9, d12, d15, d0, d3, d6, q9, q14, q15 // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d10, d13, d16, d1, d4, d7,q10, q14, q15 // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d9   //output to d9
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d11, d14, d17, d2, d5, d8,q11, q14, q15 // only 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d10   //output to d10
+    vst1.u8 {d9, d10}, [r2], r3     //write 16Byte
+
+    //d12~d17(q6~q8), d0~d8(q0~q3+d8), --> d0~d14
+    vswp    q0, q6
+    vswp    q6, q3
+    vmov    q5, q2
+    vmov    q2, q8
+
+    vmov    d20,d8
+    vmov    q4, q1
+    vmov    q1, q7
+    vmov    d14,d20
+
+    sub     r4, #4
+    cmp     r4, #0
+    bne     w16_hv_mc_luma_loop
+    vpop        {q4-q7}
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22WidthEq8_neon
+    push        {r4}
+    vpush       {q4}
+    ldr         r4, [sp, #20]
+
+    sub         r0, #2              //src[-2]
+    sub         r0, r0, r1, lsl #1  //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014        // 20
+    vld1.u8 {q0}, [r0], r1  //use 13(8+5), =src[-2]
+    vld1.u8 {q1}, [r0], r1  //use 13(8+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2        // 5
+
+    vld1.u8 {q2}, [r0], r1  //use 13(8+5), =src[0]
+    vld1.u8 {q3}, [r0], r1  //use 13(8+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {q4}, [r0], r1  //use 13(8+5), =src[2]
+
+w8_hv_mc_luma_loop:
+
+    vld1.u8 {q8}, [r0], r1  //use 13(8+5), =src[3]
+    //the 1st row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d16, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d17, q10, q14, q15  // 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2], r3           //write 8Byte
+
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    //the 2nd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d4, d6, d8, d16, d0, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d5, d7, d9, d17, d1, q10, q14, q15  // 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2], r3       //write 8Byte
+
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    //the 3rd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d6, d8, d16, d0, d2, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d7, d9, d17, d1, d3, q10, q14, q15  // 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2], r3           //write 8Byte
+
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    //the 4th row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d8, d16, d0, d2, d4, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d7, d9, d17, d1, d3, d5, q10, q14, q15  // 5 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2], r3           //write 8Byte
+
+    //q4~q5, q0~q2, --> q0~q4
+    vswp    q0, q4
+    vswp    q2, q4
+    vmov    q3, q1
+    vmov    q1, q8
+
+    sub     r4, #4
+    cmp     r4, #0
+    bne     w8_hv_mc_luma_loop
+    vpop        {q4}
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22WidthEq4_neon
+    push        {r4 ,r5, r6}
+    vpush       {q4-q7}
+    ldr         r6, [sp, #76]
+
+    sub         r0, #2              //src[-2]
+    sub         r0, r0, r1, lsl #1  //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014        // 20
+    vld1.u8 {q0}, [r0], r1  //use 9(4+5), =src[-2]
+    vld1.u8 {q1}, [r0], r1  //use 9(4+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2        // 5
+
+    vld1.u8 {q2}, [r0], r1  //use 9(4+5), =src[0]
+    vld1.u8 {q3}, [r0], r1  //use 9(4+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {q4}, [r0], r1  //use 9(4+5), =src[2]
+
+w4_hv_mc_luma_loop:
+
+    vld1.u8 {q5}, [r0], r1  //use 9(4+5), =src[3]
+    vld1.u8 {q6}, [r0], r1  //use 9(4+5), =src[4]
+
+    //the 1st&2nd row
+    pld         [r0]
+    pld         [r0, r1]
+    // vertical filtered
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d10, q7, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d11, q8, q14, q15   // 1 avail
+
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d4, d6, d8,d10, d12, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d5, d7, d9,d11, d13,q10, q14, q15   // 1 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q7, q8, q11, q12, q13   //4 avail
+    UNPACK_2_16BITS_TO_ABC  q9,q10, q0, q7, q8      //4 avail
+
+    vmov    d23, d0
+    vmov    d25, d14
+    vmov    d27, d16
+
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d22  //output to q11[0]
+    vmov        r4 ,r5, d22
+    str     r4, [r2], r3                //write 4Byte
+    str     r5, [r2], r3                //write 4Byte
+
+    //the 3rd&4th row
+    vld1.u8 {q0}, [r0], r1  //use 9(4+5), =src[3]
+    vld1.u8 {q1}, [r0], r1  //use 9(4+5), =src[4]
+    pld         [r0]
+    pld         [r0, r1]
+    // vertical filtered
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d6, d8, d10, d12, d0, q7, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d7, d9, d11, d13, d1, q8, q14, q15  // 1 avail
+
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d8,d10, d12, d0, d2, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d7, d9,d11, d13, d1, d3,q10, q14, q15   // 1 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q7, q8, q11, q12, q13   //4 avail
+    UNPACK_2_16BITS_TO_ABC  q9,q10, q2, q7, q8      //4 avail
+
+    vmov    d23, d4
+    vmov    d25, d14
+    vmov    d27, d16
+
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d22  //output to q11[0]
+    vmov        r4 ,r5, d22
+    str     r4, [r2], r3                //write 4Byte
+    str     r5, [r2], r3                //write 4Byte
+
+    //q4~q6, q0~q1, --> q0~q4
+    vswp    q4, q0
+    vmov    q3, q4
+    vmov    q4, q1
+    vmov    q1, q5
+    vmov    q2, q6
+
+    sub     r6, #4
+    cmp     r6, #0
+    bne     w4_hv_mc_luma_loop
+
+    vpop        {q4-q7}
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McCopyWidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+w16_copy_loop:
+    vld1.u8     {q0}, [r0], r1
+    sub         r4, #2
+    vld1.u8     {q1}, [r0], r1
+    vst1.u8     {q0}, [r2], r3
+    cmp         r4, #0
+    vst1.u8     {q1}, [r2], r3
+    bne         w16_copy_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McCopyWidthEq8_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+w8_copy_loop:
+    vld1.u8     {d0}, [r0], r1
+    vld1.u8     {d1}, [r0], r1
+    vst1.u8     {d0}, [r2], r3
+    vst1.u8     {d1}, [r2], r3
+    sub         r4, #2
+    cmp         r4, #0
+    bne         w8_copy_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McCopyWidthEq4_neon
+    push        {r4, r5, r6}
+    ldr         r4, [sp, #12]
+w4_copy_loop:
+    ldr     r5, [r0], r1
+    ldr     r6, [r0], r1
+    str     r5, [r2], r3
+    str     r6, [r2], r3
+
+    sub         r4, #2
+    cmp         r4, #0
+    bne         w4_copy_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN PixelAvgWidthEq16_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+w16_pix_avg_loop:
+    vld1.u8     {q0}, [r2]!
+    vld1.u8     {q1}, [r3]!
+    vld1.u8     {q2}, [r2]!
+    vld1.u8     {q3}, [r3]!
+
+    vld1.u8     {q8}, [r2]!
+    vld1.u8     {q9}, [r3]!
+    vld1.u8     {q10}, [r2]!
+    vld1.u8     {q11}, [r3]!
+
+    AVERAGE_TWO_8BITS       d0, d0, d2
+    AVERAGE_TWO_8BITS       d1, d1, d3
+    vst1.u8     {q0}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d4, d4, d6
+    AVERAGE_TWO_8BITS       d5, d5, d7
+    vst1.u8     {q2}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d16, d16, d18
+    AVERAGE_TWO_8BITS       d17, d17, d19
+    vst1.u8     {q8}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d20, d20, d22
+    AVERAGE_TWO_8BITS       d21, d21, d23
+    vst1.u8     {q10}, [r0], r1
+
+    sub         r4, #4
+    cmp         r4, #0
+    bne         w16_pix_avg_loop
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN PixelAvgWidthEq8_neon
+    push        {r4, r5}
+    ldr         r4, [sp, #8]
+    mov         r5, #16
+w8_pix_avg_loop:
+
+    vld1.u8     {d0}, [r2], r5
+    vld1.u8     {d2}, [r3], r5
+    vld1.u8     {d1}, [r2], r5
+    vld1.u8     {d3}, [r3], r5
+
+    AVERAGE_TWO_8BITS       d0, d0, d2
+    AVERAGE_TWO_8BITS       d1, d1, d3
+    vst1.u8     {d0}, [r0], r1
+    vst1.u8     {d1}, [r0], r1
+
+    vld1.u8     {d4}, [r2], r5
+    vld1.u8     {d6}, [r3], r5
+    vld1.u8     {d5}, [r2], r5
+    vld1.u8     {d7}, [r3], r5
+
+    AVERAGE_TWO_8BITS       d4, d4, d6
+    AVERAGE_TWO_8BITS       d5, d5, d7
+    vst1.u8     {d4}, [r0], r1
+    vst1.u8     {d5}, [r0], r1
+
+    sub         r4, #4
+    cmp         r4, #0
+    bne         w8_pix_avg_loop
+
+    pop     {r4, r5}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN PixelAvgWidthEq4_neon
+    push        {r4-r8}
+    ldr         r4, [sp, #20]
+w4_pix_avg_loop:
+
+    ldr     r5, [r2]
+    ldr     r6, [r2, #16]
+    ldr     r7, [r3]
+    ldr     r8, [r3, #16]
+    add     r2, #32
+    add     r3, #32
+
+    vmov        d0, r5, r6
+    vmov        d1, r7, r8
+    AVERAGE_TWO_8BITS       d0, d0, d1
+    vmov        r5, r6, d0
+
+    str     r5, [r0], r1
+    str     r6, [r0], r1
+
+    sub         r4, #2
+    cmp         r4, #0
+    bne         w4_pix_avg_loop
+
+    pop     {r4-r8}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN McChromaWidthEq8_neon
+    push        {r4, r5}
+    ldr         r4, [sp, #8]
+    ldr         r5, [sp, #12]
+//  normal case: {cA*src[x]  + cB*src[x+1]} + {cC*src[x+stride] + cD*srcp[x+stride+1]}
+//  we can opti it by adding vert only/ hori only cases, to be continue
+    vld1.u8 {d31}, [r4]     //load A/B/C/D
+    vld1.u8     {q0}, [r0], r1  //src[x]
+
+    vdup.u8 d28, d31[0]         //A
+    vdup.u8 d29, d31[1]         //B
+    vdup.u8 d30, d31[2]         //C
+    vdup.u8 d31, d31[3]         //D
+
+    vext.u8     d1, d0, d1, #1      //src[x+1]
+
+w8_mc_chroma_loop:  // each two pxl row
+    vld1.u8     {q1}, [r0], r1  //src[x+stride]
+    vld1.u8     {q2}, [r0], r1  //src[x+2*stride]
+    vext.u8     d3, d2, d3, #1      //src[x+stride+1]
+    vext.u8     d5, d4, d5, #1      //src[x+2*stride+1]
+
+    vmull.u8        q3, d0, d28         //(src[x] * A)
+    vmlal.u8        q3, d1, d29         //+=(src[x+1] * B)
+    vmlal.u8        q3, d2, d30         //+=(src[x+stride] * C)
+    vmlal.u8        q3, d3, d31         //+=(src[x+stride+1] * D)
+    vrshrn.u16      d6, q3, #6
+    vst1.u8 d6, [r2], r3
+
+    vmull.u8        q3, d2, d28         //(src[x] * A)
+    vmlal.u8        q3, d3, d29         //+=(src[x+1] * B)
+    vmlal.u8        q3, d4, d30         //+=(src[x+stride] * C)
+    vmlal.u8        q3, d5, d31         //+=(src[x+stride+1] * D)
+    vrshrn.u16      d6, q3, #6
+    vst1.u8 d6, [r2], r3
+
+    vmov        q0, q2
+    sub         r5, #2
+    cmp         r5, #0
+    bne         w8_mc_chroma_loop
+
+    pop     {r4, r5}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McChromaWidthEq4_neon
+
+    push        {r4, r5, r6}
+    ldr         r4, [sp, #12]
+    ldr         r6, [sp, #16]
+//  normal case: {cA*src[x]  + cB*src[x+1]} + {cC*src[x+stride] + cD*srcp[x+stride+1]}
+//  we can opti it by adding vert only/ hori only cases, to be continue
+    vld1.u8 {d31}, [r4]     //load A/B/C/D
+
+    vdup.u8 d28, d31[0]         //A
+    vdup.u8 d29, d31[1]         //B
+    vdup.u8 d30, d31[2]         //C
+    vdup.u8 d31, d31[3]         //D
+
+w4_mc_chroma_loop:  // each two pxl row
+    vld1.u8     {d0}, [r0], r1  //a::src[x]
+    vld1.u8     {d2}, [r0], r1  //b::src[x+stride]
+    vld1.u8     {d4}, [r0]          //c::src[x+2*stride]
+
+    vshr.u64        d1, d0, #8
+    vshr.u64        d3, d2, #8
+    vshr.u64        d5, d4, #8
+
+    vmov            q3, q1              //b::[0:7]+b::[1~8]
+    vtrn.32     q0, q1              //d0{a::[0:3]+b::[0:3]}; d1{a::[1:4]+b::[1:4]}
+    vtrn.32     q3, q2              //d6{b::[0:3]+c::[0:3]}; d7{b::[1:4]+c::[1:4]}
+
+    vmull.u8        q1, d0, d28         //(src[x] * A)
+    vmlal.u8        q1, d1, d29         //+=(src[x+1] * B)
+    vmlal.u8        q1, d6, d30         //+=(src[x+stride] * C)
+    vmlal.u8        q1, d7, d31         //+=(src[x+stride+1] * D)
+
+    vrshrn.u16      d2, q1, #6
+    vmov        r4, r5, d2
+    str r4, [r2], r3
+    str r5, [r2], r3
+
+    sub         r6, #2
+    cmp         r6, #0
+    bne         w4_mc_chroma_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN McHorVer20Width17_neon
+    push        {r4-r5}
+    mov         r4, #20
+    mov         r5, #1
+    sub         r4, r4, r4, lsl #(16-2)
+    lsl         r5, #16
+    ror         r4, #16
+    vmov        d3, r5, r4                  // 0x0014FFFB00010000
+
+    sub         r3, #16
+    ldr         r4, [sp, #8]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w17_h_mc_luma_loop:
+    vld1.u8 {d0,d1,d2}, [r0], r1    //only use 22(17+5); q0=src[-2]
+
+    vext.8      q2, q0, q1, #1      //q2=src[-1]
+    vext.8      q3, q0, q1, #2      //q3=src[0]
+    vext.8      q8, q0, q1, #3      //q8=src[1]
+    vext.8      q9, q0, q1, #4      //q9=src[2]
+    vext.8      q10, q0, q1, #5     //q10=src[3]
+
+    FILTER_6TAG_8BITS   d0, d4, d6, d16, d18, d20, d22, q14, q15
+
+    FILTER_6TAG_8BITS   d1, d5, d7, d17, d19, d21, d23, q14, q15
+
+    vst1.u8 {d22, d23}, [r2]!       //write [0:15] Byte
+
+    vsli.64 d2, d2, #8              // [0][1][2][3][4][5]XO-->O[0][1][2][3][4][5]X
+    FILTER_SINGLE_TAG_8BITS d2, d3, d22, q11, q1
+
+    vst1.u8 {d2[0]}, [r2], r3       //write 16th Byte
+
+    sub     r4, #1
+    cmp     r4, #0
+    bne     w17_h_mc_luma_loop
+    pop     {r4-r5}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer20Width9_neon
+    push        {r4-r5}
+    mov         r4, #20
+    mov         r5, #1
+    sub         r4, r4, r4, lsl #(16-2)
+    lsl         r5, #16
+    ror         r4, #16
+    vmov        d7, r5, r4                  // 0x0014FFFB00010000
+
+    sub         r3, #8
+    ldr         r4, [sp, #8]
+
+    sub         r0, #2
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w9_h_mc_luma_loop:
+    vld1.u8 {d0,d1}, [r0], r1   //only use 14(9+5); q0=src[-2]
+    pld         [r0]
+
+    vext.8      d2, d0, d1, #1      //d2=src[-1]
+    vext.8      d3, d0, d1, #2      //d3=src[0]
+    vext.8      d4, d0, d1, #3      //d4=src[1]
+    vext.8      d5, d0, d1, #4      //d5=src[2]
+    vext.8      d6, d0, d1, #5      //d6=src[3]
+
+    FILTER_6TAG_8BITS   d0, d2, d3, d4, d5, d6, d16, q14, q15
+
+    sub     r4, #1
+    vst1.u8 {d16}, [r2]!        //write [0:7] Byte
+
+    vsli.64 d2, d1, #8              // [0][1][2][3][4][5]XO-->O[0][1][2][3][4][5]X
+    FILTER_SINGLE_TAG_8BITS d2, d7, d18, q9, q1
+    vst1.u8 {d2[0]}, [r2], r3       //write 8th Byte
+
+    cmp     r4, #0
+    bne     w9_h_mc_luma_loop
+    pop     {r4-r5}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer20Width5_neon
+    push        {r4}
+    sub         r3, #4
+    sub         r0, #2
+    ldr         r4, [sp, #4]
+    vmov.u16    q14, #0x0014                // 20
+    vshr.u16    q15, q14, #2                // 5
+
+w5_h_mc_luma_loop:
+    vld1.u8 {d0,d1}, [r0], r1   //only use 10(5+5); q0=src[-2]
+    pld         [r0]
+
+    vext.8      d2, d0, d1, #1      //d2=src[-1]
+    vext.8      d3, d0, d1, #2      //d3=src[0]
+    vext.8      d4, d0, d1, #3      //d4=src[1]
+    vext.8      d5, d0, d1, #4      //d5=src[2]
+    vext.8      d6, d0, d1, #5      //d6=src[3]
+
+    FILTER_6TAG_8BITS   d0, d2, d3, d4, d5, d6, d16, q14, q15
+
+    sub     r4, #1
+    vst1.u32 {d16[0]}, [r2]!        //write [0:3] Byte
+    vst1.u8 {d16[4]}, [r2], r3       //write 5th Byte
+
+    cmp     r4, #0
+    bne     w5_h_mc_luma_loop
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02Height17_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {q0}, [r0], r1      //q0=src[-2]
+    vld1.u8 {q1}, [r0], r1      //q1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {q2}, [r0], r1      //q2=src[0]
+    vld1.u8 {q3}, [r0], r1      //q3=src[1]
+    vld1.u8 {q8}, [r0], r1      //q8=src[2]
+
+w17_v_mc_luma_loop:
+
+    vld1.u8 {q9}, [r0], r1      //q9=src[3]
+
+    FILTER_6TAG_8BITS   d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    vst1.u8 {q10}, [r2], r3         //write 1st 16Byte
+
+    FILTER_6TAG_8BITS   d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    vst1.u8 {q10}, [r2], r3         //write 2nd 16Byte
+
+    FILTER_6TAG_8BITS   d4, d6, d16, d18, d0, d2, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d5, d7, d17, d19, d1, d3, d21, q14, q15
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    vst1.u8 {q10}, [r2], r3         //write 3rd 16Byte
+
+    FILTER_6TAG_8BITS   d6, d16, d18, d0, d2, d4, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d7, d17, d19, d1, d3, d5, d21, q14, q15
+    vld1.u8 {q3}, [r0], r1      //read 5th row
+    vst1.u8 {q10}, [r2], r3         //write 4th 16Byte
+
+    FILTER_6TAG_8BITS   d16, d18, d0, d2, d4, d6, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d17, d19, d1, d3, d5, d7, d21, q14, q15
+    vld1.u8 {q8}, [r0], r1      //read 6th row
+    vst1.u8 {q10}, [r2], r3         //write 5th 16Byte
+
+    FILTER_6TAG_8BITS   d18, d0, d2, d4, d6, d16, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d19, d1, d3, d5, d7, d17, d21, q14, q15
+    vld1.u8 {q9}, [r0], r1      //read 7th row
+    vst1.u8 {q10}, [r2], r3         //write 6th 16Byte
+
+    FILTER_6TAG_8BITS   d0, d2, d4, d6, d16, d18, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vld1.u8 {q0}, [r0], r1      //read 8th row
+    vst1.u8 {q10}, [r2], r3         //write 7th 16Byte
+
+    FILTER_6TAG_8BITS   d2, d4, d6, d16, d18, d0, d20, q14, q15
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d5, d7, d17, d19, d1, d21, q14, q15
+    vst1.u8 {q10}, [r2], r3         //write 8th 16Byte
+
+    //q2, q3, q8, q9, q0 --> q0~q8
+    vswp    q0, q8
+    vswp    q0, q2
+    vmov    q1, q3
+    vmov    q3, q9                      //q0~q8
+
+    sub     r4, #8
+    cmp     r4, #1
+    bne     w17_v_mc_luma_loop
+    // the last 16Bytes
+    vld1.u8 {q9}, [r0], r1      //q9=src[3]
+    FILTER_6TAG_8BITS   d0, d2, d4, d6, d16, d18, d20, q14, q15
+    FILTER_6TAG_8BITS   d1, d3, d5, d7, d17, d19, d21, q14, q15
+    vst1.u8 {q10}, [r2], r3         //write 1st 16Byte
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02Height9_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0}, [r0], r1      //d0=src[-2]
+    vld1.u8 {d1}, [r0], r1      //d1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {d2}, [r0], r1      //d2=src[0]
+    vld1.u8 {d3}, [r0], r1      //d3=src[1]
+
+    vld1.u8 {d4}, [r0], r1      //d4=src[2]
+    vld1.u8 {d5}, [r0], r1      //d5=src[3]
+
+w9_v_mc_luma_loop:
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vld1.u8 {d0}, [r0], r1      //read 2nd row
+    vst1.u8 {d16}, [r2], r3     //write 1st 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d2, d3, d4, d5, d0, d16, q14, q15
+    vld1.u8 {d1}, [r0], r1      //read 3rd row
+    vst1.u8 {d16}, [r2], r3     //write 2nd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vld1.u8 {d2}, [r0], r1      //read 4th row
+    vst1.u8 {d16}, [r2], r3     //write 3rd 8Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d4, d5, d0, d1, d2, d16, q14, q15
+    vld1.u8 {d3}, [r0], r1      //read 5th row
+    vst1.u8 {d16}, [r2], r3     //write 4th 8Byte
+
+    //d4, d5, d0, d1, d2, d3 --> d0, d1, d2, d3, d4, d5
+    vswp    q0, q2
+    vswp    q1, q2
+
+    sub     r4, #4
+    cmp     r4, #1
+    bne     w9_v_mc_luma_loop
+
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vst1.u8 {d16}, [r2], r3     //write last 8Byte
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer02Height5_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride]
+    pld         [r0]
+    pld         [r0, r1]
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0}, [r0], r1      //d0=src[-2]
+    vld1.u8 {d1}, [r0], r1      //d1=src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+    vld1.u8 {d2}, [r0], r1      //d2=src[0]
+    vld1.u8 {d3}, [r0], r1      //d3=src[1]
+
+    vld1.u8 {d4}, [r0], r1      //d4=src[2]
+    vld1.u8 {d5}, [r0], r1      //d5=src[3]
+
+w5_v_mc_luma_loop:
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vld1.u8 {d0}, [r0], r1      //read 2nd row
+    vst1.u32 {d16[0]}, [r2], r3     //write 1st 4Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d1, d2, d3, d4, d5, d0, d16, q14, q15
+    vld1.u8 {d1}, [r0], r1      //read 3rd row
+    vst1.u32 {d16[0]}, [r2], r3     //write 2nd 4Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d2, d3, d4, d5, d0, d1, d16, q14, q15
+    vld1.u8 {d2}, [r0], r1      //read 4th row
+    vst1.u32 {d16[0]}, [r2], r3     //write 3rd 4Byte
+
+    pld         [r0]
+    FILTER_6TAG_8BITS   d3, d4, d5, d0, d1, d2, d16, q14, q15
+    vld1.u8 {d3}, [r0], r1      //read 5th row
+    vst1.u32 {d16[0]}, [r2], r3     //write 4th 8Byte
+
+    //d4, d5, d0, d1, d2, d3 --> d0, d1, d2, d3, d4, d5
+    vswp    q0, q2
+    vswp    q1, q2
+
+    sub     r4, #4
+    cmp     r4, #1
+    bne     w5_v_mc_luma_loop
+
+    FILTER_6TAG_8BITS   d0, d1, d2, d3, d4, d5, d16, q14, q15
+    vst1.u32 {d16[0]}, [r2], r3     //write last 4Byte
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22Width17_neon
+    push        {r4}
+    vpush       {q4-q7}
+    ldr         r4, [sp, #68]
+
+    sub         r0, #2                  //src[-2]
+    sub         r0, r0, r1, lsl #1      //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014            // 20
+    vld1.u8 {d0-d2}, [r0], r1       //use 21(17+5), =src[-2]
+    vld1.u8 {d3-d5}, [r0], r1       //use 21(17+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2            // 5
+
+    vld1.u8 {d6-d8}, [r0], r1       //use 21(17+5), =src[0]
+    vld1.u8 {d9-d11}, [r0], r1  //use 21(17+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {d12-d14}, [r0], r1 //use 21(17+5), =src[2]
+    sub         r3, #16
+
+w17_hv_mc_luma_loop:
+
+    vld1.u8 {d15-d17}, [r0], r1 //use 21(17+5), =src[3]
+    //the 1st row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d3, d6, d9, d12, d15, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d4, d7,d10, d13, d16,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d0   //output to q0[0]
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d5, d8,d11, d14, d17,q11, q14, q15  // only 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d1    //output to q0[1]
+    vst1.u8 {d0, d1}, [r2]!         //write 16Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d2, d22, d23, q11 //output to d2[0]
+    vst1.u8 {d2[0]}, [r2], r3       //write 16th Byte
+
+    vld1.u8 {d0-d2}, [r0], r1       //read 2nd row
+    //the 2nd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d6, d9, d12, d15, d0, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d7,d10, d13, d16, d1,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d3   //output to d3
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d8,d11, d14, d17, d2,q11, q14, q15  // only 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d4    //output to d4
+    vst1.u8 {d3, d4}, [r2]!     //write 16Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d5, d22, d23, q11 //output to d5[0]
+    vst1.u8 {d5[0]}, [r2], r3       //write 16th Byte
+
+    vld1.u8 {d3-d5}, [r0], r1       //read 3rd row
+    //the 3rd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d9, d12, d15, d0, d3, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d7,d10, d13, d16, d1, d4,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d6   //output to d6
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d8,d11, d14, d17, d2, d5,q11, q14, q15  // only 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d7    //output to d7
+    vst1.u8 {d6, d7}, [r2]!     //write 16Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d8, d22, d23, q11 //output to d8[0]
+    vst1.u8 {d8[0]}, [r2], r3       //write 16th Byte
+
+    vld1.u8 {d6-d8}, [r0], r1       //read 4th row
+    //the 4th row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS      d9, d12, d15, d0, d3, d6, q9, q14, q15 // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d10, d13, d16, d1, d4, d7,q10, q14, q15 // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d9   //output to d9
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d11, d14, d17, d2, d5, d8,q11, q14, q15 // only 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d10   //output to d10
+    vst1.u8 {d9, d10}, [r2]!        //write 16Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d11, d22, d23, q11 //output to d11[0]
+    vst1.u8 {d11[0]}, [r2], r3      //write 16th Byte
+
+    //d12~d17(q6~q8), d0~d8(q0~q3+d8), --> d0~d14
+    vswp    q0, q6
+    vswp    q6, q3
+    vmov    q5, q2
+    vmov    q2, q8
+
+    vmov    d20,d8
+    vmov    q4, q1
+    vmov    q1, q7
+    vmov    d14,d20
+
+    sub     r4, #4
+    cmp     r4, #1
+    bne     w17_hv_mc_luma_loop
+    //the last row
+    vld1.u8 {d15-d17}, [r0], r1 //use 21(17+5), =src[3]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d3, d6, d9, d12, d15, q9, q14, q15  // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d4, d7,d10, d13, d16,q10, q14, q15  // 8 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d0   //output to q0[0]
+    // vertical filtered into q10/q11
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d5, d8,d11, d14, d17,q11, q14, q15  // only 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q10, q11, q9, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q9, q12, q13, d1    //output to q0[1]
+    vst1.u8 {q0}, [r2]!         //write 16Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d2, d22, d23, q11 //output to d2[0]
+    vst1.u8 {d2[0]}, [r2], r3       //write 16th Byte
+
+    vpop        {q4-q7}
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22Width9_neon
+    push        {r4}
+    vpush       {q4}
+    ldr         r4, [sp, #20]
+
+    sub         r0, #2              //src[-2]
+    sub         r0, r0, r1, lsl #1  //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014        // 20
+    vld1.u8 {q0}, [r0], r1  //use 14(9+5), =src[-2]
+    vld1.u8 {q1}, [r0], r1  //use 14(9+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2        // 5
+
+    vld1.u8 {q2}, [r0], r1  //use 14(9+5), =src[0]
+    vld1.u8 {q3}, [r0], r1  //use 14(9+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {q4}, [r0], r1  //use 14(9+5), =src[2]
+    sub         r3, #8
+
+w9_hv_mc_luma_loop:
+
+    vld1.u8 {q8}, [r0], r1  //use 14(9+5), =src[3]
+    //the 1st row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d16, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d17, q10, q14, q15  // 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2]!              //write 8Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d19, d20, d21, q10 //output to d19[0]
+    vst1.u8 {d19[0]}, [r2], r3  //write 8th Byte
+
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    //the 2nd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d4, d6, d8, d16, d0, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d5, d7, d9, d17, d1, q10, q14, q15  // 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2]!              //write 8Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d19, d20, d21, q10 //output to d19[0]
+    vst1.u8 {d19[0]}, [r2], r3  //write 8th Byte
+
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    //the 3rd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d6, d8, d16, d0, d2, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d7, d9, d17, d1, d3, q10, q14, q15  // 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2]!              //write 8Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d19, d20, d21, q10 //output to d19[0]
+    vst1.u8 {d19[0]}, [r2], r3  //write 8th Byte
+
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    //the 4th row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d8, d16, d0, d2, d4, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d7, d9, d17, d1, d3, d5, q10, q14, q15  // 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2]!          //write 8Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d19, d20, d21, q10 //output to d19[0]
+    vst1.u8 {d19[0]}, [r2], r3  //write 8th Byte
+
+    //q4~q8, q0~q2, --> q0~q4
+    vswp    q0, q4
+    vswp    q2, q4
+    vmov    q3, q1
+    vmov    q1, q8
+
+    sub     r4, #4
+    cmp     r4, #1
+    bne     w9_hv_mc_luma_loop
+    //the last row
+    vld1.u8 {q8}, [r0], r1  //use 14(9+5), =src[3]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d16, q9, q14, q15   // 8 avail
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d17, q10, q14, q15  // 6 avail
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18  //output to q9[0]
+    vst1.u8 d18, [r2]!              //write 8Byte
+    UNPACK_1_IN_8x16BITS_TO_8BITS   d19, d20, d21, q10 //output to d19[0]
+    vst1.u8 {d19[0]}, [r2], r3  //write 8th Byte
+    vpop        {q4}
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN McHorVer22Width5_neon
+    push        {r4}
+    vpush       {q4}
+    ldr         r4, [sp, #20]
+
+    sub         r0, #2              //src[-2]
+    sub         r0, r0, r1, lsl #1  //src[-2*src_stride-2]
+    pld         [r0]
+    pld         [r0, r1]
+
+    vmov.u16    q14, #0x0014        // 20
+    vld1.u8 {q0}, [r0], r1  //use 10(5+5), =src[-2]
+    vld1.u8 {q1}, [r0], r1  //use 10(5+5), =src[-1]
+
+    pld         [r0]
+    pld         [r0, r1]
+    vshr.u16    q15, q14, #2        // 5
+
+    vld1.u8 {q2}, [r0], r1  //use 10(5+5), =src[0]
+    vld1.u8 {q3}, [r0], r1  //use 10(5+5), =src[1]
+    pld         [r0]
+    pld         [r0, r1]
+    vld1.u8 {q4}, [r0], r1  //use 10(5+5), =src[2]
+    sub         r3, #4
+
+w5_hv_mc_luma_loop:
+
+    vld1.u8 {q8}, [r0], r1  //use 10(5+5), =src[3]
+    //the 1st row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d16, q9, q14, q15
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d17, q10, q14, q15
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18
+    vst1.u32 {d18[0]}, [r2]!              //write 4Byte
+    vst1.u8 {d18[4]}, [r2], r3  //write 5th Byte
+
+    vld1.u8 {q0}, [r0], r1      //read 2nd row
+    //the 2nd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d2, d4, d6, d8, d16, d0, q9, q14, q15
+    FILTER_6TAG_8BITS_TO_16BITS     d3, d5, d7, d9, d17, d1, q10, q14, q15
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18
+    vst1.u32 {d18[0]}, [r2]!              //write 4Byte
+    vst1.u8 {d18[4]}, [r2], r3  //write 5th Byte
+
+    vld1.u8 {q1}, [r0], r1      //read 3rd row
+    //the 3rd row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d4, d6, d8, d16, d0, d2, q9, q14, q15
+    FILTER_6TAG_8BITS_TO_16BITS     d5, d7, d9, d17, d1, d3, q10, q14, q15
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18
+    vst1.u32 {d18[0]}, [r2]!              //write 4Byte
+    vst1.u8 {d18[4]}, [r2], r3  //write 5th Byte
+
+    vld1.u8 {q2}, [r0], r1      //read 4th row
+    //the 4th row
+    pld         [r0]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d6, d8, d16, d0, d2, d4, q9, q14, q15
+    FILTER_6TAG_8BITS_TO_16BITS     d7, d9, d17, d1, d3, d5, q10, q14, q15
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18
+    vst1.u32 {d18[0]}, [r2]!          //write 4Byte
+    vst1.u8 {d18[4]}, [r2], r3  //write 5th Byte
+
+    //q4~q8, q0~q2, --> q0~q4
+    vswp    q0, q4
+    vswp    q2, q4
+    vmov    q3, q1
+    vmov    q1, q8
+
+    sub     r4, #4
+    cmp     r4, #1
+    bne     w5_hv_mc_luma_loop
+    //the last row
+    vld1.u8 {q8}, [r0], r1  //use 10(5+5), =src[3]
+    // vertical filtered into q9/q10
+    FILTER_6TAG_8BITS_TO_16BITS     d0, d2, d4, d6, d8, d16, q9, q14, q15
+    FILTER_6TAG_8BITS_TO_16BITS     d1, d3, d5, d7, d9, d17, q10, q14, q15
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  q9, q10, q11, q12, q13
+    FILTER_3_IN_16BITS_TO_8BITS q11, q12, q13, d18
+    vst1.u32 {d18[0]}, [r2]!              //write 4Byte
+    vst1.u8 {d18[4]}, [r2], r3  //write 5th Byte
+    vpop        {q4}
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN PixStrideAvgWidthEq16_neon
+    push        {r4, r5, r6}
+    ldr         r4, [sp, #12]
+    ldr         r5, [sp, #16]
+    ldr         r6, [sp, #20]
+
+enc_w16_pix_avg_loop:
+    vld1.u8     {q0}, [r2], r3
+    vld1.u8     {q1}, [r4], r5
+    vld1.u8     {q2}, [r2], r3
+    vld1.u8     {q3}, [r4], r5
+
+    vld1.u8     {q8}, [r2], r3
+    vld1.u8     {q9}, [r4], r5
+    vld1.u8     {q10}, [r2], r3
+    vld1.u8     {q11}, [r4], r5
+
+    AVERAGE_TWO_8BITS       d0, d0, d2
+    AVERAGE_TWO_8BITS       d1, d1, d3
+    vst1.u8     {q0}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d4, d4, d6
+    AVERAGE_TWO_8BITS       d5, d5, d7
+    vst1.u8     {q2}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d16, d16, d18
+    AVERAGE_TWO_8BITS       d17, d17, d19
+    vst1.u8     {q8}, [r0], r1
+
+    AVERAGE_TWO_8BITS       d20, d20, d22
+    AVERAGE_TWO_8BITS       d21, d21, d23
+    vst1.u8     {q10}, [r0], r1
+
+    sub         r6, #4
+    cmp         r6, #0
+    bne         enc_w16_pix_avg_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN PixStrideAvgWidthEq8_neon
+    push        {r4, r5, r6}
+    ldr         r4, [sp, #12]
+    ldr         r5, [sp, #16]
+    ldr         r6, [sp, #20]
+enc_w8_pix_avg_loop:
+
+    vld1.u8     {d0}, [r2], r3
+    vld1.u8     {d2}, [r4], r5
+    vld1.u8     {d1}, [r2], r3
+    vld1.u8     {d3}, [r4], r5
+
+    AVERAGE_TWO_8BITS       d0, d0, d2
+    AVERAGE_TWO_8BITS       d1, d1, d3
+    vst1.u8     {d0}, [r0], r1
+    vst1.u8     {d1}, [r0], r1
+
+    vld1.u8     {d4}, [r2], r3
+    vld1.u8     {d6}, [r4], r5
+    vld1.u8     {d5}, [r2], r3
+    vld1.u8     {d7}, [r4], r5
+
+    AVERAGE_TWO_8BITS       d4, d4, d6
+    AVERAGE_TWO_8BITS       d5, d5, d7
+    vst1.u8     {d4}, [r0], r1
+    vst1.u8     {d5}, [r0], r1
+
+    sub         r6, #4
+    cmp         r6, #0
+    bne         enc_w8_pix_avg_loop
+
+    pop     {r4, r5, r6}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/arm_arch64_common_macro.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/arm_arch64_common_macro.S
new file mode 100644
index 0000000000..e6e2d590fb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/arm_arch64_common_macro.S
@@ -0,0 +1,76 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef __APPLE__
+
+.text
+
+.macro WELS_ASM_AARCH64_FUNC_BEGIN
+.align 2
+.globl _$0
+_$0:
+.endm
+
+.macro WELS_ASM_AARCH64_FUNC_END
+ret
+.endm
+#else
+
+#ifdef __ELF__
+.section .note.GNU-stack,"",%progbits // Mark stack as non-executable
+#endif
+.text
+
+.macro WELS_ASM_AARCH64_FUNC_BEGIN funcName
+.align 2
+.global \funcName
+#ifdef __ELF__
+.type \funcName, %function
+#endif
+#ifndef __clang__
+.func \funcName
+#endif
+\funcName:
+.endm
+
+.macro WELS_ASM_AARCH64_FUNC_END
+ret
+#ifndef __clang__
+.endfunc
+#endif
+.endm
+
+#endif
+
+.macro SIGN_EXTENSION arg0, arg1
+  sxtw \arg0, \arg1
+.endm
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/copy_mb_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/copy_mb_aarch64_neon.S
new file mode 100644
index 0000000000..4d9f1975a1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/copy_mb_aarch64_neon.S
@@ -0,0 +1,202 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro LOAD_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, src*, src_stride
+    ld1 {\arg0\().d}[0], [\arg4], \arg5
+    ld1 {\arg1\().d}[0], [\arg4], \arg5
+    ld1 {\arg2\().d}[0], [\arg4], \arg5
+    ld1 {\arg3\().d}[0], [\arg4], \arg5
+//  }
+.endm
+
+.macro STORE_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, dst*, dst_stride
+    st1 {\arg0\().d}[0], [\arg4], \arg5
+    st1 {\arg1\().d}[0], [\arg4], \arg5
+    st1 {\arg2\().d}[0], [\arg4], \arg5
+    st1 {\arg3\().d}[0], [\arg4], \arg5
+//  }
+.endm
+
+.macro LOAD_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, src*, src_stride
+    ld1 {\arg0\().8b}, [\arg4], \arg5
+    ld1 {\arg1\().8b}, [\arg4], \arg5
+    ld1 {\arg2\().8b}, [\arg4], \arg5
+    ld1 {\arg3\().8b}, [\arg4], \arg5
+//  }
+.endm
+
+.macro STORE_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, dst*, dst_stride
+    st1 {\arg0\().8b}, [\arg4], \arg5
+    st1 {\arg1\().8b}, [\arg4], \arg5
+    st1 {\arg2\().8b}, [\arg4], \arg5
+    st1 {\arg3\().8b}, [\arg4], \arg5
+//  }
+.endm
+
+.macro LOAD16_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, src*, src_stride
+    ld1 {\arg0\().2d}, [\arg4], \arg5
+    ld1 {\arg1\().2d}, [\arg4], \arg5
+    ld1 {\arg2\().2d}, [\arg4], \arg5
+    ld1 {\arg3\().2d}, [\arg4], \arg5
+//  }
+.endm
+
+.macro STORE16_ALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, dst*, dst_stride
+    st1 {\arg0\().2d}, [\arg4], \arg5
+    st1 {\arg1\().2d}, [\arg4], \arg5
+    st1 {\arg2\().2d}, [\arg4], \arg5
+    st1 {\arg3\().2d}, [\arg4], \arg5
+//  }
+.endm
+
+.macro LOAD16_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, src*, src_stride
+    ld1 {\arg0\().16b}, [\arg4], \arg5
+    ld1 {\arg1\().16b}, [\arg4], \arg5
+    ld1 {\arg2\().16b}, [\arg4], \arg5
+    ld1 {\arg3\().16b}, [\arg4], \arg5
+//  }
+.endm
+
+.macro STORE16_UNALIGNED_DATA_WITH_STRIDE arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: $0~$3, dst*, dst_stride
+    st1 {\arg0\().16b}, [\arg4], \arg5
+    st1 {\arg1\().16b}, [\arg4], \arg5
+    st1 {\arg2\().16b}, [\arg4], \arg5
+    st1 {\arg3\().16b}, [\arg4], \arg5
+//  }
+.endm
+
+//void WelsCopy8x8_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsCopy8x8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v4, v5, v6, v7, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v4, v5, v6, v7, x0, x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsCopy16x16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    LOAD16_ALIGNED_DATA_WITH_STRIDE   v0, v1, v2, v3, x2, x3
+
+    STORE16_ALIGNED_DATA_WITH_STRIDE  v0, v1, v2, v3, x0, x1
+
+    LOAD16_ALIGNED_DATA_WITH_STRIDE   v16, v17, v18, v19, x2, x3
+
+    STORE16_ALIGNED_DATA_WITH_STRIDE  v16, v17, v18, v19, x0, x1
+
+    LOAD16_ALIGNED_DATA_WITH_STRIDE   v0, v1, v2, v3, x2, x3
+
+    STORE16_ALIGNED_DATA_WITH_STRIDE  v0, v1, v2, v3, x0, x1
+
+    LOAD16_ALIGNED_DATA_WITH_STRIDE   v16, v17, v18, v19, x2, x3
+
+    STORE16_ALIGNED_DATA_WITH_STRIDE  v16, v17, v18, v19, x0, x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsCopy16x16NotAligned_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v16, v17, v18, v19, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v16, v17, v18, v19, x0, x1
+
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v16, v17, v18, v19, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v16, v17, v18, v19, x0, x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsCopy16x8NotAligned_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD16_UNALIGNED_DATA_WITH_STRIDE v16, v17, v18, v19, x2, x3
+
+    STORE16_UNALIGNED_DATA_WITH_STRIDE    v16, v17, v18, v19, x0, x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsCopy8x16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v4, v5, v6, v7, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v4, v5, v6, v7, x0, x1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v0, v1, v2, v3, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v0, v1, v2, v3, x0, x1
+
+    LOAD_UNALIGNED_DATA_WITH_STRIDE v4, v5, v6, v7, x2, x3
+
+    STORE_UNALIGNED_DATA_WITH_STRIDE    v4, v5, v6, v7, x0, x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/deblocking_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/deblocking_aarch64_neon.S
new file mode 100644
index 0000000000..a62c488444
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/deblocking_aarch64_neon.S
@@ -0,0 +1,852 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+
+#include "arm_arch64_common_macro.S"
+
+.macro MASK_MATRIX arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    uabd    \arg6\().16b, \arg1\().16b, \arg2\().16b
+    cmhi    \arg6\().16b, \arg4\().16b, \arg6\().16b
+
+    uabd    \arg4\().16b, \arg0\().16b, \arg1\().16b
+    cmhi    \arg4\().16b, \arg5\().16b, \arg4\().16b
+    and     \arg6\().16b, \arg6\().16b, \arg4\().16b
+
+    uabd    \arg4\().16b, \arg3\().16b, \arg2\().16b
+    cmhi    \arg4\().16b, \arg5\().16b, \arg4\().16b
+    and     \arg6\().16b, \arg6\().16b, \arg4\().16b
+.endm
+
+.macro DIFF_LUMA_LT4_P1_Q1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+    //v0, v1, v2, v3, v17(beta), v18(-Tc0), v6(Tc0), v7(flag), v19, v20
+    urhadd    \arg8\().16b, \arg2\().16b, \arg3\().16b
+    uhadd   \arg8\().16b, \arg0\().16b, \arg8\().16b
+    usubl   \arg9\().8h, \arg8\().8b, \arg1\().8b
+    sqxtn   \arg9\().8b, \arg9\().8h
+    usubl2  \arg8\().8h, \arg8\().16b, \arg1\().16b
+    sqxtn2  \arg9\().16b, \arg8\().8h
+    smax    \arg8\().16b, \arg9\().16b, \arg5\().16b
+    //
+    smin  \arg8\().16b, \arg8\().16b, \arg6\().16b
+    uabd  \arg9\().16b, \arg0\().16b, \arg2\().16b
+    cmhi  \arg9\().16b, \arg4\().16b, \arg9\().16b
+    and     \arg8\().16b, \arg8\().16b, \arg9\().16b
+    and     \arg8\().16b, \arg8\().16b, \arg7\().16b
+    add     \arg8\().16b, \arg1\().16b, \arg8\().16b
+    abs     \arg9\().16b, \arg9\().16b
+.endm
+
+.macro DIFF_LUMA_LT4_P0_Q0_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    usubl \arg5\().8h, \arg0\().8b, \arg3\().8b
+    usubl \arg6\().8h, \arg2\().8b, \arg1\().8b
+    shl     \arg6\().8h, \arg6\().8h, #2
+    add     \arg5\().8h, \arg5\().8h, \arg6\().8h
+    sqrshrn  \arg4\().8b, \arg5\().8h, #3
+.endm
+
+.macro DIFF_LUMA_LT4_P0_Q0_2 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    usubl2    \arg5\().8h, \arg0\().16b, \arg3\().16b
+    usubl2    \arg6\().8h, \arg2\().16b, \arg1\().16b
+    shl     \arg6\().8h, \arg6\().8h, #2
+    add     \arg5\().8h, \arg5\().8h, \arg6\().8h
+    sqrshrn2  \arg4\().16b, \arg5\().8h, #3
+.endm
+
+.macro EXTRACT_DELTA_INTO_TWO_PART arg0, arg1
+    cmge  \arg1\().16b, \arg0\().16b, #0
+    and     \arg1\().16b, \arg0\().16b, \arg1\().16b
+    sub     \arg0\().16b, \arg1\().16b, \arg0\().16b
+.endm
+
+.macro DIFF_LUMA_EQ4_P2P1P0_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+    uaddl \arg8\().8h, \arg1\().8b, \arg2\().8b
+    uaddl \arg9\().8h, \arg3\().8b, \arg4\().8b
+    add   \arg9\().8h, \arg9\().8h, \arg8\().8h
+
+    uaddl \arg8\().8h, \arg0\().8b, \arg1\().8b
+    shl   \arg8\().8h, \arg8\().8h, #1
+    add   \arg8\().8h, \arg9\().8h, \arg8\().8h
+
+    rshrn \arg0\().8b, \arg9\().8h, #2
+    rshrn \arg7\().8b, \arg8\().8h, #3
+    shl     \arg9\().8h, \arg9\().8h, #1
+    usubl   \arg8\().8h, \arg5\().8b, \arg1\().8b
+    add     \arg9\().8h, \arg8\().8h, \arg9\().8h
+
+    uaddl \arg8\().8h, \arg2\().8b, \arg5\().8b
+    uaddw \arg8\().8h, \arg8\().8h, \arg2\().8b
+    uaddw \arg8\().8h, \arg8\().8h, \arg3\().8b
+
+    rshrn \arg9\().8b, \arg9\().8h, #3
+    rshrn \arg8\().8b, \arg8\().8h, #2
+    bsl       \arg6\().8b, \arg9\().8b, \arg8\().8b
+.endm
+
+.macro DIFF_LUMA_EQ4_P2P1P0_2 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+    uaddl2 \arg8\().8h, \arg1\().16b, \arg2\().16b
+    uaddl2 \arg9\().8h, \arg3\().16b, \arg4\().16b
+    add   \arg9\().8h, \arg9\().8h, \arg8\().8h
+
+    uaddl2 \arg8\().8h, \arg0\().16b, \arg1\().16b
+    shl   \arg8\().8h, \arg8\().8h, #1
+    add   \arg8\().8h, \arg9\().8h, \arg8\().8h
+
+    rshrn2    \arg0\().16b, \arg9\().8h, #2
+    rshrn2    \arg7\().16b, \arg8\().8h, #3
+    shl     \arg9\().8h, \arg9\().8h, #1
+    usubl2   \arg8\().8h, \arg5\().16b, \arg1\().16b
+    add     \arg9\().8h, \arg8\().8h, \arg9\().8h
+
+    uaddl2    \arg8\().8h, \arg2\().16b, \arg5\().16b
+    uaddw2    \arg8\().8h, \arg8\().8h, \arg2\().16b
+    uaddw2    \arg8\().8h, \arg8\().8h, \arg3\().16b
+
+    rshrn2    \arg9\().16b, \arg9\().8h, #3
+    rshrn2    \arg8\().16b, \arg8\().8h, #2
+    bsl       \arg6\().16b, \arg9\().16b, \arg8\().16b
+.endm
+
+
+.macro DIFF_CHROMA_EQ4_P0Q0_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+    uaddl \arg4\().8h, \arg0\().8b, \arg3\().8b
+    shl   \arg4\().8h, \arg4\().8h, #1
+    usubl \arg5\().8h, \arg1\().8b, \arg3\().8b
+    add   \arg5\().8h, \arg5\().8h, \arg4\().8h
+    rshrn \arg6\().8b, \arg5\().8h, #2
+    usubl \arg5\().8h, \arg2\().8b, \arg0\().8b
+    add   \arg5\().8h, \arg5\().8h, \arg4\().8h
+    rshrn \arg7\().8b, \arg5\().8h, #2
+.endm
+
+.macro DIFF_CHROMA_EQ4_P0Q0_2  arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+    uaddl2 \arg4\().8h, \arg0\().16b, \arg3\().16b
+    shl   \arg4\().8h, \arg4\().8h, #1
+    usubl2 \arg5\().8h, \arg1\().16b, \arg3\().16b
+    add   \arg5\().8h, \arg5\().8h, \arg4\().8h
+    rshrn2 \arg6\().16b, \arg5\().8h, #2
+    usubl2 \arg5\().8h, \arg2\().16b, \arg0\().16b
+    add   \arg5\().8h, \arg5\().8h, \arg4\().8h
+    rshrn2 \arg7\().16b, \arg5\().8h, #2
+.endm
+
+.macro DIFF_LUMA_EQ4_MASK arg0, arg1, arg2, arg3
+    mov   \arg3\().16b, \arg2\().16b
+    bsl   \arg3\().16b, \arg0\().16b, \arg1\().16b
+.endm
+
+.macro LOAD_LUMA_DATA_3 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    ld3   {\arg0\().b, \arg1\().b, \arg2\().b} [\arg6], [x2], x1
+    ld3   {\arg3\().b, \arg4\().b, \arg5\().b} [\arg6], [x0], x1
+.endm
+
+.macro LOAD_LUMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+    ld4   {\arg0\().b, \arg1\().b, \arg2\().b, \arg3\().b} [\arg8], [x3], x1
+    ld4   {\arg4\().b, \arg5\().b, \arg6\().b, \arg7\().b} [\arg8], [x0], x1
+.endm
+
+.macro STORE_LUMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5
+    st4   {\arg0\().b, \arg1\().b, \arg2\().b, \arg3\().b} [\arg4], [x0], x1
+    st4   {\arg0\().b, \arg1\().b, \arg2\().b, \arg3\().b} [\arg5], [x2], x1
+.endm
+
+.macro STORE_LUMA_DATA_3 arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    st3   {\arg0\().b, \arg1\().b, \arg2\().b} [\arg6], [x3], x1
+    st3   {\arg3\().b, \arg4\().b, \arg5\().b} [\arg6], [x0], x1
+.endm
+
+.macro LOAD_CHROMA_DATA_4 arg0, arg1, arg2, arg3, arg4, arg5
+    ld4   {\arg0\().b, \arg1\().b, \arg2\().b, \arg3\().b} [\arg5], [\arg4], x2
+.endm
+
+.macro STORE_CHROMA_DATA_2 arg0, arg1, arg2, arg3
+    st2   {\arg0\().b, \arg1\().b} [\arg3], [\arg2], x2
+.endm
+
+.macro ZERO_JUMP_END arg0, arg1, arg2, arg3
+    mov \arg1, \arg0\().d[0]
+    mov \arg2, \arg0\().d[1]
+    orr \arg1, \arg1, \arg2
+    cbz \arg1, \arg3
+.endm
+
+.macro BS_NZC_CHECK arg0, arg1, arg2, arg3, arg4
+    ld1 {v0.16b}, [\arg0]
+    //Arrange the input data --- TOP
+    ands     x6, \arg1, #2
+    cbz      x6, bs_nzc_check_jump0
+    sub      x6, \arg0, \arg2, lsl #4
+    sub      x6, x6, \arg2, lsl #3
+    add      x6, x6, #12
+    ld1      {v1.s} [3], [x6]
+
+bs_nzc_check_jump0:
+    ext      v1.16b, v1.16b, v0.16b, #12
+    add      \arg3\().16b, v0.16b, v1.16b
+
+    // Arrange the input data --- LEFT
+    ands     x6, \arg1, #1
+    cbz      x6, bs_nzc_check_jump1
+
+    sub      x6, \arg0, #21
+    add      x7, x6, #4
+    ld1      {v1.b} [12], [x6]
+    add      x6, x7, #4
+    ld1      {v1.b} [13], [x7]
+    add      x7, x6, #4
+    ld1      {v1.b} [14], [x6]
+    ld1      {v1.b} [15], [x7]
+
+bs_nzc_check_jump1:
+    ins      v2.d[0], v0.d[1]
+    zip1     v0.16b, v0.16b, v2.16b
+    ins      v2.d[0], v0.d[1]
+    zip1     v0.16b, v0.16b, v2.16b
+    ext      v1.16b, v1.16b, v0.16b, #12
+    add      \arg4\().16b, v0.16b, v1.16b
+.endm
+
+.macro BS_COMPARE_MV arg0, arg1, arg2, arg3, arg4, arg5
+    //in: \arg0,\arg1(const),\arg2(const),\arg3(const),\arg4(const); out:\arg5
+    mov   w6, #4
+    sabd  v20.8h, \arg0\().8h, \arg1\().8h
+    sabd  v21.8h, \arg1\().8h, \arg2\().8h
+    dup   \arg0\().8h, w6
+    sabd  v22.8h, \arg2\().8h, \arg3\().8h
+    sabd  v23.8h, \arg3\().8h, \arg4\().8h
+
+    cmge  v20.8h, v20.8h, \arg0\().8h
+    cmge  v21.8h, v21.8h, \arg0\().8h
+    cmge  v22.8h, v22.8h, \arg0\().8h
+    cmge  v23.8h, v23.8h, \arg0\().8h
+
+    addp v20.8h, v20.8h, v21.8h
+    addp v21.8h, v22.8h, v23.8h
+
+    addhn  \arg5\().8b, v20.8h, v20.8h
+    addhn2  \arg5\().16b, v21.8h, v21.8h
+.endm
+
+.macro BS_MV_CHECK arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    ldp q0, q1, [\arg0], #32
+    ldp q2, q3, [\arg0]
+    sub \arg0, \arg0, #32
+    // Arrenge the input data --- TOP
+    ands     x6, \arg1, #2
+    cbz     x6, bs_mv_check_jump0
+    sub      x6, \arg0, \arg2, lsl #6
+    add      x6, x6, #48
+    ld1      {v4.16b}, [x6]
+bs_mv_check_jump0:
+    BS_COMPARE_MV  v4, v0, v1, v2, v3, \arg3
+    // Arrange the input data --- LEFT
+    ands     x6, \arg1, #1
+    cbz      x6, bs_mv_check_jump1
+    sub      x6, \arg0, #52
+    add      x7, x6, #16
+    ld1      {v4.s} [0], [x6]
+    add      x6, x7, #16
+    ld1      {v4.s} [1], [x7]
+    add      x7, x6, #16
+    ld1      {v4.s} [2], [x6]
+    ld1      {v4.s} [3], [x7]
+bs_mv_check_jump1:
+    zip1  \arg5\().4s, v0.4s, v2.4s
+    zip2  \arg6\().4s, v0.4s, v2.4s
+    zip1  v0.4s, v1.4s, v3.4s
+    zip2  v2.4s, v1.4s, v3.4s
+    zip2  v1.4s, \arg5\().4s, v0.4s
+    zip1  v0.4s, \arg5\().4s, v0.4s
+    zip2  v3.4s, \arg6\().4s, v2.4s
+    zip1  v2.4s, \arg6\().4s, v2.4s
+    BS_COMPARE_MV  v4, v0, v1, v2, v3, \arg4
+.endm
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsNonZeroCount_AArch64_neon
+    mov w1, #1
+    dup v3.8b, w1
+    ld1 {v0.8b, v1.8b, v2.8b}, [x0]
+    umin  v0.8b, v0.8b, v3.8b
+    umin  v1.8b, v1.8b, v3.8b
+    umin  v2.8b, v2.8b, v3.8b
+    st1 {v0.8b, v1.8b, v2.8b}, [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockLumaLt4V_AArch64_neon //uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc
+    dup v16.16b, w2 //alpha
+    dup v17.16b, w3 //beta
+    SIGN_EXTENSION x1,w1
+    add x2, x1, x1, lsl #1
+    sub x2, x0, x2
+    movi v23.16b, #128
+    ld1 {v0.16b}, [x2], x1
+    ld1 {v1.16b}, [x2], x1
+    ld1 {v2.16b}, [x2]
+    ld1 {v3.16b}, [x0], x1
+    ld1 {v4.16b}, [x0], x1
+    ld1 {v5.16b}, [x0]
+    sub   x2, x2, x1
+    ld4r {v18.8b, v19.8b, v20.8b, v21.8b}, [x4]
+    trn1 v18.2s, v18.2s, v19.2s
+    trn1 v20.2s, v20.2s, v21.2s
+    trn1 v6.2d, v18.2d, v20.2d // iTc0: 0000, 1111, 2222, 3333
+    cmge v7.16b, v6.16b, #0 // iTc0 Flag
+
+    MASK_MATRIX   v1, v2, v3, v4, v16, v17, v18
+    and   v7.16b, v7.16b, v18.16b // need filter flag
+
+    ZERO_JUMP_END v7, x3, x4, DeblockLumaLt4V_AArch64_neon_end
+
+    eor   v18.16b, v18.16b, v18.16b
+    sub v18.16b, v18.16b, v6.16b // -iTc0: 0000, 1111, 2222, 3333
+
+    DIFF_LUMA_LT4_P1_Q1   v0, v1, v2, v3, v17, v18, v6, v7, v19, v20
+    st1   {v19.16b}, [x2], x1
+
+    DIFF_LUMA_LT4_P1_Q1   v5, v4, v3, v2, v17, v18, v6, v7, v21, v22
+
+    abs   v20.16b, v20.16b
+    abs   v22.16b, v22.16b
+    add   v6.16b, v6.16b, v20.16b
+    add   v6.16b, v6.16b, v22.16b
+    eor   v18.16b, v18.16b, v18.16b
+    sub   v18.16b, v18.16b, v6.16b
+
+    DIFF_LUMA_LT4_P0_Q0_1 v1, v2, v3, v4, v19, v20, v22
+    DIFF_LUMA_LT4_P0_Q0_2 v1, v2, v3, v4, v19, v20, v22
+
+    smax  v19.16b, v19.16b, v18.16b
+    smin  v19.16b, v19.16b, v6.16b
+    and     v19.16b, v19.16b, v7.16b
+
+    EXTRACT_DELTA_INTO_TWO_PART   v19, v20
+    uqadd v2.16b, v2.16b, v20.16b
+    uqsub v2.16b, v2.16b, v19.16b
+    st1     {v2.16b}, [x2], x1
+    uqsub v3.16b, v3.16b, v20.16b
+    uqadd v3.16b, v3.16b, v19.16b
+    st1     {v3.16b}, [x2], x1
+    st1     {v21.16b}, [x2]
+DeblockLumaLt4V_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockLumaEq4V_AArch64_neon
+    dup     v16.16b, w2 //alpha
+    dup     v17.16b, w3 //beta
+    SIGN_EXTENSION x1,w1
+    sub     x3, x0, x1, lsl #2
+    ld1     {v0.16b}, [x3], x1
+    ld1     {v4.16b}, [x0], x1
+    ld1     {v1.16b}, [x3], x1
+    ld1     {v5.16b}, [x0], x1
+    ld1     {v2.16b}, [x3], x1
+    ld1     {v6.16b}, [x0], x1
+    ld1     {v3.16b}, [x3]
+    ld1     {v7.16b}, [x0]
+
+    sub     x3, x3, x1, lsl #1
+    MASK_MATRIX   v2, v3, v4, v5, v16, v17, v18
+    lsr       w2, w2, #2
+    add       w2, w2, #2
+    dup     v16.16b, w2 //((alpha >> 2) + 2)
+    uabd  v19.16b, v3.16b, v4.16b
+    cmhi  v20.16b, v16.16b, v19.16b //iDetaP0Q0 < ((iAlpha >> 2) + 2)
+
+    uabd  v21.16b, v1.16b, v3.16b
+    cmhi  v21.16b, v17.16b, v21.16b //bDetaP2P0
+    and     v21.16b, v21.16b, v20.16b //(iDetaP0Q0 < ((iAlpha >> 2) + 2))&&bDetaP2P0
+
+    uabd  v22.16b, v6.16b, v4.16b
+    cmhi  v22.16b, v17.16b, v22.16b //bDetaQ2Q0
+    and     v22.16b, v22.16b, v20.16b //(iDetaP0Q0 < ((iAlpha >> 2) + 2))&&bDetaQ2Q0
+    and     v20.16b, v20.16b, v18.16b //(iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0&&(iDetaP0Q0 < ((iAlpha >> 2) + 2))
+
+    mov v23.16b, v21.16b
+    mov v24.16b, v21.16b
+
+    mov v25.16b, v0.16b
+    DIFF_LUMA_EQ4_P2P1P0_1        v0, v1, v2, v3, v4, v5, v23, v19, v17, v16
+    DIFF_LUMA_EQ4_P2P1P0_2        v25, v1, v2, v3, v4, v5, v24, v19, v17, v16
+    ins v0.d[1], v25.d[1]
+    ins v23.d[1], v24.d[1]
+    and   v21.16b, v20.16b, v21.16b
+    DIFF_LUMA_EQ4_MASK    v19, v1, v21, v17
+    st1   {v17.16b}, [x3], x1
+    DIFF_LUMA_EQ4_MASK    v0, v2, v21, v17
+    st1   {v17.16b}, [x3], x1
+    DIFF_LUMA_EQ4_MASK    v23, v3, v18, v17
+    st1   {v17.16b}, [x3], x1
+
+
+    mov v23.16b, v22.16b
+    mov v24.16b, v22.16b
+    mov v25.16b, v7.16b
+    DIFF_LUMA_EQ4_P2P1P0_1        v7, v6, v5, v4, v3, v2, v23, v19, v17, v16
+    DIFF_LUMA_EQ4_P2P1P0_2        v25, v6, v5, v4, v3, v2, v24, v19, v17, v16
+    ins v7.d[1], v25.d[1]
+    ins v23.d[1], v24.d[1]
+    and   v22.16b, v20.16b, v22.16b
+    DIFF_LUMA_EQ4_MASK    v23, v4, v18, v17
+    st1   {v17.16b}, [x3], x1
+    DIFF_LUMA_EQ4_MASK    v7, v5, v22, v17
+    st1   {v17.16b}, [x3], x1
+    DIFF_LUMA_EQ4_MASK    v19, v6, v22, v17
+    st1   {v17.16b}, [x3], x1
+DeblockLumaEq4V_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockLumaLt4H_AArch64_neon //uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc
+    dup v16.16b, w2 //alpha
+    dup v17.16b, w3 //beta
+    sub x2, x0, #3
+    movi v23.16b, #128
+    SIGN_EXTENSION x1,w1
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 0
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 1
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 2
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 3
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 4
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 5
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 6
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 7
+
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 8
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 9
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 10
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 11
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 12
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 13
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 14
+    LOAD_LUMA_DATA_3      v0, v1, v2, v3, v4, v5, 15
+
+    sub x0, x0, x1, lsl #4
+
+    ld4r {v18.8b, v19.8b, v20.8b, v21.8b}, [x4]
+    trn1 v18.2s, v18.2s, v19.2s
+    trn1 v20.2s, v20.2s, v21.2s
+    trn1 v6.2d, v18.2d, v20.2d // iTc0: 0000, 1111, 2222, 3333
+    cmge v7.16b, v6.16b, #0 // iTc0 Flag
+
+    MASK_MATRIX   v1, v2, v3, v4, v16, v17, v18
+    and   v7.16b, v7.16b, v18.16b // need filter flag
+
+    ZERO_JUMP_END v7, x3, x4, DeblockLumaLt4H_AArch64_neon_end
+
+    eor   v18.16b, v18.16b, v18.16b
+    sub v18.16b, v18.16b, v6.16b // -iTc0: 0000, 1111, 2222, 3333
+
+    DIFF_LUMA_LT4_P1_Q1   v0, v1, v2, v3, v17, v18, v6, v7, v19, v20 //Use Tmp v23,v24
+    mov v25.16b, v19.16b
+
+    DIFF_LUMA_LT4_P1_Q1   v5, v4, v3, v2, v17, v18, v6, v7, v21, v22 //Use Tmp v23,v24
+
+    abs   v20.16b, v20.16b
+    abs   v22.16b, v22.16b
+    add   v6.16b, v6.16b, v20.16b
+    add   v6.16b, v6.16b, v22.16b
+    eor   v18.16b, v18.16b, v18.16b
+    sub   v18.16b, v18.16b, v6.16b
+
+    DIFF_LUMA_LT4_P0_Q0_1 v1, v2, v3, v4, v19, v20, v22
+    DIFF_LUMA_LT4_P0_Q0_2 v1, v2, v3, v4, v19, v20, v22
+
+    smax  v19.16b, v19.16b, v18.16b
+    smin  v19.16b, v19.16b, v6.16b
+    and     v19.16b, v19.16b, v7.16b
+
+    EXTRACT_DELTA_INTO_TWO_PART   v19, v20
+    uqadd v2.16b, v2.16b, v20.16b
+    uqsub v2.16b, v2.16b, v19.16b
+    mov v26.16b, v2.16b
+    uqsub v3.16b, v3.16b, v20.16b
+    uqadd v3.16b, v3.16b, v19.16b
+    mov v27.16b, v3.16b
+    mov v28.16b, v21.16b
+
+    sub   x0, x0, #2
+    add   x2, x0, x1
+    lsl   x1, x1, #1
+
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 0, 1
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 2, 3
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 4, 5
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 6, 7
+
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 8, 9
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 10, 11
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 12, 13
+    STORE_LUMA_DATA_4     v25, v26, v27, v28, 14, 15
+DeblockLumaLt4H_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockLumaEq4H_AArch64_neon
+    dup     v16.16b, w2 //alpha
+    dup     v17.16b, w3 //beta
+    sub     x3, x0, #4
+    SIGN_EXTENSION x1,w1
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 0
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 1
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 2
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 3
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 4
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 5
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 6
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 7
+
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 8
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 9
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 10
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 11
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 12
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 13
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 14
+    LOAD_LUMA_DATA_4      v0, v1, v2, v3, v4, v5, v6, v7, 15
+
+    sub x0, x0, x1, lsl #4
+    sub x3, x0, #3
+    MASK_MATRIX   v2, v3, v4, v5, v16, v17, v18
+
+    ZERO_JUMP_END v18, x4, x5, DeblockLumaEq4H_AArch64_neon_end
+
+    lsr       w2, w2, #2
+    add       w2, w2, #2
+    dup     v16.16b, w2 //((alpha >> 2) + 2)
+    uabd  v19.16b, v3.16b, v4.16b
+    cmhi  v20.16b, v16.16b, v19.16b //iDetaP0Q0 < ((iAlpha >> 2) + 2)
+
+    uabd  v21.16b, v1.16b, v3.16b
+    cmhi  v21.16b, v17.16b, v21.16b //bDetaP2P0
+    and     v21.16b, v21.16b, v20.16b //(iDetaP0Q0 < ((iAlpha >> 2) + 2))&&bDetaP2P0
+
+    uabd  v22.16b, v6.16b, v4.16b
+    cmhi  v22.16b, v17.16b, v22.16b //bDetaQ2Q0
+    and     v22.16b, v22.16b, v20.16b //(iDetaP0Q0 < ((iAlpha >> 2) + 2))&&bDetaQ2Q0
+    and     v20.16b, v20.16b, v18.16b //(iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0&&(iDetaP0Q0 < ((iAlpha >> 2) + 2))
+
+    mov v23.16b, v21.16b
+    mov v24.16b, v21.16b
+
+    mov v25.16b, v0.16b
+    DIFF_LUMA_EQ4_P2P1P0_1        v0, v1, v2, v3, v4, v5, v23, v19, v17, v16
+    DIFF_LUMA_EQ4_P2P1P0_2        v25, v1, v2, v3, v4, v5, v24, v19, v17, v16
+    ins v0.d[1], v25.d[1]
+    ins v23.d[1], v24.d[1]
+    and   v21.16b, v20.16b, v21.16b
+    DIFF_LUMA_EQ4_MASK    v19, v1, v21, v17
+    mov v26.16b, v17.16b
+    DIFF_LUMA_EQ4_MASK    v0, v2, v21, v17
+    mov v27.16b, v17.16b
+    DIFF_LUMA_EQ4_MASK    v23, v3, v18, v17
+    mov v28.16b, v17.16b
+
+
+    mov v23.16b, v22.16b
+    mov v24.16b, v22.16b
+    mov v25.16b, v7.16b
+    DIFF_LUMA_EQ4_P2P1P0_1        v7, v6, v5, v4, v3, v2, v23, v19, v17, v16
+    DIFF_LUMA_EQ4_P2P1P0_2        v25, v6, v5, v4, v3, v2, v24, v19, v17, v16
+    ins v7.d[1], v25.d[1]
+    ins v23.d[1], v24.d[1]
+    and   v22.16b, v20.16b, v22.16b
+    DIFF_LUMA_EQ4_MASK    v23, v4, v18, v17
+    mov v29.16b, v17.16b
+    DIFF_LUMA_EQ4_MASK    v7, v5, v22, v17
+    mov v30.16b, v17.16b
+    DIFF_LUMA_EQ4_MASK    v19, v6, v22, v17
+    mov v31.16b, v17.16b
+
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 0
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 1
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 2
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 3
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 4
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 5
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 6
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 7
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 8
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 9
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 10
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 11
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 12
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 13
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 14
+    STORE_LUMA_DATA_3     v26, v27, v28, v29, v30, v31, 15
+DeblockLumaEq4H_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockChromaLt4V_AArch64_neon //uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iAlpha, int32_t iBeta, int8_t* pTc
+    dup v16.16b, w3 //alpha
+    dup v17.16b, w4 //beta
+    lsl x3, x2, #1
+    sub x6, x0, x3 //pPixCb-2*Stride
+    sub x7, x1, x3 //pPixCr-2*Stride
+
+    ld1 {v0.d} [0], [x6], x2
+    ld1 {v1.d} [0], [x6]
+    ld1 {v2.d} [0], [x0], x2
+    ld1 {v3.d} [0], [x0]
+    ld1 {v0.d} [1], [x7], x2
+    ld1 {v1.d} [1], [x7]
+    ld1 {v2.d} [1], [x1], x2
+    ld1 {v3.d} [1], [x1]
+
+    ld4r {v18.8b, v19.8b, v20.8b, v21.8b}, [x5]
+    trn1 v18.4h, v18.4h, v19.4h //0011,0011,
+    trn1 v20.4h, v20.4h, v21.4h //2233,2233
+    zip1 v6.4s, v18.4s, v20.4s //iTc0: 0011,2233,0011,2233
+    cmgt v7.16b, v6.16b, #0 // iTc0 Flag
+
+    MASK_MATRIX   v0, v1, v2, v3, v16, v17, v18
+    and   v7.16b, v7.16b, v18.16b // need filter flag
+
+    ZERO_JUMP_END v7, x4, x5, DeblockChromaLt4V_AArch64_neon_end
+
+    eor   v18.16b, v18.16b, v18.16b
+    sub v18.16b, v18.16b, v6.16b //-iTc0: 0011,2233,0011,2233
+
+    DIFF_LUMA_LT4_P0_Q0_1 v0, v1, v2, v3, v19, v20, v22
+    DIFF_LUMA_LT4_P0_Q0_2 v0, v1, v2, v3, v19, v20, v22
+
+    smax  v19.16b, v19.16b, v18.16b
+    smin  v19.16b, v19.16b, v6.16b
+    and     v19.16b, v19.16b, v7.16b
+
+    EXTRACT_DELTA_INTO_TWO_PART   v19, v20
+    uqadd v1.16b, v1.16b, v20.16b
+    uqsub v1.16b, v1.16b, v19.16b
+    st1     {v1.d} [0], [x6], x2
+    st1     {v1.d} [1], [x7], x2
+    uqsub v2.16b, v2.16b, v20.16b
+    uqadd v2.16b, v2.16b, v19.16b
+    st1     {v2.d} [0], [x6]
+    st1     {v2.d} [1], [x7]
+DeblockChromaLt4V_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockChromaLt4H_AArch64_neon //uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iAlpha, int32_t iBeta, int8_t* pTc
+    dup v16.16b, w3 //alpha
+    dup v17.16b, w4 //beta
+    sub x6, x0, #2 //pPixCb-2
+    sub x7, x1, #2 //pPixCr-2
+
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 0
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 1
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 2
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 3
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 4
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 5
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 6
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 7
+
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 8
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 9
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 10
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 11
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 12
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 13
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 14
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 15
+
+    sub x0, x0, #1
+    sub x1, x1, #1
+
+    ld4r {v18.8b, v19.8b, v20.8b, v21.8b}, [x5]
+    trn1 v18.4h, v18.4h, v19.4h //0011,0011,
+    trn1 v20.4h, v20.4h, v21.4h //2233,2233
+    zip1 v6.4s, v18.4s, v20.4s //iTc0: 0011,2233,0011,2233
+    cmgt v7.16b, v6.16b, #0 // iTc0 Flag
+
+    MASK_MATRIX   v0, v1, v2, v3, v16, v17, v18
+    and   v7.16b, v7.16b, v18.16b // need filter flag
+
+    ZERO_JUMP_END v7, x4, x5, DeblockChromaLt4H_AArch64_neon_end
+    eor   v18.16b, v18.16b, v18.16b
+    sub v18.16b, v18.16b, v6.16b //-iTc0: 0011,2233,0011,2233
+
+    DIFF_LUMA_LT4_P0_Q0_1 v0, v1, v2, v3, v19, v20, v22
+    DIFF_LUMA_LT4_P0_Q0_2 v0, v1, v2, v3, v19, v20, v22
+
+    smax  v19.16b, v19.16b, v18.16b
+    smin  v19.16b, v19.16b, v6.16b
+    and     v19.16b, v19.16b, v7.16b
+
+    EXTRACT_DELTA_INTO_TWO_PART   v19, v20
+    uqadd v1.16b, v1.16b, v20.16b
+    uqsub v1.16b, v1.16b, v19.16b
+    uqsub v2.16b, v2.16b, v20.16b
+    uqadd v2.16b, v2.16b, v19.16b
+
+    STORE_CHROMA_DATA_2 v1, v2, x0, 0
+    STORE_CHROMA_DATA_2 v1, v2, x0, 1
+    STORE_CHROMA_DATA_2 v1, v2, x0, 2
+    STORE_CHROMA_DATA_2 v1, v2, x0, 3
+    STORE_CHROMA_DATA_2 v1, v2, x0, 4
+    STORE_CHROMA_DATA_2 v1, v2, x0, 5
+    STORE_CHROMA_DATA_2 v1, v2, x0, 6
+    STORE_CHROMA_DATA_2 v1, v2, x0, 7
+
+    STORE_CHROMA_DATA_2 v1, v2, x1, 8
+    STORE_CHROMA_DATA_2 v1, v2, x1, 9
+    STORE_CHROMA_DATA_2 v1, v2, x1, 10
+    STORE_CHROMA_DATA_2 v1, v2, x1, 11
+    STORE_CHROMA_DATA_2 v1, v2, x1, 12
+    STORE_CHROMA_DATA_2 v1, v2, x1, 13
+    STORE_CHROMA_DATA_2 v1, v2, x1, 14
+    STORE_CHROMA_DATA_2 v1, v2, x1, 15
+DeblockChromaLt4H_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockChromaEq4V_AArch64_neon //uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iAlpha, int32_t iBeta
+    dup v16.16b, w3 //alpha
+    dup v17.16b, w4 //beta
+    lsl x3, x2, #1
+    sub x6, x0, x3 //pPixCb-2*Stride
+    sub x7, x1, x3 //pPixCr-2*Stride
+
+    ld1 {v0.d} [0], [x6], x2
+    ld1 {v1.d} [0], [x6]
+    ld1 {v2.d} [0], [x0], x2
+    ld1 {v3.d} [0], [x0]
+    ld1 {v0.d} [1], [x7], x2
+    ld1 {v1.d} [1], [x7]
+    ld1 {v2.d} [1], [x1], x2
+    ld1 {v3.d} [1], [x1]
+
+    MASK_MATRIX   v0, v1, v2, v3, v16, v17, v7
+
+    ZERO_JUMP_END v7, x3, x4, DeblockChromaEq4V_AArch64_neon_end
+
+    DIFF_CHROMA_EQ4_P0Q0_1 v0, v1, v2, v3, v18, v19, v20, v21
+    DIFF_CHROMA_EQ4_P0Q0_2 v0, v1, v2, v3, v18, v19, v20, v21
+
+    mov v6.16b, v7.16b
+    bsl v6.16b, v20.16b, v1.16b
+    bsl v7.16b, v21.16b, v2.16b
+
+    st1     {v6.d} [0], [x6], x2
+    st1     {v6.d} [1], [x7], x2
+
+    st1     {v7.d} [0], [x6]
+    st1     {v7.d} [1], [x7]
+DeblockChromaEq4V_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockChromaEq4H_AArch64_neon //uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iAlpha, int32_t iBeta
+    dup v16.16b, w3 //alpha
+    dup v17.16b, w4 //beta
+
+    sub x6, x0, #2 //pPixCb-2
+    sub x7, x1, #2 //pPixCr-2
+
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 0
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 1
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 2
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 3
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 4
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 5
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 6
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x6, 7
+
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 8
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 9
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 10
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 11
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 12
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 13
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 14
+    LOAD_CHROMA_DATA_4        v0, v1, v2, v3, x7, 15
+    sub x0, x0, #1
+    sub x1, x1, #1
+
+    MASK_MATRIX   v0, v1, v2, v3, v16, v17, v7
+
+    ZERO_JUMP_END v7, x3, x4, DeblockChromaEq4H_AArch64_neon_end
+
+    DIFF_CHROMA_EQ4_P0Q0_1 v0, v1, v2, v3, v18, v19, v20, v21
+    DIFF_CHROMA_EQ4_P0Q0_2 v0, v1, v2, v3, v18, v19, v20, v21
+
+    mov v6.16b, v7.16b
+    bsl v6.16b, v20.16b, v1.16b
+    bsl v7.16b, v21.16b, v2.16b
+
+    STORE_CHROMA_DATA_2 v6, v7, x0, 0
+    STORE_CHROMA_DATA_2 v6, v7, x0, 1
+    STORE_CHROMA_DATA_2 v6, v7, x0, 2
+    STORE_CHROMA_DATA_2 v6, v7, x0, 3
+    STORE_CHROMA_DATA_2 v6, v7, x0, 4
+    STORE_CHROMA_DATA_2 v6, v7, x0, 5
+    STORE_CHROMA_DATA_2 v6, v7, x0, 6
+    STORE_CHROMA_DATA_2 v6, v7, x0, 7
+
+    STORE_CHROMA_DATA_2 v6, v7, x1, 8
+    STORE_CHROMA_DATA_2 v6, v7, x1, 9
+    STORE_CHROMA_DATA_2 v6, v7, x1, 10
+    STORE_CHROMA_DATA_2 v6, v7, x1, 11
+    STORE_CHROMA_DATA_2 v6, v7, x1, 12
+    STORE_CHROMA_DATA_2 v6, v7, x1, 13
+    STORE_CHROMA_DATA_2 v6, v7, x1, 14
+    STORE_CHROMA_DATA_2 v6, v7, x1, 15
+DeblockChromaEq4H_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN DeblockingBSCalcEnc_AArch64_neon
+    // Checking the nzc status
+    BS_NZC_CHECK x0, x2, x3, v16, v17 //v16,v17 save the nzc status
+    // For checking bS[I] = 2
+    movi     v0.16b, #0
+    cmgt     v16.16b, v16.16b, v0.16b
+    cmgt     v17.16b, v17.16b, v0.16b
+    movi     v0.16b, #2
+
+    and  v16.16b, v16.16b, v0.16b //v16 save the nzc check result all the time --- for dir is top
+    and  v17.16b, v17.16b, v0.16b //v17 save the nzc check result all the time --- for dir is left
+
+    // Checking the mv status
+    BS_MV_CHECK x1, x2, x3, v18, v19, v5 , v6 //v18, v19 save the mv status
+    // For checking bS[I] = 1
+    movi   v0.16b, #1
+    and  v18.16b, v18.16b, v0.16b //v18 save the nzc check result all the time --- for dir is top
+    and  v19.16b, v19.16b, v0.16b //v19 save the nzc check result all the time --- for dir is left
+    // Check bS[I] is '1' or '2'
+    umax v1.16b, v18.16b, v16.16b
+    umax v0.16b, v19.16b, v17.16b
+    st1 {v0.16b, v1.16b}, [x4]
+WELS_ASM_AARCH64_FUNC_END
+
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/expand_picture_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/expand_picture_aarch64_neon.S
new file mode 100644
index 0000000000..933de27f0a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/expand_picture_aarch64_neon.S
@@ -0,0 +1,150 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+//void ExpandPictureLuma_AArch64_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW, const int32_t kiPicH);
+WELS_ASM_AARCH64_FUNC_BEGIN ExpandPictureLuma_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x2,w2
+    SIGN_EXTENSION x3,w3
+    mov x7, x0
+    mov x8, x3
+    add x4, x7, x2
+    sub x4, x4, #1
+    mov x10, #16
+    //For the left and right expand
+_expand_picture_luma_loop2:
+    sub x5, x7, #32
+    add x6, x4, #1
+    ld1r {v0.16b}, [x7], x1
+    ld1r {v2.16b}, [x4], x1
+    mov v1.16b, v0.16b
+    mov v3.16b, v2.16b
+    st2 {v0.16b, v1.16b}, [x5]
+    st2 {v2.16b, v3.16b}, [x6]
+    sub x8, x8, #1
+    cbnz x8, _expand_picture_luma_loop2
+    //for the top and bottom expand
+    add x2, x2, #64
+    sub x0, x0, #32
+    madd x4, x1, x3, x0
+    sub x4, x4, x1
+_expand_picture_luma_loop0:
+    mov x5, #32
+    msub x5, x5, x1, x0
+    add x6, x4, x1
+    ld1 {v0.16b}, [x0], x10
+    ld1 {v1.16b}, [x4], x10
+    mov x8, #32
+_expand_picture_luma_loop1:
+    st1 {v0.16b}, [x5], x1
+    st1 {v1.16b}, [x6], x1
+    sub x8, x8, #1
+    cbnz x8, _expand_picture_luma_loop1
+
+    sub x2, x2, #16
+    cbnz x2, _expand_picture_luma_loop0
+WELS_ASM_AARCH64_FUNC_END
+
+//void ExpandPictureChroma_AArch64_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+//                                       const int32_t kiPicH);
+WELS_ASM_AARCH64_FUNC_BEGIN ExpandPictureChroma_AArch64_neon
+    //Save the dst
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x2,w2
+    SIGN_EXTENSION x3,w3
+    mov x7, x0
+    mov x8, x3
+    mov x10, #16
+    add x4, x7, x2
+    sub x4, x4, #1
+    //For the left and right expand
+_expand_picture_chroma_loop2:
+    sub x5, x7, #16
+    add x6, x4, #1
+
+    ld1r {v0.16b}, [x7], x1
+    ld1r {v1.16b}, [x4], x1
+
+    st1 {v0.16b}, [x5]
+    st1 {v1.16b}, [x6]
+    sub x8, x8, #1
+    cbnz x8, _expand_picture_chroma_loop2
+
+    //for the top and bottom expand
+    add x2, x2, #32
+    //
+    mov x9, x2
+    mov x11, #15
+    bic x2, x2, x11
+    //
+    sub x0, x0, #16
+    madd x4, x1, x3, x0
+    sub x4, x4, x1
+_expand_picture_chroma_loop0:
+    mov x5, #16
+    msub x5, x5, x1, x0
+    add x6, x4, x1
+    ld1 {v0.16b}, [x0], x10
+    ld1 {v1.16b}, [x4], x10
+
+    mov x8, #16
+_expand_picture_chroma_loop1:
+    st1 {v0.16b}, [x5], x1
+    st1 {v1.16b}, [x6], x1
+    sub x8, x8, #1
+    cbnz x8, _expand_picture_chroma_loop1
+
+    sub x2, x2, #16
+    cbnz x2, _expand_picture_chroma_loop0
+
+    and x9, x9, #15
+    sub x9, x9, #8
+    cbnz x9, _expand_picture_chroma_end
+    mov x5, #16
+    msub x5, x5, x1, x0
+    add x6, x4, x1
+    ld1 {v0.8b}, [x0]
+    ld1 {v1.8b}, [x4]
+
+    mov x8, #16
+_expand_picture_chroma_loop3:
+    st1 {v0.8b}, [x5], x1
+    st1 {v1.8b}, [x6], x1
+    sub x8, x8, #1
+    cbnz x8, _expand_picture_chroma_loop3
+_expand_picture_chroma_end:
+
+WELS_ASM_AARCH64_FUNC_END
+#endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/intra_pred_common_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/intra_pred_common_aarch64_neon.S
new file mode 100644
index 0000000000..c18c2d4639
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/intra_pred_common_aarch64_neon.S
@@ -0,0 +1,58 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+//for Luma 16x16
+//void WelsI16x16LumaPredV_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredV_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.16b}, [x3]
+.rept 16
+    st1     {v0.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+//void WelsI16x16LumaPredH_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredH_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+.rept 16
+    ld1r    {v0.16b}, [x3], x2
+    st1     {v0.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/arm64/mc_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/common/arm64/mc_aarch64_neon.S
new file mode 100644
index 0000000000..e4e43f9986
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/arm64/mc_aarch64_neon.S
@@ -0,0 +1,2614 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+.align 4
+filter_para: .short 0, 1, -5, 20, 0, 0, 0, 0
+
+.macro FILTER_6TAG_8BITS1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl v18.8h, \arg0\().8b, \arg5\().8b //v18=src[-2]+src[3]
+    uaddl v19.8h, \arg2\().8b, \arg3\().8b  //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl v19.8h, \arg1\().8b, \arg4\().8b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun \arg6\().8b, v18.8h, #5
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS2 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl2 v18.8h, \arg0\().16b, \arg5\().16b //v18=src[-2]+src[3]
+    uaddl2 v19.8h, \arg2\().16b, \arg3\().16b   //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl2 v19.8h, \arg1\().16b, \arg4\().16b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun2 \arg6\().16b, v18.8h, #5
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS1_AVERAGE_WITH_0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl v18.8h, \arg0\().8b, \arg5\().8b //v18=src[-2]+src[3]
+    uaddl v19.8h, \arg2\().8b, \arg3\().8b  //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl v19.8h, \arg1\().8b, \arg4\().8b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun \arg6\().8b, v18.8h, #5
+    uaddl  v19.8h, \arg2\().8b, \arg6\().8b
+    rshrn \arg6\().8b, v19.8h, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS2_AVERAGE_WITH_0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl2 v18.8h, \arg0\().16b, \arg5\().16b //v18=src[-2]+src[3]
+    uaddl2 v19.8h, \arg2\().16b, \arg3\().16b   //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl2 v19.8h, \arg1\().16b, \arg4\().16b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun2 \arg6\().16b, v18.8h, #5
+    uaddl2  v19.8h, \arg2\().16b, \arg6\().16b
+    rshrn2 \arg6\().16b, v19.8h, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS1_AVERAGE_WITH_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl v18.8h, \arg0\().8b, \arg5\().8b //v18=src[-2]+src[3]
+    uaddl v19.8h, \arg2\().8b, \arg3\().8b  //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl v19.8h, \arg1\().8b, \arg4\().8b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun \arg6\().8b, v18.8h, #5
+    uaddl  v19.8h, \arg3\().8b, \arg6\().8b
+    rshrn \arg6\().8b, v19.8h, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS2_AVERAGE_WITH_1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:src[-2], src[-1], src[0], src[1], src[2], src[3], dst_d, multiplier a/b; working: v18, v19
+    uaddl2 v18.8h, \arg0\().16b, \arg5\().16b //v18=src[-2]+src[3]
+    uaddl2 v19.8h, \arg2\().16b, \arg3\().16b   //src[0]+src[1]
+    mla v18.8h, v19.8h, \arg7\().8h  //v18 += 20*(src[0]+src[1]), 2 cycles
+    uaddl2 v19.8h, \arg1\().16b, \arg4\().16b  //src[-1]+src[2]
+    mls v18.8h, v19.8h, \arg8\().8h  //v18 -= 5*(src[-1]+src[2]), 2 cycles
+    sqrshrun2 \arg6\().16b, v18.8h, #5
+    uaddl2  v19.8h, \arg3\().16b, \arg6\().16b
+    rshrn2 \arg6\().16b, v19.8h, #1
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS_TO_16BITS1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:d_src[-2], d_src[-1], d_src[0], d_src[1], d_src[2], d_src[3], dst_q, multiplier a/b; working:v31
+    uaddl   \arg6\().8h, \arg0\().8b, \arg5\().8b       //dst_q=src[-2]+src[3]
+    uaddl   v31.8h, \arg2\().8b, \arg3\().8b    //src[0]+src[1]
+    mla \arg6\().8h, v31.8h, \arg7\().8h    //dst_q += 20*(src[0]+src[1]), 2 cycles
+    uaddl   v31.8h, \arg1\().8b, \arg4\().8b    //src[-1]+src[2]
+    mls \arg6\().8h, v31.8h, \arg8\().8h    //dst_q -= 5*(src[-1]+src[2]), 2 cycles
+//  }
+.endm
+
+.macro FILTER_6TAG_8BITS_TO_16BITS2 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   // input:d_src[-2], d_src[-1], d_src[0], d_src[1], d_src[2], d_src[3], dst_q, multiplier a/b; working:v31
+    uaddl2  \arg6\().8h, \arg0\().16b, \arg5\().16b     //dst_q=src[-2]+src[3]
+    uaddl2  v31.8h, \arg2\().16b, \arg3\().16b  //src[0]+src[1]
+    mla \arg6\().8h, v31.8h, \arg7\().8h    //dst_q += 20*(src[0]+src[1]), 2 cycles
+    uaddl2  v31.8h, \arg1\().16b, \arg4\().16b  //src[-1]+src[2]
+    mls \arg6\().8h, v31.8h, \arg8\().8h    //dst_q -= 5*(src[-1]+src[2]), 2 cycles
+//  }
+.endm
+
+.macro FILTER_3_IN_16BITS_TO_8BITS1 arg0, arg1, arg2, arg3
+//  {   // input:a, b, c, dst_d;
+    sub \arg0\().8h, \arg0\().8h, \arg1\().8h           //a-b
+    sshr    \arg0\().8h, \arg0\().8h, #2            //(a-b)/4
+    sub \arg0\().8h, \arg0\().8h, \arg1\().8h           //(a-b)/4-b
+    add \arg0\().8h, \arg0\().8h, \arg2\().8h           //(a-b)/4-b+c
+    sshr    \arg0\().8h, \arg0\().8h, #2            //((a-b)/4-b+c)/4
+    add \arg0\().8h, \arg0\().8h, \arg2\().8h           //((a-b)/4-b+c)/4+c = (a-5*b+20*c)/16
+    sqrshrun    \arg3\().8b, \arg0\().8h, #6        //(+32)>>6
+//  }
+.endm
+
+.macro FILTER_3_IN_16BITS_TO_8BITS2 arg0, arg1, arg2, arg3
+//  {   // input:a, b, c, dst_d;
+    sub \arg0\().8h, \arg0\().8h, \arg1\().8h           //a-b
+    sshr    \arg0\().8h, \arg0\().8h, #2            //(a-b)/4
+    sub \arg0\().8h, \arg0\().8h, \arg1\().8h           //(a-b)/4-b
+    add \arg0\().8h, \arg0\().8h, \arg2\().8h           //(a-b)/4-b+c
+    sshr    \arg0\().8h, \arg0\().8h, #2            //((a-b)/4-b+c)/4
+    add \arg0\().8h, \arg0\().8h, \arg2\().8h           //((a-b)/4-b+c)/4+c = (a-5*b+20*c)/16
+    sqrshrun2   \arg3\().16b, \arg0\().8h, #6       //(+32)>>6
+//  }
+.endm
+
+.macro UNPACK_2_16BITS_TO_ABC arg0, arg1, arg2, arg3, arg4
+//  {   // input:q_src[-2:5], q_src[6:13](avail 8+5)/q_src[6:**](avail 4+5), dst_a, dst_b, dst_c;
+    ext \arg4\().16b, \arg0\().16b, \arg1\().16b, #4        //src[0]
+    ext \arg3\().16b, \arg0\().16b, \arg1\().16b, #6        //src[1]
+    add \arg4\().8h, \arg4\().8h, \arg3\().8h                   //c=src[0]+src[1]
+
+    ext \arg3\().16b, \arg0\().16b, \arg1\().16b, #2        //src[-1]
+    ext \arg2\().16b, \arg0\().16b, \arg1\().16b, #8        //src[2]
+    add \arg3\().8h, \arg3\().8h, \arg2\().8h                   //b=src[-1]+src[2]
+
+    ext \arg2\().16b, \arg0\().16b, \arg1\().16b, #10       //src[3]
+    add \arg2\().8h, \arg2\().8h, \arg0\().8h                   //a=src[-2]+src[3]
+//  }
+.endm
+
+.macro AVERAGE_TWO_8BITS1 arg0, arg1, arg2
+//  {   // input:dst_d, src_d A and B; working: v5
+    uaddl   v30.8h, \arg2\().8b, \arg1\().8b
+    rshrn   \arg0\().8b, v30.8h, #1
+//  }
+.endm
+
+.macro AVERAGE_TWO_8BITS2 arg0, arg1, arg2
+//  {   // input:dst_d, src_d A and B; working: v5
+    uaddl2  v30.8h, \arg2\().16b, \arg1\().16b
+    rshrn2  \arg0\().16b, v30.8h, #1
+//  }
+.endm
+
+.macro FILTER_SINGLE_TAG_8BITS arg0, arg1, arg2, arg3
+// when width=17/9, used
+//  {   // input: src_d{Y[0][1][2][3][4][5]X},
+    rev64   \arg2\().8b, \arg0\().8b                // X[5][4][3][2][1][0]O
+    uaddl   \arg2\().8h, \arg0\().8b, \arg2\().8b           // each 16bits, *[50][41][32][23][14][05]*
+    mul \arg2\().4h, \arg2\().4h, \arg1\().4h           // 0+1*[50]-5*[41]+20[32]
+    addv \arg3, \arg2\().4h
+    sqrshrun \arg0\().8b, \arg0\().8h, #5
+//  }
+.endm
+
+.macro UNPACK_FILTER_SINGLE_TAG_16BITS arg0, arg1, arg2, arg3, arg4, arg5
+//  {   // each 16bits; input: d_dst, d_src[0:5], para, working, working, d(low part of d_dst)
+    ext \arg3\().16b, \arg1\().16b, \arg1\().16b, #14       // X[0][1][2][3][4][5]O
+    ext \arg4\().16b, \arg3\().16b, \arg3\().16b, #8      // [3][4][5]OX[0][1][2]
+    rev64  \arg4\().8h, \arg4\().8h         // X[5][4][3][2][1][0]O
+    add   \arg3\().8h, \arg3\().8h, \arg4\().8h    // each 16bits, *[50][41][32][23][14][05]*
+    smull \arg3\().4s, \arg3\().4h, \arg2\().4h         // 0+1*[50]-5*[41]+20[32]
+    saddlv \arg5, \arg3\().4s
+    //sshr \arg0\().2d, \arg0\().2d, #4
+    sqrshrun \arg0\().2s, \arg0\().2d, #10
+    uqxtn \arg0\().4h, \arg0\().4s
+    uqxtn \arg0\().8b, \arg0\().8h
+    //   }
+.endm
+
+.macro VEC4_LD1_8BITS_16ELEMENT arg0, arg1, arg2, arg3, arg4, arg5
+//{//load 16bytes * 4rows
+    ld1 {\arg2\().16b}, [\arg0], \arg1
+    ld1 {\arg3\().16b}, [\arg0], \arg1
+    ld1 {\arg4\().16b}, [\arg0], \arg1
+    ld1 {\arg5\().16b}, [\arg0], \arg1
+//}
+.endm
+
+.macro VEC4_ST1_8BITS_8ELEMENT arg0, arg1, arg2, arg3, arg4, arg5
+//{
+    st1 {\arg2\().8b}, [\arg0], \arg1
+    st1 {\arg3\().8b}, [\arg0], \arg1
+    st1 {\arg4\().8b}, [\arg0], \arg1
+    st1 {\arg5\().8b}, [\arg0], \arg1
+//}
+.endm
+
+.macro VEC4_UADDL_8BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
+//{
+    uaddl \arg8\().8h, \arg0\().8b, \arg1\().8b
+    uaddl \arg9\().8h, \arg2\().8b, \arg3\().8b
+    uaddl \arg10\().8h, \arg4\().8b, \arg5\().8b
+    uaddl \arg11\().8h, \arg6\().8b, \arg7\().8b
+//}
+.endm
+
+.macro VEC4_UADDL2_8BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
+//{
+    uaddl \arg8\().8h, \arg0\().16b, \arg1\().16b
+    uaddl \arg9\().8h, \arg2\().16b, \arg3\().16b
+    uaddl \arg10\().8h, \arg4\().16b, \arg5\().16b
+    uaddl \arg11\().8h, \arg6\().16b, \arg7\().16b
+//}
+.endm
+
+.macro VEC4_MLS_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
+//{
+    mls   \arg8\().8h, \arg0\().8h, \arg1\().8h
+    mls   \arg9\().8h, \arg2\().8h, \arg3\().8h
+    mls   \arg10\().8h, \arg4\().8h, \arg5\().8h
+    mls   \arg11\().8h, \arg6\().8h, \arg7\().8h
+//}
+.endm
+
+.macro VEC4_MLA_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11
+//{
+    mla   \arg8\().8h, \arg0\().8h, \arg1\().8h
+    mla   \arg9\().8h, \arg2\().8h, \arg3\().8h
+    mla   \arg10\().8h, \arg4\().8h, \arg5\().8h
+    mla   \arg11\().8h, \arg6\().8h, \arg7\().8h
+//}
+.endm
+
+.macro VEC4_SQRSHRUN_16BITS_SHIFT5 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//{
+    sqrshrun \arg4\().8b, \arg0\().8h, #5
+    sqrshrun \arg5\().8b, \arg1\().8h, #5
+    sqrshrun \arg6\().8b, \arg2\().8h, #5
+    sqrshrun \arg7\().8b, \arg3\().8h, #5
+//}
+.endm
+
+.macro VEC4_SQRSHRUN2_16BITS_SHIFT5 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//{
+    sqrshrun2 \arg4\().16b, \arg0\().8h, #5
+    sqrshrun2 \arg5\().16b, \arg1\().8h, #5
+    sqrshrun2 \arg6\().16b, \arg2\().8h, #5
+    sqrshrun2 \arg7\().16b, \arg3\().8h, #5
+//}
+.endm
+
+.macro VEC4_RSHRN_16BITS_SHIFT1 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//{
+    rshrn \arg4\().8b, \arg0\().8h, #1
+    rshrn \arg5\().8b, \arg1\().8h, #1
+    rshrn \arg6\().8b, \arg2\().8h, #1
+    rshrn \arg7\().8b, \arg3\().8h, #1
+//}
+.endm
+
+//(const uint8_t* pSrc {x0}, int32_t iSrcStride{x1}, uint8_t* pDst{x2}, int32_t iDstStride{x3}, int32_t iHeight{x4})
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20WidthEq16_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w16_h_mc_luma_loop:
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 //only use 21(16+5); v2=src[-2]
+    trn1 v2.2d, v2.2d, v3.2d
+    //prfm pldl1strm, [x0]
+    ext v5.16b, v2.16b, v4.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v4.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v4.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v4.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v4.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v5, v6, v7, v16, v17, v20, v0, v1
+
+    sub x4, x4, #1
+    st1 {v20.16b}, [x2], x3 //write 16Byte
+    cbnz x4, w16_h_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer20WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20WidthEq8_AArch64_neon
+    sub x0, x0, #2
+    stp d8,d9, [sp,#-16]!
+    movi v8.8h, #20, lsl #0
+    movi v9.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w8_h_mc_luma_loop:
+    VEC4_LD1_8BITS_16ELEMENT x0, x1, v16, v20, v24, v28    //load src[-2] in v16,v20,v24,v28 for 4 row; only use 13(8+5);
+    sub x4, x4, #4
+
+    //1st row:
+    ext v17.16b, v16.16b, v16.16b, #5  //src[3]
+    ext v18.16b, v16.16b, v16.16b, #1  //src[-1]
+    ext v19.16b, v16.16b, v16.16b, #4  //src[2]
+    //2nd row:
+    ext v21.16b, v20.16b, v20.16b, #5  //src[3]
+    ext v22.16b, v20.16b, v20.16b, #1  //src[-1]
+    ext v23.16b, v20.16b, v20.16b, #4  //src[2]
+    //3rd row:
+    ext v25.16b, v24.16b, v24.16b, #5  //src[3]
+    ext v26.16b, v24.16b, v24.16b, #1  //src[-1]
+    ext v27.16b, v24.16b, v24.16b, #4  //src[2]
+    //4th row:
+    ext v29.16b, v28.16b, v28.16b, #5  //src[3]
+    ext v30.16b, v28.16b, v28.16b, #1  //src[-1]
+    ext v31.16b, v28.16b, v28.16b, #4  //src[2]
+
+    VEC4_UADDL_8BITS v16, v17, v20, v21, v24, v25, v28, v29, v0, v2, v4, v6   //v0/v2/v4/v6=src[-2]+src[3]
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v9, v3, v9, v5, v9, v7, v9, v0, v2, v4, v6  //v0/v2/v4/v6 -= 5*(src[-1]+src[2])
+
+    //1st row:
+    ext v18.16b, v16.16b, v16.16b, #2  //src[0]
+    ext v19.16b, v16.16b, v16.16b, #3  //src[1]
+    //2nd row:
+    ext v22.16b, v20.16b, v20.16b, #2  //src[0]
+    ext v23.16b, v20.16b, v20.16b, #3  //src[1]
+    //3rd row:
+    ext v26.16b, v24.16b, v24.16b, #2  //src[0]
+    ext v27.16b, v24.16b, v24.16b, #3  //src[1]
+    //4th row:
+    ext v30.16b, v28.16b, v28.16b, #2  //src[0]
+    ext v31.16b, v28.16b, v28.16b, #3  //src[1]
+
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[0]+src[1]
+    VEC4_MLA_16BITS v1, v8, v3, v8, v5, v8, v7, v8, v0, v2, v4, v6  //v0/v2/v4/v6+=20*(src[0]+src[1])
+
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7
+    cbnz x4, w8_h_mc_luma_loop
+
+    ldp d8,d9,[sp],#16
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer20WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20WidthEq4_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    asr x4, x4, #1
+w4_h_mc_luma_loop:
+    ld1 {v2.16b}, [x0], x1 //only use 9(4+5); 1st row src[-2:6]
+    //prfm pldl1strm, [x0]
+    ld1 {v3.16b}, [x0], x1 //only use 9(4+5); 2nd row src[-2:6]
+    //prfm pldl1strm, [x0]
+
+    zip1 v4.4s, v2.4s, v3.4s  // v4=src[-2] 1st:2nd
+    ext v17.16b, v4.16b, v4.16b, #8 // v17=src[2:5] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[-1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[-1:6]
+    zip1 v5.4s, v2.4s, v3.4s  // v5=src[-1:2] 1st:2nd
+    ext v7.16b, v5.16b, v4.16b, #8    //v7=src[3:6] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[0:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[0:6]
+    zip1 v6.4s, v2.4s, v3.4s  // v6=src[0:3] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[1:6]
+    zip1 v16.4s, v2.4s, v3.4s  // v16=src[1:4] 1st:2nd
+
+    FILTER_6TAG_8BITS1 v4, v5, v6, v16, v17, v7, v20, v0, v1
+
+    st1 {v20.s}[0], [x2], x3 //write 4Byte
+    st1 {v20.s}[1], [x2], x3 //write 4Byte
+    sub x4, x4, #1
+    cbnz x4, w4_h_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer10WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer10WidthEq16_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w16_xy_10_mc_luma_loop:
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 //only use 21(16+5); v2=src[-2]
+    trn1 v2.2d, v2.2d, v3.2d
+    //prfm pldl1strm, [x0]
+    ext v5.16b, v2.16b, v4.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v4.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v4.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v4.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v4.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v2, v5, v6, v7, v16, v17, v20, v0, v1
+
+    sub x4, x4, #1
+    st1 {v20.16b}, [x2], x3 //write 16Byte
+    cbnz x4, w16_xy_10_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer10WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer10WidthEq8_AArch64_neon
+    sub x0, x0, #2
+    stp d8,d9, [sp,#-16]!
+    movi v8.8h, #20, lsl #0
+    movi v9.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w8_xy_10_mc_luma_loop:
+    VEC4_LD1_8BITS_16ELEMENT x0, x1, v16, v20, v24, v28    //load src[-2] in v16,v20,v24,v28 for 4 row; only use 13(8+5);
+    sub x4, x4, #4
+
+    //1st row:
+    ext v17.16b, v16.16b, v16.16b, #5  //src[3]
+    ext v18.16b, v16.16b, v16.16b, #1  //src[-1]
+    ext v19.16b, v16.16b, v16.16b, #4  //src[2]
+    //2nd row:
+    ext v21.16b, v20.16b, v20.16b, #5  //src[3]
+    ext v22.16b, v20.16b, v20.16b, #1  //src[-1]
+    ext v23.16b, v20.16b, v20.16b, #4  //src[2]
+    //3rd row:
+    ext v25.16b, v24.16b, v24.16b, #5  //src[3]
+    ext v26.16b, v24.16b, v24.16b, #1  //src[-1]
+    ext v27.16b, v24.16b, v24.16b, #4  //src[2]
+    //4th row:
+    ext v29.16b, v28.16b, v28.16b, #5  //src[3]
+    ext v30.16b, v28.16b, v28.16b, #1  //src[-1]
+    ext v31.16b, v28.16b, v28.16b, #4  //src[2]
+
+    VEC4_UADDL_8BITS v16, v17, v20, v21, v24, v25, v28, v29, v0, v2, v4, v6   //v0/v2/v4/v6=src[-2]+src[3]
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v9, v3, v9, v5, v9, v7, v9, v0, v2, v4, v6  //v0/v2/v4/v6 -= 5*(src[-1]+src[2])
+
+    //1st row:
+    ext v18.16b, v16.16b, v16.16b, #2  //src[0]
+    ext v19.16b, v16.16b, v16.16b, #3  //src[1]
+    //2nd row:
+    ext v22.16b, v20.16b, v20.16b, #2  //src[0]
+    ext v23.16b, v20.16b, v20.16b, #3  //src[1]
+    //3rd row:
+    ext v26.16b, v24.16b, v24.16b, #2  //src[0]
+    ext v27.16b, v24.16b, v24.16b, #3  //src[1]
+    //4th row:
+    ext v30.16b, v28.16b, v28.16b, #2  //src[0]
+    ext v31.16b, v28.16b, v28.16b, #3  //src[1]
+
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[0]+src[1]
+    VEC4_MLA_16BITS v1, v8, v3, v8, v5, v8, v7, v8, v0, v2, v4, v6  //v0/v2/v4/v6+=20*(src[0]+src[1])
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_UADDL_8BITS v1, v18, v3, v22, v5, v26, v7, v30, v0, v2, v4, v6   //average with arc[0]
+    VEC4_RSHRN_16BITS_SHIFT1 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7
+    cbnz x4, w8_xy_10_mc_luma_loop
+
+    ldp d8,d9,[sp],#16
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer10WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer10WidthEq4_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    asr x4, x4, #1
+w4_xy_10_mc_luma_loop:
+    ld1 {v2.16b}, [x0], x1 //only use 9(4+5); 1st row src[-2:6]
+    //prfm pldl1strm, [x0]
+    ld1 {v3.16b}, [x0], x1 //only use 9(4+5); 2nd row src[-2:6]
+    //prfm pldl1strm, [x0]
+
+    zip1 v4.4s, v2.4s, v3.4s  // v4=src[-2] 1st:2nd
+    ext v17.16b, v4.16b, v4.16b, #8 // v17=src[2:5] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[-1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[-1:6]
+    zip1 v5.4s, v2.4s, v3.4s  // v5=src[-1:2] 1st:2nd
+    ext v7.16b, v5.16b, v4.16b, #8    //v7=src[3:6] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[0:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[0:6]
+    zip1 v6.4s, v2.4s, v3.4s  // v6=src[0:3] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[1:6]
+    zip1 v16.4s, v2.4s, v3.4s  // v16=src[1:4] 1st:2nd
+
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v4, v5, v6, v16, v17, v7, v20, v0, v1
+
+    st1 {v20.s}[0], [x2], x3 //write 4Byte
+    st1 {v20.s}[1], [x2], x3 //write 4Byte
+    sub x4, x4, #1
+    cbnz x4, w4_xy_10_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer30WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer30WidthEq16_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w16_xy_30_mc_luma_loop:
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 //only use 21(16+5); v2=src[-2]
+    trn1 v2.2d, v2.2d, v3.2d
+    //prfm pldl1strm, [x0]
+    ext v5.16b, v2.16b, v4.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v4.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v4.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v4.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v4.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+
+    sub x4, x4, #1
+    st1 {v20.16b}, [x2], x3 //write 16Byte
+    cbnz x4, w16_xy_30_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer30WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer30WidthEq8_AArch64_neon
+    sub x0, x0, #2
+    stp d8,d9, [sp,#-16]!
+    movi v8.8h, #20, lsl #0
+    movi v9.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w8_xy_30_mc_luma_loop:
+    VEC4_LD1_8BITS_16ELEMENT x0, x1, v16, v20, v24, v28    //load src[-2] in v16,v20,v24,v28 for 4 row; only use 13(8+5);
+    sub x4, x4, #4
+
+    //1st row:
+    ext v17.16b, v16.16b, v16.16b, #5  //src[3]
+    ext v18.16b, v16.16b, v16.16b, #1  //src[-1]
+    ext v19.16b, v16.16b, v16.16b, #4  //src[2]
+    //2nd row:
+    ext v21.16b, v20.16b, v20.16b, #5  //src[3]
+    ext v22.16b, v20.16b, v20.16b, #1  //src[-1]
+    ext v23.16b, v20.16b, v20.16b, #4  //src[2]
+    //3rd row:
+    ext v25.16b, v24.16b, v24.16b, #5  //src[3]
+    ext v26.16b, v24.16b, v24.16b, #1  //src[-1]
+    ext v27.16b, v24.16b, v24.16b, #4  //src[2]
+    //4th row:
+    ext v29.16b, v28.16b, v28.16b, #5  //src[3]
+    ext v30.16b, v28.16b, v28.16b, #1  //src[-1]
+    ext v31.16b, v28.16b, v28.16b, #4  //src[2]
+
+    VEC4_UADDL_8BITS v16, v17, v20, v21, v24, v25, v28, v29, v0, v2, v4, v6   //v0/v2/v4/v6=src[-2]+src[3]
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v9, v3, v9, v5, v9, v7, v9, v0, v2, v4, v6  //v0/v2/v4/v6 -= 5*(src[-1]+src[2])
+
+    //1st row:
+    ext v18.16b, v16.16b, v16.16b, #2  //src[0]
+    ext v19.16b, v16.16b, v16.16b, #3  //src[1]
+    //2nd row:
+    ext v22.16b, v20.16b, v20.16b, #2  //src[0]
+    ext v23.16b, v20.16b, v20.16b, #3  //src[1]
+    //3rd row:
+    ext v26.16b, v24.16b, v24.16b, #2  //src[0]
+    ext v27.16b, v24.16b, v24.16b, #3  //src[1]
+    //4th row:
+    ext v30.16b, v28.16b, v28.16b, #2  //src[0]
+    ext v31.16b, v28.16b, v28.16b, #3  //src[1]
+
+    VEC4_UADDL_8BITS v18, v19, v22, v23, v26, v27, v30, v31, v1, v3, v5, v7 //v1/v3/v5/v7=src[0]+src[1]
+    VEC4_MLA_16BITS v1, v8, v3, v8, v5, v8, v7, v8, v0, v2, v4, v6  //v0/v2/v4/v6+=20*(src[0]+src[1])
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_UADDL_8BITS v1, v19, v3, v23, v5, v27, v7, v31, v0, v2, v4, v6   //average with arc[0]
+    VEC4_RSHRN_16BITS_SHIFT1 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7
+    cbnz x4, w8_xy_30_mc_luma_loop
+
+    ldp d8,d9,[sp],#16
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer30WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer30WidthEq4_AArch64_neon
+    sub x0, x0, #2
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    asr x4, x4, #1
+w4_xy_30_mc_luma_loop:
+    ld1 {v2.16b}, [x0], x1 //only use 9(4+5); 1st row src[-2:6]
+    //prfm pldl1strm, [x0]
+    ld1 {v3.16b}, [x0], x1 //only use 9(4+5); 2nd row src[-2:6]
+    //prfm pldl1strm, [x0]
+
+    zip1 v4.4s, v2.4s, v3.4s  // v4=src[-2] 1st:2nd
+    ext v17.16b, v4.16b, v4.16b, #8 // v17=src[2:5] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[-1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[-1:6]
+    zip1 v5.4s, v2.4s, v3.4s  // v5=src[-1:2] 1st:2nd
+    ext v7.16b, v5.16b, v4.16b, #8    //v7=src[3:6] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[0:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[0:6]
+    zip1 v6.4s, v2.4s, v3.4s  // v6=src[0:3] 1st:2nd
+
+    ext v2.16b, v2.16b, v4.16b, #1    //1st row src[1:6]
+    ext v3.16b, v3.16b, v4.16b, #1    //2nd row src[1:6]
+    zip1 v16.4s, v2.4s, v3.4s  // v16=src[1:4] 1st:2nd
+
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v4, v5, v6, v16, v17, v7, v20, v0, v1
+
+    st1 {v20.s}[0], [x2], x3 //write 4Byte
+    st1 {v20.s}[1], [x2], x3 //write 4Byte
+    sub x4, x4, #1
+    cbnz x4, w4_xy_30_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer01WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer01WidthEq16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[2*stride]
+
+
+w16_xy_01_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 0 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 1 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 2 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 3 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 4 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_0 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 7 line
+
+    mov v3.16b, v5.16b
+    mov v5.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v4.16b
+    mov v4.16b, v6.16b
+    mov v6.16b, v7.16b
+    sub x4, x4, #8
+    cbnz x4, w16_xy_01_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer01WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer01WidthEq8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v30.8h, #20, lsl #0
+    movi v31.8h, #5, lsl #0
+
+    ld1 {v16.8b}, [x0], x1 // v16=src[-2*stride]
+    ld1 {v17.8b}, [x0], x1 // v17=src[-1*stride]
+    ld1 {v18.8b}, [x0], x1 // v18=src[0*stride]
+    ld1 {v19.8b}, [x0], x1 // v19=src[1*stride]
+    ld1 {v20.8b}, [x0], x1 // v20=src[2*stride]
+
+w8_xy_01_mc_luma_loop:
+    ld1 {v21.8b}, [x0], x1 // v21=src[3*stride]
+    ld1 {v22.8b}, [x0], x1 // v22=src[4*stride]
+    ld1 {v23.8b}, [x0], x1 // v23=src[5*stride]
+    ld1 {v24.8b}, [x0], x1 // v24=src[6*stride]
+
+    VEC4_UADDL_8BITS v16, v21, v17, v22, v18, v23, v19, v24, v0, v2, v4, v6 //v0/v2/v4/v6 =src[-2]+src[3]
+    VEC4_UADDL_8BITS v17, v20, v18, v21, v19, v22, v20, v23, v1, v3, v5, v7 //v1/v3/v5/v7 =src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v31, v3, v31, v5, v31, v7, v31, v0, v2, v4, v6  //v0/v2/v4/v6 -=5*(src[-1]+src[2])
+    VEC4_UADDL_8BITS v18, v19, v19, v20, v20, v21, v21, v22, v1, v3, v5, v7 //v1/v3/v5/v7 =src[0]+src[1]
+    VEC4_MLA_16BITS v1, v30, v3, v30, v5, v30, v7, v30, v0, v2, v4, v6  //v0/v2/v4/v6 += 20*(src[0]+src[1])
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_UADDL_8BITS v1, v18, v3, v19, v5, v20, v7, v21, v0, v2, v4, v6 //v0/v2/v4/v6 = average with src[0]
+    VEC4_RSHRN_16BITS_SHIFT1 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7  //store 8bytes*4row
+
+    sub x4, x4, #4
+    mov v16.16b, v20.16b
+    mov v17.16b, v21.16b
+    mov v18.16b, v22.16b
+    mov v19.16b, v23.16b
+    mov v20.16b, v24.16b
+
+    cbnz x4, w8_xy_01_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer01WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer01WidthEq4_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[0], [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[0], [x0], x1 // v3=src[-1*stride]
+    mov v2.s[1], v3.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.s}[0], [x0], x1 // v4=src[0*stride]
+    mov v3.s[1], v4.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.s}[0], [x0], x1 // v5=src[1*stride]
+    mov v4.s[1], v5.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.s}[0], [x0], x1 // v6=src[2*stride]
+    mov v5.s[1], v6.s[0]
+
+w4_xy_01_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[0], [x0], x1 // v7=src[3*stride]
+    mov v6.s[1], v7.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[1], [x0], x1 // v7=src[4*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 0 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 1 line
+    mov v2.s[0], v7.s[1]
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[1], [x0], x1 // v2=src[5*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[1], [x0], x1 // v2=src[6*stride]
+    mov v3.s[0], v2.s[1]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_0 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 2 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 3 line
+    mov v4.s[0], v3.s[1]
+
+    mov v21.8b, v6.8b
+    mov v6.8b, v4.8b
+    mov v4.8b, v2.8b
+    mov v2.8b, v21.8b
+    mov v21.8b, v3.8b
+    mov v3.8b, v7.8b
+    mov v7.8b, v5.8b
+    mov v5.8b, v21.8b
+
+    sub x4, x4, #4
+    cbnz x4, w4_xy_01_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer03WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer03WidthEq16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[2*stride]
+
+
+w16_xy_03_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 0 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 1 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 2 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 3 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 4 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2_AVERAGE_WITH_1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 7 line
+
+    mov v3.16b, v5.16b
+    mov v5.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v4.16b
+    mov v4.16b, v6.16b
+    mov v6.16b, v7.16b
+    sub x4, x4, #8
+    cbnz x4, w16_xy_03_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer03WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer03WidthEq8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v30.8h, #20, lsl #0
+    movi v31.8h, #5, lsl #0
+
+    ld1 {v16.8b}, [x0], x1 // v16=src[-2*stride]
+    ld1 {v17.8b}, [x0], x1 // v17=src[-1*stride]
+    ld1 {v18.8b}, [x0], x1 // v18=src[0*stride]
+    ld1 {v19.8b}, [x0], x1 // v19=src[1*stride]
+    ld1 {v20.8b}, [x0], x1 // v20=src[2*stride]
+
+w8_xy_03_mc_luma_loop:
+    ld1 {v21.8b}, [x0], x1 // v21=src[3*stride]
+    ld1 {v22.8b}, [x0], x1 // v22=src[4*stride]
+    ld1 {v23.8b}, [x0], x1 // v23=src[5*stride]
+    ld1 {v24.8b}, [x0], x1 // v24=src[6*stride]
+
+    VEC4_UADDL_8BITS v16, v21, v17, v22, v18, v23, v19, v24, v0, v2, v4, v6 //v0/v2/v4/v6 =src[-2]+src[3]
+    VEC4_UADDL_8BITS v17, v20, v18, v21, v19, v22, v20, v23, v1, v3, v5, v7 //v1/v3/v5/v7 =src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v31, v3, v31, v5, v31, v7, v31, v0, v2, v4, v6  //v0/v2/v4/v6 -=5*(src[-1]+src[2])
+    VEC4_UADDL_8BITS v18, v19, v19, v20, v20, v21, v21, v22, v1, v3, v5, v7 //v1/v3/v5/v7 =src[0]+src[1]
+    VEC4_MLA_16BITS v1, v30, v3, v30, v5, v30, v7, v30, v0, v2, v4, v6  //v0/v2/v4/v6 += 20*(src[0]+src[1])
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_UADDL_8BITS v1, v19, v3, v20, v5, v21, v7, v22, v0, v2, v4, v6 //v0/v2/v4/v6 = average with src[0]
+    VEC4_RSHRN_16BITS_SHIFT1 v0, v2, v4, v6, v1, v3, v5, v7
+
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7  //store 8bytes*4row
+
+    sub x4, x4, #4
+    mov v16.16b, v20.16b
+    mov v17.16b, v21.16b
+    mov v18.16b, v22.16b
+    mov v19.16b, v23.16b
+    mov v20.16b, v24.16b
+
+    cbnz x4, w8_xy_03_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer03WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer03WidthEq4_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[0], [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[0], [x0], x1 // v3=src[-1*stride]
+    mov v2.s[1], v3.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.s}[0], [x0], x1 // v4=src[0*stride]
+    mov v3.s[1], v4.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.s}[0], [x0], x1 // v5=src[1*stride]
+    mov v4.s[1], v5.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.s}[0], [x0], x1 // v6=src[2*stride]
+    mov v5.s[1], v6.s[0]
+
+w4_xy_03_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[0], [x0], x1 // v7=src[3*stride]
+    mov v6.s[1], v7.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[1], [x0], x1 // v7=src[4*stride]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 0 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 1 line
+    mov v2.s[0], v7.s[1]
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[1], [x0], x1 // v2=src[5*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[1], [x0], x1 // v2=src[6*stride]
+    mov v3.s[0], v2.s[1]
+    FILTER_6TAG_8BITS1_AVERAGE_WITH_1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 2 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 3 line
+    mov v4.s[0], v3.s[1]
+
+    mov v21.8b, v6.8b
+    mov v6.8b, v4.8b
+    mov v4.8b, v2.8b
+    mov v2.8b, v21.8b
+    mov v21.8b, v3.8b
+    mov v3.8b, v7.8b
+    mov v7.8b, v5.8b
+    mov v5.8b, v21.8b
+
+    sub x4, x4, #4
+    cbnz x4, w4_xy_03_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer02WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02WidthEq16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[2*stride]
+
+
+w16_xy_02_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 0 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 1 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[3*stride]
+    FILTER_6TAG_8BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS2 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 2 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[3*stride]
+    FILTER_6TAG_8BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS2 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 3 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[3*stride]
+    FILTER_6TAG_8BITS1 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    FILTER_6TAG_8BITS2 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 4 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[3*stride]
+    FILTER_6TAG_8BITS1 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    FILTER_6TAG_8BITS2 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 7 line
+
+    mov v3.16b, v5.16b
+    mov v5.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v4.16b
+    mov v4.16b, v6.16b
+    mov v6.16b, v7.16b
+    sub x4, x4, #8
+    cbnz x4, w16_xy_02_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer02WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02WidthEq8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v30.8h, #20, lsl #0
+    movi v31.8h, #5, lsl #0
+
+    ld1 {v16.8b}, [x0], x1 // v16=src[-2*stride]
+    ld1 {v17.8b}, [x0], x1 // v17=src[-1*stride]
+    ld1 {v18.8b}, [x0], x1 // v18=src[0*stride]
+    ld1 {v19.8b}, [x0], x1 // v19=src[1*stride]
+    ld1 {v20.8b}, [x0], x1 // v20=src[2*stride]
+
+w8_xy_02_mc_luma_loop:
+    ld1 {v21.8b}, [x0], x1 // v21=src[3*stride]
+    ld1 {v22.8b}, [x0], x1 // v22=src[4*stride]
+    ld1 {v23.8b}, [x0], x1 // v23=src[5*stride]
+    ld1 {v24.8b}, [x0], x1 // v24=src[6*stride]
+
+    VEC4_UADDL_8BITS v16, v21, v17, v22, v18, v23, v19, v24, v0, v2, v4, v6 //v0/v2/v4/v6 =src[-2]+src[3]
+    VEC4_UADDL_8BITS v17, v20, v18, v21, v19, v22, v20, v23, v1, v3, v5, v7 //v1/v3/v5/v7 =src[-1]+src[2]
+    VEC4_MLS_16BITS v1, v31, v3, v31, v5, v31, v7, v31, v0, v2, v4, v6  //v0/v2/v4/v6 -=5*(src[-1]+src[2])
+    VEC4_UADDL_8BITS v18, v19, v19, v20, v20, v21, v21, v22, v1, v3, v5, v7 //v1/v3/v5/v7 =src[0]+src[1]
+    VEC4_MLA_16BITS v1, v30, v3, v30, v5, v30, v7, v30, v0, v2, v4, v6  //v0/v2/v4/v6 += 20*(src[0]+src[1])
+    VEC4_SQRSHRUN_16BITS_SHIFT5 v0, v2, v4, v6, v1, v3, v5, v7
+    VEC4_ST1_8BITS_8ELEMENT x2, x3, v1, v3, v5, v7  //store 8bytes*4row
+
+    sub x4, x4, #4
+    mov v16.16b, v20.16b
+    mov v17.16b, v21.16b
+    mov v18.16b, v22.16b
+    mov v19.16b, v23.16b
+    mov v20.16b, v24.16b
+
+    cbnz x4, w8_xy_02_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer02WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02WidthEq4_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[0], [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[0], [x0], x1 // v3=src[-1*stride]
+    mov v2.s[1], v3.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.s}[0], [x0], x1 // v4=src[0*stride]
+    mov v3.s[1], v4.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.s}[0], [x0], x1 // v5=src[1*stride]
+    mov v4.s[1], v5.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.s}[0], [x0], x1 // v6=src[2*stride]
+    mov v5.s[1], v6.s[0]
+
+w4_xy_02_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[0], [x0], x1 // v7=src[3*stride]
+    mov v6.s[1], v7.s[0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.s}[1], [x0], x1 // v7=src[4*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 0 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 1 line
+    mov v2.s[0], v7.s[1]
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.s}[1], [x0], x1 // v2=src[5*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.s}[1], [x0], x1 // v2=src[6*stride]
+    mov v3.s[0], v2.s[1]
+    FILTER_6TAG_8BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 2 line
+    st1 {v20.s}[1], [x2], x3 //write 4Byte : 3 line
+    mov v4.s[0], v3.s[1]
+
+    mov v21.8b, v6.8b
+    mov v6.8b, v4.8b
+    mov v4.8b, v2.8b
+    mov v2.8b, v21.8b
+    mov v21.8b, v3.8b
+    mov v3.8b, v7.8b
+    mov v7.8b, v5.8b
+    mov v5.8b, v21.8b
+
+    sub x4, x4, #4
+    cbnz x4, w4_xy_02_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer22WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                       int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22WidthEq16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    stp d8, d9, [sp,#-16]!
+    stp d10, d11, [sp,#-16]!
+    stp d12, d13, [sp,#-16]!
+    stp d14, d15, [sp,#-16]!
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b, v6.8b, v7.8b}, [x0], x1 // v5=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v8.8b, v9.8b, v10.8b}, [x0], x1 // v8=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v11.8b, v12.8b, v13.8b}, [x0], x1 // v11=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v14.8b, v15.8b, v16.8b}, [x0], x1 // v14=src[2*stride]
+
+w16_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v17.8b, v18.8b, v19.8b}, [x0], x1 // v17=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v5, v8, v11, v14, v17, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v6, v9, v12, v15, v18, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v7, v10, v13, v16, v19, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v8, v11, v14, v17, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v6, v9, v12, v15, v18, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v7, v10, v13, v16, v19, v4, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b, v6.8b, v7.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v8, v11, v14, v17, v2, v5, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v9, v12, v15, v18, v3, v6, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v10, v13, v16, v19, v4, v7, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v8.8b, v9.8b, v10.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v11, v14, v17, v2, v5, v8, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v12, v15, v18, v3, v6, v9, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v13, v16, v19, v4, v7, v10, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 3 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v11.8b, v12.8b, v13.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v14, v17, v2, v5, v8, v11, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v15, v18, v3, v6, v9, v12, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v16, v19, v4, v7, v10, v13, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 4 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v14.8b, v15.8b, v16.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v17, v2, v5, v8, v11, v14, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v18, v3, v6, v9, v12, v15, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v19, v4, v7, v10, v13, v16, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v17.8b, v18.8b, v19.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v5, v8, v11, v14, v17, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v6, v9, v12, v15, v18, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v7, v10, v13, v16, v19, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v8, v11, v14, v17, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v6, v9, v12, v15, v18, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v7, v10, v13, v16, v19, v4, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x3 //write 16Byte : 7 line
+
+    mov v5.16b, v11.16b
+    mov v11.16b, v17.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v8.16b
+    mov v8.16b, v14.16b
+    mov v14.16b, v30.16b
+
+    mov v6.16b, v12.16b
+    mov v12.16b, v18.16b
+    mov v30.16b, v3.16b
+    mov v3.16b, v9.16b
+    mov v9.16b, v15.16b
+    mov v15.16b, v30.16b
+
+    mov v7.16b, v13.16b
+    mov v13.16b, v19.16b
+    mov v30.16b, v4.16b
+    mov v4.16b, v10.16b
+    mov v10.16b, v16.16b
+    mov v16.16b, v30.16b
+
+    sub x4, x4, #8
+    cbnz x4, w16_hv_mc_luma_loop
+
+    ldp d14, d15, [sp], #16
+    ldp d12, d13, [sp], #16
+    ldp d10, d11, [sp], #16
+    ldp d8, d9, [sp], #16
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer22WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22WidthEq8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v5=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v8=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v11=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v14=src[2*stride]
+
+w8_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x3 //write 8Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v3, v4, v5, v6, v7, v2, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x3 //write 8Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v4, v5, v6, v7, v2, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x3 //write 8Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v5, v6, v7, v2, v3, v4, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x3 //write 8Byte : 3 line
+
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v30.16b
+
+    sub x4, x4, #4
+    cbnz x4, w8_hv_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+//void McHorVer22WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);
+
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22WidthEq4_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[2*stride]
+
+w4_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21 1st line
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v16=src[4*stride]
+    // vertical filtered into v22/v23 2nd line
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v4, v5, v6, v7, v2, v22, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v3, v4, v5, v6, v7, v2, v23, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v24, v25, v26
+    UNPACK_2_16BITS_TO_ABC  v22, v23, v28, v29, v30
+    zip1 v24.2d, v24.2d, v28.2d
+    zip1 v25.2d, v25.2d, v29.2d
+    zip1 v26.2d, v26.2d, v30.2d
+    FILTER_3_IN_16BITS_TO_8BITS1 v24, v25, v26, v27 //output to v27[0]
+    st1 {v27.s}[0], [x2], x3 //write 4Byte : 0 line
+    st1 {v27.s}[1], [x2], x3 //write 4Byte : 1 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[5*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v4, v5, v6, v7, v2, v3, v21, v0, v1
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[6*stride]
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v6, v7, v2, v3, v4, v22, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v5, v6, v7, v2, v3, v4, v23, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v24, v25, v26
+    UNPACK_2_16BITS_TO_ABC  v22, v23, v28, v29, v30
+    zip1 v24.2d, v24.2d, v28.2d
+    zip1 v25.2d, v25.2d, v29.2d
+    zip1 v26.2d, v26.2d, v30.2d
+    FILTER_3_IN_16BITS_TO_8BITS1 v24, v25, v26, v27 //output to v27[0]
+    st1 {v27.s}[0], [x2], x3 //write 4Byte : 2 line
+    st1 {v27.s}[1], [x2], x3 //write 4Byte : 3 line
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v30.16b
+
+    sub x4, x4, #4
+    cbnz x4, w4_hv_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+//void McCopyWidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                   int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McCopyWidthEq16_AArch64_neon
+    //prfm pldl1strm, [x0]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w16_copy_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v0.16b}, [x0], x1  //read 16Byte : 0 line
+    st1 {v0.16b}, [x2], x3 //write 16Byte : 0 line
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v1.16b}, [x0], x1  //read 16Byte : 1 line
+    st1 {v1.16b}, [x2], x3 //write 16Byte : 1 line
+
+    sub x4, x4, #2
+    cbnz x4, w16_copy_loop
+WELS_ASM_AARCH64_FUNC_END
+//void McCopyWidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                  int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McCopyWidthEq8_AArch64_neon
+    //prfm pldl1strm, [x0]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w8_copy_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v0.8b}, [x0], x1  //read 16Byte : 0 line
+    st1 {v0.8b}, [x2], x3 //write 16Byte : 0 line
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v1.8b}, [x0], x1  //read 16Byte : 1 line
+    st1 {v1.8b}, [x2], x3 //write 16Byte : 1 line
+
+    sub x4, x4, #2
+    cbnz x4, w8_copy_loop
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN McCopyWidthEq4_AArch64_neon
+    //prfm pldl1strm, [x0]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+w4_copy_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v0.s}[0], [x0], x1  //read 16Byte : 0 line
+    st1 {v0.s}[0], [x2], x3 //write 16Byte : 0 line
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v1.s}[0], [x0], x1  //read 16Byte : 1 line
+    st1 {v1.s}[0], [x2], x3 //write 16Byte : 1 line
+
+    sub x4, x4, #2
+    cbnz x4, w4_copy_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void PixStrideAvgWidthEq16_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+//const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+
+WELS_ASM_AARCH64_FUNC_BEGIN PixStrideAvgWidthEq16_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    SIGN_EXTENSION x6,w6
+enc_w16_pix_avg_loop:
+    ld1 {v0.16b}, [x2], x3  //read 16Byte : src0: 0 line
+    ld1 {v1.16b}, [x4], x5  //read 16Byte : src1: 0 line
+    ld1 {v2.16b}, [x2], x3  //read 16Byte : src0: 1 line
+    ld1 {v3.16b}, [x4], x5  //read 16Byte : src1: 1 line
+    ld1 {v4.16b}, [x2], x3  //read 16Byte : src0: 2 line
+    ld1 {v5.16b}, [x4], x5  //read 16Byte : src1: 2 line
+    ld1 {v6.16b}, [x2], x3  //read 16Byte : src0: 3 line
+    ld1 {v7.16b}, [x4], x5  //read 16Byte : src1: 3 line
+    AVERAGE_TWO_8BITS1  v16, v0, v1
+    AVERAGE_TWO_8BITS2  v16, v0, v1
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 0 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v2, v3
+    AVERAGE_TWO_8BITS2  v16, v2, v3
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 1 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v4, v5
+    AVERAGE_TWO_8BITS2  v16, v4, v5
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 2 line
+
+    AVERAGE_TWO_8BITS1  v16, v6, v7
+    AVERAGE_TWO_8BITS2  v16, v6, v7
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 3 line
+
+    sub x6, x6, #4
+    cbnz x6, enc_w16_pix_avg_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void PixStrideAvgWidthEq8_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+//                                        const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN PixStrideAvgWidthEq8_AArch64_neon
+    //prfm pldl1strm, [x2]
+    //prfm pldl1strm, [x4]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    SIGN_EXTENSION x6,w6
+enc_w8_pix_avg_loop:
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v0.8b}, [x2], x3  //read 8Byte : src0: 0 line
+    ld1 {v1.8b}, [x4], x5  //read 8Byte : src1: 0 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v2.8b}, [x2], x3  //read 8Byte : src0: 1 line
+    ld1 {v3.8b}, [x4], x5  //read 8Byte : src1: 1 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v4.8b}, [x2], x3  //read 8Byte : src0: 2 line
+    ld1 {v5.8b}, [x4], x5  //read 8Byte : src1: 2 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v6.8b}, [x2], x3  //read 8Byte : src0: 3 line
+    ld1 {v7.8b}, [x4], x5  //read 8Byte : src1: 3 line
+    AVERAGE_TWO_8BITS1  v16, v0, v1
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 0 line
+
+    AVERAGE_TWO_8BITS1  v16, v2, v3
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 1 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v4, v5
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 2 line
+
+    AVERAGE_TWO_8BITS1  v16, v6, v7
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 3 line
+
+    sub x6, x6, #4
+    cbnz x6, enc_w8_pix_avg_loop
+WELS_ASM_AARCH64_FUNC_END
+//void PixelAvgWidthEq16_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+//                                     const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN PixelAvgWidthEq16_AArch64_neon
+    //prfm pldl1strm, [x2]
+    //prfm pldl1strm, [x4]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    SIGN_EXTENSION x6,w6
+w16_pix_avg_loop:
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v0.16b}, [x2], x3  //read 16Byte : src0: 0 line
+    ld1 {v1.16b}, [x4], x5  //read 16Byte : src1: 0 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v2.16b}, [x2], x3  //read 16Byte : src0: 1 line
+    ld1 {v3.16b}, [x4], x5  //read 16Byte : src1: 1 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v4.16b}, [x2], x3  //read 16Byte : src0: 2 line
+    ld1 {v5.16b}, [x4], x5  //read 16Byte : src1: 2 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v6.16b}, [x2], x3  //read 16Byte : src0: 3 line
+    ld1 {v7.16b}, [x4], x5  //read 16Byte : src1: 3 line
+    AVERAGE_TWO_8BITS1  v16, v0, v1
+    AVERAGE_TWO_8BITS2  v16, v0, v1
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 0 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v2, v3
+    AVERAGE_TWO_8BITS2  v16, v2, v3
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 1 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v4, v5
+    AVERAGE_TWO_8BITS2  v16, v4, v5
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 2 line
+
+    AVERAGE_TWO_8BITS1  v16, v6, v7
+    AVERAGE_TWO_8BITS2  v16, v6, v7
+    st1 {v16.16b}, [x0], x1 //write 16Byte : 3 line
+
+    sub x6, x6, #4
+    cbnz x6, w16_pix_avg_loop
+WELS_ASM_AARCH64_FUNC_END
+//void PixelAvgWidthEq8_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+//                                   const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN PixelAvgWidthEq8_AArch64_neon
+    //prfm pldl1strm, [x2]
+    //prfm pldl1strm, [x4]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    SIGN_EXTENSION x6,w6
+w8_pix_avg_loop:
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v0.8b}, [x2], x3  //read 8Byte : src0: 0 line
+    ld1 {v1.8b}, [x4], x5  //read 8Byte : src1: 0 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v2.8b}, [x2], x3  //read 8Byte : src0: 1 line
+    ld1 {v3.8b}, [x4], x5  //read 8Byte : src1: 1 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v4.8b}, [x2], x3  //read 8Byte : src0: 2 line
+    ld1 {v5.8b}, [x4], x5  //read 8Byte : src1: 2 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v6.8b}, [x2], x3  //read 8Byte : src0: 3 line
+    ld1 {v7.8b}, [x4], x5  //read 8Byte : src1: 3 line
+    AVERAGE_TWO_8BITS1  v16, v0, v1
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 0 line
+
+    AVERAGE_TWO_8BITS1  v16, v2, v3
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 1 line
+
+
+    AVERAGE_TWO_8BITS1  v16, v4, v5
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 2 line
+
+    AVERAGE_TWO_8BITS1  v16, v6, v7
+    st1 {v16.8b}, [x0], x1 //write 8Byte : 3 line
+
+    sub x6, x6, #4
+    cbnz x6, w8_pix_avg_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void PixelAvgWidthEq4_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+//                                    const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN PixelAvgWidthEq4_AArch64_neon
+    //prfm pldl1strm, [x2]
+    //prfm pldl1strm, [x4]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    SIGN_EXTENSION x6,w6
+w4_pix_avg_loop:
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v0.s}[0], [x2], x3  //read 4Byte : src0: 0 line
+    ld1 {v1.s}[0], [x4], x5  //read 4Byte : src1: 0 line
+    //prfm pldl1strm, [x2, x3]
+    //prfm pldl1strm, [x4, x5]
+    ld1 {v0.s}[1], [x2], x3  //read 4Byte : src0: 1 line
+    ld1 {v1.s}[1], [x4], x5  //read 4Byte : src1: 1 line
+    AVERAGE_TWO_8BITS1  v2, v0, v1
+    st1 {v2.s}[0], [x0], x1 //write 4Byte : 0 line
+    st1 {v2.s}[1], [x0], x1 //write 4Byte : 1 line
+
+    sub x6, x6, #2
+    cbnz x6, w4_pix_avg_loop
+WELS_ASM_AARCH64_FUNC_END
+//void McChromaWidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t* pWeights, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McChromaWidthEq8_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    ld4r {v28.8b, v29.8b, v30.8b, v31.8b}, [x4] //load A/B/C/D
+    ld1 {v16.16b}, [x0], x1  // src[x]
+    ext v17.16b, v16.16b, v16.16b, #1  // src[x+1]
+w8_mc_chroma_loop:
+    ld1 {v18.16b}, [x0], x1  // src[x+stride]
+    ext v19.16b, v18.16b, v18.16b, #1  // src[x+stride+1]
+
+    ld1 {v20.16b}, [x0], x1  // src[x+2*stride]
+    ext v21.16b, v20.16b, v20.16b, #1  // src[x+2*stride+1]
+
+    ld1 {v22.16b}, [x0], x1  // src[x+3*stride]
+    ext v23.16b, v22.16b, v22.16b, #1  // src[x+3*stride+1]
+
+    ld1 {v24.16b}, [x0], x1  // src[x+4*stride]
+    ext v25.16b, v24.16b, v24.16b, #1  // src[x+4*stride+1]
+
+    umull v0.8h, v16.8b, v28.8b
+    umull v2.8h, v18.8b, v28.8b
+    umull v4.8h, v20.8b, v28.8b
+    umull v6.8h, v22.8b, v28.8b
+
+    umlal v0.8h, v17.8b, v29.8b
+    umlal v2.8h, v19.8b, v29.8b
+    umlal v4.8h, v21.8b, v29.8b
+    umlal v6.8h, v23.8b, v29.8b
+
+    umlal v0.8h, v18.8b, v30.8b
+    umlal v2.8h, v20.8b, v30.8b
+    umlal v4.8h, v22.8b, v30.8b
+    umlal v6.8h, v24.8b, v30.8b
+
+    umlal v0.8h, v19.8b, v31.8b
+    umlal v2.8h, v21.8b, v31.8b
+    umlal v4.8h, v23.8b, v31.8b
+    umlal v6.8h, v25.8b, v31.8b
+
+    rshrn v1.8b, v0.8h, #6
+    st1 {v1.8b}, [x2], x3
+
+    rshrn v3.8b, v2.8h, #6
+    st1 {v3.8b}, [x2], x3
+
+    rshrn v5.8b, v4.8h, #6
+    st1 {v5.8b}, [x2], x3
+
+    rshrn v7.8b, v6.8h, #6
+    st1 {v7.8b}, [x2], x3
+
+    mov v16.16b, v24.16b
+    mov v17.16b, v25.16b
+    sub x5, x5, #4
+    cbnz x5, w8_mc_chroma_loop
+WELS_ASM_AARCH64_FUNC_END
+//void McChromaWidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t* pWeights, int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McChromaWidthEq4_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    ld4r {v4.8b, v5.8b, v6.8b, v7.8b}, [x4] //load A/B/C/D
+    ld1 {v0.8b}, [x0], x1  // src[x]
+    ext v1.8b, v0.8b, v0.8b, #1  // src[x+1]
+w4_mc_chroma_loop:
+    ld1 {v2.8b}, [x0], x1  // src[x+stride]
+    ext v3.8b, v2.8b, v2.8b, #1  // src[x+stride+1]
+    ld1 {v18.8b}, [x0], x1  // src[x+2*stride]
+    ext v19.8b, v18.8b, v18.8b, #1  // src[x+2*stride+1]
+
+    zip1 v0.4s, v0.4s, v2.4s
+    zip1 v1.4s, v1.4s, v3.4s
+    zip1 v2.4s, v2.4s, v18.4s
+    zip1 v3.4s, v3.4s, v19.4s
+
+    umull v16.8h, v0.8b, v4.8b
+    umlal v16.8h, v1.8b, v5.8b
+    umlal v16.8h, v2.8b, v6.8b
+    umlal v16.8h, v3.8b, v7.8b
+    rshrn v17.8b, v16.8h, #6
+    st1 {v17.s}[0], [x2], x3
+    st1 {v17.s}[1], [x2], x3
+
+    mov v0.8b, v18.8b
+    mov v1.8b, v19.8b
+    sub x5, x5, #2
+    cbnz x5, w4_mc_chroma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer20Width17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t iHeight);// width+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20Width17_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x3, x3, #16
+    mov x5, #16
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    ldr q22, filter_para
+w17_h_mc_luma_loop:
+    ld1 {v2.16b, v3.16b}, [x0], x1 //only use 22(17+5); v2=src[-2]
+
+    //prfm pldl1strm, [x0]
+    ext v5.16b, v2.16b, v3.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v3.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v3.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v3.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v3.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    st1 {v20.16b}, [x2], x5 //write 16Byte
+
+    ext v21.8b, v3.8b, v3.8b, #7 // [0][1][2][3][4][5]XY-->O[0][1][2][3][4][5]X
+    FILTER_SINGLE_TAG_8BITS v21, v22, v23, h21
+    st1 {v21.b}[0], [x2], x3 //write 16th Byte
+
+    sub x4, x4, #1
+    cbnz x4, w17_h_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer20Width9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t iHeight);// width+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20Width9_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x3, x3, #8
+    mov x5, #8
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    ldr q22, filter_para
+w9_h_mc_luma_loop:
+    ld1 {v2.16b}, [x0], x1 //only use 14(9+5); v2=src[-2]
+    mov v3.d[0], v2.d[1]
+    //prfm pldl1strm, [x0]
+    ext v5.16b, v2.16b, v4.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v4.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v4.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v4.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v4.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    st1 {v20.8b}, [x2], x5 //write 8Byte
+
+    ext v21.8b, v3.8b, v3.8b, #7 // [0][1][2][3][4][5]XY-->O[0][1][2][3][4][5]X
+    FILTER_SINGLE_TAG_8BITS v21, v22, v23, h21
+    st1 {v21.b}[0], [x2], x3 //write 9th Byte
+
+    sub x4, x4, #1
+    cbnz x4, w9_h_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer20Width5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t iHeight);// width+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer20Width5_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x3, x3, #4
+    mov x5, #4
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+w5_h_mc_luma_loop:
+    ld1 {v2.16b}, [x0], x1 //only use 10(5+5); v2=src[-2]
+
+    ext v5.16b, v2.16b, v4.16b, #1    //v5=src[-1]
+    ext v6.16b, v2.16b, v4.16b, #2    //v6=src[0]
+    ext v7.16b, v2.16b, v4.16b, #3    //v7=src[1]
+    ext v16.16b, v2.16b, v4.16b, #4   //v16=src[2]
+    ext v17.16b, v2.16b, v4.16b, #5   //v17=src[3]
+
+    FILTER_6TAG_8BITS1 v2, v5, v6, v7, v16, v17, v20, v0, v1
+    st1 {v20.s}[0], [x2], x5 //write 4Byte
+    st1 {v20.b}[4], [x2], x3 //write 5th Byte
+
+    sub x4, x4, #1
+    cbnz x4, w5_h_mc_luma_loop
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer22Width17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                     int32_t iHeight);
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22Width17_AArch64_neon
+    stp d8, d9, [sp,#-16]!
+    stp d10, d11, [sp,#-16]!
+    stp d12, d13, [sp,#-16]!
+    stp d14, d15, [sp,#-16]!
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x3, x3, #16
+    mov x5, #16
+    ldr q29, filter_para
+
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b, v6.8b, v7.8b}, [x0], x1 // v5=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v8.8b, v9.8b, v10.8b}, [x0], x1 // v8=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v11.8b, v12.8b, v13.8b}, [x0], x1 // v11=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v14.8b, v15.8b, v16.8b}, [x0], x1 // v14=src[2*stride]
+
+w17_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v17.8b, v18.8b, v19.8b}, [x0], x1 // v17=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v5, v8, v11, v14, v17, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v6, v9, v12, v15, v18, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v7, v10, v13, v16, v19, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15 Byte : 0 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[4*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v8, v11, v14, v17, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v6, v9, v12, v15, v18, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v7, v10, v13, v16, v19, v4, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 1 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b, v6.8b, v7.8b}, [x0], x1 // v2=src[5*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v8, v11, v14, v17, v2, v5, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v9, v12, v15, v18, v3, v6, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v10, v13, v16, v19, v4, v7, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 2 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v8.8b, v9.8b, v10.8b}, [x0], x1 // v2=src[6*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v11, v14, v17, v2, v5, v8, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v12, v15, v18, v3, v6, v9, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v13, v16, v19, v4, v7, v10, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 3 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 3 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v11.8b, v12.8b, v13.8b}, [x0], x1 // v2=src[7*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v14, v17, v2, v5, v8, v11, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v15, v18, v3, v6, v9, v12, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v16, v19, v4, v7, v10, v13, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 4 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 4 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v14.8b, v15.8b, v16.8b}, [x0], x1 // v2=src[8*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v17, v2, v5, v8, v11, v14, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v18, v3, v6, v9, v12, v15, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v19, v4, v7, v10, v13, v16, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 5 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v17.8b, v18.8b, v19.8b}, [x0], x1 // v2=src[9*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v5, v8, v11, v14, v17, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v6, v9, v12, v15, v18, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v7, v10, v13, v16, v19, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 6 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b, v3.8b, v4.8b}, [x0], x1 // v2=src[10*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v8, v11, v14, v17, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v6, v9, v12, v15, v18, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v7, v10, v13, v16, v19, v4, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15Byte : 7 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 7 line
+
+    mov v5.16b, v11.16b
+    mov v11.16b, v17.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v8.16b
+    mov v8.16b, v14.16b
+    mov v14.16b, v30.16b
+
+    mov v6.16b, v12.16b
+    mov v12.16b, v18.16b
+    mov v30.16b, v3.16b
+    mov v3.16b, v9.16b
+    mov v9.16b, v15.16b
+    mov v15.16b, v30.16b
+
+    mov v7.16b, v13.16b
+    mov v13.16b, v19.16b
+    mov v30.16b, v4.16b
+    mov v4.16b, v10.16b
+    mov v10.16b, v16.16b
+    mov v16.16b, v30.16b
+
+    sub x4, x4, #8
+    cbnz x4, w17_hv_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v17.8b, v18.8b, v19.8b}, [x0], x1 // v17=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v5, v8, v11, v14, v17, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v6, v9, v12, v15, v18, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    // vertical filtered into v21/v22
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v7, v10, v13, v16, v19, v22, v0, v1
+    UNPACK_2_16BITS_TO_ABC  v21, v22, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS2 v23, v24, v25, v26 //output to v26[1]
+    st1 {v26.16b}, [x2], x5 //write 0:15 Byte : 0 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v22, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 16th Byte : 0 line
+
+    ldp d14, d15, [sp], #16
+    ldp d12, d13, [sp], #16
+    ldp d10, d11, [sp], #16
+    ldp d8, d9, [sp], #16
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer22Width9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t iHeight);//width+1&&height+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22Width9_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x3, x3, #8
+    mov x5, #8
+    ldr q29, filter_para
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v5=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v8=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v11=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v14=src[2*stride]
+
+w9_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x5 //write 0:7Byte : 0 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v21, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 8th Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[4*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v3, v4, v5, v6, v7, v2, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x5 //write 0:7Byte : 1 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v21, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 8th Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[5*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v4, v5, v6, v7, v2, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x5 //write 0:7Byte : 2 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v21, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 8th Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[6*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v5, v6, v7, v2, v3, v4, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x5 //write 0:7Byte : 3 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v21, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 8th Byte : 3 line
+
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v30.16b
+
+    sub x4, x4, #4
+    cbnz x4, w9_hv_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.8b}, [x2], x5 //write 0:7Byte : 0 line
+    UNPACK_FILTER_SINGLE_TAG_16BITS v26, v21, v29, v27, v28, d26
+    st1 {v26.b}[0], [x2], x3 //write 8th Byte : 0 line
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer22Width5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                    int32_t iHeight);//width+1&&height+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer22Width5_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, #2
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x3, x3, #4
+    mov x5, #4
+    ldr q29, filter_para
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v5=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v8=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v11=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v14=src[2*stride]
+
+w5_hv_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.s}[0], [x2], x5 //write 0:3Byte : 0 line
+    st1 {v26.b}[4], [x2], x3 //write 5th Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[4*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v3, v4, v5, v6, v7, v2, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.s}[0], [x2], x5 //write 0:3Byte : 1 line
+    st1 {v26.b}[4], [x2], x3 //write 5th Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[5*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v4, v5, v6, v7, v2, v3, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.s}[0], [x2], x5 //write 0:3Byte : 2 line
+    st1 {v26.b}[4], [x2], x3 //write 5th Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[6*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v5, v6, v7, v2, v3, v4, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.s}[0], [x2], x5 //write 0:3Byte : 3 line
+    st1 {v26.b}[4], [x2], x3 //write 5th Byte : 3 line
+
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v30.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v30.16b
+
+    sub x4, x4, #4
+    cbnz x4, w5_hv_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    // vertical filtered into v20/v21
+    FILTER_6TAG_8BITS_TO_16BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS_TO_16BITS2 v2, v3, v4, v5, v6, v7, v21, v0, v1
+    // horizon filtered
+    UNPACK_2_16BITS_TO_ABC  v20, v21, v23, v24, v25
+    FILTER_3_IN_16BITS_TO_8BITS1 v23, v24, v25, v26 //output to v26[0]
+    st1 {v26.s}[0], [x2], x5 //write 0:3Byte : 0 line
+    st1 {v26.b}[4], [x2], x3 //write 5th Byte : 0 line
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer02Height17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                      int32_t iHeight);// height+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02Height17_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[2*stride]
+
+
+w17_v_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 0 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[4*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 1 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.16b}, [x0], x1 // v3=src[5*stride]
+    FILTER_6TAG_8BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    FILTER_6TAG_8BITS2 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 2 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.16b}, [x0], x1 // v4=src[6*stride]
+    FILTER_6TAG_8BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    FILTER_6TAG_8BITS2 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 3 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.16b}, [x0], x1 // v5=src[7*stride]
+    FILTER_6TAG_8BITS1 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    FILTER_6TAG_8BITS2 v6, v7, v2, v3, v4, v5, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 4 line
+
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.16b}, [x0], x1 // v6=src[8*stride]
+    FILTER_6TAG_8BITS1 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    FILTER_6TAG_8BITS2 v7, v2, v3, v4, v5, v6, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 5 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[9*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 6 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.16b}, [x0], x1 // v2=src[10*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    FILTER_6TAG_8BITS2 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : 7 line
+
+    mov v3.16b, v5.16b
+    mov v5.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v4.16b
+    mov v4.16b, v6.16b
+    mov v6.16b, v7.16b
+    sub x4, x4, #8
+    cbnz x4, w17_v_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.16b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    FILTER_6TAG_8BITS2 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.16b}, [x2], x3 //write 16Byte : last line
+WELS_ASM_AARCH64_FUNC_END
+//void McHorVer02Height9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                     int32_t iHeight);// height+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02Height9_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.8b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.8b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.8b}, [x0], x1 // v6=src[2*stride]
+
+w9_v_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.8b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.8b}, [x2], x3 //write 8Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b}, [x0], x1 // v2=src[4*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.8b}, [x2], x3 //write 8Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.8b}, [x0], x1 // v3=src[5*stride]
+    FILTER_6TAG_8BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.8b}, [x2], x3 //write 8Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.8b}, [x0], x1 // v4=src[6*stride]
+    FILTER_6TAG_8BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.8b}, [x2], x3 //write 8Byte : 3 line
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v7.16b
+    sub x4, x4, #4
+    cbnz x4, w9_v_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.8b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.8b}, [x2], x3 //write 8Byte : 0 line
+WELS_ASM_AARCH64_FUNC_END
+
+//void McHorVer02Height5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+//                                     int32_t iHeight);// height+1
+WELS_ASM_AARCH64_FUNC_BEGIN McHorVer02Height5_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x4,w4
+    sub x0, x0, x1, lsl #1
+    movi v0.8h, #20, lsl #0
+    movi v1.8h, #5, lsl #0
+    sub x4, x4, #1
+
+    //prfm pldl1strm, [x0]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b}, [x0], x1 // v2=src[-2*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.8b}, [x0], x1 // v3=src[-1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.8b}, [x0], x1 // v4=src[0*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v5.8b}, [x0], x1 // v5=src[1*stride]
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v6.8b}, [x0], x1 // v6=src[2*stride]
+
+w5_v_mc_luma_loop:
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.8b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 0 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v2.8b}, [x0], x1 // v2=src[4*stride]
+    FILTER_6TAG_8BITS1 v3, v4, v5, v6, v7, v2, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 1 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v3.8b}, [x0], x1 // v3=src[5*stride]
+    FILTER_6TAG_8BITS1 v4, v5, v6, v7, v2, v3, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 2 line
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v4.8b}, [x0], x1 // v4=src[6*stride]
+    FILTER_6TAG_8BITS1 v5, v6, v7, v2, v3, v4, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 3 line
+
+    mov v5.16b, v3.16b
+    mov v3.16b, v7.16b
+    mov v7.16b, v2.16b
+    mov v2.16b, v6.16b
+    mov v6.16b, v4.16b
+    mov v4.16b, v7.16b
+    sub x4, x4, #4
+    cbnz x4, w5_v_mc_luma_loop
+
+    //prfm pldl1strm, [x0, x1]
+    ld1 {v7.8b}, [x0], x1 // v7=src[3*stride]
+    FILTER_6TAG_8BITS1 v2, v3, v4, v5, v6, v7, v20, v0, v1
+    st1 {v20.s}[0], [x2], x3 //write 4Byte : 0 line
+
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/generate_version.sh b/third-party/openh264/third_party/openh264/src/codec/common/generate_version.sh
new file mode 100755
index 0000000000..8814b4610c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/generate_version.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+git rev-list HEAD | sort > config.git-hash
+SRC_PATH=$1
+LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
+if [ $LOCALVER \> 1 ] ; then
+    VER="$(git rev-list HEAD -n 1 | cut -c 1-7)"
+    if git status | grep -q "modified:" ; then
+        VER="${VER}+M"
+    fi
+    GIT_VERSION=$VER
+else
+    GIT_VERSION=
+    VER="x"
+fi
+GIT_VERSION='"'$GIT_VERSION'"'
+rm -f config.git-hash
+
+mkdir -p codec/common/inc
+cat $SRC_PATH/codec/common/inc/version_gen.h.template | sed "s/\$FULL_VERSION/$GIT_VERSION/g" > codec/common/inc/version_gen.h.new
+if cmp codec/common/inc/version_gen.h.new codec/common/inc/version_gen.h > /dev/null 2>&1; then
+    # Identical to old version, don't touch it (to avoid unnecessary rebuilds)
+    rm codec/common/inc/version_gen.h.new
+    echo "Keeping existing codec/common/inc/version_gen.h"
+    exit 0
+fi
+mv codec/common/inc/version_gen.h.new codec/common/inc/version_gen.h
+
+echo "Generated codec/common/inc/version_gen.h"
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/.gitignore b/third-party/openh264/third_party/openh264/src/codec/common/inc/.gitignore
new file mode 100644
index 0000000000..0af7d9845d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/.gitignore
@@ -0,0 +1 @@
+version_gen.h
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsList.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsList.h
new file mode 100644
index 0000000000..c909be5e1e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsList.h
@@ -0,0 +1,287 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsList
+ *
+ * \brief   for the list function needed in ThreadPool
+ *
+ * \date    9/27/2015 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifndef _WELS_LIST_H_
+#define _WELS_LIST_H_
+
+#include "typedefs.h"
+#include <stdlib.h>
+
+namespace WelsCommon {
+
+template<typename TNodeType>
+struct SNode {
+  TNodeType* pPointer;
+  SNode* pPrevNode;
+  SNode* pNextNode;
+};
+
+template<typename TNodeType>
+class CWelsList {
+ public:
+  CWelsList() {
+    m_iCurrentNodeCount = 0;
+    m_iMaxNodeCount = 50;
+
+    m_pCurrentList = NULL;
+    m_pFirst = NULL;
+    m_pCurrent = NULL;
+    m_pLast = NULL;
+  };
+  ~CWelsList() {
+    if (m_pCurrentList) {
+      free (m_pCurrentList);
+      m_pCurrentList = NULL;
+    }
+
+    m_pCurrentList = NULL;
+    m_pFirst = NULL;
+    m_pCurrent = NULL;
+    m_pLast = NULL;
+  };
+
+  int32_t size() {
+    return m_iCurrentNodeCount;
+  }
+
+  bool push_back (TNodeType* pNode) {
+    if (!pNode) {
+      return false;
+    }
+
+    if (NULL == m_pCurrentList) {
+      m_pCurrentList = static_cast<SNode<TNodeType>*> (malloc (m_iMaxNodeCount * sizeof (SNode<TNodeType>)));
+      if (NULL == m_pCurrentList) {
+        return false;
+      } else {
+        ResetStorage();
+      }
+    }
+
+    if (NULL == m_pCurrent) {
+      if (!ExpandList()) {
+        return false;
+      }
+    }
+
+    m_pCurrent->pPointer = pNode;
+    m_pCurrent = m_pCurrent->pNextNode;
+    m_iCurrentNodeCount++;
+
+    return true;
+  }
+
+  TNodeType* begin() {
+    if (m_pFirst) {
+      return m_pFirst->pPointer;
+    }
+    return NULL;
+  }
+
+  void pop_front() {
+    if (m_iCurrentNodeCount == 0) {
+      return;
+    }
+
+    SNode<TNodeType>* pTemp = m_pFirst;
+
+    m_pFirst = m_pFirst->pNextNode;
+    m_pFirst->pPrevNode = NULL;
+
+    CleanOneNode (pTemp);
+
+    m_pLast->pNextNode = pTemp;
+    pTemp->pPrevNode = m_pLast;
+    m_pLast = pTemp;
+
+    if (NULL == m_pCurrent)
+      m_pCurrent = m_pLast;
+
+    m_iCurrentNodeCount --;
+  }
+
+  bool erase (TNodeType* pNode) {
+    if (0 == m_iCurrentNodeCount) {
+      return false;
+    }
+
+    SNode<TNodeType>* pTemp = m_pFirst;
+    do {
+      if (pNode == pTemp->pPointer) {
+        if (pTemp->pPrevNode) {
+          pTemp->pPrevNode->pNextNode = pTemp->pNextNode;
+        } else {
+          m_pFirst = pTemp->pNextNode;
+        }
+
+        if (pTemp->pNextNode) {
+          pTemp->pNextNode->pPrevNode = pTemp->pPrevNode;
+        }
+
+        CleanOneNode (pTemp);
+        m_iCurrentNodeCount --;
+
+        m_pLast->pNextNode = pTemp;
+        pTemp->pPrevNode = m_pLast;
+        m_pLast = pTemp;
+
+        return true;
+      }
+
+      pTemp = pTemp->pNextNode;
+
+    } while (pTemp && pTemp->pPointer);
+    return false;
+  }
+
+  bool findNode (TNodeType* pNodeTarget) {
+    if ((m_iCurrentNodeCount > 0) && pNodeTarget) {
+      SNode<TNodeType>* pNode = m_pFirst;
+      while (pNode) {
+        if (pNode->pPointer == pNodeTarget) {
+          return true;
+        }
+        pNode = pNode->pNextNode;
+      }
+    }
+    return false;
+  }
+
+  TNodeType* getNode (int iNodeIdx) {
+    if ((iNodeIdx > m_iCurrentNodeCount - 1) || (0 == m_iCurrentNodeCount)) {
+      return NULL;
+    }
+    SNode<TNodeType>* pNode = m_pFirst;
+    for (int i = 0; i < iNodeIdx; i++) {
+      if (pNode->pNextNode) {
+        pNode = pNode->pNextNode;
+      } else {
+        return NULL;
+      }
+    }
+    return pNode->pPointer;
+  }
+
+ private:
+  bool ExpandList() {
+    SNode<TNodeType>* tmpCurrentList = static_cast<SNode<TNodeType>*> (malloc (m_iMaxNodeCount * 2 * sizeof (
+                                         SNode<TNodeType>)));
+    if (tmpCurrentList == NULL) {
+      return false;
+    }
+    InitStorage (tmpCurrentList, (m_iMaxNodeCount * 2) - 1);
+
+    SNode<TNodeType>* pTemp = m_pFirst;
+    for (int i = 0; ((i < m_iMaxNodeCount) && pTemp); i++) {
+      tmpCurrentList[i].pPointer = pTemp->pPointer;
+      pTemp = pTemp->pNextNode;
+    }
+
+    free (m_pCurrentList);
+    m_pCurrentList = tmpCurrentList;
+    m_iCurrentNodeCount = m_iMaxNodeCount;
+    m_iMaxNodeCount = m_iMaxNodeCount * 2;
+    m_pFirst = & (m_pCurrentList[0]);
+    m_pLast = & (m_pCurrentList[m_iMaxNodeCount - 1]);
+    m_pCurrent = & (m_pCurrentList[m_iCurrentNodeCount]);
+    return true;
+  }
+
+  void InitStorage (SNode<TNodeType>* pList, const int32_t iMaxIndex) {
+    pList[0].pPrevNode = NULL;
+    pList[0].pPointer = NULL;
+    pList[0].pNextNode = & (pList[1]);
+    for (int i = 1; i < iMaxIndex; i++) {
+      pList[i].pPrevNode = & (pList[i - 1]);
+      pList[i].pPointer = NULL;
+      pList[i].pNextNode = & (pList[i + 1]);
+    }
+    pList[iMaxIndex].pPrevNode = & (pList[iMaxIndex - 1]);
+    pList[iMaxIndex].pPointer = NULL;
+    pList[iMaxIndex].pNextNode = NULL;
+  }
+
+
+  void CleanOneNode (SNode<TNodeType>* pSNode) {
+    pSNode->pPointer = NULL;
+    pSNode->pPrevNode = NULL;
+    pSNode->pNextNode = NULL;
+  }
+
+  void ResetStorage() {
+    InitStorage (m_pCurrentList, m_iMaxNodeCount - 1);
+    m_pCurrent = m_pCurrentList;
+    m_pFirst = & (m_pCurrentList[0]);
+    m_pLast = & (m_pCurrentList[m_iMaxNodeCount - 1]);
+  }
+
+ private:
+  int32_t m_iCurrentNodeCount;
+  int32_t m_iMaxNodeCount;
+  SNode<TNodeType>* m_pCurrentList;
+  SNode<TNodeType>* m_pFirst;
+  SNode<TNodeType>* m_pLast;
+  SNode<TNodeType>* m_pCurrent;
+};
+
+template<typename TNodeType>
+class CWelsNonDuplicatedList : public CWelsList<TNodeType> {
+ public:
+  bool push_back (TNodeType* pNode) {
+    if (0 != this->size()) {
+      if ((NULL != pNode) && (this->findNode (pNode))) {      //not checking NULL for easier testing
+        return false;
+      }
+    }
+
+    return CWelsList<TNodeType>::push_back (pNode);
+  }
+
+};
+
+
+}
+
+
+#endif
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsLock.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsLock.h
new file mode 100644
index 0000000000..ec5190f1e5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsLock.h
@@ -0,0 +1,97 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsLock.h
+ *
+ * \brief   class wrapping for locks
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef _WELS_LOCK_H_
+#define _WELS_LOCK_H_
+
+#include "macros.h"
+#include "typedefs.h"
+#include "WelsThreadLib.h"
+
+namespace WelsCommon {
+
+class CWelsLock {
+  DISALLOW_COPY_AND_ASSIGN (CWelsLock);
+ public:
+  CWelsLock() {
+    WelsMutexInit (&m_cMutex);
+  }
+
+  virtual ~CWelsLock() {
+    WelsMutexDestroy (&m_cMutex);
+  }
+
+  WELS_THREAD_ERROR_CODE  Lock() {
+    return WelsMutexLock (&m_cMutex);
+  }
+
+  WELS_THREAD_ERROR_CODE Unlock() {
+    return WelsMutexUnlock (&m_cMutex);
+  }
+
+ private:
+  WELS_MUTEX   m_cMutex;
+};
+
+class CWelsAutoLock {
+  DISALLOW_COPY_AND_ASSIGN (CWelsAutoLock);
+ public:
+  CWelsAutoLock (CWelsLock& cLock) : m_cLock (cLock) {
+    m_cLock.Lock();
+  }
+
+  virtual ~CWelsAutoLock() {
+    m_cLock.Unlock();
+  }
+
+ private:
+  CWelsLock&    m_cLock;
+};
+
+}
+
+#endif
+
+
+
+
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTask.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTask.h
new file mode 100644
index 0000000000..9501c9db6e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTask.h
@@ -0,0 +1,75 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsTask.h
+ *
+ * \brief   Interfaces introduced in thread pool
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef _WELS_TASK_H_
+#define _WELS_TASK_H_
+
+#include "codec_def.h"
+
+namespace WelsCommon {
+
+class IWelsTaskSink {
+ public:
+  virtual int OnTaskExecuted() = 0;
+  virtual int OnTaskCancelled() = 0;
+};
+
+class IWelsTask {
+ public:
+  IWelsTask (IWelsTaskSink* pSink) {
+    m_pSink = pSink;
+  };
+  virtual ~IWelsTask() { }
+
+  virtual int Execute() = 0;
+
+  IWelsTaskSink* GetSink() {
+    return m_pSink;
+  };
+
+ protected:
+  IWelsTaskSink*   m_pSink;
+};
+
+}
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTaskThread.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTaskThread.h
new file mode 100644
index 0000000000..24f399e4ac
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsTaskThread.h
@@ -0,0 +1,83 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsTaskThread.h
+ *
+ * \brief   connecting task and thread
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifndef _WELS_TASK_THREAD_H_
+#define _WELS_TASK_THREAD_H_
+
+
+#include "WelsTask.h"
+#include "WelsThread.h"
+
+namespace WelsCommon {
+
+class CWelsTaskThread;
+
+class IWelsTaskThreadSink {
+ public:
+  virtual WELS_THREAD_ERROR_CODE OnTaskStart (CWelsTaskThread* pThread, IWelsTask* pTask) = 0;
+  virtual WELS_THREAD_ERROR_CODE OnTaskStop (CWelsTaskThread* pThread, IWelsTask* pTask) = 0;
+};
+
+class CWelsTaskThread : public CWelsThread {
+ public:
+  CWelsTaskThread (IWelsTaskThreadSink* pSink);
+  virtual ~CWelsTaskThread();
+
+  WELS_THREAD_ERROR_CODE  SetTask (IWelsTask* pTask);
+  virtual void ExecuteTask();
+
+  uintptr_t    GetID() const {
+    return m_uiID;
+  }
+
+ private:
+  CWelsLock   m_cLockTask;
+  IWelsTaskThreadSink*   m_pSink;
+  IWelsTask*    m_pTask;
+  uintptr_t    m_uiID;
+
+  DISALLOW_COPY_AND_ASSIGN (CWelsTaskThread);
+};
+
+}
+
+#endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThread.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThread.h
new file mode 100644
index 0000000000..c8b6b1c662
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThread.h
@@ -0,0 +1,106 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThread.h
+ *
+ * \brief   Interfaces introduced in threads
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifndef _WELS_THREAD_H_
+#define _WELS_THREAD_H_
+
+
+#include "macros.h"
+#include "WelsLock.h"
+#include "WelsThreadLib.h"
+
+namespace WelsCommon {
+
+class CWelsThread {
+ public:
+  CWelsThread();
+  virtual ~CWelsThread();
+
+  virtual void Thread();
+  virtual void ExecuteTask() = 0;
+  virtual WELS_THREAD_ERROR_CODE Start();
+  virtual void Kill();
+  WELS_MUTEX          m_hMutex;
+ protected:
+  static WELS_THREAD_ROUTINE_TYPE  TheThread (void* pParam);
+
+  void SetRunning (bool bRunning) {
+    CWelsAutoLock  cLock (m_cLockStatus);
+
+    m_bRunning = bRunning;
+  }
+  void SetEndFlag (bool bEndFlag) {
+    CWelsAutoLock  cLock (m_cLockStatus);
+
+    m_bEndFlag = bEndFlag;
+  }
+
+  bool GetRunning() const {
+    return m_bRunning;
+  }
+
+  bool GetEndFlag() const {
+    return m_bEndFlag;
+  }
+
+  void SignalThread() {
+    WelsEventSignal (&m_hEvent, &m_hMutex, &m_iConVar);
+  }
+
+ private:
+  WELS_THREAD_HANDLE  m_hThread;
+  WELS_EVENT          m_hEvent;
+  CWelsLock           m_cLockStatus;
+  bool                m_bRunning;
+  bool                m_bEndFlag;
+  int                 m_iConVar;
+
+  DISALLOW_COPY_AND_ASSIGN (CWelsThread);
+};
+
+
+}
+
+
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadLib.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadLib.h
new file mode 100644
index 0000000000..cd26dbdd91
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadLib.h
@@ -0,0 +1,151 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThreadLib.h
+ *
+ * \brief   Interfaces introduced in thread programming
+ *
+ * \date    11/17/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef   _WELS_THREAD_API_H_
+#define   _WELS_THREAD_API_H_
+
+#include "typedefs.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+
+#include <windows.h>
+
+typedef    HANDLE                    WELS_THREAD_HANDLE;
+typedef    LPTHREAD_START_ROUTINE    LPWELS_THREAD_ROUTINE;
+
+typedef    CRITICAL_SECTION          WELS_MUTEX;
+typedef    HANDLE                    WELS_EVENT;
+
+#define    WELS_THREAD_ROUTINE_TYPE         DWORD  WINAPI
+#define    WELS_THREAD_ROUTINE_RETURN(rc)   return (DWORD)rc;
+
+#ifdef WINAPI_FAMILY
+#if !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#define WP80
+
+#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)
+#define GetSystemInfo(x) GetNativeSystemInfo(x)
+#define CreateEvent(attr, reset, init, name) CreateEventEx(attr, name, ((reset) ? CREATE_EVENT_MANUAL_RESET : 0) | ((init) ? CREATE_EVENT_INITIAL_SET : 0), EVENT_ALL_ACCESS)
+#define CreateSemaphore(a, b, c, d) CreateSemaphoreEx(a, b, c, d, 0, SEMAPHORE_ALL_ACCESS)
+#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)
+#define WaitForMultipleObjects(a, b, c, d) WaitForMultipleObjectsEx(a, b, c, d, FALSE)
+#endif
+#endif
+
+#else // NON-WINDOWS
+
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <pthread.h>
+#include <semaphore.h>
+#include <signal.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>
+
+#include <sys/stat.h>
+#include <fcntl.h>
+
+typedef   pthread_t    WELS_THREAD_HANDLE;
+typedef  void* (*LPWELS_THREAD_ROUTINE) (void*);
+
+typedef   pthread_mutex_t           WELS_MUTEX;
+
+#ifdef __APPLE__
+typedef   pthread_cond_t            WELS_EVENT;
+#else
+typedef   sem_t*                    WELS_EVENT;
+#endif
+
+#define   WELS_THREAD_ROUTINE_TYPE         void *
+#define   WELS_THREAD_ROUTINE_RETURN(rc)   return (void*)(intptr_t)rc;
+
+#endif//_WIN32
+
+typedef    int32_t        WELS_THREAD_ERROR_CODE;
+typedef    int32_t        WELS_THREAD_ATTR;
+
+typedef  struct _WelsLogicalProcessorInfo {
+  int32_t    ProcessorCount;
+} WelsLogicalProcessInfo;
+
+#define    WELS_THREAD_ERROR_OK                                 0
+#define    WELS_THREAD_ERROR_GENERAL                    ((uint32_t)(-1))
+#define    WELS_THREAD_ERROR_WAIT_OBJECT_0              0
+#define    WELS_THREAD_ERROR_WAIT_TIMEOUT               ((uint32_t)0x00000102L)
+#define    WELS_THREAD_ERROR_WAIT_FAILED                WELS_THREAD_ERROR_GENERAL
+
+WELS_THREAD_ERROR_CODE    WelsMutexInit (WELS_MUTEX*    mutex);
+WELS_THREAD_ERROR_CODE    WelsMutexLock (WELS_MUTEX*    mutex);
+WELS_THREAD_ERROR_CODE    WelsMutexUnlock (WELS_MUTEX* mutex);
+WELS_THREAD_ERROR_CODE    WelsMutexDestroy (WELS_MUTEX* mutex);
+
+WELS_THREAD_ERROR_CODE    WelsEventOpen (WELS_EVENT* p_event, const char* event_name = NULL);
+WELS_THREAD_ERROR_CODE    WelsEventClose (WELS_EVENT* event, const char* event_name = NULL);
+
+WELS_THREAD_ERROR_CODE    WelsEventSignal (WELS_EVENT* event,WELS_MUTEX *pMutex, int* iCondition);
+WELS_THREAD_ERROR_CODE    WelsEventWait (WELS_EVENT* event,WELS_MUTEX *pMutex, int& iCondition);
+WELS_THREAD_ERROR_CODE    WelsEventWaitWithTimeOut (WELS_EVENT* event, uint32_t dwMilliseconds,WELS_MUTEX *pMutex = NULL);
+WELS_THREAD_ERROR_CODE    WelsMultipleEventsWaitSingleBlocking (uint32_t nCount, WELS_EVENT* event_list,
+    WELS_EVENT* master_event = NULL,WELS_MUTEX *pMutex = NULL);
+
+WELS_THREAD_ERROR_CODE    WelsThreadCreate (WELS_THREAD_HANDLE* thread,  LPWELS_THREAD_ROUTINE  routine,
+    void* arg, WELS_THREAD_ATTR attr);
+
+WELS_THREAD_ERROR_CODE    WelsThreadSetName (const char* thread_name);
+
+WELS_THREAD_ERROR_CODE    WelsThreadJoin (WELS_THREAD_HANDLE  thread);
+
+WELS_THREAD_HANDLE        WelsThreadSelf();
+
+WELS_THREAD_ERROR_CODE    WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* pInfo);
+
+void WelsSleep (uint32_t dwMilliSecond);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadPool.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadPool.h
new file mode 100644
index 0000000000..a24309aa09
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/WelsThreadPool.h
@@ -0,0 +1,124 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThreadPool.h
+ *
+ * \brief   Interfaces introduced in thread pool
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifndef _WELS_THREAD_POOL_H_
+#define _WELS_THREAD_POOL_H_
+
+#include <stdio.h>
+#include "WelsTask.h"
+#include "WelsTaskThread.h"
+#include "WelsList.h"
+
+namespace WelsCommon {
+
+
+class  CWelsThreadPool : public CWelsThread, public IWelsTaskThreadSink {
+ public:
+  enum {
+    DEFAULT_THREAD_NUM = 4,
+  };
+
+  static WELS_THREAD_ERROR_CODE SetThreadNum (int32_t iMaxThreadNum);
+
+  static CWelsThreadPool* AddReference();
+  void RemoveInstance();
+
+  static bool IsReferenced();
+
+  //IWelsTaskThreadSink
+  virtual WELS_THREAD_ERROR_CODE OnTaskStart (CWelsTaskThread* pThread,  IWelsTask* pTask);
+  virtual WELS_THREAD_ERROR_CODE OnTaskStop (CWelsTaskThread* pThread,  IWelsTask* pTask);
+
+  //  CWelsThread
+  virtual void ExecuteTask();
+
+  WELS_THREAD_ERROR_CODE  QueueTask (IWelsTask* pTask);
+  int32_t        GetThreadNum() const {
+    return m_iMaxThreadNum;
+  }
+
+
+ protected:
+  WELS_THREAD_ERROR_CODE Init();
+  WELS_THREAD_ERROR_CODE Uninit();
+
+  WELS_THREAD_ERROR_CODE CreateIdleThread();
+  void           DestroyThread (CWelsTaskThread* pThread);
+  WELS_THREAD_ERROR_CODE AddThreadToIdleQueue (CWelsTaskThread* pThread);
+  WELS_THREAD_ERROR_CODE AddThreadToBusyList (CWelsTaskThread* pThread);
+  WELS_THREAD_ERROR_CODE RemoveThreadFromBusyList (CWelsTaskThread* pThread);
+  bool           AddTaskToWaitedList (IWelsTask* pTask);
+  CWelsTaskThread*   GetIdleThread();
+  IWelsTask*         GetWaitedTask();
+  int32_t            GetIdleThreadNum();
+  int32_t            GetBusyThreadNum();
+  int32_t            GetWaitedTaskNum();
+  void               ClearWaitedTasks();
+
+ private:
+  CWelsThreadPool();
+  virtual ~CWelsThreadPool();
+  
+  WELS_THREAD_ERROR_CODE StopAllRunning();
+
+  static int32_t   m_iRefCount;
+  static int32_t   m_iMaxThreadNum;
+  static CWelsThreadPool* m_pThreadPoolSelf;
+
+  CWelsNonDuplicatedList<IWelsTask>* m_cWaitedTasks;
+  CWelsNonDuplicatedList<CWelsTaskThread>* m_cIdleThreads;
+  CWelsList<CWelsTaskThread>* m_cBusyThreads;
+
+  CWelsLock   m_cLockPool;
+  CWelsLock   m_cLockWaitedTasks;
+  CWelsLock   m_cLockIdleTasks;
+  CWelsLock   m_cLockBusyTasks;
+
+  DISALLOW_COPY_AND_ASSIGN (CWelsThreadPool);
+};
+
+}
+
+
+#endif
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/asmdefs_mmi.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/asmdefs_mmi.h
new file mode 100644
index 0000000000..69a7ae3981
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/asmdefs_mmi.h
@@ -0,0 +1,340 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Loongson Technology Co.,Ltd.
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef ASMDEFS_MMI_H_
+#define ASMDEFS_MMI_H_
+
+#define CACHE_LINE_SIZE 32
+
+#if defined(_ABI64) && _MIPS_SIM == _ABI64
+# define mips_reg       int64_t
+# define PTRSIZE        " 8 "
+# define PTRLOG         " 3 "
+# define PTR_ADDU       "daddu "
+# define PTR_ADDIU      "daddiu "
+# define PTR_ADDI       "daddi "
+# define PTR_SUBU       "dsubu "
+# define PTR_L          "ld "
+# define PTR_S          "sd "
+# define PTR_SRA        "dsra "
+# define PTR_SRL        "dsrl "
+# define PTR_SLL        "dsll "
+#else
+# define mips_reg       int32_t
+# define PTRSIZE        " 4 "
+# define PTRLOG         " 2 "
+# define PTR_ADDU       "addu "
+# define PTR_ADDIU      "addiu "
+# define PTR_ADDI       "addi "
+# define PTR_SUBU       "subu "
+# define PTR_L          "lw "
+# define PTR_S          "sw "
+# define PTR_SRA        "sra "
+# define PTR_SRL        "srl "
+# define PTR_SLL        "sll "
+#endif
+
+#define MMI_XSawp_BH(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f2"                \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f4"         \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f4"         \n\t" \
+  "punpckhbh  "#f10", "#f8", "#f6"        \n\t" \
+  "punpcklbh  "#f8", "#f8", "#f6"         \n\t"
+
+#define MMI_XSawp_HW(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f2"                \n\t" \
+  "punpckhhw  "#f2", "#f0", "#f4"         \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f4"         \n\t" \
+  "punpckhhw  "#f10", "#f8", "#f6"        \n\t" \
+  "punpcklhw  "#f8", "#f8", "#f6"         \n\t"
+
+#define MMI_XSawp_WD(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f2"                \n\t" \
+  "punpckhwd  "#f2", "#f0", "#f4"         \n\t" \
+  "punpcklwd  "#f0", "#f0", "#f4"         \n\t" \
+  "punpckhwd  "#f10", "#f8", "#f6"        \n\t" \
+  "punpcklwd  "#f8", "#f8", "#f6"         \n\t"
+
+#define MMI_XSawp_DQ(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f2"                \n\t" \
+  "mov.d      "#f2", "#f4"                \n\t" \
+  "mov.d      "#f10", "#f6"               \n\t"
+
+#define WELS_AbsH(f0, f2, f4, f6, f8, f10) \
+  "xor        "#f8", "#f8", "#f8"         \n\t" \
+  "psubh      "#f10", "#f8", "#f6"        \n\t" \
+  "psubh      "#f8", "#f8", "#f4"         \n\t" \
+  "pmaxsh     "#f0", "#f4", "#f8"         \n\t" \
+  "pmaxsh     "#f2", "#f6", "#f10"        \n\t"
+
+#define MMI_SumSub(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f4"                    \n\t" \
+  "mov.d      "#f10", "#f6"                   \n\t" \
+  "paddh      "#f4", "#f4", "#f0"             \n\t" \
+  "paddh      "#f6", "#f6", "#f2"             \n\t" \
+  "psubh      "#f0", "#f0", "#f8"             \n\t" \
+  "psubh      "#f2", "#f2", "#f10"            \n\t"
+
+#define MMI_LoadDiff8P(f0, f2, f4, f6, f8, r0, r1) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldlc1    "#f4", 0x7("#r1")               \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gsldrc1    "#f4", 0x0("#r1")               \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f8"             \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f8"             \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f8"             \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f8"             \n\t" \
+  "psubh      "#f0", "#f0", "#f4"             \n\t" \
+  "psubh      "#f2", "#f2", "#f6"             \n\t"
+
+#define MMI_TransTwo4x4H(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18) \
+  MMI_XSawp_HW(f0, f2, f4, f6, f16, f18)  \
+  MMI_XSawp_HW(f8, f10, f12, f14, f4, f6) \
+  MMI_XSawp_WD(f0, f2, f8, f10, f12, f14) \
+  MMI_XSawp_WD(f16, f18, f4, f6, f8, f10) \
+  MMI_XSawp_DQ(f0, f2, f16, f18, f4, f6)  \
+  MMI_XSawp_DQ(f12, f14, f8, f10, f16, f18)
+
+#define MMI_TransTwo8x8B(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, f20, f22, f24, f26, f28, f30, r0, r1) \
+  "dmfc1      "#r0", "#f28"                   \n\t" \
+  "dmfc1      "#r1", "#f30"                   \n\t" \
+  MMI_XSawp_BH(f0, f2, f4, f6, f28, f30)            \
+  MMI_XSawp_BH(f8, f10, f12, f14, f4, f6)           \
+  MMI_XSawp_BH(f16, f18, f20, f22, f12, f14)        \
+  "dmtc1      "#r0", "#f20"                   \n\t" \
+  "dmtc1      "#r1", "#f22"                   \n\t" \
+  "dmfc1      "#r0", "#f12"                   \n\t" \
+  "dmfc1      "#r1", "#f14"                   \n\t" \
+  MMI_XSawp_BH(f24, f26, f20, f22, f12, f14)        \
+  MMI_XSawp_HW(f0, f2, f8, f10, f20, f22)           \
+  MMI_XSawp_HW(f28, f30, f4, f6, f8, f10)           \
+  MMI_XSawp_HW(f16, f18, f24, f26, f4, f6)          \
+  "dmtc1      "#r0", "#f24"                   \n\t" \
+  "dmtc1      "#r1", "#f26"                   \n\t" \
+  "dmfc1      "#r0", "#f8"                    \n\t" \
+  "dmfc1      "#r1", "#f10"                   \n\t" \
+  MMI_XSawp_HW(f24, f26, f12, f14, f8, f10)         \
+  MMI_XSawp_WD(f0, f2, f16, f18, f12, f14)          \
+  MMI_XSawp_WD(f20, f22, f4, f6, f16, f18)          \
+  MMI_XSawp_WD(f28, f30, f24, f26, f4, f6)          \
+  "dmtc1      "#r0", "#f24"                   \n\t" \
+  "dmtc1      "#r1", "#f26"                   \n\t" \
+  "dmfc1      "#r0", "#f16"                   \n\t" \
+  "dmfc1      "#r1", "#f18"                   \n\t" \
+  MMI_XSawp_WD(f24, f26, f8, f10, f16, f18)         \
+  MMI_XSawp_DQ(f0, f2, f28, f30, f8, f10)           \
+  MMI_XSawp_DQ(f12, f14, f4, f6, f28, f30)          \
+  MMI_XSawp_DQ(f20, f22, f24, f26, f4, f6)          \
+  "dmtc1      "#r0", "#f24"                   \n\t" \
+  "dmtc1      "#r1", "#f26"                   \n\t" \
+  "dmfc1      "#r0", "#f0"                    \n\t" \
+  "dmfc1      "#r1", "#f2"                    \n\t" \
+  MMI_XSawp_DQ(f24, f26, f16, f18, f0, f2)          \
+  "dmtc1      "#r0", "#f16"                   \n\t" \
+  "dmtc1      "#r1", "#f18"                   \n\t"
+
+#define MMI_XSwap_HW_SINGLE(f0, f2, f4) \
+  "punpckhhw  "#f4", "#f0", "#f2"             \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f2"             \n\t"
+
+#define MMI_XSwap_WD_SINGLE(f0, f2, f4) \
+  "punpckhwd  "#f4", "#f0", "#f2"             \n\t" \
+  "punpcklwd  "#f0", "#f0", "#f2"             \n\t"
+
+#define MMI_Trans4x4H_SINGLE(f0, f2, f4, f6, f8) \
+  MMI_XSwap_HW_SINGLE(f0, f2, f8)              \
+  MMI_XSwap_HW_SINGLE(f4, f6, f2)              \
+  MMI_XSwap_WD_SINGLE(f0, f4, f6)              \
+  MMI_XSwap_WD_SINGLE(f8, f2, f4)
+
+#define MMI_SumSub_SINGLE(f0, f2, f4) \
+  "mov.d      "#f4", "#f2"                    \n\t" \
+  "psubh      "#f2", "#f2", "#f0"             \n\t" \
+  "paddh      "#f0", "#f0", "#f4"             \n\t"
+
+#define MMI_SumSubMul2_SINGLE(f0, f2, f4, f6) \
+  "mov.d      "#f4", "#f0"                    \n\t" \
+  "psllh      "#f0", "#f0", "#f6"             \n\t" \
+  "paddh      "#f0", "#f0", "#f2"             \n\t" \
+  "psllh      "#f2", "#f2", "#f6"             \n\t" \
+  "psubh      "#f4", "#f4", "#f2"             \n\t"
+
+//f4 should be 0x0
+#define MMI_Copy8Times(f0, f2, f4, r0) \
+  "dmtc1      "#r0", "#f0"                    \n\t" \
+  "pshufh     "#f0", "#f0", "#f4"             \n\t" \
+  "mov.d      "#f2", "#f0"                    \n\t"
+
+//f4 should be 0x0
+#define MMI_Copy16Times(f0, f2, f4, r0) \
+  "dmtc1      "#r0", "#f0"                    \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f0"             \n\t" \
+  "pshufh     "#f0", "#f0", "#f4"             \n\t" \
+  "mov.d      "#f2", "#f0"                    \n\t"
+
+#define MMI_SumSubDiv2_SINGLE(f0, f2, f4, f6) \
+  "psrah      "#f4", "#f2", "#f6"             \n\t" \
+  "paddh      "#f4", "#f4", "#f0"             \n\t" \
+  "psrah      "#f0", "#f0", "#f6"             \n\t" \
+  "psubh      "#f0", "#f0", "#f2"             \n\t"
+
+#define MMI_IDCT_SINGLE(f0, f2, f4, f6, f8, f10, f12) \
+  MMI_SumSub_SINGLE(f6, f8, f10)             \
+  MMI_SumSubDiv2_SINGLE(f4, f2, f0, f12)     \
+  MMI_SumSub_SINGLE(f0, f6, f10)             \
+  MMI_SumSub_SINGLE(f4, f8, f10)
+
+#define MMI_StoreDiff4P_SINGLE(f0, f2, f4, f6, r0, r1, f8) \
+  "gsldlc1    "#f2", 0x7("#r1")               \n\t" \
+  "gsldrc1    "#f2", 0x0("#r1")               \n\t" \
+  "punpcklbh  "#f2", "#f2", "#f6"             \n\t" \
+  "paddh      "#f0", "#f0", "#f4"             \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "paddsh     "#f0", "#f0", "#f2"             \n\t" \
+  "packushb   "#f0", "#f0", "#f2"             \n\t" \
+  "gsswlc1    "#f0", 0x3("#r0")               \n\t" \
+  "gsswrc1    "#f0", 0x0("#r0")               \n\t"
+
+#define SUMH_HORIZON(f0, f2, f4, f6, f8) \
+  "paddh      "#f0", "#f0", "#f2"                       \n\t" \
+  "punpckhhw  "#f2", "#f0", "#f8"                       \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f8"                       \n\t" \
+  "paddw      "#f0", "#f0", "#f2"                       \n\t" \
+  "punpckhwd  "#f2", "#f0", "#f0"                       \n\t" \
+  "paddw      "#f0", "#f0", "#f2"                       \n\t"
+
+#define LOAD_COLUMN(f0, f2, f4, f6, f8, f10, f12, f14, r0, r1, r2) \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f0", 0x7("#r0")                         \n\t" \
+  "gsldlc1    "#f4", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")                         \n\t" \
+  "gsldrc1    "#f4", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f4"                       \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t" \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f8", 0x7("#r0")                         \n\t" \
+  "gsldlc1    "#f4", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f8", 0x0("#r0")                         \n\t" \
+  "gsldrc1    "#f4", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f8", "#f8", "#f4"                       \n\t" \
+  "punpckhhw  "#f2", "#f0", "#f8"                       \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f8"                       \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t" \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f12", 0x7("#r0")                        \n\t" \
+  "gsldlc1    "#f4", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f12", 0x0("#r0")                        \n\t" \
+  "gsldrc1    "#f4", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f12", "#f12", "#f4"                     \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t" \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f8", 0x7("#r0")                         \n\t" \
+  "gsldlc1    "#f4", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f8", 0x0("#r0")                         \n\t" \
+  "gsldrc1    "#f4", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f8", "#f8", "#f4"                       \n\t" \
+  "punpckhhw  "#f14", "#f12", "#f8"                     \n\t" \
+  "punpcklhw  "#f12", "#f12", "#f8"                     \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t" \
+  "punpcklwd  "#f0", "#f2", "#f14"                      \n\t" \
+  "punpckhwd  "#f2", "#f2", "#f14"                      \n\t"
+
+#define LOAD_COLUMN_C(f0, f2, f4, f6, r0, r1, r2) \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f0", 0x7("#r0")                         \n\t" \
+  "gsldlc1    "#f2", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")                         \n\t" \
+  "gsldrc1    "#f2", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f2"                       \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t" \
+  "daddu      "#r2", "#r0", "#r1"                       \n\t" \
+  "gsldlc1    "#f4", 0x7("#r0")                         \n\t" \
+  "gsldlc1    "#f2", 0x7("#r2")                         \n\t" \
+  "gsldrc1    "#f4", 0x0("#r0")                         \n\t" \
+  "gsldrc1    "#f2", 0x0("#r2")                         \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f2"                       \n\t" \
+  "punpckhhw  "#f0", "#f0", "#f4"                       \n\t" \
+  "daddu      "#r0", "#r2", "#r1"                       \n\t"
+
+/**
+ * backup register
+ */
+#define BACKUP_REG \
+   double __attribute__((aligned(16))) __back_temp[8];         \
+   if (_MIPS_SIM == _ABI64)                                    \
+   __asm__ volatile (                                          \
+     "gssqc1       $f25,      $f24,       0x00(%[temp])  \n\t" \
+     "gssqc1       $f27,      $f26,       0x10(%[temp])  \n\t" \
+     "gssqc1       $f29,      $f28,       0x20(%[temp])  \n\t" \
+     "gssqc1       $f31,      $f30,       0x30(%[temp])  \n\t" \
+     :                                                         \
+     : [temp]"r"(__back_temp)                                  \
+     : "memory"                                                \
+   );                                                          \
+  else                                                         \
+   __asm__ volatile (                                          \
+     "gssqc1       $f22,      $f20,       0x00(%[temp])  \n\t" \
+     "gssqc1       $f26,      $f24,       0x10(%[temp])  \n\t" \
+     "gssqc1       $f30,      $f28,       0x20(%[temp])  \n\t" \
+     :                                                         \
+     : [temp]"r"(__back_temp)                                  \
+     : "memory"                                                \
+   );
+
+/**
+ * recover register
+ */
+#define RECOVER_REG \
+   if (_MIPS_SIM == _ABI64)                                    \
+   __asm__ volatile (                                          \
+     "gslqc1       $f25,      $f24,       0x00(%[temp])  \n\t" \
+     "gslqc1       $f27,      $f26,       0x10(%[temp])  \n\t" \
+     "gslqc1       $f29,      $f28,       0x20(%[temp])  \n\t" \
+     "gslqc1       $f31,      $f30,       0x30(%[temp])  \n\t" \
+     :                                                         \
+     : [temp]"r"(__back_temp)                                  \
+     : "memory"                                                \
+   );                                                          \
+   else                                                        \
+   __asm__ volatile (                                          \
+     "gslqc1       $f22,      $f20,       0x00(%[temp])  \n\t" \
+     "gslqc1       $f26,      $f24,       0x10(%[temp])  \n\t" \
+     "gslqc1       $f30,      $f28,       0x20(%[temp])  \n\t" \
+     :                                                         \
+     : [temp]"r"(__back_temp)                                  \
+     : "memory"                                                \
+   );
+
+# define OK             1
+# define NOTOK          0
+
+#endif  /* ASMDEFS_MMI_H_ */
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/copy_mb.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/copy_mb.h
new file mode 100644
index 0000000000..532702a9ed
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/copy_mb.h
@@ -0,0 +1,96 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_COPY_MB_H_
+#define WELS_COPY_MB_H_
+
+#include "typedefs.h"
+
+/****************************************************************************
+ * Copy functions
+ ****************************************************************************/
+void WelsCopy4x4_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x4_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy4x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS); //
+void WelsCopy16x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS); //
+void WelsCopy16x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined (X86_ASM)
+
+void WelsCopy8x8_mmx (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_mmx (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x8NotAligned_sse2 (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+void WelsCopy16x16_sse2 (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+void WelsCopy16x16NotAligned_sse2 (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+#endif//X86_ASM
+
+#if defined (HAVE_NEON)
+void WelsCopy8x8_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x16_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x16NotAligned_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x8NotAligned_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+void WelsCopy8x8_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x16_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x16NotAligned_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x8NotAligned_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_AArch64_neon (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+#endif
+
+#if defined (HAVE_MMI)
+void WelsCopy8x8_mmi (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_mmi (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x8NotAligned_mmi (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+void WelsCopy16x16_mmi (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+void WelsCopy16x16NotAligned_mmi (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+#endif//HAVE_MMI
+
+#if defined (HAVE_MSA)
+void WelsCopy8x8_msa (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy8x16_msa (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+void WelsCopy16x8_msa (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+void WelsCopy16x16_msa (uint8_t* Dst, int32_t  iStrideD, uint8_t* Src, int32_t  iStrideS);
+#endif//HAVE_MSA
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif //SAMPLE_H_
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu.h
new file mode 100644
index 0000000000..0cbcdb44f0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu.h
@@ -0,0 +1,80 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    cpu.h
+ *
+ * \brief   CPU feature compatibility detection
+ *
+ * \date    04/29/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_CPU_DETECTION_H__)
+#define WELS_CPU_DETECTION_H__
+
+#include "typedefs.h"
+#include "cpu_core.h"
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+/*
+ *  cpuid support verify routine
+ *  return 0 if cpuid is not supported by cpu
+ */
+int32_t  WelsCPUIdVerify();
+
+void WelsCPUId (uint32_t uiIndex, uint32_t* pFeatureA, uint32_t* pFeatureB, uint32_t* pFeatureC, uint32_t* pFeatureD);
+
+int32_t WelsCPUSupportAVX (uint32_t eax, uint32_t ecx);
+int32_t WelsCPUSupportFMA (uint32_t eax, uint32_t ecx);
+
+void WelsEmms();
+
+/*
+ *  clear FPU registers states for potential float based calculation if support
+ */
+void     WelsCPURestore (const uint32_t kuiCPU);
+
+#else
+#define WelsEmms()
+#endif
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors);
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif//WELS_CPU_DETECTION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu_core.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu_core.h
new file mode 100644
index 0000000000..f25787b04a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/cpu_core.h
@@ -0,0 +1,95 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    cpu_core.h
+ *
+ * \brief   cpu core feature detection
+ *
+ * \date    4/24/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_CPU_CORE_FEATURE_DETECTION_H__)
+#define WELS_CPU_CORE_FEATURE_DETECTION_H__
+
+/*
+ *  WELS CPU feature flags
+ */
+#define WELS_CPU_MMX        0x00000001    /* mmx */
+#define WELS_CPU_MMXEXT     0x00000002    /* mmx-ext*/
+#define WELS_CPU_SSE        0x00000004    /* sse */
+#define WELS_CPU_SSE2       0x00000008    /* sse 2 */
+#define WELS_CPU_SSE3       0x00000010    /* sse 3 */
+#define WELS_CPU_SSE41      0x00000020    /* sse 4.1 */
+#define WELS_CPU_3DNOW      0x00000040    /* 3dnow! */
+#define WELS_CPU_3DNOWEXT   0x00000080    /* 3dnow! ext */
+#define WELS_CPU_ALTIVEC    0x00000100    /* altivec */
+#define WELS_CPU_SSSE3      0x00000200    /* ssse3 */
+#define WELS_CPU_SSE42      0x00000400    /* sse 4.2 */
+
+/* CPU features application extensive */
+#define WELS_CPU_FPU        0x00001000  /* x87-FPU on chip */
+#define WELS_CPU_HTT        0x00002000  /* Hyper-Threading Technology (HTT), Multi-threading enabled feature:
+                                           physical processor package is capable of supporting more than one logic processor
+                                        */
+#define WELS_CPU_CMOV       0x00004000  /* Conditional Move Instructions,
+                                           also if x87-FPU is present at indicated by the CPUID.FPU feature bit, then FCOMI and FCMOV are supported
+                                        */
+#define WELS_CPU_MOVBE      0x00008000  /* MOVBE instruction */
+#define WELS_CPU_AES        0x00010000  /* AES instruction extensions */
+#define WELS_CPU_FMA        0x00020000  /* AVX VEX FMA instruction sets */
+#define WELS_CPU_AVX        0x00000800  /* Advanced Vector eXtentions */
+
+#ifdef HAVE_AVX2
+#define WELS_CPU_AVX2       0x00040000  /* AVX2 */
+#else
+#define WELS_CPU_AVX2       0x00000000  /* !AVX2 */
+#endif
+
+#define WELS_CPU_CACHELINE_16    0x10000000    /* CacheLine Size 16 */
+#define WELS_CPU_CACHELINE_32    0x20000000    /* CacheLine Size 32 */
+#define WELS_CPU_CACHELINE_64    0x40000000    /* CacheLine Size 64 */
+#define WELS_CPU_CACHELINE_128   0x80000000    /* CacheLine Size 128 */
+
+/* For the android OS */
+#define WELS_CPU_ARMv7      0x000001    /* ARMv7 */
+#define WELS_CPU_VFPv3      0x000002    /* VFPv3 */
+#define WELS_CPU_NEON       0x000004    /* NEON */
+
+/* For loongson */
+#define WELS_CPU_MMI        0x00000001  /* mmi */
+#define WELS_CPU_MSA        0x00000002  /* msa */
+
+/*
+ *  Interfaces for CPU core feature detection as below
+ */
+
+#endif//WELS_CPU_CORE_FEATURE_DETECTION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/crt_util_safe_x.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/crt_util_safe_x.h
new file mode 100644
index 0000000000..47068c2560
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/crt_util_safe_x.h
@@ -0,0 +1,101 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    crt_util_safe_x.h
+ *
+ * \brief   Safe CRT like util for cross platfroms support
+ *
+ * \date    06/04/2010 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
+#define WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <math.h>
+#include <time.h>
+
+#if defined(_WIN32)
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/timeb.h>
+#else
+#include <sys/time.h>
+#include "typedefs.h"
+#endif//_WIN32
+
+#include "typedefs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define     WELS_FILE_SEEK_SET           SEEK_SET
+#define     WELS_FILE_SEEK_CUR           SEEK_CUR
+#define     WESL_FILE_SEEK_END           SEEK_END
+
+typedef      FILE  WelsFileHandle;
+
+#ifdef _WIN32
+typedef      struct _timeb     SWelsTime;
+#else
+typedef struct TagWelsTime {
+  time_t time;
+  unsigned short millitm;
+} SWelsTime;
+#endif
+
+int32_t   WelsSnprintf (char* buffer,  int32_t sizeOfBuffer,  const char* format, ...);
+char*   WelsStrncpy (char* dest, int32_t sizeInBytes, const char* src);
+char*   WelsStrcat (char* dest, uint32_t sizeInBytes, const char* src);
+int32_t   WelsVsnprintf (char* buffer, int32_t sizeOfBuffer, const char* format, va_list argptr);
+
+WelsFileHandle*        WelsFopen (const char* filename,  const char* mode);
+int32_t                WelsFclose (WelsFileHandle*   fp);
+int32_t                WelsFread (void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
+int32_t                WelsFwrite (const void* buffer, int32_t size, int32_t count, WelsFileHandle* fp);
+int32_t                WelsFseek (WelsFileHandle* fp, int32_t offset, int32_t origin);
+int32_t                WelsFflush (WelsFileHandle* fp);
+
+int32_t                WelsGetTimeOfDay (SWelsTime* tp);
+int32_t                WelsStrftime (char* buffer, int32_t size, const char* format, const SWelsTime* tp);
+uint16_t               WelsGetMillisecond (const SWelsTime* tp);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//WELS_CRT_UTIL_SAFE_CROSS_PLATFORMS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/deblocking_common.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/deblocking_common.h
new file mode 100644
index 0000000000..3ec9b2e5d8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/deblocking_common.h
@@ -0,0 +1,112 @@
+#ifndef WELS_DEBLOCKING_COMMON_H__
+#define WELS_DEBLOCKING_COMMON_H__
+#include "typedefs.h"
+void DeblockLumaLt4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockLumaLt4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_c (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* pTc);
+void DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* pTc);
+void DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4V2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* pTc);
+void DeblockChromaEq4V2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4H2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* pTc);
+void DeblockChromaEq4H2_c (uint8_t* pPixCbCr,int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void WelsNonZeroCount_c (int8_t* pNonZeroCount);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#ifdef  X86_ASM
+void DeblockLumaLt4V_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaTransposeH2V_sse2 (uint8_t* pPixY, int32_t iStride, uint8_t* pDst);
+void DeblockLumaTransposeV2H_sse2 (uint8_t* pPixY, int32_t iStride, uint8_t* pSrc);
+void DeblockLumaLt4H_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaEq4V_ssse3 (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4V_ssse3 (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                              int8_t* pTC);
+void DeblockChromaEq4H_ssse3 (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4H_ssse3 (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                              int8_t* pTC);
+void WelsNonZeroCount_sse2 (int8_t* pNonZeroCount);
+#endif
+
+#if defined(HAVE_NEON)
+void DeblockLumaLt4V_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockLumaLt4H_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4V_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                             int8_t* pTC);
+void DeblockChromaEq4V_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+
+void DeblockChromaLt4H_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                             int8_t* pTC);
+void DeblockChromaEq4H_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void WelsNonZeroCount_neon (int8_t* pNonZeroCount);
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+void DeblockLumaLt4V_AArch64_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_AArch64_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaLt4H_AArch64_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_AArch64_neon (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4V_AArch64_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                                     int8_t* pTC);
+void DeblockChromaEq4V_AArch64_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4H_AArch64_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                                     int8_t* pTC);
+void DeblockChromaEq4H_AArch64_neon (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void WelsNonZeroCount_AArch64_neon (int8_t* pNonZeroCount);
+#endif
+
+#if defined(HAVE_MMI)
+void DeblockLumaLt4V_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaTransposeH2V_mmi (uint8_t* pPixY, int32_t iStride, uint8_t* pDst);
+void DeblockLumaTransposeV2H_mmi (uint8_t* pPixY, int32_t iStride, uint8_t* pSrc);
+void DeblockLumaLt4H_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaEq4V_mmi (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4V_mmi (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                            int8_t* pTC);
+void DeblockChromaEq4H_mmi (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4H_mmi (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                            int8_t* pTC);
+void WelsNonZeroCount_mmi (int8_t* pNonZeroCount);
+#endif//HAVE_MMI
+
+#if defined(HAVE_MSA)
+void DeblockLumaLt4V_msa (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4V_msa (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockLumaLt4H_msa (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc);
+void DeblockLumaEq4H_msa (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaEq4V_msa (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4V_msa (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                            int8_t* pTC);
+void DeblockChromaEq4H_msa (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+void DeblockChromaLt4H_msa (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                            int8_t* pTC);
+void WelsNonZeroCount_msa (int8_t* pNonZeroCount);
+#endif//HAVE_MSA
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif //WELS_DEBLOCKING_COMMON_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/expand_pic.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/expand_pic.h
new file mode 100644
index 0000000000..2b06d9e47f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/expand_pic.h
@@ -0,0 +1,107 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    expand_pic.h
+ *
+ * \brief   Interface for expanding reconstructed picture to be used for reference
+ *
+ * \date    06/08/2009
+ *************************************************************************************
+ */
+
+#ifndef EXPAND_PICTURE_H
+#define EXPAND_PICTURE_H
+
+#include "typedefs.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#define PADDING_LENGTH 32 // reference extension
+#define CHROMA_PADDING_LENGTH 16 // chroma reference extension
+
+#if defined(X86_ASM)
+void ExpandPictureLuma_sse2 (uint8_t* pDst,
+                             const int32_t kiStride,
+                             const int32_t kiPicW,
+                             const int32_t kiPicH);
+void ExpandPictureChromaAlign_sse2 (uint8_t* pDst,
+                                    const int32_t kiStride,
+                                    const int32_t kiPicW,
+                                    const int32_t kiPicH);
+void ExpandPictureChromaUnalign_sse2 (uint8_t* pDst,
+                                      const int32_t kiStride,
+                                      const int32_t kiPicW,
+                                      const int32_t kiPicH);
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+void ExpandPictureLuma_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW, const int32_t kiPicH);
+void ExpandPictureChroma_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW, const int32_t kiPicH);
+#endif
+#if defined(HAVE_NEON_AARCH64)
+void ExpandPictureLuma_AArch64_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW, const int32_t kiPicH);
+void ExpandPictureChroma_AArch64_neon (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+                                       const int32_t kiPicH);
+#endif
+
+#if defined(HAVE_MMI)
+void ExpandPictureLuma_mmi (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+                            const int32_t kiPicH);
+void ExpandPictureChromaAlign_mmi (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+                                   const int32_t kiPicH);
+void ExpandPictureChromaUnalign_mmi (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+                                     const int32_t kiPicH);
+#endif//HAVE_MMI
+
+typedef void (*PExpandPictureFunc) (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW, const int32_t kiPicH);
+
+typedef struct TagExpandPicFunc {
+  PExpandPictureFunc pfExpandLumaPicture;
+  PExpandPictureFunc pfExpandChromaPicture[2];
+} SExpandPicFunc;
+
+void PadMBLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW, const int32_t& kiPicH,
+                  const int32_t& kiMbX, const int32_t& kiMbY, const int32_t& kiMBWidth, const int32_t& kiMBHeight);
+void PadMBChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW, const int32_t& kiPicH,
+                    const int32_t& kiMbX, const int32_t& kiMbY, const int32_t& kiMBWidth, const int32_t& kiMBHeight);
+
+void ExpandReferencingPicture (uint8_t* pData[3], int32_t iWidth, int32_t iHeight, int32_t iStride[3],
+                               PExpandPictureFunc pExpLuma, PExpandPictureFunc pExpChrom[2]);
+
+void InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCPUFlags);
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/golomb_common.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/golomb_common.h
new file mode 100644
index 0000000000..04f87b0047
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/golomb_common.h
@@ -0,0 +1,166 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    golomb_common.h
+ *
+ * \brief   Exponential Golomb entropy coding/decoding routine
+ *
+ * \date    03/12/2015 Created
+ *
+ *************************************************************************************
+ */
+#ifndef EXPONENTIAL_GOLOMB_ENTROPY_CODING_COMMON_H__
+#define EXPONENTIAL_GOLOMB_ENTROPY_CODING_COMMON_H__
+
+#include "typedefs.h"
+
+namespace WelsCommon {
+
+#define WRITE_BE_32(ptr, val) do { \
+        (ptr)[0] = (val) >> 24; \
+        (ptr)[1] = (val) >> 16; \
+        (ptr)[2] = (val) >>  8; \
+        (ptr)[3] = (val) >>  0; \
+    } while (0)
+/************************************************************************/
+/* GOLOMB CODIMG FOR WELS COMMON                                        */
+/************************************************************************/
+
+
+/*!
+ * \brief   initialize bitstream writing
+ *
+ * \param   pBs     Bit string auxiliary pointer
+ * \param   pBuf    bit-stream pBuffer
+ * \param   iSize   iSize in bits for decoder; iSize in bytes for encoder
+ *
+ * \return  iSize of pBuffer pData in byte; failed in -1 return
+ */
+static inline int32_t InitBits (SBitStringAux* pBs, const uint8_t* kpBuf, const int32_t kiSize) {
+  uint8_t* ptr = (uint8_t*)kpBuf;
+
+  pBs->pStartBuf = ptr;
+  pBs->pCurBuf   = ptr;
+  pBs->pEndBuf   = ptr + kiSize;
+  pBs->iLeftBits = 32;
+  pBs->uiCurBits = 0;
+
+  return kiSize;
+}
+
+static inline int32_t BsWriteBits (PBitStringAux pBitString, int32_t iLen, const uint32_t kuiValue) {
+  if (iLen < pBitString->iLeftBits) {
+    pBitString->uiCurBits = (pBitString->uiCurBits << iLen) | kuiValue;
+    pBitString->iLeftBits -= iLen;
+  } else {
+    iLen -= pBitString->iLeftBits;
+    pBitString->uiCurBits = (pBitString->uiCurBits << pBitString->iLeftBits) | (kuiValue >> iLen);
+    WRITE_BE_32 (pBitString->pCurBuf, pBitString->uiCurBits);
+    pBitString->pCurBuf += 4;
+    pBitString->uiCurBits = kuiValue & ((1 << iLen) - 1);
+    pBitString->iLeftBits = 32 - iLen;
+  }
+  return 0;
+}
+
+/*
+ *  Write 1 bit
+ */
+static inline int32_t BsWriteOneBit (PBitStringAux pBitString, const uint32_t kuiValue) {
+  BsWriteBits (pBitString, 1, kuiValue);
+  return 0;
+}
+
+static inline int32_t BsFlush (PBitStringAux pBitString) {
+  WRITE_BE_32 (pBitString->pCurBuf, pBitString->uiCurBits << pBitString->iLeftBits);
+  pBitString->pCurBuf += 4 - pBitString->iLeftBits / 8;
+  pBitString->iLeftBits = 32;
+  pBitString->uiCurBits = 0;
+  return 0;
+}
+
+/*
+ *  Write unsigned exp golomb codes
+ */
+
+static inline int32_t BsWriteUE (PBitStringAux pBitString, const uint32_t kuiValue) {
+  uint32_t iTmpValue = kuiValue + 1;
+  if (256 > kuiValue) {
+    BsWriteBits (pBitString, g_kuiGolombUELength[kuiValue], kuiValue + 1);
+  } else {
+    uint32_t n = 0;
+    if (iTmpValue & 0xffff0000) {
+      iTmpValue >>= 16;
+      n += 16;
+    }
+    if (iTmpValue & 0xff00) {
+      iTmpValue >>= 8;
+      n += 8;
+    }
+
+    //n += (g_kuiGolombUELength[iTmpValue] >> 1);
+
+    n += (g_kuiGolombUELength[iTmpValue - 1] >> 1);
+    BsWriteBits (pBitString, (n << 1) + 1, kuiValue + 1);
+  }
+  return 0;
+}
+
+/*
+ *  Write signed exp golomb codes
+ */
+static inline int32_t BsWriteSE (PBitStringAux pBitString, const int32_t kiValue) {
+  uint32_t iTmpValue;
+  if (0 == kiValue) {
+    BsWriteOneBit (pBitString, 1);
+  } else if (0 < kiValue) {
+    iTmpValue = (kiValue << 1) - 1;
+    BsWriteUE (pBitString, iTmpValue);
+  } else {
+    iTmpValue = ((-kiValue) << 1);
+    BsWriteUE (pBitString, iTmpValue);
+  }
+  return 0;
+}
+
+
+/*
+ *  Write RBSP trailing bits
+ */
+static inline int32_t BsRbspTrailingBits (PBitStringAux pBitString) {
+  BsWriteOneBit (pBitString, 1);
+  BsFlush (pBitString);
+
+  return 0;
+}
+
+}
+#endif//EXPONENTIAL_GOLOMB_ENTROPY_CODING_COMMON_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/intra_pred_common.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/intra_pred_common.h
new file mode 100644
index 0000000000..87cf023fa8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/intra_pred_common.h
@@ -0,0 +1,81 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    intra_pred_common.h
+ *
+ * \brief   interfaces for intra predictor about 16x16.
+ *
+ * \date    4/2/2014 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef INTRA_PRED_COMMON_H
+#define INTRA_PRED_COMMON_H
+
+#include "typedefs.h"
+
+
+void WelsI16x16LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+//for intra-prediction ASM functions
+void WelsI16x16LumaPredV_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredH_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+void WelsI16x16LumaPredV_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredH_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_NEON
+
+#if defined(HAVE_NEON_AARCH64)
+void WelsI16x16LumaPredV_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredH_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_NEON_AARCH64
+
+#if defined(HAVE_MMI)
+void WelsI16x16LumaPredV_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredH_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+#endif//
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/ls_defines.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/ls_defines.h
new file mode 100644
index 0000000000..7b2914ea34
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/ls_defines.h
@@ -0,0 +1,130 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef ___LD_ST_MACROS___
+#define ___LD_ST_MACROS___
+
+#include <string.h>
+#include "typedefs.h"
+
+#ifdef __GNUC__
+
+struct tagUnaligned_64 {
+  uint64_t l;
+} __attribute__ ((packed)) __attribute__ ((may_alias));
+struct tagUnaligned_32 {
+  uint32_t l;
+} __attribute__ ((packed)) __attribute__ ((may_alias));
+struct tagUnaligned_16 {
+  uint16_t l;
+} __attribute__ ((packed)) __attribute__ ((may_alias));
+
+#define LD16(a) (((struct tagUnaligned_16 *) (a))->l)
+#define LD32(a) (((struct tagUnaligned_32 *) (a))->l)
+#define LD64(a) (((struct tagUnaligned_64 *) (a))->l)
+
+#define STRUCTA(size, align) struct tagUnaligned_##size##_##align {\
+    uint##size##_t l; \
+} __attribute__ ((aligned(align))) __attribute__ ((may_alias))
+STRUCTA (16, 2);
+STRUCTA (32, 2);
+STRUCTA (32, 4);
+STRUCTA (64, 2);
+STRUCTA (64, 4);
+STRUCTA (64, 8);
+//#define _USE_STRUCT_INT_CVT
+//#ifdef _USE_STRUCT_INT_CVT
+#define ST16(a, b) (((struct tagUnaligned_16 *) (a))->l) = (b)
+#define ST32(a, b) (((struct tagUnaligned_32 *) (a))->l) = (b)
+#define ST64(a, b) (((struct tagUnaligned_64 *) (a))->l) = (b)
+
+#define LDA(a, size, align) (((struct tagUnaligned_##size##_##align *) (a))->l)
+#define STA(a, b, size, align) (((struct tagUnaligned_##size##_##align *) (a))->l) = (b)
+#define LD16A2(a) LDA(a, 16, 2)
+#define LD32A2(a) LDA(a, 32, 2)
+#define LD32A4(a) LDA(a, 32, 4)
+#define LD64A2(a) LDA(a, 64, 2)
+#define LD64A4(a) LDA(a, 64, 4)
+#define LD64A8(a) LDA(a, 64, 8)
+#define ST16A2(a, b) STA(a, b, 16, 2)
+#define ST32A2(a, b) STA(a, b, 32, 2)
+#define ST32A4(a, b) STA(a, b, 32, 4)
+#define ST64A2(a, b) STA(a, b, 64, 2)
+#define ST64A4(a, b) STA(a, b, 64, 4)
+#define ST64A8(a, b) STA(a, b, 64, 8)
+//#else
+//inline void __ST16(void *dst, uint16_t v) { memcpy(dst, &v, 2); }
+//inline void __ST32(void *dst, uint32_t v) { memcpy(dst, &v, 4); }
+//inline void __ST64(void *dst, uint64_t v) { memcpy(dst, &v, 8); }
+//#endif
+
+#else
+
+//#define INTD16(a) (*((int16_t*)(a)))
+//#define INTD32(a) (*((int32_t*)(a)))
+//#define INTD64(a) (*((int64_t*)(a)))
+
+#define LD16(a) (*((uint16_t*)(a)))
+#define LD32(a) (*((uint32_t*)(a)))
+#define LD64(a) (*((uint64_t*)(a)))
+
+#define ST16(a, b) *((uint16_t*)(a)) = (b)
+#define ST32(a, b) *((uint32_t*)(a)) = (b)
+#define ST64(a, b) *((uint64_t*)(a)) = (b)
+#define LD16A2 LD16
+#define LD32A2 LD32
+#define LD32A4 LD32
+#define LD64A2 LD64
+#define LD64A4 LD64
+#define LD64A8 LD64
+#define ST16A2 ST16
+#define ST32A2 ST32
+#define ST32A4 ST32
+#define ST64A2 ST64
+#define ST64A4 ST64
+#define ST64A8 ST64
+
+#endif /* !__GNUC__ */
+
+#ifndef INTD16
+#define INTD16 LD16
+#endif//INTD16
+
+#ifndef INTD32
+#define INTD32 LD32
+#endif//INTD32
+
+#ifndef INTD64
+#define INTD64 LD64
+#endif//INTD64
+
+#endif//___LD_ST_MACROS___
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/macros.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/macros.h
new file mode 100644
index 0000000000..95a7c92982
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/macros.h
@@ -0,0 +1,329 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    macros.h
+ *
+ * \brief   MACRO based tool utilization
+ *
+ * \date    3/13/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_MACRO_UTILIZATIONS_H__
+#define WELS_MACRO_UTILIZATIONS_H__
+
+#include <math.h>
+#include <assert.h>
+#include <string.h>
+#include "typedefs.h"
+
+
+/*
+* ENFORCE_STACK_ALIGN_1D: force 1 dimension local data aligned in stack
+* _tp: type
+* _nm: var name
+* _sz: size
+* _al: align bytes
+* auxiliary var: _nm ## _tEmP
+*/
+#define ENFORCE_STACK_ALIGN_1D(_tp, _nm, _sz, _al) \
+    _tp _nm ## _tEmP[(_sz)+(_al)-1]; \
+    _tp *_nm = _nm ## _tEmP + ((_al)-1) - (((uintptr_t)(_nm ## _tEmP + ((_al)-1)) & ((_al)-1))/sizeof(_tp));
+
+
+#define ENFORCE_STACK_ALIGN_2D(_tp, _nm, _cx, _cy, _al) \
+    assert( ((_al) && !((_al) & ((_al) - 1))) && ((_al) >= sizeof(_tp)) ); /*_al should be power-of-2 and >= sizeof(_tp)*/\
+    _tp _nm ## _tEmP[(_cx)*(_cy)+(_al)/sizeof(_tp)-1]; \
+    _tp *_nm ## _tEmP_al = _nm ## _tEmP + ((_al)/sizeof(_tp)-1); \
+    _nm ## _tEmP_al -= (((uintptr_t)_nm ## _tEmP_al & ((_al)-1))/sizeof(_tp)); \
+    _tp (*_nm)[(_cy)] = (_tp (*)[(_cy)])_nm ## _tEmP_al;
+
+
+#if defined(_MSC_VER)
+
+#if(_MSC_VER < 1700)
+#define inline __inline
+#endif
+
+#define ALIGNED_DECLARE( type, var, n ) __declspec(align(n)) type var
+
+#elif defined(__GNUC__)
+
+#define ALIGNED_DECLARE( type, var, n ) type var __attribute__((aligned(n)))
+#endif//_MSC_VER
+
+
+#ifndef WELS_ALIGN
+#define WELS_ALIGN(x, n) (((x)+(n)-1)&~((n)-1))
+#endif//WELS_ALIGN
+
+
+#if 1 // Alternative implementation of WELS_MAX and WELS_MIN
+#ifndef WELS_MAX
+#define WELS_MAX(x, y) ((x) > (y) ? (x) : (y))
+#endif//WELS_MAX
+
+#ifndef WELS_MIN
+#define WELS_MIN(x, y) ((x) < (y) ? (x) : (y))
+#endif//WELS_MIN
+#ifndef WELS_MIN_POSITIVE
+#define WELS_MIN_POSITIVE(x, y) (x >= 0 && y >= 0) ? WELS_MIN(x, y) : WELS_MAX(x, y);
+#endif//WELS_MIN_POSITIVE
+#else // Alternative implementation of WELS_MAX and WELS_MIN
+#ifndef WELS_MAX
+#define WELS_MAX(x, y) ((x) - (((x)-(y))&(((x)-(y))>>31)))
+#endif//WELS_MAX
+
+#ifndef WELS_MIN
+#define WELS_MIN(x, y) ((y) + (((x)-(y))&(((x)-(y))>>31)))
+#endif//WELS_MIN
+#endif // Alternative implementation of WELS_MAX and WELS_MIN
+
+
+#ifndef WELS_CEIL
+#define WELS_CEIL(x) ceil(x) // FIXME: low complexity instead of math library used
+#endif//WELS_CEIL
+
+#ifndef WELS_FLOOR
+#define WELS_FLOOR(x) floor(x)        // FIXME: low complexity instead of math library used
+#endif//WELS_FLOOR
+
+#ifndef WELS_ROUND
+#define WELS_ROUND(x) ((int32_t)(0.5+(x)))
+#endif//WELS_ROUND
+
+#ifndef WELS_ROUND64
+#define WELS_ROUND64(x) ((int64_t)(0.5+(x)))
+#endif//WELS_ROUND
+
+#ifndef WELS_DIV_ROUND
+#define WELS_DIV_ROUND(x,y) ((int32_t)((y)==0?((x)/((y)+1)):(((y)/2+(x))/(y))))
+#endif//WELS_DIV_ROUND
+
+#ifndef WELS_DIV_ROUND64
+#define WELS_DIV_ROUND64(x,y) ((int64_t)((y)==0?((x)/((y)+1)):(((y)/2+(x))/(y))))
+#endif//WELS_DIV_ROUND64
+
+#define WELS_NON_ZERO_COUNT_AVERAGE(nC,nA,nB) {         \
+  nC = nA + nB + 1;                                     \
+  nC >>= (uint8_t)( nA != -1 && nB != -1);              \
+  nC += (uint8_t)(nA == -1 && nB == -1);                \
+}
+
+static inline int32_t CeilLog2 (int32_t i) {
+  int32_t s = 0;
+  i--;
+  while (i > 0) {
+    s++;
+    i >>= 1;
+  }
+  return s;
+}
+/*
+the second path will degrades the performance
+*/
+#if 1
+static inline int32_t WelsMedian (int32_t iX,  int32_t iY, int32_t iZ) {
+  int32_t iMin = iX, iMax = iX;
+
+  if (iY < iMin)
+    iMin = iY;
+  else
+    iMax = iY;
+
+  if (iZ < iMin)
+    iMin = iZ;
+  else if (iZ > iMax)
+    iMax = iZ;
+
+  return (iX + iY + iZ) - (iMin + iMax);
+}
+#else
+static inline int32_t WelsMedian (int32_t iX,  int32_t iY, int32_t iZ) {
+  int32_t iTmp = (iX - iY) & ((iX - iY) >> 31);
+  iX -= iTmp;
+  iY += iTmp;
+  iY -= (iY - iZ) & ((iY - iZ) >> 31);
+  iY += (iX - iY) & ((iX - iY) >> 31);
+  return iY;
+}
+
+#endif
+
+#ifndef NEG_NUM
+//#define NEG_NUM( num ) (-num)
+#define NEG_NUM(iX) (1+(~(iX)))
+#endif// NEG_NUM
+
+static inline uint8_t WelsClip1 (int32_t iX) {
+  uint8_t uiTmp = (uint8_t) (((iX) & ~255) ? (- (iX) >> 31) : (iX));
+  return uiTmp;
+}
+
+#ifndef WELS_SIGN
+#define WELS_SIGN(iX) ((int32_t)(iX) >> 31)
+#endif //WELS_SIGN
+#ifndef WELS_ABS
+#if 1
+#define WELS_ABS(iX) ((iX)>0 ? (iX) : -(iX))
+#else
+#define WELS_ABS(iX) ((WELS_SIGN(iX) ^ (int32_t)(iX)) - WELS_SIGN(iX))
+#endif
+#endif //WELS_ABS
+
+// WELS_CLIP3
+#ifndef WELS_CLIP3
+#define WELS_CLIP3(iX, iY, iZ) ((iX) < (iY) ? (iY) : ((iX) > (iZ) ? (iZ) : (iX)))
+#endif //WELS_CLIP3
+
+template<typename T> T WelsClip3(T iX, T iY, T iZ) {
+  if (iX < iY)
+    return iY;
+  if (iX > iZ)
+    return iZ;
+  return iX;
+}
+
+#define DISALLOW_COPY_AND_ASSIGN(cclass) \
+private:	\
+cclass(const cclass &);	\
+cclass& operator=(const cclass &);
+
+/*
+ * Description: to check variable validation and return the specified result
+ *  iResult:    value to be checked
+ *  iExpected:  the expected value
+ */
+#ifndef WELS_VERIFY_RETURN_IFNEQ
+#define WELS_VERIFY_RETURN_IFNEQ(iResult, iExpected) \
+  if (iResult != iExpected) {                        \
+    return iResult;                                  \
+  }
+#endif//#if WELS_VERIFY_RETURN_IF
+
+/*
+ * Description: to check variable validation and return the specified result
+ *  iResult:    value to be return
+ *  bCaseIf:    negative condition to be verified
+ */
+#ifndef WELS_VERIFY_RETURN_IF
+#define WELS_VERIFY_RETURN_IF(iResult, bCaseIf) \
+  if (bCaseIf) {                                \
+    return iResult;                             \
+  }
+#endif//#if WELS_VERIFY_RETURN_IF
+
+/*
+ *  Description: to check variable validation and return the specified result
+ *      with correspoinding process advance.
+ *   result:    value to be return
+ *   case_if:   negative condition to be verified
+ *   proc:      process need perform
+ */
+#ifndef WELS_VERIFY_RETURN_PROC_IF
+#define WELS_VERIFY_RETURN_PROC_IF(iResult, bCaseIf, fProc) \
+  if (bCaseIf) {                                            \
+    fProc;                                                  \
+    return iResult;                                         \
+  }
+#endif//#if WELS_VERIFY_RETURN_PROC_IF
+
+static inline int32_t WELS_LOG2 (uint32_t v) {
+  int32_t r = 0;
+  while (v >>= 1) {
+    ++r;
+  }
+  return r;
+
+}
+
+#define CLIP3_QP_0_51(q) WELS_CLIP3(q, 0, 51) // ((q) < (0) ? (0) : ((q) > (51) ? (51) : (q)))
+#define   CALC_BI_STRIDE(width,bitcount)  ((((width * bitcount) + 31) & ~31) >> 3)
+
+
+
+
+#ifndef BUTTERFLY1x2
+#define BUTTERFLY1x2(b) (((b)<<8) | (b))
+#endif//BUTTERFLY1x2
+
+#ifndef BUTTERFLY2x4
+#define BUTTERFLY2x4(wd) (((uint32_t)(wd)<<16) |(wd))
+#endif//BUTTERFLY2x4
+
+#ifndef BUTTERFLY4x8
+#define BUTTERFLY4x8(dw) (((uint64_t)(dw)<<32) | (dw))
+#endif//BUTTERFLY4x8
+
+static inline bool WELS_POWER2_IF (uint32_t v) {
+  return (v && ! (v & (v - 1)));
+}
+
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define WELS_GCC_UNUSED  __attribute__((__unused__))
+#else
+#define WELS_GCC_UNUSED
+#endif
+
+inline bool CheckInRangeCloseOpen (const int16_t kiCurrent, const int16_t kiMin, const int16_t kiMax) {
+  return ((kiCurrent >= kiMin) && (kiCurrent < kiMax));
+}
+
+static inline void WelsSetMemUint32_c (uint32_t* pDst, uint32_t iValue, int32_t iSizeOfData) {
+  for (int i = 0; i < iSizeOfData; i++) {
+    pDst[i] = iValue;
+  }
+}
+
+static inline void WelsSetMemUint16_c (uint16_t* pDst, uint16_t iValue, int32_t iSizeOfData) {
+  for (int i = 0; i < iSizeOfData; i++) {
+    pDst[i] = iValue;
+  }
+}
+
+inline void WelsSetMemMultiplebytes_c (void* pDst, uint32_t iValue, int32_t iSizeOfData, int32_t iDataLengthOfData) {
+  assert (4 == iDataLengthOfData || 2 == iDataLengthOfData || 1 == iDataLengthOfData);
+
+  // TODO: consider add assembly for these functions
+  if (0 != iValue) {
+    if (4 == iDataLengthOfData) {
+      WelsSetMemUint32_c (static_cast<uint32_t*> (pDst), static_cast<uint32_t> (iValue), iSizeOfData);
+    } else if (2 == iDataLengthOfData) {
+      WelsSetMemUint16_c (static_cast<uint16_t*> (pDst), static_cast<uint16_t> (iValue), iSizeOfData);
+    } else {
+      memset (static_cast<uint8_t*> (pDst), static_cast<uint8_t> (iValue), iSizeOfData);
+    }
+  } else {
+    memset (static_cast<uint8_t*> (pDst), 0, iSizeOfData * iDataLengthOfData);
+  }
+}
+
+#endif//WELS_MACRO_UTILIZATIONS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/mc.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/mc.h
new file mode 100644
index 0000000000..8de1ed4c22
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/mc.h
@@ -0,0 +1,363 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef MC_H
+#define MC_H
+
+#include "typedefs.h"
+
+typedef void (*PWelsMcFunc) (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight);
+
+typedef void (*PWelsLumaHalfpelMcFunc) (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                        int32_t iWidth, int32_t iHeight);
+typedef void (*PWelsSampleAveragingFunc) (uint8_t*, int32_t, const uint8_t*, int32_t, const uint8_t*, int32_t,
+    int32_t, int32_t);
+
+typedef struct TagMcFunc {
+  PWelsLumaHalfpelMcFunc      pfLumaHalfpelHor;
+  PWelsLumaHalfpelMcFunc      pfLumaHalfpelVer;
+  PWelsLumaHalfpelMcFunc      pfLumaHalfpelCen;
+  PWelsMcFunc                 pMcChromaFunc;
+
+  PWelsMcFunc                 pMcLumaFunc;
+  PWelsSampleAveragingFunc    pfSampleAveraging;
+} SMcFunc;
+
+namespace WelsCommon {
+
+void InitMcFunc (SMcFunc* pMcFunc, uint32_t iCpu);
+
+} // namespace WelsCommon
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(HAVE_NEON)
+void McCopyWidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+
+void McCopyWidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+
+void McCopyWidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+
+void McChromaWidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t* pWeights, int32_t iHeight);
+
+void McChromaWidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t* pWeights, int32_t iHeight);
+
+void PixelAvgWidthEq16_neon (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, uint8_t* pSrcB, int32_t iHeight);
+void PixelAvgWidthEq8_neon (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, uint8_t* pSrcB, int32_t iHeight);
+void PixelAvgWidthEq4_neon (uint8_t* pDst, int32_t iDstStride, uint8_t* pSrcA, uint8_t* pSrcB, int32_t iHeight);
+
+void McHorVer01WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer01WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer01WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer03WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer03WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer03WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+
+void McHorVer10WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer10WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer10WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer30WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer30WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer30WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+
+//horizontal filter to gain half sample, that is (2, 0) location in quarter sample
+void McHorVer20WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer20WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer20WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+
+//vertical filter to gain half sample, that is (0, 2) location in quarter sample
+void McHorVer02WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer02WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer02WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+
+//horizontal and vertical filter to gain half sample, that is (2, 2) location in quarter sample
+void McHorVer22WidthEq16_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer22WidthEq8_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer22WidthEq4_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+
+void PixStrideAvgWidthEq16_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+                                 const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+void PixStrideAvgWidthEq8_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+                                const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+
+void McHorVer20Width17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int32_t iHeight);// width+1
+void McHorVer20Width9_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t iHeight);// width+1
+void McHorVer20Width5_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t iHeight);// width+1
+
+void McHorVer02Height17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);// height+1
+void McHorVer02Height9_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int32_t iHeight);// height+1
+void McHorVer02Height5_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int32_t iHeight);// height+1
+
+void McHorVer22Width17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int32_t iHeight);//width+1&&height+1
+void McHorVer22Width9_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t iHeight);//width+1&&height+1
+void McHorVer22Width5_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int32_t iHeight);//width+1&&height+1
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+void McCopyWidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                  int32_t iHeight);
+void McCopyWidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                  int32_t iHeight);
+void McCopyWidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                   int32_t iHeight);
+void McChromaWidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t* pWeights, int32_t iHeight);
+void McChromaWidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t* pWeights, int32_t iHeight);
+void PixelAvgWidthEq16_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                                     const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+void PixelAvgWidthEq8_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                                    const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+void PixelAvgWidthEq4_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                                    const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+void McHorVer01WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer01WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer01WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer03WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer03WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer03WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer10WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer10WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer10WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer30WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer30WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer30WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+//horizontal filter to gain half sample, that is (2, 0) location in quarter sample
+void McHorVer20WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer20WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer20WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+//vertical filter to gain half sample, that is (0, 2) location in quarter sample
+void McHorVer02WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer02WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer02WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+//horizontal and vertical filter to gain half sample, that is (2, 2) location in quarter sample
+void McHorVer22WidthEq16_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       int32_t iHeight);
+void McHorVer22WidthEq8_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void McHorVer22WidthEq4_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);
+void PixStrideAvgWidthEq16_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+    const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+void PixStrideAvgWidthEq8_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcStrideA,
+                                        const uint8_t* pSrcB, int32_t iSrcStrideB, int32_t iHeight);
+void McHorVer20Width17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight);// width+1
+void McHorVer20Width9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iHeight);// width+1
+void McHorVer20Width5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iHeight);// width+1
+void McHorVer02Height17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight);// height+1
+void McHorVer02Height9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight);// height+1
+void McHorVer02Height5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight);// height+1
+void McHorVer22Width17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight);//width+1&&height+1
+void McHorVer22Width9_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iHeight);//width+1&&height+1
+void McHorVer22Width5_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iHeight);//width+1&&height+1
+#endif
+
+#if defined(X86_ASM)
+//***************************************************************************//
+//                       MMXEXT definition                                   //
+//***************************************************************************//
+void McHorVer20WidthEq4_mmx (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             int32_t iHeight);
+void McChromaWidthEq4_mmx (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                           const uint8_t* kpABCD, int32_t iHeight);
+void McCopyWidthEq8_mmx (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                         int32_t iHeight);
+void PixelAvgWidthEq4_mmx (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                           const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+void PixelAvgWidthEq8_mmx (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                           const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+
+//***************************************************************************//
+//                       SSE2 definition                                     //
+//***************************************************************************//
+void McChromaWidthEq8_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            const uint8_t* kpABCD, int32_t iHeight);
+void McCopyWidthEq16_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                           int32_t iHeight);
+void McHorVer20WidthEq8_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer20WidthEq16_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                               int32_t iHeight);
+void McHorVer02WidthEq8_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iHeight);
+void McHorVer22Width8HorFirst_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iHeight);
+void McHorVer22Width8VerLastAlign_sse2 (const uint8_t* pTap, int32_t iTapStride, uint8_t* pDst, int32_t iDstStride,
+                                        int32_t iWidth, int32_t iHeight);
+void McHorVer22Width8VerLastUnAlign_sse2 (const uint8_t* pTap, int32_t iTapStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iWidth, int32_t iHeight);
+
+void PixelAvgWidthEq16_sse2 (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                             const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iHeight);
+
+void McHorVer20Width9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                int32_t iWidth,
+                                int32_t iHeight);
+void McHorVer20Width5_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                int32_t iWidth, int32_t iHeight);
+
+void McHorVer02Height9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight);
+void McHorVer02Height5_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth, int32_t iHeight);
+
+void McHorVer22HorFirst_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pTap, int32_t iTapStride,
+                              int32_t iWidth,
+                              int32_t iHeight);
+void McHorVer22Width5HorFirst_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pTap, int32_t iTapStride,
+                              int32_t iWidth, int32_t iHeight);
+void McHorVer22Width4VerLastAlign_sse2 (const uint8_t* pTap, int32_t iTapStride, uint8_t* pDst, int32_t iDstStride,
+                                        int32_t iWidth, int32_t iHeight);
+void McHorVer22Width4VerLastUnAlign_sse2 (const uint8_t* pTap, int32_t iTapStride, uint8_t* pDst, int32_t iDstStride,
+        int32_t iWidth, int32_t iHeight);
+
+//***************************************************************************//
+//                       SSE3 definition                                     //
+//***************************************************************************//
+void McCopyWidthEq16_sse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                           int32_t iHeight);
+
+//***************************************************************************//
+//                       SSSE3 definition                                    //
+//***************************************************************************//
+void McChromaWidthEq8_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                             const uint8_t* kpABCD, int32_t iHeight);
+void McHorVer02_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight);
+void McHorVer02Width4S16ToU8_ssse3 (const int16_t* pSrc, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02Width5S16ToU8_ssse3 (const int16_t* pSrc, int32_t iSrcStride,
+                                    uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02WidthGe8S16ToU8_ssse3 (const int16_t* pSrc, int32_t iSrcStride,
+                                      uint8_t* pDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight);
+void McHorVer20_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight);
+void McHorVer20Width4U8ToS16_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, int16_t* pDst, int32_t iHeight);
+void McHorVer20Width5Or9Or17_ssse3 (const uint8_t* pSrc, int32_t iSrcStride,
+                                    uint8_t* pDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight);
+void McHorVer20Width8U8ToS16_ssse3 (const uint8_t* pSrc, int32_t iSrcStride,
+                                    int16_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer20Width9Or17U8ToS16_ssse3 (const uint8_t* pSrc, int32_t iSrcStride,
+                                        int16_t* pDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight);
+
+//***************************************************************************//
+//                       AVX2 definition                                     //
+//***************************************************************************//
+#ifdef HAVE_AVX2
+void McHorVer02_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight);
+void McHorVer02Width4S16ToU8_avx2 (const int16_t* pSrc, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02Width5S16ToU8_avx2 (const int16_t* pSrc, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02Width8S16ToU8_avx2 (const int16_t* pSrc, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02Width9S16ToU8_avx2 (const int16_t* pSrc, uint8_t* pDst, int32_t iDstStride, int32_t iHeight);
+void McHorVer02Width16Or17S16ToU8_avx2 (const int16_t* pSrc, int32_t iSrcStride,
+                                        uint8_t* pDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight);
+void McHorVer20_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight);
+void McHorVer20Width5Or9Or17_avx2 (const uint8_t* pSrc, int32_t iSrcStride,
+                                   uint8_t* pDst, int32_t iDstStride, int32_t iWidth, int32_t iHeight);
+void McHorVer20Width4U8ToS16_avx2 (const uint8_t* pSrc, int32_t iSrcStride, int16_t* pDst, int32_t iHeight);
+void McHorVer20Width8U8ToS16_avx2 (const uint8_t* pSrc, int32_t iSrcStride, int16_t* pDst, int32_t iHeight);
+void McHorVer20Width16U8ToS16_avx2 (const uint8_t* pSrc, int32_t iSrcStride, int16_t* pDst, int32_t iHeight);
+void McHorVer20Width17U8ToS16_avx2 (const uint8_t* pSrc, int32_t iSrcStride, int16_t* pDst, int32_t iHeight);
+#endif //HAVE_AVX2
+
+#endif //X86_ASM
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif//MC_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/measure_time.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/measure_time.h
new file mode 100644
index 0000000000..e38280897d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/measure_time.h
@@ -0,0 +1,88 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    measure_time.h
+ *
+ * \brief   time cost measure utilization
+ *
+ * \date    04/28/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_TIME_COST_MEASURE_UTIL_H__
+#define WELS_TIME_COST_MEASURE_UTIL_H__
+
+#include <stdlib.h>
+
+#include "typedefs.h"
+#ifndef _WIN32
+#include <sys/time.h>
+#else
+#include <windows.h>
+#endif
+#include <time.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif//__cplusplus
+
+/*!
+ * \brief   time cost measure utilization
+ * \param   void
+ * \return  time elapsed since run (unit: microsecond)
+ */
+
+static inline int64_t WelsTime (void) {
+#ifndef _WIN32
+  struct timeval tv_date;
+
+  gettimeofday (&tv_date, NULL);
+  return ((int64_t) tv_date.tv_sec * 1000000 + (int64_t) tv_date.tv_usec);
+#else
+  static int64_t iMtimeFreq = 0;
+  int64_t iMtimeCur = 0;
+  int64_t iResult = 0;
+  if (!iMtimeFreq) {
+    QueryPerformanceFrequency ((LARGE_INTEGER*)&iMtimeFreq);
+    if (!iMtimeFreq)
+      iMtimeFreq = 1;
+  }
+  QueryPerformanceCounter ((LARGE_INTEGER*)&iMtimeCur);
+  iResult = (int64_t) ((double)iMtimeCur * 1e6 / (double)iMtimeFreq + 0.5);
+  return iResult;
+#endif//_WIN32
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//WELS_TIME_COST_MEASURE_UTIL_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/memory_align.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/memory_align.h
new file mode 100644
index 0000000000..c70c8a292f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/memory_align.h
@@ -0,0 +1,116 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#if !defined(WELS_COMMON_MEMORY_ALIGN_H__)
+#define WELS_COMMON_MEMORY_ALIGN_H__
+
+#include "typedefs.h"
+
+// NOTE: please do not clean below lines even comment, turn on for potential memory leak verify and memory usage monitor etc.
+//#define MEMORY_CHECK
+#define MEMORY_MONITOR
+#ifdef MEMORY_CHECK
+#ifndef MEMORY_MONITOR
+#define MEMORY_MONITOR
+#endif//MEMORY_MONITOR
+#endif//MEMORY_CHECK
+
+
+#ifdef MEMORY_CHECK
+#include <stdio.h>
+#endif//MEMORY_CHECK
+
+namespace WelsCommon {
+
+class CMemoryAlign {
+ public:
+CMemoryAlign (const uint32_t kuiCacheLineSize);
+virtual ~CMemoryAlign();
+
+void* WelsMallocz (const uint32_t kuiSize, const char* kpTag);
+void* WelsMalloc (const uint32_t kuiSize, const char* kpTag);
+void WelsFree (void* pPointer, const char* kpTag);
+const uint32_t WelsGetCacheLineSize() const;
+const uint32_t WelsGetMemoryUsage() const;
+
+ private:
+// private copy & assign constructors adding to fix klocwork scan issues
+CMemoryAlign (const CMemoryAlign& kcMa);
+CMemoryAlign& operator= (const CMemoryAlign& kcMa);
+
+ protected:
+uint32_t        m_nCacheLineSize;
+
+#ifdef MEMORY_MONITOR
+uint32_t        m_nMemoryUsageInBytes;
+#endif//MEMORY_MONITOR
+};
+
+/*!
+*************************************************************************************
+* \brief        malloc with zero filled utilization in Wels
+*
+* \param        kuiSize     size of memory block required
+*
+* \return       allocated memory pointer exactly, failed in case of NULL return
+*
+* \note N/A
+*************************************************************************************
+*/
+void* WelsMallocz (const uint32_t kuiSize, const char* kpTag);
+
+/*!
+*************************************************************************************
+* \brief        free utilization in Wels
+*
+* \param        pPtr    data pointer to be free.
+*                       i.e, uint8_t *pPtr = actual data to be free, argv = &pPtr.
+*
+* \return       NONE
+*
+* \note N/A
+*************************************************************************************
+*/
+void WelsFree (void* pPtr, const char* kpTag);
+
+#define WELS_SAFE_FREE(pPtr, pTag)              if (pPtr) { WelsFree(pPtr, pTag); pPtr = NULL; }
+
+#define  WELS_NEW_OP(object, type)   \
+  (type*)(new object);
+
+#define  WELS_DELETE_OP(p) \
+  if(p) delete p;            \
+  p = NULL;
+
+}
+
+#endif//WELS_COMMON_MEMORY_ALIGN_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/msa_macros.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/msa_macros.h
new file mode 100644
index 0000000000..2eef0e5b83
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/msa_macros.h
@@ -0,0 +1,2393 @@
+/*
+ * Copyright © 2020 Loongson Technology Co. Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author:  Yin Shiyou (yinshiyou-hf@loongson.cn)
+ *          Gu  Xiwei  (guxiwei-hf@loongson.cn)
+ */
+
+/*
+ * This header file is copied from loongson LSOM project.
+ * MSA macros is implemented with msa intrinsics in msa.h,
+ * and used for simplifing MSA optimization.
+ */
+
+#ifndef _MSA_MACROS_H
+#define _MSA_MACROS_H 1
+#define MSA_MACROS_VERSION 18
+#include <msa.h>
+
+#if (__mips_isa_rev >= 6)
+    #define LH(psrc)                              \
+    ( {                                           \
+        uint16_t val_lh_m = *(uint16_t *)(psrc);  \
+        val_lh_m;                                 \
+    } )
+
+    #define LW(psrc)                              \
+    ( {                                           \
+        uint32_t val_lw_m = *(uint32_t *)(psrc);  \
+        val_lw_m;                                 \
+    } )
+
+    #if (__mips == 64)
+        #define LD(psrc)                               \
+        ( {                                            \
+            uint64_t val_ld_m =  *(uint64_t *)(psrc);  \
+            val_ld_m;                                  \
+        } )
+    #else  // !(__mips == 64)
+        #define LD(psrc)                                                    \
+        ( {                                                                 \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                        \
+            uint32_t val0_ld_m, val1_ld_m;                                  \
+            uint64_t val_ld_m = 0;                                          \
+                                                                            \
+            val0_ld_m = LW(psrc_ld_m);                                      \
+            val1_ld_m = LW(psrc_ld_m + 4);                                  \
+                                                                            \
+            val_ld_m = (uint64_t) (val1_ld_m);                              \
+            val_ld_m = (uint64_t) ((val_ld_m << 32) & 0xFFFFFFFF00000000);  \
+            val_ld_m = (uint64_t) (val_ld_m | (uint64_t) val0_ld_m);        \
+                                                                            \
+            val_ld_m;                                                       \
+        } )
+    #endif  // (__mips == 64)
+
+    #define SH(val, pdst)  *(uint16_t *)(pdst) = (val);
+    #define SW(val, pdst)  *(uint32_t *)(pdst) = (val);
+    #define SD(val, pdst)  *(uint64_t *)(pdst) = (val);
+
+#else  // !(__mips_isa_rev >= 6)
+    #define LH(psrc)                                 \
+    ( {                                              \
+        uint8_t *psrc_lh_m = (uint8_t *) (psrc);     \
+        uint16_t val_lh_m;                           \
+                                                     \
+        __asm__ volatile (                           \
+            "ulh  %[val_lh_m],  %[psrc_lh_m]  \n\t"  \
+                                                     \
+            : [val_lh_m] "=r" (val_lh_m)             \
+            : [psrc_lh_m] "m" (*psrc_lh_m)           \
+        );                                           \
+                                                     \
+        val_lh_m;                                    \
+    } )
+
+    #define LW(psrc)                                 \
+    ( {                                              \
+        uint8_t *psrc_lw_m = (uint8_t *) (psrc);     \
+        uint32_t val_lw_m;                           \
+                                                     \
+        __asm__ volatile (                           \
+            "ulw  %[val_lw_m],  %[psrc_lw_m]  \n\t"  \
+                                                     \
+            : [val_lw_m] "=r" (val_lw_m)             \
+            : [psrc_lw_m] "m" (*psrc_lw_m)           \
+        );                                           \
+                                                     \
+        val_lw_m;                                    \
+    } )
+
+    #if (__mips == 64)
+        #define LD(psrc)                                 \
+        ( {                                              \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);     \
+            uint64_t val_ld_m = 0;                       \
+                                                         \
+            __asm__ volatile (                           \
+                "uld  %[val_ld_m],  %[psrc_ld_m]  \n\t"  \
+                                                         \
+                : [val_ld_m] "=r" (val_ld_m)             \
+                : [psrc_ld_m] "m" (*psrc_ld_m)           \
+            );                                           \
+                                                         \
+            val_ld_m;                                    \
+        } )
+    #else  // !(__mips == 64)
+        #define LD(psrc)                                                    \
+        ( {                                                                 \
+            uint8_t *psrc_ld_m = (uint8_t *) (psrc);                        \
+            uint32_t val0_ld_m, val1_ld_m;                                  \
+            uint64_t val_ld_m = 0;                                          \
+                                                                            \
+            val0_ld_m = LW(psrc_ld_m);                                      \
+            val1_ld_m = LW(psrc_ld_m + 4);                                  \
+                                                                            \
+            val_ld_m = (uint64_t) (val1_ld_m);                              \
+            val_ld_m = (uint64_t) ((val_ld_m << 32) & 0xFFFFFFFF00000000);  \
+            val_ld_m = (uint64_t) (val_ld_m | (uint64_t) val0_ld_m);        \
+                                                                            \
+            val_ld_m;                                                       \
+        } )
+    #endif  // (__mips == 64)
+
+    #define SH(val, pdst)                            \
+    {                                                \
+        uint8_t *pdst_sh_m = (uint8_t *) (pdst);     \
+        uint16_t val_sh_m = (val);                   \
+                                                     \
+        __asm__ volatile (                           \
+            "ush  %[val_sh_m],  %[pdst_sh_m]  \n\t"  \
+                                                     \
+            : [pdst_sh_m] "=m" (*pdst_sh_m)          \
+            : [val_sh_m] "r" (val_sh_m)              \
+        );                                           \
+    }
+
+    #define SW(val, pdst)                            \
+    {                                                \
+        uint8_t *pdst_sw_m = (uint8_t *) (pdst);     \
+        uint32_t val_sw_m = (val);                   \
+                                                     \
+        __asm__ volatile (                           \
+            "usw  %[val_sw_m],  %[pdst_sw_m]  \n\t"  \
+                                                     \
+            : [pdst_sw_m] "=m" (*pdst_sw_m)          \
+            : [val_sw_m] "r" (val_sw_m)              \
+        );                                           \
+    }
+
+    #define SD(val, pdst)                                             \
+    {                                                                 \
+        uint8_t *pdst_sd_m = (uint8_t *) (pdst);                      \
+        uint32_t val0_sd_m, val1_sd_m;                                \
+                                                                      \
+        val0_sd_m = (uint32_t) ((val) & 0x00000000FFFFFFFF);          \
+        val1_sd_m = (uint32_t) (((val) >> 32) & 0x00000000FFFFFFFF);  \
+                                                                      \
+        SW(val0_sd_m, pdst_sd_m);                                     \
+        SW(val1_sd_m, pdst_sd_m + 4);                                 \
+    }
+#endif // (__mips_isa_rev >= 6)
+
+
+
+
+
+
+/* Description : Load vector elements with stride.
+ * Arguments   : Inputs  - psrc    (source pointer to load from)
+ *                       - stride
+ *               Outputs - out0, out1...
+ *               Return Type - as per RTYPE
+ * Details     : Loads elements in 'out0' from (psrc).
+ *               Loads elements in 'out1' from (psrc + stride).
+ */
+#define MSA_LD_V(RTYPE, psrc, out) (out) = *((RTYPE *)(psrc));
+
+#define MSA_LD_V2(RTYPE, psrc, stride, out0, out1)  \
+{                                                   \
+    MSA_LD_V(RTYPE, (psrc), out0);                  \
+    MSA_LD_V(RTYPE, (psrc) + (stride), out1);       \
+}
+
+#define MSA_LD_V4(RTYPE, psrc, stride, out0, out1, out2, out3)     \
+{                                                                  \
+    MSA_LD_V2(RTYPE, (psrc), stride, out0, out1);                  \
+    MSA_LD_V2(RTYPE, (psrc) + 2 * (stride) , stride, out2, out3);  \
+}
+
+#define MSA_LD_V8(RTYPE, psrc, stride, out0, out1, out2, out3,                \
+                  out4, out5, out6, out7)                                     \
+{                                                                             \
+    MSA_LD_V4(RTYPE, (psrc), stride, out0, out1, out2, out3);                 \
+    MSA_LD_V4(RTYPE, (psrc) + 4 * (stride), stride, out4, out5, out6, out7);  \
+}
+
+/* Description : Store vectors with stride.
+ * Arguments   : Inputs  - in0, in1...  (source vector to be stored)
+ *                       - stride
+ *               Outputs - pdst    (destination pointer to store to)
+ * Details     : Stores elements from 'in0' to (pdst).
+ *               Stores elements from 'in1' to (pdst + stride).
+ */
+#define MSA_ST_V(RTYPE, in, pdst) *((RTYPE *)(pdst)) = (in);
+
+#define MSA_ST_V2(RTYPE, in0, in1, pdst, stride)  \
+{                                                 \
+    MSA_ST_V(RTYPE, in0, (pdst));                 \
+    MSA_ST_V(RTYPE, in1, (pdst) + (stride));      \
+}
+
+#define MSA_ST_V4(RTYPE, in0, in1, in2, in3, pdst, stride)      \
+{                                                               \
+    MSA_ST_V2(RTYPE, in0, in1, (pdst), stride);                 \
+    MSA_ST_V2(RTYPE, in2, in3, (pdst) + 2 * (stride), stride);  \
+}
+
+#define MSA_ST_V8(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7, pdst, stride) \
+{                                                                              \
+    MSA_ST_V4(RTYPE, in0, in1, in2, in3, (pdst), stride);                      \
+    MSA_ST_V4(RTYPE, in4, in5, in6, in7, (pdst) + 4 * (stride), stride);       \
+}
+
+/* Description : Store half word elements of vector with stride.
+ * Arguments   : Inputs  - in      (source vector)
+ *                       - pdst    (destination pointer to store to)
+ *                       - stride
+ * Details     : Stores half word 'idx0' from 'in' to (pdst).
+ *               Stores half word 'idx1' from 'in' to (pdst + stride).
+ *               Similar for other elements.
+ */
+#define MSA_ST_H(in, idx, pdst)                          \
+{                                                        \
+    uint16_t out0_m;                                     \
+    out0_m = __msa_copy_u_h((v8i16) in, idx);            \
+    SH(out0_m, (pdst));                                  \
+}
+#define MSA_ST_H2(in, idx0, idx1, pdst, stride)          \
+{                                                        \
+    uint16_t out0_m, out1_m;                             \
+    out0_m = __msa_copy_u_h((v8i16) in, idx0);           \
+    out1_m = __msa_copy_u_h((v8i16) in, idx1);           \
+    SH(out0_m, (pdst));                                  \
+    SH(out1_m, (pdst) + stride);                         \
+}
+#define MSA_ST_H4(in, idx0, idx1, idx2, idx3, pdst, stride)          \
+{                                                                    \
+    uint16_t out0_m, out1_m, out2_m, out3_m;                         \
+    out0_m = __msa_copy_u_h((v8i16) in, idx0);                       \
+    out1_m = __msa_copy_u_h((v8i16) in, idx1);                       \
+    out2_m = __msa_copy_u_h((v8i16) in, idx2);                       \
+    out3_m = __msa_copy_u_h((v8i16) in, idx3);                       \
+    SH(out0_m, (pdst));                                              \
+    SH(out1_m, (pdst) + stride);                                     \
+    SH(out2_m, (pdst) + 2 * stride);                                 \
+    SH(out3_m, (pdst) + 3 * stride);                                 \
+}
+#define MSA_ST_H8(in, idx0, idx1, idx2, idx3, idx4, idx5,            \
+              idx6, idx7, pdst, stride)                              \
+{                                                                    \
+    MSA_ST_H4(in, idx0, idx1, idx2, idx3, pdst, stride)              \
+    MSA_ST_H4(in, idx4, idx5, idx6, idx7, (pdst) + 4*stride, stride) \
+}
+
+/* Description : Store word elements of vector with stride.
+ * Arguments   : Inputs  - in      (source vector)
+ *                       - pdst    (destination pointer to store to)
+ *                       - stride
+ * Details     : Stores word 'idx0' from 'in' to (pdst).
+ *               Stores word 'idx1' from 'in' to (pdst + stride).
+ *               Similar for other elements.
+ */
+#define MSA_ST_W(in, idx, pdst)                          \
+{                                                        \
+    uint32_t out0_m;                                     \
+    out0_m = __msa_copy_u_w((v4i32) in, idx);            \
+    SW(out0_m, (pdst));                                  \
+}
+#define MSA_ST_W2(in, idx0, idx1, pdst, stride)          \
+{                                                        \
+    uint32_t out0_m, out1_m;                             \
+    out0_m = __msa_copy_u_w((v4i32) in, idx0);           \
+    out1_m = __msa_copy_u_w((v4i32) in, idx1);           \
+    SW(out0_m, (pdst));                                  \
+    SW(out1_m, (pdst) + stride);                         \
+}
+#define MSA_ST_W4(in, idx0, idx1, idx2, idx3, pdst, stride)         \
+{                                                                   \
+    uint32_t out0_m, out1_m, out2_m, out3_m;                        \
+    out0_m = __msa_copy_u_w((v4i32) in, idx0);                      \
+    out1_m = __msa_copy_u_w((v4i32) in, idx1);                      \
+    out2_m = __msa_copy_u_w((v4i32) in, idx2);                      \
+    out3_m = __msa_copy_u_w((v4i32) in, idx3);                      \
+    SW(out0_m, (pdst));                                             \
+    SW(out1_m, (pdst) + stride);                                    \
+    SW(out2_m, (pdst) + 2*stride);                                  \
+    SW(out3_m, (pdst) + 3*stride);                                  \
+}
+#define MSA_ST_W8(in0, in1, idx0, idx1, idx2, idx3,                 \
+              idx4, idx5, idx6, idx7, pdst, stride)                 \
+{                                                                   \
+    MSA_ST_W4(in0, idx0, idx1, idx2, idx3, pdst, stride)            \
+    MSA_ST_W4(in1, idx4, idx5, idx6, idx7, pdst + 4*stride, stride) \
+}
+
+/* Description : Store double word elements of vector with stride.
+ * Arguments   : Inputs  - in      (source vector)
+ *                       - pdst    (destination pointer to store to)
+ *                       - stride
+ * Details     : Stores double word 'idx0' from 'in' to (pdst).
+ *               Stores double word 'idx1' from 'in' to (pdst + stride).
+ *               Similar for other elements.
+ */
+#define MSA_ST_D(in, idx, pdst)                    \
+{                                                  \
+    uint64_t out0_m;                               \
+    out0_m = __msa_copy_u_d((v2i64) in, idx);      \
+    SD(out0_m, (pdst));                            \
+}
+#define MSA_ST_D2(in, idx0, idx1, pdst, stride)    \
+{                                                  \
+    uint64_t out0_m, out1_m;                       \
+    out0_m = __msa_copy_u_d((v2i64) in, idx0);     \
+    out1_m = __msa_copy_u_d((v2i64) in, idx1);     \
+    SD(out0_m, (pdst));                            \
+    SD(out1_m, (pdst) + stride);                   \
+}
+#define MSA_ST_D4(in0, in1, idx0, idx1, idx2, idx3, pdst, stride)          \
+{                                                                          \
+    uint64_t out0_m, out1_m, out2_m, out3_m;                               \
+    out0_m = __msa_copy_u_d((v2i64) in0, idx0);                            \
+    out1_m = __msa_copy_u_d((v2i64) in0, idx1);                            \
+    out2_m = __msa_copy_u_d((v2i64) in1, idx2);                            \
+    out3_m = __msa_copy_u_d((v2i64) in1, idx3);                            \
+    SD(out0_m, (pdst));                                                    \
+    SD(out1_m, (pdst) + stride);                                           \
+    SD(out2_m, (pdst) + 2 * stride);                                       \
+    SD(out3_m, (pdst) + 3 * stride);                                       \
+}
+#define MSA_ST_D8(in0, in1, in2, in3, idx0, idx1, idx2, idx3,              \
+              idx4, idx5, idx6, idx7, pdst, stride)                        \
+{                                                                          \
+    MSA_ST_D4(in0, in1, idx0, idx1, idx2, idx3, pdst, stride)              \
+    MSA_ST_D4(in2, in3, idx4, idx5, idx6, idx7, pdst + 4 * stride, stride) \
+}
+
+/* Description : Shuffle byte vector elements as per mask vector.
+ * Arguments   : Inputs  - in0, in1  (source vectors)
+ *                       - mask      (mask vectors)
+ *               Outputs - out       (dstination vectors)
+ *               Return Type - as per RTYPE
+ * Details     : Selective byte elements from 'in0' & 'in1' are copied to 'out' as
+ *               per control vector 'mask'.
+ */
+#define MSA_VSHF_B(RTYPE, in0, in1, mask, out)                             \
+{                                                                          \
+    out = (RTYPE) __msa_vshf_b((v16i8) mask, (v16i8) in0, (v16i8) in1);    \
+}
+
+#define MSA_VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1)   \
+{                                                                          \
+    MSA_VSHF_B(RTYPE, in0, in1, mask0, out0)                               \
+    MSA_VSHF_B(RTYPE, in2, in3, mask1, out1)                               \
+}
+
+#define MSA_VSHF_B4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,         \
+                    mask0, mask1, mask2, mask3, out0, out1, out2, out3)    \
+{                                                                          \
+    MSA_VSHF_B2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1);      \
+    MSA_VSHF_B2(RTYPE, in4, in5, in6, in7, mask2, mask3, out2, out3);      \
+}
+
+/* Description : Shuffle halfword vector elements as per mask vector.
+ * Arguments   : Inputs  - in0, in1  (source vectors)
+ *                       - mask      (mask vectors)
+ *               Outputs - out       (dstination vectors)
+ *               Return Type - as per RTYPE
+ * Details     : Selective halfword elements from 'in0' & 'in1' are copied to 'out' as
+ *               per control vector 'mask'.
+ */
+#define MSA_VSHF_H(RTYPE, in0, in1, mask, out)                             \
+{                                                                          \
+    out = (RTYPE) __msa_vshf_h((v8i16) mask, (v8i16) in0, (v8i16) in1);    \
+}
+
+#define MSA_VSHF_H2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1)   \
+{                                                                          \
+    MSA_VSHF_H(RTYPE, in0, in1, mask0, out0)                               \
+    MSA_VSHF_H(RTYPE, in2, in3, mask1, out1)                               \
+}
+
+#define MSA_VSHF_H4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,         \
+                    mask0, mask1, mask2, mask3, out0, out1, out2, out3)    \
+{                                                                          \
+    MSA_VSHF_H2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1);      \
+    MSA_VSHF_H2(RTYPE, in4, in5, in6, in7, mask2, mask3, out2, out3);      \
+}
+
+/* Description : Shuffle word vector elements as per mask vector.
+ * Arguments   : Inputs  - in0, in1  (source vectors)
+ *                       - mask      (mask vectors)
+ *               Outputs - out       (dstination vectors)
+ *               Return Type - as per RTYPE
+ * Details     : Selective word elements from 'in0' & 'in1' are copied to 'out' as
+ *               per control vector 'mask'.
+ */
+#define MSA_VSHF_W(RTYPE, in0, in1, mask, out)                             \
+{                                                                          \
+    out = (RTYPE) __msa_vshf_w((v4i32) mask, (v4i32) in0, (v4i32) in1);    \
+}
+
+#define MSA_VSHF_W2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1)   \
+{                                                                          \
+    MSA_VSHF_W(RTYPE, in0, in1, mask0, out0)                               \
+    MSA_VSHF_W(RTYPE, in2, in3, mask1, out1)                               \
+}
+
+#define MSA_VSHF_W4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,         \
+                    mask0, mask1, mask2, mask3, out0, out1, out2, out3)    \
+{                                                                          \
+    MSA_VSHF_W2(RTYPE, in0, in1, in2, in3, mask0, mask1, out0, out1);      \
+    MSA_VSHF_W2(RTYPE, in4, in5, in6, in7, mask2, mask3, out2, out3);      \
+}
+
+/* Description : Interleave even byte elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even byte elements of 'in0' and even byte
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVEV_B(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvev_b((v16i8) in0, (v16i8) in1);  \
+}
+
+#define MSA_ILVEV_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVEV_B(RTYPE, in0, in1, out0);                      \
+    MSA_ILVEV_B(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVEV_B4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVEV_B2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVEV_B2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave even half word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even half word elements of 'in0' and even half word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVEV_H(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvev_h((v8i16) in0, (v8i16) in1);  \
+}
+
+#define MSA_ILVEV_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVEV_H(RTYPE, in0, in1, out0);                      \
+    MSA_ILVEV_H(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVEV_H4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVEV_H2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVEV_H2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave even word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even word elements of 'in0' and even word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVEV_W(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvev_w((v2i64) in0, (v2i64) in1);  \
+}
+
+#define MSA_ILVEV_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVEV_W(RTYPE, in0, in1, out0);                      \
+    MSA_ILVEV_W(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVEV_W4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVEV_W2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVEV_W2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave even double word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even double word elements of 'in0' and even double word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVEV_D(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvev_d((v2i64) in0, (v2i64) in1);  \
+}
+
+#define MSA_ILVEV_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVEV_D(RTYPE, in0, in1, out0);                      \
+    MSA_ILVEV_D(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVEV_D4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVEV_D2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVEV_D2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave odd byte elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd byte elements of 'in0' and odd byte
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVOD_B(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvod_b((v16i8) in0, (v16i8) in1);  \
+}
+
+#define MSA_ILVOD_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVOD_B(RTYPE, in0, in1, out0);                      \
+    MSA_ILVOD_B(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVOD_B4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVOD_B2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVOD_B2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave odd half word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd half word elements of 'in0' and odd half word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVOD_H(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvod_h((v8i16) in0, (v8i16) in1);  \
+}
+
+#define MSA_ILVOD_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVOD_H(RTYPE, in0, in1, out0);                      \
+    MSA_ILVOD_H(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVOD_H4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVOD_H2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVOD_H2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave odd word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd word elements of 'in0' and odd word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVOD_W(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvod_w((v4i32) in0, (v4i32) in1);  \
+}
+
+#define MSA_ILVOD_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVOD_W(RTYPE, in0, in1, out0);                      \
+    MSA_ILVOD_W(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVOD_W4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVOD_W2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVOD_W2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave odd double word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd double word elements of 'in0' and odd double word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVOD_D(RTYPE, in0, in1, out)                   \
+{                                                           \
+    out = (RTYPE) __msa_ilvod_d((v2i64) in0, (v2i64) in1);  \
+}
+
+#define MSA_ILVOD_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_ILVOD_D(RTYPE, in0, in1, out0);                      \
+    MSA_ILVOD_D(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVOD_D4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                     out0, out1, out2, out3)                         \
+{                                                                    \
+    MSA_ILVOD_D2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVOD_D2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave left half of byte elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Left half of byte elements of 'in0' and left half of byte
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVL_B(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvl_b((v16i8) in0, (v16i8) in1);  \
+}
+
+#define MSA_ILVL_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVL_B(RTYPE, in0, in1, out0);                      \
+    MSA_ILVL_B(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVL_B4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVL_B2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVL_B2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave left half of halfword elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Left half of halfword elements of 'in0' and left half of halfword
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVL_H(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvl_h((v8i16) in0, (v8i16) in1);  \
+}
+
+#define MSA_ILVL_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVL_H(RTYPE, in0, in1, out0);                      \
+    MSA_ILVL_H(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVL_H4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVL_H2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVL_H2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave left half of word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Left half of word elements of 'in0' and left half of word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVL_W(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvl_w((v4i32) in0, (v4i32) in1);  \
+}
+
+#define MSA_ILVL_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVL_W(RTYPE, in0, in1, out0);                      \
+    MSA_ILVL_W(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVL_W4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVL_W2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVL_W2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave left half of double word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Left half of double word elements of 'in0' and left half of
+ *               double word elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVL_D(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvl_d((v2i64) in0, (v2i64) in1);  \
+}
+
+#define MSA_ILVL_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVL_D(RTYPE, in0, in1, out0);                      \
+    MSA_ILVL_D(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVL_D4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVL_D2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVL_D2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave right half of byte elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Right half of byte elements of 'in0' and right half of byte
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVR_B(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvr_b((v16i8) in0, (v16i8) in1);  \
+}
+
+#define MSA_ILVR_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVR_B(RTYPE, in0, in1, out0);                      \
+    MSA_ILVR_B(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVR_B4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVR_B2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVR_B2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave right half of halfword elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Right half of halfword elements of 'in0' and right half of halfword
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVR_H(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvr_h((v8i16) in0, (v8i16) in1);  \
+}
+
+#define MSA_ILVR_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVR_H(RTYPE, in0, in1, out0);                      \
+    MSA_ILVR_H(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVR_H4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVR_H2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVR_H2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave right half of word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Right half of word elements of 'in0' and right half of word
+ *               elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVR_W(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvr_w((v4i32) in0, (v4i32) in1);  \
+}
+
+#define MSA_ILVR_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVR_W(RTYPE, in0, in1, out0);                      \
+    MSA_ILVR_W(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVR_W4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVR_W2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVR_W2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave right half of double word elements from vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Right half of double word elements of 'in0' and right half of
+ *               double word elements of 'in1' are interleaved and copied to 'out'.
+ */
+#define MSA_ILVR_D(RTYPE, in0, in1, out)                   \
+{                                                          \
+    out = (RTYPE) __msa_ilvr_d((v2i64) in0, (v2i64) in1);  \
+}
+
+#define MSA_ILVR_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                           \
+    MSA_ILVR_D(RTYPE, in0, in1, out0);                      \
+    MSA_ILVR_D(RTYPE, in2, in3, out1);                      \
+}
+
+#define MSA_ILVR_D4(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                    out0, out1, out2, out3)                         \
+{                                                                   \
+    MSA_ILVR_D2(RTYPE, in0, in1, in2, in3, out0, out1);             \
+    MSA_ILVR_D2(RTYPE, in4, in5, in6, in7, out2, out3);             \
+}
+
+/* Description : Interleave both left and right half of input vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out0, out1
+ *               Return Type - as per RTYPE
+ * Details     : Right half of byte elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out0'.
+ *               Left half of byte elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out1'.
+ */
+#define MSA_ILVRL_B2(RTYPE, in0, in1, out0, out1)  \
+{                                                  \
+    MSA_ILVR_B(RTYPE, in0, in1, out0);             \
+    MSA_ILVL_B(RTYPE, in0, in1, out1);             \
+}
+
+#define MSA_ILVRL_B4(RTYPE, in0, in1, in2, in3,    \
+                     out0, out1, out2, out3)       \
+{                                                  \
+    MSA_ILVRL_B2(RTYPE, in0, in1, out0, out1);     \
+    MSA_ILVRL_B2(RTYPE, in2, in3, out2, out3);     \
+}
+
+/* Description : Interleave both left and right half of input vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out0, out1
+ *               Return Type - as per RTYPE
+ * Details     : Right half of halfword elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out0'.
+ *               Left half of halfword elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out1'.
+ */
+#define MSA_ILVRL_H2(RTYPE, in0, in1, out0, out1)  \
+{                                                  \
+    MSA_ILVR_H(RTYPE, in0, in1, out0);             \
+    MSA_ILVL_H(RTYPE, in0, in1, out1);             \
+}
+
+#define MSA_ILVRL_H4(RTYPE, in0, in1, in2, in3,    \
+                     out0, out1, out2, out3)       \
+{                                                  \
+    MSA_ILVRL_H2(RTYPE, in0, in1, out0, out1);     \
+    MSA_ILVRL_H2(RTYPE, in2, in3, out2, out3);     \
+}
+
+/* Description : Interleave both left and right half of input vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out0, out1
+ *               Return Type - as per RTYPE
+ * Details     : Right half of word elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out0'.
+ *               Left half of word elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out1'.
+ */
+#define MSA_ILVRL_W2(RTYPE, in0, in1, out0, out1)  \
+{                                                  \
+    MSA_ILVR_W(RTYPE, in0, in1, out0);             \
+    MSA_ILVL_W(RTYPE, in0, in1, out1);             \
+}
+
+#define MSA_ILVRL_W4(RTYPE, in0, in1, in2, in3,    \
+                     out0, out1, out2, out3)       \
+{                                                  \
+    MSA_ILVRL_W2(RTYPE, in0, in1, out0, out1);     \
+    MSA_ILVRL_W2(RTYPE, in2, in3, out2, out3);     \
+}
+
+/* Description : Interleave both left and right half of input vectors.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out0, out1
+ *               Return Type - as per RTYPE
+ * Details     : Right half of double word elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out0'.
+ *               Left half of double word elements from 'in0' and 'in1' are
+ *               interleaved and stored to 'out1'.
+ */
+#define MSA_ILVRL_D2(RTYPE, in0, in1, out0, out1)  \
+{                                                  \
+    MSA_ILVR_D(RTYPE, in0, in1, out0);             \
+    MSA_ILVL_D(RTYPE, in0, in1, out1);             \
+}
+
+#define MSA_ILVRL_D4(RTYPE, in0, in1, in2, in3,    \
+                     out0, out1, out2, out3)       \
+{                                                  \
+    MSA_ILVRL_D2(RTYPE, in0, in1, out0, out1);     \
+    MSA_ILVRL_D2(RTYPE, in2, in3, out2, out3);     \
+}
+
+/* Description : Indexed byte elements are replicated to all elements in
+ *               output vector.
+ * Arguments   : Inputs  - in, idx
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : 'idx' element value from 'in' vector is replicated to all
+ *               elements in 'out' vector.
+ *               Valid index range for halfword operation is 0-7.
+ */
+#define MSA_SPLATI_B(RTYPE, in, idx, out)                 \
+{                                                         \
+    out = (RTYPE) __msa_splati_b((v16i8) in, idx);        \
+}
+
+#define MSA_SPLATI_B2(RTYPE, in, idx0, idx1, out0, out1)  \
+{                                                         \
+    MSA_SPLATI_B(RTYPE, in, idx0, out0)                   \
+    MSA_SPLATI_B(RTYPE, in, idx1, out1)                   \
+}
+
+#define MSA_SPLATI_B4(RTYPE, in, idx0, idx1, idx2, idx3,  \
+                      out0, out1, out2, out3)             \
+{                                                         \
+    MSA_SPLATI_B2(RTYPE, in, idx0, idx1, out0, out1)      \
+    MSA_SPLATI_B2(RTYPE, in, idx2, idx3, out2, out3)      \
+}
+
+/* Description : Indexed halfword elements are replicated to all elements in
+ *               output vector.
+ * Arguments   : Inputs  - in, idx
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : 'idx' element value from 'in' vector is replicated to all
+ *               elements in 'out' vector.
+ *               Valid index range for halfword operation is 0-7.
+ */
+#define MSA_SPLATI_H(RTYPE, in, idx, out)                 \
+{                                                         \
+    out = (RTYPE) __msa_splati_h((v8i16) in, idx);        \
+}
+
+#define MSA_SPLATI_H2(RTYPE, in, idx0, idx1, out0, out1)  \
+{                                                         \
+    MSA_SPLATI_H(RTYPE, in, idx0, out0)                   \
+    MSA_SPLATI_H(RTYPE, in, idx1, out1)                   \
+}
+
+#define MSA_SPLATI_H4(RTYPE, in, idx0, idx1, idx2, idx3,  \
+                      out0, out1, out2, out3)             \
+{                                                         \
+    MSA_SPLATI_H2(RTYPE, in, idx0, idx1, out0, out1)      \
+    MSA_SPLATI_H2(RTYPE, in, idx2, idx3, out2, out3)      \
+}
+
+/* Description : Indexed word elements are replicated to all elements in
+ *               output vector.
+ * Arguments   : Inputs  - in, idx
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : 'idx' element value from 'in' vector is replicated to all
+ *               elements in 'out' vector.
+ *               Valid index range for halfword operation is 0-3.
+ */
+#define MSA_SPLATI_W(RTYPE, in, idx, out)                 \
+{                                                         \
+    out = (RTYPE) __msa_splati_w((v4i32) in, idx);        \
+}
+
+#define MSA_SPLATI_W2(RTYPE, in, idx0, idx1, out0, out1)  \
+{                                                         \
+    MSA_SPLATI_W(RTYPE, in, idx0, out0)                   \
+    MSA_SPLATI_W(RTYPE, in, idx1, out1)                   \
+}
+
+#define MSA_SPLATI_W4(RTYPE, in, idx0, idx1, idx2, idx3,  \
+                      out0, out1, out2, out3)             \
+{                                                         \
+    MSA_SPLATI_W2(RTYPE, in, idx0, idx1, out0, out1)      \
+    MSA_SPLATI_W2(RTYPE, in, idx2, idx3, out2, out3)      \
+}
+
+/* Description : Pack even byte elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even byte elements of 'in0' are copied to the left half of
+ *               'out' & even byte elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKEV_B(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckev_b((v16i8) in0, (v16i8) in1);   \
+}
+
+#define MSA_PCKEV_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKEV_B(RTYPE, in0, in1, out0)                       \
+    MSA_PCKEV_B(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKEV_B4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKEV_B2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKEV_B2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack even halfword elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even halfword elements of 'in0' are copied to the left half of
+ *               'out' & even halfword elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKEV_H(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckev_h((v8i16) in0, (v8i16) in1);   \
+}
+
+#define MSA_PCKEV_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKEV_H(RTYPE, in0, in1, out0)                       \
+    MSA_PCKEV_H(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKEV_H4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKEV_H2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKEV_H2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack even word elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even word elements of 'in0' are copied to the left half of
+ *               'out' & even word elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKEV_W(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckev_w((v4i32) in0, (v4i32) in1);   \
+}
+
+#define MSA_PCKEV_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKEV_W(RTYPE, in0, in1, out0)                       \
+    MSA_PCKEV_W(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKEV_W4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKEV_W2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKEV_W2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack even double word elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Even double word elements of 'in0' are copied to the left
+ *               half of 'out' & even double word elements of 'in1' are
+ *               copied to the right half of 'out'.
+ */
+#define MSA_PCKEV_D(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckev_d((v2i64) in0, (v2i64) in1);   \
+}
+
+#define MSA_PCKEV_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKEV_D(RTYPE, in0, in1, out0)                       \
+    MSA_PCKEV_D(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKEV_D4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKEV_D2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKEV_D2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack odd byte elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd byte elements of 'in0' are copied to the left half of
+ *               'out' & odd byte elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKOD_B(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckod_b((v16i8) in0, (v16i8) in1);   \
+}
+
+#define MSA_PCKOD_B2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKOD_B(RTYPE, in0, in1, out0)                       \
+    MSA_PCKOD_B(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKOD_B4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKOD_B2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKOD_B2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack odd halfword elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd halfword elements of 'in0' are copied to the left half of
+ *               'out' & odd halfword elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKOD_H(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckod_h((v8i16) in0, (v8i16) in1);   \
+}
+
+#define MSA_PCKOD_H2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKOD_H(RTYPE, in0, in1, out0)                       \
+    MSA_PCKOD_H(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKOD_H4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKOD_H2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKOD_H2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack odd word elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd word elements of 'in0' are copied to the left half of
+ *               'out' & odd word elements of 'in1' are copied to the right
+ *               half of 'out'.
+ */
+#define MSA_PCKOD_W(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckod_w((v4i32) in0, (v4i32) in1);   \
+}
+
+#define MSA_PCKOD_W2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKOD_W(RTYPE, in0, in1, out0)                       \
+    MSA_PCKOD_W(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKOD_W4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKOD_W2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKOD_W2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Pack odd double word elements of vector pairs.
+ * Arguments   : Inputs  - in0, in1
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Odd double word elements of 'in0' are copied to the left
+ *               half of 'out' & odd double word elements of 'in1' are
+ *               copied to the right half of 'out'.
+ */
+#define MSA_PCKOD_D(RTYPE, in0, in1, out)                    \
+{                                                            \
+    out = (RTYPE) __msa_pckod_d((v2i64) in0, (v2i64) in1);   \
+}
+
+#define MSA_PCKOD_D2(RTYPE, in0, in1, in2, in3, out0, out1)  \
+{                                                            \
+    MSA_PCKOD_D(RTYPE, in0, in1, out0)                       \
+    MSA_PCKOD_D(RTYPE, in2, in3, out1)                       \
+}
+
+#define MSA_PCKOD_D4(RTYPE, in0, in1, in2, in3, in4, in5,    \
+                     in6, in7, out0, out1, out2, out3)       \
+{                                                            \
+    MSA_PCKOD_D2(RTYPE, in0, in1, in2, in3, out0, out1)      \
+    MSA_PCKOD_D2(RTYPE, in4, in5, in6, in7, out2, out3)      \
+}
+
+/* Description : Dot product of unsigned byte vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Unsigned byte elements from 'mult' are multiplied with
+ *               unsigned byte elements from 'cnst' producing a result
+ *               twice the size of input i.e. unsigned halfword.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added together and stored to the out vector.
+ */
+#define MSA_DOTP_UB(RTYPE, mult, cnst, out)                         \
+{                                                                   \
+    out = (RTYPE) __msa_dotp_u_h((v16u8) mult, (v16u8) cnst);       \
+}
+
+#define MSA_DOTP_UB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1) \
+{                                                                   \
+    MSA_DOTP_UB(RTYPE, mult0, cnst0, out0)                          \
+    MSA_DOTP_UB(RTYPE, mult1, cnst1, out1)                          \
+}
+
+#define MSA_DOTP_UB4(RTYPE, mult0, mult1, mult2, mult3,             \
+                     cnst0, cnst1, cnst2, cnst3,                    \
+                     out0, out1, out2, out3)                        \
+{                                                                   \
+    MSA_DOTP_UB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);    \
+    MSA_DOTP_UB2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);    \
+}
+
+/* Description : Dot product of signed byte vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Signed byte elements from 'mult' are multiplied with
+ *               signed byte elements from 'cnst' producing a result
+ *               twice the size of input i.e. signed halfword.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added together and stored to the out vector.
+ */
+#define MSA_DOTP_SB(RTYPE, mult, cnst, out)                         \
+{                                                                   \
+    out = (RTYPE) __msa_dotp_s_h((v16i8) mult, (v16i8) cnst);       \
+}
+
+#define MSA_DOTP_SB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1) \
+{                                                                   \
+    MSA_DOTP_SB(RTYPE, mult0, cnst0, out0)                          \
+    MSA_DOTP_SB(RTYPE, mult1, cnst1, out1)                          \
+}
+
+#define MSA_DOTP_SB4(RTYPE, mult0, mult1, mult2, mult3,             \
+                     cnst0, cnst1, cnst2, cnst3,                    \
+                     out0, out1, out2, out3)                        \
+{                                                                   \
+    MSA_DOTP_SB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);    \
+    MSA_DOTP_SB2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);    \
+}
+
+/* Description : Dot product of unsigned halfword vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Unsigned halfword elements from 'mult' are multiplied with
+ *               unsigned halfword elements from 'cnst' producing a result
+ *               twice the size of input i.e. unsigned word.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added together and stored to the out vector.
+ */
+#define MSA_DOTP_UH(RTYPE, mult, cnst, out)                         \
+{                                                                   \
+    out = (RTYPE) __msa_dotp_u_w((v8u16) mult, (v8u16) cnst);       \
+}
+
+#define MSA_DOTP_UH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1) \
+{                                                                   \
+    MSA_DOTP_UH(RTYPE, mult0, cnst0, out0)                          \
+    MSA_DOTP_UH(RTYPE, mult1, cnst1, out1)                          \
+}
+
+#define MSA_DOTP_UH4(RTYPE, mult0, mult1, mult2, mult3,             \
+                     cnst0, cnst1, cnst2, cnst3,                    \
+                     out0, out1, out2, out3)                        \
+{                                                                   \
+    MSA_DOTP_UH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);    \
+    MSA_DOTP_UH2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);    \
+}
+
+/* Description : Dot product of signed halfword vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Signed halfword elements from 'mult' are multiplied with
+ *               signed halfword elements from 'cnst' producing a result
+ *               twice the size of input i.e. signed word.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added together and stored to the out vector.
+ */
+#define MSA_DOTP_SH(RTYPE, mult, cnst, out)                         \
+{                                                                   \
+    out = (RTYPE) __msa_dotp_s_w((v8i16) mult, (v8i16) cnst);       \
+}
+
+#define MSA_DOTP_SH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1) \
+{                                                                   \
+    MSA_DOTP_SH(RTYPE, mult0, cnst0, out0)                          \
+    MSA_DOTP_SH(RTYPE, mult1, cnst1, out1)                          \
+}
+
+#define MSA_DOTP_SH4(RTYPE, mult0, mult1, mult2, mult3,             \
+                     cnst0, cnst1, cnst2, cnst3,                    \
+                     out0, out1, out2, out3)                        \
+{                                                                   \
+    MSA_DOTP_SH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);    \
+    MSA_DOTP_SH2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);    \
+}
+
+/* Description : Dot product & addition of unsigned byte vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Unsigned byte elements from 'mult' are multiplied with
+ *               unsigned byte elements from 'cnst' producing a result
+ *               twice the size of input i.e. unsigned halfword.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added to the out vector.
+ */
+#define MSA_DPADD_UB(RTYPE, mult, cnst, out)                           \
+{                                                                      \
+    out = (RTYPE) __msa_dpadd_u_h((v8u16) out,                         \
+                                   (v16u8) mult, (v16u8) cnst);        \
+}
+
+#define MSA_DPADD_UB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1)   \
+{                                                                      \
+    MSA_DPADD_UB(RTYPE, mult0, cnst0, out0)                            \
+    MSA_DPADD_UB(RTYPE, mult1, cnst1, out1)                            \
+}
+
+#define MSA_DPADD_UB4(RTYPE, mult0, mult1, mult2, mult3,               \
+                  cnst0, cnst1, cnst2, cnst3, out0, out1, out2, out3)  \
+{                                                                      \
+    MSA_DPADD_UB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);      \
+    MSA_DPADD_UB2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);      \
+}
+
+/* Description : Dot product & addition of signed byte vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Signed byte elements from 'mult' are multiplied with
+ *               signed byte elements from 'cnst' producing a result
+ *               twice the size of input i.e. signed halfword.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added to the out vector.
+ */
+#define MSA_DPADD_SB(RTYPE, mult, cnst, out)                           \
+{                                                                      \
+    out = (RTYPE) __msa_dpadd_s_h((v8i16) out,                         \
+                                   (v16i8) mult, (v16i8) cnst);        \
+}
+
+#define MSA_DPADD_SB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1)   \
+{                                                                      \
+    MSA_DPADD_SB(RTYPE, mult0, cnst0, out0)                            \
+    MSA_DPADD_SB(RTYPE, mult1, cnst1, out1)                            \
+}
+
+#define MSA_DPADD_SB4(RTYPE, mult0, mult1, mult2, mult3,               \
+                  cnst0, cnst1, cnst2, cnst3, out0, out1, out2, out3)  \
+{                                                                      \
+    MSA_DPADD_SB2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);      \
+    MSA_DPADD_SB2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);      \
+}
+
+/* Description : Dot product & addition of unsigned halfword vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Unsigned halfword elements from 'mult' are multiplied with
+ *               unsigned halfword elements from 'cnst' producing a result
+ *               twice the size of input i.e. unsigned word.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added to the out vector.
+ */
+#define MSA_DPADD_UH(RTYPE, mult, cnst, out)                           \
+{                                                                      \
+    out = (RTYPE) __msa_dpadd_u_w((v4u32) out,                         \
+                                   (v8u16) mult, (v8u16) cnst);        \
+}
+
+#define MSA_DPADD_UH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1)   \
+{                                                                      \
+    MSA_DPADD_UH(RTYPE, mult0, cnst0, out0)                            \
+    MSA_DPADD_UH(RTYPE, mult1, cnst1, out1)                            \
+}
+
+#define MSA_DPADD_UH4(RTYPE, mult0, mult1, mult2, mult3,               \
+                  cnst0, cnst1, cnst2, cnst3, out0, out1, out2, out3)  \
+{                                                                      \
+    MSA_DPADD_UH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);      \
+    MSA_DPADD_UH2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);      \
+}
+
+/* Description : Dot product & addition of signed halfword vector elements.
+ * Arguments   : Inputs  - mult
+ *                         cnst
+ *               Outputs - out
+ *               Return Type - as per RTYPE
+ * Details     : Signed halfword elements from 'mult' are multiplied with
+ *               signed halfword elements from 'cnst' producing a result
+ *               twice the size of input i.e. signed word.
+ *               Then this multiplication results of adjacent odd-even elements
+ *               are added to the out vector.
+ */
+#define MSA_DPADD_SH(RTYPE, mult, cnst, out)                           \
+{                                                                      \
+    out = (RTYPE) __msa_dpadd_s_w((v4i32) out,                         \
+                                   (v8i16) mult, (v8i16) cnst);        \
+}
+
+#define MSA_DPADD_SH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1)   \
+{                                                                      \
+    MSA_DPADD_SH(RTYPE, mult0, cnst0, out0)                            \
+    MSA_DPADD_SH(RTYPE, mult1, cnst1, out1)                            \
+}
+
+#define MSA_DPADD_SH4(RTYPE, mult0, mult1, mult2, mult3,               \
+                  cnst0, cnst1, cnst2, cnst3, out0, out1, out2, out3)  \
+{                                                                      \
+    MSA_DPADD_SH2(RTYPE, mult0, mult1, cnst0, cnst1, out0, out1);      \
+    MSA_DPADD_SH2(RTYPE, mult2, mult3, cnst2, cnst3, out2, out3);      \
+}
+
+/* Description : Clip all signed halfword elements of input vector between min & max.
+ *               out = ((in) < (min)) ? (min) : (((in) > (max)) ? (max) : (in)).
+ * Arguments   : Inputs  - in    (input vector)
+ *                       - min   (min threshold)
+ *                       - max   (max threshold)
+ *               Outputs - in    (output vector with clipped elements)
+ * Note        : type of 'in' must be v8i16.
+ */
+#define MSA_CLIP_SH(in, min, max)                 \
+{                                                 \
+    in = __msa_max_s_h((v8i16) min, (v8i16) in);  \
+    in = __msa_min_s_h((v8i16) max, (v8i16) in);  \
+}
+
+/* Description : Clip all signed halfword elements of input vector between 0 & 255.
+ * Arguments   : Inputs  - in    (input vector)
+ *               Outputs - in    (output vector with clipped elements)
+ * Note        : type of 'in' must be v8i16.
+ */
+#define MSA_CLIP_SH_0_255(in)                   \
+{                                               \
+    in = __msa_maxi_s_h((v8i16) in, 0);         \
+    in = (v8i16) __msa_sat_u_h((v8u16) in, 7);  \
+}
+
+#define MSA_CLIP_SH2_0_255(in0, in1)            \
+{                                               \
+    MSA_CLIP_SH_0_255(in0);                     \
+    MSA_CLIP_SH_0_255(in1);                     \
+}
+
+#define MSA_CLIP_SH4_0_255(in0, in1, in2, in3)  \
+{                                               \
+    MSA_CLIP_SH2_0_255(in0, in1);               \
+    MSA_CLIP_SH2_0_255(in2, in3);               \
+}
+
+#define MSA_CLIP_SH8_0_255(in0, in1, in2, in3,  \
+                       in4, in5, in6, in7)      \
+{                                               \
+    MSA_CLIP_SH4_0_255(in0, in1, in2, in3);     \
+    MSA_CLIP_SH4_0_255(in4, in5, in6, in7);     \
+}
+
+/* Description : Clip all signed word elements of input vector between 0 & 255.
+ * Arguments   : Inputs  - in    (input vector)
+ *               Outputs - in    (output vector with clipped elements)
+ * Note        : type of 'in' must be v4i32.
+ */
+#define MSA_CLIP_SW_0_255(in)                   \
+{                                               \
+    in = __msa_maxi_s_w((v4i32) in, 0);         \
+    in = (v4i32) __msa_sat_u_w((v4u32) in, 7);  \
+}
+
+#define MSA_CLIP_SW2_0_255(in0, in1)            \
+{                                               \
+    MSA_CLIP_SW_0_255(in0);                     \
+    MSA_CLIP_SW_0_255(in1);                     \
+}
+
+#define MSA_CLIP_SW4_0_255(in0, in1, in2, in3)  \
+{                                               \
+    MSA_CLIP_SW2_0_255(in0, in1);               \
+    MSA_CLIP_SW2_0_255(in2, in3);               \
+}
+
+#define MSA_CLIP_SW8_0_255(in0, in1, in2, in3,  \
+                       in4, in5, in6, in7)      \
+{                                               \
+    MSA_CLIP_SW4_0_255(in0, in1, in2, in3);     \
+    MSA_CLIP_SW4_0_255(in4, in5, in6, in7);     \
+}
+
+/* Description : Addition of 16 unsigned byte elements.
+ *               16 unsigned byte elements of input vector are added
+ *               together and resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (unsigned byte vector)
+ *               Outputs - sum_m    (u32 sum)
+ *               Return Type - unsigned word
+ */
+#define MSA_HADD_UB_U32(in, sum_m)                       \
+{                                                        \
+    v8u16 res_m;                                         \
+    v4u32 res0_m;                                        \
+    v2u64 res1_m, res2_m;                                \
+                                                         \
+    res_m = __msa_hadd_u_h((v16u8) in, (v16u8) in);      \
+    res0_m = __msa_hadd_u_w(res_m, res_m);               \
+    res1_m = __msa_hadd_u_d(res0_m, res0_m);             \
+    res2_m = (v2u64) __msa_splati_d((v2i64) res1_m, 1);  \
+    res1_m += res2_m;                                    \
+    sum_m = __msa_copy_u_w((v4i32) res1_m, 0);           \
+}
+
+/* Description : Addition of 8 unsigned halfword elements.
+ *               8 unsigned halfword elements of input vector are added
+ *               together and resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (unsigned halfword vector)
+ *               Outputs - sum_m    (u32 sum)
+ *               Return Type - unsigned word
+ */
+#define MSA_HADD_UH_U32(in, sum_m)                       \
+{                                                        \
+    v4u32 res_m;                                         \
+    v2u64 res0_m, res1_m;                                \
+                                                         \
+    res_m = __msa_hadd_u_w((v8u16) in, (v8u16) in);      \
+    res0_m = __msa_hadd_u_d(res_m, res_m);               \
+    res1_m = (v2u64) __msa_splati_d((v2i64) res0_m, 1);  \
+    res0_m += res1_m;                                    \
+    sum_m = __msa_copy_u_w((v4i32) res0_m, 0);           \
+}
+
+/* Description : Addition of 4 unsigned word elements.
+ *               4 unsigned word elements of input vector are added together and
+ *               resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (unsigned word vector)
+ *               Outputs - sum_m    (u32 sum)
+ *               Return Type - unsigned word
+ */
+#define MSA_HADD_UW_U32(in, sum_m)                       \
+{                                                        \
+    v2u64 res0_m, res1_m;                                \
+                                                         \
+    res0_m = __msa_hadd_u_d((v4u32) in, (v4u32) in);     \
+    res1_m = (v2u64) __msa_splati_d((v2i64) res0_m, 1);  \
+    res0_m += res1_m;                                    \
+    sum_m = __msa_copy_u_w((v4i32) res0_m, 0);           \
+}
+
+/* Description : Addition of 16 signed byte elements.
+ *               16 signed byte elements of input vector are added
+ *               together and resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (signed byte vector)
+ *               Outputs - sum_m    (i32 sum)
+ *               Return Type - signed word
+ */
+#define MSA_HADD_SB_S32(in, sum_m)                   \
+{                                                    \
+    v8i16 res_m;                                     \
+    v4i32 res0_m;                                    \
+    v2i64 res1_m, res2_m;                            \
+                                                     \
+    res_m = __msa_hadd_s_h((v16i8) in, (v16i8) in);  \
+    res0_m = __msa_hadd_s_w(res_m, res_m);           \
+    res1_m = __msa_hadd_s_d(res0_m, res0_m);         \
+    res2_m = __msa_splati_d(res1_m, 1);              \
+    res1_m += res2_m;                                \
+    sum_m = __msa_copy_s_w((v4i32) res1_m, 0);       \
+}
+
+/* Description : Addition of 8 signed halfword elements.
+ *               8 signed halfword elements of input vector are added
+ *               together and resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (signed halfword vector)
+ *               Outputs - sum_m    (i32 sum)
+ *               Return Type - signed word
+ */
+#define MSA_HADD_SH_S32(in, sum_m)                   \
+{                                                    \
+    v4i32 res_m;                                     \
+    v2i64 res0_m, res1_m;                            \
+                                                     \
+    res_m = __msa_hadd_s_w((v8i16) in, (v8i16) in);  \
+    res0_m = __msa_hadd_s_d(res_m, res_m);           \
+    res1_m = __msa_splati_d(res0_m, 1);              \
+    res0_m += res1_m;                                \
+    sum_m = __msa_copy_s_w((v4i32) res0_m, 0);       \
+}
+
+/* Description : Addition of 4 signed word elements.
+ *               4 signed word elements of input vector are added together and
+ *               resulted integer sum is returned.
+ * Arguments   : Inputs  - in       (signed word vector)
+ *               Outputs - sum_m    (i32 sum)
+ *               Return Type - signed word
+ */
+#define MSA_HADD_SW_S32(in, sum_m)                    \
+{                                                     \
+    v2i64 res0_m, res1_m;                             \
+                                                      \
+    res0_m = __msa_hadd_s_d((v4i32) in, (v4i32) in);  \
+    res1_m = __msa_splati_d(res0_m, 1);               \
+    res0_m += res1_m;                                 \
+    sum_m = __msa_copy_s_w((v4i32) res0_m, 0);        \
+}
+
+/* Description : Saturate the unsigned halfword element values to the max
+ *               unsigned value of (sat_val+1 bits).
+ *               The element data width remains unchanged.
+ * Arguments   : Inputs  - in, sat_val
+ *               Outputs - in (in place)
+ *               Return Type - v8u16
+ * Details     : Each unsigned halfword element from 'in' is saturated to the
+ *               value generated with (sat_val+1) bit range.
+ *               Results are in placed to original vectors.
+ */
+#define MSA_SAT_UH(in, sat_val)                   \
+{                                                 \
+    in = __msa_sat_u_h(in, sat_val);              \
+}
+
+#define MSA_SAT_UH2(in0, in1, sat_val)            \
+{                                                 \
+    MSA_SAT_UH(in0, sat_val)                      \
+    MSA_SAT_UH(in1, sat_val)                      \
+}
+
+#define MSA_SAT_UH4(in0, in1, in2, in3, sat_val)  \
+{                                                 \
+    MSA_SAT_UH2(in0, in1, sat_val)                \
+    MSA_SAT_UH2(in2, in3, sat_val)                \
+}
+
+/* Description : Saturate the signed halfword element values to the max
+ *               signed value of (sat_val+1 bits).
+ *               The element data width remains unchanged.
+ * Arguments   : Inputs  - in, sat_val
+ *               Outputs - in (in place)
+ *               Return Type - v8i16
+ * Details     : Each signed halfword element from 'in' is saturated to the
+ *               value generated with (sat_val+1) bit range.
+ *               Results are in placed to original vectors.
+ */
+#define MSA_SAT_SH(in, sat_val)                   \
+{                                                 \
+    in = __msa_sat_s_h(in, sat_val);              \
+}
+
+#define MSA_SAT_SH2(in0, in1, sat_val)            \
+{                                                 \
+    MSA_SAT_SH(in0, sat_val)                      \
+    MSA_SAT_SH(in1, sat_val)                      \
+}
+
+#define MSA_SAT_SH4(in0, in1, in2, in3, sat_val)  \
+{                                                 \
+    MSA_SAT_SH2(in0, in1, sat_val)                \
+    MSA_SAT_SH2(in2, in3, sat_val)                \
+}
+
+/* Description : Saturate the unsigned word element values to the max
+ *               unsigned value of (sat_val+1 bits).
+ *               The element data width remains unchanged.
+ * Arguments   : Inputs  - in, sat_val
+ *               Outputs - in (in place)
+ *               Return Type - v4u32
+ * Details     : Each unsigned word element from 'in' is saturated to the
+ *               value generated with (sat_val+1) bit range.
+ *               Results are in placed to original vectors.
+ */
+#define MSA_SAT_UW(in, sat_val)                   \
+{                                                 \
+    in = __msa_sat_u_w(in, sat_val);              \
+}
+
+#define MSA_SAT_UW2(in0, in1, sat_val)            \
+{                                                 \
+    MSA_SAT_UW(in0, sat_val)                      \
+    MSA_SAT_UW(in1, sat_val)                      \
+}
+
+#define MSA_SAT_UW4(in0, in1, in2, in3, sat_val)  \
+{                                                 \
+    MSA_SAT_UW2(in0, in1, sat_val)                \
+    MSA_SAT_UW2(in2, in3, sat_val)                \
+}
+
+/* Description : Saturate the signed word element values to the max
+ *               signed value of (sat_val+1 bits).
+ *               The element data width remains unchanged.
+ * Arguments   : Inputs  - in, sat_val
+ *               Outputs - in (in place)
+ *               Return Type - v4i32
+ * Details     : Each signed word element from 'in' is saturated to the
+ *               value generated with (sat_val+1) bit range.
+ *               Results are in placed to original vectors.
+ */
+#define MSA_SAT_SW(in, sat_val)                   \
+{                                                 \
+    in = __msa_sat_s_w(in, sat_val);              \
+}
+
+#define MSA_SAT_SW2(in0, in1, sat_val)            \
+{                                                 \
+    MSA_SAT_SW(in0, sat_val)                      \
+    MSA_SAT_SW(in1, sat_val)                      \
+}
+
+#define MSA_SAT_SW4(in0, in1, in2, in3, sat_val)  \
+{                                                 \
+    MSA_SAT_SW2(in0, in1, sat_val)                \
+    MSA_SAT_SW2(in2, in3, sat_val)                \
+}
+
+/* Description : Each byte element is logically xor'ed with immediate 128.
+ * Arguments   : Inputs  - in
+ *               Outputs - in (in-place)
+ *               Return Type - as per RTYPE
+ * Details     : Each unsigned byte element from input vector 'in' is
+ *               logically xor'ed with 128 and result is in-place stored in
+ *               'in' vector.
+ */
+#define MSA_XORI_B_128(RTYPE, in)                 \
+{                                                 \
+     in = (RTYPE) __msa_xori_b((v16u8) in, 128);  \
+}
+
+#define MSA_XORI_B2_128(RTYPE, in0, in1)  \
+{                                         \
+    MSA_XORI_B_128(RTYPE, in0);           \
+    MSA_XORI_B_128(RTYPE, in1);           \
+}
+
+#define MSA_XORI_B4_128(RTYPE, in0, in1, in2, in3)  \
+{                                                   \
+    MSA_XORI_B2_128(RTYPE, in0, in1);               \
+    MSA_XORI_B2_128(RTYPE, in2, in3);               \
+}
+
+/* Description : Shift right logical all byte elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical by
+ *               number of bits respective element holds in vector 'shift' and
+ *               result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRL_B(RTYPE, in, shift)                       \
+{                                                         \
+    in = (RTYPE) __msa_srl_b((v16i8) in, (v16i8) shift);  \
+}
+
+#define MSA_SRL_B2(RTYPE, in0, in1, shift)  \
+{                                           \
+    MSA_SRL_B(RTYPE, in0, shift);           \
+    MSA_SRL_B(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRL_B4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                     \
+    MSA_SRL_B2(RTYPE, in0, in1, shift);               \
+    MSA_SRL_B2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical all halfword elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical by
+ *               number of bits respective element holds in vector 'shift' and
+ *               result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRL_H(RTYPE, in, shift)                       \
+{                                                         \
+    in = (RTYPE) __msa_srl_h((v8i16) in, (v8i16) shift);  \
+}
+
+#define MSA_SRL_H2(RTYPE, in0, in1, shift)  \
+{                                           \
+    MSA_SRL_H(RTYPE, in0, shift);           \
+    MSA_SRL_H(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRL_H4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                     \
+    MSA_SRL_H2(RTYPE, in0, in1, shift);               \
+    MSA_SRL_H2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical all word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical by
+ *               number of bits respective element holds in vector 'shift' and
+ *               result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRL_W(RTYPE, in, shift)                       \
+{                                                         \
+    in = (RTYPE) __msa_srl_w((v4i32) in, (v4i32) shift);  \
+}
+
+#define MSA_SRL_W2(RTYPE, in0, in1, shift)  \
+{                                           \
+    MSA_SRL_W(RTYPE, in0, shift);           \
+    MSA_SRL_W(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRL_W4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                     \
+    MSA_SRL_W2(RTYPE, in0, in1, shift);               \
+    MSA_SRL_W2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical all double word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical by
+ *               number of bits respective element holds in vector 'shift' and
+ *               result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRL_D(RTYPE, in, shift)                       \
+{                                                         \
+    in = (RTYPE) __msa_srl_d((v2i64) in, (v2i64) shift);  \
+}
+
+#define MSA_SRL_D2(RTYPE, in0, in1, shift)  \
+{                                           \
+    MSA_SRL_D(RTYPE, in0, shift);           \
+    MSA_SRL_D(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRL_D4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                     \
+    MSA_SRL_D2(RTYPE, in0, in1, shift);               \
+    MSA_SRL_D2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical rounded all byte elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical rounded
+ *               by number of bits respective element holds in vector 'shift'
+ *               and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRLR_B(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srlr_b((v16i8) in, (v16i8) shift);  \
+}
+
+#define MSA_SRLR_B2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRLR_B(RTYPE, in0, shift);           \
+    MSA_SRLR_B(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRLR_B4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRLR_B2(RTYPE, in0, in1, shift);               \
+    MSA_SRLR_B2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical rounded all halfword elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical rounded
+ *               by number of bits respective element holds in vector 'shift'
+ *               and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRLR_H(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srlr_h((v8i16) in, (v8i16) shift);  \
+}
+
+#define MSA_SRLR_H2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRLR_H(RTYPE, in0, shift);           \
+    MSA_SRLR_H(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRLR_H4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRLR_H2(RTYPE, in0, in1, shift);               \
+    MSA_SRLR_H2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical rounded all word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical rounded
+ *               by number of bits respective element holds in vector 'shift'
+ *               and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRLR_W(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srlr_w((v4i32) in, (v4i32) shift);  \
+}
+
+#define MSA_SRLR_W2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRLR_W(RTYPE, in0, shift);           \
+    MSA_SRLR_W(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRLR_W4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRLR_W2(RTYPE, in0, in1, shift);               \
+    MSA_SRLR_W2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right logical rounded all double word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right logical rounded
+ *               by number of bits respective element holds in vector 'shift'
+ *               and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRLR_D(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srlr_d((v2i64) in, (v2i64) shift);  \
+}
+
+#define MSA_SRLR_D2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRLR_D(RTYPE, in0, shift);           \
+    MSA_SRLR_D(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRLR_D4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRLR_D2(RTYPE, in0, in1, shift);               \
+    MSA_SRLR_D2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all byte elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in
+ *               vector 'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRAR_B(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srar_b((v16i8) in, (v16i8) shift);  \
+}
+
+#define MSA_SRAR_B2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRAR_B(RTYPE, in0, shift);           \
+    MSA_SRAR_B(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRAR_B4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRAR_B2(RTYPE, in0, in1, shift);               \
+    MSA_SRAR_B2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all halfword elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in
+ *               vector 'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRAR_H(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srar_h((v8i16) in, (v8i16) shift);  \
+}
+
+#define MSA_SRAR_H2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRAR_H(RTYPE, in0, shift);           \
+    MSA_SRAR_H(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRAR_H4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRAR_H2(RTYPE, in0, in1, shift);               \
+    MSA_SRAR_H2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in
+ *               vector 'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRAR_W(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srar_w((v4i32) in, (v4i32) shift);  \
+}
+
+#define MSA_SRAR_W2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRAR_W(RTYPE, in0, shift);           \
+    MSA_SRAR_W(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRAR_W4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRAR_W2(RTYPE, in0, in1, shift);               \
+    MSA_SRAR_W2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all double word elements
+ *               of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in
+ *               vector 'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a vector passed in.
+ */
+#define MSA_SRAR_D(RTYPE, in, shift)                       \
+{                                                          \
+    in = (RTYPE) __msa_srar_d((v2i64) in, (v2i64) shift);  \
+}
+
+#define MSA_SRAR_D2(RTYPE, in0, in1, shift)  \
+{                                            \
+    MSA_SRAR_D(RTYPE, in0, shift);           \
+    MSA_SRAR_D(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRAR_D4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                      \
+    MSA_SRAR_D2(RTYPE, in0, in1, shift);               \
+    MSA_SRAR_D2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all byte elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in vector
+ *               'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a immediate number passed in.
+ */
+#define MSA_SRARI_B(RTYPE, in, shift)                       \
+{                                                           \
+    in = (RTYPE) __msa_srari_b((v16i8) in, (v16i8) shift);  \
+}
+
+#define MSA_SRARI_B2(RTYPE, in0, in1, shift)  \
+{                                             \
+    MSA_SRARI_B(RTYPE, in0, shift);           \
+    MSA_SRARI_B(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRARI_B4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                       \
+    MSA_SRARI_B2(RTYPE, in0, in1, shift);               \
+    MSA_SRARI_B2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all halfword elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in vector
+ *               'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a immediate number passed in.
+ */
+#define MSA_SRARI_H(RTYPE, in, shift)                       \
+{                                                           \
+    in = (RTYPE) __msa_srari_h((v8i16) in, (v8i16) shift);  \
+}
+
+#define MSA_SRARI_H2(RTYPE, in0, in1, shift)  \
+{                                             \
+    MSA_SRARI_H(RTYPE, in0, shift);           \
+    MSA_SRARI_H(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRARI_H4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                       \
+    MSA_SRARI_H2(RTYPE, in0, in1, shift);               \
+    MSA_SRARI_H2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all word elements of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in vector
+ *               'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a immediate number passed in.
+ */
+#define MSA_SRARI_W(RTYPE, in, shift)                       \
+{                                                           \
+    in = (RTYPE) __msa_srari_w((v4i32) in, (v4i32) shift);  \
+}
+
+#define MSA_SRARI_W2(RTYPE, in0, in1, shift)  \
+{                                             \
+    MSA_SRARI_W(RTYPE, in0, shift);           \
+    MSA_SRARI_W(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRARI_W4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                       \
+    MSA_SRARI_W2(RTYPE, in0, in1, shift);               \
+    MSA_SRARI_W2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Shift right arithmetic rounded all double word elements
+ *               of vector.
+ * Arguments   : Inputs  - in, shift
+ *               Outputs - in (in place)
+ *               Return Type - as per RTYPE
+ * Details     : Each element of vector 'in' is shifted right arithmetic
+ *               rounded by number of bits respective element holds in
+ *               vector 'shift' and result is in place written to 'in'.
+ *               Here, 'shift' is a immediate number passed in.
+ */
+#define MSA_SRARI_D(RTYPE, in, shift)                       \
+{                                                           \
+    in = (RTYPE) __msa_srari_d((v2i64) in, (v2i64) shift);  \
+}
+
+#define MSA_SRARI_D2(RTYPE, in0, in1, shift)  \
+{                                             \
+    MSA_SRARI_D(RTYPE, in0, shift);           \
+    MSA_SRARI_D(RTYPE, in1, shift);           \
+}
+
+#define MSA_SRARI_D4(RTYPE, in0, in1, in2, in3, shift)  \
+{                                                       \
+    MSA_SRARI_D2(RTYPE, in0, in1, shift);               \
+    MSA_SRARI_D2(RTYPE, in2, in3, shift);               \
+}
+
+/* Description : Transposes input 4x4 byte block.
+ * Arguments   : Inputs  - in0, in1, in2, in3      (input 4x4 byte block)
+ *               Outputs - out0, out1, out2, out3  (output 4x4 byte block)
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE4x4_B(RTYPE, in0, in1, in2, in3,         \
+                           out0, out1, out2, out3)            \
+{                                                             \
+    v16i8 zero_m = { 0 };                                     \
+                                                              \
+    MSA_ILVR_B2(RTYPE, in2, in0, in3, in1, out2, out3);       \
+    out0 = (RTYPE) __msa_ilvr_b((v16i8) out3, (v16i8) out2);  \
+    out1 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out0, 4);     \
+    out2 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out1, 4);     \
+    out3 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out2, 4);     \
+}
+
+/* Description : Transposes input 8x4 byte block into 4x8.
+ * Arguments   : Inputs  - in0, in1, in2 ~ in7     (input 8x4 byte block)
+ *               Outputs - out0, out1, out2, out3  (output 4x8 byte block)
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE8x4_B(RTYPE, in0, in1, in2, in3, in4, in5,  \
+                           in6, in7, out0, out1, out2, out3)     \
+{                                                                \
+    v16i8 zero_m = { 0 };                                        \
+                                                                 \
+    MSA_ILVR_B4(RTYPE, in2, in0, in3, in1, in6, in4, in7, in5,   \
+                out0, out1, out2, out3);                         \
+    MSA_ILVR_H2(RTYPE, out2, out0, out3, out1, out2, out3);      \
+    out0 = (RTYPE) __msa_ilvr_b((v16i8) out3, (v16i8) out2);     \
+    out1 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out0, 8);        \
+    out2 = (RTYPE) __msa_ilvl_b((v16i8) out3, (v16i8) out2);     \
+    out3 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out2, 8);        \
+}
+
+/* Description : Transposes 16x4 block into 4x16 with byte elements in vectors.
+ * Arguments   : Inputs  - in0, in1, in2, in3, in4, in5, in6, in7,
+ *                         in8, in9, in10, in11, in12, in13, in14, in15
+ *               Outputs - out0, out1, out2, out3
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE16x4_B(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,  \
+                            in8, in9, in10, in11, in12, in13, in14, in15,   \
+                            out0, out1, out2, out3)                         \
+{                                                                           \
+    v2i64 tmp0_m, tmp1_m, tmp2_m, tmp3_m;                                   \
+                                                                            \
+    MSA_ILVR_B4(RTYPE, in2, in0, in3, in1, in6, in4, in7, in5,              \
+                out0, out1, out2, out3);                                    \
+    MSA_ILVR_H2(RTYPE, out2, out0, out3, out1, out2, out3);                 \
+    MSA_ILVRL_B2(v2i64, out3, out2, tmp0_m, tmp1_m);                        \
+                                                                            \
+    MSA_ILVR_B4(RTYPE, in10, in8, in11, in9, in14, in12, in15, in13,        \
+                out0, out1, out2, out3);                                    \
+    MSA_ILVR_H2(RTYPE, out2, out0, out3, out1, out2, out3);                 \
+    MSA_ILVRL_B2(v2i64, out3, out2, tmp2_m, tmp3_m);                        \
+                                                                            \
+    MSA_ILVRL_D4(RTYPE, tmp2_m, tmp0_m, tmp3_m, tmp1_m,                     \
+                 out0, out1, out2, out3);                                   \
+}
+
+/* Description : Transposes input 8x8 byte block.
+ * Arguments   : Inputs  - in0, in1, in2, in3, in4, in5, in6, in7
+ *                         (input 8x8 byte block)
+ *               Outputs - out0, out1, out2, out3, out4, out5, out6, out7
+ *                         (output 8x8 byte block)
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE8x8_B(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,   \
+                           out0, out1, out2, out3, out4, out5, out6, out7)  \
+{                                                                           \
+    v16i8 zero_m = {0};                                                     \
+                                                                            \
+    MSA_ILVR_B4(RTYPE, in2, in0, in3, in1, in6, in4, in7, in5,              \
+            out0, out1, out2, out3);                                        \
+    MSA_ILVRL_B4(RTYPE, out1, out0, out3, out2, out4, out5, out6, out7);    \
+    MSA_ILVRL_W4(RTYPE, out6, out4, out7, out5, out0, out2, out4, out6);    \
+    out1 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out0, 8);                   \
+    out3 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out2, 8);                   \
+    out5 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out4, 8);                   \
+    out7 = (RTYPE) __msa_sldi_b(zero_m, (v16i8) out6, 8);                   \
+}
+
+/* Description : Transposes 16x8 block into 8x16 with byte elements in vectors.
+ * Arguments   : Inputs  - in0, in1, in2, in3, in4, in5, in6, in7,
+ *                         in8, in9, in10, in11, in12, in13, in14, in15
+ *               Outputs - out0, out1, out2, out3, out4, out5, out6, out7
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE16x8_B(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,   \
+                            in8, in9, in10, in11, in12, in13, in14, in15,    \
+                            out0, out1, out2, out3, out4, out5, out6, out7)  \
+{                                                                            \
+    v16i8 tmp0_m, tmp1_m, tmp2_m, tmp3_m;                                    \
+                                                                             \
+    MSA_ILVEV_D4(RTYPE, in8, in0, in9, in1, in10, in2, in11, in3,            \
+                 out7, out6, out5, out4);                                    \
+    MSA_ILVEV_D4(RTYPE, in12, in4, in13, in5, in14, in6, in15, in7,          \
+                 out3, out2, out1, out0);                                    \
+                                                                             \
+    tmp0_m =  __msa_ilvev_b((v16i8) out6, (v16i8) out7);                     \
+    tmp1_m =  __msa_ilvod_b((v16i8) out6, (v16i8) out7);                     \
+    out6 = (RTYPE) __msa_ilvev_b((v16i8) out4, (v16i8) out5);                \
+    out5 = (RTYPE) __msa_ilvod_b((v16i8) out4, (v16i8) out5);                \
+    tmp2_m = __msa_ilvev_b((v16i8) out2, (v16i8) out3);                      \
+    tmp3_m = __msa_ilvod_b((v16i8) out2, (v16i8) out3);                      \
+    out2 = (RTYPE) __msa_ilvev_b((v16i8) out0, (v16i8) out1);                \
+    out1 = (RTYPE) __msa_ilvod_b((v16i8) out0, (v16i8) out1);                \
+                                                                             \
+    MSA_ILVEV_H2(RTYPE, out6, tmp0_m, out2, tmp2_m, out3, out7);             \
+    out0 = (RTYPE) __msa_ilvev_w((v4i32) out7, (v4i32) out3);                \
+    out4 = (RTYPE) __msa_ilvod_w((v4i32) out7, (v4i32) out3);                \
+                                                                             \
+    MSA_ILVOD_H2(RTYPE, out6, tmp0_m, out2, tmp2_m, out3, out7);             \
+    out2 = (RTYPE) __msa_ilvev_w((v4i32) out7, (v4i32) out3);                \
+    out6 = (RTYPE) __msa_ilvod_w((v4i32) out7, (v4i32) out3);                \
+                                                                             \
+    MSA_ILVOD_H2(v16i8, out5, tmp1_m, out1, tmp3_m, tmp0_m, tmp2_m);         \
+    out3 = (RTYPE) __msa_ilvev_w((v4i32) tmp2_m, (v4i32) tmp0_m);            \
+    out7 = (RTYPE) __msa_ilvod_w((v4i32) tmp2_m, (v4i32) tmp0_m);            \
+                                                                             \
+    MSA_ILVEV_H2(v16i8, out5, tmp1_m, out1, tmp3_m, tmp0_m, tmp2_m);         \
+    out1 = (RTYPE) __msa_ilvev_w((v4i32) tmp2_m, (v4i32) tmp0_m);            \
+    out5 = (RTYPE) __msa_ilvod_w((v4i32) tmp2_m, (v4i32) tmp0_m);            \
+}
+
+/* Description : Transposes 4x4 block with half word elements in vectors.
+ * Arguments   : Inputs  - in0, in1, in2, in3
+ *               Outputs - out0, out1, out2, out3
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE4x4_H(RTYPE, in0, in1, in2, in3,         \
+                           out0, out1, out2, out3)            \
+{                                                             \
+    MSA_ILVR_H2(RTYPE, in1, in0, in3, in2, out1, out3);       \
+    MSA_ILVRL_W2(RTYPE, out3, out1, out0, out2);              \
+    MSA_ILVL_D2(RTYPE, out0, out0, out2, out2, out1, out3);   \
+}
+
+/* Description : Transposes 8x4 block with half word elements in vectors.
+ * Arguments   : Inputs  - in0, in1, in2, in3, in4, in5, in6, in7
+ *               Outputs - out0, out1, out2, out3
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE8x4_H(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,   \
+                           out0, out1, out2, out3)                          \
+{                                                                           \
+    v8i16 s0_m, s1_m;                                                       \
+    v8i16 tmp0_m, tmp1_m, tmp2_m, tmp3_m;                                   \
+                                                                            \
+    MSA_ILVR_H2(v8i16, in6, in4, in7, in5, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp0_m, tmp1_m);                        \
+    MSA_ILVR_H2(v8i16, in2, in0, in3, in1, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp2_m, tmp3_m);                        \
+    MSA_PCKEV_D2(RTYPE, tmp0_m, tmp2_m, tmp1_m, tmp3_m, out0, out2);        \
+    MSA_PCKOD_D2(RTYPE, tmp0_m, tmp2_m, tmp1_m, tmp3_m, out1, out3);        \
+}
+
+/* Description : Transposes 8x8 block with half word elements in vectors.
+ * Arguments   : Inputs  - in0, in1, in2, in3, in4, in5, in6, in7
+ *               Outputs - out0, out1, out2, out3, out4, out5, out6, out7
+ *               Return Type - RTYPE
+ * Details     :
+ */
+#define MSA_TRANSPOSE8x8_H(RTYPE, in0, in1, in2, in3, in4, in5, in6, in7,   \
+                           out0, out1, out2, out3, out4, out5, out6, out7)  \
+{                                                                           \
+    v8i16 s0_m, s1_m;                                                       \
+    v8i16 tmp0_m, tmp1_m, tmp2_m, tmp3_m;                                   \
+    v8i16 tmp4_m, tmp5_m, tmp6_m, tmp7_m;                                   \
+                                                                            \
+    MSA_ILVR_H2(v8i16, in6, in4, in7, in5, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp0_m, tmp1_m);                        \
+    MSA_ILVL_H2(v8i16, in6, in4, in7, in5, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp2_m, tmp3_m);                        \
+    MSA_ILVR_H2(v8i16, in2, in0, in3, in1, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp4_m, tmp5_m);                        \
+    MSA_ILVL_H2(v8i16, in2, in0, in3, in1, s0_m, s1_m);                     \
+    MSA_ILVRL_H2(v8i16, s1_m, s0_m, tmp6_m, tmp7_m);                        \
+    MSA_PCKEV_D4(RTYPE, tmp0_m, tmp4_m, tmp1_m, tmp5_m, tmp2_m, tmp6_m,     \
+             tmp3_m, tmp7_m, out0, out2, out4, out6);                       \
+    MSA_PCKOD_D4(RTYPE, tmp0_m, tmp4_m, tmp1_m, tmp5_m, tmp2_m, tmp6_m,     \
+             tmp3_m, tmp7_m, out1, out3, out5, out7);                       \
+}
+
+#endif /* _MSA_MACROS_H */
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/sad_common.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/sad_common.h
new file mode 100644
index 0000000000..01ada25b5a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/sad_common.h
@@ -0,0 +1,124 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_SAD_COMMON_H_
+#define WELS_SAD_COMMON_H_
+
+#include "typedefs.h"
+
+
+//===================SAD=====================//
+int32_t WelsSampleSad16x16_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x8_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x16_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x8_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x4_c( uint8_t *, int32_t, uint8_t *, int32_t );
+int32_t WelsSampleSad4x8_c( uint8_t *, int32_t, uint8_t *, int32_t );
+int32_t WelsSampleSad4x4_c (uint8_t*, int32_t, uint8_t*, int32_t);
+
+
+
+void WelsSampleSadFour16x16_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour16x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour8x16_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour8x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour4x4_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour8x4_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+void WelsSampleSadFour4x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined (X86_ASM)
+
+int32_t WelsSampleSad4x4_mmx (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x8_sse21 (uint8_t*, int32_t, uint8_t*, int32_t);
+
+void WelsSampleSadFour16x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour16x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+
+#endif//X86_ASM
+
+#if defined (HAVE_NEON)
+
+int32_t WelsSampleSad4x4_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x16_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x8_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x16_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x8_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+
+void WelsSampleSadFour16x16_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour16x8_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x16_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x8_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour4x4_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+int32_t WelsSampleSad4x4_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+
+void WelsSampleSadFour16x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour16x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour4x4_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+#endif
+
+#if defined (HAVE_MMI)
+int32_t WelsSampleSad4x4_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad16x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSad8x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+
+void WelsSampleSadFour16x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour16x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+void WelsSampleSadFour8x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+#endif //SAMPLE_H_
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/typedefs.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/typedefs.h
new file mode 100644
index 0000000000..5002411017
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/typedefs.h
@@ -0,0 +1,86 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// typedef.h
+#ifndef WELS_TYPE_DEFINES_H__
+#define WELS_TYPE_DEFINES_H__
+
+#include <limits.h>
+#include <stddef.h>
+
+////////////////////////////////////////////////////////////////////////////
+// NOTICE : ALL internal implement MUST use the data type defined as below
+//          ONLY except with the interface file !!!!!
+////////////////////////////////////////////////////////////////////////////
+
+#ifndef  _MSC_VER
+
+#define __STDC_FORMAT_MACROS
+#include <stdint.h>
+#include <inttypes.h>
+
+#ifdef __LP64__
+typedef int64_t intX_t;
+#else
+typedef int32_t intX_t;
+#endif
+
+#else
+
+// FIXME:     all singed type should be declared explicit,  for example,  int8_t should be declared as signed char.
+typedef signed char      int8_t  ;
+typedef unsigned char    uint8_t ;
+typedef short            int16_t ;
+typedef unsigned short   uint16_t;
+typedef int              int32_t ;
+typedef unsigned int     uint32_t;
+typedef __int64          int64_t ;
+typedef unsigned __int64 uint64_t;
+#define PRId64 "I64d"
+
+#ifdef _WIN64
+typedef int64_t intX_t;
+#else
+typedef int32_t intX_t;
+#endif
+
+#endif // _MSC_VER defined
+
+// The 'float' type is portable and usable without any need for any extra typedefs.
+
+#ifdef EPSN
+#undef EPSN
+#endif//EPSN
+#define EPSN (0.000001f) // (1e-6) // desired float precision
+
+#endif //WELS_TYPE_DEFINES_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/utils.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/utils.h
new file mode 100644
index 0000000000..f70bd93ee6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/utils.h
@@ -0,0 +1,95 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \brief   Tool kits for decoder
+ *          ( malloc, realloc, free, log output and PSNR calculation and so on )
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_UTILS_H__
+#define WELS_UTILS_H__
+
+#include <stdarg.h>
+#include "typedefs.h"
+
+#define MAX_LOG_SIZE    1024
+#define MAX_MBS_PER_FRAME 36864 //in accordance with max level support in Rec
+/*
+ *  Function pointer declaration for various tool sets
+ */
+// wels log output
+typedef void (*PWelsLogCallbackFunc) (void* pCtx, const int32_t iLevel, const char* kpFmt, va_list argv);
+
+typedef struct TagLogContext {
+  PWelsLogCallbackFunc pfLog;
+  void* pLogCtx;
+  void* pCodecInstance;
+} SLogContext;
+
+
+#ifdef __GNUC__
+extern void WelsLog (SLogContext* pCtx, int32_t iLevel, const char* kpFmt, ...) __attribute__ ((__format__ (__printf__,
+    3,
+    4)));
+#else
+extern void WelsLog (SLogContext* pCtx, int32_t iLevel, const char* kpFmt, ...);
+#endif
+
+/*
+ *  PSNR calculation routines
+ */
+/*!
+ *************************************************************************************
+ * \brief   PSNR calculation utilization in Wels
+ *
+ * \param   kpTarPic    target picture to be calculated in Picture pData format
+ * \param   kiTarStride stride of target picture pData pBuffer
+ * \param   kpRefPic    base referencing picture samples
+ * \param   kiRefStride stride of reference picture pData pBuffer
+ * \param   kiWidth     picture iWidth in pixel
+ * \param   kiHeight    picture iHeight in pixel
+ *
+ * \return  actual PSNR result;
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+float WelsCalcPsnr (const void* kpTarPic,
+                    const int32_t kiTarStride,
+                    const void* kpRefPic,
+                    const int32_t kiRefStride,
+                    const int32_t kiWidth,
+                    const int32_t kiHeight);
+
+
+#endif//WELS_UTILS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/version.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/version.h
new file mode 100644
index 0000000000..9fab1b0eeb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/version.h
@@ -0,0 +1,10 @@
+#ifndef VERSION_H
+#define VERSION_H
+
+#ifdef GENERATED_VERSION_HEADER
+#include "version_gen.h"
+#else
+#define VERSION_NUMBER "openh264 default: 1.4"
+#endif
+
+#endif // VERSION_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/version_gen.h.template b/third-party/openh264/third_party/openh264/src/codec/common/inc/version_gen.h.template
new file mode 100644
index 0000000000..397726d1f1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/version_gen.h.template
@@ -0,0 +1,6 @@
+#ifndef VERSION_GEN_H
+#define VERSION_GEN_H
+
+#define VERSION_NUMBER $FULL_VERSION
+
+#endif // VERSION_GEN_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/welsCodecTrace.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/welsCodecTrace.h
new file mode 100644
index 0000000000..b6c323f919
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/welsCodecTrace.h
@@ -0,0 +1,64 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_CODEC_TRACE
+#define WELS_CODEC_TRACE
+
+#include <stdarg.h>
+#include "typedefs.h"
+#include "utils.h"
+#include "codec_app_def.h"
+#include "codec_api.h"
+
+class welsCodecTrace {
+ public:
+  welsCodecTrace();
+  ~welsCodecTrace();
+
+  void SetCodecInstance (void* pCodecInstance);
+  void SetTraceLevel (const int32_t kiLevel);
+  void SetTraceCallback (WelsTraceCallback func);
+  void SetTraceCallbackContext (void* pCtx);
+
+ private:
+  static void StaticCodecTrace (void* pCtx, const int32_t kiLevel, const char* kpStrFormat, va_list vl);
+  void CodecTrace (const int32_t kiLevel, const char* kpStrFormat, va_list vl);
+
+  int32_t       m_iTraceLevel;
+  WelsTraceCallback m_fpTrace;
+  void*         m_pTraceCtx;
+ public:
+
+  SLogContext m_sLogCtx;
+};
+
+#endif //WELS_CODEC_TRACE
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_common_defs.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_common_defs.h
new file mode 100644
index 0000000000..96ba01a79d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_common_defs.h
@@ -0,0 +1,373 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_common_defs.h
+#ifndef WELS_COMMON_DEFS_H__
+#define WELS_COMMON_DEFS_H__
+
+#include "typedefs.h"
+#include "macros.h"
+#include "codec_app_def.h"
+
+
+namespace WelsCommon {
+/*common use table*/
+
+#define  CTX_NA 0
+#define  WELS_CONTEXT_COUNT 460
+#define LEVEL_NUMBER 17
+typedef struct TagLevelLimits {
+  ELevelIdc uiLevelIdc;  // level idc
+  uint32_t uiMaxMBPS; // Max macroblock processing rate(MB/s)
+  uint32_t uiMaxFS;   // Max frame sizea(MBs)
+  uint32_t uiMaxDPBMbs;// Max decoded picture buffer size(MBs)
+  uint32_t uiMaxBR; // Max video bit rate
+  uint32_t uiMaxCPB; // Max CPB size
+  int16_t iMinVmv; // Vertical MV component range upper bound
+  int16_t iMaxVmv; // Vertical MV component range lower bound
+  uint16_t uiMinCR;  // Min compression ration
+  int16_t iMaxMvsPer2Mb; // Max number of motion vectors per two consecutive MBs
+} SLevelLimits;
+
+#define CpbBrNalFactor 1200  //baseline,main,and extended profiles.
+extern const SLevelLimits g_ksLevelLimits[LEVEL_NUMBER];
+extern const uint32_t g_kuiLevelMaps[LEVEL_NUMBER];
+extern const uint8_t g_kuiMbCountScan4Idx[24];
+extern const uint8_t g_kuiCache30ScanIdx[16];
+extern const uint8_t g_kuiCache48CountScan4Idx[24];
+
+extern const uint8_t g_kuiMatrixV[6][8][8];
+
+extern const uint8_t g_kuiDequantScaling4x4Default[2][16];
+extern const uint8_t g_kuiDequantScaling8x8Default[2][64];
+extern const ALIGNED_DECLARE (uint16_t, g_kuiDequantCoeff[52][8], 16);
+extern const ALIGNED_DECLARE (uint16_t, g_kuiDequantCoeff8x8[52][64], 16);
+extern const uint8_t g_kuiChromaQpTable[52];
+
+extern const uint8_t g_kuiCabacRangeLps[64][4];
+extern const int8_t g_kiCabacGlobalContextIdx[WELS_CONTEXT_COUNT][4][2];
+extern const uint8_t g_kuiStateTransTable[64][2];
+extern const uint32_t g_kuiGolombUELength[256];
+/*
+ *  NAL Unit Type (5 Bits)
+ */
+enum EWelsNalUnitType {
+  NAL_UNIT_UNSPEC_0             = 0,
+  NAL_UNIT_CODED_SLICE          = 1,
+  NAL_UNIT_CODED_SLICE_DPA      = 2,
+  NAL_UNIT_CODED_SLICE_DPB      = 3,
+  NAL_UNIT_CODED_SLICE_DPC      = 4,
+  NAL_UNIT_CODED_SLICE_IDR      = 5,
+  NAL_UNIT_SEI                  = 6,
+  NAL_UNIT_SPS                  = 7,
+  NAL_UNIT_PPS                  = 8,
+  NAL_UNIT_AU_DELIMITER         = 9,
+  NAL_UNIT_END_OF_SEQ           = 10,
+  NAL_UNIT_END_OF_STR           = 11,
+  NAL_UNIT_FILLER_DATA          = 12,
+  NAL_UNIT_SPS_EXT              = 13,
+  NAL_UNIT_PREFIX               = 14,
+  NAL_UNIT_SUBSET_SPS           = 15,
+  NAL_UNIT_DEPTH_PARAM          = 16, // NAL_UNIT_RESV_16
+  NAL_UNIT_RESV_17              = 17,
+  NAL_UNIT_RESV_18              = 18,
+  NAL_UNIT_AUX_CODED_SLICE      = 19,
+  NAL_UNIT_CODED_SLICE_EXT      = 20,
+  NAL_UNIT_MVC_SLICE_EXT        = 21, // NAL_UNIT_RESV_21
+  NAL_UNIT_RESV_22              = 22,
+  NAL_UNIT_RESV_23              = 23,
+  NAL_UNIT_UNSPEC_24            = 24,
+  NAL_UNIT_UNSPEC_25            = 25,
+  NAL_UNIT_UNSPEC_26            = 26,
+  NAL_UNIT_UNSPEC_27            = 27,
+  NAL_UNIT_UNSPEC_28            = 28,
+  NAL_UNIT_UNSPEC_29            = 29,
+  NAL_UNIT_UNSPEC_30            = 30,
+  NAL_UNIT_UNSPEC_31            = 31
+};
+
+/*
+ *  NAL Reference IDC (2 Bits)
+ */
+
+enum EWelsNalRefIdc {
+  NRI_PRI_LOWEST        = 0,
+  NRI_PRI_LOW           = 1,
+  NRI_PRI_HIGH          = 2,
+  NRI_PRI_HIGHEST       = 3
+};
+
+/*
+ * VCL TYPE
+ */
+
+enum EVclType {
+  NON_VCL   = 0,
+  VCL       = 1,
+  NOT_APP   = 2
+};
+
+/*
+ *  vcl type map for given NAL unit type and corresponding H264 type (0: AVC; 1: SVC).
+ */
+extern const EVclType g_keTypeMap[32][2];
+
+#define IS_VCL_NAL(t, ext_idx)                  (g_keTypeMap[t][ext_idx] == VCL)
+#define IS_PARAM_SETS_NALS(t)                   ( (t) == NAL_UNIT_SPS || (t) == NAL_UNIT_PPS || (t) == NAL_UNIT_SUBSET_SPS )
+#define IS_SPS_NAL(t)                           ( (t) == NAL_UNIT_SPS )
+#define IS_SUBSET_SPS_NAL(t)                    ( (t) == NAL_UNIT_SUBSET_SPS )
+#define IS_PPS_NAL(t)                           ( (t) == NAL_UNIT_PPS )
+#define IS_SEI_NAL(t)                           ( (t) == NAL_UNIT_SEI )
+#define IS_AU_DELIMITER_NAL(t)                  ( (t) == NAL_UNIT_AU_DELIMITER )
+#define IS_PREFIX_NAL(t)                        ( (t) == NAL_UNIT_PREFIX )
+#define IS_SUBSET_SPS_USED(t)                   ( (t) == NAL_UNIT_SUBSET_SPS || (t) == NAL_UNIT_CODED_SLICE_EXT )
+#define IS_VCL_NAL_AVC_BASE(t)                  ( (t) == NAL_UNIT_CODED_SLICE || (t) == NAL_UNIT_CODED_SLICE_IDR )
+#define IS_NEW_INTRODUCED_SVC_NAL(t)            ( (t) == NAL_UNIT_PREFIX || (t) == NAL_UNIT_CODED_SLICE_EXT )
+
+
+/* Base SSlice Types
+ * Invalid in case of eSliceType exceeds 9,
+ * Need trim when eSliceType > 4 as fixed SliceType(eSliceType-4),
+ * meaning mapped version after eSliceType minus 4.
+ */
+
+enum EWelsSliceType {
+  P_SLICE       = 0,
+  B_SLICE       = 1,
+  I_SLICE       = 2,
+  SP_SLICE      = 3,
+  SI_SLICE      = 4,
+  UNKNOWN_SLICE = 5
+};
+
+/* SSlice Types in scalable extension */
+enum ESliceTypeExt {
+  EP_SLICE = 0, // EP_SLICE: 0, 5
+  EB_SLICE = 1, // EB_SLICE: 1, 6
+  EI_SLICE = 2  // EI_SLICE: 2, 7
+};
+
+/* List Index */
+enum EListIndex {
+  LIST_0    = 0,
+  LIST_1    = 1,
+  LIST_A    = 2
+};
+
+
+
+/* Motion Vector components */
+enum EMvComp {
+  MV_X  = 0,
+  MV_Y  = 1,
+  MV_A  = 2
+};
+
+/* Chroma Components */
+
+enum EChromaComp {
+  CHROMA_CB     = 0,
+  CHROMA_CR     = 1,
+  CHROMA_A      = 2
+};
+
+
+
+/*
+ *  Memory Management Control Operation (MMCO) code
+ */
+enum EMmcoCode {
+  MMCO_END          = 0,
+  MMCO_SHORT2UNUSED = 1,
+  MMCO_LONG2UNUSED  = 2,
+  MMCO_SHORT2LONG   = 3,
+  MMCO_SET_MAX_LONG = 4,
+  MMCO_RESET        = 5,
+  MMCO_LONG         = 6
+};
+
+enum EVuiVideoFormat {
+  VUI_COMPONENT   = 0,
+  VUI_PAL         = 1,
+  VUI_NTSC        = 2,
+  VUI_SECAM       = 3,
+  VUI_MAC         = 4,
+  VUI_UNSPECIFIED = 5,
+  VUI_RESERVED1   = 6,
+  VUI_RESERVED2   = 7
+};
+
+/*
+ *  Bit-stream auxiliary reading / writing
+ */
+typedef struct TagBitStringAux {
+  uint8_t* pStartBuf;   // buffer to start position
+  uint8_t* pEndBuf;     // buffer + length
+  int32_t  iBits;       // count bits of overall bitstreaming input
+
+  intX_t   iIndex;      //only for cavlc usage
+  uint8_t* pCurBuf;     // current reading position
+  uint32_t uiCurBits;
+  int32_t  iLeftBits;   // count number of available bits left ([1, 8]),
+  // need pointer to next byte start position in case 0 bit left then 8 instead
+} SBitStringAux, *PBitStringAux;
+
+/* NAL Unix Header in AVC, refer to Page 56 in JVT X201wcm */
+typedef struct TagNalUnitHeader {
+  uint8_t             uiForbiddenZeroBit;
+  uint8_t             uiNalRefIdc;
+  EWelsNalUnitType    eNalUnitType;
+  uint8_t             uiReservedOneByte;                // only padding usage
+} SNalUnitHeader, *PNalUnitHeader;
+
+/* NAL Unit Header in scalable extension syntax, refer to Page 390 in JVT X201wcm */
+typedef struct TagNalUnitHeaderExt {
+  SNalUnitHeader      sNalUnitHeader;
+
+  // uint8_t   reserved_one_bit;
+  bool      bIdrFlag;
+  uint8_t   uiPriorityId;
+  int8_t    iNoInterLayerPredFlag;      // change as int8_t to support 3 values probably in encoder
+  uint8_t   uiDependencyId;
+
+  uint8_t   uiQualityId;
+  uint8_t   uiTemporalId;
+  bool      bUseRefBasePicFlag;
+  bool      bDiscardableFlag;
+
+  bool      bOutputFlag;
+  uint8_t   uiReservedThree2Bits;
+  // Derived variable(s)
+  uint8_t   uiLayerDqId;
+  bool      bNalExtFlag;
+} SNalUnitHeaderExt, *PNalUnitHeaderExt;
+
+/* AVC MB types*/
+#define MB_TYPE_INTRA4x4    0x00000001
+#define MB_TYPE_INTRA16x16  0x00000002
+#define MB_TYPE_INTRA8x8    0x00000004
+#define MB_TYPE_16x16       0x00000008
+#define MB_TYPE_16x8        0x00000010
+#define MB_TYPE_8x16        0x00000020
+#define MB_TYPE_8x8         0x00000040
+#define MB_TYPE_8x8_REF0    0x00000080
+#define MB_TYPE_SKIP        0x00000100
+#define MB_TYPE_INTRA_PCM   0x00000200
+#define MB_TYPE_INTRA_BL    0x00000400
+#define MB_TYPE_DIRECT      0x00000800
+#define MB_TYPE_P0L0        0x00001000
+#define MB_TYPE_P1L0        0x00002000
+#define MB_TYPE_P0L1        0x00004000
+#define MB_TYPE_P1L1        0x00008000
+#define MB_TYPE_L0        (MB_TYPE_P0L0 | MB_TYPE_P1L0)
+#define MB_TYPE_L1        (MB_TYPE_P0L1 | MB_TYPE_P1L1)
+
+#define SUB_MB_TYPE_8x8     0x00000001
+#define SUB_MB_TYPE_8x4     0x00000002
+#define SUB_MB_TYPE_4x8     0x00000004
+#define SUB_MB_TYPE_4x4     0x00000008
+
+#define MB_TYPE_INTRA     (MB_TYPE_INTRA4x4 | MB_TYPE_INTRA16x16 | MB_TYPE_INTRA8x8 | MB_TYPE_INTRA_PCM)
+#define MB_TYPE_INTER     (MB_TYPE_16x16 | MB_TYPE_16x8 | MB_TYPE_8x16 | MB_TYPE_8x8 | MB_TYPE_8x8_REF0 | MB_TYPE_SKIP | MB_TYPE_DIRECT)
+#define IS_INTRA4x4(type) ( MB_TYPE_INTRA4x4 == (type) )
+#define IS_INTRA8x8(type) ( MB_TYPE_INTRA8x8 == (type) )
+#define IS_INTRANxN(type) ( MB_TYPE_INTRA4x4 == (type) || MB_TYPE_INTRA8x8 == (type) )
+#define IS_INTRA16x16(type) ( MB_TYPE_INTRA16x16 == (type) )
+#define IS_INTRA(type) ( (type)&MB_TYPE_INTRA )
+#define IS_INTER(type) ( (type)&MB_TYPE_INTER )
+#define IS_INTER_16x16(type) ( (type)&MB_TYPE_16x16 )
+#define IS_INTER_16x8(type) ( (type)&MB_TYPE_16x8 )
+#define IS_INTER_8x16(type) ( (type)&MB_TYPE_8x16 )
+#define IS_TYPE_L0(type) ( (type)&MB_TYPE_L0 )
+#define IS_TYPE_L1(type) ( (type)&MB_TYPE_L1 )
+#define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0<<((part)+2*(list))))
+
+
+#define IS_SKIP(type) ( ((type)&MB_TYPE_SKIP) != 0 )
+#define IS_DIRECT(type) ( ((type)&MB_TYPE_DIRECT) != 0 )
+#define IS_SVC_INTER(type) IS_INTER(type)
+#define IS_I_BL(type) ( (type) == MB_TYPE_INTRA_BL )
+#define IS_SVC_INTRA(type) ( IS_I_BL(type) || IS_INTRA(type) )
+#define IS_Inter_8x8(type) ( ((type)&MB_TYPE_8x8) != 0)
+#define IS_SUB_8x8(sub_type) (((sub_type)&SUB_MB_TYPE_8x8) != 0)
+#define IS_SUB_8x4(sub_type) (((sub_type)&SUB_MB_TYPE_8x4) != 0)
+#define IS_SUB_4x8(sub_type) (((sub_type)&SUB_MB_TYPE_4x8) != 0)
+#define IS_SUB_4x4(sub_type) (((sub_type)&SUB_MB_TYPE_4x4) != 0)
+
+#define REF_NOT_AVAIL   -2
+#define REF_NOT_IN_LIST -1  //intra
+
+/////////intra16x16  Luma
+#define I16_PRED_INVALID   -1
+#define I16_PRED_V       0
+#define I16_PRED_H       1
+#define I16_PRED_DC      2
+#define I16_PRED_P       3
+
+#define I16_PRED_DC_L    4
+#define I16_PRED_DC_T    5
+#define I16_PRED_DC_128  6
+#define I16_PRED_DC_A  7
+//////////intra4x4   Luma
+// Here, I8x8 also use these definitions
+#define I4_PRED_INVALID    0
+#define I4_PRED_V        0
+#define I4_PRED_H        1
+#define I4_PRED_DC       2
+#define I4_PRED_DDL      3 //diagonal_down_left
+#define I4_PRED_DDR      4 //diagonal_down_right
+#define I4_PRED_VR       5 //vertical_right
+#define I4_PRED_HD       6 //horizon_down
+#define I4_PRED_VL       7 //vertical_left
+#define I4_PRED_HU       8 //horizon_up
+
+#define I4_PRED_DC_L     9
+#define I4_PRED_DC_T     10
+#define I4_PRED_DC_128   11
+
+#define I4_PRED_DDL_TOP  12 //right-top replacing by padding rightmost pixel of top
+#define I4_PRED_VL_TOP   13 //right-top replacing by padding rightmost pixel of top
+#define I4_PRED_A   14
+
+//////////intra Chroma
+#define C_PRED_INVALID   -1
+#define C_PRED_DC        0
+#define C_PRED_H         1
+#define C_PRED_V         2
+#define C_PRED_P         3
+
+#define C_PRED_DC_L      4
+#define C_PRED_DC_T      5
+#define C_PRED_DC_128    6
+#define C_PRED_A    7
+}
+#endif//WELS_COMMON_DEFS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_const_common.h b/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_const_common.h
new file mode 100644
index 0000000000..4d22d93dbb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/inc/wels_const_common.h
@@ -0,0 +1,63 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_CONST_COMMON_H__
+#define WELS_CONST_COMMON_H__
+
+// Miscellaneous sizing infos
+#ifndef MAX_FNAME_LEN
+#define MAX_FNAME_LEN           256     // maximal length of file name in char size
+#endif//MAX_FNAME_LEN
+
+#ifndef WELS_LOG_BUF_SIZE
+#define WELS_LOG_BUF_SIZE       4096
+#endif//WELS_LOG_BUF_SIZE
+
+#ifndef MAX_TRACE_LOG_SIZE
+#define MAX_TRACE_LOG_SIZE      (50 * (1<<20))  // max trace log size: 50 MB, overwrite occur if log file size exceeds this size
+#endif//MAX_TRACE_LOG_SIZE
+
+/* MB width in pixels for specified colorspace I420 usually used in codec */
+#define MB_WIDTH_LUMA           16
+#define MB_WIDTH_CHROMA         (MB_WIDTH_LUMA>>1)
+/* MB height in pixels for specified colorspace I420 usually used in codec */
+#define MB_HEIGHT_LUMA          16
+#define MB_HEIGHT_CHROMA        (MB_HEIGHT_LUMA>>1)
+#define MB_COEFF_LIST_SIZE      (256+((MB_WIDTH_CHROMA*MB_HEIGHT_CHROMA)<<1))
+#define MB_PARTITION_SIZE       4       // Macroblock partition size in 8x8 sub-blocks
+#define MB_BLOCK4x4_NUM         16
+#define MB_BLOCK8x8_NUM         4
+#define MAX_SPS_COUNT           32      // Count number of SPS
+#define BASE_QUALITY_ID         0
+
+
+#endif//WELS_CONST_COMMON_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/meson.build b/third-party/openh264/third_party/openh264/src/codec/common/meson.build
new file mode 100644
index 0000000000..b9ef507b36
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/meson.build
@@ -0,0 +1,67 @@
+cpp_sources = [
+  'src/common_tables.cpp',
+  'src/copy_mb.cpp',
+  'src/cpu.cpp',
+  'src/crt_util_safe_x.cpp',
+  'src/deblocking_common.cpp',
+  'src/expand_pic.cpp',
+  'src/intra_pred_common.cpp',
+  'src/mc.cpp',
+  'src/memory_align.cpp',
+  'src/sad_common.cpp',
+  'src/utils.cpp',
+  'src/welsCodecTrace.cpp',
+  'src/WelsTaskThread.cpp',
+  'src/WelsThread.cpp',
+  'src/WelsThreadLib.cpp',
+  'src/WelsThreadPool.cpp',
+]
+
+objs_asm = []
+if cpu_family in ['x86', 'x86_64']
+  asm_sources = [
+    'x86/cpuid.asm',
+    'x86/dct.asm',
+    'x86/deblock.asm',
+    'x86/expand_picture.asm',
+    'x86/intra_pred_com.asm',
+    'x86/mb_copy.asm',
+    'x86/mc_chroma.asm',
+    'x86/mc_luma.asm',
+    'x86/satd_sad.asm',
+    'x86/vaa.asm',
+  ]
+  objs_asm += asm_gen.process(asm_sources)
+elif cpu_family == 'arm'
+  asm_sources = [
+    'arm/copy_mb_neon.S',
+    'arm/deblocking_neon.S',
+    'arm/expand_picture_neon.S',
+    'arm/intra_pred_common_neon.S',
+    'arm/mc_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+elif cpu_family == 'aarch64'
+  asm_sources = [
+    'arm64/copy_mb_aarch64_neon.S',
+    'arm64/deblocking_aarch64_neon.S',
+    'arm64/expand_picture_aarch64_neon.S',
+    'arm64/intra_pred_common_aarch64_neon.S',
+    'arm64/mc_aarch64_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+else
+  error('Unsupported cpu_family @0@'.format(cpu_family))
+endif
+
+libcommon = static_library('common', cpp_sources, objs_asm,
+  include_directories: [inc, casm_inc],
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_mmi.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_mmi.c
new file mode 100644
index 0000000000..515e192c4b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_mmi.c
@@ -0,0 +1,477 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    copy_mb_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    20/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+void WelsCopy8x8_mmi(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                     int32_t  iStrideS ) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f2, 0x7($8)                    \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f4, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f6, 0x7($8)                    \n\t"
+    "gsldrc1    $f4, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f8, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f10, 0x7($8)                   \n\t"
+    "gsldrc1    $f8, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f12, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f14, 0x7($8)                   \n\t"
+    "gsldrc1    $f12, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0($8)                   \n\t"
+
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0x7($8)                    \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f4, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f6, 0x7($8)                    \n\t"
+    "gssdrc1    $f4, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f8, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f10, 0x7($8)                   \n\t"
+    "gssdrc1    $f8, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f12, 0x7(%[pDst])              \n\t"
+    "gssdlc1    $f14, 0x7($8)                   \n\t"
+    "gssdrc1    $f12, 0x0(%[pDst])              \n\t"
+    "gssdrc1    $f14, 0x0($8)                   \n\t"
+   : [pDst]"+&r"((unsigned char *)pDst), [pSrc]"+&r"((unsigned char *)pSrc)
+   : [iStrideD]"r"(iStrideD), [iStrideS]"r"(iStrideS)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14"
+  );
+}
+
+void WelsCopy8x16_mmi(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                      int32_t iStrideS) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f2, 0x7($8)                    \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f4, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f6, 0x7($8)                    \n\t"
+    "gsldrc1    $f4, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f8, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f10, 0x7($8)                   \n\t"
+    "gsldrc1    $f8, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f12, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f14, 0x7($8)                   \n\t"
+    "gsldrc1    $f12, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0x7($8)                    \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f4, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f6, 0x7($8)                    \n\t"
+    "gssdrc1    $f4, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f8, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f10, 0x7($8)                   \n\t"
+    "gssdrc1    $f8, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f12, 0x7(%[pDst])              \n\t"
+    "gssdlc1    $f14, 0x7($8)                   \n\t"
+    "gssdrc1    $f12, 0x0(%[pDst])              \n\t"
+    "gssdrc1    $f14, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f2, 0x7($8)                    \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f4, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f6, 0x7($8)                    \n\t"
+    "gsldrc1    $f4, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f8, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f10, 0x7($8)                   \n\t"
+    "gsldrc1    $f8, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pSrc], $8, %[iStrideS]        \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iStrideS]        \n\t"
+    "gsldlc1    $f12, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f14, 0x7($8)                   \n\t"
+    "gsldrc1    $f12, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0($8)                   \n\t"
+
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0x7($8)                    \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f4, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f6, 0x7($8)                    \n\t"
+    "gssdrc1    $f4, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f6, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f8, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f10, 0x7($8)                   \n\t"
+    "gssdrc1    $f8, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f10, 0x0($8)                   \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iStrideD]        \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iStrideD]        \n\t"
+    "gssdlc1    $f12, 0x7(%[pDst])              \n\t"
+    "gssdlc1    $f14, 0x7($8)                   \n\t"
+    "gssdrc1    $f12, 0x0(%[pDst])              \n\t"
+    "gssdrc1    $f14, 0x0($8)                   \n\t"
+   : [pDst]"+&r"((unsigned char *)pDst), [pSrc]"+&r"((unsigned char *)pSrc)
+   : [iStrideD]"r"(iStrideD), [iStrideS]"r"(iStrideS)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14"
+  );
+}
+
+void WelsCopy16x16_mmi(uint8_t* pDst, int32_t iDstStride, uint8_t* pSrc,
+                       int32_t iSrcStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f0, $f2, 0x0(%[pSrc])          \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f4, $f6, 0x0(%[pSrc])          \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f8, $f10, 0x0(%[pSrc])         \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f12, $f14, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f16, $f18, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f20, $f22, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f24, $f26, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f28, $f30, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+
+    "gssqc1     $f0, $f2, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f4, $f6, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f8, $f10, 0x0(%[pDst])         \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f12, $f14, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f16, $f18, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f20, $f22, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f24, $f26, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f28, $f30, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+
+    "gslqc1     $f0, $f2, 0x0(%[pSrc])          \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f4, $f6, 0x0(%[pSrc])          \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f8, $f10, 0x0(%[pSrc])         \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f12, $f14, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f16, $f18, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f20, $f22, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f24, $f26, 0x0(%[pSrc])        \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gslqc1     $f28, $f30, 0x0(%[pSrc])        \n\t"
+
+    "gssqc1     $f0, $f2, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f4, $f6, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f8, $f10, 0x0(%[pDst])         \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f12, $f14, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f16, $f18, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f20, $f22, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f24, $f26, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f28, $f30, 0x0(%[pDst])        \n\t"
+   : [pDst]"+&r"((unsigned char *)pDst), [pSrc]"+&r"((unsigned char *)pSrc)
+   : [iDstStride]"r"((int)iDstStride), [iSrcStride]"r"((int)iSrcStride)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsCopy16x16NotAligned_mmi(uint8_t* pDst, int32_t iDstStride, uint8_t* pSrc,
+                                 int32_t iSrcStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gsldlc1    $f2, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f0, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f0, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f6, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f10, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f8, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f8, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f14, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f12, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f12, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f18, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f18, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f22, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f22, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f26, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f24, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f26, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f24, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f30, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f28, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f30, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f28, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f0, $f2, 0x0(%[pDst])          \n\t"
+    "gssqc1     $f4, $f6, 0x0($8)               \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f8, $f10, 0x0(%[pDst])         \n\t"
+    "gssqc1     $f12, $f14, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f16, $f18, 0x0(%[pDst])        \n\t"
+    "gssqc1     $f20, $f22, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f24, $f26, 0x0(%[pDst])        \n\t"
+    "gssqc1     $f28, $f30, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+
+    "gsldlc1    $f2, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f0, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f0, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f6, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f10, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f8, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f8, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f14, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f12, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f12, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f18, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f18, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f22, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f22, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f26, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f24, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f26, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f24, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f30, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f28, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f30, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f28, 0x8(%[pSrc])              \n\t"
+
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f0, $f2, 0x0(%[pDst])          \n\t"
+    "gssqc1     $f4, $f6, 0x0($8)               \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f8, $f10, 0x0(%[pDst])         \n\t"
+    "gssqc1     $f12, $f14, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f16, $f18, 0x0(%[pDst])        \n\t"
+    "gssqc1     $f20, $f22, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pDst], $8, %[iDstStride]      \n\t"
+    PTR_ADDU   "$8, %[pDst], %[iDstStride]      \n\t"
+    "gssqc1     $f24, $f26, 0x0(%[pDst])        \n\t"
+    "gssqc1     $f28, $f30, 0x0($8)             \n\t"
+   : [pDst]"+&r"((unsigned char *)pDst), [pSrc]"+&r"((unsigned char *)pSrc)
+   : [iDstStride]"r"((int)iDstStride), [iSrcStride]"r"((int)iSrcStride)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsCopy16x8NotAligned_mmi(uint8_t* pDst, int32_t iDstStride, uint8_t* pSrc,
+                                int32_t iSrcStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gsldlc1    $f2, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f0, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f0, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f6, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f10, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f8, 0xF(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f8, 0x8(%[pSrc])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f14, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f12, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f14, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f12, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f18, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f18, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f22, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f22, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f26, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f24, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f26, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f24, 0x8(%[pSrc])              \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f30, 0x7(%[pSrc])              \n\t"
+    "gsldlc1    $f28, 0xF(%[pSrc])              \n\t"
+    "gsldrc1    $f30, 0x0(%[pSrc])              \n\t"
+    "gsldrc1    $f28, 0x8(%[pSrc])              \n\t"
+
+    "gssqc1     $f0, $f2, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f4, $f6, 0x0(%[pDst])          \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f8, $f10, 0x0(%[pDst])         \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f12, $f14, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f16, $f18, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f20, $f22, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f24, $f26, 0x0(%[pDst])        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    "gssqc1     $f28, $f30, 0x0(%[pDst])        \n\t"
+   : [pDst]"+&r"((unsigned char *)pDst), [pSrc]"+&r"((unsigned char *)pSrc)
+   : [iDstStride]"r"((int)iDstStride), [iSrcStride]"r"((int)iSrcStride)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_msa.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_msa.c
new file mode 100644
index 0000000000..4ba01edc3b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/copy_mb_msa.c
@@ -0,0 +1,80 @@
+/*!
+ * \copy
+ *     Copyright (C) 2020 Loongson Technology Co. Ltd.
+ *     Contributed by Gu Xiwei(guxiwei-hf@loongson.cn)
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    copy_mb_msa.c
+ *
+ * \brief   MIPS MSA optimizations
+ *
+ * \date    14/05/2020 Created
+ *
+ *************************************************************************************
+ */
+
+#include <stdint.h>
+#include "msa_macros.h"
+
+void WelsCopy8x8_msa(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                     int32_t  iStrideS ) {
+    v16u8 src0, src1;
+    for (int i = 0; i < 4; i++) {
+        MSA_LD_V2(v16u8, pSrc, iStrideS, src0, src1);
+        MSA_ST_D(src0, 0, pDst);
+        MSA_ST_D(src1, 0, pDst + iStrideD);
+        pSrc += 2 * iStrideS;
+        pDst += 2 * iStrideD;
+    }
+}
+
+void WelsCopy8x16_msa(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                      int32_t iStrideS) {
+    WelsCopy8x8_msa(pDst, iStrideD, pSrc, iStrideS);
+    WelsCopy8x8_msa(pDst + 8 * iStrideD, iStrideD,
+                    pSrc + 8 * iStrideS, iStrideS);
+}
+
+void WelsCopy16x8_msa(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                      int32_t iStrideS) {
+    v16u8 src0, src1;
+    for (int i = 0; i < 4; i++) {
+        MSA_LD_V2(v16u8, pSrc, iStrideS, src0, src1);
+        MSA_ST_V2(v16u8, src0, src1, pDst, iStrideD);
+        pSrc += 2 * iStrideS;
+        pDst += 2 * iStrideD;
+    }
+}
+
+void WelsCopy16x16_msa(uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc,
+                       int32_t iStrideS) {
+    WelsCopy16x8_msa(pDst, iStrideD, pSrc, iStrideS);
+    WelsCopy16x8_msa(pDst + 8 * iStrideD, iStrideD,
+                     pSrc + 8 * iStrideS, iStrideS);
+};
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_mmi.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_mmi.c
new file mode 100644
index 0000000000..08e9e4900f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_mmi.c
@@ -0,0 +1,2826 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblock_mmi.c
+ *
+ * \brief   Loongson optimize
+ *
+ * \date    20/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+void DeblockLumaLt4V_mmi(uint8_t *pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta, int8_t *pTC) {
+  unsigned char tmp[512] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "dsll       $8, %[iStride], 0x1                       \n\t"
+    "daddu      $8, $8, %[iStride]                        \n\t"
+    "dsubu      $14, %[pPix], $8                          \n\t"
+
+    "dsll       $8, %[iStride], 0x1                       \n\t"
+    "dsubu      $9, %[pPix], $8                           \n\t"
+
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+    "dsubu      $13, %[pPix], %[iStride]                  \n\t"
+    "daddu      %[iStride], %[iStride], %[pPix]           \n\t"
+    "daddu      $12, $8, %[pPix]                          \n\t"
+
+    "punpcklhw  $f0, $f0, $f0                             \n\t"
+    "lb         $8, 0x0(%[pTC])                           \n\t"
+    "punpcklwd  $f0, $f0, $f0                             \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+    "gssqc1     $f2, $f0, 432-112(%[tmp])                 \n\t"
+    "dmtc1      %[iBeta], $f0                             \n\t"
+    "lb         %[iAlpha], 0x1(%[pTC])                    \n\t"
+    "dli        %[iBeta], 0xFFFF                          \n\t"
+    "punpcklhw  $f0, $f0, $f0                             \n\t"
+    "and        $10, %[iAlpha], %[iBeta]                  \n\t"
+    "punpcklwd  $f0, $f0, $f0                             \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+    "and        %[iAlpha], %[iAlpha], %[iBeta]            \n\t"
+    "dmtc1      $10, $f4                                  \n\t"
+    "mov.d      $f8, $f4                                  \n\t"
+    "dmtc1      %[iAlpha], $f16                           \n\t"
+    "and        %[iAlpha], $8, %[iBeta]                   \n\t"
+    "dmtc1      %[iAlpha], $f20                           \n\t"
+    "mov.d      $f24, $f20                                \n\t"
+    "mov.d      $f28, $f20                                \n\t"
+    "gssqc1     $f2, $f0, 432-336(%[tmp])                 \n\t"
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+
+    "lb         %[iAlpha], 0x3(%[pTC])                    \n\t"
+    "lb         %[pTC], 0x2(%[pTC])                       \n\t"
+    "dmtc1      $10, $f12                                 \n\t"
+    "punpcklhw  $f0, $f0, $f16                            \n\t"
+    "and        $8, %[iAlpha], %[iBeta]                   \n\t"
+    "punpcklhw  $f24, $f24, $f8                           \n\t"
+    "punpcklhw  $f20, $f20, $f4                           \n\t"
+    "punpcklhw  $f0, $f0, $f24                            \n\t"
+    "punpcklhw  $f28, $f28, $f12                          \n\t"
+    "punpcklhw  $f28, $f28, $f20                          \n\t"
+    "punpckhhw  $f2, $f0, $f28                            \n\t"
+    "punpcklhw  $f0, $f0, $f28                            \n\t"
+    "gssqc1     $f2, $f0, 432-400(%[tmp])                 \n\t"
+    "dmtc1      $8, $f0                                   \n\t"
+    "and        %[iAlpha], %[iAlpha], %[iBeta]            \n\t"
+    "mov.d      $f8, $f0                                  \n\t"
+    "dmtc1      %[iAlpha], $f16                           \n\t"
+    "and        %[iAlpha], %[pTC], %[iBeta]               \n\t"
+    "dmtc1      $8, $f12                                  \n\t"
+    "dmtc1      %[iAlpha], $f20                           \n\t"
+    "punpcklhw  $f20, $f20, $f0                           \n\t"
+
+    "xor        $f0, $f0, $f0                             \n\t"
+    "dmtc1      %[iAlpha], $f24                           \n\t"
+    "and        %[pTC], %[pTC], %[iBeta]                  \n\t"
+    "punpcklhw  $f24, $f24, $f8                           \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "dmtc1      %[pTC], $f4                               \n\t"
+
+    "gslqc1     $f10, $f8, 0x0($9)                        \n\t"
+    "punpckhbh  $f10, $f8, $f0                            \n\t"
+    "punpcklbh  $f8, $f8, $f0                             \n\t"
+
+    "dli        %[iAlpha], 0x4                            \n\t"
+    "seh        %[pTC], %[iAlpha]                         \n\t"
+    "punpcklhw  $f28, $f28, $f12                          \n\t"
+    "punpcklhw  $f28, $f28, $f20                          \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[iStride])               \n\t"
+    "gslqc1     $f14, $f12, 0x0($13)                      \n\t"
+    "gsldxc1    $f2, 0x0($12, $0)                         \n\t"
+    "punpckhbh  $f22, $f20, $f0                           \n\t"
+    "punpcklbh  $f20, $f20, $f0                           \n\t"
+    "gssqc1     $f22, $f20, 432-240(%[tmp])               \n\t"
+    "punpckhbh  $f22, $f2, $f0                            \n\t"
+    "punpcklbh  $f20, $f2, $f0                            \n\t"
+    "gssqc1     $f22, $f20, 432-352(%[tmp])               \n\t"
+    "punpcklhw  $f4, $f4, $f16                            \n\t"
+    "gslqc1     $f18, $f16, 0x0($14)                      \n\t"
+    "punpcklhw  $f4, $f4, $f24                            \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[pPix])                  \n\t"
+    "punpckhhw  $f6, $f4, $f28                            \n\t"
+    "punpcklhw  $f4, $f4, $f28                            \n\t"
+    "punpckhbh  $f26, $f24, $f0                           \n\t"
+    "punpcklbh  $f24, $f24, $f0                           \n\t"
+    "punpckhbh  $f14, $f12, $f0                           \n\t"
+    "punpcklbh  $f12, $f12, $f0                           \n\t"
+    "punpckhbh  $f18, $f16, $f0                           \n\t"
+    "punpcklbh  $f16, $f16, $f0                           \n\t"
+    "psubh      $f28, $f12, $f16                          \n\t"
+    "psubh      $f30, $f14, $f18                          \n\t"
+    "gssqc1     $f18, $f16, 432-272(%[tmp])               \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f16, $f18)
+    "gslqc1     $f18, $f16, 432-336(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 432-352(%[tmp])                 \n\t"
+    "pcmpgth    $f20, $f16, $f28                          \n\t"
+    "pcmpgth    $f22, $f18, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-288(%[tmp])               \n\t"
+    "psubh      $f28, $f24, $f0                           \n\t"
+    "psubh      $f30, $f26, $f2                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f20, $f22)
+    "pcmpgth    $f20, $f16, $f28                          \n\t"
+    "pcmpgth    $f22, $f18, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-256(%[tmp])               \n\t"
+    "pavgh      $f20, $f12, $f24                          \n\t"
+    "pavgh      $f22, $f14, $f26                          \n\t"
+    "gssqc1     $f22, $f20, 432-304(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 432-400(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-288(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 432-256(%[tmp])                 \n\t"
+    "psubh      $f20, $f20, $f28                          \n\t"
+    "psubh      $f22, $f22, $f30                          \n\t"
+    "psubh      $f20, $f20, $f0                           \n\t"
+    "psubh      $f22, $f22, $f2                           \n\t"
+    "gssqc1     $f22, $f20, 432-224(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 432-240(%[tmp])                 \n\t"
+    "psubh      $f20, $f24, $f12                          \n\t"
+    "psubh      $f22, $f26, $f14                          \n\t"
+    "gssqc1     $f26, $f24, 432-32(%[tmp])                \n\t"
+    "psubh      $f24, $f24, $f0                           \n\t"
+    "psubh      $f26, $f26, $f2                           \n\t"
+    "gssqc1     $f22, $f20, 432-384(%[tmp])               \n\t"
+    WELS_AbsH($f28, $f30, $f20, $f22, $f28, $f30)
+    "gslqc1     $f22, $f20, 432-112(%[tmp])               \n\t"
+    "pcmpgth    $f20, $f20, $f28                          \n\t"
+    "pcmpgth    $f22, $f22, $f30                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "pcmpgth    $f28, $f16, $f24                          \n\t"
+    "pcmpgth    $f30, $f18, $f26                          \n\t"
+
+    "xor        $f0, $f0, $f0                             \n\t"
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "psubh      $f24, $f12, $f8                           \n\t"
+    "psubh      $f26, $f14, $f10                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "pcmpgth    $f28, $f16, $f24                          \n\t"
+    "pcmpgth    $f30, $f18, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-400(%[tmp])               \n\t"
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "pcmpgth    $f28, $f24, $f0                           \n\t"
+    "pcmpgth    $f30, $f26, $f0                           \n\t"
+    "pcmpeqh    $f24, $f24, $f0                           \n\t"
+    "pcmpeqh    $f26, $f26, $f0                           \n\t"
+    "or         $f28, $f28, $f24                          \n\t"
+    "or         $f30, $f30, $f26                          \n\t"
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-320(%[tmp])               \n\t"
+    "dmtc1      %[pTC], $f20                              \n\t"
+    "punpckhhw  $f26, $f20, $f20                          \n\t"
+    "punpcklhw  $f24, $f20, $f20                          \n\t"
+    "punpcklwd  $f20, $f24, $f24                          \n\t"
+    "mov.d      $f22, $f20                                \n\t"
+    "gssqc1     $f22, $f20, 432-336(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 432-224(%[tmp])               \n\t"
+    "psubh      $f24, $f0, $f20                           \n\t"
+    "dli        $11, 0x2                                  \n\t"
+    "psubh      $f26, $f0, $f22                           \n\t"
+    "dmtc1      $11, $f28                                 \n\t"
+    "gslqc1     $f22, $f20, 432-384(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 432-240(%[tmp])                 \n\t"
+    "psllh      $f20, $f20, $f28                          \n\t"
+    "psllh      $f22, $f22, $f28                          \n\t"
+    "psubh      $f28, $f8, $f0                            \n\t"
+    "psubh      $f30, $f10, $f2                           \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-336(%[tmp])               \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "dli        $11, 0x3                                  \n\t"
+    "dmtc1      $11, $f20                                 \n\t"
+    "psrah      $f28, $f28, $f20                          \n\t"
+    "psrah      $f30, $f30, $f20                          \n\t"
+    "gslqc1     $f22, $f20, 432-224(%[tmp])               \n\t"
+    "pmaxsh     $f24, $f24, $f28                          \n\t"
+    "pmaxsh     $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f2, $f0, 432-320(%[tmp])                 \n\t"
+    "pminsh     $f20, $f20, $f24                          \n\t"
+    "pminsh     $f22, $f22, $f26                          \n\t"
+
+    "and        $f20, $f20, $f0                           \n\t"
+    "and        $f22, $f22, $f2                           \n\t"
+    "gslqc1     $f26, $f24, 432-400(%[tmp])               \n\t"
+    "gssqc1     $f22, $f20, 432-64(%[tmp])                \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "gssqc1     $f26, $f24, 432-384(%[tmp])               \n\t"
+    "psubh      $f20, $f0, $f24                           \n\t"
+    "psubh      $f22, $f0, $f26                           \n\t"
+    "gssqc1     $f22, $f20, 432-368(%[tmp])               \n\t"
+    "mov.d      $f24, $f20                                \n\t"
+    "mov.d      $f26, $f22                                \n\t"
+    "gslqc1     $f22, $f20, 432-272(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-304(%[tmp])               \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "paddh      $f28, $f8, $f8                            \n\t"
+    "paddh      $f30, $f10, $f10                          \n\t"
+    "psubh      $f20, $f20, $f28                          \n\t"
+    "psubh      $f22, $f22, $f30                          \n\t"
+    "dli        $11, 0x1                                  \n\t"
+    "dmtc1      $11, $f28                                 \n\t"
+    "psrah      $f20, $f20, $f28                          \n\t"
+    "psrah      $f22, $f22, $f28                          \n\t"
+    "pmaxsh     $f24, $f24, $f20                          \n\t"
+    "pmaxsh     $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-384(%[tmp])               \n\t"
+    "pminsh     $f20, $f20, $f24                          \n\t"
+    "pminsh     $f22, $f22, $f26                          \n\t"
+
+    "gslqc1     $f26, $f24, 432-320(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-288(%[tmp])               \n\t"
+    "and        $f20, $f20, $f24                          \n\t"
+    "and        $f22, $f22, $f26                          \n\t"
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "gslqc1     $f26, $f24, 432-240(%[tmp])               \n\t"
+    "gssqc1     $f22, $f20, 432-96(%[tmp])                \n\t"
+    "gslqc1     $f22, $f20, 432-352(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-304(%[tmp])               \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "paddh      $f28, $f24, $f24                          \n\t"
+    "paddh      $f30, $f26, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-368(%[tmp])               \n\t"
+    "dli        $11, 0x1                                  \n\t"
+    "psubh      $f20, $f20, $f28                          \n\t"
+    "dmtc1      $11, $f28                                 \n\t"
+    "psubh      $f22, $f22, $f30                          \n\t"
+
+    "psrah      $f20, $f20, $f28                          \n\t"
+    "psrah      $f22, $f22, $f28                          \n\t"
+    "gslqc1     $f30, $f28, 0x0(%[iStride])               \n\t"
+    "pmaxsh     $f24, $f24, $f20                          \n\t"
+    "pmaxsh     $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-400(%[tmp])               \n\t"
+    "pminsh     $f20, $f20, $f24                          \n\t"
+    "pminsh     $f22, $f22, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-320(%[tmp])               \n\t"
+    "and        $f20, $f20, $f24                          \n\t"
+    "and        $f22, $f22, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-256(%[tmp])               \n\t"
+    "and        $f20, $f20, $f24                          \n\t"
+    "and        $f22, $f22, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x0($9)                       \n\t"
+    "punpcklbh  $f28, $f30, $f0                           \n\t"
+    "punpckhbh  $f30, $f30, $f0                           \n\t"
+    "gssqc1     $f30, $f28, 432-352(%[tmp])               \n\t"
+
+    "gslqc1     $f30, $f28, 0x0($12)                      \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f22, $f20, 432-48(%[tmp])                \n\t"
+    "gslqc1     $f22, $f20, 0x0($14)                      \n\t"
+    "gssqc1     $f26, $f24, 432-368(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 0x0($13)                      \n\t"
+    "punpcklbh  $f28, $f30, $f0                           \n\t"
+    "punpckhbh  $f30, $f30, $f0                           \n\t"
+    "punpcklbh  $f20, $f22, $f0                           \n\t"
+    "punpckhbh  $f22, $f22, $f0                           \n\t"
+    "gssqc1     $f30, $f28, 432-384(%[tmp])               \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f26, $f24, 432-400(%[tmp])               \n\t"
+
+    "gslqc1     $f30, $f28, 432-400(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[pPix])                  \n\t"
+    "psubh      $f28, $f28, $f20                          \n\t"
+    "psubh      $f30, $f30, $f22                          \n\t"
+    "gssqc1     $f22, $f20, 432-16(%[tmp])                \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f20, $f22)
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "pcmpgth    $f20, $f16, $f28                          \n\t"
+    "pcmpgth    $f22, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 432-384(%[tmp])               \n\t"
+    "gssqc1     $f22, $f20, 432-288(%[tmp])               \n\t"
+
+    "psubh      $f28, $f24, $f28                          \n\t"
+    "psubh      $f30, $f26, $f30                          \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f20, $f22)
+    "pcmpgth    $f20, $f16, $f28                          \n\t"
+    "pcmpgth    $f22, $f18, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-256(%[tmp])               \n\t"
+
+    "gslqc1     $f22, $f20, 432-400(%[tmp])               \n\t"
+    "gssqc1     $f26, $f24, 432-80(%[tmp])                \n\t"
+    "pavgh      $f20, $f20, $f24                          \n\t"
+    "pavgh      $f22, $f22, $f26                          \n\t"
+    "gssqc1     $f22, $f20, 432-304(%[tmp])               \n\t"
+
+    "gslqc1     $f22, $f20, 432-288(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-256(%[tmp])               \n\t"
+    "psubh      $f20, $f4, $f20                           \n\t"
+    "psubh      $f22, $f6, $f22                           \n\t"
+    "psubh      $f20, $f20, $f28                          \n\t"
+    "psubh      $f22, $f22, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-224(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 432-400(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 432-352(%[tmp])               \n\t"
+    "psubh      $f20, $f24, $f20                          \n\t"
+    "psubh      $f22, $f26, $f22                          \n\t"
+    "psubh      $f24, $f24, $f28                          \n\t"
+    "psubh      $f26, $f26, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 432-272(%[tmp])               \n\t"
+    "mov.d      $f28, $f20                                \n\t"
+    "mov.d      $f30, $f22                                \n\t"
+    WELS_AbsH($f28, $f30, $f20, $f22, $f0, $f2)
+    "gslqc1     $f22, $f20, 432-112(%[tmp])               \n\t"
+    "pcmpgth    $f20, $f20, $f28                          \n\t"
+    "pcmpgth    $f22, $f22, $f30                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "pcmpgth    $f28, $f16, $f24                          \n\t"
+    "pcmpgth    $f30, $f18, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-368(%[tmp])               \n\t"
+
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 432-400(%[tmp])               \n\t"
+    "psubh      $f28, $f28, $f24                          \n\t"
+    "psubh      $f30, $f30, $f26                          \n\t"
+    "gslqc1     $f2, $f0, 432-352(%[tmp])                 \n\t"
+    "psubh      $f24, $f24, $f0                           \n\t"
+    "psubh      $f26, $f26, $f2                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f0, $f2)
+    "pcmpgth    $f16, $f16, $f28                          \n\t"
+    "pcmpgth    $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 432-96(%[tmp])                \n\t"
+    "and        $f20, $f20, $f16                          \n\t"
+    "and        $f22, $f22, $f18                          \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+
+    "paddh      $f8, $f8, $f28                            \n\t"
+    "paddh      $f10, $f10, $f30                          \n\t"
+    "pcmpgth    $f16, $f4, $f0                            \n\t"
+    "pcmpgth    $f18, $f6, $f0                            \n\t"
+    "pcmpeqh    $f28, $f4, $f0                            \n\t"
+    "pcmpeqh    $f30, $f6, $f0                            \n\t"
+    "or         $f16, $f16, $f28                          \n\t"
+    "or         $f18, $f18, $f30                          \n\t"
+    "and        $f20, $f20, $f16                          \n\t"
+    "and        $f22, $f22, $f18                          \n\t"
+    "gslqc1     $f18, $f16, 432-224(%[tmp])               \n\t"
+    "gssqc1     $f22, $f20, 432-320(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 432-272(%[tmp])               \n\t"
+    "dli        $11, 0x2                                  \n\t"
+    "psubh      $f28, $f0, $f16                           \n\t"
+    "psubh      $f30, $f0, $f18                           \n\t"
+    "psubh      $f2, $f0, $f6                             \n\t"
+    "psubh      $f0, $f0, $f4                             \n\t"
+    "dmfc1      %[iAlpha], $f28                           \n\t"
+    "dmtc1      $11, $f28                                 \n\t"
+    "psllh      $f20, $f20, $f28                          \n\t"
+    "psllh      $f22, $f22, $f28                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-336(%[tmp])               \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-368(%[tmp])               \n\t"
+    "dli        $11, 0x3                                  \n\t"
+    "gssqc1     $f2, $f0, 432-336(%[tmp])                 \n\t"
+    "dmfc1      %[iAlpha], $f0                            \n\t"
+    "dmtc1      $11, $f0                                  \n\t"
+    "psrah      $f24, $f24, $f0                           \n\t"
+    "psrah      $f26, $f26, $f0                           \n\t"
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+    "pmaxsh     $f28, $f28, $f24                          \n\t"
+    "pmaxsh     $f30, $f30, $f26                          \n\t"
+    "pminsh     $f16, $f16, $f28                          \n\t"
+    "pminsh     $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 432-320(%[tmp])               \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+    "mov.d      $f24, $f0                                 \n\t"
+    "mov.d      $f26, $f2                                 \n\t"
+    "gslqc1     $f2, $f0, 432-16(%[tmp])                  \n\t"
+    "gslqc1     $f30, $f28, 432-304(%[tmp])               \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "paddh      $f2, $f2, $f30                            \n\t"
+    "gssqc1     $f18, $f16, 432-272(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 432-368(%[tmp])               \n\t"
+    "dli        $11, 0x1                                  \n\t"
+    "paddh      $f16, $f16, $f16                          \n\t"
+    "paddh      $f18, $f18, $f18                          \n\t"
+    "psubh      $f0, $f0, $f16                            \n\t"
+    "psubh      $f2, $f2, $f18                            \n\t"
+
+    "dmtc1      $11, $f28                                 \n\t"
+    "gslqc1     $f18, $f16, 432-64(%[tmp])                \n\t"
+    "psrah      $f0, $f0, $f28                            \n\t"
+    "psrah      $f2, $f2, $f28                            \n\t"
+    "pmaxsh     $f24, $f24, $f0                           \n\t"
+    "pmaxsh     $f26, $f26, $f2                           \n\t"
+    "gslqc1     $f2, $f0, 432-400(%[tmp])                 \n\t"
+    "pminsh     $f28, $f4, $f24                           \n\t"
+    "pminsh     $f30, $f6, $f26                           \n\t"
+    "gslqc1     $f26, $f24, 432-320(%[tmp])               \n\t"
+    "and        $f28, $f28, $f24                          \n\t"
+    "and        $f30, $f30, $f26                          \n\t"
+    "dmfc1      %[iAlpha], $f24                           \n\t"
+    "dmfc1      %[iBeta], $f26                            \n\t"
+    "gslqc1     $f26, $f24, 432-288(%[tmp])               \n\t"
+    "and        $f28, $f28, $f24                          \n\t"
+    "and        $f30, $f30, $f26                          \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f20, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 432-272(%[tmp])               \n\t"
+    "paddh      $f0, $f0, $f20                            \n\t"
+    "paddh      $f2, $f2, $f22                            \n\t"
+    "paddh      $f12, $f12, $f16                          \n\t"
+    "paddh      $f14, $f14, $f18                          \n\t"
+    "packushb   $f12, $f12, $f14                          \n\t"
+    "packushb   $f14, $f0, $f2                            \n\t"
+
+    "gslqc1     $f2, $f0, 432-32(%[tmp])                  \n\t"
+    "psubh      $f0, $f0, $f16                            \n\t"
+    "psubh      $f2, $f2, $f18                            \n\t"
+    "gslqc1     $f18, $f16, 432-80(%[tmp])                \n\t"
+    "psubh      $f16, $f16, $f20                          \n\t"
+    "gslqc1     $f26, $f24, 432-48(%[tmp])                \n\t"
+    "psubh      $f18, $f18, $f22                          \n\t"
+
+    "gslqc1     $f22, $f20, 432-240(%[tmp])               \n\t"
+    "paddh      $f20, $f20, $f24                          \n\t"
+    "paddh      $f22, $f22, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 432-304(%[tmp])               \n\t"
+    "packushb   $f0, $f0, $f2                             \n\t"
+    "packushb   $f2, $f16, $f18                           \n\t"
+    "gslqc1     $f18, $f16, 432-384(%[tmp])               \n\t"
+    "paddh      $f16, $f16, $f24                          \n\t"
+    "paddh      $f18, $f18, $f26                          \n\t"
+    "gssqc1     $f2, $f0, 480-208(%[tmp])                 \n\t"
+    "gslqc1     $f2, $f0, 432-352(%[tmp])                 \n\t"
+    "mov.d      $f28, $f0                                 \n\t"
+    "mov.d      $f30, $f2                                 \n\t"
+    "paddh      $f0, $f0, $f0                             \n\t"
+    "paddh      $f2, $f2, $f2                             \n\t"
+
+    "dmtc1      %[iAlpha], $f24                           \n\t"
+    "dmtc1      %[iBeta], $f26                            \n\t"
+
+    "psubh      $f16, $f16, $f0                           \n\t"
+    "psubh      $f18, $f18, $f2                           \n\t"
+    "dli        $11, 0x1                                  \n\t"
+    "gslqc1     $f2, $f0, 432-336(%[tmp])                 \n\t"
+    "gssqc1     $f10, $f8, 0x0($9)                        \n\t"
+    "dmtc1      $11, $f8                                  \n\t"
+    "psrah      $f16, $f16, $f8                           \n\t"
+    "psrah      $f18, $f18, $f8                           \n\t"
+    "pmaxsh     $f0, $f0, $f16                            \n\t"
+    "pmaxsh     $f2, $f2, $f18                            \n\t"
+    "pminsh     $f4, $f4, $f0                             \n\t"
+    "pminsh     $f6, $f6, $f2                             \n\t"
+    "gslqc1     $f2, $f0, 480-208(%[tmp])                 \n\t"
+
+    "gslqc1     $f10, $f8, 428-256+4(%[tmp])              \n\t"
+    "and        $f4, $f4, $f24                            \n\t"
+    "and        $f6, $f6, $f26                            \n\t"
+    "and        $f4, $f4, $f8                             \n\t"
+    "and        $f6, $f6, $f10                            \n\t"
+    "gssqc1     $f14, $f12, 0x0($13)                      \n\t"
+    "paddh      $f28, $f28, $f4                           \n\t"
+    "paddh      $f30, $f30, $f6                           \n\t"
+    "packushb   $f20, $f20, $f22                          \n\t"
+    "packushb   $f22, $f28, $f30                          \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPix])                    \n\t"
+    "gssqc1     $f22, $f20, 0x0(%[iStride])               \n\t"
+    : [pPix]"+&r"((unsigned char *)pPix)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha), [iBeta]"r"(iBeta),
+      [pTC]"r"((unsigned char *)pTC), [tmp]"r"((unsigned char *)tmp)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockLumaTransposeH2V_mmi(uint8_t *pPixY, int32_t iStride,
+                                 uint8_t *pDst) {
+  BACKUP_REG;
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "dsll       $8, %[iStride], 0x3                       \n\t"
+    "daddu      $8, $8, %[pPixY]                          \n\t"
+
+    "daddu      $9, %[pPixY], %[iStride]                  \n\t"
+    "daddu      $10, $8, %[iStride]                       \n\t"
+    "gsldlc1    $f0, 0x7(%[pPixY])                        \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldlc1    $f4, 0x7($9)                              \n\t"
+    "gsldlc1    $f6, 0x7($10)                             \n\t"
+    "gsldrc1    $f0, 0x0(%[pPixY])                        \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "gsldrc1    $f4, 0x0($9)                              \n\t"
+    "gsldrc1    $f6, 0x0($10)                             \n\t"
+    "daddu      %[pPixY], $9, %[iStride]                  \n\t"
+    "daddu      $8, $10, %[iStride]                       \n\t"
+    "daddu      $9, %[pPixY], %[iStride]                  \n\t"
+    "daddu      $10, $8, %[iStride]                       \n\t"
+    "gsldlc1    $f8, 0x7(%[pPixY])                        \n\t"
+    "gsldlc1    $f10, 0x7($8)                             \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7($10)                            \n\t"
+    "gsldrc1    $f8, 0x0(%[pPixY])                        \n\t"
+    "gsldrc1    $f10, 0x0($8)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0($10)                            \n\t"
+
+    "daddu      %[pPixY], $9, %[iStride]                  \n\t"
+    "daddu      $8, $10, %[iStride]                       \n\t"
+    "daddu      $9, %[pPixY], %[iStride]                  \n\t"
+    "daddu      $10, $8, %[iStride]                       \n\t"
+    "gsldlc1    $f16, 0x7(%[pPixY])                       \n\t"
+    "gsldlc1    $f18, 0x7($8)                             \n\t"
+    "gsldlc1    $f20, 0x7($9)                             \n\t"
+    "gsldlc1    $f22, 0x7($10)                            \n\t"
+    "gsldrc1    $f16, 0x0(%[pPixY])                       \n\t"
+    "gsldrc1    $f18, 0x0($8)                             \n\t"
+    "gsldrc1    $f20, 0x0($9)                             \n\t"
+    "gsldrc1    $f22, 0x0($10)                            \n\t"
+    "daddu      %[pPixY], $9, %[iStride]                  \n\t"
+    "daddu      $8, $10, %[iStride]                       \n\t"
+    "daddu      $9, %[pPixY], %[iStride]                  \n\t"
+    "daddu      $10, $8, %[iStride]                       \n\t"
+    "gsldlc1    $f24, 0x7(%[pPixY])                       \n\t"
+    "gsldlc1    $f26, 0x7($8)                             \n\t"
+
+    "gsldlc1    $f28, 0x7($9)                             \n\t"
+    "gsldlc1    $f30, 0x7($10)                            \n\t"
+    "gsldrc1    $f24, 0x0(%[pPixY])                       \n\t"
+    "gsldrc1    $f26, 0x0($8)                             \n\t"
+    "gsldrc1    $f28, 0x0($9)                             \n\t"
+    "gsldrc1    $f30, 0x0($10)                            \n\t"
+
+    MMI_TransTwo8x8B($f0, $f2, $f4, $f6, $f8, $f10, $f12,
+                     $f14, $f16, $f18, $f20, $f22, $f24,
+                     $f26, $f28, $f30, $9, $10)
+
+    "gssqc1     $f18, $f16, 0x0(%[pDst])                  \n\t"
+    "gssqc1     $f10, $f8, 0x10(%[pDst])                  \n\t"
+    "gssqc1     $f14, $f12, 0x20(%[pDst])                 \n\t"
+    "gssqc1     $f30, $f28, 0x30(%[pDst])                 \n\t"
+    "gssqc1     $f22, $f20, 0x40(%[pDst])                 \n\t"
+    "gssqc1     $f6, $f4, 0x50(%[pDst])                   \n\t"
+    "gssqc1     $f26, $f24, 0x60(%[pDst])                 \n\t"
+    "gssqc1     $f2, $f0, 0x70(%[pDst])                   \n\t"
+    : [pPixY] "+&r"((unsigned char *)pPixY)
+    : [iStride] "r"((int)iStride), [pDst] "r"((unsigned char *)pDst)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28",
+      "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockLumaTransposeV2H_mmi(uint8_t *pPixY, int32_t iStride,
+                                 uint8_t *pSrc) {
+  BACKUP_REG;
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pSrc])                    \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[pSrc])                   \n\t"
+    "gslqc1     $f10, $f8, 0x20(%[pSrc])                  \n\t"
+    "gslqc1     $f14, $f12, 0x30(%[pSrc])                 \n\t"
+    "gslqc1     $f18, $f16, 0x40(%[pSrc])                 \n\t"
+    "gslqc1     $f22, $f20, 0x50(%[pSrc])                 \n\t"
+    "gslqc1     $f26, $f24, 0x60(%[pSrc])                 \n\t"
+    "gslqc1     $f30, $f28, 0x70(%[pSrc])                 \n\t"
+
+    MMI_TransTwo8x8B($f0, $f2, $f4, $f6, $f8, $f10, $f12,
+                     $f14, $f16, $f18, $f20, $f22, $f24,
+                     $f26, $f28, $f30, $9, $10)
+
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f16, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f8, 0x7($8)                              \n\t"
+    "gssdrc1    $f16, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f8, 0x0($8)                              \n\t"
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f12, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f28, 0x7($8)                             \n\t"
+    "gssdrc1    $f12, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f28, 0x0($8)                             \n\t"
+
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f20, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f4, 0x7($8)                              \n\t"
+    "gssdrc1    $f20, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f4, 0x0($8)                              \n\t"
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f24, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f0, 0x7($8)                              \n\t"
+    "gssdrc1    $f24, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f0, 0x0($8)                              \n\t"
+
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f18, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f10, 0x7($8)                             \n\t"
+    "gssdrc1    $f18, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f10, 0x0($8)                             \n\t"
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f14, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f30, 0x7($8)                             \n\t"
+    "gssdrc1    $f14, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f30, 0x0($8)                             \n\t"
+
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f22, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f6, 0x7($8)                              \n\t"
+    "gssdrc1    $f22, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f6, 0x0($8)                              \n\t"
+    "daddu      %[pPixY], $8, %[iStride]                  \n\t"
+    "daddu      $8, %[pPixY], %[iStride]                  \n\t"
+    "gssdlc1    $f26, 0x7(%[pPixY])                       \n\t"
+    "gssdlc1    $f2, 0x7($8)                              \n\t"
+    "gssdrc1    $f26, 0x0(%[pPixY])                       \n\t"
+    "gssdrc1    $f2, 0x0($8)                              \n\t"
+    : [pPixY] "+&r"((unsigned char *)pPixY)
+    : [iStride] "r"((int)iStride), [pSrc] "r"((unsigned char *)pSrc)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28",
+      "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockLumaEq4V_mmi(uint8_t *pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta) {
+  unsigned char tmp[720] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "dsll       $11, %[iStride], 0x2                      \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    "daddu      $14, %[iStride], %[pPix]                  \n\t"
+    "dsubu      $8, %[pPix], $11                          \n\t"
+    "gslqc1     $f14, $f12, 0x0($8)                       \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[pPix])                  \n\t"
+    "daddu      $9, %[iStride], %[iStride]                \n\t"
+    "daddu      $10, $9, %[iStride]                       \n\t"
+    "move       $12, $9                                   \n\t"
+    "dsubu      $8, %[pPix], $9                           \n\t"
+    "gslqc1     $f6, $f4, 0x0($8)                         \n\t"
+    "dsubu      $9, %[pPix], %[iStride]                   \n\t"
+    "gslqc1     $f18, $f16, 0x0($9)                       \n\t"
+    "daddu      $13, %[iStride], %[pPix]                  \n\t"
+
+    "move       %[iStride], $12                           \n\t"
+    "daddu      $15, $12, %[pPix]                         \n\t"
+
+    "daddu      $12, %[pPix], $10                         \n\t"
+    "dsubu      $11, %[pPix], $10                         \n\t"
+
+    "gslqc1     $f26, $f24, 0x0($11)                      \n\t"
+    "daddu      %[iStride], %[iStride], %[pPix]           \n\t"
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+
+    "punpcklhw  $f28, $f0, $f0                            \n\t"
+    "punpcklwd  $f0, $f28, $f28                           \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+    "gssqc1     $f2, $f0, 640-320(%[tmp])                 \n\t"
+    "dmtc1      %[iBeta], $f0                             \n\t"
+    "gsldxc1    $f10, 0x0($15, $0)                        \n\t"
+    "punpcklhw  $f28, $f0, $f0                            \n\t"
+    "punpcklwd  $f0, $f28, $f28                           \n\t"
+    "punpckhbh  $f30, $f10, $f8                           \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+
+    "punpcklbh  $f28, $f10, $f8                           \n\t"
+    "gssqc1     $f2, $f0, 640-512(%[tmp])                 \n\t"
+    "gssqc1     $f30, $f28, 640-416(%[tmp])               \n\t"
+    "mov.d      $f0, $f4                                  \n\t"
+    "gssqc1     $f22, $f20, 704-272(%[tmp])               \n\t"
+    "gssqc1     $f6, $f4, 672-272(%[tmp])                 \n\t"
+    "mov.d      $f4, $f16                                 \n\t"
+    "punpckhbh  $f22, $f20, $f8                           \n\t"
+    "punpcklbh  $f20, $f20, $f8                           \n\t"
+    "punpckhbh  $f6, $f4, $f8                             \n\t"
+    "punpcklbh  $f4, $f4, $f8                             \n\t"
+
+    "psubh      $f28, $f20, $f4                           \n\t"
+    "psubh      $f30, $f22, $f6                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f2, $f10)
+    "gssqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "punpckhbh  $f2, $f0, $f8                             \n\t"
+    "punpcklbh  $f0, $f0, $f8                             \n\t"
+    "gssqc1     $f18, $f16, 688-272(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 0x0($14)                      \n\t"
+    "gssqc1     $f2, $f0, 640-480(%[tmp])                 \n\t"
+
+    "psubh      $f28, $f4, $f0                            \n\t"
+    "psubh      $f30, $f6, $f2                            \n\t"
+
+    "gslqc1     $f2, $f0, 640-512(%[tmp])                 \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f18, $f10)
+    "punpckhbh  $f18, $f16, $f8                           \n\t"
+    "punpcklbh  $f16, $f16, $f8                           \n\t"
+    "pcmpgth    $f0, $f0, $f28                            \n\t"
+    "pcmpgth    $f2, $f2, $f30                            \n\t"
+    "gssqc1     $f18, $f16, 640-384(%[tmp])               \n\t"
+    "psubh      $f28, $f20, $f16                          \n\t"
+    "psubh      $f30, $f22, $f18                          \n\t"
+    "gslqc1     $f18, $f16, 640-512(%[tmp])               \n\t"
+    "gssqc1     $f26, $f24, 656-272(%[tmp])               \n\t"
+    "punpckhbh  $f26, $f24, $f8                           \n\t"
+    "punpcklbh  $f24, $f24, $f8                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "gssqc1     $f26, $f24, 640-368(%[tmp])               \n\t"
+    "gssqc1     $f6, $f4, 640-144(%[tmp])                 \n\t"
+    "gssqc1     $f22, $f20, 640-400(%[tmp])               \n\t"
+    "pcmpgth    $f16, $f16, $f28                          \n\t"
+    "pcmpgth    $f18, $f18, $f30                          \n\t"
+    "and        $f0, $f0, $f16                            \n\t"
+    "and        $f2, $f2, $f18                            \n\t"
+    "gslqc1     $f18, $f16, 640-320(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "dli        %[iBeta], 0x2                             \n\t"
+    "pcmpgth    $f16, $f16, $f28                          \n\t"
+    "pcmpgth    $f18, $f18, $f30                          \n\t"
+    "and        $f0, $f0, $f16                            \n\t"
+    "and        $f2, $f2, $f18                            \n\t"
+    "dmtc1      %[iAlpha], $f16                           \n\t"
+    "dmtc1      %[iBeta], $f10                            \n\t"
+    "gssqc1     $f2, $f0, 736-272(%[tmp])                 \n\t"
+    "gslqc1     $f2, $f0, 640-320(%[tmp])                 \n\t"
+
+    "punpcklhw  $f28, $f16, $f16                          \n\t"
+    "psrah      $f16, $f0, $f10                           \n\t"
+    "psrah      $f18, $f2, $f10                           \n\t"
+    "punpcklwd  $f28, $f28, $f28                          \n\t"
+    "mov.d      $f30, $f28                                \n\t"
+    "gslqc1     $f10, $f8, 640-560(%[tmp])                \n\t"
+    "paddh      $f16, $f16, $f28                          \n\t"
+    "paddh      $f18, $f18, $f30                          \n\t"
+    "gssqc1     $f18, $f16, 640-576(%[tmp])               \n\t"
+    "pcmpgth    $f16, $f16, $f8                           \n\t"
+    "pcmpgth    $f18, $f18, $f10                          \n\t"
+    "gssqc1     $f18, $f16, 640-560(%[tmp])               \n\t"
+
+    "gssqc1     $f30, $f28, 640-624(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 640-512(%[tmp])               \n\t"
+    "psubh      $f28, $f4, $f24                           \n\t"
+    "psubh      $f30, $f6, $f26                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "gslqc1     $f10, $f8, 640-560(%[tmp])                \n\t"
+    "pcmpgth    $f16, $f16, $f28                          \n\t"
+    "pcmpgth    $f18, $f18, $f30                          \n\t"
+
+    "gslqc1     $f2, $f0, 640-416(%[tmp])                 \n\t"
+    "and        $f16, $f16, $f8                           \n\t"
+    "and        $f18, $f18, $f10                          \n\t"
+    "gssqc1     $f18, $f16, 640-544(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 640-512(%[tmp])               \n\t"
+    "psubh      $f28, $f20, $f0                           \n\t"
+    "psubh      $f30, $f22, $f2                           \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "gslqc1     $f10, $f8, 640-560(%[tmp])                \n\t"
+    "pcmpgth    $f16, $f16, $f28                          \n\t"
+    "pcmpgth    $f18, $f18, $f30                          \n\t"
+
+    "and        $f16, $f16, $f8                           \n\t"
+    "and        $f18, $f18, $f10                          \n\t"
+    "gssqc1     $f18, $f16, 640-560(%[tmp])               \n\t"
+
+    "gslqc1     $f18, $f16, 640-544(%[tmp])               \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    "pandn      $f16, $f16, $f24                          \n\t"
+    "dli        %[iAlpha], 0x4                            \n\t"
+    "pandn      $f18, $f18, $f26                          \n\t"
+    "gssqc1     $f18, $f16, 640-16(%[tmp])                \n\t"
+    "dmtc1      %[iAlpha], $f16                           \n\t"
+    "punpcklhw  $f28, $f16, $f16                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+    "punpckhbh  $f18, $f12, $f8                           \n\t"
+    "dmtc1      %[iAlpha], $f30                           \n\t"
+    "punpcklbh  $f16, $f12, $f8                           \n\t"
+    "psllh      $f16, $f16, $f30                          \n\t"
+    "psllh      $f18, $f18, $f30                          \n\t"
+    "paddh      $f16, $f16, $f24                          \n\t"
+    "paddh      $f18, $f18, $f26                          \n\t"
+    "gslqc1     $f2, $f0, 640-480(%[tmp])                 \n\t"
+    "paddh      $f16, $f16, $f24                          \n\t"
+    "paddh      $f18, $f18, $f26                          \n\t"
+    "paddh      $f16, $f16, $f24                          \n\t"
+    "paddh      $f18, $f18, $f26                          \n\t"
+    "paddh      $f16, $f16, $f0                           \n\t"
+    "paddh      $f18, $f18, $f2                           \n\t"
+
+    "gslqc1     $f26, $f24, 640-560(%[tmp])               \n\t"
+    "punpcklwd  $f28, $f28, $f28                          \n\t"
+    "mov.d      $f30, $f28                                \n\t"
+    "paddh      $f16, $f16, $f4                           \n\t"
+    "paddh      $f18, $f18, $f6                           \n\t"
+    "gssqc1     $f30, $f28, 640-592(%[tmp])               \n\t"
+    "paddh      $f16, $f16, $f20                          \n\t"
+    "paddh      $f18, $f18, $f22                          \n\t"
+    "paddh      $f16, $f16, $f28                          \n\t"
+    "paddh      $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 640-416(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 640-384(%[tmp])                 \n\t"
+    "pandn      $f24, $f24, $f28                          \n\t"
+    "pandn      $f26, $f26, $f30                          \n\t"
+    "gssqc1     $f26, $f24, 640-80(%[tmp])                \n\t"
+    "gslqc1     $f26, $f24, 0x0($12)                      \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "punpckhbh  $f26, $f24, $f8                           \n\t"
+    "punpcklbh  $f24, $f24, $f8                           \n\t"
+    "psllh      $f24, $f24, $f10                          \n\t"
+    "psllh      $f26, $f26, $f10                          \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+
+    "dli        %[iAlpha], 0x3                            \n\t"
+    "gslqc1     $f30, $f28, 640-480(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 640-592(%[tmp])                 \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+    "gslqc1     $f2, $f0, 640-560(%[tmp])                 \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "psrah      $f24, $f24, $f10                          \n\t"
+    "psrah      $f26, $f26, $f10                          \n\t"
+    "and        $f24, $f24, $f0                           \n\t"
+    "and        $f26, $f26, $f2                           \n\t"
+    "gssqc1     $f26, $f24, 640-112(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-544(%[tmp])               \n\t"
+    "pandn      $f24, $f24, $f28                          \n\t"
+    "pandn      $f26, $f26, $f30                          \n\t"
+    "gssqc1     $f26, $f24, 640-336(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-544(%[tmp])               \n\t"
+    "gssqc1     $f26, $f24, 640-528(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-368(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 640-544(%[tmp])                 \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "psrah      $f16, $f16, $f10                          \n\t"
+    "psrah      $f18, $f18, $f10                          \n\t"
+    "and        $f16, $f16, $f0                           \n\t"
+    "and        $f18, $f18, $f2                           \n\t"
+    "gslqc1     $f2, $f0, 640-624(%[tmp])                 \n\t"
+    "paddh      $f28, $f4, $f20                           \n\t"
+    "paddh      $f30, $f6, $f22                           \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+    "gslqc1     $f30, $f28, 640-528(%[tmp])               \n\t"
+    "dli        %[iAlpha], 0x2                            \n\t"
+
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "paddh      $f20, $f20, $f4                           \n\t"
+    "paddh      $f22, $f22, $f6                           \n\t"
+    "psrah      $f24, $f24, $f10                          \n\t"
+    "psrah      $f26, $f26, $f10                          \n\t"
+    "and        $f28, $f28, $f24                          \n\t"
+    "and        $f30, $f30, $f26                          \n\t"
+
+    "gslqc1     $f26, $f24, 640-384(%[tmp])               \n\t"
+    "gssqc1     $f30, $f28, 640-64(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "pandn      $f28, $f28, $f24                          \n\t"
+    "pandn      $f30, $f30, $f26                          \n\t"
+    "gssqc1     $f30, $f28, 640-304(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 640-416(%[tmp])               \n\t"
+    "gslqc1     $f10, $f8, 640-624(%[tmp])                \n\t"
+    "paddh      $f28, $f28, $f24                          \n\t"
+    "paddh      $f30, $f30, $f26                          \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "paddh      $f28, $f28, $f8                           \n\t"
+    "paddh      $f30, $f30, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "gslqc1     $f22, $f20, 640-560(%[tmp])               \n\t"
+    "psrah      $f28, $f28, $f10                          \n\t"
+    "psrah      $f30, $f30, $f10                          \n\t"
+    "and        $f20, $f20, $f28                          \n\t"
+    "and        $f22, $f22, $f30                          \n\t"
+    "gssqc1     $f22, $f20, 640-32(%[tmp])                \n\t"
+
+    "gslqc1     $f22, $f20, 640-480(%[tmp])               \n\t"
+    "gslqc1     $f2, $f0, 640-592(%[tmp])                 \n\t"
+    "gslqc1     $f10, $f8, 640-624(%[tmp])                \n\t"
+    "paddh      $f28, $f20, $f20                          \n\t"
+    "paddh      $f30, $f22, $f22                          \n\t"
+    "paddh      $f20, $f4, $f24                           \n\t"
+    "paddh      $f22, $f6, $f26                           \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "paddh      $f28, $f28, $f8                           \n\t"
+    "paddh      $f30, $f30, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "gslqc1     $f22, $f20, 640-544(%[tmp])               \n\t"
+    "psrah      $f28, $f28, $f10                          \n\t"
+    "psrah      $f30, $f30, $f10                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+    "pandn      $f20, $f20, $f28                          \n\t"
+    "pandn      $f22, $f22, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 640-480(%[tmp])               \n\t"
+    "paddh      $f28, $f28, $f4                           \n\t"
+    "paddh      $f30, $f30, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 640-400(%[tmp])                 \n\t"
+    "paddh      $f28, $f28, $f4                           \n\t"
+    "paddh      $f30, $f30, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 640-544(%[tmp])                 \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "gssqc1     $f22, $f20, 640-352(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 640-368(%[tmp])               \n\t"
+    "psllh      $f28, $f28, $f10                          \n\t"
+    "psllh      $f30, $f30, $f10                          \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+    "paddh      $f28, $f28, $f24                          \n\t"
+    "paddh      $f30, $f30, $f26                          \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "gslqc1     $f30, $f28, 640-400(%[tmp])               \n\t"
+    "psrah      $f20, $f20, $f10                          \n\t"
+    "psrah      $f22, $f22, $f10                          \n\t"
+    "and        $f4, $f4, $f20                            \n\t"
+    "and        $f6, $f6, $f22                            \n\t"
+    "gslqc1     $f22, $f20, 640-480(%[tmp])               \n\t"
+    "gssqc1     $f6, $f4, 640-96(%[tmp])                  \n\t"
+    "gslqc1     $f6, $f4, 640-384(%[tmp])                 \n\t"
+    "gslqc1     $f10, $f8, 640-400(%[tmp])                \n\t"
+    "paddh      $f24, $f4, $f4                            \n\t"
+    "paddh      $f26, $f6, $f6                            \n\t"
+    "paddh      $f4, $f4, $f8                             \n\t"
+    "paddh      $f6, $f6, $f10                            \n\t"
+    "gslqc1     $f10, $f8, 640-144(%[tmp])                \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "paddh      $f4, $f4, $f8                             \n\t"
+    "paddh      $f6, $f6, $f10                            \n\t"
+    "gslqc1     $f10, $f8, 640-592(%[tmp])                \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "paddh      $f20, $f20, $f8                           \n\t"
+    "paddh      $f22, $f22, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-624(%[tmp])                \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+    "gslqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "psrah      $f24, $f24, $f8                           \n\t"
+    "psrah      $f26, $f26, $f8                           \n\t"
+    "psllh      $f4, $f4, $f10                            \n\t"
+    "psllh      $f6, $f6, $f10                            \n\t"
+    "paddh      $f4, $f4, $f20                            \n\t"
+    "paddh      $f6, $f6, $f22                            \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+
+    "gslqc1     $f22, $f20, 656-272(%[tmp])               \n\t"
+    "pandn      $f28, $f28, $f24                          \n\t"
+    "pandn      $f30, $f30, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 640-416(%[tmp])               \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 640-560(%[tmp])                 \n\t"
+    "psrah      $f24, $f24, $f10                          \n\t"
+    "psrah      $f26, $f26, $f10                          \n\t"
+    "and        $f4, $f4, $f24                            \n\t"
+    "and        $f6, $f6, $f26                            \n\t"
+
+    "xor        $f8, $f8, $f8                             \n\t"
+    "gslqc1     $f26, $f24, 704-272(%[tmp])               \n\t"
+    "gssqc1     $f6, $f4, 640-128(%[tmp])                 \n\t"
+    "gslqc1     $f6, $f4, 672-272(%[tmp])                 \n\t"
+    "punpcklbh  $f4, $f6, $f8                             \n\t"
+    "punpckhbh  $f6, $f6, $f8                             \n\t"
+    "gssqc1     $f6, $f4, 640-448(%[tmp])                 \n\t"
+    "gslqc1     $f6, $f4, 688-272(%[tmp])                 \n\t"
+    "punpcklbh  $f4, $f6, $f8                             \n\t"
+    "punpckhbh  $f6, $f6, $f8                             \n\t"
+    "punpcklbh  $f24, $f26, $f8                           \n\t"
+    "punpckhbh  $f26, $f26, $f8                           \n\t"
+    "gssqc1     $f30, $f28, 640-288(%[tmp])               \n\t"
+    "punpcklbh  $f20, $f22, $f8                           \n\t"
+    "punpckhbh  $f22, $f22, $f8                           \n\t"
+    "gslqc1     $f30, $f28, 0x0($14)                      \n\t"
+    "gssqc1     $f6, $f4, 640-496(%[tmp])                 \n\t"
+    "gssqc1     $f26, $f24, 640-432(%[tmp])               \n\t"
+
+    "gsldxc1    $f0, 0x8($15, $0)                         \n\t"
+    "punpcklbh  $f28, $f30, $f8                           \n\t"
+    "punpckhbh  $f30, $f30, $f8                           \n\t"
+    "gssqc1     $f30, $f28, 640-464(%[tmp])               \n\t"
+
+    "punpcklbh  $f28, $f0, $f8                            \n\t"
+    "punpckhbh  $f30, $f0, $f8                            \n\t"
+    "gslqc1     $f10, $f8, 640-464(%[tmp])                \n\t"
+    "gssqc1     $f30, $f28, 640-528(%[tmp])               \n\t"
+
+    "psubh      $f28, $f24, $f4                           \n\t"
+    "psubh      $f30, $f26, $f6                           \n\t"
+    "psubh      $f24, $f24, $f8                           \n\t"
+    "psubh      $f26, $f26, $f10                          \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "gslqc1     $f10, $f8, 640-16(%[tmp])                 \n\t"
+    "gssqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "or         $f16, $f16, $f8                           \n\t"
+    "or         $f18, $f18, $f10                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "gslqc1     $f30, $f28, 640-448(%[tmp])               \n\t"
+    "psubh      $f28, $f4, $f28                           \n\t"
+    "psubh      $f30, $f6, $f30                           \n\t"
+
+    "gslqc1     $f2, $f0, 640-512(%[tmp])                 \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "pcmpgth    $f4, $f0, $f28                            \n\t"
+    "pcmpgth    $f6, $f2, $f30                            \n\t"
+    "pcmpgth    $f28, $f0, $f24                           \n\t"
+    "pcmpgth    $f30, $f2, $f26                           \n\t"
+    "gslqc1     $f26, $f24, 640-320(%[tmp])               \n\t"
+    "and        $f4, $f4, $f28                            \n\t"
+    "and        $f6, $f6, $f30                            \n\t"
+    "gslqc1     $f30, $f28, 640-560(%[tmp])               \n\t"
+    "pcmpgth    $f24, $f24, $f28                          \n\t"
+    "pcmpgth    $f26, $f26, $f30                          \n\t"
+    "and        $f4, $f4, $f24                            \n\t"
+    "and        $f6, $f6, $f26                            \n\t"
+
+    "gslqc1     $f26, $f24, 640-576(%[tmp])               \n\t"
+    "pcmpgth    $f24, $f24, $f28                          \n\t"
+    "pcmpgth    $f26, $f26, $f30                          \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    "gslqc1     $f30, $f28, 640-496(%[tmp])               \n\t"
+    "punpcklbh  $f12, $f14, $f8                           \n\t"
+    "punpckhbh  $f14, $f14, $f8                           \n\t"
+    "gssqc1     $f26, $f24, 640-560(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-512(%[tmp])               \n\t"
+    "psubh      $f28, $f28, $f20                          \n\t"
+    "psubh      $f30, $f30, $f22                          \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "pcmpgth    $f24, $f24, $f28                          \n\t"
+    "pcmpgth    $f26, $f26, $f30                          \n\t"
+
+    "dli        %[iAlpha], 0x1                            \n\t"
+    "gslqc1     $f10, $f8, 640-560(%[tmp])                \n\t"
+    "and        $f24, $f24, $f8                           \n\t"
+    "and        $f26, $f26, $f10                          \n\t"
+    "gslqc1     $f30, $f28, 640-432(%[tmp])               \n\t"
+    "gslqc1     $f10, $f8, 640-528(%[tmp])                \n\t"
+    "psubh      $f28, $f28, $f8                           \n\t"
+    "psubh      $f30, $f30, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f10                           \n\t"
+
+    "psllh      $f12, $f12, $f10                          \n\t"
+    "psllh      $f14, $f14, $f10                          \n\t"
+    "gssqc1     $f26, $f24, 640-544(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-512(%[tmp])               \n\t"
+
+    "gslqc1     $f10, $f8, 640-448(%[tmp])                \n\t"
+    "paddh      $f12, $f12, $f20                          \n\t"
+    "paddh      $f14, $f14, $f22                          \n\t"
+    "paddh      $f12, $f12, $f20                          \n\t"
+    "paddh      $f14, $f14, $f22                          \n\t"
+    "paddh      $f12, $f12, $f20                          \n\t"
+    "paddh      $f14, $f14, $f22                          \n\t"
+    "paddh      $f12, $f12, $f8                           \n\t"
+    "paddh      $f14, $f14, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-496(%[tmp])                \n\t"
+    "gslqc1     $f2, $f0, 640-560(%[tmp])                 \n\t"
+    "paddh      $f12, $f12, $f8                           \n\t"
+    "paddh      $f14, $f14, $f10                          \n\t"
+    WELS_AbsH($f28, $f30, $f28, $f30, $f8, $f10)
+    "pcmpgth    $f24, $f24, $f28                          \n\t"
+    "pcmpgth    $f26, $f26, $f30                          \n\t"
+    "and        $f24, $f24, $f0                           \n\t"
+    "and        $f26, $f26, $f2                           \n\t"
+    "gssqc1     $f26, $f24, 640-560(%[tmp])               \n\t"
+    "gslqc1     $f10, $f8, 640-544(%[tmp])                \n\t"
+
+    "gslqc1     $f2, $f0, 736-272(%[tmp])                 \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+    "gslqc1     $f30, $f28, 640-368(%[tmp])               \n\t"
+    "and        $f24, $f0, $f16                           \n\t"
+    "and        $f26, $f2, $f18                           \n\t"
+    "pandn      $f16, $f0, $f28                           \n\t"
+    "pandn      $f18, $f2, $f30                           \n\t"
+    "or         $f24, $f24, $f16                          \n\t"
+    "or         $f26, $f26, $f18                          \n\t"
+    "gslqc1     $f18, $f16, 640-432(%[tmp])               \n\t"
+    "paddh      $f12, $f12, $f16                          \n\t"
+    "paddh      $f14, $f14, $f18                          \n\t"
+    "gslqc1     $f30, $f28, 640-592(%[tmp])               \n\t"
+    "paddh      $f12, $f12, $f28                          \n\t"
+    "paddh      $f14, $f14, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "psrah      $f12, $f12, $f28                          \n\t"
+    "psrah      $f14, $f14, $f28                          \n\t"
+    "and        $f12, $f12, $f8                           \n\t"
+    "and        $f14, $f14, $f10                          \n\t"
+    "pandn      $f8, $f8, $f20                            \n\t"
+    "pandn      $f10, $f10, $f22                          \n\t"
+    "or         $f12, $f12, $f8                           \n\t"
+    "or         $f14, $f14, $f10                          \n\t"
+    "and        $f28, $f4, $f12                           \n\t"
+    "and        $f30, $f6, $f14                           \n\t"
+    "gslqc1     $f14, $f12, 640-64(%[tmp])                \n\t"
+    "gslqc1     $f10, $f8, 640-336(%[tmp])                \n\t"
+    "or         $f12, $f12, $f8                           \n\t"
+    "or         $f14, $f14, $f10                          \n\t"
+    "pandn      $f8, $f4, $f20                            \n\t"
+    "pandn      $f10, $f6, $f22                           \n\t"
+    "or         $f28, $f28, $f8                           \n\t"
+    "or         $f30, $f30, $f10                          \n\t"
+
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "and        $f8, $f0, $f12                            \n\t"
+    "and        $f10, $f2, $f14                           \n\t"
+    "gslqc1     $f14, $f12, 640-480(%[tmp])               \n\t"
+    "pandn      $f12, $f0, $f12                           \n\t"
+    "pandn      $f14, $f2, $f14                           \n\t"
+    "or         $f8, $f8, $f12                            \n\t"
+    "or         $f10, $f10, $f14                          \n\t"
+    "packushb   $f24, $f24, $f26                          \n\t"
+    "packushb   $f26, $f28, $f30                          \n\t"
+    "gssqc1     $f10, $f8, 640-336(%[tmp])                \n\t"
+    "gssqc1     $f26, $f24, 656-272(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-544(%[tmp])               \n\t"
+    "gslqc1     $f10, $f8, 640-448(%[tmp])                \n\t"
+    "paddh      $f8, $f20, $f8                            \n\t"
+    "paddh      $f10, $f22, $f10                          \n\t"
+    "gslqc1     $f30, $f28, 640-496(%[tmp])               \n\t"
+    "paddh      $f28, $f28, $f16                          \n\t"
+    "paddh      $f30, $f30, $f18                          \n\t"
+    "paddh      $f8, $f8, $f28                            \n\t"
+    "paddh      $f10, $f10, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 640-624(%[tmp])               \n\t"
+    "paddh      $f8, $f8, $f28                            \n\t"
+    "paddh      $f10, $f10, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "psrah      $f8, $f8, $f28                            \n\t"
+    "psrah      $f10, $f10, $f28                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+    "gslqc1     $f30, $f28, 640-544(%[tmp])               \n\t"
+    "and        $f24, $f24, $f8                           \n\t"
+    "and        $f26, $f26, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-448(%[tmp])                \n\t"
+    "pandn      $f28, $f28, $f8                           \n\t"
+    "pandn      $f30, $f30, $f10                          \n\t"
+    "or         $f24, $f24, $f28                          \n\t"
+    "or         $f26, $f26, $f30                          \n\t"
+    "and        $f12, $f4, $f24                           \n\t"
+    "and        $f14, $f6, $f26                           \n\t"
+    "pandn      $f24, $f4, $f8                            \n\t"
+    "pandn      $f26, $f6, $f10                           \n\t"
+    "gslqc1     $f30, $f28, 640-496(%[tmp])               \n\t"
+    "paddh      $f8, $f8, $f28                            \n\t"
+    "paddh      $f10, $f10, $f30                          \n\t"
+    "paddh      $f8, $f8, $f16                            \n\t"
+    "paddh      $f10, $f10, $f18                          \n\t"
+    "or         $f12, $f12, $f24                          \n\t"
+    "or         $f14, $f14, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 640-336(%[tmp])               \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "packushb   $f24, $f24, $f26                          \n\t"
+    "packushb   $f26, $f12, $f14                          \n\t"
+    "psllh      $f8, $f8, $f28                            \n\t"
+    "psllh      $f10, $f10, $f28                          \n\t"
+    "gssqc1     $f26, $f24, 672-272(%[tmp])               \n\t"
+    "gslqc1     $f26, $f24, 640-96(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-352(%[tmp])               \n\t"
+    "or         $f24, $f24, $f28                          \n\t"
+    "or         $f26, $f26, $f30                          \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+
+    "and        $f12, $f0, $f24                           \n\t"
+    "and        $f14, $f2, $f26                           \n\t"
+    "gslqc1     $f26, $f24, 640-144(%[tmp])               \n\t"
+    "pandn      $f24, $f0, $f24                           \n\t"
+    "pandn      $f26, $f2, $f26                           \n\t"
+    "or         $f12, $f12, $f24                          \n\t"
+    "or         $f14, $f14, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 640-544(%[tmp])               \n\t"
+    "gssqc1     $f14, $f12, 640-352(%[tmp])               \n\t"
+    "gslqc1     $f14, $f12, 640-464(%[tmp])               \n\t"
+    "gslqc1     $f30, $f28, 640-592(%[tmp])               \n\t"
+    "paddh      $f12, $f12, $f28                          \n\t"
+    "paddh      $f14, $f14, $f30                          \n\t"
+    "paddh      $f8, $f8, $f12                            \n\t"
+    "paddh      $f10, $f10, $f14                          \n\t"
+    "gslqc1     $f14, $f12, 640-448(%[tmp])               \n\t"
+    "paddh      $f20, $f20, $f8                           \n\t"
+    "paddh      $f22, $f22, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "gslqc1     $f10, $f8, 640-496(%[tmp])                \n\t"
+    "psrah      $f20, $f20, $f28                          \n\t"
+    "psrah      $f22, $f22, $f28                          \n\t"
+    "and        $f24, $f24, $f20                          \n\t"
+    "and        $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f22, $f20, 640-464(%[tmp])               \n\t"
+    "paddh      $f8, $f8, $f20                            \n\t"
+    "paddh      $f10, $f10, $f22                          \n\t"
+    "gslqc1     $f30, $f28, 640-432(%[tmp])               \n\t"
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "paddh      $f16, $f12, $f12                          \n\t"
+    "paddh      $f18, $f14, $f14                          \n\t"
+    "paddh      $f16, $f16, $f8                           \n\t"
+    "paddh      $f18, $f18, $f10                          \n\t"
+    "gslqc1     $f30, $f28, 640-624(%[tmp])               \n\t"
+    "paddh      $f16, $f16, $f28                          \n\t"
+    "paddh      $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f10, $f8, 640-544(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-592(%[tmp])               \n\t"
+    "paddh      $f12, $f12, $f28                          \n\t"
+    "paddh      $f14, $f14, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "psrah      $f16, $f16, $f28                          \n\t"
+    "psrah      $f18, $f18, $f28                          \n\t"
+    "pandn      $f8, $f8, $f16                            \n\t"
+    "pandn      $f10, $f10, $f18                          \n\t"
+    "or         $f24, $f24, $f8                           \n\t"
+    "or         $f26, $f26, $f10                          \n\t"
+    "and        $f28, $f4, $f24                           \n\t"
+    "and        $f30, $f6, $f26                           \n\t"
+    "gslqc1     $f26, $f24, 640-496(%[tmp])               \n\t"
+    "pandn      $f8, $f4, $f24                            \n\t"
+    "pandn      $f10, $f6, $f26                           \n\t"
+    "or         $f28, $f28, $f8                           \n\t"
+    "or         $f30, $f30, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-352(%[tmp])                \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f28, $f30                          \n\t"
+    "gssqc1     $f10, $f8, 688-272(%[tmp])                \n\t"
+    "gslqc1     $f10, $f8, 640-128(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-288(%[tmp])               \n\t"
+    "or         $f8, $f8, $f28                            \n\t"
+    "or         $f10, $f10, $f30                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+
+    "and        $f16, $f0, $f8                            \n\t"
+    "and        $f18, $f2, $f10                           \n\t"
+    "paddh      $f20, $f20, $f24                          \n\t"
+    "paddh      $f22, $f22, $f26                          \n\t"
+    "gslqc1     $f30, $f28, 640-400(%[tmp])               \n\t"
+    "pandn      $f8, $f0, $f28                            \n\t"
+    "pandn      $f10, $f2, $f30                           \n\t"
+    "or         $f16, $f16, $f8                           \n\t"
+    "or         $f18, $f18, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "gslqc1     $f10, $f8, 640-528(%[tmp])                \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+    "psllh      $f20, $f20, $f28                          \n\t"
+    "psllh      $f22, $f22, $f28                          \n\t"
+    "paddh      $f20, $f20, $f12                          \n\t"
+    "paddh      $f22, $f22, $f14                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "gslqc1     $f14, $f12, 640-560(%[tmp])               \n\t"
+    "paddh      $f8, $f8, $f20                            \n\t"
+    "paddh      $f10, $f10, $f22                          \n\t"
+    "psrah      $f8, $f8, $f28                            \n\t"
+    "psrah      $f10, $f10, $f28                          \n\t"
+    "gssqc1     $f18, $f16, 640-288(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 640-560(%[tmp])               \n\t"
+    "and        $f16, $f16, $f8                           \n\t"
+    "and        $f18, $f18, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-464(%[tmp])                \n\t"
+    "paddh      $f20, $f8, $f8                            \n\t"
+    "paddh      $f22, $f10, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-432(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-448(%[tmp])               \n\t"
+    "paddh      $f8, $f8, $f28                            \n\t"
+    "paddh      $f10, $f10, $f30                          \n\t"
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "paddh      $f20, $f20, $f8                           \n\t"
+    "paddh      $f22, $f22, $f10                          \n\t"
+    "gslqc1     $f30, $f28, 640-624(%[tmp])               \n\t"
+    "paddh      $f20, $f20, $f28                          \n\t"
+    "paddh      $f22, $f22, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "gslqc1     $f26, $f24, 640-560(%[tmp])               \n\t"
+    "psrah      $f20, $f20, $f28                          \n\t"
+    "psrah      $f22, $f22, $f28                          \n\t"
+    "pandn      $f12, $f12, $f20                          \n\t"
+    "pandn      $f14, $f14, $f22                          \n\t"
+    "or         $f16, $f16, $f12                          \n\t"
+    "or         $f18, $f18, $f14                          \n\t"
+    "gslqc1     $f14, $f12, 640-32(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-304(%[tmp])               \n\t"
+    "or         $f12, $f12, $f28                          \n\t"
+    "or         $f14, $f14, $f30                          \n\t"
+    "and        $f28, $f4, $f16                           \n\t"
+    "and        $f30, $f6, $f18                           \n\t"
+    "gslqc1     $f18, $f16, 640-432(%[tmp])               \n\t"
+    "gslqc1     $f22, $f20, 640-464(%[tmp])               \n\t"
+    "pandn      $f8, $f4, $f16                            \n\t"
+    "pandn      $f10, $f6, $f18                           \n\t"
+    "or         $f28, $f28, $f8                           \n\t"
+    "or         $f30, $f30, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-496(%[tmp])                \n\t"
+    "paddh      $f16, $f16, $f8                           \n\t"
+    "paddh      $f18, $f18, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 640-288(%[tmp])                \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f28, $f30                          \n\t"
+    "dli        %[iAlpha], 0x2                            \n\t"
+    "gssqc1     $f10, $f8, 704-272(%[tmp])                \n\t"
+
+    "and        $f8, $f0, $f12                            \n\t"
+    "and        $f10, $f2, $f14                           \n\t"
+    "gslqc1     $f30, $f28, 640-384(%[tmp])               \n\t"
+    "pandn      $f12, $f0, $f28                           \n\t"
+    "pandn      $f14, $f2, $f30                           \n\t"
+    "or         $f8, $f8, $f12                            \n\t"
+    "or         $f10, $f10, $f14                          \n\t"
+    "gssqc1     $f10, $f8, 640-304(%[tmp])                \n\t"
+    "gslqc1     $f10, $f8, 640-528(%[tmp])                \n\t"
+    "gslqc1     $f30, $f28, 640-464(%[tmp])               \n\t"
+    "paddh      $f12, $f8, $f28                           \n\t"
+    "paddh      $f14, $f10, $f30                          \n\t"
+    "paddh      $f12, $f12, $f16                          \n\t"
+    "paddh      $f14, $f14, $f18                          \n\t"
+    "gslqc1     $f30, $f28, 640-624(%[tmp])               \n\t"
+    "paddh      $f12, $f12, $f28                          \n\t"
+    "paddh      $f14, $f14, $f30                          \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "psrah      $f12, $f12, $f28                          \n\t"
+    "psrah      $f14, $f14, $f28                          \n\t"
+    "and        $f24, $f24, $f12                          \n\t"
+    "and        $f26, $f26, $f14                          \n\t"
+    "gslqc1     $f14, $f12, 640-560(%[tmp])               \n\t"
+    "pandn      $f16, $f12, $f20                          \n\t"
+    "pandn      $f18, $f14, $f22                          \n\t"
+    "or         $f24, $f24, $f16                          \n\t"
+    "or         $f26, $f26, $f18                          \n\t"
+    "and        $f28, $f4, $f24                           \n\t"
+    "and        $f30, $f6, $f26                           \n\t"
+    "gslqc1     $f26, $f24, 640-304(%[tmp])               \n\t"
+    "pandn      $f16, $f4, $f20                           \n\t"
+    "pandn      $f18, $f6, $f22                           \n\t"
+    "or         $f28, $f28, $f16                          \n\t"
+    "or         $f30, $f30, $f18                          \n\t"
+    "dli        %[iAlpha], 0x1                            \n\t"
+
+    "packushb   $f24, $f24, $f26                          \n\t"
+    "packushb   $f26, $f28, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 640-112(%[tmp])               \n\t"
+    "gslqc1     $f18, $f16, 640-80(%[tmp])                \n\t"
+    "or         $f28, $f28, $f16                          \n\t"
+    "or         $f30, $f30, $f18                          \n\t"
+    "and        $f16, $f0, $f28                           \n\t"
+    "and        $f18, $f2, $f30                           \n\t"
+    "gslqc1     $f30, $f28, 640-416(%[tmp])               \n\t"
+    "pandn      $f0, $f0, $f28                            \n\t"
+    "pandn      $f2, $f2, $f30                            \n\t"
+    "or         $f16, $f16, $f0                           \n\t"
+    "or         $f18, $f18, $f2                           \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "gslqc1     $f2, $f0, 0x0($12)                        \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "punpcklbh  $f0, $f2, $f30                            \n\t"
+    "punpckhbh  $f2, $f2, $f30                            \n\t"
+    "psllh      $f0, $f0, $f28                            \n\t"
+    "psllh      $f2, $f2, $f28                            \n\t"
+    "paddh      $f0, $f0, $f8                             \n\t"
+    "paddh      $f2, $f2, $f10                            \n\t"
+    "paddh      $f0, $f0, $f8                             \n\t"
+    "paddh      $f2, $f2, $f10                            \n\t"
+    "paddh      $f0, $f0, $f8                             \n\t"
+    "paddh      $f2, $f2, $f10                            \n\t"
+    "paddh      $f0, $f0, $f20                            \n\t"
+    "paddh      $f2, $f2, $f22                            \n\t"
+    "dli        %[iAlpha], 0x3                            \n\t"
+    "gslqc1     $f30, $f28, 640-432(%[tmp])               \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "paddh      $f2, $f2, $f30                            \n\t"
+    "gslqc1     $f30, $f28, 640-496(%[tmp])               \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "paddh      $f2, $f2, $f30                            \n\t"
+    "gslqc1     $f30, $f28, 640-592(%[tmp])               \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "paddh      $f2, $f2, $f30                            \n\t"
+    "dmtc1      %[iAlpha], $f28                           \n\t"
+    "psrah      $f0, $f0, $f28                            \n\t"
+    "psrah      $f2, $f2, $f28                            \n\t"
+    "and        $f0, $f0, $f12                            \n\t"
+    "and        $f2, $f2, $f14                            \n\t"
+    "pandn      $f12, $f12, $f8                           \n\t"
+    "pandn      $f14, $f14, $f10                          \n\t"
+    "or         $f0, $f0, $f12                            \n\t"
+    "or         $f2, $f2, $f14                            \n\t"
+    "and        $f28, $f4, $f0                            \n\t"
+    "and        $f30, $f6, $f2                            \n\t"
+
+    "gslqc1     $f2, $f0, 656-272(%[tmp])                 \n\t"
+    "gssqc1     $f2, $f0, 0x0($11)                        \n\t"
+
+    "gslqc1     $f2, $f0, 672-272(%[tmp])                 \n\t"
+
+    "gssqc1     $f2, $f0, 0x0($8)                         \n\t"
+    "gslqc1     $f2, $f0, 688-272(%[tmp])                 \n\t"
+    "gssqc1     $f2, $f0, 0x0($9)                         \n\t"
+    "gslqc1     $f2, $f0, 704-272(%[tmp])                 \n\t"
+
+    "pandn      $f4, $f4, $f8                             \n\t"
+    "pandn      $f6, $f6, $f10                            \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPix])                    \n\t"
+    "or         $f28, $f28, $f4                           \n\t"
+    "or         $f30, $f30, $f6                           \n\t"
+    "packushb   $f16, $f16, $f18                          \n\t"
+    "packushb   $f18, $f28, $f30                          \n\t"
+    "gssqc1     $f26, $f24, 0x0($13)                      \n\t"
+    "gssqc1     $f18, $f16, 0x0(%[iStride])               \n\t"
+    : [pPix]"+&r"((unsigned char *)pPix)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha),
+      [iBeta]"r"(iBeta), [tmp]"r"((unsigned char *)tmp)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0",
+      "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockChromaLt4V_mmi(uint8_t *pPixCb, uint8_t *pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta, int8_t *pTC) {
+  unsigned char tmp[256] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "lb         $8, 0x2(%[pTC])                           \n\t"
+    "lb         $9, 0x3(%[pTC])                           \n\t"
+    "move       $11, $8                                   \n\t"
+    "lb         $8, 0x1(%[pTC])                           \n\t"
+    "lb         %[pTC], 0x0(%[pTC])                       \n\t"
+    "move       $12, %[pTC]                               \n\t"
+    "and        %[pTC], $9, 0xFFFF                        \n\t"
+    "dmtc1      %[pTC], $f4                               \n\t"
+    "and        %[pTC], $9, 0xFFFF                        \n\t"
+    "dmtc1      %[pTC], $f8                               \n\t"
+    "move       %[pTC], $11                               \n\t"
+    "and        $9, %[pTC], 0xFFFF                        \n\t"
+    "and        %[pTC], %[pTC], 0xFFFF                    \n\t"
+    "dmtc1      %[pTC], $f16                              \n\t"
+    "and        %[pTC], $8, 0xFFFF                        \n\t"
+    "dmtc1      %[pTC], $f20                              \n\t"
+    "dmtc1      $9, $f12                                  \n\t"
+    "and        %[pTC], $8, 0xFFFF                        \n\t"
+    "dmtc1      %[pTC], $f24                              \n\t"
+    "move       %[pTC], $12                               \n\t"
+    "and        $9, %[pTC], 0xFFFF                        \n\t"
+    "and        %[pTC], %[pTC], 0xFFFF                    \n\t"
+    "punpcklhw  $f24, $f24, $f8                           \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "xor        $f2, $f2, $f2                             \n\t"
+    "gssqc1     $f2, $f0, 0x40(%[tmp])                    \n\t"
+    "dmtc1      $9, $f28                                  \n\t"
+    "dmtc1      %[pTC], $f0                               \n\t"
+    "daddu      %[pTC], %[iStride], %[iStride]            \n\t"
+    "dsubu      $9, %[pPixCb], %[pTC]                     \n\t"
+    "punpcklhw  $f20, $f20, $f4                           \n\t"
+    "gslqc1     $f6, $f4, 0x40(%[tmp])                    \n\t"
+    "punpcklhw  $f0, $f0, $f16                            \n\t"
+    "gsldxc1    $f16, 0x0(%[iStride], %[pPixCr])          \n\t"
+    "punpcklhw  $f28, $f28, $f12                          \n\t"
+    "gsldxc1    $f12, 0x0(%[pPixCb], $0)                  \n\t"
+    "punpcklhw  $f0, $f0, $f24                            \n\t"
+    "gsldxc1    $f24, 0x0($9, $0)                         \n\t"
+    "punpcklhw  $f28, $f28, $f20                          \n\t"
+    "punpckhhw  $f2, $f0, $f28                            \n\t"
+    "punpcklhw  $f0, $f0, $f28                            \n\t"
+    "dsubu      $9, %[pPixCr], %[pTC]                     \n\t"
+    "psubh      $f8, $f4, $f0                             \n\t"
+    "psubh      $f10, $f6, $f2                            \n\t"
+    "gssqc1     $f10, $f8, 0x60(%[tmp])                   \n\t"
+    "gsldxc1    $f8, 0x0($9, $0)                          \n\t"
+    "mov.d      $f26, $f8                                 \n\t"
+    "dsubu      %[pTC], %[pPixCb], %[iStride]             \n\t"
+    "gsldxc1    $f28, 0x0(%[pTC], $0)                     \n\t"
+    "dsubu      $9, %[pPixCr], %[iStride]                 \n\t"
+    "gsldxc1    $f8, 0x0($9, $0)                          \n\t"
+    "mov.d      $f30, $f8                                 \n\t"
+    "gsldxc1    $f8, 0x0(%[pPixCr], $0)                   \n\t"
+    "mov.d      $f14, $f8                                 \n\t"
+    "gsldxc1    $f8, 0x0(%[iStride], %[pPixCb])           \n\t"
+    "mov.d      $f10, $f16                                \n\t"
+    "gssqc1     $f10, $f8, 0xE0(%[tmp])                   \n\t"
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+    "punpcklhw  $f16, $f8, $f8                            \n\t"
+    "dmtc1      %[iBeta], $f8                             \n\t"
+    "punpcklhw  $f20, $f8, $f8                            \n\t"
+    "punpcklwd  $f8, $f20, $f20                           \n\t"
+    "mov.d      $f10, $f8                                 \n\t"
+    "gssqc1     $f10, $f8, 0x50(%[tmp])                   \n\t"
+    "punpckhbh  $f10, $f24, $f4                           \n\t"
+    "punpcklbh  $f8, $f24, $f4                            \n\t"
+    "gssqc1     $f14, $f12, 0xd0(%[tmp])                  \n\t"
+    "punpcklwd  $f16, $f16, $f16                          \n\t"
+    "mov.d      $f18, $f16                                \n\t"
+    "gssqc1     $f10, $f8, 0x30(%[tmp])                   \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+    "gssqc1     $f26, $f24, 0x80(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0xd0(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+    "gssqc1     $f26, $f24, 0x70(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0xe0(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+    "gssqc1     $f26, $f24, 0x90(%[tmp])                  \n\t"
+    "gslqc1     $f22, $f20, 0xe0(%[tmp])                  \n\t"
+    "mov.d      $f8, $f28                                 \n\t"
+    "mov.d      $f10, $f30                                \n\t"
+    "punpcklbh  $f28, $f30, $f6                           \n\t"
+    "punpckhbh  $f30, $f30, $f6                           \n\t"
+    "punpckhbh  $f22, $f20, $f4                           \n\t"
+    "punpcklbh  $f20, $f20, $f4                           \n\t"
+    "gssqc1     $f30, $f28, 0xa0(%[tmp])                  \n\t"
+    "punpckhbh  $f14, $f12, $f4                           \n\t"
+    "punpcklbh  $f12, $f12, $f4                           \n\t"
+    "dli        %[iBeta], 0x4                             \n\t"
+    "punpckhbh  $f10, $f8, $f4                            \n\t"
+    "punpcklbh  $f8, $f8, $f4                             \n\t"
+    "dmtc1      %[iBeta], $f24                            \n\t"
+    "punpcklhw  $f28, $f24, $f24                          \n\t"
+    "punpcklwd  $f24, $f28, $f28                          \n\t"
+    "mov.d      $f26, $f24                                \n\t"
+    "gslqc1     $f30, $f28, 0x30(%[tmp])                  \n\t"
+    "gssqc1     $f26, $f24, 0x20(%[tmp])                  \n\t"
+    "psubh      $f28, $f28, $f20                          \n\t"
+    "psubh      $f30, $f30, $f22                          \n\t"
+    "pcmpgth    $f24, $f0, $f4                            \n\t"
+    "pcmpgth    $f26, $f2, $f6                            \n\t"
+    "gslqc1     $f6, $f4, 0x60(%[tmp])                    \n\t"
+    "gssqc1     $f26, $f24, 0x40(%[tmp])                  \n\t"
+    "psubh      $f24, $f12, $f8                           \n\t"
+    "psubh      $f26, $f14, $f10                          \n\t"
+    "dmfc1      %[iAlpha], $f12                           \n\t"
+    "dmfc1      %[iBeta], $f14                            \n\t"
+    "dli        $10, 0x2                                  \n\t"
+    "dmtc1      $10, $f12                                 \n\t"
+    "dli        $10, 0x3                                  \n\t"
+    "dmtc1      $10, $f14                                 \n\t"
+    "psllh      $f24, $f24, $f12                          \n\t"
+    "psllh      $f26, $f26, $f12                          \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x20(%[tmp])                  \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psrah      $f24, $f24, $f14                          \n\t"
+    "psrah      $f26, $f26, $f14                          \n\t"
+    "dmtc1      %[iAlpha], $f12                           \n\t"
+    "dmtc1      %[iBeta], $f14                            \n\t"
+    "pmaxsh     $f4, $f4, $f24                            \n\t"
+    "pmaxsh     $f6, $f6, $f26                            \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[tmp])                    \n\t"
+    "gslqc1     $f26, $f24, 0x10(%[tmp])                  \n\t"
+    "pminsh     $f24, $f24, $f4                           \n\t"
+    "pminsh     $f26, $f26, $f6                           \n\t"
+    "gssqc1     $f26, $f24, 0x10(%[tmp])                  \n\t"
+    "psubh      $f4, $f8, $f12                            \n\t"
+    "psubh      $f6, $f10, $f14                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f24, $f26)
+    "pcmpgth    $f24, $f16, $f4                           \n\t"
+    "pcmpgth    $f26, $f18, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 0x30(%[tmp])                    \n\t"
+    "psubh      $f4, $f4, $f8                             \n\t"
+    "psubh      $f6, $f6, $f10                            \n\t"
+    "dmfc1      %[iAlpha], $f8                            \n\t"
+    "dmfc1      %[iBeta], $f10                            \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f8, $f10)
+    "pcmpgth    $f28, $f28, $f4                           \n\t"
+    "pcmpgth    $f30, $f30, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 0x50(%[tmp])                    \n\t"
+    "and        $f24, $f24, $f28                          \n\t"
+    "and        $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psubh      $f20, $f20, $f12                          \n\t"
+    "psubh      $f22, $f22, $f14                          \n\t"
+    WELS_AbsH($f20, $f22, $f20, $f22, $f8, $f10)
+    "pcmpgth    $f4, $f4, $f20                            \n\t"
+    "pcmpgth    $f6, $f6, $f22                            \n\t"
+    "gslqc1     $f22, $f20, 0x80(%[tmp])                  \n\t"
+    "gslqc1     $f10, $f8, 0x90(%[tmp])                   \n\t"
+    "psubh      $f20, $f20, $f8                           \n\t"
+    "psubh      $f22, $f22, $f10                          \n\t"
+    "and        $f24, $f24, $f4                           \n\t"
+    "and        $f26, $f26, $f6                           \n\t"
+    "gslqc1     $f10, $f8, 0x40(%[tmp])                   \n\t"
+    "and        $f24, $f24, $f8                           \n\t"
+    "and        $f26, $f26, $f10                          \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[tmp])                    \n\t"
+    "and        $f4, $f4, $f24                            \n\t"
+    "and        $f6, $f6, $f26                            \n\t"
+    "gslqc1     $f26, $f24, 0x70(%[tmp])                  \n\t"
+    "gssqc1     $f6, $f4, 0x30(%[tmp])                    \n\t"
+    "gslqc1     $f6, $f4, 0xa0(%[tmp])                    \n\t"
+    "psubh      $f24, $f24, $f4                           \n\t"
+    "psubh      $f26, $f26, $f6                           \n\t"
+    "dli        $10, 0x2                                  \n\t"
+    "dmtc1      $10, $f8                                  \n\t"
+    "psllh      $f24, $f24, $f8                           \n\t"
+    "psllh      $f26, $f26, $f8                           \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "dli        $10, 0x3                                  \n\t"
+    "gslqc1     $f10, $f8, 0x20(%[tmp])                   \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+    "dmtc1      $10, $f8                                  \n\t"
+    "gslqc1     $f22, $f20, 0x60(%[tmp])                  \n\t"
+    "psrah      $f24, $f24, $f8                           \n\t"
+    "psrah      $f26, $f26, $f8                           \n\t"
+    "pmaxsh     $f20, $f20, $f24                          \n\t"
+    "pmaxsh     $f22, $f22, $f26                          \n\t"
+    "pminsh     $f0, $f0, $f20                            \n\t"
+    "pminsh     $f2, $f2, $f22                            \n\t"
+    "gslqc1     $f22, $f20, 0x70(%[tmp])                  \n\t"
+    "psubh      $f24, $f4, $f20                           \n\t"
+    "psubh      $f26, $f6, $f22                           \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f8, $f10)
+    "pcmpgth    $f16, $f16, $f24                          \n\t"
+    "pcmpgth    $f18, $f18, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x80(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f4                           \n\t"
+    "psubh      $f26, $f26, $f6                           \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f8, $f10)
+    "pcmpgth    $f28, $f28, $f24                          \n\t"
+    "pcmpgth    $f30, $f30, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x90(%[tmp])                  \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f8, $f10)
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+    "dmtc1      %[iBeta], $f10                            \n\t"
+    "pcmpgth    $f28, $f28, $f24                          \n\t"
+    "pcmpgth    $f30, $f30, $f26                          \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f26, $f24, 0x40(%[tmp])                  \n\t"
+    "and        $f16, $f16, $f24                          \n\t"
+    "and        $f18, $f18, $f26                          \n\t"
+    "and        $f0, $f0, $f16                            \n\t"
+    "and        $f2, $f2, $f18                            \n\t"
+    "gslqc1     $f18, $f16, 0x30(%[tmp])                  \n\t"
+    "paddh      $f8, $f8, $f16                            \n\t"
+    "paddh      $f10, $f10, $f18                          \n\t"
+    "paddh      $f4, $f4, $f0                             \n\t"
+    "paddh      $f6, $f6, $f2                             \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f4, $f6                            \n\t"
+    "gssdxc1    $f8, 0x0(%[pTC], $0)                      \n\t"
+    "psubh      $f12, $f12, $f16                          \n\t"
+    "psubh      $f14, $f14, $f18                          \n\t"
+    "psubh      $f20, $f20, $f0                           \n\t"
+    "psubh      $f22, $f22, $f2                           \n\t"
+    "packushb   $f12, $f12, $f14                          \n\t"
+    "packushb   $f14, $f20, $f22                          \n\t"
+    "gssdxc1    $f12, 0x0(%[pPixCb], $0)                  \n\t"
+    "gssdxc1    $f10, 0x0($9, $0)                         \n\t"
+    "gssdxc1    $f14, 0x0(%[pPixCr], $0)                  \n\t"
+    : [pPixCb]"+&r"((unsigned char *)pPixCb), [pPixCr]"+&r"((unsigned char *)pPixCr)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha), [iBeta]"r"(iBeta),
+      [pTC]"r"((unsigned char *)pTC), [tmp]"r"((unsigned char *)tmp)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12",  "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockChromaEq4V_mmi(uint8_t *pPixCb, uint8_t *pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta) {
+  unsigned char tmp[128] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                          \n\t"
+    "daddu      $8, %[iStride], %[iStride]               \n\t"
+    "dsubu      $9, %[pPixCb], $8                        \n\t"
+    "gsldxc1    $f16, 0x0(%[pPixCr], $0)                 \n\t"
+    "gsldxc1    $f20, 0x0(%[iStride], %[pPixCr])         \n\t"
+    "gsldxc1    $f4, 0x0($9, $0)                         \n\t"
+    "dsubu      $9, %[pPixCr], $8                        \n\t"
+    "gsldxc1    $f8, 0x0($9, $0)                         \n\t"
+    "mov.d      $f6, $f8                                 \n\t"
+    "dsubu      $8, %[pPixCb], %[iStride]                \n\t"
+    "gsldxc1    $f8, 0x0($8, $0)                         \n\t"
+    "dsubu      $9, %[pPixCr], %[iStride]                \n\t"
+    "gsldxc1    $f12, 0x0($9, $0)                        \n\t"
+    "mov.d      $f10, $f12                               \n\t"
+    "gsldxc1    $f12, 0x0(%[pPixCb], $0)                 \n\t"
+    "mov.d      $f14, $f16                               \n\t"
+    "gsldxc1    $f16, 0x0(%[iStride], %[pPixCb])         \n\t"
+    "mov.d      $f18, $f20                               \n\t"
+    "dmtc1      %[iAlpha], $f20                          \n\t"
+    "xor        $f0, $f0, $f0                            \n\t"
+    "xor        $f2, $f2, $f2                            \n\t"
+    "punpcklhw  $f24, $f20, $f20                         \n\t"
+    "punpcklwd  $f20, $f24, $f24                         \n\t"
+    "mov.d      $f22, $f20                               \n\t"
+    "dmtc1      %[iBeta], $f24                           \n\t"
+    "punpcklhw  $f28, $f24, $f24                         \n\t"
+    "punpcklwd  $f24, $f28, $f28                         \n\t"
+    "mov.d      $f26, $f24                               \n\t"
+    "mov.d      $f28, $f4                                \n\t"
+    "punpcklbh  $f4, $f6, $f2                            \n\t"
+    "punpckhbh  $f6, $f6, $f2                            \n\t"
+    "punpckhbh  $f30, $f28, $f0                          \n\t"
+    "punpcklbh  $f28, $f28, $f0                          \n\t"
+    "gssqc1     $f6, $f4, 0x40(%[tmp])                   \n\t"
+    "gssqc1     $f30, $f28, 0x60(%[tmp])                 \n\t"
+    "punpckhbh  $f30, $f8, $f0                           \n\t"
+    "punpcklbh  $f28, $f8, $f0                           \n\t"
+    "gssqc1     $f30, $f28, 0x10(%[tmp])                 \n\t"
+    "punpckhbh  $f30, $f12, $f0                          \n\t"
+    "punpcklbh  $f28, $f12, $f0                          \n\t"
+    "punpcklbh  $f12, $f14, $f2                          \n\t"
+    "punpckhbh  $f14, $f14, $f2                          \n\t"
+    "gssqc1     $f30, $f28, 0x50(%[tmp])                 \n\t"
+    "mov.d      $f28, $f16                               \n\t"
+    "punpcklbh  $f16, $f18, $f2                          \n\t"
+    "punpckhbh  $f18, $f18, $f2                          \n\t"
+    "punpcklbh  $f8, $f10, $f2                           \n\t"
+    "punpckhbh  $f10, $f10, $f2                          \n\t"
+    "punpckhbh  $f30, $f28, $f0                          \n\t"
+    "punpcklbh  $f28, $f28, $f0                          \n\t"
+    "gssqc1     $f14, $f12, 0x30(%[tmp])                 \n\t"
+    "gslqc1     $f14, $f12, 0x10(%[tmp])                 \n\t"
+    "gslqc1     $f2, $f0, 0x50(%[tmp])                   \n\t"
+    "psubh      $f4, $f12, $f0                           \n\t"
+    "psubh      $f6, $f14, $f2                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f0, $f2)
+    "gssqc1     $f18, $f16, 0x20(%[tmp])                 \n\t"
+    "pcmpgth    $f0, $f20, $f4                           \n\t"
+    "pcmpgth    $f2, $f22, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 0x60(%[tmp])                   \n\t"
+    "psubh      $f4, $f4, $f12                           \n\t"
+    "psubh      $f6, $f6, $f14                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f16, $f18)
+    "pcmpgth    $f16, $f24, $f4                          \n\t"
+    "pcmpgth    $f18, $f26, $f6                          \n\t"
+    "and        $f0, $f0, $f16                           \n\t"
+    "and        $f2, $f2, $f18                           \n\t"
+    "gslqc1     $f18, $f16, 0x50(%[tmp])                 \n\t"
+    "psubh      $f4, $f28, $f16                          \n\t"
+    "psubh      $f6, $f30, $f18                          \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f16, $f18)
+    "pcmpgth    $f16, $f24, $f4                          \n\t"
+    "pcmpgth    $f18, $f26, $f6                          \n\t"
+    "gslqc1     $f6, $f4, 0x30(%[tmp])                   \n\t"
+    "psubh      $f4, $f8, $f4                            \n\t"
+    "psubh      $f6, $f10, $f6                           \n\t"
+    "dmfc1      %[iAlpha], $f28                          \n\t"
+    "dmfc1      %[iBeta], $f30                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f28, $f30)
+    "pcmpgth    $f20, $f20, $f4                          \n\t"
+    "pcmpgth    $f22, $f22, $f6                          \n\t"
+    "gslqc1     $f6, $f4, 0x40(%[tmp])                   \n\t"
+    "and        $f0, $f0, $f16                           \n\t"
+    "and        $f2, $f2, $f18                           \n\t"
+    "psubh      $f4, $f4, $f8                            \n\t"
+    "psubh      $f6, $f6, $f10                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f16, $f18)
+    "pcmpgth    $f16, $f24, $f4                          \n\t"
+    "pcmpgth    $f18, $f26, $f6                          \n\t"
+    "gslqc1     $f6, $f4, 0x20(%[tmp])                   \n\t"
+    "gslqc1     $f30, $f28, 0x30(%[tmp])                 \n\t"
+    "psubh      $f4, $f4, $f28                           \n\t"
+    "psubh      $f6, $f6, $f30                           \n\t"
+    "and        $f20, $f20, $f16                         \n\t"
+    "and        $f22, $f22, $f18                         \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f28, $f30)
+    "dmtc1      %[iAlpha], $f28                          \n\t"
+    "dmtc1      %[iBeta], $f30                           \n\t"
+    "pcmpgth    $f24, $f24, $f4                          \n\t"
+    "pcmpgth    $f26, $f26, $f6                          \n\t"
+    "and        $f20, $f20, $f24                         \n\t"
+    "and        $f22, $f22, $f26                         \n\t"
+    "dli        %[iBeta], 0x2                            \n\t"
+    "dmtc1      %[iBeta], $f4                            \n\t"
+    "punpcklhw  $f16, $f4, $f4                           \n\t"
+    "punpcklwd  $f4, $f16, $f16                          \n\t"
+    "mov.d      $f6, $f4                                 \n\t"
+    "gslqc1     $f18, $f16, 0x60(%[tmp])                 \n\t"
+    "paddh      $f24, $f16, $f16                         \n\t"
+    "paddh      $f26, $f18, $f18                         \n\t"
+    "paddh      $f24, $f24, $f12                         \n\t"
+    "paddh      $f26, $f26, $f14                         \n\t"
+    "paddh      $f24, $f24, $f28                         \n\t"
+    "paddh      $f26, $f26, $f30                         \n\t"
+    "gssqc1     $f6, $f4, 0x10(%[tmp])                   \n\t"
+    "gslqc1     $f18, $f16, 0x10(%[tmp])                 \n\t"
+    "paddh      $f24, $f24, $f16                         \n\t"
+    "paddh      $f26, $f26, $f18                         \n\t"
+    "dmtc1      %[iBeta], $f16                           \n\t"
+    "psrah      $f24, $f24, $f16                         \n\t"
+    "psrah      $f26, $f26, $f16                         \n\t"
+    "pandn      $f16, $f0, $f12                          \n\t"
+    "pandn      $f18, $f2, $f14                          \n\t"
+    "gslqc1     $f14, $f12, 0x40(%[tmp])                 \n\t"
+    "and        $f4, $f0, $f24                           \n\t"
+    "and        $f6, $f2, $f26                           \n\t"
+    "or         $f4, $f4, $f16                           \n\t"
+    "or         $f6, $f6, $f18                           \n\t"
+    "paddh      $f24, $f12, $f12                         \n\t"
+    "paddh      $f26, $f14, $f14                         \n\t"
+    "gslqc1     $f14, $f12, 0x10(%[tmp])                 \n\t"
+    "paddh      $f24, $f24, $f8                          \n\t"
+    "paddh      $f26, $f26, $f10                         \n\t"
+    "gslqc1     $f18, $f16, 0x20(%[tmp])                 \n\t"
+    "paddh      $f24, $f24, $f16                         \n\t"
+    "paddh      $f26, $f26, $f18                         \n\t"
+    "dmtc1      %[iBeta], $f16                           \n\t"
+    "paddh      $f24, $f24, $f12                         \n\t"
+    "paddh      $f26, $f26, $f14                         \n\t"
+    "psrah      $f24, $f24, $f16                         \n\t"
+    "psrah      $f26, $f26, $f16                         \n\t"
+    "and        $f16, $f20, $f24                         \n\t"
+    "and        $f18, $f22, $f26                         \n\t"
+    "pandn      $f24, $f20, $f8                          \n\t"
+    "pandn      $f26, $f22, $f10                         \n\t"
+    "or         $f16, $f16, $f24                         \n\t"
+    "or         $f18, $f18, $f26                         \n\t"
+    "packushb   $f4, $f4, $f6                            \n\t"
+    "packushb   $f6, $f16, $f18                          \n\t"
+    "gslqc1     $f18, $f16, 0x50(%[tmp])                 \n\t"
+    "paddh      $f24, $f28, $f28                         \n\t"
+    "paddh      $f26, $f30, $f30                         \n\t"
+    "paddh      $f24, $f24, $f16                         \n\t"
+    "paddh      $f26, $f26, $f18                         \n\t"
+    "gslqc1     $f10, $f8, 0x60(%[tmp])                  \n\t"
+    "paddh      $f24, $f24, $f8                          \n\t"
+    "paddh      $f26, $f26, $f10                         \n\t"
+    "dmtc1      %[iBeta], $f28                           \n\t"
+    "paddh      $f24, $f24, $f12                         \n\t"
+    "paddh      $f26, $f26, $f14                         \n\t"
+    "psrah      $f24, $f24, $f28                         \n\t"
+    "psrah      $f26, $f26, $f28                         \n\t"
+    "and        $f8, $f0, $f24                           \n\t"
+    "and        $f10, $f2, $f26                          \n\t"
+    "pandn      $f0, $f0, $f16                           \n\t"
+    "pandn      $f2, $f2, $f18                           \n\t"
+    "or         $f8, $f8, $f0                            \n\t"
+    "or         $f10, $f10, $f2                          \n\t"
+    "gslqc1     $f2, $f0, 0x20(%[tmp])                   \n\t"
+    "paddh      $f24, $f0, $f0                           \n\t"
+    "paddh      $f26, $f2, $f2                           \n\t"
+    "gslqc1     $f2, $f0, 0x30(%[tmp])                   \n\t"
+    "paddh      $f24, $f24, $f0                          \n\t"
+    "paddh      $f26, $f26, $f2                          \n\t"
+    "gslqc1     $f18, $f16, 0x40(%[tmp])                 \n\t"
+    "paddh      $f24, $f24, $f16                         \n\t"
+    "paddh      $f26, $f26, $f18                         \n\t"
+    "paddh      $f24, $f24, $f12                         \n\t"
+    "paddh      $f26, $f26, $f14                         \n\t"
+    "gssdxc1    $f4, 0x0($8, $0)                         \n\t"
+    "psrah      $f24, $f24, $f28                         \n\t"
+    "psrah      $f26, $f26, $f28                         \n\t"
+    "and        $f16, $f20, $f24                         \n\t"
+    "and        $f18, $f22, $f26                         \n\t"
+    "pandn      $f20, $f20, $f0                          \n\t"
+    "pandn      $f22, $f22, $f2                          \n\t"
+    "or         $f16, $f16, $f20                         \n\t"
+    "or         $f18, $f18, $f22                         \n\t"
+    "packushb   $f8, $f8, $f10                           \n\t"
+    "packushb   $f10, $f16, $f18                         \n\t"
+    "gssdxc1    $f8, 0x0(%[pPixCb], $0)                  \n\t"
+    "gssdxc1    $f6, 0x0($9, $0)                         \n\t"
+    "gssdxc1    $f10, 0x0(%[pPixCr], $0)                 \n\t"
+    : [pPixCb]"+&r"((unsigned char *)pPixCb), [pPixCr]"+&r"((unsigned char *)pPixCr)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha),
+      [iBeta]"r"(iBeta), [tmp]"r"((unsigned char *)tmp)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockChromaEq4H_mmi(uint8_t *pPixCb, uint8_t *pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta) {
+  unsigned char tmp[256] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "daddiu     %[pPixCb], %[pPixCb], -0x2                \n\t"
+    "daddiu     %[pPixCr], %[pPixCr], -0x2                \n\t"
+    "move       $9, %[pPixCb]                             \n\t"
+    "move       $10, %[pPixCr]                            \n\t"
+    "dsll       $11, %[iStride], 0x2                      \n\t"
+    "daddu      %[pPixCb], %[pPixCb], $11                 \n\t"
+    "daddu      %[pPixCr], %[pPixCr], $11                 \n\t"
+    "daddiu     $11, %[tmp], 0x80                         \n\t"
+    "gsldlc1    $f0, 0x7($9)                              \n\t"
+    "gsldrc1    $f0, 0x0($9)                              \n\t"
+    "daddu      $12, $9, %[iStride]                       \n\t"
+    "gsldlc1    $f4, 0x7($12)                             \n\t"
+    "gsldrc1    $f4, 0x0($12)                             \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsldlc1    $f8, 0x7($12)                             \n\t"
+    "gsldrc1    $f8, 0x0($12)                             \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsldlc1    $f12, 0x7($12)                            \n\t"
+    "gsldlc1    $f16, 0x7($10)                            \n\t"
+    "gsldrc1    $f12, 0x0($12)                            \n\t"
+    "gsldrc1    $f16, 0x0($10)                            \n\t"
+    "daddu      $12, $10, %[iStride]                      \n\t"
+    "gsldlc1    $f20, 0x7($12)                            \n\t"
+    "gsldrc1    $f20, 0x0($12)                            \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsldlc1    $f24, 0x7($12)                            \n\t"
+    "gsldrc1    $f24, 0x0($12)                            \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsldlc1    $f28, 0x7($12)                            \n\t"
+    "gsldrc1    $f28, 0x0($12)                            \n\t"
+    "punpcklwd  $f0, $f0, $f16                            \n\t"
+    "punpcklwd  $f4, $f4, $f20                            \n\t"
+    "punpcklwd  $f8, $f8, $f24                            \n\t"
+    "punpcklwd  $f12, $f12, $f28                          \n\t"
+    "gsldlc1    $f16, 0x7(%[pPixCb])                      \n\t"
+    "gsldlc1    $f20, 0x7(%[pPixCr])                      \n\t"
+    "gsldrc1    $f16, 0x0(%[pPixCb])                      \n\t"
+    "gsldrc1    $f20, 0x0(%[pPixCr])                      \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "daddu      $12, %[pPixCb], %[iStride]                \n\t"
+    "daddu      $13, %[pPixCr], %[iStride]                \n\t"
+    "gsldlc1    $f16, 0x7($12)                            \n\t"
+    "gsldlc1    $f20, 0x7($13)                            \n\t"
+    "gsldrc1    $f16, 0x0($12)                            \n\t"
+    "gsldrc1    $f20, 0x0($13)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f6, $f16                                 \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "daddu      $13, $13, %[iStride]                      \n\t"
+    "gsldlc1    $f16, 0x7($12)                            \n\t"
+    "gsldlc1    $f20, 0x7($13)                            \n\t"
+    "gsldrc1    $f16, 0x0($12)                            \n\t"
+    "gsldrc1    $f20, 0x0($13)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f10, $f16                                \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "daddu      $13, $13, %[iStride]                      \n\t"
+    "gsldlc1    $f16, 0x7($12)                            \n\t"
+    "gsldlc1    $f20, 0x7($13)                            \n\t"
+    "gsldrc1    $f16, 0x0($12)                            \n\t"
+    "gsldrc1    $f20, 0x0($13)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f14, $f16                                \n\t"
+    "punpcklbh  $f24, $f2, $f6                            \n\t"
+    "punpckhbh  $f26, $f2, $f6                            \n\t"
+    "punpckhbh  $f2, $f0, $f4                             \n\t"
+    "punpcklbh  $f0, $f0, $f4                             \n\t"
+    "punpcklbh  $f28, $f10, $f14                          \n\t"
+    "punpckhbh  $f30, $f10, $f14                          \n\t"
+    "punpckhbh  $f10, $f8, $f12                           \n\t"
+    "punpcklbh  $f8, $f8, $f12                            \n\t"
+    "punpcklhw  $f16, $f2, $f10                           \n\t"
+    "punpckhhw  $f18, $f2, $f10                           \n\t"
+    "punpckhhw  $f2, $f0, $f8                             \n\t"
+    "punpcklhw  $f0, $f0, $f8                             \n\t"
+    "punpcklhw  $f20, $f26, $f30                          \n\t"
+    "punpckhhw  $f22, $f26, $f30                          \n\t"
+    "punpckhhw  $f26, $f24, $f28                          \n\t"
+    "punpcklhw  $f24, $f24, $f28                          \n\t"
+    "punpcklwd  $f4, $f2, $f26                            \n\t"
+    "punpckhwd  $f6, $f2, $f26                            \n\t"
+    "punpckhwd  $f2, $f0, $f24                            \n\t"
+    "punpcklwd  $f0, $f0, $f24                            \n\t"
+    "punpcklwd  $f8, $f18, $f22                           \n\t"
+    "punpckhwd  $f10, $f18, $f22                          \n\t"
+    "punpckhwd  $f18, $f16, $f20                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f20, $f2                                 \n\t"
+    "mov.d      $f22, $f18                                \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "mov.d      $f24, $f6                                 \n\t"
+    "mov.d      $f26, $f10                                \n\t"
+    "mov.d      $f6, $f8                                  \n\t"
+    "gssqc1     $f2, $f0, 0x0($11)                        \n\t"
+    "gssqc1     $f22, $f20, 0x10($11)                     \n\t"
+    "gssqc1     $f6, $f4, 0x20($11)                       \n\t"
+    "gssqc1     $f26, $f24, 0x30($11)                     \n\t"
+    "gslqc1     $f26, $f24, 0x80(%[tmp])                  \n\t"
+    "gslqc1     $f18, $f16, 0x90(%[tmp])                  \n\t"
+    "gslqc1     $f22, $f20, 0xa0(%[tmp])                  \n\t"
+    "gslqc1     $f30, $f28, 0xb0(%[tmp])                  \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "dmtc1      %[iAlpha], $f4                            \n\t"
+    "punpcklhw  $f8, $f4, $f4                             \n\t"
+    "punpcklwd  $f4, $f8, $f8                             \n\t"
+    "mov.d      $f6, $f4                                  \n\t"
+    "dmtc1      %[iBeta], $f8                             \n\t"
+    "punpcklhw  $f12, $f8, $f8                            \n\t"
+    "punpcklwd  $f8, $f12, $f12                           \n\t"
+    "mov.d      $f10, $f8                                 \n\t"
+    "mov.d      $f12, $f24                                \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f26, $f24, 0x60(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0x90(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f26, $f24, 0x30(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0xa0(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f26, $f24, 0x40(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0xb0(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f0                           \n\t"
+    "punpckhbh  $f26, $f26, $f0                           \n\t"
+    "gssqc1     $f26, $f24, 0x70(%[tmp])                  \n\t"
+    "punpckhbh  $f30, $f28, $f0                           \n\t"
+    "punpcklbh  $f28, $f28, $f0                           \n\t"
+    "punpckhbh  $f18, $f16, $f0                           \n\t"
+    "punpcklbh  $f16, $f16, $f0                           \n\t"
+    "punpckhbh  $f22, $f20, $f0                           \n\t"
+    "punpcklbh  $f20, $f20, $f0                           \n\t"
+    "punpckhbh  $f14, $f12, $f0                           \n\t"
+    "punpcklbh  $f12, $f12, $f0                           \n\t"
+    "gssqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psubh      $f24, $f16, $f20                          \n\t"
+    "psubh      $f26, $f18, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f0, $f2)
+    "pcmpgth    $f0, $f4, $f24                            \n\t"
+    "pcmpgth    $f2, $f6, $f26                            \n\t"
+    "psubh      $f24, $f12, $f16                          \n\t"
+    "psubh      $f26, $f14, $f18                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "pcmpgth    $f28, $f8, $f24                           \n\t"
+    "pcmpgth    $f30, $f10, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x50(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    "and        $f0, $f0, $f28                            \n\t"
+    "and        $f2, $f2, $f30                            \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f28, $f30)
+    "dmfc1      %[iAlpha], $f20                           \n\t"
+    "dmfc1      %[iBeta], $f22                            \n\t"
+    "pcmpgth    $f28, $f8, $f24                           \n\t"
+    "pcmpgth    $f30, $f10, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x30(%[tmp])                  \n\t"
+    "gslqc1     $f22, $f20, 0x40(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f20, $f22)
+    "pcmpgth    $f4, $f4, $f24                            \n\t"
+    "pcmpgth    $f6, $f6, $f26                            \n\t"
+    "gslqc1     $f26, $f24, 0x60(%[tmp])                  \n\t"
+    "gslqc1     $f22, $f20, 0x30(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f20, $f22)
+    "and        $f0, $f0, $f28                            \n\t"
+    "and        $f2, $f2, $f30                            \n\t"
+    "pcmpgth    $f28, $f8, $f24                           \n\t"
+    "pcmpgth    $f30, $f10, $f26                          \n\t"
+    "gslqc1     $f26, $f24, 0x70(%[tmp])                  \n\t"
+    "gslqc1     $f22, $f20, 0x40(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f20, $f22)
+    "dli        $8, 0x2                                   \n\t"
+    "and        $f4, $f4, $f28                            \n\t"
+    "and        $f6, $f6, $f30                            \n\t"
+    "pcmpgth    $f8, $f8, $f24                            \n\t"
+    "pcmpgth    $f10, $f10, $f26                          \n\t"
+    "and        $f4, $f4, $f8                             \n\t"
+    "and        $f6, $f6, $f10                            \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "punpcklhw  $f24, $f8, $f8                            \n\t"
+    "punpcklwd  $f8, $f24, $f24                           \n\t"
+    "mov.d      $f10, $f8                                 \n\t"
+    "gssqc1     $f10, $f8, 0x20(%[tmp])                   \n\t"
+    "paddh      $f8, $f12, $f12                           \n\t"
+    "paddh      $f10, $f14, $f14                          \n\t"
+    "paddh      $f8, $f8, $f16                            \n\t"
+    "paddh      $f10, $f10, $f18                          \n\t"
+    "gslqc1     $f22, $f20, 0x50(%[tmp])                  \n\t"
+    "paddh      $f8, $f8, $f20                            \n\t"
+    "paddh      $f10, $f10, $f22                          \n\t"
+    "gslqc1     $f26, $f24, 0x20(%[tmp])                  \n\t"
+    "paddh      $f8, $f8, $f24                            \n\t"
+    "paddh      $f10, $f10, $f26                          \n\t"
+    "dmtc1      $8, $f20                                  \n\t"
+    "psrah      $f8, $f8, $f20                            \n\t"
+    "psrah      $f10, $f10, $f20                          \n\t"
+    "and        $f24, $f0, $f8                            \n\t"
+    "and        $f26, $f2, $f10                           \n\t"
+    "pandn      $f8, $f0, $f16                            \n\t"
+    "pandn      $f10, $f2, $f18                           \n\t"
+    "or         $f24, $f24, $f8                           \n\t"
+    "or         $f26, $f26, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 0x60(%[tmp])                   \n\t"
+    "paddh      $f28, $f8, $f8                            \n\t"
+    "paddh      $f30, $f10, $f10                          \n\t"
+    "gslqc1     $f22, $f20, 0x30(%[tmp])                  \n\t"
+    "paddh      $f28, $f28, $f20                          \n\t"
+    "paddh      $f30, $f30, $f22                          \n\t"
+    "gslqc1     $f18, $f16, 0x70(%[tmp])                  \n\t"
+    "paddh      $f28, $f28, $f16                          \n\t"
+    "paddh      $f30, $f30, $f18                          \n\t"
+    "gslqc1     $f10, $f8, 0x20(%[tmp])                   \n\t"
+    "paddh      $f28, $f28, $f8                           \n\t"
+    "paddh      $f30, $f30, $f10                          \n\t"
+    "pandn      $f8, $f4, $f20                            \n\t"
+    "pandn      $f10, $f6, $f22                           \n\t"
+    "dmtc1      $8, $f20                                  \n\t"
+    "psrah      $f28, $f28, $f20                          \n\t"
+    "psrah      $f30, $f30, $f20                          \n\t"
+    "and        $f16, $f4, $f28                           \n\t"
+    "and        $f18, $f6, $f30                           \n\t"
+    "or         $f16, $f16, $f8                           \n\t"
+    "or         $f18, $f18, $f10                          \n\t"
+    "gslqc1     $f10, $f8, 0x50(%[tmp])                   \n\t"
+    "packushb   $f24, $f24, $f26                          \n\t"
+    "packushb   $f26, $f16, $f18                          \n\t"
+    "gssqc1     $f26, $f24, 0x90(%[tmp])                  \n\t"
+    "paddh      $f24, $f8, $f8                            \n\t"
+    "paddh      $f26, $f10, $f10                          \n\t"
+    "dmtc1      %[iAlpha], $f20                           \n\t"
+    "dmtc1      %[iBeta], $f22                            \n\t"
+    "gslqc1     $f10, $f8, 0x20(%[tmp])                   \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "paddh      $f24, $f24, $f12                          \n\t"
+    "paddh      $f26, $f26, $f14                          \n\t"
+    "mov.d      $f16, $f0                                 \n\t"
+    "mov.d      $f18, $f2                                 \n\t"
+    "pandn      $f0, $f0, $f20                            \n\t"
+    "pandn      $f2, $f2, $f22                            \n\t"
+    "dmtc1      $8, $f20                                  \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+    "psrah      $f24, $f24, $f20                          \n\t"
+    "psrah      $f26, $f26, $f20                          \n\t"
+    "and        $f16, $f16, $f24                          \n\t"
+    "and        $f18, $f18, $f26                          \n\t"
+    "or         $f16, $f16, $f0                           \n\t"
+    "or         $f18, $f18, $f2                           \n\t"
+    "gslqc1     $f2, $f0, 0x70(%[tmp])                    \n\t"
+    "paddh      $f20, $f0, $f0                            \n\t"
+    "paddh      $f22, $f2, $f2                            \n\t"
+    "gslqc1     $f2, $f0, 0x40(%[tmp])                    \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+    "gslqc1     $f14, $f12, 0x60(%[tmp])                  \n\t"
+    "paddh      $f20, $f20, $f12                          \n\t"
+    "paddh      $f22, $f22, $f14                          \n\t"
+    "paddh      $f20, $f20, $f8                           \n\t"
+    "paddh      $f22, $f22, $f10                          \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "psrah      $f20, $f20, $f8                           \n\t"
+    "psrah      $f22, $f22, $f8                           \n\t"
+    "and        $f12, $f4, $f20                           \n\t"
+    "and        $f14, $f6, $f22                           \n\t"
+    "pandn      $f4, $f4, $f0                             \n\t"
+    "pandn      $f6, $f6, $f2                             \n\t"
+    "or         $f12, $f12, $f4                           \n\t"
+    "or         $f14, $f14, $f6                           \n\t"
+    "packushb   $f16, $f16, $f18                          \n\t"
+    "packushb   $f18, $f12, $f14                          \n\t"
+    "gssqc1     $f18, $f16, 0xa0(%[tmp])                  \n\t"
+    "gslqc1     $f2, $f0, 0x0($11)                        \n\t"
+    "gslqc1     $f6, $f4, 0x10($11)                       \n\t"
+    "gslqc1     $f10, $f8, 0x20($11)                      \n\t"
+    "gslqc1     $f14, $f12, 0x30($11)                     \n\t"
+    "mov.d      $f26, $f2                                 \n\t"
+    "punpckhbh  $f2, $f0, $f4                             \n\t"
+    "punpcklbh  $f0, $f0, $f4                             \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+    "mov.d      $f30, $f10                                \n\t"
+    "punpckhbh  $f10, $f8, $f12                           \n\t"
+    "punpcklbh  $f8, $f8, $f12                            \n\t"
+    "punpcklbh  $f28, $f30, $f14                          \n\t"
+    "punpckhbh  $f30, $f30, $f14                          \n\t"
+    "punpcklhw  $f16, $f2, $f10                           \n\t"
+    "punpckhhw  $f18, $f2, $f10                           \n\t"
+    "punpcklhw  $f20, $f26, $f30                          \n\t"
+    "punpckhhw  $f22, $f26, $f30                          \n\t"
+    "punpckhhw  $f2, $f0, $f8                             \n\t"
+    "punpcklhw  $f0, $f0, $f8                             \n\t"
+    "punpckhhw  $f26, $f24, $f28                          \n\t"
+    "punpcklhw  $f24, $f24, $f28                          \n\t"
+    "punpcklwd  $f4, $f2, $f26                            \n\t"
+    "punpckhwd  $f6, $f2, $f26                            \n\t"
+    "punpcklwd  $f8, $f18, $f22                           \n\t"
+    "punpckhwd  $f10, $f18, $f22                          \n\t"
+    "punpckhwd  $f2, $f0, $f24                            \n\t"
+    "punpcklwd  $f0, $f0, $f24                            \n\t"
+    "punpckhwd  $f18, $f16, $f20                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f20, $f2                                 \n\t"
+    "mov.d      $f24, $f6                                 \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "mov.d      $f22, $f18                                \n\t"
+    "mov.d      $f6, $f8                                  \n\t"
+    "mov.d      $f26, $f10                                \n\t"
+    "dli        %[iAlpha], 0x20                           \n\t"
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+    "gsswlc1    $f0, 0x3($9)                              \n\t"
+    "gsswrc1    $f0, 0x0($9)                              \n\t"
+    "daddu      $12, $9, %[iStride]                       \n\t"
+    "gsswlc1    $f20, 0x3($12)                            \n\t"
+    "gsswrc1    $f20, 0x0($12)                            \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsswlc1    $f4, 0x3($12)                             \n\t"
+    "gsswrc1    $f4, 0x0($12)                             \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsswlc1    $f24, 0x3($12)                            \n\t"
+    "gsswrc1    $f24, 0x0($12)                            \n\t"
+    "dsrl       $f0, $f0, $f8                             \n\t"
+    "dsrl       $f20, $f20, $f8                           \n\t"
+    "dsrl       $f4, $f4, $f8                             \n\t"
+    "dsrl       $f24, $f24, $f8                           \n\t"
+    "gsswlc1    $f0, 0x3($10)                             \n\t"
+    "gsswrc1    $f0, 0x0($10)                             \n\t"
+    "daddu      $13, $10, %[iStride]                      \n\t"
+    "daddu      $8, $13, %[iStride]                       \n\t"
+    "gsswlc1    $f20, 0x3($13)                            \n\t"
+    "gsswrc1    $f20, 0x0($13)                            \n\t"
+    "daddu      $13, $8, %[iStride]                       \n\t"
+    "gsswlc1    $f4, 0x3($8)                              \n\t"
+    "gsswrc1    $f4, 0x0($8)                              \n\t"
+    "gsswlc1    $f24, 0x3($13)                            \n\t"
+    "gsswrc1    $f24, 0x0($13)                            \n\t"
+    "gsswlc1    $f2, 0x3(%[pPixCb])                       \n\t"
+    "gsswrc1    $f2, 0x0(%[pPixCb])                       \n\t"
+    "daddu      $12, %[pPixCb], %[iStride]                \n\t"
+    "gsswlc1    $f22, 0x3($12)                            \n\t"
+    "gsswrc1    $f22, 0x0($12)                            \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsswlc1    $f6, 0x3($12)                             \n\t"
+    "gsswrc1    $f6, 0x0($12)                             \n\t"
+    "daddu      $12, $12, %[iStride]                      \n\t"
+    "gsswlc1    $f26, 0x3($12)                            \n\t"
+    "gsswrc1    $f26, 0x0($12)                            \n\t"
+    "dsrl       $f2, $f2, $f8                             \n\t"
+    "dsrl       $f22, $f22, $f8                           \n\t"
+    "dsrl       $f6, $f6, $f8                             \n\t"
+    "dsrl       $f26, $f26, $f8                           \n\t"
+    "gsswlc1    $f2, 0x3(%[pPixCr])                       \n\t"
+    "gsswrc1    $f2, 0x0(%[pPixCr])                       \n\t"
+    "daddu      $13, %[pPixCr], %[iStride]                \n\t"
+    "daddu      $8, $13, %[iStride]                       \n\t"
+    "gsswlc1    $f22, 0x3($13)                            \n\t"
+    "gsswrc1    $f22, 0x0($13)                            \n\t"
+    "daddu      $13, $8, %[iStride]                       \n\t"
+    "gsswlc1    $f6, 0x3($8)                              \n\t"
+    "gsswrc1    $f6, 0x0($8)                              \n\t"
+    "gsswlc1    $f26, 0x3($13)                            \n\t"
+    "gsswrc1    $f26, 0x0($13)                            \n\t"
+    : [pPixCb]"+&r"((unsigned char *)pPixCb), [pPixCr]"+&r"((unsigned char *)pPixCr)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha),
+      [iBeta]"r"(iBeta), [tmp]"r"((unsigned char *)tmp)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$f0", "$f2", "$f4",
+      "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void DeblockChromaLt4H_mmi(uint8_t *pPixCb, uint8_t *pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta, int8_t *pTC) {
+  unsigned char tmp[320] __attribute__((aligned(32)));
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "daddiu     %[pPixCb], %[pPixCb], -0x2                \n\t"
+    "daddiu     %[pPixCr], %[pPixCr], -0x2                \n\t"
+    "daddu      $8, %[pPixCb], %[iStride]                 \n\t"
+    "gsldlc1    $f0, 0x7(%[pPixCb])                       \n\t"
+    "gsldlc1    $f4, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pPixCb])                       \n\t"
+    "gsldrc1    $f4, 0x0($8)                              \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldlc1    $f12, 0x7($8)                             \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    "gsldrc1    $f12, 0x0($8)                             \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+
+    "daddu      $10, %[pPixCr], %[iStride]                \n\t"
+    "gsldlc1    $f16, 0x7(%[pPixCr])                      \n\t"
+    "gsldlc1    $f20, 0x7($10)                            \n\t"
+    "gsldrc1    $f16, 0x0(%[pPixCr])                      \n\t"
+    "gsldrc1    $f20, 0x0($10)                            \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+    "gsldlc1    $f24, 0x7($11)                            \n\t"
+    "gsldlc1    $f28, 0x7($10)                            \n\t"
+    "gsldrc1    $f24, 0x0($11)                            \n\t"
+    "gsldrc1    $f28, 0x0($10)                            \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+
+    "punpcklwd  $f0, $f0, $f16                            \n\t"
+    "punpcklwd  $f4, $f4, $f20                            \n\t"
+    "punpcklwd  $f8, $f8, $f24                            \n\t"
+    "punpcklwd  $f12, $f12, $f28                          \n\t"
+    "gsldlc1    $f16, 0x7($9)                             \n\t"
+    "gsldlc1    $f20, 0x7($11)                            \n\t"
+    "gsldrc1    $f16, 0x0($9)                             \n\t"
+    "gsldrc1    $f20, 0x0($11)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+    "gsldlc1    $f16, 0x7($8)                             \n\t"
+    "gsldlc1    $f20, 0x7($10)                            \n\t"
+    "gsldrc1    $f16, 0x0($8)                             \n\t"
+    "gsldrc1    $f20, 0x0($10)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f6, $f16                                 \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+
+    "gsldlc1    $f16, 0x7($9)                             \n\t"
+    "gsldlc1    $f20, 0x7($11)                            \n\t"
+    "gsldrc1    $f16, 0x0($9)                             \n\t"
+    "gsldrc1    $f20, 0x0($11)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f10, $f16                                \n\t"
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+
+    "gsldlc1    $f16, 0x7($8)                             \n\t"
+    "gsldlc1    $f20, 0x7($10)                            \n\t"
+    "gsldrc1    $f16, 0x0($8)                             \n\t"
+    "gsldrc1    $f20, 0x0($10)                            \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "mov.d      $f14, $f16                                \n\t"
+
+    "punpcklbh  $f24, $f2, $f6                            \n\t"
+    "punpckhbh  $f26, $f2, $f6                            \n\t"
+    "punpckhbh  $f2, $f0, $f4                             \n\t"
+    "punpcklbh  $f0, $f0, $f4                             \n\t"
+    "punpcklbh  $f28, $f10, $f14                          \n\t"
+    "punpckhbh  $f30, $f10, $f14                          \n\t"
+    "punpckhbh  $f10, $f8, $f12                           \n\t"
+    "punpcklbh  $f8, $f8, $f12                            \n\t"
+
+    "punpcklhw  $f16, $f2, $f10                           \n\t"
+    "punpckhhw  $f18, $f2, $f10                           \n\t"
+    "punpckhhw  $f2, $f0, $f8                             \n\t"
+    "punpcklhw  $f0, $f0, $f8                             \n\t"
+    "punpcklhw  $f20, $f26, $f30                          \n\t"
+    "punpckhhw  $f22, $f26, $f30                          \n\t"
+    "punpckhhw  $f26, $f24, $f28                          \n\t"
+    "punpcklhw  $f24, $f24, $f28                          \n\t"
+
+    "punpcklwd  $f4, $f2, $f26                            \n\t"
+    "punpckhwd  $f6, $f2, $f26                            \n\t"
+    "punpckhwd  $f2, $f0, $f24                            \n\t"
+    "punpcklwd  $f0, $f0, $f24                            \n\t"
+    "punpcklwd  $f8, $f18, $f22                           \n\t"
+    "punpckhwd  $f10, $f18, $f22                          \n\t"
+    "punpckhwd  $f18, $f16, $f20                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+
+    "mov.d      $f20, $f2                                 \n\t"
+    "mov.d      $f22, $f18                                \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "mov.d      $f24, $f6                                 \n\t"
+    "mov.d      $f26, $f10                                \n\t"
+    "mov.d      $f6, $f8                                  \n\t"
+    "daddiu     $11, %[tmp], 0x70                         \n\t"
+
+    "gssqc1     $f2, $f0, 0x0($11)                        \n\t"
+    "gssqc1     $f22, $f20, 0x10($11)                     \n\t"
+    "gssqc1     $f6, $f4, 0x20($11)                       \n\t"
+    "gssqc1     $f26, $f24, 0x30($11)                     \n\t"
+
+    "lb         $8, 0x3(%[pTC])                           \n\t"
+    "lb         $9, 0x2(%[pTC])                           \n\t"
+    "lb         $10, 0x1(%[pTC])                          \n\t"
+    "lb         $11, 0x0(%[pTC])                          \n\t"
+
+    "and        $12, $8, 0xFFFF                           \n\t"
+    "dmtc1      $12, $f8                                  \n\t"
+
+    "and        $9, $9, 0xFFFF                            \n\t"
+    "dmtc1      $9, $f12                                  \n\t"
+    "mov.d      $f16, $f12                                \n\t"
+
+    "and        $9, $10, 0xFFFF                           \n\t"
+    "dmtc1      $9, $f20                                  \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "mov.d      $f24, $f20                                \n\t"
+    "and        $9, $11, 0xFFFF                           \n\t"
+    "punpcklhw  $f24, $f24, $f8                           \n\t"
+
+    "mov.d      $f4, $f8                                  \n\t"
+    "dmtc1      $9, $f28                                  \n\t"
+    "mov.d      $f0, $f28                                 \n\t"
+
+    "punpcklhw  $f28, $f28, $f12                          \n\t"
+    "punpcklhw  $f20, $f20, $f4                           \n\t"
+    "xor        $f4, $f4, $f4                             \n\t"
+    "xor        $f6, $f6, $f6                             \n\t"
+    "punpcklhw  $f28, $f28, $f20                          \n\t"
+    "gslqc1     $f22, $f20, 0xA0(%[tmp])                  \n\t"
+    "punpcklhw  $f0, $f0, $f16                            \n\t"
+    "punpcklhw  $f0, $f0, $f24                            \n\t"
+
+    "gslqc1     $f26, $f24, 0x70(%[tmp])                  \n\t"
+    "punpckhhw  $f2, $f0, $f28                            \n\t"
+    "punpcklhw  $f0, $f0, $f28                            \n\t"
+    "gslqc1     $f30, $f28, 0x80(%[tmp])                  \n\t"
+    "psubh      $f8, $f4, $f0                             \n\t"
+    "psubh      $f10, $f6, $f2                            \n\t"
+    "gssqc1     $f10, $f8, 0xD0(%[tmp])                   \n\t"
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+    "punpcklhw  $f12, $f8, $f8                            \n\t"
+    "punpcklwd  $f16, $f12, $f12                          \n\t"
+    "mov.d      $f18, $f16                                \n\t"
+
+    "dmtc1      %[iBeta], $f8                             \n\t"
+    "punpcklhw  $f12, $f8, $f8                            \n\t"
+    "punpcklwd  $f8, $f12, $f12                           \n\t"
+    "mov.d      $f10, $f8                                 \n\t"
+
+    "gslqc1     $f14, $f12, 0x90(%[tmp])                  \n\t"
+    "gssqc1     $f10, $f8, 0x50(%[tmp])                   \n\t"
+    "punpckhbh  $f10, $f24, $f4                           \n\t"
+    "punpcklbh  $f8, $f24, $f4                            \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+
+    "gssqc1     $f10, $f8, 0x40(%[tmp])                   \n\t"
+    "gssqc1     $f26, $f24, 0xB0(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0x90(%[tmp])                  \n\t"
+    "punpcklbh  $f8, $f28, $f4                            \n\t"
+    "punpckhbh  $f10, $f28, $f4                           \n\t"
+    "punpcklbh  $f28, $f30, $f6                           \n\t"
+    "punpckhbh  $f30, $f30, $f6                           \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+    "punpckhbh  $f14, $f12, $f4                           \n\t"
+    "punpcklbh  $f12, $f12, $f4                           \n\t"
+    "punpckhbh  $f22, $f20, $f4                           \n\t"
+    "punpcklbh  $f20, $f20, $f4                           \n\t"
+    "gssqc1     $f30, $f28, 0xF0(%[tmp])                  \n\t"
+    "gssqc1     $f26, $f24, 0xC0(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0xA0(%[tmp])                  \n\t"
+    "punpcklbh  $f24, $f26, $f6                           \n\t"
+    "punpckhbh  $f26, $f26, $f6                           \n\t"
+
+    "dli        $13, 0x4                                  \n\t"
+    "gssqc1     $f26, $f24, 0xE0(%[tmp])                  \n\t"
+    "dmtc1      $13, $f24                                 \n\t"
+    "punpcklhw  $f28, $f24, $f24                          \n\t"
+    "punpcklwd  $f24, $f28, $f28                          \n\t"
+    "mov.d      $f26, $f24                                \n\t"
+    "dli        $12, 0x2                                  \n\t"
+    "dli        $13, 0x3                                  \n\t"
+
+    "gssqc1     $f2, $f0, 0x20(%[tmp])                    \n\t"
+    "dmfc1      %[iAlpha], $f0                            \n\t"
+    "dmfc1      %[iBeta], $f2                             \n\t"
+    "gssqc1     $f26, $f24, 0x30(%[tmp])                  \n\t"
+    "gslqc1     $f30, $f28, 0x40(%[tmp])                  \n\t"
+    "psubh      $f28, $f28, $f20                          \n\t"
+    "psubh      $f30, $f30, $f22                          \n\t"
+    "pcmpgth    $f24, $f0, $f4                            \n\t"
+    "pcmpgth    $f26, $f2, $f6                            \n\t"
+
+    "dmtc1      $12, $f0                                  \n\t"
+    "dmtc1      $13, $f2                                  \n\t"
+    "gssqc1     $f26, $f24, 0x60(%[tmp])                  \n\t"
+    "gslqc1     $f6, $f4, 0xD0(%[tmp])                    \n\t"
+    "psubh      $f24, $f12, $f8                           \n\t"
+    "psubh      $f26, $f14, $f10                          \n\t"
+    "psllh      $f24, $f24, $f0                           \n\t"
+    "psllh      $f26, $f26, $f0                           \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x30(%[tmp])                  \n\t"
+    "paddh      $f24, $f24, $f28                          \n\t"
+    "paddh      $f26, $f26, $f30                          \n\t"
+    "psrah      $f24, $f24, $f2                           \n\t"
+    "psrah      $f26, $f26, $f2                           \n\t"
+    "pmaxsh     $f4, $f4, $f24                            \n\t"
+    "pmaxsh     $f6, $f6, $f26                            \n\t"
+
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "gslqc1     $f26, $f24, 0x20(%[tmp])                  \n\t"
+    "pminsh     $f24, $f24, $f4                           \n\t"
+    "pminsh     $f26, $f26, $f6                           \n\t"
+
+    "gssqc1     $f26, $f24, 0x20(%[tmp])                  \n\t"
+    "psubh      $f4, $f8, $f12                            \n\t"
+    "psubh      $f6, $f10, $f14                           \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f0, $f2)
+    "pcmpgth    $f24, $f16, $f4                           \n\t"
+    "pcmpgth    $f26, $f18, $f6                           \n\t"
+    "gslqc1     $f6, $f4, 0x40(%[tmp])                    \n\t"
+    "psubh      $f4, $f4, $f8                             \n\t"
+    "psubh      $f6, $f6, $f10                            \n\t"
+    WELS_AbsH($f4, $f6, $f4, $f6, $f0, $f2)
+    "pcmpgth    $f28, $f28, $f4                           \n\t"
+    "pcmpgth    $f30, $f30, $f6                           \n\t"
+
+    "gslqc1     $f6, $f4, 0x50(%[tmp])                    \n\t"
+    "and        $f24, $f24, $f28                          \n\t"
+    "and        $f26, $f26, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psubh      $f20, $f20, $f12                          \n\t"
+    "psubh      $f22, $f22, $f14                          \n\t"
+    WELS_AbsH($f20, $f22, $f20, $f22, $f0, $f2)
+    "pcmpgth    $f4, $f4, $f20                            \n\t"
+    "pcmpgth    $f6, $f6, $f22                            \n\t"
+
+    "gslqc1     $f22, $f20, 0xB0(%[tmp])                  \n\t"
+    "gslqc1     $f2, $f0, 0xE0(%[tmp])                    \n\t"
+    "psubh      $f20, $f20, $f0                           \n\t"
+    "psubh      $f22, $f22, $f2                           \n\t"
+    "and        $f24, $f24, $f4                           \n\t"
+    "and        $f26, $f26, $f6                           \n\t"
+    "gslqc1     $f2, $f0, 0x60(%[tmp])                    \n\t"
+    "and        $f24, $f24, $f0                           \n\t"
+    "and        $f26, $f26, $f2                           \n\t"
+
+    "gslqc1     $f6, $f4, 0x20(%[tmp])                    \n\t"
+    "and        $f4, $f4, $f24                            \n\t"
+    "and        $f6, $f6, $f26                            \n\t"
+    "gslqc1     $f26, $f24, 0xC0(%[tmp])                  \n\t"
+    "gssqc1     $f6, $f4, 0x40(%[tmp])                    \n\t"
+    "gslqc1     $f6, $f4, 0xF0(%[tmp])                    \n\t"
+
+    "dmtc1      $12, $f0                                  \n\t"
+    "psubh      $f24, $f24, $f4                           \n\t"
+    "psubh      $f26, $f26, $f6                           \n\t"
+    "psllh      $f24, $f24, $f0                           \n\t"
+    "psllh      $f26, $f26, $f0                           \n\t"
+    "paddh      $f24, $f24, $f20                          \n\t"
+    "paddh      $f26, $f26, $f22                          \n\t"
+    "gslqc1     $f2, $f0, 0x30(%[tmp])                    \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+    "dmtc1      %[iBeta], $f2                             \n\t"
+
+    "dmtc1      $13, $f0                                  \n\t"
+    "gslqc1     $f22, $f20, 0xD0(%[tmp])                  \n\t"
+    "psrah      $f24, $f24, $f0                           \n\t"
+    "psrah      $f26, $f26, $f0                           \n\t"
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+    "pmaxsh     $f20, $f20, $f24                          \n\t"
+    "pmaxsh     $f22, $f22, $f26                          \n\t"
+    "pminsh     $f0, $f0, $f20                            \n\t"
+    "pminsh     $f2, $f2, $f22                            \n\t"
+
+    "dmfc1      %[iAlpha], $f0                            \n\t"
+    "dmfc1      %[iBeta], $f2                             \n\t"
+    "gslqc1     $f22, $f20, 0xC0(%[tmp])                  \n\t"
+    "psubh      $f24, $f4, $f20                           \n\t"
+    "psubh      $f26, $f6, $f22                           \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f0, $f2)
+    "pcmpgth    $f16, $f16, $f24                          \n\t"
+    "pcmpgth    $f18, $f18, $f26                          \n\t"
+
+    "gslqc1     $f26, $f24, 0xB0(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f4                           \n\t"
+    "psubh      $f26, $f26, $f6                           \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f0, $f2)
+    "pcmpgth    $f28, $f28, $f24                          \n\t"
+    "pcmpgth    $f30, $f30, $f26                          \n\t"
+
+    "gslqc1     $f26, $f24, 0xE0(%[tmp])                  \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+
+    "gslqc1     $f30, $f28, 0x50(%[tmp])                  \n\t"
+    "psubh      $f24, $f24, $f20                          \n\t"
+    "psubh      $f26, $f26, $f22                          \n\t"
+    WELS_AbsH($f24, $f26, $f24, $f26, $f0, $f2)
+    "pcmpgth    $f28, $f28, $f24                          \n\t"
+    "pcmpgth    $f30, $f30, $f26                          \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+    "gslqc1     $f30, $f28, 0x60(%[tmp])                  \n\t"
+    "dmtc1      %[iAlpha], $f0                            \n\t"
+    "dmtc1      %[iBeta], $f2                             \n\t"
+    "and        $f16, $f16, $f28                          \n\t"
+    "and        $f18, $f18, $f30                          \n\t"
+    "and        $f0, $f0, $f16                            \n\t"
+    "and        $f2, $f2, $f18                            \n\t"
+
+    "gslqc1     $f18, $f16, 0x40(%[tmp])                  \n\t"
+    "paddh      $f8, $f8, $f16                            \n\t"
+    "paddh      $f10, $f10, $f18                          \n\t"
+    "paddh      $f4, $f4, $f0                             \n\t"
+    "paddh      $f6, $f6, $f2                             \n\t"
+    "psubh      $f12, $f12, $f16                          \n\t"
+    "psubh      $f14, $f14, $f18                          \n\t"
+    "psubh      $f20, $f20, $f0                           \n\t"
+    "psubh      $f22, $f22, $f2                           \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f4, $f6                            \n\t"
+    "packushb   $f12, $f12, $f14                          \n\t"
+    "packushb   $f14, $f20, $f22                          \n\t"
+
+    "gssqc1     $f10, $f8, 0x80(%[tmp])                   \n\t"
+    "gssqc1     $f14, $f12, 0x90(%[tmp])                  \n\t"
+    "daddiu     $11, %[tmp], 0x70                         \n\t"
+
+    "gslqc1     $f2, $f0, 0x0($11)                        \n\t"
+    "gslqc1     $f6, $f4, 0x10($11)                       \n\t"
+    "gslqc1     $f10, $f8, 0x20($11)                      \n\t"
+    "gslqc1     $f14, $f12, 0x30($11)                     \n\t"
+
+    "punpcklbh  $f24, $f2, $f6                            \n\t"
+    "punpckhbh  $f26, $f2, $f6                            \n\t"
+    "punpckhbh  $f2, $f0, $f4                             \n\t"
+    "punpcklbh  $f0, $f0, $f4                             \n\t"
+
+    "punpcklbh  $f28, $f10, $f14                          \n\t"
+    "punpckhbh  $f30, $f10, $f14                          \n\t"
+    "punpckhbh  $f10, $f8, $f12                           \n\t"
+    "punpcklbh  $f8, $f8, $f12                            \n\t"
+
+    "punpcklhw  $f16, $f2, $f10                           \n\t"
+    "punpckhhw  $f18, $f2, $f10                           \n\t"
+    "punpckhhw  $f2, $f0, $f8                             \n\t"
+    "punpcklhw  $f0, $f0, $f8                             \n\t"
+    "punpcklhw  $f20, $f26, $f30                          \n\t"
+    "punpckhhw  $f22, $f26, $f30                          \n\t"
+    "punpckhhw  $f26, $f24, $f28                          \n\t"
+    "punpcklhw  $f24, $f24, $f28                          \n\t"
+
+    "punpcklwd  $f4, $f2, $f26                            \n\t"
+    "punpckhwd  $f6, $f2, $f26                            \n\t"
+    "punpckhwd  $f2, $f0, $f24                            \n\t"
+    "punpcklwd  $f0, $f0, $f24                            \n\t"
+    "punpcklwd  $f8, $f18, $f22                           \n\t"
+    "punpckhwd  $f10, $f18, $f22                          \n\t"
+    "punpckhwd  $f18, $f16, $f20                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+
+    "mov.d      $f20, $f2                                 \n\t"
+    "mov.d      $f22, $f18                                \n\t"
+    "mov.d      $f2, $f16                                 \n\t"
+    "mov.d      $f24, $f6                                 \n\t"
+    "mov.d      $f26, $f10                                \n\t"
+    "mov.d      $f6, $f8                                  \n\t"
+
+    "dli        %[iAlpha], 0x20                           \n\t"
+    "daddu      $8, %[pPixCb], %[iStride]                 \n\t"
+    "gsswlc1    $f0, 0x3(%[pPixCb])                       \n\t"
+    "gsswlc1    $f20, 0x3($8)                             \n\t"
+    "gsswrc1    $f0, 0x0(%[pPixCb])                       \n\t"
+    "gsswrc1    $f20, 0x0($8)                             \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "gsswlc1    $f4, 0x3($9)                              \n\t"
+    "gsswlc1    $f24, 0x3($8)                             \n\t"
+    "gsswrc1    $f4, 0x0($9)                              \n\t"
+    "gsswrc1    $f24, 0x0($8)                             \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+    "dmtc1      %[iAlpha], $f8                            \n\t"
+
+    "dsrl       $f0, $f0, $f8                             \n\t"
+    "dsrl       $f20, $f20, $f8                           \n\t"
+    "dsrl       $f4, $f4, $f8                             \n\t"
+    "dsrl       $f24, $f24, $f8                           \n\t"
+    "daddu      $10, %[pPixCr], %[iStride]                \n\t"
+    "gsswlc1    $f0, 0x3(%[pPixCr])                       \n\t"
+    "gsswlc1    $f20, 0x3($10)                            \n\t"
+    "gsswrc1    $f0, 0x0(%[pPixCr])                       \n\t"
+    "gsswrc1    $f20, 0x0($10)                            \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+    "gsswlc1    $f4, 0x3($11)                             \n\t"
+    "gsswlc1    $f24, 0x3($10)                            \n\t"
+    "gsswrc1    $f4, 0x0($11)                             \n\t"
+    "gsswrc1    $f24, 0x0($10)                            \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "gsswlc1    $f2, 0x3($9)                              \n\t"
+    "gsswlc1    $f22, 0x3($8)                             \n\t"
+    "gsswrc1    $f2, 0x0($9)                              \n\t"
+    "gsswrc1    $f22, 0x0($8)                             \n\t"
+    "daddu      $9, $8, %[iStride]                        \n\t"
+    "daddu      $8, $9, %[iStride]                        \n\t"
+    "gsswlc1    $f6, 0x3($9)                              \n\t"
+    "gsswlc1    $f26, 0x3($8)                             \n\t"
+    "gsswrc1    $f6, 0x0($9)                              \n\t"
+    "gsswrc1    $f26, 0x0($8)                             \n\t"
+
+    "dsrl       $f2, $f2, $f8                             \n\t"
+    "dsrl       $f22, $f22, $f8                           \n\t"
+    "dsrl       $f6, $f6, $f8                             \n\t"
+    "dsrl       $f26, $f26, $f8                           \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+    "gsswlc1    $f2, 0x3($11)                             \n\t"
+    "gsswlc1    $f22, 0x3($10)                            \n\t"
+    "gsswrc1    $f2, 0x0($11)                             \n\t"
+    "gsswrc1    $f22, 0x0($10)                            \n\t"
+    "daddu      $11, $10, %[iStride]                      \n\t"
+    "daddu      $10, $11, %[iStride]                      \n\t"
+    "gsswlc1    $f6, 0x3($11)                             \n\t"
+    "gsswlc1    $f26, 0x3($10)                            \n\t"
+    "gsswrc1    $f6, 0x0($11)                             \n\t"
+    "gsswrc1    $f26, 0x0($10)                            \n\t"
+    : [pPixCb]"+&r"((unsigned char *)pPixCb), [pPixCr]"+&r"((unsigned char *)pPixCr)
+    : [iStride]"r"((int)iStride), [iAlpha]"r"(iAlpha),
+      [iBeta]"r"(iBeta), [tmp]"r"((unsigned char *)tmp), [pTC]"r"((char *)pTC)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$f0", "$f2", "$f4",
+      "$f6", "$f8", "$f10", "$f12","$f14", "$f16", "$f18", "$f20", "$f22", "$f24",
+      "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsNonZeroCount_mmi(int8_t *pNonZeroCount) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                 \n\t"
+    "gsldlc1    $f0, 0x7(%[pNonZeroCount])      \n\t"
+    "gsldlc1    $f2, 0xF(%[pNonZeroCount])      \n\t"
+    "gsldlc1    $f4, 0x17(%[pNonZeroCount])     \n\t"
+    "gsldrc1    $f4, 0x10(%[pNonZeroCount])     \n\t"
+    "gsldrc1    $f0, 0x0(%[pNonZeroCount])      \n\t"
+    "gsldrc1    $f2, 0x8(%[pNonZeroCount])      \n\t"
+    "pcmpeqh    $f8, $f8, $f8                   \n\t"
+    "dli        $8, 0xF                         \n\t"
+    "dmtc1      $8, $f6                         \n\t"
+    "psrlh      $f8, $f8, $f6                   \n\t"
+    "packushb   $f8, $f8, $f8                   \n\t"
+
+    "pminub     $f0, $f0, $f8                   \n\t"
+    "pminub     $f2, $f2, $f8                   \n\t"
+    "pminub     $f4, $f4, $f8                   \n\t"
+    "gssdlc1    $f0, 0x7(%[pNonZeroCount])      \n\t"
+    "gssdlc1    $f2, 0xF(%[pNonZeroCount])      \n\t"
+    "gssdlc1    $f4, 0x17(%[pNonZeroCount])     \n\t"
+    "gssdrc1    $f0, 0x0(%[pNonZeroCount])      \n\t"
+    "gssdrc1    $f2, 0x8(%[pNonZeroCount])      \n\t"
+    "gssdrc1    $f4, 0x10(%[pNonZeroCount])     \n\t"
+    :
+    : [pNonZeroCount] "r"((unsigned char *)pNonZeroCount)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8"
+  );
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_msa.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_msa.c
new file mode 100644
index 0000000000..0d3dfcb798
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/deblock_msa.c
@@ -0,0 +1,1024 @@
+/*!
+ * \copy
+ *     Copyright (C) 2019 Loongson Technology Co. Ltd.
+ *     Contributed by Gu Xiwei(guxiwei-hf@loongson.cn)
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblock_msa.c
+ *
+ * \brief   MIPS MSA optimizations
+ *
+ * \date    15/05/2020 Created
+ *
+ *************************************************************************************
+ */
+
+#include <stdint.h>
+#include "msa_macros.h"
+
+void DeblockLumaLt4V_msa(uint8_t *pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta, int8_t *pTc) {
+    v16u8 p0, p1, p2, q0, q1, q2;
+    v16i8 iTc, negiTc, negTc, flags, f;
+    v8i16 p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, q0_l, q0_r, q1_l, q1_r, q2_l, q2_r;
+    v8i16 tc_l, tc_r, negTc_l, negTc_r;
+    v8i16 iTc_l, iTc_r, negiTc_l, negiTc_r;
+    // Use for temporary variable
+    v8i16 t0, t1, t2, t3;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0, bDetaP2P0, bDetaQ2Q0;
+    v16i8 const_1_b = __msa_ldi_b(1);
+    v8i16 const_1_h = __msa_ldi_h(1);
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v8i16 const_not_255_h = __msa_ldi_h(~255);
+    v16i8 zero = { 0 };
+    v16i8 tc = { pTc[0  >> 2], pTc[1  >> 2], pTc[2  >> 2], pTc[3  >> 2],
+                 pTc[4  >> 2], pTc[5  >> 2], pTc[6  >> 2], pTc[7  >> 2],
+                 pTc[8  >> 2], pTc[9  >> 2], pTc[10 >> 2], pTc[11 >> 2],
+                 pTc[12 >> 2], pTc[13 >> 2], pTc[14 >> 2], pTc[15 >> 2] };
+    negTc = zero - tc;
+    iTc = tc;
+
+    // Load data from pPix
+    MSA_LD_V4(v16u8, pPix - 3 * iStride, iStride, p2, p1, p0, q0);
+    MSA_LD_V2(v16u8, pPix + iStride, iStride, q1, q2);
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP2P0 = __msa_asub_u_b(p2, p0);
+    bDetaQ2Q0 = __msa_asub_u_b(q2, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+    bDetaP2P0 = (v16u8)__msa_clt_u_b(bDetaP2P0, beta);
+    bDetaQ2Q0 = (v16u8)__msa_clt_u_b(bDetaQ2Q0, beta);
+
+    // Unsigned extend p0, p1, p2, q0, q1, q2 from 8 bits to 16 bits
+    MSA_ILVRL_B4(v8i16, zero, p0, zero, p1,
+                 p0_r, p0_l, p1_r, p1_l);
+    MSA_ILVRL_B4(v8i16, zero, p2, zero, q0,
+                 p2_r, p2_l, q0_r, q0_l);
+    MSA_ILVRL_B4(v8i16, zero, q1, zero, q2,
+                 q1_r, q1_l, q2_r, q2_l);
+    // Signed extend tc, negTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(tc, zero);
+    MSA_ILVRL_B2(v8i16, flags, tc, tc_r, tc_l);
+    flags = __msa_clt_s_b(negTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, negTc, negTc_r, negTc_l);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+    flags = f & (v16i8)bDetaP2P0;
+    flags = __msa_ceq_b(flags, zero);
+    iTc += ((~flags) & const_1_b);
+    flags = f & (v16i8)bDetaQ2Q0;
+    flags = __msa_ceq_b(flags, zero);
+    iTc += ((~flags) & const_1_b);
+    negiTc = zero - iTc;
+    // Signed extend iTc, negiTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(iTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, iTc, iTc_r, iTc_l);
+    flags = __msa_clt_s_b(negiTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, negiTc, negiTc_r, negiTc_l);
+
+    // Calculate the left part
+    // p1
+    t0 = (p2_l + ((p0_l + q0_l + const_1_h) >> 1) - (p1_l << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_l, t0);
+    t0 = __msa_min_s_h(tc_l, t0);
+    t1 = p1_l + t0;
+    // q1
+    t0 = (q2_l + ((p0_l + q0_l + const_1_h) >> 1) - (q1_l << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_l, t0);
+    t0 = __msa_min_s_h(tc_l, t0);
+    t2 = q1_l + t0;
+    // iDeta
+    t0 = (((q0_l - p0_l) << 2) + (p1_l - q1_l) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negiTc_l, t0);
+    t0 = __msa_min_s_h(iTc_l, t0);
+    p1_l = t1;
+    q1_l = t2;
+    // p0
+    t1 = p0_l + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_l = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_l - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_l = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    // Calculate the right part
+    // p1
+    t0 = (p2_r + ((p0_r + q0_r + const_1_h) >> 1) - (p1_r << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_r, t0);
+    t0 = __msa_min_s_h(tc_r, t0);
+    t1 = p1_r + t0;
+    // q1
+    t0 = (q2_r + ((p0_r + q0_r + const_1_h) >> 1) - (q1_r << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_r, t0);
+    t0 = __msa_min_s_h(tc_r, t0);
+    t2 = q1_r + t0;
+    // iDeta
+    t0 = (((q0_r - p0_r) << 2) + (p1_r - q1_r) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negiTc_r, t0);
+    t0 = __msa_min_s_h(iTc_r, t0);
+    p1_r = t1;
+    q1_r = t2;
+    // p0
+    t1 = p0_r + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_r = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_r - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_r = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    // Combined left and right
+    MSA_PCKEV_B4(v8i16, p1_l, p1_r, p0_l, p0_r, q0_l, q0_r, q1_l, q1_r,
+                 t0, t1, t2, t3);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t1 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t2 & flags) + (q0 & (~flags)));
+    // Using t1, t2 as temporary flags
+    t1 = (v8i16)(flags & (~(__msa_ceq_b((v16i8)bDetaP2P0, zero))));
+    p1 = (v16u8)(t0 & t1) + (p1 & (v16u8)(~t1));
+    t2 = (v8i16)(flags & (~(__msa_ceq_b((v16i8)bDetaQ2Q0, zero))));
+    q1 = (v16u8)(t3 & t2) + (q1 & (v16u8)(~t2));
+
+    // Store data to pPix
+    MSA_ST_V4(v16u8, p1, p0, q0, q1, pPix - 2 * iStride, iStride);
+}
+
+void DeblockLumaEq4V_msa(uint8_t *pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta) {
+    v16u8 p0, p1, p2, p3, q0, q1, q2, q3;
+    v8i16 p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, p3_l, p3_r,
+          q0_l, q0_r, q1_l, q1_r, q2_l, q2_r, q3_l, q3_r;
+    v8i16 t0, t1, t2, t0_con1;
+    v8i16 s0, s1, s2, s0_con1;
+    v16u8 alpha, beta;
+    v16u8 iDetaP0Q0, bDetaP1P0, bDetaQ1Q0, bDetaP2P0, bDetaQ2Q0;
+    // Condition mask
+    v16u8 mask0, mask1;
+    v16i8 const_2_b = __msa_ldi_b(2);
+    v8i16 const_2_h = __msa_ldi_h(2);
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v16i8 zero = { 0 };
+
+    // Load data from pPix
+    MSA_LD_V8(v16u8, pPix - 4 * iStride, iStride, p3, p2, p1, p0,
+              q0, q1, q2, q3);
+    // iAlpha and beta are uint8_t type
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    // iDetaP0Q0 is not bool type
+    iDetaP0Q0 = __msa_asub_u_b(p0, q0);
+
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP2P0 = __msa_asub_u_b(p2, p0);
+    bDetaQ2Q0 = __msa_asub_u_b(q2, q0);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+    bDetaP2P0 = (v16u8)__msa_clt_u_b(bDetaP2P0, beta);
+    bDetaQ2Q0 = (v16u8)__msa_clt_u_b(bDetaQ2Q0, beta);
+
+    // Unsigned extend p0, p1, p2, p3, q0, q1, q2, q3 from 8 bits to 16 bits
+    MSA_ILVRL_B4(v8i16, zero, p0, zero, p1,
+                 p0_r, p0_l, p1_r, p1_l);
+    MSA_ILVRL_B4(v8i16, zero, p2, zero, p3,
+                 p2_r, p2_l, p3_r, p3_l);
+    MSA_ILVRL_B4(v8i16, zero, q0, zero, q1,
+                 q0_r, q0_l, q1_r, q1_l);
+    MSA_ILVRL_B4(v8i16, zero, q2, zero, q3,
+                 q2_r, q2_l, q3_r, q3_l);
+
+    // Calculate condition mask
+    // (iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0
+    mask0 = (v16u8)__msa_clt_u_b(iDetaP0Q0, alpha);
+    mask0 &= bDetaP1P0;
+    mask0 &= bDetaQ1Q0;
+    // iDetaP0Q0 < ((iAlpha >> 2) + 2)
+    mask1 = (v16u8)((alpha >> 2) + const_2_b);
+    mask1 = (v16u8)__msa_clt_u_b(iDetaP0Q0, mask1);
+
+    // Calculate the left part
+    // p0
+    t0 = (p2_l + (p1_l << 1) + (p0_l << 1) + (q0_l << 1) + q1_l + const_4_h) >> 3;
+    // p1
+    t1 = (p2_l + p1_l + p0_l + q0_l + const_2_h) >> 2;
+    // p2
+    t2 = ((p3_l << 1) + p2_l + (p2_l << 1) + p1_l + p0_l + q0_l + const_4_h) >> 3;
+    // p0 condition 1
+    t0_con1 = ((p1_l << 1) + p0_l + q1_l + const_2_h) >> 2;
+    // q0
+    s0 = (p1_l + (p0_l << 1) + (q0_l << 1) + (q1_l << 1) + q2_l + const_4_h) >> 3;
+    // q1
+    s1 = (p0_l + q0_l + q1_l + q2_l + const_2_h) >> 2;
+    // q2
+    s2 = ((q3_l << 1) + q2_l + (q2_l << 1) + q1_l + q0_l + p0_l + const_4_h) >> 3;
+    // q0 condition 1
+    s0_con1 = ((q1_l << 1) + q0_l + p1_l + const_2_h) >> 2;
+    // Move back
+    p0_l = t0;
+    p1_l = t1;
+    p2_l = t2;
+    q0_l = s0;
+    q1_l = s1;
+    q2_l = s2;
+    // Use p3_l, q3_l as tmp
+    p3_l = t0_con1;
+    q3_l = s0_con1;
+
+    // Calculate the right part
+    // p0
+    t0 = (p2_r + (p1_r << 1) + (p0_r << 1) + (q0_r << 1) + q1_r + const_4_h) >> 3;
+    // p1
+    t1 = (p2_r + p1_r + p0_r + q0_r + const_2_h) >> 2;
+    // p2
+    t2 = ((p3_r << 1) + p2_r + (p2_r << 1) + p1_r + p0_r + q0_r + const_4_h) >> 3;
+    // p0 condition 1
+    t0_con1 = ((p1_r << 1) + p0_r + q1_r + const_2_h) >> 2;
+    // q0
+    s0 = (p1_r + (p0_r << 1) + (q0_r << 1) + (q1_r << 1) + q2_r + const_4_h) >> 3;
+    // q1
+    s1 = (p0_r + q0_r + q1_r + q2_r + const_2_h) >> 2;
+    // q2
+    s2 = ((q3_r << 1) + q2_r + (q2_r << 1) + q1_r + q0_r + p0_r + const_4_h) >> 3;
+    // q0 condition 1
+    s0_con1 = ((q1_r << 1) + q0_r + p1_r + const_2_h) >> 2;
+    // Move back
+    p0_r = t0;
+    p1_r = t1;
+    p2_r = t2;
+    q0_r = s0;
+    q1_r = s1;
+    q2_r = s2;
+    // Use p3_r, q3_r as tmp
+    p3_r = t0_con1;
+    q3_r = s0_con1;
+
+    // Combined left and right
+    MSA_PCKEV_B4(v8i16, p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, q0_l, q0_r,
+                 t0, t1, t2, s0);
+    MSA_PCKEV_B4(v8i16, q1_l, q1_r, q2_l, q2_r, p3_l, p3_r, q3_l, q3_r,
+                 s1, s2, t0_con1, s0_con1);
+    t0 = (v8i16)(((v16u8)t0 & mask0 & mask1 & bDetaP2P0) + ((v16u8)t0_con1 &
+         mask0 & mask1 & (~bDetaP2P0)) + ((v16u8)t0_con1 & mask0 & (~mask1)));
+    t1 = (v8i16)((v16u8)t1 & mask0 & mask1 & bDetaP2P0);
+    t2 = (v8i16)((v16u8)t2 & mask0 & mask1 & bDetaP2P0);
+    s0 = (v8i16)(((v16u8)s0 & mask0 & mask1 & bDetaQ2Q0) + ((v16u8)s0_con1 &
+         mask0 & mask1 & (~bDetaQ2Q0)) + ((v16u8)s0_con1 & mask0 & (~mask1)));
+    s1 = (v8i16)((v16u8)s1 & mask0 & mask1 & bDetaQ2Q0);
+    s2 = (v8i16)((v16u8)s2 & mask0 & mask1 & bDetaQ2Q0);
+    p0 = (v16u8)t0 + (p0 & (~mask0));
+    p1 = (v16u8)t1 + (p1 & ~(mask0 & mask1 & bDetaP2P0));
+    p2 = (v16u8)t2 + (p2 & ~(mask0 & mask1 & bDetaP2P0));
+    q0 = (v16u8)s0 + (q0 & (~mask0));
+    q1 = (v16u8)s1 + (q1 & ~(mask0 & mask1 & bDetaQ2Q0));
+    q2 = (v16u8)s2 + (q2 & ~(mask0 & mask1 & bDetaQ2Q0));
+
+    // Store data to pPix
+    MSA_ST_V4(v16u8, p2, p1, p0, q0, pPix - 3 * iStride, iStride);
+    MSA_ST_V2(v16u8, q1, q2, pPix + iStride, iStride);
+}
+
+
+void DeblockLumaLt4H_msa(uint8_t* pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta, int8_t* pTc) {
+    v16u8 p0, p1, p2, q0, q1, q2;
+    v16i8 iTc, negiTc, negTc, flags, f;
+    v8i16 p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, q0_l, q0_r, q1_l, q1_r, q2_l, q2_r;
+    v8i16 tc_l, tc_r, negTc_l, negTc_r;
+    v8i16 iTc_l, iTc_r, negiTc_l, negiTc_r;
+    // Use for temporary variable
+    v8i16 t0, t1, t2, t3;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0, bDetaP2P0, bDetaQ2Q0;
+    v16i8 const_1_b = __msa_ldi_b(1);
+    v8i16 const_1_h = __msa_ldi_h(1);
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v8i16 const_not_255_h = __msa_ldi_h(~255);
+    v16i8 zero = { 0 };
+    v16i8 tc = { pTc[0  >> 2], pTc[1  >> 2], pTc[2  >> 2], pTc[3  >> 2],
+                 pTc[4  >> 2], pTc[5  >> 2], pTc[6  >> 2], pTc[7  >> 2],
+                 pTc[8  >> 2], pTc[9  >> 2], pTc[10 >> 2], pTc[11 >> 2],
+                 pTc[12 >> 2], pTc[13 >> 2], pTc[14 >> 2], pTc[15 >> 2] };
+    negTc = zero - tc;
+    iTc = tc;
+
+    // Load data from pPix
+    MSA_LD_V8(v8i16, pPix - 3, iStride, t0, t1, t2, t3, q1_l, q1_r, q2_l, q2_r);
+    MSA_LD_V8(v8i16, pPix + 8 * iStride - 3, iStride, p0_l, p0_r, p1_l, p1_r,
+              p2_l, p2_r, q0_l, q0_r);
+    // Transpose 16x8 to 8x16, we just need p0, p1, p2, q0, q1, q2
+    MSA_TRANSPOSE16x8_B(v16u8, t0, t1, t2, t3, q1_l, q1_r, q2_l, q2_r,
+                        p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, q0_l, q0_r,
+                        p2, p1, p0, q0, q1, q2, alpha, beta);
+
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP2P0 = __msa_asub_u_b(p2, p0);
+    bDetaQ2Q0 = __msa_asub_u_b(q2, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+    bDetaP2P0 = (v16u8)__msa_clt_u_b(bDetaP2P0, beta);
+    bDetaQ2Q0 = (v16u8)__msa_clt_u_b(bDetaQ2Q0, beta);
+
+    // Unsigned extend p0, p1, p2, q0, q1, q2 from 8 bits to 16 bits
+    MSA_ILVRL_B4(v8i16, zero, p0, zero, p1,
+                 p0_r, p0_l, p1_r, p1_l);
+    MSA_ILVRL_B4(v8i16, zero, p2, zero, q0,
+                 p2_r, p2_l, q0_r, q0_l);
+    MSA_ILVRL_B4(v8i16, zero, q1, zero, q2,
+                 q1_r, q1_l, q2_r, q2_l);
+    // Signed extend tc, negTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(tc, zero);
+    MSA_ILVRL_B2(v8i16, flags, tc, tc_r, tc_l);
+    flags = __msa_clt_s_b(negTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, negTc, negTc_r, negTc_l);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+    flags = f & (v16i8)bDetaP2P0;
+    flags = __msa_ceq_b(flags, zero);
+    iTc += ((~flags) & const_1_b);
+    flags = f & (v16i8)bDetaQ2Q0;
+    flags = __msa_ceq_b(flags, zero);
+    iTc += ((~flags) & const_1_b);
+    negiTc = zero - iTc;
+    // Signed extend iTc, negiTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(iTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, iTc, iTc_r, iTc_l);
+    flags = __msa_clt_s_b(negiTc, zero);
+    MSA_ILVRL_B2(v8i16, flags, negiTc, negiTc_r, negiTc_l);
+
+    // Calculate the left part
+    // p1
+    t0 = (p2_l + ((p0_l + q0_l + const_1_h) >> 1) - (p1_l << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_l, t0);
+    t0 = __msa_min_s_h(tc_l, t0);
+    t1 = p1_l + t0;
+    // q1
+    t0 = (q2_l + ((p0_l + q0_l + const_1_h) >> 1) - (q1_l << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_l, t0);
+    t0 = __msa_min_s_h(tc_l, t0);
+    t2 = q1_l + t0;
+    // iDeta
+    t0 = (((q0_l - p0_l) << 2) + (p1_l - q1_l) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negiTc_l, t0);
+    t0 = __msa_min_s_h(iTc_l, t0);
+    p1_l = t1;
+    q1_l = t2;
+    // p0
+    t1 = p0_l + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_l = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_l - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_l = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    // Calculate the right part
+    // p1
+    t0 = (p2_r + ((p0_r + q0_r + const_1_h) >> 1) - (p1_r << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_r, t0);
+    t0 = __msa_min_s_h(tc_r, t0);
+    t1 = p1_r + t0;
+    // q1
+    t0 = (q2_r + ((p0_r + q0_r + const_1_h) >> 1) - (q1_r << 1)) >> 1;
+    t0 = __msa_max_s_h(negTc_r, t0);
+    t0 = __msa_min_s_h(tc_r, t0);
+    t2 = q1_r + t0;
+    // iDeta
+    t0 = (((q0_r - p0_r) << 2) + (p1_r - q1_r) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negiTc_r, t0);
+    t0 = __msa_min_s_h(iTc_r, t0);
+    p1_r = t1;
+    q1_r = t2;
+    // p0
+    t1 = p0_r + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_r = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_r - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_r = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    // Combined left and right
+    MSA_PCKEV_B4(v8i16, p1_l, p1_r, p0_l, p0_r, q0_l, q0_r, q1_l, q1_r,
+                 t0, t1, t2, t3);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t1 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t2 & flags) + (q0 & (~flags)));
+    // Using t1, t2 as temporary flags
+    t1 = (v8i16)(flags & (~(__msa_ceq_b((v16i8)bDetaP2P0, zero))));
+    p1 = (v16u8)(t0 & t1) + (p1 & (v16u8)(~t1));
+    t2 = (v8i16)(flags & (~(__msa_ceq_b((v16i8)bDetaQ2Q0, zero))));
+    q1 = (v16u8)(t3 & t2) + (q1 & (v16u8)(~t2));
+
+    MSA_ILVRL_B4(v8i16, p0, p1, q1, q0, t0, t1, t2, t3);
+    MSA_ILVRL_H4(v16u8, t2, t0, t3, t1, p1, p0, q0, q1);
+    // Store data to pPix
+    MSA_ST_W8(p1, p0, 0, 1, 2, 3, 0, 1, 2, 3, pPix - 2, iStride);
+    MSA_ST_W8(q0, q1, 0, 1, 2, 3, 0, 1, 2, 3, pPix + 8 * iStride - 2, iStride);
+}
+
+void DeblockLumaEq4H_msa(uint8_t *pPix, int32_t iStride, int32_t iAlpha,
+                         int32_t iBeta) {
+    v16u8 p0, p1, p2, p3, q0, q1, q2, q3;
+    v8i16 p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, p3_l, p3_r,
+          q0_l, q0_r, q1_l, q1_r, q2_l, q2_r, q3_l, q3_r;
+    v8i16 t0, t1, t2, t0_con1;
+    v8i16 s0, s1, s2, s0_con1;
+    v16u8 alpha, beta;
+    v16u8 iDetaP0Q0, bDetaP1P0, bDetaQ1Q0, bDetaP2P0, bDetaQ2Q0;
+    // Condition mask
+    v16u8 mask0, mask1;
+    v16i8 const_2_b = __msa_ldi_b(2);
+    v8i16 const_2_h = __msa_ldi_h(2);
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v16i8 zero = { 0 };
+
+    // Load data from pPix
+    MSA_LD_V8(v8i16, pPix - 4, iStride, p0_l, p0_r, p1_l, p1_r,
+              p2_l, p2_r, p3_l, p3_r);
+    MSA_LD_V8(v8i16, pPix + 8 * iStride - 4, iStride,
+              q0_l, q0_r, q1_l, q1_r, q2_l, q2_r, q3_l, q3_r);
+    // Transpose 16x8 to 8x16, we just need p0, p1, p2, p3, q0, q1, q2, q3
+    MSA_TRANSPOSE16x8_B(v16u8, p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, p3_l, p3_r,
+                        q0_l, q0_r, q1_l, q1_r, q2_l, q2_r, q3_l, q3_r,
+                        p3, p2, p1, p0, q0, q1, q2, q3);
+    // iAlpha and beta are uint8_t type
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    // iDetaP0Q0 is not bool type
+    iDetaP0Q0 = __msa_asub_u_b(p0, q0);
+
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP2P0 = __msa_asub_u_b(p2, p0);
+    bDetaQ2Q0 = __msa_asub_u_b(q2, q0);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+    bDetaP2P0 = (v16u8)__msa_clt_u_b(bDetaP2P0, beta);
+    bDetaQ2Q0 = (v16u8)__msa_clt_u_b(bDetaQ2Q0, beta);
+
+    // Unsigned extend p0, p1, p2, p3, q0, q1, q2, q3 from 8 bits to 16 bits
+    MSA_ILVRL_B4(v8i16, zero, p0, zero, p1,
+                 p0_r, p0_l, p1_r, p1_l);
+    MSA_ILVRL_B4(v8i16, zero, p2, zero, p3,
+                 p2_r, p2_l, p3_r, p3_l);
+    MSA_ILVRL_B4(v8i16, zero, q0, zero, q1,
+                 q0_r, q0_l, q1_r, q1_l);
+    MSA_ILVRL_B4(v8i16, zero, q2, zero, q3,
+                 q2_r, q2_l, q3_r, q3_l);
+
+    // Calculate condition mask
+    // (iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0
+    mask0 = (v16u8)__msa_clt_u_b(iDetaP0Q0, alpha);
+    mask0 &= bDetaP1P0;
+    mask0 &= bDetaQ1Q0;
+    // iDetaP0Q0 < ((iAlpha >> 2) + 2)
+    mask1 = (v16u8)((alpha >> 2) + const_2_b);
+    mask1 = (v16u8)__msa_clt_u_b(iDetaP0Q0, mask1);
+
+    // Calculate the left part
+    // p0
+    t0 = (p2_l + (p1_l << 1) + (p0_l << 1) + (q0_l << 1) + q1_l + const_4_h) >> 3;
+    // p1
+    t1 = (p2_l + p1_l + p0_l + q0_l + const_2_h) >> 2;
+    // p2
+    t2 = ((p3_l << 1) + p2_l + (p2_l << 1) + p1_l + p0_l + q0_l + const_4_h) >> 3;
+    // p0 condition 1
+    t0_con1 = ((p1_l << 1) + p0_l + q1_l + const_2_h) >> 2;
+    // q0
+    s0 = (p1_l + (p0_l << 1) + (q0_l << 1) + (q1_l << 1) + q2_l + const_4_h) >> 3;
+    // q1
+    s1 = (p0_l + q0_l + q1_l + q2_l + const_2_h) >> 2;
+    // q2
+    s2 = ((q3_l << 1) + q2_l + (q2_l << 1) + q1_l + q0_l + p0_l + const_4_h) >> 3;
+    // q0 condition 1
+    s0_con1 = ((q1_l << 1) + q0_l + p1_l + const_2_h) >> 2;
+    // Move back
+    p0_l = t0;
+    p1_l = t1;
+    p2_l = t2;
+    q0_l = s0;
+    q1_l = s1;
+    q2_l = s2;
+    // Use p3_l, q3_l as tmp
+    p3_l = t0_con1;
+    q3_l = s0_con1;
+
+    // Calculate the right part
+    // p0
+    t0 = (p2_r + (p1_r << 1) + (p0_r << 1) + (q0_r << 1) + q1_r + const_4_h) >> 3;
+    // p1
+    t1 = (p2_r + p1_r + p0_r + q0_r + const_2_h) >> 2;
+    // p2
+    t2 = ((p3_r << 1) + p2_r + (p2_r << 1) + p1_r + p0_r + q0_r + const_4_h) >> 3;
+    // p0 condition 1
+    t0_con1 = ((p1_r << 1) + p0_r + q1_r + const_2_h) >> 2;
+    // q0
+    s0 = (p1_r + (p0_r << 1) + (q0_r << 1) + (q1_r << 1) + q2_r + const_4_h) >> 3;
+    // q1
+    s1 = (p0_r + q0_r + q1_r + q2_r + const_2_h) >> 2;
+    // q2
+    s2 = ((q3_r << 1) + q2_r + (q2_r << 1) + q1_r + q0_r + p0_r + const_4_h) >> 3;
+    // q0 condition 1
+    s0_con1 = ((q1_r << 1) + q0_r + p1_r + const_2_h) >> 2;
+    // Move back
+    p0_r = t0;
+    p1_r = t1;
+    p2_r = t2;
+    q0_r = s0;
+    q1_r = s1;
+    q2_r = s2;
+    // Use p3_r, q3_r as tmp
+    p3_r = t0_con1;
+    q3_r = s0_con1;
+
+    // Combined left and right
+    MSA_PCKEV_B4(v8i16, p0_l, p0_r, p1_l, p1_r, p2_l, p2_r, q0_l, q0_r,
+                 t0, t1, t2, s0);
+    MSA_PCKEV_B4(v8i16, q1_l, q1_r, q2_l, q2_r, p3_l, p3_r, q3_l, q3_r,
+                 s1, s2, t0_con1, s0_con1);
+    t0 = (v8i16)(((v16u8)t0 & mask0 & mask1 & bDetaP2P0) + ((v16u8)t0_con1 &
+         mask0 & mask1 & (~bDetaP2P0)) + ((v16u8)t0_con1 & mask0 & (~mask1)));
+    t1 = (v8i16)((v16u8)t1 & mask0 & mask1 & bDetaP2P0);
+    t2 = (v8i16)((v16u8)t2 & mask0 & mask1 & bDetaP2P0);
+    s0 = (v8i16)(((v16u8)s0 & mask0 & mask1 & bDetaQ2Q0) + ((v16u8)s0_con1 &
+         mask0 & mask1 & (~bDetaQ2Q0)) + ((v16u8)s0_con1 & mask0 & (~mask1)));
+    s1 = (v8i16)((v16u8)s1 & mask0 & mask1 & bDetaQ2Q0);
+    s2 = (v8i16)((v16u8)s2 & mask0 & mask1 & bDetaQ2Q0);
+    p0 = (v16u8)t0 + (p0 & (~mask0));
+    p1 = (v16u8)t1 + (p1 & ~(mask0 & mask1 & bDetaP2P0));
+    p2 = (v16u8)t2 + (p2 & ~(mask0 & mask1 & bDetaP2P0));
+    q0 = (v16u8)s0 + (q0 & (~mask0));
+    q1 = (v16u8)s1 + (q1 & ~(mask0 & mask1 & bDetaQ2Q0));
+    q2 = (v16u8)s2 + (q2 & ~(mask0 & mask1 & bDetaQ2Q0));
+
+    MSA_ILVRL_B4(v8i16, p1, p2, q0, p0, t0, s0, t1, s1);
+    MSA_ILVRL_B2(v8i16, q2, q1, t2, s2);
+    MSA_ILVRL_H4(v16u8, t1, t0, s1, s0, p2, p1, p0, q0);
+    // Store data to pPix
+    MSA_ST_W8(p2, p1, 0, 1, 2, 3, 0, 1, 2, 3, pPix - 3, iStride);
+    MSA_ST_W8(p0, q0, 0, 1, 2, 3, 0, 1, 2, 3, pPix + 8 * iStride - 3, iStride);
+    MSA_ST_H8(t2, 0, 1, 2, 3, 4, 5, 6, 7, pPix + 1, iStride);
+    MSA_ST_H8(s2, 0, 1, 2, 3, 4, 5, 6, 7, pPix + 8 * iStride + 1, iStride);
+}
+
+void DeblockChromaLt4V_msa(uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta, int8_t* pTc) {
+    v16u8 p0, p1, q0, q1;
+    v8i16 p0_e, p1_e, q0_e, q1_e;
+    v16i8 negTc, flags, f;
+    v8i16 tc_e, negTc_e;
+    // Use for temporary variable
+    v8i16 t0, t1, t2, t3;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v8i16 const_not_255_h = __msa_ldi_h(~255);
+    v16i8 zero = { 0 };
+    v16i8 tc = { pTc[0  >> 1], pTc[1  >> 1], pTc[2  >> 1], pTc[3  >> 1],
+                 pTc[4  >> 1], pTc[5  >> 1], pTc[6  >> 1], pTc[7  >> 1] };
+    negTc = zero - tc;
+
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+    // Signed extend tc, negTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(tc, zero);
+    MSA_ILVR_B(v8i16, flags, tc, tc_e);
+    flags = __msa_clt_s_b(negTc, zero);
+    MSA_ILVR_B(v8i16, flags, negTc, negTc_e);
+
+    // Cb
+    // Load data from pPixCb
+    MSA_LD_V4(v16u8, pPixCb - 2 * iStride, iStride, p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // iDeta
+    t0 = (((q0_e - p0_e) << 2) + (p1_e - q1_e) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negTc_e, t0);
+    t0 = __msa_min_s_h(tc_e, t0);
+    // p0
+    t1 = p0_e + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_e - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t0 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t1 & flags) + (q0 & (~flags)));
+    // Store data to pPixCb
+    MSA_ST_D(p0, 0, pPixCb - iStride);
+    MSA_ST_D(q0, 0, pPixCb);
+
+    // Cr
+    // Load data from pPixCr
+    MSA_LD_V4(v16u8, pPixCr - 2 * iStride, iStride, p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // iDeta
+    t0 = (((q0_e - p0_e) << 2) + (p1_e - q1_e) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negTc_e, t0);
+    t0 = __msa_min_s_h(tc_e, t0);
+    // p0
+    t1 = p0_e + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_e - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t0 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t1 & flags) + (q0 & (~flags)));
+    // Store data to pPixCr
+    MSA_ST_D(p0, 0, pPixCr - iStride);
+    MSA_ST_D(q0, 0, pPixCr);
+}
+
+void DeblockChromaEq4V_msa(uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta) {
+    v16u8 p0, p1, q0, q1;
+    v8i16 p0_e, p1_e, q0_e, q1_e;
+    v16i8 f;
+    // Use for temporary variable
+    v8i16 t0, t1;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+    v8i16 const_2_h = __msa_ldi_h(2);
+    v16i8 zero = { 0 };
+
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    // Cb
+    // Load data from pPixCb
+    MSA_LD_V4(v16u8, pPixCb - 2 * iStride, iStride, p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // p0
+    p0_e = ((p1_e << 1) + p0_e + q1_e + const_2_h) >> 2;
+    // q0
+    q0_e = ((q1_e << 1) + q0_e + p1_e + const_2_h) >> 2;
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    p0 = (v16u8)(((v16i8)t0 & f) + (p0 & (~f)));
+    q0 = (v16u8)(((v16i8)t1 & f) + (q0 & (~f)));
+    // Store data to pPixCb
+    MSA_ST_D(p0, 0, pPixCb - iStride);
+    MSA_ST_D(q0, 0, pPixCb);
+
+    // Cr
+    // Load data from pPixCr
+    MSA_LD_V4(v16u8, pPixCr - 2 * iStride, iStride, p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // p0
+    p0_e = ((p1_e << 1) + p0_e + q1_e + const_2_h) >> 2;
+    // q0
+    q0_e = ((q1_e << 1) + q0_e + p1_e + const_2_h) >> 2;
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    p0 = (v16u8)(((v16i8)t0 & f) + (p0 & (~f)));
+    q0 = (v16u8)(((v16i8)t1 & f) + (q0 & (~f)));
+    // Store data to pPixCr
+    MSA_ST_D(p0, 0, pPixCr - iStride);
+    MSA_ST_D(q0, 0, pPixCr);
+}
+
+void DeblockChromaLt4H_msa(uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta, int8_t* pTc) {
+    v16u8 p0, p1, q0, q1;
+    v8i16 p0_e, p1_e, q0_e, q1_e;
+    v16i8 negTc, flags, f;
+    v8i16 tc_e, negTc_e;
+    // Use for temporary variable
+    v8i16 t0, t1, t2, t3;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+    v8i16 const_4_h = __msa_ldi_h(4);
+    v8i16 const_not_255_h = __msa_ldi_h(~255);
+    v16i8 zero = { 0 };
+    v16i8 tc = { pTc[0  >> 1], pTc[1  >> 1], pTc[2  >> 1], pTc[3  >> 1],
+                 pTc[4  >> 1], pTc[5  >> 1], pTc[6  >> 1], pTc[7  >> 1] };
+    negTc = zero - tc;
+
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+    // Signed extend tc, negTc from 8 bits to 16 bits
+    flags = __msa_clt_s_b(tc, zero);
+    MSA_ILVR_B(v8i16, flags, tc, tc_e);
+    flags = __msa_clt_s_b(negTc, zero);
+    MSA_ILVR_B(v8i16, flags, negTc, negTc_e);
+
+    // Cb
+    // Load data from pPixCb
+    MSA_LD_V8(v8i16, pPixCb - 2, iStride, p1_e, p0_e, q0_e, q1_e,
+              t0, t1, t2, t3);
+    // Transpose 8x4 to 4x8, we just need p0, p1, q0, q1
+    MSA_TRANSPOSE8x4_B(v16u8, p1_e, p0_e, q0_e, q1_e, t0, t1, t2, t3,
+                       p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // iDeta
+    t0 = (((q0_e - p0_e) << 2) + (p1_e - q1_e) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negTc_e, t0);
+    t0 = __msa_min_s_h(tc_e, t0);
+    // p0
+    t1 = p0_e + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_e - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t0 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t1 & flags) + (q0 & (~flags)));
+    // Store data to pPixCb
+    MSA_ILVR_B(v16u8, q0, p0, p0);
+    MSA_ST_H8(p0, 0, 1, 2, 3, 4, 5, 6, 7, pPixCb - 1, iStride);
+
+    // Cr
+    // Load data from pPixCr
+    MSA_LD_V8(v8i16, pPixCr - 2, iStride, p1_e, p0_e, q0_e, q1_e,
+              t0, t1, t2, t3);
+    // Transpose 8x4 to 4x8, we just need p0, p1, q0, q1
+    MSA_TRANSPOSE8x4_B(v16u8, p1_e, p0_e, q0_e, q1_e, t0, t1, t2, t3,
+                       p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // iDeta
+    t0 = (((q0_e - p0_e) << 2) + (p1_e - q1_e) + const_4_h) >> 3;
+    t0 = __msa_max_s_h(negTc_e, t0);
+    t0 = __msa_min_s_h(tc_e, t0);
+    // p0
+    t1 = p0_e + t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    p0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+    // q0
+    t1 = q0_e - t0;
+    t2 = t1 & const_not_255_h;
+    t3 = __msa_cle_s_h((v8i16)zero, t1);
+    flags = (v16i8)__msa_ceq_h(t2, (v8i16)zero);
+    q0_e = (t1 & (v8i16)flags) + (t3 & (v8i16)(~flags));
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    flags = (v16i8)__msa_cle_s_b(zero, tc);
+    flags &= f;
+    p0 = (v16u8)(((v16i8)t0 & flags) + (p0 & (~flags)));
+    q0 = (v16u8)(((v16i8)t1 & flags) + (q0 & (~flags)));
+    // Store data to pPixCr
+    MSA_ILVR_B(v16u8, q0, p0, p0);
+    MSA_ST_H8(p0, 0, 1, 2, 3, 4, 5, 6, 7, pPixCr - 1, iStride);
+}
+
+void DeblockChromaEq4H_msa(uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           int32_t iAlpha, int32_t iBeta) {
+    v16u8 p0, p1, q0, q1;
+    v8i16 p0_e, p1_e, q0_e, q1_e;
+    v16i8 f;
+    // Use for temporary variable
+    v8i16 t0, t1, t2, t3;
+    v16u8 alpha, beta;
+    v16u8 bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+    v8i16 const_2_h = __msa_ldi_h(2);
+    v16i8 zero = { 0 };
+
+    alpha = (v16u8)__msa_fill_b(iAlpha);
+    beta  = (v16u8)__msa_fill_b(iBeta);
+
+    // Cb
+    // Load data from pPixCb
+    MSA_LD_V8(v8i16, pPixCb - 2, iStride, p1_e, p0_e, q0_e, q1_e,
+              t0, t1, t2, t3);
+    // Transpose 8x4 to 4x8, we just need p0, p1, q0, q1
+    MSA_TRANSPOSE8x4_B(v16u8, p1_e, p0_e, q0_e, q1_e, t0, t1, t2, t3,
+                       p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // p0
+    p0_e = ((p1_e << 1) + p0_e + q1_e + const_2_h) >> 2;
+    // q0
+    q0_e = ((q1_e << 1) + q0_e + p1_e + const_2_h) >> 2;
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    p0 = (v16u8)(((v16i8)t0 & f) + (p0 & (~f)));
+    q0 = (v16u8)(((v16i8)t1 & f) + (q0 & (~f)));
+    // Store data to pPixCb
+    MSA_ILVR_B(v16u8, q0, p0, p0);
+    MSA_ST_H8(p0, 0, 1, 2, 3, 4, 5, 6, 7, pPixCb - 1, iStride);
+
+    // Cr
+    // Load data from pPixCr
+    MSA_LD_V8(v8i16, pPixCr - 2, iStride, p1_e, p0_e, q0_e, q1_e,
+              t0, t1, t2, t3);
+    // Transpose 8x4 to 4x8, we just need p0, p1, q0, q1
+    MSA_TRANSPOSE8x4_B(v16u8, p1_e, p0_e, q0_e, q1_e, t0, t1, t2, t3,
+                       p1, p0, q0, q1);
+
+    bDetaP0Q0 = __msa_asub_u_b(p0, q0);
+    bDetaP1P0 = __msa_asub_u_b(p1, p0);
+    bDetaQ1Q0 = __msa_asub_u_b(q1, q0);
+    bDetaP0Q0 = (v16u8)__msa_clt_u_b(bDetaP0Q0, alpha);
+    bDetaP1P0 = (v16u8)__msa_clt_u_b(bDetaP1P0, beta);
+    bDetaQ1Q0 = (v16u8)__msa_clt_u_b(bDetaQ1Q0, beta);
+
+    // Unsigned extend p0, p1, q0, q1 from 8 bits to 16 bits
+    MSA_ILVR_B4(v8i16, zero, p0, zero, p1, zero, q0, zero, q1,
+                p0_e, p1_e, q0_e, q1_e);
+
+    f = (v16i8)bDetaP0Q0 & (v16i8)bDetaP1P0 & (v16i8)bDetaQ1Q0;
+
+    // p0
+    p0_e = ((p1_e << 1) + p0_e + q1_e + const_2_h) >> 2;
+    // q0
+    q0_e = ((q1_e << 1) + q0_e + p1_e + const_2_h) >> 2;
+
+    MSA_PCKEV_B2(v8i16, p0_e, p0_e, q0_e, q0_e, t0, t1);
+    p0 = (v16u8)(((v16i8)t0 & f) + (p0 & (~f)));
+    q0 = (v16u8)(((v16i8)t1 & f) + (q0 & (~f)));
+    // Store data to pPixCr
+    MSA_ILVR_B(v16u8, q0, p0, p0);
+    MSA_ST_H8(p0, 0, 1, 2, 3, 4, 5, 6, 7, pPixCr - 1, iStride);
+}
+
+void WelsNonZeroCount_msa(int8_t* pNonZeroCount) {
+    v16u8 src0, src1;
+    v16u8 zero = { 0 };
+    v16u8 const_1 = (v16u8)__msa_fill_b(0x01);
+
+    MSA_LD_V2(v16u8, pNonZeroCount, 16, src0, src1);
+    src0 = (v16u8)__msa_ceq_b((v16i8)zero, (v16i8)src0);
+    src1 = (v16u8)__msa_ceq_b((v16i8)zero, (v16i8)src1);
+    src0 += const_1;
+    src1 += const_1;
+    MSA_ST_V(v16u8, src0, pNonZeroCount);
+    MSA_ST_D(src1, 0, pNonZeroCount + 16);
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/expand_picture_mmi.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/expand_picture_mmi.c
new file mode 100644
index 0000000000..f3ef181cb8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/expand_picture_mmi.c
@@ -0,0 +1,673 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    expand_picture_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    24/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+#define mov_line_8x4_mmi_aligned(r0, r1, f0) \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t"
+
+#define mov_line_8x4_mmi_unaligned(r0, r1, f0) \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t"
+
+#define mov_line_end8x4_mmi_aligned(r0, r1, f0) \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdxc1    "#f0", 0x0("#r0", $0)           \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t"
+
+#define mov_line_end8x4_mmi_unaligned(r0, r1, f0) \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+
+#define mov_line_16x4_mmi_aligned(r0, r1, f0, f2) \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t"
+
+#define mov_line_16x4_mmi_unaligned(r0, r1, f0, f2) \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t"
+
+#define mov_line_end16x4_mmi_aligned(r0, r1, f0, f2) \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t"
+
+#define mov_line_end16x4_mmi_unaligned(r0, r1, f0, f2) \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdlc1    "#f2", 0xF("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gssdrc1    "#f2", 0x8("#r0")               \n\t" \
+
+#define exp_top_bottom_mmi_32 \
+  "dsra       %[iWidth], %[iWidth], 0x4              \n\t" \
+  "1:                                                \n\t" \
+  "gslqc1     $f2, $f0, 0x0(%[pDst])                 \n\t" \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)      \
+  mov_line_end16x4_mmi_aligned($9, %[iStride], $f0, $f2)   \
+  "gslqc1     $f6, $f4, 0x0(%[iHeight])              \n\t" \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)     \
+  mov_line_end16x4_mmi_aligned($11, %[iStride], $f4, $f6)  \
+  PTR_ADDIU  "%[pDst], %[pDst], 0x10                 \n\t" \
+  PTR_ADDIU  "$9, $9, 0x10                           \n\t" \
+  PTR_ADDIU  "%[iHeight], %[iHeight], 0x10           \n\t" \
+  PTR_ADDIU  "$11, $11, 0x10                         \n\t" \
+  "dnegu      %[iStride], %[iStride]                 \n\t" \
+  PTR_ADDIU  "%[iWidth], %[iWidth], -0x1             \n\t" \
+  "bnez       %[iWidth], 1b                          \n\t" \
+  "nop                                               \n\t"
+
+#define exp_left_right_mmi_32 \
+  "2:                                             \n\t" \
+  "lbu        %[iWidth], 0x0(%[pDst])             \n\t" \
+  MMI_Copy16Times($f0, $f2, $f28, %[iWidth])            \
+  "gssqc1     $f2, $f0, 0x0($9)                   \n\t" \
+  "gssqc1     $f2, $f0, 0x10($9)                  \n\t" \
+  "lbu        %[iWidth], 0x0(%[iHeight])          \n\t" \
+  MMI_Copy16Times($f4, $f6, $f28, %[iWidth])            \
+  "gssqc1     $f6, $f4, 0x0($11)                  \n\t" \
+  "gssqc1     $f6, $f4, 0x10($11)                 \n\t" \
+  PTR_ADDU   "%[pDst], %[pDst], %[iStride]        \n\t" \
+  PTR_ADDU   "$9, $9, %[iStride]                  \n\t" \
+  PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t" \
+  PTR_ADDU   "$11, $11, %[iStride]                \n\t" \
+  PTR_ADDIU  "$8, $8, -0x1                        \n\t" \
+  "bnez       $8, 2b                              \n\t" \
+  "nop                                            \n\t"
+
+#define mov_line_32x4_mmi(r0, r1, f0, f2) \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t"
+
+#define mov_line_end32x4_mmi(r0, r1, f0, f2) \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r1"              \n\t" \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")         \n\t" \
+  "gssqc1     "#f2", "#f0", 0x10("#r0")        \n\t"
+
+#define  exp_cross_mmi_32 \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_32x4_mmi(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_end32x4_mmi(%[iHeight], %[iStride], $f12, $f14)     \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_32x4_mmi($11, %[iStride], $f16, $f18)               \
+  mov_line_end32x4_mmi($11, %[iStride], $f16, $f18)            \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_32x4_mmi($9, %[iStride], $f20, $f22)                \
+  mov_line_end32x4_mmi($9, %[iStride], $f20, $f22)             \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_32x4_mmi($8, %[iStride], $f24, $f26)                \
+  mov_line_end32x4_mmi($8, %[iStride], $f24, $f26)
+
+#define exp_top_bottom_mmi_16_aligned \
+  "move       $8, %[iWidth]                              \n\t" \
+  "dsra       %[iWidth], %[iWidth], 0x4                  \n\t" \
+  "1:                                                    \n\t" \
+  "gslqc1     $f2, $f0, 0x0(%[pDst])                     \n\t" \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)          \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)          \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f0, $f2)          \
+  mov_line_end16x4_mmi_aligned($9, %[iStride], $f0, $f2)       \
+  "gslqc1     $f6, $f4, 0x0(%[iHeight])                  \n\t" \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)         \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)         \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f4, $f6)         \
+  mov_line_end16x4_mmi_aligned($11, %[iStride], $f4, $f6)      \
+  PTR_ADDIU  "%[pDst], %[pDst], 0x10                     \n\t" \
+  PTR_ADDIU  "$9, $9, 0x10                               \n\t" \
+  PTR_ADDIU  "%[iHeight], %[iHeight], 0x10               \n\t" \
+  PTR_ADDIU  "$11, $11, 0x10                             \n\t" \
+  "dnegu      %[iStride], %[iStride]                     \n\t" \
+  PTR_ADDIU  "%[iWidth], %[iWidth], -0x1                 \n\t" \
+  "bnez       %[iWidth], 1b                              \n\t" \
+  "nop                                                   \n\t" \
+  "and        $8, 0x0F                                   \n\t" \
+  "beqz       $8, 2f                                     \n\t" \
+  "nop                                                   \n\t" \
+  "gsldxc1    $f0, 0x0(%[pDst], $0)                      \n\t" \
+  mov_line_8x4_mmi_aligned($9, %[iStride], $f0)                \
+  mov_line_8x4_mmi_aligned($9, %[iStride], $f0)                \
+  mov_line_8x4_mmi_aligned($9, %[iStride], $f0)                \
+  mov_line_end8x4_mmi_aligned($9, %[iStride], $f0)             \
+  "gsldxc1    $f4, 0x0(%[iHeight], $0)                   \n\t" \
+  mov_line_8x4_mmi_aligned($11, %[iStride], $f4)               \
+  mov_line_8x4_mmi_aligned($11, %[iStride], $f4)               \
+  mov_line_8x4_mmi_aligned($11, %[iStride], $f4)               \
+  mov_line_end8x4_mmi_aligned($11, %[iStride], $f4)            \
+  "2:                                                    \n\t"
+
+#define exp_top_bottom_mmi_16_unaligned \
+  "move       $8, %[iWidth]                              \n\t" \
+  "dsra       %[iWidth], %[iWidth], 0x4                  \n\t" \
+  "1:                                                    \n\t" \
+  "gsldlc1    $f0, 0x7(%[pDst])                          \n\t" \
+  "gsldlc1    $f2, 0xF(%[pDst])                          \n\t" \
+  "gsldrc1    $f0, 0x0(%[pDst])                          \n\t" \
+  "gsldrc1    $f2, 0x8(%[pDst])                          \n\t" \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f0, $f2)        \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f0, $f2)        \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f0, $f2)        \
+  mov_line_end16x4_mmi_unaligned($9, %[iStride], $f0, $f2)     \
+  "gsldlc1    $f4, 0x7(%[iHeight])                       \n\t" \
+  "gsldlc1    $f6, 0xF(%[iHeight])                       \n\t" \
+  "gsldrc1    $f4, 0x0(%[iHeight])                       \n\t" \
+  "gsldrc1    $f6, 0x8(%[iHeight])                       \n\t" \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f4, $f6)       \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f4, $f6)       \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f4, $f6)       \
+  mov_line_end16x4_mmi_unaligned($11, %[iStride], $f4, $f6)    \
+  PTR_ADDIU  "%[pDst], %[pDst], 0x10                     \n\t" \
+  PTR_ADDIU  "$9, $9, 0x10                               \n\t" \
+  PTR_ADDIU  "%[iHeight], %[iHeight], 0x10               \n\t" \
+  PTR_ADDIU  "$11, $11, 0x10                             \n\t" \
+  "dnegu      %[iStride], %[iStride]                     \n\t" \
+  PTR_ADDIU  "%[iWidth], %[iWidth], -0x1                 \n\t" \
+  "bnez       %[iWidth], 1b                              \n\t" \
+  "nop                                                   \n\t" \
+  "and        $8, 0x0F                                   \n\t" \
+  "beqz       $8, 2f                                     \n\t" \
+  "nop                                                   \n\t" \
+  "gsldlc1    $f0, 0x7(%[pDst])                          \n\t" \
+  "gsldrc1    $f0, 0x0(%[pDst])                          \n\t" \
+  mov_line_8x4_mmi_unaligned($9, %[iStride], $f0)              \
+  mov_line_8x4_mmi_unaligned($9, %[iStride], $f0)              \
+  mov_line_8x4_mmi_unaligned($9, %[iStride], $f0)              \
+  mov_line_end8x4_mmi_unaligned($9, %[iStride], $f0)           \
+  "gsldlc1    $f4, 0x7(%[iHeight])                       \n\t" \
+  "gsldrc1    $f4, 0x0(%[iHeight])                       \n\t" \
+  mov_line_8x4_mmi_unaligned($11, %[iStride], $f4)             \
+  mov_line_8x4_mmi_unaligned($11, %[iStride], $f4)             \
+  mov_line_8x4_mmi_unaligned($11, %[iStride], $f4)             \
+  mov_line_end8x4_mmi_unaligned($11, %[iStride], $f4)          \
+  "2:                                                    \n\t"
+
+#define exp_left_right_mmi_16_aligned \
+  "3:                                             \n\t" \
+  "lbu        %[iWidth], 0x0(%[pDst])             \n\t" \
+  MMI_Copy16Times($f0, $f2, $f28, %[iWidth])            \
+  "gssqc1     $f2, $f0, 0x0($9)                   \n\t" \
+  "lbu        %[iWidth], 0x0(%[iHeight])          \n\t" \
+  MMI_Copy16Times($f4, $f6, $f28, %[iWidth])            \
+  "gssqc1     $f6, $f4, 0x0($11)                  \n\t" \
+  PTR_ADDU   "%[pDst], %[pDst], %[iStride]        \n\t" \
+  PTR_ADDU   "$9, $9, %[iStride]                  \n\t" \
+  PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t" \
+  PTR_ADDU   "$11, $11, %[iStride]                \n\t" \
+  PTR_ADDIU  "$8, $8, -0x1                        \n\t" \
+  "bnez       $8, 3b                              \n\t" \
+  "nop                                            \n\t"
+
+#define exp_left_right_mmi_16_unaligned \
+  "3:                                             \n\t" \
+  "lbu        %[iWidth], 0x0(%[pDst])             \n\t" \
+  MMI_Copy16Times($f0, $f2, $f28, %[iWidth])            \
+  "gssdlc1    $f0, 0x7($9)                        \n\t" \
+  "gssdlc1    $f2, 0xF($9)                        \n\t" \
+  "gssdrc1    $f0, 0x0($9)                        \n\t" \
+  "gssdrc1    $f2, 0x8($9)                        \n\t" \
+  "lbu        %[iWidth], 0x0(%[iHeight])          \n\t" \
+  MMI_Copy16Times($f4, $f6, $f28, %[iWidth])            \
+  "gssdlc1    $f4, 0x7($11)                       \n\t" \
+  "gssdlc1    $f6, 0xF($11)                       \n\t" \
+  "gssdrc1    $f4, 0x0($11)                       \n\t" \
+  "gssdrc1    $f6, 0x8($11)                       \n\t" \
+  PTR_ADDU   "%[pDst], %[pDst], %[iStride]        \n\t" \
+  PTR_ADDU   "$9, $9, %[iStride]                  \n\t" \
+  PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t" \
+  PTR_ADDU   "$11, $11, %[iStride]                \n\t" \
+  PTR_ADDIU  "$8, $8, -0x1                        \n\t" \
+  "bnez       $8, 3b                              \n\t" \
+  "nop                                            \n\t"
+
+#define exp_cross_mmi_16_aligned \
+  mov_line_16x4_mmi_aligned(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_16x4_mmi_aligned(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_16x4_mmi_aligned(%[iHeight], %[iStride], $f12, $f14)        \
+  mov_line_end16x4_mmi_aligned(%[iHeight], %[iStride], $f12, $f14)     \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f16, $f18)               \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f16, $f18)               \
+  mov_line_16x4_mmi_aligned($11, %[iStride], $f16, $f18)               \
+  mov_line_end16x4_mmi_aligned($11, %[iStride], $f16, $f18)            \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f20, $f22)                \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f20, $f22)                \
+  mov_line_16x4_mmi_aligned($9, %[iStride], $f20, $f22)                \
+  mov_line_end16x4_mmi_aligned($9, %[iStride], $f20, $f22)             \
+  mov_line_16x4_mmi_aligned($8, %[iStride], $f24, $f26)                \
+  mov_line_16x4_mmi_aligned($8, %[iStride], $f24, $f26)                \
+  mov_line_16x4_mmi_aligned($8, %[iStride], $f24, $f26)                \
+  mov_line_end16x4_mmi_aligned($8, %[iStride], $f24, $f26)
+
+#define exp_cross_mmi_16_unaligned \
+  mov_line_16x4_mmi_unaligned(%[iHeight], %[iStride], $f12, $f14)      \
+  mov_line_16x4_mmi_unaligned(%[iHeight], %[iStride], $f12, $f14)      \
+  mov_line_16x4_mmi_unaligned(%[iHeight], %[iStride], $f12, $f14)      \
+  mov_line_end16x4_mmi_unaligned(%[iHeight], %[iStride], $f12, $f14)   \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f16, $f18)             \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f16, $f18)             \
+  mov_line_16x4_mmi_unaligned($11, %[iStride], $f16, $f18)             \
+  mov_line_end16x4_mmi_unaligned($11, %[iStride], $f16, $f18)          \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f20, $f22)              \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f20, $f22)              \
+  mov_line_16x4_mmi_unaligned($9, %[iStride], $f20, $f22)              \
+  mov_line_end16x4_mmi_unaligned($9, %[iStride], $f20, $f22)           \
+  mov_line_16x4_mmi_unaligned($8, %[iStride], $f24, $f26)              \
+  mov_line_16x4_mmi_unaligned($8, %[iStride], $f24, $f26)              \
+  mov_line_16x4_mmi_unaligned($8, %[iStride], $f24, $f26)              \
+  mov_line_end16x4_mmi_unaligned($8, %[iStride], $f24, $f26)
+
+void ExpandPictureLuma_mmi(uint8_t *pDst, int32_t iStride, int32_t iWidth,
+                           int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                     \n\t"
+    "xor        $f28, $f28, $f28                    \n\t"
+    "lbu        $8, 0x0(%[pDst])                    \n\t"
+
+    MMI_Copy16Times($f12, $f14, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDU   "$9, %[pDst], %[iStride]             \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $10, %[iHeight]                     \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], -0x1        \n\t"
+    "dmul       %[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[pDst]     \n\t"
+
+    "move       $8, %[iStride]                      \n\t"
+    "dsll       $8, 0x5                             \n\t"
+    PTR_ADDU   "$11, %[iHeight], $8                 \n\t"
+
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+    MMI_Copy16Times($f20, $f22, $f28, $8)
+    PTR_ADDU   "$8, %[iHeight], %[iWidth]           \n\t"
+    PTR_ADDIU  "$8, -0x1                            \n\t"
+    "lbu        $8, 0x0($8)                         \n\t"
+    "dmtc1      $8, $f24                            \n\t"
+    "pshufh     $f24, $f24, $f28                    \n\t"
+    "packushb   $f24, $f24, $f24                    \n\t"
+    "mov.d      $f26, $f24                          \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $12, %[pDst]                        \n\t"
+    "move       $13, %[iStride]                     \n\t"
+    "move       $14, %[iWidth]                      \n\t"
+    exp_top_bottom_mmi_32
+    "move       %[iWidth], $14                      \n\t"
+    "move       %[iStride], $13                     \n\t"
+    "move       %[pDst], $12                        \n\t"
+    PTR_ADDIU  "$9, %[pDst], -0x20                  \n\t"
+    PTR_ADDU   "%[iHeight], %[pDst], %[iWidth]      \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1        \n\t"
+    PTR_ADDIU  "$11, %[iHeight], 0x1                \n\t"
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+    MMI_Copy16Times($f16, $f18, $f28, $8)
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $8, $10                             \n\t"
+    "move       $10, %[pDst]                        \n\t"
+    "move       $12, %[iStride]                     \n\t"
+    "move       $13, %[iWidth]                      \n\t"
+    "move       $14, $8                             \n\t"
+
+    exp_left_right_mmi_32
+
+    "move       $8, $14                             \n\t"
+    "move       %[iWidth], $13                      \n\t"
+    "move       %[iStride], $12                     \n\t"
+    "move       %[pDst], $10                        \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "%[iHeight], %[pDst], -0x20          \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "$11, %[pDst], %[iWidth]             \n\t"
+    PTR_ADDU   "$11, $11, %[iStride]                \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "$8, $8, 0x20                        \n\t"
+    "dmul       $8, $8, %[iStride]                  \n\t"
+    PTR_ADDU   "$9, %[iHeight], $8                  \n\t"
+    PTR_ADDU   "$8, $11, $8                         \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    exp_cross_mmi_32
+    : [pDst]"+&r"((unsigned char *)pDst), [iStride]"+&r"((int)iStride),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    :
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28"
+  );
+  RECOVER_REG;
+}
+
+void ExpandPictureChromaUnalign_mmi(uint8_t *pDst, int32_t iStride, int32_t iWidth,
+                                    int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                     \n\t"
+    "xor        $f28, $f28, $f28                    \n\t"
+    "lbu        $8, 0x0(%[pDst])                    \n\t"
+
+    MMI_Copy16Times($f12, $f14, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDU   "$9, %[pDst], %[iStride]             \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $10, %[iHeight]                     \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], -0x1        \n\t"
+    "dmul       %[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[pDst]     \n\t"
+    "move       $8, %[iStride]                      \n\t"
+    "dsll       $8, 0x4                             \n\t"
+    PTR_ADDU   "$11, %[iHeight], $8                 \n\t"
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+
+    MMI_Copy16Times($f20, $f22, $f28, $8)
+
+    PTR_ADDU   "$8, %[iHeight], %[iWidth]           \n\t"
+    PTR_ADDIU  "$8, -0x1                            \n\t"
+    "lbu        $8, 0x0($8)                         \n\t"
+
+    MMI_Copy16Times($f24, $f26, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $12, %[pDst]                        \n\t"
+    "move       $13, %[iStride]                     \n\t"
+    "move       $14, %[iWidth]                      \n\t"
+
+    exp_top_bottom_mmi_16_unaligned
+
+    "move       %[iWidth], $14                      \n\t"
+    "move       %[iStride], $13                     \n\t"
+    "move       %[pDst], $12                        \n\t"
+    PTR_ADDIU  "$9, %[pDst], -0x10                  \n\t"
+    PTR_ADDU   "%[iHeight], %[pDst], %[iWidth]      \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1        \n\t"
+    PTR_ADDIU  "$11, %[iHeight], 0x1                \n\t"
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+    MMI_Copy16Times($f16, $f18, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $8, $10                             \n\t"
+
+    "move       $10, %[pDst]                        \n\t"
+    "move       $12, %[iStride]                     \n\t"
+    "move       $13, %[iWidth]                      \n\t"
+    "move       $14, $8                             \n\t"
+
+    exp_left_right_mmi_16_unaligned
+
+    "move       $8, $14                             \n\t"
+    "move       %[iWidth], $13                      \n\t"
+    "move       %[iStride], $12                     \n\t"
+    "move       %[pDst], $10                        \n\t"
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "%[iHeight], %[pDst], -0x10          \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "$11, %[pDst], %[iWidth]             \n\t"
+    PTR_ADDU   "$11, $11, %[iStride]                \n\t"
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                        \n\t"
+    "dmul       $8, $8, %[iStride]                  \n\t"
+
+    PTR_ADDU   "$9, %[iHeight], $8                  \n\t"
+    PTR_ADDU   "$8, $11, $8                         \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+
+    exp_cross_mmi_16_unaligned
+    : [pDst]"+&r"((unsigned char *)pDst), [iStride]"+&r"((int)iStride),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    :
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28"
+  );
+  RECOVER_REG;
+}
+
+void ExpandPictureChromaAlign_mmi(uint8_t *pDst, int32_t iStride, int32_t iWidth,
+                                  int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                     \n\t"
+    "xor        $f28, $f28, $f28                    \n\t"
+    "lbu        $8, 0x0(%[pDst])                    \n\t"
+
+    MMI_Copy16Times($f12, $f14, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDU   "$9, %[pDst], %[iStride]             \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $10, %[iHeight]                     \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], -0x1        \n\t"
+    "dmul       %[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[pDst]     \n\t"
+    "move       $8, %[iStride]                      \n\t"
+    "dsll       $8, 0x4                             \n\t"
+    PTR_ADDU   "$11, %[iHeight], $8                 \n\t"
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+
+    MMI_Copy16Times($f20, $f22, $f28, $8)
+
+    PTR_ADDU   "$8, %[iHeight], %[iWidth]           \n\t"
+    PTR_ADDIU  "$8, -0x1                            \n\t"
+    "lbu        $8, 0x0($8)                         \n\t"
+
+    MMI_Copy16Times($f24, $f26, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+
+    "move       $12, %[pDst]                        \n\t"
+    "move       $13, %[iStride]                     \n\t"
+    "move       $14, %[iWidth]                      \n\t"
+    exp_top_bottom_mmi_16_aligned
+
+    "move       %[iWidth], $14                      \n\t"
+    "move       %[iStride], $13                     \n\t"
+    "move       %[pDst], $12                        \n\t"
+
+    PTR_ADDIU  "$9, %[pDst], -0x10                  \n\t"
+
+    PTR_ADDU   "%[iHeight], %[pDst], %[iWidth]      \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1        \n\t"
+    PTR_ADDIU  "$11, %[iHeight], 0x1                \n\t"
+
+    "lbu        $8, 0x0(%[iHeight])                 \n\t"
+
+    MMI_Copy16Times($f16, $f18, $f28, $8)
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    "move       $8, $10                             \n\t"
+
+    "move       $10, %[pDst]                        \n\t"
+    "move       $12, %[iStride]                     \n\t"
+    "move       $13, %[iWidth]                      \n\t"
+    "move       $14, $8                             \n\t"
+
+    exp_left_right_mmi_16_aligned
+
+    "move       $8, $14                             \n\t"
+    "move       %[iWidth], $13                      \n\t"
+    "move       %[iStride], $12                     \n\t"
+    "move       %[pDst], $10                        \n\t"
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "%[iHeight], %[pDst], -0x10          \n\t"
+    PTR_ADDU   "%[iHeight], %[iHeight], %[iStride]  \n\t"
+    PTR_ADDU   "$11, %[pDst], %[iWidth]             \n\t"
+    PTR_ADDU   "$11, $11, %[iStride]                \n\t"
+
+    "dnegu      %[iStride], %[iStride]              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                        \n\t"
+    "dmul       $8, $8, %[iStride]                  \n\t"
+
+    PTR_ADDU   "$9, %[iHeight], $8                  \n\t"
+    PTR_ADDU   "$8, $11, $8                         \n\t"
+    "dnegu      %[iStride], %[iStride]              \n\t"
+
+    exp_cross_mmi_16_aligned
+    : [pDst]"+&r"((unsigned char *)pDst), [iStride]"+&r"((int)iStride),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    :
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/intra_pred_com_mmi.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/intra_pred_com_mmi.c
new file mode 100644
index 0000000000..844e9cef3a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/intra_pred_com_mmi.c
@@ -0,0 +1,548 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    intra_pred_com_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    23/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+#define MMI_PRED_H_16X16_ONE_LINE \
+  PTR_ADDIU  "%[pPred], %[pPred], 0x10                  \n\t" \
+  PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t" \
+  "lbu        $8, 0x0(%[pRef])                          \n\t" \
+  MMI_Copy16Times($f0, $f2, $f4, $8)                          \
+  "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+#define LOAD_2_LEFT_AND_ADD \
+  PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t" \
+  "lbu        $9, -0x1(%[pRef])                         \n\t" \
+  PTR_ADDU   "$8, $8, $9                                \n\t" \
+  PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t" \
+  "lbu        $9, -0x1(%[pRef])                         \n\t" \
+  PTR_ADDU   "$8, $8, $9                                \n\t"
+
+//f2 should be mmi_01bytes, f4 should be 0x38, f6 should be 0x0
+#define MMI_PRED_H_8X8_ONE_LINE(f0, f2, f4, f6, r0, r1, r1_offset) \
+  PTR_ADDU   ""#r0", "#r0", %[kiStride]                 \n\t" \
+  "gsldxc1    "#f0", -0x8("#r0", $0)                    \n\t" \
+  "dsrl       "#f0", "#f0", "#f4"                       \n\t" \
+  "pmullh     "#f0", "#f0", "#f2"                       \n\t" \
+  "pshufh     "#f0", "#f0", "#f6"                       \n\t" \
+  "gssdxc1    "#f0", "#r1_offset"+0x0("#r1", $0)        \n\t"
+
+void WelsI16x16LumaPredV_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  __asm__ volatile (
+    ".set     arch=loongson3a                             \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pRef])                    \n\t"
+
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x20(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x30(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x40(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x50(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x60(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x70(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x80(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x90(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xa0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xb0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xc0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xd0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xe0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xf0(%[pPred])                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride)
+    : "memory", "$f0", "$f2"
+  );
+}
+
+void WelsI16x16LumaPredH_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  __asm__ volatile (
+    ".set     arch=loongson3a                             \n\t"
+    PTR_ADDIU  "%[pRef], %[pRef], -0x1                    \n\t"
+    "lbu        $8, 0x0(%[pRef])                          \n\t"
+    "xor        $f4, $f4, $f4                             \n\t"
+    MMI_Copy16Times($f0, $f2, $f4, $8)
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    MMI_PRED_H_16X16_ONE_LINE
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride)
+    : "memory", "$8", "$f0", "$f2", "$f4"
+  );
+}
+
+void WelsI16x16LumaPredDc_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  unsigned char mmi_01bytes[16]__attribute__((aligned(16))) =
+                {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+  __asm__ volatile (
+    ".set     arch=loongson3a                             \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pRef])                    \n\t"
+    "xor        $f4, $f4, $f4                             \n\t"
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f4                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f0, $f0, $f2                             \n\t"
+
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $8, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+
+    "dli        $10, 0x5                                  \n\t"
+    "dmtc1      $10, $f6                                  \n\t"
+    PTR_ADDIU  "$8, 0x10                                  \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "psrlw      $f0, $f0, $f6                             \n\t"
+    "gsldxc1    $f6, 0x0(%[mmi_01bytes], $0)              \n\t"
+    "pmuluw     $f0, $f0, $f6                             \n\t"
+    "punpcklwd  $f0, $f0, $f0                             \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x20(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x30(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x40(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x50(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x60(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x70(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x80(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x90(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xa0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xb0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xc0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xd0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xe0(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0xf0(%[pPred])                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride), [mmi_01bytes]"r"((unsigned char *)mmi_01bytes)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6"
+  );
+}
+
+void WelsI16x16LumaPredPlane_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  short mmi_plane_inc_minus[8]__attribute__((aligned(16))) = {-7, -6, -5, -4,
+                                                              -3, -2, -1, 0};
+  short mmi_plane_inc[8]__attribute__((aligned(16))) = {1, 2, 3, 4, 5, 6, 7, 8};
+  short mmi_plane_dec[8]__attribute__((aligned(16))) = {8, 7, 6, 5, 4, 3, 2, 1};
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_ADDIU  "%[pRef], %[pRef], -0x1                    \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pRef])                         \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "gsldrc1    $f0, 0x0(%[pRef])                         \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_dec])         \n\t"
+    "punpckhbh  $f2, $f0, $f28                            \n\t"
+    "punpcklbh  $f0, $f0, $f28                            \n\t"
+    "gsldlc1    $f4, 0x10(%[pRef])                        \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "pmullh     $f2, $f2, $f22                            \n\t"
+    "gsldrc1    $f4, 0x9(%[pRef])                         \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[mmi_plane_inc])         \n\t"
+    "punpckhbh  $f6, $f4, $f28                            \n\t"
+    "punpcklbh  $f4, $f4, $f28                            \n\t"
+    "pmullh     $f4, $f4, $f24                            \n\t"
+    "pmullh     $f6, $f6, $f26                            \n\t"
+    "psubh      $f4, $f4, $f0                             \n\t"
+    "psubh      $f6, $f6, $f2                             \n\t"
+
+    "xor        $f8, $f8, $f8                             \n\t"
+    SUMH_HORIZON($f4, $f6, $f0, $f2, $f8)
+    "dmfc1      $8, $f4                                   \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x5                               \n\t"
+    PTR_ADDIU  "$8, $8, 0x20                              \n\t"
+    "sra        $8, $8, 0x6                               \n\t"
+    MMI_Copy8Times($f4, $f6, $f28, $8)
+
+    "lbu        $9, 0x10(%[pRef])                         \n\t"
+    PTR_ADDIU  "%[pRef], %[pRef], -0x3                    \n\t"
+    LOAD_COLUMN($f0, $f2, $f8, $f10, $f12, $f14, $f16,
+                $f18, %[pRef], %[kiStride], $11)
+
+    PTR_ADDIU  "%[pRef], %[pRef], 0x3                     \n\t"
+    "dsll       $10, %[kiStride], 0x3                     \n\t"
+    PTR_ADDU   "$10, $10, %[pRef]                         \n\t"
+    "lbu        $8, 0x0($10)                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    "dsll       $9, $9, 0x4                               \n\t"
+
+    PTR_ADDIU  "%[pRef], %[pRef], -0x3                    \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    LOAD_COLUMN($f28, $f30, $f8, $f10, $f12, $f14, $f16,
+                $f18, %[pRef], %[kiStride], $11)
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "punpcklbh  $f0, $f2, $f18                            \n\t"
+    "punpckhbh  $f2, $f2, $f18                            \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "pmullh     $f2, $f2, $f22                            \n\t"
+    "punpcklbh  $f28, $f30, $f18                          \n\t"
+    "punpckhbh  $f30, $f30, $f18                          \n\t"
+    "pmullh     $f28, $f28, $f24                          \n\t"
+    "pmullh     $f30, $f30, $f26                          \n\t"
+    "psubh      $f28, $f28, $f0                           \n\t"
+    "psubh      $f30, $f30, $f2                           \n\t"
+
+    SUMH_HORIZON($f28, $f30, $f0, $f2, $f8)
+    "dmfc1      $8, $f28                                  \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x5                               \n\t"
+    PTR_ADDIU  "$8, $8, 0x20                              \n\t"
+    "sra        $8, $8, 0x6                               \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    MMI_Copy8Times($f16, $f18, $f20, $8)
+
+    PTR_ADDIU  "$9, $9, 0x10                              \n\t"
+    "mul        $8, $8, -0x7                              \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    MMI_Copy8Times($f0, $f2, $f20, $8)
+
+    "xor        $8, $8, $8                                \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_inc_minus])   \n\t"
+
+    "dli        $10, 0x5                                  \n\t"
+    "dmtc1      $10, $f30                                 \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    "1:                                                   \n\t"
+    "pmullh     $f8, $f4, $f20                            \n\t"
+    "pmullh     $f10, $f6, $f22                           \n\t"
+    "paddh      $f8, $f8, $f0                             \n\t"
+    "paddh      $f10, $f10, $f2                           \n\t"
+    "psrah      $f8, $f8, $f30                            \n\t"
+    "psrah      $f10, $f10, $f30                          \n\t"
+    "pmullh     $f12, $f4, $f24                           \n\t"
+    "pmullh     $f14, $f6, $f26                           \n\t"
+    "paddh      $f12, $f12, $f0                           \n\t"
+    "paddh      $f14, $f14, $f2                           \n\t"
+    "psrah      $f12, $f12, $f30                          \n\t"
+    "psrah      $f14, $f14, $f30                          \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f12, $f14                          \n\t"
+    "gssqc1     $f10, $f8, 0x0(%[pPred])                  \n\t"
+    "paddh      $f0, $f0, $f16                            \n\t"
+    "paddh      $f2, $f2, $f18                            \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], 0x10                  \n\t"
+    PTR_ADDIU  "$8, $8, 0x1                               \n\t"
+    PTR_ADDIU  "$10, $8, -0x10                            \n\t"
+    "bnez       $10, 1b                                   \n\t"
+    "nop                                                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride), [mmi_plane_inc_minus]"r"(mmi_plane_inc_minus),
+      [mmi_plane_inc]"r"(mmi_plane_inc), [mmi_plane_dec]"r"(mmi_plane_dec)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsIChromaPredPlane_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  short mmi_plane_inc_c[4]__attribute__((aligned(16))) = {1, 2, 3, 4};
+  short mmi_plane_dec_c[4]__attribute__((aligned(16))) = {4, 3, 2, 1};
+  short mmi_plane_mul_b_c[8]__attribute__((aligned(16))) = {-3, -2, -1, 0,
+                                                            1, 2, 3, 4};
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_ADDIU  "%[pRef], %[pRef], -0x1                    \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pRef])                         \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "gsldrc1    $f0, 0x0(%[pRef])                         \n\t"
+    "gsldxc1    $f20, 0x0(%[mmi_plane_dec_c], $0)         \n\t"
+    "punpcklbh  $f0, $f0, $f28                            \n\t"
+    "gsldlc1    $f4, 0xc(%[pRef])                         \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "gsldrc1    $f4, 0x5(%[pRef])                         \n\t"
+    "gsldxc1    $f24, 0x0(%[mmi_plane_inc_c], $0)         \n\t"
+    "punpcklbh  $f4, $f4, $f28                            \n\t"
+    "pmullh     $f4, $f4, $f24                            \n\t"
+    "psubh      $f4, $f4, $f0                             \n\t"
+
+    "xor        $f6, $f6, $f6                             \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    SUMH_HORIZON($f4, $f6, $f0, $f2, $f8)
+    "dmfc1      $8, $f4                                   \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x11                              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                              \n\t"
+    "sra        $8, $8, 0x5                               \n\t"
+    MMI_Copy8Times($f4, $f6, $f28, $8)
+
+    "lbu        $8, 0x8(%[pRef])                          \n\t"
+    PTR_ADDIU  "%[pRef], %[pRef], -0x3                    \n\t"
+    LOAD_COLUMN_C($f0, $f8, $f12, $f16, %[pRef], %[kiStride], $10)
+
+    PTR_ADDIU  "%[pRef], %[pRef], 0x3                     \n\t"
+    "dsll       $10, %[kiStride], 0x2                     \n\t"
+    PTR_ADDU   "$10, $10, %[pRef]                         \n\t"
+    "lbu        $9, 0x0($10)                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    "dsll       $9, $9, 0x4                               \n\t"
+
+    PTR_ADDIU  "%[pRef], %[pRef], -0x3                    \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    LOAD_COLUMN_C($f28, $f8, $f12, $f16, %[pRef], %[kiStride], $10)
+    "xor        $f16, $f16, $f16                          \n\t"
+    "punpckhbh  $f0, $f0, $f16                            \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "punpckhbh  $f28, $f28, $f16                          \n\t"
+    "pmullh     $f28, $f28, $f24                          \n\t"
+    "psubh      $f28, $f28, $f0                           \n\t"
+
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    SUMH_HORIZON($f28, $f30, $f0, $f2, $f8)
+    "dmfc1      $8, $f28                                  \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x11                              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                              \n\t"
+    "sra        $8, $8, 0x5                               \n\t"
+    MMI_Copy8Times($f16, $f18, $f8, $8)
+
+    PTR_ADDIU  "$9, $9, 0x10                              \n\t"
+    "mul        $8, $8, -0x3                              \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    MMI_Copy8Times($f0, $f2, $f8, $8)
+
+    "xor        $8, $8, $8                                \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_mul_b_c])     \n\t"
+
+    "dli        $10, 0x5                                  \n\t"
+    "dmtc1      $10, $f30                                 \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+    "1:                                                   \n\t"
+    "pmullh     $f8, $f4, $f20                            \n\t"
+    "pmullh     $f10, $f6, $f22                           \n\t"
+    "paddh      $f8, $f8, $f0                             \n\t"
+    "paddh      $f10, $f10, $f2                           \n\t"
+    "psrah      $f8, $f8, $f30                            \n\t"
+    "psrah      $f10, $f10, $f30                          \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "gssdxc1    $f8, 0x0(%[pPred], $0)                    \n\t"
+    "paddh      $f0, $f0, $f16                            \n\t"
+    "paddh      $f2, $f2, $f18                            \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], 0x8                   \n\t"
+    PTR_ADDIU  "$8, $8, 0x1                               \n\t"
+    PTR_ADDIU  "$10, $8, -0x8                             \n\t"
+    "bnez       $10, 1b                                   \n\t"
+    "nop                                                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride), [mmi_plane_mul_b_c]"r"(mmi_plane_mul_b_c),
+      [mmi_plane_inc_c]"r"(mmi_plane_inc_c), [mmi_plane_dec_c]"r"(mmi_plane_dec_c)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsIChromaPredV_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "gsldxc1    $f0, 0x0(%[pRef], $0)                     \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x20(%[pPred])                  \n\t"
+    "gssqc1     $f2, $f0, 0x30(%[pPred])                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride)
+    : "memory", "$f0", "$f2"
+  );
+}
+
+void WelsIChromaPredDc_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  short mmi_0x02[4]__attribute__((aligned(16))) = {2, 0, 0, 0};
+  unsigned char mmi_01bytes[16]__attribute__((aligned(16))) =
+                {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_SUBU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "gsldxc1    $f0, 0x0(%[pRef], $0)                     \n\t"
+
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $8, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    "dmtc1      $8, $f2                                   \n\t"
+
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $8, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pRef], %[pRef], %[kiStride]             \n\t"
+    "lbu        $9, -0x1(%[pRef])                         \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+
+    "xor        $f8, $f8, $f8                             \n\t"
+    "punpcklwd  $f6, $f0, $f8                             \n\t"
+    "punpckhwd  $f0, $f0, $f8                             \n\t"
+    "pasubub    $f0, $f0, $f8                             \n\t"
+    "pasubub    $f6, $f6, $f8                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+
+    "dadd       $f6, $f6, $f2                             \n\t"
+    "dadd       $f2, $f4, $f0                             \n\t"
+
+    "gsldxc1    $f8, 0x0(%[mmi_0x02], $0)                 \n\t"
+
+    "dli        $10, 0x2                                  \n\t"
+    "dmtc1      $10, $f10                                 \n\t"
+    "dadd       $f0, $f0, $f8                             \n\t"
+    "dsrl       $f0, $f0, $f10                            \n\t"
+
+    "dadd       $f4, $f4, $f8                             \n\t"
+    "dsrl       $f4, $f4, $f10                            \n\t"
+
+    "dli        $10, 0x3                                  \n\t"
+    "dmtc1      $10, $f10                                 \n\t"
+    "dadd       $f6, $f6, $f8                             \n\t"
+    "dadd       $f6, $f6, $f8                             \n\t"
+    "dsrl       $f6, $f6, $f10                            \n\t"
+
+    "dadd       $f2, $f2, $f8                             \n\t"
+    "dadd       $f2, $f2, $f8                             \n\t"
+    "dsrl       $f2, $f2, $f10                            \n\t"
+
+    "dli        $10, 0x20                                 \n\t"
+    "dmtc1      $10, $f10                                 \n\t"
+    "gsldxc1    $f12, 0x0(%[mmi_01bytes], $0)             \n\t"
+    "pmuluw     $f0, $f0, $f12                            \n\t"
+    "pmuluw     $f6, $f6, $f12                            \n\t"
+    "dsll       $f0, $f0, $f10                            \n\t"
+    "xor        $f0, $f0, $f6                             \n\t"
+
+    "pmuluw     $f4, $f4, $f12                            \n\t"
+    "pmuluw     $f2, $f2, $f12                            \n\t"
+    "dsll       $f2, $f2, $f10                            \n\t"
+    "xor        $f2, $f2, $f4                             \n\t"
+
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    "gssdxc1    $f0, 0x8(%[pPred], $0)                    \n\t"
+    "gssdxc1    $f0, 0x10(%[pPred], $0)                   \n\t"
+    "gssdxc1    $f0, 0x18(%[pPred], $0)                   \n\t"
+
+    "gssdxc1    $f2, 0x20(%[pPred], $0)                   \n\t"
+    "gssdxc1    $f2, 0x28(%[pPred], $0)                   \n\t"
+    "gssdxc1    $f2, 0x30(%[pPred], $0)                   \n\t"
+    "gssdxc1    $f2, 0x38(%[pPred], $0)                   \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+    : [kiStride]"r"((int)kiStride), [mmi_01bytes]"r"((unsigned char *)mmi_01bytes),
+      [mmi_0x02]"r"((unsigned char *)mmi_0x02)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12"
+  );
+}
+
+void WelsIChromaPredH_mmi(uint8_t *pPred, uint8_t *pRef, int32_t kiStride) {
+  unsigned char mmi_01bytes[16]__attribute__((aligned(16))) =
+                {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1};
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "gsldxc1    $f2, 0x0(%[mmi_01bytes], $0)              \n\t"
+    "dli        $8, 0x38                                  \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+    "xor        $f6, $f6, $f6                             \n\t"
+    "gsldxc1    $f0, -0x8(%[pRef], $0)                    \n\t"
+    "dsrl       $f0, $f0, $f4                             \n\t"
+
+    "pmullh     $f0, $f0, $f2                             \n\t"
+    "pshufh     $f0, $f0, $f6                             \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x8)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x10)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x18)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x20)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x28)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x30)
+    MMI_PRED_H_8X8_ONE_LINE($f0, $f2, $f4, $f6, %[pRef], %[pPred], 0x38)
+   : [pPred]"+&r"((unsigned char *)pPred), [pRef]"+&r"((unsigned char *)pRef)
+   : [kiStride]"r"((int)kiStride), [mmi_01bytes]"r"((unsigned char *)mmi_01bytes)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6"
+  );
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/mips/satd_sad_mmi.c b/third-party/openh264/third_party/openh264/src/codec/common/mips/satd_sad_mmi.c
new file mode 100644
index 0000000000..a85b22821a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/mips/satd_sad_mmi.c
@@ -0,0 +1,2154 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    satd_sad_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    23/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+#define MMI_SumWHorizon1(f0, f2, f4, f6, f8, f10, r0) \
+  "dli        "#r0", 0x10                               \n\t" \
+  "dmtc1      "#r0", "#f8"                              \n\t" \
+  "dli        "#r0", 0x20                               \n\t" \
+  "dmtc1      "#r0", "#f10"                             \n\t" \
+  "mov.d      "#f4", "#f2"                              \n\t" \
+  "xor        "#f6", "#f6", "#f6"                       \n\t" \
+  "paddush    "#f0", "#f0", "#f4"                       \n\t" \
+  "paddush    "#f2", "#f2", "#f6"                       \n\t" \
+  "dsrl       "#f6", "#f2", "#f10"                      \n\t" \
+  "punpcklwd  "#f4", "#f2", "#f2"                       \n\t" \
+  "punpckhwd  "#f4", "#f0", "#f4"                       \n\t" \
+  "paddush    "#f0", "#f0", "#f4"                       \n\t" \
+  "paddush    "#f2", "#f2", "#f6"                       \n\t" \
+  "dsrl       "#f4", "#f0", "#f8"                       \n\t" \
+  "pinsrh_3   "#f4", "#f4", "#f2"                       \n\t" \
+  "dsrl       "#f6", "#f2", "#f8"                       \n\t" \
+  "paddush    "#f0", "#f0", "#f4"                       \n\t" \
+  "paddush    "#f2", "#f2", "#f6"                       \n\t"
+
+#define MMI_GetSad8x4 \
+  PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t" \
+  "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t" \
+  "gsldlc1    $f4, 0x7($8)                              \n\t" \
+  "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t" \
+  "gsldrc1    $f4, 0x0($8)                              \n\t" \
+  PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t" \
+  PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t" \
+  "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t" \
+  "gsldlc1    $f6, 0x7($8)                              \n\t" \
+  "gsldlc1    $f8, 0x7(%[pSample2])                     \n\t" \
+  "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t" \
+  "gsldrc1    $f6, 0x0($8)                              \n\t" \
+  "gsldrc1    $f8, 0x0(%[pSample2])                     \n\t" \
+  PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t" \
+  PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t" \
+  "gsldlc1    $f12, 0x7($9)                             \n\t" \
+  "gsldlc1    $f10, 0x7(%[pSample2])                    \n\t" \
+  "gsldrc1    $f12, 0x0($9)                             \n\t" \
+  PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t" \
+  "gsldrc1    $f10, 0x0(%[pSample2])                    \n\t" \
+  "gsldlc1    $f14, 0x7($9)                             \n\t" \
+  "gsldrc1    $f14, 0x0($9)                             \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "pasubub    $f4, $f4, $f12                            \n\t" \
+  PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t" \
+  "pasubub    $f6, $f6, $f14                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f24, $f24, $f0                           \n\t" \
+  "paddh      $f26, $f26, $f2                           \n\t" \
+  "paddh      $f24, $f24, $f4                           \n\t" \
+  "paddh      $f26, $f26, $f6                           \n\t"
+
+#define MMI_GetSad8x4_End \
+  PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t" \
+  "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t" \
+  "gsldlc1    $f4, 0x7($8)                              \n\t" \
+  "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t" \
+  "gsldrc1    $f4, 0x0($8)                              \n\t" \
+  PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t" \
+  PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t" \
+  "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t" \
+  "gsldlc1    $f6, 0x7($8)                              \n\t" \
+  "gsldlc1    $f8, 0x7(%[pSample2])                     \n\t" \
+  "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t" \
+  "gsldrc1    $f6, 0x0($8)                              \n\t" \
+  "gsldrc1    $f8, 0x0(%[pSample2])                     \n\t" \
+  PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t" \
+  PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t" \
+  "gsldlc1    $f12, 0x7($9)                             \n\t" \
+  "gsldlc1    $f10, 0x7(%[pSample2])                    \n\t" \
+  "gsldrc1    $f12, 0x0($9)                             \n\t" \
+  PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t" \
+  "gsldrc1    $f10, 0x0(%[pSample2])                    \n\t" \
+  "gsldlc1    $f14, 0x7($9)                             \n\t" \
+  "gsldrc1    $f14, 0x0($9)                             \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "pasubub    $f4, $f4, $f12                            \n\t" \
+  "pasubub    $f6, $f6, $f14                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f24, $f24, $f0                           \n\t" \
+  "paddh      $f26, $f26, $f2                           \n\t" \
+  "paddh      $f24, $f24, $f4                           \n\t" \
+  "paddh      $f26, $f26, $f6                           \n\t"
+
+#define CACHE_SPLIT_CHECK(r0, width, cacheline) \
+  "and        "#r0", "#r0", 0x1f                        \n\t" \
+  PTR_ADDIU  ""#r0", "#r0", -0x1f                       \n\t"
+
+#define MMI_GetSad2x16 \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f0, $f0, $f4                             \n\t" \
+  "paddh      $f2, $f2, $f6                             \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f0, $f0, $f4                             \n\t" \
+  "paddh      $f2, $f2, $f6                             \n\t"
+
+#define MMI_GetSad4x16 \
+  "gsldlc1    $f0, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f2, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f0, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f2, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "paddh      $f28, $f28, $f0                           \n\t" \
+  "paddh      $f30, $f30, $f2                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t"
+
+#define MMI_GetSad4x16_Aligned \
+  "gslqc1     $f2, $f0, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "paddh      $f28, $f28, $f0                           \n\t" \
+  "paddh      $f30, $f30, $f2                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t"
+
+#define MMI_GetSad4x16_End \
+  "gsldlc1    $f0, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f2, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f0, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f2, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "paddh      $f28, $f28, $f0                           \n\t" \
+  "paddh      $f30, $f30, $f2                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t" \
+  "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t" \
+  "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t" \
+  "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t"
+
+#define MMI_GetSad4x16_Aligned_End \
+  "gslqc1     $f2, $f0, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f0, $f0, $f8                             \n\t" \
+  "pasubub    $f2, $f2, $f10                            \n\t" \
+  "biadd      $f0, $f0                                  \n\t" \
+  "biadd      $f2, $f2                                  \n\t" \
+  "paddh      $f28, $f28, $f0                           \n\t" \
+  "paddh      $f30, $f30, $f2                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t" \
+  PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t" \
+  "gslqc1     $f6, $f4, 0x0(%[pSample2])                \n\t" \
+  "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t" \
+  "pasubub    $f4, $f4, $f8                             \n\t" \
+  "pasubub    $f6, $f6, $f10                            \n\t" \
+  "biadd      $f4, $f4                                  \n\t" \
+  "biadd      $f6, $f6                                  \n\t" \
+  "paddh      $f28, $f28, $f4                           \n\t" \
+  "paddh      $f30, $f30, $f6                           \n\t"
+
+#define MMI_Get4LW16Sad(f0, f2, f4, f6, f8, f10, f12, f14, r0) \
+  "pasubub    "#f0", "#f0", "#f12"                      \n\t" \
+  "pasubub    "#f2", "#f2", "#f14"                      \n\t" \
+  "pasubub    "#f12", "#f12", "#f8"                     \n\t" \
+  "pasubub    "#f14", "#f14", "#f10"                    \n\t" \
+  "biadd      "#f0", "#f0"                              \n\t" \
+  "biadd      "#f2", "#f2"                              \n\t" \
+  "biadd      "#f12", "#f12"                            \n\t" \
+  "biadd      "#f14", "#f14"                            \n\t" \
+  "paddh      $f20, $f20, "#f0"                         \n\t" \
+  "paddh      $f22, $f22, "#f2"                         \n\t" \
+  "paddh      $f16, $f16, "#f12"                        \n\t" \
+  "paddh      $f18, $f18, "#f14"                        \n\t" \
+  "gsldlc1    "#f12", 0x6("#r0")                        \n\t" \
+  "gsldlc1    "#f14", 0xE("#r0")                        \n\t" \
+  "gsldrc1    "#f12", -0x1("#r0")                       \n\t" \
+  "gsldrc1    "#f14", 0x7("#r0")                        \n\t" \
+  "pasubub    "#f12", "#f12", "#f4"                     \n\t" \
+  "pasubub    "#f14", "#f14", "#f6"                     \n\t" \
+  "biadd      "#f12", "#f12"                            \n\t" \
+  "biadd      "#f14", "#f14"                            \n\t" \
+  "paddh      $f24, $f24, "#f12"                        \n\t" \
+  "paddh      $f26, $f26, "#f14"                        \n\t" \
+  "gsldlc1    "#f12", 0x8("#r0")                        \n\t" \
+  "gsldlc1    "#f14", 0x10("#r0")                       \n\t" \
+  "gsldrc1    "#f12", 0x1("#r0")                        \n\t" \
+  "gsldrc1    "#f14", 0x9("#r0")                        \n\t" \
+  "pasubub    "#f12", "#f12", "#f4"                     \n\t" \
+  "pasubub    "#f14", "#f14", "#f6"                     \n\t" \
+  "biadd      "#f12", "#f12"                            \n\t" \
+  "biadd      "#f14", "#f14"                            \n\t" \
+  "paddh      $f28, $f28, "#f12"                        \n\t" \
+  "paddh      $f30, $f30, "#f14"                        \n\t"
+
+#define MMI_HDMTwo4x4(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18) \
+  MMI_SumSub(f0, f2, f4, f6, f16, f18)      \
+  MMI_SumSub(f8, f10, f12, f14, f16, f18)   \
+  MMI_SumSub(f4, f6, f12, f14, f16, f18)    \
+  MMI_SumSub(f0, f2, f8, f10, f16, f18)
+
+#define MMI_SumAbs4(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, f20, f22, f24, f26) \
+  WELS_AbsH(f0, f2, f0, f2, f8, f10)                          \
+  WELS_AbsH(f4, f6, f4, f6, f8, f10)                          \
+  WELS_AbsH(f12, f14, f12, f14, f20, f22)                     \
+  WELS_AbsH(f16, f18, f16, f18, f20, f22)                     \
+  "paddush    "#f0", "#f0", "#f4"                       \n\t" \
+  "paddush    "#f2", "#f2", "#f6"                       \n\t" \
+  "paddush    "#f12", "#f12", "#f16"                    \n\t" \
+  "paddush    "#f14", "#f14", "#f18"                    \n\t" \
+  "paddush    "#f24", "#f24", "#f0"                     \n\t" \
+  "paddush    "#f26", "#f26", "#f2"                     \n\t" \
+  "paddush    "#f24", "#f24", "#f12"                    \n\t" \
+  "paddush    "#f26", "#f26", "#f14"                    \n\t"
+
+#define MMI_SumWHorizon(f0, f2, f4, f6, f8, f10) \
+  "paddh      "#f0", "#f0", "#f2"                       \n\t" \
+  "punpckhhw  "#f2", "#f0", "#f8"                       \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f8"                       \n\t" \
+  "paddw      "#f0", "#f0", "#f2"                       \n\t" \
+  "pshufh     "#f2", "#f0", "#f10"                      \n\t" \
+  "paddw      "#f0", "#f0", "#f2"                       \n\t"
+
+#define MMI_LoadDiff8P_Offset_Stride0(f0, f2, f4, f6, f8, r0, r1) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldlc1    "#f4", 0x7("#r1")               \n\t" \
+  PTR_ADDU   "$11, %[pSample1], %[iStride1]   \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gsldrc1    "#f4", 0x0("#r1")               \n\t" \
+  PTR_ADDU   "$12, %[pSample2], %[iStride2]   \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f8"             \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f8"             \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f8"             \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f8"             \n\t" \
+  "psubh      "#f0", "#f0", "#f4"             \n\t" \
+  "psubh      "#f2", "#f2", "#f6"             \n\t"
+
+#define MMI_LoadDiff8P_Offset_Stride1(f0, f2, f4, f6, f8, r0, r1) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldlc1    "#f4", 0x7("#r1")               \n\t" \
+  PTR_ADDU   "%[pSample1], $11, %[iStride1]   \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gsldrc1    "#f4", 0x0("#r1")               \n\t" \
+  PTR_ADDU   "%[pSample2], $12, %[iStride2]   \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f8"             \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f8"             \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f8"             \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f8"             \n\t" \
+  "psubh      "#f0", "#f0", "#f4"             \n\t" \
+  "psubh      "#f2", "#f2", "#f6"             \n\t"
+
+#define MMI_LoadDiff8P_Offset8(f0, f2, f4, f6, f8, r0, r1) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldlc1    "#f4", 0x7("#r1")               \n\t" \
+  PTR_ADDU   "%[pSample1], $9, 0x8            \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gsldrc1    "#f4", 0x0("#r1")               \n\t" \
+  PTR_ADDU   "%[pSample2], $10, 0x8           \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f8"             \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f8"             \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f8"             \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f8"             \n\t" \
+  "psubh      "#f0", "#f0", "#f4"             \n\t" \
+  "psubh      "#f2", "#f2", "#f6"             \n\t"
+
+#define MMI_GetSatd8x8 \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P_Offset_Stride1($f12, $f14, $f20, $f22, $f28, $11, $12)                      \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26) \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P_Offset_Stride1($f12, $f14, $f20, $f22, $f28, $11, $12)                      \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26)
+
+#define MMI_GetSatd8x8_Offset8 \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P_Offset_Stride1($f12, $f14, $f20, $f22, $f28, $11, $12)                      \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26) \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P_Offset8($f12, $f14, $f20, $f22, $f28, $11, $12)                             \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26)
+
+#define MMI_GetSatd8x8_End \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P_Offset_Stride1($f12, $f14, $f20, $f22, $f28, $11, $12)                      \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26) \
+  MMI_LoadDiff8P_Offset_Stride0($f0, $f2, $f16, $f18, $f28, %[pSample1], %[pSample2])        \
+  MMI_LoadDiff8P_Offset_Stride1($f4, $f6, $f20, $f22, $f28, $11, $12)                        \
+  MMI_LoadDiff8P_Offset_Stride0($f8, $f10, $f16, $f18, $f28, %[pSample1], %[pSample2])       \
+  MMI_LoadDiff8P($f12, $f14, $f20, $f22, $f28, $11, $12)                                     \
+  MMI_HDMTwo4x4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18)                       \
+  MMI_TransTwo4x4H($f12, $f14, $f4, $f6, $f0, $f2, $f8, $f10, $f16, $f18)                    \
+  MMI_HDMTwo4x4($f12, $f14, $f4, $f6, $f8, $f10, $f16, $f18, $f20, $f22)                     \
+  MMI_SumAbs4($f16, $f18, $f4, $f6, $f0, $f2, $f8, $f10, $f12, $f14, $f20, $f22, $f24, $f26)
+
+int32_t WelsSampleSad16x16_mmi (uint8_t* pSample1, int32_t iStride1,
+                                uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "and        $8, %[pSample2], 0xF                      \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "bnez       $8, unaligned                             \n\t"
+    "aligned:                                             \n\t"
+    MMI_GetSad4x16_Aligned
+    MMI_GetSad4x16_Aligned
+    MMI_GetSad4x16_Aligned
+    MMI_GetSad4x16_Aligned_End
+    "b          out                                       \n\t"
+
+    "unaligned:                                           \n\t"
+    MMI_GetSad4x16
+    MMI_GetSad4x16
+    MMI_GetSad4x16
+    MMI_GetSad4x16_End
+    "out:                                                 \n\t"
+    "mov.d      $f0, $f30                                 \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSadSum]"=r"((int)iSadSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1),  [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSadSum;
+}
+
+int32_t WelsSampleSad16x8_mmi (uint8_t* pSample1, int32_t iStride1,
+                               uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f2, 0xF(%[pSample2])                     \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f2, 0x8(%[pSample2])                     \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "pasubub    $f0, $f0, $f8                             \n\t"
+    "pasubub    $f2, $f2, $f10                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f6, 0xF(%[pSample2])                     \n\t"
+    "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f6, 0x8(%[pSample2])                     \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t"
+    "pasubub    $f4, $f4, $f8                             \n\t"
+    "pasubub    $f6, $f6, $f10                            \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "paddh      $f2, $f2, $f6                             \n\t"
+
+    MMI_GetSad2x16
+    MMI_GetSad2x16
+    MMI_GetSad2x16
+
+    "paddh      $f0, $f0, $f2                             \n\t"
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSadSum]"=r"((int)iSadSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1),  [iStride2]"r"((int)iStride2)
+    : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26"
+  );
+  RECOVER_REG;
+  return iSadSum;
+}
+
+int32_t WelsSampleSad8x16_mmi (uint8_t* pSample1, int32_t iStride1,
+                               uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    MMI_GetSad8x4
+    MMI_GetSad8x4
+    MMI_GetSad8x4
+    MMI_GetSad8x4_End
+    "paddh      $f0, $f26, $f24                           \n\t"
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSadSum]"=r"((int)iSadSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26"
+  );
+  RECOVER_REG;
+  return iSadSum;
+}
+
+int32_t WelsSampleSad4x4_mmi (uint8_t* pSample1, int32_t iStride1,
+                              uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "punpcklwd  $f0, $f0, $f2                             \n\t"
+
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    "punpcklwd  $f6, $f6, $f8                             \n\t"
+    "pasubub    $f0, $f0, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f4, 0x7($8)                              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0($8)                              \n\t"
+    "punpcklwd  $f2, $f2, $f4                             \n\t"
+
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    "punpcklwd  $f6, $f6, $f8                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f0, $f0, $f2                             \n\t"
+
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSadSum]"=r"((int)iSadSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1),  [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8"
+  );
+  return iSadSum;
+}
+
+int32_t WelsSampleSad8x8_mmi (uint8_t* pSample1, int32_t iStride1,
+                              uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    CACHE_SPLIT_CHECK($8, 8, 32)
+    "blez       $8, 1f                                    \n\t"
+    "nop                                                  \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+
+    "move       $9, %[pSample2]                           \n\t"
+    "and        $9, $9, 0x7                               \n\t"
+    PTR_SUBU   "%[pSample2], %[pSample2], $9              \n\t"
+    "dli        $8, 0x8                                   \n\t"
+    PTR_SUBU   "$8, $8, $9                                \n\t"
+
+    "dsll       $9, $9, 0x3                               \n\t"
+    "dsll       $8, $8, 0x3                               \n\t"
+    "dmtc1      $9, $f20                                  \n\t"
+    "dmtc1      $8, $f24                                  \n\t"
+    "dli        $9, 0x8                                   \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    PTR_ADDU   "$9, $9, %[pSample2]                       \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t"
+
+    "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0x7($9)                             \n\t"
+    "dsrl       $f4, $f4, $f20                            \n\t"
+    "gsldrc1    $f10, 0x0($9)                             \n\t"
+    "dsrl       $f6, $f6, $f20                            \n\t"
+    "dsll       $f8, $f8, $f24                            \n\t"
+    "dsll       $f10, $f10, $f24                          \n\t"
+    "or         $f4, $f4, $f8                             \n\t"
+    "or         $f6, $f6, $f10                            \n\t"
+
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f28, $f28, $f0                           \n\t"
+    "paddh      $f30, $f30, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t"
+
+    "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0x7($9)                             \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f10, 0x0($9)                             \n\t"
+    "dsrl       $f4, $f4, $f20                            \n\t"
+    "dsrl       $f6, $f6, $f20                            \n\t"
+    "dsll       $f8, $f8, $f24                            \n\t"
+    "dsll       $f10, $f10, $f24                          \n\t"
+    "or         $f4, $f4, $f8                             \n\t"
+    "or         $f6, $f6, $f10                            \n\t"
+
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f28, $f28, $f0                           \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "paddh      $f30, $f30, $f2                           \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t"
+
+    "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0x7($9)                             \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f10, 0x0($9)                             \n\t"
+    "dsrl       $f4, $f4, $f20                            \n\t"
+    "dsrl       $f6, $f6, $f20                            \n\t"
+    "dsll       $f8, $f8, $f24                            \n\t"
+    "dsll       $f10, $f10, $f24                          \n\t"
+    "or         $f4, $f4, $f8                             \n\t"
+    "or         $f6, $f6, $f10                            \n\t"
+
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f28, $f28, $f0                           \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "paddh      $f30, $f30, $f2                           \n\t"
+
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "gsldlc1    $f2, 0x7(%[pSample1])                     \n\t"
+
+    "gsldlc1    $f4, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f8, 0x7($9)                              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f8, 0x0($9)                              \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    PTR_ADDU   "$9, $9, %[iStride2]                       \n\t"
+    "gsldlc1    $f6, 0x7(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0x7($9)                             \n\t"
+    "gsldrc1    $f6, 0x0(%[pSample2])                     \n\t"
+    "gsldrc1    $f10, 0x0($9)                             \n\t"
+    "dsrl       $f4, $f4, $f20                            \n\t"
+    "dsrl       $f6, $f6, $f20                            \n\t"
+    "dsll       $f8, $f8, $f24                            \n\t"
+    "dsll       $f10, $f10, $f24                          \n\t"
+    "or         $f4, $f4, $f8                             \n\t"
+    "or         $f6, $f6, $f10                            \n\t"
+
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f28, $f28, $f0                           \n\t"
+    "paddh      $f30, $f30, $f2                           \n\t"
+
+    "mov.d      $f0, $f30                                 \n\t"
+    "paddh      $f0, $f0, $f28                            \n\t"
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    "j          2f                                        \n\t"
+    "nop                                                  \n\t"
+
+    "1:                                                   \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    MMI_GetSad8x4
+    MMI_GetSad8x4_End
+    "paddh      $f0, $f26, $f24                           \n\t"
+    "dmfc1      %[iSadSum], $f0                           \n\t"
+    "2:                                                   \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSadSum]"=r"((int)iSadSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1),  [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSadSum;
+}
+
+int32_t WelsSampleSatd4x4_mmi (uint8_t* pSample1, int32_t iStride1,
+                               uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f4, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f4, 0x0($8)                              \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "gsldlc1    $f8, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f12, 0x7($8)                             \n\t"
+    "gsldrc1    $f8, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f12, 0x0($8)                             \n\t"
+    "punpcklwd  $f0, $f0, $f8                             \n\t"
+    "punpcklwd  $f4, $f4, $f12                            \n\t"
+
+    PTR_ADDU   "$8, %[pSample2], %[iStride2]              \n\t"
+    "gsldlc1    $f16, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f20, 0x7($8)                             \n\t"
+    "gsldrc1    $f16, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f20, 0x0($8)                             \n\t"
+    PTR_ADDU   "%[pSample2], $8, %[iStride2]              \n\t"
+    PTR_ADDU   "$8, %[pSample2], %[iStride2]              \n\t"
+    "gsldlc1    $f24, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f28, 0x7($8)                             \n\t"
+    "gsldrc1    $f24, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f28, 0x0($8)                             \n\t"
+    "punpcklwd  $f16, $f16, $f24                          \n\t"
+    "punpcklwd  $f20, $f20, $f28                          \n\t"
+
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "punpckhbh  $f2, $f0, $f24                            \n\t"
+    "punpcklbh  $f0, $f0, $f24                            \n\t"
+    "punpckhbh  $f6, $f4, $f24                            \n\t"
+    "punpcklbh  $f4, $f4, $f24                            \n\t"
+    "punpckhbh  $f18, $f16, $f24                          \n\t"
+    "punpcklbh  $f16, $f16, $f24                          \n\t"
+    "punpckhbh  $f22, $f20, $f24                          \n\t"
+    "punpcklbh  $f20, $f20, $f24                          \n\t"
+
+    "psubh      $f0, $f0, $f16                            \n\t"
+    "psubh      $f2, $f2, $f18                            \n\t"
+    "psubh      $f4, $f4, $f20                            \n\t"
+    "psubh      $f6, $f6, $f22                            \n\t"
+
+    "mov.d      $f8, $f0                                  \n\t"
+    "mov.d      $f10, $f2                                 \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "paddh      $f2, $f2, $f6                             \n\t"
+    "psubh      $f8, $f8, $f4                             \n\t"
+    "psubh      $f10, $f10, $f6                           \n\t"
+    MMI_XSawp_DQ($f0, $f2, $f8, $f10, $f12, $f14)
+
+    "mov.d      $f16, $f0                                 \n\t"
+    "mov.d      $f18, $f2                                 \n\t"
+    "paddh      $f0, $f0, $f12                            \n\t"
+    "paddh      $f2, $f2, $f14                            \n\t"
+    "psubh      $f16, $f16, $f12                          \n\t"
+    "psubh      $f18, $f18, $f14                          \n\t"
+
+    "mov.d      $f8, $f2                                  \n\t"
+    "punpckhhw  $f2, $f0, $f16                            \n\t"
+    "punpcklhw  $f0, $f0, $f16                            \n\t"
+    "punpcklhw  $f16, $f18, $f8                           \n\t"
+    "punpckhhw  $f18, $f18, $f8                           \n\t"
+
+    MMI_XSawp_WD($f0, $f2, $f16, $f18, $f12, $f14)
+    MMI_XSawp_DQ($f0, $f2, $f12, $f14, $f20, $f22)
+
+    "mov.d      $f28, $f0                                 \n\t"
+    "mov.d      $f30, $f2                                 \n\t"
+    "paddh      $f0, $f0, $f20                            \n\t"
+    "paddh      $f2, $f2, $f22                            \n\t"
+    "psubh      $f28, $f28, $f20                          \n\t"
+    "psubh      $f30, $f30, $f22                          \n\t"
+
+    MMI_XSawp_DQ($f0, $f2, $f28, $f30, $f4, $f6)
+
+    "psubh      $f8, $f0, $f4                             \n\t"
+    "psubh      $f10, $f2, $f6                            \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "paddh      $f2, $f2, $f6                             \n\t"
+
+    WELS_AbsH($f0, $f2, $f0, $f2, $f12, $f14)
+    "paddush    $f24, $f24, $f0                           \n\t"
+    "paddush    $f26, $f26, $f2                           \n\t"
+    WELS_AbsH($f8, $f10, $f8, $f10, $f16, $f18)
+    "paddush    $f24, $f24, $f8                           \n\t"
+    "paddush    $f26, $f26, $f10                          \n\t"
+    MMI_SumWHorizon1($f24, $f26, $f16, $f18, $f28, $f30, $8)
+
+    "dmfc1      $8, $f24                                  \n\t"
+    "dli        $9, 0xffff                                \n\t"
+    "and        $8, $8, $9                                \n\t"
+    "dsrl       %[iSatdSum], $8, 0x1                      \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSatdSum]"=r"((int)iSatdSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1),  [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd8x8_mmi (uint8_t* pSample1, int32_t iStride1,
+                               uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "dli        $8, 0x1                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    MMI_GetSatd8x8_End
+    "psrlh      $f24, $f24, $f30                          \n\t"
+    "dli        $8, 0x4e                                  \n\t"
+    "psrlh      $f26, $f26, $f30                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    MMI_SumWHorizon($f24, $f26, $f16, $f18, $f28, $f30)
+    "mfc1       %[iSatdSum], $f24                         \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSatdSum]"=r"((int)iSatdSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$11", "$12", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd8x16_mmi (uint8_t* pSample1, int32_t iStride1,
+                                uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "dli        $8, 0x1                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    MMI_GetSatd8x8
+    MMI_GetSatd8x8_End
+    "psrlh      $f24, $f24, $f30                          \n\t"
+    "dli        $8, 0x4e                                  \n\t"
+    "psrlh      $f26, $f26, $f30                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    MMI_SumWHorizon($f24, $f26, $f16, $f18, $f28, $f30)
+    "mfc1       %[iSatdSum], $f24                         \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSatdSum]"=r"((int)iSatdSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$11", "$12", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd16x8_mmi (uint8_t* pSample1, int32_t iStride1,
+                                uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "dli        $8, 0x1                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    "move       $9, %[pSample1]                           \n\t"
+    "move       $10, %[pSample2]                          \n\t"
+    MMI_GetSatd8x8_Offset8
+
+    MMI_GetSatd8x8_End
+    "psrlh      $f24, $f24, $f30                          \n\t"
+    "dli        $8, 0x4e                                  \n\t"
+    "psrlh      $f26, $f26, $f30                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    MMI_SumWHorizon($f24, $f26, $f16, $f18, $f28, $f30)
+    "mfc1       %[iSatdSum], $f24                         \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSatdSum]"=r"((int)iSatdSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$f0", "$f2", "$f4", "$f6",
+      "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24",
+      "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd16x16_mmi (uint8_t* pSample1, int32_t iStride1,
+                                 uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "dli        $8, 0x1                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "dmtc1      $8, $f30                                  \n\t"
+    "move       $9, %[pSample1]                           \n\t"
+    "move       $10, %[pSample2]                          \n\t"
+
+    MMI_GetSatd8x8
+    MMI_GetSatd8x8_Offset8
+
+    MMI_GetSatd8x8
+    MMI_GetSatd8x8_End
+
+    "dli        $8, 0x4e                                  \n\t"
+    "psrlh      $f24, $f24, $f30                          \n\t"
+    "dmtc1      $8, $f0                                   \n\t"
+    "psrlh      $f26, $f26, $f30                          \n\t"
+    MMI_SumWHorizon($f24, $f26, $f16, $f18, $f28, $f0)
+    "mfc1       %[iSatdSum], $f24                         \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1), [iSatdSum]"=r"((int)iSatdSum),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$f0", "$f2", "$f4", "$f6",
+      "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24",
+      "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+  return iSatdSum;
+}
+
+void WelsSampleSadFour16x16_mmi (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2,
+                                 int32_t iStride2, int32_t* pSad) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    PTR_SUBU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gslqc1     $f6, $f4, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    "pasubub    $f12, $f12, $f4                           \n\t"
+    "pasubub    $f14, $f14, $f6                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f8, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0xE(%[pSample2])                    \n\t"
+    "gsldrc1    $f8, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f10, 0x7(%[pSample2])                    \n\t"
+    "pasubub    $f8, $f8, $f0                             \n\t"
+    "pasubub    $f10, $f10, $f2                           \n\t"
+    "biadd      $f8, $f8                                  \n\t"
+    "biadd      $f10, $f10                                \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0x10(%[pSample2])                   \n\t"
+    "gsldrc1    $f14, 0x9(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gslqc1     $f10, $f8, 0x0($8)                        \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $9)
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, %[pSample2])
+    "gslqc1     $f6, $f4, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, $9)
+    "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, %[pSample2])
+    "gslqc1     $f2, $f0, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, $9)
+    "gslqc1     $f6, $f4, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, %[pSample2])
+
+    "gslqc1     $f10, $f8, 0x0($8)                        \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $9)
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, %[pSample2])
+    "gslqc1     $f6, $f4, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, $9)
+    "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, %[pSample2])
+    "gslqc1     $f2, $f0, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, $9)
+    "gslqc1     $f6, $f4, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, %[pSample2])
+
+    "gslqc1     $f10, $f8, 0x0($8)                        \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $9)
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, %[pSample2])
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    "pasubub    $f8, $f8, $f12                            \n\t"
+    "pasubub    $f10, $f10, $f14                          \n\t"
+    "biadd      $f8, $f8                                  \n\t"
+    "biadd      $f10, $f10                                \n\t"
+    "paddh      $f20, $f20, $f8                           \n\t"
+    "paddh      $f22, $f22, $f10                          \n\t"
+
+    "gsldlc1    $f8, 0x6($9)                              \n\t"
+    "gsldlc1    $f10, 0xE($9)                             \n\t"
+    "gsldrc1    $f8, -0x1($9)                             \n\t"
+    "gsldrc1    $f10, 0x7($9)                             \n\t"
+    "pasubub    $f8, $f8, $f0                             \n\t"
+    "pasubub    $f10, $f10, $f2                           \n\t"
+    "biadd      $f8, $f8                                  \n\t"
+    "biadd      $f10, $f10                                \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+
+    "gsldlc1    $f12, 0x8($9)                             \n\t"
+    "gsldlc1    $f14, 0x10($9)                            \n\t"
+    "gsldrc1    $f12, 0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x9($9)                             \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "paddh      $f16, $f16, $f18                          \n\t"
+    "paddh      $f20, $f20, $f22                          \n\t"
+    "paddh      $f24, $f24, $f26                          \n\t"
+    "paddh      $f28, $f28, $f30                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "punpcklwd  $f24, $f24, $f28                          \n\t"
+    "gssqc1     $f24, $f16, 0x0(%[pSad])                  \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2),
+      [pSad]"r"((int *)pSad)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsSampleSadFour16x8_mmi (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2,
+                                int32_t iStride2, int32_t* pSad) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    PTR_SUBU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "%[pSample1], %[pSample1], %[iStride1]     \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], %[pSample2], %[iStride2]     \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gslqc1     $f6, $f4, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    "pasubub    $f12, $f12, $f4                           \n\t"
+    "pasubub    $f14, $f14, $f6                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f8, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f10, 0xE(%[pSample2])                    \n\t"
+    "gsldrc1    $f8, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f10, 0x7(%[pSample2])                    \n\t"
+    "pasubub    $f8, $f8, $f0                             \n\t"
+    "pasubub    $f10, $f10, $f2                           \n\t"
+    "biadd      $f8, $f8                                  \n\t"
+    "biadd      $f10, $f10                                \n\t"
+    "paddh      $f24, $f24, $f8                           \n\t"
+    "paddh      $f26, $f26, $f10                          \n\t"
+
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0x10(%[pSample2])                   \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x9(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gslqc1     $f10, $f8, 0x0($8)                        \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $9)
+    "gslqc1     $f2, $f0, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, %[pSample2])
+    "gslqc1     $f6, $f4, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, $9)
+    "gslqc1     $f10, $f8, 0x0(%[pSample1])               \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, %[pSample2])
+    "gslqc1     $f2, $f0, 0x0($8)                         \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f4, $f6, $f8, $f10, $f0, $f2, $f12, $f14, $9)
+    "gslqc1     $f6, $f4, 0x0(%[pSample1])                \n\t"
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    MMI_Get4LW16Sad($f8, $f10, $f0, $f2, $f4, $f6, $f12, $f14, %[pSample2])
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0xF($9)                             \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x8($9)                             \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x6($9)                              \n\t"
+    "gsldlc1    $f2, 0xE($9)                              \n\t"
+    "gsldrc1    $f0, -0x1($9)                             \n\t"
+    "gsldrc1    $f2, 0x7($9)                              \n\t"
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f6                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f24, $f24, $f0                           \n\t"
+    "paddh      $f26, $f26, $f2                           \n\t"
+
+    "gsldlc1    $f12, 0x8($9)                             \n\t"
+    "gsldlc1    $f14, 0x10($9)                            \n\t"
+    "gsldrc1    $f12, 0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x9($9)                             \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "pasubub    $f12, $f12, $f4                           \n\t"
+    "pasubub    $f14, $f14, $f6                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7(%[pSample2])                    \n\t"
+    "gsldlc1    $f14, 0xF(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x8(%[pSample2])                    \n\t"
+    "pasubub    $f4, $f4, $f12                            \n\t"
+    "pasubub    $f6, $f6, $f14                            \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f20, $f20, $f4                           \n\t"
+    "paddh      $f22, $f22, $f6                           \n\t"
+
+    "paddh      $f16, $f16, $f18                          \n\t"
+    "paddh      $f20, $f20, $f22                          \n\t"
+    "paddh      $f24, $f24, $f26                          \n\t"
+    "paddh      $f28, $f28, $f30                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "punpcklwd  $f24, $f24, $f28                          \n\t"
+    "gssqc1     $f24, $f16, 0x0(%[pSad])                  \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2),
+      [pSad]"r"((int *)pSad)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28","$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsSampleSadFour8x16_mmi (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2,
+                                int32_t iStride2, int32_t* pSad) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_SUBU   "$9, %[pSample2], %[iStride2]              \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "paddh      $f16, $f16, $f18                          \n\t"
+    "paddh      $f20, $f20, $f22                          \n\t"
+    "paddh      $f24, $f24, $f26                          \n\t"
+    "paddh      $f28, $f28, $f30                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "punpcklwd  $f24, $f24, $f28                          \n\t"
+    "gssqc1     $f24, $f16, 0x0(%[pSad])                  \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2),
+      [pSad]"r"((int *)pSad)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsSampleSadFour8x8_mmi (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2,
+                               int32_t iStride2, int32_t* pSad) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    PTR_SUBU   "$9, %[pSample2], %[iStride2]              \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    PTR_ADDU   "$8, %[pSample1], %[iStride1]              \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pSample1])                     \n\t"
+    "gsldlc1    $f2, 0x7($8)                              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSample1])                     \n\t"
+    "gsldrc1    $f2, 0x0($8)                              \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f16, $f16, $f12                          \n\t"
+    "paddh      $f18, $f18, $f14                          \n\t"
+
+    "gsldlc1    $f4, 0x6(%[pSample2])                     \n\t"
+    "gsldlc1    $f12, 0x8(%[pSample2])                    \n\t"
+    PTR_ADDU   "$9, %[pSample2], %[iStride2]              \n\t"
+    PTR_ADDU   "%[pSample1], $8, %[iStride1]              \n\t"
+    "gsldrc1    $f4, -0x1(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x1(%[pSample2])                    \n\t"
+
+    "gsldlc1    $f6, 0x6($9)                              \n\t"
+    "gsldlc1    $f14, 0x8($9)                             \n\t"
+    "gsldrc1    $f6, -0x1($9)                             \n\t"
+    "gsldrc1    $f14, 0x1($9)                             \n\t"
+
+    "pasubub    $f4, $f4, $f0                             \n\t"
+    "pasubub    $f6, $f6, $f2                             \n\t"
+    "biadd      $f4, $f4                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+    "paddh      $f24, $f24, $f4                           \n\t"
+    "paddh      $f26, $f26, $f6                           \n\t"
+    "pasubub    $f12, $f12, $f0                           \n\t"
+    "pasubub    $f14, $f14, $f2                           \n\t"
+    PTR_ADDU   "%[pSample2], $9, %[iStride2]              \n\t"
+    "biadd      $f12, $f12                                \n\t"
+    "biadd      $f14, $f14                                \n\t"
+    "paddh      $f28, $f28, $f12                          \n\t"
+    "paddh      $f30, $f30, $f14                          \n\t"
+
+    "gsldlc1    $f12, 0x7($9)                             \n\t"
+    "gsldlc1    $f14, 0x7(%[pSample2])                    \n\t"
+    "gsldrc1    $f12, 0x0($9)                             \n\t"
+    "gsldrc1    $f14, 0x0(%[pSample2])                    \n\t"
+    "pasubub    $f0, $f0, $f12                            \n\t"
+    "pasubub    $f2, $f2, $f14                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f20, $f20, $f0                           \n\t"
+    "paddh      $f22, $f22, $f2                           \n\t"
+
+    "paddh      $f16, $f16, $f18                          \n\t"
+    "paddh      $f20, $f20, $f22                          \n\t"
+    "paddh      $f24, $f24, $f26                          \n\t"
+    "paddh      $f28, $f28, $f30                          \n\t"
+    "punpcklwd  $f16, $f16, $f20                          \n\t"
+    "punpcklwd  $f24, $f24, $f28                          \n\t"
+    "gssqc1     $f24, $f16, 0x0(%[pSad])                  \n\t"
+    : [pSample1]"+&r"((unsigned char *)pSample1),
+      [pSample2]"+&r"((unsigned char *)pSample2)
+    : [iStride1]"r"((int)iStride1), [iStride2]"r"((int)iStride2),
+      [pSad]"r"((int *)pSad)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28","$f30"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/WelsTaskThread.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsTaskThread.cpp
new file mode 100644
index 0000000000..44f4e74067
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsTaskThread.cpp
@@ -0,0 +1,88 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsTaskThread.cpp
+ *
+ * \brief   functions for TaskThread
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+#include "WelsTaskThread.h"
+
+namespace WelsCommon {
+
+CWelsTaskThread::CWelsTaskThread (IWelsTaskThreadSink* pSink) : m_pSink (pSink) {
+  WelsThreadSetName ("CWelsTaskThread");
+
+  m_uiID = (uintptr_t) (this);
+  m_pTask = NULL;
+}
+
+
+CWelsTaskThread::~CWelsTaskThread() {
+}
+
+void CWelsTaskThread::ExecuteTask() {
+  CWelsAutoLock cLock (m_cLockTask);
+  if (m_pSink) {
+    m_pSink->OnTaskStart (this, m_pTask);
+  }
+
+  if (m_pTask) {
+    m_pTask->Execute();
+  }
+
+  if (m_pSink) {
+    m_pSink->OnTaskStop (this, m_pTask);
+  }
+
+  m_pTask = NULL;
+}
+
+WELS_THREAD_ERROR_CODE CWelsTaskThread::SetTask (WelsCommon::IWelsTask* pTask) {
+  CWelsAutoLock cLock (m_cLockTask);
+
+  if (!GetRunning()) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+  WelsMutexLock(&m_hMutex);
+  m_pTask = pTask;
+  WelsMutexUnlock(&m_hMutex);
+  SignalThread();
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThread.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThread.cpp
new file mode 100644
index 0000000000..37ad319c2e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThread.cpp
@@ -0,0 +1,126 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThreadPool.cpp
+ *
+ * \brief   functions for Thread Pool
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+#include "WelsThread.h"
+
+namespace WelsCommon {
+
+CWelsThread::CWelsThread() :
+  m_hThread (0),
+  m_bRunning (false),
+  m_bEndFlag (false) {
+
+  WelsEventOpen (&m_hEvent);
+  WelsMutexInit(&m_hMutex);
+  m_iConVar = 1;
+}
+
+CWelsThread::~CWelsThread() {
+  Kill();
+  WelsEventClose (&m_hEvent);
+  WelsMutexDestroy(&m_hMutex);
+}
+
+void CWelsThread::Thread() {
+  while (true) {
+    WelsEventWait (&m_hEvent,&m_hMutex,m_iConVar);
+
+    if (GetEndFlag()) {
+      break;
+    }
+
+    m_iConVar = 1;
+    ExecuteTask();//in ExecuteTask there will be OnTaskStop which opens the potential new Signaling of next run, so the setting of m_iConVar = 1 should be before ExecuteTask()
+  }
+
+  SetRunning (false);
+}
+
+WELS_THREAD_ERROR_CODE CWelsThread::Start() {
+#ifndef __APPLE__
+  if (NULL == m_hEvent) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+#endif
+  if (GetRunning()) {
+    return WELS_THREAD_ERROR_OK;
+  }
+
+  SetEndFlag (false);
+
+  WELS_THREAD_ERROR_CODE rc = WelsThreadCreate (&m_hThread,
+                              (LPWELS_THREAD_ROUTINE)TheThread, this, 0);
+
+  if (WELS_THREAD_ERROR_OK != rc) {
+    return rc;
+  }
+
+  while (!GetRunning()) {
+    WelsSleep (1);
+  }
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+void CWelsThread::Kill() {
+  if (!GetRunning()) {
+    return;
+  }
+
+  SetEndFlag (true);
+
+  WelsEventSignal (&m_hEvent,&m_hMutex,&m_iConVar);
+  WelsThreadJoin (m_hThread);
+  return;
+}
+
+WELS_THREAD_ROUTINE_TYPE  CWelsThread::TheThread (void* pParam) {
+  CWelsThread* pThis = static_cast<CWelsThread*> (pParam);
+
+  pThis->SetRunning (true);
+
+  pThis->Thread();
+
+  WELS_THREAD_ROUTINE_RETURN (NULL);
+}
+
+}
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
new file mode 100644
index 0000000000..4477e34e34
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp
@@ -0,0 +1,535 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThreadLib.c
+ *
+ * \brief   Interfaces introduced in thread programming
+ *
+ * \date    11/17/2009 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifdef __linux__
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <sched.h>
+#elif !defined(_WIN32) && !defined(__CYGWIN__)
+#include <sys/types.h>
+#include <sys/param.h>
+#include <unistd.h>
+#ifndef __Fuchsia__
+#include <sys/sysctl.h>
+#endif
+#ifdef __APPLE__
+#define HW_NCPU_NAME "hw.logicalcpu"
+#else
+#define HW_NCPU_NAME "hw.ncpu"
+#endif
+#endif
+#ifdef ANDROID_NDK
+#include <cpu-features.h>
+#endif
+#ifdef __ANDROID__
+#include <android/api-level.h>
+#endif
+
+#include "WelsThreadLib.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+
+WELS_THREAD_ERROR_CODE    WelsMutexInit (WELS_MUTEX*    mutex) {
+  InitializeCriticalSection (mutex);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexLock (WELS_MUTEX*    mutex) {
+  EnterCriticalSection (mutex);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexUnlock (WELS_MUTEX* mutex) {
+  LeaveCriticalSection (mutex);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexDestroy (WELS_MUTEX* mutex) {
+  DeleteCriticalSection (mutex);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+#else /* _WIN32 */
+
+WELS_THREAD_ERROR_CODE    WelsMutexInit (WELS_MUTEX*    mutex) {
+  return pthread_mutex_init (mutex, NULL);
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexLock (WELS_MUTEX*    mutex) {
+  return pthread_mutex_lock (mutex);
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexUnlock (WELS_MUTEX* mutex) {
+  return pthread_mutex_unlock (mutex);
+}
+
+WELS_THREAD_ERROR_CODE    WelsMutexDestroy (WELS_MUTEX* mutex) {
+  return pthread_mutex_destroy (mutex);
+}
+
+#endif /* !_WIN32 */
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+
+WELS_THREAD_ERROR_CODE    WelsEventOpen (WELS_EVENT* event, const char* event_name) {
+  WELS_EVENT   h = CreateEvent (NULL, FALSE, FALSE, NULL);
+  *event = h;
+  if (h == NULL) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE    WelsEventSignal (WELS_EVENT* event, WELS_MUTEX *pMutex, int* iCondition) {
+  (*iCondition) --;
+  if ((*iCondition) <= 0) {
+    if (SetEvent (*event)) {
+      return WELS_THREAD_ERROR_OK;
+    }
+  }
+  return WELS_THREAD_ERROR_GENERAL;
+}
+
+WELS_THREAD_ERROR_CODE    WelsEventWait (WELS_EVENT* event, WELS_MUTEX* pMutex, int& iCondition) {
+  return WaitForSingleObject (*event, INFINITE);
+}
+
+WELS_THREAD_ERROR_CODE    WelsEventWaitWithTimeOut (WELS_EVENT* event, uint32_t dwMilliseconds, WELS_MUTEX* pMutex) {
+  return WaitForSingleObject (*event, dwMilliseconds);
+}
+
+WELS_THREAD_ERROR_CODE    WelsMultipleEventsWaitSingleBlocking (uint32_t nCount,
+    WELS_EVENT* event_list, WELS_EVENT* master_even, WELS_MUTEX* pMutext) {
+  // Don't need/use the master event for anything, since windows has got WaitForMultipleObjects
+  return WaitForMultipleObjects (nCount, event_list, FALSE, INFINITE);
+}
+
+WELS_THREAD_ERROR_CODE    WelsEventClose (WELS_EVENT* event, const char* event_name) {
+  CloseHandle (*event);
+
+  *event = NULL;
+  return WELS_THREAD_ERROR_OK;
+}
+
+#ifndef WP80
+void WelsSleep (uint32_t dwMilliSecond) {
+  ::Sleep (dwMilliSecond);
+}
+#else
+void WelsSleep (uint32_t dwMilliSecond) {
+  static WELS_EVENT hSleepEvent = NULL;
+  if (!hSleepEvent) {
+    WELS_EVENT hLocalSleepEvent = NULL;
+    WELS_THREAD_ERROR_CODE ret = WelsEventOpen (&hLocalSleepEvent);
+    if (WELS_THREAD_ERROR_OK != ret) {
+      return;
+    }
+    WELS_EVENT hPreviousEvent = InterlockedCompareExchangePointerRelease (&hSleepEvent, hLocalSleepEvent, NULL);
+    if (hPreviousEvent) {
+      WelsEventClose (&hLocalSleepEvent);
+    }
+    //On this singleton usage idea of using InterlockedCompareExchangePointerRelease:
+    //   similar idea of can be found at msdn blog when introducing InterlockedCompareExchangePointerRelease
+  }
+
+  WaitForSingleObject (hSleepEvent, dwMilliSecond);
+}
+#endif
+
+WELS_THREAD_ERROR_CODE    WelsThreadCreate (WELS_THREAD_HANDLE* thread,  LPWELS_THREAD_ROUTINE  routine,
+    void* arg, WELS_THREAD_ATTR attr) {
+  WELS_THREAD_HANDLE   h = CreateThread (NULL, 0, routine, arg, 0, NULL);
+
+  if (h == NULL) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+  * thread = h;
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE WelsThreadSetName (const char* thread_name) {
+  // do nothing
+  return WELS_THREAD_ERROR_OK;
+}
+
+
+WELS_THREAD_ERROR_CODE    WelsThreadJoin (WELS_THREAD_HANDLE  thread) {
+  WaitForSingleObject (thread, INFINITE);
+  CloseHandle (thread);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+
+WELS_THREAD_HANDLE        WelsThreadSelf() {
+  return GetCurrentThread();
+}
+
+WELS_THREAD_ERROR_CODE    WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* pInfo) {
+  SYSTEM_INFO  si;
+
+  GetSystemInfo (&si);
+
+  pInfo->ProcessorCount = si.dwNumberOfProcessors;
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+#else //platform: #ifdef _WIN32
+
+WELS_THREAD_ERROR_CODE    WelsThreadCreate (WELS_THREAD_HANDLE* thread,  LPWELS_THREAD_ROUTINE  routine,
+    void* arg, WELS_THREAD_ATTR attr) {
+  WELS_THREAD_ERROR_CODE err = 0;
+
+  pthread_attr_t at;
+  err = pthread_attr_init (&at);
+  if (err)
+    return err;
+#if !defined(__ANDROID__) && !defined(__Fuchsia__)
+  err = pthread_attr_setscope (&at, PTHREAD_SCOPE_SYSTEM);
+  if (err)
+    return err;
+  err = pthread_attr_setschedpolicy (&at, SCHED_FIFO);
+  if (err)
+    return err;
+#endif
+  err = pthread_create (thread, &at, routine, arg);
+
+  pthread_attr_destroy (&at);
+
+  return err;
+}
+
+WELS_THREAD_ERROR_CODE WelsThreadSetName (const char* thread_name) {
+#ifdef APPLE_IOS
+  pthread_setname_np (thread_name);
+#endif
+#if defined(__ANDROID__) && __ANDROID_API__ >= 9
+  pthread_setname_np (pthread_self(), thread_name);
+#endif
+  // do nothing
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE    WelsThreadJoin (WELS_THREAD_HANDLE  thread) {
+  return pthread_join (thread, NULL);
+}
+
+WELS_THREAD_HANDLE        WelsThreadSelf() {
+  return pthread_self();
+}
+
+// unnamed semaphores aren't supported on OS X
+
+WELS_THREAD_ERROR_CODE    WelsEventOpen (WELS_EVENT* p_event, const char* event_name) {
+#ifdef __APPLE__
+  WELS_THREAD_ERROR_CODE err= pthread_cond_init (p_event, NULL);
+  return err;
+#else
+  WELS_EVENT event = (WELS_EVENT) malloc (sizeof (*event));
+  if (event == NULL){
+    *p_event = NULL;
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+  WELS_THREAD_ERROR_CODE err = sem_init (event, 0, 0);
+  if (!err) {
+    *p_event = event;
+    return err;
+  }
+  free (event);
+  *p_event = NULL;
+  return err;
+#endif
+}
+WELS_THREAD_ERROR_CODE    WelsEventClose (WELS_EVENT* event, const char* event_name) {
+  //printf("event_close:%x, %s\n", event, event_name);
+#ifdef __APPLE__
+  WELS_THREAD_ERROR_CODE err = pthread_cond_destroy (event);
+  return err;
+#else
+  WELS_THREAD_ERROR_CODE err = sem_destroy (*event); // match with sem_init
+  free (*event);
+  *event = NULL;
+  return err;
+#endif
+}
+
+void WelsSleep (uint32_t dwMilliSecond) {
+  usleep (dwMilliSecond * 1000);
+}
+
+WELS_THREAD_ERROR_CODE   WelsEventSignal (WELS_EVENT* event, WELS_MUTEX *pMutex, int* iCondition) {
+  WELS_THREAD_ERROR_CODE err = 0;
+  //fprintf( stderr, "before signal it, event=%x iCondition= %d..\n", event, *iCondition );
+#ifdef __APPLE__
+  WelsMutexLock (pMutex);
+  (*iCondition) --;
+  WelsMutexUnlock (pMutex);
+  if ((*iCondition) <= 0) {
+  err = pthread_cond_signal (event);
+  //fprintf( stderr, "signal it, event=%x iCondition= %d..\n",event, *iCondition );
+
+  }
+#else
+    (*iCondition) --;
+    if ((*iCondition) <= 0) {
+//  int32_t val = 0;
+//  sem_getvalue(event, &val);
+//  fprintf( stderr, "before signal it, val= %d..\n",val );
+  if (event != NULL)
+    err = sem_post (*event);
+//  sem_getvalue(event, &val);
+    //fprintf( stderr, "signal it, event=%x iCondition= %d..\n",event, *iCondition );
+    }
+#endif
+  //fprintf( stderr, "after signal it, event=%x  iCondition= %d..\n",event, *iCondition );
+  return err;
+}
+
+WELS_THREAD_ERROR_CODE WelsEventWait (WELS_EVENT* event, WELS_MUTEX* pMutex, int& iCondition) {
+#ifdef __APPLE__
+  int err = 0;
+  WelsMutexLock(pMutex);
+  //fprintf( stderr, "WelsEventWait event %x %d..\n", event, iCondition );
+  while (iCondition>0) {
+    err = pthread_cond_wait (event, pMutex);
+  }
+  WelsMutexUnlock(pMutex);
+  return err;
+#else
+  return sem_wait (*event); // blocking until signaled
+#endif
+}
+
+WELS_THREAD_ERROR_CODE    WelsEventWaitWithTimeOut (WELS_EVENT* event, uint32_t dwMilliseconds, WELS_MUTEX* pMutex) {
+
+  if (dwMilliseconds != (uint32_t) - 1) {
+#if defined(__APPLE__)
+    return pthread_cond_wait (event, pMutex);
+#else
+    return sem_wait (*event);
+#endif
+  } else {
+    struct timespec ts;
+    struct timeval tv;
+
+    gettimeofday (&tv, 0);
+
+    ts.tv_nsec = tv.tv_usec * 1000 + dwMilliseconds * 1000000;
+    ts.tv_sec = tv.tv_sec + ts.tv_nsec / 1000000000;
+    ts.tv_nsec %= 1000000000;
+
+#if defined(__APPLE__)
+    return pthread_cond_timedwait (event, pMutex, &ts);
+#else
+    return sem_timedwait (*event, &ts);
+#endif
+  }
+
+}
+
+WELS_THREAD_ERROR_CODE    WelsMultipleEventsWaitSingleBlocking (uint32_t nCount,
+    WELS_EVENT* event_list, WELS_EVENT* master_event, WELS_MUTEX* pMutex) {
+  uint32_t nIdx = 0;
+  uint32_t uiAccessTime = 2; // 2 us once
+
+  if (nCount == 0)
+    return WELS_THREAD_ERROR_WAIT_FAILED;
+#if defined(__APPLE__)
+  if (master_event != NULL) {
+    // This design relies on the events actually being semaphores;
+    // if multiple events in the list have been signalled, the master
+    // event should have a similar count (events in windows can't keep
+    // track of the actual count, but the master event isn't needed there
+    // since it uses WaitForMultipleObjects).
+    int32_t err = pthread_cond_wait (master_event, pMutex);
+    if (err != WELS_THREAD_ERROR_OK)
+      return err;
+    uiAccessTime = 0; // no blocking, just quickly loop through all to find the one that was signalled
+  }
+
+  while (1) {
+    nIdx = 0; // access each event by order
+    while (nIdx < nCount) {
+      int32_t err = 0;
+      int32_t wait_count = 0;
+
+      /*
+       * although such interface is not used in __GNUC__ like platform, to use
+       * pthread_cond_timedwait() might be better choice if need
+       */
+      do {
+        err = pthread_cond_wait (&event_list[nIdx], pMutex);
+        if (WELS_THREAD_ERROR_OK == err)
+          return WELS_THREAD_ERROR_WAIT_OBJECT_0 + nIdx;
+        else if (wait_count > 0 || uiAccessTime == 0)
+          break;
+        usleep (uiAccessTime);
+        ++ wait_count;
+      } while (1);
+      // we do need access next event next time
+      ++ nIdx;
+    }
+    usleep (1); // switch to working threads
+    if (master_event != NULL) {
+      // A master event was used and was signalled, but none of the events in the
+      // list was found to be signalled, thus wait a little more when rechecking
+      // the list to avoid busylooping here.
+      // If we ever hit this codepath it's mostly a bug in the code that signals
+      // the events.
+      uiAccessTime = 2;
+    }
+  }
+#else
+  if (master_event != NULL) {
+    // This design relies on the events actually being semaphores;
+    // if multiple events in the list have been signalled, the master
+    // event should have a similar count (events in windows can't keep
+    // track of the actual count, but the master event isn't needed there
+    // since it uses WaitForMultipleObjects).
+    int32_t err = sem_wait (*master_event);
+    if (err != WELS_THREAD_ERROR_OK)
+      return err;
+    uiAccessTime = 0; // no blocking, just quickly loop through all to find the one that was signalled
+  }
+
+  while (1) {
+    nIdx = 0; // access each event by order
+    while (nIdx < nCount) {
+      int32_t err = 0;
+      int32_t wait_count = 0;
+
+      /*
+       * although such interface is not used in __GNUC__ like platform, to use
+       * pthread_cond_timedwait() might be better choice if need
+       */
+      do {
+        err = sem_trywait (event_list[nIdx]);
+        if (WELS_THREAD_ERROR_OK == err)
+          return WELS_THREAD_ERROR_WAIT_OBJECT_0 + nIdx;
+        else if (wait_count > 0 || uiAccessTime == 0)
+          break;
+        usleep (uiAccessTime);
+        ++ wait_count;
+      } while (1);
+      // we do need access next event next time
+      ++ nIdx;
+    }
+    usleep (1); // switch to working threads
+    if (master_event != NULL) {
+      // A master event was used and was signalled, but none of the events in the
+      // list was found to be signalled, thus wait a little more when rechecking
+      // the list to avoid busylooping here.
+      // If we ever hit this codepath it's mostly a bug in the code that signals
+      // the events.
+      uiAccessTime = 2;
+    }
+  }
+
+#endif
+  return WELS_THREAD_ERROR_WAIT_FAILED;
+}
+
+WELS_THREAD_ERROR_CODE    WelsQueryLogicalProcessInfo (WelsLogicalProcessInfo* pInfo) {
+#ifdef ANDROID_NDK
+  pInfo->ProcessorCount = android_getCpuCount();
+  return WELS_THREAD_ERROR_OK;
+#elif defined(__linux__)
+
+  cpu_set_t cpuset;
+
+  CPU_ZERO (&cpuset);
+
+  if (!sched_getaffinity (0, sizeof (cpuset), &cpuset)) {
+#ifdef CPU_COUNT
+    pInfo->ProcessorCount = CPU_COUNT (&cpuset);
+#else
+    int32_t count = 0;
+    for (int i = 0; i < CPU_SETSIZE; i++) {
+      if (CPU_ISSET (i, &cpuset)) {
+        count++;
+      }
+    }
+    pInfo->ProcessorCount = count;
+#endif
+  } else {
+    pInfo->ProcessorCount = 1;
+  }
+
+  return WELS_THREAD_ERROR_OK;
+
+#elif defined(__EMSCRIPTEN__)
+
+  // There is not yet a way to determine CPU count in emscripten JS environment.
+  pInfo->ProcessorCount = 1;
+  return WELS_THREAD_ERROR_OK;
+
+#elif defined(__Fuchsia__)
+
+  pInfo->ProcessorCount = sysconf(_SC_NPROCESSORS_ONLN);
+  return WELS_THREAD_ERROR_OK;
+#else
+
+  size_t len = sizeof (pInfo->ProcessorCount);
+
+#if defined(__OpenBSD__)
+  int scname[] = { CTL_HW, HW_NCPU };
+  if (sysctl (scname, 2, &pInfo->ProcessorCount, &len, NULL, 0) == -1)
+#else
+  if (sysctlbyname (HW_NCPU_NAME, &pInfo->ProcessorCount, &len, NULL, 0) == -1)
+#endif
+    pInfo->ProcessorCount = 1;
+
+  return WELS_THREAD_ERROR_OK;
+
+#endif//__linux__
+}
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadPool.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadPool.cpp
new file mode 100644
index 0000000000..302643cc89
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/WelsThreadPool.cpp
@@ -0,0 +1,380 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    WelsThreadPool.cpp
+ *
+ * \brief   functions for Thread Pool
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+#include "typedefs.h"
+#include "memory_align.h"
+#include "WelsThreadPool.h"
+
+namespace WelsCommon {
+
+namespace {
+
+CWelsLock& GetInitLock() {
+  static CWelsLock *initLock = new CWelsLock;
+  return *initLock;
+}
+
+}
+
+int32_t CWelsThreadPool::m_iRefCount = 0;
+int32_t CWelsThreadPool::m_iMaxThreadNum = DEFAULT_THREAD_NUM;
+CWelsThreadPool* CWelsThreadPool::m_pThreadPoolSelf = NULL;
+
+CWelsThreadPool::CWelsThreadPool() :
+  m_cWaitedTasks (NULL), m_cIdleThreads (NULL), m_cBusyThreads (NULL) {
+}
+
+
+CWelsThreadPool::~CWelsThreadPool() {
+  //fprintf(stdout, "CWelsThreadPool::~CWelsThreadPool: delete %x, %x, %x\n", m_cWaitedTasks, m_cIdleThreads, m_cBusyThreads);
+  if (0 != m_iRefCount) {
+    m_iRefCount = 0;
+    Uninit();
+  }
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::SetThreadNum (int32_t iMaxThreadNum) {
+  CWelsAutoLock  cLock (GetInitLock());
+
+  if (m_iRefCount != 0) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+
+  if (iMaxThreadNum <= 0) {
+    iMaxThreadNum = 1;
+  }
+  m_iMaxThreadNum = iMaxThreadNum;
+  return WELS_THREAD_ERROR_OK;
+}
+
+
+CWelsThreadPool* CWelsThreadPool::AddReference() {
+  CWelsAutoLock  cLock (GetInitLock());
+  if (m_pThreadPoolSelf == NULL) {
+    m_pThreadPoolSelf = new CWelsThreadPool();
+    if (!m_pThreadPoolSelf) {
+      return NULL;
+    }
+  }
+
+  if (m_iRefCount == 0) {
+    if (WELS_THREAD_ERROR_OK != m_pThreadPoolSelf->Init()) {
+      m_pThreadPoolSelf->Uninit();
+      delete m_pThreadPoolSelf;
+      m_pThreadPoolSelf = NULL;
+      return NULL;
+    }
+  }
+
+  ////fprintf(stdout, "m_iRefCount=%d, iMaxThreadNum=%d\n", m_iRefCount, m_iMaxThreadNum);
+
+  ++ m_iRefCount;
+  //fprintf(stdout, "m_iRefCount2=%d\n", m_iRefCount);
+  return m_pThreadPoolSelf;
+}
+
+void CWelsThreadPool::RemoveInstance() {
+  CWelsAutoLock  cLock (GetInitLock());
+  //fprintf(stdout, "m_iRefCount=%d\n", m_iRefCount);
+  -- m_iRefCount;
+  if (0 == m_iRefCount) {
+    StopAllRunning();
+    Uninit();
+    if (m_pThreadPoolSelf) {
+      delete m_pThreadPoolSelf;
+      m_pThreadPoolSelf = NULL;
+    }
+    //fprintf(stdout, "m_iRefCount=%d, IdleThreadNum=%d, BusyThreadNum=%d, WaitedTask=%d\n", m_iRefCount, GetIdleThreadNum(), GetBusyThreadNum(), GetWaitedTaskNum());
+  }
+}
+
+
+bool CWelsThreadPool::IsReferenced() {
+  CWelsAutoLock  cLock (GetInitLock());
+  return (m_iRefCount > 0);
+}
+
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::OnTaskStart (CWelsTaskThread* pThread, IWelsTask* pTask) {
+  AddThreadToBusyList (pThread);
+  //fprintf(stdout, "CWelsThreadPool::AddThreadToBusyList: Task %x at Thread %x\n", pTask, pThread);
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::OnTaskStop (CWelsTaskThread* pThread, IWelsTask* pTask) {
+  //fprintf(stdout, "CWelsThreadPool::OnTaskStop 0: Task %x at Thread %x Finished\n", pTask, pThread);
+
+  RemoveThreadFromBusyList (pThread);
+  AddThreadToIdleQueue (pThread);
+
+  if (pTask && pTask->GetSink()) {
+    //fprintf(stdout, "CWelsThreadPool::OnTaskStop 1: Task %x at Thread %x Finished, m_pSink=%x\n", pTask, pThread, pTask->GetSink());
+    pTask->GetSink()->OnTaskExecuted();
+    ////fprintf(stdout, "CWelsThreadPool::OnTaskStop 1: Task %x at Thread %x Finished, m_pSink=%x\n", pTask, pThread, pTask->GetSink());
+  }
+  //if (m_pSink) {
+  //  m_pSink->OnTaskExecuted (pTask);
+  //}
+  //fprintf(stdout, "CWelsThreadPool::OnTaskStop 2: Task %x at Thread %x Finished\n", pTask, pThread);
+
+  SignalThread();
+
+  //fprintf(stdout, "ThreadPool: Task %x at Thread %x Finished\n", pTask, pThread);
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::Init() {
+  //fprintf(stdout, "Enter WelsThreadPool Init\n");
+
+  CWelsAutoLock  cLock (m_cLockPool);
+
+  m_cWaitedTasks = new CWelsNonDuplicatedList<IWelsTask>();
+  m_cIdleThreads = new CWelsNonDuplicatedList<CWelsTaskThread>();
+  m_cBusyThreads = new CWelsList<CWelsTaskThread>();
+  if (NULL == m_cWaitedTasks || NULL == m_cIdleThreads || NULL == m_cBusyThreads) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+
+  for (int32_t i = 0; i < m_iMaxThreadNum; i++) {
+    if (WELS_THREAD_ERROR_OK != CreateIdleThread()) {
+      return WELS_THREAD_ERROR_GENERAL;
+    }
+  }
+
+  if (WELS_THREAD_ERROR_OK != Start()) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::StopAllRunning() {
+  WELS_THREAD_ERROR_CODE iReturn = WELS_THREAD_ERROR_OK;
+
+  ClearWaitedTasks();
+
+  while (GetBusyThreadNum() > 0) {
+    //WELS_INFO_TRACE ("CWelsThreadPool::Uninit - Waiting all thread to exit");
+    WelsSleep (10);
+  }
+
+  if (GetIdleThreadNum() != m_iMaxThreadNum) {
+    iReturn = WELS_THREAD_ERROR_GENERAL;
+  }
+
+  return iReturn;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::Uninit() {
+  WELS_THREAD_ERROR_CODE iReturn = WELS_THREAD_ERROR_OK;
+  CWelsAutoLock  cLock (m_cLockPool);
+
+  iReturn = StopAllRunning();
+  if (WELS_THREAD_ERROR_OK != iReturn) {
+    return iReturn;
+  }
+
+  m_cLockIdleTasks.Lock();
+  while (m_cIdleThreads->size() > 0) {
+    DestroyThread (m_cIdleThreads->begin());
+    m_cIdleThreads->pop_front();
+  }
+  m_cLockIdleTasks.Unlock();
+
+  Kill();
+
+  WELS_DELETE_OP (m_cWaitedTasks);
+  WELS_DELETE_OP (m_cIdleThreads);
+  WELS_DELETE_OP (m_cBusyThreads);
+
+  return iReturn;
+}
+
+void CWelsThreadPool::ExecuteTask() {
+  //fprintf(stdout, "ThreadPool: scheduled tasks: ExecuteTask\n");
+  CWelsTaskThread* pThread = NULL;
+  IWelsTask*    pTask = NULL;
+  while (GetWaitedTaskNum() > 0) {
+    //fprintf(stdout, "ThreadPool:  ExecuteTask: waiting task %d\n", GetWaitedTaskNum());
+    pThread = GetIdleThread();
+    if (pThread == NULL) {
+      //fprintf(stdout, "ThreadPool:  ExecuteTask: no IdleThread\n");
+
+      break;
+    }
+    pTask = GetWaitedTask();
+    //fprintf(stdout, "ThreadPool:  ExecuteTask = %x at thread %x\n", pTask, pThread);
+    if (pTask) {
+      pThread->SetTask (pTask);
+    } else {
+      AddThreadToIdleQueue (pThread);
+    }
+  }
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::QueueTask (IWelsTask* pTask) {
+  CWelsAutoLock  cLock (m_cLockPool);
+
+  //fprintf(stdout, "CWelsThreadPool::QueueTask: %d, pTask=%x\n", m_iRefCount, pTask);
+  if (GetWaitedTaskNum() == 0) {
+    CWelsTaskThread* pThread = GetIdleThread();
+
+    if (pThread != NULL) {
+      //fprintf(stdout, "ThreadPool:  ExecuteTask = %x at thread %x\n", pTask, pThread);
+      pThread->SetTask (pTask);
+
+      return WELS_THREAD_ERROR_OK;
+    }
+  }
+  //fprintf(stdout, "ThreadPool:  AddTaskToWaitedList: %x\n", pTask);
+  if (false == AddTaskToWaitedList (pTask)) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+
+  //fprintf(stdout, "ThreadPool:  SignalThread: %x\n", pTask);
+  SignalThread();
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::CreateIdleThread() {
+  CWelsTaskThread* pThread = new CWelsTaskThread (this);
+
+  if (NULL == pThread) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+
+  if (WELS_THREAD_ERROR_OK != pThread->Start()) {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+  //fprintf(stdout, "ThreadPool:  AddThreadToIdleQueue: %x\n", pThread);
+  AddThreadToIdleQueue (pThread);
+
+  return WELS_THREAD_ERROR_OK;
+}
+
+void  CWelsThreadPool::DestroyThread (CWelsTaskThread* pThread) {
+  pThread->Kill();
+  WELS_DELETE_OP (pThread);
+
+  return;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::AddThreadToIdleQueue (CWelsTaskThread* pThread) {
+  CWelsAutoLock cLock (m_cLockIdleTasks);
+  m_cIdleThreads->push_back (pThread);
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::AddThreadToBusyList (CWelsTaskThread* pThread) {
+  CWelsAutoLock cLock (m_cLockBusyTasks);
+  m_cBusyThreads->push_back (pThread);
+  return WELS_THREAD_ERROR_OK;
+}
+
+WELS_THREAD_ERROR_CODE CWelsThreadPool::RemoveThreadFromBusyList (CWelsTaskThread* pThread) {
+  CWelsAutoLock cLock (m_cLockBusyTasks);
+  if (m_cBusyThreads->erase (pThread)) {
+    return WELS_THREAD_ERROR_OK;
+  } else {
+    return WELS_THREAD_ERROR_GENERAL;
+  }
+}
+
+bool  CWelsThreadPool::AddTaskToWaitedList (IWelsTask* pTask) {
+  CWelsAutoLock  cLock (m_cLockWaitedTasks);
+
+  return m_cWaitedTasks->push_back (pTask);
+}
+
+CWelsTaskThread*   CWelsThreadPool::GetIdleThread() {
+  CWelsAutoLock cLock (m_cLockIdleTasks);
+
+  if (NULL == m_cIdleThreads || m_cIdleThreads->size() == 0) {
+    return NULL;
+  }
+
+  //fprintf(stdout, "CWelsThreadPool::GetIdleThread=%d\n", m_cIdleThreads->size());
+
+  CWelsTaskThread* pThread = m_cIdleThreads->begin();
+  m_cIdleThreads->pop_front();
+  return pThread;
+}
+
+int32_t  CWelsThreadPool::GetBusyThreadNum() {
+  return (m_cBusyThreads?m_cBusyThreads->size():0);
+}
+
+int32_t  CWelsThreadPool::GetIdleThreadNum() {
+  return (m_cIdleThreads?m_cIdleThreads->size():0);
+}
+
+int32_t  CWelsThreadPool::GetWaitedTaskNum() {
+  return (m_cWaitedTasks?m_cWaitedTasks->size():0);
+}
+
+IWelsTask* CWelsThreadPool::GetWaitedTask() {
+  CWelsAutoLock lock (m_cLockWaitedTasks);
+
+  if (NULL==m_cWaitedTasks || m_cWaitedTasks->size() == 0) {
+    return NULL;
+  }
+
+  IWelsTask* pTask = m_cWaitedTasks->begin();
+
+  m_cWaitedTasks->pop_front();
+
+  return pTask;
+}
+
+void  CWelsThreadPool::ClearWaitedTasks() {
+  CWelsAutoLock cLock (m_cLockWaitedTasks);
+  if (NULL == m_cWaitedTasks) {
+    return;
+  }
+  IWelsTask* pTask = NULL;
+  while (0 != m_cWaitedTasks->size()) {
+    pTask = m_cWaitedTasks->begin();
+    if (pTask->GetSink()) {
+      pTask->GetSink()->OnTaskCancelled();
+    }
+    m_cWaitedTasks->pop_front();
+  }
+}
+
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/common_tables.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/common_tables.cpp
new file mode 100644
index 0000000000..117b28d089
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/common_tables.cpp
@@ -0,0 +1,906 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "wels_common_defs.h"
+
+namespace WelsCommon {
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+//////pNonZeroCount[16+8] mapping scan index
+const uint8_t g_kuiMbCountScan4Idx[24] = {
+                   //  0   1 | 4  5      luma 8*8 block           pNonZeroCount[16+8]
+  0,  1,  4,  5,   //  2   3 | 6  7        0  |  1                  0   1   2   3
+  2,  3,  6,  7,   //---------------      ---------                 4   5   6   7
+  8,  9, 12, 13,   //  8   9 | 12 13       2  |  3                  8   9  10  11
+  10, 11, 14, 15,  // 10  11 | 14 15-----------------------------> 12  13  14  15
+  16, 17, 20, 21,  //----------------    chroma 8*8 block          16  17  18  19
+  18, 19, 22, 23   // 16  17 | 20 21        0    1                 20  21  22  23
+};
+
+const uint8_t g_kuiCache48CountScan4Idx[24] = {
+  /* Luma */
+  9, 10, 17, 18,        // 1+1*8, 2+1*8, 1+2*8, 2+2*8,
+  11, 12, 19, 20,       // 3+1*8, 4+1*8, 3+2*8, 4+2*8,
+  25, 26, 33, 34,       // 1+3*8, 2+3*8, 1+4*8, 2+4*8,
+  27, 28, 35, 36,       // 3+3*8, 4+3*8, 3+4*8, 4+4*8,
+  /* Cb */
+  14, 15,               // 6+1*8, 7+1*8,
+  22, 23,               // 6+2*8, 7+2*8,
+
+  /* Cr */
+  38, 39,               // 6+4*8, 7+4*8,
+  46, 47,               // 6+5*8, 7+5*8,
+};
+
+const uint8_t g_kuiMatrixV[6][8][8] = { // generated from equation 8-317, 8-318
+  {
+    {20, 19, 25, 19, 20, 19, 25, 19},
+    {19, 18, 24, 18, 19, 18, 24, 18},
+    {25, 24, 32, 24, 25, 24, 32, 24},
+    {19, 18, 24, 18, 19, 18, 24, 18},
+    {20, 19, 25, 19, 20, 19, 25, 19},
+    {19, 18, 24, 18, 19, 18, 24, 18},
+    {25, 24, 32, 24, 25, 24, 32, 24},
+    {19, 18, 24, 18, 19, 18, 24, 18}
+  },
+  {
+    {22, 21, 28, 21, 22, 21, 28, 21},
+    {21, 19, 26, 19, 21, 19, 26, 19},
+    {28, 26, 35, 26, 28, 26, 35, 26},
+    {21, 19, 26, 19, 21, 19, 26, 19},
+    {22, 21, 28, 21, 22, 21, 28, 21},
+    {21, 19, 26, 19, 21, 19, 26, 19},
+    {28, 26, 35, 26, 28, 26, 35, 26},
+    {21, 19, 26, 19, 21, 19, 26, 19}
+  },
+  {
+    {26, 24, 33, 24, 26, 24, 33, 24},
+    {24, 23, 31, 23, 24, 23, 31, 23},
+    {33, 31, 42, 31, 33, 31, 42, 31},
+    {24, 23, 31, 23, 24, 23, 31, 23},
+    {26, 24, 33, 24, 26, 24, 33, 24},
+    {24, 23, 31, 23, 24, 23, 31, 23},
+    {33, 31, 42, 31, 33, 31, 42, 31},
+    {24, 23, 31, 23, 24, 23, 31, 23}
+  },
+  {
+    {28, 26, 35, 26, 28, 26, 35, 26},
+    {26, 25, 33, 25, 26, 25, 33, 25},
+    {35, 33, 45, 33, 35, 33, 45, 33},
+    {26, 25, 33, 25, 26, 25, 33, 25},
+    {28, 26, 35, 26, 28, 26, 35, 26},
+    {26, 25, 33, 25, 26, 25, 33, 25},
+    {35, 33, 45, 33, 35, 33, 45, 33},
+    {26, 25, 33, 25, 26, 25, 33, 25}
+  },
+  {
+    {32, 30, 40, 30, 32, 30, 40, 30},
+    {30, 28, 38, 28, 30, 28, 38, 28},
+    {40, 38, 51, 38, 40, 38, 51, 38},
+    {30, 28, 38, 28, 30, 28, 38, 28},
+    {32, 30, 40, 30, 32, 30, 40, 30},
+    {30, 28, 38, 28, 30, 28, 38, 28},
+    {40, 38, 51, 38, 40, 38, 51, 38},
+    {30, 28, 38, 28, 30, 28, 38, 28}
+  },
+  {
+    {36, 34, 46, 34, 36, 34, 46, 34},
+    {34, 32, 43, 32, 34, 32, 43, 32},
+    {46, 43, 58, 43, 46, 43, 58, 43},
+    {34, 32, 43, 32, 34, 32, 43, 32},
+    {36, 34, 46, 34, 36, 34, 46, 34},
+    {34, 32, 43, 32, 34, 32, 43, 32},
+    {46, 43, 58, 43, 46, 43, 58, 43},
+    {34, 32, 43, 32, 34, 32, 43, 32}
+  }
+};
+
+//cache element equal to 30
+const uint8_t g_kuiCache30ScanIdx[16] = { //mv or uiRefIndex cache scan index, 4*4 block as basic unit
+  7,  8, 13, 14,
+  9, 10, 15, 16,
+  19, 20, 25, 26,
+  21, 22, 27, 28
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+// extern at wels_common_defs.h
+const uint8_t g_kuiChromaQpTable[52] = {
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
+  12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+  28, 29, 29, 30, 31, 32, 32, 33, 34, 34, 35, 35, 36, 36, 37, 37,
+  37, 38, 38, 38, 39, 39, 39, 39
+};
+
+/*
+ *  vcl type map for given NAL unit type and corresponding H264 type (0: AVC; 1: SVC).
+ */
+const EVclType g_keTypeMap[32][2] = {
+  { NON_VCL,    NON_VCL },      // 0: NAL_UNIT_UNSPEC_0
+  { VCL,        VCL,    },      // 1: NAL_UNIT_CODED_SLICE
+  { VCL,        NOT_APP },      // 2: NAL_UNIT_CODED_SLICE_DPA
+  { VCL,        NOT_APP },      // 3: NAL_UNIT_CODED_SLICE_DPB
+  { VCL,        NOT_APP },      // 4: NAL_UNIT_CODED_SLICE_DPC
+  { VCL,        VCL     },      // 5: NAL_UNIT_CODED_SLICE_IDR
+  { NON_VCL,    NON_VCL },      // 6: NAL_UNIT_SEI
+  { NON_VCL,    NON_VCL },      // 7: NAL_UNIT_SPS
+  { NON_VCL,    NON_VCL },      // 8: NAL_UNIT_PPS
+  { NON_VCL,    NON_VCL },      // 9: NAL_UNIT_AU_DELIMITER
+  { NON_VCL,    NON_VCL },      // 10: NAL_UNIT_END_OF_SEQ
+  { NON_VCL,    NON_VCL },      // 11: NAL_UNIT_END_OF_STR
+  { NON_VCL,    NON_VCL },      // 12: NAL_UNIT_FILLER_DATA
+  { NON_VCL,    NON_VCL },      // 13: NAL_UNIT_SPS_EXT
+  { NON_VCL,    NON_VCL },      // 14: NAL_UNIT_PREFIX, NEED associate succeeded NAL to make a VCL
+  { NON_VCL,    NON_VCL },      // 15: NAL_UNIT_SUBSET_SPS
+  { NON_VCL,    NON_VCL },      // 16: NAL_UNIT_DEPTH_PARAM
+  { NON_VCL,    NON_VCL },      // 17: NAL_UNIT_RESV_17
+  { NON_VCL,    NON_VCL },      // 18: NAL_UNIT_RESV_18
+  { NON_VCL,    NON_VCL },      // 19: NAL_UNIT_AUX_CODED_SLICE
+  { NON_VCL,    VCL     },      // 20: NAL_UNIT_CODED_SLICE_EXT
+  { NON_VCL,    NON_VCL },      // 21: NAL_UNIT_MVC_SLICE_EXT
+  { NON_VCL,    NON_VCL },      // 22: NAL_UNIT_RESV_22
+  { NON_VCL,    NON_VCL },      // 23: NAL_UNIT_RESV_23
+  { NON_VCL,    NON_VCL },      // 24: NAL_UNIT_UNSPEC_24
+  { NON_VCL,    NON_VCL },      // 25: NAL_UNIT_UNSPEC_25
+  { NON_VCL,    NON_VCL },      // 26: NAL_UNIT_UNSPEC_26
+  { NON_VCL,    NON_VCL },      // 27: NAL_UNIT_UNSPEC_27
+  { NON_VCL,    NON_VCL },      // 28: NAL_UNIT_UNSPEC_28
+  { NON_VCL,    NON_VCL },      // 29: NAL_UNIT_UNSPEC_29
+  { NON_VCL,    NON_VCL },      // 30: NAL_UNIT_UNSPEC_30
+  { NON_VCL,    NON_VCL }       // 31: NAL_UNIT_UNSPEC_31
+};
+//default scaling list matrix value of 4x4
+const uint8_t g_kuiDequantScaling4x4Default[2][16]={
+  {  6, 13, 20, 28, 13, 20, 28, 32, 20, 28, 32, 37, 28, 32, 37, 42 },
+  { 10, 14, 20, 24, 14, 20, 24, 27, 20, 24, 27, 30, 24, 27, 30, 34 }
+};
+//default scaling list matrix value of 8x8
+const uint8_t g_kuiDequantScaling8x8Default[2][64]={
+  {  6, 10, 13, 16, 18, 23, 25, 27, 10, 11, 16, 18, 23, 25, 27, 29,
+      13, 16, 18, 23, 25, 27, 29, 31,
+      16, 18, 23, 25, 27, 29, 31, 33,
+      18, 23, 25, 27, 29, 31, 33, 36,
+      23, 25, 27, 29, 31, 33, 36, 38,
+      25, 27, 29, 31, 33, 36, 38, 40,
+      27, 29, 31, 33, 36, 38, 40, 42 },
+    {  9, 13, 15, 17, 19, 21, 22, 24,
+      13, 13, 17, 19, 21, 22, 24, 25,
+      15, 17, 19, 21, 22, 24, 25, 27,
+      17, 19, 21, 22, 24, 25, 27, 28,
+      19, 21, 22, 24, 25, 27, 28, 30,
+      21, 22, 24, 25, 27, 28, 30, 32,
+      22, 24, 25, 27, 28, 30, 32, 33,
+      24, 25, 27, 28, 30, 32, 33, 35 }
+};
+ALIGNED_DECLARE (const uint16_t, g_kuiDequantCoeff[52][8], 16) = {
+  /* 0*/{   10,   13,   10,   13,   13,   16,   13,   16 },     /* 1*/{   11,   14,   11,   14,   14,   18,   14,   18 },
+  /* 2*/{   13,   16,   13,   16,   16,   20,   16,   20 },     /* 3*/{   14,   18,   14,   18,   18,   23,   18,   23 },
+  /* 4*/{   16,   20,   16,   20,   20,   25,   20,   25 },     /* 5*/{   18,   23,   18,   23,   23,   29,   23,   29 },
+  /* 6*/{   20,   26,   20,   26,   26,   32,   26,   32 },     /* 7*/{   22,   28,   22,   28,   28,   36,   28,   36 },
+  /* 8*/{   26,   32,   26,   32,   32,   40,   32,   40 },     /* 9*/{   28,   36,   28,   36,   36,   46,   36,   46 },
+  /*10*/{   32,   40,   32,   40,   40,   50,   40,   50 },     /*11*/{   36,   46,   36,   46,   46,   58,   46,   58 },
+  /*12*/{   40,   52,   40,   52,   52,   64,   52,   64 },     /*13*/{   44,   56,   44,   56,   56,   72,   56,   72 },
+  /*14*/{   52,   64,   52,   64,   64,   80,   64,   80 },     /*15*/{   56,   72,   56,   72,   72,   92,   72,   92 },
+  /*16*/{   64,   80,   64,   80,   80,  100,   80,  100 },     /*17*/{   72,   92,   72,   92,   92,  116,   92,  116 },
+  /*18*/{   80,  104,   80,  104,  104,  128,  104,  128 },     /*19*/{   88,  112,   88,  112,  112,  144,  112,  144 },
+  /*20*/{  104,  128,  104,  128,  128,  160,  128,  160 },     /*21*/{  112,  144,  112,  144,  144,  184,  144,  184 },
+  /*22*/{  128,  160,  128,  160,  160,  200,  160,  200 },     /*23*/{  144,  184,  144,  184,  184,  232,  184,  232 },
+  /*24*/{  160,  208,  160,  208,  208,  256,  208,  256 },     /*25*/{  176,  224,  176,  224,  224,  288,  224,  288 },
+  /*26*/{  208,  256,  208,  256,  256,  320,  256,  320 },     /*27*/{  224,  288,  224,  288,  288,  368,  288,  368 },
+  /*28*/{  256,  320,  256,  320,  320,  400,  320,  400 },     /*29*/{  288,  368,  288,  368,  368,  464,  368,  464 },
+  /*30*/{  320,  416,  320,  416,  416,  512,  416,  512 },     /*31*/{  352,  448,  352,  448,  448,  576,  448,  576 },
+  /*32*/{  416,  512,  416,  512,  512,  640,  512,  640 },     /*33*/{  448,  576,  448,  576,  576,  736,  576,  736 },
+  /*34*/{  512,  640,  512,  640,  640,  800,  640,  800 },     /*35*/{  576,  736,  576,  736,  736,  928,  736,  928 },
+  /*36*/{  640,  832,  640,  832,  832, 1024,  832, 1024 },     /*37*/{  704,  896,  704,  896,  896, 1152,  896, 1152 },
+  /*38*/{  832, 1024,  832, 1024, 1024, 1280, 1024, 1280 },     /*39*/{  896, 1152,  896, 1152, 1152, 1472, 1152, 1472 },
+  /*40*/{ 1024, 1280, 1024, 1280, 1280, 1600, 1280, 1600 },     /*41*/{ 1152, 1472, 1152, 1472, 1472, 1856, 1472, 1856 },
+  /*42*/{ 1280, 1664, 1280, 1664, 1664, 2048, 1664, 2048 },     /*43*/{ 1408, 1792, 1408, 1792, 1792, 2304, 1792, 2304 },
+  /*44*/{ 1664, 2048, 1664, 2048, 2048, 2560, 2048, 2560 },     /*45*/{ 1792, 2304, 1792, 2304, 2304, 2944, 2304, 2944 },
+  /*46*/{ 2048, 2560, 2048, 2560, 2560, 3200, 2560, 3200 },     /*47*/{ 2304, 2944, 2304, 2944, 2944, 3712, 2944, 3712 },
+  /*48*/{ 2560, 3328, 2560, 3328, 3328, 4096, 3328, 4096 },     /*49*/{ 2816, 3584, 2816, 3584, 3584, 4608, 3584, 4608 },
+  /*50*/{ 3328, 4096, 3328, 4096, 4096, 5120, 4096, 5120 },     /*51*/{ 3584, 4608, 3584, 4608, 4608, 5888, 4608, 5888 },
+};
+
+ALIGNED_DECLARE (const uint16_t, g_kuiDequantCoeff8x8[52][64], 16) = {
+/* QP ==  0 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP ==  1 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP ==  2 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP ==  3 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP ==  4 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP ==  5 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP ==  6 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP ==  7 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP ==  8 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP ==  9 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 10 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 11 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 12 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 13 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 14 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 15 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 16 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 17 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 18 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 19 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 20 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 21 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 22 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 23 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 24 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 25 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 26 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 27 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 28 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 29 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 30 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 31 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 32 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 33 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 34 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 35 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 36 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 37 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 38 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 39 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 40 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 41 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 42 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 43 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 44 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 45 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+/* QP == 46 */
+{ 512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448,  512,  480,  640,  480,  512,  480,  640,  480,  480,  448,  608,  448,  480,  448,  608,  448,  640,  608,  816,  608,  640,  608,  816,  608,  480,  448,  608,  448,  480,  448,  608,  448 },
+/* QP == 47 */
+{ 576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512,  576,  544,  736,  544,  576,  544,  736,  544,  544,  512,  688,  512,  544,  512,  688,  512,  736,  688,  928,  688,  736,  688,  928,  688,  544,  512,  688,  512,  544,  512,  688,  512 },
+/* QP == 48 */
+{ 320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288,  320,  304,  400,  304,  320,  304,  400,  304,  304,  288,  384,  288,  304,  288,  384,  288,  400,  384,  512,  384,  400,  384,  512,  384,  304,  288,  384,  288,  304,  288,  384,  288 },
+/* QP == 49 */
+{ 352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304,  352,  336,  448,  336,  352,  336,  448,  336,  336,  304,  416,  304,  336,  304,  416,  304,  448,  416,  560,  416,  448,  416,  560,  416,  336,  304,  416,  304,  336,  304,  416,  304 },
+/* QP == 50 */
+{ 416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368,  416,  384,  528,  384,  416,  384,  528,  384,  384,  368,  496,  368,  384,  368,  496,  368,  528,  496,  672,  496,  528,  496,  672,  496,  384,  368,  496,  368,  384,  368,  496,  368 },
+/* QP == 51 */
+{ 448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400,  448,  416,  560,  416,  448,  416,  560,  416,  416,  400,  528,  400,  416,  400,  528,  400,  560,  528,  720,  528,  560,  528,  720,  528,  416,  400,  528,  400,  416,  400,  528,  400 },
+};
+
+// table A-1 - Level limits
+const SLevelLimits g_ksLevelLimits[LEVEL_NUMBER] = {
+  {LEVEL_1_0, 1485, 99, 396, 64, 175, -256, 255, 2, 0x7fff}, /* level 1 */
+  {LEVEL_1_B, 1485, 99, 396, 128, 350, -256, 255, 2, 0x7fff}, /* level 1.b */
+  {LEVEL_1_1, 3000, 396, 900, 192, 500, -512, 511, 2, 0x7fff}, /* level 1.1 */
+  {LEVEL_1_2, 6000, 396, 2376, 384, 1000, -512, 511, 2, 0x7fff}, /* level 1.2 */
+  {LEVEL_1_3, 11880, 396, 2376, 768, 2000, -512, 511, 2, 0x7fff}, /* level 1.3 */
+
+  {LEVEL_2_0, 11880, 396, 2376, 2000, 2000, -512, 511, 2, 0x7fff}, /* level 2 */
+  {LEVEL_2_1, 19800, 792, 4752, 4000, 4000, -1024, 1023, 2, 0x7fff}, /* level 2.1 */
+  {LEVEL_2_2, 20250, 1620, 8100, 4000, 4000, -1024, 1023, 2, 0x7fff}, /* level 2.2 */
+
+  {LEVEL_3_0, 40500, 1620, 8100, 10000, 10000, -1024, 1023, 2, 32 }, /* level 3 */
+  {LEVEL_3_1, 108000, 3600, 18000, 14000, 14000, -2048, 2047, 4, 16}, /* level 3.1 */
+  {LEVEL_3_2, 216000, 5120, 20480, 20000, 20000, -2048, 2047, 4, 16}, /* level 3.2 */
+
+  {LEVEL_4_0, 245760, 8192, 32768, 20000, 25000, -2048, 2047, 4, 16}, /* level 4 */
+  {LEVEL_4_1, 245760, 8192, 32768, 50000, 62500, -2048, 2047, 2, 16}, /* level 4.1 */
+  {LEVEL_4_2, 522240, 8704, 34816, 50000, 62500, -2048, 2047, 2, 16}, /* level 4.2 */
+
+  {LEVEL_5_0, 589824, 22080, 110400, 135000, 135000, -2048, 2047, 2, 16}, /* level 5 */
+  {LEVEL_5_1, 983040, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16}, /* level 5.1 */
+  {LEVEL_5_2, 2073600, 36864, 184320, 240000, 240000, -2048, 2047, 2, 16} /* level 5.2 */
+};
+const uint32_t g_kuiLevelMaps[LEVEL_NUMBER] = {
+  10, 9, 11, 12, 13, 20, 21, 22, 30, 31, 32, 40, 41, 42, 50, 51, 52
+};
+//for cabac
+/* this table is from Table9-12 to Table 9-24 */
+
+const int8_t g_kiCabacGlobalContextIdx[WELS_CONTEXT_COUNT][4][2] = {
+  //0-10 Table 9-12
+  {{20, -15}, {20, -15}, {20, -15}, {20, -15}},
+  {{2, 54}, {2, 54}, {2, 54}, {2, 54}},
+  {{3, 74}, {3, 74}, {3, 74}, {3, 74}},
+  {{20, -15}, {20, -15}, {20, -15}, {20, -15}},
+  {{2, 54}, {2, 54}, {2, 54}, {2, 54}},
+  {{3, 74}, {3, 74}, {3, 74}, {3, 74}},
+  {{ -28, 127}, { -28, 127}, { -28, 127}, { -28, 127}},
+  {{ -23, 104}, { -23, 104}, { -23, 104}, { -23, 104}},
+  {{ -6, 53}, { -6, 53}, { -6, 53}, { -6, 53}},
+  {{ -1, 54}, { -1, 54}, { -1, 54}, { -1, 54}},
+  {{7, 51}, {7, 51}, {7, 51}, {7, 51}},
+  //11-23 Table 9-13
+  {{CTX_NA, CTX_NA}, {23, 33}, {22, 25}, {29, 16}},
+  {{CTX_NA, CTX_NA}, {23, 2}, {34, 0}, {25, 0}},
+  {{CTX_NA, CTX_NA}, {21, 0}, {16, 0}, {14, 0}},
+  {{CTX_NA, CTX_NA}, {1, 9}, { -2, 9}, { -10, 51}},
+  {{CTX_NA, CTX_NA}, {0, 49}, {4, 41}, { -3, 62}},
+  {{CTX_NA, CTX_NA}, { -37, 118}, { -29, 118}, { -27, 99}},
+  {{CTX_NA, CTX_NA}, {5, 57}, {2, 65}, {26, 16}},
+  {{CTX_NA, CTX_NA}, { -13, 78}, { -6, 71}, { -4, 85}},
+  {{CTX_NA, CTX_NA}, { -11, 65}, { -13, 79}, { -24, 102}},
+  {{CTX_NA, CTX_NA}, {1, 62}, {5, 52}, {5, 57}},
+  {{CTX_NA, CTX_NA}, {12, 49}, {9, 50}, {6, 57}},
+  {{CTX_NA, CTX_NA}, { -4, 73}, { -3, 70}, { -17, 73}},
+  {{CTX_NA, CTX_NA}, {17, 50}, {10, 54}, {14, 57}},
+  //24-39 Table9-14
+  {{CTX_NA, CTX_NA}, {18, 64}, {26, 34}, {20, 40}},
+  {{CTX_NA, CTX_NA}, {9, 43}, {19, 22}, {20, 10}},
+  {{CTX_NA, CTX_NA}, {29, 0}, {40, 0}, {29, 0}},
+  {{CTX_NA, CTX_NA}, {26, 67}, {57, 2}, {54, 0}},
+  {{CTX_NA, CTX_NA}, {16, 90}, {41, 36}, {37, 42}},
+  {{CTX_NA, CTX_NA}, {9, 104}, {26, 69}, {12, 97}},
+  {{CTX_NA, CTX_NA}, { -46, 127}, { -45, 127}, { -32, 127}},
+  {{CTX_NA, CTX_NA}, { -20, 104}, { -15, 101}, { -22, 117}},
+  {{CTX_NA, CTX_NA}, {1, 67}, { -4, 76}, { -2, 74}},
+  {{CTX_NA, CTX_NA}, { -13, 78}, { -6, 71}, { -4, 85}},
+  {{CTX_NA, CTX_NA}, { -11, 65}, { -13, 79}, { -24, 102}},
+  {{CTX_NA, CTX_NA}, {1, 62}, {5, 52}, {5, 57}},
+  {{CTX_NA, CTX_NA}, { -6, 86}, {6, 69}, { -6, 93}},
+  {{CTX_NA, CTX_NA}, { -17, 95}, { -13, 90}, { -14, 88}},
+  {{CTX_NA, CTX_NA}, { -6, 61}, {0, 52}, { -6, 44}},
+  {{CTX_NA, CTX_NA}, {9, 45}, {8, 43}, {4, 55}},
+  //40-53 Table 9-15
+  {{CTX_NA, CTX_NA}, { -3, 69}, { -2, 69}, { -11, 89}},
+  {{CTX_NA, CTX_NA}, { -6, 81}, { -5, 82}, { -15, 103}},
+  {{CTX_NA, CTX_NA}, { -11, 96}, { -10, 96}, { -21, 116}},
+  {{CTX_NA, CTX_NA}, {6, 55}, {2, 59}, {19, 57}},
+  {{CTX_NA, CTX_NA}, {7, 67}, {2, 75}, {20, 58}},
+  {{CTX_NA, CTX_NA}, { -5, 86}, { -3, 87}, {4, 84}},
+  {{CTX_NA, CTX_NA}, {2, 88}, { -3, 100}, {6, 96}},
+  {{CTX_NA, CTX_NA}, {0, 58}, {1, 56}, {1, 63}},
+  {{CTX_NA, CTX_NA}, { -3, 76}, { -3, 74}, { -5, 85}},
+  {{CTX_NA, CTX_NA}, { -10, 94}, { -6, 85}, { -13, 106}},
+  {{CTX_NA, CTX_NA}, {5, 54}, {0, 59}, {5, 63}},
+  {{CTX_NA, CTX_NA}, {4, 69}, { -3, 81}, {6, 75}},
+  {{CTX_NA, CTX_NA}, { -3, 81}, { -7, 86}, { -3, 90}},
+  {{CTX_NA, CTX_NA}, {0, 88}, { -5, 95}, { -1, 101}},
+  //54-59 Table 9-16
+  {{CTX_NA, CTX_NA}, { -7, 67}, { -1, 66}, {3, 55}},
+  {{CTX_NA, CTX_NA}, { -5, 74}, { -1, 77}, { -4, 79}},
+  {{CTX_NA, CTX_NA}, { -4, 74}, {1, 70}, { -2, 75}},
+  {{CTX_NA, CTX_NA}, { -5, 80}, { -2, 86}, { -12, 97}},
+  {{CTX_NA, CTX_NA}, { -7, 72}, { -5, 72}, { -7, 50}},
+  {{CTX_NA, CTX_NA}, {1, 58}, {0, 61}, {1, 60}},
+  //60-69 Table 9-17
+  {{0, 41}, {0, 41}, {0, 41}, {0, 41}},
+  {{0, 63}, {0, 63}, {0, 63}, {0, 63}},
+  {{0, 63}, {0, 63}, {0, 63}, {0, 63}},
+  {{0, 63}, {0, 63}, {0, 63}, {0, 63}},
+  {{ -9, 83}, { -9, 83}, { -9, 83}, { -9, 83}},
+  {{4, 86}, {4, 86}, {4, 86}, {4, 86}},
+  {{0, 97}, {0, 97}, {0, 97}, {0, 97}},
+  {{ -7, 72}, { -7, 72}, { -7, 72}, { -7, 72}},
+  {{13, 41}, {13, 41}, {13, 41}, {13, 41}},
+  {{3, 62}, {3, 62}, {3, 62}, {3, 62}},
+  //70-104 Table 9-18
+  {{0, 11}, {0, 45}, {13, 15}, {7, 34}},
+  {{1, 55}, { -4, 78}, {7, 51}, { -9, 88}},
+  {{0, 69}, { -3, 96}, {2, 80}, { -20, 127}},
+  {{ -17, 127}, { -27, 126}, { -39, 127}, { -36, 127}},
+  {{ -13, 102}, { -28, 98}, { -18, 91}, { -17, 91}},
+  {{0, 82}, { -25, 101}, { -17, 96}, { -14, 95}},
+  {{ -7, 74}, { -23, 67}, { -26, 81}, { -25, 84}},
+  {{ -21, 107}, { -28, 82}, { -35, 98}, { -25, 86}},
+  {{ -27, 127}, { -20, 94}, { -24, 102}, { -12, 89}},
+  {{ -31, 127}, { -16, 83}, { -23, 97}, { -17, 91}},
+  {{ -24, 127}, { -22, 110}, { -27, 119}, { -31, 127}},
+  {{ -18, 95}, { -21, 91}, { -24, 99}, { -14, 76}},
+  {{ -27, 127}, { -18, 102}, { -21, 110}, { -18, 103}},
+  {{ -21, 114}, { -13, 93}, { -18, 102}, { -13, 90}},
+  {{ -30, 127}, { -29, 127}, { -36, 127}, { -37, 127}},
+  {{ -17, 123}, { -7, 92}, {0, 80}, {11, 80}},
+  {{ -12, 115}, { -5, 89}, { -5, 89}, {5, 76}},
+  {{ -16, 122}, { -7, 96}, { -7, 94}, {2, 84}},
+  {{ -11, 115}, { -13, 108}, { -4, 92}, {5, 78}},
+  {{ -12, 63}, { -3, 46}, {0, 39}, { -6, 55}},
+  {{ -2, 68}, { -1, 65}, {0, 65}, {4, 61}},
+  {{ -15, 84}, { -1, 57}, { -15, 84}, { -14, 83}},
+  {{ -13, 104}, { -9, 93}, { -35, 127}, { -37, 127}},
+  {{ -3, 70}, { -3, 74}, { -2, 73}, { -5, 79}},
+  {{ -8, 93}, { -9, 92}, { -12, 104}, { -11, 104}},
+  {{ -10, 90}, { -8, 87}, { -9, 91}, { -11, 91}},
+  {{ -30, 127}, { -23, 126}, { -31, 127}, { -30, 127}},
+  {{ -1, 74}, {5, 54}, {3, 55}, {0, 65}},
+  {{ -6, 97}, {6, 60}, {7, 56}, { -2, 79}},
+  {{ -7, 91}, {6, 59}, {7, 55}, {0, 72}},
+  {{ -20, 127}, {6, 69}, {8, 61}, { -4, 92}},
+  {{ -4, 56}, { -1, 48}, { -3, 53}, { -6, 56}},
+  {{ -5, 82}, {0, 68}, {0, 68}, {3, 68}},
+  {{ -7, 76}, { -4, 69}, { -7, 74}, { -8, 71}},
+  {{ -22, 125}, { -8, 88}, { -9, 88}, { -13, 98}},
+  //105-165 Table 9-19
+  {{ -7, 93}, { -2, 85}, { -13, 103}, { -4, 86}},
+  {{ -11, 87}, { -6, 78}, { -13, 91}, { -12, 88}},
+  {{ -3, 77}, { -1, 75}, { -9, 89}, { -5, 82}},
+  {{ -5, 71}, { -7, 77}, { -14, 92}, { -3, 72}},
+  {{ -4, 63}, {2, 54}, { -8, 76}, { -4, 67}},
+  {{ -4, 68}, {5, 50}, { -12, 87}, { -8, 72}},
+  {{ -12, 84}, { -3, 68}, { -23, 110}, { -16, 89}},
+  {{ -7, 62}, {1, 50}, { -24, 105}, { -9, 69}},
+  {{ -7, 65}, {6, 42}, { -10, 78}, { -1, 59}},
+  {{8, 61}, { -4, 81}, { -20, 112}, {5, 66}},
+  {{5, 56}, {1, 63}, { -17, 99}, {4, 57}},
+  {{ -2, 66}, { -4, 70}, { -78, 127}, { -4, 71}},
+  {{1, 64}, {0, 67}, { -70, 127}, { -2, 71}},
+  {{0, 61}, {2, 57}, { -50, 127}, {2, 58}},
+  {{ -2, 78}, { -2, 76}, { -46, 127}, { -1, 74}},
+  {{1, 50}, {11, 35}, { -4, 66}, { -4, 44}},
+  {{7, 52}, {4, 64}, { -5, 78}, { -1, 69}},
+  {{10, 35}, {1, 61}, { -4, 71}, {0, 62}},
+  {{0, 44}, {11, 35}, { -8, 72}, { -7, 51}},
+  {{11, 38}, {18, 25}, {2, 59}, { -4, 47}},
+  {{1, 45}, {12, 24}, { -1, 55}, { -6, 42}},
+  {{0, 46}, {13, 29}, { -7, 70}, { -3, 41}},
+  {{5, 44}, {13, 36}, { -6, 75}, { -6, 53}},
+  {{31, 17}, { -10, 93}, { -8, 89}, {8, 76}},
+  {{1, 51}, { -7, 73}, { -34, 119}, { -9, 78}},
+  {{7, 50}, { -2, 73}, { -3, 75}, { -11, 83}},
+  {{28, 19}, {13, 46}, {32, 20}, {9, 52}},
+  {{16, 33}, {9, 49}, {30, 22}, {0, 67}},
+  {{14, 62}, { -7, 100}, { -44, 127}, { -5, 90}},
+  {{ -13, 108}, {9, 53}, {0, 54}, {1, 67}},
+  {{ -15, 100}, {2, 53}, { -5, 61}, { -15, 72}},
+  {{ -13, 101}, {5, 53}, {0, 58}, { -5, 75}},
+  {{ -13, 91}, { -2, 61}, { -1, 60}, { -8, 80}},
+  {{ -12, 94}, {0, 56}, { -3, 61}, { -21, 83}},
+  {{ -10, 88}, {0, 56}, { -8, 67}, { -21, 64}},
+  {{ -16, 84}, { -13, 63}, { -25, 84}, { -13, 31}},
+  {{ -10, 86}, { -5, 60}, { -14, 74}, { -25, 64}},
+  {{ -7, 83}, { -1, 62}, { -5, 65}, { -29, 94}},
+  {{ -13, 87}, {4, 57}, {5, 52}, {9, 75}},
+  {{ -19, 94}, { -6, 69}, {2, 57}, {17, 63}},
+  {{1, 70}, {4, 57}, {0, 61}, { -8, 74}},
+  {{0, 72}, {14, 39}, { -9, 69}, { -5, 35}},
+  {{ -5, 74}, {4, 51}, { -11, 70}, { -2, 27}},
+  {{18, 59}, {13, 68}, {18, 55}, {13, 91}},
+  {{ -8, 102}, {3, 64}, { -4, 71}, {3, 65}},
+  {{ -15, 100}, {1, 61}, {0, 58}, { -7, 69}},
+  {{0, 95}, {9, 63}, {7, 61}, {8, 77}},
+  {{ -4, 75}, {7, 50}, {9, 41}, { -10, 66}},
+  {{2, 72}, {16, 39}, {18, 25}, {3, 62}},
+  {{ -11, 75}, {5, 44}, {9, 32}, { -3, 68}},
+  {{ -3, 71}, {4, 52}, {5, 43}, { -20, 81}},
+  {{15, 46}, {11, 48}, {9, 47}, {0, 30}},
+  {{ -13, 69}, { -5, 60}, {0, 44}, {1, 7}},
+  {{0, 62}, { -1, 59}, {0, 51}, { -3, 23}},
+  {{0, 65}, {0, 59}, {2, 46}, { -21, 74}},
+  {{21, 37}, {22, 33}, {19, 38}, {16, 66}},
+  {{ -15, 72}, {5, 44}, { -4, 66}, { -23, 124}},
+  {{9, 57}, {14, 43}, {15, 38}, {17, 37}},
+  {{16, 54}, { -1, 78}, {12, 42}, {44, -18}},
+  {{0, 62}, {0, 60}, {9, 34}, {50, -34}},
+  {{12, 72}, {9, 69}, {0, 89}, { -22, 127}},
+  //166-226 Table 9-20
+  {{24, 0}, {11, 28}, {4, 45}, {4, 39}},
+  {{15, 9}, {2, 40}, {10, 28}, {0, 42}},
+  {{8, 25}, {3, 44}, {10, 31}, {7, 34}},
+  {{13, 18}, {0, 49}, {33, -11}, {11, 29}},
+  {{15, 9}, {0, 46}, {52, -43}, {8, 31}},
+  {{13, 19}, {2, 44}, {18, 15}, {6, 37}},
+  {{10, 37}, {2, 51}, {28, 0}, {7, 42}},
+  {{12, 18}, {0, 47}, {35, -22}, {3, 40}},
+  {{6, 29}, {4, 39}, {38, -25}, {8, 33}},
+  {{20, 33}, {2, 62}, {34, 0}, {13, 43}},
+  {{15, 30}, {6, 46}, {39, -18}, {13, 36}},
+  {{4, 45}, {0, 54}, {32, -12}, {4, 47}},
+  {{1, 58}, {3, 54}, {102, -94}, {3, 55}},
+  {{0, 62}, {2, 58}, {0, 0}, {2, 58}},
+  {{7, 61}, {4, 63}, {56, -15}, {6, 60}},
+  {{12, 38}, {6, 51}, {33, -4}, {8, 44}},
+  {{11, 45}, {6, 57}, {29, 10}, {11, 44}},
+  {{15, 39}, {7, 53}, {37, -5}, {14, 42}},
+  {{11, 42}, {6, 52}, {51, -29}, {7, 48}},
+  {{13, 44}, {6, 55}, {39, -9}, {4, 56}},
+  {{16, 45}, {11, 45}, {52, -34}, {4, 52}},
+  {{12, 41}, {14, 36}, {69, -58}, {13, 37}},
+  {{10, 49}, {8, 53}, {67, -63}, {9, 49}},
+  {{30, 34}, { -1, 82}, {44, -5}, {19, 58}},
+  {{18, 42}, {7, 55}, {32, 7}, {10, 48}},
+  {{10, 55}, { -3, 78}, {55, -29}, {12, 45}},
+  {{17, 51}, {15, 46}, {32, 1}, {0, 69}},
+  {{17, 46}, {22, 31}, {0, 0}, {20, 33}},
+  {{0, 89}, { -1, 84}, {27, 36}, {8, 63}},
+  {{26, -19}, {25, 7}, {33, -25}, {35, -18}},
+  {{22, -17}, {30, -7}, {34, -30}, {33, -25}},
+  {{26, -17}, {28, 3}, {36, -28}, {28, -3}},
+  {{30, -25}, {28, 4}, {38, -28}, {24, 10}},
+  {{28, -20}, {32, 0}, {38, -27}, {27, 0}},
+  {{33, -23}, {34, -1}, {34, -18}, {34, -14}},
+  {{37, -27}, {30, 6}, {35, -16}, {52, -44}},
+  {{33, -23}, {30, 6}, {34, -14}, {39, -24}},
+  {{40, -28}, {32, 9}, {32, -8}, {19, 17}},
+  {{38, -17}, {31, 19}, {37, -6}, {31, 25}},
+  {{33, -11}, {26, 27}, {35, 0}, {36, 29}},
+  {{40, -15}, {26, 30}, {30, 10}, {24, 33}},
+  {{41, -6}, {37, 20}, {28, 18}, {34, 15}},
+  {{38, 1}, {28, 34}, {26, 25}, {30, 20}},
+  {{41, 17}, {17, 70}, {29, 41}, {22, 73}},
+  {{30, -6}, {1, 67}, {0, 75}, {20, 34}},
+  {{27, 3}, {5, 59}, {2, 72}, {19, 31}},
+  {{26, 22}, {9, 67}, {8, 77}, {27, 44}},
+  {{37, -16}, {16, 30}, {14, 35}, {19, 16}},
+  {{35, -4}, {18, 32}, {18, 31}, {15, 36}},
+  {{38, -8}, {18, 35}, {17, 35}, {15, 36}},
+  {{38, -3}, {22, 29}, {21, 30}, {21, 28}},
+  {{37, 3}, {24, 31}, {17, 45}, {25, 21}},
+  {{38, 5}, {23, 38}, {20, 42}, {30, 20}},
+  {{42, 0}, {18, 43}, {18, 45}, {31, 12}},
+  {{35, 16}, {20, 41}, {27, 26}, {27, 16}},
+  {{39, 22}, {11, 63}, {16, 54}, {24, 42}},
+  {{14, 48}, {9, 59}, {7, 66}, {0, 93}},
+  {{27, 37}, {9, 64}, {16, 56}, {14, 56}},
+  {{21, 60}, { -1, 94}, {11, 73}, {15, 57}},
+  {{12, 68}, { -2, 89}, {10, 67}, {26, 38}},
+  {{2, 97}, { -9, 108}, { -10, 116}, { -24, 127}},
+  //227-275 Table 9-21
+  {{ -3, 71}, { -6, 76}, { -23, 112}, { -24, 115}},
+  {{ -6, 42}, { -2, 44}, { -15, 71}, { -22, 82}},
+  {{ -5, 50}, {0, 45}, { -7, 61}, { -9, 62}},
+  {{ -3, 54}, {0, 52}, {0, 53}, {0, 53}},
+  {{ -2, 62}, { -3, 64}, { -5, 66}, {0, 59}},
+  {{0, 58}, { -2, 59}, { -11, 77}, { -14, 85}},
+  {{1, 63}, { -4, 70}, { -9, 80}, { -13, 89}},
+  {{ -2, 72}, { -4, 75}, { -9, 84}, { -13, 94}},
+  {{ -1, 74}, { -8, 82}, { -10, 87}, { -11, 92}},
+  {{ -9, 91}, { -17, 102}, { -34, 127}, { -29, 127}},
+  {{ -5, 67}, { -9, 77}, { -21, 101}, { -21, 100}},
+  {{ -5, 27}, {3, 24}, { -3, 39}, { -14, 57}},
+  {{ -3, 39}, {0, 42}, { -5, 53}, { -12, 67}},
+  {{ -2, 44}, {0, 48}, { -7, 61}, { -11, 71}},
+  {{0, 46}, {0, 55}, { -11, 75}, { -10, 77}},
+  {{ -16, 64}, { -6, 59}, { -15, 77}, { -21, 85}},
+  {{ -8, 68}, { -7, 71}, { -17, 91}, { -16, 88}},
+  {{ -10, 78}, { -12, 83}, { -25, 107}, { -23, 104}},
+  {{ -6, 77}, { -11, 87}, { -25, 111}, { -15, 98}},
+  {{ -10, 86}, { -30, 119}, { -28, 122}, { -37, 127}},
+  {{ -12, 92}, {1, 58}, { -11, 76}, { -10, 82}},
+  {{ -15, 55}, { -3, 29}, { -10, 44}, { -8, 48}},
+  {{ -10, 60}, { -1, 36}, { -10, 52}, { -8, 61}},
+  {{ -6, 62}, {1, 38}, { -10, 57}, { -8, 66}},
+  {{ -4, 65}, {2, 43}, { -9, 58}, { -7, 70}},
+  {{ -12, 73}, { -6, 55}, { -16, 72}, { -14, 75}},
+  {{ -8, 76}, {0, 58}, { -7, 69}, { -10, 79}},
+  {{ -7, 80}, {0, 64}, { -4, 69}, { -9, 83}},
+  {{ -9, 88}, { -3, 74}, { -5, 74}, { -12, 92}},
+  {{ -17, 110}, { -10, 90}, { -9, 86}, { -18, 108}},
+  {{ -11, 97}, {0, 70}, {2, 66}, { -4, 79}},
+  {{ -20, 84}, { -4, 29}, { -9, 34}, { -22, 69}},
+  {{ -11, 79}, {5, 31}, {1, 32}, { -16, 75}},
+  {{ -6, 73}, {7, 42}, {11, 31}, { -2, 58}},
+  {{ -4, 74}, {1, 59}, {5, 52}, {1, 58}},
+  {{ -13, 86}, { -2, 58}, { -2, 55}, { -13, 78}},
+  {{ -13, 96}, { -3, 72}, { -2, 67}, { -9, 83}},
+  {{ -11, 97}, { -3, 81}, {0, 73}, { -4, 81}},
+  {{ -19, 117}, { -11, 97}, { -8, 89}, { -13, 99}},
+  {{ -8, 78}, {0, 58}, {3, 52}, { -13, 81}},
+  {{ -5, 33}, {8, 5}, {7, 4}, { -6, 38}},
+  {{ -4, 48}, {10, 14}, {10, 8}, { -13, 62}},
+  {{ -2, 53}, {14, 18}, {17, 8}, { -6, 58}},
+  {{ -3, 62}, {13, 27}, {16, 19}, { -2, 59}},
+  {{ -13, 71}, {2, 40}, {3, 37}, { -16, 73}},
+  {{ -10, 79}, {0, 58}, { -1, 61}, { -10, 76}},
+  {{ -12, 86}, { -3, 70}, { -5, 73}, { -13, 86}},
+  {{ -13, 90}, { -6, 79}, { -1, 70}, { -9, 83}},
+  {{ -14, 97}, { -8, 85}, { -4, 78}, { -10, 87}},
+  //276 no use
+  {{CTX_NA, CTX_NA}, {CTX_NA, CTX_NA}, {CTX_NA, CTX_NA}, {CTX_NA, CTX_NA}},
+  //277-337 Table 9-22
+  {{ -6, 93}, { -13, 106}, { -21, 126}, { -22, 127}},
+  {{ -6, 84}, { -16, 106}, { -23, 124}, { -25, 127}},
+  {{ -8, 79}, { -10, 87}, { -20, 110}, { -25, 120}},
+  {{0, 66}, { -21, 114}, { -26, 126}, { -27, 127}},
+  {{ -1, 71}, { -18, 110}, { -25, 124}, { -19, 114}},
+  {{0, 62}, { -14, 98}, { -17, 105}, { -23, 117}},
+  {{ -2, 60}, { -22, 110}, { -27, 121}, { -25, 118}},
+  {{ -2, 59}, { -21, 106}, { -27, 117}, { -26, 117}},
+  {{ -5, 75}, { -18, 103}, { -17, 102}, { -24, 113}},
+  {{ -3, 62}, { -21, 107}, { -26, 117}, { -28, 118}},
+  {{ -4, 58}, { -23, 108}, { -27, 116}, { -31, 120}},
+  {{ -9, 66}, { -26, 112}, { -33, 122}, { -37, 124}},
+  {{ -1, 79}, { -10, 96}, { -10, 95}, { -10, 94}},
+  {{0, 71}, { -12, 95}, { -14, 100}, { -15, 102}},
+  {{3, 68}, { -5, 91}, { -8, 95}, { -10, 99}},
+  {{10, 44}, { -9, 93}, { -17, 111}, { -13, 106}},
+  {{ -7, 62}, { -22, 94}, { -28, 114}, { -50, 127}},
+  {{15, 36}, { -5, 86}, { -6, 89}, { -5, 92}},
+  {{14, 40}, {9, 67}, { -2, 80}, {17, 57}},
+  {{16, 27}, { -4, 80}, { -4, 82}, { -5, 86}},
+  {{12, 29}, { -10, 85}, { -9, 85}, { -13, 94}},
+  {{1, 44}, { -1, 70}, { -8, 81}, { -12, 91}},
+  {{20, 36}, {7, 60}, { -1, 72}, { -2, 77}},
+  {{18, 32}, {9, 58}, {5, 64}, {0, 71}},
+  {{5, 42}, {5, 61}, {1, 67}, { -1, 73}},
+  {{1, 48}, {12, 50}, {9, 56}, {4, 64}},
+  {{10, 62}, {15, 50}, {0, 69}, { -7, 81}},
+  {{17, 46}, {18, 49}, {1, 69}, {5, 64}},
+  {{9, 64}, {17, 54}, {7, 69}, {15, 57}},
+  {{ -12, 104}, {10, 41}, { -7, 69}, {1, 67}},
+  {{ -11, 97}, {7, 46}, { -6, 67}, {0, 68}},
+  {{ -16, 96}, { -1, 51}, { -16, 77}, { -10, 67}},
+  {{ -7, 88}, {7, 49}, { -2, 64}, {1, 68}},
+  {{ -8, 85}, {8, 52}, {2, 61}, {0, 77}},
+  {{ -7, 85}, {9, 41}, { -6, 67}, {2, 64}},
+  {{ -9, 85}, {6, 47}, { -3, 64}, {0, 68}},
+  {{ -13, 88}, {2, 55}, {2, 57}, { -5, 78}},
+  {{4, 66}, {13, 41}, { -3, 65}, {7, 55}},
+  {{ -3, 77}, {10, 44}, { -3, 66}, {5, 59}},
+  {{ -3, 76}, {6, 50}, {0, 62}, {2, 65}},
+  {{ -6, 76}, {5, 53}, {9, 51}, {14, 54}},
+  {{10, 58}, {13, 49}, { -1, 66}, {15, 44}},
+  {{ -1, 76}, {4, 63}, { -2, 71}, {5, 60}},
+  {{ -1, 83}, {6, 64}, { -2, 75}, {2, 70}},
+  {{ -7, 99}, { -2, 69}, { -1, 70}, { -2, 76}},
+  {{ -14, 95}, { -2, 59}, { -9, 72}, { -18, 86}},
+  {{2, 95}, {6, 70}, {14, 60}, {12, 70}},
+  {{0, 76}, {10, 44}, {16, 37}, {5, 64}},
+  {{ -5, 74}, {9, 31}, {0, 47}, { -12, 70}},
+  {{0, 70}, {12, 43}, {18, 35}, {11, 55}},
+  {{ -11, 75}, {3, 53}, {11, 37}, {5, 56}},
+  {{1, 68}, {14, 34}, {12, 41}, {0, 69}},
+  {{0, 65}, {10, 38}, {10, 41}, {2, 65}},
+  {{ -14, 73}, { -3, 52}, {2, 48}, { -6, 74}},
+  {{3, 62}, {13, 40}, {12, 41}, {5, 54}},
+  {{4, 62}, {17, 32}, {13, 41}, {7, 54}},
+  {{ -1, 68}, {7, 44}, {0, 59}, { -6, 76}},
+  {{ -13, 75}, {7, 38}, {3, 50}, { -11, 82}},
+  {{11, 55}, {13, 50}, {19, 40}, { -2, 77}},
+  {{5, 64}, {10, 57}, {3, 66}, { -2, 77}},
+  {{12, 70}, {26, 43}, {18, 50}, {25, 42}},
+  //338-398 Table9-23
+  {{15, 6}, {14, 11}, {19, -6}, {17, -13}},
+  {{6, 19}, {11, 14}, {18, -6}, {16, -9}},
+  {{7, 16}, {9, 11}, {14, 0}, {17, -12}},
+  {{12, 14}, {18, 11}, {26, -12}, {27, -21}},
+  {{18, 13}, {21, 9}, {31, -16}, {37, -30}},
+  {{13, 11}, {23, -2}, {33, -25}, {41, -40}},
+  {{13, 15}, {32, -15}, {33, -22}, {42, -41}},
+  {{15, 16}, {32, -15}, {37, -28}, {48, -47}},
+  {{12, 23}, {34, -21}, {39, -30}, {39, -32}},
+  {{13, 23}, {39, -23}, {42, -30}, {46, -40}},
+  {{15, 20}, {42, -33}, {47, -42}, {52, -51}},
+  {{14, 26}, {41, -31}, {45, -36}, {46, -41}},
+  {{14, 44}, {46, -28}, {49, -34}, {52, -39}},
+  {{17, 40}, {38, -12}, {41, -17}, {43, -19}},
+  {{17, 47}, {21, 29}, {32, 9}, {32, 11}},
+  {{24, 17}, {45, -24}, {69, -71}, {61, -55}},
+  {{21, 21}, {53, -45}, {63, -63}, {56, -46}},
+  {{25, 22}, {48, -26}, {66, -64}, {62, -50}},
+  {{31, 27}, {65, -43}, {77, -74}, {81, -67}},
+  {{22, 29}, {43, -19}, {54, -39}, {45, -20}},
+  {{19, 35}, {39, -10}, {52, -35}, {35, -2}},
+  {{14, 50}, {30, 9}, {41, -10}, {28, 15}},
+  {{10, 57}, {18, 26}, {36, 0}, {34, 1}},
+  {{7, 63}, {20, 27}, {40, -1}, {39, 1}},
+  {{ -2, 77}, {0, 57}, {30, 14}, {30, 17}},
+  {{ -4, 82}, { -14, 82}, {28, 26}, {20, 38}},
+  {{ -3, 94}, { -5, 75}, {23, 37}, {18, 45}},
+  {{9, 69}, { -19, 97}, {12, 55}, {15, 54}},
+  {{ -12, 109}, { -35, 125}, {11, 65}, {0, 79}},
+  {{36, -35}, {27, 0}, {37, -33}, {36, -16}},
+  {{36, -34}, {28, 0}, {39, -36}, {37, -14}},
+  {{32, -26}, {31, -4}, {40, -37}, {37, -17}},
+  {{37, -30}, {27, 6}, {38, -30}, {32, 1}},
+  {{44, -32}, {34, 8}, {46, -33}, {34, 15}},
+  {{34, -18}, {30, 10}, {42, -30}, {29, 15}},
+  {{34, -15}, {24, 22}, {40, -24}, {24, 25}},
+  {{40, -15}, {33, 19}, {49, -29}, {34, 22}},
+  {{33, -7}, {22, 32}, {38, -12}, {31, 16}},
+  {{35, -5}, {26, 31}, {40, -10}, {35, 18}},
+  {{33, 0}, {21, 41}, {38, -3}, {31, 28}},
+  {{38, 2}, {26, 44}, {46, -5}, {33, 41}},
+  {{33, 13}, {23, 47}, {31, 20}, {36, 28}},
+  {{23, 35}, {16, 65}, {29, 30}, {27, 47}},
+  {{13, 58}, {14, 71}, {25, 44}, {21, 62}},
+  {{29, -3}, {8, 60}, {12, 48}, {18, 31}},
+  {{26, 0}, {6, 63}, {11, 49}, {19, 26}},
+  {{22, 30}, {17, 65}, {26, 45}, {36, 24}},
+  {{31, -7}, {21, 24}, {22, 22}, {24, 23}},
+  {{35, -15}, {23, 20}, {23, 22}, {27, 16}},
+  {{34, -3}, {26, 23}, {27, 21}, {24, 30}},
+  {{34, 3}, {27, 32}, {33, 20}, {31, 29}},
+  {{36, -1}, {28, 23}, {26, 28}, {22, 41}},
+  {{34, 5}, {28, 24}, {30, 24}, {22, 42}},
+  {{32, 11}, {23, 40}, {27, 34}, {16, 60}},
+  {{35, 5}, {24, 32}, {18, 42}, {15, 52}},
+  {{34, 12}, {28, 29}, {25, 39}, {14, 60}},
+  {{39, 11}, {23, 42}, {18, 50}, {3, 78}},
+  {{30, 29}, {19, 57}, {12, 70}, { -16, 123}},
+  {{34, 26}, {22, 53}, {21, 54}, {21, 53}},
+  {{29, 39}, {22, 61}, {14, 71}, {22, 56}},
+  {{19, 66}, {11, 86}, {11, 83}, {25, 61}},
+  {{31, 21}, {12, 40}, {25, 32}, {21, 33}},
+  {{31, 31}, {11, 51}, {21, 49}, {19, 50}},
+  {{25, 50}, {14, 59}, {21, 54}, {17, 61}},
+  //402-459 Table 9-24
+  {{ -17, 120}, { -4, 79}, { -5, 85}, { -3, 78}},
+  {{ -20, 112}, { -7, 71}, { -6, 81}, { -8, 74}},
+  {{ -18, 114}, { -5, 69}, { -10, 77}, { -9, 72}},
+  {{ -11, 85}, { -9, 70}, { -7, 81}, { -10, 72}},
+  {{ -15, 92}, { -8, 66}, { -17, 80}, { -18, 75}},
+  {{ -14, 89}, { -10, 68}, { -18, 73}, { -12, 71}},
+  {{ -26, 71}, { -19, 73}, { -4, 74}, { -11, 63}},
+  {{ -15, 81}, { -12, 69}, { -10, 83}, { -5, 70}},
+  {{ -14, 80}, { -16, 70}, { -9, 71}, { -17, 75}},
+  {{0, 68}, { -15, 67}, { -9, 67}, { -14, 72}},
+  {{ -14, 70}, { -20, 62}, { -1, 61}, { -16, 67}},
+  {{ -24, 56}, { -19, 70}, { -8, 66}, { -8, 53}},
+  {{ -23, 68}, { -16, 66}, { -14, 66}, { -14, 59}},
+  {{ -24, 50}, { -22, 65}, {0, 59}, { -9, 52}},
+  {{ -11, 74}, { -20, 63}, {2, 59}, { -11, 68}},
+  {{23, -13}, {9, -2}, {17, -10}, {9, -2}},
+  {{26, -13}, {26, -9}, {32, -13}, {30, -10}},
+  {{40, -15}, {33, -9}, {42, -9}, {31, -4}},
+  {{49, -14}, {39, -7}, {49, -5}, {33, -1}},
+  {{44, 3}, {41, -2}, {53, 0}, {33, 7}},
+  {{45, 6}, {45, 3}, {64, 3}, {31, 12}},
+  {{44, 34}, {49, 9}, {68, 10}, {37, 23}},
+  {{33, 54}, {45, 27}, {66, 27}, {31, 38}},
+  {{19, 82}, {36, 59}, {47, 57}, {20, 64}},
+  {{ -3, 75}, { -6, 66}, { -5, 71}, { -9, 71}},
+  {{ -1, 23}, { -7, 35}, {0, 24}, { -7, 37}},
+  {{1, 34}, { -7, 42}, { -1, 36}, { -8, 44}},
+  {{1, 43}, { -8, 45}, { -2, 42}, { -11, 49}},
+  {{0, 54}, { -5, 48}, { -2, 52}, { -10, 56}},
+  {{ -2, 55}, { -12, 56}, { -9, 57}, { -12, 59}},
+  {{0, 61}, { -6, 60}, { -6, 63}, { -8, 63}},
+  {{1, 64}, { -5, 62}, { -4, 65}, { -9, 67}},
+  {{0, 68}, { -8, 66}, { -4, 67}, { -6, 68}},
+  {{ -9, 92}, { -8, 76}, { -7, 82}, { -10, 79}},
+  {{ -14, 106}, { -5, 85}, { -3, 81}, { -3, 78}},
+  {{ -13, 97}, { -6, 81}, { -3, 76}, { -8, 74}},
+  {{ -15, 90}, { -10, 77}, { -7, 72}, { -9, 72}},
+  {{ -12, 90}, { -7, 81}, { -6, 78}, { -10, 72}},
+  {{ -18, 88}, { -17, 80}, { -12, 72}, { -18, 75}},
+  {{ -10, 73}, { -18, 73}, { -14, 68}, { -12, 71}},
+  {{ -9, 79}, { -4, 74}, { -3, 70}, { -11, 63}},
+  {{ -14, 86}, { -10, 83}, { -6, 76}, { -5, 70}},
+  {{ -10, 73}, { -9, 71}, { -5, 66}, { -17, 75}},
+  {{ -10, 70}, { -9, 67}, { -5, 62}, { -14, 72}},
+  {{ -10, 69}, { -1, 61}, {0, 57}, { -16, 67}},
+  {{ -5, 66}, { -8, 66}, { -4, 61}, { -8, 53}},
+  {{ -9, 64}, { -14, 66}, { -9, 60}, { -14, 59}},
+  {{ -5, 58}, {0, 59}, {1, 54}, { -9, 52}},
+  {{2, 59}, {2, 59}, {2, 58}, { -11, 68}},
+  {{21, -10}, {21, -13}, {17, -10}, {9, -2}},
+  {{24, -11}, {33, -14}, {32, -13}, {30, -10}},
+  {{28, -8}, {39, -7}, {42, -9}, {31, -4}},
+  {{28, -1}, {46, -2}, {49, -5}, {33, -1}},
+  {{29, 3}, {51, 2}, {53, 0}, {33, 7}},
+  {{29, 9}, {60, 6}, {64, 3}, {31, 12}},
+  {{35, 20}, {61, 17}, {68, 10}, {37, 23}},
+  {{29, 36}, {55, 34}, {66, 27}, {31, 38}},
+  {{14, 67}, {42, 62}, {47, 57}, {20, 64}},
+};
+
+/*Table 9-44 – Specification of rangeTabLPS depending on pStateIdx and qCodIRangeIdx */
+
+const uint8_t g_kuiCabacRangeLps[64][4] = {
+  { 128, 176, 208, 240}, { 128, 167, 197, 227}, { 128, 158, 187, 216}, { 123, 150, 178, 205}, { 116, 142, 169, 195}, { 111, 135, 160, 185}, { 105, 128, 152, 175}, { 100, 122, 144, 166},
+  {  95, 116, 137, 158}, {  90, 110, 130, 150}, {  85, 104, 123, 142}, {  81,  99, 117, 135}, {  77,  94, 111, 128}, {  73,  89, 105, 122}, {  69,  85, 100, 116}, {  66,  80,  95, 110},
+  {  62,  76,  90, 104}, {  59,  72,  86,  99}, {  56,  69,  81,  94}, {  53,  65,  77,  89}, {  51,  62,  73,  85}, {  48,  59,  69,  80}, {  46,  56,  66,  76}, {  43,  53,  63,  72},
+  {  41,  50,  59,  69}, {  39,  48,  56,  65}, {  37,  45,  54,  62}, {  35,  43,  51,  59}, {  33,  41,  48,  56}, {  32,  39,  46,  53}, {  30,  37,  43,  50}, {  29,  35,  41,  48},
+  {  27,  33,  39,  45}, {  26,  31,  37,  43}, {  24,  30,  35,  41}, {  23,  28,  33,  39}, {  22,  27,  32,  37}, {  21,  26,  30,  35}, {  20,  24,  29,  33}, {  19,  23,  27,  31},
+  {  18,  22,  26,  30}, {  17,  21,  25,  28}, {  16,  20,  23,  27}, {  15,  19,  22,  25}, {  14,  18,  21,  24}, {  14,  17,  20,  23}, {  13,  16,  19,  22}, {  12,  15,  18,  21},
+  {  12,  14,  17,  20}, {  11,  14,  16,  19}, {  11,  13,  15,  18}, {  10,  12,  15,  17}, {  10,  12,  14,  16}, {   9,  11,  13,  15}, {   9,  11,  12,  14}, {   8,  10,  12,  14},
+  {   8,   9,  11,  13}, {   7,   9,  11,  12}, {   7,   9,  10,  12}, {   7,   8,  10,  11}, {   6,   8,   9,  11}, {   6,   7,   9,  10}, {   6,   7,   8,   9}, {   2,   2,   2,   2}
+};
+
+/*Table 9-45 – State transition table*/
+
+const uint8_t g_kuiStateTransTable[64][2] = {
+
+  {0, 1}, {0, 2}, {1, 3}, {2, 4}, {2, 5}, {4, 6}, {4, 7}, {5, 8}, {6, 9}, {7, 10},
+
+  {8, 11}, {9, 12}, {9, 13}, {11, 14}, {11, 15}, {12, 16}, {13, 17}, {13, 18}, {15, 19}, {15, 20},
+
+  {16, 21}, {16, 22}, {18, 23}, {18, 24}, {19, 25}, {19, 26}, {21, 27}, {21, 28}, {22, 29}, {22, 30},
+
+  {23, 31}, {24, 32}, {24, 33}, {25, 34}, {26, 35}, {26, 36}, {27, 37}, {27, 38}, {28, 39}, {29, 40},
+
+  {29, 41}, {30, 42}, {30, 43}, {30, 44}, {31, 45}, {32, 46}, {32, 47}, {33, 48}, {33, 49}, {33, 50},
+
+  {34, 51}, {34, 52}, {35, 53}, {35, 54}, {35, 55}, {36, 56}, {36, 57}, {36, 58}, {37, 59}, {37, 60},
+
+  {37, 61}, {38, 62}, {38, 62}, {63, 63}
+
+};
+
+// extern at svc_enc_golomb.h, golomb_common.h
+
+const uint32_t g_kuiGolombUELength[256] = {
+  1,  3,  3,  5,  5,  5,  5,  7,  7,  7,  7,  7,  7,  7,  7,     //14
+  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9,  9, //30
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,//46
+  11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,//62
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,//
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
+  17
+};
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/copy_mb.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/copy_mb.cpp
new file mode 100644
index 0000000000..96b2099d09
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/copy_mb.cpp
@@ -0,0 +1,111 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    copy_mb.cpp
+ *
+ * \brief   copy MB YUV data
+ *
+ * \date    2014.04.14 Created
+ *
+ *************************************************************************************
+ */
+
+#include "copy_mb.h"
+#include "macros.h"
+#include "ls_defines.h"
+
+/****************************************************************************
+ * Copy functions
+ ****************************************************************************/
+void WelsCopy4x4_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  const int32_t kiSrcStride2 = iStrideS << 1;
+  const int32_t kiSrcStride3 = iStrideS + kiSrcStride2;
+  const int32_t kiDstStride2 = iStrideD << 1;
+  const int32_t kiDstStride3 = iStrideD + kiDstStride2;
+
+  ST32 (pDst,                LD32 (pSrc));
+  ST32 (pDst + iStrideD,     LD32 (pSrc + iStrideS));
+  ST32 (pDst + kiDstStride2, LD32 (pSrc + kiSrcStride2));
+  ST32 (pDst + kiDstStride3, LD32 (pSrc + kiSrcStride3));
+}
+void WelsCopy8x4_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  WelsCopy4x4_c (pDst, iStrideD, pSrc, iStrideS);
+  WelsCopy4x4_c (pDst + 4, iStrideD, pSrc + 4, iStrideS);
+}
+void WelsCopy4x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  WelsCopy4x4_c (pDst, iStrideD, pSrc, iStrideS);
+  WelsCopy4x4_c (pDst + (iStrideD << 2), iStrideD, pSrc + (iStrideS << 2), iStrideS);
+}
+void WelsCopy8x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  int32_t i;
+  for (i = 0; i < 4; i++) {
+    ST32 (pDst,                 LD32 (pSrc));
+    ST32 (pDst + 4 ,            LD32 (pSrc + 4));
+    ST32 (pDst + iStrideD,      LD32 (pSrc + iStrideS));
+    ST32 (pDst + iStrideD + 4 , LD32 (pSrc + iStrideS + 4));
+    pDst += iStrideD << 1;
+    pSrc += iStrideS << 1;
+  }
+}
+void WelsCopy8x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  int32_t i;
+  for (i = 0; i < 8; ++i) {
+    ST32 (pDst,                 LD32 (pSrc));
+    ST32 (pDst + 4 ,            LD32 (pSrc + 4));
+    ST32 (pDst + iStrideD,      LD32 (pSrc + iStrideS));
+    ST32 (pDst + iStrideD + 4 , LD32 (pSrc + iStrideS + 4));
+    pDst += iStrideD << 1;
+    pSrc += iStrideS << 1;
+  }
+}
+void WelsCopy16x8_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  int32_t i;
+  for (i = 0; i < 8; i++) {
+    ST32 (pDst,         LD32 (pSrc));
+    ST32 (pDst + 4 ,    LD32 (pSrc + 4));
+    ST32 (pDst + 8 ,    LD32 (pSrc + 8));
+    ST32 (pDst + 12 ,   LD32 (pSrc + 12));
+    pDst += iStrideD ;
+    pSrc += iStrideS;
+  }
+}
+void WelsCopy16x16_c (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS) {
+  int32_t i;
+  for (i = 0; i < 16; i++) {
+    ST32 (pDst,         LD32 (pSrc));
+    ST32 (pDst + 4 ,    LD32 (pSrc + 4));
+    ST32 (pDst + 8 ,    LD32 (pSrc + 8));
+    ST32 (pDst + 12 ,   LD32 (pSrc + 12));
+    pDst += iStrideD ;
+    pSrc += iStrideS;
+  }
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/cpu.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/cpu.cpp
new file mode 100644
index 0000000000..fb5d3dae4c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/cpu.cpp
@@ -0,0 +1,359 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    cpu.cpp
+ *
+ * \brief   CPU compatibility detection
+ *
+ * \date    04/29/2009 Created
+ *
+ *************************************************************************************
+ */
+#include <string.h>
+#include <stdio.h>
+#ifdef ANDROID_NDK
+#include <cpu-features.h>
+#endif
+#include "cpu.h"
+#include "cpu_core.h"
+
+
+
+#define    CPU_Vendor_AMD    "AuthenticAMD"
+#define    CPU_Vendor_INTEL  "GenuineIntel"
+#define    CPU_Vendor_CYRIX  "CyrixInstead"
+
+#if defined(X86_ASM)
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  uint32_t uiCPU = 0;
+  uint32_t uiFeatureA = 0, uiFeatureB = 0, uiFeatureC = 0, uiFeatureD = 0;
+  int32_t  CacheLineSize = 0;
+  int8_t   chVendorName[16] = { 0 };
+  uint32_t uiMaxCpuidLevel = 0;
+
+  if (!WelsCPUIdVerify()) {
+    /* cpuid is not supported in cpu */
+    return 0;
+  }
+
+  WelsCPUId (0, &uiFeatureA, (uint32_t*)&chVendorName[0], (uint32_t*)&chVendorName[8], (uint32_t*)&chVendorName[4]);
+  uiMaxCpuidLevel = uiFeatureA;
+  if (uiMaxCpuidLevel == 0) {
+    /* maximum input value for basic cpuid information */
+    return 0;
+  }
+
+  WelsCPUId (1, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+  if ((uiFeatureD & 0x00800000) == 0) {
+    /* Basic MMX technology is not support in cpu, mean nothing for us so return here */
+    return 0;
+  }
+
+  uiCPU = WELS_CPU_MMX;
+  if (uiFeatureD & 0x02000000) {
+    /* SSE technology is identical to AMD MMX extensions */
+    uiCPU |= WELS_CPU_MMXEXT | WELS_CPU_SSE;
+  }
+  if (uiFeatureD & 0x04000000) {
+    /* SSE2 support here */
+    uiCPU |= WELS_CPU_SSE2;
+  }
+  if (uiFeatureD & 0x00000001) {
+    /* x87 FPU on-chip checking */
+    uiCPU |= WELS_CPU_FPU;
+  }
+  if (uiFeatureD & 0x00008000) {
+    /* CMOV instruction checking */
+    uiCPU |= WELS_CPU_CMOV;
+  }
+  if ((!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL)) ||
+      (!strcmp ((const char*)chVendorName, CPU_Vendor_AMD))) { // confirmed_safe_unsafe_usage
+    if (uiFeatureD & 0x10000000) {
+      /* Multi-Threading checking: contains of multiple logic processors */
+      uiCPU |= WELS_CPU_HTT;
+    }
+  }
+
+  if (uiFeatureC & 0x00000001) {
+    /* SSE3 support here */
+    uiCPU |= WELS_CPU_SSE3;
+  }
+  if (uiFeatureC & 0x00000200) {
+    /* SSSE3 support here */
+    uiCPU |= WELS_CPU_SSSE3;
+  }
+  if (uiFeatureC & 0x00080000) {
+    /* SSE4.1 support here, 45nm Penryn processor */
+    uiCPU |= WELS_CPU_SSE41;
+  }
+  if (uiFeatureC & 0x00100000) {
+    /* SSE4.2 support here, next generation Nehalem processor */
+    uiCPU |= WELS_CPU_SSE42;
+  }
+  if (WelsCPUSupportAVX (uiFeatureA, uiFeatureC)) {
+    /* AVX supported */
+    uiCPU |= WELS_CPU_AVX;
+  }
+  if (WelsCPUSupportFMA (uiFeatureA, uiFeatureC)) {
+    /* AVX FMA supported */
+    uiCPU |= WELS_CPU_FMA;
+  }
+  if (uiFeatureC & 0x02000000) {
+    /* AES checking */
+    uiCPU |= WELS_CPU_AES;
+  }
+  if (uiFeatureC & 0x00400000) {
+    /* MOVBE checking */
+    uiCPU |= WELS_CPU_MOVBE;
+  }
+
+  if (uiMaxCpuidLevel >= 7) {
+    uiFeatureC = 0;
+    WelsCPUId (7, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+    if ((uiCPU & WELS_CPU_AVX) && (uiFeatureB & 0x00000020)) {
+      /* AVX2 supported */
+      uiCPU |= WELS_CPU_AVX2;
+    }
+  }
+
+  if (pNumberOfLogicProcessors != NULL) {
+    if (uiCPU & WELS_CPU_HTT) {
+      *pNumberOfLogicProcessors = (uiFeatureB & 0x00ff0000) >> 16; // feature bits: 23-16 on returned EBX
+    } else {
+      *pNumberOfLogicProcessors = 0;
+    }
+    if (!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL)) {
+      if (uiMaxCpuidLevel >= 4) {
+        uiFeatureC = 0;
+        WelsCPUId (0x4, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+        if (uiFeatureA != 0) {
+          *pNumberOfLogicProcessors = ((uiFeatureA & 0xfc000000) >> 26) + 1;
+        }
+      }
+    }
+  }
+
+  WelsCPUId (0x80000000, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+
+  if ((!strcmp ((const char*)chVendorName, CPU_Vendor_AMD))
+      && (uiFeatureA >= 0x80000001)) { // confirmed_safe_unsafe_usage
+    WelsCPUId (0x80000001, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+    if (uiFeatureD & 0x00400000) {
+      uiCPU |= WELS_CPU_MMXEXT;
+    }
+    if (uiFeatureD & 0x80000000) {
+      uiCPU |= WELS_CPU_3DNOW;
+    }
+  }
+
+  if (!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL)) { // confirmed_safe_unsafe_usage
+    int32_t  family, model;
+
+    WelsCPUId (1, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+    family = ((uiFeatureA >> 8) & 0xf) + ((uiFeatureA >> 20) & 0xff);
+    model  = ((uiFeatureA >> 4) & 0xf) + ((uiFeatureA >> 12) & 0xf0);
+
+    if ((family == 6) && (model == 9 || model == 13 || model == 14)) {
+      uiCPU &= ~ (WELS_CPU_SSE2 | WELS_CPU_SSE3);
+    }
+  }
+
+  // get cache line size
+  if ((!strcmp ((const char*)chVendorName, CPU_Vendor_INTEL))
+      || ! (strcmp ((const char*)chVendorName, CPU_Vendor_CYRIX))) { // confirmed_safe_unsafe_usage
+    WelsCPUId (1, &uiFeatureA, &uiFeatureB, &uiFeatureC, &uiFeatureD);
+
+    CacheLineSize = (uiFeatureB & 0xff00) >>
+                    5; // ((clflush_line_size >> 8) << 3), CLFLUSH_line_size * 8 = CacheLineSize_in_byte
+
+    if (CacheLineSize == 128) {
+      uiCPU |= WELS_CPU_CACHELINE_128;
+    } else if (CacheLineSize == 64) {
+      uiCPU |= WELS_CPU_CACHELINE_64;
+    } else if (CacheLineSize == 32) {
+      uiCPU |= WELS_CPU_CACHELINE_32;
+    } else if (CacheLineSize == 16) {
+      uiCPU |= WELS_CPU_CACHELINE_16;
+    }
+  }
+
+  return uiCPU;
+}
+
+
+void WelsCPURestore (const uint32_t kuiCPU) {
+  if (kuiCPU & (WELS_CPU_MMX | WELS_CPU_MMXEXT | WELS_CPU_3DNOW | WELS_CPU_3DNOWEXT)) {
+    WelsEmms();
+  }
+}
+
+#elif defined(HAVE_NEON) //For supporting both android platform and iOS platform
+#if defined(ANDROID_NDK)
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  uint32_t         uiCPU = 0;
+  AndroidCpuFamily cpuFamily = ANDROID_CPU_FAMILY_UNKNOWN;
+  uint64_t         uiFeatures = 0;
+  cpuFamily = android_getCpuFamily();
+  if (cpuFamily == ANDROID_CPU_FAMILY_ARM) {
+    uiFeatures = android_getCpuFeatures();
+    if (uiFeatures & ANDROID_CPU_ARM_FEATURE_ARMv7) {
+      uiCPU |= WELS_CPU_ARMv7;
+    }
+    if (uiFeatures & ANDROID_CPU_ARM_FEATURE_VFPv3) {
+      uiCPU |= WELS_CPU_VFPv3;
+    }
+    if (uiFeatures & ANDROID_CPU_ARM_FEATURE_NEON) {
+      uiCPU |= WELS_CPU_NEON;
+    }
+  }
+
+  if (pNumberOfLogicProcessors != NULL) {
+    *pNumberOfLogicProcessors = android_getCpuCount();
+  }
+
+  return uiCPU;
+}
+
+#elif defined(__APPLE__)
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  uint32_t       uiCPU = 0;
+
+#if defined(__ARM_NEON__)
+  uiCPU |= WELS_CPU_ARMv7;
+  uiCPU |= WELS_CPU_VFPv3;
+  uiCPU |= WELS_CPU_NEON;
+#endif
+  return uiCPU;
+}
+#elif defined(__linux__)
+
+/* Generic arm/linux cpu feature detection */
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  int flags = 0;
+  FILE* f = fopen ("/proc/cpuinfo", "r");
+
+#if defined(__chromeos__)
+  flags |= WELS_CPU_NEON;
+#endif
+
+  if (!f) {
+    return flags;
+  }
+
+  char buf[200];
+  while (fgets (buf, sizeof (buf), f)) {
+    if (!strncmp (buf, "Features", strlen ("Features"))) {
+      // The asimd and fp features are listed on 64 bit ARMv8 kernels
+      if (strstr (buf, " neon ") || strstr (buf, " asimd "))
+        flags |= WELS_CPU_NEON;
+      if (strstr (buf, " vfpv3 ") || strstr (buf, " fp "))
+        flags |= WELS_CPU_VFPv3;
+      break;
+    }
+  }
+  fclose (f);
+  return flags;
+}
+
+#else /* HAVE_NEON enabled but no runtime detection */
+
+/* No runtime feature detection available, but built with HAVE_NEON - assume
+ * that NEON and all associated features are available. */
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  return WELS_CPU_ARMv7 |
+         WELS_CPU_VFPv3 |
+         WELS_CPU_NEON;
+}
+#endif
+#elif defined(HAVE_NEON_AARCH64)
+
+/* For AArch64, no runtime detection actually is necessary for now, since
+ * NEON and VFPv3 is mandatory on all such CPUs. (/proc/cpuinfo doesn't
+ * contain neon, and the android cpufeatures library doesn't return it
+ * either.) */
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  return WELS_CPU_VFPv3 |
+         WELS_CPU_NEON;
+}
+
+#elif defined(mips)
+/* for loongson */
+static uint32_t get_cpu_flags_from_cpuinfo(void)
+{
+    uint32_t flags = 0;
+
+# ifdef __linux__
+    FILE* fp = fopen("/proc/cpuinfo", "r");
+    if (!fp)
+        return flags;
+
+    char buf[200];
+    memset(buf, 0, sizeof(buf));
+    while (fgets(buf, sizeof(buf), fp)) {
+        if (!strncmp(buf, "model name", strlen("model name"))) {
+            if (strstr(buf, "Loongson-3A") || strstr(buf, "Loongson-3B") ||
+                strstr(buf, "Loongson-2K")) {
+                flags |= WELS_CPU_MMI;
+            }
+            break;
+        }
+    }
+    while (fgets(buf, sizeof(buf), fp)) {
+        if(!strncmp(buf, "ASEs implemented", strlen("ASEs implemented"))) {
+            if (strstr(buf, "loongson-mmi") && strstr(buf, "loongson-ext")) {
+                flags |= WELS_CPU_MMI;
+            }
+            if (strstr(buf, "msa")) {
+                flags |= WELS_CPU_MSA;
+            }
+            break;
+        }
+    }
+    fclose(fp);
+# endif
+
+    return flags;
+}
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+    return get_cpu_flags_from_cpuinfo();
+}
+
+#else /* Neither X86_ASM, HAVE_NEON, HAVE_NEON_AARCH64 nor mips */
+
+uint32_t WelsCPUFeatureDetect (int32_t* pNumberOfLogicProcessors) {
+  return 0;
+}
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/crt_util_safe_x.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/crt_util_safe_x.cpp
new file mode 100644
index 0000000000..9d54ea8e67
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/crt_util_safe_x.cpp
@@ -0,0 +1,266 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    crt_utils_safe_x.cpp
+ *
+ * \brief   common tool/function utilization
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include <string.h>
+#include <stdlib.h>
+#include <math.h>
+#include <time.h>
+#if defined(_WIN32)
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/timeb.h>
+#ifndef _MSC_VER
+#include <sys/time.h>
+#endif //!_MSC_VER
+#else
+#include <sys/time.h>
+#endif //_WIN32
+
+#include "macros.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
+
+#if defined(_WIN32) && defined(_MSC_VER)
+
+#if defined(_MSC_VER) && (_MSC_VER>=1500)
+
+int32_t WelsSnprintf (char* pBuffer,  int32_t iSizeOfBuffer, const char* kpFormat, ...) {
+  va_list  pArgPtr;
+  int32_t  iRc;
+
+  va_start (pArgPtr, kpFormat);
+
+  iRc = vsnprintf_s (pBuffer, iSizeOfBuffer, _TRUNCATE, kpFormat, pArgPtr);
+  if (iRc < 0)
+    iRc = iSizeOfBuffer;
+
+  va_end (pArgPtr);
+
+  return iRc;
+}
+
+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {
+  strncpy_s (pDest, iSizeInBytes, kpSrc, _TRUNCATE);
+
+  return pDest;
+}
+
+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {
+  int32_t iRc = vsnprintf_s (pBuffer, iSizeOfBuffer, _TRUNCATE, kpFormat, pArgPtr);
+  if (iRc < 0)
+    iRc = iSizeOfBuffer;
+  return iRc;
+}
+
+WelsFileHandle* WelsFopen (const char* kpFilename,  const char* kpMode) {
+  WelsFileHandle* pFp = NULL;
+  if (fopen_s (&pFp, kpFilename, kpMode) != 0) {
+    return NULL;
+  }
+
+  return pFp;
+}
+
+int32_t WelsFclose (WelsFileHandle* pFp) {
+  return fclose (pFp);
+}
+
+int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
+  return _ftime_s (pTp);
+}
+
+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {
+  struct tm   sTimeNow;
+  int32_t iRc;
+
+  localtime_s (&sTimeNow, &kpTp->time);
+
+  iRc = (int32_t)strftime (pBuffer, iSize, kpFormat, &sTimeNow);
+  if (iRc == 0)
+    pBuffer[0] = '\0';
+  return iRc;
+}
+
+#else
+
+int32_t WelsSnprintf (char* pBuffer,  int32_t iSizeOfBuffer, const char* kpFormat, ...) {
+  va_list pArgPtr;
+  int32_t iRc;
+
+  va_start (pArgPtr, kpFormat);
+
+  iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
+  if (iRc < 0) {
+    pBuffer[iSizeOfBuffer - 1] = '\0';
+    iRc = iSizeOfBuffer;
+  }
+
+  va_end (pArgPtr);
+
+  return iRc;
+}
+
+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {
+  strncpy (pDest, kpSrc, iSizeInBytes); //confirmed_safe_unsafe_usage
+  pDest[iSizeInBytes - 1] = '\0';
+
+  return pDest;
+}
+
+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {
+  int32_t iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
+  if (iRc < 0) {
+    pBuffer[iSizeOfBuffer - 1] = '\0';
+    iRc = iSizeOfBuffer;
+  }
+  return iRc;
+}
+
+
+WelsFileHandle* WelsFopen (const char* kpFilename,  const char* kpMode) {
+  return fopen (kpFilename, kpMode);
+}
+
+int32_t WelsFclose (WelsFileHandle* pFp) {
+  return fclose (pFp);
+}
+
+int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
+  _ftime (pTp);
+  return 0;
+}
+
+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {
+  struct tm*   pTnow;
+  int32_t iRc;
+
+  pTnow = localtime (&kpTp->time);
+
+  iRc = strftime (pBuffer, iSize, kpFormat, pTnow);
+  if (iRc == 0)
+    pBuffer[0] = '\0';
+  return iRc;
+}
+
+
+#endif // _MSC_VER
+
+#else  //GCC
+
+int32_t WelsSnprintf (char* pBuffer,  int32_t iSizeOfBuffer, const char* kpFormat, ...) {
+  va_list pArgPtr;
+  int32_t iRc;
+
+  va_start (pArgPtr, kpFormat);
+
+  iRc = vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr);
+
+  va_end (pArgPtr);
+
+  return iRc;
+}
+
+char* WelsStrncpy (char* pDest, int32_t iSizeInBytes, const char* kpSrc) {
+  strncpy (pDest, kpSrc, iSizeInBytes); //confirmed_safe_unsafe_usage
+  pDest[iSizeInBytes - 1] = '\0';
+  return pDest;
+}
+
+int32_t WelsVsnprintf (char* pBuffer, int32_t iSizeOfBuffer, const char* kpFormat, va_list pArgPtr) {
+  return vsnprintf (pBuffer, iSizeOfBuffer, kpFormat, pArgPtr); //confirmed_safe_unsafe_usage
+}
+
+WelsFileHandle* WelsFopen (const char* kpFilename,  const char* kpMode) {
+  return fopen (kpFilename, kpMode);
+}
+
+int32_t WelsFclose (WelsFileHandle*   pFp) {
+  return fclose (pFp);
+}
+
+int32_t WelsGetTimeOfDay (SWelsTime* pTp) {
+  struct timeval  sTv;
+
+  if (gettimeofday (&sTv, NULL)) {
+    return -1;
+  }
+
+  pTp->time = sTv.tv_sec;
+  pTp->millitm = (uint16_t)sTv.tv_usec / 1000;
+
+  return 0;
+}
+
+int32_t WelsStrftime (char* pBuffer, int32_t iSize, const char* kpFormat, const SWelsTime* kpTp) {
+  struct tm*   pTnow;
+  int32_t iRc;
+
+  pTnow = localtime (&kpTp->time);
+
+  iRc = (int32_t) strftime (pBuffer, iSize, kpFormat, pTnow);
+  if (iRc == 0)
+    pBuffer[0] = '\0';
+  return iRc;
+}
+
+#endif
+
+
+char* WelsStrcat (char* pDest, uint32_t uiSizeInBytes, const char* kpSrc) {
+  uint32_t uiCurLen = (uint32_t) strlen (pDest);
+  if (uiSizeInBytes > uiCurLen)
+    return WelsStrncpy (pDest + uiCurLen, uiSizeInBytes - uiCurLen, kpSrc);
+  return pDest;
+}
+
+int32_t WelsFwrite (const void* kpBuffer, int32_t iSize, int32_t iCount, WelsFileHandle* pFp) {
+  return (int32_t)fwrite (kpBuffer, iSize, iCount, pFp);
+}
+
+uint16_t WelsGetMillisecond (const SWelsTime* kpTp) {
+  return kpTp->millitm;
+}
+
+int32_t WelsFseek (WelsFileHandle* fp, int32_t offset, int32_t origin) {
+  return fseek (fp, offset, origin);
+}
+
+int32_t WelsFflush (WelsFileHandle* pFp) {
+  return fflush (pFp);
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/deblocking_common.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/deblocking_common.cpp
new file mode 100644
index 0000000000..096859b3ad
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/deblocking_common.cpp
@@ -0,0 +1,295 @@
+#include "deblocking_common.h"
+#include "macros.h"
+
+//  C code only
+void DeblockLumaLt4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta,
+                       int8_t* pTc) {
+  for (int32_t i = 0; i < 16; i++) {
+    int32_t iTc0 = pTc[i >> 2];
+    if (iTc0 >= 0) {
+      int32_t p0 = pPix[-iStrideX];
+      int32_t p1 = pPix[-2 * iStrideX];
+      int32_t p2 = pPix[-3 * iStrideX];
+      int32_t q0 = pPix[0];
+      int32_t q1 = pPix[iStrideX];
+      int32_t q2 = pPix[2 * iStrideX];
+      bool bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+      bool bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+      bool bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+      int32_t iTc = iTc0;
+      if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+        bool bDetaP2P0 =  WELS_ABS (p2 - p0) < iBeta;
+        bool bDetaQ2Q0 =  WELS_ABS (q2 - q0) < iBeta;
+        if (bDetaP2P0) {
+          pPix[-2 * iStrideX] = p1 + WELS_CLIP3 ((p2 + ((p0 + q0 + 1) >> 1) - (p1 * (1 << 1))) >> 1, -iTc0, iTc0);
+          iTc++;
+        }
+        if (bDetaQ2Q0) {
+          pPix[iStrideX] = q1 + WELS_CLIP3 ((q2 + ((p0 + q0 + 1) >> 1) - (q1 * (1 << 1))) >> 1, -iTc0, iTc0);
+          iTc++;
+        }
+        int32_t iDeta = WELS_CLIP3 ((((q0 - p0) * (1 << 2)) + (p1 - q1) + 4) >> 3, -iTc, iTc);
+        pPix[-iStrideX] = WelsClip1 (p0 + iDeta);     /* p0' */
+        pPix[0]  = WelsClip1 (q0 - iDeta);     /* q0' */
+      }
+    }
+    pPix += iStrideY;
+  }
+}
+void DeblockLumaEq4_c (uint8_t* pPix, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha, int32_t iBeta) {
+  int32_t p0, p1, p2, q0, q1, q2;
+  int32_t iDetaP0Q0;
+  bool bDetaP1P0, bDetaQ1Q0;
+  for (int32_t i = 0; i < 16; i++) {
+    p0 = pPix[-iStrideX];
+    p1 = pPix[-2 * iStrideX];
+    p2 = pPix[-3 * iStrideX];
+    q0 = pPix[0];
+    q1 = pPix[iStrideX];
+    q2 = pPix[2 * iStrideX];
+    iDetaP0Q0 = WELS_ABS (p0 - q0);
+    bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+    bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+    if ((iDetaP0Q0 < iAlpha) && bDetaP1P0 && bDetaQ1Q0) {
+      if (iDetaP0Q0 < ((iAlpha >> 2) + 2)) {
+        bool bDetaP2P0 = WELS_ABS (p2 - p0) < iBeta;
+        bool bDetaQ2Q0 =  WELS_ABS (q2 - q0) < iBeta;
+        if (bDetaP2P0) {
+          const int32_t p3 = pPix[-4 * iStrideX];
+          pPix[-iStrideX] = (p2 + (p1 * (1 << 1)) + (p0 * (1 << 1)) + (q0 * (1 << 1)) + q1 + 4) >> 3;   //p0
+          pPix[-2 * iStrideX] = (p2 + p1 + p0 + q0 + 2) >> 2;                         //p1
+          pPix[-3 * iStrideX] = ((p3 * (1 << 1)) + p2 + (p2 * (1 << 1)) + p1 + p0 + q0 + 4) >> 3; //p2
+        } else {
+          pPix[-1 * iStrideX] = ((p1 * (1 << 1)) + p0 + q1 + 2) >> 2;                       //p0
+        }
+        if (bDetaQ2Q0) {
+          const int32_t q3 = pPix[3 * iStrideX];
+          pPix[0] = (p1 + (p0 * (1 << 1)) + (q0 * (1 << 1)) + (q1 * (1 << 1)) + q2 + 4) >> 3;           //q0
+          pPix[iStrideX] = (p0 + q0 + q1 + q2 + 2) >> 2;                              //q1
+          pPix[2 * iStrideX] = ((q3 * (1 << 1)) + q2 + (q2 * (1 << 1)) + q1 + q0 + p0 + 4) >> 3;  //q2
+        } else {
+          pPix[0] = ((q1 * (1 << 1)) + q0 + p1 + 2) >> 2;                                   //q0
+        }
+      } else {
+        pPix[-iStrideX] = ((p1 * (1 << 1)) + p0 + q1 + 2) >> 2;   //p0
+        pPix[ 0] = ((q1 * (1 << 1)) + q0 + p1 + 2) >> 2;          //q0
+      }
+    }
+    pPix += iStrideY;
+  }
+}
+void DeblockLumaLt4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {
+  DeblockLumaLt4_c (pPix, iStride, 1, iAlpha, iBeta, tc);
+}
+void DeblockLumaLt4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* tc) {
+  DeblockLumaLt4_c (pPix, 1, iStride, iAlpha, iBeta, tc);
+}
+void DeblockLumaEq4V_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockLumaEq4_c (pPix, iStride, 1, iAlpha, iBeta);
+}
+void DeblockLumaEq4H_c (uint8_t* pPix, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockLumaEq4_c (pPix, 1, iStride, iAlpha, iBeta);
+}
+void DeblockChromaLt4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+                         int32_t iBeta, int8_t* pTc) {
+  int32_t p0, p1, q0, q1, iDeta;
+  bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+
+  for (int32_t i = 0; i < 8; i++) {
+    int32_t iTc0 = pTc[i >> 1];
+    if (iTc0 > 0) {
+      p0 = pPixCb[-iStrideX];
+      p1 = pPixCb[-2 * iStrideX];
+      q0 = pPixCb[0];
+      q1 = pPixCb[iStrideX];
+
+      bDetaP0Q0 =  WELS_ABS (p0 - q0) < iAlpha;
+      bDetaP1P0 =  WELS_ABS (p1 - p0) < iBeta;
+      bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+      if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+        iDeta = WELS_CLIP3 ((((q0 - p0) * (1 << 2)) + (p1 - q1) + 4) >> 3, -iTc0, iTc0);
+        pPixCb[-iStrideX] = WelsClip1 (p0 + iDeta);     /* p0' */
+        pPixCb[0]  = WelsClip1 (q0 - iDeta);     /* q0' */
+      }
+
+
+      p0 = pPixCr[-iStrideX];
+      p1 = pPixCr[-2 * iStrideX];
+      q0 = pPixCr[0];
+      q1 = pPixCr[iStrideX];
+
+      bDetaP0Q0 =  WELS_ABS (p0 - q0) < iAlpha;
+      bDetaP1P0 =  WELS_ABS (p1 - p0) < iBeta;
+      bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+
+      if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+        iDeta = WELS_CLIP3 ((((q0 - p0) * (1 << 2)) + (p1 - q1) + 4) >> 3, -iTc0, iTc0);
+        pPixCr[-iStrideX] = WelsClip1 (p0 + iDeta);     /* p0' */
+        pPixCr[0]  = WelsClip1 (q0 - iDeta);     /* q0' */
+      }
+    }
+    pPixCb += iStrideY;
+    pPixCr += iStrideY;
+  }
+}
+void DeblockChromaEq4_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+                         int32_t iBeta) {
+  int32_t p0, p1, q0, q1;
+  bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+  for (int32_t i = 0; i < 8; i++) {
+    //cb
+    p0 = pPixCb[-iStrideX];
+    p1 = pPixCb[-2 * iStrideX];
+    q0 = pPixCb[0];
+    q1 = pPixCb[iStrideX];
+    bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+    bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+    bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+    if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+      pPixCb[-iStrideX] = ((p1 * (1 << 1)) + p0 + q1 + 2) >> 2;     /* p0' */
+      pPixCb[0]  = ((q1 * (1 << 1)) + q0 + p1 + 2) >> 2;     /* q0' */
+    }
+
+    //cr
+    p0 = pPixCr[-iStrideX];
+    p1 = pPixCr[-2 * iStrideX];
+    q0 = pPixCr[0];
+    q1 = pPixCr[iStrideX];
+    bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+    bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+    bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+    if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+      pPixCr[-iStrideX] = ((p1 * (1 << 1)) + p0 + q1 + 2) >> 2;     /* p0' */
+      pPixCr[0]  = ((q1 * (1 << 1)) + q0 + p1 + 2) >> 2;     /* q0' */
+    }
+    pPixCr += iStrideY;
+    pPixCb += iStrideY;
+  }
+}
+void DeblockChromaLt4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* tc) {
+  DeblockChromaLt4_c (pPixCb, pPixCr, iStride, 1, iAlpha, iBeta, tc);
+}
+void DeblockChromaLt4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                          int8_t* tc) {
+  DeblockChromaLt4_c (pPixCb, pPixCr, 1, iStride, iAlpha, iBeta, tc);
+}
+void DeblockChromaEq4V_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockChromaEq4_c (pPixCb, pPixCr, iStride, 1, iAlpha, iBeta);
+}
+void DeblockChromaEq4H_c (uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockChromaEq4_c (pPixCb, pPixCr, 1, iStride, iAlpha, iBeta);
+}
+
+void DeblockChromaLt42_c (uint8_t* pPixCbCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+                          int32_t iBeta, int8_t* pTc) {
+  int32_t p0, p1, q0, q1, iDeta;
+  bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+
+  for (int32_t i = 0; i < 8; i++) {
+    int32_t iTc0 = pTc[i >> 1];
+    if (iTc0 > 0) {
+      p0 = pPixCbCr[-iStrideX];
+      p1 = pPixCbCr[-2 * iStrideX];
+      q0 = pPixCbCr[0];
+      q1 = pPixCbCr[iStrideX];
+
+      bDetaP0Q0 =  WELS_ABS (p0 - q0) < iAlpha;
+      bDetaP1P0 =  WELS_ABS (p1 - p0) < iBeta;
+      bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+      if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+        iDeta = WELS_CLIP3 ((((q0 - p0) * (1 << 2)) + (p1 - q1) + 4) >> 3, -iTc0, iTc0);
+        pPixCbCr[-iStrideX] = WelsClip1 (p0 + iDeta);     /* p0' */
+        pPixCbCr[0]  = WelsClip1 (q0 - iDeta);     /* q0' */
+      }
+
+
+    }
+    pPixCbCr += iStrideY;
+  }
+}
+void DeblockChromaEq42_c (uint8_t* pPixCbCr, int32_t iStrideX, int32_t iStrideY, int32_t iAlpha,
+                          int32_t iBeta) {
+  int32_t p0, p1, q0, q1;
+  bool bDetaP0Q0, bDetaP1P0, bDetaQ1Q0;
+  for (int32_t i = 0; i < 8; i++) {
+    p0 = pPixCbCr[-iStrideX];
+    p1 = pPixCbCr[-2 * iStrideX];
+    q0 = pPixCbCr[0];
+    q1 = pPixCbCr[iStrideX];
+    bDetaP0Q0 = WELS_ABS (p0 - q0) < iAlpha;
+    bDetaP1P0 = WELS_ABS (p1 - p0) < iBeta;
+    bDetaQ1Q0 = WELS_ABS (q1 - q0) < iBeta;
+    if (bDetaP0Q0 && bDetaP1P0 && bDetaQ1Q0) {
+      pPixCbCr[-iStrideX] = ((p1 * (1 << 1)) + p0 + q1 + 2) >> 2;     /* p0' */
+      pPixCbCr[0]  = ((q1 * (1 << 1)) + q0 + p1 + 2) >> 2;     /* q0' */
+    }
+
+    pPixCbCr += iStrideY;
+  }
+}
+
+void DeblockChromaLt4V2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                           int8_t* tc) {
+  DeblockChromaLt42_c (pPixCbCr, iStride, 1, iAlpha, iBeta, tc);
+}
+void DeblockChromaLt4H2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                           int8_t* tc) {
+
+  DeblockChromaLt42_c (pPixCbCr, 1, iStride, iAlpha, iBeta, tc);
+}
+void DeblockChromaEq4V2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockChromaEq42_c (pPixCbCr, iStride, 1, iAlpha, iBeta);
+}
+void DeblockChromaEq4H2_c (uint8_t* pPixCbCr, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+  DeblockChromaEq42_c (pPixCbCr, 1, iStride, iAlpha, iBeta);
+}
+
+void WelsNonZeroCount_c (int8_t* pNonZeroCount) {
+  int32_t i;
+  for (i = 0; i < 24; i++) {
+    pNonZeroCount[i] = !!pNonZeroCount[i];
+  }
+}
+
+#ifdef X86_ASM
+extern "C" {
+  void DeblockLumaLt4H_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc) {
+    ENFORCE_STACK_ALIGN_1D (uint8_t,  uiBuf,   16 * 8, 16);
+
+    DeblockLumaTransposeH2V_sse2 (pPixY - 4, iStride, &uiBuf[0]);
+    DeblockLumaLt4V_ssse3 (&uiBuf[4 * 16], 16, iAlpha, iBeta, pTc);
+    DeblockLumaTransposeV2H_sse2 (pPixY - 4, iStride, &uiBuf[0]);
+  }
+
+  void DeblockLumaEq4H_ssse3 (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+    ENFORCE_STACK_ALIGN_1D (uint8_t,  uiBuf,   16 * 8, 16);
+
+    DeblockLumaTransposeH2V_sse2 (pPixY - 4, iStride, &uiBuf[0]);
+    DeblockLumaEq4V_ssse3 (&uiBuf[4 * 16], 16, iAlpha, iBeta);
+    DeblockLumaTransposeV2H_sse2 (pPixY - 4, iStride, &uiBuf[0]);
+  }
+
+}
+
+#endif
+
+#ifdef HAVE_MMI
+extern "C" {
+  void DeblockLumaLt4H_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* pTc) {
+    ENFORCE_STACK_ALIGN_1D (uint8_t,  uiBuf,   16 * 8, 16);
+
+    DeblockLumaTransposeH2V_mmi (pPixY - 4, iStride, &uiBuf[0]);
+    DeblockLumaLt4V_mmi (&uiBuf[4 * 16], 16, iAlpha, iBeta, pTc);
+    DeblockLumaTransposeV2H_mmi (pPixY - 4, iStride, &uiBuf[0]);
+  }
+
+  void DeblockLumaEq4H_mmi (uint8_t* pPixY, int32_t iStride, int32_t iAlpha, int32_t iBeta) {
+    ENFORCE_STACK_ALIGN_1D (uint8_t,  uiBuf,   16 * 8, 16);
+
+    DeblockLumaTransposeH2V_mmi (pPixY - 4, iStride, &uiBuf[0]);
+    DeblockLumaEq4V_mmi (&uiBuf[4 * 16], 16, iAlpha, iBeta);
+    DeblockLumaTransposeV2H_mmi (pPixY - 4, iStride, &uiBuf[0]);
+  }
+}
+#endif//HAVE_MMI
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/expand_pic.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/expand_pic.cpp
new file mode 100644
index 0000000000..fcd96540e9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/expand_pic.cpp
@@ -0,0 +1,415 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#include <string.h>
+#include "expand_pic.h"
+#include "cpu_core.h"
+
+static inline void MBPadTopLeftLuma_c (uint8_t*& pDst, const int32_t& kiStride) {
+  const uint8_t kuiTL = pDst[0];
+  int32_t i = 0;
+  uint8_t* pTopLeft = pDst;
+  do {
+    pTopLeft -= kiStride;
+    // pad pTop
+    memcpy (pTopLeft, pDst, 16);           // confirmed_safe_unsafe_usage
+    memset (pTopLeft - PADDING_LENGTH, kuiTL, PADDING_LENGTH); //pTop left
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadTopLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbX) {
+  uint8_t* pTopLine = pDst + (kiMbX << 4);
+  int32_t i = 0;
+  uint8_t* pTop = pTopLine;
+  do {
+    pTop -= kiStride;
+    // pad pTop
+    memcpy (pTop, pTopLine, 16);          // confirmed_safe_unsafe_usage
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadBottomLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbX,
+                                      const int32_t& kiPicH) {
+  uint8_t* pBottomLine = pDst + (kiPicH - 1) * kiStride + (kiMbX << 4);
+  int32_t i = 0;
+  uint8_t* pBottom = pBottomLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom, pBottomLine, 16);       // confirmed_safe_unsafe_usage
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadTopRightLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW) {
+  uint8_t* pTopRight = pDst + kiPicW;
+  const uint8_t kuiTR = pTopRight[-1];
+  int32_t i = 0;
+  uint8_t* pTop = pTopRight;
+  do {
+    pTop -= kiStride;
+    // pad pTop
+    memcpy (pTop - 16, pTopRight - 16, 16);          // confirmed_safe_unsafe_usage
+    memset (pTop, kuiTR, PADDING_LENGTH); //pTop Right
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadBottomLeftLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicH) {
+  uint8_t* pDstLastLine = pDst + (kiPicH - 1) * kiStride;
+  const uint8_t kuiBL = pDstLastLine[0];
+  int32_t i = 0;
+  uint8_t* pBottom = pDstLastLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom, pDstLastLine, 16);          // confirmed_safe_unsafe_usage
+    memset (pBottom - PADDING_LENGTH, kuiBL, PADDING_LENGTH); //pBottom left
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadBottomRightLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW,
+    const int32_t& kiPicH) {
+  uint8_t* pDstLastLine = pDst + (kiPicH - 1) * kiStride + kiPicW;
+  const uint8_t kuiBR = pDstLastLine[-1];
+  int32_t i = 0;
+  uint8_t* pBottom = pDstLastLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom - 16, pDstLastLine - 16, 16);         // confirmed_safe_unsafe_usage
+    memset (pBottom, kuiBR, PADDING_LENGTH); //pBottom Right
+  } while (++i < PADDING_LENGTH);
+}
+
+static inline void MBPadLeftLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbY) {
+  uint8_t* pTmp = pDst + (kiMbY << 4) * kiStride;
+  for (int32_t i = 0; i < 16; ++i) {
+    // pad left
+    memset (pTmp - PADDING_LENGTH, pTmp[0], PADDING_LENGTH);
+    pTmp += kiStride;
+  }
+}
+
+static inline void MBPadRightLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbY,
+                                     const int32_t& kiPicW) {
+  uint8_t* pTmp = pDst + (kiMbY << 4) * kiStride + kiPicW;
+  for (int32_t i = 0; i < 16; ++i) {
+    // pad right
+    memset (pTmp, pTmp[-1], PADDING_LENGTH);
+    pTmp += kiStride;
+  }
+}
+
+static inline void MBPadTopChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbX) {
+  uint8_t* pTopLine = pDst + (kiMbX << 3);
+  int32_t i = 0;
+  uint8_t* pTop = pTopLine;
+  do {
+    pTop -= kiStride;
+    // pad pTop
+    memcpy (pTop, pTopLine, 8);         // confirmed_safe_unsafe_usage
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadBottomChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbX,
+                                        const int32_t& kiPicH) {
+  uint8_t* pBottomLine = pDst + (kiPicH - 1) * kiStride + (kiMbX << 3);
+  int32_t i = 0;
+  uint8_t* pBottom = pBottomLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom, pBottomLine, 8);        // confirmed_safe_unsafe_usage
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadTopLeftChroma_c (uint8_t*& pDst, const int32_t& kiStride) {
+  const uint8_t kuiTL = pDst[0];
+  int32_t i = 0;
+  uint8_t* pTopLeft = pDst;
+  do {
+    pTopLeft -= kiStride;
+    // pad pTop
+    memcpy (pTopLeft, pDst, 8);          // confirmed_safe_unsafe_usage
+    memset (pTopLeft - CHROMA_PADDING_LENGTH, kuiTL, CHROMA_PADDING_LENGTH); //pTop left
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadTopRightChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW) {
+  uint8_t* pTopRight = pDst + kiPicW;
+  const uint8_t kuiTR = pTopRight[-1];
+  int32_t i = 0;
+  uint8_t* pTop = pTopRight;
+  do {
+    pTop -= kiStride;
+    // pad pTop
+    memcpy (pTop - 8, pTopRight - 8, 8);         // confirmed_safe_unsafe_usage
+    memset (pTop, kuiTR, CHROMA_PADDING_LENGTH); //pTop Right
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadBottomLeftChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicH) {
+  uint8_t* pDstLastLine = pDst + (kiPicH - 1) * kiStride;
+  const uint8_t kuiBL = pDstLastLine[0];
+  int32_t i = 0;
+  uint8_t* pBottom = pDstLastLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom, pDstLastLine, 8);         // confirmed_safe_unsafe_usage
+    memset (pBottom - CHROMA_PADDING_LENGTH, kuiBL, CHROMA_PADDING_LENGTH); //pBottom left
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadBottomRightChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW,
+    const int32_t kiPicH) {
+  uint8_t* pDstLastLine = pDst + (kiPicH - 1) * kiStride + kiPicW;
+  const uint8_t kuiBR = pDstLastLine[-1];
+  int32_t i = 0;
+  uint8_t* pBottom = pDstLastLine;
+  do {
+    pBottom += kiStride;
+    // pad pBottom
+    memcpy (pBottom - 8, pDstLastLine - 8, 8);       // confirmed_safe_unsafe_usage
+    memset (pBottom, kuiBR, CHROMA_PADDING_LENGTH); //pBottom Right
+  } while (++i < CHROMA_PADDING_LENGTH);
+}
+
+static inline void MBPadLeftChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbY) {
+  uint8_t* pTmp = pDst + (kiMbY << 3) * kiStride;
+  for (int32_t i = 0; i < 8; ++i) {
+    // pad left
+    memset (pTmp - CHROMA_PADDING_LENGTH, pTmp[0], CHROMA_PADDING_LENGTH);
+    pTmp += kiStride;
+  }
+}
+
+static inline void MBPadRightChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiMbY,
+                                       const int32_t& kiPicW) {
+  uint8_t* pTmp = pDst + (kiMbY << 3) * kiStride + kiPicW;
+  for (int32_t i = 0; i < 8; ++i) {
+    // pad right
+    memset (pTmp, pTmp[-1], CHROMA_PADDING_LENGTH);
+    pTmp += kiStride;
+  }
+}
+
+void PadMBLuma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW, const int32_t& kiPicH,
+                  const int32_t& kiMbX, const int32_t& kiMbY, const int32_t& kiMBWidth, const int32_t& kiMBHeight) {
+  if (kiMbX == 0 && kiMbY == 0) {
+    MBPadTopLeftLuma_c (pDst, kiStride);
+  } else if (kiMbY == 0 && kiMbX == kiMBWidth - 1) {
+    MBPadTopRightLuma_c (pDst, kiStride, kiPicW);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX == 0) {
+    MBPadBottomLeftLuma_c (pDst, kiStride, kiPicH);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX == kiMBWidth - 1) {
+    MBPadBottomRightLuma_c (pDst, kiStride, kiPicW, kiPicH);
+  }
+  if (kiMbX == 0) {
+    MBPadLeftLuma_c (pDst, kiStride, kiMbY);
+  } else if (kiMbX == kiMBWidth - 1) {
+    MBPadRightLuma_c (pDst, kiStride, kiMbY, kiPicW);
+  }
+  if (kiMbY == 0 && kiMbX > 0 && kiMbX < kiMBWidth - 1) {
+    MBPadTopLuma_c (pDst, kiStride, kiMbX);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX > 0 && kiMbX < kiMBWidth - 1) {
+    MBPadBottomLuma_c (pDst, kiStride, kiMbX, kiPicH);
+  }
+}
+
+void PadMBChroma_c (uint8_t*& pDst, const int32_t& kiStride, const int32_t& kiPicW, const int32_t& kiPicH,
+                    const int32_t& kiMbX, const int32_t& kiMbY, const int32_t& kiMBWidth, const int32_t& kiMBHeight) {
+  if (kiMbX == 0 && kiMbY == 0) {
+    MBPadTopLeftChroma_c (pDst, kiStride);
+  } else if (kiMbY == 0 && kiMbX == kiMBWidth - 1) {
+    MBPadTopRightChroma_c (pDst, kiStride, kiPicW);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX == 0) {
+    MBPadBottomLeftChroma_c (pDst, kiStride, kiPicH);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX == kiMBWidth - 1) {
+    MBPadBottomRightChroma_c (pDst, kiStride, kiPicW, kiPicH);
+  }
+  if (kiMbX == 0) {
+    MBPadLeftChroma_c (pDst, kiStride, kiMbY);
+  } else if (kiMbX == kiMBWidth - 1) {
+    MBPadRightChroma_c (pDst, kiStride, kiMbY, kiPicW);
+  }
+  if (kiMbY == 0 && kiMbX > 0 && kiMbX < kiMBWidth - 1) {
+    MBPadTopChroma_c (pDst, kiStride, kiMbX);
+  } else if (kiMbY == kiMBHeight - 1 && kiMbX > 0 && kiMbX < kiMBWidth - 1) {
+    MBPadBottomChroma_c (pDst, kiStride, kiMbX, kiPicH);
+  }
+}
+
+// rewrite it (split into luma & chroma) that is helpful for mmx/sse2 optimization perform, 9/27/2009
+static inline void ExpandPictureLuma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+                                        const int32_t kiPicH) {
+  uint8_t* pTmp              = pDst;
+  uint8_t* pDstLastLine      = pTmp + (kiPicH - 1) * kiStride;
+  const int32_t kiPaddingLen = PADDING_LENGTH;
+  const uint8_t kuiTL        = pTmp[0];
+  const uint8_t kuiTR        = pTmp[kiPicW - 1];
+  const uint8_t kuiBL        = pDstLastLine[0];
+  const uint8_t kuiBR        = pDstLastLine[kiPicW - 1];
+  int32_t i                  = 0;
+
+  do {
+    const int32_t kiStrides = (1 + i) * kiStride;
+    uint8_t* pTop           = pTmp - kiStrides;
+    uint8_t* pBottom        = pDstLastLine + kiStrides;
+
+    // pad pTop and pBottom
+    memcpy (pTop, pTmp, kiPicW);                // confirmed_safe_unsafe_usage
+    memcpy (pBottom, pDstLastLine, kiPicW);     // confirmed_safe_unsafe_usage
+
+    // pad corners
+    memset (pTop - kiPaddingLen, kuiTL, kiPaddingLen); //pTop left
+    memset (pTop + kiPicW, kuiTR, kiPaddingLen); //pTop right
+    memset (pBottom - kiPaddingLen, kuiBL, kiPaddingLen); //pBottom left
+    memset (pBottom + kiPicW, kuiBR, kiPaddingLen); //pBottom right
+
+    ++ i;
+  } while (i < kiPaddingLen);
+
+  // pad left and right
+  i = 0;
+  do {
+    memset (pTmp - kiPaddingLen, pTmp[0], kiPaddingLen);
+    memset (pTmp + kiPicW, pTmp[kiPicW - 1], kiPaddingLen);
+
+    pTmp += kiStride;
+    ++ i;
+  } while (i < kiPicH);
+}
+
+static inline void ExpandPictureChroma_c (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicW,
+    const int32_t kiPicH) {
+  uint8_t* pTmp                 = pDst;
+  uint8_t* pDstLastLine         = pTmp + (kiPicH - 1) * kiStride;
+  const int32_t kiPaddingLen    = (PADDING_LENGTH >> 1);
+  const uint8_t kuiTL           = pTmp[0];
+  const uint8_t kuiTR           = pTmp[kiPicW - 1];
+  const uint8_t kuiBL           = pDstLastLine[0];
+  const uint8_t kuiBR           = pDstLastLine[kiPicW - 1];
+  int32_t i                     = 0;
+
+  do {
+    const int32_t kiStrides = (1 + i) * kiStride;
+    uint8_t* pTop           = pTmp - kiStrides;
+    uint8_t* pBottom        = pDstLastLine + kiStrides;
+
+    // pad pTop and pBottom
+    memcpy (pTop, pTmp, kiPicW);                // confirmed_safe_unsafe_usage
+    memcpy (pBottom, pDstLastLine, kiPicW);     // confirmed_safe_unsafe_usage
+
+    // pad corners
+    memset (pTop - kiPaddingLen, kuiTL, kiPaddingLen); //pTop left
+    memset (pTop + kiPicW, kuiTR, kiPaddingLen); //pTop right
+    memset (pBottom - kiPaddingLen, kuiBL, kiPaddingLen); //pBottom left
+    memset (pBottom + kiPicW, kuiBR, kiPaddingLen); //pBottom right
+
+    ++ i;
+  } while (i < kiPaddingLen);
+
+  // pad left and right
+  i = 0;
+  do {
+    memset (pTmp - kiPaddingLen, pTmp[0], kiPaddingLen);
+    memset (pTmp + kiPicW, pTmp[kiPicW - 1], kiPaddingLen);
+
+    pTmp += kiStride;
+    ++ i;
+  } while (i < kiPicH);
+}
+
+void InitExpandPictureFunc (SExpandPicFunc* pExpandPicFunc, const uint32_t kuiCPUFlag) {
+  pExpandPicFunc->pfExpandLumaPicture        = ExpandPictureLuma_c;
+  pExpandPicFunc->pfExpandChromaPicture[0]   = ExpandPictureChroma_c;
+  pExpandPicFunc->pfExpandChromaPicture[1]   = ExpandPictureChroma_c;
+
+#if defined(X86_ASM)
+  if ((kuiCPUFlag & WELS_CPU_SSE2) == WELS_CPU_SSE2) {
+    pExpandPicFunc->pfExpandLumaPicture      = ExpandPictureLuma_sse2;
+    pExpandPicFunc->pfExpandChromaPicture[0] = ExpandPictureChromaUnalign_sse2;
+    pExpandPicFunc->pfExpandChromaPicture[1] = ExpandPictureChromaAlign_sse2;
+  }
+#endif//X86_ASM
+#if defined(HAVE_NEON)
+  if (kuiCPUFlag & WELS_CPU_NEON) {
+    pExpandPicFunc->pfExpandLumaPicture      = ExpandPictureLuma_neon;
+    pExpandPicFunc->pfExpandChromaPicture[0] = ExpandPictureChroma_neon;
+    pExpandPicFunc->pfExpandChromaPicture[1] = ExpandPictureChroma_neon;
+  }
+#endif//HAVE_NEON
+#if defined(HAVE_NEON_AARCH64)
+  if (kuiCPUFlag & WELS_CPU_NEON) {
+    pExpandPicFunc->pfExpandLumaPicture      = ExpandPictureLuma_AArch64_neon;
+    pExpandPicFunc->pfExpandChromaPicture[0] = ExpandPictureChroma_AArch64_neon;
+    pExpandPicFunc->pfExpandChromaPicture[1] = ExpandPictureChroma_AArch64_neon;
+  }
+#endif//HAVE_NEON_AARCH64
+#if defined(HAVE_MMI)
+  if (kuiCPUFlag & WELS_CPU_MMI) {
+    pExpandPicFunc->pfExpandLumaPicture      = ExpandPictureLuma_mmi;
+    pExpandPicFunc->pfExpandChromaPicture[0] = ExpandPictureChromaUnalign_mmi;
+    pExpandPicFunc->pfExpandChromaPicture[1] = ExpandPictureChromaAlign_mmi;
+  }
+#endif//HAVE_MMI
+}
+
+
+//void ExpandReferencingPicture (SPicture* pPic, PExpandPictureFunc pExpLuma, PExpandPictureFunc pExpChrom[2]) {
+void ExpandReferencingPicture (uint8_t* pData[3], int32_t iWidth, int32_t iHeight, int32_t iStride[3],
+                               PExpandPictureFunc pExpLuma, PExpandPictureFunc pExpChrom[2]) {
+  /*local variable*/
+  uint8_t* pPicY  = pData[0];
+  uint8_t* pPicCb = pData[1];
+  uint8_t* pPicCr = pData[2];
+  const int32_t kiWidthY    = iWidth;
+  const int32_t kiHeightY   = iHeight;
+  const int32_t kiWidthUV   = kiWidthY >> 1;
+  const int32_t kiHeightUV  = kiHeightY >> 1;
+
+
+
+  pExpLuma (pPicY, iStride[0], kiWidthY, kiHeightY);
+  if (kiWidthUV >= 16) {
+    // fix coding picture size as 16x16
+    const bool kbChrAligned = /*(iWidthUV >= 16) && */ ((kiWidthUV & 0x0F) == 0); // chroma planes: (16+iWidthUV) & 15
+    pExpChrom[kbChrAligned] (pPicCb, iStride[1], kiWidthUV, kiHeightUV);
+    pExpChrom[kbChrAligned] (pPicCr, iStride[2], kiWidthUV, kiHeightUV);
+  } else {
+    // fix coding picture size as 16x16
+    ExpandPictureChroma_c (pPicCb, iStride[1], kiWidthUV, kiHeightUV);
+    ExpandPictureChroma_c (pPicCr, iStride[2], kiWidthUV, kiHeightUV);
+  }
+
+
+
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/intra_pred_common.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/intra_pred_common.cpp
new file mode 100644
index 0000000000..f35ceccbc6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/intra_pred_common.cpp
@@ -0,0 +1,77 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    get_intra_predictor.c
+ *
+ * \brief   implementation for get intra predictor about 16x16, 4x4, chroma.
+ *
+ * \date    4/2/2009 Created
+ *          9/14/2009 C level based optimization with high performance gained.
+ *              [const, using ST32/ST64 to replace memset, memcpy and memmove etc.]
+ *
+ *************************************************************************************
+ */
+#include "ls_defines.h"
+#include "cpu_core.h"
+#include "intra_pred_common.h"
+
+
+void WelsI16x16LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  uint8_t i = 15;
+  const int8_t* kpSrc = (int8_t*)&pRef[-kiStride];
+  const uint64_t kuiT1 = LD64 (kpSrc);
+  const uint64_t kuiT2 = LD64 (kpSrc + 8);
+  uint8_t* pDst = pPred;
+
+  do {
+    ST64 (pDst  , kuiT1);
+    ST64 (pDst + 8, kuiT2);
+    pDst += 16;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iStridex15 = (kiStride << 4) - kiStride;
+  int32_t iPredStride = 16;
+  int32_t iPredStridex15 = 240; //(iPredStride<<4)-iPredStride;
+  uint8_t i = 15;
+
+  do {
+    const uint8_t kuiSrc8 = pRef[iStridex15 - 1];
+    const uint64_t kuiV64 = (uint64_t) (0x0101010101010101ULL * kuiSrc8);
+    ST64 (&pPred[iPredStridex15], kuiV64);
+    ST64 (&pPred[iPredStridex15 + 8], kuiV64);
+
+    iStridex15 -= kiStride;
+    iPredStridex15 -= iPredStride;
+  } while (i-- > 0);
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/mc.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/mc.cpp
new file mode 100644
index 0000000000..455fe5cfea
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/mc.cpp
@@ -0,0 +1,4266 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mc.c
+ *
+ * \brief   Interfaces implementation for motion compensation
+ *
+ * \date    03/17/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "mc.h"
+
+#include "cpu_core.h"
+#include "ls_defines.h"
+#include "macros.h"
+#include "asmdefs_mmi.h"
+
+namespace {
+
+typedef void (*PMcChromaWidthExtFunc) (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                       const uint8_t* kpABCD, int32_t iHeight);
+typedef void (*PWelsSampleWidthAveragingFunc) (uint8_t*, int32_t, const uint8_t*, int32_t, const uint8_t*,
+    int32_t, int32_t);
+typedef void (*PWelsMcWidthHeightFunc) (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                        int32_t iWidth, int32_t iHeight);
+
+/*------------------weight for chroma fraction pixel interpolation------------------*/
+//iA = (8 - dx) * (8 - dy);
+//iB = dx * (8 - dy);
+//iC = (8 - dx) * dy;
+//iD = dx * dy
+static const uint8_t g_kuiABCD[8][8][4] = { //g_kA[dy][dx], g_kB[dy][dx], g_kC[dy][dx], g_kD[dy][dx]
+  {
+    {64, 0, 0, 0}, {56, 8, 0, 0}, {48, 16, 0, 0}, {40, 24, 0, 0},
+    {32, 32, 0, 0}, {24, 40, 0, 0}, {16, 48, 0, 0}, {8, 56, 0, 0}
+  },
+  {
+    {56, 0, 8, 0}, {49, 7, 7, 1}, {42, 14, 6, 2}, {35, 21, 5, 3},
+    {28, 28, 4, 4}, {21, 35, 3, 5}, {14, 42, 2, 6}, {7, 49, 1, 7}
+  },
+  {
+    {48, 0, 16, 0}, {42, 6, 14, 2}, {36, 12, 12, 4}, {30, 18, 10, 6},
+    {24, 24, 8, 8}, {18, 30, 6, 10}, {12, 36, 4, 12}, {6, 42, 2, 14}
+  },
+  {
+    {40, 0, 24, 0}, {35, 5, 21, 3}, {30, 10, 18, 6}, {25, 15, 15, 9},
+    {20, 20, 12, 12}, {15, 25, 9, 15}, {10, 30, 6, 18}, {5, 35, 3, 21}
+  },
+  {
+    {32, 0, 32, 0}, {28, 4, 28, 4}, {24, 8, 24, 8}, {20, 12, 20, 12},
+    {16, 16, 16, 16}, {12, 20, 12, 20}, {8, 24, 8, 24}, {4, 28, 4, 28}
+  },
+  {
+    {24, 0, 40, 0}, {21, 3, 35, 5}, {18, 6, 30, 10}, {15, 9, 25, 15},
+    {12, 12, 20, 20}, {9, 15, 15, 25}, {6, 18, 10, 30}, {3, 21, 5, 35}
+  },
+  {
+    {16, 0, 48, 0}, {14, 2, 42, 6}, {12, 4, 36, 12}, {10, 6, 30, 18},
+    {8, 8, 24, 24}, {6, 10, 18, 30}, {4, 12, 12, 36}, {2, 14, 6, 42}
+  },
+  {
+    {8, 0, 56, 0}, {7, 1, 49, 7}, {6, 2, 42, 14}, {5, 3, 35, 21},
+    {4, 4, 28, 28}, {3, 5, 21, 35}, {2, 6, 14, 42}, {1, 7, 7, 49}
+  }
+};
+
+//***************************************************************************//
+//                          C code implementation                            //
+//***************************************************************************//
+static inline void McCopyWidthEq2_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight) {
+  int32_t i;
+  for (i = 0; i < iHeight; i++) { // iWidth == 2 only for chroma
+    ST16A2 (pDst, LD16 (pSrc));
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+static inline void McCopyWidthEq4_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight) {
+  int32_t i;
+  for (i = 0; i < iHeight; i++) {
+    ST32A4 (pDst, LD32 (pSrc));
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+static inline void McCopyWidthEq8_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                     int32_t iHeight) {
+  int32_t i;
+  for (i = 0; i < iHeight; i++) {
+    ST64A8 (pDst, LD64 (pSrc));
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+static inline void McCopyWidthEq16_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                      int32_t iHeight) {
+  int32_t i;
+  for (i = 0; i < iHeight; i++) {
+    ST64A8 (pDst  , LD64 (pSrc));
+    ST64A8 (pDst + 8, LD64 (pSrc + 8));
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+//--------------------Luma sample MC------------------//
+
+static inline int32_t HorFilterInput16bit_c (const int16_t* pSrc) {
+  int32_t iPix05 = pSrc[0] + pSrc[5];
+  int32_t iPix14 = pSrc[1] + pSrc[4];
+  int32_t iPix23 = pSrc[2] + pSrc[3];
+
+  return (iPix05 - (iPix14 * 5) + (iPix23 * 20));
+}
+// h: iOffset=1 / v: iOffset=iSrcStride
+static inline int32_t FilterInput8bitWithStride_c (const uint8_t* pSrc, const int32_t kiOffset) {
+  const int32_t kiOffset1 = kiOffset;
+  const int32_t kiOffset2 = (kiOffset << 1);
+  const int32_t kiOffset3 = kiOffset + kiOffset2;
+  const uint32_t kuiPix05   = * (pSrc - kiOffset2) + * (pSrc + kiOffset3);
+  const uint32_t kuiPix14   = * (pSrc - kiOffset1) + * (pSrc + kiOffset2);
+  const uint32_t kuiPix23   = * (pSrc) + * (pSrc + kiOffset1);
+
+  return (kuiPix05 - ((kuiPix14 << 2) + kuiPix14) + (kuiPix23 << 4) + (kuiPix23 << 2));
+}
+
+static inline void PixelAvg_c (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                               const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  int32_t i, j;
+  for (i = 0; i < iHeight; i++) {
+    for (j = 0; j < iWidth; j++) {
+      pDst[j] = (pSrcA[j] + pSrcB[j] + 1) >> 1;
+    }
+    pDst  += iDstStride;
+    pSrcA += iSrcAStride;
+    pSrcB += iSrcBStride;
+  }
+}
+static inline void McCopy_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+                             int32_t iHeight) {
+  if (iWidth == 16)
+    McCopyWidthEq16_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McCopyWidthEq8_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McCopyWidthEq4_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //here iWidth == 2
+    McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+//horizontal filter to gain half sample, that is (2, 0) location in quarter sample
+static inline void McHorVer20_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  int32_t i, j;
+  for (i = 0; i < iHeight; i++) {
+    for (j = 0; j < iWidth; j++) {
+      pDst[j] = WelsClip1 ((FilterInput8bitWithStride_c (pSrc + j, 1) + 16) >> 5);
+    }
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+//vertical filter to gain half sample, that is (0, 2) location in quarter sample
+static inline void McHorVer02_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  int32_t i, j;
+  for (i = 0; i < iHeight; i++) {
+    for (j = 0; j < iWidth; j++) {
+      pDst[j] = WelsClip1 ((FilterInput8bitWithStride_c (pSrc + j, iSrcStride) + 16) >> 5);
+    }
+    pDst += iDstStride;
+    pSrc += iSrcStride;
+  }
+}
+
+//horizontal and vertical filter to gain half sample, that is (2, 2) location in quarter sample
+static inline void McHorVer22_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  int16_t iTmp[17 + 5];
+  int32_t i, j, k;
+
+  for (i = 0; i < iHeight; i++) {
+    for (j = 0; j < iWidth + 5; j++) {
+      iTmp[j] = FilterInput8bitWithStride_c (pSrc - 2 + j, iSrcStride);
+    }
+    for (k = 0; k < iWidth; k++) {
+      pDst[k] = WelsClip1 ((HorFilterInput16bit_c (&iTmp[k]) + 512) >> 10);
+    }
+    pSrc += iSrcStride;
+    pDst += iDstStride;
+  }
+}
+
+/////////////////////luma MC//////////////////////////
+static inline void McHorVer01_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiTmp[256];
+  McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer03_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiTmp[256];
+  McHorVer02_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, uiTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer10_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiTmp[256];
+  McHorVer20_c (pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, pSrc, iSrcStride, uiTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer11_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiVerTmp[256];
+  McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer12_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiVerTmp[256];
+  uint8_t uiCtrTmp[256];
+  McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer13_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiVerTmp[256];
+  McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer02_c (pSrc, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer21_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiCtrTmp[256];
+  McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer23_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiCtrTmp[256];
+  McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer30_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, pSrc + 1, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer31_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiVerTmp[256];
+  McHorVer20_c (pSrc, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer32_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiVerTmp[256];
+  uint8_t uiCtrTmp[256];
+  McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  McHorVer22_c (pSrc, iSrcStride, uiCtrTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiVerTmp, 16, uiCtrTmp, 16, iWidth, iHeight);
+}
+static inline void McHorVer33_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth,
+                                 int32_t iHeight) {
+  uint8_t uiHorTmp[256];
+  uint8_t uiVerTmp[256];
+  McHorVer20_c (pSrc + iSrcStride, iSrcStride, uiHorTmp, 16, iWidth, iHeight);
+  McHorVer02_c (pSrc + 1, iSrcStride, uiVerTmp, 16, iWidth, iHeight);
+  PixelAvg_c (pDst, iDstStride, uiHorTmp, 16, uiVerTmp, 16, iWidth, iHeight);
+}
+
+void McLuma_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+               int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
+//pSrc has been added the offset of mv
+{
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
+    {McCopy_c,      McHorVer01_c, McHorVer02_c, McHorVer03_c},
+    {McHorVer10_c,  McHorVer11_c, McHorVer12_c, McHorVer13_c},
+    {McHorVer20_c,  McHorVer21_c, McHorVer22_c, McHorVer23_c},
+    {McHorVer30_c,  McHorVer31_c, McHorVer32_c, McHorVer33_c},
+  };
+
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+static inline void McChromaWithFragMv_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  int32_t i, j;
+  int32_t iA, iB, iC, iD;
+  const uint8_t* pSrcNext = pSrc + iSrcStride;
+  const uint8_t* pABCD = g_kuiABCD[iMvY & 0x07][iMvX & 0x07];
+  iA = pABCD[0];
+  iB = pABCD[1];
+  iC = pABCD[2];
+  iD = pABCD[3];
+  for (i = 0; i < iHeight; i++) {
+    for (j = 0; j < iWidth; j++) {
+      pDst[j] = (iA * pSrc[j] + iB * pSrc[j + 1] + iC * pSrcNext[j] + iD * pSrcNext[j + 1] + 32) >> 6;
+    }
+    pDst     += iDstStride;
+    pSrc      = pSrcNext;
+    pSrcNext += iSrcStride;
+  }
+}
+
+void McChroma_c (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                 int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
+//pSrc has been added the offset of mv
+{
+  const int32_t kiD8x = iMvX & 0x07;
+  const int32_t kiD8y = iMvY & 0x07;
+  if (0 == kiD8x && 0 == kiD8y)
+    McCopy_c (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+  else
+    McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY, iWidth, iHeight);
+}
+
+#if defined(X86_ASM)
+//***************************************************************************//
+//                       SSE2 implement                          //
+//***************************************************************************//
+static inline void McHorVer22WidthEq8_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, iTap, 21, 8, 16)
+  McHorVer22Width8HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)iTap, 16, iHeight + 5);
+  McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)iTap, 16, pDst, iDstStride, 8, iHeight);
+}
+
+static inline void McHorVer02WidthEq16_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iHeight) {
+  McHorVer02WidthEq8_sse2 (pSrc,     iSrcStride, pDst,     iDstStride, iHeight);
+  McHorVer02WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
+}
+
+static inline void McHorVer22WidthEq16_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iHeight) {
+  McHorVer22WidthEq8_sse2 (pSrc,     iSrcStride, pDst,     iDstStride, iHeight);
+  McHorVer22WidthEq8_sse2 (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
+}
+
+void McHorVer20Width5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+        int32_t iWidth, int32_t iHeight) {
+    if (iWidth == 17 || iWidth == 9)
+        McHorVer20Width9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+    else //if (iWidth == 5)
+        McHorVer20Width5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void McHorVer02Height5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+        int32_t iWidth, int32_t iHeight) {
+    if (iWidth == 16 || iWidth == 8)
+        McHorVer02Height9Or17_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+    else //if (iWidth == 4)
+        McHorVer02Height5_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void McHorVer22Width5Or9Or17Height5Or9Or17_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+        int32_t iWidth, int32_t iHeight) {
+    ENFORCE_STACK_ALIGN_2D (int16_t, pTap, 22, 24, 16)
+    if (iWidth == 17 || iWidth == 9){
+        int32_t tmp1 = 2 * (iWidth - 8);
+        McHorVer22HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5);
+        McHorVer22Width8VerLastAlign_sse2 ((uint8_t*)pTap,  48, pDst, iDstStride, iWidth - 1, iHeight);
+        McHorVer22Width8VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1,  48, pDst + iWidth - 8, iDstStride, 8, iHeight);
+    }
+    else{ //if(iWidth == 5)
+        int32_t tmp1 = 2 * (iWidth - 4);
+        McHorVer22Width5HorFirst_sse2 (pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5);
+        McHorVer22Width4VerLastAlign_sse2 ((uint8_t*)pTap,  48, pDst, iDstStride, iWidth - 1, iHeight);
+        McHorVer22Width4VerLastUnAlign_sse2 ((uint8_t*)pTap + tmp1,  48, pDst + iWidth - 4, iDstStride, 4, iHeight);
+    }
+
+}
+
+static inline void McCopy_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                int32_t iWidth,
+                                int32_t iHeight) {
+  if (iWidth == 16)
+    McCopyWidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McCopyWidthEq8_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McCopyWidthEq4_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+static inline void McHorVer20_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+static inline void McHorVer02_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer02_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
+}
+
+static inline void McHorVer22_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer22_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
+}
+
+static inline void McHorVer01_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer03_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer10_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer11_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc, iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer12_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_sse2 (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pVerTmp, 16, 4, iHeight);
+    McHorVer22_c (pSrc, iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer13_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_sse2 (pSrc,            iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_sse2 (pSrc,            iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc,            iSrcStride, pVerTmp, 16, 4 , iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer21_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_sse2 (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22_c (pSrc, iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer23_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_sse2 (pSrc,            iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_sse2 (pSrc,            iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22_c (pSrc,            iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer30_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer31_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc,   iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc + 1, iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer32_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_sse2 (pSrc,   iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_sse2 (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_sse2 (pSrc,   iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc + 1, iSrcStride, pVerTmp, 16, 4, iHeight);
+    McHorVer22_c (pSrc,   iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer33_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_sse2 (pSrc + 1,          iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_sse2 (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_sse2 (pSrc + 1,          iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmx (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc + 1,          iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmx (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+
+void McLuma_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                  int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight)
+//pSrc has been added the offset of mv
+{
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
+    {McCopy_sse2,     McHorVer01_sse2, McHorVer02_sse2, McHorVer03_sse2},
+    {McHorVer10_sse2, McHorVer11_sse2, McHorVer12_sse2, McHorVer13_sse2},
+    {McHorVer20_sse2, McHorVer21_sse2, McHorVer22_sse2, McHorVer23_sse2},
+    {McHorVer30_sse2, McHorVer31_sse2, McHorVer32_sse2, McHorVer33_sse2},
+  };
+
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void McChroma_sse2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                    int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = {
+    McChromaWidthEq4_mmx,
+    McChromaWidthEq8_sse2
+  };
+  const int32_t kiD8x = iMvX & 0x07;
+  const int32_t kiD8y = iMvY & 0x07;
+  if (kiD8x == 0 && kiD8y == 0) {
+    McCopy_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+    return;
+  }
+  if (iWidth != 2) {
+    kpMcChromaWidthFuncs[iWidth >> 3] (pSrc, iSrcStride, pDst, iDstStride, g_kuiABCD[kiD8y][kiD8x], iHeight);
+  } else
+    McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY, iWidth, iHeight);
+}
+
+//***************************************************************************//
+//                          SSSE3 implementation                             //
+//***************************************************************************//
+
+void PixelAvgWidth4Or8Or16_sse2 (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                                 const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  if (iWidth < 8) {
+    PixelAvgWidthEq4_mmx   (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+  } else if (iWidth == 8) {
+    PixelAvgWidthEq8_mmx   (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+  } else {
+    PixelAvgWidthEq16_sse2 (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+  }
+}
+
+void McCopy_sse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                  int32_t iWidth, int32_t iHeight) {
+  switch (iWidth) {
+  case 16: return McCopyWidthEq16_sse3 (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  case 8:  return McCopyWidthEq8_mmx (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  case 4:  return McCopyWidthEq4_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  }
+  return McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+void McHorVer22_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 16 + 5, 8, 16);
+  if (iWidth < 8) {
+    McHorVer20Width4U8ToS16_ssse3 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width4S16ToU8_ssse3 (&pTmp[0][0], pDst, iDstStride, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20Width8U8ToS16_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iHeight + 5);
+    McHorVer02WidthGe8S16ToU8_ssse3 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, iWidth, iHeight);
+  } else {
+    McHorVer20Width8U8ToS16_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iHeight + 5);
+    McHorVer02WidthGe8S16ToU8_ssse3 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, 8, iHeight);
+    McHorVer20Width8U8ToS16_ssse3 (pSrc + 8, iSrcStride, &pTmp[0][0], sizeof *pTmp, iHeight + 5);
+    McHorVer02WidthGe8S16ToU8_ssse3 (&pTmp[0][0], sizeof *pTmp, pDst + 8, iDstStride, 8, iHeight);
+  }
+}
+
+void McHorVer01_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer02_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer03_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer02_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer10_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer11_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_ssse3 (pSrc, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer12_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer02_ssse3 (pSrc, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  McHorVer22_ssse3 (pSrc, iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pVerTmp[0][0], sizeof *pVerTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer13_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_ssse3 (pSrc,              iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer21_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer22_ssse3 (pSrc, iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer23_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer22_ssse3 (pSrc,              iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer30_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer31_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc,     iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_ssse3 (pSrc + 1, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer32_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer02_ssse3 (pSrc + 1, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  McHorVer22_ssse3 (pSrc,     iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pVerTmp[0][0], sizeof *pVerTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer33_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                       int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_ssse3 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_ssse3 (pSrc + 1,          iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer22Width5Or9Or17_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                    int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 17 + 5, WELS_ALIGN(17, 16 / sizeof (int16_t)), 16)
+  if (iWidth > 5) {
+    McHorVer20Width9Or17U8ToS16_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight + 5);
+    McHorVer02WidthGe8S16ToU8_ssse3 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, iWidth, iHeight);
+  } else {
+    McHorVer20Width8U8ToS16_ssse3 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iHeight + 5);
+    McHorVer02Width5S16ToU8_ssse3 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, iHeight);
+  }
+}
+
+void McLuma_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                   int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = {
+    {McCopy_sse3,      McHorVer01_ssse3, McHorVer02_ssse3, McHorVer03_ssse3},
+    {McHorVer10_ssse3, McHorVer11_ssse3, McHorVer12_ssse3, McHorVer13_ssse3},
+    {McHorVer20_ssse3, McHorVer21_ssse3, McHorVer22_ssse3, McHorVer23_ssse3},
+    {McHorVer30_ssse3, McHorVer31_ssse3, McHorVer32_ssse3, McHorVer33_ssse3},
+  };
+
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void McChroma_ssse3 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                     int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = {
+    McChromaWidthEq4_mmx,
+    McChromaWidthEq8_ssse3
+  };
+  const int32_t kiD8x = iMvX & 0x07;
+  const int32_t kiD8y = iMvY & 0x07;
+  if (kiD8x == 0 && kiD8y == 0) {
+    McCopy_sse2 (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+    return;
+  }
+  if (iWidth != 2) {
+    kpMcChromaWidthFuncs[iWidth >> 3] (pSrc, iSrcStride, pDst, iDstStride, g_kuiABCD[kiD8y][kiD8x], iHeight);
+  } else
+    McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY, iWidth, iHeight);
+}
+
+//***************************************************************************//
+//                          AVX2 implementation                              //
+//***************************************************************************//
+
+#ifdef HAVE_AVX2
+
+void McHorVer22_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 16 + 5, 16, 32);
+  if (iWidth < 8) {
+    McHorVer20Width4U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width4S16ToU8_avx2 (&pTmp[0][0], pDst, iDstStride, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20Width8U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width8S16ToU8_avx2 (&pTmp[0][0], pDst, iDstStride, iHeight);
+  } else {
+    McHorVer20Width16U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width16Or17S16ToU8_avx2 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, iWidth, iHeight);
+  }
+}
+
+void McHorVer01_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer02_avx2 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer03_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer02_avx2 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc + iSrcStride, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer10_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc, iSrcStride,
+                              &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer11_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_avx2 (pSrc, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer12_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer02_avx2 (pSrc, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  McHorVer22_avx2 (pSrc, iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pVerTmp[0][0], sizeof *pVerTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer13_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_avx2 (pSrc,              iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer21_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer22_avx2 (pSrc, iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer23_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer22_avx2 (pSrc,              iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer30_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, pSrc + 1, iSrcStride, &pTmp[0][0], sizeof *pTmp, iWidth, iHeight);
+}
+
+void McHorVer31_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc,     iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_avx2 (pSrc + 1, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer32_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pCtrTmp, 16, 16, 16);
+  McHorVer02_avx2 (pSrc + 1, iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  McHorVer22_avx2 (pSrc,     iSrcStride, &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pVerTmp[0][0], sizeof *pVerTmp,
+                              &pCtrTmp[0][0], sizeof *pCtrTmp, iWidth, iHeight);
+}
+
+void McHorVer33_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pHorTmp, 16, 16, 16);
+  ENFORCE_STACK_ALIGN_2D (uint8_t, pVerTmp, 16, 16, 16);
+  McHorVer20_avx2 (pSrc + iSrcStride, iSrcStride, &pHorTmp[0][0], sizeof *pHorTmp, iWidth, iHeight);
+  McHorVer02_avx2 (pSrc + 1,          iSrcStride, &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+  PixelAvgWidth4Or8Or16_sse2 (pDst, iDstStride, &pHorTmp[0][0], sizeof *pHorTmp,
+                              &pVerTmp[0][0], sizeof *pVerTmp, iWidth, iHeight);
+}
+
+void McHorVer22Width5Or9Or17_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                   int32_t iWidth, int32_t iHeight) {
+  if (iWidth < 9) {
+    ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 9 + 5, WELS_ALIGN(5, 16 / sizeof (int16_t)), 16)
+    McHorVer20Width8U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width5S16ToU8_avx2 (&pTmp[0][0], pDst, iDstStride, iHeight);
+  } else if (iWidth == 9) {
+    ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 17 + 5, 16, 32)
+    McHorVer20Width16U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width9S16ToU8_avx2 (&pTmp[0][0], pDst, iDstStride, iHeight);
+  } else {
+    ENFORCE_STACK_ALIGN_2D (int16_t, pTmp, 17 + 5, WELS_ALIGN(17, 32 / sizeof (int16_t)), 32)
+    McHorVer20Width17U8ToS16_avx2 (pSrc, iSrcStride, &pTmp[0][0], iHeight + 5);
+    McHorVer02Width16Or17S16ToU8_avx2 (&pTmp[0][0], sizeof *pTmp, pDst, iDstStride, iWidth, iHeight);
+  }
+}
+
+void McLuma_avx2 (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                  int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = {
+    {McCopy_sse3,     McHorVer01_avx2, McHorVer02_avx2, McHorVer03_avx2},
+    {McHorVer10_avx2, McHorVer11_avx2, McHorVer12_avx2, McHorVer13_avx2},
+    {McHorVer20_avx2, McHorVer21_avx2, McHorVer22_avx2, McHorVer23_avx2},
+    {McHorVer30_avx2, McHorVer31_avx2, McHorVer32_avx2, McHorVer33_avx2},
+  };
+
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+#endif //HAVE_AVX2
+
+void PixelAvg_sse2 (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                    const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  static const PWelsSampleWidthAveragingFunc kpfFuncs[2] = {
+    PixelAvgWidthEq8_mmx,
+    PixelAvgWidthEq16_sse2
+  };
+  kpfFuncs[iWidth >> 4] (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+}
+
+#endif //X86_ASM
+//***************************************************************************//
+//                       NEON implementation                      //
+//***************************************************************************//
+#if defined(HAVE_NEON)
+void McHorVer20Width5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 17)
+    McHorVer20Width17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 9)
+    McHorVer20Width9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 5)
+    McHorVer20Width5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer02Height5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                 int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02Height17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02Height9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 4)
+    McHorVer02Height5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer22Width5Or9Or17Height5Or9Or17_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 17)
+    McHorVer22Width17_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 9)
+    McHorVer22Width9_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 5)
+    McHorVer22Width5_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McCopy_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                  int32_t iWidth, int32_t iHeight) {
+  if (16 == iWidth)
+    McCopyWidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (8 == iWidth)
+    McCopyWidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (4 == iWidth)
+    McCopyWidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer20_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer20WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer20WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer20WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer02_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer02WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer22_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer22WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer22WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer22WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+void McHorVer01_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer01WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer01WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer01WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer03_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer03WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer03WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer03WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer10_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer10WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer10WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer10WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer11_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  }
+}
+void McHorVer12_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer02WidthEq4_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq4_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  }
+}
+void McHorVer13_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  }
+}
+void McHorVer21_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq4_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  }
+}
+void McHorVer23_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq4_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pCtrTmp, iHeight);
+  }
+}
+void McHorVer30_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer30WidthEq16_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer30WidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer30WidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer31_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  }
+}
+void McHorVer32_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer02WidthEq4_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq4_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pVerTmp, pCtrTmp, iHeight);
+  }
+}
+void McHorVer33_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                      int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_neon (pDst, iDstStride, pHorTmp, pVerTmp, iHeight);
+  }
+}
+
+void McLuma_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                  int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
+    {McCopy_neon,  McHorVer01_neon, McHorVer02_neon,    McHorVer03_neon},
+    {McHorVer10_neon, McHorVer11_neon, McHorVer12_neon, McHorVer13_neon},
+    {McHorVer20_neon,    McHorVer21_neon, McHorVer22_neon,    McHorVer23_neon},
+    {McHorVer30_neon, McHorVer31_neon, McHorVer32_neon, McHorVer33_neon},
+  };
+  // pSrc += (iMvY >> 2) * iSrcStride + (iMvX >> 2);
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+void McChroma_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                    int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  if (0 == iMvX && 0 == iMvY) {
+    if (8 == iWidth)
+      McCopyWidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+    else if (iWidth == 4)
+      McCopyWidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+    else //here iWidth == 2
+      McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  } else {
+    const int32_t kiD8x = iMvX & 0x07;
+    const int32_t kiD8y = iMvY & 0x07;
+    if (8 == iWidth)
+      McChromaWidthEq8_neon (pSrc, iSrcStride, pDst, iDstStride, (int32_t*) (g_kuiABCD[kiD8y][kiD8x]), iHeight);
+    else if (4 == iWidth)
+      McChromaWidthEq4_neon (pSrc, iSrcStride, pDst, iDstStride, (int32_t*) (g_kuiABCD[kiD8y][kiD8x]), iHeight);
+    else //here iWidth == 2
+      McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY, iWidth, iHeight);
+  }
+}
+void PixelAvg_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                    const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  static const PWelsSampleWidthAveragingFunc kpfFuncs[2] = {
+    PixStrideAvgWidthEq8_neon,
+    PixStrideAvgWidthEq16_neon
+  };
+  kpfFuncs[iWidth >> 4] (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+}
+#endif
+#if defined(HAVE_NEON_AARCH64)
+void McHorVer20Width5Or9Or17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                                        int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 17)
+    McHorVer20Width17_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 9)
+    McHorVer20Width9_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 5)
+    McHorVer20Width5_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer02Height5Or9Or17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02Height17_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02Height9_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 4)
+    McHorVer02Height5_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer22Width5Or9Or17Height5Or9Or17_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+    int32_t iDstStride,
+    int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 17)
+    McHorVer22Width17_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 9)
+    McHorVer22Width9_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else //if (iWidth == 5)
+    McHorVer22Width5_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McCopy_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                          int32_t iWidth, int32_t iHeight) {
+  if (16 == iWidth)
+    McCopyWidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (8 == iWidth)
+    McCopyWidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (4 == iWidth)
+    McCopyWidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer20_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer20WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer20WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer20WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer02_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer02WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer22_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer22WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer22WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer22WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+void McHorVer01_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer01WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer01WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer01WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer03_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer03WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer03WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer03WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer10_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer10WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer10WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer10WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer11_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+void McHorVer12_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer02WidthEq4_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq4_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+void McHorVer13_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_AArch64_neon (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+void McHorVer21_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq4_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+void McHorVer23_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq4_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+void McHorVer30_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer30WidthEq16_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer30WidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McHorVer30WidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+void McHorVer31_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+void McHorVer32_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer02WidthEq4_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq4_AArch64_neon (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+void McHorVer33_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                              int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 4) {
+    McHorVer20WidthEq4_AArch64_neon (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq4_AArch64_neon (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq4_AArch64_neon (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+
+void McLuma_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                          int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
+    {McCopy_AArch64_neon,  McHorVer01_AArch64_neon, McHorVer02_AArch64_neon,    McHorVer03_AArch64_neon},
+    {McHorVer10_AArch64_neon, McHorVer11_AArch64_neon, McHorVer12_AArch64_neon, McHorVer13_AArch64_neon},
+    {McHorVer20_AArch64_neon,    McHorVer21_AArch64_neon, McHorVer22_AArch64_neon,    McHorVer23_AArch64_neon},
+    {McHorVer30_AArch64_neon, McHorVer31_AArch64_neon, McHorVer32_AArch64_neon, McHorVer33_AArch64_neon},
+  };
+  // pSrc += (iMvY >> 2) * iSrcStride + (iMvX >> 2);
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+void McChroma_AArch64_neon (const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                            int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  if (0 == iMvX && 0 == iMvY) {
+    if (8 == iWidth)
+      McCopyWidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+    else if (iWidth == 4)
+      McCopyWidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+    else //here iWidth == 2
+      McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  } else {
+    const int32_t kiD8x = iMvX & 0x07;
+    const int32_t kiD8y = iMvY & 0x07;
+    if (8 == iWidth)
+      McChromaWidthEq8_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, (int32_t*) (g_kuiABCD[kiD8y][kiD8x]), iHeight);
+    else if (4 == iWidth)
+      McChromaWidthEq4_AArch64_neon (pSrc, iSrcStride, pDst, iDstStride, (int32_t*) (g_kuiABCD[kiD8y][kiD8x]), iHeight);
+    else //here iWidth == 2
+      McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY, iWidth, iHeight);
+  }
+}
+void PixelAvg_AArch64_neon (uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                            const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  static const PWelsSampleWidthAveragingFunc kpfFuncs[2] = {
+    PixStrideAvgWidthEq8_AArch64_neon,
+    PixStrideAvgWidthEq16_AArch64_neon
+  };
+  kpfFuncs[iWidth >> 4] (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+}
+#endif
+
+#if defined(HAVE_MMI)
+#define MMI_LOAD_8P(f0, f2, f4, r0) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "punpckhbh  "#f2", "#f0", "#f4"             \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f4"             \n\t"
+
+#define FILTER_HV_W4(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, \
+                     f20, f22, f24, f26, f28, f30, r0, r1, r2) \
+  "paddh      "#f0", "#f0", "#f20"            \n\t" \
+  "paddh      "#f2", "#f2", "#f22"            \n\t" \
+  "mov.d      "#f28", "#f8"                   \n\t" \
+  "mov.d      "#f30", "#f10"                  \n\t" \
+  "mov.d      "#f24", "#f4"                   \n\t" \
+  "mov.d      "#f26", "#f6"                   \n\t" \
+  "dmfc1      "#r2", "#f8"                    \n\t" \
+  "dli        "#r1", 0x0010001000100010       \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "paddh      "#f0", "#f0", "#f8"             \n\t" \
+  "paddh      "#f2", "#f2", "#f8"             \n\t" \
+  "paddh      "#f28", "#f28", "#f12"          \n\t" \
+  "paddh      "#f30", "#f30", "#f14"          \n\t" \
+  "paddh      "#f24", "#f24", "#f16"          \n\t" \
+  "paddh      "#f26", "#f26", "#f18"          \n\t" \
+  "dli        "#r1", 0x2                      \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psllh      "#f28", "#f28", "#f8"           \n\t" \
+  "psllh      "#f30", "#f30", "#f8"           \n\t" \
+  "psubh      "#f28", "#f28", "#f24"          \n\t" \
+  "psubh      "#f30", "#f30", "#f26"          \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "psllh      "#f28", "#f28", "#f8"           \n\t" \
+  "psllh      "#f30", "#f30", "#f8"           \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "dli        "#r1", 0x5                      \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "xor        "#f28", "#f28", "#f28"          \n\t" \
+  "packushb   "#f0", "#f0", "#f2"             \n\t" \
+  "gsswlc1    "#f0", 0x3("#r0")               \n\t" \
+  "gsswrc1    "#f0", 0x0("#r0")               \n\t" \
+  "dmtc1      "#r2", "#f8"                    \n\t"
+
+#define FILTER_HV_W8(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, \
+                     f20, f22, f24, f26, f28, f30, r0, r1, r2) \
+  "paddh      "#f0", "#f0", "#f20"            \n\t" \
+  "paddh      "#f2", "#f2", "#f22"            \n\t" \
+  "mov.d      "#f28", "#f8"                   \n\t" \
+  "mov.d      "#f30", "#f10"                  \n\t" \
+  "mov.d      "#f24", "#f4"                   \n\t" \
+  "mov.d      "#f26", "#f6"                   \n\t" \
+  "dmfc1      "#r2", "#f8"                    \n\t" \
+  "dli        "#r1", 0x0010001000100010       \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "paddh      "#f0", "#f0", "#f8"             \n\t" \
+  "paddh      "#f2", "#f2", "#f8"             \n\t" \
+  "paddh      "#f28", "#f28", "#f12"          \n\t" \
+  "paddh      "#f30", "#f30", "#f14"          \n\t" \
+  "paddh      "#f24", "#f24", "#f16"          \n\t" \
+  "paddh      "#f26", "#f26", "#f18"          \n\t" \
+  "dli        "#r1", 0x2                      \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psllh      "#f28", "#f28", "#f8"           \n\t" \
+  "psllh      "#f30", "#f30", "#f8"           \n\t" \
+  "psubh      "#f28", "#f28", "#f24"          \n\t" \
+  "psubh      "#f30", "#f30", "#f26"          \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "psllh      "#f28", "#f28", "#f8"           \n\t" \
+  "psllh      "#f30", "#f30", "#f8"           \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "dli        "#r1", 0x5                      \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "xor        "#f28", "#f28", "#f28"          \n\t" \
+  "packushb   "#f0", "#f0", "#f2"             \n\t" \
+  "gssdlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f0", 0x0("#r0")               \n\t" \
+  "dmtc1      "#r2", "#f8"                    \n\t"
+
+#define FILTER_VER_ALIGN(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, \
+                         f20, f22, f24, f26, f28, f30, r0, r1, r2, r3, r4) \
+  "paddh      "#f0", "#f0", "#f20"            \n\t" \
+  "paddh      "#f2", "#f2", "#f22"            \n\t" \
+  "mov.d      "#f24", "#f4"                   \n\t" \
+  "mov.d      "#f26", "#f6"                   \n\t" \
+  "mov.d      "#f28", "#f8"                   \n\t" \
+  "mov.d      "#f30", "#f10"                  \n\t" \
+  "dli        "#r2", 0x2                      \n\t" \
+  "paddh      "#f24", "#f24", "#f16"          \n\t" \
+  "paddh      "#f26", "#f26", "#f18"          \n\t" \
+  "dmfc1      "#r3", "#f8"                    \n\t" \
+  "paddh      "#f28", "#f28", "#f12"          \n\t" \
+  "paddh      "#f30", "#f30", "#f14"          \n\t" \
+  "dmtc1      "#r2", "#f8"                    \n\t" \
+  "psubh      "#f0", "#f0", "#f24"            \n\t" \
+  "psubh      "#f2", "#f2", "#f26"            \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "psubh      "#f0", "#f0", "#f24"            \n\t" \
+  "psubh      "#f2", "#f2", "#f26"            \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "dmtc1      "#r4", "#f8"                    \n\t" \
+  "paddh      "#f28", "#f28", "#f0"           \n\t" \
+  "paddh      "#f30", "#f30", "#f2"           \n\t" \
+  "dli        "#r2", 0x6                      \n\t" \
+  "paddh      "#f28", "#f28", "#f8"           \n\t" \
+  "paddh      "#f30", "#f30", "#f8"           \n\t" \
+  "dmtc1      "#r2", "#f8"                    \n\t" \
+  "psrah      "#f28", "#f28", "#f8"           \n\t" \
+  "psrah      "#f30", "#f30", "#f8"           \n\t" \
+  "packushb   "#f28", "#f28", "#f30"          \n\t" \
+  "gssdxc1    "#f28", 0x0("#r0", "#r1")       \n\t" \
+  "dmtc1      "#r3", "#f8"                    \n\t"
+
+#define FILTER_VER_UNALIGN(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, \
+                           f20, f22, f24, f26, f28, f30, r0, r1, r2, r3) \
+  "paddh      "#f0", "#f0", "#f20"            \n\t" \
+  "paddh      "#f2", "#f2", "#f22"            \n\t" \
+  "mov.d      "#f24", "#f4"                   \n\t" \
+  "mov.d      "#f26", "#f6"                   \n\t" \
+  "mov.d      "#f28", "#f8"                   \n\t" \
+  "mov.d      "#f30", "#f10"                  \n\t" \
+  "dli        "#r1", 0x2                      \n\t" \
+  "paddh      "#f24", "#f24", "#f16"          \n\t" \
+  "paddh      "#f26", "#f26", "#f18"          \n\t" \
+  "dmfc1      "#r2", "#f8"                    \n\t" \
+  "paddh      "#f28", "#f28", "#f12"          \n\t" \
+  "paddh      "#f30", "#f30", "#f14"          \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psubh      "#f0", "#f0", "#f24"            \n\t" \
+  "psubh      "#f2", "#f2", "#f26"            \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "paddh      "#f0", "#f0", "#f28"            \n\t" \
+  "paddh      "#f2", "#f2", "#f30"            \n\t" \
+  "psubh      "#f0", "#f0", "#f24"            \n\t" \
+  "psubh      "#f2", "#f2", "#f26"            \n\t" \
+  "psrah      "#f0", "#f0", "#f8"             \n\t" \
+  "psrah      "#f2", "#f2", "#f8"             \n\t" \
+  "dmtc1      "#r3", "#f8"                    \n\t" \
+  "paddh      "#f28", "#f28", "#f0"           \n\t" \
+  "paddh      "#f30", "#f30", "#f2"           \n\t" \
+  "dli        "#r1", 0x6                      \n\t" \
+  "paddh      "#f28", "#f28", "#f8"           \n\t" \
+  "paddh      "#f30", "#f30", "#f8"           \n\t" \
+  "dmtc1      "#r1", "#f8"                    \n\t" \
+  "psrah      "#f28", "#f28", "#f8"           \n\t" \
+  "psrah      "#f30", "#f30", "#f8"           \n\t" \
+  "packushb   "#f28", "#f28", "#f30"          \n\t" \
+  "gssdlc1    "#f28", 0x7("#r0")              \n\t" \
+  "gssdrc1    "#f28", 0x0("#r0")              \n\t" \
+  "dmtc1      "#r2", "#f8"                    \n\t"
+
+void McHorVer20Width5_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                          int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], -0x2          \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dli        $10, 0x0010001000100010         \n\t"
+    "dli        $11, 0x5                        \n\t"
+    "1:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "mov.d      $f28, $f8                       \n\t"
+    "mov.d      $f30, $f10                      \n\t"
+    "paddh      $f28, $f28, $f12                \n\t"
+    "paddh      $f30, $f30, $f14                \n\t"
+    "mov.d      $f24, $f16                      \n\t"
+    "mov.d      $f26, $f18                      \n\t"
+    "paddh      $f24, $f24, $f20                \n\t"
+    "paddh      $f26, $f26, $f22                \n\t"
+    "dmfc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "psubh      $f24, $f24, $f28                \n\t"
+    "psubh      $f26, $f26, $f30                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+
+    "dmtc1      $10, $f12                       \n\t"
+    "paddh      $f0, $f0, $f12                  \n\t"
+    "paddh      $f2, $f2, $f12                  \n\t"
+    "dmtc1      $11, $f12                       \n\t"
+    "psrah      $f0, $f0, $f12                  \n\t"
+    "psrah      $f2, $f2, $f12                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+
+    "gsswlc1    $f0, 0x3(%[pDst])               \n\t"
+    "gsswrc1    $f0, 0x0(%[pDst])               \n\t"
+
+    "gsldlc1    $f0, 0xd(%[pSrc])               \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0x6(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "dmtc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+
+    "paddh      $f16, $f16, $f4                 \n\t"
+    "paddh      $f18, $f18, $f6                 \n\t"
+    "paddh      $f20, $f20, $f12                \n\t"
+    "paddh      $f22, $f22, $f14                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "psubh      $f20, $f20, $f16                \n\t"
+    "psubh      $f22, $f22, $f18                \n\t"
+    "paddh      $f8, $f8, $f0                   \n\t"
+    "paddh      $f10, $f10, $f2                 \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+
+    "dmtc1      $10, $f24                       \n\t"
+    "paddh      $f8, $f8, $f24                  \n\t"
+    "paddh      $f10, $f10, $f24                \n\t"
+    "dmtc1      $11, $f24                       \n\t"
+    "psrah      $f8, $f8, $f24                  \n\t"
+    "psrah      $f10, $f10, $f24                \n\t"
+    "packushb   $f8, $f8, $f10                  \n\t"
+    "gsswlc1    $f8, 0x4(%[pDst])               \n\t"
+    "gsswrc1    $f8, 0x1(%[pDst])               \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"((unsigned char *)pSrc), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    : [iSrcStride]"r"((int)iSrcStride),  [iDstStride]"r"((int)iDstStride)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void McHorVer20Width9Or17_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                              int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], -0x2          \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dli        $9, 0x9                         \n\t"
+    "dli        $10, 0x0010001000100010         \n\t"
+    "dli        $11, 0x5                        \n\t"
+    "bne        %[iWidth], $9, 2f               \n\t"
+    "1:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "mov.d      $f28, $f8                       \n\t"
+    "mov.d      $f30, $f10                      \n\t"
+    "paddh      $f28, $f28, $f12                \n\t"
+    "paddh      $f30, $f30, $f14                \n\t"
+    "mov.d      $f24, $f16                      \n\t"
+    "mov.d      $f26, $f18                      \n\t"
+    "paddh      $f24, $f24, $f20                \n\t"
+    "paddh      $f26, $f26, $f22                \n\t"
+    "dmfc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "psubh      $f24, $f24, $f28                \n\t"
+    "psubh      $f26, $f26, $f30                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+
+    "dmtc1      $10, $f12                       \n\t"
+    "paddh      $f0, $f0, $f12                  \n\t"
+    "paddh      $f2, $f2, $f12                  \n\t"
+    "dmtc1      $11, $f12                       \n\t"
+    "psrah      $f0, $f0, $f12                  \n\t"
+    "psrah      $f2, $f2, $f12                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+
+    "gsswlc1    $f0, 0x3(%[pDst])               \n\t"
+    "gsswrc1    $f0, 0x0(%[pDst])               \n\t"
+
+    "gsldlc1    $f0, 0xd(%[pSrc])               \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0x6(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "dmtc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+
+    "paddh      $f16, $f16, $f4                 \n\t"
+    "paddh      $f18, $f18, $f6                 \n\t"
+    "paddh      $f20, $f20, $f12                \n\t"
+    "paddh      $f22, $f22, $f14                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "psubh      $f20, $f20, $f16                \n\t"
+    "psubh      $f22, $f22, $f18                \n\t"
+    "paddh      $f8, $f8, $f0                   \n\t"
+    "paddh      $f10, $f10, $f2                 \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+
+    "dmtc1      $10, $f24                       \n\t"
+    "paddh      $f8, $f8, $f24                  \n\t"
+    "paddh      $f10, $f10, $f24                \n\t"
+    "dmtc1      $11, $f24                       \n\t"
+    "psrah      $f8, $f8, $f24                  \n\t"
+    "psrah      $f10, $f10, $f24                \n\t"
+    "packushb   $f8, $f8, $f10                  \n\t"
+    "gssdlc1    $f8, 0x8(%[pDst])               \n\t"
+    "gssdrc1    $f8, 0x1(%[pDst])               \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    "j          3f                              \n\t"
+
+    "2:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "dmtc1      $8, $f30                        \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+
+    "dmtc1      $10, $f30                       \n\t"
+    "paddh      $f0, $f0, $f30                  \n\t"
+    "paddh      $f2, $f2, $f30                  \n\t"
+    "dmtc1      $11, $f30                       \n\t"
+    "psrah      $f0, $f0, $f30                  \n\t"
+    "psrah      $f2, $f2, $f30                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+
+    "gsldlc1    $f0, 15(%[pSrc])                \n\t"
+    "gsldlc1    $f4, 0x14(%[pSrc])              \n\t"
+    "gsldlc1    $f8, 0x10(%[pSrc])              \n\t"
+    "gsldlc1    $f12, 0x13(%[pSrc])             \n\t"
+    "gsldlc1    $f16, 0x11(%[pSrc])             \n\t"
+    "gsldlc1    $f20, 0x12(%[pSrc])             \n\t"
+    "gsldrc1    $f0, 8(%[pSrc])                 \n\t"
+    "gsldrc1    $f4, 0xd(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x9(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0xc(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0xb(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "mov.d      $f28, $f8                       \n\t"
+    "mov.d      $f30, $f10                      \n\t"
+    "paddh      $f28, $f28, $f12                \n\t"
+    "paddh      $f30, $f30, $f14                \n\t"
+    "mov.d      $f24, $f16                      \n\t"
+    "mov.d      $f26, $f18                      \n\t"
+    "paddh      $f24, $f24, $f20                \n\t"
+    "paddh      $f26, $f26, $f22                \n\t"
+    "dmfc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "psubh      $f24, $f24, $f28                \n\t"
+    "psubh      $f26, $f26, $f30                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+
+    "dmtc1      $10, $f30                       \n\t"
+    "paddh      $f0, $f0, $f30                  \n\t"
+    "paddh      $f2, $f2, $f30                  \n\t"
+    "dmtc1      $11, $f30                       \n\t"
+    "psrah      $f0, $f0, $f30                  \n\t"
+    "psrah      $f2, $f2, $f30                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gsswlc1    $f0, 0xb(%[pDst])               \n\t"
+    "gsswrc1    $f0, 0x8(%[pDst])               \n\t"
+
+    "dmtc1      $9, $f12                        \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "dli        $9, 0x20                        \n\t"
+    "gsldlc1    $f0, 0x15(%[pSrc])              \n\t"
+    "dmtc1      $9, $f30                        \n\t"
+    "gsldrc1    $f0, 0xE(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+
+    "paddh      $f16, $f16, $f4                 \n\t"
+    "paddh      $f18, $f18, $f6                 \n\t"
+    "paddh      $f20, $f20, $f12                \n\t"
+    "paddh      $f22, $f22, $f14                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "psubh      $f20, $f20, $f16                \n\t"
+    "psubh      $f22, $f22, $f18                \n\t"
+    "paddh      $f8, $f8, $f0                   \n\t"
+    "paddh      $f10, $f10, $f2                 \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+
+    "dmtc1      $10, $f24                       \n\t"
+    "paddh      $f8, $f8, $f24                  \n\t"
+    "paddh      $f10, $f10, $f24                \n\t"
+    "dmtc1      $11, $f24                       \n\t"
+    "psrah      $f8, $f8, $f24                  \n\t"
+    "psrah      $f10, $f10, $f24                \n\t"
+    "packushb   $f8, $f8, $f10                  \n\t"
+    "gssdlc1    $f8, 0x10(%[pDst])              \n\t"
+    "gssdrc1    $f8, 0x9(%[pDst])               \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 2b                  \n\t"
+    "3:                                         \n\t"
+    : [pSrc]"+&r"((unsigned char *)pSrc), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    : [iSrcStride]"r"((int)iSrcStride),  [iDstStride]"r"((int)iDstStride)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+//horizontal filter to gain half sample, that is (2, 0) location in quarter sample
+static inline void McHorVer20Width5Or9Or17_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                                               uint8_t* pDst, int32_t iDstStride,
+                                               int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 17 || iWidth == 9)
+      McHorVer20Width9Or17_mmi(pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+  else //if (iWidth == 5)
+      McHorVer20Width5_mmi(pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void McHorVer02Height5_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                           int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "move       $12, %[pSrc]                    \n\t"
+    "move       $13, %[pDst]                    \n\t"
+    "move       $14, %[iHeight]                 \n\t"
+
+    "dsrl       %[iWidth], %[iWidth], 0x2       \n\t"
+    PTR_ADDU   "$10, %[iSrcStride], %[iSrcStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], $10           \n\t"
+
+    "1:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    MMI_LOAD_8P($f0, $f2, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f28, $8)
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f8, $f10, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f28, $8)
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f16, $f18, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f28, $8)
+    FILTER_HV_W4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                 $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f24, $f26, $f28, %[pSrc])
+    "mov.d      $f0, $f4                        \n\t"
+    "mov.d      $f2, $f6                        \n\t"
+    "mov.d      $f4, $f8                        \n\t"
+    "mov.d      $f6, $f10                       \n\t"
+    "mov.d      $f8, $f12                       \n\t"
+    "mov.d      $f10, $f14                      \n\t"
+    "mov.d      $f12, $f16                      \n\t"
+    "mov.d      $f14, $f18                      \n\t"
+    "mov.d      $f16, $f20                      \n\t"
+    "mov.d      $f18, $f22                      \n\t"
+    "mov.d      $f20, $f24                      \n\t"
+    "mov.d      $f22, $f26                      \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+
+    "2:                                         \n\t"
+    FILTER_HV_W4($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                 $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f24, $f26, $f28, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W4($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24,
+                 $f26, $f28, $f30, $f0, $f2, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f28, $f30, $f0, $8)
+    FILTER_HV_W4($f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28,
+                 $f30, $f0, $f2, $f4, $f6, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f0, $f2, $f4, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W4($f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0,
+                 $f2, $f4, $f6, $f8, $f10, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f8, $8)
+    FILTER_HV_W4($f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6,
+                 $f8, $f10, $f12, $f14, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f8, $f10, $f12, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W4($f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10,
+                 $f12, $f14, $f16, $f18, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f16, $8)
+    FILTER_HV_W4($f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14,
+                 $f16, $f18, $f20, $f22, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f16, $f18, $f20, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W4($f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18,
+                 $f20, $f22, $f24, $f26, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f24, $8)
+    "j          2b                              \n\t"
+
+    "3:                                         \n\t"
+    PTR_ADDIU  "%[iWidth], %[iWidth], -0x1      \n\t"
+    "beqz       %[iWidth], 4f                   \n\t"
+    "move       %[pSrc], $12                    \n\t"
+    "move       %[pDst], $13                    \n\t"
+    "move       %[iHeight], $14                 \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], $10           \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], 0x4           \n\t"
+    PTR_ADDIU  "%[pDst], %[pDst], 0x4           \n\t"
+    "j          1b                              \n\t"
+    "4:                                         \n\t"
+    : [pSrc]"+&r"((unsigned char *)pSrc), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"(iWidth), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride),  [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$9", "$10", "$12", "$13", "$14", "$f0", "$f2", "$f4",
+      "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void McHorVer02Height9Or17_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                               int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "move       $12, %[pSrc]                    \n\t"
+    "move       $13, %[pDst]                    \n\t"
+    "move       $14, %[iHeight]                 \n\t"
+
+    "dsrl       %[iWidth], %[iWidth], 0x3       \n\t"
+    PTR_ADDU   "$10, %[iSrcStride], %[iSrcStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], $10           \n\t"
+
+    "1:                                         \n\t"
+    "dli        $8, 0x20                        \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+
+    MMI_LOAD_8P($f0, $f2, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f28, $8)
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f8, $f10, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f28, $8)
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f16, $f18, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f28, $8)
+    FILTER_HV_W8($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                 $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f24, $f26, $f28, %[pSrc])
+    "mov.d      $f0, $f4                        \n\t"
+    "mov.d      $f2, $f6                        \n\t"
+    "mov.d      $f4, $f8                        \n\t"
+    "mov.d      $f6, $f10                       \n\t"
+    "mov.d      $f8, $f12                       \n\t"
+    "mov.d      $f10, $f14                      \n\t"
+    "mov.d      $f12, $f16                      \n\t"
+    "mov.d      $f14, $f18                      \n\t"
+    "mov.d      $f16, $f20                      \n\t"
+    "mov.d      $f18, $f22                      \n\t"
+    "mov.d      $f20, $f24                      \n\t"
+    "mov.d      $f22, $f26                      \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+
+    "2:                                         \n\t"
+    FILTER_HV_W8($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                 $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9)
+    "dmtc1      $9, $f8                         \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f24, $f26, $f28, %[pSrc])
+    PTR_ADDU   "%[pDst],  %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24,
+                 $f26, $f28, $f30, $f0, $f2, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f28, $f30, $f0, $8)
+    FILTER_HV_W8($f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28,
+                 $f30, $f0, $f2, $f4, $f6, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f0, $f2, $f4, %[pSrc])
+    PTR_ADDU   "%[pDst],  %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0,
+                 $f2, $f4, $f6, $f8, $f10, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f8, $8)
+    FILTER_HV_W8($f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4,
+                 $f6, $f8, $f10, $f12, $f14, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f8, $f10, $f12, %[pSrc])
+    PTR_ADDU   "%[pDst],  %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8,
+                 $f10, $f12, $f14, $f16, $f18, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f16, $8)
+    FILTER_HV_W8($f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12,
+                 $f14, $f16, $f18, $f20, $f22, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], $10           \n\t"
+    MMI_LOAD_8P($f16, $f18, $f20, %[pSrc])
+    PTR_ADDU   "%[pDst],  %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16,
+                 $f18, $f20, $f22, $f24, $f26, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 3f                  \n\t"
+
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f24, $8)
+    "j          2b                              \n\t"
+
+    "3:                                         \n\t"
+    PTR_ADDIU  "%[iWidth], %[iWidth], -0x1      \n\t"
+    "beqz       %[iWidth], 4f                   \n\t"
+
+    "move       %[pSrc], $12                    \n\t"
+    "move       %[pDst], $13                    \n\t"
+    "move       %[iHeight], $14                 \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], $10           \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], 0x8           \n\t"
+    PTR_ADDIU  "%[pDst], %[pDst], 0x8           \n\t"
+    "j          1b                              \n\t"
+    "4:                                         \n\t"
+    : [pSrc]"+&r"((unsigned char *)pSrc), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"(iWidth), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride),  [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$9", "$10", "$12", "$13", "$14", "$f0", "$f2", "$f4",
+      "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+//vertical filter to gain half sample, that is (0, 2) location in quarter sample
+static inline void McHorVer02Height5Or9Or17_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                                                uint8_t* pDst, int32_t iDstStride,
+                                                int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16 || iWidth == 8)
+    McHorVer02Height9Or17_mmi(pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight );
+  else
+    McHorVer02Height5_mmi (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+static inline void McHorVer22HorFirst_mmi(const uint8_t *pSrc, int32_t iSrcStride,
+                                          uint8_t * pTap, int32_t iTapStride,
+                                          int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "dli        $8, 0x9                         \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "bne        %[iWidth], $8, 2f               \n\t"
+
+    "1:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "mov.d      $f28, $f8                       \n\t"
+    "mov.d      $f30, $f10                      \n\t"
+    "paddh      $f28, $f28, $f12                \n\t"
+    "paddh      $f30, $f30, $f14                \n\t"
+    "mov.d      $f24, $f16                      \n\t"
+    "mov.d      $f26, $f18                      \n\t"
+    "paddh      $f24, $f24, $f20                \n\t"
+    "paddh      $f26, $f26, $f22                \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmfc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "psubh      $f24, $f24, $f28                \n\t"
+    "psubh      $f26, $f26, $f30                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "gsswlc1    $f0, 0x3(%[pTap])               \n\t"
+    "gsswrc1    $f0, 0x0(%[pTap])               \n\t"
+
+    "gsldlc1    $f0, 0xd(%[pSrc])               \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0x6(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+
+    "paddh      $f16, $f16, $f4                 \n\t"
+    "paddh      $f18, $f18, $f6                 \n\t"
+    "paddh      $f20, $f20, $f12                \n\t"
+    "paddh      $f22, $f22, $f14                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "psubh      $f20, $f20, $f16                \n\t"
+    "psubh      $f22, $f22, $f18                \n\t"
+    "paddh      $f8, $f8, $f0                   \n\t"
+    "paddh      $f10, $f10, $f2                 \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "gssdlc1    $f8, 0x9(%[pTap])               \n\t"
+    "gssdlc1    $f10, 0x11(%[pTap])             \n\t"
+    "gssdrc1    $f8, 0x2(%[pTap])               \n\t"
+    "gssdrc1    $f10, 0xa(%[pTap])              \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], %[iTapStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    "j          3f                              \n\t"
+
+    "2:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "dmtc1      $8, $f30                        \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pTap])          \n\t"
+
+    "gsldlc1    $f0, 15(%[pSrc])                \n\t"
+    "gsldrc1    $f0, 8(%[pSrc])                 \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "gsldlc1    $f4, 0x14(%[pSrc])              \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "gsldrc1    $f4, 0xd(%[pSrc])               \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "gsldlc1    $f8, 0x10(%[pSrc])              \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "gsldrc1    $f8, 0x9(%[pSrc])               \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "gsldlc1    $f12, 0x13(%[pSrc])             \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "gsldrc1    $f12, 0xc(%[pSrc])              \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "gsldlc1    $f16, 0x11(%[pSrc])             \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "gsldrc1    $f16, 0xa(%[pSrc])              \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "gsldlc1    $f20, 0x12(%[pSrc])             \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "gsldrc1    $f20, 0xb(%[pSrc])              \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+
+    "mov.d      $f28, $f8                       \n\t"
+    "mov.d      $f30, $f10                      \n\t"
+    "paddh      $f28, $f28, $f12                \n\t"
+    "paddh      $f30, $f30, $f14                \n\t"
+    "mov.d      $f24, $f16                      \n\t"
+    "mov.d      $f26, $f18                      \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "paddh      $f24, $f24, $f20                \n\t"
+    "paddh      $f26, $f26, $f22                \n\t"
+    "dmfc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "psubh      $f24, $f24, $f28                \n\t"
+    "psubh      $f26, $f26, $f30                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "psllh      $f24, $f24, $f12                \n\t"
+    "psllh      $f26, $f26, $f12                \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f26                  \n\t"
+    "gsswlc1    $f0, 0x13(%[pTap])              \n\t"
+    "gsswrc1    $f0, 0x10(%[pTap])              \n\t"
+
+    "gsldlc1    $f0, 0x15(%[pSrc])              \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f0, 0xE(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $9, $f12                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+
+    "paddh      $f16, $f16, $f4                 \n\t"
+    "paddh      $f18, $f18, $f6                 \n\t"
+    "paddh      $f20, $f20, $f12                \n\t"
+    "paddh      $f22, $f22, $f14                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "psubh      $f20, $f20, $f16                \n\t"
+    "psubh      $f22, $f22, $f18                \n\t"
+    "paddh      $f8, $f8, $f0                   \n\t"
+    "paddh      $f10, $f10, $f2                 \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "psllh      $f20, $f20, $f24                \n\t"
+    "psllh      $f22, $f22, $f24                \n\t"
+    "paddh      $f8, $f8, $f20                  \n\t"
+    "paddh      $f10, $f10, $f22                \n\t"
+    "gssdlc1    $f8, 0x19(%[pTap])              \n\t"
+    "gssdlc1    $f10, 0x21(%[pTap])             \n\t"
+    "gssdrc1    $f8, 0x12(%[pTap])              \n\t"
+    "gssdrc1    $f10, 0x1a(%[pTap])             \n\t"
+
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], %[iTapStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 2b                  \n\t"
+    "3:                                         \n\t"
+    : [pSrc]"+&r"(pSrc), [pTap]"+&r"(pTap), [iWidth]"+&r"(iWidth),
+      [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride),  [iTapStride]"r"(iTapStride)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+static inline void McHorVer22Width8VerLastAlign_mmi(const uint8_t *pTap,
+                   int32_t iTapStride, uint8_t * pDst, int32_t iDstStride,
+                   int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "move       $10, %[pTap]                    \n\t"
+    "move       $11, %[pDst]                    \n\t"
+    "move       $12, %[iHeight]                 \n\t"
+    "dsrl       %[iWidth], 0x3                  \n\t"
+    PTR_ADDU   "$13, %[iTapStride], %[iTapStride] \n\t"
+    PTR_ADDU   "$14, %[iDstStride], %[iDstStride] \n\t"
+    "dli        $15, 0x0020002000200020         \n\t"
+
+    "4:                                         \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pTap])          \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f6, $f4, 0x0($8)               \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[pTap])         \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f14, $f12, 0x0($8)             \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f18, $f16, 0x0(%[pTap])        \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f22, $f20, 0x0($8)             \n\t"
+
+    FILTER_VER_ALIGN($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                     $f22, $f24, $f26, $f28, $f30, %[pDst], $0, $8, $9, $15)
+
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[pTap])        \n\t"
+    "mov.d      $f0, $f4                        \n\t"
+    "mov.d      $f2, $f6                        \n\t"
+    "mov.d      $f4, $f8                        \n\t"
+    "mov.d      $f6, $f10                       \n\t"
+    "mov.d      $f8, $f12                       \n\t"
+    "mov.d      $f10, $f14                      \n\t"
+    "mov.d      $f12, $f16                      \n\t"
+    "mov.d      $f14, $f18                      \n\t"
+    "mov.d      $f16, $f20                      \n\t"
+    "mov.d      $f18, $f22                      \n\t"
+    "mov.d      $f20, $f24                      \n\t"
+    "mov.d      $f22, $f26                      \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_SUBU   "%[pTap], %[pTap], %[iTapStride] \n\t"
+
+    "5:                                         \n\t"
+    FILTER_VER_ALIGN($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                     $f22, $f24, $f26, $f28, $f30, %[pDst], $0, $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[pTap])        \n\t"
+
+    FILTER_VER_ALIGN($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24,
+                     $f26, $f28, $f30, $f0, $f2, %[pDst], %[iDstStride], $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], $14           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f30, $f28, 0x0($8)             \n\t"
+
+    FILTER_VER_ALIGN($f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28,
+                     $f30, $f0, $f2, $f4, $f6, %[pDst], $0, $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pTap])          \n\t"
+
+    FILTER_VER_ALIGN($f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0,
+                     $f2, $f4, $f6, $f8, $f10, %[pDst], %[iDstStride], $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], $14           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f6, $f4, 0x0($8)               \n\t"
+
+    FILTER_VER_ALIGN($f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4,
+                     $f6, $f8, $f10, $f12, $f14, %[pDst], $0, $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[pTap])         \n\t"
+
+    FILTER_VER_ALIGN($f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8,
+                     $f10, $f12, $f14, $f16, $f18, %[pDst], %[iDstStride], $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], $14           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f14, $f12, 0x0($8)             \n\t"
+
+    FILTER_VER_ALIGN($f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12,
+                     $f14, $f16, $f18, $f20, $f22, %[pDst], $0, $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gslqc1     $f18, $f16, 0x0(%[pTap])        \n\t"
+
+    FILTER_VER_ALIGN($f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16,
+                     $f18, $f20, $f22, $f24, $f26, %[pDst], %[iDstStride], $8, $9, $15)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], $14           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gslqc1     $f22, $f20, 0x0($8)             \n\t"
+    "j          5b                              \n\t"
+
+    "6:                                         \n\t"
+    PTR_ADDIU  "%[iWidth], %[iWidth], -0x1      \n\t"
+    "beqz       %[iWidth], 7f                   \n\t"
+    "move       %[pTap], $10                    \n\t"
+    "move       %[pDst], $11                    \n\t"
+    "move       %[iHeight], $12                 \n\t"
+    PTR_ADDIU  "%[pTap], %[pTap], 0x10          \n\t"
+    PTR_ADDIU  "%[pDst], %[pDst], 0x8           \n\t"
+    "j          4b                              \n\t"
+    "7:                                         \n\t"
+    : [pTap]"+&r"((unsigned char *)pTap), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    : [iTapStride]"r"((int)iTapStride), [iDstStride]"r"((int)iDstStride)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0",
+      "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18",
+      "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+static inline void McHorVer22Width8VerLastUnAlign_mmi(const uint8_t *pTap,
+                   int32_t iTapStride, uint8_t * pDst, int32_t iDstStride,
+                   int32_t iWidth, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "move       $10, %[pTap]                    \n\t"
+    "move       $11, %[pDst]                    \n\t"
+    "move       $12, %[iHeight]                 \n\t"
+    "dsrl       %[iWidth], 0x3                  \n\t"
+    PTR_ADDU   "$13, %[iTapStride], %[iTapStride] \n\t"
+    "dli        $14, 0x0020002000200020         \n\t"
+
+    "4:                                         \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f0, 0x7(%[pTap])               \n\t"
+    "gsldlc1    $f2, 0xF(%[pTap])               \n\t"
+    "gsldlc1    $f4, 0x7($8)                    \n\t"
+    "gsldlc1    $f6, 0xF($8)                    \n\t"
+    "gsldrc1    $f0, 0x0(%[pTap])               \n\t"
+    "gsldrc1    $f2, 0x8(%[pTap])               \n\t"
+    "gsldrc1    $f4, 0x0($8)                    \n\t"
+    "gsldrc1    $f6, 0x8($8)                    \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f8, 0x7(%[pTap])               \n\t"
+    "gsldlc1    $f10, 0xF(%[pTap])              \n\t"
+    "gsldlc1    $f12, 0x7($8)                   \n\t"
+    "gsldlc1    $f14, 0xF($8)                   \n\t"
+    "gsldrc1    $f8, 0x0(%[pTap])               \n\t"
+    "gsldrc1    $f10, 0x8(%[pTap])              \n\t"
+    "gsldrc1    $f12, 0x0($8)                   \n\t"
+    "gsldrc1    $f14, 0x8($8)                   \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f16, 0x7(%[pTap])              \n\t"
+    "gsldlc1    $f18, 0xF(%[pTap])              \n\t"
+    "gsldlc1    $f20, 0x7($8)                   \n\t"
+    "gsldlc1    $f22, 0xF($8)                   \n\t"
+    "gsldrc1    $f16, 0x0(%[pTap])              \n\t"
+    "gsldrc1    $f18, 0x8(%[pTap])              \n\t"
+    "gsldrc1    $f20, 0x0($8)                   \n\t"
+    "gsldrc1    $f22, 0x8($8)                   \n\t"
+
+    FILTER_VER_UNALIGN($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18,
+                       $f20, $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gsldlc1    $f24, 0x7(%[pTap])              \n\t"
+    "gsldlc1    $f26, 0xF(%[pTap])              \n\t"
+    "gsldrc1    $f24, 0x0(%[pTap])              \n\t"
+    "gsldrc1    $f26, 0x8(%[pTap])              \n\t"
+    "mov.d      $f0, $f4                        \n\t"
+    "mov.d      $f2, $f6                        \n\t"
+    "mov.d      $f4, $f8                        \n\t"
+    "mov.d      $f6, $f10                       \n\t"
+    "mov.d      $f8, $f12                       \n\t"
+    "mov.d      $f10, $f14                      \n\t"
+    "mov.d      $f12, $f16                      \n\t"
+    "mov.d      $f14, $f18                      \n\t"
+    "mov.d      $f16, $f20                      \n\t"
+    "mov.d      $f18, $f22                      \n\t"
+    "mov.d      $f20, $f24                      \n\t"
+    "mov.d      $f22, $f26                      \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_SUBU   "%[pTap], %[pTap], %[iTapStride] \n\t"
+
+    "5:                                         \n\t"
+    FILTER_VER_UNALIGN($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18,
+                       $f20, $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9, $14)
+
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gsldlc1    $f24, 0x7(%[pTap])              \n\t"
+    "gsldlc1    $f26, 0xF(%[pTap])              \n\t"
+    "gsldrc1    $f24, 0x0(%[pTap])              \n\t"
+    "gsldrc1    $f26, 0x8(%[pTap])              \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+
+    FILTER_VER_UNALIGN($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22,
+                       $f24, $f26, $f28, $f30, $f0, $f2, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f28, 0x7($8)                   \n\t"
+    "gsldlc1    $f30, 0xF($8)                   \n\t"
+    "gsldrc1    $f28, 0x0($8)                   \n\t"
+    "gsldrc1    $f30, 0x8($8)                   \n\t"
+
+    FILTER_VER_UNALIGN($f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26,
+                       $f28, $f30, $f0, $f2, $f4, $f6, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gsldlc1    $f0, 0x7(%[pTap])               \n\t"
+    "gsldlc1    $f2, 0xF(%[pTap])               \n\t"
+    "gsldrc1    $f0, 0x0(%[pTap])               \n\t"
+    "gsldrc1    $f2, 0x8(%[pTap])               \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+
+    FILTER_VER_UNALIGN($f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28,
+                       $f30, $f0, $f2, $f4, $f6, $f8, $f10, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f4, 0x7($8)                    \n\t"
+    "gsldlc1    $f6, 0xF($8)                    \n\t"
+    "gsldrc1    $f4, 0x0($8)                    \n\t"
+    "gsldrc1    $f6, 0x8($8)                    \n\t"
+
+    FILTER_VER_UNALIGN($f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2,
+                       $f4, $f6, $f8, $f10, $f12, $f14, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gsldlc1    $f8, 0x7(%[pTap])               \n\t"
+    "gsldlc1    $f10, 0xF(%[pTap])              \n\t"
+    "gsldrc1    $f8, 0x0(%[pTap])               \n\t"
+    "gsldrc1    $f10, 0x8(%[pTap])              \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+
+    FILTER_VER_UNALIGN($f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6,
+                       $f8, $f10, $f12, $f14, $f16, $f18, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f12, 0x7($8)                   \n\t"
+    "gsldlc1    $f14, 0xF($8)                   \n\t"
+    "gsldrc1    $f12, 0x0($8)                   \n\t"
+    "gsldrc1    $f14, 0x8($8)                   \n\t"
+
+    FILTER_VER_UNALIGN($f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10,
+                       $f12, $f14, $f16, $f18, $f20, $f22, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pTap], %[pTap], $13           \n\t"
+    "gsldlc1    $f16, 0x7(%[pTap])              \n\t"
+    "gsldlc1    $f18, 0xF(%[pTap])              \n\t"
+    "gsldrc1    $f16, 0x0(%[pTap])              \n\t"
+    "gsldrc1    $f18, 0x8(%[pTap])              \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+
+    FILTER_VER_UNALIGN($f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14,
+                       $f16, $f18, $f20, $f22, $f24, $f26, %[pDst], $8, $9, $14)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 6f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pTap], %[iTapStride]      \n\t"
+    "gsldlc1    $f20, 0x7($8)                   \n\t"
+    "gsldlc1    $f22, 0xF($8)                   \n\t"
+    "gsldrc1    $f20, 0x0($8)                   \n\t"
+    "gsldrc1    $f22, 0x8($8)                   \n\t"
+    "j          5b                              \n\t"
+
+    "6:                                         \n\t"
+    PTR_ADDIU  "%[iWidth], %[iWidth], -0x1      \n\t"
+    "beqz       %[iWidth], 7f                   \n\t"
+    "move       %[pTap], $10                    \n\t"
+    "move       %[pDst], $11                    \n\t"
+    "move       %[iHeight], $12                 \n\t"
+    PTR_ADDIU  "%[pTap], %[pTap], 0x10          \n\t"
+    PTR_ADDIU  "%[pDst], %[pDst], 0x8           \n\t"
+    "j          4b                              \n\t"
+
+    "7:                                         \n\t"
+    : [pTap]"+&r"((unsigned char *)pTap), [pDst]"+&r"((unsigned char *)pDst),
+      [iWidth]"+&r"((int)iWidth), [iHeight]"+&r"((int)iHeight)
+    : [iTapStride]"r"((int)iTapStride), [iDstStride]"r"((int)iDstStride)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20",
+      "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+//horizontal and vertical filter to gain half sample, that is (2, 2) location in quarter sample
+static inline void McHorVer22Width5Or9Or17Height5Or9Or17_mmi(const uint8_t* pSrc,
+                   int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                   int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, pTap, 22, 24, 16)
+
+  if (iWidth == 17 || iWidth == 9){
+    int32_t tmp1 = 2 * (iWidth - 8);
+    McHorVer22HorFirst_mmi(pSrc - 2, iSrcStride, (uint8_t*)pTap, 48, iWidth, iHeight + 5);
+
+    McHorVer22Width8VerLastAlign_mmi((uint8_t*)pTap,  48, pDst, iDstStride, iWidth - 1, iHeight);
+
+    McHorVer22Width8VerLastUnAlign_mmi((uint8_t*)pTap + tmp1,  48, pDst + iWidth - 8,
+                                        iDstStride, 8, iHeight);
+  } else {
+    int16_t iTmp[17 + 5];
+    int32_t i, j, k;
+
+    for (i = 0; i < iHeight; i++) {
+      for (j = 0; j < iWidth + 5; j++) {
+        iTmp[j] = FilterInput8bitWithStride_c (pSrc - 2 + j, iSrcStride);
+      }
+      for (k = 0; k < iWidth; k++) {
+        pDst[k] = WelsClip1 ((HorFilterInput16bit_c (&iTmp[k]) + 512) >> 10);
+      }
+      pSrc += iSrcStride;
+      pDst += iDstStride;
+    }
+  }
+}
+
+void McCopyWidthEq4_mmi(const uint8_t *pSrc, int iSrcStride,
+                        uint8_t *pDst, int iDstStride, int iHeight) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    "lwl        $8, 0x3(%[pSrc])                \n\t"
+    "lwr        $8, 0x0(%[pSrc])                \n\t"
+    "swl        $8, 0x3(%[pDst])                \n\t"
+    "swr        $8, 0x0(%[pDst])                \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -1      \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8"
+  );
+}
+
+void McCopyWidthEq8_mmi(const uint8_t *pSrc, int iSrcStride,
+                        uint8_t *pDst, int iDstStride, int iHeight) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    "ldl        $8, 0x7(%[pSrc])                \n\t"
+    "ldr        $8, 0x0(%[pSrc])                \n\t"
+    "sdl        $8, 0x7(%[pDst])                \n\t"
+    "sdr        $8, 0x0(%[pDst])                \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -1      \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8"
+  );
+}
+
+void McCopyWidthEq16_mmi(const uint8_t *pSrc, int iSrcStride,
+                         uint8_t *pDst, int iDstStride, int iHeight) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    "ldl        $8, 0x7(%[pSrc])                \n\t"
+    "ldl        $9, 0xF(%[pSrc])                \n\t"
+    "ldr        $8, 0x0(%[pSrc])                \n\t"
+    "ldr        $9, 0x8(%[pSrc])                \n\t"
+    "sdl        $8, 0x7(%[pDst])                \n\t"
+    "sdl        $9, 0xF(%[pDst])                \n\t"
+    "sdr        $8, 0x0(%[pDst])                \n\t"
+    "sdr        $9, 0x8(%[pDst])                \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -1      \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$9"
+  );
+}
+
+static inline void McCopy_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                              int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McCopyWidthEq16_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McCopyWidthEq8_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 4)
+    McCopyWidthEq4_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McCopyWidthEq2_c (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+void McChromaWidthEq4_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                          int32_t iDstStride, const uint8_t *pABCD, int32_t iHeight) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gsldlc1    $f6, 0x7(%[pABCD])              \n\t"
+    "gsldrc1    $f6, 0x0(%[pABCD])              \n\t"
+    "xor        $f14, $f14, $f14                \n\t"
+    "punpcklbh  $f6, $f6, $f6                   \n\t"
+    "mov.d      $f8, $f6                        \n\t"
+    "punpcklhw  $f6, $f6, $f6                   \n\t"
+    "punpckhhw  $f8, $f8, $f8                   \n\t"
+    "mov.d      $f10, $f6                       \n\t"
+    "punpcklbh  $f6, $f6, $f14                  \n\t"
+    "punpckhbh  $f10, $f10, $f14                \n\t"
+
+    "mov.d      $f12, $f8                       \n\t"
+    "punpcklbh  $f8, $f8, $f14                  \n\t"
+    "punpckhbh  $f12, $f12, $f14                \n\t"
+    PTR_ADDU   "%[pABCD], %[pSrc], %[iSrcStride] \n\t"
+    "dli        $8, 0x6                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f2, 0x8(%[pSrc])               \n\t"
+    "dmtc1      $8, $f16                        \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x1(%[pSrc])               \n\t"
+    "dli        $8, 0x0020002000200020          \n\t"
+    "punpcklbh  $f0, $f0, $f14                  \n\t"
+    "punpcklbh  $f2, $f2, $f14                  \n\t"
+
+    "dmtc1      $8, $f18                        \n\t"
+    "1:                                         \n\t"
+    "pmullh     $f0, $f0, $f6                   \n\t"
+    "pmullh     $f2, $f2, $f10                  \n\t"
+    "paddh      $f0, $f0, $f2                   \n\t"
+
+    "gsldlc1    $f2, 0x7(%[pABCD])              \n\t"
+    "gsldrc1    $f2, 0x0(%[pABCD])              \n\t"
+    "punpcklbh  $f2, $f2, $f14                  \n\t"
+    "mov.d      $f4, $f2                        \n\t"
+    "pmullh     $f2, $f2, $f8                   \n\t"
+    "paddh      $f0, $f0, $f2                   \n\t"
+    "gsldlc1    $f2, 0x8(%[pABCD])              \n\t"
+    "gsldrc1    $f2, 0x1(%[pABCD])              \n\t"
+    "punpcklbh  $f2, $f2, $f14                  \n\t"
+    "mov.d      $f14, $f2                       \n\t"
+    "pmullh     $f2, $f2, $f12                  \n\t"
+    "paddh      $f0, $f0, $f2                   \n\t"
+    "mov.d      $f2, $f14                       \n\t"
+    "paddh      $f0, $f0, $f18                  \n\t"
+    "psrlh      $f0, $f0, $f16                  \n\t"
+    "xor        $f14, $f14, $f14                \n\t"
+    "packushb   $f0, $f0, $f14                  \n\t"
+    "gsswlc1    $f0, 0x3(%[pDst])               \n\t"
+    "gsswrc1    $f0, 0x0(%[pDst])               \n\t"
+    "mov.d      $f0, $f4                        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "%[pABCD], %[pABCD], %[iSrcStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -1      \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"((unsigned char *)pSrc), [pDst]"+&r"((unsigned char *)pDst),
+      [pABCD]"+&r"((unsigned char *)pABCD), [iHeight]"+&r"((int)iHeight)
+    : [iSrcStride]"r"((int)iSrcStride), [iDstStride]"r"((int)iDstStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18"
+  );
+}
+
+void McChromaWidthEq8_mmi(const uint8_t *pSrc, int32_t iSrcStride, uint8_t *pDst,
+                          int32_t iDstStride, const uint8_t *pABCD, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gsldlc1    $f12, 0x7(%[pABCD])             \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldrc1    $f12, 0x0(%[pABCD])             \n\t"
+    "punpcklbh  $f12, $f12, $f12                \n\t"
+    "punpckhhw  $f14, $f12, $f12                \n\t"
+    "punpcklhw  $f12, $f12, $f12                \n\t"
+
+    "mov.d      $f16, $f14                      \n\t"
+    "punpckhwd  $f14, $f12, $f12                \n\t"
+    "punpcklwd  $f12, $f12, $f12                \n\t"
+    "punpckhwd  $f18, $f16, $f16                \n\t"
+    "punpcklwd  $f16, $f16, $f16                \n\t"
+    "mov.d      $f20, $f14                      \n\t"
+    "mov.d      $f24, $f18                      \n\t"
+
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpckhbh  $f26, $f24, $f28                \n\t"
+    "punpcklbh  $f24, $f24, $f28                \n\t"
+
+    PTR_ADDU   "%[pABCD], %[pSrc], %[iSrcStride] \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0x8(%[pSrc])               \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x1(%[pSrc])               \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "1:                                         \n\t"
+    "dli        $8, 0x20                        \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+
+    "pmullh     $f0, $f0, $f12                  \n\t"
+    "pmullh     $f2, $f2, $f14                  \n\t"
+    "pmullh     $f4, $f4, $f20                  \n\t"
+    "pmullh     $f6, $f6, $f22                  \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+
+    "gsldlc1    $f4, 0x7(%[pABCD])              \n\t"
+    "gsldrc1    $f4, 0x0(%[pABCD])              \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "mov.d      $f8, $f4                        \n\t"
+    "mov.d      $f10, $f6                       \n\t"
+    "pmullh     $f4, $f4, $f16                  \n\t"
+    "pmullh     $f6, $f6, $f18                  \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+
+    "gsldlc1    $f4, 0x8(%[pABCD])              \n\t"
+    "gsldrc1    $f4, 0x1(%[pABCD])              \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "mov.d      $f28, $f4                       \n\t"
+    "mov.d      $f30, $f6                       \n\t"
+    "pmullh     $f4, $f4, $f24                  \n\t"
+    "pmullh     $f6, $f6, $f26                  \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "mov.d      $f4, $f28                       \n\t"
+    "mov.d      $f6, $f30                       \n\t"
+
+    "dli        $8, 0x0020002000200020          \n\t"
+    "dmfc1      $9, $f20                        \n\t"
+    "dmtc1      $8, $f20                        \n\t"
+    "dli        $8, 0x6                         \n\t"
+    "paddh      $f0, $f0, $f20                  \n\t"
+    "paddh      $f2, $f2, $f20                  \n\t"
+    "dmtc1      $8, $f20                        \n\t"
+    "psrlh      $f0, $f0, $f20                  \n\t"
+    "psrlh      $f2, $f2, $f20                  \n\t"
+
+    "xor        $f28, $f28, $f28                \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+
+    "mov.d      $f0, $f8                        \n\t"
+    "mov.d      $f2, $f10                       \n\t"
+    "dmtc1      $9, $f20                        \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "%[pABCD], %[pABCD], %[iSrcStride] \n\t"
+
+    PTR_ADDIU  "%[iHeight], %[iHeight], -1      \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [pABCD]"+&r"(pABCD),
+      [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void McChroma_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                  int32_t iDstStride, int16_t iMvX, int16_t iMvY,
+                  int32_t iWidth, int32_t iHeight) {
+  static const PMcChromaWidthExtFunc kpMcChromaWidthFuncs[2] = {
+    McChromaWidthEq4_mmi,
+    McChromaWidthEq8_mmi
+  };
+  const int32_t kiD8x = iMvX & 0x07;
+  const int32_t kiD8y = iMvY & 0x07;
+  if (kiD8x == 0 && kiD8y == 0) {
+    McCopy_mmi (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+    return;
+  }
+  if (iWidth != 2) {
+    kpMcChromaWidthFuncs[iWidth >> 3] (pSrc, iSrcStride, pDst, iDstStride,
+                                      g_kuiABCD[kiD8y][kiD8x], iHeight);
+  } else
+    McChromaWithFragMv_c (pSrc, iSrcStride, pDst, iDstStride, iMvX, iMvY,
+                          iWidth, iHeight);
+}
+
+void McHorVer20WidthEq8_mmi(const uint8_t *pSrc, int iSrcStride, uint8_t *pDst,
+                            int iDstStride, int iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], -0x2          \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "dli        $8, 0x0010001000100010          \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $8, $f26                        \n\t"
+    "dli        $8, 0x5                         \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+    "1:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f24                  \n\t"
+    "psrah      $f0, $f0, $f30                  \n\t"
+    "psrah      $f2, $f2, $f30                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void McHorVer20WidthEq16_mmi(const uint8_t *pSrc, int iSrcStride, uint8_t *pDst,
+                             int iDstStride, int iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], -0x2          \n\t"
+    "dli        $8, 0x0010001000100010          \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $8, $f26                        \n\t"
+    "dli        $8, 0x5                         \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+    "1:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f24                  \n\t"
+    "psrah      $f0, $f0, $f30                  \n\t"
+    "psrah      $f2, $f2, $f30                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gsldlc1    $f0, 0xF(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0x14(%[pSrc])              \n\t"
+    "gsldlc1    $f8, 0x10(%[pSrc])              \n\t"
+    "gsldlc1    $f12, 0x13(%[pSrc])             \n\t"
+    "gsldlc1    $f16, 0x11(%[pSrc])             \n\t"
+    "gsldlc1    $f20, 0x12(%[pSrc])             \n\t"
+    "gsldrc1    $f0, 0x8(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0xd(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x9(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0xc(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0xb(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f26                \n\t"
+    "psllh      $f18, $f18, $f26                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "paddh      $f0, $f0, $f24                  \n\t"
+    "paddh      $f2, $f2, $f24                  \n\t"
+    "psrah      $f0, $f0, $f30                  \n\t"
+    "psrah      $f2, $f2, $f30                  \n\t"
+    "packushb   $f0, $f0, $f2                   \n\t"
+    "gssdlc1    $f0, 0xF(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x8(%[pDst])               \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void McHorVer20WidthEq4_mmi(const uint8_t *pSrc, int iSrcStride, uint8_t *pDst,
+                            int iDstStride, int iHeight) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    PTR_ADDIU  "%[pSrc], %[pSrc], -0x2          \n\t"
+    "xor        $f14, $f14, $f14                \n\t"
+    "dli        $8, 0x0010001000100010          \n\t"
+    "dmtc1      $8, $f12                        \n\t"
+    "1:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f2, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f6, 0xb(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x9(%[pSrc])               \n\t"
+    "gsldlc1    $f10, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f2, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f6, 0x4(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x2(%[pSrc])               \n\t"
+    "gsldrc1    $f10, 0x3(%[pSrc])              \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "punpcklbh  $f0, $f0, $f14                  \n\t"
+    "punpcklbh  $f2, $f2, $f14                  \n\t"
+    "punpcklbh  $f4, $f4, $f14                  \n\t"
+    "punpcklbh  $f6, $f6, $f14                  \n\t"
+    "punpcklbh  $f8, $f8, $f14                  \n\t"
+    "punpcklbh  $f10, $f10, $f14                \n\t"
+    "dmtc1      $8, $f16                        \n\t"
+    "paddh      $f4, $f4, $f6                   \n\t"
+    "paddh      $f8, $f8, $f10                  \n\t"
+    "psllh      $f8, $f8, $f16                  \n\t"
+    "psubh      $f8, $f8, $f4                   \n\t"
+    "paddh      $f0, $f0, $f2                   \n\t"
+    "paddh      $f0, $f0, $f8                   \n\t"
+    "dli        $8, 0x5                         \n\t"
+    "psllh      $f8, $f8, $f16                  \n\t"
+    "paddh      $f0, $f0, $f8                   \n\t"
+    "paddh      $f0, $f0, $f12                  \n\t"
+    "dmtc1      $8, $f16                        \n\t"
+    "psrah      $f0, $f0, $f16                  \n\t"
+    "packushb   $f0, $f0, $f14                  \n\t"
+    "gsswlc1    $f0, 0x3(%[pDst])               \n\t"
+    "gsswrc1    $f0, 0x0(%[pDst])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16"
+  );
+}
+
+static inline void McHorVer20_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer20WidthEq16_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+}
+
+void McHorVer02WidthEq8_mmi(const uint8_t *pSrc, int iSrcStride, uint8_t *pDst,
+                            int iDstStride, int iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    MMI_LOAD_8P($f0, $f2, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f28, $8)
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f8, $f10, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f28, $8)
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f16, $f18, $f28, %[pSrc])
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f28, $8)
+
+    "1:                                         \n\t"
+    FILTER_HV_W8($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20,
+                 $f22, $f24, $f26, $f28, $f30, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f24, $f26, $f28, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24,
+                 $f26, $f28, $f30, $f0, $f2, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f28, $f30, $f0, $8)
+    FILTER_HV_W8($f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28,
+                 $f30, $f0, $f2, $f4, $f6, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f0, $f2, $f4, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0,
+                 $f2, $f4, $f6, $f8, $f10, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f4, $f6, $f8, $8)
+    FILTER_HV_W8($f16, $f18, $f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4,
+                 $f6, $f8, $f10, $f12, $f14, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f8, $f10, $f12, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f20, $f22, $f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8,
+                 $f10, $f12, $f14, $f16, $f18, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f12, $f14, $f16, $8)
+    FILTER_HV_W8($f24, $f26, $f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12,
+                 $f14, $f16, $f18, $f20, $f22, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    MMI_LOAD_8P($f16, $f18, $f20, %[pSrc])
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    FILTER_HV_W8($f28, $f30, $f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f16,
+                 $f18, $f20, $f22, $f24, $f26, %[pDst], $8, $9)
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "beqz       %[iHeight], 2f                  \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDU   "$8, %[pSrc], %[iSrcStride]      \n\t"
+    MMI_LOAD_8P($f20, $f22, $f24, $8)
+    "j          1b                              \n\t"
+    "2:                                         \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride), [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$9", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+static inline void McHorVer02WidthEq16_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                   uint8_t* pDst, int32_t iDstStride, int32_t iHeight) {
+  McHorVer02WidthEq8_mmi (pSrc,     iSrcStride, pDst,     iDstStride, iHeight);
+  McHorVer02WidthEq8_mmi (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
+}
+
+static inline void McHorVer02_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                   uint8_t* pDst, int32_t iDstStride, int32_t iWidth,
+                   int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer02WidthEq16_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer02WidthEq8_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer02_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
+}
+
+void McHorVer22Width8HorFirst_mmi(const uint8_t *pSrc, int16_t iSrcStride,
+     uint8_t *pDst, int32_t iDstStride, int32_t iHeight) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_SUBU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+    "1:                                         \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrc])               \n\t"
+    "gsldlc1    $f4, 0xc(%[pSrc])               \n\t"
+    "gsldlc1    $f8, 0x8(%[pSrc])               \n\t"
+    "gsldlc1    $f12, 0xb(%[pSrc])              \n\t"
+    "gsldlc1    $f16, 0x9(%[pSrc])              \n\t"
+    "gsldlc1    $f20, 0xa(%[pSrc])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrc])               \n\t"
+    "gsldrc1    $f4, 0x5(%[pSrc])               \n\t"
+    "gsldrc1    $f8, 0x1(%[pSrc])               \n\t"
+    "gsldrc1    $f12, 0x4(%[pSrc])              \n\t"
+    "gsldrc1    $f16, 0x2(%[pSrc])              \n\t"
+    "gsldrc1    $f20, 0x3(%[pSrc])              \n\t"
+    "punpckhbh  $f2, $f0, $f28                  \n\t"
+    "punpckhbh  $f6, $f4, $f28                  \n\t"
+    "punpckhbh  $f10, $f8, $f28                 \n\t"
+    "punpckhbh  $f14, $f12, $f28                \n\t"
+    "punpckhbh  $f18, $f16, $f28                \n\t"
+    "punpckhbh  $f22, $f20, $f28                \n\t"
+    "punpcklbh  $f0, $f0, $f28                  \n\t"
+    "punpcklbh  $f4, $f4, $f28                  \n\t"
+    "punpcklbh  $f8, $f8, $f28                  \n\t"
+    "punpcklbh  $f12, $f12, $f28                \n\t"
+    "punpcklbh  $f16, $f16, $f28                \n\t"
+    "punpcklbh  $f20, $f20, $f28                \n\t"
+    "paddh      $f8, $f8, $f12                  \n\t"
+    "paddh      $f10, $f10, $f14                \n\t"
+    "paddh      $f16, $f16, $f20                \n\t"
+    "paddh      $f18, $f18, $f22                \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "psubh      $f16, $f16, $f8                 \n\t"
+    "psubh      $f18, $f18, $f10                \n\t"
+    "paddh      $f0, $f0, $f4                   \n\t"
+    "paddh      $f2, $f2, $f6                   \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "psllh      $f16, $f16, $f30                \n\t"
+    "psllh      $f18, $f18, $f30                \n\t"
+    "paddh      $f0, $f0, $f16                  \n\t"
+    "paddh      $f2, $f2, $f18                  \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0xF(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x8(%[pDst])               \n\t"
+    PTR_ADDU   "%[pSrc], %[pSrc], %[iSrcStride] \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride] \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pSrc]"+&r"(pSrc), [pDst]"+&r"(pDst), [iHeight]"+&r"(iHeight)
+    : [iSrcStride]"r"(iSrcStride),  [iDstStride]"r"(iDstStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+static inline void McHorVer22WidthEq8_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                   uint8_t* pDst, int32_t iDstStride, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_2D (int16_t, iTap, 21, 8, 16)
+  McHorVer22Width8HorFirst_mmi (pSrc - 2, iSrcStride, (uint8_t*)iTap, 16, iHeight + 5);
+  McHorVer22Width8VerLastAlign_mmi ((uint8_t*)iTap, 16, pDst, iDstStride, 8, iHeight);
+}
+
+static inline void McHorVer22WidthEq16_mmi(const uint8_t* pSrc, int32_t iSrcStride,
+                   uint8_t* pDst, int32_t iDstStride, int32_t iHeight) {
+  McHorVer22WidthEq8_mmi (pSrc,     iSrcStride, pDst,     iDstStride, iHeight);
+  McHorVer22WidthEq8_mmi (&pSrc[8], iSrcStride, &pDst[8], iDstStride, iHeight);
+}
+
+static inline void McHorVer22_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                   int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  if (iWidth == 16)
+    McHorVer22WidthEq16_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else if (iWidth == 8)
+    McHorVer22WidthEq8_mmi (pSrc, iSrcStride, pDst, iDstStride, iHeight);
+  else
+    McHorVer22_c (pSrc, iSrcStride, pDst, iDstStride, 4, iHeight);
+}
+
+void PixelAvgWidthEq4_mmi(uint8_t *pDst,  int iDstStride, const uint8_t *pSrcA,
+     int iSrcAStride, const uint8_t *pSrcB, int iSrcBStride, int iHeight ) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                    \n\t"
+    "1:                                            \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrcB])                 \n\t"
+    "gsldlc1    $f2, 0x7(%[pSrcA])                 \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrcB])                 \n\t"
+    "gsldrc1    $f2, 0x0(%[pSrcA])                 \n\t"
+    "pavgb      $f0, $f0, $f2                      \n\t"
+    "gsswlc1    $f0, 0x3(%[pDst])                  \n\t"
+    "gsswrc1    $f0, 0x0(%[pDst])                  \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x1       \n\t"
+    PTR_ADDU   "%[pDst], %[pDst], %[iDstStride]    \n\t"
+    PTR_ADDU   "%[pSrcA], %[pSrcA], %[iSrcAStride] \n\t"
+    PTR_ADDU   "%[pSrcB], %[pSrcB], %[iSrcBStride] \n\t"
+    "bnez       %[iHeight], 1b                     \n\t"
+    : [pDst]"+&r"((unsigned char *)pDst), [pSrcA]"+&r"((unsigned char *)pSrcA),
+      [pSrcB]"+&r"((unsigned char *)pSrcB), [iHeight]"+&r"((int)iHeight)
+    : [iDstStride]"r"((int)iDstStride), [iSrcAStride]"r"((int)iSrcAStride),
+      [iSrcBStride]"r"((int)iSrcBStride)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2"
+  );
+}
+
+void PixelAvgWidthEq8_mmi(uint8_t *pDst,  int iDstStride, const uint8_t *pSrcA,
+     int iSrcAStride, const uint8_t *pSrcB, int iSrcBStride, int iHeight ) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrcA])              \n\t"
+    "gsldlc1    $f2, 0x7(%[pSrcB])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrcA])              \n\t"
+    "gsldrc1    $f2, 0x0(%[pSrcB])              \n\t"
+    "pavgb      $f0, $f0, $f2                   \n\t"
+    PTR_ADDU   "$8, %[pSrcA], %[iSrcAStride]    \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    PTR_ADDU   "$9, %[pSrcB], %[iSrcBStride]    \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gsldlc1    $f0, 0x7($8)                    \n\t"
+    "gsldlc1    $f2, 0x7($9)                    \n\t"
+    "gsldrc1    $f0, 0x0($8)                    \n\t"
+    "gsldrc1    $f2, 0x0($9)                    \n\t"
+    "pavgb      $f0, $f0, $f2                   \n\t"
+    PTR_ADDU   "$10, %[pDst], %[iDstStride]     \n\t"
+    "gssdlc1    $f0, 0x7($10)                   \n\t"
+    PTR_ADDU   "%[pSrcA], $8, %[iSrcAStride]    \n\t"
+    "gssdrc1    $f0, 0x0($10)                   \n\t"
+    PTR_ADDU   "%[pSrcB], $9, %[iSrcBStride]    \n\t"
+    PTR_ADDU   "%[pDst], $10, %[iDstStride]     \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x2    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pDst]"+&r"((unsigned char *)pDst), [pSrcA]"+&r"((unsigned char *)pSrcA),
+      [pSrcB]"+&r"((unsigned char *)pSrcB), [iHeight]"+&r"((int)iHeight)
+    : [iDstStride]"r"((int)iDstStride), [iSrcAStride]"r"((int)iSrcAStride),
+      [iSrcBStride]"r"((int)iSrcBStride)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2"
+  );
+}
+
+void PixelAvgWidthEq16_mmi(uint8_t *pDst, int iDstStride, const uint8_t *pSrcA,
+     int iSrcAStride, const uint8_t *pSrcB, int iSrcBStride, int iHeight ) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "1:                                         \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrcA])              \n\t"
+    "gsldlc1    $f2, 0xF(%[pSrcA])              \n\t"
+    "gsldlc1    $f4, 0x7(%[pSrcB])              \n\t"
+    "gsldlc1    $f6, 0xF(%[pSrcB])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrcA])              \n\t"
+    "gsldrc1    $f2, 0x8(%[pSrcA])              \n\t"
+    "gsldrc1    $f4, 0x0(%[pSrcB])              \n\t"
+    "gsldrc1    $f6, 0x8(%[pSrcB])              \n\t"
+    "pavgb      $f0, $f0, $f4                   \n\t"
+    "pavgb      $f2, $f2, $f6                   \n\t"
+    PTR_ADDU   "$8, %[pSrcA], %[iSrcAStride]    \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0xF(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x8(%[pDst])               \n\t"
+    PTR_ADDU   "$9, %[pSrcB], %[iSrcBStride]    \n\t"
+    "gsldlc1    $f0, 0x7($8)                    \n\t"
+    "gsldlc1    $f2, 0xF($8)                    \n\t"
+    "gsldrc1    $f0, 0x0($8)                    \n\t"
+    "gsldrc1    $f2, 0x8($8)                    \n\t"
+    PTR_ADDU   "$10, %[pDst], %[iDstStride]     \n\t"
+    "gsldlc1    $f4, 0x7($9)                    \n\t"
+    "gsldlc1    $f6, 0xF($9)                    \n\t"
+    "gsldrc1    $f4, 0x0($9)                    \n\t"
+    "gsldrc1    $f6, 0x8($9)                    \n\t"
+    "pavgb      $f0, $f0, $f4                   \n\t"
+    "pavgb      $f2, $f2, $f6                   \n\t"
+    "gssdlc1    $f0, 0x7($10)                   \n\t"
+    "gssdlc1    $f2, 0xF($10)                   \n\t"
+    "gssdrc1    $f0, 0x0($10)                   \n\t"
+    "gssdrc1    $f2, 0x8($10)                   \n\t"
+
+    PTR_ADDU   "%[pSrcA], $8, %[iSrcAStride]    \n\t"
+    PTR_ADDU   "%[pSrcB], $9, %[iSrcBStride]    \n\t"
+    PTR_ADDU   "%[pDst], $10, %[iDstStride]     \n\t"
+    "gsldlc1    $f0, 0x7(%[pSrcA])              \n\t"
+    "gsldlc1    $f2, 0xF(%[pSrcA])              \n\t"
+    "gsldlc1    $f4, 0x7(%[pSrcB])              \n\t"
+    "gsldlc1    $f6, 0xF(%[pSrcB])              \n\t"
+    "gsldrc1    $f0, 0x0(%[pSrcA])              \n\t"
+    "gsldrc1    $f2, 0x8(%[pSrcA])              \n\t"
+    "gsldrc1    $f4, 0x0(%[pSrcB])              \n\t"
+    "gsldrc1    $f6, 0x8(%[pSrcB])              \n\t"
+    "pavgb      $f0, $f0, $f4                   \n\t"
+    "pavgb      $f2, $f2, $f6                   \n\t"
+    PTR_ADDU   "$8, %[pSrcA], %[iSrcAStride]    \n\t"
+    PTR_ADDU   "$9, %[pSrcB], %[iSrcBStride]    \n\t"
+    "gssdlc1    $f0, 0x7(%[pDst])               \n\t"
+    "gssdlc1    $f2, 0xF(%[pDst])               \n\t"
+    "gssdrc1    $f0, 0x0(%[pDst])               \n\t"
+    "gssdrc1    $f2, 0x8(%[pDst])               \n\t"
+    "gsldlc1    $f0, 0x7($8)                    \n\t"
+    "gsldlc1    $f2, 0xF($8)                    \n\t"
+    "gsldlc1    $f4, 0x7($9)                    \n\t"
+    "gsldlc1    $f6, 0xF($9)                    \n\t"
+    "gsldrc1    $f0, 0x0($8)                    \n\t"
+    "gsldrc1    $f2, 0x8($8)                    \n\t"
+    "gsldrc1    $f4, 0x0($9)                    \n\t"
+    "gsldrc1    $f6, 0x8($9)                    \n\t"
+    PTR_ADDU   "$10, %[pDst], %[iDstStride]     \n\t"
+    "pavgb      $f0, $f0, $f4                   \n\t"
+    "pavgb      $f2, $f2, $f6                   \n\t"
+    "gssdlc1    $f0, 0x7($10)                   \n\t"
+    "gssdlc1    $f2, 0xF($10)                   \n\t"
+    "gssdrc1    $f0, 0x0($10)                   \n\t"
+    "gssdrc1    $f2, 0x8($10)                   \n\t"
+    PTR_ADDU   "%[pSrcA], $8, %[iSrcAStride]    \n\t"
+    PTR_ADDU   "%[pSrcB], $9, %[iSrcBStride]    \n\t"
+    PTR_ADDU   "%[pDst], $10, %[iDstStride]     \n\t"
+    PTR_ADDIU  "%[iHeight], %[iHeight], -0x4    \n\t"
+    "bnez       %[iHeight], 1b                  \n\t"
+    : [pDst]"+&r"((unsigned char *)pDst), [pSrcA]"+&r"((unsigned char *)pSrcA),
+      [pSrcB]"+&r"((unsigned char *)pSrcB), [iHeight]"+&r"((int)iHeight)
+    : [iDstStride]"r"((int)iDstStride), [iSrcAStride]"r"((int)iSrcAStride),
+      [iSrcBStride]"r"((int)iSrcBStride)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6"
+  );
+}
+
+static inline void McHorVer01_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+
+static inline void McHorVer03_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pSrc + iSrcStride, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+
+static inline void McHorVer10_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pTmp, 16, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pSrc, iSrcStride, pTmp, 16, iHeight);
+  }
+}
+
+static inline void McHorVer11_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_mmi (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_mmi (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc, iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+
+static inline void McHorVer12_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_mmi (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_mmi (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_mmi (pSrc, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_mmi (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc, iSrcStride, pVerTmp, 16, 4, iHeight);
+    McHorVer22_c (pSrc, iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer13_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_mmi (pSrc,            iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_mmi (pSrc,            iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc,            iSrcStride, pVerTmp, 16, 4 , iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer21_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_mmi (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_mmi (pSrc, iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22_c (pSrc, iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+
+static inline void McHorVer23_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq16_mmi (pSrc,            iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22WidthEq8_mmi (pSrc,            iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer22_c (pSrc,            iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer30_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pSrc + 1, iSrcStride, pHorTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer31_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc,   iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_mmi (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_mmi (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc + 1, iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer32_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pCtrTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer02WidthEq16_mmi (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq16_mmi (pSrc,   iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer02WidthEq8_mmi (pSrc + 1, iSrcStride, pVerTmp, 16, iHeight);
+    McHorVer22WidthEq8_mmi (pSrc,   iSrcStride, pCtrTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  } else {
+    McHorVer02_c (pSrc + 1, iSrcStride, pVerTmp, 16, 4, iHeight);
+    McHorVer22_c (pSrc,   iSrcStride, pCtrTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pVerTmp, 16, pCtrTmp, 16, iHeight);
+  }
+}
+static inline void McHorVer33_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst,
+                                  int32_t iDstStride, int32_t iWidth, int32_t iHeight) {
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pHorTmp, 256, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pVerTmp, 256, 16);
+  if (iWidth == 16) {
+    McHorVer20WidthEq16_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq16_mmi (pSrc + 1,          iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq16_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else if (iWidth == 8) {
+    McHorVer20WidthEq8_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02WidthEq8_mmi (pSrc + 1,          iSrcStride, pVerTmp, 16, iHeight);
+    PixelAvgWidthEq8_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  } else {
+    McHorVer20WidthEq4_mmi (pSrc + iSrcStride, iSrcStride, pHorTmp, 16, iHeight);
+    McHorVer02_c (pSrc + 1,          iSrcStride, pVerTmp, 16, 4, iHeight);
+    PixelAvgWidthEq4_mmi (pDst, iDstStride, pHorTmp, 16, pVerTmp, 16, iHeight);
+  }
+}
+
+void McLuma_mmi(const uint8_t* pSrc, int32_t iSrcStride, uint8_t* pDst, int32_t iDstStride,
+                int16_t iMvX, int16_t iMvY, int32_t iWidth, int32_t iHeight) {
+  static const PWelsMcWidthHeightFunc pWelsMcFunc[4][4] = { //[x][y]
+    {McCopy_mmi,     McHorVer01_mmi, McHorVer02_mmi, McHorVer03_mmi},
+    {McHorVer10_mmi, McHorVer11_mmi, McHorVer12_mmi, McHorVer13_mmi},
+    {McHorVer20_mmi, McHorVer21_mmi, McHorVer22_mmi, McHorVer23_mmi},
+    {McHorVer30_mmi, McHorVer31_mmi, McHorVer32_mmi, McHorVer33_mmi},
+  };
+
+  pWelsMcFunc[iMvX & 0x03][iMvY & 0x03] (pSrc, iSrcStride, pDst, iDstStride, iWidth, iHeight);
+}
+
+void PixelAvg_mmi(uint8_t* pDst, int32_t iDstStride, const uint8_t* pSrcA, int32_t iSrcAStride,
+                  const uint8_t* pSrcB, int32_t iSrcBStride, int32_t iWidth, int32_t iHeight) {
+  static const PWelsSampleWidthAveragingFunc kpfFuncs[2] = {
+    PixelAvgWidthEq8_mmi,
+    PixelAvgWidthEq16_mmi
+  };
+  kpfFuncs[iWidth >> 4] (pDst, iDstStride, pSrcA, iSrcAStride, pSrcB, iSrcBStride, iHeight);
+}
+#endif//HAVE_MMI
+} // anon ns.
+
+void WelsCommon::InitMcFunc (SMcFunc* pMcFuncs, uint32_t uiCpuFlag) {
+  pMcFuncs->pfLumaHalfpelHor  = McHorVer20_c;
+  pMcFuncs->pfLumaHalfpelVer  = McHorVer02_c;
+  pMcFuncs->pfLumaHalfpelCen  = McHorVer22_c;
+  pMcFuncs->pfSampleAveraging = PixelAvg_c;
+  pMcFuncs->pMcChromaFunc     = McChroma_c;
+  pMcFuncs->pMcLumaFunc       = McLuma_c;
+
+#if defined (X86_ASM)
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_sse2;
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02Height5Or9Or17_sse2;
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17Height5Or9Or17_sse2;
+    pMcFuncs->pfSampleAveraging = PixelAvg_sse2;
+    pMcFuncs->pMcChromaFunc     = McChroma_sse2;
+    pMcFuncs->pMcLumaFunc       = McLuma_sse2;
+  }
+
+  if (uiCpuFlag & WELS_CPU_SSSE3) {
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_ssse3;
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02_ssse3;
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17_ssse3;
+    pMcFuncs->pMcChromaFunc = McChroma_ssse3;
+    pMcFuncs->pMcLumaFunc   = McLuma_ssse3;
+  }
+#ifdef HAVE_AVX2
+  if (uiCpuFlag & WELS_CPU_AVX2) {
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_avx2;
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02_avx2;
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17_avx2;
+    pMcFuncs->pMcLumaFunc       = McLuma_avx2;
+  }
+#endif
+#endif //(X86_ASM)
+
+#if defined(HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pMcFuncs->pMcLumaFunc       = McLuma_neon;
+    pMcFuncs->pMcChromaFunc     = McChroma_neon;
+    pMcFuncs->pfSampleAveraging = PixelAvg_neon;
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_neon;//iWidth+1:4/8/16
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02Height5Or9Or17_neon;//heigh+1:4/8/16
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17Height5Or9Or17_neon;//iWidth+1/heigh+1
+  }
+#endif
+#if defined(HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pMcFuncs->pMcLumaFunc       = McLuma_AArch64_neon;
+    pMcFuncs->pMcChromaFunc     = McChroma_AArch64_neon;
+    pMcFuncs->pfSampleAveraging = PixelAvg_AArch64_neon;
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_AArch64_neon;//iWidth+1:4/8/16
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02Height5Or9Or17_AArch64_neon;//heigh+1:4/8/16
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17Height5Or9Or17_AArch64_neon;//iWidth+1/heigh+1
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (uiCpuFlag & WELS_CPU_MMI) {
+    pMcFuncs->pfLumaHalfpelHor  = McHorVer20Width5Or9Or17_mmi;
+    pMcFuncs->pfLumaHalfpelVer  = McHorVer02Height5Or9Or17_mmi;
+    pMcFuncs->pfLumaHalfpelCen  = McHorVer22Width5Or9Or17Height5Or9Or17_mmi;
+    pMcFuncs->pfSampleAveraging = PixelAvg_mmi;
+    pMcFuncs->pMcChromaFunc     = McChroma_mmi;
+    pMcFuncs->pMcLumaFunc       = McLuma_mmi;
+  }
+#endif//HAVE_MMI
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/memory_align.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/memory_align.cpp
new file mode 100644
index 0000000000..90efb74ae9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/memory_align.cpp
@@ -0,0 +1,174 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "memory_align.h"
+#include "macros.h"
+
+namespace WelsCommon {
+
+#ifdef MEMORY_CHECK
+static FILE*    fpMemChkPoint;
+static uint32_t nCountRequestNum;
+static int32_t  g_iMemoryLength;
+#endif
+
+
+CMemoryAlign::CMemoryAlign (const uint32_t kuiCacheLineSize)
+#ifdef MEMORY_MONITOR
+  : m_nMemoryUsageInBytes (0)
+#endif//MEMORY_MONITOR
+{
+  if ((kuiCacheLineSize == 0) || (kuiCacheLineSize & 0x0f))
+    m_nCacheLineSize = 0x10;
+  else
+    m_nCacheLineSize = kuiCacheLineSize;
+}
+
+CMemoryAlign::~CMemoryAlign() {
+#ifdef MEMORY_MONITOR
+  assert (m_nMemoryUsageInBytes == 0);
+#endif//MEMORY_MONITOR
+}
+
+void* WelsMalloc (const uint32_t kuiSize, const char* kpTag, const uint32_t kiAlign) {
+  const int32_t kiSizeOfVoidPointer     = sizeof (void**);
+  const int32_t kiSizeOfInt             = sizeof (int32_t);
+  const int32_t kiAlignedBytes          = kiAlign - 1;
+  const int32_t kiTrialRequestedSize    = kuiSize + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt;
+  const int32_t kiActualRequestedSize   = kiTrialRequestedSize;
+  const uint32_t kiPayloadSize          = kuiSize;
+
+  uint8_t* pBuf = (uint8_t*) malloc (kiActualRequestedSize);
+  if (NULL == pBuf)
+    return NULL;
+
+#ifdef MEMORY_CHECK
+  if (fpMemChkPoint == NULL) {
+    fpMemChkPoint    = fopen ("./enc_mem_check_point.txt",  "at+");
+    nCountRequestNum = 0;
+  }
+
+  if (fpMemChkPoint != NULL) {
+    if (kpTag != NULL)
+      fprintf (fpMemChkPoint, "WelsMalloc(), 0x%x : actual uiSize:\t%d\tbytes, input uiSize: %d bytes, %d - %s\n",
+               (void*)pBuf, kiActualRequestedSize, kuiSize, nCountRequestNum++, kpTag);
+    else
+      fprintf (fpMemChkPoint, "WelsMalloc(), 0x%x : actual uiSize:\t%d\tbytes, input uiSize: %d bytes, %d \n", (void*)pBuf,
+               kiActualRequestedSize, kuiSize, nCountRequestNum++);
+    fflush (fpMemChkPoint);
+  }
+#endif
+  uint8_t* pAlignedBuffer;
+  pAlignedBuffer = pBuf + kiAlignedBytes + kiSizeOfVoidPointer + kiSizeOfInt;
+  pAlignedBuffer -= ((uintptr_t) pAlignedBuffer & kiAlignedBytes);
+  * ((void**) (pAlignedBuffer - kiSizeOfVoidPointer)) = pBuf;
+  * ((int32_t*) (pAlignedBuffer - (kiSizeOfVoidPointer + kiSizeOfInt))) = kiPayloadSize;
+
+  return pAlignedBuffer;
+}
+
+void WelsFree (void* pPointer, const char* kpTag) {
+  if (pPointer) {
+#ifdef MEMORY_CHECK
+    if (fpMemChkPoint != NULL) {
+      if (kpTag != NULL)
+        fprintf (fpMemChkPoint, "WelsFree(), 0x%x - %s: \t%d\t bytes \n", (void*) (* (((void**) pPointer) - 1)), kpTag,
+                 g_iMemoryLength);
+      else
+        fprintf (fpMemChkPoint, "WelsFree(), 0x%x \n", (void*) (* (((void**) pPointer) - 1)));
+      fflush (fpMemChkPoint);
+    }
+#endif
+    free (* (((void**) pPointer) - 1));
+  }
+}
+
+void* CMemoryAlign::WelsMallocz (const uint32_t kuiSize, const char* kpTag) {
+  void* pPointer = WelsMalloc (kuiSize, kpTag);
+  if (NULL == pPointer) {
+    return NULL;
+  }
+  // zero memory
+  memset (pPointer, 0, kuiSize);
+
+  return pPointer;
+}
+
+void* CMemoryAlign::WelsMalloc (const uint32_t kuiSize, const char* kpTag) {
+  void* pPointer = WelsCommon::WelsMalloc (kuiSize, kpTag, m_nCacheLineSize);
+#ifdef MEMORY_MONITOR
+  if (pPointer != NULL) {
+    const int32_t kiMemoryLength = * ((int32_t*) ((uint8_t*)pPointer - sizeof (void**) - sizeof (
+                                        int32_t))) + m_nCacheLineSize - 1 + sizeof (void**) + sizeof (int32_t);
+    m_nMemoryUsageInBytes += kiMemoryLength;
+#ifdef MEMORY_CHECK
+    g_iMemoryLength = kiMemoryLength;
+#endif
+  }
+#endif//MEMORY_MONITOR
+  return pPointer;
+}
+
+void CMemoryAlign::WelsFree (void* pPointer, const char* kpTag) {
+#ifdef MEMORY_MONITOR
+  if (pPointer) {
+    const int32_t kiMemoryLength = * ((int32_t*) ((uint8_t*)pPointer - sizeof (void**) - sizeof (
+                                        int32_t))) + m_nCacheLineSize - 1 + sizeof (void**) + sizeof (int32_t);
+    m_nMemoryUsageInBytes -= kiMemoryLength;
+#ifdef MEMORY_CHECK
+    g_iMemoryLength = kiMemoryLength;
+#endif
+  }
+#endif//MEMORY_MONITOR
+  WelsCommon::WelsFree (pPointer, kpTag);
+}
+
+void* WelsMallocz (const uint32_t kuiSize, const char* kpTag) {
+  void* pPointer = WelsMalloc (kuiSize, kpTag, 16);
+  if (NULL == pPointer) {
+    return NULL;
+  }
+  memset (pPointer, 0, kuiSize);
+  return pPointer;
+}
+
+const uint32_t CMemoryAlign::WelsGetCacheLineSize() const {
+  return m_nCacheLineSize;
+}
+
+const uint32_t CMemoryAlign::WelsGetMemoryUsage() const {
+  return m_nMemoryUsageInBytes;
+}
+
+} // end of namespace WelsCommon
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/sad_common.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/sad_common.cpp
new file mode 100644
index 0000000000..953834218a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/sad_common.cpp
@@ -0,0 +1,165 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    sample.c
+ *
+ * \brief   compute SAD and SATD
+ *
+ * \date    2009.06.02 Created
+ *
+ *************************************************************************************
+ */
+
+#include "sad_common.h"
+#include "macros.h"
+
+int32_t WelsSampleSad4x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  int32_t i = 0;
+  uint8_t* pSrc1 = pSample1;
+  uint8_t* pSrc2 = pSample2;
+  for (i = 0; i < 4; i++) {
+    iSadSum += WELS_ABS ((pSrc1[0] - pSrc2[0]));
+    iSadSum += WELS_ABS ((pSrc1[1] - pSrc2[1]));
+    iSadSum += WELS_ABS ((pSrc1[2] - pSrc2[2]));
+    iSadSum += WELS_ABS ((pSrc1[3] - pSrc2[3]));
+
+    pSrc1 += iStride1;
+    pSrc2 += iStride2;
+  }
+
+  return iSadSum;
+}
+
+int32_t WelsSampleSad8x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  iSadSum += WelsSampleSad4x4_c (pSample1,     iStride1, pSample2,     iStride2);
+  iSadSum += WelsSampleSad4x4_c (pSample1 + 4, iStride1, pSample2 + 4, iStride2);
+  return iSadSum;
+}
+
+int32_t WelsSampleSad4x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  iSadSum += WelsSampleSad4x4_c (pSample1,                   iStride1, pSample2,                   iStride2);
+  iSadSum += WelsSampleSad4x4_c (pSample1 + (iStride1 << 2), iStride1, pSample2 + (iStride2 << 2), iStride2);
+  return iSadSum;
+}
+
+int32_t WelsSampleSad8x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  int32_t i = 0;
+  uint8_t* pSrc1 = pSample1;
+  uint8_t* pSrc2 = pSample2;
+  for (i = 0; i < 8; i++) {
+    iSadSum += WELS_ABS ((pSrc1[0] - pSrc2[0]));
+    iSadSum += WELS_ABS ((pSrc1[1] - pSrc2[1]));
+    iSadSum += WELS_ABS ((pSrc1[2] - pSrc2[2]));
+    iSadSum += WELS_ABS ((pSrc1[3] - pSrc2[3]));
+    iSadSum += WELS_ABS ((pSrc1[4] - pSrc2[4]));
+    iSadSum += WELS_ABS ((pSrc1[5] - pSrc2[5]));
+    iSadSum += WELS_ABS ((pSrc1[6] - pSrc2[6]));
+    iSadSum += WELS_ABS ((pSrc1[7] - pSrc2[7]));
+
+    pSrc1 += iStride1;
+    pSrc2 += iStride2;
+  }
+
+  return iSadSum;
+}
+int32_t WelsSampleSad16x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+
+  iSadSum += WelsSampleSad8x8_c (pSample1,     iStride1, pSample2,     iStride2);
+  iSadSum += WelsSampleSad8x8_c (pSample1 + 8, iStride1, pSample2 + 8, iStride2);
+
+  return iSadSum;
+}
+int32_t WelsSampleSad8x16_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  iSadSum += WelsSampleSad8x8_c (pSample1,                   iStride1, pSample2,                   iStride2);
+  iSadSum += WelsSampleSad8x8_c (pSample1 + (iStride1 << 3), iStride1, pSample2 + (iStride2 << 3), iStride2);
+
+  return iSadSum;
+}
+int32_t WelsSampleSad16x16_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSadSum = 0;
+  iSadSum += WelsSampleSad8x8_c (pSample1,                     iStride1, pSample2,                     iStride2);
+  iSadSum += WelsSampleSad8x8_c (pSample1 + 8,                   iStride1, pSample2 + 8,                   iStride2);
+  iSadSum += WelsSampleSad8x8_c (pSample1 + (iStride1 << 3),   iStride1, pSample2 + (iStride2 << 3),   iStride2);
+  iSadSum += WelsSampleSad8x8_c (pSample1 + (iStride1 << 3) + 8, iStride1, pSample2 + (iStride2 << 3) + 8, iStride2);
+
+  return iSadSum;
+}
+
+void WelsSampleSadFour16x16_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2,
+                               int32_t* pSad) {
+  * (pSad)     = WelsSampleSad16x16_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad16x16_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad16x16_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad16x16_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
+void WelsSampleSadFour16x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad16x8_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad16x8_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad16x8_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad16x8_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
+void WelsSampleSadFour8x16_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad8x16_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad8x16_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad8x16_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad8x16_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+
+}
+void WelsSampleSadFour8x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad8x8_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad8x8_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad8x8_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad8x8_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
+void WelsSampleSadFour4x4_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad4x4_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad4x4_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad4x4_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad4x4_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
+void WelsSampleSadFour8x4_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad8x4_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad8x4_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad8x4_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad8x4_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
+void WelsSampleSadFour4x8_c (uint8_t* iSample1, int32_t iStride1, uint8_t* iSample2, int32_t iStride2, int32_t* pSad) {
+  * (pSad)     = WelsSampleSad4x8_c (iSample1, iStride1, (iSample2 - iStride2), iStride2);
+  * (pSad + 1) = WelsSampleSad4x8_c (iSample1, iStride1, (iSample2 + iStride2), iStride2);
+  * (pSad + 2) = WelsSampleSad4x8_c (iSample1, iStride1, (iSample2 - 1), iStride2);
+  * (pSad + 3) = WelsSampleSad4x8_c (iSample1, iStride1, (iSample2 + 1), iStride2);
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/utils.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/utils.cpp
new file mode 100644
index 0000000000..fc0fbf9047
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/utils.cpp
@@ -0,0 +1,126 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    utils.c
+ *
+ * \brief   common tool/function utilization
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "utils.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
+#include "codec_app_def.h"
+float WelsCalcPsnr (const void* kpTarPic,
+                    const int32_t kiTarStride,
+                    const void* kpRefPic,
+                    const int32_t kiRefStride,
+                    const int32_t kiWidth,
+                    const int32_t kiHeight);
+
+
+void WelsLog (SLogContext* logCtx, int32_t iLevel, const char* kpFmt, ...) {
+  va_list vl;
+  char pTraceTag[MAX_LOG_SIZE] = {0};
+  switch (iLevel) {
+  case WELS_LOG_ERROR:
+    WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Error:", logCtx->pCodecInstance);
+    break;
+  case WELS_LOG_WARNING:
+    WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Warning:", logCtx->pCodecInstance);
+    break;
+  case WELS_LOG_INFO:
+    WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Info:", logCtx->pCodecInstance);
+    break;
+  case WELS_LOG_DEBUG:
+    WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Debug:", logCtx->pCodecInstance);
+    break;
+  default:
+    WelsSnprintf (pTraceTag, MAX_LOG_SIZE, "[OpenH264] this = 0x%p, Detail:", logCtx->pCodecInstance);
+    break;
+  }
+  WelsStrcat (pTraceTag, MAX_LOG_SIZE, kpFmt);
+  va_start (vl, kpFmt);
+  logCtx->pfLog (logCtx->pLogCtx, iLevel, pTraceTag, vl);
+  va_end (vl);
+}
+
+#ifndef CALC_PSNR
+#define CONST_FACTOR_PSNR       (10.0 / log(10.0))      // for good computation
+#define CALC_PSNR(w, h, s)      ((float)(CONST_FACTOR_PSNR * log( 65025.0 * w * h / s )))
+#endif//CALC_PSNR
+
+/*
+ *  PSNR calculation routines
+ */
+/*!
+ *************************************************************************************
+ * \brief   PSNR calculation utilization in Wels
+ *
+ * \param   pTarPic     target picture to be calculated in Picture pData format
+ * \param   iTarStride  stride of target picture pData pBuffer
+ * \param   pRefPic     base referencing picture samples
+ * \param   iRefStride  stride of reference picture pData pBuffer
+ * \param   iWidth      picture iWidth in pixel
+ * \param   iHeight     picture iHeight in pixel
+ *
+ * \return  actual PSNR result;
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+float WelsCalcPsnr (const void* kpTarPic,
+                    const int32_t kiTarStride,
+                    const void* kpRefPic,
+                    const int32_t kiRefStride,
+                    const int32_t kiWidth,
+                    const int32_t kiHeight) {
+  int64_t iSqe = 0;
+  int32_t x, y;
+  uint8_t* pTar = (uint8_t*)kpTarPic;
+  uint8_t* pRef = (uint8_t*)kpRefPic;
+
+  if (NULL == pTar || NULL == pRef)
+    return (-1.0f);
+
+  for (y = 0; y < kiHeight; ++ y) { // OPTable !!
+    for (x = 0; x < kiWidth; ++ x) {
+      const int32_t kiT = pTar[y * kiTarStride + x] - pRef[y * kiRefStride + x];
+      iSqe += kiT * kiT;
+    }
+  }
+  if (0 == iSqe) {
+    return (99.99f);
+  }
+  return CALC_PSNR (kiWidth, kiHeight, iSqe);
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/src/welsCodecTrace.cpp b/third-party/openh264/third_party/openh264/src/codec/common/src/welsCodecTrace.cpp
new file mode 100644
index 0000000000..b19e0a53b8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/src/welsCodecTrace.cpp
@@ -0,0 +1,103 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef _WIN32
+#include <windows.h>
+#include <tchar.h>
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
+#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
+
+#include "welsCodecTrace.h"
+#include "utils.h"
+
+
+
+static void welsStderrTrace (void* ctx, int level, const char* string) {
+  fprintf (stderr, "%s\n", string);
+}
+
+welsCodecTrace::welsCodecTrace() {
+
+  m_iTraceLevel = WELS_LOG_DEFAULT;
+  m_fpTrace = welsStderrTrace;
+  m_pTraceCtx = NULL;
+
+  m_sLogCtx.pLogCtx = this;
+  m_sLogCtx.pfLog = StaticCodecTrace;
+  m_sLogCtx.pCodecInstance = NULL;
+}
+
+welsCodecTrace::~welsCodecTrace() {
+  m_fpTrace = NULL;
+}
+
+
+
+void welsCodecTrace::StaticCodecTrace (void* pCtx, const int32_t iLevel, const char* Str_Format, va_list vl) {
+  welsCodecTrace* self = (welsCodecTrace*) pCtx;
+  self->CodecTrace (iLevel, Str_Format, vl);
+}
+
+void welsCodecTrace::CodecTrace (const int32_t iLevel, const char* Str_Format, va_list vl) {
+  if (m_iTraceLevel < iLevel) {
+    return;
+  }
+
+  char pBuf[MAX_LOG_SIZE] = {0};
+  WelsVsnprintf (pBuf, MAX_LOG_SIZE, Str_Format, vl); // confirmed_safe_unsafe_usage
+  if (m_fpTrace) {
+    m_fpTrace (m_pTraceCtx, iLevel, pBuf);
+  }
+}
+
+void welsCodecTrace::SetCodecInstance (void* pCodecInstance) {
+  m_sLogCtx.pCodecInstance = pCodecInstance;
+}
+
+void welsCodecTrace::SetTraceLevel (const int32_t iLevel) {
+  if (iLevel >= 0)
+    m_iTraceLevel = iLevel;
+}
+
+void welsCodecTrace::SetTraceCallback (WelsTraceCallback func) {
+  m_fpTrace = func;
+}
+
+void welsCodecTrace::SetTraceCallbackContext (void* ctx) {
+  m_pTraceCtx = ctx;
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/targets.mk b/third-party/openh264/third_party/openh264/src/codec/common/targets.mk
new file mode 100644
index 0000000000..43de4ce4cf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/targets.mk
@@ -0,0 +1,113 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+COMMON_SRCDIR=codec/common
+COMMON_CPP_SRCS=\
+	$(COMMON_SRCDIR)/src/common_tables.cpp\
+	$(COMMON_SRCDIR)/src/copy_mb.cpp\
+	$(COMMON_SRCDIR)/src/cpu.cpp\
+	$(COMMON_SRCDIR)/src/crt_util_safe_x.cpp\
+	$(COMMON_SRCDIR)/src/deblocking_common.cpp\
+	$(COMMON_SRCDIR)/src/expand_pic.cpp\
+	$(COMMON_SRCDIR)/src/intra_pred_common.cpp\
+	$(COMMON_SRCDIR)/src/mc.cpp\
+	$(COMMON_SRCDIR)/src/memory_align.cpp\
+	$(COMMON_SRCDIR)/src/sad_common.cpp\
+	$(COMMON_SRCDIR)/src/utils.cpp\
+	$(COMMON_SRCDIR)/src/welsCodecTrace.cpp\
+	$(COMMON_SRCDIR)/src/WelsTaskThread.cpp\
+	$(COMMON_SRCDIR)/src/WelsThread.cpp\
+	$(COMMON_SRCDIR)/src/WelsThreadLib.cpp\
+	$(COMMON_SRCDIR)/src/WelsThreadPool.cpp\
+
+COMMON_OBJS += $(COMMON_CPP_SRCS:.cpp=.$(OBJ))
+
+COMMON_ASM_SRCS=\
+	$(COMMON_SRCDIR)/x86/cpuid.asm\
+	$(COMMON_SRCDIR)/x86/dct.asm\
+	$(COMMON_SRCDIR)/x86/deblock.asm\
+	$(COMMON_SRCDIR)/x86/expand_picture.asm\
+	$(COMMON_SRCDIR)/x86/intra_pred_com.asm\
+	$(COMMON_SRCDIR)/x86/mb_copy.asm\
+	$(COMMON_SRCDIR)/x86/mc_chroma.asm\
+	$(COMMON_SRCDIR)/x86/mc_luma.asm\
+	$(COMMON_SRCDIR)/x86/satd_sad.asm\
+	$(COMMON_SRCDIR)/x86/vaa.asm\
+
+COMMON_OBJSASM += $(COMMON_ASM_SRCS:.asm=.$(OBJ))
+ifeq ($(ASM_ARCH), x86)
+COMMON_OBJS += $(COMMON_OBJSASM)
+endif
+OBJS += $(COMMON_OBJSASM)
+
+COMMON_ASM_ARM_SRCS=\
+	$(COMMON_SRCDIR)/arm/copy_mb_neon.S\
+	$(COMMON_SRCDIR)/arm/deblocking_neon.S\
+	$(COMMON_SRCDIR)/arm/expand_picture_neon.S\
+	$(COMMON_SRCDIR)/arm/intra_pred_common_neon.S\
+	$(COMMON_SRCDIR)/arm/mc_neon.S\
+
+COMMON_OBJSARM += $(COMMON_ASM_ARM_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm)
+COMMON_OBJS += $(COMMON_OBJSARM)
+endif
+OBJS += $(COMMON_OBJSARM)
+
+COMMON_ASM_ARM64_SRCS=\
+	$(COMMON_SRCDIR)/arm64/copy_mb_aarch64_neon.S\
+	$(COMMON_SRCDIR)/arm64/deblocking_aarch64_neon.S\
+	$(COMMON_SRCDIR)/arm64/expand_picture_aarch64_neon.S\
+	$(COMMON_SRCDIR)/arm64/intra_pred_common_aarch64_neon.S\
+	$(COMMON_SRCDIR)/arm64/mc_aarch64_neon.S\
+
+COMMON_OBJSARM64 += $(COMMON_ASM_ARM64_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm64)
+COMMON_OBJS += $(COMMON_OBJSARM64)
+endif
+OBJS += $(COMMON_OBJSARM64)
+
+COMMON_ASM_MIPS_MMI_SRCS=\
+	$(COMMON_SRCDIR)/mips/copy_mb_mmi.c\
+	$(COMMON_SRCDIR)/mips/deblock_mmi.c\
+	$(COMMON_SRCDIR)/mips/expand_picture_mmi.c\
+	$(COMMON_SRCDIR)/mips/intra_pred_com_mmi.c\
+	$(COMMON_SRCDIR)/mips/satd_sad_mmi.c\
+
+COMMON_OBJSMIPS_MMI += $(COMMON_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))
+
+COMMON_ASM_MIPS_MSA_SRCS=\
+	$(COMMON_SRCDIR)/mips/copy_mb_msa.c\
+	$(COMMON_SRCDIR)/mips/deblock_msa.c\
+
+COMMON_OBJSMIPS_MSA += $(COMMON_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))
+ifeq ($(ASM_ARCH), mips)
+ifeq ($(ENABLE_MMI), Yes)
+COMMON_OBJS += $(COMMON_OBJSMIPS_MMI)
+endif
+ifeq ($(ENABLE_MSA), Yes)
+COMMON_OBJS += $(COMMON_OBJSMIPS_MSA)
+endif
+endif
+OBJS += $(COMMON_OBJSMIPS_MMI)
+OBJS += $(COMMON_OBJSMIPS_MSA)
+
+OBJS += $(COMMON_OBJS)
+
+$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<
+
+$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.c
+	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c $(CXX_O) $<
+
+$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.asm
+	$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(COMMON_ASMFLAGS) $(COMMON_ASM_INCLUDES) -o $@ $<
+
+$(COMMON_SRCDIR)/%.$(OBJ): $(COMMON_SRCDIR)/%.S
+	$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(COMMON_CFLAGS) $(COMMON_INCLUDES) -c -o $@ $<
+
+$(LIBPREFIX)common.$(LIBSUFFIX): $(COMMON_OBJS)
+	$(QUIET)rm -f $@
+	$(QUIET_AR)$(AR) $(AR_OPTS) $+
+
+libraries: $(LIBPREFIX)common.$(LIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)common.$(LIBSUFFIX)
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/asm_inc.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/asm_inc.asm
new file mode 100644
index 0000000000..56366fb629
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/asm_inc.asm
@@ -0,0 +1,743 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  sse2inc.asm
+;*
+;*  Abstract
+;*      macro and constant
+;*
+;*  History
+;*      8/5/2009 Created
+;*
+;*
+;*************************************************************************/
+;***********************************************************************
+; Options, for DEBUG
+;***********************************************************************
+
+%if 1
+    %define MOVDQ movdqa
+%else
+    %define MOVDQ movdqu
+%endif
+
+%if 1
+    %define WELSEMMS emms
+%else
+    %define WELSEMMS
+%endif
+
+
+;***********************************************************************
+; Macros
+;***********************************************************************
+
+%ifdef WIN64 ; Windows x64 ;************************************
+
+DEFAULT REL
+
+BITS 64
+
+%define arg1 rcx
+%define arg2 rdx
+%define arg3 r8
+%define arg4 r9
+%define arg5 [rsp + push_num*8 + 40]
+%define arg6 [rsp + push_num*8 + 48]
+%define arg7 [rsp + push_num*8 + 56]
+%define arg8 [rsp + push_num*8 + 64]
+%define arg9 [rsp + push_num*8 + 72]
+%define arg10 [rsp + push_num*8 + 80]
+%define arg11 [rsp + push_num*8 + 88]
+%define arg12 [rsp + push_num*8 + 96]
+
+%define arg1d ecx
+%define arg2d edx
+%define arg3d r8d
+%define arg4d r9d
+%define arg5d arg5
+%define arg6d arg6
+%define arg7d arg7
+%define arg8d arg8
+%define arg9d arg9
+%define arg10d arg10
+%define arg11d arg11
+%define arg12d arg12
+
+%define r0 rcx
+%define r1 rdx
+%define r2 r8
+%define r3 r9
+%define r4 rax
+%define r5 r10
+%define r6 r11
+%define r7 rsp
+
+%define r0d ecx
+%define r1d edx
+%define r2d r8d
+%define r3d r9d
+%define r4d eax
+%define r5d r10d
+%define r6d r11d
+
+%define r0w  cx
+%define r1w  dx
+%define r2w  r8w
+%define r3w  r9w
+%define r4w  ax
+%define r6w  r11w
+
+%define r0b  cl
+%define r1b  dl
+%define r2b  r8l
+%define r3b  r9l
+
+%define  PUSHRFLAGS     pushfq
+%define  POPRFLAGS      popfq
+%define  retrq          rax
+%define  retrd          eax
+
+%elifdef UNIX64 ; Unix x64 ;************************************
+
+DEFAULT REL
+
+BITS 64
+
+%ifidn __OUTPUT_FORMAT__,elf64
+SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable
+%endif
+
+%define arg1 rdi
+%define arg2 rsi
+%define arg3 rdx
+%define arg4 rcx
+%define arg5 r8
+%define arg6 r9
+%define arg7 [rsp + push_num*8 + 8]
+%define arg8 [rsp + push_num*8 + 16]
+%define arg9 [rsp + push_num*8 + 24]
+%define arg10 [rsp + push_num*8 + 32]
+%define arg11 [rsp + push_num*8 + 40]
+%define arg12 [rsp + push_num*8 + 48]
+
+%define arg1d edi
+%define arg2d esi
+%define arg3d edx
+%define arg4d ecx
+%define arg5d r8d
+%define arg6d r9d
+%define arg7d arg7
+%define arg8d arg8
+%define arg9d arg9
+%define arg10d arg10
+%define arg11d arg11
+%define arg12d arg12
+
+%define r0 rdi
+%define r1 rsi
+%define r2 rdx
+%define r3 rcx
+%define r4 r8
+%define r5 r9
+%define r6 r10
+%define r7 rsp
+
+%define r0d edi
+%define r1d esi
+%define r2d edx
+%define r3d ecx
+%define r4d r8d
+%define r5d r9d
+%define r6d r10d
+
+%define r0w  di
+%define r1w  si
+%define r2w  dx
+%define r3w  cx
+%define r4w  r8w
+%define r6w  r10w
+
+%define r0b  dil
+%define r1b  sil
+%define r2b  dl
+%define r3b  cl
+
+%define  PUSHRFLAGS     pushfq
+%define  POPRFLAGS      popfq
+%define  retrq          rax
+%define  retrd          eax
+
+%elifdef X86_32 ; X86_32 ;************************************
+
+BITS 32
+
+%ifidn __OUTPUT_FORMAT__,elf
+SECTION .note.GNU-stack noalloc noexec nowrite progbits ; Mark the stack as non-executable
+%endif
+
+%define arg1 [esp + push_num*4 + 4]
+%define arg2 [esp + push_num*4 + 8]
+%define arg3 [esp + push_num*4 + 12]
+%define arg4 [esp + push_num*4 + 16]
+%define arg5 [esp + push_num*4 + 20]
+%define arg6 [esp + push_num*4 + 24]
+%define arg7 [esp + push_num*4 + 28]
+%define arg8 [esp + push_num*4 + 32]
+%define arg9 [esp + push_num*4 + 36]
+%define arg10 [esp + push_num*4 + 40]
+%define arg11 [esp + push_num*4 + 44]
+%define arg12 [esp + push_num*4 + 48]
+
+%define arg1d arg1
+%define arg2d arg2
+%define arg3d arg3
+%define arg4d arg4
+%define arg5d arg5
+%define arg6d arg6
+%define arg7d arg7
+%define arg8d arg8
+%define arg9d arg9
+%define arg10d arg10
+%define arg11d arg11
+%define arg12d arg12
+
+%define r0 eax
+%define r1 ecx
+%define r2 edx
+%define r3 ebx
+%define r4 esi
+%define r5 edi
+%define r6 ebp
+%define r7 esp
+
+%define r0d eax
+%define r1d ecx
+%define r2d edx
+%define r3d ebx
+%define r4d esi
+%define r5d edi
+%define r6d ebp
+
+%define r0w ax
+%define r1w cx
+%define r2w dx
+%define r3w bx
+%define r4w si
+%define r6w bp
+
+%define r0b al
+%define r1b cl
+%define r2b dl
+%define r3b bl
+
+%define  PUSHRFLAGS     pushfd
+%define  POPRFLAGS      popfd
+%define  retrq          eax      ; 32 bit mode do not support 64 bits regesters
+%define  retrd          eax
+
+%endif
+
+%macro LOAD_PARA 2
+    mov %1, %2
+%endmacro
+
+%macro LOAD_1_PARA 0
+    %ifdef X86_32
+        mov r0, [esp + push_num*4 + 4]
+    %endif
+%endmacro
+
+%macro LOAD_2_PARA 0
+    %ifdef X86_32
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+    %endif
+%endmacro
+
+%macro LOAD_3_PARA 0
+    %ifdef X86_32
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+        mov r2, [esp + push_num*4 + 12]
+    %endif
+%endmacro
+
+%macro LOAD_4_PARA 0
+    %ifdef X86_32
+        push r3
+        %assign  push_num push_num+1
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+        mov r2, [esp + push_num*4 + 12]
+        mov r3, [esp + push_num*4 + 16]
+    %endif
+%endmacro
+
+%macro LOAD_5_PARA 0
+    %ifdef X86_32
+        push r3
+        push r4
+        %assign  push_num push_num+2
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+        mov r2, [esp + push_num*4 + 12]
+        mov r3, [esp + push_num*4 + 16]
+        mov r4, [esp + push_num*4 + 20]
+    %elifdef WIN64
+        mov r4, [rsp + push_num*8 + 40]
+    %endif
+%endmacro
+
+%macro LOAD_6_PARA 0
+    %ifdef X86_32
+        push r3
+        push r4
+        push r5
+        %assign  push_num push_num+3
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+        mov r2, [esp + push_num*4 + 12]
+        mov r3, [esp + push_num*4 + 16]
+        mov r4, [esp + push_num*4 + 20]
+        mov r5, [esp + push_num*4 + 24]
+    %elifdef WIN64
+        mov r4, [rsp + push_num*8 + 40]
+        mov r5, [rsp + push_num*8 + 48]
+    %endif
+%endmacro
+
+%macro LOAD_7_PARA 0
+    %ifdef X86_32
+        push r3
+        push r4
+        push r5
+        push r6
+        %assign  push_num push_num+4
+        mov r0, [esp + push_num*4 + 4]
+        mov r1, [esp + push_num*4 + 8]
+        mov r2, [esp + push_num*4 + 12]
+        mov r3, [esp + push_num*4 + 16]
+        mov r4, [esp + push_num*4 + 20]
+        mov r5, [esp + push_num*4 + 24]
+        mov r6, [esp + push_num*4 + 28]
+    %elifdef WIN64
+        mov r4, [rsp + push_num*8 + 40]
+        mov r5, [rsp + push_num*8 + 48]
+        mov r6, [rsp + push_num*8 + 56]
+    %elifdef UNIX64
+        mov r6, [rsp + push_num*8 + 8]
+    %endif
+%endmacro
+
+
+
+%macro LOAD_4_PARA_POP 0
+    %ifdef X86_32
+        pop r3
+    %endif
+%endmacro
+
+%macro LOAD_5_PARA_POP 0
+    %ifdef X86_32
+        pop r4
+        pop r3
+    %endif
+%endmacro
+
+%macro LOAD_6_PARA_POP 0
+    %ifdef X86_32
+        pop r5
+        pop r4
+        pop r3
+    %endif
+%endmacro
+
+%macro LOAD_7_PARA_POP 0
+    %ifdef X86_32
+        pop r6
+        pop r5
+        pop r4
+        pop r3
+    %endif
+%endmacro
+
+%macro PUSH_XMM 1
+    %ifdef WIN64
+        %assign xmm_num_regs %1
+        %if xmm_num_regs > 6
+            %ifdef push_num
+                %assign push_num push_num+2*(%1-6)
+            %endif
+            sub rsp, 16*(%1 - 6)
+            movdqu [rsp], xmm6
+        %endif
+        %if xmm_num_regs > 7
+            movdqu [rsp+16], xmm7
+        %endif
+        %if xmm_num_regs > 8
+            movdqu [rsp+32], xmm8
+        %endif
+        %if xmm_num_regs > 9
+            movdqu [rsp+48], xmm9
+        %endif
+        %if xmm_num_regs > 10
+            movdqu [rsp+64], xmm10
+        %endif
+        %if xmm_num_regs > 11
+            movdqu [rsp+80], xmm11
+        %endif
+        %if xmm_num_regs > 12
+            movdqu [rsp+96], xmm12
+        %endif
+        %if xmm_num_regs > 13
+            movdqu [rsp+112], xmm13
+        %endif
+        %if xmm_num_regs > 14
+            movdqu [rsp+128], xmm14
+        %endif
+        %if xmm_num_regs > 15
+            movdqu [rsp+144], xmm15
+        %endif
+    %endif
+%endmacro
+
+%macro POP_XMM 0
+    %ifdef WIN64
+        %if xmm_num_regs > 15
+            movdqu xmm15, [rsp+144]
+        %endif
+        %if xmm_num_regs > 14
+            movdqu xmm14, [rsp+128]
+        %endif
+        %if xmm_num_regs > 13
+            movdqu xmm13, [rsp+112]
+        %endif
+        %if xmm_num_regs > 12
+            movdqu xmm12, [rsp+96]
+        %endif
+        %if xmm_num_regs > 11
+            movdqu xmm11, [rsp+80]
+        %endif
+        %if xmm_num_regs > 10
+            movdqu xmm10, [rsp+64]
+        %endif
+        %if xmm_num_regs > 9
+            movdqu xmm9, [rsp+48]
+        %endif
+        %if xmm_num_regs > 8
+            movdqu xmm8, [rsp+32]
+        %endif
+        %if xmm_num_regs > 7
+            movdqu xmm7, [rsp+16]
+        %endif
+        %if xmm_num_regs > 6
+            movdqu xmm6, [rsp]
+            add rsp, 16*(xmm_num_regs - 6)
+        %endif
+    %endif
+%endmacro
+
+%macro SIGN_EXTENSION 2
+    %ifndef X86_32
+        movsxd %1, %2
+    %endif
+%endmacro
+
+%macro SIGN_EXTENSIONW 2
+    %ifndef X86_32
+        movsx %1, %2
+    %endif
+%endmacro
+
+%macro ZERO_EXTENSION 1
+    %ifndef X86_32
+        mov dword %1, %1
+    %endif
+%endmacro
+
+%macro WELS_EXTERN 1
+    ALIGN 16, nop
+    %ifdef PREFIX
+        %ifdef WELS_PRIVATE_EXTERN
+            global _%1: WELS_PRIVATE_EXTERN
+        %else
+            global _%1
+        %endif
+        %define %1 _%1
+    %else
+        %ifdef WELS_PRIVATE_EXTERN
+            global %1: WELS_PRIVATE_EXTERN
+        %else
+            global %1
+        %endif
+    %endif
+    %1:
+%endmacro
+
+%macro WELS_AbsW 2
+    pxor        %2, %2
+    psubw       %2, %1
+    pmaxsw      %1, %2
+%endmacro
+
+%macro MMX_XSwap  4
+    movq        %4, %2
+    punpckh%1   %4, %3
+    punpckl%1   %2, %3
+%endmacro
+
+; pOut mm1, mm4, mm5, mm3
+%macro MMX_Trans4x4W 5
+    MMX_XSwap wd, %1, %2, %5
+    MMX_XSwap wd, %3, %4, %2
+    MMX_XSwap dq, %1, %3, %4
+    MMX_XSwap dq, %5, %2, %3
+%endmacro
+
+;for TRANSPOSE
+%macro SSE2_XSawp 4
+    movdqa      %4, %2
+    punpckl%1   %2, %3
+    punpckh%1   %4, %3
+%endmacro
+
+; in: xmm1, xmm2, xmm3, xmm4  pOut:  xmm1, xmm4, xmm5, mm3
+%macro SSE2_Trans4x4D 5
+    SSE2_XSawp dq,  %1, %2, %5
+    SSE2_XSawp dq,  %3, %4, %2
+    SSE2_XSawp qdq, %1, %3, %4
+    SSE2_XSawp qdq, %5, %2, %3
+%endmacro
+
+;in: xmm0, xmm1, xmm2, xmm3  pOut:  xmm0, xmm1, xmm3, xmm4
+%macro SSE2_TransTwo4x4W 5
+    SSE2_XSawp wd,  %1, %2, %5
+    SSE2_XSawp wd,  %3, %4, %2
+    SSE2_XSawp dq,  %1, %3, %4
+    SSE2_XSawp dq,  %5, %2, %3
+    SSE2_XSawp qdq, %1, %5, %2
+    SSE2_XSawp qdq, %4, %3, %5
+%endmacro
+
+;in:  m1, m2, m3, m4, m5, m6, m7, m8
+;pOut: m5, m3, m4, m8, m6, m2, m7, m1
+%macro SSE2_TransTwo8x8B 9
+    movdqa  %9,     %8
+    SSE2_XSawp bw,  %1, %2, %8
+    SSE2_XSawp bw,  %3, %4, %2
+    SSE2_XSawp bw,  %5, %6, %4
+    movdqa  %6, %9
+    movdqa  %9, %4
+    SSE2_XSawp bw,  %7, %6, %4
+
+    SSE2_XSawp wd,  %1, %3, %6
+    SSE2_XSawp wd,  %8, %2, %3
+    SSE2_XSawp wd,  %5, %7, %2
+    movdqa  %7, %9
+    movdqa  %9, %3
+    SSE2_XSawp wd,  %7, %4, %3
+
+    SSE2_XSawp dq,  %1, %5, %4
+    SSE2_XSawp dq,  %6, %2, %5
+    SSE2_XSawp dq,  %8, %7, %2
+    movdqa  %7, %9
+    movdqa  %9, %5
+    SSE2_XSawp dq,  %7, %3, %5
+
+    SSE2_XSawp qdq,  %1, %8, %3
+    SSE2_XSawp qdq,  %4, %2, %8
+    SSE2_XSawp qdq,  %6, %7, %2
+    movdqa  %7, %9
+    movdqa  %9, %1
+    SSE2_XSawp qdq,  %7, %5, %1
+    movdqa  %5, %9
+%endmacro
+
+;xmm0, xmm6, xmm7, [eax], [ecx]
+;xmm7 = 0, eax = pix1, ecx = pix2, xmm0 save the result
+%macro SSE2_LoadDiff8P 5
+    movq         %1, %4
+    punpcklbw    %1, %3
+    movq         %2, %5
+    punpcklbw    %2, %3
+    psubw        %1, %2
+%endmacro
+
+; m2 = m1 + m2, m1 = m1 - m2
+%macro SSE2_SumSub 3
+    movdqa  %3, %2
+    paddw   %2, %1
+    psubw   %1, %3
+%endmacro
+
+
+%macro butterfly_1to16_sse      3       ; xmm? for dst, xmm? for tmp, one byte for pSrc [generic register name: a/b/c/d]
+    mov %3h, %3l
+    movd %1, e%3x           ; i.e, 1% = eax (=b0)
+    pshuflw %2, %1, 00h     ; ..., b0 b0 b0 b0 b0 b0 b0 b0
+    pshufd %1, %2, 00h      ; b0 b0 b0 b0, b0 b0 b0 b0, b0 b0 b0 b0, b0 b0 b0 b0
+%endmacro
+
+;copy a dw into a xmm for 8 times
+%macro SSE2_Copy8Times 2
+    movd    %1, %2
+    punpcklwd %1, %1
+    pshufd  %1,     %1,     0
+%endmacro
+
+;copy a db into a xmm for 16 times
+%macro SSE2_Copy16Times 2
+    movd            %1, %2
+    pshuflw         %1, %1, 0
+    punpcklqdq      %1, %1
+    packuswb        %1,     %1
+%endmacro
+
+
+
+;***********************************************************************
+;preprocessor constants
+;***********************************************************************
+;dw 32,32,32,32,32,32,32,32 for xmm
+;dw 32,32,32,32 for mm
+%macro WELS_DW32 1
+    pcmpeqw %1,%1
+    psrlw %1,15
+    psllw %1,5
+%endmacro
+
+;dw 1, 1, 1, 1, 1, 1, 1, 1 for xmm
+;dw 1, 1, 1, 1 for mm
+%macro WELS_DW1 1
+    pcmpeqw %1,%1
+    psrlw %1,15
+%endmacro
+
+;all 0 for xmm and mm
+%macro WELS_Zero 1
+    pxor %1, %1
+%endmacro
+
+;dd 1, 1, 1, 1 for xmm
+;dd 1, 1 for mm
+%macro WELS_DD1 1
+    pcmpeqw %1,%1
+    psrld %1,31
+%endmacro
+
+;dB 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+%macro WELS_DB1 1
+    pcmpeqw %1,%1
+    psrlw %1,15
+    packuswb %1,%1
+%endmacro
+
+%macro WELS_DW1_VEX 1
+    vpcmpeqw %1, %1, %1
+    vpsrlw   %1, %1, 15
+%endmacro
+
+%macro WELS_DW32_VEX 1
+    vpcmpeqw %1, %1, %1
+    vpsrlw   %1, %1, 15
+    vpsllw   %1, %1,  5
+%endmacro
+
+%macro WELS_DW32767_VEX 1
+    vpcmpeqw %1, %1, %1
+    vpsrlw   %1, %1,  1
+%endmacro
+
+
+;***********************************************************************
+; Utility macros for X86_32 PIC support
+;***********************************************************************
+
+; Used internally by other macros.
+%macro INIT_X86_32_PIC_ 2
+%ifdef X86_32_PICASM
+    %xdefine pic_ptr %1
+    %xdefine pic_ptr_preserve %2
+  %if pic_ptr_preserve
+    %assign push_num push_num+1
+    push            pic_ptr
+  %endif
+    call            %%get_pc
+%%pic_refpoint:
+    jmp             %%pic_init_done
+%%get_pc:
+    mov             pic_ptr, [esp]
+    ret
+%%pic_init_done:
+    %define pic(data_addr) (pic_ptr+(data_addr)-%%pic_refpoint)
+%else
+    %define pic(data_addr) (data_addr)
+%endif
+%endmacro
+
+; Get program counter and define a helper macro "pic(addr)" to convert absolute
+; addresses to program counter-relative addresses if X86_32_PICASM is defined.
+; Otherwise define "pic(addr)" as an identity function.
+; %1=register to store PC/EIP in.
+%macro INIT_X86_32_PIC 1
+    INIT_X86_32_PIC_ %1, 1
+%endmacro
+
+; Equivalent as above, but without preserving the value of the register argument.
+%macro INIT_X86_32_PIC_NOPRESERVE 1
+    INIT_X86_32_PIC_ %1, 0
+%endmacro
+
+; Clean up after INIT_X86_32_PIC.
+; Restore the register used to hold PC/EIP if applicable, and undefine defines.
+%macro DEINIT_X86_32_PIC 0
+%ifdef X86_32_PICASM
+  %if pic_ptr_preserve
+    pop             pic_ptr
+    %assign push_num push_num-1
+  %endif
+    %undef pic_ptr
+    %undef pic_ptr_preserve
+%endif
+    %undef pic
+%endmacro
+
+; Equivalent as above, but without undefining. Useful for functions with
+; multiple epilogues.
+%macro DEINIT_X86_32_PIC_KEEPDEF 0
+%ifdef X86_32_PICASM
+  %if pic_ptr_preserve
+    pop             pic_ptr
+    %assign push_num push_num-1
+  %endif
+%endif
+%endmacro
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/cpuid.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/cpuid.asm
new file mode 100644
index 0000000000..5b0c777588
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/cpuid.asm
@@ -0,0 +1,212 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  cpu_mmx.asm
+;*
+;*  Abstract
+;*      verify cpuid feature support and cpuid detection
+;*
+;*  History
+;*      04/29/2009  Created
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+;******************************************************************************************
+; Macros
+;******************************************************************************************
+
+
+;******************************************************************************************
+; Code
+;******************************************************************************************
+
+SECTION .text
+
+; refer to "The IA-32 Intel(R) Architecture Software Developers Manual, Volume 2A A-M"
+; section CPUID - CPU Identification
+
+;******************************************************************************************
+;   int32_t WelsCPUIdVerify()
+;******************************************************************************************
+WELS_EXTERN WelsCPUIdVerify
+    push    r1
+    PUSHRFLAGS
+    PUSHRFLAGS
+
+    pop      r1
+    mov      eax, r1d
+    xor      eax, 00200000h
+    xor      eax, r1d
+    POPRFLAGS
+    pop      r1
+    ret
+
+;****************************************************************************************************
+;   void WelsCPUId( int32_t uiIndex, int32_t *pFeatureA, int32_t *pFeatureB, int32_t *pFeatureC, int32_t *pFeatureD )
+;****************************************************************************************************
+%ifdef       WIN64
+
+WELS_EXTERN WelsCPUId
+    push     rbx
+    push     rdx
+
+    mov      eax,     ecx
+    mov      ecx,     [r9]
+    cpuid
+    mov      [r9],    ecx
+    mov      [r8],    ebx
+    mov      rcx,    [rsp + 2*8 + 40]
+    mov      [rcx],   edx
+    pop      rdx
+    mov      [rdx],   eax
+
+    pop      rbx
+    ret
+
+%elifdef     UNIX64
+WELS_EXTERN WelsCPUId
+    push     rbx
+    push     rcx
+    push     rdx
+
+    mov      eax,     edi
+    mov      ecx,     [rcx]
+    cpuid
+    mov      [r8],    edx
+    pop      rdx
+    pop      r8
+    mov      [r8],   ecx
+    mov      [rdx],   ebx
+    mov      [rsi],   eax
+
+    pop      rbx
+    ret
+
+%elifdef     X86_32
+
+WELS_EXTERN WelsCPUId
+    push    ebx
+    push    edi
+
+    mov     eax, [esp+12]   ; operating index
+    mov     edi, [esp+24]
+    mov     ecx, [edi]
+    cpuid                   ; cpuid
+
+    ; processing various information return
+    mov     edi, [esp+16]
+    mov     [edi], eax
+    mov     edi, [esp+20]
+    mov     [edi], ebx
+    mov     edi, [esp+24]
+    mov     [edi], ecx
+    mov     edi, [esp+28]
+    mov     [edi], edx
+
+    pop     edi
+    pop     ebx
+    ret
+
+%endif
+
+; need call after cpuid=1 and eax, ecx flag got then
+;****************************************************************************************************
+;   int32_t WelsCPUSupportAVX( uint32_t eax, uint32_t ecx )
+;****************************************************************************************************
+WELS_EXTERN WelsCPUSupportAVX
+%ifdef     WIN64
+    mov   eax,    ecx
+    mov   ecx,    edx
+%elifdef   UNIX64
+    mov eax, edi
+    mov ecx, esi
+%else
+    mov eax, [esp+4]
+    mov ecx, [esp+8]
+%endif
+
+    ; refer to detection of AVX addressed in INTEL AVX manual document
+    and ecx, 018000000H
+    cmp ecx, 018000000H             ; check both OSXSAVE and AVX feature flags
+    jne avx_not_supported
+    ; processor supports AVX instructions and XGETBV is enabled by OS
+    mov ecx, 0                              ; specify 0 for XFEATURE_ENABLED_MASK register
+    XGETBV                                  ; result in EDX:EAX
+    and eax, 06H
+    cmp eax, 06H                    ; check OS has enabled both XMM and YMM state support
+    jne avx_not_supported
+    mov eax, 1
+    ret
+avx_not_supported:
+    mov eax, 0
+    ret
+
+
+; need call after cpuid=1 and eax, ecx flag got then
+;****************************************************************************************************
+;   int32_t WelsCPUSupportFMA( uint32_t eax, uint32_t ecx )
+;****************************************************************************************************
+WELS_EXTERN WelsCPUSupportFMA
+%ifdef     WIN64
+    mov   eax,   ecx
+    mov   ecx,   edx
+%elifdef   UNIX64
+    mov   eax,   edi
+    mov   ecx,   esi
+%else
+    mov eax, [esp+4]
+    mov ecx, [esp+8]
+%endif
+    ; refer to detection of FMA addressed in INTEL AVX manual document
+    and ecx, 018001000H
+    cmp ecx, 018001000H     ; check OSXSAVE, AVX, FMA feature flags
+    jne fma_not_supported
+    ; processor supports AVX,FMA instructions and XGETBV is enabled by OS
+    mov ecx, 0              ; specify 0 for XFEATURE_ENABLED_MASK register
+    XGETBV                  ; result in EDX:EAX
+    and eax, 06H
+    cmp eax, 06H            ; check OS has enabled both XMM and YMM state support
+    jne fma_not_supported
+    mov eax, 1
+    ret
+fma_not_supported:
+    mov eax, 0
+    ret
+
+;******************************************************************************************
+;   void WelsEmms()
+;******************************************************************************************
+WELS_EXTERN WelsEmms
+    emms    ; empty mmx technology states
+    ret
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/dct.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/dct.asm
new file mode 100644
index 0000000000..3b203a587d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/dct.asm
@@ -0,0 +1,1036 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        ?Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        ?Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  dct.asm
+;*
+;*  History
+;*      8/4/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+%macro LOAD_3_PARA_TO_5_PARA_IDCT 0
+%ifdef X86_32
+    push r3
+    push r4
+    %assign push_num push_num+2
+    mov r0, [esp + push_num*4 + 4]
+    mov r1, [esp + push_num*4 + 8]
+    mov r4, [esp + push_num*4 + 12]
+%else
+    mov r4, r2
+%endif
+    mov r2, r0
+    mov r3, r1
+%endmacro
+
+%ifdef PREFIX
+    %define prefixed(a) _ %+ a
+%else
+    %define prefixed(a) a
+%endif
+
+%ifdef X86_32_PICASM
+SECTION .text align=32
+%else
+SECTION .rodata align=32
+%endif
+
+;***********************************************************************
+; Constant
+;***********************************************************************
+
+align 32
+wels_shufb0312_movzxw_128:
+    db 0, 80h, 3, 80h, 1, 80h, 2, 80h, 4, 80h, 7, 80h, 5, 80h, 6, 80h
+wels_shufb2301_128:
+    db 2, 3, 0, 1, 6, 7, 4, 5, 10, 11, 8, 9, 14, 15, 12, 13
+wels_shufb0231_128:
+    db 0, 2, 3, 1, 4, 6, 7, 5, 8, 10, 11, 9, 12, 14, 15, 13
+wels_dw32_128:
+    times 8 dw 32
+wels_p1m1p1m1w_256:
+    times 8 dw 1, -1
+wels_p1p2m1m2w_256:
+    times 4 dw 1, 2, -1, -2
+wels_p1p1m1m1w_256:
+    times 4 dw 1, 1, -1, -1
+wels_8xp1w_8xm1w:
+    times 8 dw  1
+    times 8 dw -1
+wels_4xp1w_4xm1w_256:
+    times 4 dw  1
+    times 4 dw -1
+    times 4 dw  1
+    times 4 dw -1
+wels_4xp1w_4xp2w_4xm1w_4xm2w:
+    times 4 dw  1
+    times 4 dw  2
+    times 4 dw -1
+    times 4 dw -2
+
+align 16
+wels_p1m1p1m1w_128:
+    times 4 dw 1, -1
+wels_p1p2p1p2w_128:
+    times 4 dw 1, 2
+wels_p1m1m1p1w_128:
+    times 2 dw 1, -1, -1, 1
+wels_p0m8000p0m8000w_128:
+    times 4 dw 0, -8000h
+wels_p1p1m1m1w_128:
+    times 2 dw 1, 1, -1, -1
+wels_4xp1w_4xp2w:
+    times 4 dw 1
+    times 4 dw 2
+wels_4xp0w_4xm8000w:
+    times 4 dw 0
+    times 4 dw -8000h
+
+SECTION .text
+
+;***********************************************************************
+; MMX functions
+;***********************************************************************
+
+%macro MMX_LoadDiff4P 5
+    movd        %1, [%3]
+    movd        %2, [%4]
+    punpcklbw   %1, %5
+    punpcklbw   %2, %5
+    psubw       %1, %2
+%endmacro
+
+%macro MMX_LoadDiff4x4P 10 ;d0, d1, d2, d3, pix1address, pix1stride, pix2address, pix2stride, tmp(mm), 0(mm)
+    MMX_LoadDiff4P %1, %9, %5,    %7,    %10
+    MMX_LoadDiff4P %2, %9, %5+%6, %7+%8, %10
+    lea  %5, [%5+2*%6]
+    lea  %7, [%7+2*%8]
+    MMX_LoadDiff4P %3, %9, %5,    %7,    %10
+    MMX_LoadDiff4P %4, %9, %5+%6, %7+%8, %10
+%endmacro
+
+%macro MMX_SumSubMul2 3
+    movq    %3, %1
+    psllw   %1, $01
+    paddw   %1, %2
+    psllw   %2, $01
+    psubw   %3, %2
+%endmacro
+
+%macro MMX_SumSubDiv2 3
+    movq    %3, %2
+    psraw   %3, $01
+    paddw   %3, %1
+    psraw   %1, $01
+    psubw   %1, %2
+%endmacro
+
+%macro MMX_SumSub 3
+    movq    %3, %2
+    psubw   %2, %1
+    paddw   %1, %3
+%endmacro
+
+%macro MMX_DCT 6
+    MMX_SumSub      %4, %1, %6
+    MMX_SumSub      %3, %2, %6
+    MMX_SumSub      %3, %4, %6
+    MMX_SumSubMul2  %1, %2, %5
+%endmacro
+
+%macro MMX_IDCT 6
+    MMX_SumSub      %4, %5, %6
+    MMX_SumSubDiv2  %3, %2, %1
+    MMX_SumSub      %1, %4, %6
+    MMX_SumSub      %3, %5, %6
+%endmacro
+
+%macro MMX_StoreDiff4P 6
+    movd       %2, %6
+    punpcklbw  %2, %4
+    paddw      %1, %3
+    psraw      %1, $06
+    paddsw     %1, %2
+    packuswb   %1, %2
+    movd       %5, %1
+%endmacro
+
+;***********************************************************************
+;   void WelsDctT4_mmx( int16_t *pDct[4], uint8_t *pix1, int32_t i_pix1, uint8_t *pix2, int32_t i_pix2 )
+;***********************************************************************
+WELS_EXTERN WelsDctT4_mmx
+    %assign push_num 0
+    LOAD_5_PARA
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r4, r4d
+    WELS_Zero    mm7
+
+    MMX_LoadDiff4x4P mm1, mm2, mm3, mm4, r1, r2, r3, r4, mm0, mm7
+
+    MMX_DCT         mm1, mm2, mm3 ,mm4, mm5, mm6
+    MMX_Trans4x4W   mm3, mm1, mm4, mm5, mm2
+
+    MMX_DCT         mm3, mm5, mm2 ,mm4, mm1, mm6
+    MMX_Trans4x4W   mm2, mm3, mm4, mm1, mm5
+
+    movq    [r0+ 0],   mm2
+    movq    [r0+ 8],   mm1
+    movq    [r0+16],   mm5
+    movq    [r0+24],   mm4
+    WELSEMMS
+    LOAD_5_PARA_POP
+    ret
+
+;***********************************************************************
+; void IdctResAddPred_mmx(uint8_t* pPred, int32_t iStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN IdctResAddPred_mmx
+    %assign push_num 0
+    LOAD_3_PARA_TO_5_PARA_IDCT
+    jmp prefixed(WelsIDctT4Rec_mmx.begin)
+
+;***********************************************************************
+;   void WelsIDctT4Rec_mmx(uint8_t *rec, int32_t stride, uint8_t *pred, int32_t pred_stride, int16_t *rs)
+;***********************************************************************
+WELS_EXTERN WelsIDctT4Rec_mmx
+    %assign push_num 0
+    LOAD_5_PARA
+.begin:
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movq    mm0, [r4+ 0]
+    movq    mm1, [r4+ 8]
+    movq    mm2, [r4+16]
+    movq    mm3, [r4+24]
+
+    MMX_Trans4x4W       mm0, mm1, mm2, mm3, mm4
+    MMX_IDCT            mm1, mm2, mm3, mm4, mm0, mm6
+    MMX_Trans4x4W       mm1, mm3, mm0, mm4, mm2
+    MMX_IDCT            mm3, mm0, mm4, mm2, mm1, mm6
+
+    WELS_Zero           mm7
+    WELS_DW32           mm6
+
+    MMX_StoreDiff4P     mm3, mm0, mm6, mm7, [r0], [r2]
+    MMX_StoreDiff4P     mm4, mm0, mm6, mm7, [r0+r1], [r2+r3]
+    lea     r0, [r0+2*r1]
+    lea     r2, [r2+2*r3]
+    MMX_StoreDiff4P     mm1, mm0, mm6, mm7, [r0], [r2]
+    MMX_StoreDiff4P     mm2, mm0, mm6, mm7, [r0+r1], [r2+r3]
+
+    WELSEMMS
+    LOAD_5_PARA_POP
+    ret
+
+
+;***********************************************************************
+; SSE2 functions
+;***********************************************************************
+
+%macro SSE2_Store4x8p 6
+    movlps   [%1+0x00], %2
+    movhps   [%1+0x20], %2
+    movlps   [%1+0x08], %3
+    movhps   [%1+0x28], %3
+    movlps   [%1+0x10], %4
+    movhps   [%1+0x30], %4
+    movlps   [%1+0x18], %5
+    movhps   [%1+0x38], %5
+%endmacro
+
+%macro SSE2_Load4x8p 6
+    MOVDQ    %2,    [%1+0x00]
+    MOVDQ    %4,    [%1+0x10]
+    MOVDQ    %6,    [%1+0x20]
+    MOVDQ    %3,    [%1+0x30]
+    SSE2_XSawp qdq, %4, %3, %5
+    SSE2_XSawp qdq, %2, %6, %3
+%endmacro
+
+%macro SSE2_SumSubMul2 3
+    movdqa  %3, %1
+    psllw   %1, 1
+    paddw   %1, %2
+    psllw   %2, 1
+    psubw   %3, %2
+%endmacro
+
+%macro SSE2_SumSubDiv2 4
+    movdqa  %4, %1
+    movdqa  %3, %2
+    psraw   %2, $01
+    psraw   %4, $01
+    paddw   %1, %2
+    psubw   %4, %3
+%endmacro
+
+%macro SSE2_StoreDiff16p 9
+    paddw       %1, %4
+    psraw       %1, $06
+    movq        %3, %7
+    punpcklbw   %3, %5
+    paddsw      %1, %3
+    paddw       %2, %4
+    psraw       %2, $06
+    movq        %3, %9
+    punpcklbw   %3, %5
+    paddsw      %2, %3
+    packuswb    %1, %2
+    movlps      %6, %1
+    movhps      %8, %1
+%endmacro
+
+%macro SSE2_StoreDiff8p 5
+    movq        %2, %5
+    punpcklbw   %2, %3
+    paddsw      %2, %1
+    packuswb    %2, %2
+    movq        %4, %2
+%endmacro
+
+%macro SSE2_Load2x4P 2
+    MOVDQ       %1, [%2]
+%endmacro
+
+%macro SSE2_Store2x4P 2
+    MOVDQ       [%1], %2
+%endmacro
+
+; out=%1 pPixel1Line1=%2 pPixel1Line2=%3 pPixel2Line1=%4 pPixel2Line2=%5 zero=%6 clobber=%7,%8
+%macro SSE2_LoadDiff2x4P 8
+    movd        %1, [%2]
+    movd        %7, [%3]
+    punpckldq   %1, %7
+    punpcklbw   %1, %6
+    movd        %7, [%4]
+    movd        %8, [%5]
+    punpckldq   %7, %8
+    punpcklbw   %7, %6
+    psubw       %1, %7
+%endmacro
+
+; pRec1=%1 pRec2=%2 data=%3 pPred1=%4 pPred2=%5 dw32=%6 zero=%7 clobber=%8,%9
+%macro SSE2_StoreDiff2x4P 9
+    paddw       %3, %6
+    psraw       %3, 6
+    movd        %8, [%4]
+    movd        %9, [%5]
+    punpckldq   %8, %9
+    punpcklbw   %8, %7
+    paddsw      %3, %8
+    packuswb    %3, %3
+    movd        [%1], %3
+    psrlq       %3, 32
+    movd        [%2], %3
+%endmacro
+
+%macro SSE2_Load8DC 6
+    movdqa      %1,     %6      ; %1 = dc0 dc1
+    paddw       %1,     %5
+    psraw       %1,     $06     ; (dc + 32) >> 6
+
+    movdqa      %2,     %1
+    psrldq      %2,     4
+    punpcklwd   %2,     %2
+    punpckldq   %2,     %2      ; %2 = dc2 dc2 dc2 dc2 dc3 dc3 dc3 dc3
+
+    movdqa      %3,     %1
+    psrldq      %3,     8
+    punpcklwd   %3,     %3
+    punpckldq   %3,     %3      ; %3 = dc4 dc4 dc4 dc4 dc5 dc5 dc5 dc5
+
+    movdqa      %4,     %1
+    psrldq      %4,     12
+    punpcklwd   %4,     %4
+    punpckldq   %4,     %4      ; %4 = dc6 dc6 dc6 dc6 dc7 dc7 dc7 dc7
+
+    punpcklwd   %1,     %1
+    punpckldq   %1,     %1      ; %1 = dc0 dc0 dc0 dc0 dc1 dc1 dc1 dc1
+%endmacro
+
+%macro SSE2_DCT 6
+    SSE2_SumSub     %6, %3, %5
+    SSE2_SumSub     %1, %2, %5
+    SSE2_SumSub     %3, %2, %5
+    SSE2_SumSubMul2     %6, %1, %4
+%endmacro
+
+%macro SSE2_IDCT 7
+    SSE2_SumSub       %7, %2, %6
+    SSE2_SumSubDiv2     %1, %3, %5, %4
+    SSE2_SumSub      %2, %1, %5
+    SSE2_SumSub      %7, %4, %5
+%endmacro
+
+; Do 2 horizontal 4-pt DCTs in parallel packed as 8 words in an xmm register.
+; out=%1 in=%1 clobber=%2
+%macro SSE2_DCT_HORIZONTAL 2
+    pshuflw       %2, %1, 1bh                    ; [x[3],x[2],x[1],x[0]] low qw
+    pmullw        %1, [pic(wels_p1m1p1m1w_128)]  ; [x[0],-x[1],x[2],-x[3], ...]
+    pshufhw       %2, %2, 1bh                    ; [x[3],x[2],x[1],x[0]] high qw
+    paddw         %1, %2                         ; s = [x[0]+x[3],-x[1]+x[2],x[2]+x[1],-x[3]+x[0], ...]
+    pshufd        %2, %1, 0b1h                   ; [s[2],s[3],s[0],s[1], ...]
+    pmullw        %1, [pic(wels_p1m1m1p1w_128)]  ; [s[0],-s[1],-s[2],s[3], ...]
+    pmullw        %2, [pic(wels_p1p2p1p2w_128)]  ; [s[2],2*s[3],s[0],2*s[1], ...]]
+    paddw         %1, %2                         ; y = [s[0]+s[2],-s[1]+2*s[3],-s[2]+s[0],s[3]+2*s[1], ...]
+%endmacro
+
+; Do 2 horizontal 4-pt IDCTs in parallel packed as 8 words in an xmm register.
+;
+; Use a multiply by reciprocal to get -x>>1, and x+=-x>>1 to get x>>1, which
+; avoids a cumbersome blend with SSE2 to get a vector with right-shifted odd
+; elements.
+;
+; out=%1 in=%1 wels_p1m1m1p1w_128=%2 clobber=%3,%4
+%macro SSE2_IDCT_HORIZONTAL 4
+    movdqa        %3, [pic(wels_p0m8000p0m8000w_128)]
+    pmulhw        %3, %1                    ; x[0:7] * [0,-8000h,0,-8000h, ...] >> 16
+    pshufd        %4, %1, 0b1h              ; [x[2],x[3],x[0],x[1], ...]
+    pmullw        %4, %2                    ; [x[2],-x[3],-x[0],x[1], ...]
+    paddw         %1, %3                    ; [x[0]+0,x[1]+(-x[1]>>1),x[2]+0,x[3]+(-x[3]>>1), ...]
+    paddw         %1, %4                    ; s = [x[0]+x[2],(x[1]>>1)-x[3],x[2]-x[0],(x[3]>>1)+x[1], ...]
+    pshuflw       %3, %1, 1bh               ; [s[3],s[2],s[1],s[0]] low qw
+    pmullw        %1, [pic(wels_p1p1m1m1w_128)]  ; [s[0],s[1],-s[2],-s[3], ...]
+    pshufhw       %3, %3, 1bh               ; [s[3],s[2],s[1],s[0]] high qw
+    pmullw        %3, %2                    ; [s[3],-s[2],-s[1],s[0], ...]
+    paddw         %1, %3                    ; y = [s[0]+s[3],s[1]-s[2],-s[2]-s[1],-s[3]+s[0], ...]
+%endmacro
+
+; Do 4 vertical 4-pt DCTs in parallel packed as 16 words in 2 xmm registers.
+; Uses scrambled input to save a negation.
+; [y0,y1]=%1 [y2,y3]=%2 [x1,x0]=%1 [x2,x3]=%2 clobber=%3
+%macro SSE2_DCT_4x4P 3
+    movdqa        %3, %1
+    psubw         %1, %2                    ; [x1-x2,x0-x3]
+    paddw         %2, %3                    ; [x1+x2,x0+x3]
+    movdqa        %3, %2
+    punpckhqdq    %2, %1                    ; s03 = [x0+x3,x0-x3]
+    punpcklqdq    %3, %1                    ; s12 = [x1+x2,x1-x2]
+    movdqa        %1, %2
+    pmullw        %1, [pic(wels_4xp1w_4xp2w)] ; [s03[0],2*s03[1]]
+    paddw         %1, %3                      ; [y0,y1] = [s03[0]+s12[0],2*s03[1]+s12[1]]
+    pmullw        %3, [pic(wels_4xp1w_4xp2w)] ; [s12[0],2*s12[1]]
+    psubw         %2, %3                    ; [y2,y3] = [s03[0]-s12[0],s03[1]-2*s12[1]]
+%endmacro
+
+; Do 4 vertical 4-pt IDCTs in parallel packed as 16 words in 2 xmm registers.
+; Output is scrambled to save a negation.
+; [y1,y0]=%1 [y2,y3]=%2 [x0,x1]=%1 [x2,x3]=%2 clobber=%3,%4
+%macro SSE2_IDCT_4x4P 4
+    movdqa        %4, [pic(wels_4xp0w_4xm8000w)]
+    movdqa        %3, %1
+    pmulhw        %3, %4                    ; x[0:1] * [0,-8000h] >> 16
+    pmulhw        %4, %2                    ; x[2:3] * [0,-8000h] >> 16
+    paddw         %3, %1                    ; [x[0],x[1]>>1]
+    paddw         %4, %2                    ; [x[2],x[3]>>1]
+    psubw         %3, %2                    ; [x[0]-x[2],(x[1]>>1)-x[3]]
+    paddw         %1, %4                    ; [x[2]+x[0],(x[3]>>1)+x[1]]
+    movdqa        %2, %3
+    punpckhqdq    %3, %1                    ; s13 = [(x[1]>>1)-x[3],(x[3]>>1)+x[1]]
+    punpcklqdq    %2, %1                    ; s02 = [x[0]-x[2], x[2]+x[0]]
+    movdqa        %1, %2
+    paddw         %1, %3                    ; [y1,y0] = [s02[0]+s13[0],s02[1]+s13[1]]
+    psubw         %2, %3                    ; [y2,y3] = [s02[0]-s13[0],s02[1]-s13[1]]
+%endmacro
+
+;***********************************************************************
+; void WelsDctFourT4_sse2(int16_t *pDct, uint8_t *pix1, int32_t i_pix1, uint8_t *pix2, int32_t i_pix2 )
+;***********************************************************************
+WELS_EXTERN WelsDctFourT4_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r4, r4d
+    pxor    xmm7, xmm7
+    ;Load 4x8
+    SSE2_LoadDiff8P    xmm0, xmm6, xmm7, [r1], [r3]
+    SSE2_LoadDiff8P    xmm1, xmm6, xmm7, [r1+r2], [r3+r4]
+    lea     r1, [r1 + 2 * r2]
+    lea     r3, [r3 + 2 * r4]
+    SSE2_LoadDiff8P    xmm2, xmm6, xmm7, [r1], [r3]
+    SSE2_LoadDiff8P    xmm3, xmm6, xmm7, [r1+r2], [r3+r4]
+
+    SSE2_DCT            xmm1, xmm2, xmm3, xmm4, xmm5, xmm0
+    SSE2_DCT_HORIZONTAL xmm2, xmm5
+    SSE2_DCT_HORIZONTAL xmm0, xmm5
+    SSE2_DCT_HORIZONTAL xmm3, xmm5
+    SSE2_DCT_HORIZONTAL xmm4, xmm5
+
+    SSE2_Store4x8p r0, xmm2, xmm0, xmm3, xmm4, xmm1
+
+    lea     r1, [r1 + 2 * r2]
+    lea     r3, [r3 + 2 * r4]
+
+    ;Load 4x8
+    SSE2_LoadDiff8P    xmm0, xmm6, xmm7, [r1      ], [r3    ]
+    SSE2_LoadDiff8P    xmm1, xmm6, xmm7, [r1+r2  ], [r3+r4]
+    lea     r1, [r1 + 2 * r2]
+    lea     r3, [r3 + 2 * r4]
+    SSE2_LoadDiff8P    xmm2, xmm6, xmm7, [r1], [r3]
+    SSE2_LoadDiff8P    xmm3, xmm6, xmm7, [r1+r2], [r3+r4]
+
+    SSE2_DCT            xmm1, xmm2, xmm3, xmm4, xmm5, xmm0
+    SSE2_DCT_HORIZONTAL xmm2, xmm5
+    SSE2_DCT_HORIZONTAL xmm0, xmm5
+    SSE2_DCT_HORIZONTAL xmm3, xmm5
+    SSE2_DCT_HORIZONTAL xmm4, xmm5
+
+    SSE2_Store4x8p r0+64, xmm2, xmm0, xmm3, xmm4, xmm1
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; void WelsIDctFourT4Rec_sse2(uint8_t *rec, int32_t stride, uint8_t *pred, int32_t pred_stride, int16_t *rs);
+;***********************************************************************
+WELS_EXTERN WelsIDctFourT4Rec_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    ;Load 4x8
+    SSE2_Load4x8p  r4, xmm0, xmm1, xmm4, xmm2, xmm5
+
+    movdqa xmm7, [pic(wels_p1m1m1p1w_128)]
+    SSE2_IDCT_HORIZONTAL xmm0, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm1, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm4, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm2, xmm7, xmm5, xmm6
+    SSE2_IDCT xmm1, xmm4, xmm2, xmm3, xmm5, xmm6, xmm0
+
+    WELS_Zero           xmm7
+    WELS_DW32           xmm6
+
+    SSE2_StoreDiff16p xmm1, xmm3, xmm5, xmm6, xmm7, [r0], [r2], [r0 + r1], [r2 + r3]
+    lea     r0, [r0 + 2 * r1]
+    lea     r2, [r2 + 2 * r3]
+    SSE2_StoreDiff16p xmm0, xmm4, xmm5, xmm6, xmm7, [r0], [r2], [r0 + r1], [r2 + r3]
+
+    lea     r0, [r0 + 2 * r1]
+    lea     r2, [r2 + 2 * r3]
+    SSE2_Load4x8p  r4+64, xmm0, xmm1, xmm4, xmm2, xmm5
+
+    movdqa xmm7, [pic(wels_p1m1m1p1w_128)]
+    SSE2_IDCT_HORIZONTAL xmm0, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm1, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm4, xmm7, xmm5, xmm6
+    SSE2_IDCT_HORIZONTAL xmm2, xmm7, xmm5, xmm6
+    SSE2_IDCT xmm1, xmm4, xmm2, xmm3, xmm5, xmm6, xmm0
+
+    WELS_Zero           xmm7
+    WELS_DW32           xmm6
+
+    SSE2_StoreDiff16p xmm1, xmm3, xmm5, xmm6, xmm7, [r0], [r2], [r0 + r1], [r2 + r3]
+    lea     r0, [r0 + 2 * r1]
+    lea     r2, [r2 + 2 * r3]
+    SSE2_StoreDiff16p xmm0, xmm4, xmm5, xmm6, xmm7, [r0], [r2], [r0 + r1], [r2 + r3]
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; void WelsDctT4_sse2(int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2)
+;***********************************************************************
+WELS_EXTERN WelsDctT4_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 5
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r4, r4d
+
+    WELS_Zero xmm2
+    SSE2_LoadDiff2x4P xmm0, r1+r2, r1, r3+r4, r3, xmm2, xmm3, xmm4
+    add r1, r2
+    add r3, r4
+    SSE2_LoadDiff2x4P xmm1, r1+r2, r1+2*r2, r3+r4, r3+2*r4, xmm2, xmm3, xmm4
+    SSE2_DCT_HORIZONTAL xmm0, xmm3
+    SSE2_DCT_HORIZONTAL xmm1, xmm3
+    SSE2_DCT_4x4P xmm0, xmm1, xmm3
+    SSE2_Store2x4P r0,    xmm0
+    SSE2_Store2x4P r0+16, xmm1
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; void IdctResAddPred_sse2(uint8_t* pPred, int32_t iStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN IdctResAddPred_sse2
+    %assign push_num 0
+    LOAD_3_PARA_TO_5_PARA_IDCT
+    jmp prefixed(WelsIDctT4Rec_sse2.begin)
+
+;***********************************************************************
+; void WelsIDctT4Rec_sse2(uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN WelsIDctT4Rec_sse2
+    %assign push_num 0
+    LOAD_5_PARA
+.begin:
+    INIT_X86_32_PIC r5
+    PUSH_XMM 6
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    SSE2_Load2x4P xmm0, r4
+    SSE2_Load2x4P xmm1, r4+16
+    movdqa xmm4, [pic(wels_p1m1m1p1w_128)]
+    SSE2_IDCT_HORIZONTAL xmm0, xmm4, xmm2, xmm3
+    SSE2_IDCT_HORIZONTAL xmm1, xmm4, xmm2, xmm3
+    SSE2_IDCT_4x4P xmm0, xmm1, xmm2, xmm3
+    WELS_Zero xmm4
+    WELS_DW32 xmm5
+    SSE2_StoreDiff2x4P r0+r1, r0, xmm0, r2+r3, r2, xmm5, xmm4, xmm2, xmm3
+    add r0, r1
+    add r2, r3
+    SSE2_StoreDiff2x4P r0+r1, r0+2*r1, xmm1, r2+r3, r2+2*r3, xmm5, xmm4, xmm2, xmm3
+
+    POP_XMM
+    DEINIT_X86_32_PIC
+    LOAD_5_PARA_POP
+    ret
+
+%macro SSE2_StoreDiff4x8p 8
+    SSE2_StoreDiff8p    %1, %3, %4, [%5],           [%6]
+    SSE2_StoreDiff8p    %1, %3, %4, [%5 + %7],      [%6 + %8]
+    SSE2_StoreDiff8p    %2, %3, %4, [%5 + 8],       [%6 + 8]
+    SSE2_StoreDiff8p    %2, %3, %4, [%5 + %7 + 8],  [%6 + %8 + 8]
+%endmacro
+
+ ;***********************************************************************
+; void WelsIDctRecI16x16Dc_sse2(uint8_t *rec, int32_t stride, uint8_t *pred, int32_t pred_stride, int16_t *dct_dc)
+;***********************************************************************
+WELS_EXTERN WelsIDctRecI16x16Dc_sse2
+    %assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor        xmm7,       xmm7
+    WELS_DW32   xmm6
+
+    SSE2_Load8DC            xmm0, xmm1, xmm2, xmm3, xmm6, [r4]
+    SSE2_StoreDiff4x8p      xmm0, xmm1, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm0, xmm1, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm2, xmm3, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm2, xmm3, xmm5, xmm7, r0, r2, r1, r3
+
+    SSE2_Load8DC            xmm0, xmm1, xmm2, xmm3, xmm6, [r4 + 16]
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm0, xmm1, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm0, xmm1, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm2, xmm3, xmm5, xmm7, r0, r2, r1, r3
+
+    lea         r0,     [r0 + 2 * r1]
+    lea         r2,     [r2 + 2 * r3]
+    SSE2_StoreDiff4x8p      xmm2, xmm3, xmm5, xmm7, r0, r2, r1, r3
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+
+;***********************************************************************
+; AVX2 functions
+;***********************************************************************
+
+%ifdef HAVE_AVX2
+; out=%1 pPixel1=%2 iStride1=%3 pPixel2=%4 iStride2=%5 wels_shufb0312_movzxw=%6 clobber=%7,%8
+%macro AVX2_LoadDiff16P 8
+    vmovq         x%1, [%2         ]
+    vpbroadcastq  y%7, [%2 + 4 * %3]
+    vpblendd      y%1, y%1, y%7, 11110000b
+    vpshufb       y%1, y%1, y%6
+    vmovq         x%7, [%4         ]
+    vpbroadcastq  y%8, [%4 + 4 * %5]
+    vpblendd      y%7, y%7, y%8, 11110000b
+    vpshufb       y%7, y%7, y%6
+    vpsubw        y%1, y%1, y%7
+%endmacro
+
+; pRec=%1 iStride=%2 data=%3,%4 pPred=%5 iPredStride=%6 dw32=%7 wels_shufb0312_movzxw=%8 clobber=%9,%10
+%macro AVX2_StoreDiff32P 10
+    vpaddw        y%3, y%3, y%7
+    vpsraw        y%3, y%3, 6
+    vmovq         x%9,  [%5         ]
+    vpbroadcastq  y%10, [%5 + 4 * %6]
+    add           %5, %6
+    vpblendd      y%9, y%9, y%10, 11110000b
+    vpshufb       y%9, y%9, y%8
+    vpaddsw       y%3, y%3, y%9
+    vpaddw        y%4, y%4, y%7
+    vpsraw        y%4, y%4, 6
+    vmovq         x%9,  [%5         ]
+    vpbroadcastq  y%10, [%5 + 4 * %6]
+    vpblendd      y%9, y%9, y%10, 11110000b
+    vpshufb       y%9, y%9, y%8
+    vpaddsw       y%4, y%4, y%9
+    vpackuswb     y%3, y%3, y%4
+    vbroadcasti128 y%4, [pic(wels_shufb0231_128)]
+    vpshufb       y%3, y%3, y%4
+    vextracti128  x%4, y%3, 1
+    vmovlps       [%1         ], x%3
+    vmovlps       [%1 + 4 * %2], x%4
+    add           %1, %2
+    vmovhps       [%1         ], x%3
+    vmovhps       [%1 + 4 * %2], x%4
+%endmacro
+
+; out=%1,%2,%3,%4 pDct=%5 clobber=%6
+%macro AVX2_Load4x16P 6
+    vmovdqa       x%2,      [%5+0x00]
+    vinserti128   y%2, y%2, [%5+0x40], 1
+    vmovdqa       x%6,      [%5+0x20]
+    vinserti128   y%6, y%6, [%5+0x60], 1
+    vpunpcklqdq   y%1, y%2, y%6
+    vpunpckhqdq   y%2, y%2, y%6
+    vmovdqa       x%4,      [%5+0x10]
+    vinserti128   y%4, y%4, [%5+0x50], 1
+    vmovdqa       x%6,      [%5+0x30]
+    vinserti128   y%6, y%6, [%5+0x70], 1
+    vpunpcklqdq   y%3, y%4, y%6
+    vpunpckhqdq   y%4, y%4, y%6
+%endmacro
+
+; pDct=%1 data=%1,%2,%3,%4 clobber=%5
+%macro AVX2_Store4x16P 6
+    vpunpcklqdq   y%6, y%2,  y%3
+    vmovdqa       [%1+0x00], x%6
+    vextracti128  [%1+0x40], y%6, 1
+    vpunpckhqdq   y%6, y%2,  y%3
+    vmovdqa       [%1+0x20], x%6
+    vextracti128  [%1+0x60], y%6, 1
+    vpunpcklqdq   y%6, y%4,  y%5
+    vmovdqa       [%1+0x10], x%6
+    vextracti128  [%1+0x50], y%6, 1
+    vpunpckhqdq   y%6, y%4,  y%5
+    vmovdqa       [%1+0x30], x%6
+    vextracti128  [%1+0x70], y%6, 1
+%endmacro
+
+%macro AVX2_Load4x4P 2
+    vmovdqu       y%1, [%2]
+%endmacro
+
+%macro AVX2_Store4x4P 2
+    vmovdqu       [%1], y%2
+%endmacro
+
+; Load 4 lines of 4 pixels, shuffle and zero extend to 16-bit.
+; out=%1 pPixel=%2 iStride=%3 [wels_shufb0312_movzxw]=%4 clobber=%5,%6
+%macro AVX2_Loadzx4x4P 6
+    vmovd         x%1, [%2         ]
+    add           %2, %3
+    vpbroadcastd  x%5, [%2 + 2 * %3]
+    vpblendd      x%1, x%1, x%5, 1010b
+    vpbroadcastd  y%5, [%2         ]
+    vpbroadcastd  y%6, [%2 +     %3]
+    vpblendd      y%5, y%5, y%6, 10101010b
+    vpblendd      y%1, y%1, y%5, 11110000b
+    vpshufb       y%1, y%1, %4
+%endmacro
+
+; out=%1 pPixel1=%2 iStride1=%3 pPixel2=%4 iStride2=%5 wels_shufb0312_movzxw=%6 clobber=%7,%8,%9
+%macro AVX2_LoadDiff4x4P 9
+    AVX2_Loadzx4x4P %1, %2, %3, y%6, %7, %8
+    AVX2_Loadzx4x4P %7, %4, %5, y%6, %8, %9
+    vpsubw        y%1, y%1, y%7
+%endmacro
+
+; pRec=%1 iStride=%2 data=%3 pPred=%4 iPredStride=%5 dw32=%6 wels_shufb0312_movzxw=%7 clobber=%8,%9,%10
+%macro AVX2_StoreDiff4x4P 10
+    vpaddw         y%3, y%3, y%6
+    vpsraw         y%3, y%3, 6
+    AVX2_Loadzx4x4P %8, %4, %5, y%7, %9, %10
+    vpaddsw        y%3, y%3, y%8
+    vpackuswb      y%3, y%3, y%3
+    vbroadcasti128 y%8, [pic(wels_shufb0231_128)]
+    vpshufb        y%3, y%3, y%8
+    vextracti128   x%8, y%3, 1
+    vmovd          [%1         ], x%3
+    add            %1, %2
+    vmovd          [%1         ], x%8
+    vpsrlq         x%8, x%8, 32
+    vmovd          [%1     + %2], x%8
+    vpsrlq         x%3, x%3, 32
+    vmovd          [%1 + 2 * %2], x%3
+%endmacro
+
+; 4-pt DCT
+; out=%1,%2,%3,%4 in=%1,%2,%3,%4 clobber=%5
+%macro AVX2_DCT 5
+    vpsubw        %5, %1, %4  ; s3 = x0 - x3
+    vpaddw        %1, %1, %4  ; s0 = x0 + x3
+    vpsubw        %4, %2, %3  ; s2 = x1 - x2
+    vpaddw        %2, %2, %3  ; s1 = x1 + x2
+    vpsubw        %3, %1, %2  ; y2 = s0 - s1
+    vpaddw        %1, %1, %2  ; y0 = s0 + s1
+    vpsllw        %2, %5, 1
+    vpaddw        %2, %2, %4  ; y1 = 2 * s3 + s2
+    vpsllw        %4, %4, 1
+    vpsubw        %4, %5, %4  ; y3 = s3 - 2 * s2
+%endmacro
+
+; 4-pt IDCT
+; out=%1,%2,%3,%4 in=%1,%2,%3,%4 clobber=%5
+%macro AVX2_IDCT 5
+    vpsraw        %5, %2, 1
+    vpsubw        %5, %5, %4  ; t3 = (x1 >> 1) - x3
+    vpsraw        %4, %4, 1
+    vpaddw        %4, %2, %4  ; t2 = x1 + (x3 >> 1)
+    vpaddw        %2, %1, %3  ; t0 = x0 + x2
+    vpsubw        %3, %1, %3  ; t1 = x0 - x2
+    vpaddw        %1, %2, %4  ; y0 = t0 + t2
+    vpsubw        %4, %2, %4  ; y3 = t0 - t2
+    vpaddw        %2, %3, %5  ; y1 = t1 + t3
+    vpsubw        %3, %3, %5  ; y2 = t1 - t3
+%endmacro
+
+; Do 4 horizontal 4-pt DCTs in parallel packed as 16 words in a ymm register.
+; Uses scrambled input to save a negation.
+; [y0,y1,y2,y3]=%1 [x0,x3,x1,x2]=%1 wels_shufb2301=%2 clobber=%3
+%macro AVX2_DCT_HORIZONTAL 3
+    vpsignw       %3, %1, [pic(wels_p1m1p1m1w_256)]  ; [x0,-x3,x1,-x2]
+    vpshufb       %1, %1, %2                    ; [x3,x0,x2,x1]
+    vpaddw        %1, %1, %3                    ; s = [x0+x3,-x3+x0,x1+x2,-x2+x1]
+    vpmullw       %3, %1, [pic(wels_p1p2m1m2w_256)]  ; [s[0],2*s[1],-s[2],-2*s[3], ...]
+    vpshufd       %1, %1, 0b1h                  ; [s[2],s[3],s[0],s[1], ...]
+    vpaddw        %1, %1, %3                    ; [y0,y1,y2,y3] = [s[0]+s[2],2*s[1]+s[3],-s[2]+s[0],-2*s[3]+s[1], ...]
+%endmacro
+
+; Do 4 horizontal 4-pt IDCTs in parallel packed as 16 words in a ymm register.
+; Output is scrambled to save a negation.
+; [y0,y3,y1,y2]=%1 [x0,x1,x2,x3]=%1 wels_shufb2301=%2 clobber=%3
+%macro AVX2_IDCT_HORIZONTAL 3
+    vpsraw        %3, %1, 1                     ; [x0>>1,x1>>1,x2>>1,x3>>1]
+    vpblendw      %3, %1, %3, 10101010b         ; [x0,x1>>1,x2,x3>>1]
+    vpsignw       %1, %1, [pic(wels_p1p1m1m1w_256)]  ; [x0,x1,-x2,-x3]
+    vpshufd       %3, %3, 0b1h                  ; [x2,x3>>1,x0,x1>>1]
+    vpaddw        %1, %3, %1                    ; s = [x2+x0,(x3>>1)+x1,x0-x2,(x1>>1)-x3]
+    vpshufb       %3, %1, %2                    ; [s[1],s[0],s[3],s[2], ...]
+    vpsignw       %1, %1, [pic(wels_p1m1p1m1w_256)]  ; [s[0],-s[1],s[2],-s[3], ...]
+    vpaddw        %1, %1, %3                    ; [y0,y3,y1,y2] = [s[0]+s[1],-s[1]+s[0],s[2]+s[3],-s[3]+s[2], ...]
+%endmacro
+
+; Do 4 vertical 4-pt DCTs in parallel packed as 16 words in a ymm register.
+; Uses scrambled input to save a negation.
+; [y0,y1,y2,y3]=%1 [x0,x3,x1,x2]=%1 clobber=%2
+%macro AVX2_DCT_4x4P 2
+    vpsignw       %2, %1, [pic(wels_4xp1w_4xm1w_256)]    ; [x0,-x3,x1,-x2]
+    vpshufd       %1, %1, 4eh                            ; [x3,x0,x2,x1]
+    vpaddw        %1, %1, %2                             ; s = [x0+x3,-x3+x0,x1+x2,-x2+x1]
+    vpmullw       %2, %1, [pic(wels_4xp1w_4xp2w_4xm1w_4xm2w)] ; [s[0],2*s[1],-s[2],-2*s[3]]
+    vpermq        %1, %1, 4eh                            ; [s[2],s[3],s[0],s[1]]
+    vpaddw        %1, %1, %2                             ; [y0,y1,y2,y3] = [s[0]+s[2],2*s[1]+s[3],-s[2]+s[0],-2*s[3]+s[1]]
+%endmacro
+
+; Do 4 vertical 4-pt IDCTs in parallel packed as 16 words in a ymm register.
+; Output is scrambled to save a negation.
+; [y0,y3,y1,y2]=%1 [x0,x1,x2,x3]=%1 clobber=%2
+%macro AVX2_IDCT_4x4P 2
+    vpsraw        %2, %1, 1                              ; [x0>>1,x1>>1,x2>>1,x3>>1]
+    vpblendw      %2, %1, %2, 11110000b                  ; [x0,x1>>1,x2,x3>>1]
+    vpsignw       %1, %1, [pic(wels_8xp1w_8xm1w)]        ; [x0,x1,-x2,-x3]
+    vpermq        %2, %2, 4eh                            ; [x2,x3>>1,x0,x1>>1]
+    vpaddw        %1, %2, %1                             ; s = [x2+x0,(x3>>1)+x1,x0-x2,(x1>>1)-x3]
+    vpshufd       %2, %1, 4eh                            ; [s[1],s[0],s[3],s[2]]
+    vpmullw       %1, %1, [pic(wels_4xp1w_4xm1w_256)]    ; [s[0],-s[1],s[2],-s[3], ...]
+    vpaddw        %1, %1, %2                             ; [y0,y3,y1,y2] = [s[0]+s[1],-s[1]+s[0],s[2]+s[3],-s[3]+s[2]]
+%endmacro
+
+;***********************************************************************
+; void WelsDctFourT4_avx2(int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2)
+;***********************************************************************
+WELS_EXTERN WelsDctFourT4_avx2
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r4, r4d
+
+    vbroadcasti128 ymm6, [pic(wels_shufb0312_movzxw_128)]
+
+    ;Load 4x16
+    AVX2_LoadDiff16P mm0, r1, r2, r3, r4, mm6, mm4, mm5
+    add r1, r2
+    add r3, r4
+    AVX2_LoadDiff16P mm1, r1, r2, r3, r4, mm6, mm4, mm5
+    add r1, r2
+    add r3, r4
+    AVX2_LoadDiff16P mm2, r1, r2, r3, r4, mm6, mm4, mm5
+    add r1, r2
+    add r3, r4
+    AVX2_LoadDiff16P mm3, r1, r2, r3, r4, mm6, mm4, mm5
+
+    AVX2_DCT ymm0, ymm1, ymm2, ymm3, ymm5
+    vbroadcasti128 ymm6, [pic(wels_shufb2301_128)]
+    AVX2_DCT_HORIZONTAL ymm0, ymm6, ymm5
+    AVX2_DCT_HORIZONTAL ymm1, ymm6, ymm5
+    AVX2_DCT_HORIZONTAL ymm2, ymm6, ymm5
+    AVX2_DCT_HORIZONTAL ymm3, ymm6, ymm5
+
+    AVX2_Store4x16P r0, mm0, mm1, mm2, mm3, mm5
+    vzeroupper
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; void IdctFourResAddPred_avx2(uint8_t* pPred, int32_t iStride, const int16_t* pDct, const int8_t* pNzc);
+;***********************************************************************
+WELS_EXTERN IdctFourResAddPred_avx2
+    %assign push_num 0
+    LOAD_3_PARA_TO_5_PARA_IDCT
+    jmp prefixed(WelsIDctFourT4Rec_avx2.begin)
+
+;***********************************************************************
+; void WelsIDctFourT4Rec_avx2(uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN WelsIDctFourT4Rec_avx2
+    %assign push_num 0
+    LOAD_5_PARA
+.begin:
+    INIT_X86_32_PIC r5
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    AVX2_Load4x16P mm0, mm1, mm2, mm3, r4, mm5
+    vbroadcasti128 ymm6, [pic(wels_shufb2301_128)]
+    AVX2_IDCT_HORIZONTAL ymm0, ymm6, ymm5
+    AVX2_IDCT_HORIZONTAL ymm1, ymm6, ymm5
+    AVX2_IDCT_HORIZONTAL ymm2, ymm6, ymm5
+    AVX2_IDCT_HORIZONTAL ymm3, ymm6, ymm5
+    AVX2_IDCT ymm0, ymm1, ymm2, ymm3, ymm5
+
+    vbroadcasti128 ymm6, [pic(wels_shufb0312_movzxw_128)]
+    vbroadcasti128 ymm7, [pic(wels_dw32_128)]
+    AVX2_StoreDiff32P r0, r1, mm0, mm1, r2, r3, mm7, mm6, mm5, mm4
+    add r2, r3
+    add r0, r1
+    AVX2_StoreDiff32P r0, r1, mm2, mm3, r2, r3, mm7, mm6, mm5, mm4
+    vzeroupper
+
+    POP_XMM
+    DEINIT_X86_32_PIC
+    LOAD_5_PARA_POP
+    ret
+
+;***********************************************************************
+; void WelsDctT4_avx2(int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2)
+;***********************************************************************
+WELS_EXTERN WelsDctT4_avx2
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 5
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r4, r4d
+
+    vbroadcasti128 ymm1, [pic(wels_shufb0312_movzxw_128)]
+    AVX2_LoadDiff4x4P mm0, r1, r2, r3, r4, mm1, mm2, mm3, mm4
+    AVX2_DCT_4x4P ymm0, ymm2
+    vbroadcasti128 ymm1, [pic(wels_shufb2301_128)]
+    AVX2_DCT_HORIZONTAL ymm0, ymm1, ymm2
+    AVX2_Store4x4P r0, mm0
+    vzeroupper
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; void IdctResAddPred_avx2(uint8_t* pPred, int32_t iStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN IdctResAddPred_avx2
+    %assign push_num 0
+    LOAD_3_PARA_TO_5_PARA_IDCT
+    jmp prefixed(WelsIDctT4Rec_avx2.begin)
+
+;***********************************************************************
+; void WelsIDctT4Rec_avx2(uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct);
+;***********************************************************************
+WELS_EXTERN WelsIDctT4Rec_avx2
+    %assign push_num 0
+    LOAD_5_PARA
+.begin:
+    INIT_X86_32_PIC r5
+    PUSH_XMM 6
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    AVX2_Load4x4P mm0, r4
+    vbroadcasti128 ymm4, [pic(wels_shufb2301_128)]
+    AVX2_IDCT_HORIZONTAL ymm0, ymm4, ymm1
+    AVX2_IDCT_4x4P ymm0, ymm1
+    vbroadcasti128 ymm4, [pic(wels_shufb0312_movzxw_128)]
+    vbroadcasti128 ymm5, [pic(wels_dw32_128)]
+    AVX2_StoreDiff4x4P r0, r1, mm0, r2, r3, mm5, mm4, mm1, mm2, mm3
+    vzeroupper
+
+    POP_XMM
+    DEINIT_X86_32_PIC
+    LOAD_5_PARA_POP
+    ret
+%endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/deblock.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/deblock.asm
new file mode 100644
index 0000000000..513b37eb11
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/deblock.asm
@@ -0,0 +1,848 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  deblock.asm
+;*
+;*  Abstract
+;*      edge loop
+;*
+;*  History
+;*      08/07/2009 Created
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;*******************************************************************************
+; Macros and other preprocessor constants
+;*******************************************************************************
+
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+ALIGN   16
+FOUR_16B_SSE2:   dw   4, 4, 4, 4, 4, 4, 4, 4
+
+ALIGN   16
+WELS_DB1_16:
+    times 16 db 1
+WELS_DB127_16:
+    times 16 db 127
+WELS_DB96_16:
+    times 16 db 96
+WELS_SHUFB0000111122223333:
+    times 4 db 0
+    times 4 db 1
+    times 4 db 2
+    times 4 db 3
+
+
+SECTION .text
+
+; Unsigned byte absolute difference.
+; a=%1 b=%2 clobber=%3
+; Subtract once in each direction with saturation and return the maximum.
+%macro SSE2_AbsDiffUB 3
+    movdqa   %3, %2
+    psubusb  %3, %1
+    psubusb  %1, %2
+    por      %1, %3
+%endmacro
+
+; Unsigned byte compare less than.
+; lhs=%1 rhs^0x7f=%2 0x7f=%3
+; No unsigned byte lt/gt compare instruction available; xor by 0x7f and use a
+; signed compare. Some other options do exist. This one allows modifying the lhs
+; without mov and uses a bitwise op which can be executed on most ports on
+; common architectures.
+%macro SSE2_CmpltUB 3
+    pxor     %1, %3
+    pcmpgtb  %1, %2
+%endmacro
+
+; Unsigned byte compare greater than or equal.
+%macro SSE2_CmpgeUB 2
+    pminub   %1, %2
+    pcmpeqb  %1, %2
+%endmacro
+
+; Clip unsigned bytes to ref +/- diff.
+; data=%1 ref=%2 maxdiff_from_ref=%3 clobber=%4
+%macro SSE2_ClipUB 4
+    movdqa   %4, %2
+    psubusb  %4, %3
+    paddusb  %3, %2
+    pmaxub   %1, %4
+    pminub   %1, %3
+%endmacro
+
+; (a + b + 1 - c) >> 1
+; a=%1 b=%2 c=%3 [out:a^b&c]=%4
+%macro SSE2_AvgbFloor1 4
+    movdqa   %4, %1
+    pxor     %4, %2
+    pavgb    %1, %2
+    pand     %4, %3
+    psubb    %1, %4
+%endmacro
+
+; (a + b + carry) >> 1
+; a=%1 b=%2 carry-1=%3
+%macro SSE2_AvgbFloor2 3
+    pxor     %1, %3
+    pxor     %2, %3
+    pavgb    %1, %2
+    pxor     %1, %3
+%endmacro
+
+; a = (a & m) | (b & ~m)
+; a=%1 b=%2 m=%3
+%macro SSE2_Blend 3
+    pand     %1, %3
+    pandn    %3, %2
+    por      %1, %3
+%endmacro
+
+; Compute
+; p0 = clip(p0 + clip((q0 - p0 + ((p1 - q1) >> 2) + 1) >> 1, -iTc, iTc), 0, 255)
+; q0 = clip(q0 - clip((q0 - p0 + ((p1 - q1) >> 2) + 1) >> 1, -iTc, iTc), 0, 255)
+; 16-wide parallel in packed byte representation in xmm registers.
+;
+; p1=%1 p0=%2 q0=%3 q1=%4 iTc=%5 FFh=%6 xmmclobber=%7,%8
+%macro SSE2_DeblockP0Q0_Lt4 8
+    ; (q0 - p0 + ((p1 - q1) >> 2) + 1) >> 1 clipped to [-96, 159] and biased to [0, 255].
+    ; A limited range is sufficient because the value is clipped to [-iTc, iTc] later.
+    ; Bias so that unsigned saturation can be used.
+    ; Get ((p1 - q1) >> 2) + 192 via a pxor and two pavgbs.
+    ; q0 - p0 is split into a non-negative and non-positive part. The latter is
+    ; subtracted from the biased value.
+    movdqa     %7, %2
+    psubusb    %7, %3  ; clip(p0 - q0, 0, 255)
+    ; ((p1 - q1) >> 2) + 0xc0
+    pxor       %4, %6  ; q1 ^ 0xff aka -q1 - 1 & 0xff
+    pavgb      %1, %4  ; (((p1 - q1 + 0x100) >> 1)
+    pavgb      %1, %6  ;  + 0x100) >> 1
+    psubusb    %1, %7  ; -= clip(p0 - q0, 0, 255) saturate.
+    movdqa     %8, %3
+    psubusb    %8, %2  ; (clip(q0 - p0, 0, 255)
+    pavgb      %8, %1  ;  + clip(((p1 - q1 + 0x300) >> 2) - clip(p0 - q0, 0, 255), 0, 255) + 1) >> 1
+
+    ; Unbias and split into a non-negative and a non-positive part.
+    ; Clip each part to iTc via minub.
+    ; Add/subtract each part to/from p0/q0 and clip.
+    movdqa     %6, [pic(WELS_DB96_16)]
+    psubusb    %6, %8
+    psubusb    %8, [pic(WELS_DB96_16)]
+    pminub     %6, %5
+    pminub     %8, %5
+    psubusb    %2, %6
+    paddusb    %2, %8  ; p0
+    paddusb    %3, %6
+    psubusb    %3, %8  ; q0
+%endmacro
+
+
+;*******************************************************************************
+;    void DeblockLumaLt4V_ssse3(uint8_t * pPix, int32_t iStride, int32_t iAlpha,
+;                                 int32_t iBeta, int8_t * pTC)
+;*******************************************************************************
+
+WELS_EXTERN DeblockLumaLt4V_ssse3
+    %assign push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    movd     xmm1, arg3d
+    movd     xmm2, arg4d
+    pxor     xmm3, xmm3
+    pxor     xmm1, [pic(WELS_DB127_16)]
+    pxor     xmm2, [pic(WELS_DB127_16)]
+    pshufb   xmm1, xmm3                       ; iAlpha ^ 0x7f
+    pshufb   xmm2, xmm3                       ; iBeta  ^ 0x7f
+    mov      r2, r1                           ; iStride
+    neg      r1                               ; -iStride
+    lea      r3, [r0 + r1]                    ; pPix - iStride
+
+    ; Compute masks to enable/disable deblocking.
+    MOVDQ    xmm6, [r3 + 0 * r1]              ; p0
+    MOVDQ    xmm7, [r3 + 1 * r1]              ; p1
+    MOVDQ    xmm0, [r0 + 0 * r2]              ; q0
+    movdqa   xmm4, xmm6
+    SSE2_AbsDiffUB xmm6, xmm0, xmm3           ; |p0 - q0|
+    SSE2_CmpltUB xmm6, xmm1, [pic(WELS_DB127_16)]  ; bDeltaP0Q0 = |p0 - q0| < iAlpha
+    MOVDQ    xmm1, [r0 + 1 * r2]              ; q1
+    SSE2_AbsDiffUB xmm7, xmm4, xmm3           ; |p1 - p0|
+    SSE2_AbsDiffUB xmm0, xmm1, xmm3           ; |q1 - q0|
+    pmaxub   xmm7, xmm0                       ; max(|p1 - p0|, |q1 - q0|)
+    SSE2_CmpltUB xmm7, xmm2, [pic(WELS_DB127_16)]  ; bDeltaP1P0 & bDeltaQ1Q0 = max(|p1 - p0|, |q1 - q0|) < iBeta
+    pand     xmm6, xmm7                       ; bDeltaP0Q0P1P0Q1Q0 = bDeltaP0Q0 & bDeltaP1P0 & bDeltaQ1Q0
+    MOVDQ    xmm7, [r3 + 2 * r1]              ; p2
+    movdqa   xmm0, xmm7
+    SSE2_AbsDiffUB xmm7, xmm4, xmm3           ; |p2 - p0|
+    SSE2_CmpltUB xmm7, xmm2, [pic(WELS_DB127_16)]  ; bDeltaP2P0 = |p2 - p0| < iBeta
+    MOVDQ    xmm5, [r0 + 2 * r2]              ; q2
+    MOVDQ    xmm3, [r0 + 0 * r2]              ; q0
+    movdqa   xmm1, xmm5
+    SSE2_AbsDiffUB xmm5, xmm3, xmm4           ; |q2 - q0|
+    SSE2_CmpltUB xmm5, xmm2, [pic(WELS_DB127_16)]  ; bDeltaQ2Q0 = |q2 - q0| < iBeta
+
+    pavgb    xmm3, [r3 + 0 * r1]
+    pcmpeqw  xmm2, xmm2  ; FFh
+    pxor     xmm3, xmm2
+    ; (p2 + ((p0 + q0 + 1) >> 1)) >> 1
+    pxor     xmm0, xmm2
+    pavgb    xmm0, xmm3
+    pxor     xmm0, xmm2
+    ; (q2 + ((p0 + q0 + 1) >> 1)) >> 1
+    pxor     xmm1, xmm2
+    pavgb    xmm1, xmm3
+    pxor     xmm1, xmm2
+
+    movd     xmm3, [r4]
+    pshufb   xmm3, [pic(WELS_SHUFB0000111122223333)] ; iTc
+    movdqa   xmm4, xmm3  ; iTc0 = iTc
+    pcmpgtb  xmm3, xmm2  ; iTc > -1 ? 0xff : 0x00
+    pand     xmm6, xmm3  ; bDeltaP0Q0P1P0Q1Q0 &= iTc > -1
+    movdqa   xmm3, xmm4
+    psubb    xmm3, xmm7  ; iTc -= bDeltaP2P0 ? -1 : 0
+    psubb    xmm3, xmm5  ; iTc -= bDeltaQ2Q0 ? -1 : 0
+    pand     xmm3, xmm6  ; iTc &= bDeltaP0Q0P1P0Q1Q0 ? 0xff : 0
+    pand     xmm7, xmm6  ; bDeltaP2P0 &= bDeltaP0Q0P1P0Q1Q0
+    pand     xmm5, xmm6  ; bDeltaQ2Q0 &= bDeltaP0Q0P1P0Q1Q0
+    pand     xmm7, xmm4  ; iTc0 & (bDeltaP2P0 ? 0xff : 0)
+    pand     xmm5, xmm4  ; iTc0 & (bDeltaQ2Q0 ? 0xff : 0)
+
+    MOVDQ    xmm4, [r3 + 1 * r1]
+    SSE2_ClipUB xmm0, xmm4, xmm7, xmm6  ; clip p1.
+    MOVDQ    xmm6, [r0 + 1 * r2]
+    MOVDQ    [r3 + 1 * r1], xmm0        ; store p1.
+    SSE2_ClipUB xmm1, xmm6, xmm5, xmm7  ; clip q1.
+    MOVDQ    [r0 + 1 * r2], xmm1        ; store q1.
+
+    MOVDQ    xmm1, [r3 + 0 * r1]  ; p0
+    MOVDQ    xmm0, [r0 + 0 * r2]  ; q0
+    SSE2_DeblockP0Q0_Lt4 xmm4, xmm1, xmm0, xmm6, xmm3, xmm2, xmm5, xmm7
+    MOVDQ    [r3 + 0 * r1], xmm1  ; store p0.
+    MOVDQ    [r0 + 0 * r2], xmm0  ; store q0.
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+; Deblock 3x16 luma pixels for the eq4 case.
+;
+; Compose 8-bit averages from pavgbs. Ie. (p1 + p0 + p2 + q0 + 2) >> 2 can be
+; written as (((p1 + p0) >> 1) + ((p2 + q0 + (p1 ^ p0 & 1)) >> 1) + 1) >> 1,
+; which maps to 3 pavgbs.
+;
+; pPix=%1 iStride=%2 [in:q0,out:p0]=%3 [in:q1,out:p1]=%4 bDeltaP0Q0P1P0Q1Q0=%5 bDeltaP2P0=%6 clobber=%7,%8,%9,%10 preserve_p0p1=%11 db1=%12
+%macro SSE2_DeblockLumaEq4_3x16P 12
+    movdqa   %7, %3
+    movdqa   %8, %6
+    MOVDQ    %10, [%1 + 1 * %2]                      ; p1
+    SSE2_Blend %7, %10, %8                           ; t0 = bDeltaP2P0 ? q0 : p1
+    movdqa   %8, %6
+    MOVDQ    %9, [%1 + 2 * %2]                       ; p2
+    SSE2_Blend %9, %4, %8                            ; t1 = bDeltaP2P0 ? p2 : q1
+    SSE2_AvgbFloor1 %4,  %9,   %12, %8               ; t1 = (t1 + q1) >> 1
+    SSE2_AvgbFloor1 %10, [%1], %12, %8               ; (p0 + p1) >> 1, p0 ^ p1
+    pxor     %8, %12
+    SSE2_AvgbFloor1 %7, %4, %8, %9                   ; (t0 + t1 + (p0 ^ p1 & 1)) >> 1
+    MOVDQ    %9, [%1 + 2 * %2]                       ; p2
+    SSE2_AvgbFloor1 %3, %9, %8, %4                   ; (p2 + q0 + (p0 ^ p1 & 1)) >> 1
+    pavgb    %7, %10                                 ; p0' = (p0 + p1 + t0 + t1 + 2) >> 2
+    movdqa   %8, %10
+    pxor     %8, %3                                  ; (p0 + p1) >> 1 ^ (p2 + q0 + (p0 ^ p1 & 1)) >> 1
+    pand     %8, %12                                 ; & 1
+    pavgb    %10, %3                                 ; p1' = (p0 + p1 + p2 + q0 + 2) >> 2
+    pand     %6, %5                                  ; bDeltaP2P0 &= bDeltaP0Q0P1P0Q1Q0
+%if %11
+    MOVDQ    %3, [%1 + 0 * %2]                       ; p0
+    movdqa   %4, %5
+    SSE2_Blend %7, %3, %4                            ; p0out = bDeltaP0Q0P1P0Q1Q0 ? p0' : p0
+%else
+    SSE2_Blend %7, [%1 + 0 * %2], %5                 ; p0out = bDeltaP0Q0P1P0Q1Q0 ? p0' : p0
+%endif
+    MOVDQ    [%1 + 0 * %2], %7                       ; store p0
+    add      %1, %2
+    movdqa   %7, %10
+    psubb    %10, %8                                 ; (p0 + p1 + p2 + q0) >> 2
+    psubb    %8, %12
+    MOVDQ    %4, [%1 + (3 - 1) * %2]                 ; p3
+    SSE2_AvgbFloor2 %4, %9, %8                       ; (p2 + p3 + ((p0 + p1) >> 1 ^ (p2 + q0 + (p0 ^ p1 & 1)) >> 1 & 1)) >> 1
+    pavgb    %10, %4                                 ; p2' = (((p0 + p1 + p2 + q0) >> 1) + p2 + p3 + 2) >> 2
+    movdqa   %8, %6
+    SSE2_Blend %10, [%1 + (2 - 1) * %2], %8          ; p2out = bDeltaP2P0 ? p2' : p2
+    MOVDQ    [%1 + (2 - 1) * %2], %10                ; store p2
+%if %11
+    MOVDQ    %4, [%1 + (1 - 1) * %2]                 ; p1
+    SSE2_Blend %7, %4, %6                            ; p1out = bDeltaP2P0 ? p1' : p1
+%else
+    SSE2_Blend %7, [%1 + (1 - 1) * %2], %6           ; p1out = bDeltaP2P0 ? p1' : p1
+%endif
+    MOVDQ    [%1 + (1 - 1) * %2], %7                 ; store p1
+%endmacro
+
+
+;*******************************************************************************
+;    void DeblockLumaEq4V_ssse3(uint8_t * pPix, int32_t iStride, int32_t iAlpha,
+;                                 int32_t iBeta)
+;*******************************************************************************
+
+WELS_EXTERN DeblockLumaEq4V_ssse3
+    %assign push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 10
+    SIGN_EXTENSION r1, r1d
+    movd     xmm1, arg3d
+    movd     xmm2, arg4d
+    shr      r2, 2
+    add      r2, 1
+    movd     xmm3, r2d
+    pxor     xmm4, xmm4
+    pxor     xmm1, [pic(WELS_DB127_16)]
+    pxor     xmm2, [pic(WELS_DB127_16)]
+    pshufb   xmm1, xmm4                       ; iAlpha ^ 0x7f
+    pshufb   xmm2, xmm4                       ; iBeta  ^ 0x7f
+    pshufb   xmm3, xmm4                       ; (iAlpha >> 2) + 1
+    mov      r2, r1                           ; iStride
+    neg      r1                               ; -iStride
+    lea      r3, [r0 + r1]                    ; pPix - iStride
+
+    ; Compute masks to enable/disable filtering.
+    MOVDQ    xmm7, [r3 + 1 * r1]              ; p1
+    MOVDQ    xmm6, [r3 + 0 * r1]              ; p0
+    MOVDQ    xmm0, [r0 + 0 * r2]              ; q0
+    movdqa   xmm4, xmm6
+    SSE2_AbsDiffUB xmm6, xmm0, xmm5           ; |p0 - q0|
+    SSE2_CmpgeUB xmm3, xmm6                   ; |p0 - q0| < (iAlpha >> 2) + 2
+    SSE2_CmpltUB xmm6, xmm1, [pic(WELS_DB127_16)]  ; bDeltaP0Q0 = |p0 - q0| < iAlpha
+    MOVDQ    xmm1, [r0 + 1 * r2]              ; q1
+    SSE2_AbsDiffUB xmm7, xmm4, xmm5           ; |p1 - p0|
+    SSE2_AbsDiffUB xmm0, xmm1, xmm5           ; |q1 - q0|
+    pmaxub   xmm7, xmm0                       ; max(|p1 - p0|, |q1 - q0|)
+    SSE2_CmpltUB xmm7, xmm2, [pic(WELS_DB127_16)]  ; bDeltaP1P0 & bDeltaQ1Q0 = max(|p1 - p0|, |q1 - q0|) < iBeta
+    pand     xmm6, xmm7                       ; & bDeltaP0Q0
+
+    MOVDQ    xmm7, [r3 + 2 * r1]              ; p2
+    SSE2_AbsDiffUB xmm7, xmm4, xmm5           ; |p2 - p0|
+    SSE2_CmpltUB xmm7, xmm2, [pic(WELS_DB127_16)]  ; bDeltaP2P0 = |p2 - p0| < iBeta
+    pand     xmm7, xmm3                       ; &= |p0 - q0| < (iAlpha >> 2) + 2
+
+    MOVDQ    xmm0, [r0 + 0 * r2]              ; q0
+    MOVDQ    xmm5, [r0 + 2 * r2]              ; q2
+    SSE2_AbsDiffUB xmm5, xmm0, xmm4           ; |q2 - q0|
+    SSE2_CmpltUB xmm5, xmm2, [pic(WELS_DB127_16)]  ; bDeltaQ2Q0 = |q2 - q0| < iBeta
+    pand     xmm5, xmm3                       ; &= |p0 - q0| < (iAlpha >> 2) + 2
+
+%ifdef X86_32
+    ; Push xmm5 to free up one register. Align stack so as to ensure that failed
+    ; store forwarding penalty cannot occur (up to ~50 cycles for 128-bit on IVB).
+    mov      r2, esp
+    sub      esp,  16
+    and      esp, -16
+    movdqa   [esp], xmm5
+    SSE2_DeblockLumaEq4_3x16P r3, r1, xmm0, xmm1, xmm6, xmm7, xmm2, xmm3, xmm5, xmm4, 1, [pic(WELS_DB1_16)]
+    movdqa   xmm5, [esp]
+    mov      esp, r2
+    neg      r1
+    SSE2_DeblockLumaEq4_3x16P r0, r1, xmm0, xmm1, xmm6, xmm5, xmm2, xmm3, xmm7, xmm4, 0, [pic(WELS_DB1_16)]
+%else
+    movdqa   xmm9, [WELS_DB1_16]
+    SSE2_DeblockLumaEq4_3x16P r3, r1, xmm0, xmm1, xmm6, xmm7, xmm2, xmm3, xmm8, xmm4, 1, xmm9
+    SSE2_DeblockLumaEq4_3x16P r0, r2, xmm0, xmm1, xmm6, xmm5, xmm2, xmm3, xmm7, xmm4, 0, xmm9
+%endif
+
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+; [out:p1,p0,q0,q1]=%1,%2,%3,%4 pPixCb=%5 pPixCr=%6 iStride=%7 3*iStride-1=%8 xmmclobber=%9,%10,%11
+%macro SSE2_LoadCbCr_4x16H 11
+    movd       %1,  [%5 + 0 * %7 - 2]  ; [p1,p0,q0,q1] cb line 0
+    movd       %2,  [%5 + 2 * %7 - 2]  ; [p1,p0,q0,q1] cb line 2
+    punpcklbw  %1,  %2                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cb line 0,2
+    movd       %2,  [%5 + 4 * %7 - 2]  ; [p1,p0,q0,q1] cb line 4
+    movd       %9,  [%5 + 2 * %8]      ; [p1,p0,q0,q1] cb line 6
+    punpcklbw  %2,  %9                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cb line 4,6
+    punpcklwd  %1,  %2                 ; [p1,p1,p1,p1,p0,p0,p0,p0,q0,q0,q0,q0,q1,q1,q1,q1] cb line 0,2,4,6
+    movd       %2,  [%6 + 0 * %7 - 2]  ; [p1,p0,q0,q1] cr line 0
+    movd       %9,  [%6 + 2 * %7 - 2]  ; [p1,p0,q0,q1] cr line 2
+    punpcklbw  %2,  %9                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cr line 0,2
+    movd       %9,  [%6 + 4 * %7 - 2]  ; [p1,p0,q0,q1] cr line 4
+    movd       %10, [%6 + 2 * %8]      ; [p1,p0,q0,q1] cr line 6
+    punpcklbw  %9,  %10                ; [p1,p1,p0,p0,q0,q0,q1,q1] cr line 4,6
+    punpcklwd  %2,  %9                 ; [p1,p1,p1,p1,p0,p0,p0,p0,q0,q0,q0,q0,q1,q1,q1,q1] cr line 0,2,4,6
+    add        %5,  %7                 ; pPixCb += iStride
+    add        %6,  %7                 ; pPixCr += iStride
+    movd       %9,  [%5 + 0 * %7 - 2]  ; [p1,p0,q0,q1] cb line 1
+    movd       %10, [%5 + 2 * %7 - 2]  ; [p1,p0,q0,q1] cb line 3
+    punpcklbw  %9,  %10                ; [p1,p1,p0,p0,q0,q0,q1,q1] cb line 1,3
+    movd       %10, [%5 + 4 * %7 - 2]  ; [p1,p0,q0,q1] cb line 5
+    movd       %3,  [%5 + 2 * %8]      ; [p1,p0,q0,q1] cb line 7
+    punpcklbw  %10, %3                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cb line 5,7
+    punpcklwd  %9,  %10                ; [p1,p1,p1,p1,p0,p0,p0,p0,q0,q0,q0,q0,q1,q1,q1,q1] cb line 1,3,5,7
+    movd       %10, [%6 + 0 * %7 - 2]  ; [p1,p0,q0,q1] cr line 1
+    movd       %3,  [%6 + 2 * %7 - 2]  ; [p1,p0,q0,q1] cr line 3
+    punpcklbw  %10, %3                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cr line 1,3
+    movd       %3,  [%6 + 4 * %7 - 2]  ; [p1,p0,q0,q1] cr line 5
+    movd       %4,  [%6 + 2 * %8]      ; [p1,p0,q0,q1] cr line 7
+    punpcklbw  %3,  %4                 ; [p1,p1,p0,p0,q0,q0,q1,q1] cr line 5,7
+    punpcklwd  %10, %3                 ; [p1,p1,p1,p1,p0,p0,p0,p0,q0,q0,q0,q0,q1,q1,q1,q1] cr line 1,3,5,7
+    movdqa     %3,  %1
+    punpckldq  %1,  %2                 ; [p1,p1,p1,p1,p1,p1,p1,p1,p0,p0,p0,p0,p0,p0,p0,p0] cb/cr line 0,2,4,6
+    punpckhdq  %3,  %2                 ; [q0,q0,q0,q0,q0,q0,q0,q0,q1,q1,q1,q1,q1,q1,q1,q1] cb/cr line 0,2,4,6
+    movdqa     %11, %9
+    punpckldq  %9,  %10                ; [p1,p1,p1,p1,p1,p1,p1,p1,p0,p0,p0,p0,p0,p0,p0,p0] cb/cr line 1,3,5,7
+    punpckhdq  %11, %10                ; [q0,q0,q0,q0,q0,q0,q0,q0,q1,q1,q1,q1,q1,q1,q1,q1] cb/cr line 1,3,5,7
+    movdqa     %2,  %1
+    punpcklqdq %1,  %9                 ; [p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1,p1] cb/cr line 0,2,4,6,1,3,5,7
+    punpckhqdq %2,  %9                 ; [p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0,p0] cb/cr line 0,2,4,6,1,3,5,7
+    movdqa     %4,  %3
+    punpcklqdq %3,  %11                ; [q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0,q0] cb/cr line 0,2,4,6,1,3,5,7
+    punpckhqdq %4,  %11                ; [q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1,q1] cb/cr line 0,2,4,6,1,3,5,7
+%endmacro
+
+; pPixCb+iStride=%1 pPixCr+iStride=%2 iStride=%3 3*iStride-1=%4 p0=%5 q0=%6 rclobber=%7 dwclobber={%8,%9} xmmclobber=%10
+%macro SSE2_StoreCbCr_4x16H 10
+    movdqa     %10, %5
+    punpcklbw  %10, %6                 ; [p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0] cb/cr line 0,2,4,6
+    punpckhbw  %5, %6                  ; [p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0] cb/cr line 1,3,5,7
+    mov        %7, r7                  ; preserve stack pointer
+    and        r7, -16                 ; align stack pointer
+    sub        r7, 32                  ; allocate stack space
+    movdqa     [r7     ], %10          ; store [p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0] cb/cr line 0,2,4,6 on the stack
+    movdqa     [r7 + 16], %5           ; store [p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0,p0,q0] cb/cr line 1,3,5,7 on the stack
+    mov        %8, [r7 + 16]           ; [p0,q0,p0,q0] cb line 1,3
+    mov        [%1 + 0 * %3 - 1], %9   ; store [p0,q0] cb line 1
+    shr        %8, 16                  ; [p0,q0] cb line 3
+    mov        [%1 + 2 * %3 - 1], %9   ; store [p0,q0] cb line 3
+    mov        %8, [r7 + 20]           ; [p0,q0,p0,q0] cb line 5,7
+    mov        [%1 + 4 * %3 - 1], %9   ; store [p0,q0] cb line 5
+    shr        %8, 16                  ; [p0,q0] cb line 7
+    mov        [%1 + 2 * %4 + 1], %9   ; store [p0,q0] cb line 7
+    mov        %8, [r7 + 24]           ; [p0,q0,p0,q0] cr line 1,3
+    mov        [%2 + 0 * %3 - 1], %9   ; store [p0,q0] cr line 1
+    shr        %8, 16                  ; [p0,q0] cr line 3
+    mov        [%2 + 2 * %3 - 1], %9   ; store [p0,q0] cr line 3
+    mov        %8, [r7 + 28]           ; [p0,q0,p0,q0] cr line 5,7
+    mov        [%2 + 4 * %3 - 1], %9   ; store [p0,q0] cr line 5
+    shr        %8, 16                  ; [p0,q0] cr line 7
+    mov        [%2 + 2 * %4 + 1], %9   ; store [p0,q0] cr line 7
+    sub        %1, %3                  ; pPixCb -= iStride
+    sub        %2, %3                  ; pPixCr -= iStride
+    mov        %8, [r7     ]           ; [p0,q0,p0,q0] cb line 0,2
+    mov        [%1 + 0 * %3 - 1], %9   ; store [p0,q0] cb line 0
+    shr        %8, 16                  ; [p0,q0] cb line 2
+    mov        [%1 + 2 * %3 - 1], %9   ; store [p0,q0] cb line 2
+    mov        %8, [r7 +  4]           ; [p0,q0,p0,q0] cb line 4,6
+    mov        [%1 + 4 * %3 - 1], %9   ; store [p0,q0] cb line 4
+    shr        %8, 16                  ; [p0,q0] cb line 6
+    mov        [%1 + 2 * %4 + 1], %9   ; store [p0,q0] cb line 6
+    mov        %8, [r7 +  8]           ; [p0,q0,p0,q0] cr line 0,2
+    mov        [%2 + 0 * %3 - 1], %9   ; store [p0,q0] cr line 0
+    shr        %8, 16                  ; [p0,q0] cr line 2
+    mov        [%2 + 2 * %3 - 1], %9   ; store [p0,q0] cr line 2
+    mov        %8, [r7 + 12]           ; [p0,q0,p0,q0] cr line 4,6
+    mov        [%2 + 4 * %3 - 1], %9   ; store [p0,q0] cr line 4
+    shr        %8, 16                  ; [p0,q0] cr line 6
+    mov        [%2 + 2 * %4 + 1], %9   ; store [p0,q0] cr line 6
+    mov        r7, %7                  ; restore stack pointer
+%endmacro
+
+; p1=%1 p0=%2 q0=%3 q1=%4 iAlpha=%5 iBeta=%6 pTC=%7 xmmclobber=%8,%9,%10 interleaveTC=%11
+%macro SSSE3_DeblockChromaLt4 11
+    movdqa     %8, %3
+    SSE2_AbsDiffUB %8, %2, %9           ; |p0 - q0|
+    SSE2_CmpgeUB %8, %5                 ; !bDeltaP0Q0 = |p0 - q0| >= iAlpha
+    movdqa     %9, %4
+    SSE2_AbsDiffUB %9, %3, %5           ; |q1 - q0|
+    movdqa     %10, %1
+    SSE2_AbsDiffUB %10, %2, %5          ; |p1 - p0|
+    pmaxub     %9, %10                  ; max(|q1 - q0|, |p1 - p0|)
+    pxor       %10, %10
+    movd       %5, %6
+    pshufb     %5, %10                  ; iBeta
+    SSE2_CmpgeUB %9, %5                 ; !bDeltaQ1Q0 | !bDeltaP1P0 = max(|q1 - q0|, |p1 - p0|) >= iBeta
+    por        %8, %9                   ; | !bDeltaP0Q0
+    movd       %5, [%7]
+%if %11
+    punpckldq  %5, %5
+    punpcklbw  %5, %5                   ; iTc
+%else
+    pshufd     %5, %5, 0                ; iTc
+%endif
+    pcmpeqw    %10, %10                 ; FFh
+    movdqa     %9, %5
+    pcmpgtb    %9, %10                  ; iTc > -1 ? FFh : 00h
+    pandn      %8, %5                   ; iTc & bDeltaP0Q0 & bDeltaP1P0 & bDeltaQ1Q0
+    pand       %8, %9                   ; &= (iTc > -1 ? FFh : 00h)
+    SSE2_DeblockP0Q0_Lt4 %1, %2, %3, %4, %8, %10, %5, %9
+%endmacro
+
+; p1=%1 p0=%2 q0=%3 q1=%4 iAlpha=%5 iBeta=%6 xmmclobber=%7,%8,%9
+%macro SSSE3_DeblockChromaEq4 9
+    movdqa   %7, %3
+    SSE2_AbsDiffUB %7, %2, %8         ; |p0 - q0|
+    SSE2_CmpgeUB %7, %5               ; !bDeltaP0Q0 = |p0 - q0| >= iAlpha
+    movdqa   %8, %4
+    SSE2_AbsDiffUB %8, %3, %5         ; |q1 - q0|
+    movdqa   %9, %1
+    SSE2_AbsDiffUB %9, %2, %5         ; |p1 - p0|
+    pmaxub   %8, %9                   ; max(|q1 - q0|, |p1 - p0|)
+    pxor     %9, %9
+    movd     %5, %6
+    pshufb   %5, %9                   ; iBeta
+    SSE2_CmpgeUB %8, %5               ; !bDeltaQ1Q0 | !bDeltaP1P0 = max(|q1 - q0|, |p1 - p0|) >= iBeta
+    por      %7, %8                   ; !bDeltaP0Q0P1P0Q1Q0 = !bDeltaP0Q0 | !bDeltaQ1Q0 | !bDeltaP1P0
+    WELS_DB1 %5
+    movdqa   %8, %2
+    SSE2_AvgbFloor1 %8, %4, %5, %9    ; (p0 + q1) >> 1
+    pavgb    %8, %1                   ; p0' = (p1 + ((p0 + q1) >> 1) + 1) >> 1
+    movdqa   %9, %7
+    SSE2_Blend %2, %8, %7             ; p0out = bDeltaP0Q0P1P0Q1Q0 ? p0' : p0
+    SSE2_AvgbFloor1 %1, %3, %5, %7    ; (q0 + p1) >> 1
+    pavgb    %1, %4                   ; q0' = (q1 + ((q0 + p1) >> 1) + 1) >> 1
+    SSE2_Blend %3, %1, %9             ; q0out = bDeltaP0Q0P1P0Q1Q0 ? q0' : q0
+%endmacro
+
+
+;******************************************************************************
+; void DeblockChromaLt4V_ssse3(uint8_t * pPixCb, uint8_t * pPixCr, int32_t iStride,
+;                           int32_t iAlpha, int32_t iBeta, int8_t * pTC);
+;*******************************************************************************
+
+WELS_EXTERN DeblockChromaLt4V_ssse3
+    %assign push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    movd     xmm7, arg4d
+    pxor     xmm0, xmm0
+    pshufb   xmm7, xmm0                       ; iAlpha
+    mov      r3, r2
+    neg      r3                               ; -iStride
+
+    movq     xmm0, [r0 + 0 * r2]              ; q0 cb
+    movhps   xmm0, [r1 + 0 * r2]              ; q0 cr
+    movq     xmm2, [r0 + 1 * r3]              ; p0 cb
+    movhps   xmm2, [r1 + 1 * r3]              ; p0 cr
+    movq     xmm1, [r0 + 1 * r2]              ; q1 cb
+    movhps   xmm1, [r1 + 1 * r2]              ; q1 cr
+    movq     xmm3, [r0 + 2 * r3]              ; p1 cb
+    movhps   xmm3, [r1 + 2 * r3]              ; p1 cr
+
+%ifidni arg6, r5
+    SSSE3_DeblockChromaLt4 xmm3, xmm2, xmm0, xmm1, xmm7, arg5d, arg6, xmm4, xmm5, xmm6, 1
+%else
+    mov      r2, arg6
+    SSSE3_DeblockChromaLt4 xmm3, xmm2, xmm0, xmm1, xmm7, arg5d, r2,   xmm4, xmm5, xmm6, 1
+%endif
+
+    movlps   [r0 + 1 * r3], xmm2              ; store p0 cb
+    movhps   [r1 + 1 * r3], xmm2              ; store p0 cr
+    movlps   [r0         ], xmm0              ; store q0 cb
+    movhps   [r1         ], xmm0              ; store q0 cr
+
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+;********************************************************************************
+;  void DeblockChromaEq4V_ssse3(uint8_t * pPixCb, uint8_t * pPixCr, int32_t iStride,
+;                             int32_t iAlpha, int32_t iBeta)
+;********************************************************************************
+
+WELS_EXTERN DeblockChromaEq4V_ssse3
+    %assign push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    movd     xmm7, arg4d
+    pxor     xmm0, xmm0
+    pshufb   xmm7, xmm0                       ; iAlpha
+    mov      r3, r2
+    neg      r3                               ; -iStride
+
+    movq     xmm0, [r0 + 0 * r2]              ; q0 cb
+    movhps   xmm0, [r1 + 0 * r2]              ; q0 cr
+    movq     xmm2, [r0 + 1 * r3]              ; p0 cb
+    movhps   xmm2, [r1 + 1 * r3]              ; p0 cr
+    movq     xmm1, [r0 + 1 * r2]              ; q1 cb
+    movhps   xmm1, [r1 + 1 * r2]              ; q1 cr
+    movq     xmm3, [r0 + 2 * r3]              ; p1 cb
+    movhps   xmm3, [r1 + 2 * r3]              ; p1 cr
+
+    SSSE3_DeblockChromaEq4 xmm3, xmm2, xmm0, xmm1, xmm7, arg5d, xmm4, xmm5, xmm6
+
+    movlps   [r0 + 1 * r3], xmm2              ; store p0 cb
+    movhps   [r1 + 1 * r3], xmm2              ; store p0 cr
+    movlps   [r0 + 0 * r2], xmm0              ; store q0 cb
+    movhps   [r1 + 0 * r2], xmm0              ; store q0 cr
+
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+
+;*******************************************************************************
+;    void DeblockChromaLt4H_ssse3(uint8_t * pPixCb, uint8_t * pPixCr, int32_t iStride,
+;                                int32_t iAlpha, int32_t iBeta, int8_t * pTC);
+;*******************************************************************************
+
+WELS_EXTERN DeblockChromaLt4H_ssse3
+    %assign push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    movd       xmm7, arg4d
+    pxor       xmm0, xmm0
+    pshufb     xmm7, xmm0                       ; iAlpha
+    lea        r3, [3 * r2 - 1]                 ; 3 * iStride - 1
+
+    SSE2_LoadCbCr_4x16H xmm0, xmm1, xmm4, xmm5, r0, r1, r2, r3, xmm2, xmm3, xmm6
+    INIT_X86_32_PIC r1
+    SSSE3_DeblockChromaLt4 xmm0, xmm1, xmm4, xmm5, xmm7, arg5d, r5, xmm2, xmm3, xmm6, 0
+    DEINIT_X86_32_PIC
+    SSE2_StoreCbCr_4x16H r0, r1, r2, r3, xmm1, xmm4, r5, r4d, r4w, xmm0
+
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+
+;***************************************************************************
+;  void DeblockChromaEq4H_ssse3(uint8_t * pPixCb, uint8_t * pPixCr, int32_t iStride,
+;          int32_t iAlpha, int32_t iBeta)
+;***************************************************************************
+
+WELS_EXTERN DeblockChromaEq4H_ssse3
+    %assign push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    movd       xmm7, arg4d
+    pxor       xmm0, xmm0
+    pshufb     xmm7, xmm0                       ; iAlpha
+    lea        r3, [3 * r2 - 1]                 ; 3 * iStride - 1
+
+    SSE2_LoadCbCr_4x16H xmm0, xmm1, xmm4, xmm5, r0, r1, r2, r3, xmm2, xmm3, xmm6
+    SSSE3_DeblockChromaEq4 xmm0, xmm1, xmm4, xmm5, xmm7, arg5d, xmm2, xmm3, xmm6
+%ifdef X86_32
+    push r4
+    push r5
+    SSE2_StoreCbCr_4x16H r0, r1, r2, r3, xmm1, xmm4, r5, r4d, r4w, xmm0
+    pop r5
+    pop r4
+%else
+    SSE2_StoreCbCr_4x16H r0, r1, r2, r3, xmm1, xmm4, r5, r4d, r4w, xmm0
+%endif
+
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+
+;********************************************************************************
+;
+;   void DeblockLumaTransposeH2V_sse2(uint8_t * pPixY, int32_t iStride, uint8_t * pDst);
+;
+;********************************************************************************
+
+WELS_EXTERN DeblockLumaTransposeH2V_sse2
+    push     r3
+    push     r4
+    push     r5
+
+%assign   push_num   3
+    LOAD_3_PARA
+    PUSH_XMM 8
+
+    SIGN_EXTENSION   r1, r1d
+
+    mov      r5,    r7
+    mov      r3,    r7
+    and      r3,    0Fh
+    sub      r7,    r3
+    sub      r7,    10h
+
+    lea      r3,    [r0 + r1 * 8]
+    lea      r4,    [r1 * 3]
+
+    movq    xmm0,  [r0]
+    movq    xmm7,  [r3]
+    punpcklqdq   xmm0,  xmm7
+    movq    xmm1,  [r0 + r1]
+    movq    xmm7,  [r3 + r1]
+    punpcklqdq   xmm1,  xmm7
+    movq    xmm2,  [r0 + r1*2]
+    movq    xmm7,  [r3 + r1*2]
+    punpcklqdq   xmm2,  xmm7
+    movq    xmm3,  [r0 + r4]
+    movq    xmm7,  [r3 + r4]
+    punpcklqdq   xmm3,  xmm7
+
+    lea     r0,   [r0 + r1 * 4]
+    lea     r3,   [r3 + r1 * 4]
+    movq    xmm4,  [r0]
+    movq    xmm7,  [r3]
+    punpcklqdq   xmm4,  xmm7
+    movq    xmm5,  [r0 + r1]
+    movq    xmm7,  [r3 + r1]
+    punpcklqdq   xmm5,  xmm7
+    movq    xmm6,  [r0 + r1*2]
+    movq    xmm7,  [r3 + r1*2]
+    punpcklqdq   xmm6,  xmm7
+
+    movdqa  [r7],   xmm0
+    movq    xmm7,  [r0 + r4]
+    movq    xmm0,  [r3 + r4]
+    punpcklqdq   xmm7,  xmm0
+    movdqa  xmm0,   [r7]
+
+    SSE2_TransTwo8x8B  xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r7]
+    ;pOut: m5, m3, m4, m8, m6, m2, m7, m1
+
+    movdqa  [r2],    xmm4
+    movdqa  [r2 + 10h],  xmm2
+    movdqa  [r2 + 20h],  xmm3
+    movdqa  [r2 + 30h],  xmm7
+    movdqa  [r2 + 40h],  xmm5
+    movdqa  [r2 + 50h],  xmm1
+    movdqa  [r2 + 60h],  xmm6
+    movdqa  [r2 + 70h],  xmm0
+
+    mov     r7,   r5
+    POP_XMM
+    pop     r5
+    pop     r4
+    pop     r3
+    ret
+
+
+;*******************************************************************************************
+;
+;   void DeblockLumaTransposeV2H_sse2(uint8_t * pPixY, int32_t iStride, uint8_t * pSrc);
+;
+;*******************************************************************************************
+
+WELS_EXTERN DeblockLumaTransposeV2H_sse2
+    push     r3
+    push     r4
+
+%assign  push_num 2
+    LOAD_3_PARA
+    PUSH_XMM 8
+
+    SIGN_EXTENSION   r1, r1d
+
+    mov      r4,    r7
+    mov      r3,    r7
+    and      r3,    0Fh
+    sub      r7,    r3
+    sub      r7,    10h
+
+    movdqa   xmm0,   [r2]
+    movdqa   xmm1,   [r2 + 10h]
+    movdqa   xmm2,   [r2 + 20h]
+    movdqa   xmm3,   [r2 + 30h]
+    movdqa   xmm4,   [r2 + 40h]
+    movdqa   xmm5,   [r2 + 50h]
+    movdqa   xmm6,   [r2 + 60h]
+    movdqa   xmm7,   [r2 + 70h]
+
+    SSE2_TransTwo8x8B  xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r7]
+    ;pOut: m5, m3, m4, m8, m6, m2, m7, m1
+
+    lea      r2,   [r1 * 3]
+
+    movq     [r0],  xmm4
+    movq     [r0 + r1],  xmm2
+    movq     [r0 + r1*2],  xmm3
+    movq     [r0 + r2],  xmm7
+
+    lea      r0,   [r0 + r1*4]
+    movq     [r0],  xmm5
+    movq     [r0 + r1],  xmm1
+    movq     [r0 + r1*2],  xmm6
+    movq     [r0 + r2],  xmm0
+
+    psrldq    xmm4,   8
+    psrldq    xmm2,   8
+    psrldq    xmm3,   8
+    psrldq    xmm7,   8
+    psrldq    xmm5,   8
+    psrldq    xmm1,   8
+    psrldq    xmm6,   8
+    psrldq    xmm0,   8
+
+    lea       r0,  [r0 + r1*4]
+    movq     [r0],  xmm4
+    movq     [r0 + r1],  xmm2
+    movq     [r0 + r1*2],  xmm3
+    movq     [r0 + r2],  xmm7
+
+    lea      r0,   [r0 + r1*4]
+    movq     [r0],  xmm5
+    movq     [r0 + r1],  xmm1
+    movq     [r0 + r1*2],  xmm6
+    movq     [r0 + r2],  xmm0
+
+
+    mov      r7,   r4
+    POP_XMM
+    pop      r4
+    pop      r3
+    ret
+
+WELS_EXTERN WelsNonZeroCount_sse2
+    %assign  push_num 0
+    LOAD_1_PARA
+    movdqu  xmm0, [r0]
+    movq    xmm1, [r0+16]
+    WELS_DB1 xmm2
+    pminub  xmm0, xmm2
+    pminub  xmm1, xmm2
+    movdqu  [r0], xmm0
+    movq    [r0+16], xmm1
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/expand_picture.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/expand_picture.asm
new file mode 100644
index 0000000000..a3402bbe3e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/expand_picture.asm
@@ -0,0 +1,728 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  expand_picture.asm
+;*
+;*  Abstract
+;*      mmxext/sse for expand_frame
+;*
+;*  History
+;*      09/25/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+
+
+;***********************************************************************
+; Macros and other preprocessor constants
+;***********************************************************************
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+
+
+SECTION .text
+
+
+;;;;;;;expanding result;;;;;;;
+
+;aaaa|attttttttttttttttb|bbbb
+;aaaa|attttttttttttttttb|bbbb
+;aaaa|attttttttttttttttb|bbbb
+;aaaa|attttttttttttttttb|bbbb
+;----------------------------
+;aaaa|attttttttttttttttb|bbbb
+;llll|l                r|rrrr
+;llll|l                r|rrrr
+;llll|l                r|rrrr
+;llll|l                r|rrrr
+;llll|l                r|rrrr
+;cccc|ceeeeeeeeeeeeeeeed|dddd
+;----------------------------
+;cccc|ceeeeeeeeeeeeeeeed|dddd
+;cccc|ceeeeeeeeeeeeeeeed|dddd
+;cccc|ceeeeeeeeeeeeeeeed|dddd
+;cccc|ceeeeeeeeeeeeeeeed|dddd
+
+%macro mov_line_8x4_mmx     3   ; dst, stride, mm?
+    movq [%1], %3
+    movq [%1+%2], %3
+    lea %1, [%1+2*%2]
+    movq [%1], %3
+    movq [%1+%2], %3
+    lea %1, [%1+2*%2]
+%endmacro
+
+%macro mov_line_end8x4_mmx      3   ; dst, stride, mm?
+    movq [%1], %3
+    movq [%1+%2], %3
+    lea %1, [%1+2*%2]
+    movq [%1], %3
+    movq [%1+%2], %3
+    lea %1, [%1+%2]
+%endmacro
+
+%macro mov_line_16x4_sse2   4   ; dst, stride, xmm?, u/a
+    movdq%4 [%1], %3        ; top(bottom)_0
+    movdq%4 [%1+%2], %3     ; top(bottom)_1
+    lea %1, [%1+2*%2]
+    movdq%4 [%1], %3        ; top(bottom)_2
+    movdq%4 [%1+%2], %3     ; top(bottom)_3
+    lea %1, [%1+2*%2]
+%endmacro
+
+%macro mov_line_end16x4_sse2    4   ; dst, stride, xmm?, u/a
+    movdq%4 [%1], %3        ; top(bottom)_0
+    movdq%4 [%1+%2], %3     ; top(bottom)_1
+    lea %1, [%1+2*%2]
+    movdq%4 [%1], %3        ; top(bottom)_2
+    movdq%4 [%1+%2], %3     ; top(bottom)_3
+    lea %1, [%1+%2]
+%endmacro
+
+%macro mov_line_32x4_sse2   3   ; dst, stride, xmm?
+    movdqa [%1], %3         ; top(bottom)_0
+    movdqa [%1+16], %3      ; top(bottom)_0
+    movdqa [%1+%2], %3      ; top(bottom)_1
+    movdqa [%1+%2+16], %3       ; top(bottom)_1
+    lea %1, [%1+2*%2]
+    movdqa [%1], %3         ; top(bottom)_2
+    movdqa [%1+16], %3      ; top(bottom)_2
+    movdqa [%1+%2], %3      ; top(bottom)_3
+    movdqa [%1+%2+16], %3       ; top(bottom)_3
+    lea %1, [%1+2*%2]
+%endmacro
+
+%macro mov_line_end32x4_sse2    3   ; dst, stride, xmm?
+    movdqa [%1], %3         ; top(bottom)_0
+    movdqa [%1+16], %3      ; top(bottom)_0
+    movdqa [%1+%2], %3      ; top(bottom)_1
+    movdqa [%1+%2+16], %3       ; top(bottom)_1
+    lea %1, [%1+2*%2]
+    movdqa [%1], %3         ; top(bottom)_2
+    movdqa [%1+16], %3      ; top(bottom)_2
+    movdqa [%1+%2], %3      ; top(bottom)_3
+    movdqa [%1+%2+16], %3       ; top(bottom)_3
+    lea %1, [%1+%2]
+%endmacro
+
+%macro exp_top_bottom_sse2  1   ; iPaddingSize [luma(32)/chroma(16)]
+    ;r2 [width/16(8)]
+    ;r0 [pSrc +0], r5 [pSrc -width] r1[-stride], 32(16) ;top
+    ;r3 [pSrc +(h-1)*stride], r4 [pSrc + (h+31)*stride],32(16); bottom
+
+%if %1 == 32        ; for luma
+    sar r2, 04h     ; width / 16(8) pixels
+.top_bottom_loops:
+    ; top
+    movdqa xmm0, [r0]       ; first line of picture pData
+    mov_line_16x4_sse2 r5, r1, xmm0, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_16x4_sse2 r5, r1, xmm0, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_end16x4_sse2 r5, r1, xmm0, a
+
+    ; bottom
+    movdqa xmm1, [r3]       ; last line of picture pData
+    mov_line_16x4_sse2 r4, r1, xmm1, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_16x4_sse2 r4, r1, xmm1, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_end16x4_sse2 r4, r1, xmm1, a
+
+    lea r0, [r0+16]     ; top pSrc
+    lea r5, [r5+16]     ; top dst
+    lea r3, [r3+16]     ; bottom pSrc
+    lea r4, [r4+16]     ; bottom dst
+    neg r1          ; positive/negative stride need for next loop?
+
+    dec r2
+    jnz near .top_bottom_loops
+%elif %1 == 16  ; for chroma ??
+    mov r6, r2
+    sar r2, 04h     ; (width / 16) pixels
+.top_bottom_loops:
+    ; top
+    movdqa xmm0, [r0]       ; first line of picture pData
+    mov_line_16x4_sse2 r5, r1, xmm0, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_16x4_sse2 r5, r1, xmm0, a
+    mov_line_end16x4_sse2 r5, r1, xmm0, a
+
+    ; bottom
+    movdqa xmm1, [r3]       ; last line of picture pData
+    mov_line_16x4_sse2 r4, r1, xmm1, a  ; dst, stride, xmm?
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_16x4_sse2 r4, r1, xmm1, a
+    mov_line_end16x4_sse2 r4, r1, xmm1, a
+
+    lea r0, [r0+16]     ; top pSrc
+    lea r5, [r5+16]     ; top dst
+    lea r3, [r3+16]     ; bottom pSrc
+    lea r4, [r4+16]     ; bottom dst
+    neg r1          ; positive/negative stride need for next loop?
+
+    dec r2
+    jnz near .top_bottom_loops
+
+    ; for remaining 8 bytes
+    and r6, 0fh     ; any 8 bytes left?
+    test r6, r6
+    jz near .to_be_continued    ; no left to exit here
+
+    ; top
+    movq mm0, [r0]      ; remained 8 byte
+    mov_line_8x4_mmx r5, r1, mm0    ; dst, stride, mm?
+    mov_line_8x4_mmx r5, r1, mm0    ; dst, stride, mm?
+    mov_line_8x4_mmx r5, r1, mm0    ; dst, stride, mm?
+    mov_line_end8x4_mmx r5, r1, mm0 ; dst, stride, mm?
+    ; bottom
+    movq mm1, [r3]
+    mov_line_8x4_mmx r4, r1, mm1    ; dst, stride, mm?
+    mov_line_8x4_mmx r4, r1, mm1    ; dst, stride, mm?
+    mov_line_8x4_mmx r4, r1, mm1    ; dst, stride, mm?
+    mov_line_end8x4_mmx r4, r1, mm1 ; dst, stride, mm?
+    WELSEMMS
+
+.to_be_continued:
+%endif
+%endmacro
+
+%macro exp_left_right_sse2  2   ; iPaddingSize [luma(32)/chroma(16)], u/a
+    ;r6 [height]
+    ;r0 [pSrc+0]  r5[pSrc-32] r1[stride]
+    ;r3 [pSrc+(w-1)] r4[pSrc+w]
+
+%if %1 == 32        ; for luma
+.left_right_loops:
+    ; left
+    movzx r2d, byte [r0]        ; pixel pData for left border
+    SSE2_Copy16Times    xmm0, r2d               ; dst, tmp, pSrc [generic register name: a/b/c/d]
+    movdqa [r5], xmm0
+    movdqa [r5+16], xmm0
+
+    ; right
+    movzx r2d, byte [r3]
+    SSE2_Copy16Times    xmm1, r2d               ; dst, tmp, pSrc [generic register name: a/b/c/d]
+    movdqa [r4], xmm1
+    movdqa [r4+16], xmm1
+
+    lea r0, [r0+r1]     ; left pSrc
+    lea r5, [r5+r1]     ; left dst
+    lea r3, [r3+r1]     ; right pSrc
+    lea r4, [r4+r1]     ; right dst
+
+    dec r6
+    jnz near .left_right_loops
+%elif %1 == 16  ; for chroma ??
+.left_right_loops:
+    ; left
+    movzx r2d, byte [r0]        ; pixel pData for left border
+    SSE2_Copy16Times    xmm0, r2d               ; dst, tmp, pSrc [generic register name: a/b/c/d]
+    movdqa [r5], xmm0
+
+    ; right
+    movzx r2d, byte [r3]
+    SSE2_Copy16Times    xmm1, r2d               ; dst, tmp, pSrc [generic register name: a/b/c/d]
+    movdq%2 [r4], xmm1                              ; might not be aligned 16 bytes in case chroma planes
+
+    lea r0, [r0+r1]     ; left pSrc
+    lea r5, [r5+r1]     ; left dst
+    lea r3, [r3+r1]     ; right pSrc
+    lea r4, [r4+r1]     ; right dst
+
+    dec r6
+    jnz near .left_right_loops
+%endif
+%endmacro
+
+%macro exp_cross_sse2   2   ; iPaddingSize [luma(32)/chroma(16)], u/a
+    ; top-left: (x)mm3, top-right: (x)mm4, bottom-left: (x)mm5, bottom-right: (x)mm6
+    ; edi: TL, ebp: TR, eax: BL, ebx: BR, ecx, -stride
+    ;r3:TL ,r4:TR,r5:BL,r6:BR r1:-stride
+%if %1 == 32        ; luma
+    ; TL
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r3, r1, xmm3    ; dst, stride, xmm?
+    mov_line_end32x4_sse2   r3, r1, xmm3    ; dst, stride, xmm?
+
+    ; TR
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r4, r1, xmm4    ; dst, stride, xmm?
+    mov_line_end32x4_sse2   r4, r1, xmm4    ; dst, stride, xmm?
+
+    ; BL
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r5, r1, xmm5    ; dst, stride, xmm?
+    mov_line_end32x4_sse2   r5, r1, xmm5    ; dst, stride, xmm?
+
+    ; BR
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_32x4_sse2  r6, r1, xmm6    ; dst, stride, xmm?
+    mov_line_end32x4_sse2   r6, r1, xmm6    ; dst, stride, xmm?
+%elif %1 == 16  ; chroma
+    ; TL
+    mov_line_16x4_sse2  r3, r1, xmm3, a ; dst, stride, xmm?
+    mov_line_16x4_sse2  r3, r1, xmm3, a ; dst, stride, xmm?
+    mov_line_16x4_sse2  r3, r1, xmm3, a ; dst, stride, xmm?
+    mov_line_end16x4_sse2   r3, r1, xmm3, a ; dst, stride, xmm?
+
+    ; TR
+    mov_line_16x4_sse2  r4, r1, xmm4, %2    ; dst, stride, xmm?
+    mov_line_16x4_sse2  r4, r1, xmm4, %2    ; dst, stride, xmm?
+    mov_line_16x4_sse2  r4, r1, xmm4, %2    ; dst, stride, xmm?
+    mov_line_end16x4_sse2 r4, r1, xmm4, %2  ; dst, stride, xmm?
+
+    ; BL
+    mov_line_16x4_sse2  r5, r1, xmm5, a ; dst, stride, xmm?
+    mov_line_16x4_sse2  r5, r1, xmm5, a ; dst, stride, xmm?
+    mov_line_16x4_sse2  r5, r1, xmm5, a ; dst, stride, xmm?
+    mov_line_end16x4_sse2   r5, r1, xmm5, a ; dst, stride, xmm?
+
+    ; BR
+    mov_line_16x4_sse2  r6, r1, xmm6, %2    ; dst, stride, xmm?
+    mov_line_16x4_sse2  r6, r1, xmm6, %2    ; dst, stride, xmm?
+    mov_line_16x4_sse2  r6, r1, xmm6, %2    ; dst, stride, xmm?
+    mov_line_end16x4_sse2   r6, r1, xmm6, %2    ; dst, stride, xmm?
+%endif
+%endmacro
+
+;***********************************************************************----------------
+; void ExpandPictureLuma_sse2(  uint8_t *pDst,
+;                                   const int32_t iStride,
+;                                   const int32_t iWidth,
+;                                   const int32_t iHeight   );
+;***********************************************************************----------------
+WELS_EXTERN ExpandPictureLuma_sse2
+
+    push r4
+    push r5
+    push r6
+
+    %assign push_num 3
+    LOAD_4_PARA
+    PUSH_XMM 7
+
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+
+    ;also prepare for cross border pData top-left:xmm3
+
+    movzx r6d,byte[r0]
+    SSE2_Copy16Times xmm3,r6d         ;xmm3: pSrc[0]
+
+    neg r1
+    lea r5,[r0+r1]              ;last line of top border r5= dst top  pSrc[-stride]
+    neg r1
+
+    push r3
+
+
+    dec r3                      ;h-1
+    imul r3,r1                  ;(h-1)*stride
+    lea  r3,[r0+r3]             ;pSrc[(h-1)*stride]  r3 = src bottom
+
+    mov r6,r1                    ;r6 = stride
+    sal r6,05h                   ;r6 = 32*stride
+    lea r4,[r3+r6]               ;r4 = dst bottom
+
+    ;also prepare for cross border data: bottom-left with xmm5,bottom-right xmm6
+
+    movzx r6d,byte [r3]             ;bottom-left
+    SSE2_Copy16Times xmm5,r6d
+
+    lea r6,[r3+r2-1]
+    movzx r6d,byte [r6]
+    SSE2_Copy16Times xmm6,r6d ;bottom-right
+
+    neg r1  ;r1 = -stride
+
+    push r0
+    push r1
+    push r2
+
+    exp_top_bottom_sse2 32
+
+    ; for both left and right border
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+    pop r2
+    pop r1
+    pop r0
+
+    lea r5,[r0-32]                          ;left border dst  luma =32 chroma = -16
+
+    lea r3,[r0+r2-1]                        ;right border src
+    lea r4,[r3+1]                           ;right border dst
+
+    ;prepare for cross border data: top-rigth with xmm4
+    movzx r6d,byte [r3]                         ;top -rigth
+    SSE2_Copy16Times xmm4,r6d
+
+    neg r1   ;r1 = stride
+
+
+    pop r6  ;  r6 = height
+
+
+
+    push r0
+    push r1
+    push r2
+    push r6
+
+    exp_left_right_sse2  32,a
+
+    pop r6
+    pop r2
+    pop r1
+    pop r0
+
+    ; for cross border [top-left, top-right, bottom-left, bottom-right]
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ; have done xmm3,..,xmm6 cross pData initialization above, perform pading as below, To be continued..
+
+    neg r1  ;r1 = -stride
+    lea r3,[r0-32]
+    lea r3,[r3+r1]    ;last line of top-left border
+
+    lea r4,[r0+r2]    ;psrc +width
+    lea r4,[r4+r1]    ;psrc +width -stride
+
+
+    neg r1  ;r1 = stride
+    add r6,32         ;height +32(16) ,luma = 32, chroma = 16
+    imul r6,r1
+
+    lea r5,[r3+r6]    ;last line of bottom-left border
+    lea r6,[r4+r6]    ;last line of botoom-right border
+
+    neg r1 ; r1 = -stride
+
+    ; for left & right border expanding
+    exp_cross_sse2 32,a
+
+    POP_XMM
+    LOAD_4_PARA_POP
+
+    pop r6
+    pop r5
+    pop r4
+
+    %assign push_num 0
+
+
+    ret
+
+;***********************************************************************----------------
+; void ExpandPictureChromaAlign_sse2(   uint8_t *pDst,
+;                                       const int32_t iStride,
+;                                       const int32_t iWidth,
+;                                       const int32_t iHeight   );
+;***********************************************************************----------------
+WELS_EXTERN ExpandPictureChromaAlign_sse2
+
+    push r4
+    push r5
+    push r6
+
+    %assign push_num 3
+    LOAD_4_PARA
+    PUSH_XMM 7
+
+    SIGN_EXTENSION r1,r1d
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+
+    ;also prepare for cross border pData top-left:xmm3
+
+    movzx r6d,byte [r0]
+    SSE2_Copy16Times xmm3,r6d         ;xmm3: pSrc[0]
+
+    neg r1
+    lea r5,[r0+r1]              ;last line of top border r5= dst top  pSrc[-stride]
+    neg r1
+
+    push r3
+
+
+    dec r3                      ;h-1
+    imul r3,r1                  ;(h-1)*stride
+    lea  r3,[r0+r3]             ;pSrc[(h-1)*stride]  r3 = src bottom
+
+    mov r6,r1                    ;r6 = stride
+    sal r6,04h                   ;r6 = 32*stride
+    lea r4,[r3+r6]               ;r4 = dst bottom
+
+    ;also prepare for cross border data: bottom-left with xmm5,bottom-right xmm6
+
+    movzx r6d,byte [r3]             ;bottom-left
+    SSE2_Copy16Times xmm5,r6d
+
+    lea r6,[r3+r2-1]
+    movzx r6d,byte [r6]
+    SSE2_Copy16Times xmm6,r6d ;bottom-right
+
+    neg r1  ;r1 = -stride
+
+    push r0
+    push r1
+    push r2
+
+    exp_top_bottom_sse2 16
+
+    ; for both left and right border
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+    pop r2
+    pop r1
+    pop r0
+
+    lea r5,[r0-16]                          ;left border dst  luma =32 chroma = -16
+
+    lea r3,[r0+r2-1]                        ;right border src
+    lea r4,[r3+1]                           ;right border dst
+
+    ;prepare for cross border data: top-rigth with xmm4
+    movzx r6d,byte [r3]                         ;top -rigth
+    SSE2_Copy16Times xmm4,r6d
+
+    neg r1   ;r1 = stride
+
+
+    pop r6  ;  r6 = height
+
+
+
+    push r0
+    push r1
+    push r2
+    push r6
+    exp_left_right_sse2 16,a
+
+    pop r6
+    pop r2
+    pop r1
+    pop r0
+
+    ; for cross border [top-left, top-right, bottom-left, bottom-right]
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ; have done xmm3,..,xmm6 cross pData initialization above, perform pading as below, To be continued..
+
+    neg r1  ;r1 = -stride
+    lea r3,[r0-16]
+    lea r3,[r3+r1]    ;last line of top-left border
+
+    lea r4,[r0+r2]    ;psrc +width
+    lea r4,[r4+r1]    ;psrc +width -stride
+
+
+    neg r1  ;r1 = stride
+    add r6,16         ;height +32(16) ,luma = 32, chroma = 16
+    imul r6,r1
+
+    lea r5,[r3+r6]    ;last line of bottom-left border
+    lea r6,[r4+r6]    ;last line of botoom-right border
+
+    neg r1 ; r1 = -stride
+
+    ; for left & right border expanding
+    exp_cross_sse2 16,a
+
+    POP_XMM
+    LOAD_4_PARA_POP
+
+    pop r6
+    pop r5
+    pop r4
+
+    %assign push_num 0
+
+
+    ret
+
+;***********************************************************************----------------
+; void ExpandPictureChromaUnalign_sse2( uint8_t *pDst,
+;                                       const int32_t iStride,
+;                                       const int32_t iWidth,
+;                                       const int32_t iHeight   );
+;***********************************************************************----------------
+WELS_EXTERN ExpandPictureChromaUnalign_sse2
+    push r4
+    push r5
+    push r6
+
+    %assign push_num 3
+    LOAD_4_PARA
+    PUSH_XMM 7
+
+    SIGN_EXTENSION r1,r1d
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+
+    ;also prepare for cross border pData top-left:xmm3
+
+    movzx r6d,byte [r0]
+    SSE2_Copy16Times xmm3,r6d         ;xmm3: pSrc[0]
+
+    neg r1
+    lea r5,[r0+r1]              ;last line of top border r5= dst top  pSrc[-stride]
+    neg r1
+
+    push r3
+
+
+    dec r3                      ;h-1
+    imul r3,r1                  ;(h-1)*stride
+    lea  r3,[r0+r3]             ;pSrc[(h-1)*stride]  r3 = src bottom
+
+    mov r6,r1                    ;r6 = stride
+    sal r6,04h                   ;r6 = 32*stride
+    lea r4,[r3+r6]               ;r4 = dst bottom
+
+    ;also prepare for cross border data: bottom-left with xmm5,bottom-right xmm6
+
+    movzx r6d,byte [r3]             ;bottom-left
+    SSE2_Copy16Times xmm5,r6d
+
+    lea r6,[r3+r2-1]
+    movzx r6d,byte [r6]
+    SSE2_Copy16Times xmm6,r6d ;bottom-right
+
+    neg r1  ;r1 = -stride
+
+    push r0
+    push r1
+    push r2
+
+    exp_top_bottom_sse2 16
+
+    ; for both left and right border
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+    pop r2
+    pop r1
+    pop r0
+
+    lea r5,[r0-16]                          ;left border dst  luma =32 chroma = -16
+
+    lea r3,[r0+r2-1]                        ;right border src
+    lea r4,[r3+1]                           ;right border dst
+
+    ;prepare for cross border data: top-rigth with xmm4
+    movzx r6d,byte [r3]                         ;top -rigth
+    SSE2_Copy16Times xmm4,r6d
+
+    neg r1   ;r1 = stride
+
+
+    pop r6  ;  r6 = height
+
+
+
+    push r0
+    push r1
+    push r2
+    push r6
+    exp_left_right_sse2 16,u
+
+    pop r6
+    pop r2
+    pop r1
+    pop r0
+
+    ; for cross border [top-left, top-right, bottom-left, bottom-right]
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ; have done xmm3,..,xmm6 cross pData initialization above, perform pading as below, To be continued..
+
+    neg r1  ;r1 = -stride
+    lea r3,[r0-16]
+    lea r3,[r3+r1]    ;last line of top-left border
+
+    lea r4,[r0+r2]    ;psrc +width
+    lea r4,[r4+r1]    ;psrc +width -stride
+
+
+    neg r1  ;r1 = stride
+    add r6,16         ;height +32(16) ,luma = 32, chroma = 16
+    imul r6,r1
+
+    lea r5,[r3+r6]    ;last line of bottom-left border
+    lea r6,[r4+r6]    ;last line of botoom-right border
+
+    neg r1 ; r1 = -stride
+
+    ; for left & right border expanding
+    exp_cross_sse2 16,u
+
+    POP_XMM
+    LOAD_4_PARA_POP
+
+    pop r6
+    pop r5
+    pop r4
+
+    %assign push_num 0
+
+
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/intra_pred_com.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/intra_pred_com.asm
new file mode 100644
index 0000000000..b0bd1318b3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/intra_pred_com.asm
@@ -0,0 +1,117 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  intra_pred_common.asm
+;*
+;*  Abstract
+;*      sse2 function for intra predict operations
+;*
+;*  History
+;*      18/09/2009 Created
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+;***********************************************************************
+; void WelsI16x16LumaPredH_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride);
+;***********************************************************************
+
+%macro SSE2_PRED_H_16X16_ONE_LINE 0
+    add r0, 16
+    add r1, r2
+    movzx r3, byte [r1]
+    SSE2_Copy16Times xmm0, r3d
+    movdqa [r0], xmm0
+%endmacro
+
+WELS_EXTERN WelsI16x16LumaPredH_sse2
+    push r3
+    %assign push_num 1
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    dec r1
+    movzx r3, byte [r1]
+    SSE2_Copy16Times xmm0, r3d
+    movdqa [r0], xmm0
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    SSE2_PRED_H_16X16_ONE_LINE
+    pop r3
+    ret
+
+;***********************************************************************
+; void WelsI16x16LumaPredV_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride);
+;***********************************************************************
+WELS_EXTERN WelsI16x16LumaPredV_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub     r1, r2
+    movdqa  xmm0, [r1]
+
+    movdqa  [r0], xmm0
+    movdqa  [r0+10h], xmm0
+    movdqa  [r0+20h], xmm0
+    movdqa  [r0+30h], xmm0
+    movdqa  [r0+40h], xmm0
+    movdqa  [r0+50h], xmm0
+    movdqa  [r0+60h], xmm0
+    movdqa  [r0+70h], xmm0
+    movdqa  [r0+80h], xmm0
+    movdqa  [r0+90h], xmm0
+    movdqa  [r0+160], xmm0
+    movdqa  [r0+176], xmm0
+    movdqa  [r0+192], xmm0
+    movdqa  [r0+208], xmm0
+    movdqa  [r0+224], xmm0
+    movdqa  [r0+240], xmm0
+
+    ret
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/mb_copy.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/mb_copy.asm
new file mode 100644
index 0000000000..a47529502f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/mb_copy.asm
@@ -0,0 +1,615 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  mb_copy.asm
+;*
+;*  Abstract
+;*      mb_copy and mb_copy1
+;*
+;*  History
+;*      15/09/2009 Created
+;*      12/28/2009 Modified with larger throughput
+;*      12/29/2011 Tuned WelsCopy16x16NotAligned_sse2, added UpdateMbMv_sse2 WelsCopy16x8NotAligned_sse2,
+;*                 WelsCopy16x8_mmx, WelsCopy8x16_mmx etc;
+;*
+;*
+;*********************************************************************************************/
+%include "asm_inc.asm"
+
+%ifdef __NASM_VER__
+    %use smartalign
+%endif
+
+;***********************************************************************
+; Macros and other preprocessor constants
+;***********************************************************************
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+
+;***********************************************************************
+; void WelsCopy16x16_sse2(  uint8_t* Dst,
+;                           int32_t  iStrideD,
+;                           uint8_t* Src,
+;                           int32_t  iStrideS )
+;***********************************************************************
+WELS_EXTERN WelsCopy16x16_sse2
+
+    push r4
+    push r5
+    %assign  push_num 2
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    lea r4, [r1+2*r1]   ;ebx, [eax+2*eax]   ; x3
+    lea r5, [r3+2*r3]   ;edx, [ecx+2*ecx]   ; x3
+
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    movdqa xmm2, [r2+2*r3]
+    movdqa xmm3, [r2+r5]
+    lea r2, [r2+4*r3]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    movdqa xmm6, [r2+2*r3]
+    movdqa xmm7, [r2+r5]
+    lea r2, [r2+4*r3]
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm2
+    movdqa [r0+r4], xmm3
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm4
+    movdqa [r0+r1], xmm5
+    movdqa [r0+2*r1], xmm6
+    movdqa [r0+r4], xmm7
+    lea r0, [r0+4*r1]
+
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    movdqa xmm2, [r2+2*r3]
+    movdqa xmm3, [r2+r5]
+    lea r2, [r2+4*r3]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    movdqa xmm6, [r2+2*r3]
+    movdqa xmm7, [r2+r5]
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm2
+    movdqa [r0+r4], xmm3
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm4
+    movdqa [r0+r1], xmm5
+    movdqa [r0+2*r1], xmm6
+    movdqa [r0+r4], xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    pop r5
+    pop r4
+    ret
+
+;***********************************************************************
+; void WelsCopy16x16NotAligned_sse2(    uint8_t* Dst,
+;                           int32_t  iStrideD,
+;                           uint8_t* Src,
+;                           int32_t  iStrideS )
+;***********************************************************************
+; dst can be align with 16 bytes, but not sure about pSrc, 12/29/2011
+WELS_EXTERN WelsCopy16x16NotAligned_sse2
+    push r4
+    push r5
+    %assign  push_num 2
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    lea r4, [r1+2*r1]   ;ebx, [eax+2*eax]   ; x3
+    lea r5, [r3+2*r3]   ;edx, [ecx+2*ecx]   ; x3
+
+    movdqu xmm0, [r2]
+    movdqu xmm1, [r2+r3]
+    movdqu xmm2, [r2+2*r3]
+    movdqu xmm3, [r2+r5]
+    lea r2, [r2+4*r3]
+    movdqu xmm4, [r2]
+    movdqu xmm5, [r2+r3]
+    movdqu xmm6, [r2+2*r3]
+    movdqu xmm7, [r2+r5]
+    lea r2, [r2+4*r3]
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm2
+    movdqa [r0+r4], xmm3
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm4
+    movdqa [r0+r1], xmm5
+    movdqa [r0+2*r1], xmm6
+    movdqa [r0+r4], xmm7
+    lea r0, [r0+4*r1]
+
+    movdqu xmm0, [r2]
+    movdqu xmm1, [r2+r3]
+    movdqu xmm2, [r2+2*r3]
+    movdqu xmm3, [r2+r5]
+    lea r2, [r2+4*r3]
+    movdqu xmm4, [r2]
+    movdqu xmm5, [r2+r3]
+    movdqu xmm6, [r2+2*r3]
+    movdqu xmm7, [r2+r5]
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm2
+    movdqa [r0+r4], xmm3
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm4
+    movdqa [r0+r1], xmm5
+    movdqa [r0+2*r1], xmm6
+    movdqa [r0+r4], xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    pop r5
+    pop r4
+    ret
+
+; , 12/29/2011
+;***********************************************************************
+; void WelsCopy16x8NotAligned_sse2(uint8_t* Dst,
+;                           int32_t  iStrideD,
+;                           uint8_t* Src,
+;                           int32_t  iStrideS )
+;***********************************************************************
+WELS_EXTERN WelsCopy16x8NotAligned_sse2
+    push r4
+    push r5
+    %assign  push_num 2
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    lea r4, [r1+2*r1]   ;ebx, [eax+2*eax]   ; x3
+    lea r5, [r3+2*r3]   ;edx, [ecx+2*ecx]   ; x3
+
+    movdqu xmm0, [r2]
+    movdqu xmm1, [r2+r3]
+    movdqu xmm2, [r2+2*r3]
+    movdqu xmm3, [r2+r5]
+    lea r2, [r2+4*r3]
+    movdqu xmm4, [r2]
+    movdqu xmm5, [r2+r3]
+    movdqu xmm6, [r2+2*r3]
+    movdqu xmm7, [r2+r5]
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm2
+    movdqa [r0+r4], xmm3
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm4
+    movdqa [r0+r1], xmm5
+    movdqa [r0+2*r1], xmm6
+    movdqa [r0+r4], xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    pop r5
+    pop r4
+    ret
+
+
+;***********************************************************************
+; void WelsCopy8x16_mmx(uint8_t* Dst,
+;                       int32_t  iStrideD,
+;                       uint8_t* Src,
+;                       int32_t  iStrideS )
+;***********************************************************************
+WELS_EXTERN WelsCopy8x16_mmx
+    %assign  push_num 0
+    LOAD_4_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    movq mm0, [r2]
+    movq mm1, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm2, [r2]
+    movq mm3, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm4, [r2]
+    movq mm5, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm6, [r2]
+    movq mm7, [r2+r3]
+    lea r2, [r2+2*r3]
+
+    movq [r0], mm0
+    movq [r0+r1], mm1
+    lea r0, [r0+2*r1]
+    movq [r0], mm2
+    movq [r0+r1], mm3
+    lea r0, [r0+2*r1]
+    movq [r0], mm4
+    movq [r0+r1], mm5
+    lea r0, [r0+2*r1]
+    movq [r0], mm6
+    movq [r0+r1], mm7
+    lea r0, [r0+2*r1]
+
+    movq mm0, [r2]
+    movq mm1, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm2, [r2]
+    movq mm3, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm4, [r2]
+    movq mm5, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm6, [r2]
+    movq mm7, [r2+r3]
+
+    movq [r0], mm0
+    movq [r0+r1], mm1
+    lea r0, [r0+2*r1]
+    movq [r0], mm2
+    movq [r0+r1], mm3
+    lea r0, [r0+2*r1]
+    movq [r0], mm4
+    movq [r0+r1], mm5
+    lea r0, [r0+2*r1]
+    movq [r0], mm6
+    movq [r0+r1], mm7
+
+    WELSEMMS
+    LOAD_4_PARA_POP
+    ret
+
+;***********************************************************************
+; void WelsCopy8x8_mmx(  uint8_t* Dst,
+;                        int32_t  iStrideD,
+;                        uint8_t* Src,
+;                        int32_t  iStrideS )
+;***********************************************************************
+WELS_EXTERN WelsCopy8x8_mmx
+    push r4
+    %assign  push_num 1
+    LOAD_4_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    lea r4, [r3+2*r3]   ;edx, [ebx+2*ebx]
+
+    ; to prefetch next loop
+    prefetchnta [r2+2*r3]
+    prefetchnta [r2+r4]
+    movq mm0, [r2]
+    movq mm1, [r2+r3]
+    lea r2, [r2+2*r3]
+    ; to prefetch next loop
+    prefetchnta [r2+2*r3]
+    prefetchnta [r2+r4]
+    movq mm2, [r2]
+    movq mm3, [r2+r3]
+    lea r2, [r2+2*r3]
+    ; to prefetch next loop
+    prefetchnta [r2+2*r3]
+    prefetchnta [r2+r4]
+    movq mm4, [r2]
+    movq mm5, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm6, [r2]
+    movq mm7, [r2+r3]
+
+    movq [r0], mm0
+    movq [r0+r1], mm1
+    lea r0, [r0+2*r1]
+    movq [r0], mm2
+    movq [r0+r1], mm3
+    lea r0, [r0+2*r1]
+    movq [r0], mm4
+    movq [r0+r1], mm5
+    lea r0, [r0+2*r1]
+    movq [r0], mm6
+    movq [r0+r1], mm7
+
+    WELSEMMS
+    LOAD_4_PARA_POP
+    pop r4
+    ret
+
+; (dunhuang@cisco), 12/21/2011
+;***********************************************************************
+; void UpdateMbMv_sse2( SMVUnitXY *pMvBuffer, const SMVUnitXY sMv )
+;***********************************************************************
+WELS_EXTERN UpdateMbMv_sse2
+
+    %assign  push_num 0
+    LOAD_2_PARA
+
+    movd xmm0, r1d  ; _mv
+    pshufd xmm1, xmm0, $00
+    movdqa [r0     ], xmm1
+    movdqa [r0+0x10], xmm1
+    movdqa [r0+0x20], xmm1
+    movdqa [r0+0x30], xmm1
+    ret
+
+;*******************************************************************************
+; Macros and other preprocessor constants
+;*******************************************************************************
+
+;*******************************************************************************
+; Code
+;*******************************************************************************
+
+SECTION .text
+
+
+
+
+;*******************************************************************************
+; void PixelAvgWidthEq4_mmx( uint8_t *pDst,  int iDstStride,
+;                           uint8_t *pSrcA, int iSrcAStride,
+;                           uint8_t *pSrcB, int iSrcBStride,
+;                           int iHeight );
+;*******************************************************************************
+WELS_EXTERN PixelAvgWidthEq4_mmx
+
+    %assign  push_num 0
+    LOAD_7_PARA
+
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    SIGN_EXTENSION  r6, r6d
+
+ALIGN 4
+.height_loop:
+    movd        mm0, [r4]
+    pavgb       mm0, [r2]
+    movd        [r0], mm0
+
+    dec         r6
+    lea         r0, [r0+r1]
+    lea         r2, [r2+r3]
+    lea         r4, [r4+r5]
+    jne         .height_loop
+
+    WELSEMMS
+    LOAD_7_PARA_POP
+    ret
+
+
+;*******************************************************************************
+; void PixelAvgWidthEq8_mmx( uint8_t *pDst,  int iDstStride,
+;                           uint8_t *pSrcA, int iSrcAStride,
+;                           uint8_t *pSrcB, int iSrcBStride,
+;                           int iHeight );
+;*******************************************************************************
+WELS_EXTERN PixelAvgWidthEq8_mmx
+    %assign  push_num 0
+    LOAD_7_PARA
+
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    SIGN_EXTENSION  r6, r6d
+
+ALIGN 4
+.height_loop:
+    movq        mm0, [r2]
+    pavgb       mm0, [r4]
+    movq        [r0], mm0
+    movq        mm0, [r2+r3]
+    pavgb       mm0, [r4+r5]
+    movq        [r0+r1], mm0
+
+    lea         r2,  [r2+2*r3]
+    lea         r4,  [r4+2*r5]
+    lea         r0,  [r0+2*r1]
+
+    sub         r6, 2
+    jnz         .height_loop
+
+    WELSEMMS
+    LOAD_7_PARA_POP
+    ret
+
+
+
+;*******************************************************************************
+; void PixelAvgWidthEq16_sse2( uint8_t *pDst,  int iDstStride,
+;                          uint8_t *pSrcA, int iSrcAStride,
+;                          uint8_t *pSrcB, int iSrcBStride,
+;                          int iHeight );
+;*******************************************************************************
+WELS_EXTERN PixelAvgWidthEq16_sse2
+
+    %assign  push_num 0
+    LOAD_7_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    SIGN_EXTENSION  r6, r6d
+ALIGN 4
+.height_loop:
+    movdqu      xmm0, [r2]
+    movdqu      xmm1, [r4]
+    pavgb       xmm0, xmm1
+    ;pavgb       xmm0, [r4]
+    movdqu      [r0], xmm0
+
+    movdqu      xmm0, [r2+r3]
+    movdqu      xmm1, [r4+r5]
+    pavgb       xmm0, xmm1
+    movdqu      [r0+r1], xmm0
+
+    movdqu      xmm0, [r2+2*r3]
+    movdqu       xmm1, [r4+2*r5]
+    pavgb       xmm0, xmm1
+    movdqu      [r0+2*r1], xmm0
+
+    lea         r2, [r2+2*r3]
+    lea         r4, [r4+2*r5]
+    lea         r0, [r0+2*r1]
+
+    movdqu      xmm0, [r2+r3]
+    movdqu      xmm1, [r4+r5]
+    pavgb       xmm0, xmm1
+    movdqu      [r0+r1], xmm0
+
+    lea         r2, [r2+2*r3]
+    lea         r4, [r4+2*r5]
+    lea         r0, [r0+2*r1]
+
+    sub         r6, 4
+    jne         .height_loop
+
+    WELSEMMS
+    LOAD_7_PARA_POP
+    ret
+
+; load_instr=%1 store_instr=%2 p_dst=%3 i_dststride=%4 p_src=%5 i_srcstride=%6 cnt=%7 r_tmp=%8,%9 mm_tmp=%10,%11
+%macro CopyStrided4N 11
+    lea             %8, [3 * %6]
+    lea             %9, [3 * %4]
+ALIGN 32
+%%loop:
+    %1              %10, [%5]
+    %1              %11, [%5 + %6]
+    %2              [%3], %10
+    %2              [%3 + %4], %11
+    %1              %10, [%5 + 2 * %6]
+    %1              %11, [%5 + %8]
+    %2              [%3 + 2 * %4], %10
+    %2              [%3 + %9], %11
+    lea             %5, [%5 + 4 * %6]
+    lea             %3, [%3 + 4 * %4]
+    sub             %7, 4
+    jg              %%loop
+%endmacro
+
+;*******************************************************************************
+;   void McCopyWidthEq8_mmx( uint8_t *pSrc, int iSrcStride,
+;                            uint8_t *pDst, int iDstStride, int iHeight )
+;*******************************************************************************
+WELS_EXTERN McCopyWidthEq8_mmx
+    %assign  push_num 0
+%ifdef X86_32
+    push            r5
+    push            r6
+    %assign  push_num 2
+%endif
+    LOAD_5_PARA
+
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+
+    CopyStrided4N   movq, movq, r2, r3, r0, r1, r4, r5, r6, mm0, mm1
+
+    WELSEMMS
+    LOAD_5_PARA_POP
+%ifdef X86_32
+    pop             r6
+    pop             r5
+%endif
+    ret
+
+
+;*******************************************************************************
+;   void McCopyWidthEq16_sse2( uint8_t *pSrc, int iSrcStride, uint8_t *pDst, int iDstStride, int iHeight )
+;*******************************************************************************
+;read unaligned memory
+%macro SSE_READ_UNA 2
+    movq    %1, [%2]
+    movhps  %1, [%2+8]
+%endmacro
+
+;write unaligned memory
+%macro SSE_WRITE_UNA 2
+    movq    [%1],   %2
+    movhps  [%1+8], %2
+%endmacro
+WELS_EXTERN McCopyWidthEq16_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+ALIGN 4
+.height_loop:
+    SSE_READ_UNA    xmm0, r0
+    SSE_READ_UNA    xmm1, r0+r1
+    SSE_WRITE_UNA   r2, xmm0
+    SSE_WRITE_UNA   r2+r3, xmm1
+
+    sub     r4, 2
+    lea     r0, [r0+r1*2]
+    lea     r2, [r2+r3*2]
+    jnz     .height_loop
+
+    LOAD_5_PARA_POP
+    ret
+
+
+;*******************************************************************************
+;   void McCopyWidthEq16_sse3( uint8_t *pSrc, int iSrcStride, uint8_t *pDst, int iDstStride, int iHeight )
+;*******************************************************************************
+WELS_EXTERN McCopyWidthEq16_sse3
+    %assign push_num 0
+%ifdef X86_32
+    push            r5
+    push            r6
+    %assign push_num 2
+%endif
+    LOAD_5_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+
+    CopyStrided4N   lddqu, MOVDQ, r2, r3, r0, r1, r4, r5, r6, xmm0, xmm1
+
+    LOAD_5_PARA_POP
+%ifdef X86_32
+    pop             r6
+    pop             r5
+%endif
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_chroma.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_chroma.asm
new file mode 100644
index 0000000000..02ab26a890
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_chroma.asm
@@ -0,0 +1,313 @@
+;*!
+;* \copy
+;*     Copyright (c)  2004-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  mc_chroma.asm
+;*
+;*  Abstract
+;*      mmx motion compensation for chroma
+;*
+;*  History
+;*      10/13/2004 Created
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Local Data (Read Only)
+;***********************************************************************
+
+SECTION .rodata align=16
+
+;***********************************************************************
+; Various memory constants (trigonometric values or rounding values)
+;***********************************************************************
+
+ALIGN 16
+h264_d0x20_sse2:
+    dw 32,32,32,32,32,32,32,32
+ALIGN 16
+h264_d0x20_mmx:
+    dw 32,32,32,32
+
+
+;=============================================================================
+; Code
+;=============================================================================
+
+SECTION .text
+
+;*******************************************************************************
+; void McChromaWidthEq4_mmx( const uint8_t *src,
+;                           int32_t iSrcStride,
+;                           uint8_t *pDst,
+;                           int32_t iDstStride,
+;                           const uint8_t *pABCD,
+;                           int32_t iHeigh );
+;*******************************************************************************
+WELS_EXTERN McChromaWidthEq4_mmx
+    %assign  push_num 0
+    LOAD_6_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+
+    movd mm3, [r4]; [eax]
+    WELS_Zero mm7
+    punpcklbw mm3, mm3
+    movq      mm4, mm3
+    punpcklwd mm3, mm3
+    punpckhwd mm4, mm4
+
+    movq      mm5, mm3
+    punpcklbw mm3, mm7
+    punpckhbw mm5, mm7
+
+    movq      mm6, mm4
+    punpcklbw mm4, mm7
+    punpckhbw mm6, mm7
+
+    lea r4, [r0 + r1] ;lea ebx, [esi + eax]
+    movd mm0, [r0]
+    movd mm1, [r0+1]
+    punpcklbw mm0, mm7
+    punpcklbw mm1, mm7
+.xloop:
+
+    pmullw mm0, mm3
+    pmullw mm1, mm5
+    paddw  mm0, mm1
+
+    movd  mm1, [r4]
+    punpcklbw mm1, mm7
+    movq mm2, mm1
+    pmullw mm1, mm4
+    paddw mm0, mm1
+
+    movd mm1, [r4+1]
+    punpcklbw mm1, mm7
+    movq mm7, mm1
+    pmullw mm1,mm6
+    paddw mm0, mm1
+    movq mm1,mm7
+
+%ifdef X86_32_PICASM
+    pcmpeqw mm7, mm7
+    psrlw   mm7, 15
+    psllw   mm7, 5
+    paddw   mm0, mm7
+%else
+    paddw mm0, [h264_d0x20_mmx]
+%endif
+    psrlw mm0, 6
+
+    WELS_Zero mm7
+    packuswb mm0, mm7
+    movd [r2], mm0
+
+    movq mm0, mm2
+
+    lea r2, [r2 + r3]
+    lea r4, [r4 + r1]
+
+    dec r5
+    jnz near .xloop
+    WELSEMMS
+    LOAD_6_PARA_POP
+    ret
+
+
+;*******************************************************************************
+; void McChromaWidthEq8_sse2( const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       const uint8_t *pABCD,
+;                       int32_t iheigh );
+;*******************************************************************************
+WELS_EXTERN McChromaWidthEq8_sse2
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+
+    movd xmm3, [r4]
+    WELS_Zero xmm7
+    punpcklbw  xmm3, xmm3
+    punpcklwd  xmm3, xmm3
+
+    movdqa     xmm4, xmm3
+    punpckldq  xmm3, xmm3
+    punpckhdq  xmm4, xmm4
+    movdqa     xmm5, xmm3
+    movdqa     xmm6, xmm4
+
+    punpcklbw  xmm3, xmm7
+    punpckhbw  xmm5, xmm7
+    punpcklbw  xmm4, xmm7
+    punpckhbw  xmm6, xmm7
+
+    lea r4, [r0 + r1] ;lea ebx, [esi + eax]
+    movq xmm0, [r0]
+    movq xmm1, [r0+1]
+    punpcklbw xmm0, xmm7
+    punpcklbw xmm1, xmm7
+.xloop:
+
+    pmullw xmm0, xmm3
+    pmullw xmm1, xmm5
+    paddw  xmm0, xmm1
+
+    movq  xmm1, [r4]
+    punpcklbw xmm1, xmm7
+    movdqa xmm2, xmm1
+    pmullw xmm1, xmm4
+    paddw xmm0, xmm1
+
+    movq xmm1, [r4+1]
+    punpcklbw xmm1, xmm7
+    movdqa xmm7, xmm1
+    pmullw xmm1, xmm6
+    paddw xmm0, xmm1
+    movdqa xmm1,xmm7
+
+%ifdef X86_32_PICASM
+    pcmpeqw xmm7, xmm7
+    psrlw   xmm7, 15
+    psllw   xmm7, 5
+    paddw   xmm0, xmm7
+%else
+    paddw xmm0, [h264_d0x20_sse2]
+%endif
+    psrlw xmm0, 6
+
+    WELS_Zero xmm7
+    packuswb xmm0, xmm7
+    movq [r2], xmm0
+
+    movdqa xmm0, xmm2
+
+    lea r2, [r2 + r3]
+    lea r4, [r4 + r1]
+
+    dec r5
+    jnz near .xloop
+
+    POP_XMM
+    LOAD_6_PARA_POP
+
+    ret
+
+
+
+
+;***********************************************************************
+; void McChromaWidthEq8_ssse3( const uint8_t *pSrc,
+;                        int32_t iSrcStride,
+;                        uint8_t *pDst,
+;                        int32_t iDstStride,
+;                        const uint8_t *pABCD,
+;                        int32_t iHeigh);
+;***********************************************************************
+WELS_EXTERN McChromaWidthEq8_ssse3
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+
+    pxor      xmm7, xmm7
+    movd   xmm5, [r4]
+    punpcklwd xmm5, xmm5
+    punpckldq xmm5, xmm5
+    movdqa    xmm6, xmm5
+    punpcklqdq xmm5, xmm5
+    punpckhqdq xmm6, xmm6
+
+    sub r2, r3 ;sub esi, edi
+    sub r2, r3
+%ifdef X86_32_PICASM
+    pcmpeqw xmm7, xmm7
+    psrlw   xmm7, 15
+    psllw   xmm7, 5
+%else
+    movdqa xmm7, [h264_d0x20_sse2]
+%endif
+
+    movdqu xmm0, [r0]
+    movdqa xmm1, xmm0
+    psrldq xmm1, 1
+    punpcklbw xmm0, xmm1
+
+.hloop_chroma:
+    lea r2, [r2+2*r3]
+
+    movdqu xmm2, [r0+r1]
+    movdqa xmm3, xmm2
+    psrldq xmm3, 1
+    punpcklbw xmm2, xmm3
+    movdqa      xmm4, xmm2
+
+    pmaddubsw  xmm0, xmm5
+    pmaddubsw  xmm2, xmm6
+    paddw      xmm0, xmm2
+    paddw      xmm0, xmm7
+    psrlw      xmm0, 6
+    packuswb   xmm0, xmm0
+    movq       [r2],xmm0
+
+    lea r0, [r0+2*r1]
+    movdqu xmm2, [r0]
+    movdqa xmm3, xmm2
+    psrldq xmm3, 1
+    punpcklbw xmm2, xmm3
+    movdqa      xmm0, xmm2
+
+    pmaddubsw  xmm4, xmm5
+    pmaddubsw  xmm2, xmm6
+    paddw      xmm4, xmm2
+    paddw      xmm4, xmm7
+    psrlw      xmm4, 6
+    packuswb   xmm4, xmm4
+    movq       [r2+r3],xmm4
+
+    sub r5, 2
+    jnz .hloop_chroma
+
+    POP_XMM
+    LOAD_6_PARA_POP
+
+    ret
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_luma.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_luma.asm
new file mode 100644
index 0000000000..624e1fef2f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/mc_luma.asm
@@ -0,0 +1,4490 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  mc_luma.asm
+;*
+;*  Abstract
+;*      sse2 motion compensation
+;*
+;*  History
+;*      17/08/2009 Created
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;*******************************************************************************
+; Local Data (Read Only)
+;*******************************************************************************
+%ifdef X86_32_PICASM
+SECTION .text align=32
+%else
+SECTION .rodata align=32
+%endif
+
+;*******************************************************************************
+; Various memory constants (trigonometric values or rounding values)
+;*******************************************************************************
+
+%ifdef HAVE_AVX2
+ALIGN 32
+dwm32768_256:
+    times 16 dw -32768
+maddubsw_m2p10_m40m40_p10m2_p0p0_256:
+    times 4 db -2, 10, -40, -40, 10, -2, 0, 0
+dwm1024_256:
+    times 16 dw -1024
+dd32768_256:
+    times 8 dd 32768
+maddubsw_p1m5_256:
+    times 16 db 1, -5
+maddubsw_m5p1_256:
+    times 16 db -5, 1
+db20_256:
+    times 32 db 20
+maddubsw_m5p20_256:
+    times 16 db -5, 20
+maddubsw_p20m5_256:
+    times 16 db 20, -5
+h264_w0x10_256:
+    times 16 dw 16
+dw32_256:
+    times 16 dw 32
+%endif ; HAVE_AVX2
+
+ALIGN 16
+shufb_32435465768798A9:
+    db 3, 2, 4, 3, 5, 4, 6, 5, 7, 6, 8, 7, 9, 8, 10, 9
+shufb_011267784556ABBC:
+    db 0, 1, 1, 2, 6, 7, 7, 8, 4, 5, 5, 6, 0Ah, 0Bh, 0Bh, 0Ch
+maddubsw_p1m5_p1m5_m5p1_m5p1_128:
+    times 2 db 1, -5, 1, -5, -5, 1, -5, 1
+maddubsw_m2p10_m40m40_p10m2_p0p0_128:
+    times 2 db -2, 10, -40, -40, 10, -2, 0, 0
+dwm1024_128:
+    times 8 dw -1024
+dd32768_128:
+    times 4 dd 32768
+maddubsw_p1m5_128:
+    times 8 db 1, -5
+maddubsw_m5p1_128:
+    times 8 db -5, 1
+db20_128:
+    times 16 db 20
+maddubsw_m5p20_128:
+    times 8 db -5, 20
+maddubsw_p20m5_128:
+    times 8 db 20, -5
+h264_w0x10_1:
+    dw 16, 16, 16, 16, 16, 16, 16, 16
+ALIGN 16
+h264_mc_hc_32:
+    dw 32, 32, 32, 32, 32, 32, 32, 32
+
+
+;*******************************************************************************
+; Code
+;*******************************************************************************
+
+SECTION .text
+
+%ifdef X86_32_PICASM
+
+%macro MOVEIMM_DW16 1
+    pcmpeqw      %1,  %1
+    psrlw        %1,  15
+    psllw        %1,  4
+%endmacro
+
+%endif
+
+;*******************************************************************************
+; void McHorVer20WidthEq4_mmx( const uint8_t *pSrc,
+;                       int iSrcStride,
+;                       uint8_t *pDst,
+;                       int iDstStride,
+;                       int iHeight)
+;*******************************************************************************
+WELS_EXTERN McHorVer20WidthEq4_mmx
+    %assign  push_num 0
+    LOAD_5_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+
+    sub r0, 2
+    WELS_Zero mm7
+%ifdef X86_32_PICASM
+    MOVEIMM_DW16 mm6
+%else
+    movq mm6, [h264_w0x10_1]
+%endif
+.height_loop:
+    movd mm0, [r0]
+    punpcklbw mm0, mm7
+    movd mm1, [r0+5]
+    punpcklbw mm1, mm7
+    movd mm2, [r0+1]
+    punpcklbw mm2, mm7
+    movd mm3, [r0+4]
+    punpcklbw mm3, mm7
+    movd mm4, [r0+2]
+    punpcklbw mm4, mm7
+    movd mm5, [r0+3]
+    punpcklbw mm5, mm7
+
+    paddw mm2, mm3
+    paddw mm4, mm5
+    psllw mm4, 2
+    psubw mm4, mm2
+    paddw mm0, mm1
+    paddw mm0, mm4
+    psllw mm4, 2
+    paddw mm0, mm4
+    paddw mm0, mm6
+    psraw mm0, 5
+    packuswb mm0, mm7
+    movd [r2], mm0
+
+    add r0, r1
+    add r2, r3
+    dec r4
+    jnz .height_loop
+
+    WELSEMMS
+    LOAD_5_PARA_POP
+    ret
+
+;*******************************************************************************
+; Macros and other preprocessor constants
+;*******************************************************************************
+
+
+%macro SSE_LOAD_8P 3
+    movq %1, %3
+    punpcklbw %1, %2
+%endmacro
+
+%macro FILTER_HV_W8 9
+    paddw   %1, %6
+    paddw   %1, [pic(h264_w0x10_1)]
+    movdqa  %8, %3
+    movdqa  %7, %2
+    paddw   %8, %4
+    paddw   %7, %5
+    psllw   %8, 2
+    psubw   %8, %7
+    paddw   %1, %8
+    psllw   %8, 2
+    paddw   %1, %8
+    psraw   %1, 5
+    WELS_Zero %8
+    packuswb %1, %8
+    movq    %9, %1
+%endmacro
+
+
+%macro FILTER_HV_W4 9
+paddw   %1, %6
+paddw   %1, [pic(h264_w0x10_1)]
+movdqa  %8, %3
+movdqa  %7, %2
+paddw   %8, %4
+paddw   %7, %5
+psllw   %8, 2
+psubw   %8, %7
+paddw   %1, %8
+psllw   %8, 2
+paddw   %1, %8
+psraw   %1, 5
+WELS_Zero %8
+packuswb %1, %8
+movd    %9, %1
+%endmacro
+
+
+;*******************************************************************************
+; Code
+;*******************************************************************************
+
+SECTION .text
+
+;***********************************************************************
+; void McHorVer22Width8HorFirst_sse2(const int16_t *pSrc,
+;                       int16_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride
+;                       int32_t iHeight
+;                       )
+;***********************************************************************
+WELS_EXTERN McHorVer22Width8HorFirst_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    pxor xmm7, xmm7
+
+    sub r0, r1              ;;;;;;;;need more 5 lines.
+    sub r0, r1
+
+.yloop_width_8:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    movdqa [r2], xmm0
+
+    add r0, r1
+    add r2, r3
+    dec r4
+    jnz .yloop_width_8
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+;*******************************************************************************
+; void McHorVer20WidthEq8_sse2(  const uint8_t *pSrc,
+;                       int iSrcStride,
+;                                               uint8_t *pDst,
+;                                               int iDstStride,
+;                                               int iHeight,
+;                      );
+;*******************************************************************************
+WELS_EXTERN McHorVer20WidthEq8_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    lea r0, [r0-2]            ;pSrc -= 2;
+
+    pxor xmm7, xmm7
+%ifdef X86_32_PICASM
+    MOVEIMM_DW16 xmm6
+%else
+    movdqa xmm6, [h264_w0x10_1]
+%endif
+.y_loop:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    paddw xmm0, xmm6
+    psraw xmm0, 5
+
+    packuswb xmm0, xmm7
+    movq [r2], xmm0
+
+    lea r2, [r2+r3]
+    lea r0, [r0+r1]
+    dec r4
+    jnz near .y_loop
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+;*******************************************************************************
+; void McHorVer20WidthEq16_sse2(  const uint8_t *pSrc,
+;                       int iSrcStride,
+;                                               uint8_t *pDst,
+;                                               int iDstStride,
+;                                               int iHeight,
+;                      );
+;*******************************************************************************
+WELS_EXTERN McHorVer20WidthEq16_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    lea r0, [r0-2]            ;pSrc -= 2;
+
+    pxor xmm7, xmm7
+%ifdef X86_32_PICASM
+    MOVEIMM_DW16 xmm6
+%else
+    movdqa xmm6, [h264_w0x10_1]
+%endif
+.y_loop:
+
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    paddw xmm0, xmm6
+    psraw xmm0, 5
+    packuswb xmm0, xmm7
+    movq [r2], xmm0
+
+    movq xmm0, [r0+8]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5+8]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1+8]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4+8]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2+8]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3+8]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    paddw xmm0, xmm6
+    psraw xmm0, 5
+    packuswb xmm0, xmm7
+    movq [r2+8], xmm0
+
+    lea r2, [r2+r3]
+    lea r0, [r0+r1]
+    dec r4
+    jnz near .y_loop
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+
+;*******************************************************************************
+; void McHorVer02WidthEq8_sse2( const uint8_t *pSrc,
+;                       int iSrcStride,
+;                       uint8_t *pDst,
+;                       int iDstStride,
+;                       int iHeight )
+;*******************************************************************************
+WELS_EXTERN McHorVer02WidthEq8_sse2
+    %assign  push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    sub r0, r1
+    sub r0, r1
+
+    WELS_Zero xmm7
+
+    SSE_LOAD_8P xmm0, xmm7, [r0]
+    SSE_LOAD_8P xmm1, xmm7, [r0+r1]
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm2, xmm7, [r0]
+    SSE_LOAD_8P xmm3, xmm7, [r0+r1]
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm4, xmm7, [r0]
+    SSE_LOAD_8P xmm5, xmm7, [r0+r1]
+
+.start:
+    FILTER_HV_W8 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r4
+    jz near .xx_exit
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm6, xmm7, [r0]
+    FILTER_HV_W8 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, [r2+r3]
+    dec r4
+    jz near .xx_exit
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm7, xmm0, [r0+r1]
+    FILTER_HV_W8 xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+    dec r4
+    jz near .xx_exit
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm0, xmm1, [r0]
+    FILTER_HV_W8 xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, [r2+r3]
+    dec r4
+    jz near .xx_exit
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm1, xmm2, [r0+r1]
+    FILTER_HV_W8 xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, [r2]
+    dec r4
+    jz near .xx_exit
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm2, xmm3, [r0]
+    FILTER_HV_W8 xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, [r2+r3]
+    dec r4
+    jz near .xx_exit
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm3, xmm4, [r0+r1]
+    FILTER_HV_W8 xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, [r2]
+    dec r4
+    jz near .xx_exit
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm4, xmm5, [r0]
+    FILTER_HV_W8 xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, [r2+r3]
+    dec r4
+    jz near .xx_exit
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm5, xmm6, [r0+r1]
+    jmp near .start
+
+.xx_exit:
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+
+
+;***********************************************************************
+; void McHorVer02Height9Or17_sse2(  const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       int32_t iWidth,
+;                       int32_t iHeight )
+;***********************************************************************
+WELS_EXTERN McHorVer02Height9Or17_sse2
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+
+%ifndef X86_32
+    push r12
+    push r13
+    push r14
+    mov  r12, r0
+    mov  r13, r2
+    mov  r14, r5
+%endif
+
+    shr r4, 3
+    sub r0, r1
+    sub r0, r1
+
+.xloop:
+    WELS_Zero xmm7
+    SSE_LOAD_8P xmm0, xmm7, [r0]
+    SSE_LOAD_8P xmm1, xmm7, [r0+r1]
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm2, xmm7, [r0]
+    SSE_LOAD_8P xmm3, xmm7, [r0+r1]
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm4, xmm7, [r0]
+    SSE_LOAD_8P xmm5, xmm7, [r0+r1]
+
+    FILTER_HV_W8 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm6, xmm7, [r0]
+    movdqa xmm0,xmm1
+    movdqa xmm1,xmm2
+    movdqa xmm2,xmm3
+    movdqa xmm3,xmm4
+    movdqa xmm4,xmm5
+    movdqa xmm5,xmm6
+    add r2, r3
+    sub r0, r1
+
+.start:
+    FILTER_HV_W8 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm6, xmm7, [r0]
+    FILTER_HV_W8 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm7, xmm0, [r0+r1]
+    FILTER_HV_W8 xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm0, xmm1, [r0]
+    FILTER_HV_W8 xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm1, xmm2, [r0+r1]
+    FILTER_HV_W8 xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm2, xmm3, [r0]
+    FILTER_HV_W8 xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm3, xmm4, [r0+r1]
+    FILTER_HV_W8 xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    SSE_LOAD_8P xmm4, xmm5, [r0]
+    FILTER_HV_W8 xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    SSE_LOAD_8P xmm5, xmm6, [r0+r1]
+    jmp near .start
+
+.x_loop_dec:
+    dec r4
+    jz  near .xx_exit
+%ifdef X86_32
+    mov r0, arg1
+    mov r2, arg3
+    mov r5, arg6
+%else
+    mov r0, r12
+    mov r2, r13
+    mov r5, r14
+%endif
+    sub r0, r1
+    sub r0, r1
+    add r0, 8
+    add r2, 8
+    jmp near .xloop
+
+.xx_exit:
+%ifndef X86_32
+    pop r14
+    pop r13
+    pop r12
+%endif
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+;***********************************************************************
+; void McHorVer02Height5_sse2(  const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       int32_t iWidth,
+;                       int32_t iHeight )
+;***********************************************************************
+WELS_EXTERN McHorVer02Height5_sse2
+%assign  push_num 0
+INIT_X86_32_PIC r6
+LOAD_6_PARA
+PUSH_XMM 8
+SIGN_EXTENSION  r1, r1d
+SIGN_EXTENSION  r3, r3d
+SIGN_EXTENSION  r4, r4d
+SIGN_EXTENSION  r5, r5d
+
+%ifndef X86_32
+push r12
+push r13
+push r14
+mov  r12, r0
+mov  r13, r2
+mov  r14, r5
+%endif
+
+shr r4, 2
+sub r0, r1
+sub r0, r1
+
+.xloop:
+WELS_Zero xmm7
+SSE_LOAD_8P xmm0, xmm7, [r0]
+SSE_LOAD_8P xmm1, xmm7, [r0+r1]
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm2, xmm7, [r0]
+SSE_LOAD_8P xmm3, xmm7, [r0+r1]
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm4, xmm7, [r0]
+SSE_LOAD_8P xmm5, xmm7, [r0+r1]
+
+FILTER_HV_W4 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm6, xmm7, [r0]
+movdqa xmm0,xmm1
+movdqa xmm1,xmm2
+movdqa xmm2,xmm3
+movdqa xmm3,xmm4
+movdqa xmm4,xmm5
+movdqa xmm5,xmm6
+add r2, r3
+sub r0, r1
+
+.start:
+FILTER_HV_W4 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm6, xmm7, [r0]
+FILTER_HV_W4 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+SSE_LOAD_8P xmm7, xmm0, [r0+r1]
+FILTER_HV_W4 xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm0, xmm1, [r0]
+FILTER_HV_W4 xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+SSE_LOAD_8P xmm1, xmm2, [r0+r1]
+FILTER_HV_W4 xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm2, xmm3, [r0]
+FILTER_HV_W4 xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+SSE_LOAD_8P xmm3, xmm4, [r0+r1]
+FILTER_HV_W4 xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+SSE_LOAD_8P xmm4, xmm5, [r0]
+FILTER_HV_W4 xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+SSE_LOAD_8P xmm5, xmm6, [r0+r1]
+jmp near .start
+
+.x_loop_dec:
+dec r4
+jz  near .xx_exit
+%ifdef X86_32
+mov r0, arg1
+mov r2, arg3
+mov r5, arg6
+%else
+mov r0, r12
+mov r2, r13
+mov r5, r14
+%endif
+sub r0, r1
+sub r0, r1
+add r0, 4
+add r2, 4
+jmp near .xloop
+
+.xx_exit:
+%ifndef X86_32
+pop r14
+pop r13
+pop r12
+%endif
+POP_XMM
+LOAD_6_PARA_POP
+DEINIT_X86_32_PIC
+ret
+
+
+;***********************************************************************
+; void McHorVer20Width9Or17_sse2(       const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       int32_t iWidth,
+;                       int32_t iHeight
+;                      );
+;***********************************************************************
+WELS_EXTERN McHorVer20Width9Or17_sse2
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    sub r0, 2
+    pxor xmm7, xmm7
+
+    cmp r4, 9
+    jne near .width_17
+
+.yloop_width_9:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    movdqa xmm7, xmm2
+    paddw   xmm7, xmm3
+    movdqa xmm6, xmm4
+    paddw   xmm6, xmm5
+    psllw xmm6, 2
+    psubw xmm6, xmm7
+    paddw xmm0, xmm1
+    paddw xmm0, xmm6
+    psllw xmm6, 2
+    paddw xmm0, xmm6
+    paddw xmm0, [pic(h264_w0x10_1)]
+    psraw  xmm0, 5
+    packuswb xmm0, xmm0
+    movd [r2], xmm0
+
+    pxor  xmm7, xmm7
+    movq xmm0, [r0+6]
+    punpcklbw xmm0, xmm7
+
+    paddw xmm4, xmm1
+    paddw xmm5, xmm3
+    psllw xmm5, 2
+    psubw xmm5, xmm4
+    paddw xmm2, xmm0
+    paddw xmm2, xmm5
+    psllw xmm5, 2
+    paddw xmm2, xmm5
+    paddw xmm2, [pic(h264_w0x10_1)]
+    psraw  xmm2, 5
+    packuswb xmm2, xmm2
+    movq [r2+1], xmm2
+
+    add r0, r1
+    add r2, r3
+    dec r5
+    jnz .yloop_width_9
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+
+
+.width_17:
+.yloop_width_17:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    paddw xmm0, [pic(h264_w0x10_1)]
+    psraw  xmm0, 5
+    packuswb xmm0, xmm0
+    movq [r2], xmm0
+
+    movq xmm0, [r0+8]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5+8]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1+8]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4+8]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2+8]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3+8]
+    punpcklbw xmm5, xmm7
+
+    movdqa xmm7, xmm2
+    paddw   xmm7, xmm3
+    movdqa xmm6, xmm4
+    paddw   xmm6, xmm5
+    psllw xmm6, 2
+    psubw xmm6, xmm7
+    paddw xmm0, xmm1
+    paddw xmm0, xmm6
+    psllw xmm6, 2
+    paddw xmm0, xmm6
+    paddw xmm0, [pic(h264_w0x10_1)]
+    psraw  xmm0, 5
+    packuswb xmm0, xmm0
+    movd [r2+8], xmm0
+
+
+    pxor  xmm7, xmm7
+    movq xmm0, [r0+6+8]
+    punpcklbw xmm0, xmm7
+
+    paddw xmm4, xmm1
+    paddw xmm5, xmm3
+    psllw xmm5, 2
+    psubw xmm5, xmm4
+    paddw xmm2, xmm0
+    paddw xmm2, xmm5
+    psllw xmm5, 2
+    paddw xmm2, xmm5
+    paddw xmm2, [pic(h264_w0x10_1)]
+    psraw  xmm2, 5
+    packuswb xmm2, xmm2
+    movq [r2+9], xmm2
+    add r0, r1
+    add r2, r3
+    dec r5
+    jnz .yloop_width_17
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+;***********************************************************************
+; void McHorVer20Width5_sse2(       const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       int32_t iWidth,
+;                       int32_t iHeight
+;                      );
+;***********************************************************************
+WELS_EXTERN McHorVer20Width5_sse2
+%assign  push_num 0
+INIT_X86_32_PIC r6
+LOAD_6_PARA
+PUSH_XMM 8
+SIGN_EXTENSION  r1, r1d
+SIGN_EXTENSION  r3, r3d
+SIGN_EXTENSION  r4, r4d
+SIGN_EXTENSION  r5, r5d
+sub r0, 2
+pxor xmm7, xmm7
+
+.yloop_width_5:
+movq xmm0, [r0]
+punpcklbw xmm0, xmm7
+movq xmm1, [r0+5]
+punpcklbw xmm1, xmm7
+movq xmm2, [r0+1]
+punpcklbw xmm2, xmm7
+movq xmm3, [r0+4]
+punpcklbw xmm3, xmm7
+movq xmm4, [r0+2]
+punpcklbw xmm4, xmm7
+movq xmm5, [r0+3]
+punpcklbw xmm5, xmm7
+
+movdqa xmm7, xmm2
+paddw   xmm7, xmm3
+movdqa xmm6, xmm4
+paddw   xmm6, xmm5
+psllw xmm6, 2
+psubw xmm6, xmm7
+paddw xmm0, xmm1
+paddw xmm0, xmm6
+psllw xmm6, 2
+paddw xmm0, xmm6
+paddw xmm0, [pic(h264_w0x10_1)]
+psraw  xmm0, 5
+packuswb xmm0, xmm0
+movd [r2], xmm0
+
+pxor  xmm7, xmm7
+movq xmm0, [r0+6]
+punpcklbw xmm0, xmm7
+
+paddw xmm4, xmm1
+paddw xmm5, xmm3
+psllw xmm5, 2
+psubw xmm5, xmm4
+paddw xmm2, xmm0
+paddw xmm2, xmm5
+psllw xmm5, 2
+paddw xmm2, xmm5
+paddw xmm2, [pic(h264_w0x10_1)]
+psraw  xmm2, 5
+packuswb xmm2, xmm2
+movd [r2+1], xmm2
+
+add r0, r1
+add r2, r3
+dec r5
+jnz .yloop_width_5
+POP_XMM
+LOAD_6_PARA_POP
+DEINIT_X86_32_PIC
+ret
+
+
+;***********************************************************************
+;void McHorVer22HorFirst_sse2
+;                           (const uint8_t *pSrc,
+;                           int32_t iSrcStride,
+;                           uint8_t * pTap,
+;                           int32_t iTapStride,
+;                           int32_t iWidth,int32_t iHeight);
+;***********************************************************************
+WELS_EXTERN McHorVer22HorFirst_sse2
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    pxor xmm7, xmm7
+    sub r0, r1              ;;;;;;;;need more 5 lines.
+    sub r0, r1
+
+    cmp r4, 9
+    jne near .width_17
+
+.yloop_width_9:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    movdqa xmm7, xmm2
+    paddw   xmm7, xmm3
+    movdqa xmm6, xmm4
+    paddw   xmm6, xmm5
+    psllw xmm6, 2
+    psubw xmm6, xmm7
+    paddw xmm0, xmm1
+    paddw xmm0, xmm6
+    psllw xmm6, 2
+    paddw xmm0, xmm6
+    movd [r2], xmm0
+
+    pxor  xmm7, xmm7
+    movq xmm0, [r0+6]
+    punpcklbw xmm0, xmm7
+
+    paddw xmm4, xmm1
+    paddw xmm5, xmm3
+    psllw xmm5, 2
+    psubw xmm5, xmm4
+    paddw xmm2, xmm0
+    paddw xmm2, xmm5
+    psllw xmm5, 2
+    paddw xmm2, xmm5
+    movq [r2+2], xmm2
+    movhps [r2+2+8], xmm2
+
+    add r0, r1
+    add r2, r3
+    dec r5
+    jnz .yloop_width_9
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+
+.width_17:
+.yloop_width_17:
+    movq xmm0, [r0]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3]
+    punpcklbw xmm5, xmm7
+
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    psllw xmm4, 2
+    psubw xmm4, xmm2
+    paddw xmm0, xmm1
+    paddw xmm0, xmm4
+    psllw xmm4, 2
+    paddw xmm0, xmm4
+    movdqa [r2], xmm0
+
+    movq xmm0, [r0+8]
+    punpcklbw xmm0, xmm7
+    movq xmm1, [r0+5+8]
+    punpcklbw xmm1, xmm7
+    movq xmm2, [r0+1+8]
+    punpcklbw xmm2, xmm7
+    movq xmm3, [r0+4+8]
+    punpcklbw xmm3, xmm7
+    movq xmm4, [r0+2+8]
+    punpcklbw xmm4, xmm7
+    movq xmm5, [r0+3+8]
+    punpcklbw xmm5, xmm7
+
+    movdqa xmm7, xmm2
+    paddw   xmm7, xmm3
+    movdqa xmm6, xmm4
+    paddw   xmm6, xmm5
+    psllw xmm6, 2
+    psubw xmm6, xmm7
+    paddw xmm0, xmm1
+    paddw xmm0, xmm6
+    psllw xmm6, 2
+    paddw xmm0, xmm6
+    movd [r2+16], xmm0
+
+
+    pxor  xmm7, xmm7
+    movq xmm0, [r0+6+8]
+    punpcklbw xmm0, xmm7
+
+    paddw xmm4, xmm1
+    paddw xmm5, xmm3
+    psllw xmm5, 2
+    psubw xmm5, xmm4
+    paddw xmm2, xmm0
+    paddw xmm2, xmm5
+    psllw xmm5, 2
+    paddw xmm2, xmm5
+    movq [r2+18], xmm2
+    movhps [r2+18+8], xmm2
+
+    add r0, r1
+    add r2, r3
+    dec r5
+    jnz .yloop_width_17
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+
+%macro FILTER_VER 9
+    paddw  %1, %6
+    movdqa %7, %2
+    movdqa %8, %3
+
+
+    paddw %7, %5
+    paddw %8, %4
+
+    psubw  %1, %7
+    psraw   %1, 2
+    paddw  %1, %8
+    psubw  %1, %7
+    psraw   %1, 2
+    paddw  %8, %1
+    paddw  %8, [pic(h264_mc_hc_32)]
+    psraw   %8, 6
+    packuswb %8, %8
+    movq %9, %8
+%endmacro
+;***********************************************************************
+;void McHorVer22Width8VerLastAlign_sse2(
+;                                           const uint8_t *pTap,
+;                                           int32_t iTapStride,
+;                                           uint8_t * pDst,
+;                                           int32_t iDstStride,
+;                                           int32_t iWidth,
+;                                           int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer22Width8VerLastAlign_sse2
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+%ifndef X86_32
+    push r12
+    push r13
+    push r14
+    mov  r12, r0
+    mov  r13, r2
+    mov  r14, r5
+%endif
+
+    shr r4, 3
+
+.width_loop:
+    movdqa xmm0, [r0]
+    movdqa xmm1, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm2, [r0]
+    movdqa xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm4, [r0]
+    movdqa xmm5, [r0+r1]
+
+    FILTER_VER xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    lea r0, [r0+2*r1]
+    movdqa xmm6, [r0]
+
+    movdqa xmm0, xmm1
+    movdqa xmm1, xmm2
+    movdqa xmm2, xmm3
+    movdqa xmm3, xmm4
+    movdqa xmm4, xmm5
+    movdqa xmm5, xmm6
+
+    add r2, r3
+    sub r0, r1
+
+.start:
+    FILTER_VER xmm0,xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqa xmm6, [r0]
+    FILTER_VER xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqa xmm7, [r0+r1]
+    FILTER_VER  xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqa xmm0, [r0]
+    FILTER_VER  xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqa xmm1, [r0+r1]
+    FILTER_VER  xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,[r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqa xmm2, [r0]
+    FILTER_VER  xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqa xmm3, [r0+r1]
+    FILTER_VER  xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,[r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqa xmm4, [r0]
+    FILTER_VER  xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,xmm6, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqa xmm5, [r0+r1]
+    jmp near .start
+
+.x_loop_dec:
+    dec r4
+    jz near .exit
+%ifdef X86_32
+    mov r0, arg1
+    mov r2, arg3
+    mov r5, arg6
+%else
+    mov r0, r12
+    mov r2, r13
+    mov r5, r14
+%endif
+    add r0, 16
+    add r2, 8
+    jmp .width_loop
+
+.exit:
+%ifndef X86_32
+    pop r14
+    pop r13
+    pop r12
+%endif
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+;void McHorVer22Width8VerLastUnAlign_sse2(
+;                                           const uint8_t *pTap,
+;                                           int32_t iTapStride,
+;                                           uint8_t * pDst,
+;                                           int32_t iDstStride,
+;                                           int32_t iWidth,
+;                                           int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer22Width8VerLastUnAlign_sse2
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+%ifndef X86_32
+    push r12
+    push r13
+    push r14
+    mov  r12, r0
+    mov  r13, r2
+    mov  r14, r5
+%endif
+    shr r4, 3
+
+.width_loop:
+    movdqu xmm0, [r0]
+    movdqu xmm1, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqu xmm2, [r0]
+    movdqu xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqu xmm4, [r0]
+    movdqu xmm5, [r0+r1]
+
+    FILTER_VER xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    lea r0, [r0+2*r1]
+    movdqu xmm6, [r0]
+
+    movdqa xmm0, xmm1
+    movdqa xmm1, xmm2
+    movdqa xmm2, xmm3
+    movdqa xmm3, xmm4
+    movdqa xmm4, xmm5
+    movdqa xmm5, xmm6
+
+    add r2, r3
+    sub r0, r1
+
+.start:
+    FILTER_VER xmm0,xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqu xmm6, [r0]
+    FILTER_VER xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqu xmm7, [r0+r1]
+    FILTER_VER  xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqu xmm0, [r0]
+    FILTER_VER  xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqu xmm1, [r0+r1]
+    FILTER_VER  xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,[r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqu xmm2, [r0]
+    FILTER_VER  xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,[r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqu xmm3, [r0+r1]
+    FILTER_VER  xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,[r2]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r0, [r0+2*r1]
+    movdqu xmm4, [r0]
+    FILTER_VER  xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,xmm6, [r2+r3]
+    dec r5
+    jz near .x_loop_dec
+
+    lea r2, [r2+2*r3]
+    movdqu xmm5, [r0+r1]
+    jmp near .start
+
+.x_loop_dec:
+    dec r4
+    jz near .exit
+%ifdef X86_32
+    mov r0, arg1
+    mov r2, arg3
+    mov r5, arg6
+%else
+    mov r0, r12
+    mov r2, r13
+    mov r5, r14
+%endif
+    add r0, 16
+    add r2, 8
+    jmp .width_loop
+
+.exit:
+%ifndef X86_32
+    pop r14
+    pop r13
+    pop r12
+%endif
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+
+;***********************************************************************
+;void McHorVer22Width5HorFirst_sse2
+;                           (const uint8_t *pSrc,
+;                           int32_t iSrcStride,
+;                           uint8_t * pTap,
+;                           int32_t iTapStride,
+;                           int32_t iWidth,int32_t iHeight);
+;***********************************************************************
+WELS_EXTERN McHorVer22Width5HorFirst_sse2
+%assign  push_num 0
+LOAD_6_PARA
+PUSH_XMM 8
+SIGN_EXTENSION  r1, r1d
+SIGN_EXTENSION  r3, r3d
+SIGN_EXTENSION  r4, r4d
+SIGN_EXTENSION  r5, r5d
+pxor xmm7, xmm7
+sub r0, r1              ;;;;;;;;need more 5 lines.
+sub r0, r1
+
+.yloop_width_5:
+movq xmm0, [r0]
+punpcklbw xmm0, xmm7
+movq xmm1, [r0+5]
+punpcklbw xmm1, xmm7
+movq xmm2, [r0+1]
+punpcklbw xmm2, xmm7
+movq xmm3, [r0+4]
+punpcklbw xmm3, xmm7
+movq xmm4, [r0+2]
+punpcklbw xmm4, xmm7
+movq xmm5, [r0+3]
+punpcklbw xmm5, xmm7
+
+movdqa xmm7, xmm2
+paddw   xmm7, xmm3
+movdqa xmm6, xmm4
+paddw   xmm6, xmm5
+psllw xmm6, 2
+psubw xmm6, xmm7
+paddw xmm0, xmm1
+paddw xmm0, xmm6
+psllw xmm6, 2
+paddw xmm0, xmm6
+movd [r2], xmm0
+
+pxor  xmm7, xmm7
+movq xmm0, [r0+6]
+punpcklbw xmm0, xmm7
+
+paddw xmm4, xmm1
+paddw xmm5, xmm3
+psllw xmm5, 2
+psubw xmm5, xmm4
+paddw xmm2, xmm0
+paddw xmm2, xmm5
+psllw xmm5, 2
+paddw xmm2, xmm5
+movq [r2+2], xmm2
+movhps [r2+2+8], xmm2
+
+add r0, r1
+add r2, r3
+dec r5
+jnz .yloop_width_5
+POP_XMM
+LOAD_6_PARA_POP
+ret
+
+
+%macro FILTER_VER_4 9
+paddw  %1, %6
+movdqa %7, %2
+movdqa %8, %3
+
+
+paddw %7, %5
+paddw %8, %4
+
+psubw  %1, %7
+psraw   %1, 2
+paddw  %1, %8
+psubw  %1, %7
+psraw   %1, 2
+paddw  %8, %1
+paddw  %8, [pic(h264_mc_hc_32)]
+psraw   %8, 6
+packuswb %8, %8
+movd %9, %8
+%endmacro
+
+
+;***********************************************************************
+;void McHorVer22Width4VerLastAlign_sse2(
+;                                           const uint8_t *pTap,
+;                                           int32_t iTapStride,
+;                                           uint8_t * pDst,
+;                                           int32_t iDstStride,
+;                                           int32_t iWidth,
+;                                           int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer22Width4VerLastAlign_sse2
+%assign  push_num 0
+INIT_X86_32_PIC r6
+LOAD_6_PARA
+PUSH_XMM 8
+SIGN_EXTENSION  r1, r1d
+SIGN_EXTENSION  r3, r3d
+SIGN_EXTENSION  r4, r4d
+SIGN_EXTENSION  r5, r5d
+%ifndef X86_32
+push r12
+push r13
+push r14
+mov  r12, r0
+mov  r13, r2
+mov  r14, r5
+%endif
+
+shr r4, 2
+
+.width_loop:
+movdqa xmm0, [r0]
+movdqa xmm1, [r0+r1]
+lea r0, [r0+2*r1]
+movdqa xmm2, [r0]
+movdqa xmm3, [r0+r1]
+lea r0, [r0+2*r1]
+movdqa xmm4, [r0]
+movdqa xmm5, [r0+r1]
+
+FILTER_VER_4 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+lea r0, [r0+2*r1]
+movdqa xmm6, [r0]
+
+movdqa xmm0, xmm1
+movdqa xmm1, xmm2
+movdqa xmm2, xmm3
+movdqa xmm3, xmm4
+movdqa xmm4, xmm5
+movdqa xmm5, xmm6
+
+add r2, r3
+sub r0, r1
+
+.start:
+FILTER_VER_4 xmm0,xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqa xmm6, [r0]
+FILTER_VER_4 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqa xmm7, [r0+r1]
+FILTER_VER_4  xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqa xmm0, [r0]
+FILTER_VER_4  xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqa xmm1, [r0+r1]
+FILTER_VER_4  xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,[r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqa xmm2, [r0]
+FILTER_VER_4  xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqa xmm3, [r0+r1]
+FILTER_VER_4  xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,[r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqa xmm4, [r0]
+FILTER_VER_4  xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,xmm6, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqa xmm5, [r0+r1]
+jmp near .start
+
+.x_loop_dec:
+dec r4
+jz near .exit
+%ifdef X86_32
+mov r0, arg1
+mov r2, arg3
+mov r5, arg6
+%else
+mov r0, r12
+mov r2, r13
+mov r5, r14
+%endif
+add r0, 8
+add r2, 4
+jmp .width_loop
+
+.exit:
+%ifndef X86_32
+pop r14
+pop r13
+pop r12
+%endif
+POP_XMM
+LOAD_6_PARA_POP
+DEINIT_X86_32_PIC
+ret
+
+
+;***********************************************************************
+;void McHorVer22Width4VerLastUnAlign_sse2(
+;                                           const uint8_t *pTap,
+;                                           int32_t iTapStride,
+;                                           uint8_t * pDst,
+;                                           int32_t iDstStride,
+;                                           int32_t iWidth,
+;                                           int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer22Width4VerLastUnAlign_sse2
+%assign  push_num 0
+INIT_X86_32_PIC r6
+LOAD_6_PARA
+PUSH_XMM 8
+SIGN_EXTENSION  r1, r1d
+SIGN_EXTENSION  r3, r3d
+SIGN_EXTENSION  r4, r4d
+SIGN_EXTENSION  r5, r5d
+%ifndef X86_32
+push r12
+push r13
+push r14
+mov  r12, r0
+mov  r13, r2
+mov  r14, r5
+%endif
+shr r4, 2
+
+.width_loop:
+movdqu xmm0, [r0]
+movdqu xmm1, [r0+r1]
+lea r0, [r0+2*r1]
+movdqu xmm2, [r0]
+movdqu xmm3, [r0+r1]
+lea r0, [r0+2*r1]
+movdqu xmm4, [r0]
+movdqu xmm5, [r0+r1]
+
+FILTER_VER_4 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+lea r0, [r0+2*r1]
+movdqu xmm6, [r0]
+
+movdqa xmm0, xmm1
+movdqa xmm1, xmm2
+movdqa xmm2, xmm3
+movdqa xmm3, xmm4
+movdqa xmm4, xmm5
+movdqa xmm5, xmm6
+
+add r2, r3
+sub r0, r1
+
+.start:
+FILTER_VER_4 xmm0,xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqu xmm6, [r0]
+FILTER_VER_4 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqu xmm7, [r0+r1]
+FILTER_VER_4  xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, [r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqu xmm0, [r0]
+FILTER_VER_4  xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqu xmm1, [r0+r1]
+FILTER_VER_4  xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,[r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqu xmm2, [r0]
+FILTER_VER_4  xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,[r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqu xmm3, [r0+r1]
+FILTER_VER_4  xmm6, xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,[r2]
+dec r5
+jz near .x_loop_dec
+
+lea r0, [r0+2*r1]
+movdqu xmm4, [r0]
+FILTER_VER_4  xmm7, xmm0, xmm1, xmm2, xmm3,xmm4,xmm5,xmm6, [r2+r3]
+dec r5
+jz near .x_loop_dec
+
+lea r2, [r2+2*r3]
+movdqu xmm5, [r0+r1]
+jmp near .start
+
+.x_loop_dec:
+dec r4
+jz near .exit
+%ifdef X86_32
+mov r0, arg1
+mov r2, arg3
+mov r5, arg6
+%else
+mov r0, r12
+mov r2, r13
+mov r5, r14
+%endif
+add r0, 8
+add r2, 4
+jmp .width_loop
+
+.exit:
+%ifndef X86_32
+pop r14
+pop r13
+pop r12
+%endif
+POP_XMM
+LOAD_6_PARA_POP
+DEINIT_X86_32_PIC
+ret
+
+
+; px_ab=%1 px_cd=%2 px_ef=%3 maddubsw_ab=%4 maddubsw_cd=%5 maddubsw_ef=%6 tmp=%7
+%macro SSSE3_FilterVertical_8px 7
+    pmaddubsw       %1, %4
+    movdqa          %7, %2
+    pmaddubsw       %7, %5
+    paddw           %1, %7
+    movdqa          %7, %3
+    pmaddubsw       %7, %6
+    paddw           %1, %7
+    paddw           %1, [pic(h264_w0x10_1)]
+    psraw           %1, 5
+%endmacro
+
+; px_a=%1 px_f=%2 px_bc=%3 px_de=%4 maddubsw_bc=%5 maddubsw_de=%6 tmp=%7,%8
+%macro SSSE3_FilterVertical2_8px 8
+    movdqa          %8, %2
+    pxor            %7, %7
+    punpcklbw       %1, %7
+    punpcklbw       %8, %7
+    paddw           %1, %8
+    movdqa          %7, %3
+    pmaddubsw       %7, %5
+    paddw           %1, %7
+    movdqa          %7, %4
+    pmaddubsw       %7, %6
+    paddw           %1, %7
+    paddw           %1, [pic(h264_w0x10_1)]
+    psraw           %1, 5
+%endmacro
+
+; pixels=%1 shufb_32435465768798A9=%2 shufb_011267784556ABBC=%3 maddubsw_p1m5_p1m5_m5p1_m5p1=%4 tmp=%5,%6
+%macro SSSE3_FilterHorizontalbw_8px 6
+    movdqa          %5, %1
+    pshufb          %1, %2
+    pshufb          %5, %3
+    pshufd          %6, %1, 10110001b
+    pmaddubsw       %1, [pic(db20_128)]
+    pmaddubsw       %5, %4
+    pmaddubsw       %6, %4
+    paddw           %1, %5
+    paddw           %1, %6
+%endmacro
+
+; pixels=%1 shufb_32435465768798A9=%2 shufb_011267784556ABBC=%3 maddubsw_p1m5_p1m5_m5p1_m5p1=%4 tmp=%5,%6
+%macro SSSE3_FilterHorizontal_8px 6
+    SSSE3_FilterHorizontalbw_8px %1, %2, %3, %4, %5, %6
+    paddw           %1, [pic(h264_w0x10_1)]
+    psraw           %1, 5
+%endmacro
+
+; px0=%1 px1=%2 shufb_32435465768798A9=%3 shufb_011267784556ABBC=%4 maddubsw_p1m5_p1m5_m5p1_m5p1=%5 tmp=%6,%7
+%macro SSSE3_FilterHorizontalbw_2x4px 7
+    movdqa          %6, %1
+    movdqa          %7, %2
+    pshufb          %1, %3
+    pshufb          %2, %3
+    punpcklqdq      %1, %2
+    pshufb          %6, %4
+    pshufb          %7, %4
+    punpcklqdq      %6, %7
+    pshufd          %7, %1, 10110001b
+    pmaddubsw       %1, [pic(db20_128)]
+    pmaddubsw       %6, %5
+    pmaddubsw       %7, %5
+    paddw           %1, %6
+    paddw           %1, %7
+%endmacro
+
+; px0=%1 px1=%2 shufb_32435465768798A9=%3 shufb_011267784556ABBC=%4 maddubsw_p1m5_p1m5_m5p1_m5p1=%5 tmp=%6,%7
+%macro SSSE3_FilterHorizontal_2x4px 7
+    SSSE3_FilterHorizontalbw_2x4px %1, %2, %3, %4, %5, %6, %7
+    paddw           %1, [pic(h264_w0x10_1)]
+    psraw           %1, 5
+%endmacro
+
+; pixels=%1 -32768>>scale=%2 tmp=%3
+%macro SSSE3_FilterHorizontalbw_2px 3
+    pmaddubsw       %1, [pic(maddubsw_m2p10_m40m40_p10m2_p0p0_128)]
+    pmaddwd         %1, %2
+    pshufd          %3, %1, 10110001b
+    paddd           %1, %3
+%endmacro
+
+; pixels=%1 tmp=%2
+%macro SSSE3_FilterHorizontal_2px 2
+    SSSE3_FilterHorizontalbw_2px %1, [pic(dwm1024_128)], %2
+    paddd           %1, [pic(dd32768_128)]
+%endmacro
+
+; px0=%1 px1=%2 px2=%3 px3=%4 px4=%5 px5=%6 tmp=%7
+%macro SSE2_FilterVerticalw_8px 7
+    paddw           %1, %6
+    movdqa          %7, %2
+    paddw           %7, %5
+    psubw           %1, %7
+    psraw           %1, 2
+    psubw           %1, %7
+    movdqa          %7, %3
+    paddw           %7, %4
+    paddw           %1, %7
+    psraw           %1, 2
+    paddw           %7, [pic(h264_mc_hc_32)]
+    paddw           %1, %7
+    psraw           %1, 6
+%endmacro
+
+;***********************************************************************
+; void McHorVer02_ssse3(const uint8_t *pSrc,
+;                       int32_t iSrcStride,
+;                       uint8_t *pDst,
+;                       int32_t iDstStride,
+;                       int32_t iWidth,
+;                       int32_t iHeight)
+;***********************************************************************
+
+WELS_EXTERN McHorVer02_ssse3
+%define p_src         r0
+%define i_srcstride   r1
+%define p_dst         r2
+%define i_dststride   r3
+%ifdef X86_32_PICASM
+%define i_width       dword arg5
+%else
+%define i_width       r4
+%endif
+%define i_height      r5
+%define i_srcstride3  r6
+    %assign push_num 0
+%ifdef X86_32
+    push            r6
+    %assign push_num 1
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    INIT_X86_32_PIC_NOPRESERVE r4
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    lea             i_srcstride3, [3 * i_srcstride]
+    %assign push_num_begin push_num
+    cmp             i_width, 4
+    jg              .width8or16
+
+    movd            xmm0, [p_src]
+    movd            xmm4, [p_src + i_srcstride]
+    punpcklbw       xmm0, xmm4
+    movd            xmm1, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm4, xmm1
+    punpcklqdq      xmm0, xmm4
+    movd            xmm4, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklbw       xmm1, xmm4
+    movd            xmm2, [p_src]
+    punpcklbw       xmm4, xmm2
+    punpcklqdq      xmm1, xmm4
+    movd            xmm4, [p_src + i_srcstride]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm2, xmm4
+    movd            xmm3, [p_src]
+    punpcklbw       xmm4, xmm3
+    punpcklqdq      xmm2, xmm4
+    movdqa          xmm5, [pic(db20_128)]
+    SSSE3_FilterVertical_8px xmm0, xmm1, xmm2, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm0, xmm0
+    movd            [p_dst], xmm0
+    psrlq           xmm0, 32
+    movd            [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movd            xmm4, [p_src + i_srcstride]
+    punpcklbw       xmm3, xmm4
+    movd            xmm0, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm4, xmm0
+    punpcklqdq      xmm3, xmm4
+    SSSE3_FilterVertical_8px xmm1, xmm2, xmm3, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm1, xmm1
+    movd            [p_dst], xmm1
+    psrlq           xmm1, 32
+    movd            [p_dst + i_dststride], xmm1
+    cmp             i_height, 5
+    jl              .width4_height_le5_done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movd            xmm4, [p_src + i_srcstride3]
+    punpcklbw       xmm0, xmm4
+    jg              .width4_height_ge8
+    SSSE3_FilterVertical_8px xmm2, xmm3, xmm0, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm2, xmm2
+    movd            [p_dst], xmm2
+.width4_height_le5_done:
+    DEINIT_X86_32_PIC_KEEPDEF
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+.width4_height_ge8:
+    lea             p_src, [p_src + 4 * i_srcstride]
+    movd            xmm1, [p_src]
+    punpcklbw       xmm4, xmm1
+    punpcklqdq      xmm0, xmm4
+    SSSE3_FilterVertical_8px xmm2, xmm3, xmm0, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm2, xmm2
+    movd            [p_dst], xmm2
+    psrlq           xmm2, 32
+    movd            [p_dst + i_dststride], xmm2
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movd            xmm4, [p_src + i_srcstride]
+    punpcklbw       xmm1, xmm4
+    movd            xmm2, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm4, xmm2
+    punpcklqdq      xmm1, xmm4
+    SSSE3_FilterVertical_8px xmm3, xmm0, xmm1, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm3, xmm3
+    movd            [p_dst], xmm3
+    psrlq           xmm3, 32
+    movd            [p_dst + i_dststride], xmm3
+    cmp             i_height, 9
+    jl              .width4_height_ge8_done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movd            xmm4, [p_src + i_srcstride3]
+    punpcklbw       xmm2, xmm4
+    SSSE3_FilterVertical_8px xmm0, xmm1, xmm2, [pic(maddubsw_p1m5_128)], xmm5, [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm0, xmm0
+    movd            [p_dst], xmm0
+.width4_height_ge8_done:
+    DEINIT_X86_32_PIC_KEEPDEF
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+
+.width8or16:
+    %assign push_num push_num_begin
+    sub             i_height, 1
+    push            i_height
+    %assign push_num push_num + 1
+%xdefine i_ycnt i_height
+%define i_height [r7]
+.xloop:
+    push            p_src
+    push            p_dst
+    %assign push_num push_num + 2
+    test            i_ycnt, 1
+    jnz             .yloop_begin_even
+    movq            xmm0, [p_src]
+    movq            xmm1, [p_src + i_srcstride]
+    punpcklbw       xmm0, xmm1
+    movq            xmm2, [p_src + 2 * i_srcstride]
+    movq            xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklbw       xmm2, xmm3
+    movq            xmm4, [p_src]
+    movq            xmm5, [p_src + i_srcstride]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm4, xmm5
+    SSSE3_FilterVertical_8px xmm0, xmm2, xmm4, [pic(maddubsw_p1m5_128)], [pic(db20_128)], [pic(maddubsw_m5p1_128)], xmm7
+    packuswb        xmm0, xmm0
+    movlps          [p_dst], xmm0
+    add             p_dst, i_dststride
+    jmp             .yloop
+.yloop_begin_even:
+    movq            xmm1, [p_src]
+    movq            xmm2, [p_src + i_srcstride]
+    movq            xmm3, [p_src + 2 * i_srcstride]
+    add             p_src, i_srcstride3
+    punpcklbw       xmm2, xmm3
+    movq            xmm4, [p_src]
+    movq            xmm5, [p_src + i_srcstride]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    punpcklbw       xmm4, xmm5
+.yloop:
+    movq            xmm6, [p_src]
+    SSSE3_FilterVertical2_8px xmm1, xmm6, xmm2, xmm4, [pic(maddubsw_m5p20_128)], [pic(maddubsw_p20m5_128)], xmm0, xmm7
+    movq            xmm7, [p_src + i_srcstride]
+    punpcklbw       xmm6, xmm7
+    SSSE3_FilterVertical_8px xmm2, xmm4, xmm6, [pic(maddubsw_p1m5_128)], [pic(db20_128)], [pic(maddubsw_m5p1_128)], xmm0
+    packuswb        xmm1, xmm2
+    movlps          [p_dst], xmm1
+    movhps          [p_dst + i_dststride], xmm1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movq            xmm0, [p_src + 2 * i_srcstride]
+    SSSE3_FilterVertical2_8px xmm3, xmm0, xmm4, xmm6, [pic(maddubsw_m5p20_128)], [pic(maddubsw_p20m5_128)], xmm2, xmm1
+    movq            xmm1, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklbw       xmm0, xmm1
+    SSSE3_FilterVertical_8px xmm4, xmm6, xmm0, [pic(maddubsw_p1m5_128)], [pic(db20_128)], [pic(maddubsw_m5p1_128)], xmm2
+    packuswb        xmm3, xmm4
+    movlps          [p_dst], xmm3
+    movhps          [p_dst + i_dststride], xmm3
+    cmp             i_ycnt, 4
+    jle             .yloop_exit
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movq            xmm2, [p_src]
+    SSSE3_FilterVertical2_8px xmm5, xmm2, xmm6, xmm0, [pic(maddubsw_m5p20_128)], [pic(maddubsw_p20m5_128)], xmm4, xmm3
+    movq            xmm3, [p_src + i_srcstride]
+    punpcklbw       xmm2, xmm3
+    SSSE3_FilterVertical_8px xmm6, xmm0, xmm2, [pic(maddubsw_p1m5_128)], [pic(db20_128)], [pic(maddubsw_m5p1_128)], xmm4
+    packuswb        xmm5, xmm6
+    movlps          [p_dst], xmm5
+    movhps          [p_dst + i_dststride], xmm5
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movq            xmm4, [p_src + 2 * i_srcstride]
+    SSSE3_FilterVertical2_8px xmm7, xmm4, xmm0, xmm2, [pic(maddubsw_m5p20_128)], [pic(maddubsw_p20m5_128)], xmm6, xmm5
+    movq            xmm5, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklbw       xmm4, xmm5
+    SSSE3_FilterVertical_8px xmm0, xmm2, xmm4, [pic(maddubsw_p1m5_128)], [pic(db20_128)], [pic(maddubsw_m5p1_128)], xmm6
+    packuswb        xmm7, xmm0
+    movlps          [p_dst], xmm7
+    movhps          [p_dst + i_dststride], xmm7
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_ycnt, 8
+    jg              .yloop
+.yloop_exit:
+    pop             p_dst
+    pop             p_src
+    %assign push_num push_num - 2
+    sub             i_width, 8
+    jle             .width8or16_done
+    add             p_src, 8
+    add             p_dst, 8
+    mov             i_ycnt, i_height
+    jmp             .xloop
+.width8or16_done:
+    pop             i_ycnt
+    %assign push_num push_num - 1
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef i_srcstride3
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+%undef i_ycnt
+
+
+;*******************************************************************************
+; void McHorVer20_ssse3(const uint8_t *pSrc,
+;                       int iSrcStride,
+;                       uint8_t *pDst,
+;                       int iDstStride,
+;                       int iWidth,
+;                       int iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_width      r4
+%define i_height     r5
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    movdqa          xmm4, [pic(shufb_32435465768798A9)]
+    movdqa          xmm5, [pic(shufb_011267784556ABBC)]
+    movdqa          xmm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    cmp             i_width, 8
+    je              .width8_yloop
+    jg              .width16_yloop
+.width4_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm1, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    SSSE3_FilterHorizontal_2x4px xmm0, xmm1, xmm4, xmm5, xmm6, xmm2, xmm3
+    packuswb        xmm0, xmm0
+    movd            [p_dst], xmm0
+    psrlq           xmm0, 32
+    movd            [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 2
+    jg              .width4_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width8_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm1, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    SSSE3_FilterHorizontal_8px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    SSSE3_FilterHorizontal_8px xmm1, xmm4, xmm5, xmm6, xmm2, xmm3
+    packuswb        xmm0, xmm1
+    movlps          [p_dst], xmm0
+    movhps          [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 2
+    jg              .width8_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width16_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm1, [p_src + 6]
+    add             p_src, i_srcstride
+    SSSE3_FilterHorizontal_8px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    SSSE3_FilterHorizontal_8px xmm1, xmm4, xmm5, xmm6, xmm2, xmm3
+    packuswb        xmm0, xmm1
+    MOVDQ           [p_dst], xmm0
+    add             p_dst, i_dststride
+    sub             i_height, 1
+    jg              .width16_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+
+
+;***********************************************************************
+; void McHorVer20Width5Or9Or17_ssse3(const uint8_t *pSrc,
+;                                    int32_t iSrcStride,
+;                                    uint8_t *pDst,
+;                                    int32_t iDstStride,
+;                                    int32_t iWidth,
+;                                    int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer20Width5Or9Or17_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_width      r4
+%define i_height     r5
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    movdqa          xmm5, [pic(shufb_32435465768798A9)]
+    movdqa          xmm6, [pic(shufb_011267784556ABBC)]
+    movdqa          xmm7, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    cmp             i_width, 9
+    je              .width9_yloop
+    jg              .width17_yloop
+.width5_yloop:
+    movdqu          xmm0, [p_src - 2]
+    add             p_src, i_srcstride
+    SSSE3_FilterHorizontal_8px xmm0, xmm5, xmm6, xmm7, xmm1, xmm2
+    packuswb        xmm0, xmm0
+    movdqa          xmm1, xmm0
+    psrlq           xmm1, 8
+    movd            [p_dst], xmm0
+    movd            [p_dst + 1], xmm1
+    add             p_dst, i_dststride
+    sub             i_height, 1
+    jg              .width5_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width9_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm4, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    movdqa          xmm3, xmm0
+    punpckhqdq      xmm3, xmm4
+    SSSE3_FilterHorizontal_2px xmm3, xmm2
+    SSSE3_FilterHorizontal_8px xmm0, xmm5, xmm6, xmm7, xmm1, xmm2
+    packuswb        xmm3, xmm0
+    movd            [p_dst + 5], xmm3
+    movhps          [p_dst], xmm3
+    add             p_dst, i_dststride
+    SSSE3_FilterHorizontal_8px xmm4, xmm5, xmm6, xmm7, xmm1, xmm2
+    packuswb        xmm4, xmm4
+    psrldq          xmm3, 4
+    movd            [p_dst + 5], xmm3
+    movlps          [p_dst], xmm4
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .width9_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width17_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm3, [p_src + 6]
+    add             p_src, i_srcstride
+    movdqa          xmm4, xmm3
+    SSSE3_FilterHorizontal_8px xmm0, xmm5, xmm6, xmm7, xmm1, xmm2
+    SSSE3_FilterHorizontal_8px xmm3, xmm5, xmm6, xmm7, xmm1, xmm2
+    packuswb        xmm0, xmm3
+    movdqu          xmm1, [p_src - 2]
+    movdqu          xmm3, [p_src + 6]
+    add             p_src, i_srcstride
+    punpckhqdq      xmm4, xmm3
+    SSSE3_FilterHorizontal_2px xmm4, xmm2
+    packuswb        xmm4, xmm4
+    movd            [p_dst + 13], xmm4
+    MOVDQ           [p_dst], xmm0
+    add             p_dst, i_dststride
+    psrldq          xmm4, 4
+    movd            [p_dst + 13], xmm4
+    SSSE3_FilterHorizontal_8px xmm1, xmm5, xmm6, xmm7, xmm0, xmm2
+    SSSE3_FilterHorizontal_8px xmm3, xmm5, xmm6, xmm7, xmm0, xmm2
+    packuswb        xmm1, xmm3
+    MOVDQ           [p_dst], xmm1
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .width17_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+
+
+;*******************************************************************************
+; void McHorVer20Width4U8ToS16_ssse3(const uint8_t *pSrc,
+;                                    int iSrcStride,
+;                                    int16_t *pDst,
+;                                    int iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20Width4U8ToS16_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_height     r3
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    movdqa          xmm4, [pic(shufb_32435465768798A9)]
+    movdqa          xmm5, [pic(shufb_011267784556ABBC)]
+    movdqa          xmm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 1
+.yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm1, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    SSSE3_FilterHorizontalbw_2x4px xmm0, xmm1, xmm4, xmm5, xmm6, xmm2, xmm3
+    movdqa          [p_dst], xmm0
+    add             p_dst, 16
+    sub             i_height, 2
+    jg              .yloop
+    ; Height % 2 remainder.
+    movdqu          xmm0, [p_src - 2]
+    SSSE3_FilterHorizontalbw_8px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    movlps          [p_dst], xmm0
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_height
+
+
+;***********************************************************************
+; void McHorVer02Width4S16ToU8_ssse3(const int16_t *pSrc,
+;                                    uint8_t *pDst,
+;                                    int32_t iDstStride,
+;                                    int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width4S16ToU8_ssse3
+%define p_src        r0
+%define p_dst        r1
+%define i_dststride  r2
+%define i_height     r3
+%define i_srcstride  8
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    movdqa          xmm0, [p_src +  0 * i_srcstride]
+    movdqu          xmm1, [p_src +  1 * i_srcstride]
+    movdqa          xmm2, [p_src +  2 * i_srcstride]
+    movdqu          xmm3, [p_src +  3 * i_srcstride]
+    movdqa          xmm4, [p_src +  4 * i_srcstride]
+    movdqu          xmm5, [p_src +  5 * i_srcstride]
+    movdqa          xmm6, [p_src +  6 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm7
+    packuswb        xmm0, xmm0
+    movd            [p_dst], xmm0
+    psrlq           xmm0, 32
+    movd            [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movdqu          xmm7, [p_src +  7 * i_srcstride]
+    movdqa          xmm0, [p_src +  8 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm1
+    packuswb        xmm2, xmm2
+    movd            [p_dst], xmm2
+    psrlq           xmm2, 32
+    movd            [p_dst + i_dststride], xmm2
+    cmp             i_height, 4
+    jle             .done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movdqu          xmm1, [p_src +  9 * i_srcstride]
+    movdqa          xmm2, [p_src + 10 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm3
+    packuswb        xmm4, xmm4
+    movd            [p_dst], xmm4
+    psrlq           xmm4, 32
+    movd            [p_dst + i_dststride], xmm4
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movdqu          xmm3, [p_src + 11 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm5
+    packuswb        xmm6, xmm6
+    movd            [p_dst], xmm6
+    psrlq           xmm6, 32
+    movd            [p_dst + i_dststride], xmm6
+.done:
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_srcstride
+
+
+;***********************************************************************
+; void McHorVer20Width8U8ToS16_ssse3(const uint8_t *pSrc,
+;                                    int16_t iSrcStride,
+;                                    int16_t *pDst,
+;                                    int32_t iDstStride,
+;                                    int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer20Width8U8ToS16_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_height     r4
+    %assign  push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_5_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    movdqa          xmm4, [pic(shufb_32435465768798A9)]
+    movdqa          xmm5, [pic(shufb_011267784556ABBC)]
+    movdqa          xmm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 1
+.yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm1, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    SSSE3_FilterHorizontalbw_8px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    MOVDQ           [p_dst], xmm0
+    add             p_dst, i_dststride
+    SSSE3_FilterHorizontalbw_8px xmm1, xmm4, xmm5, xmm6, xmm2, xmm3
+    MOVDQ           [p_dst], xmm1
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .yloop
+    jl              .done
+    movdqu          xmm0, [p_src - 2]
+    SSSE3_FilterHorizontalbw_8px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    MOVDQ           [p_dst], xmm0
+.done:
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_height
+
+
+;***********************************************************************
+; void McHorVer02Width5S16ToU8_ssse3(const int16_t *pSrc,
+;                                    int32_t iTapStride,
+;                                    uint8_t *pDst,
+;                                    int32_t iDstStride,
+;                                    int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width5S16ToU8_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_height     r4
+%define i_srcstride3 r5
+    %assign  push_num 0
+%ifdef X86_32
+    push            r5
+    %assign  push_num 1
+%endif
+    INIT_X86_32_PIC r6
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    lea             i_srcstride3, [3 * i_srcstride]
+    movdqa          xmm0, [p_src]
+    movdqa          xmm1, [p_src + i_srcstride]
+    movdqa          xmm2, [p_src + 2 * i_srcstride]
+    movdqa          xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    movdqa          xmm4, [p_src]
+    movdqa          xmm5, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    movdqa          xmm6, [p_src + 2 * i_srcstride]
+    packuswb        xmm0, xmm0
+    movdqa          xmm7, xmm0
+    psrlq           xmm7, 8
+    movd            [p_dst + 1], xmm7
+    movd            [p_dst], xmm0
+    add             p_dst, i_dststride
+    SSE2_FilterVerticalw_8px xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+    movdqa          xmm7, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    packuswb        xmm1, xmm1
+    movdqa          xmm0, xmm1
+    psrlq           xmm0, 8
+    movd            [p_dst + 1], xmm0
+    movd            [p_dst], xmm1
+    add             p_dst, i_dststride
+    SSE2_FilterVerticalw_8px xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0
+    movdqa          xmm0, [p_src]
+    packuswb        xmm2, xmm2
+    movdqa          xmm1, xmm2
+    psrlq           xmm1, 8
+    movd            [p_dst + 1], xmm1
+    movd            [p_dst], xmm2
+    add             p_dst, i_dststride
+    SSE2_FilterVerticalw_8px xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1
+    packuswb        xmm3, xmm3
+    movdqa          xmm2, xmm3
+    psrlq           xmm2, 8
+    movd            [p_dst + 1], xmm2
+    movd            [p_dst], xmm3
+    add             p_dst, i_dststride
+    movdqa          xmm1, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2
+    packuswb        xmm4, xmm4
+    movdqa          xmm3, xmm4
+    psrlq           xmm3, 8
+    movd            [p_dst + 1], xmm3
+    movd            [p_dst], xmm4
+    cmp             i_height, 5
+    jle             .done
+    add             p_dst, i_dststride
+    movdqa          xmm2, [p_src + 2 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3
+    movdqa          xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    packuswb        xmm5, xmm5
+    movdqa          xmm4, xmm5
+    psrlq           xmm4, 8
+    movd            [p_dst + 1], xmm4
+    movd            [p_dst], xmm5
+    add             p_dst, i_dststride
+    SSE2_FilterVerticalw_8px xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4
+    movdqa          xmm4, [p_src]
+    packuswb        xmm6, xmm6
+    movdqa          xmm5, xmm6
+    psrlq           xmm5, 8
+    movd            [p_dst + 1], xmm5
+    movd            [p_dst], xmm6
+    add             p_dst, i_dststride
+    SSE2_FilterVerticalw_8px xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    packuswb        xmm7, xmm7
+    movdqa          xmm6, xmm7
+    psrlq           xmm6, 8
+    movd            [p_dst + 1], xmm6
+    movd            [p_dst], xmm7
+    add             p_dst, i_dststride
+    movdqa          xmm5, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    packuswb        xmm0, xmm0
+    movdqa          xmm7, xmm0
+    psrlq           xmm7, 8
+    movd            [p_dst + 1], xmm7
+    movd            [p_dst], xmm0
+.done:
+    POP_XMM
+    LOAD_5_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r5
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_srcstride3
+
+
+;***********************************************************************
+; void McHorVer20Width9Or17U8ToS16_ssse3(const uint8_t *pSrc,
+;                                        int32_t iSrcStride,
+;                                        int16_t *pDst,
+;                                        int32_t iDstStride,
+;                                        int32_t iWidth,
+;                                        int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer20Width9Or17U8ToS16_ssse3
+%define p_src       r0
+%define i_srcstride r1
+%define p_dst       r2
+%define i_dststride r3
+%define i_width     r4
+%define i_height    r5
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    pcmpeqw         xmm4, xmm4
+    psllw           xmm4, 15                                ; dw -32768
+    movdqa          xmm5, [pic(shufb_32435465768798A9)]
+    movdqa          xmm6, [pic(shufb_011267784556ABBC)]
+    movdqa          xmm7, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    cmp             i_width, 9
+    jne             .width17_yloop
+
+.width9_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqa          xmm3, xmm0
+    SSSE3_FilterHorizontalbw_8px xmm0, xmm5, xmm6, xmm7, xmm1, xmm2
+    movdqu          xmm2, [p_src + i_srcstride - 2]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    punpckhqdq      xmm3, xmm2
+    SSSE3_FilterHorizontalbw_2px xmm3, xmm4, xmm1
+    movlps          [p_dst + 10], xmm3
+    MOVDQ           [p_dst], xmm0
+    add             p_dst, i_dststride
+    movhps          [p_dst + 10], xmm3
+    SSSE3_FilterHorizontalbw_8px xmm2, xmm5, xmm6, xmm7, xmm1, xmm0
+    MOVDQ           [p_dst], xmm2
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .width9_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+
+.width17_yloop:
+    movdqu          xmm0, [p_src - 2]
+    movdqu          xmm3, [p_src + 6]
+    add             p_src, i_srcstride
+    SSSE3_FilterHorizontalbw_8px xmm0, xmm5, xmm6, xmm7, xmm1, xmm2
+    MOVDQ           [p_dst], xmm0
+    movdqa          xmm0, xmm3
+    SSSE3_FilterHorizontalbw_8px xmm3, xmm5, xmm6, xmm7, xmm1, xmm2
+    movdqu          xmm2, [p_src + 6]
+    punpckhqdq      xmm0, xmm2
+    SSSE3_FilterHorizontalbw_2px xmm0, xmm4, xmm1
+    movdqu          xmm1, [p_src - 2]
+    add             p_src, i_srcstride
+    movlps          [p_dst + 26], xmm0
+    MOVDQ           [p_dst + 16], xmm3
+    add             p_dst, i_dststride
+    movhps          [p_dst + 26], xmm0
+    SSSE3_FilterHorizontalbw_8px xmm1, xmm5, xmm6, xmm7, xmm0, xmm3
+    MOVDQ           [p_dst], xmm1
+    SSSE3_FilterHorizontalbw_8px xmm2, xmm5, xmm6, xmm7, xmm0, xmm3
+    MOVDQ           [p_dst + 16], xmm2
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .width17_yloop
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+
+
+;***********************************************************************
+; void McHorVer02WidthGe8S16ToU8_ssse3(const int16_t *pSrc,
+;                                      int32_t iSrcStride,
+;                                      uint8_t *pDst,
+;                                      int32_t iDstStride,
+;                                      int32_t iWidth,
+;                                      int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02WidthGe8S16ToU8_ssse3
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%ifdef X86_32_PICASM
+%define i_width      dword arg5
+%else
+%define i_width      r4
+%endif
+%define i_height     r5
+%define i_srcstride3 r6
+    %assign  push_num 0
+%ifdef X86_32
+    push            r6
+    %assign  push_num 1
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    INIT_X86_32_PIC_NOPRESERVE r4
+    sub             i_height, 1
+    push            i_height
+    %assign push_num push_num + 1
+    lea             i_srcstride3, [3 * i_srcstride]
+    test            i_width, 1
+    jz              .width_loop
+    push            p_src
+    push            p_dst
+    %assign push_num push_num + 2
+%ifdef X86_32_PICASM
+    add             p_src, i_width
+    add             p_src, i_width
+    sub             p_src, 2
+%else
+    lea             p_src, [p_src + 2 * i_width - 2]
+%endif
+    add             p_dst, i_width
+    movd            xmm0, [p_src]
+    punpcklwd       xmm0, [p_src + i_srcstride]
+    movd            xmm1, [p_src + 2 * i_srcstride]
+    add             p_src, i_srcstride3
+    punpcklwd       xmm1, [p_src]
+    punpckldq       xmm0, xmm1
+    movd            xmm1, [p_src + i_srcstride]
+    cmp             i_height, 4
+    je              .filter5_unalign
+    punpcklwd       xmm1, [p_src + 2 * i_srcstride]
+    movd            xmm2, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklwd       xmm2, [p_src]
+    punpckldq       xmm1, xmm2
+    punpcklqdq      xmm0, xmm1
+.height_loop_unalign:
+    movd            xmm1, [p_src + i_srcstride]
+    palignr         xmm1, xmm0, 2
+    movd            xmm2, [p_src + 2 * i_srcstride]
+    palignr         xmm2, xmm1, 2
+    movd            xmm3, [p_src + i_srcstride3]
+    palignr         xmm3, xmm2, 2
+    lea             p_src, [p_src + 4 * i_srcstride]
+    movd            xmm4, [p_src]
+    palignr         xmm4, xmm3, 2
+    movd            xmm5, [p_src + i_srcstride]
+    palignr         xmm5, xmm4, 2
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm7
+    packuswb        xmm0, xmm0
+    movdqa          xmm6, xmm0
+    pslld           xmm6, 24
+    movd            [p_dst - 4], xmm6
+    movlps          [p_dst + 4 * i_dststride - 8], xmm6
+    add             p_dst, i_dststride
+    movdqa          xmm6, xmm0
+    pslld           xmm6, 16
+    movd            [p_dst - 4], xmm6
+    movlps          [p_dst + 4 * i_dststride - 8], xmm6
+    add             p_dst, i_dststride
+    movdqa          xmm6, xmm0
+    pslld           xmm6, 8
+    movd            [p_dst - 4], xmm6
+    movd            [p_dst + i_dststride - 4], xmm0
+    lea             p_dst, [p_dst + 4 * i_dststride]
+    movlps          [p_dst - 8], xmm6
+    movlps          [p_dst + i_dststride - 8], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jle             .height_loop_unalign_exit
+    movd            xmm1, [p_src + 2 * i_srcstride]
+    palignr         xmm1, xmm5, 2
+    movd            xmm0, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    punpcklwd       xmm0, [p_src]
+    palignr         xmm0, xmm1, 4
+    jmp             .height_loop_unalign
+.height_loop_unalign_exit:
+    movddup         xmm6, [p_src + 2 * i_srcstride - 6]
+    SSE2_FilterVerticalw_8px xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+    packuswb        xmm1, xmm1
+    movlps          [p_dst - 8], xmm1
+    jmp             .unalign_done
+.filter5_unalign:
+    pslldq          xmm0, 8
+    palignr         xmm1, xmm0, 2
+    movd            xmm2, [p_src + 2 * i_srcstride]
+    palignr         xmm2, xmm1, 2
+    movd            xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    palignr         xmm3, xmm2, 2
+    movd            xmm4, [p_src]
+    palignr         xmm4, xmm3, 2
+    movd            xmm5, [p_src + i_srcstride]
+    palignr         xmm5, xmm4, 2
+    movd            xmm6, [p_src + 2 * i_srcstride]
+    palignr         xmm6, xmm5, 2
+    SSE2_FilterVerticalw_8px xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+    packuswb        xmm1, xmm1
+    movdqa          xmm0, xmm1
+    psrlq           xmm1,  8
+    movdqa          xmm2, xmm0
+    psrlq           xmm2, 16
+    movdqa          xmm3, xmm0
+    psrlq           xmm3, 24
+    movd            [p_dst - 4], xmm0
+    movd            [p_dst + i_dststride - 4], xmm1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movd            [p_dst - 4], xmm2
+    movd            [p_dst + i_dststride - 4], xmm3
+    movlps          [p_dst + 2 * i_dststride - 8], xmm0
+.unalign_done:
+    pop             p_dst
+    pop             p_src
+    %assign push_num push_num - 2
+    mov             i_height, [r7]
+    sub             i_width, 1
+.width_loop:
+    push            p_src
+    push            p_dst
+    %assign push_num push_num + 2
+    movdqa          xmm0, [p_src]
+    movdqa          xmm1, [p_src + i_srcstride]
+    movdqa          xmm2, [p_src + 2 * i_srcstride]
+    movdqa          xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    movdqa          xmm4, [p_src]
+.height_loop:
+    movdqa          xmm5, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    movdqa          xmm6, [p_src + 2 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+    movdqa          xmm7, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    packuswb        xmm0, xmm1
+    movlps          [p_dst], xmm0
+    movhps          [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    SSE2_FilterVerticalw_8px xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0
+    movdqa          xmm0, [p_src]
+    SSE2_FilterVerticalw_8px xmm3, xmm4, xmm5, xmm6, xmm7, xmm0, xmm1
+    packuswb        xmm2, xmm3
+    movlps          [p_dst], xmm2
+    movhps          [p_dst + i_dststride], xmm2
+    cmp             i_height, 4
+    jl              .x_loop_dec
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    movdqa          xmm1, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm4, xmm5, xmm6, xmm7, xmm0, xmm1, xmm2
+    je              .store_xmm4_exit
+    movdqa          xmm2, [p_src + 2 * i_srcstride]
+    SSE2_FilterVerticalw_8px xmm5, xmm6, xmm7, xmm0, xmm1, xmm2, xmm3
+    movdqa          xmm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    packuswb        xmm4, xmm5
+    movlps          [p_dst], xmm4
+    movhps          [p_dst + i_dststride], xmm4
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    SSE2_FilterVerticalw_8px xmm6, xmm7, xmm0, xmm1, xmm2, xmm3, xmm4
+    movdqa          xmm4, [p_src]
+    SSE2_FilterVerticalw_8px xmm7, xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    packuswb        xmm6, xmm7
+    movlps          [p_dst], xmm6
+    movhps          [p_dst + i_dststride], xmm6
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jg              .height_loop
+    jl              .x_loop_dec
+    movdqa          xmm5, [p_src + i_srcstride]
+    SSE2_FilterVerticalw_8px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    packuswb        xmm0, xmm0
+    movlps          [p_dst], xmm0
+.x_loop_dec:
+    pop             p_dst
+    pop             p_src
+    %assign push_num push_num - 2
+    sub             i_width, 8
+    jle             .done
+    mov             i_height, [r7]
+    add             p_src, 16
+    add             p_dst, 8
+    jmp             .width_loop
+.store_xmm4_exit:
+    packuswb        xmm4, xmm4
+    movlps          [p_dst], xmm4
+    pop             p_dst
+    pop             p_src
+.done:
+    pop             i_height
+    %assign push_num push_num - 1
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+%undef i_srcstride3
+
+
+%ifdef HAVE_AVX2
+
+; pixels=%1 shufb_32435465768798A9=%2 shufb_011267784556ABBC=%3 maddubsw_p1m5_p1m5_m5p1_m5p1=%4 tmp=%5,%6
+%macro AVX2_FilterHorizontalbw_16px 6
+    vpshufb         %5, %1, %3
+    vpshufb         %1, %1, %2
+    vpshufd         %6, %1, 10110001b
+    vpmaddubsw      %1, %1, [pic(db20_256)]
+    vpmaddubsw      %5, %5, %4
+    vpmaddubsw      %6, %6, %4
+    vpaddw          %1, %1, %5
+    vpaddw          %1, %1, %6
+%endmacro
+
+; pixels=%1 shufb_32435465768798A9=%2 shufb_011267784556ABBC=%3 db20=%4 tmp=%5,%6
+%macro AVX2_FilterHorizontal_16px 6
+    AVX2_FilterHorizontalbw_16px %1, %2, %3, %4, %5, %6
+    vpaddw          %1, %1, [pic(h264_w0x10_256)]
+    vpsraw          %1, %1, 5
+%endmacro
+
+; px0=%1 px1=%2 shufb_32435465768798A9=%3 shufb_011267784556ABBC=%4 maddubsw_p1m5_p1m5_m5p1_m5p1=%5 tmp=%6,%7
+%macro AVX2_FilterHorizontalbw_4x4px 7
+    vpshufb         %6, %1, %4
+    vpshufb         %7, %2, %4
+    vpshufb         %1, %1, %3
+    vpshufb         %2, %2, %3
+    vpunpcklqdq     %1, %1, %2
+    vpunpcklqdq     %6, %6, %7
+    vpshufd         %7, %1, 10110001b
+    vpmaddubsw      %1, %1, [pic(db20_256)]
+    vpmaddubsw      %6, %6, %5
+    vpmaddubsw      %7, %7, %5
+    vpaddw          %1, %1, %6
+    vpaddw          %1, %1, %7
+%endmacro
+
+; px0=%1 px1=%2 shufb_32435465768798A9=%3 shufb_011267784556ABBC=%4 db20=%5 tmp=%6,%7
+%macro AVX2_FilterHorizontal_4x4px 7
+    AVX2_FilterHorizontalbw_4x4px %1, %2, %3, %4, %5, %6, %7
+    vpaddw          %1, %1, [pic(h264_w0x10_256)]
+    vpsraw          %1, %1, 5
+%endmacro
+
+; pixels=%1 -32768>>scale=%2 tmp=%3
+%macro AVX2_FilterHorizontalbw_4px 3
+    vpmaddubsw      %1, %1, [pic(maddubsw_m2p10_m40m40_p10m2_p0p0_256)]
+    vpmaddwd        %1, %1, %2
+    vpshufd         %3, %1, 10110001b
+    vpaddd          %1, %1, %3
+%endmacro
+
+; pixels=%1 tmp=%2
+%macro AVX2_FilterHorizontal_4px 2
+    AVX2_FilterHorizontalbw_4px %1, [pic(dwm1024_256)], %2
+    vpaddd          %1, %1, [pic(dd32768_256)]
+%endmacro
+
+; px_ab=%1 px_cd=%2 px_ef=%3 maddubsw_ab=%4 maddubsw_cd=%5 maddubsw_ef=%6 tmp=%7
+%macro AVX2_FilterVertical_16px 7
+    vpmaddubsw      %1, %1, %4
+    vpmaddubsw      %7, %2, %5
+    vpaddw          %1, %1, %7
+    vpmaddubsw      %7, %3, %6
+    vpaddw          %1, %1, %7
+    vpaddw          %1, %1, [pic(h264_w0x10_256)]
+    vpsraw          %1, %1, 5
+%endmacro
+
+; px_a=%1 px_f=%2 px_bc=%3 px_de=%4 maddubsw_bc=%5 maddubsw_de=%6 tmp=%7,%8
+%macro AVX2_FilterVertical2_16px 8
+    vpxor           %7, %7, %7
+    vpunpcklbw      %1, %1, %7
+    vpunpcklbw      %8, %2, %7
+    vpaddw          %1, %1, %8
+    vpmaddubsw      %7, %3, %5
+    vpaddw          %1, %1, %7
+    vpmaddubsw      %7, %4, %6
+    vpaddw          %1, %1, %7
+    vpaddw          %1, %1, [pic(h264_w0x10_256)]
+    vpsraw          %1, %1, 5
+%endmacro
+
+; px0=%1 px1=%2 px2=%3 px3=%4 px4=%5 px5=%6 tmp=%7
+%macro AVX2_FilterVerticalw_16px 7
+    vpaddw          %1, %1, %6
+    vpaddw          %7, %2, %5
+    vpsubw          %1, %1, %7
+    vpsraw          %1, %1, 2
+    vpsubw          %1, %1, %7
+    vpaddw          %7, %3, %4
+    vpaddw          %1, %1, %7
+    vpsraw          %1, %1, 2
+    vpaddw          %7, %7, [pic(dw32_256)]
+    vpaddw          %1, %1, %7
+    vpsraw          %1, %1, 6
+%endmacro
+
+;***********************************************************************
+; void McHorVer02_avx2(const uint8_t *pSrc,
+;                      int32_t iSrcStride,
+;                      uint8_t *pDst,
+;                      int32_t iDstStride,
+;                      int32_t iWidth,
+;                      int32_t iHeight)
+;***********************************************************************
+
+WELS_EXTERN McHorVer02_avx2
+%define p_src         r0
+%define i_srcstride   r1
+%define p_dst         r2
+%define i_dststride   r3
+%ifdef X86_32_PICASM
+%define i_width       dword arg5
+%else
+%define i_width       r4
+%endif
+%define i_height      r5
+%define i_srcstride3  r6
+    %assign push_num 0
+%ifdef X86_32
+    push            r6
+    %assign push_num 1
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    INIT_X86_32_PIC_NOPRESERVE r4
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    lea             i_srcstride3, [3 * i_srcstride]
+    cmp             i_width, 8
+    je              .width8
+    jg              .width16
+; .width4:
+    vmovd           xmm0, [p_src]
+    vpbroadcastd    xmm5, [p_src + i_srcstride]
+    vpunpcklbw      xmm0, xmm0, xmm5
+    vpbroadcastd    ymm1, [p_src + 2 * i_srcstride]
+    vpunpcklbw      xmm5, xmm5, xmm1
+    vpblendd        xmm0, xmm0, xmm5, 1100b
+    vpbroadcastd    ymm5, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklbw      ymm1, ymm1, ymm5
+    vpbroadcastd    ymm2, [p_src]
+    vpunpcklbw      ymm5, ymm5, ymm2
+    vpblendd        ymm1, ymm1, ymm5, 11001100b
+    vpblendd        ymm0, ymm0, ymm1, 11110000b
+    vpbroadcastd    ymm5, [p_src + i_srcstride]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    vpunpcklbw      ymm2, ymm2, ymm5
+    vpbroadcastd    ymm3, [p_src]
+    vpunpcklbw      ymm5, ymm5, ymm3
+    vpblendd        ymm2, ymm2, ymm5, 11001100b
+    vpblendd        ymm1, ymm1, ymm2, 11110000b
+    vpbroadcastd    ymm5, [p_src + i_srcstride]
+    vpunpcklbw      ymm3, ymm3, ymm5
+    vpbroadcastd    ymm4, [p_src + 2 * i_srcstride]
+    vpunpcklbw      ymm5, ymm5, ymm4
+    vpblendd        ymm3, ymm3, ymm5, 11001100b
+    vpblendd        ymm2, ymm2, ymm3, 11110000b
+    vbroadcasti128  ymm6, [pic(db20_128)]
+    AVX2_FilterVertical_16px ymm0, ymm1, ymm2, [pic(maddubsw_p1m5_256)], ymm6, [pic(maddubsw_m5p1_256)], ymm5
+    vpackuswb       ymm0, ymm0, ymm0
+    vmovd           [p_dst], xmm0
+    vpsrlq          xmm5, xmm0, 32
+    vmovd           [p_dst + i_dststride], xmm5
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vextracti128    xmm0, ymm0, 1
+    vmovd           [p_dst], xmm0
+    vpsrlq          xmm5, xmm0, 32
+    vmovd           [p_dst + i_dststride], xmm5
+    cmp             i_height, 5
+    jl              .width4_done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vpbroadcastd    ymm5, [p_src + i_srcstride3]
+    vpunpcklbw      ymm4, ymm4, ymm5
+    jg              .width4_height_ge8
+    AVX2_FilterVertical_16px xmm2, xmm3, xmm4, [pic(maddubsw_p1m5_256)], xmm6, [pic(maddubsw_m5p1_256)], xmm5
+    vpackuswb       xmm2, xmm2, xmm2
+    vmovd           [p_dst], xmm2
+    jmp             .width4_done
+.width4_height_ge8:
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpbroadcastd    ymm1, [p_src]
+    vpunpcklbw      ymm5, ymm5, ymm1
+    vpblendd        ymm4, ymm4, ymm5, 11001100b
+    vpblendd        ymm3, ymm3, ymm4, 11110000b
+    vpbroadcastd    ymm5, [p_src + i_srcstride]
+    vpunpcklbw      ymm1, ymm5
+    vpbroadcastd    ymm0, [p_src + 2 * i_srcstride]
+    vpunpcklbw      ymm5, ymm5, ymm0
+    vpblendd        ymm1, ymm1, ymm5, 11001100b
+    vpblendd        ymm4, ymm4, ymm1, 11110000b
+    AVX2_FilterVertical_16px ymm2, ymm3, ymm4, [pic(maddubsw_p1m5_256)], ymm6, [pic(maddubsw_m5p1_256)], ymm5
+    vpackuswb       ymm2, ymm2, ymm2
+    vmovd           [p_dst], xmm2
+    vpsrlq          xmm5, xmm2, 32
+    vmovd           [p_dst + i_dststride], xmm5
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vextracti128    xmm2, ymm2, 1
+    vmovd           [p_dst], xmm2
+    vpsrlq          xmm5, xmm2, 32
+    vmovd           [p_dst + i_dststride], xmm5
+    cmp             i_height, 9
+    jl              .width4_done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovd           xmm5, [p_src + i_srcstride3]
+    vpunpcklbw      xmm0, xmm0, xmm5
+    AVX2_FilterVertical_16px xmm4, xmm1, xmm0, [pic(maddubsw_p1m5_256)], xmm6, [pic(maddubsw_m5p1_256)], xmm5
+    vpackuswb       xmm4, xmm4, xmm4
+    vmovd           [p_dst], xmm4
+.width4_done:
+    vzeroupper
+    DEINIT_X86_32_PIC_KEEPDEF
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+
+.width8:
+    sub             i_height, 1
+    vmovq           xmm0, [p_src]
+    vmovq           xmm4, [p_src + i_srcstride]
+    vpunpcklbw      xmm0, xmm0, xmm4
+    vmovq           xmm1, [p_src + 2 * i_srcstride]
+    vpunpcklbw      xmm4, xmm4, xmm1
+    vinserti128     ymm0, ymm0, xmm4, 1
+    vmovq           xmm4, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklbw      xmm1, xmm1, xmm4
+    vmovq           xmm6, [p_src]
+    vpunpcklbw      xmm4, xmm4, xmm6
+    vinserti128     ymm1, ymm1, xmm4, 1
+.width8_yloop:
+    vmovq           xmm4, [p_src + i_srcstride]
+    vpunpcklbw      xmm2, xmm6, xmm4
+    vmovq           xmm3, [p_src + 2 * i_srcstride]
+    vpunpcklbw      xmm4, xmm4, xmm3
+    vinserti128     ymm2, ymm2, xmm4, 1
+    vbroadcasti128  ymm5, [pic(db20_128)]
+    AVX2_FilterVertical_16px ymm0, ymm1, ymm2, [pic(maddubsw_p1m5_256)], ymm5, [pic(maddubsw_m5p1_256)], ymm4
+    vmovq           xmm4, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklbw      xmm3, xmm3, xmm4
+    vmovq           xmm6, [p_src]
+    vpunpcklbw      xmm4, xmm4, xmm6
+    vinserti128     ymm3, ymm3, xmm4, 1
+    AVX2_FilterVertical_16px ymm1, ymm2, ymm3, [pic(maddubsw_p1m5_256)], ymm5, [pic(maddubsw_m5p1_256)], ymm4
+    vpackuswb       ymm0, ymm0, ymm1
+    vmovlps         [p_dst], xmm0
+    vextracti128    xmm1, ymm0, 1
+    vmovlps         [p_dst + i_dststride], xmm1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovhps         [p_dst], xmm0
+    vmovhps         [p_dst + i_dststride], xmm1
+    cmp             i_height, 4
+    jl              .width8_done
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovq           xmm4, [p_src + i_srcstride]
+    vpunpcklbw      xmm0, xmm6, xmm4
+    jg              .width8_height_ge8
+    AVX2_FilterVertical_16px xmm2, xmm3, xmm0, [pic(maddubsw_p1m5_256)], xmm5, [pic(maddubsw_m5p1_256)], xmm4
+    vpackuswb       xmm2, xmm2, xmm2
+    vmovlps         [p_dst], xmm2
+    jmp             .width8_done
+.width8_height_ge8:
+    vmovq           xmm1, [p_src + 2 * i_srcstride]
+    vpunpcklbw      xmm4, xmm4, xmm1
+    vinserti128     ymm0, ymm0, xmm4, 1
+    AVX2_FilterVertical_16px ymm2, ymm3, ymm0, [pic(maddubsw_p1m5_256)], ymm5, [pic(maddubsw_m5p1_256)], ymm4
+    vmovq           xmm4, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklbw      xmm1, xmm1, xmm4
+    vmovq           xmm6, [p_src]
+    vpunpcklbw      xmm4, xmm4, xmm6
+    vinserti128     ymm1, ymm1, xmm4, 1
+    AVX2_FilterVertical_16px ymm3, ymm0, ymm1, [pic(maddubsw_p1m5_256)], ymm5, [pic(maddubsw_m5p1_256)], ymm4
+    vpackuswb       ymm2, ymm2, ymm3
+    vmovlps         [p_dst], xmm2
+    vextracti128    xmm3, ymm2, 1
+    vmovlps         [p_dst + i_dststride], xmm3
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovhps         [p_dst], xmm2
+    vmovhps         [p_dst + i_dststride], xmm3
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jg              .width8_yloop
+    jl              .width8_done
+    vmovq           xmm4, [p_src + i_srcstride]
+    vpunpcklbw      xmm2, xmm6, xmm4
+    AVX2_FilterVertical_16px xmm0, xmm1, xmm2, [pic(maddubsw_p1m5_256)], xmm5, [pic(maddubsw_m5p1_256)], xmm4
+    vpackuswb       xmm0, xmm0, xmm0
+    vmovlps         [p_dst], xmm0
+.width8_done:
+    vzeroupper
+    DEINIT_X86_32_PIC_KEEPDEF
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+
+.width16:
+    sub             i_height, 1
+    test            i_height, 1
+    jnz             .width16_yloop_begin_even
+    vmovq           xmm0, [p_src]
+    vpbroadcastq    ymm1, [p_src + 8]
+    vpblendd        ymm0, ymm0, ymm1, 11110000b
+    vmovq           xmm1, [p_src + i_srcstride]
+    vpbroadcastq    ymm2, [p_src + i_srcstride + 8]
+    vpblendd        ymm1, ymm1, ymm2, 11110000b
+    vpunpcklbw      ymm0, ymm0, ymm1
+    vmovq           xmm2, [p_src + 2 * i_srcstride]
+    vpbroadcastq    ymm3, [p_src + 2 * i_srcstride + 8]
+    vpblendd        ymm2, ymm2, ymm3, 11110000b
+    vmovq           xmm3, [p_src + i_srcstride3]
+    vpbroadcastq    ymm4, [p_src + i_srcstride3 + 8]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpblendd        ymm3, ymm3, ymm4, 11110000b
+    vpunpcklbw      ymm2, ymm2, ymm3
+    vmovq           xmm4, [p_src]
+    vpbroadcastq    ymm5, [p_src + 8]
+    vpblendd        ymm4, ymm4, ymm5, 11110000b
+    vmovq           xmm5, [p_src + i_srcstride]
+    vpbroadcastq    ymm6, [p_src + i_srcstride + 8]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    vpblendd        ymm5, ymm5, ymm6, 11110000b
+    vpunpcklbw      ymm4, ymm4, ymm5
+    AVX2_FilterVertical_16px ymm0, ymm2, ymm4, [pic(maddubsw_p1m5_256)], [pic(db20_256)], [pic(maddubsw_m5p1_256)], ymm7
+    vpackuswb       ymm0, ymm0, ymm0
+    vpermq          ymm0, ymm0, 1000b
+    vmovdqa         [p_dst], xmm0
+    add             p_dst, i_dststride
+    jmp             .width16_yloop
+.width16_yloop_begin_even:
+    vmovq           xmm1, [p_src]
+    vpbroadcastq    ymm2, [p_src + 8]
+    vpblendd        ymm1, ymm1, ymm2, 11110000b
+    vmovq           xmm2, [p_src + i_srcstride]
+    vpbroadcastq    ymm3, [p_src + i_srcstride + 8]
+    vpblendd        ymm2, ymm2, ymm3, 11110000b
+    vmovq           xmm3, [p_src + 2 * i_srcstride]
+    vpbroadcastq    ymm4, [p_src + 2 * i_srcstride + 8]
+    add             p_src, i_srcstride3
+    vpblendd        ymm3, ymm3, ymm4, 11110000b
+    vpunpcklbw      ymm2, ymm2, ymm3
+    vmovq           xmm4, [p_src]
+    vpbroadcastq    ymm5, [p_src + 8]
+    vpblendd        ymm4, ymm4, ymm5, 11110000b
+    vmovq           xmm5, [p_src + i_srcstride]
+    vpbroadcastq    ymm6, [p_src + i_srcstride + 8]
+    lea             p_src, [p_src + 2 * i_srcstride]
+    vpblendd        ymm5, ymm5, ymm6, 11110000b
+    vpunpcklbw      ymm4, ymm4, ymm5
+.width16_yloop:
+    vmovq           xmm6, [p_src]
+    vpbroadcastq    ymm7, [p_src + 8]
+    vpblendd        ymm6, ymm6, ymm7, 11110000b
+    AVX2_FilterVertical2_16px ymm1, ymm6, ymm2, ymm4, [pic(maddubsw_m5p20_256)], [pic(maddubsw_p20m5_256)], ymm0, ymm7
+    vmovq           xmm7, [p_src + i_srcstride]
+    vpbroadcastq    ymm0, [p_src + i_srcstride + 8]
+    vpblendd        ymm7, ymm7, ymm0, 11110000b
+    vpunpcklbw      ymm6, ymm6, ymm7
+    AVX2_FilterVertical_16px ymm2, ymm4, ymm6, [pic(maddubsw_p1m5_256)], [pic(db20_256)], [pic(maddubsw_m5p1_256)], ymm0
+    vpackuswb       ymm1, ymm1, ymm2
+    vpermq          ymm1, ymm1, 11011000b
+    vmovdqa         [p_dst], xmm1
+    vextracti128    [p_dst + i_dststride], ymm1, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovq           xmm0, [p_src + 2 * i_srcstride]
+    vpbroadcastq    ymm1, [p_src + 2 * i_srcstride + 8]
+    vpblendd        ymm0, ymm0, ymm1, 11110000b
+    AVX2_FilterVertical2_16px ymm3, ymm0, ymm4, ymm6, [pic(maddubsw_m5p20_256)], [pic(maddubsw_p20m5_256)], ymm2, ymm1
+    vmovq           xmm1, [p_src + i_srcstride3]
+    vpbroadcastq    ymm2, [p_src + i_srcstride3 + 8]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpblendd        ymm1, ymm1, ymm2, 11110000b
+    vpunpcklbw      ymm0, ymm0, ymm1
+    AVX2_FilterVertical_16px ymm4, ymm6, ymm0, [pic(maddubsw_p1m5_256)], [pic(db20_256)], [pic(maddubsw_m5p1_256)], ymm2
+    vpackuswb       ymm3, ymm3, ymm4
+    vpermq          ymm3, ymm3, 11011000b
+    vmovdqa         [p_dst], xmm3
+    vextracti128    [p_dst + i_dststride], ymm3, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovq           xmm2, [p_src]
+    vpbroadcastq    ymm3, [p_src + 8]
+    vpblendd        ymm2, ymm2, ymm3, 11110000b
+    AVX2_FilterVertical2_16px ymm5, ymm2, ymm6, ymm0, [pic(maddubsw_m5p20_256)], [pic(maddubsw_p20m5_256)], ymm4, ymm3
+    vmovq           xmm3, [p_src + i_srcstride]
+    vpbroadcastq    ymm4, [p_src + i_srcstride + 8]
+    vpblendd        ymm3, ymm3, ymm4, 11110000b
+    vpunpcklbw      ymm2, ymm2, ymm3
+    AVX2_FilterVertical_16px ymm6, ymm0, ymm2, [pic(maddubsw_p1m5_256)], [pic(db20_256)], [pic(maddubsw_m5p1_256)], ymm4
+    vpackuswb       ymm5, ymm5, ymm6
+    vpermq          ymm5, ymm5, 11011000b
+    vmovdqa         [p_dst], xmm5
+    vextracti128    [p_dst + i_dststride], ymm5, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovq           xmm4, [p_src + 2 * i_srcstride]
+    vpbroadcastq    ymm5, [p_src + 2 * i_srcstride + 8]
+    vpblendd        ymm4, ymm4, ymm5, 11110000b
+    AVX2_FilterVertical2_16px ymm7, ymm4, ymm0, ymm2, [pic(maddubsw_m5p20_256)], [pic(maddubsw_p20m5_256)], ymm6, ymm5
+    vmovq           xmm5, [p_src + i_srcstride3]
+    vpbroadcastq    ymm6, [p_src + i_srcstride3 + 8]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpblendd        ymm5, ymm5, ymm6, 11110000b
+    vpunpcklbw      ymm4, ymm4, ymm5
+    AVX2_FilterVertical_16px ymm0, ymm2, ymm4, [pic(maddubsw_p1m5_256)], [pic(db20_256)], [pic(maddubsw_m5p1_256)], ymm6
+    vpackuswb       ymm7, ymm7, ymm0
+    vpermq          ymm7, ymm7, 11011000b
+    vmovdqa         [p_dst], xmm7
+    vextracti128    [p_dst + i_dststride], ymm7, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jg              .width16_yloop
+    vzeroupper
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef i_srcstride3
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+%undef i_ycnt
+
+
+;*******************************************************************************
+; void McHorVer20_avx2(const uint8_t *pSrc,
+;                      int iSrcStride,
+;                      uint8_t *pDst,
+;                      int iDstStride,
+;                      int iWidth,
+;                      int iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_width      r4
+%define i_height     r5
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    vbroadcasti128  ymm4, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm5, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    cmp             i_width, 8
+    je              .width8
+    jg              .width16_yloop
+%xdefine i_srcstride3 i_width
+%undef i_width
+    lea             i_srcstride3, [3 * i_srcstride]
+.width4_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm1, [p_src + i_srcstride - 2]
+    vinserti128     ymm0, ymm0, [p_src + 2 * i_srcstride - 2], 1
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride3 - 2], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    AVX2_FilterHorizontal_4x4px ymm0, ymm1, ymm4, ymm5, ymm6, ymm2, ymm3
+    vpackuswb       ymm0, ymm0, ymm0
+    vmovd           [p_dst], xmm0
+    vpsrlq          xmm1, xmm0, 32
+    vmovd           [p_dst + i_dststride], xmm1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vextracti128    xmm0, ymm0, 1
+    vmovd           [p_dst], xmm0
+    vpsrlq          xmm1, xmm0, 32
+    vmovd           [p_dst + i_dststride], xmm1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 4
+    jg              .width4_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width8:
+    lea             i_srcstride3, [3 * i_srcstride]
+.width8_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm1, [p_src + i_srcstride - 2]
+    vinserti128     ymm0, ymm0, [p_src + 2 * i_srcstride - 2], 1
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride3 - 2], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    AVX2_FilterHorizontal_16px ymm0, ymm4, ymm5, ymm6, ymm2, ymm3
+    AVX2_FilterHorizontal_16px ymm1, ymm4, ymm5, ymm6, ymm2, ymm3
+    vpackuswb       ymm0, ymm0, ymm1
+    vmovlps         [p_dst], xmm0
+    vmovhps         [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vextracti128    xmm0, ymm0, 1
+    vmovlps         [p_dst], xmm0
+    vmovhps         [p_dst + i_dststride], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 4
+    jg              .width8_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+%undef i_srcstride3
+.width16_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm1, [p_src + 6]
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride - 2], 1
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride + 6], 1
+    lea             p_src, [p_src + 2 * i_srcstride]
+    AVX2_FilterHorizontal_16px ymm0, ymm4, ymm5, ymm6, ymm2, ymm3
+    AVX2_FilterHorizontal_16px ymm1, ymm4, ymm5, ymm6, ymm2, ymm3
+    vpackuswb       ymm0, ymm0, ymm1
+    vmovdqa         [p_dst], xmm0
+    vextracti128    [p_dst + i_dststride], ymm0, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 2
+    jg              .width16_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+
+
+;***********************************************************************
+; void McHorVer20Width5Or9Or17_avx2(const uint8_t *pSrc,
+;                                   int32_t iSrcStride,
+;                                   uint8_t *pDst,
+;                                   int32_t iDstStride,
+;                                   int32_t iWidth,
+;                                   int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer20Width5Or9Or17_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%define i_width      r4
+%define i_height     r5
+    %assign  push_num 0
+    INIT_X86_32_PIC r6
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    vbroadcasti128  ymm5, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm6, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm7, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    cmp             i_width, 9
+    je              .width9
+    jg              .width17
+.width5_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride - 2], 1
+    lea             p_src, [p_src + 2 * i_srcstride]
+    AVX2_FilterHorizontal_16px ymm0, ymm5, ymm6, ymm7, ymm1, ymm2
+    vpackuswb       ymm0, ymm0, ymm0
+    vpsrlq          xmm1, xmm0, 8
+    vmovd           [p_dst + 1], xmm1
+    vmovd           [p_dst], xmm0
+    add             p_dst, i_dststride
+    vextracti128    xmm0, ymm0, 1
+    vpsrlq          xmm1, xmm0, 8
+    vmovd           [p_dst + 1], xmm1
+    vmovd           [p_dst], xmm0
+    add             p_dst, i_dststride
+    sub             i_height, 2
+    jg              .width5_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width9:
+%xdefine i_srcstride3 i_width
+%undef i_width
+    lea             i_srcstride3, [3 * i_srcstride]
+.width9_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm4, [p_src + i_srcstride - 2]
+    vinserti128     ymm0, ymm0, [p_src + 2 * i_srcstride - 2], 1
+    vinserti128     ymm4, ymm4, [p_src + i_srcstride3 - 2], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpckhqdq     ymm3, ymm0, ymm4
+    AVX2_FilterHorizontal_4px ymm3, ymm2
+    AVX2_FilterHorizontal_16px ymm0, ymm5, ymm6, ymm7, ymm1, ymm2
+    vpackuswb       ymm3, ymm3, ymm0
+    vmovd           [p_dst + 5], xmm3
+    vmovhps         [p_dst], xmm3
+    add             p_dst, i_dststride
+    AVX2_FilterHorizontal_16px ymm4, ymm5, ymm6, ymm7, ymm1, ymm2
+    vpackuswb       ymm4, ymm4, ymm4
+    vpsrlq          xmm2, xmm3, 32
+    vmovd           [p_dst + 5], xmm2
+    vmovlps         [p_dst], xmm4
+    add             p_dst, i_dststride
+    vextracti128    xmm3, ymm3, 1
+    vextracti128    xmm4, ymm4, 1
+    vmovd           [p_dst + 5], xmm3
+    vmovhps         [p_dst], xmm3
+    add             p_dst, i_dststride
+    vpsrlq          xmm2, xmm3, 32
+    vmovd           [p_dst + 5], xmm2
+    vmovlps         [p_dst], xmm4
+    add             p_dst, i_dststride
+    sub             i_height, 4
+    jg              .width9_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC_KEEPDEF
+    ret
+.width17:
+    lea             i_srcstride3, [3 * i_srcstride]
+.width17_yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm3, [p_src + 6]
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride - 2], 1
+    vinserti128     ymm3, ymm3, [p_src + i_srcstride + 6], 1
+    vmovdqa         ymm4, ymm3
+    AVX2_FilterHorizontal_16px ymm0, ymm5, ymm6, ymm7, ymm1, ymm2
+    AVX2_FilterHorizontal_16px ymm3, ymm5, ymm6, ymm7, ymm1, ymm2
+    vpackuswb       ymm0, ymm0, ymm3
+    vmovdqu         xmm1, [p_src + 2 * i_srcstride - 2]
+    vmovdqu         xmm3, [p_src + 2 * i_srcstride + 6]
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride3 - 2], 1
+    vinserti128     ymm3, ymm3, [p_src + i_srcstride3 + 6], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpckhqdq     ymm4, ymm4, ymm3
+    AVX2_FilterHorizontal_4px ymm4, ymm2
+    vpackuswb       ymm4, ymm4, ymm4
+    vmovd           [p_dst + 13], xmm4
+    vmovdqa         [p_dst], xmm0
+    add             p_dst, i_dststride
+    vextracti128    xmm2, ymm4, 1
+    vmovd           [p_dst + 13], xmm2
+    vextracti128    [p_dst], ymm0, 1
+    add             p_dst, i_dststride
+    vpsrlq          xmm4, xmm4, 32
+    vmovd           [p_dst + 13], xmm4
+    AVX2_FilterHorizontal_16px ymm1, ymm5, ymm6, ymm7, ymm0, ymm4
+    AVX2_FilterHorizontal_16px ymm3, ymm5, ymm6, ymm7, ymm0, ymm4
+    vpackuswb       ymm1, ymm1, ymm3
+    vmovdqa         [p_dst], xmm1
+    add             p_dst, i_dststride
+    vpsrlq          xmm2, xmm2, 32
+    vmovd           [p_dst + 13], xmm2
+    vextracti128    [p_dst], ymm1, 1
+    add             p_dst, i_dststride
+    sub             i_height, 4
+    jg              .width17_yloop
+    vzeroupper
+    POP_XMM
+    LOAD_6_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef i_srcstride3
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+
+
+;*******************************************************************************
+; void McHorVer20Width4U8ToS16_avx2(const uint8_t *pSrc,
+;                                   int iSrcStride,
+;                                   int16_t *pDst,
+;                                   int iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20Width4U8ToS16_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_height     r3
+%define i_srcstride3 r4
+%define i_dststride   8
+    %assign  push_num 0
+%ifdef X86_32
+    push            r4
+    %assign  push_num 1
+%endif
+    INIT_X86_32_PIC r5
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    lea             i_srcstride3, [3 * i_srcstride]
+    vbroadcasti128  ymm4, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm5, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 3
+.yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm1, [p_src + i_srcstride - 2]
+    vinserti128     ymm0, ymm0, [p_src + 2 * i_srcstride - 2], 1
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride3 - 2], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    AVX2_FilterHorizontalbw_4x4px ymm0, ymm1, ymm4, ymm5, ymm6, ymm2, ymm3
+    vmovdqa         [p_dst], ymm0
+    add             p_dst, 4 * i_dststride
+    sub             i_height, 4
+    jg              .yloop
+    ; Height % 4 remaining single.
+    vmovdqu         xmm0, [p_src - 2]
+    AVX2_FilterHorizontalbw_16px xmm0, xmm4, xmm5, xmm6, xmm2, xmm3
+    vmovlps         [p_dst], xmm0
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r4
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_height
+%undef i_srcstride3
+%undef i_dststride
+
+
+;***********************************************************************
+; void McHorVer02Width4S16ToU8_avx2(const int16_t *pSrc,
+;                                   uint8_t *pDst,
+;                                   int32_t iDstStride,
+;                                   int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width4S16ToU8_avx2
+%define p_src        r0
+%define p_dst        r1
+%define i_dststride  r2
+%define i_height     r3
+%define i_dststride3 r4
+%define i_srcstride  8
+    %assign  push_num 0
+%ifdef X86_32
+    push            r4
+    %assign  push_num 1
+%endif
+    INIT_X86_32_PIC r5
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    lea             i_dststride3, [3 * i_dststride]
+    vmovdqu         ymm0, [p_src +  0 * i_srcstride]
+    vmovdqu         ymm1, [p_src +  1 * i_srcstride]
+    vmovdqu         ymm2, [p_src +  2 * i_srcstride]
+    vmovdqu         ymm3, [p_src +  3 * i_srcstride]
+    vmovdqu         ymm4, [p_src +  4 * i_srcstride]
+    vmovdqu         ymm5, [p_src +  5 * i_srcstride]
+    vmovdqu         ymm6, [p_src +  6 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm7
+    vpackuswb       ymm0, ymm0, ymm0
+    vmovd           [p_dst], xmm0
+    vpsrlq          xmm7, xmm0, 32
+    vmovd           [p_dst + i_dststride], xmm7
+    vextracti128    xmm0, ymm0, 1
+    vmovd           [p_dst + 2 * i_dststride], xmm0
+    vpsrlq          xmm7, xmm0, 32
+    vmovd           [p_dst + i_dststride3], xmm7
+    cmp             i_height, 4
+    jle             .done
+    lea             p_dst, [p_dst + 4 * i_dststride]
+    vmovdqu         ymm7, [p_src +  7 * i_srcstride]
+    vmovdqu         ymm0, [p_src +  8 * i_srcstride]
+    vmovdqu         ymm1, [p_src +  9 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm4, ymm5, ymm6, ymm7, ymm0, ymm1, ymm3
+    vpackuswb       ymm4, ymm4, ymm4
+    vmovd           [p_dst], xmm4
+    vpsrlq          xmm3, xmm4, 32
+    vmovd           [p_dst + i_dststride], xmm3
+    vextracti128    xmm4, ymm4, 1
+    vmovd           [p_dst + 2 * i_dststride], xmm4
+    vpsrlq          xmm3, xmm4, 32
+    vmovd           [p_dst + i_dststride3], xmm3
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r4
+%endif
+    ret
+%undef p_src
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_srcstride
+%undef i_dststride3
+
+
+;*******************************************************************************
+; void McHorVer20Width8U8ToS16_avx2(const uint8_t *pSrc,
+;                                   int iSrcStride,
+;                                   int16_t *pDst,
+;                                   int iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20Width8U8ToS16_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_height     r3
+%define i_dststride  16
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 6
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    vbroadcasti128  ymm3, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm4, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm5, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 1
+.yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride - 2], 1
+    lea             p_src, [p_src + 2 * i_srcstride]
+    AVX2_FilterHorizontalbw_16px ymm0, ymm3, ymm4, ymm5, ymm1, ymm2
+    vmovdqu         [p_dst], ymm0
+    add             p_dst, 2 * i_dststride
+    sub             i_height, 2
+    jg              .yloop
+    jl              .done
+    vmovdqu         xmm0, [p_src - 2]
+    AVX2_FilterHorizontalbw_16px xmm0, xmm3, xmm4, xmm5, xmm1, xmm2
+    vmovdqa         [p_dst], xmm0
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_height
+%undef i_dststride
+
+
+;***********************************************************************
+; void McHorVer02Width5S16ToU8_avx2(const int16_t *pSrc,
+;                                   uint8_t *pDst,
+;                                   int32_t iDstStride,
+;                                   int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width5S16ToU8_avx2
+%define p_src        r0
+%define p_dst        r1
+%define i_dststride  r2
+%define i_height     r3
+%define i_srcstride  16
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    vmovdqu         ymm0, [p_src +  0 * i_srcstride]
+    vmovdqu         ymm2, [p_src +  2 * i_srcstride]
+    vmovdqu         ymm4, [p_src +  4 * i_srcstride]
+    vmovdqu         ymm6, [p_src +  6 * i_srcstride]
+    vperm2i128      ymm1, ymm0, ymm2, 00100001b
+    vperm2i128      ymm3, ymm2, ymm4, 00100001b
+    vperm2i128      ymm5, ymm4, ymm6, 00100001b
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm7
+    vpackuswb       ymm0, ymm0, ymm0
+    vpsrlq          xmm7, xmm0, 8
+    vmovd           [p_dst + 1], xmm7
+    vmovd           [p_dst], xmm0
+    add             p_dst, i_dststride
+    vextracti128    xmm0, ymm0, 1
+    vpsrlq          xmm7, xmm0, 8
+    vmovd           [p_dst + 1], xmm7
+    vmovd           [p_dst], xmm0
+    add             p_dst, i_dststride
+    vmovdqu         ymm7, [p_src +  7 * i_srcstride]
+    vmovdqu         ymm0, [p_src +  8 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm2, ymm3, ymm4, ymm5, ymm6, ymm7, ymm1
+    vpackuswb       ymm2, ymm2, ymm2
+    vpsrlq          xmm1, xmm2, 8
+    vmovd           [p_dst + 1], xmm1
+    vmovd           [p_dst], xmm2
+    add             p_dst, i_dststride
+    vextracti128    xmm2, ymm2, 1
+    vpsrlq          xmm1, xmm2, 8
+    vmovd           [p_dst + 1], xmm1
+    vmovd           [p_dst], xmm2
+    add             p_dst, i_dststride
+    vmovdqu         ymm1, [p_src +  9 * i_srcstride]
+    vmovdqu         ymm2, [p_src + 10 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm4, ymm5, ymm6, ymm7, ymm0, ymm1, ymm3
+    vpackuswb       ymm4, ymm4, ymm4
+    vpsrlq          xmm3, xmm4, 8
+    vmovd           [p_dst + 1], xmm3
+    vmovd           [p_dst], xmm4
+    cmp             i_height, 5
+    jle             .done
+    add             p_dst, i_dststride
+    vextracti128    xmm4, ymm4, 1
+    vpsrlq          xmm3, xmm4, 8
+    vmovd           [p_dst + 1], xmm3
+    vmovd           [p_dst], xmm4
+    add             p_dst, i_dststride
+    vmovdqu         ymm3, [p_src + 11 * i_srcstride]
+    vmovdqu         xmm4, [p_src + 12 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm6, ymm7, ymm0, ymm1, ymm2, ymm3, ymm5
+    vpackuswb       ymm6, ymm6, ymm6
+    vpsrlq          xmm5, xmm6, 8
+    vmovd           [p_dst + 1], xmm5
+    vmovd           [p_dst], xmm6
+    add             p_dst, i_dststride
+    vextracti128    xmm6, ymm6, 1
+    vpsrlq          xmm5, xmm6, 8
+    vmovd           [p_dst + 1], xmm5
+    vmovd           [p_dst], xmm6
+    add             p_dst, i_dststride
+    vmovdqu         xmm5, [p_src + 13 * i_srcstride]
+    AVX2_FilterVerticalw_16px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm7
+    vpackuswb       xmm0, xmm0, xmm0
+    vpsrlq          xmm7, xmm0, 8
+    vmovd           [p_dst + 1], xmm7
+    vmovd           [p_dst], xmm0
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_srcstride
+
+
+;***********************************************************************
+; void McHorVer02Width8S16ToU8_avx2(const int16_t *pSrc,
+;                                   uint8_t *pDst,
+;                                   int32_t iDstStride,
+;                                   int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width8S16ToU8_avx2
+%define p_src        r0
+%define p_dst        r1
+%define i_dststride  r2
+%define i_height     r3
+%define i_dststride3 r4
+%define i_srcstride  16
+    %assign  push_num 0
+%ifdef X86_32
+    push            r4
+    %assign  push_num 1
+%endif
+    INIT_X86_32_PIC r5
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    lea             i_dststride3, [3 * i_dststride]
+    vmovdqa         ymm0, [p_src +  0 * i_srcstride]
+    vmovdqa         ymm2, [p_src +  2 * i_srcstride]
+    vmovdqa         ymm4, [p_src +  4 * i_srcstride]
+    vperm2i128      ymm1, ymm0, ymm2, 00100001b
+    vperm2i128      ymm3, ymm2, ymm4, 00100001b
+.yloop:
+    vmovdqa         ymm6, [p_src +  6 * i_srcstride]
+    vperm2i128      ymm5, ymm4, ymm6, 00100001b
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm7
+    vmovdqu         ymm7, [p_src +  7 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm2, ymm3, ymm4, ymm5, ymm6, ymm7, ymm1
+    vpackuswb       ymm1, ymm0, ymm2
+    vmovdqa         ymm0, [p_src +  8 * i_srcstride]
+    vextracti128    xmm2, ymm1, 1
+    vmovlps         [p_dst], xmm1
+    vmovlps         [p_dst + i_dststride], xmm2
+    vmovhps         [p_dst + 2 * i_dststride], xmm1
+    vmovhps         [p_dst + i_dststride3], xmm2
+    cmp             i_height, 4
+    jle             .done
+    lea             p_dst, [p_dst + 4 * i_dststride]
+    vmovdqu         ymm1, [p_src +  9 * i_srcstride]
+    vmovdqa         ymm2, [p_src + 10 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm4, ymm5, ymm6, ymm7, ymm0, ymm1, ymm3
+    vmovdqu         ymm3, [p_src + 11 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm6, ymm7, ymm0, ymm1, ymm2, ymm3, ymm5
+    vpackuswb       ymm5, ymm4, ymm6
+    vmovdqa         ymm4, [p_src + 12 * i_srcstride]
+    add             p_src, 8 * i_srcstride
+    vextracti128    xmm6, ymm5, 1
+    vmovlps         [p_dst], xmm5
+    vmovlps         [p_dst + i_dststride], xmm6
+    vmovhps         [p_dst + 2 * i_dststride], xmm5
+    vmovhps         [p_dst + i_dststride3], xmm6
+    lea             p_dst, [p_dst + 4 * i_dststride]
+    sub             i_height, 8
+    jg              .yloop
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r4
+%endif
+    ret
+%undef p_src
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_dststride3
+%undef i_srcstride
+
+
+;*******************************************************************************
+; void McHorVer20Width16U8ToS16_avx2(const uint8_t *pSrc,
+;                                    int32_t iSrcStride,
+;                                    int16_t *pDst,
+;                                    int32_t iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20Width16U8ToS16_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_height     r3
+%define i_dststride  32
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    vbroadcasti128  ymm4, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm5, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm6, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 1
+.yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vinserti128     ymm0, ymm0, [p_src + 6], 1
+    vmovdqu         xmm1, [p_src + i_srcstride - 2]
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride + 6], 1
+    lea             p_src, [p_src + 2 * i_srcstride]
+    AVX2_FilterHorizontalbw_16px ymm0, ymm4, ymm5, ymm6, ymm2, ymm3
+    vmovdqa         [p_dst], ymm0
+    AVX2_FilterHorizontalbw_16px ymm1, ymm4, ymm5, ymm6, ymm2, ymm3
+    vmovdqa         [p_dst + i_dststride], ymm1
+    add             p_dst, 2 * i_dststride
+    sub             i_height, 2
+    jg              .yloop
+    jl              .done
+    vmovdqu         xmm0, [p_src - 2]
+    vinserti128     ymm0, ymm0, [p_src + 6], 1
+    AVX2_FilterHorizontalbw_16px ymm0, ymm4, ymm5, ymm6, ymm1, ymm2
+    vmovdqa         [p_dst], ymm0
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_height
+%undef i_dststride
+
+
+;***********************************************************************
+; void McHorVer02Width9S16ToU8_avx2(const int16_t *pSrc,
+;                                   uint8_t *pDst,
+;                                   int32_t iDstStride,
+;                                   int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width9S16ToU8_avx2
+%define p_src        r0
+%define p_dst        r1
+%define i_dststride  r2
+%define i_height     r3
+%define i_srcstride  32
+    %assign  push_num 0
+    INIT_X86_32_PIC r4
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    vmovdqa         ymm0, [p_src + 0 * i_srcstride]
+    vmovdqa         ymm1, [p_src + 1 * i_srcstride]
+    vmovdqa         ymm2, [p_src + 2 * i_srcstride]
+    vmovdqa         ymm3, [p_src + 3 * i_srcstride]
+    vmovdqa         ymm4, [p_src + 4 * i_srcstride]
+    sub             i_height, 1
+.height_loop:
+    vmovdqa         ymm5, [p_src + 5 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6
+    vmovdqa         ymm6, [p_src + 6 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm1, ymm2, ymm3, ymm4, ymm5, ymm6, ymm7
+    vmovdqa         ymm7, [p_src + 7 * i_srcstride]
+    vpackuswb       ymm0, ymm0, ymm1
+    vextracti128    xmm1, ymm0, 1
+    vpsllq          xmm1, xmm1, 56
+    vmovlps         [p_dst + 1], xmm1
+    vmovlps         [p_dst], xmm0
+    add             p_dst, i_dststride
+    vmovhps         [p_dst + 1], xmm1
+    vmovhps         [p_dst], xmm0
+    add             p_dst, i_dststride
+    AVX2_FilterVerticalw_16px ymm2, ymm3, ymm4, ymm5, ymm6, ymm7, ymm0
+    vmovdqa         ymm0, [p_src + 8 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm3, ymm4, ymm5, ymm6, ymm7, ymm0, ymm1
+    vpackuswb       ymm2, ymm2, ymm3
+    vextracti128    xmm3, ymm2, 1
+    vpsllq          xmm3, xmm3, 56
+    vmovlps         [p_dst + 1], xmm3
+    vmovlps         [p_dst], xmm2
+    add             p_dst, i_dststride
+    vmovhps         [p_dst + 1], xmm3
+    vmovhps         [p_dst], xmm2
+    add             p_dst, i_dststride
+    vmovdqa         ymm1, [p_src + 9 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm4, ymm5, ymm6, ymm7, ymm0, ymm1, ymm2
+    vmovdqa         ymm2, [p_src + 10 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm5, ymm6, ymm7, ymm0, ymm1, ymm2, ymm3
+    vmovdqa         ymm3, [p_src + 11 * i_srcstride]
+    vpackuswb       ymm4, ymm4, ymm5
+    vextracti128    xmm5, ymm4, 1
+    vpsllq          xmm5, xmm5, 56
+    vmovlps         [p_dst + 1], xmm5
+    vmovlps         [p_dst], xmm4
+    cmp             i_height, 4
+    jle             .done
+    add             p_dst, i_dststride
+    vmovhps         [p_dst + 1], xmm5
+    vmovhps         [p_dst], xmm4
+    add             p_dst, i_dststride
+    AVX2_FilterVerticalw_16px ymm6, ymm7, ymm0, ymm1, ymm2, ymm3, ymm4
+    vmovdqa         ymm4, [p_src + 12 * i_srcstride]
+    add             p_src, 8 * i_srcstride
+    AVX2_FilterVerticalw_16px ymm7, ymm0, ymm1, ymm2, ymm3, ymm4, ymm5
+    vpackuswb       ymm6, ymm6, ymm7
+    vextracti128    xmm7, ymm6, 1
+    vpsllq          xmm7, xmm7, 56
+    vmovlps         [p_dst + 1], xmm7
+    vmovlps         [p_dst], xmm6
+    add             p_dst, i_dststride
+    vmovhps         [p_dst + 1], xmm7
+    vmovhps         [p_dst], xmm6
+    add             p_dst, i_dststride
+    sub             i_height, 8
+    jg              .height_loop
+    vmovdqa         ymm5, [p_src + 5 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6
+    vpackuswb       ymm0, ymm0, ymm0
+    vextracti128    xmm1, ymm0, 1
+    vpsllq          xmm1, xmm1, 56
+    vmovlps         [p_dst + 1], xmm1
+    vmovlps         [p_dst], xmm0
+.done:
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_height
+
+
+;*******************************************************************************
+; void McHorVer20Width17U8ToS16_avx2(const uint8_t *pSrc,
+;                                    int32_t iSrcStride,
+;                                    int16_t *pDst,
+;                                    int32_t iHeight);
+;*******************************************************************************
+
+WELS_EXTERN McHorVer20Width17U8ToS16_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_height     r3
+%define i_srcstride3 r4
+%define i_dststride  64
+    %assign  push_num 0
+%ifdef X86_32
+    push            r4
+    %assign  push_num 1
+%endif
+    INIT_X86_32_PIC r5
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub             p_src, i_srcstride
+    sub             p_src, i_srcstride
+    lea             i_srcstride3, [3 * i_srcstride]
+    vbroadcasti128  ymm5, [pic(shufb_32435465768798A9)]
+    vbroadcasti128  ymm6, [pic(shufb_011267784556ABBC)]
+    vbroadcasti128  ymm7, [pic(maddubsw_p1m5_p1m5_m5p1_m5p1_128)]
+    sub             i_height, 3
+.yloop:
+    vmovdqu         xmm0, [p_src - 2]
+    vmovdqu         xmm3, [p_src + 6]
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride - 2], 1
+    vinserti128     ymm3, ymm3, [p_src + i_srcstride + 6], 1
+    vmovdqa         ymm4, ymm3
+    AVX2_FilterHorizontalbw_16px ymm0, ymm5, ymm6, ymm7, ymm1, ymm2
+    vmovdqa         [p_dst], xmm0
+    vextracti128    [p_dst + i_dststride], ymm0, 1
+    AVX2_FilterHorizontalbw_16px ymm3, ymm5, ymm6, ymm7, ymm1, ymm2
+    vmovdqu         xmm1, [p_src + 2 * i_srcstride - 2]
+    vmovdqu         xmm0, [p_src + 2 * i_srcstride + 6]
+    vinserti128     ymm1, ymm1, [p_src + i_srcstride3 - 2], 1
+    vinserti128     ymm0, ymm0, [p_src + i_srcstride3 + 6], 1
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpckhqdq     ymm4, ymm4, ymm0
+    AVX2_FilterHorizontalbw_4px ymm4, [pic(dwm32768_256)], ymm2
+    vmovlps         [p_dst + 26], xmm4
+    vmovdqa         [p_dst + 16], xmm3
+    vextracti128    xmm2, ymm4, 1
+    vmovlps         [p_dst + i_dststride + 26], xmm2
+    vextracti128    [p_dst + i_dststride + 16], ymm3, 1
+    vmovhps         [p_dst + 2 * i_dststride + 26], xmm4
+    AVX2_FilterHorizontalbw_16px ymm1, ymm5, ymm6, ymm7, ymm3, ymm4
+    vmovdqa         [p_dst + 2 * i_dststride], xmm1
+    AVX2_FilterHorizontalbw_16px ymm0, ymm5, ymm6, ymm7, ymm3, ymm4
+    vmovdqa         [p_dst + 2 * i_dststride + 16], xmm0
+    vextracti128    [p_dst + 3 * i_dststride], ymm1, 1
+    vmovhps         [p_dst + 3 * i_dststride + 26], xmm2
+    vextracti128    [p_dst + 3 * i_dststride + 16], ymm0, 1
+    add             p_dst, 4 * i_dststride
+    sub             i_height, 4
+    jg              .yloop
+    ; Handle remaining 2 lines after 4x unrolled loop.
+    vmovdqu         xmm0, [p_src - 2]
+    vinserti128     ymm0, ymm0, [p_src + 6], 1
+    vmovdqu         xmm3, [p_src + i_srcstride - 2]
+    vinserti128     ymm3, ymm3, [p_src + i_srcstride + 6], 1
+    vpunpckhqdq     ymm4, ymm0, ymm3
+    AVX2_FilterHorizontalbw_4px ymm4, [pic(dwm32768_256)], ymm2
+    AVX2_FilterHorizontalbw_16px ymm0, ymm5, ymm6, ymm7, ymm1, ymm2
+    AVX2_FilterHorizontalbw_16px ymm3, ymm5, ymm6, ymm7, ymm1, ymm2
+    vextracti128    xmm4, ymm4, 1
+    vmovlps         [p_dst + 26], xmm4
+    vmovdqa         [p_dst], ymm0
+    vmovhps         [p_dst + i_dststride + 26], xmm4
+    vmovdqa         [p_dst + i_dststride], ymm3
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r4
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_height
+%undef i_srcstride3
+
+
+;***********************************************************************
+; void McHorVer02Width16Or17S16ToU8_avx2(const int16_t *pSrc,
+;                                        int32_t iSrcStride,
+;                                        uint8_t *pDst,
+;                                        int32_t iDstStride,
+;                                        int32_t iWidth,
+;                                        int32_t iHeight);
+;***********************************************************************
+
+WELS_EXTERN McHorVer02Width16Or17S16ToU8_avx2
+%define p_src        r0
+%define i_srcstride  r1
+%define p_dst        r2
+%define i_dststride  r3
+%ifdef X86_32_PICASM
+%define i_width      dword arg5
+%else
+%define i_width      r4
+%endif
+%define i_height     r5
+%define i_srcstride3 r6
+    %assign  push_num 0
+%ifdef X86_32
+    push            r6
+    %assign  push_num 1
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    SIGN_EXTENSION  r5, r5d
+    INIT_X86_32_PIC_NOPRESERVE r4
+    sub             i_height, 1
+    lea             i_srcstride3, [3 * i_srcstride]
+    test            i_width, 1
+    jz              .align_begin
+    push            i_height
+    push            p_src
+    push            p_dst
+    %assign push_num push_num + 3
+%ifdef X86_32_PICASM
+    add             p_src, i_width
+    add             p_src, i_width
+    sub             p_src, 2
+%else
+    lea             p_src, [p_src + 2 * i_width - 2]
+%endif
+    add             p_dst, i_width
+    vmovd           xmm0, [p_src]
+    vpunpcklwd      xmm0, xmm0, [p_src + i_srcstride]
+    vmovd           xmm1, [p_src + 2 * i_srcstride]
+    add             p_src, i_srcstride3
+    vpunpcklwd      xmm1, xmm1, [p_src]
+    vpunpckldq      xmm0, xmm0, xmm1
+    vmovd           xmm1, [p_src + i_srcstride]
+    vpunpcklwd      xmm1, xmm1, [p_src + 2 * i_srcstride]
+    vmovd           xmm2, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklwd      xmm2, xmm2, [p_src]
+    vpunpckldq      xmm1, xmm1, xmm2
+    vpunpcklqdq     xmm0, xmm0, xmm1
+.height_loop_unalign:
+    vmovd           xmm1, [p_src + i_srcstride]
+    vpalignr        xmm1, xmm1, xmm0, 2
+    vmovd           xmm2, [p_src + 2 * i_srcstride]
+    vpalignr        xmm2, xmm2, xmm1, 2
+    vmovd           xmm3, [p_src + i_srcstride3]
+    vpalignr        xmm3, xmm3, xmm2, 2
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vmovd           xmm4, [p_src]
+    vpalignr        xmm4, xmm4, xmm3, 2
+    vmovd           xmm5, [p_src + i_srcstride]
+    vpalignr        xmm5, xmm5, xmm4, 2
+    AVX2_FilterVerticalw_16px xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm7
+    vpackuswb       xmm0, xmm0, xmm0
+    vpslld          xmm6, xmm0, 24
+    vmovd           [p_dst - 4], xmm6
+    vmovlps         [p_dst + 4 * i_dststride - 8], xmm6
+    add             p_dst, i_dststride
+    vpslld          xmm6, xmm0, 16
+    vmovd           [p_dst - 4], xmm6
+    vmovlps         [p_dst + 4 * i_dststride - 8], xmm6
+    add             p_dst, i_dststride
+    vpslld          xmm6, xmm0, 8
+    vmovd           [p_dst - 4], xmm6
+    vmovd           [p_dst + i_dststride - 4], xmm0
+    lea             p_dst, [p_dst + 4 * i_dststride]
+    vmovlps         [p_dst - 8], xmm6
+    vmovlps         [p_dst + i_dststride - 8], xmm0
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jle             .height_loop_unalign_exit
+    vmovd           xmm1, [p_src + 2 * i_srcstride]
+    vpalignr        xmm1, xmm1, xmm5, 2
+    vmovd           xmm0, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpunpcklwd      xmm0, xmm0, [p_src]
+    vpalignr        xmm0, xmm0, xmm1, 4
+    jmp             .height_loop_unalign
+.height_loop_unalign_exit:
+    vpbroadcastq    xmm6, [p_src + 2 * i_srcstride - 6]
+    AVX2_FilterVerticalw_16px xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7
+    vpackuswb       xmm1, xmm1, xmm1
+    vmovlps         [p_dst - 8], xmm1
+    pop             p_dst
+    pop             p_src
+    pop             i_height
+    %assign push_num push_num - 3
+.align_begin:
+    vmovdqa         ymm0, [p_src]
+    vmovdqa         ymm1, [p_src + i_srcstride]
+    vmovdqa         ymm2, [p_src + 2 * i_srcstride]
+    vmovdqa         ymm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vmovdqa         ymm4, [p_src]
+.height_loop:
+    vmovdqa         ymm5, [p_src + i_srcstride]
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6
+    vmovdqa         ymm6, [p_src + 2 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm1, ymm2, ymm3, ymm4, ymm5, ymm6, ymm7
+    vmovdqa         ymm7, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpackuswb       ymm0, ymm0, ymm1
+    vpermq          ymm0, ymm0, 11011000b
+    vmovdqa         [p_dst], xmm0
+    vextracti128    [p_dst + i_dststride], ymm0, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    AVX2_FilterVerticalw_16px ymm2, ymm3, ymm4, ymm5, ymm6, ymm7, ymm0
+    vmovdqa         ymm0, [p_src]
+    AVX2_FilterVerticalw_16px ymm3, ymm4, ymm5, ymm6, ymm7, ymm0, ymm1
+    vpackuswb       ymm2, ymm2, ymm3
+    vpermq          ymm2, ymm2, 11011000b
+    vmovdqa         [p_dst], xmm2
+    vextracti128    [p_dst + i_dststride], ymm2, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    vmovdqa         ymm1, [p_src + i_srcstride]
+    AVX2_FilterVerticalw_16px ymm4, ymm5, ymm6, ymm7, ymm0, ymm1, ymm2
+    vmovdqa         ymm2, [p_src + 2 * i_srcstride]
+    AVX2_FilterVerticalw_16px ymm5, ymm6, ymm7, ymm0, ymm1, ymm2, ymm3
+    vmovdqa         ymm3, [p_src + i_srcstride3]
+    lea             p_src, [p_src + 4 * i_srcstride]
+    vpackuswb       ymm4, ymm4, ymm5
+    vpermq          ymm4, ymm4, 11011000b
+    vmovdqa        [p_dst], xmm4
+    vextracti128   [p_dst + i_dststride], ymm4, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    AVX2_FilterVerticalw_16px ymm6, ymm7, ymm0, ymm1, ymm2, ymm3, ymm4
+    vmovdqa         ymm4, [p_src]
+    AVX2_FilterVerticalw_16px ymm7, ymm0, ymm1, ymm2, ymm3, ymm4, ymm5
+    vpackuswb       ymm6, ymm6, ymm7
+    vpermq          ymm6, ymm6, 11011000b
+    vmovdqa         [p_dst], xmm6
+    vextracti128    [p_dst + i_dststride], ymm6, 1
+    lea             p_dst, [p_dst + 2 * i_dststride]
+    sub             i_height, 8
+    jg              .height_loop
+    jl              .done
+    vmovdqa         ymm5, [p_src + i_srcstride]
+    AVX2_FilterVerticalw_16px ymm0, ymm1, ymm2, ymm3, ymm4, ymm5, ymm6
+    vpackuswb       ymm0, ymm0, ymm0
+    vpermq          ymm0, ymm0, 11011000b
+    vmovdqa         [p_dst], xmm0
+.done:
+    vzeroupper
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop             r6
+%endif
+    ret
+%undef p_src
+%undef i_srcstride
+%undef p_dst
+%undef i_dststride
+%undef i_width
+%undef i_height
+%undef i_srcstride3
+
+%endif ; HAVE_AVX2
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/satd_sad.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/satd_sad.asm
new file mode 100644
index 0000000000..3dfc532b4b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/satd_sad.asm
@@ -0,0 +1,2734 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  satd_sad.asm
+;*
+;*  Abstract
+;*      WelsSampleSatd4x4_sse2
+;*      WelsSampleSatd8x8_sse2
+;*      WelsSampleSatd16x8_sse2
+;*      WelsSampleSatd8x16_sse2
+;*      WelsSampleSatd16x16_sse2
+;*
+;*      WelsSampleSad16x8_sse2
+;*      WelsSampleSad16x16_sse2
+;*
+;*  History
+;*      8/5/2009 Created
+;*     24/9/2009 modified
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Data
+;***********************************************************************
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+align 16
+HSumSubDB1:   db 1,1,1,1,1,1,1,1,1,-1,1,-1,1,-1,1,-1
+align 16
+HSumSubDW1:   dw 1,-1,1,-1,1,-1,1,-1
+align 16
+PDW1:  dw 1,1,1,1,1,1,1,1
+align 16
+PDQ2:  dw 2,0,0,0,2,0,0,0
+align 16
+HSwapSumSubDB1:   times 2 db 1, 1, 1, 1, 1, -1, 1, -1
+
+;***********************************************************************
+; Code
+;***********************************************************************
+SECTION .text
+
+;***********************************************************************
+;
+;Pixel_satd_wxh_sse2 BEGIN
+;
+;***********************************************************************
+%macro MMX_DW_1_2REG 2
+    pxor %1, %1
+    pcmpeqw %2, %2
+    psubw %1, %2
+%endmacro
+
+%macro SSE2_SumWHorizon1 2
+    movdqa      %2, %1
+    psrldq      %2, 8
+    paddusw     %1, %2
+    movdqa      %2, %1
+    psrldq      %2, 4
+    paddusw     %1, %2
+    movdqa      %2, %1
+    psrldq      %2, 2
+    paddusw     %1, %2
+%endmacro
+
+%macro SSE2_HDMTwo4x4 5 ;in: xmm1,xmm2,xmm3,xmm4  pOut: xmm4,xmm2,xmm1,xmm3
+    SSE2_SumSub %1, %2, %5
+    SSE2_SumSub %3, %4, %5
+    SSE2_SumSub %2, %4, %5
+    SSE2_SumSub %1, %3, %5
+%endmacro
+
+%macro SSE2_SumAbs4 7
+    WELS_AbsW %1, %3
+    WELS_AbsW %2, %3
+    WELS_AbsW %4, %6
+    WELS_AbsW %5, %6
+    paddusw       %1, %2
+    paddusw       %4, %5
+    paddusw       %7, %1
+    paddusw       %7, %4
+%endmacro
+
+%macro SSE2_SumWHorizon 3
+    movhlps     %2, %1          ; x2 = xx xx xx xx d7 d6 d5 d4
+    paddw       %1, %2          ; x1 = xx xx xx xx d37 d26 d15 d04
+    punpcklwd   %1, %3          ; x1 =  d37  d26 d15 d04
+    movhlps     %2, %1          ; x2 = xxxx xxxx d37 d26
+    paddd       %1, %2          ; x1 = xxxx xxxx d1357 d0246
+    pshuflw     %2, %1, 0x4e    ; x2 = xxxx xxxx d0246 d1357
+    paddd       %1, %2          ; x1 = xxxx xxxx xxxx  d01234567
+%endmacro
+
+%macro SSE2_GetSatd8x8 0
+    SSE2_LoadDiff8P    xmm0,xmm4,xmm7,[r0],[r2]
+    SSE2_LoadDiff8P    xmm1,xmm5,xmm7,[r0+r1],[r2+r3]
+    lea                 r0, [r0+2*r1]
+    lea                 r2, [r2+2*r3]
+    SSE2_LoadDiff8P    xmm2,xmm4,xmm7,[r0],[r2]
+    SSE2_LoadDiff8P    xmm3,xmm5,xmm7,[r0+r1],[r2+r3]
+
+    SSE2_HDMTwo4x4       xmm0,xmm1,xmm2,xmm3,xmm4
+    SSE2_TransTwo4x4W     xmm3,xmm1,xmm0,xmm2,xmm4
+    SSE2_HDMTwo4x4       xmm3,xmm1,xmm2,xmm4,xmm5
+    SSE2_SumAbs4         xmm4,xmm1,xmm0,xmm2,xmm3,xmm5,xmm6
+
+    lea                 r0,    [r0+2*r1]
+    lea                 r2,    [r2+2*r3]
+    SSE2_LoadDiff8P    xmm0,xmm4,xmm7,[r0],[r2]
+    SSE2_LoadDiff8P    xmm1,xmm5,xmm7,[r0+r1],[r2+r3]
+    lea                 r0, [r0+2*r1]
+    lea                 r2, [r2+2*r3]
+    SSE2_LoadDiff8P    xmm2,xmm4,xmm7,[r0],[r2]
+    SSE2_LoadDiff8P    xmm3,xmm5,xmm7,[r0+r1],[r2+r3]
+
+    SSE2_HDMTwo4x4       xmm0,xmm1,xmm2,xmm3,xmm4
+    SSE2_TransTwo4x4W     xmm3,xmm1,xmm0,xmm2,xmm4
+    SSE2_HDMTwo4x4       xmm3,xmm1,xmm2,xmm4,xmm5
+    SSE2_SumAbs4         xmm4,xmm1,xmm0,xmm2,xmm3,xmm5,xmm6
+%endmacro
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd4x4_sse2( uint8_t *, int32_t, uint8_t *, int32_t );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd4x4_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movd      xmm0, [r0]
+    movd      xmm1, [r0+r1]
+    lea       r0 , [r0+2*r1]
+    movd      xmm2, [r0]
+    movd      xmm3, [r0+r1]
+    punpckldq xmm0, xmm2
+    punpckldq xmm1, xmm3
+
+    movd      xmm4, [r2]
+    movd      xmm5, [r2+r3]
+    lea       r2 , [r2+2*r3]
+    movd      xmm6, [r2]
+    movd      xmm7, [r2+r3]
+    punpckldq xmm4, xmm6
+    punpckldq xmm5, xmm7
+
+    pxor      xmm6, xmm6
+    punpcklbw xmm0, xmm6
+    punpcklbw xmm1, xmm6
+    punpcklbw xmm4, xmm6
+    punpcklbw xmm5, xmm6
+
+    psubw     xmm0, xmm4
+    psubw     xmm1, xmm5
+
+    movdqa    xmm2, xmm0
+    paddw     xmm0, xmm1
+    psubw     xmm2, xmm1
+    SSE2_XSawp qdq, xmm0, xmm2, xmm3
+
+    movdqa     xmm4, xmm0
+    paddw      xmm0, xmm3
+    psubw      xmm4, xmm3
+
+    movdqa         xmm2, xmm0
+    punpcklwd      xmm0, xmm4
+    punpckhwd      xmm4, xmm2
+
+    SSE2_XSawp     dq,  xmm0, xmm4, xmm3
+    SSE2_XSawp     qdq, xmm0, xmm3, xmm5
+
+    movdqa         xmm7, xmm0
+    paddw          xmm0, xmm5
+    psubw          xmm7, xmm5
+
+    SSE2_XSawp     qdq,  xmm0, xmm7, xmm1
+
+    movdqa         xmm2, xmm0
+    paddw          xmm0, xmm1
+    psubw          xmm2, xmm1
+
+    WELS_AbsW  xmm0, xmm3
+    paddusw        xmm6, xmm0
+    WELS_AbsW  xmm2, xmm4
+    paddusw        xmm6, xmm2
+    SSE2_SumWHorizon1  xmm6, xmm4
+    movd           retrd,  xmm6
+    and            retrd,  0xffff
+    shr            retrd,  1
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+ ;***********************************************************************
+ ;
+ ;int32_t WelsSampleSatd8x8_sse2( uint8_t *, int32_t, uint8_t *, int32_t, );
+ ;
+ ;***********************************************************************
+WELS_EXTERN WelsSampleSatd8x8_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm6,   xmm6
+    pxor   xmm7,   xmm7
+    SSE2_GetSatd8x8
+    psrlw   xmm6,  1
+    SSE2_SumWHorizon   xmm6,xmm4,xmm7
+    movd    retrd,   xmm6
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+ ;***********************************************************************
+ ;
+ ;int32_t WelsSampleSatd8x16_sse2( uint8_t *, int32_t, uint8_t *, int32_t, );
+ ;
+ ;***********************************************************************
+WELS_EXTERN WelsSampleSatd8x16_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm6,   xmm6
+    pxor   xmm7,   xmm7
+
+    SSE2_GetSatd8x8
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSatd8x8
+
+    psrlw   xmm6,  1
+    SSE2_SumWHorizon   xmm6,xmm4,xmm7
+    movd    retrd,   xmm6
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x8_sse2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd16x8_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    push r0
+    push r2
+    pxor   xmm6,   xmm6
+    pxor   xmm7,   xmm7
+
+    SSE2_GetSatd8x8
+
+    pop r2
+    pop r0
+    add    r0,    8
+    add    r2,    8
+    SSE2_GetSatd8x8
+
+    psrlw   xmm6,  1
+    SSE2_SumWHorizon   xmm6,xmm4,xmm7
+    movd    retrd,   xmm6
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x16_sse2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd16x16_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    push r0
+    push r2
+    pxor   xmm6,   xmm6
+    pxor   xmm7,   xmm7
+
+    SSE2_GetSatd8x8
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSatd8x8
+
+    pop r2
+    pop r0
+    add    r0,    8
+    add    r2,    8
+
+    SSE2_GetSatd8x8
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSatd8x8
+
+ ; each column sum of SATD is necessarily even, so we don't lose any precision by shifting first.
+    psrlw   xmm6,  1
+    SSE2_SumWHorizon   xmm6,xmm4,xmm7
+    movd    retrd,   xmm6
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+;***********************************************************************
+;
+;Pixel_satd_wxh_sse2 END
+;
+;***********************************************************************
+
+;***********************************************************************
+;
+;Pixel_satd_intra_sse2 BEGIN
+;
+;***********************************************************************
+
+
+%macro SSE_DB_1_2REG 2
+    pxor %1, %1
+    pcmpeqw %2, %2
+    psubb %1, %2
+%endmacro
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatdThree4x4_sse2( uint8_t *pDec, int32_t iLineSizeDec, uint8_t *pEnc, int32_t iLinesizeEnc,
+;                             uint8_t* pRed, int32_t* pBestMode, int32_t, int32_t, int32_t);
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatdThree4x4_sse2
+
+%ifdef X86_32
+    push r3
+    push r4
+    push r5
+    push r6
+    %assign  push_num 4
+%else
+    %assign  push_num 0
+%endif
+    PUSH_XMM 8
+
+    mov  r2, arg3
+    mov  r3, arg4
+    SIGN_EXTENSION r3, r3d
+
+    ; load source 4x4 samples and Hadamard transform
+    movd      xmm0, [r2]
+    movd      xmm1, [r2+r3]
+    lea       r2 , [r2+2*r3]
+    movd      xmm2, [r2]
+    movd      xmm3, [r2+r3]
+    punpckldq xmm0, xmm2
+    punpckldq xmm1, xmm3
+
+    pxor      xmm6, xmm6
+    punpcklbw xmm0, xmm6
+    punpcklbw xmm1, xmm6
+
+    movdqa    xmm2, xmm0
+    paddw     xmm0, xmm1
+    psubw     xmm2, xmm1
+    SSE2_XSawp  qdq, xmm0, xmm2, xmm3
+
+    movdqa    xmm4, xmm0
+    paddw     xmm0, xmm3
+    psubw     xmm4, xmm3
+
+    movdqa    xmm2, xmm0
+    punpcklwd xmm0, xmm4
+    punpckhwd xmm4, xmm2
+
+    SSE2_XSawp  dq,  xmm0, xmm4, xmm3
+    SSE2_XSawp  qdq, xmm0, xmm3, xmm5
+
+    movdqa    xmm7, xmm0
+    paddw     xmm0, xmm5
+    psubw     xmm7, xmm5
+
+    SSE2_XSawp  qdq,  xmm0, xmm7, xmm1
+
+    ; Hadamard transform results are saved in xmm0 and xmm2
+    movdqa    xmm2, xmm0
+    paddw     xmm0, xmm1
+    psubw     xmm2, xmm1
+
+    ;load top boundary samples: [a b c d]
+    mov r0, arg1
+    mov r1, arg2
+    SIGN_EXTENSION r1, r1d
+    sub r0, r1
+%ifdef UNIX64
+    push r4
+    push r5
+%endif
+
+    movzx     r2d,  byte [r0]
+    movzx     r3d,  byte [r0+1]
+    movzx     r4d,  byte [r0+2]
+    movzx     r5d,  byte [r0+3]
+
+    ; get the transform results of top boundary samples: [a b c d]
+    add       r3d, r2d ; r3d = a + b
+    add       r5d, r4d ; r5d = c + d
+    add       r2d, r2d ; r2d = a + a
+    add       r4d, r4d ; r4d = c + c
+    sub       r2d, r3d ; r2d = a + a - a - b = a - b
+    sub       r4d, r5d ; r4d = c + c - c - d = c - d
+    add       r5d, r3d ; r5d = (a + b) + (c + d)
+    add       r3d, r3d
+    sub       r3d, r5d ; r3d = (a + b) - (c + d)
+    add       r4d, r2d ; r4d = (a - b) + (c - d)
+    add       r2d, r2d
+    sub       r2d, r4d ; r2d = (a - b) - (c - d) ; [r5d r3d r2d r4d]
+
+    movdqa    xmm6, xmm0
+    movdqa    xmm7, xmm2
+    movd      xmm5, r5d ; store the edi for DC mode
+    pxor      xmm3, xmm3
+    pxor      xmm4, xmm4
+    pinsrw    xmm3, r5d, 0
+    pinsrw    xmm3, r4d, 4
+    psllw     xmm3, 2
+    pinsrw    xmm4, r3d, 0
+    pinsrw    xmm4, r2d, 4
+    psllw     xmm4, 2
+
+    ; get the satd of H
+    psubw     xmm0, xmm3
+    psubw     xmm2, xmm4
+
+    WELS_AbsW  xmm0, xmm1
+    WELS_AbsW  xmm2, xmm1
+    paddusw        xmm0, xmm2
+    SSE2_SumWHorizon1  xmm0, xmm1 ; satd of V is stored in xmm0
+
+    ;load left boundary samples: [a b c d]'
+    add r0, r1
+
+    movzx     r2d,  byte [r0-1]
+    movzx     r3d,  byte [r0+r1-1]
+    lea       r0 , [r0+2*r1]
+    movzx     r4d,  byte [r0-1]
+    movzx     r5d,  byte [r0+r1-1]
+
+    ; get the transform results of left boundary samples: [a b c d]'
+    add       r3d, r2d ; r3d = a + b
+    add       r5d, r4d ; r5d = c + d
+    add       r2d, r2d ; r2d = a + a
+    add       r4d, r4d ; r4d = c + c
+    sub       r2d, r3d ; r2d = a + a - a - b = a - b
+    sub       r4d, r5d ; r4d = c + c - c - d = c - d
+    add       r5d, r3d ; r5d = (a + b) + (c + d)
+    add       r3d, r3d
+    sub       r3d, r5d ; r3d = (a + b) - (c + d)
+    add       r4d, r2d ; r4d = (a - b) + (c - d)
+    add       r2d, r2d
+    sub       r2d, r4d ; r2d = (a - b) - (c - d) ; [r5d r3d r2d r4d]
+
+    ; store the transform results in xmm3
+    movd      xmm3, r5d
+    pinsrw    xmm3, r3d, 1
+    pinsrw    xmm3, r2d, 2
+    pinsrw    xmm3, r4d, 3
+    psllw     xmm3, 2
+
+    ; get the satd of V
+    movdqa    xmm2, xmm6
+    movdqa    xmm4, xmm7
+    psubw     xmm2, xmm3
+    WELS_AbsW  xmm2, xmm1
+    WELS_AbsW  xmm4, xmm1
+    paddusw        xmm2, xmm4
+    SSE2_SumWHorizon1  xmm2, xmm1 ; satd of H is stored in xmm2
+
+    ; DC result is stored in xmm1
+    add       r5d, 4
+    movd      xmm1, r5d
+    paddw     xmm1, xmm5
+    psrlw     xmm1, 3
+    movdqa    xmm5, xmm1
+    psllw     xmm1, 4
+
+    ; get the satd of DC
+    psubw          xmm6, xmm1
+    WELS_AbsW  xmm6, xmm1
+    WELS_AbsW  xmm7, xmm1
+    paddusw        xmm6, xmm7
+    SSE2_SumWHorizon1  xmm6, xmm1 ; satd of DC is stored in xmm6
+%ifdef UNIX64
+    pop r5
+    pop r4
+%endif
+    ; comparing order: DC H V
+
+    mov  r4, arg5
+    movd      r2d, xmm6
+    movd      r3d, xmm2
+    movd      r6d, xmm0
+
+    and       r2d, 0xffff
+    shr       r2d, 1
+    and       r3d, 0xffff
+    shr       r3d, 1
+    and       r6d, 0xffff
+    shr       r6d, 1
+    add       r2d, dword arg7
+    add       r3d, dword arg8
+    add       r6d, dword arg9
+    cmp       r2w, r3w
+    jg near   not_dc
+    cmp       r2w, r6w
+    jg near   not_dc_h
+
+    ; for DC mode
+    movd      r3d, xmm5
+    imul      r3d, 0x01010101
+    movd      xmm5, r3d
+    pshufd    xmm5, xmm5, 0
+    movdqa    [r4], xmm5
+    mov r5, arg6
+    mov       dword [r5], 0x02
+    mov retrd, r2d
+    POP_XMM
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+%endif
+    ret
+
+not_dc:
+    cmp       r3w, r6w
+    jg near   not_dc_h
+
+    ; for H mode
+    SSE_DB_1_2REG  xmm6, xmm7
+    sub        r0, r1
+    sub        r0, r1
+    movzx      r6d,  byte [r0-1]
+    movd       xmm0, r6d
+    pmuludq    xmm0, xmm6
+
+    movzx     r6d,  byte [r0+r1-1]
+    movd      xmm1, r6d
+    pmuludq   xmm1, xmm6
+    punpckldq xmm0, xmm1
+
+    lea       r0,   [r0+r1*2]
+    movzx     r6d,  byte [r0-1]
+    movd      xmm2, r6d
+    pmuludq   xmm2, xmm6
+
+    movzx     r6d,  byte [r0+r1-1]
+    movd      xmm3, r6d
+    pmuludq   xmm3, xmm6
+    punpckldq  xmm2, xmm3
+    punpcklqdq xmm0, xmm2
+
+    movdqa    [r4],xmm0
+
+    mov       retrd, r3d
+    mov r5, arg6
+    mov       dword [r5], 0x01
+    POP_XMM
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+%endif
+    ret
+not_dc_h:
+    sub        r0, r1
+    sub        r0, r1
+    sub        r0, r1
+    movd      xmm0, [r0]
+    pshufd    xmm0, xmm0, 0
+    movdqa    [r4],xmm0
+    mov       retrd, r6d
+    mov r5, arg6
+    mov       dword [r5], 0x00
+    POP_XMM
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+%endif
+    ret
+
+
+%macro SSE41_I16x16Get8WSumSub 3 ;xmm5 HSumSubDB1, xmm6 HSumSubDW1, xmm7 PDW1 : in %1, pOut %1, %3
+    pmaddubsw    %1, xmm5
+    movdqa       %2, %1
+    pmaddwd      %1, xmm7
+    pmaddwd      %2, xmm6
+    movdqa       %3, %1
+    punpckldq    %1, %2
+    punpckhdq    %2, %3
+    movdqa       %3, %1
+    punpcklqdq   %1, %2
+    punpckhqdq   %3, %2
+    paddd        xmm4, %1 ;for dc
+    paddd        xmm4, %3 ;for dc
+    packssdw     %1, %3
+    psllw        %1, 2
+%endmacro
+%macro SSE41_ChromaGet8WSumSub 4 ;xmm5 HSumSubDB1, xmm6 HSumSubDW1, xmm7 PDW1 : in %1, pOut %1, %3 : %4 tempsse2
+    pmaddubsw    %1, xmm5
+    movdqa       %2, %1
+    pmaddwd      %1, xmm7
+    pmaddwd      %2, xmm6
+    movdqa       %3, %1
+    punpckldq    %1, %2
+    punpckhdq    %2, %3
+    movdqa       %3, %1
+    punpcklqdq   %1, %2
+    punpckhqdq   %3, %2
+;    paddd        xmm4, %1 ;for dc
+;    paddd        xmm4, %3 ;for dc
+    movdqa       %4, %1
+    punpcklqdq   %4, %3
+    packssdw     %1, %3
+    psllw        %1, 2
+%endmacro
+
+%macro SSE41_GetX38x4SatdDec 0
+    pxor        xmm7,   xmm7
+    movq        xmm0,   [r2]
+    movq        xmm1,   [r2+r3]
+    lea         r2,    [r2+2*r3]
+    movq        xmm2,   [r2]
+    movq        xmm3,   [r2+r3]
+    lea         r2,    [r2+2*r3]
+    punpcklbw   xmm0,   xmm7
+    punpcklbw   xmm1,   xmm7
+    punpcklbw   xmm2,   xmm7
+    punpcklbw   xmm3,   xmm7
+    SSE2_HDMTwo4x4       xmm0,xmm1,xmm2,xmm3,xmm7
+    SSE2_TransTwo4x4W     xmm3,xmm1,xmm0,xmm2,xmm7
+    SSE2_HDMTwo4x4       xmm3,xmm1,xmm2,xmm7,xmm0 ;pOut xmm7,xmm1,xmm3,xmm2
+    ;doesn't need another transpose
+%endmacro
+
+%macro SSE41_GetX38x4SatdV 2
+    pxor        xmm0,   xmm0
+    pinsrw      xmm0,   word[r6+%2],   0
+    pinsrw      xmm0,   word[r6+%2+8], 4
+    psubsw      xmm0,   xmm7
+    pabsw       xmm0,   xmm0
+    paddw       xmm4,   xmm0
+    pxor        xmm0,   xmm0
+    pinsrw      xmm0,   word[r6+%2+2],  0
+    pinsrw      xmm0,   word[r6+%2+10], 4
+    psubsw      xmm0,   xmm1
+    pabsw       xmm0,   xmm0
+    paddw       xmm4,   xmm0
+    pxor        xmm0,   xmm0
+    pinsrw      xmm0,   word[r6+%2+4],  0
+    pinsrw      xmm0,   word[r6+%2+12], 4
+    psubsw      xmm0,   xmm3
+    pabsw       xmm0,   xmm0
+    paddw       xmm4,   xmm0
+    pxor        xmm0,   xmm0
+    pinsrw      xmm0,   word[r6+%2+6],  0
+    pinsrw      xmm0,   word[r6+%2+14], 4
+    psubsw      xmm0,   xmm2
+    pabsw       xmm0,   xmm0
+    paddw       xmm4,   xmm0
+%endmacro
+%macro SSE41_GetX38x4SatdH  3
+    movq        xmm0,   [r6+%3+8*%1]
+    punpcklqdq  xmm0,   xmm0
+    psubsw      xmm0,   xmm7
+    pabsw       xmm0,   xmm0
+    paddw       xmm5,   xmm0
+    pabsw       xmm1,   xmm1
+    pabsw       xmm2,   xmm2
+    pabsw       xmm3,   xmm3
+    paddw       xmm2,   xmm1;for DC
+    paddw       xmm2,   xmm3;for DC
+    paddw       xmm5,   xmm2
+%endmacro
+%macro SSE41_I16X16GetX38x4SatdDC 0
+    pxor        xmm0,   xmm0
+    movq2dq     xmm0,   mm4
+    punpcklqdq  xmm0,   xmm0
+    psubsw      xmm0,   xmm7
+    pabsw       xmm0,   xmm0
+    paddw       xmm6,   xmm0
+    paddw       xmm6,   xmm2
+%endmacro
+%macro SSE41_ChromaGetX38x4SatdDC 1
+    shl         %1,     4
+    movdqa      xmm0,   [r6+32+%1]
+    psubsw      xmm0,   xmm7
+    pabsw       xmm0,   xmm0
+    paddw       xmm6,   xmm0
+    paddw       xmm6,   xmm2
+%endmacro
+%macro SSE41_I16x16GetX38x4Satd 2
+    SSE41_GetX38x4SatdDec
+    SSE41_GetX38x4SatdV   %1, %2
+    SSE41_GetX38x4SatdH   %1, %2, 32
+    SSE41_I16X16GetX38x4SatdDC
+%endmacro
+%macro SSE41_ChromaGetX38x4Satd 2
+    SSE41_GetX38x4SatdDec
+    SSE41_GetX38x4SatdV   %1, %2
+    SSE41_GetX38x4SatdH   %1, %2, 16
+    SSE41_ChromaGetX38x4SatdDC %1
+%endmacro
+%macro SSE41_HSum8W 3
+    pmaddwd     %1, %2
+    movhlps     %3, %1
+    paddd       %1, %3
+    pshuflw     %3, %1,0Eh
+    paddd       %1, %3
+%endmacro
+
+WELS_EXTERN WelsIntra16x16Combined3Satd_sse41
+    %assign  push_num 0
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov  r12, r2
+%endif
+
+    INIT_X86_32_PIC r2
+    pxor        xmm4,   xmm4
+    movdqa      xmm5,   [pic(HSumSubDB1)]
+    movdqa      xmm6,   [pic(HSumSubDW1)]
+    movdqa      xmm7,   [pic(PDW1)]
+    DEINIT_X86_32_PIC
+    sub         r0,    r1
+    movdqu      xmm0,   [r0]
+    movhlps     xmm1,   xmm0
+    punpcklqdq  xmm0,   xmm0
+    punpcklqdq  xmm1,   xmm1
+    SSE41_I16x16Get8WSumSub xmm0, xmm2, xmm3
+    SSE41_I16x16Get8WSumSub xmm1, xmm2, xmm3
+    movdqa      [r6],  xmm0 ;V
+    movdqa      [r6+16], xmm1
+    add         r0,    r1
+    pinsrb      xmm0,   byte[r0-1], 0
+    pinsrb      xmm0,   byte[r0+r1-1], 1
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     2
+    pinsrb      xmm0,   byte[r0+r1-1], 3
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     4
+    pinsrb      xmm0,   byte[r0+r1-1], 5
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     6
+    pinsrb      xmm0,   byte[r0+r1-1], 7
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     8
+    pinsrb      xmm0,   byte[r0+r1-1], 9
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     10
+    pinsrb      xmm0,   byte[r0+r1-1], 11
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     12
+    pinsrb      xmm0,   byte[r0+r1-1], 13
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     14
+    pinsrb      xmm0,   byte[r0+r1-1], 15
+    movhlps     xmm1,   xmm0
+    punpcklqdq  xmm0,   xmm0
+    punpcklqdq  xmm1,   xmm1
+    SSE41_I16x16Get8WSumSub xmm0, xmm2, xmm3
+    SSE41_I16x16Get8WSumSub xmm1, xmm2, xmm3
+    movdqa      [r6+32], xmm0 ;H
+    movdqa      [r6+48], xmm1
+    movd        r0d,    xmm4 ;dc
+    add         r0d,    16   ;(sum+16)
+    shr         r0d,    5    ;((sum+16)>>5)
+    shl         r0d,    4    ;
+    movd        mm4,    r0d  ; mm4 copy DC
+    pxor        xmm4,   xmm4 ;V
+    pxor        xmm5,   xmm5 ;H
+    pxor        xmm6,   xmm6 ;DC
+%ifdef UNIX64
+    push r4
+%endif
+    mov         r0,    0
+    mov         r4,    0
+
+.loop16x16_get_satd:
+.loopStart1:
+    SSE41_I16x16GetX38x4Satd r0, r4
+    inc          r0
+    cmp         r0, 4
+    jl          .loopStart1
+    cmp         r4, 16
+    je          .loop16x16_get_satd_end
+%ifdef X86_32
+    mov r2, arg3
+%else
+    mov r2, r12
+%endif
+    add         r2, 8
+    mov         r0, 0
+    add         r4, 16
+    jmp         .loop16x16_get_satd
+ .loop16x16_get_satd_end:
+    MMX_DW_1_2REG    xmm0, xmm1
+    psrlw       xmm4, 1 ;/2
+    psrlw       xmm5, 1 ;/2
+    psrlw       xmm6, 1 ;/2
+    SSE41_HSum8W     xmm4, xmm0, xmm1
+    SSE41_HSum8W     xmm5, xmm0, xmm1
+    SSE41_HSum8W     xmm6, xmm0, xmm1
+
+%ifdef UNIX64
+    pop r4
+%endif
+    ; comparing order: DC H V
+    movd      r3d, xmm6 ;DC
+    movd      r1d, xmm5 ;H
+    movd      r0d, xmm4 ;V
+%ifndef X86_32
+    pop r12
+%endif
+    shl       r5d, 1
+    add       r1d, r5d
+    add       r3d, r5d
+    mov       r4, arg5
+    cmp       r3d, r1d
+    jge near   not_dc_16x16
+    cmp        r3d, r0d
+    jge near   not_dc_h_16x16
+
+    ; for DC mode
+    mov       dword[r4], 2;I16_PRED_DC
+    mov       retrd, r3d
+    jmp near return_satd_intra_16x16_x3
+not_dc_16x16:
+    ; for H mode
+    cmp       r1d, r0d
+    jge near   not_dc_h_16x16
+    mov       dword[r4], 1;I16_PRED_H
+    mov       retrd, r1d
+    jmp near return_satd_intra_16x16_x3
+not_dc_h_16x16:
+    ; for V mode
+    mov       dword[r4], 0;I16_PRED_V
+    mov       retrd, r0d
+return_satd_intra_16x16_x3:
+    WELSEMMS
+    POP_XMM
+    LOAD_7_PARA_POP
+ret
+
+%macro SSE41_ChromaGetX38x8Satd 0
+    movdqa      xmm5,   [pic(HSumSubDB1)]
+    movdqa      xmm6,   [pic(HSumSubDW1)]
+    movdqa      xmm7,   [pic(PDW1)]
+    sub         r0,    r1
+    movq        xmm0,   [r0]
+    punpcklqdq  xmm0,   xmm0
+    SSE41_ChromaGet8WSumSub xmm0, xmm2, xmm3, xmm4
+    movdqa      [r6],  xmm0 ;V
+    add         r0,    r1
+    pinsrb      xmm0,   byte[r0-1], 0
+    pinsrb      xmm0,   byte[r0+r1-1], 1
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     2
+    pinsrb      xmm0,   byte[r0+r1-1], 3
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     4
+    pinsrb      xmm0,   byte[r0+r1-1], 5
+    lea         r0,    [r0+2*r1]
+    pinsrb      xmm0,   byte[r0-1],     6
+    pinsrb      xmm0,   byte[r0+r1-1], 7
+    punpcklqdq  xmm0,   xmm0
+    SSE41_ChromaGet8WSumSub xmm0, xmm2, xmm3, xmm1
+    movdqa      [r6+16], xmm0 ;H
+;(sum+2)>>2
+    movdqa      xmm6,   [pic(PDQ2)]
+    movdqa      xmm5,   xmm4
+    punpckhqdq  xmm5,   xmm1
+    paddd       xmm5,   xmm6
+    psrld       xmm5,   2
+;(sum1+sum2+4)>>3
+    paddd       xmm6,   xmm6
+    paddd       xmm4,   xmm1
+    paddd       xmm4,   xmm6
+    psrld       xmm4,   3
+;satd *16
+    pslld       xmm5,   4
+    pslld       xmm4,   4
+;temp satd
+    movdqa      xmm6,   xmm4
+    punpcklqdq  xmm4,   xmm5
+    psllq       xmm4,   32
+    psrlq       xmm4,   32
+    movdqa      [r6+32], xmm4
+    punpckhqdq  xmm5,   xmm6
+    psllq       xmm5,   32
+    psrlq       xmm5,   32
+    movdqa      [r6+48], xmm5
+
+    pxor        xmm4,   xmm4 ;V
+    pxor        xmm5,   xmm5 ;H
+    pxor        xmm6,   xmm6 ;DC
+    mov         r0,    0
+    SSE41_ChromaGetX38x4Satd r0, 0
+    inc             r0
+    SSE41_ChromaGetX38x4Satd r0, 0
+%endmacro
+
+%macro SSEReg2MMX 3
+    movdq2q     %2, %1
+    movhlps     %1, %1
+    movdq2q     %3, %1
+%endmacro
+%macro MMXReg2SSE 4
+    movq2dq     %1, %3
+    movq2dq     %2, %4
+    punpcklqdq  %1, %2
+%endmacro
+;for reduce the code size of WelsIntraChroma8x8Combined3Satd_sse41
+
+WELS_EXTERN WelsIntraChroma8x8Combined3Satd_sse41
+    %assign  push_num 0
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+loop_chroma_satdx3:
+    INIT_X86_32_PIC r4
+    SSE41_ChromaGetX38x8Satd
+    SSEReg2MMX  xmm4, mm0,mm1
+    SSEReg2MMX  xmm5, mm2,mm3
+    SSEReg2MMX  xmm6, mm5,mm6
+    mov r0,     arg8
+    mov r2,     arg9
+
+    SSE41_ChromaGetX38x8Satd
+    DEINIT_X86_32_PIC
+
+    MMXReg2SSE  xmm0, xmm3, mm0, mm1
+    MMXReg2SSE  xmm1, xmm3, mm2, mm3
+    MMXReg2SSE  xmm2, xmm3, mm5, mm6
+
+    paddw       xmm4, xmm0
+    paddw       xmm5, xmm1
+    paddw       xmm6, xmm2
+
+    MMX_DW_1_2REG    xmm0, xmm1
+    psrlw       xmm4, 1 ;/2
+    psrlw       xmm5, 1 ;/2
+    psrlw       xmm6, 1 ;/2
+    SSE41_HSum8W     xmm4, xmm0, xmm1
+    SSE41_HSum8W     xmm5, xmm0, xmm1
+    SSE41_HSum8W     xmm6, xmm0, xmm1
+    ; comparing order: DC H V
+    movd      r3d, xmm6 ;DC
+    movd      r1d, xmm5 ;H
+    movd      r0d, xmm4 ;V
+
+
+    shl       r5d, 1
+    add       r1d, r5d
+    add       r0d, r5d
+    cmp       r3d, r1d
+    jge near   not_dc_8x8
+    cmp        r3d, r0d
+    jge near   not_dc_h_8x8
+
+    ; for DC mode
+    mov       dword[r4], 0;I8_PRED_DC
+    mov       retrd, r3d
+    jmp near return_satd_intra_8x8_x3
+not_dc_8x8:
+    ; for H mode
+    cmp       r1d, r0d
+    jge near   not_dc_h_8x8
+    mov       dword[r4], 1;I8_PRED_H
+    mov       retrd, r1d
+    jmp near return_satd_intra_8x8_x3
+not_dc_h_8x8:
+    ; for V mode
+    mov       dword[r4], 2;I8_PRED_V
+    mov       retrd, r0d
+return_satd_intra_8x8_x3:
+    WELSEMMS
+    POP_XMM
+    LOAD_7_PARA_POP
+ret
+
+
+;***********************************************************************
+;
+;Pixel_satd_intra_sse2 END
+;
+;***********************************************************************
+%macro SSSE3_Get16BSadHVDC 2
+    movd        xmm6,%1
+    pshufb      xmm6,xmm1
+    movdqa      %1,  xmm6
+    movdqa      xmm0,%2
+    psadbw      xmm0,xmm7
+    paddw       xmm4,xmm0
+    movdqa      xmm0,%2
+    psadbw      xmm0,xmm5
+    paddw       xmm2,xmm0
+    psadbw      xmm6,%2
+    paddw       xmm3,xmm6
+%endmacro
+%macro WelsAddDCValue 4
+    movzx   %2, byte %1
+    mov    %3, %2
+    add     %4, %2
+%endmacro
+
+;***********************************************************************
+;
+;Pixel_sad_intra_ssse3 BEGIN
+;
+;***********************************************************************
+WELS_EXTERN WelsIntra16x16Combined3Sad_ssse3
+    %assign  push_num 0
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+
+    push  r5
+    push  r4
+    push  r3
+
+    sub    r0,    r1
+    movdqa      xmm5,[r0]
+    pxor        xmm0,xmm0
+    psadbw      xmm0,xmm5
+    movhlps     xmm1,xmm0
+    paddw       xmm0,xmm1
+    movd        r5d, xmm0
+
+    add         r0,r1
+    lea         r3,[r1+2*r1]    ;ebx r3
+    WelsAddDCValue [r0-1     ], r4d, [r6   ], r5d    ; esi r4d, eax r5d
+    WelsAddDCValue [r0-1+r1  ], r4d, [r6+16], r5d
+    WelsAddDCValue [r0-1+r1*2], r4d, [r6+32], r5d
+    WelsAddDCValue [r0-1+r3  ], r4d, [r6+48], r5d
+    lea         r0, [r0+4*r1]
+    add         r6, 64
+    WelsAddDCValue [r0-1     ], r4d, [r6   ], r5d
+    WelsAddDCValue [r0-1+r1  ], r4d, [r6+16], r5d
+    WelsAddDCValue [r0-1+r1*2], r4d, [r6+32], r5d
+    WelsAddDCValue [r0-1+r3  ], r4d, [r6+48], r5d
+    lea         r0, [r0+4*r1]
+    add         r6, 64
+    WelsAddDCValue [r0-1     ], r4d, [r6   ], r5d
+    WelsAddDCValue [r0-1+r1  ], r4d, [r6+16], r5d
+    WelsAddDCValue [r0-1+r1*2], r4d, [r6+32], r5d
+    WelsAddDCValue [r0-1+r3  ], r4d, [r6+48], r5d
+    lea         r0, [r0+4*r1]
+    add         r6, 64
+    WelsAddDCValue [r0-1     ], r4d, [r6   ], r5d
+    WelsAddDCValue [r0-1+r1  ], r4d, [r6+16], r5d
+    WelsAddDCValue [r0-1+r1*2], r4d, [r6+32], r5d
+    WelsAddDCValue [r0-1+r3  ], r4d, [r6+48], r5d
+    sub         r6, 192
+    add         r5d,10h
+    shr         r5d,5
+    movd        xmm7,r5d
+    pxor        xmm1,xmm1
+    pshufb      xmm7,xmm1
+    pxor        xmm4,xmm4
+    pxor        xmm3,xmm3
+    pxor        xmm2,xmm2
+    ;sad begin
+    pop   r3
+    lea         r4, [r3+2*r3] ;esi r4
+    SSSE3_Get16BSadHVDC [r6], [r2]
+    SSSE3_Get16BSadHVDC [r6+16], [r2+r3]
+    SSSE3_Get16BSadHVDC [r6+32], [r2+2*r3]
+    SSSE3_Get16BSadHVDC [r6+48], [r2+r4]
+    add         r6, 64
+    lea         r2, [r2+4*r3]
+    SSSE3_Get16BSadHVDC [r6], [r2]
+    SSSE3_Get16BSadHVDC [r6+16], [r2+r3]
+    SSSE3_Get16BSadHVDC [r6+32], [r2+2*r3]
+    SSSE3_Get16BSadHVDC [r6+48], [r2+r4]
+    add         r6, 64
+    lea         r2, [r2+4*r3]
+    SSSE3_Get16BSadHVDC [r6], [r2]
+    SSSE3_Get16BSadHVDC [r6+16], [r2+r3]
+    SSSE3_Get16BSadHVDC [r6+32], [r2+2*r3]
+    SSSE3_Get16BSadHVDC [r6+48], [r2+r4]
+    add         r6, 64
+    lea         r2, [r2+4*r3]
+    SSSE3_Get16BSadHVDC [r6], [r2]
+    SSSE3_Get16BSadHVDC [r6+16], [r2+r3]
+    SSSE3_Get16BSadHVDC [r6+32], [r2+2*r3]
+    SSSE3_Get16BSadHVDC [r6+48], [r2+r4]
+
+    pop r4
+    pop r5
+    pslldq      xmm3,4
+    por         xmm3,xmm2
+    movhlps     xmm1,xmm3
+    paddw       xmm3,xmm1
+    movhlps     xmm0,xmm4
+    paddw       xmm4,xmm0
+    ; comparing order: DC H V
+    movd        r1d, xmm4 ;DC   ;ebx r1d
+    movd        r0d, xmm3 ;V    ;ecx r0d
+    psrldq      xmm3, 4
+    movd        r2d, xmm3 ;H    ;esi r2d
+
+    ;mov         eax, [esp+36] ;lamda ;eax r5
+    shl         r5d, 1
+    add         r2d, r5d
+    add         r1d, r5d
+    ;mov         edx, [esp+32]  ;edx r4
+    cmp         r1d, r2d
+    jge near   not_dc_16x16_sad
+    cmp        r1d, r0d
+    jge near   not_dc_h_16x16_sad
+    ; for DC mode
+    mov       dword[r4], 2;I16_PRED_DC
+    mov       retrd, r1d
+    sub        r6, 192
+%assign x 0
+%rep 16
+    movdqa    [r6+16*x], xmm7
+%assign x x+1
+%endrep
+    jmp near return_sad_intra_16x16_x3
+not_dc_16x16_sad:
+    ; for H mode
+    cmp       r2d, r0d
+    jge near   not_dc_h_16x16_sad
+    mov       dword[r4], 1;I16_PRED_H
+    mov       retrd, r2d
+    jmp near return_sad_intra_16x16_x3
+not_dc_h_16x16_sad:
+    ; for V mode
+    mov       dword[r4], 0;I16_PRED_V
+    mov       retrd, r0d
+    sub       r6, 192
+%assign x 0
+%rep 16
+    movdqa    [r6+16*x], xmm5
+%assign x x+1
+%endrep
+return_sad_intra_16x16_x3:
+    POP_XMM
+    LOAD_7_PARA_POP
+    ret
+
+;***********************************************************************
+;
+;Pixel_sad_intra_ssse3 END
+;
+;***********************************************************************
+;***********************************************************************
+;
+;Pixel_satd_wxh_sse41 BEGIN
+;
+;***********************************************************************
+
+;SSE4.1
+%macro SSE41_GetSatd8x4 0
+    movq             xmm0, [r0]
+    punpcklqdq       xmm0, xmm0
+    pmaddubsw        xmm0, xmm7
+    movq             xmm1, [r0+r1]
+    punpcklqdq       xmm1, xmm1
+    pmaddubsw        xmm1, xmm7
+    movq             xmm2, [r2]
+    punpcklqdq       xmm2, xmm2
+    pmaddubsw        xmm2, xmm7
+    movq             xmm3, [r2+r3]
+    punpcklqdq       xmm3, xmm3
+    pmaddubsw        xmm3, xmm7
+    psubsw           xmm0, xmm2
+    psubsw           xmm1, xmm3
+    movq             xmm2, [r0+2*r1]
+    punpcklqdq       xmm2, xmm2
+    pmaddubsw        xmm2, xmm7
+    movq             xmm3, [r0+r4]
+    punpcklqdq       xmm3, xmm3
+    pmaddubsw        xmm3, xmm7
+    movq             xmm4, [r2+2*r3]
+    punpcklqdq       xmm4, xmm4
+    pmaddubsw        xmm4, xmm7
+    movq             xmm5, [r2+r5]
+    punpcklqdq       xmm5, xmm5
+    pmaddubsw        xmm5, xmm7
+    psubsw           xmm2, xmm4
+    psubsw           xmm3, xmm5
+    SSE2_HDMTwo4x4   xmm0, xmm1, xmm2, xmm3, xmm4
+    pabsw            xmm0, xmm0
+    pabsw            xmm2, xmm2
+    pabsw            xmm1, xmm1
+    pabsw            xmm3, xmm3
+    movdqa           xmm4, xmm3
+    pblendw          xmm3, xmm1, 0xAA
+    pslld            xmm1, 16
+    psrld            xmm4, 16
+    por              xmm1, xmm4
+    pmaxuw           xmm1, xmm3
+    paddw            xmm6, xmm1
+    movdqa           xmm4, xmm0
+    pblendw          xmm0, xmm2, 0xAA
+    pslld            xmm2, 16
+    psrld            xmm4, 16
+    por              xmm2, xmm4
+    pmaxuw           xmm0, xmm2
+    paddw            xmm6, xmm0
+%endmacro
+
+%macro SSSE3_SumWHorizon 4 ;eax, srcSSE, tempSSE, tempSSE
+    MMX_DW_1_2REG    %3, %4
+    pmaddwd     %2, %3
+    movhlps     %4, %2
+    paddd       %2, %4
+    pshuflw     %4, %2,0Eh
+    paddd       %2, %4
+    movd        %1, %2
+%endmacro
+;***********************************************************************
+;
+;int32_t WelsSampleSatd4x4_sse41( uint8_t *, int32_t, uint8_t *, int32_t );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd4x4_sse41
+    %assign  push_num 0
+    INIT_X86_32_PIC r5
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movdqa      xmm4,[pic(HSwapSumSubDB1)]
+    movd        xmm2,[r2]
+    movd        xmm5,[r2+r3]
+    shufps      xmm2,xmm5,0
+    movd        xmm3,[r2+r3*2]
+    lea         r2, [r3*2+r2]
+    movd        xmm5,[r2+r3]
+    shufps      xmm3,xmm5,0
+    movd        xmm0,[r0]
+    movd        xmm5,[r0+r1]
+    shufps      xmm0,xmm5,0
+    movd        xmm1,[r0+r1*2]
+    lea         r0, [r1*2+r0]
+    movd        xmm5,[r0+r1]
+    shufps      xmm1,xmm5,0
+    pmaddubsw   xmm0,xmm4
+    pmaddubsw   xmm1,xmm4
+    pmaddubsw   xmm2,xmm4
+    pmaddubsw   xmm3,xmm4
+    psubw       xmm0,xmm2
+    psubw       xmm1,xmm3
+    movdqa      xmm2,xmm0
+    paddw       xmm0,xmm1
+    psubw       xmm1,xmm2
+    movdqa      xmm2,xmm0
+    punpcklqdq  xmm0,xmm1
+    punpckhqdq  xmm2,xmm1
+    movdqa      xmm1,xmm0
+    paddw       xmm0,xmm2
+    psubw       xmm2,xmm1
+    movdqa      xmm1,xmm0
+    pblendw     xmm0,xmm2,0AAh
+    pslld       xmm2,16
+    psrld       xmm1,16
+    por         xmm2,xmm1
+    pabsw       xmm0,xmm0
+    pabsw       xmm2,xmm2
+    pmaxsw      xmm0,xmm2
+    SSSE3_SumWHorizon retrd, xmm0, xmm5, xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd8x8_sse41( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd8x8_sse41
+%ifdef X86_32
+    push  r4
+    push  r5
+%endif
+    %assign  push_num 2
+    INIT_X86_32_PIC r6
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    movdqa      xmm7, [pic(HSumSubDB1)]
+    lea         r4,  [r1+r1*2]
+    lea         r5,  [r3+r3*2]
+    pxor        xmm6, xmm6
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    SSE41_GetSatd8x4
+    SSSE3_SumWHorizon retrd, xmm6, xmm5, xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop  r5
+    pop  r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd8x16_sse41( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd8x16_sse41
+%ifdef X86_32
+    push  r4
+    push  r5
+    push  r6
+%endif
+    %assign  push_num 3
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    INIT_X86_32_PIC_NOPRESERVE r4
+    movdqa      xmm7, [pic(HSumSubDB1)]
+    DEINIT_X86_32_PIC
+    lea         r4,  [r1+r1*2]
+    lea         r5,  [r3+r3*2]
+    pxor        xmm6, xmm6
+    mov         r6,    0
+loop_get_satd_8x16:
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    inc         r6
+    cmp         r6,  4
+    jl          loop_get_satd_8x16
+    SSSE3_SumWHorizon retrd, xmm6, xmm5, xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+%ifdef X86_32
+    pop  r6
+    pop  r5
+    pop  r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x8_sse41( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSatd16x8_sse41
+%ifdef X86_32
+    push  r4
+    push  r5
+%endif
+    %assign  push_num 2
+    INIT_X86_32_PIC r6
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    push  r0
+    push  r2
+
+    movdqa      xmm7, [pic(HSumSubDB1)]
+    lea         r4,  [r1+r1*2]
+    lea         r5,  [r3+r3*2]
+    pxor        xmm6,   xmm6
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    SSE41_GetSatd8x4
+
+    pop  r2
+    pop  r0
+    add         r0,    8
+    add         r2,    8
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    SSE41_GetSatd8x4
+    SSSE3_SumWHorizon retrd, xmm6, xmm5, xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop  r5
+    pop  r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x16_sse41( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+
+WELS_EXTERN WelsSampleSatd16x16_sse41
+%ifdef X86_32
+    push  r4
+    push  r5
+    push  r6
+%endif
+    %assign  push_num 3
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    push  r0
+    push  r2
+
+    INIT_X86_32_PIC_NOPRESERVE r4
+    movdqa      xmm7, [pic(HSumSubDB1)]
+    DEINIT_X86_32_PIC
+    lea         r4,  [r1+r1*2]
+    lea         r5,  [r3+r3*2]
+    pxor        xmm6,   xmm6
+    mov         r6,    0
+loop_get_satd_16x16_left:
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    inc         r6
+    cmp         r6,  4
+    jl          loop_get_satd_16x16_left
+
+    pop  r2
+    pop  r0
+    add         r0,    8
+    add         r2,    8
+    mov         r6,    0
+loop_get_satd_16x16_right:
+    SSE41_GetSatd8x4
+    lea         r0,  [r0+4*r1]
+    lea         r2,  [r2+4*r3]
+    inc         r6
+    cmp         r6,  4
+    jl          loop_get_satd_16x16_right
+    SSSE3_SumWHorizon retrd, xmm6, xmm5, xmm7
+    POP_XMM
+    LOAD_4_PARA_POP
+%ifdef X86_32
+    pop  r6
+    pop  r5
+    pop  r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;Pixel_satd_wxh_sse41 END
+;
+;***********************************************************************
+
+;***********************************************************************
+;
+;Pixel_satd_wxh_avx2 BEGIN
+;
+;***********************************************************************
+
+%ifdef HAVE_AVX2
+; out=%1 pSrcA=%2 pSrcB=%3 HSumSubDB1_256=%4 ymm_clobber=%5
+%macro AVX2_LoadDiffSatd16x1 5
+    vbroadcasti128   %1, [%2]
+    vpmaddubsw       %1, %1, %4             ; hadamard neighboring horizontal sums and differences
+    vbroadcasti128   %5, [%3]
+    vpmaddubsw       %5, %5, %4             ; hadamard neighboring horizontal sums and differences
+    vpsubw           %1, %1, %5             ; diff srcA srcB
+%endmacro
+
+; out=%1 pSrcA=%2 pSrcA+4*iStride=%3 pSrcB=%4 pSrcB+4*iStride=%5 HSumSubDB1_128x2=%6 ymm_clobber=%7,%8
+%macro AVX2_LoadDiffSatd8x2 8
+    vpbroadcastq     %1, [%2]
+    vpbroadcastq     %7, [%3]
+    vpblendd         %1, %1, %7, 11110000b
+    vpmaddubsw       %1, %1, %6             ; hadamard neighboring horizontal sums and differences
+    vpbroadcastq     %7, [%4]
+    vpbroadcastq     %8, [%5]
+    vpblendd         %7, %7, %8, 11110000b
+    vpmaddubsw       %7, %7, %6             ; hadamard neighboring horizontal sums and differences
+    vpsubw           %1, %1, %7             ; diff srcA srcB
+%endmacro
+
+; in/out=%1,%2,%3,%4 clobber=%5
+%macro AVX2_HDMFour4x4 5
+    vpsubw           %5, %1, %4             ; s3 = x0 - x3
+    vpaddw           %1, %1, %4             ; s0 = x0 + x3
+    vpsubw           %4, %2, %3             ; s2 = x1 - x2
+    vpaddw           %2, %2, %3             ; s1 = x1 + x2
+    vpsubw           %3, %1, %2             ; y2 = s0 - s1
+    vpaddw           %1, %1, %2             ; y0 = s0 + s1
+    vpaddw           %2, %5, %4             ; y1 = s3 + s2
+    vpsubw           %4, %5, %4             ; y3 = s3 - s2
+%endmacro
+
+; out=%1 in=%1,%2,%3,%4 clobber=%5
+%macro AVX2_SatdFour4x4 5
+    AVX2_HDMFour4x4  %1, %2, %3, %4, %5
+    vpabsw           %1, %1
+    vpabsw           %2, %2
+    vpabsw           %3, %3
+    vpabsw           %4, %4
+    ; second stage of horizontal hadamard.
+    ; utilizes that |a + b| + |a - b| = 2 * max(|a|, |b|)
+    vpblendw         %5, %1, %2, 10101010b
+    vpslld           %2, %2, 16
+    vpsrld           %1, %1, 16
+    vpor             %2, %2, %1
+    vpmaxuw          %2, %2, %5
+    vpblendw         %5, %3, %4, 10101010b
+    vpslld           %4, %4, 16
+    vpsrld           %3, %3, 16
+    vpor             %4, %4, %3
+    vpmaxuw          %3, %5, %4
+    vpaddw           %1, %2, %3
+%endmacro
+
+; out=%1 pSrcA=%2 iStrideA=%3 3*iStrideA=%4 pSrcB=%5 iStrideB=%6 3*iStrideB=%7 HSumSubDB1_256=%8 ymm_clobber=%9,%10,%11,%12
+%macro AVX2_GetSatd16x4 12
+    AVX2_LoadDiffSatd16x1  %1, %2 + 0 * %3, %5 + 0 * %6, %8, %12
+    AVX2_LoadDiffSatd16x1  %9, %2 + 1 * %3, %5 + 1 * %6, %8, %12
+    AVX2_LoadDiffSatd16x1 %10, %2 + 2 * %3, %5 + 2 * %6, %8, %12
+    AVX2_LoadDiffSatd16x1 %11, %2 + 1 * %4, %5 + 1 * %7, %8, %12
+    AVX2_SatdFour4x4 %1, %9, %10, %11, %12
+%endmacro
+
+; out=%1 pSrcA=%2 iStrideA=%3 3*iStrideA=%4 pSrcB=%5 iStrideB=%6 3*iStrideB=%7 HSumSubDB1_128x2=%8 ymm_clobber=%9,%10,%11,%12,%13
+%macro AVX2_GetSatd8x8 13
+    AVX2_LoadDiffSatd8x2  %1, %2 + 0 * %3, %2 + 4 * %3, %5 + 0 * %6, %5 + 4 * %6, %8, %12, %13
+    AVX2_LoadDiffSatd8x2 %10, %2 + 2 * %3, %2 + 2 * %4, %5 + 2 * %6, %5 + 2 * %7, %8, %12, %13
+    add              %2, %3
+    add              %5, %6
+    AVX2_LoadDiffSatd8x2  %9, %2 + 0 * %3, %2 + 4 * %3, %5 + 0 * %6, %5 + 4 * %6, %8, %12, %13
+    AVX2_LoadDiffSatd8x2 %11, %2 + 2 * %3, %2 + 2 * %4, %5 + 2 * %6, %5 + 2 * %7, %8, %12, %13
+    AVX2_SatdFour4x4 %1, %9, %10, %11, %12
+%endmacro
+
+; d_out=%1 mm_in=%2 mm_clobber=%3
+%macro AVX2_SumWHorizon 3
+    WELS_DW1_VEX     y%3
+    vpmaddwd         y%2, y%2, y%3
+    vextracti128     x%3, y%2, 1
+    vpaddd           x%2, x%2, x%3
+    vpunpckhqdq      x%3, x%2, x%2
+    vpaddd           x%2, x%2, x%3
+    vpsrldq          x%3, x%2, 4
+    vpaddd           x%2, x%2, x%3
+    vmovd            %1, x%2
+%endmacro
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd8x16_avx2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+
+WELS_EXTERN WelsSampleSatd8x16_avx2
+    %assign push_num 0
+%ifdef X86_32
+    push r4
+    %assign push_num 1
+%endif
+    mov r4, 2                      ; loop cnt
+    jmp WelsSampleSatd8x8N_avx2
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd8x8_avx2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+
+WELS_EXTERN WelsSampleSatd8x8_avx2
+    %assign push_num 0
+%ifdef X86_32
+    push           r4
+    %assign push_num 1
+%endif
+    mov            r4, 1           ; loop cnt
+                                   ; fall through
+WelsSampleSatd8x8N_avx2:
+%ifdef X86_32
+    push           r5
+    push           r6
+    %assign push_num push_num+2
+%endif
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    INIT_X86_32_PIC_NOPRESERVE r5
+    vbroadcasti128 ymm7, [pic(HSumSubDB1)]
+    DEINIT_X86_32_PIC
+    lea            r5, [3 * r1]
+    lea            r6, [3 * r3]
+    vpxor          ymm6, ymm6, ymm6
+.loop:
+    AVX2_GetSatd8x8 ymm0, r0, r1, r5, r2, r3, r6, ymm7, ymm1, ymm2, ymm3, ymm4, ymm5
+    vpaddw         ymm6, ymm6, ymm0
+    sub            r4, 1
+    jbe            .loop_end
+    add            r0, r5
+    add            r2, r6
+    lea            r0, [r0 + 4 * r1]
+    lea            r2, [r2 + 4 * r3]
+    jmp            .loop
+.loop_end:
+    AVX2_SumWHorizon retrd, mm6, mm5
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+%ifdef X86_32
+    pop            r6
+    pop            r5
+    pop            r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x16_avx2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+
+WELS_EXTERN WelsSampleSatd16x16_avx2
+    %assign push_num 0
+%ifdef X86_32
+    push r4
+    %assign push_num 1
+%endif
+    mov r4, 4                      ; loop cnt
+    jmp WelsSampleSatd16x4N_avx2
+
+;***********************************************************************
+;
+;int32_t WelsSampleSatd16x8_avx2( uint8_t *, int32_t, uint8_t *, int32_t, );
+;
+;***********************************************************************
+
+WELS_EXTERN WelsSampleSatd16x8_avx2
+    %assign push_num 0
+%ifdef X86_32
+    push r4
+    %assign push_num 1
+%endif
+    mov r4, 2                      ; loop cnt
+                                   ; fall through
+WelsSampleSatd16x4N_avx2:
+%ifdef X86_32
+    push r5
+    push r6
+    %assign push_num push_num+2
+%endif
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+
+    INIT_X86_32_PIC_NOPRESERVE r5
+    vpbroadcastq xmm0, [pic(HSumSubDB1)]
+    vpbroadcastq ymm6, [pic(HSumSubDB1 + 8)]
+    vpblendd     ymm6, ymm0, ymm6, 11110000b
+    DEINIT_X86_32_PIC
+    lea          r5, [3 * r1]
+    lea          r6, [3 * r3]
+    vpxor        ymm5, ymm5, ymm5
+.loop:
+    AVX2_GetSatd16x4 ymm0, r0, r1, r5, r2, r3, r6, ymm6, ymm1, ymm2, ymm3, ymm4
+    vpaddw       ymm5, ymm5, ymm0
+    lea          r0, [r0 + 4 * r1]
+    lea          r2, [r2 + 4 * r3]
+    sub          r4, 1
+    ja           .loop
+    AVX2_SumWHorizon retrd, mm5, mm0
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+%endif
+    ret
+
+%endif
+
+;***********************************************************************
+;
+;Pixel_satd_wxh_avx2 END
+;
+;***********************************************************************
+
+;***********************************************************************
+;
+;Pixel_sad_wxh_sse2 BEGIN
+;
+;***********************************************************************
+
+%macro SSE2_GetSad2x16 0
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqu xmm1,   [r2]
+    MOVDQ  xmm2,   [r0];[eax] must aligned 16
+    psadbw xmm1,   xmm2
+    paddw  xmm0,   xmm1
+    movdqu xmm1,   [r2+r3]
+    MOVDQ  xmm2,   [r0+r1]
+    psadbw xmm1,   xmm2
+    paddw  xmm0,   xmm1
+%endmacro
+
+
+%macro SSE2_GetSad4x16 0
+    movdqu xmm0,   [r2]
+    MOVDQ  xmm2,   [r0]
+    psadbw xmm0,   xmm2
+    paddw  xmm7,   xmm0
+    movdqu xmm1,   [r2+r3]
+    MOVDQ  xmm2,   [r0+r1]
+    psadbw xmm1,   xmm2
+    paddw  xmm7,   xmm1
+    movdqu xmm1,   [r2+2*r3]
+    MOVDQ  xmm2,   [r0+2*r1];[eax] must aligned 16
+    psadbw xmm1,   xmm2
+    paddw  xmm7,   xmm1
+    movdqu xmm1,   [r2+r5]
+    MOVDQ  xmm2,   [r0+r4]
+    psadbw xmm1,   xmm2
+    paddw  xmm7,   xmm1
+%endmacro
+
+
+%macro SSE2_GetSad8x4 0
+    movq   xmm0,   [r0]
+    movq   xmm1,   [r0+r1]
+    lea    r0,     [r0+2*r1]
+    movhps xmm0,   [r0]
+    movhps xmm1,   [r0+r1]
+
+    movq   xmm2,   [r2]
+    movq   xmm3,   [r2+r3]
+    lea    r2,     [r2+2*r3]
+    movhps xmm2,   [r2]
+    movhps xmm3,   [r2+r3]
+    psadbw xmm0,   xmm2
+    psadbw xmm1,   xmm3
+    paddw  xmm6,   xmm0
+    paddw  xmm6,   xmm1
+%endmacro
+
+;***********************************************************************
+;
+;int32_t WelsSampleSad16x16_sse2( uint8_t *, int32_t, uint8_t *, int32_t, )
+;First parameter can align to 16 bytes,
+;In wels, the third parameter can't align to 16 bytes.
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSad16x16_sse2
+%ifdef X86_32
+    push  r4
+    push  r5
+%endif
+
+    %assign  push_num 2
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    lea r4, [3*r1]
+    lea r5, [3*r3]
+
+    pxor   xmm7,   xmm7
+    SSE2_GetSad4x16
+    lea    r0,  [r0+4*r1]
+    lea    r2,  [r2+4*r3]
+    SSE2_GetSad4x16
+    lea    r0,  [r0+4*r1]
+    lea    r2,  [r2+4*r3]
+    SSE2_GetSad4x16
+    lea    r0,  [r0+4*r1]
+    lea    r2,  [r2+4*r3]
+    SSE2_GetSad4x16
+    movhlps xmm0, xmm7
+    paddw xmm0, xmm7
+    movd retrd, xmm0
+    POP_XMM
+    LOAD_4_PARA_POP
+%ifdef X86_32
+    pop  r5
+    pop  r4
+%endif
+    ret
+
+;***********************************************************************
+;
+;int32_t WelsSampleSad16x8_sse2( uint8_t *, int32_t, uint8_t *, int32_t, )
+;First parameter can align to 16 bytes,
+;In wels, the third parameter can't align to 16 bytes.
+;
+;***********************************************************************
+WELS_EXTERN WelsSampleSad16x8_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movdqu xmm0,   [r2]
+    MOVDQ  xmm2,   [r0]
+    psadbw xmm0,   xmm2
+    movdqu xmm1,   [r2+r3]
+    MOVDQ  xmm2,   [r0+r1]
+    psadbw xmm1,   xmm2
+    paddw  xmm0,   xmm1
+
+    SSE2_GetSad2x16
+    SSE2_GetSad2x16
+    SSE2_GetSad2x16
+
+    movhlps     xmm1, xmm0
+    paddw       xmm0, xmm1
+    movd        retrd,  xmm0
+    LOAD_4_PARA_POP
+    ret
+
+
+
+WELS_EXTERN WelsSampleSad8x16_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm6,   xmm6
+
+    SSE2_GetSad8x4
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSad8x4
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSad8x4
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSad8x4
+
+    movhlps    xmm0, xmm6
+    paddw      xmm0, xmm6
+    movd       retrd,  xmm0
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+
+%macro CACHE_SPLIT_CHECK 3 ; address, width, cacheline
+and    %1,  0x1f|(%3>>1)
+cmp    %1,  (32-%2)|(%3>>1)
+%endmacro
+
+WELS_EXTERN WelsSampleSad8x8_sse21
+    %assign  push_num 0
+    mov     r2,  arg3
+    push    r2
+    CACHE_SPLIT_CHECK r2, 8, 64
+    jle    near   .pixel_sad_8x8_nsplit
+    pop     r2
+%ifdef X86_32
+    push    r3
+    push    r4
+    push    r5
+%endif
+    %assign  push_num 3
+    PUSH_XMM 8
+    mov     r0,  arg1
+    mov     r1,  arg2
+    SIGN_EXTENSION r1, r1d
+    pxor   xmm7,   xmm7
+
+    ;ecx r2, edx r4, edi r5
+
+    mov    r5,    r2
+    and    r5,    0x07
+    sub    r2,    r5
+    mov    r4,    8
+    sub    r4,    r5
+
+    shl    r5,    3
+    shl    r4,    3
+    movd   xmm5,   r5d
+    movd   xmm6,   r4d
+    mov    r5,    8
+    add    r5,    r2
+    mov    r3,    arg4
+    SIGN_EXTENSION r3, r3d
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+
+    movq   xmm1,   [r2]
+    movq   xmm2,   [r5]
+    movhps xmm1,   [r2+r3]
+    movhps xmm2,   [r5+r3]
+    psrlq  xmm1,   xmm5
+    psllq  xmm2,   xmm6
+    por    xmm1,   xmm2
+
+    psadbw xmm0,   xmm1
+    paddw  xmm7,   xmm0
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    lea    r5,    [r5+2*r3]
+
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+
+    movq   xmm1,   [r2]
+    movq   xmm2,   [r5]
+    movhps xmm1,   [r2+r3]
+    movhps xmm2,   [r5+r3]
+    psrlq  xmm1,   xmm5
+    psllq  xmm2,   xmm6
+    por    xmm1,   xmm2
+
+    psadbw xmm0,   xmm1
+    paddw  xmm7,   xmm0
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    lea    r5,    [r5+2*r3]
+
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+
+    movq   xmm1,   [r2]
+    movq   xmm2,   [r5]
+    movhps xmm1,   [r2+r3]
+    movhps xmm2,   [r5+r3]
+    psrlq  xmm1,   xmm5
+    psllq  xmm2,   xmm6
+    por    xmm1,   xmm2
+
+    psadbw xmm0,   xmm1
+    paddw  xmm7,   xmm0
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    lea    r5,    [r5+2*r3]
+
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+
+    movq   xmm1,   [r2]
+    movq   xmm2,   [r5]
+    movhps xmm1,   [r2+r3]
+    movhps xmm2,   [r5+r3]
+    psrlq  xmm1,   xmm5
+    psllq  xmm2,   xmm6
+    por    xmm1,   xmm2
+
+    psadbw xmm0,   xmm1
+    paddw  xmm7,   xmm0
+
+    movhlps    xmm0, xmm7
+    paddw      xmm0, xmm7
+    movd       retrd,  xmm0
+    POP_XMM
+%ifdef X86_32
+    pop  r5
+    pop  r4
+    pop  r3
+%endif
+    jmp        .return
+
+.pixel_sad_8x8_nsplit:
+
+    pop r2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm6,   xmm6
+    SSE2_GetSad8x4
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    SSE2_GetSad8x4
+    movhlps    xmm0, xmm6
+    paddw      xmm0, xmm6
+    movd       retrd,  xmm0
+    POP_XMM
+    LOAD_4_PARA_POP
+.return:
+    ret
+
+
+;***********************************************************************
+;
+;Pixel_sad_wxh_sse2 END
+;
+;***********************************************************************
+
+
+;***********************************************************************
+;
+;Pixel_sad_4_wxh_sse2 BEGIN
+;
+;***********************************************************************
+
+
+%macro SSE2_Get4LW16Sad 5 ;s-1l, s, s+1l, d, address
+    psadbw %1,   %4
+    paddw  xmm5, %1
+    psadbw %4,   %3
+    paddw  xmm4, %4
+    movdqu %4,   [%5-1]
+    psadbw %4,   %2
+    paddw  xmm6, %4
+    movdqu %4,   [%5+1]
+    psadbw %4,   %2
+    paddw  xmm7, %4
+%endmacro
+WELS_EXTERN WelsSampleSadFour16x16_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm4,   xmm4    ;sad pRefMb-i_stride_ref
+    pxor   xmm5,   xmm5    ;sad pRefMb+i_stride_ref
+    pxor   xmm6,   xmm6    ;sad pRefMb-1
+    pxor   xmm7,   xmm7    ;sad pRefMb+1
+    movdqa xmm0,   [r0]
+    sub    r2,    r3
+    movdqu xmm3,   [r2]
+    psadbw xmm3,   xmm0
+    paddw  xmm4,   xmm3
+
+    movdqa xmm1,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    psadbw xmm3,   xmm1
+    paddw  xmm4,   xmm3
+
+    movdqu xmm2,   [r2+r3-1]
+    psadbw xmm2,   xmm0
+    paddw  xmm6,   xmm2
+
+    movdqu xmm3,   [r2+r3+1]
+    psadbw xmm3,   xmm0
+    paddw  xmm7,   xmm3
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm2,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2
+    movdqa xmm0,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm1,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2
+    movdqa xmm2,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm0,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2
+    movdqa xmm1,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm2,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2
+    movdqa xmm0,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm1,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2
+    movdqa xmm2,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm0,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2
+    movdqa xmm1,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm2,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2
+    movdqa xmm0,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2+r3
+    lea    r2,    [r2+2*r3]
+    movdqu xmm3,   [r2]
+    psadbw xmm2,   xmm3
+    paddw xmm5,   xmm2
+
+    movdqu xmm2,   [r2-1]
+    psadbw xmm2,   xmm0
+    paddw xmm6,   xmm2
+
+    movdqu xmm3,   [r2+1]
+    psadbw xmm3,   xmm0
+    paddw xmm7,   xmm3
+
+    movdqu xmm3,   [r2+r3]
+    psadbw xmm0,   xmm3
+    paddw xmm5,   xmm0
+
+    movhlps    xmm0, xmm4
+    paddw      xmm4, xmm0
+    movhlps    xmm0, xmm5
+    paddw      xmm5, xmm0
+    movhlps    xmm0, xmm6
+    paddw      xmm6, xmm0
+    movhlps    xmm0, xmm7
+    paddw      xmm7, xmm0
+    punpckldq  xmm4, xmm5
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm4, xmm6
+    movdqa     [r4],xmm4
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+
+WELS_EXTERN WelsSampleSadFour16x8_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm4,   xmm4    ;sad pRefMb-i_stride_ref
+    pxor   xmm5,   xmm5    ;sad pRefMb+i_stride_ref
+    pxor   xmm6,   xmm6    ;sad pRefMb-1
+    pxor   xmm7,   xmm7    ;sad pRefMb+1
+    movdqa xmm0,   [r0]
+    sub    r2,    r3
+    movdqu xmm3,   [r2]
+    psadbw xmm3,   xmm0
+    paddw xmm4,   xmm3
+
+    movdqa xmm1,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    psadbw xmm3,   xmm1
+    paddw xmm4,   xmm3
+
+    movdqu xmm2,   [r2+r3-1]
+    psadbw xmm2,   xmm0
+    paddw xmm6,   xmm2
+
+    movdqu xmm3,   [r2+r3+1]
+    psadbw xmm3,   xmm0
+    paddw xmm7,   xmm3
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm2,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2
+    movdqa xmm0,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm1,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2
+    movdqa xmm2,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm0, xmm1, xmm2, xmm3, r2+r3
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movdqa xmm0,   [r0]
+    movdqu xmm3,   [r2]
+    SSE2_Get4LW16Sad xmm1, xmm2, xmm0, xmm3, r2
+    movdqa xmm1,   [r0+r1]
+    movdqu xmm3,   [r2+r3]
+    SSE2_Get4LW16Sad xmm2, xmm0, xmm1, xmm3, r2+r3
+    lea    r2,    [r2+2*r3]
+    movdqu xmm3,   [r2]
+    psadbw xmm0,   xmm3
+    paddw xmm5,   xmm0
+
+    movdqu xmm0,   [r2-1]
+    psadbw xmm0,   xmm1
+    paddw xmm6,   xmm0
+
+    movdqu xmm3,   [r2+1]
+    psadbw xmm3,   xmm1
+    paddw xmm7,   xmm3
+
+    movdqu xmm3,   [r2+r3]
+    psadbw xmm1,   xmm3
+    paddw xmm5,   xmm1
+
+    movhlps    xmm0, xmm4
+    paddw      xmm4, xmm0
+    movhlps    xmm0, xmm5
+    paddw      xmm5, xmm0
+    movhlps    xmm0, xmm6
+    paddw      xmm6, xmm0
+    movhlps    xmm0, xmm7
+    paddw      xmm7, xmm0
+    punpckldq  xmm4, xmm5
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm4, xmm6
+    movdqa     [r4],xmm4
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+WELS_EXTERN WelsSampleSadFour8x16_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm4,   xmm4    ;sad pRefMb-i_stride_ref
+    pxor   xmm5,   xmm5    ;sad pRefMb+i_stride_ref
+    pxor   xmm6,   xmm6    ;sad pRefMb-1
+    pxor   xmm7,   xmm7    ;sad pRefMb+1
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+    sub    r2,    r3
+    movq   xmm3,   [r2]
+    movhps xmm3,   [r2+r3]
+    psadbw xmm3,   xmm0
+    paddw  xmm4,   xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movhlps    xmm0, xmm4
+    paddw      xmm4, xmm0
+    movhlps    xmm0, xmm5
+    paddw      xmm5, xmm0
+    movhlps    xmm0, xmm6
+    paddw      xmm6, xmm0
+    movhlps    xmm0, xmm7
+    paddw      xmm7, xmm0
+    punpckldq  xmm4, xmm5
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm4, xmm6
+    movdqa     [r4],xmm4
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+
+WELS_EXTERN WelsSampleSadFour8x8_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    pxor   xmm4,   xmm4    ;sad pRefMb-i_stride_ref
+    pxor   xmm5,   xmm5    ;sad pRefMb+i_stride_ref
+    pxor   xmm6,   xmm6    ;sad pRefMb-1
+    pxor   xmm7,   xmm7    ;sad pRefMb+1
+    movq   xmm0,   [r0]
+    movhps xmm0,   [r0+r1]
+    sub    r2,    r3
+    movq   xmm3,   [r2]
+    movhps xmm3,   [r2+r3]
+    psadbw xmm3,   xmm0
+    paddw  xmm4,   xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movq   xmm0,  [r0]
+    movhps xmm0,  [r0+r1]
+    psadbw xmm3,  xmm0
+    paddw  xmm4,  xmm3
+
+
+    movq   xmm1,  [r2+r3-1]
+    movq   xmm3,  [r2+r3+1]
+
+    lea    r0,    [r0+2*r1]
+    lea    r2,    [r2+2*r3]
+    movhps xmm1,  [r2-1]
+    movhps xmm3,  [r2+1]
+
+    psadbw xmm1,  xmm0
+    paddw  xmm6,  xmm1
+    psadbw xmm3,  xmm0
+    paddw  xmm7,  xmm3
+
+    movq   xmm3,  [r2]
+    movhps xmm3,  [r2+r3]
+    psadbw xmm0,  xmm3
+    paddw  xmm5,  xmm0
+
+    movhlps    xmm0, xmm4
+    paddw      xmm4, xmm0
+    movhlps    xmm0, xmm5
+    paddw      xmm5, xmm0
+    movhlps    xmm0, xmm6
+    paddw      xmm6, xmm0
+    movhlps    xmm0, xmm7
+    paddw      xmm7, xmm0
+    punpckldq  xmm4, xmm5
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm4, xmm6
+    movdqa     [r4],xmm4
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+WELS_EXTERN WelsSampleSadFour4x4_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movd   xmm0,   [r0]
+    movd   xmm1,   [r0+r1]
+    lea        r0,    [r0+2*r1]
+    movd       xmm2,   [r0]
+    movd       xmm3,   [r0+r1]
+    punpckldq  xmm0, xmm1
+    punpckldq  xmm2, xmm3
+    punpcklqdq xmm0, xmm2
+    sub        r2,  r3
+    movd       xmm1, [r2]
+    movd       xmm2, [r2+r3]
+    punpckldq  xmm1, xmm2
+    movd       xmm2, [r2+r3-1]
+    movd       xmm3, [r2+r3+1]
+
+    lea        r2,  [r2+2*r3]
+
+    movd       xmm4, [r2]
+    movd       xmm5, [r2-1]
+    punpckldq  xmm2, xmm5
+    movd       xmm5, [r2+1]
+    punpckldq  xmm3, xmm5
+
+    movd       xmm5, [r2+r3]
+    punpckldq  xmm4, xmm5
+
+    punpcklqdq xmm1, xmm4 ;-L
+
+    movd       xmm5, [r2+r3-1]
+    movd       xmm6, [r2+r3+1]
+
+    lea        r2,  [r2+2*r3]
+    movd       xmm7, [r2-1]
+    punpckldq  xmm5, xmm7
+    punpcklqdq xmm2, xmm5 ;-1
+    movd       xmm7, [r2+1]
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm3, xmm6 ;+1
+    movd       xmm6, [r2]
+    movd       xmm7, [r2+r3]
+    punpckldq  xmm6, xmm7
+    punpcklqdq xmm4, xmm6 ;+L
+    psadbw     xmm1, xmm0
+    psadbw     xmm2, xmm0
+    psadbw     xmm3, xmm0
+    psadbw     xmm4, xmm0
+
+    movhlps    xmm0, xmm1
+    paddw      xmm1, xmm0
+    movhlps    xmm0, xmm2
+    paddw      xmm2, xmm0
+    movhlps    xmm0, xmm3
+    paddw      xmm3, xmm0
+    movhlps    xmm0, xmm4
+    paddw      xmm4, xmm0
+    punpckldq  xmm1, xmm4
+    punpckldq  xmm2, xmm3
+    punpcklqdq xmm1, xmm2
+    movdqa     [r4],xmm1
+    POP_XMM
+    LOAD_5_PARA_POP
+    ret
+
+;***********************************************************************
+;
+;Pixel_sad_4_wxh_sse2 END
+;
+;***********************************************************************
+
+;***********************************************************************
+;   int32_t WelsSampleSad4x4_mmx (uint8_t *, int32_t, uint8_t *, int32_t )
+;***********************************************************************
+WELS_EXTERN WelsSampleSad4x4_mmx
+    %assign  push_num 0
+    LOAD_4_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    movd      mm0, [r0]
+    movd      mm1, [r0+r1]
+    punpckldq mm0, mm1
+
+    movd      mm3, [r2]
+    movd      mm4, [r2+r3]
+    punpckldq mm3, mm4
+    psadbw    mm0, mm3
+
+    lea       r0, [r0+2*r1]
+    lea       r2, [r2+2*r3]
+
+    movd      mm1, [r0]
+    movd      mm2, [r0+r1]
+    punpckldq mm1, mm2
+
+    movd      mm3, [r2]
+    movd      mm4, [r2+r3]
+    punpckldq mm3, mm4
+    psadbw    mm1, mm3
+    paddw     mm0, mm1
+
+    movd      retrd, mm0
+
+    WELSEMMS
+    LOAD_4_PARA_POP
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/common/x86/vaa.asm b/third-party/openh264/third_party/openh264/src/codec/common/x86/vaa.asm
new file mode 100644
index 0000000000..1edb9f6dc1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/common/x86/vaa.asm
@@ -0,0 +1,411 @@
+;*!
+;* \copy
+;*     Copyright (c)  2010-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  vaa.asm
+;*
+;*  Abstract
+;*      sse2 for pVaa routines
+;*
+;*  History
+;*      04/14/2010  Created
+;*      06/07/2010  Added AnalysisVaaInfoIntra_sse2(ssse3)
+;*      06/10/2010  Tune rc_sad_frame_sse2 and got about 40% improvement
+;*      08/11/2010  Added abs_difference_mbrow_sse2 & sum_sqrsum_mbrow_sse2
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+
+;***********************************************************************
+; Macros and other preprocessor constants
+;***********************************************************************
+
+; by comparing it outperforms than phaddw(SSSE3) sets
+%macro SUM_WORD_8x2_SSE2    2   ; dst(pSrc), tmp
+    ; @sum_8x2 begin
+    pshufd %2, %1, 04Eh ; 01001110 B
+    paddw %1, %2
+    pshuflw %2, %1, 04Eh    ; 01001110 B
+    paddw %1, %2
+    pshuflw %2, %1, 0B1h    ; 10110001 B
+    paddw %1, %2
+    ; end of @sum_8x2
+%endmacro   ; END of SUM_WORD_8x2_SSE2
+
+
+%macro VAA_AVG_BLOCK_SSE2 6 ; dst, t0, t1, t2, t3, t4
+    movdqa %1, [r0    ] ; line 0
+    movdqa %2, [r0+r1]  ; line 1
+    movdqa %3, %1
+    punpcklbw %1, xmm7
+    punpckhbw %3, xmm7
+    movdqa %4, %2
+    punpcklbw %4, xmm7
+    punpckhbw %2, xmm7
+    paddw %1, %4
+    paddw %2, %3
+    movdqa %3, [r0+r2]  ; line 2
+    movdqa %4, [r0+r3]  ; line 3
+    movdqa %5, %3
+    punpcklbw %3, xmm7
+    punpckhbw %5, xmm7
+    movdqa %6, %4
+    punpcklbw %6, xmm7
+    punpckhbw %4, xmm7
+    paddw %3, %6
+    paddw %4, %5
+    paddw %1, %3    ; block 0, 1
+    paddw %2, %4    ; block 2, 3
+    pshufd %3, %1, 0B1h
+    pshufd %4, %2, 0B1h
+    paddw %1, %3
+    paddw %2, %4
+    movdqa %3, %1
+    movdqa %4, %2
+    pshuflw %5, %1, 0B1h
+    pshufhw %6, %3, 0B1h
+    paddw %1, %5
+    paddw %3, %6
+    pshuflw %5, %2, 0B1h
+    pshufhw %6, %4, 0B1h
+    paddw %2, %5
+    paddw %4, %6
+    punpcklwd %1, %2
+    punpckhwd %3, %4
+    punpcklwd %1, %3
+    psraw %1, $04
+%endmacro
+
+%macro VAA_AVG_BLOCK_SSSE3 6 ; dst, t0, t1, t2, t3, t4
+    movdqa %1, [r0    ] ; line 0
+    movdqa %2, [r0+r1]  ; line 1
+    movdqa %3, %1
+    punpcklbw %1, xmm7
+    punpckhbw %3, xmm7
+    movdqa %4, %2
+    punpcklbw %4, xmm7
+    punpckhbw %2, xmm7
+    paddw %1, %4
+    paddw %2, %3
+    movdqa %3, [r0+r2]  ; line 2
+    movdqa %4, [r0+r3]  ; line 3
+    movdqa %5, %3
+    punpcklbw %3, xmm7
+    punpckhbw %5, xmm7
+    movdqa %6, %4
+    punpcklbw %6, xmm7
+    punpckhbw %4, xmm7
+    paddw %3, %6
+    paddw %4, %5
+    paddw %1, %3    ; block 0, 1
+    paddw %2, %4    ; block 2, 3
+    phaddw %1, %2   ; block[0]: 0-15, 16-31; block[1]: 32-47, 48-63; ..
+    phaddw %1, xmm7 ; block[0]: 0-15; block[1]: 16-31; block[2]: 32-47; block[3]: 48-63; ....
+    psraw %1, $04
+%endmacro
+
+
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+; , 6/7/2010
+
+;***********************************************************************
+;   int32_t AnalysisVaaInfoIntra_sse2(  uint8_t *pDataY, const int32_t iLineSize );
+;***********************************************************************
+WELS_EXTERN AnalysisVaaInfoIntra_sse2
+
+    %assign push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1,r1d
+
+%ifdef X86_32
+    push r3
+    push r4
+    push r5
+    push r6
+    %assign push_num push_num+4
+%endif
+
+    mov  r5,r7
+    and  r5,0fh
+    sub  r7,r5
+    sub  r7,32
+
+
+    mov r2,r1
+    sal r2,$01   ;r2 = 2*iLineSize
+    mov r3,r2
+    add r3,r1   ;r3 = 3*iLineSize
+
+    mov r4,r2
+    sal r4,$01   ;r4 = 4*iLineSize
+
+    pxor xmm7, xmm7
+
+    ; loops
+    VAA_AVG_BLOCK_SSE2 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7], xmm0
+
+    lea r0, [r0+r4]
+    VAA_AVG_BLOCK_SSE2 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7+8], xmm0
+
+    lea r0, [r0+r4]
+    VAA_AVG_BLOCK_SSE2 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7+16], xmm0
+
+    lea r0, [r0+r4]
+    VAA_AVG_BLOCK_SSE2 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7+24], xmm0
+
+    movdqa xmm0, [r7]       ; block 0~7
+    movdqa xmm1, [r7+16]    ; block 8~15
+    movdqa xmm2, xmm0
+    paddw xmm0, xmm1
+    SUM_WORD_8x2_SSE2 xmm0, xmm3
+
+    pmullw xmm1, xmm1
+    pmullw xmm2, xmm2
+    movdqa xmm3, xmm1
+    movdqa xmm4, xmm2
+    punpcklwd xmm1, xmm7
+    punpckhwd xmm3, xmm7
+    punpcklwd xmm2, xmm7
+    punpckhwd xmm4, xmm7
+    paddd xmm1, xmm2
+    paddd xmm3, xmm4
+    paddd xmm1, xmm3
+    pshufd xmm2, xmm1, 01Bh
+    paddd xmm1, xmm2
+    pshufd xmm2, xmm1, 0B1h
+    paddd xmm1, xmm2
+
+
+
+    movd r2d, xmm0
+    and r2, 0ffffh      ; effective low work truncated
+    mov r3, r2
+    imul r2, r3
+    sar r2, $04
+    movd retrd, xmm1
+    sub retrd, r2d
+
+    add r7,32
+    add r7,r5
+
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+%endif
+    POP_XMM
+
+    ret
+
+;***********************************************************************
+;   int32_t AnalysisVaaInfoIntra_ssse3( uint8_t *pDataY, const int32_t iLineSize );
+;***********************************************************************
+WELS_EXTERN AnalysisVaaInfoIntra_ssse3
+
+    %assign push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1,r1d
+
+%ifdef X86_32
+    push r3
+    push r4
+    push r5
+    push r6
+    %assign push_num push_num+4
+%endif
+
+    mov  r5,r7
+    and  r5,0fh
+    sub  r7,r5
+    sub  r7,32
+
+
+    mov r2,r1
+    sal r2,$01   ;r2 = 2*iLineSize
+    mov r3,r2
+    add r3,r1   ;r3 = 3*iLineSize
+
+    mov r4,r2
+    sal r4,$01   ;r4 = 4*iLineSize
+
+    pxor xmm7, xmm7
+
+    ; loops
+    VAA_AVG_BLOCK_SSSE3 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7],xmm0
+
+    lea r0,[r0+r4]
+    VAA_AVG_BLOCK_SSSE3 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    movq [r7+8],xmm1
+
+
+    lea r0,[r0+r4]
+    VAA_AVG_BLOCK_SSSE3 xmm0, xmm1, xmm2, xmm3, xmm4, xmm5
+    movq [r7+16],xmm0
+
+    lea r0,[r0+r4]
+    VAA_AVG_BLOCK_SSSE3 xmm1, xmm2, xmm3, xmm4, xmm5, xmm6
+    movq [r7+24],xmm1
+
+
+    movdqa xmm0,[r7]
+    movdqa xmm1,[r7+16]
+    movdqa xmm2, xmm0
+    paddw xmm0, xmm1
+    SUM_WORD_8x2_SSE2 xmm0, xmm3    ; better performance than that of phaddw sets
+
+    pmullw xmm1, xmm1
+    pmullw xmm2, xmm2
+    movdqa xmm3, xmm1
+    movdqa xmm4, xmm2
+    punpcklwd xmm1, xmm7
+    punpckhwd xmm3, xmm7
+    punpcklwd xmm2, xmm7
+    punpckhwd xmm4, xmm7
+    paddd xmm1, xmm2
+    paddd xmm3, xmm4
+    paddd xmm1, xmm3
+    pshufd xmm2, xmm1, 01Bh
+    paddd xmm1, xmm2
+    pshufd xmm2, xmm1, 0B1h
+    paddd xmm1, xmm2
+
+
+    movd r2d, xmm0
+    and r2, 0ffffh          ; effective low work truncated
+    mov r3, r2
+    imul r2, r3
+    sar r2, $04
+    movd retrd, xmm1
+    sub retrd, r2d
+
+    add r7,32
+    add r7,r5
+%ifdef X86_32
+    pop r6
+    pop r5
+    pop r4
+    pop r3
+%endif
+    POP_XMM
+
+    ret
+
+;***********************************************************************
+;   uint8_t MdInterAnalysisVaaInfo_sse41( int32_t *pSad8x8 )
+;***********************************************************************
+WELS_EXTERN MdInterAnalysisVaaInfo_sse41
+    %assign push_num 0
+    LOAD_1_PARA
+    movdqa xmm0,[r0]
+    pshufd xmm1, xmm0, 01Bh
+    paddd xmm1, xmm0
+    pshufd xmm2, xmm1, 0B1h
+    paddd xmm1, xmm2
+    psrad xmm1, 02h     ; iAverageSad
+    movdqa xmm2, xmm1
+    psrad xmm2, 06h
+    movdqa xmm3, xmm0   ; iSadBlock
+    psrad xmm3, 06h
+    psubd xmm3, xmm2
+    pmulld xmm3, xmm3   ; [comment]: pmulld from SSE4.1 instruction sets
+    pshufd xmm4, xmm3, 01Bh
+    paddd xmm4, xmm3
+    pshufd xmm3, xmm4, 0B1h
+    paddd xmm3, xmm4
+    movd r0d, xmm3
+    cmp r0d, 20 ; INTER_VARIANCE_SAD_THRESHOLD
+
+    jb near .threshold_exit
+    pshufd xmm0, xmm0, 01Bh
+    pcmpgtd xmm0, xmm1  ; iSadBlock > iAverageSad
+    movmskps retrd, xmm0
+    ret
+.threshold_exit:
+    mov retrd, 15
+    ret
+
+;***********************************************************************
+;   uint8_t MdInterAnalysisVaaInfo_sse2( int32_t *pSad8x8 )
+;***********************************************************************
+WELS_EXTERN MdInterAnalysisVaaInfo_sse2
+    %assign push_num 0
+    LOAD_1_PARA
+    movdqa xmm0, [r0]
+    pshufd xmm1, xmm0, 01Bh
+    paddd xmm1, xmm0
+    pshufd xmm2, xmm1, 0B1h
+    paddd xmm1, xmm2
+    psrad xmm1, 02h     ; iAverageSad
+    movdqa xmm2, xmm1
+    psrad xmm2, 06h
+    movdqa xmm3, xmm0   ; iSadBlock
+    psrad xmm3, 06h
+    psubd xmm3, xmm2
+
+    ; to replace pmulld functionality as below
+    movdqa xmm2, xmm3
+    pmuludq xmm2, xmm3
+    pshufd xmm4, xmm3, 0B1h
+    pmuludq xmm4, xmm4
+    movdqa xmm5, xmm2
+    punpckldq xmm5, xmm4
+    punpckhdq xmm2, xmm4
+    punpcklqdq xmm5, xmm2
+
+    pshufd xmm4, xmm5, 01Bh
+    paddd xmm4, xmm5
+    pshufd xmm5, xmm4, 0B1h
+    paddd xmm5, xmm4
+
+    movd r0d, xmm5
+    cmp r0d, 20 ; INTER_VARIANCE_SAD_THRESHOLD
+    jb near .threshold_exit
+    pshufd xmm0, xmm0, 01Bh
+    pcmpgtd xmm0, xmm1  ; iSadBlock > iAverageSad
+    movmskps retrd, xmm0
+    ret
+.threshold_exit:
+    mov retrd, 15
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/common/inc/read_config.h b/third-party/openh264/third_party/openh264/src/codec/console/common/inc/read_config.h
new file mode 100644
index 0000000000..6ad529d58f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/common/inc/read_config.h
@@ -0,0 +1,68 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  read_config.h
+ *
+ *  Abstract
+ *      Class for reading parameter settings in a configure file.
+ *
+ *  History
+ *      08/18/2008 Created
+ *
+ *****************************************************************************/
+#ifndef READ_CONFIG_H__
+#define READ_CONFIG_H__
+
+#include <stdlib.h>
+#include <string>
+
+
+class CReadConfig {
+ public:
+  CReadConfig();
+  CReadConfig (const char* pConfigFileName);
+  CReadConfig (const std::string& pConfigFileName);
+  virtual ~CReadConfig();
+
+  void Openf (const char* strFile);
+  long ReadLine (std::string* strVal, const int iValSize = 4);
+  const bool EndOfFile();
+  const int GetLines();
+  const bool ExistFile();
+  const std::string& GetFileName();
+
+ private:
+  FILE*             m_pCfgFile;
+  std::string       m_strCfgFileName;
+  unsigned int      m_iLines;
+};
+
+#endif // READ_CONFIG_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/common/meson.build b/third-party/openh264/third_party/openh264/src/codec/console/common/meson.build
new file mode 100644
index 0000000000..6bf1124258
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/common/meson.build
@@ -0,0 +1,12 @@
+cpp_sources = [
+  'src/read_config.cpp'
+]
+
+conscomminc = [
+  inc,
+  console_common_inc,
+]
+
+libconsole_common = static_library('console_common', cpp_sources,
+  include_directories: conscomminc,
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/common/src/read_config.cpp b/third-party/openh264/third_party/openh264/src/codec/console/common/src/read_config.cpp
new file mode 100644
index 0000000000..40bc6a2238
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/common/src/read_config.cpp
@@ -0,0 +1,139 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  read_config.h
+ *
+ *  Abstract
+ *      Class for reading parameter settings in a configure file.
+ *
+ *  History
+ *      08/18/2008 Created
+ *
+ *****************************************************************************/
+
+#define _CRT_SECURE_NO_WARNINGS
+#include <stdio.h>
+#include <string.h>
+#include "read_config.h"
+
+CReadConfig::CReadConfig()
+  : m_pCfgFile (NULL)
+  , m_strCfgFileName ("")
+  , m_iLines (0) {
+}
+
+CReadConfig::CReadConfig (const char* kpConfigFileName)
+  : m_pCfgFile (0)
+  , m_strCfgFileName (kpConfigFileName)
+  , m_iLines (0) {
+  if (strlen (kpConfigFileName) > 0) { // confirmed_safe_unsafe_usage
+    m_pCfgFile = fopen (kpConfigFileName, "r");
+  }
+}
+
+CReadConfig::CReadConfig (const std::string& kpConfigFileName)
+  : m_pCfgFile (0)
+  , m_strCfgFileName (kpConfigFileName)
+  , m_iLines (0) {
+  if (kpConfigFileName.length() > 0) {
+    m_pCfgFile = fopen (kpConfigFileName.c_str(), "r");
+  }
+}
+
+CReadConfig::~CReadConfig() {
+  if (m_pCfgFile) {
+    fclose (m_pCfgFile);
+    m_pCfgFile = NULL;
+  }
+}
+
+void CReadConfig::Openf (const char* kpStrFile) {
+  if (kpStrFile != NULL && strlen (kpStrFile) > 0) { // confirmed_safe_unsafe_usage
+    m_strCfgFileName = kpStrFile;
+    m_pCfgFile = fopen (kpStrFile, "r");
+  }
+}
+
+long CReadConfig::ReadLine (std::string* pVal, const int kiValSize/* = 4*/) {
+  if (m_pCfgFile == NULL || pVal == NULL || kiValSize <= 1)
+    return 0;
+
+  std::string* strTags = &pVal[0];
+  int nTagNum = 0, n = 0;
+  bool bCommentFlag = false;
+
+  while (n < kiValSize) {
+    pVal[n] = "";
+    ++ n;
+  }
+
+  do {
+    const char kCh = (char)fgetc (m_pCfgFile);
+
+    if (kCh == '\n' || feof (m_pCfgFile)) {
+      ++ m_iLines;
+      break;
+    }
+    if (kCh == '#')
+      bCommentFlag = true;
+    if (!bCommentFlag) {
+      if (kCh == '\t' || kCh == ' ') {
+        if (nTagNum >= kiValSize - 1)
+          break;
+        if (! (*strTags).empty()) {
+          ++ nTagNum;
+          strTags = &pVal[nTagNum];
+        }
+      } else
+        *strTags += kCh;
+    }
+
+  } while (true);
+
+  return 1 + nTagNum;
+}
+
+const bool CReadConfig::EndOfFile() {
+  if (m_pCfgFile == NULL)
+    return true;
+  return feof (m_pCfgFile) ? true : false;
+}
+
+const int CReadConfig::GetLines() {
+  return m_iLines;
+}
+
+const bool CReadConfig::ExistFile() {
+  return (m_pCfgFile != NULL);
+}
+
+const std::string& CReadConfig::GetFileName() {
+  return m_strCfgFileName;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/common/targets.mk b/third-party/openh264/third_party/openh264/src/codec/console/common/targets.mk
new file mode 100644
index 0000000000..89c6fd3a78
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/common/targets.mk
@@ -0,0 +1,20 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+CONSOLE_COMMON_SRCDIR=codec/console/common
+CONSOLE_COMMON_CPP_SRCS=\
+	$(CONSOLE_COMMON_SRCDIR)/src/read_config.cpp\
+
+CONSOLE_COMMON_OBJS += $(CONSOLE_COMMON_CPP_SRCS:.cpp=.$(OBJ))
+
+OBJS += $(CONSOLE_COMMON_OBJS)
+
+$(CONSOLE_COMMON_SRCDIR)/%.$(OBJ): $(CONSOLE_COMMON_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(CONSOLE_COMMON_CFLAGS) $(CONSOLE_COMMON_INCLUDES) -c $(CXX_O) $<
+
+$(LIBPREFIX)console_common.$(LIBSUFFIX): $(CONSOLE_COMMON_OBJS)
+	$(QUIET)rm -f $@
+	$(QUIET_AR)$(AR) $(AR_OPTS) $+
+
+libraries: $(LIBPREFIX)console_common.$(LIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)console_common.$(LIBSUFFIX)
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/dec/inc/d3d9_utils.h b/third-party/openh264/third_party/openh264/src/codec/console/dec/inc/d3d9_utils.h
new file mode 100644
index 0000000000..715329d1d7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/dec/inc/d3d9_utils.h
@@ -0,0 +1,148 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    d3d9_utils.h
+ *
+ * \brief   interface of d3d9 render module
+ *
+ * \date    Created 12/14/2010
+ *
+ * \description : 1. Rendering in Vista and upper : D3D9Ex method, support host memory / shared surface input
+ *                2. Rendering in XP : D3D9 method w/o device lost handling, support host memory input
+ *                3. File Dump : support host memory / shared surface input
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_D3D9_UTILS_H__
+#define WELS_D3D9_UTILS_H__
+
+#include <stdio.h>
+#include "codec_def.h"
+
+#if defined(_MSC_VER) && (_MSC_VER>=1500) // vs2008 and upper
+#ifdef WINAPI_FAMILY
+#include <winapifamily.h>
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#define ENABLE_DISPLAY_MODULE // enable/disable the render feature
+#endif
+#else /* defined(WINAPI_FAMILY) */
+#define ENABLE_DISPLAY_MODULE // enable/disable the render feature
+#endif
+#endif
+
+#ifdef ENABLE_DISPLAY_MODULE
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#include <d3d9.h>
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+class CD3D9Utils {
+ public:
+  CD3D9Utils();
+  ~CD3D9Utils();
+
+ public:
+  HRESULT Init (BOOL bWindowed);
+  HRESULT Uninit (void);
+  HRESULT Process (void* pDst[3], SBufferInfo* Info, FILE* pFile = NULL);
+
+ private:
+  HRESULT InitResource (void* pSharedHandle, SBufferInfo* pInfo);
+  HRESULT Render (void* pDst[3], SBufferInfo* pInfo);
+  HRESULT Dump (void* pDst[3], SBufferInfo* pInfo, FILE* pFile);
+
+ private:
+  HMODULE               m_hDll;
+  HWND                  m_hWnd;
+  unsigned char*        m_pDumpYUV;
+  BOOL                  m_bInitDone;
+  int                   m_nWidth;
+  int                   m_nHeight;
+
+  LPDIRECT3D9           m_lpD3D9;
+  LPDIRECT3DDEVICE9     m_lpD3D9Device;
+
+  D3DPRESENT_PARAMETERS m_d3dpp;
+  LPDIRECT3DSURFACE9    m_lpD3D9RawSurfaceShare;
+};
+
+class CD3D9ExUtils {
+ public:
+  CD3D9ExUtils();
+  ~CD3D9ExUtils();
+
+ public:
+  HRESULT Init (BOOL bWindowed);
+  HRESULT Uninit (void);
+  HRESULT Process (void* dst[3], SBufferInfo* Info, FILE* fp = NULL);
+
+ private:
+  HRESULT InitResource (void* pSharedHandle, SBufferInfo* Info);
+  HRESULT Render (void* pDst[3], SBufferInfo* Info);
+  HRESULT Dump (void* pDst[3], SBufferInfo* Info, FILE* fp);
+
+ private:
+  HMODULE               m_hDll;
+  HWND                  m_hWnd;
+  unsigned char*        m_pDumpYUV;
+  BOOL                  m_bInitDone;
+  int                   m_nWidth;
+  int                   m_nHeight;
+
+  LPDIRECT3D9EX         m_lpD3D9;
+  LPDIRECT3DDEVICE9EX   m_lpD3D9Device;
+
+  D3DPRESENT_PARAMETERS m_d3dpp;
+  LPDIRECT3DSURFACE9    m_lpD3D9RawSurfaceShare;
+};
+#endif
+
+enum {
+  OS_UNSUPPORTED = 0,
+  OS_XP,
+  OS_VISTA_UPPER
+};
+
+class CUtils {
+ public:
+  CUtils();
+  ~CUtils();
+
+  int Process (void* dst[3], SBufferInfo* Info, FILE* fp);
+
+ private:
+  int CheckOS (void);
+
+ private:
+  int iOSType;
+  void* hHandle;
+};
+
+#endif//WELS_D3D9_UTILS_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/dec/meson.build b/third-party/openh264/third_party/openh264/src/codec/console/dec/meson.build
new file mode 100644
index 0000000000..dda82eebbf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/dec/meson.build
@@ -0,0 +1,15 @@
+cpp_sources = [
+  'src/d3d9_utils.cpp',
+  'src/h264dec.cpp',
+]
+
+decinc = [
+  inc,
+  console_common_inc,
+  include_directories('inc'),
+]
+
+decexe = executable('h264dec', cpp_sources,
+  include_directories: decinc,
+  link_with: [libdecoder, libcommon, libconsole_common],
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/dec/src/d3d9_utils.cpp b/third-party/openh264/third_party/openh264/src/codec/console/dec/src/d3d9_utils.cpp
new file mode 100644
index 0000000000..303660af78
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/dec/src/d3d9_utils.cpp
@@ -0,0 +1,648 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "d3d9_utils.h"
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void Write2File (FILE* pFp, unsigned char* pData[3], int iStride[2], int iWidth, int iHeight);
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef ENABLE_DISPLAY_MODULE
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+#define IDM_ABOUT                       104
+#define IDM_EXIT                        105
+#define IDI_TESTSHARESURFACE            107
+#define IDI_SMALL                       108
+#define IDC_TESTSHARESURFACE            109
+
+#define NV12_FORMAT  MAKEFOURCC('N','V','1','2')
+
+typedef struct {
+  UINT      uiWidth;
+  UINT      uiHeight;
+  D3DFORMAT D3Dformat;
+  D3DPOOL   D3DPool;
+} SHandleInfo;
+
+#define SAFE_RELEASE(p) if(p) { (p)->Release(); (p) = NULL; }
+#define SAFE_FREE(p)    if(p) { free (p); (p) = NULL; }
+
+HRESULT Dump2Surface (void* pDst[3], void* pSurface, int iWidth, int iHeight, int iStride[2]);
+HRESULT InitWindow (HWND* hWnd);
+LRESULT CALLBACK WndProc (HWND, UINT, WPARAM, LPARAM);
+
+typedef HRESULT (WINAPI* pFnCreateD3D9Ex) (UINT SDKVersion, IDirect3D9Ex**);
+typedef LPDIRECT3D9 (WINAPI* pFnCreateD3D9) (UINT SDKVersion);
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CD3D9Utils::CD3D9Utils() {
+  m_hDll        = NULL;
+  m_hWnd        = NULL;
+  m_pDumpYUV    = NULL;
+
+  m_bInitDone   = FALSE;
+
+  m_lpD3D9                = NULL;
+  m_lpD3D9Device          = NULL;
+  m_lpD3D9RawSurfaceShare = NULL;
+  m_nWidth  = 0;
+  m_nHeight = 0;
+  // coverity scan uninitial
+  ZeroMemory (&m_d3dpp, sizeof (m_d3dpp));
+}
+
+CD3D9Utils::~CD3D9Utils() {
+  Uninit();
+}
+
+HRESULT CD3D9Utils::Init (BOOL bWindowed) {
+  if (m_bInitDone)
+    return S_OK;
+
+  m_hDll = LoadLibrary (TEXT ("d3d9.dll"));
+  pFnCreateD3D9 pCreateD3D9 = NULL;
+  if (m_hDll)
+    pCreateD3D9 = (pFnCreateD3D9) GetProcAddress (m_hDll, TEXT ("Direct3DCreate9"));
+  else
+    return E_FAIL;
+
+  m_lpD3D9 = pCreateD3D9 (D3D_SDK_VERSION);
+
+  return bWindowed ? InitWindow (&m_hWnd) : S_OK;
+}
+
+HRESULT CD3D9Utils::Uninit() {
+  SAFE_RELEASE (m_lpD3D9RawSurfaceShare);
+  SAFE_RELEASE (m_lpD3D9Device);
+  SAFE_RELEASE (m_lpD3D9);
+  SAFE_FREE (m_pDumpYUV);
+
+  if (m_hDll) {
+    FreeLibrary (m_hDll);
+    m_hDll = NULL;
+  }
+
+  return S_OK;
+}
+
+HRESULT CD3D9Utils::Process (void* pDst[3], SBufferInfo* pInfo, FILE* pFp) {
+  HRESULT hResult = E_FAIL;
+
+  if (pDst == NULL || pInfo == NULL)
+    return hResult;
+
+  BOOL bWindowed = pFp ? FALSE : TRUE;
+  BOOL bNeedD3D9 = ! (!bWindowed);
+  if (!m_bInitDone)
+    m_bInitDone = !bNeedD3D9;
+
+  if (!m_bInitDone) {
+    hResult = Init (bWindowed);
+    if (SUCCEEDED (hResult))
+      m_bInitDone = TRUE;
+  }
+
+  if (m_bInitDone) {
+    if (bWindowed) {
+      hResult = Render (pDst, pInfo);
+      Sleep (30);
+    } else if (pFp) {
+      hResult = Dump (pDst, pInfo, pFp);
+      Sleep (0);
+    }
+  }
+
+  return hResult;
+}
+
+HRESULT CD3D9Utils::Render (void* pDst[3], SBufferInfo* pInfo) {
+  HRESULT hResult = E_FAIL;
+
+  if (!pInfo)
+    return E_FAIL;
+
+  if (m_nWidth != pInfo->UsrData.sSystemBuffer.iWidth
+      || m_nHeight != pInfo->UsrData.sSystemBuffer.iHeight) {
+    m_nWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+    m_nHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+    SAFE_RELEASE (m_lpD3D9RawSurfaceShare);
+    SAFE_RELEASE (m_lpD3D9Device);
+  }
+  hResult = InitResource (NULL, pInfo);
+  if (SUCCEEDED (hResult))
+    hResult = Dump2Surface (pDst, m_lpD3D9RawSurfaceShare, pInfo->UsrData.sSystemBuffer.iWidth,
+                            pInfo->UsrData.sSystemBuffer.iHeight, pInfo->UsrData.sSystemBuffer.iStride);
+
+  if (SUCCEEDED (hResult)) {
+    IDirect3DSurface9* pBackBuffer = NULL;
+    hResult = m_lpD3D9Device->GetBackBuffer (0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer);
+    hResult = m_lpD3D9Device->StretchRect (m_lpD3D9RawSurfaceShare, NULL, pBackBuffer, NULL, D3DTEXF_NONE);
+    hResult = m_lpD3D9Device->Present (0, 0, NULL, NULL);
+  }
+
+  return hResult;
+}
+
+HRESULT CD3D9Utils::Dump (void* pDst[3], SBufferInfo* pInfo, FILE* pFp) {
+  HRESULT hResult = E_FAIL;
+  int iStride[2];
+  int iWidth;
+  int iHeight;
+
+  iWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+  iHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+  iStride[0] = pInfo->UsrData.sSystemBuffer.iStride[0];
+  iStride[1] = pInfo->UsrData.sSystemBuffer.iStride[1];
+
+  if (pDst[0] && pDst[1] && pDst[2])
+    Write2File (pFp, (unsigned char**)pDst, iStride, iWidth, iHeight);
+
+  return hResult;
+}
+
+HRESULT CD3D9Utils::InitResource (void* pSharedHandle, SBufferInfo* pInfo) {
+  HRESULT hResult = S_OK;
+
+  // coverity scan uninitial
+  int iWidth = 0;
+  int iHeight = 0;
+  D3DFORMAT D3Dformat = (D3DFORMAT)D3DFMT_UNKNOWN;
+  D3DPOOL D3Dpool = (D3DPOOL)D3DPOOL_DEFAULT;
+
+  if (pInfo == NULL)
+    return E_FAIL;
+
+  if (m_lpD3D9Device == NULL && m_lpD3D9RawSurfaceShare == NULL) {
+    HMONITOR hMonitorWnd = MonitorFromWindow (m_hWnd, MONITOR_DEFAULTTONULL);
+
+    UINT uiAdapter = D3DADAPTER_DEFAULT;
+    UINT uiCnt = m_lpD3D9->GetAdapterCount();
+    for (UINT i = 0; i < uiCnt; i++) {
+      HMONITOR hMonitor = m_lpD3D9->GetAdapterMonitor (i);
+      if (hMonitor == hMonitorWnd) {
+        uiAdapter = i;
+        break;
+      }
+    }
+
+    D3DDISPLAYMODE D3DDisplayMode;
+    hResult = m_lpD3D9->GetAdapterDisplayMode (uiAdapter, &D3DDisplayMode);
+
+    D3DDEVTYPE D3DDevType = D3DDEVTYPE_HAL;
+    DWORD dwBehaviorFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED;
+
+    ZeroMemory (&m_d3dpp, sizeof (m_d3dpp));
+    m_d3dpp.Flags = D3DPRESENTFLAG_VIDEO;
+    m_d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
+    m_d3dpp.BackBufferFormat = D3DDisplayMode.Format;
+    m_d3dpp.Windowed = TRUE;
+    m_d3dpp.hDeviceWindow = m_hWnd;
+    m_d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+    hResult = m_lpD3D9->CreateDevice (uiAdapter, D3DDevType, NULL, dwBehaviorFlags, &m_d3dpp, &m_lpD3D9Device);
+    iWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+    iHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+    D3Dformat = (D3DFORMAT)NV12_FORMAT;
+    D3Dpool = (D3DPOOL)D3DPOOL_DEFAULT;
+
+    hResult = m_lpD3D9Device->CreateOffscreenPlainSurface (iWidth, iHeight, (D3DFORMAT)D3Dformat, (D3DPOOL)D3Dpool,
+              &m_lpD3D9RawSurfaceShare, NULL);
+
+  }
+
+  if (m_lpD3D9Device == NULL || m_lpD3D9RawSurfaceShare == NULL)
+    hResult = E_FAIL;
+
+  return hResult;
+}
+
+CD3D9ExUtils::CD3D9ExUtils() {
+  m_hDll        = NULL;
+  m_hWnd        = NULL;
+  m_pDumpYUV    = NULL;
+
+  m_bInitDone   = FALSE;
+
+  m_lpD3D9                = NULL;
+  m_lpD3D9Device          = NULL;
+  m_lpD3D9RawSurfaceShare = NULL;
+
+  m_nWidth = 0;
+  m_nHeight = 0;
+  // coverity scan uninitial
+  ZeroMemory (&m_d3dpp, sizeof (m_d3dpp));
+}
+
+CD3D9ExUtils::~CD3D9ExUtils() {
+  Uninit();
+}
+
+HRESULT CD3D9ExUtils::Init (BOOL bWindowed) {
+  if (m_bInitDone)
+    return S_OK;
+
+  m_hDll = LoadLibrary (TEXT ("d3d9.dll"));
+  pFnCreateD3D9Ex pCreateD3D9Ex = NULL;
+  if (m_hDll)
+    pCreateD3D9Ex = (pFnCreateD3D9Ex) GetProcAddress (m_hDll, TEXT ("Direct3DCreate9Ex"));
+  else
+    return E_FAIL;
+
+  pCreateD3D9Ex (D3D_SDK_VERSION, &m_lpD3D9);
+
+  return bWindowed ? InitWindow (&m_hWnd) : S_OK;
+}
+
+HRESULT CD3D9ExUtils::Uninit() {
+  SAFE_RELEASE (m_lpD3D9RawSurfaceShare);
+  SAFE_RELEASE (m_lpD3D9Device);
+  SAFE_RELEASE (m_lpD3D9);
+  SAFE_FREE (m_pDumpYUV);
+
+  if (m_hDll) {
+    FreeLibrary (m_hDll);
+    m_hDll = NULL;
+  }
+
+  return S_OK;
+}
+
+HRESULT CD3D9ExUtils::Process (void* pDst[3], SBufferInfo* pInfo, FILE* pFp) {
+  HRESULT hResult = E_FAIL;
+
+  if (pDst == NULL || pInfo == NULL)
+    return hResult;
+
+  BOOL bWindowed = pFp ? FALSE : TRUE;
+  BOOL bNeedD3D9 = ! (!bWindowed);
+  if (!m_bInitDone)
+    m_bInitDone = !bNeedD3D9;
+
+  if (!m_bInitDone) {
+    hResult = Init (bWindowed);
+    if (SUCCEEDED (hResult))
+      m_bInitDone = TRUE;
+  }
+
+  if (m_bInitDone) {
+    if (bWindowed) {
+      hResult = Render (pDst, pInfo);
+      Sleep (30); // set a simple time controlling with default of 30fps
+    } else if (pFp) {
+      hResult = Dump (pDst, pInfo, pFp);
+      Sleep (0);
+    }
+  }
+
+  return hResult;
+}
+
+HRESULT CD3D9ExUtils::Render (void* pDst[3], SBufferInfo* pInfo) {
+  HRESULT hResult = E_FAIL;
+
+  if (!pInfo)
+    return E_FAIL;
+
+  if (m_nWidth != pInfo->UsrData.sSystemBuffer.iWidth
+      || m_nHeight != pInfo->UsrData.sSystemBuffer.iHeight) {
+    m_nWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+    m_nHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+    MoveWindow (m_hWnd, 0, 0, pInfo->UsrData.sSystemBuffer.iWidth, pInfo->UsrData.sSystemBuffer.iHeight, true);
+    SAFE_RELEASE (m_lpD3D9RawSurfaceShare);
+    SAFE_RELEASE (m_lpD3D9Device);
+  }
+  hResult = InitResource (NULL, pInfo);
+  if (SUCCEEDED (hResult))
+    hResult = Dump2Surface (pDst, m_lpD3D9RawSurfaceShare, pInfo->UsrData.sSystemBuffer.iWidth,
+                            pInfo->UsrData.sSystemBuffer.iHeight, pInfo->UsrData.sSystemBuffer.iStride);
+
+  if (SUCCEEDED (hResult)) {
+    IDirect3DSurface9* pBackBuffer = NULL;
+    hResult = m_lpD3D9Device->GetBackBuffer (0, 0, D3DBACKBUFFER_TYPE_MONO, &pBackBuffer);
+    hResult = m_lpD3D9Device->StretchRect (m_lpD3D9RawSurfaceShare, NULL, pBackBuffer, NULL, D3DTEXF_NONE);
+    hResult = m_lpD3D9Device->PresentEx (0, 0, NULL, NULL, 0);
+  }
+
+  return hResult;
+}
+
+HRESULT CD3D9ExUtils::Dump (void* pDst[3], SBufferInfo* pInfo, FILE* pFp) {
+  HRESULT hResult = E_FAIL;
+  int iStride[2];
+  int iWidth;
+  int iHeight;
+
+  iWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+  iHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+  iStride[0] = pInfo->UsrData.sSystemBuffer.iStride[0];
+  iStride[1] = pInfo->UsrData.sSystemBuffer.iStride[1];
+
+  if (pDst[0] && pDst[1] && pDst[2])
+    Write2File (pFp, (unsigned char**)pDst, iStride, iWidth, iHeight);
+
+  return hResult;
+}
+
+HRESULT CD3D9ExUtils::InitResource (void* pSharedHandle, SBufferInfo* pInfo) {
+  HRESULT hResult = S_OK;
+  int iWidth;
+  int iHeight;
+  D3DFORMAT D3Dformat;
+  D3DPOOL D3Dpool;
+
+  if (pInfo == NULL)
+    return E_FAIL;
+
+  if (m_lpD3D9Device == NULL && m_lpD3D9RawSurfaceShare == NULL) {
+    HMONITOR hMonitorWnd = MonitorFromWindow (m_hWnd, MONITOR_DEFAULTTONULL);
+
+    UINT uiAdapter = D3DADAPTER_DEFAULT;
+    UINT uiCnt = m_lpD3D9->GetAdapterCount();
+    for (UINT i = 0; i < uiCnt; i++) {
+      HMONITOR hMonitor = m_lpD3D9->GetAdapterMonitor (i);
+      if (hMonitor == hMonitorWnd) {
+        uiAdapter = i;
+        break;
+      }
+    }
+
+    D3DDISPLAYMODEEX D3DDisplayMode;
+    D3DDisplayMode.Size = sizeof (D3DDISPLAYMODEEX);
+    hResult = m_lpD3D9->GetAdapterDisplayModeEx (uiAdapter, &D3DDisplayMode, NULL);
+
+    D3DDEVTYPE D3DDevType = D3DDEVTYPE_HAL;
+    DWORD dwBehaviorFlags = D3DCREATE_SOFTWARE_VERTEXPROCESSING | D3DCREATE_MULTITHREADED;
+
+    ZeroMemory (&m_d3dpp, sizeof (m_d3dpp));
+    m_d3dpp.Flags = D3DPRESENTFLAG_VIDEO;
+    m_d3dpp.SwapEffect = D3DSWAPEFFECT_DISCARD;
+    m_d3dpp.BackBufferFormat = D3DDisplayMode.Format;
+    m_d3dpp.Windowed = TRUE;
+    m_d3dpp.hDeviceWindow = m_hWnd;
+    m_d3dpp.PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE;
+    hResult = m_lpD3D9->CreateDeviceEx (uiAdapter, D3DDevType, NULL, dwBehaviorFlags, &m_d3dpp, NULL, &m_lpD3D9Device);
+    if (FAILED (hResult)) {
+      return hResult;
+    }
+    iWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+    iHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+    D3Dformat = (D3DFORMAT)NV12_FORMAT;
+    D3Dpool = (D3DPOOL)D3DPOOL_DEFAULT;
+    hResult = m_lpD3D9Device->CreateOffscreenPlainSurface (iWidth, iHeight, (D3DFORMAT)D3Dformat, (D3DPOOL)D3Dpool,
+              &m_lpD3D9RawSurfaceShare, &pSharedHandle);
+  }
+
+  if (m_lpD3D9Device == NULL || m_lpD3D9RawSurfaceShare == NULL)
+    hResult = E_FAIL;
+
+  return hResult;
+}
+
+
+HRESULT Dump2Surface (void* pDst[3], void* pSurface, int iWidth, int iHeight, int iStride[2]) {
+  HRESULT hResult = E_FAIL;
+
+  if (!pDst[0] || !pDst[1] || !pDst[2] || !pSurface)
+    return hResult;
+
+  IDirect3DSurface9* pSurfaceData = (IDirect3DSurface9*)pSurface;
+  D3DLOCKED_RECT sD3DLockedRect = {0};
+  hResult = pSurfaceData->LockRect (&sD3DLockedRect, NULL, 0);
+
+  unsigned char* pInY = (unsigned char*)pDst[0];
+  unsigned char* pOutY = (unsigned char*)sD3DLockedRect.pBits;
+  int iOutStride = sD3DLockedRect.Pitch;
+
+  for (int j = 0; j < iHeight; j++)
+    memcpy (pOutY + j * iOutStride, pInY + j * iStride[0], iWidth); //confirmed_safe_unsafe_usage
+
+  unsigned char* pInU = (unsigned char*)pDst[1];
+  unsigned char* pInV = (unsigned char*)pDst[2];
+  unsigned char* pOutC = pOutY + iOutStride * iHeight;
+  for (int i = 0; i < iHeight / 2; i++) {
+    for (int j = 0; j < iWidth; j += 2) {
+      pOutC[i * iOutStride + j  ] = pInU[i * iStride[1] + j / 2];
+      pOutC[i * iOutStride + j + 1] = pInV[i * iStride[1] + j / 2];
+    }
+  }
+
+  pSurfaceData->UnlockRect();
+
+  return hResult;
+}
+
+HRESULT InitWindow (HWND* hWnd) {
+  const TCHAR kszWindowTitle[] = TEXT ("Wels Decoder Application");
+  const TCHAR kszWindowClass[] = TEXT ("Wels Decoder Class");
+
+  WNDCLASSEX sWndClassEx = {0};
+  sWndClassEx.cbSize            = sizeof (WNDCLASSEX);
+  sWndClassEx.style             = CS_HREDRAW | CS_VREDRAW;
+  sWndClassEx.lpfnWndProc       = (WNDPROC)WndProc;
+  sWndClassEx.cbClsExtra        = 0;
+  sWndClassEx.cbWndExtra        = 0;
+  sWndClassEx.hInstance         = GetModuleHandle (NULL);
+  sWndClassEx.hIcon             = LoadIcon (sWndClassEx.hInstance, (LPCTSTR)IDI_TESTSHARESURFACE);
+  sWndClassEx.hCursor           = LoadCursor (NULL, IDC_ARROW);
+  sWndClassEx.hbrBackground     = (HBRUSH) (COLOR_WINDOW + 1);
+  sWndClassEx.lpszMenuName      = (LPCSTR)IDC_TESTSHARESURFACE;
+  sWndClassEx.lpszClassName     = kszWindowClass;
+  sWndClassEx.hIconSm           = LoadIcon (sWndClassEx.hInstance, (LPCTSTR)IDI_SMALL);
+
+  if (!RegisterClassEx (&sWndClassEx))
+    return E_FAIL;
+
+  HWND hTmpWnd = CreateWindow (kszWindowClass, kszWindowTitle, WS_OVERLAPPEDWINDOW,
+                               CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, sWndClassEx.hInstance, NULL);
+
+  *hWnd = hTmpWnd;
+  if (!hTmpWnd)
+    return E_FAIL;
+
+  ShowWindow (hTmpWnd, SW_SHOWDEFAULT);
+  UpdateWindow (hTmpWnd);
+
+  return S_OK;
+}
+
+LRESULT CALLBACK WndProc (HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) {
+  INT wmId, wmEvent;
+
+  switch (message) {
+  case WM_COMMAND:
+    wmId    = LOWORD (wParam);
+    wmEvent = HIWORD (wParam);
+    switch (wmId) {
+    case IDM_ABOUT:
+      break;
+    case IDM_EXIT:
+      DestroyWindow (hWnd);
+      break;
+    default:
+      return DefWindowProc (hWnd, message, wParam, lParam);
+    }
+    break;
+  case WM_PAINT:
+    ValidateRect (hWnd , NULL);
+    break;
+  case WM_DESTROY:
+    PostQuitMessage (0);
+    break;
+  default:
+    return DefWindowProc (hWnd, message, wParam, lParam);
+  }
+  return 0;
+}
+
+#endif
+
+CUtils::CUtils() {
+  hHandle = NULL;
+  iOSType = CheckOS();
+
+#ifdef ENABLE_DISPLAY_MODULE
+  if (iOSType == OS_XP)
+    hHandle = (void*) new CD3D9Utils;
+
+  else if (iOSType == OS_VISTA_UPPER)
+    hHandle = (void*) new CD3D9ExUtils;
+#endif
+
+  if (hHandle == NULL)
+    iOSType = OS_UNSUPPORTED;
+}
+
+CUtils::~CUtils() {
+#ifdef ENABLE_DISPLAY_MODULE
+  if (hHandle) {
+    if (iOSType == OS_XP) {
+      CD3D9Utils* hTmp = (CD3D9Utils*) hHandle;
+      delete hTmp;
+    } else if (iOSType == OS_VISTA_UPPER) {
+      CD3D9ExUtils* hTmp = (CD3D9ExUtils*) hHandle;
+      delete hTmp;
+    }
+    hHandle = NULL;
+  }
+#endif
+}
+
+int CUtils::Process (void* pDst[3], SBufferInfo* pInfo, FILE* pFp) {
+
+  int iRet = 0;
+
+  if (iOSType == OS_UNSUPPORTED) {
+    if (pFp && pDst[0] && pDst[1] && pDst[2] && pInfo) {
+      int iStride[2];
+      int iWidth = pInfo->UsrData.sSystemBuffer.iWidth;
+      int iHeight = pInfo->UsrData.sSystemBuffer.iHeight;
+      iStride[0] = pInfo->UsrData.sSystemBuffer.iStride[0];
+      iStride[1] = pInfo->UsrData.sSystemBuffer.iStride[1];
+
+      Write2File (pFp, (unsigned char**)pDst, iStride, iWidth, iHeight);
+    }
+  }
+
+#ifdef ENABLE_DISPLAY_MODULE
+  else {
+    MSG msg;
+    ZeroMemory (&msg, sizeof (msg));
+    while (msg.message != WM_QUIT) {
+      if (PeekMessage (&msg, NULL, 0U, 0U, PM_REMOVE)) {
+        TranslateMessage (&msg);
+        DispatchMessage (&msg);
+      } else {
+        HRESULT hResult = S_OK;
+        if (iOSType == OS_XP)
+          hResult = ((CD3D9Utils*)hHandle)->Process (pDst, pInfo, pFp);
+
+        else if (iOSType == OS_VISTA_UPPER)
+          hResult = ((CD3D9ExUtils*)hHandle)->Process (pDst, pInfo, pFp);
+
+        iRet = !SUCCEEDED (hResult);
+        break;
+      }
+    }
+  }
+#endif
+
+  return iRet;
+}
+
+int CUtils::CheckOS() {
+  int iType = OS_UNSUPPORTED;
+
+#ifdef ENABLE_DISPLAY_MODULE
+  OSVERSIONINFOEX osvi;
+  ZeroMemory (&osvi, sizeof (OSVERSIONINFOEX));
+  osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEX);
+  osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
+  osvi.dwMajorVersion = 6; // Vista
+  DWORDLONG condmask = VerSetConditionMask (VerSetConditionMask (0, VER_MAJORVERSION, VER_GREATER_EQUAL),
+                       VER_PLATFORMID, VER_EQUAL);
+
+  if (VerifyVersionInfo (&osvi, VER_MAJORVERSION | VER_PLATFORMID, condmask)) {
+    iType = OS_VISTA_UPPER;
+  } else {
+    osvi.dwMajorVersion = 5; // XP/2000
+    if (VerifyVersionInfo (&osvi, VER_MAJORVERSION | VER_PLATFORMID, condmask))
+      iType = OS_XP;
+  }
+#endif
+
+  return iType;
+}
+
+void Write2File (FILE* pFp, unsigned char* pData[3], int iStride[2], int iWidth, int iHeight) {
+  int   i;
+  unsigned char*  pPtr = NULL;
+
+  pPtr = pData[0];
+  for (i = 0; i < iHeight; i++) {
+    fwrite (pPtr, 1, iWidth, pFp);
+    pPtr += iStride[0];
+  }
+
+  iHeight = iHeight / 2;
+  iWidth = iWidth / 2;
+  pPtr = pData[1];
+  for (i = 0; i < iHeight; i++) {
+    fwrite (pPtr, 1, iWidth, pFp);
+    pPtr += iStride[1];
+  }
+
+  pPtr = pData[2];
+  for (i = 0; i < iHeight; i++) {
+    fwrite (pPtr, 1, iWidth, pFp);
+    pPtr += iStride[1];
+  }
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/dec/src/h264dec.cpp b/third-party/openh264/third_party/openh264/src/codec/console/dec/src/h264dec.cpp
new file mode 100644
index 0000000000..593658446e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/dec/src/h264dec.cpp
@@ -0,0 +1,658 @@
+/*!
+ * \copy
+ *     Copyright (c)  2004-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * h264dec.cpp:         Wels Decoder Console Implementation file
+ */
+
+#if defined (_WIN32)
+#define _CRT_SECURE_NO_WARNINGS
+#include <windows.h>
+#include <tchar.h>
+#else
+#include <string.h>
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#if defined (ANDROID_NDK)
+#include <android/log.h>
+#endif
+#include "codec_def.h"
+#include "codec_app_def.h"
+#include "codec_api.h"
+#include "read_config.h"
+#include "typedefs.h"
+#include "measure_time.h"
+#include "d3d9_utils.h"
+
+using namespace std;
+
+#if defined (WINDOWS_PHONE)
+double g_dDecTime = 0.0;
+float  g_fDecFPS = 0.0;
+int    g_iDecodedFrameNum = 0;
+#endif
+
+#if defined(ANDROID_NDK)
+#define LOG_TAG "welsdec"
+#define LOGI(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define printf LOGI
+#define fprintf(a, ...) LOGI(__VA_ARGS__)
+#endif
+//using namespace WelsDec;
+
+int32_t readBit (uint8_t* pBufPtr, int32_t& curBit) {
+  int nIndex = curBit / 8;
+  int nOffset = curBit % 8 + 1;
+
+  curBit++;
+  return (pBufPtr[nIndex] >> (8 - nOffset)) & 0x01;
+}
+
+int32_t readBits (uint8_t* pBufPtr, int32_t& n, int32_t& curBit) {
+  int r = 0;
+  int i;
+  for (i = 0; i < n; i++) {
+    r |= (readBit (pBufPtr, curBit) << (n - i - 1));
+  }
+  return r;
+}
+
+int32_t bsGetUe (uint8_t* pBufPtr, int32_t& curBit) {
+  int r = 0;
+  int i = 0;
+  while ((readBit (pBufPtr, curBit) == 0) && (i < 32)) {
+    i++;
+  }
+  r = readBits (pBufPtr, i, curBit);
+  r += (1 << i) - 1;
+  return r;
+}
+
+int32_t readFirstMbInSlice (uint8_t* pSliceNalPtr) {
+  int32_t curBit = 0;
+  int32_t firstMBInSlice = bsGetUe (pSliceNalPtr + 1, curBit);
+  return firstMBInSlice;
+}
+
+int32_t readPicture (uint8_t* pBuf, const int32_t& iFileSize, const int32_t& bufPos, uint8_t*& pSpsBuf,
+                     int32_t& sps_byte_count) {
+  int32_t bytes_available = iFileSize - bufPos;
+  if (bytes_available < 4) {
+    return bytes_available;
+  }
+  uint8_t* ptr = pBuf + bufPos;
+  int32_t read_bytes = 0;
+  int32_t sps_count = 0;
+  int32_t pps_count = 0;
+  int32_t non_idr_pict_count = 0;
+  int32_t idr_pict_count = 0;
+  int32_t nal_deliminator = 0;
+  pSpsBuf = NULL;
+  sps_byte_count = 0;
+  while (read_bytes < bytes_available - 4) {
+    bool has4ByteStartCode = ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 0 && ptr[3] == 1;
+    bool has3ByteStartCode = false;
+    if (!has4ByteStartCode) {
+      has3ByteStartCode = ptr[0] == 0 && ptr[1] == 0 && ptr[2] == 1;
+    }
+    if (has4ByteStartCode || has3ByteStartCode) {
+      int32_t byteOffset = has4ByteStartCode ? 4 : 3;
+      uint8_t nal_unit_type = has4ByteStartCode ? (ptr[4] & 0x1F) : (ptr[3] & 0x1F);
+      if (nal_unit_type == 1) {
+        int32_t firstMBInSlice = readFirstMbInSlice (ptr + byteOffset);
+        if (++non_idr_pict_count >= 1 && idr_pict_count >= 1 && firstMBInSlice == 0) {
+          return read_bytes;
+        }
+        if (non_idr_pict_count >= 2 && firstMBInSlice == 0) {
+          return read_bytes;
+        }
+      } else if (nal_unit_type == 5) {
+        int32_t firstMBInSlice = readFirstMbInSlice (ptr + byteOffset);
+        if (++idr_pict_count >= 1 && non_idr_pict_count >= 1 && firstMBInSlice == 0) {
+          return read_bytes;
+        }
+        if (idr_pict_count >= 2 && firstMBInSlice == 0) {
+          return read_bytes;
+        }
+      } else if (nal_unit_type == 7) {
+        pSpsBuf = ptr + (has4ByteStartCode ? 4 : 3);
+        if ((++sps_count >= 1) && (non_idr_pict_count >= 1 || idr_pict_count >= 1)) {
+          return read_bytes;
+        }
+        if (sps_count == 2) {
+          return read_bytes;
+        }
+      } else if (nal_unit_type == 8) {
+        if (++pps_count == 1 && sps_count == 1) {
+          sps_byte_count = int32_t (ptr - pSpsBuf);
+        }
+        if (pps_count >= 1 && (non_idr_pict_count >= 1 || idr_pict_count >= 1)) {
+          return read_bytes;
+        }
+      } else if (nal_unit_type == 9) {
+        if (++nal_deliminator == 2) {
+          return read_bytes;
+        }
+      }
+      if (read_bytes >= bytes_available - 4) {
+        return bytes_available;
+      }
+      read_bytes += 4;
+      ptr += 4;
+    } else {
+      ++ptr;
+      ++read_bytes;
+    }
+  }
+  return bytes_available;
+}
+
+void FlushFrames (ISVCDecoder* pDecoder, int64_t& iTotal, FILE* pYuvFile, FILE* pOptionFile, int32_t& iFrameCount,
+                  unsigned long long& uiTimeStamp, int32_t& iWidth, int32_t& iHeight, int32_t& iLastWidth, int32_t iLastHeight) {
+  uint8_t* pData[3] = { NULL };
+  uint8_t* pDst[3] = { NULL };
+  SBufferInfo sDstBufInfo;
+  int32_t num_of_frames_in_buffer = 0;
+  CUtils cOutputModule;
+  pDecoder->GetOption (DECODER_OPTION_NUM_OF_FRAMES_REMAINING_IN_BUFFER, &num_of_frames_in_buffer);
+  for (int32_t i = 0; i < num_of_frames_in_buffer; ++i) {
+    int64_t iStart = WelsTime();
+    pData[0] = NULL;
+    pData[1] = NULL;
+    pData[2] = NULL;
+    memset (&sDstBufInfo, 0, sizeof (SBufferInfo));
+    sDstBufInfo.uiInBsTimeStamp = uiTimeStamp;
+    pDecoder->FlushFrame (pData, &sDstBufInfo);
+    if (sDstBufInfo.iBufferStatus == 1) {
+      pDst[0] = sDstBufInfo.pDst[0];
+      pDst[1] = sDstBufInfo.pDst[1];
+      pDst[2] = sDstBufInfo.pDst[2];
+    }
+    int64_t iEnd = WelsTime();
+    iTotal += iEnd - iStart;
+    if (sDstBufInfo.iBufferStatus == 1) {
+      cOutputModule.Process ((void**)pDst, &sDstBufInfo, pYuvFile);
+      iWidth = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
+      iHeight = sDstBufInfo.UsrData.sSystemBuffer.iHeight;
+      if (pOptionFile != NULL) {
+        if (iWidth != iLastWidth && iHeight != iLastHeight) {
+          fwrite (&iFrameCount, sizeof (iFrameCount), 1, pOptionFile);
+          fwrite (&iWidth, sizeof (iWidth), 1, pOptionFile);
+          fwrite (&iHeight, sizeof (iHeight), 1, pOptionFile);
+          iLastWidth = iWidth;
+          iLastHeight = iHeight;
+        }
+      }
+      ++iFrameCount;
+    }
+  }
+}
+void H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, const char* kpOuputFileName,
+                         int32_t& iWidth, int32_t& iHeight, const char* pOptionFileName, const char* pLengthFileName,
+                         int32_t iErrorConMethod,
+                         bool bLegacyCalling) {
+  FILE* pH264File   = NULL;
+  FILE* pYuvFile    = NULL;
+  FILE* pOptionFile = NULL;
+// Lenght input mode support
+  FILE* fpTrack = NULL;
+
+  if (pDecoder == NULL) return;
+
+  int32_t pInfo[4];
+  unsigned long long uiTimeStamp = 0;
+  int64_t iStart = 0, iEnd = 0, iTotal = 0;
+  int32_t iSliceSize;
+  int32_t iSliceIndex = 0;
+  uint8_t* pBuf = NULL;
+  uint8_t uiStartCode[4] = {0, 0, 0, 1};
+
+  uint8_t* pData[3] = {NULL};
+  uint8_t* pDst[3] = {NULL};
+  SBufferInfo sDstBufInfo;
+
+  int32_t iBufPos = 0;
+  int32_t iFileSize;
+  int32_t iLastWidth = 0, iLastHeight = 0;
+  int32_t iFrameCount = 0;
+  int32_t iEndOfStreamFlag = 0;
+  pDecoder->SetOption (DECODER_OPTION_ERROR_CON_IDC, &iErrorConMethod);
+  CUtils cOutputModule;
+  double dElapsed = 0;
+  uint8_t uLastSpsBuf[32];
+  int32_t iLastSpsByteCount = 0;
+
+  int32_t iThreadCount = 1;
+  pDecoder->GetOption (DECODER_OPTION_NUM_OF_THREADS, &iThreadCount);
+
+  if (kpH264FileName) {
+    pH264File = fopen (kpH264FileName, "rb");
+    if (pH264File == NULL) {
+      fprintf (stderr, "Can not open h264 source file, check its legal path related please..\n");
+      return;
+    }
+    fprintf (stderr, "H264 source file name: %s..\n", kpH264FileName);
+  } else {
+    fprintf (stderr, "Can not find any h264 bitstream file to read..\n");
+    fprintf (stderr, "----------------decoder return------------------------\n");
+    return;
+  }
+
+  if (kpOuputFileName) {
+    pYuvFile = fopen (kpOuputFileName, "wb");
+    if (pYuvFile == NULL) {
+      fprintf (stderr, "Can not open yuv file to output result of decoding..\n");
+      // any options
+      //return; // can let decoder work in quiet mode, no writing any output
+    } else
+      fprintf (stderr, "Sequence output file name: %s..\n", kpOuputFileName);
+  } else {
+    fprintf (stderr, "Can not find any output file to write..\n");
+    // any options
+  }
+
+  if (pOptionFileName) {
+    pOptionFile = fopen (pOptionFileName, "wb");
+    if (pOptionFile == NULL) {
+      fprintf (stderr, "Can not open optional file for write..\n");
+    } else
+      fprintf (stderr, "Extra optional file: %s..\n", pOptionFileName);
+  }
+
+  if (pLengthFileName != NULL) {
+    fpTrack = fopen (pLengthFileName, "rb");
+    if (fpTrack == NULL)
+      printf ("Length file open ERROR!\n");
+  }
+
+  printf ("------------------------------------------------------\n");
+
+  fseek (pH264File, 0L, SEEK_END);
+  iFileSize = (int32_t) ftell (pH264File);
+  if (iFileSize <= 4) {
+    fprintf (stderr, "Current Bit Stream File is too small, read error!!!!\n");
+    goto label_exit;
+  }
+  fseek (pH264File, 0L, SEEK_SET);
+
+  pBuf = new uint8_t[iFileSize + 4];
+  if (pBuf == NULL) {
+    fprintf (stderr, "new buffer failed!\n");
+    goto label_exit;
+  }
+
+  if (fread (pBuf, 1, iFileSize, pH264File) != (uint32_t)iFileSize) {
+    fprintf (stderr, "Unable to read whole file\n");
+    goto label_exit;
+  }
+
+  memcpy (pBuf + iFileSize, &uiStartCode[0], 4); //confirmed_safe_unsafe_usage
+
+  while (true) {
+
+    if (iBufPos >= iFileSize) {
+      iEndOfStreamFlag = true;
+      if (iEndOfStreamFlag)
+        pDecoder->SetOption (DECODER_OPTION_END_OF_STREAM, (void*)&iEndOfStreamFlag);
+      break;
+    }
+// Read length from file if needed
+    if (fpTrack) {
+      if (fread (pInfo, 4, sizeof (int32_t), fpTrack) < 4)
+        goto label_exit;
+      iSliceSize = static_cast<int32_t> (pInfo[2]);
+    } else {
+      if (iThreadCount >= 1) {
+        uint8_t* uSpsPtr = NULL;
+        int32_t iSpsByteCount = 0;
+        iSliceSize = readPicture (pBuf, iFileSize, iBufPos, uSpsPtr, iSpsByteCount);
+        if (iLastSpsByteCount > 0 && iSpsByteCount > 0) {
+          if (iSpsByteCount != iLastSpsByteCount || memcmp (uSpsPtr, uLastSpsBuf, iLastSpsByteCount) != 0) {
+            //whenever new sequence is different from preceding sequence. All pending frames must be flushed out before the new sequence can start to decode.
+            FlushFrames (pDecoder, iTotal, pYuvFile, pOptionFile, iFrameCount, uiTimeStamp, iWidth, iHeight, iLastWidth,
+                         iLastHeight);
+          }
+        }
+        if (iSpsByteCount > 0 && uSpsPtr != NULL) {
+          if (iSpsByteCount > 32) iSpsByteCount = 32;
+          iLastSpsByteCount = iSpsByteCount;
+          memcpy (uLastSpsBuf, uSpsPtr, iSpsByteCount);
+        }
+      } else {
+        int i = 0;
+        for (i = 0; i < iFileSize; i++) {
+          if ((pBuf[iBufPos + i] == 0 && pBuf[iBufPos + i + 1] == 0 && pBuf[iBufPos + i + 2] == 0 && pBuf[iBufPos + i + 3] == 1
+               && i > 0) || (pBuf[iBufPos + i] == 0 && pBuf[iBufPos + i + 1] == 0 && pBuf[iBufPos + i + 2] == 1 && i > 0)) {
+            break;
+          }
+        }
+        iSliceSize = i;
+      }
+    }
+    if (iSliceSize < 4) { //too small size, no effective data, ignore
+      iBufPos += iSliceSize;
+      continue;
+    }
+
+//for coverage test purpose
+    int32_t iEndOfStreamFlag;
+    pDecoder->GetOption (DECODER_OPTION_END_OF_STREAM, &iEndOfStreamFlag);
+    int32_t iCurIdrPicId;
+    pDecoder->GetOption (DECODER_OPTION_IDR_PIC_ID, &iCurIdrPicId);
+    int32_t iFrameNum;
+    pDecoder->GetOption (DECODER_OPTION_FRAME_NUM, &iFrameNum);
+    int32_t bCurAuContainLtrMarkSeFlag;
+    pDecoder->GetOption (DECODER_OPTION_LTR_MARKING_FLAG, &bCurAuContainLtrMarkSeFlag);
+    int32_t iFrameNumOfAuMarkedLtr;
+    pDecoder->GetOption (DECODER_OPTION_LTR_MARKED_FRAME_NUM, &iFrameNumOfAuMarkedLtr);
+    int32_t iFeedbackVclNalInAu;
+    pDecoder->GetOption (DECODER_OPTION_VCL_NAL, &iFeedbackVclNalInAu);
+    int32_t iFeedbackTidInAu;
+    pDecoder->GetOption (DECODER_OPTION_TEMPORAL_ID, &iFeedbackTidInAu);
+//~end for
+
+    iStart = WelsTime();
+    pData[0] = NULL;
+    pData[1] = NULL;
+    pData[2] = NULL;
+    uiTimeStamp ++;
+    memset (&sDstBufInfo, 0, sizeof (SBufferInfo));
+    sDstBufInfo.uiInBsTimeStamp = uiTimeStamp;
+    if (!bLegacyCalling) {
+      pDecoder->DecodeFrameNoDelay (pBuf + iBufPos, iSliceSize, pData, &sDstBufInfo);
+    } else {
+      pDecoder->DecodeFrame2 (pBuf + iBufPos, iSliceSize, pData, &sDstBufInfo);
+    }
+
+    if (sDstBufInfo.iBufferStatus == 1) {
+      pDst[0] = sDstBufInfo.pDst[0];
+      pDst[1] = sDstBufInfo.pDst[1];
+      pDst[2] = sDstBufInfo.pDst[2];
+    }
+    iEnd    = WelsTime();
+    iTotal += iEnd - iStart;
+    if (sDstBufInfo.iBufferStatus == 1) {
+      cOutputModule.Process ((void**)pDst, &sDstBufInfo, pYuvFile);
+      iWidth  = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
+      iHeight = sDstBufInfo.UsrData.sSystemBuffer.iHeight;
+
+      if (pOptionFile != NULL) {
+        if (iWidth != iLastWidth && iHeight != iLastHeight) {
+          fwrite (&iFrameCount, sizeof (iFrameCount), 1, pOptionFile);
+          fwrite (&iWidth, sizeof (iWidth), 1, pOptionFile);
+          fwrite (&iHeight, sizeof (iHeight), 1, pOptionFile);
+          iLastWidth  = iWidth;
+          iLastHeight = iHeight;
+        }
+      }
+      ++ iFrameCount;
+    }
+
+    if (bLegacyCalling) {
+      iStart = WelsTime();
+      pData[0] = NULL;
+      pData[1] = NULL;
+      pData[2] = NULL;
+      memset (&sDstBufInfo, 0, sizeof (SBufferInfo));
+      sDstBufInfo.uiInBsTimeStamp = uiTimeStamp;
+      pDecoder->DecodeFrame2 (NULL, 0, pData, &sDstBufInfo);
+      if (sDstBufInfo.iBufferStatus == 1) {
+        pDst[0] = sDstBufInfo.pDst[0];
+        pDst[1] = sDstBufInfo.pDst[1];
+        pDst[2] = sDstBufInfo.pDst[2];
+      }
+      iEnd    = WelsTime();
+      iTotal += iEnd - iStart;
+      if (sDstBufInfo.iBufferStatus == 1) {
+        cOutputModule.Process ((void**)pDst, &sDstBufInfo, pYuvFile);
+        iWidth  = sDstBufInfo.UsrData.sSystemBuffer.iWidth;
+        iHeight = sDstBufInfo.UsrData.sSystemBuffer.iHeight;
+
+        if (pOptionFile != NULL) {
+          if (iWidth != iLastWidth && iHeight != iLastHeight) {
+            fwrite (&iFrameCount, sizeof (iFrameCount), 1, pOptionFile);
+            fwrite (&iWidth, sizeof (iWidth), 1, pOptionFile);
+            fwrite (&iHeight, sizeof (iHeight), 1, pOptionFile);
+            iLastWidth  = iWidth;
+            iLastHeight = iHeight;
+          }
+        }
+        ++ iFrameCount;
+      }
+    }
+    iBufPos += iSliceSize;
+    ++ iSliceIndex;
+  }
+  FlushFrames (pDecoder, iTotal, pYuvFile, pOptionFile, iFrameCount, uiTimeStamp, iWidth, iHeight, iLastWidth,
+               iLastHeight);
+  dElapsed = iTotal / 1e6;
+  fprintf (stderr, "-------------------------------------------------------\n");
+  fprintf (stderr, "iWidth:\t\t%d\nheight:\t\t%d\nFrames:\t\t%d\ndecode time:\t%f sec\nFPS:\t\t%f fps\n",
+           iWidth, iHeight, iFrameCount, dElapsed, (iFrameCount * 1.0) / dElapsed);
+  fprintf (stderr, "-------------------------------------------------------\n");
+
+#if defined (WINDOWS_PHONE)
+  g_dDecTime = dElapsed;
+  g_fDecFPS = (iFrameCount * 1.0f) / (float) dElapsed;
+  g_iDecodedFrameNum = iFrameCount;
+#endif
+
+  // coverity scan uninitial
+label_exit:
+  if (pBuf) {
+    delete[] pBuf;
+    pBuf = NULL;
+  }
+  if (pH264File) {
+    fclose (pH264File);
+    pH264File = NULL;
+  }
+  if (pYuvFile) {
+    fclose (pYuvFile);
+    pYuvFile = NULL;
+  }
+  if (pOptionFile) {
+    fclose (pOptionFile);
+    pOptionFile = NULL;
+  }
+  if (fpTrack) {
+    fclose (fpTrack);
+    fpTrack = NULL;
+  }
+
+}
+
+#if (defined(ANDROID_NDK)||defined(APPLE_IOS) || defined (WINDOWS_PHONE))
+int32_t DecMain (int32_t iArgC, char* pArgV[]) {
+#else
+int32_t main (int32_t iArgC, char* pArgV[]) {
+#endif
+  ISVCDecoder* pDecoder = NULL;
+
+  SDecodingParam sDecParam = {0};
+  string strInputFile (""), strOutputFile (""), strOptionFile (""), strLengthFile ("");
+  int iLevelSetting = (int) WELS_LOG_WARNING;
+  bool bLegacyCalling = false;
+
+  sDecParam.sVideoProperty.size = sizeof (sDecParam.sVideoProperty);
+  sDecParam.eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE;
+
+  if (iArgC < 2) {
+    printf ("usage 1: h264dec.exe welsdec.cfg\n");
+    printf ("usage 2: h264dec.exe welsdec.264 out.yuv\n");
+    printf ("usage 3: h264dec.exe welsdec.264\n");
+    return 1;
+  } else if (iArgC == 2) {
+    if (strstr (pArgV[1], ".cfg")) { // read config file //confirmed_safe_unsafe_usage
+      CReadConfig cReadCfg (pArgV[1]);
+      string strTag[4];
+      string strReconFile ("");
+
+      if (!cReadCfg.ExistFile()) {
+        printf ("Specified file: %s not exist, maybe invalid path or parameter settting.\n", cReadCfg.GetFileName().c_str());
+        return 1;
+      }
+
+      while (!cReadCfg.EndOfFile()) {
+        long nRd = cReadCfg.ReadLine (&strTag[0]);
+        if (nRd > 0) {
+          if (strTag[0].compare ("InputFile") == 0) {
+            strInputFile = strTag[1];
+          } else if (strTag[0].compare ("OutputFile") == 0) {
+            strOutputFile = strTag[1];
+          } else if (strTag[0].compare ("RestructionFile") == 0) {
+            strReconFile = strTag[1];
+            int32_t iLen = (int32_t)strReconFile.length();
+            sDecParam.pFileNameRestructed = new char[iLen + 1];
+            if (sDecParam.pFileNameRestructed != NULL) {
+              sDecParam.pFileNameRestructed[iLen] = 0;
+            }
+
+            strncpy (sDecParam.pFileNameRestructed, strReconFile.c_str(), iLen); //confirmed_safe_unsafe_usage
+          } else if (strTag[0].compare ("TargetDQID") == 0) {
+            sDecParam.uiTargetDqLayer = (uint8_t)atol (strTag[1].c_str());
+          } else if (strTag[0].compare ("ErrorConcealmentIdc") == 0) {
+            sDecParam.eEcActiveIdc = (ERROR_CON_IDC)atol (strTag[1].c_str());
+          } else if (strTag[0].compare ("CPULoad") == 0) {
+            sDecParam.uiCpuLoad = (uint32_t)atol (strTag[1].c_str());
+          } else if (strTag[0].compare ("VideoBitstreamType") == 0) {
+            sDecParam.sVideoProperty.eVideoBsType = (VIDEO_BITSTREAM_TYPE)atol (strTag[1].c_str());
+          }
+        }
+      }
+      if (strOutputFile.empty()) {
+        printf ("No output file specified in configuration file.\n");
+        return 1;
+      }
+    } else if (strstr (pArgV[1],
+                       ".264")) { // no output dump yuv file, just try to render the decoded pictures //confirmed_safe_unsafe_usage
+      strInputFile = pArgV[1];
+      sDecParam.uiTargetDqLayer = (uint8_t) - 1;
+      sDecParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
+      sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
+    }
+  } else { //iArgC > 2
+    strInputFile = pArgV[1];
+    strOutputFile = pArgV[2];
+    sDecParam.uiTargetDqLayer = (uint8_t) - 1;
+    sDecParam.eEcActiveIdc = ERROR_CON_SLICE_COPY;
+    sDecParam.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT;
+    if (iArgC > 3) {
+      for (int i = 3; i < iArgC; i++) {
+        char* cmd = pArgV[i];
+
+        if (!strcmp (cmd, "-options")) {
+          if (i + 1 < iArgC)
+            strOptionFile = pArgV[++i];
+          else {
+            printf ("options file not specified.\n");
+            return 1;
+          }
+        } else if (!strcmp (cmd, "-trace")) {
+          if (i + 1 < iArgC)
+            iLevelSetting = atoi (pArgV[++i]);
+          else {
+            printf ("trace level not specified.\n");
+            return 1;
+          }
+        } else if (!strcmp (cmd, "-length")) {
+          if (i + 1 < iArgC)
+            strLengthFile = pArgV[++i];
+          else {
+            printf ("lenght file not specified.\n");
+            return 1;
+          }
+        } else if (!strcmp (cmd, "-ec")) {
+          if (i + 1 < iArgC) {
+            int iEcActiveIdc = atoi (pArgV[++i]);
+            sDecParam.eEcActiveIdc = (ERROR_CON_IDC)iEcActiveIdc;
+            printf ("ERROR_CON(cealment) is set to %d.\n", iEcActiveIdc);
+          }
+        } else if (!strcmp (cmd, "-legacy")) {
+          bLegacyCalling = true;
+        }
+      }
+    }
+
+    if (strOutputFile.empty()) {
+      printf ("No output file specified in configuration file.\n");
+      return 1;
+    }
+  }
+
+  if (strInputFile.empty()) {
+    printf ("No input file specified in configuration file.\n");
+    return 1;
+  }
+
+
+
+
+  if (WelsCreateDecoder (&pDecoder)  || (NULL == pDecoder)) {
+    printf ("Create Decoder failed.\n");
+    return 1;
+  }
+  if (iLevelSetting >= 0) {
+    pDecoder->SetOption (DECODER_OPTION_TRACE_LEVEL, &iLevelSetting);
+  }
+
+  int32_t iThreadCount = 0;
+  pDecoder->SetOption (DECODER_OPTION_NUM_OF_THREADS, &iThreadCount);
+
+  if (pDecoder->Initialize (&sDecParam)) {
+    printf ("Decoder initialization failed.\n");
+    return 1;
+  }
+
+
+  int32_t iWidth = 0;
+  int32_t iHeight = 0;
+
+
+  H264DecodeInstance (pDecoder, strInputFile.c_str(), !strOutputFile.empty() ? strOutputFile.c_str() : NULL, iWidth,
+                      iHeight,
+                      (!strOptionFile.empty() ? strOptionFile.c_str() : NULL), (!strLengthFile.empty() ? strLengthFile.c_str() : NULL),
+                      (int32_t)sDecParam.eEcActiveIdc,
+                      bLegacyCalling);
+
+  if (sDecParam.pFileNameRestructed != NULL) {
+    delete []sDecParam.pFileNameRestructed;
+    sDecParam.pFileNameRestructed = NULL;
+  }
+
+  if (pDecoder) {
+    pDecoder->Uninitialize();
+
+    WelsDestroyDecoder (pDecoder);
+  }
+
+  return 0;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/dec/targets.mk b/third-party/openh264/third_party/openh264/src/codec/console/dec/targets.mk
new file mode 100644
index 0000000000..63be84faa0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/dec/targets.mk
@@ -0,0 +1,20 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+H264DEC_SRCDIR=codec/console/dec
+H264DEC_CPP_SRCS=\
+	$(H264DEC_SRCDIR)/src/d3d9_utils.cpp\
+	$(H264DEC_SRCDIR)/src/h264dec.cpp\
+
+H264DEC_OBJS += $(H264DEC_CPP_SRCS:.cpp=.$(OBJ))
+
+OBJS += $(H264DEC_OBJS)
+
+$(H264DEC_SRCDIR)/%.$(OBJ): $(H264DEC_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264DEC_CFLAGS) $(H264DEC_INCLUDES) -c $(CXX_O) $<
+
+h264dec$(EXEEXT): $(H264DEC_OBJS) $(H264DEC_DEPS)
+	$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $(H264DEC_OBJS) $(H264DEC_LDFLAGS) $(LDFLAGS)
+
+binaries: h264dec$(EXEEXT)
+BINARIES += h264dec$(EXEEXT)
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/enc/meson.build b/third-party/openh264/third_party/openh264/src/codec/console/enc/meson.build
new file mode 100644
index 0000000000..7b4bf46ad7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/enc/meson.build
@@ -0,0 +1,9 @@
+cpp_sources = [
+  'src/welsenc.cpp',
+]
+
+encexe = executable('h264enc', cpp_sources,
+  include_directories: [inc, console_common_inc, processing_inc, encoder_inc],
+
+  link_with: [libencoder, libcommon, libprocessing, libconsole_common],
+  dependencies: [deps])
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/enc/src/welsenc.cpp b/third-party/openh264/third_party/openh264/src/codec/console/enc/src/welsenc.cpp
new file mode 100644
index 0000000000..60b60c36fd
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/enc/src/welsenc.cpp
@@ -0,0 +1,1161 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#define _CRT_SECURE_NO_WARNINGS
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+#include <signal.h>
+#include <stdarg.h>
+#if defined (ANDROID_NDK)
+#include <android/log.h>
+#endif
+#ifdef ONLY_ENC_FRAMES_NUM
+#undef ONLY_ENC_FRAMES_NUM
+#endif//ONLY_ENC_FRAMES_NUM
+#define ONLY_ENC_FRAMES_NUM INT_MAX // 2, INT_MAX // type the num you try to encode here, 2, 10, etc
+
+#if defined (WINDOWS_PHONE)
+float   g_fFPS           = 0.0;
+double  g_dEncoderTime   = 0.0;
+int     g_iEncodedFrame  = 0;
+#endif
+
+#if defined (ANDROID_NDK)
+#define LOG_TAG "welsenc"
+#define LOGI(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define printf(...) LOGI(__VA_ARGS__)
+#define fprintf(a, ...) LOGI(__VA_ARGS__)
+#endif
+//#define STICK_STREAM_SIZE
+
+#include "measure_time.h"
+#include "read_config.h"
+
+#include "typedefs.h"
+
+#ifdef _MSC_VER
+#include <io.h>     /* _setmode() */
+#include <fcntl.h>  /* _O_BINARY */
+#endif//_MSC_VER
+
+#include "codec_def.h"
+#include "codec_api.h"
+#include "extern.h"
+#include "macros.h"
+#include "wels_const.h"
+
+#include "mt_defs.h"
+#include "WelsThreadLib.h"
+
+#ifdef _WIN32
+#ifdef WINAPI_FAMILY
+#include <winapifamily.h>
+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#define HAVE_PROCESS_AFFINITY
+#endif
+#else /* defined(WINAPI_FAMILY) */
+#define HAVE_PROCESS_AFFINITY
+#endif
+#endif /* _WIN32 */
+
+#if defined(__linux__) || defined(__unix__)
+#define _FILE_OFFSET_BITS 64
+#endif
+
+#include <iostream>
+using namespace std;
+using namespace WelsEnc;
+
+/*
+ *  Layer Context
+ */
+typedef struct LayerpEncCtx_s {
+  int32_t       iDLayerQp;
+  SSliceArgument  sSliceArgument;
+} SLayerPEncCtx;
+
+typedef struct tagFilesSet {
+  string strBsFile;
+  string strSeqFile;    // for cmd lines
+  string strLayerCfgFile[MAX_DEPENDENCY_LAYER];
+  char   sRecFileName[MAX_DEPENDENCY_LAYER][MAX_FNAME_LEN];
+  uint32_t uiFrameToBeCoded;
+  bool     bEnableMultiBsFile;
+
+  tagFilesSet() {
+    uiFrameToBeCoded = 0;
+    bEnableMultiBsFile = false;
+    for (int i = 0; i < MAX_DEPENDENCY_LAYER; i++)
+      sRecFileName[i][0] = '\0';
+  }
+} SFilesSet;
+
+
+
+/* Ctrl-C handler */
+static int     g_iCtrlC = 0;
+static void    SigIntHandler (int a) {
+  g_iCtrlC = 1;
+}
+static int     g_LevelSetting = WELS_LOG_ERROR;
+
+int ParseLayerConfig (CReadConfig& cRdLayerCfg, const int iLayer, SEncParamExt& pSvcParam, SFilesSet& sFileSet) {
+  if (!cRdLayerCfg.ExistFile()) {
+    fprintf (stderr, "Unabled to open layer #%d configuration file: %s.\n", iLayer, cRdLayerCfg.GetFileName().c_str());
+    return 1;
+  }
+
+  SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+  int iLeftTargetBitrate = (pSvcParam.iRCMode != RC_OFF_MODE) ? pSvcParam.iTargetBitrate : 0;
+  SLayerPEncCtx sLayerCtx;
+  memset (&sLayerCtx, 0, sizeof (SLayerPEncCtx));
+
+  string strTag[4];
+  string str_ ("SlicesAssign");
+  const int kiSize = (int)str_.size();
+
+  while (!cRdLayerCfg.EndOfFile()) {
+    long iLayerRd = cRdLayerCfg.ReadLine (&strTag[0]);
+    if (iLayerRd > 0) {
+      if (strTag[0].empty())
+        continue;
+      if (strTag[0].compare ("FrameWidth") == 0) {
+        pDLayer->iVideoWidth = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("FrameHeight") == 0) {
+        pDLayer->iVideoHeight = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("FrameRateOut") == 0) {
+        pDLayer->fFrameRate = (float)atof (strTag[1].c_str());
+      } else if (strTag[0].compare ("ReconFile") == 0) {
+        const unsigned int kiLen = (unsigned int)strTag[1].length();
+        if (kiLen >= sizeof (sFileSet.sRecFileName[iLayer]))
+          return -1;
+        sFileSet.sRecFileName[iLayer][kiLen] = '\0';
+        strncpy (sFileSet.sRecFileName[iLayer], strTag[1].c_str(), kiLen); // confirmed_safe_unsafe_usage
+      } else if (strTag[0].compare ("ProfileIdc") == 0) {
+        pDLayer->uiProfileIdc = (EProfileIdc)atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("FRExt") == 0) {
+//        pDLayer->frext_mode = (bool)atoi(strTag[1].c_str());
+      } else if (strTag[0].compare ("SpatialBitrate") == 0) {
+        pDLayer->iSpatialBitrate = 1000 * atoi (strTag[1].c_str());
+        if (pSvcParam.iRCMode != RC_OFF_MODE) {
+          if (pDLayer->iSpatialBitrate <= 0) {
+            fprintf (stderr, "Invalid spatial bitrate(%d) in dependency layer #%d.\n", pDLayer->iSpatialBitrate, iLayer);
+            return -1;
+          }
+          if (pDLayer->iSpatialBitrate > iLeftTargetBitrate) {
+            fprintf (stderr, "Invalid spatial(#%d) bitrate(%d) setting due to unavailable left(%d)!\n", iLayer,
+                     pDLayer->iSpatialBitrate, iLeftTargetBitrate);
+            return -1;
+          }
+          iLeftTargetBitrate -= pDLayer->iSpatialBitrate;
+        }
+      } else if (strTag[0].compare ("MaxSpatialBitrate") == 0) {
+        pDLayer->iMaxSpatialBitrate = 1000 * atoi (strTag[1].c_str());
+        if (pSvcParam.iRCMode != RC_OFF_MODE) {
+          if (pDLayer->iMaxSpatialBitrate < 0) {
+            fprintf (stderr, "Invalid max spatial bitrate(%d) in dependency layer #%d.\n", pDLayer->iMaxSpatialBitrate, iLayer);
+            return -1;
+          }
+          if (pDLayer->iMaxSpatialBitrate > 0 && pDLayer->iMaxSpatialBitrate < pDLayer->iSpatialBitrate) {
+            fprintf (stderr, "Invalid max spatial(#%d) bitrate(%d) setting::: < layerBitrate(%d)!\n", iLayer,
+                     pDLayer->iMaxSpatialBitrate, pDLayer->iSpatialBitrate);
+            return -1;
+          }
+        }
+      } else if (strTag[0].compare ("InitialQP") == 0) {
+        sLayerCtx.iDLayerQp = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("SliceMode") == 0) {
+        sLayerCtx.sSliceArgument.uiSliceMode = (SliceModeEnum)atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("SliceSize") == 0) { //SM_SIZELIMITED_SLICE
+        sLayerCtx.sSliceArgument.uiSliceSizeConstraint = atoi (strTag[1].c_str());
+        continue;
+      } else if (strTag[0].compare ("SliceNum") == 0) {
+        sLayerCtx.sSliceArgument.uiSliceNum = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare (0, kiSize, str_) == 0) {
+        const char* kpString = strTag[0].c_str();
+        int uiSliceIdx = atoi (&kpString[kiSize]);
+        assert (uiSliceIdx < MAX_SLICES_NUM);
+        sLayerCtx.sSliceArgument.uiSliceMbNum[uiSliceIdx] = atoi (strTag[1].c_str());
+      }
+    }
+  }
+  pDLayer->iDLayerQp             = sLayerCtx.iDLayerQp;
+  pDLayer->sSliceArgument.uiSliceMode = sLayerCtx.sSliceArgument.uiSliceMode;
+
+  memcpy (&pDLayer->sSliceArgument, &sLayerCtx.sSliceArgument, sizeof (SSliceArgument)); // confirmed_safe_unsafe_usage
+  memcpy (&pDLayer->sSliceArgument.uiSliceMbNum[0], &sLayerCtx.sSliceArgument.uiSliceMbNum[0],
+          sizeof (sLayerCtx.sSliceArgument.uiSliceMbNum)); // confirmed_safe_unsafe_usage
+
+  return 0;
+}
+int ParseConfig (CReadConfig& cRdCfg, SSourcePicture* pSrcPic, SEncParamExt& pSvcParam, SFilesSet& sFileSet) {
+  string strTag[4];
+  int32_t iRet = 0;
+  int8_t iLayerCount = 0;
+
+  while (!cRdCfg.EndOfFile()) {
+    long iRd = cRdCfg.ReadLine (&strTag[0]);
+    if (iRd > 0) {
+      if (strTag[0].empty())
+        continue;
+
+      if (strTag[0].compare ("UsageType") == 0) {
+        pSvcParam.iUsageType = (EUsageType)atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("SimulcastAVC") == 0) {
+        pSvcParam.bSimulcastAVC = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("SourceWidth") == 0) {
+        pSrcPic->iPicWidth = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("SourceHeight") == 0) {
+        pSrcPic->iPicHeight = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("InputFile") == 0) {
+        if (strTag[1].length() > 0)
+          sFileSet.strSeqFile = strTag[1];
+      } else if (strTag[0].compare ("OutputFile") == 0) {
+        sFileSet.strBsFile = strTag[1];
+      } else if (strTag[0].compare ("MaxFrameRate") == 0) {
+        pSvcParam.fMaxFrameRate = (float)atof (strTag[1].c_str());
+      } else if (strTag[0].compare ("FramesToBeEncoded") == 0) {
+        sFileSet.uiFrameToBeCoded = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("TemporalLayerNum") == 0) {
+        pSvcParam.iTemporalLayerNum = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("IntraPeriod") == 0) {
+        pSvcParam.uiIntraPeriod = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("MaxNalSize") == 0) {
+        pSvcParam.uiMaxNalSize = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("SpsPpsIDStrategy") == 0) {
+        int32_t iValue = atoi (strTag[1].c_str());
+        switch (iValue) {
+        case 0:
+          pSvcParam.eSpsPpsIdStrategy  = CONSTANT_ID;
+          break;
+        case 0x01:
+          pSvcParam.eSpsPpsIdStrategy  = INCREASING_ID;
+          break;
+        case 0x02:
+          pSvcParam.eSpsPpsIdStrategy  = SPS_LISTING;
+          break;
+        case 0x03:
+          pSvcParam.eSpsPpsIdStrategy  = SPS_LISTING_AND_PPS_INCREASING;
+          break;
+        case 0x06:
+          pSvcParam.eSpsPpsIdStrategy  = SPS_PPS_LISTING;
+          break;
+        default:
+          pSvcParam.eSpsPpsIdStrategy  = CONSTANT_ID;
+          break;
+        }
+      } else if (strTag[0].compare ("EnableMultiBsFile") == 0) {
+        sFileSet.bEnableMultiBsFile = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableScalableSEI") == 0) {
+        pSvcParam.bEnableSSEI = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableFrameCropping") == 0) {
+        pSvcParam.bEnableFrameCroppingFlag = (atoi (strTag[1].c_str()) != 0);
+      } else if (strTag[0].compare ("EntropyCodingModeFlag") == 0) {
+        pSvcParam.iEntropyCodingModeFlag = (atoi (strTag[1].c_str()) != 0);
+      } else if (strTag[0].compare ("ComplexityMode") == 0) {
+        pSvcParam.iComplexityMode = (ECOMPLEXITY_MODE) (atoi (strTag[1].c_str()));
+      } else if (strTag[0].compare ("LoopFilterDisableIDC") == 0) {
+        pSvcParam.iLoopFilterDisableIdc = (int8_t)atoi (strTag[1].c_str());
+        if (pSvcParam.iLoopFilterDisableIdc > 6 || pSvcParam.iLoopFilterDisableIdc < 0) {
+          fprintf (stderr, "Invalid parameter in iLoopFilterDisableIdc: %d.\n", pSvcParam.iLoopFilterDisableIdc);
+          iRet = 1;
+          break;
+        }
+      } else if (strTag[0].compare ("LoopFilterAlphaC0Offset") == 0) {
+        pSvcParam.iLoopFilterAlphaC0Offset = (int8_t)atoi (strTag[1].c_str());
+        if (pSvcParam.iLoopFilterAlphaC0Offset < -6)
+          pSvcParam.iLoopFilterAlphaC0Offset = -6;
+        else if (pSvcParam.iLoopFilterAlphaC0Offset > 6)
+          pSvcParam.iLoopFilterAlphaC0Offset = 6;
+      } else if (strTag[0].compare ("LoopFilterBetaOffset") == 0) {
+        pSvcParam.iLoopFilterBetaOffset = (int8_t)atoi (strTag[1].c_str());
+        if (pSvcParam.iLoopFilterBetaOffset < -6)
+          pSvcParam.iLoopFilterBetaOffset = -6;
+        else if (pSvcParam.iLoopFilterBetaOffset > 6)
+          pSvcParam.iLoopFilterBetaOffset = 6;
+      } else if (strTag[0].compare ("MultipleThreadIdc") == 0) {
+        // # 0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads;
+        pSvcParam.iMultipleThreadIdc = atoi (strTag[1].c_str());
+        if (pSvcParam.iMultipleThreadIdc < 0)
+          pSvcParam.iMultipleThreadIdc = 0;
+        else if (pSvcParam.iMultipleThreadIdc > MAX_THREADS_NUM)
+          pSvcParam.iMultipleThreadIdc = MAX_THREADS_NUM;
+      } else if (strTag[0].compare ("UseLoadBalancing") == 0) {
+        pSvcParam.bUseLoadBalancing = (atoi (strTag[1].c_str())) ? true : false;
+      } else if (strTag[0].compare ("RCMode") == 0) {
+        pSvcParam.iRCMode = (RC_MODES) atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("TargetBitrate") == 0) {
+        pSvcParam.iTargetBitrate = 1000 * atoi (strTag[1].c_str());
+        if ((pSvcParam.iRCMode != RC_OFF_MODE) && pSvcParam.iTargetBitrate <= 0) {
+          fprintf (stderr, "Invalid target bitrate setting due to RC enabled. Check TargetBitrate field please!\n");
+          return 1;
+        }
+      } else if (strTag[0].compare ("MaxOverallBitrate") == 0) {
+        pSvcParam.iMaxBitrate = 1000 * atoi (strTag[1].c_str());
+        if ((pSvcParam.iRCMode != RC_OFF_MODE) && pSvcParam.iMaxBitrate < 0) {
+          fprintf (stderr, "Invalid max overall bitrate setting due to RC enabled. Check MaxOverallBitrate field please!\n");
+          return 1;
+        }
+      } else if (strTag[0].compare ("MaxQp") == 0) {
+        pSvcParam.iMaxQp = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("MinQp") == 0) {
+        pSvcParam.iMinQp = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("EnableDenoise") == 0) {
+        pSvcParam.bEnableDenoise = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableSceneChangeDetection") == 0) {
+        pSvcParam.bEnableSceneChangeDetect = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableBackgroundDetection") == 0) {
+        pSvcParam.bEnableBackgroundDetection = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableAdaptiveQuantization") == 0) {
+        pSvcParam.bEnableAdaptiveQuant = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableFrameSkip") == 0) {
+        pSvcParam.bEnableFrameSkip = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("EnableLongTermReference") == 0) {
+        pSvcParam.bEnableLongTermReference = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("LongTermReferenceNumber") == 0) {
+        pSvcParam.iLTRRefNum = atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("LtrMarkPeriod") == 0) {
+        pSvcParam.iLtrMarkPeriod = (uint32_t)atoi (strTag[1].c_str());
+      } else if (strTag[0].compare ("LosslessLink") == 0) {
+        pSvcParam.bIsLosslessLink = atoi (strTag[1].c_str()) ? true : false;
+      } else if (strTag[0].compare ("NumLayers") == 0) {
+        pSvcParam.iSpatialLayerNum = (int8_t)atoi (strTag[1].c_str());
+        if (pSvcParam.iSpatialLayerNum > MAX_DEPENDENCY_LAYER || pSvcParam.iSpatialLayerNum <= 0) {
+          fprintf (stderr, "Invalid parameter in iSpatialLayerNum: %d.\n", pSvcParam.iSpatialLayerNum);
+          iRet = 1;
+          break;
+        }
+      } else if (strTag[0].compare ("LayerCfg") == 0) {
+        if (strTag[1].length() > 0)
+          sFileSet.strLayerCfgFile[iLayerCount] = strTag[1];
+//          pSvcParam.sDependencyLayers[iLayerCount].uiDependencyId = iLayerCount;
+        ++ iLayerCount;
+      } else if (strTag[0].compare ("PrefixNALAddingCtrl") == 0) {
+        int ctrl_flag = atoi (strTag[1].c_str());
+        if (ctrl_flag > 1)
+          ctrl_flag = 1;
+        else if (ctrl_flag < 0)
+          ctrl_flag = 0;
+        pSvcParam.bPrefixNalAddingCtrl = ctrl_flag ? true : false;
+      }
+    }
+  }
+
+  const int8_t kiActualLayerNum = WELS_MIN (pSvcParam.iSpatialLayerNum, iLayerCount);
+  if (pSvcParam.iSpatialLayerNum >
+      kiActualLayerNum) { // fixed number of dependency layer due to parameter error in settings
+    pSvcParam.iSpatialLayerNum = kiActualLayerNum;
+  }
+
+  assert (kiActualLayerNum <= MAX_DEPENDENCY_LAYER);
+
+  for (int8_t iLayer = 0; iLayer < kiActualLayerNum; ++ iLayer) {
+    CReadConfig cRdLayerCfg (sFileSet.strLayerCfgFile[iLayer]);
+    if (-1 == ParseLayerConfig (cRdLayerCfg, iLayer, pSvcParam, sFileSet)) {
+      iRet = 1;
+      break;
+    }
+  }
+
+  return iRet;
+}
+
+void PrintHelp() {
+  printf ("\n Wels SVC Encoder Usage:\n\n");
+  printf (" Syntax: welsenc.exe -h\n");
+  printf (" Syntax: welsenc.exe welsenc.cfg\n");
+  printf (" Syntax: welsenc.exe welsenc.cfg [options]\n");
+
+  printf ("\n Supported Options:\n");
+  printf ("  -bf          Bit Stream File\n");
+  printf ("  -org         Original file, example: -org src.yuv\n");
+  printf ("  -sw          the source width\n");
+  printf ("  -sh          the source height\n");
+  printf ("  -utype       usage type\n");
+  printf ("  -savc        simulcast avc\n");
+  printf ("  -frms        Number of total frames to be encoded\n");
+  printf ("  -frin        input frame rate\n");
+  printf ("  -numtl       Temporal layer number (default: 1)\n");
+  printf ("  -iper        Intra period (default: -1) : must be a power of 2 of GOP size (or -1)\n");
+  printf ("  -nalsize     the Maximum NAL size. which should be larger than the each layer slicesize when slice mode equals to SM_SIZELIMITED_SLICE\n");
+  printf ("  -spsid       SPS/PPS id strategy: 0:const, 1: increase, 2: sps list, 3: sps list and pps increase, 4: sps/pps list\n");
+  printf ("  -cabac       Entropy coding mode(0:cavlc 1:cabac \n");
+  printf ("  -complexity  Complexity mode (default: 0),0: low complexity, 1: medium complexity, 2: high complexity\n");
+  printf ("  -denois      Control denoising  (default: 0)\n");
+  printf ("  -scene       Control scene change detection (default: 0)\n");
+  printf ("  -bgd         Control background detection (default: 0)\n");
+  printf ("  -aq          Control adaptive quantization (default: 0)\n");
+  printf ("  -ltr         Control long term reference (default: 0)\n");
+  printf ("  -ltrnum      Control the number of long term reference((1-4):screen LTR,(1-2):video LTR \n");
+  printf ("  -ltrper      Control the long term reference marking period \n");
+  printf ("  -threadIdc   0: auto(dynamic imp. internal encoder); 1: multiple threads imp. disabled; > 1: count number of threads \n");
+  printf ("  -loadbalancing   0: turn off loadbalancing between slices when multi-threading available; 1: (default value) turn on loadbalancing between slices when multi-threading available\n");
+  printf ("  -deblockIdc  Loop filter idc (0: on, 1: off, \n");
+  printf ("  -alphaOffset AlphaOffset(-6..+6): valid range \n");
+  printf ("  -betaOffset  BetaOffset (-6..+6): valid range\n");
+  printf ("  -rc          rate control mode: -1-rc off; 0-quality mode; 1-bitrate mode; 2: buffer based mode,can't control bitrate; 3: bitrate mode based on timestamp input;\n");
+  printf ("  -tarb        Overall target bitrate\n");
+  printf ("  -maxbrTotal  Overall max bitrate\n");
+  printf ("  -maxqp       Maximum Qp (default: %d, or for screen content usage: %d)\n", QP_MAX_VALUE, MAX_SCREEN_QP);
+  printf ("  -minqp       Minimum Qp (default: %d, or for screen content usage: %d)\n", QP_MIN_VALUE, MIN_SCREEN_QP);
+  printf ("  -numl        Number Of Layers: Must exist with layer_cfg file and the number of input layer_cfg file must equal to the value set by this command\n");
+  printf ("  The options below are layer-based: (need to be set with layer id)\n");
+  printf ("  -lconfig     (Layer) (spatial layer configure file)\n");
+  printf ("  -drec        (Layer) (reconstruction file);example: -drec 0 rec.yuv.  Setting the reconstruction file, this will only functioning when dumping reconstruction is enabled\n");
+  printf ("  -dprofile    (Layer) (layer profile);example: -dprofile 0 66.  Setting the layer profile, this should be the same for all layers\n");
+  printf ("  -dw          (Layer) (output width)\n");
+  printf ("  -dh          (Layer) (output height)\n");
+  printf ("  -frout       (Layer) (output frame rate)\n");
+  printf ("  -lqp         (Layer) (base quality layer qp : must work with -ldeltaqp or -lqparr)\n");
+  printf ("  -ltarb       (Layer) (spatial layer target bitrate)\n");
+  printf ("  -lmaxb       (Layer) (spatial layer max bitrate)\n");
+  printf ("  -slcmd       (Layer) (spatial layer slice mode): pls refer to layerX.cfg for details ( -slcnum: set target slice num; -slcsize: set target slice size constraint ; -slcmbnum: set the first slice mb num under some slice modes) \n");
+  printf ("  -trace       (Level)\n");
+  printf ("\n");
+}
+
+int ParseCommandLine (int argc, char** argv, SSourcePicture* pSrcPic, SEncParamExt& pSvcParam, SFilesSet& sFileSet) {
+  char* pCommand = NULL;
+  SLayerPEncCtx sLayerCtx[MAX_SPATIAL_LAYER_NUM];
+  int n = 0;
+  string str_ ("SlicesAssign");
+
+  while (n < argc) {
+    pCommand = argv[n++];
+
+    if (!strcmp (pCommand, "-bf") && (n < argc))
+      sFileSet.strBsFile.assign (argv[n++]);
+    else if (!strcmp (pCommand, "-utype") && (n < argc))
+      pSvcParam.iUsageType = (EUsageType)atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-savc") && (n < argc))
+      pSvcParam.bSimulcastAVC =  atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-org") && (n < argc))
+      sFileSet.strSeqFile.assign (argv[n++]);
+
+    else if (!strcmp (pCommand, "-sw") && (n < argc))//source width
+      pSrcPic->iPicWidth = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-sh") && (n < argc))//source height
+      pSrcPic->iPicHeight = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-frms") && (n < argc))
+      sFileSet.uiFrameToBeCoded = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-frin") && (n < argc))
+      pSvcParam.fMaxFrameRate = (float) atof (argv[n++]);
+
+    else if (!strcmp (pCommand, "-numtl") && (n < argc))
+      pSvcParam.iTemporalLayerNum = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-mfile") && (n < argc))
+      sFileSet.bEnableMultiBsFile = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-iper") && (n < argc))
+      pSvcParam.uiIntraPeriod = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-nalsize") && (n < argc))
+      pSvcParam.uiMaxNalSize = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-spsid") && (n < argc)) {
+      int32_t iValue = atoi (argv[n++]);
+      switch (iValue) {
+      case 0:
+        pSvcParam.eSpsPpsIdStrategy  = CONSTANT_ID;
+        break;
+      case 0x01:
+        pSvcParam.eSpsPpsIdStrategy  = INCREASING_ID;
+        break;
+      case 0x02:
+        pSvcParam.eSpsPpsIdStrategy  = SPS_LISTING;
+        break;
+      case 0x03:
+        pSvcParam.eSpsPpsIdStrategy  = SPS_LISTING_AND_PPS_INCREASING;
+        break;
+      case 0x06:
+        pSvcParam.eSpsPpsIdStrategy  = SPS_PPS_LISTING;
+        break;
+      default:
+        pSvcParam.eSpsPpsIdStrategy  = CONSTANT_ID;
+        break;
+      }
+    } else if (!strcmp (pCommand, "-cabac") && (n < argc))
+      pSvcParam.iEntropyCodingModeFlag = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-complexity") && (n < argc))
+      pSvcParam.iComplexityMode = (ECOMPLEXITY_MODE)atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-denois") && (n < argc))
+      pSvcParam.bEnableDenoise = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-scene") && (n < argc))
+      pSvcParam.bEnableSceneChangeDetect = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-bgd") && (n < argc))
+      pSvcParam.bEnableBackgroundDetection = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-aq") && (n < argc))
+      pSvcParam.bEnableAdaptiveQuant = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-fs") && (n < argc))
+      pSvcParam.bEnableFrameSkip = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-ltr") && (n < argc))
+      pSvcParam.bEnableLongTermReference = atoi (argv[n++]) ? true : false;
+
+    else if (!strcmp (pCommand, "-ltrnum") && (n < argc))
+      pSvcParam.iLTRRefNum = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-ltrper") && (n < argc))
+      pSvcParam.iLtrMarkPeriod = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-threadIdc") && (n < argc))
+      pSvcParam.iMultipleThreadIdc = atoi (argv[n++]);
+    else if (!strcmp (pCommand, "-loadbalancing") && (n + 1 < argc)) {
+      pSvcParam.bUseLoadBalancing = (atoi (argv[n++])) ? true : false;
+    } else if (!strcmp (pCommand, "-deblockIdc") && (n < argc))
+      pSvcParam.iLoopFilterDisableIdc = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-alphaOffset") && (n < argc))
+      pSvcParam.iLoopFilterAlphaC0Offset = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-betaOffset") && (n < argc))
+      pSvcParam.iLoopFilterBetaOffset = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-rc") && (n < argc))
+      pSvcParam.iRCMode = static_cast<RC_MODES> (atoi (argv[n++]));
+
+    else if (!strcmp (pCommand, "-trace") && (n < argc))
+      g_LevelSetting = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-tarb") && (n < argc))
+      pSvcParam.iTargetBitrate = 1000 * atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-maxbrTotal") && (n < argc))
+      pSvcParam.iMaxBitrate = 1000 * atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-maxqp") && (n < argc))
+      pSvcParam.iMaxQp = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-minqp") && (n < argc))
+      pSvcParam.iMinQp = atoi (argv[n++]);
+
+    else if (!strcmp (pCommand, "-numl") && (n < argc)) {
+      pSvcParam.iSpatialLayerNum = atoi (argv[n++]);
+    } else if (!strcmp (pCommand, "-lconfig") && (n < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      sFileSet.strLayerCfgFile[iLayer].assign (argv[n++]);
+      CReadConfig cRdLayerCfg (sFileSet.strLayerCfgFile[iLayer]);
+      if (-1 == ParseLayerConfig (cRdLayerCfg, iLayer, pSvcParam, sFileSet)) {
+        return 1;
+      }
+    } else if (!strcmp (pCommand, "-dprofile") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->uiProfileIdc = (EProfileIdc) atoi (argv[n++]);
+    } else if (!strcmp (pCommand, "-drec") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      const unsigned int iLen = (int) strlen (argv[n]);
+      if (iLen >= sizeof (sFileSet.sRecFileName[iLayer]))
+        return 1;
+      sFileSet.sRecFileName[iLayer][iLen] = '\0';
+      strncpy (sFileSet.sRecFileName[iLayer], argv[n++], iLen); // confirmed_safe_unsafe_usage
+    } else if (!strcmp (pCommand, "-dw") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->iVideoWidth = atoi (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-dh") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->iVideoHeight = atoi (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-frout") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->fFrameRate = (float)atof (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-lqp") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->iDLayerQp = sLayerCtx[iLayer].iDLayerQp =  atoi (argv[n++]);
+    }
+    //sLayerCtx[iLayer].num_quality_layers = pDLayer->num_quality_layers = 1;
+
+    else if (!strcmp (pCommand, "-ltarb") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->iSpatialBitrate = 1000 * atoi (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-lmaxb") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->iMaxSpatialBitrate = 1000 * atoi (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-slcmd") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+
+      switch (atoi (argv[n++])) {
+      case 0:
+        pDLayer->sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+        break;
+      case 1:
+        pDLayer->sSliceArgument.uiSliceMode = SM_FIXEDSLCNUM_SLICE;
+        break;
+      case 2:
+        pDLayer->sSliceArgument.uiSliceMode = SM_RASTER_SLICE;
+        break;
+      case 3:
+        pDLayer->sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
+        break;
+      default:
+        pDLayer->sSliceArgument.uiSliceMode = SM_RESERVED;
+        break;
+      }
+    }
+
+    else if (!strcmp (pCommand, "-slcsize") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->sSliceArgument.uiSliceSizeConstraint = atoi (argv[n++]);
+    }
+
+    else if (!strcmp (pCommand, "-slcnum") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->sSliceArgument.uiSliceNum = atoi (argv[n++]);
+    } else if (!strcmp (pCommand, "-slcmbnum") && (n + 1 < argc)) {
+      unsigned int iLayer = atoi (argv[n++]);
+      SSpatialLayerConfig* pDLayer = &pSvcParam.sSpatialLayers[iLayer];
+      pDLayer->sSliceArgument.uiSliceMbNum[0] = atoi (argv[n++]);
+    }
+  }
+  return 0;
+}
+
+
+
+int FillSpecificParameters (SEncParamExt& sParam) {
+  /* Test for temporal, spatial, SNR scalability */
+  sParam.iUsageType = CAMERA_VIDEO_REAL_TIME;
+  sParam.fMaxFrameRate  = 60.0f;                // input frame rate
+  sParam.iPicWidth      = 1280;                 // width of picture in samples
+  sParam.iPicHeight     = 720;                  // height of picture in samples
+  sParam.iTargetBitrate = 2500000;              // target bitrate desired
+  sParam.iMaxBitrate    = UNSPECIFIED_BIT_RATE;
+  sParam.iRCMode        = RC_QUALITY_MODE;      //  rc mode control
+  sParam.iTemporalLayerNum = 3;    // layer number at temporal level
+  sParam.iSpatialLayerNum  = 4;    // layer number at spatial level
+  sParam.bEnableDenoise    = 0;    // denoise control
+  sParam.bEnableBackgroundDetection = 1; // background detection control
+  sParam.bEnableAdaptiveQuant       = 1; // adaptive quantization control
+  sParam.bEnableFrameSkip           = 1; // frame skipping
+  sParam.bEnableLongTermReference   = 0; // long term reference control
+  sParam.iLtrMarkPeriod = 30;
+  sParam.uiIntraPeriod  = 320;           // period of Intra frame
+  sParam.eSpsPpsIdStrategy = INCREASING_ID;
+  sParam.bPrefixNalAddingCtrl = 0;
+  sParam.iComplexityMode = LOW_COMPLEXITY;
+  sParam.bSimulcastAVC         = false;
+  int iIndexLayer = 0;
+  sParam.sSpatialLayers[iIndexLayer].uiProfileIdc       = PRO_BASELINE;
+  sParam.sSpatialLayers[iIndexLayer].iVideoWidth        = 160;
+  sParam.sSpatialLayers[iIndexLayer].iVideoHeight       = 90;
+  sParam.sSpatialLayers[iIndexLayer].fFrameRate         = 7.5f;
+  sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate    = 64000;
+  sParam.sSpatialLayers[iIndexLayer].iMaxSpatialBitrate    = UNSPECIFIED_BIT_RATE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+
+  ++ iIndexLayer;
+  sParam.sSpatialLayers[iIndexLayer].uiProfileIdc       = PRO_SCALABLE_BASELINE;
+  sParam.sSpatialLayers[iIndexLayer].iVideoWidth        = 320;
+  sParam.sSpatialLayers[iIndexLayer].iVideoHeight       = 180;
+  sParam.sSpatialLayers[iIndexLayer].fFrameRate         = 15.0f;
+  sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate    = 160000;
+  sParam.sSpatialLayers[iIndexLayer].iMaxSpatialBitrate    = UNSPECIFIED_BIT_RATE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+
+  ++ iIndexLayer;
+  sParam.sSpatialLayers[iIndexLayer].uiProfileIdc       = PRO_SCALABLE_BASELINE;
+  sParam.sSpatialLayers[iIndexLayer].iVideoWidth        = 640;
+  sParam.sSpatialLayers[iIndexLayer].iVideoHeight       = 360;
+  sParam.sSpatialLayers[iIndexLayer].fFrameRate         = 30.0f;
+  sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate    = 512000;
+  sParam.sSpatialLayers[iIndexLayer].iMaxSpatialBitrate    = UNSPECIFIED_BIT_RATE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceNum = 1;
+
+  ++ iIndexLayer;
+  sParam.sSpatialLayers[iIndexLayer].uiProfileIdc       = PRO_SCALABLE_BASELINE;
+  sParam.sSpatialLayers[iIndexLayer].iVideoWidth        = 1280;
+  sParam.sSpatialLayers[iIndexLayer].iVideoHeight       = 720;
+  sParam.sSpatialLayers[iIndexLayer].fFrameRate         = 30.0f;
+  sParam.sSpatialLayers[iIndexLayer].iSpatialBitrate    = 1500000;
+  sParam.sSpatialLayers[iIndexLayer].iMaxSpatialBitrate    = UNSPECIFIED_BIT_RATE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+  sParam.sSpatialLayers[iIndexLayer].sSliceArgument.uiSliceNum = 1;
+
+  float fMaxFr = sParam.sSpatialLayers[sParam.iSpatialLayerNum - 1].fFrameRate;
+  for (int32_t i = sParam.iSpatialLayerNum - 2; i >= 0; -- i) {
+    if (sParam.sSpatialLayers[i].fFrameRate > fMaxFr + EPSN)
+      fMaxFr = sParam.sSpatialLayers[i].fFrameRate;
+  }
+  sParam.fMaxFrameRate = fMaxFr;
+
+  return 0;
+}
+
+int ProcessEncoding (ISVCEncoder* pPtrEnc, int argc, char** argv, bool bConfigFile) {
+  int iRet = 0;
+
+  if (pPtrEnc == NULL)
+    return 1;
+
+  SFrameBSInfo sFbi;
+  SEncParamExt sSvcParam;
+  int64_t iStart = 0, iTotal = 0;
+
+  // Preparing encoding process
+  FILE* pFileYUV = NULL;
+  int32_t iActualFrameEncodedCount = 0;
+  int32_t iFrameIdx = 0;
+  int32_t iTotalFrameMax = -1;
+  uint8_t* pYUV = NULL;
+  SSourcePicture* pSrcPic = NULL;
+  uint32_t iSourceWidth, iSourceHeight, kiPicResSize;
+  // Inactive with sink with output file handler
+  FILE* pFpBs[4];
+  pFpBs[0] = pFpBs[1] = pFpBs[2] = pFpBs[3] = NULL;
+#if defined(COMPARE_DATA)
+  //For getting the golden file handle
+  FILE* fpGolden = NULL;
+#endif
+#if defined ( STICK_STREAM_SIZE )
+  FILE* fTrackStream = fopen ("coding_size.stream", "wb");
+#endif
+  SFilesSet fs;
+  // for configuration file
+  CReadConfig cRdCfg;
+  int iParsedNum = 1;
+
+  memset (&sFbi, 0, sizeof (SFrameBSInfo));
+  pPtrEnc->GetDefaultParams (&sSvcParam);
+  fs.bEnableMultiBsFile = false;
+
+  FillSpecificParameters (sSvcParam);
+  pSrcPic = new SSourcePicture;
+  if (pSrcPic == NULL) {
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+  //fill default pSrcPic
+  pSrcPic->iColorFormat = videoFormatI420;
+  pSrcPic->uiTimeStamp = 0;
+
+  // if configure file exit, reading configure file firstly
+  if (bConfigFile) {
+    iParsedNum = 2;
+    cRdCfg.Openf (argv[1]);
+    if (!cRdCfg.ExistFile()) {
+      fprintf (stderr, "Specified file: %s not exist, maybe invalid path or parameter settting.\n",
+               cRdCfg.GetFileName().c_str());
+      iRet = 1;
+      goto INSIDE_MEM_FREE;
+    }
+    iRet = ParseConfig (cRdCfg, pSrcPic, sSvcParam, fs);
+    if (iRet) {
+      fprintf (stderr, "parse svc parameter config file failed.\n");
+      iRet = 1;
+      goto INSIDE_MEM_FREE;
+    }
+  }
+  if (ParseCommandLine (argc - iParsedNum, argv + iParsedNum, pSrcPic, sSvcParam, fs) != 0) {
+    printf ("parse pCommand line failed\n");
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+  pPtrEnc->SetOption (ENCODER_OPTION_TRACE_LEVEL, &g_LevelSetting);
+  //finish reading the configurations
+  iSourceWidth = pSrcPic->iPicWidth;
+  iSourceHeight = pSrcPic->iPicHeight;
+  kiPicResSize = iSourceWidth * iSourceHeight * 3 >> 1;
+
+  pYUV = new uint8_t [kiPicResSize];
+  if (pYUV == NULL) {
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+
+  //update pSrcPic
+  pSrcPic->iStride[0] = iSourceWidth;
+  pSrcPic->iStride[1] = pSrcPic->iStride[2] = pSrcPic->iStride[0] >> 1;
+
+  pSrcPic->pData[0] = pYUV;
+  pSrcPic->pData[1] = pSrcPic->pData[0] + (iSourceWidth * iSourceHeight);
+  pSrcPic->pData[2] = pSrcPic->pData[1] + (iSourceWidth * iSourceHeight >> 2);
+
+  //update sSvcParam
+  sSvcParam.iPicWidth = 0;
+  sSvcParam.iPicHeight = 0;
+  for (int iLayer = 0; iLayer < sSvcParam.iSpatialLayerNum; iLayer++) {
+    SSpatialLayerConfig* pDLayer = &sSvcParam.sSpatialLayers[iLayer];
+    sSvcParam.iPicWidth = WELS_MAX (sSvcParam.iPicWidth, pDLayer->iVideoWidth);
+    sSvcParam.iPicHeight = WELS_MAX (sSvcParam.iPicHeight, pDLayer->iVideoHeight);
+  }
+  //if target output resolution is not set, use the source size
+  sSvcParam.iPicWidth = (!sSvcParam.iPicWidth) ? iSourceWidth : sSvcParam.iPicWidth;
+  sSvcParam.iPicHeight = (!sSvcParam.iPicHeight) ? iSourceHeight : sSvcParam.iPicHeight;
+
+  iTotalFrameMax = (int32_t)fs.uiFrameToBeCoded;
+  //  sSvcParam.bSimulcastAVC = true;
+  if (cmResultSuccess != pPtrEnc->InitializeExt (&sSvcParam)) { // SVC encoder initialization
+    fprintf (stderr, "SVC encoder Initialize failed\n");
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+  for (int iLayer = 0; iLayer < MAX_DEPENDENCY_LAYER; iLayer++) {
+    if (fs.sRecFileName[iLayer][0] != 0) {
+      SDumpLayer sDumpLayer;
+      sDumpLayer.iLayer = iLayer;
+      sDumpLayer.pFileName = fs.sRecFileName[iLayer];
+      if (cmResultSuccess != pPtrEnc->SetOption (ENCODER_OPTION_DUMP_FILE, &sDumpLayer)) {
+        fprintf (stderr, "SetOption ENCODER_OPTION_DUMP_FILE failed!\n");
+        iRet = 1;
+        goto INSIDE_MEM_FREE;
+      }
+    }
+  }
+  // Inactive with sink with output file handler
+  if (fs.strBsFile.length() > 0) {
+    bool bFileOpenErr = false;
+    if (sSvcParam.iSpatialLayerNum == 1 || fs.bEnableMultiBsFile == false) {
+      pFpBs[0] = fopen (fs.strBsFile.c_str(), "wb");
+      bFileOpenErr = (pFpBs[0] == NULL);
+    } else { //enable multi bs file writing
+      string filename_layer;
+      string add_info[4] = {"_layer0", "_layer1", "_layer2", "_layer3"};
+      string::size_type found = fs.strBsFile.find_last_of ('.');
+      for (int i = 0; i < sSvcParam.iSpatialLayerNum; ++i) {
+        filename_layer = fs.strBsFile.insert (found, add_info[i]);
+        pFpBs[i] = fopen (filename_layer.c_str(), "wb");
+        fs.strBsFile = filename_layer.erase (found, 7);
+        bFileOpenErr |= (pFpBs[i] == NULL);
+      }
+    }
+    if (bFileOpenErr) {
+      fprintf (stderr, "Can not open file (%s) to write bitstream!\n", fs.strBsFile.c_str());
+      iRet = 1;
+      goto INSIDE_MEM_FREE;
+    }
+  } else {
+    fprintf (stderr, "Don't set the proper bitstream filename!\n");
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+
+#if defined(COMPARE_DATA)
+  //For getting the golden file handle
+  if ((fpGolden = fopen (argv[3], "rb")) == NULL) {
+    fprintf (stderr, "Unable to open golden sequence file, check corresponding path!\n");
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+#endif
+
+  pFileYUV = fopen (fs.strSeqFile.c_str(), "rb");
+  if (pFileYUV != NULL) {
+#if defined(_WIN32) || defined(_WIN64)
+#if _MSC_VER >= 1400
+    if (!_fseeki64 (pFileYUV, 0, SEEK_END)) {
+      int64_t i_size = _ftelli64 (pFileYUV);
+      _fseeki64 (pFileYUV, 0, SEEK_SET);
+      iTotalFrameMax = WELS_MAX ((int32_t) (i_size / kiPicResSize), iTotalFrameMax);
+    }
+#else
+    if (!fseek (pFileYUV, 0, SEEK_END)) {
+      int64_t i_size = ftell (pFileYUV);
+      fseek (pFileYUV, 0, SEEK_SET);
+      iTotalFrameMax = WELS_MAX ((int32_t) (i_size / kiPicResSize), iTotalFrameMax);
+    }
+#endif
+#else
+    if (!fseeko (pFileYUV, 0, SEEK_END)) {
+      int64_t i_size = ftello (pFileYUV);
+      fseeko (pFileYUV, 0, SEEK_SET);
+      iTotalFrameMax = WELS_MAX ((int32_t) (i_size / kiPicResSize), iTotalFrameMax);
+    }
+#endif
+  } else {
+    fprintf (stderr, "Unable to open source sequence file (%s), check corresponding path!\n",
+             fs.strSeqFile.c_str());
+    iRet = 1;
+    goto INSIDE_MEM_FREE;
+  }
+
+  iFrameIdx = 0;
+  while (iFrameIdx < iTotalFrameMax && (((int32_t)fs.uiFrameToBeCoded <= 0)
+                                        || (iFrameIdx < (int32_t)fs.uiFrameToBeCoded))) {
+
+#ifdef ONLY_ENC_FRAMES_NUM
+    // Only encoded some limited frames here
+    if (iActualFrameEncodedCount >= ONLY_ENC_FRAMES_NUM) {
+      break;
+    }
+#endif//ONLY_ENC_FRAMES_NUM
+    bool bCanBeRead = false;
+    bCanBeRead = (fread (pYUV, 1, kiPicResSize, pFileYUV) == kiPicResSize);
+
+    if (!bCanBeRead)
+      break;
+    // To encoder this frame
+    iStart = WelsTime();
+    pSrcPic->uiTimeStamp = WELS_ROUND (iFrameIdx * (1000 / sSvcParam.fMaxFrameRate));
+    int iEncFrames = pPtrEnc->EncodeFrame (pSrcPic, &sFbi);
+    iTotal += WelsTime() - iStart;
+    ++ iFrameIdx;
+    if (videoFrameTypeSkip == sFbi.eFrameType) {
+      continue;
+    }
+
+    if (iEncFrames == cmResultSuccess) {
+      int iLayer = 0;
+      int iFrameSize = 0;
+      while (iLayer < sFbi.iLayerNum) {
+        SLayerBSInfo* pLayerBsInfo = &sFbi.sLayerInfo[iLayer];
+        if (pLayerBsInfo != NULL) {
+          int iLayerSize = 0;
+          int iNalIdx = pLayerBsInfo->iNalCount - 1;
+          do {
+            iLayerSize += pLayerBsInfo->pNalLengthInByte[iNalIdx];
+            -- iNalIdx;
+          } while (iNalIdx >= 0);
+#if defined(COMPARE_DATA)
+          //Comparing the result of encoder with golden pData
+          {
+            unsigned char* pUCArry = new unsigned char [iLayerSize];
+
+            fread (pUCArry, 1, iLayerSize, fpGolden);
+
+            for (int w = 0; w < iLayerSize; w++) {
+              if (pUCArry[w] != pLayerBsInfo->pBsBuf[w]) {
+                fprintf (stderr, "error @frame%d/layer%d/byte%d!!!!!!!!!!!!!!!!!!!!!!!!\n", iFrameIdx, iLayer, w);
+                //fprintf(stderr, "%x - %x\n", pUCArry[w], pLayerBsInfo->pBsBuf[w]);
+                break;
+              }
+            }
+            fprintf (stderr, "frame%d/layer%d comparation completed!\n", iFrameIdx, iLayer);
+
+            delete [] pUCArry;
+          }
+#endif
+          if (sSvcParam.iSpatialLayerNum == 1 || fs.bEnableMultiBsFile == false)
+            fwrite (pLayerBsInfo->pBsBuf, 1, iLayerSize, pFpBs[0]); // write pure bit stream into file
+          else { //multi bs file write
+            if (pLayerBsInfo->uiSpatialId == 0) {
+              unsigned char five_bits = pLayerBsInfo->pBsBuf[4] & 0x1f;
+              if ((five_bits == 0x07) || (five_bits == 0x08)) { //sps or pps
+                for (int i = 0; i < sSvcParam.iSpatialLayerNum; ++i) {
+                  fwrite (pLayerBsInfo->pBsBuf, 1, iLayerSize, pFpBs[i]);
+                }
+              } else {
+                fwrite (pLayerBsInfo->pBsBuf, 1, iLayerSize, pFpBs[0]);
+              }
+            } else {
+              fwrite (pLayerBsInfo->pBsBuf, 1, iLayerSize, pFpBs[pLayerBsInfo->uiSpatialId]);
+            }
+          }
+          iFrameSize += iLayerSize;
+        }
+        ++ iLayer;
+      }
+#if defined (STICK_STREAM_SIZE)
+      if (fTrackStream) {
+        fwrite (&iFrameSize, 1, sizeof (int), fTrackStream);
+      }
+#endif//STICK_STREAM_SIZE
+      ++ iActualFrameEncodedCount; // excluding skipped frame time
+    } else {
+      fprintf (stderr, "EncodeFrame(), ret: %d, frame index: %d.\n", iEncFrames, iFrameIdx);
+    }
+
+  }
+
+  if (iActualFrameEncodedCount > 0) {
+    double dElapsed = iTotal / 1e6;
+    printf ("Width:\t\t%d\nHeight:\t\t%d\nFrames:\t\t%d\nencode time:\t%f sec\nFPS:\t\t%f fps\n",
+            sSvcParam.iPicWidth, sSvcParam.iPicHeight,
+            iActualFrameEncodedCount, dElapsed, (iActualFrameEncodedCount * 1.0) / dElapsed);
+#if defined (WINDOWS_PHONE)
+    g_fFPS = (iActualFrameEncodedCount * 1.0f) / (float) dElapsed;
+    g_dEncoderTime = dElapsed;
+    g_iEncodedFrame = iActualFrameEncodedCount;
+#endif
+  }
+INSIDE_MEM_FREE:
+  for (int i = 0; i < sSvcParam.iSpatialLayerNum; ++i) {
+    if (pFpBs[i]) {
+      fclose (pFpBs[i]);
+      pFpBs[i] = NULL;
+    }
+  }
+#if defined (STICK_STREAM_SIZE)
+  if (fTrackStream) {
+    fclose (fTrackStream);
+    fTrackStream = NULL;
+  }
+#endif
+#if defined (COMPARE_DATA)
+  if (fpGolden) {
+    fclose (fpGolden);
+    fpGolden = NULL;
+  }
+#endif
+  // Destruction memory introduced in this routine
+  if (pFileYUV != NULL) {
+    fclose (pFileYUV);
+    pFileYUV = NULL;
+  }
+  if (pYUV) {
+    delete[] pYUV;
+    pYUV = NULL;
+  }
+  if (pSrcPic) {
+    delete pSrcPic;
+    pSrcPic = NULL;
+  }
+  return iRet;
+}
+
+//  Merge from Heifei's Wonder.  Lock process to a single core
+void LockToSingleCore() {
+#ifdef HAVE_PROCESS_AFFINITY
+  //for 2005 compiler, change "DWORD" to "DWORD_PTR"
+  ULONG_PTR ProcessAffMask = 0, SystemAffMask = 0;
+  HANDLE hProcess = GetCurrentProcess();
+
+  GetProcessAffinityMask (hProcess, &ProcessAffMask, &SystemAffMask);
+  if (ProcessAffMask > 1) {
+    // more than one CPU core available. Fix to only one:
+    if (ProcessAffMask & 2) {
+      ProcessAffMask = 2;
+    } else {
+      ProcessAffMask = 1;
+    }
+    // Lock process to a single CPU core
+    SetProcessAffinityMask (hProcess, ProcessAffMask);
+  }
+
+  // set high priority to avoid interrupts during test
+  SetPriorityClass (hProcess, REALTIME_PRIORITY_CLASS);
+#endif
+  return ;
+}
+
+int32_t CreateSVCEncHandle (ISVCEncoder** ppEncoder) {
+  int32_t ret = 0;
+  ret = WelsCreateSVCEncoder (ppEncoder);
+  return ret;
+}
+
+void DestroySVCEncHandle (ISVCEncoder* pEncoder) {
+  if (pEncoder) {
+    WelsDestroySVCEncoder (pEncoder);
+
+  }
+}
+
+/****************************************************************************
+ * main:
+ ****************************************************************************/
+#if defined(ANDROID_NDK) || defined(APPLE_IOS) || defined (WINDOWS_PHONE)
+extern "C" int EncMain (int argc, char** argv)
+#else
+int main (int argc, char** argv)
+#endif
+{
+  ISVCEncoder* pSVCEncoder = NULL;
+  int iRet = 0;
+
+#ifdef _MSC_VER
+  _setmode (_fileno (stdin), _O_BINARY);  /* thanks to Marcoss Morais <morais at dee.ufcg.edu.br> */
+  _setmode (_fileno (stdout), _O_BINARY);
+
+  // remove the LOCK_TO_SINGLE_CORE micro, user need to enable it with manual
+  // LockToSingleCore();
+#endif
+
+  /* Control-C handler */
+  signal (SIGINT, SigIntHandler);
+
+  iRet = CreateSVCEncHandle (&pSVCEncoder);
+  if (iRet) {
+    cout << "WelsCreateSVCEncoder() failed!!" << endl;
+    goto exit;
+  }
+
+  if (argc < 2) {
+    goto exit;
+  } else {
+    if (!strstr (argv[1], ".cfg")) { // check configuration type (like .cfg?)
+      if (argc > 2) {
+        iRet = ProcessEncoding (pSVCEncoder, argc, argv, false);
+        if (iRet != 0)
+          goto exit;
+      } else if (argc == 2 && ! strcmp (argv[1], "-h"))
+        PrintHelp();
+      else {
+        cout << "You specified pCommand is invalid!!" << endl;
+        goto exit;
+      }
+    } else {
+      iRet = ProcessEncoding (pSVCEncoder, argc, argv, true);
+      if (iRet > 0)
+        goto exit;
+    }
+  }
+
+  DestroySVCEncHandle (pSVCEncoder);
+  return 0;
+
+exit:
+  DestroySVCEncHandle (pSVCEncoder);
+  PrintHelp();
+  return 1;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/enc/targets.mk b/third-party/openh264/third_party/openh264/src/codec/console/enc/targets.mk
new file mode 100644
index 0000000000..4a0c64ea30
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/enc/targets.mk
@@ -0,0 +1,19 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+H264ENC_SRCDIR=codec/console/enc
+H264ENC_CPP_SRCS=\
+	$(H264ENC_SRCDIR)/src/welsenc.cpp\
+
+H264ENC_OBJS += $(H264ENC_CPP_SRCS:.cpp=.$(OBJ))
+
+OBJS += $(H264ENC_OBJS)
+
+$(H264ENC_SRCDIR)/%.$(OBJ): $(H264ENC_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(H264ENC_CFLAGS) $(H264ENC_INCLUDES) -c $(CXX_O) $<
+
+h264enc$(EXEEXT): $(H264ENC_OBJS) $(H264ENC_DEPS)
+	$(QUIET_CXX)$(CXX) $(CXX_LINK_O) $(H264ENC_OBJS) $(H264ENC_LDFLAGS) $(LDFLAGS)
+
+binaries: h264enc$(EXEEXT)
+BINARIES += h264enc$(EXEEXT)
diff --git a/third-party/openh264/third_party/openh264/src/codec/console/meson.build b/third-party/openh264/third_party/openh264/src/codec/console/meson.build
new file mode 100644
index 0000000000..727c2c3b77
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/console/meson.build
@@ -0,0 +1,3 @@
+subdir('common')
+subdir('dec')
+subdir('enc')
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/block_add_neon.S b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/block_add_neon.S
new file mode 100644
index 0000000000..fe29e4db91
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/block_add_neon.S
@@ -0,0 +1,129 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro ROW_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input: src_d[0]~[3], output: e_q[0]~[3]; working: $8 $9
+    vaddl.s16       \arg4, \arg0, \arg2         //int32 e[i][0] = src[0] + src[2];
+    vsubl.s16       \arg5, \arg0, \arg2         //int32 e[i][1] = src[0] - src[2];
+    vshr.s16        \arg8, \arg1, #1
+    vshr.s16        \arg9, \arg3, #1
+    vsubl.s16       \arg6, \arg8, \arg3         //int32 e[i][2] = (src[1]>>1)-src[3];
+    vaddl.s16       \arg7, \arg1, \arg9         //int32 e[i][3] = src[1] + (src[3]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_4BYTES  arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7 // both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    vadd.s32        \arg0, \arg4, \arg7         //int16 f[i][0] = e[i][0] + e[i][3];
+    vadd.s32        \arg1, \arg5, \arg6         //int16 f[i][1] = e[i][1] + e[i][2];
+    vsub.s32        \arg2, \arg5, \arg6         //int16 f[i][2] = e[i][1] - e[i][2];
+    vsub.s32        \arg3, \arg4, \arg7         //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+.macro COL_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_q[0]~[3], output: e_q[0]~[3];
+    vadd.s32        \arg4, \arg0, \arg2         //int32 e[0][j] = f[0][j] + f[2][j];
+    vsub.s32        \arg5, \arg0, \arg2         //int32 e[1][j] = f[0][j] - f[2][j];
+    vshr.s32        \arg6, \arg1, #1
+    vshr.s32        \arg7, \arg3, #1
+    vsub.s32        \arg6, \arg6, \arg3         //int32 e[2][j] = (f[1][j]>>1) - f[3][j];
+    vadd.s32        \arg7, \arg1, \arg7         //int32 e[3][j] = f[1][j] + (f[3][j]>>1);
+//  }
+.endm
+
+//  uint8_t *pred, const int32_t stride, int16_t *rs
+WELS_ASM_FUNC_BEGIN IdctResAddPred_neon
+
+    vld4.s16        {d0, d1, d2, d3}, [r2]      // cost 3 cycles!
+
+    ROW_TRANSFORM_1_STEP        d0, d1, d2, d3, q8, q9, q10, q11, d4, d5
+
+    TRANSFORM_4BYTES        q0, q1, q2, q3, q8, q9, q10, q11
+
+    // transform element 32bits
+    vtrn.s32        q0, q1              //[0 1 2 3]+[4 5 6 7]-->[0 4 2 6]+[1 5 3 7]
+    vtrn.s32        q2, q3              //[8 9 10 11]+[12 13 14 15]-->[8 12 10 14]+[9 13 11 15]
+    vswp            d1, d4              //[0 4 2 6]+[8 12 10 14]-->[0 4 8 12]+[2 6 10 14]
+    vswp            d3, d6              //[1 5 3 7]+[9 13 11 15]-->[1 5 9 13]+[3 7 11 15]
+
+    COL_TRANSFORM_1_STEP        q0, q1, q2, q3, q8, q9, q10, q11
+
+    TRANSFORM_4BYTES        q0, q1, q2, q3, q8, q9, q10, q11
+
+    //after clip_table[MAX_NEG_CROP] into [0, 255]
+    mov         r2, r0
+    vld1.32     {d20[0]},[r0],r1
+    vld1.32     {d20[1]},[r0],r1
+    vld1.32     {d22[0]},[r0],r1
+    vld1.32     {d22[1]},[r0]
+
+    vrshrn.s32      d16, q0, #6
+    vrshrn.s32      d17, q1, #6
+    vrshrn.s32      d18, q2, #6
+    vrshrn.s32      d19, q3, #6
+
+    vmovl.u8        q0,d20
+    vmovl.u8        q1,d22
+    vadd.s16        q0,q8
+    vadd.s16        q1,q9
+
+    vqmovun.s16     d20,q0
+    vqmovun.s16     d22,q1
+
+    vst1.32     {d20[0]},[r2],r1
+    vst1.32     {d20[1]},[r2],r1
+    vst1.32     {d22[0]},[r2],r1
+    vst1.32     {d22[1]},[r2]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsBlockZero16x16_neon
+    veor q0, q0
+    veor q1, q1
+    lsl r1, r1, 1
+.rept 16
+    vst1.64 {q0, q1}, [r0], r1
+.endr
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN WelsBlockZero8x8_neon
+    veor q0, q0
+    lsl r1, r1, 1
+.rept 8
+    vst1.64 {q0}, [r0], r1
+.endr
+WELS_ASM_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/intra_pred_neon.S b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/intra_pred_neon.S
new file mode 100644
index 0000000000..2e356ee006
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm/intra_pred_neon.S
@@ -0,0 +1,635 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+//Global macro
+#include "arm_arch_common_macro.S"
+
+//Global macro
+.macro GET_8BYTE_DATA arg0, arg1, arg2
+    vld1.8 {\arg0[0]}, [\arg1], \arg2
+    vld1.8 {\arg0[1]}, [\arg1], \arg2
+    vld1.8 {\arg0[2]}, [\arg1], \arg2
+    vld1.8 {\arg0[3]}, [\arg1], \arg2
+    vld1.8 {\arg0[4]}, [\arg1], \arg2
+    vld1.8 {\arg0[5]}, [\arg1], \arg2
+    vld1.8 {\arg0[6]}, [\arg1], \arg2
+    vld1.8 {\arg0[7]}, [\arg1], \arg2
+.endm
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI16x16LumaPredV_neon
+    //Get the top line data to 'q0'
+    sub  r2, r0, r1
+    vldm r2, {d0, d1}
+
+    mov  r2, r0
+    mov  r3, #4
+    //Set the top line to the each line of MB(16*16)
+loop_0_get_i16x16_luma_pred_v:
+    vst1.8 {d0,d1}, [r2], r1
+    vst1.8 {d0,d1}, [r2], r1
+    vst1.8 {d0,d1}, [r2], r1
+    vst1.8 {d0,d1}, [r2], r1
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_v
+
+WELS_ASM_FUNC_END
+
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI16x16LumaPredH_neon
+    sub  r2, r0, #1
+    mov  r3, #4
+loop_0_get_i16x16_luma_pred_h:
+    //Get one byte data from left side
+    vld1.8 {d0[],d1[]}, [r2], r1
+    vld1.8 {d2[],d3[]}, [r2], r1
+    vld1.8 {d4[],d5[]}, [r2], r1
+    vld1.8 {d6[],d7[]}, [r2], r1
+
+    //Set the line of MB using the left side byte data
+    vst1.8 {d0,d1}, [r0], r1
+    vst1.8 {d2,d3}, [r0], r1
+    vst1.8 {d4,d5}, [r0], r1
+    vst1.8 {d6,d7}, [r0], r1
+
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_h
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI16x16LumaPredDc_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Get the left vertical line data
+    sub r2, r0, #1
+    GET_8BYTE_DATA d0, r2, r1
+    GET_8BYTE_DATA d1, r2, r1
+
+    //Get the top horizontal line data
+    sub  r2, r0, r1
+    vldm r2, {d2, d3}
+
+    //Calculate the sum of top horizontal line data and vertical line data
+    vpaddl.u8 q0, q0
+    vpaddl.u8 q1, q1
+    vadd.u16  q0, q0, q1
+    vadd.u16  d0, d0, d1
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+
+    //Calculate the mean value
+    vrshr.u16  d0, d0, #5
+    vdup.8     q0, d0[0]
+
+    //Set the mean value to the all of member of MB
+    mov  r2, #4
+loop_0_get_i16x16_luma_pred_dc_both:
+    vst1.8 {d0,d1}, [r0], r1
+    vst1.8 {d0,d1}, [r0], r1
+    vst1.8 {d0,d1}, [r0], r1
+    vst1.8 {d0,d1}, [r0], r1
+    subs  r2, #1
+    bne  loop_0_get_i16x16_luma_pred_dc_both
+
+WELS_ASM_FUNC_END
+
+
+
+.align 3
+//The table for SIMD instruction {(8,7,6,5,4,3,2,1) * 5}
+CONST0_GET_I16X16_LUMA_PRED_PLANE: .long 0x191e2328, 0x050a0f14
+
+//The table for SIMD instruction {-7,-6,-5,-4,-3,-2,-1,0}
+CONST1_GET_I16X16_LUMA_PRED_PLANE: .long 0xfcfbfaf9, 0x00fffefd
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI16x16LumaPredPlane_neon
+    //stmdb sp!, { r2-r5, lr}
+
+    //Load the table {(8,7,6,5,4,3,2,1) * 5}
+    adr r2, CONST0_GET_I16X16_LUMA_PRED_PLANE
+    vldr    d0, [r2]
+
+    //Pack the top[-1] ~ top[6] to d1
+    sub       r2,  r0, r1
+    sub       r3,  r2, #1
+    vld1.8    d1, [r3]
+
+    //Pack the top[8] ~ top[15] to d2
+    add       r3, #9
+    vld1.8    d2, [r3]
+
+    //Save the top[15] to d6 for next step
+    vdup.u8   d6,   d2[7]
+
+    //Get and pack left[-1] ~ left[6] to d4
+    sub       r3,  r2, #1
+    GET_8BYTE_DATA d4, r3, r1
+
+    //Get and pack left[8] ~ left[15] to d3
+    add       r3,  r1
+    GET_8BYTE_DATA d3, r3, r1
+
+    //Save the left[15] to d7 for next step
+    vdup.u8   d7,   d3[7]
+
+    //revert the sequence of d2,d3
+    vrev64.8   q1, q1
+
+    vsubl.u8   q2, d3, d4 //q2={left[8]-left[6],left[9]-left[5],left[10]-left[4], ...}
+    vsubl.u8   q1, d2, d1 //q1={top[8]-top[6],top[9]-top[5],top[10]-top[4], ...}
+
+
+    vmovl.u8   q0, d0
+    vmul.s16   q1, q0, q1 //q1 = q1*{(8,7,6,5,4,3,2,1) * 5}
+    vmul.s16   q2, q0, q2 //q2 = q2*{(8,7,6,5,4,3,2,1) * 5}
+
+    //Calculate the sum of items of q1, q2
+    vpadd.s16  d0, d2, d3
+    vpadd.s16  d1, d4, d5
+    vpaddl.s16 q0, q0
+    vpaddl.s32 q0, q0
+
+    //Get the value of 'b', 'c' and extend to q1, q2.
+    vrshr.s64  q0, #6
+    vdup.s16   q1, d0[0]
+    vdup.s16   q2, d1[0]
+
+    //Load the table {-7,-6,-5,-4,-3,-2,-1,0} to d0
+    adr r2, CONST1_GET_I16X16_LUMA_PRED_PLANE
+    vld1.32   {d0}, [r2]
+
+    //Get the value of 'a' and save to q3
+    vaddl.u8  q3, d6, d7
+    vshl.u16  q3, #4
+
+    //calculate a+'b'*{-7,-6,-5,-4,-3,-2,-1,0} + c*{-7}
+    vmovl.s8  q0, d0
+    vmla.s16  q3, q0, q1
+    vmla.s16  q3, q2, d0[0]
+
+    //Calculate a+'b'*{1,2,3,4,5,6,7,8} + c*{-7}
+    vshl.s16  q8, q1, #3
+    vadd.s16  q8, q3
+
+    //right shift 5 bits and rounding
+    vqrshrun.s16 d0, q3, #5
+    vqrshrun.s16 d1, q8, #5
+
+    //Set the line of MB
+    vst1.u32  {d0,d1}, [r0], r1
+
+
+    //Do the same processing for setting other lines
+    mov  r2, #15
+loop_0_get_i16x16_luma_pred_plane:
+    vadd.s16  q3, q2
+    vadd.s16  q8, q2
+    vqrshrun.s16 d0, q3, #5
+    vqrshrun.s16 d1, q8, #5
+    vst1.u32  {d0,d1}, [r0], r1
+    subs  r2, #1
+    bne  loop_0_get_i16x16_luma_pred_plane
+
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredV_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub  r2, r0, r1
+    ldr  r2, [r2]
+
+    //Set the luma MB using top line
+    str  r2, [r0], r1
+    str  r2, [r0], r1
+    str  r2, [r0], r1
+    str  r2, [r0]
+
+WELS_ASM_FUNC_END
+
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredH_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the left column (4 bytes)
+    sub  r2, r0, #1
+    vld1.8 {d0[]}, [r2], r1
+    vld1.8 {d1[]}, [r2], r1
+    vld1.8 {d2[]}, [r2], r1
+    vld1.8 {d3[]}, [r2]
+
+    //Set the luma MB using the left side byte
+    vst1.32 {d0[0]}, [r0], r1
+    vst1.32 {d1[0]}, [r0], r1
+    vst1.32 {d2[0]}, [r0], r1
+    vst1.32 {d3[0]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredDDL_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row data(8 bytes)
+    sub    r2,  r0, r1
+    vld1.32  {d0}, [r2]
+
+    //For "t7 + (t7<<1)"
+    vdup.8   d1,  d0[7]
+
+    //calculate "t0+t1,t1+t2,t2+t3...t6+t7,t7+t7"
+    vext.8   d1,  d0, d1, #1
+    vaddl.u8 q1,  d1, d0
+
+    //calculate "x,t0+t1+t1+t2,t1+t2+t2+t3,...t5+t6+t6+t7,t6+t7+t7+t7"
+    vext.8   q2,  q1, q1, #14
+    vadd.u16 q0,  q1, q2
+
+    //right shift 2 bits and rounding
+    vqrshrn.u16  d0,  q0, #2
+
+    //Save "ddl0, ddl1, ddl2, ddl3"
+    vext.8   d1, d0, d0, #1
+    vst1.32  d1[0], [r0], r1
+
+    //Save "ddl1, ddl2, ddl3, ddl4"
+    vext.8   d1, d0, d0, #2
+    vst1.32  d1[0], [r0], r1
+
+    //Save "ddl2, ddl3, ddl4, ddl5"
+    vext.8   d1, d0, d0, #3
+    vst1.32  d1[0], [r0], r1
+
+    //Save "ddl3, ddl4, ddl5, ddl6"
+    vst1.32  d0[1], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredDDR_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub    r2,  r0, r1
+    vld1.32  {d0[1]}, [r2]
+
+    //Load the left column (5 bytes)
+    sub    r2,  #1
+    vld1.8 {d0[3]}, [r2], r1
+    vld1.8 {d0[2]}, [r2], r1
+    vld1.8 {d0[1]}, [r2], r1
+    vld1.8 {d0[0]}, [r2], r1
+    vld1.8 {d1[7]}, [r2] //For packing the right sequence to do SIMD processing
+
+
+    vext.8   d2, d1, d0, #7   //d0:{L2,L1,L0,LT,T0,T1,T2,T3}
+                              //d2:{L3,L2,L1,L0,LT,T0,T1,T2}
+
+    //q2:{L2+L3,L1+L2,L0+L1...T1+T2,T2+T3}
+    vaddl.u8 q2, d2, d0
+
+    //q1:{TL0+LT0,LT0+T01,...L12+L23}
+    vext.8   q3, q3, q2, #14
+    vadd.u16 q1, q2, q3
+
+    //right shift 2 bits and rounding
+    vqrshrn.u16 d0, q1, #2
+
+    //Adjust the data sequence for setting luma MB of 'pred'
+    vst1.32   d0[1], [r0], r1
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0], r1
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0], r1
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0]
+
+WELS_ASM_FUNC_END
+
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredVL_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (8 bytes)
+    sub    r2,  r0, r1
+    vld1.32  {d0}, [r2]
+
+
+    vext.8   d1,  d0, d0, #1
+    vaddl.u8 q1,  d1, d0     //q1:{t0+t1,t1+t2,t2+t3...t5+t6,x,x}
+
+    vext.8   q2,  q1, q1, #2
+    vadd.u16 q2,  q1, q2     //q2:{t0+t1+t1+t2,t1+t2+t2+t3,...t4+t5+t5+t6,x,x}
+
+    //calculate the "vl0,vl1,vl2,vl3,vl4"
+    vqrshrn.u16  d0,  q1, #1
+
+    //calculate the "vl5,vl6,vl7,vl8,vl9"
+    vqrshrn.u16  d1,  q2, #2
+
+    //Adjust the data sequence for setting the luma MB
+    vst1.32  d0[0], [r0], r1
+    vst1.32  d1[0], [r0], r1
+    vext.8   d0,  d0, d0, #1
+    vext.8   d1,  d1, d1, #1
+    vst1.32  d0[0], [r0], r1
+    vst1.32  d1[0], [r0]
+
+WELS_ASM_FUNC_END
+
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredVR_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub       r2,  r0, r1
+    vld1.32   {d0[1]}, [r2]
+
+    //Load the left column (4 bytes)
+    sub       r2,  #1
+    vld1.8    {d0[3]}, [r2], r1
+    vld1.8    {d0[2]}, [r2], r1
+    vld1.8    {d0[1]}, [r2], r1
+    vld1.8    {d0[0]}, [r2]
+
+
+    vext.8    d1, d0, d0, #7
+    vaddl.u8  q1, d0, d1      //q1:{X,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2,T2+T3}
+
+    vext.u8   q2, q1, q1, #14
+    vadd.u16  q2, q2, q1      //q2:{X,L2+L1+L1+L0,L1+L0+L0+LT,...T1+T2+T2+T3}
+
+    //Calculate the vr0 ~ vr9
+    vqrshrn.u16 d1, q2, #2
+    vqrshrn.u16 d0, q1, #1
+
+    //Adjust the data sequence for setting the luma MB
+    vst1.32  d0[1], [r0], r1
+    vst1.32  d1[1], [r0], r1
+    add    r2, r0, r1
+    vst1.8   d1[3], [r0]!
+    vst1.16  d0[2], [r0]!
+    vst1.8   d0[6], [r0]!
+    vst1.8   d1[2], [r2]!
+    vst1.16  d1[2], [r2]!
+    vst1.8   d1[6], [r2]
+WELS_ASM_FUNC_END
+
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredHU_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the left column data
+    sub       r2,  r0, #1
+    mov       r3,  #3
+    mul       r3,  r1
+    add       r3,  r2
+    vld1.8    {d0[]},  [r3]
+    vld1.8    {d0[4]}, [r2], r1
+    vld1.8    {d0[5]}, [r2], r1
+    vld1.8    {d0[6]}, [r2], r1 //d0:{L3,L3,L3,L3,L0,L1,L2,L3}
+
+    vext.8    d1, d0, d0, #1
+    vaddl.u8  q2, d0, d1        //q2:{L3+L3,L3+L3,L3+L3,L3+L0,L0+L1,L1+L2,L2+L3,L3+L3}
+
+    vext.u8   d2, d5, d4, #2
+    vadd.u16  d3, d2, d5        //d3:{L0+L1+L1+L2,L1+L2+L2+L3,L2+L3+L3+L3,L3+L3+L3+L3}
+
+    //Calculate the hu0 ~ hu5
+    vqrshrn.u16 d2, q2, #1
+    vqrshrn.u16 d1, q1, #2
+
+    //Adjust the data sequence for setting the luma MB
+    vzip.8   d2, d1
+    vst1.32  d1[0], [r0], r1
+    vext.8   d2, d1, d1, #2
+    vst1.32  d2[0], [r0], r1
+    vst1.32  d1[1], [r0], r1
+    vst1.32  d0[0], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderI4x4LumaPredHD_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the data
+    sub       r2,  r0, r1
+    sub       r2,  #1
+    vld1.32   {d0[1]}, [r2], r1
+    vld1.8    {d0[3]}, [r2], r1
+    vld1.8    {d0[2]}, [r2], r1
+    vld1.8    {d0[1]}, [r2], r1
+    vld1.8    {d0[0]}, [r2]     //d0:{L3,L2,L1,L0,LT,T0,T1,T2}
+
+
+    vext.8    d1, d0, d0, #7
+    vaddl.u8  q1, d0, d1        //q1:{x,L3+L2,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2}
+
+    vext.u8   q2, q1, q1, #14   //q2:{x,x, L3+L2,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1}
+    vadd.u16  q3, q2, q1        //q3:{x,x,L3+L2+L2+L1,L2+L1+L1+L0,L1+L0+L0+LT,L0+LT+LT+T0,LT+T0+T0+T1,T0+T1+T1+T2}
+
+    //Calculate the hd0~hd9
+    vqrshrn.u16 d1, q3, #2
+    vqrshrn.u16 d0, q2, #1
+
+    //Adjust the data sequence for setting the luma MB
+    vmov      d3, d1
+    vtrn.8    d0, d1
+    vext.u8   d2, d1, d1, #6
+    vst2.16  {d2[3], d3[3]}, [r0], r1
+    vst2.16  {d0[2], d1[2]}, [r0], r1
+    vmov     d3, d0
+    vst2.16  {d2[2], d3[2]}, [r0], r1
+    vst2.16  {d0[1], d1[1]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderIChromaPredV_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Get the top row (8 byte)
+    sub  r2, r0, r1
+    vldr d0, [r2]
+
+    //Set the chroma MB using top row data
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d0}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderIChromaPredH_neon
+    //stmdb sp!, { r2-r5, lr}
+    ////Get the left column (8 byte)
+    sub  r2, r0, #1
+    vld1.8 {d0[]}, [r2], r1
+    vld1.8 {d1[]}, [r2], r1
+    vld1.8 {d2[]}, [r2], r1
+    vld1.8 {d3[]}, [r2], r1
+    vld1.8 {d4[]}, [r2], r1
+    vld1.8 {d5[]}, [r2], r1
+    vld1.8 {d6[]}, [r2], r1
+    vld1.8 {d7[]}, [r2]
+
+    //Set the chroma MB using left column data
+    vst1.8 {d0}, [r0], r1
+    vst1.8 {d1}, [r0], r1
+    vst1.8 {d2}, [r0], r1
+    vst1.8 {d3}, [r0], r1
+    vst1.8 {d4}, [r0], r1
+    vst1.8 {d5}, [r0], r1
+    vst1.8 {d6}, [r0], r1
+    vst1.8 {d7}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDecoderIChromaPredDc_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the left column data (8 bytes)
+    sub r2, r0, #1
+    GET_8BYTE_DATA d0, r2, r1
+
+    //Load the top row data (8 bytes)
+    sub  r2, r0, r1
+    vldr d1, [r2]
+
+    //Calculate the sum of left column and top row
+    vpaddl.u8  q0, q0
+    vpaddl.u16 q0, q0
+    vadd.u32   d2, d0, d1 //'m1' save to d2
+
+    vrshr.u32  q0, q0, #2 //calculate 'm2','m3'
+    vrshr.u32  d2, d2, #3 //calculate 'm4'
+
+    //duplicate the 'mx' to a vector line
+    vdup.8     d4, d2[0]
+    vdup.8     d5, d1[4]
+    vdup.8     d6, d0[4]
+    vdup.8     d7, d2[4]
+
+    //Set the chroma MB
+    vst2.32 {d4[0],d5[0]}, [r0], r1
+    vst2.32 {d4[0],d5[0]}, [r0], r1
+    vst2.32 {d4[0],d5[0]}, [r0], r1
+    vst2.32 {d4[0],d5[0]}, [r0], r1
+    vst2.32 {d6[0],d7[0]}, [r0], r1
+    vst2.32 {d6[0],d7[0]}, [r0], r1
+    vst2.32 {d6[0],d7[0]}, [r0], r1
+    vst2.32 {d6[0],d7[0]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+//Table {{1,2,3,4,1,2,3,4}*17}
+CONST0_GET_I_CHROMA_PRED_PLANE: .long 0x44332211, 0x44332211//0x140f0a05, 0x28231e19
+//Table {-3,-2,-1,0,1,2,3,4}
+CONST1_GET_I_CHROMA_PRED_PLANE: .long 0xfffefffd, 0x0000ffff,0x00020001,0x00040003
+
+WELS_ASM_FUNC_BEGIN WelsDecoderIChromaPredPlane_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row data
+    sub  r2, r0, #1
+    sub  r2, r1
+    vld1.32 {d1[0]}, [r2]
+    add  r2, #5
+    vld1.32 {d0[0]}, [r2]
+
+    //Load the left column data
+    sub  r2, #5
+    vld1.8 {d1[4]}, [r2], r1
+    vld1.8 {d1[5]}, [r2], r1
+    vld1.8 {d1[6]}, [r2], r1
+    vld1.8 {d1[7]}, [r2], r1 //d1:{LT,T0,T1,T2,LT,L0,L1,L2}
+    add  r2, r1
+    vld1.8 {d0[4]}, [r2], r1
+    vld1.8 {d0[5]}, [r2], r1
+    vld1.8 {d0[6]}, [r2], r1
+    vld1.8 {d0[7]}, [r2]     //d0:{T4,T5,T6,T7,L4,L5,L6.L7}
+
+
+    //Save T7 to d3 for next step
+    vdup.u8   d3,   d0[3]
+    //Save L7 to d4 for next step
+    vdup.u8   d4,   d0[7]
+
+    //Calculate the value of 'a' and save to q2
+    vaddl.u8  q2, d3, d4
+    vshl.u16  q2, #4
+
+    //Load the table {{1,2,3,4,1,2,3,4}*17}
+    adr r2, CONST0_GET_I_CHROMA_PRED_PLANE
+    vld1.32   {d2}, [r2]
+
+    //Calculate the 'b','c', and save to q0
+    vrev32.8  d1, d1
+    vsubl.u8  q0, d0, d1
+    vmovl.u8   q1, d2
+    vmul.s16   q0, q1
+    vpaddl.s16 q0, q0
+    vpaddl.s32 q0, q0
+    vrshr.s64  q0, #5
+
+    //Load the table {-3,-2,-1,0,1,2,3,4} to q3
+    adr r2, CONST1_GET_I_CHROMA_PRED_PLANE
+    vld1.32   {d6, d7}, [r2]
+
+    //Duplicate the 'b','c' to q0, q1 for SIMD instruction
+    vdup.s16   q1, d1[0]
+    vdup.s16   q0, d0[0]
+
+    //Calculate the "(a + b * (j - 3) + c * (- 3) + 16) >> 5;"
+    vmla.s16   q2, q0, q3
+    vmla.s16   q2, q1, d6[0]
+    vqrshrun.s16 d0, q2, #5
+
+    //Set a line of chroma MB
+    vst1.u32  {d0}, [r0], r1
+
+    //Do the same processing for each line.
+    mov  r2, #7
+loop_0_get_i_chroma_pred_plane:
+    vadd.s16   q2, q1
+    vqrshrun.s16 d0, q2, #5
+    vst1.u32  {d0}, [r0], r1
+    subs  r2, #1
+    bne  loop_0_get_i_chroma_pred_plane
+
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/block_add_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/block_add_aarch64_neon.S
new file mode 100644
index 0000000000..417961ee9b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/block_add_aarch64_neon.S
@@ -0,0 +1,131 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro ROW_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input: src_d[0]~[3], output: e_q[0]~[3]; working: \arg8\() \arg9\()
+
+    saddl       \arg4\().4s, \arg0\().4h, \arg2\().4h          //int32 e[i][0] = src[0] + src[2];
+    ssubl       \arg5\().4s, \arg0\().4h, \arg2\().4h          //int32 e[i][1] = src[0] - src[2];
+    sshr        \arg8\().4h, \arg1\().4h, #1
+    sshr        \arg9\().4h, \arg3\().4h, #1
+    ssubl       \arg6\().4s, \arg8\().4h, \arg3\().4h          //int32 e[i][2] = (src[1]>>1)-src[3];
+    saddl       \arg7\().4s, \arg1\().4h, \arg9\().4h          //int32 e[i][3] = src[1] + (src[3]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_4BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+// both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    add       \arg0\().4s, \arg4\().4s, \arg7\().4s          //int16 f[i][0] = e[i][0] + e[i][3];
+    add       \arg1\().4s, \arg5\().4s, \arg6\().4s          //int16 f[i][1] = e[i][1] + e[i][2];
+    sub       \arg2\().4s, \arg5\().4s, \arg6\().4s          //int16 f[i][2] = e[i][1] - e[i][2];
+    sub       \arg3\().4s, \arg4\().4s, \arg7\().4s          //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+.macro COL_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_q[0]~[3], output: e_q[0]~[3];
+    add        \arg4\().4s, \arg0\().4s, \arg2\().4s          //int32 e[0][j] = f[0][j] + f[2][j];
+    sub        \arg5\().4s, \arg0\().4s, \arg2\().4s          //int32 e[1][j] = f[0][j] - f[2][j];
+    sshr        \arg6\().4s, \arg1\().4s, #1
+    sshr        \arg7\().4s, \arg3\().4s, #1
+    sub        \arg6\().4s, \arg6\().4s, \arg3\().4s          //int32 e[2][j] = (f[1][j]>>1) - f[3][j];
+    add        \arg7\().4s, \arg1\().4s, \arg7\().4s          //int32 e[3][j] = f[1][j] + (f[3][j]>>1);
+//  }
+.endm
+
+//  uint8_t *pred, const int32_t stride, int16_t *rs
+WELS_ASM_AARCH64_FUNC_BEGIN IdctResAddPred_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    ld4        {v0.4h, v1.4h, v2.4h, v3.4h}, [x2]      // cost 3 cycles!
+    ROW_TRANSFORM_1_STEP        v0, v1, v2, v3, v16, v17, v18, v19, v4, v5
+    TRANSFORM_4BYTES        v0, v1, v2, v3, v16, v17, v18, v19
+    // transform element 32bits
+    trn1        v16.4s, v0.4s, v1.4s //[0 1 2 3]+[4 5 6 7]-->[0 4 2 6]
+    trn2        v17.4s, v0.4s, v1.4s //[0 1 2 3]+[4 5 6 7]-->[1 5 3 7]
+    trn1        v18.4s, v2.4s, v3.4s //[8 9 10 11]+[12 13 14 15]-->[8 12 10 14]
+    trn2        v19.4s, v2.4s, v3.4s //[8 9 10 11]+[12 13 14 15]-->[9 13 11 15]
+    trn1        v0.2d, v16.2d, v18.2d //[0 4 2 6]+[8 12 10 14]-->[0 4 8 12]
+    trn2        v2.2d, v16.2d, v18.2d //[0 4 2 6]+[8 12 10 14]-->[2 6 10 14]
+    trn1        v1.2d, v17.2d, v19.2d //[1 5 3 7]+[9 13 11 15]-->[1 5 9 13]
+    trn2        v3.2d, v17.2d, v19.2d //[1 5 3 7]+[9 13 11 15]-->[3 7 11 15]
+    COL_TRANSFORM_1_STEP        v0, v1, v2, v3, v16, v17, v18, v19
+
+    TRANSFORM_4BYTES        v0, v1, v2, v3, v16, v17, v18, v19
+    //after clip_table[MAX_NEG_CROP] into [0, 255]
+    mov         x2, x0
+    ld1     {v16.s}[0],[x0],x1
+    ld1     {v16.s}[1],[x0],x1
+    ld1     {v17.s}[0],[x0],x1
+    ld1     {v17.s}[1],[x0]
+
+    rshrn     v0.4h, v0.4s, #6
+    rshrn2    v0.8h, v1.4s, #6
+    rshrn     v1.4h, v2.4s, #6
+    rshrn2    v1.8h, v3.4s, #6
+
+    uxtl      v2.8h,v16.8b
+    uxtl      v3.8h,v17.8b
+    add        v2.8h, v2.8h, v0.8h
+    add        v3.8h, v3.8h, v1.8h
+
+    sqxtun     v0.8b,v2.8h
+    sqxtun     v1.8b,v3.8h
+
+    st1     {v0.s}[0],[x2],x1
+    st1     {v0.s}[1],[x2],x1
+    st1     {v1.s}[0],[x2],x1
+    st1     {v1.s}[1],[x2]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsBlockZero16x16_AArch64_neon
+    eor v0.16b, v0.16b, v0.16b
+    eor v1.16b, v1.16b, v1.16b
+    SIGN_EXTENSION x1,w1
+    lsl x1, x1, 1
+.rept 16
+    st1 {v0.16b, v1.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsBlockZero8x8_AArch64_neon
+    eor v0.16b, v0.16b, v0.16b
+    SIGN_EXTENSION x1, w1
+    lsl x1, x1, 1
+.rept 8
+    st1 {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/intra_pred_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
new file mode 100644
index 0000000000..f8f9e03c7e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/arm64/intra_pred_aarch64_neon.S
@@ -0,0 +1,524 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+// for Luma 4x4
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredH_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, #1
+.rept 4
+    ld1r    {v0.8b}, [x2], x1
+    st1     {v0.S}[0], [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredDc_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     x3, x0, #1
+    ldr     s0, [x2]
+    ld1     {v0.b}[4], [x3], x1
+    ld1     {v0.b}[5], [x3], x1
+    ld1     {v0.b}[6], [x3], x1
+    ld1     {v0.b}[7], [x3]
+    uaddlv  h0, v0.8b
+    uqrshrn b0, h0, #3
+    dup     v0.8b, v0.b[0]
+.rept 4
+    st1     {v0.S}[0], [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredDcTop_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     v0.8b, v0.8b, v0.8b
+    ldr     s0, [x2]
+    uaddlv  h0, v0.8b
+    uqrshrn v0.8b, v0.8h, #2
+    dup     v0.8b, v0.b[0]
+.rept 4
+    st1     {v0.S}[0], [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredDDL_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+    dup     v1.8b, v0.b[7]
+    ext     v2.8b, v0.8b, v1.8b, #1
+    ext     v3.8b, v0.8b, v1.8b, #2
+    ushll   v2.8h, v2.8b, #1
+    uaddl   v1.8h, v3.8b, v0.8b
+    add     v1.8h, v1.8h, v2.8h
+    uqrshrn v1.8b, v1.8h, #2
+    st1     {v1.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #1
+    st1     {v0.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #2
+    st1     {v0.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #3
+    st1     {v0.S}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredDDLTop_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+    dup     v1.8b, v0.b[3]
+    mov     v0.S[1], v1.S[0]
+    ext     v2.8b, v0.8b, v1.8b, #1
+    ext     v3.8b, v0.8b, v1.8b, #2
+    ushll   v2.8h, v2.8b, #1
+    uaddl   v1.8h, v3.8b, v0.8b
+    add     v1.8h, v1.8h, v2.8h
+    uqrshrn v1.8b, v1.8h, #2
+    st1     {v1.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #1
+    st1     {v0.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #2
+    st1     {v0.S}[0], [x0], x1
+    ext     v0.8b, v1.8b, v2.8b, #3
+    st1     {v0.S}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredVL_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v1.8h, v1.8b, v0.8b
+    uqrshrn v0.8b, v1.8h, #1           // v0.8b is VL0, VL1, VL2, VL3, VL4, ...
+    ext     v2.16b, v1.16b, v1.16b, #2
+    add     v1.8h, v2.8h, v1.8h
+    uqrshrn v1.8b, v1.8h, #2          // v1.8b is VL5, VL6, VL7, VL8, VL9
+    st1     {v0.s}[0], [x0], x1 // write the first row
+    st1     {v1.s}[0], [x0], x1 // write the second row
+    ext     v3.8b, v0.8b, v0.8b, #1
+    ext     v2.8b, v1.8b, v1.8b, #1
+    st1     {v3.s}[0], [x0], x1 // write the third row
+    st1     {v2.s}[0], [x0]     // write the fourth row
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredVLTop_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+    dup     v1.8b, v0.b[3]
+    mov     v0.s[1], v1.s[0]
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v1.8h, v1.8b, v0.8b
+    uqrshrn v0.8b, v1.8h, #1           // v0.8b is VL0, VL1, VL2, VL3, VL4, ...
+    ext     v2.16b, v1.16b, v1.16b, #2
+    add     v1.8h, v2.8h, v1.8h
+    uqrshrn v1.8b, v1.8h, #2          // v1.8b is VL5, VL6, VL7, VL8, VL9
+    st1     {v0.s}[0], [x0], x1 // write the first row
+    st1     {v1.s}[0], [x0], x1 // write the second row
+    ext     v3.8b, v0.8b, v0.8b, #1
+    ext     v2.8b, v1.8b, v1.8b, #1
+    st1     {v3.s}[0], [x0], x1 // write the third row
+    st1     {v2.s}[0], [x0]     // write the fourth row
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredVR_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.s}[1], [x2]
+    sub     x2, x2, #1
+    ld1     {v0.b}[3], [x2], x1
+    ld1     {v0.b}[2], [x2], x1
+    ld1     {v0.b}[1], [x2], x1
+    ld1     {v0.b}[0], [x2]         // v0.8b l2, l1, l0, lt, t0, t1, t2, t3
+
+    ext     v1.8b, v0.8b, v0.8b, #7
+    uaddl   v2.8h, v1.8b, v0.8b     //v2:{X,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2,T2+T3}
+    ext     v1.16b, v2.16b, v2.16b, #14
+    add     v3.8h, v2.8h, v1.8h     //v3:{X,L2+L1+L1+L0,L1+L0+L0+LT,...T1+T2+T2+T3}
+
+    uqrshrn v3.8b, v3.8h, #2
+    uqrshrn v2.8b, v2.8h, #1
+
+    st1     {v2.s}[1], [x0], x1
+    st1     {v3.s}[1], [x0], x1
+
+    ext     v2.8b, v2.8b, v2.8b, #7
+    ins     v2.b[4], v3.b[3]
+    st1     {v2.s}[1], [x0], x1
+
+    ext     v3.8b, v3.8b, v3.8b, #7
+    ins     v3.b[4], v3.b[3]
+    st1     {v3.s}[1], [x0], x1
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredHU_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, #1
+    mov     x3, #3
+    mul     x3, x3, x1
+    add     x3, x3, x2
+    ld1r    {v0.8b}, [x3]
+    ld1     {v0.b}[4], [x2], x1
+    ld1     {v0.b}[5], [x2], x1
+    ld1     {v0.b}[6], [x2], x1     //d0:{L3,L3,L3,L3,L0,L1,L2,L3}
+
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v2.8h, v0.8b, v1.8b     //v2:{L3+L3,L3+L3,L3+L3,L3+L0,L0+L1,L1+L2,L2+L3,L3+L3}
+    ext     v3.16b, v2.16b, v2.16b, #2
+    add     v3.8h, v3.8h, v2.8h     //v2:{x, HU1, HU3, HU5, x}
+
+    uqrshrn v2.8b, v2.8h, #1 // HU0, HU2, HU4
+    uqrshrn v3.8b, v3.8h, #2 // HU1, HU3, HU5
+    zip2    v3.8b, v2.8b, v3.8b // HU0, HU1, HU2, HU3, HU4, HU5
+    mov     v3.h[3], v0.h[0] // v0.8b is hu0, hu1, hu2, hu3, hu4, hu5, l3, l3
+    ext     v2.8b, v3.8b, v0.8b, #2
+    st1     {v3.s}[0], [x0], x1
+    st1     {v2.s}[0], [x0], x1
+    st1     {v3.s}[1], [x0], x1
+    st1     {v0.s}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI4x4LumaPredHD_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, #1
+    sub     x2, x2, x1 // x2 points to top left
+    ld1     {v0.s}[1], [x2], x1
+    ld1     {v0.b}[3], [x2], x1
+    ld1     {v0.b}[2], [x2], x1
+    ld1     {v0.b}[1], [x2], x1
+    ld1     {v0.b}[0], [x2]         // v0.8b: l3, l2, l1, l0, lt, t0, t1, t2
+    ext     v1.8b, v0.8b, v0.8b, #1 // v1.8b: l2, l1, l0, lt, t0, t1, t2, l3
+    uaddl   v2.8h, v0.8b, v1.8b
+    ext     v3.16b, v2.16b, v2.16b, #2
+    add     v3.8h, v3.8h, v2.8h
+    uqrshrn v2.8b, v2.8h, #1  // hd8, hd6, hd4, hd0, xxx
+    uqrshrn v3.8b, v3.8h, #2 // hd9, hd7, hd5, hd1, hd2, hd3
+    zip1    v2.8b, v2.8b, v3.8b // hd8, hd9, hd6, hd7, hd4, hd5, hd0, hd1
+    mov     v1.h[0], v3.h[2]
+    ext     v3.8b, v2.8b, v1.8b, #6
+    st1     {v3.s}[0], [x0], x1
+    st1     {v2.s}[1], [x0], x1
+    ext     v3.8b, v2.8b, v1.8b, #2
+    st1     {v3.s}[0], [x0], x1
+    st1     {v2.s}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+// for Chroma 8x8
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredV_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+.rept   8
+    st1     {v0.8b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredH_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, #1
+.rept 8
+    ld1r    {v0.8b}, [x2], x1
+    st1     {v0.8b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredDc_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     x3, x0, #1
+    ld1     {v0.8b}, [x2]
+    ld1     {v0.b}[8], [x3], x1
+    ld1     {v0.b}[9], [x3], x1
+    ld1     {v0.b}[10], [x3], x1
+    ld1     {v0.b}[11], [x3], x1
+    ld1     {v0.b}[12], [x3], x1
+    ld1     {v0.b}[13], [x3], x1
+    ld1     {v0.b}[14], [x3], x1
+    ld1     {v0.b}[15], [x3]
+
+    uaddlp  v1.8h, v0.16b
+    uaddlp  v2.4s, v1.8h
+    ins     v3.d[0], v2.d[1]
+    add     v3.2s, v2.2s, v3.2s
+    urshr   v2.4s, v2.4s, #2
+    urshr   v3.2s, v3.2s, #3
+
+    dup     v0.8b, v3.b[0]
+    dup     v1.8b, v2.b[4]
+    dup     v2.8b, v2.b[12]
+    dup     v3.8b, v3.b[4]
+    ins     v0.s[1], v1.s[0]
+    ins     v2.s[1], v3.s[0]
+.rept 4
+    st1     {v0.8b}, [x0], x1
+.endr
+.rept 4
+    st1     {v2.8b}, [x0], x1
+.endr
+
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredDcTop_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.8b}, [x2]
+    uaddlp  v0.4h, v0.8b
+    addp    v0.8h, v0.8h, v0.8h
+    dup     v1.8h, v0.h[0]
+    dup     v2.8h, v0.h[1]
+    mov     v1.D[1], v2.D[0]
+    uqrshrn  v1.8b, v1.8h, #2
+.rept 8
+    st1     {v1.8b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+.align 4
+intra_1_to_4: .short 17*1, 17*2, 17*3, 17*4, 17*1, 17*2, 17*3, 17*4
+intra_m3_to_p4: .short -3, -2, -1, 0, 1, 2, 3, 4
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderIChromaPredPlane_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     x2, x2, #1
+    mov     x3, x2
+    // load pTop[2-i] and pLeft[(2-i)*kiStride]
+    ld1     {v1.b}[3], [x2], #1
+    ld1     {v1.b}[2], [x2], #1
+    ld1     {v1.b}[1], [x2], #1
+    ld1     {v1.b}[0], [x2], #1
+    ld1     {v1.b}[7], [x3], x1
+    ld1     {v1.b}[6], [x3], x1
+    ld1     {v1.b}[5], [x3], x1
+    ld1     {v1.b}[4], [x3], x1
+    add     x2, x2, #1
+    add     x3, x3, x1
+    // load pTop[4+i] and pLeft[(4+i)*kiStride]
+    ld1     {v0.b}[0], [x2], #1
+    ld1     {v0.b}[1], [x2], #1
+    ld1     {v0.b}[2], [x2], #1
+    ld1     {v0.b}[3], [x2], #1
+    ld1     {v0.b}[4], [x3], x1
+    ld1     {v0.b}[5], [x3], x1
+    ld1     {v0.b}[6], [x3], x1
+    ld1     {v0.b}[7], [x3], x1
+
+    uxtl    v1.8h, v1.8b
+    uxtl    v0.8h, v0.8b
+    ldr     q2, intra_1_to_4
+    ldr     q3, intra_m3_to_p4
+    dup     v4.8h, v0.h[3]
+    dup     v5.8h, v0.h[7]
+    add     v4.8h, v4.8h, v5.8h
+    sub     v0.8h, v0.8h, v1.8h
+    shl     v4.8h, v4.8h, #4 // v4.8h is a
+    mul     v0.8h, v0.8h, v2.8h // v0.h[0-3] is H, v0.h[4-7] is V
+    saddlp  v0.4s, v0.8h
+    addp    v0.4s, v0.4s, v0.4s // v0.s[0] is H, v0.s[1] is V
+    sqrshrn v0.4h, v0.4s, #5
+    dup     v1.8h, v0.h[0]      // v1.8h is b
+    dup     v0.8h, v0.h[1]      // v0.8h is c
+    mla     v4.8h, v1.8h, v3.8h
+    mla     v4.8h, v0.8h, v3.h[0]
+    sqrshrun v1.8b, v4.8h, #5
+    st1     {v1.8b}, [x0], x1
+.rept 7
+    add     v4.8h, v4.8h, v0.8h
+    sqrshrun v1.8b, v4.8h, #5
+    st1     {v1.8b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+//for Luma 16x16
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredV_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.16b}, [x2]
+.rept 16
+    st1     {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredH_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, #1
+.rept 16
+    ld1r    {v0.16b}, [x2], x1
+    st1     {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredDc_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     x3, x0, #1
+    ld1     {v0.16b}, [x2]
+    ld1     {v1.b}[0], [x3], x1
+    ld1     {v1.b}[1], [x3], x1
+    ld1     {v1.b}[2], [x3], x1
+    ld1     {v1.b}[3], [x3], x1
+    ld1     {v1.b}[4], [x3], x1
+    ld1     {v1.b}[5], [x3], x1
+    ld1     {v1.b}[6], [x3], x1
+    ld1     {v1.b}[7], [x3], x1
+    ld1     {v1.b}[8], [x3], x1
+    ld1     {v1.b}[9], [x3], x1
+    ld1     {v1.b}[10], [x3], x1
+    ld1     {v1.b}[11], [x3], x1
+    ld1     {v1.b}[12], [x3], x1
+    ld1     {v1.b}[13], [x3], x1
+    ld1     {v1.b}[14], [x3], x1
+    ld1     {v1.b}[15], [x3]
+    // reduce instruction
+    uaddlv    h0, v0.16b
+    uaddlv    h1, v1.16b
+    add       v0.8h, v0.8h, v1.8h
+    uqrshrn    b0, h0, #5
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredDcTop_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    ld1     {v0.16b}, [x2]
+    // reduce instruction
+    uaddlv    h0, v0.16b
+    uqrshrn    v0.8b, v0.8h, 4
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredDcLeft_AArch64_neon
+    sxtw    x1, w1
+    sub     x3, x0, #1
+    ld1     {v1.b}[0], [x3], x1
+    ld1     {v1.b}[1], [x3], x1
+    ld1     {v1.b}[2], [x3], x1
+    ld1     {v1.b}[3], [x3], x1
+    ld1     {v1.b}[4], [x3], x1
+    ld1     {v1.b}[5], [x3], x1
+    ld1     {v1.b}[6], [x3], x1
+    ld1     {v1.b}[7], [x3], x1
+    ld1     {v1.b}[8], [x3], x1
+    ld1     {v1.b}[9], [x3], x1
+    ld1     {v1.b}[10], [x3], x1
+    ld1     {v1.b}[11], [x3], x1
+    ld1     {v1.b}[12], [x3], x1
+    ld1     {v1.b}[13], [x3], x1
+    ld1     {v1.b}[14], [x3], x1
+    ld1     {v1.b}[15], [x3]
+    // reduce instruction
+    uaddlv    h1, v1.16b
+    uqrshrn    v0.8b, v1.8h, #4
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+
+.align 4
+intra_1_to_8: .short 5, 10, 15, 20, 25, 30, 35, 40
+intra_m7_to_p8: .short -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDecoderI16x16LumaPredPlane_AArch64_neon
+    sxtw    x1, w1
+    sub     x2, x0, x1
+    sub     x2, x2, #1
+    mov     x3, x2
+    ld1     {v0.8b}, [x3] // v0 low 8 bit in top(reverse order)
+    add     x3, x3, #9
+    rev64   v0.8b, v0.8b  // reverse v0
+    ld1     {v1.8b}, [x3] // v1 high 8 bit in top
+    uxtl    v0.8h, v0.8b  // extend to 16 bit integer
+    uxtl    v1.8h, v1.8b  // extend to 16 bit integer
+    ld1     {v2.b}[7], [x2], x1
+    ld1     {v2.b}[6], [x2], x1
+    ld1     {v2.b}[5], [x2], x1
+    ld1     {v2.b}[4], [x2], x1
+    ld1     {v2.b}[3], [x2], x1
+    ld1     {v2.b}[2], [x2], x1
+    ld1     {v2.b}[1], [x2], x1
+    ld1     {v2.b}[0], [x2], x1 // v2.8b low 8 bit in left
+    add     x2, x2, x1
+    ld1     {v3.b}[0], [x2], x1
+    ld1     {v3.b}[1], [x2], x1
+    ld1     {v3.b}[2], [x2], x1
+    ld1     {v3.b}[3], [x2], x1
+    ld1     {v3.b}[4], [x2], x1
+    ld1     {v3.b}[5], [x2], x1
+    ld1     {v3.b}[6], [x2], x1
+    ld1     {v3.b}[7], [x2]      // v3.8b high 8bit in left
+    uxtl    v2.8h, v2.8b
+    uxtl    v3.8h, v3.8b
+    sub     v0.8h, v1.8h, v0.8h
+    sub     v2.8h, v3.8h, v2.8h
+    ldr     q4, intra_1_to_8
+    mul     v0.8h, v0.8h, v4.8h
+    mul     v2.8h, v2.8h, v4.8h
+    saddlv  s0, v0.8h
+    saddlv  s2, v2.8h
+    add     v1.8h, v1.8h, v3.8h
+    sqrshrn v0.4h, v0.4S, #6  // b is in v0.h[0]
+    sqrshrn v2.4h, v2.4S, #6  // c is in v2.h[0]
+    shl     v1.8h, v1.8h, #4   // a is in v1.h[7]
+    ldr     q4, intra_m7_to_p8
+    ldr     q5, intra_m7_to_p8 + 16
+    dup     v1.8h, v1.h[7]
+    dup     v3.8h, v1.h[7]
+    mla     v1.8h, v4.8h, v0.h[0]
+    mla     v3.8h, v5.8h, v0.h[0]
+    dup     v2.8h, v2.h[0] // v2.8h is [cccccccc]
+    mla     v1.8h, v2.8h, v4.h[0]
+    mla     v3.8h, v2.8h, v4.h[0]
+    sqrshrun v4.8b, v1.8h, #5
+    sqrshrun2 v4.16b, v3.8h, #5
+    st1     {v4.16b}, [x0], x1
+.rept 15
+    add     v1.8h, v1.8h, v2.8h
+    add     v3.8h, v3.8h, v2.8h
+    sqrshrun v4.8b, v1.8h, #5
+    sqrshrun2 v4.16b, v3.8h, #5
+    st1     {v4.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/au_parser.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/au_parser.h
new file mode 100644
index 0000000000..8a233af90a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/au_parser.h
@@ -0,0 +1,199 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    au_parser.h
+ *
+ * \brief   Interfaces introduced in Access Unit level based parser
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_ACCESS_UNIT_PARSER_H__
+#define WELS_ACCESS_UNIT_PARSER_H__
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "nal_prefix.h"
+#include "dec_frame.h"
+#include "bit_stream.h"
+#include "parameter_sets.h"
+#include "decoder_context.h"
+
+namespace WelsDec {
+
+/*!
+ *************************************************************************************
+ * \brief   Start Code Prefix (0x 00 00 00 01) detection
+ *
+ * \param   pBuf        bitstream payload buffer
+ * \param   pOffset     offset between NAL rbsp and original bitsteam that
+ *                      start code prefix is seperated from.
+ * \param   iBufSize    count size of buffer
+ *
+ * \return  RBSP buffer of start code prefix exclusive
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+uint8_t* DetectStartCodePrefix (const uint8_t* kpBuf, int32_t* pOffset, int32_t iBufSize);
+
+/*!
+ *************************************************************************************
+ * \brief   to parse network abstraction layer unit,
+ *          escape emulation_prevention_three_byte within it
+    former name is parse_nal
+ *
+ * \param   pCtx            decoder context
+ * \param   pNalUnitHeader  parsed result of NAL Unit Header to output
+ * \param   pSrcRbsp        bitstream buffer to input
+ * \param   iSrcRbspLen     length size of bitstream buffer payload
+ * \param   pSrcNal
+ * \param   iSrcNalLen
+ * \param   pConsumedBytes  consumed bytes during parsing
+ *
+ * \return  decoded bytes payload, might be (pSrcRbsp+1) if no escapes
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeader, uint8_t* pSrcRbsp,
+                         int32_t iSrcRbspLen, uint8_t* pSrcNal, int32_t iSrcNalLen, int32_t* pConsumedBytes);
+
+int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t kiSrcLen, uint8_t* pSrcNal,
+                        const int32_t kSrcNalLen);
+
+int32_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking);
+
+int32_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs);
+
+bool CheckAccessUnitBoundary (PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PNalUnit kpLastNal,
+                              const PSps kpSps);
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+                                 PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader);
+bool CheckNextAuNewSeq (PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PSps kpSps);
+
+/*!
+ *************************************************************************************
+ * \brief   to parse Sequence Parameter Set (SPS)
+ *
+ * \param   pCtx        Decoder context
+ * \param   pBsAux      bitstream reader auxiliary
+ * \param   pPicWidth   picture width current Sps represented
+ * \param   pPicHeight  picture height current Sps represented
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case eNalUnitType is SPS.
+ *************************************************************************************
+ */
+int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicWidth, int32_t* pPicHeight,
+                  uint8_t* pSrcNal, const int32_t kSrcNalLen);
+
+/*!
+ *************************************************************************************
+ * \brief   to parse Picture Parameter Set (PPS)
+ *
+ * \param   pCtx        Decoder context
+ * \param   pPpsList    pps list
+ * \param   pBsAux      bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case eNalUnitType is PPS.
+ *************************************************************************************
+ */
+int32_t ParsePps (PWelsDecoderContext pCtx, PPps pPpsList, PBitStringAux pBsAux, uint8_t* pSrcNal,
+                  const int32_t kSrcNalLen);
+
+/*!
+*************************************************************************************
+* \brief   to parse Video Usability Information (VUI) parameter of the SPS
+*
+* \param   pCtx        Decoder context
+* \param   pSps        the sps which current Vui parameter belongs to
+* \param   pBsAux      bitstream reader auxiliary
+*
+* \return  0 - successed
+*          1 - failed
+*
+* \note    Call it in case the flag "vui_parameters_present_flag" in sps is true.
+*************************************************************************************
+*/
+int32_t ParseVui (PWelsDecoderContext pCtx, PSps pSps, PBitStringAux pBsAux);
+
+/*!
+ *************************************************************************************
+ * \brief to parse scaling list message payload
+ *
+ * \param  PPS SPS scaling list matrix     message to be parsed output
+ * \param pBsAux    bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *    1 - failed
+ *
+ * \note  Call it in case scaling matrix present at sps or pps
+ *************************************************************************************
+*/
+int32_t SetScalingListValue (uint8_t* pScalingList, int iScalingListNum, bool* bUseDefaultScalingMatrixFlag,
+                             PBitStringAux pBsAux);
+int32_t ParseScalingList (PSps pSps, PBitStringAux pBs, bool bPPS, const bool kbTrans8x8ModeFlag,
+                          bool* bScalingListPresentFlag, uint8_t (*iScalingList4x4)[16], uint8_t (*iScalingList8x8)[64]);
+/*!
+ *************************************************************************************
+ * \brief   to parse SEI message payload
+ *
+ * \param   pSei        sei message to be parsed output
+ * \param   pBsAux      bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case eNalUnitType is NAL_UNIT_SEI.
+ *************************************************************************************
+ */
+int32_t ParseSei (void* pSei, PBitStringAux pBsAux); // reserved Sei_Msg type
+
+/*!
+ *************************************************************************************
+ * \brief   reset fmo list due to got Sps now
+ *
+ * \param   pCtx    decoder context
+ *
+ * \return  count number of fmo context units are reset
+ *************************************************************************************
+ */
+int32_t ResetFmoList (PWelsDecoderContext pCtx);
+
+} // namespace WelsDec
+
+#endif//WELS_ACCESS_UNIT_PARSER_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/bit_stream.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/bit_stream.h
new file mode 100644
index 0000000000..8490a645b9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/bit_stream.h
@@ -0,0 +1,62 @@
+/*!
+ * \copy
+ *     Copyright (c)  2004-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//bit_stream.h  -       bit-stream reading and / writing auxiliary data
+#ifndef WELS_BIT_STREAM_H__
+#define WELS_BIT_STREAM_H__
+
+#include "typedefs.h"
+#include "wels_common_defs.h"
+#include "golomb_common.h"
+
+using namespace WelsCommon;
+
+namespace WelsDec {
+
+/*!
+ * \brief   input bits for decoder or initialize bitstream writing in encoder
+ *
+ * \param   pBitString  Bit string auxiliary pointer
+ * \param   kpBuf       bit-stream buffer
+ * \param   kiSize      size in bits for decoder; size in bytes for encoder
+ *
+ * \return  size of buffer data in byte; failed in -1 return
+ */
+int32_t DecInitBits (PBitStringAux pBitString, const uint8_t* kpBuf, const int32_t kiSize);
+
+int32_t InitReadBits (PBitStringAux pBitString, intX_t iEndOffset);
+
+void RBSP2EBSP (uint8_t* pDstBuf, uint8_t* pSrcBuf, const int32_t kiSize);
+
+} // namespace WelsDec
+
+#endif//WELS_BIT_STREAM_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/cabac_decoder.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/cabac_decoder.h
new file mode 100644
index 0000000000..79bb500739
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/cabac_decoder.h
@@ -0,0 +1,111 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    cabac_decoder.h
+ *
+ * \brief   Interfaces introduced for cabac decoder
+ *
+ * \date    10/10/2014 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_CABAC_DECODER_H__
+#define WELS_CABAC_DECODER_H__
+
+#include "decoder_context.h"
+#include "error_code.h"
+#include "wels_common_defs.h"
+namespace WelsDec {
+static const uint8_t g_kRenormTable256[256] = {
+  6, 6, 6, 6, 6, 6, 6, 6,
+  5, 5, 5, 5, 5, 5, 5, 5,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  4, 4, 4, 4, 4, 4, 4, 4,
+  3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3,
+  3, 3, 3, 3, 3, 3, 3, 3,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1,
+  1, 1, 1, 1, 1, 1, 1, 1
+};
+
+
+//1. CABAC context initialization
+void WelsCabacGlobalInit (PWelsDecoderContext pCabacCtx);
+void WelsCabacContextInit (PWelsDecoderContext  pCtx, uint8_t eSliceType, int32_t iCabacInitIdc, int32_t iQp);
+
+//2. decoding Engine initialization
+int32_t InitCabacDecEngineFromBS (PWelsCabacDecEngine pDecEngine, SBitStringAux* pBsAux);
+void RestoreCabacDecEngineToBS (PWelsCabacDecEngine pDecEngine, SBitStringAux* pBsAux);
+//3. actual decoding
+int32_t Read32BitsCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiValue, int32_t& iNumBitsRead);
+int32_t DecodeBinCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t& uiBit);
+int32_t DecodeBypassCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiBinVal);
+int32_t  DecodeTerminateCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiBinVal);
+
+//4. unary parsing
+int32_t DecodeUnaryBinCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, int32_t iCtxOffset,
+                             uint32_t& uiSymVal);
+
+//5. EXGk parsing
+int32_t DecodeExpBypassCabac (PWelsCabacDecEngine pDecEngine, int32_t iCount, uint32_t& uiSymVal);
+uint32_t DecodeUEGLevelCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t& uiBinVal);
+int32_t DecodeUEGMvCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t iMaxC,  uint32_t& uiCode);
+
+#define WELS_CABAC_HALF    0x01FE
+#define WELS_CABAC_QUARTER 0x0100
+#define WELS_CABAC_FALSE_RETURN(iErrorInfo) \
+if(iErrorInfo) { \
+  return iErrorInfo; \
+}
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/deblocking.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/deblocking.h
new file mode 100644
index 0000000000..e84114a83c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/deblocking.h
@@ -0,0 +1,118 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblocking.h
+ *
+ * \brief   Interfaces introduced in frame deblocking filtering
+ *
+ * \date    05/14/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_DEBLOCKING_H__
+#define WELS_DEBLOCKING_H__
+
+#include "decoder_context.h"
+#include "deblocking_common.h"
+namespace WelsDec {
+
+/*!
+ * \brief   deblocking module initialize
+ *
+ * \param   pf
+ *          cpu
+ *
+ * \return  NONE
+ */
+
+void  DeblockingInit (PDeblockingFunc pDeblockingFunc,  int32_t iCpu);
+
+
+/*!
+ * \brief   deblocking filtering target slice
+ *
+ * \param   dec         Wels decoder context
+ *
+ * \return  NONE
+ */
+void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb);
+
+/*!
+* \brief   AVC slice init deblocking filtering target layer
+*
+* \in and out param   SDeblockingFilter
+* \in and out param   iFilterIdc
+*
+* \return  NONE
+*/
+void WelsDeblockingInitFilter (PWelsDecoderContext pCtx, SDeblockingFilter& pFilter, int32_t& iFilterIdc);
+
+/*!
+* \brief   AVC MB deblocking filtering target layer
+*
+* \param   DqLayer which has the current location of MB to be deblocked.
+*
+* \return  NONE
+*/
+void WelsDeblockingFilterMB (PDqLayer pCurDqLayer, SDeblockingFilter& pFilter, int32_t& iFilterIdc,
+                             PDeblockingFilterMbFunc pDeblockMb);
+
+/*!
+ * \brief   pixel deblocking filtering
+ *
+ * \param   filter                deblocking filter
+ * \param   pix                   pixel value
+ * \param   stride                frame stride
+ * \param   bs                    boundary strength
+ *
+ * \return  NONE
+ */
+
+uint32_t DeblockingBsMarginalMBAvcbase (PDeblockingFilter  pFilter, PDqLayer pCurDqLayer, int32_t iEdge,
+                                        int32_t iNeighMb, int32_t iMbXy);
+uint32_t DeblockingBSliceBsMarginalMBAvcbase (PDqLayer pCurDqLayer, int32_t iEdge, int32_t iNeighMb, int32_t iMbXy);
+
+int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc);
+
+void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, int32_t iBoundryFlag);
+
+inline int8_t* GetPNzc (PDqLayer pCurDqLayer, int32_t iMbXy) {
+  if (pCurDqLayer->pDec != NULL && pCurDqLayer->pDec->pNzc != NULL) {
+    return pCurDqLayer->pDec->pNzc[iMbXy];
+  }
+  return pCurDqLayer->pNzc[iMbXy];
+}
+
+} // namespace WelsDec
+
+#endif //WELS_DEBLOCKING_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_frame.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_frame.h
new file mode 100644
index 0000000000..eb7337266e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_frame.h
@@ -0,0 +1,156 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//dec_frame.h
+#ifndef WELS_DEC_FRAME_H__
+#define WELS_DEC_FRAME_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "parameter_sets.h"
+#include "nal_prefix.h"
+#include "slice.h"
+#include "picture.h"
+#include "bit_stream.h"
+#include "fmo.h"
+
+namespace WelsDec {
+
+///////////////////////////////////DQ Layer level///////////////////////////////////
+typedef struct TagDqLayer       SDqLayer;
+typedef SDqLayer*               PDqLayer;
+typedef struct TagLayerInfo {
+  SNalUnitHeaderExt             sNalHeaderExt;
+  SSlice                        sSliceInLayer;  // Here Slice identify to Frame on concept
+  PSubsetSps                    pSubsetSps;     // current pSubsetSps used, memory alloc in external
+  PSps                          pSps;           // current sps based avc used, memory alloc in external
+  PPps                          pPps;           // current pps used
+} SLayerInfo, *PLayerInfo;
+/* Layer Representation */
+
+struct TagDqLayer {
+  SLayerInfo                    sLayerInfo;
+
+  PBitStringAux                 pBitStringAux;  // pointer to SBitStringAux
+  PFmo                          pFmo;           // Current fmo context pointer used
+  uint32_t* pMbType;
+  int32_t* pSliceIdc;                           // using int32_t for slice_idc
+  int16_t (*pMv[LIST_A])[MB_BLOCK4x4_NUM][MV_A];
+  int16_t (*pMvd[LIST_A])[MB_BLOCK4x4_NUM][MV_A];
+  int8_t  (*pRefIndex[LIST_A])[MB_BLOCK4x4_NUM];
+	int8_t	(*pDirect)[MB_BLOCK4x4_NUM];
+  bool*    pNoSubMbPartSizeLessThan8x8Flag;
+  bool*    pTransformSize8x8Flag;
+  int8_t*  pLumaQp;
+  int8_t (*pChromaQp)[2];
+  int8_t*  pCbp;
+  uint16_t *pCbfDc;
+  int8_t (*pNzc)[24];
+  int8_t (*pNzcRs)[24];
+  int8_t*  pResidualPredFlag;
+  int8_t*  pInterPredictionDoneFlag;
+  bool*    pMbCorrectlyDecodedFlag;
+  bool*    pMbRefConcealedFlag;
+  int16_t (*pScaledTCoeff)[MB_COEFF_LIST_SIZE];
+  int8_t (*pIntraPredMode)[8];  //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16
+  int8_t (*pIntra4x4FinalMode)[MB_BLOCK4x4_NUM];
+  uint8_t  *pIntraNxNAvailFlag;
+  int8_t*  pChromaPredMode;
+  //uint8_t (*motion_pred_flag[LIST_A])[MB_PARTITION_SIZE]; // 8x8
+  uint32_t (*pSubMbType)[MB_SUB_PARTITION_SIZE];
+  int32_t iLumaStride;
+  int32_t iChromaStride;
+  uint8_t* pPred[3];
+  int32_t iMbX;
+  int32_t iMbY;
+  int32_t iMbXyIndex;
+  int32_t iMbWidth;               // MB width of this picture, equal to sSps.iMbWidth
+  int32_t iMbHeight;              // MB height of this picture, equal to sSps.iMbHeight;
+
+  /* Common syntax elements across all slices of a DQLayer */
+  int32_t                   iSliceIdcBackup;
+  uint32_t                  uiSpsId;
+  uint32_t                  uiPpsId;
+  uint32_t                  uiDisableInterLayerDeblockingFilterIdc;
+  int32_t                   iInterLayerSliceAlphaC0Offset;
+  int32_t                   iInterLayerSliceBetaOffset;
+  //SPosOffset              sScaledRefLayer;
+  int32_t                   iSliceGroupChangeCycle;
+
+  PRefPicListReorderSyn     pRefPicListReordering;
+  PPredWeightTabSyn         pPredWeightTable;
+  PRefPicMarking            pRefPicMarking; // Decoded reference picture marking syntaxs
+  PRefBasePicMarking        pRefPicBaseMarking;
+
+  PPicture                  pRef;                   // reference picture pointer
+  PPicture                  pDec;                   // reconstruction picture pointer for layer
+
+	int16_t										iColocMv[2][16][2];     //Colocated MV cache
+	int8_t										iColocRefIndex[2][16];  //Colocated RefIndex cache
+	int8_t										iColocIntra[16];			  //Colocated Intra cache
+
+  bool                      bUseWeightPredictionFlag;
+	bool                      bUseWeightedBiPredIdc;
+	bool                      bStoreRefBasePicFlag;                           // iCurTid == 0 && iCurQid = 0 && bEncodeKeyPic = 1
+  bool                      bTCoeffLevelPredFlag;
+  bool                      bConstrainedIntraResamplingFlag;
+  uint8_t                   uiRefLayerDqId;
+  uint8_t                   uiRefLayerChromaPhaseXPlus1Flag;
+  uint8_t                   uiRefLayerChromaPhaseYPlus1;
+  uint8_t                   uiLayerDqId;                    // dq_id of current layer
+  bool                      bUseRefBasePicFlag;     // whether reference pic or reference base pic is referred?
+};
+
+typedef struct TagGpuAvcLayer {
+  SLayerInfo                sLayerInfo;
+  PBitStringAux             pBitStringAux;  // pointer to SBitStringAux
+
+	uint32_t*                  pMbType;
+  int32_t*                  pSliceIdc;      // using int32_t for slice_idc
+  int8_t*                   pLumaQp;
+  int8_t*                   pCbp;
+  int8_t                    (*pNzc)[24];
+  int8_t                    (*pIntraPredMode)[8];     //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16
+  int32_t                   iMbX;
+  int32_t                   iMbY;
+  int32_t                   iMbXyIndex;
+  int32_t                   iMbWidth;               // MB width of this picture, equal to sSps.iMbWidth
+  int32_t                   iMbHeight;              // MB height of this picture, equal to sSps.iMbHeight;
+
+} SGpuAvcDqLayer, *PGpuAvcDqLayer;
+
+///////////////////////////////////////////////////////////////////////
+
+} // namespace WelsDec
+
+#endif//WELS_DEC_FRAME_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_golomb.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_golomb.h
new file mode 100644
index 0000000000..fef8df460f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/dec_golomb.h
@@ -0,0 +1,344 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    golomb.h
+ *
+ * \brief   Exponential Golomb entropy coding/decoding routine
+ *
+ * \date    03/13/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
+#define WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
+
+#include "typedefs.h"
+#include "bit_stream.h"
+#include "macros.h"
+//#include <assert.h>
+#include "ls_defines.h"
+#include "error_code.h"
+
+namespace WelsDec {
+
+#define WELS_READ_VERIFY(uiRet) do{ \
+  uint32_t uiRetTmp = (uint32_t)uiRet; \
+  if( uiRetTmp != ERR_NONE ) \
+    return uiRetTmp; \
+}while(0)
+#define GET_WORD(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes) { \
+  if (iReadBytes > iAllowedBytes+1) { \
+    return ERR_INFO_READ_OVERFLOW; \
+  } \
+  iCurBits |= ((uint32_t)((pBufPtr[0] << 8) | pBufPtr[1])) << (iLeftBits); \
+  iLeftBits -= 16; \
+  pBufPtr +=2; \
+}
+#define NEED_BITS(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes) { \
+  if (iLeftBits > 0) { \
+    GET_WORD(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes); \
+  } \
+}
+#define UBITS(iCurBits, iNumBits) (iCurBits>>(32-(iNumBits)))
+#define DUMP_BITS(iCurBits, pBufPtr, iLeftBits, iNumBits, iAllowedBytes, iReadBytes) { \
+  iCurBits <<= (iNumBits); \
+  iLeftBits += (iNumBits); \
+  NEED_BITS(iCurBits, pBufPtr, iLeftBits, iAllowedBytes, iReadBytes); \
+}
+
+static inline int32_t BsGetBits (PBitStringAux pBs, int32_t iNumBits, uint32_t* pCode) {
+  intX_t iRc = UBITS (pBs->uiCurBits, iNumBits);
+  intX_t iAllowedBytes = pBs->pEndBuf - pBs->pStartBuf; //actual stream bytes
+  intX_t iReadBytes = pBs->pCurBuf - pBs->pStartBuf;
+  DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, iNumBits, iAllowedBytes, iReadBytes);
+  *pCode = (uint32_t)iRc;
+  return ERR_NONE;
+}
+
+/*
+ *  Exponential Golomb codes decoding routines
+ */
+
+// for data sharing cross modules and try to reduce size of binary generated, 12/10/2009
+extern const uint8_t g_kuiIntra4x4CbpTable[48];
+extern const uint8_t g_kuiIntra4x4CbpTable400[16];
+extern const uint8_t g_kuiInterCbpTable[48];
+extern const uint8_t g_kuiInterCbpTable400[16];
+
+extern const uint8_t g_kuiLeadingZeroTable[256];
+
+static const uint32_t g_kuiPrefix8BitsTable[16] = {
+  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3
+};
+
+
+static inline uint32_t GetPrefixBits (uint32_t uiValue) {
+  uint32_t iNumBit = 0;
+
+  if (uiValue & 0xffff0000) {
+    uiValue >>= 16;
+    iNumBit += 16;
+  }
+  if (uiValue & 0xff00) {
+    uiValue >>= 8;
+    iNumBit += 8;
+  }
+
+  if (uiValue & 0xf0) {
+    uiValue >>= 4;
+    iNumBit += 4;
+  }
+  iNumBit += g_kuiPrefix8BitsTable[uiValue];
+
+  return (32 - iNumBit);
+}
+
+/*
+ *  Read one bit from bit stream followed
+ */
+static inline uint32_t BsGetOneBit (PBitStringAux pBs, uint32_t* pCode) {
+  return (BsGetBits (pBs, 1, pCode));
+}
+
+static inline int32_t GetLeadingZeroBits (uint32_t iCurBits) { //<=32 bits
+  uint32_t  uiValue;
+
+  uiValue = UBITS (iCurBits, 8); //ShowBits( bs, 8 );
+  if (uiValue) {
+    return g_kuiLeadingZeroTable[uiValue];
+  }
+
+  uiValue = UBITS (iCurBits, 16); //ShowBits( bs, 16 );
+  if (uiValue) {
+    return (g_kuiLeadingZeroTable[uiValue] + 8);
+  }
+
+  uiValue = UBITS (iCurBits, 24); //ShowBits( bs, 24 );
+  if (uiValue) {
+    return (g_kuiLeadingZeroTable[uiValue] + 16);
+  }
+
+  uiValue = iCurBits; //ShowBits( bs, 32 );
+  if (uiValue) {
+    return (g_kuiLeadingZeroTable[uiValue] + 24);
+  }
+//ASSERT(false);  // should not go here
+  return -1;
+}
+
+static inline uint32_t BsGetUe (PBitStringAux pBs, uint32_t* pCode) {
+  uint32_t iValue = 0;
+  int32_t  iLeadingZeroBits = GetLeadingZeroBits (pBs->uiCurBits);
+  intX_t iAllowedBytes, iReadBytes;
+  iAllowedBytes = pBs->pEndBuf - pBs->pStartBuf; //actual stream bytes
+
+  if (iLeadingZeroBits == -1) { //bistream error
+    return ERR_INFO_READ_LEADING_ZERO;//-1
+  } else if (iLeadingZeroBits >
+             16) { //rarely into this condition (even may be bitstream error), prevent from 16-bit reading overflow
+    //using two-step reading instead of one time reading of >16 bits.
+    iReadBytes = pBs->pCurBuf - pBs->pStartBuf;
+    DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, 16, iAllowedBytes, iReadBytes);
+    iReadBytes = pBs->pCurBuf - pBs->pStartBuf;
+    DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, iLeadingZeroBits + 1 - 16, iAllowedBytes, iReadBytes);
+  } else {
+    iReadBytes = pBs->pCurBuf - pBs->pStartBuf;
+    DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, iLeadingZeroBits + 1, iAllowedBytes, iReadBytes);
+  }
+  if (iLeadingZeroBits) {
+    iValue = UBITS (pBs->uiCurBits, iLeadingZeroBits);
+    iReadBytes = pBs->pCurBuf - pBs->pStartBuf;
+    DUMP_BITS (pBs->uiCurBits, pBs->pCurBuf, pBs->iLeftBits, iLeadingZeroBits, iAllowedBytes, iReadBytes);
+  }
+
+  *pCode = ((1u << iLeadingZeroBits) - 1 + iValue);
+  return ERR_NONE;
+}
+
+
+/*
+ *  Read signed exp golomb codes
+ */
+static inline int32_t BsGetSe (PBitStringAux pBs, int32_t* pCode) {
+  uint32_t uiCodeNum;
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCodeNum));
+
+  if (uiCodeNum & 0x01) {
+    *pCode = (int32_t) ((uiCodeNum + 1) >> 1);
+  } else {
+    *pCode = NEG_NUM ((int32_t) (uiCodeNum >> 1));
+  }
+  return ERR_NONE;
+}
+
+/*
+ * Get unsigned truncated exp golomb code.
+ */
+static inline int32_t BsGetTe0 (PBitStringAux pBs, int32_t iRange, uint32_t* pCode) {
+  if (iRange == 1) {
+    *pCode = 0;
+  } else if (iRange == 2) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, pCode));
+    *pCode ^= 1;
+  } else {
+    WELS_READ_VERIFY (BsGetUe (pBs, pCode));
+  }
+  return ERR_NONE;
+}
+
+/*
+ *  Get number of trailing bits
+ */
+static inline int32_t BsGetTrailingBits (uint8_t* pBuf) {
+// TODO
+  uint32_t uiValue = *pBuf;
+  int32_t iRetNum = 0;
+
+  do {
+    if (uiValue & 1)
+      return iRetNum;
+    uiValue >>= 1;
+    ++ iRetNum;
+  } while (iRetNum < 9);
+
+  return 0;
+}
+
+/*
+ *      Check whether there is more rbsp data for processing
+ */
+static inline bool CheckMoreRBSPData (PBitStringAux pBsAux) {
+  if ((pBsAux->iBits - ((pBsAux->pCurBuf - pBsAux->pStartBuf - 2) << 3) - pBsAux->iLeftBits) > 1) {
+    return true;
+  } else {
+    return false;
+  }
+}
+
+//define macros to check syntax elements
+#define WELS_CHECK_SE_BOTH_ERROR(val, lower_bound, upper_bound, syntax_name, ret_code) do {\
+if ((val < lower_bound) || (val > upper_bound)) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_ERROR, "invalid syntax " syntax_name " %d", val);\
+  return ret_code;\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_LOWER_ERROR(val, lower_bound, syntax_name, ret_code) do {\
+if (val < lower_bound) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_ERROR, "invalid syntax " syntax_name " %d", val);\
+  return ret_code;\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_UPPER_ERROR(val, upper_bound, syntax_name, ret_code) do {\
+if (val > upper_bound) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_ERROR, "invalid syntax " syntax_name " %d", val);\
+  return ret_code;\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_BOTH_ERROR_NOLOG(val, lower_bound, upper_bound, syntax_name, ret_code) do {\
+if ((val < lower_bound) || (val > upper_bound)) {\
+  return ret_code;\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_LOWER_ERROR_NOLOG(val, lower_bound, syntax_name, ret_code) do {\
+if (val < lower_bound) {\
+  return ret_code;\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_UPPER_ERROR_NOLOG(val, upper_bound, syntax_name, ret_code) do {\
+if (val > upper_bound) {\
+  return ret_code;\
+}\
+}while(0)
+
+
+#define WELS_CHECK_SE_BOTH_WARNING(val, lower_bound, upper_bound, syntax_name) do {\
+if ((val < lower_bound) || (val > upper_bound)) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_WARNING, "invalid syntax " syntax_name " %d", val);\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_LOWER_WARNING(val, lower_bound, syntax_name) do {\
+if (val < lower_bound) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_WARNING, "invalid syntax " syntax_name " %d", val);\
+}\
+}while(0)
+
+#define WELS_CHECK_SE_UPPER_WARNING(val, upper_bound, syntax_name) do {\
+if (val > upper_bound) {\
+  WelsLog(&(pCtx->sLogCtx), WELS_LOG_WARNING, "invalid syntax " syntax_name " %d", val);\
+}\
+}while(0)
+// below define syntax element offset
+// for bit_depth_luma_minus8 and bit_depth_chroma_minus8
+#define BIT_DEPTH_LUMA_OFFSET 8
+#define BIT_DEPTH_CHROMA_OFFSET 8
+// for log2_max_frame_num_minus4
+#define LOG2_MAX_FRAME_NUM_OFFSET 4
+// for log2_max_pic_order_cnt_lsb_minus4
+#define LOG2_MAX_PIC_ORDER_CNT_LSB_OFFSET 4
+// for pic_width_in_mbs_minus1
+#define PIC_WIDTH_IN_MBS_OFFSET 1
+// for pic_height_in_map_units_minus1
+#define PIC_HEIGHT_IN_MAP_UNITS_OFFSET 1
+// for bit_depth_aux_minus8
+#define BIT_DEPTH_AUX_OFFSET 8
+// for num_slice_groups_minus1
+#define NUM_SLICE_GROUPS_OFFSET 1
+// for run_length_minus1
+#define RUN_LENGTH_OFFSET 1
+// for slice_group_change_rate_minus1
+#define SLICE_GROUP_CHANGE_RATE_OFFSET 1
+// for pic_size_in_map_units_minus1
+#define PIC_SIZE_IN_MAP_UNITS_OFFSET 1
+// for num_ref_idx_l0_default_active_minus1 and num_ref_idx_l1_default_active_minus1
+#define NUM_REF_IDX_L0_DEFAULT_ACTIVE_OFFSET 1
+#define NUM_REF_IDX_L1_DEFAULT_ACTIVE_OFFSET 1
+// for pic_init_qp_minus26 and pic_init_qs_minus26
+#define PIC_INIT_QP_OFFSET 26
+#define PIC_INIT_QS_OFFSET 26
+// for num_ref_idx_l0_active_minus1 and num_ref_idx_l1_active_minus1
+#define NUM_REF_IDX_L0_ACTIVE_OFFSET 1
+#define NUM_REF_IDX_L1_ACTIVE_OFFSET 1
+
+// From Level 5.2
+#define MAX_MB_SIZE 36864
+// for aspect_ratio_idc
+#define EXTENDED_SAR 255
+
+} // namespace WelsDec
+
+#endif//WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_mb_aux.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_mb_aux.h
new file mode 100644
index 0000000000..ee88587949
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_mb_aux.h
@@ -0,0 +1,78 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_DECODE_MB_AUX_H__
+#define WELS_DECODE_MB_AUX_H__
+
+#include "typedefs.h"
+#include "macros.h"
+
+namespace WelsDec {
+
+void IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+void IdctResAddPred8x8_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+void IdctResAddPred_mmx (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+void IdctResAddPred_sse2 (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+#if defined(HAVE_AVX2)
+void IdctResAddPred_avx2 (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+void IdctFourResAddPred_avx2 (uint8_t* pPred, int32_t iStride, int16_t* pRs, const int8_t* pNzc);
+#endif
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+void IdctResAddPred_neon (uint8_t* pred, const int32_t stride, int16_t* rs);
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+void IdctResAddPred_AArch64_neon (uint8_t* pred, const int32_t stride, int16_t* rs);
+#endif
+
+
+#if defined(HAVE_MMI)
+void IdctResAddPred_mmi (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+#endif//HAVE_MMI
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+void GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride);
+
+} // namespace WelsDec
+
+#endif//WELS_DECODE_MB_AUX_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_slice.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_slice.h
new file mode 100644
index 0000000000..f7197abbf1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decode_slice.h
@@ -0,0 +1,104 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_DECODE_SLICE_H__
+#define WELS_DECODE_SLICE_H__
+
+#include "decoder_context.h"
+
+namespace WelsDec {
+
+int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx);
+int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+
+int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx);
+int32_t WelsDecodeMbCavlcPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+
+int32_t WelsActualDecodeMbCavlcBSlice (PWelsDecoderContext pCtx);
+int32_t WelsDecodeMbCavlcBSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+
+typedef int32_t (*PWelsDecMbFunc) (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+
+int32_t WelsDecodeMbCabacISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+int32_t WelsDecodeMbCabacPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+int32_t WelsDecodeMbCabacBSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag);
+int32_t WelsDecodeMbCabacISliceBaseMode0 (PWelsDecoderContext pCtx, uint32_t& uiEosFlag);
+int32_t WelsDecodeMbCabacPSliceBaseMode0 (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiEosFlag);
+int32_t WelsDecodeMbCabacBSliceBaseMode0 (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiEosFlag);
+
+int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx); //construction based on slice
+
+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur);
+int32_t WelsDecodeAndConstructSlice (PWelsDecoderContext pCtx);
+
+int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx);
+
+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer, bool bOutput);
+int32_t WelsMbInterSampleConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer,
+                                       uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV, int32_t iStrideL, int32_t iStrideC);
+int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer);
+void WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp, PWelsDecoderContext pCtx);
+int32_t WelsMbInterPrediction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer);
+void WelsChromaDcIdct (int16_t* pBlock);
+bool ComputeColocatedTemporalScaling (PWelsDecoderContext pCtx);
+
+#ifdef __cplusplus
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+void WelsBlockZero16x16_sse2 (int16_t* block, int32_t stride);
+void WelsBlockZero8x8_sse2 (int16_t* block, int32_t stride);
+#endif
+
+#if defined(HAVE_NEON)
+void WelsBlockZero16x16_neon (int16_t* block, int32_t stride);
+void WelsBlockZero8x8_neon (int16_t* block, int32_t stride);
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+void WelsBlockZero16x16_AArch64_neon (int16_t* block, int32_t stride);
+void WelsBlockZero8x8_AArch64_neon (int16_t* block, int32_t stride);
+#endif
+#ifdef __cplusplus
+}
+#endif//__cplusplus
+
+void WelsBlockFuncInit (SBlockFunc* pFunc,  int32_t iCpu);
+void WelsBlockZero16x16_c (int16_t* block, int32_t stride);
+void WelsBlockZero8x8_c (int16_t* block, int32_t stride);
+
+} // namespace WelsDec
+
+#endif //WELS_DECODE_SLICE_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder.h
new file mode 100644
index 0000000000..0c84739d51
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder.h
@@ -0,0 +1,186 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    decoder.h
+ *
+ * \brief   Interfaces introduced in decoder system architecture
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_DECODER_SYSTEM_ARCHITECTURE_H__
+#define WELS_DECODER_SYSTEM_ARCHITECTURE_H__
+
+#include "typedefs.h"
+#include "decoder_context.h"
+
+namespace WelsDec {
+
+#ifdef __cplusplus
+extern "C" {
+#endif//__cplusplus
+
+/*!
+ * \brief   configure decoder parameters
+ */
+int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpParam);
+
+/*!
+ * \brief   fill in default values of decoder context
+ */
+void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx);
+
+/*
+* fill last decoded picture info
+*/
+void WelsDecoderLastDecPicInfoDefaults (SWelsLastDecPicInfo& sLastDecPicInfo);
+
+/*!
+* \brief   fill data fields in SPS and PPS default for decoder context
+*/
+void WelsDecoderSpsPpsDefaults (SWelsDecoderSpsPpsCTX& sSpsPpsCtx);
+
+/*!
+* \brief   copy SpsPps from one Ctx to another ctx for threaded code
+*/
+void CopySpsPps (PWelsDecoderContext pFromCtx, PWelsDecoderContext pToCtx);
+
+/*!
+ *************************************************************************************
+ * \brief   Initialize Wels decoder parameters and memory
+ *
+ * \param   pCtx            input context to be initialized at first stage
+ * \param   pTraceHandle    handle for trace
+ * \param   pLo             log info pointer
+ *
+ * \return  0 - successed
+ * \return  1 - failed
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+int32_t WelsInitDecoder (PWelsDecoderContext pCtx, SLogContext* pLogCtx);
+
+/*!
+ *************************************************************************************
+ * \brief   Uninitialize Wels decoder parameters and memory
+ *
+ * \param   pCtx    input context to be uninitialized at release stage
+ *
+ * \return  NONE
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+void WelsEndDecoder (PWelsDecoderContext pCtx);
+
+/*!
+ *************************************************************************************
+ * \brief   First entrance to decoding core interface.
+ *
+ * \param   pCtx            decoder context
+ * \param   pBufBs          bit streaming buffer
+ * \param   kBsLen          size in bytes length of bit streaming buffer input
+ * \param   ppDst           picture payload data to be output
+ * \param   pDstBufInfo     buf information of ouput data
+ *
+ * \return  0 - successed
+ * \return  1 - failed
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+
+int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const int32_t kiBsLen,
+                      uint8_t** ppDst, SBufferInfo* pDstBufInfo, SParserBsInfo* pDstBsInfo);
+
+/*
+ *  request memory blocks for decoder avc part
+ */
+int32_t WelsRequestMem (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const int32_t kiMbHeight,
+                        bool& bReallocFlag);
+
+
+/*
+ *  free memory dynamically allocated during decoder
+ */
+void WelsFreeDynamicMemory (PWelsDecoderContext pCtx);
+
+/*!
+ * \brief   make sure synchonozization picture resolution (get from slice header) among different parts (i.e, memory related and so on)
+ *          over decoder internal
+ * ( MB coordinate and parts of data within decoder context structure )
+ * \param   pCtx        Wels decoder context
+ * \param   iMbWidth    MB width
+ * \pram    iMbHeight   MB height
+ * \return  0 - successful; none 0 - something wrong
+ */
+int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const int32_t kiMbHeight);
+
+/*!
+ * \brief   init decoder predictive function pointers including ASM functions during MB reconstruction
+ * \param   pCtx        Wels decoder context
+ * \param   uiCpuFlag   cpu assembly indication
+ */
+void InitPredFunc (PWelsDecoderContext pCtx, uint32_t uiCpuFlag);
+
+/*!
+ * \brief   init decoder internal function pointers including ASM functions
+ * \param   pCtx        Wels decoder context
+ * \param   uiCpuFlag   cpu assembly indication
+ */
+void InitDecFuncs (PWelsDecoderContext pCtx, uint32_t uiCpuFlag);
+
+void GetVclNalTemporalId (PWelsDecoderContext pCtx); //get the info that whether or not have VCL NAL in current AU,
+//and if YES, get the temporal ID
+
+//reset decoder number related statistics info
+void ResetDecStatNums (SDecoderStatistics* pDecStat);
+//update information when freezing occurs, including IDR/non-IDR number
+void UpdateDecStatFreezingInfo (const bool kbIdrFlag, SDecoderStatistics* pDecStat);
+//update information when no freezing occurs, including QP, correct IDR number, ECed IDR number
+void UpdateDecStatNoFreezingInfo (PWelsDecoderContext pCtx);
+//update decoder statistics information
+void UpdateDecStat (PWelsDecoderContext pCtx, const bool kbOutput);
+//Destroy picutre buffer
+void DestroyPicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, CMemoryAlign* pMa);
+//reset picture reodering buffer list
+void ResetReorderingPictureBuffers (PPictReoderingStatus pPictReoderingStatus, PPictInfo pPictInfo,
+                                    const bool& bFullReset);
+
+#ifdef __cplusplus
+}
+#endif//__cplusplus
+
+} // namespace WelsDec
+
+#endif//WELS_DECODER_SYSTEM_ARCHITECTURE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_context.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_context.h
new file mode 100644
index 0000000000..7e8e9d798e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_context.h
@@ -0,0 +1,587 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    decoder_context.h
+ *
+ * \brief   mainly interface introduced in Wels decoder side
+ *
+ * \date    3/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_DECODER_FRAMEWORK_H__
+#define WELS_DECODER_FRAMEWORK_H__
+#include "typedefs.h"
+#include "utils.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "wels_common_defs.h"
+#include "codec_app_def.h"
+#include "parameter_sets.h"
+#include "nalu.h"
+#include "dec_frame.h"
+#include "pic_queue.h"
+#include "vlc_decoder.h"
+#include "fmo.h"
+#include "crt_util_safe_x.h"
+#include "mb_cache.h"
+#include "expand_pic.h"
+#include "mc.h"
+#include "memory_align.h"
+#include "wels_decoder_thread.h"
+
+namespace WelsDec {
+#define MAX_PRED_MODE_ID_I16x16  3
+#define MAX_PRED_MODE_ID_CHROMA  3
+#define MAX_PRED_MODE_ID_I4x4    8
+#define  WELS_QP_MAX    51
+
+#define LONG_TERM_REF
+#define IMinInt32 -0x7FFFFFFF
+typedef struct SWels_Cabac_Element {
+  uint8_t uiState;
+  uint8_t uiMPS;
+} SWelsCabacCtx, *PWelsCabacCtx;
+
+typedef struct {
+  uint64_t uiRange;
+  uint64_t uiOffset;
+  int32_t iBitsLeft;
+  uint8_t* pBuffStart;
+  uint8_t* pBuffCurr;
+  uint8_t* pBuffEnd;
+} SWelsCabacDecEngine, *PWelsCabacDecEngine;
+
+#define NEW_CTX_OFFSET_MB_TYPE_I 3
+#define NEW_CTX_OFFSET_SKIP 11
+#define NEW_CTX_OFFSET_SUBMB_TYPE 21
+#define NEW_CTX_OFFSET_B_SUBMB_TYPE 36
+#define NEW_CTX_OFFSET_MVD 40
+#define NEW_CTX_OFFSET_REF_NO 54
+#define NEW_CTX_OFFSET_DELTA_QP 60
+#define NEW_CTX_OFFSET_IPR 68
+#define NEW_CTX_OFFSET_CIPR 64
+#define NEW_CTX_OFFSET_CBP 73
+#define NEW_CTX_OFFSET_CBF 85
+#define NEW_CTX_OFFSET_MAP 105
+#define NEW_CTX_OFFSET_LAST 166
+#define NEW_CTX_OFFSET_ONE 227
+#define NEW_CTX_OFFSET_ABS 232
+#define NEW_CTX_OFFSET_TS_8x8_FLAG 399
+#define CTX_NUM_MVD 7
+#define CTX_NUM_CBP 4
+// Table 9-34 in Page 270
+#define NEW_CTX_OFFSET_TRANSFORM_SIZE_8X8_FLAG  399
+#define NEW_CTX_OFFSET_MAP_8x8  402
+#define NEW_CTX_OFFSET_LAST_8x8 417
+#define NEW_CTX_OFFSET_ONE_8x8  426
+#define NEW_CTX_OFFSET_ABS_8x8  431 // Puzzle, where is the definition?
+
+typedef struct TagDataBuffer {
+  uint8_t* pHead;
+  uint8_t* pEnd;
+
+  uint8_t* pStartPos;
+  uint8_t* pCurPos;
+} SDataBuffer;
+
+//limit size for SPS PPS total permitted size for parse_only
+#define SPS_PPS_BS_SIZE 128
+typedef struct TagSpsBsInfo {
+  uint8_t pSpsBsBuf [SPS_PPS_BS_SIZE];
+  int32_t iSpsId;
+  uint16_t uiSpsBsLen;
+} SSpsBsInfo;
+
+typedef struct TagPpsBsInfo {
+  uint8_t pPpsBsBuf [SPS_PPS_BS_SIZE];
+  int32_t iPpsId;
+  uint16_t uiPpsBsLen;
+} SPpsBsInfo;
+//#ifdef __cplusplus
+//extern "C" {
+//#endif//__cplusplus
+
+/*
+ *  Need move below structures to function pointer to seperate module/file later
+ */
+
+//typedef int32_t (*rec_mb) (Mb *cur_mb, PWelsDecoderContext pCtx);
+
+/*typedef for get intra predictor func pointer*/
+typedef void (*PGetIntraPredFunc) (uint8_t* pPred, const int32_t kiLumaStride);
+typedef void (*PIdctResAddPredFunc) (uint8_t* pPred, const int32_t kiStride, int16_t* pRs);
+typedef void (*PIdctFourResAddPredFunc) (uint8_t* pPred, int32_t iStride, int16_t* pRs, const int8_t* pNzc);
+typedef void (*PExpandPictureFunc) (uint8_t* pDst, const int32_t kiStride, const int32_t kiPicWidth,
+                                    const int32_t kiPicHeight);
+
+typedef void (*PGetIntraPred8x8Func) (uint8_t* pPred, const int32_t kiLumaStride, bool bTLAvail, bool bTRAvail);
+
+/**/
+typedef struct TagRefPic {
+  PPicture      pRefList[LIST_A][MAX_DPB_COUNT];    // reference picture marking plus FIFO scheme
+  PPicture      pShortRefList[LIST_A][MAX_DPB_COUNT];
+  PPicture      pLongRefList[LIST_A][MAX_DPB_COUNT];
+  uint8_t       uiRefCount[LIST_A];
+  uint8_t       uiShortRefCount[LIST_A];
+  uint8_t       uiLongRefCount[LIST_A]; // dependend on ref pic module
+  int32_t       iMaxLongTermFrameIdx;
+} SRefPic, *PRefPic;
+
+typedef void (*PCopyFunc) (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+typedef struct TagCopyFunc {
+  PCopyFunc pCopyLumaFunc;
+  PCopyFunc pCopyChromaFunc;
+} SCopyFunc;
+
+//deblock module defination
+struct TagDeblockingFunc;
+
+typedef struct tagDeblockingFilter {
+  uint8_t*      pCsData[3];     // pointer to reconstructed picture data
+  int32_t       iCsStride[2];   // Cs stride
+  EWelsSliceType  eSliceType;
+  int8_t        iSliceAlphaC0Offset;
+  int8_t        iSliceBetaOffset;
+  int8_t  iChromaQP[2];
+  int8_t  iLumaQP;
+  struct TagDeblockingFunc*  pLoopf;
+  PPicture* pRefPics[LIST_A];
+} SDeblockingFilter, *PDeblockingFilter;
+
+typedef void (*PDeblockingFilterMbFunc) (PDqLayer pCurDqLayer, PDeblockingFilter  filter, int32_t boundry_flag);
+typedef void (*PLumaDeblockingLT4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta,
+                                        int8_t* iTc);
+typedef void (*PLumaDeblockingEQ4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+typedef void (*PChromaDeblockingLT4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta, int8_t* iTc);
+typedef void (*PChromaDeblockingEQ4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta);
+typedef void (*PChromaDeblockingLT4Func2) (uint8_t* iSampleCbr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta, int8_t* iTc);
+typedef void (*PChromaDeblockingEQ4Func2) (uint8_t* iSampleCbr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta);
+
+typedef struct TagDeblockingFunc {
+  PLumaDeblockingLT4Func    pfLumaDeblockingLT4Ver;
+  PLumaDeblockingEQ4Func    pfLumaDeblockingEQ4Ver;
+  PLumaDeblockingLT4Func    pfLumaDeblockingLT4Hor;
+  PLumaDeblockingEQ4Func    pfLumaDeblockingEQ4Hor;
+
+  PChromaDeblockingLT4Func  pfChromaDeblockingLT4Ver;
+  PChromaDeblockingEQ4Func  pfChromaDeblockingEQ4Ver;
+  PChromaDeblockingLT4Func  pfChromaDeblockingLT4Hor;
+  PChromaDeblockingEQ4Func  pfChromaDeblockingEQ4Hor;
+
+  PChromaDeblockingLT4Func2  pfChromaDeblockingLT4Ver2;
+  PChromaDeblockingEQ4Func2  pfChromaDeblockingEQ4Ver2;
+  PChromaDeblockingLT4Func2  pfChromaDeblockingLT4Hor2;
+  PChromaDeblockingEQ4Func2  pfChromaDeblockingEQ4Hor2;
+
+} SDeblockingFunc, *PDeblockingFunc;
+
+typedef void (*PWelsNonZeroCountFunc) (int8_t* pNonZeroCount);
+typedef void (*PWelsBlockZeroFunc) (int16_t* block, int32_t stride);
+typedef  struct  TagBlockFunc {
+  PWelsNonZeroCountFunc pWelsSetNonZeroCountFunc;
+  PWelsBlockZeroFunc    pWelsBlockZero16x16Func;
+  PWelsBlockZeroFunc    pWelsBlockZero8x8Func;
+} SBlockFunc;
+
+typedef void (*PWelsFillNeighborMbInfoIntra4x4Func) (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+    int8_t* pIntraPredMode, PDqLayer pCurDqLayer);
+typedef void (*PWelsMapNeighToSample) (PWelsNeighAvail pNeighAvail, int32_t* pSampleAvail);
+typedef void (*PWelsMap16NeighToSample) (PWelsNeighAvail pNeighAvail, uint8_t* pSampleAvail);
+typedef int32_t (*PWelsParseIntra4x4ModeFunc) (PWelsNeighAvail pNeighAvail, int8_t* pIntraPredMode, PBitStringAux pBs,
+    PDqLayer pCurDqLayer);
+typedef int32_t (*PWelsParseIntra16x16ModeFunc) (PWelsNeighAvail pNeighAvail, PBitStringAux pBs, PDqLayer pCurDqLayer);
+
+enum {
+  OVERWRITE_NONE = 0,
+  OVERWRITE_PPS = 1,
+  OVERWRITE_SPS = 1 << 1,
+  OVERWRITE_SUBSETSPS = 1 << 2
+};
+
+
+//Decoder SPS and PPS global CTX
+typedef struct tagWelsWelsDecoderSpsPpsCTX {
+  SPosOffset                    sFrameCrop;
+
+  SSps                          sSpsBuffer[MAX_SPS_COUNT + 1];
+  SPps                          sPpsBuffer[MAX_PPS_COUNT + 1];
+
+  SSubsetSps                    sSubsetSpsBuffer[MAX_SPS_COUNT + 1];
+  SNalUnit                      sPrefixNal;
+
+  PSps                          pActiveLayerSps[MAX_LAYER_NUM];
+  bool                          bAvcBasedFlag;          // For decoding bitstream:
+
+  // for EC parameter sets
+  bool                          bSpsExistAheadFlag;     // whether does SPS NAL exist ahead of sequence?
+  bool                          bSubspsExistAheadFlag;// whether does Subset SPS NAL exist ahead of sequence?
+  bool                          bPpsExistAheadFlag;     // whether does PPS NAL exist ahead of sequence?
+
+  int32_t                       iSpsErrorIgnored;
+  int32_t                       iSubSpsErrorIgnored;
+  int32_t                       iPpsErrorIgnored;
+
+  bool                          bSpsAvailFlags[MAX_SPS_COUNT];
+  bool                          bSubspsAvailFlags[MAX_SPS_COUNT];
+  bool                          bPpsAvailFlags[MAX_PPS_COUNT];
+  int32_t                       iPPSLastInvalidId;
+  int32_t                       iPPSInvalidNum;
+  int32_t                       iSPSLastInvalidId;
+  int32_t                       iSPSInvalidNum;
+  int32_t                       iSubSPSLastInvalidId;
+  int32_t                       iSubSPSInvalidNum;
+  int32_t                       iSeqId; //sequence id
+  int                           iOverwriteFlags;
+} SWelsDecoderSpsPpsCTX, *PWelsDecoderSpsPpsCTX;
+
+//Last Decoded Picture Info
+typedef struct tagSWelsLastDecPicInfo {
+  // Save the last nal header info
+  SNalUnitHeaderExt sLastNalHdrExt;
+  SSliceHeader      sLastSliceHeader;
+  int32_t           iPrevPicOrderCntMsb;
+  int32_t           iPrevPicOrderCntLsb;
+  PPicture          pPreviousDecodedPictureInDpb; //pointer to previously decoded picture in DPB for error concealment
+  int32_t           iPrevFrameNum;// frame number of previous frame well decoded for non-truncated mode yet
+  bool              bLastHasMmco5;
+  uint32_t          uiDecodingTimeStamp; //represent relative decoding time stamps
+} SWelsLastDecPicInfo, *PWelsLastDecPicInfo;
+
+typedef struct tagPictInfo {
+  SBufferInfo             sBufferInfo;
+  int32_t                 iPOC;
+  int32_t                 iPicBuffIdx;
+  uint32_t                uiDecodingTimeStamp;
+  bool                    bLastGOP;
+} SPictInfo, *PPictInfo;
+
+typedef struct tagPictReoderingStatus {
+  int32_t iPictInfoIndex;
+  int32_t iMinPOC;
+  int32_t iNumOfPicts;
+  int32_t iLastGOPRemainPicts;
+  int32_t iLastWrittenPOC;
+  int32_t iLargestBufferedPicIndex;
+} SPictReoderingStatus, *PPictReoderingStatus;
+
+/*
+ *  SWelsDecoderContext: to maintail all modules data over decoder@framework
+ */
+
+typedef struct TagWelsDecoderContext {
+  SLogContext sLogCtx;
+// Input
+  void*
+  pArgDec;                        // structured arguments for decoder, reserved here for extension in the future
+
+  SDataBuffer                   sRawData;
+  SDataBuffer                   sSavedData; //for parse only purpose
+
+// Configuration
+  SDecodingParam*               pParam;
+  uint32_t                      uiCpuFlag;                      // CPU compatibility detected
+
+  VIDEO_BITSTREAM_TYPE eVideoType; //indicate the type of video to decide whether or not to do qp_delta error detection.
+  bool                          bHaveGotMemory; // global memory for decoder context related ever requested?
+
+  int32_t                       iImgWidthInPixel;       // width of image in pixel reconstruction picture to be output
+  int32_t                       iImgHeightInPixel;// height of image in pixel reconstruction picture to be output
+  int32_t
+  iLastImgWidthInPixel;   // width of image in last successful pixel reconstruction picture to be output
+  int32_t
+  iLastImgHeightInPixel;// height of image in last successful pixel reconstruction picture to be output
+  bool bFreezeOutput; // indicating current frame freezing. Default: true
+
+
+// Derived common elements
+  SNalUnitHeader                sCurNalHead;
+  EWelsSliceType                eSliceType;                     // Slice type
+  bool                          bUsedAsRef;                     //flag as ref
+  int32_t                       iFrameNum;
+  int32_t                       iErrorCode;                     // error code return while decoding in case packets lost
+  SFmo                          sFmoList[MAX_PPS_COUNT];        // list for FMO storage
+  PFmo                          pFmo;                           // current fmo context after parsed slice_header
+  int32_t                       iActiveFmoNum;          // active count number of fmo context in list
+
+  /*needed info by decode slice level and mb level*/
+  int32_t
+  iDecBlockOffsetArray[24];     // address talbe for sub 4x4 block in intra4x4_mb, so no need to caculta the address every time.
+
+  struct {
+    uint32_t*  pMbType[LAYER_NUM_EXCHANGEABLE];                      /* mb type */
+    int16_t (*pMv[LAYER_NUM_EXCHANGEABLE][LIST_A])[MB_BLOCK4x4_NUM][MV_A]; //[LAYER_NUM_EXCHANGEABLE   MB_BLOCK4x4_NUM*]
+    int8_t (*pRefIndex[LAYER_NUM_EXCHANGEABLE][LIST_A])[MB_BLOCK4x4_NUM];
+    int8_t (*pDirect[LAYER_NUM_EXCHANGEABLE])[MB_BLOCK4x4_NUM];
+    bool*   pNoSubMbPartSizeLessThan8x8Flag[LAYER_NUM_EXCHANGEABLE];
+    bool*   pTransformSize8x8Flag[LAYER_NUM_EXCHANGEABLE];
+    int8_t* pLumaQp[LAYER_NUM_EXCHANGEABLE];        /*mb luma_qp*/
+    int8_t (*pChromaQp[LAYER_NUM_EXCHANGEABLE])[2];                                         /*mb chroma_qp*/
+    int16_t (*pMvd[LAYER_NUM_EXCHANGEABLE][LIST_A])[MB_BLOCK4x4_NUM][MV_A]; //[LAYER_NUM_EXCHANGEABLE   MB_BLOCK4x4_NUM*]
+    uint16_t* pCbfDc[LAYER_NUM_EXCHANGEABLE];
+    int8_t (*pNzc[LAYER_NUM_EXCHANGEABLE])[24];
+    int8_t (*pNzcRs[LAYER_NUM_EXCHANGEABLE])[24];
+    int16_t (*pScaledTCoeff[LAYER_NUM_EXCHANGEABLE])[MB_COEFF_LIST_SIZE]; /*need be aligned*/
+    int8_t (*pIntraPredMode[LAYER_NUM_EXCHANGEABLE])[8];  //0~3 top4x4 ; 4~6 left 4x4; 7 intra16x16
+    int8_t (*pIntra4x4FinalMode[LAYER_NUM_EXCHANGEABLE])[MB_BLOCK4x4_NUM];
+    uint8_t* pIntraNxNAvailFlag[LAYER_NUM_EXCHANGEABLE];
+    int8_t*  pChromaPredMode[LAYER_NUM_EXCHANGEABLE];
+    int8_t*  pCbp[LAYER_NUM_EXCHANGEABLE];
+    uint8_t (*pMotionPredFlag[LAYER_NUM_EXCHANGEABLE][LIST_A])[MB_PARTITION_SIZE]; // 8x8
+    uint32_t (*pSubMbType[LAYER_NUM_EXCHANGEABLE])[MB_SUB_PARTITION_SIZE];
+    int32_t* pSliceIdc[LAYER_NUM_EXCHANGEABLE];         // using int32_t for slice_idc
+    int8_t*  pResidualPredFlag[LAYER_NUM_EXCHANGEABLE];
+    int8_t*  pInterPredictionDoneFlag[LAYER_NUM_EXCHANGEABLE];
+    bool*    pMbCorrectlyDecodedFlag[LAYER_NUM_EXCHANGEABLE];
+    bool*    pMbRefConcealedFlag[LAYER_NUM_EXCHANGEABLE];
+    uint32_t iMbWidth;
+    uint32_t iMbHeight;
+  } sMb;
+
+
+// reconstruction picture
+  PPicture                      pDec;                   //pointer to current picture being reconstructed
+
+  PPicture
+  pTempDec;               //pointer to temp decoder picture to be used only for Bi Prediction.
+
+// reference pictures
+  SRefPic                       sRefPic;
+  SRefPic                       sTmpRefPic; //used to temporarily save RefPic for next active thread
+  SVlcTable*                    pVlcTable;               // vlc table
+
+  SBitStringAux                 sBs;
+  int32_t iMaxBsBufferSizeInByte; //actual memory size for BS buffer
+
+  /* Global memory external */
+  SWelsDecoderSpsPpsCTX        sSpsPpsCtx;
+  bool                         bHasNewSps;
+
+  SPosOffset sFrameCrop;
+
+  PSliceHeader                  pSliceHeader;
+
+  PPicBuff                      pPicBuff;       // Initially allocated memory for pictures which are used in decoding.
+  int32_t                       iPicQueueNumber;
+
+  PAccessUnit                   pAccessUnitList;        // current access unit list to be performed
+  //PSps                          pActiveLayerSps[MAX_LAYER_NUM];
+  PSps                          pSps;   // used by current AU
+  PPps                          pPps;   // used by current AU
+// Memory for pAccessUnitList is dynamically held till decoder destruction.
+  PDqLayer
+  pCurDqLayer;            // current DQ layer representation, also carry reference base layer if applicable
+  PDqLayer                      pDqLayersList[LAYER_NUM_EXCHANGEABLE];  // DQ layers list with memory allocated
+  PNalUnit                      pNalCur;          // point to current NAL Nnit
+  uint8_t                       uiNalRefIdc;      // NalRefIdc for easy access;
+  int32_t                       iPicWidthReq;             // picture width have requested the memory
+  int32_t                       iPicHeightReq;            // picture height have requested the memory
+
+  uint8_t                       uiTargetDqId;           // maximal DQ ID in current access unit, meaning target layer ID
+  //bool                          bAvcBasedFlag;          // For decoding bitstream:
+  bool                          bEndOfStreamFlag;       // Flag on end of stream requested by external application layer
+  bool                          bInstantDecFlag;        // Flag for no-delay decoding
+  bool                          bInitialDqLayersMem;    // dq layers related memory is available?
+
+  bool                          bOnlyOneLayerInCurAuFlag; //only one layer in current AU: 1
+
+  bool                          bReferenceLostAtT0Flag;
+  int32_t                       iTotalNumMbRec; //record current number of decoded MB
+#ifdef LONG_TERM_REF
+  bool                          bParamSetsLostFlag;     //sps or pps do not exist or not correct
+
+  bool
+  bCurAuContainLtrMarkSeFlag; //current AU has the LTR marking syntax element, mark the previous frame or self
+  int32_t                       iFrameNumOfAuMarkedLtr; //if bCurAuContainLtrMarkSeFlag==true, SHOULD set this variable
+
+  uint16_t                      uiCurIdrPicId;
+#endif
+  bool       bNewSeqBegin;
+  bool       bNextNewSeqBegin;
+
+//for Parse only
+  bool bFramePending;
+  bool bFrameFinish;
+  int32_t iNalNum;
+  int32_t iMaxNalNum; //permitted max NAL num stored in parser
+  SSpsBsInfo sSpsBsInfo [MAX_SPS_COUNT];
+  SSpsBsInfo sSubsetSpsBsInfo [MAX_PPS_COUNT];
+  SPpsBsInfo sPpsBsInfo [MAX_PPS_COUNT];
+  SParserBsInfo* pParserBsInfo;
+
+  //PPicture pPreviousDecodedPictureInDpb; //pointer to previously decoded picture in DPB for error concealment
+  PGetIntraPredFunc pGetI16x16LumaPredFunc[7];          //h264_predict_copy_16x16;
+  PGetIntraPredFunc pGetI4x4LumaPredFunc[14];           // h264_predict_4x4_t
+  PGetIntraPredFunc pGetIChromaPredFunc[7];             // h264_predict_8x8_t
+  PIdctResAddPredFunc pIdctResAddPredFunc;
+  PIdctFourResAddPredFunc pIdctFourResAddPredFunc;
+  SMcFunc sMcFunc;
+  //Transform8x8
+  PGetIntraPred8x8Func pGetI8x8LumaPredFunc[14];
+  PIdctResAddPredFunc  pIdctResAddPredFunc8x8;
+
+//For error concealment
+  SCopyFunc sCopyFunc;
+  /* For Deblocking */
+  SDeblockingFunc     sDeblockingFunc;
+  SExpandPicFunc      sExpandPicFunc;
+
+  /* For Block */
+  SBlockFunc          sBlockFunc;
+
+  int32_t iCurSeqIntervalTargetDependId;
+  int32_t iCurSeqIntervalMaxPicWidth;
+  int32_t iCurSeqIntervalMaxPicHeight;
+
+  PWelsFillNeighborMbInfoIntra4x4Func  pFillInfoCacheIntraNxNFunc;
+  PWelsMapNeighToSample pMapNxNNeighToSampleFunc;
+  PWelsMap16NeighToSample pMap16x16NeighToSampleFunc;
+
+//feedback whether or not have VCL in current AU, and the temporal ID
+  int32_t iFeedbackVclNalInAu;
+  int32_t iFeedbackTidInAu;
+  int32_t iFeedbackNalRefIdc;
+
+  bool bAuReadyFlag;   // true: one au is ready for decoding; false: default value
+
+  bool bPrintFrameErrorTraceFlag; //true: can print info for upper layer
+  int32_t iIgnoredErrorInfoPacketCount; //store the packet number with error decoding info
+//trace handle
+  void*      pTraceHandle;
+
+  PWelsLastDecPicInfo pLastDecPicInfo;
+
+  SWelsCabacCtx sWelsCabacContexts[4][WELS_QP_MAX + 1][WELS_CONTEXT_COUNT];
+  bool bCabacInited;
+  SWelsCabacCtx   pCabacCtx[WELS_CONTEXT_COUNT];
+  PWelsCabacDecEngine   pCabacDecEngine;
+  double dDecTime;
+  SDecoderStatistics* pDecoderStatistics; // For real time debugging
+  int32_t iMbEcedNum;
+  int32_t iMbEcedPropNum;
+  int32_t iMbNum;
+  bool bMbRefConcealed;
+  bool bRPLRError;
+  int32_t iECMVs[16][2];
+  PPicture pECRefPic[16];
+  unsigned long long uiTimeStamp;
+  uint32_t    uiDecodingTimeStamp; //represent relative decoding time stamps
+// To support scaling list HP
+  uint16_t  pDequant_coeff_buffer4x4[6][52][16];
+  uint16_t  pDequant_coeff_buffer8x8[6][52][64];
+  uint16_t (*pDequant_coeff4x4[6])[16];// 4x4 sclaing list value pointer
+  uint16_t (*pDequant_coeff8x8[6])[64];//64 residual coeff ,with 6 kinds of residual type, 52 qp level
+  int iDequantCoeffPpsid;//When a new pps actived, reinitialised the scaling list value
+  bool bDequantCoeff4x4Init;
+  bool bUseScalingList;
+  CMemoryAlign*     pMemAlign;
+  void* pThreadCtx;
+  void* pLastThreadCtx;
+  WELS_MUTEX* pCsDecoder;
+  int16_t lastReadyHeightOffset[LIST_A][MAX_REF_PIC_COUNT]; //last ready reference MB offset
+  PPictInfo               pPictInfoList;
+  PPictReoderingStatus    pPictReoderingStatus;
+  SBufferInfo*            pDstInfo;
+} SWelsDecoderContext, *PWelsDecoderContext;
+
+typedef struct tagSWelsDecThread {
+  SWelsDecSemphore* sIsBusy;
+  SWelsDecSemphore sIsActivated;
+  SWelsDecSemphore sIsIdle;
+  SWelsDecThread sThrHandle;
+  uint32_t uiCommand;
+  uint32_t uiThrNum;
+  uint32_t uiThrMaxNum;
+  uint32_t uiThrStackSize;
+  DECLARE_PROCTHREAD_PTR (pThrProcMain);
+} SWelsDecThreadInfo, *PWelsDecThreadInfo;
+
+typedef struct tagSWelsDecThreadCtx {
+  SWelsDecThreadInfo sThreadInfo;
+  PWelsDecoderContext pCtx;
+  void* threadCtxOwner;
+  uint8_t* kpSrc;
+  int32_t kiSrcLen;
+  uint8_t** ppDst;
+  SBufferInfo sDstInfo;
+  PPicture pDec;
+  SWelsDecEvent sImageReady;
+  SWelsDecEvent sSliceDecodeStart;
+  SWelsDecEvent sSliceDecodeFinish;
+  int32_t       iPicBuffIdx; //picBuff Index
+} SWelsDecoderThreadCTX, *PWelsDecoderThreadCTX;
+
+static inline void ResetActiveSPSForEachLayer (PWelsDecoderContext pCtx) {
+  if (pCtx->iTotalNumMbRec == 0) {
+    for (int i = 0; i < MAX_LAYER_NUM; i++) {
+      pCtx->sSpsPpsCtx.pActiveLayerSps[i] = NULL;
+    }
+  }
+}
+static inline int32_t GetThreadCount (PWelsDecoderContext pCtx) {
+  int32_t iThreadCount = 0;
+  if (pCtx->pThreadCtx != NULL) {
+    PWelsDecoderThreadCTX pThreadCtx = (PWelsDecoderThreadCTX)pCtx->pThreadCtx;
+    iThreadCount = pThreadCtx->sThreadInfo.uiThrMaxNum;
+  }
+  return iThreadCount;
+}
+//GetPrevFrameNum only applies when thread count >= 2
+static inline int32_t GetPrevFrameNum (PWelsDecoderContext pCtx) {
+  if (pCtx->uiDecodingTimeStamp > 0) {
+    PWelsDecoderThreadCTX pThreadCtx = (PWelsDecoderThreadCTX)pCtx->pThreadCtx;
+    int32_t iThreadCount = int32_t (pThreadCtx->sThreadInfo.uiThrMaxNum);
+    int32_t  uiThrNum = int32_t (pThreadCtx->sThreadInfo.uiThrNum);
+    for (int32_t i = 0; i < iThreadCount; ++i) {
+      int32_t id = i - uiThrNum;
+      if (id != 0 && pThreadCtx[id].pCtx->uiDecodingTimeStamp == pCtx->uiDecodingTimeStamp - 1) {
+        if (pThreadCtx[id].pCtx->pDec != NULL) {
+          int32_t iFrameNum = pThreadCtx[id].pCtx->pDec->iFrameNum;
+          if (iFrameNum >= 0) return iFrameNum;
+        }
+        return pThreadCtx[id].pCtx->iFrameNum;
+      }
+    }
+  }
+  return pCtx->pLastDecPicInfo->iPrevFrameNum;
+}
+//#ifdef __cplusplus
+//}
+//#endif//__cplusplus
+
+
+} // namespace WelsDec
+
+#endif//WELS_DECODER_FRAMEWORK_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_core.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_core.h
new file mode 100644
index 0000000000..df25339967
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/decoder_core.h
@@ -0,0 +1,206 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  decoder_core.h
+ *
+ *  Abstract
+ *      Encapsulative core interfaces
+ *
+ *  History
+ *      07/10/2008 Created
+ *
+ *****************************************************************************/
+#ifndef WELS_DECODER_CORE_H__
+#define WELS_DECODER_CORE_H__
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "decoder_context.h"
+
+#include "codec_def.h"
+
+namespace WelsDec {
+/*
+ * InitBsBuffer
+ * Memory allocation for Bitstream Buffer
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h.
+ */
+int32_t InitBsBuffer (PWelsDecoderContext pCtx);
+
+/*
+ * ExpandBsBuffer
+ * Expand current BS buffer and copy its content
+ * new buffer size will consider input size as a reference
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h.
+ */
+int32_t ExpandBsBuffer (PWelsDecoderContext pCtx, const int32_t kiSrcLen);
+
+/*
+ * ExpandBsLenBuffer
+ * Expand current BS length buffer to double size or maximum, due to max slice number exceeding
+ * Parameter:
+ * kiCurrLen: current value of total nal number (including non-VCL nal)
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h.
+ */
+int32_t ExpandBsLenBuffer (PWelsDecoderContext pCtx, const int32_t kiCurrLen);
+
+/*
+ * CheckBsBuffer
+ * Check if current buffer size is enough
+ */
+int32_t CheckBsBuffer (PWelsDecoderContext pCtx, const int32_t kiSrcLen);
+
+/*
+ * WelsInitStaticMemory
+ * Memory request for introduced data at decoder start
+ * Especially for:
+ * rbsp_au_buffer, cur_dq_layer_ptr and ref_dq_layer_ptr in MB info cache.
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h.
+ */
+int32_t WelsInitStaticMemory (PWelsDecoderContext pCtx);
+
+/*
+ * WelsFreeStaticMemory
+ * Free memory introduced in WelsInitStaticMemory at destruction of decoder.
+ *
+ */
+void WelsFreeStaticMemory (PWelsDecoderContext pCtx);
+
+/*!
+ * \brief   request memory when maximal picture width and height are available
+ */
+int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWidth, const int32_t kiMaxHeight);
+
+/*!
+ * \brief   free dq layer context memory related
+ */
+void UninitialDqLayersContext (PWelsDecoderContext pCtx);
+
+/*
+ *  DecodeNalHeaderExt
+ *  Trigger condition: NAL_UNIT_TYPE = NAL_UNIT_PREFIX or NAL_UNIT_CODED_SLICE_EXT
+ *  Parameter:
+ *  pNal:   target NALUnit ptr
+ *  pSrc:   NAL Unit bitstream
+ */
+void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc);
+
+/*
+ *  ParseSliceHeaderSyntaxs
+ *  Parse slice header of bitstream
+ */
+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag);
+/*
+ *  Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
+ *  pSrc:   mark as decoded prefix NAL
+ *  pDst:   succeeded VCL NAL based AVC (I/P Slice)
+ */
+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kpDst, PNalUnit const kpSrc);
+
+/*
+* WelsDecodeInitAccessUnitStart
+* check and (re)allocate picture buffers on new sequence begin
+*  bit_len:    size in bit length of data
+*  buf_len:    size in byte length of data
+*  coded_au:   mark an Access Unit decoding finished
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t WelsDecodeInitAccessUnitStart (PWelsDecoderContext pCtx, SBufferInfo* pDstInfo);
+/*
+* AllocPicBuffOnNewSeqBegin
+* check and (re)allocate picture buffers on new sequence begin
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t AllocPicBuffOnNewSeqBegin (PWelsDecoderContext pCtx);
+
+/*
+* InitConstructAccessUnit
+* Init before constructing an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to
+* joint a collective access unit.
+* parameter\
+*  SBufferInfo:    Buffer info
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t InitConstructAccessUnit (PWelsDecoderContext pCtx, SBufferInfo* pDstInfo);
+
+/*
+ * ConstructAccessUnit
+ * construct an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to
+ * joint a collective access unit.
+ * parameter\
+ *  buf:        bitstream data buffer
+ *  bit_len:    size in bit length of data
+ *  buf_len:    size in byte length of data
+ *  coded_au:   mark an Access Unit decoding finished
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h
+ */
+int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo);
+
+
+/*
+ * DecodeCurrentAccessUnit
+ * Decode current access unit when current AU is completed.
+ */
+int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo);
+
+/*
+ * Check if frame is completed and EC is required
+ */
+bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** pDst, SBufferInfo* pDstInfo);
+/*
+ *  Prepare current dq layer context initialization.
+ */
+void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps);
+
+
+int32_t WelsDecodeAccessUnitStart (PWelsDecoderContext pCtx);
+void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx);
+void DecodeFinishUpdate (PWelsDecoderContext pCtx);
+
+void ForceResetCurrentAccessUnit (PAccessUnit pAu);
+void ForceClearCurrentNal (PAccessUnit pAu);
+
+bool CheckRefPicturesComplete (PWelsDecoderContext pCtx); // Check whether all ref pictures are complete
+
+void ForceResetParaSetStatusAndAUList (PWelsDecoderContext pCtx);
+} // namespace WelsDec
+
+#endif//WELS_DECODER_CORE_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_code.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_code.h
new file mode 100644
index 0000000000..8e9c37842b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_code.h
@@ -0,0 +1,222 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    error_code.h
+ *
+ * \brief   Error codes used in Wels decoder side
+ *
+ * \date    3/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_ERROR_CODE_H__
+#define WELS_ERROR_CODE_H__
+
+namespace WelsDec {
+
+typedef enum TagWelsErr {
+  ERR_NONE                = 0,
+  ERR_INVALID_PARAMETERS  = 1,
+  ERR_MALLOC_FAILED       = 2,
+  ERR_API_FAILED          = 3,
+
+  ERR_BOUND               = 31
+} EWelsErr;
+
+/*
+ * Specified error format:
+ * ERR_NO = (ERR_LEVEL_FROM (HIGH WORD) << 16) | (ERR_INFO_FROM (LOW WORD))
+ *
+ */
+#define GENERATE_ERROR_NO(iErrLevel, iErrInfo) ((iErrLevel << 16) | (iErrInfo & 0xFFFF))
+#define ERR_INVALID_INTRA4X4_MODE -1
+
+/* ERR_LEVEL */
+//-----------------------------------------------------------------------------------------------------------
+enum {
+  ERR_LEVEL_ACCESS_UNIT = 1,
+  ERR_LEVEL_NAL_UNIT_HEADER,
+  ERR_LEVEL_PREFIX_NAL,
+  ERR_LEVEL_PARAM_SETS,
+  ERR_LEVEL_SLICE_HEADER,
+  ERR_LEVEL_SLICE_DATA,
+  ERR_LEVEL_MB_DATA
+};
+
+//-----------------------------------------------------------------------------------------------------------
+
+/* More detailed error information, maximal value is 65535 */
+//-----------------------------------------------------------------------------------------------------------
+#define ERR_INFO_COMMON_BASE        1
+#define ERR_INFO_SYNTAX_BASE        1001
+#define ERR_INFO_LOGIC_BASE         10001
+enum {
+  /* Error from common system level: 1-1000 */
+  ERR_INFO_OUT_OF_MEMORY      = ERR_INFO_COMMON_BASE,
+  ERR_INFO_INVALID_ACCESS,
+  ERR_INFO_INVALID_PTR,
+  ERR_INFO_INVALID_PARAM,
+  ERR_INFO_FILE_NO_FOUND,
+  ERR_INFO_PATH_NO_FOUND,
+  ERR_INFO_ACCESS_DENIED,
+  ERR_INFO_NOT_READY,
+  ERR_INFO_WRITE_FAULT,
+  ERR_INFO_READ_FAULT,
+  ERR_INFO_READ_OVERFLOW,
+  ERR_INFO_READ_LEADING_ZERO,
+  ERR_INFO_UNINIT,
+  /* Error from H.264 syntax elements parser: 1001-10000 */
+  ERR_INFO_NO_PREFIX_CODE         = ERR_INFO_SYNTAX_BASE, // No start prefix code indication
+  ERR_INFO_NO_PARAM_SETS,                                 // No SPS and/ PPS before sequence header
+  ERR_INFO_PARAM_SETS_NOT_INTEGRATED,                     // Parameters sets (sps/pps) are not integrated at all before to decode VCL nal
+  ERR_INFO_SPS_ID_OVERFLOW,
+  ERR_INFO_PPS_ID_OVERFLOW,
+  ERR_INFO_INVALID_PROFILE_IDC,
+  ERR_INFO_UNMATCHED_LEVEL_IDC,
+  ERR_INFO_INVALID_POC_TYPE,
+  ERR_INFO_INVALID_MB_SIZE_INFO,
+  ERR_INFO_REF_COUNT_OVERFLOW,
+  ERR_INFO_CROPPING_NO_SUPPORTED,
+  ERR_INFO_INVALID_CROPPING_DATA,
+  ERR_INFO_UNSUPPORTED_VUI_HRD,
+  ERR_INFO_INVALID_SLICEGROUP,
+  ERR_INFO_INVALID_SLICEGROUP_MAP_TYPE,
+  ERR_INFO_INVALID_FRAME_NUM,
+  ERR_INFO_INVALID_IDR_PIC_ID,
+  ERR_INFO_INVALID_REDUNDANT_PIC_CNT,
+  ERR_INFO_INVALID_MAX_NUM_REF_FRAMES,
+  ERR_INFO_INVALID_MAX_MB_SIZE,
+  ERR_INFO_INVALID_FIRST_MB_IN_SLICE,
+  ERR_INFO_INVALID_NUM_REF_IDX_L0_ACTIVE_MINUS1,
+  ERR_INFO_INVALID_NUM_REF_IDX_L1_ACTIVE_MINUS1,
+  ERR_INFO_INVALID_SLICE_ALPHA_C0_OFFSET_DIV2,
+  ERR_INFO_INVALID_SLICE_BETA_OFFSET_DIV2,
+  ERR_INFO_FMO_INIT_FAIL,
+  ERR_INFO_SLICE_TYPE_OVERFLOW,
+  ERR_INFO_INVALID_CABAC_INIT_IDC,
+  ERR_INFO_INVALID_QP,
+  ERR_INFO_INVALID_PIC_INIT_QS,
+  ERR_INFO_INVALID_CHROMA_QP_INDEX_OFFSET,
+  ERR_INFO_INVALID_PIC_INIT_QP,
+  ERR_INFO_INVALID_LOG2_MAX_FRAME_NUM_MINUS4,
+  ERR_INFO_INVALID_LOG2_MAX_PIC_ORDER_CNT_LSB_MINUS4,
+  ERR_INFO_INVALID_NUM_REF_FRAME_IN_PIC_ORDER_CNT_CYCLE,
+  ERR_INFO_INVALID_DBLOCKING_IDC,
+  ERR_INFO_INVALID_MB_TYPE,
+  ERR_INFO_INVALID_MB_SKIP_RUN,
+  ERR_INFO_INVALID_SPS_ID,
+  ERR_INFO_INVALID_PPS_ID,
+  ERR_INFO_INVALID_SUB_MB_TYPE,
+  ERR_INFO_UNAVAILABLE_TOP_BLOCK_FOR_INTRA,
+  ERR_INFO_UNAVAILABLE_LEFT_BLOCK_FOR_INTRA,
+  ERR_INFO_INVALID_REF_INDEX,
+  ERR_INFO_INVALID_CBP,
+  ERR_INFO_DQUANT_OUT_OF_RANGE,
+  ERR_INFO_CAVLC_INVALID_PREFIX,
+  ERR_INFO_CAVLC_INVALID_LEVEL,
+  ERR_INFO_CAVLC_INVALID_TOTAL_COEFF_OR_TRAILING_ONES,
+  ERR_INFO_CAVLC_INVALID_ZERO_LEFT,
+  ERR_INFO_CAVLC_INVALID_RUN_BEFORE,
+  ERR_INFO_MV_OUT_OF_RANGE,
+
+  ERR_INFO_INVALID_I4x4_PRED_MODE,
+  ERR_INFO_INVALID_I16x16_PRED_MODE,
+  ERR_INFO_INVALID_I_CHROMA_PRED_MODE,
+
+  ERR_INFO_INVALID_LUMA_LOG2_WEIGHT_DENOM,
+  ERR_INFO_INVALID_CHROMA_LOG2_WEIGHT_DENOM,
+  ERR_INFO_INVALID_LUMA_WEIGHT,
+  ERR_INFO_INVALID_CHROMA_WEIGHT,
+  ERR_INFO_INVALID_LUMA_OFFSET,
+  ERR_INFO_INVALID_CHROMA_OFFSET,
+
+  ERR_INFO_UNSUPPORTED_NON_BASELINE,
+  ERR_INFO_UNSUPPORTED_FMOTYPE,
+  ERR_INFO_UNSUPPORTED_MBAFF,
+  ERR_INFO_UNSUPPORTED_ILP,
+  ERR_INFO_UNSUPPORTED_CABAC_EL,
+  ERR_INFO_UNSUPPORTED_SPSI,
+  ERR_INFO_UNSUPPORTED_MGS,
+  ERR_INFO_UNSUPPORTED_BIPRED,
+  ERR_INFO_UNSUPPORTED_WP,
+  ERR_INFO_UNSUPPORTED_SLICESKIP,
+
+  ERR_INFO_FRAMES_LOST,
+  ERR_INFO_DEPENDENCY_SPATIAL_LAYER_LOST,
+  ERR_INFO_DEPENDENCY_QUALIT_LAYER_LOST,
+  ERR_INFO_REFERENCE_PIC_LOST,
+  ERR_INFO_INVALID_REORDERING,
+  ERR_INFO_INVALID_MARKING,
+
+  ERR_INFO_FMO_NOT_SUPPORTED_IN_BASE_LAYER,
+  ERR_INFO_INVALID_ESS,
+  ERR_INFO_INVALID_SLICE_TYPE,
+  ERR_INFO_INVALID_REF_MARKING,
+  ERR_INFO_INVALID_REF_REORDERING,
+
+  /* Error from corresponding logic, 10001-65535 */
+  ERR_INFO_NO_IDR_PIC             = ERR_INFO_LOGIC_BASE,  // NO IDR picture available before sequence header
+  ERR_INFO_EC_NO_NEIGHBOUR_MBS,
+  ERR_INFO_EC_UNEXPECTED_MB_TYPE,
+  ERR_INFO_EC_NO_ENOUGH_NEIGHBOUR_MBS,
+  ERR_INFO_DUPLICATE_FRAME_NUM,
+//for LTR
+  ERR_INFO_INVALID_MMCO_NUM,
+  ERR_INFO_INVALID_MMCO_OPCODE_BASE,
+  ERR_INFO_INVALID_MMCO_SHORT2UNUSED,
+  EER_INFO_INVALID_MMCO_LONG2UNUSED,
+  ERR_INFO_INVALID_MMCO_SHOART2LONG,
+  ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW,
+  ERR_INFO_INVALID_MMCO_REF_NUM_NOT_ENOUGH,
+  ERR_INFO_INVALID_MMCO_LONG_TERM_IDX_EXCEED_MAX,
+//for CABAC
+  ERR_CABAC_NO_BS_TO_READ,
+  ERR_CABAC_UNEXPECTED_VALUE,
+//for scaling list
+  ERR_SCALING_LIST_DELTA_SCALE,
+//logic error related to multi-layer
+  ERR_INFO_WIDTH_MISMATCH,
+//reconstruction error
+  ERR_INFO_MB_RECON_FAIL,
+  ERR_INFO_MB_NUM_EXCEED_FAIL,
+  ERR_INFO_BS_INCOMPLETE,
+  ERR_INFO_MB_NUM_INADEQUATE,
+//parse only error
+  ERR_INFO_PARSEONLY_PENDING,
+  ERR_INFO_PARSEONLY_ERROR,
+};
+//-----------------------------------------------------------------------------------------------------------
+
+} // namespace WelsDec
+
+#endif//WELS_ERROR_CODE_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_concealment.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_concealment.h
new file mode 100644
index 0000000000..60a8e068ff
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/error_concealment.h
@@ -0,0 +1,68 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    error_concealment.h
+ *
+ * \brief   Interfaces introduced for error concealment
+ *
+ * \date    04/14/2014 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_ERROR_CONCEALMENT_H__
+#define WELS_ERROR_CONCEALMENT_H__
+#include "typedefs.h"
+#include "rec_mb.h"
+#include "decoder_context.h"
+
+namespace WelsDec {
+//Initialize error concealment
+void InitErrorCon (PWelsDecoderContext pCtx);
+//Do error concealment using frame copy method
+void DoErrorConFrameCopy (PWelsDecoderContext pCtx);
+//Do error concealment using slice copy method
+void DoErrorConSliceCopy (PWelsDecoderContext pCtx);
+//Do error concealment using slice MV copy method
+void DoMbECMvCopy (PWelsDecoderContext pCtx, PPicture pDec, PPicture pRef, int32_t iMbXy, int32_t iMbX, int32_t iMbY,
+                   sMCRefMember* pMCRefMem, int32_t iCurrPoc);
+void GetAvilInfoFromCorrectMb (PWelsDecoderContext pCtx);
+void DoErrorConSliceMVCopy (PWelsDecoderContext pCtx);
+//Mark erroneous frame as Ref Pic into DPB
+int32_t MarkECFrameAsRef (PWelsDecoderContext pCtx);
+//Judge if EC is needed to current frame
+bool NeedErrorCon (PWelsDecoderContext pCtx);
+// ImplementErrorConceal
+// Do actual error concealment
+void ImplementErrorCon (PWelsDecoderContext pCtx);
+
+} // namespace WelsDec
+
+#endif//WELS_ERROR_CONCEALMENT_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/fmo.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/fmo.h
new file mode 100644
index 0000000000..7d17b98625
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/fmo.h
@@ -0,0 +1,114 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    fmo.h
+ *
+ * \brief   Flexible Macroblock Ordering implementation
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_FLEXIBLE_MACROBLOCK_ORDERING_H__
+#define WELS_FLEXIBLE_MACROBLOCK_ORDERING_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "parameter_sets.h"
+#include "memory_align.h"
+
+namespace WelsDec {
+
+#ifndef MB_XY_T
+#define MB_XY_T int32_t
+#endif//MB_XY_T
+
+/*!
+ * \brief   Wels Flexible Macroblock Ordering (FMO)
+ */
+typedef struct TagFmo {
+  uint8_t*        pMbAllocMap;
+  int32_t         iCountMbNum;
+  int32_t         iSliceGroupCount;
+  int32_t         iSliceGroupType;
+  bool            bActiveFlag;
+  uint8_t         uiReserved[3];          // reserved padding bytes
+} SFmo, *PFmo;
+
+
+/*!
+ * \brief   Initialize Wels Flexible Macroblock Ordering (FMO)
+ *
+ * \param   pFmo        Wels fmo to be initialized
+ * \param   pPps        PPps
+ * \param   kiMbWidth   mb width
+ * \param   kiMbHeight  mb height
+ *
+ * \return  0 - successful; none 0 - failed;
+ */
+int32_t InitFmo (PFmo pFmo, PPps pPps, const int32_t kiMbWidth, const int32_t kiMbHeight, CMemoryAlign* pMa);
+
+/*!
+ * \brief   Uninitialize Wels Flexible Macroblock Ordering (FMO) list
+ *
+ * \param   pFmo        Wels base fmo ptr to be uninitialized
+ * \param   kiCnt       count number of PPS per list
+ * \param   kiAvail     count available number of PPS in list
+ *
+ * \return  NONE
+ */
+void UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail, CMemoryAlign* pMa);
+
+/*!
+ * \brief   update/insert FMO parameter unit
+ *
+ * \param   pFmo    FMO context
+ * \param   pSps    PSps
+ * \param   pPps    PPps
+ * \param   pActiveFmoNum   int32_t* [in/out]
+ *
+ * \return  true - update/insert successfully; false - failed;
+ */
+int32_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum, CMemoryAlign* pMa);
+
+/*!
+ * \brief   Get successive mb to be processed with given current mb_xy
+ *
+ * \param   pFmo            Wels fmo context
+ * \param   iMbXy           current mb_xy
+ *
+ * \return  iNextMb - successful; -1 - failed;
+ */
+MB_XY_T FmoNextMb (PFmo pFmo, const MB_XY_T kiMbXy);
+
+} // namespace WelsDec
+
+#endif//WELS_FLEXIBLE_MACROBLOCK_ORDERING_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/get_intra_predictor.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/get_intra_predictor.h
new file mode 100644
index 0000000000..4739970802
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/get_intra_predictor.h
@@ -0,0 +1,191 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    get_intra_predictor.h
+ *
+ * \brief   interfaces for get intra predictor about 16x16, 4x4, chroma.
+ *
+ * \date    4/2/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_GET_INTRA_PREDICTOR_H__
+#define WELS_GET_INTRA_PREDICTOR_H__
+
+#include "typedefs.h"
+
+namespace WelsDec {
+
+void WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride);
+
+void WelsI8x8LumaPredV_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredH_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDc_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredVL_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredVR_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredHU_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+void WelsI8x8LumaPredHD_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail);
+
+void WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+
+void WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride);
+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+void WelsDecoderI16x16LumaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredV_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcNA_sse2 (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderIChromaPredDcTop_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredPlane_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDc_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredH_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredV_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcLeft_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcNA_mmx (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderI4x4LumaPredH_sse2 (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDR_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHD_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHU_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVR_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDL_mmx (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVL_mmx (uint8_t* pPred, const int32_t kiStride);
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+void WelsDecoderI16x16LumaPredV_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredH_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDc_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredPlane_neon (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderI4x4LumaPredV_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredH_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDL_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDR_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVL_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVR_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHU_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHD_neon (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderIChromaPredV_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredH_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDc_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredPlane_neon (uint8_t* pPred, const int32_t kiStride);
+#endif//HAVE_NEON
+
+#if defined(HAVE_NEON_AARCH64)
+void WelsDecoderI16x16LumaPredV_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredH_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDc_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredPlane_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcTop_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcLeft_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderI4x4LumaPredH_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDL_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDDLTop_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVL_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVLTop_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredVR_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHU_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredHD_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDc_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredDcTop_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderIChromaPredV_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredH_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDc_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredPlane_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDcTop_AArch64_neon (uint8_t* pPred, const int32_t kiStride);
+#endif//HAVE_NEON_AARCH64
+
+#if defined(HAVE_MMI)
+void WelsDecoderI16x16LumaPredDc_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredPlane_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredH_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredV_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcTop_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI16x16LumaPredDcNA_mmi (uint8_t* pPred, const int32_t kiStride);
+
+void WelsDecoderIChromaPredDcTop_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredPlane_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderIChromaPredDc_mmi (uint8_t* pPred, const int32_t kiStride);
+void WelsDecoderI4x4LumaPredH_mmi (uint8_t* pPred, const int32_t kiStride);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+} // namespace WelsDec
+
+#endif //WELS_GET_INTRA_PREDICTOR_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/manage_dec_ref.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/manage_dec_ref.h
new file mode 100644
index 0000000000..164ae15d6c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/manage_dec_ref.h
@@ -0,0 +1,62 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  \file   manage_dec_ref.h
+ *
+ *  Abstract
+ *      Interface for managing reference picture
+ *
+ *  History
+ *      08/14/2009 Created
+ *
+ *****************************************************************************/
+#ifndef WELS_MANAGE_DEC_REF_H__
+#define WELS_MANAGE_DEC_REF_H__
+
+
+#include "typedefs.h"
+#include "decoder_context.h"
+
+namespace WelsDec {
+
+void  WelsResetRefPic (PWelsDecoderContext pCtx);
+void  WelsResetRefPicWithoutUnRef (PWelsDecoderContext pCtx);
+int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc);
+int32_t WelsInitBSliceRefList (PWelsDecoderContext pCtx, int32_t iPoc);
+int32_t WelsReorderRefList (PWelsDecoderContext pCtx);
+int32_t WelsReorderRefList2 (PWelsDecoderContext pCtx);
+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, PPicture pLastDec = NULL);
+
+} // namespace WelsDec
+
+#endif//WELS_MANAGE_DEC_REF_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mb_cache.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mb_cache.h
new file mode 100644
index 0000000000..45adc4dd19
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mb_cache.h
@@ -0,0 +1,80 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//mb_cache.h
+#ifndef WELS_MACROBLOCK_CACHE_H__
+#define WELS_MACROBLOCK_CACHE_H__
+
+#include "typedefs.h"
+
+namespace WelsDec {
+
+#define REF_NOT_AVAIL    -2
+#define REF_NOT_IN_LIST  -1  //intra
+
+/*
+ *  MB Cache information, such one cache should be defined within a slice
+ */
+/*
+ * Cache for Luma               Cache for Chroma(Cb, Cr)
+ *
+ *  TL T T T T                  TL T T
+ *   L - - - -                   L - -
+ *   L - - - -                   L - - TR
+ *   L - - - -
+ *   L - - - - TR
+ *
+ */
+
+////////////////////////mapping scan index////////////////////////
+
+extern const uint8_t g_kuiScan4[16];
+
+typedef struct TagNeighborAvail {
+int32_t iTopAvail;
+int32_t iLeftAvail;
+int32_t iRightTopAvail;
+int32_t iLeftTopAvail;  //used for check intra_pred_mode avail or not   //1: avail; 0: unavail
+
+int32_t iLeftType;
+int32_t iTopType;
+int32_t iLeftTopType;
+int32_t iRightTopType;
+
+int8_t  iTopCbp;
+int8_t  iLeftCbp;
+int8_t iDummy[2]; //for align
+} SWelsNeighAvail, *PWelsNeighAvail;
+
+} // namespace WelsDec
+
+#endif//WELS_MACROBLOCK_CACHE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/memmgr_nal_unit.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/memmgr_nal_unit.h
new file mode 100644
index 0000000000..380e32ca9c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/memmgr_nal_unit.h
@@ -0,0 +1,66 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  memmgr_nal_unit.h
+ *
+ *  Abstract
+ *      memory manager utils for NAL Unit list available
+ *
+ *  History
+ *      07/10/2008 Created
+ *
+ *****************************************************************************/
+#ifndef WELS_MEMORY_MANAGER_NAL_UNIT_H__
+#define WELS_MEMORY_MANAGER_NAL_UNIT_H__
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "nalu.h"
+#include "memory_align.h"
+
+namespace WelsDec {
+
+int32_t MemInitNalList (PAccessUnit* ppAu, const uint32_t kuiSize, CMemoryAlign* pMa);
+
+int32_t MemFreeNalList (PAccessUnit* ppAu, CMemoryAlign* pMa);
+
+/*
+ *  MemGetNextNal
+ *  Get next NAL Unit for using.
+ *  Need expand NAL Unit list if exceeding count number of available NAL Units withing an Access Unit
+ */
+PNalUnit MemGetNextNal (PAccessUnit* ppAu, CMemoryAlign* pMa);
+
+} // namespace WelsDec
+
+#endif//WELS_MEMORY_MANAGER_NAL_UNIT_H__
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mv_pred.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mv_pred.h
new file mode 100644
index 0000000000..943c38d532
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/mv_pred.h
@@ -0,0 +1,195 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mv_pred.h
+ *
+ * \brief   Get MV predictor and update motion vector of mb cache
+ *
+ * \date    05/22/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_MV_PRED_H__
+#define WELS_MV_PRED_H__
+
+#include "dec_frame.h"
+#include "decoder_context.h"
+
+#define RETURN_ERR_IF_NULL(pRefPic0) \
+if ( pRefPic0 == NULL) \
+  return GENERATE_ERROR_NO(ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX)
+
+namespace WelsDec {
+
+/*!
+* \brief     update mv and ref_index cache for current MB, only for P_16x16 (SKIP inclusive)
+* \param
+* \param
+*/
+void UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int32_t listIdx, int8_t iRef, int16_t iMVs[2]);
+
+/*!
+* \brief     update ref_index cache for current MB, only for P_16x16 (SKIP inclusive)
+* \param
+* \param
+*/
+void UpdateP16x16RefIdx (PDqLayer pCurDqLayer, int32_t listIdx, int8_t iRef);
+
+/*!
+* \brief     update mv only cache for current MB, only for P_16x16 (SKIP inclusive)
+* \param
+* \param
+*/
+void UpdateP16x16MotionOnly (PDqLayer pCurDqLayer, int32_t listIdx, int16_t iMVs[2]);
+
+/*!
+* \brief   update mv and ref_index cache for current MB, only for P_16x8
+* \param
+* \param
+*/
+void UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+                            int8_t iRefIndex[LIST_A][30],
+                            int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]);
+
+
+/*!
+ * \brief    update mv and ref_index cache for current MB, only for P_8x16
+ * \param
+ * \param
+ */
+void UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+                            int8_t iRefIndex[LIST_A][30],
+                            int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]);
+
+/*!
+ * \brief   get the motion predictor for skip mode
+ * \param
+ * \param   output iMvp[]
+ */
+void PredPSkipMvFromNeighbor (PDqLayer pCurDqLayer, int16_t iMvp[2]);
+
+/*!
+* \brief   get the motion predictor and reference for B-slice direct mode version 2
+* \param
+* \param   output iMvp[] and ref
+*/
+int32_t  PredMvBDirectSpatial (PWelsDecoderContext pCtx, int16_t iMvp[LIST_A][2], int8_t ref[LIST_A],
+                               SubMbType& subMbType);
+
+/*!
+* \brief   get Colocated MB for both Spatial and Temporal Direct Mode
+* \param
+* \param   output MbType and SubMbType
+*/
+int32_t GetColocatedMb (PWelsDecoderContext pCtx, MbType& mbType, SubMbType& subMbType);
+
+/*!
+* \brief   get the motion predictor for B-slice temporal direct mode 16x16
+*/
+int32_t PredBDirectTemporal (PWelsDecoderContext pCtx, int16_t iMvp[LIST_A][2], int8_t ref[LIST_A],
+                             SubMbType& subMbType);
+
+/*!
+* \brief   get the motion params for B-slice spatial direct mode
+* \param
+* \param   output iMvp[]
+*/
+
+/*!
+ * \brief   get the motion predictor for 4*4 or 8*8 or 16*16 block
+ * \param
+ * \param   output iMvp[]
+ */
+void PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+             int32_t listIdx, int32_t iPartIdx, int32_t iPartWidth, int8_t iRef, int16_t iMVP[2]);
+
+/*!
+ * \brief   get the motion predictor for inter16x8 MB
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+                      int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]);
+
+/*!
+ * \brief   get the motion predictor for inter8x16 MB
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+                      int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]);
+
+/*!
+* \brief   Fill the spatial direct motion vectors for 8x8 direct MB
+* \param
+* \param   output motion vector cache and motion vector deviation cache
+*/
+void FillSpatialDirect8x8Mv (PDqLayer pCurDqLayer, const int16_t& iIdx8, const int8_t& iPartCount, const int8_t& iPartW,
+                             const SubMbType& subMbType, const bool& bIsLongRef, int16_t pMvDirect[LIST_A][2], int8_t iRef[LIST_A],
+                             int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A]);
+
+/*!
+* \brief   Fill the temporal direct motion vectors for 8x8 direct MB
+* \param
+* \param   output motion vector cache and motion vector deviation cache
+*/
+void FillTemporalDirect8x8Mv (PDqLayer pCurDqLayer, const int16_t& iIdx8, const int8_t& iPartCount,
+                              const int8_t& iPartW,
+                              const SubMbType& subMbType, int8_t iRef[LIST_A], int16_t (*mvColoc)[2],
+                              int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A]);
+
+/*!
+* \brief   returns ref_index in List_0 from the colocated ref_index in LIST_0.
+* \param
+*  returns ref_index in List_0 of ref picture LIST_0
+*/
+int8_t MapColToList0 (PWelsDecoderContext& pCtx, const int8_t& colocRefIndexL0,
+                      const int32_t& ref0Count); //ISO/IEC 14496-10:2009(E) (8-193)
+
+/*!
+* \brief     update ref_index cache for current MB, for 8x8
+* \param
+* \param
+*/
+void Update8x8RefIdx (PDqLayer& pCurDqLayer, const int16_t& iPartIdx, const int32_t& listIdx, const int8_t& iRef);
+
+inline uint32_t* GetMbType (PDqLayer& pCurDqLayer) {
+  if (pCurDqLayer->pDec != NULL) {
+    return pCurDqLayer->pDec->pMbType;
+  } else {
+    return pCurDqLayer->pMbType;
+  }
+}
+
+} // namespace WelsDec
+
+#endif//WELS_MV_PRED_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nal_prefix.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nal_prefix.h
new file mode 100644
index 0000000000..2a2c41918b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nal_prefix.h
@@ -0,0 +1,56 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//nal_prefix.h  -       definitions for NAL Unit Header(/Ext) and PrefixNALUnit
+#ifndef WELS_NAL_UNIT_PREFIX_H__
+#define WELS_NAL_UNIT_PREFIX_H__
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "slice.h"
+
+namespace WelsDec {
+
+///////////////////////////////////NAL Unit prefix/headers///////////////////////////////////
+
+/* Prefix NAL Unix syntax, refer to Page 392 in JVT X201wcm */
+typedef struct TagPrefixNalUnit {
+  SRefBasePicMarking sRefPicBaseMarking;
+  bool               bStoreRefBasePicFlag;
+  bool               bPrefixNalUnitAdditionalExtFlag;
+  bool               bPrefixNalUnitExtFlag;
+  bool               bPrefixNalCorrectFlag;
+} SPrefixNalUnit, *PPrefixNalUnit;
+
+} // namespace WelsDec
+
+#endif//WELS_NAL_UNIT_PREFIX_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nalu.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nalu.h
new file mode 100644
index 0000000000..d39e135e5f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/nalu.h
@@ -0,0 +1,79 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//nalu.h:       NAL Unit definition
+#ifndef WELS_NAL_UNIT_H__
+#define WELS_NAL_UNIT_H__
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "nal_prefix.h"
+#include "bit_stream.h"
+
+namespace WelsDec {
+
+///////////////////////////////////NAL UNIT level///////////////////////////////////
+
+/* NAL Unit Structure */
+typedef struct TagNalUnit {
+  SNalUnitHeaderExt       sNalHeaderExt;
+
+  union {
+    struct SVclNal {
+      SSliceHeaderExt     sSliceHeaderExt;
+      SBitStringAux       sSliceBitsRead;
+      uint8_t*            pNalPos;         // save the address of slice nal for GPU function
+      int32_t             iNalLength;   // save the nal length for GPU function
+      bool                bSliceHeaderExtFlag;
+    } sVclNal;
+    SPrefixNalUnit        sPrefixNal;
+  } sNalData;
+  unsigned long long uiTimeStamp;
+} SNalUnit, *PNalUnit;
+
+///////////////////////////////////ACCESS Unit level///////////////////////////////////
+
+/* Access Unit structure */
+typedef struct TagAccessUnits {
+  PNalUnit*               pNalUnitsList;  // list of NAL Units pointer in this AU
+  uint32_t                uiAvailUnitsNum;   // Number of NAL Units available in each AU list based current bitstream,
+  uint32_t                uiActualUnitsNum;       // actual number of NAL units belong to current au
+// While available number exceeds count size below, need realloc extra NAL Units for list space.
+  uint32_t                uiCountUnitsNum;        // Count size number of malloced NAL Units in each AU list
+  uint32_t                uiStartPos;
+  uint32_t                uiEndPos;
+  bool                    bCompletedAuFlag;       // Indicate whether it is a completed AU
+} SAccessUnit, *PAccessUnit;
+
+} // namespace WelsDec
+
+#endif//WELS_NAL_UNIT_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parameter_sets.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parameter_sets.h
new file mode 100644
index 0000000000..cbdaecdb2b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parameter_sets.h
@@ -0,0 +1,217 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_PARAMETER_SETS_H__
+#define WELS_PARAMETER_SETS_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+
+namespace WelsDec {
+/* VUI syntax in Sequence Parameter Set, refer to E.1 in Rec */
+typedef struct TagVui {
+  bool bAspectRatioInfoPresentFlag;
+  uint32_t uiAspectRatioIdc;
+  uint32_t uiSarWidth;
+  uint32_t uiSarHeight;
+  bool bOverscanInfoPresentFlag;
+  bool bOverscanAppropriateFlag;
+  bool bVideoSignalTypePresentFlag;
+  uint8_t uiVideoFormat;
+  bool bVideoFullRangeFlag;
+  bool bColourDescripPresentFlag;
+  uint8_t uiColourPrimaries;
+  uint8_t uiTransferCharacteristics;
+  uint8_t uiMatrixCoeffs;
+  bool bChromaLocInfoPresentFlag;
+  uint32_t uiChromaSampleLocTypeTopField;
+  uint32_t uiChromaSampleLocTypeBottomField;
+  bool bTimingInfoPresentFlag;
+  uint32_t uiNumUnitsInTick;
+  uint32_t uiTimeScale;
+  bool bFixedFrameRateFlag;
+  bool bNalHrdParamPresentFlag;
+  bool bVclHrdParamPresentFlag;
+  bool bPicStructPresentFlag;
+  bool bBitstreamRestrictionFlag;
+  bool bMotionVectorsOverPicBoundariesFlag;
+  uint32_t uiMaxBytesPerPicDenom;
+  uint32_t uiMaxBitsPerMbDenom;
+  uint32_t uiLog2MaxMvLengthHorizontal;
+  uint32_t uiLog2MaxMvLengthVertical;
+  uint32_t uiMaxNumReorderFrames;
+  uint32_t uiMaxDecFrameBuffering;
+} SVui, *PVui;
+
+/* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
+typedef struct TagSps {
+  int32_t       iSpsId;
+  uint32_t      iMbWidth;
+  uint32_t      iMbHeight;
+  uint32_t      uiTotalMbCount; //used in decode_slice_data()
+
+  uint32_t      uiLog2MaxFrameNum;
+  uint32_t      uiPocType;
+  /* POC type 0 */
+  int32_t       iLog2MaxPocLsb;
+  /* POC type 1 */
+  int32_t       iOffsetForNonRefPic;
+
+  int32_t       iOffsetForTopToBottomField;
+  int32_t       iNumRefFramesInPocCycle;
+  int8_t        iOffsetForRefFrame[256];
+  int32_t       iNumRefFrames;
+
+  SPosOffset    sFrameCrop;
+
+  ProfileIdc    uiProfileIdc;
+  uint8_t       uiLevelIdc;
+  uint8_t       uiChromaFormatIdc;
+  uint8_t       uiChromaArrayType;
+
+  uint8_t       uiBitDepthLuma;
+  uint8_t       uiBitDepthChroma;
+  /* TO BE CONTINUE: POC type 1 */
+  bool          bDeltaPicOrderAlwaysZeroFlag;
+  bool          bGapsInFrameNumValueAllowedFlag;
+
+  bool          bFrameMbsOnlyFlag;
+  bool          bMbaffFlag;     // MB Adapative Frame Field
+  bool          bDirect8x8InferenceFlag;
+  bool          bFrameCroppingFlag;
+
+  bool          bVuiParamPresentFlag;
+//  bool          bTimingInfoPresentFlag;
+//  bool          bFixedFrameRateFlag;
+  bool          bConstraintSet0Flag;
+  bool          bConstraintSet1Flag;
+  bool          bConstraintSet2Flag;
+  bool          bConstraintSet3Flag;
+  bool          bSeparateColorPlaneFlag;
+  bool          bQpPrimeYZeroTransfBypassFlag;
+  bool          bSeqScalingMatrixPresentFlag;
+  bool          bSeqScalingListPresentFlag[12];
+  //Add scaling list supporting
+  uint8_t  iScalingList4x4[6][16];
+  uint8_t  iScalingList8x8[6][64];
+  SVui sVui;
+  const SLevelLimits* pSLevelLimits;
+} SSps, *PSps;
+
+
+/* Sequence Parameter Set extension syntax, refer to Page 58 in JVT X201wcm */
+//typedef struct TagSpsExt{
+//  uint32_t      iSpsId;
+//  uint32_t      uiAuxFormatIdc;
+//  int32_t       iAlphaOpaqueValue;
+//  int32_t       iAlphaTransparentValue;
+
+//  uint8_t       uiBitDepthAux;
+//  bool          bAlphaIncrFlag;
+//  bool          bAdditionalExtFlag;
+//}SSpsExt, *PSpsExt;
+
+/* Sequence Parameter Set extension syntax, refer to Page 391 in JVT X201wcm */
+typedef struct TagSpsSvcExt {
+  SPosOffset    sSeqScaledRefLayer;
+
+  uint8_t       uiExtendedSpatialScalability;   // ESS
+  uint8_t       uiChromaPhaseXPlus1Flag;
+  uint8_t       uiChromaPhaseYPlus1;
+  uint8_t       uiSeqRefLayerChromaPhaseXPlus1Flag;
+  uint8_t       uiSeqRefLayerChromaPhaseYPlus1;
+  bool          bInterLayerDeblockingFilterCtrlPresentFlag;
+  bool          bSeqTCoeffLevelPredFlag;
+  bool          bAdaptiveTCoeffLevelPredFlag;
+  bool          bSliceHeaderRestrictionFlag;
+} SSpsSvcExt, *PSpsSvcExt;
+
+/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
+typedef struct TagSubsetSps {
+  SSps          sSps;
+  SSpsSvcExt    sSpsSvcExt;
+  bool          bSvcVuiParamPresentFlag;
+  bool          bAdditionalExtension2Flag;
+  bool          bAdditionalExtension2DataFlag;
+} SSubsetSps, *PSubsetSps;
+
+/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
+typedef struct TagPps {
+  int32_t       iSpsId;
+  int32_t       iPpsId;
+
+  uint32_t      uiNumSliceGroups;
+  uint32_t      uiSliceGroupMapType;
+  /* slice_group_map_type = 0 */
+  uint32_t      uiRunLength[MAX_SLICEGROUP_IDS];
+  /* slice_group_map_type = 2 */
+  uint32_t      uiTopLeft[MAX_SLICEGROUP_IDS];
+  uint32_t      uiBottomRight[MAX_SLICEGROUP_IDS];
+  /* slice_group_map_type = 3, 4 or 5 */
+  uint32_t      uiSliceGroupChangeRate;
+  /* slice_group_map_type = 6 */
+  uint32_t      uiPicSizeInMapUnits;
+  uint32_t      uiSliceGroupId[MAX_SLICEGROUP_IDS];
+
+  uint32_t      uiNumRefIdxL0Active;
+  uint32_t      uiNumRefIdxL1Active;
+
+  int32_t       iPicInitQp;
+  int32_t       iPicInitQs;
+  int32_t       iChromaQpIndexOffset[2];//cb,cr
+
+  bool          bEntropyCodingModeFlag;
+  bool          bPicOrderPresentFlag;
+  /* slice_group_map_type = 3, 4 or 5 */
+  bool          bSliceGroupChangeDirectionFlag;
+  bool          bDeblockingFilterControlPresentFlag;
+
+  bool          bConstainedIntraPredFlag;
+  bool          bRedundantPicCntPresentFlag;
+  bool          bWeightedPredFlag;
+  uint8_t       uiWeightedBipredIdc;
+
+  bool    bTransform8x8ModeFlag;
+  //Add for scalinglist support
+  bool    bPicScalingMatrixPresentFlag;
+  bool    bPicScalingListPresentFlag[12];
+  uint8_t  iScalingList4x4[6][16];
+  uint8_t  iScalingList8x8[6][64];
+
+  int32_t iSecondChromaQPIndexOffset; //second_chroma_qp_index_offset
+
+} SPps, *PPps;
+
+} // namespace WelsDec
+
+#endif //WELS_PARAMETER_SETS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cabac.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cabac.h
new file mode 100644
index 0000000000..8f31543ae4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cabac.h
@@ -0,0 +1,89 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    parse_mb_syn_cabac.h
+ *
+ * \brief   cabac parse for syntax elements
+ *
+ * \date    10/10/2014 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_PARSE_MB_SYN_CABAC_H__
+#define WELS_PARSE_MB_SYN_CABAC_H__
+
+#include "decoder_context.h"
+#include "cabac_decoder.h"
+namespace WelsDec {
+int32_t ParseEndOfSliceCabac (PWelsDecoderContext pCtx, uint32_t& uiBinVal);
+int32_t ParseSkipFlagCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSkip);
+int32_t ParseMBTypeISliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiBinVal);
+int32_t ParseMBTypePSliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiBinVal);
+int32_t ParseMBTypeBSliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiBinVal);
+int32_t ParseTransformSize8x8FlagCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail,
+                                        bool& bTransformSize8x8Flag);
+int32_t ParseSubMBTypeCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSubMbType);
+int32_t ParseBSubMBTypeCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSubMbType);
+int32_t ParseIntraPredModeLumaCabac (PWelsDecoderContext pCtx, int32_t& iBinVal);
+int32_t ParseIntraPredModeChromaCabac (PWelsDecoderContext pCtx, uint8_t uiNeighAvail, int32_t& iBinVal);
+int32_t ParseInterPMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                                    int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A], int8_t pRefIndex[LIST_A][30]);
+int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                                    int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A], int8_t pRefIndex[LIST_A][30],
+                                    int8_t pDirect[30]);
+int32_t ParseRefIdxCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* nzc,
+                          int8_t ref_idx[LIST_A][30], int8_t direct[30],
+                          int32_t iListIdx, int32_t index, int32_t iActiveRefNum, int32_t b8mode, int8_t& iRefIdxVal);
+int32_t ParseMvdInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, int8_t pRefIndex[LIST_A][30],
+                           int16_t pMvdCache[LIST_A][30][2], int32_t index, int8_t iListIdx, int8_t iMvComp, int16_t& iMvdVal);
+int32_t ParseCbpInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiBinVal);
+int32_t ParseDeltaQpCabac (PWelsDecoderContext pCtx, int32_t& iQpDelta);
+int32_t ParseCbfInfoCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNzcCache, int32_t index, int32_t iResProperty,
+                           PWelsDecoderContext pCtx, uint32_t& uiCbpBit);
+int32_t ParseSignificantMapCabac (int32_t* pSignificantMap, int32_t iResProperty, PWelsDecoderContext pCtx,
+                                  uint32_t& uiBinVal);
+int32_t ParseSignificantCoeffCabac (int32_t* significant, int32_t iResProperty, PWelsDecoderContext pCtx);
+int32_t ParseResidualBlockCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCountCache, SBitStringAux* pBsAux,
+                                 int32_t index, int32_t iMaxNumCoeff, const uint8_t* pScanTable, int32_t iResProperty, int16_t* sTCoeff, uint8_t uiQp,
+                                 PWelsDecoderContext pCtx);
+int32_t ParseResidualBlockCabac8x8 (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCountCache, SBitStringAux* pBsAux,
+                                    int32_t index, int32_t iMaxNumCoeff, const uint8_t* pScanTable, int32_t iResProperty, int16_t* sTCoeff, uint8_t uiQp,
+                                    PWelsDecoderContext pCtx);
+int32_t ParseIPCMInfoCabac (PWelsDecoderContext pCtx);
+void    UpdateP16x16MvdCabac (SDqLayer* pCurDqLayer, int16_t pMvd[2], const int8_t iListIdx);
+void    UpdateP8x8RefIdxCabac (PDqLayer pCurDqLayer, int8_t pRefIndex[LIST_A][30], int32_t iPartIdx, const int8_t iRef,
+                               const int8_t iListIdx);
+void    UpdateP8x8DirectCabac (PDqLayer pCurDqLayer, int32_t iPartIdx);
+void    UpdateP16x16DirectCabac (PDqLayer pCurDqLayer);
+void    UpdateP8x8RefCacheIdxCabac (int8_t pRefIndex[LIST_A][30], const int16_t& iPartIdx, const int32_t& listIdx,
+                                    const int8_t& iRef);
+}
+//#pragma pack()
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cavlc.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cavlc.h
new file mode 100644
index 0000000000..d048551640
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/parse_mb_syn_cavlc.h
@@ -0,0 +1,137 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    parse_mb_syn_cavlc.h
+ *
+ * \brief   Parsing all syntax elements of mb and decoding residual with cavlc
+ *
+ * \date    03/17/2009 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifndef WELS_PARSE_MB_SYN_CAVLC_H__
+#define WELS_PARSE_MB_SYN_CAVLC_H__
+
+#include "wels_common_basis.h"
+#include "decoder_context.h"
+#include "dec_frame.h"
+#include "slice.h"
+
+namespace WelsDec {
+
+
+
+void GetNeighborAvailMbType (PWelsNeighAvail pNeighAvail, PDqLayer pCurDqLayer);
+void WelsFillCacheNonZeroCount (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, PDqLayer pCurDqLayer);
+void WelsFillCacheConstrain0IntraNxN (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+                                      PDqLayer pCurDqLayer);
+void WelsFillCacheConstrain1IntraNxN (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+                                      PDqLayer pCurDqLayer);
+void WelsFillCacheInterCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                              int16_t iMvArray[LIST_A][30][MV_A], int16_t iMvdCache[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30],
+                              PDqLayer pCurDqLayer);
+void WelsFillDirectCacheCabac (PWelsNeighAvail pNeighAvail, int8_t iDirect[30], PDqLayer pCurDqLayer);
+void WelsFillCacheInter (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                         int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30], PDqLayer pCurDqLayer);
+
+/*!
+ * \brief   check iPredMode for intra16x16 eligible or not
+ * \param   input : current iPredMode
+ * \param   output: 0 indicating decoding correctly; -1 means error occurence
+ */
+int32_t CheckIntra16x16PredMode (uint8_t uiSampleAvail, int8_t* pMode);
+
+/*!
+ * \brief   check iPredMode for intraNxN eligible or not
+ * \param   input : current iPredMode
+ * \param   output: 0 indicating decoding correctly; -1 means error occurence
+ */
+int32_t CheckIntraNxNPredMode (int32_t* pSampleAvail, int8_t* pMode, int32_t iIndex, bool b8x8);
+
+/*!
+ * \brief   check iPredMode for chroma eligible or not
+ * \param   input : current iPredMode
+ * \param   output: 0 indicating decoding correctly; -1 means error occurence
+ */
+int32_t CheckIntraChromaPredMode (uint8_t uiSampleAvail, int8_t* pMode);
+
+/*!
+ * \brief   predict the mode of intra4x4
+ * \param   input : current intra4x4 block index
+ * \param   output: mode index
+ */
+int32_t PredIntra4x4Mode (int8_t* pIntraPredMode, int32_t iIdx4);
+
+
+void BsStartCavlc (PBitStringAux pBs);
+void BsEndCavlc (PBitStringAux pBs);
+
+int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable,
+                                uint8_t* pNonZeroCountCache,
+                                PBitStringAux pBs,
+                                /*int16_t* coeff_level,*/
+                                int32_t iIndex,
+                                int32_t iMaxNumCoeff,
+                                const uint8_t* kpZigzagTable,
+                                int32_t iResidualProperty,
+                                /*short *tCoeffLevel,*/
+                                int16_t* pTCoeff,
+                                uint8_t uiQp,
+                                PWelsDecoderContext pCtx);
+
+// Transform8x8
+int32_t WelsResidualBlockCavlc8x8 (SVlcTable* pVlcTable,
+                                   uint8_t* pNonZeroCountCache,
+                                   PBitStringAux pBs,
+                                   /*int16_t* coeff_level,*/
+                                   int32_t iIndex,
+                                   int32_t iMaxNumCoeff,
+                                   const uint8_t* kpZigzagTable,
+                                   int32_t iResidualProperty,
+                                   /*short *tCoeffLevel,*/
+                                   int16_t* pTCoeff,
+                                   int32_t  iIdx4x4,
+                                   uint8_t uiQp,
+                                   PWelsDecoderContext pCtx);
+
+/*!
+ * \brief   parsing inter info (including ref_index and pMvd)
+ * \param   input : decoding context, current mb, bit-stream
+ * \param   output: 0 indicating decoding correctly; -1 means error
+ */
+int32_t ParseInterInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30],
+                        PBitStringAux pBs);
+int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][MV_A],
+                         int8_t iRefIdxArray[LIST_A][30], PBitStringAux pBs);
+} // namespace WelsDec
+#endif//WELS_PARSE_MB_SYN_CAVLC_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/pic_queue.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/pic_queue.h
new file mode 100644
index 0000000000..473f80ff11
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/pic_queue.h
@@ -0,0 +1,62 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//pic_queue.h
+#ifndef WELS_PICTURE_QUEUE_H__
+#define WELS_PICTURE_QUEUE_H__
+
+
+#include "picture.h"
+
+namespace WelsDec {
+
+#define   PICTURE_RESOLUTION_ALIGNMENT      32
+
+
+typedef struct TagPicBuff {
+  PPicture*      ppPic;
+  int32_t        iCapacity;  // capacity size of queue
+  int32_t        iCurrentIdx;
+} SPicBuff, *PPicBuff;
+
+/*
+ *  Interfaces
+ */
+
+PPicture PrefetchPic (PPicBuff pPicBuff);  // To get current node applicable
+PPicture PrefetchPicForThread (PPicBuff pPicBuff); // To get current node applicable in the case of threaded mode
+PPicture PrefetchLastPicForThread (PPicBuff pPicBuff,
+                                   const int32_t& iLast); // To get last node applicable in the case of threaded mode
+
+} // namespace WelsDec
+
+#endif//WELS_PICTURE_QUEUE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/picture.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/picture.h
new file mode 100644
index 0000000000..bdacc364cf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/picture.h
@@ -0,0 +1,111 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//picture.h     -       reconstruction picture/ reference picture/ residual picture are declared here
+#ifndef WELS_PICTURE_H__
+#define WELS_PICTURE_H__
+
+#include "typedefs.h"
+#include "wels_common_defs.h"
+#include "wels_const_common.h"
+#include "wels_decoder_thread.h"
+
+using namespace WelsCommon;
+
+namespace WelsDec {
+
+/*
+*  Reconstructed Picture definition
+*  It is used to express reference picture, also consequent reconstruction picture for output
+*/
+
+struct SPicture {
+  /************************************payload data*********************************/
+  uint8_t*        pBuffer[4];             // pointer to the first allocated byte, basical offset of buffer, dimension:
+  uint8_t*        pData[4];               // pointer to picture planes respectively
+  int32_t         iLinesize[4];// linesize of picture planes respectively used currently
+  int32_t         iPlanes;                        // How many planes are introduced due to color space format?
+// picture information
+
+  /*******************************from EC mv copy****************************/
+  bool bIdrFlag;
+
+  /*******************************from other standard syntax****************************/
+  /*from sps*/
+  int32_t         iWidthInPixel;  // picture width in pixel
+  int32_t         iHeightInPixel;// picture height in pixel
+  /*from slice header*/
+  int32_t         iFramePoc;              // frame POC
+
+  /*******************************sef_definition for misc use****************************/
+  bool            bUsedAsRef;                                                     //for ref pic management
+  bool            bIsLongRef;     // long term reference frame flag       //for ref pic management
+  int8_t          iRefCount;
+
+  bool            bIsComplete;    // indicate whether current picture is complete, not from EC
+  /*******************************for future use****************************/
+  uint8_t         uiTemporalId;
+  uint8_t         uiSpatialId;
+  uint8_t         uiQualityId;
+
+  int32_t         iFrameNum;              // frame number                 //for ref pic management
+  int32_t         iFrameWrapNum;          // frame wrap number            //for ref pic management
+  int32_t         iLongTermFrameIdx;                                      //id for long term ref pic
+  uint32_t        uiLongTermPicNum;       //long_term_pic_num
+
+  int32_t     iSpsId; //against mosaic caused by cross-IDR interval reference.
+  int32_t     iPpsId;
+  unsigned long long uiTimeStamp;
+  uint32_t    uiDecodingTimeStamp; //represent relative decoding time stamps
+  int32_t     iPicBuffIdx;
+  EWelsSliceType  eSliceType;
+  bool        bIsUngroupedMultiSlice; //multi-slice picture with each each slice group contains one slice.
+  bool bNewSeqBegin;
+  int32_t iMbEcedNum;
+  int32_t iMbEcedPropNum;
+  int32_t iMbNum;
+
+  bool*    pMbCorrectlyDecodedFlag;
+  int8_t (*pNzc)[24];
+  uint32_t*  pMbType; // mb type used for direct mode
+  int16_t (*pMv[LIST_A])[MB_BLOCK4x4_NUM][MV_A]; // used for direct mode
+  int8_t (*pRefIndex[LIST_A])[MB_BLOCK4x4_NUM]; //used for direct mode
+  struct SPicture* pRefPic[LIST_A][17];  //ref pictures used for direct mode
+  SWelsDecEvent* pReadyEvent;  //MB line ready event
+
+};// "Picture" declaration is comflict with Mac system
+
+typedef struct SPicture* PPicture;
+
+} // namespace WelsDec
+
+#endif//WELS_PICTURE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/rec_mb.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/rec_mb.h
new file mode 100644
index 0000000000..be0c4a7407
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/rec_mb.h
@@ -0,0 +1,104 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    rec_mb.h
+ *
+ * \brief   interfaces for all macroblock decoding process after mb syntax parsing and residual decoding with cavlc.
+ *
+ * \date    3/4/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_REC_MB_H__
+#define WELS_REC_MB_H__
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "error_code.h"
+
+#include "decoder_context.h"
+
+namespace WelsDec {
+
+#define WELS_B_MB_REC_VERIFY(uiRet) do{ \
+  uint32_t uiRetTmp = (uint32_t)uiRet; \
+  if( uiRetTmp != ERR_NONE ) \
+    return uiRetTmp; \
+}while(0)
+
+typedef struct TagMCRefMember {
+  uint8_t* pDstY;
+  uint8_t* pDstU;
+  uint8_t* pDstV;
+
+  uint8_t* pSrcY;
+  uint8_t* pSrcU;
+  uint8_t* pSrcV;
+
+  int32_t iSrcLineLuma;
+  int32_t iSrcLineChroma;
+
+  int32_t iDstLineLuma;
+  int32_t iDstLineChroma;
+
+  int32_t iPicWidth;
+  int32_t iPicHeight;
+} sMCRefMember;
+
+void BaseMC (PWelsDecoderContext pCtx, sMCRefMember* pMCRefMem, const int32_t& listIdx, const int8_t& iRefIdx,
+             int32_t iXOffset, int32_t iYOffset, SMcFunc* pMCFunc,
+             int32_t iBlkWidth, int32_t iBlkHeight, int16_t iMVs[2]);
+
+void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurDqLayer);
+
+int32_t RecI4x4Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecI4x4Luma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecI4x4Chroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecI8x8Mb (int32_t iMbXy, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecI8x8Luma (int32_t iMbXy, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecI16x16Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t RecChroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer);
+
+int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx);
+
+int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWelsDecoderContext pCtx);
+
+} // namespace WelsDec
+
+#endif //WELS_REC_MB_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/slice.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/slice.h
new file mode 100644
index 0000000000..9295eb71b1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/slice.h
@@ -0,0 +1,208 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_slice.h
+#ifndef WELS_SLICE_H__
+#define WELS_SLICE_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "picture.h"
+#include "parameter_sets.h"
+
+namespace WelsDec {
+
+/*
+ *  Reference picture list reordering syntax, refer to page 64 in JVT X201wcm
+ */
+typedef struct TagRefPicListReorderSyntax {
+  struct {
+    uint32_t    uiAbsDiffPicNumMinus1;
+    uint16_t    uiLongTermPicNum;
+    uint16_t    uiReorderingOfPicNumsIdc;
+  } sReorderingSyn[LIST_A][MAX_REF_PIC_COUNT];
+  bool          bRefPicListReorderingFlag[LIST_A];
+} SRefPicListReorderSyn, *PRefPicListReorderSyn;
+
+/*
+ *  Prediction weight table syntax, refer to page 65 in JVT X201wcm
+ */
+typedef struct TagPredWeightTabSyntax {
+  uint32_t  uiLumaLog2WeightDenom;
+  uint32_t  uiChromaLog2WeightDenom;
+  struct {
+    int32_t iLumaWeight[MAX_REF_PIC_COUNT];
+    int32_t iLumaOffset[MAX_REF_PIC_COUNT];
+    int32_t iChromaWeight[MAX_REF_PIC_COUNT][2];
+    int32_t iChromaOffset[MAX_REF_PIC_COUNT][2];
+    bool    bLumaWeightFlag;
+    bool    bChromaWeightFlag;
+  } sPredList[LIST_A];
+  int32_t   iImplicitWeight[MAX_REF_PIC_COUNT][MAX_REF_PIC_COUNT];
+} SPredWeightTabSyn, *PPredWeightTabSyn;
+
+/* Decoded reference picture marking syntax, refer to Page 66 in JVT X201wcm */
+typedef struct TagRefPicMarking {
+  struct {
+    uint32_t    uiMmcoType;
+    int32_t     iShortFrameNum;
+    int32_t     iDiffOfPicNum;
+    uint32_t    uiLongTermPicNum;
+    int32_t     iLongTermFrameIdx;
+    int32_t     iMaxLongTermFrameIdx;
+  } sMmcoRef[MAX_MMCO_COUNT];
+
+  bool          bNoOutputOfPriorPicsFlag;
+  bool          bLongTermRefFlag;
+  bool          bAdaptiveRefPicMarkingModeFlag;
+} SRefPicMarking, *PRefPicMarking;
+
+/* Decode reference base picture marking syntax in Page 396 of JVT X201wcm */
+typedef struct TagRefBasePicMarkingSyn {
+  struct {
+    uint32_t      uiMmcoType;
+    int32_t       iShortFrameNum;
+    uint32_t      uiDiffOfPicNums;
+    uint32_t      uiLongTermPicNum; //should uint32_t, cover larger range of iFrameNum.
+  } mmco_base[MAX_MMCO_COUNT];    // MAX_REF_PIC for reference picture based on frame
+
+  bool            bAdaptiveRefBasePicMarkingModeFlag;
+} SRefBasePicMarking, *PRefBasePicMarking;
+
+/* Header of slice syntax elements, refer to Page 63 in JVT X201wcm */
+typedef struct TagSliceHeaders {
+  /*****************************slice header syntax and generated****************************/
+  int32_t         iFirstMbInSlice;
+  int32_t         iFrameNum;
+  int32_t         iPicOrderCntLsb;
+  int32_t         iDeltaPicOrderCntBottom;
+  int32_t         iDeltaPicOrderCnt[2];
+  int32_t         iRedundantPicCnt;
+  int32_t         iDirectSpatialMvPredFlag; //!< Direct Mode type to be used (0: Temporal, 1: Spatial)
+  int32_t         uiRefCount[LIST_A];
+  int32_t         iSliceQpDelta;  //no use for iSliceQp is used directly
+  int32_t         iSliceQp;
+  int32_t         iSliceQsDelta;  // For SP/SI slices
+  uint32_t        uiDisableDeblockingFilterIdc;
+  int32_t         iSliceAlphaC0Offset;
+  int32_t         iSliceBetaOffset;
+  int32_t         iSliceGroupChangeCycle;
+
+  PSps            pSps;
+  PPps            pPps;
+  int32_t         iSpsId;
+  int32_t         iPpsId;
+  bool            bIdrFlag;
+
+  /*********************got from other layer for efficency if possible*********************/
+  SRefPicListReorderSyn   pRefPicListReordering;  // Reference picture list reordering syntaxs
+  SPredWeightTabSyn       sPredWeightTable;
+  int32_t                 iCabacInitIdc;
+  int32_t                 iMbWidth;       //from?
+  int32_t                 iMbHeight; //from?
+  SRefPicMarking          sRefMarking;    // Decoded reference picture marking syntaxs
+
+  uint16_t    uiIdrPicId;
+  EWelsSliceType  eSliceType;
+  bool            bNumRefIdxActiveOverrideFlag;
+  bool            bFieldPicFlag;          //not supported in base profile
+  bool            bBottomFiledFlag;               //not supported in base profile
+  uint8_t         uiPadding1Byte;
+  bool            bSpForSwitchFlag;                       // For SP/SI slices
+  int16_t         iPadding2Bytes;
+} SSliceHeader, *PSliceHeader;
+
+
+/* Slice header in scalable extension syntax, refer to Page 394 in JVT X201wcm */
+typedef struct TagSliceHeaderExt {
+  SSliceHeader    sSliceHeader;
+  PSubsetSps      pSubsetSps;
+
+  uint32_t        uiDisableInterLayerDeblockingFilterIdc;
+  int32_t         iInterLayerSliceAlphaC0Offset;
+  int32_t         iInterLayerSliceBetaOffset;
+
+//SPosOffset sScaledRefLayer;
+  int32_t         iScaledRefLayerPicWidthInSampleLuma;
+  int32_t         iScaledRefLayerPicHeightInSampleLuma;
+
+  SRefBasePicMarking sRefBasePicMarking;
+  bool            bBasePredWeightTableFlag;
+  bool            bStoreRefBasePicFlag;
+  bool            bConstrainedIntraResamplingFlag;
+  bool            bSliceSkipFlag;
+
+  bool            bAdaptiveBaseModeFlag;
+  bool            bDefaultBaseModeFlag;
+  bool            bAdaptiveMotionPredFlag;
+  bool            bDefaultMotionPredFlag;
+  bool            bAdaptiveResidualPredFlag;
+  bool            bDefaultResidualPredFlag;
+  bool            bTCoeffLevelPredFlag;
+  uint8_t         uiRefLayerChromaPhaseXPlus1Flag;
+
+  uint8_t         uiRefLayerChromaPhaseYPlus1;
+  uint8_t         uiRefLayerDqId;
+  uint8_t         uiScanIdxStart;
+  uint8_t         uiScanIdxEnd;
+} SSliceHeaderExt, *PSliceHeaderExt;
+
+
+typedef struct TagSlice {
+  /*******************************slice_header****************************/
+  SSliceHeaderExt sSliceHeaderExt;
+
+  /*******************************use for future****************************/
+// for Macroblock coding within slice
+  int32_t         iLastMbQp;              // stored qp for last mb coded, maybe more efficient for mb skip detection etc.
+
+  /*******************************slice_data****************************/
+  /*slice_data_ext()*/
+  int32_t         iMbSkipRun;
+  int32_t         iTotalMbInCurSlice; //record the total number of MB in current slice.
+
+  /*slice_data_ext() generate*/
+
+  /*******************************misc use****************************/
+  bool            bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+  /*************got from other layer for effiency if possible***************/
+  /*from lower layer: slice header*/
+  uint8_t         eSliceType;
+  uint8_t         uiPadding[2];
+  int32_t         iLastDeltaQp;
+  int16_t         iMvScale[LIST_A][MAX_DPB_COUNT]; //Moton vector scale For Temporal Direct Mode Type
+} SSlice, *PSlice;
+
+} // namespace WelsDec
+
+#endif//WELS_SLICE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/vlc_decoder.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/vlc_decoder.h
new file mode 100644
index 0000000000..9f19700d26
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/vlc_decoder.h
@@ -0,0 +1,177 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_VLC_DECODER_H__
+#define WELS_VLC_DECODER_H__
+
+#include "bit_stream.h"
+#include "dec_golomb.h"
+
+namespace WelsDec {
+
+typedef struct TagVlcTable {
+const uint8_t (*kpCoeffTokenVlcTable[4][8])[2];
+const uint8_t (*kpChromaCoeffTokenVlcTable)[2];
+const uint8_t (*kpZeroTable[7])[2];
+const uint8_t (*kpTotalZerosTable[2][15])[2];
+} SVlcTable;
+
+// for data sharing cross modules and try to reduce size of binary generated
+extern const uint8_t g_kuiVlcChromaTable[256][2];
+extern const uint8_t g_kuiVlcTable_0[256][2];
+extern const uint8_t g_kuiVlcTable_0_0[256][2];
+extern const uint8_t g_kuiVlcTable_0_1[4][2];
+extern const uint8_t g_kuiVlcTable_0_2[2][2];
+extern const uint8_t g_kuiVlcTable_0_3[2][2];
+extern const uint8_t g_kuiVlcTable_1[256][2];
+extern const uint8_t g_kuiVlcTable_1_0[64][2];
+extern const uint8_t g_kuiVlcTable_1_1[8][2];
+extern const uint8_t g_kuiVlcTable_1_2[2][2];
+extern const uint8_t g_kuiVlcTable_1_3[2][2];
+extern const uint8_t g_kuiVlcTable_2[256][2];
+extern const uint8_t g_kuiVlcTable_2_0[4][2];
+extern const uint8_t g_kuiVlcTable_2_1[4][2];
+extern const uint8_t g_kuiVlcTable_2_2[4][2];
+extern const uint8_t g_kuiVlcTable_2_3[4][2];
+extern const uint8_t g_kuiVlcTable_2_4[2][2];
+extern const uint8_t g_kuiVlcTable_2_5[2][2];
+extern const uint8_t g_kuiVlcTable_2_6[2][2];
+extern const uint8_t g_kuiVlcTable_2_7[2][2];
+extern const uint8_t g_kuiVlcTable_3[64][2];
+extern const uint8_t g_kuiVlcTableNeedMoreBitsThread[3];
+extern const uint8_t g_kuiVlcTableMoreBitsCount0[4];
+extern const uint8_t g_kuiVlcTableMoreBitsCount1[4];
+extern const uint8_t g_kuiVlcTableMoreBitsCount2[8];
+extern const uint8_t g_kuiNcMapTable[17];
+extern const uint8_t g_kuiVlcTrailingOneTotalCoeffTable[62][2];
+extern const uint8_t g_kuiTotalZerosTable0[512][2];
+extern const uint8_t g_kuiTotalZerosTable1[64][2];
+extern const uint8_t g_kuiTotalZerosTable2[64][2];
+extern const uint8_t g_kuiTotalZerosTable3[32][2];
+extern const uint8_t g_kuiTotalZerosTable4[32][2];
+extern const uint8_t g_kuiTotalZerosTable5[64][2];
+extern const uint8_t g_kuiTotalZerosTable6[64][2];
+extern const uint8_t g_kuiTotalZerosTable7[64][2];
+extern const uint8_t g_kuiTotalZerosTable8[64][2];
+extern const uint8_t g_kuiTotalZerosTable9[32][2];
+extern const uint8_t g_kuiTotalZerosTable10[16][2];
+extern const uint8_t g_kuiTotalZerosTable11[16][2];
+extern const uint8_t g_kuiTotalZerosTable12[8][2];
+extern const uint8_t g_kuiTotalZerosTable13[4][2];
+extern const uint8_t g_kuiTotalZerosTable14[2][2];
+extern const uint8_t g_kuiTotalZerosBitNumMap[15];
+extern const uint8_t g_kuiTotalZerosChromaTable0[8][2];
+extern const uint8_t g_kuiTotalZerosChromaTable1[4][2];
+extern const uint8_t g_kuiTotalZerosChromaTable2[2][2];
+extern const uint8_t g_kuiTotalZerosBitNumChromaMap[3];
+extern const uint8_t g_kuiZeroLeftTable0[2][2];
+extern const uint8_t g_kuiZeroLeftTable1[4][2];
+extern const uint8_t g_kuiZeroLeftTable2[4][2];
+extern const uint8_t g_kuiZeroLeftTable3[8][2];
+extern const uint8_t g_kuiZeroLeftTable4[8][2];
+extern const uint8_t g_kuiZeroLeftTable5[8][2];
+extern const uint8_t g_kuiZeroLeftTable6[8][2];
+extern const uint8_t g_kuiZeroLeftBitNumMap[16];
+
+#if defined(_MSC_VER) && defined(_M_IX86)
+//TODO need linux version
+#define WELS_GET_PREFIX_BITS(inval,outval){\
+  uint32_t local = inval;\
+  __asm xor       eax,    eax\
+  __asm bsr       eax,    local\
+  __asm sub       eax,    32\
+  __asm neg       eax\
+  __asm mov       outval, eax\
+}
+#else
+#define WELS_GET_PREFIX_BITS(inval, outval) outval = GetPrefixBits(inval)
+#endif
+
+static inline void InitVlcTable (SVlcTable* pVlcTable) {
+pVlcTable->kpChromaCoeffTokenVlcTable = g_kuiVlcChromaTable;
+
+pVlcTable->kpCoeffTokenVlcTable[0][0] = g_kuiVlcTable_0;
+pVlcTable->kpCoeffTokenVlcTable[0][1] = g_kuiVlcTable_1;
+pVlcTable->kpCoeffTokenVlcTable[0][2] = g_kuiVlcTable_2;
+pVlcTable->kpCoeffTokenVlcTable[0][3] = g_kuiVlcTable_3;
+
+pVlcTable->kpCoeffTokenVlcTable[1][0] = g_kuiVlcTable_0_0;
+pVlcTable->kpCoeffTokenVlcTable[1][1] = g_kuiVlcTable_0_1;
+pVlcTable->kpCoeffTokenVlcTable[1][2] = g_kuiVlcTable_0_2;
+pVlcTable->kpCoeffTokenVlcTable[1][3] = g_kuiVlcTable_0_3;
+
+pVlcTable->kpCoeffTokenVlcTable[2][0] = g_kuiVlcTable_1_0;
+pVlcTable->kpCoeffTokenVlcTable[2][1] = g_kuiVlcTable_1_1;
+pVlcTable->kpCoeffTokenVlcTable[2][2] = g_kuiVlcTable_1_2;
+pVlcTable->kpCoeffTokenVlcTable[2][3] = g_kuiVlcTable_1_3;
+
+pVlcTable->kpCoeffTokenVlcTable[3][0] = g_kuiVlcTable_2_0;
+pVlcTable->kpCoeffTokenVlcTable[3][1] = g_kuiVlcTable_2_1;
+pVlcTable->kpCoeffTokenVlcTable[3][2] = g_kuiVlcTable_2_2;
+pVlcTable->kpCoeffTokenVlcTable[3][3] = g_kuiVlcTable_2_3;
+pVlcTable->kpCoeffTokenVlcTable[3][4] = g_kuiVlcTable_2_4;
+pVlcTable->kpCoeffTokenVlcTable[3][5] = g_kuiVlcTable_2_5;
+pVlcTable->kpCoeffTokenVlcTable[3][6] = g_kuiVlcTable_2_6;
+pVlcTable->kpCoeffTokenVlcTable[3][7] = g_kuiVlcTable_2_7;
+
+pVlcTable->kpZeroTable[0] = g_kuiZeroLeftTable0;
+pVlcTable->kpZeroTable[1] = g_kuiZeroLeftTable1;
+pVlcTable->kpZeroTable[2] = g_kuiZeroLeftTable2;
+pVlcTable->kpZeroTable[3] = g_kuiZeroLeftTable3;
+pVlcTable->kpZeroTable[4] = g_kuiZeroLeftTable4;
+pVlcTable->kpZeroTable[5] = g_kuiZeroLeftTable5;
+pVlcTable->kpZeroTable[6] = g_kuiZeroLeftTable6;
+
+pVlcTable->kpTotalZerosTable[0][0] = g_kuiTotalZerosTable0;
+pVlcTable->kpTotalZerosTable[0][1] = g_kuiTotalZerosTable1;
+pVlcTable->kpTotalZerosTable[0][2] = g_kuiTotalZerosTable2;
+pVlcTable->kpTotalZerosTable[0][3] = g_kuiTotalZerosTable3;
+pVlcTable->kpTotalZerosTable[0][4] = g_kuiTotalZerosTable4;
+pVlcTable->kpTotalZerosTable[0][5] = g_kuiTotalZerosTable5;
+pVlcTable->kpTotalZerosTable[0][6] = g_kuiTotalZerosTable6;
+pVlcTable->kpTotalZerosTable[0][7] = g_kuiTotalZerosTable7;
+pVlcTable->kpTotalZerosTable[0][8] = g_kuiTotalZerosTable8;
+pVlcTable->kpTotalZerosTable[0][9] = g_kuiTotalZerosTable9;
+pVlcTable->kpTotalZerosTable[0][10] = g_kuiTotalZerosTable10;
+pVlcTable->kpTotalZerosTable[0][11] = g_kuiTotalZerosTable11;
+pVlcTable->kpTotalZerosTable[0][12] = g_kuiTotalZerosTable12;
+pVlcTable->kpTotalZerosTable[0][13] = g_kuiTotalZerosTable13;
+pVlcTable->kpTotalZerosTable[0][14] = g_kuiTotalZerosTable14;
+pVlcTable->kpTotalZerosTable[1][0] = g_kuiTotalZerosChromaTable0;
+pVlcTable->kpTotalZerosTable[1][1] = g_kuiTotalZerosChromaTable1;
+pVlcTable->kpTotalZerosTable[1][2] = g_kuiTotalZerosChromaTable2;
+
+}
+
+} // namespace WelsDec
+
+#endif//WELS_VLC_DECODER_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_common_basis.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_common_basis.h
new file mode 100644
index 0000000000..19aae110e3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_common_basis.h
@@ -0,0 +1,317 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_common_basis.h
+#ifndef WELS_COMMON_BASIS_H__
+#define WELS_COMMON_BASIS_H__
+
+#include "typedefs.h"
+#include "macros.h"
+
+#include "wels_common_defs.h"
+
+using namespace WelsCommon;
+
+namespace WelsDec {
+
+/*common use table*/
+extern const uint8_t g_kuiScan8[24];
+extern const uint8_t g_kuiLumaDcZigzagScan[16];
+extern const uint8_t g_kuiChromaDcScan[4];
+extern const uint8_t g_kMbNonZeroCountIdx[24];
+extern const uint8_t g_kCacheNzcScanIdx[4 * 4 + 4 + 4 + 3];
+extern const uint8_t g_kCache26ScanIdx[16];
+extern const uint8_t g_kCache30ScanIdx[16];
+extern const uint8_t g_kNonZeroScanIdxC[4];
+/* Profile IDC */
+typedef uint8_t ProfileIdc;
+
+/* Position Offset structure */
+typedef struct TagPosOffset {
+  int32_t iLeftOffset;
+  int32_t iTopOffset;
+  int32_t iRightOffset;
+  int32_t iBottomOffset;
+} SPosOffset;
+
+/* MB Type & Sub-MB Type */
+typedef uint32_t MbType;
+typedef uint32_t SubMbType;
+
+#define I16_LUMA_DC  1
+#define I16_LUMA_AC  2
+#define LUMA_DC_AC   3
+#define CHROMA_DC    4
+#define CHROMA_AC    5
+#define LUMA_DC_AC_8  6
+#define CHROMA_DC_U  7
+#define CHROMA_DC_V  8
+#define CHROMA_AC_U  9
+#define CHROMA_AC_V  10
+#define LUMA_DC_AC_INTRA 11
+#define LUMA_DC_AC_INTER 12
+#define CHROMA_DC_U_INTER  13
+#define CHROMA_DC_V_INTER  14
+#define CHROMA_AC_U_INTER  15
+#define CHROMA_AC_V_INTER  16
+#define LUMA_DC_AC_INTRA_8  17
+#define LUMA_DC_AC_INTER_8  18
+
+#define SHIFT_BUFFER(pBitsCache)        { pBitsCache->pBuf+=2; pBitsCache->uiRemainBits += 16; pBitsCache->uiCache32Bit |= (((pBitsCache->pBuf[2] << 8) | pBitsCache->pBuf[3]) << (32 - pBitsCache->uiRemainBits)); }
+#define POP_BUFFER(pBitsCache, iCount)  { pBitsCache->uiCache32Bit <<= iCount;  pBitsCache->uiRemainBits -= iCount; }
+
+static const uint8_t g_kuiZigzagScan[16] = { //4*4block residual zig-zag scan order
+  0,  1,  4,  8,
+  5,  2,  3,  6,
+  9, 12, 13, 10,
+  7, 11, 14, 15,
+};
+
+static const uint8_t g_kuiZigzagScan8x8[64] = { //8x8 block residual zig-zag scan order
+  0,  1,  8,  16, 9,  2,  3,  10,
+  17, 24, 32, 25, 18, 11, 4,  5,
+  12, 19, 26, 33, 40, 48, 41, 34,
+  27, 20, 13, 6,  7,  14, 21, 28,
+  35, 42, 49, 56, 57, 50, 43, 36,
+  29, 22, 15, 23, 30, 37, 44, 51,
+  58, 59, 52, 45, 38, 31, 39, 46,
+  53, 60, 61, 54, 47, 55, 62, 63,
+};
+
+static const uint8_t g_kuiIdx2CtxSignificantCoeffFlag8x8[64] = {  // Table 9-43, Page 289
+  0,  1,  2,  3,  4,  5,  5,  4,
+  4,  3,  3,  4,  4,  4,  5,  5,
+  4,  4,  4,  4,  3,  3,  6,  7,
+  7,  7,  8,  9, 10,  9,  8,  7,
+  7,  6, 11, 12, 13, 11,  6,  7,
+  8,  9, 14, 10,  9,  8,  6, 11,
+  12, 13, 11, 6,  9, 14, 10,  9,
+  11, 12, 13, 11, 14, 10, 12, 14,
+};
+
+static const uint8_t g_kuiIdx2CtxLastSignificantCoeffFlag8x8[64] = { // Table 9-43, Page 289
+  0,  1,  1,  1,  1,  1,  1,  1,
+  1,  1,  1,  1,  1,  1,  1,  1,
+  2,  2,  2,  2,  2,  2,  2,  2,
+  2,  2,  2,  2,  2,  2,  2,  2,
+  3,  3,  3,  3,  3,  3,  3,  3,
+  4,  4,  4,  4,  4,  4,  4,  4,
+  5,  5,  5,  5,  6,  6,  6,  6,
+  7,  7,  7,  7,  8,  8,  8,  8,
+};
+
+static inline void GetMbResProperty (int32_t* pMBproperty, int32_t* pResidualProperty, bool bCavlc) {
+  switch (*pResidualProperty) {
+  case CHROMA_AC_U:
+    *pMBproperty = 1;
+    *pResidualProperty = bCavlc ? CHROMA_AC : CHROMA_AC_U;
+    break;
+  case CHROMA_AC_V:
+    *pMBproperty = 2;
+    *pResidualProperty = bCavlc ? CHROMA_AC : CHROMA_AC_V;
+    break;
+  case LUMA_DC_AC_INTRA:
+    *pMBproperty = 0;
+    *pResidualProperty = LUMA_DC_AC;
+    break;
+  case CHROMA_DC_U:
+    *pMBproperty = 1;
+    *pResidualProperty =  bCavlc ? CHROMA_DC : CHROMA_DC_U;
+    break;
+  case CHROMA_DC_V:
+    *pMBproperty = 2;
+    *pResidualProperty =  bCavlc ? CHROMA_DC : CHROMA_DC_V;
+    break;
+  case I16_LUMA_AC:
+    *pMBproperty = 0;
+    break;
+  case I16_LUMA_DC:
+    *pMBproperty = 0;
+    break;
+  case LUMA_DC_AC_INTER:
+    *pMBproperty = 3;
+    *pResidualProperty = LUMA_DC_AC;
+    break;
+  case CHROMA_DC_U_INTER:
+    *pMBproperty = 4;
+    *pResidualProperty =  bCavlc ? CHROMA_DC : CHROMA_DC_U;
+    break;
+  case CHROMA_DC_V_INTER:
+    *pMBproperty = 5;
+    *pResidualProperty =  bCavlc ? CHROMA_DC : CHROMA_DC_V;
+    break;
+  case CHROMA_AC_U_INTER:
+    *pMBproperty = 4;
+    *pResidualProperty =  bCavlc ? CHROMA_AC : CHROMA_AC_U;
+    break;
+  case CHROMA_AC_V_INTER:
+    *pMBproperty = 5;
+    *pResidualProperty =  bCavlc ? CHROMA_AC : CHROMA_AC_V;
+    break;
+  // Reference to Table 7-2
+  case LUMA_DC_AC_INTRA_8:
+    *pMBproperty = 6;
+    *pResidualProperty = LUMA_DC_AC_8;
+    break;
+  case LUMA_DC_AC_INTER_8:
+    *pMBproperty = 7;
+    *pResidualProperty = LUMA_DC_AC_8;
+    break;
+  }
+}
+
+typedef struct TagI16PredInfo {
+  int8_t iPredMode;
+  int8_t iLeftAvail;
+  int8_t iTopAvail;
+  int8_t iLeftTopAvail;
+} SI16PredInfo;
+static const SI16PredInfo g_ksI16PredInfo[4] = {
+  {I16_PRED_V, 0, 1, 0},
+  {I16_PRED_H, 1, 0, 0},
+  {         0, 0, 0, 0},
+  {I16_PRED_P, 1, 1, 1},
+};
+
+static const SI16PredInfo g_ksChromaPredInfo[4] = {
+  {       0, 0, 0, 0},
+  {C_PRED_H, 1, 0, 0},
+  {C_PRED_V, 0, 1, 0},
+  {C_PRED_P, 1, 1, 1},
+};
+
+
+typedef struct TagI4PredInfo {
+  int8_t iPredMode;
+  int8_t iLeftAvail;
+  int8_t iTopAvail;
+  int8_t iLeftTopAvail;
+  // int8_t right_top_avail; //when right_top unavailable but top avail, we can pad the right-top with the rightmost pixel of top
+} SI4PredInfo;
+static const SI4PredInfo g_ksI4PredInfo[9] = {
+  {  I4_PRED_V, 0, 1, 0},
+  {  I4_PRED_H, 1, 0, 0},
+  {          0, 0, 0, 0},
+  {I4_PRED_DDL, 0, 1, 0},
+  {I4_PRED_DDR, 1, 1, 1},
+  { I4_PRED_VR, 1, 1, 1},
+  { I4_PRED_HD, 1, 1, 1},
+  { I4_PRED_VL, 0, 1, 0},
+  { I4_PRED_HU, 1, 0, 0},
+};
+
+static const uint8_t g_kuiI16CbpTable[6] = {0, 16, 32, 15, 31, 47};
+
+
+typedef struct TagPartMbInfo {
+  MbType iType;
+  int8_t iPartCount; //P_16*16, P_16*8, P_8*16, P_8*8 based on 8*8 block; P_8*4, P_4*8, P_4*4 based on 4*4 block
+  int8_t iPartWidth; //based on 4*4 block
+} SPartMbInfo;
+
+//Table 7.13. Macroblock type values 0 to 4 for P slices.
+static const SPartMbInfo g_ksInterPMbTypeInfo[5] = {
+  {MB_TYPE_16x16,    1, 4},
+  {MB_TYPE_16x8,     2, 4},
+  {MB_TYPE_8x16,     2, 2},
+  {MB_TYPE_8x8,      4, 4},
+  {MB_TYPE_8x8_REF0, 4, 4}, //ref0--ref_idx not present in bit-stream and default as 0
+};
+
+//Table 7.14. Macroblock type values 0 to 22 for B slices.
+static const SPartMbInfo g_ksInterBMbTypeInfo[] = {
+  //            Part 0        Part 1
+  { MB_TYPE_DIRECT, 1, 4 }, //B_Direct_16x16
+  { MB_TYPE_16x16 | MB_TYPE_P0L0, 1, 4 }, //B_L0_16x16
+  { MB_TYPE_16x16 | MB_TYPE_P0L1, 1, 4 }, //B_L1_16x16
+  { MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P0L1, 1, 4 },  //B_Bi_16x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, 4 },    //B_L0_L0_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P1L0, 2, 2 },    //B_L0_L0_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, 4 },    //B_L1_L1_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, 2 },    //B_L1_L1_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P1L1, 2, 4 },    //B_L0_L1_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P1L1, 2, 2 },    //B_L0_L1_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, 4 },    //B_L1_L0_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, 2 },    //B_L1_L0_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 4 },   //B_L0_Bi_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 2 },   //B_L0_Bi_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 4 },   //B_L1_Bi_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 2 },   //B_L1_Bi_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, 4 },   //B_Bi_L0_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0, 2, 2 },   //B_Bi_L0_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, 4 },   //B_Bi_L1_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L1, 2, 2 },   //B_Bi_L1_8x16
+  { MB_TYPE_16x8  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 4 },    //B_Bi_Bi_16x8
+  { MB_TYPE_8x16  | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1, 2, 2 },    //B_Bi_Bi_8x16
+  { MB_TYPE_8x8   | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_P1L0 | MB_TYPE_P1L1,  4, 4 }    //B_8x8
+};
+
+//Table 7.17 Sub-macroblock types in B macroblocks.
+static const SPartMbInfo g_ksInterPSubMbTypeInfo[4] = {
+  {SUB_MB_TYPE_8x8, 1, 2},
+  {SUB_MB_TYPE_8x4, 2, 2},
+  {SUB_MB_TYPE_4x8, 2, 1},
+  {SUB_MB_TYPE_4x4, 4, 1},
+};
+
+//Table 7.18 Sub-macroblock types in B macroblocks.
+static const SPartMbInfo g_ksInterBSubMbTypeInfo[] = {
+  { MB_TYPE_DIRECT,                               1, 2 }, //B_Direct_8x8
+  { SUB_MB_TYPE_8x8 | MB_TYPE_P0L0,                 1, 2 }, //B_L0_8x8
+  { SUB_MB_TYPE_8x8 | MB_TYPE_P0L1,                 1, 2 }, //B_L1_8x8
+  { SUB_MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1,  1, 2 }, //B_Bi_8x8
+  { SUB_MB_TYPE_8x4 | MB_TYPE_P0L0,                 2, 2 }, //B_L0_8x4
+  { SUB_MB_TYPE_4x8 | MB_TYPE_P0L0,                 2, 1 }, //B_L0_4x8
+  { SUB_MB_TYPE_8x4 | MB_TYPE_P0L1,                 2, 2 }, //B_L1_8x4
+  { SUB_MB_TYPE_4x8 | MB_TYPE_P0L1,                 2, 1 }, //B_L1_4x8
+  { SUB_MB_TYPE_8x4 | MB_TYPE_P0L0 | MB_TYPE_P0L1,  2, 2 }, //B_Bi_8x4
+  { SUB_MB_TYPE_4x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1,  2, 1 }, //B_Bi_4x8
+  { SUB_MB_TYPE_4x4 | MB_TYPE_P0L0,                 4, 1 }, //B_L0_4x4
+  { SUB_MB_TYPE_4x4 | MB_TYPE_P0L1,                 4, 1 }, //B_L1_4x4
+  { SUB_MB_TYPE_4x4 | MB_TYPE_P0L0 | MB_TYPE_P0L1,  4, 1 }  //B_Bi_4x4
+};
+
+typedef struct TagSar {
+  uint32_t uiWidth;
+  uint32_t uiHeight;
+} sSar;
+static const sSar g_ksVuiSampleAspectRatio[17] = { //Table E-1
+  { 0,  0}, { 1,  1}, {12, 11}, { 10, 11}, {16, 11}, //0~4
+  {40, 33}, {24, 11}, {20, 11}, { 32, 11}, {80, 33}, //5~9
+  {18, 11}, {15, 11}, {64, 33}, {160, 99}, { 4, 3}, //10~14
+  { 3,  2}, { 2,  1}                                //15~16
+};
+
+
+} // namespace WelsDec
+
+#endif//WELS_COMMON_BASIS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_const.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_const.h
new file mode 100644
index 0000000000..3dc949e375
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_const.h
@@ -0,0 +1,65 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_const.h
+#ifndef WELS_CONST_H__
+#define WELS_CONST_H__
+
+#include "wels_const_common.h"
+
+/* Some list size */
+
+#define MB_SUB_PARTITION_SIZE           4       // Sub partition size in a 8x8 sub-block
+#define NAL_UNIT_HEADER_EXT_SIZE        3       // Size of NAL unit header for extension in byte
+#define MAX_PPS_COUNT                   256     // Count number of PPS
+
+#define MAX_REF_PIC_COUNT               16              // MAX Short + Long reference pictures
+#define MIN_REF_PIC_COUNT               1               // minimal count number of reference pictures, 1 short + 2 key reference based?
+#define MAX_SHORT_REF_COUNT             16              // maximal count number of short reference pictures
+#define MAX_LONG_REF_COUNT              16              // maximal count number of long reference pictures
+#define MAX_DPB_COUNT                   (MAX_REF_PIC_COUNT + 1) // 1 additional position for re-order and other process
+
+#define MAX_MMCO_COUNT                  66
+
+#define MAX_SLICEGROUP_IDS              8       // Count number of Slice Groups
+
+#define MAX_LAYER_NUM                   8
+
+#define LAYER_NUM_EXCHANGEABLE          1
+
+#define MAX_NAL_UNIT_NUM_IN_AU          32      // predefined maximal number of NAL Units in an access unit
+#define MIN_ACCESS_UNIT_CAPACITY        1048576 // Min AU capacity in bytes: (1<<20) = 1024 KB predefined
+#define MAX_BUFFERED_NUM 3 //mamixum stored number of AU|packet to prevent overwrite
+#define MAX_ACCESS_UNIT_CAPACITY 7077888 //Maximum AU size in bytes for level 5.2 for single frame
+#define MAX_MACROBLOCK_CAPACITY 5000 //Maximal legal MB capacity, 15000 bits is enough
+
+#endif//WELS_CONST_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_decoder_thread.h b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_decoder_thread.h
new file mode 100644
index 0000000000..ebb8015c9c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/inc/wels_decoder_thread.h
@@ -0,0 +1,170 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2019, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_decoder_thread.h
+ *
+ * \brief   Interfaces introduced in thread programming
+ *
+ * \date    08/06/2018 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef   _WELS_DECODER_THREAD_H_
+#define   _WELS_DECODER_THREAD_H_
+
+#include "WelsThreadLib.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+#define WELS_DEC_MAX_NUM_CPU 16
+#define WELS_DEC_MAX_THREAD_STACK_SIZE   4096
+#define WELS_DEC_THREAD_COMMAND_RUN 0
+#define WELS_DEC_THREAD_COMMAND_ABORT 1
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+typedef struct tagWelsDecSemphore {
+  WELS_THREAD_HANDLE h;
+} SWelsDecSemphore;
+
+typedef struct tagWelsDecEvent {
+  WELS_THREAD_HANDLE h;
+  int isSignaled;
+} SWelsDecEvent;
+
+typedef struct tagWelsDecThread {
+  WELS_THREAD_HANDLE h;
+} SWelsDecThread;
+
+#define WelsDecThreadFunc(fn,a) DWORD WINAPI fn(LPVOID a)
+#define WelsDecThreadFuncArg(a) LPWELS_THREAD_ROUTINE a
+#define WELS_DEC_THREAD_WAIT_TIMEDOUT    WAIT_TIMEOUT
+#define WELS_DEC_THREAD_WAIT_SIGNALED    WAIT_OBJECT_0
+#define WELS_DEC_THREAD_WAIT_INFINITE    INFINITE
+
+#else // NON-WINDOWS
+
+typedef   pthread_mutexattr_t       WELS_MUTEX_ATTR;
+
+typedef struct tagWelsDecSemphore {
+  long max;
+  long v;
+  WELS_EVENT  e;
+  WELS_MUTEX  m;
+} SWelsDecSemphore;
+
+typedef struct tagWelsDecEvent {
+  int manualReset;
+  int isSignaled;
+  pthread_cond_t c;
+  WELS_MUTEX m;
+} SWelsDecEvent;
+
+typedef struct tagWelsDecThread {
+  WELS_THREAD_HANDLE h;
+} SWelsDecThread;
+
+#define WelsDecThreadFunc(fn,a) void* fn(void* a)
+#define WelsDecThreadFuncArg(a) void* (*a)(void*)
+
+#define WELS_DEC_THREAD_WAIT_TIMEDOUT    ETIMEDOUT
+#define WELS_DEC_THREAD_WAIT_SIGNALED    EINTR
+#define WELS_DEC_THREAD_WAIT_INFINITE    -1
+
+#endif//_WIN32
+
+#define WelsDecThreadReturn   WELS_THREAD_ROUTINE_RETURN(0);
+
+int32_t GetCPUCount();
+
+// Event
+int EventCreate (SWelsDecEvent* e, int manualReset, int initialState);
+void EventPost (SWelsDecEvent* e);
+int EventWait (SWelsDecEvent* e, int32_t timeout);
+void EventReset (SWelsDecEvent* e);
+void EventDestroy (SWelsDecEvent* e);
+
+// Semaphore
+int SemCreate (SWelsDecSemphore* s, long value, long max);
+int SemWait (SWelsDecSemphore* s, int32_t timeout);
+void SemRelease (SWelsDecSemphore* s, long* prev_count);
+void SemDestroy (SWelsDecSemphore* s);
+
+// Thread
+int ThreadCreate (SWelsDecThread* t, LPWELS_THREAD_ROUTINE tf, void* ta);
+int ThreadWait (SWelsDecThread* t);
+
+#define DECLARE_PROCTHREAD(name, argument) \
+  WelsDecThreadFunc(name,argument)
+
+#define DECLARE_PROCTHREAD_PTR(name) \
+  LPWELS_THREAD_ROUTINE name
+
+#define CREATE_THREAD(ph, threadproc,argument) \
+  ThreadCreate(ph, threadproc, (void*)argument)
+
+#define CREATE_EVENT(ph, manualreset,initial_state,name) \
+  EventCreate(ph,(int)(manualreset),(int)(initial_state))
+
+#define CREATE_SEMAPHORE(ph, initial_count,max_count, name) \
+  SemCreate(ph, (long)initial_count,(long)(max_count))
+
+#define CLOSE_EVENT(ph) \
+  EventDestroy(ph)
+
+#define CLOSE_SEMAPHORE(ph) \
+  SemDestroy(ph)
+
+#define SET_EVENT(ph) \
+  EventPost(ph)
+
+#define RESET_EVENT(ph) \
+  EventReset(ph)
+
+#define RELEASE_SEMAPHORE(ph) \
+  SemRelease(ph,NULL)
+
+#define WAIT_EVENT(ph,timeout) \
+  EventWait(ph, (int32_t)timeout)
+
+#define WAIT_THREAD(ph) \
+  ThreadWait(ph)
+
+#define WAIT_SEMAPHORE(ph,timeout) \
+  SemWait(ph,(int32_t)timeout)
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/mips/dct_mmi.c b/third-party/openh264/third_party/openh264/src/codec/decoder/core/mips/dct_mmi.c
new file mode 100644
index 0000000000..383d6a8973
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/mips/dct_mmi.c
@@ -0,0 +1,786 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    dct_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    17/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+#define LOAD_2_LEFT_AND_ADD                                   \
+  PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t" \
+  "lbu        $9, -0x1(%[pPred])                        \n\t" \
+  PTR_ADDU   "$8, $8, $9                                \n\t" \
+  PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t" \
+  "lbu        $9, -0x1(%[pPred])                        \n\t" \
+  PTR_ADDU   "$8, $8, $9                                \n\t"
+
+unsigned char mmi_dc_0x80[16] __attribute__((aligned(16))) = {
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80,
+  0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80};
+
+short mmi_wd_0x02[8] __attribute__((aligned(16))) = {2, 2, 2, 2, 2, 2, 2, 2};
+short mmi_plane_inc_minus[8]__attribute__((aligned(16))) = {-7, -6, -5, -4, -3, -2, -1, 0};
+short mmi_plane_inc[8]__attribute__((aligned(16))) = {1, 2, 3, 4, 5, 6, 7, 8};
+short mmi_plane_dec[8]__attribute__((aligned(16))) = {8, 7, 6, 5, 4, 3, 2, 1};
+
+short mmi_plane_inc_c[4]__attribute__((aligned(16))) = {1, 2, 3, 4};
+short mmi_plane_dec_c[4]__attribute__((aligned(16))) = {4, 3, 2, 1};
+short mmi_plane_mul_b_c[8]__attribute__((aligned(16))) = {-3, -2, -1, 0, 1, 2, 3, 4};
+
+unsigned char mmi_01bytes[16]__attribute__((aligned(16))) = {1, 1, 1, 1, 1, 1, 1, 1,
+                                                             1, 1, 1, 1, 1, 1, 1, 1};
+
+void IdctResAddPred_mmi(uint8_t *pPred, const int32_t kiStride, int16_t *pRs) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "dli        $8, 0x1                                   \n\t"
+    "gsldxc1    $f0, 0x0(%[pRs], $0)                      \n\t"
+    "gsldxc1    $f2, 0x8(%[pRs], $0)                      \n\t"
+    "gsldxc1    $f4, 0x10(%[pRs], $0)                     \n\t"
+    "gsldxc1    $f6, 0x18(%[pRs], $0)                     \n\t"
+    "dmtc1      $8, $f14                                  \n\t"
+
+    MMI_Trans4x4H_SINGLE($f0, $f2, $f4, $f6, $f8)
+    MMI_IDCT_SINGLE($f2, $f4, $f6, $f8, $f0, $f12, $f14)
+    MMI_Trans4x4H_SINGLE($f2, $f6, $f0, $f8, $f4)
+    MMI_IDCT_SINGLE($f6, $f0, $f8, $f4, $f2, $f12, $f14)
+
+    "dli        $8, 0x20                                  \n\t"
+    "xor        $f14, $f14, $f14                          \n\t"
+    "dmtc1      $8, $f12                                  \n\t"
+    "pshufh     $f12, $f12, $f14                          \n\t"
+    "dli        $8, 0x6                                   \n\t"
+    "dmtc1      $8, $f16                                  \n\t"
+
+    MMI_StoreDiff4P_SINGLE($f6, $f0, $f12, $f14, %[pPred], %[pPred], $f16)
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    MMI_StoreDiff4P_SINGLE($f8, $f0, $f12, $f14, %[pPred], %[pPred], $f16)
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    MMI_StoreDiff4P_SINGLE($f2, $f0, $f12, $f14, %[pPred], %[pPred], $f16)
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    MMI_StoreDiff4P_SINGLE($f4, $f0, $f12, $f14, %[pPred], %[pPred], $f16)
+    : [pPred]"+&r"((unsigned char *)pPred)
+    : [pRs]"r"((unsigned char *)pRs), [kiStride]"r"((int)kiStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16"
+  );
+}
+
+void WelsDecoderI16x16LumaPredDc_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "dli        $8, 0x5                                   \n\t"
+    "gsldxc1    $f10, 0x0(%[mmi_01bytes], $0)             \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+
+    "move       $10, %[pPred]                             \n\t"
+    PTR_SUBU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    "xor        $f4, $f4, $f4                             \n\t"
+    "pasubub    $f0, $f0, $f4                             \n\t"
+    "pasubub    $f2, $f2, $f4                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f0, $f0, $f2                             \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $8, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+
+    PTR_ADDIU  "$8, $8, 0x10                              \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "psrlw      $f0, $f0, $f8                             \n\t"
+    "pmuluw     $f0, $f0, $f10                            \n\t"
+    "punpcklwd  $f0, $f0, $f0                             \n\t"
+    "mov.d      $f2, $f0                                  \n\t"
+
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssqc1     $f2, $f0, 0x0($10)                        \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride),
+      [mmi_01bytes] "r"((unsigned char *)mmi_01bytes)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10"
+  );
+}
+
+void WelsDecoderI16x16LumaPredPlane_mmi(uint8_t *pPred, const int32_t kiStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $10, %[pPred]                             \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], -0x1                  \n\t"
+    PTR_SUBU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pPred])                        \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "gsldrc1    $f0, 0x0(%[pPred])                        \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_dec])         \n\t"
+    "punpckhbh  $f2, $f0, $f28                            \n\t"
+    "punpcklbh  $f0, $f0, $f28                            \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "gsldlc1    $f4, 0x10(%[pPred])                       \n\t"
+    "pmullh     $f2, $f2, $f22                            \n\t"
+    "gsldrc1    $f4, 0x9(%[pPred])                        \n\t"
+    "gslqc1     $f26, $f24, 0x0(%[mmi_plane_inc])         \n\t"
+    "punpckhbh  $f6, $f4, $f28                            \n\t"
+    "punpcklbh  $f4, $f4, $f28                            \n\t"
+    "pmullh     $f4, $f4, $f24                            \n\t"
+    "pmullh     $f6, $f6, $f26                            \n\t"
+    "psubh      $f4, $f4, $f0                             \n\t"
+    "psubh      $f6, $f6, $f2                             \n\t"
+
+    SUMH_HORIZON($f4, $f6, $f0, $f2, $f8)
+    "dmfc1      $8, $f4                                   \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x5                               \n\t"
+    PTR_ADDIU  "$8, $8, 0x20                              \n\t"
+    "sra        $8, $8, 0x6                               \n\t"
+    MMI_Copy8Times($f4, $f6, $f28, $8)
+
+    "lbu        $9, 0x10(%[pPred])                        \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], -0x3                  \n\t"
+    LOAD_COLUMN($f0, $f2, $f8, $f10, $f12, $f14, $f16, $f18, %[pPred],
+                %[kiStride], $11)
+
+    PTR_ADDIU  "%[pPred], %[pPred], 0x3                   \n\t"
+    "dsll       $11, %[kiStride], 0x3                     \n\t"
+    PTR_ADDU   "$11, $11, %[pPred]                        \n\t"
+    "lbu        $8, 0x0($11)                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    "dsll       $9, $9, 0x4                               \n\t"
+
+    PTR_ADDIU  "%[pPred], %[pPred], -0x3                  \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    LOAD_COLUMN($f28, $f30, $f8, $f10, $f12, $f14, $f16, $f18, %[pPred],
+                %[kiStride], $11)
+
+    "xor        $f16, $f16, $f16                          \n\t"
+    "punpcklbh  $f0, $f2, $f16                            \n\t"
+    "punpckhbh  $f2, $f2, $f16                            \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "pmullh     $f2, $f2, $f22                            \n\t"
+    "punpcklbh  $f28, $f30, $f16                          \n\t"
+    "punpckhbh  $f30, $f30, $f16                          \n\t"
+    "pmullh     $f28, $f28, $f24                          \n\t"
+    "pmullh     $f30, $f30, $f26                          \n\t"
+    "psubh      $f28, $f28, $f0                           \n\t"
+    "psubh      $f30, $f30, $f2                           \n\t"
+
+    "xor        $f8, $f8, $f8                             \n\t"
+
+    SUMH_HORIZON($f28, $f30, $f0, $f2, $f8)
+    "dmfc1      $8, $f28                                  \n\t"
+    "seh        $8, $8                                    \n\t"
+
+    "mul        $8, $8, 0x5                               \n\t"
+    PTR_ADDIU  "$8, $8, 0x20                              \n\t"
+    "sra        $8, $8, 0x6                               \n\t"
+    MMI_Copy8Times($f16, $f18, $f8, $8)
+
+    "move       %[pPred], $10                             \n\t"
+    PTR_ADDIU  "$9, $9, 0x10                              \n\t"
+    "mul        $8, $8, -0x7                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    MMI_Copy8Times($f0, $f2, $f8, $9)
+
+    "xor        $8, $8, $8                                \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_inc_minus])   \n\t"
+
+    "dli        $11, 0x5                                  \n\t"
+    "dmtc1      $11, $f30                                 \n\t"
+    "1:                                                   \n\t"
+    "pmullh     $f8, $f4, $f20                            \n\t"
+    "pmullh     $f10, $f6, $f22                           \n\t"
+    "paddh      $f8, $f8, $f0                             \n\t"
+    "paddh      $f10, $f10, $f2                           \n\t"
+    "psrah      $f8, $f8, $f30                            \n\t"
+    "psrah      $f10, $f10, $f30                          \n\t"
+    "pmullh     $f12, $f4, $f24                           \n\t"
+    "pmullh     $f14, $f6, $f26                           \n\t"
+    "paddh      $f12, $f12, $f0                           \n\t"
+    "paddh      $f14, $f14, $f2                           \n\t"
+    "psrah      $f12, $f12, $f30                          \n\t"
+    "psrah      $f14, $f14, $f30                          \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "packushb   $f10, $f12, $f14                          \n\t"
+    "gssqc1     $f10, $f8, 0x0(%[pPred])                  \n\t"
+    "paddh      $f0, $f0, $f16                            \n\t"
+    "paddh      $f2, $f2, $f18                            \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    PTR_ADDIU  "$8, $8, 0x1                               \n\t"
+    PTR_ADDIU  "$11, $8, -0x10                            \n\t"
+    "bnez       $11, 1b                                   \n\t"
+    "nop                                                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred)
+    : [kiStride]"r"((int)kiStride), [mmi_plane_inc_minus]"r"(mmi_plane_inc_minus),
+      [mmi_plane_inc]"r"(mmi_plane_inc), [mmi_plane_dec]"r"(mmi_plane_dec)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8",
+      "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26",
+      "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+#define COPY_16_TIMES(r0, f0, f2, f4, f6, f8)                 \
+  "gslqc1     "#f2", "#f0", -0x10("#r0")                \n\t" \
+  "dsrl       "#f0", "#f2", "#f4"                       \n\t" \
+  "pmuluw     "#f0", "#f0", "#f6"                       \n\t" \
+  "punpcklwd  "#f0", "#f0", "#f0"                       \n\t" \
+  "mov.d      "#f2", "#f0"                              \n\t"
+
+#define MMI_PRED_H_16X16_TWO_LINE_DEC                         \
+  PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t" \
+  COPY_16_TIMES(%[pPred], $f0, $f2, $f4, $f6, $f8)            \
+  "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t" \
+  PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t" \
+  COPY_16_TIMES(%[pPred], $f0, $f2, $f4, $f6, $f8)            \
+  "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+void WelsDecoderI16x16LumaPredH_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "dli        $8, 56                                    \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+    "gsldxc1    $f6, 0x0(%[mmi_01bytes], $0)              \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+
+    COPY_16_TIMES(%[pPred], $f0, $f2, $f4, $f6, $f8)
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    COPY_16_TIMES(%[pPred], $f0, $f2, $f4, $f6, $f8)
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    MMI_PRED_H_16X16_TWO_LINE_DEC
+    : [pPred]"+&r"((unsigned char *)pPred)
+    : [kiStride]"r"((int)kiStride),
+      [mmi_01bytes]"r"((unsigned char *)mmi_01bytes)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8"
+  );
+}
+
+void WelsDecoderI16x16LumaPredV_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    PTR_SUBU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride)
+    : "memory", "$f0", "$f2"
+  );
+}
+
+void WelsDecoderI16x16LumaPredDcTop_mmi(uint8_t *pPred, const int32_t kiStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    PTR_SUBU   "$8, %[pPred], %[kiStride]                 \n\t"
+    "gslqc1     $f2, $f0, 0x0($8)                         \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "pasubub    $f0, $f0, $f28                            \n\t"
+    "pasubub    $f2, $f2, $f28                            \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f2, $f2                                  \n\t"
+    "paddh      $f0, $f0, $f2                             \n\t"
+    "dmfc1      $8, $f0                                   \n\t"
+
+    PTR_ADDIU  "$8, $8, 0x8                               \n\t"
+    "dsra       $8, $8, 0x4                               \n\t"
+    MMI_Copy16Times($f4, $f6, $f28, $8)
+    "mov.d      $f0, $f4                                  \n\t"
+    "mov.d      $f2, $f6                                  \n\t"
+
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred)
+    : [kiStride]"r"((int)kiStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6"
+  );
+  RECOVER_REG;
+}
+
+void WelsDecoderI16x16LumaPredDcNA_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[mmi_dc_0x80])             \n\t"
+    "mov.d      $f4, $f0                                  \n\t"
+    "mov.d      $f6, $f2                                  \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pPred])                   \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[pPred])                   \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride), [mmi_dc_0x80] "r"(mmi_dc_0x80)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6"
+  );
+}
+
+void WelsDecoderIChromaPredPlane_mmi(uint8_t *pPred, const int32_t kiStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $10, %[pPred]                             \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], -0x1                  \n\t"
+    PTR_SUBU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+
+    "gsldlc1    $f0, 0x7(%[pPred])                        \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "gsldrc1    $f0, 0x0(%[pPred])                        \n\t"
+    "gsldxc1    $f20, 0x0(%[mmi_plane_dec_c], $0)         \n\t"
+    "punpcklbh  $f0, $f0, $f28                            \n\t"
+    "gsldlc1    $f4, 0xc(%[pPred])                        \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "gsldrc1    $f4, 0x5(%[pPred])                        \n\t"
+    "gsldxc1    $f24, 0x0(%[mmi_plane_inc_c], $0)         \n\t"
+    "punpcklbh  $f4, $f4, $f28                            \n\t"
+    "pmullh     $f4, $f4, $f24                            \n\t"
+    "psubh      $f4, $f4, $f0                             \n\t"
+
+    "xor        $f6, $f6, $f6                             \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    SUMH_HORIZON($f4, $f6, $f0, $f2, $f8)
+    "dmfc1      $8, $f4                                   \n\t"
+    "seh        $8, $8                                    \n\t"
+    "mul        $8, $8, 0x11                              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                              \n\t"
+    "sra        $8, $8, 0x5                               \n\t"
+    MMI_Copy8Times($f4, $f6, $f8, $8)
+
+    "lbu        $9, 0x8(%[pPred])                         \n\t"
+    PTR_ADDIU  "%[pPred], %[pPred], -0x3                  \n\t"
+    LOAD_COLUMN_C($f0, $f8, $f12, $f16, %[pPred], %[kiStride], $11)
+
+    PTR_ADDIU  "%[pPred], %[pPred], 0x3                   \n\t"
+    "dsll       $11, %[kiStride], 0x2                     \n\t"
+    PTR_ADDU   "$11, $11, %[pPred]                        \n\t"
+    "lbu        $8, 0x0($11)                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    "dsll       $9, $9, 0x4                               \n\t"
+
+    PTR_ADDIU  "%[pPred], %[pPred], -0x3                  \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    LOAD_COLUMN_C($f28, $f8, $f12, $f16, %[pPred], %[kiStride], $11)
+    "xor        $f16, $f16, $f16                          \n\t"
+    "punpckhbh  $f0, $f0, $f16                            \n\t"
+    "pmullh     $f0, $f0, $f20                            \n\t"
+    "punpckhbh  $f28, $f28, $f16                          \n\t"
+    "pmullh     $f28, $f28, $f24                          \n\t"
+    "psubh      $f28, $f28, $f0                           \n\t"
+
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    SUMH_HORIZON($f28, $f30, $f0, $f2, $f8)
+    "dmfc1      $8, $f28                                  \n\t"
+    "seh        $8, $8                                    \n\t"
+
+    "mul        $8, $8, 0x11                              \n\t"
+    PTR_ADDIU  "$8, $8, 0x10                              \n\t"
+    "sra        $8, $8, 0x5                               \n\t"
+    MMI_Copy8Times($f16, $f18, $f8, $8)
+
+    "move       %[pPred], $10                             \n\t"
+    PTR_ADDIU  "$9, $9, 0x10                              \n\t"
+    "mul        $8, $8, -0x3                              \n\t"
+    PTR_ADDU   "$9, $9, $8                                \n\t"
+    MMI_Copy8Times($f0, $f2, $f8, $9)
+
+    "xor        $8, $8, $8                                \n\t"
+    "gslqc1     $f22, $f20, 0x0(%[mmi_plane_mul_b_c])     \n\t"
+
+    "dli        $11, 0x5                                  \n\t"
+    "dmtc1      $11, $f30                                 \n\t"
+    "1:                                                   \n\t"
+    "pmullh     $f8, $f4, $f20                            \n\t"
+    "pmullh     $f10, $f6, $f22                           \n\t"
+    "paddh      $f8, $f8, $f0                             \n\t"
+    "paddh      $f10, $f10, $f2                           \n\t"
+    "psrah      $f8, $f8, $f30                            \n\t"
+    "psrah      $f10, $f10, $f30                          \n\t"
+    "packushb   $f8, $f8, $f10                            \n\t"
+    "gssdxc1    $f8, 0x0(%[pPred], $0)                    \n\t"
+    "paddh      $f0, $f0, $f16                            \n\t"
+    "paddh      $f2, $f2, $f18                            \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    PTR_ADDIU  "$8, $8, 0x1                               \n\t"
+    PTR_ADDIU  "$11, $8, -0x8                             \n\t"
+    "bnez       $11, 1b                                   \n\t"
+    "nop                                                  \n\t"
+    : [pPred]"+&r"((unsigned char *)pPred)
+    : [kiStride]"r"((int)kiStride), [mmi_plane_mul_b_c]"r"(mmi_plane_mul_b_c),
+      [mmi_plane_inc_c]"r"(mmi_plane_inc_c), [mmi_plane_dec_c]"r"(mmi_plane_dec_c)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12", "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsDecoderIChromaPredDc_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "move       $10, %[pPred]                             \n\t"
+
+    PTR_SUBU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gsldxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $8, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    "dmtc1      $8, $f2                                   \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $8, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "lbu        $9, -0x1(%[pPred])                        \n\t"
+    PTR_ADDU   "$8, $8, $9                                \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+
+    "xor        $f8, $f8, $f8                             \n\t"
+    "punpcklwd  $f6, $f0, $f8                             \n\t"
+    "punpckhwd  $f0, $f0, $f8                             \n\t"
+    "pasubub    $f0, $f0, $f8                             \n\t"
+    "pasubub    $f6, $f6, $f8                             \n\t"
+    "biadd      $f0, $f0                                  \n\t"
+    "biadd      $f6, $f6                                  \n\t"
+
+    "paddd      $f6, $f6, $f2                             \n\t"
+    "paddd      $f2, $f4, $f0                             \n\t"
+
+    "dli        $8, 0x2                                   \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "gsldxc1    $f12, 0x0(%[mmi_01bytes], $0)             \n\t"
+    "dli        $8, 0x3                                   \n\t"
+    "dmtc1      $8, $f10                                  \n\t"
+
+    "paddd      $f0, $f0, $f8                             \n\t"
+    "dsrl       $f0, $f0, $f8                             \n\t"
+
+    "paddd      $f4, $f4, $f8                             \n\t"
+    "dsrl       $f4, $f4, $f8                             \n\t"
+
+    "paddd      $f6, $f6, $f8                             \n\t"
+    "paddd      $f6, $f6, $f8                             \n\t"
+    "dsrl       $f6, $f6, $f10                            \n\t"
+
+    "paddd      $f2, $f2, $f8                             \n\t"
+    "paddd      $f2, $f2, $f8                             \n\t"
+    "dsrl       $f2, $f2, $f10                            \n\t"
+
+    "dli        $8, 0x20                                  \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "pmuluw     $f0, $f0, $f12                            \n\t"
+    "pmuluw     $f6, $f6, $f12                            \n\t"
+    "dsll       $f0, $f0, $f8                             \n\t"
+    "xor        $f0, $f0, $f6                             \n\t"
+
+    "pmuluw     $f4, $f4, $f12                            \n\t"
+    "pmuluw     $f2, $f2, $f12                            \n\t"
+    "dsll       $f2, $f2, $f8                             \n\t"
+    "xor        $f2, $f2, $f4                             \n\t"
+
+    "gssdxc1    $f0, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f0, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f0, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f0, 0x0($10, $0)                         \n\t"
+
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f2, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f2, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f2, 0x0($10, $0)                         \n\t"
+    PTR_ADDU   "$10, $10, %[kiStride]                     \n\t"
+    "gssdxc1    $f2, 0x0($10, $0)                         \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride),
+      [mmi_01bytes] "r"((unsigned char *)mmi_01bytes)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10",
+      "$f12"
+  );
+}
+
+void WelsDecoderIChromaPredDcTop_mmi(uint8_t *pPred, const int32_t kiStride) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "dli        $8, 0x4e                                  \n\t"
+    "dmtc1      $8, $f16                                  \n\t"
+    "dli        $8, 0xb1                                  \n\t"
+    "dmtc1      $8, $f18                                  \n\t"
+    "dli        $8, 0x2                                   \n\t"
+    "dmtc1      $8, $f20                                  \n\t"
+    PTR_SUBU   "$8, %[pPred], %[kiStride]                 \n\t"
+    "gsldxc1    $f0, 0x0($8, $0)                          \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "punpckhbh  $f2, $f0, $f28                            \n\t"
+    "punpcklbh  $f0, $f0, $f28                            \n\t"
+    "pshufh     $f4, $f0, $f16                            \n\t"
+    "pshufh     $f6, $f2, $f16                            \n\t"
+    "paddh      $f0, $f0, $f4                             \n\t"
+    "paddh      $f2, $f2, $f6                             \n\t"
+
+    "pshufh     $f8, $f0, $f18                            \n\t"
+    "pshufh     $f14, $f2, $f18                           \n\t"
+    "paddh      $f2, $f2, $f14                            \n\t"
+    "paddh      $f0, $f0, $f8                             \n\t"
+
+    "gslqc1     $f26, $f24, 0x0(%[mmi_wd_0x02])           \n\t"
+    "paddh      $f0, $f0, $f24                            \n\t"
+    "paddh      $f2, $f2, $f26                            \n\t"
+    "psrah      $f0, $f0, $f20                            \n\t"
+    "psrah      $f2, $f2, $f20                            \n\t"
+    "packushb   $f0, $f0, $f2                             \n\t"
+
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[kiStride]           \n\t"
+    "gssdxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride), [mmi_wd_0x02] "r"((short *)mmi_wd_0x02)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6"
+  );
+  RECOVER_REG;
+}
+
+void WelsDecoderI4x4LumaPredH_mmi(uint8_t *pPred, const int32_t kiStride) {
+  __asm__ volatile(
+    ".set       arch=loongson3a                           \n\t"
+    "gsldxc1    $f8, 0x0(%[mmi_01bytes], $0)              \n\t"
+    "lbu        $8, -0x1(%[pPred])                        \n\t"
+    "dmtc1      $8, $f0                                   \n\t"
+    "pmuluw     $f0, $f0, $f8                             \n\t"
+
+    PTR_ADDU   "$9, %[pPred], %[kiStride]                 \n\t"
+    "lbu        $8, -0x1($9)                              \n\t"
+    "dmtc1      $8, $f2                                   \n\t"
+    "pmuluw     $f2, $f2, $f8                             \n\t"
+
+    PTR_ADDU   "$10, $9, %[kiStride]                      \n\t"
+    "lbu        $8, -0x1($10)                             \n\t"
+    "dmtc1      $8, $f4                                   \n\t"
+    "pmuluw     $f4, $f4, $f8                             \n\t"
+
+    PTR_ADDU   "$11, $10, %[kiStride]                     \n\t"
+    "lbu        $8, -0x1($11)                             \n\t"
+    "dmtc1      $8, $f6                                   \n\t"
+    "pmuluw     $f6, $f6, $f8                             \n\t"
+
+    "gsswxc1    $f0, 0x0(%[pPred], $0)                    \n\t"
+    "gsswxc1    $f2, 0x0($9, $0)                          \n\t"
+    "gsswxc1    $f4, 0x0($10, $0)                         \n\t"
+    "gsswxc1    $f6, 0x0($11, $0)                         \n\t"
+    : [pPred] "+&r"((unsigned char *)pPred)
+    : [kiStride] "r"((int)kiStride),
+      [mmi_01bytes] "r"((unsigned char *)mmi_01bytes)
+    : "memory", "$8", "$9", "$10", "$11", "$f0", "$f2", "$f4", "$f6", "$f8"
+  );
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/au_parser.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/au_parser.cpp
new file mode 100644
index 0000000000..91f89b4374
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/au_parser.cpp
@@ -0,0 +1,1787 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    au_parser.c
+ *
+ * \brief   Interfaces introduced in Access Unit level based parser
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "codec_def.h"
+#include "au_parser.h"
+#include "decoder.h"
+#include "error_code.h"
+#include "memmgr_nal_unit.h"
+#include "decoder_core.h"
+#include "bit_stream.h"
+#include "memory_align.h"
+
+#define _PARSE_NALHRD_VCLHRD_PARAMS_ 1
+
+namespace WelsDec {
+/*!
+ *************************************************************************************
+ * \brief   Start Code Prefix (0x 00 00 00 01) detection
+ *
+ * \param   pBuf        bitstream payload buffer
+ * \param   pOffset     offset between NAL rbsp and original bitsteam that
+ *                      start code prefix is seperated from.
+ * \param   iBufSize    count size of buffer
+ *
+ * \return  RBSP buffer of start code prefix exclusive
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+uint8_t* DetectStartCodePrefix (const uint8_t* kpBuf, int32_t* pOffset, int32_t iBufSize) {
+  uint8_t* pBits = (uint8_t*)kpBuf;
+
+  do {
+    int32_t iIdx = 0;
+    while ((iIdx < iBufSize) && (! (*pBits))) {
+      ++ pBits;
+      ++ iIdx;
+    }
+    if (iIdx >= iBufSize)  break;
+
+    ++ iIdx;
+    ++ pBits;
+
+    if ((iIdx >= 3) && ((* (pBits - 1)) == 0x1)) {
+      *pOffset = (int32_t) (((uintptr_t)pBits) - ((uintptr_t)kpBuf));
+      return pBits;
+    }
+
+    iBufSize -= iIdx;
+  }  while (1);
+
+  return NULL;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to parse nal unit
+ *
+ * \param   pCtx            decoder context
+ * \param   pNalUnitHeader  parsed result of NAL Unit Header to output
+ * \param   pSrcRbsp        bitstream buffer to input
+ * \param   iSrcRbspLen     length size of bitstream buffer payload
+ * \param   pSrcNal
+ * \param   iSrcNalLen
+ * \param   pConsumedBytes  consumed bytes during parsing
+ *
+ * \return  decoded bytes payload, might be (pSrcRbsp+1) if no escapes
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+uint8_t* ParseNalHeader (PWelsDecoderContext pCtx, SNalUnitHeader* pNalUnitHeader, uint8_t* pSrcRbsp,
+                         int32_t iSrcRbspLen, uint8_t* pSrcNal, int32_t iSrcNalLen, int32_t* pConsumedBytes) {
+  PNalUnit pCurNal = NULL;
+  uint8_t* pNal     = pSrcRbsp;
+  int32_t iNalSize  = iSrcRbspLen;
+  PBitStringAux pBs = NULL;
+  bool bExtensionFlag = false;
+  int32_t iErr = ERR_NONE;
+  int32_t iBitSize = 0;
+  SDataBuffer* pSavedData = &pCtx->sSavedData;
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+  pNalUnitHeader->eNalUnitType = NAL_UNIT_UNSPEC_0;//SHOULD init it. because pCtx->sCurNalHead is common variable.
+
+  //remove the consecutive ZERO at the end of current NAL in the reverse order.--2011.6.1
+  {
+    int32_t iIndex = iSrcRbspLen - 1;
+    uint8_t uiBsZero = 0;
+    while (iIndex >= 0) {
+      uiBsZero = pSrcRbsp[iIndex];
+      if (0 == uiBsZero) {
+        --iNalSize;
+        ++ (*pConsumedBytes);
+        --iIndex;
+      } else {
+        break;
+      }
+    }
+  }
+
+  pNalUnitHeader->uiForbiddenZeroBit = (uint8_t) (pNal[0] >> 7); // uiForbiddenZeroBit
+  if (pNalUnitHeader->uiForbiddenZeroBit) { //2010.4.14
+    pCtx->iErrorCode |= dsBitstreamError;
+    return NULL; //uiForbiddenZeroBit should always equal to 0
+  }
+
+  pNalUnitHeader->uiNalRefIdc   = (uint8_t) (pNal[0] >> 5);             // uiNalRefIdc
+  pNalUnitHeader->eNalUnitType  = (EWelsNalUnitType) (pNal[0] & 0x1f);  // eNalUnitType
+
+  ++pNal;
+  --iNalSize;
+  ++ (*pConsumedBytes);
+
+  if (! (IS_SEI_NAL (pNalUnitHeader->eNalUnitType) || IS_SPS_NAL (pNalUnitHeader->eNalUnitType)
+         || IS_AU_DELIMITER_NAL (pNalUnitHeader->eNalUnitType) || pCtx->sSpsPpsCtx.bSpsExistAheadFlag)) {
+    if (pCtx->bPrintFrameErrorTraceFlag && pCtx->sSpsPpsCtx.iSpsErrorIgnored == 0) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "parse_nal(), no exist Sequence Parameter Sets ahead of sequence when try to decode NAL(type:%d).",
+               pNalUnitHeader->eNalUnitType);
+    } else {
+      pCtx->sSpsPpsCtx.iSpsErrorIgnored++;
+    }
+    pCtx->pDecoderStatistics->iSpsNoExistNalNum++;
+    pCtx->iErrorCode = dsNoParamSets;
+    return NULL;
+  }
+  pCtx->sSpsPpsCtx.iSpsErrorIgnored = 0;
+  if (! (IS_SEI_NAL (pNalUnitHeader->eNalUnitType) || IS_PARAM_SETS_NALS (pNalUnitHeader->eNalUnitType)
+         || IS_AU_DELIMITER_NAL (pNalUnitHeader->eNalUnitType) || pCtx->sSpsPpsCtx.bPpsExistAheadFlag)) {
+    if (pCtx->bPrintFrameErrorTraceFlag && pCtx->sSpsPpsCtx.iPpsErrorIgnored == 0) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "parse_nal(), no exist Picture Parameter Sets ahead of sequence when try to decode NAL(type:%d).",
+               pNalUnitHeader->eNalUnitType);
+    } else {
+      pCtx->sSpsPpsCtx.iPpsErrorIgnored++;
+    }
+    pCtx->pDecoderStatistics->iPpsNoExistNalNum++;
+    pCtx->iErrorCode = dsNoParamSets;
+    return NULL;
+  }
+  pCtx->sSpsPpsCtx.iPpsErrorIgnored = 0;
+  if ((IS_VCL_NAL_AVC_BASE (pNalUnitHeader->eNalUnitType) && ! (pCtx->sSpsPpsCtx.bSpsExistAheadFlag
+       || pCtx->sSpsPpsCtx.bPpsExistAheadFlag)) ||
+      (IS_NEW_INTRODUCED_SVC_NAL (pNalUnitHeader->eNalUnitType) && ! (pCtx->sSpsPpsCtx.bSpsExistAheadFlag
+          || pCtx->sSpsPpsCtx.bSubspsExistAheadFlag
+          || pCtx->sSpsPpsCtx.bPpsExistAheadFlag))) {
+    if (pCtx->bPrintFrameErrorTraceFlag && pCtx->sSpsPpsCtx.iSubSpsErrorIgnored == 0) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParseNalHeader(), no exist Parameter Sets ahead of sequence when try to decode slice(type:%d).",
+               pNalUnitHeader->eNalUnitType);
+    } else {
+      pCtx->sSpsPpsCtx.iSubSpsErrorIgnored++;
+    }
+    pCtx->pDecoderStatistics->iSubSpsNoExistNalNum++;
+    pCtx->iErrorCode    |= dsNoParamSets;
+    return NULL;
+  }
+  pCtx->sSpsPpsCtx.iSubSpsErrorIgnored = 0;
+
+  switch (pNalUnitHeader->eNalUnitType) {
+  case NAL_UNIT_AU_DELIMITER:
+  case NAL_UNIT_SEI:
+    if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+      pCtx->pAccessUnitList->uiEndPos = pCtx->pAccessUnitList->uiAvailUnitsNum - 1;
+      pCtx->bAuReadyFlag = true;
+    }
+    break;
+
+  case NAL_UNIT_PREFIX:
+    pCurNal = &pCtx->sSpsPpsCtx.sPrefixNal;
+    pCurNal->uiTimeStamp = pCtx->uiTimeStamp;
+
+    if (iNalSize < NAL_UNIT_HEADER_EXT_SIZE) {
+      PAccessUnit pCurAu = pCtx->pAccessUnitList;
+      uint32_t uiAvailNalNum = pCurAu->uiAvailUnitsNum;
+
+      if (uiAvailNalNum > 0) {
+        pCurAu->uiEndPos = uiAvailNalNum - 1;
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+          pCtx->bAuReadyFlag = true;
+        }
+      }
+      pCurNal->sNalData.sPrefixNal.bPrefixNalCorrectFlag = false;
+      pCtx->iErrorCode |= dsBitstreamError;
+      return NULL;
+    }
+
+    DecodeNalHeaderExt (pCurNal, pNal);
+    if ((pCurNal->sNalHeaderExt.uiQualityId != 0) || (pCurNal->sNalHeaderExt.bUseRefBasePicFlag != 0)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParseNalHeader() in Prefix Nal Unit:uiQualityId (%d) != 0, bUseRefBasePicFlag (%d) != 0, not supported!",
+               pCurNal->sNalHeaderExt.uiQualityId, pCurNal->sNalHeaderExt.bUseRefBasePicFlag);
+      PAccessUnit pCurAu = pCtx->pAccessUnitList;
+      uint32_t uiAvailNalNum = pCurAu->uiAvailUnitsNum;
+
+      if (uiAvailNalNum > 0) {
+        pCurAu->uiEndPos = uiAvailNalNum - 1;
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+          pCtx->bAuReadyFlag = true;
+        }
+      }
+      pCurNal->sNalData.sPrefixNal.bPrefixNalCorrectFlag = false;
+      pCtx->iErrorCode |= dsBitstreamError;
+      return NULL;
+    }
+
+    pNal            += NAL_UNIT_HEADER_EXT_SIZE;
+    iNalSize        -= NAL_UNIT_HEADER_EXT_SIZE;
+    *pConsumedBytes += NAL_UNIT_HEADER_EXT_SIZE;
+
+    pCurNal->sNalHeaderExt.sNalUnitHeader.uiForbiddenZeroBit = pNalUnitHeader->uiForbiddenZeroBit;
+    pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc        = pNalUnitHeader->uiNalRefIdc;
+    pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType       = pNalUnitHeader->eNalUnitType;
+    if (pNalUnitHeader->uiNalRefIdc != 0) {
+      pBs = &pCtx->sBs;
+      iBitSize = (iNalSize << 3) - BsGetTrailingBits (pNal + iNalSize - 1); // convert into bit
+
+      iErr = DecInitBits (pBs, pNal, iBitSize);
+      if (iErr) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "NAL_UNIT_PREFIX: DecInitBits() fail due invalid access.");
+        pCtx->iErrorCode |= dsBitstreamError;
+        return NULL;
+      }
+      ParsePrefixNalUnit (pCtx, pBs);
+    }
+    pCurNal->sNalData.sPrefixNal.bPrefixNalCorrectFlag = true;
+
+    break;
+  case NAL_UNIT_CODED_SLICE_EXT:
+    bExtensionFlag = true;
+  case NAL_UNIT_CODED_SLICE:
+  case NAL_UNIT_CODED_SLICE_IDR: {
+    PAccessUnit pCurAu = NULL;
+    uint32_t uiAvailNalNum;
+    pCurNal = MemGetNextNal (&pCtx->pAccessUnitList, pCtx->pMemAlign);
+    if (NULL == pCurNal) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "MemGetNextNal() fail due out of memory.");
+      pCtx->iErrorCode |= dsOutOfMemory;
+      return NULL;
+    }
+    pCurNal->uiTimeStamp = pCtx->uiTimeStamp;
+    pCurNal->sNalHeaderExt.sNalUnitHeader.uiForbiddenZeroBit = pNalUnitHeader->uiForbiddenZeroBit;
+    pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc        = pNalUnitHeader->uiNalRefIdc;
+    pCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType       = pNalUnitHeader->eNalUnitType;
+    pCurAu        = pCtx->pAccessUnitList;
+    uiAvailNalNum = pCurAu->uiAvailUnitsNum;
+
+
+    if (pNalUnitHeader->eNalUnitType == NAL_UNIT_CODED_SLICE_EXT) {
+      if (iNalSize < NAL_UNIT_HEADER_EXT_SIZE) {
+        ForceClearCurrentNal (pCurAu);
+
+        if (uiAvailNalNum > 1) {
+          pCurAu->uiEndPos = uiAvailNalNum - 2;
+          if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+            pCtx->bAuReadyFlag = true;
+          }
+        }
+        pCtx->iErrorCode |= dsBitstreamError;
+        return NULL;
+      }
+
+      DecodeNalHeaderExt (pCurNal, pNal);
+      if (pCurNal->sNalHeaderExt.uiQualityId != 0 ||
+          pCurNal->sNalHeaderExt.bUseRefBasePicFlag) {
+        if (pCurNal->sNalHeaderExt.uiQualityId != 0)
+          WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():uiQualityId (%d) != 0, MGS not supported!",
+                   pCurNal->sNalHeaderExt.uiQualityId);
+        if (pCurNal->sNalHeaderExt.bUseRefBasePicFlag != 0)
+          WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseNalHeader():bUseRefBasePicFlag (%d) != 0, MGS not supported!",
+                   pCurNal->sNalHeaderExt.bUseRefBasePicFlag);
+
+        ForceClearCurrentNal (pCurAu);
+
+        if (uiAvailNalNum > 1) {
+          pCurAu->uiEndPos = uiAvailNalNum - 2;
+          if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+            pCtx->bAuReadyFlag = true;
+          }
+        }
+        pCtx->iErrorCode |= dsBitstreamError;
+        return NULL;
+      }
+      pNal            += NAL_UNIT_HEADER_EXT_SIZE;
+      iNalSize        -= NAL_UNIT_HEADER_EXT_SIZE;
+      *pConsumedBytes += NAL_UNIT_HEADER_EXT_SIZE;
+
+      if (pCtx->pParam->bParseOnly) {
+        pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;
+        int32_t iTrailingZeroByte = 0;
+        while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
+          iTrailingZeroByte++;
+        int32_t iActualLen = iSrcNalLen - iTrailingZeroByte;
+        pCurNal->sNalData.sVclNal.iNalLength = iActualLen - NAL_UNIT_HEADER_EXT_SIZE;
+        //unify start code as 0x0001
+        int32_t iCurrStartByte = 4; //4 for 0x0001, 3 for 0x001
+        if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001
+          iCurrStartByte = 3;
+          pCurNal->sNalData.sVclNal.iNalLength++;
+        }
+        if (pCurNal->sNalHeaderExt.bIdrFlag) {
+          * (pSrcNal + iCurrStartByte) &= 0xE0;
+          * (pSrcNal + iCurrStartByte) |= 0x05;
+        } else {
+          * (pSrcNal + iCurrStartByte) &= 0xE0;
+          * (pSrcNal + iCurrStartByte) |= 0x01;
+        }
+        pSavedData->pCurPos[0] = pSavedData->pCurPos[1] = pSavedData->pCurPos[2] = 0x0;
+        pSavedData->pCurPos[3] = 0x1;
+        pSavedData->pCurPos[4] = * (pSrcNal + iCurrStartByte);
+        pSavedData->pCurPos += 5;
+        int32_t iOffset = iCurrStartByte + 1 + NAL_UNIT_HEADER_EXT_SIZE;
+        memcpy (pSavedData->pCurPos, pSrcNal + iOffset, iActualLen - iOffset);
+        pSavedData->pCurPos += iActualLen - iOffset;
+      }
+    } else {
+      if (pCtx->pParam->bParseOnly) {
+        pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;
+        int32_t iTrailingZeroByte = 0;
+        while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
+          iTrailingZeroByte++;
+        int32_t iActualLen = iSrcNalLen - iTrailingZeroByte;
+        pCurNal->sNalData.sVclNal.iNalLength = iActualLen;
+        //unify start code as 0x0001
+        int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001
+        if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001
+          pSavedData->pCurPos[0] = 0x0;
+          iStartDeltaByte = 1;
+          pCurNal->sNalData.sVclNal.iNalLength++;
+        }
+        memcpy (pSavedData->pCurPos + iStartDeltaByte, pSrcNal, iActualLen);
+        pSavedData->pCurPos += iStartDeltaByte + iActualLen;
+      }
+      if (NAL_UNIT_PREFIX == pCtx->sSpsPpsCtx.sPrefixNal.sNalHeaderExt.sNalUnitHeader.eNalUnitType) {
+        if (pCtx->sSpsPpsCtx.sPrefixNal.sNalData.sPrefixNal.bPrefixNalCorrectFlag) {
+          PrefetchNalHeaderExtSyntax (pCtx, pCurNal, &pCtx->sSpsPpsCtx.sPrefixNal);
+        }
+      }
+
+      pCurNal->sNalHeaderExt.bIdrFlag = (NAL_UNIT_CODED_SLICE_IDR == pNalUnitHeader->eNalUnitType) ? true :
+                                        false;   //SHOULD update this flag for AVC if no prefix NAL
+      pCurNal->sNalHeaderExt.iNoInterLayerPredFlag = 1;
+    }
+
+    pBs = &pCurAu->pNalUnitsList[uiAvailNalNum - 1]->sNalData.sVclNal.sSliceBitsRead;
+    iBitSize = (iNalSize << 3) - BsGetTrailingBits (pNal + iNalSize - 1); // convert into bit
+    iErr = DecInitBits (pBs, pNal, iBitSize);
+    if (iErr) {
+      ForceClearCurrentNal (pCurAu);
+      if (uiAvailNalNum > 1) {
+        pCurAu->uiEndPos = uiAvailNalNum - 2;
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+          pCtx->bAuReadyFlag = true;
+        }
+      }
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "NAL_UNIT_CODED_SLICE: DecInitBits() fail due invalid access.");
+      pCtx->iErrorCode |= dsBitstreamError;
+      return NULL;
+    }
+    iErr = ParseSliceHeaderSyntaxs (pCtx, pBs, bExtensionFlag);
+    if (iErr != ERR_NONE) {
+      if ((uiAvailNalNum == 1) && (pCurNal->sNalHeaderExt.bIdrFlag)) { //IDR parse error
+        ResetActiveSPSForEachLayer (pCtx);
+      }
+      //if current NAL occur error when parsing, should clean it from pNalUnitsList
+      //otherwise, when Next good NAL decoding, this corrupt NAL is considered as normal NAL and lead to decoder crash
+      ForceClearCurrentNal (pCurAu);
+
+      if (uiAvailNalNum > 1) {
+        pCurAu->uiEndPos = uiAvailNalNum - 2;
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+          pCtx->bAuReadyFlag = true;
+        }
+      }
+      pCtx->iErrorCode |= dsBitstreamError;
+      return NULL;
+    }
+
+    if ((uiAvailNalNum == 1)
+        && CheckNextAuNewSeq (pCtx, pCurNal, pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps)) {
+      ResetActiveSPSForEachLayer (pCtx);
+    }
+    if ((uiAvailNalNum > 1) &&
+        CheckAccessUnitBoundary (pCtx, pCurAu->pNalUnitsList[uiAvailNalNum - 1], pCurAu->pNalUnitsList[uiAvailNalNum - 2],
+                                 pCurAu->pNalUnitsList[uiAvailNalNum - 1]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps)) {
+      pCurAu->uiEndPos = uiAvailNalNum - 2;
+      pCtx->bAuReadyFlag = true;
+      pCtx->bNextNewSeqBegin = CheckNextAuNewSeq (pCtx, pCurNal, pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps);
+
+    }
+  }
+  break;
+  default:
+    break;
+  }
+
+  return pNal;
+}
+
+
+bool CheckAccessUnitBoundaryExt (PNalUnitHeaderExt pLastNalHdrExt, PNalUnitHeaderExt pCurNalHeaderExt,
+                                 PSliceHeader pLastSliceHeader, PSliceHeader pCurSliceHeader) {
+  const PSps kpSps = pCurSliceHeader->pSps;
+
+  //Sub-clause 7.1.4.1.1 temporal_id
+  if (pLastNalHdrExt->uiTemporalId != pCurNalHeaderExt->uiTemporalId) {
+    return true;
+  }
+
+  // Subclause 7.4.1.2.5
+  if (pLastSliceHeader->iRedundantPicCnt > pCurSliceHeader->iRedundantPicCnt)
+    return true;
+
+  // Subclause G7.4.1.2.4
+  if (pLastNalHdrExt->uiDependencyId > pCurNalHeaderExt->uiDependencyId)
+    return true;
+  if (pLastNalHdrExt->uiQualityId > pCurNalHeaderExt->uiQualityId)
+    return true;
+
+  // Subclause 7.4.1.2.4
+  if (pLastSliceHeader->iFrameNum != pCurSliceHeader->iFrameNum)
+    return true;
+  if (pLastSliceHeader->iPpsId != pCurSliceHeader->iPpsId)
+    return true;
+  if (pLastSliceHeader->pSps->iSpsId != pCurSliceHeader->pSps->iSpsId)
+    return true;
+  if (pLastSliceHeader->bFieldPicFlag != pCurSliceHeader->bFieldPicFlag)
+    return true;
+  if (pLastSliceHeader->bBottomFiledFlag != pCurSliceHeader->bBottomFiledFlag)
+    return true;
+  if ((pLastNalHdrExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (pCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc !=
+      NRI_PRI_LOWEST))
+    return true;
+  if (pLastNalHdrExt->bIdrFlag != pCurNalHeaderExt->bIdrFlag)
+    return true;
+  if (pCurNalHeaderExt->bIdrFlag) {
+    if (pLastSliceHeader->uiIdrPicId != pCurSliceHeader->uiIdrPicId)
+      return true;
+  }
+  if (kpSps->uiPocType == 0) {
+    if (pLastSliceHeader->iPicOrderCntLsb != pCurSliceHeader->iPicOrderCntLsb)
+      return true;
+    if (pLastSliceHeader->iDeltaPicOrderCntBottom != pCurSliceHeader->iDeltaPicOrderCntBottom)
+      return true;
+  } else if (kpSps->uiPocType == 1) {
+    if (pLastSliceHeader->iDeltaPicOrderCnt[0] != pCurSliceHeader->iDeltaPicOrderCnt[0])
+      return true;
+    if (pLastSliceHeader->iDeltaPicOrderCnt[1] != pCurSliceHeader->iDeltaPicOrderCnt[1])
+      return true;
+  }
+  if (memcmp (pLastSliceHeader->pPps, pCurSliceHeader->pPps, sizeof (SPps)) != 0
+      || memcmp (pLastSliceHeader->pSps, pCurSliceHeader->pSps, sizeof (SSps)) != 0) {
+    return true;
+  }
+  return false;
+}
+
+
+bool CheckAccessUnitBoundary (PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PNalUnit kpLastNal,
+                              const PSps kpSps) {
+  const PNalUnitHeaderExt kpLastNalHeaderExt = &kpLastNal->sNalHeaderExt;
+  const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;
+  const SSliceHeader* kpLastSliceHeader = &kpLastNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
+  const SSliceHeader* kpCurSliceHeader = &kpCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
+  if (pCtx->sSpsPpsCtx.pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != NULL
+      && pCtx->sSpsPpsCtx.pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != kpSps) {
+    return true; // the active sps changed, new sequence begins, so the current au is ready
+  }
+
+  //Sub-clause 7.1.4.1.1 temporal_id
+  if (kpLastNalHeaderExt->uiTemporalId != kpCurNalHeaderExt->uiTemporalId) {
+    return true;
+  }
+  if (kpLastSliceHeader->iFrameNum != kpCurSliceHeader->iFrameNum)
+    return true;
+  // Subclause 7.4.1.2.5
+  if (kpLastSliceHeader->iRedundantPicCnt > kpCurSliceHeader->iRedundantPicCnt)
+    return true;
+
+  // Subclause G7.4.1.2.4
+  if (kpLastNalHeaderExt->uiDependencyId > kpCurNalHeaderExt->uiDependencyId)
+    return true;
+  // Subclause 7.4.1.2.4
+  if (kpLastNalHeaderExt->uiDependencyId == kpCurNalHeaderExt->uiDependencyId
+      && kpLastSliceHeader->iPpsId != kpCurSliceHeader->iPpsId)
+    return true;
+  if (kpLastSliceHeader->bFieldPicFlag != kpCurSliceHeader->bFieldPicFlag)
+    return true;
+  if (kpLastSliceHeader->bBottomFiledFlag != kpCurSliceHeader->bBottomFiledFlag)
+    return true;
+  if ((kpLastNalHeaderExt->sNalUnitHeader.uiNalRefIdc != NRI_PRI_LOWEST) != (kpCurNalHeaderExt->sNalUnitHeader.uiNalRefIdc
+      != NRI_PRI_LOWEST))
+    return true;
+  if (kpLastNalHeaderExt->bIdrFlag != kpCurNalHeaderExt->bIdrFlag)
+    return true;
+  if (kpCurNalHeaderExt->bIdrFlag) {
+    if (kpLastSliceHeader->uiIdrPicId != kpCurSliceHeader->uiIdrPicId)
+      return true;
+  }
+  if (kpSps->uiPocType == 0) {
+    if (kpLastSliceHeader->iPicOrderCntLsb != kpCurSliceHeader->iPicOrderCntLsb)
+      return true;
+    if (kpLastSliceHeader->iDeltaPicOrderCntBottom != kpCurSliceHeader->iDeltaPicOrderCntBottom)
+      return true;
+  } else if (kpSps->uiPocType == 1) {
+    if (kpLastSliceHeader->iDeltaPicOrderCnt[0] != kpCurSliceHeader->iDeltaPicOrderCnt[0])
+      return true;
+    if (kpLastSliceHeader->iDeltaPicOrderCnt[1] != kpCurSliceHeader->iDeltaPicOrderCnt[1])
+      return true;
+  }
+
+  return false;
+}
+
+bool CheckNextAuNewSeq (PWelsDecoderContext pCtx, const PNalUnit kpCurNal, const PSps kpSps) {
+  const PNalUnitHeaderExt kpCurNalHeaderExt = &kpCurNal->sNalHeaderExt;
+  if (pCtx->sSpsPpsCtx.pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != NULL
+      && pCtx->sSpsPpsCtx.pActiveLayerSps[kpCurNalHeaderExt->uiDependencyId] != kpSps)
+    return true;
+  if (kpCurNalHeaderExt->bIdrFlag)
+    return true;
+
+  return false;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to parse NON VCL NAL Units
+ *
+ * \param   pCtx        decoder context
+ * \param   rbsp        rbsp buffer of NAL Unit
+ * \param   src_len     length of rbsp buffer
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ *************************************************************************************
+ */
+int32_t ParseNonVclNal (PWelsDecoderContext pCtx, uint8_t* pRbsp, const int32_t kiSrcLen, uint8_t* pSrcNal,
+                        const int32_t kSrcNalLen) {
+  PBitStringAux pBs = NULL;
+  EWelsNalUnitType eNalType     = NAL_UNIT_UNSPEC_0; // make initial value as unspecified
+  int32_t iPicWidth             = 0;
+  int32_t iPicHeight            = 0;
+  int32_t iBitSize              = 0;
+  int32_t iErr                  = ERR_NONE;
+  if (kiSrcLen <= 0)
+    return iErr;
+
+  pBs = &pCtx->sBs; // SBitStringAux instance for non VCL NALs decoding
+  iBitSize = (kiSrcLen << 3) - BsGetTrailingBits (pRbsp + kiSrcLen - 1); // convert into bit
+  eNalType = pCtx->sCurNalHead.eNalUnitType;
+
+  switch (eNalType) {
+  case NAL_UNIT_SPS:
+  case NAL_UNIT_SUBSET_SPS:
+    if (iBitSize > 0) {
+      iErr = DecInitBits (pBs, pRbsp, iBitSize);
+      if (ERR_NONE != iErr) {
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE)
+          pCtx->iErrorCode |= dsNoParamSets;
+        else
+          pCtx->iErrorCode |= dsBitstreamError;
+        return iErr;
+      }
+    }
+    iErr = ParseSps (pCtx, pBs, &iPicWidth, &iPicHeight, pSrcNal, kSrcNalLen);
+    if (ERR_NONE != iErr) { // modified for pSps/pSubsetSps invalid, 12/1/2009
+      if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE)
+        pCtx->iErrorCode |= dsNoParamSets;
+      else
+        pCtx->iErrorCode |= dsBitstreamError;
+      return iErr;
+    }
+    pCtx->bHasNewSps = true;
+    break;
+
+  case NAL_UNIT_PPS:
+    if (iBitSize > 0) {
+      iErr = DecInitBits (pBs, pRbsp, iBitSize);
+      if (ERR_NONE != iErr) {
+        if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE)
+          pCtx->iErrorCode |= dsNoParamSets;
+        else
+          pCtx->iErrorCode |= dsBitstreamError;
+        return iErr;
+      }
+    }
+    iErr = ParsePps (pCtx, &pCtx->sSpsPpsCtx.sPpsBuffer[0], pBs, pSrcNal, kSrcNalLen);
+    if (ERR_NONE != iErr) { // modified for pps invalid, 12/1/2009
+      if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE)
+        pCtx->iErrorCode |= dsNoParamSets;
+      else
+        pCtx->iErrorCode |= dsBitstreamError;
+      pCtx->bHasNewSps = false;
+      return iErr;
+    }
+
+    pCtx->sSpsPpsCtx.bPpsExistAheadFlag = true;
+    ++ (pCtx->sSpsPpsCtx.iSeqId);
+    break;
+
+  case NAL_UNIT_SEI:
+
+    break;
+
+  case NAL_UNIT_PREFIX:
+    break;
+  case NAL_UNIT_CODED_SLICE_DPA:
+  case NAL_UNIT_CODED_SLICE_DPB:
+  case NAL_UNIT_CODED_SLICE_DPC:
+
+    break;
+
+  default:
+    break;
+  }
+
+  return iErr;
+}
+
+int32_t ParseRefBasePicMarking (PBitStringAux pBs, PRefBasePicMarking pRefBasePicMarking) {
+  uint32_t uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_ref_base_pic_marking_mode_flag
+  const bool kbAdaptiveMarkingModeFlag = !!uiCode;
+  pRefBasePicMarking->bAdaptiveRefBasePicMarkingModeFlag = kbAdaptiveMarkingModeFlag;
+  if (kbAdaptiveMarkingModeFlag) {
+    int32_t iIdx = 0;
+    do {
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //MMCO_base
+      const uint32_t kuiMmco = uiCode;
+
+      pRefBasePicMarking->mmco_base[iIdx].uiMmcoType = kuiMmco;
+
+      if (kuiMmco == MMCO_END)
+        break;
+
+      if (kuiMmco == MMCO_SHORT2UNUSED) {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //difference_of_base_pic_nums_minus1
+        pRefBasePicMarking->mmco_base[iIdx].uiDiffOfPicNums = 1 + uiCode;
+        pRefBasePicMarking->mmco_base[iIdx].iShortFrameNum  = 0;
+      } else if (kuiMmco == MMCO_LONG2UNUSED) {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //long_term_base_pic_num
+        pRefBasePicMarking->mmco_base[iIdx].uiLongTermPicNum = uiCode;
+      }
+      ++ iIdx;
+    } while (iIdx < MAX_MMCO_COUNT);
+  }
+  return ERR_NONE;
+}
+
+int32_t ParsePrefixNalUnit (PWelsDecoderContext pCtx, PBitStringAux pBs) {
+  PNalUnit pCurNal = &pCtx->sSpsPpsCtx.sPrefixNal;
+  uint32_t uiCode;
+
+  if (pCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc != 0) {
+    PNalUnitHeaderExt head_ext = &pCurNal->sNalHeaderExt;
+    PPrefixNalUnit sPrefixNal = &pCurNal->sNalData.sPrefixNal;
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //store_ref_base_pic_flag
+    sPrefixNal->bStoreRefBasePicFlag = !!uiCode;
+    if ((head_ext->bUseRefBasePicFlag || sPrefixNal->bStoreRefBasePicFlag) && !head_ext->bIdrFlag) {
+      WELS_READ_VERIFY (ParseRefBasePicMarking (pBs, &sPrefixNal->sRefPicBaseMarking));
+    }
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //additional_prefix_nal_unit_extension_flag
+    sPrefixNal->bPrefixNalUnitAdditionalExtFlag = !!uiCode;
+    if (sPrefixNal->bPrefixNalUnitAdditionalExtFlag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //additional_prefix_nal_unit_extension_data_flag
+      sPrefixNal->bPrefixNalUnitExtFlag = !!uiCode;
+    }
+  }
+  return ERR_NONE;
+}
+
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_LEFT_OFFSET_MIN -32768
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_LEFT_OFFSET_MAX 32767
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_TOP_OFFSET_MIN -32768
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_TOP_OFFSET_MAX 32767
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_RIGHT_OFFSET_MIN -32768
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_RIGHT_OFFSET_MAX 32767
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_BOTTOM_OFFSET_MIN -32768
+#define SUBSET_SPS_SEQ_SCALED_REF_LAYER_BOTTOM_OFFSET_MAX 32767
+
+
+
+
+int32_t DecodeSpsSvcExt (PWelsDecoderContext pCtx, PSubsetSps pSpsExt, PBitStringAux pBs) {
+  PSpsSvcExt  pExt = NULL;
+  uint32_t uiCode;
+  int32_t iCode;
+
+  pExt = &pSpsExt->sSpsSvcExt;
+
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //inter_layer_deblocking_filter_control_present_flag
+  pExt->bInterLayerDeblockingFilterCtrlPresentFlag = !!uiCode;
+  WELS_READ_VERIFY (BsGetBits (pBs, 2, &uiCode)); //extended_spatial_scalability_idc
+  pExt->uiExtendedSpatialScalability = uiCode;
+  if (pExt->uiExtendedSpatialScalability > 2) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "DecodeSpsSvcExt():extended_spatial_scalability (%d) != 0, ESS not supported!",
+             pExt->uiExtendedSpatialScalability);
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_ESS);
+  }
+
+  pExt->uiChromaPhaseXPlus1Flag =
+    0;  // FIXME: Incoherent with JVT X201 standard (= 1), but conformance to JSVM (= 0) implementation.
+  pExt->uiChromaPhaseYPlus1 = 1;
+
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //chroma_phase_x_plus1_flag
+  pExt->uiChromaPhaseXPlus1Flag = uiCode;
+  WELS_READ_VERIFY (BsGetBits (pBs, 2, &uiCode)); //chroma_phase_y_plus1
+  pExt->uiChromaPhaseYPlus1 = uiCode;
+
+  pExt->uiSeqRefLayerChromaPhaseXPlus1Flag = pExt->uiChromaPhaseXPlus1Flag;
+  pExt->uiSeqRefLayerChromaPhaseYPlus1     = pExt->uiChromaPhaseYPlus1;
+  memset (&pExt->sSeqScaledRefLayer, 0, sizeof (SPosOffset));
+
+  if (pExt->uiExtendedSpatialScalability == 1) {
+    SPosOffset* const kpPos = &pExt->sSeqScaledRefLayer;
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //seq_ref_layer_chroma_phase_x_plus1_flag
+    pExt->uiSeqRefLayerChromaPhaseXPlus1Flag = uiCode;
+    WELS_READ_VERIFY (BsGetBits (pBs, 2, &uiCode)); //seq_ref_layer_chroma_phase_y_plus1
+    pExt->uiSeqRefLayerChromaPhaseYPlus1 = uiCode;
+
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //seq_scaled_ref_layer_left_offset
+    kpPos->iLeftOffset = iCode;
+    WELS_CHECK_SE_BOTH_WARNING (kpPos->iLeftOffset, SUBSET_SPS_SEQ_SCALED_REF_LAYER_LEFT_OFFSET_MIN,
+                                SUBSET_SPS_SEQ_SCALED_REF_LAYER_LEFT_OFFSET_MAX, "seq_scaled_ref_layer_left_offset");
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //seq_scaled_ref_layer_top_offset
+    kpPos->iTopOffset = iCode;
+    WELS_CHECK_SE_BOTH_WARNING (kpPos->iTopOffset, SUBSET_SPS_SEQ_SCALED_REF_LAYER_TOP_OFFSET_MIN,
+                                SUBSET_SPS_SEQ_SCALED_REF_LAYER_TOP_OFFSET_MAX, "seq_scaled_ref_layer_top_offset");
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //seq_scaled_ref_layer_right_offset
+    kpPos->iRightOffset = iCode;
+    WELS_CHECK_SE_BOTH_WARNING (kpPos->iRightOffset, SUBSET_SPS_SEQ_SCALED_REF_LAYER_RIGHT_OFFSET_MIN,
+                                SUBSET_SPS_SEQ_SCALED_REF_LAYER_RIGHT_OFFSET_MAX, "seq_scaled_ref_layer_right_offset");
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //seq_scaled_ref_layer_bottom_offset
+    kpPos->iBottomOffset = iCode;
+    WELS_CHECK_SE_BOTH_WARNING (kpPos->iBottomOffset, SUBSET_SPS_SEQ_SCALED_REF_LAYER_BOTTOM_OFFSET_MIN,
+                                SUBSET_SPS_SEQ_SCALED_REF_LAYER_BOTTOM_OFFSET_MAX, "seq_scaled_ref_layer_bottom_offset");
+  }
+
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //seq_tcoeff_level_prediction_flag
+  pExt->bSeqTCoeffLevelPredFlag = !!uiCode;
+  pExt->bAdaptiveTCoeffLevelPredFlag = false;
+  if (pExt->bSeqTCoeffLevelPredFlag) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_tcoeff_level_prediction_flag
+    pExt->bAdaptiveTCoeffLevelPredFlag = !!uiCode;
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //slice_header_restriction_flag
+  pExt->bSliceHeaderRestrictionFlag = !!uiCode;
+
+
+
+  return ERR_NONE;
+}
+
+const SLevelLimits* GetLevelLimits (int32_t iLevelIdx, bool bConstraint3) {
+  switch (iLevelIdx) {
+  case 9:
+    return &g_ksLevelLimits[1];
+  case 10:
+    return &g_ksLevelLimits[0];
+  case 11:
+    if (bConstraint3)
+      return &g_ksLevelLimits[1];
+    else
+      return &g_ksLevelLimits[2];
+  case 12:
+    return &g_ksLevelLimits[3];
+  case 13:
+    return &g_ksLevelLimits[4];
+  case 20:
+    return &g_ksLevelLimits[5];
+  case 21:
+    return &g_ksLevelLimits[6];
+  case 22:
+    return &g_ksLevelLimits[7];
+  case 30:
+    return &g_ksLevelLimits[8];
+  case 31:
+    return &g_ksLevelLimits[9];
+  case 32:
+    return &g_ksLevelLimits[10];
+  case 40:
+    return &g_ksLevelLimits[11];
+  case 41:
+    return &g_ksLevelLimits[12];
+  case 42:
+    return &g_ksLevelLimits[13];
+  case 50:
+    return &g_ksLevelLimits[14];
+  case 51:
+    return &g_ksLevelLimits[15];
+  case 52:
+    return &g_ksLevelLimits[16];
+  default:
+    return NULL;
+  }
+  return NULL;
+}
+
+bool CheckSpsActive (PWelsDecoderContext pCtx, PSps pSps, bool bUseSubsetFlag) {
+  for (int i = 0; i < MAX_LAYER_NUM; i++) {
+    if (pCtx->sSpsPpsCtx.pActiveLayerSps[i] == pSps)
+      return true;
+  }
+  // Pre-active, will be used soon
+  if (bUseSubsetFlag) {
+    if (pSps->iMbWidth > 0 && pSps->iMbHeight > 0 && pCtx->sSpsPpsCtx.bSubspsAvailFlags[pSps->iSpsId]) {
+      if (pCtx->iTotalNumMbRec > 0) {
+        return true;
+      }
+      if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+        int i = 0, iNum = (int32_t) pCtx->pAccessUnitList->uiAvailUnitsNum;
+        while (i < iNum) {
+          PNalUnit pNalUnit = pCtx->pAccessUnitList->pNalUnitsList[i];
+          if (pNalUnit->sNalData.sVclNal.bSliceHeaderExtFlag) { //ext data
+            PSps pNextUsedSps = pNalUnit->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps;
+            if (pNextUsedSps->iSpsId == pSps->iSpsId)
+              return true;
+          }
+          ++i;
+        }
+      }
+    }
+  } else {
+    if (pSps->iMbWidth > 0 && pSps->iMbHeight > 0 && pCtx->sSpsPpsCtx.bSpsAvailFlags[pSps->iSpsId]) {
+      if (pCtx->iTotalNumMbRec > 0) {
+        return true;
+      }
+      if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+        int i = 0, iNum = (int32_t) pCtx->pAccessUnitList->uiAvailUnitsNum;
+        while (i < iNum) {
+          PNalUnit pNalUnit = pCtx->pAccessUnitList->pNalUnitsList[i];
+          if (!pNalUnit->sNalData.sVclNal.bSliceHeaderExtFlag) { //non-ext data
+            PSps pNextUsedSps = pNalUnit->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps;
+            if (pNextUsedSps->iSpsId == pSps->iSpsId)
+              return true;
+          }
+          ++i;
+        }
+      }
+    }
+  }
+  return false;
+}
+
+#define  SPS_LOG2_MAX_FRAME_NUM_MINUS4_MAX 12
+#define  SPS_LOG2_MAX_PIC_ORDER_CNT_LSB_MINUS4_MAX 12
+#define  SPS_NUM_REF_FRAMES_IN_PIC_ORDER_CNT_CYCLE_MAX 255
+#define  SPS_MAX_NUM_REF_FRAMES_MAX 16
+#define  PPS_PIC_INIT_QP_QS_MIN 0
+#define  PPS_PIC_INIT_QP_QS_MAX 51
+#define  PPS_CHROMA_QP_INDEX_OFFSET_MIN -12
+#define  PPS_CHROMA_QP_INDEX_OFFSET_MAX 12
+#define  SCALING_LIST_DELTA_SCALE_MAX 127
+#define SCALING_LIST_DELTA_SCALE_MIN -128
+
+/*!
+ *************************************************************************************
+ * \brief   to parse Sequence Parameter Set (SPS)
+ *
+ * \param   pCtx        Decoder context
+ * \param   pBsAux      bitstream reader auxiliary
+ * \param   pPicWidth   picture width current Sps represented
+ * \param   pPicHeight  picture height current Sps represented
+ *
+ * \return  0 - successed
+ *      1 - failed
+ *
+ * \note    Call it in case eNalUnitType is SPS.
+ *************************************************************************************
+ */
+
+int32_t ParseSps (PWelsDecoderContext pCtx, PBitStringAux pBsAux, int32_t* pPicWidth, int32_t* pPicHeight,
+                  uint8_t* pSrcNal, const int32_t kSrcNalLen) {
+  PBitStringAux pBs = pBsAux;
+  SSubsetSps sTempSubsetSps;
+  PSps pSps = NULL;
+  PSubsetSps pSubsetSps = NULL;
+  SNalUnitHeader* pNalHead = &pCtx->sCurNalHead;
+  ProfileIdc uiProfileIdc;
+  uint8_t uiLevelIdc;
+  int32_t iSpsId;
+  uint32_t uiCode;
+  int32_t iCode;
+  int32_t iRet = ERR_NONE;
+  bool bConstraintSetFlags[6] = { false };
+  const bool kbUseSubsetFlag   = IS_SUBSET_SPS_NAL (pNalHead->eNalUnitType);
+
+  WELS_READ_VERIFY (BsGetBits (pBs, 8, &uiCode)); //profile_idc
+  uiProfileIdc = uiCode;
+  if (uiProfileIdc != PRO_BASELINE && uiProfileIdc != PRO_MAIN && uiProfileIdc != PRO_SCALABLE_BASELINE
+      && uiProfileIdc != PRO_SCALABLE_HIGH
+      && uiProfileIdc != PRO_EXTENDED && uiProfileIdc != PRO_HIGH) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "SPS ID can not be supported!\n");
+    return false;
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set0_flag
+  bConstraintSetFlags[0] = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set1_flag
+  bConstraintSetFlags[1] = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set2_flag
+  bConstraintSetFlags[2] = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set3_flag
+  bConstraintSetFlags[3] = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set4_flag
+  bConstraintSetFlags[4] = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constraint_set5_flag
+  bConstraintSetFlags[5] = !!uiCode;
+  WELS_READ_VERIFY (BsGetBits (pBs, 2, &uiCode)); // reserved_zero_2bits, equal to 0
+  WELS_READ_VERIFY (BsGetBits (pBs, 8, &uiCode)); // level_idc
+  uiLevelIdc = uiCode;
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //seq_parameter_set_id
+  if (uiCode >= MAX_SPS_COUNT) { // Modified to check invalid negative iSpsId, 12/1/2009
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " iSpsId is out of range! \n");
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_SPS_ID_OVERFLOW);
+  }
+  iSpsId = uiCode;
+  pSubsetSps = &sTempSubsetSps;
+  pSps = &sTempSubsetSps.sSps;
+  memset (pSubsetSps, 0, sizeof (SSubsetSps));
+  // Use the level 5.2 for compatibility
+  const SLevelLimits* pSMaxLevelLimits = GetLevelLimits (52, false);
+  const SLevelLimits* pSLevelLimits = GetLevelLimits (uiLevelIdc, bConstraintSetFlags[3]);
+  if (NULL == pSLevelLimits) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): level_idx (%d).\n", uiLevelIdc);
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
+  } else pSps->pSLevelLimits = pSLevelLimits;
+  // syntax elements in default
+  pSps->uiChromaFormatIdc = 1;
+  pSps->uiChromaArrayType = 1;
+
+  pSps->uiProfileIdc = uiProfileIdc;
+  pSps->uiLevelIdc   = uiLevelIdc;
+  pSps->iSpsId       = iSpsId;
+
+  if (PRO_SCALABLE_BASELINE == uiProfileIdc || PRO_SCALABLE_HIGH == uiProfileIdc ||
+      PRO_HIGH == uiProfileIdc || PRO_HIGH10 == uiProfileIdc ||
+      PRO_HIGH422 == uiProfileIdc || PRO_HIGH444 == uiProfileIdc ||
+      PRO_CAVLC444 == uiProfileIdc || 44 == uiProfileIdc) {
+
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //chroma_format_idc
+    pSps->uiChromaFormatIdc = uiCode;
+//    if (pSps->uiChromaFormatIdc != 1) {
+//      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) = 1 supported.",
+//               pSps->uiChromaFormatIdc);
+//      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
+//    }
+    if (pSps->uiChromaFormatIdc > 1) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): chroma_format_idc (%d) <=1 supported.",
+               pSps->uiChromaFormatIdc);
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
+
+    }// To support 4:0:0; 4:2:0
+    pSps->uiChromaArrayType = pSps->uiChromaFormatIdc;
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //bit_depth_luma_minus8
+    if (uiCode != 0) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_luma (%d) Only 8 bit supported.", 8 + uiCode);
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
+    }
+    pSps->uiBitDepthLuma = 8;
+
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //bit_depth_chroma_minus8
+    if (uiCode != 0) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): bit_depth_chroma (%d). Only 8 bit supported.", 8 + uiCode);
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_NON_BASELINE);
+    }
+    pSps->uiBitDepthChroma = 8;
+
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //qpprime_y_zero_transform_bypass_flag
+    pSps->bQpPrimeYZeroTransfBypassFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //seq_scaling_matrix_present_flag
+    pSps->bSeqScalingMatrixPresentFlag = !!uiCode;
+
+    if (pSps->bSeqScalingMatrixPresentFlag) {
+      WELS_READ_VERIFY (ParseScalingList (pSps, pBs, 0, 0, pSps->bSeqScalingListPresentFlag, pSps->iScalingList4x4,
+                                          pSps->iScalingList8x8));
+    }
+  }
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //log2_max_frame_num_minus4
+  WELS_CHECK_SE_UPPER_ERROR (uiCode, SPS_LOG2_MAX_FRAME_NUM_MINUS4_MAX, "log2_max_frame_num_minus4",
+                             GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_LOG2_MAX_FRAME_NUM_MINUS4));
+  pSps->uiLog2MaxFrameNum = LOG2_MAX_FRAME_NUM_OFFSET + uiCode;
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_order_cnt_type
+  pSps->uiPocType = uiCode;
+
+  if (0 == pSps->uiPocType) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //log2_max_pic_order_cnt_lsb_minus4
+    // log2_max_pic_order_cnt_lsb_minus4 should be in range 0 to 12, inclusive. (sec. 7.4.3)
+    WELS_CHECK_SE_UPPER_ERROR (uiCode, SPS_LOG2_MAX_PIC_ORDER_CNT_LSB_MINUS4_MAX, "log2_max_pic_order_cnt_lsb_minus4",
+                               GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_LOG2_MAX_PIC_ORDER_CNT_LSB_MINUS4));
+    pSps->iLog2MaxPocLsb = LOG2_MAX_PIC_ORDER_CNT_LSB_OFFSET + uiCode; // log2_max_pic_order_cnt_lsb_minus4
+
+  } else if (1 == pSps->uiPocType) {
+    int32_t i;
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //delta_pic_order_always_zero_flag
+    pSps->bDeltaPicOrderAlwaysZeroFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //offset_for_non_ref_pic
+    pSps->iOffsetForNonRefPic = iCode;
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //offset_for_top_to_bottom_field
+    pSps->iOffsetForTopToBottomField = iCode;
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //num_ref_frames_in_pic_order_cnt_cycle
+    WELS_CHECK_SE_UPPER_ERROR (uiCode, SPS_NUM_REF_FRAMES_IN_PIC_ORDER_CNT_CYCLE_MAX,
+                               "num_ref_frames_in_pic_order_cnt_cycle", GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS,
+                                   ERR_INFO_INVALID_NUM_REF_FRAME_IN_PIC_ORDER_CNT_CYCLE));
+    pSps->iNumRefFramesInPocCycle = uiCode;
+    for (i = 0; i < pSps->iNumRefFramesInPocCycle; i++) {
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //offset_for_ref_frame[ i ]
+      pSps->iOffsetForRefFrame[ i ] = iCode;
+    }
+  }
+  if (pSps->uiPocType > 2) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " illegal pic_order_cnt_type: %d ! ", pSps->uiPocType);
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_POC_TYPE);
+  }
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //max_num_ref_frames
+  pSps->iNumRefFrames = uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //gaps_in_frame_num_value_allowed_flag
+  pSps->bGapsInFrameNumValueAllowedFlag = !!uiCode;
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_width_in_mbs_minus1
+  pSps->iMbWidth = PIC_WIDTH_IN_MBS_OFFSET + uiCode;
+  if (pSps->iMbWidth > MAX_MB_SIZE || pSps->iMbWidth == 0) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_width_in_mbs(%d) invalid!", pSps->iMbWidth);
+    return  GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
+  }
+  if (((uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbWidth) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
+    if (((uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbWidth) > (uint64_t) (8 * pSMaxLevelLimits->uiMaxFS)) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "the pic_width_in_mbs exceeds the level limits!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "the pic_width_in_mbs exceeds the level limits!");
+    }
+  }
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_height_in_map_units_minus1
+  pSps->iMbHeight = PIC_HEIGHT_IN_MAP_UNITS_OFFSET + uiCode;
+  if (pSps->iMbHeight > MAX_MB_SIZE || pSps->iMbHeight == 0) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "pic_height_in_mbs(%d) invalid!", pSps->iMbHeight);
+    return  GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
+  }
+  if (((uint64_t)pSps->iMbHeight * (uint64_t)pSps->iMbHeight) > (uint64_t) (8 * pSLevelLimits->uiMaxFS)) {
+    if (((uint64_t)pSps->iMbHeight * (uint64_t)pSps->iMbHeight) > (uint64_t) (8 * pSMaxLevelLimits->uiMaxFS)) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "the pic_height_in_mbs exceeds the level limits!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "the pic_height_in_mbs exceeds the level limits!");
+    }
+  }
+  uint64_t uiTmp64 = (uint64_t)pSps->iMbWidth * (uint64_t)pSps->iMbHeight;
+  if (uiTmp64 > (uint64_t)pSLevelLimits->uiMaxFS) {
+    if (uiTmp64 > (uint64_t)pSMaxLevelLimits->uiMaxFS) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "the total count of mb exceeds the level limits!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_MB_SIZE);
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "the total count of mb exceeds the level limits!");
+    }
+  }
+  pSps->uiTotalMbCount = (uint32_t)uiTmp64;
+  WELS_CHECK_SE_UPPER_ERROR (pSps->iNumRefFrames, SPS_MAX_NUM_REF_FRAMES_MAX, "max_num_ref_frames",
+                             GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_MAX_NUM_REF_FRAMES));
+  // here we check max_num_ref_frames
+  uint32_t uiMaxDpbMbs = pSLevelLimits->uiMaxDPBMbs;
+  uint32_t uiMaxDpbFrames = uiMaxDpbMbs / pSps->uiTotalMbCount;
+  if (uiMaxDpbFrames > SPS_MAX_NUM_REF_FRAMES_MAX)
+    uiMaxDpbFrames = SPS_MAX_NUM_REF_FRAMES_MAX;
+  if ((uint32_t)pSps->iNumRefFrames > uiMaxDpbFrames) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, " max_num_ref_frames exceeds level limits!");
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //frame_mbs_only_flag
+  pSps->bFrameMbsOnlyFlag = !!uiCode;
+  if (!pSps->bFrameMbsOnlyFlag) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParseSps(): frame_mbs_only_flag (%d) not supported.",
+             pSps->bFrameMbsOnlyFlag);
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_MBAFF);
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //direct_8x8_inference_flag
+  pSps->bDirect8x8InferenceFlag = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //frame_cropping_flag
+  pSps->bFrameCroppingFlag = !!uiCode;
+  if (pSps->bFrameCroppingFlag) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_left_offset
+    pSps->sFrameCrop.iLeftOffset = uiCode;
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_right_offset
+    pSps->sFrameCrop.iRightOffset = uiCode;
+    if ((pSps->sFrameCrop.iLeftOffset + pSps->sFrameCrop.iRightOffset) > ((int32_t)pSps->iMbWidth * 16 / 2)) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "frame_crop_left_offset + frame_crop_right_offset exceeds limits!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CROPPING_DATA);
+    }
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_top_offset
+    pSps->sFrameCrop.iTopOffset = uiCode;
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //frame_crop_bottom_offset
+    pSps->sFrameCrop.iBottomOffset = uiCode;
+    if ((pSps->sFrameCrop.iTopOffset + pSps->sFrameCrop.iBottomOffset) > ((int32_t)pSps->iMbHeight * 16 / 2)) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "frame_crop_top_offset + frame_crop_right_offset exceeds limits!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CROPPING_DATA);
+    }
+  } else {
+    pSps->sFrameCrop.iLeftOffset   = 0; // frame_crop_left_offset
+    pSps->sFrameCrop.iRightOffset  = 0; // frame_crop_right_offset
+    pSps->sFrameCrop.iTopOffset    = 0; // frame_crop_top_offset
+    pSps->sFrameCrop.iBottomOffset = 0; // frame_crop_bottom_offset
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //vui_parameters_present_flag
+  pSps->bVuiParamPresentFlag = !!uiCode;
+  if (pSps->bVuiParamPresentFlag) {
+    int iRetVui = ParseVui (pCtx, pSps, pBsAux);
+    if (iRetVui == GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_VUI_HRD)) {
+      if (kbUseSubsetFlag) { //Currently do no support VUI with HRD enable in subsetSPS
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "hrd parse in vui of subsetSPS is not supported!");
+        return iRetVui;
+      }
+    } else {
+      WELS_READ_VERIFY (iRetVui);
+    }
+  }
+
+  if (pCtx->pParam->bParseOnly) {
+    if (kSrcNalLen >= SPS_PPS_BS_SIZE - 4) { //sps bs exceeds!
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "sps payload size (%d) too large for parse only (%d), not supported!",
+               kSrcNalLen, SPS_PPS_BS_SIZE - 4);
+      pCtx->iErrorCode |= dsBitstreamError;
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_OUT_OF_MEMORY);
+    }
+    if (!kbUseSubsetFlag) { //SPS
+      SSpsBsInfo* pSpsBs = &pCtx->sSpsBsInfo [iSpsId];
+      pSpsBs->iSpsId = iSpsId;
+      int32_t iTrailingZeroByte = 0;
+      while (pSrcNal[kSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
+        iTrailingZeroByte++;
+      int32_t iActualLen = kSrcNalLen - iTrailingZeroByte;
+      pSpsBs->uiSpsBsLen = (uint16_t) iActualLen;
+      //unify start code as 0x0001
+      int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001
+      if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001
+        pSpsBs->pSpsBsBuf[0] = 0x0; //add 0 to form 0x0001
+        iStartDeltaByte++;
+        pSpsBs->uiSpsBsLen++;
+      }
+      memcpy (pSpsBs->pSpsBsBuf + iStartDeltaByte, pSrcNal, iActualLen);
+    } else { //subset SPS
+      SSpsBsInfo* pSpsBs = &pCtx->sSubsetSpsBsInfo [iSpsId];
+      pSpsBs->iSpsId = iSpsId;
+      pSpsBs->pSpsBsBuf [0] = pSpsBs->pSpsBsBuf [1] = pSpsBs->pSpsBsBuf [2] = 0x00;
+      pSpsBs->pSpsBsBuf [3] = 0x01;
+      pSpsBs->pSpsBsBuf [4] = 0x67;
+
+      //re-write subset SPS to SPS
+      SBitStringAux sSubsetSpsBs;
+      CMemoryAlign* pMa = pCtx->pMemAlign;
+
+      uint8_t* pBsBuf = static_cast<uint8_t*> (pMa->WelsMallocz (SPS_PPS_BS_SIZE + 4,
+                        "Temp buffer for parse only usage.")); //to reserve 4 bytes for UVLC writing buffer
+      if (NULL == pBsBuf) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "sps buffer alloc failed for parse only!");
+        pCtx->iErrorCode |= dsOutOfMemory;
+        return pCtx->iErrorCode;
+      }
+      InitBits (&sSubsetSpsBs, pBsBuf, (int32_t) (pBs->pEndBuf - pBs->pStartBuf));
+      BsWriteBits (&sSubsetSpsBs, 8, 77); //profile_idc, forced to Main profile
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet0Flag); // constraint_set0_flag
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet1Flag); // constraint_set1_flag
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet2Flag); // constraint_set2_flag
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bConstraintSet3Flag); // constraint_set3_flag
+      BsWriteBits (&sSubsetSpsBs, 4, 0); //constraint_set4_flag, constraint_set5_flag, reserved_zero_2bits
+      BsWriteBits (&sSubsetSpsBs, 8, pSps->uiLevelIdc); //level_idc
+      BsWriteUE (&sSubsetSpsBs, pSps->iSpsId); //sps_id
+      BsWriteUE (&sSubsetSpsBs, pSps->uiLog2MaxFrameNum - 4); //log2_max_frame_num_minus4
+      BsWriteUE (&sSubsetSpsBs, pSps->uiPocType); //pic_order_cnt_type
+      if (pSps->uiPocType == 0) {
+        BsWriteUE (&sSubsetSpsBs, pSps->iLog2MaxPocLsb - 4); //log2_max_pic_order_cnt_lsb_minus4
+      } else if (pSps->uiPocType == 1) {
+        BsWriteOneBit (&sSubsetSpsBs, pSps->bDeltaPicOrderAlwaysZeroFlag); //delta_pic_order_always_zero_flag
+        BsWriteSE (&sSubsetSpsBs, pSps->iOffsetForNonRefPic); //offset_for_no_ref_pic
+        BsWriteSE (&sSubsetSpsBs, pSps->iOffsetForTopToBottomField); //offset_for_top_to_bottom_field
+        BsWriteUE (&sSubsetSpsBs, pSps->iNumRefFramesInPocCycle); //num_ref_frames_in_pic_order_cnt_cycle
+        for (int32_t i = 0; i < pSps->iNumRefFramesInPocCycle; ++i) {
+          BsWriteSE (&sSubsetSpsBs, pSps->iOffsetForRefFrame[i]); //offset_for_ref_frame[i]
+        }
+      }
+      BsWriteUE (&sSubsetSpsBs, pSps->iNumRefFrames); //max_num_ref_frames
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bGapsInFrameNumValueAllowedFlag); //gaps_in_frame_num_value_allowed_flag
+      BsWriteUE (&sSubsetSpsBs, pSps->iMbWidth - 1); //pic_width_in_mbs_minus1
+      BsWriteUE (&sSubsetSpsBs, pSps->iMbHeight - 1); //pic_height_in_map_units_minus1
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bFrameMbsOnlyFlag); //frame_mbs_only_flag
+      if (!pSps->bFrameMbsOnlyFlag) {
+        BsWriteOneBit (&sSubsetSpsBs, pSps->bMbaffFlag); //mb_adaptive_frame_field_flag
+      }
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bDirect8x8InferenceFlag); //direct_8x8_inference_flag
+      BsWriteOneBit (&sSubsetSpsBs, pSps->bFrameCroppingFlag); //frame_cropping_flag
+      if (pSps->bFrameCroppingFlag) {
+        BsWriteUE (&sSubsetSpsBs, pSps->sFrameCrop.iLeftOffset); //frame_crop_left_offset
+        BsWriteUE (&sSubsetSpsBs, pSps->sFrameCrop.iRightOffset); //frame_crop_right_offset
+        BsWriteUE (&sSubsetSpsBs, pSps->sFrameCrop.iTopOffset); //frame_crop_top_offset
+        BsWriteUE (&sSubsetSpsBs, pSps->sFrameCrop.iBottomOffset); //frame_crop_bottom_offset
+      }
+      BsWriteOneBit (&sSubsetSpsBs, 0); //vui_parameters_present_flag
+      BsRbspTrailingBits (&sSubsetSpsBs); //finished, rbsp trailing bit
+      int32_t iRbspSize = (int32_t) (sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf);
+      RBSP2EBSP (pSpsBs->pSpsBsBuf + 5, sSubsetSpsBs.pStartBuf, iRbspSize);
+      pSpsBs->uiSpsBsLen = (uint16_t) (sSubsetSpsBs.pCurBuf - sSubsetSpsBs.pStartBuf + 5);
+      if (pBsBuf) {
+        pMa->WelsFree (pBsBuf, "pBsBuf for parse only usage");
+      }
+    }
+  }
+  // Check if SPS SVC extension applicated
+  if (kbUseSubsetFlag && (PRO_SCALABLE_BASELINE == uiProfileIdc || PRO_SCALABLE_HIGH == uiProfileIdc)) {
+    if ((iRet = DecodeSpsSvcExt (pCtx, pSubsetSps, pBs)) != ERR_NONE) {
+      return iRet;
+    }
+
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //svc_vui_parameters_present_flag
+    pSubsetSps->bSvcVuiParamPresentFlag = !!uiCode;
+    if (pSubsetSps->bSvcVuiParamPresentFlag) {
+    }
+  }
+
+
+  if (PRO_SCALABLE_BASELINE == uiProfileIdc || PRO_SCALABLE_HIGH == uiProfileIdc)
+    pCtx->sSpsPpsCtx.bAvcBasedFlag = false;
+
+  *pPicWidth  = pSps->iMbWidth << 4;
+  *pPicHeight = pSps->iMbHeight << 4;
+  PSps pTmpSps = NULL;
+  if (kbUseSubsetFlag) {
+    pTmpSps = &pCtx->sSpsPpsCtx.sSubsetSpsBuffer[iSpsId].sSps;
+  } else {
+    pTmpSps = &pCtx->sSpsPpsCtx.sSpsBuffer[iSpsId];
+  }
+  if (CheckSpsActive (pCtx, pTmpSps, kbUseSubsetFlag)) {
+    // we are overwriting the active sps, copy a temp buffer
+    if (kbUseSubsetFlag) {
+      if (memcmp (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[iSpsId], pSubsetSps, sizeof (SSubsetSps)) != 0) {
+        if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+          memcpy (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[MAX_SPS_COUNT], pSubsetSps, sizeof (SSubsetSps));
+          pCtx->bAuReadyFlag = true;
+          pCtx->pAccessUnitList->uiEndPos = pCtx->pAccessUnitList->uiAvailUnitsNum - 1;
+          pCtx->sSpsPpsCtx.iOverwriteFlags |= OVERWRITE_SUBSETSPS;
+        } else if ((pCtx->pSps != NULL) && (pCtx->pSps->iSpsId == pSubsetSps->sSps.iSpsId)) {
+          memcpy (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[MAX_SPS_COUNT], pSubsetSps, sizeof (SSubsetSps));
+          pCtx->sSpsPpsCtx.iOverwriteFlags |= OVERWRITE_SUBSETSPS;
+        } else {
+          memcpy (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[iSpsId], pSubsetSps, sizeof (SSubsetSps));
+        }
+      }
+    } else {
+      if (memcmp (&pCtx->sSpsPpsCtx.sSpsBuffer[iSpsId], pSps, sizeof (SSps)) != 0) {
+        if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+          memcpy (&pCtx->sSpsPpsCtx.sSpsBuffer[MAX_SPS_COUNT], pSps, sizeof (SSps));
+          pCtx->sSpsPpsCtx.iOverwriteFlags |= OVERWRITE_SPS;
+          pCtx->bAuReadyFlag = true;
+          pCtx->pAccessUnitList->uiEndPos = pCtx->pAccessUnitList->uiAvailUnitsNum - 1;
+        } else if ((pCtx->pSps != NULL) && (pCtx->pSps->iSpsId == pSps->iSpsId)) {
+          memcpy (&pCtx->sSpsPpsCtx.sSpsBuffer[MAX_SPS_COUNT], pSps, sizeof (SSps));
+          pCtx->sSpsPpsCtx.iOverwriteFlags |= OVERWRITE_SPS;
+        } else {
+          memcpy (&pCtx->sSpsPpsCtx.sSpsBuffer[iSpsId], pSps, sizeof (SSps));
+        }
+      }
+    }
+  }
+  // Not overwrite active sps, just copy to final place
+  else if (kbUseSubsetFlag) {
+    memcpy (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[iSpsId], pSubsetSps, sizeof (SSubsetSps));
+    pCtx->sSpsPpsCtx.bSubspsAvailFlags[iSpsId] = true;
+    pCtx->sSpsPpsCtx.bSubspsExistAheadFlag = true;
+  } else {
+    memcpy (&pCtx->sSpsPpsCtx.sSpsBuffer[iSpsId], pSps, sizeof (SSps));
+    pCtx->sSpsPpsCtx.bSpsAvailFlags[iSpsId] = true;
+    pCtx->sSpsPpsCtx.bSpsExistAheadFlag = true;
+  }
+  return ERR_NONE;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to parse Picture Parameter Set (PPS)
+ *
+ * \param   pCtx        Decoder context
+ * \param   pPpsList    pps list
+ * \param   pBsAux      bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case eNalUnitType is PPS.
+ *************************************************************************************
+ */
+int32_t ParsePps (PWelsDecoderContext pCtx, PPps pPpsList, PBitStringAux pBsAux, uint8_t* pSrcNal,
+                  const int32_t kSrcNalLen) {
+
+  PPps pPps = NULL;
+  SPps sTempPps;
+  uint32_t uiPpsId = 0;
+  uint32_t iTmp;
+  uint32_t uiCode;
+  int32_t iCode;
+
+  WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //pic_parameter_set_id
+  uiPpsId = uiCode;
+  if (uiPpsId >= MAX_PPS_COUNT) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_PPS_ID_OVERFLOW);
+  }
+  pPps = &sTempPps;
+  memset (pPps, 0, sizeof (SPps));
+
+  pPps->iPpsId = uiPpsId;
+  WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //seq_parameter_set_id
+  pPps->iSpsId = uiCode;
+
+  if (pPps->iSpsId >= MAX_SPS_COUNT) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_SPS_ID_OVERFLOW);
+  }
+
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //entropy_coding_mode_flag
+  pPps->bEntropyCodingModeFlag = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //bottom_field_pic_order_in_frame_present_flag
+  pPps->bPicOrderPresentFlag   = !!uiCode;
+
+  WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //num_slice_groups_minus1
+  pPps->uiNumSliceGroups = NUM_SLICE_GROUPS_OFFSET + uiCode;
+
+  if (pPps->uiNumSliceGroups > MAX_SLICEGROUP_IDS) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_SLICEGROUP);
+  }
+
+  if (pPps->uiNumSliceGroups > 1) {
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //slice_group_map_type
+    pPps->uiSliceGroupMapType = uiCode;
+    if (pPps->uiSliceGroupMapType > 1) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "ParsePps(): slice_group_map_type (%d): support only 0,1.",
+               pPps->uiSliceGroupMapType);
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_FMOTYPE);
+    }
+
+    switch (pPps->uiSliceGroupMapType) {
+    case 0:
+      for (iTmp = 0; iTmp < pPps->uiNumSliceGroups; iTmp++) {
+        WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //run_length_minus1[ iGroup ]
+        pPps->uiRunLength[iTmp] = RUN_LENGTH_OFFSET + uiCode;
+      }
+      break;
+    default:
+      break;
+    }
+  }
+
+  WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //num_ref_idx_l0_default_active_minus1
+  pPps->uiNumRefIdxL0Active = NUM_REF_IDX_L0_DEFAULT_ACTIVE_OFFSET + uiCode;
+  WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //num_ref_idx_l1_default_active_minus1
+  pPps->uiNumRefIdxL1Active = NUM_REF_IDX_L1_DEFAULT_ACTIVE_OFFSET + uiCode;
+
+  if (pPps->uiNumRefIdxL0Active > MAX_REF_PIC_COUNT ||
+      pPps->uiNumRefIdxL1Active > MAX_REF_PIC_COUNT) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_REF_COUNT_OVERFLOW);
+  }
+
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //weighted_pred_flag
+  pPps->bWeightedPredFlag  = !!uiCode;
+  WELS_READ_VERIFY (BsGetBits (pBsAux, 2, &uiCode)); //weighted_bipred_idc
+  pPps->uiWeightedBipredIdc = uiCode;
+  // weighted_bipred_idc > 0 NOT supported now, but no impact when we ignore it
+
+  WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode)); //pic_init_qp_minus26
+  pPps->iPicInitQp = PIC_INIT_QP_OFFSET + iCode;
+  WELS_CHECK_SE_BOTH_ERROR (pPps->iPicInitQp, PPS_PIC_INIT_QP_QS_MIN, PPS_PIC_INIT_QP_QS_MAX, "pic_init_qp_minus26 + 26",
+                            GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_PIC_INIT_QP));
+  WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode)); //pic_init_qs_minus26
+  pPps->iPicInitQs = PIC_INIT_QS_OFFSET + iCode;
+  WELS_CHECK_SE_BOTH_ERROR (pPps->iPicInitQs, PPS_PIC_INIT_QP_QS_MIN, PPS_PIC_INIT_QP_QS_MAX, "pic_init_qs_minus26 + 26",
+                            GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_PIC_INIT_QS));
+  WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode)); //chroma_qp_index_offset,cb
+  pPps->iChromaQpIndexOffset[0]                  = iCode;
+  WELS_CHECK_SE_BOTH_ERROR (pPps->iChromaQpIndexOffset[0], PPS_CHROMA_QP_INDEX_OFFSET_MIN, PPS_CHROMA_QP_INDEX_OFFSET_MAX,
+                            "chroma_qp_index_offset", GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_CHROMA_QP_INDEX_OFFSET));
+  pPps->iChromaQpIndexOffset[1] = pPps->iChromaQpIndexOffset[0];//init cr qp offset
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //deblocking_filter_control_present_flag
+  pPps->bDeblockingFilterControlPresentFlag   = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //constrained_intra_pred_flag
+  pPps->bConstainedIntraPredFlag              = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //redundant_pic_cnt_present_flag
+  pPps->bRedundantPicCntPresentFlag           = !!uiCode;
+
+  if (CheckMoreRBSPData (pBsAux)) {
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //transform_8x8_mode_flag
+    pPps->bTransform8x8ModeFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //pic_scaling_matrix_present_flag
+    pPps->bPicScalingMatrixPresentFlag = !!uiCode;
+    if (pPps->bPicScalingMatrixPresentFlag) {
+      if (pCtx->sSpsPpsCtx.bSpsAvailFlags[pPps->iSpsId]) {
+        WELS_READ_VERIFY (ParseScalingList (&pCtx->sSpsPpsCtx.sSpsBuffer[pPps->iSpsId], pBsAux, 1, pPps->bTransform8x8ModeFlag,
+                                            pPps->bPicScalingListPresentFlag, pPps->iScalingList4x4, pPps->iScalingList8x8));
+      } else {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+                 "ParsePps(): sps_id (%d) does not exist for scaling_list. This PPS (%d) is marked as invalid.", pPps->iSpsId,
+                 pPps->iPpsId);
+        return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_INVALID_SPS_ID);
+      }
+    }
+    WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode)); //second_chroma_qp_index_offset
+    pPps->iChromaQpIndexOffset[1] = iCode;
+    WELS_CHECK_SE_BOTH_ERROR (pPps->iChromaQpIndexOffset[1], PPS_CHROMA_QP_INDEX_OFFSET_MIN,
+                              PPS_CHROMA_QP_INDEX_OFFSET_MAX, "chroma_qp_index_offset", GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS,
+                                  ERR_INFO_INVALID_CHROMA_QP_INDEX_OFFSET));
+  }
+
+  if (pCtx->pPps != NULL && pCtx->pPps->iPpsId == pPps->iPpsId) {
+    if (memcmp (pCtx->pPps, pPps, sizeof (*pPps)) != 0) {
+      memcpy (&pCtx->sSpsPpsCtx.sPpsBuffer[MAX_PPS_COUNT], pPps, sizeof (SPps));
+      pCtx->sSpsPpsCtx.iOverwriteFlags |= OVERWRITE_PPS;
+      if (pCtx->pAccessUnitList->uiAvailUnitsNum > 0) {
+        pCtx->bAuReadyFlag = true;
+        pCtx->pAccessUnitList->uiEndPos = pCtx->pAccessUnitList->uiAvailUnitsNum - 1;
+      }
+    }
+  } else {
+    memcpy (&pCtx->sSpsPpsCtx.sPpsBuffer[uiPpsId], pPps, sizeof (SPps));
+    pCtx->sSpsPpsCtx.bPpsAvailFlags[uiPpsId] = true;
+  }
+  if (pCtx->pParam->bParseOnly) {
+    if (kSrcNalLen >= SPS_PPS_BS_SIZE - 4) { //pps bs exceeds
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "pps payload size (%d) too large for parse only (%d), not supported!",
+               kSrcNalLen, SPS_PPS_BS_SIZE - 4);
+      pCtx->iErrorCode |= dsBitstreamError;
+      return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_OUT_OF_MEMORY);
+    }
+    SPpsBsInfo* pPpsBs = &pCtx->sPpsBsInfo [uiPpsId];
+    pPpsBs->iPpsId = (int32_t) uiPpsId;
+    int32_t iTrailingZeroByte = 0;
+    while (pSrcNal[kSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes
+      iTrailingZeroByte++;
+    int32_t iActualLen = kSrcNalLen - iTrailingZeroByte;
+    pPpsBs->uiPpsBsLen = (uint16_t) iActualLen;
+    //unify start code as 0x0001
+    int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001
+    if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001
+      pPpsBs->pPpsBsBuf[0] = 0x0; //add 0 to form 0x0001
+      iStartDeltaByte++;
+      pPpsBs->uiPpsBsLen++;
+    }
+    memcpy (pPpsBs->pPpsBsBuf + iStartDeltaByte, pSrcNal, iActualLen);
+  }
+  return ERR_NONE;
+}
+
+#define VUI_MAX_CHROMA_LOG_TYPE_TOP_BOTTOM_FIELD_MAX 5
+#define VUI_NUM_UNITS_IN_TICK_MIN 1
+#define VUI_TIME_SCALE_MIN 1
+#define VUI_MAX_BYTES_PER_PIC_DENOM_MAX 16
+#define VUI_MAX_BITS_PER_MB_DENOM_MAX 16
+#define VUI_LOG2_MAX_MV_LENGTH_HOR_MAX 16
+#define VUI_LOG2_MAX_MV_LENGTH_VER_MAX 16
+#define VUI_MAX_DEC_FRAME_BUFFERING_MAX 16
+int32_t ParseVui (PWelsDecoderContext pCtx, PSps pSps, PBitStringAux pBsAux) {
+  uint32_t uiCode;
+  PVui pVui = &pSps->sVui;
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //aspect_ratio_info_present_flag
+  pVui->bAspectRatioInfoPresentFlag = !!uiCode;
+  if (pSps->sVui.bAspectRatioInfoPresentFlag) {
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 8, &uiCode)); //aspect_ratio_idc
+    pVui->uiAspectRatioIdc = uiCode;
+    if (pVui->uiAspectRatioIdc < 17) {
+      pVui->uiSarWidth  = g_ksVuiSampleAspectRatio[pVui->uiAspectRatioIdc].uiWidth;
+      pVui->uiSarHeight = g_ksVuiSampleAspectRatio[pVui->uiAspectRatioIdc].uiHeight;
+    } else if (pVui->uiAspectRatioIdc == EXTENDED_SAR) {
+      WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //sar_width
+      pVui->uiSarWidth = uiCode;
+      WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //sar_height
+      pVui->uiSarHeight = uiCode;
+    }
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //overscan_info_present_flag
+  pVui->bOverscanInfoPresentFlag = !!uiCode;
+  if (pVui->bOverscanInfoPresentFlag) {
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //overscan_appropriate_flag
+    pVui->bOverscanAppropriateFlag = !!uiCode;
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //video_signal_type_present_flag
+  pVui->bVideoSignalTypePresentFlag = !!uiCode;
+  if (pVui->bVideoSignalTypePresentFlag) {
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 3, &uiCode)); //video_format
+    pVui->uiVideoFormat = uiCode;
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //video_full_range_flag
+    pVui->bVideoFullRangeFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //colour_description_present_flag
+    pVui->bColourDescripPresentFlag = !!uiCode;
+    if (pVui->bColourDescripPresentFlag) {
+      WELS_READ_VERIFY (BsGetBits (pBsAux, 8, &uiCode)); //colour_primaries
+      pVui->uiColourPrimaries = uiCode;
+      WELS_READ_VERIFY (BsGetBits (pBsAux, 8, &uiCode)); //transfer_characteristics
+      pVui->uiTransferCharacteristics = uiCode;
+      WELS_READ_VERIFY (BsGetBits (pBsAux, 8, &uiCode)); //matrix_coefficients
+      pVui->uiMatrixCoeffs = uiCode;
+    }
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //chroma_loc_info_present_flag
+  pVui->bChromaLocInfoPresentFlag = !!uiCode;
+  if (pVui->bChromaLocInfoPresentFlag) {
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //chroma_sample_loc_type_top_field
+    pVui->uiChromaSampleLocTypeTopField = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiChromaSampleLocTypeTopField, VUI_MAX_CHROMA_LOG_TYPE_TOP_BOTTOM_FIELD_MAX,
+                                 "chroma_sample_loc_type_top_field");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //chroma_sample_loc_type_bottom_field
+    pVui->uiChromaSampleLocTypeBottomField = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiChromaSampleLocTypeBottomField, VUI_MAX_CHROMA_LOG_TYPE_TOP_BOTTOM_FIELD_MAX,
+                                 "chroma_sample_loc_type_bottom_field");
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //timing_info_present_flag
+  pVui->bTimingInfoPresentFlag = !!uiCode;
+  if (pVui->bTimingInfoPresentFlag) {
+    uint32_t uiTmp = 0;
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //num_units_in_tick
+    uiTmp = (uiCode << 16);
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //num_units_in_tick
+    uiTmp |= uiCode;
+    pVui->uiNumUnitsInTick = uiTmp;
+    WELS_CHECK_SE_LOWER_WARNING (pVui->uiNumUnitsInTick, VUI_NUM_UNITS_IN_TICK_MIN, "num_units_in_tick");
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //time_scale
+    uiTmp = (uiCode << 16);
+    WELS_READ_VERIFY (BsGetBits (pBsAux, 16, &uiCode)); //time_scale
+    uiTmp |= uiCode;
+    pVui->uiTimeScale = uiTmp;
+    WELS_CHECK_SE_LOWER_WARNING (pVui->uiNumUnitsInTick, VUI_TIME_SCALE_MIN, "time_scale");
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //fixed_frame_rate_flag
+    pVui->bFixedFrameRateFlag = !!uiCode;
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //nal_hrd_parameters_present_flag
+  pVui->bNalHrdParamPresentFlag = !!uiCode;
+  if (pVui->bNalHrdParamPresentFlag) { //Add HRD parse. the values are not being used though.
+#ifdef _PARSE_NALHRD_VCLHRD_PARAMS_
+    int32_t cpb_cnt_minus1 = BsGetUe (pBsAux, &uiCode);
+    /*bit_rate_scale = */BsGetBits (pBsAux, 4, &uiCode);
+    /*cpb_size_scale = */BsGetBits (pBsAux, 4, &uiCode);
+    for (int32_t i = 0; i <= cpb_cnt_minus1; i++) {
+      /*bit_rate_value_minus1[i] = */BsGetUe (pBsAux, &uiCode);
+      /*cpb_size_value_minus1[i] = */BsGetUe (pBsAux, &uiCode);
+      /*cbr_flag[i] = */BsGetOneBit (pBsAux, &uiCode);
+    }
+    /*initial_cpb_removal_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*cpb_removal_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*dpb_output_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*time_offset_length = */BsGetBits (pBsAux, 5, &uiCode);
+#else
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "nal_hrd_parameters_present_flag = 1 not supported.");
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_VUI_HRD);
+#endif
+  }
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //vcl_hrd_parameters_present_flag
+  pVui->bVclHrdParamPresentFlag = !!uiCode;
+  if (pVui->bVclHrdParamPresentFlag) {//Add HRD parse. the values are not being used though.
+#ifdef _PARSE_NALHRD_VCLHRD_PARAMS_
+    int32_t cpb_cnt_minus1 = BsGetUe (pBsAux, &uiCode);
+    /*bit_rate_scale = */BsGetBits (pBsAux, 4, &uiCode);
+    /*cpb_size_scale = */BsGetBits (pBsAux, 4, &uiCode);
+    for (int32_t i = 0; i <= cpb_cnt_minus1; i++) {
+      /*bit_rate_value_minus1[i] = */BsGetUe (pBsAux, &uiCode);
+      /*cpb_size_value_minus1[i] = */BsGetUe (pBsAux, &uiCode);
+      /*cbr_flag[i] = */BsGetOneBit (pBsAux, &uiCode);
+    }
+    /*initial_cpb_removal_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*cpb_removal_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*dpb_output_delay_length_minus1 = */BsGetBits (pBsAux, 5, &uiCode);
+    /*time_offset_length = */BsGetBits (pBsAux, 5, &uiCode);
+#else
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "vcl_hrd_parameters_present_flag = 1 not supported.");
+    return GENERATE_ERROR_NO (ERR_LEVEL_PARAM_SETS, ERR_INFO_UNSUPPORTED_VUI_HRD);
+#endif
+  }
+#ifdef _PARSE_NALHRD_VCLHRD_PARAMS_
+  if (pVui->bNalHrdParamPresentFlag | pVui->bVclHrdParamPresentFlag) {
+    /*low_delay_hrd_flag = */BsGetOneBit (pBsAux, &uiCode);
+  }
+#endif
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //pic_struct_present_flag
+  pVui->bPicStructPresentFlag = !!uiCode;
+  WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //bitstream_restriction_flag
+  pVui->bBitstreamRestrictionFlag = !!uiCode;
+  if (pVui->bBitstreamRestrictionFlag) {
+    WELS_READ_VERIFY (BsGetOneBit (pBsAux, &uiCode)); //motion_vectors_over_pic_boundaries_flag
+    pVui->bMotionVectorsOverPicBoundariesFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //max_bytes_per_pic_denom
+    pVui->uiMaxBytesPerPicDenom = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiMaxBytesPerPicDenom, VUI_MAX_BYTES_PER_PIC_DENOM_MAX,
+                                 "max_bytes_per_pic_denom");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //max_bits_per_mb_denom
+    pVui->uiMaxBitsPerMbDenom = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiMaxBitsPerMbDenom, VUI_MAX_BITS_PER_MB_DENOM_MAX,
+                                 "max_bits_per_mb_denom");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //log2_max_mv_length_horizontal
+    pVui->uiLog2MaxMvLengthHorizontal = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiLog2MaxMvLengthHorizontal, VUI_LOG2_MAX_MV_LENGTH_HOR_MAX,
+                                 "log2_max_mv_length_horizontal");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //log2_max_mv_length_vertical
+    pVui->uiLog2MaxMvLengthVertical = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiLog2MaxMvLengthVertical, VUI_LOG2_MAX_MV_LENGTH_VER_MAX,
+                                 "log2_max_mv_length_vertical");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //max_num_reorder_frames
+    pVui->uiMaxNumReorderFrames = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiMaxNumReorderFrames, VUI_MAX_DEC_FRAME_BUFFERING_MAX,
+                                 "max_num_reorder_frames");
+    WELS_READ_VERIFY (BsGetUe (pBsAux, &uiCode)); //max_dec_frame_buffering
+    pVui->uiMaxDecFrameBuffering = uiCode;
+    WELS_CHECK_SE_UPPER_WARNING (pVui->uiMaxDecFrameBuffering, VUI_MAX_DEC_FRAME_BUFFERING_MAX,
+                                 "max_num_reorder_frames");
+  }
+  return ERR_NONE;
+}
+/*!
+ *************************************************************************************
+ * \brief   to parse SEI message payload
+ *
+ * \param   pSei        sei message to be parsed output
+ * \param   pBsAux      bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case eNalUnitType is NAL_UNIT_SEI.
+ *************************************************************************************
+ */
+int32_t ParseSei (void* pSei, PBitStringAux pBsAux) { // reserved Sei_Msg type
+
+
+  return ERR_NONE;
+}
+/*
+ *************************************************************************************
+ * \brief   to parse scalinglist message payload
+ *
+ * \param   pps sps scaling list matrix      message to be parsed output
+ * \param   pBsAux      bitstream reader auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case scaling list matrix present at sps or pps level
+ *************************************************************************************
+ */
+int32_t SetScalingListValue (uint8_t* pScalingList, int iScalingListNum, bool* bUseDefaultScalingMatrixFlag,
+                             PBitStringAux pBsAux) { // reserved Sei_Msg type
+  int iLastScale = 8;
+  int iNextScale = 8;
+  int iDeltaScale;
+  int32_t iCode;
+  int32_t iIdx;
+  for (int j = 0; j < iScalingListNum; j++) {
+    if (iNextScale != 0) {
+      WELS_READ_VERIFY (BsGetSe (pBsAux, &iCode));
+      WELS_CHECK_SE_BOTH_ERROR_NOLOG (iCode, SCALING_LIST_DELTA_SCALE_MIN, SCALING_LIST_DELTA_SCALE_MAX, "DeltaScale",
+                                      ERR_SCALING_LIST_DELTA_SCALE);
+      iDeltaScale = iCode;
+      iNextScale = (iLastScale + iDeltaScale + 256) % 256;
+      *bUseDefaultScalingMatrixFlag = (j == 0 && iNextScale == 0);
+      if (*bUseDefaultScalingMatrixFlag)
+        break;
+    }
+    iIdx = iScalingListNum == 16 ? g_kuiZigzagScan[j] : g_kuiZigzagScan8x8[j];
+    pScalingList[iIdx] = (iNextScale == 0) ? iLastScale : iNextScale;
+    iLastScale = pScalingList[iIdx];
+  }
+
+
+  return ERR_NONE;
+}
+
+int32_t ParseScalingList (PSps pSps, PBitStringAux pBs, bool bPPS, const bool kbTrans8x8ModeFlag,
+                          bool* pScalingListPresentFlag, uint8_t (*iScalingList4x4)[16], uint8_t (*iScalingList8x8)[64]) {
+  uint32_t uiScalingListNum;
+  uint32_t uiCode;
+
+  bool bUseDefaultScalingMatrixFlag4x4 = false;
+  bool bUseDefaultScalingMatrixFlag8x8 = false;
+  bool bInit = false;
+  const uint8_t* defaultScaling[4];
+
+  if (!bPPS) { //sps scaling_list
+    uiScalingListNum = (pSps->uiChromaFormatIdc != 3) ? 8 : 12;
+  } else { //pps scaling_list
+    uiScalingListNum = 6 + (int32_t) kbTrans8x8ModeFlag * ((pSps->uiChromaFormatIdc != 3) ? 2 : 6);
+    bInit = pSps->bSeqScalingMatrixPresentFlag;
+  }
+
+//Init default_scaling_list value for sps or pps
+  defaultScaling[0] = bInit ? pSps->iScalingList4x4[0] : g_kuiDequantScaling4x4Default[0];
+  defaultScaling[1] = bInit ? pSps->iScalingList4x4[3] : g_kuiDequantScaling4x4Default[1];
+  defaultScaling[2] = bInit ? pSps->iScalingList8x8[0] : g_kuiDequantScaling8x8Default[0];
+  defaultScaling[3] = bInit ? pSps->iScalingList8x8[1] : g_kuiDequantScaling8x8Default[1];
+
+  for (unsigned int i = 0; i < uiScalingListNum; i++) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
+    pScalingListPresentFlag[i] = !!uiCode;
+    if (!!uiCode) {
+      if (i < 6) {//4x4 scaling list
+        WELS_READ_VERIFY (SetScalingListValue (iScalingList4x4[i], 16, &bUseDefaultScalingMatrixFlag4x4, pBs));
+        if (bUseDefaultScalingMatrixFlag4x4) {
+          bUseDefaultScalingMatrixFlag4x4 = false;
+          memcpy (iScalingList4x4[i], g_kuiDequantScaling4x4Default[i / 3], sizeof (uint8_t) * 16);
+        }
+
+
+      } else {
+        WELS_READ_VERIFY (SetScalingListValue (iScalingList8x8[i - 6], 64, &bUseDefaultScalingMatrixFlag8x8, pBs));
+
+        if (bUseDefaultScalingMatrixFlag8x8) {
+          bUseDefaultScalingMatrixFlag8x8 = false;
+          memcpy (iScalingList8x8[i - 6], g_kuiDequantScaling8x8Default[ (i - 6) & 1], sizeof (uint8_t) * 64);
+        }
+      }
+
+    } else {
+      if (i < 6) {
+        if ((i != 0) && (i != 3))
+          memcpy (iScalingList4x4[i], iScalingList4x4[i - 1], sizeof (uint8_t) * 16);
+        else
+          memcpy (iScalingList4x4[i], defaultScaling[i / 3], sizeof (uint8_t) * 16);
+
+      } else {
+        if ((i == 6) || (i == 7))
+          memcpy (iScalingList8x8[i - 6], defaultScaling[ (i & 1) + 2], sizeof (uint8_t) * 64);
+        else
+          memcpy (iScalingList8x8[i - 6], iScalingList8x8[i - 8], sizeof (uint8_t) * 64);
+
+      }
+    }
+  }
+  return ERR_NONE;
+
+}
+
+/*!
+ *************************************************************************************
+ * \brief   reset fmo list due to got Sps now
+ *
+ * \param   pCtx    decoder context
+ *
+ * \return  count number of fmo context units are reset
+ *************************************************************************************
+ */
+int32_t ResetFmoList (PWelsDecoderContext pCtx) {
+  int32_t iCountNum = 0;
+  if (NULL != pCtx) {
+    // Fixed memory leak due to PPS_ID might not be continuous sometimes, 1/5/2010
+    UninitFmoList (&pCtx->sFmoList[0], MAX_PPS_COUNT, pCtx->iActiveFmoNum, pCtx->pMemAlign);
+    iCountNum = pCtx->iActiveFmoNum;
+    pCtx->iActiveFmoNum = 0;
+  }
+  return iCountNum;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/bit_stream.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/bit_stream.cpp
new file mode 100644
index 0000000000..c75260426a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/bit_stream.cpp
@@ -0,0 +1,110 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    bit_stream.cpp
+ *
+ * \brief   Reading / writing bit-stream
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "bit_stream.h"
+#include "error_code.h"
+
+namespace WelsDec {
+
+inline uint32_t GetValue4Bytes (uint8_t* pDstNal) {
+  uint32_t uiValue = 0;
+  uiValue = (pDstNal[0] << 24) | (pDstNal[1] << 16) | (pDstNal[2] << 8) | (pDstNal[3]);
+  return uiValue;
+}
+
+int32_t InitReadBits (PBitStringAux pBitString, intX_t iEndOffset) {
+  if (pBitString->pCurBuf >= (pBitString->pEndBuf - iEndOffset)) {
+    return ERR_INFO_INVALID_ACCESS;
+  }
+  pBitString->uiCurBits  = GetValue4Bytes (pBitString->pCurBuf);
+  pBitString->pCurBuf  += 4;
+  pBitString->iLeftBits = -16;
+  return ERR_NONE;
+}
+
+/*!
+ * \brief   input bits for decoder or initialize bitstream writing in encoder
+ *
+ * \param   pBitString  Bit string auxiliary pointer
+ * \param   kpBuf       bit-stream buffer
+ * \param   kiSize      size in bits for decoder; size in bytes for encoder
+ *
+ * \return  0: success, other: fail
+ */
+int32_t DecInitBits (PBitStringAux pBitString, const uint8_t* kpBuf, const int32_t kiSize) {
+  const int32_t kiSizeBuf = (kiSize + 7) >> 3;
+  uint8_t* pTmp = (uint8_t*)kpBuf;
+
+  if (NULL == pTmp)
+    return ERR_INFO_INVALID_ACCESS;
+
+  pBitString->pStartBuf = pTmp;             // buffer to start position
+  pBitString->pEndBuf   = pTmp + kiSizeBuf; // buffer + length
+  pBitString->iBits     = kiSize;           // count bits of overall bitstreaming inputindex;
+  pBitString->pCurBuf   = pBitString->pStartBuf;
+  int32_t iErr = InitReadBits (pBitString, 0);
+  if (iErr) {
+    return iErr;
+  }
+  return ERR_NONE;
+}
+
+void RBSP2EBSP (uint8_t* pDstBuf, uint8_t* pSrcBuf, const int32_t kiSize) {
+  uint8_t* pSrcPointer = pSrcBuf;
+  uint8_t* pDstPointer = pDstBuf;
+  uint8_t* pSrcEnd = pSrcBuf + kiSize;
+  int32_t iZeroCount = 0;
+
+  while (pSrcPointer < pSrcEnd) {
+    if (iZeroCount == 2 && *pSrcPointer <= 3) {
+      //add the code 0x03
+      *pDstPointer++ = 3;
+      iZeroCount = 0;
+    }
+    if (*pSrcPointer == 0) {
+      ++ iZeroCount;
+    } else {
+      iZeroCount = 0;
+    }
+    *pDstPointer++ = *pSrcPointer++;
+  }
+}
+
+} // namespace WelsDec
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/cabac_decoder.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/cabac_decoder.cpp
new file mode 100644
index 0000000000..32be5513ad
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/cabac_decoder.cpp
@@ -0,0 +1,333 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      cabac_decoder.cpp:      deals with cabac state transition and related functions
+ */
+#include "cabac_decoder.h"
+namespace WelsDec {
+static const int16_t g_kMvdBinPos2Ctx [8] = {0, 1, 2, 3, 3, 3, 3, 3};
+
+void WelsCabacGlobalInit (PWelsDecoderContext pCtx) {
+  for (int32_t iModel = 0; iModel < 4; iModel++) {
+    for (int32_t iQp = 0; iQp <= WELS_QP_MAX; iQp++)
+      for (int32_t iIdx = 0; iIdx < WELS_CONTEXT_COUNT; iIdx++) {
+        int32_t m               = g_kiCabacGlobalContextIdx[iIdx][iModel][0];
+        int32_t n               = g_kiCabacGlobalContextIdx[iIdx][iModel][1];
+        int32_t iPreCtxState    = WELS_CLIP3 ((((m * iQp) >> 4) + n), 1, 126);
+        uint8_t uiValMps         = 0;
+        uint8_t uiStateIdx       = 0;
+        if (iPreCtxState <= 63) {
+          uiStateIdx = 63 - iPreCtxState;
+          uiValMps = 0;
+        } else {
+          uiStateIdx = iPreCtxState - 64;
+          uiValMps = 1;
+        }
+        pCtx->sWelsCabacContexts[iModel][iQp][iIdx].uiState = uiStateIdx;
+        pCtx->sWelsCabacContexts[iModel][iQp][iIdx].uiMPS = uiValMps;
+      }
+  }
+  pCtx->bCabacInited = true;
+}
+
+// ------------------- 1. context initialization
+void WelsCabacContextInit (PWelsDecoderContext  pCtx, uint8_t eSliceType, int32_t iCabacInitIdc, int32_t iQp) {
+  int32_t iIdx =  pCtx->eSliceType == WelsCommon::I_SLICE ? 0 : iCabacInitIdc + 1;
+  if (!pCtx->bCabacInited) {
+    WelsCabacGlobalInit (pCtx);
+  }
+  memcpy (pCtx->pCabacCtx, pCtx->sWelsCabacContexts[iIdx][iQp],
+          WELS_CONTEXT_COUNT * sizeof (SWelsCabacCtx));
+}
+
+// ------------------- 2. decoding Engine initialization
+int32_t InitCabacDecEngineFromBS (PWelsCabacDecEngine pDecEngine, PBitStringAux pBsAux) {
+  int32_t iRemainingBits = - pBsAux->iLeftBits; //pBsAux->iLeftBits < 0
+  int32_t iRemainingBytes = (iRemainingBits >> 3) + 2; //+2: indicating the pre-read 2 bytes
+  uint8_t* pCurr;
+
+  pCurr = pBsAux->pCurBuf - iRemainingBytes;
+  if (pCurr >= (pBsAux->pEndBuf - 1)) {
+    return ERR_INFO_INVALID_ACCESS;
+  }
+  pDecEngine->uiOffset = ((pCurr[0] << 16) | (pCurr[1] << 8) | pCurr[2]);
+  pDecEngine->uiOffset <<= 16;
+  pDecEngine->uiOffset |= (pCurr[3] << 8) | pCurr[4];
+  pDecEngine->iBitsLeft = 31;
+  pDecEngine->pBuffCurr = pCurr + 5;
+
+  pDecEngine->uiRange = WELS_CABAC_HALF;
+  pDecEngine->pBuffStart = pBsAux->pStartBuf;
+  pDecEngine->pBuffEnd = pBsAux->pEndBuf;
+  pBsAux->iLeftBits = 0;
+  return ERR_NONE;
+}
+
+void RestoreCabacDecEngineToBS (PWelsCabacDecEngine pDecEngine, PBitStringAux pBsAux) {
+  //CABAC decoding finished, changing to SBitStringAux
+  pDecEngine->pBuffCurr -= (pDecEngine->iBitsLeft >> 3);
+  pDecEngine->iBitsLeft = 0;     //pcm_alignment_zero_bit in CABAC
+  pBsAux->iLeftBits = 0;
+  pBsAux->pStartBuf = pDecEngine->pBuffStart;
+  pBsAux->pCurBuf = pDecEngine->pBuffCurr;
+  pBsAux->uiCurBits = 0;
+  pBsAux->iIndex = 0;
+}
+
+// ------------------- 3. actual decoding
+int32_t Read32BitsCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiValue, int32_t& iNumBitsRead) {
+  intX_t iLeftBytes = pDecEngine->pBuffEnd - pDecEngine->pBuffCurr;
+  iNumBitsRead = 0;
+  uiValue = 0;
+  if (iLeftBytes <= 0) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_CABAC_NO_BS_TO_READ);
+  }
+  switch (iLeftBytes) {
+  case 3:
+    uiValue = ((pDecEngine->pBuffCurr[0]) << 16 | (pDecEngine->pBuffCurr[1]) << 8 | (pDecEngine->pBuffCurr[2]));
+    pDecEngine->pBuffCurr += 3;
+    iNumBitsRead = 24;
+    break;
+  case 2:
+    uiValue = ((pDecEngine->pBuffCurr[0]) << 8 | (pDecEngine->pBuffCurr[1]));
+    pDecEngine->pBuffCurr += 2;
+    iNumBitsRead = 16;
+    break;
+  case 1:
+    uiValue = pDecEngine->pBuffCurr[0];
+    pDecEngine->pBuffCurr += 1;
+    iNumBitsRead = 8;
+    break;
+  default:
+    uiValue = ((pDecEngine->pBuffCurr[0] << 24) | (pDecEngine->pBuffCurr[1]) << 16 | (pDecEngine->pBuffCurr[2]) << 8 |
+               (pDecEngine->pBuffCurr[3]));
+    pDecEngine->pBuffCurr += 4;
+    iNumBitsRead = 32;
+    break;
+  }
+  return ERR_NONE;
+}
+
+int32_t DecodeBinCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t& uiBinVal) {
+  int32_t iErrorInfo = ERR_NONE;
+  uint32_t uiState = pBinCtx->uiState;
+  uiBinVal = pBinCtx->uiMPS;
+  uint64_t uiOffset = pDecEngine->uiOffset;
+  uint64_t uiRange = pDecEngine->uiRange;
+
+  int32_t iRenorm = 1;
+  uint32_t uiRangeLPS = g_kuiCabacRangeLps[uiState][ (uiRange >> 6) & 0x03];
+  uiRange -= uiRangeLPS;
+  if (uiOffset >= (uiRange << pDecEngine->iBitsLeft)) { //LPS
+    uiOffset -= (uiRange << pDecEngine->iBitsLeft);
+    uiBinVal ^= 0x0001;
+    if (!uiState)
+      pBinCtx->uiMPS ^= 0x01;
+    pBinCtx->uiState = g_kuiStateTransTable[uiState][0];
+    iRenorm = g_kRenormTable256[uiRangeLPS];
+    uiRange = (uiRangeLPS << iRenorm);
+  } else {  //MPS
+    pBinCtx->uiState = g_kuiStateTransTable[uiState][1];
+    if (uiRange >= WELS_CABAC_QUARTER) {
+      pDecEngine->uiRange = uiRange;
+      return ERR_NONE;
+    } else {
+      uiRange <<= 1;
+    }
+  }
+  //Renorm
+  pDecEngine->uiRange = uiRange;
+  pDecEngine->iBitsLeft -= iRenorm;
+  if (pDecEngine->iBitsLeft > 0) {
+    pDecEngine->uiOffset = uiOffset;
+    return ERR_NONE;
+  }
+  uint32_t uiVal = 0;
+  int32_t iNumBitsRead = 0;
+  iErrorInfo = Read32BitsCabac (pDecEngine, uiVal, iNumBitsRead);
+  pDecEngine->uiOffset = (uiOffset << iNumBitsRead) | uiVal;
+  pDecEngine->iBitsLeft += iNumBitsRead;
+  if (iErrorInfo && pDecEngine->iBitsLeft < 0) {
+    return iErrorInfo;
+  }
+  return ERR_NONE;
+}
+
+int32_t DecodeBypassCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiBinVal) {
+  int32_t iErrorInfo = ERR_NONE;
+  int32_t iBitsLeft = pDecEngine->iBitsLeft;
+  uint64_t uiOffset = pDecEngine->uiOffset;
+  uint64_t uiRangeValue;
+
+
+  if (iBitsLeft <= 0) {
+    uint32_t uiVal = 0;
+    int32_t iNumBitsRead = 0;
+    iErrorInfo = Read32BitsCabac (pDecEngine, uiVal, iNumBitsRead);
+    uiOffset = (uiOffset << iNumBitsRead) | uiVal;
+    iBitsLeft = iNumBitsRead;
+    if (iErrorInfo && iBitsLeft == 0) {
+      return iErrorInfo;
+    }
+  }
+  iBitsLeft--;
+  uiRangeValue = (pDecEngine->uiRange << iBitsLeft);
+  if (uiOffset >= uiRangeValue) {
+    pDecEngine->iBitsLeft = iBitsLeft;
+    pDecEngine->uiOffset = uiOffset - uiRangeValue;
+    uiBinVal = 1;
+    return ERR_NONE;
+  }
+  pDecEngine->iBitsLeft = iBitsLeft;
+  pDecEngine->uiOffset = uiOffset;
+  uiBinVal = 0;
+  return ERR_NONE;
+}
+
+int32_t DecodeTerminateCabac (PWelsCabacDecEngine pDecEngine, uint32_t& uiBinVal) {
+  int32_t iErrorInfo = ERR_NONE;
+  uint64_t uiRange = pDecEngine->uiRange - 2;
+  uint64_t uiOffset = pDecEngine->uiOffset;
+
+  if (uiOffset >= (uiRange << pDecEngine->iBitsLeft)) {
+    uiBinVal = 1;
+  } else {
+    uiBinVal = 0;
+    // Renorm
+    if (uiRange < WELS_CABAC_QUARTER) {
+      int32_t iRenorm = g_kRenormTable256[uiRange];
+      pDecEngine->uiRange = (uiRange << iRenorm);
+      pDecEngine->iBitsLeft -= iRenorm;
+      if (pDecEngine->iBitsLeft < 0) {
+        uint32_t uiVal = 0;
+        int32_t iNumBitsRead = 0;
+        iErrorInfo = Read32BitsCabac (pDecEngine, uiVal, iNumBitsRead);
+        pDecEngine->uiOffset = (pDecEngine->uiOffset << iNumBitsRead) | uiVal;
+        pDecEngine->iBitsLeft += iNumBitsRead;
+      }
+      if (iErrorInfo && pDecEngine->iBitsLeft < 0) {
+        return iErrorInfo;
+      }
+      return ERR_NONE;
+    } else {
+      pDecEngine->uiRange = uiRange;
+      return ERR_NONE;
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t DecodeUnaryBinCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, int32_t iCtxOffset,
+                             uint32_t& uiSymVal) {
+  uiSymVal = 0;
+  WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx, uiSymVal));
+  if (uiSymVal == 0) {
+    return ERR_NONE;
+  } else {
+    uint32_t uiCode;
+    pBinCtx += iCtxOffset;
+    uiSymVal = 0;
+    do {
+      WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx, uiCode));
+      ++uiSymVal;
+    } while (uiCode != 0);
+    return ERR_NONE;
+  }
+}
+
+int32_t DecodeExpBypassCabac (PWelsCabacDecEngine pDecEngine, int32_t iCount, uint32_t& uiSymVal) {
+  uint32_t uiCode;
+  int32_t iSymTmp = 0;
+  int32_t iSymTmp2 = 0;
+  uiSymVal = 0;
+  do {
+    WELS_READ_VERIFY (DecodeBypassCabac (pDecEngine, uiCode));
+    if (uiCode == 1) {
+      iSymTmp += (1 << iCount);
+      ++iCount;
+    }
+  } while (uiCode != 0 && iCount != 16);
+  if (iCount == 16) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_CABAC_UNEXPECTED_VALUE);
+  }
+
+  while (iCount--) {
+    WELS_READ_VERIFY (DecodeBypassCabac (pDecEngine, uiCode));
+    if (uiCode == 1) {
+      iSymTmp2 |= (1 << iCount);
+    }
+  }
+  uiSymVal = (uint32_t) (iSymTmp + iSymTmp2);
+  return ERR_NONE;
+}
+
+uint32_t DecodeUEGLevelCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t& uiCode) {
+  uiCode = 0;
+  WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx, uiCode));
+  if (uiCode == 0)
+    return ERR_NONE;
+  else {
+    uint32_t uiTmp, uiCount = 1;
+    uiCode = 0;
+    do {
+      WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx, uiTmp));
+      ++uiCode;
+      ++uiCount;
+    } while (uiTmp != 0 && uiCount != 13);
+
+    if (uiTmp != 0) {
+      WELS_READ_VERIFY (DecodeExpBypassCabac (pDecEngine, 0, uiTmp));
+      uiCode += uiTmp + 1;
+    }
+    return ERR_NONE;
+  }
+  return ERR_NONE;
+}
+
+int32_t DecodeUEGMvCabac (PWelsCabacDecEngine pDecEngine, PWelsCabacCtx pBinCtx, uint32_t iMaxBin,  uint32_t& uiCode) {
+  WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx + g_kMvdBinPos2Ctx[0], uiCode));
+  if (uiCode == 0)
+    return ERR_NONE;
+  else {
+    uint32_t uiTmp, uiCount = 1;
+    uiCode = 0;
+    do {
+      WELS_READ_VERIFY (DecodeBinCabac (pDecEngine, pBinCtx + g_kMvdBinPos2Ctx[uiCount++], uiTmp));
+      uiCode++;
+    } while (uiTmp != 0 && uiCount != 8);
+
+    if (uiTmp != 0) {
+      WELS_READ_VERIFY (DecodeExpBypassCabac (pDecEngine, 3, uiTmp));
+      uiCode += (uiTmp + 1);
+    }
+    return ERR_NONE;
+  }
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/deblocking.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/deblocking.cpp
new file mode 100644
index 0000000000..f4fffca4c4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/deblocking.cpp
@@ -0,0 +1,1422 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblocking.c
+ *
+ * \brief   Interfaces introduced in frame deblocking filtering
+ *
+ * \date    08/02/2010
+ *
+ *************************************************************************************
+ */
+
+#include "deblocking.h"
+#include "deblocking_common.h"
+#include "cpu_core.h"
+
+namespace WelsDec {
+
+#define NO_SUPPORTED_FILTER_IDX     (-1)
+#define LEFT_FLAG_BIT 0
+#define TOP_FLAG_BIT 1
+#define LEFT_FLAG_MASK 0x01
+#define TOP_FLAG_MASK 0x02
+
+#define SAME_MB_DIFF_REFIDX
+#define g_kuiAlphaTable(x) g_kuiAlphaTable[(x)+12]
+#define g_kiBetaTable(x)  g_kiBetaTable[(x)+12]
+#define g_kiTc0Table(x)   g_kiTc0Table[(x)+12]
+
+#define MB_BS_MV(pRefPic0, pRefPic1, iMotionVector, iMbXy, iMbBn, iIndex, iNeighIndex) \
+(\
+    ( pRefPic0 != pRefPic1) ||\
+    ( WELS_ABS( iMotionVector[iMbXy][iIndex][0] - iMotionVector[iMbBn][iNeighIndex][0] ) >= 4 ) ||\
+    ( WELS_ABS( iMotionVector[iMbXy][iIndex][1] - iMotionVector[iMbBn][iNeighIndex][1] ) >= 4 )\
+)
+
+#define ON_MB_BS_MV_DIFF(iMV_A, iMV_B, iMbXy, iMbBn, iIndex, iNeighIndex) \
+(\
+    (( WELS_ABS( iMV_A[iMbXy][iIndex][0] - iMV_B[iMbBn][iNeighIndex][0] ) >= 4 ) || \
+    ( WELS_ABS( iMV_A[iMbXy][iIndex][1] - iMV_B[iMbBn][iNeighIndex][1] ) >= 4 ))\
+)
+
+#define IN_MB_BS_MV_DIFF(iMV_A, iMV_B, iMbXy, iIndex, iNeighIndex) \
+(\
+    (( WELS_ABS( iMV_A[iMbXy][iIndex][0] - iMV_B[iMbXy][iNeighIndex][0] ) >= 4 ) || \
+    ( WELS_ABS( iMV_A[iMbXy][iIndex][1] - iMV_B[iMbXy][iNeighIndex][1] )  >= 4 )) \
+)
+
+//On MB Boundary strength
+//Apply for B_SLICE
+#define ON_MB_BS(ref_p0, ref_q0, ref_p1, ref_q1, mv0, mv1, iMbXy, iMbBn, iIndex, iNeighIndex) \
+(\
+  (ref_p0 != ref_p1) ? \
+  ((ref_p0 == ref_q0) ? \
+  (ON_MB_BS_MV_DIFF (mv0, mv0, iMbXy, iMbBn, iIndex, iNeighIndex) || ON_MB_BS_MV_DIFF (mv1, mv1, iMbXy, iMbBn, iIndex, iNeighIndex)) : \
+  (ON_MB_BS_MV_DIFF (mv0, mv1, iMbXy, iMbBn, iIndex, iNeighIndex) || ON_MB_BS_MV_DIFF (mv1, mv0, iMbXy, iMbBn, iIndex, iNeighIndex))) : \
+  ((ON_MB_BS_MV_DIFF (mv0, mv0, iMbXy, iMbBn, iIndex, iNeighIndex) || ON_MB_BS_MV_DIFF (mv1, mv1, iMbXy, iMbBn, iIndex, iNeighIndex)) && \
+  (ON_MB_BS_MV_DIFF (mv0, mv1, iMbXy, iMbBn, iIndex, iNeighIndex) || ON_MB_BS_MV_DIFF (mv1, mv0, iMbXy, iMbBn, iIndex, iNeighIndex))) \
+)
+
+#if defined(SAME_MB_DIFF_REFIDX)
+#define SMB_EDGE_MV(pRefPics, iMotionVector, iIndex, iNeighIndex) \
+(\
+    ( pRefPics[iIndex] != pRefPics[iNeighIndex] )||(\
+    ( WELS_ABS( iMotionVector[iIndex][0] - iMotionVector[iNeighIndex][0] ) &(~3) ) |\
+    ( WELS_ABS( iMotionVector[iIndex][1] - iMotionVector[iNeighIndex][1] ) &(~3) ))\
+)
+#else
+#define SMB_EDGE_MV(iRefIndex, iMotionVector, iIndex, iNeighIndex) \
+(\
+    !!(( WELS_ABS( iMotionVector[iIndex][0] - iMotionVector[iNeighIndex][0] ) &(~3) ) |( WELS_ABS( iMotionVector[iIndex][1] - iMotionVector[iNeighIndex][1] ) &(~3) ))\
+)
+#endif
+
+#if defined(SAME_MB_DIFF_REFIDX)
+#define IN_SMB_EDGE_MV(refs, mv, iMbXy, iIndex, iNeigborIndex) \
+(\
+  (((refs[LIST_0][iIndex] == refs[LIST_0][iNeigborIndex]) && (refs[LIST_1][iIndex] == refs[LIST_1][iNeigborIndex])) || \
+  ((refs[LIST_0][iIndex] == refs[LIST_1][iNeigborIndex]) && (refs[LIST_1][iIndex] == refs[LIST_0][iNeigborIndex]))) ? \
+  ((refs[LIST_0][iIndex] != refs[LIST_1][iIndex]) ? \
+  ((refs[LIST_0][iIndex] == refs[LIST_0][iNeigborIndex]) ? \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_0], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_1], iMbXy, iIndex, iNeigborIndex)) : \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_1], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_0], iMbXy, iIndex, iNeigborIndex))) : \
+  ((IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_0], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_1], iMbXy, iIndex, iNeigborIndex)) && \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_1], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_0], iMbXy, iIndex, iNeigborIndex)))) : 1 \
+)
+#else
+#define IN_SMB_EDGE_MV(refs, mv, iMbXy, iIndex, iNeigborIndex) \
+(\
+  !!(((refs[LIST_0][iIndex] == refs[LIST_0][iNeigborIndex]) && (refs[LIST_1][iIndex] == refs[LIST_1][iNeigborIndex])) || \
+  ((refs[LIST_0][iIndex] == refs[LIST_1][iNeigborIndex]) && (refs[LIST_1][iIndex] == refs[LIST_0][iNeigborIndex]))) ? \
+  ((refs[LIST_0][iIndex] != refs[LIST_1][iIndex]) ? \
+  ((refs[LIST_0][iIndex] == refs[LIST_0][iNeigborIndex]) ? \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_0], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_1], iMbXy, iIndex, iNeigborIndex)) : \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_1], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_0], iMbXy, iIndex, iNeigborIndex))) : \
+  ((IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_0], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_1], iMbXy, iIndex, iNeigborIndex)) && \
+  (IN_MB_BS_MV_DIFF (mv[LIST_0], mv[LIST_1], iMbXy, iIndex, iNeigborIndex) || IN_MB_BS_MV_DIFF (mv[LIST_1], mv[LIST_0], iMbXy, iIndex, iNeigborIndex)))) : 1 \
+)
+#endif
+
+#define BS_EDGE(bsx1, pRefPics, iMotionVector, iIndex, iNeighIndex) \
+( (bsx1|SMB_EDGE_MV(pRefPics, iMotionVector, iIndex, iNeighIndex))<<((uint8_t)(!!bsx1)))
+
+//Inside MB Boundary strength
+//Apply for B_SLICE
+#define IN_BS_EDGE(bsx1, refs, mv, iMbXy, iIndex, iNeigborIndex) \
+( (bsx1|IN_SMB_EDGE_MV(refs, mv, iMbXy, iIndex, iNeigborIndex))<<((uint8_t)(!!bsx1)))
+
+#define GET_ALPHA_BETA_FROM_QP(iQp, iAlphaOffset, iBetaOffset, iIndex, iAlpha, iBeta) \
+{\
+  iIndex = (iQp + iAlphaOffset);\
+  iAlpha = g_kuiAlphaTable(iIndex);\
+  iBeta  = g_kiBetaTable((iQp + iBetaOffset));\
+}
+
+static const uint8_t g_kuiAlphaTable[52 + 24] = { //this table refers to Table 8-16 in H.264/AVC standard
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  4,  4,  5,  6,
+  7,  8,  9, 10, 12, 13, 15, 17, 20, 22,
+  25, 28, 32, 36, 40, 45, 50, 56, 63, 71,
+  80, 90, 101, 113, 127, 144, 162, 182, 203, 226,
+  255, 255
+  , 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255
+};
+
+static const int8_t g_kiBetaTable[52 + 24] = { //this table refers to Table 8-16 in H.264/AVC standard
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, 0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  2,  2,  3,
+  3,  3,  3,  4,  4,  4,  6,  6,  7,  7,
+  8,  8,  9,  9, 10, 10, 11, 11, 12, 12,
+  13, 13, 14, 14, 15, 15, 16, 16, 17, 17,
+  18, 18
+  , 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18
+};
+
+static const int8_t g_kiTc0Table[52 + 24][4] = { //this table refers Table 8-17 in H.264/AVC standard
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 1 },
+  { -1, 0, 0, 1 }, { -1, 0, 0, 1 }, { -1, 0, 0, 1 }, { -1, 0, 1, 1 }, { -1, 0, 1, 1 }, { -1, 1, 1, 1 },
+  { -1, 1, 1, 1 }, { -1, 1, 1, 1 }, { -1, 1, 1, 1 }, { -1, 1, 1, 2 }, { -1, 1, 1, 2 }, { -1, 1, 1, 2 },
+  { -1, 1, 1, 2 }, { -1, 1, 2, 3 }, { -1, 1, 2, 3 }, { -1, 2, 2, 3 }, { -1, 2, 2, 4 }, { -1, 2, 3, 4 },
+  { -1, 2, 3, 4 }, { -1, 3, 3, 5 }, { -1, 3, 4, 6 }, { -1, 3, 4, 6 }, { -1, 4, 5, 7 }, { -1, 4, 5, 8 },
+  { -1, 4, 6, 9 }, { -1, 5, 7, 10 }, { -1, 6, 8, 11 }, { -1, 6, 8, 13 }, { -1, 7, 10, 14 }, { -1, 8, 11, 16 },
+  { -1, 9, 12, 18 }, { -1, 10, 13, 20 }, { -1, 11, 15, 23 }, { -1, 13, 17, 25 }
+  , { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }
+  , { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }
+};
+
+static const uint8_t g_kuiTableBIdx[2][8] = {
+  {
+    0,  4,  8,  12,
+    3,  7,  11, 15
+  },
+
+  {
+    0,  1,  2,  3,
+    12, 13, 14, 15
+  },
+};
+
+static const uint8_t g_kuiTableB8x8Idx[2][16] = {
+  {
+    0,  1,  4,  5,  8,  9,  12, 13,   // 0   1 |  2  3
+    2,  3,  6,  7, 10, 11,  14, 15    // 4   5 |  6  7
+  },                                  // ------------
+  // 8   9 | 10 11
+  {
+    // 12 13 | 14 15
+    0,  1,  4,  5,  2,  3,  6,  7,
+    8,  9,  12, 13, 10, 11, 14, 15
+  },
+};
+//fix Bugzilla 1486223
+#define TC0_TBL_LOOKUP(tc, iIndexA, pBS, bChroma) \
+{\
+  tc[0] = g_kiTc0Table(iIndexA)[pBS[0] & 3] + bChroma;\
+  tc[1] = g_kiTc0Table(iIndexA)[pBS[1] & 3] + bChroma;\
+  tc[2] = g_kiTc0Table(iIndexA)[pBS[2] & 3] + bChroma;\
+  tc[3] = g_kiTc0Table(iIndexA)[pBS[3] & 3] + bChroma;\
+}
+
+void inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {
+  uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
+
+  uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
+  uiNnz32b1 = * (uint32_t*) (pNnzTab + 4);
+  uiNnz32b2 = * (uint32_t*) (pNnzTab + 8);
+  uiNnz32b3 = * (uint32_t*) (pNnzTab + 12);
+
+  nBS[0][1][0] = (pNnzTab[0] | pNnzTab[1]) << iLShiftFactor;
+  nBS[0][2][0] = (pNnzTab[1] | pNnzTab[2]) << iLShiftFactor;
+  nBS[0][3][0] = (pNnzTab[2] | pNnzTab[3]) << iLShiftFactor;
+
+  nBS[0][1][1] = (pNnzTab[4] | pNnzTab[5]) << iLShiftFactor;
+  nBS[0][2][1] = (pNnzTab[5] | pNnzTab[6]) << iLShiftFactor;
+  nBS[0][3][1] = (pNnzTab[6] | pNnzTab[7]) << iLShiftFactor;
+  * (uint32_t*)nBS[1][1] = (uiNnz32b0 | uiNnz32b1) << iLShiftFactor;
+
+  nBS[0][1][2] = (pNnzTab[8]  | pNnzTab[9])  << iLShiftFactor;
+  nBS[0][2][2] = (pNnzTab[9]  | pNnzTab[10]) << iLShiftFactor;
+  nBS[0][3][2] = (pNnzTab[10] | pNnzTab[11]) << iLShiftFactor;
+  * (uint32_t*)nBS[1][2] = (uiNnz32b1 | uiNnz32b2) << iLShiftFactor;
+
+  nBS[0][1][3] = (pNnzTab[12] | pNnzTab[13]) << iLShiftFactor;
+  nBS[0][2][3] = (pNnzTab[13] | pNnzTab[14]) << iLShiftFactor;
+  nBS[0][3][3] = (pNnzTab[14] | pNnzTab[15]) << iLShiftFactor;
+  * (uint32_t*)nBS[1][3] = (uiNnz32b2 | uiNnz32b3) << iLShiftFactor;
+}
+
+void inline DeblockingBSInsideMBAvsbase8x8 (int8_t* pNnzTab, uint8_t nBS[2][4][4], int32_t iLShiftFactor) {
+  int8_t i8x8NnzTab[4];
+  for (int32_t i = 0; i < 4; i++) {
+    int32_t iBlkIdx = i << 2;
+    i8x8NnzTab[i] = (pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 1]] |
+                     pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 2]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 3]]);
+  }
+
+  //vertical
+  nBS[0][2][0] = nBS[0][2][1] = (i8x8NnzTab[0] | i8x8NnzTab[1]) << iLShiftFactor;
+  nBS[0][2][2] = nBS[0][2][3] = (i8x8NnzTab[2] | i8x8NnzTab[3]) << iLShiftFactor;
+  //horizontal
+  nBS[1][2][0] = nBS[1][2][1] = (i8x8NnzTab[0] | i8x8NnzTab[2]) << iLShiftFactor;
+  nBS[1][2][2] = nBS[1][2][3] = (i8x8NnzTab[1] | i8x8NnzTab[3]) << iLShiftFactor;
+}
+
+void static inline DeblockingBSInsideMBNormal (PDeblockingFilter  pFilter, PDqLayer pCurDqLayer, uint8_t nBS[2][4][4],
+    int8_t* pNnzTab,
+    int32_t iMbXy) {
+  uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
+  int8_t* iRefIdx = pCurDqLayer->pDec->pRefIndex[LIST_0][iMbXy];
+  void* iRefs[MB_BLOCK4x4_NUM];
+  int i;
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx4, 4, 4);
+
+  int8_t i8x8NnzTab[4];
+
+  /* Look up each reference picture based on indices */
+  for (i = 0; i < MB_BLOCK4x4_NUM; i++) {
+    if (iRefIdx[i] > REF_NOT_IN_LIST)
+      iRefs[i] = pFilter->pRefPics[LIST_0][iRefIdx[i]];
+    else
+      iRefs[i] = NULL;
+  }
+
+  if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+    for (int32_t i = 0; i < 4; i++) {
+      int32_t iBlkIdx = i << 2;
+      i8x8NnzTab[i] = (pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 1]] |
+                       pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 2]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 3]]);
+    }
+    //vertical
+    nBS[0][2][0] = nBS[0][2][1] = BS_EDGE ((i8x8NnzTab[0] | i8x8NnzTab[1]), iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy],
+                                           g_kuiMbCountScan4Idx[1 << 2], g_kuiMbCountScan4Idx[0]);
+    nBS[0][2][2] = nBS[0][2][3] = BS_EDGE ((i8x8NnzTab[2] | i8x8NnzTab[3]), iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy],
+                                           g_kuiMbCountScan4Idx[3 << 2], g_kuiMbCountScan4Idx[2 << 2]);
+
+    //horizontal
+    nBS[1][2][0] = nBS[1][2][1] = BS_EDGE ((i8x8NnzTab[0] | i8x8NnzTab[2]), iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy],
+                                           g_kuiMbCountScan4Idx[2 << 2], g_kuiMbCountScan4Idx[0]);
+    nBS[1][2][2] = nBS[1][2][3] = BS_EDGE ((i8x8NnzTab[1] | i8x8NnzTab[3]), iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy],
+                                           g_kuiMbCountScan4Idx[3 << 2], g_kuiMbCountScan4Idx[1 << 2]);
+  } else {
+    uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
+    uiNnz32b1 = * (uint32_t*) (pNnzTab + 4);
+    uiNnz32b2 = * (uint32_t*) (pNnzTab + 8);
+    uiNnz32b3 = * (uint32_t*) (pNnzTab + 12);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[i] | pNnzTab[i + 1];
+    nBS[0][1][0] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 1, 0);
+    nBS[0][2][0] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 2, 1);
+    nBS[0][3][0] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 3, 2);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[4 + i] | pNnzTab[4 + i + 1];
+    nBS[0][1][1] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 5, 4);
+    nBS[0][2][1] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 6, 5);
+    nBS[0][3][1] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 7, 6);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[8 + i] | pNnzTab[8 + i + 1];
+    nBS[0][1][2] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 9, 8);
+    nBS[0][2][2] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 10, 9);
+    nBS[0][3][2] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 11, 10);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[12 + i] | pNnzTab[12 + i + 1];
+    nBS[0][1][3] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 13, 12);
+    nBS[0][2][3] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 14, 13);
+    nBS[0][3][3] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 15, 14);
+
+    // horizontal
+    * (uint32_t*)uiBsx4 = (uiNnz32b0 | uiNnz32b1);
+    nBS[1][1][0] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 4, 0);
+    nBS[1][1][1] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 5, 1);
+    nBS[1][1][2] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 6, 2);
+    nBS[1][1][3] = BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 7, 3);
+
+    * (uint32_t*)uiBsx4 = (uiNnz32b1 | uiNnz32b2);
+    nBS[1][2][0] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 8, 4);
+    nBS[1][2][1] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 9, 5);
+    nBS[1][2][2] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 10, 6);
+    nBS[1][2][3] = BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 11, 7);
+
+    * (uint32_t*)uiBsx4 = (uiNnz32b2 | uiNnz32b3);
+    nBS[1][3][0] = BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 12, 8);
+    nBS[1][3][1] = BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 13, 9);
+    nBS[1][3][2] = BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 14, 10);
+    nBS[1][3][3] = BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv[LIST_0][iMbXy], 15, 11);
+  }
+}
+
+void static inline DeblockingBSliceBSInsideMBNormal (PDeblockingFilter  pFilter, PDqLayer pCurDqLayer,
+    uint8_t nBS[2][4][4], int8_t* pNnzTab,
+    int32_t iMbXy) {
+  uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
+  void* iRefs[LIST_A][MB_BLOCK4x4_NUM];
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx4, 4, 4);
+  int8_t i8x8NnzTab[4];
+  int l;
+
+  for (l = 0; l < LIST_A; l++) {
+    int8_t* iRefIdx = pCurDqLayer->pDec->pRefIndex[l][iMbXy];
+    int i;
+    /* Look up each reference picture based on indices */
+    for (i = 0; i < MB_BLOCK4x4_NUM; i++) {
+      if (iRefIdx[i] > REF_NOT_IN_LIST)
+        iRefs[l][i] = pFilter->pRefPics[l][iRefIdx[i]];
+      else
+        iRefs[l][i] = NULL;
+    }
+  }
+
+  if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+    for (int32_t i = 0; i < 4; i++) {
+      int32_t iBlkIdx = i << 2;
+      i8x8NnzTab[i] = (pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 1]] |
+                       pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 2]] | pNnzTab[g_kuiMbCountScan4Idx[iBlkIdx + 3]]);
+    }
+    //vertical
+    int8_t iIndex = g_kuiMbCountScan4Idx[1 << 2];
+    int8_t iNeigborIndex = g_kuiMbCountScan4Idx[0];
+    nBS[0][2][0] = nBS[0][2][1] = IN_BS_EDGE ((i8x8NnzTab[0] | i8x8NnzTab[1]), iRefs, pCurDqLayer->pDec->pMv, iMbXy,
+                                  iIndex, iNeigborIndex);
+    iIndex = g_kuiMbCountScan4Idx[3 << 2];
+    iNeigborIndex = g_kuiMbCountScan4Idx[2 << 2];
+    nBS[0][2][2] = nBS[0][2][3] = IN_BS_EDGE ((i8x8NnzTab[2] | i8x8NnzTab[3]), iRefs, pCurDqLayer->pDec->pMv, iMbXy,
+                                  iIndex, iNeigborIndex);
+
+    //horizontal
+    iIndex = g_kuiMbCountScan4Idx[2 << 2];
+    iNeigborIndex = g_kuiMbCountScan4Idx[0];
+    nBS[1][2][0] = nBS[1][2][1] = IN_BS_EDGE ((i8x8NnzTab[0] | i8x8NnzTab[2]), iRefs, pCurDqLayer->pDec->pMv, iMbXy,
+                                  iIndex, iNeigborIndex);
+
+    iIndex = g_kuiMbCountScan4Idx[3 << 2];
+    iNeigborIndex = g_kuiMbCountScan4Idx[1 << 2];
+    nBS[1][2][2] = nBS[1][2][3] = IN_BS_EDGE ((i8x8NnzTab[1] | i8x8NnzTab[3]), iRefs, pCurDqLayer->pDec->pMv, iMbXy,
+                                  iIndex, iNeigborIndex);
+  } else {
+    uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
+    uiNnz32b1 = * (uint32_t*) (pNnzTab + 4);
+    uiNnz32b2 = * (uint32_t*) (pNnzTab + 8);
+    uiNnz32b3 = * (uint32_t*) (pNnzTab + 12);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[i] | pNnzTab[i + 1];
+    nBS[0][1][0] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 1, 0);
+    nBS[0][2][0] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 2, 1);
+    nBS[0][3][0] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 3, 2);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[4 + i] | pNnzTab[4 + i + 1];
+    nBS[0][1][1] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 5, 4);
+    nBS[0][2][1] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 6, 5);
+    nBS[0][3][1] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 7, 6);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[8 + i] | pNnzTab[8 + i + 1];
+    nBS[0][1][2] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 9, 8);
+    nBS[0][2][2] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 10, 9);
+    nBS[0][3][2] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 11, 10);
+
+    for (int i = 0; i < 3; i++)
+      uiBsx4[i] = pNnzTab[12 + i] | pNnzTab[12 + i + 1];
+    nBS[0][1][3] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 13, 12);
+    nBS[0][2][3] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 14, 13);
+    nBS[0][3][3] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 15, 14);
+
+    // horizontal
+    * (uint32_t*)uiBsx4 = (uiNnz32b0 | uiNnz32b1);
+    nBS[1][1][0] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 4, 0);
+    nBS[1][1][1] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 5, 1);
+    nBS[1][1][2] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 6, 2);
+    nBS[1][1][3] = IN_BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 7, 3);
+
+    * (uint32_t*)uiBsx4 = (uiNnz32b1 | uiNnz32b2);
+    nBS[1][2][0] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 8, 4);
+    nBS[1][2][1] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 9, 5);
+    nBS[1][2][2] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 10, 6);
+    nBS[1][2][3] = IN_BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 11, 7);
+
+    * (uint32_t*)uiBsx4 = (uiNnz32b2 | uiNnz32b3);
+    nBS[1][3][0] = IN_BS_EDGE (uiBsx4[0], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 12, 8);
+    nBS[1][3][1] = IN_BS_EDGE (uiBsx4[1], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 13, 9);
+    nBS[1][3][2] = IN_BS_EDGE (uiBsx4[2], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 14, 10);
+    nBS[1][3][3] = IN_BS_EDGE (uiBsx4[3], iRefs, pCurDqLayer->pDec->pMv, iMbXy, 15, 11);
+    for (int ii = 0; ii < 2; ii++)
+      for (int jj = 1; jj < 4; jj++)
+        for (int kk = 0; kk < 4; kk++)
+          if (nBS[ii][jj][kk] > 1)
+            nBS[ii][jj][kk] = nBS[ii][jj][kk];
+  }
+}
+
+
+uint32_t DeblockingBsMarginalMBAvcbase (PDeblockingFilter  pFilter, PDqLayer pCurDqLayer, int32_t iEdge,
+                                        int32_t iNeighMb, int32_t iMbXy) {
+  int32_t i, j;
+  uint32_t uiBSx4;
+  uint8_t* pBS = (uint8_t*) (&uiBSx4);
+  const uint8_t* pBIdx      = &g_kuiTableBIdx[iEdge][0];
+  const uint8_t* pBnIdx     = &g_kuiTableBIdx[iEdge][4];
+  const uint8_t* pB8x8Idx   = &g_kuiTableB8x8Idx[iEdge][0];
+  const uint8_t* pBn8x8Idx  = &g_kuiTableB8x8Idx[iEdge][8];
+  int8_t (*iRefIdx)[MB_BLOCK4x4_NUM] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pRefIndex[LIST_0] :
+                                       pCurDqLayer->pRefIndex[LIST_0];
+
+  if (pCurDqLayer->pTransformSize8x8Flag[iMbXy] && pCurDqLayer->pTransformSize8x8Flag[iNeighMb]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= (GetPNzc (pCurDqLayer, iMbXy)[* (pB8x8Idx + j)] | GetPNzc (pCurDqLayer, iNeighMb)[* (pBn8x8Idx + j)]);
+      }
+      if (uiNzc) {
+        pBS[i << 1] = pBS[1 + (i << 1)] = 2;
+      } else {
+        PPicture ref0, ref1;
+        ref0 = (iRefIdx[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iMbXy][*pB8x8Idx]] : NULL;
+        ref1 = (iRefIdx[iNeighMb][*pBn8x8Idx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iNeighMb][*pBn8x8Idx]] :
+               NULL;
+        pBS[i << 1] = pBS[1 + (i << 1)] = MB_BS_MV (ref0, ref1, pCurDqLayer->pDec->pMv[LIST_0], iMbXy, iNeighMb,
+                                          *pB8x8Idx, *pBn8x8Idx);
+      }
+      pB8x8Idx += 4;
+      pBn8x8Idx += 4;
+    }
+  } else if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= GetPNzc (pCurDqLayer, iMbXy)[* (pB8x8Idx + j)];
+      }
+      for (j = 0; j < 2; j++) {
+        if (uiNzc | GetPNzc (pCurDqLayer, iNeighMb)[*pBnIdx]) {
+          pBS[j + (i << 1)] = 2;
+        } else {
+          PPicture ref0, ref1;
+          ref0 = (iRefIdx[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iMbXy][*pB8x8Idx]] : NULL;
+          ref1 = (iRefIdx[iNeighMb][*pBnIdx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iNeighMb][*pBnIdx]] : NULL;
+          pBS[j + (i << 1)] = MB_BS_MV (ref0, ref1,
+                                        (pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] : pCurDqLayer->pMv[LIST_0]), iMbXy, iNeighMb, *pB8x8Idx,
+                                        *pBnIdx);
+        }
+        pBnIdx++;
+      }
+      pB8x8Idx += 4;
+    }
+  } else if (pCurDqLayer->pTransformSize8x8Flag[iNeighMb]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= GetPNzc (pCurDqLayer, iNeighMb)[* (pBn8x8Idx + j)];
+      }
+      for (j = 0; j < 2; j++) {
+        if (uiNzc | GetPNzc (pCurDqLayer, iMbXy)[*pBIdx]) {
+          pBS[j + (i << 1)] = 2;
+        } else {
+          PPicture ref0, ref1;
+          ref0 = (iRefIdx[iMbXy][*pBIdx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iMbXy][*pBIdx]] : NULL;
+          ref1 = (iRefIdx[iNeighMb][*pBn8x8Idx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iNeighMb][*pBn8x8Idx]] :
+                 NULL;
+          pBS[j + (i << 1)] = MB_BS_MV (ref0, ref1,
+                                        (pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] : pCurDqLayer->pMv[LIST_0]), iMbXy, iNeighMb, *pBIdx,
+                                        *pBn8x8Idx);
+        }
+        pBIdx++;
+      }
+      pBn8x8Idx += 4;
+    }
+  } else {
+    // only 4x4 transform
+    for (i = 0; i < 4; i++) {
+      if (GetPNzc (pCurDqLayer, iMbXy)[*pBIdx] | GetPNzc (pCurDqLayer, iNeighMb)[*pBnIdx]) {
+        pBS[i] = 2;
+      } else {
+        PPicture ref0, ref1;
+        ref0 = (iRefIdx[iMbXy][*pBIdx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iMbXy][*pBIdx]] : NULL;
+        ref1 = (iRefIdx[iNeighMb][*pBnIdx] > REF_NOT_IN_LIST) ? pFilter->pRefPics[LIST_0][iRefIdx[iNeighMb][*pBnIdx]] : NULL;
+        pBS[i] = MB_BS_MV (ref0, ref1, (pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] : pCurDqLayer->pMv[LIST_0]),
+                           iMbXy, iNeighMb, *pBIdx, *pBnIdx);
+      }
+      pBIdx++;
+      pBnIdx++;
+    }
+  }
+
+  return uiBSx4;
+}
+uint32_t DeblockingBSliceBsMarginalMBAvcbase (PDeblockingFilter  pFilter, PDqLayer pCurDqLayer, int32_t iEdge,
+    int32_t iNeighMb, int32_t iMbXy) {
+  int32_t i, j;
+  uint32_t uiBSx4;
+  uint8_t* pBS = (uint8_t*) (&uiBSx4);
+  const uint8_t* pBIdx = &g_kuiTableBIdx[iEdge][0];
+  const uint8_t* pBnIdx = &g_kuiTableBIdx[iEdge][4];
+  const uint8_t* pB8x8Idx = &g_kuiTableB8x8Idx[iEdge][0];
+  const uint8_t* pBn8x8Idx = &g_kuiTableB8x8Idx[iEdge][8];
+  PPicture ref_p0, ref_p1, ref_q0, ref_q1;
+  int8_t (*iRefIdx0)[MB_BLOCK4x4_NUM] = pCurDqLayer->pDec->pRefIndex[LIST_0];
+  int8_t (*iRefIdx1)[MB_BLOCK4x4_NUM] = pCurDqLayer->pDec->pRefIndex[LIST_1];
+
+  if (pCurDqLayer->pTransformSize8x8Flag[iMbXy] && pCurDqLayer->pTransformSize8x8Flag[iNeighMb]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= (GetPNzc (pCurDqLayer, iMbXy)[* (pB8x8Idx + j)] | GetPNzc (pCurDqLayer, iNeighMb)[* (pBn8x8Idx + j)]);
+      }
+      if (uiNzc) {
+        pBS[i << 1] = pBS[1 + (i << 1)] = 2;
+      } else {
+        pBS[i << 1] = pBS[1 + (i << 1)] = 1;
+        ref_p0 = iRefIdx0[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iMbXy][*pB8x8Idx]] : NULL;
+        ref_q0 = iRefIdx0[iNeighMb][*pBn8x8Idx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iNeighMb][*pBn8x8Idx]] :
+                 NULL;
+        ref_p1 = iRefIdx1[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iMbXy][*pB8x8Idx]] : NULL;
+        ref_q1 = iRefIdx1[iNeighMb][*pBn8x8Idx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iNeighMb][*pBn8x8Idx]] :
+                 NULL;
+        if (((ref_p0 == ref_q0) && (ref_p1 == ref_q1)) || ((ref_p0 == ref_q1) && (ref_p1 == ref_q0))) {
+          int16_t (*pMv0)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] :
+              pCurDqLayer->pMv[LIST_0];
+          int16_t (*pMv1)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_1] :
+              pCurDqLayer->pMv[LIST_1];
+          pBS[i << 1] = pBS[1 + (i << 1)] = ON_MB_BS (ref_p0, ref_q0, ref_p1, ref_q1, pMv0, pMv1, iMbXy, iNeighMb, *pB8x8Idx,
+                                            *pBn8x8Idx);
+        }
+      }
+      pB8x8Idx += 4;
+      pBn8x8Idx += 4;
+    }
+  } else if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= GetPNzc (pCurDqLayer, iMbXy)[* (pB8x8Idx + j)];
+      }
+      for (j = 0; j < 2; j++) {
+        if (uiNzc | GetPNzc (pCurDqLayer, iNeighMb)[*pBnIdx]) {
+          pBS[j + (i << 1)] = 2;
+        } else {
+          pBS[j + (i << 1)] = 1;
+          ref_p0 = iRefIdx0[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iMbXy][*pB8x8Idx]] : NULL;
+          ref_q0 = iRefIdx0[iNeighMb][*pBnIdx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iNeighMb][*pBnIdx]] :
+                   NULL;
+          ref_p1 = iRefIdx1[iMbXy][*pB8x8Idx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iMbXy][*pB8x8Idx]] : NULL;
+          ref_q1 = iRefIdx1[iNeighMb][*pBnIdx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iNeighMb][*pBnIdx]] :
+                   NULL;
+          if (((ref_p0 == ref_q0) && (ref_p1 == ref_q1)) || ((ref_p0 == ref_q1) && (ref_p1 == ref_q0))) {
+            int16_t (*pMv0)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] :
+                pCurDqLayer->pMv[LIST_0];
+            int16_t (*pMv1)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_1] :
+                pCurDqLayer->pMv[LIST_1];
+            pBS[j + (i << 1)] = ON_MB_BS (ref_p0, ref_q0, ref_p1, ref_q1, pMv0, pMv1, iMbXy, iNeighMb, *pB8x8Idx, *pBnIdx);
+          }
+        }
+        pBnIdx++;
+      }
+      pB8x8Idx += 4;
+    }
+  } else if (pCurDqLayer->pTransformSize8x8Flag[iNeighMb]) {
+    for (i = 0; i < 2; i++) {
+      uint8_t uiNzc = 0;
+      for (j = 0; uiNzc == 0 && j < 4; j++) {
+        uiNzc |= GetPNzc (pCurDqLayer, iNeighMb)[* (pBn8x8Idx + j)];
+      }
+      for (j = 0; j < 2; j++) {
+        if (uiNzc | GetPNzc (pCurDqLayer, iMbXy)[*pBIdx]) {
+          pBS[j + (i << 1)] = 2;
+        } else {
+          pBS[j + (i << 1)] = 1;
+          ref_p0 = iRefIdx0[iMbXy][*pBIdx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iMbXy][*pBIdx]] : NULL;
+          ref_q0 = iRefIdx0[iNeighMb][*pBn8x8Idx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iNeighMb][*pBn8x8Idx]] :
+                   NULL;
+          ref_p1 = iRefIdx1[iMbXy][*pBIdx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iMbXy][*pBIdx]] : NULL;
+          ref_q1 = iRefIdx1[iNeighMb][*pBn8x8Idx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iNeighMb][*pBn8x8Idx]] :
+                   NULL;
+          if (((ref_p0 == ref_q0) && (ref_p1 == ref_q1)) || ((ref_p0 == ref_q1) && (ref_p1 == ref_q0))) {
+            int16_t (*pMv0)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] :
+                pCurDqLayer->pMv[LIST_0];
+            int16_t (*pMv1)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_1] :
+                pCurDqLayer->pMv[LIST_1];
+            pBS[j + (i << 1)] = ON_MB_BS (ref_p0, ref_q0, ref_p1, ref_q1, pMv0, pMv1, iMbXy, iNeighMb, *pBIdx, *pBn8x8Idx);
+          }
+        }
+        pBIdx++;
+      }
+      pBn8x8Idx += 4;
+    }
+  } else {
+    // only 4x4 transform
+    for (i = 0; i < 4; i++) {
+      if (GetPNzc (pCurDqLayer, iMbXy)[*pBIdx] | GetPNzc (pCurDqLayer, iNeighMb)[*pBnIdx]) {
+        pBS[i] = 2;
+      } else {
+        pBS[i] = 1;
+        ref_p0 = iRefIdx0[iMbXy][*pBIdx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iMbXy][*pBIdx]] : NULL;
+        ref_q0 = iRefIdx0[iNeighMb][*pBnIdx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_0][iRefIdx0[iNeighMb][*pBnIdx]] :
+                 NULL;
+        ref_p1 = iRefIdx1[iMbXy][*pBIdx] > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iMbXy][*pBIdx]] : NULL;
+        ref_q1 = iRefIdx1[iNeighMb][*pBnIdx]  > REF_NOT_IN_LIST ? pFilter->pRefPics[LIST_1][iRefIdx1[iNeighMb][*pBnIdx]] :
+                 NULL;
+        if (((ref_p0 == ref_q0) && (ref_p1 == ref_q1)) || ((ref_p0 == ref_q1) && (ref_p1 == ref_q0))) {
+          int16_t (*pMv0)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_0] :
+              pCurDqLayer->pMv[LIST_0];
+          int16_t (*pMv1)[MB_BLOCK4x4_NUM][MV_A] = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMv[LIST_1] :
+              pCurDqLayer->pMv[LIST_1];
+          pBS[i] = ON_MB_BS (ref_p0, ref_q0, ref_p1, ref_q1, pMv0, pMv1, iMbXy, iNeighMb, *pBIdx, *pBnIdx);
+        }
+      }
+      pBIdx++;
+      pBnIdx++;
+    }
+  }
+
+  return uiBSx4;
+}
+int32_t DeblockingAvailableNoInterlayer (PDqLayer pCurDqLayer, int32_t iFilterIdc) {
+  int32_t iMbY = pCurDqLayer->iMbY;
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  bool bLeftFlag = false;
+  bool bTopFlag  = false;
+
+  if (2 == iFilterIdc) {
+    bLeftFlag = (iMbX > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - 1]);
+    bTopFlag  = (iMbY > 0) && (pCurDqLayer->pSliceIdc[iMbXy] == pCurDqLayer->pSliceIdc[iMbXy - pCurDqLayer->iMbWidth]);
+  } else { //if ( 0 == iFilterIdc )
+    bLeftFlag = (iMbX > 0);
+    bTopFlag  = (iMbY > 0);
+  }
+  return (bLeftFlag << LEFT_FLAG_BIT) | (bTopFlag << TOP_FLAG_BIT);
+}
+
+void FilteringEdgeLumaH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (tc, iIndexA, pBS, 0);
+    pFilter->pLoopf->pfLumaDeblockingLT4Ver (pPix, iStride, iAlpha, iBeta, tc);
+  }
+  return;
+}
+
+
+void FilteringEdgeLumaV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
+  int32_t  iIndexA;
+  int32_t  iAlpha;
+  int32_t  iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (tc, iIndexA, pBS, 0);
+    pFilter->pLoopf->pfLumaDeblockingLT4Hor (pPix, iStride, iAlpha, iBeta, tc);
+  }
+  return;
+}
+
+
+void FilteringEdgeLumaIntraH (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pFilter->pLoopf->pfLumaDeblockingEQ4Ver (pPix, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+
+void FilteringEdgeLumaIntraV (SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride, uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pFilter->pLoopf->pfLumaDeblockingEQ4Hor (pPix, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+void FilteringEdgeChromaH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16);
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
+
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+
+    if (iAlpha | iBeta) {
+      TC0_TBL_LOOKUP (tc, iIndexA, pBS, 1);
+      pFilter->pLoopf->pfChromaDeblockingLT4Ver (pPixCb, pPixCr, iStride, iAlpha, iBeta, tc);
+    }
+  } else {
+
+    for (int i = 0; i < 2; i++) {
+
+
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+
+      if (iAlpha | iBeta) {
+        uint8_t* pPixCbCr = (i == 0) ? pPixCb : pPixCr;
+        TC0_TBL_LOOKUP (tc, iIndexA, pBS, 1);
+        pFilter->pLoopf->pfChromaDeblockingLT4Ver2 (pPixCbCr, iStride, iAlpha, iBeta, tc);
+      }
+
+
+
+    }
+
+  }
+  return;
+}
+void FilteringEdgeChromaV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                           uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, tc, 4, 16);
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
+
+
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+
+    if (iAlpha | iBeta) {
+      TC0_TBL_LOOKUP (tc, iIndexA, pBS, 1);
+      pFilter->pLoopf->pfChromaDeblockingLT4Hor (pPixCb, pPixCr, iStride, iAlpha, iBeta, tc);
+    }
+
+
+  } else {
+
+    for (int i = 0; i < 2; i++) {
+
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+
+      if (iAlpha | iBeta) {
+        uint8_t* pPixCbCr = (i == 0) ? pPixCb : pPixCr;
+        TC0_TBL_LOOKUP (tc, iIndexA, pBS, 1);
+        pFilter->pLoopf->pfChromaDeblockingLT4Hor2 (pPixCbCr, iStride, iAlpha, iBeta, tc);
+      }
+
+
+    }
+  }
+  return;
+}
+
+void FilteringEdgeChromaIntraH (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                                uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
+
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+
+    if (iAlpha | iBeta) {
+      pFilter->pLoopf->pfChromaDeblockingEQ4Ver (pPixCb, pPixCr, iStride, iAlpha, iBeta);
+    }
+  } else {
+
+    for (int i = 0; i < 2; i++) {
+
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+
+      if (iAlpha | iBeta) {
+        uint8_t* pPixCbCr = (i == 0) ? pPixCb : pPixCr;
+        pFilter->pLoopf->pfChromaDeblockingEQ4Ver2 (pPixCbCr, iStride, iAlpha, iBeta);
+      }
+
+    }
+  }
+  return;
+}
+
+void FilteringEdgeChromaIntraV (SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr, int32_t iStride,
+                                uint8_t* pBS) {
+  int32_t iIndexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) { // QP of cb and cr are the same
+
+
+
+
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+    if (iAlpha | iBeta) {
+      pFilter->pLoopf->pfChromaDeblockingEQ4Hor (pPixCb, pPixCr, iStride, iAlpha, iBeta);
+    }
+  } else {
+
+    for (int i = 0; i < 2; i++) {
+
+
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+      if (iAlpha | iBeta) {
+        uint8_t* pPixCbCr = (i == 0) ? pPixCb : pPixCr;
+        pFilter->pLoopf->pfChromaDeblockingEQ4Hor2 (pPixCbCr, iStride, iAlpha, iBeta);
+      }
+    }
+
+  }
+  return;
+}
+
+
+static void DeblockingInterMb (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, uint8_t nBS[2][4][4],
+                               int32_t iBoundryFlag) {
+  int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+
+  int32_t iCurLumaQp = pCurDqLayer->pLumaQp[iMbXyIndex];
+  //int32_t* iCurChromaQp = pCurDqLayer->pChromaQp[iMbXyIndex];
+  int8_t* pCurChromaQp = pCurDqLayer->pChromaQp[iMbXyIndex];
+  int32_t iLineSize   = pFilter->iCsStride[0];
+  int32_t iLineSizeUV = pFilter->iCsStride[1];
+
+  uint8_t* pDestY, * pDestCb, * pDestCr;
+  pDestY  = pFilter->pCsData[0] + ((iMbY * iLineSize + iMbX) << 4);
+  pDestCb = pFilter->pCsData[1] + ((iMbY * iLineSizeUV + iMbX) << 3);
+  pDestCr = pFilter->pCsData[2] + ((iMbY * iLineSizeUV + iMbX) << 3);
+
+  //Vertical margin
+  if (iBoundryFlag & LEFT_FLAG_MASK) {
+    int32_t iLeftXyIndex = iMbXyIndex - 1;
+    pFilter->iLumaQP   = (iCurLumaQp + pCurDqLayer->pLumaQp[iLeftXyIndex] + 1) >> 1;
+    for (int i = 0; i < 2; i++) {
+      pFilter->iChromaQP[i] = (pCurChromaQp[i] + pCurDqLayer->pChromaQp[iLeftXyIndex][i] + 1) >> 1;
+    }
+    if (nBS[0][0][0] == 0x04) {
+      FilteringEdgeLumaIntraV (pFilter, pDestY, iLineSize, NULL);
+      FilteringEdgeChromaIntraV (pFilter, pDestCb, pDestCr, iLineSizeUV, NULL);
+    } else {
+      if (* (uint32_t*)nBS[0][0] != 0) {
+        FilteringEdgeLumaV (pFilter, pDestY, iLineSize, nBS[0][0]);
+        FilteringEdgeChromaV (pFilter, pDestCb, pDestCr, iLineSizeUV, nBS[0][0]);
+      }
+    }
+  }
+
+  pFilter->iLumaQP = iCurLumaQp;
+  pFilter->iChromaQP[0] = pCurChromaQp[0];
+  pFilter->iChromaQP[1] = pCurChromaQp[1];
+
+  if (* (uint32_t*)nBS[0][1] != 0 && !pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+    FilteringEdgeLumaV (pFilter, &pDestY[1 << 2], iLineSize, nBS[0][1]);
+  }
+
+  if (* (uint32_t*)nBS[0][2] != 0) {
+    FilteringEdgeLumaV (pFilter, &pDestY[2 << 2], iLineSize, nBS[0][2]);
+    FilteringEdgeChromaV (pFilter, &pDestCb[2 << 1], &pDestCr[2 << 1], iLineSizeUV, nBS[0][2]);
+  }
+
+  if (* (uint32_t*)nBS[0][3] != 0  && !pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+    FilteringEdgeLumaV (pFilter, &pDestY[3 << 2], iLineSize, nBS[0][3]);
+  }
+
+  if (iBoundryFlag & TOP_FLAG_MASK) {
+    int32_t iTopXyIndex = iMbXyIndex - pCurDqLayer->iMbWidth;
+    pFilter->iLumaQP = (iCurLumaQp + pCurDqLayer->pLumaQp[iTopXyIndex] + 1) >> 1;
+    for (int i = 0; i < 2; i++) {
+      pFilter->iChromaQP[i] = (pCurChromaQp[i] + pCurDqLayer->pChromaQp[iTopXyIndex][i] + 1) >> 1;
+    }
+
+    if (nBS[1][0][0] == 0x04) {
+      FilteringEdgeLumaIntraH (pFilter, pDestY, iLineSize, NULL);
+      FilteringEdgeChromaIntraH (pFilter, pDestCb, pDestCr, iLineSizeUV, NULL);
+    } else {
+      if (* (uint32_t*)nBS[1][0] != 0) {
+        FilteringEdgeLumaH (pFilter, pDestY, iLineSize, nBS[1][0]);
+        FilteringEdgeChromaH (pFilter, pDestCb, pDestCr, iLineSizeUV, nBS[1][0]);
+      }
+    }
+  }
+
+  pFilter->iLumaQP = iCurLumaQp;
+  pFilter->iChromaQP[0] = pCurChromaQp[0];
+  pFilter->iChromaQP[1] = pCurChromaQp[1];
+
+  if (* (uint32_t*)nBS[1][1] != 0  && !pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+    FilteringEdgeLumaH (pFilter, &pDestY[ (1 << 2)*iLineSize], iLineSize, nBS[1][1]);
+  }
+
+  if (* (uint32_t*)nBS[1][2] != 0) {
+    FilteringEdgeLumaH (pFilter, &pDestY[ (2 << 2)*iLineSize], iLineSize, nBS[1][2]);
+    FilteringEdgeChromaH (pFilter, &pDestCb[ (2 << 1)*iLineSizeUV], &pDestCr[ (2 << 1)*iLineSizeUV], iLineSizeUV,
+                          nBS[1][2]);
+  }
+
+  if (* (uint32_t*)nBS[1][3] != 0  && !pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+    FilteringEdgeLumaH (pFilter, &pDestY[ (3 << 2)*iLineSize], iLineSize, nBS[1][3]);
+  }
+}
+
+void FilteringEdgeLumaHV (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, int32_t iBoundryFlag) {
+  int32_t iMbXyIndex = pCurDqLayer->iMbXyIndex;
+  int32_t iMbX      = pCurDqLayer->iMbX;
+  int32_t iMbY      = pCurDqLayer->iMbY;
+  int32_t iMbWidth  = pCurDqLayer->iMbWidth;
+  int32_t iLineSize  = pFilter->iCsStride[0];
+
+  uint8_t*  pDestY;
+  int32_t  iCurQp;
+  int32_t  iIndexA, iAlpha, iBeta;
+
+  ENFORCE_STACK_ALIGN_1D (int8_t,  iTc,   4, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4);
+
+  pDestY  = pFilter->pCsData[0] + ((iMbY * iLineSize + iMbX) << 4);
+  iCurQp  = pCurDqLayer->pLumaQp[iMbXyIndex];
+
+  * (uint32_t*)uiBSx4 = 0x03030303;
+
+  // luma v
+  if (iBoundryFlag & LEFT_FLAG_MASK) {
+    pFilter->iLumaQP   = (iCurQp   + pCurDqLayer->pLumaQp[iMbXyIndex - 1] + 1) >> 1;
+    FilteringEdgeLumaIntraV (pFilter, pDestY, iLineSize, NULL);
+  }
+
+  pFilter->iLumaQP   = iCurQp;
+  GET_ALPHA_BETA_FROM_QP (pFilter->iLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                          iBeta);
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 0);
+
+    if (!pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+      pFilter->pLoopf->pfLumaDeblockingLT4Hor (&pDestY[1 << 2], iLineSize, iAlpha, iBeta, iTc);
+    }
+
+    pFilter->pLoopf->pfLumaDeblockingLT4Hor (&pDestY[2 << 2], iLineSize, iAlpha, iBeta, iTc);
+
+    if (!pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+      pFilter->pLoopf->pfLumaDeblockingLT4Hor (&pDestY[3 << 2], iLineSize, iAlpha, iBeta, iTc);
+    }
+  }
+
+  // luma h
+  if (iBoundryFlag & TOP_FLAG_MASK) {
+    pFilter->iLumaQP   = (iCurQp   + pCurDqLayer->pLumaQp[iMbXyIndex - iMbWidth] + 1) >> 1;
+    FilteringEdgeLumaIntraH (pFilter, pDestY, iLineSize, NULL);
+  }
+
+  pFilter->iLumaQP   = iCurQp;
+  if (iAlpha | iBeta) {
+    if (!pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+      pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (1 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+    }
+
+    pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (2 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+
+    if (!pCurDqLayer->pTransformSize8x8Flag[iMbXyIndex]) {
+      pFilter->pLoopf->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+    }
+  }
+}
+void FilteringEdgeChromaHV (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, int32_t iBoundryFlag) {
+  int32_t iMbXyIndex     = pCurDqLayer->iMbXyIndex;
+  int32_t iMbX      = pCurDqLayer->iMbX;
+  int32_t iMbY      = pCurDqLayer->iMbY;
+  int32_t iMbWidth  = pCurDqLayer->iMbWidth;
+  int32_t iLineSize  = pFilter->iCsStride[1];
+
+  uint8_t* pDestCb;
+  uint8_t* pDestCr;
+  //int32_t  iCurQp;
+  int8_t* pCurQp;
+  int32_t  iIndexA, iAlpha, iBeta;
+
+  ENFORCE_STACK_ALIGN_1D (int8_t,  iTc,   4, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4);
+
+  pDestCb = pFilter->pCsData[1] + ((iMbY * iLineSize + iMbX) << 3);
+  pDestCr = pFilter->pCsData[2] + ((iMbY * iLineSize + iMbX) << 3);
+  pCurQp  = pCurDqLayer->pChromaQp[iMbXyIndex];
+
+  * (uint32_t*)uiBSx4 = 0x03030303;
+
+
+// chroma v
+  if (iBoundryFlag & LEFT_FLAG_MASK) {
+
+    for (int i = 0; i < 2; i++) {
+      pFilter->iChromaQP[i] = (pCurQp[i] + pCurDqLayer->pChromaQp[iMbXyIndex - 1][i] + 1) >> 1;
+
+    }
+    FilteringEdgeChromaIntraV (pFilter, pDestCb, pDestCr, iLineSize, NULL);
+  }
+
+  pFilter->iChromaQP[0]   = pCurQp[0];
+  pFilter->iChromaQP[1]   = pCurQp[1];
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+    if (iAlpha | iBeta) {
+      TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
+      pFilter->pLoopf->pfChromaDeblockingLT4Hor (&pDestCb[2 << 1], &pDestCr[2 << 1], iLineSize, iAlpha, iBeta, iTc);
+    }
+  } else {
+
+    for (int i = 0; i < 2; i++) {
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+      if (iAlpha | iBeta) {
+        uint8_t* pDestCbCr = (i == 0) ? &pDestCb[2 << 1] : &pDestCr[2 << 1];
+        TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
+        pFilter->pLoopf->pfChromaDeblockingLT4Hor2 (pDestCbCr, iLineSize, iAlpha, iBeta, iTc);
+      }
+
+    }
+  }
+
+  // chroma h
+
+  if (iBoundryFlag & TOP_FLAG_MASK) {
+    for (int i = 0; i < 2; i++) {
+      pFilter->iChromaQP[i] = (pCurQp[i] + pCurDqLayer->pChromaQp[iMbXyIndex - iMbWidth][i] + 1) >> 1;
+    }
+    FilteringEdgeChromaIntraH (pFilter, pDestCb, pDestCr, iLineSize, NULL);
+  }
+
+  pFilter->iChromaQP[0]   = pCurQp[0];
+  pFilter->iChromaQP[1]   = pCurQp[1];
+
+  if (pFilter->iChromaQP[0] == pFilter->iChromaQP[1]) {
+    GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[0], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                            iBeta);
+    if (iAlpha | iBeta) {
+      TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
+      pFilter->pLoopf->pfChromaDeblockingLT4Ver (&pDestCb[ (2 << 1)*iLineSize], &pDestCr[ (2 << 1)*iLineSize], iLineSize,
+          iAlpha, iBeta, iTc);
+    }
+  } else {
+    for (int i = 0; i < 2; i++) {
+
+      GET_ALPHA_BETA_FROM_QP (pFilter->iChromaQP[i], pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIndexA, iAlpha,
+                              iBeta);
+      if (iAlpha | iBeta) {
+        TC0_TBL_LOOKUP (iTc, iIndexA, uiBSx4, 1);
+        uint8_t* pDestCbCr = (i == 0) ? &pDestCb[ (2 << 1) * iLineSize] : &pDestCr[ (2 << 1) * iLineSize];
+        pFilter->pLoopf->pfChromaDeblockingLT4Ver2 (pDestCbCr, iLineSize,
+            iAlpha, iBeta, iTc);
+      }
+    }
+
+
+  }
+}
+
+// merge h&v lookup table operation to save performance
+static void DeblockingIntraMb (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, int32_t iBoundryFlag) {
+  FilteringEdgeLumaHV (pCurDqLayer, pFilter, iBoundryFlag);
+  FilteringEdgeChromaHV (pCurDqLayer, pFilter, iBoundryFlag);
+}
+
+void WelsDeblockingMb (PDqLayer pCurDqLayer, PDeblockingFilter  pFilter, int32_t iBoundryFlag) {
+  uint8_t nBS[2][4][4] = {{{ 0 }}};
+
+  int32_t iMbXyIndex  = pCurDqLayer->iMbXyIndex;
+  uint32_t iCurMbType  = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMbType[iMbXyIndex] :
+                         pCurDqLayer->pMbType[iMbXyIndex];
+  int32_t iMbNb;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  bool bBSlice = pSliceHeader->eSliceType == B_SLICE;
+
+  switch (iCurMbType) {
+  case MB_TYPE_INTRA4x4:
+  case MB_TYPE_INTRA8x8:
+  case MB_TYPE_INTRA16x16:
+  case MB_TYPE_INTRA_PCM:
+    DeblockingIntraMb (pCurDqLayer, pFilter, iBoundryFlag);
+    break;
+  default:
+
+    if (iBoundryFlag & LEFT_FLAG_MASK) {
+      iMbNb = iMbXyIndex - 1;
+      uint32_t uiMbType = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMbType[iMbNb] : pCurDqLayer->pMbType[iMbNb];
+      if (bBSlice) {
+        * (uint32_t*)nBS[0][0] = IS_INTRA (uiMbType) ? 0x04040404 :
+                                 DeblockingBSliceBsMarginalMBAvcbase (
+                                   pFilter, pCurDqLayer, 0, iMbNb, iMbXyIndex);
+      } else {
+        * (uint32_t*)nBS[0][0] = IS_INTRA (uiMbType) ? 0x04040404 : DeblockingBsMarginalMBAvcbase (
+                                   pFilter, pCurDqLayer, 0, iMbNb, iMbXyIndex);
+      }
+    } else {
+      * (uint32_t*)nBS[0][0] = 0;
+    }
+    if (iBoundryFlag & TOP_FLAG_MASK) {
+      iMbNb = iMbXyIndex - pCurDqLayer->iMbWidth;
+      uint32_t uiMbType = pCurDqLayer->pDec != NULL ? pCurDqLayer->pDec->pMbType[iMbNb] : pCurDqLayer->pMbType[iMbNb];
+      if (bBSlice) {
+        * (uint32_t*)nBS[1][0] = IS_INTRA (uiMbType) ? 0x04040404 :
+                                 DeblockingBSliceBsMarginalMBAvcbase (
+                                   pFilter, pCurDqLayer, 1, iMbNb, iMbXyIndex);
+      } else {
+        * (uint32_t*)nBS[1][0] = IS_INTRA (uiMbType) ? 0x04040404 : DeblockingBsMarginalMBAvcbase (
+                                   pFilter, pCurDqLayer, 1, iMbNb, iMbXyIndex);
+      }
+    } else {
+      * (uint32_t*)nBS[1][0] = 0;
+    }
+    //SKIP MB_16x16 or others
+    if (IS_SKIP (iCurMbType)) {
+      * (uint32_t*)nBS[0][1] = * (uint32_t*)nBS[0][2] = * (uint32_t*)nBS[0][3] =
+                                 * (uint32_t*)nBS[1][1] = * (uint32_t*)nBS[1][2] = * (uint32_t*)nBS[1][3] = 0;
+    } else {
+      if (IS_INTER_16x16 (iCurMbType)) {
+        if (!pCurDqLayer->pTransformSize8x8Flag[pCurDqLayer->iMbXyIndex]) {
+          DeblockingBSInsideMBAvsbase (GetPNzc (pCurDqLayer, iMbXyIndex), nBS, 1);
+        } else {
+          DeblockingBSInsideMBAvsbase8x8 (GetPNzc (pCurDqLayer, iMbXyIndex), nBS, 1);
+        }
+      } else {
+
+        if (bBSlice) {
+          DeblockingBSliceBSInsideMBNormal (pFilter, pCurDqLayer, nBS, GetPNzc (pCurDqLayer, iMbXyIndex), iMbXyIndex);
+        } else {
+          DeblockingBSInsideMBNormal (pFilter, pCurDqLayer, nBS, GetPNzc (pCurDqLayer, iMbXyIndex), iMbXyIndex);
+        }
+      }
+    }
+    DeblockingInterMb (pCurDqLayer, pFilter, nBS, iBoundryFlag);
+    break;
+  }
+}
+
+/*!
+ * \brief   AVC slice deblocking filtering target layer
+ *
+ * \param   dec         Wels avc decoder context
+ *
+ * \return  NONE
+ */
+void WelsDeblockingFilterSlice (PWelsDecoderContext pCtx, PDeblockingFilterMbFunc pDeblockMb) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
+  int32_t iMbWidth  = pCurDqLayer->iMbWidth;
+  int32_t iTotalMbCount = pSliceHeaderExt->sSliceHeader.pSps->uiTotalMbCount;
+
+  SDeblockingFilter pFilter;
+  memset (&pFilter, 0, sizeof (pFilter));
+  PFmo pFmo = pCtx->pFmo;
+  int32_t iNextMbXyIndex = 0;
+  int32_t iTotalNumMb = pCurDqLayer->sLayerInfo.sSliceInLayer.iTotalMbInCurSlice;
+  int32_t iCountNumMb = 0;
+  int32_t iBoundryFlag;
+  int32_t iFilterIdc = pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.uiDisableDeblockingFilterIdc;
+
+  /* Step1: parameters set */
+  pFilter.pCsData[0] = pCtx->pDec->pData[0];
+  pFilter.pCsData[1] = pCtx->pDec->pData[1];
+  pFilter.pCsData[2] = pCtx->pDec->pData[2];
+
+  pFilter.iCsStride[0] = pCtx->pDec->iLinesize[0];
+  pFilter.iCsStride[1] = pCtx->pDec->iLinesize[1];
+
+  pFilter.eSliceType = (EWelsSliceType) pCurDqLayer->sLayerInfo.sSliceInLayer.eSliceType;
+
+  pFilter.iSliceAlphaC0Offset = pSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
+  pFilter.iSliceBetaOffset     = pSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
+
+  pFilter.pLoopf = &pCtx->sDeblockingFunc;
+  pFilter.pRefPics[0] = pCtx->sRefPic.pRefList[0];
+  pFilter.pRefPics[1] = pCtx->sRefPic.pRefList[1];
+
+  /* Step2: macroblock deblocking */
+  if (0 == iFilterIdc || 2 == iFilterIdc) {
+    iNextMbXyIndex = pSliceHeaderExt->sSliceHeader.iFirstMbInSlice;
+    pCurDqLayer->iMbX  = iNextMbXyIndex % iMbWidth;
+    pCurDqLayer->iMbY  = iNextMbXyIndex / iMbWidth;
+    pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+
+    do {
+      iBoundryFlag = DeblockingAvailableNoInterlayer (pCurDqLayer, iFilterIdc);
+
+      pDeblockMb (pCurDqLayer, &pFilter, iBoundryFlag);
+
+      ++iCountNumMb;
+      if (iCountNumMb >= iTotalNumMb) {
+        break;
+      }
+
+      if (pSliceHeaderExt->sSliceHeader.pPps->uiNumSliceGroups > 1) {
+        iNextMbXyIndex = FmoNextMb (pFmo, iNextMbXyIndex);
+      } else {
+        ++iNextMbXyIndex;
+      }
+      if (-1 == iNextMbXyIndex || iNextMbXyIndex >= iTotalMbCount) { // slice group boundary or end of a frame
+        break;
+      }
+
+      pCurDqLayer->iMbX  = iNextMbXyIndex % iMbWidth;
+      pCurDqLayer->iMbY  = iNextMbXyIndex / iMbWidth;
+      pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+    } while (1);
+  }
+}
+
+/*!
+* \brief   AVC slice init deblocking filtering target layer
+*
+* \in and out param   SDeblockingFilter
+* \in and out param   iFilterIdc
+*
+* \return  NONE
+*/
+void WelsDeblockingInitFilter (PWelsDecoderContext pCtx, SDeblockingFilter& pFilter, int32_t& iFilterIdc) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
+
+  memset (&pFilter, 0, sizeof (pFilter));
+
+  iFilterIdc = pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.uiDisableDeblockingFilterIdc;
+
+  /* Step1: parameters set */
+  pFilter.pCsData[0] = pCtx->pDec->pData[0];
+  pFilter.pCsData[1] = pCtx->pDec->pData[1];
+  pFilter.pCsData[2] = pCtx->pDec->pData[2];
+
+  pFilter.iCsStride[0] = pCtx->pDec->iLinesize[0];
+  pFilter.iCsStride[1] = pCtx->pDec->iLinesize[1];
+
+  pFilter.eSliceType = (EWelsSliceType)pCurDqLayer->sLayerInfo.sSliceInLayer.eSliceType;
+
+  pFilter.iSliceAlphaC0Offset = pSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
+  pFilter.iSliceBetaOffset = pSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
+
+  pFilter.pLoopf = &pCtx->sDeblockingFunc;
+  pFilter.pRefPics[0] = pCtx->sRefPic.pRefList[0];
+  pFilter.pRefPics[1] = pCtx->sRefPic.pRefList[1];
+}
+
+/*!
+* \brief   AVC MB deblocking filtering target layer
+*
+* \param   DqLayer which has the current location of MB to be deblocked.
+*
+* \return  NONE
+*/
+void WelsDeblockingFilterMB (PDqLayer pCurDqLayer, SDeblockingFilter& pFilter, int32_t& iFilterIdc,
+                             PDeblockingFilterMbFunc pDeblockMb) {
+  /* macroblock deblocking */
+  if (0 == iFilterIdc || 2 == iFilterIdc) {
+    int32_t iBoundryFlag = DeblockingAvailableNoInterlayer (pCurDqLayer, iFilterIdc);
+    pDeblockMb (pCurDqLayer, &pFilter, iBoundryFlag);
+  }
+}
+/*!
+ * \brief   deblocking module initialize
+ *
+ * \param   pf
+ *          cpu
+ *
+ * \return  NONE
+ */
+
+void  DeblockingInit (SDeblockingFunc*  pFunc,  int32_t iCpu) {
+  pFunc->pfLumaDeblockingLT4Ver     = DeblockLumaLt4V_c;
+  pFunc->pfLumaDeblockingEQ4Ver     = DeblockLumaEq4V_c;
+  pFunc->pfLumaDeblockingLT4Hor     = DeblockLumaLt4H_c;
+  pFunc->pfLumaDeblockingEQ4Hor     = DeblockLumaEq4H_c;
+
+  pFunc->pfChromaDeblockingLT4Ver   = DeblockChromaLt4V_c;
+  pFunc->pfChromaDeblockingEQ4Ver   = DeblockChromaEq4V_c;
+  pFunc->pfChromaDeblockingLT4Hor   = DeblockChromaLt4H_c;
+  pFunc->pfChromaDeblockingEQ4Hor   = DeblockChromaEq4H_c;
+
+  pFunc->pfChromaDeblockingLT4Ver2  = DeblockChromaLt4V2_c;
+  pFunc->pfChromaDeblockingEQ4Ver2  = DeblockChromaEq4V2_c;
+  pFunc->pfChromaDeblockingLT4Hor2  = DeblockChromaLt4H2_c;
+  pFunc->pfChromaDeblockingEQ4Hor2  = DeblockChromaEq4H2_c;
+
+#ifdef X86_ASM
+  if (iCpu & WELS_CPU_SSSE3) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_ssse3;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_ssse3;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_ssse3;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_ssse3;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_ssse3;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_ssse3;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_ssse3;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_ssse3;
+  }
+#endif
+
+#if defined(HAVE_NEON)
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_neon;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_neon;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_neon;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_neon;
+
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_neon;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_neon;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_neon;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_AArch64_neon;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_AArch64_neon;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_AArch64_neon;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_AArch64_neon;
+
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_AArch64_neon;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_AArch64_neon;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_AArch64_neon;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_AArch64_neon;
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (iCpu & WELS_CPU_MMI) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_mmi;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_mmi;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_mmi;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_mmi;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_mmi;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_mmi;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_mmi;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_mmi;
+  }
+#endif//HAVE_MMI
+
+#if defined(HAVE_MSA)
+  if (iCpu & WELS_CPU_MSA) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_msa;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_msa;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_msa;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_msa;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_msa;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_msa;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_msa;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_msa;
+  }
+#endif//HAVE_MSA
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_mb_aux.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_mb_aux.cpp
new file mode 100644
index 0000000000..8d4ef3c912
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_mb_aux.cpp
@@ -0,0 +1,190 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <string.h>
+
+#include "decode_mb_aux.h"
+#include "wels_common_basis.h"
+
+namespace WelsDec {
+
+//NOTE::: p_RS should NOT be modified and it will lead to mismatch with JSVM.
+//        so should allocate kA array to store the temporary value (idct).
+void IdctResAddPred_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs) {
+  int16_t iSrc[16];
+
+  uint8_t* pDst           = pPred;
+  const int32_t kiStride2 = kiStride << 1;
+  const int32_t kiStride3 = kiStride + kiStride2;
+  int32_t i;
+
+  for (i = 0; i < 4; i++) {
+    const int32_t kiY  = i << 2;
+    const int32_t kiT0 = pRs[kiY] + pRs[kiY + 2];
+    const int32_t kiT1 = pRs[kiY] - pRs[kiY + 2];
+    const int32_t kiT2 = (pRs[kiY + 1] >> 1) - pRs[kiY + 3];
+    const int32_t kiT3 = pRs[kiY + 1] + (pRs[kiY + 3] >> 1);
+
+    iSrc[kiY] = kiT0 + kiT3;
+    iSrc[kiY + 1] = kiT1 + kiT2;
+    iSrc[kiY + 2] = kiT1 - kiT2;
+    iSrc[kiY + 3] = kiT0 - kiT3;
+  }
+
+  for (i = 0; i < 4; i++) {
+    int32_t kT1 = iSrc[i]     +  iSrc[i + 8];
+    int32_t kT2 = iSrc[i + 4] + (iSrc[i + 12] >> 1);
+    int32_t kT3 = (32 + kT1 + kT2) >> 6;
+    int32_t kT4 = (32 + kT1 - kT2) >> 6;
+
+    pDst[i] = WelsClip1 (kT3 + pPred[i]);
+    pDst[i + kiStride3] = WelsClip1 (kT4 + pPred[i + kiStride3]);
+
+    kT1 = iSrc[i] - iSrc[i + 8];
+    kT2 = (iSrc[i + 4] >> 1) - iSrc[i + 12];
+    pDst[i + kiStride] = WelsClip1 (((32 + kT1 + kT2) >> 6) + pDst[i + kiStride]);
+    pDst[i + kiStride2] = WelsClip1 (((32 + kT1 - kT2) >> 6) + pDst[i + kiStride2]);
+  }
+}
+
+void IdctResAddPred8x8_c (uint8_t* pPred, const int32_t kiStride, int16_t* pRs) {
+  // To make the ASM code easy to write, should using one funciton to apply hor and ver together, such as we did on HEVC
+  // Ugly code, just for easy debug, the final version need optimization
+  int16_t p[8], b[8];
+  int16_t a[4];
+
+  int16_t iTmp[64];
+  int16_t iRes[64];
+
+  // Horizontal
+  for (int i = 0; i < 8; i++) {
+    for (int j = 0; j < 8; j++) {
+      p[j] = pRs[j + (i << 3)];
+    }
+    a[0] = p[0] + p[4];
+    a[1] = p[0] - p[4];
+    a[2] = p[6] - (p[2] >> 1);
+    a[3] = p[2] + (p[6] >> 1);
+
+    b[0] =  a[0] + a[3];
+    b[2] =  a[1] - a[2];
+    b[4] =  a[1] + a[2];
+    b[6] =  a[0] - a[3];
+
+    a[0] = -p[3] + p[5] - p[7] - (p[7] >> 1);
+    a[1] =  p[1] + p[7] - p[3] - (p[3] >> 1);
+    a[2] = -p[1] + p[7] + p[5] + (p[5] >> 1);
+    a[3] =  p[3] + p[5] + p[1] + (p[1] >> 1);
+
+    b[1] =  a[0] + (a[3] >> 2);
+    b[3] =  a[1] + (a[2] >> 2);
+    b[5] =  a[2] - (a[1] >> 2);
+    b[7] =  a[3] - (a[0] >> 2);
+
+    iTmp[0 + (i << 3)] = b[0] + b[7];
+    iTmp[1 + (i << 3)] = b[2] - b[5];
+    iTmp[2 + (i << 3)] = b[4] + b[3];
+    iTmp[3 + (i << 3)] = b[6] + b[1];
+    iTmp[4 + (i << 3)] = b[6] - b[1];
+    iTmp[5 + (i << 3)] = b[4] - b[3];
+    iTmp[6 + (i << 3)] = b[2] + b[5];
+    iTmp[7 + (i << 3)] = b[0] - b[7];
+  }
+
+  //Vertical
+  for (int i = 0; i < 8; i++) {
+    for (int j = 0; j < 8; j++) {
+      p[j] = iTmp[i + (j << 3)];
+    }
+
+    a[0] =  p[0] + p[4];
+    a[1] =  p[0] - p[4];
+    a[2] =  p[6] - (p[2] >> 1);
+    a[3] =  p[2] + (p[6] >> 1);
+
+    b[0] = a[0] + a[3];
+    b[2] = a[1] - a[2];
+    b[4] = a[1] + a[2];
+    b[6] = a[0] - a[3];
+
+    a[0] = -p[3] + p[5] - p[7] - (p[7] >> 1);
+    a[1] =  p[1] + p[7] - p[3] - (p[3] >> 1);
+    a[2] = -p[1] + p[7] + p[5] + (p[5] >> 1);
+    a[3] =  p[3] + p[5] + p[1] + (p[1] >> 1);
+
+
+    b[1] =  a[0] + (a[3] >> 2);
+    b[7] =  a[3] - (a[0] >> 2);
+    b[3] =  a[1] + (a[2] >> 2);
+    b[5] =  a[2] - (a[1] >> 2);
+
+    iRes[ (0 << 3) + i] = b[0] + b[7];
+    iRes[ (1 << 3) + i] = b[2] - b[5];
+    iRes[ (2 << 3) + i] = b[4] + b[3];
+    iRes[ (3 << 3) + i] = b[6] + b[1];
+    iRes[ (4 << 3) + i] = b[6] - b[1];
+    iRes[ (5 << 3) + i] = b[4] - b[3];
+    iRes[ (6 << 3) + i] = b[2] + b[5];
+    iRes[ (7 << 3) + i] = b[0] - b[7];
+  }
+
+  uint8_t* pDst = pPred;
+  for (int i = 0; i < 8; i++) {
+    for (int j = 0; j < 8; j++) {
+      pDst[i * kiStride + j] = WelsClip1 (((32 + iRes[ (i << 3) + j]) >> 6) + pDst[i * kiStride + j]);
+    }
+  }
+
+}
+
+void GetI4LumaIChromaAddrTable (int32_t* pBlockOffset, const int32_t kiYStride, const int32_t kiUVStride) {
+  int32_t* pOffset = pBlockOffset;
+  int32_t i;
+  const uint8_t kuiScan0 = g_kuiScan8[0];
+
+  for (i = 0; i < 16; i++) {
+    const uint32_t kuiA = g_kuiScan8[i] - kuiScan0;
+    const uint32_t kuiX = kuiA & 0x07;
+    const uint32_t kuiY = kuiA >> 3;
+
+    pOffset[i] = (kuiX + kiYStride * kuiY) << 2;
+  }
+
+  for (i = 0; i < 4; i++) {
+    const uint32_t kuiA = g_kuiScan8[i] - kuiScan0;
+
+    pOffset[16 + i] =
+      pOffset[20 + i] = ((kuiA & 0x07) + (kiUVStride/*>>1*/) * (kuiA >> 3)) << 2;
+  }
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_slice.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_slice.cpp
new file mode 100644
index 0000000000..d06a7d77f1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decode_slice.cpp
@@ -0,0 +1,3064 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  Abstract
+ *      current slice decoding
+ *
+ *  History
+ *      07/10/2008 Created
+ *      08/09/2013 Modified
+ *
+ *****************************************************************************/
+
+
+#include "deblocking.h"
+
+#include "decode_slice.h"
+
+#include "parse_mb_syn_cavlc.h"
+#include "parse_mb_syn_cabac.h"
+#include "rec_mb.h"
+#include "mv_pred.h"
+
+#include "cpu_core.h"
+
+namespace WelsDec {
+
+extern void FreePicture (PPicture pPic, CMemoryAlign* pMa);
+
+extern PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const int32_t kiPicHeight);
+
+static bool CheckRefPics (const PWelsDecoderContext& pCtx) {
+  int32_t listCount = 1;
+  if (pCtx->eSliceType == B_SLICE) {
+    ++listCount;
+  }
+  for (int32_t list = LIST_0; list < listCount; ++list) {
+    int32_t shortRefCount = pCtx->sRefPic.uiShortRefCount[list];
+    for (int32_t refIdx = 0; refIdx < shortRefCount; ++refIdx) {
+      if (!pCtx->sRefPic.pShortRefList[list][refIdx]) {
+        return false;
+      }
+    }
+    int32_t longRefCount = pCtx->sRefPic.uiLongRefCount[list];
+    for (int32_t refIdx = 0; refIdx < longRefCount; ++refIdx) {
+      if (!pCtx->sRefPic.pLongRefList[list][refIdx]) {
+        return false;
+      }
+    }
+  }
+  return true;
+}
+
+int32_t WelsTargetSliceConstruction (PWelsDecoderContext pCtx) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PSlice pCurSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pCurSlice->sSliceHeaderExt.sSliceHeader;
+
+  int32_t iTotalMbTargetLayer = pSliceHeader->pSps->uiTotalMbCount;
+
+  int32_t iCurLayerWidth  = pCurDqLayer->iMbWidth << 4;
+  int32_t iCurLayerHeight = pCurDqLayer->iMbHeight << 4;
+
+  int32_t iNextMbXyIndex = 0;
+  PFmo pFmo = pCtx->pFmo;
+
+  int32_t iTotalNumMb = pCurSlice->iTotalMbInCurSlice;
+  int32_t iCountNumMb = 0;
+  PDeblockingFilterMbFunc pDeblockMb = WelsDeblockingMb;
+
+  if (!pCtx->sSpsPpsCtx.bAvcBasedFlag && iCurLayerWidth != pCtx->iCurSeqIntervalMaxPicWidth) {
+    return ERR_INFO_WIDTH_MISMATCH;
+  }
+
+  iNextMbXyIndex   = pSliceHeader->iFirstMbInSlice;
+  pCurDqLayer->iMbX  = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+  pCurDqLayer->iMbY  = iNextMbXyIndex / pCurDqLayer->iMbWidth;
+  pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+
+  if (0 == iNextMbXyIndex) {
+    pCurDqLayer->pDec->iSpsId = pCtx->pSps->iSpsId;
+    pCurDqLayer->pDec->iPpsId = pCtx->pPps->iPpsId;
+
+    pCurDqLayer->pDec->uiQualityId = pCurDqLayer->sLayerInfo.sNalHeaderExt.uiQualityId;
+  }
+
+  do {
+    if (iCountNumMb >= iTotalNumMb) {
+      break;
+    }
+
+    if (!pCtx->pParam->bParseOnly) { //for parse only, actual recon MB unnecessary
+      if (WelsTargetMbConstruction (pCtx)) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+                 "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d",
+                 pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurSlice->eSliceType);
+
+        return ERR_INFO_MB_RECON_FAIL;
+      }
+    }
+
+    ++iCountNumMb;
+    if (!pCurDqLayer->pMbCorrectlyDecodedFlag[iNextMbXyIndex]) { //already con-ed, overwrite
+      pCurDqLayer->pMbCorrectlyDecodedFlag[iNextMbXyIndex] = true;
+      pCtx->pDec->iMbEcedPropNum += (pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] ? 1 : 0);
+      ++pCtx->iTotalNumMbRec;
+    }
+
+    if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+               "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d",
+               pCtx->iTotalNumMbRec, iTotalMbTargetLayer);
+
+      return ERR_INFO_MB_NUM_EXCEED_FAIL;
+    }
+
+    if (pSliceHeader->pPps->uiNumSliceGroups > 1) {
+      iNextMbXyIndex = FmoNextMb (pFmo, iNextMbXyIndex);
+    } else {
+      ++iNextMbXyIndex;
+    }
+    if (-1 == iNextMbXyIndex || iNextMbXyIndex >= iTotalMbTargetLayer) { // slice group boundary or end of a frame
+      break;
+    }
+    pCurDqLayer->iMbX  = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+    pCurDqLayer->iMbY  = iNextMbXyIndex / pCurDqLayer->iMbWidth;
+    pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+  } while (1);
+
+  pCtx->pDec->iWidthInPixel  = iCurLayerWidth;
+  pCtx->pDec->iHeightInPixel = iCurLayerHeight;
+
+  if ((pCurSlice->eSliceType != I_SLICE) && (pCurSlice->eSliceType != P_SLICE) && (pCurSlice->eSliceType != B_SLICE))
+    return ERR_NONE; //no error but just ignore the type unsupported
+
+  if (pCtx->pParam->bParseOnly) //for parse only, deblocking should not go on
+    return ERR_NONE;
+
+  if (1 == pSliceHeader->uiDisableDeblockingFilterIdc
+      || pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.iTotalMbInCurSlice <= 0) {
+    return ERR_NONE;//NO_SUPPORTED_FILTER_IDX
+  } else {
+    WelsDeblockingFilterSlice (pCtx, pDeblockMb);
+  }
+  // any other filter_idc not supported here, 7/22/2010
+
+  return ERR_NONE;
+}
+
+int32_t WelsMbInterSampleConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer,
+                                       uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV, int32_t iStrideL, int32_t iStrideC) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t i, iIndex, iOffset;
+
+  if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+    for (i = 0; i < 4; i++) {
+      iIndex = g_kuiMbCountScan4Idx[i << 2];
+      if (pCurDqLayer->pNzc[iMbXy][iIndex] || pCurDqLayer->pNzc[iMbXy][iIndex + 1] || pCurDqLayer->pNzc[iMbXy][iIndex + 4]
+          || pCurDqLayer->pNzc[iMbXy][iIndex + 5]) {
+        iOffset = ((iIndex >> 2) << 2) * iStrideL + ((iIndex % 4) << 2);
+        pCtx->pIdctResAddPredFunc8x8 (pDstY + iOffset, iStrideL, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 6));
+      }
+    }
+  } else {
+    // luma.
+    const int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+    int16_t* pScaledTCoeff = pCurDqLayer->pScaledTCoeff[iMbXy];
+    pCtx->pIdctFourResAddPredFunc (pDstY + 0 * iStrideL + 0, iStrideL, pScaledTCoeff + 0 * 64, pNzc +  0);
+    pCtx->pIdctFourResAddPredFunc (pDstY + 0 * iStrideL + 8, iStrideL, pScaledTCoeff + 1 * 64, pNzc +  2);
+    pCtx->pIdctFourResAddPredFunc (pDstY + 8 * iStrideL + 0, iStrideL, pScaledTCoeff + 2 * 64, pNzc +  8);
+    pCtx->pIdctFourResAddPredFunc (pDstY + 8 * iStrideL + 8, iStrideL, pScaledTCoeff + 3 * 64, pNzc + 10);
+  }
+
+  const int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int16_t* pScaledTCoeff = pCurDqLayer->pScaledTCoeff[iMbXy];
+  // Cb.
+  pCtx->pIdctFourResAddPredFunc (pDstU, iStrideC, pScaledTCoeff + 4 * 64, pNzc + 16);
+  // Cr.
+  pCtx->pIdctFourResAddPredFunc (pDstV, iStrideC, pScaledTCoeff + 5 * 64, pNzc + 18);
+
+  return ERR_NONE;
+}
+int32_t WelsMbInterConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer) {
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  uint8_t*  pDstY, *pDstCb, *pDstCr;
+
+  int32_t iLumaStride   = pCtx->pDec->iLinesize[0];
+  int32_t iChromaStride = pCtx->pDec->iLinesize[1];
+
+  pDstY  = pCurDqLayer->pDec->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
+  pDstCb = pCurDqLayer->pDec->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
+  pDstCr = pCurDqLayer->pDec->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
+
+  if (pCtx->eSliceType == P_SLICE) {
+    WELS_B_MB_REC_VERIFY (GetInterPred (pDstY, pDstCb, pDstCr, pCtx));
+  } else {
+    if (pCtx->pTempDec == NULL)
+      pCtx->pTempDec = AllocPicture (pCtx, pCtx->pSps->iMbWidth << 4, pCtx->pSps->iMbHeight << 4);
+    uint8_t*   pTempDstYCbCr[3];
+    uint8_t*   pDstYCbCr[3];
+    pTempDstYCbCr[0] = pCtx->pTempDec->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
+    pTempDstYCbCr[1] = pCtx->pTempDec->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
+    pTempDstYCbCr[2] = pCtx->pTempDec->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
+    pDstYCbCr[0] = pDstY;
+    pDstYCbCr[1] = pDstCb;
+    pDstYCbCr[2] = pDstCr;
+    WELS_B_MB_REC_VERIFY (GetInterBPred (pDstYCbCr, pTempDstYCbCr, pCtx));
+  }
+  WelsMbInterSampleConstruction (pCtx, pCurDqLayer, pDstY, pDstCb, pDstCr, iLumaStride, iChromaStride);
+
+  if (GetThreadCount (pCtx) <= 1) {
+    pCtx->sBlockFunc.pWelsSetNonZeroCountFunc (
+      pCurDqLayer->pNzc[pCurDqLayer->iMbXyIndex]); // set all none-zero nzc to 1; dbk can be opti!
+  }
+  return ERR_NONE;
+}
+
+void WelsLumaDcDequantIdct (int16_t* pBlock, int32_t iQp, PWelsDecoderContext pCtx) {
+  const int32_t kiQMul = pCtx->bUseScalingList ? pCtx->pDequant_coeff4x4[0][iQp][0] : (g_kuiDequantCoeff[iQp][0] << 4);
+#define STRIDE 16
+  int32_t i;
+  int32_t iTemp[16]; //FIXME check if this is a good idea
+  int16_t* pBlk = pBlock;
+  static const int32_t kiXOffset[4] = {0, STRIDE, STRIDE << 2,  5 * STRIDE};
+  static const int32_t kiYOffset[4] = {0, STRIDE << 1, STRIDE << 3, 10 * STRIDE};
+
+  for (i = 0; i < 4; i++) {
+    const int32_t kiOffset = kiYOffset[i];
+    const int32_t kiX1 = kiOffset + kiXOffset[2];
+    const int32_t kiX2 = STRIDE + kiOffset;
+    const int32_t kiX3 = kiOffset + kiXOffset[3];
+    const int32_t kiI4 = i << 2; // 4*i
+    const int32_t kiZ0 = pBlk[kiOffset] + pBlk[kiX1];
+    const int32_t kiZ1 = pBlk[kiOffset] - pBlk[kiX1];
+    const int32_t kiZ2 = pBlk[kiX2] - pBlk[kiX3];
+    const int32_t kiZ3 = pBlk[kiX2] + pBlk[kiX3];
+
+    iTemp[kiI4]  = kiZ0 + kiZ3;
+    iTemp[1 + kiI4] = kiZ1 + kiZ2;
+    iTemp[2 + kiI4] = kiZ1 - kiZ2;
+    iTemp[3 + kiI4] = kiZ0 - kiZ3;
+  }
+
+  for (i = 0; i < 4; i++) {
+    const int32_t kiOffset = kiXOffset[i];
+    const int32_t kiI4 = 4 + i;
+    const int32_t kiZ0 = iTemp[i] + iTemp[4 + kiI4];
+    const int32_t kiZ1 = iTemp[i] - iTemp[4 + kiI4];
+    const int32_t kiZ2 = iTemp[kiI4] - iTemp[8 + kiI4];
+    const int32_t kiZ3 = iTemp[kiI4] + iTemp[8 + kiI4];
+
+    pBlk[kiOffset] = ((kiZ0 + kiZ3) * kiQMul + (1 << 5)) >> 6; //FIXME think about merging this into decode_resdual
+    pBlk[kiYOffset[1] + kiOffset] = ((kiZ1 + kiZ2) * kiQMul + (1 << 5)) >> 6;
+    pBlk[kiYOffset[2] + kiOffset] = ((kiZ1 - kiZ2) * kiQMul + (1 << 5)) >> 6;
+    pBlk[kiYOffset[3] + kiOffset] = ((kiZ0 - kiZ3) * kiQMul + (1 << 5)) >> 6;
+  }
+#undef STRIDE
+}
+
+int32_t WelsMbIntraPredictionConstruction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer, bool bOutput) {
+//seems IPCM should not enter this path
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  WelsFillRecNeededMbInfo (pCtx, bOutput, pCurDqLayer);
+
+  if (IS_INTRA16x16 (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    RecI16x16Mb (iMbXy, pCtx, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer);
+  } else if (IS_INTRA8x8 (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    RecI8x8Mb (iMbXy, pCtx, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer);
+  } else if (IS_INTRA4x4 (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    RecI4x4Mb (iMbXy, pCtx, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsMbInterPrediction (PWelsDecoderContext pCtx, PDqLayer pCurDqLayer) {
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  uint8_t*  pDstY, *pDstCb, *pDstCr;
+
+  int32_t iLumaStride   = pCtx->pDec->iLinesize[0];
+  int32_t iChromaStride = pCtx->pDec->iLinesize[1];
+
+  pDstY  = pCurDqLayer->pDec->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
+  pDstCb = pCurDqLayer->pDec->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
+  pDstCr = pCurDqLayer->pDec->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
+
+  if (pCtx->eSliceType == P_SLICE) {
+    WELS_B_MB_REC_VERIFY (GetInterPred (pDstY, pDstCb, pDstCr, pCtx));
+  } else {
+    if (pCtx->pTempDec == NULL)
+      pCtx->pTempDec = AllocPicture (pCtx, pCtx->pSps->iMbWidth << 4, pCtx->pSps->iMbHeight << 4);
+    uint8_t*   pTempDstYCbCr[3];
+    uint8_t*   pDstYCbCr[3];
+    pTempDstYCbCr[0] = pCtx->pTempDec->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
+    pTempDstYCbCr[1] = pCtx->pTempDec->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
+    pTempDstYCbCr[2] = pCtx->pTempDec->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
+    pDstYCbCr[0] = pDstY;
+    pDstYCbCr[1] = pDstCb;
+    pDstYCbCr[2] = pDstCr;
+    WELS_B_MB_REC_VERIFY (GetInterBPred (pDstYCbCr, pTempDstYCbCr, pCtx));
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsTargetMbConstruction (PWelsDecoderContext pCtx) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  if (MB_TYPE_INTRA_PCM == pCurDqLayer->pDec->pMbType[pCurDqLayer->iMbXyIndex]) {
+    //already decoded and reconstructed when parsing
+    return ERR_NONE;
+  } else if (IS_INTRA (pCurDqLayer->pDec->pMbType[pCurDqLayer->iMbXyIndex])) {
+    WelsMbIntraPredictionConstruction (pCtx, pCurDqLayer, 1);
+  } else if (IS_INTER (pCurDqLayer->pDec->pMbType[pCurDqLayer->iMbXyIndex])) { //InterMB
+    if (0 == pCurDqLayer->pCbp[pCurDqLayer->iMbXyIndex]) { //uiCbp==0 include SKIP
+      if (!CheckRefPics (pCtx)) {
+        return ERR_INFO_MB_RECON_FAIL;
+      }
+      return WelsMbInterPrediction (pCtx, pCurDqLayer);
+    } else {
+      WelsMbInterConstruction (pCtx, pCurDqLayer);
+    }
+  } else {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsTargetMbConstruction():::::Unknown MB type: %d",
+             pCurDqLayer->pDec->pMbType[pCurDqLayer->iMbXyIndex]);
+    return ERR_INFO_MB_RECON_FAIL;
+  }
+
+  return ERR_NONE;
+}
+
+void WelsChromaDcIdct (int16_t* pBlock) {
+  int32_t iStride = 32;
+  int32_t iXStride = 16;
+  int32_t iStride1 = iXStride + iStride;
+  int16_t* pBlk = pBlock;
+  int32_t iA, iB, iC, iD, iE;
+
+  iA = pBlk[0];
+  iB = pBlk[iXStride];
+  iC = pBlk[iStride];
+  iD = pBlk[iStride1];
+
+  iE = iA - iB;
+  iA += iB;
+  iB = iC - iD;
+  iC += iD;
+
+  pBlk[0] = (iA + iC);
+  pBlk[iXStride] = (iE + iB);
+  pBlk[iStride] = (iA - iC);
+  pBlk[iStride1] = (iE - iB);
+}
+
+void WelsMapNxNNeighToSampleNormal (PWelsNeighAvail pNeighAvail, int32_t* pSampleAvail) {
+  if (pNeighAvail->iLeftAvail) {  //left
+    pSampleAvail[ 6] =
+      pSampleAvail[12] =
+        pSampleAvail[18] =
+          pSampleAvail[24] = 1;
+  }
+  if (pNeighAvail->iLeftTopAvail) { //top_left
+    pSampleAvail[0] = 1;
+  }
+  if (pNeighAvail->iTopAvail) { //top
+    pSampleAvail[1] =
+      pSampleAvail[2] =
+        pSampleAvail[3] =
+          pSampleAvail[4] = 1;
+  }
+  if (pNeighAvail->iRightTopAvail) { //top_right
+    pSampleAvail[5] = 1;
+  }
+}
+
+void WelsMapNxNNeighToSampleConstrain1 (PWelsNeighAvail pNeighAvail, int32_t* pSampleAvail) {
+  if (pNeighAvail->iLeftAvail && IS_INTRA (pNeighAvail->iLeftType)) {   //left
+    pSampleAvail[ 6] =
+      pSampleAvail[12] =
+        pSampleAvail[18] =
+          pSampleAvail[24] = 1;
+  }
+  if (pNeighAvail->iLeftTopAvail && IS_INTRA (pNeighAvail->iLeftTopType)) {  //top_left
+    pSampleAvail[0] = 1;
+  }
+  if (pNeighAvail->iTopAvail && IS_INTRA (pNeighAvail->iTopType)) {  //top
+    pSampleAvail[1] =
+      pSampleAvail[2] =
+        pSampleAvail[3] =
+          pSampleAvail[4] = 1;
+  }
+  if (pNeighAvail->iRightTopAvail && IS_INTRA (pNeighAvail->iRightTopType)) {  //top_right
+    pSampleAvail[5] = 1;
+  }
+}
+void WelsMap16x16NeighToSampleNormal (PWelsNeighAvail pNeighAvail, uint8_t* pSampleAvail) {
+  if (pNeighAvail->iLeftAvail) {
+    *pSampleAvail = (1 << 2);
+  }
+  if (pNeighAvail->iLeftTopAvail) {
+    *pSampleAvail |= (1 << 1);
+  }
+  if (pNeighAvail->iTopAvail) {
+    *pSampleAvail |= 1;
+  }
+}
+
+void WelsMap16x16NeighToSampleConstrain1 (PWelsNeighAvail pNeighAvail, uint8_t* pSampleAvail) {
+  if (pNeighAvail->iLeftAvail && IS_INTRA (pNeighAvail->iLeftType)) {
+    *pSampleAvail = (1 << 2);
+  }
+  if (pNeighAvail->iLeftTopAvail && IS_INTRA (pNeighAvail->iLeftTopType)) {
+    *pSampleAvail |= (1 << 1);
+  }
+  if (pNeighAvail->iTopAvail && IS_INTRA (pNeighAvail->iTopType)) {
+    *pSampleAvail |= 1;
+  }
+}
+
+int32_t ParseIntra4x4Mode (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, int8_t* pIntraPredMode,
+                           PBitStringAux pBs,
+                           PDqLayer pCurDqLayer) {
+  int32_t iSampleAvail[5 * 6] = { 0 }; //initialize as 0
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t iFinalMode, i;
+
+  uint8_t uiNeighAvail = 0;
+  uint32_t uiCode;
+  int32_t iCode;
+  pCtx->pMapNxNNeighToSampleFunc (pNeighAvail, iSampleAvail);
+  uiNeighAvail = (iSampleAvail[6] << 2) | (iSampleAvail[0] << 1) | (iSampleAvail[1]);
+  for (i = 0; i < 16; i++) {
+    int32_t iPrevIntra4x4PredMode = 0;
+    if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+      WELS_READ_VERIFY (ParseIntraPredModeLumaCabac (pCtx, iCode));
+      iPrevIntra4x4PredMode = iCode;
+    } else {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
+      iPrevIntra4x4PredMode = uiCode;
+    }
+    const int32_t kiPredMode = PredIntra4x4Mode (pIntraPredMode, i);
+
+    int8_t iBestMode;
+    if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+      if (iPrevIntra4x4PredMode == -1)
+        iBestMode = kiPredMode;
+      else
+        iBestMode = iPrevIntra4x4PredMode + (iPrevIntra4x4PredMode >= kiPredMode);
+    } else {
+      if (iPrevIntra4x4PredMode) {
+        iBestMode = kiPredMode;
+      } else {
+        WELS_READ_VERIFY (BsGetBits (pBs, 3, &uiCode));
+        iBestMode = uiCode + ((int32_t) uiCode >= kiPredMode);
+      }
+    }
+
+    iFinalMode = CheckIntraNxNPredMode (&iSampleAvail[0], &iBestMode, i, false);
+    if (iFinalMode == GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INVALID_INTRA4X4_MODE)) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I4x4_PRED_MODE);
+    }
+
+    pCurDqLayer->pIntra4x4FinalMode[iMbXy][g_kuiScan4[i]] = iFinalMode;
+
+    pIntraPredMode[g_kuiScan8[i]] = iBestMode;
+
+    iSampleAvail[g_kuiCache30ScanIdx[i]] = 1;
+  }
+  ST32 (&pCurDqLayer->pIntraPredMode[iMbXy][0], LD32 (&pIntraPredMode[1 + 8 * 4]));
+  pCurDqLayer->pIntraPredMode[iMbXy][4] = pIntraPredMode[4 + 8 * 1];
+  pCurDqLayer->pIntraPredMode[iMbXy][5] = pIntraPredMode[4 + 8 * 2];
+  pCurDqLayer->pIntraPredMode[iMbXy][6] = pIntraPredMode[4 + 8 * 3];
+
+  if (pCtx->pSps->uiChromaFormatIdc == 0)//no need parse chroma
+    return ERR_NONE;
+
+  if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+    WELS_READ_VERIFY (ParseIntraPredModeChromaCabac (pCtx, uiNeighAvail, iCode));
+    if (iCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = iCode;
+  } else {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //intra_chroma_pred_mode
+    if (uiCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = uiCode;
+  }
+
+  if (-1 == pCurDqLayer->pChromaPredMode[iMbXy]
+      || CheckIntraChromaPredMode (uiNeighAvail, &pCurDqLayer->pChromaPredMode[iMbXy])) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseIntra8x8Mode (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, int8_t* pIntraPredMode,
+                           PBitStringAux pBs,
+                           PDqLayer pCurDqLayer) {
+  // Similar with Intra_4x4, can put them together when needed
+  int32_t iSampleAvail[5 * 6] = { 0 }; //initialize as 0
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t iFinalMode, i;
+
+  uint8_t uiNeighAvail = 0;
+  uint32_t uiCode;
+  int32_t iCode;
+  pCtx->pMapNxNNeighToSampleFunc (pNeighAvail, iSampleAvail);
+  // Top-Right : Left : Top-Left : Top
+  uiNeighAvail = (iSampleAvail[5] << 3) | (iSampleAvail[6] << 2) | (iSampleAvail[0] << 1) | (iSampleAvail[1]);
+
+  pCurDqLayer->pIntraNxNAvailFlag[iMbXy] = uiNeighAvail;
+
+  for (i = 0; i < 4; i++) {
+    int32_t iPrevIntra4x4PredMode = 0;
+    if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+      WELS_READ_VERIFY (ParseIntraPredModeLumaCabac (pCtx, iCode));
+      iPrevIntra4x4PredMode = iCode;
+    } else {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
+      iPrevIntra4x4PredMode = uiCode;
+    }
+    const int32_t kiPredMode = PredIntra4x4Mode (pIntraPredMode, i << 2);
+
+    int8_t iBestMode;
+    if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+      if (iPrevIntra4x4PredMode == -1)
+        iBestMode = kiPredMode;
+      else
+        iBestMode = iPrevIntra4x4PredMode + (iPrevIntra4x4PredMode >= kiPredMode);
+    } else {
+      if (iPrevIntra4x4PredMode) {
+        iBestMode = kiPredMode;
+      } else {
+        WELS_READ_VERIFY (BsGetBits (pBs, 3, &uiCode));
+        iBestMode = uiCode + ((int32_t) uiCode >= kiPredMode);
+      }
+    }
+
+    iFinalMode = CheckIntraNxNPredMode (&iSampleAvail[0], &iBestMode, i << 2, true);
+
+    if (iFinalMode == GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INVALID_INTRA4X4_MODE)) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I4x4_PRED_MODE);
+    }
+
+    for (int j = 0; j < 4; j++) {
+      pCurDqLayer->pIntra4x4FinalMode[iMbXy][g_kuiScan4[ (i << 2) + j]] = iFinalMode;
+      pIntraPredMode[g_kuiScan8[ (i << 2) + j]] = iBestMode;
+      iSampleAvail[g_kuiCache30ScanIdx[ (i << 2) + j]] = 1;
+    }
+  }
+  ST32 (&pCurDqLayer->pIntraPredMode[iMbXy][0], LD32 (&pIntraPredMode[1 + 8 * 4]));
+  pCurDqLayer->pIntraPredMode[iMbXy][4] = pIntraPredMode[4 + 8 * 1];
+  pCurDqLayer->pIntraPredMode[iMbXy][5] = pIntraPredMode[4 + 8 * 2];
+  pCurDqLayer->pIntraPredMode[iMbXy][6] = pIntraPredMode[4 + 8 * 3];
+
+  if (pCtx->pSps->uiChromaFormatIdc == 0)
+    return ERR_NONE;
+
+  if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+    WELS_READ_VERIFY (ParseIntraPredModeChromaCabac (pCtx, uiNeighAvail, iCode));
+    if (iCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = iCode;
+  } else {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //intra_chroma_pred_mode
+    if (uiCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = uiCode;
+  }
+
+  if (-1 == pCurDqLayer->pChromaPredMode[iMbXy]
+      || CheckIntraChromaPredMode (uiNeighAvail, &pCurDqLayer->pChromaPredMode[iMbXy])) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t ParseIntra16x16Mode (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, PBitStringAux pBs,
+                             PDqLayer pCurDqLayer) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  uint8_t uiNeighAvail = 0; //0x07 = 0 1 1 1, means left, top-left, top avail or not. (1: avail, 0: unavail)
+  uint32_t uiCode;
+  int32_t iCode;
+  pCtx->pMap16x16NeighToSampleFunc (pNeighAvail, &uiNeighAvail);
+
+  if (CheckIntra16x16PredMode (uiNeighAvail,
+                               &pCurDqLayer->pIntraPredMode[iMbXy][7])) { //invalid iPredMode, must stop decoding
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I16x16_PRED_MODE);
+  }
+  if (pCtx->pSps->uiChromaFormatIdc == 0)
+    return ERR_NONE;
+
+  if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag) {
+    WELS_READ_VERIFY (ParseIntraPredModeChromaCabac (pCtx, uiNeighAvail, iCode));
+    if (iCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = iCode;
+  } else {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //intra_chroma_pred_mode
+    if (uiCode > MAX_PRED_MODE_ID_CHROMA) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+    pCurDqLayer->pChromaPredMode[iMbXy] = uiCode;
+  }
+  if (-1 == pCurDqLayer->pChromaPredMode[iMbXy]
+      || CheckIntraChromaPredMode (uiNeighAvail, &pCurDqLayer->pChromaPredMode[iMbXy])) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCabacISliceBaseMode0 (PWelsDecoderContext pCtx, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PBitStringAux pBsAux           = pCurDqLayer->pBitStringAux;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+  SWelsNeighAvail sNeighAvail;
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd   = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t i;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpLuma = 0, uiCbpChroma = 0;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+  pCurDqLayer->pResidualPredFlag[iMbXy] = pSlice->sSliceHeaderExt.bDefaultResidualPredFlag;
+  GetNeighborAvailMbType (&sNeighAvail, pCurDqLayer);
+  WELS_READ_VERIFY (ParseMBTypeISliceCabac (pCtx, &sNeighAvail, uiMbType));
+  if (uiMbType > 25) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+  } else if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17
+             && uiMbType <= 24))) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+  } else if (25 == uiMbType) {   //I_PCM
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in I slice!");
+    WELS_READ_VERIFY (ParseIPCMInfoCabac (pCtx));
+    pSlice->iLastDeltaQp = 0;
+    WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+    if (uiEosFlag) {
+      RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+    }
+    return ERR_NONE;
+  } else if (0 == uiMbType) { //I4x4
+    ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+    if (pCtx->pPps->bTransform8x8ModeFlag) {
+      // Transform 8x8 cabac will be added soon
+      WELS_READ_VERIFY (ParseTransformSize8x8FlagCabac (pCtx, &sNeighAvail, pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]));
+    }
+    if (pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+      uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+      pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+      WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, &sNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+    } else {
+      pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+      WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, &sNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+    }
+    //get uiCbp for I4x4
+    WELS_READ_VERIFY (ParseCbpInfoCabac (pCtx, &sNeighAvail, uiCbp));
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    pSlice->iLastDeltaQp = uiCbp == 0 ? 0 : pSlice->iLastDeltaQp;
+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? uiCbp >> 4 : 0;
+    uiCbpLuma = uiCbp & 15;
+  } else { //I16x16;
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+    pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+    pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+    pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+    pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0 ;
+    uiCbpLuma = pCurDqLayer->pCbp[iMbXy] & 15;
+    WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurDqLayer);
+    WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, &sNeighAvail, pBsAux, pCurDqLayer));
+  }
+
+  ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+  pCurDqLayer->pCbfDc[iMbXy] = 0;
+
+  if (pCurDqLayer->pCbp[iMbXy] == 0 && IS_INTRANxN (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 ((pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i]), 0, 51)];
+    }
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (pCurDqLayer->pScaledTCoeff[iMbXy][0]));
+    int32_t iQpDelta, iId8x8, iId4x4;
+    WELS_READ_VERIFY (ParseDeltaQpCabac (pCtx, iQpDelta));
+    if (iQpDelta > 25 || iQpDelta < -26) {//out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 ((pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i]), 0, 51)];
+    }
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      WELS_READ_VERIFY (ParseResidualBlockCabac (&sNeighAvail, pNonZeroCount, pBsAux, 0, 16, g_kuiLumaDcZigzagScan,
+                        I16_LUMA_DC, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx));
+      //step2: Luma AC
+      if (uiCbpLuma) {
+        for (i = 0; i < 16; i++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (&sNeighAvail, pNonZeroCount, pBsAux, i,
+                            iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC,
+                            pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4), pCurDqLayer->pLumaQp[iMbXy], pCtx));
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else { //pNonZeroCount = 0
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        // Transform 8x8 support for CABAC
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            WELS_READ_VERIFY (ParseResidualBlockCabac8x8 (&sNeighAvail, pNonZeroCount, pBsAux, (iId8x8 << 2),
+                              iScanIdxEnd - iScanIdxStart + 1, g_kuiZigzagScan8x8 + iScanIdxStart, LUMA_DC_AC_INTRA_8,
+                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), pCurDqLayer->pLumaQp[iMbXy], pCtx));
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2)]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            int32_t iIdx = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              WELS_READ_VERIFY (ParseResidualBlockCabac (&sNeighAvail, pNonZeroCount, pBsAux, iIdx, iScanIdxEnd - iScanIdxStart + 1,
+                                g_kuiZigzagScan + iScanIdxStart, LUMA_DC_AC_INTRA, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIdx << 4),
+                                pCurDqLayer->pLumaQp[iMbXy], pCtx));
+              iIdx++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2)]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+    int32_t iMbResProperty;
+    //chroma
+    //step1: DC
+    if (1 == uiCbpChroma || 2 == uiCbpChroma) {
+      //Cb Cr
+      for (i = 0; i < 2; i++) {
+        iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        WELS_READ_VERIFY (ParseResidualBlockCabac (&sNeighAvail, pNonZeroCount, pBsAux, 16 + (i << 2), 4, g_kuiChromaDcScan,
+                          iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+      }
+    }
+
+    //step2: AC
+    if (2 == uiCbpChroma) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        int32_t iIdx = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (&sNeighAvail, pNonZeroCount, pBsAux, iIdx,
+                            iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), iMbResProperty,
+                            pCurDqLayer->pScaledTCoeff[iMbXy] + (iIdx << 4), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+          iIdx++;
+        }
+      }
+      ST16 (&pCurDqLayer->pNzc[iMbXy][16], LD16 (&pNonZeroCount[6 + 8 * 1]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5]));
+    } else {
+      ST16 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+      ST16 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+      ST16 (&pCurDqLayer->pNzc[iMbXy][18], 0);
+      ST16 (&pCurDqLayer->pNzc[iMbXy][22], 0);
+    }
+  } else {
+    ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+  }
+
+  WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+  if (uiEosFlag) {
+    RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCabacISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  WELS_READ_VERIFY (WelsDecodeMbCabacISliceBaseMode0 (pCtx, uiEosFlag));
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCabacPSliceBaseMode0 (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PBitStringAux pBsAux           = pCurDqLayer->pBitStringAux;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd   = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t iMbResProperty;
+  int32_t i;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpLuma = 0, uiCbpChroma = 0;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+
+  WELS_READ_VERIFY (ParseMBTypePSliceCabac (pCtx, pNeighAvail, uiMbType));
+  // uiMbType = 4 is not allowded.
+  if (uiMbType < 4) { //Inter mode
+    int16_t pMotionVector[LIST_A][30][MV_A];
+    int16_t pMvdCache[LIST_A][30][MV_A];
+    int8_t  pRefIndex[LIST_A][30];
+    pCurDqLayer->pDec->pMbType[iMbXy] = g_ksInterPMbTypeInfo[uiMbType].iType;
+    WelsFillCacheInterCabac (pNeighAvail, pNonZeroCount, pMotionVector, pMvdCache, pRefIndex, pCurDqLayer);
+    WELS_READ_VERIFY (ParseInterPMotionInfoCabac (pCtx, pNeighAvail, pNonZeroCount, pMotionVector, pMvdCache, pRefIndex));
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+  } else { //Intra mode
+    uiMbType -= 5;
+    if (uiMbType > 25)
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+
+    if (25 == uiMbType) {   //I_PCM
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in P slice!");
+      WELS_READ_VERIFY (ParseIPCMInfoCabac (pCtx));
+      pSlice->iLastDeltaQp = 0;
+      WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+      if (uiEosFlag) {
+        RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+      }
+      return ERR_NONE;
+    } else { //normal Intra mode
+      if (0 == uiMbType) { //Intra4x4
+        ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+        if (pCtx->pPps->bTransform8x8ModeFlag) {
+          WELS_READ_VERIFY (ParseTransformSize8x8FlagCabac (pCtx, pNeighAvail, pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]));
+        }
+        if (pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+          uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+          pCtx->pFillInfoCacheIntraNxNFunc (pNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, pNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+        } else {
+          pCtx->pFillInfoCacheIntraNxNFunc (pNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, pNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+        }
+      } else { //Intra16x16
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+        pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+        pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+        pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+        uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+        uiCbpLuma = pCurDqLayer->pCbp[iMbXy] & 15;
+        WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+        WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, pNeighAvail, pBsAux, pCurDqLayer));
+      }
+    }
+  }
+
+  ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+
+  if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+    WELS_READ_VERIFY (ParseCbpInfoCabac (pCtx, pNeighAvail, uiCbp));
+
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    pSlice->iLastDeltaQp = uiCbp == 0 ? 0 : pSlice->iLastDeltaQp;
+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0 ;
+    uiCbpLuma = pCurDqLayer->pCbp[iMbXy] & 15;
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+
+    if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+      // Need modification when B picutre add in
+      bool bNeedParseTransformSize8x8Flag =
+        (((pCurDqLayer->pDec->pMbType[iMbXy] >= MB_TYPE_16x16 && pCurDqLayer->pDec->pMbType[iMbXy] <= MB_TYPE_8x16)
+          || pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy])
+         && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA8x8)
+         && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA4x4)
+         && ((pCurDqLayer->pCbp[iMbXy] & 0x0F) > 0)
+         && (pCtx->pPps->bTransform8x8ModeFlag));
+
+      if (bNeedParseTransformSize8x8Flag) {
+        WELS_READ_VERIFY (ParseTransformSize8x8FlagCabac (pCtx, pNeighAvail,
+                          pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy])); //transform_size_8x8_flag
+      }
+    }
+
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (pCurDqLayer->pScaledTCoeff[iMbXy][0]));
+
+    int32_t iQpDelta, iId8x8, iId4x4;
+
+    WELS_READ_VERIFY (ParseDeltaQpCabac (pCtx, iQpDelta));
+    if (iQpDelta > 25 || iQpDelta < -26) { //out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, 0, 16, g_kuiLumaDcZigzagScan,
+                        I16_LUMA_DC, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx));
+      //step2: Luma AC
+      if (uiCbpLuma) {
+        for (i = 0; i < 16; i++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, i, iScanIdxEnd - WELS_MAX (iScanIdxStart,
+                            1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4),
+                            pCurDqLayer->pLumaQp[iMbXy], pCtx));
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        // Transform 8x8 support for CABAC
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            WELS_READ_VERIFY (ParseResidualBlockCabac8x8 (pNeighAvail, pNonZeroCount, pBsAux, (iId8x8 << 2),
+                              iScanIdxEnd - iScanIdxStart + 1, g_kuiZigzagScan8x8 + iScanIdxStart,
+                              IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8,
+                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), pCurDqLayer->pLumaQp[iMbXy], pCtx));
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2)]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            int32_t iIdx = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, iIdx, iScanIdxEnd - iScanIdxStart + 1,
+                                g_kuiZigzagScan + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIdx << 4),
+                                pCurDqLayer->pLumaQp[iMbXy],
+                                pCtx));
+              iIdx++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+
+    //chroma
+    //step1: DC
+    if (1 == uiCbpChroma || 2 == uiCbpChroma) {
+      for (i = 0; i < 2; i++) {
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        else
+          iMbResProperty = i ? CHROMA_DC_V_INTER : CHROMA_DC_U_INTER;
+
+        WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, 16 + (i << 2), 4, g_kuiChromaDcScan,
+                          iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+      }
+    }
+    //step2: AC
+    if (2 == uiCbpChroma) {
+      for (i = 0; i < 2; i++) {
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        else
+          iMbResProperty = i ? CHROMA_AC_V_INTER : CHROMA_AC_U_INTER;
+        int32_t index = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, index,
+                            iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
+                            iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (index << 4), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+          index++;
+        }
+      }
+      ST16 (&pCurDqLayer->pNzc[iMbXy][16], LD16 (&pNonZeroCount[6 + 8 * 1]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5]));
+    } else {
+      ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+      ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+    }
+  } else {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+  }
+
+  WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+  if (uiEosFlag) {
+    RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCabacBSliceBaseMode0 (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PBitStringAux pBsAux = pCurDqLayer->pBitStringAux;
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t iMbResProperty;
+  int32_t i;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpLuma = 0, uiCbpChroma = 0;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+
+  WELS_READ_VERIFY (ParseMBTypeBSliceCabac (pCtx, pNeighAvail, uiMbType));
+
+  if (uiMbType < 23) { //Inter B mode
+    int16_t pMotionVector[LIST_A][30][MV_A];
+    int16_t pMvdCache[LIST_A][30][MV_A];
+    int8_t  pRefIndex[LIST_A][30];
+    int8_t  pDirect[30];
+    pCurDqLayer->pDec->pMbType[iMbXy] = g_ksInterBMbTypeInfo[uiMbType].iType;
+    WelsFillCacheInterCabac (pNeighAvail, pNonZeroCount, pMotionVector, pMvdCache, pRefIndex, pCurDqLayer);
+    WelsFillDirectCacheCabac (pNeighAvail, pDirect, pCurDqLayer);
+    WELS_READ_VERIFY (ParseInterBMotionInfoCabac (pCtx, pNeighAvail, pNonZeroCount, pMotionVector, pMvdCache, pRefIndex,
+                      pDirect));
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+  } else { //Intra mode
+    uiMbType -= 23;
+    if (uiMbType > 25)
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+
+    if (25 == uiMbType) {   //I_PCM
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in B slice!");
+      WELS_READ_VERIFY (ParseIPCMInfoCabac (pCtx));
+      pSlice->iLastDeltaQp = 0;
+      WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+      if (uiEosFlag) {
+        RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+      }
+      return ERR_NONE;
+    } else { //normal Intra mode
+      if (0 == uiMbType) { //Intra4x4
+        ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+        if (pCtx->pPps->bTransform8x8ModeFlag) {
+          WELS_READ_VERIFY (ParseTransformSize8x8FlagCabac (pCtx, pNeighAvail, pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]));
+        }
+        if (pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+          uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+          pCtx->pFillInfoCacheIntraNxNFunc (pNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, pNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+        } else {
+          pCtx->pFillInfoCacheIntraNxNFunc (pNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, pNeighAvail, pIntraPredMode, pBsAux, pCurDqLayer));
+        }
+      } else { //Intra16x16
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+        pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+        pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+        pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+        uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+        uiCbpLuma = pCurDqLayer->pCbp[iMbXy] & 15;
+        WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+        WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, pNeighAvail, pBsAux, pCurDqLayer));
+      }
+    }
+  }
+
+  ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+  ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+
+  if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+    WELS_READ_VERIFY (ParseCbpInfoCabac (pCtx, pNeighAvail, uiCbp));
+
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    pSlice->iLastDeltaQp = uiCbp == 0 ? 0 : pSlice->iLastDeltaQp;
+    uiCbpChroma = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+    uiCbpLuma = pCurDqLayer->pCbp[iMbXy] & 15;
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+
+    if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+      // Need modification when B picutre add in
+      bool bNeedParseTransformSize8x8Flag =
+        (((IS_INTER_16x16 (pCurDqLayer->pDec->pMbType[iMbXy]) || IS_DIRECT (pCurDqLayer->pDec->pMbType[iMbXy])
+           || IS_INTER_16x8 (pCurDqLayer->pDec->pMbType[iMbXy]) || IS_INTER_8x16 (pCurDqLayer->pDec->pMbType[iMbXy]))
+          || pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy])
+         && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA8x8)
+         && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA4x4)
+         && ((pCurDqLayer->pCbp[iMbXy] & 0x0F) > 0)
+         && (pCtx->pPps->bTransform8x8ModeFlag));
+
+      if (bNeedParseTransformSize8x8Flag) {
+        WELS_READ_VERIFY (ParseTransformSize8x8FlagCabac (pCtx, pNeighAvail,
+                          pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy])); //transform_size_8x8_flag
+      }
+    }
+
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (pCurDqLayer->pScaledTCoeff[iMbXy][0]));
+
+    int32_t iQpDelta, iId8x8, iId4x4;
+
+    WELS_READ_VERIFY (ParseDeltaQpCabac (pCtx, iQpDelta));
+    if (iQpDelta > 25 || iQpDelta < -26) { //out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, 0, 16, g_kuiLumaDcZigzagScan,
+                        I16_LUMA_DC, pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx));
+      //step2: Luma AC
+      if (uiCbpLuma) {
+        for (i = 0; i < 16; i++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, i, iScanIdxEnd - WELS_MAX (iScanIdxStart,
+                            1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4),
+                            pCurDqLayer->pLumaQp[iMbXy], pCtx));
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCtx->pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        // Transform 8x8 support for CABAC
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            WELS_READ_VERIFY (ParseResidualBlockCabac8x8 (pNeighAvail, pNonZeroCount, pBsAux, (iId8x8 << 2),
+                              iScanIdxEnd - iScanIdxStart + 1, g_kuiZigzagScan8x8 + iScanIdxStart,
+                              IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8,
+                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), pCurDqLayer->pLumaQp[iMbXy], pCtx));
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2)]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpLuma & (1 << iId8x8)) {
+            int32_t iIdx = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, iIdx, iScanIdxEnd - iScanIdxStart + 1,
+                                g_kuiZigzagScan + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIdx << 4),
+                                pCurDqLayer->pLumaQp[iMbXy],
+                                pCtx));
+              iIdx++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kCacheNzcScanIdx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32 (&pCurDqLayer->pNzc[iMbXy][0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32 (&pCurDqLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+
+    //chroma
+    //step1: DC
+    if (1 == uiCbpChroma || 2 == uiCbpChroma) {
+      for (i = 0; i < 2; i++) {
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        else
+          iMbResProperty = i ? CHROMA_DC_V_INTER : CHROMA_DC_U_INTER;
+
+        WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, 16 + (i << 2), 4, g_kuiChromaDcScan,
+                          iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+      }
+    }
+    //step2: AC
+    if (2 == uiCbpChroma) {
+      for (i = 0; i < 2; i++) {
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        else
+          iMbResProperty = i ? CHROMA_AC_V_INTER : CHROMA_AC_U_INTER;
+        int32_t index = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          WELS_READ_VERIFY (ParseResidualBlockCabac (pNeighAvail, pNonZeroCount, pBsAux, index,
+                            iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
+                            iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (index << 4), pCurDqLayer->pChromaQp[iMbXy][i], pCtx));
+          index++;
+        }
+      }
+      ST16 (&pCurDqLayer->pNzc[iMbXy][16], LD16 (&pNonZeroCount[6 + 8 * 1]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4]));
+      ST16 (&pCurDqLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5]));
+    } else {
+      ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+      ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+    }
+  } else {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+  }
+
+  WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+  if (uiEosFlag) {
+    RestoreCabacDecEngineToBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux);
+  }
+
+  return ERR_NONE;
+}
+
+
+int32_t WelsDecodeMbCabacPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPic = pCtx->sRefPic.pRefList[LIST_0];
+  uint32_t uiCode;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t i;
+  SWelsNeighAvail uiNeighAvail;
+  pCurDqLayer->pCbp[iMbXy] = 0;
+  pCurDqLayer->pCbfDc[iMbXy] = 0;
+  pCurDqLayer->pChromaPredMode[iMbXy] = C_PRED_DC;
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  GetNeighborAvailMbType (&uiNeighAvail, pCurDqLayer);
+  WELS_READ_VERIFY (ParseSkipFlagCabac (pCtx, &uiNeighAvail, uiCode));
+
+  if (uiCode) {
+    int16_t pMv[2] = {0};
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_SKIP;
+    ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    memset (pCurDqLayer->pDec->pRefIndex[0][iMbXy], 0, sizeof (int8_t) * 16);
+    bool bIsPending = GetThreadCount (pCtx) > 1;
+    pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[0] && (ppRefPic[0]->bIsComplete
+                            || bIsPending));
+    //predict mv
+    PredPSkipMvFromNeighbor (pCurDqLayer, pMv);
+    for (i = 0; i < 16; i++) {
+      ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][i], * (uint32_t*)pMv);
+      ST32 (pCurDqLayer->pMvd[0][iMbXy][i], 0);
+    }
+
+    //if (!pSlice->sSliceHeaderExt.bDefaultResidualPredFlag) {
+    //  memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (int16_t));
+    //}
+
+    //reset rS
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp; //??????????????? dqaunt of previous mb
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+
+    //for neighboring CABAC usage
+    pSlice->iLastDeltaQp = 0;
+
+    WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+
+    return ERR_NONE;
+  }
+
+  WELS_READ_VERIFY (WelsDecodeMbCabacPSliceBaseMode0 (pCtx, &uiNeighAvail, uiEosFlag));
+  return ERR_NONE;
+}
+
+
+int32_t WelsDecodeMbCabacBSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPicL0 = pCtx->sRefPic.pRefList[LIST_0];
+  PPicture* ppRefPicL1 = pCtx->sRefPic.pRefList[LIST_1];
+  uint32_t uiCode;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t i;
+  SWelsNeighAvail uiNeighAvail;
+  pCurDqLayer->pCbp[iMbXy] = 0;
+  pCurDqLayer->pCbfDc[iMbXy] = 0;
+  pCurDqLayer->pChromaPredMode[iMbXy] = C_PRED_DC;
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  GetNeighborAvailMbType (&uiNeighAvail, pCurDqLayer);
+  WELS_READ_VERIFY (ParseSkipFlagCabac (pCtx, &uiNeighAvail, uiCode));
+
+  memset (pCurDqLayer->pDirect[iMbXy], 0, sizeof (int8_t) * 16);
+
+  bool bIsPending = GetThreadCount (pCtx) > 1;
+
+  if (uiCode) {
+    int16_t pMv[LIST_A][2] = { {0, 0}, { 0, 0 } };
+    int8_t  ref[LIST_A] = { 0 };
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_SKIP | MB_TYPE_DIRECT;
+    ST32 (&pCurDqLayer->pNzc[iMbXy][0], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][4], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][8], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][12], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][16], 0);
+    ST32 (&pCurDqLayer->pNzc[iMbXy][20], 0);
+
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    memset (pCurDqLayer->pDec->pRefIndex[LIST_0][iMbXy], 0, sizeof (int8_t) * 16);
+    memset (pCurDqLayer->pDec->pRefIndex[LIST_1][iMbXy], 0, sizeof (int8_t) * 16);
+    pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPicL0[0] && (ppRefPicL0[0]->bIsComplete
+                            || bIsPending)) || ! (ppRefPicL1[0] && (ppRefPicL1[0]->bIsComplete || bIsPending));
+
+    if (pCtx->bMbRefConcealed) {
+      SLogContext* pLogCtx = & (pCtx->sLogCtx);
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "Ref Picture for B-Slice is lost, B-Slice decoding cannot be continued!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+    }
+
+    SubMbType subMbType;
+    if (pSliceHeader->iDirectSpatialMvPredFlag) {
+
+      //predict direct spatial mv
+      int32_t ret = PredMvBDirectSpatial (pCtx, pMv, ref, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    } else {
+      //temporal direct mode
+      int32_t ret = PredBDirectTemporal (pCtx, pMv, ref, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    }
+
+
+    //reset rS
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp; //??????????????? dqaunt of previous mb
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+
+    //for neighboring CABAC usage
+    pSlice->iLastDeltaQp = 0;
+
+    WELS_READ_VERIFY (ParseEndOfSliceCabac (pCtx, uiEosFlag));
+
+    return ERR_NONE;
+  }
+
+  WELS_READ_VERIFY (WelsDecodeMbCabacBSliceBaseMode0 (pCtx, &uiNeighAvail, uiEosFlag));
+  return ERR_NONE;
+}
+
+// Calculate deqaunt coeff scaling list value
+int32_t  WelsCalcDeqCoeffScalingList (PWelsDecoderContext pCtx) {
+  if (pCtx->pSps->bSeqScalingMatrixPresentFlag || pCtx->pPps->bPicScalingMatrixPresentFlag) {
+    pCtx->bUseScalingList = true;
+
+    if (!pCtx->bDequantCoeff4x4Init || (pCtx->iDequantCoeffPpsid != pCtx->pPps->iPpsId)) {
+      int i, q, x, y;
+      //Init dequant coeff value for different QP
+      for (i = 0; i < 6; i++) {
+        pCtx->pDequant_coeff4x4[i] = pCtx->pDequant_coeff_buffer4x4[i];
+        pCtx->pDequant_coeff8x8[i] = pCtx->pDequant_coeff_buffer8x8[i];
+        for (q = 0; q < 51; q++) {
+          for (x = 0; x < 16; x++) {
+            pCtx->pDequant_coeff4x4[i][q][x] = pCtx->pPps->bPicScalingMatrixPresentFlag ? pCtx->pPps->iScalingList4x4[i][x] *
+                                               g_kuiDequantCoeff[q][x & 0x07] : pCtx->pSps->iScalingList4x4[i][x] * g_kuiDequantCoeff[q][x & 0x07];
+          }
+          for (y = 0; y < 64; y++) {
+            pCtx->pDequant_coeff8x8[i][q][y] = pCtx->pPps->bPicScalingMatrixPresentFlag ? pCtx->pPps->iScalingList8x8[i][y] *
+                                               g_kuiMatrixV[q % 6][y / 8][y % 8] : pCtx->pSps->iScalingList8x8[i][y] * g_kuiMatrixV[q % 6][y / 8][y % 8];
+          }
+        }
+      }
+      pCtx->bDequantCoeff4x4Init = true;
+      pCtx->iDequantCoeffPpsid = pCtx->pPps->iPpsId;
+    }
+  } else
+    pCtx->bUseScalingList = false;
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeSlice (PWelsDecoderContext pCtx, bool bFirstSliceInLayer, PNalUnit pNalCur) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PFmo pFmo = pCtx->pFmo;
+  int32_t iRet;
+  int32_t iNextMbXyIndex, iSliceIdc;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeaderExt pSliceHeaderExt = &pSlice->sSliceHeaderExt;
+  PSliceHeader pSliceHeader = &pSliceHeaderExt->sSliceHeader;
+  int32_t iMbX, iMbY;
+  const int32_t kiCountNumMb = pSliceHeader->pSps->uiTotalMbCount; //need to be correct when fmo or multi slice
+  uint32_t uiEosFlag = 0;
+  PWelsDecMbFunc pDecMbFunc;
+
+  pSlice->iTotalMbInCurSlice = 0; //initialize at the starting of slice decoding.
+
+  if (pCtx->pPps->bEntropyCodingModeFlag) {
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag ||
+        pSlice->sSliceHeaderExt.bAdaptiveBaseModeFlag ||
+        pSlice->sSliceHeaderExt.bAdaptiveResidualPredFlag) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+               "WelsDecodeSlice()::::ILP flag exist, not supported with CABAC enabled!");
+      pCtx->iErrorCode |= dsBitstreamError;
+      return dsBitstreamError;
+    }
+    if (P_SLICE == pSliceHeader->eSliceType)
+      pDecMbFunc = WelsDecodeMbCabacPSlice;
+    else if (B_SLICE == pSliceHeader->eSliceType)
+      pDecMbFunc = WelsDecodeMbCabacBSlice;
+    else //I_SLICE. B_SLICE is being supported
+      pDecMbFunc = WelsDecodeMbCabacISlice;
+  } else {
+    if (P_SLICE == pSliceHeader->eSliceType) {
+      pDecMbFunc = WelsDecodeMbCavlcPSlice;
+    } else if (B_SLICE == pSliceHeader->eSliceType) {
+      pDecMbFunc = WelsDecodeMbCavlcBSlice;
+    } else { //I_SLICE
+      pDecMbFunc = WelsDecodeMbCavlcISlice;
+    }
+  }
+
+  if (pSliceHeader->pPps->bConstainedIntraPredFlag) {
+    pCtx->pFillInfoCacheIntraNxNFunc = WelsFillCacheConstrain1IntraNxN;
+    pCtx->pMapNxNNeighToSampleFunc    = WelsMapNxNNeighToSampleConstrain1;
+    pCtx->pMap16x16NeighToSampleFunc  = WelsMap16x16NeighToSampleConstrain1;
+  } else {
+    pCtx->pFillInfoCacheIntraNxNFunc = WelsFillCacheConstrain0IntraNxN;
+    pCtx->pMapNxNNeighToSampleFunc    = WelsMapNxNNeighToSampleNormal;
+    pCtx->pMap16x16NeighToSampleFunc  = WelsMap16x16NeighToSampleNormal;
+  }
+
+  pCtx->eSliceType = pSliceHeader->eSliceType;
+  if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag == 1) {
+    int32_t iQp = pSlice->sSliceHeaderExt.sSliceHeader.iSliceQp;
+    int32_t iCabacInitIdc = pSlice->sSliceHeaderExt.sSliceHeader.iCabacInitIdc;
+    WelsCabacContextInit (pCtx, pSlice->eSliceType, iCabacInitIdc, iQp);
+    //InitCabacCtx (pCtx->pCabacCtx, pSlice->eSliceType, iCabacInitIdc, iQp);
+    pSlice->iLastDeltaQp = 0;
+    WELS_READ_VERIFY (InitCabacDecEngineFromBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux));
+  }
+  //try to calculate  the dequant_coeff
+  WelsCalcDeqCoeffScalingList (pCtx);
+
+  iNextMbXyIndex = pSliceHeader->iFirstMbInSlice;
+  iMbX = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+  iMbY = iNextMbXyIndex / pCurDqLayer->iMbWidth; // error is introduced by multiple slices case, 11/23/2009
+  pSlice->iMbSkipRun = -1;
+  iSliceIdc = (pSliceHeader->iFirstMbInSlice << 7) + pCurDqLayer->uiLayerDqId;
+
+  pCurDqLayer->iMbX =  iMbX;
+  pCurDqLayer->iMbY = iMbY;
+  pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+
+  do {
+    if ((-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)) { // slice group boundary or end of a frame
+      break;
+    }
+
+    pCurDqLayer->pSliceIdc[iNextMbXyIndex] = iSliceIdc;
+    pCtx->bMbRefConcealed = false;
+    iRet = pDecMbFunc (pCtx,  pNalCur, uiEosFlag);
+    pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] = pCtx->bMbRefConcealed;
+    if (iRet != ERR_NONE) {
+      return iRet;
+    }
+
+    ++pSlice->iTotalMbInCurSlice;
+    if (uiEosFlag) { //end of slice
+      break;
+    }
+    if (pSliceHeader->pPps->uiNumSliceGroups > 1) {
+      iNextMbXyIndex = FmoNextMb (pFmo, iNextMbXyIndex);
+    } else {
+      ++iNextMbXyIndex;
+    }
+    iMbX = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+    iMbY = iNextMbXyIndex / pCurDqLayer->iMbWidth;
+    pCurDqLayer->iMbX =  iMbX;
+    pCurDqLayer->iMbY = iMbY;
+    pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+  } while (1);
+
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeAndConstructSlice (PWelsDecoderContext pCtx) {
+  PNalUnit pNalCur = pCtx->pNalCur;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PFmo pFmo = pCtx->pFmo;
+  int32_t iRet;
+  int32_t iNextMbXyIndex, iSliceIdc;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeaderExt pSliceHeaderExt = &pSlice->sSliceHeaderExt;
+  PSliceHeader pSliceHeader = &pSliceHeaderExt->sSliceHeader;
+  int32_t iMbX, iMbY;
+  const int32_t kiCountNumMb = pSliceHeader->pSps->uiTotalMbCount; //need to be correct when fmo or multi slice
+  int32_t iTotalMbTargetLayer = kiCountNumMb;
+  uint32_t uiEosFlag = 0;
+  PWelsDecMbFunc pDecMbFunc;
+
+  pSlice->iTotalMbInCurSlice = 0; //initialize at the starting of slice decoding.
+
+  if (pCtx->pPps->bEntropyCodingModeFlag) {
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag ||
+        pSlice->sSliceHeaderExt.bAdaptiveBaseModeFlag ||
+        pSlice->sSliceHeaderExt.bAdaptiveResidualPredFlag) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+               "WelsDecodeSlice()::::ILP flag exist, not supported with CABAC enabled!");
+      pCtx->iErrorCode |= dsBitstreamError;
+      return dsBitstreamError;
+    }
+    if (P_SLICE == pSliceHeader->eSliceType)
+      pDecMbFunc = WelsDecodeMbCabacPSlice;
+    else if (B_SLICE == pSliceHeader->eSliceType)
+      pDecMbFunc = WelsDecodeMbCabacBSlice;
+    else //I_SLICE. B_SLICE is being supported
+      pDecMbFunc = WelsDecodeMbCabacISlice;
+  } else {
+    if (P_SLICE == pSliceHeader->eSliceType) {
+      pDecMbFunc = WelsDecodeMbCavlcPSlice;
+    } else if (B_SLICE == pSliceHeader->eSliceType) {
+      pDecMbFunc = WelsDecodeMbCavlcBSlice;
+    } else { //I_SLICE
+      pDecMbFunc = WelsDecodeMbCavlcISlice;
+    }
+  }
+
+  if (pSliceHeader->pPps->bConstainedIntraPredFlag) {
+    pCtx->pFillInfoCacheIntraNxNFunc = WelsFillCacheConstrain1IntraNxN;
+    pCtx->pMapNxNNeighToSampleFunc = WelsMapNxNNeighToSampleConstrain1;
+    pCtx->pMap16x16NeighToSampleFunc = WelsMap16x16NeighToSampleConstrain1;
+  } else {
+    pCtx->pFillInfoCacheIntraNxNFunc = WelsFillCacheConstrain0IntraNxN;
+    pCtx->pMapNxNNeighToSampleFunc = WelsMapNxNNeighToSampleNormal;
+    pCtx->pMap16x16NeighToSampleFunc = WelsMap16x16NeighToSampleNormal;
+  }
+
+  pCtx->eSliceType = pSliceHeader->eSliceType;
+  if (pCurDqLayer->sLayerInfo.pPps->bEntropyCodingModeFlag == 1) {
+    int32_t iQp = pSlice->sSliceHeaderExt.sSliceHeader.iSliceQp;
+    int32_t iCabacInitIdc = pSlice->sSliceHeaderExt.sSliceHeader.iCabacInitIdc;
+    WelsCabacContextInit (pCtx, pSlice->eSliceType, iCabacInitIdc, iQp);
+    //InitCabacCtx (pCtx->pCabacCtx, pSlice->eSliceType, iCabacInitIdc, iQp);
+    pSlice->iLastDeltaQp = 0;
+    WELS_READ_VERIFY (InitCabacDecEngineFromBS (pCtx->pCabacDecEngine, pCtx->pCurDqLayer->pBitStringAux));
+  }
+  //try to calculate  the dequant_coeff
+  WelsCalcDeqCoeffScalingList (pCtx);
+
+  iNextMbXyIndex = pSliceHeader->iFirstMbInSlice;
+  iMbX = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+  iMbY = iNextMbXyIndex / pCurDqLayer->iMbWidth; // error is introduced by multiple slices case, 11/23/2009
+  pSlice->iMbSkipRun = -1;
+  iSliceIdc = (pSliceHeader->iFirstMbInSlice << 7) + pCurDqLayer->uiLayerDqId;
+
+  pCurDqLayer->iMbX = iMbX;
+  pCurDqLayer->iMbY = iMbY;
+  pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+
+  PDeblockingFilterMbFunc pDeblockMb = WelsDeblockingMb;
+
+  SDeblockingFilter pFilter;
+  int32_t iFilterIdc = 1;
+  if (pSliceHeader->uiDisableDeblockingFilterIdc != 1) {
+    WelsDeblockingInitFilter (pCtx, pFilter, iFilterIdc);
+  }
+
+  do {
+    if ((-1 == iNextMbXyIndex) || (iNextMbXyIndex >= kiCountNumMb)) { // slice group boundary or end of a frame
+      break;
+    }
+
+    pCurDqLayer->pSliceIdc[iNextMbXyIndex] = iSliceIdc;
+    pCtx->bMbRefConcealed = false;
+    iRet = pDecMbFunc (pCtx, pNalCur, uiEosFlag);
+    pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] = pCtx->bMbRefConcealed;
+    if (iRet != ERR_NONE) {
+      return iRet;
+    }
+    if (WelsTargetMbConstruction (pCtx)) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+               "WelsTargetSliceConstruction():::MB(%d, %d) construction error. pCurSlice_type:%d",
+               pCurDqLayer->iMbX, pCurDqLayer->iMbY, pSlice->eSliceType);
+
+      return ERR_INFO_MB_RECON_FAIL;
+    }
+    memcpy (pCtx->pDec->pNzc[pCurDqLayer->iMbXyIndex], pCurDqLayer->pNzc[pCurDqLayer->iMbXyIndex], 24);
+    if (pCtx->eSliceType != I_SLICE) {
+      pCtx->sBlockFunc.pWelsSetNonZeroCountFunc (
+        pCtx->pDec->pNzc[pCurDqLayer->iMbXyIndex]); // set all none-zero nzc to 1; dbk can be opti!
+    }
+    WelsDeblockingFilterMB (pCurDqLayer, pFilter, iFilterIdc, pDeblockMb);
+    if (pCtx->uiNalRefIdc > 0) {
+      if (pCurDqLayer->iMbX == 0 || pCurDqLayer->iMbX == pCurDqLayer->iMbWidth - 1 || pCurDqLayer->iMbY == 0
+          || pCurDqLayer->iMbY == pCurDqLayer->iMbHeight - 1) {
+        PadMBLuma_c (pCurDqLayer->pDec->pData[0], pCurDqLayer->pDec->iLinesize[0], pCurDqLayer->pDec->iWidthInPixel,
+                     pCurDqLayer->pDec->iHeightInPixel, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth, pCurDqLayer->iMbHeight);
+        PadMBChroma_c (pCurDqLayer->pDec->pData[1], pCurDqLayer->pDec->iLinesize[1], pCurDqLayer->pDec->iWidthInPixel / 2,
+                       pCurDqLayer->pDec->iHeightInPixel / 2, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth,
+                       pCurDqLayer->iMbHeight);
+        PadMBChroma_c (pCurDqLayer->pDec->pData[2], pCurDqLayer->pDec->iLinesize[2], pCurDqLayer->pDec->iWidthInPixel / 2,
+                       pCurDqLayer->pDec->iHeightInPixel / 2, pCurDqLayer->iMbX, pCurDqLayer->iMbY, pCurDqLayer->iMbWidth,
+                       pCurDqLayer->iMbHeight);
+      }
+    }
+    if (!pCurDqLayer->pMbCorrectlyDecodedFlag[iNextMbXyIndex]) { //already con-ed, overwrite
+      pCurDqLayer->pMbCorrectlyDecodedFlag[iNextMbXyIndex] = true;
+      pCtx->pDec->iMbEcedPropNum += (pCurDqLayer->pMbRefConcealedFlag[iNextMbXyIndex] ? 1 : 0);
+      ++pCtx->iTotalNumMbRec;
+    }
+
+    if (pCtx->iTotalNumMbRec > iTotalMbTargetLayer) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+               "WelsTargetSliceConstruction():::pCtx->iTotalNumMbRec:%d, iTotalMbTargetLayer:%d",
+               pCtx->iTotalNumMbRec, iTotalMbTargetLayer);
+
+      return ERR_INFO_MB_NUM_EXCEED_FAIL;
+    }
+
+    ++pSlice->iTotalMbInCurSlice;
+    if (uiEosFlag) { //end of slice
+      SET_EVENT (&pCtx->pDec->pReadyEvent[pCurDqLayer->iMbY]);
+      break;
+    }
+    if (pSliceHeader->pPps->uiNumSliceGroups > 1) {
+      iNextMbXyIndex = FmoNextMb (pFmo, iNextMbXyIndex);
+    } else {
+      ++iNextMbXyIndex;
+    }
+    int32_t iLastMby = iMbY;
+    int32_t iLastMbx = iMbX;
+    iMbX = iNextMbXyIndex % pCurDqLayer->iMbWidth;
+    iMbY = iNextMbXyIndex / pCurDqLayer->iMbWidth;
+    pCurDqLayer->iMbX = iMbX;
+    pCurDqLayer->iMbY = iMbY;
+    pCurDqLayer->iMbXyIndex = iNextMbXyIndex;
+    if (GetThreadCount (pCtx) > 1) {
+      if ((iMbY > iLastMby) && (iLastMbx == pCurDqLayer->iMbWidth - 1)) {
+        SET_EVENT (&pCtx->pDec->pReadyEvent[iLastMby]);
+      }
+    }
+  } while (1);
+  if (GetThreadCount (pCtx) > 1) {
+    SET_EVENT (&pCtx->pDec->pReadyEvent[pCurDqLayer->iMbY]);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) {
+  SVlcTable* pVlcTable     = pCtx->pVlcTable;
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PBitStringAux pBs              = pCurDqLayer->pBitStringAux;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+
+  SWelsNeighAvail sNeighAvail;
+  int32_t iMbResProperty;
+
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd   = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  const int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int32_t i;
+  int32_t iRet = ERR_NONE;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0;
+  uint32_t uiCode;
+  int32_t iCode;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+  GetNeighborAvailMbType (&sNeighAvail, pCurDqLayer);
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+  pCurDqLayer->pResidualPredFlag[iMbXy] = pSlice->sSliceHeaderExt.bDefaultResidualPredFlag;
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //uiMbType
+  uiMbType = uiCode;
+  if (uiMbType > 25)
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+  if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+
+  if (25 == uiMbType) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in I slice!");
+    int32_t iDecStrideL = pCurDqLayer->pDec->iLinesize[0];
+    int32_t iDecStrideC = pCurDqLayer->pDec->iLinesize[1];
+
+    int32_t iOffsetL = (iMbX + iMbY * iDecStrideL) << 4;
+    int32_t iOffsetC = (iMbX + iMbY * iDecStrideC) << 3;
+
+    uint8_t* pDecY = pCurDqLayer->pDec->pData[0] + iOffsetL;
+    uint8_t* pDecU = pCurDqLayer->pDec->pData[1] + iOffsetC;
+    uint8_t* pDecV = pCurDqLayer->pDec->pData[2] + iOffsetC;
+
+    uint8_t* pTmpBsBuf;
+
+
+    int32_t i;
+    int32_t iCopySizeY  = (sizeof (uint8_t) << 4);
+    int32_t iCopySizeUV = (sizeof (uint8_t) << 3);
+
+    int32_t iIndex = ((-pBs->iLeftBits) >> 3) + 2;
+
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA_PCM;
+
+    //step 1: locating bit-stream pointer [must align into integer byte]
+    pBs->pCurBuf -= iIndex;
+
+    //step 2: copy pixel from bit-stream into fdec [reconstruction]
+    pTmpBsBuf = pBs->pCurBuf;
+    if (!pCtx->pParam->bParseOnly) {
+      for (i = 0; i < 16; i++) { //luma
+        memcpy (pDecY, pTmpBsBuf, iCopySizeY);
+        pDecY += iDecStrideL;
+        pTmpBsBuf += 16;
+      }
+      for (i = 0; i < 8; i++) { //cb
+        memcpy (pDecU, pTmpBsBuf, iCopySizeUV);
+        pDecU += iDecStrideC;
+        pTmpBsBuf += 8;
+      }
+      for (i = 0; i < 8; i++) { //cr
+        memcpy (pDecV, pTmpBsBuf, iCopySizeUV);
+        pDecV += iDecStrideC;
+        pTmpBsBuf += 8;
+      }
+    }
+
+    pBs->pCurBuf += 384;
+
+    //step 3: update QP and pNonZeroCount
+    pCurDqLayer->pLumaQp[iMbXy] = 0;
+    memset (pCurDqLayer->pChromaQp[iMbXy], 0, sizeof (pCurDqLayer->pChromaQp[iMbXy]));
+    memset (pNzc, 16, sizeof (pCurDqLayer->pNzc[iMbXy]));   //Rec. 9.2.1 for PCM, nzc=16
+    WELS_READ_VERIFY (InitReadBits (pBs, 0));
+    return ERR_NONE;
+  } else if (0 == uiMbType) { //reference to JM
+    ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+    if (pCtx->pPps->bTransform8x8ModeFlag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //transform_size_8x8_flag
+      pCurDqLayer->pTransformSize8x8Flag[iMbXy] = !!uiCode;
+      if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+      }
+    }
+    if (!pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+      pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+      WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+    } else {
+      pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+      WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+    }
+
+    //uiCbp
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //coded_block_pattern
+    uiCbp = uiCode;
+    //G.9.1 Alternative parsing process for coded pBlock pattern
+    if (pCtx->pSps->uiChromaFormatIdc && (uiCbp > 47))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+    if (!pCtx->pSps->uiChromaFormatIdc && (uiCbp > 15))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+
+    if (pCtx->pSps->uiChromaFormatIdc)
+      uiCbp = g_kuiIntra4x4CbpTable[uiCbp];
+    else
+      uiCbp = g_kuiIntra4x4CbpTable400[uiCbp];
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    uiCbpC = uiCbp >> 4;
+    uiCbpL = uiCbp & 15;
+  } else { //I_PCM exclude, we can ignore it
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+    pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+    pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+    pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+    pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+    uiCbpC = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+    uiCbpL = pCurDqLayer->pCbp[iMbXy] & 15;
+    WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurDqLayer);
+    WELS_READ_VERIFY (ParseIntra16x16Mode (pCtx, &sNeighAvail, pBs, pCurDqLayer));
+  }
+
+  ST32A4 (&pNzc[0], 0);
+  ST32A4 (&pNzc[4], 0);
+  ST32A4 (&pNzc[8], 0);
+  ST32A4 (&pNzc[12], 0);
+  ST32A4 (&pNzc[16], 0);
+  ST32A4 (&pNzc[20], 0);
+
+  if (pCurDqLayer->pCbp[iMbXy] == 0 && IS_INTRANxN (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (pCurDqLayer->pScaledTCoeff[iMbXy][0]));
+    int32_t iQpDelta, iId8x8, iId4x4;
+
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mb_qp_delta
+    iQpDelta = iCode;
+
+    if (iQpDelta > 25 || iQpDelta < -26) { //out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0,
+                                         51)];
+    }
+
+
+    BsStartCavlc (pBs);
+
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 0, 16, g_kuiLumaDcZigzagScan, I16_LUMA_DC,
+                                          pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+        return iRet;//abnormal
+      }
+      //step2: Luma AC
+      if (uiCbpL) {
+        for (i = 0; i < 16; i++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, i, iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1,
+                                              g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4),
+                                              pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              if ((iRet = WelsResidualBlockCavlc8x8 (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                     g_kuiZigzagScan8x8 + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), iId4x4,
+                                                     pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else {
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                  g_kuiZigzagScan + iScanIdxStart, LUMA_DC_AC_INTRA, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                                  pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;//abnormal
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2)]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+
+    //chroma
+    //step1: DC
+    if (1 == uiCbpC || 2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 16 + (i << 2), 4, g_kuiChromaDcScan, iMbResProperty,
+                                            pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+          return iRet;//abnormal
+        }
+      }
+    }
+
+    //step2: AC
+    if (2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        int32_t iIndex = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - WELS_MAX (iScanIdxStart,
+                                              1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), iMbResProperty,
+                                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                              pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+          iIndex++;
+        }
+      }
+      ST16A2 (&pNzc[16], LD16A2 (&pNonZeroCount[6 + 8 * 1]));
+      ST16A2 (&pNzc[20], LD16A2 (&pNonZeroCount[6 + 8 * 2]));
+      ST16A2 (&pNzc[18], LD16A2 (&pNonZeroCount[6 + 8 * 4]));
+      ST16A2 (&pNzc[22], LD16A2 (&pNonZeroCount[6 + 8 * 5]));
+    }
+    BsEndCavlc (pBs);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCavlcISlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PBitStringAux pBs = pCurDqLayer->pBitStringAux;
+  PSliceHeaderExt pSliceHeaderExt = &pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt;
+  int32_t iBaseModeFlag;
+  int32_t iRet = 0; //should have the return value to indicate decoding error or not, It's NECESSARY--2010.4.15
+  uint32_t uiCode;
+  intX_t iUsedBits;
+  if (pSliceHeaderExt->bAdaptiveBaseModeFlag == 1) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //base_mode_flag
+    iBaseModeFlag = uiCode;
+  } else {
+    iBaseModeFlag = pSliceHeaderExt->bDefaultBaseModeFlag;
+  }
+  if (!iBaseModeFlag) {
+    iRet = WelsActualDecodeMbCavlcISlice (pCtx);
+  } else {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.",
+             iBaseModeFlag);
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP);
+  }
+  if (iRet) { //occur error when parsing, MUST STOP decoding
+    return iRet;
+  }
+
+  // check whether there is left bits to read next time in case multiple slices
+  iUsedBits = ((pBs->pCurBuf - pBs->pStartBuf) << 3) - (16 - pBs->iLeftBits);
+  // sub 1, for stop bit
+  if ((iUsedBits == (pBs->iBits - 1)) && (0 >= pCurDqLayer->sLayerInfo.sSliceInLayer.iMbSkipRun)) { // slice boundary
+    uiEosFlag = 1;
+  }
+  if (iUsedBits > (pBs->iBits -
+                   1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash.
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%" PRId64 " > pBs->iBits:%d, MUST stop decoding.",
+             (int64_t) iUsedBits, pBs->iBits);
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_BS_INCOMPLETE);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) {
+  SVlcTable* pVlcTable     = pCtx->pVlcTable;
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PBitStringAux pBs              = pCurDqLayer->pBitStringAux;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd   = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+
+  SWelsNeighAvail sNeighAvail;
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  const int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int32_t i;
+  int32_t iRet = ERR_NONE;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0;
+  uint32_t uiCode;
+  int32_t iCode;
+  int32_t iMbResProperty;
+
+  GetNeighborAvailMbType (&sNeighAvail, pCurDqLayer);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;//2009.10.23
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //uiMbType
+  uiMbType = uiCode;
+  if (uiMbType < 5) { //inter MB type
+    int16_t iMotionVector[LIST_A][30][MV_A];
+    int8_t  iRefIndex[LIST_A][30];
+    pCurDqLayer->pDec->pMbType[iMbXy] = g_ksInterPMbTypeInfo[uiMbType].iType;
+    WelsFillCacheInter (&sNeighAvail, pNonZeroCount, iMotionVector, iRefIndex, pCurDqLayer);
+
+    if ((iRet = ParseInterInfo (pCtx, iMotionVector, iRefIndex, pBs)) != ERR_NONE) {
+      return iRet;//abnormal
+    }
+
+    if (pSlice->sSliceHeaderExt.bAdaptiveResidualPredFlag == 1) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //residual_prediction_flag
+      pCurDqLayer->pResidualPredFlag[iMbXy] =  uiCode;
+    } else {
+      pCurDqLayer->pResidualPredFlag[iMbXy] = pSlice->sSliceHeaderExt.bDefaultResidualPredFlag;
+    }
+
+    if (pCurDqLayer->pResidualPredFlag[iMbXy] == 0) {
+      pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.");
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+    }
+  } else { //intra MB type
+    uiMbType -= 5;
+    if (uiMbType > 25)
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+
+    if (25 == uiMbType) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in P slice!");
+      int32_t iDecStrideL = pCurDqLayer->pDec->iLinesize[0];
+      int32_t iDecStrideC = pCurDqLayer->pDec->iLinesize[1];
+
+      int32_t iOffsetL = (iMbX + iMbY * iDecStrideL) << 4;
+      int32_t iOffsetC = (iMbX + iMbY * iDecStrideC) << 3;
+
+      uint8_t* pDecY = pCurDqLayer->pDec->pData[0] + iOffsetL;
+      uint8_t* pDecU = pCurDqLayer->pDec->pData[1] + iOffsetC;
+      uint8_t* pDecV = pCurDqLayer->pDec->pData[2] + iOffsetC;
+
+      uint8_t* pTmpBsBuf;
+
+      int32_t i;
+      int32_t iCopySizeY  = (sizeof (uint8_t) << 4);
+      int32_t iCopySizeUV = (sizeof (uint8_t) << 3);
+
+      int32_t iIndex = ((-pBs->iLeftBits) >> 3) + 2;
+
+      pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA_PCM;
+
+      //step 1: locating bit-stream pointer [must align into integer byte]
+      pBs->pCurBuf -= iIndex;
+
+      //step 2: copy pixel from bit-stream into fdec [reconstruction]
+      pTmpBsBuf = pBs->pCurBuf;
+      if (!pCtx->pParam->bParseOnly) {
+        for (i = 0; i < 16; i++) { //luma
+          memcpy (pDecY, pTmpBsBuf, iCopySizeY);
+          pDecY += iDecStrideL;
+          pTmpBsBuf += 16;
+        }
+
+        for (i = 0; i < 8; i++) { //cb
+          memcpy (pDecU, pTmpBsBuf, iCopySizeUV);
+          pDecU += iDecStrideC;
+          pTmpBsBuf += 8;
+        }
+        for (i = 0; i < 8; i++) { //cr
+          memcpy (pDecV, pTmpBsBuf, iCopySizeUV);
+          pDecV += iDecStrideC;
+          pTmpBsBuf += 8;
+        }
+      }
+
+      pBs->pCurBuf += 384;
+
+      //step 3: update QP and pNonZeroCount
+      pCurDqLayer->pLumaQp[iMbXy] = 0;
+      pCurDqLayer->pChromaQp[iMbXy][0] = pCurDqLayer->pChromaQp[iMbXy][1] = 0;
+      //Rec. 9.2.1 for PCM, nzc=16
+      ST32A4 (&pNzc[0], 0x10101010);
+      ST32A4 (&pNzc[4], 0x10101010);
+      ST32A4 (&pNzc[8], 0x10101010);
+      ST32A4 (&pNzc[12], 0x10101010);
+      ST32A4 (&pNzc[16], 0x10101010);
+      ST32A4 (&pNzc[20], 0x10101010);
+      WELS_READ_VERIFY (InitReadBits (pBs, 0));
+      return ERR_NONE;
+    } else {
+      if (0 == uiMbType) {
+        ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+        if (pCtx->pPps->bTransform8x8ModeFlag) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //transform_size_8x8_flag
+          pCurDqLayer->pTransformSize8x8Flag[iMbXy] = !!uiCode;
+          if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+            uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+          }
+        }
+        if (!pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+          pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+        } else {
+          pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+        }
+      } else { //I_PCM exclude, we can ignore it
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+        pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+        pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+        pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+        uiCbpC = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+        uiCbpL = pCurDqLayer->pCbp[iMbXy] & 15;
+        WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurDqLayer);
+        if ((iRet = ParseIntra16x16Mode (pCtx, &sNeighAvail, pBs, pCurDqLayer)) != ERR_NONE) {
+          return iRet;
+        }
+      }
+    }
+  }
+
+  if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //coded_block_pattern
+    uiCbp = uiCode;
+    {
+      if (pCtx->pSps->uiChromaFormatIdc && (uiCbp > 47))
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+      if (!pCtx->pSps->uiChromaFormatIdc && (uiCbp > 15))
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+      if (MB_TYPE_INTRA4x4 == pCurDqLayer->pDec->pMbType[iMbXy] || MB_TYPE_INTRA8x8 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+
+        uiCbp = pCtx->pSps->uiChromaFormatIdc ? g_kuiIntra4x4CbpTable[uiCbp] : g_kuiIntra4x4CbpTable400[uiCbp];
+      } else //inter
+        uiCbp = pCtx->pSps->uiChromaFormatIdc ?  g_kuiInterCbpTable[uiCbp] : g_kuiInterCbpTable400[uiCbp];
+    }
+
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    uiCbpC = pCurDqLayer->pCbp[iMbXy] >> 4;
+    uiCbpL = pCurDqLayer->pCbp[iMbXy] & 15;
+
+    // Need modification when B picutre add in
+    bool bNeedParseTransformSize8x8Flag =
+      (((pCurDqLayer->pDec->pMbType[iMbXy] >= MB_TYPE_16x16 && pCurDqLayer->pDec->pMbType[iMbXy] <= MB_TYPE_8x16)
+        || pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy])
+       && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA8x8)
+       && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA4x4)
+       && (uiCbpL > 0)
+       && (pCtx->pPps->bTransform8x8ModeFlag));
+
+    if (bNeedParseTransformSize8x8Flag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //transform_size_8x8_flag
+      pCurDqLayer->pTransformSize8x8Flag[iMbXy] = !!uiCode;
+    }
+  }
+
+  ST32A4 (&pNzc[0], 0);
+  ST32A4 (&pNzc[4], 0);
+  ST32A4 (&pNzc[8], 0);
+  ST32A4 (&pNzc[12], 0);
+  ST32A4 (&pNzc[16], 0);
+  ST32A4 (&pNzc[20], 0);
+  if (pCurDqLayer->pCbp[iMbXy] == 0 && !IS_INTRA16x16 (pCurDqLayer->pDec->pMbType[iMbXy])
+      && !IS_I_BL (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+    int32_t iQpDelta, iId8x8, iId4x4;
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, MB_COEFF_LIST_SIZE * sizeof (int16_t));
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mb_qp_delta
+    iQpDelta = iCode;
+
+    if (iQpDelta > 25 || iQpDelta < -26) { //out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0,
+                                         51)];
+    }
+
+    BsStartCavlc (pBs);
+
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 0, 16, g_kuiLumaDcZigzagScan, I16_LUMA_DC,
+                                          pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+        return iRet;//abnormal
+      }
+      //step2: Luma AC
+      if (uiCbpL) {
+        for (i = 0; i < 16; i++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, i, iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1,
+                                              g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4),
+                                              pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              if ((iRet = WelsResidualBlockCavlc8x8 (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                     g_kuiZigzagScan8x8 + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), iId4x4,
+                                                     pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else { // Normal T4x4
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                  g_kuiZigzagScan + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                                  pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;//abnormal
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+
+
+    //chroma
+    //step1: DC
+    if (1 == uiCbpC || 2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        else
+          iMbResProperty = i ? CHROMA_DC_V_INTER : CHROMA_DC_U_INTER;
+
+        if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 16 + (i << 2), 4, g_kuiChromaDcScan, iMbResProperty,
+                                            pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+          return iRet;//abnormal
+        }
+      }
+    } else {
+    }
+    //step2: AC
+    if (2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        else
+          iMbResProperty = i ? CHROMA_AC_V_INTER : CHROMA_AC_U_INTER;
+
+        int32_t iIndex = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - WELS_MAX (iScanIdxStart,
+                                              1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), iMbResProperty,
+                                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                              pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+          iIndex++;
+        }
+      }
+      ST16A2 (&pNzc[16], LD16A2 (&pNonZeroCount[6 + 8 * 1]));
+      ST16A2 (&pNzc[20], LD16A2 (&pNonZeroCount[6 + 8 * 2]));
+      ST16A2 (&pNzc[18], LD16A2 (&pNonZeroCount[6 + 8 * 4]));
+      ST16A2 (&pNzc[22], LD16A2 (&pNonZeroCount[6 + 8 * 5]));
+    }
+    BsEndCavlc (pBs);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCavlcPSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer             = pCtx->pCurDqLayer;
+  PBitStringAux pBs              = pCurDqLayer->pBitStringAux;
+  PSlice pSlice                  = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPic = pCtx->sRefPic.pRefList[LIST_0];
+  intX_t iUsedBits;
+  const int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int32_t iBaseModeFlag, i;
+  int32_t iRet = 0; //should have the return value to indicate decoding error or not, It's NECESSARY--2010.4.15
+  uint32_t uiCode;
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  if (-1 == pSlice->iMbSkipRun) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //mb_skip_run
+    pSlice->iMbSkipRun = uiCode;
+    if (-1 == pSlice->iMbSkipRun) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_SKIP_RUN);
+    }
+  }
+  if (pSlice->iMbSkipRun--) {
+    int16_t iMv[2];
+
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_SKIP;
+    ST32A4 (&pNzc[0], 0);
+    ST32A4 (&pNzc[4], 0);
+    ST32A4 (&pNzc[8], 0);
+    ST32A4 (&pNzc[12], 0);
+    ST32A4 (&pNzc[16], 0);
+    ST32A4 (&pNzc[20], 0);
+
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    memset (pCurDqLayer->pDec->pRefIndex[0][iMbXy], 0, sizeof (int8_t) * 16);
+    bool bIsPending = GetThreadCount (pCtx) > 1;
+    pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[0] && (ppRefPic[0]->bIsComplete
+                            || bIsPending));
+    //predict iMv
+    PredPSkipMvFromNeighbor (pCurDqLayer, iMv);
+    for (i = 0; i < 16; i++) {
+      ST32A2 (pCurDqLayer->pDec->pMv[0][iMbXy][i], * (uint32_t*)iMv);
+    }
+
+    //if (!pSlice->sSliceHeaderExt.bDefaultResidualPredFlag) {
+    //  memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (int16_t));
+    //}
+
+    //reset rS
+    if (!pSlice->sSliceHeaderExt.bDefaultResidualPredFlag ||
+        (pNalCur->sNalHeaderExt.uiQualityId == 0 && pNalCur->sNalHeaderExt.uiDependencyId == 0)) {
+      pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+      for (i = 0; i < 2; i++) {
+        pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                           pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+      }
+    }
+
+    pCurDqLayer->pCbp[iMbXy] = 0;
+  } else {
+    if (pSlice->sSliceHeaderExt.bAdaptiveBaseModeFlag == 1) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //base_mode_flag
+      iBaseModeFlag = uiCode;
+    } else {
+      iBaseModeFlag = pSlice->sSliceHeaderExt.bDefaultBaseModeFlag;
+    }
+    if (!iBaseModeFlag) {
+      iRet = WelsActualDecodeMbCavlcPSlice (pCtx);
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.",
+               iBaseModeFlag);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP);
+    }
+    if (iRet) { //occur error when parsing, MUST STOP decoding
+      return iRet;
+    }
+  }
+  // check whether there is left bits to read next time in case multiple slices
+  iUsedBits = ((pBs->pCurBuf - pBs->pStartBuf) << 3) - (16 - pBs->iLeftBits);
+  // sub 1, for stop bit
+  if ((iUsedBits == (pBs->iBits - 1)) && (0 >= pCurDqLayer->sLayerInfo.sSliceInLayer.iMbSkipRun)) { // slice boundary
+    uiEosFlag = 1;
+  }
+  if (iUsedBits > (pBs->iBits -
+                   1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash.
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "WelsDecodeMbCavlcISlice()::::pBs incomplete, iUsedBits:%" PRId64 " > pBs->iBits:%d, MUST stop decoding.",
+             (int64_t) iUsedBits, pBs->iBits);
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_BS_INCOMPLETE);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsDecodeMbCavlcBSlice (PWelsDecoderContext pCtx, PNalUnit pNalCur, uint32_t& uiEosFlag) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PBitStringAux pBs = pCurDqLayer->pBitStringAux;
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPicL0 = pCtx->sRefPic.pRefList[LIST_0];
+  PPicture* ppRefPicL1 = pCtx->sRefPic.pRefList[LIST_1];
+  intX_t iUsedBits;
+  const int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int32_t iBaseModeFlag, i;
+  int32_t iRet = 0; //should have the return value to indicate decoding error or not, It's NECESSARY--2010.4.15
+  uint32_t uiCode;
+
+  pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+  pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+
+  if (-1 == pSlice->iMbSkipRun) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //mb_skip_run
+    pSlice->iMbSkipRun = uiCode;
+    if (-1 == pSlice->iMbSkipRun) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_SKIP_RUN);
+    }
+  }
+  if (pSlice->iMbSkipRun--) {
+    int16_t iMv[LIST_A][2] = { { 0, 0 }, { 0, 0 } };
+    int8_t  ref[LIST_A] = { 0 };
+
+    pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_SKIP | MB_TYPE_DIRECT;
+    ST32A4 (&pNzc[0], 0);
+    ST32A4 (&pNzc[4], 0);
+    ST32A4 (&pNzc[8], 0);
+    ST32A4 (&pNzc[12], 0);
+    ST32A4 (&pNzc[16], 0);
+    ST32A4 (&pNzc[20], 0);
+
+    pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    memset (pCurDqLayer->pDec->pRefIndex[LIST_0][iMbXy], 0, sizeof (int8_t) * 16);
+    memset (pCurDqLayer->pDec->pRefIndex[LIST_1][iMbXy], 0, sizeof (int8_t) * 16);
+    bool bIsPending = GetThreadCount (pCtx) > 1;
+    pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPicL0[0] && (ppRefPicL0[0]->bIsComplete
+                            || bIsPending)) || ! (ppRefPicL1[0] && (ppRefPicL1[0]->bIsComplete || bIsPending));
+
+    /*if (pCtx->bMbRefConcealed) {
+      SLogContext* pLogCtx = & (pCtx->sLogCtx);
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "Ref Picture for B-Slice is lost, B-Slice decoding cannot be continued!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+    }*/
+    //predict iMv
+    SubMbType subMbType;
+    if (pSliceHeader->iDirectSpatialMvPredFlag) {
+
+      //predict direct spatial mv
+      int32_t ret = PredMvBDirectSpatial (pCtx, iMv, ref, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    } else {
+      //temporal direct mode
+      int32_t ret = PredBDirectTemporal (pCtx, iMv, ref, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    }
+
+    //if (!pSlice->sSliceHeaderExt.bDefaultResidualPredFlag) {
+    //  memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (int16_t));
+    //}
+
+    //reset rS
+    if (!pSlice->sSliceHeaderExt.bDefaultResidualPredFlag ||
+        (pNalCur->sNalHeaderExt.uiQualityId == 0 && pNalCur->sNalHeaderExt.uiDependencyId == 0)) {
+      pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+      for (i = 0; i < 2; i++) {
+        pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                           pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+      }
+    }
+
+    pCurDqLayer->pCbp[iMbXy] = 0;
+  } else {
+    if (pSlice->sSliceHeaderExt.bAdaptiveBaseModeFlag == 1) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //base_mode_flag
+      iBaseModeFlag = uiCode;
+    } else {
+      iBaseModeFlag = pSlice->sSliceHeaderExt.bDefaultBaseModeFlag;
+    }
+    if (!iBaseModeFlag) {
+      iRet = WelsActualDecodeMbCavlcBSlice (pCtx);
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "iBaseModeFlag (%d) != 0, inter-layer prediction not supported.",
+               iBaseModeFlag);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP);
+    }
+    if (iRet) { //occur error when parsing, MUST STOP decoding
+      return iRet;
+    }
+  }
+  // check whether there is left bits to read next time in case multiple slices
+  iUsedBits = ((pBs->pCurBuf - pBs->pStartBuf) << 3) - (16 - pBs->iLeftBits);
+  // sub 1, for stop bit
+  if ((iUsedBits == (pBs->iBits - 1)) && (0 >= pCurDqLayer->sLayerInfo.sSliceInLayer.iMbSkipRun)) { // slice boundary
+    uiEosFlag = 1;
+  }
+  if (iUsedBits > (pBs->iBits -
+                   1)) { //When BS incomplete, as long as find it, SHOULD stop decoding to avoid mosaic or crash.
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "WelsDecodeMbCavlcBSlice()::::pBs incomplete, iUsedBits:%" PRId64 " > pBs->iBits:%d, MUST stop decoding.",
+             (int64_t)iUsedBits, pBs->iBits);
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_BS_INCOMPLETE);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsActualDecodeMbCavlcBSlice (PWelsDecoderContext pCtx) {
+  SVlcTable* pVlcTable = pCtx->pVlcTable;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PBitStringAux pBs = pCurDqLayer->pBitStringAux;
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+
+  int32_t iScanIdxStart = pSlice->sSliceHeaderExt.uiScanIdxStart;
+  int32_t iScanIdxEnd = pSlice->sSliceHeaderExt.uiScanIdxEnd;
+
+  SWelsNeighAvail sNeighAvail;
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  const int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int8_t* pNzc = pCurDqLayer->pNzc[iMbXy];
+  int32_t i;
+  int32_t iRet = ERR_NONE;
+  uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0;
+  uint32_t uiCode;
+  int32_t iCode;
+  int32_t iMbResProperty;
+
+  GetNeighborAvailMbType (&sNeighAvail, pCurDqLayer);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, pNonZeroCount, 48, 16);
+  pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;//2009.10.23
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //uiMbType
+  uiMbType = uiCode;
+  if (uiMbType < 23) { //inter MB type
+    int16_t iMotionVector[LIST_A][30][MV_A];
+    int8_t  iRefIndex[LIST_A][30];
+    pCurDqLayer->pDec->pMbType[iMbXy] = g_ksInterBMbTypeInfo[uiMbType].iType;
+    WelsFillCacheInter (&sNeighAvail, pNonZeroCount, iMotionVector, iRefIndex, pCurDqLayer);
+
+    if ((iRet = ParseInterBInfo (pCtx, iMotionVector, iRefIndex, pBs)) != ERR_NONE) {
+      return iRet;//abnormal
+    }
+
+    if (pSlice->sSliceHeaderExt.bAdaptiveResidualPredFlag == 1) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //residual_prediction_flag
+      pCurDqLayer->pResidualPredFlag[iMbXy] = uiCode;
+    } else {
+      pCurDqLayer->pResidualPredFlag[iMbXy] = pSlice->sSliceHeaderExt.bDefaultResidualPredFlag;
+    }
+
+    if (pCurDqLayer->pResidualPredFlag[iMbXy] == 0) {
+      pCurDqLayer->pInterPredictionDoneFlag[iMbXy] = 0;
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.");
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+    }
+  } else { //intra MB type
+    uiMbType -= 23;
+    if (uiMbType > 25)
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+    if (!pCtx->pSps->uiChromaFormatIdc && ((uiMbType >= 5 && uiMbType <= 12) || (uiMbType >= 17 && uiMbType <= 24)))
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_MB_TYPE);
+
+    if (25 == uiMbType) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "I_PCM mode exists in B slice!");
+      int32_t iDecStrideL = pCurDqLayer->pDec->iLinesize[0];
+      int32_t iDecStrideC = pCurDqLayer->pDec->iLinesize[1];
+
+      int32_t iOffsetL = (iMbX + iMbY * iDecStrideL) << 4;
+      int32_t iOffsetC = (iMbX + iMbY * iDecStrideC) << 3;
+
+      uint8_t* pDecY = pCurDqLayer->pDec->pData[0] + iOffsetL;
+      uint8_t* pDecU = pCurDqLayer->pDec->pData[1] + iOffsetC;
+      uint8_t* pDecV = pCurDqLayer->pDec->pData[2] + iOffsetC;
+
+      uint8_t* pTmpBsBuf;
+
+      int32_t i;
+      int32_t iCopySizeY = (sizeof (uint8_t) << 4);
+      int32_t iCopySizeUV = (sizeof (uint8_t) << 3);
+
+      int32_t iIndex = ((-pBs->iLeftBits) >> 3) + 2;
+
+      pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA_PCM;
+
+      //step 1: locating bit-stream pointer [must align into integer byte]
+      pBs->pCurBuf -= iIndex;
+
+      //step 2: copy pixel from bit-stream into fdec [reconstruction]
+      pTmpBsBuf = pBs->pCurBuf;
+      if (!pCtx->pParam->bParseOnly) {
+        for (i = 0; i < 16; i++) { //luma
+          memcpy (pDecY, pTmpBsBuf, iCopySizeY);
+          pDecY += iDecStrideL;
+          pTmpBsBuf += 16;
+        }
+
+        for (i = 0; i < 8; i++) { //cb
+          memcpy (pDecU, pTmpBsBuf, iCopySizeUV);
+          pDecU += iDecStrideC;
+          pTmpBsBuf += 8;
+        }
+        for (i = 0; i < 8; i++) { //cr
+          memcpy (pDecV, pTmpBsBuf, iCopySizeUV);
+          pDecV += iDecStrideC;
+          pTmpBsBuf += 8;
+        }
+      }
+
+      pBs->pCurBuf += 384;
+
+      //step 3: update QP and pNonZeroCount
+      pCurDqLayer->pLumaQp[iMbXy] = 0;
+      pCurDqLayer->pChromaQp[iMbXy][0] = pCurDqLayer->pChromaQp[iMbXy][1] = 0;
+      //Rec. 9.2.1 for PCM, nzc=16
+      ST32A4 (&pNzc[0], 0x10101010);
+      ST32A4 (&pNzc[4], 0x10101010);
+      ST32A4 (&pNzc[8], 0x10101010);
+      ST32A4 (&pNzc[12], 0x10101010);
+      ST32A4 (&pNzc[16], 0x10101010);
+      ST32A4 (&pNzc[20], 0x10101010);
+      WELS_READ_VERIFY (InitReadBits (pBs, 0));
+      return ERR_NONE;
+    } else {
+      if (0 == uiMbType) {
+        ENFORCE_STACK_ALIGN_1D (int8_t, pIntraPredMode, 48, 16);
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA4x4;
+        if (pCtx->pPps->bTransform8x8ModeFlag) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //transform_size_8x8_flag
+          pCurDqLayer->pTransformSize8x8Flag[iMbXy] = !!uiCode;
+          if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+            uiMbType = pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA8x8;
+          }
+        }
+        if (!pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+          pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra4x4Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+        } else {
+          pCtx->pFillInfoCacheIntraNxNFunc (&sNeighAvail, pNonZeroCount, pIntraPredMode, pCurDqLayer);
+          WELS_READ_VERIFY (ParseIntra8x8Mode (pCtx, &sNeighAvail, pIntraPredMode, pBs, pCurDqLayer));
+        }
+      } else { //I_PCM exclude, we can ignore it
+        pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
+        pCurDqLayer->pTransformSize8x8Flag[iMbXy] = false;
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = true;
+        pCurDqLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
+        pCurDqLayer->pCbp[iMbXy] = g_kuiI16CbpTable[ (uiMbType - 1) >> 2];
+        uiCbpC = pCtx->pSps->uiChromaFormatIdc ? pCurDqLayer->pCbp[iMbXy] >> 4 : 0;
+        uiCbpL = pCurDqLayer->pCbp[iMbXy] & 15;
+        WelsFillCacheNonZeroCount (&sNeighAvail, pNonZeroCount, pCurDqLayer);
+        if ((iRet = ParseIntra16x16Mode (pCtx, &sNeighAvail, pBs, pCurDqLayer)) != ERR_NONE) {
+          return iRet;
+        }
+      }
+    }
+  }
+
+  if (MB_TYPE_INTRA16x16 != pCurDqLayer->pDec->pMbType[iMbXy]) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //coded_block_pattern
+    uiCbp = uiCode;
+    {
+      if (pCtx->pSps->uiChromaFormatIdc && (uiCbp > 47))
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+      if (!pCtx->pSps->uiChromaFormatIdc && (uiCbp > 15))
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_CBP);
+      if (MB_TYPE_INTRA4x4 == pCurDqLayer->pDec->pMbType[iMbXy] || MB_TYPE_INTRA8x8 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+
+        uiCbp = pCtx->pSps->uiChromaFormatIdc ? g_kuiIntra4x4CbpTable[uiCbp] : g_kuiIntra4x4CbpTable400[uiCbp];
+      } else //inter
+        uiCbp = pCtx->pSps->uiChromaFormatIdc ? g_kuiInterCbpTable[uiCbp] : g_kuiInterCbpTable400[uiCbp];
+    }
+
+    pCurDqLayer->pCbp[iMbXy] = uiCbp;
+    uiCbpC = pCurDqLayer->pCbp[iMbXy] >> 4;
+    uiCbpL = pCurDqLayer->pCbp[iMbXy] & 15;
+
+    // Need modification when B picutre add in
+    bool bNeedParseTransformSize8x8Flag =
+      (((pCurDqLayer->pDec->pMbType[iMbXy] >= MB_TYPE_16x16 && pCurDqLayer->pDec->pMbType[iMbXy] <= MB_TYPE_8x16)
+        || pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy])
+       && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA8x8)
+       && (pCurDqLayer->pDec->pMbType[iMbXy] != MB_TYPE_INTRA4x4)
+       && (uiCbpL > 0)
+       && (pCtx->pPps->bTransform8x8ModeFlag));
+
+    if (bNeedParseTransformSize8x8Flag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //transform_size_8x8_flag
+      pCurDqLayer->pTransformSize8x8Flag[iMbXy] = !!uiCode;
+    }
+  }
+
+  ST32A4 (&pNzc[0], 0);
+  ST32A4 (&pNzc[4], 0);
+  ST32A4 (&pNzc[8], 0);
+  ST32A4 (&pNzc[12], 0);
+  ST32A4 (&pNzc[16], 0);
+  ST32A4 (&pNzc[20], 0);
+  if (pCurDqLayer->pCbp[iMbXy] == 0 && !IS_INTRA16x16 (pCurDqLayer->pDec->pMbType[iMbXy])
+      && !IS_I_BL (pCurDqLayer->pDec->pMbType[iMbXy])) {
+    pCurDqLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pCurDqLayer->pLumaQp[iMbXy] +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0, 51)];
+    }
+  }
+
+  if (pCurDqLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+    int32_t iQpDelta, iId8x8, iId4x4;
+    memset (pCurDqLayer->pScaledTCoeff[iMbXy], 0, MB_COEFF_LIST_SIZE * sizeof (int16_t));
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mb_qp_delta
+    iQpDelta = iCode;
+
+    if (iQpDelta > 25 || iQpDelta < -26) { //out of iQpDelta range
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_QP);
+    }
+
+    pCurDqLayer->pLumaQp[iMbXy] = (pSlice->iLastMbQp + iQpDelta + 52) % 52; //update last_mb_qp
+    pSlice->iLastMbQp = pCurDqLayer->pLumaQp[iMbXy];
+    for (i = 0; i < 2; i++) {
+      pCurDqLayer->pChromaQp[iMbXy][i] = g_kuiChromaQpTable[WELS_CLIP3 (pSlice->iLastMbQp +
+                                         pSliceHeader->pPps->iChromaQpIndexOffset[i], 0,
+                                         51)];
+    }
+
+    BsStartCavlc (pBs);
+
+    if (MB_TYPE_INTRA16x16 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      //step1: Luma DC
+      if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 0, 16, g_kuiLumaDcZigzagScan, I16_LUMA_DC,
+                                          pCurDqLayer->pScaledTCoeff[iMbXy], pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+        return iRet;//abnormal
+      }
+      //step2: Luma AC
+      if (uiCbpL) {
+        for (i = 0; i < 16; i++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, i, iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1,
+                                              g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), I16_LUMA_AC, pCurDqLayer->pScaledTCoeff[iMbXy] + (i << 4),
+                                              pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    } else { //non-MB_TYPE_INTRA16x16
+      if (pCurDqLayer->pTransformSize8x8Flag[iMbXy]) {
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              if ((iRet = WelsResidualBlockCavlc8x8 (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                     g_kuiZigzagScan8x8 + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iId8x8 << 6), iId4x4,
+                                                     pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      } else { // Normal T4x4
+        for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
+          iMbResProperty = (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+          if (uiCbpL & (1 << iId8x8)) {
+            int32_t iIndex = (iId8x8 << 2);
+            for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+              //Luma (DC and AC decoding together)
+              if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - iScanIdxStart + 1,
+                                                  g_kuiZigzagScan + iScanIdxStart, iMbResProperty, pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                                  pCurDqLayer->pLumaQp[iMbXy], pCtx)) != ERR_NONE) {
+                return iRet;//abnormal
+              }
+              iIndex++;
+            }
+          } else {
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[iId8x8 << 2]], 0);
+            ST16 (&pNonZeroCount[g_kuiCache48CountScan4Idx[ (iId8x8 << 2) + 2]], 0);
+          }
+        }
+        ST32A4 (&pNzc[0], LD32 (&pNonZeroCount[1 + 8 * 1]));
+        ST32A4 (&pNzc[4], LD32 (&pNonZeroCount[1 + 8 * 2]));
+        ST32A4 (&pNzc[8], LD32 (&pNonZeroCount[1 + 8 * 3]));
+        ST32A4 (&pNzc[12], LD32 (&pNonZeroCount[1 + 8 * 4]));
+      }
+    }
+
+
+    //chroma
+    //step1: DC
+    if (1 == uiCbpC || 2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_DC_V : CHROMA_DC_U;
+        else
+          iMbResProperty = i ? CHROMA_DC_V_INTER : CHROMA_DC_U_INTER;
+
+        if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 16 + (i << 2), 4, g_kuiChromaDcScan, iMbResProperty,
+                                            pCurDqLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6), pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+          return iRet;//abnormal
+        }
+      }
+    } else {
+    }
+    //step2: AC
+    if (2 == uiCbpC) {
+      for (i = 0; i < 2; i++) { //Cb Cr
+        if (IS_INTRA (pCurDqLayer->pDec->pMbType[iMbXy]))
+          iMbResProperty = i ? CHROMA_AC_V : CHROMA_AC_U;
+        else
+          iMbResProperty = i ? CHROMA_AC_V_INTER : CHROMA_AC_U_INTER;
+
+        int32_t iIndex = 16 + (i << 2);
+        for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
+          if ((iRet = WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex, iScanIdxEnd - WELS_MAX (iScanIdxStart,
+                                              1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1), iMbResProperty,
+                                              pCurDqLayer->pScaledTCoeff[iMbXy] + (iIndex << 4),
+                                              pCurDqLayer->pChromaQp[iMbXy][i], pCtx)) != ERR_NONE) {
+            return iRet;//abnormal
+          }
+          iIndex++;
+        }
+      }
+      ST16A2 (&pNzc[16], LD16A2 (&pNonZeroCount[6 + 8 * 1]));
+      ST16A2 (&pNzc[20], LD16A2 (&pNonZeroCount[6 + 8 * 2]));
+      ST16A2 (&pNzc[18], LD16A2 (&pNonZeroCount[6 + 8 * 4]));
+      ST16A2 (&pNzc[22], LD16A2 (&pNonZeroCount[6 + 8 * 5]));
+    }
+    BsEndCavlc (pBs);
+  }
+
+  return ERR_NONE;
+}
+
+void WelsBlockFuncInit (SBlockFunc*    pFunc,  int32_t iCpu) {
+  pFunc->pWelsSetNonZeroCountFunc   = WelsNonZeroCount_c;
+  pFunc->pWelsBlockZero16x16Func    = WelsBlockZero16x16_c;
+  pFunc->pWelsBlockZero8x8Func      = WelsBlockZero8x8_c;
+
+#ifdef HAVE_NEON
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pWelsSetNonZeroCountFunc = WelsNonZeroCount_neon;
+    pFunc->pWelsBlockZero16x16Func  = WelsBlockZero16x16_neon;
+    pFunc->pWelsBlockZero8x8Func    = WelsBlockZero8x8_neon;
+  }
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pWelsSetNonZeroCountFunc = WelsNonZeroCount_AArch64_neon;
+    pFunc->pWelsBlockZero16x16Func  = WelsBlockZero16x16_AArch64_neon;
+    pFunc->pWelsBlockZero8x8Func    = WelsBlockZero8x8_AArch64_neon;
+  }
+#endif
+
+#if defined(X86_ASM)
+  if (iCpu & WELS_CPU_SSE2) {
+    pFunc->pWelsSetNonZeroCountFunc = WelsNonZeroCount_sse2;
+    pFunc->pWelsBlockZero16x16Func  = WelsBlockZero16x16_sse2;
+    pFunc->pWelsBlockZero8x8Func    = WelsBlockZero8x8_sse2;
+  }
+#endif
+
+}
+
+void WelsBlockInit (int16_t* pBlock, int iW, int iH, int iStride, uint8_t uiVal) {
+  int32_t i;
+  int16_t* pDst = pBlock;
+
+  for (i = 0; i < iH; i++) {
+    memset (pDst, uiVal, iW * sizeof (int16_t));
+    pDst += iStride;
+  }
+}
+void WelsBlockZero16x16_c (int16_t* pBlock, int32_t iStride) {
+  WelsBlockInit (pBlock, 16, 16, iStride, 0);
+}
+
+void WelsBlockZero8x8_c (int16_t* pBlock, int32_t iStride) {
+  WelsBlockInit (pBlock, 8, 8, iStride, 0);
+}
+
+// Compute the temporal-direct scaling factor that's common
+// to all direct MBs in this slice, as per clause 8.4.1.2.3
+// of T-REC H.264 201704
+bool ComputeColocatedTemporalScaling (PWelsDecoderContext pCtx) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PSlice pCurSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pCurSlice->sSliceHeaderExt.sSliceHeader;
+  if (!pSliceHeader->iDirectSpatialMvPredFlag) {
+    uint32_t uiRefCount = pSliceHeader->uiRefCount[LIST_0];
+    if (pCtx->sRefPic.pRefList[LIST_1][0] != NULL) {
+      for (uint32_t i = 0; i < uiRefCount; ++i) {
+        if (pCtx->sRefPic.pRefList[LIST_0][i] != NULL) {
+          const int32_t poc0 = pCtx->sRefPic.pRefList[LIST_0][i]->iFramePoc;
+          const int32_t poc1 = pCtx->sRefPic.pRefList[LIST_1][0]->iFramePoc;
+          const int32_t poc = pSliceHeader->iPicOrderCntLsb;
+          const int32_t td = WELS_CLIP3 (poc1 - poc0, -128, 127);
+          if (td == 0) {
+            pCurSlice->iMvScale[LIST_0][i] = 1 << 8;
+          } else {
+            int32_t tb = WELS_CLIP3 (poc - poc0, -128, 127);
+            int32_t tx = (16384 + (abs (td) >> 1)) / td;
+            pCurSlice->iMvScale[LIST_0][i] = WELS_CLIP3 ((tb * tx + 32) >> 6, -1024, 1023);
+          }
+        }
+      }
+    }
+  }
+  return true;
+}
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder.cpp
new file mode 100644
index 0000000000..d22c276d24
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder.cpp
@@ -0,0 +1,1250 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    decoder.c
+ *
+ * \brief   Interfaces implementation introduced in decoder system architecture
+ *
+ * \date    03/10/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "codec_def.h"
+#include "decoder.h"
+#include "cpu.h"
+#include "au_parser.h"
+#include "get_intra_predictor.h"
+#include "rec_mb.h"
+#include "mc.h"
+#include "decode_mb_aux.h"
+#include "manage_dec_ref.h"
+#include "decoder_core.h"
+#include "deblocking.h"
+#include "expand_pic.h"
+#include "decode_slice.h"
+#include "error_concealment.h"
+#include "memory_align.h"
+#include "wels_decoder_thread.h"
+
+namespace WelsDec {
+
+extern PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const int32_t kiPicHeight);
+
+extern void FreePicture (PPicture pPic, CMemoryAlign* pMa);
+
+static int32_t CreatePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, const int32_t kiSize,
+                              const int32_t kiPicWidth, const int32_t kiPicHeight) {
+
+  PPicBuff pPicBuf = NULL;
+  int32_t iPicIdx = 0;
+  if (kiSize <= 0 || kiPicWidth <= 0 || kiPicHeight <= 0) {
+    return ERR_INFO_INVALID_PARAM;
+  }
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  pPicBuf = (PPicBuff)pMa->WelsMallocz (sizeof (SPicBuff), "PPicBuff");
+
+  if (NULL == pPicBuf) {
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  pPicBuf->ppPic = (PPicture*)pMa->WelsMallocz (kiSize * sizeof (PPicture), "PPicture*");
+
+  if (NULL == pPicBuf->ppPic) {
+    pPicBuf->iCapacity = 0;
+    DestroyPicBuff (pCtx, &pPicBuf, pMa);
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  for (iPicIdx = 0; iPicIdx < kiSize; ++ iPicIdx) {
+    PPicture pPic = AllocPicture (pCtx, kiPicWidth, kiPicHeight);
+    if (NULL == pPic) {
+      // init capacity first for free memory
+      pPicBuf->iCapacity = iPicIdx;
+      DestroyPicBuff (pCtx, &pPicBuf, pMa);
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+    pPicBuf->ppPic[iPicIdx] = pPic;
+  }
+
+// initialize context in queue
+  pPicBuf->iCapacity   = kiSize;
+  pPicBuf->iCurrentIdx = 0;
+  * ppPicBuf           = pPicBuf;
+
+  return ERR_NONE;
+}
+
+static int32_t IncreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, const int32_t kiOldSize,
+                                const int32_t kiPicWidth, const int32_t kiPicHeight, const int32_t kiNewSize) {
+  PPicBuff pPicOldBuf = *ppPicBuf;
+  PPicBuff pPicNewBuf = NULL;
+  int32_t iPicIdx = 0;
+  if (kiOldSize <= 0 || kiNewSize <= 0 || kiPicWidth <= 0 || kiPicHeight <= 0) {
+    return ERR_INFO_INVALID_PARAM;
+  }
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+  pPicNewBuf = (PPicBuff)pMa->WelsMallocz (sizeof (SPicBuff), "PPicBuff");
+
+  if (NULL == pPicNewBuf) {
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  pPicNewBuf->ppPic = (PPicture*)pMa->WelsMallocz (kiNewSize * sizeof (PPicture), "PPicture*");
+
+  if (NULL == pPicNewBuf->ppPic) {
+    pPicNewBuf->iCapacity = 0;
+    DestroyPicBuff (pCtx, &pPicNewBuf, pMa);
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  // increase new PicBuf
+  for (iPicIdx = kiOldSize; iPicIdx < kiNewSize; ++ iPicIdx) {
+    PPicture pPic = AllocPicture (pCtx, kiPicWidth, kiPicHeight);
+    if (NULL == pPic) {
+      // Set maximum capacity as the new malloc memory at the tail
+      pPicNewBuf->iCapacity = iPicIdx;
+      DestroyPicBuff (pCtx, &pPicNewBuf, pMa);
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+    pPicNewBuf->ppPic[iPicIdx] = pPic;
+  }
+
+  // copy old PicBuf to new PicBuf
+  memcpy (pPicNewBuf->ppPic, pPicOldBuf->ppPic, kiOldSize * sizeof (PPicture));
+
+// initialize context in queue
+  pPicNewBuf->iCapacity   = kiNewSize;
+  pPicNewBuf->iCurrentIdx = pPicOldBuf->iCurrentIdx;
+  * ppPicBuf              = pPicNewBuf;
+
+  for (int32_t i = 0; i < pPicNewBuf->iCapacity; i++) {
+    pPicNewBuf->ppPic[i]->bUsedAsRef = false;
+    pPicNewBuf->ppPic[i]->bIsLongRef = false;
+    pPicNewBuf->ppPic[i]->iRefCount = 0;
+    pPicNewBuf->ppPic[i]->bIsComplete = false;
+  }
+// remove old PicBuf
+  if (pPicOldBuf->ppPic != NULL) {
+    pMa->WelsFree (pPicOldBuf->ppPic, "pPicOldBuf->queue");
+    pPicOldBuf->ppPic = NULL;
+  }
+  pPicOldBuf->iCapacity = 0;
+  pPicOldBuf->iCurrentIdx = 0;
+  pMa->WelsFree (pPicOldBuf, "pPicOldBuf");
+  pPicOldBuf = NULL;
+  return ERR_NONE;
+}
+
+static int32_t DecreasePicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, const int32_t kiOldSize,
+                                const int32_t kiPicWidth, const int32_t kiPicHeight, const int32_t kiNewSize) {
+  PPicBuff pPicOldBuf = *ppPicBuf;
+  PPicBuff pPicNewBuf = NULL;
+  int32_t iPicIdx = 0;
+  if (kiOldSize <= 0 || kiNewSize <= 0 || kiPicWidth <= 0 || kiPicHeight <= 0) {
+    return ERR_INFO_INVALID_PARAM;
+  }
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  pPicNewBuf = (PPicBuff)pMa->WelsMallocz (sizeof (SPicBuff), "PPicBuff");
+
+  if (NULL == pPicNewBuf) {
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  pPicNewBuf->ppPic = (PPicture*)pMa->WelsMallocz (kiNewSize * sizeof (PPicture), "PPicture*");
+
+  if (NULL == pPicNewBuf->ppPic) {
+    pPicNewBuf->iCapacity = 0;
+    DestroyPicBuff (pCtx, &pPicNewBuf, pMa);
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  ResetReorderingPictureBuffers (pCtx->pPictReoderingStatus, pCtx->pPictInfoList, false);
+
+  int32_t iPrevPicIdx = -1;
+  for (iPrevPicIdx = 0; iPrevPicIdx < kiOldSize; ++iPrevPicIdx) {
+    if (pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb == pPicOldBuf->ppPic[iPrevPicIdx]) {
+      break;
+    }
+  }
+  int32_t iDelIdx;
+  if (iPrevPicIdx < kiOldSize && iPrevPicIdx >= kiNewSize) {
+    // found pPreviousDecodedPictureInDpb,
+    pPicNewBuf->ppPic[0] = pPicOldBuf->ppPic[iPrevPicIdx];
+    pPicNewBuf->iCurrentIdx = 0;
+    memcpy (pPicNewBuf->ppPic + 1, pPicOldBuf->ppPic, (kiNewSize - 1) * sizeof (PPicture));
+    iDelIdx = kiNewSize - 1;
+  } else {
+    memcpy (pPicNewBuf->ppPic, pPicOldBuf->ppPic, kiNewSize * sizeof (PPicture));
+    pPicNewBuf->iCurrentIdx = iPrevPicIdx < kiNewSize ? iPrevPicIdx : 0;
+    iDelIdx = kiNewSize;
+  }
+
+  //update references due to allocation changes
+  //all references' references have to be reset oss-buzz 14423
+  for (int32_t i = 0; i < kiNewSize; i++) {
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      int32_t j = -1;
+      while (++j < MAX_DPB_COUNT && pPicNewBuf->ppPic[i]->pRefPic[listIdx][j] != NULL) {
+        pPicNewBuf->ppPic[i]->pRefPic[listIdx][j] = NULL;
+      }
+    }
+  }
+
+  for (iPicIdx = iDelIdx; iPicIdx < kiOldSize; iPicIdx++) {
+    if (iPrevPicIdx != iPicIdx) {
+      if (pPicOldBuf->ppPic[iPicIdx] != NULL) {
+        FreePicture (pPicOldBuf->ppPic[iPicIdx], pMa);
+        pPicOldBuf->ppPic[iPicIdx] = NULL;
+      }
+    }
+  }
+
+  // initialize context in queue
+  pPicNewBuf->iCapacity = kiNewSize;
+  * ppPicBuf             = pPicNewBuf;
+
+  for (int32_t i = 0; i < pPicNewBuf->iCapacity; i++) {
+    pPicNewBuf->ppPic[i]->bUsedAsRef = false;
+    pPicNewBuf->ppPic[i]->bIsLongRef = false;
+    pPicNewBuf->ppPic[i]->iRefCount = 0;
+    pPicNewBuf->ppPic[i]->bIsComplete = false;
+  }
+  // remove old PicBuf
+  if (pPicOldBuf->ppPic != NULL) {
+    pMa->WelsFree (pPicOldBuf->ppPic, "pPicOldBuf->queue");
+    pPicOldBuf->ppPic = NULL;
+  }
+  pPicOldBuf->iCapacity = 0;
+  pPicOldBuf->iCurrentIdx = 0;
+  pMa->WelsFree (pPicOldBuf, "pPicOldBuf");
+  pPicOldBuf = NULL;
+
+  return ERR_NONE;
+}
+
+void DestroyPicBuff (PWelsDecoderContext pCtx, PPicBuff* ppPicBuf, CMemoryAlign* pMa) {
+  PPicBuff pPicBuf = NULL;
+
+  ResetReorderingPictureBuffers (pCtx->pPictReoderingStatus, pCtx->pPictInfoList, false);
+  if (pCtx->pDstInfo) pCtx->pDstInfo->iBufferStatus = 0;
+
+  if (NULL == ppPicBuf || NULL == *ppPicBuf)
+    return;
+
+  pPicBuf = *ppPicBuf;
+  while (pPicBuf->ppPic != NULL) {
+    int32_t iPicIdx = 0;
+    while (iPicIdx < pPicBuf->iCapacity) {
+      PPicture pPic = pPicBuf->ppPic[iPicIdx];
+      if (pPic != NULL) {
+        FreePicture (pPic, pMa);
+      }
+      pPic = NULL;
+      ++ iPicIdx;
+    }
+
+    pMa->WelsFree (pPicBuf->ppPic, "pPicBuf->queue");
+
+    pPicBuf->ppPic = NULL;
+  }
+  pPicBuf->iCapacity = 0;
+  pPicBuf->iCurrentIdx = 0;
+
+  pMa->WelsFree (pPicBuf, "pPicBuf");
+
+  pPicBuf = NULL;
+  *ppPicBuf = NULL;
+}
+
+//reset picture reodering buffer list
+void ResetReorderingPictureBuffers (PPictReoderingStatus pPictReoderingStatus, PPictInfo pPictInfo,
+                                    const bool& fullReset) {
+  if (pPictReoderingStatus != NULL && pPictInfo != NULL) {
+    int32_t pictInfoListCount = fullReset ? 16 : (pPictReoderingStatus->iLargestBufferedPicIndex + 1);
+    pPictReoderingStatus->iPictInfoIndex = 0;
+    pPictReoderingStatus->iMinPOC = IMinInt32;
+    pPictReoderingStatus->iNumOfPicts = 0;
+    pPictReoderingStatus->iLastGOPRemainPicts = 0;
+    pPictReoderingStatus->iLastWrittenPOC = IMinInt32;
+    pPictReoderingStatus->iLargestBufferedPicIndex = 0;
+    for (int32_t i = 0; i < pictInfoListCount; ++i) {
+      pPictInfo[i].bLastGOP = false;
+      pPictInfo[i].iPOC = IMinInt32;
+    }
+    pPictInfo->sBufferInfo.iBufferStatus = 0;
+  }
+}
+
+/*
+ * fill data fields in default for decoder context
+ */
+void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) {
+  int32_t iCpuCores               = 1;
+  pCtx->sLogCtx = *pLogCtx;
+
+  pCtx->pArgDec                   = NULL;
+
+  pCtx->bHaveGotMemory            = false;              // not ever request memory blocks for decoder context related
+  pCtx->uiCpuFlag                 = 0;
+
+  pCtx->bAuReadyFlag              = 0;                  // au data is not ready
+  pCtx->bCabacInited = false;
+
+  pCtx->uiCpuFlag = WelsCPUFeatureDetect (&iCpuCores);
+
+  pCtx->iImgWidthInPixel          = 0;
+  pCtx->iImgHeightInPixel         = 0;                  // alloc picture data when picture size is available
+  pCtx->iLastImgWidthInPixel      = 0;
+  pCtx->iLastImgHeightInPixel     = 0;
+  pCtx->bFreezeOutput = true;
+
+  pCtx->iFrameNum                 = -1;
+  pCtx->pLastDecPicInfo->iPrevFrameNum             = -1;
+  pCtx->iErrorCode                = ERR_NONE;
+
+  pCtx->pDec                      = NULL;
+
+  pCtx->pTempDec                  = NULL;
+
+  WelsResetRefPic (pCtx);
+
+  pCtx->iActiveFmoNum             = 0;
+
+  pCtx->pPicBuff          = NULL;
+
+  //pCtx->sSpsPpsCtx.bAvcBasedFlag             = true;
+  pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb = NULL;
+  pCtx->pDecoderStatistics->iAvgLumaQp = -1;
+  pCtx->pDecoderStatistics->iStatisticsLogInterval = 1000;
+  pCtx->bUseScalingList = false;
+  /*pCtx->sSpsPpsCtx.iSpsErrorIgnored = 0;
+  pCtx->sSpsPpsCtx.iSubSpsErrorIgnored = 0;
+  pCtx->sSpsPpsCtx.iPpsErrorIgnored = 0;
+  pCtx->sSpsPpsCtx.iPPSInvalidNum = 0;
+  pCtx->sSpsPpsCtx.iPPSLastInvalidId = -1;
+  pCtx->sSpsPpsCtx.iSPSInvalidNum = 0;
+  pCtx->sSpsPpsCtx.iSPSLastInvalidId = -1;
+  pCtx->sSpsPpsCtx.iSubSPSInvalidNum = 0;
+  pCtx->sSpsPpsCtx.iSubSPSLastInvalidId = -1;
+  */
+  pCtx->iFeedbackNalRefIdc = -1; //initialize
+  pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb = 0;
+  pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb = 0;
+
+}
+
+/*
+* fill data fields in SPS and PPS default for decoder context
+*/
+void WelsDecoderSpsPpsDefaults (SWelsDecoderSpsPpsCTX& sSpsPpsCtx) {
+  sSpsPpsCtx.bSpsExistAheadFlag = false;
+  sSpsPpsCtx.bSubspsExistAheadFlag = false;
+  sSpsPpsCtx.bPpsExistAheadFlag = false;
+  sSpsPpsCtx.bAvcBasedFlag = true;
+  sSpsPpsCtx.iSpsErrorIgnored = 0;
+  sSpsPpsCtx.iSubSpsErrorIgnored = 0;
+  sSpsPpsCtx.iPpsErrorIgnored = 0;
+  sSpsPpsCtx.iPPSInvalidNum = 0;
+  sSpsPpsCtx.iPPSLastInvalidId = -1;
+  sSpsPpsCtx.iSPSInvalidNum = 0;
+  sSpsPpsCtx.iSPSLastInvalidId = -1;
+  sSpsPpsCtx.iSubSPSInvalidNum = 0;
+  sSpsPpsCtx.iSubSPSLastInvalidId = -1;
+  sSpsPpsCtx.iSeqId = -1;
+}
+
+/*
+* fill last decoded picture info
+*/
+void WelsDecoderLastDecPicInfoDefaults (SWelsLastDecPicInfo& sLastDecPicInfo) {
+  sLastDecPicInfo.iPrevPicOrderCntMsb = 0;
+  sLastDecPicInfo.iPrevPicOrderCntLsb = 0;
+  sLastDecPicInfo.pPreviousDecodedPictureInDpb = NULL;
+  sLastDecPicInfo.iPrevFrameNum = -1;
+  sLastDecPicInfo.bLastHasMmco5 = false;
+  sLastDecPicInfo.uiDecodingTimeStamp = 0;
+}
+
+/*!
+* \brief   copy SpsPps from one Ctx to another ctx for threaded code
+*/
+void CopySpsPps (PWelsDecoderContext pFromCtx, PWelsDecoderContext pToCtx) {
+  pToCtx->sSpsPpsCtx = pFromCtx->sSpsPpsCtx;
+  PAccessUnit pFromCurAu = pFromCtx->pAccessUnitList;
+  PSps pTmpLayerSps[MAX_LAYER_NUM];
+  for (int i = 0; i < MAX_LAYER_NUM; i++) {
+    pTmpLayerSps[i] = NULL;
+  }
+  // track the layer sps for the current au
+  for (unsigned int i = pFromCurAu->uiStartPos; i <= pFromCurAu->uiEndPos; i++) {
+    uint32_t uiDid = pFromCurAu->pNalUnitsList[i]->sNalHeaderExt.uiDependencyId;
+    pTmpLayerSps[uiDid] = pFromCurAu->pNalUnitsList[i]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps;
+    for (unsigned int j = 0; j < MAX_SPS_COUNT + 1; ++j) {
+      if (&pFromCtx->sSpsPpsCtx.sSpsBuffer[j] == pTmpLayerSps[uiDid]) {
+        pTmpLayerSps[uiDid] = &pToCtx->sSpsPpsCtx.sSpsBuffer[j];
+        break;
+      }
+    }
+  }
+  for (int i = 0; i < MAX_LAYER_NUM; i++) {
+    if (pTmpLayerSps[i] != NULL) {
+      pToCtx->sSpsPpsCtx.pActiveLayerSps[i] = pTmpLayerSps[i];
+    }
+  }
+}
+
+/*
+ *  destory_mb_blocks
+ */
+
+/*
+ *  get size of reference picture list in target layer incoming, = (iNumRefFrames
+ */
+static inline int32_t GetTargetRefListSize (PWelsDecoderContext pCtx) {
+  int32_t iNumRefFrames = 0;
+  // +2 for EC MV Copy buffer exchange
+  if ((pCtx == NULL) || (pCtx->pSps == NULL)) {
+    iNumRefFrames = MAX_REF_PIC_COUNT + 2;
+  } else {
+    iNumRefFrames = pCtx->pSps->iNumRefFrames + 2;
+    int32_t  iThreadCount = GetThreadCount (pCtx);
+    if (iThreadCount > 1) {
+      iNumRefFrames = MAX_REF_PIC_COUNT;
+    }
+  }
+
+#ifdef LONG_TERM_REF
+  //pic_queue size minimum set 2
+  if (iNumRefFrames < 2) {
+    iNumRefFrames = 2;
+  }
+#endif
+
+  return iNumRefFrames;
+}
+
+/*
+ *  request memory blocks for decoder avc part
+ */
+int32_t WelsRequestMem (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const int32_t kiMbHeight,
+                        bool& bReallocFlag) {
+  const int32_t kiPicWidth      = kiMbWidth << 4;
+  const int32_t kiPicHeight     = kiMbHeight << 4;
+  int32_t iErr = ERR_NONE;
+
+  int32_t iPicQueueSize         = 0;    // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
+  bReallocFlag                  = false;
+  bool  bNeedChangePicQueue     = true;
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pCtx || kiPicWidth <= 0 || kiPicHeight <= 0))
+
+  // Fixed the issue about different gop size over last, 5/17/2010
+  // get picture queue size currently
+  iPicQueueSize = GetTargetRefListSize (pCtx);  // adaptive size of picture queue, = (pSps->iNumRefFrames x 2)
+  pCtx->iPicQueueNumber = iPicQueueSize;
+  if (pCtx->pPicBuff != NULL
+      && pCtx->pPicBuff->iCapacity ==
+      iPicQueueSize) // comparing current picture queue size requested and previous allocation picture queue
+    bNeedChangePicQueue = false;
+  // HD based pic buffer need consider memory size consumed when switch from 720p to other lower size
+  WELS_VERIFY_RETURN_IF (ERR_NONE, pCtx->bHaveGotMemory && (kiPicWidth == pCtx->iImgWidthInPixel
+                         && kiPicHeight == pCtx->iImgHeightInPixel) && (!bNeedChangePicQueue)) // have same scaled buffer
+
+  // sync update pRefList
+  if (GetThreadCount (pCtx) <= 1) {
+    WelsResetRefPic (pCtx); // added to sync update ref list due to pictures are free
+  }
+
+  if (pCtx->bHaveGotMemory && (kiPicWidth == pCtx->iImgWidthInPixel && kiPicHeight == pCtx->iImgHeightInPixel)
+      && pCtx->pPicBuff != NULL && pCtx->pPicBuff->iCapacity != iPicQueueSize) {
+    // currently only active for LIST_0 due to have no B frames
+    // Actually just need one memory allocation for the PicBuff. While it needs two pointer list (LIST_0 and LIST_1).
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+             "WelsRequestMem(): memory re-alloc for no resolution change (size = %d * %d), ref list size change from %d to %d",
+             kiPicWidth, kiPicHeight, pCtx->pPicBuff->iCapacity, iPicQueueSize);
+    if (pCtx->pPicBuff->iCapacity < iPicQueueSize) {
+      iErr = IncreasePicBuff (pCtx, &pCtx->pPicBuff, pCtx->pPicBuff->iCapacity, kiPicWidth, kiPicHeight,
+                              iPicQueueSize);
+    } else {
+      iErr = DecreasePicBuff (pCtx, &pCtx->pPicBuff, pCtx->pPicBuff->iCapacity, kiPicWidth, kiPicHeight,
+                              iPicQueueSize);
+    }
+  } else {
+    if (pCtx->bHaveGotMemory)
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "WelsRequestMem(): memory re-alloc for resolution change, size change from %d * %d to %d * %d, ref list size change from %d to %d",
+               pCtx->iImgWidthInPixel, pCtx->iImgHeightInPixel, kiPicWidth, kiPicHeight, pCtx->pPicBuff->iCapacity,
+               iPicQueueSize);
+    else
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "WelsRequestMem(): memory alloc size = %d * %d, ref list size = %d",
+               kiPicWidth, kiPicHeight, iPicQueueSize);
+    // for Recycled_Pic_Queue
+    PPicBuff* ppPic = &pCtx->pPicBuff;
+    if (NULL != ppPic && NULL != *ppPic) {
+      DestroyPicBuff (pCtx, ppPic, pMa);
+    }
+
+
+    pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb = NULL;
+
+    // currently only active for LIST_0 due to have no B frames
+    iErr = CreatePicBuff (pCtx, &pCtx->pPicBuff, iPicQueueSize, kiPicWidth, kiPicHeight);
+  }
+
+  if (iErr != ERR_NONE)
+    return iErr;
+
+
+  pCtx->iImgWidthInPixel    = kiPicWidth;   // target width of image to be reconstruted while decoding
+  pCtx->iImgHeightInPixel   = kiPicHeight;  // target height of image to be reconstruted while decoding
+
+  pCtx->bHaveGotMemory      = true;         // global memory for decoder context related is requested
+  pCtx->pDec                = NULL;         // need prefetch a new pic due to spatial size changed
+
+  if (pCtx->pCabacDecEngine == NULL)
+    pCtx->pCabacDecEngine = (SWelsCabacDecEngine*) pMa->WelsMallocz (sizeof (SWelsCabacDecEngine), "pCtx->pCabacDecEngine");
+  WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, (NULL == pCtx->pCabacDecEngine))
+
+  bReallocFlag              = true;         // memory re-allocation successfully finished
+  return ERR_NONE;
+}
+
+/*
+ *  free memory dynamically allocated during decoder
+ */
+void WelsFreeDynamicMemory (PWelsDecoderContext pCtx) {
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  //free dq layer memory
+  UninitialDqLayersContext (pCtx);
+
+  //free FMO memory
+  ResetFmoList (pCtx);
+
+  //free ref-pic list & picture memory
+  WelsResetRefPic (pCtx);
+
+  PPicBuff* pPicBuff = &pCtx->pPicBuff;
+  if (NULL != pPicBuff && NULL != *pPicBuff) {
+    DestroyPicBuff (pCtx, pPicBuff, pMa);
+  }
+  if (GetThreadCount (pCtx) > 1) {
+    //prevent from double destruction of PPicBuff
+    PWelsDecoderThreadCTX pThreadCtx = (PWelsDecoderThreadCTX) (pCtx->pThreadCtx);
+    int32_t threadCount = pThreadCtx->sThreadInfo.uiThrMaxNum;
+    int32_t  id = pThreadCtx->sThreadInfo.uiThrNum;
+    for (int32_t i = 0; i < threadCount; ++i) {
+      if (pThreadCtx[i - id].pCtx != NULL) {
+        pThreadCtx[i - id].pCtx->pPicBuff = NULL;
+      }
+    }
+  }
+
+  if (pCtx->pTempDec) {
+    FreePicture (pCtx->pTempDec, pCtx->pMemAlign);
+    pCtx->pTempDec = NULL;
+  }
+
+  // added for safe memory
+  pCtx->iImgWidthInPixel  = 0;
+  pCtx->iImgHeightInPixel = 0;
+  pCtx->iLastImgWidthInPixel  = 0;
+  pCtx->iLastImgHeightInPixel = 0;
+  pCtx->bFreezeOutput = true;
+  pCtx->bHaveGotMemory = false;
+
+  //free CABAC memory
+  pMa->WelsFree (pCtx->pCabacDecEngine, "pCtx->pCabacDecEngine");
+}
+
+/*!
+ * \brief   Open decoder
+ */
+int32_t WelsOpenDecoder (PWelsDecoderContext pCtx, SLogContext* pLogCtx) {
+  int iRet = ERR_NONE;
+  // function pointers
+  InitDecFuncs (pCtx, pCtx->uiCpuFlag);
+
+  // vlc tables
+  InitVlcTable (pCtx->pVlcTable);
+
+  // static memory
+  iRet = WelsInitStaticMemory (pCtx);
+  if (ERR_NONE != iRet) {
+    pCtx->iErrorCode |= dsOutOfMemory;
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitStaticMemory() failed in WelsOpenDecoder().");
+    return iRet;
+  }
+
+#ifdef LONG_TERM_REF
+  pCtx->bParamSetsLostFlag = true;
+#else
+  pCtx->bReferenceLostAtT0Flag = true; // should be true to waiting IDR at incoming AU bits following, 6/4/2010
+#endif //LONG_TERM_REF
+  pCtx->bNewSeqBegin = true;
+  pCtx->bPrintFrameErrorTraceFlag = true;
+  pCtx->iIgnoredErrorInfoPacketCount = 0;
+  pCtx->bFrameFinish = true;
+  return iRet;
+}
+
+/*!
+ * \brief   Close decoder
+ */
+void WelsCloseDecoder (PWelsDecoderContext pCtx) {
+  WelsFreeDynamicMemory (pCtx);
+
+  WelsFreeStaticMemory (pCtx);
+
+#ifdef LONG_TERM_REF
+  pCtx->bParamSetsLostFlag       = false;
+#else
+  pCtx->bReferenceLostAtT0Flag = false;
+#endif
+  pCtx->bNewSeqBegin = false;
+  pCtx->bPrintFrameErrorTraceFlag = false;
+}
+
+/*!
+ * \brief   configure decoder parameters
+ */
+int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpParam) {
+  if (NULL == pCtx || NULL == kpParam)
+    return ERR_INFO_INVALID_PARAM;
+
+  memcpy (pCtx->pParam, kpParam, sizeof (SDecodingParam));
+  if ((pCtx->pParam->eEcActiveIdc > ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)
+      || (pCtx->pParam->eEcActiveIdc < ERROR_CON_DISABLE)) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "eErrorConMethod (%d) not in range: (%d - %d). Set as default value: (%d).", pCtx->pParam->eEcActiveIdc,
+             ERROR_CON_DISABLE, ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE,
+             ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE);
+    pCtx->pParam->eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE;
+  }
+
+  if (pCtx->pParam->bParseOnly) //parse only, disable EC method
+    pCtx->pParam->eEcActiveIdc = ERROR_CON_DISABLE;
+  InitErrorCon (pCtx);
+
+  if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType ||
+      VIDEO_BITSTREAM_AVC == pCtx->pParam->sVideoProperty.eVideoBsType) {
+    pCtx->eVideoType = pCtx->pParam->sVideoProperty.eVideoBsType;
+  } else {
+    pCtx->eVideoType = VIDEO_BITSTREAM_DEFAULT;
+  }
+
+  WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "eVideoType: %d", pCtx->eVideoType);
+
+  return ERR_NONE;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   Initialize Wels decoder parameters and memory
+ *
+ * \param   pCtx input context to be initialized at first stage
+ *
+ * \return  0 - successed
+ * \return  1 - failed
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+int32_t WelsInitDecoder (PWelsDecoderContext pCtx, SLogContext* pLogCtx) {
+  if (pCtx == NULL) {
+    return ERR_INFO_INVALID_PTR;
+  }
+
+  // open decoder
+  return WelsOpenDecoder (pCtx, pLogCtx);
+}
+
+/*!
+ *************************************************************************************
+ * \brief   Uninitialize Wels decoder parameters and memory
+ *
+ * \param   pCtx input context to be uninitialized at release stage
+ *
+ * \return  NONE
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+void WelsEndDecoder (PWelsDecoderContext pCtx) {
+  // close decoder
+  WelsCloseDecoder (pCtx);
+}
+
+void GetVclNalTemporalId (PWelsDecoderContext pCtx) {
+  PAccessUnit pAccessUnit = pCtx->pAccessUnitList;
+  int32_t idx = pAccessUnit->uiStartPos;
+
+  pCtx->iFeedbackVclNalInAu = FEEDBACK_VCL_NAL;
+  pCtx->iFeedbackTidInAu    = pAccessUnit->pNalUnitsList[idx]->sNalHeaderExt.uiTemporalId;
+  pCtx->iFeedbackNalRefIdc  = pAccessUnit->pNalUnitsList[idx]->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   First entrance to decoding core interface.
+ *
+ * \param   pCtx            decoder context
+ * \param   pBufBs          bit streaming buffer
+ * \param   kBsLen          size in bytes length of bit streaming buffer input
+ * \param   ppDst           picture payload data to be output
+ * \param   pDstBufInfo     buf information of ouput data
+ *
+ * \return  0 - successed
+ * \return  1 - failed
+ *
+ * \note    N/A
+ *************************************************************************************
+ */
+int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const int32_t kiBsLen,
+                      uint8_t** ppDst, SBufferInfo* pDstBufInfo, SParserBsInfo* pDstBsInfo) {
+  if (!pCtx->bEndOfStreamFlag) {
+    SDataBuffer* pRawData   = &pCtx->sRawData;
+    SDataBuffer* pSavedData = NULL;
+
+    int32_t iSrcIdx        = 0; //the index of source bit-stream till now after parsing one or more NALs
+    int32_t iSrcConsumed   = 0; // consumed bit count of source bs
+    int32_t iDstIdx        = 0; //the size of current NAL after 0x03 removal and 00 00 01 removal
+    int32_t iSrcLength     = 0; //the total size of current AU or NAL
+    int32_t iRet = 0;
+    int32_t iConsumedBytes = 0;
+    int32_t iOffset        = 0;
+
+    uint8_t* pSrcNal       = NULL;
+    uint8_t* pDstNal       = NULL;
+    uint8_t* pNalPayload   = NULL;
+
+
+    if (NULL == DetectStartCodePrefix (kpBsBuf, &iOffset,
+                                       kiBsLen)) {  //CAN'T find the 00 00 01 start prefix from the source buffer
+      pCtx->iErrorCode |= dsBitstreamError;
+      return dsBitstreamError;
+    }
+
+    pSrcNal    = const_cast<uint8_t*> (kpBsBuf) + iOffset;
+    iSrcLength = kiBsLen - iOffset;
+
+    if ((kiBsLen + 4) > (pRawData->pEnd - pRawData->pCurPos)) {
+      pRawData->pCurPos = pRawData->pHead;
+    }
+
+    if (pCtx->pParam->bParseOnly) {
+      pSavedData = &pCtx->sSavedData;
+      if ((kiBsLen + 4) > (pSavedData->pEnd - pSavedData->pCurPos)) {
+        pSavedData->pCurPos = pSavedData->pHead;
+      }
+    }
+    //copy raw data from source buffer (application) to raw data buffer (codec inside)
+    //0x03 removal and extract all of NAL Unit from current raw data
+    pDstNal = pRawData->pCurPos;
+
+    bool bNalStartBytes = false;
+
+    while (iSrcConsumed < iSrcLength) {
+      if ((2 + iSrcConsumed < iSrcLength) && (0 == LD16 (pSrcNal + iSrcIdx)) && (pSrcNal[2 + iSrcIdx] <= 0x03)) {
+        if (bNalStartBytes && (pSrcNal[2 + iSrcIdx] != 0x00 && pSrcNal[2 + iSrcIdx] != 0x01)) {
+          pCtx->iErrorCode |= dsBitstreamError;
+          return pCtx->iErrorCode;
+        }
+
+        if (pSrcNal[2 + iSrcIdx] == 0x02) {
+          pCtx->iErrorCode |= dsBitstreamError;
+          return pCtx->iErrorCode;
+        } else if (pSrcNal[2 + iSrcIdx] == 0x00) {
+          pDstNal[iDstIdx++] = pSrcNal[iSrcIdx++];
+          iSrcConsumed++;
+          bNalStartBytes = true;
+        } else if (pSrcNal[2 + iSrcIdx] == 0x03) {
+          if ((3 + iSrcConsumed < iSrcLength) && pSrcNal[3 + iSrcIdx] > 0x03) {
+            pCtx->iErrorCode |= dsBitstreamError;
+            return pCtx->iErrorCode;
+          } else {
+            ST16 (pDstNal + iDstIdx, 0);
+            iDstIdx      += 2;
+            iSrcIdx      += 3;
+            iSrcConsumed += 3;
+          }
+        } else { // 0x01
+          bNalStartBytes = false;
+
+          iConsumedBytes = 0;
+          pDstNal[iDstIdx] = pDstNal[iDstIdx + 1] = pDstNal[iDstIdx + 2] = pDstNal[iDstIdx + 3] =
+                               0; // set 4 reserved bytes to zero
+          pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
+          if (pNalPayload) { //parse correct
+            if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType)) {
+              iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes, pSrcNal - 3, iSrcIdx + 3);
+            }
+            CheckAndFinishLastPic (pCtx, ppDst, pDstBufInfo);
+            if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {
+              if (GetThreadCount (pCtx) <= 1) {
+                ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);
+              } else {
+                pCtx->pAccessUnitList->uiAvailUnitsNum = 1;
+              }
+            }
+          }
+          DecodeFinishUpdate (pCtx);
+
+          if ((dsOutOfMemory | dsNoParamSets) & pCtx->iErrorCode) {
+#ifdef LONG_TERM_REF
+            pCtx->bParamSetsLostFlag = true;
+#else
+            pCtx->bReferenceLostAtT0Flag = true;
+#endif
+            if (dsOutOfMemory & pCtx->iErrorCode) {
+              return pCtx->iErrorCode;
+            }
+          }
+          if (iRet) {
+            iRet = 0;
+            if (dsNoParamSets & pCtx->iErrorCode) {
+#ifdef LONG_TERM_REF
+              pCtx->bParamSetsLostFlag = true;
+#else
+              pCtx->bReferenceLostAtT0Flag = true;
+#endif
+            }
+            return pCtx->iErrorCode;
+          }
+
+          pDstNal += (iDstIdx + 4); //init, increase 4 reserved zero bytes, used to store the next NAL
+          if ((iSrcLength - iSrcConsumed + 4) > (pRawData->pEnd - pDstNal)) {
+            pDstNal = pRawData->pCurPos = pRawData->pHead;
+          } else {
+            pRawData->pCurPos = pDstNal;
+          }
+
+          pSrcNal += iSrcIdx + 3;
+          iSrcConsumed += 3;
+          iSrcIdx = 0;
+          iDstIdx  = 0; //reset 0, used to statistic the length of next NAL
+        }
+        continue;
+      }
+      pDstNal[iDstIdx++] = pSrcNal[iSrcIdx++];
+      iSrcConsumed++;
+    }
+
+    //last NAL decoding
+
+    iConsumedBytes = 0;
+    pDstNal[iDstIdx] = pDstNal[iDstIdx + 1] = pDstNal[iDstIdx + 2] = pDstNal[iDstIdx + 3] =
+                         0; // set 4 reserved bytes to zero
+    pRawData->pCurPos = pDstNal + iDstIdx + 4; //init, increase 4 reserved zero bytes, used to store the next NAL
+    pNalPayload = ParseNalHeader (pCtx, &pCtx->sCurNalHead, pDstNal, iDstIdx, pSrcNal - 3, iSrcIdx + 3, &iConsumedBytes);
+    if (pNalPayload) { //parse correct
+      if (IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType)) {
+        iRet = ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes, pSrcNal - 3, iSrcIdx + 3);
+      }
+      if (GetThreadCount (pCtx) <= 1) {
+        CheckAndFinishLastPic (pCtx, ppDst, pDstBufInfo);
+      }
+      if (pCtx->bAuReadyFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) {
+        if (GetThreadCount (pCtx) <= 1) {
+          ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);
+        } else {
+          pCtx->pAccessUnitList->uiAvailUnitsNum = 1;
+        }
+      }
+    }
+    DecodeFinishUpdate (pCtx);
+
+    if ((dsOutOfMemory | dsNoParamSets) & pCtx->iErrorCode) {
+#ifdef LONG_TERM_REF
+      pCtx->bParamSetsLostFlag = true;
+#else
+      pCtx->bReferenceLostAtT0Flag = true;
+#endif
+      return pCtx->iErrorCode;
+    }
+    if (iRet) {
+      iRet = 0;
+      if (dsNoParamSets & pCtx->iErrorCode) {
+#ifdef LONG_TERM_REF
+        pCtx->bParamSetsLostFlag = true;
+#else
+        pCtx->bReferenceLostAtT0Flag = true;
+#endif
+      }
+      return pCtx->iErrorCode;
+    }
+  } else { /* no supplementary picture payload input, but stored a picture */
+    PAccessUnit pCurAu =
+      pCtx->pAccessUnitList; // current access unit, it will never point to NULL after decode's successful initialization
+
+    if (pCurAu->uiAvailUnitsNum == 0) {
+      return pCtx->iErrorCode;
+    } else {
+      pCtx->pAccessUnitList->uiEndPos = pCtx->pAccessUnitList->uiAvailUnitsNum - 1;
+
+      ConstructAccessUnit (pCtx, ppDst, pDstBufInfo);
+    }
+    DecodeFinishUpdate (pCtx);
+
+    if ((dsOutOfMemory | dsNoParamSets) & pCtx->iErrorCode) {
+#ifdef LONG_TERM_REF
+      pCtx->bParamSetsLostFlag = true;
+#else
+      pCtx->bReferenceLostAtT0Flag = true;
+#endif
+      return pCtx->iErrorCode;
+    }
+  }
+
+  return pCtx->iErrorCode;
+}
+
+/*!
+ * \brief   make sure synchonozization picture resolution (get from slice header) among different parts (i.e, memory related and so on)
+ *          over decoder internal
+ * ( MB coordinate and parts of data within decoder context structure )
+ * \param   pCtx        Wels decoder context
+ * \param   iMbWidth    MB width
+ * \pram    iMbHeight   MB height
+ * \return  0 - successful; none 0 - something wrong
+ */
+int32_t SyncPictureResolutionExt (PWelsDecoderContext pCtx, const int32_t kiMbWidth, const int32_t kiMbHeight) {
+  int32_t iErr = ERR_NONE;
+  const int32_t kiPicWidth    = kiMbWidth << 4;
+  const int32_t kiPicHeight   = kiMbHeight << 4;
+  //fix Bugzilla Bug1479656 reallocate temp dec picture
+  if (pCtx->pTempDec != NULL && (pCtx->pTempDec->iWidthInPixel != kiPicWidth
+                                 || pCtx->pTempDec->iHeightInPixel != kiPicHeight)) {
+    FreePicture (pCtx->pTempDec, pCtx->pMemAlign);
+    pCtx->pTempDec = AllocPicture (pCtx, pCtx->pSps->iMbWidth << 4, pCtx->pSps->iMbHeight << 4);
+  }
+  bool bReallocFlag = false;
+  iErr = WelsRequestMem (pCtx, kiMbWidth, kiMbHeight, bReallocFlag); // common memory used
+  if (ERR_NONE != iErr) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "SyncPictureResolutionExt()::WelsRequestMem--buffer allocated failure.");
+    pCtx->iErrorCode |= dsOutOfMemory;
+    return iErr;
+  }
+
+  iErr = InitialDqLayersContext (pCtx, kiPicWidth, kiPicHeight);
+  if (ERR_NONE != iErr) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "SyncPictureResolutionExt()::InitialDqLayersContext--buffer allocated failure.");
+    pCtx->iErrorCode |= dsOutOfMemory;
+  }
+#if defined(MEMORY_MONITOR)
+  if (bReallocFlag) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "SyncPictureResolutionExt(), overall memory usage: %llu bytes",
+             static_cast<unsigned long long> (sizeof (SWelsDecoderContext) + pCtx->pMemAlign->WelsGetMemoryUsage()));
+  }
+#endif//MEMORY_MONITOR
+  return iErr;
+}
+
+void InitDecFuncs (PWelsDecoderContext pCtx, uint32_t uiCpuFlag) {
+  WelsBlockFuncInit (&pCtx->sBlockFunc, uiCpuFlag);
+  InitPredFunc (pCtx, uiCpuFlag);
+  InitMcFunc (& (pCtx->sMcFunc), uiCpuFlag);
+  InitExpandPictureFunc (& (pCtx->sExpandPicFunc), uiCpuFlag);
+  DeblockingInit (&pCtx->sDeblockingFunc, uiCpuFlag);
+}
+
+namespace {
+
+template<void pfIdctResAddPred (uint8_t* pPred, int32_t iStride, int16_t* pRs)>
+void IdctFourResAddPred_ (uint8_t* pPred, int32_t iStride, int16_t* pRs, const int8_t* pNzc) {
+  if (pNzc[0] || pRs[0 * 16])
+    pfIdctResAddPred (pPred + 0 * iStride + 0, iStride, pRs + 0 * 16);
+  if (pNzc[1] || pRs[1 * 16])
+    pfIdctResAddPred (pPred + 0 * iStride + 4, iStride, pRs + 1 * 16);
+  if (pNzc[4] || pRs[2 * 16])
+    pfIdctResAddPred (pPred + 4 * iStride + 0, iStride, pRs + 2 * 16);
+  if (pNzc[5] || pRs[3 * 16])
+    pfIdctResAddPred (pPred + 4 * iStride + 4, iStride, pRs + 3 * 16);
+}
+
+} // anon ns
+
+void InitPredFunc (PWelsDecoderContext pCtx, uint32_t uiCpuFlag) {
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_V     ] = WelsI16x16LumaPredV_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_H     ] = WelsI16x16LumaPredH_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC    ] = WelsI16x16LumaPredDc_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_P     ] = WelsI16x16LumaPredPlane_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_L  ] = WelsI16x16LumaPredDcLeft_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T  ] = WelsI16x16LumaPredDcTop_c;
+  pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_128] = WelsI16x16LumaPredDcNA_c;
+
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_V     ] = WelsI4x4LumaPredV_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_H     ] = WelsI4x4LumaPredH_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC    ] = WelsI4x4LumaPredDc_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC_L  ] = WelsI4x4LumaPredDcLeft_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC_T  ] = WelsI4x4LumaPredDcTop_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC_128] = WelsI4x4LumaPredDcNA_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL    ] = WelsI4x4LumaPredDDL_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL_TOP] = WelsI4x4LumaPredDDLTop_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDR    ] = WelsI4x4LumaPredDDR_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL    ] = WelsI4x4LumaPredVL_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL_TOP] = WelsI4x4LumaPredVLTop_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR    ] = WelsI4x4LumaPredVR_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU    ] = WelsI4x4LumaPredHU_c;
+  pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD    ] = WelsI4x4LumaPredHD_c;
+
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_V     ] = WelsI8x8LumaPredV_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_H     ] = WelsI8x8LumaPredH_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DC    ] = WelsI8x8LumaPredDc_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DC_L  ] = WelsI8x8LumaPredDcLeft_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DC_T  ] = WelsI8x8LumaPredDcTop_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DC_128] = WelsI8x8LumaPredDcNA_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DDL    ] = WelsI8x8LumaPredDDL_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DDL_TOP] = WelsI8x8LumaPredDDLTop_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_DDR    ] = WelsI8x8LumaPredDDR_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_VL    ] = WelsI8x8LumaPredVL_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_VL_TOP] = WelsI8x8LumaPredVLTop_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_VR    ] = WelsI8x8LumaPredVR_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_HU    ] = WelsI8x8LumaPredHU_c;
+  pCtx->pGetI8x8LumaPredFunc[I4_PRED_HD    ] = WelsI8x8LumaPredHD_c;
+
+  pCtx->pGetIChromaPredFunc[C_PRED_DC    ] = WelsIChromaPredDc_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_H     ] = WelsIChromaPredH_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_V     ] = WelsIChromaPredV_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_P     ] = WelsIChromaPredPlane_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_DC_L  ] = WelsIChromaPredDcLeft_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_DC_T  ] = WelsIChromaPredDcTop_c;
+  pCtx->pGetIChromaPredFunc[C_PRED_DC_128] = WelsIChromaPredDcNA_c;
+
+  pCtx->pIdctResAddPredFunc     = IdctResAddPred_c;
+  pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_c>;
+
+  pCtx->pIdctResAddPredFunc8x8  = IdctResAddPred8x8_c;
+
+#if defined(HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pCtx->pIdctResAddPredFunc   = IdctResAddPred_neon;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_neon>;
+
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsDecoderI16x16LumaPredDc_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsDecoderI16x16LumaPredPlane_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsDecoderI16x16LumaPredH_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsDecoderI16x16LumaPredV_neon;
+
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_V    ] = WelsDecoderI4x4LumaPredV_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_H    ] = WelsDecoderI4x4LumaPredH_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL  ] = WelsDecoderI4x4LumaPredDDL_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDR  ] = WelsDecoderI4x4LumaPredDDR_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL   ] = WelsDecoderI4x4LumaPredVL_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR   ] = WelsDecoderI4x4LumaPredVR_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU   ] = WelsDecoderI4x4LumaPredHU_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD   ] = WelsDecoderI4x4LumaPredHD_neon;
+
+    pCtx->pGetIChromaPredFunc[C_PRED_H]       = WelsDecoderIChromaPredH_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_V]       = WelsDecoderIChromaPredV_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsDecoderIChromaPredPlane_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsDecoderIChromaPredDc_neon;
+  }
+#endif//HAVE_NEON
+
+#if defined(HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pCtx->pIdctResAddPredFunc   = IdctResAddPred_AArch64_neon;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_AArch64_neon>;
+
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsDecoderI16x16LumaPredDc_AArch64_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsDecoderI16x16LumaPredPlane_AArch64_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsDecoderI16x16LumaPredH_AArch64_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsDecoderI16x16LumaPredV_AArch64_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_L]  = WelsDecoderI16x16LumaPredDcLeft_AArch64_neon;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T]  = WelsDecoderI16x16LumaPredDcTop_AArch64_neon;
+
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_H    ] = WelsDecoderI4x4LumaPredH_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL  ] = WelsDecoderI4x4LumaPredDDL_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL_TOP] = WelsDecoderI4x4LumaPredDDLTop_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL   ] = WelsDecoderI4x4LumaPredVL_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL_TOP ] = WelsDecoderI4x4LumaPredVLTop_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR   ] = WelsDecoderI4x4LumaPredVR_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU   ] = WelsDecoderI4x4LumaPredHU_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD   ] = WelsDecoderI4x4LumaPredHD_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC   ] = WelsDecoderI4x4LumaPredDc_AArch64_neon;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DC_T   ] = WelsDecoderI4x4LumaPredDcTop_AArch64_neon;
+
+    pCtx->pGetIChromaPredFunc[C_PRED_H]       = WelsDecoderIChromaPredH_AArch64_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_V]       = WelsDecoderIChromaPredV_AArch64_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsDecoderIChromaPredPlane_AArch64_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsDecoderIChromaPredDc_AArch64_neon;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_T]      = WelsDecoderIChromaPredDcTop_AArch64_neon;
+  }
+#endif//HAVE_NEON_AARCH64
+
+#if defined(X86_ASM)
+  if (uiCpuFlag & WELS_CPU_MMXEXT) {
+    pCtx->pIdctResAddPredFunc   = IdctResAddPred_mmx;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_mmx>;
+
+    ///////mmx code opt---
+    pCtx->pGetIChromaPredFunc[C_PRED_H]      = WelsDecoderIChromaPredH_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_V]      = WelsDecoderIChromaPredV_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_L  ] = WelsDecoderIChromaPredDcLeft_mmx;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_128] = WelsDecoderIChromaPredDcNA_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDR]  = WelsDecoderI4x4LumaPredDDR_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HD ]  = WelsDecoderI4x4LumaPredHD_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_HU ]  = WelsDecoderI4x4LumaPredHU_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VR ]  = WelsDecoderI4x4LumaPredVR_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_DDL]  = WelsDecoderI4x4LumaPredDDL_mmx;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_VL ]  = WelsDecoderI4x4LumaPredVL_mmx;
+  }
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pCtx->pIdctResAddPredFunc     = IdctResAddPred_sse2;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_sse2>;
+
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsDecoderI16x16LumaPredDc_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsDecoderI16x16LumaPredPlane_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsDecoderI16x16LumaPredH_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsDecoderI16x16LumaPredV_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T  ] = WelsDecoderI16x16LumaPredDcTop_sse2;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_128] = WelsDecoderI16x16LumaPredDcNA_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsDecoderIChromaPredPlane_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsDecoderIChromaPredDc_sse2;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_T]    = WelsDecoderIChromaPredDcTop_sse2;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_H]     = WelsDecoderI4x4LumaPredH_sse2;
+  }
+#if defined(HAVE_AVX2)
+  if (uiCpuFlag & WELS_CPU_AVX2) {
+    pCtx->pIdctResAddPredFunc     = IdctResAddPred_avx2;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_avx2;
+  }
+#endif
+
+#endif
+
+#if defined(HAVE_MMI)
+  if (uiCpuFlag & WELS_CPU_MMI) {
+    pCtx->pIdctResAddPredFunc   = IdctResAddPred_mmi;
+    pCtx->pIdctFourResAddPredFunc = IdctFourResAddPred_<IdctResAddPred_mmi>;
+
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC] = WelsDecoderI16x16LumaPredDc_mmi;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_P]  = WelsDecoderI16x16LumaPredPlane_mmi;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_H]  = WelsDecoderI16x16LumaPredH_mmi;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_V]  = WelsDecoderI16x16LumaPredV_mmi;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_T  ] = WelsDecoderI16x16LumaPredDcTop_mmi;
+    pCtx->pGetI16x16LumaPredFunc[I16_PRED_DC_128] = WelsDecoderI16x16LumaPredDcNA_mmi;
+    pCtx->pGetIChromaPredFunc[C_PRED_P ]      = WelsDecoderIChromaPredPlane_mmi;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC]      = WelsDecoderIChromaPredDc_mmi;
+    pCtx->pGetIChromaPredFunc[C_PRED_DC_T]    = WelsDecoderIChromaPredDcTop_mmi;
+    pCtx->pGetI4x4LumaPredFunc[I4_PRED_H]     = WelsDecoderI4x4LumaPredH_mmi;
+  }
+#endif//HAVE_MMI
+}
+
+//reset decoder number related statistics info
+void ResetDecStatNums (SDecoderStatistics* pDecStat) {
+  uint32_t uiWidth = pDecStat->uiWidth;
+  uint32_t uiHeight = pDecStat->uiHeight;
+  int32_t iAvgLumaQp = pDecStat->iAvgLumaQp;
+  uint32_t iLogInterval = pDecStat->iStatisticsLogInterval;
+  uint32_t uiProfile = pDecStat->uiProfile;
+  uint32_t uiLevel = pDecStat->uiLevel;
+  memset (pDecStat, 0, sizeof (SDecoderStatistics));
+  pDecStat->uiWidth = uiWidth;
+  pDecStat->uiHeight = uiHeight;
+  pDecStat->iAvgLumaQp = iAvgLumaQp;
+  pDecStat->iStatisticsLogInterval = iLogInterval;
+  pDecStat->uiProfile = uiProfile;
+  pDecStat->uiLevel = uiLevel;
+}
+
+//update information when freezing occurs, including IDR/non-IDR number
+void UpdateDecStatFreezingInfo (const bool kbIdrFlag, SDecoderStatistics* pDecStat) {
+  if (kbIdrFlag)
+    pDecStat->uiFreezingIDRNum++;
+  else
+    pDecStat->uiFreezingNonIDRNum++;
+}
+
+//update information when no freezing occurs, including QP, correct IDR number, ECed IDR number
+void UpdateDecStatNoFreezingInfo (PWelsDecoderContext pCtx) {
+  PDqLayer pCurDq = pCtx->pCurDqLayer;
+  PPicture pPic = pCtx->pDec;
+  SDecoderStatistics* pDecStat = pCtx->pDecoderStatistics;
+
+  if (pDecStat->iAvgLumaQp == -1) //first correct frame received
+    pDecStat->iAvgLumaQp = 0;
+
+  //update QP info
+  int32_t iTotalQp = 0;
+  const int32_t kiMbNum = pCurDq->iMbWidth * pCurDq->iMbHeight;
+  if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) { //all correct
+    for (int32_t iMb = 0; iMb < kiMbNum; ++iMb) {
+      iTotalQp += pCurDq->pLumaQp[iMb];
+    }
+    iTotalQp /= kiMbNum;
+  } else {
+    int32_t iCorrectMbNum = 0;
+    for (int32_t iMb = 0; iMb < kiMbNum; ++iMb) {
+      iCorrectMbNum += (int32_t) pCurDq->pMbCorrectlyDecodedFlag[iMb];
+      iTotalQp += pCurDq->pLumaQp[iMb] * pCurDq->pMbCorrectlyDecodedFlag[iMb];
+    }
+    if (iCorrectMbNum == 0) //non MB is correct, should remain QP statistic info
+      iTotalQp = pDecStat->iAvgLumaQp;
+    else
+      iTotalQp /= iCorrectMbNum;
+  }
+  if (pDecStat->uiDecodedFrameCount + 1 == 0) { //maximum uint32_t reached
+    ResetDecStatNums (pDecStat);
+    pDecStat->iAvgLumaQp = iTotalQp;
+  } else
+    pDecStat->iAvgLumaQp = (int) ((uint64_t) (pDecStat->iAvgLumaQp * pDecStat->uiDecodedFrameCount + iTotalQp) /
+                                  (pDecStat->uiDecodedFrameCount + 1));
+
+  //update IDR number
+  if (pCurDq->sLayerInfo.sNalHeaderExt.bIdrFlag) {
+    pDecStat->uiIDRCorrectNum += (pPic->bIsComplete);
+    if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE)
+      pDecStat->uiEcIDRNum += (!pPic->bIsComplete);
+  }
+}
+
+//update decoder statistics information
+void UpdateDecStat (PWelsDecoderContext pCtx, const bool kbOutput) {
+  if (pCtx->bFreezeOutput)
+    UpdateDecStatFreezingInfo (pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.bIdrFlag, pCtx->pDecoderStatistics);
+  else if (kbOutput)
+    UpdateDecStatNoFreezingInfo (pCtx);
+}
+
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_core.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_core.cpp
new file mode 100644
index 0000000000..eac41bfb2e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_core.cpp
@@ -0,0 +1,3000 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      decoder_core.c: Wels decoder framework core implementation
+ */
+
+#include "decoder_core.h"
+#include "error_code.h"
+#include "memmgr_nal_unit.h"
+#include "au_parser.h"
+#include "decode_slice.h"
+#include "manage_dec_ref.h"
+#include "expand_pic.h"
+#include "decoder.h"
+#include "decode_mb_aux.h"
+#include "memory_align.h"
+#include "error_concealment.h"
+
+namespace WelsDec {
+static inline int32_t DecodeFrameConstruction (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
+  PDqLayer pCurDq = pCtx->pCurDqLayer;
+  PPicture pPic = pCtx->pDec;
+
+  const int32_t kiWidth = pCurDq->iMbWidth << 4;
+  const int32_t kiHeight = pCurDq->iMbHeight << 4;
+
+  const int32_t kiTotalNumMbInCurLayer = pCurDq->iMbWidth * pCurDq->iMbHeight;
+  bool bFrameCompleteFlag = true;
+
+  if (pPic->bNewSeqBegin) {
+    memcpy (& (pCtx->sFrameCrop), & (pCurDq->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.pSps->sFrameCrop),
+            sizeof (SPosOffset)); //confirmed_safe_unsafe_usage
+#ifdef LONG_TERM_REF
+    pCtx->bParamSetsLostFlag      = false;
+#else
+    pCtx->bReferenceLostAtT0Flag = false; // need initialize it due new seq, 6/4/2010
+#endif //LONG_TERM_REF
+    if (pCtx->iTotalNumMbRec == kiTotalNumMbInCurLayer) {
+      pCtx->bPrintFrameErrorTraceFlag = true;
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "DecodeFrameConstruction(): will output first frame of new sequence, %d x %d, crop_left:%d, crop_right:%d, crop_top:%d, crop_bottom:%d, ignored error packet:%d.",
+               kiWidth, kiHeight, pCtx->sFrameCrop.iLeftOffset, pCtx->sFrameCrop.iRightOffset, pCtx->sFrameCrop.iTopOffset,
+               pCtx->sFrameCrop.iBottomOffset, pCtx->iIgnoredErrorInfoPacketCount);
+      pCtx->iIgnoredErrorInfoPacketCount = 0;
+    }
+  }
+
+  const int32_t kiActualWidth = kiWidth - (pCtx->sFrameCrop.iLeftOffset + pCtx->sFrameCrop.iRightOffset) * 2;
+  const int32_t kiActualHeight = kiHeight - (pCtx->sFrameCrop.iTopOffset + pCtx->sFrameCrop.iBottomOffset) * 2;
+
+
+  if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+    if ((pCtx->pDecoderStatistics->uiWidth != (unsigned int) kiActualWidth)
+        || (pCtx->pDecoderStatistics->uiHeight != (unsigned int) kiActualHeight)) {
+      pCtx->pDecoderStatistics->uiResolutionChangeTimes++;
+      pCtx->pDecoderStatistics->uiWidth = kiActualWidth;
+      pCtx->pDecoderStatistics->uiHeight = kiActualHeight;
+    }
+    UpdateDecStatNoFreezingInfo (pCtx);
+  }
+
+  if (pCtx->pParam->bParseOnly) { //should exit for parse only to prevent access NULL pDstInfo
+    PAccessUnit pCurAu = pCtx->pAccessUnitList;
+    if (dsErrorFree == pCtx->iErrorCode) { //correct decoding, add to data buffer
+      SParserBsInfo* pParser = pCtx->pParserBsInfo;
+      SNalUnit* pCurNal = NULL;
+      int32_t iTotalNalLen = 0;
+      int32_t iNalLen = 0;
+      int32_t iNum = 0;
+      while (iNum < pParser->iNalNum) {
+        iTotalNalLen += pParser->pNalLenInByte[iNum++];
+      }
+      uint8_t* pDstBuf = pParser->pDstBuff + iTotalNalLen;
+      int32_t iIdx = pCurAu->uiStartPos;
+      int32_t iEndIdx = pCurAu->uiEndPos;
+      uint8_t* pNalBs = NULL;
+      pParser->uiOutBsTimeStamp = (pCurAu->pNalUnitsList [iIdx]) ? pCurAu->pNalUnitsList [iIdx]->uiTimeStamp : 0;
+      //pParser->iNalNum = 0;
+      pParser->iSpsWidthInPixel = (pCtx->pSps->iMbWidth << 4) - ((pCtx->pSps->sFrameCrop.iLeftOffset +
+                                  pCtx->pSps->sFrameCrop.iRightOffset) << 1);
+      pParser->iSpsHeightInPixel = (pCtx->pSps->iMbHeight << 4) - ((pCtx->pSps->sFrameCrop.iTopOffset +
+                                   pCtx->pSps->sFrameCrop.iBottomOffset) << 1);
+
+      if (pCurAu->pNalUnitsList [iIdx]->sNalHeaderExt.bIdrFlag) { //IDR
+        if (pCtx->bFrameFinish) { //add required sps/pps
+          if (pParser->iNalNum > pCtx->iMaxNalNum - 2) { //2 reserved for sps+pps
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+                     "DecodeFrameConstruction(): current NAL num (%d) plus sps & pps exceeds permitted num (%d). Will expand",
+                     pParser->iNalNum, pCtx->iMaxNalNum);
+            WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, ExpandBsLenBuffer (pCtx, pParser->iNalNum + 2))
+          }
+          bool bSubSps = (NAL_UNIT_CODED_SLICE_EXT == pCurAu->pNalUnitsList [iIdx]->sNalHeaderExt.sNalUnitHeader.eNalUnitType);
+          SSpsBsInfo* pSpsBs = NULL;
+          SPpsBsInfo* pPpsBs = NULL;
+          int32_t iSpsId = pCtx->pSps->iSpsId;
+          int32_t iPpsId = pCtx->pPps->iPpsId;
+          pCtx->bParamSetsLostFlag = false;
+          //find required sps, pps and write into dst buff
+          pSpsBs = bSubSps ? &pCtx->sSubsetSpsBsInfo [iSpsId] : &pCtx->sSpsBsInfo [iSpsId];
+          pPpsBs = &pCtx->sPpsBsInfo [iPpsId];
+          if (pDstBuf - pParser->pDstBuff + pSpsBs->uiSpsBsLen + pPpsBs->uiPpsBsLen >= MAX_ACCESS_UNIT_CAPACITY) {
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+                     "DecodeFrameConstruction(): sps pps size: (%d %d) too large. Failed to parse. \n", pSpsBs->uiSpsBsLen,
+                     pPpsBs->uiPpsBsLen);
+            pCtx->iErrorCode |= dsOutOfMemory;
+            pCtx->pParserBsInfo->iNalNum = 0;
+            return ERR_INFO_OUT_OF_MEMORY;
+          }
+          memcpy (pDstBuf, pSpsBs->pSpsBsBuf, pSpsBs->uiSpsBsLen);
+          pParser->pNalLenInByte [pParser->iNalNum ++] = pSpsBs->uiSpsBsLen;
+          pDstBuf += pSpsBs->uiSpsBsLen;
+          memcpy (pDstBuf, pPpsBs->pPpsBsBuf, pPpsBs->uiPpsBsLen);
+          pParser->pNalLenInByte [pParser->iNalNum ++] = pPpsBs->uiPpsBsLen;
+          pDstBuf += pPpsBs->uiPpsBsLen;
+          pCtx->bFrameFinish = false;
+        }
+      }
+      //then VCL data re-write
+      if (pParser->iNalNum + iEndIdx - iIdx + 1 > pCtx->iMaxNalNum) { //calculate total NAL num
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+                 "DecodeFrameConstruction(): current NAL num (%d) exceeds permitted num (%d). Will expand",
+                 pParser->iNalNum + iEndIdx - iIdx + 1, pCtx->iMaxNalNum);
+        WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, ExpandBsLenBuffer (pCtx, pParser->iNalNum + iEndIdx - iIdx + 1))
+      }
+      while (iIdx <= iEndIdx) {
+        pCurNal = pCurAu->pNalUnitsList [iIdx ++];
+        iNalLen = pCurNal->sNalData.sVclNal.iNalLength;
+        pNalBs = pCurNal->sNalData.sVclNal.pNalPos;
+        pParser->pNalLenInByte [pParser->iNalNum ++] = iNalLen;
+        if (pDstBuf - pParser->pDstBuff + iNalLen >= MAX_ACCESS_UNIT_CAPACITY) {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+                   "DecodeFrameConstruction(): composed output size (%ld) exceeds (%d). Failed to parse. current data pos %d out of %d:, previously accumulated num: %d, total num: %d, previously accumulated len: %d, current len: %d, current buf pos: %p, header buf pos: %p \n",
+                   (long) (pDstBuf - pParser->pDstBuff + iNalLen), MAX_ACCESS_UNIT_CAPACITY, iIdx, iEndIdx, iNum, pParser->iNalNum,
+                   iTotalNalLen, iNalLen, pDstBuf, pParser->pDstBuff);
+          pCtx->iErrorCode |= dsOutOfMemory;
+          pCtx->pParserBsInfo->iNalNum = 0;
+          return ERR_INFO_OUT_OF_MEMORY;
+        }
+
+        memcpy (pDstBuf, pNalBs, iNalLen);
+        pDstBuf += iNalLen;
+      }
+      if (pCtx->iTotalNumMbRec == kiTotalNumMbInCurLayer) { //frame complete
+        pCtx->iTotalNumMbRec = 0;
+        pCtx->bFramePending = false;
+        pCtx->bFrameFinish = true; //finish current frame and mark it
+      } else if (pCtx->iTotalNumMbRec != 0) { //frame incomplete
+        pCtx->bFramePending = true;
+        pCtx->pDec->bIsComplete = false;
+        pCtx->bFrameFinish = false; //current frame not finished
+        pCtx->iErrorCode |= dsFramePending;
+        return ERR_INFO_PARSEONLY_PENDING;
+        //pCtx->pParserBsInfo->iNalNum = 0;
+      }
+    } else { //error
+      pCtx->pParserBsInfo->uiOutBsTimeStamp = 0;
+      pCtx->pParserBsInfo->iNalNum = 0;
+      pCtx->pParserBsInfo->iSpsWidthInPixel = 0;
+      pCtx->pParserBsInfo->iSpsHeightInPixel = 0;
+      return ERR_INFO_PARSEONLY_ERROR;
+    }
+    return ERR_NONE;
+  }
+
+  if (pCtx->iTotalNumMbRec != kiTotalNumMbInCurLayer) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+             "DecodeFrameConstruction(): iTotalNumMbRec:%d, total_num_mb_sps:%d, cur_layer_mb_width:%d, cur_layer_mb_height:%d ",
+             pCtx->iTotalNumMbRec, kiTotalNumMbInCurLayer, pCurDq->iMbWidth, pCurDq->iMbHeight);
+    bFrameCompleteFlag = false; //return later after output buffer is done
+    if (pCtx->bInstantDecFlag) { //no-delay decoding, wait for new slice
+      return ERR_INFO_MB_NUM_INADEQUATE;
+    }
+  } else if (pCurDq->sLayerInfo.sNalHeaderExt.bIdrFlag
+             && (pCtx->iErrorCode == dsErrorFree)) { //complete non-ECed IDR frame done
+    pCtx->pDec->bIsComplete = true;
+    pCtx->bFreezeOutput = false;
+  }
+
+  pCtx->iTotalNumMbRec = 0;
+
+  //////output:::normal path
+  pDstInfo->uiOutYuvTimeStamp = pPic->uiTimeStamp;
+  ppDst[0]      = pPic->pData[0];
+  ppDst[1]      = pPic->pData[1];
+  ppDst[2]      = pPic->pData[2];
+
+  pDstInfo->UsrData.sSystemBuffer.iFormat = videoFormatI420;
+
+  pDstInfo->UsrData.sSystemBuffer.iWidth = kiActualWidth;
+  pDstInfo->UsrData.sSystemBuffer.iHeight = kiActualHeight;
+  pDstInfo->UsrData.sSystemBuffer.iStride[0] = pPic->iLinesize[0];
+  pDstInfo->UsrData.sSystemBuffer.iStride[1] = pPic->iLinesize[1];
+  ppDst[0] = ppDst[0] + pCtx->sFrameCrop.iTopOffset * 2 * pPic->iLinesize[0] + pCtx->sFrameCrop.iLeftOffset * 2;
+  ppDst[1] = ppDst[1] + pCtx->sFrameCrop.iTopOffset  * pPic->iLinesize[1] + pCtx->sFrameCrop.iLeftOffset;
+  ppDst[2] = ppDst[2] + pCtx->sFrameCrop.iTopOffset  * pPic->iLinesize[1] + pCtx->sFrameCrop.iLeftOffset;
+  for (int i = 0; i < 3; ++i) {
+    pDstInfo->pDst[i] = ppDst[i];
+  }
+  pDstInfo->iBufferStatus = 1;
+  if (GetThreadCount (pCtx) > 1 && pPic->bIsComplete == false) {
+    pPic->bIsComplete = true;
+  }
+  if (GetThreadCount (pCtx) > 1) {
+    uint32_t uiMbHeight = (pCtx->pDec->iHeightInPixel + 15) >> 4;
+    for (uint32_t i = 0; i < uiMbHeight; ++i) {
+      SET_EVENT (&pCtx->pDec->pReadyEvent[i]);
+    }
+  }
+  bool bOutResChange = false;
+  if (GetThreadCount (pCtx) <= 1 || pCtx->pLastThreadCtx == NULL) {
+    bOutResChange = (pCtx->iLastImgWidthInPixel != pDstInfo->UsrData.sSystemBuffer.iWidth)
+                    || (pCtx->iLastImgHeightInPixel != pDstInfo->UsrData.sSystemBuffer.iHeight);
+  } else {
+    if (pCtx->pLastThreadCtx != NULL) {
+      PWelsDecoderThreadCTX pLastThreadCtx = (PWelsDecoderThreadCTX) (pCtx->pLastThreadCtx);
+      bOutResChange = (pLastThreadCtx->pCtx->iLastImgWidthInPixel != pDstInfo->UsrData.sSystemBuffer.iWidth)
+                      || (pLastThreadCtx->pCtx->iLastImgHeightInPixel != pDstInfo->UsrData.sSystemBuffer.iHeight);
+    }
+  }
+  pCtx->iLastImgWidthInPixel = pDstInfo->UsrData.sSystemBuffer.iWidth;
+  pCtx->iLastImgHeightInPixel = pDstInfo->UsrData.sSystemBuffer.iHeight;
+  if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) //no buffer output if EC is disabled and frame incomplete
+    pDstInfo->iBufferStatus = (int32_t) (bFrameCompleteFlag
+                                         && pPic->bIsComplete); // When EC disable, ECed picture not output
+  else if ((pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE
+            || pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)
+           && pCtx->iErrorCode && bOutResChange)
+    pCtx->bFreezeOutput = true;
+
+  if (pDstInfo->iBufferStatus == 0) {
+    if (!bFrameCompleteFlag)
+      pCtx->iErrorCode |= dsBitstreamError;
+    return ERR_INFO_MB_NUM_INADEQUATE;
+  }
+  if (pCtx->bFreezeOutput) {
+    pDstInfo->iBufferStatus = 0;
+    if (pPic->bNewSeqBegin) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "DecodeFrameConstruction():New sequence detected, but freezed, correct MBs (%d) out of whole MBs (%d).",
+               kiTotalNumMbInCurLayer - pCtx->iMbEcedNum, kiTotalNumMbInCurLayer);
+    }
+  }
+  pCtx->iMbEcedNum = pPic->iMbEcedNum;
+  pCtx->iMbNum = pPic->iMbNum;
+  pCtx->iMbEcedPropNum = pPic->iMbEcedPropNum;
+  if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+    if (pDstInfo->iBufferStatus && ((pCtx->pDecoderStatistics->uiWidth != (unsigned int) kiActualWidth)
+                                    || (pCtx->pDecoderStatistics->uiHeight != (unsigned int) kiActualHeight))) {
+      pCtx->pDecoderStatistics->uiResolutionChangeTimes++;
+      pCtx->pDecoderStatistics->uiWidth = kiActualWidth;
+      pCtx->pDecoderStatistics->uiHeight = kiActualHeight;
+    }
+    UpdateDecStat (pCtx, pDstInfo->iBufferStatus != 0);
+  }
+  return ERR_NONE;
+}
+
+inline bool    CheckSliceNeedReconstruct (uint8_t uiLayerDqId, uint8_t uiTargetDqId) {
+  return (uiLayerDqId == uiTargetDqId); // target layer
+}
+
+inline uint8_t GetTargetDqId (uint8_t uiTargetDqId,  SDecodingParam* psParam) {
+  uint8_t  uiRequiredDqId = psParam ? psParam->uiTargetDqLayer : (uint8_t)255;
+
+  return WELS_MIN (uiTargetDqId, uiRequiredDqId);
+}
+
+
+inline void    HandleReferenceLostL0 (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
+  if (0 == pCurNal->sNalHeaderExt.uiTemporalId) {
+    pCtx->bReferenceLostAtT0Flag = true;
+  }
+  pCtx->iErrorCode |= dsBitstreamError;
+}
+
+inline void    HandleReferenceLost (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
+  if ((0 == pCurNal->sNalHeaderExt.uiTemporalId) || (1 == pCurNal->sNalHeaderExt.uiTemporalId)) {
+    pCtx->bReferenceLostAtT0Flag = true;
+  }
+  pCtx->iErrorCode |= dsRefLost;
+}
+
+inline int32_t  WelsDecodeConstructSlice (PWelsDecoderContext pCtx, PNalUnit pCurNal) {
+  int32_t  iRet = WelsTargetSliceConstruction (pCtx);
+
+  if (iRet) {
+    HandleReferenceLostL0 (pCtx, pCurNal);
+  }
+
+  return iRet;
+}
+
+int32_t ParsePredWeightedTable (PBitStringAux pBs, PSliceHeader pSh) {
+  uint32_t uiCode;
+  int32_t iList = 0;
+  int32_t iCode;
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode));
+  WELS_CHECK_SE_BOTH_ERROR_NOLOG (uiCode, 0, 7, "luma_log2_weight_denom",
+                                  GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_LUMA_LOG2_WEIGHT_DENOM));
+  pSh->sPredWeightTable.uiLumaLog2WeightDenom = uiCode;
+  if (pSh->pSps->uiChromaArrayType != 0) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode));
+    WELS_CHECK_SE_BOTH_ERROR_NOLOG (uiCode, 0, 7, "chroma_log2_weight_denom",
+                                    GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_CHROMA_LOG2_WEIGHT_DENOM));
+    pSh->sPredWeightTable.uiChromaLog2WeightDenom = uiCode;
+  }
+
+  if ((pSh->sPredWeightTable.uiLumaLog2WeightDenom | pSh->sPredWeightTable.uiChromaLog2WeightDenom) > 7)
+    return ERR_NONE;
+
+  do {
+
+    for (int i = 0; i < pSh->uiRefCount[iList]; i++) {
+      //luma
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
+      if (!!uiCode) {
+
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode));
+        WELS_CHECK_SE_BOTH_ERROR_NOLOG (iCode, -128, 127, "luma_weight",
+                                        GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_LUMA_WEIGHT));
+        pSh->sPredWeightTable.sPredList[iList].iLumaWeight[i] = iCode;
+
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode));
+        WELS_CHECK_SE_BOTH_ERROR_NOLOG (iCode, -128, 127, "luma_offset",
+                                        GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_LUMA_OFFSET));
+        pSh->sPredWeightTable.sPredList[iList].iLumaOffset[i] = iCode;
+      } else {
+        pSh->sPredWeightTable.sPredList[iList].iLumaWeight[i] = 1 << (pSh->sPredWeightTable.uiLumaLog2WeightDenom);
+        pSh->sPredWeightTable.sPredList[iList].iLumaOffset[i] = 0;
+
+      }
+      //chroma
+      if (pSh->pSps->uiChromaArrayType == 0)
+        continue;
+
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode));
+      if (!!uiCode) {
+        for (int j = 0; j < 2; j++) {
+
+
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode));
+          WELS_CHECK_SE_BOTH_ERROR_NOLOG (iCode, -128, 127, "chroma_weight",
+                                          GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_CHROMA_WEIGHT));
+          pSh->sPredWeightTable.sPredList[iList].iChromaWeight[i][j] = iCode;
+
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode));
+          WELS_CHECK_SE_BOTH_ERROR_NOLOG (iCode, -128, 127, "chroma_offset",
+                                          GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_CHROMA_OFFSET));
+          pSh->sPredWeightTable.sPredList[iList].iChromaOffset[i][j] = iCode;
+        }
+      } else {
+        for (int j = 0; j < 2; j++) {
+
+
+          pSh->sPredWeightTable.sPredList[iList].iChromaWeight[i][j] = 1 << (pSh->sPredWeightTable.uiChromaLog2WeightDenom);
+          pSh->sPredWeightTable.sPredList[iList].iChromaOffset[i][j] = 0;
+        }
+      }
+
+    }
+    ++iList;
+    if (pSh->eSliceType != B_SLICE) {
+      break;
+    }
+  } while (iList < LIST_A);//TODO: SUPPORT LIST_A
+  return ERR_NONE;
+}
+
+void CreateImplicitWeightTable (PWelsDecoderContext pCtx) {
+
+  PSlice pSlice = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  if (pCurDqLayer->bUseWeightedBiPredIdc && pSliceHeader->pPps->uiWeightedBipredIdc == 2) {
+    int32_t iPoc = pSliceHeader->iPicOrderCntLsb;
+
+    //fix Bugzilla 1485229 check if pointers are NULL
+    if (pCtx->sRefPic.pRefList[LIST_0][0] && pCtx->sRefPic.pRefList[LIST_1][0]) {
+      if (pSliceHeader->uiRefCount[0] == 1 && pSliceHeader->uiRefCount[1] == 1
+          && int64_t(pCtx->sRefPic.pRefList[LIST_0][0]->iFramePoc) + int64_t(pCtx->sRefPic.pRefList[LIST_1][0]->iFramePoc) == 2 * int64_t(iPoc)) {
+        pCurDqLayer->bUseWeightedBiPredIdc = false;
+        return;
+      }
+    }
+
+    pCurDqLayer->pPredWeightTable->uiLumaLog2WeightDenom = 5;
+    pCurDqLayer->pPredWeightTable->uiChromaLog2WeightDenom = 5;
+    for (int32_t iRef0 = 0; iRef0 < pSliceHeader->uiRefCount[0]; iRef0++) {
+      if (pCtx->sRefPic.pRefList[LIST_0][iRef0]) {
+        const int32_t iPoc0 = pCtx->sRefPic.pRefList[LIST_0][iRef0]->iFramePoc;
+        bool bIsLongRef0 = pCtx->sRefPic.pRefList[LIST_0][iRef0]->bIsLongRef;
+        for (int32_t iRef1 = 0; iRef1 < pSliceHeader->uiRefCount[1]; iRef1++) {
+          if (pCtx->sRefPic.pRefList[LIST_1][iRef1]) {
+            const int32_t iPoc1 = pCtx->sRefPic.pRefList[LIST_1][iRef1]->iFramePoc;
+            bool bIsLongRef1 = pCtx->sRefPic.pRefList[LIST_1][iRef1]->bIsLongRef;
+            pCurDqLayer->pPredWeightTable->iImplicitWeight[iRef0][iRef1] = 32;
+            if (!bIsLongRef0 && !bIsLongRef1) {
+              const int32_t iTd = WELS_CLIP3 (iPoc1 - iPoc0, -128, 127);
+              if (iTd) {
+                int32_t iTb = WELS_CLIP3 (iPoc - iPoc0, -128, 127);
+                int32_t iTx = (16384 + (WELS_ABS (iTd) >> 1)) / iTd;
+                int32_t iDistScaleFactor = (iTb * iTx + 32) >> 8;
+                if (iDistScaleFactor >= -64 && iDistScaleFactor <= 128) {
+                  pCurDqLayer->pPredWeightTable->iImplicitWeight[iRef0][iRef1] = 64 - iDistScaleFactor;
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  return;
+}
+
+/*
+ *  Predeclared function routines ..
+ */
+int32_t ParseRefPicListReordering (PBitStringAux pBs, PSliceHeader pSh) {
+  int32_t iList = 0;
+  const EWelsSliceType keSt = pSh->eSliceType;
+  PRefPicListReorderSyn pRefPicListReordering = &pSh->pRefPicListReordering;
+  PSps pSps = pSh->pSps;
+  uint32_t uiCode;
+  if (keSt == I_SLICE || keSt == SI_SLICE)
+    return ERR_NONE;
+
+  // Common syntaxs for P or B slices: list0, list1 followed if B slices used.
+  do {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //ref_pic_list_modification_flag_l0
+    pRefPicListReordering->bRefPicListReorderingFlag[iList] = !!uiCode;
+
+    if (pRefPicListReordering->bRefPicListReorderingFlag[iList]) {
+      int32_t iIdx = 0;
+      do {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //modification_of_pic_nums_idc
+        const uint32_t kuiIdc = uiCode;
+
+        //Fixed the referrence list reordering crash issue.(fault kIdc value > 3 case)---
+        if ((iIdx >= MAX_REF_PIC_COUNT) || (kuiIdc > 3)) {
+          return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_REORDERING);
+        }
+        pRefPicListReordering->sReorderingSyn[iList][iIdx].uiReorderingOfPicNumsIdc = kuiIdc;
+        if (kuiIdc == 3)
+          break;
+
+        if (iIdx >= pSh->uiRefCount[iList] || iIdx >= MAX_REF_PIC_COUNT)
+          return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_REORDERING);
+
+        if (kuiIdc == 0 || kuiIdc == 1) {
+          // abs_diff_pic_num_minus1 should be in range 0 to MaxPicNum-1, MaxPicNum is derived as
+          // 2^(4+log2_max_frame_num_minus4)
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //abs_diff_pic_num_minus1
+          WELS_CHECK_SE_UPPER_ERROR_NOLOG (uiCode, (uint32_t) (1 << pSps->uiLog2MaxFrameNum), "abs_diff_pic_num_minus1",
+                                           GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_REORDERING));
+          pRefPicListReordering->sReorderingSyn[iList][iIdx].uiAbsDiffPicNumMinus1 = uiCode; // uiAbsDiffPicNumMinus1
+        } else if (kuiIdc == 2) {
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //long_term_pic_num
+          pRefPicListReordering->sReorderingSyn[iList][iIdx].uiLongTermPicNum = uiCode;
+        }
+
+        ++ iIdx;
+      } while (true);
+    }
+    if (keSt != B_SLICE)
+      break;
+    ++ iList;
+  } while (iList < LIST_A);
+
+  return ERR_NONE;
+}
+
+int32_t ParseDecRefPicMarking (PWelsDecoderContext pCtx, PBitStringAux pBs, PSliceHeader pSh, PSps pSps,
+                               const bool kbIdrFlag) {
+  PRefPicMarking const kpRefMarking = &pSh->sRefMarking;
+  uint32_t uiCode;
+  if (kbIdrFlag) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //no_output_of_prior_pics_flag
+    kpRefMarking->bNoOutputOfPriorPicsFlag = !!uiCode;
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //long_term_reference_flag
+    kpRefMarking->bLongTermRefFlag = !!uiCode;
+  } else {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_ref_pic_marking_mode_flag
+    kpRefMarking->bAdaptiveRefPicMarkingModeFlag = !!uiCode;
+    if (kpRefMarking->bAdaptiveRefPicMarkingModeFlag) {
+      int32_t iIdx = 0;
+      bool bAllowMmco5 = true, bMmco4Exist = false, bMmco5Exist = false, bMmco6Exist = false;
+      do {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //memory_management_control_operation
+        const uint32_t kuiMmco = uiCode;
+
+        kpRefMarking->sMmcoRef[iIdx].uiMmcoType = kuiMmco;
+        if (kuiMmco == MMCO_END)
+          break;
+
+        if (kuiMmco == MMCO_SHORT2UNUSED || kuiMmco == MMCO_SHORT2LONG) {
+          bAllowMmco5 = false;
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //difference_of_pic_nums_minus1
+          kpRefMarking->sMmcoRef[iIdx].iDiffOfPicNum = 1 + uiCode;
+          kpRefMarking->sMmcoRef[iIdx].iShortFrameNum = (pSh->iFrameNum - kpRefMarking->sMmcoRef[iIdx].iDiffOfPicNum) & ((
+                1 << pSps->uiLog2MaxFrameNum) - 1);
+        } else if (kuiMmco == MMCO_LONG2UNUSED) {
+          bAllowMmco5 = false;
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //long_term_pic_num
+          kpRefMarking->sMmcoRef[iIdx].uiLongTermPicNum = uiCode;
+        }
+        if (kuiMmco == MMCO_SHORT2LONG || kuiMmco == MMCO_LONG) {
+          if (kuiMmco == MMCO_LONG) {
+            WELS_VERIFY_RETURN_IF (-1, bMmco6Exist);
+            bMmco6Exist = true;
+          }
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //long_term_frame_idx
+          kpRefMarking->sMmcoRef[iIdx].iLongTermFrameIdx = uiCode;
+        } else if (kuiMmco == MMCO_SET_MAX_LONG) {
+          WELS_VERIFY_RETURN_IF (-1, bMmco4Exist);
+          bMmco4Exist = true;
+          WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //max_long_term_frame_idx_plus1
+          int32_t iMaxLongTermFrameIdx = -1 + uiCode;
+          if (iMaxLongTermFrameIdx > int32_t (pSps->uiLog2MaxFrameNum)) {
+            //ISO/IEC 14496-10:2009(E) 7.4.3.3 Decoded reference picture marking semantics page 96
+            return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REF_MARKING);
+          }
+          kpRefMarking->sMmcoRef[iIdx].iMaxLongTermFrameIdx = iMaxLongTermFrameIdx;
+        } else if (kuiMmco == MMCO_RESET) {
+          WELS_VERIFY_RETURN_IF (-1, (!bAllowMmco5 || bMmco5Exist));
+          bMmco5Exist = true;
+
+          pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb = 0;
+          pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb = 0;
+          pSh->iPicOrderCntLsb = 0;
+          if (pCtx->pSliceHeader)
+            pCtx->pSliceHeader->iPicOrderCntLsb = 0;
+        }
+        ++ iIdx;
+
+      } while (iIdx < MAX_MMCO_COUNT);
+    }
+  }
+
+  return ERR_NONE;
+}
+
+bool FillDefaultSliceHeaderExt (PSliceHeaderExt pShExt, PNalUnitHeaderExt pNalExt) {
+  if (pShExt == NULL || pNalExt == NULL)
+    return false;
+
+  if (pNalExt->iNoInterLayerPredFlag || pNalExt->uiQualityId > 0)
+    pShExt->bBasePredWeightTableFlag = false;
+  else
+    pShExt->bBasePredWeightTableFlag = true;
+  pShExt->uiRefLayerDqId = (uint8_t) - 1;
+  pShExt->uiDisableInterLayerDeblockingFilterIdc        = 0;
+  pShExt->iInterLayerSliceAlphaC0Offset                 = 0;
+  pShExt->iInterLayerSliceBetaOffset                    = 0;
+  pShExt->bConstrainedIntraResamplingFlag               = false;
+  pShExt->uiRefLayerChromaPhaseXPlus1Flag               = 0;
+  pShExt->uiRefLayerChromaPhaseYPlus1                   = 1;
+  //memset(&pShExt->sScaledRefLayer, 0, sizeof(SPosOffset));
+
+  pShExt->iScaledRefLayerPicWidthInSampleLuma   = pShExt->sSliceHeader.iMbWidth << 4;
+  pShExt->iScaledRefLayerPicHeightInSampleLuma  = pShExt->sSliceHeader.iMbHeight << 4;
+
+  pShExt->bSliceSkipFlag                = false;
+  pShExt->bAdaptiveBaseModeFlag         = false;
+  pShExt->bDefaultBaseModeFlag          = false;
+  pShExt->bAdaptiveMotionPredFlag       = false;
+  pShExt->bDefaultMotionPredFlag        = false;
+  pShExt->bAdaptiveResidualPredFlag     = false;
+  pShExt->bDefaultResidualPredFlag      = false;
+  pShExt->bTCoeffLevelPredFlag          = false;
+  pShExt->uiScanIdxStart                = 0;
+  pShExt->uiScanIdxEnd                  = 15;
+
+  return true;
+}
+
+int32_t InitBsBuffer (PWelsDecoderContext pCtx) {
+  if (pCtx == NULL)
+    return ERR_INFO_INVALID_PTR;
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  pCtx->iMaxBsBufferSizeInByte = MIN_ACCESS_UNIT_CAPACITY * MAX_BUFFERED_NUM;
+  if ((pCtx->sRawData.pHead = static_cast<uint8_t*> (pMa->WelsMallocz (pCtx->iMaxBsBufferSizeInByte,
+                              "pCtx->sRawData.pHead"))) == NULL) {
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+  pCtx->sRawData.pStartPos = pCtx->sRawData.pCurPos = pCtx->sRawData.pHead;
+  pCtx->sRawData.pEnd = pCtx->sRawData.pHead + pCtx->iMaxBsBufferSizeInByte;
+  if (pCtx->pParam->bParseOnly) {
+    pCtx->pParserBsInfo = static_cast<SParserBsInfo*> (pMa->WelsMallocz (sizeof (SParserBsInfo), "pCtx->pParserBsInfo"));
+    if (pCtx->pParserBsInfo == NULL) {
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+    memset (pCtx->pParserBsInfo, 0, sizeof (SParserBsInfo));
+    pCtx->pParserBsInfo->pDstBuff = static_cast<uint8_t*> (pMa->WelsMallocz (MAX_ACCESS_UNIT_CAPACITY * sizeof (uint8_t),
+                                    "pCtx->pParserBsInfo->pDstBuff"));
+    if (pCtx->pParserBsInfo->pDstBuff == NULL) {
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+    memset (pCtx->pParserBsInfo->pDstBuff, 0, MAX_ACCESS_UNIT_CAPACITY * sizeof (uint8_t));
+
+    if ((pCtx->sSavedData.pHead = static_cast<uint8_t*> (pMa->WelsMallocz (pCtx->iMaxBsBufferSizeInByte,
+                                  "pCtx->sSavedData.pHead"))) == NULL) {
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+    pCtx->sSavedData.pStartPos = pCtx->sSavedData.pCurPos = pCtx->sSavedData.pHead;
+    pCtx->sSavedData.pEnd = pCtx->sSavedData.pHead + pCtx->iMaxBsBufferSizeInByte;
+
+    pCtx->iMaxNalNum = MAX_NAL_UNITS_IN_LAYER + 2; //2 reserved for SPS+PPS
+    pCtx->pParserBsInfo->pNalLenInByte = static_cast<int*> (pMa->WelsMallocz (pCtx->iMaxNalNum * sizeof (int),
+                                         "pCtx->pParserBsInfo->pNalLenInByte"));
+    if (pCtx->pParserBsInfo->pNalLenInByte == NULL) {
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t ExpandBsBuffer (PWelsDecoderContext pCtx, const int kiSrcLen) {
+  if (pCtx == NULL)
+    return ERR_INFO_INVALID_PTR;
+  int32_t iExpandStepShift = 1;
+  int32_t iNewBuffLen = WELS_MAX ((kiSrcLen * MAX_BUFFERED_NUM), (pCtx->iMaxBsBufferSizeInByte << iExpandStepShift));
+  //allocate new bs buffer
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  //Realloc sRawData
+  uint8_t* pNewBsBuff = static_cast<uint8_t*> (pMa->WelsMallocz (iNewBuffLen, "pCtx->sRawData.pHead"));
+  if (pNewBsBuff == NULL) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "ExpandBsBuffer() Failed for malloc pNewBsBuff (%d)", iNewBuffLen);
+    pCtx->iErrorCode |= dsOutOfMemory;
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  //Calculate and set the bs start and end position
+  for (uint32_t i = 0; i <= pCtx->pAccessUnitList->uiActualUnitsNum; i++) {
+    PBitStringAux pSliceBitsRead = &pCtx->pAccessUnitList->pNalUnitsList[i]->sNalData.sVclNal.sSliceBitsRead;
+    pSliceBitsRead->pStartBuf = pSliceBitsRead->pStartBuf - pCtx->sRawData.pHead + pNewBsBuff;
+    pSliceBitsRead->pEndBuf   = pSliceBitsRead->pEndBuf   - pCtx->sRawData.pHead + pNewBsBuff;
+    pSliceBitsRead->pCurBuf   = pSliceBitsRead->pCurBuf   - pCtx->sRawData.pHead + pNewBsBuff;
+  }
+
+  //Copy current buffer status to new buffer
+  memcpy (pNewBsBuff, pCtx->sRawData.pHead, pCtx->iMaxBsBufferSizeInByte);
+  pCtx->sRawData.pStartPos = pNewBsBuff + (pCtx->sRawData.pStartPos - pCtx->sRawData.pHead);
+  pCtx->sRawData.pCurPos   = pNewBsBuff + (pCtx->sRawData.pCurPos   - pCtx->sRawData.pHead);
+  pCtx->sRawData.pEnd      = pNewBsBuff + iNewBuffLen;
+  pMa->WelsFree (pCtx->sRawData.pHead, "pCtx->sRawData.pHead");
+  pCtx->sRawData.pHead = pNewBsBuff;
+
+  if (pCtx->pParam->bParseOnly) {
+    //Realloc sSavedData
+    uint8_t* pNewSavedBsBuff = static_cast<uint8_t*> (pMa->WelsMallocz (iNewBuffLen, "pCtx->sSavedData.pHead"));
+    if (pNewSavedBsBuff == NULL) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "ExpandBsBuffer() Failed for malloc pNewSavedBsBuff (%d)", iNewBuffLen);
+      pCtx->iErrorCode |= dsOutOfMemory;
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+
+    //Copy current buffer status to new buffer
+    memcpy (pNewSavedBsBuff, pCtx->sSavedData.pHead, pCtx->iMaxBsBufferSizeInByte);
+    pCtx->sSavedData.pStartPos = pNewSavedBsBuff + (pCtx->sSavedData.pStartPos - pCtx->sSavedData.pHead);
+    pCtx->sSavedData.pCurPos   = pNewSavedBsBuff + (pCtx->sSavedData.pCurPos   - pCtx->sSavedData.pHead);
+    pCtx->sSavedData.pEnd      = pNewSavedBsBuff + iNewBuffLen;
+    pMa->WelsFree (pCtx->sSavedData.pHead, "pCtx->sSavedData.pHead");
+    pCtx->sSavedData.pHead = pNewSavedBsBuff;
+  }
+
+  pCtx->iMaxBsBufferSizeInByte = iNewBuffLen;
+  return ERR_NONE;
+}
+
+int32_t ExpandBsLenBuffer (PWelsDecoderContext pCtx, const int kiCurrLen) {
+  SParserBsInfo* pParser = pCtx->pParserBsInfo;
+  if (!pParser->pNalLenInByte)
+    return ERR_INFO_INVALID_ACCESS;
+
+  int iNewLen = kiCurrLen;
+  if (kiCurrLen >= MAX_MB_SIZE + 2) { //exceeds the max MB number of level 5.2
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "Current nal num (%d) exceededs %d.", kiCurrLen, MAX_MB_SIZE);
+    pCtx->iErrorCode |= dsOutOfMemory;
+    return ERR_INFO_OUT_OF_MEMORY;
+  } else {
+    iNewLen = kiCurrLen << 1;
+    iNewLen = WELS_MIN (iNewLen, MAX_MB_SIZE + 2);
+  }
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+  int* pNewLenBuffer = static_cast<int*> (pMa->WelsMallocz (iNewLen * sizeof (int),
+                                          "pCtx->pParserBsInfo->pNalLenInByte"));
+  if (pNewLenBuffer == NULL) {
+    pCtx->iErrorCode |= dsOutOfMemory;
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  //copy existing data from old length buffer to new
+  memcpy (pNewLenBuffer, pParser->pNalLenInByte, pCtx->iMaxNalNum * sizeof (int));
+  pMa->WelsFree (pParser->pNalLenInByte, "pCtx->pParserBsInfo->pNalLenInByte");
+  pParser->pNalLenInByte = pNewLenBuffer;
+  pCtx->iMaxNalNum = iNewLen;
+  return ERR_NONE;
+}
+
+int32_t CheckBsBuffer (PWelsDecoderContext pCtx, const int32_t kiSrcLen) {
+  if (kiSrcLen > MAX_ACCESS_UNIT_CAPACITY) { //exceeds max allowed data
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "Max AU size exceeded. Allowed size = %d, current size = %d",
+             MAX_ACCESS_UNIT_CAPACITY,
+             kiSrcLen);
+    pCtx->iErrorCode |= dsBitstreamError;
+    return ERR_INFO_INVALID_ACCESS;
+  } else if (kiSrcLen > pCtx->iMaxBsBufferSizeInByte /
+             MAX_BUFFERED_NUM) { //may lead to buffer overwrite, prevent it by expanding buffer
+    if (ExpandBsBuffer (pCtx, kiSrcLen)) {
+      return ERR_INFO_OUT_OF_MEMORY;
+    }
+  }
+
+  return ERR_NONE;
+}
+
+/*
+ * WelsInitStaticMemory
+ * Memory request for new introduced data
+ * Especially for:
+ * rbsp_au_buffer, cur_dq_layer_ptr and ref_dq_layer_ptr in MB info cache.
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h.
+*/
+int32_t WelsInitStaticMemory (PWelsDecoderContext pCtx) {
+  if (pCtx == NULL) {
+    return ERR_INFO_INVALID_PTR;
+  }
+
+  if (MemInitNalList (&pCtx->pAccessUnitList, MAX_NAL_UNIT_NUM_IN_AU, pCtx->pMemAlign) != 0)
+    return ERR_INFO_OUT_OF_MEMORY;
+
+  if (InitBsBuffer (pCtx) != 0)
+    return ERR_INFO_OUT_OF_MEMORY;
+
+  pCtx->uiTargetDqId            = (uint8_t) - 1;
+  pCtx->bEndOfStreamFlag        = false;
+
+  return ERR_NONE;
+}
+
+/*
+ * WelsFreeStaticMemory
+ * Free memory introduced in WelsInitStaticMemory at destruction of decoder.
+ *
+ */
+void WelsFreeStaticMemory (PWelsDecoderContext pCtx) {
+  if (pCtx == NULL)
+    return;
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  MemFreeNalList (&pCtx->pAccessUnitList, pMa);
+
+  if (pCtx->sRawData.pHead) {
+    pMa->WelsFree (pCtx->sRawData.pHead, "pCtx->sRawData->pHead");
+  }
+  pCtx->sRawData.pHead                = NULL;
+  pCtx->sRawData.pEnd                 = NULL;
+  pCtx->sRawData.pStartPos            = NULL;
+  pCtx->sRawData.pCurPos              = NULL;
+  if (pCtx->pParam->bParseOnly) {
+    if (pCtx->sSavedData.pHead) {
+      pMa->WelsFree (pCtx->sSavedData.pHead, "pCtx->sSavedData->pHead");
+    }
+    pCtx->sSavedData.pHead                = NULL;
+    pCtx->sSavedData.pEnd                 = NULL;
+    pCtx->sSavedData.pStartPos            = NULL;
+    pCtx->sSavedData.pCurPos              = NULL;
+    if (pCtx->pParserBsInfo) {
+      if (pCtx->pParserBsInfo->pNalLenInByte) {
+        pMa->WelsFree (pCtx->pParserBsInfo->pNalLenInByte, "pCtx->pParserBsInfo->pNalLenInByte");
+        pCtx->pParserBsInfo->pNalLenInByte = NULL;
+        pCtx->iMaxNalNum = 0;
+      }
+      if (pCtx->pParserBsInfo->pDstBuff) {
+        pMa->WelsFree (pCtx->pParserBsInfo->pDstBuff, "pCtx->pParserBsInfo->pDstBuff");
+        pCtx->pParserBsInfo->pDstBuff = NULL;
+      }
+      pMa->WelsFree (pCtx->pParserBsInfo, "pCtx->pParserBsInfo");
+      pCtx->pParserBsInfo = NULL;
+    }
+  }
+
+  if (NULL != pCtx->pParam) {
+    pMa->WelsFree (pCtx->pParam, "pCtx->pParam");
+
+    pCtx->pParam = NULL;
+  }
+}
+/*
+ *  DecodeNalHeaderExt
+ *  Trigger condition: NAL_UNIT_TYPE = NAL_UNIT_PREFIX or NAL_UNIT_CODED_SLICE_EXT
+ *  Parameter:
+ *  pNal:   target NALUnit ptr
+ *  pSrc:   NAL Unit bitstream
+ */
+void DecodeNalHeaderExt (PNalUnit pNal, uint8_t* pSrc) {
+  PNalUnitHeaderExt pHeaderExt = &pNal->sNalHeaderExt;
+
+  uint8_t uiCurByte = *pSrc;
+  pHeaderExt->bIdrFlag              = !! (uiCurByte & 0x40);
+  pHeaderExt->uiPriorityId          = uiCurByte & 0x3F;
+
+  uiCurByte = * (++pSrc);
+  pHeaderExt->iNoInterLayerPredFlag = uiCurByte >> 7;
+  pHeaderExt->uiDependencyId        = (uiCurByte & 0x70) >> 4;
+  pHeaderExt->uiQualityId           = uiCurByte & 0x0F;
+  uiCurByte = * (++pSrc);
+  pHeaderExt->uiTemporalId          = uiCurByte >> 5;
+  pHeaderExt->bUseRefBasePicFlag    = !! (uiCurByte & 0x10);
+  pHeaderExt->bDiscardableFlag      = !! (uiCurByte & 0x08);
+  pHeaderExt->bOutputFlag           = !! (uiCurByte & 0x04);
+  pHeaderExt->uiReservedThree2Bits  = uiCurByte & 0x03;
+  pHeaderExt->uiLayerDqId           = (pHeaderExt->uiDependencyId << 4) | pHeaderExt->uiQualityId;
+}
+
+
+void UpdateDecoderStatisticsForActiveParaset (SDecoderStatistics* pDecoderStatistics,
+    PSps pSps, PPps pPps) {
+  pDecoderStatistics->iCurrentActiveSpsId = pSps->iSpsId;
+
+  pDecoderStatistics->iCurrentActivePpsId = pPps->iPpsId;
+  pDecoderStatistics->uiProfile = static_cast<unsigned int> (pSps->uiProfileIdc);
+  pDecoderStatistics->uiLevel = pSps->uiLevelIdc;
+}
+
+#define SLICE_HEADER_IDR_PIC_ID_MAX 65535
+#define SLICE_HEADER_REDUNDANT_PIC_CNT_MAX 127
+#define SLICE_HEADER_ALPHAC0_BETA_OFFSET_MIN -12
+#define SLICE_HEADER_ALPHAC0_BETA_OFFSET_MAX 12
+#define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MIN -12
+#define SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MAX 12
+#define MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1 15
+#define MAX_NUM_REF_IDX_L1_ACTIVE_MINUS1 15
+#define SLICE_HEADER_CABAC_INIT_IDC_MAX 2
+/*
+ *  decode_slice_header_avc
+ *  Parse slice header of bitstream in avc for storing data structure
+ */
+int32_t ParseSliceHeaderSyntaxs (PWelsDecoderContext pCtx, PBitStringAux pBs, const bool kbExtensionFlag) {
+  PNalUnit const kpCurNal               =
+    pCtx->pAccessUnitList->pNalUnitsList[pCtx->pAccessUnitList->uiAvailUnitsNum -
+                                                                                1];
+
+  PNalUnitHeaderExt pNalHeaderExt       = NULL;
+  PSliceHeader pSliceHead               = NULL;
+  PSliceHeaderExt pSliceHeadExt         = NULL;
+  PSubsetSps pSubsetSps                 = NULL;
+  PSps pSps                             = NULL;
+  PPps pPps                             = NULL;
+  EWelsNalUnitType eNalType             = static_cast<EWelsNalUnitType> (0);
+  int32_t iPpsId                        = 0;
+  int32_t iRet                          = ERR_NONE;
+  uint8_t uiSliceType                   = 0;
+  uint8_t uiQualityId                   = BASE_QUALITY_ID;
+  bool  bIdrFlag                        = false;
+  bool  bSgChangeCycleInvolved          = false;        // involved slice group change cycle ?
+  uint32_t uiCode;
+  int32_t iCode;
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+
+  if (kpCurNal == NULL) {
+    return ERR_INFO_OUT_OF_MEMORY;
+  }
+
+  pNalHeaderExt = &kpCurNal->sNalHeaderExt;
+  pSliceHead    = &kpCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
+  eNalType      = pNalHeaderExt->sNalUnitHeader.eNalUnitType;
+
+  pSliceHeadExt = &kpCurNal->sNalData.sVclNal.sSliceHeaderExt;
+
+  if (pSliceHeadExt) {
+    SRefBasePicMarking sBaseMarking;
+    const bool kbStoreRefBaseFlag = pSliceHeadExt->bStoreRefBasePicFlag;
+    memcpy (&sBaseMarking, &pSliceHeadExt->sRefBasePicMarking, sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
+    memset (pSliceHeadExt, 0, sizeof (SSliceHeaderExt));
+    pSliceHeadExt->bStoreRefBasePicFlag = kbStoreRefBaseFlag;
+    memcpy (&pSliceHeadExt->sRefBasePicMarking, &sBaseMarking, sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
+  }
+
+  kpCurNal->sNalData.sVclNal.bSliceHeaderExtFlag = kbExtensionFlag;
+
+  // first_mb_in_slice
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //first_mb_in_slice
+  WELS_CHECK_SE_UPPER_ERROR (uiCode, 36863u, "first_mb_in_slice", GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                             ERR_INFO_INVALID_FIRST_MB_IN_SLICE));
+  pSliceHead->iFirstMbInSlice = uiCode;
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //slice_type
+  uiSliceType = uiCode;
+  if (uiSliceType > 9) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "slice type too large (%d) at first_mb(%d)", uiSliceType,
+             pSliceHead->iFirstMbInSlice);
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SLICE_TYPE);
+  }
+  if (uiSliceType > 4)
+    uiSliceType -= 5;
+
+  if ((NAL_UNIT_CODED_SLICE_IDR == eNalType) && (I_SLICE != uiSliceType)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "Invalid slice type(%d) in IDR picture. ", uiSliceType);
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SLICE_TYPE);
+  }
+
+  if (kbExtensionFlag) {
+    if (uiSliceType > 2) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "Invalid slice type(%d).", uiSliceType);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SLICE_TYPE);
+    }
+  }
+
+  pSliceHead->eSliceType = static_cast <EWelsSliceType> (uiSliceType);
+
+  WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //pic_parameter_set_id
+  WELS_CHECK_SE_UPPER_ERROR (uiCode, (MAX_PPS_COUNT - 1), "iPpsId out of range",
+                             GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                                 ERR_INFO_PPS_ID_OVERFLOW));
+  iPpsId = uiCode;
+
+  //add check PPS available here
+  if (pCtx->sSpsPpsCtx.bPpsAvailFlags[iPpsId] == false) {
+    pCtx->pDecoderStatistics->iPpsReportErrorNum++;
+    if (pCtx->sSpsPpsCtx.iPPSLastInvalidId != iPpsId) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "PPS id (%d) is invalid, previous id (%d) error ignored (%d)!", iPpsId,
+               pCtx->sSpsPpsCtx.iPPSLastInvalidId, pCtx->sSpsPpsCtx.iPPSInvalidNum);
+      pCtx->sSpsPpsCtx.iPPSLastInvalidId = iPpsId;
+      pCtx->sSpsPpsCtx.iPPSInvalidNum = 0;
+    } else {
+      pCtx->sSpsPpsCtx.iPPSInvalidNum++;
+    }
+    pCtx->iErrorCode |= dsNoParamSets;
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_PPS_ID);
+  }
+  pCtx->sSpsPpsCtx.iPPSLastInvalidId = -1;
+
+  pPps    = &pCtx->sSpsPpsCtx.sPpsBuffer[iPpsId];
+
+  if (pPps->uiNumSliceGroups == 0) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "Invalid PPS referenced");
+    pCtx->iErrorCode |= dsNoParamSets;
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_NO_PARAM_SETS);
+  }
+
+  if (kbExtensionFlag) {
+    pSubsetSps      = &pCtx->sSpsPpsCtx.sSubsetSpsBuffer[pPps->iSpsId];
+    pSps            = &pSubsetSps->sSps;
+    if (pCtx->sSpsPpsCtx.bSubspsAvailFlags[pPps->iSpsId] == false) {
+      pCtx->pDecoderStatistics->iSubSpsReportErrorNum++;
+      if (pCtx->sSpsPpsCtx.iSubSPSLastInvalidId != pPps->iSpsId) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "Sub SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId,
+                 pCtx->sSpsPpsCtx.iSubSPSLastInvalidId, pCtx->sSpsPpsCtx.iSubSPSInvalidNum);
+        pCtx->sSpsPpsCtx.iSubSPSLastInvalidId = pPps->iSpsId;
+        pCtx->sSpsPpsCtx.iSubSPSInvalidNum = 0;
+      } else {
+        pCtx->sSpsPpsCtx.iSubSPSInvalidNum++;
+      }
+      pCtx->iErrorCode |= dsNoParamSets;
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SPS_ID);
+    }
+    pCtx->sSpsPpsCtx.iSubSPSLastInvalidId = -1;
+  } else {
+    if (pCtx->sSpsPpsCtx.bSpsAvailFlags[pPps->iSpsId] == false) {
+      pCtx->pDecoderStatistics->iSpsReportErrorNum++;
+      if (pCtx->sSpsPpsCtx.iSPSLastInvalidId != pPps->iSpsId) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "SPS id (%d) is invalid, previous id (%d) error ignored (%d)!", pPps->iSpsId,
+                 pCtx->sSpsPpsCtx.iSPSLastInvalidId, pCtx->sSpsPpsCtx.iSPSInvalidNum);
+        pCtx->sSpsPpsCtx.iSPSLastInvalidId = pPps->iSpsId;
+        pCtx->sSpsPpsCtx.iSPSInvalidNum = 0;
+      } else {
+        pCtx->sSpsPpsCtx.iSPSInvalidNum++;
+      }
+      pCtx->iErrorCode |= dsNoParamSets;
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SPS_ID);
+    }
+    pCtx->sSpsPpsCtx.iSPSLastInvalidId = -1;
+    pSps = &pCtx->sSpsPpsCtx.sSpsBuffer[pPps->iSpsId];
+  }
+  pSliceHead->iPpsId = iPpsId;
+  pSliceHead->iSpsId = pPps->iSpsId;
+  pSliceHead->pPps   = pPps;
+  pSliceHead->pSps   = pSps;
+
+  pSliceHeadExt->pSubsetSps = pSubsetSps;
+
+  if (pSps->iNumRefFrames == 0) {
+    if ((uiSliceType != I_SLICE) && (uiSliceType != SI_SLICE)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "slice_type (%d) not supported for num_ref_frames = 0.", uiSliceType);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SLICE_TYPE);
+    }
+  }
+
+  bIdrFlag = (!kbExtensionFlag && eNalType == NAL_UNIT_CODED_SLICE_IDR) || (kbExtensionFlag && pNalHeaderExt->bIdrFlag);
+  pSliceHead->bIdrFlag = bIdrFlag;
+
+  if (pSps->uiLog2MaxFrameNum == 0) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "non existing SPS referenced");
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_NO_PARAM_SETS);
+  }
+  // check first_mb_in_slice
+  WELS_CHECK_SE_UPPER_ERROR ((uint32_t) (pSliceHead->iFirstMbInSlice), (pSps->uiTotalMbCount - 1), "first_mb_in_slice",
+                             GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_FIRST_MB_IN_SLICE));
+  WELS_READ_VERIFY (BsGetBits (pBs, pSps->uiLog2MaxFrameNum, &uiCode)); //frame_num
+  pSliceHead->iFrameNum = uiCode;
+
+  pSliceHead->bFieldPicFlag    = false;
+  pSliceHead->bBottomFiledFlag = false;
+  if (!pSps->bFrameMbsOnlyFlag) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "ParseSliceHeaderSyntaxs(): frame_mbs_only_flag = %d not supported. ",
+             pSps->bFrameMbsOnlyFlag);
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_MBAFF);
+  }
+  pSliceHead->iMbWidth  = pSps->iMbWidth;
+  pSliceHead->iMbHeight = pSps->iMbHeight / (1 + pSliceHead->bFieldPicFlag);
+
+  if (bIdrFlag) {
+    if (pSliceHead->iFrameNum != 0) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParseSliceHeaderSyntaxs(), invaild frame number: %d due to IDR frame introduced!",
+               pSliceHead->iFrameNum);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_FRAME_NUM);
+    }
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //idr_pic_id
+    // standard 7.4.3 idr_pic_id should be in range 0 to 65535, inclusive.
+    WELS_CHECK_SE_UPPER_ERROR (uiCode, SLICE_HEADER_IDR_PIC_ID_MAX, "idr_pic_id", GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                               ERR_INFO_INVALID_IDR_PIC_ID));
+    pSliceHead->uiIdrPicId = uiCode; /* uiIdrPicId */
+#ifdef LONG_TERM_REF
+    pCtx->uiCurIdrPicId = pSliceHead->uiIdrPicId;
+#endif
+  }
+
+  pSliceHead->iDeltaPicOrderCntBottom = 0;
+  pSliceHead->iDeltaPicOrderCnt[0] =
+    pSliceHead->iDeltaPicOrderCnt[1] = 0;
+  if (pSps->uiPocType == 0) {
+    WELS_READ_VERIFY (BsGetBits (pBs, pSps->iLog2MaxPocLsb, &uiCode)); //pic_order_cnt_lsb
+    const int32_t iMaxPocLsb = 1 << (pSps->iLog2MaxPocLsb);
+    pSliceHead->iPicOrderCntLsb = uiCode;
+    if (pPps->bPicOrderPresentFlag && !pSliceHead->bFieldPicFlag) {
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //delta_pic_order_cnt_bottom
+      pSliceHead->iDeltaPicOrderCntBottom = iCode;
+    }
+    //Calculate poc if necessary
+    int32_t pocLsb = pSliceHead->iPicOrderCntLsb;
+    if (pSliceHead->bIdrFlag || kpCurNal->sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR) {
+      pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb = 0;
+      pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb = 0;
+    }
+    int32_t pocMsb;
+    if (pocLsb < pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb
+        && pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb - pocLsb >= iMaxPocLsb / 2)
+      pocMsb = pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb + iMaxPocLsb;
+    else if (pocLsb > pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb
+             && pocLsb - pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb > iMaxPocLsb / 2)
+      pocMsb = pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb - iMaxPocLsb;
+    else
+      pocMsb = pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb;
+    pSliceHead->iPicOrderCntLsb = pocMsb + pocLsb;
+
+    if (pPps->bPicOrderPresentFlag && !pSliceHead->bFieldPicFlag) {
+      pSliceHead->iPicOrderCntLsb += pSliceHead->iDeltaPicOrderCntBottom;
+    }
+
+    if (kpCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc != 0) {
+      pCtx->pLastDecPicInfo->iPrevPicOrderCntLsb = pocLsb;
+      pCtx->pLastDecPicInfo->iPrevPicOrderCntMsb = pocMsb;
+    }
+    //End of Calculating poc
+  } else if (pSps->uiPocType == 1 && !pSps->bDeltaPicOrderAlwaysZeroFlag) {
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //delta_pic_order_cnt[ 0 ]
+    pSliceHead->iDeltaPicOrderCnt[0] = iCode;
+    if (pPps->bPicOrderPresentFlag && !pSliceHead->bFieldPicFlag) {
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //delta_pic_order_cnt[ 1 ]
+      pSliceHead->iDeltaPicOrderCnt[1] = iCode;
+    }
+  }
+  pSliceHead->iRedundantPicCnt = 0;
+  if (pPps->bRedundantPicCntPresentFlag) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //redundant_pic_cnt
+    // standard section 7.4.3, redundant_pic_cnt should be in range 0 to 127, inclusive.
+    WELS_CHECK_SE_UPPER_ERROR (uiCode, SLICE_HEADER_REDUNDANT_PIC_CNT_MAX, "redundant_pic_cnt",
+                               GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REDUNDANT_PIC_CNT));
+    pSliceHead->iRedundantPicCnt = uiCode;
+    if (pSliceHead->iRedundantPicCnt > 0) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "Redundant picture not supported!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_REDUNDANT_PIC_CNT);
+    }
+  }
+
+  if (B_SLICE == uiSliceType) {
+    //fix me: it needs to use the this flag somewhere for B-Sclice
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //direct_spatial_mv_pred_flag
+    pSliceHead->iDirectSpatialMvPredFlag = uiCode;
+  }
+
+  //set defaults, might be overriden a few line later
+  pSliceHead->uiRefCount[0] = pPps->uiNumRefIdxL0Active;
+  pSliceHead->uiRefCount[1] = pPps->uiNumRefIdxL1Active;
+
+  bool bReadNumRefFlag = (P_SLICE == uiSliceType || B_SLICE == uiSliceType);
+  if (kbExtensionFlag) {
+    bReadNumRefFlag &= (BASE_QUALITY_ID == pNalHeaderExt->uiQualityId);
+  }
+  if (bReadNumRefFlag) {
+    WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //num_ref_idx_active_override_flag
+    pSliceHead->bNumRefIdxActiveOverrideFlag = !!uiCode;
+    if (pSliceHead->bNumRefIdxActiveOverrideFlag) {
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //num_ref_idx_l0_active_minus1
+      WELS_CHECK_SE_UPPER_ERROR (uiCode, MAX_NUM_REF_IDX_L0_ACTIVE_MINUS1, "num_ref_idx_l0_active_minus1",
+                                 GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_NUM_REF_IDX_L0_ACTIVE_MINUS1));
+      pSliceHead->uiRefCount[0] = 1 + uiCode;
+      if (B_SLICE == uiSliceType) {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //num_ref_idx_l1_active_minus1
+        WELS_CHECK_SE_UPPER_ERROR (uiCode, MAX_NUM_REF_IDX_L1_ACTIVE_MINUS1, "num_ref_idx_l1_active_minus1",
+                                   GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_NUM_REF_IDX_L1_ACTIVE_MINUS1));
+        pSliceHead->uiRefCount[1] = 1 + uiCode;
+      }
+    }
+  }
+
+  if (pSliceHead->uiRefCount[0] > MAX_REF_PIC_COUNT || pSliceHead->uiRefCount[1] > MAX_REF_PIC_COUNT) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "reference overflow");
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_REF_COUNT_OVERFLOW);
+  }
+
+  if (BASE_QUALITY_ID == uiQualityId) {
+    iRet = ParseRefPicListReordering (pBs, pSliceHead);
+    if (iRet != ERR_NONE) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "invalid ref pPic list reordering syntaxs!");
+      return iRet;
+    }
+
+    if ((pPps->bWeightedPredFlag && uiSliceType == P_SLICE) || (pPps->uiWeightedBipredIdc == 1 && uiSliceType == B_SLICE)) {
+      iRet = ParsePredWeightedTable (pBs, pSliceHead);
+      if (iRet != ERR_NONE) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "invalid weighted prediction syntaxs!");
+        return iRet;
+      }
+    }
+
+    if (kbExtensionFlag) {
+      if (pNalHeaderExt->iNoInterLayerPredFlag || pNalHeaderExt->uiQualityId > 0)
+        pSliceHeadExt->bBasePredWeightTableFlag = false;
+      else
+        pSliceHeadExt->bBasePredWeightTableFlag = true;
+    }
+
+    if (kpCurNal->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc != 0) {
+      iRet = ParseDecRefPicMarking (pCtx, pBs, pSliceHead, pSps, bIdrFlag);
+      if (iRet != ERR_NONE) {
+        return iRet;
+      }
+
+      if (kbExtensionFlag && !pSubsetSps->sSpsSvcExt.bSliceHeaderRestrictionFlag) {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //store_ref_base_pic_flag
+        pSliceHeadExt->bStoreRefBasePicFlag = !!uiCode;
+        if ((pNalHeaderExt->bUseRefBasePicFlag || pSliceHeadExt->bStoreRefBasePicFlag) && !bIdrFlag) {
+          WelsLog (pLogCtx, WELS_LOG_WARNING,
+                   "ParseSliceHeaderSyntaxs(): bUseRefBasePicFlag or bStoreRefBasePicFlag = 1 not supported.");
+          return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_ILP);
+        }
+      }
+    }
+  }
+
+  if (pPps->bEntropyCodingModeFlag) {
+    if (pSliceHead->eSliceType != I_SLICE && pSliceHead->eSliceType != SI_SLICE) {
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode));
+      WELS_CHECK_SE_UPPER_ERROR (uiCode, SLICE_HEADER_CABAC_INIT_IDC_MAX, "cabac_init_idc", ERR_INFO_INVALID_CABAC_INIT_IDC);
+      pSliceHead->iCabacInitIdc = uiCode;
+    } else
+      pSliceHead->iCabacInitIdc = 0;
+  }
+
+  WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //slice_qp_delta
+  pSliceHead->iSliceQpDelta     = iCode;
+  pSliceHead->iSliceQp          = pPps->iPicInitQp + pSliceHead->iSliceQpDelta;
+  if (pSliceHead->iSliceQp < 0 || pSliceHead->iSliceQp > 51) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "QP %d out of range", pSliceHead->iSliceQp);
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_QP);
+  }
+
+  //FIXME qscale / qp ... stuff
+  if (!kbExtensionFlag) {
+    if (uiSliceType == SP_SLICE || uiSliceType == SI_SLICE) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "SP/SI not supported");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_SPSI);
+    }
+  }
+
+  pSliceHead->uiDisableDeblockingFilterIdc = 0;
+  pSliceHead->iSliceAlphaC0Offset          = 0;
+  pSliceHead->iSliceBetaOffset             = 0;
+  if (pPps->bDeblockingFilterControlPresentFlag) {
+    WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //disable_deblocking_filter_idc
+    pSliceHead->uiDisableDeblockingFilterIdc = uiCode;
+    //refer to JVT-X201wcm1.doc G.7.4.3.4--2010.4.20
+    if (pSliceHead->uiDisableDeblockingFilterIdc > 6) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "disable_deblock_filter_idc (%d) out of range [0, 6]",
+               pSliceHead->uiDisableDeblockingFilterIdc);
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_DBLOCKING_IDC);
+    }
+    if (pSliceHead->uiDisableDeblockingFilterIdc != 1) {
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //slice_alpha_c0_offset_div2
+      pSliceHead->iSliceAlphaC0Offset = iCode * 2;
+      WELS_CHECK_SE_BOTH_ERROR (pSliceHead->iSliceAlphaC0Offset, SLICE_HEADER_ALPHAC0_BETA_OFFSET_MIN,
+                                SLICE_HEADER_ALPHAC0_BETA_OFFSET_MAX, "slice_alpha_c0_offset_div2 * 2", GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                                    ERR_INFO_INVALID_SLICE_ALPHA_C0_OFFSET_DIV2));
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //slice_beta_offset_div2
+      pSliceHead->iSliceBetaOffset = iCode * 2;
+      WELS_CHECK_SE_BOTH_ERROR (pSliceHead->iSliceBetaOffset, SLICE_HEADER_ALPHAC0_BETA_OFFSET_MIN,
+                                SLICE_HEADER_ALPHAC0_BETA_OFFSET_MAX, "slice_beta_offset_div2 * 2", GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                                    ERR_INFO_INVALID_SLICE_BETA_OFFSET_DIV2));
+    }
+  }
+
+  bSgChangeCycleInvolved = (pPps->uiNumSliceGroups > 1 && pPps->uiSliceGroupMapType >= 3
+                            && pPps->uiSliceGroupMapType <= 5);
+  if (kbExtensionFlag && bSgChangeCycleInvolved)
+    bSgChangeCycleInvolved = (bSgChangeCycleInvolved && (uiQualityId == BASE_QUALITY_ID));
+  if (bSgChangeCycleInvolved) {
+    if (pPps->uiSliceGroupChangeRate > 0) {
+      const int32_t kiNumBits = (int32_t)WELS_CEIL (log (static_cast<double> (1 + pPps->uiPicSizeInMapUnits /
+                                pPps->uiSliceGroupChangeRate)));
+      WELS_READ_VERIFY (BsGetBits (pBs, kiNumBits, &uiCode)); //lice_group_change_cycle
+      pSliceHead->iSliceGroupChangeCycle = uiCode;
+    } else
+      pSliceHead->iSliceGroupChangeCycle = 0;
+  }
+
+  if (!kbExtensionFlag) {
+    FillDefaultSliceHeaderExt (pSliceHeadExt, pNalHeaderExt);
+  } else {
+    /* Extra syntax elements newly introduced */
+    pSliceHeadExt->pSubsetSps = pSubsetSps;
+
+    if (!pNalHeaderExt->iNoInterLayerPredFlag && BASE_QUALITY_ID == uiQualityId) {
+      //the following should be deleted for CODE_CLEAN
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //ref_layer_dq_id
+      pSliceHeadExt->uiRefLayerDqId = uiCode;
+      if (pSubsetSps->sSpsSvcExt.bInterLayerDeblockingFilterCtrlPresentFlag) {
+        WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //disable_inter_layer_deblocking_filter_idc
+        pSliceHeadExt->uiDisableInterLayerDeblockingFilterIdc = uiCode;
+        //refer to JVT-X201wcm1.doc G.7.4.3.4--2010.4.20
+        if (pSliceHeadExt->uiDisableInterLayerDeblockingFilterIdc > 6) {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "disable_inter_layer_deblock_filter_idc (%d) out of range [0, 6]",
+                   pSliceHeadExt->uiDisableInterLayerDeblockingFilterIdc);
+          return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_DBLOCKING_IDC);
+        }
+        if (pSliceHeadExt->uiDisableInterLayerDeblockingFilterIdc != 1) {
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //inter_layer_slice_alpha_c0_offset_div2
+          pSliceHeadExt->iInterLayerSliceAlphaC0Offset = iCode * 2;
+          WELS_CHECK_SE_BOTH_ERROR (pSliceHeadExt->iInterLayerSliceAlphaC0Offset,
+                                    SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MIN, SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MAX,
+                                    "inter_layer_alpha_c0_offset_div2 * 2", GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER,
+                                        ERR_INFO_INVALID_SLICE_ALPHA_C0_OFFSET_DIV2));
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //inter_layer_slice_beta_offset_div2
+          pSliceHeadExt->iInterLayerSliceBetaOffset = iCode * 2;
+          WELS_CHECK_SE_BOTH_ERROR (pSliceHeadExt->iInterLayerSliceBetaOffset, SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MIN,
+                                    SLICE_HEADER_INTER_LAYER_ALPHAC0_BETA_OFFSET_MAX, "inter_layer_slice_beta_offset_div2 * 2",
+                                    GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_INVALID_SLICE_BETA_OFFSET_DIV2));
+        }
+      }
+
+      pSliceHeadExt->uiRefLayerChromaPhaseXPlus1Flag = pSubsetSps->sSpsSvcExt.uiSeqRefLayerChromaPhaseXPlus1Flag;
+      pSliceHeadExt->uiRefLayerChromaPhaseYPlus1     = pSubsetSps->sSpsSvcExt.uiSeqRefLayerChromaPhaseYPlus1;
+
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //constrained_intra_resampling_flag
+      pSliceHeadExt->bConstrainedIntraResamplingFlag = !!uiCode;
+
+      {
+        SPosOffset pos;
+        pos.iLeftOffset   = pSubsetSps->sSpsSvcExt.sSeqScaledRefLayer.iLeftOffset;
+        pos.iTopOffset    = pSubsetSps->sSpsSvcExt.sSeqScaledRefLayer.iTopOffset * (2 - pSps->bFrameMbsOnlyFlag);
+        pos.iRightOffset  = pSubsetSps->sSpsSvcExt.sSeqScaledRefLayer.iRightOffset;
+        pos.iBottomOffset = pSubsetSps->sSpsSvcExt.sSeqScaledRefLayer.iBottomOffset * (2 - pSps->bFrameMbsOnlyFlag);
+        //memcpy(&pSliceHeadExt->sScaledRefLayer, &pos, sizeof(SPosOffset));//confirmed_safe_unsafe_usage
+        pSliceHeadExt->iScaledRefLayerPicWidthInSampleLuma  = (pSliceHead->iMbWidth << 4) -
+            (pos.iLeftOffset + pos.iRightOffset);
+        pSliceHeadExt->iScaledRefLayerPicHeightInSampleLuma = (pSliceHead->iMbHeight << 4) -
+            (pos.iTopOffset + pos.iBottomOffset) / (1 + pSliceHead->bFieldPicFlag);
+      }
+    } else if (uiQualityId > BASE_QUALITY_ID) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "MGS not supported.");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_MGS);
+    } else {
+      pSliceHeadExt->uiRefLayerDqId = (uint8_t) - 1;
+    }
+
+    pSliceHeadExt->bSliceSkipFlag            = false;
+    pSliceHeadExt->bAdaptiveBaseModeFlag     = false;
+    pSliceHeadExt->bDefaultBaseModeFlag      = false;
+    pSliceHeadExt->bAdaptiveMotionPredFlag   = false;
+    pSliceHeadExt->bDefaultMotionPredFlag    = false;
+    pSliceHeadExt->bAdaptiveResidualPredFlag = false;
+    pSliceHeadExt->bDefaultResidualPredFlag  = false;
+    if (pNalHeaderExt->iNoInterLayerPredFlag)
+      pSliceHeadExt->bTCoeffLevelPredFlag    = false;
+    else
+      pSliceHeadExt->bTCoeffLevelPredFlag    = pSubsetSps->sSpsSvcExt.bSeqTCoeffLevelPredFlag;
+
+    if (!pNalHeaderExt->iNoInterLayerPredFlag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //slice_skip_flag
+      pSliceHeadExt->bSliceSkipFlag = !!uiCode;
+      if (pSliceHeadExt->bSliceSkipFlag) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "bSliceSkipFlag == 1 not supported.");
+        return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_SLICESKIP);
+      } else {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_base_mode_flag
+        pSliceHeadExt->bAdaptiveBaseModeFlag = !!uiCode;
+        if (!pSliceHeadExt->bAdaptiveBaseModeFlag) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //default_base_mode_flag
+          pSliceHeadExt->bDefaultBaseModeFlag = !!uiCode;
+        }
+        if (!pSliceHeadExt->bDefaultBaseModeFlag) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_motion_prediction_flag
+          pSliceHeadExt->bAdaptiveMotionPredFlag = !!uiCode;
+          if (!pSliceHeadExt->bAdaptiveMotionPredFlag) {
+            WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //default_motion_prediction_flag
+            pSliceHeadExt->bDefaultMotionPredFlag = !!uiCode;
+          }
+        }
+
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //adaptive_residual_prediction_flag
+        pSliceHeadExt->bAdaptiveResidualPredFlag = !!uiCode;
+        if (!pSliceHeadExt->bAdaptiveResidualPredFlag) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //default_residual_prediction_flag
+          pSliceHeadExt->bDefaultResidualPredFlag = !!uiCode;
+        }
+      }
+      if (pSubsetSps->sSpsSvcExt.bAdaptiveTCoeffLevelPredFlag) {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //tcoeff_level_prediction_flag
+        pSliceHeadExt->bTCoeffLevelPredFlag = !!uiCode;
+      }
+    }
+
+    if (!pSubsetSps->sSpsSvcExt.bSliceHeaderRestrictionFlag) {
+      WELS_READ_VERIFY (BsGetBits (pBs, 4, &uiCode)); //scan_idx_start
+      pSliceHeadExt->uiScanIdxStart = uiCode;
+      WELS_READ_VERIFY (BsGetBits (pBs, 4, &uiCode)); //scan_idx_end
+      pSliceHeadExt->uiScanIdxEnd = uiCode;
+      if (pSliceHeadExt->uiScanIdxStart != 0 || pSliceHeadExt->uiScanIdxEnd != 15) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "uiScanIdxStart (%d) != 0 and uiScanIdxEnd (%d) !=15 not supported here",
+                 pSliceHeadExt->uiScanIdxStart, pSliceHeadExt->uiScanIdxEnd);
+        return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_UNSUPPORTED_MGS);
+      }
+    } else {
+      pSliceHeadExt->uiScanIdxStart = 0;
+      pSliceHeadExt->uiScanIdxEnd   = 15;
+    }
+  }
+
+  return ERR_NONE;
+}
+
+/*
+ *  Copy relative syntax elements of NALUnitHeaderExt, sRefPicBaseMarking and bStoreRefBasePicFlag in prefix nal unit.
+ *  pSrc:   mark as decoded prefix NAL
+ *  ppDst:  succeeded VCL NAL based AVC (I/P Slice)
+ */
+bool PrefetchNalHeaderExtSyntax (PWelsDecoderContext pCtx, PNalUnit const kppDst, PNalUnit const kpSrc) {
+  PNalUnitHeaderExt pNalHdrExtD = NULL, pNalHdrExtS = NULL;
+  PSliceHeaderExt pShExtD = NULL;
+  PPrefixNalUnit pPrefixS = NULL;
+  PSps pSps = NULL;
+  int32_t iIdx = 0;
+
+  if (kppDst == NULL || kpSrc == NULL)
+    return false;
+
+  pNalHdrExtD   = &kppDst->sNalHeaderExt;
+  pNalHdrExtS   = &kpSrc->sNalHeaderExt;
+  pShExtD       = &kppDst->sNalData.sVclNal.sSliceHeaderExt;
+  pPrefixS      = &kpSrc->sNalData.sPrefixNal;
+  pSps          = &pCtx->sSpsPpsCtx.sSpsBuffer[pCtx->sSpsPpsCtx.sPpsBuffer[pShExtD->sSliceHeader.iPpsId].iSpsId];
+
+  pNalHdrExtD->uiDependencyId           = pNalHdrExtS->uiDependencyId;
+  pNalHdrExtD->uiQualityId              = pNalHdrExtS->uiQualityId;
+  pNalHdrExtD->uiTemporalId             = pNalHdrExtS->uiTemporalId;
+  pNalHdrExtD->uiPriorityId             = pNalHdrExtS->uiPriorityId;
+  pNalHdrExtD->bIdrFlag                 = pNalHdrExtS->bIdrFlag;
+  pNalHdrExtD->iNoInterLayerPredFlag    = pNalHdrExtS->iNoInterLayerPredFlag;
+  pNalHdrExtD->bDiscardableFlag         = pNalHdrExtS->bDiscardableFlag;
+  pNalHdrExtD->bOutputFlag              = pNalHdrExtS->bOutputFlag;
+  pNalHdrExtD->bUseRefBasePicFlag       = pNalHdrExtS->bUseRefBasePicFlag;
+  pNalHdrExtD->uiLayerDqId              = pNalHdrExtS->uiLayerDqId;
+
+  pShExtD->bStoreRefBasePicFlag         = pPrefixS->bStoreRefBasePicFlag;
+  memcpy (&pShExtD->sRefBasePicMarking, &pPrefixS->sRefPicBaseMarking,
+          sizeof (SRefBasePicMarking)); //confirmed_safe_unsafe_usage
+  if (pShExtD->sRefBasePicMarking.bAdaptiveRefBasePicMarkingModeFlag) {
+    PRefBasePicMarking pRefBasePicMarking = &pShExtD->sRefBasePicMarking;
+    iIdx = 0;
+    do {
+      if (pRefBasePicMarking->mmco_base[iIdx].uiMmcoType == MMCO_END)
+        break;
+      if (pRefBasePicMarking->mmco_base[iIdx].uiMmcoType == MMCO_SHORT2UNUSED)
+        pRefBasePicMarking->mmco_base[iIdx].iShortFrameNum = (pShExtD->sSliceHeader.iFrameNum -
+            pRefBasePicMarking->mmco_base[iIdx].uiDiffOfPicNums) & ((1 << pSps->uiLog2MaxFrameNum) - 1);
+      ++ iIdx;
+    } while (iIdx < MAX_MMCO_COUNT);
+  }
+
+  return true;
+}
+
+
+
+int32_t UpdateAccessUnit (PWelsDecoderContext pCtx) {
+  PAccessUnit pCurAu   = pCtx->pAccessUnitList;
+  int32_t iIdx         = pCurAu->uiEndPos;
+
+  // Conversed iterator
+  pCtx->uiTargetDqId = pCurAu->pNalUnitsList[iIdx]->sNalHeaderExt.uiLayerDqId;
+  pCurAu->uiActualUnitsNum  = iIdx + 1;
+  pCurAu->bCompletedAuFlag = true;
+
+  // Added for mosaic avoidance, 11/19/2009
+#ifdef LONG_TERM_REF
+  if (pCtx->bParamSetsLostFlag || pCtx->bNewSeqBegin)
+#else
+  if (pCtx->bReferenceLostAtT0Flag || pCtx->bNewSeqBegin)
+#endif
+  {
+    uint32_t uiActualIdx = 0;
+    while (uiActualIdx < pCurAu->uiActualUnitsNum) {
+      PNalUnit nal = pCurAu->pNalUnitsList[uiActualIdx];
+
+      if (nal->sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR || nal->sNalHeaderExt.bIdrFlag) {
+        break;
+      }
+      ++ uiActualIdx;
+    }
+    if (uiActualIdx ==
+        pCurAu->uiActualUnitsNum) { // no found IDR nal within incoming AU, need exit to avoid mosaic issue, 11/19/2009
+
+      pCtx->pDecoderStatistics->uiIDRLostNum++;
+      if (!pCtx->bParamSetsLostFlag)
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+                 "UpdateAccessUnit():::::Key frame lost.....CAN NOT find IDR from current AU.");
+      pCtx->iErrorCode |= dsRefLost;
+      if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+#ifdef LONG_TERM_REF
+        pCtx->iErrorCode |= dsNoParamSets;
+        return dsNoParamSets;
+#else
+        pCtx->iErrorCode |= dsRefLost;
+        return ERR_INFO_REFERENCE_PIC_LOST;
+#endif
+      }
+    }
+  }
+
+  return ERR_NONE;
+}
+
+int32_t InitialDqLayersContext (PWelsDecoderContext pCtx, const int32_t kiMaxWidth, const int32_t kiMaxHeight) {
+  int32_t i = 0;
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pCtx || kiMaxWidth <= 0 || kiMaxHeight <= 0))
+  pCtx->sMb.iMbWidth  = (kiMaxWidth + 15) >> 4;
+  pCtx->sMb.iMbHeight = (kiMaxHeight + 15) >> 4;
+
+  if (pCtx->bInitialDqLayersMem && kiMaxWidth <= pCtx->iPicWidthReq
+      && kiMaxHeight <= pCtx->iPicHeightReq) // have same dimension memory, skipped
+    return ERR_NONE;
+
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  UninitialDqLayersContext (pCtx);
+
+  do {
+    PDqLayer pDq = (PDqLayer)pMa->WelsMallocz (sizeof (SDqLayer), "PDqLayer");
+
+    if (pDq == NULL)
+      return ERR_INFO_OUT_OF_MEMORY;
+
+    pCtx->pDqLayersList[i] = pDq; //to keep consistence with in UninitialDqLayersContext()
+    memset (pDq, 0, sizeof (SDqLayer));
+
+    pCtx->sMb.pMbType[i] = (uint32_t*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (uint32_t),
+                           "pCtx->sMb.pMbType[]");
+    pCtx->sMb.pMv[i][LIST_0] = (int16_t (*)[16][2])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                 int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]");
+    pCtx->sMb.pMv[i][LIST_1] = (int16_t (*)[16][2])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                 int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMv[][]");
+
+    pCtx->sMb.pRefIndex[i][LIST_0] = (int8_t (*)[MB_BLOCK4x4_NUM])pMa->WelsMallocz (pCtx->sMb.iMbWidth *
+                                     pCtx->sMb.iMbHeight *
+                                     sizeof (
+                                       int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[][]");
+    pCtx->sMb.pRefIndex[i][LIST_1] = (int8_t (*)[MB_BLOCK4x4_NUM])pMa->WelsMallocz (pCtx->sMb.iMbWidth *
+                                     pCtx->sMb.iMbHeight *
+                                     sizeof (
+                                       int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[][]");
+    pCtx->sMb.pDirect[i] = (int8_t (*)[MB_BLOCK4x4_NUM])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *
+                           sizeof (
+                             int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pDirect[]");
+    pCtx->sMb.pLumaQp[i] = (int8_t*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),
+                           "pCtx->sMb.pLumaQp[]");
+    pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[i] = (bool*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *
+        sizeof (
+          bool),
+        "pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[]");
+    pCtx->sMb.pTransformSize8x8Flag[i] = (bool*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                           bool),
+                                         "pCtx->sMb.pTransformSize8x8Flag[]");
+    pCtx->sMb.pChromaQp[i] = (int8_t (*)[2])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                               int8_t) * 2,
+                             "pCtx->sMb.pChromaQp[]");
+    pCtx->sMb.pMvd[i][LIST_0] = (int16_t (*)[16][2])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                  int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMvd[][]");
+    pCtx->sMb.pMvd[i][LIST_1] = (int16_t (*)[16][2])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                  int16_t) * MV_A * MB_BLOCK4x4_NUM, "pCtx->sMb.pMvd[][]");
+    pCtx->sMb.pCbfDc[i] = (uint16_t*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (uint16_t),
+                          "pCtx->sMb.pCbfDc[]");
+    pCtx->sMb.pNzc[i] = (int8_t (*)[24])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                          int8_t) * 24,
+                        "pCtx->sMb.pNzc[]");
+    pCtx->sMb.pNzcRs[i] = (int8_t (*)[24])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                            int8_t) * 24,
+                          "pCtx->sMb.pNzcRs[]");
+    pCtx->sMb.pScaledTCoeff[i] = (int16_t (*)[MB_COEFF_LIST_SIZE])pMa->WelsMallocz (pCtx->sMb.iMbWidth *
+                                 pCtx->sMb.iMbHeight *
+                                 sizeof (int16_t) * MB_COEFF_LIST_SIZE, "pCtx->sMb.pScaledTCoeff[]");
+    pCtx->sMb.pIntraPredMode[i] = (int8_t (*)[8])pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                    int8_t) * 8,
+                                  "pCtx->sMb.pIntraPredMode[]");
+    pCtx->sMb.pIntra4x4FinalMode[i] = (int8_t (*)[MB_BLOCK4x4_NUM])pMa->WelsMallocz (pCtx->sMb.iMbWidth *
+                                      pCtx->sMb.iMbHeight *
+                                      sizeof (int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pIntra4x4FinalMode[]");
+    pCtx->sMb.pIntraNxNAvailFlag[i] = (uint8_t (*))pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                        int8_t),
+                                      "pCtx->sMb.pIntraNxNAvailFlag");
+    pCtx->sMb.pChromaPredMode[i] = (int8_t*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),
+                                   "pCtx->sMb.pChromaPredMode[]");
+    pCtx->sMb.pCbp[i] = (int8_t*)pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int8_t),
+                        "pCtx->sMb.pCbp[]");
+    pCtx->sMb.pSubMbType[i] = (uint32_t (*)[MB_PARTITION_SIZE])pMa->WelsMallocz (pCtx->sMb.iMbWidth *
+                              pCtx->sMb.iMbHeight *
+                              sizeof (
+                                uint32_t) * MB_PARTITION_SIZE, "pCtx->sMb.pSubMbType[]");
+    pCtx->sMb.pSliceIdc[i] = (int32_t*) pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t),
+                             "pCtx->sMb.pSliceIdc[]"); // using int32_t for slice_idc, 4/21/2010
+    pCtx->sMb.pResidualPredFlag[i] = (int8_t*) pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                       int8_t),
+                                     "pCtx->sMb.pResidualPredFlag[]");
+    pCtx->sMb.pInterPredictionDoneFlag[i] = (int8_t*) pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight *
+                                            sizeof (
+                                                int8_t), "pCtx->sMb.pInterPredictionDoneFlag[]");
+
+    pCtx->sMb.pMbCorrectlyDecodedFlag[i] = (bool*) pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+        bool),
+                                           "pCtx->sMb.pMbCorrectlyDecodedFlag[]");
+    pCtx->sMb.pMbRefConcealedFlag[i] = (bool*) pMa->WelsMallocz (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (
+                                         bool),
+                                       "pCtx->pMbRefConcealedFlag[]");
+
+    // check memory block valid due above allocated..
+    WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY,
+                           ((NULL == pCtx->sMb.pMbType[i]) ||
+                            (NULL == pCtx->sMb.pMv[i][LIST_0]) ||
+                            (NULL == pCtx->sMb.pMv[i][LIST_1]) ||
+                            (NULL == pCtx->sMb.pRefIndex[i][LIST_0]) ||
+                            (NULL == pCtx->sMb.pRefIndex[i][LIST_1]) ||
+                            (NULL == pCtx->sMb.pDirect[i]) ||
+                            (NULL == pCtx->sMb.pLumaQp[i]) ||
+                            (NULL == pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[i]) ||
+                            (NULL == pCtx->sMb.pTransformSize8x8Flag[i]) ||
+                            (NULL == pCtx->sMb.pChromaQp[i]) ||
+                            (NULL == pCtx->sMb.pMvd[i][LIST_0]) ||
+                            (NULL == pCtx->sMb.pMvd[i][LIST_1]) ||
+                            (NULL == pCtx->sMb.pCbfDc[i]) ||
+                            (NULL == pCtx->sMb.pNzc[i]) ||
+                            (NULL == pCtx->sMb.pNzcRs[i]) ||
+                            (NULL == pCtx->sMb.pScaledTCoeff[i]) ||
+                            (NULL == pCtx->sMb.pIntraPredMode[i]) ||
+                            (NULL == pCtx->sMb.pIntra4x4FinalMode[i]) ||
+                            (NULL == pCtx->sMb.pIntraNxNAvailFlag[i]) ||
+                            (NULL == pCtx->sMb.pChromaPredMode[i]) ||
+                            (NULL == pCtx->sMb.pCbp[i]) ||
+                            (NULL == pCtx->sMb.pSubMbType[i]) ||
+                            (NULL == pCtx->sMb.pSliceIdc[i]) ||
+                            (NULL == pCtx->sMb.pResidualPredFlag[i]) ||
+                            (NULL == pCtx->sMb.pInterPredictionDoneFlag[i]) ||
+                            (NULL == pCtx->sMb.pMbRefConcealedFlag[i]) ||
+                            (NULL == pCtx->sMb.pMbCorrectlyDecodedFlag[i])
+                           )
+                          )
+
+    memset (pCtx->sMb.pSliceIdc[i], 0xff, (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t)));
+
+    ++ i;
+  } while (i < LAYER_NUM_EXCHANGEABLE);
+
+  pCtx->bInitialDqLayersMem     = true;
+  pCtx->iPicWidthReq            = kiMaxWidth;
+  pCtx->iPicHeightReq           = kiMaxHeight;
+
+  return ERR_NONE;
+}
+
+
+
+void UninitialDqLayersContext (PWelsDecoderContext pCtx) {
+  int32_t i = 0;
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  do {
+    PDqLayer pDq = pCtx->pDqLayersList[i];
+    if (pDq == NULL) {
+      ++ i;
+      continue;
+    }
+
+    if (pCtx->sMb.pMbType[i]) {
+      pMa->WelsFree (pCtx->sMb.pMbType[i], "pCtx->sMb.pMbType[]");
+
+      pCtx->sMb.pMbType[i] = NULL;
+    }
+
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      if (pCtx->sMb.pMv[i][listIdx]) {
+        pMa->WelsFree (pCtx->sMb.pMv[i][listIdx], "pCtx->sMb.pMv[][]");
+        pCtx->sMb.pMv[i][listIdx] = NULL;
+      }
+
+      if (pCtx->sMb.pRefIndex[i][listIdx]) {
+        pMa->WelsFree (pCtx->sMb.pRefIndex[i][listIdx], "pCtx->sMb.pRefIndex[][]");
+        pCtx->sMb.pRefIndex[i][listIdx] = NULL;
+      }
+
+      if (pCtx->sMb.pDirect[i]) {
+        pMa->WelsFree (pCtx->sMb.pDirect[i], "pCtx->sMb.pDirect[]");
+        pCtx->sMb.pDirect[i] = NULL;
+      }
+
+      if (pCtx->sMb.pMvd[i][listIdx]) {
+        pMa->WelsFree (pCtx->sMb.pMvd[i][listIdx], "pCtx->sMb.pMvd[][]");
+        pCtx->sMb.pMvd[i][listIdx] = NULL;
+      }
+    }
+
+    if (pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[i]) {
+      pMa->WelsFree (pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[i], "pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[]");
+
+      pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pTransformSize8x8Flag[i]) {
+      pMa->WelsFree (pCtx->sMb.pTransformSize8x8Flag[i], "pCtx->sMb.pTransformSize8x8Flag[]");
+
+      pCtx->sMb.pTransformSize8x8Flag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pLumaQp[i]) {
+      pMa->WelsFree (pCtx->sMb.pLumaQp[i], "pCtx->sMb.pLumaQp[]");
+
+      pCtx->sMb.pLumaQp[i] = NULL;
+    }
+
+    if (pCtx->sMb.pChromaQp[i]) {
+      pMa->WelsFree (pCtx->sMb.pChromaQp[i], "pCtx->sMb.pChromaQp[]");
+
+      pCtx->sMb.pChromaQp[i] = NULL;
+    }
+
+    if (pCtx->sMb.pCbfDc[i]) {
+      pMa->WelsFree (pCtx->sMb.pCbfDc[i], "pCtx->sMb.pCbfDc[]");
+      pCtx->sMb.pCbfDc[i] = NULL;
+    }
+
+    if (pCtx->sMb.pNzc[i]) {
+      pMa->WelsFree (pCtx->sMb.pNzc[i], "pCtx->sMb.pNzc[]");
+
+      pCtx->sMb.pNzc[i] = NULL;
+    }
+
+    if (pCtx->sMb.pNzcRs[i]) {
+      pMa->WelsFree (pCtx->sMb.pNzcRs[i], "pCtx->sMb.pNzcRs[]");
+
+      pCtx->sMb.pNzcRs[i] = NULL;
+    }
+
+    if (pCtx->sMb.pScaledTCoeff[i]) {
+      pMa->WelsFree (pCtx->sMb.pScaledTCoeff[i], "pCtx->sMb.pScaledTCoeff[]");
+
+      pCtx->sMb.pScaledTCoeff[i] = NULL;
+    }
+
+    if (pCtx->sMb.pIntraPredMode[i]) {
+      pMa->WelsFree (pCtx->sMb.pIntraPredMode[i], "pCtx->sMb.pIntraPredMode[]");
+
+      pCtx->sMb.pIntraPredMode[i] = NULL;
+    }
+
+    if (pCtx->sMb.pIntra4x4FinalMode[i]) {
+      pMa->WelsFree (pCtx->sMb.pIntra4x4FinalMode[i], "pCtx->sMb.pIntra4x4FinalMode[]");
+
+      pCtx->sMb.pIntra4x4FinalMode[i] = NULL;
+    }
+
+    if (pCtx->sMb.pIntraNxNAvailFlag[i]) {
+      pMa->WelsFree (pCtx->sMb.pIntraNxNAvailFlag[i], "pCtx->sMb.pIntraNxNAvailFlag");
+
+      pCtx->sMb.pIntraNxNAvailFlag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pChromaPredMode[i]) {
+      pMa->WelsFree (pCtx->sMb.pChromaPredMode[i], "pCtx->sMb.pChromaPredMode[]");
+
+      pCtx->sMb.pChromaPredMode[i] = NULL;
+    }
+
+    if (pCtx->sMb.pCbp[i]) {
+      pMa->WelsFree (pCtx->sMb.pCbp[i], "pCtx->sMb.pCbp[]");
+
+      pCtx->sMb.pCbp[i] = NULL;
+    }
+
+    //      if (pCtx->sMb.pMotionPredFlag[i])
+    //{
+    //  pMa->WelsFree( pCtx->sMb.pMotionPredFlag[i], "pCtx->sMb.pMotionPredFlag[]" );
+
+    //  pCtx->sMb.pMotionPredFlag[i] = NULL;
+    //}
+
+    if (pCtx->sMb.pSubMbType[i]) {
+      pMa->WelsFree (pCtx->sMb.pSubMbType[i], "pCtx->sMb.pSubMbType[]");
+
+      pCtx->sMb.pSubMbType[i] = NULL;
+    }
+
+    if (pCtx->sMb.pSliceIdc[i]) {
+      pMa->WelsFree (pCtx->sMb.pSliceIdc[i], "pCtx->sMb.pSliceIdc[]");
+
+      pCtx->sMb.pSliceIdc[i] = NULL;
+    }
+
+    if (pCtx->sMb.pResidualPredFlag[i]) {
+      pMa->WelsFree (pCtx->sMb.pResidualPredFlag[i], "pCtx->sMb.pResidualPredFlag[]");
+
+      pCtx->sMb.pResidualPredFlag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pInterPredictionDoneFlag[i]) {
+      pMa->WelsFree (pCtx->sMb.pInterPredictionDoneFlag[i], "pCtx->sMb.pInterPredictionDoneFlag[]");
+
+      pCtx->sMb.pInterPredictionDoneFlag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pMbCorrectlyDecodedFlag[i]) {
+      pMa->WelsFree (pCtx->sMb.pMbCorrectlyDecodedFlag[i], "pCtx->sMb.pMbCorrectlyDecodedFlag[]");
+      pCtx->sMb.pMbCorrectlyDecodedFlag[i] = NULL;
+    }
+
+    if (pCtx->sMb.pMbRefConcealedFlag[i]) {
+      pMa->WelsFree (pCtx->sMb.pMbRefConcealedFlag[i], "pCtx->sMb.pMbRefConcealedFlag[]");
+      pCtx->sMb.pMbRefConcealedFlag[i] = NULL;
+    }
+    pMa->WelsFree (pDq, "pDq");
+
+    pDq = NULL;
+    pCtx->pDqLayersList[i] = NULL;
+
+    ++ i;
+  } while (i < LAYER_NUM_EXCHANGEABLE);
+
+  pCtx->iPicWidthReq            = 0;
+  pCtx->iPicHeightReq           = 0;
+  pCtx->bInitialDqLayersMem     = false;
+}
+
+void ResetCurrentAccessUnit (PWelsDecoderContext pCtx) {
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+  pCurAu->uiStartPos            = 0;
+  pCurAu->uiEndPos              = 0;
+  pCurAu->bCompletedAuFlag      = false;
+  if (pCurAu->uiActualUnitsNum > 0) {
+    uint32_t iIdx = 0;
+    const uint32_t kuiActualNum = pCurAu->uiActualUnitsNum;
+    // a more simpler method to do nal units list management prefered here
+    const uint32_t kuiAvailNum  = pCurAu->uiAvailUnitsNum;
+    const uint32_t kuiLeftNum   = kuiAvailNum - kuiActualNum;
+
+    // Swapping active nal unit nodes of succeeding AU with leading of list
+    while (iIdx < kuiLeftNum) {
+      PNalUnit t = pCurAu->pNalUnitsList[kuiActualNum + iIdx];
+      pCurAu->pNalUnitsList[kuiActualNum + iIdx] = pCurAu->pNalUnitsList[iIdx];
+      pCurAu->pNalUnitsList[iIdx] = t;
+      ++ iIdx;
+    }
+    pCurAu->uiActualUnitsNum = pCurAu->uiAvailUnitsNum = kuiLeftNum;
+  }
+}
+
+/*!
+ * \brief   Force reset current Acess Unit Nal list in case error parsing/decoding in current AU
+ * \author
+ * \history 11/16/2009
+ */
+void ForceResetCurrentAccessUnit (PAccessUnit pAu) {
+  uint32_t uiSucAuIdx = pAu->uiEndPos + 1;
+  uint32_t uiCurAuIdx = 0;
+
+  // swap the succeeding AU's nal units to the front
+  while (uiSucAuIdx < pAu->uiAvailUnitsNum) {
+    PNalUnit t = pAu->pNalUnitsList[uiSucAuIdx];
+    pAu->pNalUnitsList[uiSucAuIdx] = pAu->pNalUnitsList[uiCurAuIdx];
+    pAu->pNalUnitsList[uiCurAuIdx] = t;
+    ++ uiSucAuIdx;
+    ++ uiCurAuIdx;
+  }
+
+  // Update avail/actual units num accordingly for next AU parsing
+  if (pAu->uiAvailUnitsNum > pAu->uiEndPos)
+    pAu->uiAvailUnitsNum -= (pAu->uiEndPos + 1);
+  else
+    pAu->uiAvailUnitsNum = 0;
+  pAu->uiActualUnitsNum = 0;
+  pAu->uiStartPos       = 0;
+  pAu->uiEndPos         = 0;
+  pAu->bCompletedAuFlag = false;
+}
+
+//clear current corrupted NAL from pNalUnitsList
+void ForceClearCurrentNal (PAccessUnit pAu) {
+  if (pAu->uiAvailUnitsNum > 0)
+    -- pAu->uiAvailUnitsNum;
+}
+
+void ForceResetParaSetStatusAndAUList (PWelsDecoderContext pCtx) {
+  pCtx->sSpsPpsCtx.bSpsExistAheadFlag = false;
+  pCtx->sSpsPpsCtx.bSubspsExistAheadFlag = false;
+  pCtx->sSpsPpsCtx.bPpsExistAheadFlag = false;
+
+  // Force clear the AU list
+  pCtx->pAccessUnitList->uiAvailUnitsNum        = 0;
+  pCtx->pAccessUnitList->uiActualUnitsNum       = 0;
+  pCtx->pAccessUnitList->uiStartPos             = 0;
+  pCtx->pAccessUnitList->uiEndPos               = 0;
+  pCtx->pAccessUnitList->bCompletedAuFlag       = false;
+}
+
+void CheckAvailNalUnitsListContinuity (PWelsDecoderContext pCtx, int32_t iStartIdx, int32_t iEndIdx) {
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+
+  uint8_t uiLastNuDependencyId, uiLastNuLayerDqId;
+  uint8_t uiCurNuDependencyId, uiCurNuQualityId, uiCurNuLayerDqId, uiCurNuRefLayerDqId;
+
+  int32_t iCurNalUnitIdx = 0;
+
+  //check the continuity of pNalUnitsList forwards (from pIdxNoInterLayerPred to end_postion)
+  uiLastNuDependencyId = pCurAu->pNalUnitsList[iStartIdx]->sNalHeaderExt.uiDependencyId;//starting nal unit
+  uiLastNuLayerDqId   = pCurAu->pNalUnitsList[iStartIdx]->sNalHeaderExt.uiLayerDqId;//starting nal unit
+  iCurNalUnitIdx = iStartIdx + 1;//current nal unit
+  while (iCurNalUnitIdx <= iEndIdx) {
+    uiCurNuDependencyId   = pCurAu->pNalUnitsList[iCurNalUnitIdx]->sNalHeaderExt.uiDependencyId;
+    uiCurNuQualityId      = pCurAu->pNalUnitsList[iCurNalUnitIdx]->sNalHeaderExt.uiQualityId;
+    uiCurNuLayerDqId     = pCurAu->pNalUnitsList[iCurNalUnitIdx]->sNalHeaderExt.uiLayerDqId;
+    uiCurNuRefLayerDqId = pCurAu->pNalUnitsList[iCurNalUnitIdx]->sNalData.sVclNal.sSliceHeaderExt.uiRefLayerDqId;
+
+    if (uiCurNuDependencyId == uiLastNuDependencyId) {
+      uiLastNuLayerDqId = uiCurNuLayerDqId;
+      ++ iCurNalUnitIdx;
+    } else { //uiCurNuDependencyId != uiLastNuDependencyId, new dependency arrive
+      if (uiCurNuQualityId == 0) {
+        uiLastNuDependencyId = uiCurNuDependencyId;
+        if (uiCurNuRefLayerDqId == uiLastNuLayerDqId) {
+          uiLastNuLayerDqId = uiCurNuLayerDqId;
+          ++ iCurNalUnitIdx;
+        } else { //cur_nu_layer_id != next_nu_ref_layer_dq_id, the chain is broken at this point
+          break;
+        }
+      } else { //new dependency arrive, but no base quality layer, so we must stop in this point
+        break;
+      }
+    }
+  }
+
+  -- iCurNalUnitIdx;
+  pCurAu->uiEndPos = iCurNalUnitIdx;
+  pCtx->uiTargetDqId = pCurAu->pNalUnitsList[iCurNalUnitIdx]->sNalHeaderExt.uiLayerDqId;
+}
+
+//main purpose: to support multi-slice and to include all slice which have the same uiDependencyId, uiQualityId and frame_num
+//for single slice, pIdxNoInterLayerPred SHOULD NOT be modified
+void RefineIdxNoInterLayerPred (PAccessUnit pCurAu, int32_t* pIdxNoInterLayerPred) {
+  int32_t iLastNalDependId  = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiDependencyId;
+  int32_t iLastNalQualityId = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiQualityId;
+  uint8_t uiLastNalTId       = pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalHeaderExt.uiTemporalId;
+  int32_t iLastNalFrameNum  =
+    pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iFrameNum;
+  int32_t iLastNalPoc        =
+    pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
+  int32_t iLastNalFirstMb   =
+    pCurAu->pNalUnitsList[*pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
+  int32_t iCurNalDependId, iCurNalQualityId, iCurNalTId, iCurNalFrameNum, iCurNalPoc, iCurNalFirstMb, iCurIdx,
+          iFinalIdxNoInterLayerPred;
+
+  bool  bMultiSliceFind = false;
+
+  iFinalIdxNoInterLayerPred = 0;
+  iCurIdx = *pIdxNoInterLayerPred - 1;
+  while (iCurIdx >= 0) {
+    if (pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.iNoInterLayerPredFlag) {
+      iCurNalDependId  = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiDependencyId;
+      iCurNalQualityId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiQualityId;
+      iCurNalTId       = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiTemporalId;
+      iCurNalFrameNum  = pCurAu->pNalUnitsList[iCurIdx]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iFrameNum;
+      iCurNalPoc        = pCurAu->pNalUnitsList[iCurIdx]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
+      iCurNalFirstMb   = pCurAu->pNalUnitsList[iCurIdx]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
+
+      if (iCurNalDependId == iLastNalDependId  &&
+          iCurNalQualityId == iLastNalQualityId &&
+          iCurNalTId       == uiLastNalTId       &&
+          iCurNalFrameNum  == iLastNalFrameNum  &&
+          iCurNalPoc        == iLastNalPoc        &&
+          iCurNalFirstMb   != iLastNalFirstMb) {
+        bMultiSliceFind = true;
+        iFinalIdxNoInterLayerPred = iCurIdx;
+        --iCurIdx;
+        continue;
+      } else {
+        break;
+      }
+    }
+    --iCurIdx;
+  }
+
+  if (bMultiSliceFind && *pIdxNoInterLayerPred != iFinalIdxNoInterLayerPred) {
+    *pIdxNoInterLayerPred = iFinalIdxNoInterLayerPred;
+  }
+}
+
+bool CheckPocOfCurValidNalUnits (PAccessUnit pCurAu, int32_t pIdxNoInterLayerPred) {
+  int32_t iEndIdx    = pCurAu->uiEndPos;
+  int32_t iCurAuPoc =
+    pCurAu->pNalUnitsList[pIdxNoInterLayerPred]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
+  int32_t iTmpPoc, i;
+  for (i = pIdxNoInterLayerPred + 1; i < iEndIdx; i++) {
+    iTmpPoc = pCurAu->pNalUnitsList[i]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iPicOrderCntLsb;
+    if (iTmpPoc != iCurAuPoc) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+bool CheckIntegrityNalUnitsList (PWelsDecoderContext pCtx) {
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+  const int32_t kiEndPos = pCurAu->uiEndPos;
+  int32_t iIdxNoInterLayerPred = 0;
+
+  if (!pCurAu->bCompletedAuFlag)
+    return false;
+
+  if (pCtx->bNewSeqBegin) {
+    pCurAu->uiStartPos = 0;
+    //step1: search the pNalUnit whose iNoInterLayerPredFlag equal to 1 backwards (from uiEndPos to 0)
+    iIdxNoInterLayerPred = kiEndPos;
+    while (iIdxNoInterLayerPred >= 0) {
+      if (pCurAu->pNalUnitsList[iIdxNoInterLayerPred]->sNalHeaderExt.iNoInterLayerPredFlag) {
+        break;
+      }
+      --iIdxNoInterLayerPred;
+    }
+    if (iIdxNoInterLayerPred < 0) {
+      //can not find the Nal Unit whose no_inter_pred_falg equal to 1, MUST STOP decode
+      return false;
+    }
+
+    //step2: support multi-slice, to include all base layer slice
+    RefineIdxNoInterLayerPred (pCurAu, &iIdxNoInterLayerPred);
+    pCurAu->uiStartPos = iIdxNoInterLayerPred;
+    CheckAvailNalUnitsListContinuity (pCtx, iIdxNoInterLayerPred, kiEndPos);
+
+    if (!CheckPocOfCurValidNalUnits (pCurAu, iIdxNoInterLayerPred)) {
+      return false;
+    }
+
+    pCtx->iCurSeqIntervalTargetDependId = pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalHeaderExt.uiDependencyId;
+    pCtx->iCurSeqIntervalMaxPicWidth  =
+      pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iMbWidth << 4;
+    pCtx->iCurSeqIntervalMaxPicHeight =
+      pCurAu->pNalUnitsList[pCurAu->uiEndPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.iMbHeight << 4;
+  } else { //P_SLICE
+    //step 1: search uiDependencyId equal to pCtx->cur_seq_interval_target_dependency_id
+    bool bGetDependId = false;
+    int32_t iIdxDependId = 0;
+
+    iIdxDependId = kiEndPos;
+    while (iIdxDependId >= 0) {
+      if (pCtx->iCurSeqIntervalTargetDependId == pCurAu->pNalUnitsList[iIdxDependId]->sNalHeaderExt.uiDependencyId) {
+        bGetDependId = true;
+        break;
+      } else {
+        --iIdxDependId;
+      }
+    }
+
+    //step 2: switch according to whether or not find the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
+    if (bGetDependId) { //get the index of pNalUnit whose uiDependencyId equal to iCurSeqIntervalTargetDependId
+      bool bGetNoInterPredFront = false;
+      //step 2a: search iNoInterLayerPredFlag [0....iIdxDependId]
+      iIdxNoInterLayerPred = iIdxDependId;
+      while (iIdxNoInterLayerPred >= 0) {
+        if (pCurAu->pNalUnitsList[iIdxNoInterLayerPred]->sNalHeaderExt.iNoInterLayerPredFlag) {
+          bGetNoInterPredFront = true;
+          break;
+        }
+        --iIdxNoInterLayerPred;
+      }
+      //step 2b: switch, whether or not find the NAL unit whose no_inter_pred_flag equal to 1 among [0....iIdxDependId]
+      if (bGetNoInterPredFront) { //YES
+        RefineIdxNoInterLayerPred (pCurAu, &iIdxNoInterLayerPred);
+        pCurAu->uiStartPos = iIdxNoInterLayerPred;
+        CheckAvailNalUnitsListContinuity (pCtx, iIdxNoInterLayerPred, iIdxDependId);
+
+        if (!CheckPocOfCurValidNalUnits (pCurAu, iIdxNoInterLayerPred)) {
+          return false;
+        }
+      } else { //NO, should find the NAL unit whose no_inter_pred_flag equal to 1 among [iIdxDependId....uiEndPos]
+        iIdxNoInterLayerPred = iIdxDependId;
+        while (iIdxNoInterLayerPred <= kiEndPos) {
+          if (pCurAu->pNalUnitsList[iIdxNoInterLayerPred]->sNalHeaderExt.iNoInterLayerPredFlag) {
+            break;
+          }
+          ++iIdxNoInterLayerPred;
+        }
+
+        if (iIdxNoInterLayerPred > kiEndPos) {
+          return false; //cann't find the index of pNalUnit whose no_inter_pred_flag = 1
+        }
+
+        RefineIdxNoInterLayerPred (pCurAu, &iIdxNoInterLayerPred);
+        pCurAu->uiStartPos = iIdxNoInterLayerPred;
+        CheckAvailNalUnitsListContinuity (pCtx, iIdxNoInterLayerPred, kiEndPos);
+
+        if (!CheckPocOfCurValidNalUnits (pCurAu, iIdxNoInterLayerPred)) {
+          return false;
+        }
+      }
+    } else { //without the index of pNalUnit, should process this AU as common case
+      iIdxNoInterLayerPred = kiEndPos;
+      while (iIdxNoInterLayerPred >= 0) {
+        if (pCurAu->pNalUnitsList[iIdxNoInterLayerPred]->sNalHeaderExt.iNoInterLayerPredFlag) {
+          break;
+        }
+        --iIdxNoInterLayerPred;
+      }
+      if (iIdxNoInterLayerPred < 0) {
+        return false; //cann't find the index of pNalUnit whose iNoInterLayerPredFlag = 1
+      }
+
+      RefineIdxNoInterLayerPred (pCurAu, &iIdxNoInterLayerPred);
+      pCurAu->uiStartPos = iIdxNoInterLayerPred;
+      CheckAvailNalUnitsListContinuity (pCtx, iIdxNoInterLayerPred, kiEndPos);
+
+      if (!CheckPocOfCurValidNalUnits (pCurAu, iIdxNoInterLayerPred)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+void CheckOnlyOneLayerInAu (PWelsDecoderContext pCtx) {
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+
+  int32_t iEndIdx = pCurAu->uiEndPos;
+  int32_t iCurIdx = pCurAu->uiStartPos;
+  uint8_t uiDId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiDependencyId;
+  uint8_t uiQId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiQualityId;
+  uint8_t uiTId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiTemporalId;
+
+  uint8_t uiCurDId, uiCurQId, uiCurTId;
+
+  pCtx->bOnlyOneLayerInCurAuFlag = true;
+
+  if (iEndIdx == iCurIdx) { //only one NAL in pNalUnitsList
+    return;
+  }
+
+  ++iCurIdx;
+  while (iCurIdx <= iEndIdx) {
+    uiCurDId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiDependencyId;
+    uiCurQId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiQualityId;
+    uiCurTId = pCurAu->pNalUnitsList[iCurIdx]->sNalHeaderExt.uiTemporalId;
+
+    if (uiDId != uiCurDId || uiQId != uiCurQId || uiTId != uiCurTId) {
+      pCtx->bOnlyOneLayerInCurAuFlag = false;
+      return;
+    }
+
+    ++iCurIdx;
+  }
+}
+
+int32_t WelsDecodeAccessUnitStart (PWelsDecoderContext pCtx) {
+  // Roll back NAL units not being belong to current access unit list for proceeded access unit
+  int32_t iRet = UpdateAccessUnit (pCtx);
+  if (iRet != ERR_NONE)
+    return iRet;
+
+  pCtx->pAccessUnitList->uiStartPos = 0;
+  if (!pCtx->sSpsPpsCtx.bAvcBasedFlag && !CheckIntegrityNalUnitsList (pCtx)) {
+    pCtx->iErrorCode |= dsBitstreamError;
+    return dsBitstreamError;
+  }
+
+  //check current AU has only one layer or not
+  //If YES, can use deblocking based on AVC
+  if (!pCtx->sSpsPpsCtx.bAvcBasedFlag) {
+    CheckOnlyOneLayerInAu (pCtx);
+  }
+
+  return ERR_NONE;
+}
+
+void WelsDecodeAccessUnitEnd (PWelsDecoderContext pCtx) {
+  //save previous header info
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+  PNalUnit pCurNal = pCurAu->pNalUnitsList[pCurAu->uiEndPos];
+  memcpy (&pCtx->pLastDecPicInfo->sLastNalHdrExt, &pCurNal->sNalHeaderExt, sizeof (SNalUnitHeaderExt));
+  memcpy (&pCtx->pLastDecPicInfo->sLastSliceHeader,
+          &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader, sizeof (SSliceHeader));
+  // uninitialize context of current access unit and rbsp buffer clean
+  ResetCurrentAccessUnit (pCtx);
+}
+
+/* CheckNewSeqBeginAndUpdateActiveLayerSps
+ * return:
+ * true - the AU to be construct is the start of new sequence; false - not
+ */
+static bool CheckNewSeqBeginAndUpdateActiveLayerSps (PWelsDecoderContext pCtx) {
+  bool bNewSeq = false;
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+  PSps pTmpLayerSps[MAX_LAYER_NUM];
+  for (int i = 0; i < MAX_LAYER_NUM; i++) {
+    pTmpLayerSps[i] = NULL;
+  }
+  // track the layer sps for the current au
+  for (unsigned int i = pCurAu->uiStartPos; i <= pCurAu->uiEndPos; i++) {
+    uint32_t uiDid = pCurAu->pNalUnitsList[i]->sNalHeaderExt.uiDependencyId;
+    pTmpLayerSps[uiDid] = pCurAu->pNalUnitsList[i]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps;
+    if ((pCurAu->pNalUnitsList[i]->sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR)
+        || (pCurAu->pNalUnitsList[i]->sNalHeaderExt.bIdrFlag))
+      bNewSeq = true;
+  }
+  int iMaxActiveLayer = 0, iMaxCurrentLayer = 0;
+  for (int i = MAX_LAYER_NUM - 1; i >= 0; i--) {
+    if (pCtx->sSpsPpsCtx.pActiveLayerSps[i] != NULL) {
+      iMaxActiveLayer = i;
+      break;
+    }
+  }
+  for (int i = MAX_LAYER_NUM - 1; i >= 0; i--) {
+    if (pTmpLayerSps[i] != NULL) {
+      iMaxCurrentLayer = i;
+      break;
+    }
+  }
+  if ((iMaxCurrentLayer != iMaxActiveLayer)
+      || (pTmpLayerSps[iMaxCurrentLayer]  != pCtx->sSpsPpsCtx.pActiveLayerSps[iMaxActiveLayer])) {
+    bNewSeq = true;
+  }
+  // fill active sps if the current sps is not null while active layer is null
+  if (!bNewSeq) {
+    for (int i = 0; i < MAX_LAYER_NUM; i++) {
+      if (pCtx->sSpsPpsCtx.pActiveLayerSps[i] == NULL && pTmpLayerSps[i] != NULL) {
+        pCtx->sSpsPpsCtx.pActiveLayerSps[i] = pTmpLayerSps[i];
+      }
+    }
+  } else {
+    // UpdateActiveLayerSps if new sequence start
+    memcpy (&pCtx->sSpsPpsCtx.pActiveLayerSps[0], &pTmpLayerSps[0], MAX_LAYER_NUM * sizeof (PSps));
+  }
+  return bNewSeq;
+}
+
+static void WriteBackActiveParameters (PWelsDecoderContext pCtx) {
+  if (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_PPS) {
+    memcpy (&pCtx->sSpsPpsCtx.sPpsBuffer[pCtx->sSpsPpsCtx.sPpsBuffer[MAX_PPS_COUNT].iPpsId],
+            &pCtx->sSpsPpsCtx.sPpsBuffer[MAX_PPS_COUNT], sizeof (SPps));
+  }
+  if (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_SPS) {
+    memcpy (&pCtx->sSpsPpsCtx.sSpsBuffer[pCtx->sSpsPpsCtx.sSpsBuffer[MAX_SPS_COUNT].iSpsId],
+            &pCtx->sSpsPpsCtx.sSpsBuffer[MAX_SPS_COUNT], sizeof (SSps));
+    pCtx->bNewSeqBegin = true;
+  }
+  if (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_SUBSETSPS) {
+    memcpy (&pCtx->sSpsPpsCtx.sSubsetSpsBuffer[pCtx->sSpsPpsCtx.sSubsetSpsBuffer[MAX_SPS_COUNT].sSps.iSpsId],
+            &pCtx->sSpsPpsCtx.sSubsetSpsBuffer[MAX_SPS_COUNT], sizeof (SSubsetSps));
+    pCtx->bNewSeqBegin = true;
+  }
+  pCtx->sSpsPpsCtx.iOverwriteFlags = OVERWRITE_NONE;
+}
+
+/*
+ * DecodeFinishUpdate
+ * decoder finish decoding, update active parameter sets and new seq status
+ *
+ */
+
+void DecodeFinishUpdate (PWelsDecoderContext pCtx) {
+  pCtx->bNewSeqBegin = false;
+  WriteBackActiveParameters (pCtx);
+  pCtx->bNewSeqBegin = pCtx->bNewSeqBegin || pCtx->bNextNewSeqBegin;
+  pCtx->bNextNewSeqBegin = false; // reset it
+  if (pCtx->bNewSeqBegin)
+    ResetActiveSPSForEachLayer (pCtx);
+}
+
+/*
+* WelsDecodeInitAccessUnitStart
+* check and (re)allocate picture buffers on new sequence begin
+*  bit_len:    size in bit length of data
+*  buf_len:    size in byte length of data
+*  coded_au:   mark an Access Unit decoding finished
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t WelsDecodeInitAccessUnitStart (PWelsDecoderContext pCtx, SBufferInfo* pDstInfo) {
+  int32_t iErr = ERR_NONE;
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+  pCtx->bAuReadyFlag = false;
+  pCtx->pLastDecPicInfo->bLastHasMmco5 = false;
+  bool bTmpNewSeqBegin = CheckNewSeqBeginAndUpdateActiveLayerSps (pCtx);
+  pCtx->bNewSeqBegin = pCtx->bNewSeqBegin || bTmpNewSeqBegin;
+  iErr = WelsDecodeAccessUnitStart (pCtx);
+  GetVclNalTemporalId (pCtx);
+
+  if (ERR_NONE != iErr) {
+    ForceResetCurrentAccessUnit (pCtx->pAccessUnitList);
+    if (!pCtx->pParam->bParseOnly)
+      pDstInfo->iBufferStatus = 0;
+    pCtx->bNewSeqBegin = pCtx->bNewSeqBegin || pCtx->bNextNewSeqBegin;
+    pCtx->bNextNewSeqBegin = false; // reset it
+    if (pCtx->bNewSeqBegin)
+      ResetActiveSPSForEachLayer (pCtx);
+    return iErr;
+  }
+
+  pCtx->pSps = pCurAu->pNalUnitsList[pCurAu->uiStartPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pSps;
+  pCtx->pPps = pCurAu->pNalUnitsList[pCurAu->uiStartPos]->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader.pPps;
+
+  return iErr;
+}
+
+/*
+* AllocPicBuffOnNewSeqBegin
+* check and (re)allocate picture buffers on new sequence begin
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t AllocPicBuffOnNewSeqBegin (PWelsDecoderContext pCtx) {
+  //try to allocate or relocate DPB memory only when new sequence is coming.
+  if (GetThreadCount (pCtx) <= 1) {
+    WelsResetRefPic (pCtx); //clear ref pPic when IDR NAL
+  }
+  int32_t iErr = SyncPictureResolutionExt (pCtx, pCtx->pSps->iMbWidth, pCtx->pSps->iMbHeight);
+
+  if (ERR_NONE != iErr) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "sync picture resolution ext failed,  the error is %d", iErr);
+    return iErr;
+  }
+
+  return iErr;
+}
+
+/*
+* InitConstructAccessUnit
+* Init before constructing an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to
+* joint a collective access unit.
+* parameter\
+*  SBufferInfo:    Buffer info
+* return:
+*  0 - success; otherwise returned error_no defined in error_no.h
+*/
+int32_t InitConstructAccessUnit (PWelsDecoderContext pCtx, SBufferInfo* pDstInfo) {
+  int32_t iErr = ERR_NONE;
+
+  iErr = WelsDecodeInitAccessUnitStart (pCtx, pDstInfo);
+  if (ERR_NONE != iErr) {
+    return iErr;
+  }
+  if (pCtx->bNewSeqBegin) {
+    iErr = AllocPicBuffOnNewSeqBegin (pCtx);
+    if (ERR_NONE != iErr) {
+      return iErr;
+    }
+  }
+
+  return iErr;
+}
+
+/*
+ * ConstructAccessUnit
+ * construct an access unit for given input bitstream, maybe partial NAL Unit, one or more Units are involved to
+ * joint a collective access unit.
+ * parameter\
+ *  buf:        bitstream data buffer
+ *  bit_len:    size in bit length of data
+ *  buf_len:    size in byte length of data
+ *  coded_au:   mark an Access Unit decoding finished
+ * return:
+ *  0 - success; otherwise returned error_no defined in error_no.h
+ */
+int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
+  int32_t iErr = ERR_NONE;
+  if (GetThreadCount (pCtx) <= 1) {
+    iErr = InitConstructAccessUnit (pCtx, pDstInfo);
+    if (ERR_NONE != iErr) {
+      return iErr;
+    }
+  }
+  if (pCtx->pCabacDecEngine == NULL) {
+    pCtx->pCabacDecEngine = (SWelsCabacDecEngine*)pCtx->pMemAlign->WelsMallocz (sizeof (SWelsCabacDecEngine),
+                            "pCtx->pCabacDecEngine");
+    WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, (NULL == pCtx->pCabacDecEngine))
+  }
+
+  iErr = DecodeCurrentAccessUnit (pCtx, ppDst, pDstInfo);
+
+  WelsDecodeAccessUnitEnd (pCtx);
+
+  if (ERR_NONE != iErr) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "returned error from decoding:[0x%x]", iErr);
+    return iErr;
+  }
+
+  return ERR_NONE;
+}
+
+static inline void InitDqLayerInfo (PDqLayer pDqLayer, PLayerInfo pLayerInfo, PNalUnit pNalUnit, PPicture pPicDec) {
+  PNalUnitHeaderExt pNalHdrExt    = &pNalUnit->sNalHeaderExt;
+  PSliceHeaderExt pShExt          = &pNalUnit->sNalData.sVclNal.sSliceHeaderExt;
+  PSliceHeader pSh                = &pShExt->sSliceHeader;
+  const uint8_t kuiQualityId      = pNalHdrExt->uiQualityId;
+
+  memcpy (&pDqLayer->sLayerInfo, pLayerInfo, sizeof (SLayerInfo)); //confirmed_safe_unsafe_usage
+
+  pDqLayer->pDec        = pPicDec;
+  pDqLayer->iMbWidth    = pSh->iMbWidth;        // MB width of this picture
+  pDqLayer->iMbHeight   = pSh->iMbHeight;// MB height of this picture
+
+  pDqLayer->iSliceIdcBackup = (pSh->iFirstMbInSlice << 7) | (pNalHdrExt->uiDependencyId << 4) | (pNalHdrExt->uiQualityId);
+
+  /* Common syntax elements across all slices of a DQLayer */
+  pDqLayer->uiPpsId                                     = pLayerInfo->pPps->iPpsId;
+  pDqLayer->uiDisableInterLayerDeblockingFilterIdc      = pShExt->uiDisableInterLayerDeblockingFilterIdc;
+  pDqLayer->iInterLayerSliceAlphaC0Offset               = pShExt->iInterLayerSliceAlphaC0Offset;
+  pDqLayer->iInterLayerSliceBetaOffset                  = pShExt->iInterLayerSliceBetaOffset;
+  pDqLayer->iSliceGroupChangeCycle                      = pSh->iSliceGroupChangeCycle;
+  pDqLayer->bStoreRefBasePicFlag                        = pShExt->bStoreRefBasePicFlag;
+  pDqLayer->bTCoeffLevelPredFlag                        = pShExt->bTCoeffLevelPredFlag;
+  pDqLayer->bConstrainedIntraResamplingFlag             = pShExt->bConstrainedIntraResamplingFlag;
+  pDqLayer->uiRefLayerDqId                              = pShExt->uiRefLayerDqId;
+  pDqLayer->uiRefLayerChromaPhaseXPlus1Flag             = pShExt->uiRefLayerChromaPhaseXPlus1Flag;
+  pDqLayer->uiRefLayerChromaPhaseYPlus1                 = pShExt->uiRefLayerChromaPhaseYPlus1;
+  pDqLayer->bUseWeightPredictionFlag                    = false;
+  pDqLayer->bUseWeightedBiPredIdc = false;
+  //memcpy(&pDqLayer->sScaledRefLayer, &pShExt->sScaledRefLayer, sizeof(SPosOffset));//confirmed_safe_unsafe_usage
+
+  if (kuiQualityId == BASE_QUALITY_ID) {
+    pDqLayer->pRefPicListReordering = &pSh->pRefPicListReordering;
+    pDqLayer->pRefPicMarking = &pSh->sRefMarking;
+
+    pDqLayer->bUseWeightPredictionFlag = pSh->pPps->bWeightedPredFlag;
+    pDqLayer->bUseWeightedBiPredIdc = pSh->pPps->uiWeightedBipredIdc != 0;
+    if (pSh->pPps->bWeightedPredFlag || pSh->pPps->uiWeightedBipredIdc) {
+      pDqLayer->pPredWeightTable = &pSh->sPredWeightTable;
+    }
+    pDqLayer->pRefPicBaseMarking        = &pShExt->sRefBasePicMarking;
+  }
+
+  pDqLayer->uiLayerDqId                 = pNalHdrExt->uiLayerDqId;      // dq_id of current layer
+  pDqLayer->bUseRefBasePicFlag          = pNalHdrExt->bUseRefBasePicFlag;
+}
+
+void WelsDqLayerDecodeStart (PWelsDecoderContext pCtx, PNalUnit pCurNal, PSps pSps, PPps pPps) {
+  PSliceHeader pSh = &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
+
+  pCtx->eSliceType   = pSh->eSliceType;
+  pCtx->pSliceHeader = pSh;
+  pCtx->bUsedAsRef   = false;
+
+  pCtx->iFrameNum    = pSh->iFrameNum;
+  UpdateDecoderStatisticsForActiveParaset (pCtx->pDecoderStatistics, pSps, pPps);
+}
+
+int32_t InitRefPicList (PWelsDecoderContext pCtx, const uint8_t kuiNRi, int32_t iPoc) {
+  int32_t iRet = ERR_NONE;
+  if (pCtx->eSliceType == B_SLICE) {
+    iRet = WelsInitBSliceRefList (pCtx, iPoc);
+    CreateImplicitWeightTable (pCtx);
+  } else
+    iRet = WelsInitRefList (pCtx, iPoc);
+  if ((pCtx->eSliceType != I_SLICE && pCtx->eSliceType != SI_SLICE)) {
+#if 0
+    if (pCtx->pSps->uiProfileIdc != 66 && pCtx->pPps->bEntropyCodingModeFlag)
+      iRet = WelsReorderRefList2 (pCtx);
+    else
+#endif
+      iRet = WelsReorderRefList (pCtx);
+  }
+
+  return iRet;
+}
+
+void InitCurDqLayerData (PWelsDecoderContext pCtx, PDqLayer pCurDq) {
+  if (NULL != pCtx && NULL != pCurDq) {
+    pCurDq->pMbType         = pCtx->sMb.pMbType[0];
+    pCurDq->pSliceIdc       = pCtx->sMb.pSliceIdc[0];
+    pCurDq->pMv[LIST_0]         = pCtx->sMb.pMv[0][LIST_0];
+    pCurDq->pMv[LIST_1]         = pCtx->sMb.pMv[0][LIST_1];
+    pCurDq->pRefIndex[LIST_0]    = pCtx->sMb.pRefIndex[0][LIST_0];
+    pCurDq->pRefIndex[LIST_1]   = pCtx->sMb.pRefIndex[0][LIST_1];
+    pCurDq->pDirect             = pCtx->sMb.pDirect[0];
+    pCurDq->pNoSubMbPartSizeLessThan8x8Flag = pCtx->sMb.pNoSubMbPartSizeLessThan8x8Flag[0];
+    pCurDq->pTransformSize8x8Flag = pCtx->sMb.pTransformSize8x8Flag[0];
+    pCurDq->pLumaQp         = pCtx->sMb.pLumaQp[0];
+    pCurDq->pChromaQp       = pCtx->sMb.pChromaQp[0];
+    pCurDq->pMvd[LIST_0]         = pCtx->sMb.pMvd[0][LIST_0];
+    pCurDq->pMvd[LIST_1]          = pCtx->sMb.pMvd[0][LIST_1];
+    pCurDq->pCbfDc          = pCtx->sMb.pCbfDc[0];
+    pCurDq->pNzc            = pCtx->sMb.pNzc[0];
+    pCurDq->pNzcRs          = pCtx->sMb.pNzcRs[0];
+    pCurDq->pScaledTCoeff   = pCtx->sMb.pScaledTCoeff[0];
+    pCurDq->pIntraPredMode  = pCtx->sMb.pIntraPredMode[0];
+    pCurDq->pIntra4x4FinalMode = pCtx->sMb.pIntra4x4FinalMode[0];
+    pCurDq->pIntraNxNAvailFlag = pCtx->sMb.pIntraNxNAvailFlag[0];
+    pCurDq->pChromaPredMode = pCtx->sMb.pChromaPredMode[0];
+    pCurDq->pCbp            = pCtx->sMb.pCbp[0];
+    pCurDq->pSubMbType      = pCtx->sMb.pSubMbType[0];
+    pCurDq->pInterPredictionDoneFlag = pCtx->sMb.pInterPredictionDoneFlag[0];
+    pCurDq->pResidualPredFlag = pCtx->sMb.pResidualPredFlag[0];
+    pCurDq->pMbCorrectlyDecodedFlag = pCtx->sMb.pMbCorrectlyDecodedFlag[0];
+    pCurDq->pMbRefConcealedFlag = pCtx->sMb.pMbRefConcealedFlag[0];
+  }
+}
+
+/*
+ * DecodeCurrentAccessUnit
+ * Decode current access unit when current AU is completed.
+ */
+int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
+  PNalUnit pNalCur = pCtx->pNalCur = NULL;
+  PAccessUnit pCurAu = pCtx->pAccessUnitList;
+
+  int32_t iIdx = pCurAu->uiStartPos;
+  int32_t iEndIdx = pCurAu->uiEndPos;
+
+  //get current thread ctx
+  PWelsDecoderThreadCTX pThreadCtx = NULL;
+  if (pCtx->pThreadCtx != NULL) {
+    pThreadCtx = (PWelsDecoderThreadCTX)pCtx->pThreadCtx;
+  }
+  //get last thread ctx
+  PWelsDecoderThreadCTX pLastThreadCtx = NULL;
+  if (pCtx->pLastThreadCtx != NULL) {
+    pLastThreadCtx = (PWelsDecoderThreadCTX) (pCtx->pLastThreadCtx);
+    if (pLastThreadCtx->pDec == NULL) {
+      pLastThreadCtx->pDec = PrefetchLastPicForThread (pCtx->pPicBuff,
+                             pLastThreadCtx->iPicBuffIdx);
+    }
+  }
+  int32_t iThreadCount = GetThreadCount (pCtx);
+  int32_t iPpsId = 0;
+  int32_t iRet = ERR_NONE;
+
+  bool bAllRefComplete = true; // Assume default all ref picutres are complete
+
+  const uint8_t kuiTargetLayerDqId = GetTargetDqId (pCtx->uiTargetDqId, pCtx->pParam);
+  const uint8_t kuiDependencyIdMax = (kuiTargetLayerDqId & 0x7F) >> 4;
+  int16_t iLastIdD = -1, iLastIdQ = -1;
+  int16_t iCurrIdD = 0, iCurrIdQ = 0;
+  pCtx->uiNalRefIdc = 0;
+  bool bFreshSliceAvailable =
+    true; // Another fresh slice comingup for given dq layer, for multiple slices in case of header parts of slices sometimes loss over error-prone channels, 8/14/2008
+
+  //update pCurDqLayer at the starting of AU decoding
+  if (pCtx->bInitialDqLayersMem || pCtx->pCurDqLayer == NULL) {
+    pCtx->pCurDqLayer = pCtx->pDqLayersList[0];
+  }
+
+  InitCurDqLayerData (pCtx, pCtx->pCurDqLayer);
+
+  pNalCur = pCurAu->pNalUnitsList[iIdx];
+  while (iIdx <= iEndIdx) {
+    PDqLayer dq_cur = pCtx->pCurDqLayer;
+    SLayerInfo pLayerInfo;
+    PSliceHeaderExt pShExt = NULL;
+    PSliceHeader pSh = NULL;
+    bool isNewFrame = true;
+    if (iThreadCount > 1) {
+      isNewFrame = pCtx->pDec == NULL;
+    }
+    if (pCtx->pDec == NULL) {
+      //make call PrefetchPic first before updating reference lists in threaded mode
+      //this prevents from possible thread-decoding hanging
+      pCtx->pDec = PrefetchPic (pCtx->pPicBuff);
+      if (pLastThreadCtx != NULL) {
+        pLastThreadCtx->pDec->bUsedAsRef = pLastThreadCtx->pCtx->uiNalRefIdc > 0;
+        if (pLastThreadCtx->pDec->bUsedAsRef) {
+          for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+            uint32_t i = 0;
+            while (i < MAX_REF_PIC_COUNT && pLastThreadCtx->pCtx->sRefPic.pRefList[listIdx][i]) {
+              pLastThreadCtx->pDec->pRefPic[listIdx][i] = pLastThreadCtx->pCtx->sRefPic.pRefList[listIdx][i];
+              ++i;
+            }
+          }
+          pLastThreadCtx->pCtx->sTmpRefPic = pLastThreadCtx->pCtx->sRefPic;
+          WelsMarkAsRef (pLastThreadCtx->pCtx, pLastThreadCtx->pDec);
+          pCtx->sRefPic = pLastThreadCtx->pCtx->sTmpRefPic;
+        } else {
+          pCtx->sRefPic = pLastThreadCtx->pCtx->sRefPic;
+        }
+      }
+      //WelsResetRefPic needs to be called when a new sequence is encountered
+      //Otherwise artifacts is observed in decoded yuv in couple of unit tests with multiple-slice frame
+      if (GetThreadCount (pCtx) > 1 && pCtx->bNewSeqBegin) {
+        WelsResetRefPic (pCtx);
+      }
+      if (pCtx->iTotalNumMbRec != 0)
+        pCtx->iTotalNumMbRec = 0;
+
+      if (NULL == pCtx->pDec) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+                 "DecodeCurrentAccessUnit()::::::PrefetchPic ERROR, pSps->iNumRefFrames:%d.",
+                 pCtx->pSps->iNumRefFrames);
+        // The error code here need to be separated from the dsOutOfMemory
+        pCtx->iErrorCode |= dsOutOfMemory;
+        return ERR_INFO_REF_COUNT_OVERFLOW;
+      }
+      if (pThreadCtx != NULL) {
+        pThreadCtx->pDec = pCtx->pDec;
+        if (iThreadCount > 1) ++pCtx->pDec->iRefCount;
+        uint32_t uiMbHeight = (pCtx->pDec->iHeightInPixel + 15) >> 4;
+        for (uint32_t i = 0; i < uiMbHeight; ++i) {
+          RESET_EVENT (&pCtx->pDec->pReadyEvent[i]);
+        }
+      }
+      pCtx->pDec->bNewSeqBegin = pCtx->bNewSeqBegin; //set flag for start decoding
+    } else if (pCtx->iTotalNumMbRec == 0) { //pDec != NULL, already start
+      pCtx->pDec->bNewSeqBegin = pCtx->bNewSeqBegin; //set flag for start decoding
+    }
+    pCtx->pDec->uiTimeStamp = pNalCur->uiTimeStamp;
+    pCtx->pDec->uiDecodingTimeStamp = pCtx->uiDecodingTimeStamp;
+    if (pThreadCtx != NULL) {
+      pThreadCtx->iPicBuffIdx = pCtx->pDec->iPicBuffIdx;
+      pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag = pCtx->pDec->pMbCorrectlyDecodedFlag;
+    }
+
+    if (pCtx->iTotalNumMbRec == 0) { //Picture start to decode
+      for (int32_t i = 0; i < LAYER_NUM_EXCHANGEABLE; ++ i)
+        memset (pCtx->sMb.pSliceIdc[i], 0xff, (pCtx->sMb.iMbWidth * pCtx->sMb.iMbHeight * sizeof (int32_t)));
+      memset (pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag, 0, pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight * sizeof (bool));
+      memset (pCtx->pCurDqLayer->pMbRefConcealedFlag, 0, pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight * sizeof (bool));
+      memset (pCtx->pDec->pRefPic[LIST_0], 0, sizeof (PPicture) * MAX_DPB_COUNT);
+      memset (pCtx->pDec->pRefPic[LIST_1], 0, sizeof (PPicture) * MAX_DPB_COUNT);
+      pCtx->pDec->iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+      pCtx->pDec->iMbEcedNum = 0;
+      pCtx->pDec->iMbEcedPropNum = 0;
+    }
+    pCtx->bRPLRError = false;
+    GetI4LumaIChromaAddrTable (pCtx->iDecBlockOffsetArray, pCtx->pDec->iLinesize[0], pCtx->pDec->iLinesize[1]);
+
+    if (pNalCur->sNalHeaderExt.uiLayerDqId > kuiTargetLayerDqId) { // confirmed pNalCur will never be NULL
+      break; // Per formance it need not to decode the remaining bits any more due to given uiLayerDqId required, 9/2/2009
+    }
+
+    memset (&pLayerInfo, 0, sizeof (SLayerInfo));
+
+    /*
+     *  Loop decoding for slices (even FMO and/ multiple slices) within a dq layer
+     */
+    while (iIdx <= iEndIdx) {
+      bool         bReconstructSlice;
+      iCurrIdQ  = pNalCur->sNalHeaderExt.uiQualityId;
+      iCurrIdD  = pNalCur->sNalHeaderExt.uiDependencyId;
+      pSh       = &pNalCur->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader;
+      pShExt    = &pNalCur->sNalData.sVclNal.sSliceHeaderExt;
+      pCtx->bRPLRError = false;
+      bReconstructSlice = CheckSliceNeedReconstruct (pNalCur->sNalHeaderExt.uiLayerDqId, kuiTargetLayerDqId);
+
+      memcpy (&pLayerInfo.sNalHeaderExt, &pNalCur->sNalHeaderExt, sizeof (SNalUnitHeaderExt)); //confirmed_safe_unsafe_usage
+
+      pCtx->pDec->iFrameNum = pSh->iFrameNum;
+      pCtx->pDec->iFramePoc = pSh->iPicOrderCntLsb; // still can not obtain correct, because current do not support POCtype 2
+      pCtx->pDec->bIdrFlag = pNalCur->sNalHeaderExt.bIdrFlag;
+      pCtx->pDec->eSliceType = pSh->eSliceType;
+
+      memcpy (&pLayerInfo.sSliceInLayer.sSliceHeaderExt, pShExt, sizeof (SSliceHeaderExt)); //confirmed_safe_unsafe_usage
+      pLayerInfo.sSliceInLayer.bSliceHeaderExtFlag      = pNalCur->sNalData.sVclNal.bSliceHeaderExtFlag;
+      pLayerInfo.sSliceInLayer.eSliceType               = pSh->eSliceType;
+      pLayerInfo.sSliceInLayer.iLastMbQp                = pSh->iSliceQp;
+      dq_cur->pBitStringAux = &pNalCur->sNalData.sVclNal.sSliceBitsRead;
+
+      pCtx->uiNalRefIdc = pNalCur->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc;
+
+      iPpsId = pSh->iPpsId;
+
+      pLayerInfo.pPps = pSh->pPps;
+      pLayerInfo.pSps = pSh->pSps;
+      pLayerInfo.pSubsetSps = pShExt->pSubsetSps;
+
+      pCtx->pFmo = &pCtx->sFmoList[iPpsId];
+      iRet = FmoParamUpdate (pCtx->pFmo, pLayerInfo.pSps, pLayerInfo.pPps, &pCtx->iActiveFmoNum, pCtx->pMemAlign);
+      if (ERR_NONE != iRet) {
+        if (iRet == ERR_INFO_OUT_OF_MEMORY) {
+          pCtx->iErrorCode |= dsOutOfMemory;
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "DecodeCurrentAccessUnit(), Fmo param alloc failed");
+        } else {
+          pCtx->iErrorCode |= dsBitstreamError;
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "DecodeCurrentAccessUnit(), FmoParamUpdate failed, eSliceType: %d.",
+                   pSh->eSliceType);
+        }
+        return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_FMO_INIT_FAIL);
+      }
+
+      bFreshSliceAvailable = (iCurrIdD != iLastIdD
+                              || iCurrIdQ != iLastIdQ);        // do not need condition of (first_mb == 0) due multiple slices might be disorder
+
+
+      WelsDqLayerDecodeStart (pCtx, pNalCur, pLayerInfo.pSps, pLayerInfo.pPps);
+
+
+      if ((iLastIdD < 0) ||  //case 1: first layer
+          (iLastIdD == iCurrIdD)) { //case 2: same uiDId
+        InitDqLayerInfo (dq_cur, &pLayerInfo, pNalCur, pCtx->pDec);
+
+        if (!dq_cur->sLayerInfo.pSps->bGapsInFrameNumValueAllowedFlag) {
+          const bool kbIdrFlag = dq_cur->sLayerInfo.sNalHeaderExt.bIdrFlag
+                                 || (dq_cur->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR);
+          // Subclause 8.2.5.2 Decoding process for gaps in frame_num
+          int32_t iPrevFrameNum = pCtx->pLastDecPicInfo->iPrevFrameNum;
+          if (pLastThreadCtx != NULL) {
+            //call GetPrevFrameNum() to get correct iPrevFrameNum to prevent frame gap warning
+            iPrevFrameNum = pCtx->bNewSeqBegin ? 0 : GetPrevFrameNum (pCtx);
+          }
+          if (!kbIdrFlag  &&
+              pSh->iFrameNum != iPrevFrameNum &&
+              pSh->iFrameNum != ((iPrevFrameNum + 1) & ((1 << dq_cur->sLayerInfo.pSps->uiLog2MaxFrameNum) -
+                                 1))) {
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+                     "referencing pictures lost due frame gaps exist, prev_frame_num: %d, curr_frame_num: %d",
+                     iPrevFrameNum,
+                     pSh->iFrameNum);
+
+            bAllRefComplete = false;
+            pCtx->iErrorCode |= dsRefLost;
+            if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+#ifdef LONG_TERM_REF
+              pCtx->bParamSetsLostFlag = true;
+#else
+              pCtx->bReferenceLostAtT0Flag = true;
+#endif
+              return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_HEADER, ERR_INFO_REFERENCE_PIC_LOST);
+            }
+          }
+        }
+
+        if (iCurrIdD == kuiDependencyIdMax && iCurrIdQ == BASE_QUALITY_ID && isNewFrame) {
+          iRet = InitRefPicList (pCtx, pCtx->uiNalRefIdc, pSh->iPicOrderCntLsb);
+          if (iThreadCount > 1) isNewFrame = false;
+          if (iRet) {
+            pCtx->bRPLRError = true;
+            bAllRefComplete = false; // RPLR error, set ref pictures complete flag false
+            HandleReferenceLost (pCtx, pNalCur);
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                     "reference picture introduced by this frame is lost during transmission! uiTId: %d",
+                     pNalCur->sNalHeaderExt.uiTemporalId);
+            if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+              if (pCtx->iTotalNumMbRec == 0)
+                pCtx->pDec = NULL;
+              return iRet;
+            }
+          }
+        }
+        //calculate Colocated mv scaling factor for temporal direct prediction
+        if (pSh->eSliceType == B_SLICE && !pSh->iDirectSpatialMvPredFlag)
+          ComputeColocatedTemporalScaling (pCtx);
+
+        if (iThreadCount > 1) {
+          if (iIdx == 0) {
+            memset (&pCtx->lastReadyHeightOffset[0][0], -1, LIST_A * MAX_REF_PIC_COUNT * sizeof (int16_t));
+            SET_EVENT (&pThreadCtx->sSliceDecodeStart);
+          }
+          iRet = WelsDecodeAndConstructSlice (pCtx);
+        } else {
+          iRet = WelsDecodeSlice (pCtx, bFreshSliceAvailable, pNalCur);
+        }
+
+        //Output good store_base reconstruction when enhancement quality layer occurred error for MGS key picture case
+        if (iRet != ERR_NONE) {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+                   "DecodeCurrentAccessUnit() failed (%d) in frame: %d uiDId: %d uiQId: %d",
+                   iRet, pSh->iFrameNum, iCurrIdD, iCurrIdQ);
+          bAllRefComplete = false;
+          HandleReferenceLostL0 (pCtx, pNalCur);
+          if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+            if (pCtx->iTotalNumMbRec == 0)
+              pCtx->pDec = NULL;
+            return iRet;
+          }
+        }
+
+        if (iThreadCount <= 1 && bReconstructSlice) {
+          if ((iRet = WelsDecodeConstructSlice (pCtx, pNalCur)) != ERR_NONE) {
+            pCtx->pDec->bIsComplete = false; // reconstruction error, directly set the flag false
+            return iRet;
+          }
+        }
+        if (bAllRefComplete && pCtx->eSliceType != I_SLICE) {
+          if (iThreadCount <= 1) {
+            if (pCtx->sRefPic.uiRefCount[LIST_0] > 0) {
+              bAllRefComplete &= CheckRefPicturesComplete (pCtx);
+            } else {
+              bAllRefComplete = false;
+            }
+          }
+        }
+      }
+#if defined (_DEBUG) &&  !defined (CODEC_FOR_TESTBED)
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "cur_frame : %d\tiCurrIdD : %d\n ",
+               dq_cur->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFrameNum, iCurrIdD);
+#endif//#if !CODEC_FOR_TESTBED
+      iLastIdD = iCurrIdD;
+      iLastIdQ = iCurrIdQ;
+
+      //pNalUnitsList overflow.
+      ++ iIdx;
+      if (iIdx <= iEndIdx) {
+        pNalCur = pCurAu->pNalUnitsList[iIdx];
+      } else {
+        pNalCur = NULL;
+      }
+
+      if (pNalCur == NULL ||
+          iLastIdD != pNalCur->sNalHeaderExt.uiDependencyId ||
+          iLastIdQ != pNalCur->sNalHeaderExt.uiQualityId)
+        break;
+    }
+
+    // Set the current dec picture complete flag. The flag will be reset when current picture need do ErrorCon.
+    pCtx->pDec->bIsComplete = bAllRefComplete;
+    if (!pCtx->pDec->bIsComplete) {  // Ref pictures ECed, result in ECed
+      pCtx->iErrorCode |= dsDataErrorConcealed;
+    }
+
+    // A dq layer decoded here
+#if defined (_DEBUG) &&  !defined (CODEC_FOR_TESTBED)
+#undef fprintf
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "POC: #%d, FRAME: #%d, D: %d, Q: %d, T: %d, P: %d, %d\n",
+             pSh->iPicOrderCntLsb, pSh->iFrameNum, iCurrIdD, iCurrIdQ, dq_cur->sLayerInfo.sNalHeaderExt.uiTemporalId,
+             dq_cur->sLayerInfo.sNalHeaderExt.uiPriorityId, dq_cur->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iSliceQp);
+#endif//#if !CODEC_FOR_TESTBED
+
+    if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) {
+      if (!pCtx->bInstantDecFlag) {
+        if (!pCtx->pParam->bParseOnly) {
+          //Do error concealment here
+          if ((NeedErrorCon (pCtx)) && (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE)) {
+            ImplementErrorCon (pCtx);
+            pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+            pCtx->pDec->iSpsId = pCtx->pSps->iSpsId;
+            pCtx->pDec->iPpsId = pCtx->pPps->iPpsId;
+          }
+        }
+      }
+
+      if (iThreadCount >= 1) {
+        int32_t  id = pThreadCtx->sThreadInfo.uiThrNum;
+        for (int32_t i = 0; i < iThreadCount; ++i) {
+          if (i == id || pThreadCtx[i - id].pCtx->uiDecodingTimeStamp == 0) continue;
+          if (pThreadCtx[i - id].pCtx->uiDecodingTimeStamp < pCtx->uiDecodingTimeStamp) {
+            WAIT_EVENT (&pThreadCtx[i - id].sSliceDecodeFinish, WELS_DEC_THREAD_WAIT_INFINITE);
+          }
+        }
+        pCtx->pLastDecPicInfo->uiDecodingTimeStamp = pCtx->uiDecodingTimeStamp;
+      }
+      iRet = DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
+      if (iRet) {
+        if (iThreadCount > 1) {
+          SET_EVENT (&pThreadCtx->sSliceDecodeFinish);
+        }
+        return iRet;
+      }
+
+      pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb = pCtx->pDec; //store latest decoded picture for EC
+      pCtx->bUsedAsRef = pCtx->uiNalRefIdc > 0;
+      if (iThreadCount <= 1) {
+        if (pCtx->bUsedAsRef) {
+          for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+            uint32_t i = 0;
+            while (i < MAX_DPB_COUNT && pCtx->sRefPic.pRefList[listIdx][i]) {
+              pCtx->pDec->pRefPic[listIdx][i] = pCtx->sRefPic.pRefList[listIdx][i];
+              ++i;
+            }
+          }
+          iRet = WelsMarkAsRef (pCtx);
+          if (iRet != ERR_NONE) {
+            if (iRet == ERR_INFO_DUPLICATE_FRAME_NUM)
+              pCtx->iErrorCode |= dsBitstreamError;
+            if (pCtx->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+              pCtx->pDec = NULL;
+              return iRet;
+            }
+          }
+          if (!pCtx->pParam->bParseOnly)
+            ExpandReferencingPicture (pCtx->pDec->pData, pCtx->pDec->iWidthInPixel, pCtx->pDec->iHeightInPixel,
+                                      pCtx->pDec->iLinesize,
+                                      pCtx->sExpandPicFunc.pfExpandLumaPicture, pCtx->sExpandPicFunc.pfExpandChromaPicture);
+        }
+      } else if (iThreadCount > 1) {
+        SET_EVENT (&pThreadCtx->sImageReady);
+      }
+      pCtx->pDec = NULL; //after frame decoding, always set to NULL
+    }
+
+    // need update frame_num due current frame is well decoded
+    if (pCurAu->pNalUnitsList[pCurAu->uiStartPos]->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc > 0)
+      pCtx->pLastDecPicInfo->iPrevFrameNum = pSh->iFrameNum;
+    if (pCtx->pLastDecPicInfo->bLastHasMmco5)
+      pCtx->pLastDecPicInfo->iPrevFrameNum = 0;
+    if (iThreadCount > 1) {
+      int32_t  id = pThreadCtx->sThreadInfo.uiThrNum;
+      for (int32_t i = 0; i < iThreadCount; ++i) {
+        if (pThreadCtx[i - id].pCtx != NULL) {
+          unsigned long long uiTimeStamp = pThreadCtx[i - id].pCtx->uiTimeStamp;
+          if (uiTimeStamp > 0 && pThreadCtx[i - id].pCtx->sSpsPpsCtx.iSeqId > pCtx->sSpsPpsCtx.iSeqId) {
+            CopySpsPps (pThreadCtx[i - id].pCtx, pCtx);
+            if (pCtx->pPicBuff != pThreadCtx[i - id].pCtx->pPicBuff) {
+              pCtx->pPicBuff = pThreadCtx[i - id].pCtx->pPicBuff;
+            }
+            InitialDqLayersContext (pCtx, pCtx->pSps->iMbWidth << 4, pCtx->pSps->iMbHeight << 4);
+            break;
+          }
+        }
+      }
+    }
+    if (iThreadCount > 1) {
+      SET_EVENT (&pThreadCtx->sSliceDecodeFinish);
+    }
+  }
+  return ERR_NONE;
+}
+
+bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferInfo* pDstInfo) {
+  PAccessUnit pAu = pCtx->pAccessUnitList;
+  bool bAuBoundaryFlag = false;
+  if (IS_VCL_NAL (pCtx->sCurNalHead.eNalUnitType, 1)) { //VCL data, AU list should have data
+    PNalUnit pCurNal = pAu->pNalUnitsList[pAu->uiEndPos];
+    bAuBoundaryFlag = (pCtx->iTotalNumMbRec != 0)
+                      && (CheckAccessUnitBoundaryExt (&pCtx->pLastDecPicInfo->sLastNalHdrExt, &pCurNal->sNalHeaderExt,
+                          &pCtx->pLastDecPicInfo->sLastSliceHeader,
+                          &pCurNal->sNalData.sVclNal.sSliceHeaderExt.sSliceHeader));
+  } else { //non VCL
+    if (pCtx->sCurNalHead.eNalUnitType == NAL_UNIT_AU_DELIMITER) {
+      bAuBoundaryFlag = true;
+    } else if (pCtx->sCurNalHead.eNalUnitType == NAL_UNIT_SEI) {
+      bAuBoundaryFlag = true;
+    } else if (pCtx->sCurNalHead.eNalUnitType == NAL_UNIT_SPS) {
+      bAuBoundaryFlag = !! (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_SPS);
+    } else if (pCtx->sCurNalHead.eNalUnitType == NAL_UNIT_SUBSET_SPS) {
+      bAuBoundaryFlag = !! (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_SUBSETSPS);
+    } else if (pCtx->sCurNalHead.eNalUnitType == NAL_UNIT_PPS) {
+      bAuBoundaryFlag = !! (pCtx->sSpsPpsCtx.iOverwriteFlags & OVERWRITE_PPS);
+    }
+    if (bAuBoundaryFlag && pCtx->pAccessUnitList->uiAvailUnitsNum != 0) { //Construct remaining data first
+      ConstructAccessUnit (pCtx, ppDst, pDstInfo);
+    }
+  }
+
+  //Do Error Concealment here
+  if (bAuBoundaryFlag && (pCtx->iTotalNumMbRec != 0) && NeedErrorCon (pCtx)) { //AU ready but frame not completely reconed
+    if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+      ImplementErrorCon (pCtx);
+      pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+      pCtx->pDec->iSpsId = pCtx->pSps->iSpsId;
+      pCtx->pDec->iPpsId = pCtx->pPps->iPpsId;
+
+      DecodeFrameConstruction (pCtx, ppDst, pDstInfo);
+      pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use
+      if (pCtx->pLastDecPicInfo->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0) {
+        if (MarkECFrameAsRef (pCtx) == ERR_INFO_INVALID_PTR) {
+          pCtx->iErrorCode |= dsRefListNullPtrs;
+          return false;
+        }
+      }
+    } else if (pCtx->pParam->bParseOnly) { //clear parse only internal data status
+      pCtx->pParserBsInfo->iNalNum = 0;
+      pCtx->bFrameFinish = true; //clear frame pending status here!
+    } else {
+      if (DecodeFrameConstruction (pCtx, ppDst, pDstInfo)) {
+        if ((pCtx->pLastDecPicInfo->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0)
+            && (pCtx->pLastDecPicInfo->sLastNalHdrExt.uiTemporalId == 0))
+          pCtx->iErrorCode |= dsNoParamSets;
+        else
+          pCtx->iErrorCode |= dsBitstreamError;
+        pCtx->pDec = NULL;
+        return false;
+      }
+    }
+    pCtx->pDec = NULL;
+    if (pAu->pNalUnitsList[pAu->uiStartPos]->sNalHeaderExt.sNalUnitHeader.uiNalRefIdc > 0)
+      pCtx->pLastDecPicInfo->iPrevFrameNum = pCtx->pLastDecPicInfo->sLastSliceHeader.iFrameNum; //save frame_num
+    if (pCtx->pLastDecPicInfo->bLastHasMmco5)
+      pCtx->pLastDecPicInfo->iPrevFrameNum = 0;
+  }
+  return ERR_NONE;
+}
+
+bool CheckRefPicturesComplete (PWelsDecoderContext pCtx) {
+  // Multi Reference, RefIdx may differ
+  bool bAllRefComplete = true;
+  int32_t iRealMbIdx = pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
+  for (int32_t iMbIdx = 0; bAllRefComplete
+       && iMbIdx < pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.iTotalMbInCurSlice; iMbIdx++) {
+    switch (pCtx->pCurDqLayer->pDec->pMbType[iRealMbIdx]) {
+    case MB_TYPE_SKIP:
+    case MB_TYPE_16x16:
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][0] ]->bIsComplete;
+      break;
+
+    case MB_TYPE_16x8:
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][0] ]->bIsComplete;
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][8] ]->bIsComplete;
+      break;
+
+    case MB_TYPE_8x16:
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][0] ]->bIsComplete;
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][2] ]->bIsComplete;
+      break;
+
+    case MB_TYPE_8x8:
+    case MB_TYPE_8x8_REF0:
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][0] ]->bIsComplete;
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][2] ]->bIsComplete;
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][8] ]->bIsComplete;
+      bAllRefComplete &=
+        pCtx->sRefPic.pRefList[ LIST_0 ][ pCtx->pCurDqLayer->pDec->pRefIndex[0][iRealMbIdx][10] ]->bIsComplete;
+      break;
+
+    default:
+      break;
+    }
+    iRealMbIdx = (pCtx->pPps->uiNumSliceGroups > 1) ? FmoNextMb (pCtx->pFmo, iRealMbIdx) :
+                 (pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice + iMbIdx);
+    if (iRealMbIdx == -1) //caused by abnormal return of FmoNextMb()
+      return false;
+  }
+
+  return bAllRefComplete;
+}
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_data_tables.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_data_tables.cpp
new file mode 100644
index 0000000000..84ba73566c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/decoder_data_tables.cpp
@@ -0,0 +1,568 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// exp_data.c
+// export date cross various modules (.c)
+#include "wels_common_basis.h"
+#include "mb_cache.h"
+#include "vlc_decoder.h"
+
+namespace WelsDec {
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+const uint8_t g_kuiScan4[16] = { //for mb cache in sMb (only current element, without neighbor)
+  // 4*4block scan    mb cache order
+  0,  1,  4,  5,        // 0  1 | 4  5      0  1 | 2  3
+  2,  3,  6,  7,        // 2  3 | 6  7      4  5 | 6  7
+  8,  9, 12, 13,        //----------------->-----------
+  10, 11, 14, 15        // 8  9 |12 13      8  9 |10 11
+};                        //10 11 |14 15     12 13 |14 15
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at wels_common_basis.h
+
+/*common use table*/
+const uint8_t g_kMbNonZeroCountIdx[24] = {
+  //  0   1 | 4  5      luma 8*8 block           pNonZeroCount[16+8]
+  0,  1,  4,  5,   //  2   3 | 6  7        0  |  1                  0   1   2   3
+  2,  3,  6,  7,   //---------------      ---------                 4   5   6   7
+  8,  9, 12, 13,   //  8   9 | 12 13       2  |  3                  8   9  10  11
+  10, 11, 14, 15,   // 10  11 | 14 15-----------------------------> 12  13  14  15
+  16, 17, 20, 21,   //----------------    chroma 8*8 block          16  17  18  19
+  18, 19, 22, 23   // 16  17 | 20 21        0    1                 20  21  22  23
+};
+//cache element equal to 26
+
+const uint8_t g_kCacheNzcScanIdx[4 * 4 + 4 + 4 + 3] = {
+  /* Luma */
+  9, 10, 17, 18,        // 1+1*8, 2+1*8, 1+2*8, 2+2*8,
+  11, 12, 19, 20,       // 3+1*8, 4+1*8, 3+2*8, 4+2*8,
+  25, 26, 33, 34,       // 1+3*8, 2+3*8, 1+4*8, 2+4*8,
+  27, 28, 35, 36,       // 3+3*8, 4+3*8, 3+4*8, 4+4*8,
+  /* Cb */
+  14, 15,               // 6+1*8, 7+1*8,
+  22, 23,               // 6+2*8, 7+2*8,
+
+  /* Cr */
+  38, 39,               // 6+4*8, 7+4*8,
+  46, 47,               // 6+5*8, 7+5*8,
+  /* Luma DC */
+  41,   // 1+5*8
+  /* Chroma DC */
+  42, 43 // 2+5*8, 3+5*8,
+};
+
+const uint8_t g_kCache26ScanIdx[16] = { //intra4*4_pred_mode and pNonZeroCount cache scan index, 4*4 block as basic unit
+  6,  7, 11, 12,
+  8,  9, 13, 14,
+  16, 17, 21, 22,
+  18, 19, 23, 24
+};
+
+//cache element equal to 30
+const uint8_t g_kCache30ScanIdx[16] = { //mv or pRefIndex cache scan index, 4*4 block as basic unit
+  7,  8, 13, 14,
+  9, 10, 15, 16,
+  19, 20, 25, 26,
+  21, 22, 27, 28
+};
+
+const uint8_t g_kNonZeroScanIdxC[4] = { //pNonZeroCount cache for chroma, 4*4 block as basic unit
+  4, 5,
+  7, 8
+};
+
+const uint8_t g_kuiScan8[24] = {        // [16 + 2*4]
+  9, 10, 17, 18,        // 1+1*8, 2+1*8, 1+2*8, 2+2*8,
+  11, 12, 19, 20,       // 3+1*8, 4+1*8, 3+2*8, 4+2*8,
+  25, 26, 33, 34,       // 1+3*8, 2+3*8, 1+4*8, 2+4*8,
+  27, 28, 35, 36,       // 3+3*8, 4+3*8, 3+4*8, 4+4*8,
+  14, 15,               // 6+1*8, 7+1*8,
+  22, 23,               // 6+2*8, 7+2*8,
+  38, 39,               // 6+4*8, 7+4*8,
+  46, 47,               // 6+5*8, 7+5*8,
+};
+
+const uint8_t g_kuiLumaDcZigzagScan[16] = {
+  0, 16, 32, 128,               // 0*16 + 0*64, 1*16 + 0*64, 2*16 + 0*64, 0*16 + 2*64,
+  48, 64, 80, 96,               // 3*16 + 0*64, 0*16 + 1*64, 1*16 + 1*64, 2*16 + 1*64,
+  144, 160, 176, 192,           // 1*16 + 2*64, 2*16 + 2*64, 3*16 + 2*64, 0*16 + 3*64,
+  112, 208, 224, 240            // 3*16 + 1*64, 1*16 + 3*64, 2*16 + 3*64, 3*16 + 3*64,
+};
+
+const uint8_t g_kuiChromaDcScan[4] = {
+  0, 16, 32, 48
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+const uint8_t g_kuiIntra4x4CbpTable[48] = {
+  47, 31, 15,  0, 23, 27, 29, 30,  7, 11, 13, 14, 39, 43, 45, 46, //15
+  16,  3,  5, 10, 12, 19, 21, 26, 28, 35, 37, 42, 44,  1,  2,  4, //31
+  8, 17, 18, 20, 24,  6,  9, 22, 25, 32, 33, 34, 36, 40, 38, 41  //47
+};
+
+const uint8_t g_kuiIntra4x4CbpTable400[16] = {
+  15, 0, 7, 11, 13, 14, 3, 5, 10, 12, 1, 2, 4, 8, 6, 9
+
+};
+
+const uint8_t g_kuiInterCbpTable[48] = {
+  0, 16,  1,  2,  4,  8, 32,  3,  5, 10, 12, 15, 47,  7, 11, 13, //15
+  14,  6,  9, 31, 35, 37, 42, 44, 33, 34, 36, 40, 39, 43, 45, 46, //31
+  17, 18, 20, 24, 19, 21, 26, 28, 23, 27, 29, 30, 22, 25, 38, 41  //47
+};
+
+const uint8_t g_kuiInterCbpTable400[16] = {
+  0, 1, 2, 4, 8, 3, 5, 10, 12, 15, 7, 11, 13, 14, 6, 9
+};
+
+const uint8_t g_kuiLeadingZeroTable[256] = {
+  8,  7,  6,  6,  5,  5,  5,  5,  4,  4,  4,  4,  4,  4,  4,  4,
+  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,  3,
+  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,  2,
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,  1,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at vlc_decoder.h
+
+const uint8_t g_kuiVlcChromaTable[256][2] = {
+  {13, 7}, {13, 7}, {12, 8}, {11, 8}, {8, 7}, {8, 7}, {7, 7}, {7, 7}, {10, 6}, {10, 6}, {10, 6}, {10, 6}, {6, 6}, {6, 6}, {6, 6}, {6, 6}, //15
+  { 3, 6}, { 3, 6}, { 3, 6}, { 3, 6}, {9, 6}, {9, 6}, {9, 6}, {9, 6}, { 4, 6}, { 4, 6}, { 4, 6}, { 4, 6}, {1, 6}, {1, 6}, {1, 6}, {1, 6}, //31
+  { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, {5, 3}, {5, 3}, //47
+  { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, {5, 3}, {5, 3}, //63
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, //79
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, //95
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, //111
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, {0, 2}, {0, 2}, {0, 2}, {0, 2}, //127
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //143
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //159
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //175
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //191
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //207
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //223
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, //239
+  { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1}, {2, 1}, {2, 1}, {2, 1}, {2, 1}  //255
+};
+
+const uint8_t g_kuiVlcTable_0[256][2]
+= { //[0] means the index of vlc table, [1] means the length of vlc code  [256] value means the value of 8bits
+  { 0, 0}, { 0, 0}, { 0, 0}, {0, 0}, {21, 8}, {12, 8}, {7, 8}, {3, 8}, {17, 7}, {17, 7}, {8, 7}, {8, 7}, {13, 6}, {13, 6}, {13, 6}, {13, 6}, //15
+  { 4, 6}, { 4, 6}, { 4, 6}, {4, 6}, { 1, 6}, { 1, 6}, {1, 6}, {1, 6}, { 9, 5}, { 9, 5}, {9, 5}, {9, 5}, { 9, 5}, { 9, 5}, { 9, 5}, { 9, 5}, //31
+  { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, //47
+  { 5, 3}, { 5, 3}, { 5, 3}, {5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, {5, 3}, {5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, //63
+  { 2, 2}, { 2, 2}, { 2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //79
+  { 2, 2}, { 2, 2}, { 2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //95
+  { 2, 2}, { 2, 2}, { 2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //111
+  { 2, 2}, { 2, 2}, { 2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, {2, 2}, {2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //127
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //143
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //159
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //175
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //191
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //207
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //223
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, //239
+  { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1} //255
+};
+
+const uint8_t g_kuiVlcTable_0_0[256][2] = { // read 8 bits  // for g_kuiVlcTable_0[0] //checked no error--
+  { 0, 0}, { 0, 0}, {47, 7}, {47, 7}, {58, 8}, {60, 8}, {59, 8}, {54, 8}, {61, 8}, {56, 8}, {55, 8}, {50, 8}, {57, 8}, {52, 8}, {51, 8}, {46, 8}, //15
+  {53, 7}, {53, 7}, {48, 7}, {48, 7}, {43, 7}, {43, 7}, {42, 7}, {42, 7}, {49, 7}, {49, 7}, {44, 7}, {44, 7}, {39, 7}, {39, 7}, {38, 7}, {38, 7}, //31
+  {45, 6}, {45, 6}, {45, 6}, {45, 6}, {40, 6}, {40, 6}, {40, 6}, {40, 6}, {35, 6}, {35, 6}, {35, 6}, {35, 6}, {34, 6}, {34, 6}, {34, 6}, {34, 6}, //47
+  {41, 6}, {41, 6}, {41, 6}, {41, 6}, {36, 6}, {36, 6}, {36, 6}, {36, 6}, {31, 6}, {31, 6}, {31, 6}, {31, 6}, {30, 6}, {30, 6}, {30, 6}, {30, 6}, //63
+  {26, 5}, {26, 5}, {26, 5}, {26, 5}, {26, 5}, {26, 5}, {26, 5}, {26, 5}, {32, 5}, {32, 5}, {32, 5}, {32, 5}, {32, 5}, {32, 5}, {32, 5}, {32, 5}, //79
+  {27, 5}, {27, 5}, {27, 5}, {27, 5}, {27, 5}, {27, 5}, {27, 5}, {27, 5}, {22, 5}, {22, 5}, {22, 5}, {22, 5}, {22, 5}, {22, 5}, {22, 5}, {22, 5}, //95
+  {37, 5}, {37, 5}, {37, 5}, {37, 5}, {37, 5}, {37, 5}, {37, 5}, {37, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, {28, 5}, //111
+  {23, 5}, {23, 5}, {23, 5}, {23, 5}, {23, 5}, {23, 5}, {23, 5}, {23, 5}, {18, 5}, {18, 5}, {18, 5}, {18, 5}, {18, 5}, {18, 5}, {18, 5}, {18, 5}, //127
+  {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, //143
+  {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, {33, 3}, //159
+  {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, //175
+  {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, {24, 3}, //191
+  {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, //207
+  {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, {19, 3}, //223
+  {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, //239
+  {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3}, {14, 3} //255
+};
+
+const uint8_t g_kuiVlcTable_0_1[4][2] = { // read 2 bits // for g_kuiVlcTable_0[1] //checked no error--
+  {29, 2}, {20, 2}, {15, 2}, {10, 2}
+};
+
+const uint8_t g_kuiVlcTable_0_2[2][2] = { // read 1 bit // for g_kuiVlcTable_0[2] //checked no error--
+  {25, 1}, {16, 1}
+};
+
+const uint8_t g_kuiVlcTable_0_3[2][2] = { // read 1 bit // for g_kuiVlcTable_0[3] //checked no error--
+  {11, 1}, {6, 1}
+};
+
+const uint8_t g_kuiVlcTable_1[256][2] = { //checked no error--
+  { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, {14, 8}, {20, 8}, {19, 8}, {10, 8}, {29, 7}, {29, 7}, {16, 7}, {16, 7}, {15, 7}, {15, 7}, { 6, 7}, { 6, 7}, //15
+  {25, 6}, {25, 6}, {25, 6}, {25, 6}, {12, 6}, {12, 6}, {12, 6}, {12, 6}, {11, 6}, {11, 6}, {11, 6}, {11, 6}, { 3, 6}, { 3, 6}, { 3, 6}, { 3, 6}, //31
+  {21, 6}, {21, 6}, {21, 6}, {21, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 7, 6}, { 7, 6}, { 7, 6}, { 7, 6}, { 1, 6}, { 1, 6}, { 1, 6}, { 1, 6}, //47
+  {17, 5}, {17, 5}, {17, 5}, {17, 5}, {17, 5}, {17, 5}, {17, 5}, {17, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, //63
+  {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, //79
+  { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, //95
+  { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, //111
+  { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, //127
+  { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //143
+  { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //159
+  { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //175
+  { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, //191
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, //207
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, //223
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, //239
+  { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2}, { 0, 2} //255
+
+};
+
+const uint8_t g_kuiVlcTable_1_0[64][2] = { // read 6 bits  // for g_kuiVlcTable_1[0] //checked no error--
+  { 0, 0}, { 0, 0}, {57, 5}, {57, 5}, {61, 6}, {60, 6}, {59, 6}, {58, 6}, {55, 6}, {54, 6}, {56, 6}, {51, 6}, {52, 5}, {52, 5}, {50, 5}, {50, 5}, //15
+  {53, 5}, {53, 5}, {48, 5}, {48, 5}, {47, 5}, {47, 5}, {46, 5}, {46, 5}, {49, 5}, {49, 5}, {44, 5}, {44, 5}, {43, 5}, {43, 5}, {42, 5}, {42, 5}, //31
+  {38, 4}, {38, 4}, {38, 4}, {38, 4}, {40, 4}, {40, 4}, {40, 4}, {40, 4}, {39, 4}, {39, 4}, {39, 4}, {39, 4}, {34, 4}, {34, 4}, {34, 4}, {34, 4}, //47
+  {45, 4}, {45, 4}, {45, 4}, {45, 4}, {36, 4}, {36, 4}, {36, 4}, {36, 4}, {35, 4}, {35, 4}, {35, 4}, {35, 4}, {30, 4}, {30, 4}, {30, 4}, {30, 4} //63
+};
+
+const uint8_t g_kuiVlcTable_1_1[8][2] = { // read 3 bits // for g_kuiVlcTable_1[1] //checked no error--
+  {41, 3}, {32, 3}, {31, 3}, {26, 3}, {37, 3}, {28, 3}, {27, 3}, {22, 3}
+};
+
+const uint8_t g_kuiVlcTable_1_2[2][2] = { // read 1 bit // for g_kuiVlcTable_1[2] //checked no error--
+  {33, 1}, {24, 1}
+};
+
+const uint8_t g_kuiVlcTable_1_3[2][2] = { // read 1 bit // for g_kuiVlcTable_1[3] //checked no error--
+  {23, 1}, {18, 1}
+};
+
+const uint8_t g_kuiVlcTable_2[256][2] = { //checked no error--
+  { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, { 0, 0}, {45, 8}, {40, 8}, {35, 8}, {30, 8}, {41, 8}, {36, 8}, {31, 8}, {26, 8}, //15
+  {22, 7}, {22, 7}, {18, 7}, {18, 7}, {32, 7}, {32, 7}, {14, 7}, {14, 7}, {37, 7}, {37, 7}, {28, 7}, {28, 7}, {27, 7}, {27, 7}, {10, 7}, {10, 7}, //31
+  { 6, 6}, { 6, 6}, { 6, 6}, { 6, 6}, {24, 6}, {24, 6}, {24, 6}, {24, 6}, {23, 6}, {23, 6}, {23, 6}, {23, 6}, { 3, 6}, { 3, 6}, { 3, 6}, { 3, 6}, //47
+  {33, 6}, {33, 6}, {33, 6}, {33, 6}, {20, 6}, {20, 6}, {20, 6}, {20, 6}, {19, 6}, {19, 6}, {19, 6}, {19, 6}, { 1, 6}, { 1, 6}, { 1, 6}, { 1, 6}, //63
+  {15, 5}, {15, 5}, {15, 5}, {15, 5}, {15, 5}, {15, 5}, {15, 5}, {15, 5}, {16, 5}, {16, 5}, {16, 5}, {16, 5}, {16, 5}, {16, 5}, {16, 5}, {16, 5}, //79
+  {11, 5}, {11, 5}, {11, 5}, {11, 5}, {11, 5}, {11, 5}, {11, 5}, {11, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, {12, 5}, //95
+  { 7, 5}, { 7, 5}, { 7, 5}, { 7, 5}, { 7, 5}, { 7, 5}, { 7, 5}, { 7, 5}, {29, 5}, {29, 5}, {29, 5}, {29, 5}, {29, 5}, {29, 5}, {29, 5}, {29, 5}, //111
+  { 8, 5}, { 8, 5}, { 8, 5}, { 8, 5}, { 8, 5}, { 8, 5}, { 8, 5}, { 8, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, { 4, 5}, //127
+  {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, {25, 4}, //143
+  {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, {21, 4}, //159
+  {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, {17, 4}, //175
+  {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, {13, 4}, //191
+  { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, { 9, 4}, //207
+  { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, { 5, 4}, //223
+  { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, //239
+  { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4}, { 0, 4} //255
+};
+
+const uint8_t g_kuiVlcTable_2_0[4][2] = { // read 2 bits // for g_kuiVlcTable_2[0] //checked
+  {0, 0}, {58, 2}, {61, 2}, {60, 2}
+};
+
+
+const uint8_t g_kuiVlcTable_2_1[4][2] = { // read 2 bits // for g_kuiVlcTable_2[1] //checked
+  {59, 2}, {54, 2}, {57, 2}, {56, 2}
+};
+
+const uint8_t g_kuiVlcTable_2_2[4][2] = { // read 2 bits // for g_kuiVlcTable_2[2] //checked
+  {55, 2}, {50, 2}, {53, 2}, {52, 2}
+};
+
+const uint8_t g_kuiVlcTable_2_3[4][2] = { // read 2 bits // for g_kuiVlcTable_2[3] //checked
+  {51, 2}, {46, 2}, {47, 1}, {47, 1}
+};
+
+const uint8_t g_kuiVlcTable_2_4[2][2] = { // read 1 bit // for g_kuiVlcTable_2[4] //checked
+  {42, 1}, {48, 1}
+};
+
+const uint8_t g_kuiVlcTable_2_5[2][2] = { // read 1 bit // for g_kuiVlcTable_2[5] //checked
+  {43, 1}, {38, 1}
+};
+
+const uint8_t g_kuiVlcTable_2_6[2][2] = { // read 1 bit // for g_kuiVlcTable_2[6] //checked no error--
+  {49, 1}, {44, 1}
+};
+
+const uint8_t g_kuiVlcTable_2_7[2][2] = { // read 1 bit // for g_kuiVlcTable_2[7] //checked no error--
+  {39, 1}, {34, 1}
+};
+
+const uint8_t g_kuiVlcTable_3[64][2] = { // read 6 bits //corrected
+  { 1, 6}, { 2, 6}, { 0, 0}, { 0, 6}, { 3, 6}, { 4, 6}, { 5, 6}, { 0, 0}, { 6, 6}, { 7, 6}, { 8, 6}, { 9, 6}, {10, 6}, {11, 6}, {12, 6}, {13, 6}, //15
+  {14, 6}, {15, 6}, {16, 6}, {17, 6}, {18, 6}, {19, 6}, {20, 6}, {21, 6}, {22, 6}, {23, 6}, {24, 6}, {25, 6}, {26, 6}, {27, 6}, {28, 6}, {29, 6}, //31
+  {30, 6}, {31, 6}, {32, 6}, {33, 6}, {34, 6}, {35, 6}, {36, 6}, {37, 6}, {38, 6}, {39, 6}, {40, 6}, {41, 6}, {42, 6}, {43, 6}, {44, 6}, {45, 6}, //47
+  {46, 6}, {47, 6}, {48, 6}, {49, 6}, {50, 6}, {51, 6}, {52, 6}, {53, 6}, {54, 6}, {55, 6}, {56, 6}, {57, 6}, {58, 6}, {59, 6}, {60, 6}, {61, 6}, //63
+};
+
+
+const uint8_t g_kuiVlcTableNeedMoreBitsThread[3] = {
+  4, 4, 8
+};
+
+const uint8_t g_kuiVlcTableMoreBitsCount0[4] = {
+  8, 2, 1, 1
+};
+
+const uint8_t g_kuiVlcTableMoreBitsCount1[4] = {
+  6, 3, 1, 1
+};
+
+const uint8_t g_kuiVlcTableMoreBitsCount2[8] = {
+  2, 2, 2, 2, 1, 1, 1, 1
+};
+
+const uint8_t g_kuiNcMapTable[17] = {
+  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3
+};
+
+
+const uint8_t g_kuiVlcTrailingOneTotalCoeffTable[62][2] = {
+  {0, 0},
+  {0, 1}, {1, 1},
+  {0, 2}, {1, 2}, {2, 2},
+  {0, 3}, {1, 3}, {2, 3}, {3, 3},
+  {0, 4}, {1, 4}, {2, 4}, {3, 4},
+  {0, 5}, {1, 5}, {2, 5}, {3, 5},
+  {0, 6}, {1, 6}, {2, 6}, {3, 6},
+  {0, 7}, {1, 7}, {2, 7}, {3, 7},
+  {0, 8}, {1, 8}, {2, 8}, {3, 8},
+  {0, 9}, {1, 9}, {2, 9}, {3, 9},
+  {0, 10}, {1, 10}, {2, 10}, {3, 10},
+  {0, 11}, {1, 11}, {2, 11}, {3, 11},
+  {0, 12}, {1, 12}, {2, 12}, {3, 12},
+  {0, 13}, {1, 13}, {2, 13}, {3, 13},
+  {0, 14}, {1, 14}, {2, 14}, {3, 14},
+  {0, 15}, {1, 15}, {2, 15}, {3, 15},
+  {0, 16}, {1, 16}, {2, 16}, {3, 16}
+};
+
+const uint8_t g_kuiTotalZerosTable0[512][2]
+= { //read 9 bits, generated by tzVlcIndex=1 in Table 9-7 in H.264/AVC standard
+  {0, 0}, {15, 9}, {14, 9}, {13, 9}, {12, 8}, {12, 8}, {11, 8}, {11, 8}, {10, 7}, {10, 7}, {10, 7}, {10, 7}, {9, 7}, {9, 7}, {9, 7}, {9, 7}, //15
+  {8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 8, 6}, { 7, 6}, { 7, 6}, { 7, 6}, { 7, 6}, {7, 6}, {7, 6}, {7, 6}, {7, 6}, //31
+  {6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, { 6, 5}, {6, 5}, {6, 5}, {6, 5}, {6, 5}, //47
+  {5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, { 5, 5}, {5, 5}, {5, 5}, {5, 5}, {5, 5}, //63
+  {4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, //79
+  {4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, {4, 4}, {4, 4}, {4, 4}, {4, 4}, //95
+  {3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4}, //111
+  {3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, { 3, 4}, {3, 4}, {3, 4}, {3, 4}, {3, 4}, //127
+  {2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, //143
+  {2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, //159
+  {2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, //175
+  {2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, //191
+  {1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, //207
+  {1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, //223
+  {1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, //239
+  {1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, //255
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //271
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //287
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //303
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //319
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //335
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //351
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //367
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //383
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //399
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //415
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //431
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //447
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //463
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //479
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1}, //495
+  {0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}, {0, 1}, {0, 1}, {0, 1}, {0, 1} //511
+};
+
+const uint8_t g_kuiTotalZerosTable1[64][2]
+= { //read 6 bits, generated by tzVlcIndex=2 in Table 9-7 in H.264/AVC standard
+  {14, 6}, {13, 6}, {12, 6}, {11, 6}, {10, 5}, {10, 5}, {9, 5}, {9, 5}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {7, 4}, {7, 4}, {7, 4}, {7, 4}, //15
+  { 6, 4}, { 6, 4}, { 6, 4}, { 6, 4}, { 5, 4}, { 5, 4}, {5, 4}, {5, 4}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, //31
+  { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, {3, 3}, {3, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, {2, 3}, //47
+  { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, { 1, 3}, {1, 3}, {1, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3}, {0, 3} //63
+};
+
+const uint8_t g_kuiTotalZerosTable2[64][2]
+= { //read 6 bits, generated by tzVlcIndex=3 in Table 9-7 in H.264/AVC standard
+  {13, 6}, {11, 6}, {12, 5}, {12, 5}, {10, 5}, {10, 5}, {9, 5}, {9, 5}, {8, 4}, {8, 4}, {8, 4}, {8, 4}, {5, 4}, {5, 4}, {5, 4}, {5, 4}, //15
+  { 4, 4}, { 4, 4}, { 4, 4}, { 4, 4}, { 0, 4}, { 0, 4}, {0, 4}, {0, 4}, {7, 3}, {7, 3}, {7, 3}, {7, 3}, {7, 3}, {7, 3}, {7, 3}, {7, 3}, //31
+  { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, {6, 3}, {6, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, {3, 3}, //47
+  { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, {2, 3}, {2, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3} //63
+};
+
+const uint8_t g_kuiTotalZerosTable3[32][2]
+= { //read 5 bits, generated by tzVlcIndex=4 in Table 9-7 in H.264/AVC standard
+  {12, 5}, {11, 5}, {10, 5}, {0, 5}, {9, 4}, {9, 4}, {7, 4}, {7, 4}, {3, 4}, {3, 4}, {2, 4}, {2, 4}, {8, 3}, {8, 3}, {8, 3}, {8, 3}, //15
+  { 6, 3}, { 6, 3}, { 6, 3}, {6, 3}, {5, 3}, {5, 3}, {5, 3}, {5, 3}, {4, 3}, {4, 3}, {4, 3}, {4, 3}, {1, 3}, {1, 3}, {1, 3}, {1, 3}, //31
+};
+
+const uint8_t g_kuiTotalZerosTable4[32][2]
+= { //read 5 bits, generated by tzVlcIndex=5 in Table 9-7 in H.264/AVC standard
+  {11, 5}, { 9, 5}, {10, 4}, {10, 4}, { 8, 4}, { 8, 4}, { 2, 4}, { 2, 4}, { 1, 4}, { 1, 4}, { 0, 4}, { 0, 4}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, //15
+  { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3} //31
+};
+
+const uint8_t g_kuiTotalZerosTable5[64][2]
+= { //read 6 bits, generated by tzVlcIndex=6 in Table 9-7 in H.264/AVC standard
+  {10, 6}, { 0, 6}, { 1, 5}, { 1, 5}, { 8, 4}, { 8, 4}, { 8, 4}, { 8, 4}, { 9, 3}, { 9, 3}, { 9, 3}, { 9, 3}, { 9, 3}, { 9, 3}, { 9, 3}, { 9, 3}, //15
+  { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, //31
+  { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, //47
+  { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3} //63
+};
+
+const uint8_t g_kuiTotalZerosTable6[64][2]
+= { //read 6 bits, generated by tzVlcIndex=7 in Table 9-7 in H.264/AVC standard
+  { 9, 6}, { 0, 6}, { 1, 5}, { 1, 5}, { 7, 4}, { 7, 4}, { 7, 4}, { 7, 4}, { 8, 3}, { 8, 3}, { 8, 3}, { 8, 3}, { 8, 3}, { 8, 3}, { 8, 3}, { 8, 3}, //15
+  { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, { 4, 3}, //31
+  { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, //47
+  { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2} //63
+};
+
+const uint8_t g_kuiTotalZerosTable7[64][2]
+= { //read 6 bits, generated by tzVlcIndex=8 in Table 9-7 in H.264/AVC standard
+  { 8, 6}, { 0, 6}, { 2, 5}, { 2, 5}, { 1, 4}, { 1, 4}, { 1, 4}, { 1, 4}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, { 7, 3}, //15
+  { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 6, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, { 3, 3}, //31
+  { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, //47
+  { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2} //63
+};
+
+const uint8_t g_kuiTotalZerosTable8[64][2]
+= { //read 6 bits, generated by tzVlcIndex=9 in Table 9-7 in H.264/AVC standard
+  { 1, 6}, { 0, 6}, { 7, 5}, { 7, 5}, { 2, 4}, { 2, 4}, { 2, 4}, { 2, 4}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, { 5, 3}, //15
+  { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, { 6, 2}, //31
+  { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, //47
+  { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2} //63
+};
+
+const uint8_t g_kuiTotalZerosTable9[32][2]
+= { //read 5 bits, generated by tzVlcIndex=10 in Table 9-7 in H.264/AVC standard
+  { 1, 5}, { 0, 5}, { 6, 4}, { 6, 4}, { 2, 3}, { 2, 3}, { 2, 3}, { 2, 3}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, { 5, 2}, //15
+  { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 4, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2}, { 3, 2} //31
+};
+
+const uint8_t g_kuiTotalZerosTable10[16][2]
+= { //read 4 bits, generated by tzVlcIndex=11 in Table 9-7 in H.264/AVC standard
+  { 0, 4}, { 1, 4}, { 2, 3}, { 2, 3}, { 3, 3}, { 3, 3}, { 5, 3}, { 5, 3}, { 4, 1}, { 4, 1}, { 4, 1}, { 4, 1}, { 4, 1}, { 4, 1}, { 4, 1}, { 4, 1} //15
+};
+
+const uint8_t g_kuiTotalZerosTable11[16][2]
+= { //read 4 bits, generated by tzVlcIndex=12 in Table 9-7 in H.264/AVC standard
+  { 0, 4}, { 1, 4}, { 4, 3}, { 4, 3}, { 2, 2}, { 2, 2}, { 2, 2}, { 2, 2}, { 3, 1}, { 3, 1}, { 3, 1}, { 3, 1}, { 3, 1}, { 3, 1}, { 3, 1}, { 3, 1} //15
+};
+
+const uint8_t g_kuiTotalZerosTable12[8][2]
+= { //read 3 bits, generated by tzVlcIndex=13 in Table 9-7 in H.264/AVC standard
+  { 0, 3}, { 1, 3}, { 3, 2}, { 3, 2}, { 2, 1}, { 2, 1}, { 2, 1}, { 2, 1} //8
+};
+
+const uint8_t g_kuiTotalZerosTable13[4][2]
+= { //read 2 bits, generated by tzVlcIndex=14 in Table 9-7 in H.264/AVC standard
+  { 0, 2}, { 1, 2}, { 2, 1}, { 2, 1}
+};
+
+const uint8_t g_kuiTotalZerosTable14[2][2]
+= { //read 1 bits generated by tzVlcIndex=15 in Table 9-7 in H.264/AVC standard
+  { 0, 1}, { 1, 1}
+};
+
+const uint8_t g_kuiTotalZerosBitNumMap[15] = {
+  9, 6, 6, 5, 5, 6, 6, 6, 6, 5, 4, 4, 3, 2, 1
+};
+
+
+const uint8_t g_kuiTotalZerosChromaTable0[8][2]
+= { //read 3 bits, generated by tzVlcIndex=1 in Table 9-9(a) in H.264/AVC standard
+  { 3, 3}, { 2, 3}, { 1, 2}, { 1, 2}, { 0, 1}, { 0, 1}, { 0, 1}, { 0, 1}
+};
+
+const uint8_t g_kuiTotalZerosChromaTable1[4][2]
+= { //read 2 bits, generated by tzVlcIndex=2 in Table 9-9(a) in H.264/AVC standard
+  { 2, 2}, { 1, 2}, { 0, 1}, { 0, 1}
+};
+
+const uint8_t g_kuiTotalZerosChromaTable2[2][2]
+= { //read 1 bits, generated by tzVlcIndex=3 in Table 9-9(a) in H.264/AVC standard
+  { 1, 1}, { 0, 1}
+};
+
+const uint8_t g_kuiTotalZerosBitNumChromaMap[3] = {
+  3, 2, 1
+};
+
+const uint8_t g_kuiZeroLeftTable0[2][2] = { //read 1 bits
+  {1, 1}, {0, 1}
+};
+
+const uint8_t g_kuiZeroLeftTable1[4][2] = { //read 2 bits
+  {2, 2}, {1, 2}, {0, 1}, {0, 1}
+};
+
+const uint8_t g_kuiZeroLeftTable2[4][2] = { //read 2 bits
+  {3, 2}, {2, 2}, {1, 2}, {0, 2}
+};
+
+const uint8_t g_kuiZeroLeftTable3[8][2] = { //read 3 bits
+  {4, 3}, {3, 3}, {2, 2}, {2, 2}, {1, 2}, {1, 2}, {0, 2}, {0, 2}
+};
+
+const uint8_t g_kuiZeroLeftTable4[8][2] = { //read 3 bits
+  {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 2}, {1, 2}, {0, 2}, {0, 2}
+};
+
+const uint8_t g_kuiZeroLeftTable5[8][2] = { //read 3 bits
+  {1, 3}, {2, 3}, {4, 3}, {3, 3}, {6, 3}, {5, 3}, {0, 2}, {0, 2}
+};
+
+const uint8_t g_kuiZeroLeftTable6[8][2] = { //read 3 bits
+  {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}
+};
+
+const uint8_t g_kuiZeroLeftBitNumMap[16] = {
+  0, 1, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3
+};
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/error_concealment.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/error_concealment.cpp
new file mode 100644
index 0000000000..64da754693
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/error_concealment.cpp
@@ -0,0 +1,480 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      error_concealment.cpp:  Wels decoder error concealment implementation
+ */
+
+#include "error_code.h"
+#include "expand_pic.h"
+#include "manage_dec_ref.h"
+#include "copy_mb.h"
+#include "error_concealment.h"
+#include "cpu_core.h"
+
+namespace WelsDec {
+//Init
+void InitErrorCon (PWelsDecoderContext pCtx) {
+  if ((pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_COPY)
+      || (pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_COPY_CROSS_IDR)
+      || (pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_MV_COPY_CROSS_IDR)
+      || (pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)
+      || (pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE)) {
+    if ((pCtx->pParam->eEcActiveIdc != ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE)
+        && (pCtx->pParam->eEcActiveIdc != ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE)) {
+      pCtx->bFreezeOutput = false;
+    }
+    pCtx->sCopyFunc.pCopyLumaFunc = WelsCopy16x16_c;
+    pCtx->sCopyFunc.pCopyChromaFunc = WelsCopy8x8_c;
+
+#if defined(X86_ASM)
+    if (pCtx->uiCpuFlag & WELS_CPU_MMXEXT) {
+      pCtx->sCopyFunc.pCopyChromaFunc = WelsCopy8x8_mmx; //aligned
+    }
+
+    if (pCtx->uiCpuFlag & WELS_CPU_SSE2) {
+      pCtx->sCopyFunc.pCopyLumaFunc = WelsCopy16x16_sse2; //this is aligned copy;
+    }
+#endif //X86_ASM
+
+#if defined(HAVE_NEON)
+    if (pCtx->uiCpuFlag & WELS_CPU_NEON) {
+      pCtx->sCopyFunc.pCopyLumaFunc     = WelsCopy16x16_neon; //aligned
+      pCtx->sCopyFunc.pCopyChromaFunc   = WelsCopy8x8_neon; //aligned
+    }
+#endif //HAVE_NEON
+
+#if defined(HAVE_NEON_AARCH64)
+    if (pCtx->uiCpuFlag & WELS_CPU_NEON) {
+      pCtx->sCopyFunc.pCopyLumaFunc     = WelsCopy16x16_AArch64_neon; //aligned
+      pCtx->sCopyFunc.pCopyChromaFunc   = WelsCopy8x8_AArch64_neon; //aligned
+    }
+#endif //HAVE_NEON_AARCH64
+  } //TODO add more methods here
+  return;
+}
+
+//Do error concealment using frame copy method
+void DoErrorConFrameCopy (PWelsDecoderContext pCtx) {
+  PPicture pDstPic = pCtx->pDec;
+  PPicture pSrcPic = pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb;
+  uint32_t uiHeightInPixelY = (pCtx->pSps->iMbHeight) << 4;
+  int32_t iStrideY = pDstPic->iLinesize[0];
+  int32_t iStrideUV = pDstPic->iLinesize[1];
+  pCtx->pDec->iMbEcedNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+  if ((pCtx->pParam->eEcActiveIdc == ERROR_CON_FRAME_COPY) && (pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.bIdrFlag))
+    pSrcPic = NULL; //no cross IDR method, should fill in data instead of copy
+  if (pSrcPic == NULL) { //no ref pic, assign specific data to picture
+    memset (pDstPic->pData[0], 128, uiHeightInPixelY * iStrideY);
+    memset (pDstPic->pData[1], 128, (uiHeightInPixelY >> 1) * iStrideUV);
+    memset (pDstPic->pData[2], 128, (uiHeightInPixelY >> 1) * iStrideUV);
+  } else if (pSrcPic == pDstPic) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "DoErrorConFrameCopy()::EC memcpy overlap.");
+  } else { //has ref pic here
+    memcpy (pDstPic->pData[0], pSrcPic->pData[0], uiHeightInPixelY * iStrideY);
+    memcpy (pDstPic->pData[1], pSrcPic->pData[1], (uiHeightInPixelY >> 1) * iStrideUV);
+    memcpy (pDstPic->pData[2], pSrcPic->pData[2], (uiHeightInPixelY >> 1) * iStrideUV);
+  }
+}
+
+
+//Do error concealment using slice copy method
+void DoErrorConSliceCopy (PWelsDecoderContext pCtx) {
+  int32_t iMbWidth = (int32_t) pCtx->pSps->iMbWidth;
+  int32_t iMbHeight = (int32_t) pCtx->pSps->iMbHeight;
+  PPicture pDstPic = pCtx->pDec;
+  PPicture pSrcPic = pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb;
+  if ((pCtx->pParam->eEcActiveIdc == ERROR_CON_SLICE_COPY) && (pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.bIdrFlag))
+    pSrcPic = NULL; //no cross IDR method, should fill in data instead of copy
+
+  //uint8_t *pDstData[3], *pSrcData[3];
+  bool* pMbCorrectlyDecodedFlag = pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag;
+  //Do slice copy late
+  int32_t iMbXyIndex;
+  uint8_t* pSrcData, *pDstData;
+  uint32_t iSrcStride; // = pSrcPic->iLinesize[0];
+  uint32_t iDstStride = pDstPic->iLinesize[0];
+  if (pSrcPic == pDstPic) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "DoErrorConSliceCopy()::EC memcpy overlap.");
+    return;
+  }
+  for (int32_t iMbY = 0; iMbY < iMbHeight; ++iMbY) {
+    for (int32_t iMbX = 0; iMbX < iMbWidth; ++iMbX) {
+      iMbXyIndex = iMbY * iMbWidth + iMbX;
+      if (!pMbCorrectlyDecodedFlag[iMbXyIndex]) {
+        pCtx->pDec->iMbEcedNum++;
+        if (pSrcPic != NULL) {
+          iSrcStride = pSrcPic->iLinesize[0];
+          //Y component
+          pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;
+          pSrcData = pSrcPic->pData[0] + iMbY * 16 * iSrcStride + iMbX * 16;
+          pCtx->sCopyFunc.pCopyLumaFunc (pDstData, iDstStride, pSrcData, iSrcStride);
+          //U component
+          pDstData = pDstPic->pData[1] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          pSrcData = pSrcPic->pData[1] + iMbY * 8 * iSrcStride / 2 + iMbX * 8;
+          pCtx->sCopyFunc.pCopyChromaFunc (pDstData, iDstStride / 2, pSrcData, iSrcStride / 2);
+          //V component
+          pDstData = pDstPic->pData[2] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          pSrcData = pSrcPic->pData[2] + iMbY * 8 * iSrcStride / 2 + iMbX * 8;
+          pCtx->sCopyFunc.pCopyChromaFunc (pDstData, iDstStride / 2, pSrcData, iSrcStride / 2);
+        } else { //pSrcPic == NULL
+          //Y component
+          pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;
+          for (int32_t i = 0; i < 16; ++i) {
+            memset (pDstData, 128, 16);
+            pDstData += iDstStride;
+          }
+          //U component
+          pDstData = pDstPic->pData[1] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          for (int32_t i = 0; i < 8; ++i) {
+            memset (pDstData, 128, 8);
+            pDstData += iDstStride / 2;
+          }
+          //V component
+          pDstData = pDstPic->pData[2] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          for (int32_t i = 0; i < 8; ++i) {
+            memset (pDstData, 128, 8);
+            pDstData += iDstStride / 2;
+          }
+        } //
+      } //!pMbCorrectlyDecodedFlag[iMbXyIndex]
+    } //iMbX
+  } //iMbY
+}
+
+//Do error concealment using slice MV copy method
+void DoMbECMvCopy (PWelsDecoderContext pCtx, PPicture pDec, PPicture pRef, int32_t iMbXy, int32_t iMbX, int32_t iMbY,
+                   sMCRefMember* pMCRefMem) {
+  if (pDec == pRef) {
+    return; // for protection, shall never go into this logic, error info printed outside.
+  }
+  int16_t iMVs[2];
+  int32_t iMbXInPix = iMbX << 4;
+  int32_t iMbYInPix = iMbY << 4;
+  int32_t iScale0;
+  int32_t iScale1;
+  uint8_t* pDst[3];
+  int32_t iCurrPoc = pDec->iFramePoc;
+  pDst[0] = pDec->pData[0] + iMbXInPix + iMbYInPix * pMCRefMem->iDstLineLuma;
+  pDst[1] = pDec->pData[1] + (iMbXInPix >> 1) + (iMbYInPix >> 1) * pMCRefMem->iDstLineChroma;
+  pDst[2] = pDec->pData[2] + (iMbXInPix >> 1) + (iMbYInPix >> 1) * pMCRefMem->iDstLineChroma;
+  if (pDec->bIdrFlag == true || pCtx->pECRefPic[0] == NULL) {
+    uint8_t* pSrcData;
+    //Y component
+    pSrcData = pMCRefMem->pSrcY + iMbY * 16 * pMCRefMem->iSrcLineLuma + iMbX * 16;
+    pCtx->sCopyFunc.pCopyLumaFunc (pDst[0], pMCRefMem->iDstLineLuma, pSrcData, pMCRefMem->iSrcLineLuma);
+    //U component
+    pSrcData = pMCRefMem->pSrcU + iMbY * 8 * pMCRefMem->iSrcLineChroma + iMbX * 8;
+    pCtx->sCopyFunc.pCopyChromaFunc (pDst[1], pMCRefMem->iDstLineChroma, pSrcData, pMCRefMem->iSrcLineChroma);
+    //V component
+    pSrcData = pMCRefMem->pSrcV + iMbY * 8 * pMCRefMem->iSrcLineChroma + iMbX * 8;
+    pCtx->sCopyFunc.pCopyChromaFunc (pDst[2], pMCRefMem->iDstLineChroma, pSrcData, pMCRefMem->iSrcLineChroma);
+    return;
+  }
+
+  if (pCtx->pECRefPic[0]) {
+    if (pCtx->pECRefPic[0] == pRef) {
+      iMVs[0] = pCtx->iECMVs[0][0];
+      iMVs[1] = pCtx->iECMVs[0][1];
+    } else {
+      iScale0 = pCtx->pECRefPic[0]->iFramePoc - iCurrPoc;
+      iScale1 = pRef->iFramePoc - iCurrPoc;
+      iMVs[0] = iScale0 == 0 ? 0 : pCtx->iECMVs[0][0] * iScale1 / iScale0;
+      iMVs[1] = iScale0 == 0 ? 0 : pCtx->iECMVs[0][1] * iScale1 / iScale0;
+    }
+    pMCRefMem->pDstY = pDst[0];
+    pMCRefMem->pDstU = pDst[1];
+    pMCRefMem->pDstV = pDst[2];
+    int32_t iFullMVx = (iMbXInPix << 2) + iMVs[0]; //quarter pixel
+    int32_t iFullMVy = (iMbYInPix << 2) + iMVs[1];
+    // only use to be output pixels to EC;
+    int32_t iPicWidthLeftLimit = 0;
+    int32_t iPicHeightTopLimit = 0;
+    int32_t iPicWidthRightLimit = pMCRefMem->iPicWidth;
+    int32_t iPicHeightBottomLimit = pMCRefMem->iPicHeight;
+    if (pCtx->pSps->bFrameCroppingFlag) {
+      iPicWidthLeftLimit = 0 + pCtx->sFrameCrop.iLeftOffset * 2;
+      iPicWidthRightLimit = (pMCRefMem->iPicWidth - pCtx->sFrameCrop.iRightOffset * 2);
+      iPicHeightTopLimit = 0 + pCtx->sFrameCrop.iTopOffset * 2;
+      iPicHeightBottomLimit = (pMCRefMem->iPicHeight - pCtx->sFrameCrop.iTopOffset * 2);
+    }
+    // further make sure no need to expand picture
+    int32_t iMinLeftOffset = (iPicWidthLeftLimit + 2) * (1 << 2);
+    int32_t iMaxRightOffset = ((iPicWidthRightLimit - 18) * (1 << 2));
+    int32_t iMinTopOffset = (iPicHeightTopLimit + 2) * (1 << 2);
+    int32_t iMaxBottomOffset = ((iPicHeightBottomLimit - 18) * (1 << 2));
+    if (iFullMVx < iMinLeftOffset) {
+      iFullMVx = (iFullMVx >> 2) * (1 << 2);
+      iFullMVx = WELS_MAX (iPicWidthLeftLimit, iFullMVx);
+    } else if (iFullMVx > iMaxRightOffset) {
+      iFullMVx = (iFullMVx >> 2) * (1 << 2);
+      iFullMVx = WELS_MIN (((iPicWidthRightLimit - 16) * (1 << 2)), iFullMVx);
+    }
+    if (iFullMVy < iMinTopOffset) {
+      iFullMVy = (iFullMVy >> 2) * (1 << 2);
+      iFullMVy = WELS_MAX (iPicHeightTopLimit, iFullMVy);
+    } else if (iFullMVy > iMaxBottomOffset) {
+      iFullMVy = (iFullMVy >> 2) * (1 << 2);
+      iFullMVy = WELS_MIN (((iPicHeightBottomLimit - 16) * (1 << 2)), iFullMVy);
+    }
+    iMVs[0] = iFullMVx - (iMbXInPix << 2);
+    iMVs[1] = iFullMVy - (iMbYInPix << 2);
+    BaseMC (pCtx, pMCRefMem, -1, -1, iMbXInPix, iMbYInPix, &pCtx->sMcFunc, 16, 16, iMVs);
+  }
+  return;
+}
+
+void GetAvilInfoFromCorrectMb (PWelsDecoderContext pCtx) {
+  int32_t iMbWidth = (int32_t) pCtx->pSps->iMbWidth;
+  int32_t iMbHeight = (int32_t) pCtx->pSps->iMbHeight;
+  bool* pMbCorrectlyDecodedFlag = pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iInterMbCorrectNum[16];
+  int32_t iMbXyIndex;
+
+  int8_t iRefIdx;
+  memset (pCtx->iECMVs, 0, sizeof (int32_t) * 32);
+  memset (pCtx->pECRefPic, 0, sizeof (PPicture) * 16);
+  memset (iInterMbCorrectNum, 0, sizeof (int32_t) * 16);
+
+  for (int32_t iMbY = 0; iMbY < iMbHeight; ++iMbY) {
+    for (int32_t iMbX = 0; iMbX < iMbWidth; ++iMbX) {
+      iMbXyIndex = iMbY * iMbWidth + iMbX;
+      if (pMbCorrectlyDecodedFlag[iMbXyIndex] && IS_INTER (pCurDqLayer->pDec->pMbType[iMbXyIndex])) {
+        uint32_t iMBType = pCurDqLayer->pDec->pMbType[iMbXyIndex];
+        switch (iMBType) {
+        case MB_TYPE_SKIP:
+        case MB_TYPE_16x16:
+          iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][0];
+          pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][0];
+          pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][1];
+          pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+          iInterMbCorrectNum[iRefIdx]++;
+          break;
+        case MB_TYPE_16x8:
+          iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][0];
+          pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][0];
+          pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][1];
+          pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+          iInterMbCorrectNum[iRefIdx]++;
+
+          iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][8];
+          pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][8][0];
+          pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][8][1];
+          pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+          iInterMbCorrectNum[iRefIdx]++;
+          break;
+        case MB_TYPE_8x16:
+          iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][0];
+          pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][0];
+          pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][0][1];
+          pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+          iInterMbCorrectNum[iRefIdx]++;
+
+          iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][2];
+          pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][2][0];
+          pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][2][1];
+          pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+          iInterMbCorrectNum[iRefIdx]++;
+          break;
+        case MB_TYPE_8x8:
+        case MB_TYPE_8x8_REF0: {
+          uint32_t iSubMBType;
+          int32_t i, j, iIIdx, iJIdx;
+
+          for (i = 0; i < 4; i++) {
+            iSubMBType = pCurDqLayer->pSubMbType[iMbXyIndex][i];
+            iIIdx = ((i >> 1) << 3) + ((i & 1) << 1);
+            iRefIdx = pCurDqLayer->pDec->pRefIndex[0][iMbXyIndex][iIIdx];
+            pCtx->pECRefPic[iRefIdx] = pCtx->sRefPic.pRefList[LIST_0][iRefIdx];
+            switch (iSubMBType) {
+            case SUB_MB_TYPE_8x8:
+              pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][0];
+              pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][1];
+              iInterMbCorrectNum[iRefIdx]++;
+
+              break;
+            case SUB_MB_TYPE_8x4:
+              pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][0];
+              pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][1];
+
+
+              pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + 4][0];
+              pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + 4][1];
+              iInterMbCorrectNum[iRefIdx] += 2;
+
+              break;
+            case SUB_MB_TYPE_4x8:
+              pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][0];
+              pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx][1];
+
+
+              pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + 1][0];
+              pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + 1][1];
+              iInterMbCorrectNum[iRefIdx] += 2;
+              break;
+            case SUB_MB_TYPE_4x4: {
+              for (j = 0; j < 4; j++) {
+                iJIdx = ((j >> 1) << 2) + (j & 1);
+                pCtx->iECMVs[iRefIdx][0] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + iJIdx][0];
+                pCtx->iECMVs[iRefIdx][1] += pCurDqLayer->pDec->pMv[0][iMbXyIndex][iIIdx + iJIdx][1];
+              }
+              iInterMbCorrectNum[iRefIdx] += 4;
+            }
+            break;
+            default:
+              break;
+            }
+          }
+        }
+        break;
+        default:
+          break;
+        }
+      } //pMbCorrectlyDecodedFlag[iMbXyIndex]
+    } //iMbX
+  } //iMbY
+  for (int32_t i = 0; i < 16; i++) {
+    if (iInterMbCorrectNum[i]) {
+      pCtx->iECMVs[i][0] = pCtx->iECMVs[i][0] / iInterMbCorrectNum[i];
+      pCtx->iECMVs[i][1] = pCtx->iECMVs[i][1] / iInterMbCorrectNum[i];
+    }
+  }
+}
+
+void DoErrorConSliceMVCopy (PWelsDecoderContext pCtx) {
+  int32_t iMbWidth = (int32_t) pCtx->pSps->iMbWidth;
+  int32_t iMbHeight = (int32_t) pCtx->pSps->iMbHeight;
+  PPicture pDstPic = pCtx->pDec;
+  PPicture pSrcPic = pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb;
+
+  bool* pMbCorrectlyDecodedFlag = pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag;
+  int32_t iMbXyIndex;
+  uint8_t* pDstData;
+  uint32_t iDstStride = pDstPic->iLinesize[0];
+  sMCRefMember sMCRefMem;
+  if (pSrcPic != NULL) {
+    sMCRefMem.iSrcLineLuma   = pSrcPic->iLinesize[0];
+    sMCRefMem.iSrcLineChroma = pSrcPic->iLinesize[1];
+    sMCRefMem.pSrcY = pSrcPic->pData[0];
+    sMCRefMem.pSrcU = pSrcPic->pData[1];
+    sMCRefMem.pSrcV = pSrcPic->pData[2];
+    sMCRefMem.iDstLineLuma   = pDstPic->iLinesize[0];
+    sMCRefMem.iDstLineChroma = pDstPic->iLinesize[1];
+    sMCRefMem.iPicWidth = pDstPic->iWidthInPixel;
+    sMCRefMem.iPicHeight = pDstPic->iHeightInPixel;
+    if (pDstPic == pSrcPic) {
+      // output error info, EC will be ignored in DoMbECMvCopy
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "DoErrorConSliceMVCopy()::EC memcpy overlap.");
+      return;
+    }
+  }
+
+  for (int32_t iMbY = 0; iMbY < iMbHeight; ++iMbY) {
+    for (int32_t iMbX = 0; iMbX < iMbWidth; ++iMbX) {
+      iMbXyIndex = iMbY * iMbWidth + iMbX;
+      if (!pMbCorrectlyDecodedFlag[iMbXyIndex]) {
+        pCtx->pDec->iMbEcedNum++;
+        if (pSrcPic != NULL) {
+          DoMbECMvCopy (pCtx, pDstPic, pSrcPic, iMbXyIndex, iMbX, iMbY, &sMCRefMem);
+        } else { //pSrcPic == NULL
+          //Y component
+          pDstData = pDstPic->pData[0] + iMbY * 16 * iDstStride + iMbX * 16;
+          for (int32_t i = 0; i < 16; ++i) {
+            memset (pDstData, 128, 16);
+            pDstData += iDstStride;
+          }
+          //U component
+          pDstData = pDstPic->pData[1] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          for (int32_t i = 0; i < 8; ++i) {
+            memset (pDstData, 128, 8);
+            pDstData += iDstStride / 2;
+          }
+          //V component
+          pDstData = pDstPic->pData[2] + iMbY * 8 * iDstStride / 2 + iMbX * 8;
+          for (int32_t i = 0; i < 8; ++i) {
+            memset (pDstData, 128, 8);
+            pDstData += iDstStride / 2;
+          }
+        } //
+
+      } //!pMbCorrectlyDecodedFlag[iMbXyIndex]
+    } //iMbX
+  } //iMbY
+}
+
+//Mark erroneous frame as Ref Pic into DPB
+int32_t MarkECFrameAsRef (PWelsDecoderContext pCtx) {
+  int32_t iRet = WelsMarkAsRef (pCtx);
+  // Under EC mode, the ERR_INFO_DUPLICATE_FRAME_NUM does not need to be process
+  if (iRet != ERR_NONE) {
+    return iRet;
+  }
+  ExpandReferencingPicture (pCtx->pDec->pData, pCtx->pDec->iWidthInPixel, pCtx->pDec->iHeightInPixel,
+                            pCtx->pDec->iLinesize,
+                            pCtx->sExpandPicFunc.pfExpandLumaPicture, pCtx->sExpandPicFunc.pfExpandChromaPicture);
+
+  return ERR_NONE;
+}
+
+bool NeedErrorCon (PWelsDecoderContext pCtx) {
+  bool bNeedEC = false;
+  int32_t iMbNum = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
+  for (int32_t i = 0; i < iMbNum; ++i) {
+    if (!pCtx->pCurDqLayer->pMbCorrectlyDecodedFlag[i]) {
+      bNeedEC = true;
+      break;
+    }
+  }
+  return bNeedEC;
+}
+
+// ImplementErrorConceal
+// Do actual error concealment
+void ImplementErrorCon (PWelsDecoderContext pCtx) {
+  if (ERROR_CON_DISABLE == pCtx->pParam->eEcActiveIdc) {
+    pCtx->iErrorCode |= dsBitstreamError;
+    return;
+  } else if ((ERROR_CON_FRAME_COPY == pCtx->pParam->eEcActiveIdc)
+             || (ERROR_CON_FRAME_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)) {
+    DoErrorConFrameCopy (pCtx);
+  } else if ((ERROR_CON_SLICE_COPY == pCtx->pParam->eEcActiveIdc)
+             || (ERROR_CON_SLICE_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)
+             || (ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE == pCtx->pParam->eEcActiveIdc)) {
+    DoErrorConSliceCopy (pCtx);
+  } else if ((ERROR_CON_SLICE_MV_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)
+             || (ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE == pCtx->pParam->eEcActiveIdc)) {
+    GetAvilInfoFromCorrectMb (pCtx);
+    DoErrorConSliceMVCopy (pCtx);
+  } //TODO add other EC methods here in the future
+  pCtx->iErrorCode |= dsDataErrorConcealed;
+  pCtx->pDec->bIsComplete = false; // Set complete flag to false after do EC.
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/fmo.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/fmo.cpp
new file mode 100644
index 0000000000..efaa1f112b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/fmo.cpp
@@ -0,0 +1,326 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    fmo.c
+ *
+ * \brief   Flexible Macroblock Ordering implementation
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "fmo.h"
+#include "memory_align.h"
+#include "error_code.h"
+
+namespace WelsDec {
+
+/*!
+ * \brief   Generate MB allocated map for interleaved slice group (TYPE 0)
+ *
+ * \param   pFmo    fmo context
+ * \param   pPps    pps context
+ *
+ * \return  0 - successful; none 0 - failed
+ */
+static inline int32_t FmoGenerateMbAllocMapType0 (PFmo pFmo, PPps pPps) {
+  uint32_t uiNumSliceGroups = 0;
+  int32_t iMbNum = 0;
+  int32_t i = 0;
+
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps))
+  uiNumSliceGroups = pPps->uiNumSliceGroups;
+  iMbNum = pFmo->iCountMbNum;
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo->pMbAllocMap || iMbNum <= 0
+                         || uiNumSliceGroups > MAX_SLICEGROUP_IDS))
+
+  do {
+    uint8_t uiGroup = 0;
+    do {
+      const int32_t kiRunIdx = pPps->uiRunLength[uiGroup];
+      int32_t j = 0;
+      do {
+        pFmo->pMbAllocMap[i + j] = uiGroup;
+        ++ j;
+      } while (j < kiRunIdx && i + j < iMbNum);
+      i += kiRunIdx;
+      ++ uiGroup;
+    } while (uiGroup < uiNumSliceGroups && i < iMbNum);
+  } while (i < iMbNum);
+
+  return ERR_NONE; // well here
+}
+
+/*!
+ * \brief   Generate MB allocated map for dispersed slice group (TYPE 1)
+ *
+ * \param   pFmo        fmo context
+ * \param   pPps        pps context
+ * \param   iMbWidth    MB width
+ *
+ * \return  0 - successful; none 0 - failed
+ */
+static inline int32_t FmoGenerateMbAllocMapType1 (PFmo pFmo, PPps pPps, const int32_t kiMbWidth) {
+  uint32_t uiNumSliceGroups = 0;
+  int32_t iMbNum = 0;
+  int32_t i = 0;
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == pPps))
+  uiNumSliceGroups = pPps->uiNumSliceGroups;
+  iMbNum = pFmo->iCountMbNum;
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo->pMbAllocMap || iMbNum <= 0 || kiMbWidth == 0
+                         || uiNumSliceGroups > MAX_SLICEGROUP_IDS))
+
+  do {
+    pFmo->pMbAllocMap[i] = (uint8_t) (((i % kiMbWidth) + (((i / kiMbWidth) * uiNumSliceGroups) >> 1)) % uiNumSliceGroups);
+    ++ i;
+  } while (i < iMbNum);
+
+  return ERR_NONE; // well here
+}
+
+/*!
+ * \brief   Generate MB allocated map for various type of slice group cases (TYPE 0, .., 6)
+ *
+ * \param   pFmo        fmo context
+ * \param   pPps        pps context
+ * \param   kiMbWidth   MB width
+ * \param   kiMbHeight  MB height
+ *
+ * \return  0 - successful; none 0 - failed
+ */
+static inline int32_t FmoGenerateSliceGroup (PFmo pFmo, const PPps kpPps, const int32_t kiMbWidth,
+    const int32_t kiMbHeight, CMemoryAlign* pMa) {
+  int32_t iNumMb = 0;
+  int32_t iErr   = 0;
+  bool bResolutionChanged = false;
+
+  // the cases we would not like
+  WELS_VERIFY_RETURN_IF (ERR_INFO_INVALID_PARAM, (NULL == pFmo || NULL == kpPps))
+
+  iNumMb = kiMbWidth * kiMbHeight;
+
+  if (0 == iNumMb)
+    return ERR_INFO_INVALID_PARAM;
+
+  pMa->WelsFree (pFmo->pMbAllocMap, "_fmo->pMbAllocMap");
+  pFmo->pMbAllocMap = (uint8_t*)pMa->WelsMallocz (iNumMb * sizeof (uint8_t), "_fmo->pMbAllocMap");
+  WELS_VERIFY_RETURN_IF (ERR_INFO_OUT_OF_MEMORY, (NULL == pFmo->pMbAllocMap)) // out of memory
+
+  pFmo->iCountMbNum = iNumMb;
+
+  if (kpPps->uiNumSliceGroups < 2 && iNumMb > 0) { // only one slice group, exactly it is single slice based
+    memset (pFmo->pMbAllocMap, 0,  iNumMb * sizeof (int8_t));   // for safe
+
+    pFmo->iSliceGroupCount = 1;
+
+    return ERR_NONE;
+  }
+
+  if (bResolutionChanged || ((int32_t)kpPps->uiSliceGroupMapType != pFmo->iSliceGroupType)
+      || ((int32_t)kpPps->uiNumSliceGroups != pFmo->iSliceGroupCount)) {
+    switch (kpPps->uiSliceGroupMapType) {
+    case 0:
+      iErr = FmoGenerateMbAllocMapType0 (pFmo, kpPps);
+      break;
+    case 1:
+      iErr = FmoGenerateMbAllocMapType1 (pFmo, kpPps, kiMbWidth);
+      break;
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+      // Reserve for others slice group type
+      iErr = 1;
+      break;
+    default:
+      return ERR_INFO_UNSUPPORTED_FMOTYPE;
+    }
+  }
+
+  if (0 == iErr) {      // well now
+    pFmo->iSliceGroupCount = kpPps->uiNumSliceGroups;
+    pFmo->iSliceGroupType  = kpPps->uiSliceGroupMapType;
+  }
+
+  return iErr;
+}
+
+/*!
+ * \brief   Initialize Wels Flexible Macroblock Ordering (FMO)
+ *
+ * \param   pFmo        Wels fmo to be initialized
+ * \param   pPps        pps argument
+ * \param   kiMbWidth   mb width
+ * \param   kiMbHeight  mb height
+ *
+ * \return  0 - successful; none 0 - failed;
+ */
+int32_t InitFmo (PFmo pFmo, PPps pPps, const int32_t kiMbWidth, const int32_t kiMbHeight, CMemoryAlign* pMa) {
+  return FmoGenerateSliceGroup (pFmo, pPps, kiMbWidth, kiMbHeight, pMa);
+}
+
+
+/*!
+ * \brief   Uninitialize Wels Flexible Macroblock Ordering (FMO) list
+ *
+ * \param   pFmo        Wels base fmo ptr to be uninitialized
+ * \param   kiCnt       count number of PPS per list
+ * \param   kiAvail     count available number of PPS in list
+ *
+ * \return  NONE
+ */
+void UninitFmoList (PFmo pFmo, const int32_t kiCnt, const int32_t kiAvail, CMemoryAlign* pMa) {
+  PFmo pIter = pFmo;
+  int32_t i = 0;
+  int32_t iFreeNodes = 0;
+
+  if (NULL == pIter || kiAvail <= 0 || kiCnt < kiAvail)
+    return;
+
+  while (i < kiCnt) {
+    if (pIter != NULL && pIter->bActiveFlag) {
+      if (NULL != pIter->pMbAllocMap) {
+        pMa->WelsFree (pIter->pMbAllocMap, "pIter->pMbAllocMap");
+
+        pIter->pMbAllocMap = NULL;
+      }
+      pIter->iSliceGroupCount   = 0;
+      pIter->iSliceGroupType    = -1;
+      pIter->iCountMbNum        = 0;
+      pIter->bActiveFlag        = false;
+      ++ iFreeNodes;
+      if (iFreeNodes >= kiAvail)
+        break;
+    }
+    ++ pIter;
+    ++ i;
+  }
+}
+
+/*!
+ * \brief   detect parameter sets are changed or not
+ *
+ * \param   pFmo                fmo context
+ * \param   kiCountNumMb        (iMbWidth * iMbHeight) in Sps
+ * \param   iSliceGroupType     slice group type if fmo is exactly enabled
+ * \param   iSliceGroupCount    slice group count if fmo is exactly enabled
+ *
+ * \return  true - changed or not initialized yet; false - not change at all
+ */
+bool FmoParamSetsChanged (PFmo pFmo, const int32_t kiCountNumMb, const int32_t kiSliceGroupType,
+                          const int32_t kiSliceGroupCount) {
+  WELS_VERIFY_RETURN_IF (false, (NULL == pFmo))
+
+  return ((!pFmo->bActiveFlag)
+          || (kiCountNumMb != pFmo->iCountMbNum)
+          || (kiSliceGroupType != pFmo->iSliceGroupType)
+          || (kiSliceGroupCount != pFmo->iSliceGroupCount));
+}
+
+/*!
+ * \brief   update/insert FMO parameter unit
+ *
+ * \param   _fmo    FMO context
+ * \param   _sps    PSps
+ * \param   _pps    PPps
+ * \param   pActiveFmoNum   int32_t* [in/out]
+ *
+ * \return  true - update/insert successfully; false - failed;
+ */
+int32_t FmoParamUpdate (PFmo pFmo, PSps pSps, PPps pPps, int32_t* pActiveFmoNum, CMemoryAlign* pMa) {
+  const uint32_t kuiMbWidth = pSps->iMbWidth;
+  const uint32_t kuiMbHeight = pSps->iMbHeight;
+  int32_t iRet = ERR_NONE;
+  if (FmoParamSetsChanged (pFmo, kuiMbWidth * kuiMbHeight, pPps->uiSliceGroupMapType, pPps->uiNumSliceGroups)) {
+    iRet = InitFmo (pFmo, pPps, kuiMbWidth, kuiMbHeight, pMa);
+    WELS_VERIFY_RETURN_IF (iRet, iRet);
+
+    if (!pFmo->bActiveFlag && *pActiveFmoNum < MAX_PPS_COUNT) {
+      ++ (*pActiveFmoNum);
+      pFmo->bActiveFlag = true;
+    }
+  }
+  return iRet;
+}
+
+/*!
+ * \brief   Convert kMbXy to slice group idc correspondingly
+ *
+ * \param   pFmo        Wels fmo context
+ * \param   kMbXy       kMbXy to be converted
+ *
+ * \return  slice group idc - successful; -1 - failed;
+ */
+int32_t FmoMbToSliceGroup (PFmo pFmo, const MB_XY_T kiMbXy) {
+  const int32_t kiMbNum  = pFmo->iCountMbNum;
+  const uint8_t* kpMbMap = pFmo->pMbAllocMap;
+
+  if (kiMbXy < 0 || kiMbXy >= kiMbNum || kpMbMap == NULL)
+    return -1;
+
+  return kpMbMap[ kiMbXy ];
+}
+
+/*!
+ * \brief   Get successive mb to be processed with given current kMbXy
+ *
+ * \param   pFmo            Wels fmo context
+ * \param   kMbXy           current kMbXy
+ *
+ * \return  iNextMb - successful; -1 - failed;
+ */
+MB_XY_T FmoNextMb (PFmo pFmo, const MB_XY_T kiMbXy) {
+  const int32_t kiTotalMb               = pFmo->iCountMbNum;
+  const uint8_t* kpMbMap                = pFmo->pMbAllocMap;
+  MB_XY_T iNextMb                       = kiMbXy;
+  const uint8_t kuiSliceGroupIdc        = (uint8_t)FmoMbToSliceGroup (pFmo, kiMbXy);
+
+  if (kuiSliceGroupIdc == (uint8_t) (-1))
+    return -1;
+
+  do {
+    ++ iNextMb;
+    if (iNextMb >= kiTotalMb) {
+      iNextMb = -1;
+      break;
+    }
+    if (kpMbMap[iNextMb] == kuiSliceGroupIdc) {
+      break;
+    }
+  } while (1);
+
+  // -1: No further MB in this slice (could be end of picture)
+  return iNextMb;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/get_intra_predictor.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/get_intra_predictor.cpp
new file mode 100644
index 0000000000..0ec74535bf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/get_intra_predictor.cpp
@@ -0,0 +1,1157 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    get_intra_predictor.c
+ *
+ * \brief   implementation for get intra predictor about 16x16, 4x4, chroma.
+ *
+ * \date    4/2/2009 Created
+ *          9/14/2009 C level based optimization with high performance gained.
+ *              [const, using ST32/ST64 to replace memset, memcpy and memmove etc.]
+ *
+ *************************************************************************************
+ */
+#include <string.h>
+
+#include "macros.h"
+#include "ls_defines.h"
+#include "get_intra_predictor.h"
+
+namespace WelsDec {
+
+#define I4x4_COUNT 4
+#define I8x8_COUNT 8
+#define I16x16_COUNT 16
+
+void WelsI4x4LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {
+  const uint32_t kuiVal = LD32A4 (pPred - kiStride);
+
+  ST32A4 (pPred, kuiVal);
+  ST32A4 (pPred + kiStride, kuiVal);
+  ST32A4 (pPred + (kiStride << 1), kuiVal);
+  ST32A4 (pPred + (kiStride << 1) + kiStride, kuiVal);
+}
+
+void WelsI4x4LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2 = kiStride << 1;
+  const int32_t kiStride3 = kiStride2 + kiStride;
+  const uint32_t kuiL0 = 0x01010101U * pPred[-1          ];
+  const uint32_t kuiL1 = 0x01010101U * pPred[-1 + kiStride ];
+  const uint32_t kuiL2 = 0x01010101U * pPred[-1 + kiStride2];
+  const uint32_t kuiL3 = 0x01010101U * pPred[-1 + kiStride3];
+
+  ST32A4 (pPred, kuiL0);
+  ST32A4 (pPred + kiStride, kuiL1);
+  ST32A4 (pPred + kiStride2, kuiL2);
+  ST32A4 (pPred + kiStride3, kuiL3);
+}
+
+void WelsI4x4LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2  = kiStride << 1;
+  const int32_t kiStride3  = kiStride2 + kiStride;
+  const uint8_t kuiMean    = (pPred[-1] + pPred[-1 + kiStride] + pPred[-1 + kiStride2] + pPred[-1 + kiStride3] +
+                              pPred[-kiStride] + pPred[-kiStride + 1] + pPred[-kiStride + 2] + pPred[-kiStride + 3] + 4) >> 3;
+  const uint32_t kuiMean32 = 0x01010101U * kuiMean;
+
+  ST32A4 (pPred, kuiMean32);
+  ST32A4 (pPred + kiStride, kuiMean32);
+  ST32A4 (pPred + kiStride2, kuiMean32);
+  ST32A4 (pPred + kiStride3, kuiMean32);
+}
+
+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2  = kiStride << 1;
+  const int32_t kiStride3  = kiStride2 + kiStride;
+  const uint8_t kuiMean    = (pPred[-1] + pPred[-1 + kiStride] + pPred[-1 + kiStride2] + pPred[-1 + kiStride3] + 2) >> 2;
+  const uint32_t kuiMean32 = 0x01010101U * kuiMean;
+
+  ST32A4 (pPred, kuiMean32);
+  ST32A4 (pPred + kiStride, kuiMean32);
+  ST32A4 (pPred + kiStride2, kuiMean32);
+  ST32A4 (pPred + kiStride3, kuiMean32);
+}
+
+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2  = kiStride << 1;
+  const int32_t kiStride3  = kiStride2 + kiStride;
+  const uint8_t kuiMean    = (pPred[-kiStride] + pPred[-kiStride + 1] + pPred[-kiStride + 2] + pPred[-kiStride + 3] + 2)
+                             >> 2;
+  const uint32_t kuiMean32 = 0x01010101U * kuiMean;
+
+  ST32A4 (pPred, kuiMean32);
+  ST32A4 (pPred + kiStride, kuiMean32);
+  ST32A4 (pPred + kiStride2, kuiMean32);
+  ST32A4 (pPred + kiStride3, kuiMean32);
+}
+
+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {
+  const uint32_t kuiDC32 = 0x80808080U;
+
+  ST32A4 (pPred, kuiDC32);
+  ST32A4 (pPred + kiStride, kuiDC32);
+  ST32A4 (pPred + (kiStride << 1), kuiDC32);
+  ST32A4 (pPred + (kiStride << 1) + kiStride, kuiDC32);
+}
+
+/*down pLeft*/
+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2 = kiStride << 1;
+  const int32_t kiStride3 = kiStride + kiStride2;
+  /*get pTop*/
+  uint8_t* ptop         = &pPred[-kiStride];
+  const uint8_t kuiT0   = *ptop;
+  const uint8_t kuiT1   = * (ptop + 1);
+  const uint8_t kuiT2   = * (ptop + 2);
+  const uint8_t kuiT3   = * (ptop + 3);
+  const uint8_t kuiT4   = * (ptop + 4);
+  const uint8_t kuiT5   = * (ptop + 5);
+  const uint8_t kuiT6   = * (ptop + 6);
+  const uint8_t kuiT7   = * (ptop + 7);
+  const uint8_t kuiDDL0 = (2 + kuiT0 + kuiT2 + (kuiT1 << 1)) >> 2;      // kDDL0
+  const uint8_t kuiDDL1 = (2 + kuiT1 + kuiT3 + (kuiT2 << 1)) >> 2;      // kDDL1
+  const uint8_t kuiDDL2 = (2 + kuiT2 + kuiT4 + (kuiT3 << 1)) >> 2;      // kDDL2
+  const uint8_t kuiDDL3 = (2 + kuiT3 + kuiT5 + (kuiT4 << 1)) >> 2;      // kDDL3
+  const uint8_t kuiDDL4 = (2 + kuiT4 + kuiT6 + (kuiT5 << 1)) >> 2;      // kDDL4
+  const uint8_t kuiDDL5 = (2 + kuiT5 + kuiT7 + (kuiT6 << 1)) >> 2;      // kDDL5
+  const uint8_t kuiDDL6 = (2 + kuiT6 + kuiT7 + (kuiT7 << 1)) >> 2;      // kDDL6
+  const uint8_t kuiList[8] = { kuiDDL0, kuiDDL1, kuiDDL2, kuiDDL3, kuiDDL4, kuiDDL5, kuiDDL6, 0 };
+
+  ST32A4 (pPred, LD32 (kuiList));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 2));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 3));
+}
+
+/*down pLeft*/
+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2 = kiStride << 1;
+  const int32_t kiStride3 = kiStride + kiStride2;
+  /*get pTop*/
+  uint8_t* ptop         = &pPred[-kiStride];
+  const uint8_t kuiT0   = *ptop;
+  const uint8_t kuiT1   = * (ptop + 1);
+  const uint8_t kuiT2   = * (ptop + 2);
+  const uint8_t kuiT3   = * (ptop + 3);
+  const uint16_t kuiT01 = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12 = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiT23 = 1 + kuiT2 + kuiT3;
+  const uint16_t kuiT33 = 1 + (kuiT3 << 1);
+  const uint8_t kuiDLT0 = (kuiT01 + kuiT12) >> 2;       // kDLT0
+  const uint8_t kuiDLT1 = (kuiT12 + kuiT23) >> 2;       // kDLT1
+  const uint8_t kuiDLT2 = (kuiT23 + kuiT33) >> 2;       // kDLT2
+  const uint8_t kuiDLT3 = kuiT33 >> 1;                  // kDLT3
+  const uint8_t kuiList[8] = { kuiDLT0, kuiDLT1, kuiDLT2, kuiDLT3, kuiDLT3, kuiDLT3, kuiDLT3, kuiDLT3 };
+
+  ST32A4 (pPred,             LD32 (kuiList));
+  ST32A4 (pPred + kiStride,  LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 2));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 3));
+}
+
+
+/*down right*/
+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2 = kiStride << 1;
+  const int32_t kiStride3 = kiStride + kiStride2;
+  uint8_t* ptopleft       = &pPred[- (kiStride + 1)];
+  uint8_t* pleft          = &pPred[-1];
+  const uint8_t kuiLT     = *ptopleft;
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0   = *pleft;
+  const uint8_t kuiL1   = * (pleft + kiStride);
+  const uint8_t kuiL2   = * (pleft + kiStride2);
+  const uint8_t kuiL3   = * (pleft + kiStride3);
+  const uint8_t kuiT0   = * (ptopleft + 1);
+  const uint8_t kuiT1   = * (ptopleft + 2);
+  const uint8_t kuiT2   = * (ptopleft + 3);
+  const uint8_t kuiT3   = * (ptopleft + 4);
+  const uint16_t kuiTL0 = 1 + kuiLT + kuiL0;
+  const uint16_t kuiLT0 = 1 + kuiLT + kuiT0;
+  const uint16_t kuiT01 = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12 = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiT23 = 1 + kuiT2 + kuiT3;
+  const uint16_t kuiL01 = 1 + kuiL0 + kuiL1;
+  const uint16_t kuiL12 = 1 + kuiL1 + kuiL2;
+  const uint16_t kuiL23 = 1 + kuiL2 + kuiL3;
+  const uint8_t kuiDDR0 = (kuiTL0 + kuiLT0) >> 2;       // kuiDDR0
+  const uint8_t kuiDDR1 = (kuiLT0 + kuiT01) >> 2;       // kuiDDR1
+  const uint8_t kuiDDR2 = (kuiT01 + kuiT12) >> 2;       // kuiDDR2
+  const uint8_t kuiDDR3 = (kuiT12 + kuiT23) >> 2;       // kuiDDR3
+  const uint8_t kuiDDR4 = (kuiTL0 + kuiL01) >> 2;       // kuiDDR4
+  const uint8_t kuiDDR5 = (kuiL01 + kuiL12) >> 2;       // kuiDDR5
+  const uint8_t kuiDDR6 = (kuiL12 + kuiL23) >> 2;       // kuiDDR6
+  const uint8_t kuiList[8] = { kuiDDR6, kuiDDR5, kuiDDR4, kuiDDR0, kuiDDR1, kuiDDR2, kuiDDR3, 0 };
+
+  ST32A4 (pPred, LD32 (kuiList + 3));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 2));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList));
+}
+
+
+/*vertical pLeft*/
+void WelsI4x4LumaPredVL_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2       = kiStride << 1;
+  const int32_t kiStride3       = kiStride + kiStride2;
+  uint8_t* ptopleft             = &pPred[- (kiStride + 1)];
+  /*get pTop*/
+  const uint8_t kuiT0           = * (ptopleft + 1);
+  const uint8_t kuiT1           = * (ptopleft + 2);
+  const uint8_t kuiT2           = * (ptopleft + 3);
+  const uint8_t kuiT3           = * (ptopleft + 4);
+  const uint8_t kuiT4           = * (ptopleft + 5);
+  const uint8_t kuiT5           = * (ptopleft + 6);
+  const uint8_t kuiT6           = * (ptopleft + 7);
+  const uint16_t kuiT01         = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12         = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiT23         = 1 + kuiT2 + kuiT3;
+  const uint16_t kuiT34         = 1 + kuiT3 + kuiT4;
+  const uint16_t kuiT45         = 1 + kuiT4 + kuiT5;
+  const uint16_t kuiT56         = 1 + kuiT5 + kuiT6;
+  const uint8_t kuiVL0          = kuiT01 >> 1;                  // kuiVL0
+  const uint8_t kuiVL1          = kuiT12 >> 1;                  // kuiVL1
+  const uint8_t kuiVL2          = kuiT23 >> 1;                  // kuiVL2
+  const uint8_t kuiVL3          = kuiT34 >> 1;                  // kuiVL3
+  const uint8_t kuiVL4          = kuiT45 >> 1;                  // kuiVL4
+  const uint8_t kuiVL5          = (kuiT01 + kuiT12) >> 2;       // kuiVL5
+  const uint8_t kuiVL6          = (kuiT12 + kuiT23) >> 2;       // kuiVL6
+  const uint8_t kuiVL7          = (kuiT23 + kuiT34) >> 2;       // kuiVL7
+  const uint8_t kuiVL8          = (kuiT34 + kuiT45) >> 2;       // kuiVL8
+  const uint8_t kuiVL9          = (kuiT45 + kuiT56) >> 2;       // kuiVL9
+  const uint8_t kuiList[10]     = { kuiVL0, kuiVL1, kuiVL2, kuiVL3, kuiVL4, kuiVL5, kuiVL6, kuiVL7, kuiVL8, kuiVL9 };
+
+  ST32A4 (pPred,             LD32 (kuiList));
+  ST32A4 (pPred + kiStride,  LD32 (kuiList + 5));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 6));
+}
+
+/*vertical pLeft*/
+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2       = kiStride << 1;
+  const int32_t kiStride3       = kiStride + kiStride2;
+  uint8_t* ptopleft             = &pPred[- (kiStride + 1)];
+  /*get pTop*/
+  const uint8_t kuiT0           = * (ptopleft + 1);
+  const uint8_t kuiT1           = * (ptopleft + 2);
+  const uint8_t kuiT2           = * (ptopleft + 3);
+  const uint8_t kuiT3           = * (ptopleft + 4);
+  const uint16_t kuiT01         = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12         = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiT23         = 1 + kuiT2 + kuiT3;
+  const uint16_t kuiT33         = 1 + (kuiT3 << 1);
+  const uint8_t kuiVL0          = kuiT01 >> 1;
+  const uint8_t kuiVL1          = kuiT12 >> 1;
+  const uint8_t kuiVL2          = kuiT23 >> 1;
+  const uint8_t kuiVL3          = kuiT33 >> 1;
+  const uint8_t kuiVL4          = (kuiT01 + kuiT12) >> 2;
+  const uint8_t kuiVL5          = (kuiT12 + kuiT23) >> 2;
+  const uint8_t kuiVL6          = (kuiT23 + kuiT33) >> 2;
+  const uint8_t kuiVL7          = kuiVL3;
+  const uint8_t kuiList[10]     = { kuiVL0, kuiVL1, kuiVL2, kuiVL3, kuiVL3, kuiVL4, kuiVL5, kuiVL6, kuiVL7, kuiVL7 };
+
+  ST32A4 (pPred, LD32 (kuiList));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 5));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 6));
+}
+
+
+/*vertical right*/
+void WelsI4x4LumaPredVR_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2       = kiStride << 1;
+  const int32_t kiStride3       = kiStride + kiStride2;
+  const uint8_t kuiLT           = pPred[-kiStride - 1];
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0           = pPred[          - 1];
+  const uint8_t kuiL1           = pPred[kiStride  - 1];
+  const uint8_t kuiL2           = pPred[kiStride2 - 1];
+  const uint8_t kuiT0           = pPred[ -kiStride];
+  const uint8_t kuiT1           = pPred[1 - kiStride];
+  const uint8_t kuiT2           = pPred[2 - kiStride];
+  const uint8_t kuiT3           = pPred[3 - kiStride];
+  const uint8_t kuiVR0          = (1 + kuiLT + kuiT0) >> 1;     // kuiVR0
+  const uint8_t kuiVR1          = (1 + kuiT0 + kuiT1) >> 1;     // kuiVR1
+  const uint8_t kuiVR2          = (1 + kuiT1 + kuiT2) >> 1;     // kuiVR2
+  const uint8_t kuiVR3          = (1 + kuiT2 + kuiT3) >> 1;     // kuiVR3
+  const uint8_t kuiVR4          = (2 + kuiL0 + (kuiLT << 1) + kuiT0) >> 2;      // kuiVR4
+  const uint8_t kuiVR5          = (2 + kuiLT + (kuiT0 << 1) + kuiT1) >> 2;      // kuiVR5
+  const uint8_t kuiVR6          = (2 + kuiT0 + (kuiT1 << 1) + kuiT2) >> 2;      // kuiVR6
+  const uint8_t kuiVR7          = (2 + kuiT1 + (kuiT2 << 1) + kuiT3) >> 2;      // kuiVR7
+  const uint8_t kuiVR8          = (2 + kuiLT + (kuiL0 << 1) + kuiL1) >> 2;      // kuiVR8
+  const uint8_t kuiVR9          = (2 + kuiL0 + (kuiL1 << 1) + kuiL2) >> 2;      // kuiVR9
+  const uint8_t kuiList[10]     = { kuiVR8, kuiVR0, kuiVR1, kuiVR2, kuiVR3, kuiVR9, kuiVR4, kuiVR5, kuiVR6, kuiVR7 };
+
+  ST32A4 (pPred, LD32 (kuiList + 1));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 6));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 5));
+}
+
+/*horizontal up*/
+void WelsI4x4LumaPredHU_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2       = kiStride << 1;
+  const int32_t kiStride3       = kiStride + kiStride2;
+  /*get pLeft*/
+  const uint8_t kuiL0           = pPred[          - 1];
+  const uint8_t kuiL1           = pPred[kiStride  - 1];
+  const uint8_t kuiL2           = pPred[kiStride2 - 1];
+  const uint8_t kuiL3           = pPred[kiStride3 - 1];
+  const uint16_t kuiL01         = 1 + kuiL0 + kuiL1;
+  const uint16_t kuiL12         = 1 + kuiL1 + kuiL2;
+  const uint16_t kuiL23         = 1 + kuiL2 + kuiL3;
+  const uint8_t kuiHU0          = kuiL01 >> 1;
+  const uint8_t kuiHU1          = (kuiL01 + kuiL12) >> 2;
+  const uint8_t kuiHU2          = kuiL12 >> 1;
+  const uint8_t kuiHU3          = (kuiL12 + kuiL23) >> 2;
+  const uint8_t kuiHU4          = kuiL23 >> 1;
+  const uint8_t kuiHU5          = (1 + kuiL23 + (kuiL3 << 1)) >> 2;
+  const uint8_t kuiList[10]     = { kuiHU0, kuiHU1, kuiHU2, kuiHU3, kuiHU4, kuiHU5, kuiL3, kuiL3, kuiL3, kuiL3 };
+
+  ST32A4 (pPred, LD32 (kuiList));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 2));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 4));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList + 6));
+}
+
+/*horizontal down*/
+void WelsI4x4LumaPredHD_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiStride2       = kiStride << 1;
+  const int32_t kiStride3       = kiStride + kiStride2;
+  const uint8_t kuiLT           = pPred[- (kiStride + 1)];
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0           = pPred[-1            ];
+  const uint8_t kuiL1           = pPred[-1 + kiStride ];
+  const uint8_t kuiL2           = pPred[-1 + kiStride2];
+  const uint8_t kuiL3           = pPred[-1 + kiStride3];
+  const uint8_t kuiT0           = pPred[-kiStride     ];
+  const uint8_t kuiT1           = pPred[-kiStride + 1 ];
+  const uint8_t kuiT2           = pPred[-kiStride + 2 ];
+  const uint16_t kuiTL0         = 1 + kuiLT + kuiL0;
+  const uint16_t kuiLT0         = 1 + kuiLT + kuiT0;
+  const uint16_t kuiT01         = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12         = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiL01         = 1 + kuiL0 + kuiL1;
+  const uint16_t kuiL12         = 1 + kuiL1 + kuiL2;
+  const uint16_t kuiL23         = 1 + kuiL2 + kuiL3;
+  const uint8_t kuiHD0          = kuiTL0 >> 1;
+  const uint8_t kuiHD1          = (kuiTL0 + kuiLT0) >> 2;
+  const uint8_t kuiHD2          = (kuiLT0 + kuiT01) >> 2;
+  const uint8_t kuiHD3          = (kuiT01 + kuiT12) >> 2;
+  const uint8_t kuiHD4          = kuiL01 >> 1;
+  const uint8_t kuiHD5          = (kuiTL0 + kuiL01) >> 2;
+  const uint8_t kuiHD6          = kuiL12 >> 1;
+  const uint8_t kuiHD7          = (kuiL01 + kuiL12) >> 2;
+  const uint8_t kuiHD8          = kuiL23 >> 1;
+  const uint8_t kuiHD9          = (kuiL12 + kuiL23) >> 2;
+  const uint8_t kuiList[10]     = { kuiHD8, kuiHD9, kuiHD6, kuiHD7, kuiHD4, kuiHD5, kuiHD0, kuiHD1, kuiHD2, kuiHD3 };
+
+  ST32A4 (pPred, LD32 (kuiList + 6));
+  ST32A4 (pPred + kiStride, LD32 (kuiList + 4));
+  ST32A4 (pPred + kiStride2, LD32 (kuiList + 2));
+  ST32A4 (pPred + kiStride3, LD32 (kuiList));
+}
+
+void WelsI8x8LumaPredV_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  uint64_t uiTop = 0;
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[8];
+  int32_t i;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  // 8-89
+  for (i = 7; i >= 0; i--) {
+    uiTop = ((uiTop << 8) | uiPixelFilterT[i]);
+  }
+
+  for (i = 0; i < 8; i++) {
+    ST64A8 (pPred + kiStride * i, uiTop);
+  }
+}
+
+void WelsI8x8LumaPredH_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  uint64_t uiLeft;
+  int32_t iStride[8];
+  uint8_t uiPixelFilterL[8];
+  int32_t i;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterL[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2) : ((
+                        pPred[-1] * 3 + pPred[-1 + iStride[1]] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+
+  // 8-90
+  for (i = 0; i < 8; i++) {
+    uiLeft = 0x0101010101010101ULL * uiPixelFilterL[i];
+    ST64A8 (pPred + iStride[i], uiLeft);
+  }
+}
+
+void WelsI8x8LumaPredDc_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  int32_t iStride[8];
+  uint8_t uiPixelFilterL[8];
+  uint8_t uiPixelFilterT[8];
+  uint16_t uiTotal = 0;
+  int32_t i;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterL[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2) : ((
+                        pPred[-1] * 3 + pPred[-1 + iStride[1]] + 2) >> 2);
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  // 8-91
+  for (i = 0; i < 8; i++) {
+    uiTotal += uiPixelFilterL[i];
+    uiTotal += uiPixelFilterT[i];
+  }
+
+  const uint8_t kuiMean = ((uiTotal + 8) >> 4);
+  const uint64_t kuiMean64 = 0x0101010101010101ULL * kuiMean;
+
+  for (i = 0; i < 8; i++) {
+    ST64A8 (pPred + iStride[i], kuiMean64);
+  }
+}
+
+void WelsI8x8LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  int32_t iStride[8];
+  uint8_t uiPixelFilterL[8];
+  uint16_t uiTotal = 0;
+  int32_t i;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterL[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2) : ((
+                        pPred[-1] * 3 + pPred[-1 + iStride[1]] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+
+  // 8-92
+  for (i = 0; i < 8; i++) {
+    uiTotal += uiPixelFilterL[i];
+  }
+
+  const uint8_t kuiMean = ((uiTotal + 4) >> 3);
+  const uint64_t kuiMean64 = 0x0101010101010101ULL * kuiMean;
+
+  for (i = 0; i < 8; i++) {
+    ST64A8 (pPred + iStride[i], kuiMean64);
+  }
+}
+
+void WelsI8x8LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[8];
+  uint16_t uiTotal = 0;
+  int32_t i;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  // 8-93
+  for (i = 0; i < 8; i++) {
+    uiTotal += uiPixelFilterT[i];
+  }
+
+  const uint8_t kuiMean = ((uiTotal + 4) >> 3);
+  const uint64_t kuiMean64 = 0x0101010101010101ULL * kuiMean;
+
+  for (i = 0; i < 8; i++) {
+    ST64A8 (pPred + iStride[i], kuiMean64);
+  }
+}
+
+void WelsI8x8LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // for normal 8 bit depth, 8-94
+  const uint64_t kuiDC64 = 0x8080808080808080ULL;
+
+  int32_t iStride[8];
+  int32_t i;
+  ST64A8 (pPred, kuiDC64);
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+    ST64A8 (pPred + iStride[i], kuiDC64);
+  }
+}
+
+/*down pLeft*/
+void WelsI8x8LumaPredDDL_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // Top and Top-right available
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[16];
+  int32_t i, j;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 15; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterT[15] = ((pPred[14 - kiStride] + pPred[15 - kiStride] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    for (j = 0; j < 8; j++) { // x
+      if (i == 7 && j == 7) { // 8-95
+        pPred[j + iStride[i]] = (uiPixelFilterT[14] + 3 * uiPixelFilterT[15] + 2) >> 2;
+      } else { // 8-96
+        pPred[j + iStride[i]] = (uiPixelFilterT[i + j] + (uiPixelFilterT[i + j + 1] << 1) + uiPixelFilterT[i + j + 2] + 2) >> 2;
+      }
+    }
+  }
+}
+
+/*down pLeft*/
+void WelsI8x8LumaPredDDLTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // Top available and Top-right unavailable
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[16];
+  int32_t i, j;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  // p[x, -1] x=8...15 are replaced with p[7, -1]
+  uiPixelFilterT[7] = ((pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+  for (i = 8; i < 16; i++) {
+    uiPixelFilterT[i] = pPred[7 - kiStride];
+  }
+
+  for (i = 0; i < 8; i++) { // y
+    for (j = 0; j < 8; j++) { // x
+      if (i == 7 && j == 7) { // 8-95
+        pPred[j + iStride[i]] = (uiPixelFilterT[14] + 3 * uiPixelFilterT[15] + 2) >> 2;
+      } else { // 8-96
+        pPred[j + iStride[i]] = (uiPixelFilterT[i + j] + (uiPixelFilterT[i + j + 1] << 1) + uiPixelFilterT[i + j + 2] + 2) >> 2;
+      }
+    }
+  }
+}
+
+/*down right*/
+void WelsI8x8LumaPredDDR_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // The TopLeft, Top, Left are all available under this mode
+  int32_t iStride[8];
+  uint8_t uiPixelFilterTL;
+  uint8_t uiPixelFilterL[8];
+  uint8_t uiPixelFilterT[8];
+  int32_t i, j;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterTL = (pPred[-1] + (pPred[-1 - kiStride] << 1) + pPred[-kiStride] + 2) >> 2;
+
+  uiPixelFilterL[0] = ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2);
+  uiPixelFilterT[0] = ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    // 8-98, x < y-1
+    for (j = 0; j < (i - 1); j++) {
+      pPred[j + iStride[i]] = (uiPixelFilterL[i - j - 2] + (uiPixelFilterL[i - j - 1] << 1) + uiPixelFilterL[i - j] + 2) >> 2;
+    }
+    // 8-98, special case, x == y-1
+    if (i >= 1) {
+      j = i - 1;
+      pPred[j + iStride[i]] = (uiPixelFilterTL + (uiPixelFilterL[0] << 1) + uiPixelFilterL[1] + 2) >> 2;
+    }
+    // 8-99, x==y
+    j = i;
+    pPred[j + iStride[i]] = (uiPixelFilterT[0] + (uiPixelFilterTL << 1) + uiPixelFilterL[0] + 2) >> 2;
+    // 8-97, special case, x == y+1
+    if (i < 7) {
+      j = i + 1;
+      pPred[j + iStride[i]] = (uiPixelFilterTL + (uiPixelFilterT[0] << 1) + uiPixelFilterT[1] + 2) >> 2;
+    }
+    for (j = i + 2; j < 8; j++) { // 8-97, x > y+1
+      pPred[j + iStride[i]] = (uiPixelFilterT[j - i - 2] + (uiPixelFilterT[j - i - 1] << 1) + uiPixelFilterT[j - i] + 2) >> 2;
+    }
+  }
+}
+
+/*vertical pLeft*/
+void WelsI8x8LumaPredVL_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // Top and Top-right available
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[16];
+  int32_t i, j;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 15; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterT[15] = ((pPred[14 - kiStride] + pPred[15 - kiStride] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    if ((i & 0x01) == 0) { // 8-108
+      for (j = 0; j < 8; j++) { // x
+        pPred[j + iStride[i]] = (uiPixelFilterT[j + (i >> 1)] + uiPixelFilterT[j + (i >> 1) + 1] + 1) >> 1;
+      }
+    } else {  // 8-109
+      for (j = 0; j < 8; j++) { // x
+        pPred[j + iStride[i]] = (uiPixelFilterT[j + (i >> 1)] + (uiPixelFilterT[j + (i >> 1) + 1] << 1) + uiPixelFilterT[j +
+                                 (i >> 1) + 2] + 2) >> 2;
+      }
+    }
+  }
+}
+
+/*vertical pLeft*/
+void WelsI8x8LumaPredVLTop_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // Top available and Top-right unavailable
+  int32_t iStride[8];
+  uint8_t uiPixelFilterT[16];
+  int32_t i, j;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterT[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2) : ((
+                        pPred[-kiStride] * 3 + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  // p[x, -1] x=8...15 are replaced with p[7, -1]
+  uiPixelFilterT[7] = ((pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+  for (i = 8; i < 16; i++) {
+    uiPixelFilterT[i] = pPred[7 - kiStride];
+  }
+
+  for (i = 0; i < 8; i++) { // y
+    if ((i & 0x01) == 0) { // 8-108
+      for (j = 0; j < 8; j++) { // x
+        pPred[j + iStride[i]] = (uiPixelFilterT[j + (i >> 1)] + uiPixelFilterT[j + (i >> 1) + 1] + 1) >> 1;
+      }
+    } else {  // 8-109
+      for (j = 0; j < 8; j++) { // x
+        pPred[j + iStride[i]] = (uiPixelFilterT[j + (i >> 1)] + (uiPixelFilterT[j + (i >> 1) + 1] << 1) + uiPixelFilterT[j +
+                                 (i >> 1) + 2] + 2) >> 2;
+      }
+    }
+  }
+}
+
+/*vertical right*/
+void WelsI8x8LumaPredVR_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // The TopLeft, Top, Left are always available under this mode
+  int32_t iStride[8];
+  uint8_t uiPixelFilterTL;
+  uint8_t uiPixelFilterL[8];
+  uint8_t uiPixelFilterT[8];
+  int32_t i, j;
+  int32_t izVR, izVRDiv;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterTL = (pPred[-1] + (pPred[-1 - kiStride] << 1) + pPred[-kiStride] + 2) >> 2;
+
+  uiPixelFilterL[0] = ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2);
+  uiPixelFilterT[0] = ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    for (j = 0; j < 8; j++) { // x
+      izVR = (j << 1) - i; // 2 * x - y
+      izVRDiv = j - (i >> 1);
+      if (izVR >= 0) {
+        if ((izVR & 0x01) == 0) {  // 8-100
+          if (izVRDiv > 0) {
+            pPred[j + iStride[i]] = (uiPixelFilterT[izVRDiv - 1] + uiPixelFilterT[izVRDiv] + 1) >> 1;
+          } else {
+            pPred[j + iStride[i]] = (uiPixelFilterTL + uiPixelFilterT[0] + 1) >> 1;
+          }
+        } else { // 8-101
+          if (izVRDiv > 1) {
+            pPred[j + iStride[i]] = (uiPixelFilterT[izVRDiv - 2] + (uiPixelFilterT[izVRDiv - 1] << 1) + uiPixelFilterT[izVRDiv] + 2)
+                                    >> 2;
+          } else {
+            pPred[j + iStride[i]] = (uiPixelFilterTL + (uiPixelFilterT[0] << 1) + uiPixelFilterT[1] + 2) >> 2;
+          }
+        }
+      } else if (izVR == -1) { // 8-102
+        pPred[j + iStride[i]] = (uiPixelFilterL[0] + (uiPixelFilterTL << 1) + uiPixelFilterT[0] + 2) >> 2;
+      } else if (izVR < -2) { // 8-103
+        pPred[j + iStride[i]] = (uiPixelFilterL[-izVR - 1] + (uiPixelFilterL[-izVR - 2] << 1) + uiPixelFilterL[-izVR - 3] + 2)
+                                >> 2;
+      } else { // izVR==-2, 8-103, special case
+        pPred[j + iStride[i]] = (uiPixelFilterL[1] + (uiPixelFilterL[0] << 1) + uiPixelFilterTL + 2) >> 2;
+      }
+    }
+  }
+}
+
+/*horizontal up*/
+void WelsI8x8LumaPredHU_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  int32_t iStride[8];
+  uint8_t uiPixelFilterL[8];
+  int32_t i, j;
+  int32_t izHU;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterL[0] = bTLAvail ? ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2) : ((
+                        pPred[-1] * 3 + pPred[-1 + iStride[1]] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    for (j = 0; j < 8; j++) { // x
+      izHU = j + (i << 1); // x + 2 * y
+      if (izHU < 13) {
+        if ((izHU & 0x01) == 0) {  // 8-110
+          pPred[j + iStride[i]] = (uiPixelFilterL[izHU >> 1] + uiPixelFilterL[1 + (izHU >> 1)] + 1) >> 1;
+        } else { // 8-111
+          pPred[j + iStride[i]] = (uiPixelFilterL[izHU >> 1] + (uiPixelFilterL[1 + (izHU >> 1)] << 1) + uiPixelFilterL[2 +
+                                   (izHU >> 1)] + 2) >> 2;
+        }
+      } else if (izHU == 13) { // 8-112
+        pPred[j + iStride[i]] = (uiPixelFilterL[6] + 3 * uiPixelFilterL[7] + 2) >> 2;
+      } else { // 8-113
+        pPred[j + iStride[i]] = uiPixelFilterL[7];
+      }
+    }
+  }
+}
+
+/*horizontal down*/
+void WelsI8x8LumaPredHD_c (uint8_t* pPred, const int32_t kiStride, bool bTLAvail, bool bTRAvail) {
+  // The TopLeft, Top, Left are all available under this mode
+  int32_t iStride[8];
+  uint8_t uiPixelFilterTL;
+  uint8_t uiPixelFilterL[8];
+  uint8_t uiPixelFilterT[8];
+  int32_t i, j;
+  int32_t izHD, izHDDiv;
+
+  for (iStride[0] = 0, i = 1; i < 8; i++) {
+    iStride[i] = iStride[i - 1] + kiStride;
+  }
+
+  uiPixelFilterTL = (pPred[-1] + (pPred[-1 - kiStride] << 1) + pPred[-kiStride] + 2) >> 2;
+
+  uiPixelFilterL[0] = ((pPred[-1 - kiStride] + (pPred[-1] << 1) + pPred[-1 + iStride[1]] + 2) >> 2);
+  uiPixelFilterT[0] = ((pPred[-1 - kiStride] + (pPred[-kiStride] << 1) + pPred[1 - kiStride] + 2) >> 2);
+  for (i = 1; i < 7; i++) {
+    uiPixelFilterL[i] = ((pPred[-1 + iStride[i - 1]] + (pPred[-1 + iStride[i]] << 1) + pPred[-1 + iStride[i + 1]] + 2) >>
+                         2);
+    uiPixelFilterT[i] = ((pPred[i - 1 - kiStride] + (pPred[i - kiStride] << 1) + pPred[i + 1 - kiStride] + 2) >> 2);
+  }
+  uiPixelFilterL[7] = ((pPred[-1 + iStride[6]] + pPred[-1 + iStride[7]] * 3 + 2) >> 2);
+  uiPixelFilterT[7] = bTRAvail ? ((pPred[6 - kiStride] + (pPred[7 - kiStride] << 1) + pPred[8 - kiStride] + 2) >> 2) : ((
+                        pPred[6 - kiStride] + pPred[7 - kiStride] * 3 + 2) >> 2);
+
+  for (i = 0; i < 8; i++) { // y
+    for (j = 0; j < 8; j++) { // x
+      izHD = (i << 1) - j; // 2*y - x
+      izHDDiv = i - (j >> 1);
+      if (izHD >= 0) {
+        if ((izHD & 0x01) == 0) {  // 8-104
+          if (izHDDiv == 0) {
+            pPred[j + iStride[i]] = (uiPixelFilterTL + uiPixelFilterL[0] + 1) >> 1;
+          } else {
+            pPred[j + iStride[i]] = (uiPixelFilterL[izHDDiv - 1] + uiPixelFilterL[izHDDiv] + 1) >> 1;
+          }
+        } else {  // 8-105
+          if (izHDDiv == 1) {
+            pPred[j + iStride[i]] = (uiPixelFilterTL + (uiPixelFilterL[0] << 1) + uiPixelFilterL[1] + 2) >> 2;
+          } else {
+            pPred[j + iStride[i]] = (uiPixelFilterL[izHDDiv - 2] + (uiPixelFilterL[izHDDiv - 1] << 1) + uiPixelFilterL[izHDDiv] + 2)
+                                    >> 2;
+          }
+        }
+      } else if (izHD == -1) { // 8-106
+        pPred[j + iStride[i]] = (uiPixelFilterL[0] + (uiPixelFilterTL << 1) + uiPixelFilterT[0] + 2) >> 2;
+      } else if (izHD < -2) { // 8-107
+        pPred[j + iStride[i]] = (uiPixelFilterT[-izHD - 1] + (uiPixelFilterT[-izHD - 2] << 1) + uiPixelFilterT[-izHD - 3] + 2)
+                                >> 2;
+      } else { // 8-107 special case, izHD==-2
+        pPred[j + iStride[i]] = (uiPixelFilterT[1] + (uiPixelFilterT[0] << 1) + uiPixelFilterTL + 2) >> 2;
+      }
+    }
+  }
+}
+
+
+void WelsIChromaPredV_c (uint8_t* pPred, const int32_t kiStride) {
+  const uint64_t kuiVal64 = LD64A8 (&pPred[-kiStride]);
+  const int32_t kiStride2 = kiStride  << 1;
+  const int32_t kiStride4 = kiStride2 << 1;
+
+  ST64A8 (pPred, kuiVal64);
+  ST64A8 (pPred + kiStride, kuiVal64);
+  ST64A8 (pPred + kiStride2, kuiVal64);
+  ST64A8 (pPred + kiStride2 + kiStride, kuiVal64);
+  ST64A8 (pPred + kiStride4, kuiVal64);
+  ST64A8 (pPred + kiStride4 + kiStride, kuiVal64);
+  ST64A8 (pPred + kiStride4 + kiStride2, kuiVal64);
+  ST64A8 (pPred + (kiStride << 3) - kiStride, kuiVal64);
+}
+
+void WelsIChromaPredH_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 3) - kiStride;
+  uint8_t i = 7;
+
+  do {
+    const uint8_t kuiVal8   = pPred[iTmp - 1];
+    const uint64_t kuiVal64 = 0x0101010101010101ULL * kuiVal8;
+
+    ST64A8 (pPred + iTmp, kuiVal64);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+
+void WelsIChromaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t a = 0, b = 0, c = 0, H = 0, V = 0;
+  int32_t i, j;
+  uint8_t* pTop = &pPred[-kiStride];
+  uint8_t* pLeft = &pPred[-1];
+
+  for (i = 0 ; i < 4 ; i ++) {
+    H += (i + 1) * (pTop[4 + i] - pTop[2 - i]);
+    V += (i + 1) * (pLeft[ (4 + i) * kiStride] - pLeft[ (2 - i) * kiStride]);
+  }
+
+  a = (pLeft[7 * kiStride] + pTop[7]) << 4;
+  b = (17 * H + 16) >> 5;
+  c = (17 * V + 16) >> 5;
+
+  for (i = 0 ; i < 8 ; i ++) {
+    for (j = 0 ; j < 8 ; j ++) {
+      int32_t iTmp = (a + b * (j - 3) + c * (i - 3) + 16) >> 5;
+      iTmp = WelsClip1 (iTmp);
+      pPred[j] = iTmp;
+    }
+    pPred += kiStride;
+  }
+}
+
+
+void WelsIChromaPredDc_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiL1            = kiStride - 1;
+  const int32_t kiL2            = kiL1 + kiStride;
+  const int32_t kiL3            = kiL2 + kiStride;
+  const int32_t kiL4            = kiL3 + kiStride;
+  const int32_t kiL5            = kiL4 + kiStride;
+  const int32_t kiL6            = kiL5 + kiStride;
+  const int32_t kiL7            = kiL6 + kiStride;
+  /*caculate the kMean value*/
+  const uint8_t kuiM1           = (pPred[-kiStride] + pPred[1 - kiStride] + pPred[2 - kiStride] + pPred[3 - kiStride] +
+                                   pPred[-1] + pPred[kiL1] + pPred[kiL2] + pPred[kiL3] + 4) >> 3 ;
+  const uint32_t kuiSum2        = pPred[4 - kiStride] + pPred[5 - kiStride] + pPred[6 - kiStride] + pPred[7 - kiStride];
+  const uint32_t kuiSum3        = pPred[kiL4] + pPred[kiL5] + pPred[kiL6] + pPred[kiL7];
+  const uint8_t kuiM2           = (kuiSum2 + 2) >> 2;
+  const uint8_t kuiM3           = (kuiSum3 + 2) >> 2;
+  const uint8_t kuiM4           = (kuiSum2 + kuiSum3 + 4) >> 3;
+  const uint8_t kuiMUP[8]       = {kuiM1, kuiM1, kuiM1, kuiM1, kuiM2, kuiM2, kuiM2, kuiM2};
+  const uint8_t kuiMDown[8]     = {kuiM3, kuiM3, kuiM3, kuiM3, kuiM4, kuiM4, kuiM4, kuiM4};
+  const uint64_t kuiUP64        = LD64 (kuiMUP);
+  const uint64_t kuiDN64        = LD64 (kuiMDown);
+
+  ST64A8 (pPred, kuiUP64);
+  ST64A8 (pPred + kiL1 + 1, kuiUP64);
+  ST64A8 (pPred + kiL2 + 1, kuiUP64);
+  ST64A8 (pPred + kiL3 + 1, kuiUP64);
+  ST64A8 (pPred + kiL4 + 1, kuiDN64);
+  ST64A8 (pPred + kiL5 + 1, kuiDN64);
+  ST64A8 (pPred + kiL6 + 1, kuiDN64);
+  ST64A8 (pPred + kiL7 + 1, kuiDN64);
+}
+
+void WelsIChromaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {
+  const int32_t kiL1    =   -1 + kiStride;
+  const int32_t kiL2    = kiL1 + kiStride;
+  const int32_t kiL3    = kiL2 + kiStride;
+  const int32_t kiL4    = kiL3 + kiStride;
+  const int32_t kiL5    = kiL4 + kiStride;
+  const int32_t kiL6    = kiL5 + kiStride;
+  const int32_t kiL7    = kiL6 + kiStride;
+  /*caculate the kMean value*/
+  const uint8_t kuiMUP   = (pPred[-1] + pPred[kiL1] + pPred[kiL2] + pPred[kiL3] + 2) >> 2 ;
+  const uint8_t kuiMDown = (pPred[kiL4] + pPred[kiL5] + pPred[kiL6] + pPred[kiL7] + 2) >> 2;
+  const uint64_t kuiUP64 = 0x0101010101010101ULL * kuiMUP;
+  const uint64_t kuiDN64 = 0x0101010101010101ULL * kuiMDown;
+
+  ST64A8 (pPred, kuiUP64);
+  ST64A8 (pPred + kiL1 + 1, kuiUP64);
+  ST64A8 (pPred + kiL2 + 1, kuiUP64);
+  ST64A8 (pPred + kiL3 + 1, kuiUP64);
+  ST64A8 (pPred + kiL4 + 1, kuiDN64);
+  ST64A8 (pPred + kiL5 + 1, kuiDN64);
+  ST64A8 (pPred + kiL6 + 1, kuiDN64);
+  ST64A8 (pPred + kiL7 + 1, kuiDN64);
+}
+
+void WelsIChromaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp          = (kiStride << 3) - kiStride;
+  /*caculate the kMean value*/
+  const uint8_t kuiM1   = (pPred[-kiStride] + pPred[1 - kiStride] + pPred[2 - kiStride] + pPred[3 - kiStride] + 2) >> 2;
+  const uint8_t kuiM2   = (pPred[4 - kiStride] + pPred[5 - kiStride] + pPred[6 - kiStride] + pPred[7 - kiStride] + 2) >>
+                          2;
+  const uint8_t kuiM[8] = {kuiM1, kuiM1, kuiM1, kuiM1, kuiM2, kuiM2, kuiM2, kuiM2};
+
+  uint8_t i = 7;
+
+  do {
+    ST64A8 (pPred + iTmp, LD64 (kuiM));
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsIChromaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 3) - kiStride;
+  const uint64_t kuiDC64 = 0x8080808080808080ULL;
+  uint8_t i = 7;
+
+  do {
+    ST64A8 (pPred + iTmp, kuiDC64);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredV_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp            = (kiStride << 4) - kiStride;
+  const uint64_t kuiTop1  = LD64A8 (pPred - kiStride);
+  const uint64_t kuiTop2  = LD64A8 (pPred - kiStride + 8);
+  uint8_t i = 15;
+
+  do {
+    ST64A8 (pPred + iTmp, kuiTop1);
+    ST64A8 (pPred + iTmp + 8, kuiTop2);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredH_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 4) - kiStride;
+  uint8_t i = 15;
+
+  do {
+    const uint8_t kuiVal8   = pPred[iTmp - 1];
+    const uint64_t kuiVal64 = 0x0101010101010101ULL * kuiVal8;
+
+    ST64A8 (pPred + iTmp, kuiVal64);
+    ST64A8 (pPred + iTmp + 8, kuiVal64);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t a = 0, b = 0, c = 0, H = 0, V = 0;
+  int32_t i, j;
+  uint8_t* pTop = &pPred[-kiStride];
+  uint8_t* pLeft = &pPred[-1];
+
+  for (i = 0 ; i < 8 ; i ++) {
+    H += (i + 1) * (pTop[8 + i] - pTop[6 - i]);
+    V += (i + 1) * (pLeft[ (8 + i) * kiStride] - pLeft[ (6 - i) * kiStride]);
+  }
+
+  a = (pLeft[15 * kiStride] + pTop[15]) << 4;
+  b = (5 * H + 32) >> 6;
+  c = (5 * V + 32) >> 6;
+
+  for (i = 0 ; i < 16 ; i ++) {
+    for (j = 0 ; j < 16 ; j ++) {
+      int32_t iTmp = (a + b * (j - 7) + c * (i - 7) + 16) >> 5;
+      iTmp = WelsClip1 (iTmp);
+      pPred[j] = iTmp;
+    }
+    pPred += kiStride;
+  }
+}
+
+void WelsI16x16LumaPredDc_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 4) - kiStride;
+  int32_t iSum = 0;
+  uint8_t i = 15;
+  uint8_t uiMean = 0;
+
+  /*caculate the kMean value*/
+  do {
+    iSum += pPred[-1 + iTmp] + pPred[-kiStride + i];
+    iTmp -= kiStride;
+  } while (i-- > 0);
+  uiMean = (16 + iSum) >> 5;
+
+  iTmp = (kiStride << 4) - kiStride;
+  i = 15;
+  do {
+    memset (&pPred[iTmp], uiMean, I16x16_COUNT);
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+
+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 4) - kiStride;
+  int32_t iSum = 0;
+  uint8_t i = 15;
+  uint8_t uiMean = 0;
+
+  /*caculate the kMean value*/
+  do {
+    iSum += pPred[-kiStride + i];
+  } while (i-- > 0);
+  uiMean = (8 + iSum) >> 4;
+
+  i = 15;
+  do {
+    memset (&pPred[iTmp], uiMean, I16x16_COUNT);
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, const int32_t kiStride) {
+  int32_t iTmp = (kiStride << 4) - kiStride;
+  int32_t iSum = 0;
+  uint64_t uiMean64 = 0;
+  uint8_t uiMean = 0;
+  uint8_t i = 15;
+
+  /*caculate the kMean value*/
+  do {
+    iSum += pPred[-1 + iTmp];
+    iTmp -= kiStride;
+  } while (i-- > 0);
+  uiMean   = (8 + iSum) >> 4;
+  uiMean64 = 0x0101010101010101ULL * uiMean;
+
+  iTmp = (kiStride << 4) - kiStride;
+  i = 15;
+  do {
+    ST64A8 (pPred + iTmp, uiMean64);
+    ST64A8 (pPred + iTmp + 8, uiMean64);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, const int32_t kiStride) {
+  const uint64_t kuiDC64 = 0x8080808080808080ULL;
+  int32_t iTmp = (kiStride << 4) - kiStride;
+  uint8_t i = 15;
+
+  do {
+    ST64A8 (pPred + iTmp, kuiDC64);
+    ST64A8 (pPred + iTmp + 8, kuiDC64);
+
+    iTmp -= kiStride;
+  } while (i-- > 0);
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/manage_dec_ref.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/manage_dec_ref.cpp
new file mode 100644
index 0000000000..571ce41d7d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/manage_dec_ref.cpp
@@ -0,0 +1,958 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  manage_dec_ref.cpp
+ *
+ *  Abstract
+ *      Implementation for managing reference picture
+ *
+ *  History
+ *      07/21/2008 Created
+ *
+ *****************************************************************************/
+
+#include "manage_dec_ref.h"
+#include "error_concealment.h"
+#include "error_code.h"
+#include "decoder.h"
+
+namespace WelsDec {
+
+static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum);
+static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameIdx);
+static PPicture WelsDelShortFromListSetUnref (PRefPic pRefPic, int32_t iFrameNum);
+static PPicture WelsDelLongFromListSetUnref (PRefPic pRefPic, uint32_t uiLongTermFrameIdx);
+
+static int32_t MMCO (PWelsDecoderContext pCtx, PRefPic pRefPic, PRefPicMarking pRefPicMarking);
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, PRefPic pRefPic, uint32_t uiMmcoType,
+                            int32_t iShortFrameNum, uint32_t uiLongTermPicNum, int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx);
+static int32_t SlidingWindow (PWelsDecoderContext pCtx, PRefPic pRefPic);
+
+static int32_t AddShortTermToList (PRefPic pRefPic, PPicture pPic);
+static int32_t AddLongTermToList (PRefPic pRefPic, PPicture pPic, int32_t iLongTermFrameIdx, uint32_t uiLongTermPicNum);
+static int32_t MarkAsLongTerm (PRefPic pRefPic, int32_t iFrameNum, int32_t iLongTermFrameIdx,
+                               uint32_t uiLongTermPicNum);
+static int32_t WelsCheckAndRecoverForFutureDecoding (PWelsDecoderContext pCtx);
+#ifdef LONG_TERM_REF
+int32_t GetLTRFrameIndex (PRefPic pRefPic, int32_t iAncLTRFrameNum);
+#endif
+static int32_t RemainOneBufferInDpbForEC (PWelsDecoderContext pCtx, PRefPic pRefPic);
+
+static void SetUnRef (PPicture pRef) {
+  if (NULL != pRef) {
+    pRef->bUsedAsRef = false;
+    pRef->bIsLongRef = false;
+    pRef->iFrameNum = -1;
+    pRef->iFrameWrapNum = -1;
+    //pRef->iFramePoc = 0;
+    pRef->iLongTermFrameIdx = -1;
+    pRef->uiLongTermPicNum = 0;
+    pRef->uiQualityId = -1;
+    pRef->uiTemporalId = -1;
+    pRef->uiSpatialId = -1;
+    pRef->iSpsId = -1;
+    pRef->bIsComplete = false;
+    pRef->iRefCount = 0;
+
+    if (pRef->eSliceType == I_SLICE) {
+      return;
+    }
+    int32_t lists = pRef->eSliceType == P_SLICE ? 1 : 2;
+    for (int32_t i = 0; i < MAX_DPB_COUNT; ++i) {
+      for (int32_t list = 0; list < lists; ++list) {
+        if (pRef->pRefPic[list][i] != NULL) {
+          pRef->pRefPic[list][i]->iRefCount = 0;
+          pRef->pRefPic[list][i] = NULL;
+        }
+      }
+    }
+  }
+}
+
+//reset pRefList when
+// 1.sps arrived that is new sequence starting
+// 2.IDR NAL i.e. 1st layer in IDR AU
+
+void WelsResetRefPic (PWelsDecoderContext pCtx) {
+  int32_t i = 0;
+  PRefPic pRefPic = &pCtx->sRefPic;
+  pCtx->sRefPic.uiLongRefCount[LIST_0] = pCtx->sRefPic.uiShortRefCount[LIST_0] = 0;
+
+  pRefPic->uiRefCount[LIST_0] = 0;
+  pRefPic->uiRefCount[LIST_1] = 0;
+
+  for (i = 0; i < MAX_DPB_COUNT; i++) {
+    if (pRefPic->pShortRefList[LIST_0][i] != NULL) {
+      SetUnRef (pRefPic->pShortRefList[LIST_0][i]);
+      pRefPic->pShortRefList[LIST_0][i] = NULL;
+    }
+  }
+  pRefPic->uiShortRefCount[LIST_0] = 0;
+
+  for (i = 0; i < MAX_DPB_COUNT; i++) {
+    if (pRefPic->pLongRefList[LIST_0][i] != NULL) {
+      SetUnRef (pRefPic->pLongRefList[LIST_0][i]);
+      pRefPic->pLongRefList[LIST_0][i] = NULL;
+    }
+  }
+  pRefPic->uiLongRefCount[LIST_0] = 0;
+}
+
+void WelsResetRefPicWithoutUnRef (PWelsDecoderContext pCtx) {
+  int32_t i = 0;
+  PRefPic pRefPic = &pCtx->sRefPic;
+  pCtx->sRefPic.uiLongRefCount[LIST_0] = pCtx->sRefPic.uiShortRefCount[LIST_0] = 0;
+
+  pRefPic->uiRefCount[LIST_0] = 0;
+  pRefPic->uiRefCount[LIST_1] = 0;
+
+  for (i = 0; i < MAX_DPB_COUNT; i++) {
+    pRefPic->pShortRefList[LIST_0][i] = NULL;
+  }
+  pRefPic->uiShortRefCount[LIST_0] = 0;
+
+  for (i = 0; i < MAX_DPB_COUNT; i++) {
+    pRefPic->pLongRefList[LIST_0][i] = NULL;
+  }
+  pRefPic->uiLongRefCount[LIST_0] = 0;
+}
+
+static int32_t WelsCheckAndRecoverForFutureDecoding (PWelsDecoderContext pCtx) {
+  if ((pCtx->sRefPic.uiShortRefCount[LIST_0] + pCtx->sRefPic.uiLongRefCount[LIST_0] <= 0)
+      && (pCtx->eSliceType != I_SLICE
+          && pCtx->eSliceType != SI_SLICE)) {
+    if (pCtx->pParam->eEcActiveIdc !=
+        ERROR_CON_DISABLE) { //IDR lost!, recover it for future decoding with data all set to 0
+      PPicture pRef = PrefetchPic (pCtx->pPicBuff);
+      if (pRef != NULL) {
+        // IDR lost, set new
+        pRef->bIsComplete = false; // Set complete flag to false for lost IDR ref picture
+        pRef->iSpsId = pCtx->pSps->iSpsId;
+        pRef->iPpsId = pCtx->pPps->iPpsId;
+        if (pCtx->eSliceType == B_SLICE) {
+          //reset reference's references when IDR is lost
+          for (int32_t list = LIST_0; list < LIST_A; ++list) {
+            for (int32_t i = 0; i < MAX_DPB_COUNT; ++i) {
+              pRef->pRefPic[list][i] = NULL;
+            }
+          }
+        }
+        pCtx->iErrorCode |= dsDataErrorConcealed;
+        bool bCopyPrevious = ((ERROR_CON_FRAME_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)
+                              || (ERROR_CON_SLICE_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)
+                              || (ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE == pCtx->pParam->eEcActiveIdc)
+                              || (ERROR_CON_SLICE_MV_COPY_CROSS_IDR == pCtx->pParam->eEcActiveIdc)
+                              || (ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE == pCtx->pParam->eEcActiveIdc))
+                             && (NULL != pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb);
+        bCopyPrevious = bCopyPrevious
+                        && (pRef->iWidthInPixel == pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->iWidthInPixel)
+                        && (pRef->iHeightInPixel == pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->iHeightInPixel);
+
+        if (!bCopyPrevious) {
+          memset (pRef->pData[0], 128, pRef->iLinesize[0] * pRef->iHeightInPixel);
+          memset (pRef->pData[1], 128, pRef->iLinesize[1] * pRef->iHeightInPixel / 2);
+          memset (pRef->pData[2], 128, pRef->iLinesize[2] * pRef->iHeightInPixel / 2);
+        } else if (pRef == pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb) {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsInitRefList()::EC memcpy overlap.");
+        } else {
+          memcpy (pRef->pData[0], pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->pData[0],
+                  pRef->iLinesize[0] * pRef->iHeightInPixel);
+          memcpy (pRef->pData[1], pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->pData[1],
+                  pRef->iLinesize[1] * pRef->iHeightInPixel / 2);
+          memcpy (pRef->pData[2], pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->pData[2],
+                  pRef->iLinesize[2] * pRef->iHeightInPixel / 2);
+        }
+        pRef->iFrameNum = 0;
+        pRef->iFramePoc = 0;
+        pRef->uiTemporalId = pRef->uiQualityId = 0;
+        pRef->eSliceType = pCtx->eSliceType;
+        ExpandReferencingPicture (pRef->pData, pRef->iWidthInPixel, pRef->iHeightInPixel, pRef->iLinesize,
+                                  pCtx->sExpandPicFunc.pfExpandLumaPicture, pCtx->sExpandPicFunc.pfExpandChromaPicture);
+        AddShortTermToList (&pCtx->sRefPic, pRef);
+      } else {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "WelsInitRefList()::PrefetchPic for EC errors.");
+        pCtx->iErrorCode |= dsOutOfMemory;
+        return ERR_INFO_REF_COUNT_OVERFLOW;
+      }
+    }
+  }
+  return ERR_NONE;
+}
+
+static void WrapShortRefPicNum (PWelsDecoderContext pCtx) {
+  int32_t i;
+  PSliceHeader pSliceHeader = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader;
+  int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum;
+  PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
+  int32_t iShortRefCount = pCtx->sRefPic.uiShortRefCount[LIST_0];
+  //wrap pic num
+  for (i = 0; i < iShortRefCount; i++) {
+    if (ppShoreRefList[i]) {
+      if (ppShoreRefList[i]->iFrameNum > pSliceHeader->iFrameNum)
+        ppShoreRefList[i]->iFrameWrapNum = ppShoreRefList[i]->iFrameNum - iMaxPicNum;
+      else
+        ppShoreRefList[i]->iFrameWrapNum = ppShoreRefList[i]->iFrameNum;
+    }
+  }
+}
+
+/**
+* fills the pRefPic.pRefList LIST_0 and LIST_0 for B-Slice.
+*/
+int32_t WelsInitBSliceRefList (PWelsDecoderContext pCtx, int32_t iPoc) {
+
+  int32_t err = WelsCheckAndRecoverForFutureDecoding (pCtx);
+  if (err != ERR_NONE) return err;
+
+  WrapShortRefPicNum (pCtx);
+
+  PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
+  PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
+  memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_DPB_COUNT * sizeof (PPicture));
+  memset (pCtx->sRefPic.pRefList[LIST_1], 0, MAX_DPB_COUNT * sizeof (PPicture));
+  int32_t iLSCurrPocCount = 0;
+  int32_t iLTCurrPocCount = 0;
+  PPicture pLSCurrPocList0[MAX_DPB_COUNT];
+  PPicture pLTCurrPocList0[MAX_DPB_COUNT];
+  for (int32_t i = 0; i < pCtx->sRefPic.uiShortRefCount[LIST_0]; ++i) {
+    if (ppShoreRefList[i]->iFramePoc < iPoc) {
+      pLSCurrPocList0[iLSCurrPocCount++] = ppShoreRefList[i];
+    }
+  }
+  for (int32_t i = pCtx->sRefPic.uiShortRefCount[LIST_0] - 1; i >= 0; --i) {
+    if (ppShoreRefList[i]->iFramePoc > iPoc) {
+      pLTCurrPocList0[iLTCurrPocCount++] = ppShoreRefList[i];
+    }
+  }
+  if (pCtx->sRefPic.uiLongRefCount[LIST_0] > 1) {
+    //long sorts in increasing order
+    PPicture pTemp;
+    for (int32_t i = 0; i < pCtx->sRefPic.uiLongRefCount[LIST_0]; ++i) {
+      for (int32_t j = i + 1; j < pCtx->sRefPic.uiLongRefCount[LIST_0]; ++j) {
+        if (ppLongRefList[j]->iFramePoc < ppLongRefList[i]->iFramePoc) {
+          pTemp = ppLongRefList[i];
+          ppLongRefList[i] = ppLongRefList[j];
+          ppLongRefList[j] = pTemp;
+        }
+      }
+    }
+  }
+  int32_t iCurrPocCount = iLSCurrPocCount + iLTCurrPocCount;
+  int32_t iCount = 0;
+  //LIST_0
+  //short
+  //It may need to sort LIST_0 and LIST_1 so that they will have the right default orders.
+  for (int32_t i = 0; i < iLSCurrPocCount; ++i) {
+    pCtx->sRefPic.pRefList[LIST_0][iCount++] = pLSCurrPocList0[i];
+  }
+  if (iLSCurrPocCount > 1) {
+    //LIST_0 short sorts in decreasing order
+    PPicture pTemp;
+    for (int32_t i = 0; i < iLSCurrPocCount; ++i) {
+      for (int32_t j = i + 1; j < iLSCurrPocCount; ++j) {
+        if (pCtx->sRefPic.pRefList[LIST_0][j]->iFramePoc > pCtx->sRefPic.pRefList[LIST_0][i]->iFramePoc) {
+          pTemp = pCtx->sRefPic.pRefList[LIST_0][i];
+          pCtx->sRefPic.pRefList[LIST_0][i] = pCtx->sRefPic.pRefList[LIST_0][j];
+          pCtx->sRefPic.pRefList[LIST_0][j] = pTemp;
+        }
+      }
+    }
+  }
+  for (int32_t i = 0; i < iLTCurrPocCount; ++i) {
+    pCtx->sRefPic.pRefList[LIST_0][iCount++] = pLTCurrPocList0[i];
+  }
+  if (iLTCurrPocCount > 1) {
+    //LIST_0 short sorts in increasing order
+    PPicture pTemp;
+    for (int32_t i = iLSCurrPocCount; i < iCurrPocCount; ++i) {
+      for (int32_t j = i + 1; j < iCurrPocCount; ++j) {
+        if (pCtx->sRefPic.pRefList[LIST_0][j]->iFramePoc < pCtx->sRefPic.pRefList[LIST_0][i]->iFramePoc) {
+          pTemp = pCtx->sRefPic.pRefList[LIST_0][i];
+          pCtx->sRefPic.pRefList[LIST_0][i] = pCtx->sRefPic.pRefList[LIST_0][j];
+          pCtx->sRefPic.pRefList[LIST_0][j] = pTemp;
+        }
+      }
+    }
+  }
+  //long
+  for (int32_t i = 0; i < pCtx->sRefPic.uiLongRefCount[LIST_0]; ++i) {
+    pCtx->sRefPic.pRefList[LIST_0][iCount++] = ppLongRefList[i];
+  }
+  pCtx->sRefPic.uiRefCount[LIST_0] = iCount;
+
+  iCount = 0;
+  //LIST_1
+  //short
+  for (int32_t i = 0; i < iLTCurrPocCount; ++i) {
+    pCtx->sRefPic.pRefList[LIST_1][iCount++] = pLTCurrPocList0[i];
+  }
+  if (iLTCurrPocCount > 1) {
+    //LIST_1 short sorts in increasing order
+    PPicture pTemp;
+    for (int32_t i = 0; i < iLTCurrPocCount; ++i) {
+      for (int32_t j = i + 1; j < iLTCurrPocCount; ++j) {
+        if (pCtx->sRefPic.pRefList[LIST_1][j]->iFramePoc < pCtx->sRefPic.pRefList[LIST_1][i]->iFramePoc) {
+          pTemp = pCtx->sRefPic.pRefList[LIST_1][i];
+          pCtx->sRefPic.pRefList[LIST_1][i] = pCtx->sRefPic.pRefList[LIST_1][j];
+          pCtx->sRefPic.pRefList[LIST_1][j] = pTemp;
+        }
+      }
+    }
+  }
+  for (int32_t i = 0; i < iLSCurrPocCount; ++i) {
+    pCtx->sRefPic.pRefList[LIST_1][iCount++] = pLSCurrPocList0[i];
+  }
+  if (iLSCurrPocCount > 1) {
+    //LIST_1 short sorts in decreasing order
+    PPicture pTemp;
+    for (int32_t i = iLTCurrPocCount; i < iCurrPocCount; ++i) {
+      for (int32_t j = i + 1; j < iCurrPocCount; ++j) {
+        if (pCtx->sRefPic.pRefList[LIST_1][j]->iFramePoc > pCtx->sRefPic.pRefList[LIST_1][i]->iFramePoc) {
+          pTemp = pCtx->sRefPic.pRefList[LIST_1][i];
+          pCtx->sRefPic.pRefList[LIST_1][i] = pCtx->sRefPic.pRefList[LIST_1][j];
+          pCtx->sRefPic.pRefList[LIST_1][j] = pTemp;
+        }
+      }
+    }
+  }
+  //long
+  for (int32_t i = 0; i < pCtx->sRefPic.uiLongRefCount[LIST_0]; ++i) {
+    pCtx->sRefPic.pRefList[LIST_1][iCount++] = ppLongRefList[i];
+  }
+  pCtx->sRefPic.uiRefCount[LIST_1] = iCount;
+  return ERR_NONE;
+}
+
+/**
+ * fills the pRefPic.pRefList.
+ */
+int32_t WelsInitRefList (PWelsDecoderContext pCtx, int32_t iPoc) {
+
+  int32_t err = WelsCheckAndRecoverForFutureDecoding (pCtx);
+  if (err != ERR_NONE) return err;
+
+  WrapShortRefPicNum (pCtx);
+
+  PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
+  PPicture* ppLongRefList  = pCtx->sRefPic.pLongRefList[LIST_0];
+  memset (pCtx->sRefPic.pRefList[LIST_0], 0, MAX_DPB_COUNT * sizeof (PPicture));
+
+  int32_t i, iCount = 0;
+  //short
+  for (i = 0; i < pCtx->sRefPic.uiShortRefCount[LIST_0]; ++i) {
+    pCtx->sRefPic.pRefList[LIST_0][iCount++ ] = ppShoreRefList[i];
+  }
+
+  //long
+  for (i = 0; i < pCtx->sRefPic.uiLongRefCount[LIST_0] ; ++i) {
+    pCtx->sRefPic.pRefList[LIST_0][iCount++  ] = ppLongRefList[i];
+  }
+  pCtx->sRefPic.uiRefCount[LIST_0] = iCount;
+
+  return ERR_NONE;
+}
+
+int32_t WelsReorderRefList (PWelsDecoderContext pCtx) {
+
+  if (pCtx->eSliceType == I_SLICE || pCtx->eSliceType == SI_SLICE) {
+    return ERR_NONE;
+  }
+
+  PRefPicListReorderSyn pRefPicListReorderSyn = pCtx->pCurDqLayer->pRefPicListReordering;
+  PNalUnitHeaderExt pNalHeaderExt = &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt;
+  PSliceHeader pSliceHeader = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader;
+  int32_t ListCount = 1;
+  if (pCtx->eSliceType == B_SLICE) ListCount = 2;
+  for (int32_t listIdx = 0; listIdx < ListCount; ++listIdx) {
+    PPicture pPic = NULL;
+    PPicture* ppRefList = pCtx->sRefPic.pRefList[listIdx];
+    int32_t  iMaxRefIdx = pCtx->iPicQueueNumber;
+    if (iMaxRefIdx >= MAX_REF_PIC_COUNT) {
+      iMaxRefIdx = MAX_REF_PIC_COUNT - 1;
+    }
+    int32_t iRefCount = pSliceHeader->uiRefCount[listIdx];
+    int32_t iPredFrameNum = pSliceHeader->iFrameNum;
+    int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum;
+    int32_t iAbsDiffPicNum = -1;
+    int32_t iReorderingIndex = 0;
+    int32_t i = 0;
+
+    if (iRefCount <= 0) {
+      pCtx->iErrorCode = dsNoParamSets; //No any reference for decoding, SHOULD request IDR
+      return ERR_INFO_REFERENCE_PIC_LOST;
+    }
+
+    if (pRefPicListReorderSyn->bRefPicListReorderingFlag[listIdx]) {
+      while ((iReorderingIndex < iMaxRefIdx)
+             && (pRefPicListReorderSyn->sReorderingSyn[listIdx][iReorderingIndex].uiReorderingOfPicNumsIdc != 3)) {
+        uint16_t uiReorderingOfPicNumsIdc =
+          pRefPicListReorderSyn->sReorderingSyn[listIdx][iReorderingIndex].uiReorderingOfPicNumsIdc;
+        if (uiReorderingOfPicNumsIdc < 2) {
+          iAbsDiffPicNum = pRefPicListReorderSyn->sReorderingSyn[listIdx][iReorderingIndex].uiAbsDiffPicNumMinus1 + 1;
+
+          if (uiReorderingOfPicNumsIdc == 0) {
+            iPredFrameNum -= iAbsDiffPicNum;
+          } else {
+            iPredFrameNum += iAbsDiffPicNum;
+          }
+          iPredFrameNum &= iMaxPicNum - 1;
+
+          for (i = iMaxRefIdx - 1; i >= 0; i--) {
+            if (ppRefList[i] != NULL && ppRefList[i]->iFrameNum == iPredFrameNum && !ppRefList[i]->bIsLongRef) {
+              if ((pNalHeaderExt->uiQualityId == ppRefList[i]->uiQualityId)
+                  && (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) {   //check;
+                WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d",
+                         pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
+                pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
+                return ERR_INFO_REFERENCE_PIC_LOST;
+              } else {
+                break;
+              }
+            }
+          }
+
+        } else if (uiReorderingOfPicNumsIdc == 2) {
+          for (i = iMaxRefIdx - 1; i >= 0; i--) {
+            if (ppRefList[i] != NULL && ppRefList[i]->bIsLongRef
+                && ppRefList[i]->iLongTermFrameIdx ==
+                pRefPicListReorderSyn->sReorderingSyn[listIdx][iReorderingIndex].uiLongTermPicNum) {
+              if ((pNalHeaderExt->uiQualityId == ppRefList[i]->uiQualityId)
+                  && (pSliceHeader->iSpsId != ppRefList[i]->iSpsId)) {    //check;
+                WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "WelsReorderRefList()::::BASE LAYER::::iSpsId:%d, ref_sps_id:%d",
+                         pSliceHeader->iSpsId, ppRefList[i]->iSpsId);
+                pCtx->iErrorCode = dsNoParamSets; //cross-IDR reference frame selection, SHOULD request IDR.--
+                return ERR_INFO_REFERENCE_PIC_LOST;
+              } else {
+                break;
+              }
+            }
+          }
+        }
+        if (i < 0) {
+          return ERR_INFO_REFERENCE_PIC_LOST;
+        }
+        pPic = ppRefList[i];
+        if (i > iReorderingIndex) {
+          memmove (&ppRefList[1 + iReorderingIndex], &ppRefList[iReorderingIndex],
+                   (i - iReorderingIndex) * sizeof (PPicture)); //confirmed_safe_unsafe_usage
+        } else if (i < iReorderingIndex) {
+          memmove (&ppRefList[1 + iReorderingIndex], &ppRefList[iReorderingIndex],
+                   (iMaxRefIdx - iReorderingIndex) * sizeof (PPicture));
+        }
+        ppRefList[iReorderingIndex] = pPic;
+        iReorderingIndex++;
+      }
+    }
+  }
+  return ERR_NONE;
+}
+
+//WelsReorderRefList2 is the test code
+int32_t WelsReorderRefList2 (PWelsDecoderContext pCtx) {
+
+  if (pCtx->eSliceType == I_SLICE || pCtx->eSliceType == SI_SLICE) {
+    return ERR_NONE;
+  }
+
+  PRefPicListReorderSyn pRefPicListReorderSyn = pCtx->pCurDqLayer->pRefPicListReordering;
+  PSliceHeader pSliceHeader = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader;
+
+  PPicture* ppShoreRefList = pCtx->sRefPic.pShortRefList[LIST_0];
+  int32_t iShortRefCount = pCtx->sRefPic.uiShortRefCount[LIST_0];
+  PPicture* ppLongRefList = pCtx->sRefPic.pLongRefList[LIST_0];
+  int32_t iLongRefCount = pCtx->sRefPic.uiLongRefCount[LIST_0];
+  int32_t i = 0;
+  int32_t j = 0;
+  int32_t k = 0;
+  int32_t iMaxRefIdx = pCtx->pSps->iNumRefFrames;
+  const int32_t iCurFrameNum = pSliceHeader->iFrameNum;
+  const int32_t iMaxPicNum = 1 << pSliceHeader->pSps->uiLog2MaxFrameNum;
+  int32_t iListCount = 1;
+  if (pCtx->eSliceType == B_SLICE) iListCount = 2;
+  for (int32_t listIdx = 0; listIdx < iListCount; ++listIdx) {
+    PPicture* ppRefList = pCtx->sRefPic.pRefList[listIdx];
+    int32_t iCount = 0;
+    int32_t iRefCount = pSliceHeader->uiRefCount[listIdx];
+    int32_t iAbsDiffPicNum = -1;
+
+    if (pRefPicListReorderSyn->bRefPicListReorderingFlag[listIdx]) {
+      int32_t iPredFrameNum = iCurFrameNum;
+      for (i = 0; pRefPicListReorderSyn->sReorderingSyn[listIdx][i].uiReorderingOfPicNumsIdc != 3; i++) {
+        if (iCount >= iMaxRefIdx)
+          break;
+
+        for (j = iRefCount; j > iCount; j--)
+          ppRefList[j] = ppRefList[j - 1];
+
+        uint16_t uiReorderingOfPicNumsIdc =
+          pRefPicListReorderSyn->sReorderingSyn[listIdx][i].uiReorderingOfPicNumsIdc;
+
+        if (uiReorderingOfPicNumsIdc < 2) { // reorder short references
+          iAbsDiffPicNum = (int32_t) (pRefPicListReorderSyn->sReorderingSyn[listIdx][i].uiAbsDiffPicNumMinus1 + 1);
+          if (uiReorderingOfPicNumsIdc == 0) {
+            if (iPredFrameNum - iAbsDiffPicNum < 0)
+              iPredFrameNum -= (iAbsDiffPicNum - iMaxPicNum);
+            else
+              iPredFrameNum -= iAbsDiffPicNum;
+          } else {
+            if (iPredFrameNum + iAbsDiffPicNum >= iMaxPicNum)
+              iPredFrameNum += (iAbsDiffPicNum - iMaxPicNum);
+            else
+              iPredFrameNum += iAbsDiffPicNum;
+          }
+
+          if (iPredFrameNum > iCurFrameNum) {
+            iPredFrameNum -= iMaxPicNum;
+          }
+
+          for (j = 0; j < iShortRefCount; j++) {
+            if (ppShoreRefList[j]) {
+              if (ppShoreRefList[j]->iFrameWrapNum == iPredFrameNum) {
+                ppRefList[iCount++] = ppShoreRefList[j];
+                break;
+              }
+            }
+          }
+          k = iCount;
+          for (j = k; j <= iRefCount; j++) {
+            if (ppRefList[j] != NULL) {
+              if (ppRefList[j]->bIsLongRef || ppRefList[j]->iFrameWrapNum != iPredFrameNum)
+                ppRefList[k++] = ppRefList[j];
+            }
+          }
+        } else { // reorder long term references uiReorderingOfPicNumsIdc == 2
+          iPredFrameNum = pRefPicListReorderSyn->sReorderingSyn[listIdx][i].uiLongTermPicNum;
+          for (j = 0; j < iLongRefCount; j++) {
+            if (ppLongRefList[j] != NULL) {
+              if (ppLongRefList[j]->uiLongTermPicNum == (uint32_t)iPredFrameNum) {
+                ppRefList[iCount++] = ppLongRefList[j];
+                break;
+              }
+            }
+          }
+          k = iCount;
+          for (j = k; j <= iRefCount; j++) {
+            if (ppRefList[j] != NULL) {
+              if (!ppRefList[j]->bIsLongRef || ppLongRefList[j]->uiLongTermPicNum != (uint32_t)iPredFrameNum)
+                ppRefList[k++] = ppRefList[j];
+            }
+          }
+        }
+      }
+    }
+
+    for (i = WELS_MAX (1, WELS_MAX (iCount, pCtx->sRefPic.uiRefCount[listIdx])); i < iRefCount; i++)
+      ppRefList[i] = ppRefList[i - 1];
+    pCtx->sRefPic.uiRefCount[listIdx] = (uint8_t)WELS_MIN (WELS_MAX (iCount, pCtx->sRefPic.uiRefCount[listIdx]),
+                                        iRefCount);
+  }
+  return ERR_NONE;
+}
+
+int32_t WelsMarkAsRef (PWelsDecoderContext pCtx, PPicture pLastDec) {
+  PPicture pDec = pLastDec;
+  bool isThreadCtx = true;
+  if (pDec == NULL) {
+    pDec = pCtx->pDec;
+    isThreadCtx = false;
+  }
+  PRefPic pRefPic = isThreadCtx ? &pCtx->sTmpRefPic : &pCtx->sRefPic;
+  PRefPicMarking pRefPicMarking = pCtx->pCurDqLayer->pRefPicMarking;
+  PAccessUnit pCurAU = pCtx->pAccessUnitList;
+  bool bIsIDRAU = false;
+  uint32_t j;
+
+  int32_t iRet = ERR_NONE;
+
+  pDec->uiQualityId = pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.uiQualityId;
+  pDec->uiTemporalId = pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt.uiTemporalId;
+  pDec->iSpsId = pCtx->pSps->iSpsId;
+  pDec->iPpsId = pCtx->pPps->iPpsId;
+
+  for (j = pCurAU->uiStartPos; j <= pCurAU->uiEndPos; j++) {
+    if (pCurAU->pNalUnitsList[j]->sNalHeaderExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_IDR
+        || pCurAU->pNalUnitsList[j]->sNalHeaderExt.bIdrFlag) {
+      bIsIDRAU = true;
+      break;
+    }
+  }
+  if (bIsIDRAU) {
+    if (pRefPicMarking->bLongTermRefFlag) {
+      pRefPic->iMaxLongTermFrameIdx = 0;
+      AddLongTermToList (pRefPic, pDec, 0, 0);
+    } else {
+      pRefPic->iMaxLongTermFrameIdx = -1;
+    }
+  } else {
+    if (pRefPicMarking->bAdaptiveRefPicMarkingModeFlag) {
+      iRet = MMCO (pCtx, pRefPic, pRefPicMarking);
+      if (iRet != ERR_NONE) {
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRet = RemainOneBufferInDpbForEC (pCtx, pRefPic);
+          WELS_VERIFY_RETURN_IF (iRet, iRet);
+        } else {
+          return iRet;
+        }
+      }
+
+      if (pCtx->pLastDecPicInfo->bLastHasMmco5) {
+        pDec->iFrameNum = 0;
+        pDec->iFramePoc = 0;
+      }
+
+    } else {
+      iRet = SlidingWindow (pCtx, pRefPic);
+      if (iRet != ERR_NONE) {
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRet = RemainOneBufferInDpbForEC (pCtx, pRefPic);
+          WELS_VERIFY_RETURN_IF (iRet, iRet);
+        } else {
+          return iRet;
+        }
+      }
+    }
+  }
+
+  if (!pDec->bIsLongRef) {
+    if (pRefPic->uiLongRefCount[LIST_0] + pRefPic->uiShortRefCount[LIST_0] >= WELS_MAX (1, pCtx->pSps->iNumRefFrames)) {
+      if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+        iRet = RemainOneBufferInDpbForEC (pCtx, pRefPic);
+        WELS_VERIFY_RETURN_IF (iRet, iRet);
+      } else {
+        return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
+      }
+    }
+    iRet = AddShortTermToList (pRefPic, pDec);
+  }
+
+  return iRet;
+}
+
+static int32_t MMCO (PWelsDecoderContext pCtx, PRefPic pRefPic, PRefPicMarking pRefPicMarking) {
+  PSps pSps = pCtx->pCurDqLayer->sLayerInfo.pSps;
+  int32_t i = 0;
+  int32_t iRet = ERR_NONE;
+  for (i = 0; i < MAX_MMCO_COUNT && pRefPicMarking->sMmcoRef[i].uiMmcoType != MMCO_END; i++) {
+    uint32_t uiMmcoType = pRefPicMarking->sMmcoRef[i].uiMmcoType;
+    int32_t iShortFrameNum = (pCtx->iFrameNum - pRefPicMarking->sMmcoRef[i].iDiffOfPicNum) & ((
+                               1 << pSps->uiLog2MaxFrameNum) - 1);
+    uint32_t uiLongTermPicNum = pRefPicMarking->sMmcoRef[i].uiLongTermPicNum;
+    int32_t iLongTermFrameIdx = pRefPicMarking->sMmcoRef[i].iLongTermFrameIdx;
+    int32_t iMaxLongTermFrameIdx = pRefPicMarking->sMmcoRef[i].iMaxLongTermFrameIdx;
+    if (uiMmcoType > MMCO_LONG) {
+      return ERR_INFO_INVALID_MMCO_OPCODE_BASE;
+    }
+    iRet = MMCOProcess (pCtx, pRefPic, uiMmcoType, iShortFrameNum, uiLongTermPicNum, iLongTermFrameIdx,
+                        iMaxLongTermFrameIdx);
+    if (iRet != ERR_NONE) {
+      return iRet;
+    }
+  }
+  if (i == MAX_MMCO_COUNT) { //although Rec does not handle this condition, we here prohibit too many MMCO op
+    return ERR_INFO_INVALID_MMCO_NUM;
+  }
+
+  return ERR_NONE;
+}
+static int32_t MMCOProcess (PWelsDecoderContext pCtx, PRefPic pRefPic, uint32_t uiMmcoType,
+                            int32_t iShortFrameNum, uint32_t uiLongTermPicNum, int32_t iLongTermFrameIdx, int32_t iMaxLongTermFrameIdx) {
+  PPicture pPic = NULL;
+  int32_t i = 0;
+  int32_t iRet = ERR_NONE;
+
+  switch (uiMmcoType) {
+  case MMCO_SHORT2UNUSED:
+    pPic = WelsDelShortFromListSetUnref (pRefPic, iShortFrameNum);
+    if (pPic == NULL) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_SHORT2UNUSED: delete an empty entry from short term list");
+    }
+    break;
+  case MMCO_LONG2UNUSED:
+    pPic = WelsDelLongFromListSetUnref (pRefPic, uiLongTermPicNum);
+    if (pPic == NULL) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2UNUSED: delete an empty entry from long term list");
+    }
+    break;
+  case MMCO_SHORT2LONG:
+    if (iLongTermFrameIdx > pRefPic->iMaxLongTermFrameIdx) {
+      return ERR_INFO_INVALID_MMCO_LONG_TERM_IDX_EXCEED_MAX;
+    }
+    pPic = WelsDelShortFromList (pRefPic, iShortFrameNum);
+    if (pPic == NULL) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "MMCO_LONG2LONG: delete an empty entry from short term list");
+      break;
+    }
+    WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
+#ifdef LONG_TERM_REF
+    pCtx->bCurAuContainLtrMarkSeFlag = true;
+    pCtx->iFrameNumOfAuMarkedLtr      = iShortFrameNum;
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_SHORT2LONG:::LTR marking....iFrameNum: %d",
+             pCtx->iFrameNumOfAuMarkedLtr);
+#endif
+
+    MarkAsLongTerm (pRefPic, iShortFrameNum, iLongTermFrameIdx, uiLongTermPicNum);
+    break;
+  case MMCO_SET_MAX_LONG:
+    pRefPic->iMaxLongTermFrameIdx = iMaxLongTermFrameIdx;
+    for (i = 0 ; i < pRefPic->uiLongRefCount[LIST_0]; i++) {
+      if (pRefPic->pLongRefList[LIST_0][i]->iLongTermFrameIdx > pRefPic->iMaxLongTermFrameIdx) {
+        WelsDelLongFromListSetUnref (pRefPic, pRefPic->pLongRefList[LIST_0][i]->iLongTermFrameIdx);
+      }
+    }
+    break;
+  case MMCO_RESET:
+    WelsResetRefPic (pCtx);
+    pCtx->pLastDecPicInfo->bLastHasMmco5 = true;
+    break;
+  case MMCO_LONG:
+    if (iLongTermFrameIdx > pRefPic->iMaxLongTermFrameIdx) {
+      return ERR_INFO_INVALID_MMCO_LONG_TERM_IDX_EXCEED_MAX;
+    }
+    WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
+    if (pRefPic->uiLongRefCount[LIST_0] + pRefPic->uiShortRefCount[LIST_0] >= WELS_MAX (1, pCtx->pSps->iNumRefFrames)) {
+      return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
+    }
+#ifdef LONG_TERM_REF
+    pCtx->bCurAuContainLtrMarkSeFlag = true;
+    pCtx->iFrameNumOfAuMarkedLtr      = pCtx->iFrameNum;
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "ex_mark_avc():::MMCO_LONG:::LTR marking....iFrameNum: %d",
+             pCtx->iFrameNum);
+#endif
+    iRet = AddLongTermToList (pRefPic, pCtx->pDec, iLongTermFrameIdx, uiLongTermPicNum);
+    break;
+  default :
+    break;
+  }
+
+  return iRet;
+}
+
+static int32_t SlidingWindow (PWelsDecoderContext pCtx, PRefPic pRefPic) {
+  PPicture pPic = NULL;
+  int32_t i = 0;
+
+  if (pRefPic->uiShortRefCount[LIST_0] + pRefPic->uiLongRefCount[LIST_0] >= pCtx->pSps->iNumRefFrames) {
+    if (pRefPic->uiShortRefCount[LIST_0] == 0) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "No reference picture in short term list when sliding window");
+      return ERR_INFO_INVALID_MMCO_REF_NUM_NOT_ENOUGH;
+    }
+    for (i = pRefPic->uiShortRefCount[LIST_0] - 1; i >= 0; i--) {
+      pPic = WelsDelShortFromList (pRefPic, pRefPic->pShortRefList[LIST_0][i]->iFrameNum);
+      if (pPic) {
+        SetUnRef (pPic);
+        break;
+      } else {
+        return ERR_INFO_INVALID_MMCO_REF_NUM_OVERFLOW;
+      }
+    }
+  }
+  return ERR_NONE;
+}
+
+static PPicture WelsDelShortFromList (PRefPic pRefPic, int32_t iFrameNum) {
+  int32_t i = 0;
+  int32_t iMoveSize = 0;
+  PPicture pPic = NULL;
+
+  for (i = 0; i < pRefPic->uiShortRefCount[LIST_0]; i++) {
+    if (pRefPic->pShortRefList[LIST_0][i]->iFrameNum == iFrameNum) {
+      iMoveSize = pRefPic->uiShortRefCount[LIST_0] - i - 1;
+      pPic = pRefPic->pShortRefList[LIST_0][i];
+      pPic->bUsedAsRef = false;
+      pRefPic->pShortRefList[LIST_0][i] = NULL;
+      if (iMoveSize > 0) {
+        memmove (&pRefPic->pShortRefList[LIST_0][i], &pRefPic->pShortRefList[LIST_0][i + 1],
+                 iMoveSize * sizeof (PPicture)); //confirmed_safe_unsafe_usage
+      }
+      pRefPic->uiShortRefCount[LIST_0]--;
+      pRefPic->pShortRefList[LIST_0][pRefPic->uiShortRefCount[LIST_0]] = NULL;
+      break;
+    }
+  }
+  return pPic;
+}
+
+static PPicture WelsDelShortFromListSetUnref (PRefPic pRefPic, int32_t iFrameNum) {
+  PPicture pPic = WelsDelShortFromList (pRefPic, iFrameNum);
+  if (pPic) {
+    SetUnRef (pPic);
+  }
+  return pPic;
+}
+
+static PPicture WelsDelLongFromList (PRefPic pRefPic, uint32_t uiLongTermFrameIdx) {
+  PPicture pPic = NULL;
+  int32_t i = 0;
+  for (i = 0; i < pRefPic->uiLongRefCount[LIST_0]; i++) {
+    pPic = pRefPic->pLongRefList[LIST_0][i];
+    if (pPic->iLongTermFrameIdx == (int32_t)uiLongTermFrameIdx) {
+      int32_t iMoveSize = pRefPic->uiLongRefCount[LIST_0] - i - 1;
+      pPic->bUsedAsRef = false;
+      pPic->bIsLongRef = false;
+      if (iMoveSize > 0) {
+        memmove (&pRefPic->pLongRefList[LIST_0][i], &pRefPic->pLongRefList[LIST_0][i + 1],
+                 iMoveSize * sizeof (PPicture)); //confirmed_safe_unsafe_usage
+      }
+      pRefPic->uiLongRefCount[LIST_0]--;
+      pRefPic->pLongRefList[LIST_0][pRefPic->uiLongRefCount[LIST_0]] = NULL;
+      return pPic;
+    }
+  }
+  return NULL;
+}
+
+static PPicture WelsDelLongFromListSetUnref (PRefPic pRefPic, uint32_t uiLongTermFrameIdx) {
+  PPicture pPic = WelsDelLongFromList (pRefPic, uiLongTermFrameIdx);
+  if (pPic) {
+    SetUnRef (pPic);
+  }
+  return pPic;
+}
+
+static int32_t AddShortTermToList (PRefPic pRefPic, PPicture pPic) {
+  pPic->bUsedAsRef = true;
+  pPic->bIsLongRef = false;
+  pPic->iLongTermFrameIdx = -1;
+  if (pRefPic->uiShortRefCount[LIST_0] > 0) {
+    // Check the duplicate frame_num in short ref list
+    for (int32_t iPos = 0; iPos < pRefPic->uiShortRefCount[LIST_0]; iPos++) {
+      if (!pRefPic->pShortRefList[LIST_0][iPos]) {
+        return ERR_INFO_INVALID_PTR;
+      }
+      if (pPic->iFrameNum == pRefPic->pShortRefList[LIST_0][iPos]->iFrameNum) {
+        // Replace the previous ref pic with the new one with the same frame_num
+        pRefPic->pShortRefList[LIST_0][iPos] = pPic;
+        return ERR_INFO_DUPLICATE_FRAME_NUM;
+      }
+    }
+
+    memmove (&pRefPic->pShortRefList[LIST_0][1], &pRefPic->pShortRefList[LIST_0][0],
+             pRefPic->uiShortRefCount[LIST_0]*sizeof (PPicture));//confirmed_safe_unsafe_usage
+  }
+  pRefPic->pShortRefList[LIST_0][0] = pPic;
+  pRefPic->uiShortRefCount[LIST_0]++;
+  return ERR_NONE;
+}
+
+static int32_t AddLongTermToList (PRefPic pRefPic, PPicture pPic, int32_t iLongTermFrameIdx,
+                                  uint32_t uiLongTermPicNum) {
+  int32_t i = 0;
+
+  pPic->bUsedAsRef = true;
+  pPic->bIsLongRef = true;
+  pPic->iLongTermFrameIdx = iLongTermFrameIdx;
+  pPic->uiLongTermPicNum = uiLongTermPicNum;
+  if (pRefPic->uiLongRefCount[LIST_0] == 0) {
+    pRefPic->pLongRefList[LIST_0][pRefPic->uiLongRefCount[LIST_0]] = pPic;
+  } else {
+    for (i = 0; i < pRefPic->uiLongRefCount[LIST_0]; i++) {
+      if (!pRefPic->pLongRefList[LIST_0][i]) {
+        return ERR_INFO_INVALID_PTR;
+      }
+      if (pRefPic->pLongRefList[LIST_0][i]->iLongTermFrameIdx > pPic->iLongTermFrameIdx) {
+        break;
+      }
+    }
+    memmove (&pRefPic->pLongRefList[LIST_0][i + 1], &pRefPic->pLongRefList[LIST_0][i],
+             (pRefPic->uiLongRefCount[LIST_0] - i)*sizeof (PPicture)); //confirmed_safe_unsafe_usage
+    pRefPic->pLongRefList[LIST_0][i] = pPic;
+  }
+
+  pRefPic->uiLongRefCount[LIST_0]++;
+  return ERR_NONE;
+}
+
+static int32_t MarkAsLongTerm (PRefPic pRefPic, int32_t iFrameNum, int32_t iLongTermFrameIdx,
+                               uint32_t uiLongTermPicNum) {
+  PPicture pPic = NULL;
+  int32_t i = 0;
+  int32_t iRet = ERR_NONE;
+  WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
+
+  for (i = 0; i < pRefPic->uiRefCount[LIST_0]; i++) {
+    pPic = pRefPic->pRefList[LIST_0][i];
+    if (pPic->iFrameNum == iFrameNum && !pPic->bIsLongRef) {
+      iRet = AddLongTermToList (pRefPic, pPic, iLongTermFrameIdx, uiLongTermPicNum);
+      break;
+    }
+  }
+
+  return iRet;
+}
+
+#ifdef LONG_TERM_REF
+int32_t GetLTRFrameIndex (PRefPic pRefPic, int32_t iAncLTRFrameNum) {
+  int32_t iLTRFrameIndex = -1;
+  PPicture pPic;
+  for (int i = 0; i < pRefPic->uiLongRefCount[0]; ++i) {
+    pPic = pRefPic->pLongRefList[LIST_0][i];
+    if (pPic->iFrameNum == iAncLTRFrameNum) {
+      return (pPic->iLongTermFrameIdx);
+    }
+  }
+  return iLTRFrameIndex;
+}
+#endif
+
+static int32_t RemainOneBufferInDpbForEC (PWelsDecoderContext pCtx, PRefPic pRefPic) {
+  int32_t iRet = ERR_NONE;
+  if (pRefPic->uiShortRefCount[0] + pRefPic->uiLongRefCount[0] < pCtx->pSps->iNumRefFrames)
+    return iRet;
+
+  if (pRefPic->uiShortRefCount[0] > 0) {
+    iRet = SlidingWindow (pCtx, pRefPic);
+  } else { //all LTR, remove the smallest long_term_frame_idx
+    int32_t iLongTermFrameIdx = 0;
+    int32_t iMaxLongTermFrameIdx = pRefPic->iMaxLongTermFrameIdx;
+#ifdef LONG_TERM_REF
+    int32_t iCurrLTRFrameIdx = GetLTRFrameIndex (pRefPic, pCtx->iFrameNumOfAuMarkedLtr);
+#endif
+    while ((pRefPic->uiLongRefCount[0] >= pCtx->pSps->iNumRefFrames) && (iLongTermFrameIdx <= iMaxLongTermFrameIdx)) {
+#ifdef LONG_TERM_REF
+      if (iLongTermFrameIdx == iCurrLTRFrameIdx) {
+        iLongTermFrameIdx++;
+        continue;
+      }
+#endif
+      WelsDelLongFromListSetUnref (pRefPic, iLongTermFrameIdx);
+      iLongTermFrameIdx++;
+    }
+  }
+  if (pRefPic->uiShortRefCount[0] + pRefPic->uiLongRefCount[0] >=
+      pCtx->pSps->iNumRefFrames) { //fail to remain one empty buffer in DPB
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "RemainOneBufferInDpbForEC(): empty one DPB failed for EC!");
+    iRet = ERR_INFO_REF_COUNT_OVERFLOW;
+  }
+
+  return iRet;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/memmgr_nal_unit.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/memmgr_nal_unit.cpp
new file mode 100644
index 0000000000..c274b71a66
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/memmgr_nal_unit.cpp
@@ -0,0 +1,148 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  memmgr_nal_unit.c
+ *
+ *  Abstract
+ *      memory manager utils for NAL Unit list available
+ *
+ *  History
+ *      07/10/2008 Created
+ *
+ *****************************************************************************/
+#include "memmgr_nal_unit.h"
+#include "memory_align.h"
+#include "error_code.h"
+
+namespace WelsDec {
+
+int32_t MemInitNalList (PAccessUnit* ppAu, const uint32_t kuiSize, CMemoryAlign* pMa) {
+  uint32_t uiIdx = 0;
+  uint8_t* pBase = NULL, *pPtr = NULL;
+  const uint32_t kuiSizeAu = sizeof (SAccessUnit);
+  const uint32_t kuiSizeNalUnitPtr = kuiSize * sizeof (PNalUnit);
+  const uint32_t kuiSizeNalUnit = sizeof (SNalUnit);
+  const uint32_t kuiCountSize = (kuiSizeAu + kuiSizeNalUnitPtr + kuiSize * kuiSizeNalUnit) * sizeof (uint8_t);
+
+  if (kuiSize == 0)
+    return ERR_INFO_INVALID_PARAM;
+
+  if (*ppAu != NULL) {
+    MemFreeNalList (ppAu, pMa);
+  }
+
+  pBase = (uint8_t*)pMa->WelsMallocz (kuiCountSize, "Access Unit");
+  if (pBase == NULL)
+    return ERR_INFO_OUT_OF_MEMORY;
+  pPtr = pBase;
+  *ppAu = (PAccessUnit)pPtr;
+  pPtr += kuiSizeAu;
+  (*ppAu)->pNalUnitsList = (PNalUnit*)pPtr;
+  pPtr += kuiSizeNalUnitPtr;
+  do {
+    (*ppAu)->pNalUnitsList[uiIdx] = (PNalUnit)pPtr;
+    pPtr += kuiSizeNalUnit;
+    ++ uiIdx;
+  } while (uiIdx < kuiSize);
+
+  (*ppAu)->uiCountUnitsNum      = kuiSize;
+  (*ppAu)->uiAvailUnitsNum      = 0;
+  (*ppAu)->uiActualUnitsNum     = 0;
+  (*ppAu)->uiStartPos           = 0;
+  (*ppAu)->uiEndPos             = 0;
+  (*ppAu)->bCompletedAuFlag     = false;
+
+  return ERR_NONE;
+}
+
+int32_t MemFreeNalList (PAccessUnit* ppAu, CMemoryAlign* pMa) {
+  if (ppAu != NULL) {
+    PAccessUnit pAu = *ppAu;
+    if (pAu != NULL) {
+      pMa->WelsFree (pAu, "Access Unit");
+      *ppAu = NULL;
+    }
+  }
+  return ERR_NONE;
+}
+
+
+int32_t ExpandNalUnitList (PAccessUnit* ppAu, const int32_t kiOrgSize, const int32_t kiExpSize, CMemoryAlign* pMa) {
+  if (kiExpSize <= kiOrgSize)
+    return ERR_INFO_INVALID_PARAM;
+  else {
+    PAccessUnit pTmp = NULL;
+    int32_t iIdx = 0;
+    int32_t iRet = ERR_NONE;
+    if ((iRet = MemInitNalList (&pTmp, kiExpSize, pMa)) != ERR_NONE) // request new list with expanding
+      return iRet;
+
+    do {
+      memcpy (pTmp->pNalUnitsList[iIdx], (*ppAu)->pNalUnitsList[iIdx], sizeof (SNalUnit)); //confirmed_safe_unsafe_usage
+      ++ iIdx;
+    } while (iIdx < kiOrgSize);
+
+    pTmp->uiCountUnitsNum       = kiExpSize;
+    pTmp->uiAvailUnitsNum       = (*ppAu)->uiAvailUnitsNum;
+    pTmp->uiActualUnitsNum      = (*ppAu)->uiActualUnitsNum;
+    pTmp->uiEndPos              = (*ppAu)->uiEndPos;
+    pTmp->bCompletedAuFlag      = (*ppAu)->bCompletedAuFlag;
+
+    MemFreeNalList (ppAu, pMa); // free old list
+    *ppAu = pTmp;
+    return ERR_NONE;
+  }
+}
+
+/*
+ *  MemGetNextNal
+ *  Get next NAL Unit for using.
+ *  Need expand NAL Unit list if exceeding count number of available NAL Units withing an Access Unit
+ */
+PNalUnit MemGetNextNal (PAccessUnit* ppAu, CMemoryAlign* pMa) {
+  PAccessUnit pAu = *ppAu;
+  PNalUnit pNu = NULL;
+
+  if (pAu->uiAvailUnitsNum >= pAu->uiCountUnitsNum) { // need expand list
+    const uint32_t kuiExpandingSize = pAu->uiCountUnitsNum + (MAX_NAL_UNIT_NUM_IN_AU >> 1);
+    if (ExpandNalUnitList (ppAu, pAu->uiCountUnitsNum, kuiExpandingSize, pMa))
+      return NULL; // out of memory
+    pAu = *ppAu;
+  }
+
+  pNu = pAu->pNalUnitsList[pAu->uiAvailUnitsNum++]; // ready for next nal position
+
+  memset (pNu, 0, sizeof (SNalUnit)); // Please do not remove this for cache intend!!
+
+  return pNu;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/mv_pred.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/mv_pred.cpp
new file mode 100644
index 0000000000..642a982d91
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/mv_pred.cpp
@@ -0,0 +1,1183 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mv_pred.c
+ *
+ * \brief   Get MV predictor and update motion vector of mb cache
+ *
+ * \date    05/22/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "mv_pred.h"
+#include "ls_defines.h"
+#include "mb_cache.h"
+#include "parse_mb_syn_cabac.h"
+
+namespace WelsDec {
+
+static inline  void SetRectBlock (void* vp, int32_t w, const int32_t h, int32_t stride, const uint32_t val,
+                                  const int32_t size) {
+  uint8_t* p = (uint8_t*)vp;
+  w *= size;
+  if (w == 1 && h == 4) {
+    * (uint8_t*) (p + 0 * stride) =
+      * (uint8_t*) (p + 1 * stride) =
+        * (uint8_t*) (p + 2 * stride) =
+          * (uint8_t*) (p + 3 * stride) = (uint8_t)val;
+  } else if (w == 2 && h == 2) {
+    * (uint16_t*) (p + 0 * stride) =
+      * (uint16_t*) (p + 1 * stride) = size == 4 ? (uint16_t)val : (uint16_t) (val * 0x0101U);
+  } else if (w == 2 && h == 4) {
+    * (uint16_t*) (p + 0 * stride) =
+      * (uint16_t*) (p + 1 * stride) =
+        * (uint16_t*) (p + 2 * stride) =
+          * (uint16_t*) (p + 3 * stride) = size == 4 ? (uint16_t)val : (uint16_t) (val * 0x0101U);
+  } else if (w == 4 && h == 2) {
+    * (uint32_t*) (p + 0 * stride) =
+      * (uint32_t*) (p + 1 * stride) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 4 && h == 4) {
+    * (uint32_t*) (p + 0 * stride) =
+      * (uint32_t*) (p + 1 * stride) =
+        * (uint32_t*) (p + 2 * stride) =
+          * (uint32_t*) (p + 3 * stride) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 8 && h == 1) {
+    * (uint32_t*) (p + 0 * stride) =
+      * (uint32_t*) (p + 0 * stride + 4) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 8 && h == 2) {
+    * (uint32_t*) (p + 0 * stride) =
+      * (uint32_t*) (p + 0 * stride + 4) =
+        * (uint32_t*) (p + 1 * stride) =
+          * (uint32_t*) (p + 1 * stride + 4) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 8 && h == 4) {
+    * (uint32_t*) (p + 0 * stride) =
+      * (uint32_t*) (p + 0 * stride + 4) =
+        * (uint32_t*) (p + 1 * stride) =
+          * (uint32_t*) (p + 1 * stride + 4) =
+            * (uint32_t*) (p + 2 * stride) =
+              * (uint32_t*) (p + 2 * stride + 4) =
+                * (uint32_t*) (p + 3 * stride) =
+                  * (uint32_t*) (p + 3 * stride + 4) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 16 && h == 2) {
+    * (uint32_t*) (p + 0 * stride + 0) =
+      * (uint32_t*) (p + 0 * stride + 4) =
+        * (uint32_t*) (p + 0 * stride + 8) =
+          * (uint32_t*) (p + 0 * stride + 12) =
+            * (uint32_t*) (p + 1 * stride + 0) =
+              * (uint32_t*) (p + 1 * stride + 4) =
+                * (uint32_t*) (p + 1 * stride + 8) =
+                  * (uint32_t*) (p + 1 * stride + 12) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 16 && h == 3) {
+    * (uint32_t*) (p + 0 * stride + 0) =
+      * (uint32_t*) (p + 0 * stride + 4) =
+        * (uint32_t*) (p + 0 * stride + 8) =
+          * (uint32_t*) (p + 0 * stride + 12) =
+            * (uint32_t*) (p + 1 * stride + 0) =
+              * (uint32_t*) (p + 1 * stride + 4) =
+                * (uint32_t*) (p + 1 * stride + 8) =
+                  * (uint32_t*) (p + 1 * stride + 12) =
+                    * (uint32_t*) (p + 2 * stride + 0) =
+                      * (uint32_t*) (p + 2 * stride + 4) =
+                        * (uint32_t*) (p + 2 * stride + 8) =
+                          * (uint32_t*) (p + 2 * stride + 12) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  } else if (w == 16 && h == 4) {
+    * (uint32_t*) (p + 0 * stride + 0) =
+      * (uint32_t*) (p + 0 * stride + 4) =
+        * (uint32_t*) (p + 0 * stride + 8) =
+          * (uint32_t*) (p + 0 * stride + 12) =
+            * (uint32_t*) (p + 1 * stride + 0) =
+              * (uint32_t*) (p + 1 * stride + 4) =
+                * (uint32_t*) (p + 1 * stride + 8) =
+                  * (uint32_t*) (p + 1 * stride + 12) =
+                    * (uint32_t*) (p + 2 * stride + 0) =
+                      * (uint32_t*) (p + 2 * stride + 4) =
+                        * (uint32_t*) (p + 2 * stride + 8) =
+                          * (uint32_t*) (p + 2 * stride + 12) =
+                            * (uint32_t*) (p + 3 * stride + 0) =
+                              * (uint32_t*) (p + 3 * stride + 4) =
+                                * (uint32_t*) (p + 3 * stride + 8) =
+                                  * (uint32_t*) (p + 3 * stride + 12) = size == 4 ? val : (uint32_t) (val * 0x01010101UL);
+  }
+}
+void CopyRectBlock4Cols (void* vdst, void* vsrc, const int32_t stride_dst, const int32_t stride_src, int32_t w,
+                         const int32_t size) {
+  uint8_t* dst = (uint8_t*)vdst;
+  uint8_t* src = (uint8_t*)vsrc;
+  w *= size;
+  if (w == 1) {
+    dst[stride_dst * 0] = src[stride_src * 0];
+    dst[stride_dst * 1] = src[stride_src * 1];
+    dst[stride_dst * 2] = src[stride_src * 2];
+    dst[stride_dst * 3] = src[stride_src * 3];
+  } else if (w == 2) {
+    * (uint16_t*) (&dst[stride_dst * 0]) = * (uint16_t*) (&src[stride_src * 0]);
+    * (uint16_t*) (&dst[stride_dst * 1]) = * (uint16_t*) (&src[stride_src * 1]);
+    * (uint16_t*) (&dst[stride_dst * 2]) = * (uint16_t*) (&src[stride_src * 2]);
+    * (uint16_t*) (&dst[stride_dst * 3]) = * (uint16_t*) (&src[stride_src * 3]);
+  } else if (w == 4) {
+    * (uint32_t*) (&dst[stride_dst * 0]) = * (uint32_t*) (&src[stride_src * 0]);
+    * (uint32_t*) (&dst[stride_dst * 1]) = * (uint32_t*) (&src[stride_src * 1]);
+    * (uint32_t*) (&dst[stride_dst * 2]) = * (uint32_t*) (&src[stride_src * 2]);
+    * (uint32_t*) (&dst[stride_dst * 3]) = * (uint32_t*) (&src[stride_src * 3]);
+  } else if (w == 16) {
+    memcpy (&dst[stride_dst * 0], &src[stride_src * 0], 16);
+    memcpy (&dst[stride_dst * 1], &src[stride_src * 1], 16);
+    memcpy (&dst[stride_dst * 2], &src[stride_src * 2], 16);
+    memcpy (&dst[stride_dst * 3], &src[stride_src * 3], 16);
+  }
+}
+void PredPSkipMvFromNeighbor (PDqLayer pCurDqLayer, int16_t iMvp[2]) {
+  bool bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
+
+  int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
+  int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;
+  int32_t iCurX, iCurY, iCurXy, iLeftXy, iTopXy = 0, iLeftTopXy = 0, iRightTopXy = 0;
+
+  int8_t iLeftRef;
+  int8_t iTopRef;
+  int8_t iRightTopRef;
+  int8_t iLeftTopRef;
+  int8_t iDiagonalRef;
+  int8_t iMatchRef;
+  int16_t iMvA[2], iMvB[2], iMvC[2], iMvD[2];
+
+  iCurXy = pCurDqLayer->iMbXyIndex;
+  iCurX  = pCurDqLayer->iMbX;
+  iCurY  = pCurDqLayer->iMbY;
+  iCurSliceIdc = pCurDqLayer->pSliceIdc[iCurXy];
+
+  if (iCurX != 0) {
+    iLeftXy = iCurXy - 1;
+    iLeftSliceIdc = pCurDqLayer->pSliceIdc[iLeftXy];
+    bLeftAvail = (iLeftSliceIdc == iCurSliceIdc);
+  } else {
+    bLeftAvail = 0;
+    bLeftTopAvail = 0;
+  }
+
+  if (iCurY != 0) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+    iTopSliceIdc = pCurDqLayer->pSliceIdc[iTopXy];
+    bTopAvail = (iTopSliceIdc == iCurSliceIdc);
+    if (iCurX != 0) {
+      iLeftTopXy = iTopXy - 1;
+      iLeftTopSliceIdc = pCurDqLayer->pSliceIdc[iLeftTopXy];
+      bLeftTopAvail = (iLeftTopSliceIdc  == iCurSliceIdc);
+    } else {
+      bLeftTopAvail = 0;
+    }
+    if (iCurX != (pCurDqLayer->iMbWidth - 1)) {
+      iRightTopXy = iTopXy + 1;
+      iRightTopSliceIdc = pCurDqLayer->pSliceIdc[iRightTopXy];
+      bRightTopAvail = (iRightTopSliceIdc == iCurSliceIdc);
+    } else {
+      bRightTopAvail = 0;
+    }
+  } else {
+    bTopAvail = 0;
+    bLeftTopAvail = 0;
+    bRightTopAvail = 0;
+  }
+
+  iLeftType = ((iCurX != 0 && bLeftAvail) ? GetMbType (pCurDqLayer)[iLeftXy] : 0);
+  iTopType = ((iCurY != 0 && bTopAvail) ? GetMbType (pCurDqLayer)[iTopXy] : 0);
+  iLeftTopType = ((iCurX != 0 && iCurY != 0 && bLeftTopAvail)
+                  ? GetMbType (pCurDqLayer)[iLeftTopXy] : 0);
+  iRightTopType = ((iCurX != pCurDqLayer->iMbWidth - 1 && iCurY != 0 && bRightTopAvail)
+                   ? GetMbType (pCurDqLayer)[iRightTopXy] : 0);
+
+  /*get neb mv&iRefIdxArray*/
+  /*left*/
+  if (bLeftAvail && IS_INTER (iLeftType)) {
+    ST32 (iMvA, LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[0][iLeftXy][3] : pCurDqLayer->pMv[0][iLeftXy][3]));
+    iLeftRef = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[0][iLeftXy][3] : pCurDqLayer->pRefIndex[0][iLeftXy][3];
+  } else {
+    ST32 (iMvA, 0);
+    if (0 == bLeftAvail) { //not available
+      iLeftRef = REF_NOT_AVAIL;
+    } else { //available but is intra mb type
+      iLeftRef = REF_NOT_IN_LIST;
+    }
+  }
+  if (REF_NOT_AVAIL == iLeftRef ||
+      (0 == iLeftRef && 0 == * (int32_t*)iMvA)) {
+    ST32 (iMvp, 0);
+    return;
+  }
+
+  /*top*/
+  if (bTopAvail && IS_INTER (iTopType)) {
+    ST32 (iMvB, LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[0][iTopXy][12] : pCurDqLayer->pMv[0][iTopXy][12]));
+    iTopRef = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[0][iTopXy][12] : pCurDqLayer->pRefIndex[0][iTopXy][12];
+  } else {
+    ST32 (iMvB, 0);
+    if (0 == bTopAvail) { //not available
+      iTopRef = REF_NOT_AVAIL;
+    } else { //available but is intra mb type
+      iTopRef = REF_NOT_IN_LIST;
+    }
+  }
+  if (REF_NOT_AVAIL == iTopRef ||
+      (0 == iTopRef  && 0 == * (int32_t*)iMvB)) {
+    ST32 (iMvp, 0);
+    return;
+  }
+
+  /*right_top*/
+  if (bRightTopAvail && IS_INTER (iRightTopType)) {
+    ST32 (iMvC, LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[0][iRightTopXy][12] :
+                      pCurDqLayer->pMv[0][iRightTopXy][12]));
+    iRightTopRef = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[0][iRightTopXy][12] :
+                   pCurDqLayer->pRefIndex[0][iRightTopXy][12];
+  } else {
+    ST32 (iMvC, 0);
+    if (0 == bRightTopAvail) { //not available
+      iRightTopRef = REF_NOT_AVAIL;
+    } else { //available but is intra mb type
+      iRightTopRef = REF_NOT_IN_LIST;
+    }
+  }
+
+  /*left_top*/
+  if (bLeftTopAvail && IS_INTER (iLeftTopType)) {
+    ST32 (iMvD, LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[0][iLeftTopXy][15] : pCurDqLayer->pMv[0][iLeftTopXy][15]));
+    iLeftTopRef = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[0][iLeftTopXy][15] :
+                  pCurDqLayer->pRefIndex[0][iLeftTopXy][15];
+  } else {
+    ST32 (iMvD, 0);
+    if (0 == bLeftTopAvail) { //not available
+      iLeftTopRef = REF_NOT_AVAIL;
+    } else { //available but is intra mb type
+      iLeftTopRef = REF_NOT_IN_LIST;
+    }
+  }
+
+  iDiagonalRef = iRightTopRef;
+  if (REF_NOT_AVAIL == iDiagonalRef) {
+    iDiagonalRef = iLeftTopRef;
+    * (int32_t*)iMvC = * (int32_t*)iMvD;
+  }
+
+  if (REF_NOT_AVAIL == iTopRef && REF_NOT_AVAIL == iDiagonalRef && iLeftRef >= REF_NOT_IN_LIST) {
+    ST32 (iMvp, LD32 (iMvA));
+    return;
+  }
+
+  iMatchRef = (0 == iLeftRef) + (0 == iTopRef) + (0 == iDiagonalRef);
+  if (1 == iMatchRef) {
+    if (0 == iLeftRef) {
+      ST32 (iMvp, LD32 (iMvA));
+    } else if (0 == iTopRef) {
+      ST32 (iMvp, LD32 (iMvB));
+    } else {
+      ST32 (iMvp, LD32 (iMvC));
+    }
+  } else {
+    iMvp[0] = WelsMedian (iMvA[0], iMvB[0], iMvC[0]);
+    iMvp[1] = WelsMedian (iMvA[1], iMvB[1], iMvC[1]);
+  }
+}
+
+int32_t GetColocatedMb (PWelsDecoderContext pCtx, MbType& mbType, SubMbType& subMbType) {
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  uint32_t is8x8 = IS_Inter_8x8 (GetMbType (pCurDqLayer)[iMbXy]);
+  mbType = GetMbType (pCurDqLayer)[iMbXy];
+
+  PPicture colocPic = pCtx->sRefPic.pRefList[LIST_1][0];
+  if (GetThreadCount (pCtx) > 1) {
+    if (16 * pCurDqLayer->iMbY > pCtx->lastReadyHeightOffset[1][0]) {
+      if (colocPic->pReadyEvent[pCurDqLayer->iMbY].isSignaled != 1) {
+        WAIT_EVENT (&colocPic->pReadyEvent[pCurDqLayer->iMbY], WELS_DEC_THREAD_WAIT_INFINITE);
+      }
+      pCtx->lastReadyHeightOffset[1][0] = 16 * pCurDqLayer->iMbY;
+    }
+  }
+
+  if (colocPic == NULL) {
+    SLogContext* pLogCtx = & (pCtx->sLogCtx);
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "Colocated Ref Picture for B-Slice is lost, B-Slice decoding cannot be continued!");
+    return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+  }
+
+  MbType coloc_mbType = colocPic->pMbType[iMbXy];
+  if (coloc_mbType == MB_TYPE_SKIP) {
+    //This indicates the colocated MB is P SKIP MB
+    coloc_mbType |= MB_TYPE_16x16 | MB_TYPE_P0L0 | MB_TYPE_P1L0;
+  }
+  if (IS_Inter_8x8 (coloc_mbType) && !pCtx->pSps->bDirect8x8InferenceFlag) {
+    subMbType = SUB_MB_TYPE_4x4 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_DIRECT;
+    mbType |= MB_TYPE_8x8 | MB_TYPE_L0 | MB_TYPE_L1;
+  } else if (!is8x8 && (IS_INTER_16x16 (coloc_mbType) || IS_INTRA (coloc_mbType)/* || IS_SKIP(coloc_mbType)*/)) {
+    subMbType = SUB_MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_DIRECT;
+    mbType |= MB_TYPE_16x16 | MB_TYPE_L0 | MB_TYPE_L1;
+  } else {
+    subMbType = SUB_MB_TYPE_8x8 | MB_TYPE_P0L0 | MB_TYPE_P0L1 | MB_TYPE_DIRECT;
+    mbType |= MB_TYPE_8x8 | MB_TYPE_L0 | MB_TYPE_L1;
+  }
+
+  if (IS_INTRA (coloc_mbType)) {
+    SetRectBlock (pCurDqLayer->iColocIntra, 4, 4, 4 * sizeof (int8_t), 1, sizeof (int8_t));
+    return ERR_NONE;
+  }
+  SetRectBlock (pCurDqLayer->iColocIntra, 4, 4, 4 * sizeof (int8_t), 0, sizeof (int8_t));
+
+  if (IS_INTER_16x16 (mbType)) {
+    int16_t iMVZero[2] = { 0 };
+    int16_t* pMv = IS_TYPE_L1 (coloc_mbType) ? colocPic->pMv[LIST_1][iMbXy][0] : iMVZero;
+    ST32 (pCurDqLayer->iColocMv[LIST_0][0], LD32 (colocPic->pMv[LIST_0][iMbXy][0]));
+    ST32 (pCurDqLayer->iColocMv[LIST_1][0], LD32 (pMv));
+    pCurDqLayer->iColocRefIndex[LIST_0][0] = colocPic->pRefIndex[LIST_0][iMbXy][0];
+    pCurDqLayer->iColocRefIndex[LIST_1][0] = IS_TYPE_L1 (coloc_mbType) ? colocPic->pRefIndex[LIST_1][iMbXy][0] :
+        REF_NOT_IN_LIST;
+  } else {
+    if (!pCtx->pSps->bDirect8x8InferenceFlag) {
+      CopyRectBlock4Cols (pCurDqLayer->iColocMv[LIST_0], colocPic->pMv[LIST_0][iMbXy], 16, 16, 4, 4);
+      CopyRectBlock4Cols (pCurDqLayer->iColocRefIndex[LIST_0], colocPic->pRefIndex[LIST_0][iMbXy], 4, 4, 4, 1);
+      if (IS_TYPE_L1 (coloc_mbType)) {
+        CopyRectBlock4Cols (pCurDqLayer->iColocMv[LIST_1], colocPic->pMv[LIST_1][iMbXy], 16, 16, 4, 4);
+        CopyRectBlock4Cols (pCurDqLayer->iColocRefIndex[LIST_1], colocPic->pRefIndex[LIST_1][iMbXy], 4, 4, 4, 1);
+      } else { // only forward prediction
+        SetRectBlock (pCurDqLayer->iColocRefIndex[LIST_1], 4, 4, 4, (uint8_t)REF_NOT_IN_LIST, 1);
+      }
+    } else {
+      for (int32_t listIdx = 0; listIdx < 1 + !! (coloc_mbType & MB_TYPE_L1); listIdx++) {
+        SetRectBlock (pCurDqLayer->iColocMv[listIdx][0], 2, 2, 16, LD32 (colocPic->pMv[listIdx][iMbXy][0]), 4);
+        SetRectBlock (pCurDqLayer->iColocMv[listIdx][2], 2, 2, 16, LD32 (colocPic->pMv[listIdx][iMbXy][3]), 4);
+        SetRectBlock (pCurDqLayer->iColocMv[listIdx][8], 2, 2, 16, LD32 (colocPic->pMv[listIdx][iMbXy][12]), 4);
+        SetRectBlock (pCurDqLayer->iColocMv[listIdx][10], 2, 2, 16, LD32 (colocPic->pMv[listIdx][iMbXy][15]), 4);
+
+        SetRectBlock (&pCurDqLayer->iColocRefIndex[listIdx][0], 2, 2, 4, colocPic->pRefIndex[listIdx][iMbXy][0], 1);
+        SetRectBlock (&pCurDqLayer->iColocRefIndex[listIdx][2], 2, 2, 4, colocPic->pRefIndex[listIdx][iMbXy][3], 1);
+        SetRectBlock (&pCurDqLayer->iColocRefIndex[listIdx][8], 2, 2, 4, colocPic->pRefIndex[listIdx][iMbXy][12], 1);
+        SetRectBlock (&pCurDqLayer->iColocRefIndex[listIdx][10], 2, 2, 4, colocPic->pRefIndex[listIdx][iMbXy][15], 1);
+      }
+      if (! (coloc_mbType & MB_TYPE_L1)) // only forward prediction
+        SetRectBlock (&pCurDqLayer->iColocRefIndex[1][0], 4, 4, 4, (uint8_t)REF_NOT_IN_LIST, 1);
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t PredMvBDirectSpatial (PWelsDecoderContext pCtx, int16_t iMvp[LIST_A][2], int8_t ref[LIST_A],
+                              SubMbType& subMbType) {
+
+  int32_t ret = ERR_NONE;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  bool bSkipOrDirect = (IS_SKIP (GetMbType (pCurDqLayer)[iMbXy]) | IS_DIRECT (GetMbType (pCurDqLayer)[iMbXy])) > 0;
+
+  MbType mbType;
+  ret = GetColocatedMb (pCtx, mbType, subMbType);
+  if (ret != ERR_NONE) {
+    return ret;
+  }
+
+  bool bTopAvail, bLeftTopAvail, bRightTopAvail, bLeftAvail;
+  int32_t iLeftTopType, iRightTopType, iTopType, iLeftType;
+  int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
+  int32_t iCurX, iCurY, iCurXy, iLeftXy = 0, iTopXy = 0, iLeftTopXy = 0, iRightTopXy = 0;
+
+  int8_t iLeftRef[LIST_A];
+  int8_t iTopRef[LIST_A];
+  int8_t iRightTopRef[LIST_A];
+  int8_t iLeftTopRef[LIST_A];
+  int8_t iDiagonalRef[LIST_A];
+  int16_t iMvA[LIST_A][2], iMvB[LIST_A][2], iMvC[LIST_A][2], iMvD[LIST_A][2];
+
+  iCurXy = pCurDqLayer->iMbXyIndex;
+
+  iCurX = pCurDqLayer->iMbX;
+  iCurY = pCurDqLayer->iMbY;
+  iCurSliceIdc = pCurDqLayer->pSliceIdc[iCurXy];
+
+  if (iCurX != 0) {
+    iLeftXy = iCurXy - 1;
+    iLeftSliceIdc = pCurDqLayer->pSliceIdc[iLeftXy];
+    bLeftAvail = (iLeftSliceIdc == iCurSliceIdc);
+  } else {
+    bLeftAvail = 0;
+    bLeftTopAvail = 0;
+  }
+
+  if (iCurY != 0) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+    iTopSliceIdc = pCurDqLayer->pSliceIdc[iTopXy];
+    bTopAvail = (iTopSliceIdc == iCurSliceIdc);
+    if (iCurX != 0) {
+      iLeftTopXy = iTopXy - 1;
+      iLeftTopSliceIdc = pCurDqLayer->pSliceIdc[iLeftTopXy];
+      bLeftTopAvail = (iLeftTopSliceIdc == iCurSliceIdc);
+    } else {
+      bLeftTopAvail = 0;
+    }
+    if (iCurX != (pCurDqLayer->iMbWidth - 1)) {
+      iRightTopXy = iTopXy + 1;
+      iRightTopSliceIdc = pCurDqLayer->pSliceIdc[iRightTopXy];
+      bRightTopAvail = (iRightTopSliceIdc == iCurSliceIdc);
+    } else {
+      bRightTopAvail = 0;
+    }
+  } else {
+    bTopAvail = 0;
+    bLeftTopAvail = 0;
+    bRightTopAvail = 0;
+  }
+
+  iLeftType = ((iCurX != 0 && bLeftAvail) ? GetMbType (pCurDqLayer)[iLeftXy] : 0);
+  iTopType = ((iCurY != 0 && bTopAvail) ? GetMbType (pCurDqLayer)[iTopXy] : 0);
+  iLeftTopType = ((iCurX != 0 && iCurY != 0 && bLeftTopAvail)
+                  ? GetMbType (pCurDqLayer)[iLeftTopXy] : 0);
+  iRightTopType = ((iCurX != pCurDqLayer->iMbWidth - 1 && iCurY != 0 && bRightTopAvail)
+                   ? GetMbType (pCurDqLayer)[iRightTopXy] : 0);
+
+  /*get neb mv&iRefIdxArray*/
+  for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+
+    /*left*/
+    if (bLeftAvail && IS_INTER (iLeftType)) {
+      ST32 (iMvA[listIdx], LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[listIdx][iLeftXy][3] :
+                                 pCurDqLayer->pMv[listIdx][iLeftXy][3]));
+      iLeftRef[listIdx] = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][3] :
+                          pCurDqLayer->pRefIndex[listIdx][iLeftXy][3];
+    } else {
+      ST32 (iMvA[listIdx], 0);
+      if (0 == bLeftAvail) { //not available
+        iLeftRef[listIdx] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iLeftRef[listIdx] = REF_NOT_IN_LIST;
+      }
+    }
+
+    /*top*/
+    if (bTopAvail && IS_INTER (iTopType)) {
+      ST32 (iMvB[listIdx], LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[listIdx][iTopXy][12] :
+                                 pCurDqLayer->pMv[listIdx][iTopXy][12]));
+      iTopRef[listIdx] = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[listIdx][iTopXy][12] :
+                         pCurDqLayer->pRefIndex[listIdx][iTopXy][12];
+    } else {
+      ST32 (iMvB[listIdx], 0);
+      if (0 == bTopAvail) { //not available
+        iTopRef[listIdx] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iTopRef[listIdx] = REF_NOT_IN_LIST;
+      }
+    }
+
+    /*right_top*/
+    if (bRightTopAvail && IS_INTER (iRightTopType)) {
+      ST32 (iMvC[listIdx], LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[listIdx][iRightTopXy][12] :
+                                 pCurDqLayer->pMv[listIdx][iRightTopXy][12]));
+      iRightTopRef[listIdx] = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[listIdx][iRightTopXy][12] :
+                              pCurDqLayer->pRefIndex[listIdx][iRightTopXy][12];
+    } else {
+      ST32 (iMvC[listIdx], 0);
+      if (0 == bRightTopAvail) { //not available
+        iRightTopRef[listIdx] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRightTopRef[listIdx] = REF_NOT_IN_LIST;
+      }
+    }
+    /*left_top*/
+    if (bLeftTopAvail && IS_INTER (iLeftTopType)) {
+      ST32 (iMvD[listIdx], LD32 (pCurDqLayer->pDec ? pCurDqLayer->pDec->pMv[listIdx][iLeftTopXy][15] :
+                                 pCurDqLayer->pMv[listIdx][iLeftTopXy][15]));
+      iLeftTopRef[listIdx] = pCurDqLayer->pDec ? pCurDqLayer->pDec->pRefIndex[listIdx][iLeftTopXy][15] :
+                             pCurDqLayer->pRefIndex[listIdx][iLeftTopXy][15];
+    } else {
+      ST32 (iMvD[listIdx], 0);
+      if (0 == bLeftTopAvail) { //not available
+        iLeftTopRef[listIdx] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iLeftTopRef[listIdx] = REF_NOT_IN_LIST;
+      }
+    }
+
+    iDiagonalRef[listIdx] = iRightTopRef[listIdx];
+    if (REF_NOT_AVAIL == iDiagonalRef[listIdx]) {
+      iDiagonalRef[listIdx] = iLeftTopRef[listIdx];
+      ST32 (iMvC[listIdx], LD32 (iMvD[listIdx]));
+    }
+
+    int8_t ref_temp = WELS_MIN_POSITIVE (iTopRef[listIdx], iDiagonalRef[listIdx]);
+    ref[listIdx] = WELS_MIN_POSITIVE (iLeftRef[listIdx], ref_temp);
+    if (ref[listIdx] >= 0) {
+
+      uint32_t match_count = (iLeftRef[listIdx] == ref[listIdx]) + (iTopRef[listIdx] == ref[listIdx]) +
+                             (iDiagonalRef[listIdx] == ref[listIdx]);
+      if (match_count == 1) {
+        if (iLeftRef[listIdx] == ref[listIdx]) {
+          ST32 (iMvp[listIdx], LD32 (iMvA[listIdx]));
+        } else if (iTopRef[listIdx] == ref[listIdx]) {
+          ST32 (iMvp[listIdx], LD32 (iMvB[listIdx]));
+        } else {
+          ST32 (iMvp[listIdx], LD32 (iMvC[listIdx]));
+        }
+      } else {
+        iMvp[listIdx][0] = WelsMedian (iMvA[listIdx][0], iMvB[listIdx][0], iMvC[listIdx][0]);
+        iMvp[listIdx][1] = WelsMedian (iMvA[listIdx][1], iMvB[listIdx][1], iMvC[listIdx][1]);
+      }
+    } else {
+      iMvp[listIdx][0] = 0;
+      iMvp[listIdx][1] = 0;
+      ref[listIdx] = REF_NOT_IN_LIST;
+    }
+  }
+  if (ref[LIST_0] <= REF_NOT_IN_LIST && ref[LIST_1] <= REF_NOT_IN_LIST) {
+    ref[LIST_0] = ref[LIST_1] = 0;
+  } else if (ref[LIST_1] < 0) {
+    mbType &= ~MB_TYPE_L1;
+    subMbType &= ~MB_TYPE_L1;
+  } else if (ref[LIST_0] < 0) {
+    mbType &= ~MB_TYPE_L0;
+    subMbType &= ~MB_TYPE_L0;
+  }
+  GetMbType (pCurDqLayer)[iMbXy] = mbType;
+
+  int16_t pMvd[4] = { 0 };
+
+  bool bIsLongRef = pCtx->sRefPic.pRefList[LIST_1][0]->bIsLongRef;
+
+  if (IS_INTER_16x16 (mbType)) {
+    if ((* (int32_t*)iMvp[LIST_0] | * (int32_t*)iMvp[LIST_1])) {
+      if (0 == pCurDqLayer->iColocIntra[0] && !bIsLongRef
+          && ((pCurDqLayer->iColocRefIndex[LIST_0][0] == 0 && (unsigned) (pCurDqLayer->iColocMv[LIST_0][0][0] + 1) <= 2
+               && (unsigned) (pCurDqLayer->iColocMv[LIST_0][0][1] + 1) <= 2)
+              || (pCurDqLayer->iColocRefIndex[LIST_0][0] < 0 && pCurDqLayer->iColocRefIndex[LIST_1][0] == 0
+                  && (unsigned) (pCurDqLayer->iColocMv[LIST_1][0][0] + 1) <= 2
+                  && (unsigned) (pCurDqLayer->iColocMv[LIST_1][0][1] + 1) <= 2))) {
+        if (0 >= ref[0])  * (uint32_t*)iMvp[LIST_0] = 0;
+        if (0 >= ref[1])  * (uint32_t*)iMvp[LIST_1] = 0;
+      }
+    }
+    UpdateP16x16DirectCabac (pCurDqLayer);
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      UpdateP16x16MotionInfo (pCurDqLayer, listIdx, ref[listIdx], iMvp[listIdx]);
+      UpdateP16x16MvdCabac (pCurDqLayer, pMvd, listIdx);
+    }
+  } else {
+    if (bSkipOrDirect) {
+      int8_t pSubPartCount[4], pPartW[4];
+      for (int32_t i = 0; i < 4; i++) { //Direct 8x8 Ref and mv
+        int16_t iIdx8 = i << 2;
+        pCurDqLayer->pSubMbType[iMbXy][i] = subMbType;
+        int8_t pRefIndex[LIST_A][30];
+        UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, ref[LIST_0], LIST_0);
+        UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, ref[LIST_1], LIST_1);
+        UpdateP8x8DirectCabac (pCurDqLayer, iIdx8);
+
+        pSubPartCount[i] = g_ksInterBSubMbTypeInfo[0].iPartCount;
+        pPartW[i] = g_ksInterBSubMbTypeInfo[0].iPartWidth;
+
+        if (IS_SUB_4x4 (subMbType)) {
+          pSubPartCount[i] = 4;
+          pPartW[i] = 1;
+        }
+        FillSpatialDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], subMbType, bIsLongRef, iMvp, ref, NULL, NULL);
+      }
+    }
+  }
+  return ret;
+}
+
+int32_t PredBDirectTemporal (PWelsDecoderContext pCtx, int16_t iMvp[LIST_A][2], int8_t ref[LIST_A],
+                             SubMbType& subMbType) {
+  int32_t ret = ERR_NONE;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  bool bSkipOrDirect = (IS_SKIP (GetMbType (pCurDqLayer)[iMbXy]) | IS_DIRECT (GetMbType (pCurDqLayer)[iMbXy])) > 0;
+
+  MbType mbType;
+  ret = GetColocatedMb (pCtx, mbType, subMbType);
+  if (ret != ERR_NONE) {
+    return ret;
+  }
+
+  GetMbType (pCurDqLayer)[iMbXy] = mbType;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  int16_t pMvd[4] = { 0 };
+  const int32_t ref0Count = WELS_MIN (pSliceHeader->uiRefCount[LIST_0], pCtx->sRefPic.uiRefCount[LIST_0]);
+  if (IS_INTER_16x16 (mbType)) {
+    ref[LIST_0] = 0;
+    ref[LIST_1] = 0;
+    UpdateP16x16DirectCabac (pCurDqLayer);
+    UpdateP16x16RefIdx (pCurDqLayer, LIST_1, ref[LIST_1]);
+    ST64 (iMvp,  0);
+    if (pCurDqLayer->iColocIntra[0]) {
+      UpdateP16x16MotionOnly (pCurDqLayer, LIST_0, iMvp[LIST_0]);
+      UpdateP16x16MotionOnly (pCurDqLayer, LIST_1, iMvp[LIST_1]);
+      UpdateP16x16RefIdx (pCurDqLayer, LIST_0, ref[LIST_0]);
+    } else {
+      ref[LIST_0] = 0;
+      int16_t* mv = pCurDqLayer->iColocMv[LIST_0][0];
+      int8_t colocRefIndexL0 = pCurDqLayer->iColocRefIndex[LIST_0][0];
+      if (colocRefIndexL0 >= 0) {
+        ref[LIST_0] = MapColToList0 (pCtx, colocRefIndexL0, ref0Count);
+      } else {
+        mv = pCurDqLayer->iColocMv[LIST_1][0];
+      }
+      UpdateP16x16RefIdx (pCurDqLayer, LIST_0, ref[LIST_0]);
+
+      iMvp[LIST_0][0] = (pSlice->iMvScale[LIST_0][ref[LIST_0]] * mv[0] + 128) >> 8;
+      iMvp[LIST_0][1] = (pSlice->iMvScale[LIST_0][ref[LIST_0]] * mv[1] + 128) >> 8;
+      UpdateP16x16MotionOnly (pCurDqLayer, LIST_0, iMvp[LIST_0]);
+      iMvp[LIST_1][0] = iMvp[LIST_0][0] - mv[0];
+      iMvp[LIST_1][1] = iMvp[LIST_0][1] - mv[1];
+      UpdateP16x16MotionOnly (pCurDqLayer, LIST_1, iMvp[LIST_1]);
+    }
+    UpdateP16x16MvdCabac (pCurDqLayer, pMvd, LIST_0);
+    UpdateP16x16MvdCabac (pCurDqLayer, pMvd, LIST_1);
+  } else {
+    if (bSkipOrDirect) {
+      int8_t pSubPartCount[4], pPartW[4];
+      int8_t pRefIndex[LIST_A][30];
+      for (int32_t i = 0; i < 4; i++) {
+        int16_t iIdx8 = i << 2;
+        const uint8_t iScan4Idx = g_kuiScan4[iIdx8];
+        pCurDqLayer->pSubMbType[iMbXy][i] = subMbType;
+
+        int16_t (*mvColoc)[2] = pCurDqLayer->iColocMv[LIST_0];
+
+        ref[LIST_1] = 0;
+        UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, ref[LIST_1], LIST_1);
+        if (pCurDqLayer->iColocIntra[iScan4Idx]) {
+          ref[LIST_0] = 0;
+          UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, ref[LIST_0], LIST_0);
+          ST64 (iMvp, 0);
+        } else {
+          ref[LIST_0] = 0;
+          int8_t colocRefIndexL0 = pCurDqLayer->iColocRefIndex[LIST_0][iScan4Idx];
+          if (colocRefIndexL0 >= 0) {
+            ref[LIST_0] = MapColToList0 (pCtx, colocRefIndexL0, ref0Count);
+          } else {
+            mvColoc = pCurDqLayer->iColocMv[LIST_1];
+          }
+          UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, ref[LIST_0], LIST_0);
+        }
+        UpdateP8x8DirectCabac (pCurDqLayer, iIdx8);
+
+        pSubPartCount[i] = g_ksInterBSubMbTypeInfo[0].iPartCount;
+        pPartW[i] = g_ksInterBSubMbTypeInfo[0].iPartWidth;
+
+        if (IS_SUB_4x4 (subMbType)) {
+          pSubPartCount[i] = 4;
+          pPartW[i] = 1;
+        }
+        FillTemporalDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], subMbType, ref, mvColoc, NULL, NULL);
+      }
+    }
+  }
+  return ret;
+}
+
+//basic iMVs prediction unit for iMVs partition width (4, 2, 1)
+void PredMv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+             int32_t listIdx, int32_t iPartIdx, int32_t iPartWidth, int8_t iRef, int16_t iMVP[2]) {
+  const uint8_t kuiLeftIdx      = g_kuiCache30ScanIdx[iPartIdx] - 1;
+  const uint8_t kuiTopIdx       = g_kuiCache30ScanIdx[iPartIdx] - 6;
+  const uint8_t kuiRightTopIdx  = kuiTopIdx + iPartWidth;
+  const uint8_t kuiLeftTopIdx   = kuiTopIdx - 1;
+
+  const int8_t kiLeftRef      = iRefIndex[listIdx][kuiLeftIdx];
+  const int8_t kiTopRef       = iRefIndex[listIdx][ kuiTopIdx];
+  const int8_t kiRightTopRef  = iRefIndex[listIdx][kuiRightTopIdx];
+  const int8_t kiLeftTopRef   = iRefIndex[listIdx][ kuiLeftTopIdx];
+  int8_t iDiagonalRef  = kiRightTopRef;
+
+  int8_t iMatchRef = 0;
+
+
+  int16_t iAMV[2], iBMV[2], iCMV[2];
+
+  ST32 (iAMV, LD32 (iMotionVector[listIdx][     kuiLeftIdx]));
+  ST32 (iBMV, LD32 (iMotionVector[listIdx][      kuiTopIdx]));
+  ST32 (iCMV, LD32 (iMotionVector[listIdx][kuiRightTopIdx]));
+
+  if (REF_NOT_AVAIL == iDiagonalRef) {
+    iDiagonalRef = kiLeftTopRef;
+    ST32 (iCMV, LD32 (iMotionVector[listIdx][kuiLeftTopIdx]));
+  }
+
+  iMatchRef = (iRef == kiLeftRef) + (iRef == kiTopRef) + (iRef == iDiagonalRef);
+
+  if (REF_NOT_AVAIL == kiTopRef && REF_NOT_AVAIL == iDiagonalRef && kiLeftRef >= REF_NOT_IN_LIST) {
+    ST32 (iMVP, LD32 (iAMV));
+    return;
+  }
+
+  if (1 == iMatchRef) {
+    if (iRef == kiLeftRef) {
+      ST32 (iMVP, LD32 (iAMV));
+    } else if (iRef == kiTopRef) {
+      ST32 (iMVP, LD32 (iBMV));
+    } else {
+      ST32 (iMVP, LD32 (iCMV));
+    }
+  } else {
+    iMVP[0] = WelsMedian (iAMV[0], iBMV[0], iCMV[0]);
+    iMVP[1] = WelsMedian (iAMV[1], iBMV[1], iCMV[1]);
+  }
+}
+void PredInter8x16Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+                      int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]) {
+  if (0 == iPartIdx) {
+    const int8_t kiLeftRef = iRefIndex[listIdx][6];
+    if (iRef == kiLeftRef) {
+      ST32 (iMVP, LD32 (&iMotionVector[listIdx][6][0]));
+      return;
+    }
+  } else { // 1 == iPartIdx
+    int8_t iDiagonalRef = iRefIndex[listIdx][5]; //top-right
+    int8_t index = 5;
+    if (REF_NOT_AVAIL == iDiagonalRef) {
+      iDiagonalRef = iRefIndex[listIdx][2]; //top-left for 8*8 block(index 1)
+      index = 2;
+    }
+    if (iRef == iDiagonalRef) {
+      ST32 (iMVP, LD32 (&iMotionVector[listIdx][index][0]));
+      return;
+    }
+  }
+
+  PredMv (iMotionVector, iRefIndex, listIdx, iPartIdx, 2, iRef, iMVP);
+}
+void PredInter16x8Mv (int16_t iMotionVector[LIST_A][30][MV_A], int8_t iRefIndex[LIST_A][30],
+                      int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVP[2]) {
+  if (0 == iPartIdx) {
+    const int8_t kiTopRef = iRefIndex[listIdx][1];
+    if (iRef == kiTopRef) {
+      ST32 (iMVP, LD32 (&iMotionVector[listIdx][1][0]));
+      return;
+    }
+  } else { // 8 == iPartIdx
+    const int8_t kiLeftRef = iRefIndex[listIdx][18];
+    if (iRef == kiLeftRef) {
+      ST32 (iMVP, LD32 (&iMotionVector[listIdx][18][0]));
+      return;
+    }
+  }
+
+  PredMv (iMotionVector, iRefIndex, listIdx, iPartIdx, 4, iRef, iMVP);
+}
+
+//update iMVs and iRefIndex cache for current MB, only for P_16*16 (SKIP inclusive)
+/* can be further optimized */
+void UpdateP16x16MotionInfo (PDqLayer pCurDqLayer, int32_t listIdx, int8_t iRef, int16_t iMVs[2]) {
+  const int16_t kiRef2 = ((uint8_t)iRef << 8) | (uint8_t)iRef;
+  const int32_t kiMV32 = LD32 (iMVs);
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  for (i = 0; i < 16; i += 4) {
+    //mb
+    const uint8_t kuiScan4Idx = g_kuiScan4[i];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+    if (pCurDqLayer->pDec != NULL) {
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    } else {
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    }
+  }
+}
+
+//update iRefIndex cache for current MB, only for P_16*16 (SKIP inclusive)
+/* can be further optimized */
+void UpdateP16x16RefIdx (PDqLayer pCurDqLayer, int32_t listIdx, int8_t iRef) {
+  const int16_t kiRef2 = ((uint8_t)iRef << 8) | (uint8_t)iRef;
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  for (i = 0; i < 16; i += 4) {
+    //mb
+    const uint8_t kuiScan4Idx = g_kuiScan4[i];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+
+    ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+    ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+  }
+}
+
+//update iMVs only cache for current MB, only for P_16*16 (SKIP inclusive)
+/* can be further optimized */
+void UpdateP16x16MotionOnly (PDqLayer pCurDqLayer, int32_t listIdx, int16_t iMVs[2]) {
+  const int32_t kiMV32 = LD32 (iMVs);
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  for (i = 0; i < 16; i += 4) {
+    //mb
+    const uint8_t kuiScan4Idx = g_kuiScan4[i];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+    if (pCurDqLayer->pDec != NULL) {
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    } else {
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    }
+  }
+}
+
+//update iRefIndex and iMVs of Mb, only for P16x8
+/*need further optimization, mb_cache not work */
+void UpdateP16x8MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+                            int8_t iRefIndex[LIST_A][30],
+                            int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]) {
+  const int16_t kiRef2 = ((uint8_t)iRef << 8) | (uint8_t)iRef;
+  const int32_t kiMV32 = LD32 (iMVs);
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  for (i = 0; i < 2; i++, iPartIdx += 4) {
+    const uint8_t kuiScan4Idx      = g_kuiScan4[iPartIdx];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+    const uint8_t kuiCacheIdx      = g_kuiCache30ScanIdx[iPartIdx];
+    const uint8_t kuiCacheIdxPlus6 = 6 + kuiCacheIdx;
+
+    //mb
+    if (pCurDqLayer->pDec != NULL) {
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    } else {
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    }
+    //cache
+    ST16 (&iRefIndex[listIdx][kuiCacheIdx ], kiRef2);
+    ST16 (&iRefIndex[listIdx][kuiCacheIdxPlus6], kiRef2);
+    ST32 (iMotionVector[listIdx][  kuiCacheIdx ], kiMV32);
+    ST32 (iMotionVector[listIdx][1 + kuiCacheIdx ], kiMV32);
+    ST32 (iMotionVector[listIdx][  kuiCacheIdxPlus6], kiMV32);
+    ST32 (iMotionVector[listIdx][1 + kuiCacheIdxPlus6], kiMV32);
+  }
+}
+//update iRefIndex and iMVs of both Mb and Mb_cache, only for P8x16
+void UpdateP8x16MotionInfo (PDqLayer pCurDqLayer, int16_t iMotionVector[LIST_A][30][MV_A],
+                            int8_t iRefIndex[LIST_A][30],
+                            int32_t listIdx, int32_t iPartIdx, int8_t iRef, int16_t iMVs[2]) {
+  const int16_t kiRef2 = ((uint8_t)iRef << 8) | (uint8_t)iRef;
+  const int32_t kiMV32 = LD32 (iMVs);
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  for (i = 0; i < 2; i++, iPartIdx += 8) {
+    const uint8_t kuiScan4Idx = g_kuiScan4[iPartIdx];
+    const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+    const uint8_t kuiCacheIdxPlus6 = 6 + kuiCacheIdx;
+
+    //mb
+    if (pCurDqLayer->pDec != NULL) {
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    } else {
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4Idx], kiRef2);
+      ST16 (&pCurDqLayer->pRefIndex[listIdx][iMbXy][kuiScan4IdxPlus4], kiRef2);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4Idx], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][kuiScan4IdxPlus4], kiMV32);
+      ST32 (pCurDqLayer->pMv[listIdx][iMbXy][1 + kuiScan4IdxPlus4], kiMV32);
+    }
+    //cache
+    ST16 (&iRefIndex[listIdx][kuiCacheIdx ], kiRef2);
+    ST16 (&iRefIndex[listIdx][kuiCacheIdxPlus6], kiRef2);
+    ST32 (iMotionVector[listIdx][  kuiCacheIdx ], kiMV32);
+    ST32 (iMotionVector[listIdx][1 + kuiCacheIdx ], kiMV32);
+    ST32 (iMotionVector[listIdx][  kuiCacheIdxPlus6], kiMV32);
+    ST32 (iMotionVector[listIdx][1 + kuiCacheIdxPlus6], kiMV32);
+  }
+}
+
+void FillSpatialDirect8x8Mv (PDqLayer pCurDqLayer, const int16_t& iIdx8, const int8_t& iPartCount, const int8_t& iPartW,
+                             const SubMbType& subMbType, const bool& bIsLongRef, int16_t pMvDirect[LIST_A][2], int8_t iRef[LIST_A],
+                             int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A]) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  for (int32_t j = 0; j < iPartCount; j++) {
+    int8_t iPartIdx = iIdx8 + j * iPartW;
+    uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+    uint8_t iColocIdx = g_kuiScan4[iPartIdx];
+    uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+    int16_t pMV[4] = { 0 };
+    if (IS_SUB_8x8 (subMbType)) {
+      * (uint32_t*)pMV = * (uint32_t*)pMvDirect[LIST_0];
+      ST32 ((pMV + 2), LD32 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], LD64 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx + 4], LD64 (pMV));
+      ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+      ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx + 4], 0);
+      if (pMotionVector != NULL) {
+        ST64 (pMotionVector[LIST_0][iCacheIdx], LD64 (pMV));
+        ST64 (pMotionVector[LIST_0][iCacheIdx + 6], LD64 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST64 (pMvdCache[LIST_0][iCacheIdx], 0);
+        ST64 (pMvdCache[LIST_0][iCacheIdx + 6], 0);
+      }
+      * (uint32_t*)pMV = * (uint32_t*)pMvDirect[LIST_1];
+      ST32 ((pMV + 2), LD32 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], LD64 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx + 4], LD64 (pMV));
+      ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+      ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx + 4], 0);
+      if (pMotionVector != NULL) {
+        ST64 (pMotionVector[LIST_1][iCacheIdx], LD64 (pMV));
+        ST64 (pMotionVector[LIST_1][iCacheIdx + 6], LD64 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST64 (pMvdCache[LIST_1][iCacheIdx], 0);
+        ST64 (pMvdCache[LIST_1][iCacheIdx + 6], 0);
+      }
+    } else { //SUB_4x4
+      * (uint32_t*)pMV = * (uint32_t*)pMvDirect[LIST_0];
+      ST32 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], LD32 (pMV));
+      ST32 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+      if (pMotionVector != NULL) {
+        ST32 (pMotionVector[LIST_0][iCacheIdx], LD32 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST32 (pMvdCache[LIST_0][iCacheIdx], 0);
+      }
+      * (uint32_t*)pMV = * (uint32_t*)pMvDirect[LIST_1];
+      ST32 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], LD32 (pMV));
+      ST32 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+      if (pMotionVector != NULL) {
+        ST32 (pMotionVector[LIST_1][iCacheIdx], LD32 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST32 (pMvdCache[LIST_1][iCacheIdx], 0);
+      }
+    }
+    if ((* (int32_t*)pMvDirect[LIST_0] | * (int32_t*)pMvDirect[LIST_1])) {
+      uint32_t uiColZeroFlag = (0 == pCurDqLayer->iColocIntra[iColocIdx]) && !bIsLongRef &&
+                               (pCurDqLayer->iColocRefIndex[LIST_0][iColocIdx] == 0 || (pCurDqLayer->iColocRefIndex[LIST_0][iColocIdx] < 0
+                                   && pCurDqLayer->iColocRefIndex[LIST_1][iColocIdx] == 0));
+      const int16_t (*mvColoc)[2] = 0 == pCurDqLayer->iColocRefIndex[LIST_0][iColocIdx] ? pCurDqLayer->iColocMv[LIST_0] :
+                                    pCurDqLayer->iColocMv[LIST_1];
+      const int16_t* mv = mvColoc[iColocIdx];
+      if (IS_SUB_8x8 (subMbType)) {
+        if (uiColZeroFlag && ((unsigned) (mv[0] + 1) <= 2 && (unsigned) (mv[1] + 1) <= 2)) {
+          if (iRef[LIST_0] == 0) {
+            ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], 0);
+            ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx + 4], 0);
+            ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+            ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx + 4], 0);
+            if (pMotionVector != NULL) {
+              ST64 (pMotionVector[LIST_0][iCacheIdx], 0);
+              ST64 (pMotionVector[LIST_0][iCacheIdx + 6], 0);
+            }
+            if (pMvdCache != NULL) {
+              ST64 (pMvdCache[LIST_0][iCacheIdx], 0);
+              ST64 (pMvdCache[LIST_0][iCacheIdx + 6], 0);
+            }
+          }
+
+          if (iRef[LIST_1] == 0) {
+            ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], 0);
+            ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx + 4], 0);
+            ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+            ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx + 4], 0);
+            if (pMotionVector != NULL) {
+              ST64 (pMotionVector[LIST_1][iCacheIdx], 0);
+              ST64 (pMotionVector[LIST_1][iCacheIdx + 6], 0);
+            }
+            if (pMvdCache != NULL) {
+              ST64 (pMvdCache[LIST_1][iCacheIdx], 0);
+              ST64 (pMvdCache[LIST_1][iCacheIdx + 6], 0);
+            }
+          }
+        }
+      } else {
+        if (uiColZeroFlag && ((unsigned) (mv[0] + 1) <= 2 && (unsigned) (mv[1] + 1) <= 2)) {
+          if (iRef[LIST_0] == 0) {
+            ST32 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], 0);
+            ST32 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+            if (pMotionVector != NULL) {
+              ST32 (pMotionVector[LIST_0][iCacheIdx], 0);
+            }
+            if (pMvdCache != NULL) {
+              ST32 (pMvdCache[LIST_0][iCacheIdx], 0);
+            }
+          }
+          if (iRef[LIST_1] == 0) {
+            ST32 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], 0);
+            ST32 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+            if (pMotionVector != NULL) {
+              ST32 (pMotionVector[LIST_1][iCacheIdx], 0);
+            }
+            if (pMvdCache != NULL) {
+              ST32 (pMvdCache[LIST_1][iCacheIdx], 0);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+void FillTemporalDirect8x8Mv (PDqLayer pCurDqLayer, const int16_t& iIdx8, const int8_t& iPartCount,
+                              const int8_t& iPartW,
+                              const SubMbType& subMbType, int8_t iRef[LIST_A], int16_t (*mvColoc)[2], int16_t pMotionVector[LIST_A][30][MV_A],
+                              int16_t pMvdCache[LIST_A][30][MV_A]) {
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int16_t pMvDirect[LIST_A][2] = { { 0, 0 }, { 0, 0 } };
+  for (int32_t j = 0; j < iPartCount; j++) {
+    int8_t iPartIdx = iIdx8 + j * iPartW;
+    uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+    uint8_t iColocIdx = g_kuiScan4[iPartIdx];
+    uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+    int16_t* mv = mvColoc[iColocIdx];
+
+    int16_t pMV[4] = { 0 };
+    if (IS_SUB_8x8 (subMbType)) {
+      if (!pCurDqLayer->iColocIntra[iColocIdx]) {
+        pMvDirect[LIST_0][0] = (pSlice->iMvScale[LIST_0][iRef[LIST_0]] * mv[0] + 128) >> 8;
+        pMvDirect[LIST_0][1] = (pSlice->iMvScale[LIST_0][iRef[LIST_0]] * mv[1] + 128) >> 8;
+      }
+      ST32 (pMV, LD32 (pMvDirect[LIST_0]));
+      ST32 ((pMV + 2), LD32 (pMvDirect[LIST_0]));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], LD64 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx + 4], LD64 (pMV));
+      ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+      ST64 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx + 4], 0);
+      if (pMotionVector != NULL) {
+        ST64 (pMotionVector[LIST_0][iCacheIdx], LD64 (pMV));
+        ST64 (pMotionVector[LIST_0][iCacheIdx + 6], LD64 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST64 (pMvdCache[LIST_0][iCacheIdx], 0);
+        ST64 (pMvdCache[LIST_0][iCacheIdx + 6], 0);
+      }
+      if (!pCurDqLayer->iColocIntra[g_kuiScan4[iIdx8]]) {
+        pMvDirect[LIST_1][0] = pMvDirect[LIST_0][0] - mv[0];
+        pMvDirect[LIST_1][1] = pMvDirect[LIST_0][1] - mv[1];
+      }
+      ST32 (pMV, LD32 (pMvDirect[LIST_1]));
+      ST32 ((pMV + 2), LD32 (pMvDirect[LIST_1]));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], LD64 (pMV));
+      ST64 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx + 4], LD64 (pMV));
+      ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+      ST64 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx + 4], 0);
+      if (pMotionVector != NULL) {
+        ST64 (pMotionVector[LIST_1][iCacheIdx], LD64 (pMV));
+        ST64 (pMotionVector[LIST_1][iCacheIdx + 6], LD64 (pMV));
+      }
+      if (pMvdCache != NULL) {
+        ST64 (pMvdCache[LIST_1][iCacheIdx], 0);
+        ST64 (pMvdCache[LIST_1][iCacheIdx + 6], 0);
+      }
+    } else { //SUB_4x4
+      if (!pCurDqLayer->iColocIntra[iColocIdx]) {
+        pMvDirect[LIST_0][0] = (pSlice->iMvScale[LIST_0][iRef[LIST_0]] * mv[0] + 128) >> 8;
+        pMvDirect[LIST_0][1] = (pSlice->iMvScale[LIST_0][iRef[LIST_0]] * mv[1] + 128) >> 8;
+      }
+      ST32 (pCurDqLayer->pDec->pMv[LIST_0][iMbXy][iScan4Idx], LD32 (pMvDirect[LIST_0]));
+      ST32 (pCurDqLayer->pMvd[LIST_0][iMbXy][iScan4Idx], 0);
+      if (pMotionVector != NULL) {
+        ST32 (pMotionVector[LIST_0][iCacheIdx], LD32 (pMvDirect[LIST_0]));
+      }
+      if (pMvdCache != NULL) {
+        ST32 (pMvdCache[LIST_0][iCacheIdx], 0);
+      }
+      if (!pCurDqLayer->iColocIntra[iColocIdx]) {
+        pMvDirect[LIST_1][0] = pMvDirect[LIST_0][0] - mv[0];
+        pMvDirect[LIST_1][1] = pMvDirect[LIST_0][1] - mv[1];
+      }
+      ST32 (pCurDqLayer->pDec->pMv[LIST_1][iMbXy][iScan4Idx], LD32 (pMvDirect[LIST_1]));
+      ST32 (pCurDqLayer->pMvd[LIST_1][iMbXy][iScan4Idx], 0);
+      if (pMotionVector != NULL) {
+        ST32 (pMotionVector[LIST_1][iCacheIdx], LD32 (pMvDirect[LIST_1]));
+      }
+      if (pMvdCache != NULL) {
+        ST32 (pMvdCache[LIST_1][iCacheIdx], 0);
+      }
+    }
+  }
+}
+int8_t MapColToList0 (PWelsDecoderContext& pCtx, const int8_t& colocRefIndexL0,
+                      const int32_t& ref0Count) { //ISO/IEC 14496-10:2009(E) (8-193)
+  //When reference is lost, this function must be skipped.
+  if ((pCtx->iErrorCode & dsRefLost) == dsRefLost) {
+    return 0;
+  }
+  PPicture pic1 = pCtx->sRefPic.pRefList[LIST_1][0];
+  if (pic1 && pic1->pRefPic[LIST_0][colocRefIndexL0]) {
+    const int32_t iFramePoc = pic1->pRefPic[LIST_0][colocRefIndexL0]->iFramePoc;
+    for (int32_t i = 0; i < ref0Count; i++) {
+      if (pCtx->sRefPic.pRefList[LIST_0][i]->iFramePoc == iFramePoc) {
+        return i;
+      }
+    }
+  }
+  return 0;
+}
+void Update8x8RefIdx (PDqLayer& pCurDqLayer, const int16_t& iPartIdx, const int32_t& listIdx, const int8_t& iRef) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+  pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][iScan4Idx] = pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][iScan4Idx + 1] =
+        pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][iScan4Idx + 4] = pCurDqLayer->pDec->pRefIndex[listIdx][iMbXy][iScan4Idx +
+            5] = iRef;
+
+}
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cabac.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cabac.cpp
new file mode 100644
index 0000000000..177a5e82ae
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cabac.cpp
@@ -0,0 +1,1565 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *      parse_mb_syn_cabac.cpp: cabac parse for syntax elements
+ */
+#include "parse_mb_syn_cabac.h"
+#include "decode_slice.h"
+#include "mv_pred.h"
+#include "error_code.h"
+#include <stdio.h>
+
+namespace WelsDec {
+#define IDX_UNUSED -1
+
+static const int16_t g_kMaxPos       [] = {IDX_UNUSED, 15, 14, 15, 3, 14, 63, 3, 3, 14, 14};
+static const int16_t g_kMaxC2       [] = {IDX_UNUSED, 4, 4, 4, 3, 4, 4, 3, 3, 4, 4};
+static const int16_t g_kBlockCat2CtxOffsetCBF[] = {IDX_UNUSED, 0, 4, 8, 12, 16, 0, 12, 12, 16, 16};
+static const int16_t g_kBlockCat2CtxOffsetMap [] = {IDX_UNUSED, 0, 15, 29, 44, 47, 0, 44, 44, 47, 47};
+static const int16_t g_kBlockCat2CtxOffsetLast[] = {IDX_UNUSED, 0, 15, 29, 44, 47, 0, 44, 44, 47, 47};
+static const int16_t g_kBlockCat2CtxOffsetOne [] = {IDX_UNUSED, 0, 10, 20, 30, 39, 0, 30, 30, 39, 39};
+static const int16_t g_kBlockCat2CtxOffsetAbs [] = {IDX_UNUSED, 0, 10, 20, 30, 39, 0, 30, 30, 39, 39};
+
+const uint8_t g_kTopBlkInsideMb[24] = { //for index with z-order 0~23
+  //  0   1 | 4  5      luma 8*8 block           pNonZeroCount[16+8]
+  0,  0,  1,  1,   //  2   3 | 6  7        0  |  1                  0   1   2   3
+  0,  0,  1,  1,   //---------------      ---------                 4   5   6   7
+  1,  1,  1,  1,   //  8   9 | 12 13       2  |  3                  8   9  10  11
+  1,  1,  1,  1,  // 10  11 | 14 15-----------------------------> 12  13  14  15
+  0,  0,  1,  1,   //----------------    chroma 8*8 block          16  17  18  19
+  0,  0,  1,  1   // 16  17 | 20 21        0    1                 20  21  22  23
+  // 18  19 | 22 23
+};
+
+const uint8_t g_kLeftBlkInsideMb[24] = { //for index with z-order 0~23
+  //  0   1 | 4  5      luma 8*8 block           pNonZeroCount[16+8]
+  0,  1,  0,  1,   //  2   3 | 6  7        0  |  1                  0   1   2   3
+  1,  1,  1,  1,   //---------------      ---------                 4   5   6   7
+  0,  1,  0,  1,   //  8   9 | 12 13       2  |  3                  8   9  10  11
+  1,  1,  1,  1,  // 10  11 | 14 15-----------------------------> 12  13  14  15
+  0,  1,  0,  1,   //----------------    chroma 8*8 block          16  17  18  19
+  0,  1,  0,  1   // 16  17 | 20 21        0    1                 20  21  22  23
+  // 18  19 | 22 23
+};
+
+static uint32_t DecodeCabacIntraMbType (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, int ctx_base) {
+  uint32_t uiCode;
+  uint32_t uiMbType = 0;
+
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + ctx_base;
+
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx, uiCode));
+  if (!uiCode) {
+    return 0; /* I4x4 */
+  }
+
+  WELS_READ_VERIFY (DecodeTerminateCabac (pCabacDecEngine, uiCode));
+  if (uiCode) {
+    return 25; /* PCM */
+  }
+  uiMbType = 1; /* I16x16 */
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 1, uiCode)); /* cbp_luma != 0 */
+  uiMbType += 12 * uiCode;
+
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 2, uiCode));
+  if (uiCode) {
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 2, uiCode));
+    uiMbType += 4 + 4 * uiCode;
+  }
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+  uiMbType += 2 * uiCode;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+  uiMbType += 1 * uiCode;
+  return uiMbType;
+}
+
+void UpdateP16x8RefIdxCabac (PDqLayer pCurDqLayer, int8_t pRefIndex[LIST_A][30], int32_t iPartIdx, const int8_t iRef,
+                             const int8_t iListIdx) {
+  uint32_t iRef32Bit = (uint32_t) iRef;
+  const int32_t iRef4Bytes = (iRef32Bit << 24) | (iRef32Bit << 16) | (iRef32Bit << 8) | iRef32Bit;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+  const uint8_t iScan4Idx4 = 4 + iScan4Idx;
+  const uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+  const uint8_t iCacheIdx6 = 6 + iCacheIdx;
+  //mb
+  ST32 (&pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx ], iRef4Bytes);
+  ST32 (&pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx4], iRef4Bytes);
+  //cache
+  ST32 (&pRefIndex[iListIdx][iCacheIdx ], iRef4Bytes);
+  ST32 (&pRefIndex[iListIdx][iCacheIdx6], iRef4Bytes);
+}
+
+void UpdateP8x16RefIdxCabac (PDqLayer pCurDqLayer, int8_t pRefIndex[LIST_A][30], int32_t iPartIdx, const int8_t iRef,
+                             const int8_t iListIdx) {
+  uint16_t iRef16Bit = (uint16_t) iRef;
+  const int16_t iRef2Bytes = (iRef16Bit << 8) | iRef16Bit;
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  for (i = 0; i < 2; i++, iPartIdx += 8) {
+    const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+    const uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+    const uint8_t iScan4Idx4 = 4 + iScan4Idx;
+    const uint8_t iCacheIdx6 = 6 + iCacheIdx;
+    //mb
+    ST16 (&pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx ], iRef2Bytes);
+    ST16 (&pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx4], iRef2Bytes);
+    //cache
+    ST16 (&pRefIndex[iListIdx][iCacheIdx ], iRef2Bytes);
+    ST16 (&pRefIndex[iListIdx][iCacheIdx6], iRef2Bytes);
+  }
+}
+
+void UpdateP8x8RefIdxCabac (PDqLayer pCurDqLayer, int8_t pRefIndex[LIST_A][30], int32_t iPartIdx, const int8_t iRef,
+                            const int8_t iListIdx) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+  pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx] = pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx + 1]
+      =
+        pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx + 4] = pCurDqLayer->pDec->pRefIndex[iListIdx][iMbXy][iScan4Idx +
+            5] = iRef;
+}
+
+void UpdateP8x8DirectCabac (PDqLayer pCurDqLayer, int32_t iPartIdx) {
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+  pCurDqLayer->pDirect[iMbXy][iScan4Idx] = pCurDqLayer->pDirect[iMbXy][iScan4Idx + 1] =
+        pCurDqLayer->pDirect[iMbXy][iScan4Idx + 4] = pCurDqLayer->pDirect[iMbXy][iScan4Idx + 5] = 1;
+}
+
+void UpdateP16x16DirectCabac (PDqLayer pCurDqLayer) {
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  const int16_t direct = (1 << 8) | 1;
+  for (i = 0; i < 16; i += 4) {
+    const uint8_t kuiScan4Idx = g_kuiScan4[i];
+    const uint8_t kuiScan4IdxPlus4 = 4 + kuiScan4Idx;
+    ST16 (&pCurDqLayer->pDirect[iMbXy][kuiScan4Idx], direct);
+    ST16 (&pCurDqLayer->pDirect[iMbXy][kuiScan4IdxPlus4], direct);
+  }
+}
+
+void UpdateP16x16MvdCabac (SDqLayer* pCurDqLayer, int16_t pMvd[2], const int8_t iListIdx) {
+  int32_t pMvd32[2];
+  ST32 (&pMvd32[0], LD32 (pMvd));
+  ST32 (&pMvd32[1], LD32 (pMvd));
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  for (i = 0; i < 16; i += 2) {
+    ST64 (pCurDqLayer->pMvd[iListIdx][iMbXy][i], LD64 (pMvd32));
+  }
+}
+
+void UpdateP16x8MvdCabac (SDqLayer* pCurDqLayer, int16_t pMvdCache[LIST_A][30][MV_A], int32_t iPartIdx, int16_t pMvd[2],
+                          const int8_t iListIdx) {
+  int32_t pMvd32[2];
+  ST32 (&pMvd32[0], LD32 (pMvd));
+  ST32 (&pMvd32[1], LD32 (pMvd));
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  for (i = 0; i < 2; i++, iPartIdx += 4) {
+    const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+    const uint8_t iScan4Idx4 = 4 + iScan4Idx;
+    const uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+    const uint8_t iCacheIdx6 = 6 + iCacheIdx;
+    //mb
+    ST64 (pCurDqLayer->pMvd[iListIdx][iMbXy][  iScan4Idx ], LD64 (pMvd32));
+    ST64 (pCurDqLayer->pMvd[iListIdx][iMbXy][  iScan4Idx4], LD64 (pMvd32));
+    //cache
+    ST64 (pMvdCache[iListIdx][  iCacheIdx ], LD64 (pMvd32));
+    ST64 (pMvdCache[iListIdx][  iCacheIdx6], LD64 (pMvd32));
+  }
+}
+
+void UpdateP8x16MvdCabac (SDqLayer* pCurDqLayer, int16_t pMvdCache[LIST_A][30][MV_A], int32_t iPartIdx, int16_t pMvd[2],
+                          const int8_t iListIdx) {
+  int32_t pMvd32[2];
+  ST32 (&pMvd32[0], LD32 (pMvd));
+  ST32 (&pMvd32[1], LD32 (pMvd));
+  int32_t i;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  for (i = 0; i < 2; i++, iPartIdx += 8) {
+    const uint8_t iScan4Idx = g_kuiScan4[iPartIdx];
+    const uint8_t iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+    const uint8_t iScan4Idx4 = 4 + iScan4Idx;
+    const uint8_t iCacheIdx6 = 6 + iCacheIdx;
+    //mb
+    ST64 (pCurDqLayer->pMvd[iListIdx][iMbXy][  iScan4Idx ], LD64 (pMvd32));
+    ST64 (pCurDqLayer->pMvd[iListIdx][iMbXy][  iScan4Idx4], LD64 (pMvd32));
+    //cache
+    ST64 (pMvdCache[iListIdx][  iCacheIdx ], LD64 (pMvd32));
+    ST64 (pMvdCache[iListIdx][  iCacheIdx6], LD64 (pMvd32));
+  }
+}
+
+int32_t ParseEndOfSliceCabac (PWelsDecoderContext pCtx, uint32_t& uiBinVal) {
+  uiBinVal = 0;
+  WELS_READ_VERIFY (DecodeTerminateCabac (pCtx->pCabacDecEngine, uiBinVal));
+  return ERR_NONE;
+}
+
+int32_t ParseSkipFlagCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSkip) {
+  uiSkip = 0;
+  int32_t iCtxInc = NEW_CTX_OFFSET_SKIP;
+  iCtxInc += (pNeighAvail->iLeftAvail && !IS_SKIP (pNeighAvail->iLeftType)) + (pNeighAvail->iTopAvail
+             && !IS_SKIP (pNeighAvail->iTopType));
+  if (B_SLICE == pCtx->eSliceType)
+    iCtxInc += 13;
+  PWelsCabacCtx pBinCtx = (pCtx->pCabacCtx + iCtxInc);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pBinCtx, uiSkip));
+  return ERR_NONE;
+}
+
+
+int32_t ParseMBTypeISliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiBinVal) {
+  uint32_t uiCode;
+  int32_t iIdxA = 0, iIdxB = 0;
+  int32_t iCtxInc;
+  uiBinVal = 0;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_MB_TYPE_I; //I mode in I slice
+  iIdxA = (pNeighAvail->iLeftAvail) && (pNeighAvail->iLeftType != MB_TYPE_INTRA4x4
+                                        && pNeighAvail->iLeftType != MB_TYPE_INTRA8x8);
+  iIdxB = (pNeighAvail->iTopAvail) && (pNeighAvail->iTopType != MB_TYPE_INTRA4x4
+                                       && pNeighAvail->iTopType != MB_TYPE_INTRA8x8);
+  iCtxInc = iIdxA + iIdxB;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + iCtxInc, uiCode));
+  uiBinVal = uiCode;
+  if (uiBinVal != 0) {  //I16x16
+    WELS_READ_VERIFY (DecodeTerminateCabac (pCabacDecEngine, uiCode));
+    if (uiCode == 1)
+      uiBinVal = 25; //I_PCM
+    else {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+      uiBinVal = 1 + uiCode * 12;
+      //decoding of uiCbp:0,1,2
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 4, uiCode));
+      if (uiCode != 0) {
+        WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+        uiBinVal += 4;
+        if (uiCode != 0)
+          uiBinVal += 4;
+      }
+      //decoding of I pred-mode: 0,1,2,3
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 6, uiCode));
+      uiBinVal += (uiCode << 1);
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 7, uiCode));
+      uiBinVal += uiCode;
+    }
+  }
+  //I4x4
+  return ERR_NONE;
+}
+
+int32_t ParseMBTypePSliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiMbType) {
+  uint32_t uiCode;
+  uiMbType = 0;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_SKIP;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+  if (uiCode) {
+    // Intra MB
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 6, uiCode));
+    if (uiCode) { // Intra 16x16
+      WELS_READ_VERIFY (DecodeTerminateCabac (pCabacDecEngine, uiCode));
+      if (uiCode) {
+        uiMbType = 30;
+        return ERR_NONE;//MB_TYPE_INTRA_PCM;
+      }
+
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 7, uiCode));
+      uiMbType = 6 + uiCode * 12;
+
+      //uiCbp: 0,1,2
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 8, uiCode));
+      if (uiCode) {
+        uiMbType += 4;
+        WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 8, uiCode));
+        if (uiCode)
+          uiMbType += 4;
+      }
+
+      //IPredMode: 0,1,2,3
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 9, uiCode));
+      uiMbType += (uiCode << 1);
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 9, uiCode));
+      uiMbType += uiCode;
+    } else
+      // Intra 4x4
+      uiMbType = 5;
+  } else { // P MB
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 4, uiCode));
+    if (uiCode) { //second bit
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 6, uiCode));
+      if (uiCode)
+        uiMbType = 1;
+      else
+        uiMbType = 2;
+    } else {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      if (uiCode)
+        uiMbType = 3;
+      else
+        uiMbType = 0;
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseMBTypeBSliceCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiMbType) {
+  uint32_t uiCode;
+  uiMbType = 0;
+  int32_t iIdxA = 0, iIdxB = 0;
+  int32_t iCtxInc;
+
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + 27; //B slice
+
+  iIdxA = (pNeighAvail->iLeftAvail) && !IS_DIRECT (pNeighAvail->iLeftType);
+  iIdxB = (pNeighAvail->iTopAvail) && !IS_DIRECT (pNeighAvail->iTopType);
+
+  iCtxInc = iIdxA + iIdxB;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + iCtxInc, uiCode));
+  if (!uiCode)
+    uiMbType = 0; // Bi_Direct
+  else {
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+    if (!uiCode) {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      uiMbType = 1 + uiCode; // 16x16 L0L1
+    } else {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 4, uiCode));
+      uiMbType = uiCode << 3;
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      uiMbType |= uiCode << 2;
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      uiMbType |= uiCode << 1;
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      uiMbType |= uiCode;
+      if (uiMbType < 8) {
+        uiMbType += 3;
+        return ERR_NONE;
+      } else if (uiMbType == 13) {
+        uiMbType = DecodeCabacIntraMbType (pCtx, pNeighAvail, 32) + 23;
+        return ERR_NONE;
+      } else if (uiMbType == 14) {
+        uiMbType = 11; // Bi8x16
+        return ERR_NONE;
+      } else if (uiMbType == 15) {
+        uiMbType = 22; // 8x8
+        return ERR_NONE;
+      }
+      uiMbType <<= 1;
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 5, uiCode));
+      uiMbType |= uiCode;
+      uiMbType -= 4;
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseTransformSize8x8FlagCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail,
+                                        bool& bTransformSize8x8Flag) {
+  uint32_t uiCode;
+  int32_t iIdxA, iIdxB;
+  int32_t iCtxInc;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_TS_8x8_FLAG;
+  iIdxA = (pNeighAvail->iLeftAvail) && (pCtx->pCurDqLayer->pTransformSize8x8Flag[pCtx->pCurDqLayer->iMbXyIndex - 1]);
+  iIdxB = (pNeighAvail->iTopAvail)
+          && (pCtx->pCurDqLayer->pTransformSize8x8Flag[pCtx->pCurDqLayer->iMbXyIndex - pCtx->pCurDqLayer->iMbWidth]);
+  iCtxInc = iIdxA + iIdxB;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + iCtxInc, uiCode));
+  bTransformSize8x8Flag = !!uiCode;
+
+  return ERR_NONE;
+}
+
+int32_t ParseSubMBTypeCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSubMbType) {
+  uint32_t uiCode;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_SUBMB_TYPE;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx, uiCode));
+  if (uiCode)
+    uiSubMbType = 0;
+  else {
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 1, uiCode));
+    if (uiCode) {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 2, uiCode));
+      uiSubMbType = 3 - uiCode;
+    } else {
+      uiSubMbType = 1;
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseBSubMBTypeCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiSubMbType) {
+  uint32_t uiCode;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_B_SUBMB_TYPE;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx, uiCode));
+  if (!uiCode) {
+    uiSubMbType = 0; /* B_Direct_8x8 */
+    return ERR_NONE;
+  }
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 1, uiCode));
+  if (!uiCode) {
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+    uiSubMbType = 1 + uiCode; /* B_L0_8x8, B_L1_8x8 */
+    return ERR_NONE;
+  }
+  uiSubMbType = 3;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 2, uiCode));
+  if (uiCode) {
+    WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+    if (uiCode) {
+      WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+      uiSubMbType = 11 + uiCode; /* B_L1_4x4, B_Bi_4x4 */
+      return ERR_NONE;
+    }
+    uiSubMbType += 4;
+  }
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+  uiSubMbType += 2 * uiCode;
+  WELS_READ_VERIFY (DecodeBinCabac (pCabacDecEngine, pBinCtx + 3, uiCode));
+  uiSubMbType += uiCode;
+
+  return ERR_NONE;
+}
+
+int32_t ParseIntraPredModeLumaCabac (PWelsDecoderContext pCtx, int32_t& iBinVal) {
+  uint32_t uiCode;
+  iBinVal = 0;
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_IPR, uiCode));
+  if (uiCode == 1)
+    iBinVal = -1;
+  else {
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_IPR + 1, uiCode));
+    iBinVal |= uiCode;
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_IPR + 1, uiCode));
+    iBinVal |= (uiCode << 1);
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_IPR + 1, uiCode));
+    iBinVal |= (uiCode << 2);
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseIntraPredModeChromaCabac (PWelsDecoderContext pCtx, uint8_t uiNeighAvail, int32_t& iBinVal) {
+  uint32_t uiCode;
+  int32_t iIdxA, iIdxB, iCtxInc;
+  int8_t* pChromaPredMode = pCtx->pCurDqLayer->pChromaPredMode;
+  uint32_t* pMbType = pCtx->pCurDqLayer->pDec->pMbType;
+  int32_t iLeftAvail     = uiNeighAvail & 0x04;
+  int32_t iTopAvail      = uiNeighAvail & 0x01;
+
+  int32_t iMbXy = pCtx->pCurDqLayer->iMbXyIndex;
+  int32_t iMbXyTop = iMbXy - pCtx->pCurDqLayer->iMbWidth;
+  int32_t iMbXyLeft = iMbXy - 1;
+
+  iBinVal = 0;
+
+  iIdxB = iTopAvail  && (pChromaPredMode[iMbXyTop] > 0 && pChromaPredMode[iMbXyTop] <= 3)
+          && pMbType[iMbXyTop]  != MB_TYPE_INTRA_PCM;
+  iIdxA = iLeftAvail && (pChromaPredMode[iMbXyLeft] > 0 && pChromaPredMode[iMbXyLeft] <= 3)
+          && pMbType[iMbXyLeft] != MB_TYPE_INTRA_PCM;
+  iCtxInc = iIdxA + iIdxB;
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CIPR + iCtxInc, uiCode));
+  iBinVal = uiCode;
+  if (iBinVal != 0) {
+    uint32_t iSym;
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CIPR + 3, iSym));
+    if (iSym == 0) {
+      iBinVal = (iSym + 1);
+      return ERR_NONE;
+    }
+    iSym = 0;
+    do {
+      WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CIPR + 3, uiCode));
+      ++iSym;
+    } while ((uiCode != 0) && (iSym < 1));
+
+    if ((uiCode != 0) && (iSym == 1))
+      ++ iSym;
+    iBinVal = (iSym + 1);
+    return ERR_NONE;
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseInterPMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                                    int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A], int8_t pRefIndex[LIST_A][30]) {
+  PSlice pSlice                 = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader     = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  PPicture* ppRefPic = pCtx->sRefPic.pRefList[LIST_0];
+  int32_t pRefCount[2];
+  int32_t i, j;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int16_t pMv[4] = {0};
+  int16_t pMvd[4] = {0};
+  int8_t iRef[2] = {0};
+  int32_t iPartIdx;
+  int16_t iMinVmv = pSliceHeader->pSps->pSLevelLimits->iMinVmv;
+  int16_t iMaxVmv = pSliceHeader->pSps->pSLevelLimits->iMaxVmv;
+  pRefCount[0] = pSliceHeader->uiRefCount[0];
+  pRefCount[1] = pSliceHeader->uiRefCount[1];
+
+  bool bIsPending = GetThreadCount (pCtx) > 1;
+
+  switch (pCurDqLayer->pDec->pMbType[iMbXy]) {
+  case MB_TYPE_16x16: {
+    iPartIdx = 0;
+    WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, 0, LIST_0, iPartIdx, pRefCount[0], 0,
+                                        iRef[0]));
+    if ((iRef[0] < 0) || (iRef[0] >= pRefCount[0]) || (ppRefPic[iRef[0]] == NULL)) { //error ref_idx
+      pCtx->bMbRefConcealed = true;
+      if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+        iRef[0] = 0;
+        pCtx->iErrorCode |= dsBitstreamError;
+      } else {
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+      }
+    }
+    pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRef[0]]
+                            && (ppRefPic[iRef[0]]->bIsComplete || bIsPending));
+    PredMv (pMotionVector, pRefIndex, LIST_0, 0, 4, iRef[0], pMv);
+    WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 0, pMvd[0]));
+    WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 1, pMvd[1]));
+    pMv[0] += pMvd[0];
+    pMv[1] += pMvd[1];
+    WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+    UpdateP16x16MotionInfo (pCurDqLayer, LIST_0, iRef[0], pMv);
+    UpdateP16x16MvdCabac (pCurDqLayer, pMvd, LIST_0);
+  }
+  break;
+  case MB_TYPE_16x8:
+    for (i = 0; i < 2; i++) {
+      iPartIdx = i << 3;
+      WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, 0, LIST_0, iPartIdx, pRefCount[0], 0,
+                                          iRef[i]));
+      if ((iRef[i] < 0) || (iRef[i] >= pRefCount[0]) || (ppRefPic[iRef[i]] == NULL)) { //error ref_idx
+        pCtx->bMbRefConcealed = true;
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRef[i] = 0;
+          pCtx->iErrorCode |= dsBitstreamError;
+        } else {
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+        }
+      }
+      pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRef[i]]
+                              && (ppRefPic[iRef[i]]->bIsComplete || bIsPending));
+      UpdateP16x8RefIdxCabac (pCurDqLayer, pRefIndex, iPartIdx, iRef[i], LIST_0);
+    }
+    for (i = 0; i < 2; i++) {
+      iPartIdx = i << 3;
+      PredInter16x8Mv (pMotionVector, pRefIndex, LIST_0, iPartIdx, iRef[i], pMv);
+      WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 0, pMvd[0]));
+      WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 1, pMvd[1]));
+      pMv[0] += pMvd[0];
+      pMv[1] += pMvd[1];
+      WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      UpdateP16x8MotionInfo (pCurDqLayer, pMotionVector, pRefIndex, LIST_0, iPartIdx, iRef[i], pMv);
+      UpdateP16x8MvdCabac (pCurDqLayer, pMvdCache, iPartIdx, pMvd, LIST_0);
+    }
+    break;
+  case MB_TYPE_8x16:
+    for (i = 0; i < 2; i++) {
+      iPartIdx = i << 2;
+      WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, 0, LIST_0, iPartIdx, pRefCount[0], 0,
+                                          iRef[i]));
+      if ((iRef[i] < 0) || (iRef[i] >= pRefCount[0]) || (ppRefPic[iRef[i]] == NULL)) { //error ref_idx
+        pCtx->bMbRefConcealed = true;
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRef[i] = 0;
+          pCtx->iErrorCode |= dsBitstreamError;
+        } else {
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+        }
+      }
+      pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRef[i]]
+                              && (ppRefPic[iRef[i]]->bIsComplete || bIsPending));
+      UpdateP8x16RefIdxCabac (pCurDqLayer, pRefIndex, iPartIdx, iRef[i], LIST_0);
+    }
+    for (i = 0; i < 2; i++) {
+      iPartIdx = i << 2;
+      PredInter8x16Mv (pMotionVector, pRefIndex, LIST_0, i << 2, iRef[i], pMv/*&mv[0], &mv[1]*/);
+
+      WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 0, pMvd[0]));
+      WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 1, pMvd[1]));
+      pMv[0] += pMvd[0];
+      pMv[1] += pMvd[1];
+      WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      UpdateP8x16MotionInfo (pCurDqLayer, pMotionVector, pRefIndex, LIST_0, iPartIdx, iRef[i], pMv);
+      UpdateP8x16MvdCabac (pCurDqLayer, pMvdCache, iPartIdx, pMvd, LIST_0);
+    }
+    break;
+  case MB_TYPE_8x8:
+  case MB_TYPE_8x8_REF0: {
+    int8_t pRefIdx[4] = {0}, pSubPartCount[4], pPartW[4];
+    uint32_t uiSubMbType;
+    //sub_mb_type, partition
+    for (i = 0; i < 4; i++) {
+      WELS_READ_VERIFY (ParseSubMBTypeCabac (pCtx, pNeighAvail, uiSubMbType));
+      if (uiSubMbType >= 4) { //invalid sub_mb_type
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_SUB_MB_TYPE);
+      }
+      pCurDqLayer->pSubMbType[iMbXy][i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iType;
+      pSubPartCount[i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iPartCount;
+      pPartW[i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iPartWidth;
+
+      // Need modification when B picture add in, reference to 7.3.5
+      pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] &= (uiSubMbType == 0);
+    }
+
+    for (i = 0; i < 4; i++) {
+      int16_t iIdx8 = i << 2;
+      WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, 0, LIST_0, iIdx8, pRefCount[0], 1,
+                                          pRefIdx[i]));
+      if ((pRefIdx[i] < 0) || (pRefIdx[i] >= pRefCount[0]) || (ppRefPic[pRefIdx[i]] == NULL)) { //error ref_idx
+        pCtx->bMbRefConcealed = true;
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          pRefIdx[i] = 0;
+          pCtx->iErrorCode |= dsBitstreamError;
+        } else {
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+        }
+      }
+      pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[pRefIdx[i]]
+                              && (ppRefPic[pRefIdx[i]]->bIsComplete || bIsPending));
+      UpdateP8x8RefIdxCabac (pCurDqLayer, pRefIndex, iIdx8, pRefIdx[i], LIST_0);
+    }
+    //mv
+    for (i = 0; i < 4; i++) {
+      int8_t iPartCount = pSubPartCount[i];
+      uiSubMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+      int16_t iPartIdx, iBlockW = pPartW[i];
+      uint8_t iScan4Idx, iCacheIdx;
+      iCacheIdx = g_kuiCache30ScanIdx[i << 2];
+      pRefIndex[0][iCacheIdx ] = pRefIndex[0][iCacheIdx + 1]
+                                 = pRefIndex[0][iCacheIdx + 6] = pRefIndex[0][iCacheIdx + 7] = pRefIdx[i];
+
+      for (j = 0; j < iPartCount; j++) {
+        iPartIdx = (i << 2) + j * iBlockW;
+        iScan4Idx = g_kuiScan4[iPartIdx];
+        iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+        PredMv (pMotionVector, pRefIndex, LIST_0, iPartIdx, iBlockW, pRefIdx[i], pMv);
+        WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 0, pMvd[0]));
+        WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, LIST_0, 1, pMvd[1]));
+        pMv[0] += pMvd[0];
+        pMv[1] += pMvd[1];
+        WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        if (SUB_MB_TYPE_8x8 == uiSubMbType) {
+          ST32 ((pMv + 2), LD32 (pMv));
+          ST32 ((pMvd + 2), LD32 (pMvd));
+          ST64 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx], LD64 (pMv));
+          ST64 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx + 4], LD64 (pMv));
+          ST64 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx], LD64 (pMvd));
+          ST64 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx + 4], LD64 (pMvd));
+          ST64 (pMotionVector[0][iCacheIdx  ], LD64 (pMv));
+          ST64 (pMotionVector[0][iCacheIdx + 6], LD64 (pMv));
+          ST64 (pMvdCache[0][iCacheIdx  ], LD64 (pMvd));
+          ST64 (pMvdCache[0][iCacheIdx + 6], LD64 (pMvd));
+        } else if (SUB_MB_TYPE_8x4 == uiSubMbType) {
+          ST32 ((pMv + 2), LD32 (pMv));
+          ST32 ((pMvd + 2), LD32 (pMvd));
+          ST64 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx  ], LD64 (pMv));
+          ST64 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx  ], LD64 (pMvd));
+          ST64 (pMotionVector[0][iCacheIdx  ], LD64 (pMv));
+          ST64 (pMvdCache[0][iCacheIdx  ], LD64 (pMvd));
+        } else if (SUB_MB_TYPE_4x8 == uiSubMbType) {
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx  ], LD32 (pMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx + 4], LD32 (pMv));
+          ST32 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx  ], LD32 (pMvd));
+          ST32 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx + 4], LD32 (pMvd));
+          ST32 (pMotionVector[0][iCacheIdx  ], LD32 (pMv));
+          ST32 (pMotionVector[0][iCacheIdx + 6], LD32 (pMv));
+          ST32 (pMvdCache[0][iCacheIdx  ], LD32 (pMvd));
+          ST32 (pMvdCache[0][iCacheIdx + 6], LD32 (pMvd));
+        } else {  //SUB_MB_TYPE_4x4
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][iScan4Idx  ], LD32 (pMv));
+          ST32 (pCurDqLayer->pMvd[0][iMbXy][iScan4Idx  ], LD32 (pMvd));
+          ST32 (pMotionVector[0][iCacheIdx  ], LD32 (pMv));
+          ST32 (pMvdCache[0][iCacheIdx  ], LD32 (pMvd));
+        }
+      }
+    }
+  }
+  break;
+  default:
+    break;
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseInterBMotionInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                                    int16_t pMotionVector[LIST_A][30][MV_A], int16_t pMvdCache[LIST_A][30][MV_A], int8_t pRefIndex[LIST_A][30],
+                                    int8_t pDirect[30]) {
+  PSlice pSlice = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t pRefCount[LIST_A];
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int16_t pMv[4] = { 0 };
+  int16_t pMvd[4] = { 0 };
+  int8_t iRef[LIST_A] = { 0 };
+  int32_t iPartIdx;
+  int16_t iMinVmv = pSliceHeader->pSps->pSLevelLimits->iMinVmv;
+  int16_t iMaxVmv = pSliceHeader->pSps->pSLevelLimits->iMaxVmv;
+  pRefCount[0] = pSliceHeader->uiRefCount[0];
+  pRefCount[1] = pSliceHeader->uiRefCount[1];
+
+  MbType mbType = pCurDqLayer->pDec->pMbType[iMbXy];
+
+  bool bIsPending = GetThreadCount (pCtx) > 1;
+
+  if (IS_DIRECT (mbType)) {
+
+    int16_t pMvDirect[LIST_A][2] = { { 0, 0 }, { 0, 0 } };
+    SubMbType subMbType;
+    if (pSliceHeader->iDirectSpatialMvPredFlag) {
+      //predict direct spatial mv
+      int32_t ret = PredMvBDirectSpatial (pCtx, pMvDirect, iRef, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    } else {
+      //temporal direct 16x16 mode
+      int32_t ret = PredBDirectTemporal (pCtx, pMvDirect, iRef, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    }
+  } else if (IS_INTER_16x16 (mbType)) {
+    iPartIdx = 0;
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      iRef[listIdx] = REF_NOT_IN_LIST;
+      if (IS_DIR (mbType, 0, listIdx)) {
+        WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, pDirect, listIdx, iPartIdx,
+                                            pRefCount[listIdx], 0,
+                                            iRef[listIdx]));
+        if ((iRef[listIdx] < 0) || (iRef[listIdx] >= pRefCount[listIdx])
+            || (pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]] == NULL)) { //error ref_idx
+          pCtx->bMbRefConcealed = true;
+          if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+            iRef[listIdx] = 0;
+            pCtx->iErrorCode |= dsBitstreamError;
+            RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]]);
+          } else {
+            return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+          }
+        }
+        pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]]
+                                && (pCtx->sRefPic.pRefList[listIdx][iRef[listIdx]]->bIsComplete || bIsPending));
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      if (IS_DIR (mbType, 0, listIdx)) {
+        PredMv (pMotionVector, pRefIndex, listIdx, 0, 4, iRef[listIdx], pMv);
+        WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 0, pMvd[0]));
+        WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 1, pMvd[1]));
+        pMv[0] += pMvd[0];
+        pMv[1] += pMvd[1];
+        WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      } else {
+        * (uint32_t*)pMv = * (uint32_t*)pMvd = 0;
+      }
+      UpdateP16x16MotionInfo (pCurDqLayer, listIdx, iRef[listIdx], pMv);
+      UpdateP16x16MvdCabac (pCurDqLayer, pMvd, listIdx);
+    }
+  } else if (IS_INTER_16x8 (mbType)) {
+    int8_t ref_idx_list[LIST_A][2] = { {REF_NOT_IN_LIST, REF_NOT_IN_LIST}, { REF_NOT_IN_LIST, REF_NOT_IN_LIST } };
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        iPartIdx = i << 3;
+        int8_t ref_idx = REF_NOT_IN_LIST;
+        if (IS_DIR (mbType, i, listIdx)) {
+          WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, pDirect, listIdx, iPartIdx,
+                                              pRefCount[listIdx], 0, ref_idx));
+          if ((ref_idx < 0) || (ref_idx >= pRefCount[listIdx])
+              || (pCtx->sRefPic.pRefList[listIdx][ref_idx] == NULL)) { //error ref_idx
+            pCtx->bMbRefConcealed = true;
+            if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+              ref_idx = 0;
+              pCtx->iErrorCode |= dsBitstreamError;
+              RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
+            } else {
+              return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+            }
+          }
+          pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (pCtx->sRefPic.pRefList[listIdx][ref_idx]
+                                  && (pCtx->sRefPic.pRefList[listIdx][ref_idx]->bIsComplete || bIsPending));
+        }
+        UpdateP16x8RefIdxCabac (pCurDqLayer, pRefIndex, iPartIdx, ref_idx, listIdx);
+        ref_idx_list[listIdx][i] = ref_idx;
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        iPartIdx = i << 3;
+        int8_t ref_idx = ref_idx_list[listIdx][i];
+        if (IS_DIR (mbType, i, listIdx)) {
+          PredInter16x8Mv (pMotionVector, pRefIndex, listIdx, iPartIdx, ref_idx, pMv);
+          WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 0, pMvd[0]));
+          WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 1, pMvd[1]));
+          pMv[0] += pMvd[0];
+          pMv[1] += pMvd[1];
+          WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        } else {
+          * (uint32_t*)pMv = * (uint32_t*)pMvd = 0;
+        }
+        UpdateP16x8MotionInfo (pCurDqLayer, pMotionVector, pRefIndex, listIdx, iPartIdx, ref_idx, pMv);
+        UpdateP16x8MvdCabac (pCurDqLayer, pMvdCache, iPartIdx, pMvd, listIdx);
+      }
+    }
+  } else if (IS_INTER_8x16 (mbType)) {
+    int8_t ref_idx_list[LIST_A][2] = { { REF_NOT_IN_LIST, REF_NOT_IN_LIST }, { REF_NOT_IN_LIST, REF_NOT_IN_LIST } };
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        iPartIdx = i << 2;
+        int8_t ref_idx = REF_NOT_IN_LIST;
+        if (IS_DIR (mbType, i, listIdx)) {
+          WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, pDirect, listIdx, iPartIdx,
+                                              pRefCount[listIdx], 0, ref_idx));
+          if ((ref_idx < 0) || (ref_idx >= pRefCount[listIdx])
+              || (pCtx->sRefPic.pRefList[listIdx][ref_idx] == NULL)) { //error ref_idx
+            pCtx->bMbRefConcealed = true;
+            if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+              ref_idx = 0;
+              pCtx->iErrorCode |= dsBitstreamError;
+              RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][ref_idx]);
+            } else {
+              return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+            }
+          }
+          pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (pCtx->sRefPic.pRefList[listIdx][ref_idx]
+                                  && (pCtx->sRefPic.pRefList[listIdx][ref_idx]->bIsComplete || bIsPending));
+        }
+        UpdateP8x16RefIdxCabac (pCurDqLayer, pRefIndex, iPartIdx, ref_idx, listIdx);
+        ref_idx_list[listIdx][i] = ref_idx;
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        iPartIdx = i << 2;
+        int8_t ref_idx = ref_idx_list[listIdx][i];
+        if (IS_DIR (mbType, i, listIdx)) {
+          PredInter8x16Mv (pMotionVector, pRefIndex, listIdx, iPartIdx, ref_idx, pMv);
+          WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 0, pMvd[0]));
+          WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 1, pMvd[1]));
+          pMv[0] += pMvd[0];
+          pMv[1] += pMvd[1];
+          WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        } else {
+          * (uint32_t*)pMv = * (uint32_t*)pMvd = 0;
+        }
+        UpdateP8x16MotionInfo (pCurDqLayer, pMotionVector, pRefIndex, listIdx, iPartIdx, ref_idx, pMv);
+        UpdateP8x16MvdCabac (pCurDqLayer, pMvdCache, iPartIdx, pMvd, listIdx);
+      }
+    }
+  } else if (IS_Inter_8x8 (mbType)) {
+    int8_t pSubPartCount[4], pPartW[4];
+    uint32_t uiSubMbType;
+    //sub_mb_type, partition
+    int16_t pMvDirect[LIST_A][2] = { {0, 0}, {0, 0} };
+    if (pCtx->sRefPic.pRefList[LIST_1][0] == NULL) {
+      SLogContext* pLogCtx = & (pCtx->sLogCtx);
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "Colocated Ref Picture for B-Slice is lost, B-Slice decoding cannot be continued!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+    }
+    bool bIsLongRef = pCtx->sRefPic.pRefList[LIST_1][0]->bIsLongRef;
+    const int32_t ref0Count = WELS_MIN (pSliceHeader->uiRefCount[LIST_0], pCtx->sRefPic.uiRefCount[LIST_0]);
+    bool has_direct_called = false;
+    SubMbType directSubMbType = 0;
+    for (int32_t i = 0; i < 4; i++) {
+      WELS_READ_VERIFY (ParseBSubMBTypeCabac (pCtx, pNeighAvail, uiSubMbType));
+      if (uiSubMbType >= 13) { //invalid sub_mb_type
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_SUB_MB_TYPE);
+      }
+//      pCurDqLayer->pSubMbType[iMbXy][i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iType;
+      pSubPartCount[i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iPartCount;
+      pPartW[i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iPartWidth;
+
+      // Need modification when B picture add in, reference to 7.3.5
+      if (pSubPartCount[i] > 1)
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = false;
+
+      if (IS_DIRECT (g_ksInterBSubMbTypeInfo[uiSubMbType].iType)) {
+        if (!has_direct_called) {
+          if (pSliceHeader->iDirectSpatialMvPredFlag) {
+            int32_t ret = PredMvBDirectSpatial (pCtx, pMvDirect, iRef, directSubMbType);
+            if (ret != ERR_NONE) {
+              return ret;
+            }
+
+          } else {
+            //temporal direct mode
+            int32_t ret = PredBDirectTemporal (pCtx, pMvDirect, iRef, directSubMbType);
+            if (ret != ERR_NONE) {
+              return ret;
+            }
+          }
+          has_direct_called = true;
+        }
+        pCurDqLayer->pSubMbType[iMbXy][i] = directSubMbType;
+        if (IS_SUB_4x4 (pCurDqLayer->pSubMbType[iMbXy][i])) {
+          pSubPartCount[i] = 4;
+          pPartW[i] = 1;
+        }
+      } else {
+        pCurDqLayer->pSubMbType[iMbXy][i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iType;
+      }
+    }
+    for (int32_t i = 0; i < 4; i++) { //Direct 8x8 Ref and mv
+      int16_t iIdx8 = i << 2;
+      if (IS_DIRECT (pCurDqLayer->pSubMbType[iMbXy][i])) {
+        if (pSliceHeader->iDirectSpatialMvPredFlag) {
+          FillSpatialDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], directSubMbType, bIsLongRef, pMvDirect, iRef,
+                                  pMotionVector, pMvdCache);
+        } else {
+          int16_t (*mvColoc)[2] = pCurDqLayer->iColocMv[LIST_0];
+          iRef[LIST_1] = 0;
+          iRef[LIST_0] = 0;
+          const uint8_t uiColoc4Idx = g_kuiScan4[iIdx8];
+          if (!pCurDqLayer->iColocIntra[uiColoc4Idx]) {
+            iRef[LIST_0] = 0;
+            int8_t colocRefIndexL0 = pCurDqLayer->iColocRefIndex[LIST_0][uiColoc4Idx];
+            if (colocRefIndexL0 >= 0) {
+              iRef[LIST_0] = MapColToList0 (pCtx, colocRefIndexL0, ref0Count);
+            } else {
+              mvColoc = pCurDqLayer->iColocMv[LIST_1];
+            }
+          }
+          Update8x8RefIdx (pCurDqLayer, iIdx8, LIST_0, iRef[LIST_0]);
+          Update8x8RefIdx (pCurDqLayer, iIdx8, LIST_1, iRef[LIST_1]);
+          UpdateP8x8RefCacheIdxCabac (pRefIndex, iIdx8, LIST_0, iRef[LIST_0]);
+          UpdateP8x8RefCacheIdxCabac (pRefIndex, iIdx8, LIST_1, iRef[LIST_1]);
+          FillTemporalDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], directSubMbType, iRef, mvColoc, pMotionVector,
+                                   pMvdCache);
+        }
+      }
+    }
+    //ref no-direct
+    int8_t ref_idx_list[LIST_A][4] = { {REF_NOT_IN_LIST, REF_NOT_IN_LIST}, { REF_NOT_IN_LIST, REF_NOT_IN_LIST } };
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 4; i++) {
+        int16_t iIdx8 = i << 2;
+        int32_t subMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+        int8_t iref = REF_NOT_IN_LIST;
+        if (IS_DIRECT (subMbType)) {
+          if (pSliceHeader->iDirectSpatialMvPredFlag) {
+            Update8x8RefIdx (pCurDqLayer, iIdx8, listIdx, iRef[listIdx]);
+            ref_idx_list[listIdx][i] = iRef[listIdx];
+          }
+          UpdateP8x8DirectCabac (pCurDqLayer, iIdx8);
+        } else {
+          if (IS_DIR (subMbType, 0, listIdx)) {
+            WELS_READ_VERIFY (ParseRefIdxCabac (pCtx, pNeighAvail, pNonZeroCount, pRefIndex, pDirect, listIdx, iIdx8,
+                                                pRefCount[listIdx], 1,
+                                                iref));
+            if ((iref < 0) || (iref >= pRefCount[listIdx]) || (pCtx->sRefPic.pRefList[listIdx][iref] == NULL)) { //error ref_idx
+              pCtx->bMbRefConcealed = true;
+              if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+                iref = 0;
+                pCtx->iErrorCode |= dsBitstreamError;
+                RETURN_ERR_IF_NULL(pCtx->sRefPic.pRefList[listIdx][iref]);
+              } else {
+                return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+              }
+            }
+            pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (pCtx->sRefPic.pRefList[listIdx][iref]
+                                    && (pCtx->sRefPic.pRefList[listIdx][iref]->bIsComplete || bIsPending));
+          }
+          Update8x8RefIdx (pCurDqLayer, iIdx8, listIdx, iref);
+          ref_idx_list[listIdx][i] = iref;
+        }
+      }
+    }
+    //mv
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 4; i++) {
+        int16_t iIdx8 = i << 2;
+
+        uint32_t subMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+        if (IS_DIRECT (subMbType) && !pSliceHeader->iDirectSpatialMvPredFlag)
+          continue;
+
+        int8_t iref = ref_idx_list[listIdx][i];
+        UpdateP8x8RefCacheIdxCabac (pRefIndex, iIdx8, listIdx, iref);
+
+        if (IS_DIRECT (subMbType))
+          continue;
+
+        bool is_dir = IS_DIR (subMbType, 0, listIdx) > 0;
+        int8_t iPartCount = pSubPartCount[i];
+        int16_t iBlockW = pPartW[i];
+        uint8_t iScan4Idx, iCacheIdx;
+        for (int32_t j = 0; j < iPartCount; j++) {
+          iPartIdx = (i << 2) + j * iBlockW;
+          iScan4Idx = g_kuiScan4[iPartIdx];
+          iCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+          if (is_dir) {
+            PredMv (pMotionVector, pRefIndex, listIdx, iPartIdx, iBlockW, iref, pMv);
+            WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 0, pMvd[0]));
+            WELS_READ_VERIFY (ParseMvdInfoCabac (pCtx, pNeighAvail, pRefIndex, pMvdCache, iPartIdx, listIdx, 1, pMvd[1]));
+            pMv[0] += pMvd[0];
+            pMv[1] += pMvd[1];
+            WELS_CHECK_SE_BOTH_WARNING (pMv[1], iMinVmv, iMaxVmv, "vertical mv");
+          } else {
+            * (uint32_t*)pMv = * (uint32_t*)pMvd = 0;
+          }
+          if (IS_SUB_8x8 (subMbType)) { //MB_TYPE_8x8
+            ST32 ((pMv + 2), LD32 (pMv));
+            ST32 ((pMvd + 2), LD32 (pMvd));
+            ST64 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx], LD64 (pMv));
+            ST64 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx + 4], LD64 (pMv));
+            ST64 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx], LD64 (pMvd));
+            ST64 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx + 4], LD64 (pMvd));
+            ST64 (pMotionVector[listIdx][iCacheIdx], LD64 (pMv));
+            ST64 (pMotionVector[listIdx][iCacheIdx + 6], LD64 (pMv));
+            ST64 (pMvdCache[listIdx][iCacheIdx], LD64 (pMvd));
+            ST64 (pMvdCache[listIdx][iCacheIdx + 6], LD64 (pMvd));
+          } else if (IS_SUB_4x4 (subMbType)) { //MB_TYPE_4x4
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx], LD32 (pMv));
+            ST32 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx], LD32 (pMvd));
+            ST32 (pMotionVector[listIdx][iCacheIdx], LD32 (pMv));
+            ST32 (pMvdCache[listIdx][iCacheIdx], LD32 (pMvd));
+          } else if (IS_SUB_4x8 (subMbType)) { //MB_TYPE_4x8 5, 7, 9
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx], LD32 (pMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx + 4], LD32 (pMv));
+            ST32 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx], LD32 (pMvd));
+            ST32 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx + 4], LD32 (pMvd));
+            ST32 (pMotionVector[listIdx][iCacheIdx], LD32 (pMv));
+            ST32 (pMotionVector[listIdx][iCacheIdx + 6], LD32 (pMv));
+            ST32 (pMvdCache[listIdx][iCacheIdx], LD32 (pMvd));
+            ST32 (pMvdCache[listIdx][iCacheIdx + 6], LD32 (pMvd));
+          } else { //MB_TYPE_8x4 4, 6, 8
+            ST32 ((pMv + 2), LD32 (pMv));
+            ST32 ((pMvd + 2), LD32 (pMvd));
+            ST64 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][iScan4Idx], LD64 (pMv));
+            ST64 (pCurDqLayer->pMvd[listIdx][iMbXy][iScan4Idx], LD64 (pMvd));
+            ST64 (pMotionVector[listIdx][iCacheIdx], LD64 (pMv));
+            ST64 (pMvdCache[listIdx][iCacheIdx], LD64 (pMvd));
+          }
+        }
+      }
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseRefIdxCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint8_t* nzc,
+                          int8_t ref_idx[LIST_A][30], int8_t direct[30],
+                          int32_t iListIdx, int32_t iZOrderIdx, int32_t iActiveRefNum, int32_t b8mode, int8_t& iRefIdxVal) {
+  if (iActiveRefNum == 1) {
+    iRefIdxVal = 0;
+    return ERR_NONE;
+  }
+  uint32_t uiCode;
+  int32_t iIdxA = 0, iIdxB = 0;
+  int32_t iCtxInc = 0;
+  int8_t* pRefIdxInMB = pCtx->pCurDqLayer->pDec->pRefIndex[iListIdx][pCtx->pCurDqLayer->iMbXyIndex];
+  int8_t* pDirect = pCtx->pCurDqLayer->pDirect[pCtx->pCurDqLayer->iMbXyIndex];
+  if (iZOrderIdx == 0) {
+    iIdxB = (pNeighAvail->iTopAvail && pNeighAvail->iTopType != MB_TYPE_INTRA_PCM
+             && ref_idx[iListIdx][g_kuiCache30ScanIdx[iZOrderIdx] - 6] > 0);
+    iIdxA = (pNeighAvail->iLeftAvail && pNeighAvail->iLeftType != MB_TYPE_INTRA_PCM
+             && ref_idx[iListIdx][g_kuiCache30ScanIdx[iZOrderIdx] - 1] > 0);
+    if (pCtx->eSliceType == B_SLICE) {
+      if (iIdxB > 0 && direct[g_kuiCache30ScanIdx[iZOrderIdx] - 6] == 0) {
+        iCtxInc += 2;
+      }
+      if (iIdxA > 0 && direct[g_kuiCache30ScanIdx[iZOrderIdx] - 1] == 0) {
+        iCtxInc++;
+      }
+    }
+  } else if (iZOrderIdx == 4) {
+    iIdxB = (pNeighAvail->iTopAvail && pNeighAvail->iTopType != MB_TYPE_INTRA_PCM
+             && ref_idx[iListIdx][g_kuiCache30ScanIdx[iZOrderIdx] - 6] > 0);
+    iIdxA = pRefIdxInMB[g_kuiScan4[iZOrderIdx] - 1] > 0;
+    if (pCtx->eSliceType == B_SLICE) {
+      if (iIdxB > 0 && direct[g_kuiCache30ScanIdx[iZOrderIdx] - 6] == 0) {
+        iCtxInc += 2;
+      }
+      if (iIdxA > 0 && pDirect[g_kuiScan4[iZOrderIdx] - 1] == 0) {
+        iCtxInc ++;
+      }
+    }
+  } else if (iZOrderIdx == 8) {
+
+    iIdxB = pRefIdxInMB[g_kuiScan4[iZOrderIdx] - 4] > 0;
+    iIdxA = (pNeighAvail->iLeftAvail && pNeighAvail->iLeftType != MB_TYPE_INTRA_PCM
+             && ref_idx[iListIdx][g_kuiCache30ScanIdx[iZOrderIdx] - 1] > 0);
+    if (pCtx->eSliceType == B_SLICE) {
+      if (iIdxB > 0 && pDirect[g_kuiScan4[iZOrderIdx] - 4] == 0) {
+        iCtxInc += 2;
+      }
+      if (iIdxA > 0 && direct[g_kuiCache30ScanIdx[iZOrderIdx] - 1] == 0) {
+        iCtxInc++;
+      }
+    }
+  } else {
+    iIdxB = pRefIdxInMB[g_kuiScan4[iZOrderIdx] - 4] > 0;
+    iIdxA = pRefIdxInMB[g_kuiScan4[iZOrderIdx] - 1] > 0;
+    if (pCtx->eSliceType == B_SLICE) {
+      if (iIdxB > 0 && pDirect[g_kuiScan4[iZOrderIdx] - 4] == 0) {
+        iCtxInc += 2;
+      }
+      if (iIdxA > 0 && pDirect[g_kuiScan4[iZOrderIdx] - 1] == 0) {
+        iCtxInc++;
+      }
+    }
+  }
+  if (pCtx->eSliceType != B_SLICE) {
+    iCtxInc = iIdxA + (iIdxB << 1);
+  }
+
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_REF_NO + iCtxInc, uiCode));
+  if (uiCode) {
+    WELS_READ_VERIFY (DecodeUnaryBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_REF_NO + 4, 1, uiCode));
+    ++uiCode;
+  }
+  iRefIdxVal = (int8_t) uiCode;
+  return ERR_NONE;
+}
+
+int32_t ParseMvdInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, int8_t pRefIndex[LIST_A][30],
+                           int16_t pMvdCache[LIST_A][30][2], int32_t index, int8_t iListIdx, int8_t iMvComp, int16_t& iMvdVal) {
+  uint32_t uiCode;
+  int32_t iIdxA = 0;
+  //int32_t sym;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_MVD + iMvComp * CTX_NUM_MVD;
+  iMvdVal = 0;
+
+  if (pRefIndex[iListIdx][g_kuiCache30ScanIdx[index] - 6] >= 0)
+    iIdxA = WELS_ABS (pMvdCache[iListIdx][g_kuiCache30ScanIdx[index] - 6][iMvComp]);
+  if (pRefIndex[iListIdx][g_kuiCache30ScanIdx[index] - 1] >= 0)
+    iIdxA += WELS_ABS (pMvdCache[iListIdx][g_kuiCache30ScanIdx[index] - 1][iMvComp]);
+
+  int32_t iCtxInc = 0;
+  if (iIdxA >= 3)
+    iCtxInc = 1 + (iIdxA > 32);
+
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine,  pBinCtx + iCtxInc, uiCode));
+  if (uiCode) {
+    WELS_READ_VERIFY (DecodeUEGMvCabac (pCtx->pCabacDecEngine, pBinCtx + 3, 3, uiCode));
+    iMvdVal = (int16_t) (uiCode + 1);
+    WELS_READ_VERIFY (DecodeBypassCabac (pCtx->pCabacDecEngine, uiCode));
+    if (uiCode) {
+      iMvdVal = -iMvdVal;
+    }
+  } else {
+    iMvdVal = 0;
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseCbpInfoCabac (PWelsDecoderContext pCtx, PWelsNeighAvail pNeighAvail, uint32_t& uiCbp) {
+  int32_t iIdxA = 0, iIdxB = 0, pALeftMb[2], pBTopMb[2];
+  uiCbp = 0;
+  uint32_t pCbpBit[6];
+  int32_t iCtxInc;
+
+  //Luma: bit by bit for 4 8x8 blocks in z-order
+  pBTopMb[0]  = pNeighAvail->iTopAvail  && pNeighAvail->iTopType  != MB_TYPE_INTRA_PCM
+                && ((pNeighAvail->iTopCbp  & (1 << 2)) == 0);
+  pBTopMb[1]  = pNeighAvail->iTopAvail  && pNeighAvail->iTopType  != MB_TYPE_INTRA_PCM
+                && ((pNeighAvail->iTopCbp  & (1 << 3)) == 0);
+  pALeftMb[0] = pNeighAvail->iLeftAvail && pNeighAvail->iLeftType != MB_TYPE_INTRA_PCM
+                && ((pNeighAvail->iLeftCbp & (1 << 1)) == 0);
+  pALeftMb[1] = pNeighAvail->iLeftAvail && pNeighAvail->iLeftType != MB_TYPE_INTRA_PCM
+                && ((pNeighAvail->iLeftCbp & (1 << 3)) == 0);
+
+  //left_top 8x8 block
+  iCtxInc = pALeftMb[0] + (pBTopMb[0] << 1);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + iCtxInc, pCbpBit[0]));
+  if (pCbpBit[0])
+    uiCbp += 0x01;
+
+  //right_top 8x8 block
+  iIdxA = !pCbpBit[0];
+  iCtxInc = iIdxA + (pBTopMb[1] << 1);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + iCtxInc, pCbpBit[1]));
+  if (pCbpBit[1])
+    uiCbp += 0x02;
+
+  //left_bottom 8x8 block
+  iIdxB = !pCbpBit[0];
+  iCtxInc = pALeftMb[1] + (iIdxB << 1);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + iCtxInc, pCbpBit[2]));
+  if (pCbpBit[2])
+    uiCbp += 0x04;
+
+  //right_bottom 8x8 block
+  iIdxB = !pCbpBit[1];
+  iIdxA = !pCbpBit[2];
+  iCtxInc = iIdxA + (iIdxB << 1);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + iCtxInc, pCbpBit[3]));
+  if (pCbpBit[3])
+    uiCbp += 0x08;
+
+  if (pCtx->pSps->uiChromaFormatIdc == 0)//monochroma
+    return ERR_NONE;
+
+
+  //Chroma: bit by bit
+  iIdxB = pNeighAvail->iTopAvail  && (pNeighAvail->iTopType  == MB_TYPE_INTRA_PCM || (pNeighAvail->iTopCbp  >> 4));
+  iIdxA = pNeighAvail->iLeftAvail && (pNeighAvail->iLeftType == MB_TYPE_INTRA_PCM || (pNeighAvail->iLeftCbp >> 4));
+
+  //BitIdx = 0
+  iCtxInc = iIdxA + (iIdxB << 1);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + CTX_NUM_CBP + iCtxInc,
+                                    pCbpBit[4]));
+
+  //BitIdx = 1
+  if (pCbpBit[4]) {
+    iIdxB = pNeighAvail->iTopAvail  && (pNeighAvail->iTopType  == MB_TYPE_INTRA_PCM || (pNeighAvail->iTopCbp  >> 4) == 2);
+    iIdxA = pNeighAvail->iLeftAvail && (pNeighAvail->iLeftType == MB_TYPE_INTRA_PCM || (pNeighAvail->iLeftCbp >> 4) == 2);
+    iCtxInc = iIdxA + (iIdxB << 1);
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine,
+                                      pCtx->pCabacCtx + NEW_CTX_OFFSET_CBP + 2 * CTX_NUM_CBP + iCtxInc,
+                                      pCbpBit[5]));
+    uiCbp += 1 << (4 + pCbpBit[5]);
+
+  }
+
+  return ERR_NONE;
+}
+
+int32_t ParseDeltaQpCabac (PWelsDecoderContext pCtx, int32_t& iQpDelta) {
+  uint32_t uiCode;
+  PSlice pCurrSlice = & (pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer);
+  iQpDelta = 0;
+  PWelsCabacCtx pBinCtx = pCtx->pCabacCtx + NEW_CTX_OFFSET_DELTA_QP;
+  int32_t iCtxInc = (pCurrSlice->iLastDeltaQp != 0);
+  WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pBinCtx + iCtxInc, uiCode));
+  if (uiCode != 0) {
+    WELS_READ_VERIFY (DecodeUnaryBinCabac (pCtx->pCabacDecEngine, pBinCtx + 2, 1, uiCode));
+    uiCode++;
+    iQpDelta = (uiCode + 1) >> 1;
+    if ((uiCode & 1) == 0)
+      iQpDelta = - iQpDelta;
+  }
+  pCurrSlice->iLastDeltaQp = iQpDelta;
+  return ERR_NONE;
+}
+
+int32_t ParseCbfInfoCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNzcCache, int32_t iZIndex, int32_t iResProperty,
+                           PWelsDecoderContext pCtx, uint32_t& uiCbfBit) {
+  int8_t nA, nB/*, zigzag_idx = 0*/;
+  int32_t iCurrBlkXy = pCtx->pCurDqLayer->iMbXyIndex;
+  int32_t iTopBlkXy = iCurrBlkXy - pCtx->pCurDqLayer->iMbWidth; //default value: MB neighboring
+  int32_t iLeftBlkXy = iCurrBlkXy - 1; //default value: MB neighboring
+  uint16_t* pCbfDc = pCtx->pCurDqLayer->pCbfDc;
+  uint32_t* pMbType = pCtx->pCurDqLayer->pDec->pMbType;
+  int32_t iCtxInc;
+  uiCbfBit = 0;
+  nA = nB = (int8_t)!!IS_INTRA (pMbType[iCurrBlkXy]);
+
+  if (iResProperty == I16_LUMA_DC || iResProperty == CHROMA_DC_U || iResProperty == CHROMA_DC_V) { //DC
+    if (pNeighAvail->iTopAvail)
+      nB = (pMbType[iTopBlkXy] == MB_TYPE_INTRA_PCM) || ((pCbfDc[iTopBlkXy] >> iResProperty) & 1);
+    if (pNeighAvail->iLeftAvail)
+      nA = (pMbType[iLeftBlkXy] == MB_TYPE_INTRA_PCM) || ((pCbfDc[iLeftBlkXy] >> iResProperty) & 1);
+    iCtxInc = nA + (nB << 1);
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine,
+                                      pCtx->pCabacCtx + NEW_CTX_OFFSET_CBF + g_kBlockCat2CtxOffsetCBF[iResProperty] + iCtxInc, uiCbfBit));
+    if (uiCbfBit)
+      pCbfDc[iCurrBlkXy] |= (1 << iResProperty);
+  } else { //AC
+    //for 4x4 blk, make sure blk-idx is correct
+    if (pNzcCache[g_kCacheNzcScanIdx[iZIndex] - 8] != 0xff) { //top blk available
+      if (g_kTopBlkInsideMb[iZIndex])
+        iTopBlkXy = iCurrBlkXy;
+      nB = pNzcCache[g_kCacheNzcScanIdx[iZIndex] - 8] || pMbType[iTopBlkXy]  == MB_TYPE_INTRA_PCM;
+    }
+    if (pNzcCache[g_kCacheNzcScanIdx[iZIndex] - 1] != 0xff) { //left blk available
+      if (g_kLeftBlkInsideMb[iZIndex])
+        iLeftBlkXy = iCurrBlkXy;
+      nA = pNzcCache[g_kCacheNzcScanIdx[iZIndex] - 1] || pMbType[iLeftBlkXy] == MB_TYPE_INTRA_PCM;
+    }
+
+    iCtxInc = nA + (nB << 1);
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine,
+                                      pCtx->pCabacCtx + NEW_CTX_OFFSET_CBF + g_kBlockCat2CtxOffsetCBF[iResProperty] + iCtxInc, uiCbfBit));
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseSignificantMapCabac (int32_t* pSignificantMap, int32_t iResProperty, PWelsDecoderContext pCtx,
+                                  uint32_t& uiCoeffNum) {
+  uint32_t uiCode;
+
+  PWelsCabacCtx pMapCtx  = pCtx->pCabacCtx + (iResProperty == LUMA_DC_AC_8 ? NEW_CTX_OFFSET_MAP_8x8 : NEW_CTX_OFFSET_MAP)
+                           + g_kBlockCat2CtxOffsetMap [iResProperty];
+  PWelsCabacCtx pLastCtx = pCtx->pCabacCtx + (iResProperty == LUMA_DC_AC_8 ? NEW_CTX_OFFSET_LAST_8x8 :
+                           NEW_CTX_OFFSET_LAST) + g_kBlockCat2CtxOffsetLast[iResProperty];
+
+
+  int32_t i;
+  uiCoeffNum = 0;
+  int32_t i0 = 0;
+  int32_t i1 = g_kMaxPos[iResProperty];
+
+  int32_t iCtx;
+
+  for (i = i0; i < i1; ++i) {
+    iCtx = (iResProperty == LUMA_DC_AC_8 ? g_kuiIdx2CtxSignificantCoeffFlag8x8[i] : i);
+    //read significant
+    WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pMapCtx + iCtx, uiCode));
+    if (uiCode) {
+      * (pSignificantMap++) = 1;
+      ++ uiCoeffNum;
+      //read last significant
+      iCtx = (iResProperty == LUMA_DC_AC_8 ? g_kuiIdx2CtxLastSignificantCoeffFlag8x8[i] : i);
+      WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pLastCtx + iCtx, uiCode));
+      if (uiCode) {
+        memset (pSignificantMap, 0, (i1 - i) * sizeof (int32_t));
+        return ERR_NONE;
+      }
+    } else
+      * (pSignificantMap++) = 0;
+  }
+
+  //deal with last pSignificantMap if no data
+  //if(i < i1+1)
+  {
+    *pSignificantMap = 1;
+    ++uiCoeffNum;
+  }
+
+  return ERR_NONE;
+}
+
+int32_t ParseSignificantCoeffCabac (int32_t* pSignificant, int32_t iResProperty, PWelsDecoderContext pCtx) {
+  uint32_t uiCode;
+  PWelsCabacCtx pOneCtx = pCtx->pCabacCtx + (iResProperty == LUMA_DC_AC_8 ? NEW_CTX_OFFSET_ONE_8x8 : NEW_CTX_OFFSET_ONE) +
+                          g_kBlockCat2CtxOffsetOne[iResProperty];
+  PWelsCabacCtx pAbsCtx = pCtx->pCabacCtx + (iResProperty == LUMA_DC_AC_8 ? NEW_CTX_OFFSET_ABS_8x8 : NEW_CTX_OFFSET_ABS) +
+                          g_kBlockCat2CtxOffsetAbs[iResProperty];
+
+  const int16_t iMaxType = g_kMaxC2[iResProperty];
+  int32_t i = g_kMaxPos[iResProperty];
+  int32_t* pCoff = pSignificant + i;
+  int32_t c1 = 1;
+  int32_t c2 = 0;
+  for (; i >= 0; --i) {
+    if (*pCoff != 0) {
+      WELS_READ_VERIFY (DecodeBinCabac (pCtx->pCabacDecEngine, pOneCtx + c1, uiCode));
+      *pCoff += uiCode;
+      if (*pCoff == 2) {
+        WELS_READ_VERIFY (DecodeUEGLevelCabac (pCtx->pCabacDecEngine, pAbsCtx + c2, uiCode));
+        *pCoff += uiCode;
+        ++c2;
+        c2 = WELS_MIN (c2, iMaxType);
+        c1 = 0;
+      } else if (c1) {
+        ++c1;
+        c1 = WELS_MIN (c1, 4);
+      }
+      WELS_READ_VERIFY (DecodeBypassCabac (pCtx->pCabacDecEngine, uiCode));
+      if (uiCode)
+        *pCoff = - *pCoff;
+    }
+    pCoff--;
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseResidualBlockCabac8x8 (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCountCache, SBitStringAux* pBsAux,
+                                    int32_t iIndex, int32_t iMaxNumCoeff, const uint8_t* pScanTable, int32_t iResProperty,
+                                    short* sTCoeff, /*int mb_mode*/ uint8_t uiQp, PWelsDecoderContext pCtx) {
+  uint32_t uiTotalCoeffNum = 0;
+  uint32_t uiCbpBit;
+  int32_t pSignificantMap[64] = {0};
+
+  int32_t iMbResProperty = 0;
+  GetMbResProperty (&iMbResProperty, &iResProperty, false);
+  const uint16_t* pDeQuantMul = (pCtx->bUseScalingList) ? pCtx->pDequant_coeff8x8[iMbResProperty - 6][uiQp] :
+                                g_kuiDequantCoeff8x8[uiQp];
+
+  uiCbpBit = 1; // for 8x8, MaxNumCoeff == 64 && uiCbpBit == 1
+  if (uiCbpBit) { //has coeff
+    WELS_READ_VERIFY (ParseSignificantMapCabac (pSignificantMap, iResProperty, pCtx, uiTotalCoeffNum));
+    WELS_READ_VERIFY (ParseSignificantCoeffCabac (pSignificantMap, iResProperty, pCtx));
+  }
+
+  pNonZeroCountCache[g_kCacheNzcScanIdx[iIndex]] =
+    pNonZeroCountCache[g_kCacheNzcScanIdx[iIndex + 1]] =
+      pNonZeroCountCache[g_kCacheNzcScanIdx[iIndex + 2]] =
+        pNonZeroCountCache[g_kCacheNzcScanIdx[iIndex + 3]] = (uint8_t)uiTotalCoeffNum;
+  if (uiTotalCoeffNum == 0) {
+    return ERR_NONE;
+  }
+  int32_t j = 0, i;
+  if (iResProperty == LUMA_DC_AC_8) {
+    do {
+      if (pSignificantMap[j] != 0) {
+        i = pScanTable[ j ];
+        sTCoeff[i] = uiQp >= 36 ? ((pSignificantMap[j] * pDeQuantMul[i]) * (1 << (uiQp / 6 - 6))) : ((
+                       pSignificantMap[j] * pDeQuantMul[i] + (1 << (5 - uiQp / 6))) >> (6 - uiQp / 6));
+      }
+      ++j;
+    } while (j < 64);
+  }
+
+  return ERR_NONE;
+}
+
+int32_t ParseResidualBlockCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCountCache, SBitStringAux* pBsAux,
+                                 int32_t iIndex, int32_t iMaxNumCoeff,
+                                 const uint8_t* pScanTable, int32_t iResProperty, short* sTCoeff, /*int mb_mode*/ uint8_t uiQp,
+                                 PWelsDecoderContext pCtx) {
+  int32_t iCurNzCacheIdx;
+  uint32_t uiTotalCoeffNum = 0;
+  uint32_t uiCbpBit;
+  int32_t pSignificantMap[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+  int32_t iMbResProperty = 0;
+  GetMbResProperty (&iMbResProperty, &iResProperty, false);
+  const uint16_t* pDeQuantMul = (pCtx->bUseScalingList) ? pCtx->pDequant_coeff4x4[iMbResProperty][uiQp] :
+                                g_kuiDequantCoeff[uiQp];
+
+  WELS_READ_VERIFY (ParseCbfInfoCabac (pNeighAvail, pNonZeroCountCache, iIndex, iResProperty, pCtx, uiCbpBit));
+  if (uiCbpBit) { //has coeff
+    WELS_READ_VERIFY (ParseSignificantMapCabac (pSignificantMap, iResProperty, pCtx, uiTotalCoeffNum));
+    WELS_READ_VERIFY (ParseSignificantCoeffCabac (pSignificantMap, iResProperty, pCtx));
+  }
+
+  iCurNzCacheIdx = g_kCacheNzcScanIdx[iIndex];
+  pNonZeroCountCache[iCurNzCacheIdx] = (uint8_t)uiTotalCoeffNum;
+  if (uiTotalCoeffNum == 0) {
+    return ERR_NONE;
+  }
+  int32_t j = 0;
+  if (iResProperty == I16_LUMA_DC) {
+    do {
+      sTCoeff[pScanTable[j]] = pSignificantMap[j];
+      ++j;
+    } while (j < 16);
+    WelsLumaDcDequantIdct (sTCoeff, uiQp, pCtx);
+  } else if (iResProperty == CHROMA_DC_U || iResProperty == CHROMA_DC_V) {
+    do {
+      sTCoeff[pScanTable[j]] = pSignificantMap[j];
+      ++j;
+    } while (j < 4);
+    //iHadamard2x2
+    WelsChromaDcIdct (sTCoeff);
+    //scaling
+    if (!pCtx->bUseScalingList) {
+      for (j = 0; j < 4; ++j) {
+        sTCoeff[pScanTable[j]] = (int16_t) ((int64_t)sTCoeff[pScanTable[j]] * (int64_t)pDeQuantMul[0] >> 1);
+      }
+    } else { //with scaling list
+      for (j = 0; j < 4; ++j) {
+        sTCoeff[pScanTable[j]] = (int16_t) ((int64_t)sTCoeff[pScanTable[j]] * (int64_t)pDeQuantMul[0] >> 5);
+      }
+    }
+  } else { //luma ac, chroma ac
+    do {
+      if (pSignificantMap[j] != 0) {
+        if (!pCtx->bUseScalingList) {
+          sTCoeff[pScanTable[j]] = pSignificantMap[j] * pDeQuantMul[pScanTable[j] & 0x07];
+        } else {
+          sTCoeff[pScanTable[j]] = (int16_t) (((int64_t)pSignificantMap[j] * (int64_t)pDeQuantMul[pScanTable[j]] + 8) >> 4);
+        }
+      }
+      ++j;
+    } while (j < 16);
+  }
+  return ERR_NONE;
+}
+
+int32_t ParseIPCMInfoCabac (PWelsDecoderContext pCtx) {
+  int32_t i;
+  PWelsCabacDecEngine pCabacDecEngine = pCtx->pCabacDecEngine;
+  SBitStringAux* pBsAux = pCtx->pCurDqLayer->pBitStringAux;
+  SDqLayer* pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iDstStrideLuma = pCurDqLayer->pDec->iLinesize[0];
+  int32_t iDstStrideChroma = pCurDqLayer->pDec->iLinesize[1];
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+
+  int32_t iMbOffsetLuma = (iMbX + iMbY * iDstStrideLuma) << 4;
+  int32_t iMbOffsetChroma = (iMbX + iMbY * iDstStrideChroma) << 3;
+
+  uint8_t* pMbDstY = pCtx->pDec->pData[0] + iMbOffsetLuma;
+  uint8_t* pMbDstU = pCtx->pDec->pData[1] + iMbOffsetChroma;
+  uint8_t* pMbDstV = pCtx->pDec->pData[2] + iMbOffsetChroma;
+
+  uint8_t* pPtrSrc;
+
+  pCurDqLayer->pDec->pMbType[iMbXy] = MB_TYPE_INTRA_PCM;
+  RestoreCabacDecEngineToBS (pCabacDecEngine, pBsAux);
+  intX_t iBytesLeft = pBsAux->pEndBuf - pBsAux->pCurBuf;
+  if (iBytesLeft < 384) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_CABAC_NO_BS_TO_READ);
+  }
+  pPtrSrc = pBsAux->pCurBuf;
+  if (!pCtx->pParam->bParseOnly) {
+    for (i = 0; i < 16; i++) {   //luma
+      memcpy (pMbDstY, pPtrSrc, 16);
+      pMbDstY += iDstStrideLuma;
+      pPtrSrc += 16;
+    }
+    for (i = 0; i < 8; i++) {   //cb
+      memcpy (pMbDstU, pPtrSrc, 8);
+      pMbDstU += iDstStrideChroma;
+      pPtrSrc += 8;
+    }
+    for (i = 0; i < 8; i++) {   //cr
+      memcpy (pMbDstV, pPtrSrc, 8);
+      pMbDstV += iDstStrideChroma;
+      pPtrSrc += 8;
+    }
+  }
+
+  pBsAux->pCurBuf += 384;
+
+  pCurDqLayer->pLumaQp[iMbXy] = 0;
+  pCurDqLayer->pChromaQp[iMbXy][0] = pCurDqLayer->pChromaQp[iMbXy][1] = 0;
+  memset (pCurDqLayer->pNzc[iMbXy], 16, sizeof (pCurDqLayer->pNzc[iMbXy]));
+
+  //step 4: cabac engine init
+  WELS_READ_VERIFY (InitReadBits (pBsAux, 1));
+  WELS_READ_VERIFY (InitCabacDecEngineFromBS (pCabacDecEngine, pBsAux));
+  return ERR_NONE;
+}
+void    UpdateP8x8RefCacheIdxCabac (int8_t pRefIndex[LIST_A][30], const int16_t& iPartIdx,
+                                    const int32_t& listIdx, const int8_t& iRef) {
+  const uint8_t uiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+  pRefIndex[listIdx][uiCacheIdx] = pRefIndex[listIdx][uiCacheIdx + 1] = pRefIndex[listIdx][uiCacheIdx + 6] =
+                                     pRefIndex[listIdx][uiCacheIdx + 7] = iRef;
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cavlc.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
new file mode 100644
index 0000000000..dc10d72731
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -0,0 +1,1729 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    parse_mb_syn_cavlc.c
+ *
+ * \brief   Interfaces implementation for parsing the syntax of MB
+ *
+ * \date    03/17/2009 Created
+ *
+ *************************************************************************************
+ */
+
+
+#include "parse_mb_syn_cavlc.h"
+#include "decode_slice.h"
+#include "error_code.h"
+#include "mv_pred.h"
+
+namespace WelsDec {
+#define MAX_LEVEL_PREFIX 15
+
+typedef struct TagReadBitsCache {
+  uint32_t uiCache32Bit;
+  uint8_t  uiRemainBits;
+  uint8_t*  pBuf;
+} SReadBitsCache;
+
+void GetNeighborAvailMbType (PWelsNeighAvail pNeighAvail, PDqLayer pCurDqLayer) {
+  int32_t iCurSliceIdc, iTopSliceIdc, iLeftTopSliceIdc, iRightTopSliceIdc, iLeftSliceIdc;
+  int32_t iCurXy, iTopXy = 0, iLeftXy = 0, iLeftTopXy = 0, iRightTopXy = 0;
+  int32_t iCurX, iCurY;
+
+  iCurXy = pCurDqLayer->iMbXyIndex;
+  iCurX  = pCurDqLayer->iMbX;
+  iCurY  = pCurDqLayer->iMbY;
+  iCurSliceIdc = pCurDqLayer->pSliceIdc[iCurXy];
+  if (iCurX != 0) {
+    iLeftXy = iCurXy - 1;
+    iLeftSliceIdc = pCurDqLayer->pSliceIdc[iLeftXy];
+    pNeighAvail->iLeftAvail = (iLeftSliceIdc == iCurSliceIdc);
+    pNeighAvail->iLeftCbp   = pNeighAvail->iLeftAvail ? pCurDqLayer->pCbp[iLeftXy] : 0;
+  } else {
+    pNeighAvail->iLeftAvail = 0;
+    pNeighAvail->iLeftTopAvail = 0;
+    pNeighAvail->iLeftCbp = 0;
+  }
+
+  if (iCurY != 0) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+    iTopSliceIdc = pCurDqLayer->pSliceIdc[iTopXy];
+    pNeighAvail->iTopAvail = (iTopSliceIdc == iCurSliceIdc);
+    pNeighAvail->iTopCbp   = pNeighAvail->iTopAvail ? pCurDqLayer->pCbp[iTopXy] : 0;
+    if (iCurX != 0) {
+      iLeftTopXy = iTopXy - 1;
+      iLeftTopSliceIdc = pCurDqLayer->pSliceIdc[iLeftTopXy];
+      pNeighAvail->iLeftTopAvail = (iLeftTopSliceIdc == iCurSliceIdc);
+    } else {
+      pNeighAvail->iLeftTopAvail = 0;
+    }
+    if (iCurX != (pCurDqLayer->iMbWidth - 1)) {
+      iRightTopXy = iTopXy + 1;
+      iRightTopSliceIdc = pCurDqLayer->pSliceIdc[iRightTopXy];
+      pNeighAvail->iRightTopAvail = (iRightTopSliceIdc == iCurSliceIdc);
+    } else {
+      pNeighAvail->iRightTopAvail = 0;
+    }
+  } else {
+    pNeighAvail->iTopAvail = 0;
+    pNeighAvail->iLeftTopAvail = 0;
+    pNeighAvail->iRightTopAvail = 0;
+    pNeighAvail->iTopCbp   = 0;
+  }
+
+  pNeighAvail->iLeftType     = (pNeighAvail->iLeftAvail     ? pCurDqLayer->pDec->pMbType[iLeftXy]     : 0);
+  pNeighAvail->iTopType      = (pNeighAvail->iTopAvail      ? pCurDqLayer->pDec->pMbType[iTopXy]      : 0);
+  pNeighAvail->iLeftTopType  = (pNeighAvail->iLeftTopAvail  ? pCurDqLayer->pDec->pMbType[iLeftTopXy]  : 0);
+  pNeighAvail->iRightTopType = (pNeighAvail->iRightTopAvail ? pCurDqLayer->pDec->pMbType[iRightTopXy] : 0);
+}
+void WelsFillCacheNonZeroCount (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                                PDqLayer pCurDqLayer) { //no matter slice type, intra_pred_constrained_flag
+  int32_t iCurXy  = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy  = 0;
+  int32_t iLeftXy = 0;
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+
+  //stuff non_zero_coeff_count from pNeighAvail(left and top)
+  if (pNeighAvail->iTopAvail) {
+    ST32 (&pNonZeroCount[1], LD32 (&pCurDqLayer->pNzc[iTopXy][12]));
+    pNonZeroCount[0] = pNonZeroCount[5] = pNonZeroCount[29] = 0;
+    ST16 (&pNonZeroCount[6], LD16 (&pCurDqLayer->pNzc[iTopXy][20]));
+    ST16 (&pNonZeroCount[30], LD16 (&pCurDqLayer->pNzc[iTopXy][22]));
+  } else {
+    ST32 (&pNonZeroCount[1], 0xFFFFFFFFU);
+    pNonZeroCount[0] = pNonZeroCount[5] = pNonZeroCount[29] = 0xFF;
+    ST16 (&pNonZeroCount[6], 0xFFFF);
+    ST16 (&pNonZeroCount[30], 0xFFFF);
+  }
+
+  if (pNeighAvail->iLeftAvail) {
+    pNonZeroCount[8 * 1] = pCurDqLayer->pNzc[iLeftXy][3];
+    pNonZeroCount[8 * 2] = pCurDqLayer->pNzc[iLeftXy][7];
+    pNonZeroCount[8 * 3] = pCurDqLayer->pNzc[iLeftXy][11];
+    pNonZeroCount[8 * 4] = pCurDqLayer->pNzc[iLeftXy][15];
+
+    pNonZeroCount[5 + 8 * 1] = pCurDqLayer->pNzc[iLeftXy][17];
+    pNonZeroCount[5 + 8 * 2] = pCurDqLayer->pNzc[iLeftXy][21];
+    pNonZeroCount[5 + 8 * 4] = pCurDqLayer->pNzc[iLeftXy][19];
+    pNonZeroCount[5 + 8 * 5] = pCurDqLayer->pNzc[iLeftXy][23];
+  } else {
+    pNonZeroCount[8 * 1] =
+      pNonZeroCount[8 * 2] =
+        pNonZeroCount[8 * 3] =
+          pNonZeroCount[8 * 4] = -1;//unavailable
+
+    pNonZeroCount[5 + 8 * 1] =
+      pNonZeroCount[5 + 8 * 2] = -1;//unavailable
+
+    pNonZeroCount[5 + 8 * 4] =
+      pNonZeroCount[5 + 8 * 5] = -1;//unavailable
+  }
+}
+void WelsFillCacheConstrain1IntraNxN (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+                                      PDqLayer pCurDqLayer) { //no matter slice type
+  int32_t iCurXy  = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy  = 0;
+  int32_t iLeftXy = 0;
+
+  //stuff non_zero_coeff_count from pNeighAvail(left and top)
+  WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+
+  //intraNxN_pred_mode
+  if (pNeighAvail->iTopAvail && IS_INTRANxN (pNeighAvail->iTopType)) { //top
+    ST32 (pIntraPredMode + 1, LD32 (&pCurDqLayer->pIntraPredMode[iTopXy][0]));
+  } else {
+    int32_t iPred;
+    if (IS_INTRA16x16 (pNeighAvail->iTopType) || (MB_TYPE_INTRA_PCM == pNeighAvail->iTopType))
+      iPred = 0x02020202;
+    else
+      iPred = 0xffffffff;
+    ST32 (pIntraPredMode + 1, iPred);
+  }
+
+  if (pNeighAvail->iLeftAvail && IS_INTRANxN (pNeighAvail->iLeftType)) { //left
+    pIntraPredMode[ 0 + 8    ] = pCurDqLayer->pIntraPredMode[iLeftXy][4];
+    pIntraPredMode[ 0 + 8 * 2] = pCurDqLayer->pIntraPredMode[iLeftXy][5];
+    pIntraPredMode[ 0 + 8 * 3] = pCurDqLayer->pIntraPredMode[iLeftXy][6];
+    pIntraPredMode[ 0 + 8 * 4] = pCurDqLayer->pIntraPredMode[iLeftXy][3];
+  } else {
+    int8_t iPred;
+    if (IS_INTRA16x16 (pNeighAvail->iLeftType) || (MB_TYPE_INTRA_PCM == pNeighAvail->iLeftType))
+      iPred = 2;
+    else
+      iPred = -1;
+    pIntraPredMode[ 0 + 8    ] =
+      pIntraPredMode[ 0 + 8 * 2] =
+        pIntraPredMode[ 0 + 8 * 3] =
+          pIntraPredMode[ 0 + 8 * 4] = iPred;
+  }
+}
+
+void WelsFillCacheConstrain0IntraNxN (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int8_t* pIntraPredMode,
+                                      PDqLayer pCurDqLayer) { //no matter slice type
+  int32_t iCurXy  = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy  = 0;
+  int32_t iLeftXy = 0;
+
+  //stuff non_zero_coeff_count from pNeighAvail(left and top)
+  WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+
+  //intra4x4_pred_mode
+  if (pNeighAvail->iTopAvail && IS_INTRANxN (pNeighAvail->iTopType)) { //top
+    ST32 (pIntraPredMode + 1, LD32 (&pCurDqLayer->pIntraPredMode[iTopXy][0]));
+  } else {
+    int32_t iPred;
+    if (pNeighAvail->iTopAvail)
+      iPred = 0x02020202;
+    else
+      iPred = 0xffffffff;
+    ST32 (pIntraPredMode + 1, iPred);
+  }
+
+  if (pNeighAvail->iLeftAvail && IS_INTRANxN (pNeighAvail->iLeftType)) { //left
+    pIntraPredMode[ 0 + 8 * 1] = pCurDqLayer->pIntraPredMode[iLeftXy][4];
+    pIntraPredMode[ 0 + 8 * 2] = pCurDqLayer->pIntraPredMode[iLeftXy][5];
+    pIntraPredMode[ 0 + 8 * 3] = pCurDqLayer->pIntraPredMode[iLeftXy][6];
+    pIntraPredMode[ 0 + 8 * 4] = pCurDqLayer->pIntraPredMode[iLeftXy][3];
+  } else {
+    int8_t iPred;
+    if (pNeighAvail->iLeftAvail)
+      iPred = 2;
+    else
+      iPred = -1;
+    pIntraPredMode[ 0 + 8 * 1] =
+      pIntraPredMode[ 0 + 8 * 2] =
+        pIntraPredMode[ 0 + 8 * 3] =
+          pIntraPredMode[ 0 + 8 * 4] = iPred;
+  }
+}
+
+void WelsFillCacheInterCabac (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount, int16_t iMvArray[LIST_A][30][MV_A],
+                              int16_t iMvdCache[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30], PDqLayer pCurDqLayer) {
+  int32_t iCurXy      = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy      = 0;
+  int32_t iLeftXy     = 0;
+  int32_t iLeftTopXy  = 0;
+  int32_t iRightTopXy = 0;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  int32_t listCount = 1;
+  if (pSliceHeader->eSliceType == B_SLICE) {
+    listCount = 2;
+  }
+  //stuff non_zero_coeff_count from pNeighAvail(left and top)
+  WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+  if (pNeighAvail->iLeftTopAvail) {
+    iLeftTopXy = iCurXy - 1 - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iRightTopAvail) {
+    iRightTopXy = iCurXy + 1 - pCurDqLayer->iMbWidth;
+  }
+
+  for (int32_t listIdx = 0; listIdx < listCount; ++listIdx) {
+    //stuff mv_cache and iRefIdxArray from left and top (inter)
+    if (pNeighAvail->iLeftAvail && IS_INTER (pNeighAvail->iLeftType)) {
+      ST32 (iMvArray[listIdx][6], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][3]));
+      ST32 (iMvArray[listIdx][12], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][7]));
+      ST32 (iMvArray[listIdx][18], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][11]));
+      ST32 (iMvArray[listIdx][24], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][15]));
+
+      ST32 (iMvdCache[listIdx][6], LD32 (pCurDqLayer->pMvd[listIdx][iLeftXy][3]));
+      ST32 (iMvdCache[listIdx][12], LD32 (pCurDqLayer->pMvd[listIdx][iLeftXy][7]));
+      ST32 (iMvdCache[listIdx][18], LD32 (pCurDqLayer->pMvd[listIdx][iLeftXy][11]));
+      ST32 (iMvdCache[listIdx][24], LD32 (pCurDqLayer->pMvd[listIdx][iLeftXy][15]));
+
+      iRefIdxArray[listIdx][6] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][3];
+      iRefIdxArray[listIdx][12] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][7];
+      iRefIdxArray[listIdx][18] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][11];
+      iRefIdxArray[listIdx][24] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][15];
+    } else {
+      ST32 (iMvArray[listIdx][6], 0);
+      ST32 (iMvArray[listIdx][12], 0);
+      ST32 (iMvArray[listIdx][18], 0);
+      ST32 (iMvArray[listIdx][24], 0);
+
+      ST32 (iMvdCache[listIdx][6], 0);
+      ST32 (iMvdCache[listIdx][12], 0);
+      ST32 (iMvdCache[listIdx][18], 0);
+      ST32 (iMvdCache[listIdx][24], 0);
+
+
+      if (0 == pNeighAvail->iLeftAvail) { //not available
+        iRefIdxArray[listIdx][6] =
+          iRefIdxArray[listIdx][12] =
+            iRefIdxArray[listIdx][18] =
+              iRefIdxArray[listIdx][24] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][6] =
+          iRefIdxArray[listIdx][12] =
+            iRefIdxArray[listIdx][18] =
+              iRefIdxArray[listIdx][24] = REF_NOT_IN_LIST;
+      }
+    }
+    if (pNeighAvail->iLeftTopAvail && IS_INTER (pNeighAvail->iLeftTopType)) {
+      ST32 (iMvArray[listIdx][0], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftTopXy][15]));
+      ST32 (iMvdCache[listIdx][0], LD32 (pCurDqLayer->pMvd[listIdx][iLeftTopXy][15]));
+      iRefIdxArray[listIdx][0] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftTopXy][15];
+    } else {
+      ST32 (iMvArray[listIdx][0], 0);
+      ST32 (iMvdCache[listIdx][0], 0);
+      if (0 == pNeighAvail->iLeftTopAvail) { //not available
+        iRefIdxArray[listIdx][0] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][0] = REF_NOT_IN_LIST;
+      }
+    }
+
+    if (pNeighAvail->iTopAvail && IS_INTER (pNeighAvail->iTopType)) {
+      ST64 (iMvArray[listIdx][1], LD64 (pCurDqLayer->pDec->pMv[listIdx][iTopXy][12]));
+      ST64 (iMvArray[listIdx][3], LD64 (pCurDqLayer->pDec->pMv[listIdx][iTopXy][14]));
+      ST64 (iMvdCache[listIdx][1], LD64 (pCurDqLayer->pMvd[listIdx][iTopXy][12]));
+      ST64 (iMvdCache[listIdx][3], LD64 (pCurDqLayer->pMvd[listIdx][iTopXy][14]));
+      ST32 (&iRefIdxArray[listIdx][1], LD32 (&pCurDqLayer->pDec->pRefIndex[listIdx][iTopXy][12]));
+    } else {
+      ST64 (iMvArray[listIdx][1], 0);
+      ST64 (iMvArray[listIdx][3], 0);
+      ST64 (iMvdCache[listIdx][1], 0);
+      ST64 (iMvdCache[listIdx][3], 0);
+      if (0 == pNeighAvail->iTopAvail) { //not available
+        iRefIdxArray[listIdx][1] =
+          iRefIdxArray[listIdx][2] =
+            iRefIdxArray[listIdx][3] =
+              iRefIdxArray[listIdx][4] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][1] =
+          iRefIdxArray[listIdx][2] =
+            iRefIdxArray[listIdx][3] =
+              iRefIdxArray[listIdx][4] = REF_NOT_IN_LIST;
+      }
+    }
+
+    if (pNeighAvail->iRightTopAvail && IS_INTER (pNeighAvail->iRightTopType)) {
+      ST32 (iMvArray[listIdx][5], LD32 (pCurDqLayer->pDec->pMv[listIdx][iRightTopXy][12]));
+      ST32 (iMvdCache[listIdx][5], LD32 (pCurDqLayer->pMvd[listIdx][iRightTopXy][12]));
+      iRefIdxArray[listIdx][5] = pCurDqLayer->pDec->pRefIndex[listIdx][iRightTopXy][12];
+    } else {
+      ST32 (iMvArray[listIdx][5], 0);
+      if (0 == pNeighAvail->iRightTopAvail) { //not available
+        iRefIdxArray[listIdx][5] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][5] = REF_NOT_IN_LIST;
+      }
+    }
+
+    //right-top 4*4 block unavailable
+    ST32 (iMvArray[listIdx][9], 0);
+    ST32 (iMvArray[listIdx][21], 0);
+    ST32 (iMvArray[listIdx][11], 0);
+    ST32 (iMvArray[listIdx][17], 0);
+    ST32 (iMvArray[listIdx][23], 0);
+    ST32 (iMvdCache[listIdx][9], 0);
+    ST32 (iMvdCache[listIdx][21], 0);
+    ST32 (iMvdCache[listIdx][11], 0);
+    ST32 (iMvdCache[listIdx][17], 0);
+    ST32 (iMvdCache[listIdx][23], 0);
+    iRefIdxArray[listIdx][9] =
+      iRefIdxArray[listIdx][21] =
+        iRefIdxArray[listIdx][11] =
+          iRefIdxArray[listIdx][17] =
+            iRefIdxArray[listIdx][23] = REF_NOT_AVAIL;
+  }
+}
+
+void WelsFillDirectCacheCabac (PWelsNeighAvail pNeighAvail, int8_t iDirect[30], PDqLayer pCurDqLayer) {
+
+  int32_t iCurXy = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy = 0;
+  int32_t iLeftXy = 0;
+  int32_t iLeftTopXy = 0;
+  int32_t iRightTopXy = 0;
+
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+  if (pNeighAvail->iLeftTopAvail) {
+    iLeftTopXy = iCurXy - 1 - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iRightTopAvail) {
+    iRightTopXy = iCurXy + 1 - pCurDqLayer->iMbWidth;
+  }
+  memset (iDirect, 0, 30);
+  if (pNeighAvail->iLeftAvail && IS_INTER (pNeighAvail->iLeftType)) {
+    iDirect[6] = pCurDqLayer->pDirect[iLeftXy][3];
+    iDirect[12] = pCurDqLayer->pDirect[iLeftXy][7];
+    iDirect[18] = pCurDqLayer->pDirect[iLeftXy][11];
+    iDirect[24] = pCurDqLayer->pDirect[iLeftXy][15];
+  }
+  if (pNeighAvail->iLeftTopAvail && IS_INTER (pNeighAvail->iLeftTopType)) {
+    iDirect[0] = pCurDqLayer->pDirect[iLeftTopXy][15];
+  }
+
+  if (pNeighAvail->iTopAvail && IS_INTER (pNeighAvail->iTopType)) {
+    ST32 (&iDirect[1], LD32 (&pCurDqLayer->pDirect[iTopXy][12]));
+  }
+
+  if (pNeighAvail->iRightTopAvail && IS_INTER (pNeighAvail->iRightTopType)) {
+    iDirect[5] = pCurDqLayer->pDirect[iRightTopXy][12];
+  }
+  //right-top 4*4 block unavailable
+}
+
+void WelsFillCacheInter (PWelsNeighAvail pNeighAvail, uint8_t* pNonZeroCount,
+                         int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30], PDqLayer pCurDqLayer) {
+  int32_t iCurXy      = pCurDqLayer->iMbXyIndex;
+  int32_t iTopXy      = 0;
+  int32_t iLeftXy     = 0;
+  int32_t iLeftTopXy  = 0;
+  int32_t iRightTopXy = 0;
+
+  PSlice pSlice = &pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  int32_t listCount = 1;
+  if (pSliceHeader->eSliceType == B_SLICE) {
+    listCount = 2;
+  }
+
+  //stuff non_zero_coeff_count from pNeighAvail(left and top)
+  WelsFillCacheNonZeroCount (pNeighAvail, pNonZeroCount, pCurDqLayer);
+
+  if (pNeighAvail->iTopAvail) {
+    iTopXy = iCurXy - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iLeftAvail) {
+    iLeftXy = iCurXy - 1;
+  }
+  if (pNeighAvail->iLeftTopAvail) {
+    iLeftTopXy = iCurXy - 1 - pCurDqLayer->iMbWidth;
+  }
+  if (pNeighAvail->iRightTopAvail) {
+    iRightTopXy = iCurXy + 1 - pCurDqLayer->iMbWidth;
+  }
+
+  for (int32_t listIdx = 0; listIdx < listCount; ++listIdx) {
+    //stuff mv_cache and iRefIdxArray from left and top (inter)
+    if (pNeighAvail->iLeftAvail && IS_INTER (pNeighAvail->iLeftType)) {
+      ST32 (iMvArray[listIdx][6], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][3]));
+      ST32 (iMvArray[listIdx][12], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][7]));
+      ST32 (iMvArray[listIdx][18], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][11]));
+      ST32 (iMvArray[listIdx][24], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftXy][15]));
+      iRefIdxArray[listIdx][6] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][3];
+      iRefIdxArray[listIdx][12] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][7];
+      iRefIdxArray[listIdx][18] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][11];
+      iRefIdxArray[listIdx][24] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftXy][15];
+    } else {
+      ST32 (iMvArray[listIdx][6], 0);
+      ST32 (iMvArray[listIdx][12], 0);
+      ST32 (iMvArray[listIdx][18], 0);
+      ST32 (iMvArray[listIdx][24], 0);
+
+      if (0 == pNeighAvail->iLeftAvail) { //not available
+        iRefIdxArray[listIdx][6] =
+          iRefIdxArray[listIdx][12] =
+            iRefIdxArray[listIdx][18] =
+              iRefIdxArray[listIdx][24] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][6] =
+          iRefIdxArray[listIdx][12] =
+            iRefIdxArray[listIdx][18] =
+              iRefIdxArray[listIdx][24] = REF_NOT_IN_LIST;
+      }
+    }
+    if (pNeighAvail->iLeftTopAvail && IS_INTER (pNeighAvail->iLeftTopType)) {
+      ST32 (iMvArray[listIdx][0], LD32 (pCurDqLayer->pDec->pMv[listIdx][iLeftTopXy][15]));
+      iRefIdxArray[listIdx][0] = pCurDqLayer->pDec->pRefIndex[listIdx][iLeftTopXy][15];
+    } else {
+      ST32 (iMvArray[listIdx][0], 0);
+      if (0 == pNeighAvail->iLeftTopAvail) { //not available
+        iRefIdxArray[listIdx][0] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][0] = REF_NOT_IN_LIST;
+      }
+    }
+    if (pNeighAvail->iTopAvail && IS_INTER (pNeighAvail->iTopType)) {
+      ST64 (iMvArray[listIdx][1], LD64 (pCurDqLayer->pDec->pMv[listIdx][iTopXy][12]));
+      ST64 (iMvArray[listIdx][3], LD64 (pCurDqLayer->pDec->pMv[listIdx][iTopXy][14]));
+      ST32 (&iRefIdxArray[listIdx][1], LD32 (&pCurDqLayer->pDec->pRefIndex[listIdx][iTopXy][12]));
+    } else {
+      ST64 (iMvArray[listIdx][1], 0);
+      ST64 (iMvArray[listIdx][3], 0);
+      if (0 == pNeighAvail->iTopAvail) { //not available
+        iRefIdxArray[listIdx][1] =
+          iRefIdxArray[listIdx][2] =
+            iRefIdxArray[listIdx][3] =
+              iRefIdxArray[listIdx][4] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][1] =
+          iRefIdxArray[listIdx][2] =
+            iRefIdxArray[listIdx][3] =
+              iRefIdxArray[listIdx][4] = REF_NOT_IN_LIST;
+      }
+    }
+    if (pNeighAvail->iRightTopAvail && IS_INTER (pNeighAvail->iRightTopType)) {
+      ST32 (iMvArray[listIdx][5], LD32 (pCurDqLayer->pDec->pMv[listIdx][iRightTopXy][12]));
+      iRefIdxArray[listIdx][5] = pCurDqLayer->pDec->pRefIndex[listIdx][iRightTopXy][12];
+    } else {
+      ST32 (iMvArray[listIdx][5], 0);
+      if (0 == pNeighAvail->iRightTopAvail) { //not available
+        iRefIdxArray[listIdx][5] = REF_NOT_AVAIL;
+      } else { //available but is intra mb type
+        iRefIdxArray[listIdx][5] = REF_NOT_IN_LIST;
+      }
+    }
+    //right-top 4*4 block unavailable
+    ST32 (iMvArray[listIdx][9], 0);
+    ST32 (iMvArray[listIdx][21], 0);
+    ST32 (iMvArray[listIdx][11], 0);
+    ST32 (iMvArray[listIdx][17], 0);
+    ST32 (iMvArray[listIdx][23], 0);
+    iRefIdxArray[listIdx][9] =
+      iRefIdxArray[listIdx][21] =
+        iRefIdxArray[listIdx][11] =
+          iRefIdxArray[listIdx][17] =
+            iRefIdxArray[listIdx][23] = REF_NOT_AVAIL;
+  }
+}
+
+int32_t PredIntra4x4Mode (int8_t* pIntraPredMode, int32_t iIdx4) {
+  int8_t iTopMode  = pIntraPredMode[g_kuiScan8[iIdx4] - 8];
+  int8_t iLeftMode = pIntraPredMode[g_kuiScan8[iIdx4] - 1];
+  int8_t iBestMode;
+
+  if (-1 == iLeftMode || -1 == iTopMode) {
+    iBestMode = 2;
+  } else {
+    iBestMode = WELS_MIN (iLeftMode, iTopMode);
+  }
+  return iBestMode;
+}
+
+#define CHECK_I16_MODE(a, b, c, d)                           \
+                      ((a == g_ksI16PredInfo[a].iPredMode) &&  \
+                       (b >= g_ksI16PredInfo[a].iLeftAvail) && \
+                       (c >= g_ksI16PredInfo[a].iTopAvail) &&  \
+                       (d >= g_ksI16PredInfo[a].iLeftTopAvail));
+#define CHECK_CHROMA_MODE(a, b, c, d)                              \
+                        ((a == g_ksChromaPredInfo[a].iPredMode) &&  \
+                         (b >= g_ksChromaPredInfo[a].iLeftAvail) && \
+                         (c >= g_ksChromaPredInfo[a].iTopAvail) &&  \
+                         (d >= g_ksChromaPredInfo[a].iLeftTopAvail));
+#define CHECK_I4_MODE(a, b, c, d)                              \
+                     ((a == g_ksI4PredInfo[a].iPredMode) &&      \
+                      (b >= g_ksI4PredInfo[a].iLeftAvail) &&     \
+                      (c >= g_ksI4PredInfo[a].iTopAvail) &&      \
+                      (d >= g_ksI4PredInfo[a].iLeftTopAvail));
+
+
+int32_t CheckIntra16x16PredMode (uint8_t uiSampleAvail, int8_t* pMode) {
+  int32_t iLeftAvail     = uiSampleAvail & 0x04;
+  int32_t bLeftTopAvail  = uiSampleAvail & 0x02;
+  int32_t iTopAvail      = uiSampleAvail & 0x01;
+
+  if ((*pMode < 0) || (*pMode > MAX_PRED_MODE_ID_I16x16)) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I16x16_PRED_MODE);
+  }
+
+  if (I16_PRED_DC == *pMode) {
+    if (iLeftAvail && iTopAvail) {
+      return ERR_NONE;
+    } else if (iLeftAvail) {
+      *pMode = I16_PRED_DC_L;
+    } else if (iTopAvail) {
+      *pMode = I16_PRED_DC_T;
+    } else {
+      *pMode = I16_PRED_DC_128;
+    }
+  } else {
+    bool bModeAvail = CHECK_I16_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+    if (0 == bModeAvail) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I16x16_PRED_MODE);
+    }
+  }
+  return ERR_NONE;
+}
+
+
+int32_t CheckIntraChromaPredMode (uint8_t uiSampleAvail, int8_t* pMode) {
+  int32_t iLeftAvail     = uiSampleAvail & 0x04;
+  int32_t bLeftTopAvail  = uiSampleAvail & 0x02;
+  int32_t iTopAvail      = uiSampleAvail & 0x01;
+
+  if (C_PRED_DC == *pMode) {
+    if (iLeftAvail && iTopAvail) {
+      return ERR_NONE;
+    } else if (iLeftAvail) {
+      *pMode = C_PRED_DC_L;
+    } else if (iTopAvail) {
+      *pMode = C_PRED_DC_T;
+    } else {
+      *pMode = C_PRED_DC_128;
+    }
+  } else {
+    bool bModeAvail = CHECK_CHROMA_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+    if (0 == bModeAvail) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_I_CHROMA_PRED_MODE);
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t CheckIntraNxNPredMode (int32_t* pSampleAvail, int8_t* pMode, int32_t iIndex, bool b8x8) {
+  int8_t iIdx = g_kuiCache30ScanIdx[iIndex];
+
+  int32_t iLeftAvail     = pSampleAvail[iIdx - 1];
+  int32_t iTopAvail      = pSampleAvail[iIdx - 6];
+  int32_t bLeftTopAvail  = pSampleAvail[iIdx - 7];
+  int32_t bRightTopAvail = pSampleAvail[iIdx - (b8x8 ? 4 : 5)];  // Diff with 4x4 Pred
+
+  int8_t iFinalMode;
+
+  if ((*pMode < 0) || (*pMode > MAX_PRED_MODE_ID_I4x4)) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INVALID_INTRA4X4_MODE);
+  }
+
+  if (I4_PRED_DC == *pMode) {
+    if (iLeftAvail && iTopAvail) {
+      return *pMode;
+    } else if (iLeftAvail) {
+      iFinalMode = I4_PRED_DC_L;
+    } else if (iTopAvail) {
+      iFinalMode = I4_PRED_DC_T;
+    } else {
+      iFinalMode = I4_PRED_DC_128;
+    }
+  } else {
+    bool bModeAvail = CHECK_I4_MODE (*pMode, iLeftAvail, iTopAvail, bLeftTopAvail);
+    if (0 == bModeAvail) {
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INVALID_INTRA4X4_MODE);
+    }
+
+    iFinalMode = *pMode;
+
+    //if right-top unavailable, modify mode DDL and VL (padding rightmost pixel of top)
+    if (I4_PRED_DDL == iFinalMode && 0 == bRightTopAvail) {
+      iFinalMode = I4_PRED_DDL_TOP;
+    } else if (I4_PRED_VL == iFinalMode && 0 == bRightTopAvail) {
+      iFinalMode = I4_PRED_VL_TOP;
+    }
+  }
+  return iFinalMode;
+}
+
+void BsStartCavlc (PBitStringAux pBs) {
+  pBs->iIndex = ((pBs->pCurBuf - pBs->pStartBuf) << 3) - (16 - pBs->iLeftBits);
+}
+void BsEndCavlc (PBitStringAux pBs) {
+  pBs->pCurBuf   = pBs->pStartBuf + (pBs->iIndex >> 3);
+  uint32_t uiCache32Bit = (uint32_t) ((((pBs->pCurBuf[0] << 8) | pBs->pCurBuf[1]) << 16) |
+                                      (pBs->pCurBuf[2] << 8) | pBs->pCurBuf[3]);
+  pBs->uiCurBits = uiCache32Bit << (pBs->iIndex & 0x07);
+  pBs->pCurBuf  += 4;
+  pBs->iLeftBits = -16 + (pBs->iIndex & 0x07);
+}
+
+
+// return: used bits
+static int32_t CavlcGetTrailingOnesAndTotalCoeff (uint8_t& uiTotalCoeff, uint8_t& uiTrailingOnes,
+    SReadBitsCache* pBitsCache, SVlcTable* pVlcTable, bool bChromaDc, int8_t nC) {
+  const uint8_t* kpVlcTableMoreBitsCountList[3] = {g_kuiVlcTableMoreBitsCount0, g_kuiVlcTableMoreBitsCount1, g_kuiVlcTableMoreBitsCount2};
+  int32_t iUsedBits = 0;
+  int32_t iIndexVlc, iIndexValue, iNcMapIdx;
+  uint32_t uiCount;
+  uint32_t uiValue;
+
+  if (bChromaDc) {
+    uiValue        = pBitsCache->uiCache32Bit >> 24;
+    iIndexVlc      = pVlcTable->kpChromaCoeffTokenVlcTable[uiValue][0];
+    uiCount        = pVlcTable->kpChromaCoeffTokenVlcTable[uiValue][1];
+    POP_BUFFER (pBitsCache, uiCount);
+    iUsedBits     += uiCount;
+    uiTrailingOnes = g_kuiVlcTrailingOneTotalCoeffTable[iIndexVlc][0];
+    uiTotalCoeff   = g_kuiVlcTrailingOneTotalCoeffTable[iIndexVlc][1];
+  } else { //luma
+    iNcMapIdx = g_kuiNcMapTable[nC];
+    if (iNcMapIdx <= 2) {
+      uiValue = pBitsCache->uiCache32Bit >> 24;
+      if (uiValue < g_kuiVlcTableNeedMoreBitsThread[iNcMapIdx]) {
+        POP_BUFFER (pBitsCache, 8);
+        iUsedBits  += 8;
+        iIndexValue = pBitsCache->uiCache32Bit >> (32 - kpVlcTableMoreBitsCountList[iNcMapIdx][uiValue]);
+        iIndexVlc   = pVlcTable->kpCoeffTokenVlcTable[iNcMapIdx + 1][uiValue][iIndexValue][0];
+        uiCount     = pVlcTable->kpCoeffTokenVlcTable[iNcMapIdx + 1][uiValue][iIndexValue][1];
+        POP_BUFFER (pBitsCache, uiCount);
+        iUsedBits  += uiCount;
+      } else {
+        iIndexVlc  = pVlcTable->kpCoeffTokenVlcTable[0][iNcMapIdx][uiValue][0];
+        uiCount    = pVlcTable->kpCoeffTokenVlcTable[0][iNcMapIdx][uiValue][1];
+        uiValue    = pBitsCache->uiCache32Bit >> (32 - uiCount);
+        POP_BUFFER (pBitsCache, uiCount);
+        iUsedBits += uiCount;
+      }
+    } else {
+      uiValue    = pBitsCache->uiCache32Bit >> (32 - 6);
+      POP_BUFFER (pBitsCache, 6);
+      iUsedBits += 6;
+      iIndexVlc  = pVlcTable->kpCoeffTokenVlcTable[0][3][uiValue][0];  //differ
+    }
+    uiTrailingOnes = g_kuiVlcTrailingOneTotalCoeffTable[iIndexVlc][0];
+    uiTotalCoeff  = g_kuiVlcTrailingOneTotalCoeffTable[iIndexVlc][1];
+  }
+
+  return iUsedBits;
+}
+
+static int32_t CavlcGetLevelVal (int32_t iLevel[16], SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
+                                 uint8_t uiTrailingOnes) {
+  int32_t i, iUsedBits = 0;
+  int32_t iSuffixLength, iSuffixLengthSize, iLevelPrefix, iPrefixBits, iLevelCode, iThreshold;
+  for (i = 0; i < uiTrailingOnes; i++) {
+    iLevel[i] = 1 - ((pBitsCache->uiCache32Bit >> (30 - i)) & 0x02);
+  }
+  POP_BUFFER (pBitsCache, uiTrailingOnes);
+  iUsedBits += uiTrailingOnes;
+
+  iSuffixLength = (uiTotalCoeff > 10 && uiTrailingOnes < 3);
+
+  for (; i < uiTotalCoeff; i++) {
+    if (pBitsCache->uiRemainBits <= 16) SHIFT_BUFFER (pBitsCache);
+    WELS_GET_PREFIX_BITS (pBitsCache->uiCache32Bit, iPrefixBits);
+    if (iPrefixBits > MAX_LEVEL_PREFIX + 1) //iPrefixBits includes leading "0"s and first "1", should +1
+      return -1;
+    POP_BUFFER (pBitsCache, iPrefixBits);
+    iUsedBits   += iPrefixBits;
+    iLevelPrefix = iPrefixBits - 1;
+
+    iLevelCode = iLevelPrefix << iSuffixLength; //differ
+    iSuffixLengthSize = iSuffixLength;
+
+    if (iLevelPrefix >= 14) {
+      if (14 == iLevelPrefix && 0 == iSuffixLength)
+        iSuffixLengthSize = 4;
+      else if (15 == iLevelPrefix) {
+        iSuffixLengthSize = 12;
+        if (iSuffixLength == 0)
+          iLevelCode += 15;
+      }
+    }
+
+    if (iSuffixLengthSize > 0) {
+      if (pBitsCache->uiRemainBits <= iSuffixLengthSize) SHIFT_BUFFER (pBitsCache);
+      iLevelCode += (pBitsCache->uiCache32Bit >> (32 - iSuffixLengthSize));
+      POP_BUFFER (pBitsCache, iSuffixLengthSize);
+      iUsedBits  += iSuffixLengthSize;
+    }
+
+    iLevelCode += ((i == uiTrailingOnes) && (uiTrailingOnes < 3)) << 1;
+    iLevel[i]   = ((iLevelCode + 2) >> 1);
+    iLevel[i]  -= (iLevel[i] << 1) & (- (iLevelCode & 0x01));
+
+    iSuffixLength += !iSuffixLength;
+    iThreshold     = 3 << (iSuffixLength - 1);
+    iSuffixLength += ((iLevel[i] > iThreshold) || (iLevel[i] < -iThreshold)) && (iSuffixLength < 6);
+  }
+
+  return iUsedBits;
+}
+
+static int32_t CavlcGetTotalZeros (int32_t& iZerosLeft, SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
+                                   SVlcTable* pVlcTable, bool bChromaDc) {
+  int32_t iCount, iUsedBits = 0;
+  const uint8_t* kpBitNumMap;
+  uint32_t uiValue;
+
+  int32_t iTotalZeroVlcIdx;
+  uint8_t uiTableType;
+  //chroma_dc (0 < uiTotalCoeff < 4); others (chroma_ac or luma: 0 < uiTotalCoeff < 16)
+
+  if (bChromaDc) {
+    iTotalZeroVlcIdx = uiTotalCoeff;
+    kpBitNumMap = g_kuiTotalZerosBitNumChromaMap;
+    uiTableType = bChromaDc;
+  } else {
+    iTotalZeroVlcIdx = uiTotalCoeff;
+    kpBitNumMap = g_kuiTotalZerosBitNumMap;
+    uiTableType = 0;
+  }
+
+  iCount = kpBitNumMap[iTotalZeroVlcIdx - 1];
+  if (pBitsCache->uiRemainBits < iCount) SHIFT_BUFFER (
+      pBitsCache); // if uiRemainBits+16 still smaller than iCount?? potential bug
+  uiValue    = pBitsCache->uiCache32Bit >> (32 - iCount);
+  iCount     = pVlcTable->kpTotalZerosTable[uiTableType][iTotalZeroVlcIdx - 1][uiValue][1];
+  POP_BUFFER (pBitsCache, iCount);
+  iUsedBits += iCount;
+  iZerosLeft = pVlcTable->kpTotalZerosTable[uiTableType][iTotalZeroVlcIdx - 1][uiValue][0];
+
+  return iUsedBits;
+}
+static int32_t CavlcGetRunBefore (int32_t iRun[16], SReadBitsCache* pBitsCache, uint8_t uiTotalCoeff,
+                                  SVlcTable* pVlcTable, int32_t iZerosLeft) {
+  int32_t i, iUsedBits = 0;
+  uint32_t uiCount, uiValue, iPrefixBits;
+
+  for (i = 0; i < uiTotalCoeff - 1; i++) {
+    if (iZerosLeft > 0) {
+      uiCount = g_kuiZeroLeftBitNumMap[iZerosLeft];
+      if (pBitsCache->uiRemainBits < uiCount) SHIFT_BUFFER (pBitsCache);
+      uiValue = pBitsCache->uiCache32Bit >> (32 - uiCount);
+      if (iZerosLeft < 7) {
+        uiCount = pVlcTable->kpZeroTable[iZerosLeft - 1][uiValue][1];
+        POP_BUFFER (pBitsCache, uiCount);
+        iUsedBits += uiCount;
+        iRun[i] = pVlcTable->kpZeroTable[iZerosLeft - 1][uiValue][0];
+      } else {
+        POP_BUFFER (pBitsCache, uiCount);
+        iUsedBits += uiCount;
+        if (pVlcTable->kpZeroTable[6][uiValue][0] < 7) {
+          iRun[i] = pVlcTable->kpZeroTable[6][uiValue][0];
+        } else {
+          if (pBitsCache->uiRemainBits < 16) SHIFT_BUFFER (pBitsCache);
+          WELS_GET_PREFIX_BITS (pBitsCache->uiCache32Bit, iPrefixBits);
+          iRun[i] = iPrefixBits + 6;
+          if (iRun[i] > iZerosLeft)
+            return -1;
+          POP_BUFFER (pBitsCache, iPrefixBits);
+          iUsedBits += iPrefixBits;
+        }
+      }
+    } else {
+      for (int j = i; j < uiTotalCoeff; j++) {
+        iRun[j] = 0;
+      }
+      return iUsedBits;
+    }
+
+    iZerosLeft -= iRun[i];
+  }
+
+  iRun[uiTotalCoeff - 1] = iZerosLeft;
+
+  return iUsedBits;
+}
+
+int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable, uint8_t* pNonZeroCountCache, PBitStringAux pBs, int32_t iIndex,
+                                int32_t iMaxNumCoeff,
+                                const uint8_t* kpZigzagTable, int32_t iResidualProperty, int16_t* pTCoeff, uint8_t uiQp,
+                                PWelsDecoderContext pCtx) {
+  int32_t iLevel[16], iZerosLeft, iCoeffNum;
+  int32_t  iRun[16];
+  int32_t iCurNonZeroCacheIdx, i;
+
+
+  int32_t iMbResProperty = 0;
+  GetMbResProperty (&iMbResProperty, &iResidualProperty, 1);
+  const uint16_t* kpDequantCoeff = pCtx->bUseScalingList ? pCtx->pDequant_coeff4x4[iMbResProperty][uiQp] :
+                                   g_kuiDequantCoeff[uiQp];
+
+  int8_t nA, nB, nC;
+  uint8_t uiTotalCoeff, uiTrailingOnes;
+  int32_t iUsedBits = 0;
+  intX_t iCurIdx   = pBs->iIndex;
+  uint8_t* pBuf     = ((uint8_t*)pBs->pStartBuf) + (iCurIdx >> 3);
+  bool  bChromaDc = (CHROMA_DC == iResidualProperty);
+  uint8_t bChroma   = (bChromaDc || CHROMA_AC == iResidualProperty);
+  SReadBitsCache sReadBitsCache;
+
+  uint32_t uiCache32Bit = (uint32_t) ((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]);
+  sReadBitsCache.uiCache32Bit = uiCache32Bit << (iCurIdx & 0x07);
+  sReadBitsCache.uiRemainBits = 32 - (iCurIdx & 0x07);
+  sReadBitsCache.pBuf = pBuf;
+  //////////////////////////////////////////////////////////////////////////
+
+  if (bChroma) {
+    iCurNonZeroCacheIdx = g_kuiCache48CountScan4Idx[iIndex];
+    nA = pNonZeroCountCache[iCurNonZeroCacheIdx - 1];
+    nB = pNonZeroCountCache[iCurNonZeroCacheIdx - 8];
+  } else { //luma
+    iCurNonZeroCacheIdx = g_kuiCache48CountScan4Idx[iIndex];
+    nA = pNonZeroCountCache[iCurNonZeroCacheIdx - 1];
+    nB = pNonZeroCountCache[iCurNonZeroCacheIdx - 8];
+  }
+
+  WELS_NON_ZERO_COUNT_AVERAGE (nC, nA, nB);
+
+  iUsedBits += CavlcGetTrailingOnesAndTotalCoeff (uiTotalCoeff, uiTrailingOnes, &sReadBitsCache, pVlcTable, bChromaDc,
+               nC);
+
+  if (iResidualProperty != CHROMA_DC && iResidualProperty != I16_LUMA_DC) {
+    pNonZeroCountCache[iCurNonZeroCacheIdx] = uiTotalCoeff;
+    //////////////////////////////////////////////////////////////////////////
+  }
+  if (0 == uiTotalCoeff) {
+    pBs->iIndex += iUsedBits;
+    return ERR_NONE;
+  }
+  if ((uiTrailingOnes > 3) || (uiTotalCoeff > 16)) { /////////////////check uiTrailingOnes and uiTotalCoeff
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_TOTAL_COEFF_OR_TRAILING_ONES);
+  }
+  if ((i = CavlcGetLevelVal (iLevel, &sReadBitsCache, uiTotalCoeff, uiTrailingOnes)) == -1) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_LEVEL);
+  }
+  iUsedBits += i;
+  if (uiTotalCoeff < iMaxNumCoeff) {
+    iUsedBits += CavlcGetTotalZeros (iZerosLeft, &sReadBitsCache, uiTotalCoeff, pVlcTable, bChromaDc);
+  } else {
+    iZerosLeft = 0;
+  }
+
+  if ((iZerosLeft < 0) || ((iZerosLeft + uiTotalCoeff) > iMaxNumCoeff)) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_ZERO_LEFT);
+  }
+  if ((i = CavlcGetRunBefore (iRun, &sReadBitsCache, uiTotalCoeff, pVlcTable, iZerosLeft)) == -1) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_RUN_BEFORE);
+  }
+  iUsedBits += i;
+  pBs->iIndex += iUsedBits;
+  iCoeffNum = -1;
+
+  if (iResidualProperty == CHROMA_DC) {
+    //chroma dc scaling process, is kpDequantCoeff[0]? LevelScale(qPdc%6,0,0))<<(qPdc/6-6), the transform is done at construction.
+    for (i = uiTotalCoeff - 1; i >= 0; --i) {
+      //FIXME merge into rundecode?
+      int32_t j;
+      iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+      j          = kpZigzagTable[ iCoeffNum ];
+      pTCoeff[j] = iLevel[i];
+    }
+    WelsChromaDcIdct (pTCoeff);
+    //scaling
+    if (!pCtx->bUseScalingList) {
+      for (int j = 0; j < 4; ++j) {
+        pTCoeff[kpZigzagTable[j]] = (pTCoeff[kpZigzagTable[j]] * kpDequantCoeff[0]) >> 1;
+      }
+    } else {
+      for (int j = 0; j < 4; ++j) {
+        pTCoeff[kpZigzagTable[j]] = ((int64_t) pTCoeff[kpZigzagTable[j]] * (int64_t) kpDequantCoeff[0]) >> 5;
+      }
+    }
+  } else if (iResidualProperty == I16_LUMA_DC) { //DC coefficent, only call in Intra_16x16, base_mode_flag = 0
+    for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into rundecode?
+      int32_t j;
+      iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+      j          = kpZigzagTable[ iCoeffNum ];
+      pTCoeff[j] = iLevel[i];
+    }
+    WelsLumaDcDequantIdct (pTCoeff, uiQp, pCtx);
+  } else {
+    for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into  rundecode?
+      int32_t j;
+      iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+      j          = kpZigzagTable[ iCoeffNum ];
+      if (!pCtx->bUseScalingList) {
+        pTCoeff[j] = (iLevel[i] * kpDequantCoeff[j & 0x07]);
+      } else {
+        pTCoeff[j] = (iLevel[i] * kpDequantCoeff[j] + 8) >> 4;
+      }
+    }
+  }
+
+  return ERR_NONE;
+}
+
+int32_t WelsResidualBlockCavlc8x8 (SVlcTable* pVlcTable, uint8_t* pNonZeroCountCache, PBitStringAux pBs, int32_t iIndex,
+                                   int32_t iMaxNumCoeff, const uint8_t* kpZigzagTable, int32_t iResidualProperty,
+                                   int16_t* pTCoeff, int32_t  iIdx4x4, uint8_t uiQp,
+                                   PWelsDecoderContext pCtx) {
+  int32_t iLevel[16], iZerosLeft, iCoeffNum;
+  int32_t  iRun[16];
+  int32_t iCurNonZeroCacheIdx, i;
+
+  int32_t iMbResProperty = 0;
+  GetMbResProperty (&iMbResProperty, &iResidualProperty, 1);
+
+  const uint16_t* kpDequantCoeff = pCtx->bUseScalingList ? pCtx->pDequant_coeff8x8[iMbResProperty - 6][uiQp] :
+                                   g_kuiDequantCoeff8x8[uiQp];
+
+  int8_t nA, nB, nC;
+  uint8_t uiTotalCoeff, uiTrailingOnes;
+  int32_t iUsedBits = 0;
+  intX_t iCurIdx   = pBs->iIndex;
+  uint8_t* pBuf     = ((uint8_t*)pBs->pStartBuf) + (iCurIdx >> 3);
+  bool  bChromaDc = (CHROMA_DC == iResidualProperty);
+  uint8_t bChroma   = (bChromaDc || CHROMA_AC == iResidualProperty);
+  SReadBitsCache sReadBitsCache;
+
+  uint32_t uiCache32Bit = (uint32_t) ((((pBuf[0] << 8) | pBuf[1]) << 16) | (pBuf[2] << 8) | pBuf[3]);
+  sReadBitsCache.uiCache32Bit = uiCache32Bit << (iCurIdx & 0x07);
+  sReadBitsCache.uiRemainBits = 32 - (iCurIdx & 0x07);
+  sReadBitsCache.pBuf = pBuf;
+  //////////////////////////////////////////////////////////////////////////
+
+  if (bChroma) {
+    iCurNonZeroCacheIdx = g_kuiCache48CountScan4Idx[iIndex];
+    nA = pNonZeroCountCache[iCurNonZeroCacheIdx - 1];
+    nB = pNonZeroCountCache[iCurNonZeroCacheIdx - 8];
+  } else { //luma
+    iCurNonZeroCacheIdx = g_kuiCache48CountScan4Idx[iIndex];
+    nA = pNonZeroCountCache[iCurNonZeroCacheIdx - 1];
+    nB = pNonZeroCountCache[iCurNonZeroCacheIdx - 8];
+  }
+
+  WELS_NON_ZERO_COUNT_AVERAGE (nC, nA, nB);
+
+  iUsedBits += CavlcGetTrailingOnesAndTotalCoeff (uiTotalCoeff, uiTrailingOnes, &sReadBitsCache, pVlcTable, bChromaDc,
+               nC);
+
+  if (iResidualProperty != CHROMA_DC && iResidualProperty != I16_LUMA_DC) {
+    pNonZeroCountCache[iCurNonZeroCacheIdx] = uiTotalCoeff;
+    //////////////////////////////////////////////////////////////////////////
+  }
+  if (0 == uiTotalCoeff) {
+    pBs->iIndex += iUsedBits;
+    return ERR_NONE;
+  }
+  if ((uiTrailingOnes > 3) || (uiTotalCoeff > 16)) { /////////////////check uiTrailingOnes and uiTotalCoeff
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_TOTAL_COEFF_OR_TRAILING_ONES);
+  }
+  if ((i = CavlcGetLevelVal (iLevel, &sReadBitsCache, uiTotalCoeff, uiTrailingOnes)) == -1) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_LEVEL);
+  }
+  iUsedBits += i;
+  if (uiTotalCoeff < iMaxNumCoeff) {
+    iUsedBits += CavlcGetTotalZeros (iZerosLeft, &sReadBitsCache, uiTotalCoeff, pVlcTable, bChromaDc);
+  } else {
+    iZerosLeft = 0;
+  }
+
+  if ((iZerosLeft < 0) || ((iZerosLeft + uiTotalCoeff) > iMaxNumCoeff)) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_ZERO_LEFT);
+  }
+  if ((i = CavlcGetRunBefore (iRun, &sReadBitsCache, uiTotalCoeff, pVlcTable, iZerosLeft)) == -1) {
+    return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_CAVLC_INVALID_RUN_BEFORE);
+  }
+  iUsedBits += i;
+  pBs->iIndex += iUsedBits;
+  iCoeffNum = -1;
+
+  for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into  rundecode?
+    int32_t j;
+    iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+    j = (iCoeffNum << 2) + iIdx4x4;
+    j          = kpZigzagTable[ j ];
+    pTCoeff[j] = uiQp >= 36 ? ((iLevel[i] * kpDequantCoeff[j]) * (1 << (uiQp / 6 - 6)))
+                 : ((iLevel[i] * kpDequantCoeff[j] + (1 << (5 - uiQp / 6))) >> (6 - uiQp / 6));
+  }
+
+  return ERR_NONE;
+}
+
+int32_t ParseInterInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][MV_A], int8_t iRefIdxArray[LIST_A][30],
+                        PBitStringAux pBs) {
+  PSlice pSlice                 = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader     = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPic = pCtx->sRefPic.pRefList[LIST_0];
+  int32_t iRefCount[2];
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t i, j;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  int32_t iMotionPredFlag[4];
+  int16_t iMv[2];
+  uint32_t uiCode;
+  int32_t iCode;
+  int16_t iMinVmv = pSliceHeader->pSps->pSLevelLimits->iMinVmv;
+  int16_t iMaxVmv = pSliceHeader->pSps->pSLevelLimits->iMaxVmv;
+  iMotionPredFlag[0] = iMotionPredFlag[1] = iMotionPredFlag[2] = iMotionPredFlag[3] =
+                         pSlice->sSliceHeaderExt.bDefaultMotionPredFlag;
+  iRefCount[0] = pSliceHeader->uiRefCount[0];
+  iRefCount[1] = pSliceHeader->uiRefCount[1];
+
+  bool bIsPending = GetThreadCount (pCtx) > 1;
+
+  switch (pCurDqLayer->pDec->pMbType[iMbXy]) {
+  case MB_TYPE_16x16: {
+    int32_t iRefIdx = 0;
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0[ mbPartIdx ]
+      iMotionPredFlag[0] = uiCode;
+    }
+    if (iMotionPredFlag[0] == 0) {
+      WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[0], &uiCode)); //motion_prediction_flag_l1[ mbPartIdx ]
+      iRefIdx = uiCode;
+      // Security check: iRefIdx should be in range 0 to num_ref_idx_l0_active_minus1, includsive
+      // ref to standard section 7.4.5.1. iRefCount[0] is 1 + num_ref_idx_l0_active_minus1.
+      if ((iRefIdx < 0) || (iRefIdx >= iRefCount[0]) || (ppRefPic[iRefIdx] == NULL)) { //error ref_idx
+        pCtx->bMbRefConcealed = true;
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRefIdx = 0;
+          pCtx->iErrorCode |= dsBitstreamError;
+        } else {
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+        }
+      }
+      pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRefIdx]
+                              && (ppRefPic[iRefIdx]->bIsComplete || bIsPending));
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+      return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+    }
+    PredMv (iMvArray, iRefIdxArray, LIST_0, 0, 4, iRefIdx, iMv);
+
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ 0 ][ compIdx ]
+    iMv[0] += iCode;
+    WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ 0 ][ compIdx ]
+    iMv[1] += iCode;
+    WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+    UpdateP16x16MotionInfo (pCurDqLayer, LIST_0, iRefIdx, iMv);
+  }
+  break;
+  case MB_TYPE_16x8: {
+    int32_t iRefIdx[2];
+    for (i = 0; i < 2; i++) {
+      if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0[ mbPartIdx ]
+        iMotionPredFlag[i] = uiCode;
+      }
+    }
+
+    for (i = 0; i < 2; i++) {
+      if (iMotionPredFlag[i]) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+      }
+      WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[0], &uiCode)); //ref_idx_l0[ mbPartIdx ]
+      iRefIdx[i] = uiCode;
+      if ((iRefIdx[i] < 0) || (iRefIdx[i] >= iRefCount[0]) || (ppRefPic[iRefIdx[i]] == NULL)) { //error ref_idx
+        pCtx->bMbRefConcealed = true;
+        if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+          iRefIdx[i] = 0;
+          pCtx->iErrorCode |= dsBitstreamError;
+        } else {
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+        }
+      }
+      pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRefIdx[i]]
+                              && (ppRefPic[iRefIdx[i]]->bIsComplete || bIsPending));
+    }
+    for (i = 0; i < 2; i++) {
+      PredInter16x8Mv (iMvArray, iRefIdxArray, LIST_0, i << 3, iRefIdx[i], iMv);
+
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ 0 ][ compIdx ]
+      iMv[0] += iCode;
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ 0 ][ compIdx ]
+      iMv[1] += iCode;
+      WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      UpdateP16x8MotionInfo (pCurDqLayer, iMvArray, iRefIdxArray, LIST_0, i << 3, iRefIdx[i], iMv);
+    }
+  }
+  break;
+  case MB_TYPE_8x16: {
+    int32_t iRefIdx[2];
+    for (i = 0; i < 2; i++) {
+      if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0[ mbPartIdx ]
+        iMotionPredFlag[i] = uiCode;
+      }
+    }
+
+    for (i = 0; i < 2; i++) {
+      if (iMotionPredFlag[i] == 0) {
+        WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[0], &uiCode)); //ref_idx_l0[ mbPartIdx ]
+        iRefIdx[i] = uiCode;
+        if ((iRefIdx[i] < 0) || (iRefIdx[i] >= iRefCount[0]) || (ppRefPic[iRefIdx[i]] == NULL)) { //error ref_idx
+          pCtx->bMbRefConcealed = true;
+          if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+            iRefIdx[i] = 0;
+            pCtx->iErrorCode |= dsBitstreamError;
+          } else {
+            return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+          }
+        }
+        pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRefIdx[i]]
+                                && (ppRefPic[iRefIdx[i]]->bIsComplete || bIsPending));
+      } else {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+      }
+
+    }
+    for (i = 0; i < 2; i++) {
+      PredInter8x16Mv (iMvArray, iRefIdxArray, LIST_0, i << 2, iRefIdx[i], iMv);
+
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ 0 ][ compIdx ]
+      iMv[0] += iCode;
+      WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ 0 ][ compIdx ]
+      iMv[1] += iCode;
+      WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      UpdateP8x16MotionInfo (pCurDqLayer, iMvArray, iRefIdxArray, LIST_0, i << 2, iRefIdx[i], iMv);
+    }
+  }
+  break;
+  case MB_TYPE_8x8:
+  case MB_TYPE_8x8_REF0: {
+    int32_t iRefIdx[4] = {0}, iSubPartCount[4], iPartWidth[4];
+    uint32_t uiSubMbType;
+
+    if (MB_TYPE_8x8_REF0 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      iRefCount[0] =
+        iRefCount[1] = 1;
+    }
+
+    //uiSubMbType, partition
+    for (i = 0; i < 4; i++) {
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //sub_mb_type[ mbPartIdx ]
+      uiSubMbType = uiCode;
+      if (uiSubMbType >= 4) { //invalid uiSubMbType
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_SUB_MB_TYPE);
+      }
+      pCurDqLayer->pSubMbType[iMbXy][i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iType;
+      iSubPartCount[i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iPartCount;
+      iPartWidth[i] = g_ksInterPSubMbTypeInfo[uiSubMbType].iPartWidth;
+
+      // Need modification when B picture add in, reference to 7.3.5
+      pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] &= (uiSubMbType == 0);
+    }
+
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      for (i = 0; i < 4; i++) {
+        WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0[ mbPartIdx ]
+        iMotionPredFlag[i] = uiCode;
+      }
+    }
+
+    //iRefIdxArray
+    if (MB_TYPE_8x8_REF0 == pCurDqLayer->pDec->pMbType[iMbXy]) {
+      memset (pCurDqLayer->pDec->pRefIndex[0][iMbXy], 0, 16);
+    } else {
+      for (i = 0; i < 4; i++) {
+        int16_t iIndex8 = i << 2;
+        uint8_t uiScan4Idx = g_kuiScan4[iIndex8];
+
+        if (iMotionPredFlag[i] == 0) {
+          WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[0], &uiCode)); //ref_idx_l0[ mbPartIdx ]
+          iRefIdx[i] = uiCode;
+          if ((iRefIdx[i] < 0) || (iRefIdx[i] >= iRefCount[0]) || (ppRefPic[iRefIdx[i]] == NULL)) { //error ref_idx
+            pCtx->bMbRefConcealed = true;
+            if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+              iRefIdx[i] = 0;
+              pCtx->iErrorCode |= dsBitstreamError;
+            } else {
+              return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+            }
+          }
+          pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[iRefIdx[i]]
+                                  && (ppRefPic[iRefIdx[i]]->bIsComplete || bIsPending));
+
+          pCurDqLayer->pDec->pRefIndex[0][iMbXy][uiScan4Idx  ] = pCurDqLayer->pDec->pRefIndex[0][iMbXy][uiScan4Idx + 1] =
+                pCurDqLayer->pDec->pRefIndex[0][iMbXy][uiScan4Idx + 4] = pCurDqLayer->pDec->pRefIndex[0][iMbXy][uiScan4Idx + 5] =
+                      iRefIdx[i];
+        } else {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+        }
+      }
+    }
+
+    //gain mv and update mv cache
+    for (i = 0; i < 4; i++) {
+      int8_t iPartCount = iSubPartCount[i];
+      uint32_t uiSubMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+      int16_t iMv[2], iPartIdx, iBlockWidth = iPartWidth[i], iIdx = i << 2;
+      uint8_t uiScan4Idx, uiCacheIdx;
+
+      uint8_t uiIdx4Cache = g_kuiCache30ScanIdx[iIdx];
+
+      iRefIdxArray[0][uiIdx4Cache  ] = iRefIdxArray[0][uiIdx4Cache + 1] =
+                                         iRefIdxArray[0][uiIdx4Cache + 6] = iRefIdxArray[0][uiIdx4Cache + 7] = iRefIdx[i];
+
+      for (j = 0; j < iPartCount; j++) {
+        iPartIdx = iIdx + j * iBlockWidth;
+        uiScan4Idx = g_kuiScan4[iPartIdx];
+        uiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+        PredMv (iMvArray, iRefIdxArray, LIST_0, iPartIdx, iBlockWidth, iRefIdx[i], iMv);
+
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ subMbPartIdx ][ compIdx ]
+        iMv[0] += iCode;
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ subMbPartIdx ][ compIdx ]
+        iMv[1] += iCode;
+        WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        if (SUB_MB_TYPE_8x8 == uiSubMbType) {
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx], LD32 (iMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx + 1], LD32 (iMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx + 4], LD32 (iMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx + 5], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx  ], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx + 1], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx + 6], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx + 7], LD32 (iMv));
+        } else if (SUB_MB_TYPE_8x4 == uiSubMbType) {
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx  ], LD32 (iMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx + 1], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx  ], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx + 1], LD32 (iMv));
+        } else if (SUB_MB_TYPE_4x8 == uiSubMbType) {
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx  ], LD32 (iMv));
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx + 4], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx  ], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx + 6], LD32 (iMv));
+        } else { //SUB_MB_TYPE_4x4 == uiSubMbType
+          ST32 (pCurDqLayer->pDec->pMv[0][iMbXy][uiScan4Idx  ], LD32 (iMv));
+          ST32 (iMvArray[0][uiCacheIdx  ], LD32 (iMv));
+        }
+      }
+    }
+  }
+  break;
+  default:
+    break;
+  }
+
+  return ERR_NONE;
+}
+int32_t ParseInterBInfo (PWelsDecoderContext pCtx, int16_t iMvArray[LIST_A][30][MV_A],
+                         int8_t iRefIdxArray[LIST_A][30], PBitStringAux pBs) {
+  PSlice pSlice = &pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer;
+  PSliceHeader pSliceHeader = &pSlice->sSliceHeaderExt.sSliceHeader;
+  PPicture* ppRefPic[2];
+  ppRefPic[LIST_0] = pCtx->sRefPic.pRefList[LIST_0];
+  ppRefPic[LIST_1] = pCtx->sRefPic.pRefList[LIST_1];
+  int8_t ref_idx_list[LIST_A][4];
+  int8_t iRef[2] = { 0, 0 };
+  int32_t iRefCount[2];
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iMbXy = pCurDqLayer->iMbXyIndex;
+  uint8_t iMotionPredFlag[LIST_A][4];
+  int16_t iMv[2];
+  uint32_t uiCode;
+  int32_t iCode;
+  int16_t iMinVmv = pSliceHeader->pSps->pSLevelLimits->iMinVmv;
+  int16_t iMaxVmv = pSliceHeader->pSps->pSLevelLimits->iMaxVmv;
+  memset (ref_idx_list, -1, LIST_A * 4);
+  memset (iMotionPredFlag, (pSlice->sSliceHeaderExt.bDefaultMotionPredFlag ? 1 : 0), LIST_A * 4);
+  iRefCount[0] = pSliceHeader->uiRefCount[0];
+  iRefCount[1] = pSliceHeader->uiRefCount[1];
+
+  bool bIsPending = GetThreadCount (pCtx) > 1;
+
+  MbType mbType = pCurDqLayer->pDec->pMbType[iMbXy];
+  if (IS_DIRECT (mbType)) {
+
+    int16_t pMvDirect[LIST_A][2] = { { 0, 0 }, { 0, 0 } };
+    SubMbType subMbType;
+    if (pSliceHeader->iDirectSpatialMvPredFlag) {
+      //predict direct spatial mv
+      int32_t ret = PredMvBDirectSpatial (pCtx, pMvDirect, iRef, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    } else {
+      //temporal direct 16x16 mode
+      int32_t ret = PredBDirectTemporal (pCtx, pMvDirect, iRef, subMbType);
+      if (ret != ERR_NONE) {
+        return ret;
+      }
+    }
+  } else if (IS_INTER_16x16 (mbType)) {
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        if (IS_DIR (mbType, 0, listIdx)) {
+          WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0/l1[ mbPartIdx ]
+          iMotionPredFlag[listIdx][0] = uiCode;
+        }
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      if (IS_DIR (mbType, 0, listIdx)) {
+        if (iMotionPredFlag[listIdx][0] == 0) {
+          WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[listIdx], &uiCode)); //motion_prediction_flag_l1[ mbPartIdx ]
+          ref_idx_list[listIdx][0] = uiCode;
+          // Security check: iRefIdx should be in range 0 to num_ref_idx_l0_active_minus1, includsive
+          // ref to standard section 7.4.5.1. iRefCount[0] is 1 + num_ref_idx_l0_active_minus1.
+          if ((ref_idx_list[listIdx][0] < 0) || (ref_idx_list[listIdx][0] >= iRefCount[listIdx])
+              || (ppRefPic[listIdx][ref_idx_list[listIdx][0]] == NULL)) { //error ref_idx
+            pCtx->bMbRefConcealed = true;
+            if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+              ref_idx_list[listIdx][0] = 0;
+              pCtx->iErrorCode |= dsBitstreamError;
+              RETURN_ERR_IF_NULL(ppRefPic[listIdx][ref_idx_list[listIdx][0]]);
+            } else {
+              return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+            }
+          }
+          pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[listIdx][ref_idx_list[listIdx][0]]
+                                  && (ppRefPic[listIdx][ref_idx_list[listIdx][0]]->bIsComplete || bIsPending));
+        } else {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+          return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+        }
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      if (IS_DIR (mbType, 0, listIdx)) {
+        PredMv (iMvArray, iRefIdxArray, listIdx, 0, 4, ref_idx_list[listIdx][0], iMv);
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ 0 ][ compIdx ]
+        iMv[0] += iCode;
+        WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ 0 ][ compIdx ]
+        iMv[1] += iCode;
+        WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+      } else {
+        * (uint32_t*)iMv = 0;
+      }
+      UpdateP16x16MotionInfo (pCurDqLayer, listIdx, ref_idx_list[listIdx][0], iMv);
+    }
+  } else if (IS_INTER_16x8 (mbType)) {
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        for (int32_t i = 0; i < 2; ++i) {
+          if (IS_DIR (mbType, i, listIdx)) {
+            WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0/l1[ mbPartIdx ]
+            iMotionPredFlag[listIdx][i] = uiCode;
+          }
+        }
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        if (IS_DIR (mbType, i, listIdx)) {
+          if (iMotionPredFlag[listIdx][i] == 0) {
+            WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[listIdx], &uiCode)); //motion_prediction_flag_l1[ mbPartIdx ]
+            int32_t iRefIdx = uiCode;
+            // Security check: iRefIdx should be in range 0 to num_ref_idx_l0_active_minus1, includsive
+            // ref to standard section 7.4.5.1. iRefCount[0] is 1 + num_ref_idx_l0_active_minus1.
+            if ((iRefIdx < 0) || (iRefIdx >= iRefCount[listIdx]) || (ppRefPic[listIdx][iRefIdx] == NULL)) { //error ref_idx
+              pCtx->bMbRefConcealed = true;
+              if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+                iRefIdx = 0;
+                pCtx->iErrorCode |= dsBitstreamError;
+                RETURN_ERR_IF_NULL(ppRefPic[listIdx][iRefIdx]);
+              } else {
+                return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+              }
+            }
+            ref_idx_list[listIdx][i] = iRefIdx;
+            pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[listIdx][iRefIdx]
+                                    && (ppRefPic[listIdx][iRefIdx]->bIsComplete || bIsPending));
+          } else {
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+            return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+          }
+        }
+      }
+    }
+    // Read mvd_L0 then mvd_L1
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      // Partitions
+      for (int32_t i = 0; i < 2; i++) {
+        int iPartIdx = i << 3;
+        int32_t iRefIdx = ref_idx_list[listIdx][i];
+        if (IS_DIR (mbType, i, listIdx)) {
+          PredInter16x8Mv (iMvArray, iRefIdxArray, listIdx, iPartIdx, iRefIdx, iMv);
+
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l{0,1}[ mbPartIdx ][ listIdx ][x]
+          iMv[0] += iCode;
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l{0,1}[ mbPartIdx ][ listIdx ][y]
+          iMv[1] += iCode;
+
+          WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        } else {
+          * (uint32_t*)iMv = 0;
+        }
+        UpdateP16x8MotionInfo (pCurDqLayer, iMvArray, iRefIdxArray, listIdx, iPartIdx, iRefIdx, iMv);
+      }
+    }
+  } else if (IS_INTER_8x16 (mbType)) {
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        for (int32_t i = 0; i < 2; ++i) {
+          if (IS_DIR (mbType, i, listIdx)) {
+            WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0/l1[ mbPartIdx ]
+            iMotionPredFlag[listIdx][i] = uiCode;
+          }
+        }
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; ++i) {
+        if (IS_DIR (mbType, i, listIdx)) {
+          if (iMotionPredFlag[listIdx][i] == 0) {
+            WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[listIdx], &uiCode)); //motion_prediction_flag_l1[ mbPartIdx ]
+            int32_t iRefIdx = uiCode;
+            // Security check: iRefIdx should be in range 0 to num_ref_idx_l0_active_minus1, includsive
+            // ref to standard section 7.4.5.1. iRefCount[0] is 1 + num_ref_idx_l0_active_minus1.
+            if ((iRefIdx < 0) || (iRefIdx >= iRefCount[listIdx]) || (ppRefPic[listIdx][iRefIdx] == NULL)) { //error ref_idx
+              pCtx->bMbRefConcealed = true;
+              if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+                iRefIdx = 0;
+                pCtx->iErrorCode |= dsBitstreamError;
+                RETURN_ERR_IF_NULL(ppRefPic[listIdx][iRefIdx]);
+              } else {
+                return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+              }
+            }
+            ref_idx_list[listIdx][i] = iRefIdx;
+            pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[listIdx][iRefIdx]
+                                    && (ppRefPic[listIdx][iRefIdx]->bIsComplete || bIsPending));
+          } else {
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+            return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+          }
+        }
+      }
+    }
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 2; i++) {
+        int iPartIdx = i << 2;
+        int32_t iRefIdx = ref_idx_list[listIdx][i];
+        if (IS_DIR (mbType, i, listIdx)) {
+          PredInter8x16Mv (iMvArray, iRefIdxArray, listIdx, iPartIdx, iRefIdx, iMv);
+
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ 0 ][ compIdx ]
+          iMv[0] += iCode;
+          WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ 0 ][ compIdx ]
+          iMv[1] += iCode;
+          WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+        } else {
+          * (uint32_t*)iMv = 0;
+        }
+        UpdateP8x16MotionInfo (pCurDqLayer, iMvArray, iRefIdxArray, listIdx, iPartIdx, iRefIdx, iMv);
+      }
+    }
+  } else if (IS_Inter_8x8 (mbType)) {
+    int8_t pSubPartCount[4], pPartW[4];
+    uint32_t uiSubMbType;
+    //sub_mb_type, partition
+    int16_t pMvDirect[LIST_A][2] = { { 0, 0 }, { 0, 0 } };
+    if (pCtx->sRefPic.pRefList[LIST_1][0] == NULL) {
+      SLogContext* pLogCtx = & (pCtx->sLogCtx);
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "Colocated Ref Picture for B-Slice is lost, B-Slice decoding cannot be continued!");
+      return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+    }
+    bool bIsLongRef = pCtx->sRefPic.pRefList[LIST_1][0]->bIsLongRef;
+    const int32_t ref0Count = WELS_MIN (pSliceHeader->uiRefCount[LIST_0], pCtx->sRefPic.uiRefCount[LIST_0]);
+    bool has_direct_called = false;
+    SubMbType directSubMbType = 0;
+
+    //uiSubMbType, partition
+    for (int32_t i = 0; i < 4; i++) {
+      WELS_READ_VERIFY (BsGetUe (pBs, &uiCode)); //sub_mb_type[ mbPartIdx ]
+      uiSubMbType = uiCode;
+      if (uiSubMbType >= 13) { //invalid uiSubMbType
+        return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_SUB_MB_TYPE);
+      }
+      pSubPartCount[i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iPartCount;
+      pPartW[i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iPartWidth;
+
+      // Need modification when B picture add in, reference to 7.3.5
+      if (pSubPartCount[i] > 1)
+        pCurDqLayer->pNoSubMbPartSizeLessThan8x8Flag[iMbXy] = false;
+
+      if (IS_DIRECT (g_ksInterBSubMbTypeInfo[uiSubMbType].iType)) {
+        if (!has_direct_called) {
+          if (pSliceHeader->iDirectSpatialMvPredFlag) {
+            int32_t ret = PredMvBDirectSpatial (pCtx, pMvDirect, iRef, directSubMbType);
+            if (ret != ERR_NONE) {
+              return ret;
+            }
+
+          } else {
+            //temporal direct mode
+            int32_t ret = PredBDirectTemporal (pCtx, pMvDirect, iRef, directSubMbType);
+            if (ret != ERR_NONE) {
+              return ret;
+            }
+          }
+          has_direct_called = true;
+        }
+        pCurDqLayer->pSubMbType[iMbXy][i] = directSubMbType;
+        if (IS_SUB_4x4 (pCurDqLayer->pSubMbType[iMbXy][i])) {
+          pSubPartCount[i] = 4;
+          pPartW[i] = 1;
+        }
+      } else {
+        pCurDqLayer->pSubMbType[iMbXy][i] = g_ksInterBSubMbTypeInfo[uiSubMbType].iType;
+      }
+    }
+    if (pSlice->sSliceHeaderExt.bAdaptiveMotionPredFlag) {
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        for (int32_t i = 0; i < 4; i++) {
+          bool is_dir = IS_DIR (pCurDqLayer->pSubMbType[iMbXy][i], 0, listIdx) > 0;
+          if (is_dir) {
+            WELS_READ_VERIFY (BsGetOneBit (pBs, &uiCode)); //motion_prediction_flag_l0[ mbPartIdx ]
+            iMotionPredFlag[listIdx][i] = uiCode;
+          }
+        }
+      }
+    }
+    for (int32_t i = 0; i < 4; i++) { //Direct 8x8 Ref and mv
+      int16_t iIdx8 = i << 2;
+      if (IS_DIRECT (pCurDqLayer->pSubMbType[iMbXy][i])) {
+        if (pSliceHeader->iDirectSpatialMvPredFlag) {
+          FillSpatialDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], directSubMbType, bIsLongRef, pMvDirect, iRef,
+                                  iMvArray, NULL);
+        } else {
+          int16_t (*mvColoc)[2] = pCurDqLayer->iColocMv[LIST_0];
+          iRef[LIST_1] = 0;
+          iRef[LIST_0] = 0;
+          const uint8_t uiColoc4Idx = g_kuiScan4[iIdx8];
+          if (!pCurDqLayer->iColocIntra[uiColoc4Idx]) {
+            iRef[LIST_0] = 0;
+            int8_t colocRefIndexL0 = pCurDqLayer->iColocRefIndex[LIST_0][uiColoc4Idx];
+            if (colocRefIndexL0 >= 0) {
+              iRef[LIST_0] = MapColToList0 (pCtx, colocRefIndexL0, ref0Count);
+            } else {
+              mvColoc = pCurDqLayer->iColocMv[LIST_1];
+            }
+          }
+          Update8x8RefIdx (pCurDqLayer, iIdx8, LIST_0, iRef[LIST_0]);
+          Update8x8RefIdx (pCurDqLayer, iIdx8, LIST_1, iRef[LIST_1]);
+          FillTemporalDirect8x8Mv (pCurDqLayer, iIdx8, pSubPartCount[i], pPartW[i], directSubMbType, iRef, mvColoc, iMvArray,
+                                   NULL);
+        }
+      }
+    }
+    //ref no-direct
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 4; i++) {
+        int16_t iIdx8 = i << 2;
+        int32_t subMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+        int8_t iref = REF_NOT_IN_LIST;
+        if (IS_DIRECT (subMbType)) {
+          if (pSliceHeader->iDirectSpatialMvPredFlag) {
+            Update8x8RefIdx (pCurDqLayer, iIdx8, listIdx, iRef[listIdx]);
+            ref_idx_list[listIdx][i] = iRef[listIdx];
+          }
+        } else {
+          if (IS_DIR (subMbType, 0, listIdx)) {
+            if (iMotionPredFlag[listIdx][i] == 0) {
+              WELS_READ_VERIFY (BsGetTe0 (pBs, iRefCount[listIdx], &uiCode)); //ref_idx_l0[ mbPartIdx ]
+              iref = uiCode;
+              if ((iref < 0) || (iref >= iRefCount[listIdx]) || (ppRefPic[listIdx][iref] == NULL)) { //error ref_idx
+                pCtx->bMbRefConcealed = true;
+                if (pCtx->pParam->eEcActiveIdc != ERROR_CON_DISABLE) {
+                  iref = 0;
+                  pCtx->iErrorCode |= dsBitstreamError;
+                  RETURN_ERR_IF_NULL(ppRefPic[listIdx][iref]);
+                } else {
+                  return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_INVALID_REF_INDEX);
+                }
+              }
+              pCtx->bMbRefConcealed = pCtx->bRPLRError || pCtx->bMbRefConcealed || ! (ppRefPic[listIdx][iref]
+                                      && (ppRefPic[listIdx][iref]->bIsComplete || bIsPending));
+            } else {
+              WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "inter parse: iMotionPredFlag = 1 not supported. ");
+              return GENERATE_ERROR_NO (ERR_LEVEL_MB_DATA, ERR_INFO_UNSUPPORTED_ILP);
+            }
+          }
+          Update8x8RefIdx (pCurDqLayer, iIdx8, listIdx, iref);
+          ref_idx_list[listIdx][i] = iref;
+        }
+      }
+    }
+    //mv
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      for (int32_t i = 0; i < 4; i++) {
+        int8_t iPartCount = pSubPartCount[i];
+        int16_t iPartIdx, iBlockW = pPartW[i];
+        uint8_t uiScan4Idx, uiCacheIdx;
+
+        uiCacheIdx = g_kuiCache30ScanIdx[i << 2];
+
+        int8_t iref = ref_idx_list[listIdx][i];
+        iRefIdxArray[listIdx][uiCacheIdx] = iRefIdxArray[listIdx][uiCacheIdx + 1] =
+                                              iRefIdxArray[listIdx][uiCacheIdx + 6] = iRefIdxArray[listIdx][uiCacheIdx + 7] = iref;
+
+        uint32_t subMbType = pCurDqLayer->pSubMbType[iMbXy][i];
+        if (IS_DIRECT (subMbType)) {
+          continue;
+        }
+        bool is_dir = IS_DIR (subMbType, 0, listIdx) > 0;
+        for (int32_t j = 0; j < iPartCount; j++) {
+          iPartIdx = (i << 2) + j * iBlockW;
+          uiScan4Idx = g_kuiScan4[iPartIdx];
+          uiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+          if (is_dir) {
+            PredMv (iMvArray, iRefIdxArray, listIdx, iPartIdx, iBlockW, iref, iMv);
+
+            WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l0[ mbPartIdx ][ subMbPartIdx ][ compIdx ]
+            iMv[0] += iCode;
+            WELS_READ_VERIFY (BsGetSe (pBs, &iCode)); //mvd_l1[ mbPartIdx ][ subMbPartIdx ][ compIdx ]
+            iMv[1] += iCode;
+            WELS_CHECK_SE_BOTH_WARNING (iMv[1], iMinVmv, iMaxVmv, "vertical mv");
+          } else {
+            * (uint32_t*)iMv = 0;
+          }
+          if (IS_SUB_8x8 (subMbType)) { //MB_TYPE_8x8
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx], LD32 (iMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx + 1], LD32 (iMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx + 4], LD32 (iMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx + 5], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx + 1], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx + 6], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx + 7], LD32 (iMv));
+          } else if (IS_SUB_8x4 (subMbType)) {
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx], LD32 (iMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx + 1], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx + 1], LD32 (iMv));
+          } else if (IS_SUB_4x8 (subMbType)) {
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx], LD32 (iMv));
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx + 4], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx + 6], LD32 (iMv));
+          } else { //SUB_MB_TYPE_4x4 == uiSubMbType
+            ST32 (pCurDqLayer->pDec->pMv[listIdx][iMbXy][uiScan4Idx], LD32 (iMv));
+            ST32 (iMvArray[listIdx][uiCacheIdx], LD32 (iMv));
+          }
+        }
+      }
+    }
+  }
+  return ERR_NONE;
+}
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/pic_queue.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/pic_queue.cpp
new file mode 100644
index 0000000000..475df0ac0d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/pic_queue.cpp
@@ -0,0 +1,244 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    pic_queue.c
+ *
+ * \brief   Recycled piture queue implementation
+ *
+ * \date    03/13/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "pic_queue.h"
+#include "decoder_context.h"
+#include "codec_def.h"
+#include "memory_align.h"
+
+namespace WelsDec {
+
+void FreePicture (PPicture pPic, CMemoryAlign* pMa);
+
+
+///////////////////////////////////Recycled queue management for pictures///////////////////////////////////
+/*   ______________________________________
+  -->| P0 | P1 | P2 | P3 | P4 | .. | Pn-1 |-->
+     --------------------------------------
+ *
+ *  How does it work?
+ *  node <- next; ++ next;
+ *
+*/
+
+
+
+PPicture AllocPicture (PWelsDecoderContext pCtx, const int32_t kiPicWidth, const int32_t kiPicHeight) {
+  PPicture pPic = NULL;
+  int32_t iPicWidth = 0;
+  int32_t iPicHeight = 0;
+
+  int32_t iPicChromaWidth   = 0;
+  int32_t iPicChromaHeight  = 0;
+  int32_t iLumaSize         = 0;
+  int32_t iChromaSize       = 0;
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+
+  pPic = (PPicture) pMa->WelsMallocz (sizeof (SPicture), "PPicture");
+  WELS_VERIFY_RETURN_IF (NULL, NULL == pPic);
+
+  memset (pPic, 0, sizeof (SPicture));
+
+  iPicWidth = WELS_ALIGN (kiPicWidth + (PADDING_LENGTH << 1), PICTURE_RESOLUTION_ALIGNMENT);
+  iPicHeight = WELS_ALIGN (kiPicHeight + (PADDING_LENGTH << 1), PICTURE_RESOLUTION_ALIGNMENT);
+  iPicChromaWidth   = iPicWidth >> 1;
+  iPicChromaHeight  = iPicHeight >> 1;
+
+  iLumaSize     = iPicWidth * iPicHeight;
+  iChromaSize   = iPicChromaWidth * iPicChromaHeight;
+
+  if (pCtx->pParam->bParseOnly) {
+    pPic->pBuffer[0] = pPic->pBuffer[1] = pPic->pBuffer[2] = NULL;
+    pPic->pData[0] = pPic->pData[1] = pPic->pData[2] = NULL;
+    pPic->iLinesize[0] = iPicWidth;
+    pPic->iLinesize[1] = pPic->iLinesize[2] = iPicChromaWidth;
+  } else {
+    pPic->pBuffer[0] = static_cast<uint8_t*> (pMa->WelsMallocz (iLumaSize /* luma */
+                       + (iChromaSize << 1) /* Cb,Cr */, "_pic->buffer[0]"));
+    WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pBuffer[0], FreePicture (pPic, pMa));
+
+    memset (pPic->pBuffer[0], 128, (iLumaSize + (iChromaSize << 1)));
+    pPic->iLinesize[0] = iPicWidth;
+    pPic->iLinesize[1] = pPic->iLinesize[2] = iPicChromaWidth;
+    pPic->pBuffer[1]   = pPic->pBuffer[0] + iLumaSize;
+    pPic->pBuffer[2]   = pPic->pBuffer[1] + iChromaSize;
+    pPic->pData[0]     = pPic->pBuffer[0] + (1 + pPic->iLinesize[0]) * PADDING_LENGTH;
+    pPic->pData[1]     = pPic->pBuffer[1] + /*WELS_ALIGN*/ (((1 + pPic->iLinesize[1]) * PADDING_LENGTH) >> 1);
+    pPic->pData[2]     = pPic->pBuffer[2] + /*WELS_ALIGN*/ (((1 + pPic->iLinesize[2]) * PADDING_LENGTH) >> 1);
+  }
+  pPic->iPlanes        = 3;    // yv12 in default
+  pPic->iWidthInPixel  = kiPicWidth;
+  pPic->iHeightInPixel = kiPicHeight;
+  pPic->iFrameNum      = -1;
+  pPic->iRefCount = 0;
+
+  uint32_t uiMbWidth = (kiPicWidth + 15) >> 4;
+  uint32_t uiMbHeight = (kiPicHeight + 15) >> 4;
+  uint32_t uiMbCount = uiMbWidth * uiMbHeight;
+
+  pPic->pMbCorrectlyDecodedFlag = (bool*)pMa->WelsMallocz (uiMbCount * sizeof (bool), "pPic->pMbCorrectlyDecodedFlag");
+  pPic->pNzc = GetThreadCount (pCtx) > 1 ? (int8_t (*)[24])pMa->WelsMallocz (uiMbCount * 24, "pPic->pNzc") : NULL;
+  pPic->pMbType = (uint32_t*)pMa->WelsMallocz (uiMbCount * sizeof (uint32_t), "pPic->pMbType");
+  pPic->pMv[LIST_0] = (int16_t (*)[16][2])pMa->WelsMallocz (uiMbCount * sizeof (
+                        int16_t) * MV_A * MB_BLOCK4x4_NUM, "pPic->pMv[]");
+  pPic->pMv[LIST_1] = (int16_t (*)[16][2])pMa->WelsMallocz (uiMbCount * sizeof (
+                        int16_t) * MV_A * MB_BLOCK4x4_NUM, "pPic->pMv[]");
+  pPic->pRefIndex[LIST_0] = (int8_t (*)[16])pMa->WelsMallocz (uiMbCount * sizeof (
+                              int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[]");
+  pPic->pRefIndex[LIST_1] = (int8_t (*)[16])pMa->WelsMallocz (uiMbCount * sizeof (
+                              int8_t) * MB_BLOCK4x4_NUM, "pCtx->sMb.pRefIndex[]");
+  if (pCtx->pThreadCtx != NULL) {
+    pPic->pReadyEvent = (SWelsDecEvent*)pMa->WelsMallocz (uiMbHeight * sizeof (SWelsDecEvent), "pPic->pReadyEvent");
+    for (uint32_t i = 0; i < uiMbHeight; ++i) {
+      CREATE_EVENT (&pPic->pReadyEvent[i], 1, 0, NULL);
+    }
+  } else {
+    pPic->pReadyEvent = NULL;
+  }
+
+  return pPic;
+}
+
+void FreePicture (PPicture pPic, CMemoryAlign* pMa) {
+  if (NULL != pPic) {
+    if (pPic->pBuffer[0]) {
+      pMa->WelsFree (pPic->pBuffer[0], "pPic->pBuffer[0]");
+      pPic->pBuffer[0] = NULL;
+    }
+
+    if (pPic->pMbCorrectlyDecodedFlag) {
+      pMa->WelsFree (pPic->pMbCorrectlyDecodedFlag, "pPic->pMbCorrectlyDecodedFlag");
+      pPic->pMbCorrectlyDecodedFlag = NULL;
+    }
+
+    if (pPic->pNzc) {
+      pMa->WelsFree (pPic->pNzc, "pPic->pNzc");
+      pPic->pNzc = NULL;
+    }
+
+    if (pPic->pMbType) {
+      pMa->WelsFree (pPic->pMbType, "pPic->pMbType");
+      pPic->pMbType = NULL;
+    }
+
+    for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+      if (pPic->pMv[listIdx]) {
+        pMa->WelsFree (pPic->pMv[listIdx], "pPic->pMv[]");
+        pPic->pMv[listIdx] = NULL;
+      }
+
+      if (pPic->pRefIndex[listIdx]) {
+        pMa->WelsFree (pPic->pRefIndex[listIdx], "pPic->pRefIndex[]");
+        pPic->pRefIndex[listIdx] = NULL;
+      }
+    }
+    if (pPic->pReadyEvent != NULL) {
+      uint32_t uiMbHeight = (pPic->iHeightInPixel + 15) >> 4;
+      for (uint32_t i = 0; i < uiMbHeight; ++i) {
+        CLOSE_EVENT (&pPic->pReadyEvent[i]);
+      }
+      pMa->WelsFree (pPic->pReadyEvent, "pPic->pReadyEvent");
+      pPic->pReadyEvent = NULL;
+    }
+    pMa->WelsFree (pPic, "pPic");
+    pPic = NULL;
+  }
+}
+PPicture PrefetchPic (PPicBuff pPicBuf) {
+  int32_t iPicIdx = 0;
+  PPicture pPic  = NULL;
+
+  if (pPicBuf->iCapacity == 0) {
+    return NULL;
+  }
+
+  for (iPicIdx = pPicBuf->iCurrentIdx + 1; iPicIdx < pPicBuf->iCapacity ; ++iPicIdx) {
+    if (pPicBuf->ppPic[iPicIdx] != NULL && !pPicBuf->ppPic[iPicIdx]->bUsedAsRef
+        && pPicBuf->ppPic[iPicIdx]->iRefCount <= 0) {
+      pPic = pPicBuf->ppPic[iPicIdx];
+      break;
+    }
+  }
+  if (pPic != NULL) {
+    pPicBuf->iCurrentIdx = iPicIdx;
+    pPic->iPicBuffIdx = iPicIdx;
+    return pPic;
+  }
+  for (iPicIdx = 0 ; iPicIdx <= pPicBuf->iCurrentIdx ; ++iPicIdx) {
+    if (pPicBuf->ppPic[iPicIdx] != NULL && !pPicBuf->ppPic[iPicIdx]->bUsedAsRef
+        && pPicBuf->ppPic[iPicIdx]->iRefCount <= 0) {
+      pPic = pPicBuf->ppPic[iPicIdx];
+      break;
+    }
+  }
+
+  pPicBuf->iCurrentIdx = iPicIdx;
+  if (pPic != NULL) {
+    pPic->iPicBuffIdx = iPicIdx;
+  }
+  return pPic;
+}
+
+PPicture PrefetchPicForThread (PPicBuff pPicBuf) {
+  PPicture pPic = NULL;
+
+  if (pPicBuf->iCapacity == 0) {
+    return NULL;
+  }
+  pPic = pPicBuf->ppPic[pPicBuf->iCurrentIdx];
+  pPic->iPicBuffIdx = pPicBuf->iCurrentIdx;
+  if (++pPicBuf->iCurrentIdx >= pPicBuf->iCapacity) {
+    pPicBuf->iCurrentIdx = 0;
+  }
+  return pPic;
+}
+
+PPicture PrefetchLastPicForThread (PPicBuff pPicBuf, const int32_t& iLastPicBuffIdx) {
+  PPicture pPic = NULL;
+
+  if (pPicBuf->iCapacity == 0) {
+    return NULL;
+  }
+  if (iLastPicBuffIdx >= 0 && iLastPicBuffIdx < pPicBuf->iCapacity) {
+    pPic = pPicBuf->ppPic[iLastPicBuffIdx];
+  }
+  return pPic;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/rec_mb.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/rec_mb.cpp
new file mode 100644
index 0000000000..9034cc4d7d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/rec_mb.cpp
@@ -0,0 +1,1078 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    rec_mb.c
+ *
+ * \brief   implementation for all macroblock decoding process after mb syntax parsing and residual decoding with cavlc.
+ *
+ * \date    3/18/2009 Created
+ *
+ *************************************************************************************
+ */
+
+
+#include "rec_mb.h"
+#include "decode_slice.h"
+
+namespace WelsDec {
+
+void WelsFillRecNeededMbInfo (PWelsDecoderContext pCtx, bool bOutput, PDqLayer pCurDqLayer) {
+  PPicture pCurPic = pCtx->pDec;
+  int32_t iLumaStride   = pCurPic->iLinesize[0];
+  int32_t iChromaStride = pCurPic->iLinesize[1];
+  int32_t iMbX = pCurDqLayer->iMbX;
+  int32_t iMbY = pCurDqLayer->iMbY;
+
+  pCurDqLayer->iLumaStride = iLumaStride;
+  pCurDqLayer->iChromaStride = iChromaStride;
+
+  if (bOutput) {
+    pCurDqLayer->pPred[0] = pCurPic->pData[0] + ((iMbY * iLumaStride + iMbX) << 4);
+    pCurDqLayer->pPred[1] = pCurPic->pData[1] + ((iMbY * iChromaStride + iMbX) << 3);
+    pCurDqLayer->pPred[2] = pCurPic->pData[2] + ((iMbY * iChromaStride + iMbX) << 3);
+  }
+}
+
+int32_t RecI8x8Mb (int32_t iMbXy, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  RecI8x8Luma (iMbXy, pCtx, pScoeffLevel, pDqLayer);
+  RecI4x4Chroma (iMbXy, pCtx, pScoeffLevel, pDqLayer);
+  return ERR_NONE;
+}
+
+int32_t RecI8x8Luma (int32_t iMbXy, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  /*****get local variable from outer variable********/
+  /*prediction info*/
+  uint8_t* pPred = pDqLayer->pPred[0];
+
+  int32_t iLumaStride = pDqLayer->iLumaStride;
+  int32_t* pBlockOffset = pCtx->iDecBlockOffsetArray;
+  PGetIntraPred8x8Func* pGetI8x8LumaPredFunc = pCtx->pGetI8x8LumaPredFunc;
+
+  int8_t* pIntra8x8PredMode = pDqLayer->pIntra4x4FinalMode[iMbXy]; // I_NxN
+  int16_t* pRS = pScoeffLevel;
+  /*itransform info*/
+  PIdctResAddPredFunc pIdctResAddPredFunc = pCtx->pIdctResAddPredFunc8x8;
+
+  /*************local variable********************/
+  uint8_t i = 0;
+  bool bTLAvail[4], bTRAvail[4];
+  // Top-Right : Left : Top-Left : Top
+  bTLAvail[0] = !! (pDqLayer->pIntraNxNAvailFlag[iMbXy] & 0x02);
+  bTLAvail[1] = !! (pDqLayer->pIntraNxNAvailFlag[iMbXy] & 0x01);
+  bTLAvail[2] = !! (pDqLayer->pIntraNxNAvailFlag[iMbXy] & 0x04);
+  bTLAvail[3] = true;
+
+  bTRAvail[0] = !! (pDqLayer->pIntraNxNAvailFlag[iMbXy] & 0x01);
+  bTRAvail[1] = !! (pDqLayer->pIntraNxNAvailFlag[iMbXy] & 0x08);
+  bTRAvail[2] = true;
+  bTRAvail[3] = false;
+
+  /*************real process*********************/
+  for (i = 0; i < 4; i++) {
+
+    uint8_t* pPredI8x8 = pPred + pBlockOffset[i << 2];
+    uint8_t uiMode = pIntra8x8PredMode[g_kuiScan4[i << 2]];
+
+    pGetI8x8LumaPredFunc[uiMode] (pPredI8x8, iLumaStride, bTLAvail[i], bTRAvail[i]);
+
+    int32_t iIndex = g_kuiMbCountScan4Idx[i << 2];
+    if (pDqLayer->pNzc[iMbXy][iIndex] || pDqLayer->pNzc[iMbXy][iIndex + 1] || pDqLayer->pNzc[iMbXy][iIndex + 4]
+        || pDqLayer->pNzc[iMbXy][iIndex + 5]) {
+      int16_t* pRSI8x8 = &pRS[i << 6];
+      pIdctResAddPredFunc (pPredI8x8, iLumaStride, pRSI8x8);
+    }
+  }
+
+  return ERR_NONE;
+}
+
+int32_t RecI4x4Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  RecI4x4Luma (iMBXY, pCtx, pScoeffLevel, pDqLayer);
+  RecI4x4Chroma (iMBXY, pCtx, pScoeffLevel, pDqLayer);
+  return ERR_NONE;
+}
+
+
+int32_t RecI4x4Luma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  /*****get local variable from outer variable********/
+  /*prediction info*/
+  uint8_t* pPred = pDqLayer->pPred[0];
+
+  int32_t iLumaStride = pDqLayer->iLumaStride;
+  int32_t* pBlockOffset = pCtx->iDecBlockOffsetArray;
+  PGetIntraPredFunc* pGetI4x4LumaPredFunc = pCtx->pGetI4x4LumaPredFunc;
+
+  int8_t* pIntra4x4PredMode = pDqLayer->pIntra4x4FinalMode[iMBXY];
+  int16_t* pRS = pScoeffLevel;
+  /*itransform info*/
+  PIdctResAddPredFunc pIdctResAddPredFunc = pCtx->pIdctResAddPredFunc;
+
+
+  /*************local variable********************/
+  uint8_t i = 0;
+
+  /*************real process*********************/
+  for (i = 0; i < 16; i++) {
+
+    uint8_t* pPredI4x4 = pPred + pBlockOffset[i];
+    uint8_t uiMode = pIntra4x4PredMode[g_kuiScan4[i]];
+
+    pGetI4x4LumaPredFunc[uiMode] (pPredI4x4, iLumaStride);
+
+    if (pDqLayer->pNzc[iMBXY][g_kuiMbCountScan4Idx[i]]) {
+      int16_t* pRSI4x4 = &pRS[i << 4];
+      pIdctResAddPredFunc (pPredI4x4, iLumaStride, pRSI4x4);
+    }
+  }
+
+  return ERR_NONE;
+}
+
+
+int32_t RecI4x4Chroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  int32_t iChromaStride = pCtx->pCurDqLayer->pDec->iLinesize[1];
+
+  int8_t iChromaPredMode = pDqLayer->pChromaPredMode[iMBXY];
+
+  PGetIntraPredFunc* pGetIChromaPredFunc = pCtx->pGetIChromaPredFunc;
+
+  uint8_t* pPred = pDqLayer->pPred[1];
+
+  pGetIChromaPredFunc[iChromaPredMode] (pPred, iChromaStride);
+  pPred = pDqLayer->pPred[2];
+  pGetIChromaPredFunc[iChromaPredMode] (pPred, iChromaStride);
+
+  RecChroma (iMBXY, pCtx, pScoeffLevel, pDqLayer);
+
+  return ERR_NONE;
+}
+
+
+int32_t RecI16x16Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  /*decoder use, encoder no use*/
+  int8_t iI16x16PredMode = pDqLayer->pIntraPredMode[iMBXY][7];
+  int8_t iChromaPredMode = pDqLayer->pChromaPredMode[iMBXY];
+  PGetIntraPredFunc* pGetIChromaPredFunc = pCtx->pGetIChromaPredFunc;
+  PGetIntraPredFunc* pGetI16x16LumaPredFunc = pCtx->pGetI16x16LumaPredFunc;
+  int32_t iUVStride = pCtx->pCurDqLayer->pDec->iLinesize[1];
+
+  /*common use by decoder&encoder*/
+  int32_t iYStride = pDqLayer->iLumaStride;
+  int16_t* pRS = pScoeffLevel;
+
+  uint8_t* pPred = pDqLayer->pPred[0];
+
+  PIdctFourResAddPredFunc pIdctFourResAddPredFunc = pCtx->pIdctFourResAddPredFunc;
+
+  /*decode i16x16 y*/
+  pGetI16x16LumaPredFunc[iI16x16PredMode] (pPred, iYStride);
+
+  /*1 mb is divided 16 4x4_block to idct*/
+  const int8_t* pNzc = pDqLayer->pNzc[iMBXY];
+  pIdctFourResAddPredFunc (pPred + 0 * iYStride + 0, iYStride, pRS + 0 * 64, pNzc +  0);
+  pIdctFourResAddPredFunc (pPred + 0 * iYStride + 8, iYStride, pRS + 1 * 64, pNzc +  2);
+  pIdctFourResAddPredFunc (pPred + 8 * iYStride + 0, iYStride, pRS + 2 * 64, pNzc +  8);
+  pIdctFourResAddPredFunc (pPred + 8 * iYStride + 8, iYStride, pRS + 3 * 64, pNzc + 10);
+
+  /*decode intra mb cb&cr*/
+  pPred = pDqLayer->pPred[1];
+  pGetIChromaPredFunc[iChromaPredMode] (pPred, iUVStride);
+  pPred = pDqLayer->pPred[2];
+  pGetIChromaPredFunc[iChromaPredMode] (pPred, iUVStride);
+  RecChroma (iMBXY, pCtx, pScoeffLevel, pDqLayer);
+
+  return ERR_NONE;
+}
+
+
+//according to current 8*8 block ref_index to gain reference picture
+static inline int32_t GetRefPic (sMCRefMember* pMCRefMem, PWelsDecoderContext pCtx, const int8_t& iRefIdx,
+                                 int32_t listIdx) {
+  PPicture pRefPic;
+
+  if (iRefIdx >= 0) {
+    pRefPic = pCtx->sRefPic.pRefList[listIdx][iRefIdx];
+
+    if (pRefPic != NULL) {
+      pMCRefMem->iSrcLineLuma = pRefPic->iLinesize[0];
+      pMCRefMem->iSrcLineChroma = pRefPic->iLinesize[1];
+
+      pMCRefMem->pSrcY = pRefPic->pData[0];
+      pMCRefMem->pSrcU = pRefPic->pData[1];
+      pMCRefMem->pSrcV = pRefPic->pData[2];
+      if (!pMCRefMem->pSrcY || !pMCRefMem->pSrcU || !pMCRefMem->pSrcV) {
+        return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+      }
+      return ERR_NONE;
+    }
+  }
+  return GENERATE_ERROR_NO (ERR_LEVEL_SLICE_DATA, ERR_INFO_REFERENCE_PIC_LOST);
+}
+
+
+#ifndef MC_FLOW_SIMPLE_JUDGE
+#define MC_FLOW_SIMPLE_JUDGE 1
+#endif //MC_FLOW_SIMPLE_JUDGE
+void BaseMC (PWelsDecoderContext pCtx, sMCRefMember* pMCRefMem, const int32_t& listIdx, const int8_t& iRefIdx,
+             int32_t iXOffset, int32_t iYOffset,
+             SMcFunc* pMCFunc,
+             int32_t iBlkWidth, int32_t iBlkHeight, int16_t iMVs[2]) {
+  int32_t iFullMVx = (iXOffset << 2) + iMVs[0]; //quarter pixel
+  int32_t iFullMVy = (iYOffset << 2) + iMVs[1];
+  iFullMVx = WELS_CLIP3 (iFullMVx, ((-PADDING_LENGTH + 2) * (1 << 2)),
+                         ((pMCRefMem->iPicWidth + PADDING_LENGTH - 19) * (1 << 2)));
+  iFullMVy = WELS_CLIP3 (iFullMVy, ((-PADDING_LENGTH + 2) * (1 << 2)),
+                         ((pMCRefMem->iPicHeight + PADDING_LENGTH - 19) * (1 << 2)));
+
+  if (GetThreadCount (pCtx) > 1 && iRefIdx >= 0) {
+    // wait for the lines of reference macroblock (3 + 16).
+    PPicture pRefPic = pCtx->sRefPic.pRefList[listIdx][iRefIdx];
+    if (pCtx->bNewSeqBegin && (pCtx->iErrorCode & dsRefLost)) {
+      //set event if refpic is lost to prevent from infinite waiting.
+      if (!pRefPic->pReadyEvent[0].isSignaled) {
+        for (uint32_t ln = 0; ln < pCtx->sMb.iMbHeight; ++ln) {
+          SET_EVENT (&pRefPic->pReadyEvent[ln]);
+        }
+      }
+    }
+    int32_t offset = (iFullMVy >> 2) + iBlkHeight + 3 + 16;
+    if (offset > pCtx->lastReadyHeightOffset[listIdx][iRefIdx]) {
+      const int32_t down_line = WELS_MIN (offset >> 4, int32_t (pCtx->sMb.iMbHeight) - 1);
+      if (pRefPic->pReadyEvent[down_line].isSignaled != 1) {
+        WAIT_EVENT (&pRefPic->pReadyEvent[down_line], WELS_DEC_THREAD_WAIT_INFINITE);
+      }
+      pCtx->lastReadyHeightOffset[listIdx][iRefIdx] = offset;
+    }
+  }
+
+  int32_t iSrcPixOffsetLuma = (iFullMVx >> 2) + (iFullMVy >> 2) * pMCRefMem->iSrcLineLuma;
+  int32_t iSrcPixOffsetChroma = (iFullMVx >> 3) + (iFullMVy >> 3) * pMCRefMem->iSrcLineChroma;
+
+  int32_t iBlkWidthChroma = iBlkWidth >> 1;
+  int32_t iBlkHeightChroma = iBlkHeight >> 1;
+
+  uint8_t* pSrcY = pMCRefMem->pSrcY + iSrcPixOffsetLuma;
+  uint8_t* pSrcU = pMCRefMem->pSrcU + iSrcPixOffsetChroma;
+  uint8_t* pSrcV = pMCRefMem->pSrcV + iSrcPixOffsetChroma;
+  uint8_t* pDstY = pMCRefMem->pDstY;
+  uint8_t* pDstU = pMCRefMem->pDstU;
+  uint8_t* pDstV = pMCRefMem->pDstV;
+
+  pMCFunc->pMcLumaFunc (pSrcY, pMCRefMem->iSrcLineLuma, pDstY, pMCRefMem->iDstLineLuma, iFullMVx, iFullMVy, iBlkWidth,
+                        iBlkHeight);
+  pMCFunc->pMcChromaFunc (pSrcU, pMCRefMem->iSrcLineChroma, pDstU, pMCRefMem->iDstLineChroma, iFullMVx, iFullMVy,
+                          iBlkWidthChroma, iBlkHeightChroma);
+  pMCFunc->pMcChromaFunc (pSrcV, pMCRefMem->iSrcLineChroma, pDstV, pMCRefMem->iDstLineChroma, iFullMVx, iFullMVy,
+                          iBlkWidthChroma, iBlkHeightChroma);
+
+}
+
+static void WeightPrediction (PDqLayer pCurDqLayer, sMCRefMember* pMCRefMem, int32_t listIdx, int32_t iRefIdx,
+                              int32_t iBlkWidth,
+                              int32_t iBlkHeight) {
+
+
+  int32_t iLog2denom, iWoc, iOoc;
+  int32_t iPredTemp, iLineStride;
+  int32_t iPixel = 0;
+  uint8_t* pDst;
+  //luma
+  iLog2denom = pCurDqLayer->pPredWeightTable->uiLumaLog2WeightDenom;
+  iWoc = pCurDqLayer->pPredWeightTable->sPredList[listIdx].iLumaWeight[iRefIdx];
+  iOoc = pCurDqLayer->pPredWeightTable->sPredList[listIdx].iLumaOffset[iRefIdx];
+  iLineStride = pMCRefMem->iDstLineLuma;
+
+  for (int i = 0; i < iBlkHeight; i++) {
+    for (int j = 0; j < iBlkWidth; j++) {
+      iPixel = j + i * (iLineStride);
+      if (iLog2denom >= 1) {
+        iPredTemp = ((pMCRefMem->pDstY[iPixel] * iWoc + (1 << (iLog2denom - 1))) >> iLog2denom) + iOoc;
+
+        pMCRefMem->pDstY[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+      } else {
+        iPredTemp = pMCRefMem->pDstY[iPixel] * iWoc + iOoc;
+
+        pMCRefMem->pDstY[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+
+      }
+    }
+  }
+
+
+  //UV
+  iBlkWidth = iBlkWidth >> 1;
+  iBlkHeight = iBlkHeight >> 1;
+  iLog2denom = pCurDqLayer->pPredWeightTable->uiChromaLog2WeightDenom;
+  iLineStride = pMCRefMem->iDstLineChroma;
+
+  for (int i = 0; i < 2; i++) {
+
+
+    //iLog2denom = pCurDqLayer->pPredWeightTable->uiChromaLog2WeightDenom;
+    iWoc =  pCurDqLayer->pPredWeightTable->sPredList[listIdx].iChromaWeight[iRefIdx][i];
+    iOoc = pCurDqLayer->pPredWeightTable->sPredList[listIdx].iChromaOffset[iRefIdx][i];
+    pDst = i ? pMCRefMem->pDstV : pMCRefMem->pDstU;
+    //iLineStride = pMCRefMem->iDstLineChroma;
+
+    for (int i = 0; i < iBlkHeight ; i++) {
+      for (int j = 0; j < iBlkWidth; j++) {
+        iPixel = j + i * (iLineStride);
+        if (iLog2denom >= 1) {
+          iPredTemp = ((pDst[iPixel] * iWoc + (1 << (iLog2denom - 1))) >> iLog2denom) + iOoc;
+
+          pDst[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+        } else {
+          iPredTemp = pDst[iPixel] * iWoc + iOoc;
+
+          pDst[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+
+        }
+      }
+
+    }
+
+
+  }
+}
+
+static void BiWeightPrediction (PDqLayer pCurDqLayer, sMCRefMember* pMCRefMem, sMCRefMember* pTempMCRefMem,
+                                int32_t iRefIdx1, int32_t iRefIdx2, bool bWeightedBipredIdcIs1, int32_t iBlkWidth,
+                                int32_t iBlkHeight) {
+  int32_t iWoc1 = 0, iOoc1 = 0, iWoc2 = 0, iOoc2 = 0;
+  int32_t iPredTemp, iLineStride;
+  int32_t iPixel = 0;
+  //luma
+  int32_t iLog2denom = pCurDqLayer->pPredWeightTable->uiLumaLog2WeightDenom;
+  if (bWeightedBipredIdcIs1) {
+    iWoc1 = pCurDqLayer->pPredWeightTable->sPredList[LIST_0].iLumaWeight[iRefIdx1];
+    iOoc1 = pCurDqLayer->pPredWeightTable->sPredList[LIST_0].iLumaOffset[iRefIdx1];
+    iWoc2 = pCurDqLayer->pPredWeightTable->sPredList[LIST_1].iLumaWeight[iRefIdx2];
+    iOoc2 = pCurDqLayer->pPredWeightTable->sPredList[LIST_1].iLumaOffset[iRefIdx2];
+  } else {
+    iWoc1 = pCurDqLayer->pPredWeightTable->iImplicitWeight[iRefIdx1][iRefIdx2];
+    iWoc2 = 64 - iWoc1;
+  }
+  iLineStride = pMCRefMem->iDstLineLuma;
+
+  for (int i = 0; i < iBlkHeight; i++) {
+    for (int j = 0; j < iBlkWidth; j++) {
+      iPixel = j + i * (iLineStride);
+      iPredTemp = ((pMCRefMem->pDstY[iPixel] * iWoc1 + pTempMCRefMem->pDstY[iPixel] * iWoc2 + (1 << iLog2denom)) >>
+                   (iLog2denom + 1)) + ((iOoc1 + iOoc2 + 1) >> 1);
+      pMCRefMem->pDstY[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+    }
+  }
+
+  //UV
+  iBlkWidth = iBlkWidth >> 1;
+  iBlkHeight = iBlkHeight >> 1;
+  iLog2denom = pCurDqLayer->pPredWeightTable->uiChromaLog2WeightDenom;
+  iLineStride = pMCRefMem->iDstLineChroma;
+
+  uint8_t* pDst;
+  uint8_t* pTempDst;
+  for (int k = 0; k < 2; k++) {
+    //iLog2denom = pCurDqLayer->pPredWeightTable->uiChromaLog2WeightDenom;
+    if (bWeightedBipredIdcIs1) {
+      iWoc1 = pCurDqLayer->pPredWeightTable->sPredList[LIST_0].iChromaWeight[iRefIdx1][k];
+      iOoc1 = pCurDqLayer->pPredWeightTable->sPredList[LIST_0].iChromaOffset[iRefIdx1][k];
+      iWoc2 = pCurDqLayer->pPredWeightTable->sPredList[LIST_1].iChromaWeight[iRefIdx2][k];
+      iOoc2 = pCurDqLayer->pPredWeightTable->sPredList[LIST_1].iChromaOffset[iRefIdx2][k];
+    }
+    pDst  = k ? pMCRefMem->pDstV : pMCRefMem->pDstU;
+    pTempDst = k ? pTempMCRefMem->pDstV : pTempMCRefMem->pDstU;
+    //iLineStride = pMCRefMem->iDstLineChroma;
+
+    for (int i = 0; i < iBlkHeight; i++) {
+      for (int j = 0; j < iBlkWidth; j++) {
+        iPixel = j + i * (iLineStride);
+        iPredTemp = ((pDst[iPixel] * iWoc1 + pTempDst[iPixel] * iWoc2 + (1 << iLog2denom)) >> (iLog2denom + 1)) + ((
+                      iOoc1 + iOoc2 + 1) >> 1);
+        pDst[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+      }
+    }
+  }
+}
+
+static void BiPrediction (PDqLayer pCurDqLayer, sMCRefMember* pMCRefMem, sMCRefMember* pTempMCRefMem, int32_t iBlkWidth,
+                          int32_t iBlkHeight) {
+  int32_t iPredTemp, iLineStride;
+  int32_t iPixel = 0;
+  //luma
+  iLineStride = pMCRefMem->iDstLineLuma;
+
+  for (int i = 0; i < iBlkHeight; i++) {
+    for (int j = 0; j < iBlkWidth; j++) {
+      iPixel = j + i * (iLineStride);
+      iPredTemp = (pMCRefMem->pDstY[iPixel] + pTempMCRefMem->pDstY[iPixel] + 1) >> 1;
+      pMCRefMem->pDstY[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+    }
+  }
+
+  //UV
+  iBlkWidth = iBlkWidth >> 1;
+  iBlkHeight = iBlkHeight >> 1;
+  iLineStride = pMCRefMem->iDstLineChroma;
+
+  uint8_t* pDst;
+  uint8_t* pTempDst;
+  for (int k = 0; k < 2; k++) {
+    pDst = k ? pMCRefMem->pDstV : pMCRefMem->pDstU;
+    pTempDst = k ? pTempMCRefMem->pDstV : pTempMCRefMem->pDstU;
+    //iLineStride = pMCRefMem->iDstLineChroma;
+
+    for (int i = 0; i < iBlkHeight; i++) {
+      for (int j = 0; j < iBlkWidth; j++) {
+        iPixel = j + i * (iLineStride);
+        iPredTemp = (pDst[iPixel] + pTempDst[iPixel] + 1) >> 1;
+        pDst[iPixel] = WELS_CLIP3 (iPredTemp, 0, 255);
+      }
+    }
+  }
+}
+
+int32_t GetInterPred (uint8_t* pPredY, uint8_t* pPredCb, uint8_t* pPredCr, PWelsDecoderContext pCtx) {
+  sMCRefMember pMCRefMem;
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  SMcFunc* pMCFunc = &pCtx->sMcFunc;
+
+  int32_t iMBXY = pCurDqLayer->iMbXyIndex;
+
+  int16_t iMVs[2] = {0};
+
+  uint32_t iMBType = pCurDqLayer->pDec->pMbType[iMBXY];
+
+  int32_t iMBOffsetX = pCurDqLayer->iMbX << 4;
+  int32_t iMBOffsetY = pCurDqLayer->iMbY << 4;
+
+  int32_t iDstLineLuma   = pCtx->pDec->iLinesize[0];
+  int32_t iDstLineChroma = pCtx->pDec->iLinesize[1];
+
+  int32_t iBlk8X, iBlk8Y, iBlk4X, iBlk4Y, i, j, iIIdx, iJIdx;
+
+  pMCRefMem.iPicWidth = (pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iMbWidth << 4);
+  pMCRefMem.iPicHeight = (pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iMbHeight << 4);
+
+  pMCRefMem.pDstY = pPredY;
+  pMCRefMem.pDstU = pPredCb;
+  pMCRefMem.pDstV = pPredCr;
+
+  pMCRefMem.iDstLineLuma   = iDstLineLuma;
+  pMCRefMem.iDstLineChroma = iDstLineChroma;
+
+  int8_t iRefIndex = 0;
+
+  switch (iMBType) {
+  case MB_TYPE_SKIP:
+  case MB_TYPE_16x16:
+    iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
+    iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
+    iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
+    WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+    BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
+
+    if (pCurDqLayer->bUseWeightPredictionFlag) {
+      iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
+      WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 16);
+    }
+    break;
+  case MB_TYPE_16x8:
+    iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
+    iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
+    iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
+    WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+    BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 8, iMVs);
+
+    if (pCurDqLayer->bUseWeightPredictionFlag) {
+      WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 8);
+    }
+
+    iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][8][0];
+    iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][8][1];
+    iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][8];
+    WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+    pMCRefMem.pDstY = pPredY  + (iDstLineLuma << 3);
+    pMCRefMem.pDstU = pPredCb + (iDstLineChroma << 2);
+    pMCRefMem.pDstV = pPredCr + (iDstLineChroma << 2);
+    BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iMBOffsetX, iMBOffsetY + 8, pMCFunc, 16, 8, iMVs);
+
+    if (pCurDqLayer->bUseWeightPredictionFlag) {
+      WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 16, 8);
+    }
+    break;
+  case MB_TYPE_8x16:
+    iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][0][0];
+    iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][0][1];
+    iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][0];
+    WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+    BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iMBOffsetX, iMBOffsetY, pMCFunc, 8, 16, iMVs);
+    if (pCurDqLayer->bUseWeightPredictionFlag) {
+      WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 16);
+    }
+
+    iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][2][0];
+    iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][2][1];
+    iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][2];
+    WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+    pMCRefMem.pDstY = pPredY + 8;
+    pMCRefMem.pDstU = pPredCb + 4;
+    pMCRefMem.pDstV = pPredCr + 4;
+    BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iMBOffsetX + 8, iMBOffsetY, pMCFunc, 8, 16, iMVs);
+
+    if (pCurDqLayer->bUseWeightPredictionFlag) {
+      WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 16);
+    }
+    break;
+  case MB_TYPE_8x8:
+  case MB_TYPE_8x8_REF0: {
+    uint32_t iSubMBType;
+    int32_t iXOffset, iYOffset;
+    uint8_t* pDstY, *pDstU, *pDstV;
+    for (i = 0; i < 4; i++) {
+      iSubMBType = pCurDqLayer->pSubMbType[iMBXY][i];
+      iBlk8X = (i & 1) << 3;
+      iBlk8Y = (i >> 1) << 3;
+      iXOffset = iMBOffsetX + iBlk8X;
+      iYOffset = iMBOffsetY + iBlk8Y;
+
+      iIIdx = ((i >> 1) << 3) + ((i & 1) << 1);
+      iRefIndex = pCurDqLayer->pDec->pRefIndex[0][iMBXY][iIIdx];
+      WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, LIST_0));
+      pDstY = pPredY + iBlk8X + iBlk8Y * iDstLineLuma;
+      pDstU = pPredCb + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+      pDstV = pPredCr + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+      pMCRefMem.pDstY = pDstY;
+      pMCRefMem.pDstU = pDstU;
+      pMCRefMem.pDstV = pDstV;
+      switch (iSubMBType) {
+      case SUB_MB_TYPE_8x8:
+        iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
+        iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
+        BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
+        if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+          WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 8);
+        }
+
+        break;
+      case SUB_MB_TYPE_8x4:
+        iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
+        iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
+        BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
+        if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+          WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 4);
+        }
+
+
+        iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 4][0];
+        iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 4][1];
+        pMCRefMem.pDstY += (iDstLineLuma << 2);
+        pMCRefMem.pDstU += (iDstLineChroma << 1);
+        pMCRefMem.pDstV += (iDstLineChroma << 1);
+        BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
+        if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+          WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 8, 4);
+        }
+
+        break;
+      case SUB_MB_TYPE_4x8:
+        iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][0];
+        iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx][1];
+        BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
+        if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+          WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 4, 8);
+        }
+
+
+        iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 1][0];
+        iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + 1][1];
+        pMCRefMem.pDstY += 4;
+        pMCRefMem.pDstU += 2;
+        pMCRefMem.pDstV += 2;
+        BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
+        if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+          WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 4, 8);
+        }
+
+        break;
+      case SUB_MB_TYPE_4x4: {
+        for (j = 0; j < 4; j++) {
+          int32_t iUVLineStride;
+          iJIdx = ((j >> 1) << 2) + (j & 1);
+
+          iBlk4X = (j & 1) << 2;
+          iBlk4Y = (j >> 1) << 2;
+
+          iUVLineStride = (iBlk4X >> 1) + (iBlk4Y >> 1) * iDstLineChroma;
+          pMCRefMem.pDstY = pDstY + iBlk4X + iBlk4Y * iDstLineLuma;
+          pMCRefMem.pDstU = pDstU + iUVLineStride;
+          pMCRefMem.pDstV = pDstV + iUVLineStride;
+
+          iMVs[0] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + iJIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[0][iMBXY][iIIdx + iJIdx][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
+          if (pCurDqLayer->bUseWeightPredictionFlag) {
+
+            WeightPrediction (pCurDqLayer, &pMCRefMem, LIST_0, iRefIndex, 4, 4);
+          }
+
+        }
+      }
+      break;
+      default:
+        break;
+      }
+    }
+  }
+  break;
+  default:
+    break;
+  }
+  return ERR_NONE;
+}
+
+int32_t GetInterBPred (uint8_t* pPredYCbCr[3], uint8_t* pTempPredYCbCr[3], PWelsDecoderContext pCtx) {
+  sMCRefMember pMCRefMem;
+  sMCRefMember pTempMCRefMem;
+
+  PDqLayer pCurDqLayer = pCtx->pCurDqLayer;
+  SMcFunc* pMCFunc = &pCtx->sMcFunc;
+
+  int32_t iMBXY = pCurDqLayer->iMbXyIndex;
+
+  int16_t iMVs[2] = { 0 };
+
+  uint32_t iMBType = pCurDqLayer->pDec->pMbType[iMBXY];
+
+  int32_t iMBOffsetX = pCurDqLayer->iMbX << 4;
+  int32_t iMBOffsetY = pCurDqLayer->iMbY << 4;
+
+  int32_t iDstLineLuma = pCtx->pDec->iLinesize[0];
+  int32_t iDstLineChroma = pCtx->pDec->iLinesize[1];
+
+
+  pMCRefMem.iPicWidth = (pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iMbWidth << 4);
+  pMCRefMem.iPicHeight = (pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iMbHeight << 4);
+
+  pMCRefMem.pDstY = pPredYCbCr[0];
+  pMCRefMem.pDstU = pPredYCbCr[1];
+  pMCRefMem.pDstV = pPredYCbCr[2];
+
+  pMCRefMem.iDstLineLuma = iDstLineLuma;
+  pMCRefMem.iDstLineChroma = iDstLineChroma;
+
+  pTempMCRefMem = pMCRefMem;
+  pTempMCRefMem.pDstY = pTempPredYCbCr[0];
+  pTempMCRefMem.pDstU = pTempPredYCbCr[1];
+  pTempMCRefMem.pDstV = pTempPredYCbCr[2];
+
+
+  int8_t iRefIndex0 = 0;
+  int8_t iRefIndex1 = 0;
+  int8_t iRefIndex = 0;
+
+  bool bWeightedBipredIdcIs1 = pCurDqLayer->sLayerInfo.pPps->uiWeightedBipredIdc == 1;
+
+  if (IS_INTER_16x16 (iMBType)) {
+    if (IS_TYPE_L0 (iMBType) && IS_TYPE_L1 (iMBType)) {
+      iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][0][0];
+      iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][0][1];
+      iRefIndex0 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][0];
+      WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex0, LIST_0));
+      BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
+
+      iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][0][0];
+      iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][0][1];
+      iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][0];
+      WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, iRefIndex1, LIST_1));
+      BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
+      if (pCurDqLayer->bUseWeightedBiPredIdc) {
+        BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 16, 16);
+      } else {
+        BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  16, 16);
+      }
+    } else {
+      int32_t listIdx = (iMBType & MB_TYPE_P0L0) ? LIST_0 : LIST_1;
+      iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][0][0];
+      iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][0][1];
+      iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][0];
+      WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, listIdx));
+      BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iMBOffsetX, iMBOffsetY, pMCFunc, 16, 16, iMVs);
+      if (bWeightedBipredIdcIs1) {
+        WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 16, 16);
+      }
+    }
+  } else if (IS_INTER_16x8 (iMBType)) {
+    for (int32_t i = 0; i < 2; ++i) {
+      int32_t iPartIdx = i << 3;
+      uint32_t listCount = 0;
+      int32_t lastListIdx = LIST_0;
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        if (IS_DIR (iMBType, i, listIdx)) {
+          lastListIdx = listIdx;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iPartIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iPartIdx][1];
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iPartIdx];
+          WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, listIdx));
+          if (i) {
+            pMCRefMem.pDstY += (iDstLineLuma << 3);
+            pMCRefMem.pDstU += (iDstLineChroma << 2);
+            pMCRefMem.pDstV += (iDstLineChroma << 2);
+          }
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iMBOffsetX, iMBOffsetY + iPartIdx, pMCFunc, 16, 8, iMVs);
+          if (++listCount == 2) {
+            iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iPartIdx][0];
+            iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iPartIdx][1];
+            iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][iPartIdx];
+            WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, iRefIndex1, LIST_1));
+            if (i) {
+              pTempMCRefMem.pDstY += (iDstLineLuma << 3);
+              pTempMCRefMem.pDstU += (iDstLineChroma << 2);
+              pTempMCRefMem.pDstV += (iDstLineChroma << 2);
+            }
+            BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iMBOffsetX, iMBOffsetY + iPartIdx, pMCFunc, 16, 8, iMVs);
+            if (pCurDqLayer->bUseWeightedBiPredIdc) {
+              iRefIndex0 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][iPartIdx];
+              iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][iPartIdx];
+              BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 16, 8);
+            } else {
+              BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, 16, 8);
+            }
+          }
+        }
+      }
+      if (listCount == 1) {
+        if (bWeightedBipredIdcIs1) {
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[lastListIdx][iMBXY][iPartIdx];
+          WeightPrediction (pCurDqLayer, &pMCRefMem, lastListIdx, iRefIndex, 16, 8);
+        }
+      }
+    }
+  } else if (IS_INTER_8x16 (iMBType)) {
+    for (int32_t i = 0; i < 2; ++i) {
+      uint32_t listCount = 0;
+      int32_t lastListIdx = LIST_0;
+      for (int32_t listIdx = LIST_0; listIdx < LIST_A; ++listIdx) {
+        if (IS_DIR (iMBType, i, listIdx)) {
+          lastListIdx = listIdx;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][i << 1][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][i << 1][1];
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][i << 1];
+          WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, listIdx));
+          if (i) {
+            pMCRefMem.pDstY += 8;
+            pMCRefMem.pDstU += 4;
+            pMCRefMem.pDstV += 4;
+          }
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iMBOffsetX + (i ? 8 : 0), iMBOffsetY, pMCFunc, 8, 16, iMVs);
+          if (++listCount == 2) {
+            iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][i << 1][0];
+            iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][i << 1][1];
+            iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][i << 1];
+            WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, iRefIndex1, LIST_1));
+            if (i) {
+              pTempMCRefMem.pDstY += 8;
+              pTempMCRefMem.pDstU += 4;
+              pTempMCRefMem.pDstV += 4;
+            }
+            BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iMBOffsetX + (i ? 8 : 0), iMBOffsetY, pMCFunc, 8, 16, iMVs);
+            if (pCurDqLayer->bUseWeightedBiPredIdc) {
+              iRefIndex0 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][i << 1];
+              iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][i << 1];
+              BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 8, 16);
+            } else {
+              BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, 8, 16);
+            }
+          }
+        }
+      }
+      if (listCount == 1) {
+        if (bWeightedBipredIdcIs1) {
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[lastListIdx][iMBXY][i << 1];
+          WeightPrediction (pCurDqLayer, &pMCRefMem, lastListIdx, iRefIndex, 8, 16);
+        }
+      }
+    }
+  } else if (IS_Inter_8x8 (iMBType)) {
+    int32_t iBlk8X, iBlk8Y, iBlk4X, iBlk4Y, iIIdx, iJIdx;
+    uint32_t iSubMBType;
+    int32_t iXOffset, iYOffset;
+    uint8_t* pDstY, *pDstU, *pDstV;
+    uint8_t* pDstY2, *pDstU2, *pDstV2;
+    for (int32_t i = 0; i < 4; i++) {
+      iSubMBType = pCurDqLayer->pSubMbType[iMBXY][i];
+      iBlk8X = (i & 1) << 3;
+      iBlk8Y = (i >> 1) << 3;
+      iXOffset = iMBOffsetX + iBlk8X;
+      iYOffset = iMBOffsetY + iBlk8Y;
+
+      iIIdx = ((i >> 1) << 3) + ((i & 1) << 1);
+
+      pDstY = pPredYCbCr[0] + iBlk8X + iBlk8Y * iDstLineLuma;
+      pDstU = pPredYCbCr[1] + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+      pDstV = pPredYCbCr[2] + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+      pMCRefMem.pDstY = pDstY;
+      pMCRefMem.pDstU = pDstU;
+      pMCRefMem.pDstV = pDstV;
+
+      pTempMCRefMem = pMCRefMem;
+      pDstY2 = pTempPredYCbCr[0] + iBlk8X + iBlk8Y * iDstLineLuma;
+      pDstU2 = pTempPredYCbCr[1] + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+      pDstV2 = pTempPredYCbCr[2] + (iBlk8X >> 1) + (iBlk8Y >> 1) * iDstLineChroma;
+
+      pTempMCRefMem.pDstY = pDstY2;
+      pTempMCRefMem.pDstU = pDstU2;
+      pTempMCRefMem.pDstV = pDstV2;
+
+      if ((IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType))) {
+        iRefIndex0 = pCurDqLayer->pDec->pRefIndex[LIST_0][iMBXY][iIIdx];
+        WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex0, LIST_0));
+
+        iRefIndex1 = pCurDqLayer->pDec->pRefIndex[LIST_1][iMBXY][iIIdx];
+        WELS_B_MB_REC_VERIFY (GetRefPic (&pTempMCRefMem, pCtx, iRefIndex1, LIST_1));
+      } else {
+        int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
+        iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
+        WELS_B_MB_REC_VERIFY (GetRefPic (&pMCRefMem, pCtx, iRefIndex, listIdx));
+      }
+
+      if (IS_SUB_8x8 (iSubMBType)) {
+        if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) {
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
+
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
+
+          if (pCurDqLayer->bUseWeightedBiPredIdc) {
+            BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 8, 8);
+          } else {
+            BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  8, 8);
+          }
+        } else {
+          int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset, iYOffset, pMCFunc, 8, 8, iMVs);
+          if (bWeightedBipredIdcIs1) {
+            WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 8, 8);
+          }
+        }
+      } else if (IS_SUB_8x4 (iSubMBType)) {
+        if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) { //B_Bi_8x4
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
+
+          if (pCurDqLayer->bUseWeightedBiPredIdc) {
+            BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 8, 4);
+          } else {
+            BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  8, 4);
+          }
+
+          pMCRefMem.pDstY += (iDstLineLuma << 2);
+          pMCRefMem.pDstU += (iDstLineChroma << 1);
+          pMCRefMem.pDstV += (iDstLineChroma << 1);
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 4][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 4][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
+
+          pTempMCRefMem.pDstY += (iDstLineLuma << 2);
+          pTempMCRefMem.pDstU += (iDstLineChroma << 1);
+          pTempMCRefMem.pDstV += (iDstLineChroma << 1);
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 4][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 4][1];
+          BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
+
+          if (pCurDqLayer->bUseWeightedBiPredIdc) {
+            BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 8, 4);
+          } else {
+            BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  8, 4);
+          }
+        } else { //B_L0_8x4 B_L1_8x4
+          int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset, iYOffset, pMCFunc, 8, 4, iMVs);
+          pMCRefMem.pDstY += (iDstLineLuma << 2);
+          pMCRefMem.pDstU += (iDstLineChroma << 1);
+          pMCRefMem.pDstV += (iDstLineChroma << 1);
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 4][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 4][1];
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset, iYOffset + 4, pMCFunc, 8, 4, iMVs);
+          if (bWeightedBipredIdcIs1) {
+            WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 8, 4);
+          }
+        }
+      } else if (IS_SUB_4x8 (iSubMBType)) {
+        if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) { //B_Bi_4x8
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx][1];
+          BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
+
+          if (pCurDqLayer->bUseWeightedBiPredIdc) {
+            BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 4, 8);
+          } else {
+            BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  4, 8);
+          }
+
+          pMCRefMem.pDstY += 4;
+          pMCRefMem.pDstU += 2;
+          pMCRefMem.pDstV += 2;
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 1][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + 1][1];
+          BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
+
+          pTempMCRefMem.pDstY += 4;
+          pTempMCRefMem.pDstU += 2;
+          pTempMCRefMem.pDstV += 2;
+          iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 1][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + 1][1];
+          BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
+
+          if (pCurDqLayer->bUseWeightedBiPredIdc) {
+            BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 4, 8);
+          } else {
+            BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, 4, 8);
+          }
+        } else { //B_L0_4x8 B_L1_4x8
+          int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx][1];
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset, iYOffset, pMCFunc, 4, 8, iMVs);
+          pMCRefMem.pDstY += 4;
+          pMCRefMem.pDstU += 2;
+          pMCRefMem.pDstV += 2;
+          iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 1][0];
+          iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + 1][1];
+          BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset + 4, iYOffset, pMCFunc, 4, 8, iMVs);
+          if (bWeightedBipredIdcIs1) {
+            WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 4, 8);
+          }
+        }
+      } else if (IS_SUB_4x4 (iSubMBType)) {
+        if (IS_TYPE_L0 (iSubMBType) && IS_TYPE_L1 (iSubMBType)) {
+          for (int32_t j = 0; j < 4; j++) {
+            int32_t iUVLineStride;
+            iJIdx = ((j >> 1) << 2) + (j & 1);
+
+            iBlk4X = (j & 1) << 2;
+            iBlk4Y = (j >> 1) << 2;
+
+            iUVLineStride = (iBlk4X >> 1) + (iBlk4Y >> 1) * iDstLineChroma;
+            pMCRefMem.pDstY = pDstY + iBlk4X + iBlk4Y * iDstLineLuma;
+            pMCRefMem.pDstU = pDstU + iUVLineStride;
+            pMCRefMem.pDstV = pDstV + iUVLineStride;
+
+            iMVs[0] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + iJIdx][0];
+            iMVs[1] = pCurDqLayer->pDec->pMv[LIST_0][iMBXY][iIIdx + iJIdx][1];
+            BaseMC (pCtx, &pMCRefMem, LIST_0, iRefIndex0, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
+
+            pTempMCRefMem.pDstY = pDstY2 + iBlk8X + iBlk8Y * iDstLineLuma;
+            pTempMCRefMem.pDstU = pDstU2 + iUVLineStride;
+            pTempMCRefMem.pDstV = pDstV2 + iUVLineStride;;
+
+            iMVs[0] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + iJIdx][0];
+            iMVs[1] = pCurDqLayer->pDec->pMv[LIST_1][iMBXY][iIIdx + iJIdx][1];
+            BaseMC (pCtx, &pTempMCRefMem, LIST_1, iRefIndex1, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
+
+            if (pCurDqLayer->bUseWeightedBiPredIdc) {
+              BiWeightPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem, iRefIndex0, iRefIndex1, bWeightedBipredIdcIs1, 4, 4);
+            } else {
+              BiPrediction (pCurDqLayer, &pMCRefMem, &pTempMCRefMem,  4, 4);
+            }
+          }
+        } else {
+          int32_t listIdx = IS_TYPE_L0 (iSubMBType) ? LIST_0 : LIST_1;
+          iRefIndex = pCurDqLayer->pDec->pRefIndex[listIdx][iMBXY][iIIdx];
+          for (int32_t j = 0; j < 4; j++) {
+            int32_t iUVLineStride;
+            iJIdx = ((j >> 1) << 2) + (j & 1);
+
+            iBlk4X = (j & 1) << 2;
+            iBlk4Y = (j >> 1) << 2;
+
+            iUVLineStride = (iBlk4X >> 1) + (iBlk4Y >> 1) * iDstLineChroma;
+            pMCRefMem.pDstY = pDstY + iBlk4X + iBlk4Y * iDstLineLuma;
+            pMCRefMem.pDstU = pDstU + iUVLineStride;
+            pMCRefMem.pDstV = pDstV + iUVLineStride;
+
+            iMVs[0] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + iJIdx][0];
+            iMVs[1] = pCurDqLayer->pDec->pMv[listIdx][iMBXY][iIIdx + iJIdx][1];
+            BaseMC (pCtx, &pMCRefMem, listIdx, iRefIndex, iXOffset + iBlk4X, iYOffset + iBlk4Y, pMCFunc, 4, 4, iMVs);
+            if (bWeightedBipredIdcIs1) {
+              WeightPrediction (pCurDqLayer, &pMCRefMem, listIdx, iRefIndex, 4, 4);
+            }
+          }
+        }
+      }
+    }
+  }
+  return ERR_NONE;
+}
+
+int32_t RecChroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLevel, PDqLayer pDqLayer) {
+  int32_t iChromaStride = pCtx->pCurDqLayer->pDec->iLinesize[1];
+  PIdctFourResAddPredFunc pIdctFourResAddPredFunc = pCtx->pIdctFourResAddPredFunc;
+
+  uint8_t i = 0;
+  uint8_t uiCbpC = pDqLayer->pCbp[iMBXY] >> 4;
+
+  if (1 == uiCbpC || 2 == uiCbpC) {
+    for (i = 0; i < 2; i++) {
+      int16_t* pRS = pScoeffLevel + 256 + (i << 6);
+      uint8_t* pPred = pDqLayer->pPred[i + 1];
+      const int8_t* pNzc = pDqLayer->pNzc[iMBXY] + 16 + 2 * i;
+
+      /*1 chroma is divided 4 4x4_block to idct*/
+      pIdctFourResAddPredFunc (pPred, iChromaStride, pRS, pNzc);
+    }
+  }
+
+  return ERR_NONE;
+}
+
+} // namespace WelsDec
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/wels_decoder_thread.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/wels_decoder_thread.cpp
new file mode 100644
index 0000000000..d05aa4515b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/src/wels_decoder_thread.cpp
@@ -0,0 +1,311 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2019, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_decoder_thread.cpp
+ *
+ * \brief   Interfaces introduced in thread programming
+ *
+ * \date    08/06/2018 Created
+ *
+ *************************************************************************************
+ */
+
+
+#ifdef __linux__
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <sched.h>
+#elif !defined(_WIN32) && !defined(__CYGWIN__)
+#include <sys/types.h>
+#include <sys/param.h>
+#include <unistd.h>
+#ifndef __Fuchsia__
+#include <sys/sysctl.h>
+#endif
+#ifdef __APPLE__
+#define HW_NCPU_NAME "hw.logicalcpu"
+#else
+#define HW_NCPU_NAME "hw.ncpu"
+#endif
+#endif
+
+#include "wels_decoder_thread.h"
+#include <stdio.h>
+#include <stdlib.h>
+
+int32_t GetCPUCount() {
+  WelsLogicalProcessInfo pInfo;
+  pInfo.ProcessorCount = 1;
+  WelsQueryLogicalProcessInfo (&pInfo);
+  return pInfo.ProcessorCount;
+}
+
+int ThreadCreate (SWelsDecThread* t, LPWELS_THREAD_ROUTINE tf, void* ta) {
+  WELS_THREAD_ATTR attr = 0;
+  return WelsThreadCreate (& (t->h), tf, ta, attr);
+}
+
+int ThreadWait (SWelsDecThread* t) {
+  return WelsThreadJoin (t->h);
+}
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+
+int EventCreate (SWelsDecEvent* e, int manualReset, int initialState) {
+  e->h = CreateEvent (NULL, manualReset, initialState, NULL);
+  e->isSignaled = initialState;
+  return (e->h != NULL) ? 0 : 1;
+}
+
+void EventReset (SWelsDecEvent* e) {
+  ResetEvent (e->h);
+  e->isSignaled = 0;
+}
+
+void EventPost (SWelsDecEvent* e) {
+  SetEvent (e->h);
+  e->isSignaled = 1;
+}
+
+int EventWait (SWelsDecEvent* e, int32_t timeout) {
+  DWORD result;
+  if ((uint32_t)timeout == WELS_DEC_THREAD_WAIT_INFINITE || timeout < 0)
+    result = WaitForSingleObject (e->h, INFINITE);
+  else
+    result = WaitForSingleObject (e->h, timeout);
+
+  if (result == WAIT_OBJECT_0)
+    return WELS_DEC_THREAD_WAIT_SIGNALED;
+  else
+    return WAIT_TIMEOUT;
+}
+
+void EventDestroy (SWelsDecEvent* e) {
+  CloseHandle (e->h);
+  e->h = NULL;
+}
+
+int SemCreate (SWelsDecSemphore* s, long value, long max) {
+  s->h = CreateSemaphore (NULL, value, max, NULL);
+  return (s->h != NULL) ? 0 : 1;
+}
+
+int SemWait (SWelsDecSemphore* s, int32_t timeout) {
+  DWORD result;
+  if ((uint32_t)timeout == WELS_DEC_THREAD_WAIT_INFINITE || timeout < 0)
+    result = WaitForSingleObject (s->h, INFINITE);
+  else
+    result = WaitForSingleObject (s->h, timeout);
+
+  if (result == WAIT_OBJECT_0) {
+    return WELS_DEC_THREAD_WAIT_SIGNALED;
+  } else {
+    return WELS_DEC_THREAD_WAIT_TIMEDOUT;
+  }
+}
+
+void SemRelease (SWelsDecSemphore* s, long* prevcount) {
+  ReleaseSemaphore (s->h, 1, prevcount);
+}
+
+void SemDestroy (SWelsDecSemphore* s) {
+  CloseHandle (s->h);
+  s->h = NULL;
+}
+
+#else /* _WIN32 */
+
+static void getTimespecFromTimeout (struct timespec* ts, int32_t timeout) {
+  struct timeval tv;
+  gettimeofday (&tv, 0);
+  ts->tv_nsec = tv.tv_usec * 1000 + timeout * 1000000;
+  ts->tv_sec = tv.tv_sec + ts->tv_nsec / 1000000000;
+  ts->tv_nsec %= 1000000000;
+}
+int EventCreate (SWelsDecEvent* e, int manualReset, int initialState) {
+  if (pthread_mutex_init (& (e->m), NULL))
+    return 1;
+  if (pthread_cond_init (& (e->c), NULL))
+    return 2;
+
+  e->isSignaled = initialState;
+  e->manualReset = manualReset;
+
+  return 0;
+}
+
+void EventReset (SWelsDecEvent* e) {
+  pthread_mutex_lock (& (e->m));
+  e->isSignaled = 0;
+  pthread_mutex_unlock (& (e->m));
+}
+
+void EventPost (SWelsDecEvent* e) {
+  pthread_mutex_lock (& (e->m));
+  pthread_cond_broadcast (& (e->c));
+  e->isSignaled = 1;
+  pthread_mutex_unlock (& (e->m));
+}
+
+int EventWait (SWelsDecEvent* e, int32_t timeout) {
+  pthread_mutex_lock (& (e->m));
+  int signaled = e->isSignaled;
+  if (timeout == 0) {
+    pthread_mutex_unlock (& (e->m));
+    if (signaled)
+      return WELS_DEC_THREAD_WAIT_SIGNALED;
+    else
+      return WELS_DEC_THREAD_WAIT_TIMEDOUT;
+  }
+  if (signaled) {
+    if (!e->manualReset) {
+      e->isSignaled = 0;
+    }
+    pthread_mutex_unlock (& (e->m));
+    return WELS_DEC_THREAD_WAIT_SIGNALED;
+  }
+  int rc = 0;
+  if (timeout == WELS_DEC_THREAD_WAIT_INFINITE || timeout < 0) {
+    rc = pthread_cond_wait (& (e->c), & (e->m));
+  } else {
+    struct timespec ts;
+    getTimespecFromTimeout (&ts, timeout);
+    rc = pthread_cond_timedwait (& (e->c), & (e->m), &ts);
+  }
+  if (!e->manualReset) {
+    e->isSignaled = 0;
+  }
+  pthread_mutex_unlock (& (e->m));
+  if (rc == 0)
+    return WELS_DEC_THREAD_WAIT_SIGNALED;
+  else
+    return WELS_DEC_THREAD_WAIT_TIMEDOUT;
+}
+
+void EventDestroy (SWelsDecEvent* e) {
+  pthread_mutex_destroy (& (e->m));
+  pthread_cond_destroy (& (e->c));
+}
+
+int SemCreate (SWelsDecSemphore* s, long value, long max) {
+  s->v = value;
+  s->max = max;
+  if (pthread_mutex_init (& (s->m), NULL))
+    return 1;
+  const char* event_name = "";
+  if (WelsEventOpen (& (s->e), event_name)) {
+    return 2;
+  }
+  return 0;
+}
+
+int SemWait (SWelsDecSemphore* s, int32_t timeout) {
+#if defined(__APPLE__)
+  pthread_mutex_lock (& (s->m));
+#endif
+  int rc = 0;
+  if (timeout != 0) {
+    while ((s->v) == 0) {
+      if (timeout == WELS_DEC_THREAD_WAIT_INFINITE || timeout < 0) {
+        // infinite wait until released
+#if defined(__APPLE__)
+        rc = pthread_cond_wait (& (s->e), & (s->m));
+#else
+        rc = sem_wait (s->e);
+        if (rc != 0) rc = errno;
+#endif
+      } else {
+        struct timespec ts;
+        getTimespecFromTimeout (&ts, timeout);
+#if defined(__APPLE__)
+        rc = pthread_cond_timedwait (& (s->e), & (s->m), &ts);
+#else
+        rc = sem_timedwait (s->e, &ts);
+        if (rc != 0) rc = errno;
+#endif
+        if (rc != EINTR) {
+          // if timed out we return to the caller
+          break;
+        }
+      }
+    }
+    // only decrement counter if semaphore was signaled
+    if (rc == 0)
+      s->v -= 1;
+
+  } else {
+    // Special handling for timeout of 0
+    if (s->v > 0) {
+      s->v -= 1;
+      rc = 0;
+    } else {
+      rc = 1;
+    }
+  }
+#if defined(__APPLE__)
+  pthread_mutex_unlock (& (s->m));
+#endif
+  // set return value
+  if (rc == 0)
+    return WELS_DEC_THREAD_WAIT_SIGNALED;
+  else
+    return WELS_DEC_THREAD_WAIT_TIMEDOUT;
+}
+
+void SemRelease (SWelsDecSemphore* s, long* o_pPrevCount) {
+  long prevcount;
+#ifdef __APPLE__
+  pthread_mutex_lock (& (s->m));
+  prevcount = s->v;
+  if (s->v < s->max)
+    s->v += 1;
+  pthread_cond_signal (& (s->e));
+  pthread_mutex_unlock (& (s->m));
+#else
+  prevcount = s->v;
+  if (s->v < s->max)
+    s->v += 1;
+  sem_post (s->e);
+#endif
+  if (o_pPrevCount != NULL) {
+    *o_pPrevCount = prevcount;
+  }
+}
+
+void SemDestroy (SWelsDecSemphore* s) {
+  pthread_mutex_destroy (& (s->m));
+  const char* event_name = "";
+  WelsEventClose (& (s->e), event_name);
+}
+
+#endif /* !_WIN32 */
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/dct.asm b/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/dct.asm
new file mode 100644
index 0000000000..40e230c64e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/dct.asm
@@ -0,0 +1,72 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        ?Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        ?Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  dct.asm
+;*
+;*  Abstract
+;*      WelsDctFourT4_sse2
+;*
+;*  History
+;*      8/4/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+SECTION .text
+
+;void WelsBlockZero16x16_sse2(int16_t * block, int32_t stride);
+WELS_EXTERN WelsBlockZero16x16_sse2
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    shl     r1, 1
+    pxor    xmm0, xmm0
+%rep 16
+    movdqa  [r0], xmm0
+    movdqa  [r0+16], xmm0
+    add     r0, r1
+%endrep
+    ret
+
+;void WelsBlockZero8x8_sse2(int16_t * block, int32_t stride);
+WELS_EXTERN WelsBlockZero8x8_sse2
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    shl     r1, 1
+    pxor    xmm0, xmm0
+%rep 8
+    movdqa  [r0], xmm0
+    add     r0, r1
+%endrep
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/intra_pred.asm b/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/intra_pred.asm
new file mode 100644
index 0000000000..4ea1afc329
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/core/x86/intra_pred.asm
@@ -0,0 +1,1456 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  intra_pred.asm
+;*
+;*  Abstract
+;*      sse2 and mmx function for intra predict operations(decoder)
+;*
+;*  History
+;*      18/09/2009 Created
+;*      19/11/2010 Added
+;*                  WelsDecoderI16x16LumaPredDcTop_sse2, WelsDecoderI16x16LumaPredDcNA_sse2,
+;*                  WelsDecoderIChromaPredDcLeft_mmx, WelsDecoderIChromaPredDcTop_sse2
+;*                  and WelsDecoderIChromaPredDcNA_mmx
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+;*******************************************************************************
+; Local Data (Read Only)
+;*******************************************************************************
+
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+align 16
+sse2_plane_inc_minus dw -7, -6, -5, -4, -3, -2, -1, 0
+align 16
+sse2_plane_inc dw 1, 2, 3, 4, 5, 6, 7, 8
+align 16
+sse2_plane_dec dw 8, 7, 6, 5, 4, 3, 2, 1
+
+; for chroma plane mode
+sse2_plane_inc_c dw 1, 2, 3, 4
+sse2_plane_dec_c dw 4, 3, 2, 1
+align 16
+sse2_plane_mul_b_c dw -3, -2, -1, 0, 1, 2, 3, 4
+
+align 16
+mmx_01bytes:        times 16    db 1
+
+align 16
+mmx_0x02: dw 0x02, 0x00, 0x00, 0x00
+
+align 16
+sse2_dc_0x80: times 16 db 0x80
+align 16
+sse2_wd_0x02: times 8 dw 0x02
+
+;*******************************************************************************
+; macros
+;*******************************************************************************
+;xmm0, xmm1, xmm2, eax, ecx
+;lower 64 bits of xmm0 save the result
+%macro SSE2_PRED_H_4X4_TWO_LINE 5
+    movd        %1, [%4-1]
+    movdqa      %3, %1
+    punpcklbw   %1, %3
+    movdqa      %3, %1
+    punpcklbw   %1, %3
+
+    ;add            %4, %5
+    movd        %2, [%4+%5-1]
+    movdqa      %3, %2
+    punpcklbw   %2, %3
+    movdqa      %3, %2
+    punpcklbw   %2, %3
+    punpckldq   %1, %2
+%endmacro
+
+
+%macro LOAD_COLUMN 6
+    movd    %1, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %1,   %2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %3,   %2
+    punpcklwd %1,   %3
+    lea     %5, [%5+2*%6]
+    movd    %4, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %4,   %2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    lea     %5, [%5+2*%6]
+    punpcklbw %3,   %2
+    punpcklwd %4,   %3
+    punpckhdq %1,   %4
+%endmacro
+
+%macro SUMW_HORIZON 3
+    movhlps     %2, %1          ; x2 = xx xx xx xx d7 d6 d5 d4
+    paddw       %1, %2          ; x1 = xx xx xx xx d37 d26 d15 d04
+    punpcklwd   %1, %3          ; x1 =  d37  d26 d15 d04
+    movhlps     %2, %1          ; x2 = xxxx xxxx d37 d26
+    paddd       %1, %2          ; x1 = xxxx xxxx d1357 d0246
+    pshuflw     %2, %1, 0x4e    ; x2 = xxxx xxxx d0246 d1357
+    paddd       %1, %2          ; x1 = xxxx xxxx xxxx  d01234567
+%endmacro
+
+%macro COPY_16_TIMES 2
+    movdqa      %2, [%1-16]
+    psrldq      %2, 15
+    pmuludq     %2, [pic(mmx_01bytes)]
+    pshufd      %2, %2, 0
+%endmacro
+
+%macro COPY_16_TIMESS 3
+    movdqa      %2, [%1+%3-16]
+    psrldq      %2, 15
+    pmuludq     %2, [pic(mmx_01bytes)]
+    pshufd      %2, %2, 0
+%endmacro
+
+%macro LOAD_COLUMN_C 6
+    movd    %1, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %1,%2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %3,   %2
+    punpckhwd %1,   %3
+    lea     %5, [%5+2*%6]
+%endmacro
+
+%macro LOAD_2_LEFT_AND_ADD 0
+    lea         r0, [r0+2*r1]
+    movzx       r3, byte [r0-0x01]
+    add         r2, r3
+    movzx       r3, byte [r0+r1-0x01]
+    add         r2, r3
+%endmacro
+
+;*******************************************************************************
+; Code
+;*******************************************************************************
+
+SECTION .text
+
+
+;*******************************************************************************
+;   void WelsDecoderI4x4LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride)
+;
+;   pPred must align to 16
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredH_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+
+    movzx       r2, byte [r0-1]
+    movd        xmm0,   r2d
+    pmuludq     xmm0,   [pic(mmx_01bytes)]
+
+    movzx       r2, byte [r0+r1-1]
+    movd        xmm1,   r2d
+    pmuludq     xmm1,   [pic(mmx_01bytes)]
+
+    lea         r0, [r0+r1]
+    movzx       r2, byte [r0+r1-1]
+    movd        xmm2,   r2d
+    pmuludq     xmm2,   [pic(mmx_01bytes)]
+
+    movzx       r2, byte [r0+2*r1-1]
+    movd        xmm3,   r2d
+    pmuludq     xmm3,   [pic(mmx_01bytes)]
+
+    sub         r0,    r1
+    movd        [r0], xmm0
+    movd        [r0+r1], xmm1
+    lea         r0, [r0+2*r1]
+    movd        [r0], xmm2
+    movd        [r0+r1], xmm3
+
+    DEINIT_X86_32_PIC
+    ret
+
+;*******************************************************************************
+; void WelsDecoderI16x16LumaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI16x16LumaPredPlane_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    mov r4, r0 ; save r0 in r4
+    sub     r0, 1
+    sub     r0, r1
+
+    ;for H
+    pxor    xmm7,   xmm7
+    movq    xmm0,   [r0]
+    movdqa  xmm5,   [pic(sse2_plane_dec)]
+    punpcklbw xmm0, xmm7
+    pmullw  xmm0,   xmm5
+    movq    xmm1,   [r0 + 9]
+    movdqa  xmm6,   [pic(sse2_plane_inc)]
+    punpcklbw xmm1, xmm7
+    pmullw  xmm1,   xmm6
+    psubw   xmm1,   xmm0
+
+    SUMW_HORIZON    xmm1,xmm0,xmm2
+    movd    r2d,    xmm1        ; H += (i + 1) * (top[8 + i] - top[6 - i]);
+    movsx   r2, r2w
+    imul    r2, 5
+    add     r2, 32
+    sar     r2, 6           ; b = (5 * H + 32) >> 6;
+    SSE2_Copy8Times xmm1, r2d   ; xmm1 = b,b,b,b,b,b,b,b
+
+    movzx   r3, BYTE [r0+16]
+    sub r0, 3
+    LOAD_COLUMN     xmm0, xmm2, xmm3, xmm4, r0, r1
+
+    add     r0, 3
+    movzx   r2, BYTE [r0+8*r1]
+    add     r3, r2
+    shl     r3, 4           ;   a = (left[15*kiStride] + top[15]) << 4;
+
+    sub r0, 3
+    add     r0, r1
+    LOAD_COLUMN     xmm7, xmm2, xmm3, xmm4, r0, r1
+    pxor    xmm4,   xmm4
+    punpckhbw xmm0, xmm4
+    pmullw  xmm0,   xmm5
+    punpckhbw xmm7, xmm4
+    pmullw  xmm7,   xmm6
+    psubw   xmm7,   xmm0
+
+    ; Indicate that xmm2 is fully initialized. Its actual value doesn't
+    ; matter in SUMW_HORIZON below, but after being used in LOAD_COLUMN above,
+    ; valgrind thinks that xmm2 contains uninitalized data (if the columns outside
+    ; of the left are uninitialized, such as in DecUT_IntraPrediction), which taints
+    ; r2d below, even if actually isn't based on the uninitialized data.
+    pxor xmm2, xmm2
+
+    SUMW_HORIZON   xmm7,xmm0,xmm2
+    movd    r2d,   xmm7         ; V
+    movsx   r2, r2w
+
+    imul    r2, 5
+    add     r2, 32
+    sar     r2, 6               ; c = (5 * V + 32) >> 6;
+    SSE2_Copy8Times xmm4, r2d       ; xmm4 = c,c,c,c,c,c,c,c
+
+    mov r0, r4
+    add     r3, 16
+    imul    r2, -7
+    add     r3, r2      ; s = a + 16 + (-7)*c
+    SSE2_Copy8Times xmm0, r3d       ; xmm0 = s,s,s,s,s,s,s,s
+
+    xor     r2, r2
+    movdqa  xmm5,   [pic(sse2_plane_inc_minus)]
+
+get_i16x16_luma_pred_plane_sse2_1:
+    movdqa  xmm2,   xmm1
+    pmullw  xmm2,   xmm5
+    paddw   xmm2,   xmm0
+    psraw   xmm2,   5
+    movdqa  xmm3,   xmm1
+    pmullw  xmm3,   xmm6
+    paddw   xmm3,   xmm0
+    psraw   xmm3,   5
+    packuswb xmm2,  xmm3
+    movdqa  [r0],   xmm2
+    paddw   xmm0,   xmm4
+    add     r0, r1
+    inc     r2
+    cmp     r2, 16
+    jnz get_i16x16_luma_pred_plane_sse2_1
+
+    POP_XMM
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    ret
+
+
+
+;*******************************************************************************
+; void WelsDecoderI16x16LumaPredH_sse2(uint8_t *pPred, const int32_t kiStride);
+;*******************************************************************************
+
+%macro SSE2_PRED_H_16X16_TWO_LINE_DEC 2
+    lea     %1, [%1+%2*2]
+
+    COPY_16_TIMES %1,   xmm0
+    movdqa  [%1],   xmm0
+    COPY_16_TIMESS %1,  xmm0,   %2
+    movdqa  [%1+%2],    xmm0
+%endmacro
+
+WELS_EXTERN WelsDecoderI16x16LumaPredH_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC_NOPRESERVE r2
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+
+    COPY_16_TIMES r0,   xmm0
+    movdqa  [r0],       xmm0
+    COPY_16_TIMESS r0,  xmm0,   r1
+    movdqa  [r0+r1],    xmm0
+
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+    SSE2_PRED_H_16X16_TWO_LINE_DEC r0, r1
+
+    DEINIT_X86_32_PIC
+    ret
+
+;*******************************************************************************
+; void WelsDecoderI16x16LumaPredV_sse2(uint8_t *pPred, const int32_t kiStride);
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI16x16LumaPredV_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+
+    sub     r0, r1
+    movdqa  xmm0, [r0]
+
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+    movdqa  [r0+r1], xmm0
+    lea     r0, [r0+2*r1]
+    movdqa  [r0],     xmm0
+
+    ret
+
+;*******************************************************************************
+; void WelsDecoderIChromaPredPlane_sse2(uint8_t *pPred, const int32_t kiStride);
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredPlane_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    mov r4, r0
+    sub     r0, 1
+    sub     r0, r1
+
+    pxor    mm7,    mm7
+    movq    mm0,    [r0]
+    movq    mm5,    [pic(sse2_plane_dec_c)]
+    punpcklbw mm0,  mm7
+    pmullw  mm0,    mm5
+    movq    mm1,    [r0 + 5]
+    movq    mm6,    [pic(sse2_plane_inc_c)]
+    punpcklbw mm1,  mm7
+    pmullw  mm1,    mm6
+    psubw   mm1,    mm0
+
+    movq2dq xmm1,   mm1
+    pxor    xmm2,   xmm2
+    SUMW_HORIZON    xmm1,xmm0,xmm2
+    movd    r2d,    xmm1
+    movsx   r2, r2w
+    imul    r2, 17
+    add     r2, 16
+    sar     r2, 5           ; b = (17 * H + 16) >> 5;
+    SSE2_Copy8Times xmm1, r2d   ; mm1 = b,b,b,b,b,b,b,b
+
+    movzx   r3, BYTE [r0+8]
+    sub r0, 3
+    LOAD_COLUMN_C   mm0, mm2, mm3, mm4, r0, r1
+
+    add     r0, 3
+    movzx   r2, BYTE [r0+4*r1]
+    add     r3, r2
+    shl     r3, 4           ; a = (left[7*kiStride] + top[7]) << 4;
+
+    sub r0, 3
+    add     r0, r1
+    LOAD_COLUMN_C   mm7, mm2, mm3, mm4, r0, r1
+    pxor    mm4,    mm4
+    punpckhbw mm0,  mm4
+    pmullw  mm0,    mm5
+    punpckhbw mm7,  mm4
+    pmullw  mm7,    mm6
+    psubw   mm7,    mm0
+
+    movq2dq xmm7,   mm7
+    pxor    xmm2,   xmm2
+    SUMW_HORIZON    xmm7,xmm0,xmm2
+    movd    r2d,    xmm7            ; V
+    movsx   r2, r2w
+
+    imul    r2, 17
+    add     r2, 16
+    sar     r2, 5               ; c = (17 * V + 16) >> 5;
+    SSE2_Copy8Times xmm4, r2d       ; mm4 = c,c,c,c,c,c,c,c
+
+    mov     r0, r4
+    add     r3, 16
+    imul    r2, -3
+    add     r3, r2              ; s = a + 16 + (-3)*c
+    SSE2_Copy8Times xmm0, r3d       ; xmm0 = s,s,s,s,s,s,s,s
+
+    xor     r2, r2
+    movdqa  xmm5,   [pic(sse2_plane_mul_b_c)]
+
+get_i_chroma_pred_plane_sse2_1:
+    movdqa  xmm2,   xmm1
+    pmullw  xmm2,   xmm5
+    paddw   xmm2,   xmm0
+    psraw   xmm2,   5
+    packuswb xmm2,  xmm2
+    movq    [r0],   xmm2
+    paddw   xmm0,   xmm4
+    add     r0, r1
+    inc     r2
+    cmp     r2, 8
+    jnz get_i_chroma_pred_plane_sse2_1
+
+    POP_XMM
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    WELSEMMS
+    ret
+
+;*******************************************************************************
+;   0 |1 |2 |3 |4 |
+;   6 |7 |8 |9 |10|
+;   11|12|13|14|15|
+;   16|17|18|19|20|
+;   21|22|23|24|25|
+;   7 is the start pixel of current 4x4 block
+;   pPred[7] = ([6]+[0]*2+[1]+2)/4
+;
+;   void WelsDecoderI4x4LumaPredDDR_mmx(uint8_t *pPred, const int32_t kiStride)
+;
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredDDR_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+
+    movq        mm1,[r2+r1-8]       ;get value of 11,decreasing 8 is trying to improve the performance of movq mm1[8] = 11
+    movq        mm2,[r2-8]          ;get value of 6 mm2[8] = 6
+    sub     r2, r1          ;mov eax to above line of current block(postion of 1)
+    punpckhbw   mm2,[r2-8]          ;mm2[8](high 8th byte of mm2) = [0](value of 0), mm2[7]= [6]
+    movd        mm3,[r2]            ;get value 1, mm3[1] = [1],mm3[2]=[2],mm3[3]=[3]
+    punpckhwd   mm1,mm2             ;mm1[8]=[0],mm1[7]=[6],mm1[6]=[11]
+    psllq       mm3,18h             ;mm3[5]=[1]
+    psrlq       mm1,28h             ;mm1[3]=[0],mm1[2]=[6],mm1[1]=[11]
+    por         mm3,mm1             ;mm3[6]=[3],mm3[5]=[2],mm3[4]=[1],mm3[3]=[0],mm3[2]=[6],mm3[1]=[11]
+    movq        mm1,mm3             ;mm1[6]=[3],mm1[5]=[2],mm1[4]=[1],mm1[3]=[0],mm1[2]=[6],mm1[1]=[11]
+    lea         r2,[r2+r1*2-8h]     ;set eax point to 12
+    movq        mm4,[r2+r1]     ;get value of 16, mm4[8]=[16]
+    psllq       mm3,8               ;mm3[7]=[3],mm3[6]=[2],mm3[5]=[1],mm3[4]=[0],mm3[3]=[6],mm3[2]=[11],mm3[1]=0
+    psrlq       mm4,38h             ;mm4[1]=[16]
+    por         mm3,mm4             ;mm3[7]=[3],mm3[6]=[2],mm3[5]=[1],mm3[4]=[0],mm3[3]=[6],mm3[2]=[11],mm3[1]=[16]
+    movq        mm2,mm3             ;mm2[7]=[3],mm2[6]=[2],mm2[5]=[1],mm2[4]=[0],mm2[3]=[6],mm2[2]=[11],mm2[1]=[16]
+    movq        mm4,[r2+r1*2]       ;mm4[8]=[21]
+    psllq       mm3,8               ;mm3[8]=[3],mm3[7]=[2],mm3[6]=[1],mm3[5]=[0],mm3[4]=[6],mm3[3]=[11],mm3[2]=[16],mm3[1]=0
+    psrlq       mm4,38h             ;mm4[1]=[21]
+    por         mm3,mm4             ;mm3[8]=[3],mm3[7]=[2],mm3[6]=[1],mm3[5]=[0],mm3[4]=[6],mm3[3]=[11],mm3[2]=[16],mm3[1]=[21]
+    movq        mm4,mm3             ;mm4[8]=[3],mm4[7]=[2],mm4[6]=[1],mm4[5]=[0],mm4[4]=[6],mm4[3]=[11],mm4[2]=[16],mm4[1]=[21]
+    pavgb       mm3,mm1             ;mm3=([11]+[21]+1)/2
+    pxor        mm1,mm4             ;find odd value in the lowest bit of each byte
+    pand        mm1,[pic(mmx_01bytes)]   ;set the odd bit
+    psubusb     mm3,mm1             ;decrease 1 from odd bytes
+    pavgb       mm2,mm3             ;mm2=(([11]+[21]+1)/2+1+[16])/2
+
+    lea         r0,[r0+r1]
+    movd        [r0+2*r1],mm2
+    sub         r0,r1
+    psrlq       mm2,8
+    movd        [r0+2*r1],mm2
+    psrlq       mm2,8
+    movd        [r0+r1],mm2
+    psrlq       mm2,8
+    movd        [r0],mm2
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+;*******************************************************************************
+;   void WelsDecoderIChromaPredH_mmx(uint8_t *pPred, const int32_t kiStride)
+;   copy 8 pixel of 8 line from left
+;*******************************************************************************
+%macro MMX_PRED_H_8X8_ONE_LINE 4
+    movq        %1,     [%3-8]
+    psrlq       %1,     38h
+
+    pmullw      %1,     [pic(mmx_01bytes)]
+    pshufw      %1,     %1, 0
+    movq        [%4],   %1
+%endmacro
+
+%macro MMX_PRED_H_8X8_ONE_LINEE 4
+    movq        %1,     [%3+r1-8]
+    psrlq       %1,     38h
+
+    pmullw      %1,     [pic(mmx_01bytes)]
+    pshufw      %1,     %1, 0
+    movq        [%4],   %1
+%endmacro
+
+WELS_EXTERN WelsDecoderIChromaPredH_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+
+    movq        mm0,    [r2-8]
+    psrlq       mm0,    38h
+
+    pmullw      mm0,        [pic(mmx_01bytes)]
+    pshufw      mm0,    mm0,    0
+    movq        [r0],   mm0
+
+    MMX_PRED_H_8X8_ONE_LINEE mm0, mm1, r2, r0+r1
+
+    lea         r2, [r2+r1*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r2, r0+2*r1
+
+    lea         r0, [r0+2*r1]
+    MMX_PRED_H_8X8_ONE_LINEE mm0, mm1, r2, r0+r1
+
+    lea         r2, [r2+r1*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r2, r0+2*r1
+
+    lea         r0, [r0+2*r1]
+    MMX_PRED_H_8X8_ONE_LINEE mm0, mm1, r2, r0+r1
+
+    lea         r2, [r2+r1*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r2, r0+2*r1
+
+    lea         r0, [r0+2*r1]
+    MMX_PRED_H_8X8_ONE_LINEE mm0, mm1, r2, r0+r1
+
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+;*******************************************************************************
+;   void WelsDecoderIChromaPredV_mmx(uint8_t *pPred, const int32_t kiStride)
+;   copy 8 pixels from top 8 pixels
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredV_mmx
+    %assign push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+
+    sub         r0,     r1
+    movq        mm0,        [r0]
+
+    movq        [r0+r1],        mm0
+    movq        [r0+2*r1],  mm0
+    lea         r0, [r0+2*r1]
+    movq        [r0+r1],      mm0
+    movq        [r0+2*r1],    mm0
+    lea         r0, [r0+2*r1]
+    movq        [r0+r1],      mm0
+    movq        [r0+2*r1],    mm0
+    lea         r0, [r0+2*r1]
+    movq        [r0+r1],      mm0
+    movq        [r0+2*r1],    mm0
+
+    WELSEMMS
+    ret
+
+
+;*******************************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |a |b |
+;   |g |h |e |f |
+;   |i |j |g |h |
+
+;   a = (1 + lt + l0)>>1
+;   e = (1 + l0 + l1)>>1
+;   g = (1 + l1 + l2)>>1
+;   i = (1 + l2 + l3)>>1
+
+;   d = (2 + t0 + (t1<<1) + t2)>>2
+;   c = (2 + lt + (t0<<1) + t1)>>2
+;   b = (2 + l0 + (lt<<1) + t0)>>2
+
+;   f = (2 + l1 + (l0<<1) + lt)>>2
+;   h = (2 + l2 + (l1<<1) + l0)>>2
+;   j = (2 + l3 + (l2<<1) + l1)>>2
+;   [b a f e h g j i] + [d c b a] --> mov to memory
+;
+;   void WelsDecoderI4x4LumaPredHD_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredHD_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+    sub         r2, r1
+    movd        mm0, [r2-1]            ; mm0 = [xx xx xx xx t2 t1 t0 lt]
+    psllq       mm0, 20h                ; mm0 = [t2 t1 t0 lt xx xx xx xx]
+
+    movd        mm1, [r2+2*r1-4]
+    punpcklbw   mm1, [r2+r1-4]        ; mm1[7] = l0, mm1[6] = l1
+    lea         r2, [r2+2*r1]
+    movd        mm2, [r2+2*r1-4]
+    punpcklbw   mm2, [r2+r1-4]        ; mm2[7] = l2, mm2[6] = l3
+    punpckhwd   mm2, mm1                ; mm2 = [l0 l1 l2 l3 xx xx xx xx]
+    psrlq       mm2, 20h
+    pxor        mm0, mm2                ; mm0 = [t2 t1 t0 lt l0 l1 l2 l3]
+
+    movq        mm1, mm0
+    psrlq       mm1, 10h                ; mm1 = [xx xx t2 t1 t0 lt l0 l1]
+    movq        mm2, mm0
+    psrlq       mm2, 8h                 ; mm2 = [xx t2 t1 t0 lt l0 l1 l2]
+    movq        mm3, mm2
+    movq        mm4, mm1
+    pavgb       mm1, mm0
+
+    pxor        mm4, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm4, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm1, mm4                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm1                ; mm2 = [xx xx d  c  b  f  h  j]
+
+    movq        mm4, mm0
+    pavgb       mm3, mm4                ; mm3 = [xx xx xx xx a  e  g  i]
+    punpcklbw   mm3, mm2                ; mm3 = [b  a  f  e  h  g  j  i]
+
+    psrlq       mm2, 20h
+    psllq       mm2, 30h                ; mm2 = [d  c  0  0  0  0  0  0]
+    movq        mm4, mm3
+    psrlq       mm4, 10h                ; mm4 = [0  0  b  a  f  e  h  j]
+    pxor        mm2, mm4                ; mm2 = [d  c  b  a  xx xx xx xx]
+    psrlq       mm2, 20h                ; mm2 = [xx xx xx xx  d  c  b  a]
+
+    movd        [r0], mm2
+    lea         r0, [r0+r1]
+    movd        [r0+2*r1], mm3
+    sub         r0, r1
+    psrlq       mm3, 10h
+    movd        [r0+2*r1], mm3
+    psrlq       mm3, 10h
+    movd        [r0+r1], mm3
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+
+;*******************************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |c |d |e |f |
+;   |e |f |g |g |
+;   |g |g |g |g |
+
+;   a = (1 + l0 + l1)>>1
+;   c = (1 + l1 + l2)>>1
+;   e = (1 + l2 + l3)>>1
+;   g = l3
+
+;   b = (2 + l0 + (l1<<1) + l2)>>2
+;   d = (2 + l1 + (l2<<1) + l3)>>2
+;   f = (2 + l2 + (l3<<1) + l3)>>2
+
+;   [g g f e d c b a] + [g g g g] --> mov to memory
+;
+;   void WelsDecoderI4x4LumaPredHU_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredHU_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+
+    movd        mm0, [r2-4]            ; mm0[3] = l0
+    punpcklbw   mm0, [r2+r1-4]        ; mm0[7] = l1, mm0[6] = l0
+    lea         r2, [r2+2*r1]
+    movd        mm2, [r2-4]            ; mm2[3] = l2
+    movd        mm4, [r2+r1-4]        ; mm4[3] = l3
+    punpcklbw   mm2, mm4
+    punpckhwd   mm0, mm2                ; mm0 = [l3 l2 l1 l0 xx xx xx xx]
+
+    psrlq       mm4, 18h
+    psllq       mm4, 38h                ; mm4 = [l3 xx xx xx xx xx xx xx]
+    psrlq       mm0, 8h
+    pxor        mm0, mm4                ; mm0 = [l3 l3 l2 l1 l0 xx xx xx]
+
+    movq        mm1, mm0
+    psllq       mm1, 8h                 ; mm1 = [l3 l2 l1 l0 xx xx xx xx]
+    movq        mm3, mm1                ; mm3 = [l3 l2 l1 l0 xx xx xx xx]
+    pavgb       mm1, mm0                ; mm1 = [g  e  c  a  xx xx xx xx]
+
+    movq        mm2, mm0
+    psllq       mm2, 10h                ; mm2 = [l2 l1 l0 xx xx xx xx xx]
+    movq        mm5, mm2
+    pavgb       mm2, mm0
+
+    pxor        mm5, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm5, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm5                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm3                ; mm2 = [f  d  b  xx xx xx xx xx]
+
+    psrlq       mm2, 8h
+    pxor        mm2, mm4                ; mm2 = [g  f  d  b  xx xx xx xx]
+
+    punpckhbw   mm1, mm2                ; mm1 = [g  g  f  e  d  c  b  a]
+    punpckhbw   mm4, mm4                ; mm4 = [g  g  xx xx xx xx xx xx]
+    punpckhbw   mm4, mm4                ; mm4 = [g  g  g  g  xx xx xx xx]
+
+    psrlq       mm4, 20h
+    lea         r0, [r0+r1]
+    movd        [r0+2*r1], mm4
+
+    sub         r0, r1
+    movd        [r0], mm1
+    psrlq       mm1, 10h
+    movd        [r0+r1], mm1
+    psrlq       mm1, 10h
+    movd        [r0+2*r1], mm1
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+
+;*******************************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   l3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |g |h |
+;   |i |a |b |c |
+;   |j |e |f |g |
+
+;   a = (1 + lt + t0)>>1
+;   b = (1 + t0 + t1)>>1
+;   c = (1 + t1 + t2)>>1
+;   d = (1 + t2 + t3)>>1
+
+;   e = (2 + l0 + (lt<<1) + t0)>>2
+;   f = (2 + lt + (t0<<1) + t1)>>2
+;   g = (2 + t0 + (t1<<1) + t2)>>2
+
+;   h = (2 + t1 + (t2<<1) + t3)>>2
+;   i = (2 + lt + (l0<<1) + l1)>>2
+;   j = (2 + l0 + (l1<<1) + l2)>>2
+;
+;   void WelsDecoderI4x4LumaPredVR_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredVR_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+    sub         r2, r1
+    movq        mm0, [r2-1]            ; mm0 = [xx xx xx t3 t2 t1 t0 lt]
+    psllq       mm0, 18h                ; mm0 = [t3 t2 t1 t0 lt xx xx xx]
+
+    movd        mm1, [r2+2*r1-4]
+    punpcklbw   mm1, [r2+r1-4]        ; mm1[7] = l0, mm1[6] = l1
+    lea         r2, [r2+2*r1]
+    movq        mm2, [r2+r1-8]        ; mm2[7] = l2
+    punpckhwd   mm2, mm1                ; mm2 = [l0 l1 l2 xx xx xx xx xx]
+    psrlq       mm2, 28h
+    pxor        mm0, mm2                ; mm0 = [t3 t2 t1 t0 lt l0 l1 l2]
+
+    movq        mm1, mm0
+    psllq       mm1, 8h                 ; mm1 = [t2 t1 t0 lt l0 l1 l2 xx]
+    pavgb       mm1, mm0                ; mm1 = [d  c  b  a  xx xx xx xx]
+
+    movq        mm2, mm0
+    psllq       mm2, 10h                ; mm2 = [t1 t0 lt l0 l1 l2 xx xx]
+    movq        mm3, mm2
+    pavgb       mm2, mm0
+
+    pxor        mm3, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm3, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm3                ; decrease 1 from odd bytes
+
+    movq        mm3, mm0
+    psllq       mm3, 8h                 ; mm3 = [t2 t1 t0 lt l0 l1 l2 xx]
+    pavgb       mm3, mm2                ; mm3 = [h  g  f  e  i  j  xx xx]
+    movq        mm2, mm3
+
+    psrlq       mm1, 20h                ; mm1 = [xx xx xx xx d  c  b  a]
+    movd        [r0], mm1
+
+    psrlq       mm2, 20h                ; mm2 = [xx xx xx xx h  g  f  e]
+    movd        [r0+r1], mm2
+
+    movq        mm4, mm3
+    psllq       mm4, 20h
+    psrlq       mm4, 38h                ; mm4 = [xx xx xx xx xx xx xx i]
+
+    movq        mm5, mm3
+    psllq       mm5, 28h
+    psrlq       mm5, 38h                ; mm5 = [xx xx xx xx xx xx xx j]
+
+    psllq       mm1, 8h
+    pxor        mm4, mm1                ; mm4 = [xx xx xx xx c  b  a  i]
+    movd        [r0+2*r1], mm4
+
+    psllq       mm2, 8h
+    pxor        mm5, mm2                ; mm5 = [xx xx xx xx g  f  e  j]
+    lea         r0, [r0+2*r1]
+    movd        [r0+r1], mm5
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;*******************************************************************************
+;   lt|t0|t1|t2|t3|t4|t5|t6|t7
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   lt,t0,t1,t2,t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |b |c |d |e |
+;   |c |d |e |f |
+;   |d |e |f |g |
+
+;   a = (2 + t0 + t2 + (t1<<1))>>2
+;   b = (2 + t1 + t3 + (t2<<1))>>2
+;   c = (2 + t2 + t4 + (t3<<1))>>2
+;   d = (2 + t3 + t5 + (t4<<1))>>2
+
+;   e = (2 + t4 + t6 + (t5<<1))>>2
+;   f = (2 + t5 + t7 + (t6<<1))>>2
+;   g = (2 + t6 + t7 + (t7<<1))>>2
+
+;   [g f e d c b a] --> mov to memory
+;
+;   void WelsDecoderI4x4LumaPredDDL_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredDDL_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+    sub         r2, r1
+    movq        mm0, [r2]              ; mm0 = [t7 t6 t5 t4 t3 t2 t1 t0]
+    movq        mm1, mm0
+    movq        mm2, mm0
+
+    movq        mm3, mm0
+    psrlq       mm3, 38h
+    psllq       mm3, 38h                ; mm3 = [t7 xx xx xx xx xx xx xx]
+
+    psllq       mm1, 8h                 ; mm1 = [t6 t5 t4 t3 t2 t1 t0 xx]
+    psrlq       mm2, 8h
+    pxor        mm2, mm3                ; mm2 = [t7 t7 t6 t5 t4 t3 t2 t1]
+
+    movq        mm3, mm1
+    pavgb       mm1, mm2
+    pxor        mm3, mm2                ; find odd value in the lowest bit of each byte
+    pand        mm3, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm1, mm3                ; decrease 1 from odd bytes
+
+    pavgb       mm0, mm1                ; mm0 = [g f e d c b a xx]
+
+    psrlq       mm0, 8h
+    movd        [r0], mm0
+    psrlq       mm0, 8h
+    movd        [r0+r1], mm0
+    psrlq       mm0, 8h
+    movd        [r0+2*r1], mm0
+    psrlq       mm0, 8h
+    lea         r0, [r0+2*r1]
+    movd        [r0+r1], mm0
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+;*******************************************************************************
+;   lt|t0|t1|t2|t3|t4|t5|t6|t7
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   lt,t0,t1,t2,t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |g |h |
+;   |b |c |d |i |
+;   |f |g |h |j |
+
+;   a = (1 + t0 + t1)>>1
+;   b = (1 + t1 + t2)>>1
+;   c = (1 + t2 + t3)>>1
+;   d = (1 + t3 + t4)>>1
+;   i = (1 + t4 + t5)>>1
+
+;   e = (2 + t0 + (t1<<1) + t2)>>2
+;   f = (2 + t1 + (t2<<1) + t3)>>2
+;   g = (2 + t2 + (t3<<1) + t4)>>2
+;   h = (2 + t3 + (t4<<1) + t5)>>2
+;   j = (2 + t4 + (t5<<1) + t6)>>2
+
+;   [i d c b a] + [j h g f e] --> mov to memory
+;
+;   void WelsDecoderI4x4LumaPredVL_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI4x4LumaPredVL_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+
+    sub         r2, r1
+    movq        mm0, [r2]              ; mm0 = [t7 t6 t5 t4 t3 t2 t1 t0]
+    movq        mm1, mm0
+    movq        mm2, mm0
+
+    psrlq       mm1, 8h                 ; mm1 = [xx t7 t6 t5 t4 t3 t2 t1]
+    psrlq       mm2, 10h                ; mm2 = [xx xx t7 t6 t5 t4 t3 t2]
+
+    movq        mm3, mm1
+    pavgb       mm3, mm0                ; mm3 = [xx xx xx i  d  c  b  a]
+
+    movq        mm4, mm2
+    pavgb       mm2, mm0
+    pxor        mm4, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm4, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm4                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm1                ; mm2 = [xx xx xx j  h  g  f  e]
+
+    movd        [r0], mm3
+    psrlq       mm3, 8h
+    movd        [r0+2*r1], mm3
+
+    movd        [r0+r1], mm2
+    psrlq       mm2, 8h
+    lea         r0, [r0+2*r1]
+    movd        [r0+r1], mm2
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;*******************************************************************************
+;
+;   void WelsDecoderIChromaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredDc_sse2
+    push    r3
+    push    r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r4, r0
+
+    sub         r0, r1
+    movq        mm0, [r0]
+
+    movzx       r2, byte [r0+r1-0x01] ; l1
+    lea         r0, [r0+2*r1]
+    movzx       r3, byte [r0-0x01]     ; l2
+    add         r2, r3
+    movzx       r3, byte [r0+r1-0x01] ; l3
+    add         r2, r3
+    lea         r0, [r0+2*r1]
+    movzx       r3, byte [r0-0x01]     ; l4
+    add         r2, r3
+    movd        mm1, r2d                 ; mm1 = l1+l2+l3+l4
+
+    movzx       r2, byte [r0+r1-0x01] ; l5
+    lea         r0, [r0+2*r1]
+    movzx       r3, byte [r0-0x01]     ; l6
+    add         r2, r3
+    movzx       r3, byte [r0+r1-0x01] ; l7
+    add         r2, r3
+    lea         r0, [r0+2*r1]
+    movzx       r3, byte [r0-0x01]     ; l8
+    add         r2, r3
+    movd        mm2, r2d                 ; mm2 = l5+l6+l7+l8
+
+    movq        mm3, mm0
+    psrlq       mm0, 0x20
+    psllq       mm3, 0x20
+    psrlq       mm3, 0x20
+    pxor        mm4, mm4
+    psadbw      mm0, mm4
+    psadbw      mm3, mm4                 ; sum1 = mm3+mm1, sum2 = mm0, sum3 = mm2
+
+    paddq       mm3, mm1
+    movq        mm1, mm2
+    paddq       mm1, mm0;                ; sum1 = mm3, sum2 = mm0, sum3 = mm2, sum4 = mm1
+
+    movq        mm4, [pic(mmx_0x02)]
+
+    paddq       mm0, mm4
+    psrlq       mm0, 0x02
+
+    paddq       mm2, mm4
+    psrlq       mm2, 0x02
+
+    paddq       mm3, mm4
+    paddq       mm3, mm4
+    psrlq       mm3, 0x03
+
+    paddq       mm1, mm4
+    paddq       mm1, mm4
+    psrlq       mm1, 0x03
+
+    pmuludq     mm0, [pic(mmx_01bytes)]
+    pmuludq     mm3, [pic(mmx_01bytes)]
+    psllq       mm0, 0x20
+    pxor        mm0, mm3                 ; mm0 = m_up
+
+    pmuludq     mm2, [pic(mmx_01bytes)]
+    pmuludq     mm1, [pic(mmx_01bytes)]
+    psllq       mm1, 0x20
+    pxor        mm1, mm2                 ; mm2 = m_down
+
+    movq        [r4],       mm0
+    movq        [r4+r1],   mm0
+    movq        [r4+2*r1], mm0
+    lea         r4, [r4+2*r1]
+    movq        [r4+r1],   mm0
+
+    movq        [r4+2*r1], mm1
+    lea         r4, [r4+2*r1]
+    movq        [r4+r1],   mm1
+    movq        [r4+2*r1], mm1
+    lea         r4, [r4+2*r1]
+    movq        [r4+r1],   mm1
+
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    WELSEMMS
+    ret
+
+
+
+;*******************************************************************************
+;
+;   void WelsDecoderI16x16LumaPredDc_sse2(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI16x16LumaPredDc_sse2
+    push    r3
+    push    r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r4, r0
+    sub         r0, r1
+    movdqa      xmm0, [r0]             ; read one row
+    pxor        xmm1, xmm1
+    psadbw      xmm0, xmm1
+    movdqa      xmm1, xmm0
+    psrldq      xmm1, 0x08
+    pslldq      xmm0, 0x08
+    psrldq      xmm0, 0x08
+    paddw       xmm0, xmm1
+
+    movzx       r2, byte [r0+r1-0x01]
+    movzx       r3, byte [r0+2*r1-0x01]
+    add     r2, r3
+    lea         r0, [r0+r1]
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    add         r2, 0x10
+    movd        xmm1, r2d
+    paddw       xmm0, xmm1
+    psrld       xmm0, 0x05
+    pmuludq     xmm0, [pic(mmx_01bytes)]
+    pshufd      xmm0, xmm0, 0
+
+    movdqa      [r4],       xmm0
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+    movdqa      [r4+2*r1], xmm0
+    lea         r4,         [r4+2*r1]
+
+    movdqa      [r4+r1],   xmm0
+
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+
+    ret
+
+;*******************************************************************************
+; for intra prediction as follows, 11/19/2010
+;*******************************************************************************
+
+;*******************************************************************************
+;   void WelsDecoderI16x16LumaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI16x16LumaPredDcTop_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+    sub r2, r1
+    movdqa xmm0, [r2]       ; pPred-kiStride, top line
+    pxor xmm7, xmm7
+    psadbw xmm0, xmm7
+    movdqa xmm1, xmm0
+    psrldq xmm1, 8
+    paddw  xmm0, xmm1
+    xor r2, r2
+    movd r2d, xmm0
+    ;movdqa xmm1, xmm0
+    ;punpcklbw xmm0, xmm7
+    ;punpckhbw xmm1, xmm7
+
+    ;paddw xmm0, xmm1           ; (ub.max(ff) << 4) will not excceed of uw, so can perform it in unit of unsigned word scope
+    ;pshufd xmm1, xmm0, 04eh        ; 01001110, w3w2w1w0,w7w6w5w4
+    ;paddw xmm0, xmm1           ; w3+7 w2+6 w1+5 w0+4 w3+7 w2+6 w1+5 w0+4
+    ;pshufd xmm1, xmm0, 0b1h        ; 10110001, w1+5 w0+4 w3+7 w2+6 w1+5 w0+4 w3+7 w2+6
+    ;paddw xmm0, xmm1           ; w_o w_e w_o w_e w_o w_e w_o w_e (w_o=1+3+5+7, w_e=0+2+4+6)
+    ;pshuflw xmm1, xmm0, 0b1h   ; 10110001
+    ;paddw xmm0, xmm1           ; sum in word unit (x8)
+    ;xor r3, r3
+    ;movd r3d, xmm0
+    ;and edx, 0ffffh
+
+    add r2, 8
+    sar r2, 4
+    SSE2_Copy16Times xmm1, r2d
+    ;mov dh, dl
+    ;mov r2, edx
+    ;shl r2, 010h
+    ;or edx, r2
+    ;movd xmm1, edx
+    ;pshufd xmm0, xmm1, 00h
+    ;movdqa xmm1, xmm0
+    movdqa xmm0, xmm1
+    lea r2, [2*r1+r1]       ; 3*kiStride
+
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+
+    POP_XMM
+    ret
+
+;*******************************************************************************
+;   void WelsDecoderI16x16LumaPredDcNA_sse2(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderI16x16LumaPredDcNA_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    lea r2, [2*r1+r1]       ; 3*kiStride
+
+    movdqa xmm0, [pic(sse2_dc_0x80)]
+    movdqa xmm1, xmm0
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+    lea r0, [r0+4*r1]
+    movdqa [r0], xmm0
+    movdqa [r0+r1], xmm1
+    movdqa [r0+2*r1], xmm0
+    movdqa [r0+r2], xmm1
+
+    DEINIT_X86_32_PIC
+    ret
+
+;*******************************************************************************
+;   void WelsDecoderIChromaPredDcLeft_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredDcLeft_mmx
+    push r3
+    push r4
+    %assign push_num 2
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    mov r4, r0
+    ; for left
+    dec r0
+    xor r2, r2
+    xor r3, r3
+    movzx r2, byte [r0]
+    movzx r3, byte [r0+r1]
+    add r2, r3
+    lea r0, [r0+2*r1]
+    movzx r3, byte [r0]
+    add r2, r3
+    movzx r3, byte [r0+r1]
+    add r2, r3
+    add r2, 02h
+    sar r2, 02h
+    ;SSE2_Copy16Times mm0, r2d
+    mov r3, r2
+    sal r3, 8
+    or r2, r3
+    movd mm1, r2d
+    pshufw mm0, mm1, 00h
+    ;mov bh, bl
+    ;movd mm1, ebx
+    ;pshufw mm0, mm1, 00h   ; up64
+    movq mm1, mm0
+    xor r2, r2
+    lea r0, [r0+2*r1]
+    movzx r2, byte [r0]
+    movzx r3, byte [r0+r1]
+    add r2, r3
+    lea r0, [r0+2*r1]
+    movzx r3, byte [r0]
+    add r2, r3
+    movzx r3, byte [r0+r1]
+    add r2, r3
+    add r2, 02h
+    sar r2, 02h
+    mov r3, r2
+    sal r3, 8
+    or r2, r3
+    movd mm3, r2d
+    pshufw mm2, mm3, 00h
+    ;mov bh, bl
+    ;movd mm3, ebx
+    ;pshufw mm2, mm3, 00h   ; down64
+    ;SSE2_Copy16Times mm2, r2d
+    movq mm3, mm2
+    lea r2, [2*r1+r1]
+    movq [r4], mm0
+    movq [r4+r1], mm1
+    movq [r4+2*r1], mm0
+    movq [r4+r2], mm1
+    lea r4, [r4+4*r1]
+    movq [r4], mm2
+    movq [r4+r1], mm3
+    movq [r4+2*r1], mm2
+    movq [r4+r2], mm3
+    pop r4
+    pop r3
+    emms
+    ret
+
+;*******************************************************************************
+;   void WelsDecoderIChromaPredDcTop_sse2(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredDcTop_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    mov r2, r0
+    sub r2, r1
+    movq xmm0, [r2]     ; top: 8x1 pixels
+    pxor xmm7, xmm7
+    punpcklbw xmm0, xmm7        ; ext 8x2 words
+    pshufd xmm1, xmm0, 0B1h     ; 10110001 B, w5 w4 w7 w6 w1 w0 w3 w2
+    paddw xmm0, xmm1            ; w5+7 w4+6 w5+7 w4+6 w1+3 w0+2 w1+3 w0+2
+    movdqa xmm1, xmm0
+    pshuflw xmm2, xmm0, 0B1h    ; 10110001 B, .. w0+2 w1+3 w0+2 w1+3
+    pshufhw xmm3, xmm1, 0B1h    ; 10110001 B, w4+6 w5+7 w4+6 w5+7 ..
+    paddw xmm0, xmm2            ; .. w0+..+3 w0+..+3 w0+..+3 w0+..+3
+    paddw xmm1, xmm3            ; w4+..+7 w4+..+7 w4+..+7 w4+..+7 ..
+    punpckhqdq xmm1, xmm7
+    punpcklqdq xmm0, xmm1       ; sum1 sum1 sum1 sum1 sum0 sum0 sum0 sum0
+%ifdef X86_32_PICASM
+    pcmpeqw  xmm6, xmm6
+    psrlw    xmm6, 15
+    psllw    xmm6, 1
+%else
+    movdqa xmm6, [sse2_wd_0x02]
+%endif
+    paddw xmm0, xmm6
+    psraw xmm0, 02h
+    packuswb xmm0, xmm7
+    lea r2, [2*r1+r1]
+    movq [r0], xmm0
+    movq [r0+r1], xmm0
+    movq [r0+2*r1], xmm0
+    movq [r0+r2], xmm0
+    lea r0, [r0+4*r1]
+    movq [r0], xmm0
+    movq [r0+r1], xmm0
+    movq [r0+2*r1], xmm0
+    movq [r0+r2], xmm0
+    POP_XMM
+    ret
+
+;*******************************************************************************
+;   void WelsDecoderIChromaPredDcNA_mmx(uint8_t *pPred, const int32_t kiStride)
+;*******************************************************************************
+WELS_EXTERN WelsDecoderIChromaPredDcNA_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    lea r2, [2*r1+r1]
+    movq mm0, [pic(sse2_dc_0x80)]
+    movq mm1, mm0
+    movq [r0], mm0
+    movq [r0+r1], mm1
+    movq [r0+2*r1], mm0
+    movq [r0+r2], mm1
+    lea r0, [r0+4*r1]
+    movq [r0], mm0
+    movq [r0+r1], mm1
+    movq [r0+2*r1], mm0
+    movq [r0+r2], mm1
+    DEINIT_X86_32_PIC
+    emms
+    ret
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/meson.build b/third-party/openh264/third_party/openh264/src/codec/decoder/meson.build
new file mode 100644
index 0000000000..da27b9522a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/meson.build
@@ -0,0 +1,58 @@
+cpp_sources = [
+  'core/src/au_parser.cpp',
+  'core/src/bit_stream.cpp',
+  'core/src/cabac_decoder.cpp',
+  'core/src/deblocking.cpp',
+  'core/src/decode_mb_aux.cpp',
+  'core/src/decode_slice.cpp',
+  'core/src/decoder.cpp',
+  'core/src/decoder_core.cpp',
+  'core/src/decoder_data_tables.cpp',
+  'core/src/error_concealment.cpp',
+  'core/src/fmo.cpp',
+  'core/src/get_intra_predictor.cpp',
+  'core/src/manage_dec_ref.cpp',
+  'core/src/memmgr_nal_unit.cpp',
+  'core/src/mv_pred.cpp',
+  'core/src/parse_mb_syn_cabac.cpp',
+  'core/src/parse_mb_syn_cavlc.cpp',
+  'core/src/pic_queue.cpp',
+  'core/src/rec_mb.cpp',
+  'plus/src/welsDecoderExt.cpp',
+  'core/src/wels_decoder_thread.cpp',
+]
+
+objs_asm = []
+if cpu_family in ['x86', 'x86_64']
+  asm_sources = [
+    'core/x86/dct.asm',
+    'core/x86/intra_pred.asm',
+  ]
+  objs_asm = asm_gen.process(asm_sources)
+elif cpu_family == 'arm'
+  asm_sources = [
+    'core/arm/block_add_neon.S',
+    'core/arm/intra_pred_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+elif cpu_family == 'aarch64'
+  asm_sources = [
+    'core/arm64/block_add_aarch64_neon.S',
+    'core/arm64/intra_pred_aarch64_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+else
+  error('Unsupported cpu family @0@'.format(cpu_family))
+endif
+
+libdecoder = static_library('decoder', cpp_sources, objs_asm,
+  include_directories: [inc, decoder_inc, casm_inc],
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/plus/inc/welsDecoderExt.h b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/inc/welsDecoderExt.h
new file mode 100644
index 0000000000..cfacbc83f5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/inc/welsDecoderExt.h
@@ -0,0 +1,168 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  WelsDecoderExt.h
+ *
+ *  Abstract
+ *      Cisco OpenH264 decoder extension utilization interface
+ *
+ *  History
+ *      3/12/2009 Created
+ *
+ *
+ *************************************************************************/
+#if !defined(WELS_PLUS_WELSDECODEREXT_H)
+#define WELS_PLUS_WELSDECODEREXT_H
+
+#include "codec_api.h"
+#include "codec_app_def.h"
+#include "decoder_context.h"
+#include "welsCodecTrace.h"
+#include "cpu.h"
+
+class ISVCDecoder;
+
+namespace WelsDec {
+
+//#define OUTPUT_BIT_STREAM  ////for test to output bitstream
+
+class CWelsDecoder : public ISVCDecoder {
+ public:
+  CWelsDecoder (void);
+  virtual ~CWelsDecoder();
+
+  virtual long EXTAPI Initialize (const SDecodingParam* pParam);
+  virtual long EXTAPI Uninitialize();
+
+  /***************************************************************************
+  *   Description:
+  *       Decompress one frame, and output I420 or RGB24(in the future) decoded stream and its length.
+  *   Input parameters:
+  *       Parameter       TYPE                   Description
+  *       pSrc            unsigned char*         the h264 stream to decode
+  *       srcLength       int                    the length of h264 steam
+  *       pDst            unsigned char*         buffer pointer of decoded data
+  *       pDstInfo        SBufferInfo&           information provided to API including width, height, SW/HW option, etc
+  *
+  *   return: if decode frame success return 0, otherwise corresponding error returned.
+  ***************************************************************************/
+  virtual DECODING_STATE EXTAPI DecodeFrame (const unsigned char* kpSrc,
+      const int kiSrcLen,
+      unsigned char** ppDst,
+      int* pStride,
+      int& iWidth,
+      int& iHeight);
+
+  virtual DECODING_STATE EXTAPI DecodeFrameNoDelay (const unsigned char* kpSrc,
+      const int kiSrcLen,
+      unsigned char** ppDst,
+      SBufferInfo* pDstInfo);
+
+  virtual DECODING_STATE EXTAPI DecodeFrame2 (const unsigned char* kpSrc,
+      const int kiSrcLen,
+      unsigned char** ppDst,
+      SBufferInfo* pDstInfo);
+
+  virtual DECODING_STATE EXTAPI FlushFrame (unsigned char** ppDst,
+      SBufferInfo* pDstInfo);
+
+  virtual DECODING_STATE EXTAPI DecodeParser (const unsigned char* kpSrc,
+      const int kiSrcLen,
+      SParserBsInfo* pDstInfo);
+  virtual DECODING_STATE EXTAPI DecodeFrameEx (const unsigned char* kpSrc,
+      const int kiSrcLen,
+      unsigned char* pDst,
+      int iDstStride,
+      int& iDstLen,
+      int& iWidth,
+      int& iHeight,
+      int& color_format);
+
+  virtual long EXTAPI SetOption (DECODER_OPTION eOptID, void* pOption);
+  virtual long EXTAPI GetOption (DECODER_OPTION eOptID, void* pOption);
+
+ public:
+  DECODING_STATE DecodeFrame2WithCtx (PWelsDecoderContext pCtx, const unsigned char* kpSrc, const int kiSrcLen,
+                                      unsigned char** ppDst, SBufferInfo* pDstInfo);
+  DECODING_STATE ParseAccessUnit (SWelsDecoderThreadCTX& sThreadCtx);
+
+ private:
+  welsCodecTrace*         m_pWelsTrace;
+  uint32_t                m_uiDecodeTimeStamp;
+  bool                    m_bIsBaseline;
+  int32_t                 m_iCpuCount;
+  int32_t                 m_iThreadCount;
+  int32_t                 m_iCtxCount;
+  PPicBuff                m_pPicBuff;
+  bool                    m_bParamSetsLostFlag;
+  bool                    m_bFreezeOutput;
+  int32_t                 m_DecCtxActiveCount;
+  PWelsDecoderThreadCTX   m_pDecThrCtx;
+  PWelsDecoderThreadCTX   m_pLastDecThrCtx;
+  int32_t                 m_iLastBufferedIdx;
+  WELS_MUTEX              m_csDecoder;
+  SWelsDecEvent           m_sBufferingEvent;
+  SWelsDecEvent           m_sReleaseBufferEvent;
+  SWelsDecSemphore        m_sIsBusy;
+  SPictInfo               m_sPictInfoList[16];
+  SPictReoderingStatus    m_sReoderingStatus;
+  PWelsDecoderThreadCTX   m_pDecThrCtxActive[WELS_DEC_MAX_NUM_CPU];
+  SVlcTable               m_sVlcTable;
+  SWelsLastDecPicInfo     m_sLastDecPicInfo;
+  SDecoderStatistics      m_sDecoderStatistics;// For real time debugging
+
+ private:
+  int32_t InitDecoder (const SDecodingParam* pParam);
+  void UninitDecoder (void);
+  int32_t InitDecoderCtx (PWelsDecoderContext& pCtx, const SDecodingParam* pParam);
+  void UninitDecoderCtx (PWelsDecoderContext& pCtx);
+  int32_t ResetDecoder (PWelsDecoderContext& pCtx);
+  int32_t ThreadResetDecoder (PWelsDecoderContext& pCtx);
+
+  void OutputStatisticsLog (SDecoderStatistics& sDecoderStatistics);
+  DECODING_STATE ReorderPicturesInDisplay (PWelsDecoderContext pCtx, unsigned char** ppDst, SBufferInfo* pDstInfo);
+  int ThreadDecodeFrameInternal (const unsigned char* kpSrc, const int kiSrcLen, unsigned char** ppDst,
+                                 SBufferInfo* pDstInfo);
+  void BufferingReadyPicture (PWelsDecoderContext pCtx, unsigned char** ppDst, SBufferInfo* pDstInfo);
+  void ReleaseBufferedReadyPicture (PWelsDecoderContext pCtx, unsigned char** ppDst, SBufferInfo* pDstInfo);
+
+  void OpenDecoderThreads();
+  void CloseDecoderThreads();
+#ifdef OUTPUT_BIT_STREAM
+  WelsFileHandle* m_pFBS;
+  WelsFileHandle* m_pFBSSize;
+#endif//OUTPUT_BIT_STREAM
+
+};
+
+} // namespace WelsDec
+
+#endif // !defined(WELS_PLUS_WELSDECODEREXT_H)
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/welsDecoderExt.cpp b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/welsDecoderExt.cpp
new file mode 100644
index 0000000000..da798e8aaa
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/welsDecoderExt.cpp
@@ -0,0 +1,1504 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  welsDecoderExt.cpp
+ *
+ *  Abstract
+ *      Cisco OpenH264 decoder extension utilization
+ *
+ *  History
+ *      3/12/2009 Created
+ *
+ *
+ ************************************************************************/
+//#include <assert.h>
+#include "welsDecoderExt.h"
+#include "welsCodecTrace.h"
+#include "codec_def.h"
+#include "typedefs.h"
+#include "memory_align.h"
+#include "utils.h"
+#include "version.h"
+
+//#include "macros.h"
+#include "decoder.h"
+#include "decoder_core.h"
+#include "manage_dec_ref.h"
+#include "error_concealment.h"
+
+#include "measure_time.h"
+extern "C" {
+#include "decoder_core.h"
+#include "manage_dec_ref.h"
+}
+#include "error_code.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like util for cross platforms
+#include <time.h>
+#if defined(_WIN32) /*&& defined(_DEBUG)*/
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#include <malloc.h>
+#else
+#include <sys/time.h>
+#endif
+
+namespace WelsDec {
+
+//////////////////////////////////////////////////////////////////////
+// Construction/Destruction
+//////////////////////////////////////////////////////////////////////
+
+/***************************************************************************
+*   Description:
+*       class CWelsDecoder constructor function, do initialization  and
+*       alloc memory required
+*
+*   Input parameters: none
+*
+*   return: none
+***************************************************************************/
+DECLARE_PROCTHREAD (pThrProcInit, p) {
+  SWelsDecThreadInfo* sThreadInfo = (SWelsDecThreadInfo*)p;
+#if defined(WIN32)
+  _alloca (WELS_DEC_MAX_THREAD_STACK_SIZE * (sThreadInfo->uiThrNum + 1));
+#endif
+  return sThreadInfo->pThrProcMain (p);
+}
+
+static DECODING_STATE  ConstructAccessUnit (CWelsDecoder* pWelsDecoder, PWelsDecoderThreadCTX pThrCtx) {
+  int iRet = dsErrorFree;
+  //WelsMutexLock (&pWelsDecoder->m_csDecoder);
+  if (pThrCtx->pCtx->pLastThreadCtx != NULL) {
+    PWelsDecoderThreadCTX pLastThreadCtx = (PWelsDecoderThreadCTX) (pThrCtx->pCtx->pLastThreadCtx);
+    WAIT_EVENT (&pLastThreadCtx->sSliceDecodeStart, WELS_DEC_THREAD_WAIT_INFINITE);
+    RESET_EVENT (&pLastThreadCtx->sSliceDecodeStart);
+  }
+  pThrCtx->pDec = NULL;
+  if (GetThreadCount (pThrCtx->pCtx) > 1) {
+    RESET_EVENT (&pThrCtx->sSliceDecodeFinish);
+  }
+  iRet |= pWelsDecoder->DecodeFrame2WithCtx (pThrCtx->pCtx, NULL, 0, pThrCtx->ppDst, &pThrCtx->sDstInfo);
+
+  //WelsMutexUnlock (&pWelsDecoder->m_csDecoder);
+  return (DECODING_STATE)iRet;
+}
+
+DECLARE_PROCTHREAD (pThrProcFrame, p) {
+  SWelsDecoderThreadCTX* pThrCtx = (SWelsDecoderThreadCTX*)p;
+  while (1) {
+    RELEASE_SEMAPHORE (pThrCtx->sThreadInfo.sIsBusy);
+    RELEASE_SEMAPHORE (&pThrCtx->sThreadInfo.sIsIdle);
+    WAIT_SEMAPHORE (&pThrCtx->sThreadInfo.sIsActivated, WELS_DEC_THREAD_WAIT_INFINITE);
+    if (pThrCtx->sThreadInfo.uiCommand == WELS_DEC_THREAD_COMMAND_RUN) {
+      CWelsDecoder* pWelsDecoder = (CWelsDecoder*)pThrCtx->threadCtxOwner;
+      ConstructAccessUnit (pWelsDecoder, pThrCtx);
+    } else if (pThrCtx->sThreadInfo.uiCommand == WELS_DEC_THREAD_COMMAND_ABORT) {
+      break;
+    }
+  }
+  return 0;
+}
+
+CWelsDecoder::CWelsDecoder (void)
+  : m_pWelsTrace (NULL),
+    m_uiDecodeTimeStamp (0),
+    m_bIsBaseline (false),
+    m_iCpuCount (1),
+    m_iThreadCount (0),
+    m_iCtxCount (1),
+    m_pPicBuff (NULL),
+    m_bParamSetsLostFlag (false),
+    m_bFreezeOutput (false),
+    m_DecCtxActiveCount (0),
+    m_pDecThrCtx (NULL),
+    m_pLastDecThrCtx (NULL),
+    m_iLastBufferedIdx (0) {
+#ifdef OUTPUT_BIT_STREAM
+  char chFileName[1024] = { 0 };  //for .264
+  int iBufUsed = 0;
+  int iBufLeft = 1023;
+  int iCurUsed;
+
+  char chFileNameSize[1024] = { 0 }; //for .len
+  int iBufUsedSize = 0;
+  int iBufLeftSize = 1023;
+  int iCurUsedSize;
+#endif//OUTPUT_BIT_STREAM
+
+
+  m_pWelsTrace = new welsCodecTrace();
+  if (m_pWelsTrace != NULL) {
+    m_pWelsTrace->SetCodecInstance (this);
+    m_pWelsTrace->SetTraceLevel (WELS_LOG_ERROR);
+
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::CWelsDecoder() entry");
+  }
+
+  ResetReorderingPictureBuffers (&m_sReoderingStatus, m_sPictInfoList, true);
+
+  m_iCpuCount = GetCPUCount();
+  if (m_iCpuCount > WELS_DEC_MAX_NUM_CPU) {
+    m_iCpuCount = WELS_DEC_MAX_NUM_CPU;
+  }
+
+  m_pDecThrCtx = new SWelsDecoderThreadCTX[m_iCtxCount];
+  memset (m_pDecThrCtx, 0, sizeof (SWelsDecoderThreadCTX)*m_iCtxCount);
+  for (int32_t i = 0; i < WELS_DEC_MAX_NUM_CPU; ++i) {
+    m_pDecThrCtxActive[i] = NULL;
+  }
+#ifdef OUTPUT_BIT_STREAM
+  SWelsTime sCurTime;
+
+  WelsGetTimeOfDay (&sCurTime);
+
+  iCurUsed = WelsSnprintf (chFileName, iBufLeft, "bs_0x%p_", (void*)this);
+  iCurUsedSize = WelsSnprintf (chFileNameSize, iBufLeftSize, "size_0x%p_", (void*)this);
+
+  iBufUsed += iCurUsed;
+  iBufLeft -= iCurUsed;
+  if (iBufLeft > 0) {
+    iCurUsed = WelsStrftime (&chFileName[iBufUsed], iBufLeft, "%y%m%d%H%M%S", &sCurTime);
+    iBufUsed += iCurUsed;
+    iBufLeft -= iCurUsed;
+  }
+
+  iBufUsedSize += iCurUsedSize;
+  iBufLeftSize -= iCurUsedSize;
+  if (iBufLeftSize > 0) {
+    iCurUsedSize = WelsStrftime (&chFileNameSize[iBufUsedSize], iBufLeftSize, "%y%m%d%H%M%S", &sCurTime);
+    iBufUsedSize += iCurUsedSize;
+    iBufLeftSize -= iCurUsedSize;
+  }
+
+  if (iBufLeft > 0) {
+    iCurUsed = WelsSnprintf (&chFileName[iBufUsed], iBufLeft, ".%03.3u.264", WelsGetMillisecond (&sCurTime));
+    iBufUsed += iCurUsed;
+    iBufLeft -= iCurUsed;
+  }
+
+  if (iBufLeftSize > 0) {
+    iCurUsedSize = WelsSnprintf (&chFileNameSize[iBufUsedSize], iBufLeftSize, ".%03.3u.len",
+                                 WelsGetMillisecond (&sCurTime));
+    iBufUsedSize += iCurUsedSize;
+    iBufLeftSize -= iCurUsedSize;
+  }
+
+
+  m_pFBS = WelsFopen (chFileName, "wb");
+  m_pFBSSize = WelsFopen (chFileNameSize, "wb");
+#endif//OUTPUT_BIT_STREAM
+}
+
+/***************************************************************************
+*   Description:
+*       class CWelsDecoder destructor function, destroy allocced memory
+*
+*   Input parameters: none
+*
+*   return: none
+***************************************************************************/
+CWelsDecoder::~CWelsDecoder() {
+  if (m_pWelsTrace != NULL) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::~CWelsDecoder()");
+  }
+  CloseDecoderThreads();
+  UninitDecoder();
+
+#ifdef OUTPUT_BIT_STREAM
+  if (m_pFBS) {
+    WelsFclose (m_pFBS);
+    m_pFBS = NULL;
+  }
+  if (m_pFBSSize) {
+    WelsFclose (m_pFBSSize);
+    m_pFBSSize = NULL;
+  }
+#endif//OUTPUT_BIT_STREAM
+
+  if (m_pWelsTrace != NULL) {
+    delete m_pWelsTrace;
+    m_pWelsTrace = NULL;
+  }
+  if (m_pDecThrCtx != NULL) {
+    delete[] m_pDecThrCtx;
+    m_pDecThrCtx = NULL;
+  }
+}
+
+long CWelsDecoder::Initialize (const SDecodingParam* pParam) {
+  int iRet = ERR_NONE;
+  if (m_pWelsTrace == NULL) {
+    return cmMallocMemeError;
+  }
+
+  if (pParam == NULL) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsDecoder::Initialize(), invalid input argument.");
+    return cmInitParaError;
+  }
+
+  // H.264 decoder initialization,including memory allocation,then open it ready to decode
+  iRet = InitDecoder (pParam);
+  if (iRet)
+    return iRet;
+
+  return cmResultSuccess;
+}
+
+long CWelsDecoder::Uninitialize() {
+  UninitDecoder();
+
+  return ERR_NONE;
+}
+
+void CWelsDecoder::UninitDecoder (void) {
+  for (int32_t i = 0; i < m_iCtxCount; ++i) {
+    if (m_pDecThrCtx[i].pCtx != NULL) {
+      if (i > 0) {
+        WelsResetRefPicWithoutUnRef (m_pDecThrCtx[i].pCtx);
+      }
+      UninitDecoderCtx (m_pDecThrCtx[i].pCtx);
+    }
+  }
+}
+
+void CWelsDecoder::OpenDecoderThreads() {
+  if (m_iThreadCount >= 1) {
+    m_uiDecodeTimeStamp = 0;
+    CREATE_SEMAPHORE (&m_sIsBusy, m_iThreadCount, m_iThreadCount, NULL);
+    WelsMutexInit (&m_csDecoder);
+    CREATE_EVENT (&m_sBufferingEvent, 1, 0, NULL);
+    SET_EVENT (&m_sBufferingEvent);
+    CREATE_EVENT (&m_sReleaseBufferEvent, 1, 0, NULL);
+    SET_EVENT (&m_sReleaseBufferEvent);
+    for (int32_t i = 0; i < m_iThreadCount; ++i) {
+      m_pDecThrCtx[i].sThreadInfo.uiThrMaxNum = m_iThreadCount;
+      m_pDecThrCtx[i].sThreadInfo.uiThrNum = i;
+      m_pDecThrCtx[i].sThreadInfo.uiThrStackSize = WELS_DEC_MAX_THREAD_STACK_SIZE;
+      m_pDecThrCtx[i].sThreadInfo.pThrProcMain = pThrProcFrame;
+      m_pDecThrCtx[i].sThreadInfo.sIsBusy = &m_sIsBusy;
+      m_pDecThrCtx[i].sThreadInfo.uiCommand = WELS_DEC_THREAD_COMMAND_RUN;
+      m_pDecThrCtx[i].threadCtxOwner = this;
+      m_pDecThrCtx[i].kpSrc = NULL;
+      m_pDecThrCtx[i].kiSrcLen = 0;
+      m_pDecThrCtx[i].ppDst = NULL;
+      m_pDecThrCtx[i].pDec = NULL;
+      CREATE_EVENT (&m_pDecThrCtx[i].sImageReady, 1, 0, NULL);
+      CREATE_EVENT (&m_pDecThrCtx[i].sSliceDecodeStart, 1, 0, NULL);
+      CREATE_EVENT (&m_pDecThrCtx[i].sSliceDecodeFinish, 1, 0, NULL);
+      CREATE_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsIdle, 0, 1, NULL);
+      CREATE_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsActivated, 0, 1, NULL);
+      CREATE_THREAD (&m_pDecThrCtx[i].sThreadInfo.sThrHandle, pThrProcInit, (void*) (& (m_pDecThrCtx[i])));
+    }
+  }
+}
+void CWelsDecoder::CloseDecoderThreads() {
+  if (m_iThreadCount >= 1) {
+    for (int32_t i = 0; i < m_iThreadCount; i++) { //waiting the completion begun slices
+      WAIT_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsIdle, WELS_DEC_THREAD_WAIT_INFINITE);
+      m_pDecThrCtx[i].sThreadInfo.uiCommand = WELS_DEC_THREAD_COMMAND_ABORT;
+      RELEASE_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsActivated);
+      WAIT_THREAD (&m_pDecThrCtx[i].sThreadInfo.sThrHandle);
+      CLOSE_EVENT (&m_pDecThrCtx[i].sImageReady);
+      CLOSE_EVENT (&m_pDecThrCtx[i].sSliceDecodeStart);
+      CLOSE_EVENT (&m_pDecThrCtx[i].sSliceDecodeFinish);
+      CLOSE_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsIdle);
+      CLOSE_SEMAPHORE (&m_pDecThrCtx[i].sThreadInfo.sIsActivated);
+    }
+    WelsMutexDestroy (&m_csDecoder);
+    CLOSE_EVENT (&m_sBufferingEvent);
+    CLOSE_EVENT (&m_sReleaseBufferEvent);
+    CLOSE_SEMAPHORE (&m_sIsBusy);
+  }
+}
+
+void CWelsDecoder::UninitDecoderCtx (PWelsDecoderContext& pCtx) {
+  if (pCtx != NULL) {
+
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsDecoder::UninitDecoderCtx(), openh264 codec version = %s.",
+             VERSION_NUMBER);
+
+    WelsEndDecoder (pCtx);
+
+    if (pCtx->pMemAlign != NULL) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsDecoder::UninitDecoder(), verify memory usage (%d bytes) after free..",
+               pCtx->pMemAlign->WelsGetMemoryUsage());
+      delete pCtx->pMemAlign;
+      pCtx->pMemAlign = NULL;
+    }
+
+    if (NULL != pCtx) {
+      WelsFree (pCtx, "m_pDecContext");
+
+      pCtx = NULL;
+    }
+    if (m_iCtxCount <= 1) m_pDecThrCtx[0].pCtx = NULL;
+  }
+}
+
+// the return value of this function is not suitable, it need report failure info to upper layer.
+int32_t CWelsDecoder::InitDecoder (const SDecodingParam* pParam) {
+
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+           "CWelsDecoder::init_decoder(), openh264 codec version = %s, ParseOnly = %d",
+           VERSION_NUMBER, (int32_t)pParam->bParseOnly);
+  if (m_iThreadCount >= 1 && pParam->bParseOnly) {
+    m_iThreadCount = 0;
+  }
+  OpenDecoderThreads();
+  //reset decoder context
+  memset (&m_sDecoderStatistics, 0, sizeof (SDecoderStatistics));
+  memset (&m_sLastDecPicInfo, 0, sizeof (SWelsLastDecPicInfo));
+  memset (&m_sVlcTable, 0, sizeof (SVlcTable));
+  UninitDecoder();
+  WelsDecoderLastDecPicInfoDefaults (m_sLastDecPicInfo);
+  for (int32_t i = 0; i < m_iCtxCount; ++i) {
+    InitDecoderCtx (m_pDecThrCtx[i].pCtx, pParam);
+    if (m_iThreadCount >= 1) {
+      m_pDecThrCtx[i].pCtx->pThreadCtx = &m_pDecThrCtx[i];
+    }
+  }
+  m_bParamSetsLostFlag = false;
+  m_bFreezeOutput = false;
+  return cmResultSuccess;
+}
+
+// the return value of this function is not suitable, it need report failure info to upper layer.
+int32_t CWelsDecoder::InitDecoderCtx (PWelsDecoderContext& pCtx, const SDecodingParam* pParam) {
+
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+           "CWelsDecoder::init_decoder(), openh264 codec version = %s, ParseOnly = %d",
+           VERSION_NUMBER, (int32_t)pParam->bParseOnly);
+
+  //reset decoder context
+  UninitDecoderCtx (pCtx);
+  pCtx = (PWelsDecoderContext)WelsMallocz (sizeof (SWelsDecoderContext), "m_pDecContext");
+  if (NULL == pCtx)
+    return cmMallocMemeError;
+  int32_t iCacheLineSize = 16;   // on chip cache line size in byte
+  pCtx->pMemAlign = new CMemoryAlign (iCacheLineSize);
+  WELS_VERIFY_RETURN_PROC_IF (cmMallocMemeError, (NULL == pCtx->pMemAlign), UninitDecoderCtx (pCtx))
+  if (m_iCtxCount <= 1) m_pDecThrCtx[0].pCtx = pCtx;
+  //fill in default value into context
+  pCtx->pLastDecPicInfo = &m_sLastDecPicInfo;
+  pCtx->pDecoderStatistics = &m_sDecoderStatistics;
+  pCtx->pVlcTable = &m_sVlcTable;
+  pCtx->pPictInfoList = m_sPictInfoList;
+  pCtx->pPictReoderingStatus = &m_sReoderingStatus;
+  pCtx->pCsDecoder = &m_csDecoder;
+  WelsDecoderDefaults (pCtx, &m_pWelsTrace->m_sLogCtx);
+  WelsDecoderSpsPpsDefaults (pCtx->sSpsPpsCtx);
+  //check param and update decoder context
+  pCtx->pParam = (SDecodingParam*)pCtx->pMemAlign->WelsMallocz (sizeof (SDecodingParam),
+                 "SDecodingParam");
+  WELS_VERIFY_RETURN_PROC_IF (cmMallocMemeError, (NULL == pCtx->pParam), UninitDecoderCtx (pCtx));
+  int32_t iRet = DecoderConfigParam (pCtx, pParam);
+  WELS_VERIFY_RETURN_IFNEQ (iRet, cmResultSuccess);
+
+  //init decoder
+  WELS_VERIFY_RETURN_PROC_IF (cmMallocMemeError, WelsInitDecoder (pCtx, &m_pWelsTrace->m_sLogCtx),
+                              UninitDecoderCtx (pCtx))
+  pCtx->pPicBuff = NULL;
+  return cmResultSuccess;
+}
+
+int32_t CWelsDecoder::ResetDecoder (PWelsDecoderContext& pCtx) {
+  // TBC: need to be modified when context and trace point are null
+  if (m_iThreadCount >= 1) {
+    ThreadResetDecoder (pCtx);
+  } else {
+    if (pCtx != NULL && m_pWelsTrace != NULL) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "ResetDecoder(), context error code is %d",
+               pCtx->iErrorCode);
+      SDecodingParam sPrevParam;
+      memcpy (&sPrevParam, pCtx->pParam, sizeof (SDecodingParam));
+
+      WELS_VERIFY_RETURN_PROC_IF (cmInitParaError, InitDecoderCtx (pCtx, &sPrevParam),
+                                  UninitDecoderCtx (pCtx));
+    } else if (m_pWelsTrace != NULL) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "ResetDecoder() failed as decoder context null");
+    }
+    ResetReorderingPictureBuffers (&m_sReoderingStatus, m_sPictInfoList, false);
+    if (pCtx->pDstInfo) pCtx->pDstInfo->iBufferStatus = 0;
+  }
+  return ERR_INFO_UNINIT;
+}
+
+int32_t CWelsDecoder::ThreadResetDecoder (PWelsDecoderContext& pCtx) {
+  // TBC: need to be modified when context and trace point are null
+  SDecodingParam sPrevParam;
+  if (pCtx != NULL && m_pWelsTrace != NULL) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "ResetDecoder(), context error code is %d", pCtx->iErrorCode);
+    memcpy (&sPrevParam, pCtx->pParam, sizeof (SDecodingParam));
+    ResetReorderingPictureBuffers (&m_sReoderingStatus, m_sPictInfoList, true);
+    if (pCtx->pDstInfo) pCtx->pDstInfo->iBufferStatus = 0;
+    CloseDecoderThreads();
+    UninitDecoder();
+    InitDecoder (&sPrevParam);
+  } else if (m_pWelsTrace != NULL) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "ResetDecoder() failed as decoder context null");
+  }
+  return ERR_INFO_UNINIT;
+}
+
+/*
+ * Set Option
+ */
+long CWelsDecoder::SetOption (DECODER_OPTION eOptID, void* pOption) {
+  int iVal = 0;
+  if (eOptID == DECODER_OPTION_NUM_OF_THREADS) {
+    if (pOption != NULL) {
+      int32_t threadCount = * ((int32_t*)pOption);
+      if (threadCount < 0) threadCount = 0;
+      if (threadCount > m_iCpuCount) {
+        threadCount = m_iCpuCount;
+      }
+      if (threadCount > 3) {
+        threadCount = 3;
+      }
+      if (threadCount != m_iThreadCount) {
+        m_iThreadCount = threadCount;
+        if (m_pDecThrCtx != NULL) {
+          delete [] m_pDecThrCtx;
+          m_iCtxCount = m_iThreadCount == 0 ? 1 : m_iThreadCount;
+          m_pDecThrCtx = new SWelsDecoderThreadCTX[m_iCtxCount];
+          memset (m_pDecThrCtx, 0, sizeof (SWelsDecoderThreadCTX)*m_iCtxCount);
+        }
+      }
+    }
+    return cmResultSuccess;
+  }
+  for (int32_t i = 0; i < m_iCtxCount; ++i) {
+    PWelsDecoderContext pDecContext = m_pDecThrCtx[i].pCtx;
+    if (pDecContext == NULL && eOptID != DECODER_OPTION_TRACE_LEVEL &&
+        eOptID != DECODER_OPTION_TRACE_CALLBACK && eOptID != DECODER_OPTION_TRACE_CALLBACK_CONTEXT)
+      return dsInitialOptExpected;
+    if (eOptID == DECODER_OPTION_END_OF_STREAM) { // Indicate bit-stream of the final frame to be decoded
+      if (pOption == NULL)
+        return cmInitParaError;
+
+      iVal = * ((int*)pOption); // boolean value for whether enabled End Of Stream flag
+
+      if (pDecContext == NULL) return dsInitialOptExpected;
+
+      pDecContext->bEndOfStreamFlag = iVal ? true : false;
+
+      return cmResultSuccess;
+    } else if (eOptID == DECODER_OPTION_ERROR_CON_IDC) { // Indicate error concealment status
+      if (pOption == NULL)
+        return cmInitParaError;
+
+      if (pDecContext == NULL) return dsInitialOptExpected;
+
+      iVal = * ((int*)pOption); // int value for error concealment idc
+      iVal = WELS_CLIP3 (iVal, (int32_t)ERROR_CON_DISABLE, (int32_t)ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE);
+      if ((pDecContext->pParam->bParseOnly) && (iVal != (int32_t)ERROR_CON_DISABLE)) {
+        WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+                 "CWelsDecoder::SetOption for ERROR_CON_IDC = %d not allowd for parse only!.", iVal);
+        return cmInitParaError;
+      }
+
+      pDecContext->pParam->eEcActiveIdc = (ERROR_CON_IDC)iVal;
+      InitErrorCon (pDecContext);
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsDecoder::SetOption for ERROR_CON_IDC = %d.", iVal);
+
+      return cmResultSuccess;
+    } else if (eOptID == DECODER_OPTION_TRACE_LEVEL) {
+      if (m_pWelsTrace) {
+        uint32_t level = * ((uint32_t*)pOption);
+        m_pWelsTrace->SetTraceLevel (level);
+      }
+      return cmResultSuccess;
+    } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK) {
+      if (m_pWelsTrace) {
+        WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
+        m_pWelsTrace->SetTraceCallback (callback);
+        WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+                 "CWelsDecoder::SetOption():DECODER_OPTION_TRACE_CALLBACK callback = %p.",
+                 callback);
+      }
+      return cmResultSuccess;
+    } else if (eOptID == DECODER_OPTION_TRACE_CALLBACK_CONTEXT) {
+      if (m_pWelsTrace) {
+        void* ctx = * ((void**)pOption);
+        m_pWelsTrace->SetTraceCallbackContext (ctx);
+      }
+      return cmResultSuccess;
+    } else if (eOptID == DECODER_OPTION_GET_STATISTICS) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+               "CWelsDecoder::SetOption():DECODER_OPTION_GET_STATISTICS: this option is get-only!");
+      return cmInitParaError;
+    } else if (eOptID == DECODER_OPTION_STATISTICS_LOG_INTERVAL) {
+      if (pOption) {
+        if (pDecContext == NULL) return dsInitialOptExpected;
+        pDecContext->pDecoderStatistics->iStatisticsLogInterval = (* ((unsigned int*)pOption));
+        return cmResultSuccess;
+      }
+    } else if (eOptID == DECODER_OPTION_GET_SAR_INFO) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+               "CWelsDecoder::SetOption():DECODER_OPTION_GET_SAR_INFO: this option is get-only!");
+      return cmInitParaError;
+    }
+  }
+  return cmInitParaError;
+}
+
+/*
+ *  Get Option
+ */
+long CWelsDecoder::GetOption (DECODER_OPTION eOptID, void* pOption) {
+  int iVal = 0;
+  if (DECODER_OPTION_NUM_OF_THREADS == eOptID) {
+    * ((int*)pOption) = m_iThreadCount;
+    return cmResultSuccess;
+  }
+  PWelsDecoderContext pDecContext = m_pDecThrCtx[0].pCtx;
+  if (pDecContext == NULL)
+    return cmInitExpected;
+
+  if (pOption == NULL)
+    return cmInitParaError;
+
+  if (DECODER_OPTION_END_OF_STREAM == eOptID) {
+    iVal = pDecContext->bEndOfStreamFlag;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  }
+#ifdef LONG_TERM_REF
+  else if (DECODER_OPTION_IDR_PIC_ID == eOptID) {
+    iVal = pDecContext->uiCurIdrPicId;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_FRAME_NUM == eOptID) {
+    iVal = pDecContext->iFrameNum;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_LTR_MARKING_FLAG == eOptID) {
+    iVal = pDecContext->bCurAuContainLtrMarkSeFlag;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_LTR_MARKED_FRAME_NUM == eOptID) {
+    iVal = pDecContext->iFrameNumOfAuMarkedLtr;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  }
+#endif
+  else if (DECODER_OPTION_VCL_NAL == eOptID) { //feedback whether or not have VCL NAL in current AU
+    iVal = pDecContext->iFeedbackVclNalInAu;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_TEMPORAL_ID == eOptID) { //if have VCL NAL in current AU, then feedback the temporal ID
+    iVal = pDecContext->iFeedbackTidInAu;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_IS_REF_PIC == eOptID) {
+    iVal = pDecContext->iFeedbackNalRefIdc;
+    if (iVal > 0)
+      iVal = 1;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_ERROR_CON_IDC == eOptID) {
+    iVal = (int)pDecContext->pParam->eEcActiveIdc;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_GET_STATISTICS == eOptID) { // get decoder statistics info for real time debugging
+    SDecoderStatistics* pDecoderStatistics = (static_cast<SDecoderStatistics*> (pOption));
+
+    memcpy (pDecoderStatistics, pDecContext->pDecoderStatistics, sizeof (SDecoderStatistics));
+
+    if (pDecContext->pDecoderStatistics->uiDecodedFrameCount != 0) { //not original status
+      pDecoderStatistics->fAverageFrameSpeedInMs = (float) (pDecContext->dDecTime) /
+          (pDecContext->pDecoderStatistics->uiDecodedFrameCount);
+      pDecoderStatistics->fActualAverageFrameSpeedInMs = (float) (pDecContext->dDecTime) /
+          (pDecContext->pDecoderStatistics->uiDecodedFrameCount + pDecContext->pDecoderStatistics->uiFreezingIDRNum +
+           pDecContext->pDecoderStatistics->uiFreezingNonIDRNum);
+    }
+    return cmResultSuccess;
+  } else if (eOptID == DECODER_OPTION_STATISTICS_LOG_INTERVAL) {
+    if (pOption) {
+      iVal = pDecContext->pDecoderStatistics->iStatisticsLogInterval;
+      * ((unsigned int*)pOption) = iVal;
+      return cmResultSuccess;
+    }
+  } else if (DECODER_OPTION_GET_SAR_INFO == eOptID) { //get decoder SAR info in VUI
+    PVuiSarInfo pVuiSarInfo = (static_cast<PVuiSarInfo> (pOption));
+    memset (pVuiSarInfo, 0, sizeof (SVuiSarInfo));
+    if (!pDecContext->pSps) {
+      return cmInitExpected;
+    } else {
+      pVuiSarInfo->uiSarWidth = pDecContext->pSps->sVui.uiSarWidth;
+      pVuiSarInfo->uiSarHeight = pDecContext->pSps->sVui.uiSarHeight;
+      pVuiSarInfo->bOverscanAppropriateFlag = pDecContext->pSps->sVui.bOverscanAppropriateFlag;
+      return cmResultSuccess;
+    }
+  } else if (DECODER_OPTION_PROFILE == eOptID) {
+    if (!pDecContext->pSps) {
+      return cmInitExpected;
+    }
+    iVal = (int)pDecContext->pSps->uiProfileIdc;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_LEVEL == eOptID) {
+    if (!pDecContext->pSps) {
+      return cmInitExpected;
+    }
+    iVal = (int)pDecContext->pSps->uiLevelIdc;
+    * ((int*)pOption) = iVal;
+    return cmResultSuccess;
+  } else if (DECODER_OPTION_NUM_OF_FRAMES_REMAINING_IN_BUFFER == eOptID) {
+    for (int32_t activeThread = 0; activeThread < m_DecCtxActiveCount; ++activeThread) {
+      WAIT_SEMAPHORE (&m_pDecThrCtxActive[activeThread]->sThreadInfo.sIsIdle, WELS_DEC_THREAD_WAIT_INFINITE);
+      RELEASE_SEMAPHORE (&m_pDecThrCtxActive[activeThread]->sThreadInfo.sIsIdle);
+    }
+    * ((int*)pOption) = m_sReoderingStatus.iNumOfPicts;
+    return cmResultSuccess;
+  }
+
+  return cmInitParaError;
+}
+
+DECODING_STATE CWelsDecoder::DecodeFrameNoDelay (const unsigned char* kpSrc,
+    const int kiSrcLen,
+    unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  int iRet = dsErrorFree;
+  if (m_iThreadCount >= 1) {
+    iRet = ThreadDecodeFrameInternal (kpSrc, kiSrcLen, ppDst, pDstInfo);
+    if (m_sReoderingStatus.iNumOfPicts) {
+      WAIT_EVENT (&m_sBufferingEvent, WELS_DEC_THREAD_WAIT_INFINITE);
+      RESET_EVENT (&m_sReleaseBufferEvent);
+      ReleaseBufferedReadyPicture (NULL, ppDst, pDstInfo);
+      SET_EVENT (&m_sReleaseBufferEvent);
+    }
+    return (DECODING_STATE)iRet;
+  }
+  //SBufferInfo sTmpBufferInfo;
+  //unsigned char* ppTmpDst[3] = {NULL, NULL, NULL};
+  iRet = (int)DecodeFrame2 (kpSrc, kiSrcLen, ppDst, pDstInfo);
+  //memcpy (&sTmpBufferInfo, pDstInfo, sizeof (SBufferInfo));
+  //ppTmpDst[0] = ppDst[0];
+  //ppTmpDst[1] = ppDst[1];
+  //ppTmpDst[2] = ppDst[2];
+  iRet |= DecodeFrame2 (NULL, 0, ppDst, pDstInfo);
+  //if ((pDstInfo->iBufferStatus == 0) && (sTmpBufferInfo.iBufferStatus == 1)) {
+  //memcpy (pDstInfo, &sTmpBufferInfo, sizeof (SBufferInfo));
+  //ppDst[0] = ppTmpDst[0];
+  //ppDst[1] = ppTmpDst[1];
+  //ppDst[2] = ppTmpDst[2];
+  //}
+  return (DECODING_STATE)iRet;
+}
+
+DECODING_STATE CWelsDecoder::DecodeFrame2WithCtx (PWelsDecoderContext pDecContext, const unsigned char* kpSrc,
+    const int kiSrcLen,
+    unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  if (pDecContext == NULL || pDecContext->pParam == NULL) {
+    if (m_pWelsTrace != NULL) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "Call DecodeFrame2 without Initialize.\n");
+    }
+    return dsInitialOptExpected;
+  }
+
+  if (pDecContext->pParam->bParseOnly) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "bParseOnly should be false for this API calling! \n");
+    pDecContext->iErrorCode |= dsInvalidArgument;
+    return dsInvalidArgument;
+  }
+  if (CheckBsBuffer (pDecContext, kiSrcLen)) {
+    if (ResetDecoder (pDecContext))
+      return dsOutOfMemory;
+
+    return dsErrorFree;
+  }
+  if (kiSrcLen > 0 && kpSrc != NULL) {
+#ifdef OUTPUT_BIT_STREAM
+    if (m_pFBS) {
+      WelsFwrite (kpSrc, sizeof (unsigned char), kiSrcLen, m_pFBS);
+      WelsFflush (m_pFBS);
+    }
+    if (m_pFBSSize) {
+      WelsFwrite (&kiSrcLen, sizeof (int), 1, m_pFBSSize);
+      WelsFflush (m_pFBSSize);
+    }
+#endif//OUTPUT_BIT_STREAM
+    pDecContext->bEndOfStreamFlag = false;
+    if (GetThreadCount (pDecContext) <= 0) {
+      pDecContext->uiDecodingTimeStamp = ++m_uiDecodeTimeStamp;
+    }
+  } else {
+    //For application MODE, the error detection should be added for safe.
+    //But for CONSOLE MODE, when decoding LAST AU, kiSrcLen==0 && kpSrc==NULL.
+    pDecContext->bEndOfStreamFlag = true;
+    pDecContext->bInstantDecFlag = true;
+  }
+
+  int64_t iStart, iEnd;
+  iStart = WelsTime();
+
+  if (GetThreadCount (pDecContext) <= 1) {
+    ppDst[0] = ppDst[1] = ppDst[2] = NULL;
+  }
+  pDecContext->iErrorCode = dsErrorFree; //initialize at the starting of AU decoding.
+  pDecContext->iFeedbackVclNalInAu = FEEDBACK_UNKNOWN_NAL; //initialize
+  unsigned long long uiInBsTimeStamp = pDstInfo->uiInBsTimeStamp;
+  if (GetThreadCount (pDecContext) <= 1) {
+    memset (pDstInfo, 0, sizeof (SBufferInfo));
+  }
+  pDstInfo->uiInBsTimeStamp = uiInBsTimeStamp;
+#ifdef LONG_TERM_REF
+  pDecContext->bReferenceLostAtT0Flag = false; //initialize for LTR
+  pDecContext->bCurAuContainLtrMarkSeFlag = false;
+  pDecContext->iFrameNumOfAuMarkedLtr = 0;
+  pDecContext->iFrameNum = -1; //initialize
+#endif
+
+  pDecContext->iFeedbackTidInAu = -1; //initialize
+  pDecContext->iFeedbackNalRefIdc = -1; //initialize
+  if (pDstInfo) {
+    pDstInfo->uiOutYuvTimeStamp = 0;
+    pDecContext->uiTimeStamp = pDstInfo->uiInBsTimeStamp;
+  } else {
+    pDecContext->uiTimeStamp = 0;
+  }
+  WelsDecodeBs (pDecContext, kpSrc, kiSrcLen, ppDst,
+                pDstInfo, NULL); //iErrorCode has been modified in this function
+  pDecContext->bInstantDecFlag = false; //reset no-delay flag
+  if (pDecContext->iErrorCode) {
+    EWelsNalUnitType eNalType =
+      NAL_UNIT_UNSPEC_0; //for NBR, IDR frames are expected to decode as followed if error decoding an IDR currently
+
+    eNalType = pDecContext->sCurNalHead.eNalUnitType;
+    if (pDecContext->iErrorCode & dsOutOfMemory) {
+      if (ResetDecoder (pDecContext)) {
+        return dsOutOfMemory;
+      }
+      return dsErrorFree;
+    }
+    if (pDecContext->iErrorCode & dsRefListNullPtrs) {
+      if (ResetDecoder (pDecContext)) {
+        return dsRefListNullPtrs;
+      }
+      return dsErrorFree;
+    }
+    //for AVC bitstream (excluding AVC with temporal scalability, including TP), as long as error occur, SHOULD notify upper layer key frame loss.
+    if ((IS_PARAM_SETS_NALS (eNalType) || NAL_UNIT_CODED_SLICE_IDR == eNalType) ||
+        (VIDEO_BITSTREAM_AVC == pDecContext->eVideoType)) {
+      if (pDecContext->pParam->eEcActiveIdc == ERROR_CON_DISABLE) {
+#ifdef LONG_TERM_REF
+        pDecContext->bParamSetsLostFlag = true;
+#else
+        pDecContext->bReferenceLostAtT0Flag = true;
+#endif
+      }
+    }
+
+    if (pDecContext->bPrintFrameErrorTraceFlag) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "decode failed, failure type:%d \n",
+               pDecContext->iErrorCode);
+      pDecContext->bPrintFrameErrorTraceFlag = false;
+    } else {
+      pDecContext->iIgnoredErrorInfoPacketCount++;
+      if (pDecContext->iIgnoredErrorInfoPacketCount == INT_MAX) {
+        WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING, "continuous error reached INT_MAX! Restart as 0.");
+        pDecContext->iIgnoredErrorInfoPacketCount = 0;
+      }
+    }
+    if ((pDecContext->pParam->eEcActiveIdc != ERROR_CON_DISABLE) && (pDstInfo->iBufferStatus == 1)) {
+      //TODO after dec status updated
+      pDecContext->iErrorCode |= dsDataErrorConcealed;
+
+      pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+      if (pDecContext->pDecoderStatistics->uiDecodedFrameCount == 0) { //exceed max value of uint32_t
+        ResetDecStatNums (pDecContext->pDecoderStatistics);
+        pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+      }
+      int32_t iMbConcealedNum = pDecContext->iMbEcedNum + pDecContext->iMbEcedPropNum;
+      pDecContext->pDecoderStatistics->uiAvgEcRatio = pDecContext->iMbNum == 0 ?
+          (pDecContext->pDecoderStatistics->uiAvgEcRatio * pDecContext->pDecoderStatistics->uiEcFrameNum) : ((
+                pDecContext->pDecoderStatistics->uiAvgEcRatio * pDecContext->pDecoderStatistics->uiEcFrameNum) + ((
+                      iMbConcealedNum * 100) / pDecContext->iMbNum));
+      pDecContext->pDecoderStatistics->uiAvgEcPropRatio = pDecContext->iMbNum == 0 ?
+          (pDecContext->pDecoderStatistics->uiAvgEcPropRatio * pDecContext->pDecoderStatistics->uiEcFrameNum) : ((
+                pDecContext->pDecoderStatistics->uiAvgEcPropRatio * pDecContext->pDecoderStatistics->uiEcFrameNum) + ((
+                      pDecContext->iMbEcedPropNum * 100) / pDecContext->iMbNum));
+      pDecContext->pDecoderStatistics->uiEcFrameNum += (iMbConcealedNum == 0 ? 0 : 1);
+      pDecContext->pDecoderStatistics->uiAvgEcRatio = pDecContext->pDecoderStatistics->uiEcFrameNum == 0 ? 0 :
+          pDecContext->pDecoderStatistics->uiAvgEcRatio / pDecContext->pDecoderStatistics->uiEcFrameNum;
+      pDecContext->pDecoderStatistics->uiAvgEcPropRatio = pDecContext->pDecoderStatistics->uiEcFrameNum == 0 ? 0 :
+          pDecContext->pDecoderStatistics->uiAvgEcPropRatio / pDecContext->pDecoderStatistics->uiEcFrameNum;
+    }
+    iEnd = WelsTime();
+    pDecContext->dDecTime += (iEnd - iStart) / 1e3;
+
+    OutputStatisticsLog (*pDecContext->pDecoderStatistics);
+
+    if (GetThreadCount (pDecContext) >= 1) {
+      WAIT_EVENT (&m_sReleaseBufferEvent, WELS_DEC_THREAD_WAIT_INFINITE);
+      RESET_EVENT (&m_sBufferingEvent);
+      BufferingReadyPicture (pDecContext, ppDst, pDstInfo);
+      SET_EVENT (&m_sBufferingEvent);
+    } else {
+      ReorderPicturesInDisplay (pDecContext, ppDst, pDstInfo);
+    }
+
+    return (DECODING_STATE)pDecContext->iErrorCode;
+  }
+  // else Error free, the current codec works well
+
+  if (pDstInfo->iBufferStatus == 1) {
+
+    pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+    if (pDecContext->pDecoderStatistics->uiDecodedFrameCount == 0) { //exceed max value of uint32_t
+      ResetDecStatNums (pDecContext->pDecoderStatistics);
+      pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+    }
+
+    OutputStatisticsLog (*pDecContext->pDecoderStatistics);
+  }
+  iEnd = WelsTime();
+  pDecContext->dDecTime += (iEnd - iStart) / 1e3;
+
+  if (GetThreadCount (pDecContext) >= 1) {
+    WAIT_EVENT (&m_sReleaseBufferEvent, WELS_DEC_THREAD_WAIT_INFINITE);
+    RESET_EVENT (&m_sBufferingEvent);
+    BufferingReadyPicture (pDecContext, ppDst, pDstInfo);
+    SET_EVENT (&m_sBufferingEvent);
+  } else {
+    ReorderPicturesInDisplay (pDecContext, ppDst, pDstInfo);
+  }
+  return dsErrorFree;
+}
+
+DECODING_STATE CWelsDecoder::DecodeFrame2 (const unsigned char* kpSrc,
+    const int kiSrcLen,
+    unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  PWelsDecoderContext pDecContext = m_pDecThrCtx[0].pCtx;
+  pDecContext->pDstInfo = pDstInfo;
+  return DecodeFrame2WithCtx (pDecContext, kpSrc, kiSrcLen, ppDst, pDstInfo);
+}
+
+DECODING_STATE CWelsDecoder::FlushFrame (unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  bool bEndOfStreamFlag = true;
+  if (m_iThreadCount <= 1) {
+    for (int32_t j = 0; j < m_iCtxCount; ++j) {
+      if (!m_pDecThrCtx[j].pCtx->bEndOfStreamFlag) {
+        bEndOfStreamFlag = false;
+      }
+    }
+  }
+  if (bEndOfStreamFlag && m_sReoderingStatus.iNumOfPicts > 0) {
+    m_sReoderingStatus.iMinPOC = IMinInt32;
+    if (m_bIsBaseline) {
+      uint32_t uiDecodingTimeStamp = 0;
+      int32_t firstValidIdx = -1;
+      for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+        if (m_sPictInfoList[i].iPOC > IMinInt32) {
+          uiDecodingTimeStamp = m_sPictInfoList[i].uiDecodingTimeStamp;
+          m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+          m_sReoderingStatus.iPictInfoIndex = i;
+          firstValidIdx = i;
+          break;
+        }
+      }
+      for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+        if (i == firstValidIdx) continue;
+        if (m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].uiDecodingTimeStamp < uiDecodingTimeStamp) {
+          uiDecodingTimeStamp = m_sPictInfoList[i].uiDecodingTimeStamp;
+          m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+          m_sReoderingStatus.iPictInfoIndex = i;
+        }
+      }
+    } else {
+      int32_t firstValidIdx = -1;
+      for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+        if (m_sReoderingStatus.iMinPOC == IMinInt32 && m_sPictInfoList[i].iPOC > IMinInt32) {
+          m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+          m_sReoderingStatus.iPictInfoIndex = i;
+          firstValidIdx = i;
+          break;
+        }
+      }
+      for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+        if (i == firstValidIdx) continue;
+        if (m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].iPOC < m_sReoderingStatus.iMinPOC) {
+          m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+          m_sReoderingStatus.iPictInfoIndex = i;
+        }
+      }
+    }
+  }
+  if (m_sReoderingStatus.iMinPOC > IMinInt32) {
+    m_sReoderingStatus.iLastWrittenPOC = m_sReoderingStatus.iMinPOC;
+#if defined (_DEBUG)
+#ifdef _MOTION_VECTOR_DUMP_
+    fprintf (stderr, "Output POC: #%d uiDecodingTimeStamp=%d\n", m_sReoderingStatus.iLastWrittenPOC,
+             m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].uiDecodingTimeStamp);
+#endif
+#endif
+    memcpy (pDstInfo, &m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].sBufferInfo, sizeof (SBufferInfo));
+    ppDst[0] = pDstInfo->pDst[0];
+    ppDst[1] = pDstInfo->pDst[1];
+    ppDst[2] = pDstInfo->pDst[2];
+    m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
+    PPicBuff pPicBuff = m_iThreadCount <= 1 ? m_pDecThrCtx[0].pCtx->pPicBuff : m_pPicBuff;
+    if (m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx < pPicBuff->iCapacity) {
+      PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
+      --pPic->iRefCount;
+    }
+    m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
+    m_sReoderingStatus.iMinPOC = IMinInt32;
+    --m_sReoderingStatus.iNumOfPicts;
+  }
+
+  return dsErrorFree;
+}
+
+void CWelsDecoder::OutputStatisticsLog (SDecoderStatistics& sDecoderStatistics) {
+  if ((sDecoderStatistics.uiDecodedFrameCount > 0) && (sDecoderStatistics.iStatisticsLogInterval > 0)
+      && ((sDecoderStatistics.uiDecodedFrameCount % sDecoderStatistics.iStatisticsLogInterval) == 0)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "DecoderStatistics: uiWidth=%d, uiHeight=%d, fAverageFrameSpeedInMs=%.1f, fActualAverageFrameSpeedInMs=%.1f, \
+              uiDecodedFrameCount=%d, uiResolutionChangeTimes=%d, uiIDRCorrectNum=%d, \
+              uiAvgEcRatio=%d, uiAvgEcPropRatio=%d, uiEcIDRNum=%d, uiEcFrameNum=%d, \
+              uiIDRLostNum=%d, uiFreezingIDRNum=%d, uiFreezingNonIDRNum=%d, iAvgLumaQp=%d, \
+              iSpsReportErrorNum=%d, iSubSpsReportErrorNum=%d, iPpsReportErrorNum=%d, iSpsNoExistNalNum=%d, iSubSpsNoExistNalNum=%d, iPpsNoExistNalNum=%d, \
+              uiProfile=%d, uiLevel=%d, \
+              iCurrentActiveSpsId=%d, iCurrentActivePpsId=%d,",
+             sDecoderStatistics.uiWidth,
+             sDecoderStatistics.uiHeight,
+             sDecoderStatistics.fAverageFrameSpeedInMs,
+             sDecoderStatistics.fActualAverageFrameSpeedInMs,
+
+             sDecoderStatistics.uiDecodedFrameCount,
+             sDecoderStatistics.uiResolutionChangeTimes,
+             sDecoderStatistics.uiIDRCorrectNum,
+
+             sDecoderStatistics.uiAvgEcRatio,
+             sDecoderStatistics.uiAvgEcPropRatio,
+             sDecoderStatistics.uiEcIDRNum,
+             sDecoderStatistics.uiEcFrameNum,
+
+             sDecoderStatistics.uiIDRLostNum,
+             sDecoderStatistics.uiFreezingIDRNum,
+             sDecoderStatistics.uiFreezingNonIDRNum,
+             sDecoderStatistics.iAvgLumaQp,
+
+             sDecoderStatistics.iSpsReportErrorNum,
+             sDecoderStatistics.iSubSpsReportErrorNum,
+             sDecoderStatistics.iPpsReportErrorNum,
+             sDecoderStatistics.iSpsNoExistNalNum,
+             sDecoderStatistics.iSubSpsNoExistNalNum,
+             sDecoderStatistics.iPpsNoExistNalNum,
+
+             sDecoderStatistics.uiProfile,
+             sDecoderStatistics.uiLevel,
+
+             sDecoderStatistics.iCurrentActiveSpsId,
+             sDecoderStatistics.iCurrentActivePpsId);
+  }
+}
+
+void CWelsDecoder::BufferingReadyPicture (PWelsDecoderContext pCtx, unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  if (pDstInfo->iBufferStatus == 0) {
+    return;
+  }
+  m_bIsBaseline = pCtx->pSps->uiProfileIdc == 66 || pCtx->pSps->uiProfileIdc == 83;
+  if (!m_bIsBaseline) {
+    if (m_sReoderingStatus.iNumOfPicts && pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb
+        && pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->bNewSeqBegin) {
+      m_sReoderingStatus.iLastGOPRemainPicts = m_sReoderingStatus.iNumOfPicts;
+
+      for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+        if (m_sPictInfoList[i].iPOC > IMinInt32) {
+          m_sPictInfoList[i].bLastGOP = true;
+        }
+      }
+    } else {
+      if (m_sReoderingStatus.iNumOfPicts > 0) {
+        //This can happen when decoder moves to next GOP without being able to decoder first picture PicOrderCntLsb = 0
+        bool hasGOPChanged = false;
+        for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+          if (m_sPictInfoList[i].iPOC == pCtx->pSliceHeader->iPicOrderCntLsb) {
+            hasGOPChanged = true;
+            break;
+          }
+        }
+        if (hasGOPChanged) {
+          m_sReoderingStatus.iLastGOPRemainPicts = m_sReoderingStatus.iNumOfPicts;
+          for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+            if (m_sPictInfoList[i].iPOC > IMinInt32) {
+              m_sPictInfoList[i].bLastGOP = true;
+            }
+          }
+        }
+      }
+    }
+  }
+  for (int32_t i = 0; i < 16; ++i) {
+    if (m_sPictInfoList[i].iPOC == IMinInt32) {
+      memcpy (&m_sPictInfoList[i].sBufferInfo, pDstInfo, sizeof (SBufferInfo));
+      m_sPictInfoList[i].iPOC = pCtx->pSliceHeader->iPicOrderCntLsb;
+      m_sPictInfoList[i].uiDecodingTimeStamp = pCtx->uiDecodingTimeStamp;
+      m_sPictInfoList[i].iPicBuffIdx = pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->iPicBuffIdx;
+      if (GetThreadCount (pCtx) <= 1) ++pCtx->pLastDecPicInfo->pPreviousDecodedPictureInDpb->iRefCount;
+      m_sPictInfoList[i].bLastGOP = false;
+      m_iLastBufferedIdx = i;
+      pDstInfo->iBufferStatus = 0;
+      ++m_sReoderingStatus.iNumOfPicts;
+      if (i > m_sReoderingStatus.iLargestBufferedPicIndex) {
+        m_sReoderingStatus.iLargestBufferedPicIndex = i;
+      }
+      break;
+    }
+  }
+}
+
+void CWelsDecoder::ReleaseBufferedReadyPicture (PWelsDecoderContext pCtx, unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  PPicBuff pPicBuff = pCtx ? pCtx->pPicBuff : m_pPicBuff;
+  if (pCtx == NULL && m_iThreadCount <= 1) {
+    pCtx = m_pDecThrCtx[0].pCtx;
+  }
+  if (!m_bIsBaseline && m_sReoderingStatus.iLastGOPRemainPicts > 0) {
+    m_sReoderingStatus.iMinPOC = IMinInt32;
+    int32_t firstValidIdx = -1;
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (m_sReoderingStatus.iMinPOC == IMinInt32 && m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].bLastGOP) {
+        m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+        m_sReoderingStatus.iPictInfoIndex = i;
+        firstValidIdx = i;
+        break;
+      }
+    }
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (i == firstValidIdx) continue;
+      if (m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].iPOC < m_sReoderingStatus.iMinPOC
+          && m_sPictInfoList[i].bLastGOP) {
+        m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+        m_sReoderingStatus.iPictInfoIndex = i;
+      }
+    }
+    m_sReoderingStatus.iLastWrittenPOC = m_sReoderingStatus.iMinPOC;
+#if defined (_DEBUG)
+#ifdef _MOTION_VECTOR_DUMP_
+    fprintf (stderr, "Output POC: #%d uiDecodingTimeStamp=%d\n", m_sReoderingStatus.iLastWrittenPOC,
+             m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].uiDecodingTimeStamp);
+#endif
+#endif
+    memcpy (pDstInfo, &m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].sBufferInfo, sizeof (SBufferInfo));
+    ppDst[0] = pDstInfo->pDst[0];
+    ppDst[1] = pDstInfo->pDst[1];
+    ppDst[2] = pDstInfo->pDst[2];
+    m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
+    PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
+    --pPic->iRefCount;
+    m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
+    m_sReoderingStatus.iMinPOC = IMinInt32;
+    --m_sReoderingStatus.iNumOfPicts;
+    --m_sReoderingStatus.iLastGOPRemainPicts;
+    if (m_sReoderingStatus.iLastGOPRemainPicts == 0) {
+      m_sReoderingStatus.iLastWrittenPOC = IMinInt32;
+    }
+    return;
+  }
+  if (m_sReoderingStatus.iNumOfPicts && m_bIsBaseline) {
+    uint32_t uiDecodingTimeStamp = 0;
+    int32_t firstValidIdx = -1;
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (m_sPictInfoList[i].iPOC > IMinInt32) {
+        uiDecodingTimeStamp = m_sPictInfoList[i].uiDecodingTimeStamp;
+        m_sReoderingStatus.iPictInfoIndex = i;
+        firstValidIdx = i;
+        break;
+      }
+    }
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (i == firstValidIdx) continue;
+      if (m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].uiDecodingTimeStamp < uiDecodingTimeStamp) {
+        uiDecodingTimeStamp = m_sPictInfoList[i].uiDecodingTimeStamp;
+        m_sReoderingStatus.iPictInfoIndex = i;
+      }
+    }
+    if (uiDecodingTimeStamp > 0) {
+#if defined (_DEBUG)
+#ifdef _MOTION_VECTOR_DUMP_
+      fprintf (stderr, "Output POC: #%d uiDecodingTimeStamp=%d\n", m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC,
+               uiDecodingTimeStamp);
+#endif
+#endif
+      memcpy (pDstInfo, &m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].sBufferInfo, sizeof (SBufferInfo));
+      ppDst[0] = pDstInfo->pDst[0];
+      ppDst[1] = pDstInfo->pDst[1];
+      ppDst[2] = pDstInfo->pDst[2];
+      m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
+      PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
+      --pPic->iRefCount;
+      --m_sReoderingStatus.iNumOfPicts;
+    }
+    return;
+  }
+  if (m_sReoderingStatus.iNumOfPicts > 0) {
+    m_sReoderingStatus.iMinPOC = IMinInt32;
+    int32_t firstValidIdx = -1;
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (m_sReoderingStatus.iMinPOC == IMinInt32 && m_sPictInfoList[i].iPOC > IMinInt32) {
+        m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+        m_sReoderingStatus.iPictInfoIndex = i;
+        firstValidIdx = i;
+        break;
+      }
+    }
+    for (int32_t i = 0; i <= m_sReoderingStatus.iLargestBufferedPicIndex; ++i) {
+      if (i == firstValidIdx) continue;
+      if (m_sPictInfoList[i].iPOC > IMinInt32 && m_sPictInfoList[i].iPOC < m_sReoderingStatus.iMinPOC) {
+        m_sReoderingStatus.iMinPOC = m_sPictInfoList[i].iPOC;
+        m_sReoderingStatus.iPictInfoIndex = i;
+      }
+    }
+  }
+  if (m_sReoderingStatus.iMinPOC > IMinInt32) {
+    int32_t iLastPOC = pCtx != NULL ? pCtx->pSliceHeader->iPicOrderCntLsb : m_sPictInfoList[m_iLastBufferedIdx].iPOC;
+    bool isReady = (m_sReoderingStatus.iLastWrittenPOC > IMinInt32
+                    && m_sReoderingStatus.iMinPOC - m_sReoderingStatus.iLastWrittenPOC <= 1)
+                   || m_sReoderingStatus.iMinPOC < iLastPOC;
+    if (isReady) {
+      m_sReoderingStatus.iLastWrittenPOC = m_sReoderingStatus.iMinPOC;
+#if defined (_DEBUG)
+#ifdef _MOTION_VECTOR_DUMP_
+      fprintf (stderr, "Output POC: #%d uiDecodingTimeStamp=%d\n", m_sReoderingStatus.iLastWrittenPOC,
+               m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].uiDecodingTimeStamp);
+#endif
+#endif
+      memcpy (pDstInfo, &m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].sBufferInfo, sizeof (SBufferInfo));
+      ppDst[0] = pDstInfo->pDst[0];
+      ppDst[1] = pDstInfo->pDst[1];
+      ppDst[2] = pDstInfo->pDst[2];
+      m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPOC = IMinInt32;
+      PPicture pPic = pPicBuff->ppPic[m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].iPicBuffIdx];
+      --pPic->iRefCount;
+      m_sPictInfoList[m_sReoderingStatus.iPictInfoIndex].bLastGOP = false;
+      m_sReoderingStatus.iMinPOC = IMinInt32;
+      --m_sReoderingStatus.iNumOfPicts;
+    }
+  }
+}
+
+DECODING_STATE CWelsDecoder::ReorderPicturesInDisplay (PWelsDecoderContext pDecContext, unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  DECODING_STATE iRet = dsErrorFree;
+  if (pDstInfo->iBufferStatus == 1) {
+    m_bIsBaseline = pDecContext->pSps->uiProfileIdc == 66 || pDecContext->pSps->uiProfileIdc == 83;
+    if (!m_bIsBaseline) {
+      BufferingReadyPicture (pDecContext, ppDst, pDstInfo);
+      ReleaseBufferedReadyPicture (pDecContext, ppDst, pDstInfo);
+    }
+  }
+  return iRet;
+}
+
+DECODING_STATE CWelsDecoder::DecodeParser (const unsigned char* kpSrc, const int kiSrcLen, SParserBsInfo* pDstInfo) {
+  PWelsDecoderContext pDecContext = m_pDecThrCtx[0].pCtx;
+
+  if (pDecContext == NULL || pDecContext->pParam == NULL) {
+    if (m_pWelsTrace != NULL) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "Call DecodeParser without Initialize.\n");
+    }
+    return dsInitialOptExpected;
+  }
+
+  if (!pDecContext->pParam->bParseOnly) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "bParseOnly should be true for this API calling! \n");
+    pDecContext->iErrorCode |= dsInvalidArgument;
+    return dsInvalidArgument;
+  }
+  int64_t iEnd, iStart = WelsTime();
+  if (CheckBsBuffer (pDecContext, kiSrcLen)) {
+    if (ResetDecoder (pDecContext))
+      return dsOutOfMemory;
+
+    return dsErrorFree;
+  }
+  if (kiSrcLen > 0 && kpSrc != NULL) {
+#ifdef OUTPUT_BITSTREAM
+    if (m_pFBS) {
+      WelsFwrite (kpSrc, sizeof (unsigned char), kiSrcLen, m_pFBS);
+      WelsFflush (m_pFBS);
+    }
+#endif//OUTPUT_BIT_STREAM
+    pDecContext->bEndOfStreamFlag = false;
+  } else {
+    //For application MODE, the error detection should be added for safe.
+    //But for CONSOLE MODE, when decoding LAST AU, kiSrcLen==0 && kpSrc==NULL.
+    pDecContext->bEndOfStreamFlag = true;
+    pDecContext->bInstantDecFlag = true;
+  }
+
+  pDecContext->iErrorCode = dsErrorFree; //initialize at the starting of AU decoding.
+  pDecContext->pParam->eEcActiveIdc = ERROR_CON_DISABLE; //add protection to disable EC here.
+  pDecContext->iFeedbackNalRefIdc = -1; //initialize
+  if (!pDecContext->bFramePending) { //frame complete
+    pDecContext->pParserBsInfo->iNalNum = 0;
+    memset (pDecContext->pParserBsInfo->pNalLenInByte, 0, MAX_NAL_UNITS_IN_LAYER);
+  }
+  pDstInfo->iNalNum = 0;
+  pDstInfo->iSpsWidthInPixel = pDstInfo->iSpsHeightInPixel = 0;
+  if (pDstInfo) {
+    pDecContext->uiTimeStamp = pDstInfo->uiInBsTimeStamp;
+    pDstInfo->uiOutBsTimeStamp = 0;
+  } else {
+    pDecContext->uiTimeStamp = 0;
+  }
+  WelsDecodeBs (pDecContext, kpSrc, kiSrcLen, NULL, NULL, pDstInfo);
+  if (pDecContext->iErrorCode & dsOutOfMemory) {
+    if (ResetDecoder (pDecContext))
+      return dsOutOfMemory;
+    return dsErrorFree;
+  }
+
+  if (!pDecContext->bFramePending && pDecContext->pParserBsInfo->iNalNum) {
+    memcpy (pDstInfo, pDecContext->pParserBsInfo, sizeof (SParserBsInfo));
+
+    if (pDecContext->iErrorCode == ERR_NONE) { //update statistics: decoding frame count
+      pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+      if (pDecContext->pDecoderStatistics->uiDecodedFrameCount == 0) { //exceed max value of uint32_t
+        ResetDecStatNums (pDecContext->pDecoderStatistics);
+        pDecContext->pDecoderStatistics->uiDecodedFrameCount++;
+      }
+    }
+  }
+
+  pDecContext->bInstantDecFlag = false; //reset no-delay flag
+
+  if (pDecContext->iErrorCode && pDecContext->bPrintFrameErrorTraceFlag) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "decode failed, failure type:%d \n", pDecContext->iErrorCode);
+    pDecContext->bPrintFrameErrorTraceFlag = false;
+  }
+  iEnd = WelsTime();
+  pDecContext->dDecTime += (iEnd - iStart) / 1e3;
+  return (DECODING_STATE)pDecContext->iErrorCode;
+}
+
+DECODING_STATE CWelsDecoder::DecodeFrame (const unsigned char* kpSrc,
+    const int kiSrcLen,
+    unsigned char** ppDst,
+    int* pStride,
+    int& iWidth,
+    int& iHeight) {
+  DECODING_STATE eDecState = dsErrorFree;
+  SBufferInfo    DstInfo;
+
+  memset (&DstInfo, 0, sizeof (SBufferInfo));
+  DstInfo.UsrData.sSystemBuffer.iStride[0] = pStride[0];
+  DstInfo.UsrData.sSystemBuffer.iStride[1] = pStride[1];
+  DstInfo.UsrData.sSystemBuffer.iWidth = iWidth;
+  DstInfo.UsrData.sSystemBuffer.iHeight = iHeight;
+
+  eDecState = DecodeFrame2 (kpSrc, kiSrcLen, ppDst, &DstInfo);
+  if (eDecState == dsErrorFree) {
+    pStride[0] = DstInfo.UsrData.sSystemBuffer.iStride[0];
+    pStride[1] = DstInfo.UsrData.sSystemBuffer.iStride[1];
+    iWidth     = DstInfo.UsrData.sSystemBuffer.iWidth;
+    iHeight    = DstInfo.UsrData.sSystemBuffer.iHeight;
+  }
+
+  return eDecState;
+}
+
+DECODING_STATE CWelsDecoder::DecodeFrameEx (const unsigned char* kpSrc,
+    const int kiSrcLen,
+    unsigned char* pDst,
+    int iDstStride,
+    int& iDstLen,
+    int& iWidth,
+    int& iHeight,
+    int& iColorFormat) {
+  DECODING_STATE state = dsErrorFree;
+
+  return state;
+}
+
+DECODING_STATE CWelsDecoder::ParseAccessUnit (SWelsDecoderThreadCTX& sThreadCtx) {
+  sThreadCtx.pCtx->bHasNewSps = false;
+  sThreadCtx.pCtx->bParamSetsLostFlag = m_bParamSetsLostFlag;
+  sThreadCtx.pCtx->bFreezeOutput = m_bFreezeOutput;
+  sThreadCtx.pCtx->uiDecodingTimeStamp = ++m_uiDecodeTimeStamp;
+  bool bPicBuffChanged = false;
+  if (m_pLastDecThrCtx != NULL && sThreadCtx.pCtx->sSpsPpsCtx.iSeqId < m_pLastDecThrCtx->pCtx->sSpsPpsCtx.iSeqId) {
+    CopySpsPps (m_pLastDecThrCtx->pCtx, sThreadCtx.pCtx);
+    sThreadCtx.pCtx->iPicQueueNumber = m_pLastDecThrCtx->pCtx->iPicQueueNumber;
+    if (sThreadCtx.pCtx->pPicBuff != m_pPicBuff) {
+      bPicBuffChanged = true;
+      sThreadCtx.pCtx->pPicBuff = m_pPicBuff;
+      sThreadCtx.pCtx->bHaveGotMemory = m_pPicBuff != NULL;
+      sThreadCtx.pCtx->iImgWidthInPixel = m_pLastDecThrCtx->pCtx->iImgWidthInPixel;
+      sThreadCtx.pCtx->iImgHeightInPixel = m_pLastDecThrCtx->pCtx->iImgHeightInPixel;
+    }
+  }
+
+  //if threadCount > 1, then each thread must contain exact one complete frame.
+  if (GetThreadCount (sThreadCtx.pCtx) > 1) {
+    sThreadCtx.pCtx->pAccessUnitList->uiAvailUnitsNum = 0;
+    sThreadCtx.pCtx->pAccessUnitList->uiActualUnitsNum = 0;
+  }
+
+  int32_t iRet = DecodeFrame2WithCtx (sThreadCtx.pCtx, sThreadCtx.kpSrc, sThreadCtx.kiSrcLen, sThreadCtx.ppDst,
+                                      &sThreadCtx.sDstInfo);
+
+  int32_t iErr = InitConstructAccessUnit (sThreadCtx.pCtx, &sThreadCtx.sDstInfo);
+  if (ERR_NONE != iErr) {
+    return (DECODING_STATE) (iRet | iErr);
+  }
+  if (sThreadCtx.pCtx->bNewSeqBegin) {
+    m_pPicBuff = sThreadCtx.pCtx->pPicBuff;
+  } else if (bPicBuffChanged) {
+    InitialDqLayersContext (sThreadCtx.pCtx, sThreadCtx.pCtx->pSps->iMbWidth << 4, sThreadCtx.pCtx->pSps->iMbHeight << 4);
+  }
+  if (!sThreadCtx.pCtx->bNewSeqBegin && m_pLastDecThrCtx != NULL) {
+    sThreadCtx.pCtx->sFrameCrop = m_pLastDecThrCtx->pCtx->pSps->sFrameCrop;
+  }
+  m_bParamSetsLostFlag = sThreadCtx.pCtx->bNewSeqBegin ? false : sThreadCtx.pCtx->bParamSetsLostFlag;
+  m_bFreezeOutput = sThreadCtx.pCtx->bNewSeqBegin ? false : sThreadCtx.pCtx->bFreezeOutput;
+  return (DECODING_STATE)iErr;
+}
+/*
+* Run decoding picture in separate thread.
+*/
+
+int CWelsDecoder::ThreadDecodeFrameInternal (const unsigned char* kpSrc, const int kiSrcLen, unsigned char** ppDst,
+    SBufferInfo* pDstInfo) {
+  int state = dsErrorFree;
+  int32_t i, j;
+  int32_t signal = 0;
+
+  //serial using of threads
+  if (m_DecCtxActiveCount < m_iThreadCount) {
+    signal = m_DecCtxActiveCount;
+  } else {
+    signal = m_pDecThrCtxActive[0]->sThreadInfo.uiThrNum;
+  }
+
+  WAIT_SEMAPHORE (&m_pDecThrCtx[signal].sThreadInfo.sIsIdle, WELS_DEC_THREAD_WAIT_INFINITE);
+
+  for (i = 0; i < m_DecCtxActiveCount; ++i) {
+    if (m_pDecThrCtxActive[i] == &m_pDecThrCtx[signal]) {
+      m_pDecThrCtxActive[i] = NULL;
+      for (j = i; j < m_DecCtxActiveCount - 1; j++) {
+        m_pDecThrCtxActive[j] = m_pDecThrCtxActive[j + 1];
+        m_pDecThrCtxActive[j + 1] = NULL;
+      }
+      --m_DecCtxActiveCount;
+      break;
+    }
+  }
+
+  m_pDecThrCtxActive[m_DecCtxActiveCount++] = &m_pDecThrCtx[signal];
+  if (m_pLastDecThrCtx != NULL) {
+    m_pDecThrCtx[signal].pCtx->pLastThreadCtx = m_pLastDecThrCtx;
+  }
+  m_pDecThrCtx[signal].kpSrc = const_cast<uint8_t*> (kpSrc);
+  m_pDecThrCtx[signal].kiSrcLen = kiSrcLen;
+  m_pDecThrCtx[signal].ppDst = ppDst;
+  memcpy (&m_pDecThrCtx[signal].sDstInfo, pDstInfo, sizeof (SBufferInfo));
+
+  ParseAccessUnit (m_pDecThrCtx[signal]);
+  if (m_iThreadCount > 1) {
+    m_pLastDecThrCtx = &m_pDecThrCtx[signal];
+  }
+  m_pDecThrCtx[signal].sThreadInfo.uiCommand = WELS_DEC_THREAD_COMMAND_RUN;
+  RELEASE_SEMAPHORE (&m_pDecThrCtx[signal].sThreadInfo.sIsActivated);
+
+  // wait early picture
+  if (m_DecCtxActiveCount >= m_iThreadCount) {
+    WAIT_SEMAPHORE (&m_pDecThrCtxActive[0]->sThreadInfo.sIsIdle, WELS_DEC_THREAD_WAIT_INFINITE);
+    RELEASE_SEMAPHORE (&m_pDecThrCtxActive[0]->sThreadInfo.sIsIdle);
+  }
+  return state;
+}
+
+} // namespace WelsDec
+
+
+using namespace WelsDec;
+/*
+*       WelsGetDecoderCapability
+*       @return: DecCapability information
+*/
+int WelsGetDecoderCapability (SDecoderCapability* pDecCapability) {
+  memset (pDecCapability, 0, sizeof (SDecoderCapability));
+  pDecCapability->iProfileIdc = 66; //Baseline
+  pDecCapability->iProfileIop = 0xE0; //11100000b
+  pDecCapability->iLevelIdc = 32; //level_idc = 3.2
+  pDecCapability->iMaxMbps = 216000; //from level_idc = 3.2
+  pDecCapability->iMaxFs = 5120; //from level_idc = 3.2
+  pDecCapability->iMaxCpb = 20000; //from level_idc = 3.2
+  pDecCapability->iMaxDpb = 20480; //from level_idc = 3.2
+  pDecCapability->iMaxBr = 20000; //from level_idc = 3.2
+  pDecCapability->bRedPicCap = 0; //not support redundant pic
+
+  return ERR_NONE;
+}
+/* WINAPI is indeed in prefix due to sync to application layer callings!! */
+
+/*
+*   WelsCreateDecoder
+*   @return:    success in return 0, otherwise failed.
+*/
+long WelsCreateDecoder (ISVCDecoder** ppDecoder) {
+
+  if (NULL == ppDecoder) {
+    return ERR_INVALID_PARAMETERS;
+  }
+
+  *ppDecoder = new CWelsDecoder();
+
+  if (NULL == *ppDecoder) {
+    return ERR_MALLOC_FAILED;
+  }
+
+  return ERR_NONE;
+}
+
+/*
+*   WelsDestroyDecoder
+*/
+void WelsDestroyDecoder (ISVCDecoder* pDecoder) {
+  if (NULL != pDecoder) {
+    delete (CWelsDecoder*)pDecoder;
+  }
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/wels_dec_export.def b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/wels_dec_export.def
new file mode 100644
index 0000000000..29a37e3e2b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/plus/src/wels_dec_export.def
@@ -0,0 +1,4 @@
+EXPORTS
+    WelsGetDecoderCapability
+    WelsCreateDecoder
+    WelsDestroyDecoder
diff --git a/third-party/openh264/third_party/openh264/src/codec/decoder/targets.mk b/third-party/openh264/third_party/openh264/src/codec/decoder/targets.mk
new file mode 100644
index 0000000000..88dc5afb12
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/decoder/targets.mk
@@ -0,0 +1,98 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+DECODER_SRCDIR=codec/decoder
+DECODER_CPP_SRCS=\
+	$(DECODER_SRCDIR)/core/src/au_parser.cpp\
+	$(DECODER_SRCDIR)/core/src/bit_stream.cpp\
+	$(DECODER_SRCDIR)/core/src/cabac_decoder.cpp\
+	$(DECODER_SRCDIR)/core/src/deblocking.cpp\
+	$(DECODER_SRCDIR)/core/src/decode_mb_aux.cpp\
+	$(DECODER_SRCDIR)/core/src/decode_slice.cpp\
+	$(DECODER_SRCDIR)/core/src/decoder.cpp\
+	$(DECODER_SRCDIR)/core/src/decoder_core.cpp\
+	$(DECODER_SRCDIR)/core/src/decoder_data_tables.cpp\
+	$(DECODER_SRCDIR)/core/src/error_concealment.cpp\
+	$(DECODER_SRCDIR)/core/src/fmo.cpp\
+	$(DECODER_SRCDIR)/core/src/get_intra_predictor.cpp\
+	$(DECODER_SRCDIR)/core/src/manage_dec_ref.cpp\
+	$(DECODER_SRCDIR)/core/src/memmgr_nal_unit.cpp\
+	$(DECODER_SRCDIR)/core/src/mv_pred.cpp\
+	$(DECODER_SRCDIR)/core/src/parse_mb_syn_cabac.cpp\
+	$(DECODER_SRCDIR)/core/src/parse_mb_syn_cavlc.cpp\
+	$(DECODER_SRCDIR)/core/src/pic_queue.cpp\
+	$(DECODER_SRCDIR)/core/src/rec_mb.cpp\
+	$(DECODER_SRCDIR)/core/src/wels_decoder_thread.cpp\
+	$(DECODER_SRCDIR)/plus/src/welsDecoderExt.cpp\
+
+DECODER_OBJS += $(DECODER_CPP_SRCS:.cpp=.$(OBJ))
+
+DECODER_ASM_SRCS=\
+	$(DECODER_SRCDIR)/core/x86/dct.asm\
+	$(DECODER_SRCDIR)/core/x86/intra_pred.asm\
+
+DECODER_OBJSASM += $(DECODER_ASM_SRCS:.asm=.$(OBJ))
+ifeq ($(ASM_ARCH), x86)
+DECODER_OBJS += $(DECODER_OBJSASM)
+endif
+OBJS += $(DECODER_OBJSASM)
+
+DECODER_ASM_ARM_SRCS=\
+	$(DECODER_SRCDIR)/core/arm/block_add_neon.S\
+	$(DECODER_SRCDIR)/core/arm/intra_pred_neon.S\
+
+DECODER_OBJSARM += $(DECODER_ASM_ARM_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm)
+DECODER_OBJS += $(DECODER_OBJSARM)
+endif
+OBJS += $(DECODER_OBJSARM)
+
+DECODER_ASM_ARM64_SRCS=\
+	$(DECODER_SRCDIR)/core/arm64/block_add_aarch64_neon.S\
+	$(DECODER_SRCDIR)/core/arm64/intra_pred_aarch64_neon.S\
+
+DECODER_OBJSARM64 += $(DECODER_ASM_ARM64_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm64)
+DECODER_OBJS += $(DECODER_OBJSARM64)
+endif
+OBJS += $(DECODER_OBJSARM64)
+
+DECODER_ASM_MIPS_MMI_SRCS=\
+	$(DECODER_SRCDIR)/core/mips/dct_mmi.c\
+
+DECODER_OBJSMIPS_MMI += $(DECODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))
+
+DECODER_ASM_MIPS_MSA_SRCS=\
+
+DECODER_OBJSMIPS_MSA += $(DECODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))
+ifeq ($(ASM_ARCH), mips)
+ifeq ($(ENABLE_MMI), Yes)
+DECODER_OBJS += $(DECODER_OBJSMIPS_MMI)
+endif
+ifeq ($(ENABLE_MSA), Yes)
+DECODER_OBJS += $(DECODER_OBJSMIPS_MSA)
+endif
+endif
+OBJS += $(DECODER_OBJSMIPS_MMI)
+OBJS += $(DECODER_OBJSMIPS_MSA)
+
+OBJS += $(DECODER_OBJS)
+
+$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(DECODER_CFLAGS) $(DECODER_INCLUDES) -c $(CXX_O) $<
+
+$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.c
+	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(DECODER_CFLAGS) $(DECODER_INCLUDES) -c $(CXX_O) $<
+
+$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.asm
+	$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(DECODER_ASMFLAGS) $(DECODER_ASM_INCLUDES) -o $@ $<
+
+$(DECODER_SRCDIR)/%.$(OBJ): $(DECODER_SRCDIR)/%.S
+	$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(DECODER_CFLAGS) $(DECODER_INCLUDES) -c -o $@ $<
+
+$(LIBPREFIX)decoder.$(LIBSUFFIX): $(DECODER_OBJS)
+	$(QUIET)rm -f $@
+	$(QUIET_AR)$(AR) $(AR_OPTS) $+
+
+libraries: $(LIBPREFIX)decoder.$(LIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)decoder.$(LIBSUFFIX)
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_neon.S
new file mode 100644
index 0000000000..b06fa36604
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_neon.S
@@ -0,0 +1,589 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+
+#include "arm_arch_common_macro.S"
+
+//Global macro
+.macro GET_8BYTE_DATA arg0, arg1, arg2
+    vld1.8 {\arg0[0]}, [\arg1], \arg2
+    vld1.8 {\arg0[1]}, [\arg1], \arg2
+    vld1.8 {\arg0[2]}, [\arg1], \arg2
+    vld1.8 {\arg0[3]}, [\arg1], \arg2
+    vld1.8 {\arg0[4]}, [\arg1], \arg2
+    vld1.8 {\arg0[5]}, [\arg1], \arg2
+    vld1.8 {\arg0[6]}, [\arg1], \arg2
+    vld1.8 {\arg0[7]}, [\arg1], \arg2
+.endm
+
+
+WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredDc_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Get the left vertical line data
+    sub r3, r1, #1
+    GET_8BYTE_DATA d0, r3, r2
+    GET_8BYTE_DATA d1, r3, r2
+
+    //Get the top horizontal line data
+    sub  r3, r1, r2
+    vldm r3, {d2, d3}
+
+    //Calculate the sum of top horizontal line data and vertical line data
+    vpaddl.u8 q0, q0
+    vpaddl.u8 q1, q1
+    vadd.u16  q0, q0, q1
+    vadd.u16  d0, d0, d1
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+
+    //Calculate the mean value
+    vrshr.u16  d0, d0, #5
+    vdup.8     q0, d0[0]
+
+    //Set the mean value to the all of member of MB
+    mov  r3, #4
+loop_0_get_i16x16_luma_pred_dc_both:
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    vst1.8 {d0,d1}, [r0]!
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_dc_both
+
+WELS_ASM_FUNC_END
+
+
+.align 3
+//The table for SIMD instruction {(8,7,6,5,4,3,2,1) * 5}
+CONST0_GET_I16X16_LUMA_PRED_PLANE: .long 0x191e2328, 0x050a0f14
+
+//The table for SIMD instruction {-7,-6,-5,-4,-3,-2,-1,0}
+CONST1_GET_I16X16_LUMA_PRED_PLANE: .long 0xfcfbfaf9, 0x00fffefd
+
+
+WELS_ASM_FUNC_BEGIN WelsI16x16LumaPredPlane_neon
+    //stmdb sp!, { r4, lr}
+
+    //Load the table {(8,7,6,5,4,3,2,1) * 5}
+    adr r3, CONST0_GET_I16X16_LUMA_PRED_PLANE
+    vldr    d0, [r3]
+
+    //Pack the top[-1] ~ top[6] to d1
+    sub       r3,  r1, r2
+    sub       r1,  r3, #1
+    vld1.8    d1, [r1]
+
+    //Pack the top[8] ~ top[15] to d2
+    add       r1, #9
+    vld1.8    d2, [r1]
+
+    //Save the top[15] to d6 for next step
+    vdup.u8   d6,   d2[7]
+
+    //Get and pack left[-1] ~ left[6] to d4
+    sub       r1,  r3, #1
+    GET_8BYTE_DATA d4, r1, r2
+
+    //Get and pack left[8] ~ left[15] to d3
+    add       r1,  r2
+    GET_8BYTE_DATA d3, r1, r2
+
+    //Save the left[15] to d7 for next step
+    vdup.u8   d7,   d3[7]
+
+    //revert the sequence of d2,d3
+    vrev64.8   q1, q1
+
+    vsubl.u8   q2, d3, d4 //q2={left[8]-left[6],left[9]-left[5],left[10]-left[4], ...}
+    vsubl.u8   q1, d2, d1 //q1={top[8]-top[6],top[9]-top[5],top[10]-top[4], ...}
+
+
+    vmovl.u8   q0, d0
+    vmul.s16   q1, q0, q1 //q1 = q1*{(8,7,6,5,4,3,2,1) * 5}
+    vmul.s16   q2, q0, q2 //q2 = q2*{(8,7,6,5,4,3,2,1) * 5}
+
+    //Calculate the sum of items of q1, q2
+    vpadd.s16  d0, d2, d3
+    vpadd.s16  d1, d4, d5
+    vpaddl.s16 q0, q0
+    vpaddl.s32 q0, q0
+
+    //Get the value of 'b', 'c' and extend to q1, q2.
+    vrshr.s64  q0, #6
+    vdup.s16   q1, d0[0]
+    vdup.s16   q2, d1[0]
+
+    //Load the table {-7,-6,-5,-4,-3,-2,-1,0} to d0
+    adr r3, CONST1_GET_I16X16_LUMA_PRED_PLANE
+    vld1.32   {d0}, [r3]
+
+    //Get the value of 'a' and save to q3
+    vaddl.u8  q3, d6, d7
+    vshl.u16  q3, #4
+
+    //calculate a+'b'*{-7,-6,-5,-4,-3,-2,-1,0} + c*{-7}
+    vmovl.s8  q0, d0
+    vmla.s16  q3, q0, q1
+    vmla.s16  q3, q2, d0[0]
+
+    //Calculate a+'b'*{1,2,3,4,5,6,7,8} + c*{-7}
+    vshl.s16  q8, q1, #3
+    vadd.s16  q8, q3
+
+    //right shift 5 bits and rounding
+    vqrshrun.s16 d0, q3, #5
+    vqrshrun.s16 d1, q8, #5
+
+    //Set the line of MB
+    vst1.u32  {d0,d1}, [r0]!
+
+
+    //Do the same processing for setting other lines
+    mov  r3, #15
+loop_0_get_i16x16_luma_pred_plane:
+    vadd.s16  q3, q2
+    vadd.s16  q8, q2
+    vqrshrun.s16 d0, q3, #5
+    vqrshrun.s16 d1, q8, #5
+    vst1.u32  {d0,d1}, [r0]!
+    subs  r3, #1
+    bne  loop_0_get_i16x16_luma_pred_plane
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredV_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub  r3, r1, r2
+    ldr  r3, [r3]
+
+    //Set the luma MB using top line
+    str  r3, [r0], #4
+    str  r3, [r0], #4
+    str  r3, [r0], #4
+    str  r3, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredH_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the left column (4 bytes)
+    sub  r3, r1, #1
+    vld1.8 {d0[]}, [r3], r2
+    vld1.8 {d1[]}, [r3], r2
+    vld1.8 {d2[]}, [r3], r2
+    vld1.8 {d3[]}, [r3]
+
+    //Set the luma MB using the left side byte
+    vst1.32 {d0[0]}, [r0]!
+    vst1.32 {d1[0]}, [r0]!
+    vst1.32 {d2[0]}, [r0]!
+    vst1.32 {d3[0]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredDDL_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row data(8 bytes)
+    sub    r3,  r1, r2
+    vld1.32  {d0}, [r3]
+
+    //For "t7 + (t7<<1)"
+    vdup.8   d1,  d0[7]
+
+    //calculate "t0+t1,t1+t2,t2+t3...t6+t7,t7+t7"
+    vext.8   d1,  d0, d1, #1
+    vaddl.u8 q1,  d1, d0
+
+    //calculate "x,t0+t1+t1+t2,t1+t2+t2+t3,...t5+t6+t6+t7,t6+t7+t7+t7"
+    vext.8   q2,  q1, q1, #14
+    vadd.u16 q0,  q1, q2
+
+    //right shift 2 bits and rounding
+    vqrshrn.u16  d0,  q0, #2
+
+    //Save "ddl0, ddl1, ddl2, ddl3"
+    vext.8   d1, d0, d0, #1
+    vst1.32  d1[0], [r0]!
+
+    //Save "ddl1, ddl2, ddl3, ddl4"
+    vext.8   d1, d0, d0, #2
+    vst1.32  d1[0], [r0]!
+
+    //Save "ddl2, ddl3, ddl4, ddl5"
+    vext.8   d1, d0, d0, #3
+    vst1.32  d1[0], [r0]!
+
+    //Save "ddl3, ddl4, ddl5, ddl6"
+    vst1.32  d0[1], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredDDR_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub    r3,  r1, r2
+    vld1.32  {d0[1]}, [r3]
+
+    //Load the left column (5 bytes)
+    sub    r3,  #1
+    vld1.8 {d0[3]}, [r3], r2
+    vld1.8 {d0[2]}, [r3], r2
+    vld1.8 {d0[1]}, [r3], r2
+    vld1.8 {d0[0]}, [r3], r2
+    vld1.8 {d1[7]}, [r3] //For packing the right sequence to do SIMD processing
+
+
+    vext.8   d2, d1, d0, #7   //d0:{L2,L1,L0,LT,T0,T1,T2,T3}
+                              //d2:{L3,L2,L1,L0,LT,T0,T1,T2}
+
+    //q2:{L2+L3,L1+L2,L0+L1...T1+T2,T2+T3}
+    vaddl.u8 q2, d2, d0
+
+    //q1:{TL0+LT0,LT0+T01,...L12+L23}
+    vext.8   q3, q3, q2, #14
+    vadd.u16 q1, q2, q3
+
+    //right shift 2 bits and rounding
+    vqrshrn.u16 d0, q1, #2
+
+    //Adjust the data sequence for setting luma MB of 'pred'
+    vst1.32   d0[1], [r0]!
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0]!
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0]!
+    vext.8    d0, d0, d0, #7
+    vst1.32   d0[1], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredVL_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (8 bytes)
+    sub    r3,  r1, r2
+    vld1.32  {d0}, [r3]
+
+
+    vext.8   d1,  d0, d0, #1
+    vaddl.u8 q1,  d1, d0     //q1:{t0+t1,t1+t2,t2+t3...t5+t6,x,x}
+
+    vext.8   q2,  q1, q1, #2
+    vadd.u16 q2,  q1, q2     //q2:{t0+t1+t1+t2,t1+t2+t2+t3,...t4+t5+t5+t6,x,x}
+
+    //calculate the "vl0,vl1,vl2,vl3,vl4"
+    vqrshrn.u16  d0,  q1, #1
+
+    //calculate the "vl5,vl6,vl7,vl8,vl9"
+    vqrshrn.u16  d1,  q2, #2
+
+    //Adjust the data sequence for setting the luma MB
+    vst1.32  d0[0], [r0]!
+    vst1.32  d1[0], [r0]!
+    vext.8   d0,  d0, d0, #1
+    vext.8   d1,  d1, d1, #1
+    vst1.32  d0[0], [r0]!
+    vst1.32  d1[0], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredVR_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row (4 bytes)
+    sub       r3,  r1, r2
+    vld1.32   {d0[1]}, [r3]
+
+    //Load the left column (4 bytes)
+    sub       r3,  #1
+    vld1.8    {d0[3]}, [r3], r2
+    vld1.8    {d0[2]}, [r3], r2
+    vld1.8    {d0[1]}, [r3], r2
+    vld1.8    {d0[0]}, [r3]
+
+
+    vext.8    d1, d0, d0, #7
+    vaddl.u8  q1, d0, d1      //q1:{X,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2,T2+T3}
+
+    vext.u8   q2, q1, q1, #14
+    vadd.u16  q2, q2, q1      //q2:{X,L2+L1+L1+L0,L1+L0+L0+LT,...T1+T2+T2+T3}
+
+    //Calculate the vr0 ~ vr9
+    vqrshrn.u16 d1, q2, #2
+    vqrshrn.u16 d0, q1, #1
+
+    //Adjust the data sequence for setting the luma MB
+    vst1.32  d0[1], [r0]!
+    vst1.32  d1[1], [r0]!
+    //add    r2, r0, r1
+    vst1.8   d1[3], [r0]!
+    vst1.16  d0[2], [r0]!
+    vst1.8   d0[6], [r0]!
+    vst1.8   d1[2], [r0]!
+    vst1.16  d1[2], [r0]!
+    vst1.8   d1[6], [r0]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredHU_neon
+    //stmdb sp!, { r4, lr}
+    //Load the left column data
+    sub       r3,  r1, #1
+    mov       r1,  #3
+    mul       r1,  r2
+    add       r1,  r3
+    vld1.8    {d0[]},  [r1]
+    vld1.8    {d0[4]}, [r3], r2
+    vld1.8    {d0[5]}, [r3], r2
+    vld1.8    {d0[6]}, [r3], r2 //d0:{L3,L3,L3,L3,L0,L1,L2,L3}
+
+    vext.8    d1, d0, d0, #1
+    vaddl.u8  q2, d0, d1        //q2:{L3+L3,L3+L3,L3+L3,L3+L0,L0+L1,L1+L2,L2+L3,L3+L3}
+
+    vext.u8   d2, d5, d4, #2
+    vadd.u16  d3, d2, d5        //d3:{L0+L1+L1+L2,L1+L2+L2+L3,L2+L3+L3+L3,L3+L3+L3+L3}
+
+    //Calculate the hu0 ~ hu5
+    vqrshrn.u16 d2, q2, #1
+    vqrshrn.u16 d1, q1, #2
+
+    //Adjust the data sequence for setting the luma MB
+    vzip.8   d2, d1
+    vst1.32  d1[0], [r0]!
+    vext.8   d2, d1, d1, #2
+    vst1.32  d2[0], [r0]!
+    vst1.32  d1[1], [r0]!
+    vst1.32  d0[0], [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsI4x4LumaPredHD_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the data
+    sub       r3,  r1, r2
+    sub       r3,  #1
+    vld1.32   {d0[1]}, [r3], r2
+    vld1.8    {d0[3]}, [r3], r2
+    vld1.8    {d0[2]}, [r3], r2
+    vld1.8    {d0[1]}, [r3], r2
+    vld1.8    {d0[0]}, [r3]     //d0:{L3,L2,L1,L0,LT,T0,T1,T2}
+
+
+    vext.8    d1, d0, d0, #7
+    vaddl.u8  q1, d0, d1        //q1:{x,L3+L2,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2}
+
+    vext.u8   q2, q1, q1, #14   //q2:{x,x, L3+L2,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1}
+    vadd.u16  q3, q2, q1        //q3:{x,x,L3+L2+L2+L1,L2+L1+L1+L0,L1+L0+L0+LT,L0+LT+LT+T0,LT+T0+T0+T1,T0+T1+T1+T2}
+
+    //Calculate the hd0~hd9
+    vqrshrn.u16 d1, q3, #2
+    vqrshrn.u16 d0, q2, #1
+
+    //Adjust the data sequence for setting the luma MB
+    vmov      d3, d1
+    vtrn.8    d0, d1
+    vext.u8   d2, d1, d1, #6
+    vst2.16  {d2[3], d3[3]}, [r0]!
+    vst2.16  {d0[2], d1[2]}, [r0]!
+    vmov     d3, d0
+    vst2.16  {d2[2], d3[2]}, [r0]!
+    vst2.16  {d0[1], d1[1]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIChromaPredV_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Get the top row (8 byte)
+    sub  r3, r1, r2
+    vldr d0, [r3]
+
+    //Set the chroma MB using top row data
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d0}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIChromaPredH_neon
+    //stmdb sp!, { r2-r5, lr}
+    ////Get the left column (8 byte)
+    sub  r3, r1, #1
+    vld1.8 {d0[]}, [r3], r2
+    vld1.8 {d1[]}, [r3], r2
+    vld1.8 {d2[]}, [r3], r2
+    vld1.8 {d3[]}, [r3], r2
+    vld1.8 {d4[]}, [r3], r2
+    vld1.8 {d5[]}, [r3], r2
+    vld1.8 {d6[]}, [r3], r2
+    vld1.8 {d7[]}, [r3]
+
+    //Set the chroma MB using left column data
+    vst1.8 {d0}, [r0]!
+    vst1.8 {d1}, [r0]!
+    vst1.8 {d2}, [r0]!
+    vst1.8 {d3}, [r0]!
+    vst1.8 {d4}, [r0]!
+    vst1.8 {d5}, [r0]!
+    vst1.8 {d6}, [r0]!
+    vst1.8 {d7}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIChromaPredDc_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the left column data (8 bytes)
+    sub r3, r1, #1
+    GET_8BYTE_DATA d0, r3, r2
+
+    //Load the top row data (8 bytes)
+    sub  r3, r1, r2
+    vldr d1, [r3]
+
+    //Calculate the sum of left column and top row
+    vpaddl.u8  q0, q0
+    vpaddl.u16 q0, q0
+    vadd.u32   d2, d0, d1 //'m1' save to d2
+
+    vrshr.u32  q0, q0, #2 //calculate 'm2','m3'
+    vrshr.u32  d2, d2, #3 //calculate 'm4'
+
+    //duplicate the 'mx' to a vector line
+    vdup.8     d4, d2[0]
+    vdup.8     d5, d1[4]
+    vdup.8     d6, d0[4]
+    vdup.8     d7, d2[4]
+
+    //Set the chroma MB
+    vst2.32 {d4[0],d5[0]}, [r0]!
+    vst2.32 {d4[0],d5[0]}, [r0]!
+    vst2.32 {d4[0],d5[0]}, [r0]!
+    vst2.32 {d4[0],d5[0]}, [r0]!
+    vst2.32 {d6[0],d7[0]}, [r0]!
+    vst2.32 {d6[0],d7[0]}, [r0]!
+    vst2.32 {d6[0],d7[0]}, [r0]!
+    vst2.32 {d6[0],d7[0]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+//Table {{1,2,3,4,1,2,3,4}*17}
+CONST0_GET_I_CHROMA_PRED_PLANE: .long 0x44332211, 0x44332211//0x140f0a05, 0x28231e19
+//Table {-3,-2,-1,0,1,2,3,4}
+CONST1_GET_I_CHROMA_PRED_PLANE: .long 0xfffefffd, 0x0000ffff,0x00020001,0x00040003
+
+WELS_ASM_FUNC_BEGIN WelsIChromaPredPlane_neon
+    //stmdb sp!, { r2-r5, lr}
+    //Load the top row data
+    sub  r3, r1, #1
+    sub  r3, r2
+    vld1.32 {d1[0]}, [r3]
+    add  r3, #5
+    vld1.32 {d0[0]}, [r3]
+
+    //Load the left column data
+    sub  r3, #5
+    vld1.8 {d1[4]}, [r3], r2
+    vld1.8 {d1[5]}, [r3], r2
+    vld1.8 {d1[6]}, [r3], r2
+    vld1.8 {d1[7]}, [r3], r2 //d1:{LT,T0,T1,T2,LT,L0,L1,L2}
+    add  r3, r2
+    vld1.8 {d0[4]}, [r3], r2
+    vld1.8 {d0[5]}, [r3], r2
+    vld1.8 {d0[6]}, [r3], r2
+    vld1.8 {d0[7]}, [r3]     //d0:{T4,T5,T6,T7,L4,L5,L6.L7}
+
+
+    //Save T7 to d3 for next step
+    vdup.u8   d3,   d0[3]
+    //Save L7 to d4 for next step
+    vdup.u8   d4,   d0[7]
+
+    //Calculate the value of 'a' and save to q2
+    vaddl.u8  q2, d3, d4
+    vshl.u16  q2, #4
+
+    //Load the table {{1,2,3,4,1,2,3,4}*17}
+    adr r3, CONST0_GET_I_CHROMA_PRED_PLANE
+    vld1.32   {d2}, [r3]
+
+    //Calculate the 'b','c', and save to q0
+    vrev32.8  d1, d1
+    vsubl.u8  q0, d0, d1
+    vmovl.u8   q1, d2
+    vmul.s16   q0, q1
+    vpaddl.s16 q0, q0
+    vpaddl.s32 q0, q0
+    vrshr.s64  q0, #5
+
+    //Load the table {-3,-2,-1,0,1,2,3,4} to q3
+    adr r3, CONST1_GET_I_CHROMA_PRED_PLANE
+    vld1.32   {d6, d7}, [r3]
+
+    //Duplicate the 'b','c' to q0, q1 for SIMD instruction
+    vdup.s16   q1, d1[0]
+    vdup.s16   q0, d0[0]
+
+    //Calculate the "(a + b * (j - 3) + c * (- 3) + 16) >> 5;"
+    vmla.s16   q2, q0, q3
+    vmla.s16   q2, q1, d6[0]
+    vqrshrun.s16 d0, q2, #5
+
+    //Set a line of chroma MB
+    vst1.u32  {d0}, [r0]!
+
+    //Do the same processing for each line.
+    mov  r3, #7
+loop_0_get_i_chroma_pred_plane:
+    vadd.s16   q2, q1
+    vqrshrun.s16 d0, q2, #5
+    vst1.u32  {d0}, [r0]!
+    subs  r3, #1
+    bne  loop_0_get_i_chroma_pred_plane
+
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
new file mode 100644
index 0000000000..98498d4fb7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/intra_pred_sad_3_opt_neon.S
@@ -0,0 +1,735 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+ //The data sequence will be used
+.macro GET_8BYTE_DATA_L0 arg0, arg1, arg2
+    vld1.8 {\arg0[0]}, [\arg1], \arg2
+    vld1.8 {\arg0[1]}, [\arg1], \arg2
+    vld1.8 {\arg0[2]}, [\arg1], \arg2
+    vld1.8 {\arg0[3]}, [\arg1], \arg2
+    vld1.8 {\arg0[4]}, [\arg1], \arg2
+    vld1.8 {\arg0[5]}, [\arg1], \arg2
+    vld1.8 {\arg0[6]}, [\arg1], \arg2
+    vld1.8 {\arg0[7]}, [\arg1], \arg2
+.endm
+
+.macro HDM_TRANSFORM_4X4_L0 arg0, arg1, arg2,arg3, arg4, arg5, arg6, arg7, arg8
+
+    //Do the vertical transform
+    vaddl.u8 q0, \arg0, \arg1 //{0,4,8,12,1,5,9,13}
+    vsubl.u8 q1, \arg0, \arg1 //{2,6,10,14,3,7,11,15}
+    vswp  d1, d2
+    vadd.s16 q2, q0, q1 //{0,1,2,3,4,5,6,7}
+    vsub.s16 q1, q0, q1 //{12,13,14,15,8,9,10,11}
+
+    //Do the horizontal transform
+    vtrn.32 q2, q1
+    vadd.s16 q0, q2, q1
+    vsub.s16 q1, q2, q1
+
+    vtrn.16 q0, q1
+    vadd.s16 q2, q0, q1
+    vsub.s16 q1, q0, q1
+
+    vmov.s16 d0, d4
+    vmov.s16 d1, d2
+
+    vabs.s16 d3, d3
+
+    //16x16_v
+    vtrn.32 d0, d1 //{0,1,3,2}
+    vaba.s16 \arg5, d0, \arg2 //16x16_v
+    vaba.s16 \arg5, d1, \arg8
+    vaba.s16 \arg5, d5, \arg8
+    vadd.u16 \arg5, d3
+
+    //16x16_h
+    vtrn.16 d4, d5 //{0,4,12,8}
+    vaba.s16 \arg6, d4, \arg3 //16x16_h
+    vabs.s16 d2, d2
+    vabs.s16 d5, d5
+    vadd.u16 d2, d3
+    vadd.u16 d2, d5
+    vadd.u16 \arg6, d2
+
+    //16x16_dc_both
+    vaba.s16 \arg7, d4, \arg4 //16x16_dc_both
+    vadd.u16 \arg7, d2
+.endm
+
+WELS_ASM_FUNC_BEGIN WelsIntra16x16Combined3Satd_neon
+    stmdb sp!, {r4-r7, lr}
+    vpush {q4-q7}
+
+    //Get the top line data to 'q15'(16 bytes)
+    sub  r7, r0, r1
+    vld1.8 {q15}, [r7]
+
+    //Get the left colume data to 'q14' (16 bytes)
+    sub  r7, r0, #1
+    GET_8BYTE_DATA_L0 d28, r7, r1
+    GET_8BYTE_DATA_L0 d29, r7, r1
+
+    //Calculate the mean value and save to 'q13->d27(reserve the d26)' (2 bytes)
+    //Calculate the 16x16_dc_both mode SATD
+    vaddl.u8 q0, d30, d31
+    vaddl.u8 q1, d28, d29
+    vadd.u16 q0, q1
+    vadd.u16 d0, d1
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+
+    //Calculate the mean value
+    vrshr.u16  d0, #5
+    vshl.u16   d27, d0, #4
+
+
+    //Calculate the 16x16_v mode SATD and save to "q11, 12"
+    vshll.u8 q0, d30, #2
+    vshll.u8 q1, d31, #2
+    vtrn.32  q0, q1
+    vadd.s16 q2, q0, q1
+    vsub.s16 q1, q0, q1
+    vtrn.16  q2, q1
+    vadd.s16 q12, q2, q1
+    vsub.s16 q11, q2, q1
+    vtrn.32  q12, q11 //{0,1,3,2, 4,5,7,6} q12
+                      //{8,9,11,10, 12,13,15,14} q11
+    //Calculate the 16x16_h mode SATD and save to "q9, q10"
+    vshll.u8 q0, d28, #2
+    vshll.u8 q1, d29, #2
+    vtrn.32  q0, q1
+    vadd.s16 q2, q0, q1
+    vsub.s16 q1, q0, q1
+    vtrn.16  q2, q1
+    vadd.s16 q10, q2, q1
+    vsub.s16 q9,  q2, q1
+    vtrn.32  q10, q9  //{0,1,3,2, 4,5,7,6} q10
+                      //{8,9,11,10, 12,13,15,14} q9
+
+    vmov.i32 d17, #0//Save the SATD of DC_BOTH
+    vmov.i32 d16, #0//Save the SATD of H
+    vmov.i32 d15, #0//Save the SATD of V
+    vmov.i32 d14, #0//For zero D register
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {q3}, [r2], r3
+    vld1.32  {q4}, [r2], r3
+    vld1.32  {q5}, [r2], r3
+    vld1.32  {q6}, [r2], r3
+    vtrn.32  q3, q4
+    vtrn.32  q5, q6
+
+    HDM_TRANSFORM_4X4_L0 d6, d10, d24, d20, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d7, d11, d22, d20, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d8, d12, d25, d20, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d9, d13, d23, d20, d27, d15, d16, d17, d14
+
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {q3}, [r2], r3
+    vld1.32  {q4}, [r2], r3
+    vld1.32  {q5}, [r2], r3
+    vld1.32  {q6}, [r2], r3
+    vtrn.32  q3, q4
+    vtrn.32  q5, q6
+
+    HDM_TRANSFORM_4X4_L0 d6, d10, d24, d21, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d7, d11, d22, d21, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d8, d12, d25, d21, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d9, d13, d23, d21, d27, d15, d16, d17, d14
+
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {q3}, [r2], r3
+    vld1.32  {q4}, [r2], r3
+    vld1.32  {q5}, [r2], r3
+    vld1.32  {q6}, [r2], r3
+    vtrn.32  q3, q4
+    vtrn.32  q5, q6
+
+    HDM_TRANSFORM_4X4_L0 d6, d10, d24, d18, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d7, d11, d22, d18, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d8, d12, d25, d18, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d9, d13, d23, d18, d27, d15, d16, d17, d14
+
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {q3}, [r2], r3
+    vld1.32  {q4}, [r2], r3
+    vld1.32  {q5}, [r2], r3
+    vld1.32  {q6}, [r2], r3
+    vtrn.32  q3, q4
+    vtrn.32  q5, q6
+
+    HDM_TRANSFORM_4X4_L0 d6, d10, d24, d19, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d7, d11, d22, d19, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d8, d12, d25, d19, d27, d15, d16, d17, d14
+    HDM_TRANSFORM_4X4_L0 d9, d13, d23, d19, d27, d15, d16, d17, d14
+
+    //Get the data from stack
+    ldr r5, [sp, #84] //the addr of Best_mode
+    ldr r6, [sp, #88] //the value of i_lambda
+
+    //vadd.u16   d24, d25
+    vrshr.u16  d15, #1
+    vpaddl.u16 d15, d15
+    vpaddl.u32 d15, d15
+    vmov.u32   r0, d15[0]
+
+    //vadd.u16   d22, d23
+    vrshr.u16  d16, #1
+    vpaddl.u16 d16, d16
+    vpaddl.u32 d16, d16
+    vmov.u32   r1, d16[0]
+    add  r1, r1, r6, lsl #1
+
+    //vadd.u16   d20, d21
+    vrshr.u16  d17, #1
+    vpaddl.u16 d17, d17
+    vpaddl.u32 d17, d17
+    vmov.u32   r2, d17[0]
+    add  r2, r2, r6, lsl #1
+
+    mov r4, #0
+    cmp r1, r0
+    movcc r0, r1
+    movcc r4, #1
+    cmp r2, r0
+    movcc r0, r2
+    movcc r4, #2
+
+    str r4, [r5]
+
+    vpop {q4-q7}
+    ldmia sp!, {r4-r7, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIntra16x16Combined3Sad_neon
+    stmdb sp!, {r4-r7, lr}
+
+    //Get the top line data to 'q15'(16 bytes)
+    sub  r4, r0, r1
+    vld1.8 {q15}, [r4]
+
+    //Get the left colume data to 'q14' (16 bytes)
+    sub  r4, r0, #1
+    GET_8BYTE_DATA_L0 d28, r4, r1
+    GET_8BYTE_DATA_L0 d29, r4, r1
+
+    //Calculate the mean value and save to 'q13' (8 bytes)
+    //Calculate the 16x16_dc_both mode SATD
+    vaddl.u8 q0, d30, d31
+    vaddl.u8 q1, d28, d29
+    vadd.u16 q0, q1
+    vadd.u16 d0, d1
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+
+    //Calculate the mean value
+    vrshr.u16  d0, d0, #5
+    vdup.8     q13, d0[0]
+
+    sub  r4, r0, #1
+
+    vmov.i32 q12, #0//Save the SATD of DC_BOTH
+    vmov.i32 q11, #0//Save the SATD of H
+    vmov.i32 q10, #0//Save the SATD of V
+
+    mov lr, #16
+sad_intra_16x16_x3_opt_loop0:
+    //Get the left colume data to 'd0' (16 bytes)
+    vld1.8 {d0[]}, [r4], r1
+
+    //Load the p_enc data and save to "q1 ~ q2"--- 16X4 bytes
+    vld1.8  {q1}, [r2], r3
+
+    subs lr, #1
+    //Do the SAD for top colume
+    vabal.u8  q12, d30, d2
+    vabal.u8  q12, d31, d3
+
+    //Do the SAD for left colume
+    vabal.u8  q11, d0, d2
+    vabal.u8  q11, d0, d3
+
+    //Do the SAD for mean value
+    vabal.u8  q10, d26, d2
+    vabal.u8  q10, d26, d3
+
+    bne sad_intra_16x16_x3_opt_loop0
+
+    //Get the data from stack
+    ldr r5, [sp, #20] //the addr of Best_mode
+    ldr r6, [sp, #24] //the value of i_lambda
+
+    vadd.u16   d24, d25
+    vpaddl.u16 d24, d24
+    vpaddl.u32 d24, d24
+    vmov.u32   r0, d24[0]
+
+    vadd.u16   d22, d23
+    vpaddl.u16 d22, d22
+    vpaddl.u32 d22, d22
+    vmov.u32   r1, d22[0]
+    add  r1, r1, r6, lsl #1
+
+    vadd.u16   d20, d21
+    vpaddl.u16 d20, d20
+    vpaddl.u32 d20, d20
+    vmov.u32   r2, d20[0]
+    add  r2, r2, r6, lsl #1
+
+    mov r4, #0
+    cmp r1, r0
+    movcc r0, r1
+    movcc r4, #1
+    cmp r2, r0
+    movcc r0, r2
+    movcc r4, #2
+
+    str r4, [r5]
+
+    ldmia sp!, {r4-r7, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIntra8x8Combined3Sad_neon
+    stmdb sp!, {r4-r7, lr}
+
+    //Get the data from stack
+    ldr r4, [sp, #32] //p_dec_cr
+    ldr r5, [sp, #36] //p_enc_cr
+
+    //Get the left colume data to 'd28(cb), d30(cr)' (16 bytes)
+    sub  r6, r0, #1
+    GET_8BYTE_DATA_L0 d28, r6, r1
+    sub  r6, r4, #1
+    GET_8BYTE_DATA_L0 d30, r6, r1
+
+    //Get the top line data to 'd29(cb), d31(cr)'(16 bytes)
+    sub  r6, r0, r1
+    vld1.8 {d29}, [r6]
+    sub  r6, r4, r1
+    vld1.8 {d31}, [r6]
+
+    //Calculate the sum of left column and top row
+    vmov.i32   q0, q14
+    vpaddl.u8  q0, q0
+    vpaddl.u16 q0, q0
+    vadd.u32   d2, d0, d1 //'m1' save to d2
+    vrshr.u32  q0, q0, #2 //calculate 'm2','m3'
+    vrshr.u32  d2, d2, #3 //calculate 'm4'
+
+    //duplicate the 'mx' to a vector line
+    vdup.8     d27, d2[0]
+    vdup.8     d26, d1[4]
+    vtrn.32    d27, d26
+
+    vdup.8     d26, d0[4]
+    vdup.8     d25, d2[4]
+    vtrn.32    d26, d25   //Save to "d27, d26"
+
+    vmov.i32   q0, q15
+    vpaddl.u8  q0, q0
+    vpaddl.u16 q0, q0
+    vadd.u32   d2, d0, d1 //'m1' save to d2
+    vrshr.u32  q0, q0, #2 //calculate 'm2','m3'
+    vrshr.u32  d2, d2, #3 //calculate 'm4'
+
+    //duplicate the 'mx' to a vector line
+    vdup.8     d25, d2[0]
+    vdup.8     d24, d1[4]
+    vtrn.32    d25, d24
+
+    vdup.8     d24, d0[4]
+    vdup.8     d23, d2[4]
+    vtrn.32    d24, d23   //Save to "d25, d24"
+
+    vmov.i32 q11, #0//Save the SATD of DC_BOTH
+    vmov.i32 q10, #0//Save the SATD of H
+    vmov.i32 q9 , #0//Save the SATD of V
+    sub  r6, r0, #1
+    sub  r7, r4, #1
+    mov lr, #4
+sad_intra_8x8_x3_opt_loop0:
+
+    //Load the p_enc data and save to "q1 ~ q2"--- 16X4 bytes
+    vld1.8  {d0}, [r2], r3
+    vld1.8  {d1}, [r5], r3
+
+    //Get the left colume data to 'd0' (16 bytes)
+    vld1.8 {d2[]}, [r6], r1
+    vld1.8 {d3[]}, [r7], r1
+
+    subs lr, #1
+
+
+    //Do the SAD for top colume
+    vabal.u8  q11, d29, d0
+    vabal.u8  q11, d31, d1
+
+    //Do the SAD for left colume
+    vabal.u8  q10, d2, d0
+    vabal.u8  q10, d3, d1
+
+    //Do the SAD for mean value
+    vabal.u8  q9, d27, d0
+    vabal.u8  q9, d25, d1
+
+
+    bne sad_intra_8x8_x3_opt_loop0
+
+    mov lr, #4
+sad_intra_8x8_x3_opt_loop1:
+
+    //Load the p_enc data and save to "q1 ~ q2"--- 16X4 bytes
+    vld1.8  {d0}, [r2], r3
+    vld1.8  {d1}, [r5], r3
+
+    //Get the left colume data to 'd0' (16 bytes)
+    vld1.8 {d2[]}, [r6], r1
+    vld1.8 {d3[]}, [r7], r1
+
+    subs lr, #1
+
+
+    //Do the SAD for top colume
+    vabal.u8  q11, d29, d0
+    vabal.u8  q11, d31, d1
+
+    //Do the SAD for left colume
+    vabal.u8  q10, d2, d0
+    vabal.u8  q10, d3, d1
+
+    //Do the SAD for mean value
+    vabal.u8  q9, d26, d0
+    vabal.u8  q9, d24, d1
+
+
+    bne sad_intra_8x8_x3_opt_loop1
+    //Get the data from stack
+    ldr r5, [sp, #20] //the addr of Best_mode
+    ldr r6, [sp, #24] //the value of i_lambda
+
+    vadd.u16   d22, d23
+    vpaddl.u16 d22, d22
+    vpaddl.u32 d22, d22
+    vmov.u32   r0, d22[0]
+    add  r0, r0, r6, lsl #1
+
+    vadd.u16   d20, d21
+    vpaddl.u16 d20, d20
+    vpaddl.u32 d20, d20
+    vmov.u32   r1, d20[0]
+    add  r1, r1, r6, lsl #1
+
+    vadd.u16   d18, d19
+    vpaddl.u16 d18, d18
+    vpaddl.u32 d18, d18
+    vmov.u32   r2, d18[0]
+
+    mov r4, #2
+    cmp r1, r0
+    movcc r0, r1
+    movcc r4, #1
+    cmp r2, r0
+    movcc r0, r2
+    movcc r4, #0
+
+    str r4, [r5]
+
+    ldmia sp!, {r4-r7, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIntra8x8Combined3Satd_neon
+    stmdb sp!, {r4-r7, lr}
+    vpush {q4-q7}
+
+    //Get the data from stack
+    ldr r4, [sp, #96] //p_dec_cr
+    ldr r5, [sp, #100] //p_enc_cr
+
+    //Get the top line data to 'd29(cb), d31(cr)'(16 bytes)
+    sub  r6, r0, r1
+    vld1.8 {d29}, [r6]
+    sub  r6, r4, r1
+    vld1.8 {d31}, [r6]
+
+    //Get the left colume data to 'd28(cb), d30(cr)' (16 bytes)
+    sub  r6, r0, #1
+    GET_8BYTE_DATA_L0 d28, r6, r1
+    sub  r6, r4, #1
+    GET_8BYTE_DATA_L0 d30, r6, r1
+
+    //Calculate the 16x16_v mode SATD and save to "q12, 13"
+    vshll.u8 q0, d29, #2
+    vshll.u8 q1, d31, #2
+    vtrn.32  q0, q1
+    vadd.s16 q2, q0, q1
+    vsub.s16 q1, q0, q1
+    vtrn.16  q2, q1
+    vadd.s16 q13, q2, q1
+    vsub.s16 q12, q2, q1
+    vtrn.32  q13, q12 //{0,1,3,2, 4,5,7,6} q13
+                      //{8,9,11,10, 12,13,15,14} q12
+    //Calculate the 16x16_h mode SATD and save to "q10, q11"
+    vshll.u8 q0, d28, #2
+    vshll.u8 q1, d30, #2
+    vtrn.32  q0, q1
+    vadd.s16 q2, q0, q1
+    vsub.s16 q1, q0, q1
+    vtrn.16  q2, q1
+    vadd.s16 q11, q2, q1
+    vsub.s16 q10,  q2, q1
+    vtrn.32  q11, q10  //{0,1,3,2, 4,5,7,6} q11
+                       //{8,9,11,10, 12,13,15,14} q10
+
+    //Calculate the sum of left column and top row
+    //vmov.i32   q0, q14
+    vpaddl.u8  q0, q14
+    vpaddl.u16 q0, q0
+    vadd.u32   d2, d0, d1
+
+    vpaddl.u8  q2, q15
+    vpaddl.u16 q2, q2
+    vadd.u32   d3, d4, d5
+
+    vtrn.32    q0, q2
+    vrshr.u32  q1, #3
+    vrshr.u32  q2, #2
+    vshll.u32  q9, d4, #4 // {2cb, 2cr} q9
+    vshll.u32  q8, d5, #4 // {1cb, 1cr} q8
+    vshll.u32  q7, d2, #4 // {0cb, 3cb} q7
+    vshll.u32  q6, d3, #4 // {0cr, 3cr} q6
+
+
+    vmov.i32 d28, #0//Save the SATD of DC_BOTH
+    vmov.i32 d10, #0//Save the SATD of H
+    vmov.i32 d11, #0//Save the SATD of V
+    vmov.i32 d30, #0//For zero D register
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {d6}, [r2], r3
+    vld1.32  {d7}, [r2], r3
+    vld1.32  {d8}, [r2], r3
+    vld1.32  {d9}, [r2], r3
+    vtrn.32  d6, d7
+    vtrn.32  d8, d9
+    HDM_TRANSFORM_4X4_L0 d6, d8, d26, d22, d14, d11, d10, d28, d30
+    HDM_TRANSFORM_4X4_L0 d7, d9, d27, d22, d16, d11, d10, d28, d30
+
+    vld1.32  {d6}, [r5], r3
+    vld1.32  {d7}, [r5], r3
+    vld1.32  {d8}, [r5], r3
+    vld1.32  {d9}, [r5], r3
+    vtrn.32  d6, d7
+    vtrn.32  d8, d9
+    HDM_TRANSFORM_4X4_L0 d6, d8, d24, d20, d12, d11, d10, d28, d30
+    HDM_TRANSFORM_4X4_L0 d7, d9, d25, d20, d17, d11, d10, d28, d30
+
+    //Load the p_enc data and save to "q3 ~ q6"--- 16X4 bytes
+    vld1.32  {d6}, [r2], r3
+    vld1.32  {d7}, [r2], r3
+    vld1.32  {d8}, [r2], r3
+    vld1.32  {d9}, [r2], r3
+    vtrn.32  d6, d7
+    vtrn.32  d8, d9
+    HDM_TRANSFORM_4X4_L0 d6, d8, d26, d23, d18, d11, d10, d28, d30
+    HDM_TRANSFORM_4X4_L0 d7, d9, d27, d23, d15, d11, d10, d28, d30
+
+    vld1.32  {d6}, [r5], r3
+    vld1.32  {d7}, [r5], r3
+    vld1.32  {d8}, [r5], r3
+    vld1.32  {d9}, [r5], r3
+    vtrn.32  d6, d7
+    vtrn.32  d8, d9
+    HDM_TRANSFORM_4X4_L0 d6, d8, d24, d21, d19, d11, d10, d28, d30
+    HDM_TRANSFORM_4X4_L0 d7, d9, d25, d21, d13, d11, d10, d28, d30
+
+    //Get the data from stack
+    ldr r5, [sp, #84] //the addr of Best_mode
+    ldr r6, [sp, #88] //the value of i_lambda
+
+    vrshr.u16  d11, #1
+    vpaddl.u16 d11, d11
+    vpaddl.u32 d11, d11
+    vmov.u32   lr, d11[0]
+    add  lr, lr, r6, lsl #1
+
+    vrshr.u16  d10, #1
+    vpaddl.u16 d10, d10
+    vpaddl.u32 d10, d10
+    vmov.u32   r3, d10[0]
+    add  r3, r3, r6, lsl #1
+
+    vrshr.u16  d28, #1
+    vpaddl.u16 d28, d28
+    vpaddl.u32 d28, d28
+    vmov.u32   r2, d28[0]
+
+    mov r6, #2
+    cmp r3, lr
+    movcc lr, r3
+    movcc r6, #1
+    cmp r2, lr
+    movcc lr, r2
+    movcc r6, #0
+
+    str r6, [r5]
+    mov r0, lr
+
+    vpop {q4-q7}
+    ldmia sp!, {r4-r7, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIntra4x4Combined3Satd_neon
+    stmdb sp!, {r4-r7, lr}
+
+    //Get the top line data to 'd31[0~3]'(4 bytes)
+    sub  r7, r0, r1
+    vld1.32 {d31[0]}, [r7]
+
+    //Get the left colume data to 'd31[4~7]' (4 bytes)
+    sub  r7, r0, #1
+    vld1.8 {d31[4]}, [r7], r1
+    vld1.8 {d31[5]}, [r7], r1
+    vld1.8 {d31[6]}, [r7], r1
+    vld1.8 {d31[7]}, [r7], r1
+
+    //Calculate the mean value and save to 'd30' (2 bytes)
+    vpaddl.u8 d0, d31
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+    //Calculate the mean value
+    vrshr.u16  d0, #3
+    vshl.u16   d30, d0, #4
+
+    //Calculate the 16x16_v mode SATD and save to "d29"
+    //Calculate the 16x16_h mode SATD and save to "d28"
+    vshll.u8 q0, d31, #2
+    vtrn.32  d0, d1
+    vadd.s16 d2, d0, d1
+    vsub.s16 d1, d0, d1
+    vtrn.16  d2, d1
+    vadd.s16 d29, d2, d1
+    vsub.s16 d28, d2, d1
+    vtrn.32  d29, d28 //{0,1,3,2 top} d29
+                      //{0,1,3,2 left} d28
+
+    vmov.i32 d27, #0//Save the SATD of DC_BOTH
+    vmov.i32 d26, #0//Save the SATD of H
+    vmov.i32 d25, #0//Save the SATD of V
+    vmov.i32 d24, #0//For zero D register
+
+    //Load the p_enc data and save to "d22,d23"--- 4X4 bytes
+    vld1.32  {d23[0]}, [r2], r3
+    vld1.32  {d23[1]}, [r2], r3
+    vld1.32  {d22[0]}, [r2], r3
+    vld1.32  {d22[1]}, [r2], r3
+
+    HDM_TRANSFORM_4X4_L0 d23, d22, d29, d28, d30, d25, d26, d27, d24
+
+    //Get the data from stack
+    ldr r5, [sp, #28] //the value of lambda2
+    ldr r6, [sp, #32] //the value of lambda1
+    ldr r7, [sp, #36] //the value of lambda0
+
+    vrshr.u16  d25, #1
+    vpaddl.u16 d25, d25
+    vpaddl.u32 d25, d25
+    vmov.u32   r0, d25[0]
+    add  r0, r7
+
+    vrshr.u16  d26, #1
+    vpaddl.u16 d26, d26
+    vpaddl.u32 d26, d26
+    vmov.u32   r1, d26[0]
+    add  r1, r6
+
+    vrshr.u16  d27, #1
+    vpaddl.u16 d27, d27
+    vpaddl.u32 d27, d27
+    vmov.u32   r2, d27[0]
+    add  r2, r5
+
+    ldr r5, [sp, #20] //p_dst
+    ldr r6, [sp, #24] //the addr of Best_mode
+
+    mov r4, r0
+    cmp r1, r4
+    movcc r4, r1
+    cmp r2, r4
+    movcc r4, r2
+
+    //The compare sequence affect the resule
+    cmp r4, r2
+    bne satd_intra_4x4_x3_opt_jump0
+    mov r0, #2
+    str r0, [r6]
+    vshr.u32  d0, d30, #4 // {2cb, 2cr} q9
+    vdup.8 q1, d0[0]
+    vst1.8 {q1}, [r5]
+    //...
+    bl satd_intra_4x4_x3_opt_end
+satd_intra_4x4_x3_opt_jump0:
+
+    cmp r4, r1
+    bne satd_intra_4x4_x3_opt_jump1
+    mov r0, #1
+    str r0, [r6]
+    vdup.8 d0, d31[4]
+    vdup.8 d1, d31[5]
+    vdup.8 d2, d31[6]
+    vdup.8 d3, d31[7]
+    vst4.32 {d0[0],d1[0],d2[0],d3[0]}, [r5]
+
+    bl satd_intra_4x4_x3_opt_end
+satd_intra_4x4_x3_opt_jump1:
+
+    mov r0, #0
+    str r0, [r6]
+    vst1.32 {d31[0]}, [r5]!
+    vst1.32 {d31[0]}, [r5]!
+    vst1.32 {d31[0]}, [r5]!
+    vst1.32 {d31[0]}, [r5]!
+
+
+satd_intra_4x4_x3_opt_end:
+    mov r0, r4
+
+    ldmia sp!, {r4-r7, lr}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/memory_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/memory_neon.S
new file mode 100644
index 0000000000..0088727c8b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/memory_neon.S
@@ -0,0 +1,62 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+WELS_ASM_FUNC_BEGIN WelsSetMemZero_neon
+    veor q0, q0
+    cmp r1, #32
+    beq mem_zero_32_neon_start
+    blt mem_zero_24_neon_start
+
+mem_zero_loop:
+    subs r1, r1, #64
+    vst1.64 {q0}, [r0]!
+    vst1.64 {q0}, [r0]!
+    vst1.64 {q0}, [r0]!
+    vst1.64 {q0}, [r0]!
+    bne mem_zero_loop
+    bx lr
+
+mem_zero_32_neon_start:
+    vst1.64 {q0}, [r0]!
+    vst1.64 {q0}, [r0]!
+    bx lr
+
+mem_zero_24_neon_start:
+    vst1.64 {q0}, [r0]!
+    vst1.64 {d0}, [r0]!
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/pixel_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/pixel_neon.S
new file mode 100644
index 0000000000..1a93d6c2c4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/pixel_neon.S
@@ -0,0 +1,882 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro SATD_16x4
+    vld1.64     {q0}, [r0,:128], r1
+    vld1.64     {q1}, [r2], r3
+
+    vsubl.u8    q8,  d0,  d2
+    vld1.64     {q2}, [r0,:128], r1
+
+    vsubl.u8    q10, d1,  d3
+    vld1.64     {q3}, [r2], r3
+
+    vsubl.u8    q9,  d4,  d6
+    vld1.64     {q0}, [r0,:128], r1
+
+    vsubl.u8    q11, d5,  d7
+    vld1.64     {q1}, [r2], r3
+
+    vsubl.u8    q12, d0,  d2
+    vld1.64     {q2}, [r0,:128], r1
+
+    vsubl.u8    q14, d1,  d3
+    vadd.s16    q0,  q8,  q9
+
+    vld1.64     {q3}, [r2], r3
+    vsub.s16    q1,  q8,  q9
+
+    vsubl.u8    q13, d4,  d6
+    vsubl.u8    q15, d5,  d7
+
+    vadd.s16    q2, q12, q13
+    vsub.s16    q3, q12, q13
+
+    vadd.s16    q8, q10, q11
+    vsub.s16    q9, q10, q11
+
+    vadd.s16    q10, q14, q15
+    vsub.s16    q11, q14, q15
+
+    vadd.s16    q12, q0, q2
+    vsub.s16    q14, q0, q2
+
+    vadd.s16    q13, q8, q10
+    vsub.s16    q15, q8, q10
+
+    vsub.s16    q0, q1, q3
+    vadd.s16    q2, q1, q3
+
+    vsub.s16    q1, q9, q11
+    vadd.s16    q3, q9, q11
+
+    vtrn.16 q12, q14
+    vtrn.16 q13, q15
+
+    vadd.s16 q8, q12, q14
+    vabd.s16 q10, q12, q14
+
+    vadd.s16 q9, q13, q15
+    vabd.s16 q11, q13, q15
+
+    vabs.s16 q8, q8
+    vabs.s16 q9, q9
+
+    vtrn.16 q0, q2
+    vtrn.16 q1, q3
+
+    vadd.s16 q12, q0, q2
+    vabd.s16 q14, q0, q2
+
+    vadd.s16 q13, q1, q3
+    vabd.s16 q15, q1, q3
+
+    vabs.s16 q12, q12
+    vabs.s16 q13, q13
+
+    vtrn.32 q8, q10
+    vtrn.32 q9, q11
+
+    vtrn.32 q12, q14
+    vtrn.32 q13, q15
+
+    vmax.s16    q0, q8,  q10
+    vmax.s16    q1, q9,  q11
+    vmax.s16    q2, q12,  q14
+    vmax.s16    q3, q13,  q15
+
+    vadd.u16 q0, q0, q1
+    vadd.u16 q2, q2, q3
+.endm
+
+.macro SATD_8x4
+
+    vld1.64     {d0}, [r0,:64], r1
+    vld1.64     {d1}, [r2], r3
+
+    vld1.64     {d2}, [r0,:64], r1
+    vsubl.u8    q8, d0, d1
+
+    vld1.64     {d3}, [r2], r3
+    vsubl.u8    q9, d2, d3
+
+    vld1.64     {d4}, [r0,:64], r1
+    vld1.64     {d5}, [r2], r3
+
+    vadd.s16    q12, q8, q9
+    vsubl.u8    q10, d4, d5
+
+    vld1.64     {d6}, [r0,:64], r1
+    vld1.64     {d7}, [r2], r3
+
+    vsubl.u8    q11, d6,  d7
+    vsub.s16    q13, q8, q9
+
+    vadd.s16    q14, q10, q11
+    vsub.s16    q15, q10, q11
+
+    vadd.s16    q0, q12, q14
+    vsub.s16    q1, q12, q14
+
+    vsub.s16    q2, q13, q15
+    vadd.s16    q3, q13, q15
+
+    vtrn.16     q0, q1
+    vtrn.16     q2, q3
+
+    vadd.s16    q8, q0, q1
+    vabd.s16    q9, q0, q1
+
+    vabs.s16    q8, q8
+    vadd.s16    q10, q2, q3
+
+    vabd.s16    q11, q2, q3
+    vabs.s16    q10, q10
+
+    vtrn.32     q8, q9
+    vtrn.32     q10, q11
+
+    vmax.s16    q0, q8, q9
+    vmax.s16    q1, q10, q11
+.endm
+
+.macro SAD_16x4
+    vld1.64 {q6}, [r0, :128], r1
+    vabal.u8 q10, d8, d10
+
+    vld1.64 {q7}, [r2], r3
+    vabal.u8 q11, d9, d11
+
+    vld1.64 {q0}, [r0, :128], r1
+    vabal.u8 q12, d12, d14
+
+    vld1.64 {q1}, [r2], r3
+    vabal.u8 q13, d13, d15
+
+    vld1.64 {q2}, [r0, :128], r1
+    vabal.u8 q10, d0, d2
+
+    vld1.64 {q3}, [r2], r3
+    vabal.u8 q11, d1, d3
+
+    vld1.64 {q4}, [r0, :128], r1
+    vabal.u8 q12, d4, d6
+
+    vld1.64 {q5}, [r2], r3
+    vabal.u8 q13, d5, d7
+.endm
+
+.macro SAD_8x4
+    vld1.64 {d0}, [r0, :64], r1
+    vld1.64 {d1}, [r2], r3
+
+    vabal.u8 q10, d0, d1
+    vld1.64 {d2}, [r0, :64], r1
+
+    vld1.64 {d3}, [r2], r3
+    vabal.u8 q11, d2, d3
+
+    vld1.64 {d4}, [r0, :64], r1
+    vld1.64 {d5}, [r2], r3
+
+    vabal.u8 q12, d4, d5
+    vld1.64 {d6}, [r0, :64], r1
+
+    vld1.64 {d7}, [r2], r3
+    vabal.u8 q13, d6, d7
+.endm
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSad16x16_neon
+    vpush {q4-q7}
+
+    vld1.64 {q0}, [r0, :128], r1
+    vld1.64 {q1}, [r2], r3
+
+    vabdl.u8 q10, d0, d2
+    vld1.64 {q2}, [r0, :128], r1
+
+    vabdl.u8 q11, d1, d3
+    vld1.64 {q3}, [r2], r3
+
+    vld1.64 {q4}, [r0, :128], r1
+    vabdl.u8 q12, d4, d6
+    vld1.64 {q5}, [r2], r3
+    vabdl.u8 q13, d5, d7
+
+    SAD_16x4
+    SAD_16x4
+    SAD_16x4
+
+    vld1.64 {q6}, [r0, :128], r1
+    vabal.u8 q10, d8, d10
+
+    vld1.64 {q7}, [r2], r3
+    vabal.u8 q11, d9, d11
+
+    vabal.u8 q12, d12, d14
+    vabal.u8 q13, d13, d15
+
+    vadd.u16 q14, q10, q11
+    vadd.u16 q15, q12, q13
+
+    vadd.u16 q15, q14, q15
+    vadd.u16 d0, d30, d31
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+    vmov.u32   r0, d0[0]
+
+    vpop {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSad16x8_neon
+    vpush {q4-q7}
+
+    vld1.64 {q0}, [r0, :128], r1
+    vld1.64 {q1}, [r2], r3
+
+    vabdl.u8 q10, d0, d2
+    vld1.64 {q2}, [r0, :128], r1
+
+    vabdl.u8 q11, d1, d3
+    vld1.64 {q3}, [r2], r3
+
+    vld1.64 {q4}, [r0, :128], r1
+    vabdl.u8 q12, d4, d6
+    vld1.64 {q5}, [r2], r3
+    vabdl.u8 q13, d5, d7
+
+    SAD_16x4
+
+    vld1.64 {q6}, [r0, :128], r1
+    vabal.u8 q10, d8, d10
+
+    vld1.64 {q7}, [r2], r3
+    vabal.u8 q11, d9, d11
+
+    vabal.u8 q12, d12, d14
+    vabal.u8 q13, d13, d15
+
+    vadd.u16 q14, q10, q11
+    vadd.u16 q15, q12, q13
+
+    vadd.u16 q15, q14, q15
+    vadd.u16 d0, d30, d31
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+    vmov.u32   r0, d0[0]
+    vpop {q4-q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSad8x16_neon
+
+    vld1.64 {d0}, [r0, :64], r1
+    vld1.64 {d1}, [r2], r3
+
+    vabdl.u8 q10, d0, d1
+    vld1.64 {d2}, [r0, :64], r1
+
+    vld1.64 {d3}, [r2], r3
+    vabdl.u8 q11, d2, d3
+
+    vld1.64 {d4}, [r0, :64], r1
+    vld1.64 {d5}, [r2], r3
+
+    vabdl.u8 q12, d4, d5
+    vld1.64 {d6}, [r0, :64], r1
+
+    vld1.64 {d7}, [r2], r3
+    vabdl.u8 q13, d6, d7
+
+    SAD_8x4
+    SAD_8x4
+    SAD_8x4
+
+    vadd.u16 q14, q10, q11
+    vadd.u16 q15, q12, q13
+    vadd.u16 q15, q15, q14
+    vadd.u16 d0, d30, d31
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+    vmov.u32   r0, d0[0]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSad8x8_neon
+
+    vld1.64 {d0}, [r0, :64], r1
+    vld1.64 {d1}, [r2], r3
+
+    vabdl.u8 q10, d0, d1
+    vld1.64 {d2}, [r0, :64], r1
+
+    vld1.64 {d3}, [r2], r3
+    vabdl.u8 q11, d2, d3
+
+    vld1.64 {d4}, [r0, :64], r1
+    vld1.64 {d5}, [r2], r3
+
+    vabdl.u8 q12, d4, d5
+    vld1.64 {d6}, [r0, :64], r1
+
+    vld1.64 {d7}, [r2], r3
+    vabdl.u8 q13, d6, d7
+
+    SAD_8x4
+
+    vadd.u16 q14, q10, q11
+    vadd.u16 q15, q12, q13
+    vadd.u16 q15, q15, q14
+    vadd.u16 d0, d30, d31
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+    vmov.u32   r0, d0[0]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSad4x4_neon
+    stmdb sp!, {r4-r5, lr}
+
+    //Loading a horizontal line data (4 bytes)
+    //line 0
+    ldr r4, [r0], r1
+    ldr r5, [r2], r3
+    usad8  lr, r4, r5
+
+    //line 1
+    ldr r4, [r0], r1
+    ldr r5, [r2], r3
+    usada8  lr, r4, r5, lr
+
+    //line 2
+    ldr r4, [r0], r1
+    ldr r5, [r2], r3
+    usada8  lr, r4, r5, lr
+
+    //line 3
+    ldr r4, [r0]
+    ldr r5, [r2]
+    usada8  r0, r4, r5, lr
+
+    ldmia sp!, {r4-r5, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSadFour16x16_neon
+
+    stmdb sp!, {r4-r5, lr}
+
+    //Generate the pix2 start addr
+    sub   r4, r2, #1
+    add   r5, r2, #1
+    sub   r2, r3
+
+    //Loading a horizontal line data (16 bytes)
+    vld1.8 {q0}, [r0], r1 //save pix1
+
+    vld1.8 {q1}, [r2], r3 //save pix2 - stride
+    vld1.8 {q10}, [r2], r3 //save pix2
+    vld1.8 {q2}, [r2], r3 //save pix2 + stride
+
+    vld1.8 {q3}, [r4], r3 //save pix2 - 1
+    vld1.8 {q8}, [r5], r3 //save pix2 + 1
+
+    //Do the SAD for 16 bytes
+    vabdl.u8  q15, d0, d2
+    vabal.u8  q15, d1, d3
+
+    vabdl.u8  q13, d0, d4
+    vabal.u8  q13, d1, d5
+
+    vabdl.u8  q11, d0, d6
+    vabal.u8  q11, d1, d7
+
+    vabdl.u8  q9, d0, d16
+    vabal.u8  q9, d1, d17
+
+    mov lr, #15
+pixel_sad_4_16x16_loop_0:
+
+    //Loading a horizontal line data (16 bytes)
+    vld1.8 {q0}, [r0], r1 //save pix1
+    vmov.8 q1,   q10      //save pix2 - stride
+    vmov.8 q10,  q2
+    vabal.u8  q15, d0, d2
+    vld1.8 {q2}, [r2], r3 //save pix2 + stride
+    vabal.u8  q15, d1, d3
+    vld1.8 {q3}, [r4], r3 //save pix2 - 1
+    vabal.u8  q13, d0, d4
+    vld1.8 {q8}, [r5], r3 //save pix2 + 1
+    vabal.u8  q13, d1, d5
+    subs lr, #1
+
+    vabal.u8  q11, d0, d6
+    vabal.u8  q11, d1, d7
+
+    vabal.u8  q9, d0, d16
+    vabal.u8  q9, d1, d17
+
+    bne pixel_sad_4_16x16_loop_0
+
+
+    //Save SAD to 'r0'
+    ldr   r0, [sp, #12]
+
+    vadd.u16   d0, d30, d31
+    vadd.u16   d1, d26, d27
+    vadd.u16   d2, d22, d23
+    vadd.u16   d3, d18, d19
+
+    vpaddl.u16 q0, q0
+    vpaddl.u16 q1, q1
+
+    vpaddl.u32 q0, q0
+    vpaddl.u32 q1, q1
+
+    vst4.32    {d0[0],d1[0],d2[0],d3[0]}, [r0]
+
+    ldmia sp!, {r4-r5, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSadFour16x8_neon
+    stmdb sp!, {r4-r5, lr}
+
+    //Generate the pix2 start addr
+    sub   r4, r2, #1
+    add   r5, r2, #1
+    sub   r2, r3
+
+    //Loading a horizontal line data (16 bytes)
+    vld1.8 {q0}, [r0], r1 //save pix1
+
+    vld1.8 {q1}, [r2], r3 //save pix2 - stride
+    vld1.8 {q10}, [r2], r3 //save pix2
+    vld1.8 {q2}, [r2], r3 //save pix2 + stride
+
+    vld1.8 {q3}, [r4], r3 //save pix2 - 1
+    vld1.8 {q8}, [r5], r3 //save pix2 + 1
+
+    //Do the SAD for 16 bytes
+    vabdl.u8  q15, d0, d2
+    vabal.u8  q15, d1, d3
+
+    vabdl.u8  q13, d0, d4
+    vabal.u8  q13, d1, d5
+
+    vabdl.u8  q11, d0, d6
+    vabal.u8  q11, d1, d7
+
+    vabdl.u8  q9, d0, d16
+    vabal.u8  q9, d1, d17
+
+    mov lr, #7
+pixel_sad_4_16x8_loop_0:
+
+    //Loading a horizontal line data (16 bytes)
+    vld1.8 {q0}, [r0], r1 //save pix1
+    vmov.8 q1,   q10      //save pix2 - stride
+    vmov.8 q10,  q2
+    vabal.u8  q15, d0, d2
+    vld1.8 {q2}, [r2], r3 //save pix2 + stride
+    vabal.u8  q15, d1, d3
+    vld1.8 {q3}, [r4], r3 //save pix2 - 1
+    vabal.u8  q13, d0, d4
+    vld1.8 {q8}, [r5], r3 //save pix2 + 1
+    vabal.u8  q13, d1, d5
+    subs lr, #1
+
+    vabal.u8  q11, d0, d6
+    vabal.u8  q11, d1, d7
+
+    vabal.u8  q9, d0, d16
+    vabal.u8  q9, d1, d17
+
+    bne pixel_sad_4_16x8_loop_0
+
+    //Save SAD to 'r0'
+    ldr   r0, [sp, #12]
+
+    vadd.u16   d0, d30, d31
+    vadd.u16   d1, d26, d27
+    vadd.u16   d2, d22, d23
+    vadd.u16   d3, d18, d19
+
+    vpaddl.u16 q0, q0
+    vpaddl.u16 q1, q1
+
+    vpaddl.u32 q0, q0
+    vpaddl.u32 q1, q1
+
+    vst4.32    {d0[0],d1[0],d2[0],d3[0]}, [r0]
+
+    ldmia sp!, {r4-r5, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSadFour8x16_neon
+    stmdb sp!, {r4-r5, lr}
+
+    //Generate the pix2 start addr
+    sub   r4, r2, #1
+    add   r5, r2, #1
+    sub   r2, r3
+
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1 //save pix1
+
+    vld1.8 {d1}, [r2], r3 //save pix2 - stride
+    vld1.8 {d6}, [r2], r3 //save pix2
+    vld1.8 {d2}, [r2], r3 //save pix2 + stride
+
+    vld1.8 {d3}, [r4], r3 //save pix2 - 1
+    vld1.8 {d4}, [r5], r3 //save pix2 + 1
+
+    //Do the SAD for 8 bytes
+    vabdl.u8  q15, d0, d1
+    vabdl.u8  q14, d0, d2
+    vabdl.u8  q13, d0, d3
+    vabdl.u8  q12, d0, d4
+
+    mov lr, #15
+pixel_sad_4_8x16_loop_0:
+
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1 //save pix1
+    vmov.8 d1,   d6       //save pix2 - stride
+    vmov.8 d6,   d2
+    vld1.8 {d2}, [r2], r3 //save pix2 + stride
+    vld1.8 {d3}, [r4], r3 //save pix2 - 1
+    vabal.u8  q15, d0, d1
+
+    vld1.8 {d4}, [r5], r3 //save pix2 + 1
+    //Do the SAD for 8 bytes
+    vabal.u8  q14, d0, d2
+    vabal.u8  q13, d0, d3
+    vabal.u8  q12, d0, d4
+    subs lr, #1
+
+    bne pixel_sad_4_8x16_loop_0
+
+    //Save SAD to 'r0'
+    ldr   r0, [sp, #12]
+
+    vadd.u16   d0, d30, d31
+    vadd.u16   d1, d28, d29
+    vadd.u16   d2, d26, d27
+    vadd.u16   d3, d24, d25
+
+    vpaddl.u16 q0, q0
+    vpaddl.u16 q1, q1
+
+    vpaddl.u32 q0, q0
+    vpaddl.u32 q1, q1
+
+    vst4.32    {d0[0],d1[0],d2[0],d3[0]}, [r0]
+
+    ldmia sp!, {r4-r5, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSadFour8x8_neon
+    stmdb sp!, {r4-r5, lr}
+
+    //Generate the pix2 start addr
+    sub   r4, r2, #1
+    add   r5, r2, #1
+    sub   r2, r3
+
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1 //save pix1
+
+    vld1.8 {d1}, [r2], r3 //save pix2 - stride
+    vld1.8 {d6}, [r2], r3 //save pix2
+    vld1.8 {d2}, [r2], r3 //save pix2 + stride
+
+    vld1.8 {d3}, [r4], r3 //save pix2 - 1
+    vld1.8 {d4}, [r5], r3 //save pix2 + 1
+
+    //Do the SAD for 8 bytes
+    vabdl.u8  q15, d0, d1
+    vabdl.u8  q14, d0, d2
+    vabdl.u8  q13, d0, d3
+    vabdl.u8  q12, d0, d4
+
+    mov lr, #7
+pixel_sad_4_8x8_loop_0:
+
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1 //save pix1
+    vmov.8 d1,   d6       //save pix2 - stride
+    vmov.8 d6,   d2
+    vld1.8 {d2}, [r2], r3 //save pix2 + stride
+    vld1.8 {d3}, [r4], r3 //save pix2 - 1
+    vabal.u8  q15, d0, d1
+
+    vld1.8 {d4}, [r5], r3 //save pix2 + 1
+    //Do the SAD for 8 bytes
+    vabal.u8  q14, d0, d2
+    vabal.u8  q13, d0, d3
+    vabal.u8  q12, d0, d4
+    subs lr, #1
+    bne pixel_sad_4_8x8_loop_0
+
+    //Save SAD to 'r0'
+    ldr   r0, [sp, #12]
+
+    vadd.u16   d0, d30, d31
+    vadd.u16   d1, d28, d29
+    vadd.u16   d2, d26, d27
+    vadd.u16   d3, d24, d25
+
+    vpaddl.u16 q0, q0
+    vpaddl.u16 q1, q1
+
+    vpaddl.u32 q0, q0
+    vpaddl.u32 q1, q1
+
+    vst4.32    {d0[0],d1[0],d2[0],d3[0]}, [r0]
+
+    ldmia sp!, {r4-r5, lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSadFour4x4_neon
+
+    vld1.32  {d0[0]}, [r0], r1
+    vld1.32  {d0[1]}, [r0], r1
+    vld1.32  {d1[0]}, [r0], r1
+    vld1.32  {d1[1]}, [r0]
+
+
+    sub   r0, r2, r3
+    vld1.32  {d2[0]}, [r0], r3
+    vld1.32  {d2[1]}, [r0], r3
+    vld1.32  {d3[0]}, [r0], r3
+    vld1.32  {d3[1]}, [r0], r3
+    vld1.32  {d4[0]}, [r0], r3
+    vld1.32  {d4[1]}, [r0]
+
+    sub   r0,  r2, #1
+    vld1.32  {d5[0]}, [r0], r3
+    vld1.32  {d5[1]}, [r0], r3
+    vld1.32  {d6[0]}, [r0], r3
+    vld1.32  {d6[1]}, [r0]
+
+    add   r0,  r2, #1
+    vld1.32  {d7[0]}, [r0], r3
+    vld1.32  {d7[1]}, [r0], r3
+    vld1.32  {d8[0]}, [r0], r3
+    vld1.32  {d8[1]}, [r0]
+
+    vabdl.u8  q15, d0, d2
+    vabdl.u8  q14, d1, d3
+
+    vabdl.u8  q13, d0, d3
+    vabdl.u8  q12, d1, d4
+
+    vabdl.u8  q11, d0, d5
+    vabdl.u8  q10, d1, d6
+
+    vabdl.u8  q9, d0, d7
+    vabdl.u8  q8, d1, d8
+
+    //Save SAD to 'r4'
+    ldr   r0, [sp]
+    vadd.u16   q0, q14, q15
+    vadd.u16   q1, q12, q13
+    vadd.u16   q2, q10, q11
+    vadd.u16   q3, q8 , q9
+
+    vadd.u16   d0, d1
+    vadd.u16   d1, d2, d3
+    vadd.u16   d2, d4, d5
+    vadd.u16   d3, d6, d7
+
+    vpaddl.u16 q0, q0
+    vpaddl.u16 q1, q1
+
+    vpaddl.u32 q0, q0
+    vpaddl.u32 q1, q1
+
+    vst4.32    {d0[0],d1[0],d2[0],d3[0]}, [r0]
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSatd16x16_neon
+    vpush       {q7}
+
+    SATD_16x4
+    vadd.u16    q7,  q0, q2
+
+    SATD_16x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q2
+
+    SATD_16x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q2
+
+    SATD_16x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q2
+
+    vadd.u16  d0, d14, d15
+    vpaddl.u16  d0, d0
+    vpaddl.u32  d0, d0
+
+    vmov.32     r0,  d0[0]
+    vpop        {q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSatd16x8_neon
+    vpush       {q7}
+
+    SATD_16x4
+    vadd.u16    q7,  q0, q2
+
+    SATD_16x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q2
+
+    vadd.u16  d0, d14, d15
+    vpaddl.u16  d0, d0
+    vpaddl.u32  d0, d0
+
+    vmov.32     r0,  d0[0]
+    vpop        {q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSatd8x16_neon
+    vpush       {q7}
+
+    SATD_8x4
+    vadd.u16    q7,  q0, q1
+
+    SATD_8x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q1
+
+    SATD_8x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q1
+
+    SATD_8x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q1
+
+    vadd.u16  d0, d14, d15
+    vpaddl.u16  d0, d0
+    vpaddl.u32  d0, d0
+
+    vmov.32     r0,  d0[0]
+    vpop        {q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSatd8x8_neon
+    vpush       {q7}
+
+    SATD_8x4
+    vadd.u16    q7,  q0, q1
+
+    SATD_8x4
+    vadd.u16    q7,  q7, q0
+    vadd.u16    q7,  q7, q1
+
+    vadd.u16  d0, d14, d15
+    vpaddl.u16  d0, d0
+    vpaddl.u32  d0, d0
+
+    vmov.32     r0,  d0[0]
+    vpop        {q7}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsSampleSatd4x4_neon
+
+    //Load the pix1 data --- 16 bytes
+    vld1.32  {d0[0]}, [r0], r1
+    vld1.32  {d0[1]}, [r0], r1
+    vld1.32  {d1[0]}, [r0], r1
+    vld1.32  {d1[1]}, [r0]
+
+    //Load the pix2 data --- 16 bytes
+    vld1.32  {d2[0]}, [r2], r3
+    vld1.32  {d2[1]}, [r2], r3
+    vld1.32  {d3[0]}, [r2], r3
+    vld1.32  {d3[1]}, [r2]
+
+    //Get the difference
+    vsubl.u8 q15, d0, d2 //{0,1,2,3,4,5,6,7}
+    vsubl.u8 q14, d1, d3 //{8,9,10,11,12,13,14,15}
+
+    //Do the vertical transform
+    vadd.s16 q13, q15, q14 //{0,4,8,12,1,5,9,13}
+    vsub.s16 q12, q15, q14 //{2,6,10,14,3,7,11,15}
+    vswp  d27, d24
+    vadd.s16 q15, q13, q12 //{0,1,2,3,4,5,6,7}
+    vsub.s16 q14, q13, q12 //{12,13,14,15,8,9,10,11}
+
+    //Do the horizontal transform
+    vtrn.32 q15, q14
+    vadd.s16 q13, q15, q14
+    vsub.s16 q12, q15, q14
+
+    vtrn.16 q13, q12
+    vadd.s16 q15, q13, q12
+
+    //Do the SAD
+    vabs.s16 q15, q15
+    vabd.s16 q14, q13, q12
+
+    vadd.u16 q0, q15, q14
+
+    vrhadd.u16 d0, d1
+    vpaddl.u16 d0, d0
+    vpaddl.u32 d0, d0
+
+    vmov.u32   r0, d0[0]
+
+WELS_ASM_FUNC_END
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/reconstruct_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/reconstruct_neon.S
new file mode 100644
index 0000000000..9fdf9d9ae0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/reconstruct_neon.S
@@ -0,0 +1,903 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro LOAD_4x4_DATA_FOR_DCT arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: \arg0~\arg3, src1*, src1_stride, src2*, src2_stride
+    vld2.16 {\arg0[0],\arg1[0]}, [\arg4], \arg5
+    vld2.16 {\arg2[0],\arg3[0]}, [\arg6], \arg7
+    vld2.16 {\arg0[1],\arg1[1]}, [\arg4], \arg5
+    vld2.16 {\arg2[1],\arg3[1]}, [\arg6], \arg7
+
+    vld2.16 {\arg0[2],\arg1[2]}, [\arg4], \arg5
+    vld2.16 {\arg2[2],\arg3[2]}, [\arg6], \arg7
+    vld2.16 {\arg0[3],\arg1[3]}, [\arg4], \arg5
+    vld2.16 {\arg2[3],\arg3[3]}, [\arg6], \arg7
+//  }
+.endm
+
+.macro LOAD_8x8_DATA_FOR_DCT arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input: \arg0~\arg3, src1*, src2*; untouched r2:src1_stride &r4:src2_stride
+    vld1.64 {\arg0}, [\arg8], r2
+    vld1.64 {\arg4}, [\arg9], r4
+    vld1.64 {\arg1}, [\arg8], r2
+    vld1.64 {\arg5}, [\arg9], r4
+
+    vld1.64 {\arg2}, [\arg8], r2
+    vld1.64 {\arg6}, [\arg9], r4
+    vld1.64 {\arg3}, [\arg8], r2
+    vld1.64 {\arg7}, [\arg9], r4
+//  }
+.endm
+
+.macro DCT_ROW_TRANSFORM_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], working: [4]~[7]
+    vadd.s16        \arg4, \arg0, \arg3         //int16 s[0] = data[i] + data[i3];
+    vsub.s16        \arg7, \arg0, \arg3         //int16 s[3] = data[i] - data[i3];
+    vadd.s16        \arg5, \arg1, \arg2         //int16 s[1] = data[i1] + data[i2];
+    vsub.s16        \arg6, \arg1, \arg2         //int16 s[2] = data[i1] - data[i2];
+
+    vadd.s16        \arg0, \arg4, \arg5         //int16 dct[i ] = s[0] + s[1];
+    vsub.s16        \arg2, \arg4, \arg5         //int16 dct[i2] = s[0] - s[1];
+    vshl.s16        \arg1, \arg7, #1
+    vshl.s16        \arg3, \arg6, #1
+    vadd.s16        \arg1, \arg1, \arg6         //int16 dct[i1] = (s[3] << 1) + s[2];
+    vsub.s16        \arg3, \arg7, \arg3         //int16 dct[i3] = s[3] - (s[2] << 1);
+//  }
+.endm
+
+.macro MATRIX_TRANSFORM_EACH_16BITS arg0, arg1, arg2, arg3
+//  {   //  input & output: src_d[0]~[3];[0 1 2 3]+[4 5 6 7]+[8 9 10 11]+[12 13 14 15]
+    vtrn.s16        \arg0, \arg1                //[0 1 2 3]+[4 5 6 7]-->[0 4 2 6]+[1 5 3 7]
+    vtrn.s16        \arg2, \arg3                //[8 9 10 11]+[12 13 14 15]-->[8 12 10 14]+[9 13 11 15]
+    vtrn.32     \arg0, \arg2                //[0 4 2 6]+[8 12 10 14]-->[0 4 8 12]+[2 6 10 14]
+    vtrn.32     \arg1, \arg3                //[1 5 3 7]+[9 13 11 15]-->[1 5 9 13]+[3 7 11 15]
+//  }
+.endm
+
+.macro NEWQUANT_COEF_EACH_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8
+//  {   //  input:  coef, ff (dst), ff_d0, ff_d1, mf_d0, md_d1
+    veor.s16        \arg6, \arg6            // init 0 , and keep 0;
+    vaba.s16        \arg1, \arg0, \arg6     // f + abs(coef - 0)
+    vmull.s16       \arg7, \arg2, \arg4
+    vmull.s16       \arg8, \arg3, \arg5
+    vshr.s32        \arg7, #16
+    vshr.s32        \arg8, #16
+    vmovn.s32       \arg2, \arg7
+    vmovn.s32       \arg3, \arg8
+
+    vcgt.s16        \arg7, \arg0, #0        // if true, location of coef == 11111111
+    vbif.s16        \arg6, \arg1, \arg7     // if (x<0) reserved part; else keep 0 untouched
+    vshl.s16        \arg6, #1
+    vsub.s16        \arg1, \arg1, \arg6     // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro NEWQUANT_COEF_EACH_16BITS_MAX arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input:  coef, ff (dst), ff_d0, ff_d1, mf_d0(max), md_d1
+    veor.s16        \arg6, \arg6            // init 0 , and keep 0;
+    vaba.s16        \arg1, \arg0, \arg6     // f + abs(coef - 0)
+    vmull.s16       \arg7, \arg2, \arg4
+    vmull.s16       \arg8, \arg3, \arg5
+    vshr.s32        \arg7, #16
+    vshr.s32        \arg8, #16
+    vmovn.s32       \arg2, \arg7
+    vmovn.s32       \arg3, \arg8
+
+    vcgt.s16        \arg7, \arg0, #0        // if true, location of coef == 11111111
+    vbif.s16        \arg6, \arg1, \arg7     // if (x<0) reserved part; else keep 0 untouched
+    vshl.s16        \arg6, #1
+    vmax.s16        \arg9, \arg2, \arg3
+    vsub.s16        \arg1, \arg1, \arg6     // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro QUANT_DUALWORD_COEF_EACH_16BITS arg0, arg1, arg2, arg3, arg4
+//  {   //  input:  coef, ff (dst), mf , working_d (all 0), working_q
+    vaba.s16        \arg1, \arg0, \arg3     // f + abs(coef - 0)
+    vmull.s16       \arg4, \arg1, \arg2     // *= mf
+    vshr.s32        \arg4, #16
+    vmovn.s32       \arg1, \arg4            // >> 16
+
+    vcgt.s16        \arg2, \arg0, #0        // if true, location of coef == 11111111
+    vbif.s16        \arg3, \arg1, \arg2     // if (x<0) reserved part; else keep 0 untouched
+    vshl.s16        \arg3, #1
+    vsub.s16        \arg1, \arg1, \arg3     // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro DC_ZERO_COUNT_IN_DUALWORD arg0, arg1, arg2
+//  {   //  input:  coef, dst_d, working_d (all 0x01)
+    vceq.s16    \arg1, \arg0, #0
+    vand.s16    \arg1, \arg2
+    vpadd.s16   \arg1, \arg1, \arg1
+    vpadd.s16   \arg1, \arg1, \arg1
+//  }
+.endm
+
+.macro SELECT_MAX_IN_ABS_COEF arg0, arg1, arg2, arg3, arg4
+//  {   //  input:  coef_0, coef_1, max_q (identy to follow two), output: max_d0, max_d1
+    vmax.s16        \arg2, \arg0, \arg1     // max 1st in \arg3 & max 2nd in \arg4
+    vpmax.s16       \arg3, \arg3, \arg4     // max 1st in \arg3[0][1] & max 2nd in \arg3[2][3]
+    vpmax.s16       \arg3, \arg3, \arg4     // max 1st in \arg3[0][1]
+//  }
+.endm
+
+.macro ZERO_COUNT_IN_2_QUARWORD arg0, arg1, arg2, arg3, arg4, arg5, arg6
+//  {   //  input:  coef_0 (identy to \arg3 \arg4), coef_1(identy to \arg5 \arg6), mask_q
+    vceq.s16    \arg0, #0
+    vceq.s16    \arg1, #0
+    vand.s16    \arg0, \arg2
+    vand.s16    \arg1, \arg2
+
+    vpadd.s16   \arg3, \arg3, \arg5
+    vpadd.s16   \arg4, \arg4, \arg6
+    vpadd.s16   \arg3, \arg3, \arg4     // 8-->4
+    vpadd.s16   \arg3, \arg3, \arg3
+    vpadd.s16   \arg3, \arg3, \arg3
+//  }
+.endm
+
+.macro HDM_QUANT_2x2_TOTAL_16BITS arg0, arg1, arg2
+//  {   //  input: src_d[0]~[3], working_d, dst_d
+    vshr.s64    \arg1, \arg0, #32
+    vadd.s16    \arg2, \arg0, \arg1     // [0] = rs[0] + rs[32];[1] = rs[16] + rs[48];
+    vsub.s16    \arg1, \arg0, \arg1     // [0] = rs[0] - rs[32];[1] = rs[16] - rs[48];
+    vtrn.s16    \arg2, \arg1
+    vtrn.s32    \arg2, \arg1
+//  }
+.endm
+
+.macro IHDM_4x4_TOTAL_16BITS arg0, arg1, arg2
+//  {   //  input: each src_d[0]~[3](dst), working_q0, working_q1, working_q2
+    vshr.s64    \arg1, \arg0, #32
+    vadd.s16    \arg2, \arg0, \arg1     // [0] = rs[0] + rs[2];[1] = rs[1] + rs[3];
+    vsub.s16    \arg1, \arg0, \arg1     // [0] = rs[0] - rs[2];[1] = rs[1] - rs[3];
+    vtrn.s16    \arg2, \arg1
+    vrev32.16   \arg1, \arg1
+    vtrn.s32    \arg2, \arg1            // [0] = rs[0] + rs[2];[1] = rs[0] - rs[2];[2] = rs[1] - rs[3];[3] = rs[1] + rs[3];
+
+    vrev64.16   \arg1, \arg2
+    vadd.s16    \arg0, \arg2, \arg1     // [0] = rs[0] + rs[3];[1] = rs[1] + rs[2];
+    vsub.s16    \arg1, \arg2, \arg1
+    vrev32.16   \arg1, \arg1            // [0] = rs[1] - rs[2];[1] = rs[0] - rs[3];
+    vtrn.s32    \arg0, \arg1            // [0] = rs[0] + rs[3];[1] = rs[1] + rs[2];[2] = rs[1] - rs[2];[3] = rs[0] - rs[3];
+//  }
+.endm
+
+.macro MB_PRED_8BITS_ADD_DCT_16BITS_CLIP arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input: pred_d[0]/[1](output), dct_q0/1, working_q0/1;
+    vmovl.u8        \arg4,\arg0
+    vmovl.u8        \arg5,\arg1
+    vadd.s16        \arg4,\arg2
+    vadd.s16        \arg5,\arg3
+    vqmovun.s16 \arg0,\arg4
+    vqmovun.s16 \arg1,\arg5
+//  }
+.endm
+
+.macro ROW_TRANSFORM_1_STEP_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], output: e_d[0]~[3];
+    vadd.s16        \arg4, \arg0, \arg2         //int16 e[i][0] = src[0] + src[2];
+    vsub.s16        \arg5, \arg0, \arg2         //int16 e[i][1] = src[0] - src[2];
+    vshr.s16        \arg6, \arg1, #1
+    vshr.s16        \arg7, \arg3, #1
+    vsub.s16        \arg6, \arg6, \arg3         //int16 e[i][2] = (src[1]>>1)-src[3];
+    vadd.s16        \arg7, \arg1, \arg7         //int16 e[i][3] = src[1] + (src[3]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7    // both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    vadd.s16        \arg0, \arg4, \arg7         //int16 f[i][0] = e[i][0] + e[i][3];
+    vadd.s16        \arg1, \arg5, \arg6         //int16 f[i][1] = e[i][1] + e[i][2];
+    vsub.s16        \arg2, \arg5, \arg6         //int16 f[i][2] = e[i][1] - e[i][2];
+    vsub.s16        \arg3, \arg4, \arg7         //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+
+.macro ROW_TRANSFORM_0_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], output: e_q[0]~[3];
+    vaddl.s16       \arg4, \arg0, \arg2         //int32 e[i][0] = src[0] + src[2];
+    vsubl.s16       \arg5, \arg0, \arg2         //int32 e[i][1] = src[0] - src[2];
+    vsubl.s16       \arg6, \arg1, \arg3         //int32 e[i][2] = src[1] - src[3];
+    vaddl.s16       \arg7, \arg1, \arg3         //int32 e[i][3] = src[1] + src[3];
+//  }
+.endm
+
+.macro ROW_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input: src_d[0]~[3], output: e_q[0]~[3]; working: \arg8 \arg9
+    vaddl.s16       \arg4, \arg0, \arg2         //int32 e[i][0] = src[0] + src[2];
+    vsubl.s16       \arg5, \arg0, \arg2         //int32 e[i][1] = src[0] - src[2];
+    vshr.s16        \arg8, \arg1, #1
+    vshr.s16        \arg9, \arg3, #1
+    vsubl.s16       \arg6, \arg8, \arg3         //int32 e[i][2] = (src[1]>>1)-src[3];
+    vaddl.s16       \arg7, \arg1, \arg9         //int32 e[i][3] = src[1] + (src[3]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_4BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7  // both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    vadd.s32        \arg0, \arg4, \arg7         //int16 f[i][0] = e[i][0] + e[i][3];
+    vadd.s32        \arg1, \arg5, \arg6         //int16 f[i][1] = e[i][1] + e[i][2];
+    vsub.s32        \arg2, \arg5, \arg6         //int16 f[i][2] = e[i][1] - e[i][2];
+    vsub.s32        \arg3, \arg4, \arg7         //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+.macro COL_TRANSFORM_0_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_q[0]~[3], output: e_q[0]~[3];
+    vadd.s32        \arg4, \arg0, \arg2         //int32 e[0][j] = f[0][j] + f[2][j];
+    vsub.s32        \arg5, \arg0, \arg2         //int32 e[1][j] = f[0][j] - f[2][j];
+    vsub.s32        \arg6, \arg1, \arg3         //int32 e[2][j] = (f[1][j]>>1) - f[3][j];
+    vadd.s32        \arg7, \arg1, \arg3         //int32 e[3][j] = f[1][j] + (f[3][j]>>1);
+//  }
+.endm
+
+.macro COL_TRANSFORM_1_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_q[0]~[3], output: e_q[0]~[3];
+    vadd.s32        \arg4, \arg0, \arg2         //int32 e[0][j] = f[0][j] + f[2][j];
+    vsub.s32        \arg5, \arg0, \arg2         //int32 e[1][j] = f[0][j] - f[2][j];
+    vshr.s32        \arg6, \arg1, #1
+    vshr.s32        \arg7, \arg3, #1
+    vsub.s32        \arg6, \arg6, \arg3         //int32 e[2][j] = (f[1][j]>>1) - f[3][j];
+    vadd.s32        \arg7, \arg1, \arg7         //int32 e[3][j] = f[1][j] + (f[3][j]>>1);
+//  }
+.endm
+
+
+WELS_ASM_FUNC_BEGIN WelsDctT4_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    LOAD_4x4_DATA_FOR_DCT   d4, d5, d6, d7, r1, r2, r3, r4
+
+    vsubl.u8    q0, d4, d6
+    vsubl.u8    q1, d5, d7
+    vtrn.s32    q0, q1
+    vswp        d1, d2
+
+    // horizontal transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      d0, d1, d2, d3, d4, d5, d6, d7
+
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS    d0, d1, d2, d3
+
+    //  vertical transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      d0, d1, d2, d3, d4, d5, d6, d7
+
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS    d0, d1, d2, d3
+
+    vst1.s16        {q0, q1}, [r0]!
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDctFourT4_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    LOAD_8x8_DATA_FOR_DCT   d16, d17, d18, d19, d20, d21, d22, d23, r1, r3
+
+    vsubl.u8    q0, d16, d20
+    vsubl.u8    q1, d17, d21
+    vsubl.u8    q2, d18, d22
+    vsubl.u8    q3, d19, d23
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    // horizontal transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    //  vertical transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    vswp        d1, d2
+    vswp        d5, d6
+    vswp        q1, q2
+    vst1.s16        {q0, q1}, [r0]!
+    vst1.s16        {q2, q3}, [r0]!
+
+    ////////////////
+    LOAD_8x8_DATA_FOR_DCT   d16, d17, d18, d19, d20, d21, d22, d23, r1, r3
+
+    vsubl.u8    q0, d16, d20
+    vsubl.u8    q1, d17, d21
+    vsubl.u8    q2, d18, d22
+    vsubl.u8    q3, d19, d23
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    // horizontal transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    //  vertical transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    vswp        d1, d2
+    vswp        d5, d6
+    vswp        q1, q2
+    vst1.s16        {q0, q1}, [r0]!
+    vst1.s16        {q2, q3}, [r0]!
+
+    pop     {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsQuant4x4_neon
+    vld1.s16        {q2}, [r1]
+    vld1.s16        {q0, q1}, [r0]
+    vld1.s16        {q3}, [r2]
+
+    vmov            q8, q2
+
+    NEWQUANT_COEF_EACH_16BITS   q0, q2, d4, d5, d6, d7, q9, q10, q11
+    vst1.s16        {q2}, [r0]!
+
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r0]!
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsQuant4x4Dc_neon
+
+    vld1.s16        {q0, q1}, [r0]
+    vdup.s16        q2, r1      // even ff range [0, 768]
+    vdup.s16        q3, r2
+
+    vmov            q8, q2
+
+    NEWQUANT_COEF_EACH_16BITS   q0, q2, d4, d5, d6, d7, q9, q10, q11
+    vst1.s16        {q2}, [r0]!
+
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r0]!
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsQuantFour4x4_neon
+    vld1.s16        {q2}, [r1]
+    vld1.s16        {q3}, [r2]
+    mov             r1, r0
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q0, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q0, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q0, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q0, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS   q1, q8, d16, d17, d6, d7, q9, q10, q11
+    vst1.s16        {q8}, [r1]!
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsQuantFour4x4Max_neon
+    vld1.s16        {q2}, [r1]
+    vld1.s16        {q3}, [r2]
+    mov             r1, r0
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q0, q8, d16, d17, d6, d7, q9, q10, q11, d26
+    vst1.s16        {q8}, [r1]!
+    vmov            q12, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q1, q12, d24, d25, d6, d7, q9, q10, q11, d28
+    vst1.s16        {q12}, [r1]!        // then 1st 16 elem in d26 & d28
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q0, q8, d16, d17, d6, d7, q9, q10, q11, d27
+    vst1.s16        {q8}, [r1]!
+    vmov            q12, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q1, q12, d24, d25, d6, d7, q9, q10, q11, d29
+    vst1.s16        {q12}, [r1]!    // then 2nd 16 elem in d27 & d29
+
+    SELECT_MAX_IN_ABS_COEF  q13, q14, q0, d0, d1
+    vst1.s32        {d0[0]}, [r3]!
+
+    ///////////
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q0, q8, d16, d17, d6, d7, q9, q10, q11, d26
+    vst1.s16        {q8}, [r1]!
+    vmov            q12, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q1, q12, d24, d25, d6, d7, q9, q10, q11, d28
+    vst1.s16        {q12}, [r1]!        // then 3rd 16 elem in d26 & d28
+
+    vld1.s16        {q0, q1}, [r0]!
+    vmov            q8, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q0, q8, d16, d17, d6, d7, q9, q10, q11, d27
+    vst1.s16        {q8}, [r1]!
+    vmov            q12, q2
+    NEWQUANT_COEF_EACH_16BITS_MAX   q1, q12, d24, d25, d6, d7, q9, q10, q11, d29
+    vst1.s16        {q12}, [r1]!    // then 4th 16 elem in d27 & d29
+
+    SELECT_MAX_IN_ABS_COEF  q13, q14, q0, d0, d1
+    vst1.s32        {d0[0]}, [r3]!
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsHadamardT4Dc_neon
+    push    {r2,r3}
+    mov     r2, #64 // 2*16*sizeof(int16_t)
+    add     r3, r1, #32
+
+    vld1.s16        {d0}, [r1], r2
+    vld1.s16        {d1}, [r3], r2
+    vld1.s16        {d4}, [r1], r2
+    vld1.s16        {d5}, [r3], r2
+    vld1.s16        {d2}, [r1], r2
+    vld1.s16        {d3}, [r3], r2
+    vld1.s16        {d6}, [r1], r2
+    vld1.s16        {d7}, [r3], r2
+    vtrn.16     q0, q2      // d0[0 4], d1[1 5]
+    vtrn.16     q1, q3      // d2[2 6], d3[3 7]
+
+    vld1.s16        {d16}, [r1], r2
+    vld1.s16        {d17}, [r3], r2
+    vld1.s16        {d20}, [r1], r2
+    vld1.s16        {d21}, [r3], r2
+    vld1.s16        {d18}, [r1], r2
+    vld1.s16        {d19}, [r3], r2
+    vld1.s16        {d22}, [r1], r2
+    vld1.s16        {d23}, [r3], r2
+    vtrn.16     q8, q10     //d16[08 12],d17[09 13]
+    vtrn.16     q9, q11     //d18[10 14],d19[11 15]
+
+    vtrn.32     q0, q8      // d0 [0 4 08 12] = dct[idx],       d1[1 5 09 13] = dct[idx+16]
+    vtrn.32     q1, q9      // d2 [2 6 10 14] = dct[idx+64],    d3[3 7 11 15] = dct[idx+80]
+
+    ROW_TRANSFORM_0_STEP    d0, d1, d3, d2, q8, q11, q10, q9
+
+    TRANSFORM_4BYTES        q0, q1, q3, q2, q8, q11, q10, q9
+
+    // transform element 32bits
+    vtrn.s32        q0, q1              //[0 1 2 3]+[4 5 6 7]-->[0 4 2 6]+[1 5 3 7]
+    vtrn.s32        q2, q3              //[8 9 10 11]+[12 13 14 15]-->[8 12 10 14]+[9 13 11 15]
+    vswp            d1, d4              //[0 4 2 6]+[8 12 10 14]-->[0 4 8 12]+[2 6 10 14]
+    vswp            d3, d6              //[1 5 3 7]+[9 13 11 15]-->[1 5 9 13]+[3 7 11 15]
+
+    COL_TRANSFORM_0_STEP    q0, q1, q3, q2, q8, q11, q10, q9
+
+    TRANSFORM_4BYTES        q0, q1, q3, q2, q8, q11, q10, q9
+
+    vrshrn.s32      d16, q0, #1
+    vrshrn.s32      d17, q1, #1
+    vrshrn.s32      d18, q2, #1
+    vrshrn.s32      d19, q3, #1
+    vst1.16 {q8, q9}, [r0]  //store
+
+    pop     {r2,r3}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsHadamardQuant2x2_neon
+
+    vdup.s16    d1, r1              //ff
+    vdup.s16    d2, r2              //mf
+    veor        d3, d3
+
+    mov         r1, #32
+    mov         r2, r0
+
+    vld1.s16    {d0[0]}, [r0], r1       //rs[00]
+    vst1.s16    {d3[0]}, [r2], r1       //rs[00]=0
+    vld1.s16    {d0[1]}, [r0], r1       //rs[16]
+    vst1.s16    {d3[0]}, [r2], r1       //rs[16]=0
+    vld1.s16    {d0[2]}, [r0], r1       //rs[32]
+    vst1.s16    {d3[0]}, [r2], r1       //rs[32]=0
+    vld1.s16    {d0[3]}, [r0], r1       //rs[48]
+    vst1.s16    {d3[0]}, [r2], r1       //rs[48]=0
+
+    HDM_QUANT_2x2_TOTAL_16BITS  d0, d4, d5      // output d5
+
+    HDM_QUANT_2x2_TOTAL_16BITS  d5, d4, d0      // output d0
+
+    QUANT_DUALWORD_COEF_EACH_16BITS d0, d1, d2, d3, q2
+
+    vst1.s16    d1, [r3]        // store to dct
+    ldr         r2, [sp, #0]
+    vst1.s16    d1, [r2]        // store to block
+
+    mov         r1, #1
+    vdup.s16    d3, r1
+    DC_ZERO_COUNT_IN_DUALWORD   d1, d0, d3
+
+    vmov    r0, r1, d0
+    and     r0, #0x07       // range [0~4]
+    rsb     r0, #4
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsHadamardQuant2x2SkipKernel_neon
+
+    vdup.s16    d3, r1
+    mov         r1, #32
+    vld1.s16    {d0[0]}, [r0], r1       //rs[00]
+    vld1.s16    {d0[1]}, [r0], r1       //rs[16]
+    vld1.s16    {d0[2]}, [r0], r1       //rs[32]
+    vld1.s16    {d0[3]}, [r0], r1       //rs[48]
+
+    HDM_QUANT_2x2_TOTAL_16BITS  d0, d1, d2      // output d2
+
+    HDM_QUANT_2x2_TOTAL_16BITS  d2, d1, d0      // output d0
+
+    vabs.s16    d1, d0
+    vcgt.s16    d1, d1, d3      // abs(dct[i])>threshold;
+    vmov    r0, r1, d1
+    orr     r0, r1
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsGetNoneZeroCount_neon
+    push    {r1}
+    vld1.s16    {q0, q1}, [r0]
+    vmov.s16    q8, #1
+
+    ZERO_COUNT_IN_2_QUARWORD    q0, q1, q8, d0, d1, d2, d3
+    vmov    r0, r1, d0
+    and     r0, #0x1F   // range [0~16]
+    rsb     r0, #16
+    pop     {r1}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDequant4x4_neon
+    vld1.s16    {q0, q1}, [r0]
+    vld1.u16    {q2}, [r1]
+
+    vmul.s16    q8, q0, q2
+    vmul.s16    q9, q1, q2
+
+    vst1.s16    {q8, q9}, [r0]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDequantFour4x4_neon
+    vld1.u16    {q12}, [r1]
+    mov     r1, r0
+    vld1.s16    {q0, q1}, [r0]!
+    vld1.s16    {q2, q3}, [r0]!
+    vmul.s16    q0, q0, q12
+    vld1.s16    {q8, q9}, [r0]!
+    vmul.s16    q1, q1, q12
+    vld1.s16    {q10, q11}, [r0]!
+
+    vst1.s16    {q0, q1}, [r1]!
+
+    vmul.s16    q2, q2, q12
+    vmul.s16    q3, q3, q12
+    vmul.s16    q8, q8, q12
+    vst1.s16    {q2, q3}, [r1]!
+
+    vmul.s16    q9, q9, q12
+    vmul.s16    q10, q10, q12
+    vmul.s16    q11, q11, q12
+    vst1.s16    {q8, q9}, [r1]!
+    vst1.s16    {q10, q11}, [r1]!
+
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsDequantIHadamard4x4_neon
+
+    vld1.s16    {q0, q1}, [r0]
+    vdup.s16    q8, r1
+
+    IHDM_4x4_TOTAL_16BITS   q0, q2, q3
+    IHDM_4x4_TOTAL_16BITS   q1, q2, q3
+
+    MATRIX_TRANSFORM_EACH_16BITS    d0, d1, d2, d3
+
+    IHDM_4x4_TOTAL_16BITS   q0, q2, q3
+    vmul.s16    q0, q8
+
+    IHDM_4x4_TOTAL_16BITS   q1, q2, q3
+    vmul.s16    q1, q8
+
+    MATRIX_TRANSFORM_EACH_16BITS    d0, d1, d2, d3
+    vst1.s16    {q0, q1}, [r0]
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIDctT4Rec_neon
+    vld1.u32        {d16[0]}, [r2], r3
+    push            {r4}
+    ldr             r4, [sp, #4]
+    vld1.u32        {d16[1]}, [r2], r3
+
+    vld4.s16        {d0, d1, d2, d3}, [r4]      // cost 3 cycles!
+    vld1.u32        {d17[0]}, [r2], r3
+    vld1.u32        {d17[1]}, [r2], r3          // q7 is pred
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       d0, d1, d2, d3, d4, d5, d6, d7
+
+    TRANSFORM_TOTAL_16BITS      d0, d1, d2, d3, d4, d5, d6, d7
+
+    MATRIX_TRANSFORM_EACH_16BITS    d0, d1, d2, d3
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       d0, d1, d2, d3, d4, d5, d6, d7
+
+    TRANSFORM_TOTAL_16BITS      d0, d1, d2, d3, d4, d5, d6, d7
+    vrshr.s16       d0, d0, #6
+    vrshr.s16       d1, d1, #6
+    vrshr.s16       d2, d2, #6
+    vrshr.s16       d3, d3, #6
+
+    //after rounding 6, clip into [0, 255]
+    vmovl.u8        q2,d16
+    vadd.s16        q0,q2
+    vqmovun.s16 d16,q0
+    vst1.32     {d16[0]},[r0],r1
+    vst1.32     {d16[1]},[r0],r1
+
+    vmovl.u8        q2,d17
+    vadd.s16        q1,q2
+    vqmovun.s16 d17,q1
+    vst1.32     {d17[0]},[r0],r1
+    vst1.32     {d17[1]},[r0]
+
+    pop         {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIDctFourT4Rec_neon
+
+    vld1.u64        {d24}, [r2], r3
+    push            {r4}
+    ldr             r4, [sp, #4]
+    vld1.u64        {d25}, [r2], r3
+
+    vld4.s16        {d0, d1, d2, d3}, [r4]!     // cost 3 cycles!
+    vld1.u64        {d26}, [r2], r3
+    vld1.u64        {d27}, [r2], r3
+    vld4.s16        {d4, d5, d6, d7}, [r4]!     // cost 3 cycles!
+    vswp            d1, d4
+    vswp            d3, d6
+    vswp            q1, q2                      // q0~q3
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       q0, q1, q2, q3, q8, q9, q10, q11
+
+    TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       q0, q1, q2, q3, q8, q9, q10, q11
+
+    TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+    vrshr.s16       q0, q0, #6
+    vrshr.s16       q1, q1, #6
+    vrshr.s16       q2, q2, #6
+    vrshr.s16       q3, q3, #6
+
+    //after rounding 6, clip into [0, 255]
+    vmovl.u8        q8,d24
+    vadd.s16        q0,q8
+    vqmovun.s16 d24,q0
+    vst1.u8     {d24},[r0],r1
+
+    vmovl.u8        q8,d25
+    vadd.s16        q1,q8
+    vqmovun.s16 d25,q1
+    vst1.u8     {d25},[r0],r1
+
+    vmovl.u8        q8,d26
+    vadd.s16        q2,q8
+    vqmovun.s16 d26,q2
+    vst1.u8     {d26},[r0],r1
+
+    vmovl.u8        q8,d27
+    vadd.s16        q3,q8
+    vqmovun.s16 d27,q3
+    vst1.u8     {d27},[r0],r1
+
+    vld1.u64        {d24}, [r2], r3
+    vld1.u64        {d25}, [r2], r3
+
+    vld4.s16        {d0, d1, d2, d3}, [r4]!     // cost 3 cycles!
+    vld1.u64        {d26}, [r2], r3
+    vld1.u64        {d27}, [r2], r3
+    vld4.s16        {d4, d5, d6, d7}, [r4]!     // cost 3 cycles!
+    vswp            d1, d4
+    vswp            d3, d6
+    vswp            q1, q2                      // q0~q3
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       q0, q1, q2, q3, q8, q9, q10, q11
+
+    TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+
+    MATRIX_TRANSFORM_EACH_16BITS    q0, q1, q2, q3
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS       q0, q1, q2, q3, q8, q9, q10, q11
+
+    TRANSFORM_TOTAL_16BITS      q0, q1, q2, q3, q8, q9, q10, q11
+    vrshr.s16       q0, q0, #6
+    vrshr.s16       q1, q1, #6
+    vrshr.s16       q2, q2, #6
+    vrshr.s16       q3, q3, #6
+
+    //after rounding 6, clip into [0, 255]
+    vmovl.u8        q8,d24
+    vadd.s16        q0,q8
+    vqmovun.s16 d24,q0
+    vst1.u8     {d24},[r0],r1
+
+    vmovl.u8        q8,d25
+    vadd.s16        q1,q8
+    vqmovun.s16 d25,q1
+    vst1.u8     {d25},[r0],r1
+
+    vmovl.u8        q8,d26
+    vadd.s16        q2,q8
+    vqmovun.s16 d26,q2
+    vst1.u8     {d26},[r0],r1
+
+    vmovl.u8        q8,d27
+    vadd.s16        q3,q8
+    vqmovun.s16 d27,q3
+    vst1.u8     {d27},[r0],r1
+
+    pop         {r4}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN WelsIDctRecI16x16Dc_neon
+    push        {r4}
+    ldr         r4, [sp, #4]
+
+    vld1.s16    {q8,q9}, [r4]
+    vrshr.s16       q8, q8, #6
+    vrshr.s16       q9, q9, #6
+
+    vdup.s16    d20, d16[0]
+    vdup.s16    d21, d16[1]
+    vdup.s16    d22, d16[2]
+    vdup.s16    d23, d16[3]
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vdup.s16    d20, d17[0]
+    vdup.s16    d21, d17[1]
+    vdup.s16    d22, d17[2]
+    vdup.s16    d23, d17[3]
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vdup.s16    d20, d18[0]
+    vdup.s16    d21, d18[1]
+    vdup.s16    d22, d18[2]
+    vdup.s16    d23, d18[3]
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vdup.s16    d20, d19[0]
+    vdup.s16    d21, d19[1]
+    vdup.s16    d22, d19[2]
+    vdup.s16    d23, d19[3]
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    vld1.u8 {q0}, [r2], r3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   d0, d1, q10, q11, q12, q13
+    vst1.u8 {q0}, [r0], r1
+
+    pop         {r4}
+WELS_ASM_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/svc_motion_estimation.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/svc_motion_estimation.S
new file mode 100644
index 0000000000..1f47a7c435
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm/svc_motion_estimation.S
@@ -0,0 +1,366 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+WELS_ASM_FUNC_BEGIN SumOf8x8SingleBlock_neon
+    vld1.64 {d0}, [r0], r1
+    vld1.64 {d1}, [r0], r1
+    vld1.64 {d2}, [r0], r1
+    vld1.64 {d3}, [r0], r1
+    vld1.64 {d4}, [r0], r1
+    vld1.64 {d5}, [r0], r1
+    vld1.64 {d6}, [r0], r1
+    vld1.64 {d7}, [r0]
+    vpaddl.u8 q0, q0
+    vpadal.u8 q0, q1
+    vpadal.u8 q0, q2
+    vpadal.u8 q0, q3
+
+    vpaddl.u16 q0, q0
+    vpadd.i32 d0, d1
+    vpadd.i32 d0, d0
+    vmov    r0, r1, d0
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN SumOf16x16SingleBlock_neon
+    vld1.64 {q0}, [r0], r1
+    vpaddl.u8 q0, q0
+.rept 15
+    vld1.64 {q1}, [r0], r1
+    vpadal.u8 q0, q1
+.endr
+    vpaddl.u16 q0, q0
+    vpadd.i32 d0, d1
+    vpadd.i32 d0, d0
+    vmov    r0, r1, d0
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN SumOf8x8BlockOfFrame_neon
+//(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,const int32_t kiRefStride,uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[])
+    stmdb sp!, {r4-r12}
+    ldr r5, [sp, #40] //pTimesOfFeatureValue
+    ldr r4, [sp, #36] //pFeatureOfBlock
+
+    mov r8, r0
+    mov r6, r1
+    add r8, r6
+    add r4, r4, r6, lsl #1
+
+    mov r7, r6
+_width_loop8x8_1:
+    subs r0, r8, r7
+    vld1.64 {d0}, [r0], r3
+    vld1.64 {d1}, [r0], r3
+    vld1.64 {d2}, [r0], r3
+    vld1.64 {d3}, [r0], r3
+    vld1.64 {d4}, [r0], r3
+    vld1.64 {d5}, [r0], r3
+    vld1.64 {d6}, [r0], r3
+    vld1.64 {d7}, [r0]
+
+    vpaddl.u8 q0, q0
+    vpadal.u8 q0, q1
+    vpadal.u8 q0, q2
+    vpadal.u8 q0, q3
+    vpaddl.u16 q0, q0
+    vpadd.i32 d0, d1
+    vpadd.i32 d0, d0
+
+    subs r1, r4, r7, lsl #1
+    vst1.16 {d0[0]}, [r1] // sum -> pFeatureOfBlock[i]
+    vmov    r0, r1, d0
+    add r1, r5, r0, lsl #2
+    ldr r0, [r1]
+    add r0, #1
+    str r0, [r1]
+
+    subs r7, #1
+    bne _width_loop8x8_1
+
+    add r8, r3
+    add r4, r4, r6, lsl #1
+    subs r2, #1
+    beq _SumOf8x8BlockOfFrame_end
+
+
+_height_loop8x8:
+    mov r7, r6
+_width_loop8x8_2:
+    subs r0, r8, r7
+    subs r1, r4, r7, lsl #1
+
+    subs r9, r1, r6, lsl #1 // last line of pFeatureOfBlock[i]
+    ldrh  r10, [r9] // sum of last line of pFeatureOfBlock[i]
+
+    subs r11, r0, r3
+    vld1.64 {d1}, [r11]
+    add r0, r11, r3, lsl #3
+    vld1.64 {d0}, [r0] //
+
+    vpaddl.u8 q0, q0
+    vpadd.u16 d0, d0, d1
+    vpaddl.u16 d0, d0
+    vmov r11, r12, d0
+    subs r10, r12
+    add r0, r10, r11
+
+    strh r0, [r1] // sum -> pFeatureOfBlock[i]
+
+    add r1, r5, r0, lsl #2
+    ldr r0, [r1]
+    add r0, #1
+    str r0, [r1]
+    subs r7, #1
+    bne _width_loop8x8_2
+
+    add r8, r3
+    add r4, r4, r6, lsl #1
+    subs r2, #1
+    bne _height_loop8x8
+_SumOf8x8BlockOfFrame_end:
+    ldmia sp!, {r4-r12}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN SumOf16x16BlockOfFrame_neon
+//(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,const int32_t kiRefStride,uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[])
+    stmdb sp!, {r4-r12}
+    ldr r5, [sp, #40] //pTimesOfFeatureValue
+    ldr r4, [sp, #36] //pFeatureOfBlock
+
+    mov r8, r0
+    mov r6, r1
+    add r8, r6
+    add r4, r4, r6, lsl #1
+
+    mov r7, r6
+_width_loop16x16_1:
+    subs r0, r8, r7
+    vld1.64 {q0}, [r0], r3
+    vpaddl.u8 q0, q0
+.rept 15
+    vld1.64 {q1}, [r0], r3
+    vpadal.u8 q0, q1
+.endr
+    vpaddl.u16 q0, q0
+    vpadd.i32 d0, d1
+    vpadd.i32 d0, d0
+
+    subs r1, r4, r7, lsl #1
+    vst1.16 {d0[0]}, [r1] // sum -> pFeatureOfBlock[i]
+    vmov    r0, r1, d0
+    add r1, r5, r0, lsl #2
+    ldr r0, [r1]
+    add r0, #1
+    str r0, [r1]
+
+    subs r7, #1
+    bne _width_loop16x16_1
+    add r8, r3
+    add r4, r4, r6, lsl #1
+    subs r2, #1
+    beq _SumOf16x16BlockOfFrame_neon_end
+
+_height_loop16x16:
+    mov r7, r6
+_width_loop16x16_2:
+    subs r0, r8, r7
+    subs r1, r4, r7, lsl #1
+    subs r9, r1, r6, lsl #1 // last line of pFeatureOfBlock[i]
+    ldrh  r10, [r9] // sum of last line of pFeatureOfBlock[i]
+
+    subs r11, r0, r3
+    vld1.64 {q1}, [r11]
+    add r0, r11, r3, lsl #4
+    vld1.64 {q0}, [r0] //
+
+    vpaddl.u8 q0, q0
+    vpaddl.u8 q1, q1
+    vpadd.u16 d0, d0, d1
+    vpadd.u16 d1, d2, d3
+    vpadd.u16 d0, d0, d1
+    vpaddl.u16 d0, d0
+
+    vmov r11, r12, d0
+    subs r10, r12
+    add r0, r10, r11
+
+    strh r0, [r1] // sum -> pFeatureOfBlock[i]
+    add r1, r5, r0, lsl #2
+    ldr r0, [r1]
+    add r0, #1
+    str r0, [r1]
+
+    subs r7, #1
+    bne _width_loop16x16_2
+
+    add r8, r3
+    add r4, r4, r6, lsl #1
+    subs r2, #1
+    bne _height_loop16x16
+_SumOf16x16BlockOfFrame_neon_end:
+    ldmia sp!, {r4-r12}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN InitializeHashforFeature_neon
+// (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize, uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+    stmdb sp!, {r4-r7}
+    ldr r4, [sp, #16] //pFeatureValuePointerList
+    bic r5, r2, #3
+_hash_assign_loop_x4:
+    vld1.64 {q0}, [r0]!
+    vshl.u32 q0, q0, #2
+    vceq.u32 q1, q0, #0
+    vand.i32 d2, d2, d3
+    vmov r6, r7, d2
+    and r6, r6, r7
+    cmp r6, #0xffffffff
+    beq _hash_assign_with_copy_x4
+
+    veor q1, q1
+    vext.32 q2, q1, q0, #3
+    vext.32 q3, q1, q0, #2
+    vext.32 q4, q1, q0, #1
+    vadd.u32 q0, q0, q2
+    vadd.u32 q0, q0, q3
+    vadd.u32 q0, q0, q4
+    vext.32 q2, q1, q0, #3
+    vdup.32  q3, r1
+    vadd.u32 q2, q2, q3
+    vst1.64 {q2}, [r3]!
+    vst1.64 {q2}, [r4]!
+    vmov.32 r6, d1[1]
+    add r1, r1, r6
+    b _assign_next
+
+_hash_assign_with_copy_x4:
+    vdup.32  q2, r1
+    vst1.64 {q2}, [r3]!
+    vst1.64 {q2}, [r4]!
+
+_assign_next:
+    subs r5, r5, #4
+    bne _hash_assign_loop_x4
+
+    and r5, r2, #3
+    cmp r5, #0
+    beq _hash_assign_end
+_hash_assign_loop_x4_rem:
+    str r1, [r3], #4
+    str r1, [r4], #4
+    ldr r7, [r0], #4
+    lsl r7, r7, #2
+    add r1, r1, r7
+    subs r5, r5, #1
+    bne _hash_assign_loop_x4_rem
+_hash_assign_end:
+
+    ldmia sp!, {r4-r7}
+WELS_ASM_FUNC_END
+
+.align 4
+mv_x_inc_x4: .short 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00
+mv_y_inc_x4: .short 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00
+mx_x_offset_x4: .short 0x00, 0x04, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x00
+
+WELS_ASM_FUNC_BEGIN FillQpelLocationByFeatureValue_neon
+// void  (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight, uint16_t** pFeatureValuePointerList)
+    stmdb sp!, {r4-r8}
+    vpush {q4-q7}
+    adr r7, mv_x_inc_x4
+    vld1.64 {q7}, [r7]
+    adr r7, mv_y_inc_x4
+    vld1.64 {q6}, [r7]
+    adr r7, mx_x_offset_x4
+    vld1.64 {q5}, [r7]
+    veor q4, q4
+    veor q3, q3
+    vdup.32 q8, r3
+_hash_height_loop:
+    mov r7, r1
+    vmov q2, q5 //mx_x_offset_x4
+_hash_width_loop:
+    vld1.64 {d0}, [r0]!
+    vshll.u16 q0, d0, #2
+    vadd.u32 q0, q8
+    vmov q1, q2
+    vmov q4, q3
+    vzip.16 q1, q4
+
+    vmov.32 r4, d0[0]
+    ldr r5, [r4]
+    vmov.32 r6, d2[0]
+    str r6, [r5]
+    add r5, r5, #4
+    pld [r5] // cache miss?
+    str r5, [r4]
+
+    vmov.32 r4, d0[1]
+    ldr r5, [r4]
+    vmov.32 r6, d2[1]
+    str r6, [r5]
+    add r5, r5, #4
+    pld [r5] // cache miss?
+    str r5, [r4]
+
+    vmov.32 r4, d1[0]
+    ldr r5, [r4]
+    vmov.32 r6, d3[0]
+    str r6, [r5]
+    add r5, r5, #4
+    pld [r5] // cache miss?
+    str r5, [r4]
+
+    vmov.32 r4, d1[1]
+    ldr r5, [r4]
+    vmov.32 r6, d3[1]
+    str r6, [r5]
+    add r5, r5, #4
+    pld [r5] // cache miss?
+    str r5, [r4]
+
+    vadd.u16 q2, q2, q7
+    subs r7, #4
+    bne _hash_width_loop
+
+    vadd.u16 q3, q3, q6
+    subs r2, #1
+    bne _hash_height_loop
+
+    vpop {q4-q7}
+    ldmia sp!, {r4-r8}
+WELS_ASM_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
new file mode 100644
index 0000000000..ef50027d64
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_aarch64_neon.S
@@ -0,0 +1,505 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+// for Luma 4x4
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredH_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+.rept 4
+    ld1r    {v0.8b}, [x3], x2
+    st1     {v0.S}[0], [x0], 4
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredDc_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     x4, x1, #1
+    ldr     s0, [x3]
+    ld1     {v0.b}[4], [x4], x2
+    ld1     {v0.b}[5], [x4], x2
+    ld1     {v0.b}[6], [x4], x2
+    ld1     {v0.b}[7], [x4]
+    uaddlv  h0, v0.8b
+    uqrshrn b0, h0, #3
+    dup     v0.8b, v0.b[0]
+.rept 4
+    st1     {v0.S}[0], [x0], 4
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredDcTop_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     v0.8b, v0.8b, v0.8b
+    ldr     s0, [x3]
+    uaddlv  h0, v0.8b
+    uqrshrn v0.8b, v0.8h, #2
+    dup     v0.8b, v0.b[0]
+.rept 4
+    st1     {v0.S}[0], [x0], 4
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredDDL_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+    dup     v1.8b, v0.b[7]
+    ext     v2.8b, v0.8b, v1.8b, #1
+    ext     v3.8b, v0.8b, v1.8b, #2
+    ushll   v2.8h, v2.8b, #1
+    uaddl   v1.8h, v3.8b, v0.8b
+    add     v1.8h, v1.8h, v2.8h
+    uqrshrn v1.8b, v1.8h, #2
+    st1     {v1.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #1
+    st1     {v0.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #2
+    st1     {v0.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #3
+    st1     {v0.S}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredDDLTop_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+    dup     v1.8b, v0.b[3]
+    mov     v0.S[1], v1.S[0]
+    ext     v2.8b, v0.8b, v1.8b, #1
+    ext     v3.8b, v0.8b, v1.8b, #2
+    ushll   v2.8h, v2.8b, #1
+    uaddl   v1.8h, v3.8b, v0.8b
+    add     v1.8h, v1.8h, v2.8h
+    uqrshrn v1.8b, v1.8h, #2
+    st1     {v1.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #1
+    st1     {v0.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #2
+    st1     {v0.S}[0], [x0], 4
+    ext     v0.8b, v1.8b, v2.8b, #3
+    st1     {v0.S}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredVL_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v1.8h, v1.8b, v0.8b
+    uqrshrn v0.8b, v1.8h, #1           // v0.8b is VL0, VL1, VL2, VL3, VL4, ...
+    ext     v2.16b, v1.16b, v1.16b, #2
+    add     v1.8h, v2.8h, v1.8h
+    uqrshrn v1.8b, v1.8h, #2          // v1.8b is VL5, VL6, VL7, VL8, VL9
+    st1     {v0.s}[0], [x0], 4 // write the first row
+    st1     {v1.s}[0], [x0], 4 // write the second row
+    ext     v3.8b, v0.8b, v0.8b, #1
+    ext     v2.8b, v1.8b, v1.8b, #1
+    st1     {v3.s}[0], [x0], 4 // write the third row
+    st1     {v2.s}[0], [x0]     // write the fourth row
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredVLTop_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+    dup     v1.8b, v0.b[3]
+    mov     v0.s[1], v1.s[0]
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v1.8h, v1.8b, v0.8b
+    uqrshrn v0.8b, v1.8h, #1           // v0.8b is VL0, VL1, VL2, VL3, VL4, ...
+    ext     v2.16b, v1.16b, v1.16b, #2
+    add     v1.8h, v2.8h, v1.8h
+    uqrshrn v1.8b, v1.8h, #2          // v1.8b is VL5, VL6, VL7, VL8, VL9
+    st1     {v0.s}[0], [x0], 4 // write the first row
+    st1     {v1.s}[0], [x0], 4 // write the second row
+    ext     v3.8b, v0.8b, v0.8b, #1
+    ext     v2.8b, v1.8b, v1.8b, #1
+    st1     {v3.s}[0], [x0], 4 // write the third row
+    st1     {v2.s}[0], [x0]     // write the fourth row
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredVR_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.s}[1], [x3]
+    sub     x3, x3, #1
+    ld1     {v0.b}[3], [x3], x2
+    ld1     {v0.b}[2], [x3], x2
+    ld1     {v0.b}[1], [x3], x2
+    ld1     {v0.b}[0], [x3]         // v0.8b l2, l1, l0, lt, t0, t1, t2, t3
+
+    ext     v1.8b, v0.8b, v0.8b, #7
+    uaddl   v2.8h, v1.8b, v0.8b     //v2:{X,L2+L1,L1+L0,L0+LT,LT+T0,T0+T1,T1+T2,T2+T3}
+    ext     v1.16b, v2.16b, v2.16b, #14
+    add     v3.8h, v2.8h, v1.8h     //v3:{X,L2+L1+L1+L0,L1+L0+L0+LT,...T1+T2+T2+T3}
+
+    uqrshrn v3.8b, v3.8h, #2
+    uqrshrn v2.8b, v2.8h, #1
+
+    st1     {v2.s}[1], [x0], 4
+    st1     {v3.s}[1], [x0], 4
+
+    ext     v2.8b, v2.8b, v2.8b, #7
+    ins     v2.b[4], v3.b[3]
+    st1     {v2.s}[1], [x0], 4
+
+    ext     v3.8b, v3.8b, v3.8b, #7
+    ins     v3.b[4], v3.b[3]
+    st1     {v3.s}[1], [x0]
+
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredHU_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+    mov     x4, #3
+    mul     x4, x4, x2
+    add     x4, x4, x3
+    ld1r    {v0.8b}, [x4]
+    ld1     {v0.b}[4], [x3], x2
+    ld1     {v0.b}[5], [x3], x2
+    ld1     {v0.b}[6], [x3], x2     //d0:{L3,L3,L3,L3,L0,L1,L2,L3}
+
+    ext     v1.8b, v0.8b, v0.8b, #1
+    uaddl   v2.8h, v0.8b, v1.8b     //v2:{L3+L3,L3+L3,L3+L3,L3+L0,L0+L1,L1+L2,L2+L3,L3+L3}
+    ext     v3.16b, v2.16b, v2.16b, #2
+    add     v3.8h, v3.8h, v2.8h     //v2:{x, HU1, HU3, HU5, x}
+
+    uqrshrn v2.8b, v2.8h, #1 // HU0, HU2, HU4
+    uqrshrn v3.8b, v3.8h, #2 // HU1, HU3, HU5
+    zip2    v3.8b, v2.8b, v3.8b // HU0, HU1, HU2, HU3, HU4, HU5
+    mov     v3.h[3], v0.h[0] // v0.8b is hu0, hu1, hu2, hu3, hu4, hu5, l3, l3
+    ext     v2.8b, v3.8b, v0.8b, #2
+    st1     {v3.s}[0], [x0], 4
+    st1     {v2.s}[0], [x0], 4
+    st1     {v3.s}[1], [x0], 4
+    st1     {v0.s}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI4x4LumaPredHD_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+    sub     x3, x3, x2 // x2 points to top left
+    ld1     {v0.s}[1], [x3], x2
+    ld1     {v0.b}[3], [x3], x2
+    ld1     {v0.b}[2], [x3], x2
+    ld1     {v0.b}[1], [x3], x2
+    ld1     {v0.b}[0], [x3]         // v0.8b: l3, l2, l1, l0, lt, t0, t1, t2
+    ext     v1.8b, v0.8b, v0.8b, #1 // v1.8b: l2, l1, l0, lt, t0, t1, t2, l3
+    uaddl   v2.8h, v0.8b, v1.8b
+    ext     v3.16b, v2.16b, v2.16b, #2
+    add     v3.8h, v3.8h, v2.8h
+    uqrshrn v2.8b, v2.8h, #1  // hd8, hd6, hd4, hd0, xxx
+    uqrshrn v3.8b, v3.8h, #2 // hd9, hd7, hd5, hd1, hd2, hd3
+    zip1    v2.8b, v2.8b, v3.8b // hd8, hd9, hd6, hd7, hd4, hd5, hd0, hd1
+    mov     v1.h[0], v3.h[2]
+    ext     v3.8b, v2.8b, v1.8b, #6
+    st1     {v3.s}[0], [x0], 4
+    st1     {v2.s}[1], [x0], 4
+    ext     v3.8b, v2.8b, v1.8b, #2
+    st1     {v3.s}[0], [x0], 4
+    st1     {v2.s}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+// for Chroma 8x8
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIChromaPredV_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+.rept   8
+    st1     {v0.8b}, [x0], 8
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIChromaPredH_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+.rept 8
+    ld1r    {v0.8b}, [x3], x2
+    st1     {v0.8b}, [x0], 8
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIChromaPredDc_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     x4, x1, #1
+    ld1     {v0.8b}, [x3]
+    ld1     {v0.b}[8], [x4], x2
+    ld1     {v0.b}[9], [x4], x2
+    ld1     {v0.b}[10], [x4], x2
+    ld1     {v0.b}[11], [x4], x2
+    ld1     {v0.b}[12], [x4], x2
+    ld1     {v0.b}[13], [x4], x2
+    ld1     {v0.b}[14], [x4], x2
+    ld1     {v0.b}[15], [x4]
+
+    uaddlp  v1.8h, v0.16b
+    uaddlp  v2.4s, v1.8h
+    ins     v3.d[0], v2.d[1]
+    add     v3.2s, v2.2s, v3.2s
+    urshr   v2.4s, v2.4s, #2
+    urshr   v3.2s, v3.2s, #3
+
+    dup     v0.8b, v3.b[0]
+    dup     v1.8b, v2.b[4]
+    dup     v2.8b, v2.b[12]
+    dup     v3.8b, v3.b[4]
+    ins     v0.s[1], v1.s[0]
+    ins     v2.s[1], v3.s[0]
+.rept 4
+    st1     {v0.8b}, [x0], 8
+.endr
+.rept 4
+    st1     {v2.8b}, [x0], 8
+.endr
+
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIChromaPredDcTop_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.8b}, [x3]
+    uaddlp  v0.4h, v0.8b
+    addp    v0.8h, v0.8h, v0.8h
+    dup     v1.8h, v0.h[0]
+    dup     v2.8h, v0.h[1]
+    mov     v1.D[1], v2.D[0]
+    uqrshrn  v1.8b, v1.8h, #2
+.rept 8
+    st1     {v1.8b}, [x0], 8
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+.align 4
+intra_1_to_4: .short 17*1, 17*2, 17*3, 17*4, 17*1, 17*2, 17*3, 17*4
+intra_m3_to_p4: .short -3, -2, -1, 0, 1, 2, 3, 4
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIChromaPredPlane_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     x3, x3, #1
+    mov     x4, x3
+    // load pTop[2-i] and pLeft[(2-i)*kiStride]
+    ld1     {v1.b}[3], [x3], #1
+    ld1     {v1.b}[2], [x3], #1
+    ld1     {v1.b}[1], [x3], #1
+    ld1     {v1.b}[0], [x3], #1
+    ld1     {v1.b}[7], [x4], x2
+    ld1     {v1.b}[6], [x4], x2
+    ld1     {v1.b}[5], [x4], x2
+    ld1     {v1.b}[4], [x4], x2
+    add     x3, x3, #1
+    add     x4, x4, x2
+    // load pTop[4+i] and pLeft[(4+i)*kiStride]
+    ld1     {v0.b}[0], [x3], #1
+    ld1     {v0.b}[1], [x3], #1
+    ld1     {v0.b}[2], [x3], #1
+    ld1     {v0.b}[3], [x3], #1
+    ld1     {v0.b}[4], [x4], x2
+    ld1     {v0.b}[5], [x4], x2
+    ld1     {v0.b}[6], [x4], x2
+    ld1     {v0.b}[7], [x4], x2
+
+    uxtl    v1.8h, v1.8b
+    uxtl    v0.8h, v0.8b
+    ldr     q2, intra_1_to_4
+    ldr     q3, intra_m3_to_p4
+    dup     v4.8h, v0.h[3]
+    dup     v5.8h, v0.h[7]
+    add     v4.8h, v4.8h, v5.8h
+    sub     v0.8h, v0.8h, v1.8h
+    shl     v4.8h, v4.8h, #4 // v4.8h is a
+    mul     v0.8h, v0.8h, v2.8h // v0.h[0-3] is H, v0.h[4-7] is V
+    saddlp  v0.4s, v0.8h
+    addp    v0.4s, v0.4s, v0.4s // v0.s[0] is H, v0.s[1] is V
+    sqrshrn v0.4h, v0.4s, #5
+    dup     v1.8h, v0.h[0]      // v1.8h is b
+    dup     v0.8h, v0.h[1]      // v0.8h is c
+    mla     v4.8h, v1.8h, v3.8h
+    mla     v4.8h, v0.8h, v3.h[0]
+    sqrshrun v1.8b, v4.8h, #5
+    st1     {v1.8b}, [x0], 8
+.rept 7
+    add     v4.8h, v4.8h, v0.8h
+    sqrshrun v1.8b, v4.8h, #5
+    st1     {v1.8b}, [x0], 8
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredDc_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     x4, x1, #1
+    ld1     {v0.16b}, [x3]
+    ld1     {v1.b}[0], [x4], x2
+    ld1     {v1.b}[1], [x4], x2
+    ld1     {v1.b}[2], [x4], x2
+    ld1     {v1.b}[3], [x4], x2
+    ld1     {v1.b}[4], [x4], x2
+    ld1     {v1.b}[5], [x4], x2
+    ld1     {v1.b}[6], [x4], x2
+    ld1     {v1.b}[7], [x4], x2
+    ld1     {v1.b}[8], [x4], x2
+    ld1     {v1.b}[9], [x4], x2
+    ld1     {v1.b}[10], [x4], x2
+    ld1     {v1.b}[11], [x4], x2
+    ld1     {v1.b}[12], [x4], x2
+    ld1     {v1.b}[13], [x4], x2
+    ld1     {v1.b}[14], [x4], x2
+    ld1     {v1.b}[15], [x4]
+    // reduce instruction
+    uaddlv    h0, v0.16b
+    uaddlv    h1, v1.16b
+    add       v0.8h, v0.8h, v1.8h
+    uqrshrn    b0, h0, #5
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredDcTop_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    ld1     {v0.16b}, [x3]
+    // reduce instruction
+    uaddlv    h0, v0.16b
+    uqrshrn    v0.8b, v0.8h, 4
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredDcLeft_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, #1
+    ld1     {v1.b}[0], [x3], x2
+    ld1     {v1.b}[1], [x3], x2
+    ld1     {v1.b}[2], [x3], x2
+    ld1     {v1.b}[3], [x3], x2
+    ld1     {v1.b}[4], [x3], x2
+    ld1     {v1.b}[5], [x3], x2
+    ld1     {v1.b}[6], [x3], x2
+    ld1     {v1.b}[7], [x3], x2
+    ld1     {v1.b}[8], [x3], x2
+    ld1     {v1.b}[9], [x3], x2
+    ld1     {v1.b}[10], [x3], x2
+    ld1     {v1.b}[11], [x3], x2
+    ld1     {v1.b}[12], [x3], x2
+    ld1     {v1.b}[13], [x3], x2
+    ld1     {v1.b}[14], [x3], x2
+    ld1     {v1.b}[15], [x3]
+    // reduce instruction
+    uaddlv    h1, v1.16b
+    uqrshrn    v0.8b, v1.8h, #4
+    dup       v0.16b, v0.b[0]
+.rept 16
+    st1     {v0.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+
+.align 4
+intra_1_to_8: .short 5, 10, 15, 20, 25, 30, 35, 40
+intra_m7_to_p8: .short -7, -6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8
+//void WelsI16x16LumaPredPlane_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsI16x16LumaPredPlane_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    sub     x3, x1, x2
+    sub     x3, x3, #1
+    mov     x4, x3
+    ld1     {v0.8b}, [x4] // v0 low 8 bit in top(reverse order)
+    add     x4, x4, #9
+    rev64   v0.8b, v0.8b  // reverse v0
+    ld1     {v1.8b}, [x4] // v1 high 8 bit in top
+    uxtl    v0.8h, v0.8b  // extend to 16 bit integer
+    uxtl    v1.8h, v1.8b  // extend to 16 bit integer
+    ld1     {v2.b}[7], [x3], x2
+    ld1     {v2.b}[6], [x3], x2
+    ld1     {v2.b}[5], [x3], x2
+    ld1     {v2.b}[4], [x3], x2
+    ld1     {v2.b}[3], [x3], x2
+    ld1     {v2.b}[2], [x3], x2
+    ld1     {v2.b}[1], [x3], x2
+    ld1     {v2.b}[0], [x3], x2 // v2.8b low 8 bit in left
+    add     x3, x3, x2
+    ld1     {v3.b}[0], [x3], x2
+    ld1     {v3.b}[1], [x3], x2
+    ld1     {v3.b}[2], [x3], x2
+    ld1     {v3.b}[3], [x3], x2
+    ld1     {v3.b}[4], [x3], x2
+    ld1     {v3.b}[5], [x3], x2
+    ld1     {v3.b}[6], [x3], x2
+    ld1     {v3.b}[7], [x3]      // v3.8b high 8bit in left
+    uxtl    v2.8h, v2.8b
+    uxtl    v3.8h, v3.8b
+    sub     v0.8h, v1.8h, v0.8h
+    sub     v2.8h, v3.8h, v2.8h
+    ldr     q4, intra_1_to_8
+    mul     v0.8h, v0.8h, v4.8h
+    mul     v2.8h, v2.8h, v4.8h
+    saddlv  s0, v0.8h
+    saddlv  s2, v2.8h
+    add     v1.8h, v1.8h, v3.8h
+    sqrshrn v0.4h, v0.4S, #6  // b is in v0.h[0]
+    sqrshrn v2.4h, v2.4S, #6  // c is in v2.h[0]
+    shl     v1.8h, v1.8h, #4   // a is in v1.h[7]
+    ldr     q4, intra_m7_to_p8
+    ldr     q5, intra_m7_to_p8 + 16
+    dup     v1.8h, v1.h[7]
+    dup     v3.8h, v1.h[7]
+    mla     v1.8h, v4.8h, v0.h[0]
+    mla     v3.8h, v5.8h, v0.h[0]
+    dup     v2.8h, v2.h[0] // v2.8h is [cccccccc]
+    mla     v1.8h, v2.8h, v4.h[0]
+    mla     v3.8h, v2.8h, v4.h[0]
+    sqrshrun v4.8b, v1.8h, #5
+    sqrshrun2 v4.16b, v3.8h, #5
+    st1     {v4.16b}, [x0], 16
+.rept 15
+    add     v1.8h, v1.8h, v2.8h
+    add     v3.8h, v3.8h, v2.8h
+    sqrshrun v4.8b, v1.8h, #5
+    sqrshrun2 v4.16b, v3.8h, #5
+    st1     {v4.16b}, [x0], 16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
new file mode 100644
index 0000000000..a41621370c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S
@@ -0,0 +1,611 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro LOAD_LUMA_DATA
+    sub     x7, x0, x1
+    ld1     {v0.16b}, [x7]      //top
+    sub     x7, x0, #1
+    ld1     {v1.b}[0], [x7], x1
+    ld1     {v1.b}[1], [x7], x1
+    ld1     {v1.b}[2], [x7], x1
+    ld1     {v1.b}[3], [x7], x1
+    ld1     {v1.b}[4], [x7], x1
+    ld1     {v1.b}[5], [x7], x1
+    ld1     {v1.b}[6], [x7], x1
+    ld1     {v1.b}[7], [x7], x1
+    ld1     {v1.b}[8], [x7], x1
+    ld1     {v1.b}[9], [x7], x1
+    ld1     {v1.b}[10], [x7], x1
+    ld1     {v1.b}[11], [x7], x1
+    ld1     {v1.b}[12], [x7], x1
+    ld1     {v1.b}[13], [x7], x1
+    ld1     {v1.b}[14], [x7], x1
+    ld1     {v1.b}[15], [x7]    //left
+.endm
+
+.macro LOAD_16X4_DATA
+    //Load the p_enc data and save to "v22 ~ v25"--- 16X4 bytes
+    ld1     {v0.16b}, [x2], x3
+    ld1     {v1.16b}, [x2], x3
+    ld1     {v20.16b}, [x2], x3
+    ld1     {v21.16b}, [x2], x3
+    trn1    v22.4s, v0.4s, v1.4s
+    trn2    v23.4s, v0.4s, v1.4s
+    trn1    v24.4s, v20.4s, v21.4s
+    trn2    v25.4s, v20.4s, v21.4s
+.endm
+
+.macro GET_16X16_V_SATD
+    trn1    v6.4s, v4.4s, v5.4s
+    trn2    v7.4s, v4.4s, v5.4s
+    add     v4.8h, v6.8h, v7.8h
+    sub     v5.8h, v6.8h, v7.8h
+    trn1    v6.8h, v4.8h, v5.8h
+    trn2    v7.8h, v4.8h, v5.8h
+    add     v4.8h, v6.8h, v7.8h
+    sub     v5.8h, v6.8h, v7.8h
+    trn1    v6.4s, v4.4s, v5.4s
+    trn2    v7.4s, v4.4s, v5.4s     //{0,1,3,2, 4,5,7,6} v6 {8,9,11,10, 12,13,15,14} v7
+.endm
+
+.macro GET_16X16_H_SATD
+    trn1    v16.4s, v4.4s, v5.4s
+    trn2    v17.4s, v4.4s, v5.4s
+    add     v4.8h, v16.8h, v17.8h
+    sub     v5.8h, v16.8h, v17.8h
+    trn1    v16.8h, v4.8h, v5.8h
+    trn2    v17.8h, v4.8h, v5.8h
+    add     v4.8h, v16.8h, v17.8h
+    sub     v5.8h, v16.8h, v17.8h
+    trn1    v16.4s, v4.4s, v5.4s
+    trn2    v17.4s, v4.4s, v5.4s    //{0,1,3,2, 4,5,7,6} v16 {8,9,11,10, 12,13,15,14} v17
+.endm
+
+.macro SELECT_BEST_COST arg0, arg1, arg2
+    cmp     w1, \arg0
+    csel    \arg0, \arg0, w1, \arg2
+    cset    w7, \arg1
+    cmp     w2, \arg0
+    mov     w6, #2
+    csel    \arg0, \arg0, w2, \arg2
+    csel    w7, w7, w6, \arg2
+.endm
+
+.macro SELECT_BEST_COST_PREFER_HIGHER arg0
+    SELECT_BEST_COST \arg0, ls, hi
+.endm
+
+.macro SELECT_BEST_COST_PREFER_LOWER arg0
+    SELECT_BEST_COST \arg0, lo, hs
+.endm
+
+.macro LOAD_CHROMA_DATA arg0, arg1, arg2
+    sub     x9, \arg0, x1
+    ld1     {\arg1}, [x9]      //top_cb
+    sub     x9, \arg0, #1
+    ld1     {\arg2}[8], [x9], x1
+    ld1     {\arg2}[9], [x9], x1
+    ld1     {\arg2}[10], [x9], x1
+    ld1     {\arg2}[11], [x9], x1
+    ld1     {\arg2}[12], [x9], x1
+    ld1     {\arg2}[13], [x9], x1
+    ld1     {\arg2}[14], [x9], x1
+    ld1     {\arg2}[15], [x9], x1 //left_cb
+.endm
+
+.macro LOAD_8X4_DATA arg0
+    //Load the p_enc data and save to "v20 ~ v21"--- 8X4 bytes
+    ld1     {v0.8b}, [\arg0], x3
+    ld1     {v1.8b}, [\arg0], x3
+    ld1     {v0.d}[1], [\arg0], x3
+    ld1     {v1.d}[1], [\arg0], x3
+    trn1    v2.4s, v0.4s, v1.4s
+    trn2    v1.4s, v0.4s, v1.4s
+    trn1    v20.2d, v2.2d, v1.2d
+    trn2    v21.2d, v2.2d, v1.2d
+.endm
+
+.macro HDM_TRANSFORM_4X4_L0 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+    //Do the vertical transform
+    uadd\arg9\()   v0.8h, \arg0, \arg1
+    usub\arg9\()   v1.8h, \arg0, \arg1
+    trn1    v3.2d, v0.2d, v1.2d
+    trn2    v1.2d, v0.2d, v1.2d
+    add     v4.8h, v3.8h, v1.8h //{0,1,2,3,4,5,6,7}
+    sub     v5.8h, v3.8h, v1.8h //{12,13,14,15,8,9,10,11}
+
+    //Do the horizontal transform
+    trn1    v0.4s, v4.4s, v5.4s
+    trn2    v1.4s, v4.4s, v5.4s
+    add     v4.8h, v0.8h, v1.8h
+    sub     v5.8h, v0.8h, v1.8h
+    trn1    v0.8h, v4.8h, v5.8h
+    trn2    v1.8h, v4.8h, v5.8h
+    add     v4.8h, v0.8h, v1.8h
+    sub     v5.8h, v0.8h, v1.8h
+
+    //16x16_v
+    trn1    v0.2s, v4.2s, v5.2s
+    trn2    v1.2s, v4.2s, v5.2s
+    sabal   \arg5, v0.4h, \arg2
+    sabal   \arg5, v1.4h, \arg8\().4h
+    sabal2  \arg5, v4.8h, \arg8\().8h
+    sabal2  \arg5, v5.8h, \arg8\().8h
+
+    //16x16_h
+    ins     v3.d[0], v4.d[1]
+    trn1    v0.4h, v4.4h, v3.4h
+    trn2    v1.4h, v4.4h, v3.4h
+    sabal   \arg6, v0.4h, \arg3
+    sabdl   v4.4s, v1.4h, \arg8\().4h
+    sabal   v4.4s, v5.4h, \arg8\().4h
+    sabal2  v4.4s, v5.8h, \arg8\().8h
+    add     \arg6, \arg6, v4.4s
+
+    //16x16_dc_both
+    sabal   \arg7, v0.4h, \arg4
+    add     \arg7, \arg7, v4.4s
+.endm
+
+//int32_t WelsIntra8x8Combined3Sad_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,uint8_t*);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIntra8x8Combined3Sad_AArch64_neon
+    ldr     x11, [sp, #0]
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    LOAD_CHROMA_DATA x0, v0.8b, v0.b
+
+    uaddlp  v1.8h, v0.16b
+    uaddlp  v2.4s, v1.8h
+    ins     v3.d[0], v2.d[1]
+    add     v3.2s, v2.2s, v3.2s
+    urshr   v2.4s, v2.4s, #2
+    urshr   v3.2s, v3.2s, #3
+
+    dup     v20.8b, v3.b[0]
+    dup     v21.8b, v2.b[4]
+    dup     v22.8b, v2.b[12]
+    dup     v23.8b, v3.b[4]
+    ins     v20.s[1], v21.s[0]
+    ins     v22.s[1], v23.s[0]
+
+    LOAD_CHROMA_DATA x7, v4.8b, v4.b
+
+    uaddlp  v5.8h, v4.16b
+    uaddlp  v6.4s, v5.8h
+    ins     v7.d[0], v6.d[1]
+    add     v7.2s, v6.2s, v7.2s
+    urshr   v6.4s, v6.4s, #2
+    urshr   v7.2s, v7.2s, #3
+
+    dup     v24.8b, v7.b[0]
+    dup     v25.8b, v6.b[4]
+    dup     v26.8b, v6.b[12]
+    dup     v27.8b, v7.b[4]
+    ins     v24.s[1], v25.s[0]
+    ins     v26.s[1], v27.s[0]
+
+    sub     x9, x0, #1
+    sub     x10, x7, #1
+
+    ld1     {v3.8b}, [x2], x3
+    ld1     {v5.8b}, [x11], x3
+
+    ld1r    {v6.8b}, [x9], x1
+    ld1r    {v7.8b}, [x10], x1
+
+    uabdl   v29.8h, v0.8b, v3.8b
+    uabal   v29.8h, v4.8b, v5.8b   //top
+
+    uabdl   v30.8h, v6.8b, v3.8b
+    uabal   v30.8h, v7.8b, v5.8b   //left
+
+    uabdl   v31.8h, v20.8b, v3.8b
+    uabal   v31.8h, v24.8b, v5.8b   //Dc
+.rept 3
+    ld1     {v3.8b}, [x2], x3
+    ld1     {v5.8b}, [x11], x3
+
+    ld1r    {v6.8b}, [x9], x1
+    ld1r    {v7.8b}, [x10], x1
+
+    uabal   v29.8h, v0.8b, v3.8b
+    uabal   v29.8h, v4.8b, v5.8b   //top
+
+    uabal   v30.8h, v6.8b, v3.8b
+    uabal   v30.8h, v7.8b, v5.8b   //left
+
+    uabal   v31.8h, v20.8b, v3.8b
+    uabal   v31.8h, v24.8b, v5.8b   //Dc
+.endr
+
+.rept 4
+    ld1     {v3.8b}, [x2], x3
+    ld1     {v5.8b}, [x11], x3
+
+    ld1r    {v6.8b}, [x9], x1
+    ld1r    {v7.8b}, [x10], x1
+
+    uabal   v29.8h, v0.8b, v3.8b
+    uabal   v29.8h, v4.8b, v5.8b   //top
+
+    uabal   v30.8h, v6.8b, v3.8b
+    uabal   v30.8h, v7.8b, v5.8b   //left
+
+    uabal   v31.8h, v22.8b, v3.8b
+    uabal   v31.8h, v26.8b, v5.8b   //Dc
+.endr
+
+    saddlv  s29, v29.8h
+    fmov    w2, s29
+    add     w2, w2, w5, lsl #1
+    saddlv  s30, v30.8h
+    fmov    w1, s30
+    add     w1, w1, w5, lsl #1
+    saddlv  s31, v31.8h
+    fmov    w0, s31
+
+    SELECT_BEST_COST_PREFER_HIGHER w0
+
+    str     w7, [x4]
+WELS_ASM_AARCH64_FUNC_END
+
+//int32_t WelsIntra16x16Combined3Sad_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIntra16x16Combined3Sad_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    LOAD_LUMA_DATA
+
+    uaddlv    h2, v0.16b
+    uaddlv    h3, v1.16b
+    add       v2.8h, v2.8h, v3.8h
+    uqrshrn   b2, h2, #5
+    dup       v2.16b, v2.b[0]   //Dc
+
+    sub     x7, x0, #1
+    ld1     {v3.16b}, [x2], x3
+    ld1r    {v4.16b}, [x7], x1
+
+    uabdl   v29.8h, v0.8b, v3.8b
+    uabal2  v29.8h, v0.16b,v3.16b   //top
+
+    uabdl   v30.8h, v4.8b, v3.8b
+    uabal2  v30.8h, v4.16b,v3.16b   //left
+
+    uabdl   v31.8h, v2.8b, v3.8b
+    uabal2  v31.8h, v2.16b,v3.16b   //Dc
+    mov     x6, #15
+sad_intra_16x16_x3_opt_loop0:
+    ld1     {v3.16b}, [x2], x3
+    ld1r    {v4.16b}, [x7], x1
+
+    uabal   v29.8h, v0.8b, v3.8b
+    uabal2  v29.8h, v0.16b,v3.16b   //top
+
+    uabal   v30.8h, v4.8b, v3.8b
+    uabal2  v30.8h, v4.16b,v3.16b   //left
+
+    uabal   v31.8h, v2.8b, v3.8b
+    uabal2  v31.8h, v2.16b,v3.16b   //Dc
+    sub     x6, x6, #1
+    cbnz    x6,  sad_intra_16x16_x3_opt_loop0
+
+    saddlv  s29, v29.8h
+    fmov    w0, s29
+    saddlv  s30, v30.8h
+    fmov    w1, s30
+    add     w1, w1, w5, lsl #1
+    saddlv  s31, v31.8h
+    fmov    w2, s31
+    add     w2, w2, w5, lsl #1
+
+    SELECT_BEST_COST_PREFER_LOWER w0
+
+    str     w7, [x4]
+WELS_ASM_AARCH64_FUNC_END
+
+//int32_t WelsIntra4x4Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t,int32_t);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIntra4x4Combined3Satd_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x6,w6
+    SIGN_EXTENSION x7,w7
+
+    sub     x9, x0, x1
+    ld1     {v16.s}[0], [x9]      //top
+    sub     x9, x0, #1
+    ld1     {v16.b}[4], [x9], x1
+    ld1     {v16.b}[5], [x9], x1
+    ld1     {v16.b}[6], [x9], x1
+    ld1     {v16.b}[7], [x9], x1
+
+
+    uaddlv  h2, v16.8b
+    uqrshrn b17, h2, #3
+    urshr   v2.4h, v2.4h, #3
+    shl     v2.4h, v2.4h, #4
+
+    //Calculate the 4x4_v 4x4_h mode SATD and save to "v6, v7"
+    ushll   v4.8h, v16.8b, #2
+    ins     v5.d[0], v4.d[1]
+    trn1    v6.2s, v4.2s, v5.2s
+    trn2    v7.2s, v4.2s, v5.2s
+
+    add     v4.4h, v6.4h, v7.4h
+    sub     v5.4h, v6.4h, v7.4h
+    trn1    v6.4h, v4.4h, v5.4h
+    trn2    v7.4h, v4.4h, v5.4h
+    add     v4.4h, v6.4h, v7.4h
+    sub     v5.4h, v6.4h, v7.4h
+    trn1    v6.2s, v4.2s, v5.2s
+    trn2    v7.2s, v4.2s, v5.2s     //{0,1,3,2,top} v6 {0,1,3,2,left} v7
+
+    eor     v31.16b, v31.16b, v31.16b  //Save the SATD of DC_BOTH
+    eor     v30.16b, v30.16b, v30.16b  //Save the SATD of H
+    eor     v29.16b, v29.16b, v29.16b  //Save the SATD of V
+    eor     v28.16b, v28.16b, v28.16b  //For zero register
+
+    //Load the p_enc data and save to "v22 ~ v23"--- 16X4 bytes
+    ld1     {v22.s}[0], [x2], x3
+    ld1     {v22.s}[1], [x2], x3
+    ld1     {v23.s}[0], [x2], x3
+    ld1     {v23.s}[1], [x2], x3
+
+    HDM_TRANSFORM_4X4_L0 v22.8b, v23.8b, v6.4h, v7.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+
+    ldr     x11, [sp, #0]
+    urshr   v29.4s, v29.4s, #1
+    addv    s29, v29.4s
+    fmov    w0, s29
+    add     w0, w0, w11
+
+    urshr   v30.4s, v30.4s, #1
+    addv    s30, v30.4s
+    fmov    w1, s30
+    add     w1, w1, w7
+
+    urshr   v31.4s, v31.4s, #1
+    addv    s31, v31.4s
+    fmov    w2, s31
+    add     w2, w2, w6
+
+    mov     w10, w0
+    SELECT_BEST_COST_PREFER_HIGHER w10
+
+    str     w7, [x5]
+
+    sub     w9, w10, w2
+    cbnz    w9, satd_intra_4x4_x3_opt_jump0
+    dup     v0.16b, v17.b[0]
+    st1     {v0.16b}, [x4]
+    b       satd_intra_4x4_x3_opt_end
+
+satd_intra_4x4_x3_opt_jump0:
+    sub     w8, w10, w1
+    cbnz    w8, satd_intra_4x4_x3_opt_jump1
+    dup     v0.16b, v16.b[4]
+    dup     v1.16b, v16.b[5]
+    dup     v2.16b, v16.b[6]
+    dup     v3.16b, v16.b[7]
+    st4     {v0.s,v1.s,v2.s,v3.s}[0], [x4]
+    b       satd_intra_4x4_x3_opt_end
+
+satd_intra_4x4_x3_opt_jump1:
+    st1     {v16.S}[0], [x4], #4
+    st1     {v16.S}[0], [x4], #4
+    st1     {v16.S}[0], [x4], #4
+    st1     {v16.S}[0], [x4]
+satd_intra_4x4_x3_opt_end:
+    mov     w0, w10
+
+WELS_ASM_AARCH64_FUNC_END
+
+//int32_t WelsIntra8x8Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,uint8_t*);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIntra8x8Combined3Satd_AArch64_neon
+    ldr     x11, [sp, #0]
+
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    LOAD_CHROMA_DATA x0, v0.8b, v0.b
+
+    LOAD_CHROMA_DATA x7, v1.8b, v1.b
+
+    //Calculate the 16x16_v mode SATD and save to "v6, v7"
+    ushll   v4.8h, v0.8b, #2
+    ushll   v5.8h, v1.8b, #2
+    GET_16X16_V_SATD
+
+    //Calculate the 16x16_h mode SATD and save to "v16, v17"
+    ushll2  v4.8h, v0.16b, #2
+    ushll2  v5.8h, v1.16b, #2
+    GET_16X16_H_SATD
+
+    uaddlp  v0.8h, v0.16b
+    uaddlp  v2.4s, v0.8h
+    ins     v3.d[0], v2.d[1]
+    add     v3.2s, v2.2s, v3.2s
+
+    uaddlp  v1.8h, v1.16b
+    uaddlp  v4.4s, v1.8h
+    ins     v5.d[0], v4.d[1]
+    add     v5.2s, v4.2s, v5.2s
+
+    trn2    v0.4s, v2.4s, v4.4s
+    urshr   v0.4s, v0.4s, #2
+    urshr   v3.2s, v3.2s, #3
+    urshr   v5.2s, v5.2s, #3
+
+    ushll   v22.2d, v0.2s, #4    //{1cb, 1cr}
+    ushll2  v23.2d, v0.4s, #4    //{2cb, 2cr}
+    ushll   v24.2d, v3.2s, #4   //{0cb, 3cb}
+    ushll   v25.2d, v5.2s, #4   //{0cr, 3cr}
+
+    eor     v31.16b, v31.16b, v31.16b  //Save the SATD of DC_BOTH
+    eor     v30.16b, v30.16b, v30.16b  //Save the SATD of H
+    eor     v29.16b, v29.16b, v29.16b  //Save the SATD of V
+    eor     v28.16b, v28.16b, v28.16b  //For zero register
+
+    ins     v18.d[0], v6.d[1]
+    ins     v19.d[0], v7.d[1]
+    ins     v26.d[0], v16.d[1]
+    ins     v27.d[0], v17.d[1]
+
+    LOAD_8X4_DATA x2
+
+    HDM_TRANSFORM_4X4_L0 v20.8b, v21.8b, v6.4h, v16.4h, v24.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v20.16b, v21.16b, v18.4h, v16.4h, v22.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_8X4_DATA x11
+
+    ins     v22.d[0], v22.d[1]
+    HDM_TRANSFORM_4X4_L0 v20.8b, v21.8b, v7.4h, v17.4h, v25.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v20.16b, v21.16b, v19.4h, v17.4h, v22.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_8X4_DATA x2
+
+    ins     v24.d[0], v24.d[1]
+    HDM_TRANSFORM_4X4_L0 v20.8b, v21.8b, v6.4h, v26.4h, v23.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v20.16b, v21.16b, v18.4h, v26.4h, v24.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_8X4_DATA x11
+
+    ins     v23.d[0], v23.d[1]
+    ins     v25.d[0], v25.d[1]
+    HDM_TRANSFORM_4X4_L0 v20.8b, v21.8b, v7.4h, v27.4h, v23.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v20.16b, v21.16b, v19.4h, v27.4h, v25.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    urshr   v29.4s, v29.4s, #1
+    addv    s29, v29.4s
+    fmov    w2, s29
+    add     w2, w2, w5, lsl #1
+
+    urshr   v30.4s, v30.4s, #1
+    addv    s30, v30.4s
+    fmov    w1, s30
+    add     w1, w1, w5, lsl #1
+
+    urshr   v31.4s, v31.4s, #1
+    addv    s31, v31.4s
+    fmov    w0, s31
+
+    SELECT_BEST_COST_PREFER_HIGHER w0
+
+    str     w7, [x4]
+WELS_ASM_AARCH64_FUNC_END
+
+//int32_t WelsIntra16x16Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIntra16x16Combined3Satd_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    SIGN_EXTENSION x5,w5
+    LOAD_LUMA_DATA
+
+    uaddlv  h2, v0.16b
+    uaddlv  h3, v1.16b
+    add     v2.8h, v2.8h, v3.8h
+    urshr   v2.4h, v2.4h, #5
+    shl     v2.4h, v2.4h, #4
+
+    //Calculate the 16x16_v mode SATD and save to "v6, v7"
+    ushll   v4.8h, v0.8b, #2
+    ushll2  v5.8h, v0.16b, #2
+    GET_16X16_V_SATD
+
+    //Calculate the 16x16_h mode SATD and save to "v16, v17"
+    ushll   v4.8h, v1.8b, #2
+    ushll2  v5.8h, v1.16b, #2
+    GET_16X16_H_SATD
+
+    eor     v31.16b, v31.16b, v31.16b  //Save the SATD of DC_BOTH
+    eor     v30.16b, v30.16b, v30.16b  //Save the SATD of H
+    eor     v29.16b, v29.16b, v29.16b  //Save the SATD of V
+    eor     v28.16b, v28.16b, v28.16b  //For zero register
+
+    ins     v18.d[0], v6.d[1]
+    ins     v19.d[0], v7.d[1]
+    ins     v26.d[0], v16.d[1]
+    ins     v27.d[0], v17.d[1]
+
+    LOAD_16X4_DATA
+
+    HDM_TRANSFORM_4X4_L0 v22.8b, v24.8b, v6.4h, v16.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v22.16b, v24.16b, v7.4h, v16.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+    HDM_TRANSFORM_4X4_L0 v23.8b, v25.8b, v18.4h, v16.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v23.16b, v25.16b, v19.4h, v16.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_16X4_DATA
+
+    HDM_TRANSFORM_4X4_L0 v22.8b, v24.8b, v6.4h, v26.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v22.16b, v24.16b, v7.4h, v26.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+    HDM_TRANSFORM_4X4_L0 v23.8b, v25.8b, v18.4h, v26.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v23.16b, v25.16b, v19.4h, v26.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_16X4_DATA
+
+    HDM_TRANSFORM_4X4_L0 v22.8b, v24.8b, v6.4h, v17.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v22.16b, v24.16b, v7.4h, v17.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+    HDM_TRANSFORM_4X4_L0 v23.8b, v25.8b, v18.4h, v17.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v23.16b, v25.16b, v19.4h, v17.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    LOAD_16X4_DATA
+
+    HDM_TRANSFORM_4X4_L0 v22.8b, v24.8b, v6.4h, v27.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v22.16b, v24.16b, v7.4h, v27.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+    HDM_TRANSFORM_4X4_L0 v23.8b, v25.8b, v18.4h, v27.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l
+    HDM_TRANSFORM_4X4_L0 v23.16b, v25.16b, v19.4h, v27.4h, v2.4h, v29.4s, v30.4s, v31.4s, v28, l2
+
+    urshr   v29.4s, v29.4s, #1
+    addv    s29, v29.4s
+    fmov    w0, s29
+
+    urshr   v30.4s, v30.4s, #1
+    addv    s30, v30.4s
+    fmov    w1, s30
+    add     w1, w1, w5, lsl #1
+
+    urshr   v31.4s, v31.4s, #1
+    addv    s31, v31.4s
+    fmov    w2, s31
+    add     w2, w2, w5, lsl #1
+
+    SELECT_BEST_COST_PREFER_LOWER w0
+
+    str     w7, [x4]
+
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/memory_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/memory_aarch64_neon.S
new file mode 100644
index 0000000000..e20500df6e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/memory_aarch64_neon.S
@@ -0,0 +1,63 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+//void WelsSetMemZero_AArch64_neon (void* pDst, int32_t iSize);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSetMemZero_AArch64_neon
+    eor v0.16b, v0.16b, v0.16b
+    SIGN_EXTENSION x1,w1
+    cmp x1, #32
+    b.eq mem_zero_32_neon_start
+    b.lt mem_zero_24_neon_start
+mem_zero_loop:
+    subs x1, x1, #64
+    st1 {v0.16b}, [x0], #16
+    st1 {v0.16b}, [x0], #16
+    st1 {v0.16b}, [x0], #16
+    st1 {v0.16b}, [x0], #16
+    b.ne mem_zero_loop
+    b mem_zero_end
+
+mem_zero_32_neon_start:
+    st1 {v0.16b}, [x0], #16
+    st1 {v0.16b}, [x0], #16
+    b mem_zero_end
+mem_zero_24_neon_start:
+    st1 {v0.16b}, [x0], #16
+    st1 {v0.8b}, [x0], #8
+mem_zero_end:
+
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/pixel_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/pixel_aarch64_neon.S
new file mode 100644
index 0000000000..4840c90f37
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/pixel_aarch64_neon.S
@@ -0,0 +1,621 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro CALC_AND_STORE_SAD
+    saddlv  s2, v2.8h
+    fmov    w0, s2
+.endm
+
+.macro CALC_AND_STORE_SAD_FOUR
+    saddlv  s28, v28.8h
+    saddlv  s29, v29.8h
+    saddlv  s30, v30.8h
+    saddlv  s31, v31.8h
+    st4     {v28.s, v29.s, v30.s, v31.s}[0], [x4]
+.endm
+
+.macro LOAD_8X8_1
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x0], x1
+    ld1     {v2.8b}, [x0], x1
+    ld1     {v3.8b}, [x0], x1
+    ld1     {v4.8b}, [x0], x1
+    ld1     {v5.8b}, [x0], x1
+    ld1     {v6.8b}, [x0], x1
+    ld1     {v7.8b}, [x0], x1
+.endm
+
+.macro LOAD_16X8_1
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x0], x1
+    ld1     {v2.16b}, [x0], x1
+    ld1     {v3.16b}, [x0], x1
+    ld1     {v4.16b}, [x0], x1
+    ld1     {v5.16b}, [x0], x1
+    ld1     {v6.16b}, [x0], x1
+    ld1     {v7.16b}, [x0], x1
+.endm
+
+.macro LOAD_8X8_2 arg0
+    ld1     {v16.8b}, [\arg0], x3
+    ld1     {v17.8b}, [\arg0], x3
+    ld1     {v18.8b}, [\arg0], x3
+    ld1     {v19.8b}, [\arg0], x3
+    ld1     {v20.8b}, [\arg0], x3
+    ld1     {v21.8b}, [\arg0], x3
+    ld1     {v22.8b}, [\arg0], x3
+    ld1     {v23.8b}, [\arg0], x3
+.endm
+
+.macro CALC_ABS_8X8_1 arg0, arg1
+    uab\arg1\()l    \arg0, v0.8b, v16.8b
+    uabal   \arg0, v1.8b, v17.8b
+    uabal   \arg0, v2.8b, v18.8b
+    uabal   \arg0, v3.8b, v19.8b
+    uabal   \arg0, v4.8b, v20.8b
+    uabal   \arg0, v5.8b, v21.8b
+    uabal   \arg0, v6.8b, v22.8b
+    uabal   \arg0, v7.8b, v23.8b
+.endm
+
+.macro CALC_ABS_8X8_2 arg0
+    uab\arg0\()l    v29.8h, v0.8b, v18.8b
+    uabal   v29.8h, v1.8b, v19.8b
+    uabal   v29.8h, v2.8b, v20.8b
+    uabal   v29.8h, v3.8b, v21.8b
+    uabal   v29.8h, v4.8b, v22.8b
+    uabal   v29.8h, v5.8b, v23.8b
+    uabal   v29.8h, v6.8b, v24.8b
+    uabal   v29.8h, v7.8b, v25.8b
+.endm
+
+.macro LOAD_16X8_2 arg0
+    ld1     {v16.16b}, [\arg0], x3
+    ld1     {v17.16b}, [\arg0], x3
+    ld1     {v18.16b}, [\arg0], x3
+    ld1     {v19.16b}, [\arg0], x3
+    ld1     {v20.16b}, [\arg0], x3
+    ld1     {v21.16b}, [\arg0], x3
+    ld1     {v22.16b}, [\arg0], x3
+    ld1     {v23.16b}, [\arg0], x3
+.endm
+
+.macro CALC_ABS_16X8_1 arg0, arg1
+    uab\arg1\()l  \arg0, v0.8b, v16.8b
+    uabal2  \arg0, v0.16b,v16.16b
+    uabal   \arg0, v1.8b, v17.8b
+    uabal2  \arg0, v1.16b,v17.16b
+    uabal   \arg0, v2.8b, v18.8b
+    uabal2  \arg0, v2.16b,v18.16b
+    uabal   \arg0, v3.8b, v19.8b
+    uabal2  \arg0, v3.16b,v19.16b
+    uabal   \arg0, v4.8b, v20.8b
+    uabal2  \arg0, v4.16b,v20.16b
+    uabal   \arg0, v5.8b, v21.8b
+    uabal2  \arg0, v5.16b,v21.16b
+    uabal   \arg0, v6.8b, v22.8b
+    uabal2  \arg0, v6.16b,v22.16b
+    uabal   \arg0, v7.8b, v23.8b
+    uabal2  \arg0, v7.16b,v23.16b
+.endm
+
+.macro CALC_ABS_16X8_2 arg0
+    uab\arg0\()l  v29.8h, v0.8b, v18.8b
+    uabal2  v29.8h, v0.16b,v18.16b
+    uabal   v29.8h, v1.8b, v19.8b
+    uabal2  v29.8h, v1.16b,v19.16b
+    uabal   v29.8h, v2.8b, v20.8b
+    uabal2  v29.8h, v2.16b,v20.16b
+    uabal   v29.8h, v3.8b, v21.8b
+    uabal2  v29.8h, v3.16b,v21.16b
+    uabal   v29.8h, v4.8b, v22.8b
+    uabal2  v29.8h, v4.16b,v22.16b
+    uabal   v29.8h, v5.8b, v23.8b
+    uabal2  v29.8h, v5.16b,v23.16b
+    uabal   v29.8h, v6.8b, v24.8b
+    uabal2  v29.8h, v6.16b,v24.16b
+    uabal   v29.8h, v7.8b, v25.8b
+    uabal2  v29.8h, v7.16b,v25.16b
+.endm
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSad4x4_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.s}[0], [x0], x1
+    ld1     {v1.s}[0], [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+.rept 3
+    ld1     {v0.s}[0], [x0], x1
+    ld1     {v1.s}[0], [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+.endr
+    saddlv  s2, v2.4h
+    fmov    w0, s2
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSad8x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+.rept 7
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+.endr
+    CALC_AND_STORE_SAD
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSad8x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+.rept 15
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+.endr
+    CALC_AND_STORE_SAD
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSad16x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+    uabal2  v2.8h, v0.16b, v1.16b
+.rept 7
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+    uabal2  v2.8h, v0.16b, v1.16b
+.endr
+    CALC_AND_STORE_SAD
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSad16x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+    uabal2  v2.8h, v0.16b, v1.16b
+.rept 15
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+    uabal2  v2.8h, v0.16b, v1.16b
+.endr
+    CALC_AND_STORE_SAD
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSadFour4x4_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.s}[0], [x0], x1
+    ld1     {v0.s}[1], [x0], x1
+    ld1     {v1.s}[0], [x0], x1
+    ld1     {v1.s}[1], [x0]
+    sub     x0, x2, x3
+    ld1     {v2.s}[0], [x0], x3
+    ld1     {v2.s}[1], [x0], x3
+    ld1     {v3.s}[0], [x0], x3
+    ld1     {v3.s}[1], [x0], x3
+    ld1     {v4.s}[0], [x0], x3
+    ld1     {v4.s}[1], [x0], x3
+
+    uabdl   v28.8h, v0.8b, v2.8b
+    uabal   v28.8h, v1.8b, v3.8b
+
+    uabdl   v29.8h, v0.8b, v3.8b
+    uabal   v29.8h, v1.8b, v4.8b
+
+    sub     x0, x2, #1
+    ld1     {v2.s}[0], [x0], x3
+    ld1     {v2.s}[1], [x0], x3
+    ld1     {v3.s}[0], [x0], x3
+    ld1     {v3.s}[1], [x0]
+    uabdl   v30.8h, v0.8b, v2.8b
+    uabal   v30.8h, v1.8b, v3.8b
+
+    add     x0, x2, #1
+    ld1     {v2.s}[0], [x0], x3
+    ld1     {v2.s}[1], [x0], x3
+    ld1     {v3.s}[0], [x0], x3
+    ld1     {v3.s}[1], [x0]
+    uabdl   v31.8h, v0.8b, v2.8b
+    uabal   v31.8h, v1.8b, v3.8b
+
+    CALC_AND_STORE_SAD_FOUR
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSadFour8x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    LOAD_8X8_1
+    sub     x0, x2, x3
+    LOAD_8X8_2 x0
+    ld1     {v24.8b}, [x0], x3
+    ld1     {v25.8b}, [x0]
+
+    CALC_ABS_8X8_1 v28.8h, d
+    CALC_ABS_8X8_2 d
+
+    sub     x0, x2, #1
+    LOAD_8X8_2 x0
+    CALC_ABS_8X8_1 v30.8h, d
+
+    add     x0, x2, #1
+    LOAD_8X8_2 x0
+    CALC_ABS_8X8_1 v31.8h, d
+
+    CALC_AND_STORE_SAD_FOUR
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSadFour8x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    LOAD_8X8_1
+    sub     x5, x2, x3
+    LOAD_8X8_2 x5
+    ld1     {v24.8b}, [x5], x3
+    ld1     {v25.8b}, [x5], x3
+
+    CALC_ABS_8X8_1 v28.8h, d
+    CALC_ABS_8X8_2 d
+
+    sub     x6, x2, #1
+    LOAD_8X8_2 x6
+    CALC_ABS_8X8_1 v30.8h, d
+
+    add     x7, x2, #1
+    LOAD_8X8_2 x7
+    CALC_ABS_8X8_1 v31.8h, d
+
+    LOAD_8X8_1
+    sub     x5, x5, x3
+    sub     x5, x5, x3
+    LOAD_8X8_2 x5
+    ld1     {v24.8b}, [x5], x3
+    ld1     {v25.8b}, [x5]
+
+    CALC_ABS_8X8_1 v28.8h, a
+    CALC_ABS_8X8_2 a
+
+    LOAD_8X8_2 x6
+    CALC_ABS_8X8_1 v30.8h, a
+
+    LOAD_8X8_2 x7
+    CALC_ABS_8X8_1 v31.8h, a
+
+    CALC_AND_STORE_SAD_FOUR
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSadFour16x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    LOAD_16X8_1
+    sub     x0, x2, x3
+    LOAD_16X8_2 x0
+    ld1     {v24.16b}, [x0], x3
+    ld1     {v25.16b}, [x0]
+
+    CALC_ABS_16X8_1 v28.8h, d
+    CALC_ABS_16X8_2 d
+
+    sub     x0, x2, #1
+    LOAD_16X8_2 x0
+    CALC_ABS_16X8_1 v30.8h, d
+
+    add     x0, x2, #1
+    LOAD_16X8_2 x0
+    CALC_ABS_16X8_1 v31.8h, d
+
+    CALC_AND_STORE_SAD_FOUR
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSadFour16x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+
+    LOAD_16X8_1
+    sub     x5, x2, x3
+    LOAD_16X8_2 x5
+    ld1     {v24.16b}, [x5], x3
+    ld1     {v25.16b}, [x5], x3
+
+    CALC_ABS_16X8_1 v28.8h, d
+    CALC_ABS_16X8_2 d
+
+    sub     x6, x2, #1
+    LOAD_16X8_2 x6
+    CALC_ABS_16X8_1 v30.8h, d
+
+    add     x7, x2, #1
+    LOAD_16X8_2 x7
+    CALC_ABS_16X8_1 v31.8h, d
+
+    LOAD_16X8_1
+    sub     x5, x5, x3
+    sub     x5, x5, x3
+    LOAD_16X8_2 x5
+    ld1     {v24.16b}, [x5], x3
+    ld1     {v25.16b}, [x5]
+
+    CALC_ABS_16X8_1 v28.8h, a
+    CALC_ABS_16X8_2 a
+
+    LOAD_16X8_2 x6
+    CALC_ABS_16X8_1 v30.8h, a
+
+    LOAD_16X8_2 x7
+    CALC_ABS_16X8_1 v31.8h, a
+
+    CALC_AND_STORE_SAD_FOUR
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSatd4x4_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    ld1     {v0.s}[0], [x0], x1
+    ld1     {v0.s}[1], [x0], x1
+    ld1     {v1.s}[0], [x0], x1
+    ld1     {v1.s}[1], [x0]
+
+    ld1     {v2.s}[0], [x2], x3
+    ld1     {v2.s}[1], [x2], x3
+    ld1     {v3.s}[0], [x2], x3
+    ld1     {v3.s}[1], [x2]
+    usubl   v4.8h, v0.8b, v2.8b //{0,1,2,3,4,5,6,7}
+    usubl   v5.8h, v1.8b, v3.8b //{8,9,10,11,12,13,14,15}
+
+    //Do the vertical transform
+    add     v6.8h, v4.8h, v5.8h //{0,4,8,12,1,5,9,13}
+    sub     v7.8h, v4.8h, v5.8h //{2,6,10,14,3,7,11,15}
+    mov     x4,      v6.d[1]
+    mov     v6.d[1], v7.d[0]
+    ins     v7.d[0], x4
+    add     v4.8h, v6.8h, v7.8h
+    sub     v5.8h, v6.8h, v7.8h
+
+    //Do the horizontal transform
+    trn1    v6.4s, v4.4s, v5.4s
+    trn2    v7.4s, v4.4s, v5.4s
+    add     v4.8h, v6.8h, v7.8h
+    sub     v5.8h, v6.8h, v7.8h
+    trn1    v6.8h, v4.8h, v5.8h
+    trn2    v7.8h, v4.8h, v5.8h
+    add     v4.8h, v6.8h, v7.8h
+    abs     v4.8h, v4.8h
+    saba    v4.8h, v6.8h, v7.8h
+    uaddlv  s4, v4.8h
+    fmov    w0, s4
+    add     w0, w0, #1
+    lsr     w0, w0, #1
+
+WELS_ASM_AARCH64_FUNC_END
+
+.macro SATD_8x4
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    ld1     {v2.8b}, [x0], x1
+    usubl   v16.8h,  v0.8b, v1.8b
+
+    ld1     {v3.8b}, [x2], x3
+    usubl   v17.8h,  v2.8b, v3.8b
+    ld1     {v4.8b}, [x0], x1
+    ld1     {v5.8b}, [x2], x3
+
+    add     v25.8h,  v16.8h, v17.8h
+    usubl   v18.8h,  v4.8b,  v5.8b
+
+    ld1     {v6.8b}, [x0], x1
+    ld1     {v7.8b}, [x2], x3
+
+    usubl   v19.8h,  v6.8b,  v7.8b
+    sub     v26.8h,  v16.8h, v17.8h
+
+    add     v27.8h,  v18.8h, v19.8h
+    sub     v28.8h,  v18.8h, v19.8h
+
+    add     v0.8h,  v25.8h, v27.8h
+    sub     v1.8h,  v25.8h, v27.8h
+
+    add     v2.8h,  v26.8h, v28.8h
+    sub     v3.8h,  v26.8h, v28.8h
+
+    trn1    v4.8h, v0.8h, v1.8h
+    trn2    v5.8h, v0.8h, v1.8h
+    trn1    v6.8h, v2.8h, v3.8h
+    trn2    v7.8h, v2.8h, v3.8h
+
+    add     v16.8h, v4.8h, v5.8h
+    sabd    v17.8h, v4.8h, v5.8h
+    abs     v16.8h, v16.8h
+    add     v18.8h, v6.8h, v7.8h
+    sabd    v19.8h, v6.8h, v7.8h
+    abs     v18.8h, v18.8h
+
+    trn1    v4.4s, v16.4s, v17.4s
+    trn2    v5.4s, v16.4s, v17.4s
+    trn1    v6.4s, v18.4s, v19.4s
+    trn2    v7.4s, v18.4s, v19.4s
+
+    smax    v0.8h, v4.8h, v5.8h
+    smax    v1.8h, v6.8h, v7.8h
+.endm
+
+.macro SATD_16x4
+    ld1     {v0.16b}, [x0], x1
+    ld1     {v1.16b}, [x2], x3
+    ld1     {v2.16b}, [x0], x1
+    usubl   v16.8h,  v0.8b, v1.8b
+    usubl2  v24.8h,  v0.16b, v1.16b
+
+    ld1     {v3.16b}, [x2], x3
+    usubl   v17.8h,  v2.8b, v3.8b
+    usubl2  v25.8h,  v2.16b, v3.16b
+
+    ld1     {v4.16b}, [x0], x1
+    ld1     {v5.16b}, [x2], x3
+    usubl   v18.8h,  v4.8b, v5.8b
+    usubl2  v26.8h,  v4.16b, v5.16b
+
+    ld1     {v6.16b}, [x0], x1
+    ld1     {v7.16b}, [x2], x3
+    usubl   v19.8h,  v6.8b, v7.8b
+    usubl2  v27.8h,  v6.16b, v7.16b
+
+    add     v0.8h,  v16.8h, v17.8h
+    sub     v1.8h,  v16.8h, v17.8h
+    add     v2.8h,  v18.8h, v19.8h
+    sub     v3.8h,  v18.8h, v19.8h
+
+    add     v4.8h,  v24.8h, v25.8h
+    sub     v5.8h,  v24.8h, v25.8h
+    add     v6.8h,  v26.8h, v27.8h
+    sub     v7.8h,  v26.8h, v27.8h
+
+    add     v16.8h,  v0.8h, v2.8h
+    sub     v18.8h,  v0.8h, v2.8h
+    add     v17.8h,  v4.8h, v6.8h
+    sub     v19.8h,  v4.8h, v6.8h
+
+    add     v0.8h,  v1.8h, v3.8h
+    sub     v2.8h,  v1.8h, v3.8h
+    add     v1.8h,  v5.8h, v7.8h
+    sub     v3.8h,  v5.8h, v7.8h
+
+    trn1    v4.8h, v16.8h, v18.8h
+    trn2    v6.8h, v16.8h, v18.8h
+    trn1    v5.8h, v17.8h, v19.8h
+    trn2    v7.8h, v17.8h, v19.8h
+
+    add     v16.8h, v4.8h, v6.8h
+    sabd    v18.8h, v4.8h, v6.8h
+    add     v17.8h, v5.8h, v7.8h
+    sabd    v19.8h, v5.8h, v7.8h
+    abs     v16.8h, v16.8h
+    abs     v17.8h, v17.8h
+
+    trn1    v4.8h, v0.8h, v2.8h
+    trn2    v6.8h, v0.8h, v2.8h
+    trn1    v5.8h, v1.8h, v3.8h
+    trn2    v7.8h, v1.8h, v3.8h
+
+    add     v0.8h, v4.8h, v6.8h
+    sabd    v2.8h, v4.8h, v6.8h
+    add     v1.8h, v5.8h, v7.8h
+    sabd    v3.8h, v5.8h, v7.8h
+    abs     v0.8h, v0.8h
+    abs     v1.8h, v1.8h
+
+    trn1    v4.4s, v16.4s, v18.4s
+    trn2    v6.4s, v16.4s, v18.4s
+    trn1    v5.4s, v17.4s, v19.4s
+    trn2    v7.4s, v17.4s, v19.4s
+
+    trn1    v16.4s, v0.4s, v2.4s
+    trn2    v18.4s, v0.4s, v2.4s
+    trn1    v17.4s, v1.4s, v3.4s
+    trn2    v19.4s, v1.4s, v3.4s
+
+    smax    v0.8h, v4.8h, v6.8h
+    smax    v1.8h, v5.8h, v7.8h
+    smax    v2.8h, v16.8h, v18.8h
+    smax    v3.8h, v17.8h, v19.8h
+    add     v0.8h, v0.8h, v1.8h
+    add     v2.8h, v2.8h, v3.8h
+.endm
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSatd16x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    SATD_16x4
+    add     v31.8h, v0.8h, v2.8h
+.rept 3
+    SATD_16x4
+    add     v31.8h, v31.8h, v0.8h
+    add     v31.8h, v31.8h, v2.8h
+.endr
+    uaddlv  s4, v31.8h
+    fmov    w0, s4
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSatd16x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    SATD_16x4
+    add     v31.8h, v0.8h, v2.8h
+
+    SATD_16x4
+    add     v31.8h, v31.8h, v0.8h
+    add     v31.8h, v31.8h, v2.8h
+
+    uaddlv  s4, v31.8h
+    fmov    w0, s4
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSatd8x16_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    SATD_8x4
+    add     v31.8h, v0.8h, v1.8h
+.rept 3
+    SATD_8x4
+    add     v31.8h, v31.8h, v0.8h
+    add     v31.8h, v31.8h, v1.8h
+.endr
+    uaddlv  s4, v31.8h
+    fmov    w0, s4
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsSampleSatd8x8_AArch64_neon
+    sxtw    x1, w1
+    sxtw    x3, w3
+    SATD_8x4
+    add     v31.8h, v0.8h, v1.8h
+
+    SATD_8x4
+    add     v31.8h, v31.8h, v0.8h
+    add     v31.8h, v31.8h, v1.8h
+    uaddlv  s4, v31.8h
+    fmov    w0, s4
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/reconstruct_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
new file mode 100644
index 0000000000..6676068409
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/reconstruct_aarch64_neon.S
@@ -0,0 +1,717 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro ZERO_COUNT_IN_2_QUARWORD arg0, arg1, arg2
+//  {   //  input:  coef_0 (identy to \arg3\() \arg4\()), coef_1(identy to \arg5\() \arg6\()), mask_q
+    cmeq    \arg0\().8h, \arg0\().8h, #0
+    cmeq    \arg1\().8h, \arg1\().8h, #0
+    uzp1    \arg0\().16b, \arg0\().16b, \arg1\().16b
+    ushr    \arg0\().16b, \arg0\().16b, 7
+    addv    \arg2\(), \arg0\().16b
+//  }
+.endm
+
+.macro NEWQUANT_COEF_EACH_16BITS arg0, arg1, arg2, arg3, arg4, arg5
+// if coef <= 0, - coef; else , coef;
+//  {   //  input:  coef, ff (dst), mf
+    eor     \arg3\().16b, \arg3\().16b, \arg3\().16b          // init 0 , and keep 0;
+    saba    \arg1\().8h, \arg0\().8h, \arg3\().8h      // f + abs(coef - 0)
+    smull   \arg4\().4s, \arg1\().4h, \arg2\().4h
+    smull2  \arg5\().4s, \arg1\().8h, \arg2\().8h
+    shrn    \arg1\().4h, \arg4\().4s, #16
+    shrn2   \arg1\().8h, \arg5\().4s, #16
+
+    cmgt    \arg4\().8h, \arg0\().8h, #0      // if true, location of coef == 11111111
+    bif     \arg3\().16b, \arg1\().16b, \arg4\().16b      // if (x<0) reserved part; else keep 0 untouched
+    shl     \arg3\().8h, \arg3\().8h, #1
+    sub     \arg1\().8h, \arg1\().8h, \arg3\().8h      // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro NEWQUANT_COEF_EACH_16BITS_MAX arg0, arg1, arg2, arg3, arg4, arg5, arg6
+// if coef <= 0, - coef; else , coef;
+//  {   //  input:  coef, ff (dst), mf
+    eor     \arg3\().16b, \arg3\().16b, \arg3\().16b          // init 0 , and keep 0;
+    saba    \arg1\().8h, \arg0\().8h, \arg3\().8h      // f + abs(coef - 0)
+    smull   \arg4\().4s, \arg1\().4h, \arg2\().4h
+    smull2  \arg5\().4s, \arg1\().8h, \arg2\().8h
+    shrn    \arg1\().4h, \arg4\().4s, #16
+    shrn2   \arg1\().8h, \arg5\().4s, #16
+
+    cmgt    \arg4\().8h, \arg0\().8h, #0      // if true, location of coef == 11111111
+    bif     \arg3\().16b, \arg1\().16b, \arg4\().16b      // if (x<0) reserved part; else keep 0 untouched
+    shl     \arg3\().8h, \arg3\().8h, #1
+    mov     \arg6\().16b, \arg1\().16b
+    sub     \arg1\().8h, \arg1\().8h, \arg3\().8h      // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro QUANT_DUALWORD_COEF_EACH_16BITS arg0, arg1, arg2, arg3, arg4
+// if coef <= 0, - coef; else , coef;
+//  {   //  input:  coef, ff (dst), mf
+    saba    \arg1\().8h, \arg0\().8h, \arg3\().8h      // f + abs(coef - 0)
+    smull   \arg4\().4s, \arg1\().4h, \arg2\().4h
+    shrn    \arg1\().4h, \arg4\().4s, #16
+
+    cmgt    \arg4\().8h, \arg0\().8h, #0      // if true, location of coef == 11111111
+    bif     \arg3\().16b, \arg1\().16b, \arg4\().16b      // if (x<0) reserved part; else keep 0 untouched
+    shl     \arg3\().8h, \arg3\().8h, #1
+    sub     \arg1\().8h, \arg1\().8h, \arg3\().8h      // if x > 0, -= 0; else x-= 2x
+//  }
+.endm
+
+.macro SELECT_MAX_IN_ABS_COEF arg0, arg1, arg2, arg3, arg4, arg5
+//  {   //  input:  coef_0, coef_1, coef_2, coef_3, max_q (identy to follow two)
+    umax    \arg0\().8h, \arg0\().8h, \arg1\().8h
+    umaxv   \arg4\(), \arg0\().8h
+    umax    \arg2\().8h, \arg2\().8h, \arg3\().8h
+    umaxv   \arg5\(), \arg2\().8h
+//  }
+.endm
+
+.macro HDM_QUANT_2x2_TOTAL_16BITS arg0, arg1, arg2
+//  {   //  input: src_d[0][16][32][48], dst_d[0][16][32][48], working
+    sshr  \arg1\().2d, \arg0\().2d, #32
+    add   \arg2\().4h, \arg0\().4h, \arg1\().4h      // [0] = rs[0] + rs[32];[1] = rs[16] + rs[48];
+    sub   \arg1\().4h, \arg0\().4h, \arg1\().4h      // [0] = rs[0] - rs[32];[1] = rs[16] - rs[48];
+    zip1  \arg1\().4h, \arg2\().4h, \arg1\().4h
+//  }
+.endm
+
+
+.macro DC_ZERO_COUNT_IN_DUALWORD arg0, arg1, arg2
+//  {   //  input:  coef, dst_d, working_d (all 0x01)
+    cmeq    \arg0\().4h, \arg0\().4h, #0
+    and     \arg0\().8b, \arg0\().8b, \arg2\().8b
+    addv    \arg1\(), \arg0\().4h
+//  }
+.endm
+
+.macro IHDM_4x4_TOTAL_16BITS arg0, arg1, arg2
+//  {   //  input: each src_d[0]~[3](dst), working_q0, working_q1
+    uzp2  \arg1\().4s, \arg0\().4s, \arg0\().4s
+    uzp1  \arg0\().4s, \arg0\().4s, \arg0\().4s
+    add   \arg2\().8h, \arg0\().8h, \arg1\().8h      // [0] = rs[0] + rs[2];[1] = rs[1] + rs[3];[2] = rs[4] + rs[6];[3] = rs[5] + rs[7];
+    sub   \arg1\().8h, \arg0\().8h, \arg1\().8h      // [0] = rs[0] - rs[2];[1] = rs[1] - rs[3];[2] = rs[4] - rs[6];[3] = rs[5] - rs[7];
+    zip1  \arg2\().8h, \arg2\().8h, \arg1\().8h      // [0] = rs[0] + rs[2]; [1] = rs[0] - rs[2]; ... [2]; [3]
+
+    uzp2  \arg1\().4s, \arg2\().4s, \arg2\().4s
+    uzp1  \arg0\().4s, \arg2\().4s, \arg2\().4s
+    add   \arg2\().8h, \arg0\().8h, \arg1\().8h      // [0] = rs[0] + rs[2];[1] = rs[1] + rs[3];[2] = rs[4] + rs[6];[3] = rs[5] + rs[7];
+    sub   \arg1\().8h, \arg0\().8h, \arg1\().8h      // [0] = rs[0] - rs[2];[1] = rs[1] - rs[3];[2] = rs[4] - rs[6];[3] = rs[5] - rs[7];
+    rev32 \arg1\().4h, \arg1\().4h             // [0] = rs[1] - rs[3];[1] = rs[0] - rs[2];[2] = rs[5] - rs[7];[3] = rs[4] - rs[6];
+    zip1  \arg0\().4s, \arg2\().4s, \arg1\().4s
+    //  }
+.endm
+
+.macro MATRIX_TRANSFORM_EACH_16BITS_2x8_OUT2 arg0, arg1, arg2, arg3
+//  {   //  input & output: src_d[0]~[3];[0 1 2 3]+[4 5 6 7]+[8 9 10 11]+[12 13 14 15]
+    uzp1 \arg2\().4s, \arg0\().4s, \arg1\().4s   //[0 1 4 5]+[8 9 12 13]
+    uzp2 \arg3\().4s, \arg0\().4s, \arg1\().4s   //[2 3 6 7]+[10 11 14 15]
+
+    uzp1 \arg0\().8h, \arg2\().8h, \arg3\().8h   //[0 4 8 12]+[2 6 10 14]
+    uzp2 \arg2\().8h, \arg2\().8h, \arg3\().8h   //[1 5 9 13]+[3 7 11 15]
+    zip2 \arg1\().2d, \arg0\().2d, \arg2\().2d   //[2 6 10 14]+[3 7 11 15]
+    zip1 \arg0\().2d, \arg0\().2d, \arg2\().2d   //[0 4 8 12]+[1 5 9 13]
+//  }
+.endm
+
+.macro MATRIX_TRANSFORM_EACH_16BITS_OUT4 arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input & output: src_d[0]~[3];[0 4 8 12],[1 5 9 13],[2 6 10 14],[3 7 11 15]
+    trn1 \arg4\().8h, v0.8h, v1.8h
+    trn2 \arg5\().8h, v0.8h, v1.8h
+    trn1 \arg6\().8h, v2.8h, v3.8h
+    trn2 \arg7\().8h, v2.8h, v3.8h
+
+    trn1 \arg0\().4s, v4.4s, v6.4s
+    trn2 \arg2\().4s, v4.4s, v6.4s
+    trn1 \arg1\().4s, v5.4s, v7.4s
+    trn2 \arg3\().4s, v5.4s, v7.4s
+//  }
+.endm
+
+.macro MATRIX_TRANSFORM_EACH_16BITS_4x4_OUT2 arg0, arg1, arg2, arg3
+//  {   //  input & output: src_d[0]~[3];[0 1 2 3],[4 5 6 7],[8 9 10 11],[12 13 14 15]
+    mov  \arg0\().d[1], \arg1\().d[0]  //[0 1 2 3]+[4 5 6 7]
+    mov  \arg2\().d[1], \arg3\().d[0]  //[8 9 10 11]+[12 13 14 15]
+    uzp1 \arg1\().4s, \arg0\().4s, \arg2\().4s   //[0 1 4 5]+[8 9 12 13]
+    uzp2 \arg3\().4s, \arg0\().4s, \arg2\().4s   //[2 3 6 7]+[10 11 14 15]
+
+    uzp1 \arg0\().8h, \arg1\().8h, \arg3\().8h   //[0 4 8 12]+[2 6 10 14]
+    uzp2 \arg2\().8h, \arg1\().8h, \arg3\().8h   //[1 5 9 13]+[3 7 11 15]
+    zip2 \arg1\().2d, \arg0\().2d, \arg2\().2d   //[2 6 10 14]+[3 7 11 15]
+    zip1 \arg0\().2d, \arg0\().2d, \arg2\().2d   //[0 4 8 12]+[1 5 9 13]
+//  }
+.endm
+
+.macro LOAD_4x4_DATA_FOR_DCT arg0, arg1, arg2, arg3, arg4, arg5
+    ld1   {\arg0\().s}[0], [\arg2\()], \arg3\()
+    ld1   {\arg0\().s}[1], [\arg2\()], \arg3\()
+    ld1   {\arg0\().s}[2], [\arg2\()], \arg3\()
+    ld1   {\arg0\().s}[3], [\arg2\()]
+
+    ld1   {\arg1\().s}[0], [\arg4\()], \arg5\()
+    ld1   {\arg1\().s}[1], [\arg4\()], \arg5\()
+    ld1   {\arg1\().s}[2], [\arg4\()], \arg5\()
+    ld1   {\arg1\().s}[3], [\arg4\()]
+.endm
+
+.macro DCT_ROW_TRANSFORM_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], working: [4]~[7]
+    add     \arg4\().8h, \arg0\().8h, \arg3\().8h   //int16 s[0] = data[i] + data[i3];
+    sub     \arg7\().8h, \arg0\().8h, \arg3\().8h   //int16 s[3] = data[i] - data[i3];
+    add     \arg5\().8h, \arg1\().8h, \arg2\().8h   //int16 s[1] = data[i1] + data[i2];
+    sub     \arg6\().8h, \arg1\().8h, \arg2\().8h   //int16 s[2] = data[i1] - data[i2];
+
+    add     \arg0\().8h, \arg4\().8h, \arg5\().8h   //int16 dct[i ] = s[0] + s[1];
+    sub     \arg2\().8h, \arg4\().8h, \arg5\().8h   //int16 dct[i2] = s[0] - s[1];
+    shl     \arg1\().8h, \arg7\().8h, #1
+    shl     \arg3\().8h, \arg6\().8h, #1
+    add     \arg1\().8h, \arg1\().8h, \arg6\().8h   //int16 dct[i1] = (s[3] << 1) + s[2];
+    sub     \arg3\().8h, \arg7\().8h, \arg3\().8h   //int16 dct[i3] = s[3] - (s[2] << 1);
+//  }
+.endm
+
+.macro LOAD_8x4_DATA_FOR_DCT arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9
+//  {   //  input: \arg0\()~\arg3\(), src1*, src2*; untouched r2:src1_stride &r4:src2_stride
+    ld1   {\arg0\().d}[0], [\arg8\()], x2
+    ld1   {\arg1\().d}[0], [\arg8\()], x2
+    ld1   {\arg2\().d}[0], [\arg8\()], x2
+    ld1   {\arg3\().d}[0], [\arg8\()], x2
+
+    ld1   {\arg4\().d}[0], [\arg9\()], x4
+    ld1   {\arg5\().d}[0], [\arg9\()], x4
+    ld1   {\arg6\().d}[0], [\arg9\()], x4
+    ld1   {\arg7\().d}[0], [\arg9\()], x4
+//  }
+.endm
+
+.macro ROW_TRANSFORM_1_STEP_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], output: e_d[0]~[3];
+    add   \arg4\().8h, \arg0\().8h, \arg2\().8h          //int16 e[i][0] = src[0] + src[2];
+    sub   \arg5\().8h, \arg0\().8h, \arg2\().8h          //int16 e[i][1] = src[0] - src[2];
+    sshr  \arg6\().8h, \arg1\().8h, #1
+    sshr  \arg7\().8h, \arg3\().8h, #1
+    sub   \arg6\().8h, \arg6\().8h, \arg3\().8h          //int16 e[i][2] = (src[1]>>1)-src[3];
+    add   \arg7\().8h, \arg1\().8h, \arg7\().8h          //int16 e[i][3] = src[1] + (src[3]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_TOTAL_16BITS arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+// both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    add   \arg0\().8h, \arg4\().8h, \arg7\().8h          //int16 f[i][0] = e[i][0] + e[i][3];
+    add   \arg1\().8h, \arg5\().8h, \arg6\().8h          //int16 f[i][1] = e[i][1] + e[i][2];
+    sub   \arg2\().8h, \arg5\().8h, \arg6\().8h          //int16 f[i][2] = e[i][1] - e[i][2];
+    sub   \arg3\().8h, \arg4\().8h, \arg7\().8h          //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+.macro ROW_TRANSFORM_0_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_d[0]~[3], output: e_q[0]~[3];
+    saddl   \arg4\().4s, \arg0\().4h, \arg2\().4h          //int32 e[i][0] = src[0] + src[2];
+    ssubl   \arg5\().4s, \arg0\().4h, \arg2\().4h          //int32 e[i][1] = src[0] - src[2];
+    ssubl   \arg6\().4s, \arg1\().4h, \arg3\().4h          //int32 e[i][2] = src[1] - src[3];
+    saddl   \arg7\().4s, \arg1\().4h, \arg3\().4h          //int32 e[i][3] = src[1] + src[3];
+//  }
+.endm
+
+.macro COL_TRANSFORM_0_STEP arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+//  {   //  input: src_q[0]~[3], output: e_q[0]~[3];
+    add     \arg4\().4s, \arg0\().4s, \arg2\().4s          //int32 e[0][j] = f[0][j] + f[2][j];
+    sub     \arg5\().4s, \arg0\().4s, \arg2\().4s          //int32 e[1][j] = f[0][j] - f[2][j];
+    sub     \arg6\().4s, \arg1\().4s, \arg3\().4s          //int32 e[2][j] = (f[1][j]>>1) - f[3][j];
+    add     \arg7\().4s, \arg1\().4s, \arg3\().4s          //int32 e[3][j] = f[1][j] + (f[3][j]>>1);
+//  }
+.endm
+
+.macro TRANSFORM_4BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7
+// both row & col transform used
+//  {   //  output: f_q[0]~[3], input: e_q[0]~[3];
+    add     \arg0\().4s, \arg4\().4s, \arg7\().4s          //int16 f[i][0] = e[i][0] + e[i][3];
+    add     \arg1\().4s, \arg5\().4s, \arg6\().4s          //int16 f[i][1] = e[i][1] + e[i][2];
+    sub     \arg2\().4s, \arg5\().4s, \arg6\().4s          //int16 f[i][2] = e[i][1] - e[i][2];
+    sub     \arg3\().4s, \arg4\().4s, \arg7\().4s          //int16 f[i][3] = e[i][0] - e[i][3];
+//  }
+.endm
+
+.macro MB_PRED_8BITS_ADD_DCT_16BITS_CLIP arg0, arg1, arg2, arg3, arg4
+//  {   //  input: pred_d[0](output), dct_q0/1, working_q0/1;
+    uxtl      \arg3\().8h, \arg0\().8b
+    uxtl2     \arg4\().8h, \arg0\().16b
+    add       \arg3\().8h, \arg3\().8h, \arg1\().8h
+    add       \arg4\().8h, \arg4\().8h, \arg2\().8h
+    sqxtun    \arg0\().8b, \arg3\().8h
+    sqxtun2   \arg0\().16b,\arg4\().8h
+//  }
+.endm
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsGetNoneZeroCount_AArch64_neon
+    ld1     {v0.8h, v1.8h}, [x0]
+    ZERO_COUNT_IN_2_QUARWORD    v0, v1, b0
+    mov     x0, v0.d[0]
+    mov     x1, #16
+    subs    x0, x1, x0
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsQuant4x4_AArch64_neon
+    ld1     {v2.8h}, [x1]
+    ld1     {v0.8h, v1.8h}, [x0]
+    ld1     {v3.8h}, [x2]
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS   v0, v2, v3, v5, v6, v7
+    st1     {v2.8h}, [x0], #16
+    NEWQUANT_COEF_EACH_16BITS   v1, v4, v3, v5, v6, v7
+    st1     {v4.8h}, [x0], #16
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsQuant4x4Dc_AArch64_neon
+    ld1     {v0.8h, v1.8h}, [x0]
+    dup     v2.8h, w1      // even ff range [0, 768]
+    dup     v3.8h, w2
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS   v0, v2, v3, v5, v6, v7
+    st1     {v2.8h}, [x0], #16
+    NEWQUANT_COEF_EACH_16BITS   v1, v4, v3, v5, v6, v7
+    st1     {v4.8h}, [x0], #16
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsQuantFour4x4_AArch64_neon
+    ld1     {v2.8h}, [x1]
+    ld1     {v3.8h}, [x2]
+    mov     x1, x0
+
+.rept 4
+    ld1     {v0.8h, v1.8h}, [x0], #32
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS   v0, v4, v3, v5, v6, v7
+    st1     {v4.8h}, [x1], #16
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS   v1, v4, v3, v5, v6, v7
+    st1     {v4.8h}, [x1], #16
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsQuantFour4x4Max_AArch64_neon
+    ld1     {v2.8h}, [x1]
+    ld1     {v3.8h}, [x2]
+    mov     x1, x0
+
+    ld1     {v0.8h, v1.8h}, [x0], #32
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v0, v4, v3, v5, v6, v7, v16
+    st1     {v4.8h}, [x1], #16
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v1, v4, v3, v5, v6, v7, v17
+    st1     {v4.8h}, [x1], #16   // then 1st 16 elem in v16  & v17
+
+    ld1     {v0.8h, v1.8h}, [x0], #32
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v0, v4, v3, v5, v6, v7, v18
+    st1     {v4.8h}, [x1], #16
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v1, v4, v3, v5, v6, v7, v19
+    st1     {v4.8h}, [x1], #16   // then 2st 16 elem in v18 & v19
+
+    SELECT_MAX_IN_ABS_COEF  v16, v17, v18, v19, h20, h21
+
+    ld1     {v0.8h, v1.8h}, [x0], #32
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v0, v4, v3, v5, v6, v7, v16
+    st1     {v4.8h}, [x1], #16
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v1, v4, v3, v5, v6, v7, v17
+    st1     {v4.8h}, [x1], #16   // then 1st 16 elem in v16  & v17
+
+    ld1     {v0.8h, v1.8h}, [x0], #32
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v0, v4, v3, v5, v6, v7, v18
+    st1     {v4.8h}, [x1], #16
+    mov     v4.16b, v2.16b
+    NEWQUANT_COEF_EACH_16BITS_MAX   v1, v4, v3, v5, v6, v7, v19
+    st1     {v4.8h}, [x1], #16   // then 2st 16 elem in v18 & v19
+
+    SELECT_MAX_IN_ABS_COEF  v16, v17, v18, v19, h22, h23
+
+    st4 {v20.h,v21.h,v22.h,v23.h}[0], [x3]
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDequant4x4_AArch64_neon
+    ld1    {v0.8h, v1.8h}, [x0]
+    ld1    {v2.8h}, [x1]
+    mul    v3.8h, v0.8h, v2.8h
+    mul    v4.8h, v1.8h, v2.8h
+    st1    {v3.8h, v4.8h}, [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDequantFour4x4_AArch64_neon
+    ld1    {v2.8h}, [x1]
+    mov    x1, x0
+.rept 4
+    ld1   {v0.8h,v1.8h}, [x0], #32
+    mul   v3.8h, v0.8h, v2.8h
+    mul   v4.8h, v1.8h, v2.8h
+    st1   {v3.8h,v4.8h}, [x1], #32
+.endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsHadamardQuant2x2SkipKernel_AArch64_neon
+    dup   v4.8h, w1
+    mov   x1, #32
+    ld1   {v0.h}[0], [x0], x1       //rs[0]
+    ld1   {v0.h}[1], [x0], x1       //rs[16]
+    ld1   {v0.h}[2], [x0], x1       //rs[32]
+    ld1   {v0.h}[3], [x0], x1       //rs[48]
+
+    HDM_QUANT_2x2_TOTAL_16BITS  v0, v1, v2      // output v1
+
+    HDM_QUANT_2x2_TOTAL_16BITS  v1, v0, v2      // output v0
+
+    abs   v1.4h, v0.4h
+    cmhi  v0.4h, v1.4h, v4.4h         // abs(dct[i])>threshold;
+    mov   w0, v0.s[0]
+    mov   w1, v0.s[1]
+    orr   w0, w0, w1
+WELS_ASM_AARCH64_FUNC_END
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsHadamardQuant2x2_AArch64_neon
+
+    dup   v1.8h, w1 //ff
+    dup   v2.8h, w2 //mf
+    eor   v3.16b, v3.16b, v3.16b
+
+    mov   x1, #32
+    mov   x2, x0
+    ld1   {v0.h}[0], [x0], x1       //rs[0]
+    st1   {v3.h}[0], [x2], x1      //rs[00]=0
+    ld1   {v0.h}[1], [x0], x1       //rs[16]
+    st1   {v3.h}[1], [x2], x1      //rs[16]=0
+    ld1   {v0.h}[2], [x0], x1       //rs[32]
+    st1   {v3.h}[2], [x2], x1      //rs[32]=0
+    ld1   {v0.h}[3], [x0], x1       //rs[48]
+    st1   {v3.h}[3], [x2], x1      //rs[48]=0
+
+
+    HDM_QUANT_2x2_TOTAL_16BITS  v0, v4, v5      // output v4
+
+    HDM_QUANT_2x2_TOTAL_16BITS  v4, v0, v5      // output v0
+
+    QUANT_DUALWORD_COEF_EACH_16BITS v0, v1, v2, v3, v4
+
+    st1    {v1.d}[0], [x3]        // store to dct
+    st1    {v1.d}[0], [x4]        // store to block
+
+    movi v3.8h, #1, lsl #0
+
+    movi v0.16b, #255
+
+    DC_ZERO_COUNT_IN_DUALWORD   v1, h0, v3
+
+    mov     x0, v0.d[0]
+    mov     x1, #4
+    subs    x0, x1, x0
+WELS_ASM_AARCH64_FUNC_END
+
+
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDequantIHadamard4x4_AArch64_neon
+    ld1    {v0.8h, v1.8h}, [x0]
+    dup    v4.8h, w1
+
+    IHDM_4x4_TOTAL_16BITS   v0, v2, v3
+    IHDM_4x4_TOTAL_16BITS   v1, v2, v3
+
+    MATRIX_TRANSFORM_EACH_16BITS_2x8_OUT2    v0, v1, v2, v3
+
+    IHDM_4x4_TOTAL_16BITS   v0, v2, v3
+    mul   v0.8h, v0.8h, v4.8h
+
+    IHDM_4x4_TOTAL_16BITS   v1, v2, v3
+    mul   v1.8h, v1.8h, v4.8h
+
+    MATRIX_TRANSFORM_EACH_16BITS_2x8_OUT2    v0, v1, v2, v3
+    st1    {v0.16b, v1.16b}, [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+//void WelsDctT4_AArch64_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDctT4_AArch64_neon
+    SIGN_EXTENSION x2, w2
+    SIGN_EXTENSION x4, w4
+    LOAD_4x4_DATA_FOR_DCT   v0, v1, x1, x2, x3, x4
+    usubl  v2.8h, v0.8b, v1.8b
+    usubl2 v4.8h, v0.16b, v1.16b
+    uzp1  v3.8h, v2.8h, v4.8h
+    uzp2  v5.8h, v2.8h, v4.8h
+    uzp2  v2.8h, v3.8h, v5.8h // s[2, 6, 10, 14] [3, 7, 11, 15]
+    uzp1  v0.8h, v3.8h, v5.8h // s[0, 4, 8, 12] [1, 5, 9, 13]
+    mov    v3.d[0], v2.d[1]   // s[3, 7, 11, 15]
+    mov    v1.d[0], v0.d[1]   // s[1, 5, 9, 13]
+
+    // horizontal transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS          v0, v1, v2, v3, v4, v5, v6, v7
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS_OUT4   v0, v1, v2, v3, v4, v5, v6, v7
+    // vertical transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS          v0, v1, v2, v3, v4, v5, v6, v7
+
+    st4       {v0.d, v1.d, v2.d, v3.d}[0], [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+//void WelsDctFourT4_AArch64_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsDctFourT4_AArch64_neon
+    SIGN_EXTENSION x2,w2
+    SIGN_EXTENSION x4,w4
+.rept 2
+    LOAD_8x4_DATA_FOR_DCT   v0, v1, v2, v3, v4, v5, v6, v7, x1, x3
+    usubl    v0.8h, v0.8b, v4.8b
+    usubl    v1.8h, v1.8b, v5.8b
+    usubl    v2.8h, v2.8b, v6.8b
+    usubl    v3.8h, v3.8b, v7.8b
+
+    MATRIX_TRANSFORM_EACH_16BITS_OUT4   v0, v1, v2, v3, v4, v5, v6, v7
+
+    // horizontal transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      v0, v1, v2, v3, v4, v5, v6, v7
+
+    // transform element
+    MATRIX_TRANSFORM_EACH_16BITS_OUT4   v0, v1, v2, v3, v4, v5, v6, v7
+
+    //  vertical transform
+    DCT_ROW_TRANSFORM_TOTAL_16BITS      v0, v1, v2, v3, v4, v5, v6, v7
+
+    uzp1    v4.2d, v0.2d, v1.2d
+    uzp2    v6.2d, v0.2d, v1.2d
+    uzp1    v5.2d, v2.2d, v3.2d
+    uzp2    v7.2d, v2.2d, v3.2d
+    st1     {v4.16b, v5.16b}, [x0], #32
+    st1     {v6.16b, v7.16b}, [x0], #32
+.endr
+WELS_ASM_AARCH64_FUNC_END
+//void WelsIDctT4Rec_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct)
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIDctT4Rec_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    ld1     {v16.s}[0], [x2], x3
+    ld1     {v16.s}[1], [x2], x3
+    ld1     {v16.s}[2], [x2], x3
+    ld1     {v16.s}[3], [x2], x3                   // Pred
+    ld4     {v0.4h, v1.4h, v2.4h, v3.4h}, [x4]      // dct coeff
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS   v0, v1, v2, v3, v4, v5, v6, v7
+
+    TRANSFORM_TOTAL_16BITS              v0, v1, v2, v3, v4, v5, v6, v7
+
+    MATRIX_TRANSFORM_EACH_16BITS_OUT4   v0, v1, v2, v3, v4, v5, v6, v7
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS   v0, v1, v2, v3, v4, v5, v6, v7
+
+    TRANSFORM_TOTAL_16BITS              v0, v1, v2, v3, v4, v5, v6, v7
+    ins     v0.d[1], v1.d[0]
+    ins     v2.d[1], v3.d[0]
+    srshr   v0.8h, v0.8h, #6
+    srshr   v2.8h, v2.8h, #6
+    //after rounding 6, clip into [0, 255]
+    uxtl    v1.8h, v16.8b
+    add     v0.8h, v0.8h, v1.8h
+    sqxtun  v1.8b, v0.8h
+    st1     {v1.s}[0],[x0],x1
+    st1     {v1.s}[1],[x0],x1
+
+    uxtl2   v1.8h, v16.16b
+    add     v2.8h, v2.8h, v1.8h
+    sqxtun  v1.8b, v2.8h
+    st1     {v1.s}[0],[x0],x1
+    st1     {v1.s}[1],[x0],x1
+WELS_ASM_AARCH64_FUNC_END
+//void WelsIDctFourT4Rec_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIDctFourT4Rec_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+.rept 2
+    ld1     {v16.d}[0], [x2], x3
+    ld1     {v16.d}[1], [x2], x3
+    ld1     {v17.d}[0], [x2], x3
+    ld1     {v17.d}[1], [x2], x3                   // Pred
+    ld4     {v0.8h, v1.8h, v2.8h, v3.8h}, [x4], #64     // dct coeff
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS   v0, v1, v2, v3, v4, v5, v6, v7
+
+    TRANSFORM_TOTAL_16BITS    v0, v1, v2, v3, v4, v5, v6, v7
+
+    MATRIX_TRANSFORM_EACH_16BITS_OUT4    v0, v1, v2, v3, v4, v5, v6, v7
+
+    ROW_TRANSFORM_1_STEP_TOTAL_16BITS   v0, v1, v2, v3, v4, v5, v6, v7
+
+    TRANSFORM_TOTAL_16BITS    v0, v1, v2, v3, v4, v5, v6, v7
+    srshr   v0.8h, v0.8h, #6
+    srshr   v1.8h, v1.8h, #6
+    srshr   v2.8h, v2.8h, #6
+    srshr   v3.8h, v3.8h, #6
+
+    //after rounding 6, clip into [0, 255]
+    uxtl    v4.8h, v16.8b
+    add     v0.8h, v0.8h, v4.8h
+    sqxtun  v0.8b, v0.8h
+    st1     {v0.d}[0],[x0],x1
+
+    uxtl2   v5.8h, v16.16b
+    add     v1.8h, v1.8h, v5.8h
+    sqxtun  v1.8b, v1.8h
+    st1     {v1.d}[0],[x0],x1
+
+    uxtl    v6.8h, v17.8b
+    add     v2.8h, v2.8h, v6.8h
+    sqxtun  v2.8b, v2.8h
+    st1     {v2.d}[0],[x0],x1
+
+    uxtl2   v7.8h, v17.16b
+    add     v3.8h, v3.8h, v7.8h
+    sqxtun  v3.8b, v3.8h
+    st1     {v3.d}[0],[x0],x1
+ .endr
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN WelsHadamardT4Dc_AArch64_neon
+
+    mov     x2, #32
+    ld1     {v0.h}[0], [x1], x2
+    ld1     {v1.h}[0], [x1], x2
+    ld1     {v0.h}[1], [x1], x2
+    ld1     {v1.h}[1], [x1], x2
+
+    ld1     {v2.h}[0], [x1], x2
+    ld1     {v3.h}[0], [x1], x2
+    ld1     {v2.h}[1], [x1], x2
+    ld1     {v3.h}[1], [x1], x2
+
+    ld1     {v0.h}[2], [x1], x2
+    ld1     {v1.h}[2], [x1], x2
+    ld1     {v0.h}[3], [x1], x2
+    ld1     {v1.h}[3], [x1], x2
+
+    ld1     {v2.h}[2], [x1], x2
+    ld1     {v3.h}[2], [x1], x2
+    ld1     {v2.h}[3], [x1], x2
+    ld1     {v3.h}[3], [x1], x2 // v0[0 4 08 12],v1[1 5 09 13],v2[2 6 10 14],v3[3 7 11 15]
+
+    ROW_TRANSFORM_0_STEP    v0, v1, v3, v2, v4, v7, v6, v5
+    TRANSFORM_4BYTES        v0, v1, v3, v2, v4, v7, v6, v5
+
+    // transform element 32bits
+    uzp1    v4.4s, v0.4s, v1.4s // 0 2 4 6
+    uzp2    v5.4s, v0.4s, v1.4s // 1 3 5 7
+    uzp1    v6.4s, v2.4s, v3.4s // 8 10 12 14
+    uzp2    v7.4s, v2.4s, v3.4s // 9 11 13 15
+
+    uzp1    v0.4s, v4.4s, v6.4s // 0 4  8 12
+    uzp2    v2.4s, v4.4s, v6.4s // 2 6 10 14
+    uzp1    v1.4s, v5.4s, v7.4s // 1 5  9 13
+    uzp2    v3.4s, v5.4s, v7.4s // 3 7 11 15
+
+    COL_TRANSFORM_0_STEP    v0, v1, v3, v2, v4, v7, v6, v5
+    TRANSFORM_4BYTES        v0, v1, v3, v2, v4, v7, v6, v5
+    sqrshrn   v4.4h, v0.4s, #1
+    sqrshrn2  v4.8h, v1.4s, #1
+    sqrshrn   v5.4h, v2.4s, #1
+    sqrshrn2  v5.8h, v3.4s, #1
+    st1       {v4.16b, v5.16b}, [x0]  //store
+WELS_ASM_AARCH64_FUNC_END
+
+//void WelsIDctRecI16x16Dc_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride,
+//                int16_t* pDctDc);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsIDctRecI16x16Dc_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x3,w3
+    ld1       {v16.16b,v17.16b}, [x4]
+    srshr     v16.8h, v16.8h, #6
+    srshr     v17.8h, v17.8h, #6
+
+    dup       v0.8h, v16.h[0]
+    dup       v1.8h, v16.h[1]
+    ins       v0.d[1], v1.d[0]
+    dup       v1.8h, v16.h[2]
+    dup       v2.8h, v16.h[3]
+    ins       v1.d[1], v2.d[0]
+
+.rept 4
+    ld1       {v3.16b}, [x2], x3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   v3, v0, v1, v4, v5
+    st1       {v3.16b}, [x0], x1
+.endr
+
+    dup       v0.8h, v16.h[4]
+    dup       v1.8h, v16.h[5]
+    ins       v0.d[1], v1.d[0]
+    dup       v1.8h, v16.h[6]
+    dup       v2.8h, v16.h[7]
+    ins       v1.d[1], v2.d[0]
+
+.rept 4
+    ld1       {v3.16b}, [x2], x3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   v3, v0, v1, v4, v5
+    st1       {v3.16b}, [x0], x1
+.endr
+
+    dup       v0.8h, v17.h[0]
+    dup       v1.8h, v17.h[1]
+    ins       v0.d[1], v1.d[0]
+    dup       v1.8h, v17.h[2]
+    dup       v2.8h, v17.h[3]
+    ins       v1.d[1], v2.d[0]
+
+.rept 4
+    ld1       {v3.16b}, [x2], x3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   v3, v0, v1, v4, v5
+    st1       {v3.16b}, [x0], x1
+.endr
+
+    dup       v0.8h, v17.h[4]
+    dup       v1.8h, v17.h[5]
+    ins       v0.d[1], v1.d[0]
+    dup       v1.8h, v17.h[6]
+    dup       v2.8h, v17.h[7]
+    ins       v1.d[1], v2.d[0]
+
+.rept 4
+    ld1       {v3.16b}, [x2], x3
+    MB_PRED_8BITS_ADD_DCT_16BITS_CLIP   v3, v0, v1, v4, v5
+    st1       {v3.16b}, [x0], x1
+.endr
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
new file mode 100644
index 0000000000..422a5f8442
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/arm64/svc_motion_estimation_aarch64_neon.S
@@ -0,0 +1,350 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+//int32_t SumOf8x8SingleBlock_AArch64_neon (uint8_t* pRef, const int32_t kiRefStride);
+WELS_ASM_AARCH64_FUNC_BEGIN SumOf8x8SingleBlock_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    ld1 {v0.d}[0], [x0], x1
+    ld1 {v0.d}[1], [x0], x1
+    ld1 {v1.d}[0], [x0], x1
+    ld1 {v1.d}[1], [x0], x1
+    ld1 {v2.d}[0], [x0], x1
+    ld1 {v2.d}[1], [x0], x1
+    ld1 {v3.d}[0], [x0], x1
+    ld1 {v3.d}[1], [x0]
+    uaddlp v0.8h, v0.16b
+    uadalp v0.8h, v1.16b
+    uadalp v0.8h, v2.16b
+    uadalp v0.8h, v3.16b
+    uaddlv s0, v0.8h
+    mov    x0, v0.d[0]
+WELS_ASM_AARCH64_FUNC_END
+
+//int32_t SumOf16x16SingleBlock_AArch64_neon (uint8_t* pRef, const int32_t kiRefStride);
+WELS_ASM_AARCH64_FUNC_BEGIN SumOf16x16SingleBlock_AArch64_neon
+    SIGN_EXTENSION x1,w1
+    ld1 {v0.16b}, [x0], x1
+    uaddlp v0.8h, v0.16b
+.rept 15
+    ld1 {v1.16b}, [x0], x1
+    uadalp v0.8h, v1.16b
+.endr
+    uaddlv s0, v0.8h
+    mov    x0, v0.d[0]
+WELS_ASM_AARCH64_FUNC_END
+
+//void SumOf8x8BlockOfFrame_AArch64_neon (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+//                               const int32_t kiRefStride,
+//                                uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+WELS_ASM_AARCH64_FUNC_BEGIN SumOf8x8BlockOfFrame_AArch64_neon
+//(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,const int32_t kiRefStride,uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[])
+    //x5: pTimesOfFeatureValue
+    //x4: pFeatureOfBlock
+
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x2,w2
+    SIGN_EXTENSION x3,w3
+    mov x8, x0
+    mov x6, x1
+    add x8, x8, x6
+    add x4, x4, x6, lsl #1
+
+    mov x7, x6
+_width_loop8x8_1:
+    subs x0, x8, x7
+    ld1 {v0.d}[0], [x0], x3
+    ld1 {v0.d}[1], [x0], x3
+    ld1 {v1.d}[0], [x0], x3
+    ld1 {v1.d}[1], [x0], x3
+    ld1 {v2.d}[0], [x0], x3
+    ld1 {v2.d}[1], [x0], x3
+    ld1 {v3.d}[0], [x0], x3
+    ld1 {v3.d}[1], [x0]
+    uaddlp v0.8h, v0.16b
+    uadalp v0.8h, v1.16b
+    uadalp v0.8h, v2.16b
+    uadalp v0.8h, v3.16b
+    uaddlv s0, v0.8h
+
+    subs x1, x4, x7, lsl #1
+    st1 {v0.h}[0], [x1] // sum -> pFeatureOfBlock[i]
+    mov w0, #0
+    ins v0.s[1], w0
+    mov    x0, v0.d[0]
+    add x1, x5, x0, lsl #2
+    ldr w0, [x1]
+    add w0, w0, #1
+    str w0, [x1]
+    subs x7, x7, #1
+    cbnz x7, _width_loop8x8_1
+
+    add x8, x8, x3
+    add x4, x4, x6, lsl #1
+    subs x2, x2, #1
+    cbz x2, _SumOf8x8BlockOfFrame_AArch64_neon_end
+
+_height_loop8x8:
+    mov x7, x6
+_width_loop8x8_2:
+    subs x0, x8, x7
+    subs x1, x4, x7, lsl #1
+    subs x9, x1, x6, lsl #1 // last line of pFeatureOfBlock[i]
+    ldrh  w10, [x9] // sum of last line of pFeatureOfBlock[i]
+
+    subs x11, x0, x3
+    ld1 {v0.d}[1], [x11]
+    add x0, x11, x3, lsl #3
+    ld1 {v0.d}[0], [x0] //
+
+    uaddlp v0.8h, v0.16b
+    addp v0.8h, v0.8h, v1.8h
+    uaddlp v0.4s, v0.8h
+    umov w11, v0.s[0]
+    umov w12, v0.s[1]
+
+    subs w10, w10, w12
+    mov x0, #0
+    add w0, w10, w11
+    strh w0, [x1] // sum -> pFeatureOfBlock[i]
+    add x1, x5, x0, lsl #2
+    ldr w0, [x1]
+    add w0, w0, #1
+    str w0, [x1]
+    subs x7, x7, #1
+    cbnz x7, _width_loop8x8_2
+
+    add x8, x8, x3
+    add x4, x4, x6, lsl #1
+    subs x2, x2, #1
+    cbnz x2, _height_loop8x8
+_SumOf8x8BlockOfFrame_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN SumOf16x16BlockOfFrame_AArch64_neon
+//(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,const int32_t kiRefStride,uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[])
+    //x5: pTimesOfFeatureValue
+    //x4: pFeatureOfBlock
+
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x2,w2
+    SIGN_EXTENSION x3,w3
+    mov x8, x0
+    mov x6, x1
+    add x8, x8, x6
+    add x4, x4, x6, lsl #1
+
+    mov x7, x6
+_width_loop16x16_1:
+    subs x0, x8, x7
+    ld1 {v0.16b}, [x0], x3
+    uaddlp v0.8h, v0.16b
+.rept 15
+    ld1 {v1.16b}, [x0], x3
+    uadalp v0.8h, v1.16b
+.endr
+    uaddlv s0, v0.8h
+
+    subs x1, x4, x7, lsl #1
+    st1 {v0.h}[0], [x1] // sum -> pFeatureOfBlock[i]
+    mov w0, #0
+    ins v0.s[1], w0
+    mov    x0, v0.d[0]
+    add x1, x5, x0, lsl #2
+    ldr w0, [x1]
+    add w0, w0, #1
+    str w0, [x1]
+    subs x7, x7, #1
+    cbnz x7, _width_loop16x16_1
+
+    add x8, x8, x3
+    add x4, x4, x6, lsl #1
+    subs x2, x2, #1
+    cbz x2, _SumOf16x16BlockOfFrame_AArch64_neon_end
+
+_height_loop16x16:
+    mov x7, x6
+_width_loop16x16_2:
+    subs x0, x8, x7
+
+    subs x1, x4, x7, lsl #1
+    subs x9, x1, x6, lsl #1 // last line of pFeatureOfBlock[i]
+    ldrh  w10, [x9] // sum of last line of pFeatureOfBlock[i]
+
+    subs x11, x0, x3
+    ld1 {v1.16b}, [x11]
+    add x0, x11, x3, lsl #4
+    ld1 {v0.16b}, [x0] //
+
+    uaddlv h0, v0.16b
+    uaddlv h1, v1.16b
+    umov w11, v0.h[0]
+    umov w12, v1.h[0]
+
+    subs w10, w10, w12
+    mov x0, #0
+    add w0, w10, w11
+    strh w0, [x1] // sum -> pFeatureOfBlock[i]
+    add x1, x5, x0, lsl #2
+    ldr w0, [x1]
+    add w0, w0, #1
+    str w0, [x1]
+    subs x7, x7, #1
+    cbnz x7, _width_loop16x16_2
+
+    add x8, x8, x3
+    add x4, x4, x6, lsl #1
+    subs x2, x2, #1
+    cbnz x2, _height_loop16x16
+_SumOf16x16BlockOfFrame_AArch64_neon_end:
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN InitializeHashforFeature_AArch64_neon
+// (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize, uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+    SIGN_EXTENSION x2,w2
+    mov x9, #3
+    bic x5, x2, x9
+    mov x8, #0
+_hash_assign_loop_x4:
+    ld1 {v0.16b}, [x0], #16
+    shl v0.4s, v0.4s, #2
+    addv s1, v0.4s
+    umov w7, v1.s[0]
+    cbz w7, _hash_assign_with_copy_x4
+
+    ins v2.d[0], x1
+    umov w8, v0.s[0]
+    add x1, x1, x8
+    ins v2.d[1], x1
+    umov w8, v0.s[1]
+    add x1, x1, x8
+    ins v3.d[0], x1
+    umov w8, v0.s[2]
+    add x1, x1, x8
+    ins v3.d[1], x1
+    umov w8, v0.s[3]
+    add x1, x1, x8
+    st1 {v2.16b, v3.16b}, [x3], #32
+    st1 {v2.16b, v3.16b}, [x4], #32
+    b _assign_next
+_hash_assign_with_copy_x4:
+    dup  v2.2d, x1
+    dup  v3.2d, x1
+    st1 {v2.16b, v3.16b}, [x3], #32
+    st1 {v2.16b, v3.16b}, [x4], #32
+
+_assign_next:
+    subs x5, x5, #4
+    cbnz x5, _hash_assign_loop_x4
+
+    and x5, x2, x9
+    cbz x5, _hash_assign_end
+
+
+_hash_assign_loop_x4_rem:
+    str x1, [x3], #8
+    str x1, [x4], #8
+    ldr w8, [x0], #4
+    lsl w8, w8, #2
+    add x1, x1, x8
+    subs x5, x5, #1
+    cbnz x5, _hash_assign_loop_x4_rem
+
+_hash_assign_end:
+WELS_ASM_AARCH64_FUNC_END
+
+.align 4
+mv_x_inc_x4: .short 0x10, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00
+mv_y_inc_x4: .short 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00
+mx_x_offset_x4: .short 0x00, 0x04, 0x08, 0x0c, 0x00, 0x00, 0x00, 0x00
+
+WELS_ASM_AARCH64_FUNC_BEGIN FillQpelLocationByFeatureValue_AArch64_neon
+// void  (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight, uint16_t** pFeatureValuePointerList)
+    ldr q7, mv_x_inc_x4
+    ldr q6, mv_y_inc_x4
+    ldr q5, mx_x_offset_x4
+    SIGN_EXTENSION x1,w1
+    SIGN_EXTENSION x2,w2
+    eor v4.16b, v4.16b, v4.16b
+    eor v3.16b, v3.16b, v3.16b
+    dup v16.2d, x3 // v8->v16
+
+_hash_height_loop:
+    mov x7, x1
+    mov v2.16b, v5.16b //mx_x_offset_x4
+
+_hash_width_loop:
+    ld1 {v0.d}[0], [x0], #8
+
+    ushll v0.4s, v0.4h, #3
+    uaddw   v17.2d, v16.2d, v0.2s
+    uaddw2  v18.2d, v16.2d, v0.4s
+    zip1 v1.8h, v2.8h, v3.8h
+
+    umov x4, v17.d[0]
+    ldr x5, [x4]
+    umov w6, v1.s[0]
+    str w6, [x5]
+    add x5, x5, #4
+    str x5, [x4]
+
+    umov x4, v17.d[1]
+    ldr x5, [x4]
+    umov w6, v1.s[1]
+    str w6, [x5]
+    add x5, x5, #4
+    str x5, [x4]
+
+    umov x4, v18.d[0]
+    ldr x5, [x4]
+    umov w6, v1.s[2]
+    str w6, [x5]
+    add x5, x5, #4
+    str x5, [x4]
+
+    umov x4, v18.d[1]
+    ldr x5, [x4]
+    umov w6, v1.s[3]
+    str w6, [x5]
+    add x5, x5, #4
+    str x5, [x4]
+
+    add v2.8h, v2.8h, v7.8h
+    subs x7, x7, #4
+    cbnz x7, _hash_width_loop
+
+    add v3.8h, v3.8h, v6.8h
+    subs x2, x2, #1
+    cbnz x2, _hash_height_loop
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/as264_common.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/as264_common.h
new file mode 100644
index 0000000000..30b21a3d84
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/as264_common.h
@@ -0,0 +1,143 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    common.h
+ *
+ * \brief   common flag definitions
+ *
+ * \date    7/6/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef AS264_COMMON_H_
+#define AS264_COMMON_H_
+
+/* debug setting for console
+$(TargetPath)
+-iper 60 -lqp 26 -frin 2 -rc 1 -cf 4 -org desktop.bgra -sw 800 -sh 592 -bf desktop.h264
+.\..\..\..\..\bin
+*/
+
+/****************************************************************************
+ * Options for algorithm, usually change bitrate
+ ****************************************************************************/
+#define DISABLE_FMO_FEATURE             //
+
+/****************************************************************************
+ * Options for optimization, not change bitrate
+ ****************************************************************************/
+//#undef        X86_ASM             // X86_ASM is included in project preprocessor definitions, undef it when need to disable asm code
+#define SINGLE_REF_FRAME            // need to disable it when use multi-reference
+
+
+#if defined(WELS_TESTBED)               // for SGE testing
+#define ENABLE_FRAME_DUMP
+
+#ifdef FRAME_INFO_OUTPUT
+#undef FRAME_INFO_OUTPUT
+#endif//FRAME_INFO_OUTPUT
+#endif//WELS_TESTBED
+
+
+#if defined(__UNITTEST__)               // for unittest
+#ifndef ENABLE_FRAME_DUMP
+#define ENABLE_FRAME_DUMP
+#endif//ENABLE_FRAME_DUMP
+#endif//__UNITTEST__
+
+//#define ENABLE_PSNR_CALC
+//#define STAT_OUTPUT
+//#define MB_TYPES_CHECK
+//
+//#define FRAME_INFO_OUTPUT
+//#define LAYER_INFO_OUTPUT
+//#define SLICE_INFO_OUTPUT             // useful in multiple slice coding track
+//#define MB_TYPES_INFO_OUTPUT
+
+
+/* macros dependencies check */
+//@if !FRAME_INFO_OUTPUT
+#if !defined(FRAME_INFO_OUTPUT)
+
+#if defined(ENABLE_PSNR_CALC)
+#undef ENABLE_PSNR_CALC
+#endif//ENABLE_PSNR_CALC
+
+//#if defined(STAT_OUTPUT)
+//#undef STAT_OUTPUT
+//#endif//STAT_OUTPUT
+
+#if defined(LAYER_INFO_OUTPUT)
+#undef LAYER_INFO_OUTPUT
+#endif//LAYER_INFO_OUTPUT
+
+#if defined(SLICE_INFO_OUTPUT)
+#undef SLICE_INFO_OUTPUT
+#endif//SLICE_INFO_OUTPUT
+
+#if defined(MB_TYPES_INFO_OUTPUT)
+#undef MB_TYPES_INFO_OUTPUT
+#endif//MB_TYPES_INFO_OUTPUT
+
+#endif//FRAME_INFO_OUTPUT
+
+//@if SLICE_INFO_OUTPUT
+#if defined(SLICE_INFO_OUTPUT)
+
+#if !defined(FRAME_INFO_OUTPUT)
+#define FRAME_INFO_OUTPUT
+#endif//FRAME_INFO_OUTPUT
+
+#if !defined(LAYER_INFO_OUTPUT)
+#define LAYER_INFO_OUTPUT
+#endif//LAYER_INFO_OUTPUT
+
+#endif//SLICE_INFO_OUTPUT
+
+#if defined(LAYER_INFO_OUTPUT)
+
+#if !defined(FRAME_INFO_OUTPUT)
+#define FRAME_INFO_OUTPUT
+#endif//!FRAME_INFO_OUTPUT
+
+#endif//LAYER_INFO_OUTPUT
+
+//@if MB_TYPES_INFO_OUTPUT
+#if defined(MB_TYPES_INFO_OUTPUT)
+
+#if !defined(MB_TYPES_CHECK)
+#define MB_TYPES_CHECK
+#endif//MB_TYPES_CHECK
+#endif//MB_TYPES_INFO_OUTPUT
+
+#endif // AS264_COMMON_H_
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/au_set.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/au_set.h
new file mode 100644
index 0000000000..a12106e9cb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/au_set.h
@@ -0,0 +1,152 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    au_set.h
+ *
+ * \brief   Interfaces introduced in Access Unit level based writer
+ *
+ * \date    05/18/2009 Created
+ *          05/21/2009 Added init_sps and init_pps
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_ACCESS_UNIT_WRITER_H__
+#define WELS_ACCESS_UNIT_WRITER_H__
+
+#include "parameter_sets.h"
+#include "paraset_strategy.h"
+#include "param_svc.h"
+#include "utils.h"
+namespace WelsEnc {
+/*!
+ *************************************************************************************
+ * \brief   to write Sequence Parameter Set (SPS)
+ *
+ * \param   pSps        SWelsSPS to be wrote
+ * \param   bs_aux      bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is SPS.
+ *************************************************************************************
+ */
+
+int32_t WelsWriteSpsNal (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_t* pSpsIdDelta);
+
+
+/*!
+ *************************************************************************************
+ * \brief   to write SubSet Sequence Parameter Set
+ *
+ * \param   sub_sps     subset pSps parsed
+ * \param   bs_aux      bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is SubSet SPS.
+ *************************************************************************************
+ */
+int32_t WelsWriteSubsetSpsSyntax (SSubsetSps* pSubsetSps, SBitStringAux* pBitStringAux , int32_t* pSpsIdDelta);
+
+
+/*!
+ *************************************************************************************
+ * \brief   to write Picture Parameter Set (PPS)
+ *
+ * \param   pPps        pPps
+ * \param   bs_aux      bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is PPS.
+ *************************************************************************************
+ */
+int32_t WelsWritePpsSyntax (SWelsPPS* pPps, SBitStringAux* pBitStringAux, IWelsParametersetStrategy* pParametersetStrategy);
+
+/*!
+ * \brief   initialize pSps based on configurable parameters in svc
+ * \param   pSps                SWelsSPS*
+ * \param   pLayerParam         SSpatialLayerConfig  dependency layer parameter
+ * \param   pLayerParamInternal SSpatialLayerInternal*, internal dependency layer parameter
+ * \param   iSpsId              SPS Id
+ * \return  0 - successful
+ *          1 - failed
+ */
+int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialLayerInternal* pLayerParamInternal,
+                     const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
+                     const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
+                     const int32_t kiDlayerCount,bool bSVCBaselayer);
+
+/*!
+ * \brief   initialize subset pSps based on configurable parameters in svc
+ * \param   pSubsetSps          SSubsetSps*
+ * \param   pLayerParam         SSpatialLayerConfig  dependency layer parameter
+ * \param   pLayerParamInternal SSpatialLayerInternal*, internal dependency layer parameter
+ * \param   kiSpsId             SPS Id
+ * \return  0 - successful
+ *          1 - failed
+ */
+int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SSpatialLayerConfig* pLayerParam,
+                           SSpatialLayerInternal* pLayerParamInternal,
+                           const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
+                           const uint32_t kiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
+                           const int32_t kiDlayerCount);
+
+/*!
+ * \brief   initialize pPps based on configurable parameters and pSps(subset pSps) in svc
+ * \param   pPps                            SWelsPPS*
+ * \param   pSps                            SWelsSPS*
+ * \param   pSubsetSps                      SSubsetSps*
+ * \param   kbDeblockingFilterPresentFlag   bool
+ * \param   kiPpsId                         PPS Id
+ * \param   kbUsingSubsetSps                bool
+ * \return  0 - successful
+ *          1 - failed
+ */
+int32_t WelsInitPps (SWelsPPS* pPps,
+                     SWelsSPS* pSps,
+                     SSubsetSps* pSubsetSps,
+                     const uint32_t kuiPpsId,
+                     const bool kbDeblockingFilterPresentFlag,
+                     const bool kbUsingSubsetSps,
+                     const bool kbEntropyCodingModeFlag);
+
+int32_t WelsCheckRefFrameLimitationNumRefFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam);
+int32_t WelsCheckRefFrameLimitationLevelIdcFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam);
+
+int32_t WelsAdjustLevel (SSpatialLayerConfig* pSpatialLayer,const SLevelLimits *pCurLevel);
+
+}
+#endif//WELS_ACCESS_UNIT_PARSER_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/deblocking.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/deblocking.h
new file mode 100644
index 0000000000..55f64b5d1b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/deblocking.h
@@ -0,0 +1,92 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblocking.h
+ *
+ * \brief   Interfaces introduced in frame deblocking filtering
+ *
+ * \date    08/03/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_DEBLOCKING_H_
+#define WELS_DEBLOCKING_H_
+
+#include "encoder_context.h"
+#include "wels_func_ptr_def.h"
+#include "deblocking_common.h"
+namespace WelsEnc {
+
+
+//struct tagDeblockingFunc;
+
+typedef struct TagDeblockingFilter {
+  uint8_t*    pCsData[3];     // pointer to reconstructed picture pData
+  int32_t     iCsStride[3];   // Cs iStride
+  int16_t     iMbStride;
+  int8_t      iSliceAlphaC0Offset;
+  int8_t      iSliceBetaOffset;
+  uint8_t     uiLumaQP;
+  uint8_t     uiChromaQP;
+  uint8_t     uiFilterIdc;
+  uint8_t     uiReserved;
+} SDeblockingFilter;
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+#if defined(HAVE_NEON)
+void DeblockingBSCalcEnc_neon (int8_t* pNzc, SMVUnitXY* pMv, int32_t iBoundryFlag, int32_t iMbStride,
+                               uint8_t (*pBS)[4][4]);
+#endif
+#if defined(HAVE_NEON_AARCH64)
+void DeblockingBSCalcEnc_AArch64_neon (int8_t* pNzc, SMVUnitXY* pMv, int32_t iBoundryFlag, int32_t iMbStride,
+                                       uint8_t (*pBS)[4][4]);
+#endif
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+void DeblockingInit (DeblockingFunc*   pFunc,  int32_t iCpu);
+
+void WelsBlockFuncInit (PSetNoneZeroCountZeroFunc* pfSetNZCZero,  int32_t iCpu);
+
+void PerformDeblockingFilter (sWelsEncCtx* pEnc);
+
+void DeblockingFilterFrameAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc);
+
+void DeblockingFilterSliceAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SSlice* pSlice);
+void DeblockingFilterSliceAvcbaseNull (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SSlice* pSlice);
+}
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/decode_mb_aux.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/decode_mb_aux.h
new file mode 100644
index 0000000000..893c4a3ba4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/decode_mb_aux.h
@@ -0,0 +1,107 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef DECODE_MB_AUX_H
+#define DECODE_MB_AUX_H
+
+#include "typedefs.h"
+#include "macros.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+void WelsDequantLumaDc4x4 (int16_t* pRes, const int32_t kiQp);
+void WelsIHadamard4x4Dc (int16_t* pRes);
+
+void WelsInitReconstructionFuncs (SWelsFuncPtrList* pList, uint32_t  iCpuFlags);
+void WelsGetEncBlockStrideOffset (int32_t* pBlock, const int32_t kiStrideY, const int32_t kiStrideUV);
+
+void WelsDequantFour4x4_c (int16_t* pRes, const uint16_t* kpQpTable);
+void WelsDequant4x4_c (int16_t* pRes, const uint16_t* kpQpTable);
+void WelsDequantIHadamard4x4_c (int16_t* pRes, const uint16_t kuiMF);
+void WelsDequantIHadamard2x2Dc (int16_t* pDct, const uint16_t kuiMF);
+
+void WelsIDctT4RecOnMb (uint8_t* pDst, int32_t iDstStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct,
+                        PIDctFunc pfIDctFourT4);
+void WelsIDctT4Rec_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct);
+void WelsIDctRecI16x16Dc_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDctDc);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+void WelsDequant4x4_sse2 (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequantFour4x4_sse2 (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequantIHadamard4x4_sse2 (int16_t* pRes, const uint16_t kuiMF);
+
+void WelsIDctT4Rec_mmx (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctT4Rec_sse2 (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_sse2 (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctRecI16x16Dc_sse2 (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride,
+                               int16_t* pDctDc);
+void WelsIDctT4Rec_avx2 (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_avx2 (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+#endif//X86_ASM
+
+#ifdef HAVE_NEON
+void WelsDequantFour4x4_neon (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequant4x4_neon (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequantIHadamard4x4_neon (int16_t* pRes, const uint16_t kuiMF);
+
+void WelsIDctT4Rec_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctRecI16x16Dc_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride,
+                               int16_t* pDctDc);
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+void WelsDequantFour4x4_AArch64_neon (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequant4x4_AArch64_neon (int16_t* pDct, const uint16_t* kpMF);
+void WelsDequantIHadamard4x4_AArch64_neon (int16_t* pRes, const uint16_t kuiMF);
+
+void WelsIDctT4Rec_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctRecI16x16Dc_AArch64_neon (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride,
+                                 int16_t* pDctDc);
+#endif
+
+#if defined(HAVE_MMI)
+void WelsIDctT4Rec_mmi (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctFourT4Rec_mmi (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDct);
+void WelsIDctRecI16x16Dc_mmi (uint8_t* pRec, int32_t iStride, uint8_t* pPrediction, int32_t iPredStride, int16_t* pDctDc);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/dq_map.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/dq_map.h
new file mode 100644
index 0000000000..ba83fab242
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/dq_map.h
@@ -0,0 +1,58 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    dq_map.h
+ *
+ * \brief   Dependency Quality layer IDC mapping for cross layer selection and jumpping.
+ *          DQ layer idc map for svc encoding, might be a better scheme than that of design before,
+ *          can aware idc of referencing layer and that idc of successive layer to be coded
+ *
+ * \date    4/22/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__)
+#define WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__
+
+namespace WelsEnc {
+/*
+ *  Dependency Quality IDC
+ */
+
+typedef struct TagDqIdc {
+uint16_t    iPpsId;         // pPps id
+uint8_t     iSpsId;         // pSps id
+int8_t      uiSpatialId;    // spatial id
+} SDqIdc;
+
+}
+
+#endif//WELS_ENCODER_DEPENDENCY_QUAILITY_IDC_MAP_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encode_mb_aux.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encode_mb_aux.h
new file mode 100644
index 0000000000..296d2e380b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encode_mb_aux.h
@@ -0,0 +1,185 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef ENCODE_MB_AUX_H
+#define ENCODE_MB_AUX_H
+
+#include "typedefs.h"
+#include "wels_func_ptr_def.h"
+#include "copy_mb.h"
+
+namespace WelsEnc {
+void WelsInitEncodingFuncs (SWelsFuncPtrList* pFuncList, uint32_t  uiCpuFlag);
+int32_t WelsGetNoneZeroCount_c (int16_t* pLevel);
+
+/****************************************************************************
+ * Scan and Score functions
+ ****************************************************************************/
+void    WelsScan4x4Ac_c (int16_t* pZigValue, int16_t* pDct);
+void    WelsScan4x4Dc (int16_t* pLevel, int16_t* pDct);
+void    WelsScan4x4DcAc_c (int16_t* pLevel, int16_t* pDct);
+int32_t WelsCalculateSingleCtr4x4_c (int16_t* pDct);
+
+/****************************************************************************
+ * HDM and Quant functions
+ ****************************************************************************/
+void WelsHadamardT4Dc_c (int16_t* pLumaDc, int16_t* pDct);
+int32_t WelsHadamardQuant2x2_c (int16_t* pRes, const int16_t kiFF, int16_t iMF, int16_t* pDct, int16_t* pBlock);
+int32_t WelsHadamardQuant2x2Skip_c (int16_t* pRes, int16_t iFF,  int16_t iMF);
+
+void WelsQuant4x4_c (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_c (int16_t* pDct, int16_t iFF,  int16_t iMF);
+void WelsQuantFour4x4_c (int16_t* pDct, const int16_t* pFF, const int16_t* pQpTable);
+void WelsQuantFour4x4Max_c (int16_t* pDct, const int16_t* pF, const int16_t* pQpTable, int16_t* pMax);
+
+
+/****************************************************************************
+ * DCT functions
+ ****************************************************************************/
+void WelsDctT4_c (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+// dct_data is no-use here, just for the same interface with dct_save functions
+void WelsDctFourT4_c (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#ifdef X86_ASM
+
+int32_t WelsGetNoneZeroCount_sse2 (int16_t* pLevel);
+int32_t WelsGetNoneZeroCount_sse42 (int16_t* pLevel);
+
+/****************************************************************************
+ * Scan and Score functions
+ ****************************************************************************/
+void WelsScan4x4Ac_sse2 (int16_t* zig_value, int16_t* pDct);
+void WelsScan4x4DcAc_ssse3 (int16_t* pLevel, int16_t* pDct);
+void WelsScan4x4DcAc_sse2 (int16_t* pLevel, int16_t* pDct);
+int32_t WelsCalculateSingleCtr4x4_sse2 (int16_t* pDct);
+
+/****************************************************************************
+ * DCT functions
+ ****************************************************************************/
+void WelsDctT4_mmx (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctT4_sse2 (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctFourT4_sse2 (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctT4_avx2 (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctFourT4_avx2 (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+
+/****************************************************************************
+ * HDM and Quant functions
+ ****************************************************************************/
+int32_t WelsHadamardQuant2x2_mmx (int16_t* pRes, const int16_t kiFF, int16_t iMF, int16_t* pDct, int16_t* pBlock);
+void WelsHadamardT4Dc_sse2 (int16_t* pLumaDc, int16_t* pDct);
+int32_t WelsHadamardQuant2x2Skip_mmx (int16_t* pRes, int16_t iFF,  int16_t iMF);
+
+void WelsQuant4x4_sse2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_sse2 (int16_t* pDct, int16_t iFF, int16_t iMF);
+void WelsQuantFour4x4_sse2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuantFour4x4Max_sse2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+
+void WelsQuant4x4_avx2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_avx2 (int16_t* pDct, int16_t iFF, int16_t iMF);
+void WelsQuantFour4x4_avx2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuantFour4x4Max_avx2 (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+
+#endif
+
+#ifdef HAVE_NEON
+void WelsHadamardT4Dc_neon (int16_t* pLumaDc, int16_t* pDct);
+int32_t WelsHadamardQuant2x2_neon (int16_t* pRes, const int16_t kiFF, int16_t iMF, int16_t* pDct, int16_t* pBlock);
+int32_t WelsHadamardQuant2x2Skip_neon (int16_t* pRes, int16_t iFF,  int16_t iMF);
+int32_t WelsHadamardQuant2x2SkipKernel_neon (int16_t* pRes, int16_t iThreshold); // avoid divide operator
+
+void WelsDctT4_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctFourT4_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+
+int32_t WelsGetNoneZeroCount_neon (int16_t* pLevel);
+
+void WelsQuant4x4_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_neon (int16_t* pDct, int16_t iFF, int16_t iMF);
+void WelsQuantFour4x4_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuantFour4x4Max_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+void WelsHadamardT4Dc_AArch64_neon (int16_t* pLumaDc, int16_t* pDct);
+int32_t WelsHadamardQuant2x2_AArch64_neon (int16_t* pRes, const int16_t kiFF, int16_t iMF, int16_t* pDct, int16_t* pBlock);
+int32_t WelsHadamardQuant2x2Skip_AArch64_neon (int16_t* pRes, int16_t iFF,  int16_t iMF);
+int32_t WelsHadamardQuant2x2SkipKernel_AArch64_neon (int16_t* pRes, int16_t iThreshold); // avoid divide operator
+
+void WelsDctT4_AArch64_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctFourT4_AArch64_neon (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+
+int32_t WelsGetNoneZeroCount_AArch64_neon (int16_t* pLevel);
+
+void WelsQuant4x4_AArch64_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_AArch64_neon (int16_t* pDct, int16_t iFF, int16_t iMF);
+void WelsQuantFour4x4_AArch64_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuantFour4x4Max_AArch64_neon (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+#endif
+
+#ifdef HAVE_MMI
+int32_t WelsGetNoneZeroCount_mmi (int16_t* pLevel);
+
+/****************************************************************************
+ *  * Scan and Score functions
+ *   ****************************************************************************/
+void WelsScan4x4Ac_mmi (int16_t* zig_value, int16_t* pDct);
+void WelsScan4x4DcAc_mmi (int16_t* pLevel, int16_t* pDct);
+int32_t WelsCalculateSingleCtr4x4_mmi (int16_t* pDct);
+
+/****************************************************************************
+ *  * DCT functions
+ *   ****************************************************************************/
+void WelsDctT4_mmi (int16_t* pDct,  uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+void WelsDctFourT4_mmi (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2);
+
+/****************************************************************************
+ *  * HDM and Quant functions
+ *   ****************************************************************************/
+void WelsHadamardT4Dc_mmi (int16_t* pLumaDc, int16_t* pDct);
+
+void WelsQuant4x4_mmi (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuant4x4Dc_mmi (int16_t* pDct, int16_t iFF, int16_t iMF);
+void WelsQuantFour4x4_mmi (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+void WelsQuantFour4x4Max_mmi (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+ALIGNED_DECLARE (extern const int16_t, g_kiQuantInterFF[58][8], 16);
+#define g_iQuantIntraFF (g_kiQuantInterFF +6 )
+ALIGNED_DECLARE (extern const int16_t, g_kiQuantMF[52][8], 16);
+}
+#endif//ENCODE_MB_AUX_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder.h
new file mode 100644
index 0000000000..893b5389db
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder.h
@@ -0,0 +1,148 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encoder.h
+ *
+ * \brief   core encoder
+ *
+ * \date    5/14/2009
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_CORE_ENCODER_H__)
+#define WELS_CORE_ENCODER_H__
+
+#include "encoder_context.h"
+
+namespace WelsEnc {
+/*!
+ * \brief   request specific memory for SVC
+ * \param   pEncCtx     sWelsEncCtx*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t RequestMemorySvc (sWelsEncCtx** ppCtx, SExistingParasetList* pExistingParasetList);
+
+/*!
+ * \brief   free memory in SVC core encoder
+ * \param   pEncCtx     sWelsEncCtx**
+ * \return  none
+ */
+void FreeMemorySvc (sWelsEncCtx** ppCtx);
+
+/*!
+ * \brief    allocate or reallocate the output bs buffer
+ * \return:  successful - 0; otherwise none 0 for failed
+ */
+int32_t AllocateBsOutputBuffer (CMemoryAlign* pMa, const int32_t iNeededLen, int32_t iOrigLen, const char* kpTag,
+                                uint8_t*& pOutputBuffer);
+//TODO: to finish this function and call it
+
+/*!
+ * \brief   initialize function pointers that potentially used in Wels encoding
+ * \param   pEncCtx     sWelsEncCtx*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t InitFunctionPointers (sWelsEncCtx* pEncCtx, SWelsSvcCodingParam* _param, uint32_t  uiCpuFlag);
+
+///*!
+// * \brief decide frame type (IDR/P frame)
+// * \param uiFrameType frame type output
+// * \param frame_idx   frame index elapsed currently
+// * \param idr         IDR interval
+// * \return    successful - 0; otherwise none 0 for failed
+// */
+/*!
+ * \brief   initialize frame coding
+ */
+void InitFrameCoding (sWelsEncCtx* pEncCtx, const EVideoFrameType keFrameType, const int32_t kiDidx);
+void LoadBackFrameNum (sWelsEncCtx* pEncCtx, const int32_t kiDidx);
+
+EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum, const int32_t kiDidx,
+                                 bool bSkipFrameFlag);
+void InitBitStream (sWelsEncCtx* pEncCtx);
+int32_t GetTemporalLevel (SSpatialLayerInternal* fDlp, const int32_t kiFrameNum, const int32_t kiGopSize);
+/*!
+ * \brief   Dump reconstruction for dependency layer
+ */
+
+extern "C" void DumpDependencyRec (SPicture* pSrcPic, const char* kpFileName, const int8_t kiDid, bool bAppend,
+                                   SDqLayer* pDqLayer, bool bSimulCastAVC);
+
+/*!
+ * \brief   Dump the reconstruction pictures
+ */
+void DumpRecFrame (SPicture* pSrcPic, const char* kpFileName, const int8_t kiDid, bool bAppend, SDqLayer* pDqLayer);
+
+
+/*!
+ * \brief   encode overall slices pData in a frame
+ * \param   pEncCtx             sWelsEncCtx*, encoder context
+ * \param   count_slice_num     count number of slices in a frame
+ * \param   eNalType            EWelsNalUnitType for a frame
+ * \param   nal_idc             EWelsNalRefIdc for a frame
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t EncodeFrame (sWelsEncCtx* pEncCtx,
+                     const int32_t kiSliceNumCount,
+                     const EWelsNalUnitType keNalType,
+                     const EWelsNalRefIdc keNalIdc);
+
+
+/**********************************************************************************
+ * memzero Function
+***********************************************************************************/
+void WelsSetMemZero_c (void* pDst, int32_t iSize); // confirmed_safe_unsafe_usage
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#ifdef X86_ASM
+void WelsSetMemZeroAligned64_sse2 (void* pDst, int32_t iSize);
+void WelsSetMemZeroSize64_mmx (void* pDst, int32_t iSize);
+void WelsSetMemZeroSize8_mmx (void* pDst, int32_t iSize);
+void WelsPrefetchZero_mmx (int8_t const* kpDst);
+#elif defined(HAVE_NEON)
+void WelsSetMemZero_neon (void* pDst, int32_t iSize);
+#elif defined(HAVE_NEON_AARCH64)
+void WelsSetMemZero_AArch64_neon (void* pDst, int32_t iSize);
+#endif
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+/**********************************************************************************
+ * Function points type
+***********************************************************************************/
+}
+
+#endif//WELS_CORE_ENCODER_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder_context.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder_context.h
new file mode 100644
index 0000000000..90a909e763
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/encoder_context.h
@@ -0,0 +1,240 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encoder_context.h
+ *
+ * \brief   Main pData to be operated over Wels encoder all modules
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_ENCODER_CONTEXT_H__
+#define WELS_ENCODER_CONTEXT_H__
+
+#include <stdio.h>
+#include "typedefs.h"
+#include "param_svc.h"
+#include "nal_encap.h"
+#include "picture.h"
+#include "paraset_strategy.h"
+#include "dq_map.h"
+#include "stat.h"
+#include "macros.h"
+#include "rc.h"
+#include "as264_common.h"
+#include "wels_preprocess.h"
+#include "wels_func_ptr_def.h"
+#include "crt_util_safe_x.h"
+#include "utils.h"
+
+#include "mt_defs.h" // for multiple threadin,
+#include "WelsThreadLib.h"
+#include "wels_task_management.h"
+
+namespace WelsEnc {
+
+class IWelsTaskManage;
+class IWelsReferenceStrategy;
+
+/*
+ *  reference list for each quality layer in SVC
+ */
+typedef struct TagRefList {
+  SPicture*     pShortRefList[1 + MAX_SHORT_REF_COUNT]; // reference list 0 - int16_t
+  SPicture*     pLongRefList[1 + MAX_REF_PIC_COUNT];    // reference list 1 - int32_t
+  SPicture*     pNextBuffer;
+  SPicture*     pRef[1 + MAX_REF_PIC_COUNT];    // plus 1 for swap intend
+  uint8_t       uiShortRefCount;
+  uint8_t       uiLongRefCount; // dependend on pRef pic module
+} SRefList;
+
+typedef struct TagLTRState {
+// LTR mark feedback
+  uint32_t      uiLtrMarkState; // LTR mark state, indicate whether there is a LTR mark feedback unsolved
+  int32_t       iLtrMarkFbFrameNum;// the unsolved LTR mark feedback, the marked iFrameNum feedback from decoder
+
+// LTR used as recovery reference
+  int32_t       iLastRecoverFrameNum; // reserve the last LTR or IDR recover iFrameNum
+  int32_t       iLastCorFrameNumDec; // reserved the last correct position in decoder side, use to select valid LTR to recover or to decide the LTR mark validation
+  int32_t       iCurFrameNumInDec; // current iFrameNum in decoder side, use to select valid LTR to recover or to decide the LTR mark validation
+
+// LTR mark
+  int32_t       iLTRMarkMode; // direct mark or delay mark
+  int32_t       iLTRMarkSuccessNum; //successful marked num, for mark mode switch
+  int32_t       iCurLtrIdx;// current int32_t term reference index to mark
+  int32_t       iLastLtrIdx[MAX_TEMPORAL_LAYER_NUM];
+  int32_t       iSceneLtrIdx;// related to Scene LTR, used by screen content
+
+  uint32_t      uiLtrMarkInterval;// the interval from the last int32_t term pRef mark
+
+  bool          bLTRMarkingFlag;        //decide whether current frame marked as LTR
+  bool          bLTRMarkEnable; //when LTR is confirmed and the interval is no smaller than the marking period
+  bool          bReceivedT0LostFlag;    // indicate whether a t0 lost feedback is recieved, for LTR recovery
+} SLTRState;
+
+typedef struct TagSpatialPicIndex {
+  SPicture*     pSrc;   // I420 based and after color space converted
+  int32_t       iDid;   // dependency id
+} SSpatialPicIndex;
+
+typedef struct TagStrideTables {
+  int32_t*      pStrideDecBlockOffset[MAX_DEPENDENCY_LAYER][2]; // [iDid][tid==0][24 x 4]: luma+chroma= 24 x 4
+  int32_t*      pStrideEncBlockOffset[MAX_DEPENDENCY_LAYER];    // [iDid][24 x 4]: luma+chroma= 24 x 4
+  int16_t*      pMbIndexX[MAX_DEPENDENCY_LAYER];                // [iDid][iMbX]: map for iMbX in each spatial layer coding
+  int16_t*      pMbIndexY[MAX_DEPENDENCY_LAYER];                // [iDid][iMbY]: map for iMbY in each spatial layer coding
+} SStrideTables;
+
+typedef struct TagWelsEncCtx {
+  SLogContext sLogCtx;
+// Input
+  SWelsSvcCodingParam* pSvcParam;   // SVC parameter, WelsSVCParamConfig in svc_param_settings.h
+
+  int32_t*          pSadCostMb;
+  /* MVD cost tables for Inter MB */
+  int32_t           iMvRange;
+  uint16_t*         pMvdCostTable; //[52];  // adaptive to spatial layers
+  int32_t           iMvdCostTableSize; //the size of above table
+  int32_t           iMvdCostTableStride; //the stride of above table
+  SMVUnitXY*
+  pMvUnitBlock4x4;      // (*pMvUnitBlock4x4[2])[MB_BLOCK4x4_NUM];          // for store each 4x4 blocks' mv unit, the two swap after different d layer
+  int8_t*
+  pRefIndexBlock4x4;    // (*pRefIndexBlock4x4[2])[MB_BLOCK8x8_NUM];        // for store each 4x4 blocks' pRef index, the two swap after different d layer
+  int8_t*           pNonZeroCountBlocks;     // (*pNonZeroCountBlocks)[MB_LUMA_CHROMA_BLOCK4x4_NUM];
+  int8_t*
+  pIntra4x4PredModeBlocks;      // (*pIntra4x4PredModeBlocks)[INTRA_4x4_MODE_NUM];  //last byte is not used; the first 4 byte is for the bottom 12,13,14,15 4x4 block intra mode, and 3 byte for (3,7,11)
+
+  SMB**             ppMbListD;     // [MAX_DEPENDENCY_LAYER];
+  SStrideTables*    pStrideTab;     // stride tables for internal coding used
+  SWelsFuncPtrList* pFuncList;
+
+  SSliceThreading*  pSliceThreading;
+  IWelsTaskManage*  pTaskManage; //was planning to put it under CWelsH264SVCEncoder but it may be updated (lock/no lock) when param is changed
+  IWelsReferenceStrategy* pReferenceStrategy;
+
+  // pointers
+  SPicture*         pEncPic;                // pointer to current picture to be encoded
+  SPicture*         pDecPic;                // pointer to current picture being reconstructed
+  SPicture*         pRefPic;                // pointer to current reference picture
+
+  SDqLayer*         pCurDqLayer;            // DQ layer context used to being encoded currently, for reference base layer to refer: pCurDqLayer->pRefLayer if applicable
+  SDqLayer**        ppDqLayerList;          // overall DQ layers encoded for storage
+
+  SRefList**        ppRefPicListExt;        // reference picture list for SVC
+  SPicture*         pRefList0[16];
+  SLTRState*        pLtr;//[MAX_DEPENDENCY_LAYER];
+  bool              bCurFrameMarkedAsSceneLtr;
+// Derived
+
+  EWelsSliceType    eSliceType;             // currently coding slice type
+  EWelsNalUnitType  eNalType;               // NAL type
+  EWelsNalRefIdc    eNalPriority;           // NAL_Reference_Idc currently
+  EWelsNalRefIdc    eLastNalPriority[MAX_DEPENDENCY_LAYER];       // NAL_Reference_Idc in last frame
+  uint8_t           iNumRef0;
+
+  uint8_t           uiDependencyId;         // Idc of dependecy layer to be coded
+  uint8_t           uiTemporalId;           // Idc of temporal layer to be coded
+  bool              bNeedPrefixNalFlag;     // whether add prefix nal
+
+// Rate control routine
+  SWelsSvcRc*       pWelsSvcRc;
+  bool              bCheckWindowStatusRefreshFlag;
+  int64_t           iCheckWindowStartTs;
+  int64_t           iCheckWindowCurrentTs;
+  int32_t           iCheckWindowInterval;
+  int32_t           iCheckWindowIntervalShift;
+  bool              bCheckWindowShiftResetFlag;
+  int32_t           iGlobalQp;      // global qp
+
+// VAA
+  SVAAFrameInfo*    pVaa;           // VAA information of reference
+  CWelsPreProcess*  pVpp;
+
+  SWelsSPS*         pSpsArray;      // MAX_SPS_COUNT by standard compatible
+  SWelsSPS*         pSps;
+  SWelsPPS*         pPPSArray;      // MAX_PPS_COUNT by standard compatible
+  SWelsPPS*         pPps;
+  /* SVC only */
+  SSubsetSps*       pSubsetArray;   // MAX_SPS_COUNT by standard compatible
+  SSubsetSps*       pSubsetSps;
+  int32_t           iSpsNum;        // number of pSps used
+  int32_t           iSubsetSpsNum;  // number of pSps used
+  int32_t           iPpsNum;        // number of pPps used
+
+// Output
+  SWelsEncoderOutput* pOut;         // for NAL raw pData (need allocating memory for sNalList internal)
+  uint8_t*          pFrameBs;       // restoring bitstream pBuffer of all NALs in a frame
+  int32_t           iFrameBsSize;   // count size of frame bs in bytes allocated
+  int32_t           iPosBsBuffer;   // current writing position of frame bs pBuffer
+
+  SSpatialPicIndex  sSpatialIndexMap[MAX_DEPENDENCY_LAYER];
+  int32_t           iSliceBufferSize[MAX_DEPENDENCY_LAYER];
+
+  bool              bRefOfCurTidIsLtr[MAX_DEPENDENCY_LAYER][MAX_TEMPORAL_LEVEL];
+ // uint16_t          uiIdrPicId;           // IDR picture id: [0, 65535], this one is used for LTR
+  int32_t           iMaxSliceCount;// maximal count number of slices for all layers observation
+  int16_t           iActiveThreadsNum;      // number of threads active so far
+
+  /*
+   * DQ layer idc map for svc encoding, might be a better scheme than that of design before,
+   * can aware idc of referencing layer and that idc of successive layer to be coded
+   */
+  /* SVC only */
+  SDqIdc*           pDqIdcMap;    // overall DQ map of full scalability in specific frame (All full D/T/Q layers involved)                                                                                                // pDqIdcMap[dq_index] for each SDqIdc pData
+
+  SParaSetOffset    sPSOVector;
+  SParaSetOffset*   pPSOVector;
+  CMemoryAlign*     pMemAlign;
+
+#if defined(STAT_OUTPUT)
+// overall stat pData, refer to SStatData in stat.h, in case avc to use stat[0][0]
+  SStatData         sStatData [ MAX_DEPENDENCY_LAYER ] [ MAX_QUALITY_LEVEL ];
+  SStatSliceInfo    sPerInfo;
+#endif//STAT_OUTPUT
+
+  //related to Statistics
+  int64_t            uiStartTimestamp;
+  SEncoderStatistics sEncoderStatistics[MAX_DEPENDENCY_LAYER];
+  int32_t            iStatisticsLogInterval;
+  int64_t            iLastStatisticsLogTs;
+
+  int32_t iEncoderError;
+  WELS_MUTEX mutexEncoderError;
+  bool bDeliveryFlag;
+  SStateCtx sWelsCabacContexts[4][WELS_QP_MAX + 1][WELS_CONTEXT_COUNT];
+#ifdef ENABLE_FRAME_DUMP
+  bool bDependencyRecFlag[MAX_DEPENDENCY_LAYER];
+#endif
+  int64_t            uiLastTimestamp;
+  uint8_t*           pDynamicBsBuffer[MAX_THREADS_NUM];
+} sWelsEncCtx/*, *PWelsEncCtx*/;
+}
+#endif//sWelsEncCtx_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/extern.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/extern.h
new file mode 100644
index 0000000000..8790a48f87
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/extern.h
@@ -0,0 +1,124 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    extern.h
+ *
+ * \brief   extern interfaces between core and plus of wels encoder
+ *
+ * \date    4/21/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_ENCODER_EXTERN_H__)
+#define WELS_ENCODER_EXTERN_H__
+
+#include "typedefs.h"
+#include "encoder_context.h"
+
+namespace WelsEnc {
+
+/*!
+ * \brief   initialize source picture body
+ * \param   kpSrc       SSourcePicture*
+ * \param   kiCsp       internal csp format
+ * \param   kiWidth widht of picture in pixels
+ * \param   kiHeight    height of picture in pixels
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t InitPic (const void* kpSrc, const int32_t kiCsp, const int32_t kiWidth, const int32_t kiHeight);
+
+/*
+ *  SVC core encoder external interfaces
+ */
+
+/*!
+ * \brief   validate checking in parameter configuration
+ * \pParam  pParam      SWelsSvcCodingParam*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t ParamValidationExt (SLogContext* pCtx, SWelsSvcCodingParam* pParam);
+
+// GOM based RC related for uiSliceNum decision
+void GomValidCheck (const int32_t kiMbWidth, const int32_t kiMbHeight, int32_t* pSliceNum);
+
+/*!
+ * \brief   initialize Wels avc encoder core library
+ * \param   ppCtx       sWelsEncCtx**
+ * \param   para        SWelsSvcCodingParam*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pPara, SLogContext* pLogCtx,
+                            SExistingParasetList* pExistingParasetList);
+
+/*!
+ * \brief   uninitialize Wels encoder core library
+ * \param   pEncCtx     sWelsEncCtx*
+ * \return  none
+ */
+void WelsUninitEncoderExt (sWelsEncCtx** ppCtx);
+
+/*!
+ * \brief   core svc encoding process
+ *
+ * \param   h           sWelsEncCtx*, encoder context
+ * \param   pFbi        FrameBSInfo*
+ * \param   kpSrcPic    Source picture
+ * \return  EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP)
+ */
+int32_t WelsEncoderEncodeExt (sWelsEncCtx*, SFrameBSInfo* pFbi, const SSourcePicture* kpSrcPic);
+
+int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst);
+
+/*
+ * Force coding IDR as follows
+ */
+int32_t ForceCodingIDR (sWelsEncCtx* pCtx,int32_t iLayerId);
+
+/*!
+ * \brief   Wels SVC encoder parameters adjustment
+ *          SVC adjustment results in new requirement in memory blocks adjustment
+ */
+int32_t WelsBitRateVerification(SLogContext* pLogCtx,SSpatialLayerConfig* pLayerParam,int32_t iLayerId);
+int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNew);
+void WelsEncoderApplyFrameRate (SWelsSvcCodingParam* pParam);
+int32_t WelsEncoderApplyBitRate (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer);
+int32_t WelsEncoderApplyBitVaryRang(SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iRang);
+int32_t WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue);
+int32_t DynSliceRealloc(sWelsEncCtx* pCtx,SFrameBSInfo* pFrameBsInfo,SLayerBSInfo* pLayerBsInfo);
+int32_t FilterLTRRecoveryRequest (sWelsEncCtx* pCtx, SLTRRecoverRequest* pLTRRecoverRequest);
+void CheckProfileSetting (SLogContext* pLogCtx,SWelsSvcCodingParam* pParam,int32_t iLayer, EProfileIdc uiProfileIdc);
+void CheckLevelSetting (SLogContext* pLogCtx,SWelsSvcCodingParam* pParam,int32_t iLayer, ELevelIdc uiLevelIdc);
+void CheckReferenceNumSetting (SLogContext* pLogCtx,  SWelsSvcCodingParam* pParam,int32_t iNumRef);
+void FilterLTRMarkingFeedback (sWelsEncCtx* pCtx, SLTRMarkingFeedback* pLTRMarkingFeedback);
+}
+
+#endif//WELS_ENCODER_CALLBACK_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/get_intra_predictor.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/get_intra_predictor.h
new file mode 100644
index 0000000000..ae9dc39896
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/get_intra_predictor.h
@@ -0,0 +1,175 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    get_intra_predictor.h
+ *
+ * \brief   interfaces for get intra predictor about 16x16, 4x4, chroma.
+ *
+ * \date    4/2/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef GET_INTRA_PREDICTOR_H
+#define GET_INTRA_PREDICTOR_H
+
+#include "typedefs.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+void WelsI4x4LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef,  const int32_t kiStride);
+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI4x4LumaPredVR_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHD_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVL_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHU_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+
+void WelsIChromaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredPlane_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI16x16ChromaPredVer (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16ChromaPredHor (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+void WelsFillingPred8to16_mmx (uint8_t* pPred, uint8_t* pValue);
+void WelsFillingPred8x2to16_mmx (uint8_t* pPred, uint8_t* pValue);
+void WelsFillingPred1to16_mmx (uint8_t* pPred, const uint8_t kuiValue);
+void WelsFillingPred8x2to16_sse2 (uint8_t* pPred, uint8_t* pValue);
+void WelsFillingPred1to16_sse2 (uint8_t* pPred, const uint8_t kuiValue);
+
+//for intra-prediction ASM functions
+void WelsI16x16LumaPredDc_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsIChromaPredH_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredV_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDc_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredPlane_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI4x4LumaPredV_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredH_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDc_sse2 (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDL_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDR_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVR_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHD_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVL_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHU_mmx (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+void WelsI16x16LumaPredDc_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI4x4LumaPredV_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredH_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDL_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDR_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVL_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVR_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHU_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHD_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsIChromaPredV_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredH_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDc_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredPlane_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_NEON
+
+#if defined(HAVE_NEON_AARCH64)
+void WelsI16x16LumaPredDc_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDcTop_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredDcLeft_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsI4x4LumaPredH_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDL_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDDLTop_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVL_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVLTop_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredVR_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHU_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredHD_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDc_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI4x4LumaPredDcTop_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsIChromaPredV_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredH_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDc_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredPlane_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDcTop_AArch64_neon (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_NEON_AARCH64
+
+#if defined(HAVE_MMI)
+void WelsI16x16LumaPredDc_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsI16x16LumaPredPlane_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+void WelsIChromaPredH_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredV_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredDc_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+void WelsIChromaPredPlane_mmi (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+void WelsInitIntraPredFuncs (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag);
+
+}
+#endif //GET_INTRA_PREDICTOR_H
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mb_cache.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mb_cache.h
new file mode 100644
index 0000000000..d7c0494f52
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mb_cache.h
@@ -0,0 +1,141 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//mb_cache.h
+#ifndef WELS_MACROBLOCK_CACHE_H__
+#define WELS_MACROBLOCK_CACHE_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "macros.h"
+
+namespace WelsEnc {
+
+/*
+ *  MB Cache information, such one cache should be defined within a slice
+ */
+/*
+ * Cache for Luma               Cache for Chroma(Cb, Cr)
+ *
+ *  TL T T T T                  TL T T
+ *   L - - - -                   L - -
+ *   L - - - -                   L - - TR
+ *   L - - - -
+ *   L - - - - TR
+ *
+ */
+
+////////////////////////mapping scan index////////////////////////
+
+extern const uint8_t g_kuiSmb4AddrIn256[16];
+extern const uint8_t g_kuiCache12_8x8RefIdx[4];
+
+typedef struct TagDCTCoeff {
+//ALIGNED_DECLARE( int16_t, residual_ac[16], 16 ); //I_16x16
+int16_t iLumaBlock[16][16]; //based on block4x4 luma DC/AC
+//ALIGNED_DECLARE( int16_t, iLumaI16x16Dc[16], 16 ); //I_16x16 DC
+int16_t iLumaI16x16Dc[16];
+//ALIGNED_DECLARE( int16_t, iChromaDc[2][4], 16 ); //chroma DC
+int16_t iChromaBlock[8][16]; //based on block4x4  chroma DC/AC
+int16_t iChromaDc[2][4];
+} SDCTCoeff ;
+
+typedef struct TagMbCache {
+//the followed pData now is promised aligned to 16 bytes
+ALIGNED_DECLARE (SMVComponentUnit, sMvComponents, 16);
+
+ALIGNED_DECLARE (int8_t, iNonZeroCoeffCount[48], 16);   // Cache line size
+// int8_t iNonZeroCoeffCount[6 * 8];      // Right luma, Chroma(Left Top Cb, Left btm Cr); must follow by iIntraPredMode!
+ALIGNED_DECLARE (int8_t, iIntraPredMode[48], 16);
+// must follow with iNonZeroCoeffCount!
+
+int32_t    iSadCost[4];                        //avail 1; unavail 0
+SMVUnitXY  sMbMvp[MB_BLOCK4x4_NUM];// for write bs
+
+//for residual decoding (recovery) at the side of Encoder
+int16_t* pCoeffLevel;           // tmep
+//malloc memory for prediction
+uint8_t* pSkipMb;
+
+//ALIGNED_DECLARE(uint8_t, pMemPredMb[2][256],  16);//One: Best I_16x16 Luma and refine frac_pixel pBuffer; another: PingPong I_8x8&&Inter Cb + Cr
+uint8_t* pMemPredMb;
+uint8_t* pMemPredLuma;// inter && intra share same pointer;
+//ALIGNED_DECLARE(uint8_t, pMemPredChroma[2][64*2], 16); //another PingPong pBuffer: Best Cb + Cr;
+uint8_t* pMemPredChroma;// inter && intra share same pointer;
+uint8_t* pBestPredIntraChroma; //Cb:0~63;   Cr:64~127
+
+//ALIGNED_DECLARE(uint8_t, pMemPredBlk4[2][16], 16); //I_4x4
+uint8_t* pMemPredBlk4;
+
+uint8_t* pBestPredI4x4Blk4;//I_4x4
+
+//ALIGNED_DECLARE(uint8_t, pBufferInterPredMe[4][400], 16);//inter type pBuffer for ME h & v & hv
+uint8_t* pBufferInterPredMe;    // [4][400] is enough because only h&v or v&hv or h&hv. but if both h&v&hv is needed when 8 quart pixel, future we have to use [5][400].
+
+//no scan4[] order, just as memory order to store
+//ALIGNED_DECLARE(bool, pPrevIntra4x4PredModeFlag[16], 16);//if 1, means no rem_intra4x4_pred_mode; if 0, means rem_intra4x4_pred_mode != 0
+bool* pPrevIntra4x4PredModeFlag;
+//ALIGNED_DECLARE(int8_t, pRemIntra4x4PredModeFlag[16], 16);//-1 as default; if pPrevIntra4x4PredModeFlag==0,
+//pRemIntra4x4PredModeFlag or added by 1 is the best pred_mode
+int8_t* pRemIntra4x4PredModeFlag;
+
+int32_t     iSadCostSkip[4];      //avail 1; unavail 0
+bool      bMbTypeSkip[4];         //1: skip; 0: non-skip
+int32_t*     pEncSad;
+
+//for residual encoding at the side of Encoder
+SDCTCoeff* pDct;
+
+uint8_t      uiNeighborIntra; // LEFT_MB_POS:0x01, TOP_MB_POS:0x02, TOPLEFT_MB_POS = 0x04 ,TOPRIGHT_MB_POS = 0x08;
+uint8_t uiLumaI16x16Mode;
+uint8_t uiChmaI8x8Mode;
+
+bool         bCollocatedPredFlag;//denote if current MB is collocated predicted (MV==0).
+uint32_t     uiRefMbType;
+
+struct {
+  /* pointer of current mb location in original frame */
+  uint8_t* pEncMb[3];
+  /* pointer of current mb location in recovery frame */
+  uint8_t* pDecMb[3];
+  /* pointer of co-located mb location in reference frame */
+  uint8_t* pRefMb[3];
+  //for SVC
+  uint8_t*      pCsMb[3];//locating current mb's CS in whole frame
+//              int16_t *p_rs[3];//locating current mb's RS     in whole frame
+
+} SPicData;
+} SMbCache;
+
+}//end of namespace
+
+#endif//WELS_MACROBLOCK_CACHE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/md.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/md.h
new file mode 100644
index 0000000000..7e27710692
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/md.h
@@ -0,0 +1,181 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    md.h
+ *
+ * \brief   mode decision
+ *
+ * \date    2009.5.14 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_MACROBLOCK_MODE_DECISION_H__
+#define WELS_MACROBLOCK_MODE_DECISION_H__
+
+#include "svc_motion_estimate.h"
+#include "svc_enc_macroblock.h"
+#include "encode_mb_aux.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+#define ME_REFINE_BUF_STRIDE       32
+#define ME_REFINE_BUF_WIDTH_BLK4   8
+#define ME_REFINE_BUF_WIDTH_BLK8   16
+#define ME_REFINE_BUF_STRIDE_BLK4  160
+#define ME_REFINE_BUF_STRIDE_BLK8  320
+
+#define REFINE_ME_NO_BEST_HALF_PIXEL 0 //( 0,  0)
+#define REFINE_ME_HALF_PIXEL_LEFT    3 //(-2,  0)
+#define REFINE_ME_HALF_PIXEL_RIGHT   4 //( 2,  0)
+#define REFINE_ME_HALF_PIXEL_TOP     1 //( 0, -2)
+#define REFINE_ME_HALF_PIXEL_BOTTOM  2 //( 0,  2)
+
+#define ME_NO_BEST_QUAR_PIXEL 1 //( 0,  0) or best half pixel
+#define ME_QUAR_PIXEL_LEFT    2 //(-1,  0)
+#define ME_QUAR_PIXEL_RIGHT   3 //( 1,  0)
+#define ME_QUAR_PIXEL_TOP     4 //( 0, -1)
+#define ME_QUAR_PIXEL_BOTTOM  5 //( 0,  1)
+
+#define NO_BEST_FRAC_PIX   1 // REFINE_ME_NO_BEST_HALF_PIXEL + ME_NO_BEST_QUAR_PIXEL
+
+//for vaa constants
+#define MBVAASIGN_FLAT       15
+#define MBVAASIGN_HOR1      3
+#define MBVAASIGN_HOR2      12
+#define MBVAASIGN_VER1       5
+#define MBVAASIGN_VER2       10
+#define MBVAASIGN_CMPX1    6
+#define MBVAASIGN_CMPX2    9
+
+extern const int32_t g_kiQpCostTable[52];
+extern const int8_t g_kiMapModeI16x16[7];
+//extern const int8_t g_kiMapModeI4x4[14];
+extern const int8_t g_kiMapModeIntraChroma[7];
+
+/////////////////////////////
+
+// if we want keep total sizeof(SWelsMD) <= 256, we maybe need to seperate three member of SWelsME.
+typedef struct TagWelsMD {
+int32_t         iLambda;
+uint16_t*       pMvdCost;
+
+int32_t         iCostLuma;
+int32_t         iCostChroma;//satd+lambda(best_pred_mode) //i_sad_chroma;
+int32_t         iSadPredMb;
+
+uint8_t         uiRef; //uiRefIndex appointed by Encoder, used for MC
+bool            bMdUsingSad;
+uint16_t        uiReserved;
+
+int32_t         iCostSkipMb;
+int32_t         iSadPredSkip;
+
+int32_t         iMbPixX;                // pixel position of MB in horizontal axis
+int32_t         iMbPixY;                // pixel position of MB in vertical axis
+int32_t         iBlock8x8StaticIdc[4];
+
+//NO B frame in our Wels, we can ignore list1
+
+struct {
+  SWelsME       sMe16x16;               //adjust each SWelsME for 8 D-word!
+  SWelsME       sMe8x8[4];
+  SWelsME       sMe16x8[2];
+  SWelsME       sMe8x16[2];
+  SWelsME       sMe4x4[4][4];
+  SWelsME       sMe8x4[4][2];
+  SWelsME       sMe4x8[4][2];
+//  SMVUnitXY     i_mvbs[MB_BLOCK8x8_NUM];        //scaled MVB
+} sMe;
+
+} SWelsMD;
+
+typedef struct TagMeRefinePointer {
+uint8_t* pHalfPixH;
+uint8_t* pHalfPixV;
+uint8_t* pHalfPixHV;
+
+uint8_t* pQuarPixBest;
+uint8_t* pQuarPixTmp;
+
+PCopyFunc pfCopyBlockByMode;
+} SMeRefinePointer;
+
+void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth/*, bool constrained_intra_pred_flag*/);
+void FillNeighborCacheInterWithoutBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth,
+                                       int8_t* pVaaBgMbFlag); //BGD spatial func
+void FillNeighborCacheInterWithBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
+void InitFillNeighborCacheInterFunc (SWelsFuncPtrList* pFuncList, const int32_t kiFlag);
+
+void MvdCostInit (uint16_t* pMvdCostInter, const int32_t kiMvdSz);
+
+void PredictSad (int8_t* pRefIndexCache, int32_t* pSadCostCache, int32_t uiRef, int32_t* pSadPred);
+
+
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+                     int32_t* iSadPredSkip);
+
+//  for pfGetVarianceFromIntraVaa function ptr adaptive by CPU features, 6/7/2010
+void InitIntraAnalysisVaaInfo (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag);
+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb);
+
+uint8_t MdInterAnalysisVaaInfo_c (int32_t* pSad8x8);
+
+
+void InitMeRefinePointer (SMeRefinePointer* pMeRefine, SMbCache* pMbCache, int32_t iStride);
+void MeRefineFracPixel (sWelsEncCtx* pEncCtx, uint8_t* pMemPredInterMb, SWelsME* pMe,
+                        SMeRefinePointer* pMeRefine, int32_t iWidth, int32_t iHeight);
+
+void InitBlkStrideWithRef (int32_t* pBlkStride, const int32_t kiStrideRef);
+
+void UpdateMbMv_c (SMVUnitXY* pMvBuffer, const SMVUnitXY ksMv);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined(X86_ASM)
+
+//  for pfGetVarianceFromIntraVaa SIMD optimization, 6/7/2010
+int32_t AnalysisVaaInfoIntra_sse2 (uint8_t* pDataY, const int32_t kiLineSize);
+int32_t AnalysisVaaInfoIntra_ssse3 (uint8_t* pDataY, const int32_t kiLineSize);
+uint8_t MdInterAnalysisVaaInfo_sse2 (int32_t* pSad8x8);
+uint8_t MdInterAnalysisVaaInfo_sse41 (int32_t* pSad8x8);
+void UpdateMbMv_sse2 (SMVUnitXY* pMvBuffer, const SMVUnitXY ksMv);
+
+#endif//X86_ASM
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+}
+#endif//WELS_MACROBLOCK_MODE_DECISION_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mt_defs.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mt_defs.h
new file mode 100644
index 0000000000..a6ed27e51c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mt_defs.h
@@ -0,0 +1,91 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mt_defs.h
+ *
+ * \brief   Main macros for multiple threading implementation
+ *
+ * \date    2/26/2010 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(MULTIPLE_THREADING_DEFINES_H__)
+#define MULTIPLE_THREADING_DEFINES_H__
+
+#include "typedefs.h"
+#include "codec_app_def.h"
+#include "wels_const.h"
+#include "WelsThreadLib.h"
+#include "slice.h"
+
+using namespace WelsEnc;
+/*
+ *  MT_DEBUG: output trace MT related into log file
+ */
+//#define MT_DEBUG
+//#define ENABLE_TRACE_MT
+
+#define THRESHOLD_RMSE_CORE8    0.0320f // v1.1: 0.0320f; v1.0: 0.02f
+#define THRESHOLD_RMSE_CORE4    0.0215f // v1.1: 0.0215f; v1.0: 0.03f
+#define THRESHOLD_RMSE_CORE2    0.0200f // v1.1: 0.0200f; v1.0: 0.04f
+
+typedef struct TagSliceThreadPrivateData {
+void*           pWelsPEncCtx;
+SFrameBSInfo*   pFrameBsInfo;
+int32_t         iSliceIndex;    // slice index, zero based
+int32_t         iThreadIndex;   // thread index, zero based
+
+} SSliceThreadPrivateData;
+
+typedef struct TagSliceThreading {
+SSliceThreadPrivateData*        pThreadPEncCtx;// thread context, [iThreadIdx]
+char eventNamespace[100];
+WELS_THREAD_HANDLE              pThreadHandles[MAX_THREADS_NUM];// thread handles, [iThreadIdx]
+WELS_EVENT                      pSliceCodedEvent[MAX_THREADS_NUM];// events for slice coded state, [iThreadIdx]
+WELS_EVENT                      pSliceCodedMasterEvent; // events for signalling that some event in pSliceCodedEvent has been signalled
+WELS_EVENT                      pReadySliceCodingEvent[MAX_THREADS_NUM];        // events for slice coding ready, [iThreadIdx]
+WELS_EVENT                      pUpdateMbListEvent[MAX_THREADS_NUM];            // signal to update mb list neighbor for various slices
+WELS_EVENT                      pFinUpdateMbListEvent[MAX_THREADS_NUM]; // signal to indicate finish updating mb list
+
+WELS_MUTEX                      mutexSliceNumUpdate;    // for dynamic slicing mode MT
+
+#ifdef MT_DEBUG
+FILE*                           pFSliceDiff;    // file handle for debug
+#endif//MT_DEBUG
+
+uint8_t*                        pThreadBsBuffer[MAX_THREADS_NUM]; //actual memory for slice buffer
+bool                            bThreadBsBufferUsage[MAX_THREADS_NUM];
+WELS_MUTEX                      mutexThreadBsBufferUsage;
+WELS_MUTEX                      mutexEvent;
+WELS_MUTEX                      mutexThreadSlcBuffReallocate;
+} SSliceThreading;
+
+#endif//MULTIPLE_THREADING_DEFINES_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mv_pred.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mv_pred.h
new file mode 100644
index 0000000000..e0bc18a30d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/mv_pred.h
@@ -0,0 +1,191 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mv_pred.h
+ *
+ * \brief   Get MV predictor and update motion vector of mb cache
+ *
+ * \date    05/22/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_MV_PRED_H__
+#define WELS_MV_PRED_H__
+
+
+#include "svc_enc_macroblock.h"
+#include "mb_cache.h"
+
+namespace WelsEnc {
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB, only for P_16x16 (SKIP inclusive)
+ * \param
+ * \param
+ */
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_16x16 (SKIP inclusive)
+ * \param
+ * \param
+ */
+void UpdateP16x16MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int8_t kiRef, SMVUnitXY* pMv); //for encoder
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_16x8
+ * \param
+ * \param
+ */
+void UpdateP16x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                            SMVUnitXY* pMv);
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_8x16
+ * \param
+ * \param
+ */
+void update_P8x16_motion_info (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                               SMVUnitXY* pMv);
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_8x8
+ * \param
+ * \param
+ */
+void UpdateP8x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv);
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_4x4
+ * \param
+ * \param
+ */
+void UpdateP4x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv);
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_8x4
+ * \param
+ * \param
+ */
+void UpdateP8x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv);
+
+/*!
+ * \brief   update pMv and uiRefIndex cache for current MB and pMbCache, only for P_4x8
+ * \param
+ * \param
+ */
+void UpdateP4x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv);
+
+/*!
+ * \brief   get the motion predictor for 4*4 or 8*8 or 16*16 block
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredMv (const SMVComponentUnit* kpMvComp, int8_t iPartIdx, int8_t iPartW, int32_t iRef, SMVUnitXY* sMvp);
+
+
+/*!
+ * \brief   get the motion predictor for SKIP MB
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredSkipMv (SMbCache* pMbCache, SMVUnitXY* sMvp);
+
+
+/*!
+ * \brief   get the motion predictor for inter16x8 MB
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredInter16x8Mv (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* sMvp);
+
+
+/*!
+ * \brief   get the motion predictor for inter8x16 MB
+ * \param
+ * \param   output mvp_x and mvp_y
+ */
+void PredInter8x16Mv (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* sMvp);
+
+//=========================update motion info(MV and ref_idx) into Mb_cache==========================
+/*!
+ * \brief   only update pMv cache for current MB, only for P_16x16
+ * \param
+ * \param
+ */
+//void update_p16x16_motion2cache(SMbCache* pMbCache, int8_t pRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_16x8
+ * \param
+ * \param
+ */
+void UpdateP16x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_8x16
+ * \param
+ * \param
+ */
+void UpdateP8x16Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_8x8
+ * \param
+ * \param
+ */
+void UpdateP8x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_4x4
+ * \param
+ * \param
+ */
+void UpdateP4x4Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_8x4
+ * \param
+ * \param
+ */
+void UpdateP8x4Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+
+/*!
+ * \brief   only update pMv cache for current MB, only for P_4x8
+ * \param
+ * \param
+ */
+void UpdateP4x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv);
+}
+#endif//WELS_MV_PRED_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/nal_encap.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/nal_encap.h
new file mode 100644
index 0000000000..70a9cad234
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/nal_encap.h
@@ -0,0 +1,143 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    nal_encap.h
+ *
+ * \brief   NAL pRawNal pData encapsulation
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_NAL_UNIT_ENCAPSULATION_H__
+#define WELS_NAL_UNIT_ENCAPSULATION_H__
+
+#include "typedefs.h"
+#include "wels_common_defs.h"
+#include "wels_const.h"
+
+using namespace WelsCommon;
+
+//SBitStringAux
+namespace WelsEnc {
+
+#define NAL_HEADER_SIZE (4)
+/*
+ *  Raw payload pData for NAL unit, AVC/SVC compatible
+ */
+typedef struct TagWelsNalRaw {
+uint8_t*                pRawData;       // pRawNal payload for slice pData
+int32_t                 iPayloadSize;   // size of pRawNal pData
+
+SNalUnitHeaderExt       sNalExt;        // NAL header information
+
+int32_t iStartPos; //NAL start position in buffer
+} SWelsNalRaw;
+
+/*
+ *  Encoder majoy output pData
+ */
+typedef struct TagWelsEncoderOutput {
+uint8_t*        pBsBuffer;              // overall bitstream pBuffer allocation for a coded picture, recycling use intend.
+uint32_t        uiSize;                 // size of allocation pBuffer above
+
+SBitStringAux   sBsWrite;
+
+// SWelsNalRaw             raw_nals[MAX_DEPENDENCY_LAYER*2+MAX_DEPENDENCY_LAYER*MAX_QUALITY_LEVEL]; // AVC: max up to SPS+PPS+max_slice_idc (2 + 8) for FMO;
+SWelsNalRaw*    sNalList;               // nal list, adaptive for AVC/SVC in case single slice, multiple slices or fmo
+int32_t*        pNalLen;
+int32_t         iCountNals;             // count number of NAL in list
+// SVC: num_sps (MAX_D) + num_pps (MAX_D) + num_vcl (MAX_D * MAX_Q)
+int32_t         iNalIndex;              // coding NAL currently, 0 based
+int32_t         iLayerBsIndex;          // layer index of  bit stream for SFrameBsIfo
+// bool            bAnnexBFlag;            // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+} SWelsEncoderOutput;
+
+//#define MT_DEBUG_BS_WR        0       // for MT debugging if needed
+
+typedef struct TagWelsSliceBs {
+uint8_t*        pBs;                    // output bitstream, pBitStringAux not needed for slice 0 due to no dependency of pFrameBs available
+uint32_t        uiBsPos;                // position of output bitstream
+uint8_t*        pBsBuffer;              // overall bitstream pBuffer allocation for a coded slice, recycling use intend.
+uint32_t        uiSize;                 // size of allocation pBuffer above
+
+SBitStringAux   sBsWrite;
+
+SWelsNalRaw     sNalList[2];            // nal list, PREFIX NAL(if applicable) + SLICE NAL
+// int32_t         iCountNals;             // count number of NAL in list
+int32_t         iNalLen[2];
+int32_t         iNalIndex;              // coding NAL currently, 0 based
+
+// bool            bAnnexBFlag;            // annexeb flag, to figure it pOut the packetization mode whether need 4 bytes (0 0 0 1) of start code prefix
+#if MT_DEBUG_BS_WR
+bool            bSliceCodedFlag;
+#endif//MT_DEBUG_BS_WR
+} SWelsSliceBs;
+
+/*!
+ * \brief   load an initialize NAL pRawNal pData
+ */
+void WelsLoadNal (SWelsEncoderOutput* pEncoderOuput, const int32_t/*EWelsNalUnitType*/ kiType,
+                  const int32_t/*EWelsNalRefIdc*/ kiNalRefIdc);
+
+/*!
+ * \brief   unload pRawNal NAL
+ */
+void WelsUnloadNal (SWelsEncoderOutput* pEncoderOuput);
+
+/*!
+ * \brief   load an initialize NAL pRawNal pData
+ */
+void WelsLoadNalForSlice (SWelsSliceBs* pSliceBs, const int32_t/*EWelsNalUnitType*/ kiType,
+                          const int32_t/*EWelsNalRefIdc*/ kiNalRefIdc);
+
+/*!
+ * \brief   unload pRawNal NAL
+ */
+void WelsUnloadNalForSlice (SWelsSliceBs* pSliceBs);
+
+/*!
+ * \brief   encode NAL with emulation forbidden three bytes checking
+ * \param   pDst        pDst NAL pData
+ * \param   pDstLen     length of pDst NAL output
+ * \param   annexeb     annexeb flag
+ * \param   pRawNal     pRawNal NAL pData
+ * \return  ERR_CODE
+ */
+int32_t WelsEncodeNal (SWelsNalRaw* pRawNal, void* pNalHeaderExt, const int32_t kiDstBufferLen, void* pDst,
+                       int32_t* pDstLen);
+
+/*!
+ * \brief   write prefix nal
+ */
+int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t keNalRefIdc, const bool kbIdrFlag);
+}
+#endif//WELS_NAL_UNIT_ENCAPSULATION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/param_svc.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/param_svc.h
new file mode 100644
index 0000000000..780b4df414
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/param_svc.h
@@ -0,0 +1,569 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    param_svc.h
+ *
+ * \brief   Configurable parameters in H.264/SVC Encoder
+ *
+ * \date    4/20/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_ENCODER_PARAMETER_SVC_H__)
+#define WELS_ENCODER_PARAMETER_SVC_H__
+
+#include <string.h>
+#include <math.h>
+#include "typedefs.h"
+#include "codec_def.h"
+#include "macros.h"
+#include "wels_const.h"
+#include "rc.h"
+#include "svc_enc_slice_segment.h"
+#include "as264_common.h"
+
+namespace WelsEnc {
+
+#define   INVALID_TEMPORAL_ID   ((uint8_t)0xff)
+
+extern const uint8_t   g_kuiTemporalIdListTable[MAX_TEMPORAL_LEVEL][MAX_GOP_SIZE + 1];
+
+/*!
+* \brief    get Logarithms base 2 of (upper/base)
+* \param    base    based scaler
+* \param    upper   input upper value
+* \return   2 based scaling factor
+*/
+static inline uint32_t GetLogFactor (float base, float upper) {
+#if defined(_M_X64) && _MSC_VER == 1800
+  _set_FMA3_enable(0);
+#endif
+  const double dLog2factor      = log10 (1.0 * upper / base) / log10 (2.0);
+  const double dEpsilon         = 0.0001;
+  const double dRound           = floor (dLog2factor + 0.5);
+
+  if (dLog2factor < dRound + dEpsilon && dRound < dLog2factor + dEpsilon) {
+    return (uint32_t) (dRound);
+  }
+  return UINT_MAX;
+}
+
+/*
+ *  Dependency Layer Parameter
+ */
+typedef struct TagDLayerParam {
+  int32_t       iActualWidth;                   // input source picture actual width
+  int32_t       iActualHeight;                  // input source picture actual height
+  int32_t       iTemporalResolution;
+  int32_t       iDecompositionStages;
+  uint8_t       uiCodingIdx2TemporalId[ (1 << MAX_TEMPORAL_LEVEL) + 1];
+
+  int8_t        iHighestTemporalId;
+  float         fInputFrameRate;                // input frame rate
+  float         fOutputFrameRate;               // output frame rate
+  uint16_t          uiIdrPicId;           // IDR picture id: [0, 65535], this one is used for LTR
+  int32_t           iCodingIndex;
+  int32_t           iFrameIndex;            // count how many frames elapsed during coding context currently
+  bool              bEncCurFrmAsIdrFlag;
+  int32_t           iFrameNum;              // current frame number coding
+  int32_t           iPOC;                   // frame iPOC
+#ifdef ENABLE_FRAME_DUMP
+  char          sRecFileName[MAX_FNAME_LEN];    // file to be constructed
+#endif//ENABLE_FRAME_DUMP
+} SSpatialLayerInternal;
+
+/*
+ *  Cisco OpenH264 Encoder Parameter Configuration
+ */
+typedef struct TagWelsSvcCodingParam: SEncParamExt {
+  SSpatialLayerInternal sDependencyLayers[MAX_DEPENDENCY_LAYER];
+
+  /* General */
+  uint32_t uiGopSize;                      // GOP size (at maximal frame rate: 16)
+  struct {
+    int32_t iLeft;
+    int32_t iTop;
+    int32_t iWidth;
+    int32_t iHeight;
+  } SUsedPicRect;       // the rect in input picture that encoder actually used
+
+  char*       pCurPath; // record current lib path such as:/pData/pData/com.wels.enc/lib/
+
+  bool      bDeblockingParallelFlag;        // deblocking filter parallelization control flag
+  int32_t   iBitsVaryPercentage;
+
+  int8_t   iDecompStages;          // GOP size dependency
+  int32_t  iMaxNumRefFrame;
+
+ public:
+  TagWelsSvcCodingParam() {
+    FillDefault();
+  }
+  ~TagWelsSvcCodingParam() {}
+
+  static void FillDefault (SEncParamExt& param) {
+    memset (&param, 0, sizeof (param));
+    param.uiIntraPeriod         = 0;                    // intra period (multiple of GOP size as desired)
+    param.iNumRefFrame          = AUTO_REF_PIC_COUNT;// number of reference frame used
+
+    param.iPicWidth             = 0;    //   actual input picture width
+    param.iPicHeight            = 0;    //   actual input picture height
+
+    param.fMaxFrameRate         = MAX_FRAME_RATE;       // maximal frame rate [Hz / fps]
+
+    param.iComplexityMode       = LOW_COMPLEXITY;
+    param.iTargetBitrate        = UNSPECIFIED_BIT_RATE; // overall target bitrate introduced in RC module
+    param.iMaxBitrate           = UNSPECIFIED_BIT_RATE;
+    param.iMultipleThreadIdc    = 1;
+    param.bUseLoadBalancing = true;
+
+    param.iLTRRefNum            = 0;
+    param.iLtrMarkPeriod        = 30;   //the min distance of two int32_t references
+
+    param.bEnableSSEI           = false;
+    param.bSimulcastAVC         = false;
+    param.bEnableFrameCroppingFlag = true; // enable frame cropping flag: true alwayse in application
+    // false: Streaming Video Sharing; true: Video Conferencing Meeting;
+
+    /* Deblocking loop filter */
+    param.iLoopFilterDisableIdc         = 0;    // 0: on, 1: off, 2: on except for slice boundaries
+    param.iLoopFilterAlphaC0Offset      = 0;    // AlphaOffset: valid range [-6, 6], default 0
+    param.iLoopFilterBetaOffset         = 0;    // BetaOffset:  valid range [-6, 6], default 0
+
+    /* Rate Control */
+    param.iRCMode                       = RC_QUALITY_MODE;
+    param.iPaddingFlag                  = 0;
+    param.iEntropyCodingModeFlag        = 0;
+    param.bEnableDenoise                = false;        // denoise control
+    param.bEnableSceneChangeDetect      = true;         // scene change detection control
+    param.bEnableBackgroundDetection    = true;         // background detection control
+    param.bEnableAdaptiveQuant          = true;         // adaptive quantization control
+    param.bEnableFrameSkip              = true;         // frame skipping
+    param.bEnableLongTermReference      = false;        // long term reference control
+    param.eSpsPpsIdStrategy             = INCREASING_ID;// pSps pPps id addition control
+    param.bPrefixNalAddingCtrl          = false;        // prefix NAL adding control
+    param.iSpatialLayerNum              = 1;            // number of dependency(Spatial/CGS) layers used to be encoded
+    param.iTemporalLayerNum             = 1;            // number of temporal layer specified
+
+    param.iMaxQp = QP_MAX_VALUE;
+    param.iMinQp = QP_MIN_VALUE;
+    param.iUsageType = CAMERA_VIDEO_REAL_TIME;
+    param.uiMaxNalSize = 0;
+    param.bIsLosslessLink = false;
+    for (int32_t iLayer = 0; iLayer < MAX_SPATIAL_LAYER_NUM; iLayer++) {
+      param.sSpatialLayers[iLayer].uiProfileIdc = PRO_UNKNOWN;
+      param.sSpatialLayers[iLayer].uiLevelIdc = LEVEL_UNKNOWN;
+      param.sSpatialLayers[iLayer].iDLayerQp = SVC_QUALITY_BASE_QP;
+      param.sSpatialLayers[iLayer].fFrameRate = param.fMaxFrameRate;
+
+      param.sSpatialLayers[iLayer].iMaxSpatialBitrate = UNSPECIFIED_BIT_RATE;
+
+      param.sSpatialLayers[iLayer].sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+      param.sSpatialLayers[iLayer].sSliceArgument.uiSliceNum = 0; //AUTO, using number of CPU cores
+      param.sSpatialLayers[iLayer].sSliceArgument.uiSliceSizeConstraint = 1500;
+
+      param.sSpatialLayers[iLayer].bAspectRatioPresent = false; // do not write any of the following information to the header
+      param.sSpatialLayers[iLayer].eAspectRatio = ASP_UNSPECIFIED;
+      param.sSpatialLayers[iLayer].sAspectRatioExtWidth = 0;
+      param.sSpatialLayers[iLayer].sAspectRatioExtHeight = 0;
+
+      const int32_t kiLesserSliceNum = ((MAX_SLICES_NUM < MAX_SLICES_NUM_TMP) ? MAX_SLICES_NUM : MAX_SLICES_NUM_TMP);
+      for (int32_t idx = 0; idx < kiLesserSliceNum; idx++)
+        param.sSpatialLayers[iLayer].sSliceArgument.uiSliceMbNum[idx] = 0; //default, using one row a slice if uiSliceMode is SM_RASTER_MODE
+
+      // See codec_app_def.h for more info about members bVideoSignalTypePresent through uiColorMatrix.  The default values
+      // used below preserve the previous behavior; i.e., no additional information will be written to the output file.
+      param.sSpatialLayers[iLayer].bVideoSignalTypePresent = false;			// do not write any of the following information to the header
+      param.sSpatialLayers[iLayer].uiVideoFormat = VF_UNDEF;				// undefined
+      param.sSpatialLayers[iLayer].bFullRange = false;						// analog video data range [16, 235]
+      param.sSpatialLayers[iLayer].bColorDescriptionPresent = false;		// do not write any of the following three items to the header
+      param.sSpatialLayers[iLayer].uiColorPrimaries = CP_UNDEF;				// undefined
+      param.sSpatialLayers[iLayer].uiTransferCharacteristics = TRC_UNDEF;	// undefined
+      param.sSpatialLayers[iLayer].uiColorMatrix = CM_UNDEF;				// undefined
+    }
+  }
+
+  void FillDefault() {
+    FillDefault (*this);
+    uiGopSize = 1;                      // GOP size (at maximal frame rate: 16)
+    iMaxNumRefFrame = AUTO_REF_PIC_COUNT;
+    SUsedPicRect.iLeft =
+      SUsedPicRect.iTop =
+        SUsedPicRect.iWidth =
+          SUsedPicRect.iHeight = 0;     // the rect in input picture that encoder actually used
+
+    pCurPath                    = NULL; // record current lib path such as:/pData/pData/com.wels.enc/lib/
+
+    bDeblockingParallelFlag     = false;// deblocking filter parallelization control flag
+
+    iDecompStages               = 0;    // GOP size dependency, unknown here and be revised later
+    iBitsVaryPercentage = 10;
+  }
+
+  int32_t ParamBaseTranscode (const SEncParamBase& pCodingParam) {
+
+    fMaxFrameRate  = WELS_CLIP3 (pCodingParam.fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
+    iTargetBitrate = pCodingParam.iTargetBitrate;
+    iUsageType  = pCodingParam.iUsageType;
+    iPicWidth   = pCodingParam.iPicWidth;
+    iPicHeight  = pCodingParam.iPicHeight;
+
+    SUsedPicRect.iLeft = 0;
+    SUsedPicRect.iTop  = 0;
+    SUsedPicRect.iWidth = ((iPicWidth >> 1) * (1 << 1));
+    SUsedPicRect.iHeight = ((iPicHeight >> 1) * (1 << 1));
+
+    iRCMode = pCodingParam.iRCMode;    // rc mode
+
+    int8_t iIdxSpatial = 0;
+    EProfileIdc uiProfileIdc = PRO_UNKNOWN;
+    if (iEntropyCodingModeFlag)
+      uiProfileIdc = PRO_MAIN;
+    SSpatialLayerInternal* pDlp = &sDependencyLayers[0];
+
+    while (iIdxSpatial < iSpatialLayerNum) {
+
+      sSpatialLayers->uiProfileIdc              = uiProfileIdc;
+      sSpatialLayers->uiLevelIdc                = LEVEL_UNKNOWN;
+      sSpatialLayers[iIdxSpatial].fFrameRate    = WELS_CLIP3 (pCodingParam.fMaxFrameRate,
+          MIN_FRAME_RATE, MAX_FRAME_RATE);
+      pDlp->fInputFrameRate =
+        pDlp->fOutputFrameRate = WELS_CLIP3 (sSpatialLayers[iIdxSpatial].fFrameRate, MIN_FRAME_RATE,
+                                             MAX_FRAME_RATE);
+#ifdef ENABLE_FRAME_DUMP
+      pDlp->sRecFileName[0] = '\0'; // file to be constructed
+#endif//ENABLE_FRAME_DUMP
+      pDlp->iActualWidth = sSpatialLayers[iIdxSpatial].iVideoWidth = iPicWidth;
+      pDlp->iActualHeight = sSpatialLayers[iIdxSpatial].iVideoHeight = iPicHeight;
+
+      sSpatialLayers->iSpatialBitrate =
+        sSpatialLayers[iIdxSpatial].iSpatialBitrate = pCodingParam.iTargetBitrate; // target bitrate for current spatial layer
+
+      sSpatialLayers->iMaxSpatialBitrate = UNSPECIFIED_BIT_RATE;
+      sSpatialLayers->iDLayerQp = SVC_QUALITY_BASE_QP;
+
+      uiProfileIdc = (!bSimulcastAVC) ? PRO_SCALABLE_BASELINE : uiProfileIdc;
+      ++ pDlp;
+      ++ iIdxSpatial;
+    }
+    SetActualPicResolution();
+
+    return 0;
+  }
+  void GetBaseParams (SEncParamBase* pCodingParam) {
+    pCodingParam->iUsageType     = iUsageType;
+    pCodingParam->iPicWidth      = iPicWidth;
+    pCodingParam->iPicHeight     = iPicHeight;
+    pCodingParam->iTargetBitrate = iTargetBitrate;
+    pCodingParam->iRCMode        = iRCMode;
+    pCodingParam->fMaxFrameRate  = fMaxFrameRate;
+  }
+  int32_t ParamTranscode (const SEncParamExt& pCodingParam) {
+    float fParamMaxFrameRate = WELS_CLIP3 (pCodingParam.fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
+
+    iUsageType = pCodingParam.iUsageType;
+    iPicWidth   = pCodingParam.iPicWidth;
+    iPicHeight  = pCodingParam.iPicHeight;
+    fMaxFrameRate = fParamMaxFrameRate;
+    iComplexityMode = pCodingParam.iComplexityMode;
+
+    SUsedPicRect.iLeft = 0;
+    SUsedPicRect.iTop  = 0;
+    SUsedPicRect.iWidth = ((iPicWidth >> 1) << 1);
+    SUsedPicRect.iHeight = ((iPicHeight >> 1) << 1);
+
+    iMultipleThreadIdc = pCodingParam.iMultipleThreadIdc;
+    bUseLoadBalancing = pCodingParam.bUseLoadBalancing;
+
+    /* Deblocking loop filter */
+    iLoopFilterDisableIdc       = pCodingParam.iLoopFilterDisableIdc;      // 0: on, 1: off, 2: on except for slice boundaries,
+    iLoopFilterAlphaC0Offset    = pCodingParam.iLoopFilterAlphaC0Offset;   // AlphaOffset: valid range [-6, 6], default 0
+    iLoopFilterBetaOffset       = pCodingParam.iLoopFilterBetaOffset;      // BetaOffset:  valid range [-6, 6], default 0
+    iEntropyCodingModeFlag      = pCodingParam.iEntropyCodingModeFlag;
+    bEnableFrameCroppingFlag    = pCodingParam.bEnableFrameCroppingFlag;
+
+    /* Rate Control */
+    iRCMode = pCodingParam.iRCMode;    // rc mode
+    bSimulcastAVC = pCodingParam.bSimulcastAVC;
+    iPaddingFlag = pCodingParam.iPaddingFlag;
+
+    iTargetBitrate      = pCodingParam.iTargetBitrate;  // target bitrate
+    iMaxBitrate         = pCodingParam.iMaxBitrate;
+    if ((iMaxBitrate != UNSPECIFIED_BIT_RATE) && (iMaxBitrate < iTargetBitrate)) {
+      iMaxBitrate  = iTargetBitrate;
+    }
+    iMaxQp = pCodingParam.iMaxQp;
+    iMinQp = pCodingParam.iMinQp;
+    uiMaxNalSize          = pCodingParam.uiMaxNalSize;
+    /* Denoise Control */
+    bEnableDenoise = pCodingParam.bEnableDenoise ? true : false;    // Denoise Control  // only support 0 or 1 now
+
+    /* Scene change detection control */
+    bEnableSceneChangeDetect   = pCodingParam.bEnableSceneChangeDetect;
+
+    /* Background detection Control */
+    bEnableBackgroundDetection = pCodingParam.bEnableBackgroundDetection ? true : false;
+
+    /* Adaptive quantization control */
+    bEnableAdaptiveQuant       = pCodingParam.bEnableAdaptiveQuant ? true : false;
+
+    /* Frame skipping */
+    bEnableFrameSkip           = pCodingParam.bEnableFrameSkip ? true : false;
+
+    /* Enable int32_t term reference */
+    bEnableLongTermReference   = pCodingParam.bEnableLongTermReference ? true : false;
+    iLtrMarkPeriod = pCodingParam.iLtrMarkPeriod;
+    bIsLosslessLink = pCodingParam.bIsLosslessLink;
+    if (iUsageType == SCREEN_CONTENT_REAL_TIME && !bIsLosslessLink && bEnableLongTermReference) {
+      bEnableLongTermReference = false;
+    }
+
+    /* For ssei information */
+    bEnableSSEI         = pCodingParam.bEnableSSEI;
+    bSimulcastAVC       = pCodingParam.bSimulcastAVC;
+
+    /* Layer definition */
+    iSpatialLayerNum = (int8_t)WELS_CLIP3 (pCodingParam.iSpatialLayerNum, 1,
+                                            MAX_DEPENDENCY_LAYER); // number of dependency(Spatial/CGS) layers used to be encoded
+    iTemporalLayerNum = (int8_t)WELS_CLIP3 (pCodingParam.iTemporalLayerNum, 1,
+                          MAX_TEMPORAL_LEVEL); // number of temporal layer specified
+
+    uiGopSize           = 1 << (iTemporalLayerNum - 1); // Override GOP size based temporal layer
+    iDecompStages       = iTemporalLayerNum - 1;        // WELS_LOG2( uiGopSize );// GOP size dependency
+    uiIntraPeriod       = pCodingParam.uiIntraPeriod;// intra period (multiple of GOP size as desired)
+    if (uiIntraPeriod == (uint32_t) (-1))
+      uiIntraPeriod = 0;
+    else if (uiIntraPeriod & (uiGopSize - 1)) // none multiple of GOP size
+      uiIntraPeriod = ((uiIntraPeriod + uiGopSize - 1) / uiGopSize) * uiGopSize;
+
+    if (((pCodingParam.iNumRefFrame != AUTO_REF_PIC_COUNT)
+         && !((pCodingParam.iNumRefFrame > MAX_REF_PIC_COUNT) || (pCodingParam.iNumRefFrame < MIN_REF_PIC_COUNT)))
+        || ((iNumRefFrame != AUTO_REF_PIC_COUNT) && (pCodingParam.iNumRefFrame == AUTO_REF_PIC_COUNT))) {
+      iNumRefFrame  = pCodingParam.iNumRefFrame;
+    }
+    if ((iNumRefFrame != AUTO_REF_PIC_COUNT) && (iNumRefFrame > iMaxNumRefFrame)) {
+      iMaxNumRefFrame = iNumRefFrame;
+    }
+    iLTRRefNum  = (pCodingParam.bEnableLongTermReference ? pCodingParam.iLTRRefNum : 0);
+    iLtrMarkPeriod  = pCodingParam.iLtrMarkPeriod;
+
+    bPrefixNalAddingCtrl = pCodingParam.bPrefixNalAddingCtrl;
+
+    if ( (CONSTANT_ID == pCodingParam.eSpsPpsIdStrategy)
+        || (INCREASING_ID == pCodingParam.eSpsPpsIdStrategy)
+        || (SPS_LISTING == pCodingParam.eSpsPpsIdStrategy)
+        || (SPS_LISTING_AND_PPS_INCREASING == pCodingParam.eSpsPpsIdStrategy)
+        || (SPS_PPS_LISTING == pCodingParam.eSpsPpsIdStrategy)) {
+    eSpsPpsIdStrategy =
+      pCodingParam.eSpsPpsIdStrategy;//For SVC meeting application, to avoid mosaic issue caused by cross-IDR reference.
+    //SHOULD enable this feature.
+    } else {
+      // keep the default value
+    }
+
+    SSpatialLayerInternal* pDlp        = &sDependencyLayers[0];
+    SSpatialLayerConfig* pSpatialLayer = &sSpatialLayers[0];
+    EProfileIdc uiProfileIdc           = iEntropyCodingModeFlag ? PRO_HIGH : PRO_BASELINE;
+    int8_t iIdxSpatial  = 0;
+    while (iIdxSpatial < iSpatialLayerNum) {
+      pSpatialLayer->uiProfileIdc      = (pCodingParam.sSpatialLayers[iIdxSpatial].uiProfileIdc == PRO_UNKNOWN) ? uiProfileIdc :
+                                      pCodingParam.sSpatialLayers[iIdxSpatial].uiProfileIdc;
+      pSpatialLayer->uiLevelIdc        = pCodingParam.sSpatialLayers[iIdxSpatial].uiLevelIdc;
+
+      float fLayerFrameRate     = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].fFrameRate,
+                                          MIN_FRAME_RATE, fParamMaxFrameRate);
+      pDlp->fInputFrameRate     = fParamMaxFrameRate;
+      pSpatialLayer->fFrameRate =
+        pDlp->fOutputFrameRate  = WELS_CLIP3 (fLayerFrameRate, MIN_FRAME_RATE, fParamMaxFrameRate);
+
+#ifdef ENABLE_FRAME_DUMP
+      pDlp->sRecFileName[0]     = '\0'; // file to be constructed
+#endif//ENABLE_FRAME_DUMP
+      pSpatialLayer->iVideoWidth = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].iVideoWidth, 0,
+                                   iPicWidth);  // frame width
+      pSpatialLayer->iVideoHeight = WELS_CLIP3 (pCodingParam.sSpatialLayers[iIdxSpatial].iVideoHeight, 0,
+                                    iPicHeight);// frame height
+
+      pSpatialLayer->iSpatialBitrate    =
+        pCodingParam.sSpatialLayers[iIdxSpatial].iSpatialBitrate;       // target bitrate for current spatial layer
+      pSpatialLayer->iMaxSpatialBitrate =
+        pCodingParam.sSpatialLayers[iIdxSpatial].iMaxSpatialBitrate;
+
+      if ((iSpatialLayerNum==1) && (iIdxSpatial==0)) {
+        if (pSpatialLayer->iVideoWidth == 0) {
+          pSpatialLayer->iVideoWidth = iPicWidth;
+        }
+        if (pSpatialLayer->iVideoHeight == 0) {
+          pSpatialLayer->iVideoHeight = iPicHeight;
+        }
+        if (pSpatialLayer->iSpatialBitrate == 0) {
+          pSpatialLayer->iSpatialBitrate = iTargetBitrate;
+        }
+        if (pSpatialLayer->iMaxSpatialBitrate == 0) {
+          pSpatialLayer->iMaxSpatialBitrate = iMaxBitrate;
+        }
+      }
+
+      //multi slice
+      pSpatialLayer->sSliceArgument = pCodingParam.sSpatialLayers[iIdxSpatial].sSliceArgument;
+
+      memcpy (&(pSpatialLayer->sSliceArgument),
+              &(pCodingParam.sSpatialLayers[iIdxSpatial].sSliceArgument), // confirmed_safe_unsafe_usage
+              sizeof (SSliceArgument)) ;
+
+      pSpatialLayer->iDLayerQp = pCodingParam.sSpatialLayers[iIdxSpatial].iDLayerQp;
+
+      // See codec_app_def.h and parameter_sets.h for more info about members bVideoSignalTypePresent through uiColorMatrix.
+      pSpatialLayer->bVideoSignalTypePresent =   pCodingParam.sSpatialLayers[iIdxSpatial].bVideoSignalTypePresent;
+      pSpatialLayer->uiVideoFormat =             pCodingParam.sSpatialLayers[iIdxSpatial].uiVideoFormat;
+      pSpatialLayer->bFullRange =                pCodingParam.sSpatialLayers[iIdxSpatial].bFullRange;
+      pSpatialLayer->bColorDescriptionPresent =  pCodingParam.sSpatialLayers[iIdxSpatial].bColorDescriptionPresent;
+      pSpatialLayer->uiColorPrimaries =          pCodingParam.sSpatialLayers[iIdxSpatial].uiColorPrimaries;
+      pSpatialLayer->uiTransferCharacteristics = pCodingParam.sSpatialLayers[iIdxSpatial].uiTransferCharacteristics;
+      pSpatialLayer->uiColorMatrix =             pCodingParam.sSpatialLayers[iIdxSpatial].uiColorMatrix;
+
+      pSpatialLayer->bAspectRatioPresent = pCodingParam.sSpatialLayers[iIdxSpatial].bAspectRatioPresent;
+      pSpatialLayer->eAspectRatio = pCodingParam.sSpatialLayers[iIdxSpatial].eAspectRatio;
+      pSpatialLayer->sAspectRatioExtWidth = pCodingParam.sSpatialLayers[iIdxSpatial].sAspectRatioExtWidth;
+      pSpatialLayer->sAspectRatioExtHeight = pCodingParam.sSpatialLayers[iIdxSpatial].sAspectRatioExtHeight;
+
+      uiProfileIdc = (!bSimulcastAVC) ? PRO_SCALABLE_BASELINE : uiProfileIdc; //it is used in the D>0 layer if SVC is applied, so set to PRO_SCALABLE_BASELINE
+      ++ pDlp;
+      ++ pSpatialLayer;
+      ++ iIdxSpatial;
+    }
+
+    SetActualPicResolution();
+
+    return 0;
+  }
+
+// assuming that the width/height ratio of all spatial layers are the same
+
+  void SetActualPicResolution() {
+    int32_t iSpatialIdx = iSpatialLayerNum - 1;
+    for (; iSpatialIdx >= 0; iSpatialIdx --) {
+      SSpatialLayerInternal* pDlayerInternal = &sDependencyLayers[iSpatialIdx];
+      SSpatialLayerConfig* pDlayer =  &sSpatialLayers[iSpatialIdx];
+
+      pDlayerInternal->iActualWidth = pDlayer->iVideoWidth;
+      pDlayerInternal->iActualHeight = pDlayer->iVideoHeight;
+      pDlayer->iVideoWidth = WELS_ALIGN (pDlayerInternal->iActualWidth, MB_WIDTH_LUMA);
+      pDlayer->iVideoHeight = WELS_ALIGN (pDlayerInternal->iActualHeight, MB_HEIGHT_LUMA);
+    }
+  }
+
+  /*!
+  * \brief  determined key coding tables for temporal scalability, uiProfileIdc etc for each spatial layer settings
+  * \param  SWelsSvcCodingParam, and carried with known GOP size, max, input and output frame rate of each spatial
+  * \return NONE (should ensure valid parameter before this procedure)
+  */
+  int32_t DetermineTemporalSettings() {
+    const int32_t iDecStages = WELS_LOG2 (uiGopSize); // (int8_t)GetLogFactor(1.0f, 1.0f * pcfg->uiGopSize);  //log2(uiGopSize)
+    const uint8_t* pTemporalIdList = &g_kuiTemporalIdListTable[iDecStages][0];
+    SSpatialLayerInternal* pDlp    = &sDependencyLayers[0];
+    SSpatialLayerConfig* pSpatialLayer = &sSpatialLayers[0];
+    int8_t i = 0;
+
+    while (i < iSpatialLayerNum) {
+      const uint32_t kuiLogFactorInOutRate = GetLogFactor (pDlp->fOutputFrameRate, pDlp->fInputFrameRate);
+      const uint32_t kuiLogFactorMaxInRate = GetLogFactor (pDlp->fInputFrameRate, fMaxFrameRate);
+      if (UINT_MAX == kuiLogFactorInOutRate || UINT_MAX == kuiLogFactorMaxInRate) {
+        return ENC_RETURN_INVALIDINPUT;
+      }
+      int32_t iNotCodedMask = 0;
+      int8_t iMaxTemporalId = 0;
+
+      memset (pDlp->uiCodingIdx2TemporalId, INVALID_TEMPORAL_ID, sizeof (pDlp->uiCodingIdx2TemporalId));
+      iNotCodedMask = (1 << (kuiLogFactorInOutRate + kuiLogFactorMaxInRate)) - 1;
+      for (uint32_t uiFrameIdx = 0; uiFrameIdx <= uiGopSize; ++ uiFrameIdx) {
+        if (0 == (uiFrameIdx & iNotCodedMask)) {
+          const int8_t kiTemporalId = pTemporalIdList[uiFrameIdx];
+          pDlp->uiCodingIdx2TemporalId[uiFrameIdx] = kiTemporalId;
+          if (kiTemporalId > iMaxTemporalId) {
+            iMaxTemporalId = kiTemporalId;
+          }
+        }
+      }
+
+      pDlp->iHighestTemporalId   = iMaxTemporalId;
+      pDlp->iTemporalResolution  = kuiLogFactorMaxInRate + kuiLogFactorInOutRate;
+      pDlp->iDecompositionStages = iDecStages - kuiLogFactorMaxInRate - kuiLogFactorInOutRate;
+      if (pDlp->iDecompositionStages < 0) {
+        return ENC_RETURN_INVALIDINPUT;
+      }
+      ++ pDlp;
+      ++ pSpatialLayer;
+      ++ i;
+    }
+    iDecompStages = (int8_t)iDecStages;
+    return ENC_RETURN_SUCCESS;
+  }
+
+} SWelsSvcCodingParam;
+
+
+typedef struct TagExistingParasetList {
+  SWelsSPS            sSps[MAX_SPS_COUNT];
+  SSubsetSps          sSubsetSps[MAX_SPS_COUNT];
+  SWelsPPS            sPps[MAX_PPS_COUNT];
+
+  uint32_t            uiInUseSpsNum;
+  uint32_t            uiInUseSubsetSpsNum;
+  uint32_t            uiInUsePpsNum;
+} SExistingParasetList;
+
+
+static inline int32_t FreeCodingParam (SWelsSvcCodingParam** pParam, CMemoryAlign* pMa) {
+  if (pParam == NULL || *pParam == NULL || pMa == NULL)
+    return 1;
+  pMa->WelsFree (*pParam, "SWelsSvcCodingParam");
+  *pParam = NULL;
+  return 0;
+}
+
+static inline int32_t AllocCodingParam (SWelsSvcCodingParam** pParam, CMemoryAlign* pMa) {
+  if (pParam == NULL || pMa == NULL)
+    return 1;
+  if (*pParam != NULL) {
+    FreeCodingParam (pParam, pMa);
+  }
+  SWelsSvcCodingParam* pCodingParam = (SWelsSvcCodingParam*)pMa->WelsMallocz (sizeof (SWelsSvcCodingParam),
+                                      "SWelsSvcCodingParam");
+  if (NULL == pCodingParam)
+    return 1;
+  *pParam = pCodingParam;
+  return 0;
+}
+
+}//end of namespace WelsEnc
+
+#endif//WELS_ENCODER_PARAMETER_SVC_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/parameter_sets.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/parameter_sets.h
new file mode 100644
index 0000000000..1f85da0553
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/parameter_sets.h
@@ -0,0 +1,181 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_PARAMETER_SETS_H__
+#define WELS_PARAMETER_SETS_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+
+namespace WelsEnc {
+
+/* Sequence Parameter Set, refer to Page 57 in JVT X201wcm */
+typedef struct TagWelsSPS {
+uint32_t        uiSpsId;
+int16_t         iMbWidth;
+int16_t         iMbHeight;
+uint32_t        uiLog2MaxFrameNum;
+// uint32_t        uiPocType;
+/* POC type 0 */
+int32_t         iLog2MaxPocLsb;
+/* POC type 1 */
+// int32_t         iOffsetForNonRefPic;
+
+// int32_t         iOffsetForTopToBottomField;
+// int32_t         iNumRefFramesInPocCycle;
+// int8_t          iOffsetForRefFrame[256];
+SCropOffset     sFrameCrop;
+int16_t         iNumRefFrames;
+// uint32_t        uiNumUnitsInTick;
+// uint32_t        uiTimeScale;
+
+uint8_t         uiProfileIdc;
+uint8_t         iLevelIdc;
+// uint8_t         uiChromaFormatIdc;
+// uint8_t         uiChromaArrayType;              //support =1
+
+// uint8_t         uiBitDepthLuma;         //=8, only used in decoder, encoder in general_***; it can be removed when removed general up_sample
+// uint8_t         uiBitDepthChroma;               //=8
+/* TO BE CONTINUE: POC type 1 */
+// bool            bDeltaPicOrderAlwaysZeroFlag;
+bool            bGapsInFrameNumValueAllowedFlag;
+
+// bool            bFrameMbsOnlyFlag;
+// bool            bMbaffFlag;     // MB Adapative Frame Field
+// bool            bDirect8x8InferenceFlag;
+bool            bFrameCroppingFlag;
+
+bool            bVuiParamPresentFlag;
+// bool            bTimingInfoPresentFlag;
+// bool            bFixedFrameRateFlag;
+
+// Note: members bVideoSignalTypePresent through uiColorMatrix below are also defined in SSpatialLayerConfig in codec_app_def.h,
+// along with definitions for enumerators EVideoFormatSPS, EColorPrimaries, ETransferCharacteristics, and EColorMatrix.
+bool	bVideoSignalTypePresent;	// false => do not write any of the following information to the header
+uint8_t	uiVideoFormat;				// EVideoFormatSPS; 3 bits in header; 0-5 => component, kpal, ntsc, secam, mac, undef
+bool	bFullRange;					// false => analog video data range [16, 235]; true => full data range [0,255]
+bool	bColorDescriptionPresent;	// false => do not write any of the following three items to the header
+uint8_t	uiColorPrimaries;			// EColorPrimaries; 8 bits in header; 0 - 9 => ???, bt709, undef, ???, bt470m, bt470bg,
+                                    //    smpte170m, smpte240m, film, bt2020
+uint8_t	uiTransferCharacteristics;	// ETransferCharacteristics; 8 bits in header; 0 - 15 => ???, bt709, undef, ???, bt470m, bt470bg, smpte170m,
+                                    //   smpte240m, linear, log100, log316, iec61966-2-4, bt1361e, iec61966-2-1, bt2020-10, bt2020-12
+uint8_t	uiColorMatrix;				// EColorMatrix; 8 bits in header (corresponds to FFmpeg "colorspace"); 0 - 10 => GBR, bt709,
+                                    //   undef, ???, fcc, bt470bg, smpte170m, smpte240m, YCgCo, bt2020nc, bt2020c
+
+bool            bConstraintSet0Flag;
+bool            bConstraintSet1Flag;
+bool            bConstraintSet2Flag;
+bool            bConstraintSet3Flag;
+// bool            bSeparateColorPlaneFlag;  // =false,: only used in decoder, encoder in general_***; it can be removed when removed general up_sample
+
+// aspect ratio in VUI
+bool            bAspectRatioPresent;
+ESampleAspectRatio  eAspectRatio;
+uint16_t            sAspectRatioExtWidth;
+uint16_t            sAspectRatioExtHeight;
+
+} SWelsSPS, *PWelsSPS;
+
+
+/* Sequence Parameter Set SVC extension syntax, refer to Page 391 in JVT X201wcm */
+typedef struct TagSpsSvcExt {
+// SCropOffset     sSeqScaledRefLayer;
+
+uint8_t         iExtendedSpatialScalability;    // ESS
+// uint8_t         uiChromaPhaseXPlus1Flag;
+// uint8_t         uiChromaPhaseYPlus1;
+// uint8_t         uiSeqRefLayerChromaPhaseXPlus1Flag;
+// uint8_t         uiSeqRefLayerChromaPhaseYPlus1;
+// bool            bInterLayerDeblockingFilterCtrlPresentFlag;
+bool            bSeqTcoeffLevelPredFlag;
+bool            bAdaptiveTcoeffLevelPredFlag;
+bool            bSliceHeaderRestrictionFlag;
+} SSpsSvcExt, *PSpsSvcExt;
+
+/* Subset sequence parameter set syntax, refer to Page 391 in JVT X201wcm */
+typedef struct TagSubsetSps {
+SWelsSPS                pSps;
+SSpsSvcExt      sSpsSvcExt;
+
+// bool            bSvcVuiParamPresentFlag;
+// bool            bAdditionalExtension2Flag;
+// bool            bAdditionalExtension2DataFlag;
+} SSubsetSps, *PSubsetSps;
+
+/* Picture parameter set syntax, refer to Page 59 in JVT X201wcm */
+typedef struct TagWelsPPS {
+uint32_t        iSpsId;
+uint32_t        iPpsId;
+
+#if !defined(DISABLE_FMO_FEATURE)
+uint32_t        uiNumSliceGroups;
+uint32_t        uiSliceGroupMapType;
+/* uiSliceGroupMapType = 0 */
+uint32_t        uiRunLength[MAX_SLICEGROUP_IDS];
+/* uiSliceGroupMapType = 2 */
+uint32_t        uiTopLeft[MAX_SLICEGROUP_IDS];
+uint32_t        uiBottomRight[MAX_SLICEGROUP_IDS];
+/* uiSliceGroupMapType = 3, 4 or 5 */
+/* uiSliceGroupMapType = 3, 4 or 5 */
+bool            bSliceGroupChangeDirectionFlag;
+uint32_t        uiSliceGroupChangeRate;
+/* uiSliceGroupMapType = 6 */
+uint32_t        uiPicSizeInMapUnits;
+uint32_t        uiSliceGroupId[MAX_SLICEGROUP_IDS];
+#endif//!DISABLE_FMO_FEATURE
+
+// uint32_t        uiNumRefIdxL0Active;
+// uint32_t        uiNumRefIdxL1Active;
+
+int8_t          iPicInitQp;
+int8_t          iPicInitQs;
+uint8_t         uiChromaQpIndexOffset;
+
+/* potential application for High profile */
+// int32_t         iSecondChromaQpIndexOffset;
+// /* potential application for High profile */
+
+// bool            bPicOrderPresentFlag;
+bool    bEntropyCodingModeFlag;
+bool            bDeblockingFilterControlPresentFlag;
+
+// bool            bConstainedIntraPredFlag;
+// bool            bRedundantPicCntPresentFlag;
+// bool            bWeightedPredFlag;
+// uint8_t         uiWeightedBiPredIdc;
+
+} SWelsPPS, *PWelsPPPS;
+
+}
+
+#endif //WELS_PARAMETER_SETS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/paraset_strategy.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/paraset_strategy.h
new file mode 100644
index 0000000000..77a83570d3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/paraset_strategy.h
@@ -0,0 +1,310 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_PARASET_STRATEGY_H
+#define WELS_PARASET_STRATEGY_H
+
+#include "param_svc.h"
+#include "utils.h"
+
+namespace WelsEnc {
+
+class IWelsParametersetStrategy {
+ public:
+  virtual ~IWelsParametersetStrategy() { }
+
+  static IWelsParametersetStrategy* CreateParametersetStrategy (EParameterSetStrategy eSpsPpsIdStrategy,
+      const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
+
+  //virtual SParaSetOffset* GetParaSetOffset() = 0;
+
+  virtual int32_t GetPpsIdOffset (const int32_t iPpsId) = 0;
+  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId) = 0;
+  virtual int32_t* GetSpsIdOffsetList (const int iParasetType) = 0;
+
+  virtual uint32_t GetAllNeededParasetNum() = 0;
+
+  virtual uint32_t GetNeededSpsNum() = 0;
+  virtual uint32_t GetNeededSubsetSpsNum() = 0;
+  virtual uint32_t GetNeededPpsNum() = 0;
+
+  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
+                             SSubsetSps*       pSubsetArray,
+                             SWelsPPS* pPpsArray) = 0;
+
+  virtual void Update (const uint32_t kuiId, const int iParasetType) = 0;
+  virtual void UpdatePpsList (sWelsEncCtx* pCtx) = 0;
+
+  virtual bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx) = 0;
+
+  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                                   const int32_t iDlayerCount,
+                                   uint32_t kuiSpsId,
+                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer) = 0;
+
+  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
+                            SWelsSPS* pSps,
+                            SSubsetSps* pSubsetSps,
+                            uint32_t kuiPpsId,
+                            const bool kbDeblockingFilterPresentFlag,
+                            const bool kbUsingSubsetSps,
+                            const bool kbEntropyCodingModeFlag) = 0;
+
+  virtual  void SetUseSubsetFlag (const uint32_t iPpsId, const bool bUseSubsetSps) = 0;
+
+  virtual  void UpdateParaSetNum (sWelsEncCtx* pCtx) = 0;
+
+  virtual  int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop) = 0;
+
+  virtual  void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
+                                        sWelsEncCtx* pCtx, SExistingParasetList* pExistingParasetList) = 0;
+  virtual  void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList) = 0;
+
+  virtual int32_t GetSpsIdx (const int32_t iIdx) = 0;
+};
+
+
+class  CWelsParametersetIdConstant : public IWelsParametersetStrategy {
+ public:
+
+  CWelsParametersetIdConstant (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
+  virtual ~ CWelsParametersetIdConstant();
+
+  virtual int32_t GetPpsIdOffset (const int32_t iPpsId);
+  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId);
+  int32_t* GetSpsIdOffsetList (const int iParasetType);
+
+  uint32_t GetAllNeededParasetNum();
+
+  virtual uint32_t GetNeededSpsNum();
+  virtual uint32_t GetNeededSubsetSpsNum();
+  virtual uint32_t GetNeededPpsNum();
+
+  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
+                             SSubsetSps*       pSubsetArray,
+                             SWelsPPS* pPpsArray);
+
+  virtual void Update (const uint32_t kuiId, const int iParasetType);
+  virtual void UpdatePpsList (sWelsEncCtx* pCtx) {};
+
+  bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx) {
+    return true;
+  };
+
+  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                                   const int32_t iDlayerCount, uint32_t kuiSpsId,
+                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer);
+
+  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
+                            SWelsSPS* pSps,
+                            SSubsetSps* pSubsetSps,
+                            uint32_t kuiPpsId,
+                            const bool kbDeblockingFilterPresentFlag,
+                            const bool kbUsingSubsetSps,
+                            const bool kbEntropyCodingModeFlag);
+
+  virtual void SetUseSubsetFlag (const uint32_t iPpsId, const bool bUseSubsetSps);
+
+  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx) {};
+
+  virtual int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop) {
+    return iPpsId;
+  };
+
+  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
+                                       sWelsEncCtx* pCtx,
+                                       SExistingParasetList* pExistingParasetList) {};
+  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList) {};
+
+  virtual int32_t GetSpsIdx (const int32_t iIdx) {
+    return 0;
+  };
+ protected:
+
+  virtual void LoadPreviousSps (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
+                                SSubsetSps*       pSubsetArray) {};
+  virtual void LoadPreviousPps (SExistingParasetList* pExistingParasetList, SWelsPPS* pPpsArray) {};
+
+ protected:
+  SParaSetOffset m_sParaSetOffset;
+  bool m_bSimulcastAVC;
+  int32_t m_iSpatialLayerNum;
+
+  uint32_t m_iBasicNeededSpsNum;
+  uint32_t m_iBasicNeededPpsNum;
+};
+
+/*
+  typedef struct TagParaSetOffsetVariable {
+    int32_t       iParaSetIdDelta[MAX_DQ_LAYER_NUM+1];//mark delta between SPS_ID_in_bs and sps_id_in_encoder, can be minus, for each dq-layer
+    //need not extra +1 due no MGS and FMO case so far
+    bool          bUsedParaSetIdInBs[MAX_PPS_COUNT];      //mark the used SPS_ID with 1
+    uint32_t      uiNextParaSetIdToUseInBs;               //mark the next SPS_ID_in_bs, for all layers
+  } SParaSetOffsetVariable;
+
+  typedef struct TagParaSetOffset {
+    //in PS0 design, "sParaSetOffsetVariable" record the previous paras before current IDR, AND NEED to be stacked and recover across IDR
+    SParaSetOffsetVariable
+    sParaSetOffsetVariable[PARA_SET_TYPE]; //PARA_SET_TYPE=3; paraset_type = 0: AVC_SPS; =1: Subset_SPS; =2: PPS
+    //in PSO design, "bPpsIdMappingIntoSubsetsps" uses the current para of current IDR period
+    bool
+    bPpsIdMappingIntoSubsetsps[MAX_DQ_LAYER_NUM+1];   // need not extra +1 due no MGS and FMO case so far
+
+    int32_t  iPpsIdList[MAX_DQ_LAYER_NUM][MAX_PPS_COUNT]; //index0: max pps types; index1: for differnt IDRs, if only index0=1, index1 can reach MAX_PPS_COUNT
+
+    //#if _DEBUG
+    int32_t  eSpsPpsIdStrategy;
+    //#endif
+
+    uint32_t uiNeededSpsNum;
+    uint32_t uiNeededSubsetSpsNum;
+    uint32_t uiNeededPpsNum;
+
+    uint32_t uiInUseSpsNum;
+    uint32_t uiInUseSubsetSpsNum;
+    uint32_t uiInUsePpsNum;
+  } SParaSetOffset;
+  */
+
+class  CWelsParametersetIdNonConstant : public CWelsParametersetIdConstant {
+ public:
+  CWelsParametersetIdNonConstant (const bool bSimulcastAVC,
+                                  const int32_t kiSpatialLayerNum): CWelsParametersetIdConstant (bSimulcastAVC, kiSpatialLayerNum) {};
+
+  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
+                                       sWelsEncCtx* pCtx,
+                                       SExistingParasetList* pExistingParasetList);
+  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList);
+};
+
+class  CWelsParametersetIdIncreasing : public CWelsParametersetIdNonConstant {
+ public:
+  CWelsParametersetIdIncreasing (const bool bSimulcastAVC,
+                                 const int32_t kiSpatialLayerNum): CWelsParametersetIdNonConstant (bSimulcastAVC, kiSpatialLayerNum) {};
+
+
+  virtual int32_t GetPpsIdOffset (const int32_t iPpsId);
+  virtual int32_t GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId);
+
+  virtual void Update (const uint32_t kuiId, const int iParasetType);
+
+ protected:
+
+  //void ParasetIdAdditionIdAdjust (SParaSetOffsetVariable* sParaSetOffsetVariable, const int32_t kiCurEncoderParaSetId,
+  //                              const uint32_t kuiMaxIdInBs);
+
+ private:
+  void DebugPps (const int32_t kiPpsId);
+  void DebugSpsPps (const int32_t iPpsId, const int32_t iSpsId);
+};
+
+
+class  CWelsParametersetSpsListing : public CWelsParametersetIdNonConstant {
+ public:
+  CWelsParametersetSpsListing (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
+
+  virtual uint32_t GetNeededSubsetSpsNum();
+
+  virtual void LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
+                             SSubsetSps*       pSubsetArray,
+                             SWelsPPS* pPpsArray);
+
+  bool CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx);
+
+  virtual uint32_t GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                                   const int32_t iDlayerCount, uint32_t kuiSpsId,
+                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer);
+
+  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx);
+
+  int32_t GetSpsIdx (const int32_t iIdx) {
+    return iIdx;
+  };
+
+  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
+                                       sWelsEncCtx* pCtx,
+                                       SExistingParasetList* pExistingParasetList);
+ protected:
+  virtual void LoadPreviousSps (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
+                                SSubsetSps*       pSubsetArray);
+  virtual bool CheckPpsGenerating();
+  virtual int32_t SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps);
+};
+
+class  CWelsParametersetSpsPpsListing : public CWelsParametersetSpsListing {
+ public:
+  CWelsParametersetSpsPpsListing (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum);
+
+  //uint32_t GetNeededPpsNum();
+
+  virtual void UpdatePpsList (sWelsEncCtx* pCtx);
+
+  virtual uint32_t InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
+                            SWelsSPS* pSps,
+                            SSubsetSps* pSubsetSps,
+                            uint32_t kuiPpsId,
+                            const bool kbDeblockingFilterPresentFlag,
+                            const bool kbUsingSubsetSps,
+                            const bool kbEntropyCodingModeFlag);
+
+  virtual void UpdateParaSetNum (sWelsEncCtx* pCtx);
+
+  virtual int32_t GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop);
+
+  virtual void OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList,
+                                       sWelsEncCtx* pCtx,
+                                       SExistingParasetList* pExistingParasetList);
+  virtual void LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable, int32_t* pPpsIdList);
+ protected:
+  virtual void LoadPreviousPps (SExistingParasetList* pExistingParasetList, SWelsPPS* pPpsArray);
+
+  virtual bool CheckPpsGenerating();
+  virtual int32_t SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps);
+};
+
+class CWelsParametersetSpsListingPpsIncreasing : public CWelsParametersetSpsListing {
+ public:
+  CWelsParametersetSpsListingPpsIncreasing (const bool bSimulcastAVC,
+      const int32_t kiSpatialLayerNum): CWelsParametersetSpsListing (bSimulcastAVC, kiSpatialLayerNum) {};
+
+  virtual int32_t GetPpsIdOffset (const int32_t kiPpsId);
+  virtual void Update (const uint32_t kuiId, const int iParasetType);
+};
+
+int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                         const int32_t iDlayerCount, const int32_t iSpsNumInUse,
+                         SWelsSPS* pSpsArray,
+                         SSubsetSps* pSubsetArray, bool bSVCBaseLayer);
+
+}
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture.h
new file mode 100644
index 0000000000..fdd4a90432
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture.h
@@ -0,0 +1,137 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//picture.h  -  reconstruction picture/ reference picture/ residual picture are declared here
+#ifndef WELS_PICTURE_H__
+#define WELS_PICTURE_H__
+
+#include "typedefs.h"
+#include "as264_common.h"
+#include "wels_common_basis.h"
+
+namespace WelsEnc {
+#define LIST_SIZE      0x10000    //(256*256)
+typedef struct TagScreenBlockFeatureStorage {
+//Input
+uint16_t*  pFeatureOfBlockPointer;    // Pointer to pFeatureOfBlock
+int32_t    iIs16x16;      //Feature block size
+uint8_t      uiFeatureStrategyIndex;// index of hash strategy
+
+//Modify
+uint32_t*  pTimesOfFeatureValue;    // times of every value in Feature
+uint16_t**
+pLocationOfFeature;      // uint16_t *pLocationOfFeature[LIST_SIZE], pLocationOfFeature[i] saves all the location(x,y) whose Feature = i;
+uint16_t*  pLocationPointer;  // buffer of position array
+int32_t    iActualListSize;      // actual list size
+uint32_t uiSadCostThreshold[BLOCK_SIZE_ALL];
+bool      bRefBlockFeatureCalculated; // flag of whether pre-process is done
+uint16_t **pFeatureValuePointerList;//uint16_t* pFeatureValuePointerList[WELS_MAX (LIST_SIZE_SUM_16x16, LIST_SIZE_MSE_16x16)]
+} SScreenBlockFeatureStorage; //should be stored with RefPic, one for each frame
+
+/*
+ *  Reconstructed Picture definition
+ *  It is used to express reference picture, also consequent reconstruction picture for output
+ */
+typedef struct TagPicture {
+/************************************payload pData*********************************/
+uint8_t*    pBuffer;    // pointer to the first allocated byte, basical offset of pBuffer, dimension:
+uint8_t*    pData[3];    // pointer to picture planes respectively
+int32_t    iLineSize[3];  // iLineSize of picture planes respectively
+
+// picture information
+/*******************************from other standard syntax****************************/
+/*from pSps*/
+int32_t    iWidthInPixel;  // picture width in pixel
+int32_t    iHeightInPixel;// picture height in pixel
+int32_t    iPictureType;  // got from sSliceHeader(): eSliceType
+int32_t    iFramePoc;    // frame POC
+
+float      fFrameRate;   // MOVE
+int32_t    iFrameNum;    // frame number      //for pRef pic management
+
+uint32_t*  uiRefMbType;  // for iMbWidth*iMbHeight
+uint8_t*    pRefMbQp;    // for iMbWidth*iMbHeight
+
+int32_t*     pMbSkipSad;   //for iMbWidth*iMbHeight
+
+SMVUnitXY*  sMvList;
+
+/*******************************sef_definition for misc use****************************/
+int32_t    iMarkFrameNum;
+int32_t    iLongTermPicNum;
+
+bool    bUsedAsRef;            //for pRef pic management
+bool    bIsLongRef;  // long term reference frame flag  //for pRef pic management
+bool    bIsSceneLTR;  //long term reference & large scene change
+uint8_t    uiRecieveConfirmed;
+uint8_t    uiTemporalId;
+uint8_t    uiSpatialId;
+int32_t   iFrameAverageQp;
+
+/*******************************for screen reference frames****************************/
+SScreenBlockFeatureStorage* pScreenBlockFeatureStorage;
+
+  /*
+   *    set picture as unreferenced
+   */
+  void SetUnref () {
+      iFramePoc          = -1;
+      iFrameNum          = -1;
+      uiTemporalId       =
+        uiSpatialId      =
+        iLongTermPicNum  = -1;
+      bIsLongRef         = false;
+      uiRecieveConfirmed = RECIEVE_FAILED;
+      iMarkFrameNum      = -1;
+      bUsedAsRef         = false;
+
+      if (NULL != pScreenBlockFeatureStorage)
+        pScreenBlockFeatureStorage->bRefBlockFeatureCalculated = false;
+  }
+
+} SPicture;
+
+/*
+ *  Residual Picture
+ */
+//typedef struct Rs_Picture_s{
+//  int16_t    *pBuffer[4];    // base pBuffer
+//  int16_t    *pData[4];    // pData pBuffer
+//  int32_t    real_linesize[4];// actual iLineSize of picture planes respectively
+//  int32_t    used_linesize[4];// iLineSize of picture planes respectively used currently
+//  int32_t    planes;      // planes of YUV
+//}Rs_Picture_t;
+
+}  // end of namespace WelsEnc {
+
+#endif//WELS_PICTURE_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture_handle.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture_handle.h
new file mode 100644
index 0000000000..018ddbc24f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/picture_handle.h
@@ -0,0 +1,66 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    picture_handle.h
+ *
+ * \brief   picture pData handling
+ *
+ * \date    5/20/2009 Created
+ *
+ *************************************************************************************/
+#if !defined(WELS_ENCODER_PICTURE_HANDLE_H__)
+#define WELS_ENCODER_PICTURE_HANDLE_H__
+
+#include "picture.h"
+#include "typedefs.h"
+#include "memory_align.h"
+
+namespace WelsEnc {
+/*!
+ * \brief   alloc picture pData with borders for each plane based width and height of picture
+ * \param   kiWidth                 width of picture in pixels
+ * \param   kiHeight                height of picture in pixels
+ * \param   bNeedMbInfo             need pData allocation
+ * \pram    iNeedFeatureStorage     need storage for FME
+ * \return  successful if effective picture pointer returned, otherwise failed with NULL
+ */
+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth, const int32_t kiHeight, bool bNeedMbInfo,
+                        int32_t iNeedFeatureStorage);
+
+/*!
+ * \brief   free picture pData planes
+ * \param   pic     picture pointer to be destoryed
+ * \return  none
+ */
+void FreePicture (CMemoryAlign* pMa, SPicture** ppPic);
+
+}
+#endif//WELS_ENCODER_PICTURE_HANDLE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/rc.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/rc.h
new file mode 100644
index 0000000000..00a6570bba
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/rc.h
@@ -0,0 +1,283 @@
+/*!
+ * \copy
+ *     Copyright (c)  2004-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  ratectl.c
+ *
+ *  Abstract
+ *      Include file for ratectl.c
+ *
+ *  History
+ *      9/8/2004 Created
+ *    12/26/2011 Modified
+ *
+ *
+ *************************************************************************/
+#ifndef RC_H
+#define RC_H
+
+
+#include "codec_app_def.h"
+#include "svc_enc_macroblock.h"
+#include "slice.h"
+
+namespace WelsEnc {
+
+typedef struct TagWelsEncCtx sWelsEncCtx;
+
+//trace
+#define GOM_TRACE_FLAG 0
+#define GOM_H_SCC               8
+
+enum {
+  BITS_NORMAL,
+  BITS_LIMITED,
+  BITS_EXCEEDED
+};
+
+enum {
+//virtual gop size
+  VGOP_SIZE             = 8,
+
+//qp information
+  GOM_MIN_QP_MODE       = 12,
+  GOM_MAX_QP_MODE       = 36,
+  MAX_LOW_BR_QP         = 42,
+  MIN_IDR_QP            = 26,
+  MAX_IDR_QP            = 32,
+  MIN_SCREEN_QP         = 26,
+  MAX_SCREEN_QP         = 35,
+  DELTA_QP              = 2,
+  DELTA_QP_BGD_THD      = 3,
+  QP_MIN_VALUE          = 0,
+  QP_MAX_VALUE          = 51,
+
+//frame skip constants
+  SKIP_QP_90P           = 24,
+  SKIP_QP_180P          = 24,
+  SKIP_QP_360P          = 31,
+  SKIP_QP_720P          = 31,
+  LAST_FRAME_QP_RANGE_UPPER_MODE0  = 3,
+  LAST_FRAME_QP_RANGE_LOWER_MODE0  = 2,
+  LAST_FRAME_QP_RANGE_UPPER_MODE1  = 5,
+  LAST_FRAME_QP_RANGE_LOWER_MODE1  = 3,
+
+  MB_WIDTH_THRESHOLD_90P   = 15,
+  MB_WIDTH_THRESHOLD_180P  = 30,
+  MB_WIDTH_THRESHOLD_360P  = 60,
+
+//Mode 0 parameter
+  GOM_ROW_MODE0_90P     = 2,
+  GOM_ROW_MODE0_180P    = 2,
+  GOM_ROW_MODE0_360P    = 4,
+  GOM_ROW_MODE0_720P    = 4,
+  QP_RANGE_MODE0        = 3,
+
+//Mode 1 parameter
+  GOM_ROW_MODE1_90P     = 1,
+  GOM_ROW_MODE1_180P    = 1,
+  GOM_ROW_MODE1_360P    = 2,
+  GOM_ROW_MODE1_720P    = 2,
+  QP_RANGE_UPPER_MODE1  = 9,
+  QP_RANGE_LOWER_MODE1  = 4,
+  QP_RANGE_INTRA_MODE1  = 3
+};
+
+//bits allocation
+#define MAX_BITS_VARY_PERCENTAGE 100 //bits vary range in percentage
+#define MAX_BITS_VARY_PERCENTAGE_x3d2 150 //bits vary range in percentage * 3/2
+#define INT_MULTIPLY 100 // use to multiply in Double to Int Conversion, should be same as AQ_QSTEP_INT_MULTIPLY in WelsVP
+#define WEIGHT_MULTIPLY 2000
+#define REMAIN_BITS_TH (1)
+#define VGOP_BITS_PERCENTAGE_DIFF 5
+#define IDR_BITRATE_RATIO  4
+#define FRAME_iTargetBits_VARY_RANGE 50 // *INT_MULTIPLY
+//R-Q Model
+#define LINEAR_MODEL_DECAY_FACTOR 80 // *INT_MULTIPLY
+#define FRAME_CMPLX_RATIO_RANGE 20 // *INT_MULTIPLY
+#define SMOOTH_FACTOR_MIN_VALUE 2 // *INT_MULTIPLY
+//#define VGOP_BITS_MIN_RATIO 0.8
+//skip and padding
+#define TIME_CHECK_WINDOW 5000 // ms
+#define SKIP_RATIO  50 // *INT_MULTIPLY
+#define LAST_FRAME_PREDICT_WEIGHT 0.5
+#define PADDING_BUFFER_RATIO 50 // *INT_MULTIPLY
+#define PADDING_THRESHOLD    5 //*INT_MULTIPLY
+
+#define VIRTUAL_BUFFER_LOW_TH   120 //*INT_MULTIPLY
+#define VIRTUAL_BUFFER_HIGH_TH  180 //*INT_MULTIPLY
+
+#define _BITS_RANGE 0
+
+enum {
+  EVEN_TIME_WINDOW  =0,
+  ODD_TIME_WINDOW   =1,
+  TIME_WINDOW_TOTAL =2
+};
+
+typedef struct TagRCTemporal {
+int32_t   iMinBitsTl;
+int32_t   iMaxBitsTl;
+int32_t   iTlayerWeight;
+int32_t   iGopBitsDq;
+//P frame level R-Q Model
+int64_t   iLinearCmplx; // *INT_MULTIPLY
+int32_t   iPFrameNum;
+int64_t   iFrameCmplxMean;
+int32_t   iMaxQp;
+int32_t   iMinQp;
+} SRCTemporal;
+
+typedef struct TagWelsRc {
+int32_t   iRcVaryPercentage;
+int32_t   iRcVaryRatio;
+
+int32_t   iInitialQp; //initial qp
+int64_t   iBitRate; // Note: although the max bit rate is 240000*1200 which can be represented by int32, but there are many multipler of this iBitRate in the calculation of RC, so use int64 to avoid type conversion at all such places
+int32_t   iPreviousBitrate;
+int32_t   iPreviousGopSize;
+double    fFrameRate;
+int32_t   iBitsPerFrame;
+int32_t   iMaxBitsPerFrame;
+double    dPreviousFps;
+
+// bits allocation and status
+int32_t   iRemainingBits;
+int32_t   iBitsPerMb;
+int32_t   iTargetBits;
+int32_t   iCurrentBitsLevel;//0:normal; 1:limited; 2:exceeded.
+
+int32_t   iIdrNum;
+int64_t   iIntraComplexity; //255*255(MaxMbSAD)*36864(MaxFS) make the highest bit of 32-bit integer 1
+int32_t   iIntraMbCount;
+int64_t   iIntraComplxMean;
+
+int8_t    iTlOfFrames[VGOP_SIZE];
+int32_t   iRemainingWeights;
+int32_t   iFrameDqBits;
+
+bool       bGomRC;
+double*    pGomComplexity;
+int32_t*   pGomForegroundBlockNum;
+int32_t*   pCurrentFrameGomSad;
+int32_t*   pGomCost;
+
+int32_t   bEnableGomQp;
+int32_t   iAverageFrameQp;
+int32_t   iMinFrameQp;
+int32_t   iMaxFrameQp;
+int32_t   iNumberMbFrame;
+int32_t   iNumberMbGom;
+int32_t   iGomSize;
+
+int32_t   iSkipFrameNum;
+int32_t   iFrameCodedInVGop;
+int32_t   iSkipFrameInVGop;
+int32_t   iGopNumberInVGop;
+int32_t   iGopIndexInVGop;
+
+int32_t   iSkipQpValue;
+int32_t   iQpRangeUpperInFrame;
+int32_t   iQpRangeLowerInFrame;
+int32_t   iMinQp;
+int32_t   iMaxQp;
+//int32_t   delta_adaptive_qp;
+int32_t   iSkipBufferRatio;
+
+int32_t   iQStep; // *INT_MULTIPLY
+int32_t   iFrameDeltaQpUpper;
+int32_t   iFrameDeltaQpLower;
+int32_t   iLastCalculatedQScale;
+
+//for skip frame and padding
+int32_t   iBufferSizeSkip;
+int64_t   iBufferFullnessSkip;
+int64_t   iBufferMaxBRFullness[TIME_WINDOW_TOTAL];//0: EVEN_TIME_WINDOW; 1: ODD_TIME_WINDOW
+int32_t   iPredFrameBit;
+bool      bNeedShiftWindowCheck[TIME_WINDOW_TOTAL];
+int32_t   iBufferSizePadding;
+int32_t   iBufferFullnessPadding;
+int32_t   iPaddingSize;
+int32_t   iPaddingBitrateStat;
+bool      bSkipFlag;
+int32_t   iContinualSkipFrames;
+SRCTemporal* pTemporalOverRc;
+
+//for scc
+int64_t     iAvgCost2Bits;
+int64_t     iCost2BitsIntra;
+int32_t    iBaseQp;
+long long  uiLastTimeStamp;
+
+//for statistics and online adjustments
+int32_t   iActualBitRate; // TODO: to complete later
+float     fLatestFrameRate; // TODO: to complete later
+} SWelsSvcRc;
+
+typedef  void (*PWelsRCPictureInitFunc) (sWelsEncCtx* pCtx,long long uiTimeStamp);
+typedef  void (*PWelsRCPictureDelayJudgeFunc) (sWelsEncCtx* pCtx,long long uiTimeStamp,int32_t iDidIdx);
+typedef  void (*PWelsRCPictureInfoUpdateFunc) (sWelsEncCtx* pCtx, int32_t iLayerSize);
+typedef  void (*PWelsRCMBInfoUpdateFunc) (sWelsEncCtx* pCtx, SMB* pCurMb, int32_t iCostLuma, SSlice* pSlice);
+typedef  void (*PWelsRCMBInitFunc) (sWelsEncCtx* pCtx, SMB* pCurMb, SSlice* pSlice);
+typedef  void (*PWelsCheckFrameSkipBasedMaxbrFunc) (sWelsEncCtx* pCtx, const long long uiTimeStamp, int32_t iDidIdx);
+typedef  void (*PWelsUpdateBufferWhenFrameSkippedFunc)(sWelsEncCtx* pCtx, int32_t iSpatialNum);
+typedef  void (*PWelsUpdateMaxBrCheckWindowStatusFunc)(sWelsEncCtx* pCtx, int32_t iSpatialNum, const long long uiTimeStamp);
+typedef  bool (*PWelsRCPostFrameSkippingFunc)(sWelsEncCtx* pCtx, const int32_t iDid, const long long uiTimeStamp);
+
+typedef  struct  WelsRcFunc_s {
+PWelsRCPictureInitFunc          pfWelsRcPictureInit;
+PWelsRCPictureDelayJudgeFunc    pfWelsRcPicDelayJudge;
+PWelsRCPictureInfoUpdateFunc    pfWelsRcPictureInfoUpdate;
+PWelsRCMBInitFunc               pfWelsRcMbInit;
+PWelsRCMBInfoUpdateFunc         pfWelsRcMbInfoUpdate;
+PWelsCheckFrameSkipBasedMaxbrFunc pfWelsCheckSkipBasedMaxbr;
+PWelsUpdateBufferWhenFrameSkippedFunc pfWelsUpdateBufferWhenSkip;
+PWelsUpdateMaxBrCheckWindowStatusFunc pfWelsUpdateMaxBrWindowStatus;
+
+PWelsRCPostFrameSkippingFunc    pfWelsRcPostFrameSkipping;
+} SWelsRcFunc;
+
+void GomRCInitForOneSlice(SSlice* pSlice, const int32_t kiBitsPerMb);
+void CheckFrameSkipBasedMaxbr (sWelsEncCtx* pCtx,const long long uiTimeStamp, int32_t iDidIdx);
+void UpdateBufferWhenFrameSkipped(sWelsEncCtx* pCtx, int32_t iSpatialNum);
+void UpdateMaxBrCheckWindowStatus(sWelsEncCtx* pCtx, int32_t iSpatialNum, const long long uiTimeStamp);
+bool WelsRcPostFrameSkipping(sWelsEncCtx* pCtx, const int32_t iDid, const long long uiTimeStamp);
+void WelsRcPostFrameSkippedUpdate (sWelsEncCtx* pCtx, const int32_t iDid);
+
+void RcTraceFrameBits (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iFrameSize);
+void WelsRcInitModule (sWelsEncCtx* pCtx, RC_MODES iRcMode);
+void WelsRcInitFuncPointers (sWelsEncCtx* pEncCtx, RC_MODES iRcMode);
+void WelsRcFreeMemory (sWelsEncCtx* pCtx);
+bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx,long long uiTimeStamp,int32_t iSpatialNum,int32_t iCurDid);
+bool WelsUpdateSkipFrameStatus();
+long long GetTimestampForRc(const long long uiTimeStamp, const long long uiLastTimeStamp, const float fFrameRate);
+
+}
+#endif //RC_H
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/ref_list_mgr_svc.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/ref_list_mgr_svc.h
new file mode 100644
index 0000000000..ad82e7e0d8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/ref_list_mgr_svc.h
@@ -0,0 +1,148 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  ref_list_mgr_svc.h
+ *
+ *  Abstract
+ *      Interface for managing reference picture in svc encoder side
+ *
+ *  History
+ *      09/01/2008 Created
+ *      08/07/2009 Ported
+ *
+ *****************************************************************************/
+#if !defined(REFERENCE_PICTURE_LIST_MANAGEMENT_SVC_H__)
+#define REFERENCE_PICTURE_LIST_MANAGEMENT_SVC_H__
+
+#include "typedefs.h"
+#include "encoder_context.h"
+#include "codec_app_def.h"
+
+namespace WelsEnc {
+
+typedef enum {
+LTR_DIRECT_MARK = 0,
+LTR_DELAY_MARK = 1
+} LTR_MARKING_PROCESS_MODE;
+
+typedef enum {
+FRAME_NUM_EQUAL    = 0x01,
+FRAME_NUM_BIGGER   = 0x02,
+FRAME_NUM_SMALLER  = 0x04,
+FRAME_NUM_OVER_MAX = 0x08
+} COMPARE_FRAME_NUM;
+
+/*
+*   reset LTR marking , recovery ,feedback state to default
+*/
+void ResetLtrState (SLTRState* pLtr);
+/*
+ *  reset reference picture list
+ */
+void WelsResetRefList (sWelsEncCtx* pCtx);
+
+/*
+ *  update reference picture list
+ */
+bool WelsUpdateRefList (sWelsEncCtx* pCtx);
+/*
+ *  build reference picture list
+ */
+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t kiPOC, int32_t iBestLtrRefIdx);
+
+/*
+ *  update syntax for reference base related
+ */
+void WelsUpdateRefSyntax (sWelsEncCtx* pCtx, const int32_t kiPOC, const int32_t kiFrameType);
+
+
+/*
+* check current mark iFrameNum used in LTR list or not
+*/
+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx);
+/*
+*   decide whether current frame include long term reference mark and update long term reference mark syntax
+*/
+void WelsMarkPic (sWelsEncCtx* pCtx);
+
+#ifdef LONG_TERM_REF_DUMP
+void DumpRef (sWelsEncCtx* ctx);
+#endif
+
+class IWelsReferenceStrategy {
+ public:
+  IWelsReferenceStrategy() {};
+  virtual ~IWelsReferenceStrategy() { };
+
+  static IWelsReferenceStrategy* CreateReferenceStrategy (sWelsEncCtx* pCtx, const EUsageType keUsageType,
+      const bool kbLtrEnabled);
+  virtual bool BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx) = 0;
+  virtual void MarkPic() = 0;
+  virtual bool UpdateRefList() = 0;
+  virtual void EndofUpdateRefList() = 0;
+  virtual void AfterBuildRefList() = 0;
+
+ protected:
+  virtual void Init (sWelsEncCtx* pCtx) = 0;
+};
+
+class  CWelsReference_TemporalLayer : public IWelsReferenceStrategy {
+ public:
+  virtual bool BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx);
+  virtual void MarkPic();
+  virtual bool UpdateRefList();
+  virtual void EndofUpdateRefList();
+  virtual void AfterBuildRefList();
+
+  void Init (sWelsEncCtx* pCtx);
+ protected:
+  sWelsEncCtx* m_pEncoderCtx;
+
+};
+
+class  CWelsReference_Screen : public CWelsReference_TemporalLayer {
+ public:
+  virtual bool BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx);
+  virtual void MarkPic();
+  virtual bool UpdateRefList();
+  virtual void EndofUpdateRefList();
+  virtual void AfterBuildRefList();
+};
+
+class  CWelsReference_LosslessWithLtr : public CWelsReference_Screen {
+ public:
+  virtual bool BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx);
+  virtual void MarkPic();
+  virtual bool UpdateRefList();
+  virtual void EndofUpdateRefList();
+};
+}
+#endif//REFERENCE_PICTURE_LIST_MANAGEMENT_SVC_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/sample.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/sample.h
new file mode 100644
index 0000000000..c953a50b09
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/sample.h
@@ -0,0 +1,143 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef SAMPLE_H_
+#define SAMPLE_H_
+
+#include "typedefs.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+
+//======================SATD======================//
+int32_t WelsSampleSatd16x16_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_c (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x8_c (uint8_t*, int32_t, uint8_t*, int32_t);
+//int32_t WelsSampleSatd8x4( uint8_t *, int32_t, uint8_t *, int32_t );
+//int32_t WelsSampleSatd4x8( uint8_t *, int32_t, uint8_t *, int32_t );
+int32_t WelsSampleSatd4x4_c (uint8_t*, int32_t, uint8_t*, int32_t);
+
+int32_t WelsSampleSatdIntra4x4Combined3_c (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t,
+    int32_t);
+int32_t WelsSampleSatdIntra16x16Combined3_c (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsSampleSadIntra16x16Combined3_c (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*,
+    uint8_t*, uint8_t*);
+int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*,
+    uint8_t*, uint8_t*);
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+#if defined (X86_ASM)
+
+
+int32_t WelsSampleSatd8x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatdThree4x4_sse2 (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t,
+                                     int32_t);
+
+int32_t WelsSampleSatd8x8_sse41 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_sse41 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_sse41 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_sse41 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd4x4_sse41 (uint8_t*, int32_t, uint8_t*, int32_t);
+
+int32_t WelsIntra16x16Combined3Satd_sse41 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntra16x16Combined3Sad_ssse3 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntraChroma8x8Combined3Satd_sse41 (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*,
+    uint8_t*, uint8_t*);
+
+int32_t WelsSampleSatd8x8_avx2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_avx2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_avx2 (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_avx2 (uint8_t*, int32_t, uint8_t*, int32_t);
+
+#endif//X86_ASM
+
+#if defined (HAVE_NEON)
+
+
+int32_t WelsSampleSatd8x8_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd4x4_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+
+int32_t WelsIntra16x16Combined3Satd_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntra16x16Combined3Sad_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntra8x8Combined3Satd_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,
+                                        uint8_t*);
+int32_t WelsIntra8x8Combined3Sad_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,
+                                       uint8_t*);
+int32_t WelsIntra4x4Combined3Satd_neon (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t,
+                                        int32_t);
+
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+int32_t WelsSampleSatd4x4_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsIntra16x16Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntra16x16Combined3Sad_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+int32_t WelsIntra8x8Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,
+                                            uint8_t*);
+int32_t WelsIntra8x8Combined3Sad_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*, uint8_t*,
+                                           uint8_t*);
+int32_t WelsIntra4x4Combined3Satd_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t, int32_t,
+                                            int32_t);
+#endif
+
+#if defined (HAVE_MMI)
+int32_t WelsSampleSatd8x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x8_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd8x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd16x16_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+int32_t WelsSampleSatd4x4_mmi (uint8_t*, int32_t, uint8_t*, int32_t);
+#endif//HAVE_MMI
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+void WelsInitSampleSadFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag);
+
+}
+
+#endif //SAMPLE_H_
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cabac.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cabac.h
new file mode 100644
index 0000000000..61299d48fa
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cabac.h
@@ -0,0 +1,127 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    set_mb_syn_cabac.h
+ *
+ * \brief   Seting all syntax elements of mb and encoding residual with cabac
+ *
+ * \date    09/27/2014 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef SET_MB_SYN_CABAC_H_
+#define SET_MB_SYN_CABAC_H_
+
+#include "typedefs.h"
+#include "wels_common_defs.h"
+
+using namespace WelsCommon;
+
+namespace WelsEnc {
+
+#define  WELS_QP_MAX    51
+
+typedef uint64_t cabac_low_t;
+enum { CABAC_LOW_WIDTH = sizeof (cabac_low_t) / sizeof (uint8_t) * 8 };
+
+typedef struct TagStateCtx {
+  // Packed representation of state and MPS as state << 1 | MPS.
+  uint8_t   m_uiStateMps;
+
+  uint8_t Mps()   const { return m_uiStateMps  & 1; }
+  uint8_t State() const { return m_uiStateMps >> 1; }
+  void Set (uint8_t uiState, uint8_t uiMps) { m_uiStateMps = uiState * 2 + uiMps; }
+} SStateCtx;
+typedef struct TagCabacCtx {
+  cabac_low_t m_uiLow;
+  int32_t   m_iLowBitCnt;
+  int32_t   m_iRenormCnt;
+  uint32_t  m_uiRange;
+  SStateCtx   m_sStateCtx[WELS_CONTEXT_COUNT];
+  uint8_t*   m_pBufStart;
+  uint8_t*   m_pBufEnd;
+  uint8_t*   m_pBufCur;
+} SCabacCtx;
+
+
+void WelsCabacContextInit (void* pCtx, SCabacCtx* pCbCtx, int32_t iModel);
+void WelsCabacEncodeInit (SCabacCtx* pCbCtx, uint8_t* pBuf,  uint8_t* pEnd);
+inline void WelsCabacEncodeDecision (SCabacCtx* pCbCtx, int32_t iCtx, uint32_t uiBin);
+inline void WelsCabacEncodeBypassOne (SCabacCtx* pCbCtx, int32_t uiBin);
+void WelsCabacEncodeTerminate (SCabacCtx* pCbCtx, uint32_t uiBin);
+void WelsCabacEncodeUeBypass (SCabacCtx* pCbCtx, int32_t iExpBits, uint32_t uiVal);
+void WelsCabacEncodeFlush (SCabacCtx* pCbCtx);
+uint8_t* WelsCabacEncodeGetPtr (SCabacCtx* pCbCtx);
+int32_t  WriteBlockResidualCabac (void* pEncCtx,  int16_t* pCoffLevel, int32_t iEndIdx,
+                                  int32_t iCalRunLevelFlag,
+                                  int32_t iResidualProperty, int8_t iNC, SBitStringAux* pBs);
+
+
+// private functions used by public inline functions.
+void WelsCabacEncodeDecisionLps_ (SCabacCtx* pCbCtx, int32_t iCtx);
+void WelsCabacEncodeUpdateLowNontrivial_ (SCabacCtx* pCbCtx);
+inline void WelsCabacEncodeUpdateLow_ (SCabacCtx* pCbCtx) {
+  if (pCbCtx->m_iLowBitCnt + pCbCtx->m_iRenormCnt < CABAC_LOW_WIDTH) {
+    pCbCtx->m_iLowBitCnt  += pCbCtx->m_iRenormCnt;
+    pCbCtx->m_uiLow      <<= pCbCtx->m_iRenormCnt;
+  } else {
+    WelsCabacEncodeUpdateLowNontrivial_ (pCbCtx);
+  }
+  pCbCtx->m_iRenormCnt = 0;
+}
+
+// inline function definitions.
+void WelsCabacEncodeDecision (SCabacCtx* pCbCtx, int32_t iCtx, uint32_t uiBin) {
+  if (uiBin == pCbCtx->m_sStateCtx[iCtx].Mps()) {
+    const int32_t kiState = pCbCtx->m_sStateCtx[iCtx].State();
+    uint32_t uiRange = pCbCtx->m_uiRange;
+    uint32_t uiRangeLps = g_kuiCabacRangeLps[kiState][(uiRange & 0xff) >> 6];
+    uiRange -= uiRangeLps;
+
+    const int32_t kiRenormAmount = uiRange >> 8 ^ 1;
+    pCbCtx->m_uiRange = uiRange << kiRenormAmount;
+    pCbCtx->m_iRenormCnt += kiRenormAmount;
+    pCbCtx->m_sStateCtx[iCtx].Set (g_kuiStateTransTable[kiState][1], uiBin);
+  } else {
+    WelsCabacEncodeDecisionLps_ (pCbCtx, iCtx);
+  }
+}
+
+void WelsCabacEncodeBypassOne (SCabacCtx* pCbCtx, int32_t uiBin) {
+  const uint32_t kuiBinBitmask = -uiBin;
+  pCbCtx->m_iRenormCnt++;
+  WelsCabacEncodeUpdateLow_ (pCbCtx);
+  pCbCtx->m_uiLow += kuiBinBitmask & pCbCtx->m_uiRange;
+}
+
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cavlc.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cavlc.h
new file mode 100644
index 0000000000..37735b9b51
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/set_mb_syn_cavlc.h
@@ -0,0 +1,92 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    set_mb_syn_cavlc.h
+ *
+ * \brief   Seting all syntax elements of mb and decoding residual with cavlc
+ *
+ * \date    05/19/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef SET_MB_SYN_CAVLC_H_
+#define SET_MB_SYN_CAVLC_H_
+
+#include "typedefs.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+
+
+enum ECtxBlockCat {
+  LUMA_DC     = 0,
+  LUMA_AC     = 1,
+  LUMA_4x4    = 2,
+  CHROMA_DC   = 3,
+  CHROMA_AC   = 4
+};
+
+
+#define LUMA_DC_AC    0x04
+
+typedef struct TagCavlcTableItem {
+  uint16_t uiBits;
+  uint8_t  uiLen;
+  uint8_t  uiSuffixLength;
+} SCavlcTableItem;
+
+void  InitCoeffFunc (SWelsFuncPtrList* pFuncList, const uint32_t uiCpuFlag,int32_t iEntropyCodingModeFlag);
+
+int32_t  WriteBlockResidualCavlc (SWelsFuncPtrList* pFuncList, int16_t* pCoffLevel, int32_t iEndIdx,
+                                  int32_t iCalRunLevelFlag,
+                                  int32_t iResidualProperty, int8_t iNC, SBitStringAux* pBs);
+
+
+#if defined(__cplusplus)
+extern "C" {
+#endif//__cplusplus
+
+int32_t CavlcParamCal_c (int16_t* pCoffLevel, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeffs ,
+                         int32_t iEndIdx);
+#ifdef  X86_ASM
+int32_t CavlcParamCal_sse2 (int16_t* pCoffLevel, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeffs ,
+                            int32_t iEndIdx);
+int32_t CavlcParamCal_sse42 (int16_t* pCoffLevel, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeffs ,
+                             int32_t iEndIdx);
+#endif
+
+#if defined(__cplusplus)
+}
+#endif//__cplusplus
+
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice.h
new file mode 100644
index 0000000000..755c80a3bd
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice.h
@@ -0,0 +1,212 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_slice.h
+#ifndef WELS_SLICE_H__
+#define WELS_SLICE_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "mb_cache.h"
+#include "picture.h"
+#include "parameter_sets.h"
+#include "svc_enc_slice_segment.h"
+#include "set_mb_syn_cabac.h"
+#include "nal_encap.h"
+
+namespace WelsEnc {
+
+/*******************************sub struct of slice header****************************/
+
+
+/*
+ *  Reference picture list reordering syntax, refer to page 64 in JVT X201wcm
+ */
+typedef struct TagRefPicListReorderSyntax {
+struct {
+  uint32_t      uiAbsDiffPicNumMinus1; //uiAbsDiffPicNumMinus1 SHOULD be in the range of [4, (1<<pSps->uiLog2MaxFrameNum)-1], {p104, JVT-X201wcm1}
+  //but int8_t can't cover the range, SHOULD modify it.
+  uint16_t      iLongTermPicNum;
+  uint16_t      uiReorderingOfPicNumsIdc; //in order to pack 2-uint16_t into 1-(u)int32_t, so modify the type into uint16_t.
+} SReorderingSyntax[MAX_REFERENCE_REORDER_COUNT_NUM];   // MAX_REF_PIC_COUNT
+} SRefPicListReorderSyntax;
+
+
+/* Decoded reference picture marking syntax, refer to Page 66 in JVT X201wcm */
+typedef struct TagRefPicMarking {
+struct {
+  int32_t       iMmcoType;
+  int32_t       iShortFrameNum;
+  int32_t       iDiffOfPicNum;
+  int32_t       iLongTermPicNum;
+  int32_t       iLongTermFrameIdx;
+  int32_t       iMaxLongTermFrameIdx;
+} SMmcoRef[MAX_REFERENCE_MMCO_COUNT_NUM];       // MAX_MMCO_COUNT
+
+// int32_t         mmco_index;
+uint8_t         uiMmcoCount;
+bool            bNoOutputOfPriorPicsFlag;
+bool            bLongTermRefFlag;
+bool            bAdaptiveRefPicMarkingModeFlag;
+} SRefPicMarking;
+
+// slice level rc statistic info
+typedef struct TagRCSlicing {
+  int32_t   iComplexityIndexSlice;
+  int32_t   iCalculatedQpSlice;
+  int32_t   iStartMbSlice;
+  int32_t   iEndMbSlice;
+  int32_t   iTotalQpSlice;
+  int32_t   iTotalMbSlice;
+  int32_t   iTargetBitsSlice;
+  int32_t   iBsPosSlice;
+  int32_t   iFrameBitsSlice;
+  int32_t   iGomBitsSlice;
+  int32_t   iGomTargetBits;
+  //int32_t   gom_coded_mb;
+} SRCSlicing;
+
+/* Header of slice syntax elements, refer to Page 63 in JVT X201wcm */
+typedef struct TagSliceHeader {
+/*****************************slice header syntax and generated****************************/
+int32_t         iFirstMbInSlice;
+// uint32_t        pic_parameter_set_id;
+int32_t         iFrameNum;
+int32_t         iPicOrderCntLsb;
+
+// int32_t         delta_pic_order_cnt_bottom;
+// int32_t         delta_pic_order_cnt[2];
+// int32_t         redundant_pic_cnt;
+
+EWelsSliceType  eSliceType;
+uint8_t         uiNumRefIdxL0Active;                    //
+//int32_t         num_ref_idx_l1_active_minus1    //B frame is not supported
+uint8_t         uiRefCount;
+//Ref_Pic         *ref_pic;
+uint8_t         uiRefIndex;     // exact reference picture index for slice
+
+int8_t          iSliceQpDelta;
+// int32_t         slice_qp;
+// int32_t         slice_qs_delta;         // For SP/SI slices
+uint8_t         uiDisableDeblockingFilterIdc;
+int8_t          iSliceAlphaC0Offset;
+int8_t          iSliceBetaOffset;
+#if !defined(DISABLE_FMO_FEATURE)
+int32_t         iSliceGroupChangeCycle;
+#endif//!DISABLE_FMO_FEATURE
+
+SWelsSPS*       pSps;
+SWelsPPS*       pPps;
+int32_t         iSpsId;
+int32_t         iPpsId;
+
+uint16_t        uiIdrPicId;
+// uint8_t         color_plane_id;//from?
+
+bool            bNumRefIdxActiveOverrideFlag;
+// bool            field_pic_flag;         //not supported in base profile
+// bool            bottom_field_flag;              //not supported in base profile
+uint8_t         uiPadding1Bytes;
+
+SRefPicMarking  sRefMarking;    // Decoded reference picture marking syntaxs
+
+SRefPicListReorderSyntax        sRefReordering; // Reference picture list reordering syntaxs
+} SSliceHeader, *PSliceHeader;
+
+
+/* SSlice header in scalable extension syntax, refer to Page 394 in JVT X201wcm */
+typedef struct TagSliceHeaderExt {
+SSliceHeader    sSliceHeader;
+
+SSubsetSps*     pSubsetSps;
+
+uint32_t        uiNumMbsInSlice;
+
+bool            bStoreRefBasePicFlag;
+bool            bConstrainedIntraResamplingFlag;
+bool            bSliceSkipFlag;
+
+bool            bAdaptiveBaseModeFlag;
+bool            bDefaultBaseModeFlag;
+bool            bAdaptiveMotionPredFlag;
+bool            bDefaultMotionPredFlag;
+
+bool            bAdaptiveResidualPredFlag;
+bool            bDefaultResidualPredFlag;
+bool            bTcoeffLevelPredFlag;
+uint8_t         uiDisableInterLayerDeblockingFilterIdc;
+
+} SSliceHeaderExt, *PSliceHeaderExt;
+
+
+typedef struct TagSlice {
+// mainly for multiple threads imp.
+SMbCache        sMbCacheInfo;   // MBCache is introduced within slice dependency
+SBitStringAux*  pSliceBsa;
+SWelsSliceBs    sSliceBs;
+
+/*******************************sSliceHeader****************************/
+SSliceHeaderExt sSliceHeaderExt;
+
+SMVUnitXY       sMvStartMin;
+SMVUnitXY       sMvStartMax;
+SMVUnitXY       sMvc[5];
+uint8_t         uiMvcNum;
+uint8_t         sScaleShift;
+
+int32_t         iSliceIdx;
+uint32_t        uiBufferIdx;
+bool            bSliceHeaderExtFlag; // Indicate which slice header is used, avc or ext?
+uint8_t         uiLastMbQp;             // stored qp for last mb coded, maybe more efficient for mb skip detection etc.
+
+bool            bDynamicSlicingSliceSizeCtrlFlag;
+uint8_t         uiAssumeLog2BytePerMb;
+
+uint32_t        uiSliceFMECostDown;//TODO: for FME switch under MT, to opt after ME final?
+
+uint8_t         uiReservedFillByte;     // reserved to meet 4 bytes alignment
+
+SCabacCtx       sCabacCtx;
+int32_t         iCabacInitIdc;
+int32_t         iMbSkipRun;
+
+int32_t         iCountMbNumInSlice;
+uint32_t        uiSliceConsumeTime;
+int32_t         iSliceComplexRatio;
+
+SRCSlicing      sSlicingOverRc;   //slice level rc statistic info
+} SSlice, *PSlice;
+
+}
+#endif//WELS_SLICE_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice_multi_threading.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice_multi_threading.h
new file mode 100644
index 0000000000..9e5a3c1925
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/slice_multi_threading.h
@@ -0,0 +1,97 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    slice_multi_threading.c
+ *
+ * \brief   slice based multiple threading
+ *
+ * \date    04/16/2010 Created
+ *
+ *************************************************************************************
+ */
+#ifndef SVC_SLICE_MULTIPLE_THREADING_H__
+#define SVC_SLICE_MULTIPLE_THREADING_H__
+
+
+#include "typedefs.h"
+#include "codec_app_def.h"
+#include "param_svc.h"
+#include "encoder_context.h"
+#include "svc_enc_frame.h"
+#include "svc_enc_macroblock.h"
+#include "svc_enc_slice_segment.h"
+#include "WelsThreadLib.h"
+
+namespace WelsEnc {
+void UpdateMbListNeighborParallel (SDqLayer* pCurDq,
+                                   SMB* pMbList,
+                                   const int32_t kiSliceIdc);
+
+void CalcSliceComplexRatio (SDqLayer* pCurDq);
+
+int32_t NeedDynamicAdjust (SSlice** ppSliceInLayer, const int32_t iSliceNum);
+
+void DynamicAdjustSlicing (sWelsEncCtx* pCtx,
+                           SDqLayer* pCurDqLayer,
+                           int32_t iCurDid);
+
+int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pParam, const int32_t kiCountBsLen,
+                           const int32_t kiTargetSpatialBsSize, bool bDynamicSlice);
+
+void ReleaseMtResource (sWelsEncCtx** ppCtx);
+
+int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32_t kiSliceCount);
+
+#if !defined(_WIN32)
+WELS_THREAD_ROUTINE_TYPE UpdateMbListThreadProc (void* arg);
+#endif//!_WIN32
+
+int32_t DynamicDetectCpuCores();
+
+
+int32_t AdjustBaseLayer (sWelsEncCtx* pCtx);
+int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid);
+
+
+
+#if defined(MT_DEBUG)
+void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t kiCurDid);
+#endif
+#if defined(MT_DEBUG)
+void TrackSliceConsumeTime (sWelsEncCtx* pCtx, int32_t* pDidList, const int32_t kiSpatialNum);
+#endif//defined(MT_DEBUG)
+
+void SetOneSliceBsBufferUnderMultithread(sWelsEncCtx* pCtx, const int32_t kiThreadIdx, SSlice* pSlice);
+int32_t WriteSliceBs (sWelsEncCtx* pCtx,SWelsSliceBs* pSliceBs,const int32_t iSliceIdx,int32_t& iSliceSize);
+}
+
+#endif//SVC_SLICE_MULTIPLE_THREADING_H__
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/stat.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/stat.h
new file mode 100644
index 0000000000..6b70026d24
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/stat.h
@@ -0,0 +1,102 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    stat.h
+ *
+ * \brief   statistical pData information
+ *
+ * \date    4/22/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(WELS_ENCODER_STATISTICAL_DATA_H__)
+#define WELS_ENCODER_STATISTICAL_DATA_H__
+
+namespace WelsEnc {
+
+/*
+ *  Stat quality
+ */
+typedef struct TagStatQuality {
+
+float   rYPsnr[5];
+float   rUPsnr[5];
+float   rVPsnr[5];
+
+} SStatQuality;
+
+/*
+ *  Stat complexity pData
+ */
+typedef struct TagComplexityStat {
+
+#ifdef FME_TEST
+int32_t         cost_time;
+int32_t         me_time;
+int32_t         mvp_time;
+int32_t         mvb_time;
+#endif
+
+// any else?
+
+} SComplexityStat;
+
+/*
+ *  Stat slice details information
+ */
+typedef struct TagStatSliceInfo {
+
+/* per slice info */
+int32_t         iSliceCount[5];
+int32_t         iSliceSize [5];
+int32_t         iMbCount   [5][18];
+
+} SStatSliceInfo;
+
+/*
+ *  For overall statistical pData
+ */
+typedef struct TagStatData {
+
+// Quality
+SStatQuality    sQualityStat;
+
+// Complexity
+SComplexityStat sComplexityStat;
+
+// SSlice information output
+SStatSliceInfo  sSliceData;
+
+} SStatData;
+
+}
+
+#endif//WELS_ENCODER_STATISTICAL_DATA_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_base_layer_md.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_base_layer_md.h
new file mode 100644
index 0000000000..c600f779ba
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_base_layer_md.h
@@ -0,0 +1,102 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_base_layer_md.h
+ *
+ * \brief   mode decision
+ *
+ * \date    2009.08.10 Created
+ *
+ *************************************************************************************
+ */
+#ifndef SVC_BASE_LAYER_MACROBLOCK_MODE_DECISION_H__
+#define SVC_BASE_LAYER_MACROBLOCK_MODE_DECISION_H__
+
+#include "md.h"
+#include "mb_cache.h"
+
+namespace WelsEnc {
+void WelsMdIntraInit (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, const int32_t kiSliceFirstMbXY);
+int32_t WelsMdI16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda);
+int32_t WelsMdIntraChroma (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda);
+
+int32_t WelsMdI4x4 (sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache* pMbCache);
+int32_t WelsMdI4x4Fast (sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache* pMbCache);
+
+int32_t WelsMdIntraFinePartition (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+int32_t WelsMdIntraFinePartitionVaa (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+
+void WelsMdIntraMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+
+void WelsMdBackgroundMbEnc (sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice, bool bSkipMbFlag);
+bool WelsMdPSkipEnc (sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache* pMbCache);
+int32_t WelsMdP16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb);
+
+int32_t WelsMdP16x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice);
+int32_t WelsMdP8x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice);
+int32_t WelsMdP8x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice);
+int32_t WelsMdP4x4 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, const int32_t ki8x8Idx);
+int32_t WelsMdP8x4 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, const int32_t ki8x8Idx);
+int32_t WelsMdP4x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice, const int32_t ki8x8Idx);
+/*static*/  void WelsMdInterInit (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, const int32_t kiSliceFirstMbXY);
+/*static*/ void WelsMdInterFinePartition (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
+/*static*/ void WelsMdInterFinePartitionVaa (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, int32_t bestCost);
+/*static*/ void WelsMdInterFinePartitionVaaOnScreen (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb,
+    int32_t bestCost);
+void WelsMdInterMbRefinement (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+bool WelsMdFirstIntraMode (sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache* pMbCache);
+//bool svc_md_first_intra_mode_constrained(sWelsEncCtx* pEnc, SWelsMD* pMd, SMB* pCurMb, SMbCache *pMbCache);
+void WelsMdInterMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pUnused);
+
+//both used in BL and EL
+//void wels_md_inter_init ( SWelsMD* pMd, const uint8_t ref_idx, const bool is_highest_dlayer_flag );
+
+
+
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                            bool bTrySkip);
+void WelsMdInterUpdatePskip (SDqLayer* pCurDqLayer, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
+void WelsMdInterDecidedPskip (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
+
+void WelsMdInterDoubleCheckPskip (SMB* pCurMb, SMbCache* pMbCache);
+void WelsMdInterEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
+
+void WelsMdInterSaveSadAndRefMbType (Mb_Type* pRefMbTypeList, SMbCache* pMbCache, const SMB*  kpCurMb,
+                                     const SWelsMD* kpMd);
+
+void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
+                                   SMbCache* pMbCache, const bool kbSkip);
+void WelsMdIntraSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+//end of: both used in BL and EL
+
+
+}
+#endif//WELS_MACROBLOCK_MODE_DECISION_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_frame.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_frame.h
new file mode 100644
index 0000000000..8c8db5bee8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_frame.h
@@ -0,0 +1,136 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_svc_layer.h
+#ifndef WELS_SVC_EXTENSION_LAYER_H__
+#define WELS_SVC_EXTENSION_LAYER_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "parameter_sets.h"
+#include "slice.h"
+#include "picture.h"
+#include "svc_enc_macroblock.h"
+
+
+#include "svc_enc_slice_segment.h"
+namespace WelsEnc {
+
+/*
+ *  Frame level in SVC DQLayer instead.
+ *  Dependency-Quaility layer struction definition for SVC extension of H.264/AVC
+ */
+
+///////////////////////////////////DQ Layer level///////////////////////////////////
+
+typedef struct TagDqLayer   SDqLayer;
+typedef SDqLayer*           pDqLayer;
+
+typedef struct TagFeatureSearchPreparation {
+SScreenBlockFeatureStorage*     pRefBlockFeature;//point the the ref frame storage
+
+uint16_t*       pFeatureOfBlock;                // Feature of every block (8x8), begin with the point
+uint8_t         uiFeatureStrategyIndex;// index of hash strategy
+
+/* for FME frame-level switch */
+bool bFMESwitchFlag;
+uint8_t uiFMEGoodFrameCount;
+int32_t iHighFreMbCount;
+} SFeatureSearchPreparation; //maintain only one
+
+typedef struct TagSliceBufferInfo {
+SSlice*                 pSliceBuffer;  // slice buffer for multi thread,
+int32_t                 iMaxSliceNum;
+int32_t                 iCodedSliceNum;
+}SSliceBufferInfo;
+
+typedef struct TagLayerInfo {
+SNalUnitHeaderExt       sNalHeaderExt;
+SSubsetSps*             pSubsetSpsP;    // current pSubsetSps used, memory alloc in external
+SWelsSPS*               pSpsP;          // current pSps based avc used, memory alloc in external
+SWelsPPS*               pPpsP;          // current pPps used
+} SLayerInfo;
+/* Layer Representation */
+struct TagDqLayer {
+SLayerInfo              sLayerInfo;
+SSliceBufferInfo        sSliceBufferInfo[MAX_THREADS_NUM];
+SSlice**                ppSliceInLayer;
+SSliceCtx               sSliceEncCtx;   // current slice context
+uint8_t*                pCsData[3];     // pointer to reconstructed picture pData
+int32_t                 iCsStride[3];   // Cs stride
+
+uint8_t*                pEncData[3];    // pData picture to be encoded in current layer
+int32_t                 iEncStride[3];  // pData picture stride
+
+SMB*                    sMbDataP;       // pointer to mb of mbAddr equal to 0 in slice, mb_data_ptr = mb_base_ptr + (1+iMbStride).
+int16_t                 iMbWidth;       // MB width of this picture, equal to pSps.iMbWidth
+int16_t                 iMbHeight;      // MB height of this picture, equal to pSps.iMbHeight;
+
+bool                    bBaseLayerAvailableFlag;        // whether base layer is available for prediction?
+bool                    bSatdInMdFlag; // whether SATD is calculated in ME and integer-pel MD
+
+uint8_t                 iLoopFilterDisableIdc;  // 0: on, 1: off, 2: on except for slice boundaries
+int8_t                  iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0
+int8_t                  iLoopFilterBetaOffset;  // BetaOffset:  valid range [-6, 6], default 0
+uint8_t                 uiDisableInterLayerDeblockingFilterIdc;
+int8_t                  iInterLayerSliceAlphaC0Offset;
+int8_t                  iInterLayerSliceBetaOffset;
+bool                    bDeblockingParallelFlag; //parallel_deblocking_flag
+
+SPicture*               pRefPic;        // reference picture pointer
+SPicture*               pDecPic;        // reconstruction picture pointer for layer
+SPicture*               pRefOri[MAX_REF_PIC_COUNT];
+
+bool                    bThreadSlcBufferFlag;
+bool                    bSliceBsBufferFlag;
+int32_t                 iMaxSliceNum;
+int32_t                 NumSliceCodedOfPartition[MAX_THREADS_NUM];      // for dynamic slicing mode
+int32_t                 LastCodedMbIdxOfPartition[MAX_THREADS_NUM];     // for dynamic slicing mode
+int32_t                 FirstMbIdxOfPartition[MAX_THREADS_NUM];         // for dynamic slicing mode
+int32_t                 EndMbIdxOfPartition[MAX_THREADS_NUM];           // for dynamic slicing mode
+int32_t*                pFirstMbIdxOfSlice;
+int32_t*                pCountMbNumInSlice;
+
+bool                    bNeedAdjustingSlicing;
+
+SFeatureSearchPreparation* pFeatureSearchPreparation;
+
+SDqLayer*               pRefLayer;              // pointer to referencing dq_layer of current layer to be decoded
+};
+
+///////////////////////////////////////////////////////////////////////
+
+// frame structure for svc
+typedef SDqLayer SWelsSvcFrame;
+}
+#endif//WELS_SVC_EXTENSION_LAYER_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_golomb.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_golomb.h
new file mode 100644
index 0000000000..431d2cc681
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_golomb.h
@@ -0,0 +1,123 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_enc_golomb.h
+ *
+ * \brief   Exponential Golomb entropy coding routine
+ *
+ * \date    03/13/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
+#define WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
+
+#include "wels_common_defs.h"
+#include "golomb_common.h"
+
+using namespace WelsCommon;
+
+namespace WelsEnc {
+
+/************************************************************************/
+/* GOLOMB CODIMG FOR WELS ENCODER ONLY                                  */
+/************************************************************************/
+
+
+/*
+ *  Get size of unsigned exp golomb codes
+ */
+static inline uint32_t BsSizeUE (const uint32_t kiValue) {
+if (256 > kiValue) {
+  return g_kuiGolombUELength[kiValue];
+} else {
+  uint32_t n = 0;
+  uint32_t iTmpValue = kiValue + 1;
+
+  if (iTmpValue & 0xffff0000) {
+    iTmpValue >>= 16;
+    n += 16;
+  }
+  if (iTmpValue & 0xff00) {
+    iTmpValue >>= 8;
+    n += 8;
+  }
+
+  //n += (g_kuiGolombUELength[iTmpValue] >> 1);
+  n += (g_kuiGolombUELength[iTmpValue - 1] >> 1);
+  return ((n << 1) + 1);
+
+}
+}
+
+/*
+ *  Get size of signed exp golomb codes
+ */
+static inline uint32_t BsSizeSE (const int32_t kiValue) {
+uint32_t iTmpValue;
+if (0 == kiValue) {
+  return 1;
+} else if (0 < kiValue) {
+  iTmpValue = (kiValue << 1) - 1;
+  return BsSizeUE (iTmpValue);
+} else {
+  iTmpValue = ((-kiValue) << 1);
+  return BsSizeUE (iTmpValue);
+}
+}
+
+/*
+ *  Write truncated exp golomb codes
+ */
+static inline void BsWriteTE (SBitStringAux* pBs, const int32_t kiX, const uint32_t kuiValue) {
+if (1 == kiX) {
+  BsWriteOneBit (pBs, !kuiValue);
+} else {
+  BsWriteUE (pBs, kuiValue);
+}
+}
+
+static inline int32_t BsGetBitsPos (SBitStringAux* pBs) {
+return (int32_t) (((pBs->pCurBuf - pBs->pStartBuf) << 3) + 32 - pBs->iLeftBits);
+}
+
+static inline void BsAlign( SBitStringAux* pBs )
+{
+   if( pBs->iLeftBits&7 )
+   {
+      pBs->uiCurBits <<= pBs->iLeftBits&7;
+      pBs->uiCurBits |= (1 << (pBs->iLeftBits&7)) - 1;
+      pBs->iLeftBits &= ~7;
+   }
+   BsFlush(pBs );
+}
+}
+#endif//WELS_EXPONENTIAL_GOLOMB_ENTROPY_CODING_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_macroblock.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_macroblock.h
new file mode 100644
index 0000000000..c8446f221b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_macroblock.h
@@ -0,0 +1,82 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//macroblock.h
+#ifndef WELS_MACROBLOCK_H__
+#define WELS_MACROBLOCK_H__
+
+#include "typedefs.h"
+#include "wels_const.h"
+#include "wels_common_basis.h"
+#include "macros.h"
+
+namespace WelsEnc {
+
+//struct Mb_s;
+
+/* MB syntax and context, refer to Page 399 in JVT X201wcm */
+// keep the most essential level pData structure be 64 Bytes, which matches cache line size; if so, the order with structure maybe negligible.
+// pls take care when modify MB structure size
+typedef struct TagMB {
+/*************************mb_layer() syntax and generated********************************/
+/*mb_layer():*/
+Mb_Type         uiMbType;       // including MB detailed partition type, number and type of reference list
+uint8_t         uiSubMbType[4]; // sub MB types
+int32_t         iMbXY;          // offset position of MB top left point based
+int16_t         iMbX;           // position of MB in horizontal axis [0..32767]
+int16_t         iMbY;           // position of MB in vertical axis [0..32767]
+
+uint8_t         uiNeighborAvail;        // avail && same_slice: LEFT_MB_POS:0x01, TOP_MB_POS:0x02, TOPRIGHT_MB_POS = 0x04 ,TOPLEFT_MB_POS = 0x08;
+uint8_t         uiCbp;
+
+SMVUnitXY*      sMv;
+int8_t*         pRefIndex;
+
+int32_t*        pSadCost;          // mb sad. set to 0 for intra mb
+int8_t*         pIntra4x4PredMode; // [MB_BLOCK4x4_NUM]
+int8_t*         pNonZeroCount;     // [MB_LUMA_CHROMA_BLOCK4x4_NUM]
+
+SMVUnitXY       sP16x16Mv;
+
+uint8_t         uiLumaQp;       // uiLumaQp: pPps->iInitialQp + sSliceHeader->delta_qp + mb->dquant.
+uint8_t         uiChromaQp;
+uint16_t        uiSliceIdc;     // 2^16=65536 > MaxFS(36864) of level 5.1; AVC: iFirstMbInSlice?; SVC: (iFirstMbInSlice << 7) | ((uiDependencyId << 4) | uiQualityId);
+uint32_t        uiChromPredMode;
+int32_t         iLumaDQp;
+SMVUnitXY       sMvd[MB_BLOCK4x4_NUM]; //only for CABAC writing; storage structure the same as sMv, in 4x4 scan order.
+int32_t         iCbpDc;
+//uint8_t         reserved_filling_bytes[1];      // not deleting this line for further changes of this structure. filling bytes reserved to make structure aligned with 4 bytes, higher cache hit on less structure size by 2 cache lines( 2 * 64 bytes) once hit
+} SMB, *PMb;
+
+}
+
+#endif//WELS_MACROBLOCK_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_slice_segment.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_slice_segment.h
new file mode 100644
index 0000000000..d237dc3ec8
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_enc_slice_segment.h
@@ -0,0 +1,212 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    slice_segment.h
+ *
+ * \brief   SSlice segment routine (Single slice/multiple slice/fmo arrangement exclusive)
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef WELS_SLICE_SEGMENT_H__
+#define WELS_SLICE_SEGMENT_H__
+
+#include "typedefs.h"
+#include "macros.h"
+#include "as264_common.h"
+#include "memory_align.h"
+
+#include "codec_app_def.h"
+#include "set_mb_syn_cabac.h"
+
+using namespace WelsCommon;
+
+namespace WelsEnc {
+
+
+// NOTE:
+// if PREFIX_NALs are used in base layer(iDid=0, qid=0), MAX_SLICES_NUM will be half of MAX_NAL_UNITS_IN_LAYER in case ST or MT without PACKING_ONE_SLICE_PER_LAYER
+// in case MT and PACKING_ONE_SLICE_PER_LAYER, MAX_SLICES_NUM should not be exceeding MAX_LAYER_NUM_OF_FRAME
+// for AVC cases, maximal resolution we can support up to (?x1024) for SM_ROWMB_SLICE slice mode
+// fine solution for MAX_SLICES_NUM, need us use the variable instead of MACRO for any resolution combining any multiple-slice mode adaptive
+#define SAVED_NALUNIT_NUM                       ( (MAX_SPATIAL_LAYER_NUM*MAX_QUALITY_LAYER_NUM) + 1 + MAX_SPATIAL_LAYER_NUM ) // SPS/PPS + SEI/SSEI + PADDING_NAL
+#define MAX_SLICES_NUM                          ( ( MAX_NAL_UNITS_IN_LAYER - SAVED_NALUNIT_NUM ) / 3 )  // Also MAX_SLICES_NUM need constrained by implementation: uiSliceIdc allocated in SSliceCtx.pOverallMbMap need a byte range as expected
+#define AVERSLICENUM_CONSTRAINT         (MAX_SLICES_NUM)                        // used in sNalList initialization,
+
+#define MIN_NUM_MB_PER_SLICE                    48                                                      // (128/16 * 96/16), addressing the lowest resolution for multiple slicing is 128x96 above
+
+#define DEFAULT_MAXPACKETSIZE_CONSTRAINT        (1200)          //in bytes
+//#define MINPACKETSIZE_CONSTRAINT                (1200)
+
+#define AVER_MARGIN_BYTES                       ( 100 ) //in bytes
+#define JUMPPACKETSIZE_CONSTRAINT(max_byte)             ( max_byte - AVER_MARGIN_BYTES ) //in bytes
+#define JUMPPACKETSIZE_JUDGE(len,mb_idx,max_byte)       ( (len) > JUMPPACKETSIZE_CONSTRAINT(max_byte) ) //( (mb_idx+1)%40/*16slice for compare*/ == 0 )        //
+//cur_mb_idx is for early tests, can be omit in optimization
+typedef struct TagSlice      SSlice;
+typedef struct TagDqLayer    SDqLayer;
+typedef struct TagWelsEncCtx sWelsEncCtx;
+/*!
+ * \brief   SSlice context
+ */
+/* Single/multiple slices */
+typedef struct SlicepEncCtx_s {
+SliceModeEnum           uiSliceMode;            /* 0: single slice in frame; 1: multiple slices in frame; */
+int16_t                 iMbWidth;               /* width of picture size in mb */
+int16_t                 iMbHeight;              /* height of picture size in mb */
+int32_t                 iSliceNumInFrame;       /* count number of slices in frame; */
+int32_t                 iMbNumInFrame;          /* count number of MBs in frame */
+uint16_t*               pOverallMbMap;          /* overall MB map in frame, store virtual slice idc; */
+uint32_t                uiSliceSizeConstraint;  /* in byte */
+int32_t                 iMaxSliceNumConstraint; /* maximal number of slices constraint */
+
+} SSliceCtx;
+
+
+typedef struct TagDynamicSlicingStack {
+int32_t         iStartPos;
+int32_t         iCurrentPos;
+
+uint8_t*        pBsStackBufPtr; // current writing position
+uint32_t        uiBsStackCurBits;
+int32_t         iBsStackLeftBits;
+
+SCabacCtx       sStoredCabac;
+int32_t         iMbSkipRunStack;
+uint8_t         uiLastMbQp;
+uint8_t*        pRestoreBuffer;
+} SDynamicSlicingStack;
+
+/*!
+ * \brief   Initialize Wels SSlice context (Single/multiple slices and FMO)
+ *
+ * \param   pCurDq          current layer which its SSlice context will be initialized
+ * \param   bFmoUseFlag     flag of using fmo
+ * \param   iMbWidth        MB width
+ * \param   iMbHeight       MB height
+ * \param   uiSliceMode     slice mode
+ * \param   mul_slice_arg   argument for multiple slice if it is applicable
+ * \param   pPpsArg         argument for pPps parameter
+ *
+ * \return  0 - successful; none 0 - failed;
+ */
+int32_t InitSlicePEncCtx (SDqLayer* pCurDq,
+                          CMemoryAlign* pMa,
+                          bool bFmoUseFlag,
+                          int32_t iMbWidth,
+                          int32_t iMbHeight,
+                          SSliceArgument* pSliceArgument,
+                          void* pPpsArg);
+
+
+/*!
+ * \brief   Uninitialize Wels SSlice context (Single/multiple slices and FMO)
+ *
+ * \param   pCurDq       curent layer which its SSlice context will be initialized
+ *
+ * \return  NONE;
+ */
+void UninitSlicePEncCtx (SDqLayer* pCurDq, CMemoryAlign* pMa);
+
+/*!
+ * \brief   Get slice idc for given iMbXY (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq    current layer info
+ * \param   kiMbXY    MB xy index
+ *
+ * \return  uiSliceIdc - successful; (uint8_t)(-1) - failed;
+ */
+uint16_t WelsMbToSliceIdc (SDqLayer* pCurDq, const int32_t kiMbXY);
+
+/*!
+ * \brief   Get first mb in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurLayer       current layer
+ * \param   kiSliceIdc      slice idc
+ *
+ * \return  first_mb - successful; -1 - failed;
+ */
+int32_t WelsGetFirstMbOfSlice (SDqLayer* pCurLayer, const int32_t kiSliceIdc);
+
+/*!
+ * \brief   Get successive mb to be processed in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq       current layer info
+ * \param   kiMbXY       MB xy index
+ *
+ * \return  next_mb - successful; -1 - failed;
+ */
+int32_t WelsGetNextMbOfSlice (SDqLayer* pCurDq, const int32_t kiMbXY);
+
+/*!
+ * \brief   Get previous mb to be processed in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq          current layer info
+ * \param   kiMbXY          MB xy index
+ *
+ * \return  prev_mb - successful; -1 - failed;
+ */
+int32_t WelsGetPrevMbOfSlice (SDqLayer* pCurDq, const int32_t kiMbXY);
+
+/*!
+ * \brief   Get number of mb in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq          current layer info
+ * \param   pSlice          slice which request slice num
+ * \param   kiSliceIdc      slice/slice_group idc
+ *
+ * \return  count_num_of_mb - successful; -1 - failed;
+ */
+int32_t WelsGetNumMbInSlice (SDqLayer* pCurDq, SSlice* pSlice, const int32_t kuiSliceIdc);
+
+/*!
+ *  Get slice count for multiple slice segment
+ *
+ */
+int32_t GetInitialSliceNum (SSliceArgument* pSliceArgument);
+int32_t GetCurrentSliceNum (const SDqLayer* pCurDq);
+SSlice* GetSliceByIndex(sWelsEncCtx* pCtx, const int32_t kiSliceIdc);
+
+//checking valid para
+int32_t DynamicMaxSliceNumConstraint (uint32_t uiMaximumNum, int32_t uiConsumedNum, uint32_t uiDulplicateTimes);
+
+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame,  SSliceArgument* pSliceArg);
+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg);
+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth,  SSliceArgument* pSliceArg);
+
+bool GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum);
+bool GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight,  SSliceArgument* pSliceArg);
+//end of checking valid para
+
+int32_t DynamicAdjustSlicePEncCtxAll (SDqLayer* pCurDq,
+                                      int32_t* pRunLength);
+}
+#endif//WELS_SLICE_SEGMENT_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_mb.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_mb.h
new file mode 100644
index 0000000000..6408e637ed
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_mb.h
@@ -0,0 +1,63 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encode_mb.h
+ *
+ * \brief   interface for mb encoding
+ *
+ * \date    5/21/2009 Created
+ *
+ *************************************************************************************
+ */
+#if !defined(ENCODE_MB_H)
+#define ENCODE_MB_H
+
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "slice.h"
+#include "encoder_context.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+void WelsDctMb (int16_t* pRs, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4);
+
+void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
+void WelsEncRecI4x4Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, uint8_t uiI4x4Idx);
+void WelsEncInterY (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache);
+void WelsEncRecUV (SWelsFuncPtrList* func, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRs, int32_t iUV);
+void WelsRecPskip (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SMB* pCurMb, SMbCache* pMbCache);
+
+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
+bool WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV);
+}
+#endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_slice.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_slice.h
new file mode 100644
index 0000000000..a1de2c554a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_encode_slice.h
@@ -0,0 +1,184 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_encode_slice.h
+ *
+ * \brief   svc encoding slice
+ *
+ * \date    2009.07.27 Created
+ *
+ *************************************************************************************
+ */
+#ifndef SVC_ENCODE_SLICE_H__
+#define SVC_ENCODE_SLICE_H__
+
+#include "encoder_context.h"
+#include "as264_common.h"
+#include "svc_enc_macroblock.h"
+#include "mb_cache.h"
+
+namespace WelsEnc {
+#if defined(MB_TYPES_CHECK)
+void WelsCountMbType (int32_t (*iMbCount)[18], const EWelsSliceType eSt, const SMB* pMb);
+#endif
+
+void UpdateMbNeighbor(SDqLayer* pCurDq, SMB* pMb, const int32_t kiMbWidth, uint16_t uiSliceIdc);
+
+void UpdateNonZeroCountCache (SMB* pMb, SMbCache* pMbCache);
+
+//for P SSlice (intra part + inter part, MB level)
+void OutputPMbWithoutConstructCsRsNoCopy (sWelsEncCtx* pEncCtx, SDqLayer* pDq, SSlice* pSlice, SMB* pMb);
+
+void WelsSliceHeaderScalExtInit (SDqLayer* pCurLayer, SSlice* pSlice);
+void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* pSlice);
+
+void WelsSliceHeaderWrite (SBitStringAux* pBs, SDqLayer* pCurLayer, SSlice* pSlice, uint32_t uiPpsIdBasis);
+void WelsSliceHeaderExtWrite (SBitStringAux* pBs, SDqLayer* pCurLayer, SSlice* pSlice, uint32_t uiPpsIdBasis);
+
+//===================MB-leve encode====================//
+void WelsInterMbEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb); //only for inter part
+//for I SSlice (only intra part, MB level)
+void WelsIMbChromaEncode (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache);
+//for P SSlice (intra part + inter part, MB level)
+void WelsPMbChromaEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
+
+
+//===================MB-level encode====================//
+//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
+int32_t WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice,  const bool kbIsHighestDlayerFlag);
+int32_t WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice,  const bool kbIsHighestDlayerFlag);
+
+//encapsulation func: store base rec, highest Dependency Layer(only one quality) rec, single layer rec
+int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice);         // for intra non-dynamic slice
+int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice);  // for intra dynamic slice
+
+//slice buffer init, allocate/re-allocate and free process
+int32_t AllocMbCacheAligned (SMbCache* pMbCache, CMemoryAlign* pMa);
+void FreeMbCache (SMbCache* pMbCache, CMemoryAlign* pMa);
+
+int32_t InitSliceBoundaryInfo (SDqLayer* pCurLayer,
+                               SSliceArgument* pSliceArgument,
+                               const int32_t kiSliceNumInFrame);
+
+int32_t SetSliceBoundaryInfo(SDqLayer* pCurLayer, SSlice* pSlice, const int32_t kiSliceIdx);
+
+int32_t AllocateSliceMBBuffer (SSlice* pSlice, CMemoryAlign* pMa);
+
+int32_t InitSliceBsBuffer (SSlice* pSlice,
+                           SBitStringAux* pBsWrite,
+                           bool bIndependenceBsBuffer,
+                           const int32_t iMaxSliceBufferSize,
+                           CMemoryAlign* pMa);
+
+void FreeSliceBuffer (SSlice*& pSliceList,
+                      const int32_t kiMaxSliceNum,
+                      CMemoryAlign* pMa,
+                      const char* kpTag);
+
+void InitSliceHeadWithBase (SSlice* pSlice, SSlice* pBaseSlice);
+
+void InitSliceRefInfoWithBase (SSlice* pSlice, SSlice* pBaseSlice, const uint8_t kuiRefCount);
+
+int32_t InitSliceList (SSlice*& pSliceList,
+                       SBitStringAux* pBsWrite,
+                       const int32_t kiMaxSliceNum,
+                       const int32_t kiMaxSliceBufferSize,
+                       const bool bIndependenceBsBuffer,
+                       CMemoryAlign* pMa);
+
+int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx);
+
+int32_t InitOneSliceInThread (sWelsEncCtx* pCtx,
+                              SSlice*& pSlice,
+                              const int32_t kiSlcBuffIdx,
+                              const int32_t kiDlayerIdx,
+                              const int32_t kiSliceIdx);
+
+int32_t InitSliceInLayer (sWelsEncCtx* pCtx,
+                          SDqLayer* pDqLayer,
+                          const int32_t kiDlayerIndex,
+                          CMemoryAlign* pMa);
+
+int32_t ReallocateSliceList (sWelsEncCtx* pCtx,
+                             SSliceArgument* pSliceArgument,
+                             SSlice*& pSliceList,
+                             const int32_t kiMaxSliceNumOld,
+                             const int32_t kiMaxSliceNumNew);
+
+int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx,
+                                 SDqLayer* pDqLayer,
+                                 const int32_t kiDlayerIdx,
+                                 const int32_t KiSlcBuffIdx);
+
+int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx);
+
+int32_t GetCurLayerNalCount(const SDqLayer* pCurDq, const int32_t kiCodedSliceNum);
+int32_t GetTotalCodedNalCount(SFrameBSInfo* pFbi);
+
+int32_t FrameBsRealloc (sWelsEncCtx* pCtx,
+                        SFrameBSInfo* pFrameBsInfo,
+                        SLayerBSInfo* pLayerBsInfo,
+                        const int32_t kiMaxSliceNumOld);
+
+int32_t ReOrderSliceInLayer(sWelsEncCtx* pCtx,
+                            const SliceModeEnum kuiSliceMode,
+                            const int32_t kiThreadNum);
+
+int32_t SliceLayerInfoUpdate (sWelsEncCtx* pCtx,
+                              SFrameBSInfo* pFrameBsInfo,
+                              SLayerBSInfo* pLayerBsInfo,
+                              const SliceModeEnum kuiSliceMode);
+
+//slice encoding process
+int32_t WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice);
+int32_t WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice);
+
+int32_t WelsCodeOneSlice (sWelsEncCtx* pEncCtx, SSlice* pCurSlice,
+                          const int32_t keNalType);
+
+void WelsInitSliceEncodingFuncs (uint32_t uiCpuFlag);
+
+void UpdateMbNeighbourInfoForNextSlice (SDqLayer* pCurDq,
+                                        SMB* pMbList,
+                                        const int32_t kiNextSliceFirstMbIdx,
+                                        const int32_t kiLastMbIdxInPartition);
+void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+                       int32_t iNextSliceFirstMbIdx, const int32_t kiLastMbIdxInPartition);
+int32_t WelsMdInterMbLoop (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pMd,
+                           const int32_t kiSliceFirstMbXY); // for inter non-dynamic slice
+int32_t WelsMdInterMbLoopOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pMd,
+    const int32_t kiSliceFirstMbXY); // for inter dynamic slice
+
+
+bool DynSlcJudgeSliceBoundaryStepBack (void* pEncCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+                                       SDynamicSlicingStack* pDss);
+}
+#endif //SVC_ENCODE_SLICE_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_mode_decision.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_mode_decision.h
new file mode 100644
index 0000000000..c45c80151b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_mode_decision.h
@@ -0,0 +1,94 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_mode_decision.h
+ *
+ * \brief   SVC Spatial Enhancement Layer MD
+ *
+ * \date    2009.7.29 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef SVC_MODE_DECISION_H
+#define SVC_MODE_DECISION_H
+#include "encoder_context.h"
+#include "svc_encode_mb.h"
+#include "svc_encode_slice.h"
+#include "svc_enc_macroblock.h"
+#include "md.h"
+
+
+namespace WelsEnc {
+////////////////////////
+// INTERFACE, called by svc_encode_slice.c
+///////////////////////
+#define DELTA_QP_SCD_THD 5
+
+typedef enum {
+STATIC,
+SCROLLED
+} ESkipModes;
+
+// NOILP ILFMD ENTRANCE
+void WelsMdSpatialelInterMbIlfmdNoilp (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
+                                       const Mb_Type kuiRefMbType);
+void WelsMdInterMbEnhancelayer (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache);
+SMB* GetRefMb (SDqLayer* pCurLayer, SMB* pCurMb);
+void SetMvBaseEnhancelayer (SWelsMD* pMd, SMB* pCurMb, const SMB* kpRefMb);
+
+//////////////
+// MD from background detection
+//////////////
+bool WelsMdInterJudgeBGDPskip (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                               bool* bKeepSkip);
+bool WelsMdInterJudgeBGDPskipFalse (sWelsEncCtx* pEnc, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                                    bool* bKeepSkip);
+
+void WelsMdUpdateBGDInfo (SDqLayer* pCurLayer,  SMB* pCurMb, const bool kbCollocatedPredFlag,
+                               const int32_t kiRefPictureType);
+void WelsMdUpdateBGDInfoNULL (SDqLayer* pCurLayer,  SMB* pCurMb, const bool kbCollocatedPredFlag,
+                                   const int32_t kiRefPictureType);
+
+//////////////
+// MD for screen contents
+//////////////
+bool MdInterSCDPskipProcess (sWelsEncCtx* pEncCtx, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                             ESkipModes eSkipMode);
+typedef bool (*pJudgeSkipFun) (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, SWelsMD* pWelsMd);
+void SetBlockStaticIdcToMd (void* pVaa, void* pMd, SMB* pCurMb, void* pDqLay);
+void WelsInitSCDPskipFunc (SWelsFuncPtrList* pFuncList, const bool bScrollingDetection);
+
+void SetScrollingMvToMd (SVAAFrameInfo* pVaa, SWelsMD* pWelsMd);
+void SetScrollingMvToMdNull (SVAAFrameInfo* pVaa, SWelsMD* pWelsMd);
+}
+#endif //SVC_MODE_DECISION_H
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_motion_estimate.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_motion_estimate.h
new file mode 100644
index 0000000000..dbfbc3c287
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_motion_estimate.h
@@ -0,0 +1,359 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file  svc motion estimate.h
+ *
+ * \brief  Interfaces introduced in svc mb motion estimation
+ *
+ * \date  08/11/2009 Created
+ *
+ *************************************************************************************
+ */
+#ifndef SVC_MOTION_ESTIMATE_
+#define SVC_MOTION_ESTIMATE_
+
+#include "typedefs.h"
+#include "encoder_context.h"
+#include "wels_func_ptr_def.h"
+
+namespace WelsEnc {
+#define CAMERA_STARTMV_RANGE (64)
+#define  ITERATIVE_TIMES  (16)
+#define CAMERA_MV_RANGE (CAMERA_STARTMV_RANGE+ITERATIVE_TIMES)
+#define CAMERA_MVD_RANGE  ((CAMERA_MV_RANGE+1)<<1) //mvd=mv_range*2;
+#define  BASE_MV_MB_NMB  ((2*CAMERA_MV_RANGE/MB_WIDTH_LUMA)-1)
+#define CAMERA_HIGHLAYER_MVD_RANGE (243)//mvd range;
+#define EXPANDED_MV_RANGE (504) //=512-8 rather than 511 to sacrifice same edge point but save complexity in assemblys
+#define EXPANDED_MVD_RANGE ((504+1)<<1)
+
+enum {
+ME_DIA    = 0x01,  // LITTLE DIAMOND= 0x01
+ME_CROSS  = 0x02,  // CROSS=  0x02
+ME_FME    = 0x04,  // FME = 0x04
+ME_FULL    = 0x10,  // FULL
+
+// derived ME methods combination
+ME_DIA_CROSS    = (ME_DIA | ME_CROSS),   // DIA+CROSS
+ME_DIA_CROSS_FME  = (ME_DIA_CROSS | ME_FME)  // DIA+CROSS+FME
+};
+
+union SadPredISatdUnit {
+uint32_t  uiSadPred;
+uint32_t  uiSatd;    //reuse the sad_pred as a temp satd pData
+};
+typedef struct TagWelsME {
+/* input */
+uint16_t*          pMvdCost;
+union SadPredISatdUnit  uSadPredISatd; //reuse the sad_pred as a temp pData
+uint32_t
+uiSadCost;  //used by ME and RC //max SAD should be max_delta*size+lambda*mvdsize = 255*256+91*33*2 = 65280 + 6006 = 71286 > (2^16)-1 = 65535
+uint32_t          uiSatdCost; /* satd + lm * nbits */
+uint32_t          uiSadCostThreshold;
+int32_t            iCurMeBlockPixX;
+int32_t            iCurMeBlockPixY;
+uint8_t            uiBlockSize;   /* BLOCK_WxH */
+uint8_t            uiReserved;
+
+uint8_t*            pEncMb;
+uint8_t*            pRefMb;
+uint8_t*            pColoRefMb;
+
+SMVUnitXY          sMvp;
+SMVUnitXY          sMvBase;
+SMVUnitXY          sDirectionalMv;
+
+SScreenBlockFeatureStorage* pRefFeatureStorage;
+
+/* output */
+SMVUnitXY          sMv;
+} SWelsME;
+
+typedef struct TagFeatureSearchIn {
+PSampleSadSatdCostFunc pSad;
+
+uint32_t* pTimesOfFeature;
+uint16_t** pQpelLocationOfFeature;
+uint16_t* pMvdCostX;
+uint16_t* pMvdCostY;
+
+uint8_t* pEnc;
+uint8_t* pColoRef;
+int32_t iEncStride;
+int32_t iRefStride;
+uint16_t uiSadCostThresh;
+
+int32_t iFeatureOfCurrent;
+
+int32_t iCurPixX;
+int32_t iCurPixY;
+int32_t iCurPixXQpel;
+int32_t iCurPixYQpel;
+
+int32_t iMinQpelX;
+int32_t iMinQpelY;
+int32_t iMaxQpelX;
+int32_t iMaxQpelY;
+} SFeatureSearchIn;
+
+typedef struct TagFeatureSearchOut {
+SMVUnitXY sBestMv;
+uint32_t uiBestSadCost;
+uint8_t* pBestRef;
+} SFeatureSearchOut;
+
+#define  COST_MVD(table, mx, my)  (table[mx] + table[my])
+extern const int32_t QStepx16ByQp[52];
+
+// Function definitions below
+
+void WelsInitMeFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag, bool bScreenContent);
+
+/*!
+ * \brief  BL mb motion estimate search
+ *
+ * \param  enc      Wels encoder context
+ * \param  m          Wels me information
+ *
+ * \return  NONE
+ */
+void WelsMotionEstimateSearch (SWelsFuncPtrList* pFuncList, SDqLayer* pLplayer, SWelsME* pLpme, SSlice* pLpslice);
+void WelsMotionEstimateSearchStatic (SWelsFuncPtrList* pFuncList, SDqLayer* pLplayer, SWelsME* pLpme, SSlice* pLpslice);
+void WelsMotionEstimateSearchScrolled (SWelsFuncPtrList* pFuncList, SDqLayer* pLplayer, SWelsME* pLpme, SSlice* pLpslice);
+/*!
+ * \brief  BL mb motion estimate initial point testing
+ *
+ * \param  enc      Wels encoder context
+ * \param  m          Wels me information
+ * \param  mv_range  search range in motion estimate
+ * \param  point      the best match point in motion estimation
+ *
+ * \return  NONE
+ */
+
+
+/*!
+ * \brief  EL mb motion estimate initial point testing
+ *
+ * \param  pix_func  SSampleDealingFunc
+ * \param  m          Wels me information
+ * \param  mv_range  search range in motion estimate
+ * \param  point      the best match point in motion estimation
+ *
+ * \return  NONE
+ */
+
+bool WelsMotionEstimateInitialPoint (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                                     const int32_t kiStrideEnc, const int32_t kiStrideRef);
+
+/*!
+ * \brief  mb iterative motion estimate search
+ *
+ * \param  enc      Wels encoder context
+ * \param  m          Wels me information
+ * \param  point      the best match point in motion estimation
+ *
+ * \return  NONE
+ */
+void WelsDiamondSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice, const int32_t kiEncStride,
+                        const int32_t kiRefStride);
+
+bool WelsMeSadCostSelect (int32_t* pSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+                          const int32_t kiDy, int32_t* pIx, int32_t* pIy);
+
+void CalculateSatdCost (PSampleSadSatdCostFunc pSatd, SWelsME* pMe, const int32_t kiEncStride, const int32_t kiRefStride);
+void NotCalculateSatdCost (PSampleSadSatdCostFunc pSatd, SWelsME* pMe, const int32_t kiEncStride,
+                           const int32_t kiRefStride);
+bool CheckDirectionalMv (PSampleSadSatdCostFunc pSad, SWelsME* pMe,
+                         const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv, const int32_t kiEncStride, const int32_t kiRefStride,
+                         int32_t& iBestSadCost);
+bool CheckDirectionalMvFalse (PSampleSadSatdCostFunc pSad, SWelsME* pMe,
+                              const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv, const int32_t kiEncStride, const int32_t kiRefStride,
+                              int32_t& iBestSadCost);
+
+// Cross Search Basics
+void LineFullSearch_c (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                       uint16_t* pMvdTable,
+                       const int32_t kiEncStride, const int32_t kiRefStride,
+                       const int16_t kiMinMv, const int16_t kiMaxMv,
+                       const bool bVerticalSearch);
+#ifdef X86_ASM
+extern "C"
+{
+uint32_t SampleSad8x8Hor8_sse41 (uint8_t*, int32_t, uint8_t*, int32_t, uint16_t*, int32_t*);
+uint32_t SampleSad16x16Hor8_sse41 (uint8_t*, int32_t, uint8_t*, int32_t, uint16_t*, int32_t*);
+}
+
+void VerticalFullSearchUsingSSE41 (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                                   uint16_t* pMvdTable,
+                                   const int32_t kiEncStride, const int32_t kiRefStride,
+                                   const int16_t kiMinMv, const int16_t kiMaxMv,
+                                   const bool bVerticalSearch);
+void HorizontalFullSearchUsingSSE41 (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                                     uint16_t* pMvdTable,
+                                     const int32_t kiEncStride, const int32_t kiRefStride,
+                                     const int16_t kiMinMv, const int16_t kiMaxMv,
+                                     const bool bVerticalSearch);
+#endif
+void WelsMotionCrossSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                            const int32_t kiEncStride, const int32_t kiRefStride);
+void WelsDiamondCrossSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                             const int32_t kiEncStride, const int32_t kiRefStride);
+
+// Feature Search Basics
+#define LIST_SIZE_SUM_16x16 0x0FF01  //(256*255+1)
+#define LIST_SIZE_SUM_8x8     0x03FC1  //(64*255+1)
+#define LIST_SIZE_MSE_16x16 0x00878  //(avg+mse)/2, max= (255+16*255)/2
+
+#define FME_DEFAULT_FEATURE_INDEX (0)
+#define FMESWITCH_DEFAULT_GOODFRAME_NUM (2)
+#define FMESWITCH_MBSAD_THRESHOLD   30 // empirically set.
+
+void InitializeHashforFeature_c (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+                                 uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+void FillQpelLocationByFeatureValue_c (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight,
+                                       uint16_t** pFeatureValuePointerList);
+int32_t SumOf8x8SingleBlock_c (uint8_t* pRef, const int32_t kiRefStride);
+int32_t SumOf16x16SingleBlock_c (uint8_t* pRef, const int32_t kiRefStride);
+void SumOf8x8BlockOfFrame_c (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                             const int32_t kiRefStride,
+                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf16x16BlockOfFrame_c (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                               const int32_t kiRefStride,
+                               uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+
+#ifdef X86_ASM
+extern "C"
+{
+void InitializeHashforFeature_sse2 (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+                                     uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+void FillQpelLocationByFeatureValue_sse2 (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight,
+                                           uint16_t** pFeatureValuePointerList);
+int32_t SumOf8x8SingleBlock_sse2 (uint8_t* pRef, const int32_t kiRefStride);
+int32_t SumOf16x16SingleBlock_sse2 (uint8_t* pRef, const int32_t kiRefStride);
+void SumOf8x8BlockOfFrame_sse2 (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                const int32_t kiRefStride, uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf16x16BlockOfFrame_sse2 (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                const int32_t kiRefStride, uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf8x8BlockOfFrame_sse4 (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                const int32_t kiRefStride, uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf16x16BlockOfFrame_sse4 (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                const int32_t kiRefStride, uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+}
+#endif
+#ifdef HAVE_NEON
+extern "C"
+{
+void InitializeHashforFeature_neon (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+                                    uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+void FillQpelLocationByFeatureValue_neon (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight,
+                                          uint16_t** pFeatureValuePointerList);
+int32_t SumOf8x8SingleBlock_neon (uint8_t* pRef, const int32_t kiRefStride);
+int32_t SumOf16x16SingleBlock_neon (uint8_t* pRef, const int32_t kiRefStride);
+void SumOf8x8BlockOfFrame_neon (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                                const int32_t kiRefStride,
+                                uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf16x16BlockOfFrame_neon (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                                  const int32_t kiRefStride,
+                                  uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+}
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+extern "C"
+{
+void InitializeHashforFeature_AArch64_neon (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+                                    uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+void FillQpelLocationByFeatureValue_AArch64_neon (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight,
+                                          uint16_t** pFeatureValuePointerList);
+int32_t SumOf8x8SingleBlock_AArch64_neon (uint8_t* pRef, const int32_t kiRefStride);
+int32_t SumOf16x16SingleBlock_AArch64_neon (uint8_t* pRef, const int32_t kiRefStride);
+void SumOf8x8BlockOfFrame_AArch64_neon (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                                const int32_t kiRefStride,
+                                uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+void SumOf16x16BlockOfFrame_AArch64_neon (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                                  const int32_t kiRefStride,
+                                  uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+}
+#endif
+int32_t RequestScreenBlockFeatureStorage (CMemoryAlign* pMa, const int32_t kiFrameWidth,  const int32_t kiFrameHeight,
+    const int32_t iNeedFeatureStorage,
+    SScreenBlockFeatureStorage* pScreenBlockFeatureStorage);
+int32_t ReleaseScreenBlockFeatureStorage (CMemoryAlign* pMa, SScreenBlockFeatureStorage* pScreenBlockFeatureStorage);
+int32_t RequestFeatureSearchPreparation (CMemoryAlign* pMa, const int32_t kiFrameWidth,  const int32_t kiFrameHeight,
+    const int32_t iNeedFeatureStorage,
+    SFeatureSearchPreparation* pFeatureSearchPreparation);
+int32_t ReleaseFeatureSearchPreparation (CMemoryAlign* pMa, uint16_t*& pFeatureOfBlock);
+
+#define FMESWITCH_DEFAULT_GOODFRAME_NUM (2)
+#define FME_DEFAULT_FEATURE_INDEX (0)
+
+
+void PerformFMEPreprocess (SWelsFuncPtrList* pFunc, SPicture* pRef, uint16_t* pFeatureOfBlock,
+                           SScreenBlockFeatureStorage* pScreenBlockFeatureStorage);
+bool SetFeatureSearchIn (SWelsFuncPtrList* pFunc,  const SWelsME& sMe,
+                         const SSlice* pSlice, SScreenBlockFeatureStorage* pRefFeatureStorage,
+                         const int32_t kiEncStride, const int32_t kiRefStride,
+                         SFeatureSearchIn* pFeatureSearchIn);
+void MotionEstimateFeatureFullSearch (SFeatureSearchIn& sFeatureSearchIn,
+                                      const uint32_t kuiMaxSearchPoint,
+                                      SWelsME* pMe);
+void UpdateFMESwitch (SDqLayer* pCurLayer);
+void UpdateFMESwitchNull (SDqLayer* pCurLayer);
+
+void WelsDiamondCrossFeatureSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                                    const int32_t kiEncStride, const int32_t kiRefStride);
+
+//inline functions
+inline void SetMvWithinIntegerMvRange (const int32_t kiMbWidth, const int32_t kiMbHeight, const int32_t kiMbX,
+                                       const int32_t kiMbY,
+                                       const int32_t kiMaxMvRange,
+                                       SMVUnitXY* pMvMin, SMVUnitXY* pMvMax) {
+pMvMin->iMvX = WELS_MAX (-1 * ((kiMbX + 1) * (1 << 4)) + INTPEL_NEEDED_MARGIN, -1 * kiMaxMvRange);
+pMvMin->iMvY = WELS_MAX (-1 * ((kiMbY + 1) * (1 << 4)) + INTPEL_NEEDED_MARGIN, -1 * kiMaxMvRange);
+pMvMax->iMvX = WELS_MIN (((kiMbWidth - kiMbX) * (1 << 4)) - INTPEL_NEEDED_MARGIN, kiMaxMvRange);
+pMvMax->iMvY = WELS_MIN (((kiMbHeight - kiMbY) * (1 << 4)) - INTPEL_NEEDED_MARGIN, kiMaxMvRange);
+}
+
+inline bool CheckMvInRange (const SMVUnitXY ksCurrentMv, const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv) {
+return (CheckInRangeCloseOpen (ksCurrentMv.iMvX, ksMinMv.iMvX, ksMaxMv.iMvX)
+        && CheckInRangeCloseOpen (ksCurrentMv.iMvY, ksMinMv.iMvY, ksMaxMv.iMvY));
+}
+//FME switch related
+inline bool CalcFMESwitchFlag (const uint8_t uiFMEGoodFrameCount, const int32_t iHighFreMbPrecentage,
+                               const int32_t iAvgMbSAD, const bool bScrollingDetected) {
+return (bScrollingDetected || (uiFMEGoodFrameCount > 0 && iAvgMbSAD > FMESWITCH_MBSAD_THRESHOLD));
+//TODO: add the logic of iHighFreMbPrecentage
+//return ( iHighFreMbPrecentage > 2
+//            && ( bScrollingDetected || iHighFreMbPrecentage >15
+//            ||( uiFMEGoodFrameCount>0 && iFrameSAD > FMESWITCH_FRAMESAD_THRESHOLD ) ) );
+}
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn.h
new file mode 100644
index 0000000000..6c7c87b606
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn.h
@@ -0,0 +1,70 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_set_mb_syn.h
+ *
+ * \brief   Seting all syntax elements of mb and encoding residual with cavlc and cabac
+ *
+ * \date    2009.8.12 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef SVC_SET_MB_SYN_H_
+#define SVC_SET_MB_SYN_H_
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "encoder_context.h"
+#include "md.h"
+#include "slice.h"
+#include "set_mb_syn_cavlc.h"
+#include "set_mb_syn_cabac.h"
+
+namespace WelsEnc {
+
+
+
+int32_t WelsWriteMbResidual (SWelsFuncPtrList* pFuncList, SMbCache* sMbCacheInfo, SMB* pCurMb, SBitStringAux* pBs);
+
+void WelsSpatialWriteSubMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
+
+void WelsSpatialWriteMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
+void WelsInitSliceCabac(sWelsEncCtx* pEncCtx,SSlice* pSlice);
+void WelsCabacInit(void *pCtx);
+void WelsWriteSliceEndSyn(SSlice *pSlice,bool bEntropyCodingModeFlag);
+//for Base Layer CAVLC writing
+int32_t WelsSpatialWriteMbSyn (sWelsEncCtx* Ctx, SSlice* pSlice, SMB* pCurMb);
+int32_t WelsSpatialWriteMbSynCabac (sWelsEncCtx* pCtx, SSlice* pSlice, SMB* pCurMb);
+int32_t GetBsPosCavlc(SSlice *pSlice);
+int32_t GetBsPosCabac(SSlice *pSlice);
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
new file mode 100644
index 0000000000..076fdb477a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/svc_set_mb_syn_cavlc.h
@@ -0,0 +1,67 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_set_mb_syn_cavlc.h
+ *
+ * \brief   Seting all syntax elements of mb and decoding residual with cavlc
+ *
+ * \date    2009.8.12 Created
+ *
+ *************************************************************************************
+ */
+#ifndef SVC_SET_MB_SYN_CAVLC_H_
+#define SVC_SET_MB_SYN_CAVLC_H_
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "encoder_context.h"
+#include "md.h"
+#include "slice.h"
+#include "set_mb_syn_cavlc.h"
+#include "set_mb_syn_cabac.h"
+
+namespace WelsEnc {
+
+
+
+int32_t WelsWriteMbResidual (SWelsFuncPtrList* pFuncList, SMbCache* sMbCacheInfo, SMB* pCurMb, SBitStringAux* pBs);
+
+void WelsSpatialWriteSubMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
+
+void WelsSpatialWriteMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb);
+void WelsInitSliceCabac(sWelsEncCtx* pEncCtx,SSlice* pSlice);
+void WelsWriteSliceEndSyn(SSlice *pSlice,bool bEntropyCodingModeFlag);
+//for Base Layer CAVLC writing
+int32_t WelsSpatialWriteMbSyn (void* Ctx, SSlice* pSlice, SMB* pCurMb);
+int32_t WelsSpatialWriteMbSynCabac (void* pCtx, SSlice* pSlice, SMB* pCurMb);
+
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/vlc_encoder.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/vlc_encoder.h
new file mode 100644
index 0000000000..6b1a97b27c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/vlc_encoder.h
@@ -0,0 +1,92 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WELS_VLC_ENCODER_H__
+#define WELS_VLC_ENCODER_H__
+
+#include "svc_enc_golomb.h"
+
+/************************************************************************/
+/* VLC FOR WELS ENCODER                                                 */
+/************************************************************************/
+
+namespace WelsEnc {
+
+//g_kuiVlcCoeffToken[uiNc][total-coeff][trailing-ones][0--value, 1--bit count]
+extern const uint8_t g_kuiVlcCoeffToken[5][17][4][2];
+extern const uint8_t g_kuiVlcLevelPrefix[15][2];
+//g_kuiVlcTotalZeros[tzVlcIndex][uiTotalZeros][0--value, 1--bit count]
+extern const uint8_t g_kuiVlcTotalZeros[16][16][2];
+extern const uint8_t g_kuiVlcTotalZerosChromaDc[4][4][2];
+//add for mgs
+extern const uint8_t g_kuiVlcTotalZerosChromaDc422[8][8][2];
+//g_kuiVlcRunBefore[zeros-left][run-before][0--value, 1--bit count]
+extern const uint8_t g_kuiVlcRunBefore[8][15][2];
+extern const ALIGNED_DECLARE (uint8_t, g_kuiEncNcMapTable[18], 16);
+
+#define    CHROMA_DC_NC_OFFSET       17
+
+static inline int32_t WriteTotalCoeffTrailingones (SBitStringAux* pBs, uint8_t uiNc, uint8_t uiTotalCoeff,
+    uint8_t uiTrailingOnes) {
+const uint8_t kuiNcIdx      = g_kuiEncNcMapTable[uiNc];
+const uint8_t* kpCoeffToken = &g_kuiVlcCoeffToken[kuiNcIdx][uiTotalCoeff][uiTrailingOnes][0];
+return BsWriteBits (pBs,  kpCoeffToken[1], kpCoeffToken[0]);
+}
+
+static inline int32_t WriteTotalcoeffTrailingonesChroma (SBitStringAux* pBs, uint8_t uiTotalCoeff,
+    uint8_t uiTrailingOnes) {
+const uint8_t* kpCoeffToken = &g_kuiVlcCoeffToken[4][uiTotalCoeff][uiTrailingOnes][0];
+return BsWriteBits (pBs, kpCoeffToken[1], kpCoeffToken[0]);
+}
+
+//kuiZeroCount = level_prefix;
+static inline int32_t WriteLevelPrefix (SBitStringAux* pBs, const uint32_t kuiZeroCount) {
+BsWriteBits (pBs, kuiZeroCount + 1, 1);
+return 0;
+}
+
+static inline int32_t WriteTotalZeros (SBitStringAux* pBs, uint32_t uiTotalCoeff, uint32_t uiTotalZeros) {
+const uint8_t* kpTotalZeros = &g_kuiVlcTotalZeros[uiTotalCoeff][uiTotalZeros][0];
+return BsWriteBits (pBs, kpTotalZeros[1], kpTotalZeros[0]);
+}
+
+static inline int32_t WriteTotalZerosChromaDc (SBitStringAux* pBs, uint32_t uiTotalCoeff, uint32_t uiTotalZeros) {
+const uint8_t* kpTotalZerosChromaDc = &g_kuiVlcTotalZerosChromaDc[uiTotalCoeff][uiTotalZeros][0];
+return BsWriteBits (pBs, kpTotalZerosChromaDc[1], kpTotalZerosChromaDc[0]);
+}
+
+static inline int32_t WriteRunBefore (SBitStringAux* pBs, uint8_t uiZeroLeft, uint8_t uiRunBefore) {
+const uint8_t* kpRunBefore = &g_kuiVlcRunBefore[uiZeroLeft][uiRunBefore][0];
+return BsWriteBits (pBs, kpRunBefore[1], kpRunBefore[0]);
+}
+}
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_common_basis.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_common_basis.h
new file mode 100644
index 0000000000..ec52169c84
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_common_basis.h
@@ -0,0 +1,160 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_common_basis.h
+#ifndef WELS_COMMON_BASIS_H__
+#define WELS_COMMON_BASIS_H__
+
+#include "typedefs.h"
+#include "macros.h"
+
+#include "wels_const.h"
+
+#include "wels_common_defs.h"
+
+using namespace WelsCommon;
+
+namespace WelsEnc {
+
+typedef int32_t WelsErrorType;
+
+struct SMVUnitXY { // each 4 Bytes
+  int16_t iMvX;
+  int16_t iMvY;
+ public:
+  SMVUnitXY& sDeltaMv (const SMVUnitXY& _v0, const SMVUnitXY& _v1) {
+    iMvX = _v0.iMvX - _v1.iMvX;
+    iMvY = _v0.iMvY - _v1.iMvY;
+    return (*this);
+  };
+  SMVUnitXY& sAssignMv (const SMVUnitXY& _v0) {
+    iMvX = _v0.iMvX;
+    iMvY = _v0.iMvY;
+    return (*this);
+  };
+};
+
+typedef struct TagMVComponentUnit {             // each LIST_0/LIST_1
+  SMVUnitXY     sMotionVectorCache[5 * 6 - 1];  // Luma only: 5 x 6 - 1 = 29 D-Words
+  int8_t        iRefIndexCache[5 * 6];          // Luma only: 5 x 6 = 30 bytes
+} SMVComponentUnit, *PMVComponentUnit;
+
+
+typedef struct TagParaSetOffsetVariable {
+  int32_t       iParaSetIdDelta[MAX_DQ_LAYER_NUM/*+1*/];//mark delta between SPS_ID_in_bs and sps_id_in_encoder, can be minus, for each dq-layer
+//need not extra +1 due no MGS and FMO case so far
+  bool          bUsedParaSetIdInBs[MAX_PPS_COUNT];      //mark the used SPS_ID with 1
+  uint32_t      uiNextParaSetIdToUseInBs;               //mark the next SPS_ID_in_bs, for all layers
+} SParaSetOffsetVariable;
+
+typedef struct TagParaSetOffset {
+//in PS0 design, "sParaSetOffsetVariable" record the previous paras before current IDR, AND NEED to be stacked and recover across IDR
+  SParaSetOffsetVariable
+  sParaSetOffsetVariable[PARA_SET_TYPE]; //PARA_SET_TYPE=3; paraset_type = 0: AVC_SPS; =1: Subset_SPS; =2: PPS
+//in PSO design, "bPpsIdMappingIntoSubsetsps" uses the current para of current IDR period
+  bool
+  bPpsIdMappingIntoSubsetsps[MAX_DQ_LAYER_NUM/*+1*/];   // need not extra +1 due no MGS and FMO case so far
+
+  int32_t  iPpsIdList[MAX_DQ_LAYER_NUM][MAX_PPS_COUNT]; //index0: max pps types; index1: for differnt IDRs, if only index0=1, index1 can reach MAX_PPS_COUNT
+
+#if _DEBUG
+  int32_t  eSpsPpsIdStrategy;
+#endif
+
+  uint32_t uiNeededSpsNum;
+  uint32_t uiNeededSubsetSpsNum;
+  uint32_t uiNeededPpsNum;
+
+  uint32_t uiInUseSpsNum;
+  uint32_t uiInUseSubsetSpsNum;
+  uint32_t uiInUsePpsNum;
+} SParaSetOffset;
+
+
+
+/* Position Offset structure */
+typedef struct TagCropOffset {
+  int16_t       iCropLeft;
+  int16_t       iCropRight;
+  int16_t       iCropTop;
+  int16_t       iCropBottom;
+} SCropOffset;
+
+
+/* Transform Type */
+
+enum ETransType {
+  T_4x4     = 0,
+  T_8x8     = 1,
+  T_16x16   = 2,
+  T_PCM     = 3
+};
+
+enum EMbPosition {
+  LEFT_MB_POS           = 0x01, // A
+  TOP_MB_POS            = 0x02, // B
+  TOPRIGHT_MB_POS       = 0x04, // C
+  TOPLEFT_MB_POS        = 0x08, // D,
+  RIGHT_MB_POS          = 0x10, //  add followed four case to reuse when intra up-sample
+  BOTTOM_MB_POS         = 0x20, //
+  BOTTOMRIGHT_MB_POS    = 0x40, //
+  BOTTOMLEFT_MB_POS     = 0x80, //
+  MB_POS_A              = 0x100
+};
+
+/* MB Type & Sub-MB Type */
+typedef uint32_t Mb_Type;
+
+#define MB_LEFT_BIT             0// add to use in intra up-sample
+#define MB_TOP_BIT              1
+#define MB_TOPRIGHT_BIT         2
+#define MB_TOPLEFT_BIT          3
+#define MB_RIGHT_BIT            4
+#define MB_BOTTOM_BIT           5
+#define MB_BTMRIGHT_BIT         6
+#define MB_BTMLEFT_BIT          7
+
+#define MB_TYPE_BACKGROUND      0x00010000  // conditional BG skip_mb
+
+enum {
+  Intra4x4      = 0,
+  Intra16x16    = 1,
+  Inter16x16    = 2,
+  Inter16x8     = 3,
+  Inter8x16     = 4,
+  Inter8x8      = 5,
+  PSkip         = 6
+};
+
+
+}
+#endif//WELS_COMMON_BASIS_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_const.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_const.h
new file mode 100644
index 0000000000..741ac73e69
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_const.h
@@ -0,0 +1,174 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+//wels_const.h
+#ifndef WELS_CONST_H__
+#define WELS_CONST_H__
+
+#include "as264_common.h" //  to communicate with specific macros there, 3/18/2010
+#include "codec_app_def.h"
+#include "wels_const_common.h"
+
+/* To control number of spatial, quality and temporal layers constraint by application layer? */
+#define NUM_SPATIAL_LAYERS_CONSTRAINT
+#define NUM_QUALITY_LAYERS_CONSTRAINT
+
+
+#define STATISTICS_LOG_INTERVAL_MS (5000) // output statistics log every 5s
+
+#define INTRA_4x4_MODE_NUM              8
+#define MB_LUMA_CHROMA_BLOCK4x4_NUM     24
+
+#define MAX_PPS_COUNT_LIMITED           57// limit the max ID of PPS because of known limitation of receiver endpoints
+#define MAX_PPS_COUNT                   (MAX_PPS_COUNT_LIMITED)//in Standard is 256     // Count number of PPS
+
+#define PARA_SET_TYPE                   3 // SPS+PPS
+#define PARA_SET_TYPE_AVCSPS            0
+#define PARA_SET_TYPE_SUBSETSPS         1
+#define PARA_SET_TYPE_PPS               2
+
+#define MAX_VERTICAL_MV_RANGE           1024  //TODO, for allocate enough memory for transpose
+#define MAX_FRAME_RATE                  60      // maximal frame rate to support
+#define MIN_FRAME_RATE                  1       // minimal frame rate need support
+
+#define MAX_BIT_RATE                    INT_MAX // maximal bit rate to support
+//TODO {Sijia}: 30fps*MaxCPB in level5.1 = 30*240000*1000bits = 7 200 000 000, larger than INT_MAX which is 2147483647, but this is also very big and abnormal number, should figure out a reasonable number after discussion
+#define MIN_BIT_RATE                    1       // minimal bit rate need support
+
+#define SVC_QUALITY_BASE_QP             26
+#define MAX_SLICEGROUP_IDS              8       // Count number of SSlice Groups
+#define MAX_THREADS_NUM                 4       // assume to support up to 4 logical cores(threads)
+
+#define INTPEL_NEEDED_MARGIN            (3)  // for safe sub-pel MC
+
+#define I420_PLANES                     3
+
+#define COMPRESS_RATIO_THR (1.0f)       //set to size of the original data, which will be large enough considering MinCR
+
+#if !defined(SSEI_BUFFER_SIZE)
+#define SSEI_BUFFER_SIZE        128
+#endif//SSEI_BUFFER_SIZE
+
+#if !defined(SPS_BUFFER_SIZE)
+#define SPS_BUFFER_SIZE         32
+#endif//SPS_BUFFER_SIZE
+
+#if !defined(PPS_BUFFER_SIZE)
+#define PPS_BUFFER_SIZE         16
+#endif//PPS_BUFFER_SIZE
+
+#if !defined(MAX_MACROBLOCK_SIZE_IN_BYTE)
+#define MAX_MACROBLOCK_SIZE_IN_BYTE     400 //3200/8, 3200 is from Annex A.3.1.(n)
+#endif
+
+#define MAX_MACROBLOCK_SIZE_IN_BYTE_x2 (MAX_MACROBLOCK_SIZE_IN_BYTE<<1)
+
+#if defined(NUM_SPATIAL_LAYERS_CONSTRAINT)
+#define MAX_DEPENDENCY_LAYER            MAX_SPATIAL_LAYER_NUM   // Maximal dependency layer
+#else
+#define MAX_DEPENDENCY_LAYER            8       // Maximal dependency layer
+#endif//NUM_SPATIAL_LAYERS_CONSTRAINT
+
+//The max temporal level support is equal or less than MAX_TEMPORAL_LAYER_NUM defined @ codec_app_def.h
+#define MAX_TEMPORAL_LEVEL              MAX_TEMPORAL_LAYER_NUM  // Maximal temporal level
+
+#if defined(NUM_QUALITY_LAYERS_CONSTRAINT)
+#define MAX_QUALITY_LEVEL               MAX_QUALITY_LAYER_NUM           // Maximal quality level
+#else
+#define MAX_QUALITY_LEVEL               16      // Maximal quality level
+#endif//NUM_QUALITY_LAYERS_CONSTRAINT
+
+#if defined(MAX_GOP_SIZE)
+#undef MAX_GOP_SIZE
+#endif//MAX_GOP_SIZE
+#define MAX_GOP_SIZE    (1<<(MAX_TEMPORAL_LEVEL-1))
+
+#define MAX_SHORT_REF_COUNT             (MAX_GOP_SIZE>>1) // 16 in standard, maximal count number of short reference pictures
+#define LONG_TERM_REF_NUM               2
+#define LONG_TERM_REF_NUM_SCREEN        4
+#define MAX_REF_PIC_COUNT               16 // 32 in standard, maximal Short + Long reference pictures
+#define MIN_REF_PIC_COUNT               1               // minimal count number of reference pictures, 1 short + 2 key reference based?
+#define MAX_MULTI_REF_PIC_COUNT         1       //maximum multi-reference number
+//#define TOTAL_REF_MINUS_HALF_GOP      1       // last t0 in last gop
+#define MAX_MMCO_COUNT                  66
+
+// adjusted numbers reference picture functionality related definition
+#define MAX_REFERENCE_MMCO_COUNT_NUM            4       // adjusted MAX_MMCO_COUNT(66 in standard) definition per encoder design
+#define MAX_REFERENCE_REORDER_COUNT_NUM         2       // adjusted MAX_REF_PIC_COUNT(32 in standard) for reference reordering definition per encoder design
+#define MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA          (MAX_SHORT_REF_COUNT+LONG_TERM_REF_NUM) // <= MAX_REF_PIC_COUNT, memory saved if <
+#define MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN          (MAX_SHORT_REF_COUNT+LONG_TERM_REF_NUM_SCREEN)  // <= MAX_REF_PIC_COUNT, memory saved if <
+
+#define BASE_DEPENDENCY_ID              0
+#define MAX_DQ_LAYER_NUM                (MAX_DEPENDENCY_LAYER/**MAX_QUALITY_LEVEL*/)
+
+#define INVALID_ID                      (-1)
+
+#define NAL_HEADER_ADD_0X30BYTES        20
+
+#define SLICE_NUM_EXPAND_COEF           2
+
+enum {
+BLOCK_16x16    = 0,
+BLOCK_16x8     = 1,
+BLOCK_8x16     = 2,
+BLOCK_8x8      = 3,
+BLOCK_4x4      = 4,
+BLOCK_8x4      = 5,
+BLOCK_4x8      = 6,
+BLOCK_SIZE_ALL = 7
+};
+
+typedef enum {
+RECIEVE_UNKOWN = 0,
+RECIEVE_SUCCESS = 1,
+RECIEVE_FAILED = 2
+} LTR_MARKING_RECEIVE_STATE;
+
+enum {
+  CUR_AU_IDX    = 0,                    // index symbol for current access unit
+  SUC_AU_IDX    = 1                     // index symbol for successive access unit
+};
+
+enum {
+  ENC_RETURN_SUCCESS = 0,
+  ENC_RETURN_MEMALLOCERR = 0x01, //will free memory and uninit
+  ENC_RETURN_UNSUPPORTED_PARA = 0x02, //unsupported setting
+  ENC_RETURN_UNEXPECTED = 0x04, //unexpected value
+  ENC_RETURN_CORRECTED = 0x08, //unexpected value but corrected by encoder
+  ENC_RETURN_INVALIDINPUT = 0x10, //invalid input
+  ENC_RETURN_MEMOVERFLOWFOUND = 0x20,
+  ENC_RETURN_VLCOVERFLOWFOUND = 0x40,
+  ENC_RETURN_KNOWN_ISSUE = 0x80
+};
+//TODO: need to complete the return checking in encoder and fill in more types if needed
+
+#endif//WELS_CONST_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_func_ptr_def.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_func_ptr_def.h
new file mode 100644
index 0000000000..81d9a3723d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_func_ptr_def.h
@@ -0,0 +1,300 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// wels_func_ptr_def.h
+#ifndef WELS_ENCODER_FUNCTION_POINTERS_DEFINITION_H_
+#define WELS_ENCODER_FUNCTION_POINTERS_DEFINITION_H_
+
+#include "typedefs.h"
+#include "wels_common_basis.h"
+#include "svc_enc_macroblock.h"
+#include "mb_cache.h"
+#include "slice.h"
+#include "svc_enc_slice_segment.h"
+#include "svc_enc_frame.h"
+#include "expand_pic.h"
+#include "rc.h"
+#include "IWelsVP.h"
+#include "mc.h"
+
+namespace WelsEnc {
+
+typedef struct TagWelsEncCtx sWelsEncCtx;
+typedef struct TagWelsFuncPointerList SWelsFuncPtrList;
+typedef struct TagVAAFrameInfo SVAAFrameInfo;
+
+typedef struct TagWelsME SWelsME;
+typedef struct TagWelsMD SWelsMD;
+
+typedef void (*PSetMemoryZero) (void* pDst, int32_t iSize);
+typedef void (*PDctFunc) (int16_t* pDct, uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2);
+
+typedef void (*PCopyFunc) (uint8_t* pDst, int32_t iStrideD, uint8_t* pSrc, int32_t iStrideS);
+typedef void (*PIDctFunc) (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pRes);
+typedef void (*PDeQuantizationFunc) (int16_t* pRes, const uint16_t* kpQpTable);
+typedef void (*PDeQuantizationHadamardFunc) (int16_t* pRes, const uint16_t kuiMF);
+typedef int32_t (*PGetNoneZeroCountFunc) (int16_t* pLevel);
+
+typedef void (*PScanFunc) (int16_t* pLevel, int16_t* pDct);
+typedef int32_t (*PCalculateSingleCtrFunc) (int16_t* pDct);
+
+typedef void (*PTransformHadamard4x4Func) (int16_t* pLumaDc, int16_t* pDct);
+typedef void (*PQuantizationFunc) (int16_t* pDct, const int16_t* pFF, const int16_t* pMF);
+typedef void (*PQuantizationMaxFunc) (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax);
+typedef void (*PQuantizationDcFunc) (int16_t* pDct, int16_t iFF,  int16_t iMF);
+typedef int32_t (*PQuantizationSkipFunc) (int16_t* pDct, int16_t iFF,  int16_t iMF);
+typedef int32_t (*PQuantizationHadamardFunc) (int16_t* pRes, const int16_t kiFF, int16_t iMF, int16_t* pDct,
+    int16_t* pBlock);
+
+typedef void (*PLumaDeblockingLT4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta, int8_t* iTc);
+typedef void (*PLumaDeblockingEQ4Func) (uint8_t* iSampleY, int32_t iStride, int32_t iAlpha, int32_t iBeta);
+typedef void (*PChromaDeblockingLT4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta, int8_t* iTc);
+typedef void (*PChromaDeblockingEQ4Func) (uint8_t* iSampleCb, uint8_t* iSampleCr, int32_t iStride, int32_t iAlpha,
+    int32_t iBeta);
+typedef void (*PDeblockingBSCalc) (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
+                                   int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag);
+typedef void (*PDeblockingFilterSlice) (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SSlice* pSlice);
+
+typedef struct tagDeblockingFunc {
+  PLumaDeblockingLT4Func    pfLumaDeblockingLT4Ver;
+  PLumaDeblockingEQ4Func    pfLumaDeblockingEQ4Ver;
+  PLumaDeblockingLT4Func    pfLumaDeblockingLT4Hor;
+  PLumaDeblockingEQ4Func    pfLumaDeblockingEQ4Hor;
+
+  PChromaDeblockingLT4Func  pfChromaDeblockingLT4Ver;
+  PChromaDeblockingEQ4Func  pfChromaDeblockingEQ4Ver;
+  PChromaDeblockingLT4Func  pfChromaDeblockingLT4Hor;
+  PChromaDeblockingEQ4Func  pfChromaDeblockingEQ4Hor;
+
+  PDeblockingBSCalc         pfDeblockingBSCalc;
+
+  PDeblockingFilterSlice    pfDeblockingFilterSlice;
+} DeblockingFunc;
+
+typedef  void (*PSetNoneZeroCountZeroFunc) (int8_t* pNonZeroCount);
+
+typedef int32_t (*PIntraFineMdFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+typedef void (*PInterFineMdFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb, int32_t bestCost);
+typedef bool (*PInterMdFirstIntraModeFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache);
+
+typedef void (*PFillInterNeighborCacheFunc) (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag);
+typedef void (*PAccumulateSadFunc) (uint32_t* pSumDiff, int32_t* pGomForegroundBlockNum, int32_t* iSad8x8,
+                                    int8_t* pVaaBgMbFlag);//for RC
+typedef bool (*PDynamicSlicingStepBackFunc) (sWelsEncCtx* pEncCtx, SSlice* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+    SDynamicSlicingStack* pDynamicSlicingStack); // 2010.8.17
+
+typedef bool (*PInterMdBackgroundDecisionFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb,
+    SMbCache* pMbCache, bool* pKeepPskip);
+typedef void (*PMdBackgroundInfoUpdateFunc) (SDqLayer* pCurLayer,  SMB* pCurMb, const bool bFlag,
+    const int32_t kiRefPictureType);
+
+typedef bool (*PInterMdScrollingPSkipDecisionFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb,
+    SMbCache* pMbCache);
+typedef void (*PSetScrollingMv) (SVAAFrameInfo* pVaa, SWelsMD* pMd);
+
+typedef void (*PInterMdFunc) (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb, SMbCache* pMbCache);
+
+typedef int32_t (*PSampleSadSatdCostFunc) (uint8_t*, int32_t, uint8_t*, int32_t);
+typedef void (*PSample4SadCostFunc) (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*);
+typedef int32_t (*PIntraPred4x4Combined3Func) (uint8_t*, int32_t, uint8_t*, int32_t, uint8_t*, int32_t*, int32_t,
+    int32_t, int32_t);
+typedef int32_t (*PIntraPred16x16Combined3Func) (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*);
+typedef int32_t (*PIntraPred8x8Combined3Func) (uint8_t*, int32_t, uint8_t*, int32_t, int32_t*, int32_t, uint8_t*,
+    uint8_t*, uint8_t*);
+
+typedef uint32_t (*PSampleSadHor8Func) (uint8_t*, int32_t, uint8_t*, int32_t, uint16_t*, int32_t*);
+typedef void (*PMotionSearchFunc) (SWelsFuncPtrList* pFuncList, SDqLayer* pCurDqLayer, SWelsME* pMe,
+                                   SSlice* pSlice);
+typedef void (*PSearchMethodFunc) (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice, const int32_t kiEncStride,
+                                   const int32_t kiRefStride);
+typedef void (*PCalculateSatdFunc) (PSampleSadSatdCostFunc pSatd, SWelsME* pMe, const int32_t kiEncStride,
+                                    const int32_t kiRefStride);
+typedef bool (*PCheckDirectionalMv) (PSampleSadSatdCostFunc pSad, SWelsME* pMe,
+                                     const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv, const int32_t kiEncStride, const int32_t kiRefStride,
+                                     int32_t& iBestSadCost);
+typedef void (*PLineFullSearchFunc) (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                                     uint16_t* pMvdTable,
+                                     const int32_t kiEncStride, const int32_t kiRefStride,
+                                     const int16_t kiMinMv, const int16_t kiMaxMv,
+                                     const bool bVerticalSearch);
+typedef void (*PInitializeHashforFeatureFunc) (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+    uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+typedef void (*PFillQpelLocationByFeatureValueFunc) (uint16_t* pFeatureOfBlock, const int32_t kiWidth,
+    const int32_t kiHeight,
+    uint16_t** pFeatureValuePointerList);
+typedef void (*PCalculateBlockFeatureOfFrame) (uint8_t* pRef, const int32_t kiWidth, const int32_t kiHeight,
+    const int32_t kiRefStride,
+    uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+typedef int32_t (*PCalculateSingleBlockFeature) (uint8_t* pRef, const int32_t kiRefStride);
+typedef void (*PUpdateFMESwitch) (SDqLayer* pCurLayer);
+
+#define     MAX_BLOCK_TYPE BLOCK_SIZE_ALL
+typedef struct TagSampleDealingFunc {
+  PSampleSadSatdCostFunc            pfSampleSad[MAX_BLOCK_TYPE];
+  PSampleSadSatdCostFunc            pfSampleSatd[MAX_BLOCK_TYPE];
+  PSample4SadCostFunc                 pfSample4Sad[MAX_BLOCK_TYPE];
+  PIntraPred4x4Combined3Func      pfIntra4x4Combined3Satd;
+  PIntraPred16x16Combined3Func  pfIntra16x16Combined3Satd;
+  PIntraPred16x16Combined3Func  pfIntra16x16Combined3Sad;
+  PIntraPred8x8Combined3Func      pfIntra8x8Combined3Satd;
+  PIntraPred8x8Combined3Func      pfIntra8x8Combined3Sad;
+
+  PSampleSadSatdCostFunc*            pfMdCost;
+  PSampleSadSatdCostFunc*            pfMeCost;
+  PIntraPred16x16Combined3Func   pfIntra16x16Combined3;
+  PIntraPred8x8Combined3Func       pfIntra8x8Combined3;
+  PIntraPred4x4Combined3Func       pfIntra4x4Combined3;
+} SSampleDealingFunc;
+typedef void (*PGetIntraPredFunc) (uint8_t* pPrediction, uint8_t* pRef, const int32_t kiStride);
+
+typedef int32_t (*PGetVarianceFromIntraVaaFunc) (uint8_t* pSampelY, const int32_t kiStride);
+typedef uint8_t (*PGetMbSignFromInterVaaFunc) (int32_t* pSad8x8);
+typedef void (*PUpdateMbMvFunc) (SMVUnitXY* pMvUnit, const SMVUnitXY ksMv);
+
+typedef bool (*PBuildRefListFunc) (sWelsEncCtx* pCtx, const int32_t iPOC, int32_t iBestLtrRefIdx);
+typedef void (*PMarkPicFunc) (sWelsEncCtx* pCtx);
+typedef bool (*PUpdateRefListFunc) (sWelsEncCtx* pCtx);
+typedef void (*PEndofUpdateRefListFunc) (sWelsEncCtx* pCtx);
+typedef void (*PAfterBuildRefListFunc) (sWelsEncCtx* pCtx);
+
+typedef  int32_t (*PCavlcParamCalFunc) (int16_t* pCoff, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeffs,
+                                        int32_t iEndIdx);
+typedef int32_t (*PWelsSpatialWriteMbSyn) (sWelsEncCtx* pCtx, SSlice* pSlice, SMB* pCurMb);
+typedef void (*PStashMBStatus) (SDynamicSlicingStack* pDss, SSlice* pSlice, int32_t iMbSkipRun);
+typedef int32_t (*PStashPopMBStatus) (SDynamicSlicingStack* pDss, SSlice* pSlice);
+typedef int32_t (*PGetBsPosition)(SSlice *pSlice);
+class IWelsParametersetStrategy;
+
+struct TagWelsFuncPointerList {
+  SExpandPicFunc sExpandPicFunc;
+  PFillInterNeighborCacheFunc       pfFillInterNeighborCache;
+
+  PGetVarianceFromIntraVaaFunc  pfGetVarianceFromIntraVaa;
+  PGetMbSignFromInterVaaFunc  pfGetMbSignFromInterVaa;
+  PUpdateMbMvFunc              pfUpdateMbMv;
+  PInterMdFirstIntraModeFunc      pfFirstIntraMode; //svc_encode_slice.c svc_mode_decision.c svc_base_layer_md.c
+  PIntraFineMdFunc
+  pfIntraFineMd;          //svc_encode_slice.c svc_mode_decision.c svc_base_layer_md.c
+  PInterFineMdFunc                     pfInterFineMd;          //svc_encode_slice.c svc_base_layer_md.c
+  PInterMdFunc                           pfInterMd;
+
+  PInterMdBackgroundDecisionFunc          pfInterMdBackgroundDecision;
+  PMdBackgroundInfoUpdateFunc      pfMdBackgroundInfoUpdate;
+
+  PInterMdScrollingPSkipDecisionFunc pfSCDPSkipDecision;
+  PSetScrollingMv pfSetScrollingMv;
+
+  SMcFunc                sMcFuncs;
+  SSampleDealingFunc     sSampleDealingFuncs;
+  PGetIntraPredFunc     pfGetLumaI16x16Pred[I16_PRED_DC_A];
+  PGetIntraPredFunc     pfGetLumaI4x4Pred[I4_PRED_A];
+  PGetIntraPredFunc     pfGetChromaPred[C_PRED_A];
+
+  PSampleSadHor8Func    pfSampleSadHor8[2];     // 1: for 16x16 square; 0: for 8x8 square
+  PMotionSearchFunc
+  pfMotionSearch[BLOCK_STATIC_IDC_ALL]; //svc_encode_slice.c svc_mode_decision.c svc_enhance_layer_md.c svc_base_layer_md.c
+  PSearchMethodFunc pfSearchMethod[BLOCK_SIZE_ALL];
+  PCalculateSatdFunc pfCalculateSatd;
+  PCheckDirectionalMv pfCheckDirectionalMv;
+
+  PInitializeHashforFeatureFunc         pfInitializeHashforFeature;
+  PFillQpelLocationByFeatureValueFunc   pfFillQpelLocationByFeatureValue;
+  PCalculateBlockFeatureOfFrame pfCalculateBlockFeatureOfFrame[2];//0 - for 8x8, 1 for 16x16
+  PCalculateSingleBlockFeature pfCalculateSingleBlockFeature[2];//0 - for 8x8, 1 for 16x16
+  PLineFullSearchFunc pfVerticalFullSearch;
+  PLineFullSearchFunc pfHorizontalFullSearch;
+  PUpdateFMESwitch pfUpdateFMESwitch;
+
+  PCopyFunc      pfCopy16x16Aligned;    //svc_encode_slice.c svc_mode_decision.c svc_base_layer_md.c
+  PCopyFunc      pfCopy16x16NotAligned;  //md.c
+  PCopyFunc      pfCopy8x8Aligned;    //svc_encode_slice.c svc_mode_decision.c svc_base_layer_md.c md.c
+  PCopyFunc    pfCopy16x8NotAligned;  //for MeRefineFracPixel 16x8 based
+  PCopyFunc    pfCopy8x16Aligned;    //for MeRefineFracPixel 8x16 based
+  PCopyFunc      pfCopy4x4;    //not sure if aligned or not, need further tune
+  PCopyFunc      pfCopy8x4;    //not sure if aligned or not, need further tune
+  PCopyFunc      pfCopy4x8;    //not sure if aligned or not, need further tune
+
+  PDctFunc          pfDctT4;
+  PDctFunc                pfDctFourT4;
+
+  PCalculateSingleCtrFunc        pfCalculateSingleCtr4x4;
+  PScanFunc        pfScan4x4;    //DC/AC
+  PScanFunc        pfScan4x4Ac;
+
+  PQuantizationFunc                pfQuantization4x4;
+  PQuantizationFunc                pfQuantizationFour4x4;
+  PQuantizationDcFunc              pfQuantizationDc4x4;
+  PQuantizationMaxFunc            pfQuantizationFour4x4Max;
+  PQuantizationHadamardFunc    pfQuantizationHadamard2x2;
+  PQuantizationSkipFunc            pfQuantizationHadamard2x2Skip;
+
+  PTransformHadamard4x4Func   pfTransformHadamard4x4Dc;
+
+  PGetNoneZeroCountFunc          pfGetNoneZeroCount;
+
+  PDeQuantizationFunc              pfDequantization4x4;
+  PDeQuantizationFunc                pfDequantizationFour4x4;
+  PDeQuantizationHadamardFunc    pfDequantizationIHadamard4x4;
+  PIDctFunc                              pfIDctFourT4;
+  PIDctFunc                              pfIDctT4;
+  PIDctFunc                              pfIDctI16x16Dc;
+
+
+
+  // OPTI: if MT under diff uiSliceMode, need change here
+  //PDynamicSlicingStepBackFunc  dynslc_funcpointer_stepback;//svc_encode_slice.c
+  //DYNSLC_LNGTH_CRTL    dynslc_funcpointer_slcsize_ctrl;
+
+  /* For Deblocking */
+  DeblockingFunc                         pfDeblocking;
+  PSetNoneZeroCountZeroFunc     pfSetNZCZero;
+
+  SWelsRcFunc              pfRc;
+  PAccumulateSadFunc         pfAccumulateSadForRc;
+
+  PSetMemoryZero        pfSetMemZeroSize8;      // for size is times to 8
+  PSetMemoryZero        pfSetMemZeroSize64Aligned16;      // for size is times of 64, and address is align to 16
+  PSetMemoryZero        pfSetMemZeroSize64;      // for size is times of 64, and don't know address is align to 16 or not
+
+  PCavlcParamCalFunc    pfCavlcParamCal;
+  PWelsSpatialWriteMbSyn pfWelsSpatialWriteMbSyn;
+  PGetBsPosition pfGetBsPosition;
+  PStashMBStatus pfStashMBStatus;
+  PStashPopMBStatus pfStashPopMBStatus;
+
+  IWelsParametersetStrategy* pParametersetStrategy;
+};
+
+}  //end of namespace WelsEnc {
+
+#endif//WELS_ENCODER_FUNCTION_POINTERS_DEFINITION_H_
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_preprocess.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_preprocess.h
new file mode 100644
index 0000000000..4d1cd8eff1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_preprocess.h
@@ -0,0 +1,251 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_preprocess.h
+ *
+ * \brief   interface of video pre-process plugins
+ *
+ * \date    03/15/2011
+ *
+ * \description : this class is designed as an interface to unify video pre-processing
+ *                class implement sets such as denoise,colorspace conversion etc...
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELS_PREPROCESS_H
+#define WELS_PREPROCESS_H
+
+#include "typedefs.h"
+#include "picture.h"
+#include "wels_const.h"
+#include "IWelsVP.h"
+#include "param_svc.h"
+
+namespace WelsEnc {
+
+typedef struct TagWelsEncCtx sWelsEncCtx;
+
+typedef  struct {
+  SPicture*     pScaledInputPicture;
+  int32_t       iScaledWidth[MAX_DEPENDENCY_LAYER];
+  int32_t       iScaledHeight[MAX_DEPENDENCY_LAYER];
+} Scaled_Picture;
+
+
+typedef struct {
+  int64_t iMinFrameComplexity;
+  int64_t iMinFrameComplexity08;
+  int64_t iMinFrameComplexity11;
+
+  int32_t iMinFrameNumGap;
+  int32_t iMinFrameQp;
+} SRefJudgement;
+
+typedef struct {
+  SPicture*   pRefPicture;
+  int32_t     iSrcListIdx;   //idx in  h->spatial_pic[base_did];
+  bool        bSceneLtrFlag;
+  unsigned char*        pBestBlockStaticIdc;
+} SRefInfoParam;
+
+typedef struct TagVAAFrameInfo {
+  SVAACalcResult        sVaaCalcInfo;
+  SAdaptiveQuantizationParam sAdaptiveQuantParam;
+  SComplexityAnalysisParam sComplexityAnalysisParam;
+
+  int32_t       iPicWidth;          // maximal iWidth of picture in samples for svc coding
+  int32_t       iPicHeight;         // maximal iHeight of picture in samples for svc coding
+  int32_t       iPicStride;         //luma
+  int32_t       iPicStrideUV;
+
+  uint8_t*      pRefY; //pRef
+  uint8_t*      pCurY; //cur
+  uint8_t*      pRefU; //pRef
+  uint8_t*      pCurU; //cur
+  uint8_t*      pRefV; //pRef
+  uint8_t*      pCurV; //cur
+
+  int8_t*       pVaaBackgroundMbFlag;
+  uint8_t       uiValidLongTermPicIdx;
+  uint8_t       uiMarkLongTermPicIdx;
+
+  ESceneChangeIdc eSceneChangeIdc;
+  bool          bSceneChangeFlag;
+  bool          bIdrPeriodFlag;
+} SVAAFrameInfo;
+
+typedef struct SVAAFrameInfoExt_t: public SVAAFrameInfo {
+  SComplexityAnalysisScreenParam    sComplexityScreenParam;
+  SScrollDetectionParam    sScrollDetectInfo;
+  SRefInfoParam    sVaaStrBestRefCandidate[MAX_REF_PIC_COUNT];
+  SRefInfoParam    sVaaLtrBestRefCandidate[MAX_REF_PIC_COUNT];
+  int32_t    iNumOfAvailableRef;
+
+  int32_t     iVaaBestRefFrameNum;
+  uint8_t*    pVaaBestBlockStaticIdc;//pointer
+  uint8_t*    pVaaBlockStaticIdc[16];//real memory,
+} SVAAFrameInfoExt;
+
+class CWelsPreProcess {
+ public:
+  CWelsPreProcess (sWelsEncCtx* pEncCtx);
+  virtual  ~CWelsPreProcess();
+
+  static CWelsPreProcess* CreatePreProcess (sWelsEncCtx* pEncCtx);
+
+  virtual SPicture* GetCurrentOrigFrame (int32_t iDIdx) = 0;
+ public:
+  int32_t WelsPreprocessReset (sWelsEncCtx* pEncCtx, int32_t iWidth, int32_t iHeight);
+  int32_t AllocSpatialPictures (sWelsEncCtx* pCtx, SWelsSvcCodingParam* pParam);
+  void    FreeSpatialPictures (sWelsEncCtx* pCtx);
+  int32_t BuildSpatialPicList (sWelsEncCtx* pEncCtx, const SSourcePicture* kpSrcPic);
+  int32_t AnalyzeSpatialPic (sWelsEncCtx* pEncCtx, const int32_t kiDIdx);
+  int32_t UpdateSpatialPictures (sWelsEncCtx* pEncCtx, SWelsSvcCodingParam* pParam, const int8_t iCurTid,
+                                 const int32_t d_idx);
+  int32_t GetRefFrameInfo (int32_t iRefIdx, bool bCurrentFrameIsSceneLtr, SPicture*& pRefOri);
+  void    AnalyzePictureComplexity (sWelsEncCtx* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
+                                    const int32_t kiDependencyId, const bool kbCalculateBGD);
+  int32_t UpdateBlockIdcForScreen (uint8_t*  pCurBlockStaticPointer, const SPicture* kpRefPic, const SPicture* kpSrcPic);
+
+
+  void UpdateSrcList (SPicture* pCurPicture, const int32_t kiCurDid, SPicture** pShortRefList,
+                      const uint32_t kuiShortRefCount);
+  void UpdateSrcListLosslessScreenRefSelectionWithLtr (SPicture* pCurPicture, const int32_t kiCurDid,
+      const int32_t kuiMarkLongTermPicIdx, SPicture** pLongRefList);
+
+
+ protected:
+  bool GetSceneChangeFlag (ESceneChangeIdc eSceneChangeIdc);
+  virtual  ESceneChangeIdc  DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture = NULL) = 0;
+
+  void InitPixMap (const SPicture* pPicture, SPixMap* pPixMap);
+
+  int32_t GetCurPicPosition (const int32_t kiDidx);
+
+ private:
+  int32_t WelsPreprocessCreate();
+  int32_t WelsPreprocessDestroy();
+  int32_t InitLastSpatialPictures (sWelsEncCtx* pEncCtx);
+
+ private:
+  int32_t SingleLayerPreprocess (sWelsEncCtx* pEncCtx, const SSourcePicture* kpSrc, Scaled_Picture* m_sScaledPicture);
+
+  void  BilateralDenoising (SPicture* pSrc, const int32_t iWidth, const int32_t iHeight);
+
+  int32_t DownsamplePadding (SPicture* pSrc, SPicture* pDstPic,  int32_t iSrcWidth, int32_t iSrcHeight,
+                             int32_t iShrinkWidth, int32_t iShrinkHeight, int32_t iTargetWidth, int32_t iTargetHeight,
+                             bool bForceCopy);
+
+  void    VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bCalculateSQDiff,
+                          bool bCalculateVar, bool bCalculateBGD);
+  void    BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture, bool bDetectFlag);
+  void    AdaptiveQuantCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture);
+  void    Padding (uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iStrideY, int32_t iStrideUV,
+                   int32_t iActualWidth, int32_t iPaddingWidth, int32_t iActualHeight, int32_t iPaddingHeight);
+  void    SetRefMbType (sWelsEncCtx* pCtx, uint32_t** pRefMbTypeArray, int32_t iRefPicType);
+
+  int32_t ColorspaceConvert (SWelsSvcCodingParam* pSvcParam, SPicture* pDstPic, const SSourcePicture* kpSrc,
+                             const int32_t kiWidth, const int32_t kiHeight);
+  void WelsMoveMemoryWrapper (SWelsSvcCodingParam* pSvcParam, SPicture* pDstPic, const SSourcePicture* kpSrc,
+                              const int32_t kiWidth, const int32_t kiHeight);
+
+  /*!
+  * \brief  exchange two picture pData planes
+  * \param  ppPic1      picture pointer to picture 1
+  * \param  ppPic2      picture pointer to picture 2
+  * \return none
+  */
+  void WelsExchangeSpatialPictures (SPicture** ppPic1, SPicture** ppPic2);
+
+  SPicture* GetBestRefPic (EUsageType iUsageType, bool bSceneLtr, EWelsSliceType eSliceType, int32_t kiDidx,
+                           int32_t iRefTemporalIdx);
+  SPicture* GetBestRefPic (const int32_t kiDidx, const int32_t iRefTemporalIdx);
+ protected:
+  IWelsVP*         m_pInterfaceVp;
+  sWelsEncCtx*     m_pEncCtx;
+  uint8_t          m_uiSpatialLayersInTemporal[MAX_DEPENDENCY_LAYER];
+
+ private:
+  Scaled_Picture   m_sScaledPicture;
+  SPicture*        m_pLastSpatialPicture[MAX_DEPENDENCY_LAYER][2];
+  bool             m_bInitDone;
+  uint8_t          m_uiSpatialPicNum[MAX_DEPENDENCY_LAYER];
+ protected:
+  /* For Downsampling & VAA I420 based source pictures */
+  SPicture*        m_pSpatialPic[MAX_DEPENDENCY_LAYER][MAX_REF_PIC_COUNT + 1];
+  // need memory requirement with total number of num_of_ref + 1, "+1" is for current frame
+  int32_t           m_iAvaliableRefInSpatialPicList;
+
+};
+
+class CWelsPreProcessVideo : public CWelsPreProcess {
+ public:
+  CWelsPreProcessVideo (sWelsEncCtx* pEncCtx) : CWelsPreProcess (pEncCtx) {};
+
+  virtual SPicture* GetCurrentOrigFrame (int32_t iDIdx);
+
+  virtual ESceneChangeIdc  DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture = NULL);
+};
+
+
+
+class CWelsPreProcessScreen : public CWelsPreProcess {
+ public:
+  CWelsPreProcessScreen (sWelsEncCtx* pEncCtx) : CWelsPreProcess (pEncCtx) {};
+
+  virtual SPicture* GetCurrentOrigFrame (int32_t iDIdx);
+
+  virtual ESceneChangeIdc  DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture = NULL);
+
+ private:
+  SPicture** GetReferenceSrcPicList(int32_t iTargetDid);
+
+  void GetAvailableRefListLosslessScreenRefSelection (SPicture** pSrcPicList, uint8_t iCurTid,
+      const int32_t iClosestLtrFrameNum,
+      SRefInfoParam* pAvailableRefList, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum);
+
+  void GetAvailableRefList (SPicture** pSrcPicList, uint8_t iCurTid, const int32_t iClosestLtrFrameNum,
+                            SRefInfoParam* pAvailableRefList, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum);
+  void InitRefJudgement (SRefJudgement* pRefJudgement);
+
+  bool JudgeBestRef (SPicture* pRefPic, const SRefJudgement& sRefJudgement, const int64_t iFrameComplexity,
+                     const bool bIsClosestLtrFrame);
+  void SaveBestRefToJudgement (const int32_t iRefPictureAvQP, const int64_t iComplexity, SRefJudgement* pRefJudgement);
+  void SaveBestRefToLocal (SRefInfoParam* pRefPicInfo, const SSceneChangeResult& sSceneChangeResult,
+                           SRefInfoParam* pRefSaved);
+  void SaveBestRefToVaa (SRefInfoParam& sRefSaved, SRefInfoParam* pVaaBestRef);
+};
+
+
+}
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_base.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_base.h
new file mode 100644
index 0000000000..e27af3118a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_base.h
@@ -0,0 +1,79 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_base.h
+ *
+ * \brief   interface for base task
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+
+
+
+#ifndef  _WELS_BASE_TASK_H_
+#define  _WELS_BASE_TASK_H_
+
+#include "typedefs.h"
+#include "WelsTask.h"
+
+namespace WelsEnc {
+
+class CWelsBaseTask : public WelsCommon::IWelsTask {
+ public:
+  enum ETaskType {
+    WELS_ENC_TASK_ENCODING = 0,
+    WELS_ENC_TASK_ENCODE_FIXED_SLICE = WELS_ENC_TASK_ENCODING,
+    WELS_ENC_TASK_ENCODE_SLICE_LOADBALANCING = WELS_ENC_TASK_ENCODING,
+    WELS_ENC_TASK_ENCODE_SLICE_SIZECONSTRAINED = WELS_ENC_TASK_ENCODING,
+    WELS_ENC_TASK_UPDATEMBMAP = 1,
+    WELS_ENC_TASK_PREPROCESS = 2,
+    WELS_ENC_TASK_ALL = 3,
+  };
+
+  CWelsBaseTask (WelsCommon::IWelsTaskSink* pSink): IWelsTask (pSink) {};
+  virtual ~CWelsBaseTask();
+
+  virtual uint32_t GetTaskType() const = 0;
+
+ private:
+
+};
+
+}
+
+
+#endif
+
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_encoder.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_encoder.h
new file mode 100644
index 0000000000..3203bf4950
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_encoder.h
@@ -0,0 +1,142 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_encoder.h
+ *
+ * \brief   interface for encoder tasks
+ *
+ * \date    07/06/2015 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef _WELS_ENCODER_TASK_H_
+#define _WELS_ENCODER_TASK_H_
+
+#include "wels_task_base.h"
+#include "encoder_context.h"
+
+namespace WelsEnc {
+
+extern int32_t WriteSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, uint8_t* pFrameBsBuffer,
+                                    const int32_t iSliceIdx,
+                                    int32_t& iSliceSize);
+extern int32_t WriteSliceBs (sWelsEncCtx* pCtx,SWelsSliceBs* pSliceBs,const int32_t iSliceIdx, int32_t& iSliceSize);
+
+class CWelsSliceEncodingTask : public CWelsBaseTask {
+ public:
+  CWelsSliceEncodingTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx, const int32_t iSliceIdx);
+  virtual ~CWelsSliceEncodingTask();
+
+  CWelsSliceEncodingTask* CreateSliceEncodingTask (sWelsEncCtx* pCtx, const int32_t iSliceIdx);
+  WelsErrorType SetBoundary (int32_t iStartMbIdx, int32_t iEndMbIdx);
+
+  virtual WelsErrorType Execute();
+  virtual WelsErrorType InitTask();
+  virtual WelsErrorType ExecuteTask();
+  virtual void FinishTask();
+
+  virtual uint32_t        GetTaskType() const {
+    return WELS_ENC_TASK_ENCODE_FIXED_SLICE;
+  }
+ protected:
+  WelsErrorType m_eTaskResult;
+
+  int32_t QueryEmptyThread (bool* pThreadBsBufferUsage);
+
+  sWelsEncCtx* m_pCtx;
+  SSliceThreadPrivateData* m_pPrivateData;
+  SLayerBSInfo* m_pLbi;
+  int32_t m_iStartMbIdx;
+  int32_t m_iEndMbIdx;
+
+  EWelsNalUnitType m_eNalType;
+  EWelsNalRefIdc m_eNalRefIdc;
+  bool m_bNeedPrefix;
+  uint32_t m_uiDependencyId;
+
+  SSlice* m_pSlice;
+  SWelsSliceBs* m_pSliceBs;
+  int32_t m_iSliceIdx;
+  int32_t m_iSliceSize;
+  int32_t m_iThreadIdx;
+};
+
+class CWelsLoadBalancingSlicingEncodingTask : public CWelsSliceEncodingTask {
+ public:
+  CWelsLoadBalancingSlicingEncodingTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx, const int32_t iSliceIdx) : CWelsSliceEncodingTask (pSink, pCtx,
+        iSliceIdx) {
+  };
+
+  virtual WelsErrorType InitTask();
+  virtual void FinishTask();
+
+  virtual uint32_t        GetTaskType() const {
+    return WELS_ENC_TASK_ENCODE_SLICE_LOADBALANCING;
+  }
+ private:
+  int64_t m_iSliceStart;
+};
+
+
+class CWelsConstrainedSizeSlicingEncodingTask : public CWelsLoadBalancingSlicingEncodingTask {
+ public:
+  CWelsConstrainedSizeSlicingEncodingTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx,
+      const int32_t iSliceIdx) : CWelsLoadBalancingSlicingEncodingTask (pSink, pCtx, iSliceIdx) {
+  };
+
+  virtual WelsErrorType ExecuteTask();
+
+  virtual uint32_t        GetTaskType() const {
+    return WELS_ENC_TASK_ENCODE_SLICE_SIZECONSTRAINED;
+  }
+
+};
+
+
+class CWelsUpdateMbMapTask : public CWelsBaseTask {
+ public:
+  CWelsUpdateMbMapTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx, const int32_t iSliceIdx);
+  virtual ~CWelsUpdateMbMapTask();
+
+  virtual WelsErrorType Execute();
+
+  virtual uint32_t        GetTaskType() const {
+    return WELS_ENC_TASK_UPDATEMBMAP;
+  }
+ protected:
+  sWelsEncCtx* m_pCtx;
+  int32_t m_iSliceIdx;
+};
+
+}       //namespace
+#endif  //header guard
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_management.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_management.h
new file mode 100644
index 0000000000..acd6126333
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_task_management.h
@@ -0,0 +1,135 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_management.h
+ *
+ * \brief   interface for task management
+ *
+ * \date    5/14/2012 Created
+ *
+ *************************************************************************************
+ */
+
+#ifndef _WELS_ENCODER_TASK_MANAGE_H_
+#define _WELS_ENCODER_TASK_MANAGE_H_
+
+#include "wels_common_basis.h"
+#include "WelsLock.h"
+#include "WelsThreadPool.h"
+#include "wels_task_base.h"
+
+namespace WelsEnc {
+
+class IWelsTaskManage {
+ public:
+  virtual ~IWelsTaskManage() { }
+
+  virtual WelsErrorType   Init (sWelsEncCtx*   pEncCtx) = 0;
+  virtual void            Uninit() = 0;
+
+  virtual void            InitFrame (const int32_t kiCurDid) {}
+  virtual WelsErrorType   ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType = CWelsBaseTask::WELS_ENC_TASK_ENCODING)
+    = 0;
+
+  static IWelsTaskManage* CreateTaskManage (sWelsEncCtx* pCtx, const int32_t iSpatialLayer, const bool bNeedLock);
+
+  virtual int32_t  GetThreadPoolThreadNum() = 0;
+};
+
+
+class  CWelsTaskManageBase : public IWelsTaskManage, public WelsCommon::IWelsTaskSink {
+ public:
+  typedef  CWelsNonDuplicatedList<CWelsBaseTask>            TASKLIST_TYPE;
+  //typedef  std::pair<int, int>                  SLICE_BOUNDARY_PAIR;
+  //typedef  CWelsList<SLICE_BOUNDARY_PAIR>       SLICE_PAIR_LIST;
+
+  CWelsTaskManageBase();
+  virtual ~ CWelsTaskManageBase();
+
+  virtual WelsErrorType  Init (sWelsEncCtx*   pEncCtx);
+  virtual void           InitFrame (const int32_t kiCurDid = 0);
+
+  virtual WelsErrorType  ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType = CWelsBaseTask::WELS_ENC_TASK_ENCODING);
+
+  //IWelsTaskSink
+  virtual WelsErrorType OnTaskExecuted();
+  virtual WelsErrorType OnTaskCancelled();
+
+  int32_t  GetThreadPoolThreadNum();
+
+ protected:
+  virtual WelsErrorType  CreateTasks (sWelsEncCtx* pEncCtx, const int32_t kiTaskCount);
+
+  WelsErrorType          ExecuteTaskList(TASKLIST_TYPE** pTaskList);
+
+ protected:
+  sWelsEncCtx*    m_pEncCtx;
+  WelsCommon::CWelsThreadPool*   m_pThreadPool;
+
+  TASKLIST_TYPE*  m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_ALL][MAX_DEPENDENCY_LAYER];
+  TASKLIST_TYPE*  m_cEncodingTaskList[MAX_DEPENDENCY_LAYER];
+  TASKLIST_TYPE*  m_cPreEncodingTaskList[MAX_DEPENDENCY_LAYER];
+  int32_t         m_iTaskNum[MAX_DEPENDENCY_LAYER];
+
+  //SLICE_PAIR_LIST *m_cSliceList;
+
+  int32_t         m_iThreadNum;
+
+  int32_t          m_iWaitTaskNum;
+  WELS_EVENT       m_hTaskEvent;
+  WELS_MUTEX       m_hEventMutex;
+  WelsCommon::CWelsLock  m_cWaitTaskNumLock;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN (CWelsTaskManageBase);
+  void  OnTaskMinusOne();
+
+  void Uninit();
+  void DestroyTasks();
+  void DestroyTaskList(TASKLIST_TYPE* pTargetTaskList);
+
+  int32_t        m_iCurDid;
+};
+
+class  CWelsTaskManageOne : public CWelsTaskManageBase {
+ public:
+  CWelsTaskManageOne();
+  virtual ~CWelsTaskManageOne();
+
+  WelsErrorType   Init (sWelsEncCtx* pEncCtx);
+  virtual WelsErrorType  ExecuteTasks(const CWelsBaseTask::ETaskType iTaskType = CWelsBaseTask::WELS_ENC_TASK_ENCODING);
+
+  int32_t  GetThreadPoolThreadNum() {return 1;};
+};
+
+}       //namespace
+#endif  //header guard
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_transpose_matrix.h b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_transpose_matrix.h
new file mode 100644
index 0000000000..38832e4056
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/inc/wels_transpose_matrix.h
@@ -0,0 +1,58 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#ifndef WELS_RUBY_ENCODER_TRANSPOSE_MATRIX_H__
+#define WELS_RUBY_ENCODER_TRANSPOSE_MATRIX_H__
+
+#include "typedefs.h"
+
+namespace WelsEnc {
+
+#ifdef X86_ASM
+extern "C"
+{
+  void TransposeMatrixBlocksx16_sse2 (void* pDst, const int32_t kiDstStride, void* pSrc, const int32_t kiSrcStride,
+                                      const int32_t kiBlocksNum);
+  void TransposeMatrixBlock16x16_sse2 (void* pDst, const int32_t kiDstStride, void* pSrc, const int32_t kiSrcStride);
+  void TransposeMatrixBlocksx8_mmx (void* pDst, const int32_t kiDstStride, void* pSrc, const int32_t kiSrcStride,
+                                    const int32_t kiBlocksNum);
+  void TransposeMatrixBlock8x8_mmx (void* pDst, const int32_t kiDstStride, void* pSrc, const int32_t kiSrcStride);
+}
+#endif
+
+typedef void (*PTransposeMatrixBlockFunc) (void* pDst, const int32_t kiDstStride, void* pSrc,
+    const int32_t kiSrcStride);
+typedef void (*PTransposeMatrixBlocksFunc) (void* pDst, const int32_t kiDstStride, void* pSrc,
+    const int32_t kiSrcStride, const int32_t kiBlocksNum);
+
+}// end of namespace declaration
+
+#endif//WELS_RUBY_ENCODER_TRANSPOSE_MATRIX_H__
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/dct_mmi.c b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/dct_mmi.c
new file mode 100644
index 0000000000..ae8d21159b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/dct_mmi.c
@@ -0,0 +1,529 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    dct_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    20/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+#define MMI_Load4x8p(r0, f0, f2, f4, f6, f8, f10, f12, f14, f16, f18) \
+  "gslqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  "gslqc1     "#f10", "#f8", 0x10("#r0")      \n\t" \
+  "gslqc1     "#f18", "#f16", 0x20("#r0")     \n\t" \
+  "gslqc1     "#f6", "#f4", 0x30("#r0")       \n\t" \
+  MMI_XSawp_DQ(f8, f10, f4, f6, f12, f14)           \
+  MMI_XSawp_DQ(f0, f2, f16, f18, f4, f6)
+
+#define MMI_SumSubDiv2(f0, f2, f4, f6, f8, f10, f12, f14, f16) \
+  "mov.d      "#f8", "#f4"                    \n\t" \
+  "mov.d      "#f10", "#f6"                   \n\t" \
+  "psrah      "#f4", "#f4", "#f16"            \n\t" \
+  "psrah      "#f6", "#f6", "#f16"            \n\t" \
+  "psrah      "#f12", "#f0", "#f16"           \n\t" \
+  "psrah      "#f14", "#f2", "#f16"           \n\t" \
+  "paddh      "#f0", "#f0", "#f4"             \n\t" \
+  "paddh      "#f2", "#f2", "#f6"             \n\t" \
+  "psubh      "#f12", "#f12", "#f8"           \n\t" \
+  "psubh      "#f14", "#f14", "#f10"          \n\t"
+
+#define MMI_IDCT(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, f20, f22, f24, f26, f28) \
+  MMI_SumSub(f24, f26, f4, f6, f20, f22)                        \
+  MMI_SumSubDiv2(f0, f2, f8, f10, f16, f18, f12, f14, f28)      \
+  MMI_SumSub(f4, f6, f0, f2, f16, f18)                          \
+  MMI_SumSub(f24, f26, f12, f14, f16, f18)
+
+#define MMI_StoreDiff8p_6(f0, f2, f4, f6, f8, f12, r0, r1, f14) \
+  "paddh      "#f0", "#f0", "#f8"             \n\t" \
+  "paddh      "#f2", "#f2", "#f8"             \n\t" \
+  "psrah      "#f0", "#f0", "#f14"            \n\t" \
+  "psrah      "#f2", "#f2", "#f14"            \n\t" \
+  "gsldlc1    "#f4", 0x7("#r1")               \n\t" \
+  "gsldrc1    "#f4", 0x0("#r1")               \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f12"            \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f12"            \n\t" \
+  "paddsh     "#f4", "#f4", "#f0"             \n\t" \
+  "paddsh     "#f6", "#f6", "#f2"             \n\t" \
+  "packushb   "#f4", "#f4", "#f6"             \n\t" \
+  "gssdlc1    "#f4", 0x7("#r0")               \n\t" \
+  "gssdrc1    "#f4", 0x0("#r0")               \n\t"
+
+#define MMI_StoreDiff8p_5(f0, f2, f4, f6, f8, r0, r1, offset) \
+  "gsldlc1    "#f4", "#offset"+0x7("#r1")     \n\t" \
+  "gsldrc1    "#f4", "#offset"+0x0("#r1")     \n\t" \
+  "punpckhbh  "#f6", "#f4", "#f8"             \n\t" \
+  "punpcklbh  "#f4", "#f4", "#f8"             \n\t" \
+  "paddsh     "#f4", "#f4", "#f0"             \n\t" \
+  "paddsh     "#f6", "#f6", "#f2"             \n\t" \
+  "packushb   "#f4", "#f4", "#f6"             \n\t" \
+  "gssdlc1    "#f4", "#offset"+0x7("#r0")     \n\t" \
+  "gssdrc1    "#f4", "#offset"+0x0("#r0")     \n\t"
+
+#define MMI_Load8DC(f0, f2, f4, f6, f8, f10, f12, f14, f16, r0, offset, f20) \
+  "gslqc1     "#f2", "#f0", "#offset"+0x0("#r0") \n\t" \
+  "paddh      "#f0", "#f0", "#f16"               \n\t" \
+  "paddh      "#f2", "#f2", "#f16"               \n\t" \
+  "psrah      "#f0", "#f0", "#f20"               \n\t" \
+  "psrah      "#f2", "#f2", "#f20"               \n\t" \
+  "punpckhhw  "#f4", "#f0", "#f0"                \n\t" \
+  "punpckhwd  "#f6", "#f4", "#f4"                \n\t" \
+  "punpcklwd  "#f4", "#f4", "#f4"                \n\t" \
+  "punpcklhw  "#f8", "#f2", "#f2"                \n\t" \
+  "punpckhwd  "#f10", "#f8", "#f8"               \n\t" \
+  "punpcklwd  "#f8", "#f8", "#f8"                \n\t" \
+  "punpckhhw  "#f12", "#f2", "#f2"               \n\t" \
+  "punpckhwd  "#f14", "#f12", "#f12"             \n\t" \
+  "punpcklwd  "#f12", "#f12", "#f12"             \n\t" \
+  "punpcklhw  "#f0", "#f0", "#f0"                \n\t" \
+  "punpckhwd  "#f2", "#f0", "#f0"                \n\t" \
+  "punpcklwd  "#f0", "#f0", "#f0"                \n\t"
+
+#define MMI_StoreDiff4x8p(f0, f2, f4, f6, f8, f10, f12, r0, r1, r2, r3) \
+  MMI_StoreDiff8p_5(f0, f2, f8, f10, f12, r0, r1, 0x0)         \
+  MMI_StoreDiff8p_5(f4, f6, f8, f10, f12, r0, r1, 0x8)         \
+  PTR_ADDU   ""#r0", "#r0", "#r2"                        \n\t" \
+  PTR_ADDU   ""#r1", "#r1", "#r3"                        \n\t" \
+  MMI_StoreDiff8p_5(f0, f2, f8, f10, f12, r0, r1, 0x0)         \
+  MMI_StoreDiff8p_5(f4, f6, f8, f10, f12, r0, r1, 0x8)
+
+#define MMI_Load4Col(f0, f2, f4, f6, f8, r0, offset) \
+  "lh         $8, "#offset"("#r0")        \n\t" \
+  "dmtc1      $8, "#f0"                   \n\t" \
+  "lh         $8, "#offset"+0x20("#r0")   \n\t" \
+  "dmtc1      $8, "#f4"                   \n\t" \
+  "punpcklwd  "#f0", "#f0", "#f4"         \n\t" \
+  "lh         $8, "#offset"+0x80("#r0")   \n\t" \
+  "dmtc1      $8, "#f6"                   \n\t" \
+  "lh         $8, "#offset"+0xa0("#r0")   \n\t" \
+  "dmtc1      $8, "#f8"                   \n\t" \
+  "punpcklwd  "#f2", "#f6", "#f8"         \n\t"
+
+#define MMI_SumSubD(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f4"                \n\t" \
+  "mov.d      "#f10", "#f6"               \n\t" \
+  "paddw      "#f4", "#f4", "#f0"         \n\t" \
+  "paddw      "#f6", "#f6", "#f2"         \n\t" \
+  "psubw      "#f0", "#f0", "#f8"         \n\t" \
+  "psubw      "#f2", "#f2", "#f10"        \n\t"
+
+#define WELS_DD1(f0, f2, f_val_31) \
+  "pcmpeqh    "#f0", "#f0", "#f0"         \n\t" \
+  "pcmpeqh    "#f2", "#f2", "#f2"         \n\t" \
+  "psrlw      "#f0", "#f0", "#f_val_31"   \n\t" \
+  "psrlw      "#f2", "#f2", "#f_val_31"   \n\t"
+
+#define MMI_SumSubDiv2D(f0, f2, f4, f6, f8, f10, f12, f14, f_val_1) \
+  "paddw      "#f0", "#f0", "#f4"         \n\t" \
+  "paddw      "#f2", "#f2", "#f6"         \n\t" \
+  "paddw      "#f0", "#f0", "#f8"         \n\t" \
+  "paddw      "#f2", "#f2", "#f10"        \n\t" \
+  "psraw      "#f0", "#f0", "#f_val_1"    \n\t" \
+  "psraw      "#f2", "#f2", "#f_val_1"    \n\t" \
+  "mov.d      "#f12", "#f0"               \n\t" \
+  "mov.d      "#f14", "#f2"               \n\t" \
+  "psubw      "#f12", "#f12", "#f4"       \n\t" \
+  "psubw      "#f14", "#f14", "#f6"       \n\t"
+
+#define MMI_Trans4x4W(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18) \
+  MMI_XSawp_WD(f0, f2, f4, f6, f16, f18)  \
+  MMI_XSawp_WD(f8, f10, f12, f14, f4, f6) \
+  MMI_XSawp_DQ(f0, f2, f8, f10, f12, f14) \
+  MMI_XSawp_DQ(f16, f18, f4, f6, f8, f10)
+
+#define MMI_SumSubMul2(f0, f2, f4, f6, f8, f10) \
+  "mov.d      "#f8", "#f0"                    \n\t" \
+  "mov.d      "#f10", "#f2"                   \n\t" \
+  "paddh      "#f0", "#f0", "#f0"             \n\t" \
+  "paddh      "#f2", "#f2", "#f2"             \n\t" \
+  "paddh      "#f0", "#f0", "#f4"             \n\t" \
+  "paddh      "#f2", "#f2", "#f6"             \n\t" \
+  "psubh      "#f8", "#f8", "#f4"             \n\t" \
+  "psubh      "#f10", "#f10", "#f6"           \n\t" \
+  "psubh      "#f8", "#f8", "#f4"             \n\t" \
+  "psubh      "#f10", "#f10", "#f6"           \n\t"
+
+#define MMI_DCT(f0, f2, f4, f6, f8, f10, f12, f14, f16, f18, f20, f22) \
+  MMI_SumSub(f20, f22, f8, f10, f16, f18)   \
+  MMI_SumSub(f0, f2, f4, f6, f16, f18)      \
+  MMI_SumSub(f8, f10, f4, f6, f16, f18)     \
+  MMI_SumSubMul2(f20, f22, f0, f2, f12, f14)
+
+#define MMI_Store4x8p(r0, f0, f2, f4, f6, f8, f10, f12, f14, f16, f18) \
+  MMI_XSawp_DQ(f0, f2, f4, f6, f16, f18)            \
+  MMI_XSawp_DQ(f8, f10, f12, f14, f4, f6)           \
+  "gssqc1     "#f2", "#f0", 0x0("#r0")        \n\t" \
+  "gssqc1     "#f10", "#f8", 0x10("#r0")      \n\t" \
+  "gssqc1     "#f18", "#f16", 0x20("#r0")     \n\t" \
+  "gssqc1     "#f6", "#f4", 0x30("#r0")       \n\t"
+
+#define MMI_LoadDiff4P_SINGLE(f0, f2, r0, r1, f4) \
+  "gsldlc1    "#f0", 0x7("#r0")               \n\t" \
+  "gsldlc1    "#f2", 0x7("#r1")               \n\t" \
+  "gsldrc1    "#f0", 0x0("#r0")               \n\t" \
+  "gsldrc1    "#f2", 0x0("#r1")               \n\t" \
+  "punpcklbh  "#f0", "#f0", "#f4"             \n\t" \
+  "punpcklbh  "#f2", "#f2", "#f4"             \n\t" \
+  "psubh      "#f0", "#f0", "#f2"             \n\t"
+
+#define MMI_LoadDiff4x4P_SINGLE(f0, f2, f4, f6, r0, r1, r2, r3, f8, f10) \
+  MMI_LoadDiff4P_SINGLE(f0, f8, r0, r2, f10)        \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  PTR_ADDU   ""#r2", "#r2", "#r3"             \n\t" \
+  MMI_LoadDiff4P_SINGLE(f2, f8, r0, r2, f10)        \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  PTR_ADDU   ""#r2", "#r2", "#r3"             \n\t" \
+  MMI_LoadDiff4P_SINGLE(f4, f8, r0, r2, f10)        \
+  PTR_ADDU   ""#r0", "#r0", "#r1"             \n\t" \
+  PTR_ADDU   ""#r2", "#r2", "#r3"             \n\t" \
+  MMI_LoadDiff4P_SINGLE(f6, f8, r0, r2, f10)
+
+#define MMI_DCT_SINGLE(f0, f2, f4, f6, f8, f10, f12) \
+  MMI_SumSub_SINGLE(f6, f0, f10)     \
+  MMI_SumSub_SINGLE(f4, f2, f10)     \
+  MMI_SumSub_SINGLE(f4, f6, f10)     \
+  MMI_SumSubMul2_SINGLE(f0, f2, f8, f12)
+
+void WelsIDctT4Rec_mmi(uint8_t* pRec, int32_t iStride, uint8_t* pPred,
+                       int32_t iPredStride, int16_t* pDct) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                    \n\t"
+    "gsldlc1    $f0, 0x7(%[pDct])                  \n\t"
+    "gsldrc1    $f0, 0x0(%[pDct])                  \n\t"
+    "gsldlc1    $f2, 0xF(%[pDct])                  \n\t"
+    "gsldrc1    $f2, 0x8(%[pDct])                  \n\t"
+    "gsldlc1    $f4, 0x17(%[pDct])                 \n\t"
+    "gsldrc1    $f4, 0x10(%[pDct])                 \n\t"
+    "gsldlc1    $f6, 0x1F(%[pDct])                 \n\t"
+    "gsldrc1    $f6, 0x18(%[pDct])                 \n\t"
+
+    "dli        $8, 0x1                            \n\t"
+    "dmtc1      $8, $f16                           \n\t"
+    "dli        $8, 0x6                            \n\t"
+    "dmtc1      $8, $f18                           \n\t"
+
+    MMI_Trans4x4H_SINGLE($f0, $f2, $f4, $f6, $f8)
+    MMI_IDCT_SINGLE($f2, $f4, $f6, $f8, $f0, $f12, $f16)
+    MMI_Trans4x4H_SINGLE($f2, $f6, $f0, $f8, $f4)
+    MMI_IDCT_SINGLE($f6, $f0, $f8, $f4, $f2, $f12, $f16)
+
+    "xor        $f14, $f14, $f14                   \n\t"
+    "dli        $8, 0x0020                         \n\t"
+    "dmtc1      $8, $f12                           \n\t"
+    "punpcklhw  $f12, $f12, $f12                   \n\t"
+    "punpcklwd  $f12, $f12, $f12                   \n\t"
+
+    MMI_StoreDiff4P_SINGLE($f6, $f0, $f12, $f14, %[pRec], %[pPred], $f18)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4P_SINGLE($f8, $f0, $f12, $f14, %[pRec], %[pPred], $f18)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4P_SINGLE($f2, $f0, $f12, $f14, %[pRec], %[pPred], $f18)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4P_SINGLE($f4, $f0, $f12, $f14, %[pRec], %[pPred], $f18)
+    : [pRec]"+&r"((uint8_t *)pRec), [pPred]"+&r"((uint8_t *)pPred)
+    : [iStride]"r"((int)iStride), [iPredStride]"r"((int)iPredStride),
+      [pDct]"r"((short *)pDct)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18"
+  );
+}
+
+void WelsIDctFourT4Rec_mmi(uint8_t* pRec, int32_t iStride, uint8_t* pPred,
+                           int32_t iPredStride, int16_t* pDct) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                    \n\t"
+    MMI_Load4x8p(%[pDct], $f0, $f2, $f4, $f6, $f16, $f18, $f8, $f10, $f20, $f22)
+
+    MMI_TransTwo4x4H($f0, $f2, $f4, $f6, $f16, $f18, $f8, $f10, $f12, $f14)
+    "dli        $8, 0x1                            \n\t"
+    "dmtc1      $8, $f30                           \n\t"
+    MMI_IDCT($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26,
+             $f0, $f2, $f30)
+    MMI_TransTwo4x4H($f4, $f6, $f16, $f18, $f0, $f2, $f8, $f10, $f12, $f14)
+    MMI_IDCT($f16, $f18, $f8, $f10, $f12, $f14, $f0, $f2, $f20, $f22, $f24, $f26,
+             $f4, $f6, $f30)
+
+    "xor        $f28, $f28, $f28                   \n\t"
+    "dli        $8, 0x6                            \n\t"
+    "dmtc1      $8, $f26                           \n\t"
+    "dli        $8, 0x0020                         \n\t"
+    "dmtc1      $8, $f24                           \n\t"
+    "punpcklhw  $f24, $f24, $f24                   \n\t"
+    "punpcklwd  $f24, $f24, $f24                   \n\t"
+
+    MMI_StoreDiff8p_6($f16, $f18, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f0, $f2, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f4, $f6, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f8, $f10, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+
+    PTR_ADDIU  "%[pDct], %[pDct], 0x40             \n\t"
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_Load4x8p(%[pDct], $f0, $f2, $f4, $f6, $f16, $f18, $f8, $f10, $f20, $f22)
+
+    MMI_TransTwo4x4H($f0, $f2, $f4, $f6, $f16, $f18, $f8, $f10, $f12, $f14)
+    MMI_IDCT($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f24, $f26,
+             $f0, $f2, $f30)
+    MMI_TransTwo4x4H($f4, $f6, $f16, $f18, $f0, $f2, $f8, $f10, $f12, $f14)
+    MMI_IDCT($f16, $f18, $f8, $f10, $f12, $f14, $f0, $f2, $f20, $f22, $f24, $f26,
+             $f4, $f6, $f30)
+
+    "dli        $8, 0x6                            \n\t"
+    "dmtc1      $8, $f26                           \n\t"
+    "dli        $8, 0x0020                         \n\t"
+    "dmtc1      $8, $f24                           \n\t"
+    "punpcklhw  $f24, $f24, $f24                   \n\t"
+    "punpcklwd  $f24, $f24, $f24                   \n\t"
+
+    MMI_StoreDiff8p_6($f16, $f18, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f0, $f2, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f4, $f6, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff8p_6($f8, $f10, $f20, $f22, $f24, $f28, %[pRec], %[pPred], $f26)
+    : [pRec]"+&r"((uint8_t *)pRec), [pPred]"+&r"((uint8_t *)pPred),
+      [pDct]"+&r"((short *)pDct)
+    : [iStride]"r"((int)iStride), [iPredStride]"r"((int)iPredStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsIDctRecI16x16Dc_mmi(uint8_t* pRec, int32_t iStride, uint8_t* pPred,
+                             int32_t iPredStride, int16_t* pDct) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                    \n\t"
+    "xor        $f28, $f28, $f28                   \n\t"
+    "dli        $8, 0x0020                         \n\t"
+    "dmtc1      $8, $f24                           \n\t"
+    "punpcklhw  $f24, $f24, $f24                   \n\t"
+    "punpcklwd  $f24, $f24, $f24                   \n\t"
+    "dli        $8, 0x6                            \n\t"
+    "dmtc1      $8, $f30                           \n\t"
+
+    MMI_Load8DC($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f24,
+                %[pDct], 0x0, $f30)
+
+    MMI_StoreDiff4x8p($f0, $f2, $f4, $f6, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f0, $f2, $f4, $f6, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f8, $f10, $f12, $f14, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f8, $f10, $f12, $f14, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    MMI_Load8DC($f0, $f2, $f4, $f6, $f8, $f10, $f12, $f14, $f24, %[pDct], 0x10, $f30)
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f0, $f2, $f4, $f6, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f0, $f2, $f4, $f6, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f8, $f10, $f12, $f14, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+
+    PTR_ADDU   "%[pRec], %[pRec], %[iStride]       \n\t"
+    PTR_ADDU   "%[pPred], %[pPred], %[iPredStride] \n\t"
+    MMI_StoreDiff4x8p($f8, $f10, $f12, $f14, $f20, $f22, $f28, %[pRec],
+                      %[pPred], %[iStride], %[iPredStride])
+    : [pRec]"+&r"((uint8_t *)pRec), [pPred]"+&r"((uint8_t *)pPred),
+      [pDct]"+&r"((short *)pDct)
+    : [iStride]"r"((int)iStride), [iPredStride]"r"((int)iPredStride)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsHadamardT4Dc_mmi( int16_t *luma_dc, int16_t *pDct) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    MMI_Load4Col($f4, $f6, $f20, $f24, $f0, %[pDct], 0x0)
+    MMI_Load4Col($f8, $f10, $f20, $f24, $f0, %[pDct], 0x40)
+    MMI_Load4Col($f12, $f14, $f20, $f24, $f0, %[pDct], 0x100)
+    MMI_Load4Col($f16, $f18, $f20, $f24, $f0, %[pDct], 0x140)
+
+    MMI_SumSubD($f4, $f6, $f8, $f10, $f28, $f30)
+    MMI_SumSubD($f12, $f14, $f16, $f18, $f28, $f30)
+    MMI_SumSubD($f8, $f10, $f16, $f18, $f28, $f30)
+    MMI_SumSubD($f4, $f6, $f12, $f14, $f28, $f30)
+
+    MMI_Trans4x4W($f16, $f18, $f8, $f10, $f4, $f6, $f12, $f14, $f20, $f22)
+
+    MMI_SumSubD($f16, $f18, $f12, $f14, $f28, $f30)
+    MMI_SumSubD($f20, $f22, $f4, $f6, $f28, $f30)
+
+    "dli        $8, 0x1F                        \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+
+    WELS_DD1($f24, $f26, $f30)
+
+    "dli        $8, 0x1                         \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+
+    MMI_SumSubDiv2D($f12, $f14, $f4, $f6, $f24, $f26, $f0, $f2, $f30)
+    MMI_SumSubDiv2D($f16, $f18, $f20, $f22, $f24, $f26, $f4, $f6, $f30)
+    MMI_Trans4x4W($f12, $f14, $f0, $f2, $f4, $f6, $f16, $f18, $f8, $f10)
+
+    "packsswh   $f12, $f12, $f14                \n\t"
+    "packsswh   $f14, $f16, $f18                \n\t"
+
+    "packsswh   $f8, $f8, $f10                  \n\t"
+    "packsswh   $f10, $f4, $f6                  \n\t"
+    "gssqc1     $f14, $f12, 0x0(%[luma_dc])     \n\t"
+    "gssqc1     $f10, $f8, 0x10(%[luma_dc])     \n\t"
+   :
+   : [luma_dc]"r"((short *)luma_dc), [pDct]"r"((short *)pDct)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void WelsDctT4_mmi(int16_t *pDct, uint8_t *pix1, int32_t i_pix1,
+                   uint8_t *pix2, int32_t i_pix2 ) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f14, $f14, $f14                \n\t"
+    "dli        $8, 0x1                         \n\t"
+    "dmtc1      $8, $f16                        \n\t"
+
+    MMI_LoadDiff4x4P_SINGLE($f2, $f4, $f6, $f8, %[pix1], %[i_pix1],
+                            %[pix2], %[i_pix2], $f0, $f14)
+
+    MMI_DCT_SINGLE($f2, $f4, $f6, $f8, $f10, $f12, $f16)
+    MMI_Trans4x4H_SINGLE($f6, $f2, $f8, $f10, $f4)
+
+    MMI_DCT_SINGLE($f6, $f10, $f4, $f8, $f2, $f12, $f16)
+    MMI_Trans4x4H_SINGLE($f4, $f6, $f8, $f2, $f10)
+
+    "gssdlc1    $f4, 0x7(%[pDct])               \n\t"
+    "gssdlc1    $f2, 0xF(%[pDct])               \n\t"
+    "gssdlc1    $f10, 0x17(%[pDct])             \n\t"
+    "gssdlc1    $f8, 0x1F(%[pDct])              \n\t"
+    "gssdrc1    $f4, 0x0(%[pDct])               \n\t"
+    "gssdrc1    $f2, 0x8(%[pDct])               \n\t"
+    "gssdrc1    $f10, 0x10(%[pDct])             \n\t"
+    "gssdrc1    $f8, 0x18(%[pDct])              \n\t"
+   : [pDct]"+&r"((short *)pDct), [pix1]"+&r"(pix1), [pix2]"+&r"(pix2)
+   : [i_pix1]"r"(i_pix1), [i_pix2]"r"(i_pix2)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16"
+  );
+}
+
+void WelsDctFourT4_mmi(int16_t *pDct, uint8_t *pix1, int32_t i_pix1,
+                       uint8_t *pix2, int32_t i_pix2 ) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    MMI_LoadDiff8P($f0, $f2, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f4, $f6, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f8, $f10, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f12, $f14, $f24, $f26, $f28, %[pix1], %[pix2])
+
+    MMI_DCT($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f0, $f2)
+    MMI_TransTwo4x4H($f8, $f10, $f0, $f2, $f12, $f14, $f16, $f18, $f4, $f6)
+    MMI_DCT($f0, $f2, $f16, $f18, $f4, $f6, $f12, $f14, $f20, $f22, $f8, $f10)
+    MMI_TransTwo4x4H($f16, $f18, $f8, $f10, $f4, $f6, $f12, $f14, $f0, $f2)
+
+    MMI_Store4x8p(%[pDct], $f16, $f18, $f8, $f10, $f12, $f14, $f0, $f2, $f20, $f22)
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f0, $f2, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f4, $f6, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f8, $f10, $f24, $f26, $f28, %[pix1], %[pix2])
+    PTR_ADDU   "%[pix1], %[pix1], %[i_pix1]     \n\t"
+    PTR_ADDU   "%[pix2], %[pix2], %[i_pix2]     \n\t"
+    MMI_LoadDiff8P($f12, $f14, $f24, $f26, $f28, %[pix1], %[pix2])
+
+    MMI_DCT($f4, $f6, $f8, $f10, $f12, $f14, $f16, $f18, $f20, $f22, $f0, $f2)
+    MMI_TransTwo4x4H($f8, $f10, $f0, $f2, $f12, $f14, $f16, $f18, $f4, $f6)
+    MMI_DCT($f0, $f2, $f16, $f18, $f4, $f6, $f12, $f14, $f20, $f22, $f8, $f10)
+    MMI_TransTwo4x4H($f16, $f18, $f8, $f10, $f4, $f6, $f12, $f14, $f0, $f2)
+
+    PTR_ADDIU  "%[pDct], %[pDct], 0x40          \n\t"
+    MMI_Store4x8p(%[pDct], $f16, $f18, $f8, $f10, $f12, $f14, $f0, $f2, $f20, $f22)
+   : [pDct]"+&r"((short *)pDct), [pix1]"+&r"(pix1), [pix2]"+&r"(pix2)
+   : [i_pix1]"r"(i_pix1), [i_pix2]"r"(i_pix2)
+   : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+     "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/quant_mmi.c b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/quant_mmi.c
new file mode 100644
index 0000000000..0e46a4339a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/quant_mmi.c
@@ -0,0 +1,553 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    quant_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    20/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+void WelsQuant4x4_mmi(int16_t *pDct, const int16_t* ff, const int16_t *mf) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f10, $f10, $f10                \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[ff])           \n\t"
+    "gslqc1     $f14, $f12, 0x0(%[mf])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+   :
+   : [pDct]"r"((short *)pDct), [ff]"r"((short *)ff), [mf]"r"((short *)mf)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14"
+  );
+}
+
+void WelsQuant4x4Dc_mmi(int16_t *pDct, const int16_t ff, int16_t mf) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "xor        $f10, $f10, $f10                \n\t"
+    "dmtc1      %[mf], $f12                     \n\t"
+    "pshufh     $f12, $f12, $f10                \n\t"
+
+    "dmtc1      %[ff], $f8                      \n\t"
+    "pshufh     $f8, $f8, $f10                  \n\t"
+
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f8                   \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f12                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f8                   \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f12                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+   :
+   : [pDct]"r"((short *)pDct), [ff]"r"((short)ff), [mf]"r"((short)mf)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12"
+  );
+}
+
+void WelsQuantFour4x4_mmi(int16_t *pDct, const int16_t* ff, const int16_t *mf) {
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[ff])           \n\t"
+    "gslqc1     $f14, $f12, 0x0(%[mf])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x20(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x20(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x30(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x30(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x40(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x40(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x50(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x50(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x60(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x60(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x70(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x70(%[pDct])         \n\t"
+   :
+   : [pDct]"r"((short *)pDct), [ff]"r"((short *)ff), [mf]"r"((short *)mf)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14"
+  );
+}
+
+void WelsQuantFour4x4Max_mmi(int16_t *pDct, const int16_t*ff,
+                             const int16_t *mf, int16_t *max) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f10, $f8, 0x0(%[ff])           \n\t"
+    "gslqc1     $f14, $f12, 0x0(%[mf])          \n\t"
+
+    "xor        $f16, $f16, $f16                \n\t"
+    "xor        $f18, $f18, $f18                \n\t"
+    "xor        $f20, $f20, $f20                \n\t"
+    "xor        $f22, $f22, $f22                \n\t"
+    "xor        $f24, $f24, $f24                \n\t"
+    "xor        $f26, $f26, $f26                \n\t"
+    "xor        $f28, $f28, $f28                \n\t"
+    "xor        $f30, $f30, $f30                \n\t"
+
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f16, $f16, $f0                 \n\t"
+    "pmaxsh     $f18, $f18, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+
+    "gslqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f16, $f16, $f0                 \n\t"
+    "pmaxsh     $f18, $f18, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x10(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x20(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f20, $f20, $f0                 \n\t"
+    "pmaxsh     $f22, $f22, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x20(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x30(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f20, $f20, $f0                 \n\t"
+    "pmaxsh     $f22, $f22, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x30(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x40(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f24, $f24, $f0                 \n\t"
+    "pmaxsh     $f26, $f26, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x40(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x50(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f24, $f24, $f0                 \n\t"
+    "pmaxsh     $f26, $f26, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x50(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x60(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f28, $f28, $f0                 \n\t"
+    "pmaxsh     $f30, $f30, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x60(%[pDct])         \n\t"
+
+    "gslqc1     $f2, $f0, 0x70(%[pDct])         \n\t"
+    "xor        $f4, $f4, $f4                   \n\t"
+    "xor        $f6, $f6, $f6                   \n\t"
+    "pcmpgth    $f4, $f4, $f0                   \n\t"
+    "pcmpgth    $f6, $f6, $f2                   \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "paddush    $f0, $f0, $f8                   \n\t"
+    "paddush    $f2, $f2, $f10                  \n\t"
+    "pmulhuh    $f0, $f0, $f12                  \n\t"
+    "pmulhuh    $f2, $f2, $f14                  \n\t"
+    "pmaxsh     $f28, $f28, $f0                 \n\t"
+    "pmaxsh     $f30, $f30, $f2                 \n\t"
+    "xor        $f0, $f0, $f4                   \n\t"
+    "xor        $f2, $f2, $f6                   \n\t"
+    "psubh      $f0, $f0, $f4                   \n\t"
+    "psubh      $f2, $f2, $f6                   \n\t"
+    "gssqc1     $f2, $f0, 0x70(%[pDct])         \n\t"
+
+    "mov.d      $f0, $f18                       \n\t"
+    "punpckhhw  $f18, $f16, $f20                \n\t"
+    "punpcklhw  $f16, $f16, $f20                \n\t"
+    "punpckhhw  $f2, $f0, $f22                  \n\t"
+    "punpcklhw  $f0, $f0, $f22                  \n\t"
+
+    "mov.d      $f20, $f26                      \n\t"
+    "punpckhhw  $f26, $f24, $f28                \n\t"
+    "punpcklhw  $f24, $f24, $f28                \n\t"
+    "punpckhhw  $f22, $f20, $f30                \n\t"
+    "punpcklhw  $f20, $f20, $f30                \n\t"
+
+    "mov.d      $f28, $f18                      \n\t"
+    "punpckhwd  $f18, $f16, $f24                \n\t"
+    "punpcklwd  $f16, $f16, $f24                \n\t"
+    "punpckhwd  $f30, $f28, $f26                \n\t"
+    "punpcklwd  $f28, $f28, $f26                \n\t"
+
+    "mov.d      $f24, $f2                       \n\t"
+    "punpckhwd  $f2, $f0, $f20                  \n\t"
+    "punpcklwd  $f0, $f0, $f20                  \n\t"
+    "punpckhwd  $f26, $f24, $f22                \n\t"
+    "punpcklwd  $f24, $f24, $f22                \n\t"
+
+    "mov.d      $f20, $f18                      \n\t"
+    "mov.d      $f18, $f0                       \n\t"
+    "mov.d      $f22, $f2                       \n\t"
+
+    "mov.d      $f0, $f30                       \n\t"
+    "mov.d      $f30, $f24                      \n\t"
+    "mov.d      $f2, $f26                       \n\t"
+
+    "pmaxsh     $f0, $f0, $f16                  \n\t"
+    "pmaxsh     $f2, $f2, $f18                  \n\t"
+
+    "pmaxsh     $f0, $f0, $f20                  \n\t"
+    "pmaxsh     $f2, $f2, $f22                  \n\t"
+
+    "pmaxsh     $f0, $f0, $f28                  \n\t"
+    "pmaxsh     $f2, $f2, $f30                  \n\t"
+
+    "mov.d      $f4, $f0                        \n\t"
+    "mov.d      $f6, $f2                        \n\t"
+
+    "mov.d      $f0, $f2                        \n\t"
+    "mov.d      $f2, $f6                        \n\t"
+
+    "pmaxsh     $f0, $f0, $f4                   \n\t"
+    "pmaxsh     $f2, $f2, $f6                   \n\t"
+
+    "gssdlc1    $f0, 0x7(%[max])                \n\t"
+    "gssdrc1    $f0, 0x0(%[max])                \n\t"
+   :
+   : [pDct]"r"((short *)pDct), [ff]"r"((short *)ff), [mf]"r"((short *)mf),
+     [max]"r"((short *)max)
+   : "memory", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12", "$f14",
+     "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/score_mmi.c b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/score_mmi.c
new file mode 100644
index 0000000000..56f983a38d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/mips/score_mmi.c
@@ -0,0 +1,324 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    score_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    21/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+unsigned char nozero_count_table[] __attribute__((aligned(16))) = {
+    0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4,
+    2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4,
+    2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6,
+    4, 5, 5, 6, 5, 6, 6, 7, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 2, 3, 3, 4, 3, 4, 4, 5,
+    3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6,
+    4, 5, 5, 6, 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+    4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8};
+
+int32_t WelsGetNoneZeroCount_mmi(int16_t *level) {
+  int ret_val = 0;
+  __asm__ volatile(
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[level])         \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[level])        \n\t"
+    "xor        $f8, $f8, $f8                   \n\t"
+    "pcmpeqh    $f0, $f0, $f8                   \n\t"
+    "pcmpeqh    $f2, $f2, $f8                   \n\t"
+    "pcmpeqh    $f4, $f4, $f8                   \n\t"
+    "pcmpeqh    $f6, $f6, $f8                   \n\t"
+    "packsshb   $f4, $f4, $f6                   \n\t"
+    "packsshb   $f6, $f0, $f2                   \n\t"
+    "pmovmskb   $f0, $f4                        \n\t"
+    "pmovmskb   $f2, $f6                        \n\t"
+    "dmfc1      $8, $f0                         \n\t"
+    "dmfc1      $9, $f2                         \n\t"
+    "xor        $8, 0xFF                        \n\t"
+    "xor        $9, 0xFF                        \n\t"
+    PTR_ADDU   "$10, $8, %[nozero_count_table]  \n\t"
+    "lbu        $8, 0x0($10)                    \n\t"
+    PTR_ADDU   "$10, $9, %[nozero_count_table]  \n\t"
+    "lbu        $9, 0x0($10)                    \n\t"
+    PTR_ADDU   "%[ret_val], $8, $9              \n\t"
+    : [ret_val] "=r"((int)ret_val)
+    : [level] "r"((unsigned char *)level),
+      [nozero_count_table] "r"((unsigned char *)nozero_count_table)
+    : "memory", "$8", "$9", "$10", "$f0", "$f2", "$f4", "$f6", "$f8"
+  );
+  return ret_val;
+}
+
+void WelsScan4x4DcAc_mmi(int16_t level[16], int16_t *pDct) {
+  BACKUP_REG;
+  __asm__ volatile(
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[pDct])         \n\t"
+    "dli        $8, 0x3                         \n\t"
+    "dmtc1      $8, $f22                        \n\t"
+    "dli        $8, 0x2                         \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+    "dli        $8, 0x1                         \n\t"
+    "dmtc1      $8, $f26                        \n\t"
+    "dmtc1      $0, $f28                        \n\t"
+    "pextrh     $f18, $f2, $f22                 \n\t"
+    "pextrh     $f20, $f4, $f24                 \n\t"
+    "pextrh     $f16, $f2, $f26                 \n\t"
+    "pinsrh_2   $f4, $f4, $f18                  \n\t"
+    "pinsrh_3   $f2, $f2, $f16                  \n\t"
+    "pextrh     $f18, $f4, $f28                 \n\t"
+    "pinsrh_1   $f2, $f2, $f18                  \n\t"
+    "pinsrh_0   $f4, $f4, $f20                  \n\t"
+    "dli        $8, 0x93                        \n\t"
+    "dmtc1      $8, $f22                        \n\t"
+    "dli        $8, 0x39                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+    "punpckhwd  $f10, $f0, $f2                  \n\t"
+    "punpcklwd  $f8, $f0, $f2                   \n\t"
+    "punpckhwd  $f14, $f4, $f6                  \n\t"
+    "punpcklwd  $f12, $f4, $f6                  \n\t"
+    "mov.d      $f0, $f8                        \n\t"
+    "pshufh     $f2, $f10, $f22                 \n\t"
+    "pshufh     $f4, $f12, $f24                 \n\t"
+    "mov.d      $f6, $f14                       \n\t"
+    "gssqc1     $f2, $f0, 0x0(%[level])         \n\t"
+    "gssqc1     $f6, $f4, 0x10(%[level])        \n\t"
+    :
+    : [level] "r"((short *)level), [pDct] "r"((short *)pDct)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28"
+  );
+  RECOVER_REG;
+}
+
+void WelsScan4x4Ac_mmi(int16_t *zig_value, int16_t *pDct) {
+  BACKUP_REG;
+  __asm__ volatile(
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[pDct])         \n\t"
+    "mov.d      $f8, $f2                        \n\t"
+    "mov.d      $f2, $f4                        \n\t"
+    "mov.d      $f10, $f6                       \n\t"
+
+    "mov.d      $f12, $f2                       \n\t"
+    "punpckhwd  $f2, $f0, $f8                   \n\t"
+    "punpcklwd  $f0, $f0, $f8                   \n\t"
+    "punpckhwd  $f14, $f12, $f10                \n\t"
+    "punpcklwd  $f12, $f12, $f10                \n\t"
+
+    "dmtc1      $0, $f20                        \n\t"
+    "dli        $8, 0x10                        \n\t"
+    "dmtc1      $8, $f22                        \n\t"
+    "dli        $8, 0x30                        \n\t"
+    "dmtc1      $8, $f24                        \n\t"
+    "dli        $8, 0x3                         \n\t"
+    "dmtc1      $8, $f26                        \n\t"
+    "dli        $8, 0x93                        \n\t"
+    "dmtc1      $8, $f28                        \n\t"
+    "dli        $8, 0x39                        \n\t"
+    "dmtc1      $8, $f30                        \n\t"
+    "pextrh     $f16, $f0, $f26                 \n\t"
+    "pextrh     $f18, $f2, $f26                 \n\t"
+    "pinsrh_3   $f2, $f2, $f16                  \n\t"
+    "pextrh     $f16, $f14, $f20                \n\t"
+    "pinsrh_0   $f14, $f14, $f18                \n\t"
+    "pextrh     $f18, $f12, $f20                \n\t"
+    "pinsrh_0   $f12, $f12, $f16                \n\t"
+    "pinsrh_3   $f0, $f0, $f18                  \n\t"
+
+    "mov.d      $f4, $f0                        \n\t"
+    "pshufh     $f6, $f2, $f28                  \n\t"
+    "pshufh     $f8, $f12, $f30                 \n\t"
+    "mov.d      $f10, $f14                      \n\t"
+
+    "mov.d      $f12, $f8                       \n\t"
+    "mov.d      $f14, $f10                      \n\t"
+    "dsrl       $f4, $f4, $f22                  \n\t"
+    "pinsrh_3   $f4, $f4, $f6                   \n\t"
+    "dsrl       $f6, $f6, $f22                  \n\t"
+    "dsll       $f14, $f12, $f24                \n\t"
+    "xor        $f12, $f12, $f12                \n\t"
+    "or         $f4, $f4, $f12                  \n\t"
+    "or         $f6, $f6, $f14                  \n\t"
+    "dsrl       $f8, $f8, $f22                  \n\t"
+    "pinsrh_3   $f8, $f8, $f10                  \n\t"
+    "dsrl       $f10, $f10, $f22                \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[zig_value])     \n\t"
+    "gssqc1     $f10, $f8, 0x10(%[zig_value])   \n\t"
+    :
+    : [zig_value] "r"((short *)zig_value), [pDct] "r"((short *)pDct)
+    : "memory", "$8", "$f0", "$f2", "$f4", "$f6", "$f8", "$f10", "$f12",
+      "$f14", "$f16", "$f18", "$f20", "$f22", "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+unsigned char i_ds_table[]__attribute__((aligned(16))) = {
+      3, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+unsigned char high_mask_table[]__attribute__((aligned(16))) = {
+      0, 0, 0, 3, 0, 2, 3, 6, 0, 2,
+      2, 5, 3, 5, 6, 9, 0, 1, 2, 5,
+      2, 4, 5, 8, 3, 5, 5, 8, 6, 8,
+      9,12, 0, 1, 1, 4, 2, 4, 5, 8,
+      2, 4, 4, 7, 5, 7, 8,11, 3, 4,
+      5, 8, 5, 7, 8,11, 6, 8, 8,11,
+      9,11,12,15, 0, 1, 1, 4, 1, 3,
+      4, 7, 2, 4, 4, 7, 5, 7, 8,11,
+      2, 3, 4, 7, 4, 6, 7,10, 5, 7,
+      7,10, 8,10,11,14, 3, 4, 4, 7,
+      5, 7, 8,11, 5, 7, 7,10, 8,10,
+     11,14, 6, 7, 8,11, 8,10,11,14,
+      9,11,11,14,12,14,15,18, 0, 0,
+      1, 4, 1, 3, 4, 7, 1, 3, 3, 6,
+      4, 6, 7,10, 2, 3, 4, 7, 4, 6,
+      7,10, 5, 7, 7,10, 8,10,11,14,
+      2, 3, 3, 6, 4, 6, 7,10, 4, 6,
+      6, 9, 7, 9,10,13, 5, 6, 7,10,
+      7, 9,10,13, 8,10,10,13,11,13,
+     14,17, 3, 4, 4, 7, 4, 6, 7,10,
+      5, 7, 7,10, 8,10,11,14, 5, 6,
+      7,10, 7, 9,10,13, 8,10,10,13,
+     11,13,14,17, 6, 7, 7,10, 8,10,
+     11,14, 8,10,10,13,11,13,14,17,
+      9,10,11,14,11,13,14,17,12,14,
+     14,17,15,17,18,21};
+
+unsigned char low_mask_table[]__attribute__((aligned(16))) = {
+      0, 3, 2, 6, 2, 5, 5, 9, 1, 5,
+      4, 8, 5, 8, 8,12, 1, 4, 4, 8,
+      4, 7, 7,11, 4, 8, 7,11, 8,11,
+     11,15, 1, 4, 3, 7, 4, 7, 7,11,
+      3, 7, 6,10, 7,10,10,14, 4, 7,
+      7,11, 7,10,10,14, 7,11,10,14,
+     11,14,14,18, 0, 4, 3, 7, 3, 6,
+      6,10, 3, 7, 6,10, 7,10,10,14,
+      3, 6, 6,10, 6, 9, 9,13, 6,10,
+      9,13,10,13,13,17, 4, 7, 6,10,
+      7,10,10,14, 6,10, 9,13,10,13,
+     13,17, 7,10,10,14,10,13,13,17,
+     10,14,13,17,14,17,17,21, 0, 3,
+      3, 7, 3, 6, 6,10, 2, 6, 5, 9,
+      6, 9, 9,13, 3, 6, 6,10, 6, 9,
+      9,13, 6,10, 9,13,10,13,13,17,
+      3, 6, 5, 9, 6, 9, 9,13, 5, 9,
+      8,12, 9,12,12,16, 6, 9, 9,13,
+      9,12,12,16, 9,13,12,16,13,16,
+     16,20, 3, 7, 6,10, 6, 9, 9,13,
+      6,10, 9,13,10,13,13,17, 6, 9,
+      9,13, 9,12,12,16, 9,13,12,16,
+     13,16,16,20, 7,10, 9,13,10,13,
+     13,17, 9,13,12,16,13,16,16,20,
+     10,13,13,17,13,16,16,20,13,17,
+     16,20,17,20,20,24};
+
+int32_t WelsCalculateSingleCtr4x4_mmi(int16_t *pDct) {
+  int32_t iSingleCtr = 0;
+  __asm__ volatile(
+    ".set       arch=loongson3a                 \n\t"
+    "gslqc1     $f2, $f0, 0x0(%[pDct])          \n\t"
+    "gslqc1     $f6, $f4, 0x10(%[pDct])         \n\t"
+    "packsshb   $f0, $f0, $f2                   \n\t"
+    "packsshb   $f2, $f4, $f6                   \n\t"
+
+    "xor        $f10, $f10, $f10                \n\t"
+    "xor        $f8, $f8, $f8                   \n\t"
+
+    "pcmpeqb    $f0, $f0, $f8                   \n\t"
+    "pcmpeqb    $f2, $f2, $f8                   \n\t"
+
+    "pmovmskb   $f10, $f0                       \n\t"
+    "pmovmskb   $f12, $f2                       \n\t"
+    "punpcklbh  $f10, $f10, $f12                \n\t"
+
+    "dmfc1      $12, $f10                       \n\t"
+    "dli        $8, 0xffff                      \n\t"
+    "xor        $12, $12, $8                    \n\t"
+
+    "xor        %[pDct], %[pDct], %[pDct]       \n\t"
+    "dli        $8, 0x80                        \n\t"
+    "dli        $9, 0x7                         \n\t"
+    "dli        $10, 0x100                      \n\t"
+    "dli        $11, 0x8                        \n\t"
+
+    "1:                                         \n\t"
+    "and        $13, $12, $8                    \n\t"
+    "bnez       $13, 2f                         \n\t"
+    "nop                                        \n\t"
+    "daddiu     $9, -0x1                        \n\t"
+    "dsrl       $8, 1                           \n\t"
+    "bnez       $9, 1b                          \n\t"
+    "nop                                        \n\t"
+    "2:                                         \n\t"
+    "and        $13, $12, $10                   \n\t"
+    "bnez       $13, 3f                         \n\t"
+    "nop                                        \n\t"
+    "daddiu     $11, 0x1                        \n\t"
+    "dsll       $10, 1                          \n\t"
+    "daddiu     $13, $11, -0x10                 \n\t"
+    "bltz       $13, 2b                         \n\t"
+    "nop                                        \n\t"
+    "3:                                         \n\t"
+    "dsubu      $11, $11, $9                    \n\t"
+    "daddiu     $11, -0x1                       \n\t"
+    PTR_ADDU   "$8, %[i_ds_table], $11          \n\t"
+    "lb         $10, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDct], %[pDct], $10           \n\t"
+    "move       $11, $12                        \n\t"
+    "dli        $10, 0xff                       \n\t"
+    "and        $12, $10                        \n\t"
+    "dsrl       $11, 0x8                        \n\t"
+    "and        $11, $10                        \n\t"
+    PTR_ADDU   "$8, %[low_mask_table], $12      \n\t"
+    "lb         $10, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[pDct], %[pDct], $10           \n\t"
+    PTR_ADDU   "$8, %[high_mask_table], $11     \n\t"
+    "lb         $10, 0x0($8)                    \n\t"
+    PTR_ADDU   "%[iSingleCtr], %[pDct], $10     \n\t"
+    : [iSingleCtr] "=r"(iSingleCtr)
+    : [pDct] "r"((short *)pDct),
+      [i_ds_table] "r"((unsigned char *)i_ds_table),
+      [high_mask_table] "r"((unsigned char *)high_mask_table),
+      [low_mask_table] "r"((unsigned char *)low_mask_table)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$f0", "$f2", "$f4",
+      "$f6", "$f8", "$f10", "$f12"
+  );
+  return iSingleCtr;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/au_set.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/au_set.cpp
new file mode 100644
index 0000000000..a49df47520
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/au_set.cpp
@@ -0,0 +1,634 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    au_set.c
+ *
+ * \brief   Interfaces introduced in Access Unit level based writer
+ *
+ * \date    05/18/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "au_set.h"
+#include "svc_enc_golomb.h"
+#include "macros.h"
+
+#include "wels_common_defs.h"
+
+using namespace WelsCommon;
+
+namespace WelsEnc {
+
+static inline int32_t WelsCheckLevelLimitation (const SWelsSPS* kpSps, const SLevelLimits* kpLevelLimit,
+    float fFrameRate, int32_t iTargetBitRate) {
+  uint32_t uiPicWidthInMBs = kpSps->iMbWidth;
+  uint32_t uiPicHeightInMBs = kpSps->iMbHeight;
+  uint32_t uiPicInMBs = uiPicWidthInMBs * uiPicHeightInMBs;
+  uint32_t uiNumRefFrames = kpSps->iNumRefFrames;
+
+  if (kpLevelLimit->uiMaxMBPS < (uint32_t) (uiPicInMBs * fFrameRate))
+    return 0;
+  if (kpLevelLimit->uiMaxFS < uiPicInMBs)
+    return 0;
+  if ((kpLevelLimit->uiMaxFS << 3) < (uiPicWidthInMBs * uiPicWidthInMBs))
+    return 0;
+  if ((kpLevelLimit->uiMaxFS << 3) < (uiPicHeightInMBs * uiPicHeightInMBs))
+    return 0;
+  if (kpLevelLimit->uiMaxDPBMbs < uiNumRefFrames * uiPicInMBs)
+    return 0;
+  if ((iTargetBitRate != UNSPECIFIED_BIT_RATE)
+      && ((int32_t) kpLevelLimit->uiMaxBR  * 1200) < iTargetBitRate)    //RC enabled, considering bitrate constraint
+    return 0;
+  //add more checks here if needed in future
+
+  return 1;
+
+}
+int32_t WelsAdjustLevel (SSpatialLayerConfig* pSpatialLayer, const SLevelLimits* pCurLevel) {
+  int32_t iMaxBitrate = pSpatialLayer->iMaxSpatialBitrate;
+  do {
+    if (iMaxBitrate <= (int32_t) (pCurLevel->uiMaxBR * CpbBrNalFactor)) {
+      pSpatialLayer->uiLevelIdc = pCurLevel->uiLevelIdc;
+      return 0;
+    }
+    pCurLevel++;
+  } while (pCurLevel->uiLevelIdc != LEVEL_5_2);
+  return 1;
+}
+
+static int32_t WelsCheckNumRefSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, bool bStrictCheck) {
+  // validate LTR num
+  int32_t iCurrentSupportedLtrNum = (pParam->iUsageType == CAMERA_VIDEO_REAL_TIME) ? LONG_TERM_REF_NUM :
+                                    LONG_TERM_REF_NUM_SCREEN;
+  if ((pParam->bEnableLongTermReference) && (iCurrentSupportedLtrNum != pParam->iLTRRefNum)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING, "iLTRRefNum(%d) does not equal to currently supported %d, will be reset",
+             pParam->iLTRRefNum, iCurrentSupportedLtrNum);
+    pParam->iLTRRefNum = iCurrentSupportedLtrNum;
+  } else if (!pParam->bEnableLongTermReference) {
+    pParam->iLTRRefNum = 0;
+  }
+
+  //TODO: here is a fix needed here, the most reasonable value should be:
+  //        iCurrentStrNum = WELS_MAX (1, WELS_LOG2 (pParam->uiGopSize));
+  //      but reference list updating need to be changed
+  int32_t iCurrentStrNum = ((pParam->iUsageType == SCREEN_CONTENT_REAL_TIME && pParam->bEnableLongTermReference)
+                            ? (WELS_MAX (1, WELS_LOG2 (pParam->uiGopSize)))
+                            : (WELS_MAX (1, (pParam->uiGopSize >> 1))));
+  int32_t iNeededRefNum = (pParam->uiIntraPeriod != 1) ? (iCurrentStrNum + pParam->iLTRRefNum) : 0;
+
+  iNeededRefNum = WELS_CLIP3 (iNeededRefNum,
+                              MIN_REF_PIC_COUNT,
+                              (pParam->iUsageType == CAMERA_VIDEO_REAL_TIME) ? MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA :
+                              MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN);
+  // to adjust default or invalid input, in case pParam->iNumRefFrame do not have a valid value for the next step
+  if (pParam->iNumRefFrame == AUTO_REF_PIC_COUNT) {
+    pParam->iNumRefFrame = iNeededRefNum;
+  } else if (pParam->iNumRefFrame < iNeededRefNum) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "iNumRefFrame(%d) setting does not support the temporal and LTR setting, will be reset to %d",
+             pParam->iNumRefFrame, iNeededRefNum);
+    if (bStrictCheck) {
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+    pParam->iNumRefFrame = iNeededRefNum;
+  }
+
+  // after adjustment, do the following:
+  // if the setting is larger than needed, we will use the needed, and write the max into sps and for memory to wait for further expanding
+  if (pParam->iMaxNumRefFrame < pParam->iNumRefFrame) {
+    pParam->iMaxNumRefFrame = pParam->iNumRefFrame;
+  }
+  pParam->iNumRefFrame = iNeededRefNum;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t WelsCheckRefFrameLimitationNumRefFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam) {
+
+  if (WelsCheckNumRefSetting (pLogCtx, pParam, false)) {
+    // we take num-ref as the honored setting but it conflicts with temporal and LTR
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+  return ENC_RETURN_SUCCESS;
+}
+int32_t WelsCheckRefFrameLimitationLevelIdcFirst (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam) {
+  if ((pParam->iNumRefFrame == AUTO_REF_PIC_COUNT) || (pParam->iMaxNumRefFrame == AUTO_REF_PIC_COUNT)) {
+    //no need to do the checking
+    return ENC_RETURN_SUCCESS;
+  }
+
+  WelsCheckNumRefSetting (pLogCtx, pParam, false);
+
+  int32_t i = 0;
+  int32_t iRefFrame;
+  //get the number of reference frame according to level limitation.
+  for (i = 0; i < pParam->iSpatialLayerNum; ++ i) {
+    SSpatialLayerConfig* pSpatialLayer = &pParam->sSpatialLayers[i];
+    if (pSpatialLayer->uiLevelIdc == LEVEL_UNKNOWN) {
+      continue;
+    }
+
+    uint32_t uiPicInMBs = ((pSpatialLayer->iVideoHeight + 15) >> 4) * ((pSpatialLayer->iVideoWidth + 15) >> 4);
+    iRefFrame = g_ksLevelLimits[pSpatialLayer->uiLevelIdc - 1].uiMaxDPBMbs / uiPicInMBs;
+
+    //check iMaxNumRefFrame
+    if (iRefFrame < pParam->iMaxNumRefFrame) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "iMaxNumRefFrame(%d) adjusted to %d because of limitation from uiLevelIdc=%d",
+               pParam->iMaxNumRefFrame, iRefFrame, pSpatialLayer->uiLevelIdc);
+      pParam->iMaxNumRefFrame = iRefFrame;
+
+      //check iNumRefFrame
+      if (iRefFrame < pParam->iNumRefFrame) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "iNumRefFrame(%d) adjusted to %d because of limitation from uiLevelIdc=%d",
+                 pParam->iNumRefFrame, iRefFrame, pSpatialLayer->uiLevelIdc);
+        pParam->iNumRefFrame = iRefFrame;
+      }
+    } else {
+      //because it is level first now, so adjust max-ref
+      WelsLog (pLogCtx, WELS_LOG_INFO,
+               "iMaxNumRefFrame(%d) adjusted to %d because of uiLevelIdc=%d -- under level-idc first strategy ",
+               pParam->iMaxNumRefFrame, iRefFrame, pSpatialLayer->uiLevelIdc);
+      pParam->iMaxNumRefFrame = iRefFrame;
+    }
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+static inline ELevelIdc WelsGetLevelIdc (const SWelsSPS* kpSps, float fFrameRate, int32_t iTargetBitRate) {
+  int32_t iOrder;
+  for (iOrder = 0; iOrder < LEVEL_NUMBER; iOrder++) {
+    if (WelsCheckLevelLimitation (kpSps, & (g_ksLevelLimits[iOrder]), fFrameRate, iTargetBitRate)) {
+      return (g_ksLevelLimits[iOrder].uiLevelIdc);
+    }
+  }
+  return LEVEL_5_1; //final decision: select the biggest level
+}
+
+int32_t WelsWriteVUI (SWelsSPS* pSps, SBitStringAux* pBitStringAux) {
+  SBitStringAux* pLocalBitStringAux = pBitStringAux;
+  assert (pSps != NULL && pBitStringAux != NULL);
+
+  BsWriteOneBit (pLocalBitStringAux, pSps->bAspectRatioPresent); //aspect_ratio_info_present_flag
+  if (pSps->bAspectRatioPresent) {
+    BsWriteBits (pLocalBitStringAux, 8, pSps->eAspectRatio); // aspect_ratio_idc
+    if (pSps->eAspectRatio == ASP_EXT_SAR) {
+      BsWriteBits (pLocalBitStringAux, 16, pSps->sAspectRatioExtWidth); // sar_width
+      BsWriteBits (pLocalBitStringAux, 16, pSps->sAspectRatioExtHeight); // sar_height
+    }
+  }
+  BsWriteOneBit (pLocalBitStringAux, false); //overscan_info_present_flag
+
+  // See codec_app_def.h and parameter_sets.h for more info about members bVideoSignalTypePresent through uiColorMatrix.
+  BsWriteOneBit (pLocalBitStringAux, pSps->bVideoSignalTypePresent); //video_signal_type_present_flag
+  if (pSps->bVideoSignalTypePresent) {
+    //write video signal type info to header
+
+    BsWriteBits (pLocalBitStringAux, 3, pSps->uiVideoFormat);
+    BsWriteOneBit (pLocalBitStringAux, pSps->bFullRange);
+    BsWriteOneBit (pLocalBitStringAux, pSps->bColorDescriptionPresent);
+
+    if (pSps->bColorDescriptionPresent) {
+      //write color description info to header
+
+      BsWriteBits (pLocalBitStringAux, 8, pSps->uiColorPrimaries);
+      BsWriteBits (pLocalBitStringAux, 8, pSps->uiTransferCharacteristics);
+      BsWriteBits (pLocalBitStringAux, 8, pSps->uiColorMatrix);
+
+    }//write color description info to header
+
+  }//write video signal type info to header
+
+  BsWriteOneBit (pLocalBitStringAux, false); //chroma_loc_info_present_flag
+  BsWriteOneBit (pLocalBitStringAux, false); //timing_info_present_flag
+  BsWriteOneBit (pLocalBitStringAux, false); //nal_hrd_parameters_present_flag
+  BsWriteOneBit (pLocalBitStringAux, false); //vcl_hrd_parameters_present_flag
+  BsWriteOneBit (pLocalBitStringAux, false); //pic_struct_present_flag
+  BsWriteOneBit (pLocalBitStringAux, true); //bitstream_restriction_flag
+
+  //
+  BsWriteOneBit (pLocalBitStringAux, true); //motion_vectors_over_pic_boundaries_flag
+  BsWriteUE (pLocalBitStringAux, 0); //max_bytes_per_pic_denom
+  BsWriteUE (pLocalBitStringAux, 0); //max_bits_per_mb_denom
+  BsWriteUE (pLocalBitStringAux, 16); //log2_max_mv_length_horizontal
+  BsWriteUE (pLocalBitStringAux, 16); //log2_max_mv_length_vertical
+
+  BsWriteUE (pLocalBitStringAux, 0); //max_num_reorder_frames
+  BsWriteUE (pLocalBitStringAux, pSps->iNumRefFrames); //max_dec_frame_buffering
+
+  return 0;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to set Sequence Parameter Set (SPS)
+ *
+ * \param   pSps            SWelsSPS to be wrote, update iSpsId dependency
+ * \param   pBitStringAux   bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is SPS.
+ *************************************************************************************
+ */
+int32_t WelsWriteSpsSyntax (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_t* pSpsIdDelta, bool bBaseLayer) {
+  SBitStringAux* pLocalBitStringAux = pBitStringAux;
+
+  assert (pSps != NULL && pBitStringAux != NULL);
+
+  BsWriteBits (pLocalBitStringAux, 8, pSps->uiProfileIdc);
+
+  BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet0Flag);        // bConstraintSet0Flag
+  BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet1Flag);        // bConstraintSet1Flag
+  BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet2Flag);        // bConstraintSet2Flag
+  BsWriteOneBit (pLocalBitStringAux, pSps->bConstraintSet3Flag);        // bConstraintSet3Flag
+  if (PRO_HIGH == pSps->uiProfileIdc || PRO_EXTENDED == pSps->uiProfileIdc ||
+      PRO_MAIN == pSps->uiProfileIdc) {
+    BsWriteOneBit (pLocalBitStringAux, 1);        // bConstraintSet4Flag: If profile_idc is equal to 77, 88, or 100, constraint_set4_flag equal to 1 indicates that the value of frame_mbs_only_flag is equal to 1. constraint_set4_flag equal to 0 indicates that the value of frame_mbs_only_flag may or may not be equal to 1.
+    BsWriteOneBit (pLocalBitStringAux, 1);        // bConstraintSet5Flag: If profile_idc is equal to 77, 88, or 100, constraint_set5_flag equal to 1 indicates that B slice types are not present in the coded video sequence. constraint_set5_flag equal to 0 indicates that B slice types may or may not be present in the coded video sequence.
+    BsWriteBits (pLocalBitStringAux, 2, 0);                               // reserved_zero_2bits, equal to 0
+  } else {
+    BsWriteBits (pLocalBitStringAux, 4, 0);                               // reserved_zero_4bits, equal to 0
+  }
+  BsWriteBits (pLocalBitStringAux, 8, pSps->iLevelIdc);                 // iLevelIdc
+  BsWriteUE (pLocalBitStringAux, pSps->uiSpsId + pSpsIdDelta[pSps->uiSpsId]);        // seq_parameter_set_id
+
+  if (PRO_SCALABLE_BASELINE == pSps->uiProfileIdc || PRO_SCALABLE_HIGH == pSps->uiProfileIdc ||
+      PRO_HIGH == pSps->uiProfileIdc || PRO_HIGH10 == pSps->uiProfileIdc ||
+      PRO_HIGH422 == pSps->uiProfileIdc || PRO_HIGH444 == pSps->uiProfileIdc ||
+      PRO_CAVLC444 == pSps->uiProfileIdc || 44 == pSps->uiProfileIdc) {
+    BsWriteUE (pLocalBitStringAux, 1);  //uiChromaFormatIdc, now should be 1
+    BsWriteUE (pLocalBitStringAux, 0); //uiBitDepthLuma
+    BsWriteUE (pLocalBitStringAux, 0); //uiBitDepthChroma
+    BsWriteOneBit (pLocalBitStringAux, 0); //qpprime_y_zero_transform_bypass_flag
+    BsWriteOneBit (pLocalBitStringAux, 0); //seq_scaling_matrix_present_flag
+  }
+
+  BsWriteUE (pLocalBitStringAux, pSps->uiLog2MaxFrameNum - 4);  // log2_max_frame_num_minus4
+  BsWriteUE (pLocalBitStringAux, 0/*pSps->uiPocType*/);         // pic_order_cnt_type
+  BsWriteUE (pLocalBitStringAux, pSps->iLog2MaxPocLsb - 4);     // log2_max_pic_order_cnt_lsb_minus4
+
+  BsWriteUE (pLocalBitStringAux, pSps->iNumRefFrames);          // max_num_ref_frames
+  BsWriteOneBit (pLocalBitStringAux, pSps->bGapsInFrameNumValueAllowedFlag); //gaps_in_frame_numvalue_allowed_flag
+  BsWriteUE (pLocalBitStringAux, pSps->iMbWidth - 1);           // pic_width_in_mbs_minus1
+  BsWriteUE (pLocalBitStringAux, pSps->iMbHeight - 1);          // pic_height_in_map_units_minus1
+  BsWriteOneBit (pLocalBitStringAux, true/*pSps->bFrameMbsOnlyFlag*/);  // bFrameMbsOnlyFlag
+
+  BsWriteOneBit (pLocalBitStringAux, 0/*pSps->bDirect8x8InferenceFlag*/);       // direct_8x8_inference_flag
+  BsWriteOneBit (pLocalBitStringAux, pSps->bFrameCroppingFlag); // bFrameCroppingFlag
+  if (pSps->bFrameCroppingFlag) {
+    BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropLeft);         // frame_crop_left_offset
+    BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropRight);        // frame_crop_right_offset
+    BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropTop);          // frame_crop_top_offset
+    BsWriteUE (pLocalBitStringAux, pSps->sFrameCrop.iCropBottom);       // frame_crop_bottom_offset
+  }
+  if (bBaseLayer) {
+    BsWriteOneBit (pLocalBitStringAux, true);   // vui_parameters_present_flag
+    WelsWriteVUI (pSps, pBitStringAux);
+  } else {
+    BsWriteOneBit (pLocalBitStringAux, false);
+  }
+  return 0;
+}
+
+
+int32_t WelsWriteSpsNal (SWelsSPS* pSps, SBitStringAux* pBitStringAux, int32_t* pSpsIdDelta) {
+  WelsWriteSpsSyntax (pSps, pBitStringAux, pSpsIdDelta, true);
+
+  BsRbspTrailingBits (pBitStringAux);
+
+  return 0;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to write SubSet Sequence Parameter Set
+ *
+ * \param   sub_sps         subset pSps parsed
+ * \param   pBitStringAux   bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is SubSet SPS.
+ *************************************************************************************
+ */
+
+int32_t WelsWriteSubsetSpsSyntax (SSubsetSps* pSubsetSps, SBitStringAux* pBitStringAux , int32_t* pSpsIdDelta) {
+  SWelsSPS* pSps = &pSubsetSps->pSps;
+
+  WelsWriteSpsSyntax (pSps, pBitStringAux, pSpsIdDelta, false);
+
+  if (pSps->uiProfileIdc == PRO_SCALABLE_BASELINE || pSps->uiProfileIdc == PRO_SCALABLE_HIGH) {
+    SSpsSvcExt* pSubsetSpsExt = &pSubsetSps->sSpsSvcExt;
+
+    BsWriteOneBit (pBitStringAux, true/*pSubsetSpsExt->bInterLayerDeblockingFilterCtrlPresentFlag*/);
+    BsWriteBits (pBitStringAux, 2, pSubsetSpsExt->iExtendedSpatialScalability);
+    BsWriteOneBit (pBitStringAux, 0/*pSubsetSpsExt->uiChromaPhaseXPlus1Flag*/);
+    BsWriteBits (pBitStringAux, 2, 1/*pSubsetSpsExt->uiChromaPhaseYPlus1*/);
+    if (pSubsetSpsExt->iExtendedSpatialScalability == 1) {
+      BsWriteOneBit (pBitStringAux, 0/*pSubsetSpsExt->uiSeqRefLayerChromaPhaseXPlus1Flag*/);
+      BsWriteBits (pBitStringAux, 2, 1/*pSubsetSpsExt->uiSeqRefLayerChromaPhaseYPlus1*/);
+      BsWriteSE (pBitStringAux, 0/*pSubsetSpsExt->sSeqScaledRefLayer.left_offset*/);
+      BsWriteSE (pBitStringAux, 0/*pSubsetSpsExt->sSeqScaledRefLayer.top_offset*/);
+      BsWriteSE (pBitStringAux, 0/*pSubsetSpsExt->sSeqScaledRefLayer.right_offset*/);
+      BsWriteSE (pBitStringAux, 0/*pSubsetSpsExt->sSeqScaledRefLayer.bottom_offset*/);
+    }
+    BsWriteOneBit (pBitStringAux, pSubsetSpsExt->bSeqTcoeffLevelPredFlag);
+    if (pSubsetSpsExt->bSeqTcoeffLevelPredFlag) {
+      BsWriteOneBit (pBitStringAux, pSubsetSpsExt->bAdaptiveTcoeffLevelPredFlag);
+    }
+    BsWriteOneBit (pBitStringAux, pSubsetSpsExt->bSliceHeaderRestrictionFlag);
+
+    BsWriteOneBit (pBitStringAux, false/*pSubsetSps->bSvcVuiParamPresentFlag*/);
+  }
+  BsWriteOneBit (pBitStringAux, false/*pSubsetSps->bAdditionalExtension2Flag*/);
+
+  BsRbspTrailingBits (pBitStringAux);
+
+  return 0;
+}
+
+/*!
+ *************************************************************************************
+ * \brief   to write Picture Parameter Set (PPS)
+ *
+ * \param   pPps            pPps
+ * \param   pBitStringAux   bitstream writer auxiliary
+ *
+ * \return  0 - successed
+ *          1 - failed
+ *
+ * \note    Call it in case EWelsNalUnitType is PPS.
+ *************************************************************************************
+ */
+int32_t WelsWritePpsSyntax (SWelsPPS* pPps, SBitStringAux* pBitStringAux,
+                            IWelsParametersetStrategy* pParametersetStrategy) {
+  SBitStringAux* pLocalBitStringAux = pBitStringAux;
+
+  BsWriteUE (pLocalBitStringAux, pPps->iPpsId + pParametersetStrategy->GetPpsIdOffset (pPps->iPpsId));
+  BsWriteUE (pLocalBitStringAux, pPps->iSpsId + pParametersetStrategy->GetSpsIdOffset (pPps->iPpsId, pPps->iSpsId));
+
+  BsWriteOneBit (pLocalBitStringAux, pPps->bEntropyCodingModeFlag);
+  BsWriteOneBit (pLocalBitStringAux, false/*pPps->bPicOrderPresentFlag*/);
+
+#ifdef DISABLE_FMO_FEATURE
+  BsWriteUE (pLocalBitStringAux, 0/*pPps->uiNumSliceGroups - 1*/);
+#else
+  BsWriteUE (pLocalBitStringAux, pPps->uiNumSliceGroups - 1);
+  if (pPps->uiNumSliceGroups > 1) {
+    uint32_t i, uiNumBits;
+
+    BsWriteUE (pLocalBitStringAux, pPps->uiSliceGroupMapType);
+
+    switch (pPps->uiSliceGroupMapType) {
+    case 0:
+      for (i = 0; i < pPps->uiNumSliceGroups; i ++) {
+        BsWriteUE (pLocalBitStringAux, pPps->uiRunLength[i] - 1);
+      }
+      break;
+    case 2:
+      for (i = 0; i < pPps->uiNumSliceGroups; i ++) {
+        BsWriteUE (pLocalBitStringAux, pPps->uiTopLeft[i]);
+        BsWriteUE (pLocalBitStringAux, pPps->uiBottomRight[i]);
+      }
+      break;
+    case 3:
+    case 4:
+    case 5:
+      BsWriteOneBit (pLocalBitStringAux, pPps->bSliceGroupChangeDirectionFlag);
+      BsWriteUE (pLocalBitStringAux, pPps->uiSliceGroupChangeRate - 1);
+      break;
+    case 6:
+      BsWriteUE (pLocalBitStringAux, pPps->uiPicSizeInMapUnits - 1);
+      uiNumBits = 0;///////////////////WELS_CEILLOG2(pPps->uiPicSizeInMapUnits);
+      for (i = 0; i < pPps->uiPicSizeInMapUnits; i ++) {
+        BsWriteBits (pLocalBitStringAux, uiNumBits, pPps->uiSliceGroupId[i]);
+      }
+      break;
+    default:
+      break;
+    }
+  }
+#endif//!DISABLE_FMO_FEATURE
+
+  BsWriteUE (pLocalBitStringAux, 0/*pPps->uiNumRefIdxL0Active - 1*/);
+  BsWriteUE (pLocalBitStringAux, 0/*pPps->uiNumRefIdxL1Active - 1*/);
+
+
+  BsWriteOneBit (pLocalBitStringAux, false/*pPps->bWeightedPredFlag*/);
+  BsWriteBits (pLocalBitStringAux, 2, 0/*pPps->uiWeightedBiPredIdc*/);
+
+  BsWriteSE (pLocalBitStringAux, pPps->iPicInitQp - 26);
+  BsWriteSE (pLocalBitStringAux, pPps->iPicInitQs - 26);
+
+  BsWriteSE (pLocalBitStringAux, pPps->uiChromaQpIndexOffset);
+  BsWriteOneBit (pLocalBitStringAux, pPps->bDeblockingFilterControlPresentFlag);
+  BsWriteOneBit (pLocalBitStringAux, false/*pPps->bConstainedIntraPredFlag*/);
+  BsWriteOneBit (pLocalBitStringAux, false/*pPps->bRedundantPicCntPresentFlag*/);
+
+  BsRbspTrailingBits (pLocalBitStringAux);
+
+  return 0;
+}
+
+static inline bool WelsGetPaddingOffset (int32_t iActualWidth, int32_t iActualHeight,  int32_t iWidth,
+    int32_t iHeight, SCropOffset& pOffset) {
+  if ((iWidth < iActualWidth) || (iHeight < iActualHeight))
+    return false;
+
+  // make actual size even
+  iActualWidth -= (iActualWidth & 1);
+  iActualHeight -= (iActualHeight & 1);
+
+  pOffset.iCropLeft = 0;
+  pOffset.iCropRight = (iWidth - iActualWidth) / 2;
+  pOffset.iCropTop = 0;
+  pOffset.iCropBottom = (iHeight - iActualHeight) / 2;
+
+  return (iWidth > iActualWidth) || (iHeight > iActualHeight);
+}
+int32_t WelsInitSps (SWelsSPS* pSps, SSpatialLayerConfig* pLayerParam, SSpatialLayerInternal* pLayerParamInternal,
+                     const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
+                     const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
+                     const int32_t kiDlayerCount, bool bSVCBaselayer) {
+  memset (pSps, 0, sizeof (SWelsSPS));
+  pSps->uiSpsId         = kuiSpsId;
+  pSps->iMbWidth        = (pLayerParam->iVideoWidth + 15) >> 4;
+  pSps->iMbHeight       = (pLayerParam->iVideoHeight + 15) >> 4;
+
+  //max value of both iFrameNum and POC are 2^16-1, in our encoder, iPOC=2*iFrameNum, so max of iFrameNum should be 2^15-1.--
+  pSps->uiLog2MaxFrameNum = 15;//16;
+  pSps->iLog2MaxPocLsb = 1 + pSps->uiLog2MaxFrameNum;
+
+  pSps->iNumRefFrames = kiNumRefFrame;        /* min pRef size when fifo pRef operation*/
+
+  if (kbEnableFrameCropping) {
+    // TODO: get frame_crop_left_offset, frame_crop_right_offset, frame_crop_top_offset, frame_crop_bottom_offset
+    pSps->bFrameCroppingFlag = WelsGetPaddingOffset (pLayerParamInternal->iActualWidth, pLayerParamInternal->iActualHeight,
+                               pLayerParam->iVideoWidth, pLayerParam->iVideoHeight, pSps->sFrameCrop);
+  } else {
+    pSps->bFrameCroppingFlag = false;
+  }
+  pSps->uiProfileIdc = pLayerParam->uiProfileIdc ? pLayerParam->uiProfileIdc : PRO_BASELINE;
+  if (pLayerParam->uiProfileIdc == PRO_BASELINE) {
+    pSps->bConstraintSet0Flag = true;
+  }
+  if (pLayerParam->uiProfileIdc <= PRO_MAIN) {
+    pSps->bConstraintSet1Flag = true;
+  }
+  if ((kiDlayerCount > 1) && bSVCBaselayer) {
+    pSps->bConstraintSet2Flag = true;
+  }
+
+  ELevelIdc uiLevel = WelsGetLevelIdc (pSps, pLayerParamInternal->fOutputFrameRate, pLayerParam->iSpatialBitrate);
+  //update level
+  //for Scalable Baseline, Scalable High, and Scalable High Intra profiles.If level_idc is equal to 9, the indicated level is level 1b.
+  //for the Baseline, Constrained Baseline, Main, and Extended profiles,If level_idc is equal to 11 and constraint_set3_flag is equal to 1, the indicated level is level 1b.
+  if ((uiLevel == LEVEL_1_B) &&
+      ((pSps->uiProfileIdc == PRO_BASELINE) || (pSps->uiProfileIdc == PRO_MAIN) || (pSps->uiProfileIdc == PRO_EXTENDED))) {
+    uiLevel = LEVEL_1_1;
+    pSps->bConstraintSet3Flag = true;
+  }
+  if ((pLayerParam->uiLevelIdc == LEVEL_UNKNOWN) || (pLayerParam->uiLevelIdc < uiLevel)) {
+    pLayerParam->uiLevelIdc = uiLevel;
+  }
+  pSps->iLevelIdc = pLayerParam->uiLevelIdc;
+
+  //bGapsInFrameNumValueAllowedFlag is false when only spatial layer number and temporal layer number is 1, and ltr is 0.
+  if ((kiDlayerCount == 1) && (pSps->iNumRefFrames == 1))
+    pSps->bGapsInFrameNumValueAllowedFlag = false;
+  else
+    pSps->bGapsInFrameNumValueAllowedFlag = true;
+
+  pSps->bVuiParamPresentFlag = true;
+
+  pSps->bAspectRatioPresent = pLayerParam->bAspectRatioPresent;
+  pSps->eAspectRatio = pLayerParam->eAspectRatio;
+  pSps->sAspectRatioExtWidth = pLayerParam->sAspectRatioExtWidth;
+  pSps->sAspectRatioExtHeight = pLayerParam->sAspectRatioExtHeight;
+
+  // See codec_app_def.h and parameter_sets.h for more info about members bVideoSignalTypePresent through uiColorMatrix.
+  pSps->bVideoSignalTypePresent =   pLayerParam->bVideoSignalTypePresent;
+  pSps->uiVideoFormat =             pLayerParam->uiVideoFormat;
+  pSps->bFullRange =                pLayerParam->bFullRange;
+  pSps->bColorDescriptionPresent =  pLayerParam->bColorDescriptionPresent;
+  pSps->uiColorPrimaries =          pLayerParam->uiColorPrimaries;
+  pSps->uiTransferCharacteristics = pLayerParam->uiTransferCharacteristics;
+  pSps->uiColorMatrix =             pLayerParam->uiColorMatrix;
+
+  return 0;
+}
+
+
+int32_t WelsInitSubsetSps (SSubsetSps* pSubsetSps, SSpatialLayerConfig* pLayerParam,
+                           SSpatialLayerInternal* pLayerParamInternal,
+                           const uint32_t kuiIntraPeriod, const int32_t kiNumRefFrame,
+                           const uint32_t kuiSpsId, const bool kbEnableFrameCropping, bool bEnableRc,
+                           const int32_t kiDlayerCount) {
+  SWelsSPS* pSps = &pSubsetSps->pSps;
+
+  memset (pSubsetSps, 0, sizeof (SSubsetSps));
+
+  WelsInitSps (pSps, pLayerParam, pLayerParamInternal, kuiIntraPeriod, kiNumRefFrame, kuiSpsId, kbEnableFrameCropping,
+               bEnableRc, kiDlayerCount, false);
+
+  pSps->uiProfileIdc = pLayerParam->uiProfileIdc ;
+
+  pSubsetSps->sSpsSvcExt.iExtendedSpatialScalability    = 0;    /* ESS is 0 in default */
+  pSubsetSps->sSpsSvcExt.bAdaptiveTcoeffLevelPredFlag   = false;
+  pSubsetSps->sSpsSvcExt.bSeqTcoeffLevelPredFlag        = false;
+  pSubsetSps->sSpsSvcExt.bSliceHeaderRestrictionFlag = true;
+
+  return 0;
+}
+
+int32_t WelsInitPps (SWelsPPS* pPps,
+                     SWelsSPS* pSps,
+                     SSubsetSps* pSubsetSps,
+                     const uint32_t kuiPpsId,
+                     const bool kbDeblockingFilterPresentFlag,
+                     const bool kbUsingSubsetSps,
+                     const bool kbEntropyCodingModeFlag) {
+  SWelsSPS* pUsedSps = NULL;
+  if (pPps == NULL || (pSps == NULL && pSubsetSps == NULL))
+    return 1;
+  if (!kbUsingSubsetSps) {
+    assert (pSps != NULL);
+    if (NULL == pSps)
+      return 1;
+    pUsedSps = pSps;
+  } else {
+    assert (pSubsetSps != NULL);
+    if (NULL == pSubsetSps)
+      return 1;
+    pUsedSps = &pSubsetSps->pSps;
+  }
+
+  /* fill picture parameter set syntax */
+  pPps->iPpsId = kuiPpsId;
+  pPps->iSpsId = pUsedSps->uiSpsId;
+  pPps->bEntropyCodingModeFlag = kbEntropyCodingModeFlag;
+#if !defined(DISABLE_FMO_FEATURE)
+  pPps->uiNumSliceGroups = 1; //param->qos_param.sliceGroupCount;
+  if (pPps->uiNumSliceGroups > 1) {
+    pPps->uiSliceGroupMapType = 0; //param->qos_param.sliceGroupType;
+    if (pPps->uiSliceGroupMapType == 0) {
+      uint32_t uiGroup = 0;
+      while (uiGroup < pPps->uiNumSliceGroups) {
+        pPps->uiRunLength[uiGroup] = 25;
+        ++ uiGroup;
+      }
+    } else if (pPps->uiSliceGroupMapType == 2) {
+      memset (&pPps->uiTopLeft[0], 0, MAX_SLICEGROUP_IDS * sizeof (pPps->uiTopLeft[0]));
+      memset (&pPps->uiBottomRight[0], 0, MAX_SLICEGROUP_IDS * sizeof (pPps->uiBottomRight[0]));
+    } else if (pPps->uiSliceGroupMapType >= 3 &&
+               pPps->uiSliceGroupMapType <= 5) {
+      pPps->bSliceGroupChangeDirectionFlag = false;
+      pPps->uiSliceGroupChangeRate = 0;
+    } else if (pPps->uiSliceGroupMapType == 6) {
+      pPps->uiPicSizeInMapUnits = 1;
+      memset (&pPps->uiSliceGroupId[0], 0, MAX_SLICEGROUP_IDS * sizeof (pPps->uiSliceGroupId[0]));
+    }
+  }
+#endif//!DISABLE_FMO_FEATURE
+
+  pPps->iPicInitQp = 26;
+  pPps->iPicInitQs = 26;
+
+  pPps->uiChromaQpIndexOffset                   = 0;
+  pPps->bDeblockingFilterControlPresentFlag     = kbDeblockingFilterPresentFlag;
+
+  return 0;
+}
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/deblocking.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/deblocking.cpp
new file mode 100644
index 0000000000..8fd00ea611
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/deblocking.cpp
@@ -0,0 +1,885 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    deblocking.c
+ *
+ * \brief   Interfaces introduced in frame deblocking filtering
+ *
+ * \date    08/03/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "deblocking.h"
+#include "cpu_core.h"
+
+namespace WelsEnc {
+
+#define g_kuiAlphaTable(x) g_kuiAlphaTable[(x)]
+#define g_kiBetaTable(x)  g_kiBetaTable[(x)]
+#define g_kiTc0Table(x)   g_kiTc0Table[(x)]
+
+#define MB_BS_MV(sCurMv, sNeighMv, uiBIdx, uiBnIdx) \
+  (\
+  ( WELS_ABS( sCurMv[uiBIdx].iMvX - sNeighMv[uiBnIdx].iMvX ) >= 4 ) ||\
+  ( WELS_ABS( sCurMv[uiBIdx].iMvY - sNeighMv[uiBnIdx].iMvY ) >= 4 )\
+  )
+
+#define SMB_EDGE_MV(uiRefIndex, sMotionVector, uiBIdx, uiBnIdx) \
+  (\
+  !!((WELS_ABS(sMotionVector[uiBIdx].iMvX - sMotionVector[uiBnIdx].iMvX) &(~3)) | (WELS_ABS(sMotionVector[uiBIdx].iMvY - sMotionVector[uiBnIdx].iMvY) &(~3)))\
+  )
+
+#define BS_EDGE(bsx1, uiRefIndex, sMotionVector, uiBIdx, uiBnIdx) \
+  ( (bsx1|SMB_EDGE_MV(uiRefIndex, sMotionVector, uiBIdx, uiBnIdx))<<(bsx1?1:0))
+
+#define GET_ALPHA_BETA_FROM_QP(QP, iAlphaOffset, iBetaOffset, iIdexA, iAlpha, iBeta) \
+{\
+  iIdexA = (QP + iAlphaOffset);\
+  iIdexA = CLIP3_QP_0_51(iIdexA);\
+  iAlpha = g_kuiAlphaTable(iIdexA);\
+  iBeta  = g_kiBetaTable((CLIP3_QP_0_51(QP + iBetaOffset)));\
+}
+
+static const uint8_t g_kuiAlphaTable[52 + 12] = { //this table refers to Table 8-16 in H.264/AVC standard
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  4,  4,  5,  6,
+  7,  8,  9, 10, 12, 13, 15, 17, 20, 22,
+  25, 28, 32, 36, 40, 45, 50, 56, 63, 71,
+  80, 90, 101, 113, 127, 144, 162, 182, 203, 226,
+  255, 255
+  , 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255
+};
+
+static const int8_t g_kiBetaTable[52 + 12] = { //this table refers to Table 8-16 in H.264/AVC standard
+  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,
+  0,  0,  0,  0,  0,  0,  2,  2,  2,  3,
+  3,  3,  3,  4,  4,  4,  6,  6,  7,  7,
+  8,  8,  9,  9, 10, 10, 11, 11, 12, 12,
+  13, 13, 14, 14, 15, 15, 16, 16, 17, 17,
+  18, 18
+  , 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18
+};
+
+static const int8_t g_kiTc0Table[52 + 12][4] = { //this table refers Table 8-17 in H.264/AVC standard
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 },
+  { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 0 }, { -1, 0, 0, 1 },
+  { -1, 0, 0, 1 }, { -1, 0, 0, 1 }, { -1, 0, 0, 1 }, { -1, 0, 1, 1 }, { -1, 0, 1, 1 }, { -1, 1, 1, 1 },
+  { -1, 1, 1, 1 }, { -1, 1, 1, 1 }, { -1, 1, 1, 1 }, { -1, 1, 1, 2 }, { -1, 1, 1, 2 }, { -1, 1, 1, 2 },
+  { -1, 1, 1, 2 }, { -1, 1, 2, 3 }, { -1, 1, 2, 3 }, { -1, 2, 2, 3 }, { -1, 2, 2, 4 }, { -1, 2, 3, 4 },
+  { -1, 2, 3, 4 }, { -1, 3, 3, 5 }, { -1, 3, 4, 6 }, { -1, 3, 4, 6 }, { -1, 4, 5, 7 }, { -1, 4, 5, 8 },
+  { -1, 4, 6, 9 }, { -1, 5, 7, 10 }, { -1, 6, 8, 11 }, { -1, 6, 8, 13 }, { -1, 7, 10, 14 }, { -1, 8, 11, 16 },
+  { -1, 9, 12, 18 }, { -1, 10, 13, 20 }, { -1, 11, 15, 23 }, { -1, 13, 17, 25 }
+  , { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }
+  , { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }, { -1, 13, 17, 25 }
+};
+
+static const uint8_t g_kuiTableBIdx[2][8] = {
+  {
+    0,  4,  8,  12, // g_kuiTableBIdx
+    3,  7,  11, 15
+  }, // table_bn_idx
+
+  {
+    0,  1,  2,  3 , // g_kuiTableBIdx
+    12, 13, 14, 15
+  }, // table_bn_idx
+};
+
+#define TC0_TBL_LOOKUP(iTc, iIdexA, pBS, bchroma) \
+{\
+  iTc[0] = g_kiTc0Table(iIdexA)[pBS[0]] + bchroma;\
+  iTc[1] = g_kiTc0Table(iIdexA)[pBS[1]] + bchroma;\
+  iTc[2] = g_kiTc0Table(iIdexA)[pBS[2]] + bchroma;\
+  iTc[3] = g_kiTc0Table(iIdexA)[pBS[3]] + bchroma;\
+}
+
+void inline DeblockingBSInsideMBAvsbase (int8_t* pNnzTab, uint8_t uiBS[2][4][4], int32_t iLShiftFactor) {
+  uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
+
+  uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
+  uiNnz32b1 = * (uint32_t*) (pNnzTab + 4);
+  uiNnz32b2 = * (uint32_t*) (pNnzTab + 8);
+  uiNnz32b3 = * (uint32_t*) (pNnzTab + 12);
+
+  uiBS[0][1][0] = (pNnzTab[0] | pNnzTab[1]) << iLShiftFactor;
+  uiBS[0][2][0] = (pNnzTab[1] | pNnzTab[2]) << iLShiftFactor;
+  uiBS[0][3][0] = (pNnzTab[2] | pNnzTab[3]) << iLShiftFactor;
+
+  uiBS[0][1][1] = (pNnzTab[4] | pNnzTab[5]) << iLShiftFactor;
+  uiBS[0][2][1] = (pNnzTab[5] | pNnzTab[6]) << iLShiftFactor;
+  uiBS[0][3][1] = (pNnzTab[6] | pNnzTab[7]) << iLShiftFactor;
+  * (uint32_t*)uiBS[1][1] = (uiNnz32b0 | uiNnz32b1) << iLShiftFactor;
+
+  uiBS[0][1][2] = (pNnzTab[8]  | pNnzTab[9])  << iLShiftFactor;
+  uiBS[0][2][2] = (pNnzTab[9]  | pNnzTab[10]) << iLShiftFactor;
+  uiBS[0][3][2] = (pNnzTab[10] | pNnzTab[11]) << iLShiftFactor;
+  * (uint32_t*)uiBS[1][2] = (uiNnz32b1 | uiNnz32b2) << iLShiftFactor;
+
+  uiBS[0][1][3] = (pNnzTab[12] | pNnzTab[13]) << iLShiftFactor;
+  uiBS[0][2][3] = (pNnzTab[13] | pNnzTab[14]) << iLShiftFactor;
+  uiBS[0][3][3] = (pNnzTab[14] | pNnzTab[15]) << iLShiftFactor;
+  * (uint32_t*)uiBS[1][3] = (uiNnz32b2 | uiNnz32b3) << iLShiftFactor;
+
+}
+
+void inline DeblockingBSInsideMBNormal (SMB* pCurMb, uint8_t uiBS[2][4][4], int8_t* pNnzTab) {
+  uint32_t uiNnz32b0, uiNnz32b1, uiNnz32b2, uiNnz32b3;
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBsx4, 4, 4);
+
+  uiNnz32b0 = * (uint32_t*) (pNnzTab + 0);
+  uiNnz32b1 = * (uint32_t*) (pNnzTab + 4);
+  uiNnz32b2 = * (uint32_t*) (pNnzTab + 8);
+  uiNnz32b3 = * (uint32_t*) (pNnzTab + 12);
+
+  for (int i = 0; i < 3; i++)
+    uiBsx4[i] = pNnzTab[i] | pNnzTab[i + 1];
+  uiBS[0][1][0] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 1, 0);
+  uiBS[0][2][0] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 2, 1);
+  uiBS[0][3][0] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 3, 2);
+
+  for (int i = 0; i < 3; i++)
+    uiBsx4[i] = pNnzTab[4 + i] | pNnzTab[4 + i + 1];
+  uiBS[0][1][1] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 5, 4);
+  uiBS[0][2][1] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 6, 5);
+  uiBS[0][3][1] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 7, 6);
+
+  for (int i = 0; i < 3; i++)
+    uiBsx4[i] = pNnzTab[8 + i] | pNnzTab[8 + i + 1];
+  uiBS[0][1][2] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 9, 8);
+  uiBS[0][2][2] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 10, 9);
+  uiBS[0][3][2] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 11, 10);
+
+  for (int i = 0; i < 3; i++)
+    uiBsx4[i] = pNnzTab[12 + i] | pNnzTab[12 + i + 1];
+  uiBS[0][1][3] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 13, 12);
+  uiBS[0][2][3] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 14, 13);
+  uiBS[0][3][3] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 15, 14);
+
+  //horizontal
+  * (uint32_t*)uiBsx4 = (uiNnz32b0 | uiNnz32b1);
+  uiBS[1][1][0] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 4, 0);
+  uiBS[1][1][1] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 5, 1);
+  uiBS[1][1][2] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 6, 2);
+  uiBS[1][1][3] = BS_EDGE (uiBsx4[3], iRefIdx, pCurMb->sMv, 7, 3);
+
+  * (uint32_t*)uiBsx4 = (uiNnz32b1 | uiNnz32b2);
+  uiBS[1][2][0] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 8, 4);
+  uiBS[1][2][1] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 9, 5);
+  uiBS[1][2][2] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 10, 6);
+  uiBS[1][2][3] = BS_EDGE (uiBsx4[3], iRefIdx, pCurMb->sMv, 11, 7);
+
+  * (uint32_t*)uiBsx4 = (uiNnz32b2 | uiNnz32b3);
+  uiBS[1][3][0] = BS_EDGE (uiBsx4[0], iRefIdx, pCurMb->sMv, 12, 8);
+  uiBS[1][3][1] = BS_EDGE (uiBsx4[1], iRefIdx, pCurMb->sMv, 13, 9);
+  uiBS[1][3][2] = BS_EDGE (uiBsx4[2], iRefIdx, pCurMb->sMv, 14, 10);
+  uiBS[1][3][3] = BS_EDGE (uiBsx4[3], iRefIdx, pCurMb->sMv, 15, 11);
+}
+
+uint32_t DeblockingBSMarginalMBAvcbase (SMB* pCurMb, SMB* pNeighMb, int32_t iEdge) {
+  int32_t i;
+  uint32_t uiBSx4;
+  uint8_t* pBS = (uint8_t*) (&uiBSx4);
+  const uint8_t* pBIdx  = &g_kuiTableBIdx[iEdge][0];
+  const uint8_t* pBnIdx = &g_kuiTableBIdx[iEdge][4];
+
+
+  for (i = 0; i < 4; i++) {
+    if (pCurMb->pNonZeroCount[*pBIdx] | pNeighMb->pNonZeroCount[*pBnIdx]) {
+      pBS[i] = 2;
+    } else {
+      pBS[i] =
+#ifndef SINGLE_REF_FRAME
+        (pCurMb->uiRefIndex[g_kiTableBlock8x8Idx[1][iEdge][i]] - pNeighMb->uiRefIndex[g_kiTableBlock8x8NIdx[1][iEdge][i]]) ||
+#endif
+        MB_BS_MV (pCurMb->sMv, pNeighMb->sMv, *pBIdx, *pBnIdx);
+    }
+    pBIdx++;
+    pBnIdx++;
+  }
+  return uiBSx4;
+}
+
+void FilteringEdgeLumaH (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride,
+                         uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, pBS, 0);
+    pfDeblocking->pfLumaDeblockingLT4Ver (pPix, iStride, iAlpha, iBeta, iTc);
+  }
+  return;
+}
+void FilteringEdgeLumaV (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride,
+                         uint8_t* pBS) {
+  int32_t  iIdexA;
+  int32_t  iAlpha;
+  int32_t  iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, pBS, 0);
+    pfDeblocking->pfLumaDeblockingLT4Hor (pPix, iStride, iAlpha, iBeta, iTc);
+  }
+  return;
+}
+
+void FilteringEdgeLumaIntraH (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride,
+                              uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfLumaDeblockingEQ4Ver (pPix, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+
+void FilteringEdgeLumaIntraV (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPix, int32_t iStride,
+                              uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfLumaDeblockingEQ4Hor (pPix, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+void FilteringEdgeChromaH (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr,
+                           int32_t iStride, uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, pBS, 1);
+    pfDeblocking->pfChromaDeblockingLT4Ver (pPixCb, pPixCr, iStride, iAlpha, iBeta, iTc);
+  }
+  return;
+}
+void FilteringEdgeChromaV (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPixCb, uint8_t* pPixCr,
+                           int32_t iStride, uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+  ENFORCE_STACK_ALIGN_1D (int8_t, iTc, 4, 16);
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, pBS, 1);
+    pfDeblocking->pfChromaDeblockingLT4Hor (pPixCb, pPixCr, iStride, iAlpha, iBeta, iTc);
+  }
+  return;
+}
+
+void FilteringEdgeChromaIntraH (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPixCb,
+                                uint8_t* pPixCr, int32_t iStride, uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfChromaDeblockingEQ4Ver (pPixCb, pPixCr, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+
+void FilteringEdgeChromaIntraV (DeblockingFunc* pfDeblocking, SDeblockingFilter* pFilter, uint8_t* pPixCb,
+                                uint8_t* pPixCr, int32_t iStride, uint8_t* pBS) {
+  int32_t iIdexA;
+  int32_t iAlpha;
+  int32_t iBeta;
+
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfChromaDeblockingEQ4Hor (pPixCb, pPixCr, iStride, iAlpha, iBeta);
+  }
+  return;
+}
+
+void DeblockingInterMb (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFilter* pFilter, uint8_t uiBS[2][4][4]) {
+  int8_t iCurLumaQp   = pCurMb->uiLumaQp;
+  int8_t iCurChromaQp = pCurMb->uiChromaQp;
+  int32_t iLineSize     = pFilter->iCsStride[0];
+  int32_t iLineSizeUV   = pFilter->iCsStride[1];
+  int32_t iMbStride    = pFilter->iMbStride;
+
+  int32_t iMbX = pCurMb->iMbX;
+  int32_t iMbY = pCurMb->iMbY;
+
+  bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};
+  bool bTopBsValid[2]  = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};
+
+  int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
+  int32_t iTopFlag  = bTopBsValid[pFilter->uiFilterIdc];
+
+  uint8_t* pDestY, *pDestCb, *pDestCr;
+  pDestY  = pFilter->pCsData[0];
+  pDestCb = pFilter->pCsData[1];
+  pDestCr = pFilter->pCsData[2];
+
+  if (iLeftFlag) {
+    pFilter->uiLumaQP   = (iCurLumaQp + (pCurMb - 1)->uiLumaQp + 1) >> 1;
+    pFilter->uiChromaQP = (iCurChromaQp + (pCurMb - 1)->uiChromaQp + 1) >> 1;
+
+    if (uiBS[0][0][0] == 0x04) {
+      FilteringEdgeLumaIntraV (pfDeblocking, pFilter, pDestY, iLineSize , NULL);
+      FilteringEdgeChromaIntraV (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSizeUV, NULL);
+    } else {
+      if (* (uint32_t*)uiBS[0][0] != 0) {
+        FilteringEdgeLumaV (pfDeblocking, pFilter, pDestY, iLineSize, uiBS[0][0]);
+        FilteringEdgeChromaV (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSizeUV, uiBS[0][0]);
+      }
+    }
+  }
+
+  pFilter->uiLumaQP = iCurLumaQp;
+  pFilter->uiChromaQP = iCurChromaQp;
+
+  if (* (uint32_t*)uiBS[0][1] != 0) {
+    FilteringEdgeLumaV (pfDeblocking, pFilter, &pDestY[1 << 2], iLineSize, uiBS[0][1]);
+  }
+
+  if (* (uint32_t*)uiBS[0][2] != 0) {
+    FilteringEdgeLumaV (pfDeblocking, pFilter, &pDestY[2 << 2], iLineSize, uiBS[0][2]);
+    FilteringEdgeChromaV (pfDeblocking, pFilter, &pDestCb[2 << 1], &pDestCr[2 << 1], iLineSizeUV, uiBS[0][2]);
+  }
+
+  if (* (uint32_t*)uiBS[0][3] != 0) {
+    FilteringEdgeLumaV (pfDeblocking, pFilter, &pDestY[3 << 2], iLineSize, uiBS[0][3]);
+  }
+
+  if (iTopFlag) {
+    pFilter->uiLumaQP = (iCurLumaQp + (pCurMb - iMbStride)->uiLumaQp + 1) >> 1;
+    pFilter->uiChromaQP = (iCurChromaQp + (pCurMb - iMbStride)->uiChromaQp + 1) >> 1;
+
+    if (uiBS[1][0][0] == 0x04) {
+      FilteringEdgeLumaIntraH (pfDeblocking, pFilter, pDestY, iLineSize , NULL);
+      FilteringEdgeChromaIntraH (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSizeUV, NULL);
+    } else {
+      if (* (uint32_t*)uiBS[1][0] != 0) {
+        FilteringEdgeLumaH (pfDeblocking, pFilter, pDestY, iLineSize, uiBS[1][0]);
+        FilteringEdgeChromaH (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSizeUV, uiBS[1][0]);
+      }
+    }
+  }
+
+  pFilter->uiLumaQP = iCurLumaQp;
+  pFilter->uiChromaQP = iCurChromaQp;
+
+  if (* (uint32_t*)uiBS[1][1] != 0) {
+    FilteringEdgeLumaH (pfDeblocking, pFilter, &pDestY[ (1 << 2)*iLineSize], iLineSize, uiBS[1][1]);
+  }
+
+  if (* (uint32_t*)uiBS[1][2] != 0) {
+    FilteringEdgeLumaH (pfDeblocking, pFilter, &pDestY[ (2 << 2)*iLineSize], iLineSize, uiBS[1][2]);
+    FilteringEdgeChromaH (pfDeblocking, pFilter, &pDestCb[ (2 << 1)*iLineSizeUV], &pDestCr[ (2 << 1)*iLineSizeUV],
+                          iLineSizeUV, uiBS[1][2]);
+  }
+
+  if (* (uint32_t*)uiBS[1][3] != 0) {
+    FilteringEdgeLumaH (pfDeblocking, pFilter, &pDestY[ (3 << 2)*iLineSize], iLineSize, uiBS[1][3]);
+  }
+}
+
+void FilteringEdgeLumaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFilter* pFilter) {
+  int32_t iLineSize  = pFilter->iCsStride[0];
+  int32_t iMbStride = pFilter->iMbStride;
+
+  uint8_t*  pDestY;
+  int8_t   iCurQp;
+  int32_t  iIdexA, iAlpha, iBeta;
+
+  int32_t iMbX = pCurMb->iMbX;
+  int32_t iMbY = pCurMb->iMbY;
+
+  bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};
+  bool bTopBsValid[2]  = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};
+
+  int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
+  int32_t iTopFlag  = bTopBsValid[pFilter->uiFilterIdc];
+
+  ENFORCE_STACK_ALIGN_1D (int8_t,  iTc,   4, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4);
+
+  pDestY  = pFilter->pCsData[0];
+  iCurQp  = pCurMb->uiLumaQp;
+
+  * (uint32_t*)uiBSx4 = 0x03030303;
+
+  // luma v
+  if (iLeftFlag) {
+    pFilter->uiLumaQP = (iCurQp + (pCurMb - 1)->uiLumaQp + 1) >> 1;
+    FilteringEdgeLumaIntraV (pfDeblocking, pFilter, pDestY, iLineSize, NULL);
+  }
+
+  pFilter->uiLumaQP   = iCurQp;
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiLumaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, uiBSx4, 0);
+    pfDeblocking->pfLumaDeblockingLT4Hor (&pDestY[1 << 2], iLineSize, iAlpha, iBeta, iTc);
+    pfDeblocking->pfLumaDeblockingLT4Hor (&pDestY[2 << 2], iLineSize, iAlpha, iBeta, iTc);
+    pfDeblocking->pfLumaDeblockingLT4Hor (&pDestY[3 << 2], iLineSize, iAlpha, iBeta, iTc);
+
+  }
+
+  // luma h
+  if (iTopFlag) {
+    pFilter->uiLumaQP   = (iCurQp   + (pCurMb - iMbStride)->uiLumaQp + 1) >> 1;
+    FilteringEdgeLumaIntraH (pfDeblocking, pFilter, pDestY, iLineSize, NULL);
+  }
+
+  pFilter->uiLumaQP   = iCurQp;
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfLumaDeblockingLT4Ver (&pDestY[ (1 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+    pfDeblocking->pfLumaDeblockingLT4Ver (&pDestY[ (2 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+    pfDeblocking->pfLumaDeblockingLT4Ver (&pDestY[ (3 << 2)*iLineSize], iLineSize, iAlpha, iBeta, iTc);
+  }
+}
+void FilteringEdgeChromaHV (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFilter* pFilter) {
+  int32_t iLineSize  = pFilter->iCsStride[1];
+  int32_t iMbStride = pFilter->iMbStride;
+
+  uint8_t*  pDestCb, *pDestCr;
+  int8_t   iCurQp;
+  int32_t  iIdexA, iAlpha, iBeta;
+
+  int32_t iMbX = pCurMb->iMbX;
+  int32_t iMbY = pCurMb->iMbY;
+
+  bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};
+  bool bTopBsValid[2]  = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};
+
+  int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
+  int32_t iTopFlag  = bTopBsValid[pFilter->uiFilterIdc];
+
+  ENFORCE_STACK_ALIGN_1D (int8_t,  iTc,   4, 16);
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiBSx4, 4, 4);
+
+  pDestCb = pFilter->pCsData[1];
+  pDestCr = pFilter->pCsData[2];
+  iCurQp  = pCurMb->uiChromaQp;
+  * (uint32_t*)uiBSx4 = 0x03030303;
+
+  // chroma v
+  if (iLeftFlag) {
+    pFilter->uiChromaQP = (iCurQp + (pCurMb - 1)->uiChromaQp + 1) >> 1;
+    FilteringEdgeChromaIntraV (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSize, NULL);
+  }
+
+  pFilter->uiChromaQP   = iCurQp;
+  GET_ALPHA_BETA_FROM_QP (pFilter->uiChromaQP, pFilter->iSliceAlphaC0Offset, pFilter->iSliceBetaOffset, iIdexA, iAlpha,
+                          iBeta);
+  if (iAlpha | iBeta) {
+    TC0_TBL_LOOKUP (iTc, iIdexA, uiBSx4, 1);
+    pfDeblocking->pfChromaDeblockingLT4Hor (&pDestCb[2 << 1], &pDestCr[2 << 1], iLineSize, iAlpha, iBeta, iTc);
+  }
+
+  // chroma h
+  if (iTopFlag) {
+    pFilter->uiChromaQP = (iCurQp + (pCurMb - iMbStride)->uiChromaQp + 1) >> 1;
+    FilteringEdgeChromaIntraH (pfDeblocking, pFilter, pDestCb, pDestCr, iLineSize, NULL);
+  }
+
+  pFilter->uiChromaQP   = iCurQp;
+  if (iAlpha | iBeta) {
+    pfDeblocking->pfChromaDeblockingLT4Ver (&pDestCb[ (2 << 1)*iLineSize], &pDestCr[ (2 << 1)*iLineSize], iLineSize, iAlpha,
+                                            iBeta, iTc);
+  }
+}
+
+// merge h&v lookup table operation to save performance
+void DeblockingIntraMb (DeblockingFunc* pfDeblocking, SMB* pCurMb, SDeblockingFilter* pFilter) {
+  FilteringEdgeLumaHV (pfDeblocking, pCurMb, pFilter);
+  FilteringEdgeChromaHV (pfDeblocking, pCurMb, pFilter);
+}
+
+#if defined(HAVE_NEON) && defined(SINGLE_REF_FRAME)
+void DeblockingBSCalc_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
+                            int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) {
+  DeblockingBSCalcEnc_neon (pCurMb->pNonZeroCount, pCurMb->sMv,
+                            (iLeftFlag ? LEFT_MB_POS : 0) | (iTopFlag ? TOP_MB_POS : 0), iMbStride, uiBS);
+  if (iLeftFlag) {
+    if (IS_INTRA ((pCurMb - 1)->uiMbType)) {
+      * (uint32_t*)uiBS[0][0] = 0x04040404;
+    }
+  } else {
+    * (uint32_t*)uiBS[0][0] = 0;
+  }
+  if (iTopFlag) {
+    if (IS_INTRA ((pCurMb - iMbStride)->uiMbType)) {
+      * (uint32_t*)uiBS[1][0] = 0x04040404;
+    }
+  } else {
+    * (uint32_t*)uiBS[1][0] = 0;
+  }
+}
+#endif
+
+#if defined(HAVE_NEON_AARCH64) && defined(SINGLE_REF_FRAME)
+void DeblockingBSCalc_AArch64_neon (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
+                                    int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) {
+  DeblockingBSCalcEnc_AArch64_neon (pCurMb->pNonZeroCount, pCurMb->sMv,
+                                    (iLeftFlag ? LEFT_MB_POS : 0) | (iTopFlag ? TOP_MB_POS : 0), iMbStride, uiBS);
+  if (iLeftFlag) {
+    if (IS_INTRA ((pCurMb - 1)->uiMbType)) {
+      * (uint32_t*)uiBS[0][0] = 0x04040404;
+    }
+  } else {
+    * (uint32_t*)uiBS[0][0] = 0;
+  }
+  if (iTopFlag) {
+    if (IS_INTRA ((pCurMb - iMbStride)->uiMbType)) {
+      * (uint32_t*)uiBS[1][0] = 0x04040404;
+    }
+  } else {
+    * (uint32_t*)uiBS[1][0] = 0;
+  }
+}
+#endif
+
+void DeblockingBSCalc_c (SWelsFuncPtrList* pFunc, SMB* pCurMb, uint8_t uiBS[2][4][4], Mb_Type uiCurMbType,
+                         int32_t iMbStride, int32_t iLeftFlag, int32_t iTopFlag) {
+  if (iLeftFlag) {
+    * (uint32_t*)uiBS[0][0] = IS_INTRA ((pCurMb - 1)->uiMbType) ? 0x04040404 : DeblockingBSMarginalMBAvcbase (pCurMb,
+                              pCurMb - 1, 0);
+  } else {
+    * (uint32_t*)uiBS[0][0] = 0;
+  }
+  if (iTopFlag) {
+    * (uint32_t*)uiBS[1][0] = IS_INTRA ((pCurMb - iMbStride)->uiMbType) ? 0x04040404 : DeblockingBSMarginalMBAvcbase (
+                                pCurMb, (pCurMb - iMbStride), 1);
+  } else {
+    * (uint32_t*)uiBS[1][0] = 0;
+  }
+  //SKIP MB_16x16 or others
+  if (uiCurMbType != MB_TYPE_SKIP) {
+    pFunc->pfSetNZCZero (pCurMb->pNonZeroCount); // set all none-zero nzc to 1; dbk can be opti!
+
+    if (uiCurMbType == MB_TYPE_16x16) {
+      DeblockingBSInsideMBAvsbase (pCurMb->pNonZeroCount, uiBS, 1);
+    } else {
+      DeblockingBSInsideMBNormal (pCurMb, uiBS, pCurMb->pNonZeroCount);
+    }
+  } else {
+    * (uint32_t*)uiBS[0][1] = * (uint32_t*)uiBS[0][2] = * (uint32_t*)uiBS[0][3] =
+                                * (uint32_t*)uiBS[1][1] = * (uint32_t*)uiBS[1][2] = * (uint32_t*)uiBS[1][3] = 0;
+  }
+}
+
+void DeblockingMbAvcbase (SWelsFuncPtrList* pFunc, SMB* pCurMb, SDeblockingFilter* pFilter) {
+  uint8_t uiBS[2][4][4] = {{{ 0 }}};
+
+  Mb_Type uiCurMbType = pCurMb->uiMbType;
+  int32_t iMbStride  = pFilter->iMbStride;
+
+  int32_t iMbX = pCurMb->iMbX;
+  int32_t iMbY = pCurMb->iMbY;
+
+  bool bLeftBsValid[2] = { (iMbX > 0), ((iMbX > 0)&& (pCurMb->uiSliceIdc == (pCurMb - 1)->uiSliceIdc))};
+  bool bTopBsValid[2]  = { (iMbY > 0), ((iMbY > 0)&& (pCurMb->uiSliceIdc == (pCurMb - iMbStride)->uiSliceIdc))};
+
+  int32_t iLeftFlag = bLeftBsValid[pFilter->uiFilterIdc];
+  int32_t iTopFlag  = bTopBsValid[pFilter->uiFilterIdc];
+
+  switch (uiCurMbType) {
+  case MB_TYPE_INTRA4x4:
+  case MB_TYPE_INTRA16x16:
+  case MB_TYPE_INTRA_PCM:
+    DeblockingIntraMb (&pFunc->pfDeblocking, pCurMb, pFilter);
+    break;
+  default:
+    pFunc->pfDeblocking.pfDeblockingBSCalc (pFunc, pCurMb, uiBS, uiCurMbType, iMbStride, iLeftFlag, iTopFlag);
+    DeblockingInterMb (&pFunc->pfDeblocking, pCurMb, pFilter, uiBS);
+    break;
+  }
+}
+
+void  DeblockingFilterFrameAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc) {
+  int32_t i, j;
+  const int32_t kiMbWidth   = pCurDq->iMbWidth;
+  const int32_t kiMbHeight  = pCurDq->iMbHeight;
+  SMB* pCurrentMbBlock      = pCurDq->sMbDataP;
+  SSliceHeaderExt* sSliceHeaderExt = &pCurDq->ppSliceInLayer[0]->sSliceHeaderExt;
+  SDeblockingFilter pFilter;
+
+  /* Step1: parameters set */
+  if (sSliceHeaderExt->sSliceHeader.uiDisableDeblockingFilterIdc == 1)
+    return;
+
+  pFilter.uiFilterIdc = (sSliceHeaderExt->sSliceHeader.uiDisableDeblockingFilterIdc != 0);
+
+  pFilter.iCsStride[0] = pCurDq->pDecPic->iLineSize[0];
+  pFilter.iCsStride[1] = pCurDq->pDecPic->iLineSize[1];
+  pFilter.iCsStride[2] = pCurDq->pDecPic->iLineSize[2];
+
+  pFilter.iSliceAlphaC0Offset = sSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
+  pFilter.iSliceBetaOffset     = sSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
+
+  pFilter.iMbStride = kiMbWidth;
+
+  for (j = 0; j < kiMbHeight; ++j) {
+    pFilter.pCsData[0] = pCurDq->pDecPic->pData[0] + ((j * pFilter.iCsStride[0]) << 4);
+    pFilter.pCsData[1] = pCurDq->pDecPic->pData[1] + ((j * pFilter.iCsStride[1]) << 3);
+    pFilter.pCsData[2] = pCurDq->pDecPic->pData[2] + ((j * pFilter.iCsStride[2]) << 3);
+    for (i = 0; i < kiMbWidth; i++) {
+      DeblockingMbAvcbase (pFunc, pCurrentMbBlock, &pFilter);
+      ++pCurrentMbBlock;
+      pFilter.pCsData[0] += MB_WIDTH_LUMA;
+      pFilter.pCsData[1] += MB_WIDTH_CHROMA;
+      pFilter.pCsData[2] += MB_WIDTH_CHROMA;
+    }
+  }
+}
+
+void DeblockingFilterSliceAvcbase (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SSlice* pSlice) {
+  SMB* pMbList                          = pCurDq->sMbDataP;
+  SSliceHeaderExt* sSliceHeaderExt      = &pSlice->sSliceHeaderExt;
+  SMB* pCurrentMbBlock;
+
+  const int32_t kiMbWidth               = pCurDq->iMbWidth;
+  const int32_t kiMbHeight              = pCurDq->iMbHeight;
+  const int32_t kiTotalNumMb            = kiMbWidth * kiMbHeight;
+  int32_t iCurMbIdx = 0, iNextMbIdx = 0, iNumMbFiltered = 0;
+
+  /* Step1: parameters set */
+  if (sSliceHeaderExt->sSliceHeader.uiDisableDeblockingFilterIdc == 1)
+    return;
+
+  SDeblockingFilter pFilter;
+
+  pFilter.uiFilterIdc = (sSliceHeaderExt->sSliceHeader.uiDisableDeblockingFilterIdc != 0);
+  pFilter.iCsStride[0] = pCurDq->pDecPic->iLineSize[0];
+  pFilter.iCsStride[1] = pCurDq->pDecPic->iLineSize[1];
+  pFilter.iCsStride[2] = pCurDq->pDecPic->iLineSize[2];
+  pFilter.iSliceAlphaC0Offset = sSliceHeaderExt->sSliceHeader.iSliceAlphaC0Offset;
+  pFilter.iSliceBetaOffset    = sSliceHeaderExt->sSliceHeader.iSliceBetaOffset;
+  pFilter.iMbStride           = kiMbWidth;
+
+  iNextMbIdx  = sSliceHeaderExt->sSliceHeader.iFirstMbInSlice;
+
+  for (; ;) {
+    iCurMbIdx       = iNextMbIdx;
+    pCurrentMbBlock = &pMbList[ iCurMbIdx ];
+
+    pFilter.pCsData[0] = pCurDq->pDecPic->pData[0] + ((pCurrentMbBlock->iMbX + pCurrentMbBlock->iMbY * pFilter.iCsStride[0])
+                         << 4);
+    pFilter.pCsData[1] = pCurDq->pDecPic->pData[1] + ((pCurrentMbBlock->iMbX + pCurrentMbBlock->iMbY * pFilter.iCsStride[1])
+                         << 3);
+    pFilter.pCsData[2] = pCurDq->pDecPic->pData[2] + ((pCurrentMbBlock->iMbX + pCurrentMbBlock->iMbY * pFilter.iCsStride[2])
+                         << 3);
+
+    DeblockingMbAvcbase (pFunc, pCurrentMbBlock, &pFilter);
+
+    ++iNumMbFiltered;
+    iNextMbIdx = WelsGetNextMbOfSlice (pCurDq, iCurMbIdx);
+    //whether all of MB in current slice filtered or not
+    if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbFiltered >= kiTotalNumMb) {
+      break;
+    }
+  }
+}
+
+void DeblockingFilterSliceAvcbaseNull (SDqLayer* pCurDq, SWelsFuncPtrList* pFunc, SSlice* pSlice) {
+}
+
+void PerformDeblockingFilter (sWelsEncCtx* pEnc) {
+  SDqLayer* pCurLayer = pEnc->pCurDqLayer;
+  SSlice* pSlice      = NULL;
+
+  if (pCurLayer->iLoopFilterDisableIdc == 0) {
+    DeblockingFilterFrameAvcbase (pCurLayer, pEnc->pFuncList);
+  } else if (pCurLayer->iLoopFilterDisableIdc == 2) {
+    int32_t iSliceCount = 0;
+    int32_t iSliceIdx   = 0;
+
+    iSliceCount = GetCurrentSliceNum (pCurLayer);
+    do {
+      pSlice = pCurLayer->ppSliceInLayer[iSliceIdx];
+      assert (NULL != pSlice);
+      DeblockingFilterSliceAvcbase (pCurLayer, pEnc->pFuncList, pSlice);
+      ++ iSliceIdx;
+    } while (iSliceIdx < iSliceCount);
+  }
+}
+
+void WelsBlockFuncInit (PSetNoneZeroCountZeroFunc* pfSetNZCZero,  int32_t iCpu) {
+  *pfSetNZCZero = WelsNonZeroCount_c;
+#ifdef HAVE_NEON
+  if (iCpu & WELS_CPU_NEON) {
+    *pfSetNZCZero = WelsNonZeroCount_neon;
+  }
+#endif
+#ifdef HAVE_NEON_AARCH64
+  if (iCpu & WELS_CPU_NEON) {
+    *pfSetNZCZero = WelsNonZeroCount_AArch64_neon;
+  }
+#endif
+#if defined(X86_ASM)
+  if (iCpu & WELS_CPU_SSE2) {
+    *pfSetNZCZero = WelsNonZeroCount_sse2;
+  }
+#endif
+#if defined(HAVE_MMI)
+  if (iCpu & WELS_CPU_MMI) {
+    *pfSetNZCZero = WelsNonZeroCount_mmi;
+  }
+#endif
+#if defined(HAVE_MSA)
+  if (iCpu & WELS_CPU_MSA) {
+    *pfSetNZCZero = WelsNonZeroCount_msa;
+  }
+#endif
+}
+
+void  DeblockingInit (DeblockingFunc*   pFunc,  int32_t iCpu) {
+  pFunc->pfLumaDeblockingLT4Ver     = DeblockLumaLt4V_c;
+  pFunc->pfLumaDeblockingEQ4Ver     = DeblockLumaEq4V_c;
+  pFunc->pfLumaDeblockingLT4Hor     = DeblockLumaLt4H_c;
+  pFunc->pfLumaDeblockingEQ4Hor     = DeblockLumaEq4H_c;
+
+  pFunc->pfChromaDeblockingLT4Ver   = DeblockChromaLt4V_c;
+  pFunc->pfChromaDeblockingEQ4Ver   = DeblockChromaEq4V_c;
+  pFunc->pfChromaDeblockingLT4Hor   = DeblockChromaLt4H_c;
+  pFunc->pfChromaDeblockingEQ4Hor   = DeblockChromaEq4H_c;
+
+  pFunc->pfDeblockingBSCalc         = DeblockingBSCalc_c;
+
+
+#ifdef X86_ASM
+  if (iCpu & WELS_CPU_SSSE3) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_ssse3;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_ssse3;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_ssse3;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_ssse3;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_ssse3;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_ssse3;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_ssse3;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_ssse3;
+  }
+#endif
+
+#if defined(HAVE_NEON)
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_neon;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_neon;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_neon;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_neon;
+
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_neon;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_neon;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_neon;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_neon;
+
+#if defined(SINGLE_REF_FRAME)
+    pFunc->pfDeblockingBSCalc       = DeblockingBSCalc_neon;
+#endif
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (iCpu & WELS_CPU_NEON) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_AArch64_neon;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_AArch64_neon;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_AArch64_neon;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_AArch64_neon;
+
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_AArch64_neon;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_AArch64_neon;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_AArch64_neon;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_AArch64_neon;
+
+#if defined(SINGLE_REF_FRAME)
+    pFunc->pfDeblockingBSCalc       = DeblockingBSCalc_AArch64_neon;
+#endif
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (iCpu & WELS_CPU_MMI) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_mmi;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_mmi;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_mmi;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_mmi;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_mmi;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_mmi;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_mmi;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_mmi;
+  }
+#endif//HAVE_MMI
+
+#if defined(HAVE_MSA)
+  if (iCpu & WELS_CPU_MSA) {
+    pFunc->pfLumaDeblockingLT4Ver   = DeblockLumaLt4V_msa;
+    pFunc->pfLumaDeblockingEQ4Ver   = DeblockLumaEq4V_msa;
+    pFunc->pfLumaDeblockingLT4Hor   = DeblockLumaLt4H_msa;
+    pFunc->pfLumaDeblockingEQ4Hor   = DeblockLumaEq4H_msa;
+    pFunc->pfChromaDeblockingLT4Ver = DeblockChromaLt4V_msa;
+    pFunc->pfChromaDeblockingEQ4Ver = DeblockChromaEq4V_msa;
+    pFunc->pfChromaDeblockingLT4Hor = DeblockChromaLt4H_msa;
+    pFunc->pfChromaDeblockingEQ4Hor = DeblockChromaEq4H_msa;
+  }
+#endif//HAVE_MSA
+}
+
+
+} // namespace WelsEnc
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/decode_mb_aux.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/decode_mb_aux.cpp
new file mode 100644
index 0000000000..e139c76da5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/decode_mb_aux.cpp
@@ -0,0 +1,314 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "decode_mb_aux.h"
+#include "cpu_core.h"
+
+namespace WelsEnc {
+/****************************************************************************
+ * Dequant and Ihdm functions
+ ****************************************************************************/
+void WelsIHadamard4x4Dc (int16_t* pRes) { //pBuffer size : 4x4
+  int16_t iTemp[4];
+  int32_t i = 4;
+
+  while (--i >= 0) {
+    const int32_t kiIdx  = i << 2;
+    const int32_t kiIdx1 = 1 + kiIdx;
+    const int32_t kiIdx2 = 1 + kiIdx1;
+    const int32_t kiIdx3 = 1 + kiIdx2;
+
+    iTemp[0] = pRes[kiIdx ] + pRes[kiIdx2];
+    iTemp[1] = pRes[kiIdx ] - pRes[kiIdx2];
+    iTemp[2] = pRes[kiIdx1] - pRes[kiIdx3];
+    iTemp[3] = pRes[kiIdx1] + pRes[kiIdx3];
+
+    pRes[kiIdx ] = iTemp[0] + iTemp[3];
+    pRes[kiIdx1] = iTemp[1] + iTemp[2];
+    pRes[kiIdx2] = iTemp[1] - iTemp[2];
+    pRes[kiIdx3] = iTemp[0] - iTemp[3];
+  }
+
+  i = 4;
+  while (--i >= 0) {
+    const int32_t kiI4  = 4 + i;
+    const int32_t kiI8  = 4 + kiI4;
+    const int32_t kiI12 = 4 + kiI8;
+
+    iTemp[0] = pRes[i  ] + pRes[kiI8 ];
+    iTemp[1] = pRes[i  ] - pRes[kiI8 ];
+    iTemp[2] = pRes[kiI4 ] - pRes[kiI12];
+    iTemp[3] = pRes[kiI4 ] + pRes[kiI12];
+
+    pRes[i  ] = iTemp[0] + iTemp[3];
+    pRes[kiI4 ] = iTemp[1] + iTemp[2];
+    pRes[kiI8 ] = iTemp[1] - iTemp[2];
+    pRes[kiI12] = iTemp[0] - iTemp[3];
+  }
+}
+
+/* for qp < 12 */
+void WelsDequantLumaDc4x4 (int16_t* pRes, const int32_t kiQp) {
+  int32_t i = 15;
+  const uint16_t kuiDequantValue = g_kuiDequantCoeff[kiQp % 6][0];
+  const int16_t kiQF0   = kiQp / 6;
+  const int16_t kiQF1   = 2 - kiQF0;
+  const int16_t kiQF0S  = 1 << (1 - kiQF0);
+
+  while (i >= 0) {
+    pRes[i  ]   = (pRes[i  ]   * kuiDequantValue + kiQF0S) >> kiQF1;
+    pRes[i - 1] = (pRes[i - 1] * kuiDequantValue + kiQF0S) >> kiQF1;
+    pRes[i - 2] = (pRes[i - 2] * kuiDequantValue + kiQF0S) >> kiQF1;
+    pRes[i - 3] = (pRes[i - 3] * kuiDequantValue + kiQF0S) >> kiQF1;
+
+    i -= 4;
+  }
+}
+
+/* for qp >= 12 */
+void WelsDequantIHadamard4x4_c (int16_t* pRes, const uint16_t kuiMF) {
+  int16_t iTemp[4];
+  int32_t i;
+
+  for (i = 0; i < 16; i += 4) {
+    iTemp[0] = pRes[i  ]   + pRes[i + 2];
+    iTemp[1] = pRes[i  ]   - pRes[i + 2];
+    iTemp[2] = pRes[i + 1] - pRes[i + 3];
+    iTemp[3] = pRes[i + 1] + pRes[i + 3];
+
+    pRes[i  ]   = iTemp[0] + iTemp[3];
+    pRes[i + 1] = iTemp[1] + iTemp[2];
+    pRes[i + 2] = iTemp[1] - iTemp[2];
+    pRes[i + 3] = iTemp[0] - iTemp[3];
+  }
+
+  for (i = 0; i < 4; i++) {
+    iTemp[0] = pRes[i   ]   + pRes[i + 8 ];
+    iTemp[1] = pRes[i   ]   - pRes[i + 8 ];
+    iTemp[2] = pRes[i + 4 ] - pRes[i + 12];
+    iTemp[3] = pRes[i + 4 ] + pRes[i + 12];
+
+    pRes[i  ]    = (iTemp[0] + iTemp[3]) * kuiMF;
+    pRes[i + 4 ] = (iTemp[1] + iTemp[2]) * kuiMF;
+    pRes[i + 8 ] = (iTemp[1] - iTemp[2]) * kuiMF;
+    pRes[i + 12] = (iTemp[0] - iTemp[3]) * kuiMF;
+  }
+}
+
+void WelsDequantIHadamard2x2Dc (int16_t* pDct, const uint16_t kuiMF) {
+  const int16_t kiSumU = pDct[0] + pDct[2];
+  const int16_t kiDelU = pDct[0] - pDct[2];
+  const int16_t kiSumD = pDct[1] + pDct[3];
+  const int16_t kiDelD = pDct[1] - pDct[3];
+
+  pDct[0] = ((kiSumU + kiSumD) * kuiMF) >> 1;
+  pDct[1] = ((kiSumU - kiSumD) * kuiMF) >> 1;
+  pDct[2] = ((kiDelU + kiDelD) * kuiMF) >> 1;
+  pDct[3] = ((kiDelU - kiDelD) * kuiMF) >> 1;
+}
+
+void WelsDequant4x4_c (int16_t* pRes, const uint16_t* kpMF) {
+  int32_t i;
+  for (i = 0; i < 8; i++) {
+    pRes[i]     *= kpMF[i];
+    pRes[i + 8] *= kpMF[i];
+  }
+}
+
+void WelsDequantFour4x4_c (int16_t* pRes, const uint16_t* kpMF) {
+  int32_t i;
+  for (i = 0; i < 8; i++) {
+    pRes[i]      *= kpMF[i];
+    pRes[i + 8]  *= kpMF[i];
+    pRes[i + 16] *= kpMF[i];
+    pRes[i + 24] *= kpMF[i];
+    pRes[i + 32] *= kpMF[i];
+    pRes[i + 40] *= kpMF[i];
+    pRes[i + 48] *= kpMF[i];
+    pRes[i + 56] *= kpMF[i];
+  }
+}
+
+/****************************************************************************
+ * IDCT functions, final output = prediction(CS) + IDCT(scaled_coeff)
+ ****************************************************************************/
+void WelsIDctT4Rec_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct) {
+  int32_t i;
+  int16_t iTemp[16];
+
+  int32_t iDstStridex2 = iStride << 1;
+  int32_t iDstStridex3 = iStride + iDstStridex2;
+  int32_t iPredStridex2 = iPredStride << 1;
+  int32_t iPredStridex3 = iPredStride + iPredStridex2;
+
+  for (i = 0; i < 4; i ++) { //horizon
+    int32_t iIdx = i << 2;
+    const int32_t kiHorSumU = pDct[iIdx] + pDct[iIdx + 2];      // add 0-2
+    const int32_t kiHorDelU = pDct[iIdx] - pDct[iIdx + 2];      // sub 0-2
+    const int32_t kiHorSumD = pDct[iIdx + 1] + (pDct[iIdx + 3] >> 1);
+    const int32_t kiHorDelD = (pDct[iIdx + 1] >> 1) - pDct[iIdx + 3];
+
+    iTemp[iIdx  ]   = kiHorSumU  + kiHorSumD;
+    iTemp[iIdx + 1] = kiHorDelU   + kiHorDelD;
+    iTemp[iIdx + 2] = kiHorDelU   -  kiHorDelD;
+    iTemp[iIdx + 3] = kiHorSumU  -  kiHorSumD;
+  }
+
+  for (i = 0; i < 4; i ++) { //vertical
+    const int32_t kiVerSumL = iTemp[i]                 + iTemp[8 + i];
+    const int32_t kiVerDelL   = iTemp[i]                 - iTemp[8 + i];
+    const int32_t kiVerDelR   = (iTemp[4 + i] >> 1) - iTemp[12 + i];
+    const int32_t kiVerSumR = iTemp[4 + i]             + (iTemp[12 + i] >> 1);
+
+    pRec[i               ] = WelsClip1 (pPred[i                ] + ((kiVerSumL + kiVerSumR + 32) >> 6));
+    pRec[iStride + i     ] = WelsClip1 (pPred[iPredStride + i  ] + ((kiVerDelL + kiVerDelR + 32) >> 6));
+    pRec[iDstStridex2 + i] = WelsClip1 (pPred[iPredStridex2 + i] + ((kiVerDelL - kiVerDelR + 32) >> 6));
+    pRec[iDstStridex3 + i] = WelsClip1 (pPred[iPredStridex3 + i] + ((kiVerSumL - kiVerSumR + 32) >> 6));
+  }
+}
+
+void WelsIDctFourT4Rec_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct) {
+  int32_t iDstStridex4  = iStride << 2;
+  int32_t iPredStridex4 = iPredStride << 2;
+  WelsIDctT4Rec_c (pRec,                    iStride, pPred,                     iPredStride, pDct);
+  WelsIDctT4Rec_c (&pRec[4],                iStride, &pPred[4],                 iPredStride, pDct + 16);
+  WelsIDctT4Rec_c (&pRec[iDstStridex4    ], iStride, &pPred[iPredStridex4  ],   iPredStride, pDct + 32);
+  WelsIDctT4Rec_c (&pRec[iDstStridex4 + 4], iStride, &pPred[iPredStridex4 + 4], iPredStride, pDct + 48);
+
+}
+
+void WelsIDctT4RecOnMb (uint8_t* pDst, int32_t iDstStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDct,
+                        PIDctFunc pfIDctFourT4) {
+  int32_t iDstStridex8  = iDstStride << 3;
+  int32_t iPredStridex8 = iPredStride << 3;
+
+  pfIDctFourT4 (&pDst[0], iDstStride, &pPred[0], iPredStride, pDct);
+  pfIDctFourT4 (&pDst[8], iDstStride, &pPred[8], iPredStride, pDct + 64);
+  pfIDctFourT4 (&pDst[iDstStridex8], iDstStride, &pPred[iPredStridex8], iPredStride, pDct + 128);
+  pfIDctFourT4 (&pDst[iDstStridex8 + 8], iDstStride, &pPred[iPredStridex8 + 8], iPredStride, pDct + 192);
+}
+
+/*
+ * pfIDctI16x16Dc: do luma idct of an MB for I16x16 mode, when only dc value are non-zero
+ */
+void WelsIDctRecI16x16Dc_c (uint8_t* pRec, int32_t iStride, uint8_t* pPred, int32_t iPredStride, int16_t* pDctDc) {
+  int32_t i, j;
+
+  for (i = 0; i < 16; i ++) {
+    for (j = 0; j < 16; j++) {
+      pRec[j] = WelsClip1 (pPred[j] + ((pDctDc[ (i & 0x0C) + (j >> 2)] + 32) >> 6));
+    }
+    pRec += iStride;
+    pPred += iPredStride;
+  }
+}
+
+void WelsGetEncBlockStrideOffset (int32_t* pBlock, const int32_t kiStrideY, const int32_t kiStrideUV) {
+  int32_t i, j, k, r;
+  for (j = 0; j < 4; j++) {
+    i = j << 2;
+    k = (j & 0x01) << 1;
+    r = j & 0x02;
+    pBlock[i]           = (0 + k + (0 + r) * kiStrideY) << 2;
+    pBlock[i + 1]       = (1 + k + (0 + r) * kiStrideY) << 2;
+    pBlock[i + 2]       = (0 + k + (1 + r) * kiStrideY) << 2;
+    pBlock[i + 3]       = (1 + k + (1 + r) * kiStrideY) << 2;
+
+    pBlock[16 + j]      =
+      pBlock[20 + j]    = ((j & 0x01) + r * kiStrideUV) << 2;
+  }
+}
+
+void WelsInitReconstructionFuncs (SWelsFuncPtrList* pFuncList, uint32_t  uiCpuFlag) {
+  pFuncList->pfDequantization4x4            = WelsDequant4x4_c;
+  pFuncList->pfDequantizationFour4x4        = WelsDequantFour4x4_c;
+  pFuncList->pfDequantizationIHadamard4x4   = WelsDequantIHadamard4x4_c;
+
+  pFuncList->pfIDctT4           = WelsIDctT4Rec_c;
+  pFuncList->pfIDctFourT4       = WelsIDctFourT4Rec_c;
+  pFuncList->pfIDctI16x16Dc     = WelsIDctRecI16x16Dc_c;
+
+#if defined(X86_ASM)
+  if (uiCpuFlag & WELS_CPU_MMXEXT) {
+    pFuncList->pfIDctT4         = WelsIDctT4Rec_mmx;
+  }
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->pfDequantization4x4          = WelsDequant4x4_sse2;
+    pFuncList->pfDequantizationFour4x4      = WelsDequantFour4x4_sse2;
+    pFuncList->pfDequantizationIHadamard4x4 = WelsDequantIHadamard4x4_sse2;
+
+    pFuncList->pfIDctT4         = WelsIDctT4Rec_sse2;
+    pFuncList->pfIDctFourT4     = WelsIDctFourT4Rec_sse2;
+    pFuncList->pfIDctI16x16Dc   = WelsIDctRecI16x16Dc_sse2;
+  }
+#if defined(HAVE_AVX2)
+  if (uiCpuFlag & WELS_CPU_AVX2) {
+    pFuncList->pfIDctT4     = WelsIDctT4Rec_avx2;
+    pFuncList->pfIDctFourT4 = WelsIDctFourT4Rec_avx2;
+  }
+#endif
+
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfDequantization4x4          = WelsDequant4x4_neon;
+    pFuncList->pfDequantizationFour4x4      = WelsDequantFour4x4_neon;
+    pFuncList->pfDequantizationIHadamard4x4 = WelsDequantIHadamard4x4_neon;
+
+    pFuncList->pfIDctFourT4     = WelsIDctFourT4Rec_neon;
+    pFuncList->pfIDctT4         = WelsIDctT4Rec_neon;
+    pFuncList->pfIDctI16x16Dc   = WelsIDctRecI16x16Dc_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfDequantization4x4          = WelsDequant4x4_AArch64_neon;
+    pFuncList->pfDequantizationFour4x4      = WelsDequantFour4x4_AArch64_neon;
+    pFuncList->pfDequantizationIHadamard4x4 = WelsDequantIHadamard4x4_AArch64_neon;
+
+    pFuncList->pfIDctFourT4     = WelsIDctFourT4Rec_AArch64_neon;
+    pFuncList->pfIDctT4         = WelsIDctT4Rec_AArch64_neon;
+    pFuncList->pfIDctI16x16Dc   = WelsIDctRecI16x16Dc_AArch64_neon;
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (uiCpuFlag & WELS_CPU_MMI) {
+    pFuncList->pfIDctT4         = WelsIDctT4Rec_mmi;
+    pFuncList->pfIDctFourT4     = WelsIDctFourT4Rec_mmi;
+    pFuncList->pfIDctI16x16Dc   = WelsIDctRecI16x16Dc_mmi;
+  }
+#endif//HAVE_MMI
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encode_mb_aux.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encode_mb_aux.cpp
new file mode 100644
index 0000000000..f9bc6c4768
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encode_mb_aux.cpp
@@ -0,0 +1,627 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#include "ls_defines.h"
+#include "encode_mb_aux.h"
+#include "cpu_core.h"
+namespace WelsEnc {
+
+ALIGNED_DECLARE (const int16_t, g_kiQuantInterFF[58][8], 16) = {
+  /* 0*/ {   0,   1,   0,   1,   1,   1,   1,   1 },
+  /* 1*/ {   0,   1,   0,   1,   1,   1,   1,   1 },
+  /* 2*/ {   1,   1,   1,   1,   1,   1,   1,   1 },
+  /* 3*/ {   1,   1,   1,   1,   1,   1,   1,   1 },
+  /* 4*/ {   1,   1,   1,   1,   1,   2,   1,   2 },
+  /* 5*/ {   1,   1,   1,   1,   1,   2,   1,   2 },
+  /* 6*/ {   1,   1,   1,   1,   1,   2,   1,   2 },
+  /* 7*/ {   1,   1,   1,   1,   1,   2,   1,   2 },
+  /* 8*/ {   1,   2,   1,   2,   2,   3,   2,   3 },
+  /* 9*/ {   1,   2,   1,   2,   2,   3,   2,   3 },
+  /*10*/ {   1,   2,   1,   2,   2,   3,   2,   3 },
+  /*11*/ {   1,   2,   1,   2,   2,   4,   2,   4 },
+  /*12*/ {   2,   3,   2,   3,   3,   4,   3,   4 },
+  /*13*/ {   2,   3,   2,   3,   3,   5,   3,   5 },
+  /*14*/ {   2,   3,   2,   3,   3,   5,   3,   5 },
+  /*15*/ {   2,   4,   2,   4,   4,   6,   4,   6 },
+  /*16*/ {   3,   4,   3,   4,   4,   7,   4,   7 },
+  /*17*/ {   3,   5,   3,   5,   5,   8,   5,   8 },
+  /*18*/ {   3,   5,   3,   5,   5,   8,   5,   8 },
+  /*19*/ {   4,   6,   4,   6,   6,   9,   6,   9 },
+  /*20*/ {   4,   7,   4,   7,   7,  10,   7,  10 },
+  /*21*/ {   5,   8,   5,   8,   8,  12,   8,  12 },
+  /*22*/ {   5,   8,   5,   8,   8,  13,   8,  13 },
+  /*23*/ {   6,  10,   6,  10,  10,  15,  10,  15 },
+  /*24*/ {   7,  11,   7,  11,  11,  17,  11,  17 },
+  /*25*/ {   7,  12,   7,  12,  12,  19,  12,  19 },
+  /*26*/ {   9,  13,   9,  13,  13,  21,  13,  21 },
+  /*27*/ {   9,  15,   9,  15,  15,  24,  15,  24 },
+  /*28*/ {  11,  17,  11,  17,  17,  26,  17,  26 },
+  /*29*/ {  12,  19,  12,  19,  19,  30,  19,  30 },
+  /*30*/ {  13,  22,  13,  22,  22,  33,  22,  33 },
+  /*31*/ {  15,  23,  15,  23,  23,  38,  23,  38 },
+  /*32*/ {  17,  27,  17,  27,  27,  42,  27,  42 },
+  /*33*/ {  19,  30,  19,  30,  30,  48,  30,  48 },
+  /*34*/ {  21,  33,  21,  33,  33,  52,  33,  52 },
+  /*35*/ {  24,  38,  24,  38,  38,  60,  38,  60 },
+  /*36*/ {  27,  43,  27,  43,  43,  67,  43,  67 },
+  /*37*/ {  29,  47,  29,  47,  47,  75,  47,  75 },
+  /*38*/ {  35,  53,  35,  53,  53,  83,  53,  83 },
+  /*39*/ {  37,  60,  37,  60,  60,  96,  60,  96 },
+  /*40*/ {  43,  67,  43,  67,  67, 104,  67, 104 },
+  /*41*/ {  48,  77,  48,  77,  77, 121,  77, 121 },
+  /*42*/ {  53,  87,  53,  87,  87, 133,  87, 133 },
+  /*43*/ {  59,  93,  59,  93,  93, 150,  93, 150 },
+  /*44*/ {  69, 107,  69, 107, 107, 167, 107, 167 },
+  /*45*/ {  75, 120,  75, 120, 120, 192, 120, 192 },
+  /*46*/ {  85, 133,  85, 133, 133, 208, 133, 208 },
+  /*47*/ {  96, 153,  96, 153, 153, 242, 153, 242 },
+  /*48*/ { 107, 173, 107, 173, 173, 267, 173, 267 },
+  /*49*/ { 117, 187, 117, 187, 187, 300, 187, 300 },
+  /*50*/ { 139, 213, 139, 213, 213, 333, 213, 333 },
+  /*51*/ { 149, 240, 149, 240, 240, 383, 240, 383 },
+  /* from here below is only for intra */
+  /*46*/ { 171, 267, 171, 267, 267, 417, 267, 417 },
+  /*47*/ { 192, 307, 192, 307, 307, 483, 307, 483 },
+  /*48*/ { 213, 347, 213, 347, 347, 533, 347, 533 },
+  /*49*/ { 235, 373, 235, 373, 373, 600, 373, 600 },
+  /*50*/ { 277, 427, 277, 427, 427, 667, 427, 667 },
+  /*51*/ { 299, 480, 299, 480, 480, 767, 480, 767 },
+};
+
+
+
+ALIGNED_DECLARE (const int16_t, g_kiQuantMF[52][8], 16) = {
+  /* 0*/        {26214, 16132, 26214, 16132, 16132, 10486, 16132, 10486 },
+  /* 1*/        {23832, 14980, 23832, 14980, 14980,  9320, 14980,  9320 },
+  /* 2*/        {20164, 13108, 20164, 13108, 13108,  8388, 13108,  8388 },
+  /* 3*/        {18724, 11650, 18724, 11650, 11650,  7294, 11650,  7294 },
+  /* 4*/        {16384, 10486, 16384, 10486, 10486,  6710, 10486,  6710 },
+  /* 5*/        {14564,  9118, 14564,  9118,  9118,  5786,  9118,  5786 },
+  /* 6*/        {13107,  8066, 13107,  8066,  8066,  5243,  8066,  5243 },
+  /* 7*/        {11916,  7490, 11916,  7490,  7490,  4660,  7490,  4660 },
+  /* 8*/        {10082,  6554, 10082,  6554,  6554,  4194,  6554,  4194 },
+  /* 9*/        { 9362,  5825,  9362,  5825,  5825,  3647,  5825,  3647 },
+  /*10*/        { 8192,  5243,  8192,  5243,  5243,  3355,  5243,  3355 },
+  /*11*/        { 7282,  4559,  7282,  4559,  4559,  2893,  4559,  2893 },
+  /*12*/        { 6554,  4033,  6554,  4033,  4033,  2622,  4033,  2622 },
+  /*13*/        { 5958,  3745,  5958,  3745,  3745,  2330,  3745,  2330 },
+  /*14*/        { 5041,  3277,  5041,  3277,  3277,  2097,  3277,  2097 },
+  /*15*/        { 4681,  2913,  4681,  2913,  2913,  1824,  2913,  1824 },
+  /*16*/        { 4096,  2622,  4096,  2622,  2622,  1678,  2622,  1678 },
+  /*17*/        { 3641,  2280,  3641,  2280,  2280,  1447,  2280,  1447 },
+  /*18*/        { 3277,  2017,  3277,  2017,  2017,  1311,  2017,  1311 },
+  /*19*/        { 2979,  1873,  2979,  1873,  1873,  1165,  1873,  1165 },
+  /*20*/        { 2521,  1639,  2521,  1639,  1639,  1049,  1639,  1049 },
+  /*21*/        { 2341,  1456,  2341,  1456,  1456,   912,  1456,   912 },
+  /*22*/        { 2048,  1311,  2048,  1311,  1311,   839,  1311,   839 },
+  /*23*/        { 1821,  1140,  1821,  1140,  1140,   723,  1140,   723 },
+  /*24*/        { 1638,  1008,  1638,  1008,  1008,   655,  1008,   655 },
+  /*25*/        { 1490,   936,  1490,   936,   936,   583,   936,   583 },
+  /*26*/        { 1260,   819,  1260,   819,   819,   524,   819,   524 },
+  /*27*/        { 1170,   728,  1170,   728,   728,   456,   728,   456 },
+  /*28*/        { 1024,   655,  1024,   655,   655,   419,   655,   419 },
+  /*29*/        {  910,   570,   910,   570,   570,   362,   570,   362 },
+  /*30*/        {  819,   504,   819,   504,   504,   328,   504,   328 },
+  /*31*/        {  745,   468,   745,   468,   468,   291,   468,   291 },
+  /*32*/        {  630,   410,   630,   410,   410,   262,   410,   262 },
+  /*33*/        {  585,   364,   585,   364,   364,   228,   364,   228 },
+  /*34*/        {  512,   328,   512,   328,   328,   210,   328,   210 },
+  /*35*/        {  455,   285,   455,   285,   285,   181,   285,   181 },
+  /*36*/        {  410,   252,   410,   252,   252,   164,   252,   164 },
+  /*37*/        {  372,   234,   372,   234,   234,   146,   234,   146 },
+  /*38*/        {  315,   205,   315,   205,   205,   131,   205,   131 },
+  /*39*/        {  293,   182,   293,   182,   182,   114,   182,   114 },
+  /*40*/        {  256,   164,   256,   164,   164,   105,   164,   105 },
+  /*41*/        {  228,   142,   228,   142,   142,    90,   142,    90 },
+  /*42*/        {  205,   126,   205,   126,   126,    82,   126,    82 },
+  /*43*/        {  186,   117,   186,   117,   117,    73,   117,    73 },
+  /*44*/        {  158,   102,   158,   102,   102,    66,   102,    66 },
+  /*45*/        {  146,    91,   146,    91,    91,    57,    91,    57 },
+  /*46*/        {  128,    82,   128,    82,    82,    52,    82,    52 },
+  /*47*/        {  114,    71,   114,    71,    71,    45,    71,    45 },
+  /*48*/        {  102,    63,   102,    63,    63,    41,    63,    41 },
+  /*49*/        {   93,    59,    93,    59,    59,    36,    59,    36 },
+  /*50*/        {   79,    51,    79,    51,    51,    33,    51,    33 },
+  /*51*/        {   73,    46,    73,    46,    46,    28,    46,    28 }
+};
+
+/****************************************************************************
+ * HDM and Quant functions
+ ****************************************************************************/
+#define WELS_ABS_LC(a) ((iSign ^ (int32_t)(a)) - iSign)
+#define NEW_QUANT(pDct, iFF, iMF) (((iFF)+ WELS_ABS_LC(pDct))*(iMF)) >>16
+#define WELS_NEW_QUANT(pDct,iFF,iMF) WELS_ABS_LC(NEW_QUANT(pDct, iFF, iMF))
+void WelsQuant4x4_c (int16_t* pDct, const int16_t* pFF,  const int16_t* pMF) {
+  int32_t i, j, iSign;
+  for (i = 0; i < 16; i += 4) {
+    j = i & 0x07;
+    iSign = WELS_SIGN (pDct[i]);
+    pDct[i] = WELS_NEW_QUANT (pDct[i], pFF[j], pMF[j]);
+    iSign = WELS_SIGN (pDct[i + 1]);
+    pDct[i + 1] = WELS_NEW_QUANT (pDct[i + 1], pFF[j + 1], pMF[j + 1]);
+    iSign = WELS_SIGN (pDct[i + 2]);
+    pDct[i + 2] = WELS_NEW_QUANT (pDct[i + 2], pFF[j + 2], pMF[j + 2]);
+    iSign = WELS_SIGN (pDct[i + 3]);
+    pDct[i + 3] = WELS_NEW_QUANT (pDct[i + 3], pFF[j + 3], pMF[j + 3]);
+  }
+}
+
+void WelsQuant4x4Dc_c (int16_t* pDct, int16_t iFF,  int16_t iMF) {
+  int32_t i, iSign;
+  for (i = 0; i < 16; i += 4) {
+    iSign = WELS_SIGN (pDct[i]);
+    pDct[i] = WELS_NEW_QUANT (pDct[i], iFF, iMF);
+    iSign = WELS_SIGN (pDct[i + 1]);
+    pDct[i + 1] = WELS_NEW_QUANT (pDct[i + 1], iFF, iMF);
+    iSign = WELS_SIGN (pDct[i + 2]);
+    pDct[i + 2] = WELS_NEW_QUANT (pDct[i + 2], iFF, iMF);
+    iSign = WELS_SIGN (pDct[i + 3]);
+    pDct[i + 3] = WELS_NEW_QUANT (pDct[i + 3], iFF, iMF);
+  }
+}
+
+void WelsQuantFour4x4_c (int16_t* pDct, const int16_t* pFF, const int16_t* pMF) {
+  int32_t i, j, iSign;
+
+  for (i = 0; i < 64; i += 4) {
+    j = i & 0x07;
+    iSign = WELS_SIGN (pDct[i]);
+    pDct[i] = WELS_NEW_QUANT (pDct[i], pFF[j], pMF[j]);
+    iSign = WELS_SIGN (pDct[i + 1]);
+    pDct[i + 1] = WELS_NEW_QUANT (pDct[i + 1], pFF[j + 1], pMF[j + 1]);
+    iSign = WELS_SIGN (pDct[i + 2]);
+    pDct[i + 2] = WELS_NEW_QUANT (pDct[i + 2], pFF[j + 2], pMF[j + 2]);
+    iSign = WELS_SIGN (pDct[i + 3]);
+    pDct[i + 3] = WELS_NEW_QUANT (pDct[i + 3], pFF[j + 3], pMF[j + 3]);
+  }
+}
+
+void WelsQuantFour4x4Max_c (int16_t* pDct, const int16_t* pFF, const int16_t* pMF, int16_t* pMax) {
+  int32_t i, j, k, iSign;
+  int16_t iMaxAbs;
+  for (k = 0; k < 4; k++) {
+    iMaxAbs = 0;
+    for (i = 0; i < 16; i++) {
+      j = i & 0x07;
+      iSign = WELS_SIGN (pDct[i]);
+      pDct[i] = NEW_QUANT (pDct[i], pFF[j], pMF[j]);
+      if (iMaxAbs < pDct[i]) iMaxAbs = pDct[i];
+      pDct[i] = WELS_ABS_LC (pDct[i]);
+    }
+    pDct += 16;
+    pMax[k] = iMaxAbs;
+  }
+}
+
+int32_t WelsHadamardQuant2x2Skip_c (int16_t* pRs, int16_t iFF,  int16_t iMF) {
+  int16_t pDct[4], s[4];
+  int16_t iThreshold = ((1 << 16) - 1) / iMF - iFF;
+
+  s[0] = pRs[0]  + pRs[32];
+  s[1] = pRs[0]  - pRs[32];
+  s[2] = pRs[16] + pRs[48];
+  s[3] = pRs[16] - pRs[48];
+
+  pDct[0] = s[0] + s[2];
+  pDct[1] = s[0] - s[2];
+  pDct[2] = s[1] + s[3];
+  pDct[3] = s[1] - s[3];
+
+  return ((WELS_ABS (pDct[0]) > iThreshold) || (WELS_ABS (pDct[1]) > iThreshold) || (WELS_ABS (pDct[2]) > iThreshold)
+          || (WELS_ABS (pDct[3]) > iThreshold));
+}
+
+int32_t WelsHadamardQuant2x2_c (int16_t* pRs, const int16_t iFF, int16_t iMF, int16_t* pDct, int16_t* pBlock) {
+  int16_t s[4];
+  int32_t iSign, i, iDcNzc = 0;
+
+  s[0] = pRs[0]  + pRs[32];
+  s[1] = pRs[0]  - pRs[32];
+  s[2] = pRs[16] + pRs[48];
+  s[3] = pRs[16] - pRs[48];
+
+  pRs[0] = 0;
+  pRs[16] = 0;
+  pRs[32] = 0;
+  pRs[48] = 0;
+
+  pDct[0] = s[0] + s[2];
+  pDct[1] = s[0] - s[2];
+  pDct[2] = s[1] + s[3];
+  pDct[3] = s[1] - s[3];
+
+  iSign = WELS_SIGN (pDct[0]);
+  pDct[0] = WELS_NEW_QUANT (pDct[0], iFF, iMF);
+  iSign = WELS_SIGN (pDct[1]);
+  pDct[1] = WELS_NEW_QUANT (pDct[1], iFF, iMF);
+  iSign = WELS_SIGN (pDct[2]);
+  pDct[2] = WELS_NEW_QUANT (pDct[2], iFF, iMF);
+  iSign = WELS_SIGN (pDct[3]);
+  pDct[3] = WELS_NEW_QUANT (pDct[3], iFF, iMF);
+
+  ST64 (pBlock, LD64 (pDct));
+
+  for (i = 0; i < 4; i++)
+    iDcNzc += (pBlock[i] != 0);
+  return iDcNzc;
+}
+
+/* dc value pick up and hdm_4x4 */
+void WelsHadamardT4Dc_c (int16_t* pLumaDc, int16_t* pDct) {
+  int32_t p[16], s[4];
+  int32_t i, iIdx;
+
+  for (i = 0 ; i < 16 ; i += 4) {
+    iIdx = ((i & 0x08) << 4) + ((i & 0x04) << 3);
+    s[0] = pDct[iIdx ]     + pDct[iIdx + 80];
+    s[3] = pDct[iIdx ]     - pDct[iIdx + 80];
+    s[1] = pDct[iIdx + 16] + pDct[iIdx + 64];
+    s[2] = pDct[iIdx + 16] - pDct[iIdx + 64];
+
+    p[i  ]   = s[0] + s[1];
+    p[i + 2] = s[0] - s[1];
+    p[i + 1] = s[3] + s[2];
+    p[i + 3] = s[3] - s[2];
+  }
+
+  for (i = 0 ; i < 4 ; i ++) {
+    s[0] = p[i ]    + p[i + 12];
+    s[3] = p[i ]    - p[i + 12];
+    s[1] = p[i + 4] + p[i + 8];
+    s[2] = p[i + 4] - p[i + 8];
+
+    pLumaDc[i  ]    = WELS_CLIP3 ((s[0] + s[1] + 1) >> 1, -32768, 32767);
+    pLumaDc[i + 8 ] = WELS_CLIP3 ((s[0] - s[1] + 1) >> 1, -32768, 32767);
+    pLumaDc[i + 4 ] = WELS_CLIP3 ((s[3] + s[2] + 1) >> 1, -32768, 32767);
+    pLumaDc[i + 12] = WELS_CLIP3 ((s[3] - s[2] + 1) >> 1, -32768, 32767);
+  }
+}
+
+/****************************************************************************
+ * DCT functions
+ ****************************************************************************/
+void WelsDctT4_c (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2) {
+  int16_t i, pData[16], s[4];
+  for (i = 0 ; i < 16 ; i += 4) {
+    const int32_t kiI1 = 1 + i;
+    const int32_t kiI2 = 2 + i;
+    const int32_t kiI3 = 3 + i;
+
+    pData[i ] = pPixel1[0] - pPixel2[0];
+    pData[kiI1] = pPixel1[1] - pPixel2[1];
+    pData[kiI2] = pPixel1[2] - pPixel2[2];
+    pData[kiI3] = pPixel1[3] - pPixel2[3];
+
+    pPixel1 += iStride1;
+    pPixel2 += iStride2;
+
+    /*horizontal transform */
+    s[0] = pData[i] + pData[kiI3];
+    s[3] = pData[i] - pData[kiI3];
+    s[1] = pData[kiI1] + pData[kiI2];
+    s[2] = pData[kiI1] - pData[kiI2];
+
+    pDct[i ]   = s[0] + s[1];
+    pDct[kiI2] = s[0] - s[1];
+    pDct[kiI1] = (s[3] * (1 << 1)) + s[2];
+    pDct[kiI3] = s[3] - (s[2] * (1 << 1));
+  }
+
+  /* vertical transform */
+  for (i = 0 ; i < 4 ; i ++) {
+    const int32_t kiI4  = 4 + i;
+    const int32_t kiI8  = 8 + i;
+    const int32_t kiI12 = 12 + i;
+
+    s[0] = pDct[i ] + pDct[kiI12];
+    s[3] = pDct[i ] - pDct[kiI12];
+    s[1] = pDct[kiI4] + pDct[kiI8 ];
+    s[2] = pDct[kiI4] - pDct[kiI8 ];
+
+    pDct[i  ]   = s[0] + s[1];
+    pDct[kiI8 ] = s[0] - s[1];
+    pDct[kiI4 ] = (s[3] * (1 << 1)) + s[2];
+    pDct[kiI12] = s[3] - (s[2] * (1 << 1));
+  }
+}
+
+void WelsDctFourT4_c (int16_t* pDct, uint8_t* pPixel1, int32_t iStride1, uint8_t* pPixel2, int32_t iStride2) {
+  int32_t stride_1 = iStride1 << 2;
+  int32_t stride_2 = iStride2 << 2;
+
+  WelsDctT4_c (pDct,      &pPixel1[0],            iStride1, &pPixel2[0],            iStride2);
+  WelsDctT4_c (pDct + 16, &pPixel1[4],            iStride1, &pPixel2[4],            iStride2);
+  WelsDctT4_c (pDct + 32, &pPixel1[stride_1    ], iStride1, &pPixel2[stride_2    ], iStride2);
+  WelsDctT4_c (pDct + 48, &pPixel1[stride_1 + 4], iStride1, &pPixel2[stride_2 + 4], iStride2);
+}
+
+/****************************************************************************
+ * Scan and Score functions
+ ****************************************************************************/
+void WelsScan4x4DcAc_c (int16_t* pLevel, int16_t* pDct) {
+  ST32 (pLevel, LD32 (pDct));
+  pLevel[2] = pDct[4];
+  pLevel[3] = pDct[8];
+  pLevel[4] = pDct[5];
+  ST32 (pLevel + 5, LD32 (pDct + 2));
+  pLevel[7] = pDct[6];
+  pLevel[8] = pDct[9];
+  ST32 (pLevel + 9, LD32 (pDct + 12));
+  pLevel[11] = pDct[10];
+  pLevel[12] = pDct[7];
+  pLevel[13] = pDct[11];
+  ST32 (pLevel + 14, LD32 (pDct + 14));
+}
+
+void WelsScan4x4Ac_c (int16_t* pLevel, int16_t* pDct) {
+  pLevel[0]  = pDct[1];
+  pLevel[1]  = pDct[4];
+  pLevel[2]  = pDct[8];
+  pLevel[3]  = pDct[5];
+  ST32 (&pLevel[4], LD32 (&pDct[2]));
+  pLevel[6]  = pDct[6];
+  pLevel[7]  = pDct[9];
+  ST32 (&pLevel[8], LD32 (&pDct[12]));
+  pLevel[10] = pDct[10];
+  pLevel[11] = pDct[7];
+  pLevel[12] = pDct[11];
+  ST32 (&pLevel[13], LD32 (&pDct[14]));
+  pLevel[15] = 0;
+}
+
+void WelsScan4x4Dc (int16_t* pLevel, int16_t* pDct) {
+  ST32 (pLevel, LD32 (pDct));
+  pLevel[2] = pDct[4];
+  pLevel[3] = pDct[8];
+  pLevel[4] = pDct[5];
+  ST32 (pLevel + 5, LD32 (pDct + 2));
+  pLevel[7] = pDct[6];
+  pLevel[8] = pDct[9];
+  ST32 (pLevel + 9, LD32 (pDct + 12));
+  pLevel[11] = pDct[10];
+  pLevel[12] = pDct[7];
+  pLevel[13] = pDct[11];
+  ST32 (pLevel + 14, LD32 (pDct + 14));
+}
+
+//refer to JVT-O079
+int32_t WelsCalculateSingleCtr4x4_c (int16_t* pDct) {
+  static const int32_t kiTRunTable[16] = { 3, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+  int32_t iSingleCtr = 0;
+  int32_t iIdx = 15;
+  int32_t iRun;
+
+  while (iIdx >= 0 && pDct[iIdx] == 0)      --iIdx;
+
+  while (iIdx >= 0) {
+    -- iIdx;
+    iRun = iIdx;
+    while (iIdx >= 0 && pDct[iIdx] == 0)  --iIdx;
+    iRun -= iIdx;
+    iSingleCtr += kiTRunTable[iRun];
+  }
+  return iSingleCtr;
+}
+
+int32_t WelsGetNoneZeroCount_c (int16_t* pLevel) {
+  int32_t iCnt = 0;
+  int32_t iIdx = 0;
+
+  while (iIdx < 16) {
+    iCnt += (pLevel[  iIdx] == 0);
+    iCnt += (pLevel[1 + iIdx] == 0);
+    iCnt += (pLevel[2 + iIdx] == 0);
+    iCnt += (pLevel[3 + iIdx] == 0);
+
+    iIdx += 4;
+  }
+  return (16 - iCnt);
+}
+
+#ifdef HAVE_NEON
+int32_t WelsHadamardQuant2x2Skip_neon (int16_t* pRes, int16_t iFF,  int16_t iMF) {
+  int16_t iThreshold = ((1 << 16) - 1) / iMF - iFF;
+  return WelsHadamardQuant2x2SkipKernel_neon (pRes, iThreshold);
+}
+#endif
+#ifdef HAVE_NEON_AARCH64
+int32_t WelsHadamardQuant2x2Skip_AArch64_neon (int16_t* pRes, int16_t iFF,  int16_t iMF) {
+  int16_t iThreshold = ((1 << 16) - 1) / iMF - iFF;
+  return WelsHadamardQuant2x2SkipKernel_AArch64_neon (pRes, iThreshold);
+}
+#endif
+void WelsInitEncodingFuncs (SWelsFuncPtrList* pFuncList, uint32_t  uiCpuFlag) {
+  pFuncList->pfCopy8x8Aligned           = WelsCopy8x8_c;
+  pFuncList->pfCopy16x16Aligned         =
+  pFuncList->pfCopy16x16NotAligned      = WelsCopy16x16_c;
+  pFuncList->pfCopy16x8NotAligned       = WelsCopy16x8_c;
+  pFuncList->pfCopy8x16Aligned          = WelsCopy8x16_c;
+  pFuncList->pfCopy4x4           = WelsCopy4x4_c;
+  pFuncList->pfCopy8x4           = WelsCopy8x4_c;
+  pFuncList->pfCopy4x8           = WelsCopy4x8_c;
+  pFuncList->pfQuantizationHadamard2x2          = WelsHadamardQuant2x2_c;
+  pFuncList->pfQuantizationHadamard2x2Skip      = WelsHadamardQuant2x2Skip_c;
+  pFuncList->pfTransformHadamard4x4Dc           = WelsHadamardT4Dc_c;
+
+  pFuncList->pfDctT4                    = WelsDctT4_c;
+  pFuncList->pfDctFourT4                = WelsDctFourT4_c;
+
+  pFuncList->pfScan4x4                  = WelsScan4x4DcAc_c;
+  pFuncList->pfScan4x4Ac                = WelsScan4x4Ac_c;
+  pFuncList->pfCalculateSingleCtr4x4    = WelsCalculateSingleCtr4x4_c;
+
+  pFuncList->pfGetNoneZeroCount         = WelsGetNoneZeroCount_c;
+
+  pFuncList->pfQuantization4x4          = WelsQuant4x4_c;
+  pFuncList->pfQuantizationDc4x4        = WelsQuant4x4Dc_c;
+  pFuncList->pfQuantizationFour4x4      = WelsQuantFour4x4_c;
+  pFuncList->pfQuantizationFour4x4Max   = WelsQuantFour4x4Max_c;
+
+#if defined(X86_ASM)
+  if (uiCpuFlag & WELS_CPU_MMXEXT) {
+
+    pFuncList->pfQuantizationHadamard2x2        = WelsHadamardQuant2x2_mmx;
+    pFuncList->pfQuantizationHadamard2x2Skip    = WelsHadamardQuant2x2Skip_mmx;
+
+    pFuncList->pfDctT4                  = WelsDctT4_mmx;
+
+    pFuncList->pfCopy8x8Aligned         = WelsCopy8x8_mmx;
+    pFuncList->pfCopy8x16Aligned        = WelsCopy8x16_mmx;
+  }
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->pfGetNoneZeroCount       = WelsGetNoneZeroCount_sse2;
+    pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_sse2;
+
+    pFuncList->pfQuantization4x4        = WelsQuant4x4_sse2;
+    pFuncList->pfQuantizationDc4x4      = WelsQuant4x4Dc_sse2;
+    pFuncList->pfQuantizationFour4x4    = WelsQuantFour4x4_sse2;
+    pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_sse2;
+
+    pFuncList->pfCopy16x16Aligned       = WelsCopy16x16_sse2;
+    pFuncList->pfCopy16x16NotAligned    = WelsCopy16x16NotAligned_sse2;
+    pFuncList->pfCopy16x8NotAligned     = WelsCopy16x8NotAligned_sse2;
+
+    pFuncList->pfScan4x4                = WelsScan4x4DcAc_sse2;
+    pFuncList->pfScan4x4Ac              = WelsScan4x4Ac_sse2;
+    pFuncList->pfCalculateSingleCtr4x4  = WelsCalculateSingleCtr4x4_sse2;
+
+    pFuncList->pfDctT4                  = WelsDctT4_sse2;
+    pFuncList->pfDctFourT4              = WelsDctFourT4_sse2;
+  }
+//#ifndef MACOS
+  if (uiCpuFlag & WELS_CPU_SSSE3) {
+    pFuncList->pfScan4x4                = WelsScan4x4DcAc_ssse3;
+  }
+  if (uiCpuFlag & WELS_CPU_SSE42) {
+    pFuncList->pfGetNoneZeroCount       = WelsGetNoneZeroCount_sse42;
+  }
+#if defined(HAVE_AVX2)
+  if (uiCpuFlag & WELS_CPU_AVX2) {
+    pFuncList->pfDctT4                  = WelsDctT4_avx2;
+    pFuncList->pfDctFourT4              = WelsDctFourT4_avx2;
+
+    pFuncList->pfQuantization4x4        = WelsQuant4x4_avx2;
+    pFuncList->pfQuantizationDc4x4      = WelsQuant4x4Dc_avx2;
+    pFuncList->pfQuantizationFour4x4    = WelsQuantFour4x4_avx2;
+    pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_avx2;
+  }
+#endif
+//#endif//MACOS
+
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfQuantizationHadamard2x2        = WelsHadamardQuant2x2_neon;
+    pFuncList->pfQuantizationHadamard2x2Skip    = WelsHadamardQuant2x2Skip_neon;
+    pFuncList->pfDctT4                          = WelsDctT4_neon;
+    pFuncList->pfCopy8x8Aligned                 = WelsCopy8x8_neon;
+    pFuncList->pfCopy8x16Aligned                = WelsCopy8x16_neon;
+
+    pFuncList->pfGetNoneZeroCount       = WelsGetNoneZeroCount_neon;
+    pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_neon;
+
+    pFuncList->pfQuantization4x4        = WelsQuant4x4_neon;
+    pFuncList->pfQuantizationDc4x4      = WelsQuant4x4Dc_neon;
+    pFuncList->pfQuantizationFour4x4    = WelsQuantFour4x4_neon;
+    pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_neon;
+
+    pFuncList->pfCopy16x16Aligned       = WelsCopy16x16_neon;
+    pFuncList->pfCopy16x16NotAligned    = WelsCopy16x16NotAligned_neon;
+    pFuncList->pfCopy16x8NotAligned     = WelsCopy16x8NotAligned_neon;
+    pFuncList->pfDctFourT4              = WelsDctFourT4_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfQuantizationHadamard2x2        = WelsHadamardQuant2x2_AArch64_neon;
+    pFuncList->pfQuantizationHadamard2x2Skip    = WelsHadamardQuant2x2Skip_AArch64_neon;
+    pFuncList->pfDctT4                          = WelsDctT4_AArch64_neon;
+    pFuncList->pfCopy8x8Aligned                 = WelsCopy8x8_AArch64_neon;
+    pFuncList->pfCopy8x16Aligned                = WelsCopy8x16_AArch64_neon;
+
+    pFuncList->pfGetNoneZeroCount       = WelsGetNoneZeroCount_AArch64_neon;
+    pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_AArch64_neon;
+
+    pFuncList->pfQuantization4x4        = WelsQuant4x4_AArch64_neon;
+    pFuncList->pfQuantizationDc4x4      = WelsQuant4x4Dc_AArch64_neon;
+    pFuncList->pfQuantizationFour4x4    = WelsQuantFour4x4_AArch64_neon;
+    pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_AArch64_neon;
+
+    pFuncList->pfCopy16x16Aligned       = WelsCopy16x16_AArch64_neon;
+    pFuncList->pfCopy16x16NotAligned    = WelsCopy16x16NotAligned_AArch64_neon;
+    pFuncList->pfCopy16x8NotAligned     = WelsCopy16x8NotAligned_AArch64_neon;
+    pFuncList->pfDctFourT4              = WelsDctFourT4_AArch64_neon;
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (uiCpuFlag & WELS_CPU_MMI) {
+    pFuncList->pfCopy8x8Aligned         = WelsCopy8x8_mmi;
+    pFuncList->pfCopy8x16Aligned        = WelsCopy8x16_mmi;
+
+    pFuncList->pfGetNoneZeroCount       = WelsGetNoneZeroCount_mmi;
+    pFuncList->pfTransformHadamard4x4Dc = WelsHadamardT4Dc_mmi;
+
+    pFuncList->pfQuantization4x4        = WelsQuant4x4_mmi;
+    pFuncList->pfQuantizationDc4x4      = WelsQuant4x4Dc_mmi;
+    pFuncList->pfQuantizationFour4x4    = WelsQuantFour4x4_mmi;
+    pFuncList->pfQuantizationFour4x4Max = WelsQuantFour4x4Max_mmi;
+
+    pFuncList->pfCopy16x16Aligned       = WelsCopy16x16_mmi;
+    pFuncList->pfCopy16x16NotAligned    = WelsCopy16x16NotAligned_mmi;
+    pFuncList->pfCopy16x8NotAligned     = WelsCopy16x8NotAligned_mmi;
+
+    pFuncList->pfScan4x4                = WelsScan4x4DcAc_mmi;
+    pFuncList->pfScan4x4Ac              = WelsScan4x4Ac_mmi;
+    pFuncList->pfCalculateSingleCtr4x4  = WelsCalculateSingleCtr4x4_mmi;
+
+    pFuncList->pfDctT4                  = WelsDctT4_mmi;
+    pFuncList->pfDctFourT4              = WelsDctFourT4_mmi;
+  }
+#endif//HAVE_MMI
+
+#if defined(HAVE_MSA)
+  if (uiCpuFlag & WELS_CPU_MSA) {
+    pFuncList->pfCopy8x8Aligned         = WelsCopy8x8_msa;
+    pFuncList->pfCopy8x16Aligned        = WelsCopy8x16_msa;
+
+    pFuncList->pfCopy16x16Aligned       =
+    pFuncList->pfCopy16x16NotAligned    = WelsCopy16x16_msa;
+    pFuncList->pfCopy16x8NotAligned     = WelsCopy16x8_msa;
+  }
+#endif
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder.cpp
new file mode 100644
index 0000000000..8b5b792994
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder.cpp
@@ -0,0 +1,551 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encoder.c
+ *
+ * \brief   core encoder
+ *
+ * \date    5/14/2009 Created
+ *
+ *************************************************************************************
+ */
+#include "encoder.h"
+#include "cpu_core.h"
+
+#include "decode_mb_aux.h"
+#include "get_intra_predictor.h"
+
+#include "deblocking.h"
+#include "ref_list_mgr_svc.h"
+#include "mc.h"
+#include "paraset_strategy.h"
+#include "sample.h"
+
+#include "svc_enc_golomb.h"
+#include "svc_base_layer_md.h"
+#include "svc_mode_decision.h"
+#include "set_mb_syn_cavlc.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross_platforms
+#include "slice_multi_threading.h"
+
+//  global   function  pointers  definition
+namespace WelsEnc {
+/* Motion compensation */
+
+
+/*!
+ * \brief   initialize source picture body
+ * \param   pSrc        SSourcePicture*
+ * \param   csp         internal csp format
+ * \param   iWidth      widht of picture in pixels
+ * \param   iHeight     iHeight of picture in pixels
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t InitPic (const void* kpSrc, const int32_t kiColorspace, const int32_t kiWidth, const int32_t kiHeight) {
+  SSourcePicture* pSrcPic = (SSourcePicture*)kpSrc;
+
+  if (NULL == pSrcPic || kiWidth == 0 || kiHeight == 0)
+    return 1;
+
+  pSrcPic->iColorFormat = kiColorspace;
+  pSrcPic->iPicWidth    = kiWidth;
+  pSrcPic->iPicHeight   = kiHeight;
+
+  //currently encoder only supports videoFormatI420.
+  if ((kiColorspace & (~videoFormatVFlip)) != videoFormatI420)
+    return 2;
+  switch (kiColorspace & (~videoFormatVFlip)) {
+  case videoFormatI420:
+  case videoFormatYV12:
+    pSrcPic->pData[0]   = NULL;
+    pSrcPic->pData[1]   = NULL;
+    pSrcPic->pData[2]   = NULL;
+    pSrcPic->pData[3]   = NULL;
+    pSrcPic->iStride[0] = kiWidth;
+    pSrcPic->iStride[2] = pSrcPic->iStride[1] = kiWidth >> 1;
+    pSrcPic->iStride[3] = 0;
+    break;
+  case videoFormatYUY2:
+  case videoFormatYVYU:
+  case videoFormatUYVY:
+    pSrcPic->pData[0]   = NULL;
+    pSrcPic->pData[1]   = NULL;
+    pSrcPic->pData[2]   = NULL;
+    pSrcPic->pData[3]   = NULL;
+    pSrcPic->iStride[0] = CALC_BI_STRIDE (kiWidth,  16);
+    pSrcPic->iStride[3] = pSrcPic->iStride[2] = pSrcPic->iStride[1] = 0;
+    break;
+  case videoFormatRGB:
+  case videoFormatBGR:
+    pSrcPic->pData[0]   = NULL;
+    pSrcPic->pData[1]   = NULL;
+    pSrcPic->pData[2]   = NULL;
+    pSrcPic->pData[3]   = NULL;
+    pSrcPic->iStride[0] = CALC_BI_STRIDE (kiWidth, 24);
+    pSrcPic->iStride[3] = pSrcPic->iStride[2] = pSrcPic->iStride[1] = 0;
+    if (kiColorspace & videoFormatVFlip)
+      pSrcPic->iColorFormat = kiColorspace & (~videoFormatVFlip);
+    else
+      pSrcPic->iColorFormat = kiColorspace | videoFormatVFlip;
+    break;
+  case videoFormatBGRA:
+  case videoFormatRGBA:
+  case videoFormatARGB:
+  case videoFormatABGR:
+    pSrcPic->pData[0]   = NULL;
+    pSrcPic->pData[1]   = NULL;
+    pSrcPic->pData[2]   = NULL;
+    pSrcPic->pData[3]   = NULL;
+    pSrcPic->iStride[0] = kiWidth << 2;
+    pSrcPic->iStride[3] = pSrcPic->iStride[2] = pSrcPic->iStride[1] = 0;
+    if (kiColorspace & videoFormatVFlip)
+      pSrcPic->iColorFormat = kiColorspace & (~videoFormatVFlip);
+    else
+      pSrcPic->iColorFormat = kiColorspace | videoFormatVFlip;
+    break;
+  default:
+    return 2; // any else?
+  }
+
+  return 0;
+}
+
+
+void WelsInitBGDFunc (SWelsFuncPtrList* pFuncList, const bool kbEnableBackgroundDetection) {
+  if (kbEnableBackgroundDetection) {
+    pFuncList->pfInterMdBackgroundDecision = WelsMdInterJudgeBGDPskip;
+    pFuncList->pfMdBackgroundInfoUpdate = WelsMdUpdateBGDInfo;
+  } else {
+    pFuncList->pfInterMdBackgroundDecision = WelsMdInterJudgeBGDPskipFalse;
+    pFuncList->pfMdBackgroundInfoUpdate = WelsMdUpdateBGDInfoNULL;
+  }
+}
+
+/*!
+ * \brief   initialize function pointers that potentially used in Wels encoding
+ * \param   pEncCtx     sWelsEncCtx*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t InitFunctionPointers (sWelsEncCtx* pEncCtx, SWelsSvcCodingParam* pParam, uint32_t uiCpuFlag) {
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+  SWelsFuncPtrList* pFuncList = pEncCtx->pFuncList;
+  bool bScreenContent = (SCREEN_CONTENT_REAL_TIME == pParam->iUsageType);
+
+  /* Functionality utilization of CPU instructions dependency */
+  pFuncList->pfSetMemZeroSize8              = WelsSetMemZero_c;             // confirmed_safe_unsafe_usage
+  pFuncList->pfSetMemZeroSize64Aligned16    = WelsSetMemZero_c;     // confirmed_safe_unsafe_usage
+  pFuncList->pfSetMemZeroSize64             = WelsSetMemZero_c;     // confirmed_safe_unsafe_usage
+#if defined(X86_ASM)
+  if (uiCpuFlag & WELS_CPU_MMXEXT) {
+    pFuncList->pfSetMemZeroSize8            = WelsSetMemZeroSize8_mmx;              // confirmed_safe_unsafe_usage
+    pFuncList->pfSetMemZeroSize64Aligned16  = WelsSetMemZeroSize64_mmx;     // confirmed_safe_unsafe_usage
+    pFuncList->pfSetMemZeroSize64           = WelsSetMemZeroSize64_mmx;     // confirmed_safe_unsafe_usage
+  }
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->pfSetMemZeroSize64Aligned16  = WelsSetMemZeroAligned64_sse2; // confirmed_safe_unsafe_usage
+  }
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfSetMemZeroSize8            = WelsSetMemZero_neon;
+    pFuncList->pfSetMemZeroSize64Aligned16  = WelsSetMemZero_neon;
+    pFuncList->pfSetMemZeroSize64           = WelsSetMemZero_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfSetMemZeroSize8            = WelsSetMemZero_AArch64_neon;
+    pFuncList->pfSetMemZeroSize64Aligned16  = WelsSetMemZero_AArch64_neon;
+    pFuncList->pfSetMemZeroSize64           = WelsSetMemZero_AArch64_neon;
+  }
+#endif
+
+  InitExpandPictureFunc (& (pFuncList->sExpandPicFunc), uiCpuFlag);
+
+  /* Intra_Prediction_fn*/
+  WelsInitIntraPredFuncs (pFuncList, uiCpuFlag);
+
+  /* ME func */
+  WelsInitMeFunc (pFuncList, uiCpuFlag, bScreenContent);
+
+  /* sad, satd, average */
+  WelsInitSampleSadFunc (pFuncList, uiCpuFlag);
+
+  //
+  WelsInitBGDFunc (pFuncList, pParam->bEnableBackgroundDetection);
+  WelsInitSCDPskipFunc (pFuncList, bScreenContent && (pParam->bEnableSceneChangeDetect));
+
+  // for pfGetVarianceFromIntraVaa function ptr adaptive by CPU features, 6/7/2010
+  InitIntraAnalysisVaaInfo (pFuncList, uiCpuFlag);
+
+  /* Motion compensation */
+  /*init pixel average function*/
+  /*get one column or row pixel when refinement*/
+  InitMcFunc (&pFuncList->sMcFuncs, uiCpuFlag);
+  InitCoeffFunc (pFuncList, uiCpuFlag, pParam->iEntropyCodingModeFlag);
+
+  WelsInitEncodingFuncs (pFuncList, uiCpuFlag);
+  WelsInitReconstructionFuncs (pFuncList, uiCpuFlag);
+
+  DeblockingInit (&pFuncList->pfDeblocking, uiCpuFlag);
+  WelsBlockFuncInit (&pFuncList->pfSetNZCZero, uiCpuFlag);
+
+  InitFillNeighborCacheInterFunc (pFuncList, pParam->bEnableBackgroundDetection);
+
+  pFuncList->pParametersetStrategy = IWelsParametersetStrategy::CreateParametersetStrategy (pParam->eSpsPpsIdStrategy,
+                                     pParam->bSimulcastAVC, pParam->iSpatialLayerNum);
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, (NULL == pFuncList->pParametersetStrategy))
+
+  return iReturn;
+}
+
+void UpdateFrameNum (sWelsEncCtx* pEncCtx, const int32_t kiDidx) {
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx];
+  bool bNeedFrameNumIncreasing = false;
+
+  if (NRI_PRI_LOWEST != pEncCtx->eLastNalPriority[kiDidx]) {
+    bNeedFrameNumIncreasing = true;
+  }
+
+  if (bNeedFrameNumIncreasing) {
+    if (pParamInternal->iFrameNum < (1 << pEncCtx->pSps->uiLog2MaxFrameNum) - 1)
+      ++ pParamInternal->iFrameNum;
+    else
+      pParamInternal->iFrameNum = 0;    // if iFrameNum overflow
+  }
+
+  pEncCtx->eLastNalPriority[kiDidx] = NRI_PRI_LOWEST;
+}
+
+
+void LoadBackFrameNum (sWelsEncCtx* pEncCtx, const int32_t kiDidx) {
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx];
+  bool bNeedFrameNumIncreasing = false;
+
+  if (NRI_PRI_LOWEST != pEncCtx->eLastNalPriority[kiDidx]) {
+    bNeedFrameNumIncreasing = true;
+  }
+
+  if (bNeedFrameNumIncreasing) {
+    if (pParamInternal->iFrameNum != 0) {
+      pParamInternal->iFrameNum --;
+    } else {
+      pParamInternal->iFrameNum = (1 << pEncCtx->pSps->uiLog2MaxFrameNum) - 1;
+    }
+  }
+}
+
+void InitBitStream (sWelsEncCtx* pEncCtx) {
+  // for bitstream writing
+  pEncCtx->iPosBsBuffer         = 0;    // reset bs pBuffer position
+  pEncCtx->pOut->iNalIndex      = 0;    // reset NAL index
+  pEncCtx->pOut->iLayerBsIndex  = 0;    // reset index of Layer Bs
+
+  InitBits (&pEncCtx->pOut->sBsWrite, pEncCtx->pOut->pBsBuffer, pEncCtx->pOut->uiSize);
+}
+/*!
+ * \brief   initialize frame coding
+ */
+void InitFrameCoding (sWelsEncCtx* pEncCtx, const EVideoFrameType keFrameType, const int32_t kiDidx) {
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx];
+  if (keFrameType == videoFrameTypeP) {
+    ++pParamInternal->iFrameIndex;
+
+    if (pParamInternal->iPOC < (1 << pEncCtx->pSps->iLog2MaxPocLsb) -
+        2)     // if iPOC type is no 0, this need be modification
+      pParamInternal->iPOC += 2;   // for POC type 0
+    else
+      pParamInternal->iPOC = 0;
+
+    UpdateFrameNum (pEncCtx, kiDidx);
+
+    pEncCtx->eNalType           = NAL_UNIT_CODED_SLICE;
+    pEncCtx->eSliceType         = P_SLICE;
+    pEncCtx->eNalPriority       = NRI_PRI_HIGH;
+  } else if (keFrameType == videoFrameTypeIDR) {
+    pParamInternal->iFrameNum          = 0;
+    pParamInternal->iPOC               = 0;
+    pParamInternal->bEncCurFrmAsIdrFlag = false;
+    pParamInternal->iFrameIndex = 0;
+
+    pEncCtx->eNalType           = NAL_UNIT_CODED_SLICE_IDR;
+    pEncCtx->eSliceType         = I_SLICE;
+    pEncCtx->eNalPriority       = NRI_PRI_HIGHEST;
+
+    pParamInternal->iCodingIndex       = 0;
+
+    // reset_ref_list
+
+    // rc_init_gop
+  } else if (keFrameType == videoFrameTypeI) {
+    if (pParamInternal->iPOC < (1 << pEncCtx->pSps->iLog2MaxPocLsb) -
+        2)     // if iPOC type is no 0, this need be modification
+      pParamInternal->iPOC += 2;   // for POC type 0
+    else
+      pParamInternal->iPOC = 0;
+
+    UpdateFrameNum (pEncCtx, kiDidx);
+
+    pEncCtx->eNalType     = NAL_UNIT_CODED_SLICE;
+    pEncCtx->eSliceType   = I_SLICE;
+    pEncCtx->eNalPriority = NRI_PRI_HIGHEST;
+
+    // rc_init_gop
+  } else { // B pictures are not supported now, any else?
+    assert (0);
+  }
+
+#if defined(STAT_OUTPUT)
+  memset (&pEncCtx->sPerInfo, 0, sizeof (SStatSliceInfo));
+#endif//FRAME_INFO_OUTPUT
+}
+
+EVideoFrameType DecideFrameType (sWelsEncCtx* pEncCtx, const int8_t kiSpatialNum, const int32_t kiDidx,
+                                 bool bSkipFrameFlag) {
+  SWelsSvcCodingParam* pSvcParam = pEncCtx->pSvcParam;
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDidx];
+  EVideoFrameType iFrameType = videoFrameTypeInvalid;
+  bool bSceneChangeFlag = false;
+  if (pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
+        (kiSpatialNum < pSvcParam->iSpatialLayerNum)) {
+      bSceneChangeFlag = false;
+    } else {
+      bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
+    }
+    if (pEncCtx->pVaa->bIdrPeriodFlag || pParamInternal->bEncCurFrmAsIdrFlag || (!pSvcParam->bEnableLongTermReference
+        && bSceneChangeFlag && !bSkipFrameFlag)) {
+      iFrameType = videoFrameTypeIDR;
+    } else if (pSvcParam->bEnableLongTermReference && (bSceneChangeFlag
+               || pEncCtx->pVaa->eSceneChangeIdc == LARGE_CHANGED_SCENE)) {
+      int iActualLtrcount = 0;
+      SPicture** pLongTermRefList = pEncCtx->ppRefPicListExt[0]->pLongRefList;
+      for (int i = 0; i < pSvcParam->iLTRRefNum; ++i) {
+        if (NULL != pLongTermRefList[i] && pLongTermRefList[i]->bUsedAsRef && pLongTermRefList[i]->bIsLongRef
+            && pLongTermRefList[i]->bIsSceneLTR) {
+          ++iActualLtrcount;
+        }
+      }
+      if (iActualLtrcount == pSvcParam->iLTRRefNum && bSceneChangeFlag) {
+        iFrameType = videoFrameTypeIDR;
+      } else {
+        iFrameType = videoFrameTypeP;
+        pEncCtx->bCurFrameMarkedAsSceneLtr = true;
+      }
+    } else {
+      iFrameType = videoFrameTypeP;
+    }
+    if (videoFrameTypeP == iFrameType && bSkipFrameFlag) {
+      iFrameType = videoFrameTypeSkip;
+    } else if (videoFrameTypeIDR == iFrameType) {
+      pParamInternal->iCodingIndex = 0;
+      pEncCtx->bCurFrameMarkedAsSceneLtr   = true;
+    }
+
+  } else {
+    // perform scene change detection
+    if ((!pSvcParam->bEnableSceneChangeDetect) || pEncCtx->pVaa->bIdrPeriodFlag ||
+        (kiSpatialNum < pSvcParam->iSpatialLayerNum)
+        || (pParamInternal->iFrameIndex < (VGOP_SIZE << 1))) { // avoid too frequent I frame coding, rc control
+      bSceneChangeFlag = false;
+    } else {
+      bSceneChangeFlag = pEncCtx->pVaa->bSceneChangeFlag;
+    }
+
+    //scene_changed_flag: RC enable && iSpatialNum == pSvcParam->iSpatialLayerNum
+    //bIdrPeriodFlag: RC disable || iSpatialNum != pSvcParam->iSpatialLayerNum
+    //pEncCtx->bEncCurFrmAsIdrFlag: 1. first frame should be IDR; 2. idr pause; 3. idr request
+    iFrameType = (pEncCtx->pVaa->bIdrPeriodFlag || bSceneChangeFlag
+                  || pParamInternal->bEncCurFrmAsIdrFlag) ? videoFrameTypeIDR : videoFrameTypeP;
+    if ( videoFrameTypeIDR == iFrameType ) {
+      WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+               "encoding videoFrameTypeIDR due to ( bIdrPeriodFlag %d, bSceneChangeFlag %d, bEncCurFrmAsIdrFlag %d )",
+               pEncCtx->pVaa->bIdrPeriodFlag,
+               bSceneChangeFlag,
+               pParamInternal->bEncCurFrmAsIdrFlag);
+    }
+
+    if (videoFrameTypeP == iFrameType && bSkipFrameFlag) {  // for frame skip, 1/5/2010
+      iFrameType = videoFrameTypeSkip;
+    } else if (videoFrameTypeIDR == iFrameType) {
+      pParamInternal->iCodingIndex = 0;
+    }
+  }
+  return iFrameType;
+}
+
+/*!
+ * \brief   Dump reconstruction for dependency layer
+ */
+
+extern "C" void DumpDependencyRec (SPicture* pCurPicture, const char* kpFileName, const int8_t kiDid, bool bAppend,
+                                   SDqLayer* pDqLayer, bool bSimulCastAVC) {
+  WelsFileHandle* pDumpRecFile = NULL;
+  int32_t iWrittenSize = 0;
+  const char* openMode = bAppend ? "ab" : "wb";
+  SWelsSPS* pSpsTmp = NULL;
+  if (bSimulCastAVC || (kiDid == BASE_DEPENDENCY_ID)) {
+    pSpsTmp = pDqLayer->sLayerInfo.pSpsP;
+  } else {
+    pSpsTmp = & (pDqLayer->sLayerInfo.pSubsetSpsP->pSps);
+  }
+  bool bFrameCroppingFlag = pSpsTmp->bFrameCroppingFlag;
+  SCropOffset* pFrameCrop = &pSpsTmp->sFrameCrop;
+
+  if (NULL == pCurPicture || NULL == kpFileName || kiDid >= MAX_DEPENDENCY_LAYER)
+    return;
+  if (strlen (kpFileName) > 0) // confirmed_safe_unsafe_usage
+    pDumpRecFile = WelsFopen (kpFileName, openMode);
+  else {
+    char sDependencyRecFileName[16] = {0};
+    WelsSnprintf (sDependencyRecFileName, 16, "rec%d.yuv", kiDid); // confirmed_safe_unsafe_usage
+    pDumpRecFile = WelsFopen (sDependencyRecFileName, openMode);
+  }
+  if (NULL != pDumpRecFile && bAppend)
+    WelsFseek (pDumpRecFile, 0, SEEK_END);
+
+  if (NULL != pDumpRecFile) {
+    int32_t i = 0;
+    int32_t j = 0;
+    const int32_t kiStrideY      = pCurPicture->iLineSize[0];
+    const int32_t kiLumaWidth    = bFrameCroppingFlag ? (pCurPicture->iWidthInPixel - ((pFrameCrop->iCropLeft +
+                                   pFrameCrop->iCropRight) << 1)) : pCurPicture->iWidthInPixel;
+    const int32_t kiLumaHeight   = bFrameCroppingFlag ? (pCurPicture->iHeightInPixel - ((pFrameCrop->iCropTop +
+                                   pFrameCrop->iCropBottom) << 1)) : pCurPicture->iHeightInPixel;
+    const int32_t kiChromaWidth  = kiLumaWidth >> 1;
+    const int32_t kiChromaHeight = kiLumaHeight >> 1;
+    uint8_t* pSrc = NULL;
+    pSrc = bFrameCroppingFlag ? (pCurPicture->pData[0] + kiStrideY * (pFrameCrop->iCropTop << 1) +
+                                 (pFrameCrop->iCropLeft << 1)) : pCurPicture->pData[0];
+    for (j = 0; j < kiLumaHeight; ++ j) {
+      iWrittenSize = WelsFwrite (pSrc + j * kiStrideY, 1, kiLumaWidth, pDumpRecFile);
+      assert (iWrittenSize == kiLumaWidth);
+      if (iWrittenSize < kiLumaWidth) {
+        assert (0); // make no sense for us if writing failed
+        WelsFclose (pDumpRecFile);
+        return;
+      }
+    }
+    for (i = 1; i < I420_PLANES; ++ i) {
+      const int32_t kiStrideUV = pCurPicture->iLineSize[i];
+      pSrc = bFrameCroppingFlag ? (pCurPicture->pData[i] + kiStrideUV * pFrameCrop->iCropTop + pFrameCrop->iCropLeft) :
+             pCurPicture->pData[i];
+      for (j = 0; j < kiChromaHeight; ++ j) {
+        iWrittenSize = WelsFwrite (pSrc + j * kiStrideUV, 1, kiChromaWidth, pDumpRecFile);
+        assert (iWrittenSize == kiChromaWidth);
+        if (iWrittenSize < kiChromaWidth) {
+          assert (0); // make no sense for us if writing failed
+          WelsFclose (pDumpRecFile);
+          return;
+        }
+      }
+    }
+    WelsFclose (pDumpRecFile);
+    pDumpRecFile = NULL;
+  }
+}
+
+/*!
+ * \brief   Dump the reconstruction pictures
+ */
+
+void DumpRecFrame (SPicture* pCurPicture, const char* kpFileName, const int8_t kiDid, bool bAppend,
+                   SDqLayer* pDqLayer) {
+  WelsFileHandle* pDumpRecFile = NULL;
+  SWelsSPS* pSpsTmp = (kiDid > BASE_DEPENDENCY_ID) ? & (pDqLayer->sLayerInfo.pSubsetSpsP->pSps) :
+                      pDqLayer->sLayerInfo.pSpsP;
+  bool bFrameCroppingFlag = pSpsTmp->bFrameCroppingFlag;
+  SCropOffset* pFrameCrop = &pSpsTmp->sFrameCrop;
+
+  int32_t iWrittenSize = 0;
+  const char* openMode = bAppend ? "ab" : "wb";
+
+  if (NULL == pCurPicture || NULL == kpFileName)
+    return;
+
+  if (strlen (kpFileName) > 0) { // confirmed_safe_unsafe_usage
+    pDumpRecFile = WelsFopen (kpFileName, openMode);
+  } else {
+    pDumpRecFile = WelsFopen ("rec.yuv", openMode);
+  }
+  if (NULL != pDumpRecFile && bAppend)
+    WelsFseek (pDumpRecFile, 0, SEEK_END);
+
+  if (NULL != pDumpRecFile) {
+    int32_t i = 0;
+    int32_t j = 0;
+    const int32_t kiStrideY      = pCurPicture->iLineSize[0];
+    const int32_t kiLumaWidth    = bFrameCroppingFlag ? (pCurPicture->iWidthInPixel - ((pFrameCrop->iCropLeft +
+                                   pFrameCrop->iCropRight) << 1)) : pCurPicture->iWidthInPixel;
+    const int32_t kiLumaHeight   = bFrameCroppingFlag ? (pCurPicture->iHeightInPixel - ((pFrameCrop->iCropTop +
+                                   pFrameCrop->iCropBottom) << 1)) : pCurPicture->iHeightInPixel;
+    const int32_t kiChromaWidth  = kiLumaWidth >> 1;
+    const int32_t kiChromaHeight = kiLumaHeight >> 1;
+    uint8_t* pSrc = NULL;
+    pSrc = bFrameCroppingFlag ? (pCurPicture->pData[0] + kiStrideY * (pFrameCrop->iCropTop << 1) +
+                                 (pFrameCrop->iCropLeft << 1)) : pCurPicture->pData[0];
+    for (j = 0; j < kiLumaHeight; ++ j) {
+      iWrittenSize = WelsFwrite (pSrc + j * kiStrideY, 1, kiLumaWidth, pDumpRecFile);
+      assert (iWrittenSize == kiLumaWidth);
+      if (iWrittenSize < kiLumaWidth) {
+        assert (0); // make no sense for us if writing failed
+        WelsFclose (pDumpRecFile);
+        return;
+      }
+    }
+    for (i = 1; i < I420_PLANES; ++ i) {
+      const int32_t kiStrideUV = pCurPicture->iLineSize[i];
+      pSrc = bFrameCroppingFlag ? (pCurPicture->pData[i] + kiStrideUV * pFrameCrop->iCropTop + pFrameCrop->iCropLeft) :
+             pCurPicture->pData[i];
+      for (j = 0; j < kiChromaHeight; ++ j) {
+        iWrittenSize = WelsFwrite (pSrc + j * kiStrideUV, 1, kiChromaWidth, pDumpRecFile);
+        assert (iWrittenSize == kiChromaWidth);
+        if (iWrittenSize < kiChromaWidth) {
+          assert (0); // make no sense for us if writing failed
+          WelsFclose (pDumpRecFile);
+          return;
+        }
+      }
+    }
+    WelsFclose (pDumpRecFile);
+    pDumpRecFile = NULL;
+  }
+}
+
+
+
+/***********************************************************************************/
+void WelsSetMemZero_c (void* pDst, int32_t iSize) { // confirmed_safe_unsafe_usage
+  memset (pDst, 0, iSize);
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_data_tables.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_data_tables.cpp
new file mode 100644
index 0000000000..8d20653021
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_data_tables.cpp
@@ -0,0 +1,345 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// exp_data.c
+// export date cross various modules (.c)
+#include "md.h"
+#include "vlc_encoder.h"
+namespace WelsEnc {
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at mb_cache.h
+const uint8_t g_kuiSmb4AddrIn256[16] = {
+  0,           4,            16 * 4,      16 * 4 + 4,
+  8,           12,           16 * 4 + 8,  16 * 4 + 12,
+  16 * 8,      16 * 8 + 4,   16 * 12,     16 * 12 + 4,
+  16 * 8 + 8,  16 * 8 + 12,  16 * 12 + 8, 16 * 12 + 12
+};
+
+
+const uint8_t g_kuiCache12_8x8RefIdx[4] = { //mv or uiRefIndex cache scan index, 4*4 block as basic unit
+  5, 6,
+  9, 10
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at md.h
+const int32_t g_kiQpCostTable[52] = {
+  1, 1, 1, 1, 1, 1, 1, 1,  /*  0-7 */
+  1, 1, 1, 1,              /*  8-11 */
+  1, 1, 1, 1, 2, 2, 2, 2,  /* 12-19 */
+  3, 3, 3, 4, 4, 4, 5, 6,  /* 20-27 */
+  6, 7, 8, 9, 10, 11, 13, 14, /* 28-35 */
+  16, 18, 20, 23, 25, 29, 32, 36, /* 36-43 */
+  40, 45, 51, 57, 64, 72, 81, 91 /* 44-51 */
+};
+const int8_t g_kiMapModeI16x16[7] = {
+  0, 1, 2, 3, 2, 2, 2
+};//{I16_PRED_V, I16_PRED_H, I16_PRED_DC, I16_PRED_P, I16_PRED_DC, I16_PRED_DC, I16_PRED_DC};
+
+const int8_t g_kiMapModeIntraChroma[7] = {
+  0, 1, 2, 3, 0, 0, 0
+};//{C_PRED_DC, C_PRED_H, C_PRED_V, C_PRED_P, C_PRED_DC_L, C_PRED_DC_T, C_PRED_DC_128};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at vlc_encoder.h
+
+//g_kuiVlcCoeffToken[nc][total-coeff][trailing-ones][0--value, 1--bit count]
+const uint8_t g_kuiVlcCoeffToken[5][17][4][2] = {
+  {
+    //0<=nc<2
+    { { 1,  1}, { 0,  0}, { 0,  0}, { 0,  0} },//0
+    { { 5,  6}, { 1,  2}, { 0,  0}, { 0,  0} },//1
+    { { 7,  8}, { 4,  6}, { 1,  3}, { 0,  0} },//2
+    { { 7,  9}, { 6,  8}, { 5,  7}, { 3,  5} },//3
+    { { 7, 10}, { 6,  9}, { 5,  8}, { 3,  6} },//4
+    { { 7, 11}, { 6, 10}, { 5,  9}, { 4,  7} },//5
+    { {15, 13}, { 6, 11}, { 5, 10}, { 4,  8} },//6
+    { {11, 13}, {14, 13}, { 5, 11}, { 4,  9} },//7
+    { { 8, 13}, {10, 13}, {13, 13}, { 4, 10} },//8
+    { {15, 14}, {14, 14}, { 9, 13}, { 4, 11} },//9
+    { {11, 14}, {10, 14}, {13, 14}, {12, 13} },//10
+    { {15, 15}, {14, 15}, { 9, 14}, {12, 14} },//11
+    { {11, 15}, {10, 15}, {13, 15}, { 8, 14} },//12
+    { {15, 16}, { 1, 15}, { 9, 15}, {12, 15} },//13
+    { {11, 16}, {14, 16}, {13, 16}, { 8, 15} },//14
+    { { 7, 16}, {10, 16}, { 9, 16}, {12, 16} },//15
+    { { 4, 16}, { 6, 16}, { 5, 16}, { 8, 16} } //16
+  },
+
+  {
+    //2<=nc<4
+    { { 3,  2}, { 0,  0}, { 0,  0}, { 0,  0} },//0
+    { {11,  6}, { 2,  2}, { 0,  0}, { 0,  0} },//1
+    { { 7,  6}, { 7,  5}, { 3,  3}, { 0,  0} },//2
+    { { 7,  7}, {10,  6}, { 9,  6}, { 5,  4} },//3
+    { { 7,  8}, { 6,  6}, { 5,  6}, { 4,  4} },//4
+    { { 4,  8}, { 6,  7}, { 5,  7}, { 6,  5} },//5
+    { { 7,  9}, { 6,  8}, { 5,  8}, { 8,  6} },//6
+    { {15, 11}, { 6,  9}, { 5,  9}, { 4,  6} },//7
+    { {11, 11}, {14, 11}, {13, 11}, { 4,  7} },//8
+    { {15, 12}, {10, 11}, { 9, 11}, { 4,  9} },//9
+    { {11, 12}, {14, 12}, {13, 12}, {12, 11} },//10
+    { { 8, 12}, {10, 12}, { 9, 12}, { 8, 11} },//11
+    { {15, 13}, {14, 13}, {13, 13}, {12, 12} },//12
+    { {11, 13}, {10, 13}, { 9, 13}, {12, 13} },//13
+    { { 7, 13}, {11, 14}, { 6, 13}, { 8, 13} },//14
+    { { 9, 14}, { 8, 14}, {10, 14}, { 1, 13} },//15
+    { { 7, 14}, { 6, 14}, { 5, 14}, { 4, 14} } //16
+  },
+
+  {
+    //4<=nc<8
+    { {15,  4}, { 0,  0}, { 0,  0}, { 0,  0} },//0
+    { {15,  6}, {14,  4}, { 0,  0}, { 0,  0} },//1
+    { {11,  6}, {15,  5}, {13,  4}, { 0,  0} },//2
+    { { 8,  6}, {12,  5}, {14,  5}, {12,  4} },//3
+    { {15,  7}, {10,  5}, {11,  5}, {11,  4} },//4
+    { {11,  7}, { 8,  5}, { 9,  5}, {10,  4} },//5
+    { { 9,  7}, {14,  6}, {13,  6}, { 9,  4} },//6
+    { { 8,  7}, {10,  6}, { 9,  6}, { 8,  4} },//7
+    { {15,  8}, {14,  7}, {13,  7}, {13,  5} },//8
+    { {11,  8}, {14,  8}, {10,  7}, {12,  6} },//9
+    { {15,  9}, {10,  8}, {13,  8}, {12,  7} },//10
+    { {11,  9}, {14,  9}, { 9,  8}, {12,  8} },//11
+    { { 8,  9}, {10,  9}, {13,  9}, { 8,  8} },//12
+    { {13, 10}, { 7,  9}, { 9,  9}, {12,  9} },//13
+    { { 9, 10}, {12, 10}, {11, 10}, {10, 10} },//14
+    { { 5, 10}, { 8, 10}, { 7, 10}, { 6, 10} },//15
+    { { 1, 10}, { 4, 10}, { 3, 10}, { 2, 10} } //16
+  },
+
+  {
+    //8<=nc
+    { { 3,  6}, { 0,  0}, { 0,  0}, { 0,  0} },//0
+    { { 0,  6}, { 1,  6}, { 0,  0}, { 0,  0} },//1
+    { { 4,  6}, { 5,  6}, { 6,  6}, { 0,  0} },//2
+    { { 8,  6}, { 9,  6}, {10,  6}, {11,  6} },//3
+    { {12,  6}, {13,  6}, {14,  6}, {15,  6} },//4
+    { {16,  6}, {17,  6}, {18,  6}, {19,  6} },//5
+    { {20,  6}, {21,  6}, {22,  6}, {23,  6} },//6
+    { {24,  6}, {25,  6}, {26,  6}, {27,  6} },//7
+    { {28,  6}, {29,  6}, {30,  6}, {31,  6} },//8
+    { {32,  6}, {33,  6}, {34,  6}, {35,  6} },//9
+    { {36,  6}, {37,  6}, {38,  6}, {39,  6} },//10
+    { {40,  6}, {41,  6}, {42,  6}, {43,  6} },//11
+    { {44,  6}, {45,  6}, {46,  6}, {47,  6} },//12
+    { {48,  6}, {49,  6}, {50,  6}, {51,  6} },//13
+    { {52,  6}, {53,  6}, {54,  6}, {55,  6} },//14
+    { {56,  6}, {57,  6}, {58,  6}, {59,  6} },//15
+    { {60,  6}, {61,  6}, {62,  6}, {63,  6} } //16
+  },
+
+  {
+    //nc == -1
+    { { 1,  2}, { 0,  0}, { 0,  0}, { 0,  0} },//0
+    { { 7,  6}, { 1,  1}, { 0,  0}, { 0,  0} },//1
+    { { 4,  6}, { 6,  6}, { 1,  3}, { 0,  0} },//2
+    { { 3,  6}, { 3,  7}, { 2,  7}, { 5,  6} },//3
+    { { 2,  6}, { 3,  8}, { 2,  8}, { 0,  7} },//4
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//5
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//6
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//7
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//8
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//9
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//10
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//11
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//12
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//13
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//14
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} },//15
+    { { 0,  0}, { 0,  0}, { 0,  0}, { 0,  0} } //16
+  }
+};
+
+//const uint8_t g_kuiVlcLevelPrefix[15][2] =
+//{
+//  {1, 1}, {1, 2}
+//};
+
+//g_kuiVlcTotalZeros[tzVlcIndex][total_zeros][0--value, 1--bit count]
+const uint8_t g_kuiVlcTotalZeros[16][16][2] = {
+  {
+    //0 not available
+    {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //1
+    {1, 1}, {3, 3}, {2, 3}, {3, 4}, {2, 4}, {3, 5}, {2, 5}, {3, 6}, {2, 6}, {3, 7}, {2, 7}, {3, 8}, {2, 8}, {3, 9}, {2, 9}, {1, 9}
+  },
+  {
+    //2
+    {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {5, 4}, {4, 4}, {3, 4}, {2, 4}, {3, 5}, {2, 5}, {3, 6}, {2, 6}, {1, 6}, {0, 6}, {0, 0}
+  },
+  {
+    //3
+    {5, 4}, {7, 3}, {6, 3}, {5, 3}, {4, 4}, {3, 4}, {4, 3}, {3, 3}, {2, 4}, {3, 5}, {2, 5}, {1, 6}, {1, 5}, {0, 6}, {0, 0}, {0, 0}
+  },
+  {
+    //4
+    {3, 5}, {7, 3}, {5, 4}, {4, 4}, {6, 3}, {5, 3}, {4, 3}, {3, 4}, {3, 3}, {2, 4}, {2, 5}, {1, 5}, {0, 5}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //5
+    {5, 4}, {4, 4}, {3, 4}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 4}, {1, 5}, {1, 4}, {0, 5}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //6
+    {1, 6}, {1, 5}, {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 4}, {1, 3}, {0, 6}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //7
+    {1, 6}, {1, 5}, {5, 3}, {4, 3}, {3, 3}, {3, 2}, {2, 3}, {1, 4}, {1, 3}, {0, 6}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //8
+    {1, 6}, {1, 4}, {1, 5}, {3, 3}, {3, 2}, {2, 2}, {2, 3}, {1, 3}, {0, 6}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //9
+    {1, 6}, {0, 6}, {1, 4}, {3, 2}, {2, 2}, {1, 3}, {1, 2}, {1, 5}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //10
+    {1, 5}, {0, 5}, {1, 3}, {3, 2}, {2, 2}, {1, 2}, {1, 4}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //11
+    {0, 4}, {1, 4}, {1, 3}, {2, 3}, {1, 1}, {3, 3}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //12
+    {0, 4}, {1, 4}, {1, 2}, {1, 1}, {1, 3}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //13
+    {0, 3}, {1, 3}, {1, 1}, {1, 2}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //14
+    {0, 2}, {1, 2}, {1, 1}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //15
+    {0, 1}, {1, 1}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  }
+};
+
+const uint8_t g_kuiVlcTotalZerosChromaDc[4][4][2] = {
+  {
+    {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    {1, 1}, {1, 2}, {1, 3}, {0, 3}
+  },
+  {
+    {1, 1}, {1, 2}, {0, 2}, {0, 0}
+  },
+  {
+    {1, 1}, {0, 1}, {0, 0}, {0, 0}
+  }
+};
+//
+
+//g_kuiVlcRunBefore[zeros-left][run-before][0--value, 1--bit count]
+const uint8_t g_kuiVlcRunBefore[8][15][2] = {
+  {
+    //0 not available
+    {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //1
+    {1, 1}, {0, 1}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //2
+    {1, 1}, {1, 2}, {0, 2}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //3
+    {3, 2}, {2, 2}, {1, 2}, {0, 2}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //4
+    {3, 2}, {2, 2}, {1, 2}, {1, 3}, {0, 3}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //5
+    {3, 2}, {2, 2}, {3, 3}, {2, 3}, {1, 3}, {0, 3}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //6
+    {3, 2}, {0, 3}, {1, 3}, {3, 3}, {2, 3}, {5, 3}, {4, 3}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}
+  },
+  {
+    //>6
+    {7, 3}, {6, 3}, {5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {1, 4}, {1, 5}, {1, 6}, {1, 7}, {1, 8}, {1, 9}, {1, 10}, {1, 11}
+  }
+};
+
+const ALIGNED_DECLARE (uint8_t, g_kuiEncNcMapTable[18], 16) = {
+  0, 0, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4
+};
+
+
+
+const uint8_t   g_kuiTemporalIdListTable[MAX_TEMPORAL_LEVEL][MAX_GOP_SIZE + 1] = {
+  {
+    0, 0, 0, 0, 0, 0, 0, 0,
+    0
+  },  // uiGopSize = 1
+  {
+    0, 1, 0, 0, 0, 0, 0, 0,
+    0
+  },  // uiGopSize = 2
+  {
+    0, 2, 1, 2, 0, 0, 0, 0,
+    0
+  },  // uiGopSize = 4
+  {
+    0, 3, 2, 3, 1, 3, 2, 3,
+    0
+  }  //uiGopSize = 8
+};
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+// extern at svc_encode_slice.h
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_ext.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_ext.cpp
new file mode 100644
index 0000000000..9bc6e103b7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/encoder_ext.cpp
@@ -0,0 +1,4617 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encoder_ext.c
+ *
+ * \brief   core encoder for SVC
+ *
+ * \date    7/24/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "encoder.h"
+#include "cpu.h"
+#include "utils.h"
+#include "svc_enc_golomb.h"
+#include "au_set.h"
+#include "picture_handle.h"
+#include "svc_base_layer_md.h"
+#include "svc_encode_slice.h"
+#include "svc_mode_decision.h"
+#include "decode_mb_aux.h"
+#include "deblocking.h"
+#include "ref_list_mgr_svc.h"
+#include "ls_defines.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like utils for cross platforms
+#include "slice_multi_threading.h"
+#include "measure_time.h"
+#include "svc_set_mb_syn.h"
+
+namespace WelsEnc {
+
+
+int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx,
+                                 SFrameBSInfo* pFrameBsInfo,
+                                 SLayerBSInfo* pLayerBsInfo,
+                                 int32_t* pNalIdxInLayer,
+                                 int32_t* pLayerSize,
+                                 int32_t iFirstMbIdxInPartition,
+                                 int32_t iEndMbIdxInPartition,
+                                 int32_t iStartSliceIdx
+                                );
+
+
+int32_t WelsBitRateVerification (SLogContext* pLogCtx, SSpatialLayerConfig* pLayerParam, int32_t iLayerId) {
+  if ((pLayerParam->iSpatialBitrate <= 0)
+      || (static_cast<float> (pLayerParam->iSpatialBitrate) < pLayerParam->fFrameRate)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "Invalid bitrate settings in layer %d, bitrate= %d at FrameRate(%f)", iLayerId,
+             pLayerParam->iSpatialBitrate, pLayerParam->fFrameRate);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  // deal with LEVEL_MAX_BR and MAX_BR setting
+  const SLevelLimits* pCurLevelLimit = g_ksLevelLimits;
+  while ((pCurLevelLimit->uiLevelIdc != LEVEL_5_2) && (pCurLevelLimit->uiLevelIdc != pLayerParam->uiLevelIdc))
+    pCurLevelLimit++;
+  const int32_t iLevelMaxBitrate = pCurLevelLimit->uiMaxBR * CpbBrNalFactor;
+  const int32_t iLevel52MaxBitrate = g_ksLevelLimits[LEVEL_NUMBER - 1].uiMaxBR * CpbBrNalFactor;
+  if (UNSPECIFIED_BIT_RATE != iLevelMaxBitrate) {
+    if ((pLayerParam->iMaxSpatialBitrate == UNSPECIFIED_BIT_RATE)
+        || (pLayerParam->iMaxSpatialBitrate > iLevel52MaxBitrate)) {
+      pLayerParam->iMaxSpatialBitrate = iLevelMaxBitrate;
+      WelsLog (pLogCtx, WELS_LOG_INFO,
+               "Current MaxSpatialBitrate is invalid (UNSPECIFIED_BIT_RATE or larger than LEVEL5_2) but level setting is valid, set iMaxSpatialBitrate to %d from level (%d)",
+               pLayerParam->iMaxSpatialBitrate, pLayerParam->uiLevelIdc);
+    } else if (pLayerParam->iMaxSpatialBitrate > iLevelMaxBitrate) {
+      ELevelIdc iCurLevel = pLayerParam->uiLevelIdc;
+      WelsAdjustLevel (pLayerParam, pCurLevelLimit);
+      WelsLog (pLogCtx, WELS_LOG_INFO,
+               "LevelIdc is changed from (%d) to (%d) according to the iMaxSpatialBitrate(%d)",
+               iCurLevel, pLayerParam->uiLevelIdc, pLayerParam->iMaxSpatialBitrate);
+    }
+  } else if ((pLayerParam->iMaxSpatialBitrate != UNSPECIFIED_BIT_RATE)
+             && (pLayerParam->iMaxSpatialBitrate > iLevel52MaxBitrate)) {
+    // no level limitation, just need to check if iMaxSpatialBitrate is too big from reasonable
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "No LevelIdc setting and iMaxSpatialBitrate (%d) is considered too big to be valid, changed to UNSPECIFIED_BIT_RATE",
+             pLayerParam->iMaxSpatialBitrate);
+    pLayerParam->iMaxSpatialBitrate = UNSPECIFIED_BIT_RATE;
+  }
+
+  // deal with iSpatialBitrate and iMaxSpatialBitrate setting
+  if (pLayerParam->iMaxSpatialBitrate != UNSPECIFIED_BIT_RATE) {
+    if (pLayerParam->iMaxSpatialBitrate == pLayerParam->iSpatialBitrate) {
+      WelsLog (pLogCtx, WELS_LOG_INFO,
+               "Setting MaxSpatialBitrate (%d) the same at SpatialBitrate (%d) will make the actual bit rate lower than SpatialBitrate",
+               pLayerParam->iMaxSpatialBitrate, pLayerParam->iSpatialBitrate);
+    } else if (pLayerParam->iMaxSpatialBitrate < pLayerParam->iSpatialBitrate) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "MaxSpatialBitrate (%d) should be larger than SpatialBitrate (%d), considering it as error setting",
+               pLayerParam->iMaxSpatialBitrate, pLayerParam->iSpatialBitrate);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+void CheckProfileSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer, EProfileIdc uiProfileIdc) {
+  SSpatialLayerConfig* pLayerInfo = &pParam->sSpatialLayers[iLayer];
+  pLayerInfo->uiProfileIdc = uiProfileIdc;
+  if (pParam->bSimulcastAVC) {
+    if ((uiProfileIdc != PRO_BASELINE) && (uiProfileIdc != PRO_MAIN) && (uiProfileIdc != PRO_HIGH)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING, "layerId(%d) doesn't support profile(%d), change to UNSPECIFIC profile", iLayer,
+               uiProfileIdc);
+      pLayerInfo->uiProfileIdc = PRO_UNKNOWN;
+    }
+  } else {
+    if (iLayer == SPATIAL_LAYER_0) {
+      if ((uiProfileIdc != PRO_BASELINE) && (uiProfileIdc != PRO_MAIN) && (uiProfileIdc != PRO_HIGH)) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "layerId(%d) doesn't support profile(%d), change to UNSPECIFIC profile", iLayer,
+                 uiProfileIdc);
+        pLayerInfo->uiProfileIdc = PRO_UNKNOWN;
+      }
+    } else {
+      if ((uiProfileIdc != PRO_SCALABLE_BASELINE) && (uiProfileIdc != PRO_SCALABLE_HIGH)) {
+        pLayerInfo->uiProfileIdc = PRO_SCALABLE_BASELINE;
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "layerId(%d) doesn't support profile(%d), change to scalable baseline profile",
+                 iLayer, uiProfileIdc);
+      }
+    }
+  }
+}
+void CheckLevelSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iLayer, ELevelIdc uiLevelIdc) {
+  SSpatialLayerConfig* pLayerInfo = &pParam->sSpatialLayers[iLayer];
+  pLayerInfo->uiLevelIdc = LEVEL_UNKNOWN;
+  int32_t iLevelIdx = LEVEL_NUMBER - 1;
+  do {
+    if (g_ksLevelLimits[iLevelIdx].uiLevelIdc == uiLevelIdc) {
+      pLayerInfo->uiLevelIdc = uiLevelIdc;
+      break;
+    }
+    iLevelIdx--;
+  } while (iLevelIdx >= 0);
+}
+void CheckReferenceNumSetting (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iNumRef) {
+  int32_t iRefUpperBound = (pParam->iUsageType == CAMERA_VIDEO_REAL_TIME) ?
+                           MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA : MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN;
+  pParam->iNumRefFrame = iNumRef;
+  if ((iNumRef < MIN_REF_PIC_COUNT) || (iNumRef > iRefUpperBound)) {
+    pParam->iNumRefFrame = AUTO_REF_PIC_COUNT;
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "doesn't support the number of reference frame(%d) change to auto select mode", iNumRef);
+  }
+}
+
+int32_t SliceArgumentValidationFixedSliceMode (SLogContext* pLogCtx,
+    SSliceArgument* pSliceArgument, const RC_MODES  kiRCMode,
+    const int32_t kiPicWidth,       const int32_t kiPicHeight) {
+  int32_t iCpuCores            = 0;
+  int32_t iIdx                 = 0;
+  const int32_t iMbWidth       = (kiPicWidth + 15) >> 4;
+  const int32_t iMbHeight      = (kiPicHeight + 15) >> 4;
+  const int32_t iMbNumInFrame  = iMbWidth * iMbHeight;
+  bool  bSingleMode            = false;
+
+  pSliceArgument->uiSliceSizeConstraint = 0;
+
+  if (pSliceArgument->uiSliceNum == 0) {
+    WelsCPUFeatureDetect (&iCpuCores);
+    if (0 == iCpuCores) {
+      // cpuid not supported or doesn't expose the number of cores,
+      // use high level system API as followed to detect number of pysical/logic processor
+      iCpuCores = DynamicDetectCpuCores();
+    }
+    pSliceArgument->uiSliceNum = iCpuCores;
+  }
+
+  if (pSliceArgument->uiSliceNum <= 1) {
+    WelsLog (pLogCtx, WELS_LOG_INFO,
+             "SliceArgumentValidationFixedSliceMode(), uiSliceNum(%d) you set for SM_FIXEDSLCNUM_SLICE, now turn to SM_SINGLE_SLICE type!",
+             pSliceArgument->uiSliceNum);
+    bSingleMode = true;
+  }
+
+  // considering the coding efficient and performance,
+  // iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting
+  if (iMbNumInFrame <= MIN_NUM_MB_PER_SLICE) {
+    WelsLog (pLogCtx, WELS_LOG_INFO,
+             "SliceArgumentValidationFixedSliceMode(), uiSliceNum(%d) you set for SM_FIXEDSLCNUM_SLICE, now turn to SM_SINGLE_SLICE type as CountMbNum less than MIN_NUM_MB_PER_SLICE!",
+             pSliceArgument->uiSliceNum);
+    bSingleMode = true;
+  }
+
+  if (bSingleMode) {
+    pSliceArgument->uiSliceMode = SM_SINGLE_SLICE;
+    pSliceArgument->uiSliceNum = 1;
+    for (iIdx = 0; iIdx < MAX_SLICES_NUM; iIdx++) {
+      pSliceArgument->uiSliceMbNum[iIdx] = 0;
+    }
+    return ENC_RETURN_SUCCESS;
+  }
+
+  if (pSliceArgument->uiSliceNum > MAX_SLICES_NUM) {
+    pSliceArgument->uiSliceNum = MAX_SLICES_NUM;
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "SliceArgumentValidationFixedSliceMode(), uiSliceNum exceed MAX_SLICES_NUM! So setting slice num eqaul to MAX_SLICES_NUM(%d)!",
+             pSliceArgument->uiSliceNum);
+  }
+
+  if (kiRCMode != RC_OFF_MODE) { // multiple slices verify with gom
+    //check uiSliceNum and set uiSliceMbNum with current uiSliceNum
+    if (!GomValidCheckSliceNum (iMbWidth, iMbHeight, &pSliceArgument->uiSliceNum)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "SliceArgumentValidationFixedSliceMode(), unsupported setting with Resolution and uiSliceNum combination under RC on! So uiSliceNum is changed to %d!",
+               pSliceArgument->uiSliceNum);
+    }
+
+    if (pSliceArgument->uiSliceNum <= 1 ||
+        !GomValidCheckSliceMbNum (iMbWidth, iMbHeight, pSliceArgument)) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "SliceArgumentValidationFixedSliceMode(), unsupported setting with Resolution and uiSliceNum (%d) combination  under RC on! Consider setting single slice with this resolution!",
+               pSliceArgument->uiSliceNum);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+  } else if (!CheckFixedSliceNumMultiSliceSetting (iMbNumInFrame, pSliceArgument)) {
+    //check uiSliceMbNum with current uiSliceNum
+    WelsLog (pLogCtx, WELS_LOG_ERROR,
+             "SliceArgumentValidationFixedSliceMode(), invalid uiSliceMbNum (%d) settings!,now turn to SM_SINGLE_SLICE type",
+             pSliceArgument->uiSliceMbNum[0]);
+    pSliceArgument->uiSliceMode = SM_SINGLE_SLICE;
+    pSliceArgument->uiSliceNum  = 1;
+    for (iIdx = 0; iIdx < MAX_SLICES_NUM; iIdx++) {
+      pSliceArgument->uiSliceMbNum[iIdx] = 0;
+    }
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+
+/*!
+ * \brief   validate checking in parameter configuration
+ * \pParam  pParam      SWelsSvcCodingParam*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) {
+  const float fEpsn = 0.000001f;
+  int32_t i = 0;
+
+  assert (pCfg != NULL);
+
+  if (! (pCfg->iUsageType < INPUT_CONTENT_TYPE_ALL)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid usage type = %d", pCfg->iUsageType);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+  if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    if (pCfg->iSpatialLayerNum > 1) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid the number of Spatial layer(%d)for screen content",
+               pCfg->iSpatialLayerNum);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+    if (pCfg->bEnableAdaptiveQuant) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParamValidation(), AdaptiveQuant(%d) is not supported yet for screen content, auto turned off",
+               pCfg->bEnableAdaptiveQuant);
+      pCfg->bEnableAdaptiveQuant = false;
+    }
+    if (pCfg->bEnableBackgroundDetection) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParamValidation(), BackgroundDetection(%d) is not supported yet for screen content, auto turned off",
+               pCfg->bEnableBackgroundDetection);
+      pCfg->bEnableBackgroundDetection = false;
+    }
+    if (pCfg->bEnableSceneChangeDetect == false) {
+      pCfg->bEnableSceneChangeDetect = true;
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParamValidation(), screen change detection should be turned on, change bEnableSceneChangeDetect as true");
+    }
+
+  }
+
+  //turn off adaptive quant now, algorithms needs to be refactored
+  pCfg->bEnableAdaptiveQuant = false;
+
+  if (pCfg->iSpatialLayerNum > 1) {
+    for (i = pCfg->iSpatialLayerNum - 1; i > 0; i--) {
+      SSpatialLayerConfig* fDlpUp = &pCfg->sSpatialLayers[i];
+      SSpatialLayerConfig* fDlp = &pCfg->sSpatialLayers[i - 1];
+      if ((fDlp->iVideoWidth > fDlpUp->iVideoWidth) || (fDlp->iVideoHeight > fDlpUp->iVideoHeight)) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR,
+                 "ParamValidation,Invalid resolution layer(%d) resolution(%d x %d) should be less than the upper spatial layer resolution(%d x %d) ",
+                 i, fDlp->iVideoWidth, fDlp->iVideoHeight, fDlpUp->iVideoWidth, fDlpUp->iVideoHeight);
+        return ENC_RETURN_UNSUPPORTED_PARA;
+      }
+    }
+  }
+
+  if (!CheckInRangeCloseOpen (pCfg->iLoopFilterDisableIdc, DEBLOCKING_IDC_0, DEBLOCKING_IDC_2 + 1) ||
+      !CheckInRangeCloseOpen (pCfg->iLoopFilterAlphaC0Offset, DEBLOCKING_OFFSET_MINUS, DEBLOCKING_OFFSET + 1) ||
+      !CheckInRangeCloseOpen (pCfg->iLoopFilterBetaOffset, DEBLOCKING_OFFSET_MINUS, DEBLOCKING_OFFSET + 1)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR,
+             "ParamValidation, Invalid iLoopFilterDisableIdc(%d) or iLoopFilterAlphaC0Offset(%d) or iLoopFilterBetaOffset(%d)!",
+             pCfg->iLoopFilterDisableIdc, pCfg->iLoopFilterAlphaC0Offset, pCfg->iLoopFilterBetaOffset);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  for (i = 0; i < pCfg->iSpatialLayerNum; ++ i) {
+    SSpatialLayerInternal* fDlp = &pCfg->sDependencyLayers[i];
+    SSpatialLayerConfig* pConfig = &pCfg->sSpatialLayers[i];
+    if (fDlp->fOutputFrameRate > fDlp->fInputFrameRate || (fDlp->fInputFrameRate >= -fEpsn
+        && fDlp->fInputFrameRate <= fEpsn)
+        || (fDlp->fOutputFrameRate >= -fEpsn && fDlp->fOutputFrameRate <= fEpsn)) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "Invalid settings in input frame rate(%.6f) or output frame rate(%.6f) of layer #%d config file..",
+               fDlp->fInputFrameRate, fDlp->fOutputFrameRate, i);
+      return ENC_RETURN_INVALIDINPUT;
+    }
+    if (UINT_MAX == GetLogFactor (fDlp->fOutputFrameRate, fDlp->fInputFrameRate)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "AUTO CORRECT: Invalid settings in input frame rate(%.6f) and output frame rate(%.6f) of layer #%d config file: iResult of output frame rate divided by input frame rate should be power of 2(i.e,in/pOut=2^n). \n Auto correcting Output Framerate to Input Framerate %f!\n",
+               fDlp->fInputFrameRate, fDlp->fOutputFrameRate, i, fDlp->fInputFrameRate);
+      fDlp->fOutputFrameRate = fDlp->fInputFrameRate;
+      pConfig->fFrameRate = fDlp->fOutputFrameRate;
+    }
+  }
+
+  if ((pCfg->iRCMode != RC_OFF_MODE) && (pCfg->iRCMode != RC_QUALITY_MODE) && (pCfg->iRCMode != RC_BUFFERBASED_MODE)
+      && (pCfg->iRCMode != RC_BITRATE_MODE) && (pCfg->iRCMode != RC_TIMESTAMP_MODE)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid iRCMode = %d", pCfg->iRCMode);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+  //bitrate setting validation
+  if (pCfg->iRCMode != RC_OFF_MODE) {
+    int32_t  iTotalBitrate = 0;
+    if (pCfg->iTargetBitrate <= 0) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "Invalid bitrate settings in total configure, bitrate= %d", pCfg->iTargetBitrate);
+      return ENC_RETURN_INVALIDINPUT;
+    }
+    for (i = 0; i < pCfg->iSpatialLayerNum; ++ i) {
+      SSpatialLayerConfig* pSpatialLayer = &pCfg->sSpatialLayers[i];
+      iTotalBitrate += pSpatialLayer->iSpatialBitrate;
+
+      if (WelsBitRateVerification (pLogCtx, pSpatialLayer, i) != ENC_RETURN_SUCCESS)
+        return ENC_RETURN_INVALIDINPUT;
+    }
+    if (iTotalBitrate > pCfg->iTargetBitrate) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "Invalid settings in bitrate. the sum of each layer bitrate(%d) is larger than total bitrate setting(%d)",
+               iTotalBitrate, pCfg->iTargetBitrate);
+      return ENC_RETURN_INVALIDINPUT;
+    }
+    if ((pCfg->iRCMode == RC_QUALITY_MODE) || (pCfg->iRCMode == RC_BITRATE_MODE) || (pCfg->iRCMode == RC_TIMESTAMP_MODE))
+      if (!pCfg->bEnableFrameSkip)
+        WelsLog (pLogCtx, WELS_LOG_WARNING,
+                 "bEnableFrameSkip = %d,bitrate can't be controlled for RC_QUALITY_MODE,RC_BITRATE_MODE and RC_TIMESTAMP_MODE without enabling skip frame.",
+                 pCfg->bEnableFrameSkip);
+    if ((pCfg->iMaxQp <= 0) || (pCfg->iMinQp <= 0)) {
+      if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+        WelsLog (pLogCtx, WELS_LOG_INFO, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp, MIN_SCREEN_QP,
+                 MAX_SCREEN_QP);
+        pCfg->iMinQp = MIN_SCREEN_QP;
+        pCfg->iMaxQp = MAX_SCREEN_QP;
+      } else {
+        WelsLog (pLogCtx, WELS_LOG_INFO, "Change QP Range from(%d,%d) to (%d,%d)", pCfg->iMinQp, pCfg->iMaxQp,
+                 GOM_MIN_QP_MODE, MAX_LOW_BR_QP);
+        pCfg->iMinQp = GOM_MIN_QP_MODE;
+        pCfg->iMaxQp = MAX_LOW_BR_QP;
+      }
+
+    }
+    pCfg->iMinQp = WELS_CLIP3 (pCfg->iMinQp, GOM_MIN_QP_MODE, QP_MAX_VALUE);
+    pCfg->iMaxQp = WELS_CLIP3 (pCfg->iMaxQp, pCfg->iMinQp, QP_MAX_VALUE);
+  }
+  // ref-frames validation
+  if (((pCfg->iUsageType == CAMERA_VIDEO_REAL_TIME) || (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME))
+      ? WelsCheckRefFrameLimitationNumRefFirst (pLogCtx, pCfg)
+      : WelsCheckRefFrameLimitationLevelIdcFirst (pLogCtx, pCfg)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsCheckRefFrameLimitation failed");
+    return ENC_RETURN_INVALIDINPUT;
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+
+int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingParam) {
+  int8_t i = 0;
+  int32_t iIdx = 0;
+
+  assert (pCodingParam != NULL);
+  if (NULL == pCodingParam)
+    return ENC_RETURN_INVALIDINPUT;
+
+  if ((pCodingParam->iUsageType != CAMERA_VIDEO_REAL_TIME) && (pCodingParam->iUsageType != SCREEN_CONTENT_REAL_TIME)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(),Invalid usage type = %d", pCodingParam->iUsageType);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+  if ((pCodingParam->iUsageType == SCREEN_CONTENT_REAL_TIME) && (!pCodingParam->bIsLosslessLink
+      && pCodingParam->bEnableLongTermReference)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "ParamValidationExt(), setting lossy link for LTR under screen, which is not supported yet! Auto disabled LTR!");
+    pCodingParam->bEnableLongTermReference = false;
+  }
+  if (pCodingParam->iSpatialLayerNum < 1 || pCodingParam->iSpatialLayerNum > MAX_DEPENDENCY_LAYER) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), monitor invalid pCodingParam->iSpatialLayerNum: %d!",
+             pCodingParam->iSpatialLayerNum);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  if (pCodingParam->iTemporalLayerNum < 1 || pCodingParam->iTemporalLayerNum > MAX_TEMPORAL_LEVEL) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), monitor invalid pCodingParam->iTemporalLayerNum: %d!",
+             pCodingParam->iTemporalLayerNum);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  if (pCodingParam->uiGopSize < 1 || pCodingParam->uiGopSize > MAX_GOP_SIZE) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), monitor invalid pCodingParam->uiGopSize: %d!",
+             pCodingParam->uiGopSize);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+
+  if (pCodingParam->uiIntraPeriod && pCodingParam->uiIntraPeriod < pCodingParam->uiGopSize) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR,
+             "ParamValidationExt(), uiIntraPeriod(%d) should be not less than that of uiGopSize(%d) or -1 specified!",
+             pCodingParam->uiIntraPeriod, pCodingParam->uiGopSize);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  if (pCodingParam->uiIntraPeriod && (pCodingParam->uiIntraPeriod & (pCodingParam->uiGopSize - 1)) != 0) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR,
+             "ParamValidationExt(), uiIntraPeriod(%d) should be multiple of uiGopSize(%d) or -1 specified!",
+             pCodingParam->uiIntraPeriod, pCodingParam->uiGopSize);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  //about iMultipleThreadIdc, bDeblockingParallelFlag, iLoopFilterDisableIdc, & uiSliceMode
+  // (1) Single Thread
+  //    if (THREAD==1)//single thread
+  //            no parallel_deblocking: bDeblockingParallelFlag = 0;
+  // (2) Multi Thread: see uiSliceMode decision
+  if (pCodingParam->iMultipleThreadIdc == 1) {
+    //now is single thread. no parallel deblocking, set flag=0
+    pCodingParam->bDeblockingParallelFlag = false;
+  } else {
+    pCodingParam->bDeblockingParallelFlag = true;
+  }
+
+  // eSpsPpsIdStrategy checkings
+  if (pCodingParam->iSpatialLayerNum > 1 && (!pCodingParam->bSimulcastAVC)
+      && (SPS_LISTING & pCodingParam->eSpsPpsIdStrategy)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "ParamValidationExt(), eSpsPpsIdStrategy setting (%d) with multiple svc SpatialLayers (%d) not supported! eSpsPpsIdStrategy adjusted to CONSTANT_ID",
+             pCodingParam->eSpsPpsIdStrategy, pCodingParam->iSpatialLayerNum);
+    pCodingParam->eSpsPpsIdStrategy = CONSTANT_ID;
+  }
+  if (pCodingParam->iUsageType == SCREEN_CONTENT_REAL_TIME && (SPS_LISTING & pCodingParam->eSpsPpsIdStrategy)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "ParamValidationExt(), eSpsPpsIdStrategy setting (%d) with iUsageType (%d) not supported! eSpsPpsIdStrategy adjusted to CONSTANT_ID",
+             pCodingParam->eSpsPpsIdStrategy, pCodingParam->iUsageType);
+    pCodingParam->eSpsPpsIdStrategy = CONSTANT_ID;
+  }
+
+  if (pCodingParam->bSimulcastAVC && (SPS_LISTING & pCodingParam->eSpsPpsIdStrategy)) {
+    WelsLog (pLogCtx, WELS_LOG_INFO,
+             "ParamValidationExt(), eSpsPpsIdStrategy(%d) under bSimulcastAVC(%d) not supported yet, adjusted to INCREASING_ID",
+             pCodingParam->eSpsPpsIdStrategy, pCodingParam->bSimulcastAVC);
+    pCodingParam->eSpsPpsIdStrategy = INCREASING_ID;
+  }
+
+  if (pCodingParam->bSimulcastAVC && pCodingParam->bPrefixNalAddingCtrl) {
+    WelsLog (pLogCtx, WELS_LOG_INFO,
+             "ParamValidationExt(), bSimulcastAVC(%d) is not compatible with bPrefixNalAddingCtrl(%d) true, adjusted bPrefixNalAddingCtrl to false",
+             pCodingParam->eSpsPpsIdStrategy, pCodingParam->bSimulcastAVC);
+    pCodingParam->bPrefixNalAddingCtrl = false;
+  }
+
+  for (i = 0; i < pCodingParam->iSpatialLayerNum; ++ i) {
+    SSpatialLayerConfig* pSpatialLayer = &pCodingParam->sSpatialLayers[i];
+    int32_t kiPicWidth = pSpatialLayer->iVideoWidth;
+    int32_t kiPicHeight = pSpatialLayer->iVideoHeight;
+    uint32_t iMbWidth           = 0;
+    uint32_t iMbHeight          = 0;
+    int32_t iMbNumInFrame       = 0;
+    uint32_t iMaxSliceNum       = MAX_SLICES_NUM;
+    int32_t  iReturn            = 0;
+
+    if ((pCodingParam->iPicWidth > 0) && (pCodingParam->iPicHeight > 0)
+        && (kiPicWidth == 0) && (kiPicHeight == 0)
+        && (pCodingParam->iSpatialLayerNum == 1)) {
+      kiPicWidth = pSpatialLayer->iVideoWidth = pCodingParam->iPicWidth;
+      kiPicHeight = pSpatialLayer->iVideoHeight = pCodingParam->iPicHeight;
+      WelsLog (pLogCtx, WELS_LOG_DEBUG,
+               "ParamValidationExt(), layer resolution is not set, set to general resolution %d x %d",
+               pSpatialLayer->iVideoWidth, pSpatialLayer->iVideoHeight);
+    }
+
+    if ((kiPicWidth <= 0) || (kiPicHeight <= 0) || (kiPicWidth * kiPicHeight > (MAX_MBS_PER_FRAME << 8))) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "ParamValidationExt(), width > 0, height > 0, width * height <= %d, invalid %d x %d in dependency layer settings!",
+               (MAX_MBS_PER_FRAME << 8), kiPicWidth, kiPicHeight);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+    if ((kiPicWidth & 0x0F) != 0 || (kiPicHeight & 0x0F) != 0) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR,
+               "ParamValidationExt(), in layer #%d iWidth x iHeight(%d x %d) both should be multiple of 16, can not support with arbitrary size currently!",
+               i, kiPicWidth, kiPicHeight);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+
+    if (pSpatialLayer->sSliceArgument.uiSliceMode >= SM_RESERVED) {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!",
+               pSpatialLayer->sSliceArgument.uiSliceMode);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+    if ((pCodingParam->uiMaxNalSize != 0) && (pSpatialLayer->sSliceArgument.uiSliceMode != SM_SIZELIMITED_SLICE)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "ParamValidationExt(), current layer %d uiSliceMode (%d) settings may not fulfill MaxNalSize = %d", i,
+               pSpatialLayer->sSliceArgument.uiSliceMode, pCodingParam->uiMaxNalSize);
+    }
+    CheckProfileSetting (pLogCtx, pCodingParam, i, pSpatialLayer->uiProfileIdc);
+    CheckLevelSetting (pLogCtx, pCodingParam, i, pSpatialLayer->uiLevelIdc);
+    //check pSlice settings under multi-pSlice
+    if (kiPicWidth <= 16 && kiPicHeight <= 16) {
+      //only have one MB, set to single_slice
+      pSpatialLayer->sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+    }
+    switch (pSpatialLayer->sSliceArgument.uiSliceMode) {
+    case SM_SINGLE_SLICE:
+      pSpatialLayer->sSliceArgument.uiSliceNum = 1;
+      pSpatialLayer->sSliceArgument.uiSliceSizeConstraint = 0;
+      for (iIdx = 0; iIdx < MAX_SLICES_NUM; iIdx++) {
+        pSpatialLayer->sSliceArgument.uiSliceMbNum[iIdx] = 0;
+      }
+      break;
+    case SM_FIXEDSLCNUM_SLICE: {
+      iReturn = SliceArgumentValidationFixedSliceMode (pLogCtx, &pSpatialLayer->sSliceArgument, pCodingParam->iRCMode,
+                kiPicWidth, kiPicHeight);
+      if (iReturn)
+        return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+    break;
+    case SM_RASTER_SLICE: {
+      pSpatialLayer->sSliceArgument.uiSliceSizeConstraint = 0;
+
+      iMbWidth  = (kiPicWidth + 15) >> 4;
+      iMbHeight = (kiPicHeight + 15) >> 4;
+      iMbNumInFrame = iMbWidth * iMbHeight;
+      iMaxSliceNum = MAX_SLICES_NUM;
+      if (pSpatialLayer->sSliceArgument.uiSliceMbNum[0] == 0) {
+        if (iMbHeight > iMaxSliceNum) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceNum (%d) settings more than MAX(%d)!",
+                   iMbHeight, MAX_SLICES_NUM);
+          return ENC_RETURN_UNSUPPORTED_PARA;
+        }
+        pSpatialLayer->sSliceArgument.uiSliceNum = iMbHeight;
+        for (uint32_t j = 0; j < iMbHeight; j++) {
+          pSpatialLayer->sSliceArgument.uiSliceMbNum[j] = iMbWidth;
+        }
+        if (!CheckRowMbMultiSliceSetting (iMbWidth,
+                                          &pSpatialLayer->sSliceArgument)) { // verify interleave mode settings
+          WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMbNum (%d) settings!",
+                   pSpatialLayer->sSliceArgument.uiSliceMbNum[0]);
+          return ENC_RETURN_UNSUPPORTED_PARA;
+        }
+        break;
+      }
+
+      if (!CheckRasterMultiSliceSetting (iMbNumInFrame,
+                                         &pSpatialLayer->sSliceArgument)) { // verify interleave mode settings
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMbNum (%d) settings!",
+                 pSpatialLayer->sSliceArgument.uiSliceMbNum[0]);
+        return ENC_RETURN_UNSUPPORTED_PARA;
+      }
+      if (pSpatialLayer->sSliceArgument.uiSliceNum <= 0
+          || pSpatialLayer->sSliceArgument.uiSliceNum > iMaxSliceNum) { // verify interleave mode settings
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceNum (%d) in SM_RASTER_SLICE settings!",
+                 pSpatialLayer->sSliceArgument.uiSliceNum);
+        return ENC_RETURN_UNSUPPORTED_PARA;
+      }
+      if (pSpatialLayer->sSliceArgument.uiSliceNum == 1) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING,
+                 "ParamValidationExt(), pSlice setting for SM_RASTER_SLICE now turn to SM_SINGLE_SLICE!");
+        pSpatialLayer->sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+        break;
+      }
+      if ((pCodingParam->iRCMode != RC_OFF_MODE) && pSpatialLayer->sSliceArgument.uiSliceNum > 1) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), WARNING: GOM based RC do not support SM_RASTER_SLICE!");
+      }
+      // considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting
+      if (iMbNumInFrame <= MIN_NUM_MB_PER_SLICE) {
+        pSpatialLayer->sSliceArgument.uiSliceMode = SM_SINGLE_SLICE;
+        pSpatialLayer->sSliceArgument.uiSliceNum = 1;
+        break;
+      }
+    }
+    break;
+    case SM_SIZELIMITED_SLICE: {
+      iMbWidth  = (kiPicWidth + 15) >> 4;
+      iMbHeight = (kiPicHeight + 15) >> 4;
+      if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint <= MAX_MACROBLOCK_SIZE_IN_BYTE) {
+        WelsLog (pLogCtx, WELS_LOG_ERROR,
+                 "ParamValidationExt(), invalid iSliceSize (%d) settings!should be larger than  MAX_MACROBLOCK_SIZE_IN_BYTE(%d)",
+                 pSpatialLayer->sSliceArgument.uiSliceSizeConstraint, MAX_MACROBLOCK_SIZE_IN_BYTE);
+        return ENC_RETURN_UNSUPPORTED_PARA;
+      }
+
+      if (pCodingParam->uiMaxNalSize > 0) {
+        if (pCodingParam->uiMaxNalSize < (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE)) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "ParamValidationExt(), invalid uiMaxNalSize (%d) settings! should be larger than (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE)(%d)",
+                   pCodingParam->uiMaxNalSize, (NAL_HEADER_ADD_0X30BYTES + MAX_MACROBLOCK_SIZE_IN_BYTE));
+          return ENC_RETURN_UNSUPPORTED_PARA;
+        }
+
+        if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint > (pCodingParam->uiMaxNalSize -
+            NAL_HEADER_ADD_0X30BYTES)) {
+          WelsLog (pLogCtx, WELS_LOG_WARNING,
+                   "ParamValidationExt(), slice mode = SM_SIZELIMITED_SLICE, uiSliceSizeConstraint = %d ,uiMaxNalsize = %d, will take uiMaxNalsize!",
+                   pSpatialLayer->sSliceArgument.uiSliceSizeConstraint, pCodingParam->uiMaxNalSize);
+          pSpatialLayer->sSliceArgument.uiSliceSizeConstraint =  pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES;
+        }
+      }
+      pSpatialLayer->sSliceArgument.uiSliceSizeConstraint -= NAL_HEADER_ADD_0X30BYTES;
+    }
+    break;
+    default: {
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!",
+               pCodingParam->sSpatialLayers[0].sSliceArgument.uiSliceMode);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+
+    }
+    break;
+    }
+  }
+  for (i = 0; i < pCodingParam->iSpatialLayerNum; ++ i) {
+    SSpatialLayerConfig* pLayerInfo = &pCodingParam->sSpatialLayers[i];
+    if ((pLayerInfo->uiProfileIdc == PRO_BASELINE) || (pLayerInfo->uiProfileIdc == PRO_SCALABLE_BASELINE)) {
+      if (pCodingParam->iEntropyCodingModeFlag != 0) {
+        pCodingParam->iEntropyCodingModeFlag = 0;
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "layerId(%d) Profile is baseline, Change CABAC to CAVLC", i);
+      }
+    } else if (pLayerInfo->uiProfileIdc == PRO_UNKNOWN) {
+      if ((i == 0) || pCodingParam->bSimulcastAVC) {
+        pLayerInfo->uiProfileIdc = (pCodingParam->iEntropyCodingModeFlag) ? PRO_HIGH : PRO_BASELINE;
+      } else {
+        pLayerInfo->uiProfileIdc = PRO_SCALABLE_BASELINE;
+      }
+    }
+  }
+  return ParamValidation (pLogCtx, pCodingParam);
+}
+
+
+void WelsEncoderApplyFrameRate (SWelsSvcCodingParam* pParam) {
+  SSpatialLayerInternal* pLayerParamInternal;
+  SSpatialLayerConfig* pLayerParam;
+  const float kfEpsn = 0.000001f;
+  const int32_t kiNumLayer = pParam->iSpatialLayerNum;
+  int32_t i;
+  const float kfMaxFrameRate = pParam->fMaxFrameRate;
+  float fRatio;
+  float fTargetOutputFrameRate;
+
+  //set input frame rate to each layer
+  for (i = 0; i < kiNumLayer; i++) {
+    pLayerParamInternal = & (pParam->sDependencyLayers[i]);
+    pLayerParam = & (pParam->sSpatialLayers[i]);
+    fRatio = pLayerParamInternal->fOutputFrameRate / pLayerParamInternal->fInputFrameRate;
+    if ((kfMaxFrameRate - pLayerParamInternal->fInputFrameRate) > kfEpsn
+        || (kfMaxFrameRate - pLayerParamInternal->fInputFrameRate) < -kfEpsn) {
+      pLayerParamInternal->fInputFrameRate = kfMaxFrameRate;
+      fTargetOutputFrameRate = kfMaxFrameRate * fRatio;
+      pLayerParamInternal->fOutputFrameRate = (fTargetOutputFrameRate >= 6) ? fTargetOutputFrameRate :
+                                              (pLayerParamInternal->fInputFrameRate);
+      pLayerParam->fFrameRate = pLayerParamInternal->fOutputFrameRate;
+      //TODO:{Sijia} from design, there is no sense to have temporal layer when under 6fps even with such setting?
+    }
+  }
+}
+
+int32_t WelsEncoderApplyBitRate (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int iLayer) {
+  //TODO (Sijia):  this is a temporary solution which keep the ratio between layers
+  //but it is also possible to fulfill the bitrate of lower layer first
+
+  SSpatialLayerConfig* pLayerParam;
+  const int32_t iNumLayers = pParam->iSpatialLayerNum;
+  int32_t i, iOrigTotalBitrate = 0;
+  if (iLayer == SPATIAL_LAYER_ALL) {
+    //read old BR
+    for (i = 0; i < iNumLayers; i++) {
+      iOrigTotalBitrate += pParam->sSpatialLayers[i].iSpatialBitrate;
+    }
+    //write new BR
+    float fRatio = 0.0;
+    for (i = 0; i < iNumLayers; i++) {
+      pLayerParam = & (pParam->sSpatialLayers[i]);
+      fRatio = pLayerParam->iSpatialBitrate / (static_cast<float> (iOrigTotalBitrate));
+      pLayerParam->iSpatialBitrate = static_cast<int32_t> (pParam->iTargetBitrate * fRatio);
+
+      if (WelsBitRateVerification (pLogCtx, pLayerParam, i) != ENC_RETURN_SUCCESS)
+        return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+  } else {
+    return WelsBitRateVerification (pLogCtx, & (pParam->sSpatialLayers[iLayer]), iLayer);
+  }
+  return ENC_RETURN_SUCCESS;
+}
+int32_t WelsEncoderApplyBitVaryRang (SLogContext* pLogCtx, SWelsSvcCodingParam* pParam, int32_t iRang) {
+  SSpatialLayerConfig* pLayerParam;
+  const int32_t iNumLayers = pParam->iSpatialLayerNum;
+  for (int32_t i = 0; i < iNumLayers; i++) {
+    pLayerParam = & (pParam->sSpatialLayers[i]);
+    pLayerParam->iMaxSpatialBitrate = WELS_MIN ((int) (pLayerParam->iSpatialBitrate * (1 + iRang / 100.0)),
+                                      pLayerParam->iMaxSpatialBitrate);
+    if (WelsBitRateVerification (pLogCtx, pLayerParam, i) != ENC_RETURN_SUCCESS)
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    WelsLog (pLogCtx, WELS_LOG_INFO,
+             "WelsEncoderApplyBitVaryRang:UpdateMaxBitrate layerId= %d,iMaxSpatialBitrate = %d", i, pLayerParam->iMaxSpatialBitrate);
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+/*!
+ * \brief   acquire count number of layers and NALs based on configurable paramters dependency
+ * \pParam  pCtx            sWelsEncCtx*
+ * \pParam  pParam          SWelsSvcCodingParam*
+ * \pParam  pCountLayers    pointer of count number of layers indeed
+ * \pParam  iCountNals      pointer of count number of nals indeed
+ * \return  0 - successful; otherwise failed
+ */
+int32_t AcquireLayersNals (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pParam, int32_t* pCountLayers,
+                           int32_t* pCountNals) {
+  int32_t iCountNumLayers       = 0;
+  int32_t iCountNumNals         = 0;
+  int32_t iNumDependencyLayers  = 0;
+  int32_t iDIndex               = 0;
+
+  if (NULL == pParam || NULL == ppCtx || NULL == *ppCtx)
+    return 1;
+
+  iNumDependencyLayers = pParam->iSpatialLayerNum;
+
+  do {
+    SSpatialLayerConfig* pDLayer = &pParam->sSpatialLayers[iDIndex];
+//    pDLayer->ptr_cfg = pParam;
+    int32_t iOrgNumNals = iCountNumNals;
+
+    //Note: Sep. 2010
+    //Review this part and suggest no change, since the memory over-use
+    //(1) counts little to the overall performance
+    //(2) should not be critial even under mobile case
+    if (SM_SIZELIMITED_SLICE == pDLayer->sSliceArgument.uiSliceMode) {
+      iCountNumNals += MAX_SLICES_NUM;
+      // plus prefix NALs
+      if (iDIndex == 0)
+        iCountNumNals += MAX_SLICES_NUM;
+      // MAX_SLICES_NUM < MAX_LAYER_NUM_OF_FRAME ensured at svc_enc_slice_segment.h
+      if (iCountNumNals - iOrgNumNals > MAX_NAL_UNITS_IN_LAYER) {
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+                 "AcquireLayersNals(), num_of_slice(%d) > existing slice(%d) at (iDid= %d), max=%d",
+                 iCountNumNals, iOrgNumNals, iDIndex, MAX_NAL_UNITS_IN_LAYER);
+        return 1;
+      }
+    } else { /*if ( SM_SINGLE_SLICE != pDLayer->sSliceArgument.uiSliceMode )*/
+      const int32_t kiNumOfSlice = GetInitialSliceNum (&pDLayer->sSliceArgument);
+
+      // NEED check iCountNals value in case multiple slices is used
+      iCountNumNals += kiNumOfSlice; // for pSlice VCL NALs
+      // plus prefix NALs
+      if (iDIndex == 0)
+        iCountNumNals += kiNumOfSlice;
+      assert (iCountNumNals - iOrgNumNals <= MAX_NAL_UNITS_IN_LAYER);
+      if (kiNumOfSlice > MAX_SLICES_NUM) {
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+                 "AcquireLayersNals(), num_of_slice(%d) > MAX_SLICES_NUM(%d) per (iDid= %d, qid= %d) settings!",
+                 kiNumOfSlice, MAX_SLICES_NUM, iDIndex, 0);
+        return 1;
+      }
+    }
+
+    if (iCountNumNals - iOrgNumNals > MAX_NAL_UNITS_IN_LAYER) {
+      WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+               "AcquireLayersNals(), num_of_nals(%d) > MAX_NAL_UNITS_IN_LAYER(%d) per (iDid= %d, qid= %d) settings!",
+               (iCountNumNals - iOrgNumNals), MAX_NAL_UNITS_IN_LAYER, iDIndex, 0);
+      return 1;
+    }
+
+    iCountNumLayers ++;
+
+    ++ iDIndex;
+  } while (iDIndex < iNumDependencyLayers);
+
+  if (NULL == (*ppCtx)->pFuncList || NULL == (*ppCtx)->pFuncList->pParametersetStrategy) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+             "AcquireLayersNals(), pFuncList and pParametersetStrategy needed to be initialized first!");
+    return 1;
+  }
+  // count parasets
+  iCountNumNals += 1 + iNumDependencyLayers + (iCountNumLayers << 1) +
+                   iCountNumLayers // plus iCountNumLayers for reserved application
+                   + (*ppCtx)->pFuncList->pParametersetStrategy->GetAllNeededParasetNum();
+
+  // to check number of layers / nals / slices dependencies, 12/8/2010
+  if (iCountNumLayers > MAX_LAYER_NUM_OF_FRAME) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR, "AcquireLayersNals(), iCountNumLayers(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
+             iCountNumLayers, MAX_LAYER_NUM_OF_FRAME);
+    return 1;
+  }
+
+  if (NULL != pCountLayers)
+    *pCountLayers = iCountNumLayers;
+  if (NULL != pCountNals)
+    *pCountNals = iCountNumNals;
+  return 0;
+}
+
+static  void  InitMbInfo (sWelsEncCtx* pEnc, SMB*   pList, SDqLayer* pLayer, const int32_t kiDlayerId,
+                          const int32_t kiMaxMbNum) {
+  int32_t  iMbWidth     = pLayer->iMbWidth;
+  int32_t  iMbHeight    = pLayer->iMbHeight;
+  int32_t  iIdx;
+  int32_t  iMbNum       = iMbWidth * iMbHeight;
+  uint32_t uiNeighborAvail;
+  const int32_t kiOffset = (kiDlayerId & 0x01) * kiMaxMbNum;
+  SMVUnitXY (*pLayerMvUnitBlock4x4)[MB_BLOCK4x4_NUM] = (SMVUnitXY (*)[MB_BLOCK4x4_NUM]) (
+        &pEnc->pMvUnitBlock4x4[MB_BLOCK4x4_NUM * kiOffset]);
+  int8_t (*pLayerRefIndexBlock8x8)[MB_BLOCK8x8_NUM] = (int8_t (*)[MB_BLOCK8x8_NUM]) (
+        &pEnc->pRefIndexBlock4x4[MB_BLOCK8x8_NUM * kiOffset]);
+
+  for (iIdx = 0; iIdx < iMbNum; iIdx++) {
+    bool     bLeft;
+    bool     bTop;
+    bool     bLeftTop;
+    bool     bRightTop;
+    int32_t  iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
+    uint16_t  uiSliceIdc; //[0..65535] > 36864 of LEVEL5.2
+
+    pList[iIdx].iMbX = pEnc->pStrideTab->pMbIndexX[kiDlayerId][iIdx];
+    pList[iIdx].iMbY = pEnc->pStrideTab->pMbIndexY[kiDlayerId][iIdx];
+    pList[iIdx].iMbXY = iIdx;
+
+    uiSliceIdc = WelsMbToSliceIdc (pLayer, iIdx);
+    iLeftXY = iIdx - 1;
+    iTopXY = iIdx - iMbWidth;
+    iLeftTopXY = iTopXY - 1;
+    iRightTopXY = iTopXY + 1;
+
+    bLeft = (pList[iIdx].iMbX > 0) && (uiSliceIdc == WelsMbToSliceIdc (pLayer, iLeftXY));
+    bTop = (pList[iIdx].iMbY > 0) && (uiSliceIdc == WelsMbToSliceIdc (pLayer, iTopXY));
+    bLeftTop = (pList[iIdx].iMbX > 0) && (pList[iIdx].iMbY > 0) && (uiSliceIdc ==
+               WelsMbToSliceIdc (pLayer, iLeftTopXY));
+    bRightTop = (pList[iIdx].iMbX < (iMbWidth - 1)) && (pList[iIdx].iMbY > 0) && (uiSliceIdc ==
+                WelsMbToSliceIdc (pLayer, iRightTopXY));
+
+    uiNeighborAvail = 0;
+    if (bLeft) {
+      uiNeighborAvail |= LEFT_MB_POS;
+    }
+    if (bTop) {
+      uiNeighborAvail |= TOP_MB_POS;
+    }
+    if (bLeftTop) {
+      uiNeighborAvail |= TOPLEFT_MB_POS;
+    }
+    if (bRightTop) {
+      uiNeighborAvail |= TOPRIGHT_MB_POS;
+    }
+    pList[iIdx].uiSliceIdc      = uiSliceIdc; // merge from svc_hd_opt_b for multiple slices coding
+    pList[iIdx].uiNeighborAvail = uiNeighborAvail;
+    uiNeighborAvail = 0;
+    if (pList[iIdx].iMbX >= BASE_MV_MB_NMB)
+      uiNeighborAvail |= LEFT_MB_POS;
+    if (pList[iIdx].iMbX <= (iMbWidth - 1 - BASE_MV_MB_NMB))
+      uiNeighborAvail |= RIGHT_MB_POS;
+    if (pList[iIdx].iMbY >= BASE_MV_MB_NMB)
+      uiNeighborAvail |= TOP_MB_POS;
+    if (pList[iIdx].iMbY <= (iMbHeight - 1 - BASE_MV_MB_NMB))
+      uiNeighborAvail |= BOTTOM_MB_POS;
+
+    pList[iIdx].sMv                     = pLayerMvUnitBlock4x4[iIdx];
+    pList[iIdx].pRefIndex               = pLayerRefIndexBlock8x8[iIdx];
+    pList[iIdx].pSadCost                = &pEnc->pSadCostMb[iIdx];
+    pList[iIdx].pIntra4x4PredMode       = &pEnc->pIntra4x4PredModeBlocks[iIdx * INTRA_4x4_MODE_NUM];
+    pList[iIdx].pNonZeroCount           = &pEnc->pNonZeroCountBlocks[iIdx * MB_LUMA_CHROMA_BLOCK4x4_NUM];
+  }
+}
+
+
+int32_t   InitMbListD (sWelsEncCtx** ppCtx) {
+  int32_t iNumDlayer = (*ppCtx)->pSvcParam->iSpatialLayerNum;
+  int32_t iMbSize[MAX_DEPENDENCY_LAYER] = { 0 };
+  int32_t iOverallMbNum = 0;
+  int32_t iMbWidth = 0;
+  int32_t iMbHeight = 0;
+  int32_t i;
+
+  if (iNumDlayer > MAX_DEPENDENCY_LAYER)
+    return 1;
+
+  for (i = 0; i < iNumDlayer; i++) {
+    iMbWidth = ((*ppCtx)->pSvcParam->sSpatialLayers[i].iVideoWidth + 15) >> 4;
+    iMbHeight = ((*ppCtx)->pSvcParam->sSpatialLayers[i].iVideoHeight + 15) >> 4;
+    iMbSize[i] = iMbWidth  * iMbHeight;
+    iOverallMbNum += iMbSize[i];
+  }
+
+  (*ppCtx)->ppMbListD = static_cast<SMB**> ((*ppCtx)->pMemAlign->WelsMallocz (iNumDlayer * sizeof (SMB*), "ppMbListD"));
+  (*ppCtx)->ppMbListD[0] = NULL;
+  WELS_VERIFY_RETURN_IF (1, (*ppCtx)->ppMbListD == NULL)
+  (*ppCtx)->ppMbListD[0] = static_cast<SMB*> ((*ppCtx)->pMemAlign->WelsMallocz (iOverallMbNum * sizeof (SMB),
+                           "ppMbListD[0]"));
+  WELS_VERIFY_RETURN_IF (1, (*ppCtx)->ppMbListD[0] == NULL)
+  (*ppCtx)->ppDqLayerList[0]->sMbDataP = (*ppCtx)->ppMbListD[0];
+  InitMbInfo (*ppCtx, (*ppCtx)->ppMbListD[0], (*ppCtx)->ppDqLayerList[0], 0, iMbSize[iNumDlayer - 1]);
+  for (i = 1; i < iNumDlayer; i++) {
+    (*ppCtx)->ppMbListD[i] = (*ppCtx)->ppMbListD[i - 1] + iMbSize[i - 1];
+    (*ppCtx)->ppDqLayerList[i]->sMbDataP = (*ppCtx)->ppMbListD[i];
+    InitMbInfo (*ppCtx, (*ppCtx)->ppMbListD[i], (*ppCtx)->ppDqLayerList[i], i, iMbSize[iNumDlayer - 1]);
+  }
+
+  return 0;
+}
+
+void FreeSliceInLayer (SDqLayer* pDq, CMemoryAlign* pMa) {
+  int32_t iIdx = 0;
+  for (; iIdx < MAX_THREADS_NUM; iIdx ++) {
+    FreeSliceBuffer (pDq->sSliceBufferInfo[iIdx].pSliceBuffer,
+                     pDq->sSliceBufferInfo[iIdx].iMaxSliceNum,
+                     pMa, "pSliceBuffer");
+  }
+}
+
+void FreeDqLayer (SDqLayer*& pDq, CMemoryAlign* pMa) {
+  if (NULL == pDq) {
+    return;
+  }
+
+  FreeSliceInLayer (pDq, pMa);
+
+  if (pDq->ppSliceInLayer) {
+    pMa->WelsFree (pDq->ppSliceInLayer, "ppSliceInLayer");
+    pDq->ppSliceInLayer = NULL;
+  }
+
+  if (pDq->pFirstMbIdxOfSlice) {
+    pMa->WelsFree (pDq->pFirstMbIdxOfSlice, "pFirstMbIdxOfSlice");
+    pDq->pFirstMbIdxOfSlice = NULL;
+  }
+
+  if (pDq->pCountMbNumInSlice) {
+    pMa->WelsFree (pDq->pCountMbNumInSlice, "pCountMbNumInSlice");
+    pDq->pCountMbNumInSlice = NULL;
+  }
+
+  if (pDq->pFeatureSearchPreparation) {
+    ReleaseFeatureSearchPreparation (pMa, pDq->pFeatureSearchPreparation->pFeatureOfBlock);
+    pMa->WelsFree (pDq->pFeatureSearchPreparation, "pFeatureSearchPreparation");
+    pDq->pFeatureSearchPreparation = NULL;
+  }
+
+  UninitSlicePEncCtx (pDq, pMa);
+  pDq->iMaxSliceNum = 0;
+
+  pMa->WelsFree (pDq, "pDqLayer");
+  pDq = NULL;
+}
+
+void  FreeRefList (SRefList*& pRefList, CMemoryAlign* pMa, const int iMaxNumRefFrame) {
+  if (NULL == pRefList) {
+    return;
+  }
+
+  int32_t iRef = 0;
+  do {
+    if (pRefList->pRef[iRef] != NULL) {
+      FreePicture (pMa, &pRefList->pRef[iRef]);
+    }
+    ++ iRef;
+  } while (iRef < 1 + iMaxNumRefFrame);
+
+  pMa->WelsFree (pRefList, "pRefList");
+  pRefList = NULL;
+}
+
+/*!
+ * \brief   initialize ppDqLayerList and slicepEncCtx_list due to count number of layers available
+ * \pParam  pCtx            sWelsEncCtx*
+ * \return  0 - successful; otherwise failed
+ */
+static inline int32_t InitDqLayers (sWelsEncCtx** ppCtx, SExistingParasetList* pExistingParasetList) {
+  SWelsSvcCodingParam* pParam   = NULL;
+  SWelsSPS* pSps                = NULL;
+  SSubsetSps* pSubsetSps        = NULL;
+  SWelsPPS* pPps                = NULL;
+  CMemoryAlign* pMa             = NULL;
+  int32_t iDlayerCount          = 0;
+  int32_t iDlayerIndex          = 0;
+  int32_t iSpsId               = 0;
+  uint32_t iPpsId               = 0;
+  uint32_t iNumRef              = 0;
+  int32_t iResult               = 0;
+
+  if (NULL == ppCtx || NULL == *ppCtx)
+    return 1;
+
+  pMa           = (*ppCtx)->pMemAlign;
+  pParam        = (*ppCtx)->pSvcParam;
+  iDlayerCount  = pParam->iSpatialLayerNum;
+  iNumRef       = pParam->iMaxNumRefFrame;
+
+  const int32_t kiFeatureStrategyIndex = FME_DEFAULT_FEATURE_INDEX;
+  const int32_t kiMe16x16 = ME_DIA_CROSS;
+  const int32_t kiMe8x8 = ME_DIA_CROSS_FME;
+  const int32_t kiNeedFeatureStorage = (pParam->iUsageType != SCREEN_CONTENT_REAL_TIME) ? 0 :
+                                       ((kiFeatureStrategyIndex << 16) + ((kiMe16x16 & 0x00FF) << 8) + (kiMe8x8 & 0x00FF));
+
+  iDlayerIndex = 0;
+  while (iDlayerIndex < iDlayerCount) {
+    SRefList* pRefList          = NULL;
+    uint32_t i                  = 0;
+    const int32_t kiWidth       = pParam->sSpatialLayers[iDlayerIndex].iVideoWidth;
+    const int32_t kiHeight      = pParam->sSpatialLayers[iDlayerIndex].iVideoHeight;
+    int32_t iPicWidth           = WELS_ALIGN (kiWidth, MB_WIDTH_LUMA) + (PADDING_LENGTH << 1);  // with iWidth of horizon
+    int32_t iPicChromaWidth     = iPicWidth >> 1;
+
+    iPicWidth = WELS_ALIGN (iPicWidth,
+                            32); // 32(or 16 for chroma below) to match original imp. here instead of iCacheLineSize
+    iPicChromaWidth = WELS_ALIGN (iPicChromaWidth, 16);
+
+    WelsGetEncBlockStrideOffset ((*ppCtx)->pStrideTab->pStrideEncBlockOffset[iDlayerIndex], iPicWidth, iPicChromaWidth);
+
+    // pRef list
+    pRefList = (SRefList*)pMa->WelsMallocz (sizeof (SRefList), "pRefList");
+    WELS_VERIFY_RETURN_IF (1, (NULL == pRefList))
+    do {
+      pRefList->pRef[i] = AllocPicture (pMa, kiWidth, kiHeight, true,
+                                        (iDlayerIndex == iDlayerCount - 1) ? kiNeedFeatureStorage : 0); // to use actual size of current layer
+      WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pRefList->pRef[i]), FreeRefList (pRefList, pMa, iNumRef))
+      ++ i;
+    } while (i < 1 + iNumRef);
+
+    pRefList->pNextBuffer = pRefList->pRef[0];
+    (*ppCtx)->ppRefPicListExt[iDlayerIndex] = pRefList;
+    ++ iDlayerIndex;
+  }
+
+  iDlayerIndex = 0;
+  while (iDlayerIndex < iDlayerCount) {
+    SDqLayer* pDqLayer              = NULL;
+    SSpatialLayerConfig* pDlayer    = &pParam->sSpatialLayers[iDlayerIndex];
+    SSpatialLayerInternal* pParamInternal    = &pParam->sDependencyLayers[iDlayerIndex];
+    const int32_t kiMbW             = (pDlayer->iVideoWidth + 0x0f) >> 4;
+    const int32_t kiMbH             = (pDlayer->iVideoHeight + 0x0f) >> 4;
+
+    pParamInternal->iCodingIndex = 0;
+    pParamInternal->iFrameIndex = 0;
+    pParamInternal->iFrameNum = 0;
+    pParamInternal->iPOC = 0;
+    pParamInternal->uiIdrPicId = 0;
+    pParamInternal->bEncCurFrmAsIdrFlag = true;  // make sure first frame is IDR
+    // pDq layers list
+    pDqLayer = (SDqLayer*)pMa->WelsMallocz (sizeof (SDqLayer), "pDqLayer");
+    WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pDqLayer), FreeDqLayer (pDqLayer, pMa))
+
+    pDqLayer->bNeedAdjustingSlicing = false;
+
+    pDqLayer->iMbWidth  = kiMbW;
+    pDqLayer->iMbHeight = kiMbH;
+
+    int32_t iMaxSliceNum            = 1;
+    const int32_t kiSliceNum = GetInitialSliceNum (&pDlayer->sSliceArgument);
+    if (iMaxSliceNum < kiSliceNum)
+      iMaxSliceNum = kiSliceNum;
+    pDqLayer->iMaxSliceNum = iMaxSliceNum;
+
+    iResult = InitSliceInLayer (*ppCtx, pDqLayer, iDlayerIndex, pMa);
+    if (iResult) {
+      WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "InitDqLayers(), InitSliceInLayer failed(%d)!", iResult);
+      FreeDqLayer (pDqLayer, pMa);
+      return iResult;
+    }
+
+    //deblocking parameters initialization
+    //target-layer deblocking
+    pDqLayer->iLoopFilterDisableIdc     = pParam->iLoopFilterDisableIdc;
+    pDqLayer->iLoopFilterAlphaC0Offset  = (pParam->iLoopFilterAlphaC0Offset) << 1;
+    pDqLayer->iLoopFilterBetaOffset     = (pParam->iLoopFilterBetaOffset) << 1;
+    //parallel deblocking
+    pDqLayer->bDeblockingParallelFlag   = pParam->bDeblockingParallelFlag;
+
+    //deblocking parameter adjustment
+    if (SM_SINGLE_SLICE == pDlayer->sSliceArgument.uiSliceMode) {
+      //iLoopFilterDisableIdc: will be 0 or 1 under single_slice
+      if (2 == pParam->iLoopFilterDisableIdc) {
+        pDqLayer->iLoopFilterDisableIdc = 0;
+      }
+      //bDeblockingParallelFlag
+      pDqLayer->bDeblockingParallelFlag = false;
+    } else {
+      //multi-pSlice
+      if (0 == pDqLayer->iLoopFilterDisableIdc) {
+        pDqLayer->bDeblockingParallelFlag = false;
+      }
+    }
+
+    //
+    if (kiNeedFeatureStorage && iDlayerIndex == iDlayerCount - 1) {
+      pDqLayer->pFeatureSearchPreparation = static_cast<SFeatureSearchPreparation*> (pMa->WelsMallocz (sizeof (
+                                              SFeatureSearchPreparation), "pFeatureSearchPreparation"));
+      WELS_VERIFY_RETURN_IF (1, NULL == pDqLayer->pFeatureSearchPreparation)
+      int32_t iReturn = RequestFeatureSearchPreparation (pMa, pDlayer->iVideoWidth, pDlayer->iVideoHeight,
+                        kiNeedFeatureStorage,
+                        pDqLayer->pFeatureSearchPreparation);
+      WELS_VERIFY_RETURN_IF (1, ENC_RETURN_SUCCESS != iReturn)
+    } else {
+      pDqLayer->pFeatureSearchPreparation = NULL;
+    }
+
+    (*ppCtx)->ppDqLayerList[iDlayerIndex] = pDqLayer;
+
+    ++ iDlayerIndex;
+  }
+
+  // for dynamically malloc for parameter sets memory instead of maximal items for standard to reduce size, 3/18/2010
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pFuncList))
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pFuncList->pParametersetStrategy))
+  const int32_t kiNeededSpsNum = (*ppCtx)->pFuncList->pParametersetStrategy->GetNeededSpsNum();
+  const int32_t kiNeededSubsetSpsNum = (*ppCtx)->pFuncList->pParametersetStrategy->GetNeededSubsetSpsNum();
+  (*ppCtx)->pSpsArray = (SWelsSPS*)pMa->WelsMallocz (kiNeededSpsNum * sizeof (SWelsSPS), "pSpsArray");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pSpsArray))
+  if (kiNeededSubsetSpsNum > 0) {
+    (*ppCtx)->pSubsetArray = (SSubsetSps*)pMa->WelsMallocz (kiNeededSubsetSpsNum * sizeof (SSubsetSps), "pSubsetArray");
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pSubsetArray))
+  } else {
+    (*ppCtx)->pSubsetArray = NULL;
+  }
+
+  // PPS
+  const int32_t kiNeededPpsNum = (*ppCtx)->pFuncList->pParametersetStrategy->GetNeededPpsNum();
+  (*ppCtx)->pPPSArray = (SWelsPPS*)pMa->WelsMallocz (kiNeededPpsNum * sizeof (SWelsPPS), "pPPSArray");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pPPSArray))
+
+  (*ppCtx)->pFuncList->pParametersetStrategy->LoadPrevious (pExistingParasetList, (*ppCtx)->pSpsArray,
+      (*ppCtx)->pSubsetArray, (*ppCtx)->pPPSArray);
+
+
+  (*ppCtx)->pDqIdcMap = (SDqIdc*)pMa->WelsMallocz (iDlayerCount * sizeof (SDqIdc), "pDqIdcMap");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pDqIdcMap))
+
+  iDlayerIndex = 0;
+  while (iDlayerIndex < iDlayerCount) {
+    SDqIdc* pDqIdc                      = & (*ppCtx)->pDqIdcMap[iDlayerIndex];
+    const bool bUseSubsetSps            = (!pParam->bSimulcastAVC) && (iDlayerIndex > BASE_DEPENDENCY_ID);
+    SSpatialLayerConfig* pDlayerParam   = &pParam->sSpatialLayers[iDlayerIndex];
+    bool bSvcBaselayer = (!pParam->bSimulcastAVC) && (iDlayerCount > BASE_DEPENDENCY_ID)
+                         && (iDlayerIndex == BASE_DEPENDENCY_ID);
+    pDqIdc->uiSpatialId = iDlayerIndex;
+
+    iSpsId = (*ppCtx)->pFuncList->pParametersetStrategy->GenerateNewSps (*ppCtx, bUseSubsetSps, iDlayerIndex,
+             iDlayerCount, iSpsId, pSps, pSubsetSps, bSvcBaselayer);
+    WELS_VERIFY_RETURN_IF (ENC_RETURN_UNSUPPORTED_PARA, (0 > iSpsId))
+    if (!bUseSubsetSps) {
+      pSps = & ((*ppCtx)->pSpsArray[iSpsId]);
+    } else {
+      pSubsetSps = & ((*ppCtx)->pSubsetArray[iSpsId]);
+    }
+
+    iPpsId = (*ppCtx)->pFuncList->pParametersetStrategy->InitPps ((*ppCtx), iSpsId, pSps, pSubsetSps, iPpsId, true,
+             bUseSubsetSps, pParam->iEntropyCodingModeFlag != 0);
+    pPps = & ((*ppCtx)->pPPSArray[iPpsId]);
+
+    // Not using FMO in SVC coding so far, come back if need FMO
+    {
+      iResult = InitSlicePEncCtx ((*ppCtx)->ppDqLayerList[iDlayerIndex],
+                                  (*ppCtx)->pMemAlign,
+                                  false,
+                                  pSps->iMbWidth,
+                                  pSps->iMbHeight,
+                                  & (pDlayerParam->sSliceArgument),
+                                  pPps);
+      if (iResult) {
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "InitDqLayers(), InitSlicePEncCtx failed(%d)!", iResult);
+        return iResult;
+      }
+    }
+    pDqIdc->iSpsId = iSpsId;
+    pDqIdc->iPpsId = iPpsId;
+
+    if ((pParam->bSimulcastAVC) || (bUseSubsetSps))
+      ++ iSpsId;
+    ++ iPpsId;
+    if (bUseSubsetSps) {
+      ++ (*ppCtx)->iSubsetSpsNum;
+    } else {
+      ++ (*ppCtx)->iSpsNum;
+    }
+    ++ (*ppCtx)->iPpsNum;
+
+    ++ iDlayerIndex;
+  }
+
+  (*ppCtx)->pFuncList->pParametersetStrategy->UpdateParaSetNum ((*ppCtx));
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t AllocStrideTables (sWelsEncCtx** ppCtx, const int32_t kiNumSpatialLayers) {
+  CMemoryAlign* pMa             = (*ppCtx)->pMemAlign;
+  SWelsSvcCodingParam* pParam   = (*ppCtx)->pSvcParam;
+  SStrideTables* pPtr           = NULL;
+  int16_t* pTmpRow              = NULL, *pRowX = NULL, *pRowY = NULL, *p = NULL;
+  uint8_t* pBase                = NULL;
+  uint8_t* pBaseDec = NULL, *pBaseEnc = NULL, *pBaseMbX = NULL, *pBaseMbY = NULL;
+  struct {
+    int32_t iMbWidth;
+    int32_t iCountMbNum;                // count number of SMB in each spatial
+    int32_t iSizeAllMbAlignCache;       // cache line size aligned in each spatial
+  } sMbSizeMap[MAX_DEPENDENCY_LAYER] = {{ 0 }};
+  int32_t iLineSizeY[MAX_DEPENDENCY_LAYER][2] = {{ 0 }};
+  int32_t iLineSizeUV[MAX_DEPENDENCY_LAYER][2] = {{ 0 }};
+  int32_t iMapSpatialIdx[MAX_DEPENDENCY_LAYER][2] = {{ 0 }};
+  int32_t iSizeDec              = 0;
+  int32_t iSizeEnc              = 0;
+  int32_t iCountLayersNeedCs[2] = {0};
+  const int32_t kiUnit1Size = 24 * sizeof (int32_t);
+  int32_t iUnit2Size            = 0;
+  int32_t iNeedAllocSize        = 0;
+  int32_t iRowSize              = 0;
+  int16_t iMaxMbWidth           = 0;
+  int16_t iMaxMbHeight          = 0;
+  int32_t i                     = 0;
+  int32_t iSpatialIdx           = 0;
+  int32_t iTemporalIdx          = 0;
+  int32_t iCntTid               = 0;
+
+  if (kiNumSpatialLayers <= 0 || kiNumSpatialLayers > MAX_DEPENDENCY_LAYER)
+    return 1;
+
+  pPtr = (SStrideTables*)pMa->WelsMallocz (sizeof (SStrideTables), "SStrideTables");
+  if (NULL == pPtr)
+    return 1;
+  (*ppCtx)->pStrideTab = pPtr;
+
+  iCntTid = pParam->iTemporalLayerNum > 1 ? 2 : 1;
+
+  iSpatialIdx = 0;
+  while (iSpatialIdx < kiNumSpatialLayers) {
+    const int32_t kiTmpWidth = (pParam->sSpatialLayers[iSpatialIdx].iVideoWidth + 15) >> 4;
+    const int32_t kiTmpHeight = (pParam->sSpatialLayers[iSpatialIdx].iVideoHeight + 15) >> 4;
+    int32_t iNumMb = kiTmpWidth * kiTmpHeight;
+
+    sMbSizeMap[iSpatialIdx].iMbWidth    = kiTmpWidth;
+    sMbSizeMap[iSpatialIdx].iCountMbNum = iNumMb;
+
+    iNumMb *= sizeof (int16_t);
+    sMbSizeMap[iSpatialIdx].iSizeAllMbAlignCache = iNumMb;
+    iUnit2Size += iNumMb;
+
+    ++ iSpatialIdx;
+  }
+
+  // Adaptive size_cs, size_fdec by implementation dependency
+  iTemporalIdx = 0;
+  while (iTemporalIdx < iCntTid) {
+    const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
+
+    iSpatialIdx = 0;
+    while (iSpatialIdx < kiNumSpatialLayers) {
+      SSpatialLayerConfig* fDlp = &pParam->sSpatialLayers[iSpatialIdx];
+
+      const int32_t kiWidthPad = WELS_ALIGN (fDlp->iVideoWidth, 16) + (PADDING_LENGTH << 1);
+      iLineSizeY[iSpatialIdx][kbBaseTemporalFlag]  = WELS_ALIGN (kiWidthPad, 32);
+      iLineSizeUV[iSpatialIdx][kbBaseTemporalFlag] = WELS_ALIGN ((kiWidthPad >> 1), 16);
+
+      iMapSpatialIdx[iCountLayersNeedCs[kbBaseTemporalFlag]][kbBaseTemporalFlag] = iSpatialIdx;
+      ++ iCountLayersNeedCs[kbBaseTemporalFlag];
+      ++ iSpatialIdx;
+    }
+    ++ iTemporalIdx;
+  }
+  iSizeDec = kiUnit1Size * (iCountLayersNeedCs[0] + iCountLayersNeedCs[1]);
+  iSizeEnc = kiUnit1Size * kiNumSpatialLayers;
+
+  iNeedAllocSize = iSizeDec + iSizeEnc + (iUnit2Size << 1);
+
+  pBase = (uint8_t*)pMa->WelsMallocz (iNeedAllocSize, "pBase");
+  if (NULL == pBase) {
+    return 1;
+  }
+
+  pBaseDec = pBase;                     // iCountLayersNeedCs
+  pBaseEnc = pBaseDec + iSizeDec;       // iNumSpatialLayers
+  pBaseMbX = pBaseEnc + iSizeEnc;       // iNumSpatialLayers
+  pBaseMbY = pBaseMbX + iUnit2Size;     // iNumSpatialLayers
+
+  iTemporalIdx = 0;
+  while (iTemporalIdx < iCntTid) {
+    const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
+
+    iSpatialIdx = 0;
+    while (iSpatialIdx < iCountLayersNeedCs[kbBaseTemporalFlag]) {
+      const int32_t kiActualSpatialIdx = iMapSpatialIdx[iSpatialIdx][kbBaseTemporalFlag];
+      const int32_t kiLumaWidth        = iLineSizeY[kiActualSpatialIdx][kbBaseTemporalFlag];
+      const int32_t kiChromaWidth      = iLineSizeUV[kiActualSpatialIdx][kbBaseTemporalFlag];
+
+      WelsGetEncBlockStrideOffset ((int32_t*)pBaseDec, kiLumaWidth, kiChromaWidth);
+
+      pPtr->pStrideDecBlockOffset[kiActualSpatialIdx][kbBaseTemporalFlag] = (int32_t*)pBaseDec;
+      pBaseDec += kiUnit1Size;
+
+      ++ iSpatialIdx;
+    }
+    ++ iTemporalIdx;
+  }
+  iTemporalIdx = 0;
+  while (iTemporalIdx < iCntTid) {
+    const bool kbBaseTemporalFlag = (iTemporalIdx == 0);
+
+    iSpatialIdx = 0;
+    while (iSpatialIdx < kiNumSpatialLayers) {
+      int32_t iMatchIndex = 0;
+      bool bInMap = false;
+      bool bMatchFlag = false;
+
+      i = 0;
+      while (i < iCountLayersNeedCs[kbBaseTemporalFlag]) {
+        const int32_t kiActualIdx = iMapSpatialIdx[i][kbBaseTemporalFlag];
+        if (kiActualIdx == iSpatialIdx) {
+          bInMap = true;
+          break;
+        }
+        if (!bMatchFlag) {
+          iMatchIndex = kiActualIdx;
+          bMatchFlag = true;
+        }
+        ++ i;
+      }
+
+      if (bInMap) {
+        ++ iSpatialIdx;
+        continue;
+      }
+
+      // not in spatial map and assign match one to it
+      pPtr->pStrideDecBlockOffset[iSpatialIdx][kbBaseTemporalFlag] =
+        pPtr->pStrideDecBlockOffset[iMatchIndex][kbBaseTemporalFlag];
+
+      ++ iSpatialIdx;
+    }
+    ++ iTemporalIdx;
+  }
+
+  iSpatialIdx = 0;
+  while (iSpatialIdx < kiNumSpatialLayers) {
+    const int32_t kiAllocMbSize = sMbSizeMap[iSpatialIdx].iSizeAllMbAlignCache;
+
+    pPtr->pStrideEncBlockOffset[iSpatialIdx]    = (int32_t*)pBaseEnc;
+
+    pPtr->pMbIndexX[iSpatialIdx]                = (int16_t*)pBaseMbX;
+    pPtr->pMbIndexY[iSpatialIdx]                = (int16_t*)pBaseMbY;
+
+    pBaseEnc += kiUnit1Size;
+    pBaseMbX += kiAllocMbSize;
+    pBaseMbY += kiAllocMbSize;
+
+    ++ iSpatialIdx;
+  }
+
+  while (iSpatialIdx < MAX_DEPENDENCY_LAYER) {
+    pPtr->pStrideDecBlockOffset[iSpatialIdx][0] = NULL;
+    pPtr->pStrideDecBlockOffset[iSpatialIdx][1] = NULL;
+    pPtr->pStrideEncBlockOffset[iSpatialIdx]    = NULL;
+    pPtr->pMbIndexX[iSpatialIdx]                = NULL;
+    pPtr->pMbIndexY[iSpatialIdx]                = NULL;
+
+    ++ iSpatialIdx;
+  }
+
+  // initialize pMbIndexX and pMbIndexY tables as below
+
+  iMaxMbWidth   = sMbSizeMap[kiNumSpatialLayers - 1].iMbWidth;
+  iMaxMbWidth   = WELS_ALIGN (iMaxMbWidth, 4);  // 4 loops for int16_t required introduced as below
+  iRowSize      = iMaxMbWidth * sizeof (int16_t);
+
+  pTmpRow = (int16_t*)pMa->WelsMallocz (iRowSize, "pTmpRow");
+  if (NULL == pTmpRow) {
+    return 1;
+  }
+  pRowX = pTmpRow;
+  pRowY = pRowX;
+  // initialize pRowX & pRowY
+  i = 0;
+  p = pRowX;
+  while (i < iMaxMbWidth) {
+    *p          = i;
+    * (p + 1)   = 1 + i;
+    * (p + 2)   = 2 + i;
+    * (p + 3)   = 3 + i;
+
+    p += 4;
+    i += 4;
+  }
+
+  iSpatialIdx = kiNumSpatialLayers;
+  while (--iSpatialIdx >= 0) {
+    int16_t* pMbIndexX = pPtr->pMbIndexX[iSpatialIdx];
+    const int32_t kiMbWidth     = sMbSizeMap[iSpatialIdx].iMbWidth;
+    const int32_t kiMbHeight    = sMbSizeMap[iSpatialIdx].iCountMbNum / kiMbWidth;
+    const int32_t kiLineSize    = kiMbWidth * sizeof (int16_t);
+
+    i = 0;
+    while (i < kiMbHeight) {
+      memcpy (pMbIndexX, pRowX, kiLineSize); // confirmed_safe_unsafe_usage
+
+      pMbIndexX += kiMbWidth;
+      ++ i;
+    }
+  }
+
+  memset (pRowY, 0, iRowSize);
+  iMaxMbHeight = sMbSizeMap[kiNumSpatialLayers - 1].iCountMbNum / sMbSizeMap[kiNumSpatialLayers - 1].iMbWidth;
+  i = 0;
+  for (;;) {
+    ENFORCE_STACK_ALIGN_1D (int16_t, t, 4, 16)
+
+    int32_t t32 = 0;
+    int16_t j = 0;
+
+    for (iSpatialIdx = kiNumSpatialLayers - 1; iSpatialIdx >= 0; -- iSpatialIdx) {
+      const int32_t kiMbWidth  = sMbSizeMap[iSpatialIdx].iMbWidth;
+      const int32_t kiMbHeight = sMbSizeMap[iSpatialIdx].iCountMbNum / kiMbWidth;
+      const int32_t kiLineSize = kiMbWidth * sizeof (int16_t);
+      int16_t* pMbIndexY = pPtr->pMbIndexY[iSpatialIdx] + i * kiMbWidth;
+
+      if (i < kiMbHeight) {
+        memcpy (pMbIndexY, pRowY, kiLineSize); // confirmed_safe_unsafe_usage
+      }
+    }
+    ++ i;
+    if (i >= iMaxMbHeight)
+      break;
+
+    t32 = i | (i << 16);
+    ST32 (t, t32);
+    ST32 (t + 2, t32);
+
+    p = pRowY;
+    while (j < iMaxMbWidth) {
+      ST64 (p, LD64 (t));
+
+      p += 4;
+      j += 4;
+    }
+  }
+
+  pMa->WelsFree (pTmpRow, "pTmpRow");
+  pTmpRow = NULL;
+
+  return 0;
+}
+int32_t RequestMemoryVaaScreen (SVAAFrameInfo* pVaa,  CMemoryAlign* pMa,  const int32_t iNumRef,
+                                const int32_t iCountMax8x8BNum) {
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pVaa);
+
+  pVaaExt->pVaaBlockStaticIdc[0] = (static_cast<uint8_t*> (pMa->WelsMallocz (iNumRef * iCountMax8x8BNum * sizeof (
+                                      uint8_t), "pVaa->pVaaBlockStaticIdc[0]")));
+  if (NULL == pVaaExt->pVaaBlockStaticIdc[0]) {
+    return 1;
+  }
+
+  for (int32_t idx = 1; idx < iNumRef; idx++) {
+    pVaaExt->pVaaBlockStaticIdc[idx] = pVaaExt->pVaaBlockStaticIdc[idx - 1] + iCountMax8x8BNum;
+  }
+  return 0;
+}
+void ReleaseMemoryVaaScreen (SVAAFrameInfo* pVaa,  CMemoryAlign* pMa, const int32_t iNumRef) {
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pVaa);
+  if (pVaaExt && pMa && pVaaExt->pVaaBlockStaticIdc[0]) {
+    pMa->WelsFree (pVaaExt->pVaaBlockStaticIdc[0], "pVaa->pVaaBlockStaticIdc[0]");
+
+    for (int32_t idx = 0; idx < iNumRef; idx++) {
+      pVaaExt->pVaaBlockStaticIdc[idx] = NULL;
+    }
+  }
+}
+/*!
+ * \brief   request specific memory for SVC
+ * \pParam  pEncCtx     sWelsEncCtx*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+void GetMvMvdRange (SWelsSvcCodingParam* pParam, int32_t& iMvRange, int32_t& iMvdRange) {
+  ELevelIdc iMinLevelIdc = LEVEL_5_2;
+  int32_t iMinMv = 0;
+  int32_t iMaxMv = 0;
+  int32_t iFixMvRange = pParam->iUsageType ? EXPANDED_MV_RANGE : CAMERA_STARTMV_RANGE;
+  int32_t iFixMvdRange = (pParam->iUsageType ? EXPANDED_MVD_RANGE : ((pParam->iSpatialLayerNum == 1) ? CAMERA_MVD_RANGE :
+                          CAMERA_HIGHLAYER_MVD_RANGE));
+  for (int32_t iLayer = 0; iLayer < pParam->iSpatialLayerNum; iLayer++) {
+    if (pParam->sSpatialLayers[iLayer].uiLevelIdc < iMinLevelIdc)
+      iMinLevelIdc = pParam->sSpatialLayers[iLayer].uiLevelIdc;
+  }
+  const SLevelLimits* pLevelLimit = g_ksLevelLimits;
+  while ((pLevelLimit->uiLevelIdc != LEVEL_5_2) && (pLevelLimit->uiLevelIdc != iMinLevelIdc))
+    pLevelLimit++;
+  iMinMv = (pLevelLimit->iMinVmv) >> 2;
+  iMaxMv = (pLevelLimit->iMaxVmv) >> 2;
+
+  iMvRange = WELS_MIN (WELS_ABS (iMinMv), iMaxMv);
+
+  iMvRange = WELS_MIN (iMvRange, iFixMvRange);
+
+  iMvdRange = (iMvRange + 1) << 1;
+
+  iMvdRange = WELS_MIN (iMvdRange, iFixMvdRange);
+}
+int32_t RequestMemorySvc (sWelsEncCtx** ppCtx, SExistingParasetList* pExistingParasetList) {
+  SWelsSvcCodingParam* pParam           = (*ppCtx)->pSvcParam;
+  CMemoryAlign* pMa                     = (*ppCtx)->pMemAlign;
+  SSpatialLayerConfig* pFinalSpatial    = NULL;
+  int32_t iCountBsLen                   = 0;
+  int32_t iCountNals                    = 0;
+  int32_t iMaxPicWidth                  = 0;
+  int32_t iMaxPicHeight                 = 0;
+  int32_t iCountMaxMbNum                = 0;
+  int32_t iIndex                        = 0;
+  int32_t iCountLayers                  = 0;
+  int32_t iResult                       = 0;
+  float fCompressRatioThr               = .5f;
+  const int32_t kiNumDependencyLayers   = pParam->iSpatialLayerNum;
+  int32_t iVclLayersBsSizeCount         = 0;
+  int32_t iNonVclLayersBsSizeCount      = 0;
+  int32_t iTargetSpatialBsSize          = 0;
+
+  if (kiNumDependencyLayers < 1 || kiNumDependencyLayers > MAX_DEPENDENCY_LAYER) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc() failed due to invalid iNumDependencyLayers(%d)!",
+             kiNumDependencyLayers);
+    return 1;
+  }
+
+  if (pParam->uiGopSize == 0 || (pParam->uiIntraPeriod && ((pParam->uiIntraPeriod % pParam->uiGopSize) != 0))) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING,
+             "RequestMemorySvc() failed due to invalid uiIntraPeriod(%d) (=multipler of uiGopSize(%d)!",
+             pParam->uiIntraPeriod, pParam->uiGopSize);
+    return 1;
+  }
+
+  pFinalSpatial = &pParam->sSpatialLayers[kiNumDependencyLayers - 1];
+  iMaxPicWidth  = pFinalSpatial->iVideoWidth;
+  iMaxPicHeight = pFinalSpatial->iVideoHeight;
+  iCountMaxMbNum = ((15 + iMaxPicWidth) >> 4) * ((15 + iMaxPicHeight) >> 4);
+
+  iResult = AcquireLayersNals (ppCtx, pParam, &iCountLayers, &iCountNals);
+  if (iResult) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AcquireLayersNals failed(%d)!", iResult);
+    return 1;
+  }
+
+  const int32_t kiSpsSize = (*ppCtx)->pFuncList->pParametersetStrategy->GetNeededSpsNum() * SPS_BUFFER_SIZE;
+  const int32_t kiPpsSize = (*ppCtx)->pFuncList->pParametersetStrategy->GetNeededPpsNum() * PPS_BUFFER_SIZE;
+  iNonVclLayersBsSizeCount = SSEI_BUFFER_SIZE + kiSpsSize + kiPpsSize;
+
+  bool    bDynamicSlice = false;
+  uint32_t uiMaxSliceNumEstimation = 0;
+  int32_t iSliceBufferSize = 0;
+  int32_t iMaxSliceBufferSize = 0;
+  int32_t iTotalLength = 0;
+  int32_t iLayerBsSize = 0;
+  iIndex = 0;
+  while (iIndex < pParam->iSpatialLayerNum) {
+    SSpatialLayerConfig* fDlp = &pParam->sSpatialLayers[iIndex];
+
+    fCompressRatioThr = COMPRESS_RATIO_THR;
+
+    iLayerBsSize = WELS_ROUND (((3 * fDlp->iVideoWidth * fDlp->iVideoHeight) >> 1) * fCompressRatioThr) +
+                   MAX_MACROBLOCK_SIZE_IN_BYTE_x2;
+    iLayerBsSize = WELS_ALIGN (iLayerBsSize, 4); // 4 bytes alinged
+    iVclLayersBsSizeCount += iLayerBsSize;
+
+    SSliceArgument* pSliceArgument = & (fDlp->sSliceArgument);
+    if (pSliceArgument->uiSliceMode == SM_SIZELIMITED_SLICE) {
+      bDynamicSlice = true;
+      uiMaxSliceNumEstimation = WELS_MIN (AVERSLICENUM_CONSTRAINT,
+                                          (iLayerBsSize / pSliceArgument->uiSliceSizeConstraint) + 1);
+      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, (int) uiMaxSliceNumEstimation);
+      iSliceBufferSize = (WELS_MAX (pSliceArgument->uiSliceSizeConstraint,
+                                    iLayerBsSize / uiMaxSliceNumEstimation) << 1) + MAX_MACROBLOCK_SIZE_IN_BYTE_x2;
+    } else {
+      (*ppCtx)->iMaxSliceCount = WELS_MAX ((*ppCtx)->iMaxSliceCount, (int) pSliceArgument->uiSliceNum);
+      iSliceBufferSize = ((iLayerBsSize / pSliceArgument->uiSliceNum) << 1) + MAX_MACROBLOCK_SIZE_IN_BYTE_x2;
+    }
+    iMaxSliceBufferSize                = WELS_MAX (iMaxSliceBufferSize, iSliceBufferSize);
+    (*ppCtx)->iSliceBufferSize[iIndex] = iSliceBufferSize;
+    ++ iIndex;
+  }
+  iTargetSpatialBsSize = iLayerBsSize;
+  iCountBsLen = iNonVclLayersBsSizeCount + iVclLayersBsSizeCount;
+
+  iMaxSliceBufferSize = WELS_MIN (iMaxSliceBufferSize, iTargetSpatialBsSize);
+  iTotalLength = iCountBsLen;
+
+  pParam->iNumRefFrame = WELS_CLIP3 (pParam->iNumRefFrame, MIN_REF_PIC_COUNT,
+                                     (pParam->iUsageType == CAMERA_VIDEO_REAL_TIME ? MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA :
+                                      MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN));
+
+  // Output
+  (*ppCtx)->pOut = (SWelsEncoderOutput*)pMa->WelsMallocz (sizeof (SWelsEncoderOutput), "SWelsEncoderOutput");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pOut))
+  (*ppCtx)->pOut->pBsBuffer = (uint8_t*)pMa->WelsMallocz (iCountBsLen, "pOut->pBsBuffer");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pOut->pBsBuffer))
+  (*ppCtx)->pOut->uiSize = iCountBsLen;
+  (*ppCtx)->pOut->sNalList = (SWelsNalRaw*)pMa->WelsMallocz (iCountNals * sizeof (SWelsNalRaw), "pOut->sNalList");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pOut->sNalList))
+  (*ppCtx)->pOut->pNalLen = (int32_t*)pMa->WelsMallocz (iCountNals * sizeof (int32_t), "pOut->pNalLen");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pOut->pNalLen))
+  (*ppCtx)->pOut->iCountNals    = iCountNals;
+  (*ppCtx)->pOut->iNalIndex     = 0;
+  (*ppCtx)->pOut->iLayerBsIndex = 0;
+
+  (*ppCtx)->pFrameBs = (uint8_t*)pMa->WelsMalloc (iTotalLength, "pFrameBs");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pFrameBs))
+  (*ppCtx)->iFrameBsSize = iTotalLength;
+  (*ppCtx)->iPosBsBuffer = 0;
+
+  // for dynamic slice mode&& CABAC,allocate slice buffer to restore slice data
+  if (bDynamicSlice && pParam->iEntropyCodingModeFlag) {
+    for (int32_t iIdx = 0; iIdx < MAX_THREADS_NUM; iIdx++) {
+      (*ppCtx)->pDynamicBsBuffer[iIdx] = (uint8_t*)pMa->WelsMalloc (iMaxSliceBufferSize, "DynamicSliceBs");
+      WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pDynamicBsBuffer[iIdx]))
+    }
+  }
+  // for pSlice bs buffers
+  if (pParam->iMultipleThreadIdc > 1
+      && RequestMtResource (ppCtx, pParam, iCountBsLen, iMaxSliceBufferSize, bDynamicSlice)) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMtResource failed!");
+    return 1;
+  }
+
+  (*ppCtx)->pReferenceStrategy = IWelsReferenceStrategy::CreateReferenceStrategy ((*ppCtx), pParam->iUsageType,
+                                 pParam->bEnableLongTermReference);
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pReferenceStrategy))
+
+  (*ppCtx)->pIntra4x4PredModeBlocks = static_cast<int8_t*>
+                                      (pMa->WelsMallocz (iCountMaxMbNum * INTRA_4x4_MODE_NUM, "pIntra4x4PredModeBlocks"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pIntra4x4PredModeBlocks))
+
+  (*ppCtx)->pNonZeroCountBlocks = static_cast<int8_t*>
+                                  (pMa->WelsMallocz (iCountMaxMbNum * MB_LUMA_CHROMA_BLOCK4x4_NUM, "pNonZeroCountBlocks"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pNonZeroCountBlocks))
+
+  (*ppCtx)->pMvUnitBlock4x4 = static_cast<SMVUnitXY*>
+                              (pMa->WelsMallocz (iCountMaxMbNum * 2 * MB_BLOCK4x4_NUM * sizeof (SMVUnitXY), "pMvUnitBlock4x4"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pMvUnitBlock4x4))
+
+  (*ppCtx)->pRefIndexBlock4x4 = static_cast<int8_t*>
+                                (pMa->WelsMallocz (iCountMaxMbNum * 2 * MB_BLOCK8x8_NUM * sizeof (int8_t), "pRefIndexBlock4x4"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pRefIndexBlock4x4))
+
+  (*ppCtx)->pSadCostMb = static_cast<int32_t*>
+                         (pMa->WelsMallocz (iCountMaxMbNum * sizeof (int32_t), "pSadCostMb"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pSadCostMb))
+
+  (*ppCtx)->iGlobalQp = 26;   // global qp in default
+
+  (*ppCtx)->pLtr = (SLTRState*)pMa->WelsMallocz (kiNumDependencyLayers * sizeof (SLTRState), "SLTRState");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pLtr))
+  int32_t i = 0;
+  for (i = 0; i < kiNumDependencyLayers; i++) {
+    ResetLtrState (& (*ppCtx)->pLtr[i]);
+  }
+
+  // stride tables
+  if (AllocStrideTables (ppCtx, kiNumDependencyLayers)) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), AllocStrideTables failed!");
+    return 1;
+  }
+
+  //Rate control module memory allocation
+  // only malloc once for RC pData, 12/14/2009
+  (*ppCtx)->pWelsSvcRc = (SWelsSvcRc*)pMa->WelsMallocz (kiNumDependencyLayers * sizeof (SWelsSvcRc), "pWelsSvcRc");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pWelsSvcRc))
+  //End of Rate control module memory allocation
+
+  //pVaa memory allocation
+  if (pParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    (*ppCtx)->pVaa = (SVAAFrameInfoExt*)pMa->WelsMallocz (sizeof (SVAAFrameInfoExt), "pVaa");
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa))
+    if (RequestMemoryVaaScreen ((*ppCtx)->pVaa, pMa, (*ppCtx)->pSvcParam->iMaxNumRefFrame, iCountMaxMbNum << 2)) {
+      WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), RequestMemoryVaaScreen failed!");
+      return 1;
+    }
+  } else {
+    (*ppCtx)->pVaa = (SVAAFrameInfo*)pMa->WelsMallocz (sizeof (SVAAFrameInfo), "pVaa");
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa))
+  }
+
+  if ((*ppCtx)->pSvcParam->bEnableAdaptiveQuant) { //malloc mem
+    (*ppCtx)->pVaa->sAdaptiveQuantParam.pMotionTextureUnit   = static_cast<SMotionTextureUnit*>
+        (pMa->WelsMallocz (iCountMaxMbNum * sizeof (SMotionTextureUnit), "pVaa->sAdaptiveQuantParam.pMotionTextureUnit"));
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sAdaptiveQuantParam.pMotionTextureUnit))
+    (*ppCtx)->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp   = static_cast<int8_t*>
+        (pMa->WelsMallocz (iCountMaxMbNum * sizeof (int8_t), "pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp"));
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp))
+  }
+
+  (*ppCtx)->pVaa->pVaaBackgroundMbFlag = (int8_t*)pMa->WelsMallocz (iCountMaxMbNum * sizeof (int8_t),
+                                         "pVaa->pVaaBackgroundMbFlag");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->pVaaBackgroundMbFlag))
+
+  (*ppCtx)->pVaa->sVaaCalcInfo.pSad8x8 = static_cast<int32_t (*)[4]>
+                                         (pMa->WelsMallocz (iCountMaxMbNum * 4 * sizeof (int32_t), "pVaa->sVaaCalcInfo.sad8x8"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pSad8x8))
+  (*ppCtx)->pVaa->sVaaCalcInfo.pSsd16x16 = static_cast<int32_t*>
+      (pMa->WelsMallocz (iCountMaxMbNum * sizeof (int32_t), "pVaa->sVaaCalcInfo.pSsd16x16"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pSsd16x16))
+  (*ppCtx)->pVaa->sVaaCalcInfo.pSum16x16 = static_cast<int32_t*>
+      (pMa->WelsMallocz (iCountMaxMbNum * sizeof (int32_t), "pVaa->sVaaCalcInfo.pSum16x16"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pSum16x16))
+  (*ppCtx)->pVaa->sVaaCalcInfo.pSumOfSquare16x16 = static_cast<int32_t*>
+      (pMa->WelsMallocz (iCountMaxMbNum * sizeof (int32_t), "pVaa->sVaaCalcInfo.pSumOfSquare16x16"));
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pSumOfSquare16x16))
+
+  if ((*ppCtx)->pSvcParam->bEnableBackgroundDetection) { //BGD control
+    (*ppCtx)->pVaa->sVaaCalcInfo.pSumOfDiff8x8 = static_cast<int32_t (*)[4]>
+        (pMa->WelsMallocz (iCountMaxMbNum * 4 * sizeof (int32_t), "pVaa->sVaaCalcInfo.pSumOfDiff8x8"));
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pSumOfDiff8x8))
+    (*ppCtx)->pVaa->sVaaCalcInfo.pMad8x8 = static_cast<uint8_t (*)[4]>
+                                           (pMa->WelsMallocz (iCountMaxMbNum * 4 * sizeof (uint8_t), "pVaa->sVaaCalcInfo.pMad8x8"));
+    WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pVaa->sVaaCalcInfo.pMad8x8))
+  }
+
+  //End of pVaa memory allocation
+
+  (*ppCtx)->ppRefPicListExt = (SRefList**)pMa->WelsMallocz (kiNumDependencyLayers * sizeof (SRefList*),
+                              "ppRefPicListExt");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->ppRefPicListExt))
+
+  (*ppCtx)->ppDqLayerList = (SDqLayer**)pMa->WelsMallocz (kiNumDependencyLayers * sizeof (SDqLayer*), "ppDqLayerList");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->ppDqLayerList))
+
+  iResult = InitDqLayers (ppCtx, pExistingParasetList);
+  if (iResult) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitDqLayers failed(%d)!", iResult);
+    return iResult;
+  }
+
+  if (InitMbListD (ppCtx)) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_WARNING, "RequestMemorySvc(), InitMbListD failed!");
+    return 1;
+  }
+
+  int32_t iMvdRange = 0;
+  GetMvMvdRange (pParam, (*ppCtx)->iMvRange, iMvdRange);
+  const uint32_t kuiMvdInterTableSize   = (iMvdRange << 2); //intepel*4=qpel
+  const uint32_t kuiMvdInterTableStride =  1 + (kuiMvdInterTableSize << 1);//qpel_mv_range*2=(+/-);
+  const uint32_t kuiMvdCacheAlignedSize = kuiMvdInterTableStride * sizeof (uint16_t);
+
+  (*ppCtx)->iMvdCostTableSize = kuiMvdInterTableSize;
+  (*ppCtx)->iMvdCostTableStride = kuiMvdInterTableStride;
+  (*ppCtx)->pMvdCostTable = (uint16_t*)pMa->WelsMallocz (52 * kuiMvdCacheAlignedSize, "pMvdCostTable");
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pMvdCostTable))
+  MvdCostInit ((*ppCtx)->pMvdCostTable, kuiMvdInterTableStride);  //should put to a better place?
+
+  if ((*ppCtx)->ppRefPicListExt[0] != NULL && (*ppCtx)->ppRefPicListExt[0]->pRef[0] != NULL)
+    (*ppCtx)->pDecPic = (*ppCtx)->ppRefPicListExt[0]->pRef[0];
+  else
+    (*ppCtx)->pDecPic = NULL; // error here
+
+  (*ppCtx)->pSps = & (*ppCtx)->pSpsArray[0];
+  (*ppCtx)->pPps = & (*ppCtx)->pPPSArray[0];
+
+  return 0;
+}
+
+
+/*!
+ * \brief   free memory in SVC core encoder
+ * \pParam  pEncCtx     sWelsEncCtx*
+ * \return  none
+ */
+void FreeMemorySvc (sWelsEncCtx** ppCtx) {
+  if (NULL != *ppCtx) {
+    sWelsEncCtx* pCtx = *ppCtx;
+    CMemoryAlign* pMa = pCtx->pMemAlign;
+    SWelsSvcCodingParam* pParam = pCtx->pSvcParam;
+    int32_t ilayer = 0;
+
+    // SStrideTables
+    if (NULL != pCtx->pStrideTab) {
+      if (NULL != pCtx->pStrideTab->pStrideDecBlockOffset[0][1]) {
+        pMa->WelsFree (pCtx->pStrideTab->pStrideDecBlockOffset[0][1], "pBase");
+        pCtx->pStrideTab->pStrideDecBlockOffset[0][1] = NULL;
+      }
+      pMa->WelsFree (pCtx->pStrideTab, "SStrideTables");
+      pCtx->pStrideTab = NULL;
+    }
+    // pDq idc map
+    if (NULL != pCtx->pDqIdcMap) {
+      pMa->WelsFree (pCtx->pDqIdcMap, "pDqIdcMap");
+      pCtx->pDqIdcMap = NULL;
+    }
+
+    if (NULL != pCtx->pOut) {
+      // bs pBuffer
+      if (NULL != pCtx->pOut->pBsBuffer) {
+        pMa->WelsFree (pCtx->pOut->pBsBuffer, "pOut->pBsBuffer");
+        pCtx->pOut->pBsBuffer = NULL;
+      }
+      // NALs list
+      if (NULL != pCtx->pOut->sNalList) {
+        pMa->WelsFree (pCtx->pOut->sNalList, "pOut->sNalList");
+        pCtx->pOut->sNalList = NULL;
+      }
+      // NALs len
+      if (NULL != pCtx->pOut->pNalLen) {
+        pMa->WelsFree (pCtx->pOut->pNalLen, "pOut->pNalLen");
+        pCtx->pOut->pNalLen = NULL;
+      }
+      pMa->WelsFree (pCtx->pOut, "SWelsEncoderOutput");
+      pCtx->pOut = NULL;
+    }
+
+    if (pParam != NULL && pParam->iMultipleThreadIdc > 1)
+      ReleaseMtResource (ppCtx);
+
+    if (NULL != pCtx->pReferenceStrategy) {
+      WELS_DELETE_OP (pCtx->pReferenceStrategy);
+    }
+
+    // frame bitstream pBuffer
+    if (NULL != pCtx->pFrameBs) {
+      pMa->WelsFree (pCtx->pFrameBs, "pFrameBs");
+      pCtx->pFrameBs = NULL;
+    }
+    for (int32_t iIdx = 0; iIdx < MAX_THREADS_NUM; iIdx++) {
+      pMa->WelsFree (pCtx->pDynamicBsBuffer[iIdx], "DynamicSliceBs");
+      pCtx->pDynamicBsBuffer[iIdx] = NULL;
+
+    }
+    // pSpsArray
+    if (NULL != pCtx->pSpsArray) {
+      pMa->WelsFree (pCtx->pSpsArray, "pSpsArray");
+      pCtx->pSpsArray = NULL;
+    }
+    // pPPSArray
+    if (NULL != pCtx->pPPSArray) {
+      pMa->WelsFree (pCtx->pPPSArray, "pPPSArray");
+      pCtx->pPPSArray = NULL;
+    }
+    // subset_sps_array
+    if (NULL != pCtx->pSubsetArray) {
+      pMa->WelsFree (pCtx->pSubsetArray, "pSubsetArray");
+      pCtx->pSubsetArray = NULL;
+    }
+
+    if (NULL != pCtx->pIntra4x4PredModeBlocks) {
+      pMa->WelsFree (pCtx->pIntra4x4PredModeBlocks, "pIntra4x4PredModeBlocks");
+      pCtx->pIntra4x4PredModeBlocks = NULL;
+    }
+
+    if (NULL != pCtx->pNonZeroCountBlocks) {
+      pMa->WelsFree (pCtx->pNonZeroCountBlocks, "pNonZeroCountBlocks");
+      pCtx->pNonZeroCountBlocks = NULL;
+    }
+
+    if (NULL != pCtx->pMvUnitBlock4x4) {
+      pMa->WelsFree (pCtx->pMvUnitBlock4x4, "pMvUnitBlock4x4");
+      pCtx->pMvUnitBlock4x4 = NULL;
+    }
+
+    if (NULL != pCtx->pRefIndexBlock4x4) {
+      pMa->WelsFree (pCtx->pRefIndexBlock4x4, "pRefIndexBlock4x4");
+      pCtx->pRefIndexBlock4x4 = NULL;
+    }
+
+    if (NULL != pCtx->ppMbListD) {
+      if (NULL != pCtx->ppMbListD[0]) {
+        pMa->WelsFree (pCtx->ppMbListD[0], "ppMbListD[0]");
+        (*ppCtx)->ppMbListD[0] = NULL;
+      }
+      pMa->WelsFree (pCtx->ppMbListD, "ppMbListD");
+      pCtx->ppMbListD = NULL;
+    }
+
+    if (NULL != pCtx->pSadCostMb) {
+      pMa->WelsFree (pCtx->pSadCostMb, "pSadCostMb");
+      pCtx->pSadCostMb = NULL;
+    }
+
+    // SLTRState
+    if (NULL != pCtx->pLtr) {
+      pMa->WelsFree (pCtx->pLtr, "SLTRState");
+      pCtx->pLtr = NULL;
+    }
+
+    // pDq layers list
+    ilayer = 0;
+    if (NULL != pCtx->ppDqLayerList && pParam != NULL) {
+      while (ilayer < pParam->iSpatialLayerNum) {
+        SDqLayer* pDq = pCtx->ppDqLayerList[ilayer];
+        // pDq layers
+        if (NULL != pDq) {
+          FreeDqLayer (pDq, pMa);
+          pCtx->ppDqLayerList[ilayer] = NULL;
+        }
+        ++ ilayer;
+      }
+      pMa->WelsFree (pCtx->ppDqLayerList, "ppDqLayerList");
+      pCtx->ppDqLayerList = NULL;
+    }
+    // reference picture list extension
+    if (NULL != pCtx->ppRefPicListExt && pParam != NULL) {
+      ilayer = 0;
+      while (ilayer < pParam->iSpatialLayerNum) {
+        FreeRefList (pCtx->ppRefPicListExt[ilayer], pMa, pParam->iMaxNumRefFrame);
+        pCtx->ppRefPicListExt[ilayer] = NULL;
+        ++ ilayer;
+      }
+
+      pMa->WelsFree (pCtx->ppRefPicListExt, "ppRefPicListExt");
+      pCtx->ppRefPicListExt = NULL;
+    }
+
+    // VAA
+    if (NULL != pCtx->pVaa) {
+      if (pCtx->pSvcParam->bEnableAdaptiveQuant) { //free mem
+        pMa->WelsFree (pCtx->pVaa->sAdaptiveQuantParam.pMotionTextureUnit, "pVaa->sAdaptiveQuantParam.pMotionTextureUnit");
+        pCtx->pVaa->sAdaptiveQuantParam.pMotionTextureUnit = NULL;
+        pMa->WelsFree (pCtx->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp,
+                       "pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp");
+        pCtx->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp = NULL;
+      }
+
+      pMa->WelsFree (pCtx->pVaa->pVaaBackgroundMbFlag, "pVaa->pVaaBackgroundMbFlag");
+      pCtx->pVaa->pVaaBackgroundMbFlag = NULL;
+      pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pSad8x8, "pVaa->sVaaCalcInfo.sad8x8");
+      pCtx->pVaa->sVaaCalcInfo.pSad8x8 = NULL;
+      pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pSsd16x16, "pVaa->sVaaCalcInfo.pSsd16x16");
+      pCtx->pVaa->sVaaCalcInfo.pSsd16x16 = NULL;
+      pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pSum16x16, "pVaa->sVaaCalcInfo.pSum16x16");
+      pCtx->pVaa->sVaaCalcInfo.pSum16x16 = NULL;
+      pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pSumOfSquare16x16, "pVaa->sVaaCalcInfo.pSumOfSquare16x16");
+      pCtx->pVaa->sVaaCalcInfo.pSumOfSquare16x16 = NULL;
+
+      if (pCtx->pSvcParam->bEnableBackgroundDetection) { //BGD control
+        pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pSumOfDiff8x8, "pVaa->sVaaCalcInfo.pSumOfDiff8x8");
+        pCtx->pVaa->sVaaCalcInfo.pSumOfDiff8x8 = NULL;
+        pMa->WelsFree (pCtx->pVaa->sVaaCalcInfo.pMad8x8, "pVaa->sVaaCalcInfo.pMad8x8");
+        pCtx->pVaa->sVaaCalcInfo.pMad8x8 = NULL;
+      }
+      if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
+        ReleaseMemoryVaaScreen (pCtx->pVaa, pMa, pCtx->pSvcParam->iMaxNumRefFrame);
+      pMa->WelsFree (pCtx->pVaa, "pVaa");
+      pCtx->pVaa = NULL;
+    }
+
+    // rate control module memory free
+    if (NULL != pCtx->pWelsSvcRc) {
+      WelsRcFreeMemory (pCtx);
+      pMa->WelsFree (pCtx->pWelsSvcRc, "pWelsSvcRc");
+      pCtx->pWelsSvcRc = NULL;
+    }
+
+    /* MVD cost tables for Inter */
+    if (NULL != pCtx->pMvdCostTable) {
+      pMa->WelsFree (pCtx->pMvdCostTable, "pMvdCostTable");
+      pCtx->pMvdCostTable = NULL;
+    }
+
+    FreeCodingParam (&pCtx->pSvcParam, pMa);
+    if (NULL != pCtx->pFuncList) {
+      if (NULL != pCtx->pFuncList->pParametersetStrategy) {
+        WELS_DELETE_OP (pCtx->pFuncList->pParametersetStrategy);
+      }
+
+      pMa->WelsFree (pCtx->pFuncList, "SWelsFuncPtrList");
+      pCtx->pFuncList = NULL;
+    }
+
+#if defined(MEMORY_MONITOR)
+    assert (pMa->WelsGetMemoryUsage() == 0); // ensure all memory free well
+#endif//MEMORY_MONITOR
+
+    if ((*ppCtx)->pMemAlign != NULL) {
+      WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO, "FreeMemorySvc(), verify memory usage (%d bytes) after free..",
+               (*ppCtx)->pMemAlign->WelsGetMemoryUsage());
+      WELS_DELETE_OP ((*ppCtx)->pMemAlign);
+    }
+
+    free (*ppCtx);
+    *ppCtx = NULL;
+  }
+}
+
+int32_t InitSliceSettings (SLogContext* pLogCtx,     SWelsSvcCodingParam* pCodingParam,
+                           const int32_t kiCpuCores, int16_t* pMaxSliceCount) {
+  int32_t iSpatialIdx = 0, iSpatialNum = pCodingParam->iSpatialLayerNum;
+  uint16_t iMaxSliceCount = 0;
+
+  do {
+    SSpatialLayerConfig* pDlp           = &pCodingParam->sSpatialLayers[iSpatialIdx];
+    SSliceArgument* pSliceArgument      = &pDlp->sSliceArgument;
+    int32_t iReturn                     = 0;
+
+    switch (pSliceArgument->uiSliceMode) {
+    case SM_SIZELIMITED_SLICE:
+      iMaxSliceCount = AVERSLICENUM_CONSTRAINT;
+      break; // go through for SM_SIZELIMITED_SLICE?
+    case SM_FIXEDSLCNUM_SLICE: {
+      iReturn = SliceArgumentValidationFixedSliceMode (pLogCtx, &pDlp->sSliceArgument, pCodingParam->iRCMode,
+                pDlp->iVideoWidth, pDlp->iVideoHeight);
+      if (iReturn)
+        return ENC_RETURN_UNSUPPORTED_PARA;
+
+      if (pSliceArgument->uiSliceNum > iMaxSliceCount) {
+        iMaxSliceCount = pSliceArgument->uiSliceNum;
+      }
+    }
+    break;
+    case SM_SINGLE_SLICE:
+      if (pSliceArgument->uiSliceNum > iMaxSliceCount)
+        iMaxSliceCount = pSliceArgument->uiSliceNum;
+      break;
+    case SM_RASTER_SLICE:
+      if (pSliceArgument->uiSliceNum > iMaxSliceCount)
+        iMaxSliceCount = pSliceArgument->uiSliceNum;
+      break;
+    default:
+      break;
+    }
+
+    ++ iSpatialIdx;
+  } while (iSpatialIdx < iSpatialNum);
+
+  pCodingParam->iMultipleThreadIdc = WELS_MIN (kiCpuCores, iMaxSliceCount);
+  if (pCodingParam->iLoopFilterDisableIdc == 0
+      && pCodingParam->iMultipleThreadIdc != 1) // Loop filter requested to be enabled, with threading enabled
+    pCodingParam->iLoopFilterDisableIdc =
+      2; // Disable loop filter on slice boundaries since that's not allowed with multithreading
+  *pMaxSliceCount = iMaxSliceCount;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+/*!
+ * \brief   log output for cpu features/capabilities
+ */
+void OutputCpuFeaturesLog (SLogContext* pLogCtx, uint32_t uiCpuFeatureFlags, uint32_t uiCpuCores,
+                           int32_t iCacheLineSize) {
+  // welstracer output
+  WelsLog (pLogCtx, WELS_LOG_INFO, "WELS CPU features/capacities (0x%x) detected: \t"
+           "HTT:      %c, "
+           "MMX:      %c, "
+           "MMXEX:    %c, "
+           "SSE:      %c, "
+           "SSE2:     %c, "
+           "SSE3:     %c, "
+           "SSSE3:    %c, "
+           "SSE4.1:   %c, "
+           "SSE4.2:   %c, "
+           "AVX:      %c, "
+           "FMA:      %c, "
+           "X87-FPU:  %c, "
+           "3DNOW:    %c, "
+           "3DNOWEX:  %c, "
+           "ALTIVEC:  %c, "
+           "CMOV:     %c, "
+           "MOVBE:    %c, "
+           "AES:      %c, "
+           "NUMBER OF LOGIC PROCESSORS ON CHIP: %d, "
+           "CPU CACHE LINE SIZE (BYTES):        %d",
+           uiCpuFeatureFlags,
+           (uiCpuFeatureFlags & WELS_CPU_HTT) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_MMX) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_MMXEXT) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSE) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSE2) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSE3) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSSE3) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSE41) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_SSE42) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_AVX) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_FMA) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_FPU) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_3DNOW) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_3DNOWEXT) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_ALTIVEC) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_CMOV) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_MOVBE) ? 'Y' : 'N',
+           (uiCpuFeatureFlags & WELS_CPU_AES) ? 'Y' : 'N',
+           uiCpuCores,
+           iCacheLineSize);
+}
+/*
+ *
+ * status information output
+ */
+#if defined(STAT_OUTPUT)
+void StatOverallEncodingExt (sWelsEncCtx* pCtx) {
+  int8_t i = 0;
+  int8_t j = 0;
+  for (i = 0; i < pCtx->pSvcParam->iSpatialLayerNum; i++) {
+    fprintf (stdout, "\nDependency layer : %d\n", i);
+    fprintf (stdout, "Quality layer : %d\n", j);
+    {
+      const int32_t iCount = pCtx->sStatData[i][j].sSliceData.iSliceCount[I_SLICE] +
+                             pCtx->sStatData[i][j].sSliceData.iSliceCount[P_SLICE] +
+                             pCtx->sStatData[i][j].sSliceData.iSliceCount[B_SLICE];
+#if defined(MB_TYPES_CHECK)
+      if (iCount > 0) {
+        int32_t iCountNumIMb = pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][Intra4x4] +
+                               pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][Intra16x16] + pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][7];
+        int32_t iCountNumPMb =  pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Intra4x4] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Intra16x16] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][7] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x16] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x8] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x16] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x8] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][10] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][PSkip];
+        int32_t count_p_mbL0 =  pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x16] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x8] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x16] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x8] +
+                                pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][10];
+
+        int32_t iMbCount = iCountNumIMb + iCountNumPMb;
+        if (iMbCount > 0) {
+          fprintf (stderr,
+                   "SVC: overall Slices MBs: %d Avg\nI4x4: %.3f%% I16x16: %.3f%% IBL: %.3f%%\nP16x16: %.3f%% P16x8: %.3f%% P8x16: %.3f%% P8x8: %.3f%% SUBP8x8: %.3f%% PSKIP: %.3f%%\nILP(All): %.3f%% ILP(PL0): %.3f%% BLSKIP(PL0): %.3f%% RP(PL0): %.3f%%\n",
+                   iMbCount,
+                   (100.0f * (pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][Intra4x4] +
+                              pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Intra4x4]) / iMbCount),
+                   (100.0f * (pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][Intra16x16] +
+                              pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Intra16x16]) / iMbCount),
+                   (100.0f * (pCtx->sStatData[i][j].sSliceData.iMbCount[I_SLICE][7] +
+                              pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][7]) / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x16] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter16x8] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x16] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][Inter8x8] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][10] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][PSkip] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][11] / iMbCount),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][11] / count_p_mbL0),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][8] / count_p_mbL0),
+                   (100.0f * pCtx->sStatData[i][j].sSliceData.iMbCount[P_SLICE][9] / count_p_mbL0)
+                  );
+        }
+      }
+#endif //#if defined(MB_TYPES_CHECK)
+
+      if (iCount > 0) {
+        fprintf (stdout, "SVC: overall PSNR Y: %2.3f U: %2.3f V: %2.3f kb/s: %.1f fps: %.3f\n\n",
+                 (pCtx->sStatData[i][j].sQualityStat.rYPsnr[I_SLICE] + pCtx->sStatData[i][j].sQualityStat.rYPsnr[P_SLICE] +
+                  pCtx->sStatData[i][j].sQualityStat.rYPsnr[B_SLICE]) / (float) (iCount),
+                 (pCtx->sStatData[i][j].sQualityStat.rUPsnr[I_SLICE] + pCtx->sStatData[i][j].sQualityStat.rUPsnr[P_SLICE] +
+                  pCtx->sStatData[i][j].sQualityStat.rUPsnr[B_SLICE]) / (float) (iCount),
+                 (pCtx->sStatData[i][j].sQualityStat.rVPsnr[I_SLICE] + pCtx->sStatData[i][j].sQualityStat.rVPsnr[P_SLICE] +
+                  pCtx->sStatData[i][j].sQualityStat.rVPsnr[B_SLICE]) / (float) (iCount),
+                 1.0f * pCtx->pSvcParam->sDependencyLayers[i].fOutputFrameRate * (pCtx->sStatData[i][j].sSliceData.iSliceSize[I_SLICE] +
+                     pCtx->sStatData[i][j].sSliceData.iSliceSize[P_SLICE] + pCtx->sStatData[i][j].sSliceData.iSliceSize[B_SLICE]) / (float) (
+                   iCount + pCtx->pWelsSvcRc[i].iSkipFrameNum) / 1000,
+                 1.0f * pCtx->pSvcParam->sDependencyLayers[i].fOutputFrameRate);
+
+      }
+
+    }
+
+  }
+}
+#endif
+
+
+int32_t GetMultipleThreadIdc (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingParam, int16_t& iSliceNum,
+                              int32_t& iCacheLineSize, uint32_t& uiCpuFeatureFlags) {
+  // for cpu features detection, Only detect once??
+  int32_t uiCpuCores =
+    0; // number of logic processors on physical processor package, zero logic processors means HTT not supported
+  uiCpuFeatureFlags = WelsCPUFeatureDetect (&uiCpuCores); // detect cpu capacity features
+
+#ifdef X86_ASM
+  if (uiCpuFeatureFlags & WELS_CPU_CACHELINE_128)
+    iCacheLineSize = 128;
+  else if (uiCpuFeatureFlags & WELS_CPU_CACHELINE_64)
+    iCacheLineSize = 64;
+  else if (uiCpuFeatureFlags & WELS_CPU_CACHELINE_32)
+    iCacheLineSize = 32;
+  else if (uiCpuFeatureFlags & WELS_CPU_CACHELINE_16)
+    iCacheLineSize = 16;
+  OutputCpuFeaturesLog (pLogCtx, uiCpuFeatureFlags, uiCpuCores, iCacheLineSize);
+#else
+  iCacheLineSize = 16; // 16 bytes aligned in default
+#endif//X86_ASM
+
+  if (0 == pCodingParam->iMultipleThreadIdc && uiCpuCores == 0) {
+    // cpuid not supported or doesn't expose the number of cores,
+    // use high level system API as followed to detect number of pysical/logic processor
+    uiCpuCores = DynamicDetectCpuCores();
+  }
+
+  if (0 == pCodingParam->iMultipleThreadIdc)
+    pCodingParam->iMultipleThreadIdc = (uiCpuCores > 0) ? uiCpuCores : 1;
+
+  // So far so many cpu cores up to MAX_THREADS_NUM mean for server platforms,
+  // for client application here it is constrained by maximal to MAX_THREADS_NUM
+  pCodingParam->iMultipleThreadIdc = WELS_CLIP3 (pCodingParam->iMultipleThreadIdc, 1, MAX_THREADS_NUM);
+  uiCpuCores = pCodingParam->iMultipleThreadIdc;
+
+  if (InitSliceSettings (pLogCtx, pCodingParam, uiCpuCores, &iSliceNum)) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "GetMultipleThreadIdc(), InitSliceSettings failed.");
+    return 1;
+  }
+  return 0;
+}
+
+/*!
+ * \brief   uninitialize Wels encoder core library
+ * \pParam  pEncCtx     sWelsEncCtx*
+ * \return  none
+ */
+void WelsUninitEncoderExt (sWelsEncCtx** ppCtx) {
+  if (NULL == ppCtx || NULL == *ppCtx)
+    return;
+
+  WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+           "WelsUninitEncoderExt(), pCtx= %p, iMultipleThreadIdc= %d.",
+           (void*) (*ppCtx), (*ppCtx)->pSvcParam->iMultipleThreadIdc);
+
+#if defined(STAT_OUTPUT)
+  StatOverallEncodingExt (*ppCtx);
+#endif
+
+  if ((*ppCtx)->pSvcParam->iMultipleThreadIdc > 1 && (*ppCtx)->pSliceThreading != NULL) {
+    const int32_t iThreadCount = (*ppCtx)->pSvcParam->iMultipleThreadIdc;
+    int32_t iThreadIdx = 0;
+
+    while (iThreadIdx < iThreadCount) {
+      int res = 0;
+      if ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx]) {
+
+        res = WelsThreadJoin ((*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx]); // waiting thread exit
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO, "WelsUninitEncoderExt(), pthread_join(pThreadHandles%d) return %d..",
+                 iThreadIdx,
+                 res);
+        (*ppCtx)->pSliceThreading->pThreadHandles[iThreadIdx] = 0;
+      }
+      ++ iThreadIdx;
+    }
+  }
+
+  if ((*ppCtx)->pVpp) {
+    (*ppCtx)->pVpp->FreeSpatialPictures (*ppCtx);
+    WELS_DELETE_OP ((*ppCtx)->pVpp);
+  }
+  FreeMemorySvc (ppCtx);
+  *ppCtx = NULL;
+}
+
+/*!
+ * \brief   initialize Wels avc encoder core library
+ * \pParam  ppCtx       sWelsEncCtx**
+ * \pParam  pParam      SWelsSvcCodingParam*
+ * \return  successful - 0; otherwise none 0 for failed
+ */
+int32_t WelsInitEncoderExt (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx,
+                            SExistingParasetList* pExistingParasetList) {
+  sWelsEncCtx* pCtx      = NULL;
+  int32_t iRet           = 0;
+  int16_t iSliceNum      = 1;    // number of slices used
+  int32_t iCacheLineSize = 16;   // on chip cache line size in byte
+  uint32_t uiCpuFeatureFlags = 0;
+  if (NULL == ppCtx || NULL == pCodingParam) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), NULL == ppCtx(0x%p) or NULL == pCodingParam(0x%p).",
+             (void*)ppCtx, (void*)pCodingParam);
+    return 1;
+  }
+
+  iRet = ParamValidationExt (pLogCtx, pCodingParam);
+  if (iRet != 0) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), ParamValidationExt failed return %d.", iRet);
+    return iRet;
+  }
+  iRet = pCodingParam->DetermineTemporalSettings();
+  if (iRet != ENC_RETURN_SUCCESS) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR,
+             "WelsInitEncoderExt(), DetermineTemporalSettings failed return %d (check in/out frame rate and temporal layer setting! -- in/out = 2^x, x <= temppral_layer_num)",
+             iRet);
+    return iRet;
+  }
+  iRet = GetMultipleThreadIdc (pLogCtx, pCodingParam, iSliceNum, iCacheLineSize, uiCpuFeatureFlags);
+  if (iRet != 0) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), GetMultipleThreadIdc failed return %d.", iRet);
+    return iRet;
+  }
+
+
+  *ppCtx = NULL;
+
+  pCtx = static_cast<sWelsEncCtx*> (malloc (sizeof (sWelsEncCtx)));
+
+  WELS_VERIFY_RETURN_IF (1, (NULL == pCtx))
+  memset (pCtx, 0, sizeof (sWelsEncCtx));
+
+  pCtx->sLogCtx = *pLogCtx;
+
+  pCtx->pMemAlign = new CMemoryAlign (iCacheLineSize);
+  WELS_VERIFY_RETURN_PROC_IF (1, (NULL == pCtx->pMemAlign), WelsUninitEncoderExt (&pCtx))
+
+  iRet = AllocCodingParam (&pCtx->pSvcParam, pCtx->pMemAlign);
+  if (iRet != 0) {
+    WelsUninitEncoderExt (&pCtx);
+    return iRet;
+  }
+  memcpy (pCtx->pSvcParam, pCodingParam, sizeof (SWelsSvcCodingParam)); // confirmed_safe_unsafe_usage
+
+  pCtx->pFuncList = (SWelsFuncPtrList*)pCtx->pMemAlign->WelsMallocz (sizeof (SWelsFuncPtrList), "SWelsFuncPtrList");
+  if (NULL == pCtx->pFuncList) {
+    WelsUninitEncoderExt (&pCtx);
+    return 1;
+  }
+  InitFunctionPointers (pCtx, pCtx->pSvcParam, uiCpuFeatureFlags);
+
+  pCtx->iActiveThreadsNum = pCodingParam->iMultipleThreadIdc;
+  pCtx->iMaxSliceCount = iSliceNum;
+  iRet = RequestMemorySvc (&pCtx, pExistingParasetList);
+  if (iRet != 0) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), RequestMemorySvc failed return %d.", iRet);
+    WelsUninitEncoderExt (&pCtx);
+    return iRet;
+  }
+
+  if (pCodingParam->iEntropyCodingModeFlag)
+    WelsCabacInit (pCtx);
+  WelsRcInitModule (pCtx,  pCtx->pSvcParam->iRCMode);
+
+  pCtx->pVpp = CWelsPreProcess::CreatePreProcess (pCtx);
+  if (pCtx->pVpp == NULL) {
+    iRet = 1;
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), pOut of memory in case new CWelsPreProcess().");
+    WelsUninitEncoderExt (&pCtx);
+    return iRet;
+  }
+  if ((iRet = pCtx->pVpp->AllocSpatialPictures (pCtx, pCtx->pSvcParam)) != 0) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsInitEncoderExt(), pVPP alloc spatial pictures failed");
+    WelsUninitEncoderExt (&pCtx);
+    return iRet;
+  }
+
+#if defined(MEMORY_MONITOR)
+  WelsLog (pLogCtx, WELS_LOG_INFO, "WelsInitEncoderExt() exit, overall memory usage: %llu bytes",
+           static_cast<unsigned long long> (sizeof (sWelsEncCtx) /* requested size from malloc() or new operator */
+               + pCtx->pMemAlign->WelsGetMemoryUsage())  /* requested size from CMemoryAlign::WelsMalloc() */
+          );
+#endif//MEMORY_MONITOR
+
+  pCtx->iStatisticsLogInterval = STATISTICS_LOG_INTERVAL_MS;
+  pCtx->uiLastTimestamp = -1;
+  pCtx->bDeliveryFlag = true;
+  *ppCtx = pCtx;
+
+  WelsLog (pLogCtx, WELS_LOG_INFO, "WelsInitEncoderExt(), pCtx= 0x%p.", (void*)pCtx);
+
+  return 0;
+}
+/*!
+ * \brief   get temporal level due to configuration and coding context
+ */
+int32_t GetTemporalLevel (SSpatialLayerInternal* fDlp, const int32_t kiFrameNum, const int32_t kiGopSize) {
+  const int32_t kiCodingIdx = kiFrameNum & (kiGopSize - 1);
+
+  return fDlp->uiCodingIdx2TemporalId[kiCodingIdx];
+}
+
+void DynslcUpdateMbNeighbourInfoListForAllSlices (SDqLayer* pCurDq, SMB* pMbList) {
+  SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
+  const int32_t kiMbWidth       = pSliceCtx->iMbWidth;
+  const int32_t kiEndMbInSlice  = pSliceCtx->iMbNumInFrame - 1;
+  int32_t  iIdx                 = 0;
+
+  do {
+    SMB* pMb = &pMbList[iIdx];
+    UpdateMbNeighbor (pCurDq, pMb, kiMbWidth, WelsMbToSliceIdc (pCurDq, pMb->iMbXY));
+    ++ iIdx;
+  } while (iIdx <= kiEndMbInSlice);
+}
+
+/*
+ * TUNE back if number of picture partition decision algorithm based on past if available
+ */
+int32_t PicPartitionNumDecision (sWelsEncCtx* pCtx) {
+  int32_t iPartitionNum = 1;
+  if (pCtx->pSvcParam->iMultipleThreadIdc > 1) {
+    iPartitionNum = pCtx->pSvcParam->iMultipleThreadIdc;
+  }
+  return iPartitionNum;
+}
+
+void WelsInitCurrentQBLayerMltslc (sWelsEncCtx* pCtx) {
+  //pData init
+  SDqLayer*  pCurDq    = pCtx->pCurDqLayer;
+  //mb_neighbor
+  DynslcUpdateMbNeighbourInfoListForAllSlices (pCurDq, pCurDq->sMbDataP);
+}
+
+void UpdateSlicepEncCtxWithPartition (SDqLayer* pCurDq, int32_t iPartitionNum) {
+  SSliceCtx* pSliceCtx                  = &pCurDq->sSliceEncCtx;
+  const int32_t kiMbNumInFrame          = pSliceCtx->iMbNumInFrame;
+  int32_t iCountMbNumPerPartition       = kiMbNumInFrame;
+  int32_t iAssignableMbLeft             = kiMbNumInFrame;
+  int32_t iCountMbNumInPartition        = 0;
+  int32_t iFirstMbIdx                   = 0;
+  int32_t i/*, j*/;
+
+  if (iPartitionNum <= 0)
+    iPartitionNum = 1;
+  else if (iPartitionNum > AVERSLICENUM_CONSTRAINT)
+    iPartitionNum = AVERSLICENUM_CONSTRAINT; // AVERSLICENUM_CONSTRAINT might be variable, however not fixed by MACRO
+  iCountMbNumPerPartition /= iPartitionNum;
+  if (iCountMbNumPerPartition == 0 || iCountMbNumPerPartition == 1) {
+    iCountMbNumPerPartition = kiMbNumInFrame;
+    iPartitionNum           = 1;
+  }
+
+  pSliceCtx->iSliceNumInFrame = iPartitionNum;
+
+  i = 0;
+  while (i < iPartitionNum) {
+    if (i + 1 == iPartitionNum) {
+      iCountMbNumInPartition = iAssignableMbLeft;
+    } else {
+      iCountMbNumInPartition = iCountMbNumPerPartition;
+    }
+
+    pCurDq->FirstMbIdxOfPartition[i]     = iFirstMbIdx;
+    pCurDq->EndMbIdxOfPartition[i]       = iFirstMbIdx + iCountMbNumInPartition - 1;
+    pCurDq->LastCodedMbIdxOfPartition[i] = 0;
+    pCurDq->NumSliceCodedOfPartition[i]  = 0;
+
+    WelsSetMemMultiplebytes_c (pSliceCtx->pOverallMbMap + iFirstMbIdx, i,
+                               iCountMbNumInPartition, sizeof (uint16_t));
+
+    // for next partition(or pSlice)
+    iFirstMbIdx       += iCountMbNumInPartition;
+    iAssignableMbLeft -= iCountMbNumInPartition;
+    ++ i;
+  }
+
+  while (i < MAX_THREADS_NUM) {
+    pCurDq->FirstMbIdxOfPartition[i]     = 0;
+    pCurDq->EndMbIdxOfPartition[i]       = 0;
+    pCurDq->LastCodedMbIdxOfPartition[i] = 0;
+    pCurDq->NumSliceCodedOfPartition[i]  = 0;
+    ++ i;
+  }
+}
+
+void WelsInitCurrentDlayerMltslc (sWelsEncCtx* pCtx, int32_t iPartitionNum) {
+  SDqLayer* pCurDq      = pCtx->pCurDqLayer;
+  SSliceCtx* pSliceCtx  = &pCurDq->sSliceEncCtx;
+  uint32_t  uiMiniPacketSize  = 0;
+
+  UpdateSlicepEncCtxWithPartition (pCurDq, iPartitionNum);
+
+  if (I_SLICE == pCtx->eSliceType) { //check if uiSliceSizeConstraint too small
+#define byte_complexIMBat26 (60)
+    uint8_t iCurDid    = pCtx->uiDependencyId;
+    uint32_t uiFrmByte = 0;
+
+    if (pCtx->pSvcParam->iRCMode != RC_OFF_MODE) {
+      //RC case
+      uiFrmByte = (
+                    ((uint32_t) (pCtx->pSvcParam->sSpatialLayers[iCurDid].iSpatialBitrate)
+                     / (uint32_t) (pCtx->pSvcParam->sDependencyLayers[iCurDid].fInputFrameRate)) >> 3);
+    } else {
+      //fixed QP case
+      const int32_t iTtlMbNumInFrame = pSliceCtx->iMbNumInFrame;
+      int32_t iQDeltaTo26 = (26 - pCtx->pSvcParam->sSpatialLayers[iCurDid].iDLayerQp);
+
+      uiFrmByte = (iTtlMbNumInFrame * byte_complexIMBat26);
+      if (iQDeltaTo26 > 0) {
+        //smaller QP than 26
+        uiFrmByte = (uint32_t) (uiFrmByte * ((float)iQDeltaTo26 / 4));
+      } else if (iQDeltaTo26 < 0) {
+        //larger QP than 26
+        iQDeltaTo26 = ((-iQDeltaTo26) >> 2);   //delta mod 4
+        uiFrmByte = (uiFrmByte >> (iQDeltaTo26));   //if delta 4, byte /2
+      }
+    }
+
+    //MINPACKETSIZE_CONSTRAINT
+    //suppose 16 byte per mb at average
+    uiMiniPacketSize = (uint32_t) (uiFrmByte / pSliceCtx->iMaxSliceNumConstraint);
+    if (pSliceCtx->uiSliceSizeConstraint < uiMiniPacketSize) {
+      WelsLog (& (pCtx->sLogCtx),
+               WELS_LOG_WARNING,
+               "Set-SliceConstraint(%d) too small for current resolution (MB# %d) under QP/BR!",
+               pSliceCtx->uiSliceSizeConstraint,
+               pSliceCtx->iMbNumInFrame
+              );
+    }
+  }
+
+  WelsInitCurrentQBLayerMltslc (pCtx);
+}
+
+/*!
+ * \brief   initialize current layer
+ */
+void WelsInitCurrentLayer (sWelsEncCtx* pCtx,
+                           const int32_t kiWidth,
+                           const int32_t kiHeight) {
+  SWelsSvcCodingParam* pParam   = pCtx->pSvcParam;
+  SPicture* pEncPic             = pCtx->pEncPic;
+  SPicture* pDecPic             = pCtx->pDecPic;
+  SDqLayer* pCurDq              = pCtx->pCurDqLayer;
+  SSlice*   pBaseSlice          = pCurDq->ppSliceInLayer[0];
+  const uint8_t kiCurDid        = pCtx->uiDependencyId;
+  const bool kbUseSubsetSpsFlag = (!pParam->bSimulcastAVC) && (kiCurDid > BASE_DEPENDENCY_ID);
+  SNalUnitHeaderExt* pNalHdExt  = &pCurDq->sLayerInfo.sNalHeaderExt;
+  SNalUnitHeader* pNalHd        = &pNalHdExt->sNalUnitHeader;
+  SDqIdc* pDqIdc                = &pCtx->pDqIdcMap[kiCurDid];
+  int32_t iIdx                  = 0;
+  int32_t iSliceCount           = pCurDq->iMaxSliceNum;
+  SSpatialLayerInternal* pParamInternal = &pParam->sDependencyLayers[kiCurDid];
+  if (NULL == pCurDq || NULL == pBaseSlice)
+    return;
+
+  pCurDq->pDecPic = pDecPic;
+
+  assert (iSliceCount > 0);
+
+  int32_t iCurPpsId = pDqIdc->iPpsId;
+  int32_t iCurSpsId = pDqIdc->iSpsId;
+
+  iCurPpsId = pCtx->pFuncList->pParametersetStrategy->GetCurrentPpsId (iCurPpsId,
+              WELS_ABS (pParamInternal->uiIdrPicId - 1) % MAX_PPS_COUNT);
+
+  pBaseSlice->sSliceHeaderExt.sSliceHeader.iPpsId       = iCurPpsId;
+  pCurDq->sLayerInfo.pPpsP                              =
+    pBaseSlice->sSliceHeaderExt.sSliceHeader.pPps       = &pCtx->pPPSArray[iCurPpsId];
+
+  pBaseSlice->sSliceHeaderExt.sSliceHeader.iSpsId       = iCurSpsId;
+  if (kbUseSubsetSpsFlag) {
+    pCurDq->sLayerInfo.pSubsetSpsP                      = &pCtx->pSubsetArray[iCurSpsId];
+    pCurDq->sLayerInfo.pSpsP                            =
+      pBaseSlice->sSliceHeaderExt.sSliceHeader.pSps     = &pCurDq->sLayerInfo.pSubsetSpsP->pSps;
+  } else {
+    pCurDq->sLayerInfo.pSubsetSpsP                      = NULL;
+    pCurDq->sLayerInfo.pSpsP                            =
+      pBaseSlice->sSliceHeaderExt.sSliceHeader.pSps     = &pCtx->pSpsArray[iCurSpsId];
+  }
+
+  pBaseSlice->bSliceHeaderExtFlag = (NAL_UNIT_CODED_SLICE_EXT == pCtx->eNalType);
+
+  iIdx = 1;
+  while (iIdx < iSliceCount) {
+    InitSliceHeadWithBase (pCurDq->ppSliceInLayer[iIdx], pBaseSlice);
+    ++ iIdx;
+  }
+
+  memset (pNalHdExt, 0, sizeof (SNalUnitHeaderExt));
+  pNalHd->uiNalRefIdc                   = pCtx->eNalPriority;
+  pNalHd->eNalUnitType                  = pCtx->eNalType;
+
+  pNalHdExt->uiDependencyId             = kiCurDid;
+  pNalHdExt->bDiscardableFlag           = (pCtx->bNeedPrefixNalFlag) ? (pNalHd->uiNalRefIdc == NRI_PRI_LOWEST) : false;
+  pNalHdExt->bIdrFlag                   = (pParamInternal->iFrameNum == 0)
+                                          && ((pCtx->eNalType == NAL_UNIT_CODED_SLICE_IDR)
+                                              || (pCtx->eSliceType == I_SLICE));
+  pNalHdExt->uiTemporalId               = pCtx->uiTemporalId;
+
+  // pEncPic pData
+  pCurDq->pEncData[0]   = pEncPic->pData[0];
+  pCurDq->pEncData[1]   = pEncPic->pData[1];
+  pCurDq->pEncData[2]   = pEncPic->pData[2];
+  pCurDq->iEncStride[0] = pEncPic->iLineSize[0];
+  pCurDq->iEncStride[1] = pEncPic->iLineSize[1];
+  pCurDq->iEncStride[2] = pEncPic->iLineSize[2];
+  // cs pData
+  pCurDq->pCsData[0]    = pDecPic->pData[0];
+  pCurDq->pCsData[1]    = pDecPic->pData[1];
+  pCurDq->pCsData[2]    = pDecPic->pData[2];
+  pCurDq->iCsStride[0]  = pDecPic->iLineSize[0];
+  pCurDq->iCsStride[1]  = pDecPic->iLineSize[1];
+  pCurDq->iCsStride[2]  = pDecPic->iLineSize[2];
+
+  if (pCurDq->pRefLayer != NULL) {
+    pCurDq->bBaseLayerAvailableFlag = true;
+  } else {
+    pCurDq->bBaseLayerAvailableFlag = false;
+  }
+
+  if (pCtx->pTaskManage) {
+    pCtx->pTaskManage->InitFrame (kiCurDid);
+  }
+}
+
+static inline void SetFastCodingFunc (SWelsFuncPtrList* pFuncList) {
+  pFuncList->pfIntraFineMd = WelsMdIntraFinePartitionVaa;
+  pFuncList->sSampleDealingFuncs.pfMdCost = pFuncList->sSampleDealingFuncs.pfSampleSad;
+  pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3 = pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Sad;
+  pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3 = pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Sad;
+}
+static inline void SetNormalCodingFunc (SWelsFuncPtrList* pFuncList) {
+  pFuncList->pfIntraFineMd = WelsMdIntraFinePartition;
+  pFuncList->sSampleDealingFuncs.pfMdCost = pFuncList->sSampleDealingFuncs.pfSampleSatd;
+  pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3 =
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Satd;
+  pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3 =
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Satd;
+  pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3 =
+    pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd;
+}
+bool SetMeMethod (const uint8_t uiMethod, PSearchMethodFunc& pSearchMethodFunc) {
+  switch (uiMethod) {
+  case  ME_DIA:
+    pSearchMethodFunc  = WelsDiamondSearch;
+    break;
+  case  ME_CROSS:
+    pSearchMethodFunc = WelsMotionCrossSearch;
+    break;
+  case  ME_DIA_CROSS:
+    pSearchMethodFunc = WelsDiamondCrossSearch;
+    break;
+  case  ME_DIA_CROSS_FME:
+    pSearchMethodFunc = WelsDiamondCrossFeatureSearch;
+    break;
+  case ME_FULL:
+    pSearchMethodFunc = WelsDiamondSearch;
+    return false;
+  default:
+    pSearchMethodFunc = WelsDiamondSearch;
+    return false;
+  }
+  return true;
+}
+
+
+
+void PreprocessSliceCoding (sWelsEncCtx* pCtx) {
+  SDqLayer* pCurLayer           = pCtx->pCurDqLayer;
+  //const bool kbBaseAvail      = pCurLayer->bBaseLayerAvailableFlag;
+  bool bFastMode = (pCtx->pSvcParam->iComplexityMode == LOW_COMPLEXITY);
+  SWelsFuncPtrList* pFuncList = pCtx->pFuncList;
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+  /* function pointers conditional assignment under sWelsEncCtx, layer_mb_enc_rec (in stack) is exclusive */
+  if ((pCtx->pSvcParam->iUsageType == CAMERA_VIDEO_REAL_TIME && bFastMode) ||
+      (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME && P_SLICE == pCtx->eSliceType
+       && bFastMode) //TODO: here is for sync with the origin code, consider the design again with more tests
+     ) {
+    SetFastCodingFunc (pFuncList);
+  } else {
+    SetNormalCodingFunc (pFuncList);
+  }
+
+  if (P_SLICE == pCtx->eSliceType) {
+    for (int i = 0; i < BLOCK_STATIC_IDC_ALL; i++) {
+      pFuncList->pfMotionSearch[i] = WelsMotionEstimateSearch;
+    }
+    pFuncList->pfSearchMethod[BLOCK_16x16]  =
+      pFuncList->pfSearchMethod[BLOCK_16x8] =
+        pFuncList->pfSearchMethod[BLOCK_8x16] =
+          pFuncList->pfSearchMethod[BLOCK_8x8] =
+            pFuncList->pfSearchMethod[BLOCK_4x4] =
+              pFuncList->pfSearchMethod[BLOCK_8x4] =
+                pFuncList->pfSearchMethod[BLOCK_4x8] = WelsDiamondSearch;
+    pFuncList->pfFirstIntraMode = WelsMdFirstIntraMode;
+    pFuncList->sSampleDealingFuncs.pfMeCost = pCtx->pFuncList->sSampleDealingFuncs.pfSampleSatd;
+    pFuncList->pfSetScrollingMv = SetScrollingMvToMdNull;
+
+    if (bFastMode) {
+      pFuncList->pfCalculateSatd = NotCalculateSatdCost;
+      pFuncList->pfInterFineMd = WelsMdInterFinePartitionVaa;
+    } else {
+      pFuncList->pfCalculateSatd = CalculateSatdCost;
+      pFuncList->pfInterFineMd = WelsMdInterFinePartition;
+    }
+  } else {
+    pFuncList->sSampleDealingFuncs.pfMeCost = NULL;
+  }
+
+  //to init at each frame will be needed when dealing with hybrid content (camera+screen)
+  if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    if (P_SLICE == pCtx->eSliceType) {
+      //MD related func pointers
+      pFuncList->pfInterFineMd = WelsMdInterFinePartitionVaaOnScreen;
+
+      //ME related func pointers
+      SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+      if (pVaaExt->sScrollDetectInfo.bScrollDetectFlag
+          && (pVaaExt->sScrollDetectInfo.iScrollMvX | pVaaExt->sScrollDetectInfo.iScrollMvY)) {
+        pFuncList->pfSetScrollingMv = SetScrollingMvToMd;
+      } else {
+        pFuncList->pfSetScrollingMv = SetScrollingMvToMdNull;
+      }
+
+      pFuncList->pfMotionSearch[NO_STATIC] = WelsMotionEstimateSearch;
+      pFuncList->pfMotionSearch[COLLOCATED_STATIC] = WelsMotionEstimateSearchStatic;
+      pFuncList->pfMotionSearch[SCROLLED_STATIC] = WelsMotionEstimateSearchScrolled;
+      //ME16x16
+      if (!SetMeMethod (ME_DIA_CROSS, pFuncList->pfSearchMethod[BLOCK_16x16])) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "SetMeMethod(BLOCK_16x16) ME_DIA_CROSS unsuccessful, switched to default search");
+      }
+      //ME8x8
+      SFeatureSearchPreparation* pFeatureSearchPreparation = pCurLayer->pFeatureSearchPreparation;
+      if (pFeatureSearchPreparation) {
+        pFeatureSearchPreparation->iHighFreMbCount = 0;
+
+        //calculate bFMESwitchFlag
+        SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+        const int32_t kiMbSize = pCurLayer->iMbHeight * pCurLayer->iMbWidth;
+        pFeatureSearchPreparation->bFMESwitchFlag = CalcFMESwitchFlag (pFeatureSearchPreparation->uiFMEGoodFrameCount,
+            pFeatureSearchPreparation->iHighFreMbCount * 100 / kiMbSize, pCtx->pVaa->sVaaCalcInfo.iFrameSad / kiMbSize,
+            pVaaExt->sScrollDetectInfo.bScrollDetectFlag);
+
+        //PerformFMEPreprocess
+        SScreenBlockFeatureStorage* pScreenBlockFeatureStorage = pCurLayer->pRefPic->pScreenBlockFeatureStorage;
+        pFeatureSearchPreparation->pRefBlockFeature = pScreenBlockFeatureStorage;
+        if (pFeatureSearchPreparation->bFMESwitchFlag
+            && !pScreenBlockFeatureStorage->bRefBlockFeatureCalculated) {
+          SPicture* pRef = (pCtx->pSvcParam->bEnableLongTermReference ? pCurLayer->pRefOri[0] : pCurLayer->pRefPic);
+          PerformFMEPreprocess (pFuncList, pRef, pFeatureSearchPreparation->pFeatureOfBlock,
+                                pScreenBlockFeatureStorage);
+        }
+
+        //assign ME pointer
+        if (pFeatureSearchPreparation->bFMESwitchFlag && pScreenBlockFeatureStorage->bRefBlockFeatureCalculated
+            && (!pScreenBlockFeatureStorage->iIs16x16)) {
+          if (!SetMeMethod (ME_DIA_CROSS_FME, pFuncList->pfSearchMethod[BLOCK_8x8])) {
+            WelsLog (pLogCtx, WELS_LOG_WARNING,
+                     "SetMeMethod(BLOCK_8x8) ME_DIA_CROSS_FME unsuccessful, switched to default search");
+          }
+        }
+
+        //assign UpdateFMESwitch pointer
+        if (pFeatureSearchPreparation->bFMESwitchFlag) {
+          pFuncList->pfUpdateFMESwitch = UpdateFMESwitch;
+        } else {
+          pFuncList->pfUpdateFMESwitch = UpdateFMESwitchNull;
+        }
+      }//if (pFeatureSearchPreparation)
+    } else {
+      //reset some status when at I_SLICE
+      pCurLayer->pFeatureSearchPreparation->bFMESwitchFlag = true;
+      pCurLayer->pFeatureSearchPreparation->uiFMEGoodFrameCount = FMESWITCH_DEFAULT_GOODFRAME_NUM;
+    }
+  }
+
+  // update some layer dependent variable to save judgements in mb-level
+  pCurLayer->bSatdInMdFlag = ((pFuncList->sSampleDealingFuncs.pfMeCost == pFuncList->sSampleDealingFuncs.pfSampleSatd)
+                              && (pFuncList->sSampleDealingFuncs.pfMdCost == pFuncList->sSampleDealingFuncs.pfSampleSatd));
+
+  const int32_t kiCurDid            = pCtx->uiDependencyId;
+  const int32_t kiCurTid            = pCtx->uiTemporalId;
+  if (pCurLayer->bDeblockingParallelFlag && (pCurLayer->iLoopFilterDisableIdc != 1)
+#if !defined(ENABLE_FRAME_DUMP)
+      && (NRI_PRI_LOWEST != pCtx->eNalPriority)
+      && (pCtx->pSvcParam->sDependencyLayers[kiCurDid].iHighestTemporalId == 0
+          || kiCurTid < pCtx->pSvcParam->sDependencyLayers[kiCurDid].iHighestTemporalId)
+#endif// !ENABLE_FRAME_DUMP
+     ) {
+    pFuncList->pfDeblocking.pfDeblockingFilterSlice = DeblockingFilterSliceAvcbase;
+  } else {
+    pFuncList->pfDeblocking.pfDeblockingFilterSlice = DeblockingFilterSliceAvcbaseNull;
+  }
+}
+
+/*!
+ * \brief   swap pDq layers between current pDq layer and reference pDq layer
+ */
+
+static inline void WelsSwapDqLayers (sWelsEncCtx* pCtx, const int32_t kiNextDqIdx) {
+  // swap and assign reference
+  SDqLayer* pTmpLayer           = pCtx->ppDqLayerList[kiNextDqIdx];
+  SDqLayer* pRefLayer           = pCtx->pCurDqLayer;
+  pCtx->pCurDqLayer             = pTmpLayer;
+  pCtx->pCurDqLayer->pRefLayer  = pRefLayer;
+}
+
+/*!
+ * \brief   prefetch reference picture after WelsBuildRefList
+ */
+static inline void PrefetchReferencePicture (sWelsEncCtx* pCtx, const EVideoFrameType keFrameType) {
+  const int32_t kiSliceCount = pCtx->pCurDqLayer->iMaxSliceNum;
+  int32_t iIdx = 0;
+  uint8_t uiRefIdx = -1;
+
+  assert (kiSliceCount > 0);
+  if (keFrameType != videoFrameTypeIDR) {
+    assert (pCtx->iNumRef0 > 0);
+    pCtx->pRefPic               = pCtx->pRefList0[0];   // always get item 0 due to reordering done
+    pCtx->pCurDqLayer->pRefPic  = pCtx->pRefPic;
+    uiRefIdx                    = 0;                    // reordered reference iIndex
+  } else { // safe for IDR coding
+    pCtx->pRefPic               = NULL;
+    pCtx->pCurDqLayer->pRefPic  = NULL;
+  }
+
+  iIdx = 0;
+  while (iIdx < kiSliceCount) {
+    pCtx->pCurDqLayer->ppSliceInLayer[iIdx]->sSliceHeaderExt.sSliceHeader.uiRefIndex = uiRefIdx;
+    ++ iIdx;
+  }
+}
+
+int32_t WelsWriteOneSPS (sWelsEncCtx* pCtx, const int32_t kiSpsIdx, int32_t& iNalSize) {
+  int iNal = pCtx->pOut->iNalIndex;
+  WelsLoadNal (pCtx->pOut, NAL_UNIT_SPS, NRI_PRI_HIGHEST);
+
+  WelsWriteSpsNal (&pCtx->pSpsArray[kiSpsIdx], &pCtx->pOut->sBsWrite,
+                   pCtx->pFuncList->pParametersetStrategy->GetSpsIdOffsetList (PARA_SET_TYPE_AVCSPS));
+  WelsUnloadNal (pCtx->pOut);
+
+  int32_t iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[iNal], NULL,
+                                   pCtx->iFrameBsSize - pCtx->iPosBsBuffer,//available buffer to be written, so need to substract the used length
+                                   pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                                   &iNalSize);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pCtx->iPosBsBuffer += iNalSize;
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t WelsWriteOnePPS (sWelsEncCtx* pCtx, const int32_t kiPpsIdx, int32_t& iNalSize) {
+  //TODO
+  int32_t iNal = pCtx->pOut->iNalIndex;
+  /* generate picture parameter set */
+  WelsLoadNal (pCtx->pOut, NAL_UNIT_PPS, NRI_PRI_HIGHEST);
+
+  WelsWritePpsSyntax (&pCtx->pPPSArray[kiPpsIdx], &pCtx->pOut->sBsWrite,
+                      pCtx->pFuncList->pParametersetStrategy);
+  WelsUnloadNal (pCtx->pOut);
+
+  int32_t iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[iNal], NULL,
+                                   pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                                   pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                                   &iNalSize);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pCtx->iPosBsBuffer += iNalSize;
+  return ENC_RETURN_SUCCESS;
+}
+
+
+/*!
+ * \brief   write all parameter sets introduced in SVC extension
+ * \return  writing results, success or error
+ */
+int32_t WelsWriteParameterSets (sWelsEncCtx* pCtx, int32_t* pNalLen, int32_t* pNumNal, int32_t* pTotalLength) {
+  int32_t iSize = 0;
+  int32_t iNal  = 0;
+  int32_t iIdx  = 0;
+  int32_t iId   = 0;
+  int32_t iCountNal     = 0;
+  int32_t iNalLength    = 0;
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+
+  if (NULL == pCtx || NULL == pNalLen || NULL == pNumNal || NULL == pCtx->pFuncList->pParametersetStrategy)
+    return ENC_RETURN_UNEXPECTED;
+
+  *pTotalLength = 0;
+  /* write all SPS */
+  iIdx = 0;
+  while (iIdx < pCtx->iSpsNum) {
+    pCtx->pFuncList->pParametersetStrategy->Update (pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS);
+    /* generate sequence parameters set */
+    iId = pCtx->pFuncList->pParametersetStrategy->GetSpsIdx (iIdx);
+
+    WelsWriteOneSPS (pCtx, iId, iNalLength);
+
+    pNalLen[iCountNal] = iNalLength;
+    iSize += iNalLength;
+
+    ++ iIdx;
+    ++ iCountNal;
+  }
+
+  /* write all Subset SPS */
+  iIdx = 0;
+  while (iIdx < pCtx->iSubsetSpsNum) {
+    iNal = pCtx->pOut->iNalIndex;
+
+    pCtx->pFuncList->pParametersetStrategy->Update (pCtx->pSubsetArray[iIdx].pSps.uiSpsId, PARA_SET_TYPE_SUBSETSPS);
+
+    iId = iIdx;
+
+    /* generate Subset SPS */
+    WelsLoadNal (pCtx->pOut, NAL_UNIT_SUBSET_SPS, NRI_PRI_HIGHEST);
+
+    WelsWriteSubsetSpsSyntax (&pCtx->pSubsetArray[iId], &pCtx->pOut->sBsWrite,
+                              pCtx->pFuncList->pParametersetStrategy->GetSpsIdOffsetList (PARA_SET_TYPE_SUBSETSPS));
+    WelsUnloadNal (pCtx->pOut);
+
+    iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[iNal], NULL,
+                             pCtx->iFrameBsSize - pCtx->iPosBsBuffer,//available buffer to be written, so need to substract the used length
+                             pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                             &iNalLength);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    pNalLen[iCountNal] = iNalLength;
+
+    pCtx->iPosBsBuffer  += iNalLength;
+    iSize               += iNalLength;
+
+    ++ iIdx;
+    ++ iCountNal;
+  }
+
+  pCtx->pFuncList->pParametersetStrategy->UpdatePpsList (pCtx);
+
+  iIdx = 0;
+  while (iIdx < pCtx->iPpsNum) {
+    pCtx->pFuncList->pParametersetStrategy->Update (pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS);
+
+    WelsWriteOnePPS (pCtx, iIdx, iNalLength);
+
+    pNalLen[iCountNal] = iNalLength;
+    iSize += iNalLength;
+
+    ++ iIdx;
+    ++ iCountNal;
+  }
+
+  *pNumNal = iCountNal;
+  *pTotalLength = iSize;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+static inline int32_t AddPrefixNal (sWelsEncCtx* pCtx,
+                                    SLayerBSInfo* pLayerBsInfo,
+                                    int32_t* pNalLen,
+                                    int32_t* pNalIdxInLayer,
+                                    const EWelsNalUnitType keNalType,
+                                    const EWelsNalRefIdc keNalRefIdc,
+                                    int32_t& iPayloadSize) {
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+  iPayloadSize = 0;
+
+  if (keNalRefIdc != NRI_PRI_LOWEST) {
+    WelsLoadNal (pCtx->pOut, NAL_UNIT_PREFIX, keNalRefIdc);
+
+    WelsWriteSVCPrefixNal (&pCtx->pOut->sBsWrite, keNalRefIdc, (NAL_UNIT_CODED_SLICE_IDR == keNalType));
+
+    WelsUnloadNal (pCtx->pOut);
+
+    iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[pCtx->pOut->iNalIndex - 1],
+                             &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt,
+                             pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                             pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                             &pNalLen[*pNalIdxInLayer]);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    iPayloadSize = pNalLen[*pNalIdxInLayer];
+
+    pCtx->iPosBsBuffer += iPayloadSize;
+
+    (*pNalIdxInLayer) ++;
+  } else { // No Prefix NAL Unit RBSP syntax here, but need add NAL Unit Header extension
+    WelsLoadNal (pCtx->pOut, NAL_UNIT_PREFIX, keNalRefIdc);
+    // No need write any syntax of prefix NAL Unit RBSP here
+    WelsUnloadNal (pCtx->pOut);
+
+    iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[pCtx->pOut->iNalIndex - 1],
+                             &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt,
+                             pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                             pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                             &pNalLen[*pNalIdxInLayer]);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    iPayloadSize = pNalLen[*pNalIdxInLayer];
+
+    pCtx->iPosBsBuffer += iPayloadSize;
+
+    (*pNalIdxInLayer) ++;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t WritePadding (sWelsEncCtx* pCtx, int32_t iLen, int32_t& iSize) {
+  int32_t i = 0;
+  int32_t iNal = 0;
+  SBitStringAux* pBs = NULL;
+  int32_t iNalLen;
+
+  iSize = 0;
+  iNal  = pCtx->pOut->iNalIndex;
+  pBs   = &pCtx->pOut->sBsWrite;  // SBitStringAux instance for non VCL NALs decoding
+
+  if ((pBs->pEndBuf - pBs->pCurBuf) < iLen || iNal >= pCtx->pOut->iCountNals) {
+#if GOM_TRACE_FLAG
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "[RC] paddingcal pBuffer overflow, bufferlen=%lld, paddinglen=%d, iNalIdx= %d, iCountNals= %d",
+             static_cast<long long int> (pBs->pEndBuf - pBs->pCurBuf), iLen, iNal, pCtx->pOut->iCountNals);
+#endif
+    return ENC_RETURN_MEMOVERFLOWFOUND;
+  }
+
+  WelsLoadNal (pCtx->pOut, NAL_UNIT_FILLER_DATA, NRI_PRI_LOWEST);
+
+  for (i = 0; i < iLen; i++) {
+    BsWriteBits (pBs, 8, 0xff);
+  }
+
+  BsRbspTrailingBits (pBs);
+
+  WelsUnloadNal (pCtx->pOut);
+  int32_t iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[iNal], NULL,
+                                   pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                                   pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                                   &iNalLen);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pCtx->iPosBsBuffer += iNalLen;
+  iSize              += iNalLen;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+/*
+ * Force coding IDR as follows
+ */
+int32_t ForceCodingIDR (sWelsEncCtx* pCtx, int32_t iLayerId) {
+  if (NULL == pCtx)
+    return 1;
+  if ((iLayerId < 0) || (iLayerId >= MAX_SPATIAL_LAYER_NUM) || (!pCtx->pSvcParam->bSimulcastAVC)) {
+    for (int32_t iDid = 0; iDid < pCtx->pSvcParam->iSpatialLayerNum; iDid++) {
+      SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[iDid];
+      pParamInternal->iCodingIndex = 0;
+      pParamInternal->iFrameIndex = 0;
+      pParamInternal->iFrameNum = 0;
+      pParamInternal->iPOC = 0;
+      pParamInternal->bEncCurFrmAsIdrFlag = true;
+      pCtx->sEncoderStatistics[0].uiIDRReqNum++;
+    }
+    WelsLog (&pCtx->sLogCtx, WELS_LOG_INFO, "ForceCodingIDR(iDid 0-%d)at InputFrameCount=%d\n",
+             pCtx->pSvcParam->iSpatialLayerNum - 1, pCtx->sEncoderStatistics[0].uiInputFrameCount);
+
+
+
+  } else {
+    SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[iLayerId];
+    pParamInternal->iCodingIndex = 0;
+    pParamInternal->iFrameIndex = 0;
+    pParamInternal->iFrameNum = 0;
+    pParamInternal->iPOC = 0;
+    pParamInternal->bEncCurFrmAsIdrFlag = true;
+    pCtx->sEncoderStatistics[iLayerId].uiIDRReqNum++;
+    WelsLog (&pCtx->sLogCtx, WELS_LOG_INFO, "ForceCodingIDR(iDid %d)at InputFrameCount=%d\n", iLayerId,
+             pCtx->sEncoderStatistics[iLayerId].uiInputFrameCount);
+  }
+  pCtx->bCheckWindowStatusRefreshFlag = false;
+
+
+  return 0;
+}
+
+int32_t WelsEncoderEncodeParameterSets (sWelsEncCtx* pCtx, void* pDst) {
+  if (NULL == pCtx || NULL == pDst) {
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  SFrameBSInfo* pFbi          = (SFrameBSInfo*)pDst;
+  SLayerBSInfo* pLayerBsInfo  = &pFbi->sLayerInfo[0];
+  int32_t iCountNal           = 0;
+  int32_t iTotalLength        = 0;
+
+  pLayerBsInfo->pBsBuf = pCtx->pFrameBs;
+  pLayerBsInfo->pNalLengthInByte = pCtx->pOut->pNalLen;
+  InitBits (&pCtx->pOut->sBsWrite, pCtx->pOut->pBsBuffer, pCtx->pOut->uiSize);
+
+  pCtx->iPosBsBuffer = 0;
+  int32_t iReturn = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal, &iTotalLength);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pLayerBsInfo->uiSpatialId   = 0;
+  pLayerBsInfo->uiTemporalId  = 0;
+  pLayerBsInfo->uiQualityId   = 0;
+  pLayerBsInfo->uiLayerType   = NON_VIDEO_CODING_LAYER;
+  pLayerBsInfo->iNalCount     = iCountNal;
+  pLayerBsInfo->eFrameType    = videoFrameTypeInvalid;
+  pLayerBsInfo->iSubSeqId     = 0;
+  //pCtx->eLastNalPriority      = NRI_PRI_HIGHEST;
+  pFbi->iLayerNum             = 1;
+  pFbi->eFrameType            = videoFrameTypeInvalid;
+  WelsEmms();
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t GetSubSequenceId (sWelsEncCtx* pCtx, EVideoFrameType eFrameType) {
+  int32_t iSubSeqId = 0;
+  if (eFrameType == videoFrameTypeIDR)
+    iSubSeqId = 0;
+  else if (eFrameType == videoFrameTypeI)
+    iSubSeqId = 1;
+  else if (eFrameType == videoFrameTypeP) {
+    if (pCtx->bCurFrameMarkedAsSceneLtr)
+      iSubSeqId = 2;
+    else
+      iSubSeqId = 3 + pCtx->uiTemporalId; //T0:3 T1:4 T2:5 T3:6
+  } else
+    iSubSeqId = 3 + MAX_TEMPORAL_LAYER_NUM;
+  return iSubSeqId;
+}
+
+// writing parasets for (simulcast) svc
+int32_t WriteSsvcParaset (sWelsEncCtx* pCtx, const int32_t kiSpatialNum,
+                          SLayerBSInfo*& pLayerBsInfo, int32_t& iLayerNum, int32_t& iFrameSize) {
+  int32_t iNonVclSize = 0, iCountNal = 0, iReturn = ENC_RETURN_SUCCESS;
+  iReturn = WelsWriteParameterSets (pCtx, &pLayerBsInfo->pNalLengthInByte[0], &iCountNal, &iNonVclSize);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+  for (int32_t iSpatialId = 0; iSpatialId < kiSpatialNum; iSpatialId++) {
+    SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[iSpatialId];
+    if (pParamInternal->uiIdrPicId < 65535) {
+      ++ pParamInternal->uiIdrPicId;
+    } else {
+      pParamInternal->uiIdrPicId = 0;
+    }
+  }
+  pLayerBsInfo->uiSpatialId     = 0;
+  pLayerBsInfo->uiTemporalId    = 0;
+  pLayerBsInfo->uiQualityId     = 0;
+  pLayerBsInfo->uiLayerType     = NON_VIDEO_CODING_LAYER;
+  pLayerBsInfo->iNalCount       = iCountNal;
+  pLayerBsInfo->eFrameType      = videoFrameTypeIDR;
+  pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, videoFrameTypeIDR);
+  //point to next pLayerBsInfo
+  ++ pLayerBsInfo;
+  ++ pCtx->pOut->iLayerBsIndex;
+  pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+  pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+
+  //update for external countings
+  ++ iLayerNum;
+  iFrameSize += iNonVclSize;
+  return iReturn;
+}
+
+// writing parasets for simulcast avc
+int32_t WriteSavcParaset (sWelsEncCtx* pCtx, const int32_t iIdx,
+                          SLayerBSInfo*& pLayerBsInfo, int32_t& iLayerNum, int32_t& iFrameSize) {
+  int32_t iNonVclSize = 0, iCountNal = 0, iReturn = ENC_RETURN_SUCCESS;
+
+  // write SPS
+  iNonVclSize = 0;
+
+  //writing one NAL
+  int32_t iNalSize = 0;
+  iCountNal        = 0;
+
+
+  if (pCtx->pFuncList->pParametersetStrategy) {
+    pCtx->pFuncList->pParametersetStrategy->Update (pCtx->pSpsArray[iIdx].uiSpsId, PARA_SET_TYPE_AVCSPS);
+  }
+
+  iReturn          = WelsWriteOneSPS (pCtx, iIdx, iNalSize);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pLayerBsInfo->pNalLengthInByte[iCountNal] = iNalSize;
+  iNonVclSize += iNalSize;
+  iCountNal = 1;
+
+  //finish writing one NAL
+
+  pLayerBsInfo->uiSpatialId   = iIdx;
+  pLayerBsInfo->uiTemporalId  = 0;
+  pLayerBsInfo->uiQualityId   = 0;
+  pLayerBsInfo->uiLayerType   = NON_VIDEO_CODING_LAYER;
+  pLayerBsInfo->iNalCount     = iCountNal;
+  pLayerBsInfo->eFrameType    = videoFrameTypeIDR;
+  pLayerBsInfo->iSubSeqId     = GetSubSequenceId (pCtx, videoFrameTypeIDR);
+  //point to next pLayerBsInfo
+  ++ pLayerBsInfo;
+  ++ pCtx->pOut->iLayerBsIndex;
+  pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+  pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+  //update for external countings
+  ++ iLayerNum;
+
+  // write PPS
+
+  //TODO: under new strategy, will PPS be correctly updated?
+
+  //writing one NAL
+  iNalSize = 0;
+  iCountNal        = 0;
+
+  if (pCtx->pFuncList->pParametersetStrategy) {
+    pCtx->pFuncList->pParametersetStrategy->Update (pCtx->pPPSArray[iIdx].iPpsId, PARA_SET_TYPE_PPS);
+  }
+
+  iReturn          = WelsWriteOnePPS (pCtx, iIdx, iNalSize);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  pLayerBsInfo->pNalLengthInByte[iCountNal] = iNalSize;
+  iNonVclSize += iNalSize;
+  iCountNal = 1;
+  //finish writing one NAL
+
+  pLayerBsInfo->uiSpatialId   = iIdx;
+  pLayerBsInfo->uiTemporalId  = 0;
+  pLayerBsInfo->uiQualityId   = 0;
+  pLayerBsInfo->uiLayerType   = NON_VIDEO_CODING_LAYER;
+  pLayerBsInfo->iNalCount     = iCountNal;
+  pLayerBsInfo->eFrameType    = videoFrameTypeIDR;
+  pLayerBsInfo->iSubSeqId     = GetSubSequenceId (pCtx, videoFrameTypeIDR);
+  //point to next pLayerBsInfo
+  ++ pLayerBsInfo;
+  ++ pCtx->pOut->iLayerBsIndex;
+  pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+  pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+  //update for external countings
+  ++ iLayerNum;
+
+  // to check number of layers / nals / slices dependencies
+  if (iLayerNum > MAX_LAYER_NUM_OF_FRAME) {
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR, "WriteSavcParaset(), iLayerNum(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
+             iLayerNum, MAX_LAYER_NUM_OF_FRAME);
+    return 1;
+  }
+
+  iFrameSize += iNonVclSize;
+  return iReturn;
+}
+
+//cover the logic of simulcast avc + sps_pps_listing
+int32_t WriteSavcParaset_Listing (sWelsEncCtx* pCtx, const int32_t kiSpatialNum,
+                                  SLayerBSInfo*& pLayerBsInfo, int32_t& iLayerNum, int32_t& iFrameSize) {
+  int32_t iNonVclSize = 0, iCountNal = 0, iReturn = ENC_RETURN_SUCCESS;
+
+  // write SPS
+  iNonVclSize = 0;
+
+  for (int32_t iSpatialId = 0; iSpatialId < kiSpatialNum; iSpatialId++) {
+    SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[iSpatialId];
+    if (pParamInternal->uiIdrPicId < 65535) {
+      ++ pParamInternal->uiIdrPicId;
+    } else {
+      pParamInternal->uiIdrPicId = 0;
+    }
+
+    iCountNal = 0;
+
+    for (int32_t iIdx = 0; iIdx < pCtx->iSpsNum; iIdx++) {
+      //writing one NAL
+      int32_t iNalSize = 0;
+      iReturn = WelsWriteOneSPS (pCtx, iIdx, iNalSize);
+      WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+      pLayerBsInfo->pNalLengthInByte[iCountNal] = iNalSize;
+      iNonVclSize += iNalSize;
+      iCountNal ++;
+      //finish writing one NAL
+    }
+
+    pLayerBsInfo->uiSpatialId   = iSpatialId;
+    pLayerBsInfo->uiTemporalId  = 0;
+    pLayerBsInfo->uiQualityId   = 0;
+    pLayerBsInfo->uiLayerType   = NON_VIDEO_CODING_LAYER;
+    pLayerBsInfo->iNalCount     = iCountNal;
+    pLayerBsInfo->eFrameType    = videoFrameTypeIDR;
+    pLayerBsInfo->iSubSeqId     = GetSubSequenceId (pCtx, videoFrameTypeIDR);
+    //point to next pLayerBsInfo
+    ++ pLayerBsInfo;
+    ++ pCtx->pOut->iLayerBsIndex;
+    pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+    pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+    //update for external countings
+    ++ iLayerNum;
+  }
+
+  // write PPS
+  pCtx->pFuncList->pParametersetStrategy->UpdatePpsList (pCtx);
+
+  //TODO: under new strategy, will PPS be correctly updated?
+  for (int32_t iSpatialId = 0; iSpatialId < kiSpatialNum; iSpatialId++) {
+    iCountNal = 0;
+    for (int32_t iIdx = 0; iIdx < pCtx->iPpsNum; iIdx++) {
+      //writing one NAL
+      int32_t iNalSize = 0;
+      iReturn = WelsWriteOnePPS (pCtx, iIdx, iNalSize);
+      WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+      pLayerBsInfo->pNalLengthInByte[iCountNal] = iNalSize;
+      iNonVclSize += iNalSize;
+      iCountNal ++;
+      //finish writing one NAL
+    }
+
+    pLayerBsInfo->uiSpatialId   = iSpatialId;
+    pLayerBsInfo->uiTemporalId  = 0;
+    pLayerBsInfo->uiQualityId   = 0;
+    pLayerBsInfo->uiLayerType   = NON_VIDEO_CODING_LAYER;
+    pLayerBsInfo->iNalCount     = iCountNal;
+    pLayerBsInfo->eFrameType    = videoFrameTypeIDR;
+    pLayerBsInfo->iSubSeqId     = GetSubSequenceId (pCtx, videoFrameTypeIDR);
+    //point to next pLayerBsInfo
+    ++ pLayerBsInfo;
+    ++ pCtx->pOut->iLayerBsIndex;
+    pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+    pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+    //update for external countings
+    ++ iLayerNum;
+  }
+
+  // to check number of layers / nals / slices dependencies
+  if (iLayerNum > MAX_LAYER_NUM_OF_FRAME) {
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR, "WriteSavcParaset(), iLayerNum(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
+             iLayerNum, MAX_LAYER_NUM_OF_FRAME);
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  iFrameSize += iNonVclSize;
+  return iReturn;
+}
+
+void StackBackEncoderStatus (sWelsEncCtx* pEncCtx,
+                             EVideoFrameType keFrameType) {
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  // for bitstream writing
+  pEncCtx->iPosBsBuffer        = 0;   // reset bs pBuffer position
+  pEncCtx->pOut->iNalIndex     = 0;   // reset NAL index
+  pEncCtx->pOut->iLayerBsIndex = 0;   // reset index of Layer Bs
+
+  InitBits (&pEncCtx->pOut->sBsWrite, pEncCtx->pOut->pBsBuffer, pEncCtx->pOut->uiSize);
+  if ((keFrameType == videoFrameTypeP) || (keFrameType == videoFrameTypeI)) {
+    pParamInternal->iFrameIndex --;
+    if (pParamInternal->iPOC != 0) {
+      pParamInternal->iPOC -= 2;
+    } else {
+      pParamInternal->iPOC = (1 << pEncCtx->pSps->iLog2MaxPocLsb) - 2;
+    }
+
+    LoadBackFrameNum (pEncCtx, pEncCtx->uiDependencyId);
+
+    pEncCtx->eNalType     = NAL_UNIT_CODED_SLICE;
+    pEncCtx->eSliceType   = P_SLICE;
+    //pEncCtx->eNalPriority = pEncCtx->eLastNalPriority; //not need this since eNalPriority will be updated at the beginning of coding a frame
+  } else if (keFrameType == videoFrameTypeIDR) {
+    pParamInternal->uiIdrPicId --;
+
+    //set the next frame to be IDR
+    ForceCodingIDR (pEncCtx, pEncCtx->uiDependencyId);
+  } else { // B pictures are not supported now, any else?
+    assert (0);
+  }
+
+  // no need to stack back RC info since the info is still useful for later RQ model calculation
+  // no need to stack back MB slicing info for dynamic balancing, since the info is still refer-able
+}
+
+void ClearFrameBsInfo (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi) {
+  pFbi->sLayerInfo[0].pBsBuf           = pCtx->pFrameBs;
+  pFbi->sLayerInfo[0].pNalLengthInByte = pCtx->pOut->pNalLen;
+
+  for (int i = 0; i < pFbi->iLayerNum; i++) {
+    pFbi->sLayerInfo[i].iNalCount = 0;
+    pFbi->sLayerInfo[i].eFrameType = videoFrameTypeSkip;
+  }
+  pFbi->iLayerNum = 0;
+  pFbi->iFrameSizeInBytes = 0;
+}
+EVideoFrameType PrepareEncodeFrame (sWelsEncCtx* pCtx, SLayerBSInfo*& pLayerBsInfo, int32_t iSpatialNum,
+                                    int8_t& iCurDid, int32_t& iCurTid,
+                                    int32_t& iLayerNum, int32_t& iFrameSize, long long uiTimeStamp) {
+  SWelsSvcCodingParam* pSvcParam        = pCtx->pSvcParam;
+  SSpatialPicIndex* pSpatialIndexMap = &pCtx->sSpatialIndexMap[0];
+
+  bool bSkipFrameFlag =  WelsRcCheckFrameStatus (pCtx, uiTimeStamp, iSpatialNum, iCurDid);
+  EVideoFrameType eFrameType = DecideFrameType (pCtx, iSpatialNum, iCurDid, bSkipFrameFlag);
+  if (eFrameType == videoFrameTypeSkip) {
+    if (pSvcParam->bSimulcastAVC) {
+      if (pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip)
+        pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip (pCtx, iCurDid);
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+               "[Rc] Frame timestamp = %lld, iDid = %d,skip one frame due to target_br, continual skipped %d frames",
+               uiTimeStamp, iCurDid, pCtx->pWelsSvcRc[iCurDid].iContinualSkipFrames);
+    }
+
+    else {
+      if (pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip) {
+        for (int32_t i = 0; i < iSpatialNum; i++) {
+          pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip (pCtx, (pSpatialIndexMap + i)->iDid);
+        }
+      }
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+               "[Rc] Frame timestamp = %lld, iDid = %d,skip one frame due to target_br, continual skipped %d frames",
+               uiTimeStamp, iCurDid, pCtx->pWelsSvcRc[iCurDid].iContinualSkipFrames);
+    }
+
+  } else {
+    SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iCurDid];
+
+    iCurTid = GetTemporalLevel (pParamInternal, pParamInternal->iCodingIndex,
+                                pSvcParam->uiGopSize);
+    pCtx->uiTemporalId = iCurTid;
+    if (eFrameType == videoFrameTypeIDR) {
+      // write parameter sets bitstream or SEI/SSEI (if any) here
+      // TODO: use function pointer instead
+      if (! (SPS_LISTING & pCtx->pSvcParam->eSpsPpsIdStrategy)) {
+        if (pSvcParam->bSimulcastAVC) {
+          pCtx->iEncoderError = WriteSavcParaset (pCtx, iCurDid, pLayerBsInfo, iLayerNum, iFrameSize);
+          ++ pParamInternal->uiIdrPicId;
+        } else {
+          pCtx->iEncoderError = WriteSsvcParaset (pCtx, iSpatialNum, pLayerBsInfo, iLayerNum, iFrameSize);
+        }
+      } else {
+        pCtx->iEncoderError = WriteSavcParaset_Listing (pCtx, iSpatialNum, pLayerBsInfo, iLayerNum, iFrameSize);
+
+
+      }
+    }
+  }
+  return eFrameType;
+}
+/*!
+ * \brief   core svc encoding process
+ *
+ * \pParam  pCtx            sWelsEncCtx*, encoder context
+ * \pParam  pFbi            FrameBSInfo*
+ * \pParam  pSrcPic         Source Picture
+ * \return  EFrameType (videoFrameTypeIDR/videoFrameTypeI/videoFrameTypeP)
+ */
+int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSourcePicture* pSrcPic) {
+  if (pCtx == NULL) {
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  SLayerBSInfo* pLayerBsInfo            = &pFbi->sLayerInfo[0];
+  SWelsSvcCodingParam* pSvcParam        = pCtx->pSvcParam;
+  SSpatialPicIndex* pSpatialIndexMap = &pCtx->sSpatialIndexMap[0];
+#if defined(ENABLE_FRAME_DUMP) || defined(ENABLE_PSNR_CALC)
+  SPicture* fsnr                = NULL;
+#endif//ENABLE_FRAME_DUMP || ENABLE_PSNR_CALC
+  SPicture* pEncPic             = NULL; // to be decided later
+#if defined(MT_DEBUG)
+  int32_t iDidList[MAX_DEPENDENCY_LAYER] = {0};
+#endif
+  int32_t iLayerNum             = 0;
+  int32_t iLayerSize            = 0;
+  int32_t iSpatialNum           =
+    0; // available count number of spatial layers due to frame size changed in this given frame
+  int32_t iSpatialIdx           = 0; // iIndex of spatial layers due to frame size changed in this given frame
+  int32_t iFrameSize            = 0;
+  int32_t iNalIdxInLayer        = 0;
+  int32_t iCountNal             = 0;
+  EVideoFrameType eFrameType    = videoFrameTypeInvalid;
+  int32_t iCurWidth             = 0;
+  int32_t iCurHeight            = 0;
+  EWelsNalUnitType eNalType     = NAL_UNIT_UNSPEC_0;
+  EWelsNalRefIdc eNalRefIdc     = NRI_PRI_LOWEST;
+  int8_t iCurDid                = 0;
+  int32_t iCurTid                = 0;
+  bool bAvcBased                = false;
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+#if defined(ENABLE_PSNR_CALC)
+  float fSnrY = .0f, fSnrU = .0f, fSnrV = .0f;
+#endif//ENABLE_PSNR_CALC
+
+#if defined(_DEBUG)
+  int32_t i = 0, j = 0, k = 0;
+#endif//_DEBUG
+  pCtx->iEncoderError = ENC_RETURN_SUCCESS;
+  pCtx->bCurFrameMarkedAsSceneLtr = false;
+  pFbi->eFrameType = videoFrameTypeSkip;
+  pFbi->iLayerNum = 0; // for initialization
+  pFbi->uiTimeStamp = GetTimestampForRc (pSrcPic->uiTimeStamp, pCtx->uiLastTimestamp,
+                                         pCtx->pSvcParam->sSpatialLayers[pCtx->pSvcParam->iSpatialLayerNum - 1].fFrameRate);
+  for (int32_t iNalIdx = 0; iNalIdx < MAX_LAYER_NUM_OF_FRAME; iNalIdx++) {
+    pFbi->sLayerInfo[iNalIdx].eFrameType = videoFrameTypeSkip;
+    pFbi->sLayerInfo[iNalIdx].iNalCount  = 0;
+  }
+  // perform csc/denoise/downsample/padding, generate spatial layers
+  iSpatialNum = pCtx->pVpp->BuildSpatialPicList (pCtx, pSrcPic);
+  if (iSpatialNum == -1) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "Failed in allocating memory in BuildSpatialPicList");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  if (pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus) {
+    pCtx->pFuncList->pfRc.pfWelsUpdateMaxBrWindowStatus (pCtx, iSpatialNum, pFbi->uiTimeStamp);
+  }
+
+  if (iSpatialNum < 1) {
+    for (int32_t iDidIdx = 0; iDidIdx < pSvcParam->iSpatialLayerNum; iDidIdx++) {
+      SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iDidIdx];
+      pParamInternal->iCodingIndex ++;
+    }
+    pFbi->eFrameType = videoFrameTypeSkip;
+    pLayerBsInfo->eFrameType = videoFrameTypeSkip;
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+             "[Rc] Frame timestamp = %lld, skip one frame due to preprocessing return (temporal layer settings or else)",
+             pSrcPic->uiTimeStamp);
+    return ENC_RETURN_SUCCESS;
+  }
+
+  InitBitStream (pCtx);
+  pLayerBsInfo->pBsBuf = pCtx->pFrameBs ;
+  pLayerBsInfo->pNalLengthInByte = pCtx->pOut->pNalLen;
+  iCurDid = pSpatialIndexMap->iDid;
+  pCtx->pCurDqLayer             = pCtx->ppDqLayerList[iCurDid];
+  pCtx->pCurDqLayer->pRefLayer  = NULL;
+  if (!pSvcParam->bSimulcastAVC) {
+    eFrameType = PrepareEncodeFrame (pCtx, pLayerBsInfo, iSpatialNum, iCurDid, iCurTid, iLayerNum, iFrameSize,
+                                     pFbi->uiTimeStamp);
+    if (eFrameType == videoFrameTypeSkip) {
+      pFbi->eFrameType = videoFrameTypeSkip;
+      pLayerBsInfo->eFrameType = videoFrameTypeSkip;
+      return ENC_RETURN_SUCCESS;
+    }
+  } else {
+    for (int32_t iDidIdx = 0; iDidIdx < pSvcParam->iSpatialLayerNum; iDidIdx++) {
+      SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iDidIdx];
+      int32_t iTemporalId =  GetTemporalLevel (pParamInternal, pParamInternal->iCodingIndex,
+                             pSvcParam->uiGopSize);
+      if (iTemporalId == INVALID_TEMPORAL_ID)
+        pParamInternal->iCodingIndex ++;
+    }
+  }
+
+  while (iSpatialIdx < iSpatialNum) {
+    iCurDid  = (pSpatialIndexMap + iSpatialIdx)->iDid;
+    SSpatialLayerConfig* pParam = &pSvcParam->sSpatialLayers[iCurDid];
+    SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[iCurDid];
+    int32_t  iDecompositionStages = pSvcParam->sDependencyLayers[iCurDid].iDecompositionStages;
+    pCtx->pCurDqLayer           = pCtx->ppDqLayerList[iCurDid];
+    pCtx->uiDependencyId        =  iCurDid;
+
+    if (pSvcParam->bSimulcastAVC) {
+      eFrameType = PrepareEncodeFrame (pCtx, pLayerBsInfo, iSpatialNum, iCurDid, iCurTid, iLayerNum, iFrameSize,
+                                       pFbi->uiTimeStamp);
+      if (eFrameType == videoFrameTypeSkip) {
+        pLayerBsInfo->eFrameType = videoFrameTypeSkip;
+        ++iSpatialIdx;
+        continue;
+      }
+    }
+    InitFrameCoding (pCtx, eFrameType, iCurDid);
+    pCtx->pVpp->AnalyzeSpatialPic (pCtx, iCurDid);
+
+    pCtx->pEncPic               = pEncPic = (pSpatialIndexMap + iSpatialIdx)->pSrc;
+    pCtx->pEncPic->iPictureType = pCtx->eSliceType;
+    pCtx->pEncPic->iFramePoc    = pParamInternal->iPOC;
+
+    iCurWidth   = pParam->iVideoWidth;
+    iCurHeight  = pParam->iVideoHeight;
+#if defined(MT_DEBUG)
+    iDidList[iSpatialIdx]       = iCurDid;
+#endif
+    // Encoding this picture might mulitiple sQualityStat layers potentially be encoded as followed
+    switch (pParam->sSliceArgument.uiSliceMode) {
+    case SM_FIXEDSLCNUM_SLICE: {
+      if ((pSvcParam->iMultipleThreadIdc > 1) &&
+          (pSvcParam->bUseLoadBalancing
+           && pSvcParam->iMultipleThreadIdc >= pSvcParam->sSpatialLayers[iCurDid].sSliceArgument.uiSliceNum)
+         ) {
+        if (iCurDid > 0)
+          AdjustEnhanceLayer (pCtx, iCurDid);
+        else
+          AdjustBaseLayer (pCtx);
+      }
+
+      break;
+    }
+    case SM_SIZELIMITED_SLICE: {
+      int32_t iPicIPartitionNum = PicPartitionNumDecision (pCtx);
+      // MT compatibility
+      pCtx->iActiveThreadsNum =
+        iPicIPartitionNum; // we try to active number of threads, equal to number of picture partitions
+      WelsInitCurrentDlayerMltslc (pCtx, iPicIPartitionNum);
+      break;
+    }
+    default: {
+      break;
+    }
+    }
+
+    /* coding each spatial layer, only one sQualityStat layer within spatial support */
+    int32_t iSliceCount = 1;
+    if (iLayerNum >= MAX_LAYER_NUM_OF_FRAME) { // check available layer_bs_info writing as follows
+      WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsEncoderEncodeExt(), iLayerNum(%d) overflow(max:%d)!", iLayerNum,
+               MAX_LAYER_NUM_OF_FRAME);
+      return ENC_RETURN_UNSUPPORTED_PARA;
+    }
+
+    iNalIdxInLayer  = 0;
+    bAvcBased       = ((pSvcParam->bSimulcastAVC) || (iCurDid == BASE_DEPENDENCY_ID));
+    pCtx->bNeedPrefixNalFlag    = ((!pSvcParam->bSimulcastAVC) && (bAvcBased &&
+                                   (pSvcParam->bPrefixNalAddingCtrl ||
+                                    (pSvcParam->iSpatialLayerNum > 1))));
+
+    if (eFrameType == videoFrameTypeP) {
+      eNalType = bAvcBased ? NAL_UNIT_CODED_SLICE : NAL_UNIT_CODED_SLICE_EXT;
+    } else if (eFrameType == videoFrameTypeIDR) {
+      eNalType = bAvcBased ? NAL_UNIT_CODED_SLICE_IDR : NAL_UNIT_CODED_SLICE_EXT;
+    }
+    if (iCurTid == 0 || pCtx->eSliceType == I_SLICE)
+      eNalRefIdc = NRI_PRI_HIGHEST;
+    else if (iCurTid == iDecompositionStages)
+      eNalRefIdc = NRI_PRI_LOWEST;
+    else if (1 + iCurTid == iDecompositionStages)
+      eNalRefIdc = NRI_PRI_LOW;
+    else // more details for other temporal layers?
+      eNalRefIdc = NRI_PRI_HIGHEST;
+    pCtx->eNalType = eNalType;
+    pCtx->eNalPriority = eNalRefIdc;
+
+    pCtx->pDecPic               = pCtx->ppRefPicListExt[iCurDid]->pNextBuffer;
+#if defined(ENABLE_FRAME_DUMP) || defined(ENABLE_PSNR_CALC)
+    fsnr                        = pCtx->pDecPic;
+#endif//#if defined(ENABLE_FRAME_DUMP) || defined(ENABLE_PSNR_CALC)
+    pCtx->pDecPic->iPictureType = pCtx->eSliceType;
+    pCtx->pDecPic->iFramePoc    = pParamInternal->iPOC;
+
+    WelsInitCurrentLayer (pCtx, iCurWidth, iCurHeight);
+
+    pCtx->pReferenceStrategy->MarkPic();
+    if (!pCtx->pReferenceStrategy->BuildRefList (pParamInternal->iPOC, 0)) {
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "WelsEncoderEncodeExt(), WelsBuildRefList failed for P frames, pCtx->iNumRef0= %d. ForceCodingIDR!",
+               pCtx->iNumRef0);
+      eFrameType = videoFrameTypeIDR;
+      pCtx->iEncoderError = ENC_RETURN_CORRECTED;
+      break;
+    }
+    if (pCtx->eSliceType != I_SLICE) {
+      pCtx->pReferenceStrategy->AfterBuildRefList();
+    }
+#ifdef LONG_TERM_REF_DUMP
+    DumpRef (pCtx);
+#endif
+    if (pSvcParam->iRCMode != RC_OFF_MODE)
+      pCtx->pVpp->AnalyzePictureComplexity (pCtx, pCtx->pEncPic, ((pCtx->eSliceType == P_SLICE)
+                                            && (pCtx->iNumRef0 > 0)) ? pCtx->pRefList0[0] : NULL,
+                                            iCurDid, (pCtx->eSliceType == P_SLICE) && pSvcParam->bEnableBackgroundDetection);
+    WelsUpdateRefSyntax (pCtx,  pParamInternal->iPOC,
+                         eFrameType); //get reordering syntax used for writing slice header and transmit to encoder.
+    PrefetchReferencePicture (pCtx, eFrameType); // update reference picture for current pDq layer
+    pCtx->pFuncList->pfRc.pfWelsRcPictureInit (pCtx, pFbi->uiTimeStamp);
+    PreprocessSliceCoding (pCtx); // MUST be called after pfWelsRcPictureInit() and WelsInitCurrentLayer()
+
+    //TODO Complexity Calculation here for screen content
+    iLayerSize = 0;
+    if (SM_SINGLE_SLICE == pParam->sSliceArgument.uiSliceMode) { // only one slice within a sQualityStat layer
+      int32_t iSliceSize   = 0;
+      int32_t iPayloadSize = 0;
+      SSlice* pCurSlice    = &pCtx->pCurDqLayer->sSliceBufferInfo[0].pSliceBuffer[0];
+
+      if (pCtx->bNeedPrefixNalFlag) {
+        pCtx->iEncoderError = AddPrefixNal (pCtx, pLayerBsInfo, &pLayerBsInfo->pNalLengthInByte[0], &iNalIdxInLayer, eNalType,
+                                            eNalRefIdc,
+                                            iPayloadSize);
+        WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+        iLayerSize += iPayloadSize;
+      }
+
+      WelsLoadNal (pCtx->pOut, eNalType, eNalRefIdc);
+      assert (0 == (int) pCurSlice->iSliceIdx);
+      pCtx->iEncoderError   = SetSliceBoundaryInfo (pCtx->pCurDqLayer, pCurSlice, 0);
+      WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+
+      pCtx->iEncoderError   = WelsCodeOneSlice (pCtx, pCurSlice, eNalType);
+      WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+
+      WelsUnloadNal (pCtx->pOut);
+
+      pCtx->iEncoderError = WelsEncodeNal (&pCtx->pOut->sNalList[pCtx->pOut->iNalIndex - 1],
+                                           &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt,
+                                           pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                                           pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                                           &pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer]);
+      WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+      iSliceSize = pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer];
+
+      iLayerSize += iSliceSize;
+      pCtx->iPosBsBuffer               += iSliceSize;
+      pLayerBsInfo->uiLayerType         = VIDEO_CODING_LAYER;
+      pLayerBsInfo->uiSpatialId         = iCurDid;
+      pLayerBsInfo->uiTemporalId        = iCurTid;
+      pLayerBsInfo->uiQualityId         = 0;
+      pLayerBsInfo->iNalCount           = ++ iNalIdxInLayer;
+      pLayerBsInfo->eFrameType          = eFrameType;
+      pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType);
+    }
+    // for dynamic slicing single threading..
+    else if ((SM_SIZELIMITED_SLICE == pParam->sSliceArgument.uiSliceMode) && (pSvcParam->iMultipleThreadIdc <= 1)) {
+      const int32_t kiLastMbInFrame = pCtx->pCurDqLayer->sSliceEncCtx.iMbNumInFrame;
+      pCtx->iEncoderError = WelsCodeOnePicPartition (pCtx, pFbi, pLayerBsInfo, &iNalIdxInLayer, &iLayerSize, 0,
+                            kiLastMbInFrame - 1, 0);
+      pLayerBsInfo->eFrameType = eFrameType;
+      pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType);
+      WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+    } else {
+      //other multi-slice uiSliceMode
+      // THREAD_FULLY_FIRE_MODE/THREAD_PICK_UP_MODE for any mode of non-SM_SIZELIMITED_SLICE
+      if ((SM_SIZELIMITED_SLICE != pParam->sSliceArgument.uiSliceMode) && (pSvcParam->iMultipleThreadIdc > 1)) {
+        iSliceCount = GetCurrentSliceNum (pCtx->pCurDqLayer);
+        if (iLayerNum + 1 >= MAX_LAYER_NUM_OF_FRAME) { // check available layer_bs_info for further writing as followed
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), iLayerNum(%d) overflow(max:%d) at iDid= %d uiSliceMode= %d, iSliceCount= %d!",
+                   iLayerNum, MAX_LAYER_NUM_OF_FRAME, iCurDid, pParam->sSliceArgument.uiSliceMode, iSliceCount);
+          return ENC_RETURN_UNSUPPORTED_PARA;
+        }
+        if (iSliceCount <= 1) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), iSliceCount(%d) from GetCurrentSliceNum() is untrusted due stack/heap crupted!",
+                   iSliceCount);
+          return ENC_RETURN_UNEXPECTED;
+        }
+        //note: the old codes are removed at commit: 3e0ee69
+        pLayerBsInfo->pBsBuf = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+        pLayerBsInfo->uiLayerType   = VIDEO_CODING_LAYER;
+        pLayerBsInfo->uiSpatialId   = pCtx->uiDependencyId;
+        pLayerBsInfo->uiTemporalId  = pCtx->uiTemporalId;
+        pLayerBsInfo->uiQualityId   = 0;
+        pLayerBsInfo->iNalCount     = 0;
+        pLayerBsInfo->eFrameType    = eFrameType;
+        pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType);
+
+        pCtx->pTaskManage->ExecuteTasks();
+        if (pCtx->iEncoderError) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), multi-slice (mode %d) encoding error!",
+                   pParam->sSliceArgument.uiSliceMode);
+          return pCtx->iEncoderError;
+        }
+
+        iLayerSize = AppendSliceToFrameBs (pCtx, pLayerBsInfo, iSliceCount);
+      }
+      // THREAD_FULLY_FIRE_MODE && SM_SIZELIMITED_SLICE
+      else if ((SM_SIZELIMITED_SLICE == pParam->sSliceArgument.uiSliceMode) && (pSvcParam->iMultipleThreadIdc > 1)) {
+        const int32_t kiPartitionCnt = pCtx->iActiveThreadsNum;
+
+        //TODO: use a function to remove duplicate code here and ln3994
+        int32_t iLayerBsIdx       = pCtx->pOut->iLayerBsIndex;
+        SLayerBSInfo* pLbi        = &pFbi->sLayerInfo[iLayerBsIdx];
+        pLbi->pBsBuf = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+        pLbi->uiLayerType   = VIDEO_CODING_LAYER;
+        pLbi->uiSpatialId   = pCtx->uiDependencyId;
+        pLbi->uiTemporalId  = pCtx->uiTemporalId;
+        pLbi->uiQualityId   = 0;
+        pLbi->iNalCount     = 0;
+        pLbi->eFrameType = eFrameType;
+        pLbi->iSubSeqId = GetSubSequenceId (pCtx, eFrameType);
+        int32_t iIdx = 0;
+        while (iIdx < kiPartitionCnt) {
+          pCtx->pSliceThreading->pThreadPEncCtx[iIdx].pFrameBsInfo = pFbi;
+          pCtx->pSliceThreading->pThreadPEncCtx[iIdx].iSliceIndex  = iIdx;
+          ++ iIdx;
+        }
+
+        int32_t iRet = InitAllSlicesInThread (pCtx);
+        if (iRet) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), multi-slice (mode %d) InitAllSlicesInThread() error!",
+                   pParam->sSliceArgument.uiSliceMode);
+          return ENC_RETURN_UNEXPECTED;
+        }
+        pCtx->pTaskManage->ExecuteTasks();
+
+        if (pCtx->iEncoderError) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), multi-slice (mode %d) encoding error = %d!",
+                   pParam->sSliceArgument.uiSliceMode, pCtx->iEncoderError);
+          return pCtx->iEncoderError;
+        }
+
+        iRet = SliceLayerInfoUpdate (pCtx, pFbi, pLayerBsInfo, pParam->sSliceArgument.uiSliceMode);
+        if (iRet) {
+          WelsLog (pLogCtx, WELS_LOG_ERROR,
+                   "WelsEncoderEncodeExt(), multi-slice (mode %d) InitAllSlicesInThread() error!",
+                   pParam->sSliceArgument.uiSliceMode);
+          return ENC_RETURN_UNEXPECTED;
+        }
+
+        iSliceCount = GetCurrentSliceNum (pCtx->pCurDqLayer);
+        iLayerSize  = AppendSliceToFrameBs (pCtx, pLayerBsInfo, iSliceCount);
+      } else { // for non-dynamic-slicing mode single threading branch..
+        const bool bNeedPrefix = pCtx->bNeedPrefixNalFlag;
+        int32_t iSliceIdx    = 0;
+        SSlice* pCurSlice    = NULL;
+
+        iSliceCount = GetCurrentSliceNum (pCtx->pCurDqLayer);
+        while (iSliceIdx < iSliceCount) {
+          int32_t iSliceSize    = 0;
+          int32_t iPayloadSize  = 0;
+
+          if (bNeedPrefix) {
+            pCtx->iEncoderError = AddPrefixNal (pCtx, pLayerBsInfo, &pLayerBsInfo->pNalLengthInByte[0], &iNalIdxInLayer, eNalType,
+                                                eNalRefIdc,
+                                                iPayloadSize);
+            WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+            iLayerSize += iPayloadSize;
+          }
+
+          WelsLoadNal (pCtx->pOut, eNalType, eNalRefIdc);
+
+          pCurSlice = &pCtx->pCurDqLayer->sSliceBufferInfo[0].pSliceBuffer[iSliceIdx];
+          assert (iSliceIdx == pCurSlice->iSliceIdx);
+          pCtx->iEncoderError   = SetSliceBoundaryInfo (pCtx->pCurDqLayer, pCurSlice, iSliceIdx);
+
+          pCtx->iEncoderError = WelsCodeOneSlice (pCtx, pCurSlice, eNalType);
+          WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+
+          WelsUnloadNal (pCtx->pOut);
+
+          pCtx->iEncoderError = WelsEncodeNal (&pCtx->pOut->sNalList[pCtx->pOut->iNalIndex - 1],
+                                               &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt,
+                                               pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                                               pCtx->pFrameBs + pCtx->iPosBsBuffer, &pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer]);
+          WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+          iSliceSize = pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer];
+
+          pCtx->iPosBsBuffer += iSliceSize;
+          iLayerSize         += iSliceSize;
+
+#if defined(SLICE_INFO_OUTPUT)
+          fprintf (stderr,
+                   "@slice=%-6d sliceType:%c idc:%d size:%-6d\n",
+                   iSliceIdx,
+                   (pCtx->eSliceType == P_SLICE ? 'P' : 'I'),
+                   eNalRefIdc,
+                   iSliceSize);
+#endif//SLICE_INFO_OUTPUT
+          ++ iNalIdxInLayer;
+          ++ iSliceIdx;
+        }
+
+        pLayerBsInfo->uiLayerType       = VIDEO_CODING_LAYER;
+        pLayerBsInfo->uiSpatialId       = iCurDid;
+        pLayerBsInfo->uiTemporalId      = iCurTid;
+        pLayerBsInfo->uiQualityId       = 0;
+        pLayerBsInfo->iNalCount         = iNalIdxInLayer;
+        pLayerBsInfo->eFrameType        = eFrameType;
+        pLayerBsInfo->iSubSeqId         = GetSubSequenceId (pCtx, eFrameType);
+      }
+    }
+
+    if (NULL != pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping
+        && pCtx->pFuncList->pfRc.pfWelsRcPostFrameSkipping (pCtx, iCurDid, pFbi->uiTimeStamp)) {
+
+      StackBackEncoderStatus (pCtx, eFrameType);
+      ClearFrameBsInfo (pCtx, pFbi);
+
+      iFrameSize = 0;
+      iLayerSize = 0;
+      iLayerNum = 0;
+
+      if (pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip) {
+        pCtx->pFuncList->pfRc.pfWelsUpdateBufferWhenSkip (pCtx, iSpatialNum);
+      }
+
+      WelsRcPostFrameSkippedUpdate (pCtx, iCurDid);
+      pCtx->iEncoderError = ENC_RETURN_SUCCESS;
+      return ENC_RETURN_SUCCESS;
+    }
+
+    // deblocking filter
+    if (
+      (!pCtx->pCurDqLayer->bDeblockingParallelFlag) &&
+#if !defined(ENABLE_FRAME_DUMP)
+      ((eNalRefIdc != NRI_PRI_LOWEST) && (pSvcParam->sDependencyLayers[iCurDid].iHighestTemporalId == 0
+                                          || iCurTid < pSvcParam->sDependencyLayers[iCurDid].iHighestTemporalId)) &&
+#endif//!ENABLE_FRAME_DUMP
+      true
+    ) {
+      PerformDeblockingFilter (pCtx);
+    }
+
+    pCtx->pFuncList->pfRc.pfWelsRcPictureInfoUpdate (pCtx, iLayerSize);
+    iFrameSize += iLayerSize;
+    RcTraceFrameBits (pCtx, pFbi->uiTimeStamp, iFrameSize);
+    pCtx->pDecPic->iFrameAverageQp = pCtx->pWelsSvcRc[iCurDid].iAverageFrameQp;
+
+    //update scc related
+    pCtx->pFuncList->pfUpdateFMESwitch (pCtx->pCurDqLayer);
+
+    // reference picture list update
+    if (eNalRefIdc != NRI_PRI_LOWEST) {
+      if (!pCtx->pReferenceStrategy->UpdateRefList()) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "WelsEncoderEncodeExt(), WelsUpdateRefList failed. ForceCodingIDR!");
+        //the above is to set the next frame to be IDR
+        pCtx->iEncoderError = ENC_RETURN_CORRECTED;
+        break;
+      }
+    }
+
+
+    //check MinCr
+    {
+      int32_t iMinCrFrameSize = (pParam->iVideoWidth * pParam->iVideoHeight * 3) >> 2; //MinCr = 2;
+      if (pParam->uiLevelIdc == LEVEL_3_1 || pParam->uiLevelIdc == LEVEL_3_2 || pParam->uiLevelIdc == LEVEL_4_0)
+        iMinCrFrameSize >>= 1; //MinCr = 4
+      if (iFrameSize > iMinCrFrameSize)
+        WelsLog (pLogCtx, WELS_LOG_WARNING,
+                 "WelsEncoderEncodeExt()MinCr Checking,codec bitstream size is larger than Level limitation");
+    }
+#ifdef ENABLE_FRAME_DUMP
+    {
+      DumpDependencyRec (fsnr, &pSvcParam->sDependencyLayers[iCurDid].sRecFileName[0], iCurDid,
+                         pCtx->bDependencyRecFlag[iCurDid], pCtx->pCurDqLayer, pSvcParam->bSimulcastAVC);
+      pCtx->bDependencyRecFlag[iCurDid] = true;
+    }
+#endif//ENABLE_FRAME_DUMP
+
+#if defined(ENABLE_PSNR_CALC)
+    fSnrY = WelsCalcPsnr (fsnr->pData[0],
+                          fsnr->iLineSize[0],
+                          pEncPic->pData[0],
+                          pEncPic->iLineSize[0],
+                          iCurWidth,
+                          iCurHeight);
+    fSnrU = WelsCalcPsnr (fsnr->pData[1],
+                          fsnr->iLineSize[1],
+                          pEncPic->pData[1],
+                          pEncPic->iLineSize[1],
+                          (iCurWidth >> 1),
+                          (iCurHeight >> 1));
+    fSnrV = WelsCalcPsnr (fsnr->pData[2],
+                          fsnr->iLineSize[2],
+                          pEncPic->pData[2],
+                          pEncPic->iLineSize[2],
+                          (iCurWidth >> 1),
+                          (iCurHeight >> 1));
+#endif//ENABLE_PSNR_CALC
+
+#if defined(LAYER_INFO_OUTPUT)
+    fprintf (stderr, "%2s %5d: %-5d %2s   T%1d D%1d Q%-2d  QP%3d   Y%2.2f  U%2.2f  V%2.2f  %8d bits\n",
+             (iSpatialIdx == 0) ? "#AU" : "   ",
+             pParamInternal->iPOC,
+             pParamInternal->iFrameNum,
+             (eFrameType == videoFrameTypeI || eFrameType == videoFrameTypeIDR) ? "I" : "P",
+             iCurTid,
+             iCurDid,
+             0,
+             pCtx->pWelsSvcRc[pCtx->uiDependencyId].iAverageFrameQp,
+             fSnrY,
+             fSnrU,
+             fSnrV,
+             (iLayerSize << 3));
+#endif//LAYER_INFO_OUTPUT
+
+#if defined(STAT_OUTPUT)
+
+#if defined(ENABLE_PSNR_CALC)
+    {
+      pCtx->sStatData[iCurDid][0].sQualityStat.rYPsnr[pCtx->eSliceType] += fSnrY;
+      pCtx->sStatData[iCurDid][0].sQualityStat.rUPsnr[pCtx->eSliceType] += fSnrU;
+      pCtx->sStatData[iCurDid][0].sQualityStat.rVPsnr[pCtx->eSliceType] += fSnrV;
+    }
+#endif//ENABLE_PSNR_CALC
+
+#if defined(MB_TYPES_CHECK) //091025, frame output
+    if (pCtx->eSliceType == P_SLICE) {
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Intra4x4] += pCtx->sPerInfo.iMbCount[P_SLICE][Intra4x4];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Intra16x16] += pCtx->sPerInfo.iMbCount[P_SLICE][Intra16x16];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Inter16x16] += pCtx->sPerInfo.iMbCount[P_SLICE][Inter16x16];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Inter16x8] += pCtx->sPerInfo.iMbCount[P_SLICE][Inter16x8];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Inter8x16] += pCtx->sPerInfo.iMbCount[P_SLICE][Inter8x16];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][Inter8x8] += pCtx->sPerInfo.iMbCount[P_SLICE][Inter8x8];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][PSkip] += pCtx->sPerInfo.iMbCount[P_SLICE][PSkip];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][8] += pCtx->sPerInfo.iMbCount[P_SLICE][8];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][9] += pCtx->sPerInfo.iMbCount[P_SLICE][9];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][10] += pCtx->sPerInfo.iMbCount[P_SLICE][10];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[P_SLICE][11] += pCtx->sPerInfo.iMbCount[P_SLICE][11];
+    } else if (pCtx->eSliceType == I_SLICE) {
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[I_SLICE][Intra4x4] += pCtx->sPerInfo.iMbCount[I_SLICE][Intra4x4];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[I_SLICE][Intra16x16] += pCtx->sPerInfo.iMbCount[I_SLICE][Intra16x16];
+      pCtx->sStatData[iCurDid][0].sSliceData.iMbCount[I_SLICE][7] += pCtx->sPerInfo.iMbCount[I_SLICE][7];
+    }
+
+    memset (pCtx->sPerInfo.iMbCount[P_SLICE], 0, 18 * sizeof (int32_t));
+    memset (pCtx->sPerInfo.iMbCount[I_SLICE], 0, 18 * sizeof (int32_t));
+
+#endif//MB_TYPES_CHECK
+    {
+      ++ pCtx->sStatData[iCurDid][0].sSliceData.iSliceCount[pCtx->eSliceType]; // for multiple slices coding
+      pCtx->sStatData[iCurDid][0].sSliceData.iSliceSize[pCtx->eSliceType] += (iLayerSize << 3); // bits
+    }
+#endif//STAT_OUTPUT
+
+    iCountNal = pLayerBsInfo->iNalCount;
+    ++ iLayerNum;
+    ++ pLayerBsInfo;
+    ++ pCtx->pOut->iLayerBsIndex;
+    pLayerBsInfo->pBsBuf = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+    pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + iCountNal;
+
+    if (pSvcParam->iPaddingFlag && pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize > 0) {
+      int32_t iPaddingNalSize = 0;
+      pCtx->iEncoderError =  WritePadding (pCtx, pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize, iPaddingNalSize);
+      WELS_VERIFY_RETURN_IFNEQ (pCtx->iEncoderError, ENC_RETURN_SUCCESS)
+
+#if GOM_TRACE_FLAG
+      WelsLog (pLogCtx, WELS_LOG_INFO, "[RC] dependency ID = %d,encoding_qp = %d Padding: %d", pCtx->uiDependencyId,
+               pCtx->iGlobalQp,
+               pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize);
+#endif
+      if (iPaddingNalSize <= 0)
+        return ENC_RETURN_UNEXPECTED;
+
+      pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingBitrateStat += pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize;
+
+      pCtx->pWelsSvcRc[pCtx->uiDependencyId].iPaddingSize = 0;
+
+      pLayerBsInfo->uiSpatialId         = 0;
+      pLayerBsInfo->uiTemporalId        = 0;
+      pLayerBsInfo->uiQualityId         = 0;
+      pLayerBsInfo->uiLayerType         = NON_VIDEO_CODING_LAYER;
+      pLayerBsInfo->iNalCount           = 1;
+      pLayerBsInfo->pNalLengthInByte[0] = iPaddingNalSize;
+      pLayerBsInfo->eFrameType          = eFrameType;
+      pLayerBsInfo->iSubSeqId = GetSubSequenceId (pCtx, eFrameType);
+      ++ pLayerBsInfo;
+      ++ pCtx->pOut->iLayerBsIndex;
+      pLayerBsInfo->pBsBuf           = pCtx->pFrameBs + pCtx->iPosBsBuffer;
+      pLayerBsInfo->pNalLengthInByte = (pLayerBsInfo - 1)->pNalLengthInByte + 1;
+      ++ iLayerNum;
+
+      iFrameSize += iPaddingNalSize;
+    }
+
+    if ((pParam->sSliceArgument.uiSliceMode == SM_FIXEDSLCNUM_SLICE)
+        && pSvcParam->bUseLoadBalancing
+        && pSvcParam->iMultipleThreadIdc > 1 &&
+        pSvcParam->iMultipleThreadIdc >= pParam->sSliceArgument.uiSliceNum) {
+      CalcSliceComplexRatio (pCtx->pCurDqLayer);
+#if defined(MT_DEBUG)
+      TrackSliceComplexities (pCtx, iCurDid);
+#endif//#if defined(MT_DEBUG)
+    }
+
+    pCtx->eLastNalPriority[iCurDid] = eNalRefIdc;
+    ++ iSpatialIdx;
+
+    if (iCurDid + 1 < pSvcParam->iSpatialLayerNum) {
+      //for next layer, note that iSpatialIdx has been ++ so it is pointer to next layer
+      WelsSwapDqLayers (pCtx, (pSpatialIndexMap + iSpatialIdx)->iDid);
+    }
+
+    if (pCtx->pVpp->UpdateSpatialPictures (pCtx, pSvcParam, iCurTid, iCurDid) != 0) {
+      ForceCodingIDR (pCtx, iCurDid);
+      WelsLog (pLogCtx, WELS_LOG_WARNING,
+               "WelsEncoderEncodeExt(), Logic Error Found in Preprocess updating. ForceCodingIDR!");
+      //the above is to set the next frame IDR
+      pFbi->eFrameType = eFrameType;
+      pLayerBsInfo->eFrameType = eFrameType;
+      return ENC_RETURN_CORRECTED;
+    }
+
+    if (pSvcParam->bEnableLongTermReference && ((pCtx->pLtr[pCtx->uiDependencyId].bLTRMarkingFlag
+        && (pCtx->pLtr[pCtx->uiDependencyId].iLTRMarkMode == LTR_DIRECT_MARK)) || eFrameType == videoFrameTypeIDR)) {
+      pCtx->bRefOfCurTidIsLtr[iCurDid][iCurTid] = true;
+    }
+    if (pSvcParam->bSimulcastAVC)
+      ++ pParamInternal->iCodingIndex;
+  }//end of (iSpatialIdx/iSpatialNum)
+
+  if (!pSvcParam->bSimulcastAVC) {
+    for (int32_t i = 0; i < pSvcParam->iSpatialLayerNum; i++) {
+      SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[i];
+      pParamInternal->iCodingIndex ++;
+    }
+  }
+
+  if (ENC_RETURN_CORRECTED == pCtx->iEncoderError) {
+    pCtx->pVpp->UpdateSpatialPictures (pCtx, pSvcParam, iCurTid, (pSpatialIndexMap + iSpatialIdx)->iDid);
+    ForceCodingIDR (pCtx, (pSpatialIndexMap + iSpatialIdx)->iDid);
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "WelsEncoderEncodeExt(), Logic Error Found in temporal level. ForceCodingIDR!");
+    //the above is to set the next frame IDR
+    pFbi->eFrameType = eFrameType;
+    pLayerBsInfo->eFrameType = eFrameType;
+    return ENC_RETURN_CORRECTED;
+  }
+
+#if defined(MT_DEBUG)
+  TrackSliceConsumeTime (pCtx, iDidList, iSpatialNum);
+#endif//MT_DEBUG
+
+  // to check number of layers / nals / slices dependencies
+  if (iLayerNum > MAX_LAYER_NUM_OF_FRAME) {
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR, "WelsEncoderEncodeExt(), iLayerNum(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
+             iLayerNum, MAX_LAYER_NUM_OF_FRAME);
+    return 1;
+  }
+
+
+  pFbi->iLayerNum = iLayerNum;
+
+  WelsLog (pLogCtx, WELS_LOG_DEBUG, "WelsEncoderEncodeExt() OutputInfo iLayerNum = %d,iFrameSize = %d",
+           iLayerNum, iFrameSize);
+  for (int32_t i = 0; i < iLayerNum; i++)
+    WelsLog (pLogCtx, WELS_LOG_DEBUG,
+             "WelsEncoderEncodeExt() OutputInfo iLayerId = %d,iNalType = %d,iNalCount = %d, first Nal Length=%d,uiSpatialId = %d,uiTemporalId = %d,iSubSeqId = %d",
+             i,
+             pFbi->sLayerInfo[i].uiLayerType, pFbi->sLayerInfo[i].iNalCount, pFbi->sLayerInfo[i].pNalLengthInByte[0],
+             pFbi->sLayerInfo[i].uiSpatialId, pFbi->sLayerInfo[i].uiTemporalId, pFbi->sLayerInfo[i].iSubSeqId);
+  WelsEmms();
+
+  pLayerBsInfo->eFrameType = eFrameType;
+  pFbi->iFrameSizeInBytes = iFrameSize;
+  pFbi->eFrameType = eFrameType;
+  for (int32_t k = 0; k < pFbi->iLayerNum; k++) {
+    if (pFbi->eFrameType != pFbi->sLayerInfo[k].eFrameType) {
+      pFbi->eFrameType = videoFrameTypeIPMixed;
+    }
+  }
+#ifdef _DEBUG
+  if (pFbi->iLayerNum > MAX_LAYER_NUM_OF_FRAME) {
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR, "WelsEncoderEncodeExt(), iLayerNum(%d) > MAX_LAYER_NUM_OF_FRAME(%d)!",
+             pFbi->iLayerNum, MAX_LAYER_NUM_OF_FRAME);
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  int32_t iTotalNal = 0;
+  for (int32_t k = 0; k < pFbi->iLayerNum; k++) {
+    iTotalNal += pFbi->sLayerInfo[k].iNalCount;
+
+    if ((pCtx->iActiveThreadsNum > 1) && (MAX_NAL_UNITS_IN_LAYER < pFbi->sLayerInfo[k].iNalCount)) {
+      WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR,
+               "WelsEncoderEncodeExt(), iCountNumNals(%d) > MAX_NAL_UNITS_IN_LAYER(%d) under multi-thread(%d) NOT supported!",
+               pFbi->sLayerInfo[k].iNalCount, MAX_NAL_UNITS_IN_LAYER, pCtx->iActiveThreadsNum);
+      return ENC_RETURN_UNEXPECTED;
+    }
+  }
+
+  if (iTotalNal > pCtx->pOut->iCountNals) {
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR, "WelsEncoderEncodeExt(), iTotalNal(%d) > iCountNals(%d)!",
+             iTotalNal, pCtx->pOut->iCountNals);
+    return ENC_RETURN_UNEXPECTED;
+  }
+#endif
+  return ENC_RETURN_SUCCESS;
+}
+
+/*!
+ * \brief   Wels SVC encoder parameters adjustment
+ *          SVC adjustment results in new requirement in memory blocks adjustment
+ */
+int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewParam) {
+  SWelsSvcCodingParam* pOldParam = NULL;
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+  int8_t iIndexD = 0;
+  bool bNeedReset = false;
+  int16_t iSliceNum = 1; // number of slices used
+  int32_t iCacheLineSize = 16; // on chip cache line size in byte
+  uint32_t uiCpuFeatureFlags = 0;
+
+  if (NULL == ppCtx || NULL == *ppCtx || NULL == pNewParam) return 1;
+
+  /* Check validation in new parameters */
+  iReturn = ParamValidationExt (& (*ppCtx)->sLogCtx, pNewParam);
+  if (iReturn != ENC_RETURN_SUCCESS) return iReturn;
+
+  iReturn = GetMultipleThreadIdc (& (*ppCtx)->sLogCtx, pNewParam, iSliceNum, iCacheLineSize, uiCpuFeatureFlags);
+  if (iReturn != ENC_RETURN_SUCCESS) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR, "WelsEncoderParamAdjust(), GetMultipleThreadIdc failed return %d.",
+             iReturn);
+    return iReturn;
+  }
+
+  pOldParam = (*ppCtx)->pSvcParam;
+
+  if (pOldParam->iUsageType != pNewParam->iUsageType) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+             "WelsEncoderParamAdjust(), does not expect in-middle change of iUsgaeType from %d to %d", pOldParam->iUsageType,
+             pNewParam->iUsageType);
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }
+
+  /* Decide whether need reset for IDR frame based on adjusting prarameters changed */
+  /* Temporal levels, spatial settings and/ or quality settings changed need update parameter sets related. */
+  bNeedReset = (pOldParam == NULL) ||
+               (pOldParam->bSimulcastAVC != pNewParam->bSimulcastAVC) ||
+               (pOldParam->iSpatialLayerNum != pNewParam->iSpatialLayerNum) ||
+               (pOldParam->iPicWidth != pNewParam->iPicWidth
+                || pOldParam->iPicHeight != pNewParam->iPicHeight) ||
+               (pOldParam->SUsedPicRect.iWidth != pNewParam->SUsedPicRect.iWidth
+                || pOldParam->SUsedPicRect.iHeight != pNewParam->SUsedPicRect.iHeight) ||
+               (pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) ||
+               (pOldParam->iLTRRefNum != pNewParam->iLTRRefNum) ||
+               (pOldParam->iMultipleThreadIdc != pNewParam->iMultipleThreadIdc) ||
+               (pOldParam->bEnableBackgroundDetection != pNewParam->bEnableBackgroundDetection) ||
+               (pOldParam->bEnableAdaptiveQuant != pNewParam->bEnableAdaptiveQuant) ||
+               (pOldParam->eSpsPpsIdStrategy != pNewParam->eSpsPpsIdStrategy);
+  if ((pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) ||
+      ((pOldParam->iMaxNumRefFrame == 1) && (pOldParam->iTemporalLayerNum == 1) && (pNewParam->iTemporalLayerNum == 2))) {
+    bNeedReset = true;
+  }
+  if (bNeedReset) {
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+             "WelsEncoderParamAdjust(),bSimulcastAVC(%d,%d),iSpatialLayerNum(%d,%d),iPicWidth(%d,%d),iPicHeight(%d,%d),Rect.iWidth(%d,%d),Rect.iHeight(%d,%d)",
+             pOldParam->bSimulcastAVC, pNewParam->bSimulcastAVC,
+             pOldParam->iSpatialLayerNum, pNewParam->iSpatialLayerNum,
+             pOldParam->iPicWidth, pNewParam->iPicWidth,
+             pOldParam->iPicHeight, pNewParam->iPicHeight,
+             pOldParam->SUsedPicRect.iWidth, pNewParam->SUsedPicRect.iWidth,
+             pOldParam->SUsedPicRect.iHeight, pNewParam->SUsedPicRect.iHeight);
+
+    WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+             "WelsEncoderParamAdjust(),bEnableLongTermReference(%d,%d),iLTRRefNum(%d,%d),iMultipleThreadIdc(%d,%d),bEnableBackgroundDetection(%d,%d),bEnableAdaptiveQuant(%d,%d),eSpsPpsIdStrategy(%d,%d),iMaxNumRefFrame(%d,%d),iTemporalLayerNum(%d,%d)",
+             pOldParam->bEnableLongTermReference, pNewParam->bEnableLongTermReference,
+             pOldParam->iLTRRefNum, pNewParam->iLTRRefNum,
+             pOldParam->iMultipleThreadIdc, pNewParam->iMultipleThreadIdc,
+             pOldParam->bEnableBackgroundDetection, pNewParam->bEnableBackgroundDetection,
+             pOldParam->bEnableAdaptiveQuant, pNewParam->bEnableAdaptiveQuant,
+             pOldParam->eSpsPpsIdStrategy, pNewParam->eSpsPpsIdStrategy,
+             pOldParam->iMaxNumRefFrame, pNewParam->iMaxNumRefFrame,
+             pOldParam->iTemporalLayerNum, pNewParam->iTemporalLayerNum);
+  }
+  if (!bNeedReset) { // Check its picture resolutions/quality settings respectively in each dependency layer
+    iIndexD = 0;
+    assert (pOldParam->iSpatialLayerNum == pNewParam->iSpatialLayerNum);
+    do {
+      const SSpatialLayerInternal* kpOldDlp     = &pOldParam->sDependencyLayers[iIndexD];
+      const SSpatialLayerInternal* kpNewDlp     = &pNewParam->sDependencyLayers[iIndexD];
+      float fT1 = .0f;
+      float fT2 = .0f;
+
+      // check frame size settings
+      if (pOldParam->sSpatialLayers[iIndexD].iVideoWidth != pNewParam->sSpatialLayers[iIndexD].iVideoWidth ||
+          pOldParam->sSpatialLayers[iIndexD].iVideoHeight != pNewParam->sSpatialLayers[iIndexD].iVideoHeight ||
+          kpOldDlp->iActualWidth != kpNewDlp->iActualWidth ||
+          kpOldDlp->iActualHeight != kpNewDlp->iActualHeight) {
+        bNeedReset = true;
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+                 "WelsEncoderParamAdjust(),iIndexD = %d,sSpatialLayers.wxh_old(%d,%d),sSpatialLayers.wxh_new(%d,%d),iActualwxh_old(%d,%d),iActualwxh_new(%d,%d)",
+                 iIndexD, pOldParam->sSpatialLayers[iIndexD].iVideoWidth, pOldParam->sSpatialLayers[iIndexD].iVideoHeight,
+                 pNewParam->sSpatialLayers[iIndexD].iVideoWidth, pNewParam->sSpatialLayers[iIndexD].iVideoHeight,
+                 kpOldDlp->iActualWidth, kpOldDlp->iActualHeight,
+                 kpNewDlp->iActualWidth, kpNewDlp->iActualHeight);
+        break;
+      }
+
+      if (pOldParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceMode !=
+          pNewParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceMode
+          ||
+          pOldParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceNum !=
+          pNewParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceNum) {
+
+        bNeedReset = true;
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+                 "WelsEncoderParamAdjust(),iIndexD = %d,uiSliceMode (%d,%d),uiSliceNum(%d,%d)", iIndexD,
+                 pOldParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceMode,
+                 pNewParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceMode,
+                 pOldParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceNum,
+                 pNewParam->sSpatialLayers[iIndexD].sSliceArgument.uiSliceNum);
+
+        break;
+      }
+
+      // check frame rate
+      // we can not check whether corresponding fFrameRate is equal or not,
+      // only need to check d_max/d_min and max_fr/d_max whether it is equal or not
+      if (kpNewDlp->fInputFrameRate > EPSN && kpOldDlp->fInputFrameRate > EPSN)
+        fT1 = kpNewDlp->fOutputFrameRate / kpNewDlp->fInputFrameRate - kpOldDlp->fOutputFrameRate / kpOldDlp->fInputFrameRate;
+      if (kpNewDlp->fOutputFrameRate > EPSN && kpOldDlp->fOutputFrameRate > EPSN)
+        fT2 = pNewParam->fMaxFrameRate / kpNewDlp->fOutputFrameRate - pOldParam->fMaxFrameRate / kpOldDlp->fOutputFrameRate;
+      if (fT1 > EPSN || fT1 < -EPSN || fT2 > EPSN || fT2 < -EPSN) {
+        bNeedReset = true;
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+                 "WelsEncoderParamAdjust() iIndexD = %d,fInputFrameRate(%f,%f),fOutputFrameRate(%f,%f),fMaxFrameRate(%f,%f)", iIndexD,
+                 kpOldDlp->fInputFrameRate, kpNewDlp->fInputFrameRate,
+                 kpOldDlp->fOutputFrameRate, kpNewDlp->fOutputFrameRate,
+                 pOldParam->fMaxFrameRate, pNewParam->fMaxFrameRate);
+        break;
+      }
+      if (pOldParam->sSpatialLayers[iIndexD].uiProfileIdc != pNewParam->sSpatialLayers[iIndexD].uiProfileIdc) {
+        bNeedReset = true;
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+                 "WelsEncoderParamAdjust(),iIndexD = %d,uiProfileIdc(%d,%d)", iIndexD,
+                 pOldParam->sSpatialLayers[iIndexD].uiProfileIdc, pNewParam->sSpatialLayers[iIndexD].uiProfileIdc);
+        break;
+      }
+      //check level change,if new level is smaller than old level,don't reset encoder. still use old level.
+
+      if (pNewParam->sSpatialLayers[iIndexD].uiLevelIdc > pOldParam->sSpatialLayers[iIndexD].uiLevelIdc) {
+        bNeedReset = true;
+        WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_INFO,
+                 "WelsEncoderParamAdjust(),iIndexD = %d,uiLevelIdc(%d,%d)", iIndexD,
+                 pOldParam->sSpatialLayers[iIndexD].uiLevelIdc, pNewParam->sSpatialLayers[iIndexD].uiLevelIdc);
+        break;
+      }
+      ++ iIndexD;
+    } while (iIndexD < pOldParam->iSpatialLayerNum);
+  }
+
+  if (bNeedReset) {
+    SLogContext sLogCtx = (*ppCtx)->sLogCtx;
+
+    int32_t iOldSpsPpsIdStrategy = pOldParam->eSpsPpsIdStrategy;
+    SParaSetOffsetVariable sTmpPsoVariable[PARA_SET_TYPE];
+    int32_t  iTmpPpsIdList[MAX_DQ_LAYER_NUM * MAX_PPS_COUNT];
+    //for LTR or SPS,PPS ID update
+    uint16_t uiMaxIdrPicId = 0;
+    for (iIndexD = 0; iIndexD < pOldParam->iSpatialLayerNum; iIndexD++) {
+      if (pOldParam->sDependencyLayers[iIndexD].uiIdrPicId > uiMaxIdrPicId)
+        uiMaxIdrPicId = pOldParam->sDependencyLayers[iIndexD].uiIdrPicId;
+    }
+
+    //for sEncoderStatistics
+    SEncoderStatistics sTempEncoderStatistics[MAX_DEPENDENCY_LAYER];
+    memcpy (sTempEncoderStatistics, (*ppCtx)->sEncoderStatistics, sizeof (sTempEncoderStatistics));
+    int64_t            uiStartTimestamp = (*ppCtx)->uiStartTimestamp;
+    int32_t            iStatisticsLogInterval = (*ppCtx)->iStatisticsLogInterval;
+    int64_t            iLastStatisticsLogTs = (*ppCtx)->iLastStatisticsLogTs;
+    //for sEncoderStatistics
+
+    SExistingParasetList sExistingParasetList;
+    SExistingParasetList* pExistingParasetList = NULL;
+
+    if (((CONSTANT_ID != iOldSpsPpsIdStrategy) && (CONSTANT_ID != pNewParam->eSpsPpsIdStrategy))) {
+      (*ppCtx)->pFuncList->pParametersetStrategy->OutputCurrentStructure (sTmpPsoVariable, iTmpPpsIdList, (*ppCtx),
+          &sExistingParasetList);
+
+      if ((SPS_LISTING & iOldSpsPpsIdStrategy)
+          && (SPS_LISTING & pNewParam->eSpsPpsIdStrategy)) {
+        pExistingParasetList = &sExistingParasetList;
+      }
+    }
+
+    WelsUninitEncoderExt (ppCtx);
+
+    /* Update new parameters */
+    if (WelsInitEncoderExt (ppCtx, pNewParam, &sLogCtx, pExistingParasetList))
+      return 1;
+    //if WelsInitEncoderExt succeed
+    //for LTR or SPS,PPS ID update
+    for (iIndexD = 0; iIndexD < pNewParam->iSpatialLayerNum; iIndexD++) {
+      (*ppCtx)->pSvcParam->sDependencyLayers[iIndexD].uiIdrPicId = uiMaxIdrPicId;
+    }
+
+    //for sEncoderStatistics
+    memcpy ((*ppCtx)->sEncoderStatistics, sTempEncoderStatistics, sizeof (sTempEncoderStatistics));
+    (*ppCtx)->uiStartTimestamp = uiStartTimestamp;
+    (*ppCtx)->iStatisticsLogInterval = iStatisticsLogInterval;
+    (*ppCtx)->iLastStatisticsLogTs = iLastStatisticsLogTs;
+    //for sEncoderStatistics
+
+    //load back the needed structure for eSpsPpsIdStrategy
+    if (((CONSTANT_ID != iOldSpsPpsIdStrategy) && (CONSTANT_ID != pNewParam->eSpsPpsIdStrategy))
+        || ((SPS_PPS_LISTING == iOldSpsPpsIdStrategy)
+            && (SPS_PPS_LISTING == pNewParam->eSpsPpsIdStrategy))) {
+      (*ppCtx)->pFuncList->pParametersetStrategy->LoadPreviousStructure (sTmpPsoVariable, iTmpPpsIdList);
+    }
+  } else {
+    /* maybe adjustment introduced in bitrate or little settings adjustment and so on.. */
+    pNewParam->iNumRefFrame                     = WELS_CLIP3 (pNewParam->iNumRefFrame, MIN_REF_PIC_COUNT,
+        (pNewParam->iUsageType == CAMERA_VIDEO_REAL_TIME ? MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA :
+         MAX_REFERENCE_PICTURE_COUNT_NUM_SCREEN));
+    pNewParam->iLoopFilterDisableIdc            = WELS_CLIP3 (pNewParam->iLoopFilterDisableIdc, 0, 6);
+    pNewParam->iLoopFilterAlphaC0Offset         = WELS_CLIP3 (pNewParam->iLoopFilterAlphaC0Offset, -6, 6);
+    pNewParam->iLoopFilterBetaOffset            = WELS_CLIP3 (pNewParam->iLoopFilterBetaOffset, -6, 6);
+    pNewParam->fMaxFrameRate                    = WELS_CLIP3 (pNewParam->fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
+
+    // we can not use direct struct based memcpy due some fields need keep unchanged as before
+    pOldParam->fMaxFrameRate    = pNewParam->fMaxFrameRate;             // maximal frame rate [Hz / fps]
+    pOldParam->iComplexityMode  = pNewParam->iComplexityMode;                   // color space of input sequence
+    pOldParam->uiIntraPeriod    = pNewParam->uiIntraPeriod;             // intra period (multiple of GOP size as desired)
+    pOldParam->eSpsPpsIdStrategy = pNewParam->eSpsPpsIdStrategy;
+    pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl;
+    pOldParam->iNumRefFrame     = pNewParam->iNumRefFrame;              // number of reference frame used
+    pOldParam->uiGopSize = pNewParam->uiGopSize;
+    if (pOldParam->iTemporalLayerNum != pNewParam->iTemporalLayerNum) {
+      pOldParam->iTemporalLayerNum = pNewParam->iTemporalLayerNum;
+      for (int32_t iIndexD = 0; iIndexD < MAX_DEPENDENCY_LAYER; iIndexD++)
+        pOldParam->sDependencyLayers[iIndexD].iCodingIndex = 0;
+    }
+    pOldParam->iDecompStages = pNewParam->iDecompStages;
+    /* denoise control */
+    pOldParam->bEnableDenoise = pNewParam->bEnableDenoise;
+
+    /* background detection control */
+    pOldParam->bEnableBackgroundDetection = pNewParam->bEnableBackgroundDetection;
+
+    /* adaptive quantization control */
+    pOldParam->bEnableAdaptiveQuant = pNewParam->bEnableAdaptiveQuant;
+
+    /* int32_t term reference control */
+    pOldParam->bEnableLongTermReference = pNewParam->bEnableLongTermReference;
+    pOldParam->iLtrMarkPeriod = pNewParam->iLtrMarkPeriod;
+
+    // keep below values unchanged as before
+    pOldParam->bEnableSSEI              = pNewParam->bEnableSSEI;
+    pOldParam->bSimulcastAVC            = pNewParam->bSimulcastAVC;
+    pOldParam->bEnableFrameCroppingFlag = pNewParam->bEnableFrameCroppingFlag;  // enable frame cropping flag
+
+    /* Motion search */
+
+    /* Deblocking loop filter */
+    pOldParam->iLoopFilterDisableIdc    =
+      pNewParam->iLoopFilterDisableIdc;     // 0: on, 1: off, 2: on except for slice boundaries
+    pOldParam->iLoopFilterAlphaC0Offset = pNewParam->iLoopFilterAlphaC0Offset;// AlphaOffset: valid range [-6, 6], default 0
+    pOldParam->iLoopFilterBetaOffset    =
+      pNewParam->iLoopFilterBetaOffset;     // BetaOffset:  valid range [-6, 6], default 0
+
+    /* Rate Control */
+    pOldParam->iRCMode          = pNewParam->iRCMode;
+    pOldParam->iTargetBitrate   =
+      pNewParam->iTargetBitrate;                    // overall target bitrate introduced in RC module
+    pOldParam->iPaddingFlag     = pNewParam->iPaddingFlag;
+
+    /* Layer definition */
+    pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl;
+
+    // d
+    iIndexD = 0;
+    do {
+      SSpatialLayerInternal* pOldDlpInternal    = &pOldParam->sDependencyLayers[iIndexD];
+      SSpatialLayerInternal* pNewDlpInternal    = &pNewParam->sDependencyLayers[iIndexD];
+
+      SSpatialLayerConfig* pOldDlp      = &pOldParam->sSpatialLayers[iIndexD];
+      SSpatialLayerConfig* pNewDlp      = &pNewParam->sSpatialLayers[iIndexD];
+
+      pOldDlpInternal->fInputFrameRate  = pNewDlpInternal->fInputFrameRate;     // input frame rate
+      pOldDlpInternal->fOutputFrameRate = pNewDlpInternal->fOutputFrameRate;    // output frame rate
+      pOldDlp->iSpatialBitrate          = pNewDlp->iSpatialBitrate;
+      pOldDlp->iMaxSpatialBitrate       = pNewDlp->iMaxSpatialBitrate;
+      pOldDlp->uiProfileIdc             =
+        pNewDlp->uiProfileIdc;                        // value of profile IDC (0 for auto-detection)
+      pOldDlp->iDLayerQp                = pNewDlp->iDLayerQp;
+
+      /* Derived variants below */
+      pOldDlpInternal->iTemporalResolution      = pNewDlpInternal->iTemporalResolution;
+      pOldDlpInternal->iDecompositionStages     = pNewDlpInternal->iDecompositionStages;
+      memcpy (pOldDlpInternal->uiCodingIdx2TemporalId, pNewDlpInternal->uiCodingIdx2TemporalId,
+              sizeof (pOldDlpInternal->uiCodingIdx2TemporalId)); // confirmed_safe_unsafe_usage
+      ++ iIndexD;
+    } while (iIndexD < pOldParam->iSpatialLayerNum);
+  }
+
+  /* Any else initialization/reset for rate control here? */
+
+  return 0;
+}
+
+int32_t WelsEncoderApplyLTR (SLogContext* pLogCtx, sWelsEncCtx** ppCtx, SLTRConfig* pLTRValue) {
+  SWelsSvcCodingParam sConfig;
+  int32_t iNumRefFrame = 1;
+  int32_t iRet = 0;
+  memcpy (&sConfig, (*ppCtx)->pSvcParam, sizeof (SWelsSvcCodingParam));
+  sConfig.bEnableLongTermReference = pLTRValue->bEnableLongTermReference;
+  sConfig.iLTRRefNum = pLTRValue->iLTRRefNum;
+  int32_t uiGopSize = 1 << (sConfig.iTemporalLayerNum - 1);
+  if (sConfig.iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    if (sConfig.bEnableLongTermReference) {
+      sConfig.iLTRRefNum = LONG_TERM_REF_NUM_SCREEN;//WELS_CLIP3 (sConfig.iLTRRefNum, 1, LONG_TERM_REF_NUM_SCREEN);
+      iNumRefFrame = WELS_MAX (1, WELS_LOG2 (uiGopSize)) + sConfig.iLTRRefNum;
+    } else {
+      sConfig.iLTRRefNum = 0;
+      iNumRefFrame = WELS_MAX (1, uiGopSize >> 1);
+    }
+  } else {
+    if (sConfig.bEnableLongTermReference) {
+      sConfig.iLTRRefNum = LONG_TERM_REF_NUM;//WELS_CLIP3 (sConfig.iLTRRefNum, 1, LONG_TERM_REF_NUM);
+    } else {
+      sConfig.iLTRRefNum = 0;
+    }
+    iNumRefFrame = ((uiGopSize >> 1) > 1) ? ((uiGopSize >> 1) + sConfig.iLTRRefNum) : (MIN_REF_PIC_COUNT +
+                   sConfig.iLTRRefNum);
+    iNumRefFrame = WELS_CLIP3 (iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);
+
+  }
+  if (iNumRefFrame > sConfig.iMaxNumRefFrame) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             " CWelsH264SVCEncoder::SetOption LTR flag = %d and number = %d: Required number of reference increased to %d and iMaxNumRefFrame is adjusted (from %d)",
+             sConfig.bEnableLongTermReference, sConfig.iLTRRefNum, iNumRefFrame, sConfig.iMaxNumRefFrame);
+    sConfig.iMaxNumRefFrame = iNumRefFrame;
+  }
+
+  if (sConfig.iNumRefFrame < iNumRefFrame) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             " CWelsH264SVCEncoder::SetOption LTR flag = %d and number = %d, Required number of reference increased from Old = %d to New = %d because of LTR setting",
+             sConfig.bEnableLongTermReference, sConfig.iLTRRefNum, sConfig.iNumRefFrame, iNumRefFrame);
+    sConfig.iNumRefFrame = iNumRefFrame;
+  }
+  WelsLog (pLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::SetOption enable LTR = %d,ltrnum = %d",
+           sConfig.bEnableLongTermReference, sConfig.iLTRRefNum);
+  iRet = WelsEncoderParamAdjust (ppCtx, &sConfig);
+  return iRet;
+}
+
+int32_t DynSliceRealloc (sWelsEncCtx* pCtx,
+                         SFrameBSInfo* pFrameBsInfo,
+                         SLayerBSInfo* pLayerBsInfo) {
+  int32_t iRet = 0;
+
+  iRet = FrameBsRealloc (pCtx, pFrameBsInfo, pLayerBsInfo, pCtx->pCurDqLayer->iMaxSliceNum);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  iRet = ReallocSliceBuffer (pCtx);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  return iRet;
+}
+
+int32_t WelsCodeOnePicPartition (sWelsEncCtx* pCtx,
+                                 SFrameBSInfo* pFrameBSInfo,
+                                 SLayerBSInfo* pLayerBsInfo,
+                                 int32_t* pNalIdxInLayer,
+                                 int32_t* pLayerSize,
+                                 int32_t iFirstMbIdxInPartition,
+                                 int32_t iEndMbIdxInPartition,
+                                 int32_t iStartSliceIdx
+                                ) {
+
+  SDqLayer* pCurLayer                   = pCtx->pCurDqLayer;
+  uint32_t uSlcBuffIdx                  = 0;
+  SSlice* pStartSlice                   = &pCurLayer->sSliceBufferInfo[uSlcBuffIdx].pSliceBuffer[iStartSliceIdx];
+  int32_t iNalIdxInLayer                = *pNalIdxInLayer;
+  int32_t iSliceIdx                     = iStartSliceIdx;
+  const int32_t kiSliceStep             = pCtx->iActiveThreadsNum;
+  const int32_t kiPartitionId           = iStartSliceIdx % kiSliceStep;
+  int32_t iPartitionBsSize              = 0;
+  int32_t iAnyMbLeftInPartition         = iEndMbIdxInPartition - iFirstMbIdxInPartition + 1;
+  const EWelsNalUnitType keNalType      = pCtx->eNalType;
+  const EWelsNalRefIdc keNalRefIdc      = pCtx->eNalPriority;
+  const bool kbNeedPrefix               = pCtx->bNeedPrefixNalFlag;
+  const int32_t kiSliceIdxStep          = pCtx->iActiveThreadsNum;
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+
+  pStartSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = iFirstMbIdxInPartition;
+
+  while (iAnyMbLeftInPartition > 0) {
+    int32_t iSliceSize      = 0;
+    int32_t iPayloadSize    = 0;
+    SSlice* pCurSlice = NULL;
+
+    if (iSliceIdx >= (pCurLayer->sSliceBufferInfo[uSlcBuffIdx].iMaxSliceNum -
+                      kiSliceIdxStep)) { // insufficient memory in pSliceInLayer[]
+      if (pCtx->iActiveThreadsNum == 1) {
+        //only single thread support re-alloc now
+        if (DynSliceRealloc (pCtx, pFrameBSInfo, pLayerBsInfo)) {
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+                   "CWelsH264SVCEncoder::WelsCodeOnePicPartition: DynSliceRealloc not successful");
+          return ENC_RETURN_MEMALLOCERR;
+        }
+      } else if (iSliceIdx >= pCurLayer->iMaxSliceNum) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+                 "CWelsH264SVCEncoder::WelsCodeOnePicPartition: iSliceIdx(%d) over iMaxSliceNum(%d)", iSliceIdx,
+                 pCurLayer->iMaxSliceNum);
+        return ENC_RETURN_MEMALLOCERR;
+      }
+    }
+
+    if (kbNeedPrefix) {
+      iReturn = AddPrefixNal (pCtx, pLayerBsInfo, &pLayerBsInfo->pNalLengthInByte[0], &iNalIdxInLayer, keNalType, keNalRefIdc,
+                              iPayloadSize);
+      WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+      iPartitionBsSize += iPayloadSize;
+    }
+
+    WelsLoadNal (pCtx->pOut, keNalType, keNalRefIdc);
+    pCurSlice = &pCtx->pCurDqLayer->sSliceBufferInfo[uSlcBuffIdx].pSliceBuffer[iSliceIdx];
+    pCurSlice->iSliceIdx = iSliceIdx;
+
+    iReturn = WelsCodeOneSlice (pCtx, pCurSlice, keNalType);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    WelsUnloadNal (pCtx->pOut);
+
+    iReturn = WelsEncodeNal (&pCtx->pOut->sNalList[pCtx->pOut->iNalIndex - 1],
+                             &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt,
+                             pCtx->iFrameBsSize - pCtx->iPosBsBuffer,
+                             pCtx->pFrameBs + pCtx->iPosBsBuffer,
+                             &pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer]);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    iSliceSize = pLayerBsInfo->pNalLengthInByte[iNalIdxInLayer];
+
+    pCtx->iPosBsBuffer  += iSliceSize;
+    iPartitionBsSize    += iSliceSize;
+
+#if defined(SLICE_INFO_OUTPUT)
+    fprintf (stderr,
+             "@slice=%-6d sliceType:%c idc:%d size:%-6d\n",
+             iSliceIdx,
+             (pCtx->eSliceType == P_SLICE ? 'P' : 'I'),
+             keNalRefIdc,
+             iSliceSize);
+#endif//SLICE_INFO_OUTPUT
+
+    ++ iNalIdxInLayer;
+    iSliceIdx += kiSliceStep; //if iSliceIdx is not continuous
+    iAnyMbLeftInPartition = iEndMbIdxInPartition - pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId];
+  }
+
+  *pLayerSize           = iPartitionBsSize;
+  *pNalIdxInLayer       = iNalIdxInLayer;
+
+  // slice based packing???
+  pLayerBsInfo->uiLayerType     = VIDEO_CODING_LAYER;
+  pLayerBsInfo->uiSpatialId     = pCtx->uiDependencyId;
+  pLayerBsInfo->uiTemporalId    = pCtx->uiTemporalId;
+  pLayerBsInfo->uiQualityId     = 0;
+  pLayerBsInfo->iNalCount       = iNalIdxInLayer;
+  return ENC_RETURN_SUCCESS;
+}
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/get_intra_predictor.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/get_intra_predictor.cpp
new file mode 100644
index 0000000000..ab6de930b3
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/get_intra_predictor.cpp
@@ -0,0 +1,738 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    get_intra_predictor.c
+ *
+ * \brief   implementation for get intra predictor about 16x16, 4x4, chroma.
+ *
+ * \date    4/2/2009 Created
+ *          9/14/2009 C level based optimization with high performance gained.
+ *              [const, using ST32/ST64 to replace memset, memcpy and memmove etc.]
+ *
+ *************************************************************************************
+ */
+#include "ls_defines.h"
+#include "cpu_core.h"
+#include "intra_pred_common.h"
+#include "get_intra_predictor.h"
+
+namespace WelsEnc {
+#define I4x4_COUNT 4
+#define I8x8_COUNT 8
+#define I16x16_COUNT 16
+
+typedef void (*PFillingPred) (uint8_t* pPred, uint8_t* pSrc);
+typedef void (*PFillingPred1to16) (uint8_t* pPred, const uint8_t kuiSrc);
+
+static inline void WelsFillingPred8to16_c (uint8_t* pPred, uint8_t* pSrc) {
+  ST64 (pPred  , LD64 (pSrc));
+  ST64 (pPred + 8, LD64 (pSrc));
+}
+static inline void WelsFillingPred8x2to16_c (uint8_t* pPred, uint8_t* pSrc) {
+  ST64 (pPred  , LD64 (pSrc));
+  ST64 (pPred + 8, LD64 (pSrc + 8));
+}
+static inline void WelsFillingPred1to16_c (uint8_t* pPred, const uint8_t kuiSrc) {
+  const uint8_t kuiSrc8[8] = { kuiSrc, kuiSrc, kuiSrc, kuiSrc, kuiSrc, kuiSrc, kuiSrc, kuiSrc };
+  ST64 (pPred  , LD64 (kuiSrc8));
+  ST64 (pPred + 8, LD64 (kuiSrc8));
+}
+
+#define WelsFillingPred8to16 WelsFillingPred8to16_c
+#define WelsFillingPred8x2to16 WelsFillingPred8x2to16_c
+#define WelsFillingPred1to16 WelsFillingPred1to16_c
+
+
+
+#define I4x4_PRED_STRIDE 4
+#define I4x4_PRED_STRIDE2 8
+#define I4x4_PRED_STRIDE3 12
+
+void WelsI4x4LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint32_t kuiSrc = LD32 (&pRef[-kiStride]);
+  ENFORCE_STACK_ALIGN_1D (uint32_t, uiSrcx2, 2, 16)
+  uiSrcx2[0] = uiSrcx2[1] = kuiSrc;
+
+  WelsFillingPred8to16 (pPred, (uint8_t*)&uiSrcx2[0]);
+}
+
+void WelsI4x4LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint32_t kiStridex2Left = (kiStride << 1) - 1;
+  const uint32_t kiStridex3Left = kiStride + kiStridex2Left;
+  const uint8_t kuiHor1 = pRef[-1];
+  const uint8_t kuiHor2 = pRef[kiStride - 1];
+  const uint8_t kuiHor3 = pRef[kiStridex2Left];
+  const uint8_t kuiHor4 = pRef[kiStridex3Left];
+  const uint8_t kuiVec1[4] = {kuiHor1, kuiHor1, kuiHor1, kuiHor1};
+  const uint8_t kuiVec2[4] = {kuiHor2, kuiHor2, kuiHor2, kuiHor2};
+  const uint8_t kuiVec3[4] = {kuiHor3, kuiHor3, kuiHor3, kuiHor3};
+  const uint8_t kuiVec4[4] = {kuiHor4, kuiHor4, kuiHor4, kuiHor4};
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  ST32 (&uiSrc[0], LD32 (kuiVec1));
+  ST32 (&uiSrc[4], LD32 (kuiVec2));
+  ST32 (&uiSrc[8], LD32 (kuiVec3));
+  ST32 (&uiSrc[12], LD32 (kuiVec4));
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+void WelsI4x4LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint8_t kuiDcValue = (pRef[-1] + pRef[kiStride - 1] + pRef[ (kiStride << 1) - 1] + pRef[ (kiStride << 1) +
+                              kiStride - 1] +
+                              pRef[-kiStride] + pRef[1 - kiStride] + pRef[2 - kiStride] + pRef[3 - kiStride] + 4) >> 3;
+
+  WelsFillingPred1to16 (pPred, kuiDcValue);
+}
+
+void WelsI4x4LumaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint8_t kuiDcValue = (pRef[-1] + pRef[kiStride - 1] + pRef[ (kiStride << 1) - 1] + pRef[ (kiStride << 1) +
+                              kiStride - 1] + 2) >> 2;
+
+  WelsFillingPred1to16 (pPred, kuiDcValue);
+}
+
+void WelsI4x4LumaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint8_t kuiDcValue = (pRef[-kiStride] + pRef[1 - kiStride] + pRef[2 - kiStride] + pRef[3 - kiStride] + 2) >> 2;
+
+  WelsFillingPred1to16 (pPred, kuiDcValue);
+}
+
+void WelsI4x4LumaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint8_t kuiDcValue = 0x80;
+
+  WelsFillingPred1to16 (pPred, kuiDcValue);
+}
+
+/*down pLeft*/
+void WelsI4x4LumaPredDDL_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  /*get pTop*/
+  const uint8_t kuiT0   = pRef[-kiStride];
+  const uint8_t kuiT1   = pRef[1 - kiStride];
+  const uint8_t kuiT2   = pRef[2 - kiStride];
+  const uint8_t kuiT3   = pRef[3 - kiStride];
+  const uint8_t kuiT4   = pRef[4 - kiStride];
+  const uint8_t kuiT5   = pRef[5 - kiStride];
+  const uint8_t kuiT6   = pRef[6 - kiStride];
+  const uint8_t kuiT7   = pRef[7 - kiStride];
+  const uint8_t kuiDDL0 = (2 + kuiT0 + kuiT2 + (kuiT1 << 1)) >> 2;      // uiDDL0
+  const uint8_t kuiDDL1 = (2 + kuiT1 + kuiT3 + (kuiT2 << 1)) >> 2;      // uiDDL1
+  const uint8_t kuiDDL2 = (2 + kuiT2 + kuiT4 + (kuiT3 << 1)) >> 2;      // uiDDL2
+  const uint8_t kuiDDL3 = (2 + kuiT3 + kuiT5 + (kuiT4 << 1)) >> 2;      // uiDDL3
+  const uint8_t kuiDDL4 = (2 + kuiT4 + kuiT6 + (kuiT5 << 1)) >> 2;      // uiDDL4
+  const uint8_t kuiDDL5 = (2 + kuiT5 + kuiT7 + (kuiT6 << 1)) >> 2;      // uiDDL5
+  const uint8_t kuiDDL6 = (2 + kuiT6 + kuiT7 + (kuiT7 << 1)) >> 2;      // uiDDL6
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = kuiDDL0;
+  uiSrc[1] = uiSrc[4] = kuiDDL1;
+  uiSrc[2] = uiSrc[5] = uiSrc[8] = kuiDDL2;
+  uiSrc[3] = uiSrc[6] = uiSrc[9] = uiSrc[12] = kuiDDL3;
+  uiSrc[7] = uiSrc[10] = uiSrc[13] = kuiDDL4;
+  uiSrc[11] = uiSrc[14] = kuiDDL5;
+  uiSrc[15] = kuiDDL6;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+/*down pLeft*/
+void WelsI4x4LumaPredDDLTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  /*get pTop*/
+  const uint8_t kuiT0   = pRef[-kiStride];
+  const uint8_t kuiT1   = pRef[1 - kiStride];
+  const uint8_t kuiT2   = pRef[2 - kiStride];
+  const uint8_t kuiT3   = pRef[3 - kiStride];
+  const uint8_t kuiDLT0 = (2 + kuiT0 + kuiT2 + (kuiT1 << 1)) >> 2;      // uiDLT0
+  const uint8_t kuiDLT1 = (2 + kuiT1 + kuiT3 + (kuiT2 << 1)) >> 2;      // uiDLT1
+  const uint8_t kuiDLT2 = (2 + kuiT2 + kuiT3 + (kuiT3 << 1)) >> 2;      // uiDLT2
+  const uint8_t kuiDLT3 = (2 + (kuiT3 << 2)) >> 2;                      // uiDLT3
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  memset (&uiSrc[6], kuiDLT3, 10 * sizeof (uint8_t));
+  uiSrc[0] = kuiDLT0;
+  uiSrc[1] = uiSrc[4] = kuiDLT1;
+  uiSrc[2] = uiSrc[5] = uiSrc[8] = kuiDLT2;
+  uiSrc[3] = kuiDLT3;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+/*down right*/
+void WelsI4x4LumaPredDDR_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kiStridex2  = kiStride << 1;
+  const int32_t kiStridex3  = kiStride + kiStridex2;
+  const uint8_t kuiLT       = pRef[-kiStride - 1];  // pTop-pLeft
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0       = pRef[-1];
+  const uint8_t kuiL1       = pRef[kiStride - 1];
+  const uint8_t kuiL2       = pRef[kiStridex2 - 1];
+  const uint8_t kuiL3       = pRef[kiStridex3 - 1];
+  const uint8_t kuiT0       = pRef[-kiStride];
+  const uint8_t kuiT1       = pRef[1 - kiStride];
+  const uint8_t kuiT2       = pRef[2 - kiStride];
+  const uint8_t kuiT3       = pRef[3 - kiStride];
+  const uint16_t kuiTL0     = 1 + kuiLT + kuiL0;
+  const uint16_t kuiLT0     = 1 + kuiLT + kuiT0;
+  const uint16_t kuiT01     = 1 + kuiT0 + kuiT1;
+  const uint16_t kuiT12     = 1 + kuiT1 + kuiT2;
+  const uint16_t kuiT23     = 1 + kuiT2 + kuiT3;
+  const uint16_t kuiL01     = 1 + kuiL0 + kuiL1;
+  const uint16_t kuiL12     = 1 + kuiL1 + kuiL2;
+  const uint16_t kuiL23     = 1 + kuiL2 + kuiL3;
+  const uint8_t kuiDDR0     = (kuiTL0 + kuiLT0) >> 2;
+  const uint8_t kuiDDR1     = (kuiLT0 + kuiT01) >> 2;
+  const uint8_t kuiDDR2     = (kuiT01 + kuiT12) >> 2;
+  const uint8_t kuiDDR3     = (kuiT12 + kuiT23) >> 2;
+  const uint8_t kuiDDR4     = (kuiTL0 + kuiL01) >> 2;
+  const uint8_t kuiDDR5     = (kuiL01 + kuiL12) >> 2;
+  const uint8_t kuiDDR6     = (kuiL12 + kuiL23) >> 2;
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = uiSrc[5] = uiSrc[10] = uiSrc[15] = kuiDDR0;
+  uiSrc[1] = uiSrc[6] = uiSrc[11] = kuiDDR1;
+  uiSrc[2] = uiSrc[7] = kuiDDR2;
+  uiSrc[3] = kuiDDR3;
+  uiSrc[4] = uiSrc[9] = uiSrc[14] = kuiDDR4;
+  uiSrc[8] = uiSrc[13] = kuiDDR5;
+  uiSrc[12] = kuiDDR6;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+/*vertical pLeft*/
+void WelsI4x4LumaPredVL_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  /*get pTop*/
+  const uint8_t kuiT0   = pRef[-kiStride];
+  const uint8_t kuiT1   = pRef[1 - kiStride];
+  const uint8_t kuiT2   = pRef[2 - kiStride];
+  const uint8_t kuiT3   = pRef[3 - kiStride];
+  const uint8_t kuiT4   = pRef[4 - kiStride];
+  const uint8_t kuiT5   = pRef[5 - kiStride];
+  const uint8_t kuiT6   = pRef[6 - kiStride];
+  const uint8_t kuiVL0  = (1 + kuiT0 + kuiT1) >> 1;                     // uiVL0
+  const uint8_t kuiVL1  = (1 + kuiT1 + kuiT2) >> 1;                     // uiVL1
+  const uint8_t kuiVL2  = (1 + kuiT2 + kuiT3) >> 1;                     // uiVL2
+  const uint8_t kuiVL3  = (1 + kuiT3 + kuiT4) >> 1;                     // uiVL3
+  const uint8_t kuiVL4  = (1 + kuiT4 + kuiT5) >> 1;                     // uiVL4
+  const uint8_t kuiVL5  = (2 + kuiT0 + (kuiT1 << 1) + kuiT2) >> 2;      // uiVL5
+  const uint8_t kuiVL6  = (2 + kuiT1 + (kuiT2 << 1) + kuiT3) >> 2;      // uiVL6
+  const uint8_t kuiVL7  = (2 + kuiT2 + (kuiT3 << 1) + kuiT4) >> 2;      // uiVL7
+  const uint8_t kuiVL8  = (2 + kuiT3 + (kuiT4 << 1) + kuiT5) >> 2;      // uiVL8
+  const uint8_t kuiVL9  = (2 + kuiT4 + (kuiT5 << 1) + kuiT6) >> 2;      // uiVL9
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = kuiVL0;
+  uiSrc[1] = uiSrc[8] = kuiVL1;
+  uiSrc[2] = uiSrc[9] = kuiVL2;
+  uiSrc[3] = uiSrc[10] = kuiVL3;
+  uiSrc[4] = kuiVL5;
+  uiSrc[5] = uiSrc[12] = kuiVL6;
+  uiSrc[6] = uiSrc[13] = kuiVL7;
+  uiSrc[7] = uiSrc[14] = kuiVL8;
+  uiSrc[11] = kuiVL4;
+  uiSrc[15] = kuiVL9;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+
+/*vertical pLeft*/
+void WelsI4x4LumaPredVLTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  uint8_t* pTopLeft     = &pRef[-kiStride - 1]; // pTop-pLeft
+  /*get pTop*/
+  const uint8_t kuiT0   = * (pTopLeft + 1);
+  const uint8_t kuiT1   = * (pTopLeft + 2);
+  const uint8_t kuiT2   = * (pTopLeft + 3);
+  const uint8_t kuiT3   = * (pTopLeft + 4);
+  const uint8_t kuiVLT0 = (1 + kuiT0 + kuiT1) >> 1;                     // uiVLT0
+  const uint8_t kuiVLT1 = (1 + kuiT1 + kuiT2) >> 1;                     // uiVLT1
+  const uint8_t kuiVLT2 = (1 + kuiT2 + kuiT3) >> 1;                     // uiVLT2
+  const uint8_t kuiVLT3 = (1 + (kuiT3 << 1)) >> 1;                      // uiVLT3
+  const uint8_t kuiVLT4 = (2 + kuiT0 + (kuiT1 << 1) + kuiT2) >> 2;      // uiVLT4
+  const uint8_t kuiVLT5 = (2 + kuiT1 + (kuiT2 << 1) + kuiT3) >> 2;      // uiVLT5
+  const uint8_t kuiVLT6 = (2 + kuiT2 + (kuiT3 << 1) + kuiT3) >> 2;      // uiVLT6
+  const uint8_t kuiVLT7 = (2 + (kuiT3 << 2)) >> 2;                      // uiVLT7
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = kuiVLT0;
+  uiSrc[1] = uiSrc[8] = kuiVLT1;
+  uiSrc[2] = uiSrc[9] = kuiVLT2;
+  uiSrc[3] = uiSrc[10] = uiSrc[11] = kuiVLT3;
+  uiSrc[4] = kuiVLT4;
+  uiSrc[5] = uiSrc[12] = kuiVLT5;
+  uiSrc[6] = uiSrc[13] = kuiVLT6;
+  uiSrc[7] = uiSrc[14] = uiSrc[15] = kuiVLT7;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+/*vertical right*/
+void WelsI4x4LumaPredVR_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kiStridex2  = kiStride << 1;
+  const uint8_t kuiLT       = pRef[-kiStride - 1];  // pTop-pLeft
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0       = pRef[-1];
+  const uint8_t kuiL1       = pRef[kiStride - 1];
+  const uint8_t kuiL2       = pRef[kiStridex2 - 1];
+  const uint8_t kuiT0       = pRef[-kiStride];
+  const uint8_t kuiT1       = pRef[1 - kiStride];
+  const uint8_t kuiT2       = pRef[2 - kiStride];
+  const uint8_t kuiT3       = pRef[3 - kiStride];
+  const uint8_t kuiVR0      = (1 + kuiLT + kuiT0) >> 1;
+  const uint8_t kuiVR1      = (1 + kuiT0 + kuiT1) >> 1;
+  const uint8_t kuiVR2      = (1 + kuiT1 + kuiT2) >> 1;
+  const uint8_t kuiVR3      = (1 + kuiT2 + kuiT3) >> 1;
+  const uint8_t kuiVR4      = (2 + kuiL0 + (kuiLT << 1) + kuiT0) >> 2;
+  const uint8_t kuiVR5      = (2 + kuiLT + (kuiT0 << 1) + kuiT1) >> 2;
+  const uint8_t kuiVR6      = (2 + kuiT0 + (kuiT1 << 1) + kuiT2) >> 2;
+  const uint8_t kuiVR7      = (2 + kuiT1 + (kuiT2 << 1) + kuiT3) >> 2;
+  const uint8_t kuiVR8      = (2 + kuiLT + (kuiL0 << 1) + kuiL1) >> 2;
+  const uint8_t kuiVR9      = (2 + kuiL0 + (kuiL1 << 1) + kuiL2) >> 2;
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = uiSrc[9] = kuiVR0;
+  uiSrc[1] = uiSrc[10] = kuiVR1;
+  uiSrc[2] = uiSrc[11] = kuiVR2;
+  uiSrc[3] = kuiVR3;
+  uiSrc[4] = uiSrc[13] = kuiVR4;
+  uiSrc[5] = uiSrc[14] = kuiVR5;
+  uiSrc[6] = uiSrc[15] = kuiVR6;
+  uiSrc[7] = kuiVR7;
+  uiSrc[8] = kuiVR8;
+  uiSrc[12] = kuiVR9;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+/*horizontal up*/
+void WelsI4x4LumaPredHU_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kiStridex2  = kiStride << 1;
+  const int32_t kiStridex3  = kiStride + kiStridex2;
+  /*get pLeft*/
+  const uint8_t kuiL0       = pRef[-1];
+  const uint8_t kuiL1       = pRef[kiStride - 1];
+  const uint8_t kuiL2       = pRef[kiStridex2 - 1];
+  const uint8_t kuiL3       = pRef[kiStridex3 - 1];
+  const uint16_t kuiL01     = (1 + kuiL0 + kuiL1);
+  const uint16_t kuiL12     = (1 + kuiL1 + kuiL2);
+  const uint16_t kuiL23     = (1 + kuiL2 + kuiL3);
+  const uint8_t kuiHU0      = kuiL01 >> 1;
+  const uint8_t kuiHU1      = (kuiL01 + kuiL12) >> 2;
+  const uint8_t kuiHU2      = kuiL12 >> 1;
+  const uint8_t kuiHU3      = (kuiL12 + kuiL23) >> 2;
+  const uint8_t kuiHU4      = kuiL23 >> 1;
+  const uint8_t kuiHU5      = (1 + kuiL23 + (kuiL3 << 1)) >> 2;
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = kuiHU0;
+  uiSrc[1] = kuiHU1;
+  uiSrc[2] = uiSrc[4] = kuiHU2;
+  uiSrc[3] = uiSrc[5] = kuiHU3;
+  uiSrc[6] = uiSrc[8] = kuiHU4;
+  uiSrc[7] = uiSrc[9] = kuiHU5;
+  memset (&uiSrc[10], kuiL3, 6 * sizeof (uint8_t));
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+/*horizontal down*/
+void WelsI4x4LumaPredHD_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kiStridex2  = kiStride << 1;
+  const int32_t kiStridex3  = kiStride + kiStridex2;
+  const uint8_t kuiLT       = pRef[-kiStride - 1];  // pTop-pLeft
+  /*get pLeft and pTop*/
+  const uint8_t kuiL0       = pRef[-1];
+  const uint8_t kuiL1       = pRef[kiStride - 1];
+  const uint8_t kuiL2       = pRef[kiStridex2 - 1];
+  const uint8_t kuiL3       = pRef[kiStridex3 - 1];
+  const uint8_t kuiT0       = pRef[-kiStride];
+  const uint8_t kuiT1       = pRef[1 - kiStride];
+  const uint8_t kuiT2       = pRef[2 - kiStride];
+  const uint8_t kuiHD0      = (1 + kuiLT + kuiL0) >> 1;                     // uiHD0
+  const uint8_t kuiHD1      = (2 + kuiL0 + (kuiLT << 1) + kuiT0) >> 2;      // uiHD1
+  const uint8_t kuiHD2      = (2 + kuiLT + (kuiT0 << 1) + kuiT1) >> 2;      // uiHD2
+  const uint8_t kuiHD3      = (2 + kuiT0 + (kuiT1 << 1) + kuiT2) >> 2;      // uiHD3
+  const uint8_t kuiHD4      = (1 + kuiL0 + kuiL1) >> 1;                     // uiHD4
+  const uint8_t kuiHD5      = (2 + kuiLT + (kuiL0 << 1) + kuiL1) >> 2;      // uiHD5
+  const uint8_t kuiHD6      = (1 + kuiL1 + kuiL2) >> 1;                     // uiHD6
+  const uint8_t kuiHD7      = (2 + kuiL0 + (kuiL1 << 1) + kuiL2) >> 2;      // uiHD7
+  const uint8_t kuiHD8      = (1 + kuiL2 + kuiL3) >> 1;                     // uiHD8
+  const uint8_t kuiHD9      = (2 + kuiL1 + (kuiL2 << 1) + kuiL3) >> 2;      // uiHD9
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiSrc, 16, 16) // TobeCont'd about assign opt as follows
+  uiSrc[0] = uiSrc[6] = kuiHD0;
+  uiSrc[1] = uiSrc[7] = kuiHD1;
+  uiSrc[2] = kuiHD2;
+  uiSrc[3] = kuiHD3;
+  uiSrc[4] = uiSrc[10] = kuiHD4;
+  uiSrc[5] = uiSrc[11] = kuiHD5;
+  uiSrc[8] = uiSrc[14] = kuiHD6;
+  uiSrc[9] = uiSrc[15] = kuiHD7;
+  uiSrc[12] = kuiHD8;
+  uiSrc[13] = kuiHD9;
+
+  WelsFillingPred8x2to16 (pPred, uiSrc);
+}
+
+
+
+#define I8x8_PRED_STRIDE 8
+
+void WelsIChromaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint64_t kuiSrc64 = LD64 (&pRef[-kiStride]);
+
+  ST64 (pPred     , kuiSrc64);
+  ST64 (pPred + 8 , kuiSrc64);
+  ST64 (pPred + 16, kuiSrc64);
+  ST64 (pPred + 24, kuiSrc64);
+  ST64 (pPred + 32, kuiSrc64);
+  ST64 (pPred + 40, kuiSrc64);
+  ST64 (pPred + 48, kuiSrc64);
+  ST64 (pPred + 56, kuiSrc64);
+}
+
+void WelsIChromaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iStridex7 = (kiStride << 3) - kiStride;
+  int32_t iI8x8Stridex7 = (I8x8_PRED_STRIDE << 3) - I8x8_PRED_STRIDE;
+  uint8_t i = 7;
+
+  do {
+    const uint8_t kuiLeft = pRef[iStridex7 - 1]; // pLeft value
+    uint64_t kuiSrc64 = (uint64_t) (0x0101010101010101ULL * kuiLeft);
+    ST64 (pPred + iI8x8Stridex7, kuiSrc64);
+
+    iStridex7 -= kiStride;
+    iI8x8Stridex7 -= I8x8_PRED_STRIDE;
+  } while (i-- > 0);
+}
+
+
+void WelsIChromaPredPlane_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iLTshift = 0, iTopshift = 0, iLeftshift = 0, iTopSum = 0, iLeftSum = 0;
+  int32_t i, j;
+  uint8_t* pTop = &pRef[-kiStride];
+  uint8_t* pLeft = &pRef[-1];
+
+  for (i = 0 ; i < 4 ; i ++) {
+    iTopSum += (i + 1) * (pTop[4 + i] - pTop[2 - i]);
+    iLeftSum += (i + 1) * (pLeft[ (4 + i) * kiStride] - pLeft[ (2 - i) * kiStride]);
+  }
+
+  iLTshift = (pLeft[7 * kiStride] + pTop[7]) << 4;
+  iTopshift = (17 * iTopSum + 16) >> 5;
+  iLeftshift = (17 * iLeftSum + 16) >> 5;
+
+  for (i = 0 ; i < 8 ; i ++) {
+    for (j = 0 ; j < 8 ; j ++) {
+      pPred[j] = WelsClip1 ((iLTshift + iTopshift * (j - 3) + iLeftshift * (i - 3) + 16) >> 5);
+    }
+    pPred += I8x8_PRED_STRIDE;
+  }
+}
+
+
+void WelsIChromaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kuiL1 = kiStride - 1;
+  const int32_t kuiL2 = kuiL1 + kiStride;
+  const int32_t kuiL3 = kuiL2 + kiStride;
+  const int32_t kuiL4 = kuiL3 + kiStride;
+  const int32_t kuiL5 = kuiL4 + kiStride;
+  const int32_t kuiL6 = kuiL5 + kiStride;
+  const int32_t kuiL7 = kuiL6 + kiStride;
+  /*caculate the iMean value*/
+  const uint8_t kuiMean1 = (pRef[-kiStride] + pRef[1 - kiStride] + pRef[2 - kiStride] + pRef[3 - kiStride] +
+                            pRef[-1] + pRef[kuiL1] + pRef[kuiL2] + pRef[kuiL3] + 4) >> 3;
+  const uint32_t kuiSum2 = pRef[4 - kiStride] + pRef[5 - kiStride] + pRef[6 - kiStride] + pRef[7 - kiStride];
+  const uint32_t kuiSum3 = pRef[kuiL4] + pRef[kuiL5] + pRef[kuiL6] + pRef[kuiL7];
+  const uint8_t kuiMean2 = (kuiSum2 + 2) >> 2;
+  const uint8_t kuiMean3 = (kuiSum3 + 2) >> 2;
+  const uint8_t kuiMean4 = (kuiSum2 + kuiSum3 + 4) >> 3;
+
+  const uint8_t kuiTopMean[8] = {kuiMean1, kuiMean1, kuiMean1, kuiMean1, kuiMean2, kuiMean2, kuiMean2, kuiMean2};
+  const uint8_t kuiBottomMean[8] = {kuiMean3, kuiMean3, kuiMean3, kuiMean3, kuiMean4, kuiMean4, kuiMean4, kuiMean4};
+  const uint64_t kuiTopMean64 = LD64 (kuiTopMean);
+  const uint64_t kuiBottomMean64 = LD64 (kuiBottomMean);
+
+  ST64 (pPred     , kuiTopMean64);
+  ST64 (pPred + 8 , kuiTopMean64);
+  ST64 (pPred + 16, kuiTopMean64);
+  ST64 (pPred + 24, kuiTopMean64);
+  ST64 (pPred + 32, kuiBottomMean64);
+  ST64 (pPred + 40, kuiBottomMean64);
+  ST64 (pPred + 48, kuiBottomMean64);
+  ST64 (pPred + 56, kuiBottomMean64);
+}
+
+void WelsIChromaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const int32_t kuiL1   = kiStride - 1;
+  const int32_t kuiL2   = kuiL1 + kiStride;
+  const int32_t kuiL3   = kuiL2 + kiStride;
+  const int32_t kuiL4   = kuiL3 + kiStride;
+  const int32_t kuiL5   = kuiL4 + kiStride;
+  const int32_t kuiL6   = kuiL5 + kiStride;
+  const int32_t kuiL7   = kuiL6 + kiStride;
+  /*caculate the iMean value*/
+  const uint8_t kuiTopMean          = (pRef[-1] + pRef[kuiL1] + pRef[kuiL2] + pRef[kuiL3] + 2) >> 2 ;
+  const uint8_t kuiBottomMean       = (pRef[kuiL4] + pRef[kuiL5] + pRef[kuiL6] + pRef[kuiL7] + 2) >> 2;
+  const uint64_t kuiTopMean64       = (uint64_t) (0x0101010101010101ULL * kuiTopMean);
+  const uint64_t kuiBottomMean64    = (uint64_t) (0x0101010101010101ULL * kuiBottomMean);
+  ST64 (pPred     , kuiTopMean64);
+  ST64 (pPred + 8 , kuiTopMean64);
+  ST64 (pPred + 16, kuiTopMean64);
+  ST64 (pPred + 24, kuiTopMean64);
+  ST64 (pPred + 32, kuiBottomMean64);
+  ST64 (pPred + 40, kuiBottomMean64);
+  ST64 (pPred + 48, kuiBottomMean64);
+  ST64 (pPred + 56, kuiBottomMean64);
+}
+
+void WelsIChromaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  /*caculate the iMean value*/
+  const uint8_t kuiMean1 = (pRef[-kiStride] + pRef[1 - kiStride] + pRef[2 - kiStride] + pRef[3 - kiStride] + 2) >> 2;
+  const uint8_t kuiMean2 = (pRef[4 - kiStride] + pRef[5 - kiStride] + pRef[6 - kiStride] + pRef[7 - kiStride] + 2) >> 2;
+  const uint8_t kuiMean[8] = {kuiMean1, kuiMean1, kuiMean1, kuiMean1, kuiMean2, kuiMean2, kuiMean2, kuiMean2};
+  const uint64_t kuiMean64 = LD64 (kuiMean);
+
+  ST64 (pPred     , kuiMean64);
+  ST64 (pPred + 8 , kuiMean64);
+  ST64 (pPred + 16, kuiMean64);
+  ST64 (pPred + 24, kuiMean64);
+  ST64 (pPred + 32, kuiMean64);
+  ST64 (pPred + 40, kuiMean64);
+  ST64 (pPred + 48, kuiMean64);
+  ST64 (pPred + 56, kuiMean64);
+}
+
+void WelsIChromaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  const uint64_t kuiDcValue64 = (uint64_t)0x8080808080808080ULL;
+  ST64 (pPred     , kuiDcValue64);
+  ST64 (pPred + 8 , kuiDcValue64);
+  ST64 (pPred + 16, kuiDcValue64);
+  ST64 (pPred + 24, kuiDcValue64);
+  ST64 (pPred + 32, kuiDcValue64);
+  ST64 (pPred + 40, kuiDcValue64);
+  ST64 (pPred + 48, kuiDcValue64);
+  ST64 (pPred + 56, kuiDcValue64);
+}
+
+
+void WelsI16x16LumaPredPlane_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iLTshift = 0, iTopshift = 0, iLeftshift = 0, iTopSum = 0, iLeftSum = 0;
+  int32_t i, j;
+  uint8_t* pTop = &pRef[-kiStride];
+  uint8_t* pLeft = &pRef[-1];
+  int32_t iPredStride = 16;
+
+  for (i = 0 ; i < 8 ; i ++) {
+    iTopSum += (i + 1) * (pTop[8 + i] - pTop[6 - i]);
+    iLeftSum += (i + 1) * (pLeft[ (8 + i) * kiStride] - pLeft[ (6 - i) * kiStride]);
+  }
+
+  iLTshift = (pLeft[15 * kiStride] + pTop[15]) << 4;
+  iTopshift = (5 * iTopSum + 32) >> 6;
+  iLeftshift = (5 * iLeftSum + 32) >> 6;
+
+  for (i = 0 ; i < 16 ; i ++) {
+    for (j = 0 ; j < 16 ; j ++) {
+      pPred[j] = WelsClip1 ((iLTshift + iTopshift * (j - 7) + iLeftshift * (i - 7) + 16) >> 5);
+    }
+    pPred += iPredStride;
+  }
+}
+
+void WelsI16x16LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iStridex15 = (kiStride << 4) - kiStride;
+  int32_t iSum = 0;
+  uint8_t i = 15;
+  uint8_t iMean = 0;
+
+  /*caculate the iMean value*/
+  do {
+    iSum += pRef[-1 + iStridex15] + pRef[-kiStride + i];
+    iStridex15 -= kiStride;
+  } while (i-- > 0);
+  iMean = (16 + iSum) >> 5;
+  memset (pPred, iMean, 256);
+}
+
+
+void WelsI16x16LumaPredDcTop_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iSum = 0;
+  uint8_t i = 15;
+  uint8_t iMean = 0;
+
+  /*caculate the iMean value*/
+  do {
+    iSum += pRef[-kiStride + i];
+  } while (i-- > 0);
+  iMean = (8 + iSum) >> 4;
+  memset (pPred, iMean, 256);
+}
+
+void WelsI16x16LumaPredDcLeft_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  int32_t iStridex15 = (kiStride << 4) - kiStride;
+  int32_t iSum = 0;
+  uint8_t i = 15;
+  uint8_t iMean = 0;
+
+  /*caculate the iMean value*/
+  do {
+    iSum += pRef[-1 + iStridex15];
+    iStridex15 -= kiStride;
+  } while (i-- > 0);
+  iMean = (8 + iSum) >> 4;
+  memset (pPred, iMean, 256);
+}
+
+void WelsI16x16LumaPredDcNA_c (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride) {
+  memset (pPred, 0x80, 256);
+}
+
+void WelsInitIntraPredFuncs (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag) {
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_V] =      WelsI16x16LumaPredV_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_H] =      WelsI16x16LumaPredH_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC] =     WelsI16x16LumaPredDc_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_P] =      WelsI16x16LumaPredPlane_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC_L] =   WelsI16x16LumaPredDcLeft_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC_T] =   WelsI16x16LumaPredDcTop_c;
+  pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC_128] = WelsI16x16LumaPredDcNA_c;
+
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_V] = WelsI4x4LumaPredV_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_H] = WelsI4x4LumaPredH_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC] = WelsI4x4LumaPredDc_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC_L] = WelsI4x4LumaPredDcLeft_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC_T] = WelsI4x4LumaPredDcTop_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC_128] = WelsI4x4LumaPredDcNA_c;
+
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL] = WelsI4x4LumaPredDDL_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL_TOP] = WelsI4x4LumaPredDDLTop_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDR] = WelsI4x4LumaPredDDR_c;
+
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL] = WelsI4x4LumaPredVL_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL_TOP] = WelsI4x4LumaPredVLTop_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_VR] = WelsI4x4LumaPredVR_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_HU] = WelsI4x4LumaPredHU_c;
+  pFuncList->pfGetLumaI4x4Pred[I4_PRED_HD] = WelsI4x4LumaPredHD_c;
+
+  pFuncList->pfGetChromaPred[C_PRED_DC] = WelsIChromaPredDc_c;
+  pFuncList->pfGetChromaPred[C_PRED_H] = WelsIChromaPredH_c;
+  pFuncList->pfGetChromaPred[C_PRED_V] = WelsIChromaPredV_c;
+  pFuncList->pfGetChromaPred[C_PRED_P] = WelsIChromaPredPlane_c;
+  pFuncList->pfGetChromaPred[C_PRED_DC_L] = WelsIChromaPredDcLeft_c;
+  pFuncList->pfGetChromaPred[C_PRED_DC_T] = WelsIChromaPredDcTop_c;
+  pFuncList->pfGetChromaPred[C_PRED_DC_128] = WelsIChromaPredDcNA_c;
+#ifdef HAVE_NEON
+  if (kuiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDR] = WelsI4x4LumaPredDDR_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HD]  = WelsI4x4LumaPredHD_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HU]  = WelsI4x4LumaPredHU_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VR]  = WelsI4x4LumaPredVR_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL] = WelsI4x4LumaPredDDL_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL]  = WelsI4x4LumaPredVL_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_H] = WelsI4x4LumaPredH_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_V] = WelsI4x4LumaPredV_neon;
+
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_V] = WelsI16x16LumaPredV_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_H] = WelsI16x16LumaPredH_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC] = WelsI16x16LumaPredDc_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_P] = WelsI16x16LumaPredPlane_neon;
+
+    pFuncList->pfGetChromaPred[C_PRED_DC]   = WelsIChromaPredDc_neon;
+    pFuncList->pfGetChromaPred[C_PRED_V]    = WelsIChromaPredV_neon;
+    pFuncList->pfGetChromaPred[C_PRED_P]    = WelsIChromaPredPlane_neon;
+    pFuncList->pfGetChromaPred[C_PRED_H]    = WelsIChromaPredH_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (kuiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC] = WelsI16x16LumaPredDc_AArch64_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_P]  = WelsI16x16LumaPredPlane_AArch64_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_H]  = WelsI16x16LumaPredH_AArch64_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_V]  = WelsI16x16LumaPredV_AArch64_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC_L]  = WelsI16x16LumaPredDcLeft_AArch64_neon;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC_T]  = WelsI16x16LumaPredDcTop_AArch64_neon;
+
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_H    ] = WelsI4x4LumaPredH_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL  ] = WelsI4x4LumaPredDDL_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL_TOP] = WelsI4x4LumaPredDDLTop_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL   ] = WelsI4x4LumaPredVL_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL_TOP ] = WelsI4x4LumaPredVLTop_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VR   ] = WelsI4x4LumaPredVR_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HU   ] = WelsI4x4LumaPredHU_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HD   ] = WelsI4x4LumaPredHD_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC   ] = WelsI4x4LumaPredDc_AArch64_neon;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC_T   ] = WelsI4x4LumaPredDcTop_AArch64_neon;
+
+    pFuncList->pfGetChromaPred[C_PRED_H]       = WelsIChromaPredH_AArch64_neon;
+    pFuncList->pfGetChromaPred[C_PRED_V]       = WelsIChromaPredV_AArch64_neon;
+    pFuncList->pfGetChromaPred[C_PRED_P ]      = WelsIChromaPredPlane_AArch64_neon;
+    pFuncList->pfGetChromaPred[C_PRED_DC]      = WelsIChromaPredDc_AArch64_neon;
+    pFuncList->pfGetChromaPred[C_PRED_DC_T]      = WelsIChromaPredDcTop_AArch64_neon;
+  }
+#endif//HAVE_NEON_AARCH64
+
+#ifdef X86_ASM
+  if (kuiCpuFlag & WELS_CPU_MMXEXT) {
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDR] = WelsI4x4LumaPredDDR_mmx;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HD]  = WelsI4x4LumaPredHD_mmx;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_HU]  = WelsI4x4LumaPredHU_mmx;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VR]  = WelsI4x4LumaPredVR_mmx;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DDL] = WelsI4x4LumaPredDDL_mmx;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_VL]  = WelsI4x4LumaPredVL_mmx;
+    pFuncList->pfGetChromaPred[C_PRED_H] = WelsIChromaPredH_mmx;
+  }
+  if (kuiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_H] = WelsI4x4LumaPredH_sse2;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_DC] = WelsI4x4LumaPredDc_sse2;
+    pFuncList->pfGetLumaI4x4Pred[I4_PRED_V] = WelsI4x4LumaPredV_sse2;
+
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_V] = WelsI16x16LumaPredV_sse2;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_H] = WelsI16x16LumaPredH_sse2;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC] = WelsI16x16LumaPredDc_sse2;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_P] = WelsI16x16LumaPredPlane_sse2;
+
+    pFuncList->pfGetChromaPred[C_PRED_DC]   = WelsIChromaPredDc_sse2;
+    pFuncList->pfGetChromaPred[C_PRED_V]    = WelsIChromaPredV_sse2;
+    pFuncList->pfGetChromaPred[C_PRED_P]    = WelsIChromaPredPlane_sse2;
+  }
+#endif
+
+#if defined(HAVE_MMI)
+  if (kuiCpuFlag & WELS_CPU_MMI) {
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_V] = WelsI16x16LumaPredV_mmi;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_H] = WelsI16x16LumaPredH_mmi;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_DC] = WelsI16x16LumaPredDc_mmi;
+    pFuncList->pfGetLumaI16x16Pred[I16_PRED_P] = WelsI16x16LumaPredPlane_mmi;
+
+    pFuncList->pfGetChromaPred[C_PRED_H] = WelsIChromaPredH_mmi;
+    pFuncList->pfGetChromaPred[C_PRED_DC]   = WelsIChromaPredDc_mmi;
+    pFuncList->pfGetChromaPred[C_PRED_V]    = WelsIChromaPredV_mmi;
+    pFuncList->pfGetChromaPred[C_PRED_P]    = WelsIChromaPredPlane_mmi;
+  }
+#endif//HAVE_MMI
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/md.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/md.cpp
new file mode 100644
index 0000000000..041e453fd1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/md.cpp
@@ -0,0 +1,910 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    md.c
+ *
+ * \brief   mode decision
+ *
+ * \date    2009.05.14 Created
+ *
+ *************************************************************************************
+ */
+
+#include "ls_defines.h"
+#include "md.h"
+#include "cpu_core.h"
+#include "svc_enc_golomb.h"
+
+namespace WelsEnc {
+#define INTRA_VARIANCE_SAD_THRESHOLD 150
+#define INTER_VARIANCE_SAD_THRESHOLD 20
+
+//fill cache of neighbor MB, containing pNonZeroCount, sample_avail, pIntra4x4PredMode
+void FillNeighborCacheIntra (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth) {
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  uint32_t uiNeighborIntra = 0;
+
+  if (uiNeighborAvail & LEFT_MB_POS) { //LEFT MB
+    int8_t* pLeftMbNonZeroCount = pCurMb->pNonZeroCount - MB_LUMA_CHROMA_BLOCK4x4_NUM;
+    pMbCache->iNonZeroCoeffCount[8] = pLeftMbNonZeroCount[ 3];
+    pMbCache->iNonZeroCoeffCount[16] = pLeftMbNonZeroCount[ 7];
+    pMbCache->iNonZeroCoeffCount[24] = pLeftMbNonZeroCount[11];
+    pMbCache->iNonZeroCoeffCount[32] = pLeftMbNonZeroCount[15];
+
+    pMbCache->iNonZeroCoeffCount[ 13] = pLeftMbNonZeroCount[17];
+    pMbCache->iNonZeroCoeffCount[21] = pLeftMbNonZeroCount[21];
+    pMbCache->iNonZeroCoeffCount[37] = pLeftMbNonZeroCount[19];
+    pMbCache->iNonZeroCoeffCount[45] = pLeftMbNonZeroCount[23];
+
+    uiNeighborIntra |= LEFT_MB_POS;
+
+    if (IS_INTRA4x4 ((pCurMb - 1)->uiMbType)) {
+      int8_t* pLeftMbIntra4x4PredMode = pCurMb->pIntra4x4PredMode - INTRA_4x4_MODE_NUM;
+      pMbCache->iIntraPredMode[8] = pLeftMbIntra4x4PredMode[4];
+      pMbCache->iIntraPredMode[16] = pLeftMbIntra4x4PredMode[5];
+      pMbCache->iIntraPredMode[24] = pLeftMbIntra4x4PredMode[6];
+      pMbCache->iIntraPredMode[32] = pLeftMbIntra4x4PredMode[3];
+    } else { // if ( 0 == constrained_intra_pred_flag || IS_INTRA16x16((pCurMb-1)->uiMbType ))
+      pMbCache->iIntraPredMode[8] =
+        pMbCache->iIntraPredMode[16] =
+          pMbCache->iIntraPredMode[24] =
+            pMbCache->iIntraPredMode[32] = 2; //DC
+    }
+  } else {
+    pMbCache->iNonZeroCoeffCount[ 8] =
+      pMbCache->iNonZeroCoeffCount[16] =
+        pMbCache->iNonZeroCoeffCount[24] =
+          pMbCache->iNonZeroCoeffCount[32] = -1;//unavailable
+    pMbCache->iNonZeroCoeffCount[13] =
+      pMbCache->iNonZeroCoeffCount[21] =
+        pMbCache->iNonZeroCoeffCount[37] =
+          pMbCache->iNonZeroCoeffCount[45] = -1;//unavailable
+
+    pMbCache->iIntraPredMode[8] =
+      pMbCache->iIntraPredMode[16] =
+        pMbCache->iIntraPredMode[24] =
+          pMbCache->iIntraPredMode[32] = -1;//unavailable
+  }
+
+  if (uiNeighborAvail & TOP_MB_POS) { //TOP MB
+    SMB* pTopMb = pCurMb - iMbWidth;
+    ST32 (&pMbCache->iNonZeroCoeffCount[1], LD32 (&pTopMb->pNonZeroCount[12]));
+
+    ST16 (&pMbCache->iNonZeroCoeffCount[6], LD16 (&pTopMb->pNonZeroCount[20]));
+    ST16 (&pMbCache->iNonZeroCoeffCount[30], LD16 (&pTopMb->pNonZeroCount[22]));
+
+    uiNeighborIntra |= TOP_MB_POS;
+
+    if (IS_INTRA4x4 (pTopMb->uiMbType)) {
+      ST32 (pMbCache->iIntraPredMode + 1, LD32 (&pTopMb->pIntra4x4PredMode[0]));
+    } else { // if ( 0 == constrained_intra_pred_flag || IS_INTRA16x16( pTopMb->uiMbType ))
+      const uint32_t kuiDc32 = 0x02020202;
+      ST32 (pMbCache->iIntraPredMode + 1 , kuiDc32);
+    }
+  } else {
+    const uint32_t kuiUnavail32 = 0xffffffff;
+    ST32 (pMbCache->iIntraPredMode + 1 , kuiUnavail32);
+    ST32 (&pMbCache->iNonZeroCoeffCount[1], kuiUnavail32);
+
+    ST16 (&pMbCache->iNonZeroCoeffCount[6], 0xffff);
+    ST16 (&pMbCache->iNonZeroCoeffCount[30], 0xffff);
+  }
+
+  if (uiNeighborAvail & TOPLEFT_MB_POS) {
+    uiNeighborIntra |= 0x04;
+  }
+
+
+  if (uiNeighborAvail & TOPRIGHT_MB_POS) {
+    uiNeighborIntra |= 0x08;
+  }
+  pMbCache->uiNeighborIntra = uiNeighborIntra;
+}
+//fill cache of neighbor MB, containing motion_vector and uiRefIndex
+void FillNeighborCacheInterWithoutBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag) {
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  SMB* pLeftMb = pCurMb - 1 ;
+  SMB* pTopMb = pCurMb - iMbWidth;
+  SMB* pLeftTopMb = pCurMb - iMbWidth - 1 ;
+  SMB* iRightTopMb = pCurMb - iMbWidth + 1 ;
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  if ((uiNeighborAvail & LEFT_MB_POS) && IS_SVC_INTER (pLeftMb->uiMbType)) {
+    pMvComp->sMotionVectorCache[ 6] = pLeftMb->sMv[ 3];
+    pMvComp->sMotionVectorCache[12] = pLeftMb->sMv[ 7];
+    pMvComp->sMotionVectorCache[18] = pLeftMb->sMv[11];
+    pMvComp->sMotionVectorCache[24] = pLeftMb->sMv[15];
+    pMvComp->iRefIndexCache[ 6] = pLeftMb->pRefIndex[1];
+    pMvComp->iRefIndexCache[12] = pLeftMb->pRefIndex[1];
+    pMvComp->iRefIndexCache[18] = pLeftMb->pRefIndex[3];
+    pMvComp->iRefIndexCache[24] = pLeftMb->pRefIndex[3];
+    pMbCache->iSadCost[3] = pLeftMb->pSadCost[0];
+
+    if (pLeftMb->uiMbType == MB_TYPE_SKIP) {
+      pMbCache->bMbTypeSkip[3] = 1;
+      pMbCache->iSadCostSkip[3] = pMbCache->pEncSad[-1];
+    } else {
+      pMbCache->bMbTypeSkip[3] = 0;
+      pMbCache->iSadCostSkip[3] = 0;
+    }
+  } else { //avail or non-inter
+    ST32 (&pMvComp->sMotionVectorCache[ 6], 0);
+    ST32 (&pMvComp->sMotionVectorCache[12], 0);
+    ST32 (&pMvComp->sMotionVectorCache[18], 0);
+    ST32 (&pMvComp->sMotionVectorCache[24], 0);
+    pMvComp->iRefIndexCache[ 6] =
+      pMvComp->iRefIndexCache[12] =
+        pMvComp->iRefIndexCache[18] =
+          pMvComp->iRefIndexCache[24] = (uiNeighborAvail & LEFT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[3] = 0;
+    pMbCache->bMbTypeSkip[3] = 0;
+    pMbCache->iSadCostSkip[3] = 0;
+  }
+
+  if ((uiNeighborAvail & TOP_MB_POS) && IS_SVC_INTER (pTopMb->uiMbType)) { //TOP MB
+    ST64 (&pMvComp->sMotionVectorCache[1], LD64 (&pTopMb->sMv[12]));
+    ST64 (&pMvComp->sMotionVectorCache[3], LD64 (&pTopMb->sMv[14]));
+    pMvComp->iRefIndexCache[1] = pTopMb->pRefIndex[2];
+    pMvComp->iRefIndexCache[2] = pTopMb->pRefIndex[2];
+    pMvComp->iRefIndexCache[3] = pTopMb->pRefIndex[3];
+    pMvComp->iRefIndexCache[4] = pTopMb->pRefIndex[3];
+    pMbCache->iSadCost[1] = pTopMb->pSadCost[0];
+
+    if (pTopMb->uiMbType == MB_TYPE_SKIP) {
+      pMbCache->bMbTypeSkip[1] = 1;
+      pMbCache->iSadCostSkip[1] = pMbCache->pEncSad[-iMbWidth];
+    } else {
+      pMbCache->bMbTypeSkip[1] = 0;
+      pMbCache->iSadCostSkip[1] = 0;
+    }
+  } else { //unavail
+    ST64 (&pMvComp->sMotionVectorCache[1], 0);
+    ST64 (&pMvComp->sMotionVectorCache[3], 0);
+    pMvComp->iRefIndexCache[1] =
+      pMvComp->iRefIndexCache[2] =
+        pMvComp->iRefIndexCache[3] =
+          pMvComp->iRefIndexCache[4] = (uiNeighborAvail & TOP_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[1] = 0;
+
+    pMbCache->bMbTypeSkip[1] = 0;
+    pMbCache->iSadCostSkip[1] = 0;
+  }
+
+  if ((uiNeighborAvail & TOPLEFT_MB_POS) && IS_SVC_INTER (pLeftTopMb->uiMbType)) { //LEFT_TOP MB
+    pMvComp->sMotionVectorCache[0] = pLeftTopMb->sMv[15];
+    pMvComp->iRefIndexCache[0] = pLeftTopMb->pRefIndex[3];
+    pMbCache->iSadCost[0] = pLeftTopMb->pSadCost[0];
+
+    if (pLeftTopMb->uiMbType == MB_TYPE_SKIP) {
+      pMbCache->bMbTypeSkip[0] = 1;
+      pMbCache->iSadCostSkip[0] = pMbCache->pEncSad[-iMbWidth - 1];
+    } else {
+      pMbCache->bMbTypeSkip[0] = 0;
+      pMbCache->iSadCostSkip[0] = 0;
+    }
+  } else { //unavail
+    ST32 (&pMvComp->sMotionVectorCache[0], 0);
+    pMvComp->iRefIndexCache[0] = (uiNeighborAvail & TOPLEFT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[0] = 0;
+    pMbCache->bMbTypeSkip[0] = 0;
+    pMbCache->iSadCostSkip[0] = 0;
+  }
+
+  if ((uiNeighborAvail & TOPRIGHT_MB_POS) && IS_SVC_INTER (iRightTopMb->uiMbType)) { //RIGHT_TOP MB
+    pMvComp->sMotionVectorCache[5] = iRightTopMb->sMv[12];
+    pMvComp->iRefIndexCache[5] = iRightTopMb->pRefIndex[2];
+    pMbCache->iSadCost[2] = iRightTopMb->pSadCost[0];
+
+    if (iRightTopMb->uiMbType == MB_TYPE_SKIP) {
+      pMbCache->bMbTypeSkip[2] = 1;
+      pMbCache->iSadCostSkip[2] = pMbCache->pEncSad[-iMbWidth + 1];
+    } else {
+      pMbCache->bMbTypeSkip[2] = 0;
+      pMbCache->iSadCostSkip[2] = 0;
+    }
+  } else { //unavail
+    ST32 (&pMvComp->sMotionVectorCache[5], 0);
+    pMvComp->iRefIndexCache[5] = (uiNeighborAvail & TOPRIGHT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[2] = 0;
+    pMbCache->bMbTypeSkip[2] = 0;
+    pMbCache->iSadCostSkip[2] = 0;
+  }
+
+  //right-top 4*4 pBlock unavailable
+  ST32 (&pMvComp->sMotionVectorCache[ 9], 0);
+  ST32 (&pMvComp->sMotionVectorCache[21], 0);
+  ST32 (&pMvComp->sMotionVectorCache[11], 0);
+  ST32 (&pMvComp->sMotionVectorCache[17], 0);
+  ST32 (&pMvComp->sMotionVectorCache[23], 0);
+  pMvComp->iRefIndexCache[ 9] =
+    pMvComp->iRefIndexCache[11] =
+      pMvComp->iRefIndexCache[17] =
+        pMvComp->iRefIndexCache[21] =
+          pMvComp->iRefIndexCache[23] = REF_NOT_AVAIL;
+}
+
+void FillNeighborCacheInterWithBGD (SMbCache* pMbCache, SMB* pCurMb, int32_t iMbWidth, int8_t* pVaaBgMbFlag) {
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  SMB* pLeftMb = pCurMb - 1 ;
+  SMB* pTopMb = pCurMb - iMbWidth;
+  SMB* pLeftTopMb = pCurMb - iMbWidth - 1 ;
+  SMB* iRightTopMb = pCurMb - iMbWidth + 1 ;
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+
+  if ((uiNeighborAvail & LEFT_MB_POS) && IS_SVC_INTER (pLeftMb->uiMbType)) {
+    pMvComp->sMotionVectorCache[ 6] = pLeftMb->sMv[ 3];
+    pMvComp->sMotionVectorCache[12] = pLeftMb->sMv[ 7];
+    pMvComp->sMotionVectorCache[18] = pLeftMb->sMv[11];
+    pMvComp->sMotionVectorCache[24] = pLeftMb->sMv[15];
+    pMvComp->iRefIndexCache[ 6] = pLeftMb->pRefIndex[1];
+    pMvComp->iRefIndexCache[12] = pLeftMb->pRefIndex[1];
+    pMvComp->iRefIndexCache[18] = pLeftMb->pRefIndex[3];
+    pMvComp->iRefIndexCache[24] = pLeftMb->pRefIndex[3];
+    pMbCache->iSadCost[3] = pLeftMb->pSadCost[0];
+
+    if (pLeftMb->uiMbType == MB_TYPE_SKIP && pVaaBgMbFlag[-1] == 0) {
+      pMbCache->bMbTypeSkip[3] = 1;
+      pMbCache->iSadCostSkip[3] = pMbCache->pEncSad[-1];
+    } else {
+      pMbCache->bMbTypeSkip[3] = 0;
+      pMbCache->iSadCostSkip[3] = 0;
+    }
+  } else { //avail or non-inter
+    ST32 (&pMvComp->sMotionVectorCache[ 6], 0);
+    ST32 (&pMvComp->sMotionVectorCache[12], 0);
+    ST32 (&pMvComp->sMotionVectorCache[18], 0);
+    ST32 (&pMvComp->sMotionVectorCache[24], 0);
+    pMvComp->iRefIndexCache[ 6] =
+      pMvComp->iRefIndexCache[12] =
+        pMvComp->iRefIndexCache[18] =
+          pMvComp->iRefIndexCache[24] = (uiNeighborAvail & LEFT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[3] = 0;
+    pMbCache->bMbTypeSkip[3] = 0;
+    pMbCache->iSadCostSkip[3] = 0;
+  }
+
+  if ((uiNeighborAvail & TOP_MB_POS) && IS_SVC_INTER (pTopMb->uiMbType)) { //TOP MB
+    ST64 (&pMvComp->sMotionVectorCache[1], LD64 (&pTopMb->sMv[12]));
+    ST64 (&pMvComp->sMotionVectorCache[3], LD64 (&pTopMb->sMv[14]));
+    pMvComp->iRefIndexCache[1] = pTopMb->pRefIndex[2];
+    pMvComp->iRefIndexCache[2] = pTopMb->pRefIndex[2];
+    pMvComp->iRefIndexCache[3] = pTopMb->pRefIndex[3];
+    pMvComp->iRefIndexCache[4] = pTopMb->pRefIndex[3];
+    pMbCache->iSadCost[1] = pTopMb->pSadCost[0];
+    if (pTopMb->uiMbType == MB_TYPE_SKIP  && pVaaBgMbFlag[-iMbWidth] == 0) {
+      pMbCache->bMbTypeSkip[1] = 1;
+      pMbCache->iSadCostSkip[1] = pMbCache->pEncSad[-iMbWidth];
+    } else {
+      pMbCache->bMbTypeSkip[1] = 0;
+      pMbCache->iSadCostSkip[1] = 0;
+    }
+  } else { //unavail
+    ST64 (&pMvComp->sMotionVectorCache[1], 0);
+    ST64 (&pMvComp->sMotionVectorCache[3], 0);
+    pMvComp->iRefIndexCache[1] =
+      pMvComp->iRefIndexCache[2] =
+        pMvComp->iRefIndexCache[3] =
+          pMvComp->iRefIndexCache[4] = (uiNeighborAvail & TOP_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[1] = 0;
+    pMbCache->bMbTypeSkip[1] = 0;
+    pMbCache->iSadCostSkip[1] = 0;
+  }
+
+
+  if ((uiNeighborAvail & TOPLEFT_MB_POS) && IS_SVC_INTER (pLeftTopMb->uiMbType)) { //LEFT_TOP MB
+    pMvComp->sMotionVectorCache[0] = pLeftTopMb->sMv[15];
+    pMvComp->iRefIndexCache[0] = pLeftTopMb->pRefIndex[3];
+    pMbCache->iSadCost[0] = pLeftTopMb->pSadCost[0];
+
+    if (pLeftTopMb->uiMbType == MB_TYPE_SKIP  && pVaaBgMbFlag[-iMbWidth - 1] == 0) {
+      pMbCache->bMbTypeSkip[0] = 1;
+      pMbCache->iSadCostSkip[0] = pMbCache->pEncSad[-iMbWidth - 1];
+    } else {
+      pMbCache->bMbTypeSkip[0] = 0;
+      pMbCache->iSadCostSkip[0] = 0;
+    }
+  } else { //unavail
+    ST32 (&pMvComp->sMotionVectorCache[0], 0);
+    pMvComp->iRefIndexCache[0] = (uiNeighborAvail & TOPLEFT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[0] = 0;
+    pMbCache->bMbTypeSkip[0] = 0;
+    pMbCache->iSadCostSkip[0] = 0;
+  }
+
+  if ((uiNeighborAvail & TOPRIGHT_MB_POS) && IS_SVC_INTER (iRightTopMb->uiMbType)) { //RIGHT_TOP MB
+    pMvComp->sMotionVectorCache[5] = iRightTopMb->sMv[12];
+    pMvComp->iRefIndexCache[5] = iRightTopMb->pRefIndex[2];
+    pMbCache->iSadCost[2] = iRightTopMb->pSadCost[0];
+
+    if (iRightTopMb->uiMbType == MB_TYPE_SKIP  && pVaaBgMbFlag[-iMbWidth + 1] == 0) {
+      pMbCache->bMbTypeSkip[2] = 1;
+      pMbCache->iSadCostSkip[2] = pMbCache->pEncSad[-iMbWidth + 1];
+    } else {
+      pMbCache->bMbTypeSkip[2] = 0;
+      pMbCache->iSadCostSkip[2] = 0;
+    }
+  } else { //unavail
+    ST32 (&pMvComp->sMotionVectorCache[5], 0);
+    pMvComp->iRefIndexCache[5] = (uiNeighborAvail & TOPRIGHT_MB_POS) ? REF_NOT_IN_LIST : REF_NOT_AVAIL;
+    pMbCache->iSadCost[2] = 0;
+    pMbCache->bMbTypeSkip[2] = 0;
+    pMbCache->iSadCostSkip[2] = 0;
+  }
+
+  //right-top 4*4 pBlock unavailable
+  ST32 (&pMvComp->sMotionVectorCache[ 9], 0);
+  ST32 (&pMvComp->sMotionVectorCache[21], 0);
+  ST32 (&pMvComp->sMotionVectorCache[11], 0);
+  ST32 (&pMvComp->sMotionVectorCache[17], 0);
+  ST32 (&pMvComp->sMotionVectorCache[23], 0);
+  pMvComp->iRefIndexCache[ 9] =
+    pMvComp->iRefIndexCache[11] =
+      pMvComp->iRefIndexCache[17] =
+        pMvComp->iRefIndexCache[21] =
+          pMvComp->iRefIndexCache[23] = REF_NOT_AVAIL;
+}
+
+void InitFillNeighborCacheInterFunc (SWelsFuncPtrList* pFuncList, const int32_t kiFlag) {
+  pFuncList->pfFillInterNeighborCache = kiFlag ? FillNeighborCacheInterWithBGD : FillNeighborCacheInterWithoutBGD;
+}
+
+void UpdateMbMv_c (SMVUnitXY* pMvBuffer, const SMVUnitXY ksMv) {
+  int32_t k = 0;
+  for (; k < MB_BLOCK4x4_NUM; k += 4) {
+    pMvBuffer[k  ] =
+      pMvBuffer[k + 1] =
+        pMvBuffer[k + 2] =
+          pMvBuffer[k + 3] = ksMv;
+  }
+}
+
+
+uint8_t MdInterAnalysisVaaInfo_c (int32_t* pSad8x8) {
+  int32_t iSadBlock[4], iAverageSadBlock[4];
+  int32_t iAverageSad, iVarianceSad;
+
+  iSadBlock[0] = pSad8x8[0];
+  iAverageSad = iSadBlock[0];
+
+  iSadBlock[1] = pSad8x8[1];
+  iAverageSad += iSadBlock[1];
+
+  iSadBlock[2] = pSad8x8[2];
+  iAverageSad += iSadBlock[2];
+
+  iSadBlock[3] = pSad8x8[3];
+  iAverageSad += iSadBlock[3];
+
+  iAverageSad = iAverageSad >> 2;
+
+  iAverageSadBlock[0] = (iSadBlock[0] >> 6) - (iAverageSad >> 6);
+  iVarianceSad = iAverageSadBlock[0] * iAverageSadBlock[0];
+
+  iAverageSadBlock[1] = (iSadBlock[1] >> 6) - (iAverageSad >> 6);
+  iVarianceSad += iAverageSadBlock[1] * iAverageSadBlock[1];
+
+  iAverageSadBlock[2] = (iSadBlock[2] >> 6) - (iAverageSad >> 6);
+  iVarianceSad += iAverageSadBlock[2] * iAverageSadBlock[2];
+
+  iAverageSadBlock[3] = (iSadBlock[3] >> 6) - (iAverageSad >> 6);
+  iVarianceSad += iAverageSadBlock[3] * iAverageSadBlock[3];
+
+  if (iVarianceSad < INTER_VARIANCE_SAD_THRESHOLD) {
+    return 15;
+  }
+
+  uint8_t uiMbSign = 0;
+  if (iSadBlock[0] > iAverageSad)
+    uiMbSign |= 0x08;
+  if (iSadBlock[1] > iAverageSad)
+    uiMbSign |= 0x04;
+  if (iSadBlock[2] > iAverageSad)
+    uiMbSign |= 0x02;
+  if (iSadBlock[3] > iAverageSad)
+    uiMbSign |= 0x01;
+  return (uiMbSign);
+}
+
+int32_t AnalysisVaaInfoIntra_c (uint8_t* pDataY, const int32_t kiLineSize) {
+  ENFORCE_STACK_ALIGN_1D (uint16_t, uiAvgBlock, 16, 16)
+  uint16_t* pBlock = &uiAvgBlock[0];
+  uint8_t* pEncData         = pDataY;
+  const int32_t kiLineSize2 = kiLineSize << 1;
+  const int32_t kiLineSize3 = kiLineSize + kiLineSize2;
+  const int32_t kiLineSize4 = kiLineSize << 2;
+  int32_t i = 0, j = 0, num = 0;
+  int32_t iSumAvg = 0, iSumSqr = 0;
+
+//  analysis_vaa_info_intra_core_c( pDataY, iLineSize, pBlock );
+  for (; j < 16; j += 4) {
+    num = 0;
+    for (i = 0; i < 16; i += 4, num ++) {
+      pBlock[num] =  pEncData[i              ] + pEncData[i + 1              ] + pEncData[i + 2              ] + pEncData[i +
+                     3              ];
+      pBlock[num] += pEncData[i + kiLineSize ] + pEncData[i + kiLineSize  + 1] + pEncData[i + kiLineSize  + 2] + pEncData[i +
+                     kiLineSize  + 3];
+      pBlock[num] += pEncData[i + kiLineSize2] + pEncData[i + kiLineSize2 + 1] + pEncData[i + kiLineSize2 + 2] + pEncData[i +
+                     kiLineSize2 + 3];
+      pBlock[num] += pEncData[i + kiLineSize3] + pEncData[i + kiLineSize3 + 1] + pEncData[i + kiLineSize3 + 2] + pEncData[i +
+                     kiLineSize3 + 3];
+      pBlock[num] >>=  4;
+    }
+    pBlock += 4;
+    pEncData += kiLineSize4;
+  }
+
+  pBlock = &uiAvgBlock[0];
+  i = 4;
+  for (; i > 0; --i) {
+    iSumAvg += pBlock[0] + pBlock[1] + pBlock[2] + pBlock[3];
+    iSumSqr += pBlock[0] * pBlock[0] + pBlock[1] * pBlock[1] + pBlock[2] * pBlock[2] + pBlock[3] * pBlock[3];
+
+    pBlock += 4;
+  }
+
+
+  return /*variance =*/ (iSumSqr - ((iSumAvg * iSumAvg) >> 4));
+}
+
+// for pfGetVarianceFromIntraVaa function ptr adaptive by CPU features, 6/7/2010
+void InitIntraAnalysisVaaInfo (SWelsFuncPtrList* pFuncList, const uint32_t kuiCpuFlag) {
+  pFuncList->pfGetVarianceFromIntraVaa      = AnalysisVaaInfoIntra_c;
+  pFuncList->pfGetMbSignFromInterVaa        = MdInterAnalysisVaaInfo_c;
+  pFuncList->pfUpdateMbMv                   = UpdateMbMv_c;
+
+#if defined(X86_ASM)
+  if ((kuiCpuFlag & WELS_CPU_SSE2) == WELS_CPU_SSE2) {
+    pFuncList->pfGetVarianceFromIntraVaa    = AnalysisVaaInfoIntra_sse2;
+    pFuncList->pfGetMbSignFromInterVaa      = MdInterAnalysisVaaInfo_sse2;
+    pFuncList->pfUpdateMbMv                 = UpdateMbMv_sse2;
+  }
+  if ((kuiCpuFlag & WELS_CPU_SSSE3) == WELS_CPU_SSSE3) {
+    pFuncList->pfGetVarianceFromIntraVaa    = AnalysisVaaInfoIntra_ssse3;
+  }
+  if ((kuiCpuFlag & WELS_CPU_SSE41) == WELS_CPU_SSE41) {
+    pFuncList->pfGetMbSignFromInterVaa      = MdInterAnalysisVaaInfo_sse41;
+  }
+#endif//X86_ASM
+}
+
+bool MdIntraAnalysisVaaInfo (sWelsEncCtx* pEncCtx, uint8_t* pEncMb) {
+
+  SDqLayer* pCurDqLayer     = pEncCtx->pCurDqLayer;
+  const int32_t kiLineSize  = pCurDqLayer->iEncStride[0];
+  const int32_t kiVariance  = pEncCtx->pFuncList->pfGetVarianceFromIntraVaa (pEncMb, kiLineSize);
+  return (kiVariance >= INTRA_VARIANCE_SAD_THRESHOLD);
+}
+
+void InitMeRefinePointer (SMeRefinePointer* pMeRefine, SMbCache* pMbCache, int32_t iStride) {
+  pMeRefine->pHalfPixH    = &pMbCache->pBufferInterPredMe[0] + iStride;
+  pMeRefine->pHalfPixV    = &pMbCache->pBufferInterPredMe[640] + iStride;
+
+  pMeRefine->pQuarPixBest = &pMbCache->pBufferInterPredMe[1280] + iStride;
+  pMeRefine->pQuarPixTmp  = &pMbCache->pBufferInterPredMe[1920] + iStride;
+}
+typedef struct TagQuarParams {
+  int32_t iBestCost;
+  int32_t iBestHalfPix;
+  int32_t iStrideA;
+  int32_t iStrideB;
+  uint8_t* pRef;
+  uint8_t* pSrcB[4];
+  uint8_t* pSrcA[4];
+  int32_t iLms[4];
+  int32_t iBestQuarPix;
+} SQuarRefineParams;
+
+#define SWITCH_BEST_TMP_BUF(prev_best, curr_best){\
+  pParams->iBestCost = iCurCost;\
+  pTmp = prev_best;\
+  prev_best = curr_best;\
+  curr_best = pTmp;\
+}
+#define CALC_COST(me_buf, lm) ( pFunc->sSampleDealingFuncs.pfMeCost[kuiPixel](pEncMb, iStrideEnc, me_buf, ME_REFINE_BUF_STRIDE) + lm )
+
+inline void MeRefineQuarPixel (SWelsFuncPtrList* pFunc, SWelsME* pMe, SMeRefinePointer* pMeRefine,
+                               const int32_t kiWidth, const int32_t kiHeight, SQuarRefineParams* pParams, int32_t iStrideEnc) {
+  PWelsSampleAveragingFunc pSampleAvg   = pFunc->sMcFuncs.pfSampleAveraging;
+  int32_t iCurCost;
+  uint8_t* pEncMb                       = pMe->pEncMb;
+  uint8_t* pTmp                         = NULL;
+  const uint8_t kuiPixel                = pMe->uiBlockSize;
+
+  pSampleAvg (pMeRefine->pQuarPixTmp, ME_REFINE_BUF_STRIDE, pParams->pSrcA[0], ME_REFINE_BUF_STRIDE,
+              pParams->pSrcB[0], pParams->iStrideA, kiWidth, kiHeight);
+
+  iCurCost = CALC_COST (pMeRefine->pQuarPixTmp, pParams->iLms[0]);
+  if (iCurCost < pParams->iBestCost) {
+    pParams->iBestQuarPix = ME_QUAR_PIXEL_TOP;
+    SWITCH_BEST_TMP_BUF (pMeRefine->pQuarPixBest, pMeRefine->pQuarPixTmp);
+  }
+  //=========================(0, 1)=======================//
+  pSampleAvg (pMeRefine->pQuarPixTmp, ME_REFINE_BUF_STRIDE, pParams->pSrcA[1],
+              ME_REFINE_BUF_STRIDE, pParams->pSrcB[1], pParams->iStrideA, kiWidth, kiHeight);
+  iCurCost = CALC_COST (pMeRefine->pQuarPixTmp, pParams->iLms[1]);
+  if (iCurCost < pParams->iBestCost) {
+    pParams->iBestQuarPix = ME_QUAR_PIXEL_BOTTOM;
+    SWITCH_BEST_TMP_BUF (pMeRefine->pQuarPixBest, pMeRefine->pQuarPixTmp);
+  }
+  //==========================(-1, 0)=========================//
+  pSampleAvg (pMeRefine->pQuarPixTmp, ME_REFINE_BUF_STRIDE, pParams->pSrcA[2],
+              ME_REFINE_BUF_STRIDE, pParams->pSrcB[2], pParams->iStrideB, kiWidth, kiHeight);
+  iCurCost = CALC_COST (pMeRefine->pQuarPixTmp, pParams->iLms[2]);
+  if (iCurCost < pParams->iBestCost) {
+    pParams->iBestQuarPix = ME_QUAR_PIXEL_LEFT;
+    SWITCH_BEST_TMP_BUF (pMeRefine->pQuarPixBest, pMeRefine->pQuarPixTmp);
+  }
+  //==========================(1, 0)=========================//
+  pSampleAvg (pMeRefine->pQuarPixTmp, ME_REFINE_BUF_STRIDE, pParams->pSrcA[3],
+              ME_REFINE_BUF_STRIDE, pParams->pSrcB[3], pParams->iStrideB,  kiWidth, kiHeight);
+
+  iCurCost = CALC_COST (pMeRefine->pQuarPixTmp, pParams->iLms[3]);
+  if (iCurCost < pParams->iBestCost) {
+    pParams->iBestQuarPix = ME_QUAR_PIXEL_RIGHT;
+    SWITCH_BEST_TMP_BUF (pMeRefine->pQuarPixBest, pMeRefine->pQuarPixTmp);
+  }
+}
+
+void MeRefineFracPixel (sWelsEncCtx* pEncCtx, uint8_t* pMemPredInterMb, SWelsME* pMe,
+                        SMeRefinePointer* pMeRefine, int32_t iWidth, int32_t iHeight) {
+  SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+  int16_t iMvx = pMe->sMv.iMvX;
+  int16_t iMvy = pMe->sMv.iMvY;
+
+  int16_t iHalfMvx = iMvx;
+  int16_t iHalfMvy = iMvy;
+  const int32_t kiStrideEnc = pEncCtx->pCurDqLayer->iEncStride[0];
+  const int32_t kiStrideRef = pEncCtx->pCurDqLayer->pRefPic->iLineSize[0];
+
+  uint8_t* pEncData = pMe->pEncMb;
+  uint8_t* pRef = pMe->pRefMb;//091010
+
+  int32_t iBestQuarPix = ME_NO_BEST_QUAR_PIXEL;
+
+  SQuarRefineParams sParams;
+  static const int32_t iMvQuarAddX[10] = {0, 0, -1, 1, 0, 0, 0, -1, 1, 0};
+  const int32_t* pMvQuarAddY = iMvQuarAddX + 3;
+  uint8_t* pBestPredInter = pRef;
+  int32_t iInterBlk4Stride = ME_REFINE_BUF_STRIDE;
+
+  int32_t iBestCost;
+  int32_t iCurCost;
+  int32_t iBestHalfPix;
+
+  if (pEncCtx->pCurDqLayer->bSatdInMdFlag) {
+    iBestCost = pMe->uSadPredISatd.uiSatd + COST_MVD (pMe->pMvdCost, iMvx - pMe->sMvp.iMvX, iMvy - pMe->sMvp.iMvY);
+  } else {
+    iBestCost = pFunc->sSampleDealingFuncs.pfMeCost[pMe->uiBlockSize] (pEncData, kiStrideEnc, pRef, kiStrideRef) +
+                COST_MVD (pMe->pMvdCost, iMvx - pMe->sMvp.iMvX, iMvy - pMe->sMvp.iMvY);
+  }
+
+  iBestHalfPix = REFINE_ME_NO_BEST_HALF_PIXEL;
+
+  pFunc->sMcFuncs.pfLumaHalfpelVer (pRef - kiStrideRef, kiStrideRef, pMeRefine->pHalfPixV, ME_REFINE_BUF_STRIDE, iWidth,
+                                    iHeight + 1);
+
+  //step 1: get [iWidth][iHeight+1] half pixel from vertical filter
+  //===========================(0, -2)==============================//
+  iCurCost = pFunc->sSampleDealingFuncs.pfMeCost[pMe->uiBlockSize] (pEncData, kiStrideEnc, pMeRefine->pHalfPixV,
+             ME_REFINE_BUF_STRIDE) +
+             COST_MVD (pMe->pMvdCost, iMvx - pMe->sMvp.iMvX, iMvy - 2 - pMe->sMvp.iMvY);
+  if (iCurCost < iBestCost) {
+    iBestCost = iCurCost;
+    iBestHalfPix = REFINE_ME_HALF_PIXEL_TOP;
+    pBestPredInter = pMeRefine->pHalfPixV;
+  }
+  //===========================(0, 2)==============================//
+  iCurCost = pFunc->sSampleDealingFuncs.pfMeCost[pMe->uiBlockSize] (pEncData, kiStrideEnc,
+             pMeRefine->pHalfPixV + ME_REFINE_BUF_STRIDE, ME_REFINE_BUF_STRIDE) +
+             COST_MVD (pMe->pMvdCost, iMvx - pMe->sMvp.iMvX, iMvy + 2 - pMe->sMvp.iMvY);
+  if (iCurCost < iBestCost) {
+    iBestCost = iCurCost;
+    iBestHalfPix = REFINE_ME_HALF_PIXEL_BOTTOM;
+    pBestPredInter = pMeRefine->pHalfPixV + ME_REFINE_BUF_STRIDE;
+  }
+  pFunc->sMcFuncs.pfLumaHalfpelHor (pRef - 1, kiStrideRef, pMeRefine->pHalfPixH, ME_REFINE_BUF_STRIDE, iWidth + 1,
+                                    iHeight);
+  //step 2: get [iWidth][iHeight+1] half pixel from horizon filter
+
+  //===========================(-2, 0)==============================//
+  iCurCost = pFunc->sSampleDealingFuncs.pfMeCost[pMe->uiBlockSize] (pEncData, kiStrideEnc, pMeRefine->pHalfPixH,
+             ME_REFINE_BUF_STRIDE) +
+             COST_MVD (pMe->pMvdCost, iMvx - 2 - pMe->sMvp.iMvX, iMvy - pMe->sMvp.iMvY);
+  if (iCurCost < iBestCost) {
+    iBestCost = iCurCost;
+    iBestHalfPix = REFINE_ME_HALF_PIXEL_LEFT;
+    pBestPredInter = pMeRefine->pHalfPixH;
+  }
+  //===========================(2, 0)===============================//
+  iCurCost = pFunc->sSampleDealingFuncs.pfMeCost[pMe->uiBlockSize] (pEncData, kiStrideEnc, pMeRefine->pHalfPixH + 1,
+             ME_REFINE_BUF_STRIDE) +
+             COST_MVD (pMe->pMvdCost, iMvx + 2 - pMe->sMvp.iMvX, iMvy - pMe->sMvp.iMvY);
+  if (iCurCost < iBestCost) {
+    iBestCost = iCurCost;
+    iBestHalfPix = REFINE_ME_HALF_PIXEL_RIGHT;
+    pBestPredInter = pMeRefine->pHalfPixH + 1;
+  }
+
+  sParams.iBestCost = iBestCost;
+  sParams.iBestHalfPix = iBestHalfPix;
+  sParams.pRef = pRef;
+  sParams.iBestQuarPix = ME_NO_BEST_QUAR_PIXEL;
+
+  //step 5: if no best half-pixel prediction, try quarter pixel prediction
+  //        if yes, must get [X+1][X+1] half-pixel from (2, 2) horizontal and vertical filter
+  if (REFINE_ME_NO_BEST_HALF_PIXEL == iBestHalfPix) {
+    sParams.iStrideA = kiStrideRef;
+    sParams.iStrideB = kiStrideRef;
+    sParams.pSrcA[0] = pMeRefine->pHalfPixV;
+    sParams.pSrcA[1] = pMeRefine->pHalfPixV + ME_REFINE_BUF_STRIDE;
+    sParams.pSrcA[2] = pMeRefine->pHalfPixH;
+    sParams.pSrcA[3] = pMeRefine->pHalfPixH + 1;
+
+    sParams.pSrcB[0] = sParams.pSrcB[1] = sParams.pSrcB[2] = sParams.pSrcB[3] = pRef;
+
+    sParams.iLms[0] = COST_MVD (pMe->pMvdCost, iHalfMvx - pMe->sMvp.iMvX, iHalfMvy - 1 - pMe->sMvp.iMvY);
+    sParams.iLms[1] = COST_MVD (pMe->pMvdCost, iHalfMvx - pMe->sMvp.iMvX, iHalfMvy + 1 - pMe->sMvp.iMvY);
+    sParams.iLms[2] = COST_MVD (pMe->pMvdCost, iHalfMvx - 1 - pMe->sMvp.iMvX, iHalfMvy - pMe->sMvp.iMvY);
+    sParams.iLms[3] = COST_MVD (pMe->pMvdCost, iHalfMvx + 1 - pMe->sMvp.iMvX, iHalfMvy - pMe->sMvp.iMvY);
+  } else { //must get [X+1][X+1] half-pixel from (2, 2) horizontal and vertical filter
+    switch (iBestHalfPix) {
+    case REFINE_ME_HALF_PIXEL_LEFT: {
+      pMeRefine->pHalfPixHV = pMeRefine->pHalfPixV;//reuse pBuffer, here only h&hv
+      pFunc->sMcFuncs.pfLumaHalfpelCen (pRef - 1 - kiStrideRef, kiStrideRef, pMeRefine->pHalfPixHV, ME_REFINE_BUF_STRIDE,
+                                        iWidth + 1, iHeight + 1);
+
+      iHalfMvx -= 2;
+      sParams.iStrideA = ME_REFINE_BUF_STRIDE;
+      sParams.iStrideB = kiStrideRef;
+      sParams.pSrcA[0] = pMeRefine->pHalfPixH;
+      sParams.pSrcA[3] = sParams.pSrcA[2] = sParams.pSrcA[1] = sParams.pSrcA[0];
+      sParams.pSrcB[0] = pMeRefine->pHalfPixHV;
+      sParams.pSrcB[1] = pMeRefine->pHalfPixHV + ME_REFINE_BUF_STRIDE;
+      sParams.pSrcB[2] = pRef - 1;
+      sParams.pSrcB[3] = pRef;
+
+    }
+    break;
+    case REFINE_ME_HALF_PIXEL_RIGHT: {
+      pMeRefine->pHalfPixHV = pMeRefine->pHalfPixV;//reuse pBuffer, here only h&hv
+      pFunc->sMcFuncs.pfLumaHalfpelCen (pRef - 1 - kiStrideRef, kiStrideRef, pMeRefine->pHalfPixHV, ME_REFINE_BUF_STRIDE,
+                                        iWidth + 1, iHeight + 1);
+      iHalfMvx += 2;
+      sParams.iStrideA = ME_REFINE_BUF_STRIDE;
+      sParams.iStrideB = kiStrideRef;
+      sParams.pSrcA[0] = pMeRefine->pHalfPixH + 1;
+      sParams.pSrcA[3] = sParams.pSrcA[2] = sParams.pSrcA[1] = sParams.pSrcA[0];
+      sParams.pSrcB[0] = pMeRefine->pHalfPixHV + 1;
+      sParams.pSrcB[1] = pMeRefine->pHalfPixHV + 1 + ME_REFINE_BUF_STRIDE;
+      sParams.pSrcB[2] = pRef;
+      sParams.pSrcB[3] = pRef + 1;
+    }
+    break;
+    case REFINE_ME_HALF_PIXEL_TOP: {
+      pMeRefine->pHalfPixHV = pMeRefine->pHalfPixH;//reuse pBuffer, here only v&hv
+      pFunc->sMcFuncs.pfLumaHalfpelCen (pRef - 1 - kiStrideRef, kiStrideRef, pMeRefine->pHalfPixHV, ME_REFINE_BUF_STRIDE,
+                                        iWidth + 1, iHeight + 1);
+
+      iHalfMvy -= 2;
+      sParams.iStrideA = kiStrideRef;
+      sParams.iStrideB = ME_REFINE_BUF_STRIDE;
+      sParams.pSrcA[0] = pMeRefine->pHalfPixV;
+      sParams.pSrcA[3] = sParams.pSrcA[2] = sParams.pSrcA[1] = sParams.pSrcA[0];
+      sParams.pSrcB[0] = pRef - kiStrideRef;
+      sParams.pSrcB[1] = pRef;
+      sParams.pSrcB[2] = pMeRefine->pHalfPixHV;
+      sParams.pSrcB[3] = pMeRefine->pHalfPixHV + 1;
+    }
+    break;
+    case REFINE_ME_HALF_PIXEL_BOTTOM: {
+      pMeRefine->pHalfPixHV = pMeRefine->pHalfPixH;//reuse pBuffer, here only v&hv
+      pFunc->sMcFuncs.pfLumaHalfpelCen (pRef - 1 - kiStrideRef, kiStrideRef, pMeRefine->pHalfPixHV, ME_REFINE_BUF_STRIDE,
+                                        iWidth + 1, iHeight + 1);
+      iHalfMvy += 2;
+      sParams.iStrideA = kiStrideRef;
+      sParams.iStrideB = ME_REFINE_BUF_STRIDE;
+      sParams.pSrcA[0] = pMeRefine->pHalfPixV + ME_REFINE_BUF_STRIDE;
+      sParams.pSrcA[3] = sParams.pSrcA[2] = sParams.pSrcA[1] = sParams.pSrcA[0];
+      sParams.pSrcB[0] = pRef;
+      sParams.pSrcB[1] = pRef + kiStrideRef;
+      sParams.pSrcB[2] = pMeRefine->pHalfPixHV + ME_REFINE_BUF_STRIDE;
+      sParams.pSrcB[3] = pMeRefine->pHalfPixHV + ME_REFINE_BUF_STRIDE + 1;
+    }
+    break;
+    default:
+      break;
+    }
+    sParams.iLms[0] = COST_MVD (pMe->pMvdCost, iHalfMvx - pMe->sMvp.iMvX, iHalfMvy - 1 - pMe->sMvp.iMvY);
+    sParams.iLms[1] = COST_MVD (pMe->pMvdCost, iHalfMvx - pMe->sMvp.iMvX, iHalfMvy + 1 - pMe->sMvp.iMvY);
+    sParams.iLms[2] = COST_MVD (pMe->pMvdCost, iHalfMvx - 1 - pMe->sMvp.iMvX, iHalfMvy - pMe->sMvp.iMvY);
+    sParams.iLms[3] = COST_MVD (pMe->pMvdCost, iHalfMvx + 1 - pMe->sMvp.iMvX, iHalfMvy - pMe->sMvp.iMvY);
+  }
+  MeRefineQuarPixel (pFunc, pMe, pMeRefine, iWidth, iHeight, &sParams, kiStrideEnc);
+
+  if (iBestCost > sParams.iBestCost) {
+    pBestPredInter = pMeRefine->pQuarPixBest;
+    iBestCost = sParams.iBestCost;
+  }
+  iBestQuarPix = sParams.iBestQuarPix;
+
+  //update final best MV
+  pMe->sMv.iMvX = iHalfMvx + iMvQuarAddX[iBestQuarPix];
+  pMe->sMv.iMvY = iHalfMvy + pMvQuarAddY[iBestQuarPix];
+  pMe->uiSatdCost = iBestCost;
+
+  //No half or quarter pixel best, so do MC with integer pixel MV
+  if (iBestHalfPix + iBestQuarPix == NO_BEST_FRAC_PIX) {
+    pBestPredInter = pRef;
+    iInterBlk4Stride = kiStrideRef;
+  }
+  pMeRefine->pfCopyBlockByMode (pMemPredInterMb, MB_WIDTH_LUMA, pBestPredInter,
+                                iInterBlk4Stride);
+}
+
+void InitBlkStrideWithRef (int32_t* pBlkStride, const int32_t kiStrideRef) {
+  static const uint8_t kuiStrideX[16] = {
+    0, 4 , 0, 4 ,
+    8, 12, 8, 12,
+    0, 4 , 0, 4 ,
+    8, 12, 8, 12
+  };
+  static const uint8_t kuiStrideY[16] = {
+    0, 0, 4 , 4 ,
+    0, 0, 4 , 4 ,
+    8, 8, 12, 12,
+    8, 8, 12, 12
+  };
+  int32_t i;
+
+  for (i = 0; i < 16; i += 4) {
+    pBlkStride[i  ] = kuiStrideX[i  ] + kuiStrideY[i  ] * kiStrideRef;
+    pBlkStride[i + 1] = kuiStrideX[i + 1] + kuiStrideY[i + 1] * kiStrideRef;
+    pBlkStride[i + 2] = kuiStrideX[i + 2] + kuiStrideY[i + 2] * kiStrideRef;
+    pBlkStride[i + 3] = kuiStrideX[i + 3] + kuiStrideY[i + 3] * kiStrideRef;
+  }
+}
+
+/*
+ * iMvdSz = (648*2+1) or (972*2+1);
+ */
+void MvdCostInit (uint16_t* pMvdCostInter, const int32_t kiMvdSz) {
+  const int32_t kiSz        = kiMvdSz >> 1;
+  uint16_t* pNegMvd         = pMvdCostInter;
+  uint16_t* pPosMvd         = pMvdCostInter + kiSz + 1;
+  const int32_t* kpQpLambda = &g_kiQpCostTable[0];
+  int32_t i, j;
+
+  for (i = 0; i < 52; ++ i) {
+    const uint16_t kiLambda = kpQpLambda[i];
+    int32_t iNegSe = -kiSz;
+    int32_t iPosSe = 1;
+
+    for (j = 0; j < kiSz; j += 4) {
+      *pNegMvd++ = kiLambda * BsSizeSE (iNegSe++);
+      *pNegMvd++ = kiLambda * BsSizeSE (iNegSe++);
+      *pNegMvd++ = kiLambda * BsSizeSE (iNegSe++);
+      *pNegMvd++ = kiLambda * BsSizeSE (iNegSe++);
+
+      *pPosMvd++ = kiLambda * BsSizeSE (iPosSe++);
+      *pPosMvd++ = kiLambda * BsSizeSE (iPosSe++);
+      *pPosMvd++ = kiLambda * BsSizeSE (iPosSe++);
+      *pPosMvd++ = kiLambda * BsSizeSE (iPosSe++);
+    }
+    *pNegMvd = kiLambda;
+    pNegMvd += kiSz + 1;
+    pPosMvd += kiSz + 1;
+  }
+}
+
+void PredictSad (int8_t* pRefIndexCache, int32_t* pSadCostCache, int32_t uiRef, int32_t* pSadPred) {
+  const int32_t kiRefB  = pRefIndexCache[1];//top g_uiCache12_8x8RefIdx[0] - 4
+  int32_t iRefC         = pRefIndexCache[5];//top-right g_uiCache12_8x8RefIdx[0] - 2
+  const int32_t kiRefA  = pRefIndexCache[6];//left g_uiCache12_8x8RefIdx[0] - 1
+  const int32_t kiSadB  = pSadCostCache[1];
+  int32_t iSadC         = pSadCostCache[2];
+  const int32_t kiSadA  = pSadCostCache[3];
+
+  int32_t iCount;
+
+  if (iRefC == REF_NOT_AVAIL) {
+    iRefC = pRefIndexCache[0];//top-left g_uiCache12_8x8RefIdx[0] - 4 - 1
+    iSadC  = pSadCostCache[0];
+  }
+
+  if (kiRefB == REF_NOT_AVAIL && iRefC == REF_NOT_AVAIL && kiRefA != REF_NOT_AVAIL) {
+    * pSadPred = kiSadA;
+  } else {
+    iCount  = (uiRef == kiRefA) << MB_LEFT_BIT;
+    iCount |= (uiRef == kiRefB) << MB_TOP_BIT;
+    iCount |= (uiRef == iRefC) << MB_TOPRIGHT_BIT;
+    switch (iCount) {
+    case LEFT_MB_POS:// A
+      *pSadPred = kiSadA;
+      break;
+    case TOP_MB_POS:// B
+      *pSadPred = kiSadB;
+      break;
+    case TOPRIGHT_MB_POS:// C or D
+      *pSadPred = iSadC;
+      break;
+    default:
+      *pSadPred = WelsMedian (kiSadA, kiSadB, iSadC);
+      break;
+    }
+  }
+
+#define REPLACE_SAD_MULTIPLY(x)   ((x) - (x>>3) + (x >>5))    // it's 0.90625, very close with 0.9
+  iCount = (*pSadPred) << 6;  // here *64 will not overflow. SAD range 0~ 255*256(max 2^16), int32_t is enough
+  *pSadPred = (REPLACE_SAD_MULTIPLY (iCount) + 32) >> 6;
+#undef REPLACE_SAD_MULTIPLY
+}
+
+
+void PredictSadSkip (int8_t* pRefIndexCache, bool* pMbSkipCache, int32_t* pSadCostCache, int32_t uiRef,
+                     int32_t* iSadPredSkip) {
+  const int32_t kiRefB  = pRefIndexCache[1];//top g_uiCache12_8x8RefIdx[0] - 4
+  int32_t iRefC         = pRefIndexCache[5];//top-right g_uiCache12_8x8RefIdx[0] - 2
+  const int32_t kiRefA  = pRefIndexCache[6];//left g_uiCache12_8x8RefIdx[0] - 1
+  const int32_t kiSadB  = (pMbSkipCache[1] == 1 ? pSadCostCache[1] : 0);
+  int32_t iSadC         = (pMbSkipCache[2] == 1 ? pSadCostCache[2] : 0);
+  const int32_t kiSadA  = (pMbSkipCache[3] == 1 ? pSadCostCache[3] : 0);
+  int32_t iRefSkip      = pMbSkipCache[2];
+
+  int32_t iCount = 0;
+
+  if (iRefC == REF_NOT_AVAIL) {
+    iRefC = pRefIndexCache[0];//top-left g_uiCache12_8x8RefIdx[0] - 4 - 1
+    iSadC  = (pMbSkipCache[0] == 1 ? pSadCostCache[0] : 0);
+    iRefSkip = pMbSkipCache[0];
+  }
+
+  if (kiRefB == REF_NOT_AVAIL && iRefC == REF_NOT_AVAIL && kiRefA != REF_NOT_AVAIL) {
+    * iSadPredSkip = kiSadA;
+  } else {
+    iCount  = ((uiRef == kiRefA) && (pMbSkipCache[3] == 1)) << MB_LEFT_BIT;
+    iCount |= ((uiRef == kiRefB) && (pMbSkipCache[1] == 1)) << MB_TOP_BIT;
+    iCount |= ((uiRef == iRefC) && (iRefSkip == 1)) << MB_TOPRIGHT_BIT;
+    switch (iCount) {
+    case LEFT_MB_POS:// A
+      *iSadPredSkip = kiSadA;
+      break;
+    case TOP_MB_POS:// B
+      *iSadPredSkip = kiSadB;
+      break;
+    case TOPRIGHT_MB_POS:// C or D
+      *iSadPredSkip = iSadC;
+      break;
+    default:
+      *iSadPredSkip = WelsMedian (kiSadA, kiSadB, iSadC);
+      break;
+    }
+  }
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/mv_pred.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/mv_pred.cpp
new file mode 100644
index 0000000000..a06a629c7c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/mv_pred.cpp
@@ -0,0 +1,436 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    mv_pred.c
+ *
+ * \brief   Get MV predictor and update motion vector of mb cache
+ *
+ * \date    05/22/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "mv_pred.h"
+#include "ls_defines.h"
+namespace WelsEnc {
+//basic pMv prediction unit for pMv width (4, 2, 1)
+void PredMv (const SMVComponentUnit* kpMvComp, int8_t iPartIdx, int8_t iPartW, int32_t iRef, SMVUnitXY* sMvp) {
+  const uint8_t kuiLeftIdx = g_kuiCache30ScanIdx[iPartIdx] - 1;
+  const uint8_t kuiTopIdx  = g_kuiCache30ScanIdx[iPartIdx] - 6;
+
+  int32_t iMatchRef;
+  int32_t iLeftRef = kpMvComp->iRefIndexCache[kuiLeftIdx];
+  int32_t iTopRef  = kpMvComp->iRefIndexCache[ kuiTopIdx];
+  int32_t iRightTopRef = kpMvComp->iRefIndexCache[kuiTopIdx + iPartW];
+  int32_t iDiagonalRef;
+  SMVUnitXY sMvA (kpMvComp->sMotionVectorCache[kuiLeftIdx]);
+  SMVUnitXY sMvB (kpMvComp->sMotionVectorCache[kuiTopIdx]);
+  SMVUnitXY sMvC;
+
+  if (REF_NOT_AVAIL == iRightTopRef) {
+    iDiagonalRef = kpMvComp->iRefIndexCache[ kuiTopIdx - 1];// left_top;
+    sMvC = kpMvComp->sMotionVectorCache[kuiTopIdx - 1];
+  } else {
+    iDiagonalRef = iRightTopRef;// right_top;
+    sMvC = kpMvComp->sMotionVectorCache[kuiTopIdx + iPartW];
+  }
+
+  if ((REF_NOT_AVAIL == iTopRef) && (REF_NOT_AVAIL == iDiagonalRef) && iLeftRef != REF_NOT_AVAIL) {
+    *sMvp = sMvA;
+    return;
+  }
+
+  // b2[diag] b1[top] b0[left] is available!
+  iMatchRef  = (iRef == iLeftRef)     << MB_LEFT_BIT;
+  iMatchRef |= (iRef == iTopRef)      << MB_TOP_BIT;
+  iMatchRef |= (iRef == iDiagonalRef) << MB_TOPRIGHT_BIT;
+  switch (iMatchRef) {
+  case LEFT_MB_POS:// A
+    *sMvp = sMvA;
+    break;
+  case TOP_MB_POS:// B
+    *sMvp = sMvB;
+    break;
+  case TOPRIGHT_MB_POS:// C or D
+    *sMvp = sMvC;
+    break;
+  default:
+    sMvp->iMvX = WelsMedian (sMvA.iMvX, sMvB.iMvX, sMvC.iMvX);
+    sMvp->iMvY = WelsMedian (sMvA.iMvY, sMvB.iMvY, sMvC.iMvY);
+    break;
+  }
+}
+void PredInter8x16Mv (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* sMvp) {
+  const SMVComponentUnit* kpMvComp = &pMbCache->sMvComponents;
+  if (0 == iPartIdx) {
+    const int8_t kiLeftRef = kpMvComp->iRefIndexCache[6];
+    if (iRef == kiLeftRef) {
+      *sMvp = kpMvComp->sMotionVectorCache[6];
+      return;
+    }
+  } else { // 1 == iPartIdx
+    int8_t iDiagonalRef = kpMvComp->iRefIndexCache[5]; //top-right
+    int8_t iIndex = 5;
+    if (REF_NOT_AVAIL == iDiagonalRef) {
+      iDiagonalRef = kpMvComp->iRefIndexCache[2]; //top-left for 8*8 block(iIndex 1)
+      iIndex = 2;
+    }
+    if (iRef == iDiagonalRef) {
+      *sMvp = kpMvComp->sMotionVectorCache[iIndex];
+      return;
+    }
+  }
+
+  PredMv (kpMvComp, iPartIdx, 2, iRef, sMvp);
+}
+void PredInter16x8Mv (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* sMvp) {
+  const SMVComponentUnit* kpMvComp = &pMbCache->sMvComponents;
+  if (0 == iPartIdx) {
+    const int8_t kiTopRef = kpMvComp->iRefIndexCache[1];
+    if (iRef == kiTopRef) {
+      *sMvp = kpMvComp->sMotionVectorCache[1];
+      return;
+    }
+  } else { // 8 == iPartIdx
+    const int8_t kiLeftRef = kpMvComp->iRefIndexCache[18];
+    if (iRef == kiLeftRef) {
+      *sMvp = kpMvComp->sMotionVectorCache[18];
+      return;
+    }
+  }
+
+  PredMv (kpMvComp, iPartIdx, 4, iRef, sMvp);
+}
+void PredSkipMv (SMbCache* pMbCache, SMVUnitXY* sMvp) {
+  const SMVComponentUnit* kpMvComp = &pMbCache->sMvComponents;
+  const int8_t kiLeftRef = kpMvComp->iRefIndexCache[6]; //A
+  const int8_t kiTopRef  = kpMvComp->iRefIndexCache[1]; //B
+
+  if (REF_NOT_AVAIL == kiLeftRef  || REF_NOT_AVAIL == kiTopRef ||
+      (0 == kiLeftRef && 0 == * (int32_t*) (&kpMvComp->sMotionVectorCache[6])) ||
+      (0 == kiTopRef  && 0 == * (int32_t*) (&kpMvComp->sMotionVectorCache[1]))) {
+    ST32 (sMvp, 0);
+    return;
+  }
+
+  PredMv (kpMvComp, 0, 4, 0, sMvp);
+}
+
+//update pMv and uiRefIndex cache for current MB, only for P_16*16 (SKIP inclusive)
+void UpdateP16x16MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int8_t kiRef, SMVUnitXY* pMv) {
+  // optimized 11/25/2011
+  SMVComponentUnit* pMvComp     = &pMbCache->sMvComponents;
+  const uint32_t kuiMv32        = LD32 (pMv);
+  const uint64_t kuiMv64        = BUTTERFLY4x8 (kuiMv32);
+  uint64_t uiMvBuf[8]           = { kuiMv64, kuiMv64, kuiMv64, kuiMv64, kuiMv64, kuiMv64, kuiMv64, kuiMv64 };
+  const uint16_t kuiRef16       = BUTTERFLY1x2 (kiRef);
+  const uint32_t kuiRef32       = BUTTERFLY2x4 (kuiRef16);
+
+  ST32 (pCurMb->pRefIndex, kuiRef32);
+  // update pMv range from 0~15
+  memcpy (pCurMb->sMv, uiMvBuf, sizeof (uiMvBuf)); // confirmed_safe_unsafe_usage
+
+  /*
+   * blocks 0: 7~10, 1: 13~16, 2: 19~22, 3: 25~28
+   */
+  pMvComp->iRefIndexCache[7]    = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[8], kuiRef16);
+  pMvComp->iRefIndexCache[10]   = kiRef;
+  pMvComp->iRefIndexCache[13]   = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[14], kuiRef16);
+  pMvComp->iRefIndexCache[16]   = kiRef;
+  pMvComp->iRefIndexCache[19]   = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[20], kuiRef16);
+  pMvComp->iRefIndexCache[22]   = kiRef;
+  pMvComp->iRefIndexCache[25]   = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[26], kuiRef16);
+  pMvComp->iRefIndexCache[28]   = kiRef;
+
+  /*
+  * blocks 0: 7~10, 1: 13~16, 2: 19~22, 3: 25~28
+  */
+  pMvComp->sMotionVectorCache[7]  = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[8], kuiMv64);
+  pMvComp->sMotionVectorCache[10] = *pMv;
+  pMvComp->sMotionVectorCache[13] = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[14], kuiMv64);
+  pMvComp->sMotionVectorCache[16] = *pMv;
+  pMvComp->sMotionVectorCache[19] = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[20], kuiMv64);
+  pMvComp->sMotionVectorCache[22] = *pMv;
+  pMvComp->sMotionVectorCache[25] = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[26], kuiMv64);
+  pMvComp->sMotionVectorCache[28] = *pMv;
+}
+
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P16x8
+void UpdateP16x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                            SMVUnitXY* pMv) {
+  // optimized 11/25/2011
+  SMVComponentUnit* pMvComp     = &pMbCache->sMvComponents;
+  const uint32_t kuiMv32        = LD32 (pMv);
+  const uint64_t kuiMv64        = BUTTERFLY4x8 (kuiMv32);
+  uint64_t uiMvBuf[4]           = { kuiMv64, kuiMv64, kuiMv64, kuiMv64 };
+  const int16_t kiScan4Idx      = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx      = g_kuiCache30ScanIdx[kiPartIdx];
+  const int16_t kiCacheIdx1     = 1 + kiCacheIdx;
+  const int16_t kiCacheIdx3     = 3 + kiCacheIdx;
+  const int16_t kiCacheIdx6     = 6 + kiCacheIdx;
+  const int16_t kiCacheIdx7     = 7 + kiCacheIdx;
+  const int16_t kiCacheIdx9     = 9 + kiCacheIdx;
+  const uint16_t kuiRef16       = BUTTERFLY1x2 (kiRef);
+
+  ST16 (&pCurMb->pRefIndex[ (kiPartIdx >> 2)], kuiRef16);
+  memcpy (&pCurMb->sMv[kiScan4Idx], uiMvBuf, sizeof (uiMvBuf)); // confirmed_safe_unsafe_usage
+
+  /*
+  * blocks 0: g_kuiCache30ScanIdx[iPartIdx]~g_kuiCache30ScanIdx[iPartIdx]+3, 1: g_kuiCache30ScanIdx[iPartIdx]+6~g_kuiCache30ScanIdx[iPartIdx]+9
+  */
+  pMvComp->iRefIndexCache[kiCacheIdx]  = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[kiCacheIdx1], kuiRef16);
+  pMvComp->iRefIndexCache[kiCacheIdx3] = kiRef;
+  pMvComp->iRefIndexCache[kiCacheIdx6] = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[kiCacheIdx7], kuiRef16);
+  pMvComp->iRefIndexCache[kiCacheIdx9] = kiRef;
+
+  /*
+  * blocks 0: g_kuiCache30ScanIdx[iPartIdx]~g_kuiCache30ScanIdx[iPartIdx]+3, 1: g_kuiCache30ScanIdx[iPartIdx]+6~g_kuiCache30ScanIdx[iPartIdx]+9
+  */
+  pMvComp->sMotionVectorCache[kiCacheIdx]  = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[kiCacheIdx1], kuiMv64);
+  pMvComp->sMotionVectorCache[kiCacheIdx3] = *pMv;
+  pMvComp->sMotionVectorCache[kiCacheIdx6] = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[kiCacheIdx7], kuiMv64);
+  pMvComp->sMotionVectorCache[kiCacheIdx9] = *pMv;
+}
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P8x16
+void update_P8x16_motion_info (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                               SMVUnitXY* pMv) {
+  // optimized 11/25/2011
+  SMVComponentUnit* pMvComp     = &pMbCache->sMvComponents;
+  const uint32_t kuiMv32        = LD32 (pMv);
+  const uint64_t kuiMv64        = BUTTERFLY4x8 (kuiMv32);
+  const int16_t kiScan4Idx      = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx      = g_kuiCache30ScanIdx[kiPartIdx];
+  const int16_t kiCacheIdx1     = 1 + kiCacheIdx;
+  const int16_t kiCacheIdx3     = 3 + kiCacheIdx;
+  const int16_t kiCacheIdx12    = 12 + kiCacheIdx;
+  const int16_t kiCacheIdx13    = 13 + kiCacheIdx;
+  const int16_t kiCacheIdx15    = 15 + kiCacheIdx;
+  const int16_t kiBlkIdx        = kiPartIdx >> 2;
+  const uint16_t kuiRef16       = BUTTERFLY1x2 (kiRef);
+
+  pCurMb->pRefIndex[kiBlkIdx]     = kiRef;
+  pCurMb->pRefIndex[2 + kiBlkIdx] = kiRef;
+  ST64 (&pCurMb->sMv[kiScan4Idx], kuiMv64);
+  ST64 (&pCurMb->sMv[4 + kiScan4Idx], kuiMv64);
+  ST64 (&pCurMb->sMv[8 + kiScan4Idx], kuiMv64);
+  ST64 (&pCurMb->sMv[12 + kiScan4Idx], kuiMv64);
+
+  /*
+  * blocks 0: g_kuiCache30ScanIdx[iPartIdx]~g_kuiCache30ScanIdx[iPartIdx]+3, 1: g_kuiCache30ScanIdx[iPartIdx]+6~g_kuiCache30ScanIdx[iPartIdx]+9
+  */
+  pMvComp->iRefIndexCache[kiCacheIdx]   = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[kiCacheIdx1], kuiRef16);
+  pMvComp->iRefIndexCache[kiCacheIdx3]  = kiRef;
+  pMvComp->iRefIndexCache[kiCacheIdx12] = kiRef;
+  ST16 (&pMvComp->iRefIndexCache[kiCacheIdx13], kuiRef16);
+  pMvComp->iRefIndexCache[kiCacheIdx15] = kiRef;
+
+  /*
+  * blocks 0: g_kuiCache30ScanIdx[iPartIdx]~g_kuiCache30ScanIdx[iPartIdx]+3, 1: g_kuiCache30ScanIdx[iPartIdx]+6~g_kuiCache30ScanIdx[iPartIdx]+9
+  */
+  pMvComp->sMotionVectorCache[kiCacheIdx]  = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[kiCacheIdx1], kuiMv64);
+  pMvComp->sMotionVectorCache[kiCacheIdx3] = *pMv;
+  pMvComp->sMotionVectorCache[kiCacheIdx12] = *pMv;
+  ST64 (&pMvComp->sMotionVectorCache[kiCacheIdx13], kuiMv64);
+  pMvComp->sMotionVectorCache[kiCacheIdx15] = *pMv;
+}
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P8x8
+void UpdateP8x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const uint32_t kuiMv32        = LD32 (pMv);
+  const uint64_t kuiMv64        = BUTTERFLY4x8 (kuiMv32);
+  const int16_t kiScan4Idx      = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx      = g_kuiCache30ScanIdx[kiPartIdx];
+  const int16_t kiCacheIdx1     = 1 + kiCacheIdx;
+  const int16_t kiCacheIdx6     = 6 + kiCacheIdx;
+  const int16_t kiCacheIdx7     = 7 + kiCacheIdx;
+
+  //mb
+  ST64 (&pCurMb->sMv[  kiScan4Idx], kuiMv64);
+  ST64 (&pCurMb->sMv[4 + kiScan4Idx], kuiMv64);
+
+  //cache
+  pMvComp->iRefIndexCache[kiCacheIdx ] =
+    pMvComp->iRefIndexCache[kiCacheIdx1] =
+      pMvComp->iRefIndexCache[kiCacheIdx6] =
+        pMvComp->iRefIndexCache[kiCacheIdx7] = kiRef;
+  pMvComp->sMotionVectorCache[kiCacheIdx ] =
+    pMvComp->sMotionVectorCache[kiCacheIdx1] =
+      pMvComp->sMotionVectorCache[kiCacheIdx6] =
+        pMvComp->sMotionVectorCache[kiCacheIdx7] = *pMv;
+}
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P4x4
+void UpdateP4x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const int16_t kiScan4Idx  = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx  = g_kuiCache30ScanIdx[kiPartIdx];
+
+  //mb
+  pCurMb->sMv[kiScan4Idx] = *pMv;
+  //cache
+  pMvComp->iRefIndexCache[kiCacheIdx] = kiRef;
+  pMvComp->sMotionVectorCache[kiCacheIdx] = *pMv;
+}
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P8x4
+void UpdateP8x4MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const int16_t kiScan4Idx  = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx  = g_kuiCache30ScanIdx[kiPartIdx];
+
+  //mb
+  pCurMb->sMv[    kiScan4Idx] = *pMv;
+  pCurMb->sMv[1 + kiScan4Idx] = *pMv;
+  //cache
+  pMvComp->iRefIndexCache[    kiCacheIdx] = kiRef;
+  pMvComp->iRefIndexCache[1 + kiCacheIdx] = kiRef;
+  pMvComp->sMotionVectorCache[    kiCacheIdx] = *pMv;
+  pMvComp->sMotionVectorCache[1 + kiCacheIdx] = *pMv;
+}
+//update uiRefIndex and pMv of both SMB and Mb_cache, only for P4x8
+void UpdateP4x8MotionInfo (SMbCache* pMbCache, SMB* pCurMb, const int32_t kiPartIdx, const int8_t kiRef,
+                           SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const int16_t kiScan4Idx  = g_kuiMbCountScan4Idx[kiPartIdx];
+  const int16_t kiCacheIdx  = g_kuiCache30ScanIdx[kiPartIdx];
+
+  //mb
+  pCurMb->sMv[    kiScan4Idx] = *pMv;
+  pCurMb->sMv[4 + kiScan4Idx] = *pMv;
+  //cache
+  pMvComp->iRefIndexCache[    kiCacheIdx] = kiRef;
+  pMvComp->iRefIndexCache[6 + kiCacheIdx] = kiRef;
+  pMvComp->sMotionVectorCache[    kiCacheIdx] = *pMv;
+  pMvComp->sMotionVectorCache[6 + kiCacheIdx] = *pMv;
+}
+//=========================update motion info(MV and ref_idx) into Mb_cache==========================
+//update pMv and uiRefIndex cache only for Mb_cache, only for P_16*16 (SKIP inclusive)
+
+//update uiRefIndex and pMv of only Mb_cache, only for P16x8
+void UpdateP16x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  int32_t i;
+
+  for (i = 0; i < 2; i++, iPartIdx += 4) {
+    //cache
+    const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+    pMvComp->iRefIndexCache[  kuiCacheIdx] =
+      pMvComp->iRefIndexCache[1 + kuiCacheIdx] =
+        pMvComp->iRefIndexCache[6 + kuiCacheIdx] =
+          pMvComp->iRefIndexCache[7 + kuiCacheIdx] = iRef;
+    pMvComp->sMotionVectorCache[  kuiCacheIdx] =
+      pMvComp->sMotionVectorCache[1 + kuiCacheIdx] =
+        pMvComp->sMotionVectorCache[6 + kuiCacheIdx] =
+          pMvComp->sMotionVectorCache[7 + kuiCacheIdx] = *pMv;
+  }
+}
+//update uiRefIndex and pMv of only Mb_cache, only for P8x16
+void UpdateP8x16Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t iRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  int32_t i;
+
+  for (i = 0; i < 2; i++, iPartIdx += 8) {
+    //cache
+    const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+    pMvComp->iRefIndexCache[  kuiCacheIdx] =
+      pMvComp->iRefIndexCache[1 + kuiCacheIdx] =
+        pMvComp->iRefIndexCache[6 + kuiCacheIdx] =
+          pMvComp->iRefIndexCache[7 + kuiCacheIdx] = iRef;
+    pMvComp->sMotionVectorCache[  kuiCacheIdx] =
+      pMvComp->sMotionVectorCache[1 + kuiCacheIdx] =
+        pMvComp->sMotionVectorCache[6 + kuiCacheIdx] =
+          pMvComp->sMotionVectorCache[7 + kuiCacheIdx] = *pMv;
+  }
+}
+
+//update uiRefIndex and pMv of only Mb_cache, only for P8x8
+void UpdateP8x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t pRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+  pMvComp->iRefIndexCache[  kuiCacheIdx] =
+    pMvComp->iRefIndexCache[1 + kuiCacheIdx] =
+      pMvComp->iRefIndexCache[6 + kuiCacheIdx] =
+        pMvComp->iRefIndexCache[7 + kuiCacheIdx] = pRef;
+  pMvComp->sMotionVectorCache[  kuiCacheIdx] =
+    pMvComp->sMotionVectorCache[1 + kuiCacheIdx] =
+      pMvComp->sMotionVectorCache[6 + kuiCacheIdx] =
+        pMvComp->sMotionVectorCache[7 + kuiCacheIdx] = *pMv;
+}
+
+//update uiRefIndex and pMv of only Mb_cache, for P4x4
+void UpdateP4x4Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t pRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+  pMvComp->iRefIndexCache    [kuiCacheIdx] = pRef;
+  pMvComp->sMotionVectorCache[kuiCacheIdx] = *pMv;
+}
+
+//update uiRefIndex and pMv of only Mb_cache, for P8x4
+void UpdateP8x4Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t pRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+  pMvComp->iRefIndexCache      [    kuiCacheIdx] =
+    pMvComp->iRefIndexCache    [1 + kuiCacheIdx] = pRef;
+  pMvComp->sMotionVectorCache  [    kuiCacheIdx] =
+    pMvComp->sMotionVectorCache[1 + kuiCacheIdx] = *pMv;
+}
+
+//update uiRefIndex and pMv of only Mb_cache, for P4x8
+void UpdateP4x8Motion2Cache (SMbCache* pMbCache, int32_t iPartIdx, int8_t pRef, SMVUnitXY* pMv) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const uint8_t kuiCacheIdx = g_kuiCache30ScanIdx[iPartIdx];
+
+  pMvComp->iRefIndexCache      [    kuiCacheIdx] =
+    pMvComp->iRefIndexCache    [6 + kuiCacheIdx] = pRef;
+  pMvComp->sMotionVectorCache  [    kuiCacheIdx] =
+    pMvComp->sMotionVectorCache[6 + kuiCacheIdx] = *pMv;
+}
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/nal_encap.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/nal_encap.cpp
new file mode 100644
index 0000000000..019d86ff6f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/nal_encap.cpp
@@ -0,0 +1,198 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    nal_encap.c
+ *
+ * \brief   NAL pRawNal pData encapsulation
+ *
+ * \date    5/25/2009   Created
+ *
+ *************************************************************************************/
+#include "nal_encap.h"
+#include "svc_enc_golomb.h"
+#include "ls_defines.h"
+namespace WelsEnc {
+/*!
+ * \brief   load an initialize NAL pRawNal pData
+ */
+void WelsLoadNal (SWelsEncoderOutput* pEncoderOuput, const int32_t/*EWelsNalUnitType*/ kiType,
+                  const int32_t/*EWelsNalRefIdc*/ kiNalRefIdc) {
+  SWelsEncoderOutput* pWelsEncoderOuput = pEncoderOuput;
+  SWelsNalRaw* pRawNal                  = &pWelsEncoderOuput->sNalList[ pWelsEncoderOuput->iNalIndex ];
+  SNalUnitHeader* sNalUnitHeader        = &pRawNal->sNalExt.sNalUnitHeader;
+  const int32_t kiStartPos              = (BsGetBitsPos (&pWelsEncoderOuput->sBsWrite) >> 3);
+
+  sNalUnitHeader->eNalUnitType          = (EWelsNalUnitType)kiType;
+  sNalUnitHeader->uiNalRefIdc           = (EWelsNalRefIdc)kiNalRefIdc;
+  sNalUnitHeader->uiForbiddenZeroBit    = 0;
+
+  pRawNal->pRawData     = &pWelsEncoderOuput->pBsBuffer[kiStartPos];
+  pRawNal->iStartPos    = kiStartPos;
+  pRawNal->iPayloadSize = 0;
+}
+
+/*!
+ * \brief   unload pRawNal NAL
+ */
+void WelsUnloadNal (SWelsEncoderOutput* pEncoderOuput) {
+  SWelsEncoderOutput*   pWelsEncoderOuput = pEncoderOuput;
+  int32_t*      pIdx            = &pWelsEncoderOuput->iNalIndex;
+  SWelsNalRaw* pRawNal          = &pWelsEncoderOuput->sNalList[ *pIdx ];
+  const int32_t kiEndPos        = (BsGetBitsPos (&pWelsEncoderOuput->sBsWrite) >> 3);
+
+  /* count payload size of pRawNal NAL */
+  pRawNal->iPayloadSize = kiEndPos - pRawNal->iStartPos;
+
+  ++ (*pIdx);
+}
+
+/*!
+ * \brief   load an initialize NAL pRawNal pData
+ */
+void WelsLoadNalForSlice (SWelsSliceBs* pSliceBs, const int32_t/*EWelsNalUnitType*/ kiType,
+                          const int32_t/*EWelsNalRefIdc*/ kiNalRefIdc) {
+  SWelsNalRaw* pRawNal                  = &pSliceBs->sNalList[ pSliceBs->iNalIndex ];
+  SNalUnitHeader* sNalUnitHeader        = &pRawNal->sNalExt.sNalUnitHeader;
+  SBitStringAux* pBitStringAux          = &pSliceBs->sBsWrite;
+  const int32_t kiStartPos              = (BsGetBitsPos (pBitStringAux) >> 3);
+
+  sNalUnitHeader->eNalUnitType          = (EWelsNalUnitType)kiType;
+  sNalUnitHeader->uiNalRefIdc           = (EWelsNalRefIdc)kiNalRefIdc;
+  sNalUnitHeader->uiForbiddenZeroBit    = 0;
+
+  pRawNal->pRawData     = &pSliceBs->pBsBuffer[kiStartPos];
+  pRawNal->iStartPos    = kiStartPos;
+  pRawNal->iPayloadSize = 0;
+}
+
+/*!
+ * \brief   unload pRawNal NAL
+ */
+void WelsUnloadNalForSlice (SWelsSliceBs* pSliceBs) {
+  int32_t*      pIdx            = &pSliceBs->iNalIndex;
+  SWelsNalRaw* pRawNal          = &pSliceBs->sNalList[ *pIdx ];
+  SBitStringAux* pBitStringAux  = &pSliceBs->sBsWrite;
+  const int32_t kiEndPos        = (BsGetBitsPos (pBitStringAux) >> 3);
+
+  /* count payload size of pRawNal NAL */
+  pRawNal->iPayloadSize = kiEndPos - pRawNal->iStartPos;
+  ++ (*pIdx);
+}
+
+/*!
+ * \brief   encode NAL with emulation forbidden three bytes checking
+ * \param   pDst        pDst NAL pData
+ * \param   pDstLen     length of pDst NAL output
+ * \param   annexeb     annexeb flag
+ * \param   pRawNal     pRawNal NAL pData
+ * \return  ERRCODE
+ */
+//TODO 1: refactor the calling of this func in multi-thread
+//TODO 2: complete the realloc&copy
+int32_t WelsEncodeNal (SWelsNalRaw* pRawNal, void* pNalHeaderExt, const int32_t kiDstBufferLen, void* pDst,
+                       int32_t* pDstLen) {
+  const bool kbNALExt = pRawNal->sNalExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_PREFIX
+                        || pRawNal->sNalExt.sNalUnitHeader.eNalUnitType == NAL_UNIT_CODED_SLICE_EXT;
+  int32_t iAssumedNeededLength = NAL_HEADER_SIZE + (kbNALExt ? 3 : 0) + pRawNal->iPayloadSize + 1;
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_UNEXPECTED, (iAssumedNeededLength <= 0))
+
+  //since for each 0x000 need a 0x03, so the needed length will not exceed (iAssumeNeedLenth + iAssumeNeedLength/3), here adjust to >>1 to omit division
+  if (kiDstBufferLen < (iAssumedNeededLength + (iAssumedNeededLength >> 1))) {
+    return ENC_RETURN_MEMALLOCERR;
+    //TODO: call the realloc&copy instead
+  }
+  uint8_t* pDstStart    = (uint8_t*)pDst;
+  uint8_t* pDstPointer  = pDstStart;
+  uint8_t* pSrcPointer  = pRawNal->pRawData;
+  uint8_t* pSrcEnd      = pRawNal->pRawData + pRawNal->iPayloadSize;
+  int32_t iZeroCount    = 0;
+  int32_t iNalLength    = 0;
+  *pDstLen = 0;
+
+  static const uint8_t kuiStartCodePrefix[NAL_HEADER_SIZE] = { 0, 0, 0, 1 };
+  ST32 (pDstPointer, LD32 (&kuiStartCodePrefix[0]));
+  pDstPointer += 4;
+
+  /* NAL Unit Header */
+  *pDstPointer++ = (pRawNal->sNalExt.sNalUnitHeader.uiNalRefIdc << 5) | (pRawNal->sNalExt.sNalUnitHeader.eNalUnitType &
+                   0x1f);
+
+  if (kbNALExt) {
+    SNalUnitHeaderExt* sNalExt = (SNalUnitHeaderExt*)pNalHeaderExt;
+
+    /* NAL UNIT Extension Header */
+    *pDstPointer++ = (0x80) |
+                     (sNalExt->bIdrFlag << 6);
+
+    *pDstPointer++ = (0x80) |
+                     (sNalExt->uiDependencyId << 4);
+
+    *pDstPointer++ = (sNalExt->uiTemporalId << 5) |
+                     (sNalExt->bDiscardableFlag << 3) |
+                     (0x07);
+  }
+
+  while (pSrcPointer < pSrcEnd) {
+    if (iZeroCount == 2 && *pSrcPointer <= 3) {
+      //add the code 03
+      *pDstPointer++ = 3;
+      iZeroCount = 0;
+    }
+    if (*pSrcPointer == 0) {
+      ++ iZeroCount;
+    } else {
+      iZeroCount = 0;
+    }
+    *pDstPointer++ = *pSrcPointer++;
+  }
+
+  /* count length of NAL Unit */
+  iNalLength = (int32_t) (pDstPointer - pDstStart);
+  if (NULL != pDstLen)
+    *pDstLen = iNalLength;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+/*!
+ * \brief   write prefix nal
+ */
+int32_t WelsWriteSVCPrefixNal (SBitStringAux* pBitStringAux, const int32_t kiNalRefIdc,
+                               const bool kbIdrFlag) {
+  if (0 < kiNalRefIdc) {
+    BsWriteOneBit (pBitStringAux, false/*bStoreRefBasePicFlag*/);
+    BsWriteOneBit (pBitStringAux, false);
+    BsRbspTrailingBits (pBitStringAux);
+  }
+  return 0;
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/paraset_strategy.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/paraset_strategy.cpp
new file mode 100644
index 0000000000..a506362a47
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/paraset_strategy.cpp
@@ -0,0 +1,713 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "au_set.h"
+#include "encoder_context.h"
+#include "paraset_strategy.h"
+
+namespace WelsEnc {
+
+
+IWelsParametersetStrategy*   IWelsParametersetStrategy::CreateParametersetStrategy (
+  EParameterSetStrategy eSpsPpsIdStrategy, bool bSimulcastAVC,
+  const int32_t kiSpatialLayerNum) {
+
+  IWelsParametersetStrategy* pParametersetStrategy = NULL;
+  switch (eSpsPpsIdStrategy) {
+  case INCREASING_ID:
+    pParametersetStrategy = WELS_NEW_OP (CWelsParametersetIdIncreasing (bSimulcastAVC, kiSpatialLayerNum),
+                                         CWelsParametersetIdIncreasing);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pParametersetStrategy)
+    break;
+  case SPS_LISTING:
+    pParametersetStrategy = WELS_NEW_OP (CWelsParametersetSpsListing (bSimulcastAVC, kiSpatialLayerNum),
+                                         CWelsParametersetSpsListing);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pParametersetStrategy)
+    break;
+  case SPS_LISTING_AND_PPS_INCREASING:
+    pParametersetStrategy = WELS_NEW_OP (CWelsParametersetSpsListingPpsIncreasing (bSimulcastAVC, kiSpatialLayerNum),
+                                         CWelsParametersetSpsListingPpsIncreasing);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pParametersetStrategy)
+    break;
+  case SPS_PPS_LISTING:
+    pParametersetStrategy = WELS_NEW_OP (CWelsParametersetSpsPpsListing (bSimulcastAVC, kiSpatialLayerNum),
+                                         CWelsParametersetSpsPpsListing);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pParametersetStrategy)
+    break;
+  case CONSTANT_ID:
+  default:
+    pParametersetStrategy = WELS_NEW_OP (CWelsParametersetIdConstant (bSimulcastAVC, kiSpatialLayerNum),
+                                         CWelsParametersetIdConstant);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pParametersetStrategy)
+    break;
+  }
+
+  return pParametersetStrategy;
+}
+
+
+static int32_t WelsGenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                                   const int32_t iDlayerCount, const int32_t kiSpsId,
+                                   SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer) {
+  int32_t iRet = 0;
+
+  if (!kbUseSubsetSps) {
+    pSps        = & (pCtx->pSpsArray[kiSpsId]);
+  } else {
+    pSubsetSps  = & (pCtx->pSubsetArray[kiSpsId]);
+    pSps        = &pSubsetSps->pSps;
+  }
+
+  SWelsSvcCodingParam* pParam = pCtx->pSvcParam;
+  SSpatialLayerConfig* pDlayerParam = &pParam->sSpatialLayers[iDlayerIndex];
+  // Need port pSps/pPps initialization due to spatial scalability changed
+  if (!kbUseSubsetSps) {
+    iRet = WelsInitSps (pSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
+                        pParam->iMaxNumRefFrame,
+                        kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount,
+                        bSVCBaselayer);
+  } else {
+    iRet = WelsInitSubsetSps (pSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
+                              pParam->iMaxNumRefFrame,
+                              kiSpsId, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
+  }
+  return iRet;
+}
+
+static bool CheckMatchedSps (SWelsSPS* const pSps1, SWelsSPS* const pSps2) {
+
+  if ((pSps1->iMbWidth != pSps2->iMbWidth)
+      || (pSps1->iMbHeight != pSps2->iMbHeight)) {
+    return false;
+  }
+
+  if ((pSps1->uiLog2MaxFrameNum != pSps2->uiLog2MaxFrameNum)
+      || (pSps1->iLog2MaxPocLsb != pSps2->iLog2MaxPocLsb)) {
+    return false;
+  }
+
+  if (pSps1->iNumRefFrames != pSps2->iNumRefFrames) {
+    return false;
+  }
+
+  if ((pSps1->bFrameCroppingFlag != pSps2->bFrameCroppingFlag)
+      || (pSps1->sFrameCrop.iCropLeft != pSps2->sFrameCrop.iCropLeft)
+      || (pSps1->sFrameCrop.iCropRight != pSps2->sFrameCrop.iCropRight)
+      || (pSps1->sFrameCrop.iCropTop != pSps2->sFrameCrop.iCropTop)
+      || (pSps1->sFrameCrop.iCropBottom != pSps2->sFrameCrop.iCropBottom)
+     ) {
+    return false;
+  }
+
+  if ((pSps1->uiProfileIdc != pSps2->uiProfileIdc)
+      || (pSps1->bConstraintSet0Flag != pSps2->bConstraintSet0Flag)
+      || (pSps1->bConstraintSet1Flag != pSps2->bConstraintSet1Flag)
+      || (pSps1->bConstraintSet2Flag != pSps2->bConstraintSet2Flag)
+      || (pSps1->bConstraintSet3Flag != pSps2->bConstraintSet3Flag)
+      || (pSps1->iLevelIdc != pSps2->iLevelIdc)) {
+    return false;
+  }
+
+  return true;
+}
+
+static bool CheckMatchedSubsetSps (SSubsetSps* const pSubsetSps1, SSubsetSps* const pSubsetSps2) {
+  if (!CheckMatchedSps (&pSubsetSps1->pSps, &pSubsetSps2->pSps)) {
+    return false;
+  }
+
+  if ((pSubsetSps1->sSpsSvcExt.iExtendedSpatialScalability      != pSubsetSps2->sSpsSvcExt.iExtendedSpatialScalability)
+      || (pSubsetSps1->sSpsSvcExt.bAdaptiveTcoeffLevelPredFlag  != pSubsetSps2->sSpsSvcExt.bAdaptiveTcoeffLevelPredFlag)
+      || (pSubsetSps1->sSpsSvcExt.bSeqTcoeffLevelPredFlag != pSubsetSps2->sSpsSvcExt.bSeqTcoeffLevelPredFlag)
+      || (pSubsetSps1->sSpsSvcExt.bSliceHeaderRestrictionFlag != pSubsetSps2->sSpsSvcExt.bSliceHeaderRestrictionFlag)) {
+    return false;
+  }
+
+  return true;
+}
+
+/*!
+ * \brief   check if the current parameter can found a presenting sps
+ * \param   pParam          the current encoding paramter in SWelsSvcCodingParam
+ * \param   kbUseSubsetSps  bool
+ * \param   iDlayerIndex    int, the index of current D layer
+ * \param   iDlayerCount    int, the number of total D layer
+ * \param pSpsArray         array of all the stored SPSs
+ * \param   pSubsetArray    array of all the stored Subset-SPSs
+ * \return  0 - successful
+ *         -1 - cannot find existing SPS for current encoder parameter
+ */
+int32_t FindExistingSps (SWelsSvcCodingParam* pParam, const bool kbUseSubsetSps, const int32_t iDlayerIndex,
+                         const int32_t iDlayerCount, const int32_t iSpsNumInUse,
+                         SWelsSPS* pSpsArray,
+                         SSubsetSps* pSubsetArray, bool bSVCBaseLayer) {
+  SSpatialLayerConfig* pDlayerParam = &pParam->sSpatialLayers[iDlayerIndex];
+
+  assert (iSpsNumInUse <= MAX_SPS_COUNT);
+  if (!kbUseSubsetSps) {
+    SWelsSPS sTmpSps;
+    WelsInitSps (&sTmpSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
+                 pParam->iMaxNumRefFrame,
+                 0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount,
+                 bSVCBaseLayer);
+    for (int32_t iId = 0; iId < iSpsNumInUse; iId++) {
+      if (CheckMatchedSps (&sTmpSps, &pSpsArray[iId])) {
+        return iId;
+      }
+    }
+  } else {
+    SSubsetSps sTmpSubsetSps;
+    WelsInitSubsetSps (&sTmpSubsetSps, pDlayerParam, &pParam->sDependencyLayers[iDlayerIndex], pParam->uiIntraPeriod,
+                       pParam->iMaxNumRefFrame,
+                       0, pParam->bEnableFrameCroppingFlag, pParam->iRCMode != RC_OFF_MODE, iDlayerCount);
+
+    for (int32_t iId = 0; iId < iSpsNumInUse; iId++) {
+      if (CheckMatchedSubsetSps (&sTmpSubsetSps, &pSubsetArray[iId])) {
+        return iId;
+      }
+    }
+  }
+
+  return INVALID_ID;
+}
+
+CWelsParametersetIdConstant::CWelsParametersetIdConstant (const bool bSimulcastAVC, const int32_t kiSpatialLayerNum) {
+  memset (&m_sParaSetOffset, 0, sizeof (m_sParaSetOffset));
+
+  m_bSimulcastAVC = bSimulcastAVC;
+  m_iSpatialLayerNum = kiSpatialLayerNum;
+
+  m_iBasicNeededSpsNum = 1;
+  m_iBasicNeededPpsNum = (1 + m_iSpatialLayerNum);
+}
+
+CWelsParametersetIdConstant::~CWelsParametersetIdConstant() {
+}
+
+int32_t CWelsParametersetIdConstant::GetPpsIdOffset (const int32_t iPpsId) {
+  return 0;
+};
+int32_t CWelsParametersetIdConstant::GetSpsIdOffset (const int32_t iPpsId, const int32_t iSpsId) {
+  return 0;
+};
+
+int32_t* CWelsParametersetIdConstant::GetSpsIdOffsetList (const int iParasetType) {
+  return & (m_sParaSetOffset.sParaSetOffsetVariable[iParasetType].iParaSetIdDelta[0]);
+}
+
+uint32_t CWelsParametersetIdConstant::GetAllNeededParasetNum() {
+  return (GetNeededSpsNum()
+          + GetNeededSubsetSpsNum()
+          + GetNeededPpsNum());
+}
+
+uint32_t CWelsParametersetIdConstant::GetNeededSpsNum() {
+  if (0 >= m_sParaSetOffset.uiNeededSpsNum) {
+    m_sParaSetOffset.uiNeededSpsNum = m_iBasicNeededSpsNum * ((m_bSimulcastAVC) ? (m_iSpatialLayerNum) : (1));
+  }
+  return m_sParaSetOffset.uiNeededSpsNum;
+}
+
+
+uint32_t CWelsParametersetIdConstant::GetNeededSubsetSpsNum() {
+  if (0 >= m_sParaSetOffset.uiNeededSubsetSpsNum) {
+    m_sParaSetOffset.uiNeededSubsetSpsNum = (m_bSimulcastAVC ? 0 : (m_iSpatialLayerNum - 1));
+  }
+  return m_sParaSetOffset.uiNeededSubsetSpsNum;
+}
+
+uint32_t CWelsParametersetIdConstant::GetNeededPpsNum() {
+  if (0 == m_sParaSetOffset.uiNeededPpsNum) {
+    m_sParaSetOffset.uiNeededPpsNum = m_iBasicNeededPpsNum * ((m_bSimulcastAVC) ? (m_iSpatialLayerNum) :
+                                      (1));
+  }
+  return m_sParaSetOffset.uiNeededPpsNum;
+}
+
+void CWelsParametersetIdConstant::LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
+    SSubsetSps*       pSubsetArray, SWelsPPS* pPpsArray) {
+  return;
+}
+
+void CWelsParametersetIdConstant::Update (const uint32_t kuiId, const int iParasetType) {
+  memset (&m_sParaSetOffset, 0, sizeof (SParaSetOffset));
+}
+
+uint32_t CWelsParametersetIdConstant::GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps,
+    const int32_t iDlayerIndex,
+    const int32_t iDlayerCount, uint32_t kuiSpsId,
+    SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSVCBaselayer) {
+  WelsGenerateNewSps (pCtx, kbUseSubsetSps, iDlayerIndex,
+                      iDlayerCount, kuiSpsId,
+                      pSps, pSubsetSps, bSVCBaselayer);
+  return kuiSpsId;
+}
+
+
+uint32_t CWelsParametersetIdConstant::InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
+    SWelsSPS* pSps,
+    SSubsetSps* pSubsetSps,
+    uint32_t kuiPpsId,
+    const bool kbDeblockingFilterPresentFlag,
+    const bool kbUsingSubsetSps,
+    const bool kbEntropyCodingModeFlag) {
+  WelsInitPps (& pCtx->pPPSArray[kuiPpsId], pSps, pSubsetSps, kuiPpsId, true, kbUsingSubsetSps, kbEntropyCodingModeFlag);
+  SetUseSubsetFlag (kuiPpsId, kbUsingSubsetSps);
+  return kuiPpsId;
+}
+
+void CWelsParametersetIdConstant::SetUseSubsetFlag (const uint32_t iPpsId, const bool bUseSubsetSps) {
+  m_sParaSetOffset.bPpsIdMappingIntoSubsetsps[iPpsId] = bUseSubsetSps;
+}
+
+void CWelsParametersetIdNonConstant::OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable,
+    int32_t* pPpsIdList, sWelsEncCtx* pCtx, SExistingParasetList* pExistingParasetList) {
+  for (int32_t k = 0; k < PARA_SET_TYPE; k++) {
+    memset ((m_sParaSetOffset.sParaSetOffsetVariable[k].bUsedParaSetIdInBs), 0, MAX_PPS_COUNT * sizeof (bool));
+  }
+  memcpy (pParaSetOffsetVariable, m_sParaSetOffset.sParaSetOffsetVariable,
+          (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage
+}
+void CWelsParametersetIdNonConstant::LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable,
+    int32_t* pPpsIdList) {
+  memcpy (m_sParaSetOffset.sParaSetOffsetVariable, pParaSetOffsetVariable,
+          (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage
+}
+
+//
+//CWelsParametersetIdIncreasing
+//
+
+void CWelsParametersetIdIncreasing::DebugSpsPps (const int32_t kiPpsId, const int32_t kiSpsId) {
+#if _DEBUG
+  //SParaSetOffset use, 110421
+  //if ( (INCREASING_ID & eSpsPpsIdStrategy)) {
+  const int32_t kiParameterSetType = (m_sParaSetOffset.bPpsIdMappingIntoSubsetsps[kiPpsId] ?
+                                      PARA_SET_TYPE_SUBSETSPS : PARA_SET_TYPE_AVCSPS) ;
+
+  const int32_t kiTmpSpsIdInBs = kiSpsId +
+                                 m_sParaSetOffset.sParaSetOffsetVariable[kiParameterSetType].iParaSetIdDelta[kiSpsId];
+  const int32_t tmp_pps_id_in_bs = kiPpsId +
+                                   m_sParaSetOffset.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[kiPpsId];
+  assert (MAX_SPS_COUNT > kiTmpSpsIdInBs);
+  assert (MAX_PPS_COUNT > tmp_pps_id_in_bs);
+  assert (m_sParaSetOffset.sParaSetOffsetVariable[kiParameterSetType].bUsedParaSetIdInBs[kiTmpSpsIdInBs]);
+  //}
+#endif
+}
+void CWelsParametersetIdIncreasing::DebugPps (const int32_t kiPpsId) {
+#if _DEBUG
+  const int32_t kiTmpPpsIdInBs = kiPpsId +
+                                 m_sParaSetOffset.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[ kiPpsId ];
+  assert (MAX_PPS_COUNT > kiTmpPpsIdInBs);
+
+  //when activated need to sure there is avialable PPS
+  assert (m_sParaSetOffset.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].bUsedParaSetIdInBs[kiTmpPpsIdInBs]);
+#endif
+}
+
+void ParasetIdAdditionIdAdjust (SParaSetOffsetVariable* sParaSetOffsetVariable,
+                                const int32_t kiCurEncoderParaSetId,
+                                const uint32_t kuiMaxIdInBs) { //paraset_type = 0: SPS; =1: PPS
+  //SPS_ID in avc_sps and pSubsetSps will be different using this
+  //SPS_ID case example:
+  //1st enter:  next_spsid_in_bs == 0; spsid == 0; delta==0;            //actual spsid_in_bs == 0
+  //1st finish: next_spsid_in_bs == 1;
+  //2nd enter:  next_spsid_in_bs == 1; spsid == 0; delta==1;            //actual spsid_in_bs == 1
+  //2nd finish: next_spsid_in_bs == 2;
+  //31st enter: next_spsid_in_bs == 31; spsid == 0~2; delta==31~29;     //actual spsid_in_bs == 31
+  //31st finish:next_spsid_in_bs == 0;
+  //31st enter: next_spsid_in_bs == 0; spsid == 0~2; delta==-2~0;       //actual spsid_in_bs == 0
+  //31st finish:next_spsid_in_bs == 1;
+
+  const int32_t kiEncId = kiCurEncoderParaSetId;
+  uint32_t uiNextIdInBs = sParaSetOffsetVariable->uiNextParaSetIdToUseInBs;
+
+  //update current layer's pCodingParam
+  sParaSetOffsetVariable->iParaSetIdDelta[kiEncId] = uiNextIdInBs -
+      kiEncId;  //for current parameter set, change its id_delta
+  //write pso pData for next update:
+  sParaSetOffsetVariable->bUsedParaSetIdInBs[uiNextIdInBs] = true; //   update current used_id
+
+  //prepare for next update:
+  //   find the next avaibable iId
+  ++uiNextIdInBs;
+  if (uiNextIdInBs >= kuiMaxIdInBs) {
+    uiNextIdInBs = 0;//ensure the SPS_ID wound not exceed MAX_SPS_COUNT
+  }
+  //   update next_id
+  sParaSetOffsetVariable->uiNextParaSetIdToUseInBs = uiNextIdInBs;
+}
+
+void CWelsParametersetIdIncreasing::Update (const uint32_t kuiId, const int iParasetType) {
+#if _DEBUG
+  m_sParaSetOffset.eSpsPpsIdStrategy = INCREASING_ID;
+  assert (kuiId < MAX_DQ_LAYER_NUM);
+#endif
+
+  ParasetIdAdditionIdAdjust (& (m_sParaSetOffset.sParaSetOffsetVariable[iParasetType]),
+                             kuiId,
+                             (iParasetType != PARA_SET_TYPE_PPS) ? MAX_SPS_COUNT : MAX_PPS_COUNT);
+}
+//((SPS_PPS_LISTING != pEncCtx->pSvcParam->eSpsPpsIdStrategy) ? (&
+//  (pEncCtx->sPSOVector.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[0])) : NULL)
+
+int32_t CWelsParametersetIdIncreasing::GetPpsIdOffset (const int32_t kiPpsId) {
+#if _DEBUG
+  DebugPps (kiPpsId);
+#endif
+  return (m_sParaSetOffset.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[kiPpsId]);
+}
+
+int32_t CWelsParametersetIdIncreasing::GetSpsIdOffset (const int32_t kiPpsId, const int32_t kiSpsId) {
+  const int32_t kiParameterSetType = (m_sParaSetOffset.bPpsIdMappingIntoSubsetsps[kiPpsId] ?
+                                      PARA_SET_TYPE_SUBSETSPS : PARA_SET_TYPE_AVCSPS);
+#if _DEBUG
+  DebugSpsPps (kiPpsId, kiSpsId);
+#endif
+  return (m_sParaSetOffset.sParaSetOffsetVariable[kiParameterSetType].iParaSetIdDelta[kiSpsId]);
+}
+
+//
+//CWelsParametersetSpsListing
+//
+
+CWelsParametersetSpsListing::CWelsParametersetSpsListing (const bool bSimulcastAVC,
+    const int32_t kiSpatialLayerNum) : CWelsParametersetIdNonConstant (bSimulcastAVC, kiSpatialLayerNum) {
+  memset (&m_sParaSetOffset, 0, sizeof (m_sParaSetOffset));
+
+  m_bSimulcastAVC = bSimulcastAVC;
+  m_iSpatialLayerNum = kiSpatialLayerNum;
+
+  m_iBasicNeededSpsNum = MAX_SPS_COUNT;
+  m_iBasicNeededPpsNum = 1;
+}
+
+uint32_t CWelsParametersetSpsListing::GetNeededSubsetSpsNum() {
+  if (0 >= m_sParaSetOffset.uiNeededSubsetSpsNum) {
+    //      sPSOVector.uiNeededSubsetSpsNum = ((pSvcParam->bSimulcastAVC) ? (0) :((SPS_LISTING & pSvcParam->eSpsPpsIdStrategy) ? (MAX_SPS_COUNT) : (pSvcParam->iSpatialLayerNum - 1)));
+    m_sParaSetOffset.uiNeededSubsetSpsNum = ((m_bSimulcastAVC) ? (0) :
+                                            (MAX_SPS_COUNT));
+  }
+  return m_sParaSetOffset.uiNeededSubsetSpsNum;
+}
+
+void CWelsParametersetSpsListing::LoadPreviousSps (SExistingParasetList* pExistingParasetList, SWelsSPS* pSpsArray,
+    SSubsetSps*       pSubsetArray) {
+  //if ((SPS_LISTING & pParam->eSpsPpsIdStrategy) && (NULL != pExistingParasetList)) {
+  m_sParaSetOffset.uiInUseSpsNum = pExistingParasetList->uiInUseSpsNum;
+  memcpy (pSpsArray, pExistingParasetList->sSps, MAX_SPS_COUNT * sizeof (SWelsSPS));
+
+  if (GetNeededSubsetSpsNum() > 0) {
+    m_sParaSetOffset.uiInUseSubsetSpsNum = pExistingParasetList->uiInUseSubsetSpsNum;
+    memcpy (pSubsetArray, pExistingParasetList->sSubsetSps, MAX_SPS_COUNT * sizeof (SSubsetSps));
+  } else {
+    m_sParaSetOffset.uiInUseSubsetSpsNum = 0;
+  }
+  //}
+
+}
+void CWelsParametersetSpsListing::LoadPrevious (SExistingParasetList* pExistingParasetList,  SWelsSPS* pSpsArray,
+    SSubsetSps*       pSubsetArray, SWelsPPS* pPpsArray) {
+  if (NULL == pExistingParasetList) {
+    return;
+  }
+  LoadPreviousSps (pExistingParasetList, pSpsArray, pSubsetArray);
+  LoadPreviousPps (pExistingParasetList, pPpsArray);
+}
+
+bool CWelsParametersetSpsListing::CheckParamCompatibility (SWelsSvcCodingParam* pCodingParam, SLogContext* pLogCtx) {
+  if (pCodingParam->iSpatialLayerNum > 1 && (!pCodingParam->bSimulcastAVC)) {
+    WelsLog (pLogCtx, WELS_LOG_WARNING,
+             "ParamValidationExt(), eSpsPpsIdStrategy setting (%d) with multiple svc SpatialLayers (%d) not supported! eSpsPpsIdStrategy adjusted to CONSTANT_ID",
+             pCodingParam->eSpsPpsIdStrategy, pCodingParam->iSpatialLayerNum);
+    pCodingParam->eSpsPpsIdStrategy = CONSTANT_ID;
+    return false;
+  }
+  return true;
+}
+
+bool CWelsParametersetSpsListing::CheckPpsGenerating() {
+  return true;
+}
+int32_t CWelsParametersetSpsListing::SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps) {
+
+  // reset current list
+  if (!kbUseSubsetSps) {
+    m_sParaSetOffset.uiInUseSpsNum = 1;
+    memset (pCtx->pSpsArray, 0, MAX_SPS_COUNT * sizeof (SWelsSPS));
+  } else {
+    m_sParaSetOffset.uiInUseSubsetSpsNum = 1;
+    memset (pCtx->pSubsetArray, 0, MAX_SPS_COUNT * sizeof (SSubsetSps));
+  }
+
+  //iSpsId = 0;
+  return 0;
+}
+uint32_t CWelsParametersetSpsListing::GenerateNewSps (sWelsEncCtx* pCtx, const bool kbUseSubsetSps,
+    const int32_t iDlayerIndex,
+    const int32_t iDlayerCount, uint32_t kuiSpsId,
+    SWelsSPS*& pSps, SSubsetSps*& pSubsetSps, bool bSvcBaselayer) {
+  //check if the current param can fit in an existing SPS
+  const int32_t kiFoundSpsId = FindExistingSps (pCtx->pSvcParam, kbUseSubsetSps, iDlayerIndex, iDlayerCount,
+                               kbUseSubsetSps ? (m_sParaSetOffset.uiInUseSubsetSpsNum) : (m_sParaSetOffset.uiInUseSpsNum),
+                               pCtx->pSpsArray,
+                               pCtx->pSubsetArray, bSvcBaselayer);
+
+
+  if (INVALID_ID != kiFoundSpsId) {
+    //if yes, set pSps or pSubsetSps to it
+    kuiSpsId = kiFoundSpsId;
+    if (!kbUseSubsetSps) {
+      pSps = & (pCtx->pSpsArray[kiFoundSpsId]);
+    } else {
+      pSubsetSps = & (pCtx->pSubsetArray[kiFoundSpsId]);
+    }
+  } else {
+    //if no, generate a new SPS as usual
+    if (!CheckPpsGenerating()) {
+      return -1;
+    }
+
+    kuiSpsId = (!kbUseSubsetSps) ? (m_sParaSetOffset.uiInUseSpsNum++) : (m_sParaSetOffset.uiInUseSubsetSpsNum++);
+    if (kuiSpsId >= MAX_SPS_COUNT) {
+      if (SpsReset (pCtx, kbUseSubsetSps) < 0) {
+        return -1;
+      }
+      kuiSpsId = 0;
+    }
+
+    WelsGenerateNewSps (pCtx, kbUseSubsetSps, iDlayerIndex,
+                        iDlayerCount, kuiSpsId, pSps, pSubsetSps, bSvcBaselayer);
+  }
+  return kuiSpsId;
+}
+
+void CWelsParametersetSpsListing::UpdateParaSetNum (sWelsEncCtx* pCtx) {
+  pCtx->iSpsNum = m_sParaSetOffset.uiInUseSpsNum;
+  pCtx->iSubsetSpsNum = m_sParaSetOffset.uiInUseSubsetSpsNum;
+};
+
+void CWelsParametersetSpsListing::OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable,
+    int32_t* pPpsIdList, sWelsEncCtx* pCtx, SExistingParasetList* pExistingParasetList) {
+  CWelsParametersetIdNonConstant::OutputCurrentStructure (pParaSetOffsetVariable, pPpsIdList, pCtx, pExistingParasetList);
+  pExistingParasetList->uiInUseSpsNum = m_sParaSetOffset.uiInUseSpsNum;
+
+  memcpy (pExistingParasetList->sSps, pCtx->pSpsArray, MAX_SPS_COUNT * sizeof (SWelsSPS));
+  if (NULL != pCtx->pSubsetArray) {
+    pExistingParasetList->uiInUseSubsetSpsNum = m_sParaSetOffset.uiInUseSubsetSpsNum;
+    memcpy (pExistingParasetList->sSubsetSps, pCtx->pSubsetArray, MAX_SPS_COUNT * sizeof (SSubsetSps));
+  } else {
+    pExistingParasetList->uiInUseSubsetSpsNum = 0;
+  }
+}
+
+//
+//CWelsParametersetSpsPpsListing
+//
+
+CWelsParametersetSpsPpsListing::CWelsParametersetSpsPpsListing (const bool bSimulcastAVC,
+    const int32_t kiSpatialLayerNum): CWelsParametersetSpsListing (bSimulcastAVC, kiSpatialLayerNum) {
+  memset (&m_sParaSetOffset, 0, sizeof (m_sParaSetOffset));
+
+  m_bSimulcastAVC = bSimulcastAVC;
+  m_iSpatialLayerNum = kiSpatialLayerNum;
+
+  m_iBasicNeededSpsNum = MAX_SPS_COUNT;
+  m_iBasicNeededPpsNum = MAX_PPS_COUNT;
+}
+
+void CWelsParametersetSpsPpsListing::LoadPreviousPps (SExistingParasetList* pExistingParasetList, SWelsPPS* pPpsArray) {
+  // copy from existing if the pointer exists
+  //if ((SPS_PPS_LISTING == pParam->eSpsPpsIdStrategy) && (NULL != pExistingParasetList)) {
+  m_sParaSetOffset.uiInUsePpsNum = pExistingParasetList->uiInUsePpsNum;
+  memcpy (pPpsArray, pExistingParasetList->sPps, MAX_PPS_COUNT * sizeof (SWelsPPS));
+  //}
+}
+
+/*  if ((SPS_PPS_LISTING == pCtx->pSvcParam->eSpsPpsIdStrategy) && (pCtx->iPpsNum < MAX_PPS_COUNT)) {
+ UpdatePpsList (pCtx);
+ }*/
+void CWelsParametersetSpsPpsListing::UpdatePpsList (sWelsEncCtx* pCtx) {
+  if (pCtx->iPpsNum >= MAX_PPS_COUNT) {
+    return;
+  }
+  assert (pCtx->iPpsNum <= MAX_DQ_LAYER_NUM);
+
+  //Generate PPS LIST
+  int32_t iPpsId = 0, iUsePpsNum = pCtx->iPpsNum;
+
+  for (int32_t iIdrRound = 0; iIdrRound < MAX_PPS_COUNT; iIdrRound++) {
+    for (iPpsId = 0; iPpsId < pCtx->iPpsNum; iPpsId++) {
+      m_sParaSetOffset.iPpsIdList[iPpsId][iIdrRound] = ((iIdrRound * iUsePpsNum + iPpsId) % MAX_PPS_COUNT);
+    }
+  }
+
+  for (iPpsId = iUsePpsNum; iPpsId < MAX_PPS_COUNT; iPpsId++) {
+    memcpy (& (pCtx->pPPSArray[iPpsId]), & (pCtx->pPPSArray[iPpsId % iUsePpsNum]), sizeof (SWelsPPS));
+    pCtx->pPPSArray[iPpsId].iPpsId = iPpsId;
+    pCtx->iPpsNum++;
+  }
+
+  assert (pCtx->iPpsNum == MAX_PPS_COUNT);
+  m_sParaSetOffset.uiInUsePpsNum = pCtx->iPpsNum;
+}
+
+
+bool CWelsParametersetSpsPpsListing::CheckPpsGenerating() {
+  /*if ((SPS_PPS_LISTING == pCtx->pSvcParam->eSpsPpsIdStrategy) && (MAX_PPS_COUNT <= pCtx->sPSOVector.uiInUsePpsNum)) {
+    //check if we can generate new SPS or not
+    WelsLog (& pCtx->sLogCtx, WELS_LOG_ERROR,
+             "InitDqLayers(), cannot generate new SPS under the SPS_PPS_LISTING mode!");
+    return ENC_RETURN_UNSUPPORTED_PARA;
+  }*/
+  if (MAX_PPS_COUNT <= m_sParaSetOffset.uiInUsePpsNum) {
+    return false;
+  }
+
+  return true;
+}
+int32_t CWelsParametersetSpsPpsListing::SpsReset (sWelsEncCtx* pCtx, bool kbUseSubsetSps) {
+  /*        if (SPS_PPS_LISTING == pParam->eSpsPpsIdStrategy) {
+   WelsLog (& (*ppCtx)->sLogCtx, WELS_LOG_ERROR,
+   "InitDqLayers(), cannot generate new SPS under the SPS_PPS_LISTING mode!");
+   return ENC_RETURN_UNSUPPORTED_PARA;
+   }*/
+  return -1;
+}
+
+int32_t FindExistingPps (SWelsSPS* pSps, SSubsetSps* pSubsetSps, const bool kbUseSubsetSps, const int32_t iSpsId,
+                         const bool kbEntropyCodingFlag, const int32_t iPpsNumInUse,
+                         SWelsPPS* pPpsArray) {
+#if !defined(DISABLE_FMO_FEATURE)
+  // feature not supported yet
+  return INVALID_ID;
+#endif//!DISABLE_FMO_FEATURE
+
+  SWelsPPS sTmpPps;
+  WelsInitPps (&sTmpPps,
+               pSps,
+               pSubsetSps,
+               0,
+               true,
+               kbUseSubsetSps,
+               kbEntropyCodingFlag);
+
+  assert (iPpsNumInUse <= MAX_PPS_COUNT);
+  for (int32_t iId = 0; iId < iPpsNumInUse; iId++) {
+    if ((sTmpPps.iSpsId == pPpsArray[iId].iSpsId)
+        && (sTmpPps.bEntropyCodingModeFlag == pPpsArray[iId].bEntropyCodingModeFlag)
+        && (sTmpPps.iPicInitQp == pPpsArray[iId].iPicInitQp)
+        && (sTmpPps.iPicInitQs == pPpsArray[iId].iPicInitQs)
+        && (sTmpPps.uiChromaQpIndexOffset == pPpsArray[iId].uiChromaQpIndexOffset)
+        && (sTmpPps.bDeblockingFilterControlPresentFlag == pPpsArray[iId].bDeblockingFilterControlPresentFlag)
+       ) {
+      return iId;
+    }
+  }
+
+  return INVALID_ID;
+}
+
+uint32_t CWelsParametersetSpsPpsListing::InitPps (sWelsEncCtx* pCtx, uint32_t kiSpsId,
+    SWelsSPS* pSps,
+    SSubsetSps* pSubsetSps,
+    uint32_t kuiPpsId,
+    const bool kbDeblockingFilterPresentFlag,
+    const bool kbUsingSubsetSps,
+    const bool kbEntropyCodingModeFlag) {
+  const int32_t kiFoundPpsId = FindExistingPps (pSps, pSubsetSps, kbUsingSubsetSps, kiSpsId,
+                               kbEntropyCodingModeFlag,
+                               m_sParaSetOffset.uiInUsePpsNum,
+                               pCtx->pPPSArray);
+
+
+  if (INVALID_ID != kiFoundPpsId) {
+    //if yes, set pPps to it
+    kuiPpsId = kiFoundPpsId;
+  } else {
+    kuiPpsId = (m_sParaSetOffset.uiInUsePpsNum++);
+    WelsInitPps (& pCtx->pPPSArray[kuiPpsId], pSps, pSubsetSps, kuiPpsId, true, kbUsingSubsetSps, kbEntropyCodingModeFlag);
+  }
+  SetUseSubsetFlag (kuiPpsId, kbUsingSubsetSps);
+  return kuiPpsId;
+}
+
+void CWelsParametersetSpsPpsListing::UpdateParaSetNum (sWelsEncCtx* pCtx) {
+  CWelsParametersetSpsListing::UpdateParaSetNum (pCtx);
+
+  //UpdatePpsList (pCtx);
+  pCtx->iPpsNum = m_sParaSetOffset.uiInUsePpsNum;
+}
+
+int32_t CWelsParametersetSpsPpsListing::GetCurrentPpsId (const int32_t iPpsId, const int32_t iIdrLoop) {
+  return m_sParaSetOffset.iPpsIdList[iPpsId][iIdrLoop];
+}
+
+void CWelsParametersetSpsPpsListing::LoadPreviousStructure (SParaSetOffsetVariable* pParaSetOffsetVariable,
+    int32_t* pPpsIdList) {
+  memcpy (m_sParaSetOffset.sParaSetOffsetVariable, pParaSetOffsetVariable,
+          (PARA_SET_TYPE)*sizeof (SParaSetOffsetVariable)); // confirmed_safe_unsafe_usage
+
+  memcpy ((m_sParaSetOffset.iPpsIdList), pPpsIdList, MAX_DQ_LAYER_NUM * MAX_PPS_COUNT * sizeof (int32_t));
+
+}
+
+void CWelsParametersetSpsPpsListing::OutputCurrentStructure (SParaSetOffsetVariable* pParaSetOffsetVariable,
+    int32_t* pPpsIdList, sWelsEncCtx* pCtx, SExistingParasetList* pExistingParasetList) {
+  CWelsParametersetSpsListing::OutputCurrentStructure (pParaSetOffsetVariable, pPpsIdList, pCtx, pExistingParasetList);
+
+  pExistingParasetList->uiInUsePpsNum = m_sParaSetOffset.uiInUsePpsNum;
+  memcpy (pExistingParasetList->sPps, pCtx->pPps, MAX_PPS_COUNT * sizeof (SWelsPPS));
+  memcpy (pPpsIdList, (m_sParaSetOffset.iPpsIdList), MAX_DQ_LAYER_NUM * MAX_PPS_COUNT * sizeof (int32_t));
+}
+
+//
+//CWelsParametersetSpsListingPpsIncreasing
+//
+
+int32_t CWelsParametersetSpsListingPpsIncreasing::GetPpsIdOffset (const int32_t kiPpsId) {
+  //same as CWelsParametersetIdIncreasing::GetPpsIdOffset
+  return (m_sParaSetOffset.sParaSetOffsetVariable[PARA_SET_TYPE_PPS].iParaSetIdDelta[kiPpsId]);
+}
+
+void CWelsParametersetSpsListingPpsIncreasing::Update (const uint32_t kuiId, const int iParasetType) {
+  //same as CWelsParametersetIdIncreasing::Update
+#if _DEBUG
+  assert (kuiId < MAX_DQ_LAYER_NUM);
+#endif
+
+  ParasetIdAdditionIdAdjust (& (m_sParaSetOffset.sParaSetOffsetVariable[iParasetType]),
+                             kuiId,
+                             (iParasetType != PARA_SET_TYPE_PPS) ? MAX_SPS_COUNT : MAX_PPS_COUNT);
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/picture_handle.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/picture_handle.cpp
new file mode 100644
index 0000000000..b0721c4385
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/picture_handle.cpp
@@ -0,0 +1,184 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    picture_handle.c
+ *
+ * \brief   picture pData handling
+ *
+ * \date    5/20/2009 Created
+ *
+ *************************************************************************************/
+#include "picture_handle.h"
+#include "svc_motion_estimate.h"
+
+namespace WelsEnc {
+/*!
+ * \brief   alloc picture pData with borders for each plane based width and height of picture
+ * \param   cx              width of picture in pixels
+ * \param   cy              height of picture in pixels
+ * \param   need_data       need pData allocation
+ * \pram    need_expand     need borders expanding
+ * \return  successful if effective picture pointer returned, otherwise failed with NULL
+ */
+SPicture* AllocPicture (CMemoryAlign* pMa, const int32_t kiWidth , const int32_t kiHeight,
+                        bool bNeedMbInfo, int32_t iNeedFeatureStorage) {
+  SPicture* pPic = NULL;
+  int32_t iPicWidth = 0;
+  int32_t iPicHeight = 0;
+
+  int32_t iPicChromaWidth       = 0;
+  int32_t iPicChromaHeight      = 0;
+  int32_t iLumaSize             = 0;
+  int32_t iChromaSize           = 0;
+
+  pPic = static_cast<SPicture*> (pMa->WelsMallocz (sizeof (SPicture), "pPic"));
+
+  WELS_VERIFY_RETURN_IF (NULL, NULL == pPic);
+
+  iPicWidth         = WELS_ALIGN (kiWidth, MB_WIDTH_LUMA) + (PADDING_LENGTH << 1);  // with width of horizon
+  iPicHeight        = WELS_ALIGN (kiHeight, MB_HEIGHT_LUMA) + (PADDING_LENGTH << 1);        // with height of vertical
+  iPicChromaWidth   = iPicWidth >> 1;
+  iPicChromaHeight  = iPicHeight >> 1;
+  iPicWidth         = WELS_ALIGN (iPicWidth,
+                                  32);  // 32(or 16 for chroma below) to match original imp. here instead of cache_line_size
+  iPicChromaWidth   = WELS_ALIGN (iPicChromaWidth, 16);
+  iLumaSize         = iPicWidth * iPicHeight;
+  iChromaSize       = iPicChromaWidth * iPicChromaHeight;
+
+  pPic->pBuffer = (uint8_t*)pMa->WelsMalloc (iLumaSize /* luma */
+                  + (iChromaSize << 1) /* Cb,Cr */
+                  , "pPic->pBuffer");
+  WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pBuffer, FreePicture (pMa, &pPic));
+  pPic->iLineSize[0]    = iPicWidth;
+  pPic->iLineSize[1]    = pPic->iLineSize[2]    = iPicChromaWidth;
+  pPic->pData[0]        = pPic->pBuffer + (1 + pPic->iLineSize[0]) * PADDING_LENGTH;
+  pPic->pData[1]        = pPic->pBuffer + iLumaSize + (((1 + pPic->iLineSize[1]) * PADDING_LENGTH) >> 1);
+  pPic->pData[2]        = pPic->pBuffer + iLumaSize + iChromaSize + (((1 + pPic->iLineSize[2]) * PADDING_LENGTH) >> 1);
+
+  pPic->iWidthInPixel   = kiWidth;
+  pPic->iHeightInPixel  = kiHeight;
+  pPic->iFrameNum       = -1;
+
+  pPic->bIsLongRef      = false;
+  pPic->iLongTermPicNum = -1;
+  pPic->uiRecieveConfirmed = 0;
+  pPic->iMarkFrameNum   = -1;
+
+  if (bNeedMbInfo) {
+    const uint32_t kuiCountMbNum = ((15 + kiWidth) >> 4) * ((15 + kiHeight) >> 4);
+
+    pPic->uiRefMbType = (uint32_t*)pMa->WelsMallocz (kuiCountMbNum * sizeof (uint32_t), "pPic->uiRefMbType");
+    WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->uiRefMbType, FreePicture (pMa, &pPic));
+
+    pPic->pRefMbQp = (uint8_t*)pMa->WelsMallocz (kuiCountMbNum * sizeof (uint8_t), "pPic->pRefMbQp");
+    WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pRefMbQp, FreePicture (pMa, &pPic));
+
+    pPic->sMvList           = static_cast<SMVUnitXY*> (pMa->WelsMallocz (kuiCountMbNum * sizeof (SMVUnitXY),
+                              "pPic->sMvList"));
+    WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->sMvList, FreePicture (pMa, &pPic));
+
+    pPic->pMbSkipSad       = (int32_t*)pMa->WelsMallocz (kuiCountMbNum * sizeof (int32_t), "pPic->pMbSkipSad");
+    WELS_VERIFY_RETURN_PROC_IF (NULL, NULL == pPic->pMbSkipSad, FreePicture (pMa, &pPic));
+  }
+
+  if (iNeedFeatureStorage) {
+    pPic->pScreenBlockFeatureStorage = static_cast<SScreenBlockFeatureStorage*> (pMa->WelsMallocz (sizeof (
+                                         SScreenBlockFeatureStorage), "pScreenBlockFeatureStorage"));
+    int32_t iReturn = RequestScreenBlockFeatureStorage (pMa, kiWidth,  kiHeight, iNeedFeatureStorage,
+                      pPic->pScreenBlockFeatureStorage);
+    WELS_VERIFY_RETURN_PROC_IF (NULL, ENC_RETURN_SUCCESS != iReturn, FreePicture (pMa, &pPic));
+  } else {
+    pPic->pScreenBlockFeatureStorage = NULL;
+  }
+  return pPic;
+}
+
+/*!
+ * \brief   free picture pData planes
+ * \param   pPic        picture pointer to be destoryed
+ * \return  none
+ */
+void FreePicture (CMemoryAlign* pMa, SPicture** ppPic) {
+  if (NULL != ppPic && NULL != *ppPic) {
+    SPicture* pPic = *ppPic;
+
+    if (NULL != pPic->pBuffer) {
+      pMa->WelsFree (pPic->pBuffer, "pPic->pBuffer");
+      pPic->pBuffer = NULL;
+    }
+    pPic->pBuffer          = NULL;
+    pPic->pData[0]         =
+      pPic->pData[1]       =
+        pPic->pData[2]     = NULL;
+    pPic->iLineSize[0]     =
+      pPic->iLineSize[1]   =
+        pPic->iLineSize[2] = 0;
+
+    pPic->iWidthInPixel         = 0;
+    pPic->iHeightInPixel        = 0;
+    pPic->iFrameNum             = -1;
+
+    pPic->bIsLongRef            = false;
+    pPic->uiRecieveConfirmed    = 0;
+    pPic->iLongTermPicNum       = -1;
+    pPic->iMarkFrameNum         = -1;
+
+    if (pPic->uiRefMbType) {
+      pMa->WelsFree (pPic->uiRefMbType, "pPic->uiRefMbType");
+      pPic->uiRefMbType = NULL;
+    }
+    if (pPic->pRefMbQp) {
+      pMa->WelsFree (pPic->pRefMbQp, "pPic->pRefMbQp");
+      pPic->pRefMbQp = NULL;
+    }
+
+    if (pPic->sMvList) {
+      pMa->WelsFree (pPic->sMvList, "pPic->sMvList");
+      pPic->sMvList = NULL;
+    }
+    if (pPic->pMbSkipSad) {
+      pMa->WelsFree (pPic->pMbSkipSad, "pPic->pMbSkipSad");
+      pPic->pMbSkipSad = NULL;
+    }
+
+    if (pPic->pScreenBlockFeatureStorage) {
+      ReleaseScreenBlockFeatureStorage (pMa, pPic->pScreenBlockFeatureStorage);
+      pMa->WelsFree (pPic->pScreenBlockFeatureStorage, "pPic->pScreenBlockFeatureStorage");
+      pPic->pScreenBlockFeatureStorage = NULL;
+    }
+
+    pMa->WelsFree (*ppPic, "pPic");
+    *ppPic = NULL;
+  }
+}
+
+} // namespace WelsEnc
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ratectl.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ratectl.cpp
new file mode 100644
index 0000000000..6634f94e46
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ratectl.cpp
@@ -0,0 +1,1556 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *  ratectl.c
+ *
+ *  Abstract
+ *      Rate Control
+ *
+ *  History
+ *      9/8/2009 Created
+ *    12/26/2011 Modified
+ *
+ *
+ *
+ *************************************************************************/
+#include "rc.h"
+#include "encoder_context.h"
+#include "utils.h"
+#include "svc_enc_golomb.h"
+
+
+namespace WelsEnc {
+
+const int32_t g_kiQpToQstepTable[52] = {
+  63,   71,   79,   89,  100,  112,  126,  141,  159,  178,
+  200,  224,  252,  283,  317,  356,  400,  449,  504,  566,
+  635,  713,  800,  898, 1008, 1131, 1270, 1425, 1600, 1796,
+  2016, 2263, 2540, 2851, 3200, 3592, 4032, 4525, 5080, 5702,
+  6400, 7184, 8063, 9051, 10159, 11404, 12800, 14368, 16127, 18102,
+  20319, 22807
+}; //WELS_ROUND(INT_MULTIPLY*pow (2.0, (iQP - 4.0) / 6.0))
+
+void RcInitLayerMemory (SWelsSvcRc* pWelsSvcRc, CMemoryAlign* pMA, const int32_t kiMaxTl) {
+  const int32_t kiGomSize       = pWelsSvcRc->iGomSize;
+  const int32_t kiGomSizeD      = kiGomSize * sizeof (double);
+  const int32_t kiGomSizeI      = kiGomSize * sizeof (int32_t);
+  const int32_t kiLayerRcSize   = kiGomSizeD + (kiGomSizeI * 3) +  sizeof (SRCTemporal) * kiMaxTl;
+  uint8_t* pBaseMem             = (uint8_t*)pMA->WelsMalloc (kiLayerRcSize, "pWelsSvcRc->pTemporalOverRc");
+
+  if (NULL == pBaseMem)
+    return;
+
+  pWelsSvcRc->pTemporalOverRc   = (SRCTemporal*)pBaseMem;
+  pBaseMem += sizeof (SRCTemporal) * kiMaxTl;
+  pWelsSvcRc->pGomComplexity    = (double*)pBaseMem;
+  pBaseMem += kiGomSizeD;
+  pWelsSvcRc->pGomForegroundBlockNum    = (int32_t*)pBaseMem;
+  pBaseMem += kiGomSizeI;
+  pWelsSvcRc->pCurrentFrameGomSad       = (int32_t*)pBaseMem;
+  pBaseMem += kiGomSizeI;
+  pWelsSvcRc->pGomCost          = (int32_t*)pBaseMem;
+
+}
+
+void RcFreeLayerMemory (SWelsSvcRc* pWelsSvcRc, CMemoryAlign* pMA) {
+  if (pWelsSvcRc != NULL && pWelsSvcRc->pTemporalOverRc != NULL) {
+    pMA->WelsFree (pWelsSvcRc->pTemporalOverRc, "pWelsSvcRc->pTemporalOverRc");
+    pWelsSvcRc->pTemporalOverRc         = NULL;
+    pWelsSvcRc->pGomComplexity          = NULL;
+    pWelsSvcRc->pGomForegroundBlockNum  = NULL;
+    pWelsSvcRc->pCurrentFrameGomSad     = NULL;
+    pWelsSvcRc->pGomCost                = NULL;
+  }
+}
+
+static inline int32_t RcConvertQp2QStep (int32_t iQP) {
+  return g_kiQpToQstepTable[iQP];
+}
+static inline int32_t RcConvertQStep2Qp (int32_t iQpStep) {
+  if (iQpStep <= g_kiQpToQstepTable[0]) //Qp step too small, return qp=0
+    return 0;
+  return WELS_ROUND ((6 * log (iQpStep * 1.0f / INT_MULTIPLY) / log (2.0) + 4.0));
+}
+
+void RcInitSequenceParameter (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = NULL;
+  SSpatialLayerConfig* pDLayerParam = NULL;
+
+  int32_t j = 0;
+  int32_t iMbWidth = 0;
+
+  bool bMultiSliceMode = false;
+  int32_t iGomRowMode0 = 1, iGomRowMode1 = 1;
+  for (j = 0; j < pEncCtx->pSvcParam->iSpatialLayerNum; j++) {
+    pWelsSvcRc  = &pEncCtx->pWelsSvcRc[j];
+    pDLayerParam = &pEncCtx->pSvcParam->sSpatialLayers[j];
+    iMbWidth     = (pDLayerParam->iVideoWidth >> 4);
+    pWelsSvcRc->iNumberMbFrame = iMbWidth * (pDLayerParam->iVideoHeight >> 4);
+
+    pWelsSvcRc->iRcVaryPercentage = pEncCtx->pSvcParam->iBitsVaryPercentage; // % -- for temp
+    pWelsSvcRc->iRcVaryRatio = pWelsSvcRc->iRcVaryPercentage;
+
+    pWelsSvcRc->iBufferFullnessSkip = 0;
+    pWelsSvcRc->uiLastTimeStamp = 0;
+    pWelsSvcRc->iCost2BitsIntra = 1;
+    pWelsSvcRc->iAvgCost2Bits = 1;
+    pWelsSvcRc->iSkipBufferRatio  = SKIP_RATIO;
+    pWelsSvcRc->iContinualSkipFrames = 0;
+    pWelsSvcRc->iQpRangeUpperInFrame = (QP_RANGE_UPPER_MODE1 * MAX_BITS_VARY_PERCENTAGE - ((
+                                          QP_RANGE_UPPER_MODE1 - QP_RANGE_MODE0) *
+                                        pWelsSvcRc->iRcVaryRatio)) / MAX_BITS_VARY_PERCENTAGE;
+    pWelsSvcRc->iQpRangeLowerInFrame = (QP_RANGE_LOWER_MODE1 * MAX_BITS_VARY_PERCENTAGE - ((
+                                          QP_RANGE_LOWER_MODE1 - QP_RANGE_MODE0) *
+                                        pWelsSvcRc->iRcVaryRatio)) / MAX_BITS_VARY_PERCENTAGE;
+
+    if (iMbWidth <= MB_WIDTH_THRESHOLD_90P) {
+      pWelsSvcRc->iSkipQpValue = SKIP_QP_90P;
+      iGomRowMode0 = GOM_ROW_MODE0_90P;
+      iGomRowMode1 = GOM_ROW_MODE1_90P;
+    } else if (iMbWidth <= MB_WIDTH_THRESHOLD_180P) {
+      pWelsSvcRc->iSkipQpValue = SKIP_QP_180P;
+      iGomRowMode0 = GOM_ROW_MODE0_180P;
+      iGomRowMode1 = GOM_ROW_MODE1_180P;
+    } else if (iMbWidth <= MB_WIDTH_THRESHOLD_360P) {
+      pWelsSvcRc->iSkipQpValue = SKIP_QP_360P;
+      iGomRowMode0 = GOM_ROW_MODE0_360P;
+      iGomRowMode1 = GOM_ROW_MODE1_360P;
+    } else {
+      pWelsSvcRc->iSkipQpValue = SKIP_QP_720P;
+      iGomRowMode0 = GOM_ROW_MODE0_720P;
+      iGomRowMode1 = GOM_ROW_MODE1_720P;
+    }
+    iGomRowMode0 = iGomRowMode1 + ((iGomRowMode0 - iGomRowMode1) * pWelsSvcRc->iRcVaryRatio / MAX_BITS_VARY_PERCENTAGE);
+
+    pWelsSvcRc->iNumberMbGom   = iMbWidth * iGomRowMode0;
+
+    pWelsSvcRc->iMinQp = pEncCtx->pSvcParam->iMinQp;
+
+    pWelsSvcRc->iMaxQp = pEncCtx->pSvcParam->iMaxQp;
+
+    pWelsSvcRc->iFrameDeltaQpUpper = LAST_FRAME_QP_RANGE_UPPER_MODE1 - ((LAST_FRAME_QP_RANGE_UPPER_MODE1 -
+                                     LAST_FRAME_QP_RANGE_UPPER_MODE0) * pWelsSvcRc->iRcVaryRatio / MAX_BITS_VARY_PERCENTAGE);
+    pWelsSvcRc->iFrameDeltaQpLower = LAST_FRAME_QP_RANGE_LOWER_MODE1 - ((LAST_FRAME_QP_RANGE_LOWER_MODE1 -
+                                     LAST_FRAME_QP_RANGE_LOWER_MODE0) * pWelsSvcRc->iRcVaryRatio / MAX_BITS_VARY_PERCENTAGE);
+
+    pWelsSvcRc->iSkipFrameNum = 0;
+    pWelsSvcRc->iGomSize = (pWelsSvcRc->iNumberMbFrame + pWelsSvcRc->iNumberMbGom - 1) / pWelsSvcRc->iNumberMbGom;
+    pWelsSvcRc->bEnableGomQp = true;
+
+    RcInitLayerMemory (pWelsSvcRc, pEncCtx->pMemAlign, 1 + pEncCtx->pSvcParam->sDependencyLayers[j].iHighestTemporalId);
+
+    bMultiSliceMode = ((SM_RASTER_SLICE == pDLayerParam->sSliceArgument.uiSliceMode) ||
+                       (SM_SIZELIMITED_SLICE    == pDLayerParam->sSliceArgument.uiSliceMode));
+    if (bMultiSliceMode)
+      pWelsSvcRc->iNumberMbGom = pWelsSvcRc->iNumberMbFrame;
+  }
+}
+
+
+void RcInitTlWeight (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCTemporal* pTOverRc = pWelsSvcRc->pTemporalOverRc;
+  SSpatialLayerInternal* pDLayerParam =  &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  const int32_t kiDecompositionStages = pDLayerParam->iDecompositionStages;
+  const int32_t kiHighestTid = pDLayerParam->iHighestTemporalId;
+
+//Index 0:Virtual GOP size, Index 1:Frame rate
+//double WeightArray[4][4] = { {1.0, 0, 0, 0}, {0.6, 0.4, 0, 0}, {0.4, 0.3, 0.15, 0}, {0.25, 0.15, 0.125, 0.0875}};
+  int32_t iWeightArray[4][4] = { {2000, 0, 0, 0}, {1200, 800, 0, 0}, {800, 600, 300, 0}, {500, 300, 250, 175}}; // original*WEIGHT_MULTIPLY
+  const int32_t kiGopSize = (1 << kiDecompositionStages);
+  int32_t i, k, n;
+
+  n = 0;
+  while (n <= kiHighestTid) {
+    pTOverRc[n].iTlayerWeight = iWeightArray[kiDecompositionStages][n];
+    pTOverRc[n].iMinQp = pWelsSvcRc->iMinQp + (n << 1);
+    pTOverRc[n].iMinQp = WELS_CLIP3 (pTOverRc[n].iMinQp, 0, 51);
+    pTOverRc[n].iMaxQp = pWelsSvcRc->iMaxQp + (n << 1);
+    pTOverRc[n].iMaxQp = WELS_CLIP3 (pTOverRc[n].iMaxQp, pTOverRc[n].iMinQp, 51);
+    ++ n;
+  }
+//Calculate the frame index for the current frame and its reference frame
+  for (n = 0; n < VGOP_SIZE; n += kiGopSize) {
+    pWelsSvcRc->iTlOfFrames[n] = 0;
+    for (i = 1; i <= kiDecompositionStages; i++) {
+      for (k = 1 << (kiDecompositionStages - i); k < kiGopSize; k += (kiGopSize >> (i - 1))) {
+        pWelsSvcRc->iTlOfFrames[k + n] = i;
+      }
+    }
+  }
+  pWelsSvcRc->iPreviousGopSize = kiGopSize;
+  pWelsSvcRc->iGopNumberInVGop = VGOP_SIZE / kiGopSize;
+}
+
+void RcUpdateBitrateFps (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc    = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCTemporal* pTOverRc     = pWelsSvcRc->pTemporalOverRc;
+
+  SSpatialLayerConfig* pDLayerParam     = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+  SSpatialLayerInternal* pDLayerParamInternal     = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  const int32_t kiGopSize = (1 << pDLayerParamInternal->iDecompositionStages);
+  const int32_t kiHighestTid = pDLayerParamInternal->iHighestTemporalId;
+  const int32_t input_iBitsPerFrame = WELS_DIV_ROUND (pDLayerParam->iSpatialBitrate,
+                                      pDLayerParamInternal->fOutputFrameRate);
+  const int64_t kiGopBits = input_iBitsPerFrame * kiGopSize;
+  int32_t i;
+
+  pWelsSvcRc->iBitRate   = pDLayerParam->iSpatialBitrate;
+  pWelsSvcRc->fFrameRate = pDLayerParamInternal->fOutputFrameRate;
+
+  int32_t iTargetVaryRange = ((MAX_BITS_VARY_PERCENTAGE - pWelsSvcRc->iRcVaryRatio) >> 1);
+  int32_t iMinBitsRatio = MAX_BITS_VARY_PERCENTAGE - iTargetVaryRange;
+  int32_t iMaxBitsRatio = MAX_BITS_VARY_PERCENTAGE_x3d2;
+
+  for (i = 0; i <= kiHighestTid; i++) {
+    const int64_t kdConstraitBits = kiGopBits * pTOverRc[i].iTlayerWeight;
+    pTOverRc[i].iMinBitsTl = WELS_DIV_ROUND (kdConstraitBits * iMinBitsRatio,
+                             MAX_BITS_VARY_PERCENTAGE * WEIGHT_MULTIPLY);
+    pTOverRc[i].iMaxBitsTl = WELS_DIV_ROUND (kdConstraitBits * iMaxBitsRatio,
+                             MAX_BITS_VARY_PERCENTAGE * WEIGHT_MULTIPLY);
+  }
+//When bitrate is changed, pBuffer size should be updated
+  pWelsSvcRc->iBufferSizeSkip = WELS_DIV_ROUND (pWelsSvcRc->iBitRate * pWelsSvcRc->iSkipBufferRatio, INT_MULTIPLY);
+  pWelsSvcRc->iBufferSizePadding = WELS_DIV_ROUND (pWelsSvcRc->iBitRate * PADDING_BUFFER_RATIO, INT_MULTIPLY);
+
+//change remaining bits
+  if (pWelsSvcRc->iBitsPerFrame > REMAIN_BITS_TH) {
+    pWelsSvcRc->iRemainingBits = WELS_DIV_ROUND (static_cast<int64_t> (pWelsSvcRc->iRemainingBits) * input_iBitsPerFrame,
+                                 pWelsSvcRc->iBitsPerFrame);
+  }
+  pWelsSvcRc->iBitsPerFrame = input_iBitsPerFrame;
+  pWelsSvcRc->iMaxBitsPerFrame = WELS_DIV_ROUND (pDLayerParam->iMaxSpatialBitrate,
+                                 pDLayerParamInternal->fOutputFrameRate);
+}
+
+
+void RcInitVGop (sWelsEncCtx* pEncCtx) {
+  const int32_t kiDid = pEncCtx->uiDependencyId;
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[kiDid];
+  SRCTemporal* pTOverRc = pWelsSvcRc->pTemporalOverRc;
+  const int32_t kiHighestTid = pEncCtx->pSvcParam->sDependencyLayers[kiDid].iHighestTemporalId;
+
+  pWelsSvcRc->iRemainingBits = VGOP_SIZE * pWelsSvcRc->iBitsPerFrame;
+  pWelsSvcRc->iRemainingWeights = pWelsSvcRc->iGopNumberInVGop * WEIGHT_MULTIPLY;
+
+  pWelsSvcRc->iFrameCodedInVGop = 0;
+  pWelsSvcRc->iGopIndexInVGop = 0;
+
+  for (int32_t i = 0; i <= kiHighestTid; ++ i)
+    pTOverRc[i].iGopBitsDq = 0;
+  pWelsSvcRc->iSkipFrameInVGop = 0;
+}
+
+void RcInitRefreshParameter (sWelsEncCtx* pEncCtx) {
+  const int32_t kiDid                         = pEncCtx->uiDependencyId;
+  SWelsSvcRc* pWelsSvcRc                      = &pEncCtx->pWelsSvcRc[kiDid];
+  SRCTemporal* pTOverRc                       = pWelsSvcRc->pTemporalOverRc;
+  SSpatialLayerConfig* pDLayerParam           = &pEncCtx->pSvcParam->sSpatialLayers[kiDid];
+  SSpatialLayerInternal* pDLayerParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[kiDid];
+  const int32_t kiHighestTid = pDLayerParamInternal->iHighestTemporalId;
+  int32_t i;
+
+//I frame R-Q Model
+  pWelsSvcRc->iIntraComplexity = 0;
+  pWelsSvcRc->iIntraMbCount = 0;
+  pWelsSvcRc->iIntraComplxMean = 0;
+//P frame R-Q Model
+  for (i = 0; i <= kiHighestTid; i++) {
+    pTOverRc[i].iPFrameNum = 0;
+    pTOverRc[i].iLinearCmplx = 0;
+    pTOverRc[i].iFrameCmplxMean = 0;
+  }
+
+  pWelsSvcRc->iBufferFullnessSkip = 0;
+  pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] = 0;
+  pWelsSvcRc->iBufferMaxBRFullness[ODD_TIME_WINDOW] = 0;
+  pWelsSvcRc->iPredFrameBit = 0;
+  pWelsSvcRc->iBufferFullnessPadding = 0;
+
+  pWelsSvcRc->iGopIndexInVGop = 0;
+  pWelsSvcRc->iRemainingBits = 0;
+  pWelsSvcRc->iBitsPerFrame = 0;
+
+//Backup the initial bitrate and fps
+  pWelsSvcRc->iPreviousBitrate  = pDLayerParam->iSpatialBitrate;
+  pWelsSvcRc->dPreviousFps      = pDLayerParamInternal->fOutputFrameRate;
+
+  memset (pWelsSvcRc->pCurrentFrameGomSad, 0, pWelsSvcRc->iGomSize * sizeof (int32_t));
+
+  RcInitTlWeight (pEncCtx);
+  RcUpdateBitrateFps (pEncCtx);
+  RcInitVGop (pEncCtx);
+}
+
+bool RcJudgeBitrateFpsUpdate (sWelsEncCtx* pEncCtx) {
+  int32_t iCurDid = pEncCtx->uiDependencyId;
+  SWelsSvcRc* pWelsSvcRc       = &pEncCtx->pWelsSvcRc[iCurDid];
+  SSpatialLayerInternal* pDLayerParamInternal    = &pEncCtx->pSvcParam->sDependencyLayers[iCurDid];
+  SSpatialLayerConfig* pDLayerParam    = &pEncCtx->pSvcParam->sSpatialLayers[iCurDid];
+
+  if ((pWelsSvcRc->iPreviousBitrate != pDLayerParam->iSpatialBitrate) ||
+      (pWelsSvcRc->dPreviousFps - pDLayerParamInternal->fOutputFrameRate) > EPSN ||
+      (pWelsSvcRc->dPreviousFps - pDLayerParamInternal->fOutputFrameRate) < -EPSN) {
+    pWelsSvcRc->iPreviousBitrate = pDLayerParam->iSpatialBitrate;
+    pWelsSvcRc->dPreviousFps = pDLayerParamInternal->fOutputFrameRate;
+    return true;
+  } else
+    return false;
+}
+
+#if GOM_TRACE_FLAG
+void RcTraceVGopBitrate (sWelsEncCtx* pEncCtx) {
+  const int32_t kiDid    = pEncCtx->uiDependencyId;
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[kiDid];
+
+  if (pWelsSvcRc->iFrameCodedInVGop) {
+    const int32_t kiHighestTid  = pEncCtx->pSvcParam->sDependencyLayers[kiDid].iHighestTemporalId;
+    SRCTemporal* pTOverRc       = pWelsSvcRc->pTemporalOverRc;
+    int32_t iVGopBitrate = 0;
+    int32_t iTotalBits = pWelsSvcRc->iPaddingBitrateStat;
+    int32_t iTid = 0;
+    while (iTid <= kiHighestTid) {
+      iTotalBits += pTOverRc[iTid].iGopBitsDq;
+      ++ iTid;
+    }
+    int32_t iFrameInVGop = pWelsSvcRc->iFrameCodedInVGop + pWelsSvcRc->iSkipFrameInVGop;
+    if (0 != iFrameInVGop)
+      iVGopBitrate = WELS_ROUND (iTotalBits / iFrameInVGop * pWelsSvcRc->fFrameRate);
+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, "[Rc] VGOPbitrate%d: %d ", kiDid, iVGopBitrate);
+    if (iTotalBits > 0) {
+      iTid = 0;
+      while (iTid <= kiHighestTid) {
+        WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, "T%d=%8.3f ", iTid, (double) (pTOverRc[iTid].iGopBitsDq / iTotalBits));
+        ++ iTid;
+      }
+    }
+  }
+}
+#endif
+
+void RcUpdateTemporalZero (sWelsEncCtx* pEncCtx) {
+  const int32_t kiDid                   = pEncCtx->uiDependencyId;
+  SWelsSvcRc* pWelsSvcRc                = &pEncCtx->pWelsSvcRc[kiDid];
+  SSpatialLayerInternal* pDLayerParam   = &pEncCtx->pSvcParam->sDependencyLayers[kiDid];
+  const int32_t kiGopSize               = (1 << pDLayerParam->iDecompositionStages);
+
+  if (pWelsSvcRc->iPreviousGopSize  != kiGopSize) {
+#if GOM_TRACE_FLAG
+    RcTraceVGopBitrate (pEncCtx);
+#endif
+    RcInitTlWeight (pEncCtx);
+    RcInitVGop (pEncCtx);
+  } else if (pWelsSvcRc->iGopIndexInVGop == pWelsSvcRc->iGopNumberInVGop || pEncCtx->eSliceType == I_SLICE) {
+#if GOM_TRACE_FLAG
+    RcTraceVGopBitrate (pEncCtx);
+#endif
+    RcInitVGop (pEncCtx);
+  }
+  pWelsSvcRc->iGopIndexInVGop++;
+}
+
+
+void RcCalculateIdrQp (sWelsEncCtx* pEncCtx) {
+  double dBpp = 0;
+  int32_t i;
+
+//64k@6fps for 90p:     bpp 0.74    QP:24
+//192k@12fps for 180p:  bpp 0.28    QP:26
+//512k@24fps for 360p:  bpp 0.09    QP:30
+//1500k@30fps for 720p: bpp 0.05    QP:32
+  double dBppArray[4][3] = {{0.5, 0.75, 1.0}, {0.2, 0.3, 0.4}, {0.05, 0.09, 0.13}, {0.03, 0.06, 0.1}};
+  int32_t dInitialQPArray[4][4] = {{28, 26, 24, 22}, {30, 28, 26, 24}, {32, 30, 28, 26}, {34, 32, 30, 28}};
+  int32_t iBppIndex = 0;
+  int32_t iQpRangeArray[4][2] = {{37, 25}, {36, 24}, {35, 23}, {34, 22}};
+  int64_t iFrameComplexity = pEncCtx->pVaa->sComplexityAnalysisParam.iFrameComplexity;
+  if (pEncCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+    iFrameComplexity = pVaa->sComplexityScreenParam.iFrameComplexity;
+  }
+  SWelsSvcRc* pWelsSvcRc                = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SSpatialLayerConfig* pDLayerParam     = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+  SSpatialLayerInternal* pDLayerParamInternal       = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  if (pDLayerParamInternal->fOutputFrameRate > EPSN && pDLayerParam->iVideoWidth && pDLayerParam->iVideoHeight)
+    dBpp = (double) (pDLayerParam->iSpatialBitrate) / (double) (pDLayerParamInternal->fOutputFrameRate *
+           pDLayerParam->iVideoWidth *
+           pDLayerParam->iVideoHeight);
+  else
+    dBpp = 0.1;
+//Area*2
+  if (pDLayerParam->iVideoWidth * pDLayerParam->iVideoHeight <= 28800) // 90p video:160*90
+    iBppIndex = 0;
+  else if (pDLayerParam->iVideoWidth * pDLayerParam->iVideoHeight <= 115200) // 180p video:320*180
+    iBppIndex = 1;
+  else if (pDLayerParam->iVideoWidth * pDLayerParam->iVideoHeight <= 460800) // 360p video:640*360
+    iBppIndex = 2;
+  else
+    iBppIndex = 3;
+
+//Search
+  for (i = 0; i < 3; i++) {
+    if (dBpp <= dBppArray[iBppIndex][i])
+      break;
+  }
+  int32_t iMaxQp = iQpRangeArray[i][0];
+  int32_t iMinQp = iQpRangeArray[i][1];
+  iMinQp = WELS_CLIP3 (iMinQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+  iMaxQp = WELS_CLIP3 (iMaxQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+  if (0 == pWelsSvcRc->iIdrNum) { //the first IDR frame
+    pWelsSvcRc->iInitialQp = dInitialQPArray[iBppIndex][i];
+  } else {
+
+    //obtain the idr qp using previous idr complexity
+    if (pWelsSvcRc->iNumberMbFrame != pWelsSvcRc->iIntraMbCount) {
+      pWelsSvcRc->iIntraComplexity = pWelsSvcRc->iIntraComplexity * pWelsSvcRc->iNumberMbFrame /
+                                     pWelsSvcRc->iIntraMbCount;
+    }
+
+    int64_t iCmplxRatio = WELS_DIV_ROUND64 (iFrameComplexity * INT_MULTIPLY,
+                                            pWelsSvcRc->iIntraComplxMean);
+    iCmplxRatio = WELS_CLIP3 (iCmplxRatio, INT_MULTIPLY - FRAME_CMPLX_RATIO_RANGE, INT_MULTIPLY + FRAME_CMPLX_RATIO_RANGE);
+    pWelsSvcRc->iQStep = WELS_DIV_ROUND ((pWelsSvcRc->iIntraComplexity * iCmplxRatio),
+                                         (pWelsSvcRc->iTargetBits * INT_MULTIPLY));
+    pWelsSvcRc->iInitialQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep);
+  }
+
+  pWelsSvcRc->iInitialQp = WELS_CLIP3 (pWelsSvcRc->iInitialQp, iMinQp, iMaxQp);
+  pEncCtx->iGlobalQp = pWelsSvcRc->iInitialQp;
+  pWelsSvcRc->iQStep = RcConvertQp2QStep (pEncCtx->iGlobalQp);
+  pWelsSvcRc->iLastCalculatedQScale = pEncCtx->iGlobalQp;
+  pWelsSvcRc->iMinFrameQp = WELS_CLIP3 (pEncCtx->iGlobalQp - DELTA_QP_BGD_THD, iMinQp, iMaxQp);
+  pWelsSvcRc->iMaxFrameQp = WELS_CLIP3 (pEncCtx->iGlobalQp + DELTA_QP_BGD_THD, iMinQp, iMaxQp);
+
+}
+
+void RcCalculatePictureQp (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  int32_t iTl                   = pEncCtx->uiTemporalId;
+  SRCTemporal* pTOverRc         = &pWelsSvcRc->pTemporalOverRc[iTl];
+  int32_t iLumaQp = 0;
+  int32_t iDeltaQpTemporal = 0;
+  int64_t iFrameComplexity = pEncCtx->pVaa->sComplexityAnalysisParam.iFrameComplexity;
+  if (pEncCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+    iFrameComplexity = pVaa->sComplexityScreenParam.iFrameComplexity;
+  }
+  if (0 == pTOverRc->iPFrameNum) {
+    iLumaQp = pWelsSvcRc->iInitialQp;
+  } else if (pWelsSvcRc->iCurrentBitsLevel == BITS_EXCEEDED) {
+    iLumaQp = pWelsSvcRc->iLastCalculatedQScale + DELTA_QP_BGD_THD;
+//limit QP
+    int32_t iLastIdxCodecInVGop = pWelsSvcRc->iFrameCodedInVGop - 1;
+    if (iLastIdxCodecInVGop < 0)
+      iLastIdxCodecInVGop += VGOP_SIZE;
+    int32_t iTlLast = pWelsSvcRc->iTlOfFrames[iLastIdxCodecInVGop];
+    iDeltaQpTemporal = iTl - iTlLast;
+    if (0 == iTlLast && iTl > 0)
+      iDeltaQpTemporal += 1;
+    else if (0 == iTl && iTlLast > 0)
+      iDeltaQpTemporal -= 1;
+
+  } else {
+    int64_t iCmplxRatio = WELS_DIV_ROUND64 (iFrameComplexity * INT_MULTIPLY,
+                                            pTOverRc->iFrameCmplxMean);
+    iCmplxRatio = WELS_CLIP3 (iCmplxRatio, INT_MULTIPLY - FRAME_CMPLX_RATIO_RANGE, INT_MULTIPLY + FRAME_CMPLX_RATIO_RANGE);
+
+    pWelsSvcRc->iQStep = WELS_DIV_ROUND ((pTOverRc->iLinearCmplx * iCmplxRatio), (pWelsSvcRc->iTargetBits * INT_MULTIPLY));
+    iLumaQp = RcConvertQStep2Qp (pWelsSvcRc->iQStep);
+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+             "iCmplxRatio = %d,frameComplexity = %" PRId64 ",iFrameCmplxMean = %" PRId64 ",iQStep = %d,iLumaQp = %d", (int)iCmplxRatio,
+             iFrameComplexity, pTOverRc->iFrameCmplxMean, pWelsSvcRc->iQStep, iLumaQp);
+//limit QP
+    int32_t iLastIdxCodecInVGop = pWelsSvcRc->iFrameCodedInVGop - 1;
+    if (iLastIdxCodecInVGop < 0)
+      iLastIdxCodecInVGop += VGOP_SIZE;
+    int32_t iTlLast = pWelsSvcRc->iTlOfFrames[iLastIdxCodecInVGop];
+    int32_t iDeltaQpTemporal = iTl - iTlLast;
+    if (0 == iTlLast && iTl > 0)
+      iDeltaQpTemporal += 1;
+    else if (0 == iTl && iTlLast > 0)
+      iDeltaQpTemporal -= 1;
+  }
+  pWelsSvcRc->iMinFrameQp =  WELS_CLIP3 (pWelsSvcRc->iLastCalculatedQScale - pWelsSvcRc->iFrameDeltaQpLower +
+                                         iDeltaQpTemporal, pTOverRc->iMinQp, pTOverRc->iMaxQp) ;
+  pWelsSvcRc->iMaxFrameQp =  WELS_CLIP3 (pWelsSvcRc->iLastCalculatedQScale + pWelsSvcRc->iFrameDeltaQpUpper +
+                                         iDeltaQpTemporal, pTOverRc->iMinQp, pTOverRc->iMaxQp);
+
+  iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iMinFrameQp, pWelsSvcRc->iMaxFrameQp);
+
+  if (pEncCtx->pSvcParam->bEnableAdaptiveQuant) {
+
+    iLumaQp =  WELS_DIV_ROUND (iLumaQp * INT_MULTIPLY - pEncCtx->pVaa->sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp,
+                               INT_MULTIPLY);
+    iLumaQp = WELS_CLIP3 (iLumaQp, pWelsSvcRc->iMinFrameQp, pWelsSvcRc->iMaxFrameQp);
+  }
+  pWelsSvcRc->iQStep = RcConvertQp2QStep (iLumaQp);
+  pWelsSvcRc->iLastCalculatedQScale = iLumaQp;
+  pEncCtx->iGlobalQp = iLumaQp;
+}
+
+void GomRCInitForOneSlice (SSlice* pSlice, const int32_t kiBitsPerMb) {
+  SRCSlicing* pSOverRc        = &pSlice->sSlicingOverRc;
+  pSOverRc->iStartMbSlice     = pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
+  pSOverRc->iEndMbSlice       = pSOverRc->iStartMbSlice + pSlice->iCountMbNumInSlice - 1;
+  pSOverRc->iTargetBitsSlice  = WELS_DIV_ROUND (static_cast<int64_t> (kiBitsPerMb) * pSlice->iCountMbNumInSlice,
+                                INT_MULTIPLY);
+}
+
+void RcInitSliceInformation (sWelsEncCtx* pEncCtx) {
+  SSlice** ppSliceInLayer   = pEncCtx->pCurDqLayer->ppSliceInLayer;
+  SWelsSvcRc* pWelsSvcRc    = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  const int32_t kiSliceNum  = pEncCtx->pCurDqLayer->iMaxSliceNum;
+  pWelsSvcRc->iBitsPerMb    = WELS_DIV_ROUND (static_cast<int64_t> (pWelsSvcRc->iTargetBits) * INT_MULTIPLY,
+                              pWelsSvcRc->iNumberMbFrame);
+  pWelsSvcRc->bGomRC        = (RC_OFF_MODE == pEncCtx->pSvcParam->iRCMode ||
+                               RC_BUFFERBASED_MODE == pEncCtx->pSvcParam->iRCMode) ? false : true;
+  for (int32_t i = 0; i < kiSliceNum; i++) {
+    SRCSlicing* pSOverRc        = &ppSliceInLayer[i]->sSlicingOverRc;
+    pSOverRc->iTotalQpSlice     = 0;
+    pSOverRc->iTotalMbSlice     = 0;
+    pSOverRc->iFrameBitsSlice   = 0;
+    pSOverRc->iGomBitsSlice     = 0;
+    pSOverRc->iStartMbSlice     = 0;
+    pSOverRc->iEndMbSlice       = 0;
+    pSOverRc->iTargetBitsSlice  = 0;
+  }
+}
+
+void RcDecideTargetBits (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCTemporal* pTOverRc         = &pWelsSvcRc->pTemporalOverRc[pEncCtx->uiTemporalId];
+
+  pWelsSvcRc->iCurrentBitsLevel = BITS_NORMAL;
+  //allocate bits
+  if (pEncCtx->eSliceType == I_SLICE) {
+    pWelsSvcRc->iTargetBits = pWelsSvcRc->iBitsPerFrame * IDR_BITRATE_RATIO;
+  } else {
+    if (pWelsSvcRc->iRemainingWeights > pTOverRc->iTlayerWeight)
+      pWelsSvcRc->iTargetBits = WELS_DIV_ROUND (static_cast<int64_t> (pWelsSvcRc->iRemainingBits) * pTOverRc->iTlayerWeight,
+                                pWelsSvcRc->iRemainingWeights);
+    else //this case should be not hit. needs to more test case to verify this
+      pWelsSvcRc->iTargetBits = pWelsSvcRc->iRemainingBits;
+    if ((pWelsSvcRc->iTargetBits <= 0) && ((pEncCtx->pSvcParam->iRCMode == RC_BITRATE_MODE)
+                                           && (pEncCtx->pSvcParam->bEnableFrameSkip == false))) {
+      pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED;
+    }
+    pWelsSvcRc->iTargetBits = WELS_CLIP3 (pWelsSvcRc->iTargetBits, pTOverRc->iMinBitsTl, pTOverRc->iMaxBitsTl);
+  }
+  pWelsSvcRc->iRemainingWeights -= pTOverRc->iTlayerWeight;
+
+}
+
+void RcDecideTargetBitsTimestamp (sWelsEncCtx* pEncCtx) {
+  //decide one frame bits allocated
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SSpatialLayerConfig* pDLayerParam = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+  int32_t iTl                 = pEncCtx->uiTemporalId;
+  SRCTemporal* pTOverRc       = &pWelsSvcRc->pTemporalOverRc[iTl];
+  pWelsSvcRc->iCurrentBitsLevel = BITS_NORMAL;
+
+  if (pEncCtx->eSliceType == I_SLICE) {
+    int32_t iBufferTh = static_cast<int32_t> (pWelsSvcRc->iBufferSizeSkip - pWelsSvcRc->iBufferFullnessSkip);
+    if (iBufferTh <= 0) {
+      pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED;
+      pWelsSvcRc->iTargetBits = pTOverRc->iMinBitsTl;
+    } else {
+      int32_t iMaxTh = iBufferTh * 3 / 4;
+      int32_t iMinTh = static_cast<int32_t>((pDLayerParam->fFrameRate < 8) ? iBufferTh * 1.0 / 4 : iBufferTh * 2 / pDLayerParam->fFrameRate);
+      if (pDLayerParam->fFrameRate < (IDR_BITRATE_RATIO + 1))
+        pWelsSvcRc->iTargetBits = static_cast<int32_t> (((double) (pDLayerParam->iSpatialBitrate) / (double) (
+                                    pDLayerParam->fFrameRate)));
+      else
+        pWelsSvcRc->iTargetBits = static_cast<int32_t> (((double) (pDLayerParam->iSpatialBitrate) / (double) (
+                                    pDLayerParam->fFrameRate) * IDR_BITRATE_RATIO));
+      WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+               "iMaxTh = %d,iMinTh = %d,pWelsSvcRc->iTargetBits = %d,pWelsSvcRc->iBufferSizeSkip = %d, pWelsSvcRc->iBufferFullnessSkip= %"
+               PRId64,
+               iMaxTh, iMinTh, pWelsSvcRc->iTargetBits, pWelsSvcRc->iBufferSizeSkip, pWelsSvcRc->iBufferFullnessSkip);
+      pWelsSvcRc->iTargetBits = WELS_CLIP3 (pWelsSvcRc->iTargetBits, iMinTh, iMaxTh);
+    }
+
+  } else {
+    int32_t iBufferTh = static_cast<int32_t> (pWelsSvcRc->iBufferSizeSkip - pWelsSvcRc->iBufferFullnessSkip);
+    if (iBufferTh <= 0) {
+      pWelsSvcRc->iCurrentBitsLevel = BITS_EXCEEDED;
+      pWelsSvcRc->iTargetBits = pTOverRc->iMinBitsTl;
+      WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+               "iMaxTh = %d,pWelsSvcRc->iTargetBits = %d,pWelsSvcRc->iBufferSizeSkip = %d, pWelsSvcRc->iBufferFullnessSkip= %" PRId64,
+               iBufferTh, pWelsSvcRc->iTargetBits, pWelsSvcRc->iBufferSizeSkip, pWelsSvcRc->iBufferFullnessSkip);
+    } else {
+
+      SSpatialLayerInternal* pDLayerParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+      const int32_t kiGopSize   = (1 << pDLayerParamInternal->iDecompositionStages);
+      int32_t iAverageFrameSize = (int32_t) ((double) (pDLayerParam->iSpatialBitrate) / (double) (pDLayerParam->fFrameRate));
+      const int32_t kiGopBits   = iAverageFrameSize * kiGopSize;
+      pWelsSvcRc->iTargetBits = WELS_DIV_ROUND (pTOverRc->iTlayerWeight * kiGopBits, INT_MULTIPLY * 10 * 2);
+
+      int32_t iMaxTh = iBufferTh / 2;
+      int32_t iMinTh = static_cast<int32_t>((pDLayerParam->fFrameRate < 8) ? iBufferTh * 1.0 / 4 : iBufferTh * 2 / pDLayerParam->fFrameRate);
+      WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+               "iMaxTh = %d,iMinTh = %d,pWelsSvcRc->iTargetBits = %d,pWelsSvcRc->iBufferSizeSkip = %d, pWelsSvcRc->iBufferFullnessSkip= % "
+               PRId64,
+               iMaxTh, iMinTh, pWelsSvcRc->iTargetBits, pWelsSvcRc->iBufferSizeSkip, pWelsSvcRc->iBufferFullnessSkip);
+      pWelsSvcRc->iTargetBits = WELS_CLIP3 (pWelsSvcRc->iTargetBits, iMinTh, iMaxTh);
+    }
+  }
+}
+
+void RcInitGomParameters (sWelsEncCtx* pEncCtx) {
+  SSlice** ppSliceInLayer     = pEncCtx->pCurDqLayer->ppSliceInLayer;
+  SWelsSvcRc* pWelsSvcRc      = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCSlicing* pSOverRc        = &ppSliceInLayer[0]->sSlicingOverRc;
+  const int32_t kiSliceNum    = pEncCtx->pCurDqLayer->iMaxSliceNum;
+  const int32_t kiGlobalQp    = pEncCtx->iGlobalQp;
+
+  pWelsSvcRc->iAverageFrameQp = 0;
+  for (int32_t i = 0; i < kiSliceNum; ++i) {
+    pSOverRc                            = &ppSliceInLayer[i]->sSlicingOverRc;
+    pSOverRc->iComplexityIndexSlice     = 0;
+    pSOverRc->iCalculatedQpSlice        = kiGlobalQp;
+  }
+  memset (pWelsSvcRc->pGomComplexity, 0, pWelsSvcRc->iGomSize * sizeof (double));
+  memset (pWelsSvcRc->pGomCost, 0, pWelsSvcRc->iGomSize * sizeof (int32_t));
+}
+
+void RcCalculateMbQp (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCSlicing* pSOverRc          = &pSlice->sSlicingOverRc;
+
+  int32_t iLumaQp               = pSOverRc->iCalculatedQpSlice;
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+  if (pEncCtx->pSvcParam->bEnableAdaptiveQuant) {
+    iLumaQp   = (int8_t)WELS_CLIP3 (iLumaQp +
+                                    pEncCtx->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp[pCurMb->iMbXY], pWelsSvcRc->iMinFrameQp,
+                                    pWelsSvcRc->iMaxFrameQp);
+  }
+  pCurMb->uiChromaQp    = g_kuiChromaQpTable[CLIP3_QP_0_51 (iLumaQp + kuiChromaQpIndexOffset)];
+  pCurMb->uiLumaQp      = iLumaQp;
+}
+
+SWelsSvcRc* RcJudgeBaseUsability (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc  = NULL, *pWelsSvcRc_Base = NULL;
+  SSpatialLayerConfig* pDlpBase = NULL, *pDLayerParam = NULL;
+  SSpatialLayerInternal* pDlpBaseInternal = NULL;
+  if (pEncCtx->uiDependencyId <= 0)
+    return NULL;
+  pDlpBaseInternal = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId - 1];
+  pDlpBase = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId - 1];
+  pWelsSvcRc_Base = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId - 1];
+  if (pEncCtx->uiTemporalId <= pDlpBaseInternal->iDecompositionStages) {
+    pWelsSvcRc      = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+    pWelsSvcRc_Base = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId - 1];
+    pDLayerParam             = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+    pDlpBase        = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId - 1];
+    if ((pDLayerParam->iVideoWidth * pDLayerParam->iVideoHeight / pWelsSvcRc->iNumberMbGom) ==
+        (pDlpBase->iVideoWidth * pDlpBase->iVideoHeight / pWelsSvcRc_Base->iNumberMbGom))
+      return pWelsSvcRc_Base;
+    else
+      return NULL;
+  } else
+    return NULL;
+}
+
+void RcGomTargetBits (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SWelsSvcRc* pWelsSvcRc_Base   = NULL;
+  SRCSlicing* pSOverRc          = &pSlice->sSlicingOverRc;
+
+  int32_t iAllocateBits = 0;
+  int32_t iSumSad = 0;
+  int32_t iLastGomIndex = 0;
+  int32_t iLeftBits = 0;
+  const int32_t kiComplexityIndex = pSOverRc->iComplexityIndexSlice;
+  int32_t i;
+
+  iLastGomIndex  = pSOverRc->iEndMbSlice / pWelsSvcRc->iNumberMbGom;
+  iLeftBits = pSOverRc->iTargetBitsSlice - pSOverRc->iFrameBitsSlice;
+  if (iLeftBits <= 0) {
+    pSOverRc->iGomTargetBits = 0;
+    return;
+  } else if (kiComplexityIndex >= iLastGomIndex) {
+    iAllocateBits = iLeftBits;
+  } else {
+    pWelsSvcRc_Base = RcJudgeBaseUsability (pEncCtx);
+    pWelsSvcRc_Base = (pWelsSvcRc_Base) ? pWelsSvcRc_Base : pWelsSvcRc;
+    for (i = kiComplexityIndex + 1; i <= iLastGomIndex; i++) {
+      iSumSad += pWelsSvcRc_Base->pCurrentFrameGomSad[i];
+    }
+
+    if (0 == iSumSad)
+      iAllocateBits = WELS_DIV_ROUND (iLeftBits, (iLastGomIndex - kiComplexityIndex));
+    else
+      iAllocateBits = WELS_DIV_ROUND ((int64_t)iLeftBits * pWelsSvcRc_Base->pCurrentFrameGomSad[kiComplexityIndex + 1],
+                                      iSumSad);
+  }
+  pSOverRc->iGomTargetBits = iAllocateBits;
+}
+
+
+
+void RcCalculateGomQp (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SWelsSvcRc* pWelsSvcRc    = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCSlicing* pSOverRc      = &pSlice->sSlicingOverRc;
+  int64_t iBitsRatio        = 1;
+
+  int64_t iLeftBits         = pSOverRc->iTargetBitsSlice - pSOverRc->iFrameBitsSlice;
+  int64_t iTargetLeftBits   = iLeftBits + pSOverRc->iGomBitsSlice - pSOverRc->iGomTargetBits;
+  if ((iLeftBits <= 0) || (iTargetLeftBits <= 0)) {
+    pSOverRc->iCalculatedQpSlice += 2;
+  } else {
+//globe decision
+    iBitsRatio = 10000 * iLeftBits / (iTargetLeftBits + 1);
+    if (iBitsRatio < 8409)              //2^(-1.5/6)*10000
+      pSOverRc->iCalculatedQpSlice += 2;
+    else if (iBitsRatio < 9439)         //2^(-0.5/6)*10000
+      pSOverRc->iCalculatedQpSlice += 1;
+    else if (iBitsRatio > 10600)        //2^(0.5/6)*10000
+      pSOverRc->iCalculatedQpSlice -= 1;
+    else if (iBitsRatio > 11900)        //2^(1.5/6)*10000
+      pSOverRc->iCalculatedQpSlice -= 2;
+  }
+  pSOverRc->iCalculatedQpSlice = WELS_CLIP3 (pSOverRc->iCalculatedQpSlice, pWelsSvcRc->iMinFrameQp,
+                                 pWelsSvcRc->iMaxFrameQp);
+// WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,"iCalculatedQpSlice =%d,iBitsRatio = %d\n",pSOverRc->iCalculatedQpSlice,iBitsRatio);
+  pSOverRc->iGomBitsSlice = 0;
+
+}
+
+void   RcVBufferCalculationSkip (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCTemporal* pTOverRc = pWelsSvcRc->pTemporalOverRc;
+  const int32_t kiOutputBits = pWelsSvcRc->iBitsPerFrame;
+  const int32_t kiOutputMaxBits = pWelsSvcRc->iMaxBitsPerFrame;
+//condition 1: whole pBuffer fullness
+  pWelsSvcRc->iBufferFullnessSkip += (pWelsSvcRc->iFrameDqBits - kiOutputBits);
+  pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] += (pWelsSvcRc->iFrameDqBits - kiOutputMaxBits);
+  pWelsSvcRc->iBufferMaxBRFullness[ODD_TIME_WINDOW] += (pWelsSvcRc->iFrameDqBits - kiOutputMaxBits);
+
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "[Rc] bits in buffer = %" PRId64 ", bits in Max bitrate buffer = %" PRId64,
+           pWelsSvcRc->iBufferFullnessSkip, pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW]);
+//condition 2: VGOP bits constraint
+  int64_t iVGopBitsPred = 0;
+  for (int32_t i = pWelsSvcRc->iFrameCodedInVGop + 1; i < VGOP_SIZE; i++)
+    iVGopBitsPred += pTOverRc[pWelsSvcRc->iTlOfFrames[i]].iMinBitsTl;
+  iVGopBitsPred -= pWelsSvcRc->iRemainingBits;
+  double dIncPercent = iVGopBitsPred * 100.0 / (pWelsSvcRc->iBitsPerFrame * VGOP_SIZE) -
+                       (double)VGOP_BITS_PERCENTAGE_DIFF;
+
+  if ((pWelsSvcRc->iBufferFullnessSkip > pWelsSvcRc->iBufferSizeSkip
+       && pWelsSvcRc->iAverageFrameQp > pWelsSvcRc->iSkipQpValue)
+      || (dIncPercent > pWelsSvcRc->iRcVaryPercentage)) {
+    pWelsSvcRc->bSkipFlag = true;
+  }
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "[Rc] VBV_Skip,dIncPercent = %f,iRcVaryPercentage = %d,pWelsSvcRc->bSkipFlag = %d", dIncPercent,
+           pWelsSvcRc->iRcVaryPercentage, pWelsSvcRc->bSkipFlag);
+}
+void CheckFrameSkipBasedMaxbr (sWelsEncCtx* pEncCtx, const long long uiTimeStamp, int32_t iDidIdx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[iDidIdx];
+  SSpatialLayerConfig* pDLayerParam     = &pEncCtx->pSvcParam->sSpatialLayers[iDidIdx];
+  //SSpatialLayerInternal* pDLayerParamInternal     = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  if (!pEncCtx->pSvcParam->bEnableFrameSkip)
+    return;
+  const int32_t iSentBits = pWelsSvcRc->iBitsPerFrame;
+  const int32_t kiOutputMaxBits = pWelsSvcRc->iMaxBitsPerFrame;
+  const int64_t kiMaxSpatialBitRate = pDLayerParam->iMaxSpatialBitrate;
+
+//estimate allowed continual skipped frames in the sequence
+  const int32_t iPredSkipFramesTarBr = (WELS_DIV_ROUND (pWelsSvcRc->iBufferFullnessSkip, iSentBits) + 1) >> 1;
+  const int32_t iPredSkipFramesMaxBr = (WELS_MAX (WELS_DIV_ROUND (pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW],
+                                        kiOutputMaxBits), 0) + 1) >> 1;
+
+//calculate the remaining bits in TIME_CHECK_WINDOW
+  const int32_t iAvailableBitsInTimeWindow = WELS_DIV_ROUND ((TIME_CHECK_WINDOW - pEncCtx->iCheckWindowInterval) *
+      kiMaxSpatialBitRate, 1000);
+  const int32_t iAvailableBitsInShiftTimeWindow = WELS_DIV_ROUND ((TIME_CHECK_WINDOW - pEncCtx->iCheckWindowIntervalShift)
+      * kiMaxSpatialBitRate, 1000);
+
+  bool bJudgeMaxBRbSkip[TIME_WINDOW_TOTAL];//0: EVEN_TIME_WINDOW; 1: ODD_TIME_WINDOW
+
+  /* 4 cases for frame skipping
+  1:skipping when buffer size larger than target threshold and current continual skip frames is allowed
+  2:skipping when MaxBr buffer size + predict frame size - remaining bits in time window < 0 and current continual skip frames is allowed
+  3:if in last ODD_TIME_WINDOW the MAX Br is overflowed, make more strict skipping conditions
+  4:such as case 3 in the other window
+  */
+  bool bJudgeBufferFullSkip = (pWelsSvcRc->iContinualSkipFrames <= iPredSkipFramesTarBr)
+                              && (pWelsSvcRc->iBufferFullnessSkip > pWelsSvcRc->iBufferSizeSkip);
+  bool bJudgeMaxBRbufferFullSkip = (pWelsSvcRc->iContinualSkipFrames <= iPredSkipFramesMaxBr)
+                                   && (pEncCtx->iCheckWindowInterval > TIME_CHECK_WINDOW / 2)
+                                   && (pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] + pWelsSvcRc->iPredFrameBit - iAvailableBitsInTimeWindow > 0);
+  bJudgeMaxBRbSkip[EVEN_TIME_WINDOW] = (pEncCtx->iCheckWindowInterval > TIME_CHECK_WINDOW / 2)
+                                       && (pWelsSvcRc->bNeedShiftWindowCheck[EVEN_TIME_WINDOW])
+                                       && (pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] + pWelsSvcRc->iPredFrameBit - iAvailableBitsInTimeWindow +
+                                           kiOutputMaxBits > 0);
+  bJudgeMaxBRbSkip[ODD_TIME_WINDOW] = (pEncCtx->iCheckWindowIntervalShift > TIME_CHECK_WINDOW / 2)
+                                      && (pWelsSvcRc->bNeedShiftWindowCheck[ODD_TIME_WINDOW])
+                                      && (pWelsSvcRc->iBufferMaxBRFullness[ODD_TIME_WINDOW] + pWelsSvcRc->iPredFrameBit - iAvailableBitsInShiftTimeWindow +
+                                          kiOutputMaxBits > 0);
+
+  pWelsSvcRc->bSkipFlag = false;
+  if (bJudgeBufferFullSkip || bJudgeMaxBRbufferFullSkip || bJudgeMaxBRbSkip[EVEN_TIME_WINDOW]
+      || bJudgeMaxBRbSkip[ODD_TIME_WINDOW]) {
+    pWelsSvcRc->bSkipFlag = true;
+    pWelsSvcRc->iSkipFrameNum++;
+    pWelsSvcRc->iSkipFrameInVGop++;
+    pWelsSvcRc->iBufferFullnessSkip -= iSentBits;
+    pWelsSvcRc->iRemainingBits +=  iSentBits;
+    pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] -= kiOutputMaxBits;
+    pWelsSvcRc->iBufferMaxBRFullness[ODD_TIME_WINDOW] -= kiOutputMaxBits;
+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+             "[Rc] bits in buffer = %" PRId64 ", bits in Max bitrate buffer = %" PRId64 ", Predict skip frames = %d and %d",
+             pWelsSvcRc->iBufferFullnessSkip, pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW], iPredSkipFramesTarBr,
+             iPredSkipFramesMaxBr);
+    pWelsSvcRc->iBufferFullnessSkip = WELS_MAX (pWelsSvcRc->iBufferFullnessSkip, 0);
+  }
+}
+
+bool WelsRcCheckFrameStatus (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iSpatialNum, int32_t iCurDid) {
+
+  bool bSkipMustFlag = false;
+
+  SSpatialPicIndex* pSpatialIndexMap = &pEncCtx->sSpatialIndexMap[0];
+
+  //simul_cast AVC control
+  if (pEncCtx->pSvcParam->bSimulcastAVC) {
+    //check target_br skip and update info
+    int32_t iDidIdx = iCurDid;
+    if (pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge) {
+      pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge (pEncCtx, uiTimeStamp, iDidIdx);
+    }
+    if (true == pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag) {
+      bSkipMustFlag = true;
+    }
+    //check max_br skip
+    if (pEncCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr) {
+      if ((!bSkipMustFlag) && (pEncCtx->pSvcParam->sSpatialLayers[iDidIdx].iMaxSpatialBitrate != UNSPECIFIED_BIT_RATE)) {
+        pEncCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr (pEncCtx, uiTimeStamp, iDidIdx);
+        if (true == pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag) {
+          bSkipMustFlag = true;
+
+        }
+      }
+    }
+    if (bSkipMustFlag) {
+      pEncCtx->pWelsSvcRc[iDidIdx].uiLastTimeStamp = uiTimeStamp;
+      pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag = false;
+      pEncCtx->pWelsSvcRc[iDidIdx].iContinualSkipFrames++;
+      return true;
+    }
+  } else { //SVC control
+    for (int32_t i = 0; i < iSpatialNum; i++) {
+      int32_t iDidIdx = (pSpatialIndexMap + i)->iDid;
+      //check target_br skip and update info
+
+      if (pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge) {
+        pEncCtx->pFuncList->pfRc.pfWelsRcPicDelayJudge (pEncCtx, uiTimeStamp, iDidIdx);
+      }
+      if (true == pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag) {
+        bSkipMustFlag = true;
+      }
+      //check max_br skip
+      if (pEncCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr) {
+        if ((!bSkipMustFlag) && (pEncCtx->pSvcParam->sSpatialLayers[iDidIdx].iMaxSpatialBitrate != UNSPECIFIED_BIT_RATE)) {
+          pEncCtx->pFuncList->pfRc.pfWelsCheckSkipBasedMaxbr (pEncCtx, uiTimeStamp, iDidIdx);
+          if (true == pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag) {
+            bSkipMustFlag = true;
+          }
+        }
+      }
+      if (bSkipMustFlag) {
+        break;
+      }
+    }
+
+    if (bSkipMustFlag) {
+      for (int32_t i = 0; i < iSpatialNum; i++) {
+        int32_t iDidIdx = (pSpatialIndexMap + i)->iDid;
+        pEncCtx->pWelsSvcRc[iDidIdx].uiLastTimeStamp = uiTimeStamp;
+        pEncCtx->pWelsSvcRc[iDidIdx].bSkipFlag = false;
+        pEncCtx->pWelsSvcRc[iDidIdx].iContinualSkipFrames++;
+      }
+      return true;
+    }
+  }
+  return false;
+}
+void UpdateBufferWhenFrameSkipped (sWelsEncCtx* pEncCtx, int32_t iCurDid) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[iCurDid];
+  const int32_t kiOutputBits = pWelsSvcRc->iBitsPerFrame;
+  const int32_t kiOutputMaxBits = pWelsSvcRc->iMaxBitsPerFrame;
+  pWelsSvcRc->iBufferFullnessSkip = pWelsSvcRc->iBufferFullnessSkip - kiOutputBits;
+  pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW] -= kiOutputMaxBits;
+  pWelsSvcRc->iBufferMaxBRFullness[ODD_TIME_WINDOW] -= kiOutputMaxBits;
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "[Rc] iDid = %d,bits in buffer = %" PRId64 ", bits in Max bitrate buffer = %" PRId64,
+           iCurDid, pWelsSvcRc->iBufferFullnessSkip, pWelsSvcRc->iBufferMaxBRFullness[EVEN_TIME_WINDOW]);
+
+  pWelsSvcRc->iBufferFullnessSkip = WELS_MAX (pWelsSvcRc->iBufferFullnessSkip, 0);
+
+  pWelsSvcRc->iRemainingBits +=  kiOutputBits;
+  pWelsSvcRc->iSkipFrameNum++;
+  pWelsSvcRc->iSkipFrameInVGop++;
+
+  if ((pWelsSvcRc->iContinualSkipFrames % 3) == 0) {
+    //output a warning when iContinualSkipFrames is large enough, which may indicate subjective quality problem
+    //note that here iContinualSkipFrames must be >0, so the log output will be 3/6/....
+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_WARNING, "[Rc] iDid = %d,iContinualSkipFrames(%d) is large",
+             iCurDid, pWelsSvcRc->iContinualSkipFrames);
+  }
+}
+void UpdateMaxBrCheckWindowStatus (sWelsEncCtx* pEncCtx, int32_t iSpatialNum, const long long uiTimeStamp) {
+  SSpatialPicIndex* pSpatialIndexMap = &pEncCtx->sSpatialIndexMap[0];
+  if (pEncCtx->bCheckWindowStatusRefreshFlag) {
+    pEncCtx->iCheckWindowCurrentTs = uiTimeStamp;
+  } else {
+    pEncCtx->iCheckWindowCurrentTs = pEncCtx->iCheckWindowStartTs = uiTimeStamp;
+    pEncCtx->bCheckWindowStatusRefreshFlag = true;
+    for (int32_t i = 0; i < iSpatialNum; i++) {
+      int32_t iCurDid = (pSpatialIndexMap + i)->iDid;
+      pEncCtx->pWelsSvcRc[iCurDid].iBufferFullnessSkip = 0;
+      pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[ODD_TIME_WINDOW] = 0;
+      pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[EVEN_TIME_WINDOW] = 0;
+      pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[ODD_TIME_WINDOW] = false;
+      pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[EVEN_TIME_WINDOW] = false;
+    }
+
+  }
+  pEncCtx->iCheckWindowInterval = (int32_t) (pEncCtx->iCheckWindowCurrentTs - pEncCtx->iCheckWindowStartTs);
+  if (pEncCtx->iCheckWindowInterval >= (TIME_CHECK_WINDOW >> 1) && !pEncCtx->bCheckWindowShiftResetFlag) {
+    pEncCtx->bCheckWindowShiftResetFlag = true;
+    for (int32_t i = 0; i < iSpatialNum; i++) {
+      int32_t iCurDid = (pSpatialIndexMap + i)->iDid;
+      if (pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[ODD_TIME_WINDOW] > 0
+          && pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[ODD_TIME_WINDOW] !=
+          pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[0]) {
+        pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[EVEN_TIME_WINDOW] = true;
+      } else {
+        pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[EVEN_TIME_WINDOW] = false;
+      }
+      pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[ODD_TIME_WINDOW] = 0;
+    }
+  }
+  pEncCtx->iCheckWindowIntervalShift = pEncCtx->iCheckWindowInterval >= (TIME_CHECK_WINDOW >> 1) ?
+                                       pEncCtx->iCheckWindowInterval - (TIME_CHECK_WINDOW >> 1) : pEncCtx->iCheckWindowInterval + (TIME_CHECK_WINDOW >> 1);
+
+  if (pEncCtx->iCheckWindowInterval >= TIME_CHECK_WINDOW || pEncCtx->iCheckWindowInterval == 0) {
+    pEncCtx->iCheckWindowStartTs = pEncCtx->iCheckWindowCurrentTs;
+    pEncCtx->iCheckWindowInterval = 0;
+    pEncCtx->bCheckWindowShiftResetFlag = false;
+    for (int32_t i = 0; i < iSpatialNum; i++) {
+      int32_t iCurDid = (pSpatialIndexMap + i)->iDid;
+      if (pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[EVEN_TIME_WINDOW] > 0) {
+        pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[ODD_TIME_WINDOW] = true;
+      } else {
+        pEncCtx->pWelsSvcRc[iCurDid].bNeedShiftWindowCheck[ODD_TIME_WINDOW] = false;
+      }
+      pEncCtx->pWelsSvcRc[iCurDid].iBufferMaxBRFullness[EVEN_TIME_WINDOW] = 0;
+    }
+  }
+  return;
+}
+
+bool WelsRcPostFrameSkipping (sWelsEncCtx* pCtx, const int32_t iDid, const long long uiTimeStamp) {
+  //TODO: put in the decision of rate-control
+  return false;
+}
+
+void WelsRcPostFrameSkippedUpdate (sWelsEncCtx* pCtx, const int32_t iDid) {
+  //TODO: do something to update buffers after post-skipping is done
+  //let RC know post-skipping happened and adjust strategy accordingly
+}
+
+void RcVBufferCalculationPadding (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  const int32_t kiOutputBits = pWelsSvcRc->iBitsPerFrame;
+  const int32_t kiBufferThreshold = WELS_DIV_ROUND (PADDING_THRESHOLD * (-pWelsSvcRc->iBufferSizePadding), INT_MULTIPLY);
+
+  pWelsSvcRc->iBufferFullnessPadding += (pWelsSvcRc->iFrameDqBits - kiOutputBits);
+
+  if (pWelsSvcRc->iBufferFullnessPadding < kiBufferThreshold) {
+    pWelsSvcRc->iPaddingSize = -pWelsSvcRc->iBufferFullnessPadding;
+    pWelsSvcRc->iPaddingSize >>= 3; // /8
+    pWelsSvcRc->iBufferFullnessPadding = 0;
+  } else
+    pWelsSvcRc->iPaddingSize = 0;
+}
+
+
+void RcTraceFrameBits (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iFrameSize) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  if (pWelsSvcRc->iPredFrameBit != 0)
+    pWelsSvcRc->iPredFrameBit = (int32_t) (LAST_FRAME_PREDICT_WEIGHT * pWelsSvcRc->iFrameDqBits +
+                                           (1 - LAST_FRAME_PREDICT_WEIGHT) * pWelsSvcRc->iPredFrameBit);
+  else
+    pWelsSvcRc->iPredFrameBit = pWelsSvcRc->iFrameDqBits;
+
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "[Rc]Layer %d: Frame timestamp = %lld, Frame type = %d, encoding_qp = %d, average qp = %d, max qp = %d, min qp = %d, index = %d, "
+           "iTid = %d, used = %d, bitsperframe = %d, target = %d, remainingbits = %d, skipbuffersize = %d",
+           pEncCtx->uiDependencyId, uiTimeStamp, pEncCtx->eSliceType, pEncCtx->iGlobalQp, pWelsSvcRc->iAverageFrameQp,
+           pWelsSvcRc->iMaxFrameQp,
+           pWelsSvcRc->iMinFrameQp,
+           pParamInternal->iFrameIndex, pEncCtx->uiTemporalId,
+           ( pWelsSvcRc->iFrameDqBits > 0 ) ? pWelsSvcRc->iFrameDqBits : (iFrameSize<<3) ,
+           pWelsSvcRc->iBitsPerFrame,
+           pWelsSvcRc->iTargetBits, pWelsSvcRc->iRemainingBits, pWelsSvcRc->iBufferSizeSkip);
+
+}
+
+void RcUpdatePictureQpBits (sWelsEncCtx* pEncCtx, int32_t iCodedBits) {
+  SSlice** ppSliceInLayer = pEncCtx->pCurDqLayer->ppSliceInLayer;
+  SRCSlicing* pSOverRc    = &ppSliceInLayer[0]->sSlicingOverRc;
+  SWelsSvcRc* pWelsSvcRc  = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SSliceCtx* pCurSliceCtx = &pEncCtx->pCurDqLayer->sSliceEncCtx;
+  int32_t iTotalQp = 0, iTotalMb = 0;
+  int32_t i;
+
+  if (pEncCtx->eSliceType == P_SLICE) {
+    for (i = 0; i < pCurSliceCtx->iSliceNumInFrame; i++) {
+      pSOverRc    = &ppSliceInLayer[i]->sSlicingOverRc;
+      iTotalQp += pSOverRc->iTotalQpSlice;
+      iTotalMb += pSOverRc->iTotalMbSlice;
+    }
+    if (iTotalMb > 0)
+      pWelsSvcRc->iAverageFrameQp = WELS_DIV_ROUND (INT_MULTIPLY * iTotalQp, iTotalMb * INT_MULTIPLY);
+    else
+      pWelsSvcRc->iAverageFrameQp = pEncCtx->iGlobalQp;
+  } else {
+    pWelsSvcRc->iAverageFrameQp = pEncCtx->iGlobalQp;
+  }
+  pWelsSvcRc->iFrameDqBits = iCodedBits;
+  pWelsSvcRc->iLastCalculatedQScale = pWelsSvcRc->iAverageFrameQp;
+  pWelsSvcRc->pTemporalOverRc[pEncCtx->uiTemporalId].iGopBitsDq += pWelsSvcRc->iFrameDqBits;
+}
+
+void RcUpdateIntraComplexity (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  int32_t iAlpha = WELS_DIV_ROUND (INT_MULTIPLY, (1 + pWelsSvcRc->iIdrNum));
+  if (iAlpha < (INT_MULTIPLY / 4)) iAlpha = INT_MULTIPLY / 4;
+  int32_t iQStep = RcConvertQp2QStep (pWelsSvcRc->iAverageFrameQp);
+  int64_t iIntraCmplx = iQStep * static_cast<int64_t> (pWelsSvcRc->iFrameDqBits);
+  int64_t iFrameComplexity = pEncCtx->pVaa->sComplexityAnalysisParam.iFrameComplexity;
+  if (pEncCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+    iFrameComplexity = pVaa->sComplexityScreenParam.iFrameComplexity;
+  }
+  if (pWelsSvcRc->iIdrNum == 0) {
+    pWelsSvcRc->iIntraComplexity = iIntraCmplx;
+    pWelsSvcRc->iIntraComplxMean = iFrameComplexity;
+  } else {
+    pWelsSvcRc->iIntraComplexity = WELS_DIV_ROUND64 (((LINEAR_MODEL_DECAY_FACTOR) * pWelsSvcRc->iIntraComplexity +
+                                   (INT_MULTIPLY - LINEAR_MODEL_DECAY_FACTOR) *
+                                   iIntraCmplx), INT_MULTIPLY);
+
+
+    pWelsSvcRc->iIntraComplxMean = WELS_DIV_ROUND64 (((LINEAR_MODEL_DECAY_FACTOR) * static_cast<int64_t>
+                                   (pWelsSvcRc->iIntraComplxMean)
+                                   + (INT_MULTIPLY - LINEAR_MODEL_DECAY_FACTOR) * (iFrameComplexity)),
+                                   INT_MULTIPLY);
+  }
+
+  pWelsSvcRc->iIntraMbCount = pWelsSvcRc->iNumberMbFrame;
+  pWelsSvcRc->iIdrNum++;
+  if (pWelsSvcRc->iIdrNum > 255)
+    pWelsSvcRc->iIdrNum = 255;
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "RcUpdateIntraComplexity iFrameDqBits = %d,iQStep= %d,iIntraCmplx = %" PRId64,
+           pWelsSvcRc->iFrameDqBits, pWelsSvcRc->iQStep, pWelsSvcRc->iIntraComplexity);
+
+}
+
+void RcUpdateFrameComplexity (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  const int32_t kiTl            = pEncCtx->uiTemporalId;
+  SRCTemporal* pTOverRc         = &pWelsSvcRc->pTemporalOverRc[kiTl];
+
+  int64_t iFrameComplexity = pEncCtx->pVaa->sComplexityAnalysisParam.iFrameComplexity;
+  if (pEncCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+    iFrameComplexity = pVaa->sComplexityScreenParam.iFrameComplexity;
+  }
+  int32_t iQStep = RcConvertQp2QStep (pWelsSvcRc->iAverageFrameQp);
+  int32_t iAlpha = WELS_DIV_ROUND (INT_MULTIPLY, (1 + pTOverRc->iPFrameNum));
+  if (iAlpha < SMOOTH_FACTOR_MIN_VALUE)
+    iAlpha = SMOOTH_FACTOR_MIN_VALUE;
+  if (0 == pTOverRc->iPFrameNum) {
+    pTOverRc->iLinearCmplx = ((int64_t)pWelsSvcRc->iFrameDqBits) * iQStep;
+    pTOverRc->iFrameCmplxMean = (int32_t)iFrameComplexity;
+  } else {
+    pTOverRc->iLinearCmplx = WELS_DIV_ROUND64 (((LINEAR_MODEL_DECAY_FACTOR) * (int64_t)pTOverRc->iLinearCmplx
+                             + (INT_MULTIPLY - LINEAR_MODEL_DECAY_FACTOR) * ((int64_t)pWelsSvcRc->iFrameDqBits * iQStep)),
+                             INT_MULTIPLY);
+    pTOverRc->iFrameCmplxMean = WELS_DIV_ROUND64 (((LINEAR_MODEL_DECAY_FACTOR) * static_cast<int64_t>
+                                (pTOverRc->iFrameCmplxMean)
+                                + (INT_MULTIPLY - LINEAR_MODEL_DECAY_FACTOR) * iFrameComplexity),
+                                INT_MULTIPLY);
+  }
+
+
+  pTOverRc->iPFrameNum++;
+  if (pTOverRc->iPFrameNum > 255)
+    pTOverRc->iPFrameNum = 255;
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "RcUpdateFrameComplexity iFrameDqBits = %d,iQStep= %d,pWelsSvcRc->iQStep= %d,pTOverRc->iLinearCmplx = %" PRId64,
+           pWelsSvcRc->iFrameDqBits,
+           iQStep, pWelsSvcRc->iQStep, pTOverRc->iLinearCmplx);
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, "iFrameCmplxMean = %" PRId64 ",iFrameComplexity = %" PRId64,
+           pTOverRc->iFrameCmplxMean, iFrameComplexity);
+}
+
+int32_t RcCalculateCascadingQp (struct TagWelsEncCtx* pEncCtx, int32_t iQp) {
+  int32_t iTemporalQp = 0;
+  if (pEncCtx->pSvcParam->iDecompStages) {
+    if (pEncCtx->uiTemporalId == 0)
+      iTemporalQp = iQp - 3 - (pEncCtx->pSvcParam->iDecompStages - 1);
+    else
+      iTemporalQp = iQp - (pEncCtx->pSvcParam->iDecompStages - pEncCtx->uiTemporalId);
+    iTemporalQp = WELS_CLIP3 (iTemporalQp, 1, 51);
+  } else
+    iTemporalQp = iQp;
+  return iTemporalQp;
+}
+
+void  WelsRcPictureInitGom (sWelsEncCtx* pEncCtx, long long uiTimeStamp) {
+  SWelsSvcRc* pWelsSvcRc           = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  const int32_t kiSliceNum         = pEncCtx->pCurDqLayer->iMaxSliceNum;
+  pWelsSvcRc->iContinualSkipFrames = 0;
+
+  if (pEncCtx->eSliceType == I_SLICE) {
+    if (0 == pWelsSvcRc->iIdrNum) { //iIdrNum == 0 means encoder has been initialed
+      RcInitRefreshParameter (pEncCtx);
+    }
+  }
+  if (RcJudgeBitrateFpsUpdate (pEncCtx)) {
+    RcUpdateBitrateFps (pEncCtx);
+  }
+  if (pEncCtx->uiTemporalId == 0) {
+    RcUpdateTemporalZero (pEncCtx);
+  }
+  if (pEncCtx->pSvcParam->iRCMode == RC_TIMESTAMP_MODE) {
+    RcDecideTargetBitsTimestamp (pEncCtx);
+    pWelsSvcRc->uiLastTimeStamp = uiTimeStamp;
+  } else {
+    RcDecideTargetBits (pEncCtx);
+  }
+  //turn off GOM QP when slicenum is larger 1
+  if ((kiSliceNum > 1) || ((pEncCtx->pSvcParam->iRCMode == RC_BITRATE_MODE)
+                           && (pEncCtx->eSliceType == I_SLICE))) {
+    pWelsSvcRc->bEnableGomQp = false;
+  } else
+    pWelsSvcRc->bEnableGomQp = true;
+
+  //decide globe_qp
+  if (pEncCtx->eSliceType == I_SLICE) {
+    RcCalculateIdrQp (pEncCtx);
+  } else {
+    RcCalculatePictureQp (pEncCtx);
+  }
+  RcInitSliceInformation (pEncCtx);
+  RcInitGomParameters (pEncCtx);
+}
+
+void  WelsRcPictureInfoUpdateGom (sWelsEncCtx* pEncCtx, int32_t iLayerSize) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  int32_t iCodedBits = (iLayerSize << 3);
+
+  RcUpdatePictureQpBits (pEncCtx, iCodedBits);
+
+  if (pEncCtx->eSliceType == P_SLICE) {
+    RcUpdateFrameComplexity (pEncCtx);
+  } else {
+    RcUpdateIntraComplexity (pEncCtx);
+  }
+  pWelsSvcRc->iRemainingBits -= pWelsSvcRc->iFrameDqBits;
+
+  if (pEncCtx->pSvcParam->bEnableFrameSkip /*&&
+      pEncCtx->uiDependencyId == pEncCtx->pSvcParam->iSpatialLayerNum - 1*/) {
+    RcVBufferCalculationSkip (pEncCtx);
+  }
+
+  if (pEncCtx->pSvcParam->iPaddingFlag)
+    RcVBufferCalculationPadding (pEncCtx);
+  pWelsSvcRc->iFrameCodedInVGop++;
+}
+
+void WelsRcMbInitGom (sWelsEncCtx* pEncCtx, SMB* pCurMb, SSlice* pSlice) {
+  SWelsSvcRc* pWelsSvcRc        = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCSlicing* pSOverRc          = &pSlice->sSlicingOverRc;
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+
+  pSOverRc->iBsPosSlice = pEncCtx->pFuncList->pfGetBsPosition (pSlice);
+  if (pWelsSvcRc->bEnableGomQp) {
+    //calculate gom qp and target bits at the beginning of gom
+    if (0 == (pCurMb->iMbXY % pWelsSvcRc->iNumberMbGom)) {
+      if (pCurMb->iMbXY != pSOverRc->iStartMbSlice) {
+        pSOverRc->iComplexityIndexSlice++;
+        RcCalculateGomQp (pEncCtx, pSlice, pCurMb);
+      }
+      RcGomTargetBits (pEncCtx, pSlice);
+    }
+
+    RcCalculateMbQp (pEncCtx, pSlice, pCurMb);
+  } else {
+    pCurMb->uiLumaQp   = pEncCtx->iGlobalQp;
+    pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];
+  }
+
+}
+
+void WelsRcMbInfoUpdateGom (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iCostLuma, SSlice* pSlice) {
+  SWelsSvcRc* pWelsSvcRc            = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SRCSlicing* pSOverRc              = &pSlice->sSlicingOverRc;
+  const int32_t kiComplexityIndex   = pSOverRc->iComplexityIndexSlice;
+
+  int32_t iCurMbBits = pEncCtx->pFuncList->pfGetBsPosition (pSlice) - pSOverRc->iBsPosSlice;
+  pSOverRc->iFrameBitsSlice += iCurMbBits;
+  pSOverRc->iGomBitsSlice += iCurMbBits;
+
+  pWelsSvcRc->pGomCost[kiComplexityIndex] += iCostLuma;
+  if (iCurMbBits > 0) {
+    pSOverRc->iTotalQpSlice += pCurMb->uiLumaQp;
+    pSOverRc->iTotalMbSlice++;
+  }
+}
+
+void  WelsRcPictureInitDisable (sWelsEncCtx* pEncCtx, long long uiTimeStamp) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SSpatialLayerConfig* pDLayerParam = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+  const int32_t kiQp = pDLayerParam->iDLayerQp;
+
+  pEncCtx->iGlobalQp = RcCalculateCascadingQp (pEncCtx, kiQp);
+
+  if (pEncCtx->pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE)) {
+    pEncCtx->iGlobalQp = WELS_CLIP3 ((pEncCtx->iGlobalQp * INT_MULTIPLY -
+                                      pEncCtx->pVaa->sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp) / INT_MULTIPLY, pWelsSvcRc->iMinQp,
+                                     pWelsSvcRc->iMaxQp);
+  } else {
+    pEncCtx->iGlobalQp = WELS_CLIP3 (pEncCtx->iGlobalQp, 0, 51);
+  }
+
+  pWelsSvcRc->iAverageFrameQp = pEncCtx->iGlobalQp;
+}
+
+void  WelsRcPictureInfoUpdateDisable (sWelsEncCtx* pEncCtx, int32_t iLayerSize) {
+}
+
+void  WelsRcMbInitDisable (sWelsEncCtx* pEncCtx, SMB* pCurMb, SSlice* pSlice) {
+  int32_t iLumaQp = pEncCtx->iGlobalQp;
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
+
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+
+
+  if (pEncCtx->pSvcParam->bEnableAdaptiveQuant && (pEncCtx->eSliceType == P_SLICE)) {
+    iLumaQp   = (int8_t)WELS_CLIP3 (iLumaQp +
+                                    pEncCtx->pVaa->sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp[pCurMb->iMbXY], pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+  } else {
+    iLumaQp = WELS_CLIP3 (iLumaQp, 0, 51);
+  }
+  pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (iLumaQp + kuiChromaQpIndexOffset)];
+  pCurMb->uiLumaQp = iLumaQp;
+}
+
+void  WelsRcMbInfoUpdateDisable (sWelsEncCtx* pEncCtx, SMB* pCurMb, int32_t iCostLuma, SSlice* pSlice) {
+}
+
+void WelRcPictureInitBufferBasedQp (sWelsEncCtx* pEncCtx, long long uiTimeStamp) {
+
+  SVAAFrameInfo* pVaa = static_cast<SVAAFrameInfo*> (pEncCtx->pVaa);
+  SWelsSvcRc* pWelsSvcRc =  &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+
+  int32_t iMinQp = pEncCtx->pSvcParam->iMinQp;
+  if (pVaa->eSceneChangeIdc == LARGE_CHANGED_SCENE)
+    iMinQp += 2;
+  else if (pVaa->eSceneChangeIdc == MEDIUM_CHANGED_SCENE)
+    iMinQp += 1;
+  if (pEncCtx->bDeliveryFlag)
+    pEncCtx->iGlobalQp -= 1;
+  else
+    pEncCtx->iGlobalQp += 2;
+  pEncCtx->iGlobalQp = WELS_CLIP3 (pEncCtx->iGlobalQp, iMinQp, pWelsSvcRc->iMaxQp);
+  pWelsSvcRc->iAverageFrameQp = pWelsSvcRc->iMaxFrameQp = pWelsSvcRc->iMinFrameQp = pEncCtx->iGlobalQp;
+}
+void WelRcPictureInitScc (sWelsEncCtx* pEncCtx, long long uiTimeStamp) {
+  SWelsSvcRc* pWelsSvcRc =  &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+  SSpatialLayerConfig* pDLayerConfig   = &pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId];
+  SSpatialLayerInternal* pDLayerParamInternal       = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  int64_t iFrameCplx = pVaa->sComplexityScreenParam.iFrameComplexity;
+  int32_t iBitRate = pDLayerConfig->iSpatialBitrate;// pEncCtx->pSvcParam->target_bitrate;
+
+  int32_t iBaseQp = pWelsSvcRc->iBaseQp;
+  pEncCtx->iGlobalQp = iBaseQp;
+  int32_t iDeltaQp = 0;
+  if (pEncCtx->eSliceType == I_SLICE) {
+    int64_t iTargetBits = iBitRate * 2 - pWelsSvcRc->iBufferFullnessSkip;
+    iTargetBits = WELS_MAX (1, iTargetBits);
+    int32_t iQstep = WELS_DIV_ROUND (iFrameCplx * pWelsSvcRc->iCost2BitsIntra, iTargetBits);
+    int32_t iQp = RcConvertQStep2Qp (iQstep);
+
+    pEncCtx->iGlobalQp = WELS_CLIP3 (iQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+  } else {
+    int64_t iTargetBits = WELS_ROUND (((float)iBitRate / pDLayerParamInternal->fOutputFrameRate)); //iBitRate / 10;
+    int32_t iQstep = WELS_DIV_ROUND (iFrameCplx * pWelsSvcRc->iAvgCost2Bits, iTargetBits);
+    int32_t iQp = RcConvertQStep2Qp (iQstep);
+    iDeltaQp = iQp - iBaseQp;
+    if (pWelsSvcRc->iBufferFullnessSkip > iBitRate) {
+      if (iDeltaQp > 0) {
+        ++iBaseQp;
+      }
+    } else if (pWelsSvcRc->iBufferFullnessSkip == 0) {
+      if (iDeltaQp < 0) {
+        --iBaseQp;
+      }
+    }
+    if (iDeltaQp >= 6) {
+      iBaseQp += 3;
+    } else if ((iDeltaQp <= -6)) {
+      --iBaseQp;
+    }
+    iBaseQp = WELS_CLIP3 (iBaseQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMinQp);
+
+    pEncCtx->iGlobalQp = iBaseQp;
+
+
+    if (iDeltaQp < -6) {
+      pEncCtx->iGlobalQp = WELS_CLIP3 (pWelsSvcRc->iBaseQp - 6, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+    }
+
+    if (iDeltaQp > 5) {
+      if (LARGE_CHANGED_SCENE == pEncCtx->pVaa->eSceneChangeIdc || pWelsSvcRc->iBufferFullnessSkip > 2 * iBitRate
+          || iDeltaQp > 10) {
+        pEncCtx->iGlobalQp = WELS_CLIP3 (pWelsSvcRc->iBaseQp + iDeltaQp, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+      } else if (MEDIUM_CHANGED_SCENE == pEncCtx->pVaa->eSceneChangeIdc || pWelsSvcRc->iBufferFullnessSkip > iBitRate) {
+        pEncCtx->iGlobalQp = WELS_CLIP3 (pWelsSvcRc->iBaseQp + 5, pWelsSvcRc->iMinQp, pWelsSvcRc->iMaxQp);
+      }
+    }
+    pWelsSvcRc->iBaseQp = iBaseQp;
+  }
+  pWelsSvcRc->iAverageFrameQp = pEncCtx->iGlobalQp;
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, "WelRcPictureInitScc iLumaQp = %d\n", pEncCtx->iGlobalQp);
+  pWelsSvcRc->uiLastTimeStamp = uiTimeStamp;
+
+}
+void WelsRcDropFrameUpdate (sWelsEncCtx* pEncCtx, uint32_t iDropSize) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[0];
+
+  pWelsSvcRc->iBufferFullnessSkip -= (int32_t)iDropSize;
+  pWelsSvcRc->iBufferFullnessSkip = WELS_MAX (0, pWelsSvcRc->iBufferFullnessSkip);
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG, "[WelsRcDropFrameUpdate:\tdrop:%d\t%" PRId64 "\n", iDropSize,
+           pWelsSvcRc->iBufferFullnessSkip);
+}
+
+void WelsRcPictureInfoUpdateScc (sWelsEncCtx* pEncCtx, int32_t iNalSize) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  int32_t iFrameBits = (iNalSize << 3);
+  pWelsSvcRc->iBufferFullnessSkip += iFrameBits;
+
+  SVAAFrameInfoExt* pVaa = static_cast<SVAAFrameInfoExt*> (pEncCtx->pVaa);
+
+  int32_t iQstep = RcConvertQp2QStep (pEncCtx->iGlobalQp);
+  int64_t iCost2Bits = WELS_DIV_ROUND64 ((((int64_t)iFrameBits * iQstep)), pVaa->sComplexityScreenParam.iFrameComplexity);
+
+  if (pEncCtx->eSliceType == P_SLICE) {
+    pWelsSvcRc->iAvgCost2Bits = WELS_DIV_ROUND64 ((95 * pWelsSvcRc->iAvgCost2Bits + 5 * iCost2Bits), INT_MULTIPLY);
+  } else {
+    pWelsSvcRc->iCost2BitsIntra = WELS_DIV_ROUND64 ((90 * pWelsSvcRc->iCost2BitsIntra + 10 * iCost2Bits), INT_MULTIPLY);
+  }
+}
+
+
+void WelsRcMbInitScc (sWelsEncCtx* pEncCtx, SMB* pCurMb, SSlice* pSlice) {
+  /* Get delta iQp of this MB */
+  pCurMb->uiLumaQp = pEncCtx->iGlobalQp;
+  pCurMb->uiChromaQp = g_kuiChromaQpTable[WELS_CLIP3 (pCurMb->uiLumaQp + pEncCtx->pPps->uiChromaQpIndexOffset, 0, 51)];
+}
+
+void WelsRcFrameDelayJudgeTimeStamp (sWelsEncCtx* pEncCtx, long long uiTimeStamp, int32_t iDidIdx) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[iDidIdx];
+  SSpatialLayerConfig* pDLayerConfig   = &pEncCtx->pSvcParam->sSpatialLayers[iDidIdx];
+
+  int32_t iBitRate = pDLayerConfig->iSpatialBitrate;
+  int32_t iEncTimeInv = (pWelsSvcRc->uiLastTimeStamp == 0) ? 0 : (int32_t) (uiTimeStamp - pWelsSvcRc->uiLastTimeStamp);
+  if ((iEncTimeInv < 0) || (iEncTimeInv > 1000)) {
+    iEncTimeInv = (int32_t) (1000.0 / pDLayerConfig->fFrameRate);
+    pWelsSvcRc->uiLastTimeStamp = uiTimeStamp - iEncTimeInv;
+  }
+  int32_t iSentBits  = (int32_t) ((double)iBitRate * iEncTimeInv * (1.0E-3) + 0.5);
+  iSentBits = WELS_MAX (iSentBits, 0);
+
+  //When bitrate is changed, pBuffer size should be updated
+  pWelsSvcRc->iBufferSizeSkip = WELS_DIV_ROUND (pDLayerConfig->iSpatialBitrate * pWelsSvcRc->iSkipBufferRatio,
+                                INT_MULTIPLY);
+  pWelsSvcRc->iBufferSizePadding = WELS_DIV_ROUND (pDLayerConfig->iSpatialBitrate * PADDING_BUFFER_RATIO, INT_MULTIPLY);
+
+  pWelsSvcRc->iBufferFullnessSkip -= iSentBits;
+  pWelsSvcRc->iBufferFullnessSkip = WELS_MAX ((-1) * (pDLayerConfig->iSpatialBitrate / 4),
+                                    pWelsSvcRc->iBufferFullnessSkip);
+
+  if (pEncCtx->pSvcParam->bEnableFrameSkip) {
+    pWelsSvcRc->bSkipFlag = true;
+    if (pWelsSvcRc->iBufferFullnessSkip < pWelsSvcRc->iBufferSizeSkip) {
+      pWelsSvcRc->bSkipFlag = false;
+    }
+    if (pWelsSvcRc->bSkipFlag) {
+      pWelsSvcRc->iSkipFrameNum++;
+      pWelsSvcRc->uiLastTimeStamp = uiTimeStamp;
+    }
+  }
+  WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_DEBUG,
+           "WelsRcFrameDelayJudgeTimeStamp iDidIdx = %d,iSkipFrameNum = %d,buffer = %" PRId64
+           ",threadhold = %d,bitrate = %d,iSentBits = %d,lasttimestamp = %lld,timestamp=%lld", iDidIdx,
+           pWelsSvcRc->iSkipFrameNum, pWelsSvcRc->iBufferFullnessSkip, pWelsSvcRc->iBufferSizeSkip, iBitRate, iSentBits,
+           pWelsSvcRc->uiLastTimeStamp, uiTimeStamp);
+}
+
+void  WelsRcPictureInfoUpdateGomTimeStamp (sWelsEncCtx* pEncCtx, int32_t iLayerSize) {
+  SWelsSvcRc* pWelsSvcRc = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  int32_t iCodedBits = (iLayerSize << 3);
+
+  RcUpdatePictureQpBits (pEncCtx, iCodedBits);
+  if (pEncCtx->eSliceType == P_SLICE) {
+    RcUpdateFrameComplexity (pEncCtx);
+  } else {
+    RcUpdateIntraComplexity (pEncCtx);
+  }
+
+  pWelsSvcRc->iRemainingBits -= pWelsSvcRc->iFrameDqBits;
+  //condition 1: whole pBuffer fullness
+  pWelsSvcRc->iBufferFullnessSkip += pWelsSvcRc->iFrameDqBits;
+
+  if (pEncCtx->pSvcParam->iPaddingFlag)
+    RcVBufferCalculationPadding (pEncCtx);
+  pWelsSvcRc->iFrameCodedInVGop++;
+}
+
+void  WelsRcInitFuncPointers (sWelsEncCtx* pEncCtx, RC_MODES iRcMode) {
+  SWelsRcFunc*   pRcf = &pEncCtx->pFuncList->pfRc;
+  switch (iRcMode) {
+  case RC_OFF_MODE:
+    pRcf->pfWelsRcPictureInit = WelsRcPictureInitDisable;
+    pRcf->pfWelsRcPicDelayJudge = NULL;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateDisable;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitDisable;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateDisable;
+    pRcf->pfWelsCheckSkipBasedMaxbr = NULL;
+    pRcf->pfWelsUpdateBufferWhenSkip = NULL;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = NULL;
+    pRcf->pfWelsRcPostFrameSkipping = NULL;
+    break;
+  case RC_BUFFERBASED_MODE:
+    pRcf->pfWelsRcPictureInit = WelRcPictureInitBufferBasedQp;
+    pRcf->pfWelsRcPicDelayJudge = NULL;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateDisable;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitDisable;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateDisable;
+    pRcf->pfWelsCheckSkipBasedMaxbr = NULL;
+    pRcf->pfWelsUpdateBufferWhenSkip = NULL;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = NULL;
+    pRcf->pfWelsRcPostFrameSkipping = NULL;
+    break;
+  case RC_BITRATE_MODE:
+    pRcf->pfWelsRcPictureInit = WelsRcPictureInitGom;
+    pRcf->pfWelsRcPicDelayJudge = NULL;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateGom;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitGom;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateGom;
+    pRcf->pfWelsCheckSkipBasedMaxbr = CheckFrameSkipBasedMaxbr;
+    pRcf->pfWelsUpdateBufferWhenSkip = UpdateBufferWhenFrameSkipped;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = UpdateMaxBrCheckWindowStatus;
+    pRcf->pfWelsRcPostFrameSkipping = WelsRcPostFrameSkipping;
+    break;
+  case RC_BITRATE_MODE_POST_SKIP:
+    pRcf->pfWelsRcPictureInit = WelsRcPictureInitGom;
+    pRcf->pfWelsRcPicDelayJudge = NULL;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateGom;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitGom;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateGom;
+    pRcf->pfWelsCheckSkipBasedMaxbr = CheckFrameSkipBasedMaxbr;
+    pRcf->pfWelsUpdateBufferWhenSkip = UpdateBufferWhenFrameSkipped;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = UpdateMaxBrCheckWindowStatus;
+    pRcf->pfWelsRcPostFrameSkipping = WelsRcPostFrameSkipping;
+    break;
+  case RC_TIMESTAMP_MODE:
+
+    pRcf->pfWelsRcPictureInit = WelsRcPictureInitGom;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateGomTimeStamp;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitGom;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateGom;
+
+    pRcf->pfWelsRcPicDelayJudge = WelsRcFrameDelayJudgeTimeStamp;
+    pRcf->pfWelsCheckSkipBasedMaxbr = NULL;
+    pRcf->pfWelsUpdateBufferWhenSkip = NULL;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = NULL;
+    pRcf->pfWelsRcPostFrameSkipping = NULL;
+    break;
+  case RC_QUALITY_MODE:
+  default:
+    pRcf->pfWelsRcPictureInit = WelsRcPictureInitGom;
+    pRcf->pfWelsRcPicDelayJudge = NULL;
+    pRcf->pfWelsRcPictureInfoUpdate = WelsRcPictureInfoUpdateGom;
+    pRcf->pfWelsRcMbInit = WelsRcMbInitGom;
+    pRcf->pfWelsRcMbInfoUpdate = WelsRcMbInfoUpdateGom;
+    pRcf->pfWelsCheckSkipBasedMaxbr = CheckFrameSkipBasedMaxbr;
+    pRcf->pfWelsUpdateBufferWhenSkip = UpdateBufferWhenFrameSkipped;
+    pRcf->pfWelsUpdateMaxBrWindowStatus = UpdateMaxBrCheckWindowStatus;
+    pRcf->pfWelsRcPostFrameSkipping = NULL;
+    break;
+  }
+}
+
+void  WelsRcInitModule (sWelsEncCtx* pEncCtx, RC_MODES iRcMode) {
+  WelsRcInitFuncPointers (pEncCtx, iRcMode);
+  RcInitSequenceParameter (pEncCtx);
+}
+
+void  WelsRcFreeMemory (sWelsEncCtx* pEncCtx) {
+  SWelsSvcRc* pWelsSvcRc = NULL;
+  int32_t i = 0;
+  for (i = 0; i < pEncCtx->pSvcParam->iSpatialLayerNum; i++) {
+    pWelsSvcRc  = &pEncCtx->pWelsSvcRc[i];
+    RcFreeLayerMemory (pWelsSvcRc, pEncCtx->pMemAlign);
+  }
+}
+
+long long GetTimestampForRc (const long long uiTimeStamp, const long long uiLastTimeStamp, const float fFrameRate) {
+  if ((uiLastTimeStamp >= uiTimeStamp) || ((uiTimeStamp == 0) && (uiLastTimeStamp != -1))) {
+    return (uiLastTimeStamp + (int32_t) (1000.0 / fFrameRate));
+  }
+  return uiTimeStamp;
+}
+
+}//end of namespace
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ref_list_mgr_svc.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ref_list_mgr_svc.cpp
new file mode 100644
index 0000000000..80ba25aa83
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/ref_list_mgr_svc.cpp
@@ -0,0 +1,1077 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+// ref_list_mgr_svc.c
+#include "ref_list_mgr_svc.h"
+#include "utils.h"
+#include "picture_handle.h"
+namespace WelsEnc {
+
+#define STR_ROOM 1
+/*
+*   reset LTR marking , recovery ,feedback state to default
+*/
+void ResetLtrState (SLTRState* pLtr) {
+  pLtr->bReceivedT0LostFlag = false;
+  pLtr->iLastRecoverFrameNum = 0;
+  pLtr->iLastCorFrameNumDec = -1;
+  pLtr->iCurFrameNumInDec = -1;
+
+  // LTR mark
+  pLtr->iLTRMarkMode = LTR_DIRECT_MARK;
+  pLtr->iLTRMarkSuccessNum = 0; //successful marked num
+  pLtr->bLTRMarkingFlag = false; //decide whether current frame marked as LTR
+  pLtr->bLTRMarkEnable = false; //when LTR is confirmed and the interval is no smaller than the marking period
+  pLtr->iCurLtrIdx = 0;
+  memset (&pLtr->iLastLtrIdx , 0 , sizeof (pLtr->iLastLtrIdx)) ;
+  pLtr->uiLtrMarkInterval = 0;
+
+  // LTR mark feedback
+  pLtr->uiLtrMarkState = NO_LTR_MARKING_FEEDBACK ;
+  pLtr->iLtrMarkFbFrameNum = -1;
+}
+
+/*
+ *  reset reference picture list
+ */
+void WelsResetRefList (sWelsEncCtx* pCtx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  int32_t i;
+
+  for (i = 0; i < MAX_SHORT_REF_COUNT + 1; i++)
+    pRefList->pShortRefList[i] = NULL;
+  for (i = 0; i < pCtx->pSvcParam->iLTRRefNum + 1; i++)
+    pRefList->pLongRefList[i] = NULL;
+  for (i = 0; i < pCtx->pSvcParam->iNumRefFrame + 1; i++)
+    pRefList->pRef[i]->SetUnref();
+
+  pRefList->uiLongRefCount = 0;
+  pRefList->uiShortRefCount = 0;
+  pRefList->pNextBuffer = pRefList->pRef[0];
+}
+
+static inline void DeleteLTRFromLongList (sWelsEncCtx* pCtx, int32_t iIdx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  int32_t k ;
+
+  for (k = iIdx; k < pRefList->uiLongRefCount - 1; k++) {
+    pRefList->pLongRefList[k] = pRefList->pLongRefList[k + 1];
+  }
+  pRefList->pLongRefList[k] = NULL;
+  pRefList->uiLongRefCount--;
+
+}
+static inline void DeleteSTRFromShortList (sWelsEncCtx* pCtx, int32_t iIdx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  int32_t k ;
+
+  for (k = iIdx; k < pRefList->uiShortRefCount - 1; k++) {
+    pRefList->pShortRefList[k] = pRefList->pShortRefList[k + 1];
+  }
+  pRefList->pShortRefList[k] = NULL;
+  pRefList->uiShortRefCount--;
+
+}
+static void DeleteNonSceneLTR (sWelsEncCtx* pCtx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  for (int32_t i = 0; i < pCtx->pSvcParam->iNumRefFrame; ++i) {
+    SPicture* pRef = pRefList->pLongRefList[i];
+    if (pRef != NULL &&  pRef->bUsedAsRef && pRef->bIsLongRef && (!pRef->bIsSceneLTR) &&
+        (pCtx->uiTemporalId < pRef->uiTemporalId || pCtx->bCurFrameMarkedAsSceneLtr)) {
+      //this is our strategy to Unref all non-sceneLTR when the the current frame is sceneLTR
+      pRef->SetUnref();
+      DeleteLTRFromLongList (pCtx, i);
+      i--;
+    }
+  }
+}
+
+static inline int32_t CompareFrameNum (int32_t iFrameNumA, int32_t iFrameNumB, int32_t iMaxFrameNumPlus1) {
+  int64_t iNumA, iNumB, iDiffAB, iDiffMin;
+  if (iFrameNumA > iMaxFrameNumPlus1 || iFrameNumB > iMaxFrameNumPlus1) {
+    return -2;
+  }
+#define  WelsAbsDiffInt64(a,b) ( (a) > (b) )?( a - b ):( b - a )
+
+  iDiffAB = WelsAbsDiffInt64 ((int64_t) (iFrameNumA), (int64_t) (iFrameNumB));
+
+  iDiffMin = iDiffAB;
+  if (iDiffMin == 0) {
+    return FRAME_NUM_EQUAL;
+  }
+
+  iNumA = WelsAbsDiffInt64 ((int64_t) (iFrameNumA + iMaxFrameNumPlus1), (int64_t) (iFrameNumB));
+  if (iNumA == 0) {
+    return FRAME_NUM_EQUAL;
+  } else if (iDiffMin > iNumA) {
+    return FRAME_NUM_BIGGER;
+  }
+
+  iNumB = WelsAbsDiffInt64 ((int64_t) (iFrameNumB + iMaxFrameNumPlus1), (int64_t) (iFrameNumA));
+  if (iNumB == 0) {
+    return FRAME_NUM_EQUAL;
+  } else if (iDiffMin > iNumB) {
+    return FRAME_NUM_SMALLER;
+  }
+
+  return (iFrameNumA > iFrameNumB) ? (FRAME_NUM_BIGGER) : (FRAME_NUM_SMALLER);
+
+}
+/*
+*   delete failed mark according LTR recovery pRequest
+*/
+static inline void DeleteInvalidLTR (sWelsEncCtx* pCtx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** pLongRefList = pRefList->pLongRefList;
+  SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
+  int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
+  int32_t i;
+  SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+
+  for (i = 0; i < LONG_TERM_REF_NUM; i++) {
+    if (pLongRefList[i] != NULL) {
+      if (CompareFrameNum (pLongRefList[i]->iFrameNum , pLtr->iLastCorFrameNumDec, iMaxFrameNumPlus1) == FRAME_NUM_BIGGER
+          && (CompareFrameNum (pLongRefList[i]->iFrameNum , pLtr->iCurFrameNumInDec,
+                               iMaxFrameNumPlus1) & (FRAME_NUM_EQUAL | FRAME_NUM_SMALLER))) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "LTR ,invalid LTR delete ,long_term_idx = %d , iFrameNum =%d ",
+                 pLongRefList[i]->iLongTermPicNum, pLongRefList[i]->iFrameNum);
+        pLongRefList[i]->SetUnref();
+        DeleteLTRFromLongList (pCtx, i);
+        pLtr->bLTRMarkEnable = true;
+        if (pRefList->uiLongRefCount == 0) {
+          pParamInternal->bEncCurFrmAsIdrFlag = true;
+        }
+      } else if (CompareFrameNum (pLongRefList[i]->iMarkFrameNum , pLtr->iLastCorFrameNumDec ,
+                                  iMaxFrameNumPlus1) == FRAME_NUM_BIGGER
+                 && (CompareFrameNum (pLongRefList[i]->iMarkFrameNum, pLtr->iCurFrameNumInDec ,
+                                      iMaxFrameNumPlus1) & (FRAME_NUM_EQUAL | FRAME_NUM_SMALLER))
+                 && pLtr->iLTRMarkMode == LTR_DELAY_MARK) {
+        WelsLog (pLogCtx, WELS_LOG_WARNING, "LTR ,iMarkFrameNum invalid LTR delete ,long_term_idx = %d , iFrameNum =%d ",
+                 pLongRefList[i]->iLongTermPicNum, pLongRefList[i]->iFrameNum);
+        pLongRefList[i]->SetUnref();
+        DeleteLTRFromLongList (pCtx, i);
+        pLtr->bLTRMarkEnable = true;
+        if (pRefList->uiLongRefCount == 0) {
+          pParamInternal->bEncCurFrmAsIdrFlag = true;
+        }
+      }
+    }
+  }
+
+}
+/*
+*   handle LTR Mark feedback message
+*/
+static inline void HandleLTRMarkFeedback (sWelsEncCtx* pCtx) {
+  SRefList* pRefList            = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** pLongRefList       = pRefList->pLongRefList;
+  SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
+  SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  int32_t i, j;
+
+  if (pLtr->uiLtrMarkState == LTR_MARKING_SUCCESS) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING,
+             "pLtr->uiLtrMarkState = %d, pLtr.iCurLtrIdx = %d , pLtr->iLtrMarkFbFrameNum = %d ,pCtx->iFrameNum = %d ",
+             pLtr->uiLtrMarkState, pLtr->iCurLtrIdx, pLtr->iLtrMarkFbFrameNum, pParamInternal->iFrameNum);
+    for (i = 0; i < pRefList->uiLongRefCount; i++) {
+      if (pLongRefList[i]->iFrameNum == pLtr->iLtrMarkFbFrameNum && pLongRefList[i]->uiRecieveConfirmed != RECIEVE_SUCCESS) {
+
+        pLongRefList[i]->uiRecieveConfirmed = RECIEVE_SUCCESS;
+        pCtx->pVaa->uiValidLongTermPicIdx = pLongRefList[i]->iLongTermPicNum;
+
+        pLtr->iCurFrameNumInDec  =
+          pLtr->iLastRecoverFrameNum =
+            pLtr->iLastCorFrameNumDec = pLtr->iLtrMarkFbFrameNum;
+
+        for (j = 0; j < pRefList->uiLongRefCount; j++) {
+          if (pLongRefList[j]->iLongTermPicNum != pLtr->iCurLtrIdx) {
+            pLongRefList[j]->SetUnref();
+            DeleteLTRFromLongList (pCtx, j);
+          }
+        }
+
+        pLtr->iLTRMarkSuccessNum++;
+        pLtr->iCurLtrIdx = (pLtr->iCurLtrIdx + 1) % LONG_TERM_REF_NUM;
+        pLtr->iLTRMarkMode = (pLtr->iLTRMarkSuccessNum >= (LONG_TERM_REF_NUM)) ? (LTR_DELAY_MARK) : (LTR_DIRECT_MARK);
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "LTR mark mode =%d", pLtr->iLTRMarkMode);
+        pLtr->bLTRMarkEnable = true;
+        break;
+      }
+    }
+    pLtr->uiLtrMarkState = NO_LTR_MARKING_FEEDBACK;
+  } else if (pLtr->uiLtrMarkState == LTR_MARKING_FAILED) {
+    for (i = 0; i < pRefList->uiLongRefCount; i++) {
+      if (pLongRefList[i]->iFrameNum == pLtr->iLtrMarkFbFrameNum) {
+        pLongRefList[i]->SetUnref();
+        DeleteLTRFromLongList (pCtx, i);
+        break;
+      }
+    }
+    pLtr->uiLtrMarkState = NO_LTR_MARKING_FEEDBACK;
+    pLtr->bLTRMarkEnable = true;
+
+    if (pLtr->iLTRMarkSuccessNum == 0) {
+      pParamInternal->bEncCurFrmAsIdrFlag = true; // no LTR , means IDR recieve failed, force next frame IDR
+    }
+  }
+}
+/*
+ *  LTR mark process
+ */
+static inline void LTRMarkProcess (sWelsEncCtx* pCtx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** pLongRefList = pRefList->pLongRefList;
+  SPicture** pShortRefList = pRefList->pShortRefList;
+  SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
+  int32_t iGoPFrameNumInterval = ((pCtx->pSvcParam->uiGopSize >> 1) > 1) ? (pCtx->pSvcParam->uiGopSize >> 1) : (1);
+  int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
+  int32_t i = 0;
+  int32_t j = 0;
+  bool bMoveLtrFromShortToLong = false;
+  SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+
+  if (pCtx->eSliceType == I_SLICE) {
+    i = 0;
+    pShortRefList[i]->uiRecieveConfirmed = RECIEVE_SUCCESS;
+  } else if (pLtr->bLTRMarkingFlag) {
+    pCtx->pVaa->uiMarkLongTermPicIdx = pLtr->iCurLtrIdx;
+
+    if (pLtr->iLTRMarkMode == LTR_DELAY_MARK) {
+      for (i = 0; i < pRefList->uiShortRefCount; i++) {
+        if (CompareFrameNum (pParamInternal->iFrameNum, pShortRefList[i]->iFrameNum + iGoPFrameNumInterval,
+                             iMaxFrameNumPlus1) == FRAME_NUM_EQUAL) {
+          break;
+        }
+      }
+    }
+  }
+
+  if (pCtx->eSliceType == I_SLICE || pLtr->bLTRMarkingFlag) {
+    pShortRefList[i]->bIsLongRef = true;
+    pShortRefList[i]->iLongTermPicNum = pLtr->iCurLtrIdx;
+    pShortRefList[i]->iMarkFrameNum = pParamInternal->iFrameNum;
+  }
+
+  // delay one gop to move LTR from int16_t list to int32_t list
+  if (pLtr->iLTRMarkMode == LTR_DIRECT_MARK && pCtx->eSliceType != I_SLICE && !pLtr->bLTRMarkingFlag) {
+    for (j = 0; j < pRefList->uiShortRefCount; j++) {
+      if (pRefList->pShortRefList[j]->bIsLongRef) {
+        i = j;
+        bMoveLtrFromShortToLong = true;
+        break;
+      }
+    }
+  }
+
+  if ((pLtr->iLTRMarkMode == LTR_DELAY_MARK && pLtr->bLTRMarkingFlag)
+      || ((pLtr->iLTRMarkMode == LTR_DIRECT_MARK) && (bMoveLtrFromShortToLong))) {
+    pCtx->bRefOfCurTidIsLtr[pCtx->uiDependencyId][pCtx->uiTemporalId] = true;
+
+    if (pRefList->uiLongRefCount > 0) {
+      memmove (&pRefList->pLongRefList[1], &pRefList->pLongRefList[0],
+               pRefList->uiLongRefCount * sizeof (SPicture*)); // confirmed_safe_unsafe_usage
+    }
+    pLongRefList[0] = pShortRefList[i];
+    pRefList->uiLongRefCount++;
+    if (pRefList->uiLongRefCount > pCtx->pSvcParam->iLTRRefNum) {
+      pRefList->pLongRefList[pRefList->uiLongRefCount - 1]->SetUnref();
+      DeleteLTRFromLongList (pCtx, pRefList->uiLongRefCount - 1);
+    }
+    DeleteSTRFromShortList (pCtx, i);
+  }
+}
+
+static inline void LTRMarkProcessScreen (sWelsEncCtx* pCtx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** pLongRefList = pRefList->pLongRefList;
+  int32_t iLtrIdx =  pCtx->pDecPic->iLongTermPicNum;
+  pCtx->pVaa->uiMarkLongTermPicIdx = pCtx->pDecPic->iLongTermPicNum;
+
+  assert (CheckInRangeCloseOpen (iLtrIdx, 0, MAX_REF_PIC_COUNT));
+  if (pLongRefList[iLtrIdx] != NULL) {
+    pLongRefList[iLtrIdx]->SetUnref();
+  } else {
+    pRefList->uiLongRefCount++;
+  }
+  pLongRefList[iLtrIdx] = pCtx->pDecPic;
+}
+
+static void PrefetchNextBuffer (sWelsEncCtx* pCtx) {
+  SRefList* pRefList            = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  const int32_t kiNumRef        = pCtx->pSvcParam->iNumRefFrame;
+  int32_t i;
+
+  pRefList->pNextBuffer = NULL;
+  for (i = 0; i < kiNumRef + 1; i++) {
+    if (!pRefList->pRef[i]->bUsedAsRef) {
+      pRefList->pNextBuffer = pRefList->pRef[i];
+      break;
+    }
+  }
+
+  if (pRefList->pNextBuffer == NULL && pRefList->uiShortRefCount > 0) {
+    pRefList->pNextBuffer = pRefList->pShortRefList[pRefList->uiShortRefCount - 1];
+    pRefList->pNextBuffer->SetUnref();
+  }
+
+  pCtx->pDecPic = pRefList->pNextBuffer;
+}
+
+/*
+ *  update reference picture list
+ */
+bool WelsUpdateRefList (sWelsEncCtx* pCtx) {
+  SRefList* pRefList                = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SLTRState* pLtr                   = &pCtx->pLtr[pCtx->uiDependencyId];
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+
+  int32_t iRefIdx                   = 0;
+  const uint8_t kuiTid              = pCtx->uiTemporalId;
+  const uint8_t kuiDid              = pCtx->uiDependencyId;
+  const EWelsSliceType keSliceType  = pCtx->eSliceType;
+  uint32_t i = 0;
+  // Need update pRef list in case store base layer or target dependency layer construction
+  if (NULL == pCtx->pCurDqLayer)
+    return false;
+
+  if (NULL == pRefList || NULL == pRefList->pRef[0])
+    return false;
+
+  if (NULL != pCtx->pDecPic) {
+#if !defined(ENABLE_FRAME_DUMP) // to save complexity, 1/6/2009
+    if ((pParamD->iHighestTemporalId == 0) || (kuiTid < pParamD->iHighestTemporalId))
+#endif// !ENABLE_FRAME_DUMP
+      // Expanding picture for future reference
+      ExpandReferencingPicture (pCtx->pDecPic->pData, pCtx->pDecPic->iWidthInPixel, pCtx->pDecPic->iHeightInPixel,
+                                pCtx->pDecPic->iLineSize,
+                                pCtx->pFuncList->sExpandPicFunc.pfExpandLumaPicture, pCtx->pFuncList->sExpandPicFunc.pfExpandChromaPicture);
+
+    // move picture in list
+    pCtx->pDecPic->uiTemporalId = kuiTid;
+    pCtx->pDecPic->uiSpatialId  = kuiDid;
+    pCtx->pDecPic->iFrameNum    = pParamD->iFrameNum;
+    pCtx->pDecPic->iFramePoc    = pParamD->iPOC;
+    pCtx->pDecPic->uiRecieveConfirmed = RECIEVE_UNKOWN;
+    pCtx->pDecPic->bUsedAsRef   = true;
+
+    for (iRefIdx = pRefList->uiShortRefCount - 1; iRefIdx >= 0; --iRefIdx) {
+      pRefList->pShortRefList[iRefIdx + 1] = pRefList->pShortRefList[iRefIdx];
+    }
+    pRefList->pShortRefList[0] = pCtx->pDecPic;
+    pRefList->uiShortRefCount++;
+  }
+
+  if (keSliceType == P_SLICE) {
+    if (pCtx->uiTemporalId == 0) {
+      if (pCtx->pSvcParam->bEnableLongTermReference) {
+        LTRMarkProcess (pCtx);
+        DeleteInvalidLTR (pCtx);
+        HandleLTRMarkFeedback (pCtx);
+
+        pLtr->bReceivedT0LostFlag = false; // reset to false due to the recovery is finished
+        pLtr->bLTRMarkingFlag = false;
+        ++pLtr->uiLtrMarkInterval;
+      }
+
+      for (i = pRefList->uiShortRefCount - 1; i > 0; i--) {
+        pRefList->pShortRefList[i]->SetUnref();
+        DeleteSTRFromShortList (pCtx, i);
+      }
+      if (pRefList->uiShortRefCount > 0 && (pRefList->pShortRefList[0]->uiTemporalId > 0
+                                            || pRefList->pShortRefList[0]->iFrameNum != pParamD->iFrameNum)) {
+        pRefList->pShortRefList[0]->SetUnref();
+        DeleteSTRFromShortList (pCtx, 0);
+      }
+    }
+  } else { // in case IDR currently coding
+    if (pCtx->pSvcParam->bEnableLongTermReference) {
+      LTRMarkProcess (pCtx);
+
+      pLtr->iCurLtrIdx = (pLtr->iCurLtrIdx + 1) % LONG_TERM_REF_NUM;
+      pLtr->iLTRMarkSuccessNum = 1; //IDR default suceess
+      pLtr->bLTRMarkEnable =  true;
+      pLtr->uiLtrMarkInterval = 0;
+
+      pCtx->pVaa->uiValidLongTermPicIdx = 0;
+      pCtx->pVaa->uiMarkLongTermPicIdx = 0;
+    }
+  }
+  pCtx->pReferenceStrategy->EndofUpdateRefList();
+  return true;
+}
+
+bool CheckCurMarkFrameNumUsed (sWelsEncCtx* pCtx) {
+  SLTRState* pLtr = &pCtx->pLtr[pCtx->uiDependencyId];
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** pLongRefList = pRefList->pLongRefList;
+  int32_t iGoPFrameNumInterval = ((pCtx->pSvcParam->uiGopSize >> 1) > 1) ? (pCtx->pSvcParam->uiGopSize >> 1) : (1);
+  int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
+  SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  int32_t i;
+
+  for (i = 0; i < pRefList->uiLongRefCount; i++) {
+    if ((pParamInternal->iFrameNum == pLongRefList[i]->iFrameNum && pLtr->iLTRMarkMode == LTR_DIRECT_MARK) ||
+        (CompareFrameNum (pParamInternal->iFrameNum + iGoPFrameNumInterval, pLongRefList[i]->iFrameNum,
+                          iMaxFrameNumPlus1) == FRAME_NUM_EQUAL  && pLtr->iLTRMarkMode == LTR_DELAY_MARK)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+static inline void WelsMarkMMCORefInfoWithBase (SSlice** ppSliceList,
+    SSlice* pBaseSlice,
+    const int32_t kiCountSliceNum) {
+  int32_t iSliceIdx = 0;
+  SSliceHeaderExt* pSliceHdrExt = NULL;
+  SSliceHeaderExt* pBaseSHExt   = &pBaseSlice->sSliceHeaderExt;
+
+  for (iSliceIdx = 0; iSliceIdx < kiCountSliceNum; iSliceIdx++) {
+    pSliceHdrExt = &ppSliceList[iSliceIdx]->sSliceHeaderExt;
+    memcpy (&pSliceHdrExt->sSliceHeader.sRefMarking, &pBaseSHExt->sSliceHeader.sRefMarking, sizeof (SRefPicMarking));
+  }
+}
+
+void WelsMarkMMCORefInfo (sWelsEncCtx* pCtx, SLTRState* pLtr,
+                          SSlice** ppSliceList, const int32_t kiCountSliceNum) {
+  SSlice* pBaseSlice            = ppSliceList[0];
+  SRefPicMarking* pRefPicMark   = &pBaseSlice->sSliceHeaderExt.sSliceHeader.sRefMarking;
+  int32_t iGoPFrameNumInterval  = ((pCtx->pSvcParam->uiGopSize >> 1) > 1) ? (pCtx->pSvcParam->uiGopSize >> 1) : (1);
+
+  memset (pRefPicMark, 0, sizeof (SRefPicMarking));
+
+  if (pCtx->pSvcParam->bEnableLongTermReference && pLtr->bLTRMarkingFlag) {
+    if (pLtr->iLTRMarkMode == LTR_DIRECT_MARK) {
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iMaxLongTermFrameIdx = LONG_TERM_REF_NUM - 1;
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_SET_MAX_LONG;
+
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iDiffOfPicNum = iGoPFrameNumInterval;
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_SHORT2UNUSED;
+
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iLongTermFrameIdx = pLtr->iCurLtrIdx;
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_LONG;
+    } else if (pLtr->iLTRMarkMode == LTR_DELAY_MARK) {
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iDiffOfPicNum = iGoPFrameNumInterval;
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iLongTermFrameIdx = pLtr->iCurLtrIdx;
+      pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_SHORT2LONG;
+    }
+  }
+
+  WelsMarkMMCORefInfoWithBase (ppSliceList, pBaseSlice, kiCountSliceNum);
+}
+
+void WelsMarkPic (sWelsEncCtx* pCtx) {
+  SLTRState* pLtr               = &pCtx->pLtr[pCtx->uiDependencyId];
+  const int32_t kiCountSliceNum = pCtx->pCurDqLayer->iMaxSliceNum;
+
+  if (pCtx->pSvcParam->bEnableLongTermReference && pLtr->bLTRMarkEnable && pCtx->uiTemporalId == 0) {
+    if (!pLtr->bReceivedT0LostFlag && pLtr->uiLtrMarkInterval > pCtx->pSvcParam->iLtrMarkPeriod
+        && CheckCurMarkFrameNumUsed (pCtx)) {
+      pLtr->bLTRMarkingFlag = true;
+      pLtr->bLTRMarkEnable = false;
+      pLtr->uiLtrMarkInterval = 0;
+      for (int32_t i = 0 ; i < MAX_TEMPORAL_LAYER_NUM; ++i) {
+        if (pCtx->uiTemporalId < i || pCtx->uiTemporalId == 0) {
+          pLtr->iLastLtrIdx[i] = pLtr->iCurLtrIdx;
+        }
+      }
+    } else {
+      pLtr->bLTRMarkingFlag = false;
+    }
+  }
+
+  WelsMarkMMCORefInfo (pCtx, pLtr, pCtx->pCurDqLayer->ppSliceInLayer, kiCountSliceNum);
+}
+
+int32_t FilterLTRRecoveryRequest (sWelsEncCtx* pCtx, SLTRRecoverRequest* pLTRRecoverRequest) {
+  //if disable LTR, force IDR
+  if (!pCtx->pSvcParam->bEnableLongTermReference) {
+    for (int32_t iDid = 0; iDid < pCtx->pSvcParam->iSpatialLayerNum; iDid++) {
+      SSpatialLayerInternal* pParamInternal = &pCtx->pSvcParam->sDependencyLayers[iDid];
+      pParamInternal->bEncCurFrmAsIdrFlag = true;
+    }
+  } else {
+    SLTRRecoverRequest* pRequest = pLTRRecoverRequest;
+    int32_t iLayerId = pLTRRecoverRequest->iLayerId;
+    if ((iLayerId < 0) || (iLayerId >= pCtx->pSvcParam->iSpatialLayerNum))
+      return false;
+
+    SLTRState* pLtr = &pCtx->pLtr[iLayerId];
+    int32_t iMaxFrameNumPlus1 = (1 << pCtx->pSps->uiLog2MaxFrameNum);
+    SSpatialLayerInternal* pParamInternal    = &pCtx->pSvcParam->sDependencyLayers[iLayerId];
+    if (pRequest->uiFeedbackType == LTR_RECOVERY_REQUEST &&  pRequest->uiIDRPicId == pParamInternal->uiIdrPicId) {
+      if (pRequest->iLastCorrectFrameNum == -1) {
+        pParamInternal->bEncCurFrmAsIdrFlag = true;
+        return true;
+      } else if (pRequest->iCurrentFrameNum == -1) {
+        pLtr->bReceivedT0LostFlag = true;
+        return true;
+      } else if ((CompareFrameNum (pLtr->iLastRecoverFrameNum , pRequest->iLastCorrectFrameNum,
+                                   iMaxFrameNumPlus1) & (FRAME_NUM_EQUAL | FRAME_NUM_SMALLER)) // t0 lost
+                 || ((CompareFrameNum (pLtr->iLastRecoverFrameNum , pRequest->iCurrentFrameNum,
+                                       iMaxFrameNumPlus1) & (FRAME_NUM_EQUAL | FRAME_NUM_SMALLER)) &&
+                     CompareFrameNum (pLtr->iLastRecoverFrameNum , pRequest->iLastCorrectFrameNum,
+                                      iMaxFrameNumPlus1) == FRAME_NUM_BIGGER)) { // recovery failed
+
+        pLtr->bReceivedT0LostFlag = true;
+        pLtr->iLastCorFrameNumDec = pRequest->iLastCorrectFrameNum;
+        pLtr->iCurFrameNumInDec = pRequest->iCurrentFrameNum;
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+                 "Receive valid LTR recovery pRequest,feedback_type = %d ,uiIdrPicId = %d , current_frame_num = %d , last correct frame num = %d"
+                 , pRequest->uiFeedbackType, pRequest->uiIDRPicId, pRequest->iCurrentFrameNum, pRequest->iLastCorrectFrameNum);
+      }
+
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "Receive LTR recovery pRequest,feedback_type = %d ,uiIdrPicId = %d , current_frame_num = %d , last correct frame num = %d"
+               , pRequest->uiFeedbackType, pRequest->uiIDRPicId, pRequest->iCurrentFrameNum, pRequest->iLastCorrectFrameNum);
+    }
+  }
+
+  return true;
+}
+void FilterLTRMarkingFeedback (sWelsEncCtx* pCtx, SLTRMarkingFeedback* pLTRMarkingFeedback) {
+  int32_t iLayerId = pLTRMarkingFeedback->iLayerId;
+  if ((iLayerId < 0) || (iLayerId >= pCtx->pSvcParam->iSpatialLayerNum)) {
+    return;
+  }
+  SLTRState* pLtr = &pCtx->pLtr[iLayerId];
+  assert (pLTRMarkingFeedback);
+  if (pCtx->pSvcParam->bEnableLongTermReference) {
+    SSpatialLayerInternal* pParamInternal    = &pCtx->pSvcParam->sDependencyLayers[iLayerId];
+    if (pLTRMarkingFeedback->uiIDRPicId == pParamInternal->uiIdrPicId
+        && (pLTRMarkingFeedback->uiFeedbackType == LTR_MARKING_SUCCESS
+            || pLTRMarkingFeedback->uiFeedbackType == LTR_MARKING_FAILED)) { // avoid error pData
+      pLtr->uiLtrMarkState = pLTRMarkingFeedback->uiFeedbackType;
+      pLtr->iLtrMarkFbFrameNum =  pLTRMarkingFeedback->iLTRFrameNum ;
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "Receive valid LTR marking feedback, feedback_type = %d , uiIdrPicId = %d , LTR_frame_num = %d , cur_idr_pic_id = %d",
+               pLTRMarkingFeedback->uiFeedbackType, pLTRMarkingFeedback->uiIDRPicId, pLTRMarkingFeedback->iLTRFrameNum ,
+               pParamInternal->uiIdrPicId);
+
+    } else {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+               "Receive LTR marking feedback, feedback_type = %d , uiIdrPicId = %d , LTR_frame_num = %d , cur_idr_pic_id = %d",
+               pLTRMarkingFeedback->uiFeedbackType, pLTRMarkingFeedback->uiIDRPicId, pLTRMarkingFeedback->iLTRFrameNum ,
+               pParamInternal->uiIdrPicId);
+    }
+  }
+}
+
+/*
+ *  build reference picture list
+ */
+bool WelsBuildRefList (sWelsEncCtx* pCtx, const int32_t iPOC, int32_t iBestLtrRefIdx) {
+  SRefList* pRefList            = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SLTRState* pLtr               = &pCtx->pLtr[pCtx->uiDependencyId];
+  const int32_t kiNumRef        = pCtx->pSvcParam->iNumRefFrame;
+  const uint8_t kuiTid          = pCtx->uiTemporalId;
+  uint32_t i                    = 0;
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  // to support any type of cur_dq->mgs_control
+  //    [ 0:    using current layer to do ME/MC;
+  //     -1:    using store base layer to do ME/MC;
+  //      2:    using highest layer to do ME/MC; ]
+
+  // build reference list 0/1 if applicable
+
+  pCtx->iNumRef0 = 0;
+  if (pCtx->eSliceType != I_SLICE) {
+    if (pCtx->pSvcParam->bEnableLongTermReference && pLtr->bReceivedT0LostFlag && pCtx->uiTemporalId == 0) {
+      for (i = 0; i < pRefList->uiLongRefCount; i++) {
+        if (pRefList->pLongRefList[i]->uiRecieveConfirmed == RECIEVE_SUCCESS) {
+          pCtx->pCurDqLayer->pRefOri[pCtx->iNumRef0] = pRefList->pLongRefList[i];
+          pCtx->pRefList0[pCtx->iNumRef0++] = pRefList->pLongRefList[i];
+          pLtr->iLastRecoverFrameNum = pParamD->iFrameNum;
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO,
+                   "pRef is int32_t !iLastRecoverFrameNum = %d, pRef iFrameNum = %d,LTR number = %d,",
+                   pLtr->iLastRecoverFrameNum, pCtx->pRefList0[0]->iFrameNum, pRefList->uiLongRefCount);
+          break;
+        }
+      }
+    } else {
+      for (i = 0; i < pRefList->uiShortRefCount; ++ i) {
+        SPicture* pRef = pRefList->pShortRefList[i];
+        if (pRef != NULL && pRef->bUsedAsRef && pRef->iFramePoc >= 0 && pRef->uiTemporalId <= kuiTid) {
+          pCtx->pCurDqLayer->pRefOri[pCtx->iNumRef0] = pRef;
+          pCtx->pRefList0[pCtx->iNumRef0++] = pRef;
+          WelsLog (& (pCtx->sLogCtx), WELS_LOG_DETAIL,
+                   "WelsBuildRefList pCtx->uiTemporalId = %d,pRef->iFrameNum = %d,pRef->uiTemporalId = %d",
+                   pCtx->uiTemporalId, pRef->iFrameNum, pRef->uiTemporalId);
+        }
+      }
+    }
+  } else { // safe for IDR
+    WelsResetRefList (pCtx);  //for IDR, SHOULD reset pRef list.
+    ResetLtrState (&pCtx->pLtr[pCtx->uiDependencyId]); //SHOULD update it when IDR.
+    for (int32_t k = 0; k < MAX_TEMPORAL_LEVEL; k++) {
+      pCtx->bRefOfCurTidIsLtr[pCtx->uiDependencyId][k] = false;
+    }
+    pCtx->pRefList0[0] = NULL;
+  }
+
+  if (pCtx->iNumRef0 > kiNumRef)
+    pCtx->iNumRef0 = kiNumRef;
+  return (pCtx->iNumRef0 > 0 || pCtx->eSliceType == I_SLICE) ? (true) : (false);
+}
+
+static void UpdateBlockStatic (sWelsEncCtx* pCtx) {
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+  assert (pCtx->iNumRef0 == 1); //multi-ref is not support yet?
+  for (int32_t idx = 0; idx < pCtx->iNumRef0; idx++) {
+    //TODO: we need to re-factor the source picture storage first,
+    //and then use original frame of the ref to do this calculation for better vaa algo implementation
+    SPicture* pRef = pCtx->pRefList0[idx];
+    if (pVaaExt->iVaaBestRefFrameNum != pRef->iFrameNum) {
+      //re-do the calculation
+      pCtx->pVpp->UpdateBlockIdcForScreen (pVaaExt->pVaaBestBlockStaticIdc, pRef, pCtx->pEncPic);
+    }
+  }
+}
+
+void WelsUpdateSliceHeaderSyntax (sWelsEncCtx* pCtx,  const int32_t iAbsDiffPicNumMinus1,
+                                  SSlice** ppSliceList, const int32_t uiFrameType) {
+  const int32_t kiCountSliceNum = pCtx->pCurDqLayer->iMaxSliceNum;
+  SLTRState* pLtr               = &pCtx->pLtr[pCtx->uiDependencyId];
+  int32_t iIdx = 0;
+
+  assert (kiCountSliceNum > 0);
+
+  for (iIdx = 0; iIdx < kiCountSliceNum; iIdx++) {
+    SSliceHeaderExt*    pSliceHdrExt = &ppSliceList[iIdx]->sSliceHeaderExt;
+    SSliceHeader*       pSliceHdr = &pSliceHdrExt->sSliceHeader;
+    SRefPicListReorderSyntax* pRefReorder = &pSliceHdr->sRefReordering;
+    SRefPicMarking* pRefPicMark = &pSliceHdr->sRefMarking;
+
+    /*syntax for num_ref_idx_l0_active_minus1*/
+    pSliceHdr->uiRefCount = pCtx->iNumRef0;
+    if (pCtx->iNumRef0 > 0) {
+      if ((!pCtx->pRefList0[0]->bIsLongRef) || (!pCtx->pSvcParam->bEnableLongTermReference)) {
+        pRefReorder->SReorderingSyntax[0].uiReorderingOfPicNumsIdc = 0;
+        pRefReorder->SReorderingSyntax[0].uiAbsDiffPicNumMinus1 = iAbsDiffPicNumMinus1;
+        pRefReorder->SReorderingSyntax[1].uiReorderingOfPicNumsIdc = 3;
+      } else {
+        int32_t iRefIdx = 0;
+        for (iRefIdx = 0; iRefIdx < pCtx->iNumRef0; iRefIdx++) {
+          pRefReorder->SReorderingSyntax[iRefIdx].uiReorderingOfPicNumsIdc = 2;
+          pRefReorder->SReorderingSyntax[iRefIdx].iLongTermPicNum = pCtx->pRefList0[iRefIdx]->iLongTermPicNum;
+        }
+        pRefReorder->SReorderingSyntax[iRefIdx].uiReorderingOfPicNumsIdc = 3;
+      }
+    }
+
+    /*syntax for dec_ref_pic_marking()*/
+    if (videoFrameTypeIDR == uiFrameType) {
+      pRefPicMark->bNoOutputOfPriorPicsFlag = false;
+      pRefPicMark->bLongTermRefFlag = pCtx->pSvcParam->bEnableLongTermReference;
+    } else {
+      if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
+        pRefPicMark->bAdaptiveRefPicMarkingModeFlag = pCtx->pSvcParam->bEnableLongTermReference;
+      else
+        pRefPicMark->bAdaptiveRefPicMarkingModeFlag = (pCtx->pSvcParam->bEnableLongTermReference
+            && pLtr->bLTRMarkingFlag) ? (true) : (false);
+    }
+  }
+}
+
+/*
+ *  update syntax for reference base related
+ */
+void WelsUpdateRefSyntax (sWelsEncCtx* pCtx, const int32_t iPOC, const int32_t uiFrameType) {
+  int32_t iAbsDiffPicNumMinus1   = -1;
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  /*syntax for ref_pic_list_reordering()*/
+  if (pCtx->iNumRef0 > 0) {
+    iAbsDiffPicNumMinus1 = pParamD->iFrameNum - (pCtx->pRefList0[0]->iFrameNum) - 1;
+
+    if (iAbsDiffPicNumMinus1 < 0) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "WelsUpdateRefSyntax():::uiAbsDiffPicNumMinus1:%d", iAbsDiffPicNumMinus1);
+      iAbsDiffPicNumMinus1 += (1 << (pCtx->pSps->uiLog2MaxFrameNum));
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_INFO, "WelsUpdateRefSyntax():::uiAbsDiffPicNumMinus1< 0, update as:%d",
+               iAbsDiffPicNumMinus1);
+    }
+  }
+
+  WelsUpdateSliceHeaderSyntax (pCtx, iAbsDiffPicNumMinus1, pCtx->pCurDqLayer->ppSliceInLayer, uiFrameType);
+}
+
+static inline void UpdateOriginalPicInfo (SPicture* pOrigPic, SPicture* pReconPic) {
+  if (!pOrigPic)
+    return;
+
+  pOrigPic->iPictureType = pReconPic->iPictureType;
+  pOrigPic->iFramePoc = pReconPic->iFramePoc;
+  pOrigPic->iFrameNum = pReconPic->iFrameNum;
+  pOrigPic->uiSpatialId = pReconPic->uiSpatialId;
+  pOrigPic->uiTemporalId = pReconPic->uiTemporalId;
+  pOrigPic->iLongTermPicNum = pReconPic->iLongTermPicNum;
+  pOrigPic->bUsedAsRef = pReconPic->bUsedAsRef;
+  pOrigPic->bIsLongRef = pReconPic->bIsLongRef;
+  pOrigPic->bIsSceneLTR = pReconPic->bIsSceneLTR;
+  pOrigPic->iFrameAverageQp = pReconPic->iFrameAverageQp;
+}
+
+static void UpdateSrcPicListLosslessScreenRefSelectionWithLtr (sWelsEncCtx* pCtx) {
+  int32_t iDIdx = pCtx->uiDependencyId;
+  //update info in src list
+  UpdateOriginalPicInfo (pCtx->pEncPic, pCtx->pDecPic);
+  PrefetchNextBuffer (pCtx);
+  pCtx->pVpp->UpdateSrcListLosslessScreenRefSelectionWithLtr (pCtx->pEncPic, iDIdx,  pCtx->pVaa->uiMarkLongTermPicIdx,
+      pCtx->ppRefPicListExt[iDIdx]->pLongRefList);
+}
+
+static void UpdateSrcPicList (sWelsEncCtx* pCtx) {
+  int32_t iDIdx = pCtx->uiDependencyId;
+  //update info in src list
+  UpdateOriginalPicInfo (pCtx->pEncPic, pCtx->pDecPic);
+  PrefetchNextBuffer (pCtx);
+  pCtx->pVpp->UpdateSrcList (pCtx->pEncPic, iDIdx, pCtx->ppRefPicListExt[iDIdx]->pShortRefList,
+                             pCtx->ppRefPicListExt[iDIdx]->uiShortRefCount);
+}
+
+bool WelsUpdateRefListScreen (sWelsEncCtx* pCtx) {
+  SRefList* pRefList                = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SLTRState* pLtr                   = &pCtx->pLtr[pCtx->uiDependencyId];
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  const uint8_t kuiTid              = pCtx->uiTemporalId;
+  // Need update ref list in case store base layer or target dependency layer construction
+  if (NULL == pCtx->pCurDqLayer)
+    return false;
+
+  if (NULL == pRefList || NULL == pRefList->pRef[0])
+    return false;
+
+  if (NULL != pCtx->pDecPic) {
+#if !defined(ENABLE_FRAME_DUMP) // to save complexity, 1/6/2009
+    if ((pParamD->iHighestTemporalId == 0) || (kuiTid < pParamD->iHighestTemporalId))
+#endif// !ENABLE_FRAME_DUMP
+      // Expanding picture for future reference
+      ExpandReferencingPicture (pCtx->pDecPic->pData, pCtx->pDecPic->iWidthInPixel, pCtx->pDecPic->iHeightInPixel,
+                                pCtx->pDecPic->iLineSize,
+                                pCtx->pFuncList->sExpandPicFunc.pfExpandLumaPicture, pCtx->pFuncList->sExpandPicFunc.pfExpandChromaPicture);
+
+    // move picture in list
+    pCtx->pDecPic->uiTemporalId = pCtx->uiTemporalId;
+    pCtx->pDecPic->uiSpatialId  = pCtx->uiDependencyId;
+    pCtx->pDecPic->iFrameNum    = pParamD->iFrameNum;
+    pCtx->pDecPic->iFramePoc    = pParamD->iPOC;
+    pCtx->pDecPic->bUsedAsRef   = true;
+    pCtx->pDecPic->bIsLongRef   = true;
+    pCtx->pDecPic->bIsSceneLTR  = pLtr->bLTRMarkingFlag || (pCtx->pSvcParam->bEnableLongTermReference
+                                  && pCtx->eSliceType == I_SLICE);
+    pCtx->pDecPic->iLongTermPicNum = pLtr->iCurLtrIdx;
+  }
+  if (pCtx->eSliceType == P_SLICE) {
+    DeleteNonSceneLTR (pCtx);
+    LTRMarkProcessScreen (pCtx);
+    pLtr->bLTRMarkingFlag = false;
+    ++pLtr->uiLtrMarkInterval;
+  } else { // in case IDR currently coding
+    LTRMarkProcessScreen (pCtx);
+    pLtr->iCurLtrIdx = 1;
+    pLtr->iSceneLtrIdx = 1;
+    pLtr->uiLtrMarkInterval = 0;
+    pCtx->pVaa->uiValidLongTermPicIdx = 0;
+  }
+
+  pCtx->pReferenceStrategy->EndofUpdateRefList();
+  return true;
+}
+
+bool WelsBuildRefListScreen (sWelsEncCtx* pCtx, const int32_t iPOC, int32_t iBestLtrRefIdx) {
+  SRefList* pRefList = pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SWelsSvcCodingParam* pParam = pCtx->pSvcParam;
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+  const int32_t iNumRef = pParam->iNumRefFrame;
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  pCtx->iNumRef0 = 0;
+
+  if (pCtx->eSliceType != I_SLICE) {
+    int iLtrRefIdx = 0;
+    SPicture* pRefOri = NULL;
+    for (int idx = 0; idx < pVaaExt->iNumOfAvailableRef; idx++) {
+      iLtrRefIdx = pCtx->pVpp->GetRefFrameInfo (idx, pCtx->bCurFrameMarkedAsSceneLtr, pRefOri);
+      if (iLtrRefIdx >= 0 && iLtrRefIdx <= pParam->iLTRRefNum) {
+        SPicture* pRefPic = pRefList->pLongRefList[iLtrRefIdx];
+        if (pRefPic != NULL && pRefPic->bUsedAsRef && pRefPic->bIsLongRef) {
+          if (pRefPic->uiTemporalId <= pCtx->uiTemporalId && (!pCtx->bCurFrameMarkedAsSceneLtr || pRefPic->bIsSceneLTR)) {
+            pCtx->pCurDqLayer->pRefOri[pCtx->iNumRef0] = pRefOri;
+            pCtx->pRefList0[pCtx->iNumRef0++] = pRefPic;
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                     "WelsBuildRefListScreen(), current iFrameNum = %d, current Tid = %d, ref iFrameNum = %d, ref uiTemporalId = %d, ref is Scene LTR = %d, LTR count = %d,iNumRef = %d",
+                     pParamD->iFrameNum, pCtx->uiTemporalId,
+                     pRefPic->iFrameNum, pRefPic->uiTemporalId, pRefPic->bIsSceneLTR,
+                     pRefList->uiLongRefCount, iNumRef);
+          }
+        }
+      } else {
+        for (int32_t i = iNumRef ; i >= 0 ; --i) {
+          if (pRefList->pLongRefList[i] == NULL) {
+            continue;
+          } else if (pRefList->pLongRefList[i]->uiTemporalId == 0
+                     || pRefList->pLongRefList[i]->uiTemporalId < pCtx->uiTemporalId) {
+            pCtx->pCurDqLayer->pRefOri[pCtx->iNumRef0] = pRefOri;
+            pCtx->pRefList0[pCtx->iNumRef0++] = pRefList->pLongRefList[i];
+            WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                     "WelsBuildRefListScreen(), ref !current iFrameNum = %d, ref iFrameNum = %d,LTR number = %d",
+                     pParamD->iFrameNum, pCtx->pRefList0[pCtx->iNumRef0 - 1]->iFrameNum, pRefList->uiLongRefCount);
+            break;
+          }
+        }
+      }
+    } // end of (int idx = 0; idx < pVaaExt->iNumOfAvailableRef; idx++)
+
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+             "WelsBuildRefListScreen(), CurrentFramePoc=%d, isLTR=%d", iPOC, pCtx->bCurFrameMarkedAsSceneLtr);
+    for (int j = 0; j < iNumRef; j++) {
+      SPicture* pARefPicture = pRefList->pLongRefList[j];
+      if (pARefPicture != NULL) {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                 "WelsBuildRefListScreen()\tRefLot[%d]: iPoc=%d, iPictureType=%d, bUsedAsRef=%d, bIsLongRef=%d, bIsSceneLTR=%d, uiTemporalId=%d, iFrameNum=%d, iMarkFrameNum=%d, iLongTermPicNum=%d, uiRecieveConfirmed=%d",
+                 j,
+                 pARefPicture->iFramePoc,
+                 pARefPicture->iPictureType,
+                 pARefPicture->bUsedAsRef,
+                 pARefPicture->bIsLongRef,
+                 pARefPicture->bIsSceneLTR,
+                 pARefPicture->uiTemporalId,
+                 pARefPicture->iFrameNum,
+                 pARefPicture->iMarkFrameNum,
+                 pARefPicture->iLongTermPicNum,
+                 pARefPicture->uiRecieveConfirmed);
+      } else {
+        WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "WelsBuildRefListScreen()\tRefLot[%d]: NULL", j);
+      }
+    }
+  } else {
+    // dealing with IDR
+    WelsResetRefList (pCtx);  //for IDR, SHOULD reset pRef list.
+    ResetLtrState (&pCtx->pLtr[pCtx->uiDependencyId]); //SHOULD update it when IDR.
+    pCtx->pRefList0[0] = NULL;
+  }
+  if (pCtx->iNumRef0 > iNumRef) {
+    pCtx->iNumRef0 = iNumRef;
+  }
+
+  return (pCtx->iNumRef0 > 0 || pCtx->eSliceType == I_SLICE) ? (true) : (false);
+}
+
+static inline bool IsValidFrameNum (const int32_t kiFrameNum) {
+  return (kiFrameNum < (1 << 30)); // TODO: use the original judge first, may be improved
+}
+
+void WelsMarkMMCORefInfoScreen (sWelsEncCtx* pCtx, SLTRState* pLtr,
+                                SSlice** ppSliceList, const int32_t kiCountSliceNum) {
+  SSlice* pBaseSlice          = ppSliceList[0];
+  SRefPicMarking* pRefPicMark = &pBaseSlice->sSliceHeaderExt.sSliceHeader.sRefMarking;
+  const int32_t iMaxLtrIdx = pCtx->pSvcParam->iNumRefFrame - STR_ROOM - 1;
+
+  memset (pRefPicMark, 0, sizeof (SRefPicMarking));
+  if (pCtx->pSvcParam->bEnableLongTermReference) {
+    pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iMaxLongTermFrameIdx = iMaxLtrIdx;
+    pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_SET_MAX_LONG;
+
+    pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount].iLongTermFrameIdx = pLtr->iCurLtrIdx;
+    pRefPicMark->SMmcoRef[pRefPicMark->uiMmcoCount++].iMmcoType = MMCO_LONG;
+  }
+
+  WelsMarkMMCORefInfoWithBase (ppSliceList, pBaseSlice, kiCountSliceNum);
+}
+
+void WelsMarkPicScreen (sWelsEncCtx* pCtx) {
+  SLTRState* pLtr          = &pCtx->pLtr[pCtx->uiDependencyId];
+  int32_t iMaxTid          = WELS_LOG2 (pCtx->pSvcParam->uiGopSize);
+  int32_t iMaxActualLtrIdx = -1;
+  SSpatialLayerInternal* pParamD    = &pCtx->pSvcParam->sDependencyLayers[pCtx->uiDependencyId];
+  if (pCtx->pSvcParam->bEnableLongTermReference)
+    iMaxActualLtrIdx = pCtx->pSvcParam->iNumRefFrame - STR_ROOM - 1 -  WELS_MAX (iMaxTid , 1);
+
+  SRefList* pRefList =  pCtx->ppRefPicListExt[pCtx->uiDependencyId];
+  SPicture** ppLongRefList = pRefList->pLongRefList;
+  const int32_t iNumRef = pCtx->pSvcParam->iNumRefFrame;
+  int32_t i;
+  const int32_t iLongRefNum = iNumRef - STR_ROOM;
+  const bool bIsRefListNotFull = pRefList->uiLongRefCount < iLongRefNum;
+
+  if (!pCtx->pSvcParam->bEnableLongTermReference) {
+    pLtr->iCurLtrIdx = pCtx->uiTemporalId;
+  } else {
+    if (iMaxActualLtrIdx != -1 && pCtx->uiTemporalId == 0 && pCtx->bCurFrameMarkedAsSceneLtr) {
+      //Scene LTR
+      pLtr->bLTRMarkingFlag = true;
+      pLtr->uiLtrMarkInterval = 0;
+      pLtr->iCurLtrIdx  = pLtr->iSceneLtrIdx % (iMaxActualLtrIdx + 1);
+      pLtr->iSceneLtrIdx++;
+    } else {
+      pLtr->bLTRMarkingFlag = false;
+      //for other LTR
+      if (bIsRefListNotFull) {
+        for (int32_t i = 0; i < iLongRefNum; ++i) {
+          if (pRefList->pLongRefList[i] == NULL) {
+            pLtr->iCurLtrIdx = i   ;
+            break;
+          }
+        }
+      } else {
+        int32_t iRefNum_t[MAX_TEMPORAL_LAYER_NUM] = {0};
+        for (i = 0 ; i < pRefList->uiLongRefCount ; ++i) {
+          if (ppLongRefList[i]->bUsedAsRef && ppLongRefList[i]->bIsLongRef && (!ppLongRefList[i]->bIsSceneLTR)) {
+            ++iRefNum_t[ ppLongRefList[i]->uiTemporalId ];
+          }
+        }
+
+        int32_t iMaxMultiRefTid = (iMaxTid) ? (iMaxTid - 1) : (0) ;
+        for (i = 0; i < MAX_TEMPORAL_LAYER_NUM ; ++i) {
+          if (iRefNum_t[i] > 1) {
+            iMaxMultiRefTid = i;
+          }
+        }
+        int32_t iLongestDeltaFrameNum = -1;
+        int32_t iMaxFrameNum = (1 << pCtx->pSps->uiLog2MaxFrameNum);
+
+        for (i = 0 ; i < pRefList->uiLongRefCount ; ++i) {
+          if (ppLongRefList[i]->bUsedAsRef && ppLongRefList[i]->bIsLongRef && (!ppLongRefList[i]->bIsSceneLTR)
+              && iMaxMultiRefTid == ppLongRefList[i]->uiTemporalId) {
+            if (!IsValidFrameNum (ppLongRefList[i]->iFrameNum)) {  // pLtr->iCurLtrIdx must have a value
+              WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "WelsMarkPicScreen, Invalid Frame Number");
+              return;
+            }
+            int32_t iDeltaFrameNum = (pParamD->iFrameNum >= ppLongRefList[i]->iFrameNum)
+                                     ? (pParamD->iFrameNum - ppLongRefList[i]->iFrameNum)
+                                     : (pParamD->iFrameNum + iMaxFrameNum - ppLongRefList[i]->iFrameNum);
+
+            if (iDeltaFrameNum > iLongestDeltaFrameNum) {
+              pLtr->iCurLtrIdx = ppLongRefList[i]->iLongTermPicNum;
+              iLongestDeltaFrameNum = iDeltaFrameNum;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  for (i = 0 ; i < MAX_TEMPORAL_LAYER_NUM; ++i) {
+    if ((pCtx->uiTemporalId <  i) || (pCtx->uiTemporalId == 0)) {
+      pLtr->iLastLtrIdx[i] = pLtr->iCurLtrIdx;
+    }
+  }
+
+  const int32_t iSliceNum = pCtx->pCurDqLayer->iMaxSliceNum;
+
+  WelsMarkMMCORefInfoScreen (pCtx, pLtr, pCtx->pCurDqLayer->ppSliceInLayer, iSliceNum);
+
+  return;
+}
+
+void DoNothing (sWelsEncCtx* pointer) {
+}
+
+
+IWelsReferenceStrategy*   IWelsReferenceStrategy::CreateReferenceStrategy (sWelsEncCtx* pCtx,
+    const EUsageType keUsageType,
+    const bool kbLtrEnabled) {
+
+  IWelsReferenceStrategy* pReferenceStrategy = NULL;
+  switch (keUsageType) {
+  case SCREEN_CONTENT_REAL_TIME:
+    if (kbLtrEnabled) {
+      pReferenceStrategy = WELS_NEW_OP (CWelsReference_LosslessWithLtr(),
+                                        CWelsReference_LosslessWithLtr);
+    } else {
+      pReferenceStrategy = WELS_NEW_OP (CWelsReference_Screen(),
+                                        CWelsReference_Screen);
+    }
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pReferenceStrategy)
+    break;
+  case CAMERA_VIDEO_REAL_TIME:
+  case CAMERA_VIDEO_NON_REAL_TIME:
+  default:
+    pReferenceStrategy = WELS_NEW_OP (CWelsReference_TemporalLayer(),
+                                      CWelsReference_TemporalLayer);
+    WELS_VERIFY_RETURN_IF (NULL, NULL == pReferenceStrategy)
+    break;
+  }
+  pReferenceStrategy->Init (pCtx);
+  return pReferenceStrategy;
+}
+
+void CWelsReference_TemporalLayer::Init (sWelsEncCtx* pCtx) {
+  m_pEncoderCtx = pCtx;
+}
+
+bool CWelsReference_TemporalLayer::BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx) {
+  return WelsBuildRefList (m_pEncoderCtx, iPOC,  iBestLtrRefIdx);
+}
+void CWelsReference_TemporalLayer::MarkPic() {
+  WelsMarkPic (m_pEncoderCtx);
+}
+bool CWelsReference_TemporalLayer::UpdateRefList() {
+  return WelsUpdateRefList (m_pEncoderCtx);
+}
+void CWelsReference_TemporalLayer::EndofUpdateRefList() {
+  PrefetchNextBuffer (m_pEncoderCtx);
+}
+void CWelsReference_TemporalLayer::AfterBuildRefList() {
+  DoNothing (m_pEncoderCtx);
+}
+
+bool CWelsReference_Screen::BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx) {
+  return WelsBuildRefList (m_pEncoderCtx, iPOC,  iBestLtrRefIdx);
+}
+void CWelsReference_Screen::MarkPic() {
+  WelsMarkPic (m_pEncoderCtx);
+}
+bool CWelsReference_Screen::UpdateRefList() {
+  return WelsUpdateRefList (m_pEncoderCtx);
+}
+void CWelsReference_Screen::EndofUpdateRefList() {
+  UpdateSrcPicList (m_pEncoderCtx);
+}
+void CWelsReference_Screen::AfterBuildRefList() {
+  UpdateBlockStatic (m_pEncoderCtx);
+}
+
+bool CWelsReference_LosslessWithLtr::BuildRefList (const int32_t iPOC, int32_t iBestLtrRefIdx) {
+  return WelsBuildRefListScreen (m_pEncoderCtx, iPOC,  iBestLtrRefIdx);
+}
+void CWelsReference_LosslessWithLtr::MarkPic() {
+  WelsMarkPicScreen (m_pEncoderCtx);
+}
+bool CWelsReference_LosslessWithLtr::UpdateRefList() {
+  return WelsUpdateRefListScreen (m_pEncoderCtx);
+}
+void CWelsReference_LosslessWithLtr::EndofUpdateRefList() {
+  UpdateSrcPicListLosslessScreenRefSelectionWithLtr (m_pEncoderCtx);
+}
+} // namespace WelsEnc
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/sample.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/sample.cpp
new file mode 100644
index 0000000000..78498b08db
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/sample.cpp
@@ -0,0 +1,495 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    sample.c
+ *
+ * \brief   compute SAD and SATD
+ *
+ * \date    2009.06.02 Created
+ *
+ *************************************************************************************
+ */
+
+#include "sample.h"
+#include "sad_common.h"
+#include "intra_pred_common.h"
+#include "mc.h"
+#include "cpu_core.h"
+
+namespace WelsEnc {
+int32_t WelsSampleSatd4x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  int32_t pSampleMix[4][4] = {{ 0 }};
+  int32_t iSample0, iSample1, iSample2, iSample3;
+  int32_t i = 0;
+  uint8_t* pSrc1 = pSample1;
+  uint8_t* pSrc2 = pSample2;
+
+  //step 1: get the difference
+  for (i = 0; i < 4; i++) {
+    pSampleMix[i][0] = pSrc1[0] - pSrc2[0];
+    pSampleMix[i][1] = pSrc1[1] - pSrc2[1];
+    pSampleMix[i][2] = pSrc1[2] - pSrc2[2];
+    pSampleMix[i][3] = pSrc1[3] - pSrc2[3];
+
+    pSrc1 += iStride1;
+    pSrc2 += iStride2;
+  }
+
+  //step 2: horizontal transform
+  for (i = 0; i < 4; i++) {
+    iSample0 = pSampleMix[i][0] + pSampleMix[i][2];
+    iSample1 = pSampleMix[i][1] + pSampleMix[i][3];
+    iSample2 = pSampleMix[i][0] - pSampleMix[i][2];
+    iSample3 = pSampleMix[i][1] - pSampleMix[i][3];
+
+    pSampleMix[i][0] = iSample0 + iSample1;
+    pSampleMix[i][1] = iSample2 + iSample3;
+    pSampleMix[i][2] = iSample2 - iSample3;
+    pSampleMix[i][3] = iSample0 - iSample1;
+  }
+
+  //step 3: vertical transform and get the sum of SATD
+  for (i = 0; i < 4; i++) {
+    iSample0 = pSampleMix[0][i] + pSampleMix[2][i];
+    iSample1 = pSampleMix[1][i] + pSampleMix[3][i];
+    iSample2 = pSampleMix[0][i] - pSampleMix[2][i];
+    iSample3 = pSampleMix[1][i] - pSampleMix[3][i];
+
+    pSampleMix[0][i] = iSample0 + iSample1;
+    pSampleMix[1][i] = iSample2 + iSample3;
+    pSampleMix[2][i] = iSample2 - iSample3;
+    pSampleMix[3][i] = iSample0 - iSample1;
+
+    iSatdSum += (WELS_ABS (pSampleMix[0][i]) + WELS_ABS (pSampleMix[1][i]) + WELS_ABS (pSampleMix[2][i]) + WELS_ABS (
+                   pSampleMix[3][i]));
+  }
+
+  return ((iSatdSum + 1) >> 1);
+}
+
+int32_t WelsSampleSatd8x4_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  iSatdSum += WelsSampleSatd4x4_c (pSample1,   iStride1, pSample2,   iStride2);
+  iSatdSum += WelsSampleSatd4x4_c (pSample1 + 4, iStride1, pSample2 + 4, iStride2);
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd4x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+  iSatdSum += WelsSampleSatd4x4_c (pSample1,                   iStride1, pSample2,                   iStride2);
+  iSatdSum += WelsSampleSatd4x4_c (pSample1 + (iStride1 << 2), iStride1, pSample2 + (iStride2 << 2), iStride2);
+  return iSatdSum;
+}
+
+int32_t WelsSampleSatd8x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+
+  iSatdSum += WelsSampleSatd4x4_c (pSample1,                     iStride1, pSample2,                     iStride2);
+  iSatdSum += WelsSampleSatd4x4_c (pSample1 + 4,                   iStride1, pSample2 + 4,                   iStride2);
+  iSatdSum += WelsSampleSatd4x4_c (pSample1 + (iStride1 << 2),   iStride1, pSample2 + (iStride2 << 2),   iStride2);
+  iSatdSum += WelsSampleSatd4x4_c (pSample1 + (iStride1 << 2) + 4, iStride1, pSample2 + (iStride2 << 2) + 4, iStride2);
+
+  return iSatdSum;
+}
+int32_t WelsSampleSatd16x8_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+
+  iSatdSum += WelsSampleSatd8x8_c (pSample1,   iStride1, pSample2,   iStride2);
+  iSatdSum += WelsSampleSatd8x8_c (pSample1 + 8, iStride1, pSample2 + 8, iStride2);
+
+  return iSatdSum;
+}
+int32_t WelsSampleSatd8x16_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+
+  iSatdSum += WelsSampleSatd8x8_c (pSample1,                   iStride1, pSample2,                   iStride2);
+  iSatdSum += WelsSampleSatd8x8_c (pSample1 + (iStride1 << 3), iStride1, pSample2 + (iStride2 << 3), iStride2);
+
+  return iSatdSum;
+}
+int32_t WelsSampleSatd16x16_c (uint8_t* pSample1, int32_t iStride1, uint8_t* pSample2, int32_t iStride2) {
+  int32_t iSatdSum = 0;
+
+  iSatdSum += WelsSampleSatd8x8_c (pSample1,                     iStride1, pSample2,                     iStride2);
+  iSatdSum += WelsSampleSatd8x8_c (pSample1 + 8,                   iStride1, pSample2 + 8,                   iStride2);
+  iSatdSum += WelsSampleSatd8x8_c (pSample1 + (iStride1 << 3),   iStride1, pSample2 + (iStride2 << 3),   iStride2);
+  iSatdSum += WelsSampleSatd8x8_c (pSample1 + (iStride1 << 3) + 8, iStride1, pSample2 + (iStride2 << 3) + 8, iStride2);
+
+  return iSatdSum;
+}
+
+
+extern void WelsI4x4LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+extern void WelsI4x4LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+extern void WelsI4x4LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+
+int32_t WelsSampleSatdIntra4x4Combined3_c (uint8_t* pDec, int32_t iDecStride, uint8_t* pEnc, int32_t iEncStride,
+    uint8_t* pDst,
+    int32_t* pBestMode, int32_t iLambda2, int32_t iLambda1, int32_t iLambda0) {
+  int32_t iBestMode = -1;
+  int32_t iCurCost, iBestCost = INT_MAX;
+  ENFORCE_STACK_ALIGN_2D (uint8_t, uiLocalBuffer, 3, 16, 16)
+
+  WelsI4x4LumaPredDc_c (uiLocalBuffer[2], pDec, iDecStride);
+  iCurCost = WelsSampleSatd4x4_c (uiLocalBuffer[2], 4, pEnc, iEncStride) + iLambda2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 2;
+    iBestCost = iCurCost;
+  }
+
+  WelsI4x4LumaPredH_c (uiLocalBuffer[1], pDec, iDecStride);
+  iCurCost = WelsSampleSatd4x4_c (uiLocalBuffer[1], 4, pEnc, iEncStride) + iLambda1;
+  if (iCurCost < iBestCost) {
+    iBestMode = 1;
+    iBestCost = iCurCost;
+  }
+  WelsI4x4LumaPredV_c (uiLocalBuffer[0], pDec, iDecStride);
+  iCurCost = WelsSampleSatd4x4_c (uiLocalBuffer[0], 4, pEnc, iEncStride) + iLambda0;
+  if (iCurCost < iBestCost) {
+    iBestMode = 0;
+    iBestCost = iCurCost;
+  }
+
+  memcpy (pDst, uiLocalBuffer[iBestMode], 16 * sizeof (uint8_t)); // confirmed_safe_unsafe_usage
+  *pBestMode = iBestMode;
+
+  return iBestCost;
+}
+extern void WelsIChromaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+extern void WelsIChromaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+extern void WelsIChromaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+
+int32_t WelsSampleSatdIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, uint8_t* pEncCb, int32_t iEncStride,
+    int32_t* pBestMode, int32_t iLambda, uint8_t* pDstChroma, uint8_t* pDecCr, uint8_t* pEncCr) {
+  int32_t iBestMode = -1;
+  int32_t iCurCost, iBestCost = INT_MAX;
+
+  WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
+
+  if (iCurCost < iBestCost) {
+    iBestMode = 2;
+    iBestCost = iCurCost;
+  }
+
+  WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 1;
+    iBestCost = iCurCost;
+  }
+  WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSatd8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSatd8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride);
+  if (iCurCost < iBestCost) {
+    iBestMode = 0;
+    iBestCost = iCurCost;
+  }
+
+  *pBestMode = iBestMode;
+
+  return iBestCost;
+
+
+}
+int32_t WelsSampleSadIntra8x8Combined3_c (uint8_t* pDecCb, int32_t iDecStride, uint8_t* pEncCb, int32_t iEncStride,
+    int32_t* pBestMode, int32_t iLambda, uint8_t* pDstChroma, uint8_t* pDecCr, uint8_t* pEncCr) {
+  int32_t iBestMode = -1;
+  int32_t iCurCost, iBestCost = INT_MAX;
+
+  WelsIChromaPredV_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredV_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
+
+  if (iCurCost < iBestCost) {
+    iBestMode = 2;
+    iBestCost = iCurCost;
+  }
+
+  WelsIChromaPredH_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredH_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 1;
+    iBestCost = iCurCost;
+  }
+  WelsIChromaPredDc_c (pDstChroma, pDecCb, iDecStride);
+  WelsIChromaPredDc_c (pDstChroma + 64, pDecCr, iDecStride);
+  iCurCost = WelsSampleSad8x8_c (pDstChroma, 8, pEncCb, iEncStride);
+  iCurCost += WelsSampleSad8x8_c (pDstChroma + 64, 8, pEncCr, iEncStride);
+  if (iCurCost < iBestCost) {
+    iBestMode = 0;
+    iBestCost = iCurCost;
+  }
+
+  *pBestMode = iBestMode;
+
+  return iBestCost;
+
+}
+
+extern void WelsI16x16LumaPredDc_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+//extern void WelsI16x16LumaPredH_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+//extern void WelsI16x16LumaPredV_c (uint8_t* pPred, uint8_t* pRef, const int32_t iStride);
+
+int32_t WelsSampleSatdIntra16x16Combined3_c (uint8_t* pDec, int32_t iDecStride, uint8_t* pEnc, int32_t iEncStride,
+    int32_t* pBestMode, int32_t iLambda, uint8_t* pDst) {
+  int32_t iBestMode = -1;
+  int32_t iCurCost, iBestCost = INT_MAX;
+
+  WelsI16x16LumaPredV_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSatd16x16_c (pDst, 16, pEnc, iEncStride);
+
+  if (iCurCost < iBestCost) {
+    iBestMode = 0;
+    iBestCost = iCurCost;
+  }
+
+  WelsI16x16LumaPredH_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSatd16x16_c (pDst, 16, pEnc, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 1;
+    iBestCost = iCurCost;
+  }
+  WelsI16x16LumaPredDc_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSatd16x16_c (pDst, 16, pEnc, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 2;
+    iBestCost = iCurCost;
+  }
+
+  *pBestMode = iBestMode;
+
+  return iBestCost;
+
+
+}
+int32_t WelsSampleSadIntra16x16Combined3_c (uint8_t* pDec, int32_t iDecStride, uint8_t* pEnc, int32_t iEncStride,
+    int32_t* pBestMode, int32_t iLambda, uint8_t* pDst) {
+  int32_t iBestMode = -1;
+  int32_t iCurCost, iBestCost = INT_MAX;
+
+  WelsI16x16LumaPredV_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSad16x16_c (pDst, 16, pEnc, iEncStride);
+
+  if (iCurCost < iBestCost) {
+    iBestMode = 0;
+    iBestCost = iCurCost;
+  }
+
+  WelsI16x16LumaPredH_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSad16x16_c (pDst, 16, pEnc, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 1;
+    iBestCost = iCurCost;
+  }
+  WelsI16x16LumaPredDc_c (pDst, pDec, iDecStride);
+  iCurCost = WelsSampleSad16x16_c (pDst, 16, pEnc, iEncStride) + iLambda * 2;
+  if (iCurCost < iBestCost) {
+    iBestMode = 2;
+    iBestCost = iCurCost;
+  }
+
+  *pBestMode = iBestMode;
+
+  return iBestCost;
+
+
+}
+
+void WelsInitSampleSadFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag) {
+  //pfSampleSad init
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] = WelsSampleSad16x16_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x8 ] = WelsSampleSad16x8_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x16 ] = WelsSampleSad8x16_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8  ] = WelsSampleSad8x8_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x4  ] = WelsSampleSad4x4_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x4  ] = WelsSampleSad8x4_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x8  ] = WelsSampleSad4x8_c;
+
+  //pfSampleSatd init
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8  ] = WelsSampleSatd8x8_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4  ] = WelsSampleSatd4x4_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x4  ] = WelsSampleSatd8x4_c;
+  pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x8  ] = WelsSampleSatd4x8_c;
+
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x16] = WelsSampleSadFour16x16_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x8] = WelsSampleSadFour16x8_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x16] = WelsSampleSadFour8x16_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x8] = WelsSampleSadFour8x8_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_4x4] = WelsSampleSadFour4x4_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x4] = WelsSampleSadFour8x4_c;
+  pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_4x8] = WelsSampleSadFour4x8_c;
+
+  pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd   = NULL;
+  pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Satd   = NULL;
+  pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Sad    = NULL;
+  pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Satd = NULL;
+  pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Sad  = NULL;
+
+#if defined (X86_ASM)
+  if (uiCpuFlag & WELS_CPU_MMXEXT) {
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x4  ] = WelsSampleSad4x4_mmx;
+  }
+
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] = WelsSampleSad16x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x8 ] = WelsSampleSad16x8_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x16] = WelsSampleSad8x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] = WelsSampleSad8x8_sse21;
+
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x16] = WelsSampleSadFour16x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x8] = WelsSampleSadFour16x8_sse2;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x16] = WelsSampleSadFour8x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x8] = WelsSampleSadFour8x8_sse2;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_4x4] = WelsSampleSadFour4x4_sse2;
+
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4  ] = WelsSampleSatd4x4_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8  ] = WelsSampleSatd8x8_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_sse2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_sse2;
+    pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd = WelsSampleSatdThree4x4_sse2;
+  }
+
+  if (uiCpuFlag & WELS_CPU_SSSE3) {
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Sad = WelsIntra16x16Combined3Sad_ssse3;
+  }
+
+  if (uiCpuFlag & WELS_CPU_SSE41) {
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_sse41;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8] = WelsSampleSatd16x8_sse41;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16] = WelsSampleSatd8x16_sse41;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8] = WelsSampleSatd8x8_sse41;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4] = WelsSampleSatd4x4_sse41;
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Satd = WelsIntra16x16Combined3Satd_sse41;
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Satd = WelsIntraChroma8x8Combined3Satd_sse41;
+  }
+#if defined(HAVE_AVX2)
+  if (uiCpuFlag & WELS_CPU_AVX2) {
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_avx2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8]  = WelsSampleSatd16x8_avx2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16]  = WelsSampleSatd8x16_avx2;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8]   = WelsSampleSatd8x8_avx2;
+  }
+#endif
+#endif //(X86_ASM)
+
+#if defined (HAVE_NEON)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x4  ] = WelsSampleSad4x4_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] = WelsSampleSad16x16_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x8 ] = WelsSampleSad16x8_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x16] = WelsSampleSad8x16_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] = WelsSampleSad8x8_neon;
+
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x16] = WelsSampleSadFour16x16_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x8] = WelsSampleSadFour16x8_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x16] = WelsSampleSadFour8x16_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x8] = WelsSampleSadFour8x8_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_4x4] = WelsSampleSadFour4x4_neon;
+
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4  ] = WelsSampleSatd4x4_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8  ] = WelsSampleSatd8x8_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_neon;
+
+    pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd   = WelsIntra4x4Combined3Satd_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Satd   = WelsIntra8x8Combined3Satd_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Sad    = WelsIntra8x8Combined3Sad_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Satd = WelsIntra16x16Combined3Satd_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Sad  = WelsIntra16x16Combined3Sad_neon;
+  }
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+  if (uiCpuFlag & WELS_CPU_NEON) {
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x4  ] = WelsSampleSad4x4_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] = WelsSampleSad16x16_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x8 ] = WelsSampleSad16x8_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x16] = WelsSampleSad8x16_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] = WelsSampleSad8x8_AArch64_neon;
+
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x16] = WelsSampleSadFour16x16_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x8] = WelsSampleSadFour16x8_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x16] = WelsSampleSadFour8x16_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x8] = WelsSampleSadFour8x8_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_4x4] = WelsSampleSadFour4x4_AArch64_neon;
+
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4  ] = WelsSampleSatd4x4_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8  ] = WelsSampleSatd8x8_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_AArch64_neon;
+
+    pFuncList->sSampleDealingFuncs.pfIntra4x4Combined3Satd   = WelsIntra4x4Combined3Satd_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Satd   = WelsIntra8x8Combined3Satd_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra8x8Combined3Sad    = WelsIntra8x8Combined3Sad_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Satd = WelsIntra16x16Combined3Satd_AArch64_neon;
+    pFuncList->sSampleDealingFuncs.pfIntra16x16Combined3Sad  = WelsIntra16x16Combined3Sad_AArch64_neon;
+  }
+#endif
+
+#if defined (HAVE_MMI)
+  if (uiCpuFlag & WELS_CPU_MMI) {
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] = WelsSampleSad16x16_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x8 ] = WelsSampleSad16x8_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x16] = WelsSampleSad8x16_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] = WelsSampleSad8x8_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_4x4  ] = WelsSampleSad4x4_mmi;
+
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4  ] = WelsSampleSatd4x4_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x8  ] = WelsSampleSatd8x8_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_8x16 ] = WelsSampleSatd8x16_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x8 ] = WelsSampleSatd16x8_mmi;
+    pFuncList->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] = WelsSampleSatd16x16_mmi;
+
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x16] = WelsSampleSadFour16x16_mmi;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_16x8] = WelsSampleSadFour16x8_mmi;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x16] = WelsSampleSadFour8x16_mmi;
+    pFuncList->sSampleDealingFuncs.pfSample4Sad[BLOCK_8x8] = WelsSampleSadFour8x8_mmi;
+  }
+#endif//HAVE_MMI
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cabac.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cabac.cpp
new file mode 100644
index 0000000000..0d7a2e701d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cabac.cpp
@@ -0,0 +1,204 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    set_mb_syn_cabac.cpp
+ *
+ * \brief   cabac coding engine
+ *
+ * \date    10/11/2014 Created
+ *
+ *************************************************************************************
+ */
+#include <string.h>
+#include "typedefs.h"
+#include "macros.h"
+#include "set_mb_syn_cabac.h"
+#include "encoder.h"
+#include "golomb_common.h"
+
+namespace {
+
+const int8_t g_kiClz5Table[32] = {
+  6, 5, 4, 4, 3, 3, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2,
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+};
+
+void PropagateCarry (uint8_t* pBufCur, uint8_t* pBufStart) {
+  for (; pBufCur > pBufStart; --pBufCur)
+    if (++ * (pBufCur - 1))
+      break;
+}
+
+} // anon ns.
+
+namespace WelsEnc {
+
+void WelsCabacInit (void* pCtx) {
+  sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
+  for (int32_t iModel = 0; iModel < 4; iModel++) {
+    for (int32_t iQp = 0; iQp <= WELS_QP_MAX; iQp++)
+      for (int32_t iIdx = 0; iIdx < WELS_CONTEXT_COUNT; iIdx++) {
+        int32_t m               = g_kiCabacGlobalContextIdx[iIdx][iModel][0];
+        int32_t n               = g_kiCabacGlobalContextIdx[iIdx][iModel][1];
+        int32_t iPreCtxState    = WELS_CLIP3 ((((m * iQp) >> 4) + n), 1, 126);
+        uint8_t uiValMps         = 0;
+        uint8_t uiStateIdx       = 0;
+        if (iPreCtxState <= 63) {
+          uiStateIdx = 63 - iPreCtxState;
+          uiValMps = 0;
+        } else {
+          uiStateIdx = iPreCtxState - 64;
+          uiValMps = 1;
+        }
+        pEncCtx->sWelsCabacContexts[iModel][iQp][iIdx].Set (uiStateIdx, uiValMps);
+      }
+  }
+}
+
+void WelsCabacContextInit (void* pCtx, SCabacCtx* pCbCtx, int32_t iModel) {
+  sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
+  int32_t iIdx =  pEncCtx->eSliceType == WelsCommon::I_SLICE ? 0 : iModel + 1;
+  int32_t iQp = pEncCtx->iGlobalQp;
+  memcpy (pCbCtx->m_sStateCtx, pEncCtx->sWelsCabacContexts[iIdx][iQp],
+          WELS_CONTEXT_COUNT * sizeof (SStateCtx));
+}
+
+void  WelsCabacEncodeInit (SCabacCtx* pCbCtx, uint8_t* pBuf,  uint8_t* pEnd) {
+  pCbCtx->m_uiLow     = 0;
+  pCbCtx->m_iLowBitCnt = 9;
+  pCbCtx->m_iRenormCnt = 0;
+  pCbCtx->m_uiRange   = 510;
+  pCbCtx->m_pBufStart = pBuf;
+  pCbCtx->m_pBufEnd = pEnd;
+  pCbCtx->m_pBufCur = pBuf;
+}
+
+void WelsCabacEncodeUpdateLowNontrivial_ (SCabacCtx* pCbCtx) {
+  int32_t iLowBitCnt = pCbCtx->m_iLowBitCnt;
+  int32_t iRenormCnt = pCbCtx->m_iRenormCnt;
+  cabac_low_t uiLow = pCbCtx->m_uiLow;
+
+  do {
+    uint8_t* pBufCur = pCbCtx->m_pBufCur;
+    const int32_t kiInc = CABAC_LOW_WIDTH - 1 - iLowBitCnt;
+
+    uiLow <<= kiInc;
+    if (uiLow & cabac_low_t (1) << (CABAC_LOW_WIDTH - 1))
+      PropagateCarry (pBufCur, pCbCtx->m_pBufStart);
+
+    if (CABAC_LOW_WIDTH > 32) {
+      WRITE_BE_32 (pBufCur, (uint32_t) (uiLow >> 31));
+      pBufCur += 4;
+    }
+    *pBufCur++ = (uint8_t) (uiLow >> 23);
+    *pBufCur++ = (uint8_t) (uiLow >> 15);
+    iRenormCnt -= kiInc;
+    iLowBitCnt = 15;
+    uiLow &= (1u << iLowBitCnt) - 1;
+    pCbCtx->m_pBufCur = pBufCur;
+  } while (iLowBitCnt + iRenormCnt > CABAC_LOW_WIDTH - 1);
+
+  pCbCtx->m_iLowBitCnt = iLowBitCnt + iRenormCnt;
+  pCbCtx->m_uiLow = uiLow << iRenormCnt;
+}
+
+void WelsCabacEncodeDecisionLps_ (SCabacCtx* pCbCtx, int32_t iCtx) {
+  const int32_t kiState = pCbCtx->m_sStateCtx[iCtx].State();
+  uint32_t uiRange = pCbCtx->m_uiRange;
+  uint32_t uiRangeLps = g_kuiCabacRangeLps[kiState][ (uiRange & 0xff) >> 6];
+  uiRange -= uiRangeLps;
+  pCbCtx->m_sStateCtx[iCtx].Set (g_kuiStateTransTable[kiState][0],
+                                 pCbCtx->m_sStateCtx[iCtx].Mps() ^ (kiState == 0));
+
+  WelsCabacEncodeUpdateLow_ (pCbCtx);
+  pCbCtx->m_uiLow += uiRange;
+
+  const int32_t kiRenormAmount = g_kiClz5Table[uiRangeLps >> 3];
+  pCbCtx->m_uiRange = uiRangeLps << kiRenormAmount;
+  pCbCtx->m_iRenormCnt = kiRenormAmount;
+}
+
+void WelsCabacEncodeTerminate (SCabacCtx* pCbCtx, uint32_t uiBin) {
+  pCbCtx->m_uiRange -= 2;
+  if (uiBin) {
+    WelsCabacEncodeUpdateLow_ (pCbCtx);
+    pCbCtx->m_uiLow  += pCbCtx->m_uiRange;
+
+    const int32_t kiRenormAmount = 7;
+    pCbCtx->m_uiRange = 2 << kiRenormAmount;
+    pCbCtx->m_iRenormCnt = kiRenormAmount;
+
+    WelsCabacEncodeUpdateLow_ (pCbCtx);
+    pCbCtx->m_uiLow |= 0x80;
+  } else {
+    const int32_t kiRenormAmount = pCbCtx->m_uiRange >> 8 ^ 1;
+    pCbCtx->m_uiRange = pCbCtx->m_uiRange << kiRenormAmount;
+    pCbCtx->m_iRenormCnt += kiRenormAmount;
+  }
+}
+void WelsCabacEncodeUeBypass (SCabacCtx* pCbCtx, int32_t iExpBits, uint32_t uiVal) {
+  int32_t iSufS = uiVal;
+  int32_t iStopLoop = 0;
+  int32_t k = iExpBits;
+  do {
+    if (iSufS >= (1 << k)) {
+      WelsCabacEncodeBypassOne (pCbCtx, 1);
+      iSufS = iSufS - (1 << k);
+      k++;
+    } else {
+      WelsCabacEncodeBypassOne (pCbCtx, 0);
+      while (k--)
+        WelsCabacEncodeBypassOne (pCbCtx, (iSufS >> k) & 1);
+      iStopLoop = 1;
+    }
+  } while (!iStopLoop);
+}
+
+void WelsCabacEncodeFlush (SCabacCtx* pCbCtx) {
+  WelsCabacEncodeTerminate (pCbCtx, 1);
+
+  cabac_low_t uiLow = pCbCtx->m_uiLow;
+  int32_t iLowBitCnt = pCbCtx->m_iLowBitCnt;
+  uint8_t* pBufCur = pCbCtx->m_pBufCur;
+
+  uiLow <<= CABAC_LOW_WIDTH - 1 - iLowBitCnt;
+  if (uiLow & cabac_low_t (1) << (CABAC_LOW_WIDTH - 1))
+    PropagateCarry (pBufCur, pCbCtx->m_pBufStart);
+  for (; (iLowBitCnt -= 8) >= 0; uiLow <<= 8)
+    * pBufCur++ = (uint8_t) (uiLow >> (CABAC_LOW_WIDTH - 9));
+
+  pCbCtx->m_pBufCur = pBufCur;
+}
+
+uint8_t* WelsCabacEncodeGetPtr (SCabacCtx* pCbCtx) {
+  return pCbCtx->m_pBufCur;
+}
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cavlc.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cavlc.cpp
new file mode 100644
index 0000000000..6231624dba
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/set_mb_syn_cavlc.cpp
@@ -0,0 +1,318 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    set_mb_syn_cavlc.h
+ *
+ * \brief   Seting all syntax elements of mb and decoding residual with cavlc
+ *
+ * \date    05/19/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "svc_set_mb_syn.h"
+#include "vlc_encoder.h"
+#include "cpu_core.h"
+#include "wels_const.h"
+
+namespace WelsEnc {
+
+const  ALIGNED_DECLARE (uint8_t, g_kuiZeroLeftMap[16], 16) = {
+  0, 1, 2, 3, 4, 5, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7
+};
+
+
+/*
+ *  Exponential Golomb codes encoding routines
+ */
+
+#define    CAVLC_BS_INIT( pBs )  \
+  uint8_t  * pBufPtr = pBs->pCurBuf; \
+  uint32_t   uiCurBits = pBs->uiCurBits; \
+  int32_t    iLeftBits = pBs->iLeftBits;
+
+#define    CAVLC_BS_UNINIT( pBs ) \
+  pBs->pCurBuf = pBufPtr;  \
+  pBs->uiCurBits = uiCurBits;  \
+  pBs->iLeftBits = iLeftBits;
+
+#define    CAVLC_BS_WRITE( n,  v ) \
+  {  \
+  if ( (n) < iLeftBits ) {\
+  uiCurBits = (uiCurBits<<(n))|(v);\
+  iLeftBits -= (n);\
+  }\
+  else {\
+  (n) -= iLeftBits;\
+  uiCurBits = (uiCurBits<<iLeftBits) | ((v)>>(n));\
+  WRITE_BE_32(pBufPtr, uiCurBits);\
+  pBufPtr += 4;\
+  uiCurBits = (v) & ((1<<(n))-1);\
+  iLeftBits = 32 - (n);\
+  }\
+  } ;
+
+
+int32_t CavlcParamCal_c (int16_t* pCoffLevel, uint8_t* pRun, int16_t* pLevel, int32_t* pTotalCoeff ,
+                         int32_t iLastIndex) {
+  int32_t iTotalZeros = 0;
+  int32_t iTotalCoeffs = 0;
+
+  while (iLastIndex >= 0 && pCoffLevel[iLastIndex] == 0) {
+    -- iLastIndex;
+  }
+
+  while (iLastIndex >= 0) {
+    int32_t iCountZero = 0;
+    pLevel[iTotalCoeffs] = pCoffLevel[iLastIndex--];
+
+    while (iLastIndex >= 0 && pCoffLevel[iLastIndex] == 0) {
+      ++ iCountZero;
+      -- iLastIndex;
+    }
+    iTotalZeros += iCountZero;
+    pRun[iTotalCoeffs++] = iCountZero;
+  }
+  *pTotalCoeff = iTotalCoeffs;
+  return iTotalZeros;
+}
+
+int32_t  WriteBlockResidualCavlc (SWelsFuncPtrList* pFuncList, int16_t* pCoffLevel, int32_t iEndIdx,
+                                  int32_t iCalRunLevelFlag,
+                                  int32_t iResidualProperty, int8_t iNC, SBitStringAux* pBs) {
+  ENFORCE_STACK_ALIGN_1D (int16_t, iLevel, 16, 16)
+  ENFORCE_STACK_ALIGN_1D (uint8_t, uiRun, 16, 16)
+
+  int32_t iTotalCoeffs = 0;
+  int32_t iTrailingOnes = 0;
+  int32_t iTotalZeros = 0, iZerosLeft = 0;
+  uint32_t uiSign = 0;
+  int32_t iLevelCode = 0, iLevelPrefix = 0, iLevelSuffix = 0, uiSuffixLength = 0, iLevelSuffixSize = 0;
+  int32_t iValue = 0, iThreshold, iZeroLeft;
+  int32_t n = 0;
+  int32_t i = 0;
+
+
+  CAVLC_BS_INIT (pBs);
+
+  /*Step 1: calculate iLevel and iRun and total */
+
+  if (iCalRunLevelFlag) {
+    int32_t iCount = 0;
+    iTotalZeros = pFuncList->pfCavlcParamCal (pCoffLevel, uiRun, iLevel, &iTotalCoeffs, iEndIdx);
+    iCount = (iTotalCoeffs > 3) ? 3 : iTotalCoeffs;
+    for (i = 0; i < iCount ; i++) {
+      if (WELS_ABS (iLevel[i]) == 1) {
+        iTrailingOnes ++;
+        uiSign <<= 1;
+        if (iLevel[i] < 0)
+          uiSign |= 1;
+      } else {
+        break;
+
+      }
+    }
+  }
+  /*Step 3: coeff token */
+  const uint8_t* upCoeffToken = &g_kuiVlcCoeffToken[g_kuiEncNcMapTable[iNC]][iTotalCoeffs][iTrailingOnes][0];
+  iValue = upCoeffToken[0];
+  n = upCoeffToken[1];
+
+  if (iTotalCoeffs == 0) {
+    CAVLC_BS_WRITE (n, iValue);
+
+    CAVLC_BS_UNINIT (pBs);
+    return ENC_RETURN_SUCCESS;
+  }
+
+  /* Step 4: */
+  /*  trailing */
+  n += iTrailingOnes;
+  iValue = (iValue << iTrailingOnes) + uiSign;
+  CAVLC_BS_WRITE (n, iValue);
+
+  /*  levels */
+  uiSuffixLength = (iTotalCoeffs > 10 && iTrailingOnes < 3) ? 1 : 0;
+
+  for (i = iTrailingOnes; i < iTotalCoeffs; i++) {
+    int32_t iVal = iLevel[i];
+
+    iLevelCode = (iVal - 1) * (1 << 1);
+    uiSign = (iLevelCode >> 31);
+    iLevelCode = (iLevelCode ^ uiSign) + (uiSign << 1);
+    iLevelCode -= ((i == iTrailingOnes) && (iTrailingOnes < 3)) << 1;
+
+    iLevelPrefix = iLevelCode >> uiSuffixLength;
+    iLevelSuffixSize = uiSuffixLength;
+    iLevelSuffix = iLevelCode - (iLevelPrefix << uiSuffixLength);
+
+    if (iLevelPrefix >= 14 && iLevelPrefix < 30 && uiSuffixLength == 0) {
+      iLevelPrefix = 14;
+      iLevelSuffix = iLevelCode - iLevelPrefix;
+      iLevelSuffixSize = 4;
+    } else if (iLevelPrefix >= 15) {
+      iLevelPrefix = 15;
+      iLevelSuffix = iLevelCode - (iLevelPrefix << uiSuffixLength);
+      //for baseline profile,overflow when the length of iLevelSuffix is larger than 11.
+      if (iLevelSuffix >> 11)
+        return ENC_RETURN_VLCOVERFLOWFOUND;
+      if (uiSuffixLength == 0) {
+        iLevelSuffix -= 15;
+      }
+      iLevelSuffixSize = 12;
+    }
+
+    n = iLevelPrefix + 1 + iLevelSuffixSize;
+    iValue = ((1 << iLevelSuffixSize) | iLevelSuffix);
+    CAVLC_BS_WRITE (n, iValue);
+
+    uiSuffixLength += !uiSuffixLength;
+    iThreshold = 3 << (uiSuffixLength - 1);
+    uiSuffixLength += ((iVal > iThreshold) || (iVal < -iThreshold)) && (uiSuffixLength < 6);
+
+  }
+
+  /* Step 5: total zeros */
+
+  if (iTotalCoeffs < iEndIdx + 1) {
+    if (CHROMA_DC != iResidualProperty) {
+      const uint8_t* upTotalZeros = &g_kuiVlcTotalZeros[iTotalCoeffs][iTotalZeros][0];
+      n = upTotalZeros[1];
+      iValue = upTotalZeros[0];
+      CAVLC_BS_WRITE (n, iValue);
+    } else {
+      const uint8_t* upTotalZeros = &g_kuiVlcTotalZerosChromaDc[iTotalCoeffs][iTotalZeros][0];
+      n = upTotalZeros[1];
+      iValue = upTotalZeros[0];
+      CAVLC_BS_WRITE (n, iValue);
+    }
+  }
+
+  /* Step 6: pRun before */
+  iZerosLeft = iTotalZeros;
+  for (i = 0; i + 1 < iTotalCoeffs && iZerosLeft > 0; ++ i) {
+    const uint8_t uirun = uiRun[i];
+    iZeroLeft = g_kuiZeroLeftMap[iZerosLeft];
+    n = g_kuiVlcRunBefore[iZeroLeft][uirun][1];
+    iValue = g_kuiVlcRunBefore[iZeroLeft][uirun][0];
+    CAVLC_BS_WRITE (n, iValue);
+    iZerosLeft -= uirun;
+  }
+
+  CAVLC_BS_UNINIT (pBs);
+  return ENC_RETURN_SUCCESS;
+}
+
+void StashMBStatusCavlc (SDynamicSlicingStack* pDss, SSlice* pSlice, int32_t iMbSkipRun) {
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  pDss->pBsStackBufPtr          = pBs->pCurBuf;
+  pDss->uiBsStackCurBits        = pBs->uiCurBits;
+  pDss->iBsStackLeftBits        = pBs->iLeftBits;
+  pDss->uiLastMbQp              = pSlice->uiLastMbQp;
+  pDss->iMbSkipRunStack = iMbSkipRun;
+}
+int32_t StashPopMBStatusCavlc (SDynamicSlicingStack* pDss, SSlice* pSlice) {
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  pBs->pCurBuf          = pDss->pBsStackBufPtr;
+  pBs->uiCurBits        = pDss->uiBsStackCurBits;
+  pBs->iLeftBits        = pDss->iBsStackLeftBits;
+  pSlice->uiLastMbQp    = pDss->uiLastMbQp;
+  return pDss->iMbSkipRunStack;
+}
+void StashMBStatusCabac (SDynamicSlicingStack* pDss, SSlice* pSlice, int32_t iMbSkipRun) {
+  SCabacCtx* pCtx = &pSlice->sCabacCtx;
+  memcpy (&pDss->sStoredCabac, pCtx, sizeof (SCabacCtx));
+  if (pDss->pRestoreBuffer) {
+    int32_t iPosBitOffset =  GetBsPosCabac (pSlice) - pDss->iStartPos;
+    int32_t iLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));
+    memcpy (pDss->pRestoreBuffer, pCtx->m_pBufStart, iLen);
+  }
+  pDss->uiLastMbQp =  pSlice->uiLastMbQp;
+  pDss->iMbSkipRunStack = iMbSkipRun;
+}
+int32_t StashPopMBStatusCabac (SDynamicSlicingStack* pDss, SSlice* pSlice) {
+  SCabacCtx* pCtx = &pSlice->sCabacCtx;
+  memcpy (pCtx, &pDss->sStoredCabac, sizeof (SCabacCtx));
+  if (pDss->pRestoreBuffer) {
+    int32_t iPosBitOffset = GetBsPosCabac (pSlice) - pDss->iStartPos;
+    int32_t iLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));
+    memcpy (pCtx->m_pBufStart, pDss->pRestoreBuffer, iLen);
+  }
+  pSlice->uiLastMbQp = pDss->uiLastMbQp;
+  return pDss->iMbSkipRunStack;
+}
+int32_t GetBsPosCavlc (SSlice* pSlice) {
+  return BsGetBitsPos (pSlice->pSliceBsa);
+}
+int32_t GetBsPosCabac (SSlice* pSlice) {
+  return (int32_t) ((pSlice->sCabacCtx.m_pBufCur - pSlice->sCabacCtx.m_pBufStart) << 3) +
+         (pSlice->sCabacCtx.m_iLowBitCnt - 9);
+}
+void WelsWriteSliceEndSyn (SSlice* pSlice, bool bEntropyCodingModeFlag) {
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  if (bEntropyCodingModeFlag) {
+    WelsCabacEncodeFlush (&pSlice->sCabacCtx);
+    pBs->pCurBuf = WelsCabacEncodeGetPtr (&pSlice->sCabacCtx);
+
+  } else {
+    BsRbspTrailingBits (pBs);
+    BsFlush (pBs);
+  }
+}
+void InitCoeffFunc (SWelsFuncPtrList* pFuncList, const uint32_t uiCpuFlag, int32_t iEntropyCodingModeFlag) {
+  pFuncList->pfCavlcParamCal = CavlcParamCal_c;
+
+#if defined(X86_32_ASM)
+  if (uiCpuFlag & WELS_CPU_SSE2) {
+    pFuncList->pfCavlcParamCal = CavlcParamCal_sse2;
+  }
+#endif
+
+#ifdef X86_ASM
+  if (uiCpuFlag & WELS_CPU_SSE42) {
+    pFuncList->pfCavlcParamCal = CavlcParamCal_sse42;
+  }
+#endif
+  if (iEntropyCodingModeFlag) {
+    pFuncList->pfStashMBStatus = StashMBStatusCabac;
+    pFuncList->pfStashPopMBStatus = StashPopMBStatusCabac;
+    pFuncList->pfWelsSpatialWriteMbSyn = WelsSpatialWriteMbSynCabac;
+    pFuncList->pfGetBsPosition = GetBsPosCabac;
+  } else {
+    pFuncList->pfStashMBStatus = StashMBStatusCavlc;
+    pFuncList->pfStashPopMBStatus = StashPopMBStatusCavlc;
+    pFuncList->pfWelsSpatialWriteMbSyn = WelsSpatialWriteMbSyn;
+    pFuncList->pfGetBsPosition = GetBsPosCavlc;
+  }
+}
+
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/slice_multi_threading.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/slice_multi_threading.cpp
new file mode 100644
index 0000000000..da4fe3d61e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/slice_multi_threading.cpp
@@ -0,0 +1,640 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    slice_multi_threading.h
+ *
+ * \brief   pSlice based multiple threading
+ *
+ * \date    04/16/2010 Created
+ *
+ *************************************************************************************
+ */
+
+
+#include <assert.h>
+#if !defined(_WIN32)
+#include <semaphore.h>
+#include <unistd.h>
+#endif//!_WIN32
+#ifndef SEM_NAME_MAX
+// length of semaphore name should be system constrained at least on mac 10.7
+#define  SEM_NAME_MAX 32
+#endif//SEM_NAME_MAX
+#include "slice_multi_threading.h"
+#include "mt_defs.h"
+#include "nal_encap.h"
+#include "utils.h"
+#include "encoder.h"
+#include "svc_encode_slice.h"
+#include "deblocking.h"
+#include "svc_enc_golomb.h"
+#include "crt_util_safe_x.h" // for safe crt like calls
+#include "rc.h"
+
+#include "cpu.h"
+
+#include "measure_time.h"
+#include "wels_task_management.h"
+
+#if defined(ENABLE_TRACE_MT)
+#define MT_TRACE_LOG(pLog, x, ...) WelsLog(pLog, x, __VA_ARGS__)
+#else
+#define MT_TRACE_LOG(x, ...)
+#endif
+
+namespace WelsEnc {
+void UpdateMbListNeighborParallel (SDqLayer* pCurDq,
+                                   SMB* pMbList,
+                                   const int32_t uiSliceIdc) {
+  SSliceCtx* pSliceCtx           = &pCurDq->sSliceEncCtx;
+  const int32_t kiMbWidth        = pSliceCtx->iMbWidth;
+  int32_t iIdx                   = pCurDq->pFirstMbIdxOfSlice[uiSliceIdc];
+  const int32_t kiEndMbInSlice   = iIdx + pCurDq->pCountMbNumInSlice[uiSliceIdc] - 1;
+
+  do {
+    UpdateMbNeighbor (pCurDq, &pMbList[iIdx], kiMbWidth, uiSliceIdc);
+    ++ iIdx;
+  } while (iIdx <= kiEndMbInSlice);
+}
+
+void CalcSliceComplexRatio (SDqLayer* pCurDq) {
+  SSliceCtx* pSliceCtx          = &pCurDq->sSliceEncCtx;
+  SSlice** ppSliceInLayer       = pCurDq->ppSliceInLayer;
+  int32_t iSumAv                = 0;
+  const int32_t kiSliceCount    = pSliceCtx->iSliceNumInFrame;
+  int32_t iSliceIdx             = 0;
+  int32_t iAvI[MAX_SLICES_NUM];
+
+  assert (kiSliceCount <= MAX_SLICES_NUM);
+  WelsEmms();
+
+  while (iSliceIdx < kiSliceCount) {
+    iAvI[iSliceIdx] = WELS_DIV_ROUND (INT_MULTIPLY * ppSliceInLayer[iSliceIdx]->iCountMbNumInSlice,
+                                      ppSliceInLayer[iSliceIdx]->uiSliceConsumeTime);
+    MT_TRACE_LOG (NULL, WELS_LOG_DEBUG, "[MT] CalcSliceComplexRatio(), uiSliceConsumeTime[%d]= %d us, slice_run= %d",
+                  iSliceIdx,
+                  ppSliceInLayer[iSliceIdx]->uiSliceConsumeTime, ppSliceInLayer[iSliceIdx]->iCountMbNumInSlice);
+    iSumAv += iAvI[iSliceIdx];
+
+    ++ iSliceIdx;
+  }
+  while (-- iSliceIdx >= 0) {
+    ppSliceInLayer[iSliceIdx]->iSliceComplexRatio = WELS_DIV_ROUND (INT_MULTIPLY * iAvI[iSliceIdx], iSumAv);
+  }
+}
+
+int32_t NeedDynamicAdjust (SSlice** ppSliceInLayer, const int32_t iSliceNum) {
+  if (NULL == ppSliceInLayer) {
+    return false;
+  }
+
+  uint32_t uiTotalConsume       = 0;
+  int32_t iSliceIdx             = 0;
+  int32_t iNeedAdj              = false;
+
+  WelsEmms();
+
+  while (iSliceIdx < iSliceNum) {
+    if (NULL == ppSliceInLayer[iSliceIdx]) {
+      return false;
+    }
+
+    uiTotalConsume += ppSliceInLayer[iSliceIdx]->uiSliceConsumeTime;
+    iSliceIdx ++;
+  }
+  if (uiTotalConsume == 0) {
+    MT_TRACE_LOG (NULL, WELS_LOG_DEBUG,
+                  "[MT] NeedDynamicAdjust(), herein do no adjust due first picture, iCountSliceNum= %d",
+                  iSliceNum);
+    return false;
+  }
+
+  iSliceIdx = 0;
+  float fThr                    = EPSN; // threshold for various cores cases
+  float fRmse                   = .0f;  // root mean square error of pSlice consume ratios
+  const float kfMeanRatio       = 1.0f / iSliceNum;
+  do {
+    const float fRatio = 1.0f * ppSliceInLayer[iSliceIdx]->uiSliceConsumeTime / uiTotalConsume;
+    const float fDiffRatio = fRatio - kfMeanRatio;
+    fRmse += (fDiffRatio * fDiffRatio);
+    ++ iSliceIdx;
+  } while (iSliceIdx + 1 < iSliceNum);
+  fRmse = sqrtf (fRmse / iSliceNum);
+  if (iSliceNum >= 8) {
+    fThr += THRESHOLD_RMSE_CORE8;
+  } else if (iSliceNum >= 4) {
+    fThr += THRESHOLD_RMSE_CORE4;
+  } else if (iSliceNum >= 2) {
+    fThr += THRESHOLD_RMSE_CORE2;
+  } else
+    fThr = 1.0f;
+  if (fRmse > fThr)
+    iNeedAdj = true;
+  MT_TRACE_LOG (NULL, WELS_LOG_DEBUG,
+                "[MT] NeedDynamicAdjust(), herein adjustment decision is made (iNeedAdj= %d) by: fRmse of pSlice complexity ratios %.6f, the corresponding threshold %.6f, iCountSliceNum %d",
+                iNeedAdj, fRmse, fThr, iSliceNum);
+
+  return iNeedAdj;
+}
+
+void DynamicAdjustSlicing (sWelsEncCtx* pCtx,
+                           SDqLayer* pCurDqLayer,
+                           int32_t iCurDid) {
+  SSliceCtx* pSliceCtx          = &pCurDqLayer->sSliceEncCtx;
+  SSlice** ppSliceInLayer       = pCurDqLayer->ppSliceInLayer;
+  const int32_t kiCountSliceNum = pSliceCtx->iSliceNumInFrame;
+  const int32_t kiCountNumMb    = pSliceCtx->iMbNumInFrame;
+  int32_t iMinimalMbNum         =
+    pSliceCtx->iMbWidth;  // in theory we need only 1 SMB, here let it as one SMB row required
+  int32_t iMaximalMbNum         = 0;    // dynamically assign later
+  int32_t iMbNumLeft            = kiCountNumMb;
+  int32_t iRunLen[MAX_THREADS_NUM] = {0};
+  int32_t iSliceIdx             = 0;
+
+  int32_t iNumMbInEachGom = 0;
+  SWelsSvcRc* pWelsSvcRc = &pCtx->pWelsSvcRc[iCurDid];
+  if (pCtx->pSvcParam->iRCMode != RC_OFF_MODE) {
+    iNumMbInEachGom = pWelsSvcRc->iNumberMbGom;
+
+    if (iNumMbInEachGom <= 0) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+               "[MT] DynamicAdjustSlicing(), invalid iNumMbInEachGom= %d from RC, iDid= %d, iCountNumMb= %d", iNumMbInEachGom,
+               iCurDid, kiCountNumMb);
+      return;
+    }
+
+    // do not adjust in case no extra iNumMbInEachGom based left for slicing adjustment,
+    // extra MB of non integrated GOM assigned at the last pSlice in default, keep up on early initial result.
+    if (iNumMbInEachGom * kiCountSliceNum >= kiCountNumMb) {
+      return;
+    }
+    iMinimalMbNum = iNumMbInEachGom;
+  }
+
+  if (kiCountSliceNum < 2 || (kiCountSliceNum & 0x01)) // we need suppose uiSliceNum is even for multiple threading
+    return;
+
+  iMaximalMbNum = kiCountNumMb - (kiCountSliceNum - 1) * iMinimalMbNum;
+
+  WelsEmms();
+
+  MT_TRACE_LOG (& (pCtx->sLogCtx), WELS_LOG_DEBUG, "[MT] DynamicAdjustSlicing(), iDid= %d, iCountNumMb= %d", iCurDid,
+                kiCountNumMb);
+
+  iSliceIdx = 0;
+  while (iSliceIdx + 1 < kiCountSliceNum) {
+    int32_t iNumMbAssigning = WELS_DIV_ROUND (kiCountNumMb * ppSliceInLayer[iSliceIdx]->iSliceComplexRatio, INT_MULTIPLY);
+
+    // GOM boundary aligned
+    if (pCtx->pSvcParam->iRCMode != RC_OFF_MODE) {
+      iNumMbAssigning = iNumMbAssigning / iNumMbInEachGom * iNumMbInEachGom;
+    }
+
+    // make sure one GOM at least in each pSlice for safe
+    if (iNumMbAssigning < iMinimalMbNum)
+      iNumMbAssigning = iMinimalMbNum;
+    else if (iNumMbAssigning > iMaximalMbNum)
+      iNumMbAssigning = iMaximalMbNum;
+
+    assert (iNumMbAssigning > 0);
+
+    iMbNumLeft -= iNumMbAssigning;
+    if (iMbNumLeft <= 0) { // error due to we can not support slice_skip now yet, do not adjust this time
+      assert (0);
+      return;
+    }
+    iRunLen[iSliceIdx] = iNumMbAssigning;
+    MT_TRACE_LOG (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                  "[MT] DynamicAdjustSlicing(), iSliceIdx= %d, iSliceComplexRatio= %.2f, slice_run_org= %d, slice_run_adj= %d",
+                  iSliceIdx, ppSliceInLayer[iSliceIdx]->iSliceComplexRatio * 1.0f / INT_MULTIPLY,
+                  ppSliceInLayer[iSliceIdx]->iCountMbNumInSlice,
+                  iNumMbAssigning);
+    ++ iSliceIdx;
+    iMaximalMbNum = iMbNumLeft - (kiCountSliceNum - iSliceIdx - 1) * iMinimalMbNum; // get maximal num_mb in left parts
+  }
+  iRunLen[iSliceIdx] = iMbNumLeft;
+  MT_TRACE_LOG (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+                "[MT] DynamicAdjustSlicing(), iSliceIdx= %d, pSliceComplexRatio= %.2f, slice_run_org= %d, slice_run_adj= %d",
+                iSliceIdx, ppSliceInLayer[iSliceIdx]->iSliceComplexRatio * 1.0f / INT_MULTIPLY,
+                ppSliceInLayer[iSliceIdx]->iCountMbNumInSlice, iMbNumLeft);
+  pCurDqLayer->bNeedAdjustingSlicing = !DynamicAdjustSlicePEncCtxAll (pCurDqLayer, iRunLen);
+}
+
+int32_t RequestMtResource (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pCodingParam, const int32_t iCountBsLen,
+                           const int32_t iMaxSliceBufferSize, bool bDynamicSlice) {
+  CMemoryAlign* pMa             = NULL;
+  SWelsSvcCodingParam* pPara    = NULL;
+  SSliceThreading* pSmt         = NULL;
+  int32_t iNumSpatialLayers     = 0;
+  int32_t iThreadNum            = 0;
+  int32_t iIdx                  = 0;
+  int32_t iReturn               = ENC_RETURN_SUCCESS;
+
+  if (NULL == ppCtx || NULL == pCodingParam || NULL == *ppCtx || iCountBsLen <= 0)
+    return 1;
+#if defined(ENABLE_TRACE_MT)
+  SLogContext* pLogCtx = & ((*ppCtx)->sLogCtx);
+#endif
+  pMa                  = (*ppCtx)->pMemAlign;
+  pPara                = pCodingParam;
+  iNumSpatialLayers    = pPara->iSpatialLayerNum;
+  iThreadNum           = pPara->iMultipleThreadIdc;
+
+  assert (iThreadNum > 0);
+
+  pSmt = (SSliceThreading*)pMa->WelsMalloc (sizeof (SSliceThreading), "SSliceThreading");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pSmt))
+  memset (pSmt, 0, sizeof (SSliceThreading));
+  (*ppCtx)->pSliceThreading = pSmt;
+  pSmt->pThreadPEncCtx = (SSliceThreadPrivateData*)pMa->WelsMalloc (sizeof (SSliceThreadPrivateData) * iThreadNum,
+                         "pThreadPEncCtx");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pSmt->pThreadPEncCtx))
+
+#ifdef _WIN32
+  // Dummy event namespace, the windows events don't actually use this
+  WelsSnprintf (pSmt->eventNamespace, sizeof (pSmt->eventNamespace), "%p", (void*) *ppCtx);
+#else
+  WelsSnprintf (pSmt->eventNamespace, sizeof (pSmt->eventNamespace), "%p%x", (void*) *ppCtx, getpid());
+#endif//!_WIN32
+
+#ifdef MT_DEBUG
+  // file handle for MT debug
+  pSmt->pFSliceDiff = NULL;
+
+  if (pSmt->pFSliceDiff) {
+    fclose (pSmt->pFSliceDiff);
+    pSmt->pFSliceDiff = NULL;
+  }
+  pSmt->pFSliceDiff = fopen ("slice_time.txt", "wt+");
+#endif//MT_DEBUG
+
+  MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "encpEncCtx= 0x%p", (void*) *ppCtx);
+
+  char name[SEM_NAME_MAX] = {0};
+  WELS_GCC_UNUSED WELS_THREAD_ERROR_CODE err = 0;
+
+  iIdx = 0;
+  while (iIdx < iThreadNum) {
+    pSmt->pThreadPEncCtx[iIdx].pWelsPEncCtx   = (void*) *ppCtx;
+    pSmt->pThreadPEncCtx[iIdx].iSliceIndex    = iIdx;
+    pSmt->pThreadPEncCtx[iIdx].iThreadIndex   = iIdx;
+    pSmt->pThreadHandles[iIdx]                = 0;
+
+    // length of semaphore name should be system constrained at least on mac 10.7
+    WelsSnprintf (name, SEM_NAME_MAX, "ud%d%s", iIdx, pSmt->eventNamespace);
+    err = WelsEventOpen (&pSmt->pUpdateMbListEvent[iIdx], name);
+    MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "[MT] Open pUpdateMbListEvent%d named(%s) ret%d err%d", iIdx, name, err, errno);
+    WelsSnprintf (name, SEM_NAME_MAX, "fu%d%s", iIdx, pSmt->eventNamespace);
+    err = WelsEventOpen (&pSmt->pFinUpdateMbListEvent[iIdx], name);
+    MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "[MT] Open pFinUpdateMbListEvent%d named(%s) ret%d err%d", iIdx, name, err,
+                  errno);
+    WelsSnprintf (name, SEM_NAME_MAX, "sc%d%s", iIdx, pSmt->eventNamespace);
+    err = WelsEventOpen (&pSmt->pSliceCodedEvent[iIdx], name);
+    MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedEvent%d named(%s) ret%d err%d", iIdx, name, err, errno);
+    WelsSnprintf (name, SEM_NAME_MAX, "rc%d%s", iIdx, pSmt->eventNamespace);
+    err = WelsEventOpen (&pSmt->pReadySliceCodingEvent[iIdx], name);
+    MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "[MT] Open pReadySliceCodingEvent%d = 0x%p named(%s) ret%d err%d", iIdx,
+                  (void*)pSmt->pReadySliceCodingEvent[iIdx], name, err, errno);
+    ++ iIdx;
+  }
+
+  WelsSnprintf (name, SEM_NAME_MAX, "scm%s", pSmt->eventNamespace);
+  err = WelsEventOpen (&pSmt->pSliceCodedMasterEvent, name);
+  MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "[MT] Open pSliceCodedMasterEvent named(%s) ret%d err%d", name, err, errno);
+
+  iReturn = WelsMutexInit (&pSmt->mutexSliceNumUpdate);
+  WELS_VERIFY_RETURN_IF (1, (WELS_THREAD_ERROR_OK != iReturn))
+
+  (*ppCtx)->pTaskManage = IWelsTaskManage::CreateTaskManage (*ppCtx, iNumSpatialLayers, bDynamicSlice);
+  WELS_VERIFY_RETURN_IF (1, (NULL == (*ppCtx)->pTaskManage))
+
+  int32_t iThreadBufferNum = WELS_MIN ((*ppCtx)->pTaskManage->GetThreadPoolThreadNum(), MAX_THREADS_NUM);
+
+  for (iIdx = 0; iIdx < iThreadBufferNum; iIdx++) {
+    pSmt->pThreadBsBuffer[iIdx] = (uint8_t*)pMa->WelsMallocz (iCountBsLen, "pSmt->pThreadBsBuffer");
+    WELS_VERIFY_RETURN_IF (1, (NULL == pSmt->pThreadBsBuffer[iIdx]))
+  }
+  iReturn = WelsMutexInit (&pSmt->mutexThreadBsBufferUsage);
+  WELS_VERIFY_RETURN_PROC_IF (1, (WELS_THREAD_ERROR_OK != iReturn), FreeMemorySvc (ppCtx))
+
+  iReturn = WelsMutexInit (&pSmt->mutexEvent);
+  WELS_VERIFY_RETURN_PROC_IF (1, (WELS_THREAD_ERROR_OK != iReturn), FreeMemorySvc (ppCtx));
+
+  iReturn = WelsMutexInit (&pSmt->mutexThreadSlcBuffReallocate);
+  WELS_VERIFY_RETURN_PROC_IF (1, (WELS_THREAD_ERROR_OK != iReturn), FreeMemorySvc (ppCtx))
+
+  iReturn = WelsMutexInit (& (*ppCtx)->mutexEncoderError);
+  WELS_VERIFY_RETURN_IF (1, (WELS_THREAD_ERROR_OK != iReturn))
+
+  MT_TRACE_LOG (pLogCtx, WELS_LOG_INFO, "RequestMtResource(), iThreadNum=%d, iMultipleThreadIdc= %d",
+                pPara->iMultipleThreadIdc,
+                (*ppCtx)->iMaxSliceCount);
+  return 0;
+}
+
+void ReleaseMtResource (sWelsEncCtx** ppCtx) {
+  SSliceThreading* pSmt                 = NULL;
+  CMemoryAlign* pMa                     = NULL;
+  int32_t iIdx                          = 0;
+  int32_t iThreadNum                    = 0;
+
+  if (NULL == ppCtx || NULL == *ppCtx)
+    return;
+
+  pMa           = (*ppCtx)->pMemAlign;
+  iThreadNum    = (*ppCtx)->pSvcParam->iMultipleThreadIdc;
+  pSmt          = (*ppCtx)->pSliceThreading;
+
+  if (NULL == pSmt)
+    return;
+
+  char ename[SEM_NAME_MAX] = {0};
+  while (iIdx < iThreadNum) {
+    // length of semaphore name should be system constrained at least on mac 10.7
+    WelsSnprintf (ename, SEM_NAME_MAX, "sc%d%s", iIdx, pSmt->eventNamespace);
+    WelsEventClose (&pSmt->pSliceCodedEvent[iIdx], ename);
+    WelsSnprintf (ename, SEM_NAME_MAX, "rc%d%s", iIdx, pSmt->eventNamespace);
+    WelsEventClose (&pSmt->pReadySliceCodingEvent[iIdx], ename);
+    WelsSnprintf (ename, SEM_NAME_MAX, "ud%d%s", iIdx, pSmt->eventNamespace);
+    WelsEventClose (&pSmt->pUpdateMbListEvent[iIdx], ename);
+    WelsSnprintf (ename, SEM_NAME_MAX, "fu%d%s", iIdx, pSmt->eventNamespace);
+    WelsEventClose (&pSmt->pFinUpdateMbListEvent[iIdx], ename);
+
+    ++ iIdx;
+  }
+  WelsSnprintf (ename, SEM_NAME_MAX, "scm%s", pSmt->eventNamespace);
+  WelsEventClose (&pSmt->pSliceCodedMasterEvent, ename);
+
+  WelsMutexDestroy (&pSmt->mutexSliceNumUpdate);
+  WelsMutexDestroy (&pSmt->mutexThreadBsBufferUsage);
+  WelsMutexDestroy (&pSmt->mutexThreadSlcBuffReallocate);
+  WelsMutexDestroy (& ((*ppCtx)->mutexEncoderError));
+  WelsMutexDestroy (&pSmt->mutexEvent);
+  if (pSmt->pThreadPEncCtx != NULL) {
+    pMa->WelsFree (pSmt->pThreadPEncCtx, "pThreadPEncCtx");
+    pSmt->pThreadPEncCtx = NULL;
+  }
+
+  for (int i = 0; i < MAX_THREADS_NUM; i++) {
+    if (pSmt->pThreadBsBuffer[i]) {
+      pMa->WelsFree (pSmt->pThreadBsBuffer[i], "pSmt->pThreadBsBuffer");
+      pSmt->pThreadBsBuffer[i] = NULL;
+    }
+  }
+  memset (&pSmt->bThreadBsBufferUsage, 0, MAX_THREADS_NUM * sizeof (bool));
+
+  if ((*ppCtx)->pTaskManage != NULL) {
+    WELS_DELETE_OP ((*ppCtx)->pTaskManage);
+  }
+
+#ifdef MT_DEBUG
+  // file handle for debug
+  if (pSmt->pFSliceDiff) {
+    fclose (pSmt->pFSliceDiff);
+    pSmt->pFSliceDiff = NULL;
+  }
+#endif//MT_DEBUG
+  pMa->WelsFree ((*ppCtx)->pSliceThreading, "SSliceThreading");
+  (*ppCtx)->pSliceThreading = NULL;
+}
+
+int32_t AppendSliceToFrameBs (sWelsEncCtx* pCtx, SLayerBSInfo* pLbi, const int32_t iSliceCount) {
+  SSlice** ppSliceInlayer = pCtx->pCurDqLayer->ppSliceInLayer;
+  SWelsSliceBs* pSliceBs  = NULL;
+  int32_t iLayerSize      = 0;
+  int32_t iNalIdxBase     = pLbi->iNalCount;
+  int32_t iSliceIdx       = 0;
+
+  iNalIdxBase  = pLbi->iNalCount = 0;
+  while (iSliceIdx < iSliceCount) {
+    pSliceBs    = &ppSliceInlayer[iSliceIdx]->sSliceBs;
+    if (pSliceBs != NULL && pSliceBs->uiBsPos > 0) {
+      int32_t iNalIdx = 0;
+      const int32_t iCountNal = pSliceBs->iNalIndex;
+
+#if MT_DEBUG_BS_WR
+      assert (pSliceBs->bSliceCodedFlag);
+#endif//MT_DEBUG_BS_WR
+
+      memmove (pCtx->pFrameBs + pCtx->iPosBsBuffer, pSliceBs->pBs, pSliceBs->uiBsPos); // confirmed_safe_unsafe_usage
+      pCtx->iPosBsBuffer += pSliceBs->uiBsPos;
+
+      iLayerSize += pSliceBs->uiBsPos;
+
+      while (iNalIdx < iCountNal) {
+        pLbi->pNalLengthInByte[iNalIdxBase + iNalIdx] = pSliceBs->iNalLen[iNalIdx];
+        ++ iNalIdx;
+      }
+      pLbi->iNalCount += iCountNal;
+      iNalIdxBase     += iCountNal;
+    }
+    ++ iSliceIdx;
+  }
+
+  return iLayerSize;
+}
+
+int32_t WriteSliceBs (sWelsEncCtx* pCtx, SWelsSliceBs* pSliceBs, const int32_t iSliceIdx, int32_t& iSliceSize) {
+  const int32_t kiNalCnt        = pSliceBs->iNalIndex;
+  int32_t iNalIdx               = 0;
+  int32_t iNalSize              = 0;
+  int32_t iReturn               = ENC_RETURN_SUCCESS;
+  int32_t iTotalLeftLength      = pSliceBs->uiSize - pSliceBs->uiBsPos;
+  SNalUnitHeaderExt* pNalHdrExt = &pCtx->pCurDqLayer->sLayerInfo.sNalHeaderExt;
+  uint8_t* pDst                 = pSliceBs->pBs;
+
+  assert (kiNalCnt <= 2);
+  if (kiNalCnt > 2)
+    return 0;
+
+  iSliceSize = 0;
+  while (iNalIdx < kiNalCnt) {
+    iNalSize = 0;
+    iReturn = WelsEncodeNal (&pSliceBs->sNalList[iNalIdx], pNalHdrExt, iTotalLeftLength - iSliceSize,
+                             pDst, &iNalSize);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+    pSliceBs->iNalLen[iNalIdx] = iNalSize;
+    iSliceSize                += iNalSize;
+    pDst                      += iNalSize;
+    ++ iNalIdx;
+  }
+  pSliceBs->uiBsPos = iSliceSize;
+
+  return iReturn;
+}
+
+// thread process for coding one pSlice
+int32_t DynamicDetectCpuCores() {
+  WelsLogicalProcessInfo  info;
+  WelsQueryLogicalProcessInfo (&info);
+  return info.ProcessorCount;
+}
+
+int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) {
+  SDqLayer* pCurDq      = pCtx->ppDqLayerList[0];
+  int32_t iNeedAdj      = 1;
+#ifdef MT_DEBUG
+  int64_t iT0 = WelsTime();
+#endif//MT_DEBUG
+
+  pCtx->pCurDqLayer = pCurDq;
+
+  // do not need adjust due to not different at both slices of consumed time
+  iNeedAdj = NeedDynamicAdjust (pCtx->ppDqLayerList[0]->ppSliceInLayer
+                                , pCurDq->sSliceEncCtx.iSliceNumInFrame);
+  if (iNeedAdj)
+    DynamicAdjustSlicing (pCtx,
+                          pCurDq,
+                          0);
+#ifdef MT_DEBUG
+  iT0 = WelsTime() - iT0;
+  if (pCtx->pSliceThreading->pFSliceDiff) {
+    fprintf (pCtx->pSliceThreading->pFSliceDiff,
+             "%6" PRId64" us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n",
+             iT0, iNeedAdj);
+  }
+#endif//MT_DEBUG
+
+  return iNeedAdj;
+}
+
+int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) {
+#ifdef MT_DEBUG
+  int64_t iT1 = WelsTime();
+#endif//MT_DEBUG
+  int32_t iNeedAdj = 1;
+  // uiSliceMode of referencing spatial should be SM_FIXEDSLCNUM_SLICE
+  // if using spatial base layer for complexity estimation
+
+  const bool kbModelingFromSpatial = (pCtx->pCurDqLayer->pRefLayer != NULL && iCurDid > 0)
+                                     && (pCtx->pSvcParam->sSpatialLayers[iCurDid - 1].sSliceArgument.uiSliceMode == SM_FIXEDSLCNUM_SLICE
+                                         && pCtx->pSvcParam->iMultipleThreadIdc >= pCtx->pSvcParam->sSpatialLayers[iCurDid -
+                                             1].sSliceArgument.uiSliceNum);
+
+  if (kbModelingFromSpatial) { // using spatial base layer for complexity estimation
+    // do not need adjust due to not different at both slices of consumed time
+    iNeedAdj = NeedDynamicAdjust (pCtx->ppDqLayerList[iCurDid - 1]->ppSliceInLayer,
+                                  pCtx->pCurDqLayer->sSliceEncCtx.iSliceNumInFrame);
+    if (iNeedAdj)
+      DynamicAdjustSlicing (pCtx,
+                            pCtx->pCurDqLayer,
+                            iCurDid
+                           );
+  } else { // use temporal layer for complexity estimation
+    // do not need adjust due to not different at both slices of consumed time
+    iNeedAdj = NeedDynamicAdjust (pCtx->ppDqLayerList[iCurDid]->ppSliceInLayer,
+                                  pCtx->pCurDqLayer->sSliceEncCtx.iSliceNumInFrame);
+    if (iNeedAdj)
+      DynamicAdjustSlicing (pCtx,
+                            pCtx->pCurDqLayer,
+                            iCurDid
+                           );
+  }
+
+#ifdef MT_DEBUG
+  iT1 = WelsTime() - iT1;
+  if (pCtx->pSliceThreading->pFSliceDiff) {
+    fprintf (pCtx->pSliceThreading->pFSliceDiff,
+             "%6" PRId64" us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n",
+             iT1, iCurDid, iNeedAdj);
+  }
+#endif//MT_DEBUG
+
+  return iNeedAdj;
+}
+
+
+
+#if defined(MT_DEBUG)
+void TrackSliceComplexities (sWelsEncCtx* pCtx, const int32_t iCurDid) {
+  const int32_t kiCountSliceNum = pCtx->pCurDqLayer->sSliceEncCtx.iSliceNumInFrame;
+  SSlice** ppSliceInLayer = pCtx->pCurDqLayer->ppSliceInLayer;
+  if (kiCountSliceNum > 0) {
+    int32_t iSliceIdx = 0;
+    do {
+      fprintf (pCtx->pSliceThreading->pFSliceDiff, "%6.3f complexity pRatio at iDid %d pSlice %d\n",
+               ppSliceInLayer[iSliceIdx]->iSliceComplexRatio, iCurDid, iSliceIdx);
+      ++ iSliceIdx;
+    } while (iSliceIdx < kiCountSliceNum);
+  }
+}
+#endif
+
+#if defined(MT_DEBUG)
+void TrackSliceConsumeTime (sWelsEncCtx* pCtx, int32_t* pDidList, const int32_t iSpatialNum) {
+  SWelsSvcCodingParam* pPara = NULL;
+  int32_t iSpatialIdx = 0;
+
+  if (iSpatialNum > MAX_DEPENDENCY_LAYER)
+    return;
+
+  pPara = pCtx->pSvcParam;
+  while (iSpatialIdx < iSpatialNum) {
+    const int32_t kiDid             = pDidList[iSpatialIdx];
+    SSliceArgument* pSliceArgument  = &pPara->sSpatialLayers[kiDid].sSliceArgument;
+    SDqLayer* pCurDq                = pCtx->ppDqLayerList[kiDid];
+    SSlice** ppSliceInLayer         = pCurDq->ppSliceInLayer;
+    SSliceCtx* pSliceCtx            = &pCurDq->sSliceEncCtx;
+    const uint32_t kuiCountSliceNum = pSliceCtx->iSliceNumInFrame;
+    if (pCtx->pSliceThreading) {
+      if (pCtx->pSliceThreading->pFSliceDiff
+          && ((pSliceArgument->uiSliceMode == SM_FIXEDSLCNUM_SLICE) || (pSliceArgument->uiSliceMode == SM_SIZELIMITED_SLICE))
+          && pPara->iMultipleThreadIdc > 1
+          && pPara->iMultipleThreadIdc >= kuiCountSliceNum) {
+        uint32_t i = 0;
+        uint32_t uiMaxT = 0;
+        int32_t iMaxI = 0;
+        while (i < kuiCountSliceNum) {
+          fprintf (pCtx->pSliceThreading->pFSliceDiff, "%6d us consume_time coding_idx %d iDid %d pSlice %d\n",
+                   ppSliceInLayer[i]->uiSliceConsumeTime, pCtx->iCodingIndex, kiDid, i /*/ 1000*/);
+          if (ppSliceInLayer[i]->uiSliceConsumeTime > uiMaxT) {
+            uiMaxT = ppSliceInLayer[i]->uiSliceConsumeTime;
+            iMaxI = i;
+          }
+          ++ i;
+        }
+        fprintf (pCtx->pSliceThreading->pFSliceDiff, "%6d us consume_time_max coding_idx %d iDid %d pSlice %d\n", uiMaxT,
+                 pCtx->iCodingIndex, kiDid, iMaxI /*/ 1000*/);
+      }
+    }
+    ++ iSpatialIdx;
+  }
+}
+#endif//#if defined(MT_DEBUG)
+
+void SetOneSliceBsBufferUnderMultithread (sWelsEncCtx* pCtx, const int32_t kiThreadIdx, SSlice* pSlice) {
+  SWelsSliceBs* pSliceBs  = &pSlice->sSliceBs;
+  pSliceBs->pBsBuffer     = pCtx->pSliceThreading->pThreadBsBuffer[kiThreadIdx];
+  pSliceBs->uiBsPos       = 0;
+}
+}
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_base_layer_md.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_base_layer_md.cpp
new file mode 100644
index 0000000000..5acc2d922b
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_base_layer_md.cpp
@@ -0,0 +1,2041 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_base_layer_md.c
+ *
+ * \brief   mode decision
+ *
+ * \date    2009.08.10 Created
+ *
+ *************************************************************************************
+ */
+#include "ls_defines.h"
+#include "mv_pred.h"
+#include "svc_enc_golomb.h"
+#include "svc_base_layer_md.h"
+#include "encoder.h"
+#include "svc_encode_mb.h"
+#include "svc_encode_slice.h"
+namespace WelsEnc {
+static const ALIGNED_DECLARE (int8_t, g_kiIntra16AvaliMode[8][5], 16) = {
+  { I16_PRED_DC_128, I16_PRED_INVALID, I16_PRED_INVALID, I16_PRED_INVALID, 1 },
+  { I16_PRED_DC_L,   I16_PRED_H,       I16_PRED_INVALID, I16_PRED_INVALID, 2 },
+  { I16_PRED_DC_T,   I16_PRED_V,       I16_PRED_INVALID, I16_PRED_INVALID, 2 },
+  { I16_PRED_V,      I16_PRED_H,       I16_PRED_DC,      I16_PRED_INVALID, 3 },
+  { I16_PRED_DC_128, I16_PRED_INVALID, I16_PRED_INVALID, I16_PRED_INVALID, 1 },
+  { I16_PRED_DC_L,   I16_PRED_H,       I16_PRED_INVALID, I16_PRED_INVALID, 2 },
+  { I16_PRED_DC_T,   I16_PRED_V,       I16_PRED_INVALID, I16_PRED_INVALID, 2 },
+  { I16_PRED_V,      I16_PRED_H,       I16_PRED_DC,      I16_PRED_P,       4 }
+};
+
+static const ALIGNED_DECLARE (uint8_t, g_kiIntra4AvailCount[16], 16) = {
+#ifndef  I4_PRED_MODE_EXTEND
+  1, 3, 2, 4, 1, 3, 2, 7, 1, 3, 4, 6, 1, 3, 4, 9
+#else
+  1, 3, 4, 4, 1, 3, 4, 7, 1, 3, 4, 6, 1, 3, 4, 9
+#endif  //I4_PRED_MODE_EXTEND
+};
+
+//left_avail | (top_avail<<1) | (left_top_avail<<2) | (right_top_avail<<3);
+static const ALIGNED_DECLARE (uint8_t, g_kiIntra4AvailMode[16][16], 16) = {
+  {
+    I4_PRED_DC_128,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },  //  0000
+
+  {
+    I4_PRED_DC_L,    I4_PRED_H,       I4_PRED_HU,      I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },  //  0001
+
+#ifndef  I4_PRED_MODE_EXTEND
+  {
+    I4_PRED_DC_T,    I4_PRED_V,       I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  }, //  0010
+#else
+  {
+    I4_PRED_DC_T,    I4_PRED_V,       I4_PRED_DDL_TOP, I4_PRED_VL_TOP,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  }, //  0010
+#endif //I4_PRED_MODE_EXTEND
+
+  {
+    I4_PRED_DC,      I4_PRED_H,       I4_PRED_V,       I4_PRED_HU,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  }, //  0011
+
+  {
+    I4_PRED_DC_128,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },  //  0100
+
+  {
+    I4_PRED_DC_L,    I4_PRED_H,       I4_PRED_HU,      I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },    //  0101
+
+#ifndef  I4_PRED_MODE_EXTEND
+  {
+    I4_PRED_DC_T,    I4_PRED_V,       I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },     //  0110
+#else
+  {
+    I4_PRED_DC_T,  I4_PRED_V,       I4_PRED_DDL_TOP, I4_PRED_VL_TOP,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },     //  0110
+#endif //I4_PRED_MODE_EXTEND
+
+  {
+    I4_PRED_DC,      I4_PRED_H,       I4_PRED_V,       I4_PRED_HU,
+    I4_PRED_DDR,     I4_PRED_VR,      I4_PRED_HD,      I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },               //  0111
+
+  {
+    I4_PRED_DC_128,   I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },  //  1000
+
+  {
+    I4_PRED_DC_L,    I4_PRED_H,       I4_PRED_HU,      I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },    //  1001
+
+  {
+    I4_PRED_DC_T,    I4_PRED_V,       I4_PRED_DDL,     I4_PRED_VL,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },     //  1010
+
+  {
+    I4_PRED_DC,      I4_PRED_H,       I4_PRED_V,       I4_PRED_HU,
+    I4_PRED_DDL,     I4_PRED_VL,      I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },          //  1011
+
+  {
+    I4_PRED_DC_128,  I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },  //  1100
+
+  {
+    I4_PRED_DC_L,    I4_PRED_H,       I4_PRED_HU,      I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },    //  1101
+
+  {
+    I4_PRED_DC_T,    I4_PRED_V,       I4_PRED_DDL,     I4_PRED_VL,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  },     //  1110
+
+  {
+    I4_PRED_DC,      I4_PRED_H,       I4_PRED_V,       I4_PRED_HU,
+    I4_PRED_DDL,     I4_PRED_VL,      I4_PRED_DDR,     I4_PRED_VR,
+    I4_PRED_HD,      I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID,
+    I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID, I4_PRED_INVALID
+  }                          //  1111
+
+};
+static const ALIGNED_DECLARE (int8_t, g_kiIntraChromaAvailMode[8][5], 16) = {
+  { C_PRED_DC_128, C_PRED_INVALID, C_PRED_INVALID, C_PRED_INVALID, 1 },
+  { C_PRED_DC_L,   C_PRED_H,       C_PRED_INVALID, C_PRED_INVALID, 2 },
+  { C_PRED_DC_T,   C_PRED_V,       C_PRED_INVALID, C_PRED_INVALID, 2 },
+  { C_PRED_V,      C_PRED_H,       C_PRED_DC,      C_PRED_INVALID, 3 },
+  { C_PRED_DC_128, C_PRED_INVALID, C_PRED_INVALID, C_PRED_INVALID, 1 },
+  { C_PRED_DC_L,   C_PRED_H,       C_PRED_INVALID, C_PRED_INVALID, 2 },
+  { C_PRED_DC_T,   C_PRED_V,       C_PRED_INVALID, C_PRED_INVALID, 2 },
+  { C_PRED_V,      C_PRED_H,       C_PRED_DC,      C_PRED_P,       4 }
+};
+
+// for cache hit, two table are total sizeof 64 Bytes
+const int8_t g_kiCoordinateIdx4x4X[16] = { 0, 4, 0, 4,
+                                           8, 12, 8, 12,
+                                           0, 4, 0, 4,
+                                           8, 12, 8, 12
+                                         };
+
+const int8_t g_kiCoordinateIdx4x4Y[16] = { 0, 0, 4, 4,
+                                           0, 0, 4, 4,
+                                           8, 8, 12, 12,
+                                           8, 8, 12, 12
+                                         };
+static const ALIGNED_DECLARE (int8_t, g_kiNeighborIntraToI4x4[16][16], 16) = {
+  { 0,  1,  10, 7,  1,  1,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 1,  1,  15, 7,  1,  1,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 10, 15, 10, 7,  15, 7,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 11, 15, 15, 7,  15, 7,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 4,  1,  10, 7,  1,  1,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 5,  1,  15, 7,  1,  1,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 14, 15, 10, 7,  15, 7,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 15, 15, 15, 7,  15, 7,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 0,  1,  10, 7,  1,  9,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 1,  1,  15, 7,  1,  9,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 10, 15, 10, 7,  15, 15, 15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 11, 15, 15, 7,  15, 15, 15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 4,  1,  10, 7,  1,  9,  15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 5,  1,  15, 7,  1,  9,  15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+  { 14, 15, 10, 7,  15, 15, 15, 7,  10, 15, 10, 7,  15, 7,  15, 7},
+  { 15, 15, 15, 7,  15, 15, 15, 7,  15, 15, 15, 7,  15, 7,  15, 7},
+};
+
+ALIGNED_DECLARE (const int8_t, g_kiMapModeI4x4[14], 16) = {
+  0, 1, 2, 3, 4, 5, 6, 7, 8, 2, 2, 2, 3, 7
+};
+
+int32_t PredIntra4x4Mode (int8_t* pIntraPredMode, int32_t iIdx4) {
+  int8_t iTopMode = pIntraPredMode[iIdx4 - 8];
+  int8_t iLeftMode = pIntraPredMode[iIdx4 - 1];
+  int8_t iBestMode;
+
+  if (-1 == iLeftMode || -1 == iTopMode) {
+    iBestMode = 2;
+  } else {
+    iBestMode = WELS_MIN (iLeftMode, iTopMode);
+  }
+  return iBestMode;
+}
+
+void WelsMdIntraInit (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, const int32_t iSliceFirstMbXY) {
+  SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
+
+  const int32_t kiMbX  = pCurMb->iMbX;
+  const int32_t kiMbY  = pCurMb->iMbY;
+  const int32_t kiMbXY = pCurMb->iMbXY;
+
+  // step 3. locating current pEnc and pDec
+  // unroll loops here
+  if (0 == kiMbX || iSliceFirstMbXY == kiMbXY) {
+    int32_t iStrideY, iStrideUV;
+    int32_t iOffsetY, iOffsetUV;
+
+    iStrideY    = pCurLayer->iEncStride[0];
+    iStrideUV   = pCurLayer->iEncStride[1];
+    iOffsetY    = (kiMbX + kiMbY * iStrideY) << 4;
+    iOffsetUV   = (kiMbX + kiMbY * iStrideUV) << 3;
+    pMbCache->SPicData.pEncMb[0]        = pCurLayer->pEncData[0] + iOffsetY;
+    pMbCache->SPicData.pEncMb[1]        = pCurLayer->pEncData[1] + iOffsetUV;
+    pMbCache->SPicData.pEncMb[2]        = pCurLayer->pEncData[2] + iOffsetUV;
+
+    iStrideY    = pCurLayer->iCsStride[0];
+    iStrideUV   = pCurLayer->iCsStride[1];
+    iOffsetY    = (kiMbX + kiMbY * iStrideY) << 4;
+    iOffsetUV   = (kiMbX + kiMbY * iStrideUV) << 3;
+    pMbCache->SPicData.pCsMb[0]         = pCurLayer->pCsData[0] + iOffsetY;
+    pMbCache->SPicData.pCsMb[1]         = pCurLayer->pCsData[1] + iOffsetUV;
+    pMbCache->SPicData.pCsMb[2]         = pCurLayer->pCsData[2] + iOffsetUV;
+
+    iStrideY    = pCurLayer->pDecPic->iLineSize[0];
+    iStrideUV   = pCurLayer->pDecPic->iLineSize[1];
+    iOffsetY    = (kiMbX + kiMbY * iStrideY) << 4;
+    iOffsetUV   = (kiMbX + kiMbY * iStrideUV) << 3;
+    pMbCache->SPicData.pDecMb[0]        = pCurLayer->pDecPic->pData[0] + iOffsetY;
+    pMbCache->SPicData.pDecMb[1]        = pCurLayer->pDecPic->pData[1] + iOffsetUV;
+    pMbCache->SPicData.pDecMb[2]        = pCurLayer->pDecPic->pData[2] + iOffsetUV;
+  } else {
+    pMbCache->SPicData.pEncMb[0]        += MB_WIDTH_LUMA;
+    pMbCache->SPicData.pEncMb[1]        += MB_WIDTH_CHROMA;
+    pMbCache->SPicData.pEncMb[2]        += MB_WIDTH_CHROMA;
+
+    pMbCache->SPicData.pDecMb[0]        += MB_WIDTH_LUMA;
+    pMbCache->SPicData.pDecMb[1]        += MB_WIDTH_CHROMA;
+    pMbCache->SPicData.pDecMb[2]        += MB_WIDTH_CHROMA;
+
+    pMbCache->SPicData.pCsMb[0]         += MB_WIDTH_LUMA;
+    pMbCache->SPicData.pCsMb[1]         += MB_WIDTH_CHROMA;
+    pMbCache->SPicData.pCsMb[2]         += MB_WIDTH_CHROMA;
+  }
+
+  //step 2. initial pWelsMd
+  pCurMb->uiCbp = 0;
+
+  //step 4: locating scaled_tcoeff
+
+  //step 1. load neighbor cache
+  FillNeighborCacheIntra (pMbCache, pCurMb, pCurLayer->iMbWidth);
+  pMbCache->pMemPredLuma = pMbCache->pMemPredMb;// in WelsMdI16x16() will be changed, so re-init here!
+  pMbCache->pMemPredChroma = pMbCache->pMemPredMb +
+                             256;// Init with default, maybe change in WelsMdI16x16 and svc_md_i16x16_sad
+}
+
+void WelsMdInterInit (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, const int32_t iSliceFirstMbXY) {
+  SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
+  SMbCache* pMbCache  = &pSlice->sMbCacheInfo;
+  const int32_t kiMbX  = pCurMb->iMbX;
+  const int32_t kiMbY  = pCurMb->iMbY;
+  const int32_t kiMbXY = pCurMb->iMbXY;
+  const int32_t kiMbWidth = pCurLayer->iMbWidth;
+  const int32_t kiMbHeight = pCurLayer->iMbHeight;
+
+  pMbCache->pEncSad = &pCurLayer->pDecPic->pMbSkipSad[kiMbXY];
+
+  //step 1. load neighbor cache
+  pEncCtx->pFuncList->pfFillInterNeighborCache (pMbCache, pCurMb, kiMbWidth,
+      pEncCtx->pVaa->pVaaBackgroundMbFlag + kiMbXY); //BGD spatial pFunc
+
+  //step 3: initial cost
+
+  //step 4. locating current p_ref
+  // merge loops
+  if (0 == kiMbX || iSliceFirstMbXY == kiMbXY) {
+    const int32_t kiRefStrideY          = pCurLayer->pRefPic->iLineSize[0];
+    const int32_t kiRefStrideUV         = pCurLayer->pRefPic->iLineSize[1];
+    const int32_t kiCurStrideY          = (kiMbX + kiMbY * kiRefStrideY) << 4;
+    const int32_t kiCurStrideUV         = (kiMbX + kiMbY * kiRefStrideUV) << 3;
+    pMbCache->SPicData.pRefMb[0]        = pCurLayer->pRefPic->pData[0] + kiCurStrideY;
+    pMbCache->SPicData.pRefMb[1]        = pCurLayer->pRefPic->pData[1] + kiCurStrideUV;
+    pMbCache->SPicData.pRefMb[2]        = pCurLayer->pRefPic->pData[2] + kiCurStrideUV;
+  } else {
+    pMbCache->SPicData.pRefMb[0]        += MB_WIDTH_LUMA;
+    pMbCache->SPicData.pRefMb[1]        += MB_WIDTH_CHROMA;
+    pMbCache->SPicData.pRefMb[2]        += MB_WIDTH_CHROMA;
+  }
+
+  pMbCache->uiRefMbType = pCurLayer->pRefPic->uiRefMbType[kiMbXY];
+  pMbCache->bCollocatedPredFlag = false;
+
+  //comment: sometimes, mode decision process may skip the md_p16x16 and md_pskip function,
+  ST32 (&pCurMb->sP16x16Mv, 0);
+  ST32 (&pCurLayer->pDecPic->sMvList[kiMbXY], 0);
+
+  SetMvWithinIntegerMvRange (kiMbWidth, kiMbHeight, kiMbX, kiMbY, pEncCtx->iMvRange, & (pSlice->sMvStartMin),
+                             & (pSlice->sMvStartMax));
+}
+
+int32_t WelsMdI16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda) {
+  const int8_t*  kpAvailMode;
+  int32_t iAvailCount;
+  int32_t iIdx = 0;
+  uint8_t* pPredI16x16[2] = {pMbCache->pMemPredMb, pMbCache->pMemPredMb + 256};
+  uint8_t* pDst       = pPredI16x16[0];
+  uint8_t* pDec       = pMbCache->SPicData.pCsMb[0];
+  uint8_t* pEnc       = pMbCache->SPicData.pEncMb[0];
+  int32_t iLineSizeDec = pCurDqLayer->iCsStride[0];
+  int32_t iLineSizeEnc = pCurDqLayer->iEncStride[0];
+  int32_t i, iCurCost, iCurMode, iBestMode, iBestCost = INT_MAX;
+
+  int32_t iOffset = pMbCache->uiNeighborIntra & 0x07;
+  iAvailCount = g_kiIntra16AvaliMode[iOffset][4];
+  kpAvailMode = g_kiIntra16AvaliMode[iOffset];
+  if (iAvailCount > 3 && pFunc->sSampleDealingFuncs.pfIntra16x16Combined3) {
+    iBestCost = pFunc->sSampleDealingFuncs.pfIntra16x16Combined3 (pDec, iLineSizeDec, pEnc, iLineSizeEnc, &iBestMode,
+                iLambda, pDst/*temp*/);
+    iCurMode = kpAvailMode[3];
+    pFunc->pfGetLumaI16x16Pred[iCurMode] (pDst, pDec, iLineSizeDec);
+    iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_16x16] (pDst, 16, pEnc, iLineSizeEnc) + iLambda * 4 ;
+    if (iCurCost < iBestCost) {
+      iBestMode = iCurMode;
+      iBestCost = iCurCost;
+    } else {
+      pFunc->pfGetLumaI16x16Pred[iBestMode] (pDst, pDec, iLineSizeDec);
+    }
+    iIdx = 1;
+    iBestCost += iLambda;
+  } else {
+    iBestMode = kpAvailMode[0];
+    for (i = 0; i < iAvailCount; ++ i) {
+      iCurMode = kpAvailMode[i];
+
+      assert (iCurMode >= 0 && iCurMode < 7);
+
+      pFunc->pfGetLumaI16x16Pred[iCurMode] (pDst, pDec, iLineSizeDec);
+      iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_16x16] (pDst, 16, pEnc, iLineSizeEnc);
+      iCurCost += iLambda * (BsSizeUE (g_kiMapModeI16x16[iCurMode]));
+      if (iCurCost < iBestCost) {
+        iBestMode = iCurMode;
+        iBestCost = iCurCost;
+        iIdx = iIdx ^ 0x01;
+        pDst = pPredI16x16[iIdx];
+      }
+    }
+  }
+  pMbCache->pMemPredChroma = pPredI16x16[iIdx];
+
+  pMbCache->pMemPredLuma = pPredI16x16[iIdx ^ 0x01];
+  pMbCache->uiLumaI16x16Mode  = iBestMode;
+  return iBestCost;
+}
+int32_t WelsMdI4x4 (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  int32_t iLambda               = pWelsMd->iLambda;
+  int32_t iBestCostLuma         = pWelsMd->iCostLuma;
+  uint8_t* pEncMb               = pMbCache->SPicData.pEncMb[0];
+  uint8_t* pDecMb               = pMbCache->SPicData.pCsMb[0];
+  const int32_t kiLineSizeEnc   = pCurDqLayer->iEncStride[0];
+  const int32_t kiLineSizeDec   = pCurDqLayer->iCsStride[0];
+
+  uint8_t* pCurEnc, *pCurDec, *pDst;
+
+  int32_t iPredMode, iCurMode, iBestMode, iFinalMode;
+  int32_t iCurCost, iBestCost;
+  int32_t iAvailCount;
+  const uint8_t* kpAvailMode;
+  int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
+  int32_t lambda[2] = {iLambda << 2, iLambda};
+  bool* pPrevIntra4x4PredModeFlag       = pMbCache->pPrevIntra4x4PredModeFlag;
+  int8_t* pRemIntra4x4PredModeFlag      = pMbCache->pRemIntra4x4PredModeFlag;
+  const uint8_t* kpIntra4x4AvailCount   = &g_kiIntra4AvailCount[0];
+  const uint8_t* kpCache48CountScan4    = &g_kuiCache48CountScan4Idx[0];
+  const int8_t* kpNeighborIntraToI4x4   = g_kiNeighborIntraToI4x4[pMbCache->uiNeighborIntra];
+  const int8_t* kpCoordinateIdxX        = &g_kiCoordinateIdx4x4X[0];
+  const int8_t* kpCoordinateIdxY        = &g_kiCoordinateIdx4x4Y[0];
+  int32_t iBestPredBufferNum            = 0;
+  int32_t iCosti4x4                     = 0;
+
+#if defined(X86_ASM)
+  WelsPrefetchZero_mmx (g_kiMapModeI4x4);
+  WelsPrefetchZero_mmx ((int8_t*)&pFunc->pfGetLumaI4x4Pred);
+#endif//X86_ASM
+
+  for (i = 0; i < 16; i++) {
+    const int32_t kiOffset = kpNeighborIntraToI4x4[i];
+
+    //step 1: locating current 4x4 block position in pEnc and pDecMb
+    iCoordinateX = kpCoordinateIdxX[i];
+    iCoordinateY = kpCoordinateIdxY[i];
+
+    iIdxStrideEnc = (iCoordinateY * kiLineSizeEnc) + iCoordinateX;
+    pCurEnc = pEncMb + iIdxStrideEnc;
+    iIdxStrideDec = (iCoordinateY * kiLineSizeDec) + iCoordinateX;
+    pCurDec = pDecMb + iIdxStrideDec;
+
+    //step 2: get predicted mode from neighbor
+    iPredMode = PredIntra4x4Mode (pMbCache->iIntraPredMode, kpCache48CountScan4[i]);
+
+    //step 3: collect candidates of iPredMode
+    iAvailCount = kpIntra4x4AvailCount[kiOffset];
+    kpAvailMode = g_kiIntra4AvailMode[kiOffset];
+
+    //step 4: gain the best pred mode
+    iBestCost = INT_MAX;
+    iBestMode = kpAvailMode[0];
+
+    if (pFunc->sSampleDealingFuncs.pfIntra4x4Combined3 && (iAvailCount >= 6)) {
+      pDst = &pMbCache->pMemPredBlk4[iBestPredBufferNum << 4];
+
+      iBestCost = pFunc->sSampleDealingFuncs.pfIntra4x4Combined3 (pCurDec, kiLineSizeDec, pCurEnc, kiLineSizeEnc, pDst,
+                  &iBestMode,
+                  lambda[iPredMode == 2], lambda[iPredMode == 1], lambda[iPredMode == 0]);
+      //     ST64(&pMbCache->pMemPredBlk4[iBestMode<<4], LD64(mem_pred_blk4_temp));
+      //     ST64(&pMbCache->pMemPredBlk4[8+(iBestMode<<4)], LD64(mem_pred_blk4_temp+8));
+
+      for (j = 3; j < iAvailCount; ++ j) {
+        iCurMode = kpAvailMode[j];
+
+        assert (iCurMode >= 0 && iCurMode < 14);
+
+        pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+        pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+        iCurCost = pFunc->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                   lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+        if (iCurCost < iBestCost) {
+          iBestMode = iCurMode;
+          iBestCost = iCurCost;
+          iBestPredBufferNum = 1 - iBestPredBufferNum;
+        }
+      }
+    } else {
+      for (j = 0; j < iAvailCount; ++ j) {
+        iCurMode = kpAvailMode[j];
+
+        assert (iCurMode >= 0 && iCurMode < 14);
+
+        pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+        pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+        iCurCost = pFunc->sSampleDealingFuncs.pfSampleSatd[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                   lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+        if (iCurCost < iBestCost) {
+          iBestMode = iCurMode;
+          iBestCost = iCurCost;
+          iBestPredBufferNum = 1 - iBestPredBufferNum;
+        }
+      }
+    }
+    pMbCache->pBestPredI4x4Blk4 = &pMbCache->pMemPredBlk4[iBestPredBufferNum << 4];
+    iCosti4x4 += iBestCost;
+    if (iCosti4x4 >= iBestCostLuma) {
+      break;
+    }
+
+    //step 5: update pred mode and sample avail cache
+    iFinalMode = g_kiMapModeI4x4[iBestMode];
+    if (iPredMode == iFinalMode) {
+      *pPrevIntra4x4PredModeFlag++ = true;
+    } else {
+      *pPrevIntra4x4PredModeFlag++ = false;
+      *pRemIntra4x4PredModeFlag  = (iFinalMode < iPredMode ? iFinalMode : (iFinalMode - 1));
+    }
+    pRemIntra4x4PredModeFlag++;
+    // pCurMb->pIntra4x4PredMode[g_kuiMbCountScan4Idx[i]] = iFinalMode;
+    pMbCache->iIntraPredMode[kpCache48CountScan4[i]] = iFinalMode;
+
+    //step 6: encoding I_4x4
+    WelsEncRecI4x4Y (pEncCtx, pCurMb, pMbCache, i);
+  }
+  ST32 (pCurMb->pIntra4x4PredMode, LD32 (&pMbCache->iIntraPredMode[33]));
+  pCurMb->pIntra4x4PredMode[4] = pMbCache->iIntraPredMode[12];
+  pCurMb->pIntra4x4PredMode[5] = pMbCache->iIntraPredMode[20];
+  pCurMb->pIntra4x4PredMode[6] = pMbCache->iIntraPredMode[28];
+  iCosti4x4 += (iLambda << 4) + (iLambda << 3); //4*6*lambda from JVT SATD0
+  return iCosti4x4;
+}
+
+int32_t WelsMdI4x4Fast (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  int32_t iLambda               = pWelsMd->iLambda;
+  int32_t iBestCostLuma         = pWelsMd->iCostLuma;
+  uint8_t* pEncMb               = pMbCache->SPicData.pEncMb[0];
+  uint8_t* pDecMb               = pMbCache->SPicData.pCsMb[0];
+  const int32_t kiLineSizeEnc   = pCurDqLayer->iEncStride[0];
+  const int32_t kiLineSizeDec   = pCurDqLayer->iCsStride[0];
+
+  uint8_t* pCurEnc, *pCurDec, *pDst;
+  int8_t iPredMode, iCurMode, iBestMode, iFinalMode;
+  int32_t iCurCost, iBestCost;
+  int32_t iAvailCount;
+  const uint8_t* kpAvailMode;
+  int32_t i, j, iCoordinateX, iCoordinateY, iIdxStrideEnc, iIdxStrideDec;
+  int32_t iCostH, iCostV, iCostVR, iCostHD, iCostVL, iCostHU, iBestModeFake;
+  int32_t lambda[2] = {iLambda << 2, iLambda};
+  bool* pPrevIntra4x4PredModeFlag       = pMbCache->pPrevIntra4x4PredModeFlag;
+  int8_t* pRemIntra4x4PredModeFlag      = pMbCache->pRemIntra4x4PredModeFlag;
+  const uint8_t* kpIntra4x4AvailCount   = &g_kiIntra4AvailCount[0];
+  const uint8_t* kpCache48CountScan4    = &g_kuiCache48CountScan4Idx[0];
+  const int8_t* kpNeighborIntraToI4x4   = g_kiNeighborIntraToI4x4[pMbCache->uiNeighborIntra];
+  const int8_t* kpCoordinateIdxX        = &g_kiCoordinateIdx4x4X[0];
+  const int8_t* kpCoordinateIdxY        = &g_kiCoordinateIdx4x4Y[0];
+  int32_t iBestPredBufferNum            = 0;
+  int32_t iCosti4x4                     = 0;
+#if defined(X86_ASM)
+  WelsPrefetchZero_mmx (g_kiMapModeI4x4);
+  WelsPrefetchZero_mmx ((int8_t*)&pFunc->pfGetLumaI4x4Pred);
+#endif//X86_ASM
+
+  for (i = 0; i < 16; i++) {
+    const int32_t kiOffset = kpNeighborIntraToI4x4[i];
+//    const int32_t i_next = (1+i) & 15; // next loop
+//    const uint8_t dummy_byte= pIntra4x4AvailCount[pNeighborIntraToI4x4[i_next]]; // prefetch pIntra4x4AvailCount of next loop to avoid cache missed
+
+    //step 1: locating current 4x4 block position in pEnc and pDecMb
+    iCoordinateX = kpCoordinateIdxX[i];
+    iCoordinateY = kpCoordinateIdxY[i];
+
+    iIdxStrideEnc = (iCoordinateY * kiLineSizeEnc) + iCoordinateX;
+    pCurEnc = pEncMb + iIdxStrideEnc;
+    iIdxStrideDec = (iCoordinateY * kiLineSizeDec) + iCoordinateX;
+    pCurDec = pDecMb + iIdxStrideDec;
+
+    //step 2: get predicted mode from neighbor
+    iPredMode = PredIntra4x4Mode (pMbCache->iIntraPredMode, kpCache48CountScan4[i]);
+    //step 3: collect candidates of iPredMode
+    iAvailCount = kpIntra4x4AvailCount[kiOffset];
+    kpAvailMode = g_kiIntra4AvailMode[kiOffset];
+
+    if (iAvailCount == 9 || iAvailCount == 7) {
+      //I4_PRED_DC(2)
+
+      iBestMode = I4_PRED_DC;
+
+      pDst = &pMbCache->pMemPredBlk4[iBestPredBufferNum << 4];
+
+      pFunc->pfGetLumaI4x4Pred[I4_PRED_DC] (pDst, pCurDec, kiLineSizeDec);
+      iBestCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                  lambda[iPredMode == g_kiMapModeI4x4[iBestMode]];
+
+      //I4_PRED_H(1)
+      iCurMode = I4_PRED_H;
+
+      pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+      pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+      iCostH = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                          lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+      if (iCurCost < iBestCost) {
+        iBestMode = iCurMode;
+        iBestCost = iCurCost;
+        iBestPredBufferNum = 1 - iBestPredBufferNum;
+      }
+
+      //I4_PRED_V(0)
+      iCurMode = I4_PRED_V;
+
+      pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+      pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+      iCostV = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                          lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+      if (iCurCost < iBestCost) {
+        iBestMode = iCurMode;
+        iBestCost = iCurCost;
+        iBestPredBufferNum = 1 - iBestPredBufferNum;
+      }
+      if (iCostV < iCostH) {
+        if (iAvailCount == 9) {
+          iBestModeFake = true; //indicating whether V is the best fake mode
+
+          //I4_PRED_VR(5) and I4_PRED_VL(7)
+          iCurMode = I4_PRED_VR;
+
+          pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+          pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+          iCostVR = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                               lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+          if (iCurCost < iBestCost) {
+            iBestMode = iCurMode;
+            iBestCost = iCurCost;
+            iBestPredBufferNum = 1 - iBestPredBufferNum;
+          }
+
+          if (iCurCost < iCostV)
+            iBestModeFake = false;
+
+          iCurMode = I4_PRED_VL;
+
+          pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+          pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+          iCostVL = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                               lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+          if (iCurCost < iBestCost) {
+            iBestMode = iCurMode;
+            iBestCost = iCurCost;
+            iBestPredBufferNum = 1 - iBestPredBufferNum;
+          }
+
+          if (iCurCost < iCostV)
+            iBestModeFake = false;
+
+          //Vertical Early Determination
+          if (!iBestModeFake) { //Vertical is not the best, go on checking...
+            //select the best one from VL and VR
+            if (iCostVR < iCostVL) {
+              //I4_PRED_DDR(4)
+              iCurMode = I4_PRED_DDR;
+
+              pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+              pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+
+              iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                         lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+              if (iCurCost < iBestCost) {
+                iBestMode = iCurMode;
+                iBestCost = iCurCost;
+                iBestPredBufferNum = 1 - iBestPredBufferNum;
+              }
+            } else {
+              //I4_PRED_DDL(3)
+              iCurMode = I4_PRED_DDL;
+
+              pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+              pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+
+              iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                         lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+              if (iCurCost < iBestCost) {
+                iBestMode = iCurMode;
+                iBestCost = iCurCost;
+                iBestPredBufferNum = 1 - iBestPredBufferNum;
+              }
+            }
+          }
+        } else if (iAvailCount == 7) {
+          iCurMode = I4_PRED_DDR;
+
+          pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+          pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+          iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                     lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+          if (iCurCost < iBestCost) {
+            iBestMode = iCurMode;
+            iBestCost = iCurCost;
+            iBestPredBufferNum = 1 - iBestPredBufferNum;
+          }
+
+          iCurMode = I4_PRED_VR;
+
+          pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+          pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+
+          iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                     lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+          if (iCurCost < iBestCost) {
+            iBestMode = iCurMode;
+            iBestCost = iCurCost;
+            iBestPredBufferNum = 1 - iBestPredBufferNum;
+          }
+        }
+      } else {
+        iBestModeFake = true; //indicating whether H is the best fake mode
+        //I4_PRED_HD(6) and I4_PRED_HU(8)
+        iCurMode = I4_PRED_HD;
+
+        pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+        pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+        iCostHD = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                             lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+        if (iCurCost < iBestCost) {
+          iBestMode = iCurMode;
+          iBestCost = iCurCost;
+          iBestPredBufferNum = 1 - iBestPredBufferNum;
+        }
+
+        if (iCurCost < iCostH)
+          iBestModeFake = false;
+
+        iCurMode = I4_PRED_HU;
+
+        pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+        pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+        iCostHU = iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                             lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+        if (iCurCost < iBestCost) {
+          iBestMode = iCurMode;
+          iBestCost = iCurCost;
+          iBestPredBufferNum = 1 - iBestPredBufferNum;
+        }
+
+        if (iCurCost < iCostH)
+          iBestModeFake = false;
+
+        if (!iBestModeFake) { //Horizontal is not the best, go on checking...
+          //select the best one from VL and VR
+          if (iCostHD < iCostHU) {
+            //I4_PRED_DDR(4)
+            iCurMode = I4_PRED_DDR;
+
+            pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+            pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+            iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                       lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+            if (iCurCost < iBestCost) {
+              iBestMode = iCurMode;
+              iBestCost = iCurCost;
+              iBestPredBufferNum = 1 - iBestPredBufferNum;
+            }
+          } else if (iAvailCount == 9) {
+            //I4_PRED_DDL(3)
+            iCurMode = I4_PRED_DDL;
+
+            pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+            pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+
+            iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                       lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+            if (iCurCost < iBestCost) {
+              iBestMode = iCurMode;
+              iBestCost = iCurCost;
+              iBestPredBufferNum = 1 - iBestPredBufferNum;
+            }
+
+          }
+        }
+      }
+    } else {
+      iBestCost = INT_MAX;
+      iBestMode = I4_PRED_INVALID;
+      for (j = 0; j < iAvailCount; j++) {
+        // I4x4_MODE_CHECK(pAvailMode[j], iCurCost);
+        iCurMode = kpAvailMode[j];
+
+        pDst = &pMbCache->pMemPredBlk4[ (1 - iBestPredBufferNum) << 4];
+
+        pFunc->pfGetLumaI4x4Pred[iCurMode] (pDst, pCurDec, kiLineSizeDec);
+        iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_4x4] (pDst, 4, pCurEnc, kiLineSizeEnc) +
+                   lambda[iPredMode == g_kiMapModeI4x4[iCurMode]];
+
+        if (iCurCost < iBestCost) {
+          iBestMode = iCurMode;
+          iBestCost = iCurCost;
+          iBestPredBufferNum = 1 - iBestPredBufferNum;
+        }
+      }
+    }
+    pMbCache->pBestPredI4x4Blk4 = &pMbCache->pMemPredBlk4[iBestPredBufferNum << 4];
+    iCosti4x4 += iBestCost;
+    if (iCosti4x4 >= iBestCostLuma) {
+      break;
+    }
+
+    //step 5: update pred mode and sample avail cache
+    iFinalMode = g_kiMapModeI4x4[iBestMode];
+    if (iPredMode == iFinalMode) {
+      *pPrevIntra4x4PredModeFlag++ = true;
+    } else {
+      *pPrevIntra4x4PredModeFlag++ = false;
+      *pRemIntra4x4PredModeFlag  = (iFinalMode < iPredMode ? iFinalMode : (iFinalMode - 1));
+    }
+    pRemIntra4x4PredModeFlag++;
+    // pCurMb->pIntra4x4PredMode[scan4[i]] = iFinalMode;
+    pMbCache->iIntraPredMode[kpCache48CountScan4[i]] = iFinalMode;
+    //step 6: encoding I_4x4
+    WelsEncRecI4x4Y (pEncCtx, pCurMb, pMbCache, i);
+  }
+  ST32 (pCurMb->pIntra4x4PredMode, LD32 (&pMbCache->iIntraPredMode[33]));
+  pCurMb->pIntra4x4PredMode[4] = pMbCache->iIntraPredMode[12];
+  pCurMb->pIntra4x4PredMode[5] = pMbCache->iIntraPredMode[20];
+  pCurMb->pIntra4x4PredMode[6] = pMbCache->iIntraPredMode[28];
+  iCosti4x4 += (iLambda << 4) + (iLambda << 3); //4*6*lambda from JVT SATD0
+  return iCosti4x4;
+}
+
+int32_t WelsMdIntraChroma (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SMbCache* pMbCache, int32_t iLambda) {
+  const int8_t* kpAvailMode;
+  int32_t iAvailCount = 0;
+  int32_t iChmaIdx = 0;
+  uint8_t* pPredIntraChma[2]    = {pMbCache->pMemPredChroma, pMbCache->pMemPredChroma + 128};
+  uint8_t* pDstChma             = pPredIntraChma[0];
+  uint8_t* pEncCb               = pMbCache->SPicData.pEncMb[1];
+  uint8_t* pEncCr               = pMbCache->SPicData.pEncMb[2];
+  uint8_t* pDecCb               = pMbCache->SPicData.pCsMb[1];//pMbCache->SPicData.pDecMb[1];
+  uint8_t* pDecCr               = pMbCache->SPicData.pCsMb[2];//pMbCache->SPicData.pDecMb[2];
+  const int32_t kiLineSizeEnc   = pCurDqLayer->iEncStride[1];
+  const int32_t kiLineSizeDec   = pCurDqLayer->iCsStride[1];//pMbCache->SPicData.i_stride_dec[1];
+
+  int32_t i, iCurMode, iCurCost, iBestMode, iBestCost = INT_MAX;
+
+  int32_t iOffset = pMbCache->uiNeighborIntra & 0x07;
+  iAvailCount = g_kiIntraChromaAvailMode[iOffset][4];
+  kpAvailMode = g_kiIntraChromaAvailMode[iOffset];
+  if (iAvailCount > 3 && pFunc->sSampleDealingFuncs.pfIntra8x8Combined3) {
+    iBestCost = pFunc->sSampleDealingFuncs.pfIntra8x8Combined3 (pDecCb, kiLineSizeDec, pEncCb, kiLineSizeEnc, &iBestMode,
+                iLambda, pDstChma, pDecCr, pEncCr);
+    iCurMode = kpAvailMode[3];
+    pFunc->pfGetChromaPred[iCurMode] (pDstChma, pDecCb, kiLineSizeDec); //Cb
+    pFunc->pfGetChromaPred[iCurMode] (pDstChma + 64, pDecCr, kiLineSizeDec); //Cr
+
+    iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_8x8] (pDstChma, 8, pEncCb, kiLineSizeEnc) +
+               pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_8x8] (pDstChma + 64, 8, pEncCr, kiLineSizeEnc) +
+               iLambda * 4;
+    if (iCurCost < iBestCost) {
+      iBestMode = iCurMode;
+      iBestCost = iCurCost;
+    } else {
+      pFunc->pfGetChromaPred[iBestMode] (pDstChma, pDecCb, kiLineSizeDec); //Cb
+      pFunc->pfGetChromaPred[iBestMode] (pDstChma + 64, pDecCr, kiLineSizeDec); //Cr
+    }
+    iBestCost += iLambda;
+    iChmaIdx = 1;
+  } else {
+    iBestMode = kpAvailMode[0];
+    for (i = 0; i < iAvailCount; ++ i) {
+      iCurMode = kpAvailMode[i];
+
+      assert (iCurMode >= 0 && iCurMode < 7);
+
+      // pDstCb = &pMbCache->mem_pred_intra_cb[iCurMode<<6];
+      // pDstCr = &pMbCache->mem_pred_intra_cr[iCurMode<<6];
+      pFunc->pfGetChromaPred[iCurMode] (pDstChma, pDecCb, kiLineSizeDec); //Cb
+      iCurCost = pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_8x8] (pDstChma, 8, pEncCb, kiLineSizeEnc);
+
+      pFunc->pfGetChromaPred[iCurMode] (pDstChma + 64, pDecCr, kiLineSizeDec); //Cr
+      iCurCost += pFunc->sSampleDealingFuncs.pfMdCost[BLOCK_8x8] (pDstChma + 64, 8, pEncCr, kiLineSizeEnc) +
+                  iLambda * BsSizeUE (g_kiMapModeIntraChroma[iCurMode]);
+      if (iCurCost < iBestCost) {
+        iBestMode = iCurMode;
+        iBestCost = iCurCost;
+        iChmaIdx = iChmaIdx ^ 0x01;
+        pDstChma = pPredIntraChma[iChmaIdx];
+      }
+    }
+  }
+
+  pMbCache->pBestPredIntraChroma = pPredIntraChma[iChmaIdx ^ 0x01];
+  pMbCache->uiChmaI8x8Mode = iBestMode;
+  return iBestCost;
+}
+int32_t WelsMdIntraFinePartition (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  int32_t iCosti4x4 = WelsMdI4x4 (pEncCtx, pWelsMd, pCurMb, pMbCache);
+
+  if (iCosti4x4 < pWelsMd->iCostLuma) {
+    pCurMb->uiMbType = MB_TYPE_INTRA4x4;
+    pWelsMd->iCostLuma = iCosti4x4;
+  }
+  return pWelsMd->iCostLuma;
+}
+
+int32_t WelsMdIntraFinePartitionVaa (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+
+  if (MdIntraAnalysisVaaInfo (pEncCtx, pMbCache->SPicData.pEncMb[0])) {
+    int32_t iCosti4x4 = WelsMdI4x4Fast (pEncCtx, pWelsMd, pCurMb, pMbCache);
+
+    if (iCosti4x4 < pWelsMd->iCostLuma) {
+      pCurMb->uiMbType = MB_TYPE_INTRA4x4;
+      pWelsMd->iCostLuma = iCosti4x4;
+    }
+  }
+
+  return pWelsMd->iCostLuma;
+}
+
+void WelsMdIntraMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  //initial prediction memory for I_16x16
+  pWelsMd->iCostLuma = WelsMdI16x16 (pEncCtx->pFuncList, pEncCtx->pCurDqLayer, pMbCache, pWelsMd->iLambda);
+  pCurMb->uiMbType = MB_TYPE_INTRA16x16;
+
+  WelsMdIntraSecondaryModesEnc (pEncCtx, pWelsMd, pCurMb, pMbCache);
+}
+
+static inline void InitMe (const SWelsMD& sWelsMd, const int32_t iBlockSize, uint8_t* pEnc, uint8_t* pRef,
+                           SScreenBlockFeatureStorage* pRefFeatureStorage,
+                           SWelsME& sWelsMe) {
+  sWelsMe.iCurMeBlockPixX = sWelsMd.iMbPixX;
+  sWelsMe.iCurMeBlockPixY = sWelsMd.iMbPixY;
+  sWelsMe.uiBlockSize = iBlockSize;
+  sWelsMe.pMvdCost = sWelsMd.pMvdCost;
+
+  sWelsMe.pEncMb = pEnc;
+  sWelsMe.pRefMb = sWelsMe.pColoRefMb = pRef;
+
+  sWelsMe.pRefFeatureStorage = pRefFeatureStorage;
+}
+
+int32_t WelsMdP16x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurLayer, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  SWelsME* pMe16x16 = &pWelsMd->sMe.sMe16x16;
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  const int32_t kiMbWidth  = pCurLayer->iMbWidth;  // for assign once
+  const int32_t kiMbHeight = pCurLayer->iMbHeight;
+  InitMe (*pWelsMd, BLOCK_16x16, pMbCache->SPicData.pEncMb[0], pMbCache->SPicData.pRefMb[0],
+          pCurLayer->pRefPic->pScreenBlockFeatureStorage,
+          *pMe16x16);
+  //not putting the line below into InitMe to avoid judging mode in InitMe
+  pMe16x16->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb;
+
+  pSlice->uiMvcNum = 0;
+  pSlice->sMvc[pSlice->uiMvcNum++] = pMe16x16->sMvBase;
+  //spatial motion vector predictors
+  if (uiNeighborAvail & LEFT_MB_POS) { //left available
+    pSlice->sMvc[pSlice->uiMvcNum++] = (pCurMb - 1)->sP16x16Mv;
+  }
+  if (uiNeighborAvail & TOP_MB_POS) { //top available
+    pSlice->sMvc[pSlice->uiMvcNum++] = (pCurMb - kiMbWidth)->sP16x16Mv;
+  }
+  //temporal motion vector predictors
+  if (pCurLayer->pRefPic->iPictureType == P_SLICE) {
+    if (pCurMb->iMbX < kiMbWidth - 1) {
+      SMVUnitXY sTempMv = pCurLayer->pRefPic->sMvList[pCurMb->iMbXY + 1];
+      pSlice->sMvc[pSlice->uiMvcNum].iMvX = sTempMv.iMvX >> pSlice->sScaleShift;
+      pSlice->sMvc[pSlice->uiMvcNum].iMvY = sTempMv.iMvY >> pSlice->sScaleShift;
+      ++ pSlice->uiMvcNum;
+    }
+    if (pCurMb->iMbY < kiMbHeight - 1) {
+      SMVUnitXY sTempMv = pCurLayer->pRefPic->sMvList[pCurMb->iMbXY + kiMbWidth];
+      pSlice->sMvc[pSlice->uiMvcNum].iMvX = sTempMv.iMvX >> pSlice->sScaleShift;
+      pSlice->sMvc[pSlice->uiMvcNum].iMvY = sTempMv.iMvY >> pSlice->sScaleShift;
+      ++ pSlice->uiMvcNum;
+    }
+  }
+
+  PredMv (&pMbCache->sMvComponents, 0, 4, 0, & (pMe16x16->sMvp));
+  pFunc->pfMotionSearch[0] (pFunc, pCurLayer, pMe16x16, pSlice);
+
+  pCurMb->sP16x16Mv = pMe16x16->sMv;
+  pCurLayer->pDecPic->sMvList[pCurMb->iMbXY] = pMe16x16->sMv;
+
+  return pMe16x16->uiSatdCost;
+}
+int32_t WelsMdP16x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iStrideEnc = pCurDqLayer->iEncStride[0];
+  int32_t iStrideRef = pCurDqLayer->pRefPic->iLineSize[0];
+  SWelsME* sMe16x8;
+  int32_t i = 0, iPixelY;
+  int32_t iCostP16x8 = 0;
+  do {
+    sMe16x8 = &pWelsMd->sMe.sMe16x8[i];
+    iPixelY = (i << 3);
+    InitMe (*pWelsMd, BLOCK_16x8,
+            pMbCache->SPicData.pEncMb[0] + (iPixelY * iStrideEnc),
+            pMbCache->SPicData.pRefMb[0] + (iPixelY * iStrideRef),
+            pCurDqLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe16x8);
+    //not putting the lines below into InitMe to avoid judging mode in InitMe
+    sMe16x8->iCurMeBlockPixY = pWelsMd->iMbPixY + iPixelY;
+    sMe16x8->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 1;
+
+    pSlice->sMvc[0] = sMe16x8->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredInter16x8Mv (pMbCache, i << 3, 0, & (sMe16x8->sMvp));
+    pFunc->pfMotionSearch[0] (pFunc, pCurDqLayer, sMe16x8, pSlice);
+    UpdateP16x8Motion2Cache (pMbCache, i << 3, pWelsMd->uiRef, & (sMe16x8->sMv));
+    iCostP16x8 += sMe16x8->uiSatdCost;
+    ++i;
+  } while (i < 2);
+  return iCostP16x8;
+}
+int32_t WelsMdP8x16 (SWelsFuncPtrList* pFunc, SDqLayer* pCurLayer, SWelsMD* pWelsMd, SSlice* pSlice) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  SWelsME* sMe8x16;
+  int32_t i = 0, iPixelX;
+  int32_t iCostP8x16 = 0;
+  do {
+    iPixelX = (i << 3);
+    sMe8x16 = &pWelsMd->sMe.sMe8x16[i];
+    InitMe (*pWelsMd, BLOCK_8x16,
+            pMbCache->SPicData.pEncMb[0] + iPixelX,
+            pMbCache->SPicData.pRefMb[0] + iPixelX,
+            pCurLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe8x16);
+    //not putting the lines below into InitMe to avoid judging mode in InitMe
+    sMe8x16->iCurMeBlockPixX = pWelsMd->iMbPixX + iPixelX;
+    sMe8x16->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 1;
+
+    pSlice->sMvc[0] = sMe8x16->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredInter8x16Mv (pMbCache, i << 2, 0, & (sMe8x16->sMvp));
+    pFunc->pfMotionSearch[0] (pFunc, pCurLayer, sMe8x16, pSlice);
+    UpdateP8x16Motion2Cache (pMbCache, i << 2, pWelsMd->uiRef, & (sMe8x16->sMv));
+    iCostP8x16 += sMe8x16->uiSatdCost;
+    ++i;
+  } while (i < 2);
+  return iCostP8x16;
+}
+int32_t WelsMdP8x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iLineSizeEnc = pCurDqLayer->iEncStride[0];
+  int32_t iLineSizeRef = pCurDqLayer->pRefPic->iLineSize[0];
+  SWelsME* sMe8x8;
+  int32_t i, iIdxX, iIdxY, iPixelX, iPixelY, iStrideEnc, iStrideRef;
+  int32_t iCostP8x8 = 0;
+  for (i = 0; i < 4; i++) {
+    iIdxX = i & 1;
+    iIdxY = i >> 1;
+    iPixelX = (iIdxX << 3);
+    iPixelY = (iIdxY << 3);
+    iStrideEnc = iPixelX + (iPixelY * iLineSizeEnc);
+    iStrideRef = iPixelX + (iPixelY * iLineSizeRef);
+
+    sMe8x8 = &pWelsMd->sMe.sMe8x8[i];
+    InitMe (*pWelsMd, BLOCK_8x8,
+            pMbCache->SPicData.pEncMb[0] + iStrideEnc,
+            pMbCache->SPicData.pRefMb[0] + iStrideRef,
+            pCurDqLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe8x8);
+    //not putting these three lines below into InitMe to avoid judging mode in InitMe
+    sMe8x8->iCurMeBlockPixX = pWelsMd->iMbPixX + iPixelX;
+    sMe8x8->iCurMeBlockPixY = pWelsMd->iMbPixY + iPixelY;
+    sMe8x8->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 2;
+
+
+    pSlice->sMvc[0] = sMe8x8->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredMv (&pMbCache->sMvComponents, i << 2, 2, pWelsMd->uiRef, & (sMe8x8->sMvp));
+    pFunc->pfMotionSearch[pWelsMd->iBlock8x8StaticIdc[i]] (pFunc, pCurDqLayer, sMe8x8, pSlice);
+    UpdateP8x8Motion2Cache (pMbCache, i << 2, pWelsMd->uiRef, & (sMe8x8->sMv));
+    iCostP8x8 += sMe8x8->uiSatdCost;
+//    sMe8x8++;
+  }
+  return iCostP8x8;
+}
+
+int32_t WelsMdP4x4 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice,
+                    const int32_t ki8x8Idx) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iLineSizeEnc = pCurDqLayer->iEncStride[0];
+  int32_t iLineSizeRef = pCurDqLayer->pRefPic->iLineSize[0];
+  SWelsME* sMe4x4;
+  int32_t i4x4Idx, iIdxX, iIdxY, iPixelX, iPixelY, iStrideEnc, iStrideRef;
+  int32_t iCostP4x4 = 0;
+  for (i4x4Idx = 0; i4x4Idx < 4; ++i4x4Idx) {
+    int32_t iPartIdx = (ki8x8Idx << 2) + i4x4Idx;
+    iIdxX = ((ki8x8Idx & 1) << 1) + (i4x4Idx & 1);
+    iIdxY = ((ki8x8Idx >> 1) << 1) + (i4x4Idx >> 1);
+    iPixelX = (iIdxX << 2);
+    iPixelY = (iIdxY << 2);
+    iStrideEnc = iPixelX + (iPixelY * iLineSizeEnc);
+    iStrideRef = iPixelX + (iPixelY * iLineSizeRef);
+
+    sMe4x4 = &pWelsMd->sMe.sMe4x4[ki8x8Idx][i4x4Idx];
+    InitMe (*pWelsMd, BLOCK_4x4,
+            pMbCache->SPicData.pEncMb[0] + iStrideEnc,
+            pMbCache->SPicData.pRefMb[0] + iStrideRef,
+            pCurDqLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe4x4);
+    //not putting these three lines below into InitMe to avoid judging mode in InitMe
+    sMe4x4->iCurMeBlockPixX = pWelsMd->iMbPixX + iPixelX;
+    sMe4x4->iCurMeBlockPixY = pWelsMd->iMbPixY + iPixelY;
+    sMe4x4->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 2;
+
+    pSlice->sMvc[0] = sMe4x4->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredMv (&pMbCache->sMvComponents, iPartIdx, 1, pWelsMd->uiRef, & (sMe4x4->sMvp));
+    pFunc->pfMotionSearch[0] (pFunc, pCurDqLayer, sMe4x4, pSlice);
+    UpdateP4x4Motion2Cache (pMbCache, iPartIdx, pWelsMd->uiRef, & (sMe4x4->sMv));
+    iCostP4x4 += sMe4x4->uiSatdCost;
+  }
+  return iCostP4x4;
+}
+
+int32_t WelsMdP8x4 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice,
+                    const int32_t ki8x8Idx) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iLineSizeEnc = pCurDqLayer->iEncStride[0];
+  int32_t iLineSizeRef = pCurDqLayer->pRefPic->iLineSize[0];
+  SWelsME* sMe8x4;
+  int32_t i8x4Idx, iIdxX, iIdxY, iPixelX, iPixelY, iStrideEnc, iStrideRef;
+  int32_t iCostP8x4 = 0;
+  for (i8x4Idx = 0; i8x4Idx < 2; ++i8x4Idx) {
+    int32_t iPartIdx = (ki8x8Idx << 2) + (i8x4Idx << 1);
+    iIdxX = ((ki8x8Idx & 1) << 1);
+    iIdxY = ((ki8x8Idx >> 1) << 1) + i8x4Idx;
+    iPixelX = (iIdxX << 2);
+    iPixelY = (iIdxY << 2);
+    iStrideEnc = iPixelX + (iPixelY * iLineSizeEnc);
+    iStrideRef = iPixelX + (iPixelY * iLineSizeRef);
+
+    sMe8x4 = &pWelsMd->sMe.sMe8x4[ki8x8Idx][i8x4Idx];
+    InitMe (*pWelsMd, BLOCK_8x4,
+            pMbCache->SPicData.pEncMb[0] + iStrideEnc,
+            pMbCache->SPicData.pRefMb[0] + iStrideRef,
+            pCurDqLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe8x4);
+    //not putting these three lines below into InitMe to avoid judging mode in InitMe
+    sMe8x4->iCurMeBlockPixX = pWelsMd->iMbPixX + iPixelX;
+    sMe8x4->iCurMeBlockPixY = pWelsMd->iMbPixY + iPixelY;
+    sMe8x4->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 2;
+
+    pSlice->sMvc[0] = sMe8x4->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredMv (&pMbCache->sMvComponents, iPartIdx, 2, pWelsMd->uiRef, & (sMe8x4->sMvp));
+    pFunc->pfMotionSearch[0] (pFunc, pCurDqLayer, sMe8x4, pSlice);
+    UpdateP8x4Motion2Cache (pMbCache, iPartIdx, pWelsMd->uiRef, & (sMe8x4->sMv));
+    iCostP8x4 += sMe8x4->uiSatdCost;
+  }
+  return iCostP8x4;
+}
+
+int32_t WelsMdP4x8 (SWelsFuncPtrList* pFunc, SDqLayer* pCurDqLayer, SWelsMD* pWelsMd, SSlice* pSlice,
+                    const int32_t ki8x8Idx) {
+  //Wayne, to be modified
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iLineSizeEnc = pCurDqLayer->iEncStride[0];
+  int32_t iLineSizeRef = pCurDqLayer->pRefPic->iLineSize[0];
+  SWelsME* sMe4x8;
+  int32_t i4x8Idx, iIdxX, iIdxY, iPixelX, iPixelY, iStrideEnc, iStrideRef;
+  int32_t iCostP4x8 = 0;
+  for (i4x8Idx = 0; i4x8Idx < 2; ++i4x8Idx) {
+    int32_t iPartIdx = (ki8x8Idx << 2) + i4x8Idx;
+    iIdxX = ((ki8x8Idx & 1) << 1) + i4x8Idx;
+    iIdxY = ((ki8x8Idx >> 1) << 1);
+    iPixelX = (iIdxX << 2);
+    iPixelY = (iIdxY << 2);
+    iStrideEnc = iPixelX + (iPixelY * iLineSizeEnc);
+    iStrideRef = iPixelX + (iPixelY * iLineSizeRef);
+
+    sMe4x8 = &pWelsMd->sMe.sMe4x8[ki8x8Idx][i4x8Idx];
+    InitMe (*pWelsMd, BLOCK_4x8,
+            pMbCache->SPicData.pEncMb[0] + iStrideEnc,
+            pMbCache->SPicData.pRefMb[0] + iStrideRef,
+            pCurDqLayer->pRefPic->pScreenBlockFeatureStorage,
+            *sMe4x8);
+    //not putting these three lines below into InitMe to avoid judging mode in InitMe
+    sMe4x8->iCurMeBlockPixX = pWelsMd->iMbPixX + iPixelX;
+    sMe4x8->iCurMeBlockPixY = pWelsMd->iMbPixY + iPixelY;
+    sMe4x8->uSadPredISatd.uiSadPred = pWelsMd->iSadPredMb >> 2;
+
+    pSlice->sMvc[0] = sMe4x8->sMvBase;
+    pSlice->uiMvcNum = 1;
+
+    PredMv (&pMbCache->sMvComponents, iPartIdx, 1, pWelsMd->uiRef, & (sMe4x8->sMvp));
+    pFunc->pfMotionSearch[0] (pFunc, pCurDqLayer, sMe4x8, pSlice);
+    UpdateP4x8Motion2Cache (pMbCache, iPartIdx, pWelsMd->uiRef, & (sMe4x8->sMv));
+    iCostP4x8 += sMe4x8->uiSatdCost;
+  }
+  return iCostP4x8;
+}
+
+void WelsMdInterFinePartition (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, int32_t iBestCost) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+//  SMbCache *pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iCost = 0;
+
+//  WelsLog( pEncCtx, WELS_LOG_INFO, "WelsMdP8x8, p_ref[0]= 0x%p", pMbCache->SPicData.pRefMb[0]);
+
+  iCost = WelsMdP8x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+
+  if (iCost < iBestCost) {
+    int32_t iCostPart;
+    pCurMb->uiMbType = MB_TYPE_8x8;
+    memset (pCurMb->uiSubMbType, SUB_MB_TYPE_8x8, 4);
+
+//    WelsLog( pEncCtx, WELS_LOG_INFO, "WelsMdP16x8, p_ref[0]= 0x%p", pMbCache->SPicData.pRefMb[0]);
+    iCostPart = WelsMdP16x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostPart <= iCost) {
+      iCost = iCostPart;
+      pCurMb->uiMbType = MB_TYPE_16x8;
+      //pCurMb->mb_partition = 2;
+    }
+
+//    WelsLog( pEncCtx, WELS_LOG_INFO, "WelsMdP8x16, p_ref[0]= 0x%p", pMbCache->SPicData.pRefMb[0]);
+    iCostPart = WelsMdP8x16 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostPart <= iCost) {
+      iCost = iCostPart;
+      pCurMb->uiMbType = MB_TYPE_8x16;
+      //pCurMb->mb_partition = 2;
+    }
+  }
+}
+
+void WelsMdInterFinePartitionVaa (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
+                                  int32_t iBestCost) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+//  SMbCache *pMbCache = &pSlice->sMbCacheInfo;
+  int32_t iCostP8x16, iCostP16x8, iCostP8x8;
+  uint8_t uiMbSign = pEncCtx->pFuncList->pfGetMbSignFromInterVaa (&pEncCtx->pVaa->sVaaCalcInfo.pSad8x8[pCurMb->iMbXY][0]);
+
+  if (uiMbSign == 15) {
+    return;
+  }
+
+//  iCost = pWelsMd->sMe16x16.uiSatdCost;
+
+  switch (uiMbSign) {
+  case 3:
+  case 12:
+//    WelsLog( pEncCtx, WELS_LOG_INFO, "WelsMdP16x8, p_ref[0]= 0x%p", pMbCache->SPicData.pRefMb[0]);
+    iCostP16x8 = WelsMdP16x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostP16x8 < iBestCost) {
+      iBestCost = iCostP16x8;
+      pCurMb->uiMbType = MB_TYPE_16x8;
+      //pCurMb->mb_partition = 2;
+    }
+    break;
+
+  case 5:
+  case 10:
+//    WelsLog( pEncCtx, WELS_LOG_INFO, "WelsMdP8x16, p_ref[0]= 0x%p", pMbCache->SPicData.pRefMb[0]);
+    iCostP8x16 = WelsMdP8x16 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostP8x16 < iBestCost) {
+      iBestCost = iCostP8x16;
+      pCurMb->uiMbType = MB_TYPE_8x16;
+      //pCurMb->mb_partition = 2;
+    }
+    break;
+
+  case 6:
+  case 9:
+    iCostP8x8 = WelsMdP8x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostP8x8 < iBestCost) {
+      iBestCost = iCostP8x8;
+      pCurMb->uiMbType = MB_TYPE_8x8;
+      memset (pCurMb->uiSubMbType, SUB_MB_TYPE_8x8, 4);
+    }
+    break;
+
+  default:
+    iCostP8x8 = WelsMdP8x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+    if (iCostP8x8 < iBestCost) {
+      iBestCost = iCostP8x8;
+      pCurMb->uiMbType = MB_TYPE_8x8;
+      memset (pCurMb->uiSubMbType, SUB_MB_TYPE_8x8, 4);
+
+      iCostP16x8 = WelsMdP16x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+      if (iCostP16x8 <= iBestCost) {
+        iBestCost = iCostP16x8;
+        pCurMb->uiMbType = MB_TYPE_16x8;
+      }
+
+      iCostP8x16 = WelsMdP8x16 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+      if (iCostP8x16 <= iBestCost) {
+        iBestCost = iCostP8x16;
+        pCurMb->uiMbType = MB_TYPE_8x16;
+      }
+    }
+    break;
+  }
+  pWelsMd->iCostLuma = iBestCost;
+}
+
+
+inline void VaaBackgroundMbDataUpdate (SWelsFuncPtrList* pFunc, SVAAFrameInfo* pVaaInfo, SMB* pCurMb) {
+  const int32_t kiPicStride     = pVaaInfo->iPicStride;
+  const int32_t kiPicStrideUV   = pVaaInfo->iPicStrideUV;
+  const int32_t kiOffsetY       = (pCurMb->iMbY * kiPicStride + pCurMb->iMbX) << 4;
+  const int32_t kiOffsetUV      = (pCurMb->iMbY * kiPicStrideUV + pCurMb->iMbX) << 3;
+
+  pFunc->pfCopy16x16Aligned (pVaaInfo->pCurY + kiOffsetY, kiPicStride, pVaaInfo->pRefY + kiOffsetY, kiPicStride);
+  pFunc->pfCopy8x8Aligned (pVaaInfo->pCurU + kiOffsetUV, kiPicStrideUV, pVaaInfo->pRefU + kiOffsetUV, kiPicStrideUV);
+  pFunc->pfCopy8x8Aligned (pVaaInfo->pCurV + kiOffsetUV, kiPicStrideUV, pVaaInfo->pRefV + kiOffsetUV, kiPicStrideUV);
+}
+
+void WelsMdBackgroundMbEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice,
+                            bool bSkipMbFlag) {
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SMVUnitXY sMvp                = { 0 };
+  uint8_t* pRefLuma             = pMbCache->SPicData.pRefMb[0];
+  uint8_t* pRefCb               = pMbCache->SPicData.pRefMb[1];
+  uint8_t* pRefCr               = pMbCache->SPicData.pRefMb[2];
+  int32_t iLineSizeY            = pCurDqLayer->pRefPic->iLineSize[0];
+  int32_t iLineSizeUV           = pCurDqLayer->pRefPic->iLineSize[1];
+  uint8_t* pDstLuma             = pMbCache->pSkipMb;
+  uint8_t* pDstCb               = pMbCache->pSkipMb + 256;
+  uint8_t* pDstCr               = pMbCache->pSkipMb + 256 + 64;
+
+  if (!bSkipMbFlag) {
+    pDstLuma    = pMbCache->pMemPredLuma;
+    pDstCb      = pMbCache->pMemPredChroma;
+    pDstCr      = pMbCache->pMemPredChroma + 64;
+  }
+  //MC
+  pFunc->sMcFuncs.pMcLumaFunc (pRefLuma, iLineSizeY, pDstLuma, 16, 0, 0, 16, 16);
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCb, iLineSizeUV, pDstCb, 8, sMvp.iMvX, sMvp.iMvY, 8, 8); //Cb
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCr, iLineSizeUV, pDstCr, 8, sMvp.iMvX, sMvp.iMvY, 8, 8); //Cr
+
+  pCurMb->uiCbp = 0;
+  pMbCache->bCollocatedPredFlag = true;
+  pWelsMd->iCostLuma = 0;//BGD&RC integration
+  pCurMb->pSadCost[0] = pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                        pCurDqLayer->iEncStride[0], pRefLuma, iLineSizeY);
+  ST32 (&pCurMb->sP16x16Mv, 0);
+  ST32 (&pCurDqLayer->pDecPic->sMvList[pCurMb->iMbXY], 0);
+
+  if (bSkipMbFlag) {
+    pCurMb->uiMbType = MB_TYPE_BACKGROUND;
+
+    //update motion info to current MB
+    ST32 (pCurMb->pRefIndex, 0);
+    pFunc->pfUpdateMbMv (pCurMb->sMv, sMvp);
+
+    pCurMb->uiLumaQp   = pSlice->uiLastMbQp;
+    pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
+                                                          pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset)];
+
+    WelsRecPskip (pCurDqLayer, pEncCtx->pFuncList, pCurMb, pMbCache);
+    VaaBackgroundMbDataUpdate (pEncCtx->pFuncList, pEncCtx->pVaa, pCurMb);
+    return;
+  }
+
+  pCurMb->uiMbType = MB_TYPE_16x16;
+
+  pWelsMd->sMe.sMe16x16.sMv.iMvX = 0;
+  pWelsMd->sMe.sMe16x16.sMv.iMvY = 0;
+  PredMv (&pMbCache->sMvComponents, 0, 4, pWelsMd->uiRef, &pWelsMd->sMe.sMe16x16.sMvp);
+  pMbCache->sMbMvp[0] = pWelsMd->sMe.sMe16x16.sMvp;
+
+  UpdateP16x16MotionInfo (pMbCache, pCurMb, pWelsMd->uiRef, &pWelsMd->sMe.sMe16x16.sMv);
+
+  if (pWelsMd->bMdUsingSad)
+    pWelsMd->iCostLuma = pCurMb->pSadCost[0];
+  else
+    pWelsMd->iCostLuma = pFunc->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                         pCurDqLayer->iEncStride[0], pRefLuma, iLineSizeY);
+
+  WelsInterMbEncode (pEncCtx, pSlice, pCurMb);
+  WelsPMbChromaEncode (pEncCtx, pSlice, pCurMb);
+
+  pFunc->pfCopy16x16Aligned (pMbCache->SPicData.pCsMb[0], pCurDqLayer->iCsStride[0], pMbCache->pMemPredLuma,     16);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[1], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma,    8);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[2], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma + 64, 8);
+}
+
+bool WelsMdPSkipEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+
+  uint8_t* pRefLuma = pMbCache->SPicData.pRefMb[0];
+  uint8_t* pRefCb   = pMbCache->SPicData.pRefMb[1];
+  uint8_t* pRefCr   = pMbCache->SPicData.pRefMb[2];
+  int32_t iLineSizeY  = pCurLayer->pRefPic->iLineSize[0];
+  int32_t iLineSizeUV = pCurLayer->pRefPic->iLineSize[1];
+
+  uint8_t* pDstLuma = pMbCache->pSkipMb;
+  uint8_t* pDstCb   = pMbCache->pSkipMb + 256;
+  uint8_t* pDstCr   = pMbCache->pSkipMb + 256 + 64;
+
+  SMVUnitXY sMvp = { 0 };
+  int32_t n;
+
+  int32_t iEncStride = pCurLayer->iEncStride[0];
+  uint8_t* pEncMb = pMbCache->SPicData.pEncMb[0];
+  int32_t* pStrideEncBlockOffset = pEncCtx->pStrideTab->pStrideEncBlockOffset[pEncCtx->uiDependencyId];
+  int32_t* pEncBlockOffset;
+
+  int32_t iSadCostLuma = 0;
+  int32_t iSadCostChroma = 0;
+  int32_t iSadCostMb = 0;
+
+  PredSkipMv (pMbCache, &sMvp);
+
+  // Special case, need to clip the vector //
+  SMVUnitXY sQpelMvp = { static_cast<int16_t> (sMvp.iMvX >> 2), static_cast<int16_t> (sMvp.iMvY >> 2) };
+  n = (pCurMb->iMbX << 4) + sQpelMvp.iMvX;
+  if (n < -29)
+    return false;
+  else if (n > (int32_t) ((pCurLayer->iMbWidth << 4) + 12))
+    return false;
+
+  n = (pCurMb->iMbY << 4) + sQpelMvp.iMvY;
+  if (n < -29)
+    return false;
+  else if (n > (int32_t) ((pCurLayer->iMbHeight << 4) + 12))
+    return false;
+
+  //luma
+  pRefLuma += sQpelMvp.iMvY * iLineSizeY + sQpelMvp.iMvX;
+  pFunc->sMcFuncs.pMcLumaFunc (pRefLuma, iLineSizeY, pDstLuma, 16, sMvp.iMvX, sMvp.iMvY, 16, 16);
+  iSadCostLuma    = pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                    pCurLayer->iEncStride[0], pDstLuma, 16);
+
+  const int32_t iStrideUV = (sQpelMvp.iMvY >> 1) * iLineSizeUV + (sQpelMvp.iMvX >> 1);
+  pRefCb += iStrideUV;
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCb, iLineSizeUV, pDstCb, 8, sMvp.iMvX, sMvp.iMvY, 8, 8); //Cb
+  iSadCostChroma  = pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] (pMbCache->SPicData.pEncMb[1],
+                    pCurLayer->iEncStride[1], pDstCb, 8);
+
+  pRefCr += iStrideUV;
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCr, iLineSizeUV, pDstCr, 8, sMvp.iMvX, sMvp.iMvY, 8, 8); //Cr
+  iSadCostChroma += pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] (pMbCache->SPicData.pEncMb[2],
+                    pCurLayer->iEncStride[2], pDstCr, 8);
+
+  iSadCostMb = iSadCostLuma + iSadCostChroma;
+
+  if (iSadCostMb == 0                             ||
+      iSadCostMb < pWelsMd->iSadPredSkip   ||
+      (pCurLayer->pRefPic->iPictureType == P_SLICE     &&
+       pMbCache->uiRefMbType == MB_TYPE_SKIP    &&
+       iSadCostMb < pCurLayer->pRefPic->pMbSkipSad[pCurMb->iMbXY])) {
+    //update motion info to current MB
+    ST32 (pCurMb->pRefIndex, 0);
+    pFunc->pfUpdateMbMv (pCurMb->sMv, sMvp);
+
+    if (pWelsMd->bMdUsingSad) {
+      pCurMb->pSadCost[0] = iSadCostLuma;
+      pWelsMd->iCostLuma = pCurMb->pSadCost[0];
+    } else
+      pWelsMd->iCostLuma = pFunc->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                           pCurLayer->iEncStride[0], pDstLuma, 16);
+
+    pWelsMd->iCostSkipMb = iSadCostMb;
+
+    pCurMb->sP16x16Mv = sMvp;
+    pCurLayer->pDecPic->sMvList[pCurMb->iMbXY] = sMvp;
+
+    return true;
+  }
+
+  WelsDctMb (pMbCache->pCoeffLevel,  pEncMb, iEncStride, pDstLuma, pEncCtx->pFuncList->pfDctFourT4);
+
+  if (WelsTryPYskip (pEncCtx, pCurMb, pMbCache)) {
+    iEncStride = pEncCtx->pCurDqLayer->iEncStride[1];
+    pEncMb = pMbCache->SPicData.pEncMb[1];
+    pEncBlockOffset = pStrideEncBlockOffset + 16;
+    pFunc->pfDctFourT4 (pMbCache->pCoeffLevel + 256, & (pEncMb[*pEncBlockOffset]), iEncStride, pMbCache->pSkipMb + 256, 8);
+    if (WelsTryPUVskip (pEncCtx, pCurMb, pMbCache, 1)) {
+      pEncMb = pMbCache->SPicData.pEncMb[2];
+      pEncBlockOffset = pStrideEncBlockOffset + 20;
+      pFunc->pfDctFourT4 (pMbCache->pCoeffLevel + 320, & (pEncMb[*pEncBlockOffset]), iEncStride, pMbCache->pSkipMb + 320, 8);
+      if (WelsTryPUVskip (pEncCtx, pCurMb, pMbCache, 2)) {
+        //update motion info to current MB
+        ST32 (pCurMb->pRefIndex, 0);
+        pFunc->pfUpdateMbMv (pCurMb->sMv, sMvp);
+
+        if (pWelsMd->bMdUsingSad) {
+          pCurMb->pSadCost[0] = iSadCostLuma;
+          pWelsMd->iCostLuma = pCurMb->pSadCost[0];
+        } else
+          pWelsMd->iCostLuma = pFunc->sSampleDealingFuncs.pfSampleSatd[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                               pCurLayer->iEncStride[0], pDstLuma, 16);
+
+        pWelsMd->iCostSkipMb = iSadCostMb;
+
+        pCurMb->sP16x16Mv = sMvp;
+        pCurLayer->pDecPic->sMvList[pCurMb->iMbXY] = sMvp;
+
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
+const int32_t g_kiPixStrideIdx8x8[4] = {  0,                                             ME_REFINE_BUF_WIDTH_BLK8,
+                                          ME_REFINE_BUF_STRIDE_BLK8, ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK8
+                                       };
+const int32_t g_kiPixStrideIdx4x4[4][4] = {
+  {
+    0,
+    0 + ME_REFINE_BUF_WIDTH_BLK4,
+    0 + ME_REFINE_BUF_STRIDE_BLK4,
+    0 + ME_REFINE_BUF_WIDTH_BLK4 + ME_REFINE_BUF_STRIDE_BLK4
+  }, //[0][]
+  {
+    ME_REFINE_BUF_WIDTH_BLK8,
+    ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_WIDTH_BLK4,
+    ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_STRIDE_BLK4,
+    ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_WIDTH_BLK4 + ME_REFINE_BUF_STRIDE_BLK4
+  }, //[1][]
+  {
+    ME_REFINE_BUF_STRIDE_BLK8,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK4,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_STRIDE_BLK4,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK4 + ME_REFINE_BUF_STRIDE_BLK4
+  }, //[2][]
+  {
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK8,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_WIDTH_BLK4,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_STRIDE_BLK4,
+    ME_REFINE_BUF_STRIDE_BLK8 + ME_REFINE_BUF_WIDTH_BLK8 + ME_REFINE_BUF_WIDTH_BLK4 + ME_REFINE_BUF_STRIDE_BLK4
+  } //[3][]
+};
+
+void WelsMdInterMbRefinement (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+  uint8_t* pTmpRefCb, *pTmpRefCr, *pTmpDstCb, *pTmpDstCr;
+  int32_t iMvStride, iRefBlk4Stride, iDstBlk4Stride;
+  SMVUnitXY* pMv;
+  int32_t iBestSadCost = 0, iBestSatdCost = 0;
+  SMeRefinePointer sMeRefine;
+
+  int32_t i, j, iIdx, iPixStride;
+
+  uint8_t* pRefCb = pMbCache->SPicData.pRefMb[1];
+  uint8_t* pRefCr = pMbCache->SPicData.pRefMb[2];
+  uint8_t* pDstCb = pMbCache->pMemPredChroma;
+  uint8_t* pDstCr = pMbCache->pMemPredChroma + 64;
+  uint8_t* pDstLuma = pMbCache->pMemPredLuma;
+
+  int32_t iLineSizeRefUV = pCurDqLayer->pRefPic->iLineSize[1];
+
+  switch (pCurMb->uiMbType) {
+  case MB_TYPE_16x16:
+    //luma
+    InitMeRefinePointer (&sMeRefine, pMbCache, 0);
+    sMeRefine.pfCopyBlockByMode =
+      pFunc->pfCopy16x16NotAligned; // dst can be align with 16 bytes, but not sure at pSrc, 12/29/2011
+    MeRefineFracPixel (pEncCtx, pDstLuma, &pWelsMd->sMe.sMe16x16, &sMeRefine, 16, 16);
+    UpdateP16x16MotionInfo (pMbCache, pCurMb, pWelsMd->uiRef, &pWelsMd->sMe.sMe16x16.sMv);
+
+    pMbCache->sMbMvp[0] = pWelsMd->sMe.sMe16x16.sMvp;
+    //save the best cost of final mode
+    iBestSadCost  = pWelsMd->sMe.sMe16x16.uiSadCost;
+    iBestSatdCost = pWelsMd->sMe.sMe16x16.uiSatdCost;
+
+    //chroma
+    pMv = &pWelsMd->sMe.sMe16x16.sMv;
+    iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+    pTmpRefCb = pRefCb + iMvStride;
+    pTmpRefCr = pRefCr + iMvStride;
+    pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb, iLineSizeRefUV, pDstCb, 8, pMv->iMvX, pMv->iMvY, 8, 8); //Cb
+    pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr, iLineSizeRefUV, pDstCr, 8, pMv->iMvX, pMv->iMvY, 8, 8); //Cr
+
+    pWelsMd->iCostSkipMb = pEncCtx->pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                           pCurDqLayer->iEncStride[0], pDstLuma, 16);
+    pWelsMd->iCostSkipMb += pEncCtx->pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] (pMbCache->SPicData.pEncMb[1],
+                            pCurDqLayer->iEncStride[1], pDstCb, 8);
+    pWelsMd->iCostSkipMb += pEncCtx->pFuncList->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] (pMbCache->SPicData.pEncMb[2],
+                            pCurDqLayer->iEncStride[2], pDstCr, 8);
+    break;
+
+  case MB_TYPE_16x8:
+    iPixStride = 0;
+    sMeRefine.pfCopyBlockByMode =
+      pFunc->pfCopy16x8NotAligned; // dst can be align with 16 bytes, but not sure at pSrc, 12/29/2011
+    for (i = 0; i < 2; i++) {
+      //luma
+      iIdx = i << 3;
+      InitMeRefinePointer (&sMeRefine, pMbCache, iPixStride);
+      iPixStride += ME_REFINE_BUF_STRIDE_BLK8;
+      PredInter16x8Mv (pMbCache, iIdx, pWelsMd->uiRef, &pWelsMd->sMe.sMe16x8[i].sMvp);
+      MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iIdx], &pWelsMd->sMe.sMe16x8[i], &sMeRefine, 16, 8);
+      UpdateP16x8MotionInfo (pMbCache, pCurMb, iIdx, pWelsMd->uiRef, &pWelsMd->sMe.sMe16x8[i].sMv);
+      pMbCache->sMbMvp[i] = pWelsMd->sMe.sMe16x8[i].sMvp;
+      //save the best cost of final mode
+      iBestSadCost += pWelsMd->sMe.sMe16x8[i].uiSadCost;
+      iBestSatdCost += pWelsMd->sMe.sMe16x8[i].uiSatdCost;
+
+      //chroma
+      iRefBlk4Stride = (i << 2) * iLineSizeRefUV;
+      iDstBlk4Stride = i << 5; // 4*8
+      pMv = &pWelsMd->sMe.sMe16x8[i].sMv;
+      iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+      pTmpRefCb = pRefCb + iRefBlk4Stride + iMvStride;
+      pTmpRefCr = pRefCr + iRefBlk4Stride + iMvStride;
+      pTmpDstCb = pDstCb + iDstBlk4Stride;
+      pTmpDstCr = pDstCr + iDstBlk4Stride;
+      pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY, 8, 4); //Cb
+      pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY, 8, 4); //Cr
+    }
+    break;
+
+  case MB_TYPE_8x16:
+    iPixStride = 0;
+    sMeRefine.pfCopyBlockByMode = pFunc->pfCopy8x16Aligned;
+    for (i = 0; i < 2; i++) {
+      //luma
+      iIdx = i << 2;
+      InitMeRefinePointer (&sMeRefine, pMbCache, iPixStride);
+      iPixStride += ME_REFINE_BUF_WIDTH_BLK8;
+      PredInter8x16Mv (pMbCache, iIdx, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x16[i].sMvp);
+      MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iIdx], &pWelsMd->sMe.sMe8x16[i], &sMeRefine, 8, 16);
+      update_P8x16_motion_info (pMbCache, pCurMb, iIdx, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x16[i].sMv);
+      pMbCache->sMbMvp[i] = pWelsMd->sMe.sMe8x16[i].sMvp;
+      //save the best cost of final mode
+      iBestSadCost += pWelsMd->sMe.sMe8x16[i].uiSadCost;
+      iBestSatdCost += pWelsMd->sMe.sMe8x16[i].uiSatdCost;
+
+      //chroma
+      iRefBlk4Stride = iIdx; //4
+      pMv = &pWelsMd->sMe.sMe8x16[i].sMv;
+      iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+      pTmpRefCb = pRefCb + iRefBlk4Stride + iMvStride;
+      pTmpRefCr = pRefCr + iRefBlk4Stride + iMvStride;
+      pTmpDstCb = pDstCb + iRefBlk4Stride;
+      pTmpDstCr = pDstCr + iRefBlk4Stride;
+      pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY, 4, 8); //Cb
+      pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY, 4, 8); //Cr
+    }
+    break;
+  case MB_TYPE_8x8:
+    pMbCache->sMvComponents.iRefIndexCache [9] = pMbCache->sMvComponents.iRefIndexCache [21] = REF_NOT_AVAIL;
+    for (i = 0; i < 4; i++) {
+      int32_t iBlk8Idx = i << 2; //0, 4, 8, 12
+      int32_t iBlk4X, iBlk4Y, iBlk4x4Idx;
+
+      pCurMb->pRefIndex[i] = pWelsMd->uiRef;
+      switch (pCurMb->uiSubMbType[i]) {
+      case SUB_MB_TYPE_8x8:
+        sMeRefine.pfCopyBlockByMode = pFunc->pfCopy8x8Aligned;
+        //luma
+        InitMeRefinePointer (&sMeRefine, pMbCache, g_kiPixStrideIdx8x8[i]);
+        PredMv (&pMbCache->sMvComponents, iBlk8Idx, 2, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x8[i].sMvp);
+        MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iBlk8Idx], &pWelsMd->sMe.sMe8x8[i], &sMeRefine, 8, 8);
+        UpdateP8x8MotionInfo (pMbCache, pCurMb, iBlk8Idx, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x8[i].sMv);
+        pMbCache->sMbMvp[g_kuiMbCountScan4Idx[iBlk8Idx]] = pWelsMd->sMe.sMe8x8[i].sMvp;
+        iBestSadCost += pWelsMd->sMe.sMe8x8[i].uiSadCost;
+        iBestSatdCost += pWelsMd->sMe.sMe8x8[i].uiSatdCost;
+
+        //chroma
+        pMv = &pWelsMd->sMe.sMe8x8[i].sMv;
+        iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+
+        iBlk4X = (i & 1) << 2;
+        iBlk4Y = (i >> 1) << 2;
+        iRefBlk4Stride = iBlk4Y * iLineSizeRefUV + iBlk4X;
+        iDstBlk4Stride = (iBlk4Y << 3) + iBlk4X;
+
+        pTmpRefCb = pRefCb + iRefBlk4Stride;
+        pTmpDstCb = pDstCb + iDstBlk4Stride;
+        pTmpRefCr = pRefCr + iRefBlk4Stride;
+        pTmpDstCr = pDstCr + iDstBlk4Stride;
+        pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb + iMvStride, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY,
+            4, 4); //Cb
+        pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr + iMvStride, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY,
+            4, 4); //Cr
+        break;
+      case SUB_MB_TYPE_4x4:
+        sMeRefine.pfCopyBlockByMode = pFunc->pfCopy4x4;
+        //luma
+        for (j = 0; j < 4; ++j) {
+          iBlk4x4Idx = iBlk8Idx + j;
+          InitMeRefinePointer (&sMeRefine, pMbCache, g_kiPixStrideIdx4x4[i][j]);
+          PredMv (&pMbCache->sMvComponents, iBlk4x4Idx, 1, pWelsMd->uiRef, &pWelsMd->sMe.sMe4x4[i][j].sMvp);
+          MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iBlk4x4Idx], &pWelsMd->sMe.sMe4x4[i][j], &sMeRefine, 4, 4);
+          UpdateP4x4MotionInfo (pMbCache, pCurMb, iBlk4x4Idx, pWelsMd->uiRef, &pWelsMd->sMe.sMe4x4[i][j].sMv);
+          pMbCache->sMbMvp[g_kuiMbCountScan4Idx[iBlk4x4Idx]] = pWelsMd->sMe.sMe4x4[i][j].sMvp;
+          iBestSadCost += pWelsMd->sMe.sMe4x4[i][j].uiSadCost;
+          iBestSatdCost += pWelsMd->sMe.sMe4x4[i][j].uiSatdCost;
+
+          //chroma
+          pMv = &pWelsMd->sMe.sMe4x4[i][j].sMv;
+          iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+
+          iBlk4X = (((i & 1) << 1) + (j & 1)) << 1;
+          iBlk4Y = (((i >> 1) << 1) + (j >> 1)) << 1;
+          iRefBlk4Stride = iBlk4Y * iLineSizeRefUV + iBlk4X;
+          iDstBlk4Stride = (iBlk4Y << 3) + iBlk4X;
+
+          pTmpRefCb = pRefCb + iRefBlk4Stride;
+          pTmpDstCb = pDstCb + iDstBlk4Stride;
+          pTmpRefCr = pRefCr + iRefBlk4Stride;
+          pTmpDstCr = pDstCr + iDstBlk4Stride;
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb + iMvStride, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY,
+              2, 2); //Cb
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr + iMvStride, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY,
+              2, 2); //Cr
+        }
+        break;
+      case SUB_MB_TYPE_8x4:
+        sMeRefine.pfCopyBlockByMode = pFunc->pfCopy8x4;
+        //luma
+        for (j = 0; j < 2; ++j) {
+          iBlk4x4Idx = iBlk8Idx + (j << 1);
+          InitMeRefinePointer (&sMeRefine, pMbCache, g_kiPixStrideIdx4x4[i][j << 1]);
+          PredMv (&pMbCache->sMvComponents, iBlk4x4Idx, 2, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x4[i][j].sMvp);
+          MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iBlk4x4Idx], &pWelsMd->sMe.sMe8x4[i][j], &sMeRefine, 8, 4);
+          UpdateP8x4MotionInfo (pMbCache, pCurMb, iBlk4x4Idx, pWelsMd->uiRef, &pWelsMd->sMe.sMe8x4[i][j].sMv);
+          pMbCache->sMbMvp[g_kuiMbCountScan4Idx[    iBlk4x4Idx]] = pWelsMd->sMe.sMe8x4[i][j].sMvp;
+          //pMbCache->sMbMvp[g_kuiMbCountScan4Idx[1 + iBlk4x4Idx]] = pWelsMd->sMe.sMe8x4[i][j].sMvp;
+          iBestSadCost += pWelsMd->sMe.sMe8x4[i][j].uiSadCost;
+          iBestSatdCost += pWelsMd->sMe.sMe8x4[i][j].uiSatdCost;
+
+          //chroma
+          pMv = &pWelsMd->sMe.sMe8x4[i][j].sMv;
+          iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+
+          iBlk4X = ((i & 1) << 1) << 1;
+          iBlk4Y = (((i >> 1) << 1) + j) << 1;
+          iRefBlk4Stride = iBlk4Y * iLineSizeRefUV + iBlk4X;
+          iDstBlk4Stride = (iBlk4Y << 3) + iBlk4X;
+
+          pTmpRefCb = pRefCb + iRefBlk4Stride;
+          pTmpDstCb = pDstCb + iDstBlk4Stride;
+          pTmpRefCr = pRefCr + iRefBlk4Stride;
+          pTmpDstCr = pDstCr + iDstBlk4Stride;
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb + iMvStride, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY,
+              4, 2); //Cb
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr + iMvStride, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY,
+              4, 2); //Cr
+        }
+        break;
+      case SUB_MB_TYPE_4x8:
+        sMeRefine.pfCopyBlockByMode = pFunc->pfCopy4x8;
+        //luma
+        for (j = 0; j < 2; ++j) {
+          iBlk4x4Idx = iBlk8Idx + j;
+          InitMeRefinePointer (&sMeRefine, pMbCache, g_kiPixStrideIdx4x4[i][j]);
+          PredMv (&pMbCache->sMvComponents, iBlk4x4Idx, 1, pWelsMd->uiRef, &pWelsMd->sMe.sMe4x8[i][j].sMvp);
+          MeRefineFracPixel (pEncCtx, pDstLuma + g_kuiSmb4AddrIn256[iBlk4x4Idx], &pWelsMd->sMe.sMe4x8[i][j], &sMeRefine, 4, 8);
+          UpdateP4x8MotionInfo (pMbCache, pCurMb, iBlk4x4Idx, pWelsMd->uiRef, &pWelsMd->sMe.sMe4x8[i][j].sMv);
+          pMbCache->sMbMvp[g_kuiMbCountScan4Idx[    iBlk4x4Idx]] = pWelsMd->sMe.sMe4x8[i][j].sMvp;
+          //pMbCache->sMbMvp[g_kuiMbCountScan4Idx[4 + iBlk4x4Idx]] = pWelsMd->sMe.sMe8x4[i][j].sMvp;
+          iBestSadCost += pWelsMd->sMe.sMe4x8[i][j].uiSadCost;
+          iBestSatdCost += pWelsMd->sMe.sMe4x8[i][j].uiSatdCost;
+
+          //chroma
+          pMv = &pWelsMd->sMe.sMe4x8[i][j].sMv;
+          iMvStride = (pMv->iMvY >> 3) * iLineSizeRefUV + (pMv->iMvX >> 3);
+
+          iBlk4X = (((i & 1) << 1) + j) << 1;
+          iBlk4Y = (((i >> 1) << 1)) << 1;
+          iRefBlk4Stride = iBlk4Y * iLineSizeRefUV + iBlk4X;
+          iDstBlk4Stride = (iBlk4Y << 3) + iBlk4X;
+
+          pTmpRefCb = pRefCb + iRefBlk4Stride;
+          pTmpDstCb = pDstCb + iDstBlk4Stride;
+          pTmpRefCr = pRefCr + iRefBlk4Stride;
+          pTmpDstCr = pDstCr + iDstBlk4Stride;
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCb + iMvStride, iLineSizeRefUV, pTmpDstCb, 8, pMv->iMvX, pMv->iMvY,
+              2, 4); //Cb
+          pEncCtx->pFuncList->sMcFuncs.pMcChromaFunc (pTmpRefCr + iMvStride, iLineSizeRefUV, pTmpDstCr, 8, pMv->iMvX, pMv->iMvY,
+              2, 4); //Cr
+        }
+        break;
+      }
+    }
+    break;
+  default:
+    break;
+  }
+  pCurMb->pSadCost[0] = iBestSadCost;
+  if (pWelsMd->bMdUsingSad)
+    pWelsMd->iCostLuma = iBestSadCost;
+  else
+    pWelsMd->iCostLuma = iBestSatdCost;
+
+}
+bool WelsMdFirstIntraMode (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+
+  int32_t iCostI16x16 = WelsMdI16x16 (pFunc, pEncCtx->pCurDqLayer, pMbCache, pWelsMd->iLambda);
+
+  //compare cost_p16x16 with cost_i16x16
+  if (iCostI16x16 < pWelsMd->iCostLuma) {
+    pCurMb->uiMbType = MB_TYPE_INTRA16x16;
+    pWelsMd->iCostLuma = iCostI16x16;
+
+    pFunc->pfIntraFineMd (pEncCtx, pWelsMd, pCurMb, pMbCache);
+
+    //add pEnc&rec to MD--2010.3.15
+    if (IS_INTRA16x16 (pCurMb->uiMbType)) {
+      pCurMb->uiCbp = 0;
+      WelsEncRecI16x16Y (pEncCtx, pCurMb, pMbCache);
+    }
+
+    //chroma
+    pWelsMd->iCostChroma = WelsMdIntraChroma (pFunc, pEncCtx->pCurDqLayer, pMbCache, pWelsMd->iLambda);
+    WelsIMbChromaEncode (pEncCtx, pCurMb, pMbCache);  //add pEnc&rec to MD--2010.3.15
+    pCurMb->uiChromPredMode = pMbCache->uiChmaI8x8Mode;
+    pCurMb->pSadCost[0] = 0;
+    return true; //intra_mb_type is best
+  }
+
+  return false;
+}
+
+void WelsMdInterMb (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pUnused) {
+  SDqLayer* pCurDqLayer             = pEncCtx->pCurDqLayer;
+  SMbCache* pMbCache                = &pSlice->sMbCacheInfo;
+  const uint32_t kuiNeighborAvail   = pCurMb->uiNeighborAvail;
+  const int32_t kiMbWidth           = pCurDqLayer->iMbWidth;
+  const  SMB* top_mb                = pCurMb - kiMbWidth;
+  const bool bMbLeftAvailPskip      = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+  const bool bMbTopAvailPskip       = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (top_mb->uiMbType) : false);
+  const bool bMbTopLeftAvailPskip   = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((top_mb - 1)->uiMbType) : false);
+  const bool bMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((top_mb + 1)->uiMbType) : false);
+  bool bTrySkip = bMbLeftAvailPskip || bMbTopAvailPskip || bMbTopLeftAvailPskip || bMbTopRightAvailPskip;
+  bool bKeepSkip = bMbLeftAvailPskip && bMbTopAvailPskip && bMbTopRightAvailPskip;
+  bool bSkip = false;
+
+  //try BGD skip
+  if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {
+    return;
+  }
+
+  //try static or scrolled Pskip
+  if (pEncCtx->pFuncList->pfSCDPSkipDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache)) {
+    return;
+  }
+
+  //step 1: try SKIP
+  bSkip = WelsMdInterJudgePskip (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, bTrySkip);
+
+  if (bSkip) {
+    if (bKeepSkip) {
+      WelsMdInterDecidedPskip (pEncCtx,  pSlice,  pCurMb, pMbCache);
+      return;
+    }
+  } else {
+    PredictSad (pMbCache->sMvComponents.iRefIndexCache, pMbCache->iSadCost, 0, &pWelsMd->iSadPredMb);
+
+    //step 2: P_16x16
+    pWelsMd->iCostLuma = WelsMdP16x16 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice, pCurMb);
+    pCurMb->uiMbType = MB_TYPE_16x16;
+  }
+
+  WelsMdInterSecondaryModesEnc (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, bSkip);
+}
+
+
+
+//////
+//  try the ordinary Pskip
+//////
+bool WelsMdInterJudgePskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                            bool bTrySkip) {
+  bool bRet = true;
+  if (((pEncCtx->pRefPic->iPictureType == P_SLICE) && (pMbCache->uiRefMbType == MB_TYPE_SKIP
+       || pMbCache->uiRefMbType == MB_TYPE_BACKGROUND)) ||
+      bTrySkip) {
+    PredictSadSkip (pMbCache->sMvComponents.iRefIndexCache, pMbCache->bMbTypeSkip, pMbCache->iSadCostSkip, 0,
+                    & (pWelsMd->iSadPredSkip));
+    bRet = WelsMdPSkipEnc (pEncCtx, pWelsMd, pCurMb, pMbCache) ? true : false;
+    return bRet;
+  }
+
+  return false;
+}
+
+//////
+//  try the ordinary Pskip
+//////
+void WelsMdInterUpdatePskip (SDqLayer* pCurDqLayer, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache) {
+  //add pEnc&rec to MD--2010.3.15
+  pCurMb->uiCbp = 0;
+  pCurMb->uiLumaQp   = pSlice->uiLastMbQp;
+  pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
+                                                        pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset)];
+  pMbCache->bCollocatedPredFlag = (LD32 (&pCurMb->sMv[0]) == 0);
+}
+
+
+//////
+//  doublecheck if current MBTYPE is Pskip
+//////
+void WelsMdInterDoubleCheckPskip (SMB* pCurMb, SMbCache* pMbCache) {
+  if (MB_TYPE_16x16 == pCurMb->uiMbType && 0 == pCurMb->uiCbp) {
+    if (0 == pCurMb->pRefIndex[0]) {
+      SMVUnitXY sMvp = { 0 };
+
+      PredSkipMv (pMbCache, &sMvp);
+      if (LD32 (&sMvp) == LD32 (&pCurMb->sMv[0])) {
+        pCurMb->uiMbType = MB_TYPE_SKIP;
+      }
+    }
+    pMbCache->bCollocatedPredFlag = (LD32 (&pCurMb->sMv[0]) == 0);
+  }
+}
+
+//////
+//  Pskip mb encode
+//////
+void WelsMdInterDecidedPskip (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  pCurMb->uiMbType = MB_TYPE_SKIP;
+  WelsRecPskip (pCurDqLayer, pEncCtx->pFuncList, pCurMb, pMbCache);
+  WelsMdInterUpdatePskip (pCurDqLayer, pSlice, pCurMb, pMbCache);
+}
+
+//////
+//  inter mb encode
+//////
+void WelsMdInterEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+
+  //add pEnc&rec to MD--2010.3.15
+  const int32_t kiCsStrideY = pCurDqLayer->iCsStride[0];
+  const int32_t kiCsStrideUV = pCurDqLayer->iCsStride[1];
+
+  //add pEnc&rec to MD--2010.3.15
+  pCurMb->uiCbp = 0;
+  WelsInterMbEncode (pEncCtx, pSlice, pCurMb);
+  WelsPMbChromaEncode (pEncCtx, pSlice, pCurMb);
+
+  pFunc->pfCopy16x16Aligned (pMbCache->SPicData.pCsMb[0], kiCsStrideY, pMbCache->pMemPredLuma,      16);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[1], kiCsStrideUV, pMbCache->pMemPredChroma,    8);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[2], kiCsStrideUV, pMbCache->pMemPredChroma + 64, 8);
+}
+
+
+
+//
+//
+//
+void WelsMdInterSaveSadAndRefMbType (Mb_Type* pRefMbtypeList, SMbCache* pMbCache, const SMB*  pCurMb,
+                                     const SWelsMD* pMd) {
+  const Mb_Type kmtCurMbtype = pCurMb->uiMbType;
+
+  //sad
+  pMbCache->pEncSad[0] = (kmtCurMbtype == MB_TYPE_SKIP) ? pMd->iCostSkipMb : 0;
+  //uiMbType
+  pRefMbtypeList[pCurMb->iMbXY] = kmtCurMbtype;
+}
+
+void WelsMdInterSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
+                                   SMbCache* pMbCache, const bool bSkip) {
+  //step 2: Intra
+  const bool kbTrySkip = pEncCtx->pFuncList->pfFirstIntraMode (pEncCtx, pWelsMd, pCurMb, pMbCache);
+  if (kbTrySkip)
+    return;
+
+  if (bSkip) {
+    WelsMdInterDecidedPskip (pEncCtx,  pSlice,  pCurMb, pMbCache);
+  } else {
+    //Step 3: SubP16 MD
+    pEncCtx->pFuncList->pfSetScrollingMv (pEncCtx->pVaa, pWelsMd); //SCC
+    pEncCtx->pFuncList->pfInterFineMd (pEncCtx, pWelsMd, pSlice, pCurMb, pWelsMd->iCostLuma);
+
+    //refinement for inter type
+    WelsMdInterMbRefinement (pEncCtx, pWelsMd, pCurMb, pMbCache);
+
+    //step 7: invoke encoding
+    WelsMdInterEncode (pEncCtx, pSlice, pCurMb, pMbCache);
+
+    //step 8: double check Pskip
+    WelsMdInterDoubleCheckPskip (pCurMb, pMbCache);
+  }
+}
+
+
+void WelsMdIntraSecondaryModesEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+  //initial prediction memory for I_4x4
+  pFunc->pfIntraFineMd (pEncCtx, pWelsMd, pCurMb, pMbCache); //WelsMdIntraFinePartitionVaa
+
+  //add pEnc&rec to MD--2010.3.15
+  if (IS_INTRA16x16 (pCurMb->uiMbType)) {
+    pCurMb->uiCbp = 0;
+    WelsEncRecI16x16Y (pEncCtx, pCurMb, pMbCache);
+  }
+
+  //chroma
+  pWelsMd->iCostChroma = WelsMdIntraChroma (pFunc, pEncCtx->pCurDqLayer, pMbCache, pWelsMd->iLambda);
+  WelsIMbChromaEncode (pEncCtx, pCurMb, pMbCache);  //add pEnc&rec to MD--2010.3.15
+  pCurMb->uiChromPredMode = pMbCache->uiChmaI8x8Mode;
+  pCurMb->pSadCost[0] = 0;
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_enc_slice_segment.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_enc_slice_segment.cpp
new file mode 100644
index 0000000000..5a9bf739eb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_enc_slice_segment.cpp
@@ -0,0 +1,679 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    slice_segment.c
+ *
+ * \brief   SSlice segment routine (Single slice/multiple slice/fmo arrangement exclusive)
+ *
+ * \date    2/4/2009 Created
+ *
+ *************************************************************************************
+ */
+#include <string.h>
+#include "rc.h"
+#include "svc_enc_frame.h"
+
+namespace WelsEnc {
+/*!
+ * \brief   Assign MB map for single slice segment
+ *
+ * \param   pMbMap          overall MB map
+ * \param   iCountMbNum     count number of MB
+ *
+ * \return  0 - successful; none 0 - failed
+ */
+int32_t AssignMbMapSingleSlice (void* pMbMap, const int32_t kiCountMbNum, const int32_t kiMapUnitSize) {
+  if (NULL == pMbMap || kiCountMbNum <= 0)
+    return 1;
+
+  memset (pMbMap, 0, kiCountMbNum * kiMapUnitSize);
+
+  return 0;
+}
+
+/*!
+ * \brief   Assign MB map for multiple slice(s) segment
+ *
+ * \param   pCurDq              current layer which its MB map will be assigned
+ * \param   kpSliceArgument     slice argument for current layer
+ *
+ * \return  0 - successful; none 0 - failed
+ */
+int32_t AssignMbMapMultipleSlices (SDqLayer* pCurDq, const SSliceArgument* kpSliceArgument) {
+  SSliceCtx* pSliceSeg   = &pCurDq->sSliceEncCtx;
+  int32_t iSliceIdx      = 0;
+  if (NULL == pSliceSeg || SM_SINGLE_SLICE == pSliceSeg->uiSliceMode)
+    return 1;
+
+  if ((SM_RASTER_SLICE == pSliceSeg->uiSliceMode) && (0 == kpSliceArgument->uiSliceMbNum[0])) {
+    const int32_t kiMbWidth = pSliceSeg->iMbWidth;
+    int32_t iSliceNum = pSliceSeg->iSliceNumInFrame;
+
+    iSliceIdx = 0;
+    while (iSliceIdx < iSliceNum) {
+      const int32_t kiFirstMb                       = iSliceIdx * kiMbWidth;
+      WelsSetMemMultiplebytes_c (pSliceSeg->pOverallMbMap + kiFirstMb, iSliceIdx,
+                                 kiMbWidth, sizeof (uint16_t));
+      ++ iSliceIdx;
+    }
+
+    return 0;
+  } else if (SM_RASTER_SLICE  == pSliceSeg->uiSliceMode ||
+             SM_FIXEDSLCNUM_SLICE == pSliceSeg->uiSliceMode) {
+    const int32_t* kpSlicesAssignList           = (int32_t*) & (kpSliceArgument->uiSliceMbNum[0]);
+    const int32_t kiCountNumMbInFrame           = pSliceSeg->iMbNumInFrame;
+    const int32_t kiCountSliceNumInFrame        = pSliceSeg->iSliceNumInFrame;
+    int32_t iMbIdx                              = 0;
+
+    iSliceIdx = 0;
+    do {
+      const int32_t kiCurRunLength                  = kpSlicesAssignList[iSliceIdx];
+      int32_t iRunIdx                               = 0;
+
+      // due here need check validate mb_assign_map for input pData, can not use memset
+      do {
+        pSliceSeg->pOverallMbMap[iMbIdx + iRunIdx] = iSliceIdx;
+        ++ iRunIdx;
+      } while (iRunIdx < kiCurRunLength && iMbIdx + iRunIdx < kiCountNumMbInFrame);
+
+      iMbIdx += kiCurRunLength;
+      ++ iSliceIdx;
+    } while (iSliceIdx < kiCountSliceNumInFrame && iMbIdx < kiCountNumMbInFrame);
+  } else if (SM_SIZELIMITED_SLICE == pSliceSeg->uiSliceMode) {
+    // do nothing,pSliceSeg->pOverallMbMap will be initial later
+  } else { // any else uiSliceMode?
+    assert (0);
+  }
+
+  // extention for other multiple slice type in the future
+  return 1;
+}
+
+/*!
+ *  Check slices assignment settings on MST_INTERLEAVE type
+ */
+
+//slice parameter check for SM_FIXEDSLCNUM_SLICE
+bool CheckFixedSliceNumMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {
+  int32_t* pSlicesAssignList    = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
+  const uint32_t kuiSliceNum    = pSliceArg->uiSliceNum;
+  uint32_t uiSliceIdx           = 0;
+  const int32_t kiMbNumPerSlice = kiMbNumInFrame / kuiSliceNum;
+  int32_t iNumMbLeft            = kiMbNumInFrame;
+
+  if (NULL == pSlicesAssignList)
+    return false;
+
+  for (; uiSliceIdx + 1 < kuiSliceNum; ++ uiSliceIdx) {
+    pSlicesAssignList[uiSliceIdx] = kiMbNumPerSlice;
+    iNumMbLeft -= kiMbNumPerSlice;
+  }
+
+  pSlicesAssignList[uiSliceIdx] = iNumMbLeft;
+
+  if (iNumMbLeft <= 0 || kiMbNumPerSlice <= 0) {
+    return false;
+  }
+
+  return true;
+}
+
+//slice parameter check for SM_ROWMB_SLICE
+bool CheckRowMbMultiSliceSetting (const int32_t kiMbWidth, SSliceArgument* pSliceArg) {
+  int32_t* pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
+  const uint32_t kuiSliceNum            = pSliceArg->uiSliceNum;
+  uint32_t uiSliceIdx                   = 0;
+
+  if (NULL == pSlicesAssignList)
+    return false;
+
+  while (uiSliceIdx < kuiSliceNum) {
+    pSlicesAssignList[uiSliceIdx] = kiMbWidth;
+    ++ uiSliceIdx;
+  }
+  return true;
+}
+
+//slice parameter check for SM_RASTER_SLICE
+bool CheckRasterMultiSliceSetting (const int32_t kiMbNumInFrame, SSliceArgument* pSliceArg) {
+  int32_t*      pSlicesAssignList = (int32_t*) & (pSliceArg->uiSliceMbNum[0]);
+  int32_t       iActualSliceCount       = 0;
+
+  //check mb_num setting
+  uint32_t uiSliceIdx   = 0;
+  int32_t iCountMb      = 0;
+
+  if (NULL == pSlicesAssignList)
+    return false;
+
+  while ((uiSliceIdx < MAX_SLICES_NUM) && (0 < pSlicesAssignList[uiSliceIdx])) {
+    iCountMb            += pSlicesAssignList[uiSliceIdx];
+    iActualSliceCount   =  uiSliceIdx + 1;
+
+    if (iCountMb >= kiMbNumInFrame) {
+      break;
+    }
+
+    ++ uiSliceIdx;
+  }
+  //break condition above makes, after the while
+  // here must have (iActualSliceCount <= MAX_SLICES_NUM)
+
+  //correction if needed
+  if (iCountMb == kiMbNumInFrame) {
+    ;
+  } else if (iCountMb > kiMbNumInFrame) {
+    //need correction:
+    //setting is more than iMbNumInFrame,
+    //cut the last uiSliceMbNum; adjust iCountMb
+    pSlicesAssignList[iActualSliceCount - 1] -= (iCountMb - kiMbNumInFrame);
+    iCountMb = kiMbNumInFrame;
+  } else if (iActualSliceCount < MAX_SLICES_NUM) {
+    //where ( iCountMb < iMbNumInFrame )
+    //can do correction:
+    //  make the last uiSliceMbNum the left num
+    pSlicesAssignList[iActualSliceCount] = kiMbNumInFrame - iCountMb;
+    iActualSliceCount += 1;
+  } else {
+    //here ( iCountMb < iMbNumInFrame ) && ( iActualSliceCount == MAX_SLICES_NUM )
+    //no more slice can be added
+    return false;
+  }
+
+  pSliceArg->uiSliceNum = iActualSliceCount;
+  return true;
+
+}
+
+
+// GOM based RC related for uiSliceNum decision, only used at SM_FIXEDSLCNUM_SLICE
+bool GomValidCheckSliceNum (const int32_t kiMbWidth, const int32_t kiMbHeight, uint32_t* pSliceNum) {
+  const int32_t kiCountNumMb    = kiMbWidth * kiMbHeight;
+  uint32_t iSliceNum            = *pSliceNum;
+  int32_t iGomSize;
+
+  //The default RC is Bit-rate mode[Yi], but need consider as below:
+  // Tuned to use max of mode0 and mode1 due can not refresh on this from rc mode changed outside, 8/16/2011
+  // NOTE: GOM_ROW_MODE0_?P is integer multipler of GOM_ROW_MODE1_?P, which predefined at rc.h there, so GOM_ROM take MODE0 as the initial
+  if (kiMbWidth <= MB_WIDTH_THRESHOLD_90P)
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_90P;
+  else if (kiMbWidth <= MB_WIDTH_THRESHOLD_180P)
+    iGomSize = kiMbWidth *  GOM_ROW_MODE0_180P;
+  else if (kiMbWidth <= MB_WIDTH_THRESHOLD_360P)
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_360P;
+  else
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_720P;
+
+  while (true) {
+    if (kiCountNumMb < iGomSize * (int32_t) iSliceNum) {
+      -- iSliceNum;
+      iSliceNum = iSliceNum - (iSliceNum & 0x01); // verfiy even num for multiple slices case
+      if (iSliceNum < 2) // for safe
+        break;
+      continue;
+    }
+    break;
+  }
+
+  if (*pSliceNum != iSliceNum) {
+    *pSliceNum = (0 != iSliceNum) ? iSliceNum : 1;
+    return false;
+  }
+  return true;
+}
+
+
+// GOM based RC related for uiSliceMbNum decision, only used at SM_FIXEDSLCNUM_SLICE
+bool GomValidCheckSliceMbNum (const int32_t kiMbWidth, const int32_t kiMbHeight, SSliceArgument* pSliceArg) {
+  uint32_t* pSlicesAssignList   = & (pSliceArg->uiSliceMbNum[0]);
+  const uint32_t kuiSliceNum    = pSliceArg->uiSliceNum;
+  const int32_t kiMbNumInFrame  = kiMbWidth * kiMbHeight;
+  const int32_t kiMbNumPerSlice = kiMbNumInFrame / kuiSliceNum;
+  int32_t iNumMbLeft            = kiMbNumInFrame;
+
+  int32_t iMinimalMbNum         = kiMbWidth;    // in theory we need only 1 SMB, here let it as one SMB row required
+  int32_t iMaximalMbNum         = 0;    // dynamically assign later
+  int32_t iGomSize;
+
+  uint32_t uiSliceIdx = 0; // for test
+
+  // The default RC is Bit-rate mode [Yi], but need consider as below:
+  // Tuned to use max of mode0 and mode1 due can not refresh on this from rc mode changed outside, 8/16/2011
+  // NOTE: GOM_ROW_MODE0_?P is integer multipler of GOM_ROW_MODE1_?P, which predefined at rc.h there, so GOM_ROM take MODE0 as the initial
+  if (kiMbWidth <= MB_WIDTH_THRESHOLD_90P)
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_90P;
+  else if (kiMbWidth <= MB_WIDTH_THRESHOLD_180P)
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_180P;
+  else if (kiMbWidth <= MB_WIDTH_THRESHOLD_360P)
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_360P;
+  else
+    iGomSize = kiMbWidth * GOM_ROW_MODE0_720P;
+  // GOM boundary aligned
+  int32_t iNumMbAssigning = WELS_DIV_ROUND (INT_MULTIPLY * kiMbNumPerSlice, iGomSize * INT_MULTIPLY) * iGomSize;
+  int32_t iCurNumMbAssigning = 0;
+
+  iMinimalMbNum = iGomSize;
+  while (uiSliceIdx + 1 < kuiSliceNum) {
+    iMaximalMbNum = iNumMbLeft - (kuiSliceNum - uiSliceIdx - 1) * iMinimalMbNum; // get maximal num_mb in left parts
+    // make sure one GOM at least in each slice for safe
+    if (iNumMbAssigning < iMinimalMbNum)
+      iCurNumMbAssigning = iMinimalMbNum;
+    else if (iNumMbAssigning > iMaximalMbNum)
+      iCurNumMbAssigning = (iMaximalMbNum / iGomSize) * iGomSize;
+    else
+      iCurNumMbAssigning = iNumMbAssigning;
+
+    if (iCurNumMbAssigning <= 0) {
+      return false;
+    }
+
+    iNumMbLeft -= iCurNumMbAssigning;
+    if (iNumMbLeft <= 0)  {
+      return false;
+    }
+
+    pSlicesAssignList[uiSliceIdx] = iCurNumMbAssigning;
+    ++ uiSliceIdx;
+  }
+  pSlicesAssignList[uiSliceIdx] = iNumMbLeft;
+  if (iNumMbLeft < iMinimalMbNum) {
+    return false;
+  }
+
+  return true;
+}
+
+
+/*!
+ *  Get slice count for multiple slice segment
+ *
+ */
+int32_t GetInitialSliceNum (SSliceArgument* pSliceArgument) {
+  if (NULL == pSliceArgument)
+    return -1;
+
+  switch (pSliceArgument->uiSliceMode) {
+  case SM_SINGLE_SLICE:
+  case SM_FIXEDSLCNUM_SLICE:
+  case SM_RASTER_SLICE: {
+    return pSliceArgument->uiSliceNum;
+  }
+  case SM_SIZELIMITED_SLICE: {
+    return AVERSLICENUM_CONSTRAINT;//at the beginning of dynamic slicing, set the uiSliceNum to be 1
+  }
+  case SM_RESERVED:
+  default: {
+    return -1;
+  }
+  }
+
+  return -1;
+}
+
+/*!
+ * \brief   Initialize slice segment (Single/multiple slices)
+ *
+ * \param   pCurDq              current layer which its SSlice segment will be initialized
+ * \param   uiSliceMode         SSlice mode
+ * \param   multi_slice_argv    Multiple slices argument
+ * \param   iMbWidth            MB width
+ * \param   iMbHeight           MB height
+ *
+ * \return  0 - successful; none 0 - failed;
+ */
+int32_t InitSliceSegment (SDqLayer* pCurDq,
+                          CMemoryAlign* pMa,
+                          SSliceArgument* pSliceArgument,
+                          const int32_t kiMbWidth,
+                          const int32_t kiMbHeight) {
+  SSliceCtx* pSliceSeg        = &pCurDq->sSliceEncCtx;
+  const int32_t kiCountMbNum  = kiMbWidth * kiMbHeight;
+  SliceModeEnum uiSliceMode   = SM_SINGLE_SLICE;
+
+  if (NULL == pSliceSeg || NULL == pSliceArgument || kiMbWidth == 0 || kiMbHeight == 0)
+    return 1;
+
+  uiSliceMode = pSliceArgument->uiSliceMode;
+  if (pSliceSeg->iMbNumInFrame == kiCountMbNum && pSliceSeg->iMbWidth == kiMbWidth
+      && pSliceSeg->iMbHeight == kiMbHeight && pSliceSeg->uiSliceMode == uiSliceMode && pSliceSeg->pOverallMbMap != NULL)
+    return 0;
+  else if (pSliceSeg->iMbNumInFrame != kiCountMbNum) {
+    if (NULL != pSliceSeg->pOverallMbMap) {
+      pMa->WelsFree (pSliceSeg->pOverallMbMap, "pSliceSeg->pOverallMbMap");
+
+      pSliceSeg->pOverallMbMap = NULL;
+    }
+
+    // just for safe
+    pSliceSeg->iSliceNumInFrame = 0;
+    pSliceSeg->iMbNumInFrame    = 0;
+    pSliceSeg->iMbWidth         = 0;
+    pSliceSeg->iMbHeight        = 0;
+    pSliceSeg->uiSliceMode      = SM_SINGLE_SLICE;      // sigle in default
+  }
+
+  if (SM_SINGLE_SLICE == uiSliceMode) {
+    pSliceSeg->pOverallMbMap = (uint16_t*)pMa->WelsMallocz (kiCountMbNum * sizeof (uint16_t), "pSliceSeg->pOverallMbMap");
+
+    WELS_VERIFY_RETURN_IF (1, NULL == pSliceSeg->pOverallMbMap)
+    pSliceSeg->iSliceNumInFrame = 1;
+
+    pSliceSeg->uiSliceMode              = uiSliceMode;
+    pSliceSeg->iMbWidth                 = kiMbWidth;
+    pSliceSeg->iMbHeight                = kiMbHeight;
+    pSliceSeg->iMbNumInFrame            = kiCountMbNum;
+
+    return AssignMbMapSingleSlice (pSliceSeg->pOverallMbMap, kiCountMbNum, sizeof (pSliceSeg->pOverallMbMap[0]));
+  } else { //if ( SM_MULTIPLE_SLICE == uiSliceMode )
+    if (uiSliceMode != SM_FIXEDSLCNUM_SLICE && uiSliceMode != SM_RASTER_SLICE
+        && uiSliceMode != SM_SIZELIMITED_SLICE)
+      return 1;
+
+    pSliceSeg->pOverallMbMap = (uint16_t*)pMa->WelsMallocz (kiCountMbNum * sizeof (uint16_t), "pSliceSeg->pOverallMbMap");
+    WELS_VERIFY_RETURN_IF (1, NULL == pSliceSeg->pOverallMbMap)
+
+    WelsSetMemMultiplebytes_c (pSliceSeg->pOverallMbMap, 0, kiCountMbNum, sizeof (uint16_t));
+
+    //SM_SIZELIMITED_SLICE: init, set pSliceSeg->iSliceNumInFrame = 1;
+    pSliceSeg->iSliceNumInFrame = GetInitialSliceNum (pSliceArgument);
+    if (-1 == pSliceSeg->iSliceNumInFrame)
+      return 1;
+
+    pSliceSeg->uiSliceMode      = pSliceArgument->uiSliceMode;
+
+    pSliceSeg->iMbWidth         = kiMbWidth;
+    pSliceSeg->iMbHeight        = kiMbHeight;
+    pSliceSeg->iMbNumInFrame    = kiCountMbNum;
+    if (SM_SIZELIMITED_SLICE == pSliceArgument->uiSliceMode) {
+      if (0 < pSliceArgument->uiSliceSizeConstraint) {
+        pSliceSeg->uiSliceSizeConstraint = pSliceArgument->uiSliceSizeConstraint;
+      } else {
+        return 1;
+      }
+    } else {
+      pSliceSeg->uiSliceSizeConstraint = DEFAULT_MAXPACKETSIZE_CONSTRAINT;
+    }
+    // about "iMaxSliceNumConstraint"
+    //only used in SM_SIZELIMITED_SLICE mode so far,
+    //now follows NAL_UNIT_CONSTRAINT, (see definition)
+    //will be adjusted under MT if there is limitation on iLayerNum
+    pSliceSeg->iMaxSliceNumConstraint = MAX_SLICES_NUM;
+
+
+    return AssignMbMapMultipleSlices (pCurDq, pSliceArgument);
+  }
+  return 0;
+}
+
+/*!
+ * \brief   Uninitialize slice segment (Single/multiple slices)
+ *
+ * \param   pCurDq           current layer which its SSlice segment will be uninitialized
+ *
+ * \return  none;
+ */
+void UninitSliceSegment (SDqLayer* pCurDq, CMemoryAlign* pMa) {
+  SSliceCtx* pSliceSeg = &pCurDq->sSliceEncCtx;
+  if (NULL != pSliceSeg) {
+    if (NULL != pSliceSeg->pOverallMbMap) {
+      pMa->WelsFree (pSliceSeg->pOverallMbMap, "pSliceSeg->pOverallMbMap");
+
+      pSliceSeg->pOverallMbMap = NULL;
+    }
+
+    pSliceSeg->uiSliceMode      = SM_SINGLE_SLICE;      // single in default
+    pSliceSeg->iMbWidth         = 0;
+    pSliceSeg->iMbHeight        = 0;
+    pSliceSeg->iSliceNumInFrame = 0;
+    pSliceSeg->iMbNumInFrame    = 0;
+    pSliceSeg->uiSliceSizeConstraint   = 0;
+    pSliceSeg->iMaxSliceNumConstraint  = 0;
+  }
+}
+
+
+/*!
+ * \brief   Initialize Wels SSlice context (Single/multiple slices and FMO)
+ *
+ * \param   pCurDq          current layer which its SSlice context will be initialized
+ * \param   bFmoUseFlag     flag of using fmo
+ * \param   iMbWidth        MB width
+ * \param   iMbHeight       MB height
+ * \param   uiSliceMode     slice mode
+ * \param   mul_slice_arg   argument for multiple slice if it is applicable
+ * \param   pPpsArg         argument for pPps parameter
+ *
+ * \return  0 - successful; none 0 - failed;
+ */
+int32_t InitSlicePEncCtx (SDqLayer* pCurDq,
+                          CMemoryAlign* pMa,
+                          bool bFmoUseFlag,
+                          int32_t iMbWidth,
+                          int32_t iMbHeight,
+                          SSliceArgument* pSliceArgument,
+                          void* pPpsArg) {
+  if (NULL == pCurDq)
+    return 1;
+
+  InitSliceSegment (pCurDq,
+                    pMa,
+                    pSliceArgument,
+                    iMbWidth,
+                    iMbHeight);
+  return 0;
+}
+
+
+/*!
+ * \brief   Uninitialize Wels SSlice context (Single/multiple slices and FMO)
+ *
+ * \param   pCurDq       current layer which its SSlice context will be initialized
+ *
+ * \return  NONE;
+ */
+void UninitSlicePEncCtx (SDqLayer* pCurDq, CMemoryAlign* pMa) {
+  if (NULL != pCurDq) {
+    UninitSliceSegment (pCurDq, pMa);
+  }
+}
+
+/*!
+ * \brief   Get slice idc for given iMbXY (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq    current layer info
+ * \param   kiMbXY    MB xy index
+ *
+ * \return  uiSliceIdc - successful; -1 - failed;
+ */
+uint16_t WelsMbToSliceIdc (SDqLayer* pCurDq, const int32_t kiMbXY) {
+  if (NULL == pCurDq)
+    return (uint16_t) (-1);
+
+  SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
+  if (NULL != pSliceCtx && kiMbXY < pSliceCtx->iMbNumInFrame && kiMbXY >= 0)
+    return pSliceCtx->pOverallMbMap[ kiMbXY ];
+  return (uint16_t) (-1);
+}
+
+/*!
+ * \brief   Get first mb in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurLayer       current layer
+ * \param   kuiSliceIdc     slice idc
+ *
+ * \return  iFirstMb - successful; -1 - failed;
+ */
+int32_t WelsGetFirstMbOfSlice (SDqLayer* pCurLayer, const int32_t kuiSliceIdc) {
+  if (NULL == pCurLayer || NULL == pCurLayer->pFirstMbIdxOfSlice) {
+    return -1;
+  }
+
+  return pCurLayer->pFirstMbIdxOfSlice[kuiSliceIdc];
+}
+
+/*!
+ * \brief   Get successive mb to be processed in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq     current layer info
+ * \param   kiMbXY     MB xy index
+ *
+ * \return  next_mb - successful; -1 - failed;
+ */
+int32_t WelsGetNextMbOfSlice (SDqLayer* pCurDq, const int32_t kiMbXY) {
+  if (NULL != pCurDq) {
+    SSliceCtx* pSliceSeg = &pCurDq->sSliceEncCtx;
+    if (NULL == pSliceSeg || kiMbXY < 0 || kiMbXY >= pSliceSeg->iMbNumInFrame)
+      return -1;
+    if (SM_SINGLE_SLICE == pSliceSeg->uiSliceMode) {
+      int32_t iNextMbIdx = kiMbXY;
+      ++ iNextMbIdx;
+      if (iNextMbIdx >= pSliceSeg->iMbNumInFrame)
+        iNextMbIdx = -1;
+      return iNextMbIdx;
+    } else { /*if ( SM_MULTIPLE_SLICE == pSliceSeg->uiSliceMode )*/
+      if (SM_RESERVED != pSliceSeg->uiSliceMode) {
+        int32_t iNextMbIdx = kiMbXY;
+        ++ iNextMbIdx;
+        if (iNextMbIdx < pSliceSeg->iMbNumInFrame && pSliceSeg->pOverallMbMap != NULL
+            && pSliceSeg->pOverallMbMap[iNextMbIdx] == pSliceSeg->pOverallMbMap[ kiMbXY ])
+          return iNextMbIdx;
+        return -1;
+      } else
+        return -1; // reserved here for other multiple slice type
+    }
+  } else
+    return -1;
+}
+
+/*!
+ * \brief   Get previous mb to be processed in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pCurDq     current layer info
+ * \param   kiMbXY     MB xy index
+ *
+ * \return  prev_mb - successful; -1 - failed;
+ */
+int32_t WelsGetPrevMbOfSlice (SDqLayer* pCurDq, const int32_t kiMbXY) {
+  if (NULL != pCurDq) {
+    SSliceCtx* pSliceSeg = &pCurDq->sSliceEncCtx;
+    if (NULL == pSliceSeg || kiMbXY < 0 || kiMbXY >= pSliceSeg->iMbNumInFrame)
+      return -1;
+    if (pSliceSeg->uiSliceMode == SM_SINGLE_SLICE)
+      return (-1 + kiMbXY);
+    else { /* if ( pSliceSeg->uiSliceMode == SM_MULTIPLE_SLICE )*/
+      if (SM_RESERVED == pSliceSeg->uiSliceMode) {
+        int32_t iPrevMbIdx = kiMbXY;
+        -- iPrevMbIdx;
+        if (iPrevMbIdx >= 0 && iPrevMbIdx < pSliceSeg->iMbNumInFrame && NULL != pSliceSeg->pOverallMbMap
+            && pSliceSeg->pOverallMbMap[ kiMbXY ] == pSliceSeg->pOverallMbMap[ iPrevMbIdx ])
+          return iPrevMbIdx;
+        return -1;
+      } else
+        return -1;
+    }
+  } else
+    return -1;
+}
+
+/*!
+ * \brief   Get number of mb in slice/slice_group: uiSliceIdc (apply in Single/multiple slices and FMO)
+ *
+ * \param   pSliceCtx       SSlice context
+ * \param   pSlice          slice which request slice num
+ * \param   kuiSliceIdc     slice/slice_group idc
+ *
+ * \return  count_num_of_mb - successful; -1 - failed;
+ */
+int32_t WelsGetNumMbInSlice (SDqLayer* pCurDq, SSlice* pSlice, const int32_t kuiSliceIdc) {
+  SSliceCtx* pSliceCtx = &pCurDq->sSliceEncCtx;
+  bool bInValidFlag    = false;
+
+  if (NULL == pSliceCtx || NULL == pSlice || kuiSliceIdc < 0) {
+    return -1;
+  }
+
+  bInValidFlag = ((SM_SINGLE_SLICE != pSliceCtx->uiSliceMode) && (kuiSliceIdc >= pSliceCtx->iSliceNumInFrame))
+                 || ((SM_SINGLE_SLICE == pSliceCtx->uiSliceMode) && (kuiSliceIdc > 0));
+  if (bInValidFlag) {
+    return -1;
+  }
+
+  return pSlice->iCountMbNumInSlice;
+}
+
+int32_t GetCurrentSliceNum (const SDqLayer* pCurDq) {
+  const SSliceCtx* kpSliceCtx = &pCurDq->sSliceEncCtx;
+  return (kpSliceCtx != NULL) ? (kpSliceCtx->iSliceNumInFrame) : (-1);
+}
+int32_t DynamicAdjustSlicePEncCtxAll (SDqLayer* pCurDq,
+                                      int32_t* pRunLength) {
+  SSliceCtx* pSliceCtx                  = &pCurDq->sSliceEncCtx;
+  const int32_t iCountNumMbInFrame      = pSliceCtx->iMbNumInFrame;
+  const int32_t iCountSliceNumInFrame   = pSliceCtx->iSliceNumInFrame;
+  int32_t iSameRunLenFlag               = 1;
+  int32_t iFirstMbIdx                   = 0;
+  int32_t iSliceIdx                     = 0;
+
+  assert (iCountSliceNumInFrame <= MAX_THREADS_NUM);
+
+  while (iSliceIdx < iCountSliceNumInFrame) {
+    if (pRunLength[iSliceIdx] != pCurDq->pFirstMbIdxOfSlice[iSliceIdx]) {
+      iSameRunLenFlag = 0;
+      break;
+    }
+    ++ iSliceIdx;
+  }
+  if (iSameRunLenFlag) {
+    return 1; // do not need adjust it due to same running length as before to save complexity
+  }
+
+  iSliceIdx = 0;
+  do {
+    const int32_t kiSliceRun = pRunLength[iSliceIdx];
+    pCurDq->pFirstMbIdxOfSlice[iSliceIdx]         = iFirstMbIdx;
+    pCurDq->pCountMbNumInSlice[iSliceIdx]         = kiSliceRun;
+
+    WelsSetMemMultiplebytes_c (pSliceCtx->pOverallMbMap + iFirstMbIdx, iSliceIdx,
+                               kiSliceRun, sizeof (uint16_t));
+
+    iFirstMbIdx += kiSliceRun;
+
+    ++ iSliceIdx;
+  } while (iSliceIdx < iCountSliceNumInFrame && iFirstMbIdx < iCountNumMbInFrame);
+
+  return 0;
+}
+
+int32_t DynamicMaxSliceNumConstraint (uint32_t uiMaximumNum, int32_t iConsumedNum, uint32_t iDulplicateTimes) {
+  return ((uiMaximumNum - iConsumedNum - 1) / iDulplicateTimes);
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_mb.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_mb.cpp
new file mode 100644
index 0000000000..040c74edda
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_mb.cpp
@@ -0,0 +1,386 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    encode_mb.c
+ *
+ * \brief   Implementaion for pCurMb encoding
+ *
+ * \date    05/19/2009 Created
+ *************************************************************************************
+ */
+
+
+#include "svc_encode_mb.h"
+#include "encode_mb_aux.h"
+#include "decode_mb_aux.h"
+#include "ls_defines.h"
+
+namespace WelsEnc {
+void WelsDctMb (int16_t* pRes, uint8_t* pEncMb, int32_t iEncStride, uint8_t* pBestPred, PDctFunc pfDctFourT4) {
+  pfDctFourT4 (pRes,       pEncMb,                      iEncStride, pBestPred,       16);
+  pfDctFourT4 (pRes + 64,  pEncMb + 8,                  iEncStride, pBestPred + 8,   16);
+  pfDctFourT4 (pRes + 128, pEncMb + 8 * iEncStride,     iEncStride, pBestPred + 128, 16);
+  pfDctFourT4 (pRes + 192, pEncMb + 8 * iEncStride + 8, iEncStride, pBestPred + 136, 16);
+}
+
+void WelsEncRecI16x16Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {
+  ENFORCE_STACK_ALIGN_1D (int16_t, aDctT4Dc, 16, 16)
+  SWelsFuncPtrList* pFuncList   = pEncCtx->pFuncList;
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  const int32_t kiEncStride     = pCurDqLayer->iEncStride[0];
+  int16_t* pRes                 = pMbCache->pCoeffLevel;
+  uint8_t* pPred                = pMbCache->SPicData.pCsMb[0];
+  const int32_t kiRecStride     = pCurDqLayer->iCsStride[0];
+  int16_t* pBlock               = pMbCache->pDct->iLumaBlock[0];
+  uint8_t* pBestPred            = pMbCache->pMemPredLuma;
+  const uint8_t* kpNoneZeroCountIdx = &g_kuiMbCountScan4Idx[0];
+  uint8_t i, uiQp               = pCurMb->uiLumaQp;
+  uint32_t uiNoneZeroCount, uiNoneZeroCountMbAc = 0, uiCountI16x16Dc;
+
+  const int16_t* pMF = g_kiQuantMF[uiQp];
+  const int16_t* pFF = g_iQuantIntraFF[uiQp];
+
+  WelsDctMb (pRes,  pMbCache->SPicData.pEncMb[0], kiEncStride, pBestPred, pEncCtx->pFuncList->pfDctFourT4);
+
+  pFuncList->pfTransformHadamard4x4Dc (aDctT4Dc, pRes);
+  pFuncList->pfQuantizationDc4x4 (aDctT4Dc, pFF[0] << 1, pMF[0]>>1);
+  pFuncList->pfScan4x4 (pMbCache->pDct->iLumaI16x16Dc, aDctT4Dc);
+  uiCountI16x16Dc = pFuncList->pfGetNoneZeroCount (pMbCache->pDct->iLumaI16x16Dc);
+
+  for (i = 0; i < 4; i++) {
+    pFuncList->pfQuantizationFour4x4 (pRes, pFF,  pMF);
+    pFuncList->pfScan4x4Ac (pBlock,      pRes);
+    pFuncList->pfScan4x4Ac (pBlock + 16, pRes + 16);
+    pFuncList->pfScan4x4Ac (pBlock + 32, pRes + 32);
+    pFuncList->pfScan4x4Ac (pBlock + 48, pRes + 48);
+    pRes += 64;
+    pBlock += 64;
+  }
+  pRes -= 256;
+  pBlock -= 256;
+
+  for (i = 0; i < 16; i++) {
+    uiNoneZeroCount = pFuncList->pfGetNoneZeroCount (pBlock);
+    pCurMb->pNonZeroCount[*kpNoneZeroCountIdx++] = uiNoneZeroCount;
+    uiNoneZeroCountMbAc += uiNoneZeroCount;
+    pBlock += 16;
+  }
+
+  if (uiCountI16x16Dc > 0) {
+    if (uiQp < 12) {
+      WelsIHadamard4x4Dc (aDctT4Dc);
+      WelsDequantLumaDc4x4 (aDctT4Dc, uiQp);
+    } else
+      pFuncList->pfDequantizationIHadamard4x4 (aDctT4Dc, g_kuiDequantCoeff[uiQp][0] >> 2);
+  }
+
+  if (uiNoneZeroCountMbAc > 0) {
+    pCurMb->uiCbp = 15;
+    pFuncList->pfDequantizationFour4x4 (pRes, g_kuiDequantCoeff[uiQp]);
+    pFuncList->pfDequantizationFour4x4 (pRes + 64, g_kuiDequantCoeff[uiQp]);
+    pFuncList->pfDequantizationFour4x4 (pRes + 128, g_kuiDequantCoeff[uiQp]);
+    pFuncList->pfDequantizationFour4x4 (pRes + 192, g_kuiDequantCoeff[uiQp]);
+
+    pRes[0]  = aDctT4Dc[0];
+    pRes[16] = aDctT4Dc[1];
+    pRes[32] = aDctT4Dc[4];
+    pRes[48] = aDctT4Dc[5];
+    pRes[64] = aDctT4Dc[2];
+    pRes[80] = aDctT4Dc[3];
+    pRes[96] = aDctT4Dc[6];
+    pRes[112] = aDctT4Dc[7];
+    pRes[128] = aDctT4Dc[8];
+    pRes[144] = aDctT4Dc[9];
+    pRes[160] = aDctT4Dc[12];
+    pRes[176] = aDctT4Dc[13];
+    pRes[192] = aDctT4Dc[10];
+    pRes[208] = aDctT4Dc[11];
+    pRes[224] = aDctT4Dc[14];
+    pRes[240] = aDctT4Dc[15];
+
+    pFuncList->pfIDctFourT4 (pPred,                       kiRecStride, pBestPred,        16, pRes);
+    pFuncList->pfIDctFourT4 (pPred + 8,                   kiRecStride, pBestPred + 8,    16, pRes + 64);
+    pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8,     kiRecStride, pBestPred + 128,  16, pRes + 128);
+    pFuncList->pfIDctFourT4 (pPred + kiRecStride * 8 + 8, kiRecStride, pBestPred + 136,  16, pRes + 192);
+  } else if (uiCountI16x16Dc > 0) {
+    pFuncList->pfIDctI16x16Dc (pPred, kiRecStride, pBestPred, 16, aDctT4Dc);
+  } else {
+    pFuncList->pfCopy16x16Aligned (pPred, kiRecStride, pBestPred, 16);
+  }
+}
+void WelsEncRecI4x4Y (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, uint8_t uiI4x4Idx) {
+  SWelsFuncPtrList* pFuncList   = pEncCtx->pFuncList;
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  int32_t iEncStride            = pCurDqLayer->iEncStride[0];
+  uint8_t uiQp                  = pCurMb->uiLumaQp;
+
+  int16_t* pResI4x4 = pMbCache->pCoeffLevel;
+  uint8_t* pPredI4x4;
+
+  uint8_t* pPred     = pMbCache->SPicData.pCsMb[0];
+  int32_t iRecStride = pCurDqLayer->iCsStride[0];
+
+  uint32_t uiOffset = g_kuiMbCountScan4Idx[uiI4x4Idx];
+  uint8_t* pEncMb = pMbCache->SPicData.pEncMb[0];
+  uint8_t* pBestPred = pMbCache->pBestPredI4x4Blk4;
+  int16_t* pBlock = pMbCache->pDct->iLumaBlock[uiI4x4Idx];
+
+  const int16_t* pMF = g_kiQuantMF[uiQp];
+  const int16_t* pFF = g_iQuantIntraFF[uiQp];
+
+  int32_t* pStrideEncBlockOffset = pEncCtx->pStrideTab->pStrideEncBlockOffset[pEncCtx->uiDependencyId];
+  int32_t* pStrideDecBlockOffset = pEncCtx->pStrideTab->pStrideDecBlockOffset[pEncCtx->uiDependencyId][0 ==
+                                   pEncCtx->uiTemporalId];
+  int32_t iNoneZeroCount = 0;
+
+  pFuncList->pfDctT4 (pResI4x4, & (pEncMb[pStrideEncBlockOffset[uiI4x4Idx]]), iEncStride, pBestPred, 4);
+  pFuncList->pfQuantization4x4 (pResI4x4, pFF, pMF);
+  pFuncList->pfScan4x4 (pBlock, pResI4x4);
+
+  iNoneZeroCount = pFuncList->pfGetNoneZeroCount (pBlock);
+  pCurMb->pNonZeroCount[uiOffset] = iNoneZeroCount;
+
+  pPredI4x4 = pPred + pStrideDecBlockOffset[uiI4x4Idx];
+  if (iNoneZeroCount > 0) {
+    pCurMb->uiCbp |= 1 << (uiI4x4Idx >> 2);
+    pFuncList->pfDequantization4x4 (pResI4x4, g_kuiDequantCoeff[uiQp]);
+    pFuncList->pfIDctT4 (pPredI4x4, iRecStride, pBestPred, 4, pResI4x4);
+  } else
+    pFuncList->pfCopy4x4 (pPredI4x4, iRecStride, pBestPred, 4);
+}
+
+void WelsEncInterY (SWelsFuncPtrList* pFuncList, SMB* pCurMb, SMbCache* pMbCache) {
+  PQuantizationMaxFunc pfQuantizationFour4x4Max         = pFuncList->pfQuantizationFour4x4Max;
+  PSetMemoryZero pfSetMemZeroSize8                      = pFuncList->pfSetMemZeroSize8;
+  PSetMemoryZero pfSetMemZeroSize64                     = pFuncList->pfSetMemZeroSize64;
+  PScanFunc pfScan4x4                                   = pFuncList->pfScan4x4;
+  PCalculateSingleCtrFunc pfCalculateSingleCtr4x4       = pFuncList->pfCalculateSingleCtr4x4;
+  PGetNoneZeroCountFunc pfGetNoneZeroCount              = pFuncList->pfGetNoneZeroCount;
+  PDeQuantizationFunc pfDequantizationFour4x4           = pFuncList->pfDequantizationFour4x4;
+  int16_t* pRes = pMbCache->pCoeffLevel;
+  int32_t iSingleCtrMb = 0, iSingleCtr8x8[4];
+  int16_t* pBlock = pMbCache->pDct->iLumaBlock[0];
+  uint8_t uiQp = pCurMb->uiLumaQp;
+  const int16_t* pMF = g_kiQuantMF[uiQp];
+  const int16_t* pFF = g_kiQuantInterFF[uiQp];
+  int16_t aMax[16];
+  int32_t i, j, iNoneZeroCountMbDcAc = 0, iNoneZeroCount = 0;
+
+  for (i = 0; i < 4; i++) {
+    pfQuantizationFour4x4Max (pRes, pFF,  pMF, aMax + (i << 2));
+    iSingleCtr8x8[i] = 0;
+    for (j = 0; j < 4; j++) {
+      if (aMax[ (i << 2) + j] == 0)
+        pfSetMemZeroSize8 (pBlock, 32);
+      else {
+        pfScan4x4 (pBlock, pRes);
+        if (aMax[ (i << 2) + j] > 1)
+          iSingleCtr8x8[i] += 9;
+        else if (iSingleCtr8x8[i] < 6)
+          iSingleCtr8x8[i] += pfCalculateSingleCtr4x4 (pBlock);
+      }
+      pRes += 16;
+      pBlock += 16;
+    }
+    iSingleCtrMb += iSingleCtr8x8[i];
+  }
+  pBlock -= 256;
+  pRes -= 256;
+
+  memset (pCurMb->pNonZeroCount, 0, 16);
+
+
+  if (iSingleCtrMb < 6) {  //from JVT-O079
+    iNoneZeroCountMbDcAc = 0;
+    pfSetMemZeroSize64 (pRes,  768); // confirmed_safe_unsafe_usage
+  } else {
+    const uint8_t* kpNoneZeroCountIdx = g_kuiMbCountScan4Idx;
+    for (i = 0; i < 4; i++) {
+      if (iSingleCtr8x8[i] >= 4) {
+        for (j = 0; j < 4; j++) {
+          iNoneZeroCount = pfGetNoneZeroCount (pBlock);
+          pCurMb->pNonZeroCount[*kpNoneZeroCountIdx++] = iNoneZeroCount;
+          iNoneZeroCountMbDcAc += iNoneZeroCount;
+          pBlock += 16;
+        }
+        pfDequantizationFour4x4 (pRes, g_kuiDequantCoeff[uiQp]);
+        pCurMb->uiCbp |= 1 << i;
+      } else { // set zero for an 8x8 pBlock
+        pfSetMemZeroSize64 (pRes, 128); // confirmed_safe_unsafe_usage
+        kpNoneZeroCountIdx += 4;
+        pBlock += 64;
+      }
+      pRes += 64;
+    }
+  }
+}
+
+void    WelsEncRecUV (SWelsFuncPtrList* pFuncList, SMB* pCurMb, SMbCache* pMbCache, int16_t* pRes, int32_t iUV) {
+  PQuantizationHadamardFunc pfQuantizationHadamard2x2   = pFuncList->pfQuantizationHadamard2x2;
+  PQuantizationMaxFunc pfQuantizationFour4x4Max         = pFuncList->pfQuantizationFour4x4Max;
+  PSetMemoryZero pfSetMemZeroSize8                      = pFuncList->pfSetMemZeroSize8;
+  PSetMemoryZero pfSetMemZeroSize64                     = pFuncList->pfSetMemZeroSize64;
+  PScanFunc pfScan4x4Ac                                 = pFuncList->pfScan4x4Ac;
+  PCalculateSingleCtrFunc pfCalculateSingleCtr4x4       = pFuncList->pfCalculateSingleCtr4x4;
+  PGetNoneZeroCountFunc pfGetNoneZeroCount              = pFuncList->pfGetNoneZeroCount;
+  PDeQuantizationFunc pfDequantizationFour4x4           = pFuncList->pfDequantizationFour4x4;
+  const int32_t kiInterFlag                             = !IS_INTRA (pCurMb->uiMbType);
+  const uint8_t kiQp                                    = pCurMb->uiChromaQp;
+  uint8_t i, uiNoneZeroCount, uiNoneZeroCountMbAc       = 0, uiNoneZeroCountMbDc = 0;
+  uint8_t uiNoneZeroCountOffset                         = (iUV - 1) << 1;   //UV==1 or 2
+  uint8_t uiSubMbIdx                                    = 16 + ((iUV - 1) << 2); //uiSubMbIdx == 16 or 20
+  int16_t* iChromaDc = pMbCache->pDct->iChromaDc[iUV - 1], *pBlock = pMbCache->pDct->iChromaBlock[ (iUV - 1) << 2];
+  int16_t aDct2x2[4], j, aMax[4];
+  int32_t iSingleCtr8x8 = 0;
+  const int16_t* pMF = g_kiQuantMF[kiQp];
+  const int16_t* pFF = g_kiQuantInterFF[ (!kiInterFlag) * 6 + kiQp];
+
+  uiNoneZeroCountMbDc = pfQuantizationHadamard2x2 (pRes, pFF[0] << 1, pMF[0]>>1, aDct2x2, iChromaDc);
+
+  pfQuantizationFour4x4Max (pRes, pFF,  pMF, aMax);
+
+  for (j = 0; j < 4; j++) {
+    if (aMax[j] == 0)
+      pfSetMemZeroSize8 (pBlock, 32);
+    else {
+      pfScan4x4Ac (pBlock, pRes);
+      if (kiInterFlag) {
+        if (aMax[j] > 1)
+          iSingleCtr8x8 += 9;
+        else if (iSingleCtr8x8 < 7)
+          iSingleCtr8x8 += pfCalculateSingleCtr4x4 (pBlock);
+      } else
+        iSingleCtr8x8 = INT_MAX;
+    }
+    pRes += 16;
+    pBlock += 16;
+  }
+  pRes -= 64;
+
+  if (iSingleCtr8x8 < 7) { //from JVT-O079
+    pfSetMemZeroSize64 (pRes, 128); // confirmed_safe_unsafe_usage
+    ST16 (&pCurMb->pNonZeroCount[16 + uiNoneZeroCountOffset], 0);
+    ST16 (&pCurMb->pNonZeroCount[20 + uiNoneZeroCountOffset], 0);
+  } else {
+    const uint8_t* kpNoneZeroCountIdx = &g_kuiMbCountScan4Idx[uiSubMbIdx];
+    pBlock -= 64;
+    for (i = 0; i < 4; i++) {
+      uiNoneZeroCount = pfGetNoneZeroCount (pBlock);
+      pCurMb->pNonZeroCount[*kpNoneZeroCountIdx++] = uiNoneZeroCount;
+      uiNoneZeroCountMbAc += uiNoneZeroCount;
+      pBlock += 16;
+    }
+    pfDequantizationFour4x4 (pRes, g_kuiDequantCoeff[pCurMb->uiChromaQp]);
+    pCurMb->uiCbp &= 0x0F;
+    pCurMb->uiCbp |= 0x20;
+  }
+
+  if (uiNoneZeroCountMbDc > 0) {
+    WelsDequantIHadamard2x2Dc (aDct2x2, g_kuiDequantCoeff[kiQp][0]);
+    if (2 != (pCurMb->uiCbp >> 4))
+      pCurMb->uiCbp |= (0x01 << 4) ;
+    pRes[0]  = aDct2x2[0];
+    pRes[16] = aDct2x2[1];
+    pRes[32] = aDct2x2[2];
+    pRes[48] = aDct2x2[3];
+  }
+}
+
+
+void    WelsRecPskip (SDqLayer* pCurLayer, SWelsFuncPtrList* pFuncList, SMB* pCurMb, SMbCache* pMbCache) {
+  int32_t* iRecStride   = pCurLayer->iCsStride;
+  uint8_t** pCsMb       = &pMbCache->SPicData.pCsMb[0];
+
+  pFuncList->pfCopy16x16Aligned (pCsMb[0],  *iRecStride++,  pMbCache->pSkipMb,       16);
+  pFuncList->pfCopy8x8Aligned (pCsMb[1],    *iRecStride++,  pMbCache->pSkipMb + 256, 8);
+  pFuncList->pfCopy8x8Aligned (pCsMb[2],    *iRecStride,    pMbCache->pSkipMb + 320, 8);
+  pFuncList->pfSetMemZeroSize8 (pCurMb->pNonZeroCount,  24);
+}
+
+bool WelsTryPYskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {
+  int32_t iSingleCtrMb = 0;
+  int16_t* pRes = pMbCache->pCoeffLevel;
+  const uint8_t kuiQp = pCurMb->uiLumaQp;
+
+  int16_t* pBlock = pMbCache->pDct->iLumaBlock[0];
+  uint16_t aMax[4], i, j;
+  const int16_t* pMF = g_kiQuantMF[kuiQp];
+  const int16_t* pFF = g_kiQuantInterFF[kuiQp];
+
+  for (i = 0; i < 4; i++) {
+    pEncCtx->pFuncList->pfQuantizationFour4x4Max (pRes, pFF,  pMF, (int16_t*)aMax);
+
+    for (j = 0; j < 4; j++) {
+      if (aMax[j] > 1) return false; // iSingleCtrMb += 9, can't be P_SKIP
+      else if (aMax[j] == 1) {
+        pEncCtx->pFuncList->pfScan4x4 (pBlock, pRes); //
+        iSingleCtrMb += pEncCtx->pFuncList->pfCalculateSingleCtr4x4 (pBlock);
+      }
+      if (iSingleCtrMb >= 6) return false; //from JVT-O079
+      pRes += 16;
+      pBlock += 16;
+    }
+  }
+  return true;
+}
+
+bool    WelsTryPUVskip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iUV) {
+  int16_t* pRes = ((iUV == 1) ? & (pMbCache->pCoeffLevel[256]) : & (pMbCache->pCoeffLevel[256 + 64]));
+
+  const uint8_t kuiQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
+                        pEncCtx->pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset)];
+
+  const int16_t* pMF = g_kiQuantMF[kuiQp];
+  const int16_t* pFF = g_kiQuantInterFF[kuiQp];
+
+  if (pEncCtx->pFuncList->pfQuantizationHadamard2x2Skip (pRes, pFF[0] << 1, pMF[0]>>1))
+    return false;
+  else {
+    uint16_t aMax[4], j;
+    int32_t iSingleCtrMb = 0;
+    int16_t* pBlock = pMbCache->pDct->iChromaBlock[ (iUV - 1) << 2];
+    pEncCtx->pFuncList->pfQuantizationFour4x4Max (pRes, pFF,  pMF, (int16_t*)aMax);
+
+    for (j = 0; j < 4; j++) {
+      if (aMax[j] > 1) return false;   // iSingleCtrMb += 9, can't be P_SKIP
+      else if (aMax[j] == 1) {
+        pEncCtx->pFuncList->pfScan4x4Ac (pBlock, pRes);
+        iSingleCtrMb += pEncCtx->pFuncList->pfCalculateSingleCtr4x4 (pBlock);
+      }
+      if (iSingleCtrMb >= 7) return false; //from JVT-O079
+      pRes += 16;
+      pBlock += 16;
+    }
+    return true;
+  }
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_slice.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_slice.cpp
new file mode 100644
index 0000000000..90139136f9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_encode_slice.cpp
@@ -0,0 +1,2009 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_encode_slice.c
+ *
+ * \brief   svc encoding slice
+ *
+ * \date    2009.07.27 Created
+ *
+ *************************************************************************************
+ */
+
+#include "ls_defines.h"
+#include "svc_encode_slice.h"
+#include "svc_enc_golomb.h"
+#include "svc_base_layer_md.h"
+#include "svc_encode_mb.h"
+#include "svc_set_mb_syn.h"
+#include "decode_mb_aux.h"
+#include "svc_mode_decision.h"
+
+namespace WelsEnc {
+//#define ENC_TRACE
+
+typedef int32_t (*PWelsCodingSliceFunc) (sWelsEncCtx* pCtx, SSlice* pSlice);
+typedef void (*PWelsSliceHeaderWriteFunc) (sWelsEncCtx* pCtx, SBitStringAux* pBs, SDqLayer* pCurLayer, SSlice* pSlice,
+    IWelsParametersetStrategy* pParametersetStrategy);
+
+void UpdateNonZeroCountCache (SMB* pMb, SMbCache* pMbCache) {
+  ST32 (&pMbCache->iNonZeroCoeffCount[9], LD32 (&pMb->pNonZeroCount[ 0]));
+  ST32 (&pMbCache->iNonZeroCoeffCount[17], LD32 (&pMb->pNonZeroCount[ 4]));
+  ST32 (&pMbCache->iNonZeroCoeffCount[25], LD32 (&pMb->pNonZeroCount[ 8]));
+  ST32 (&pMbCache->iNonZeroCoeffCount[33], LD32 (&pMb->pNonZeroCount[12]));
+
+  ST16 (&pMbCache->iNonZeroCoeffCount[14], LD16 (&pMb->pNonZeroCount[16]));
+  ST16 (&pMbCache->iNonZeroCoeffCount[38], LD16 (&pMb->pNonZeroCount[18]));
+  ST16 (&pMbCache->iNonZeroCoeffCount[22], LD16 (&pMb->pNonZeroCount[20]));
+  ST16 (&pMbCache->iNonZeroCoeffCount[46], LD16 (&pMb->pNonZeroCount[22]));
+}
+
+void WelsSliceHeaderScalExtInit (SDqLayer* pCurLayer, SSlice* pSlice) {
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+  SNalUnitHeaderExt* pNalHeadExt = &pCurLayer->sLayerInfo.sNalHeaderExt;
+
+  uint8_t uiDependencyId = pNalHeadExt->uiDependencyId;
+
+  pSliceHeadExt->bSliceSkipFlag = false;
+
+  if (uiDependencyId > 0) { //spatial EL
+    //bothe adaptive and default flags should equal to 0.
+    pSliceHeadExt->bAdaptiveBaseModeFlag     =
+      pSliceHeadExt->bAdaptiveMotionPredFlag   =
+        pSliceHeadExt->bAdaptiveResidualPredFlag = false;
+
+    pSliceHeadExt->bDefaultBaseModeFlag     =
+      pSliceHeadExt->bDefaultMotionPredFlag   =
+        pSliceHeadExt->bDefaultResidualPredFlag = false;
+  }
+}
+
+void WelsSliceHeaderExtInit (sWelsEncCtx* pEncCtx, SDqLayer* pCurLayer, SSlice* pSlice) {
+  SSliceHeaderExt* pCurSliceExt = &pSlice->sSliceHeaderExt;
+  SSliceHeader* pCurSliceHeader  = &pCurSliceExt->sSliceHeader;
+  SSpatialLayerInternal* pParamInternal = &pEncCtx->pSvcParam->sDependencyLayers[pEncCtx->uiDependencyId];
+  pCurSliceHeader->eSliceType = pEncCtx->eSliceType;
+
+  pCurSliceExt->bStoreRefBasePicFlag = false;
+
+  pCurSliceHeader->iFrameNum      = pParamInternal->iFrameNum;
+  pCurSliceHeader->uiIdrPicId     = pParamInternal->uiIdrPicId;
+  pCurSliceHeader->iPicOrderCntLsb = pEncCtx->pEncPic->iFramePoc;      // 0
+
+  if (P_SLICE == pEncCtx->eSliceType) {
+    pCurSliceHeader->uiNumRefIdxL0Active = 1;
+    if (pCurSliceHeader->uiRefCount > 0 &&
+        pCurSliceHeader->uiRefCount <= pCurLayer->sLayerInfo.pSpsP->iNumRefFrames) {
+      pCurSliceHeader->bNumRefIdxActiveOverrideFlag = true;
+      pCurSliceHeader->uiNumRefIdxL0Active = pCurSliceHeader->uiRefCount;
+    }
+    //to solve mismatch between debug&release
+    else {
+      pCurSliceHeader->bNumRefIdxActiveOverrideFlag = false;
+    }
+  }
+
+  pCurSliceHeader->iSliceQpDelta = pEncCtx->iGlobalQp - pCurLayer->sLayerInfo.pPpsP->iPicInitQp;
+
+  //for deblocking initial
+  pCurSliceHeader->uiDisableDeblockingFilterIdc = pCurLayer->iLoopFilterDisableIdc;
+  pCurSliceHeader->iSliceAlphaC0Offset =
+    pCurLayer->iLoopFilterAlphaC0Offset; // need update iSliceAlphaC0Offset & iSliceBetaOffset for pSlice-header if loop_filter_idc != 1
+  pCurSliceHeader->iSliceBetaOffset = pCurLayer->iLoopFilterBetaOffset;
+  pCurSliceExt->uiDisableInterLayerDeblockingFilterIdc = pCurLayer->uiDisableInterLayerDeblockingFilterIdc;
+
+  if (pSlice->bSliceHeaderExtFlag) {
+    WelsSliceHeaderScalExtInit (pCurLayer, pSlice);
+  } else {
+    //both adaptive and default flags should equal to 0.
+    pCurSliceExt->bAdaptiveBaseModeFlag =
+      pCurSliceExt->bAdaptiveMotionPredFlag =
+        pCurSliceExt->bAdaptiveResidualPredFlag = false;
+
+    pCurSliceExt->bDefaultBaseModeFlag =
+      pCurSliceExt->bDefaultMotionPredFlag =
+        pCurSliceExt->bDefaultResidualPredFlag  = false;
+  }
+}
+
+
+void UpdateMbNeighbor (SDqLayer* pCurDq, SMB* pMb, const int32_t kiMbWidth, uint16_t uiSliceIdc) {
+  uint32_t uiNeighborAvailFlag        = 0;
+  const int32_t kiMbXY                = pMb->iMbXY;
+  const int32_t kiMbX                 = pMb->iMbX;
+  const int32_t kiMbY                 = pMb->iMbY;
+  bool     bLeft;
+  bool     bTop;
+  bool     bLeftTop;
+  bool     bRightTop;
+  int32_t   iLeftXY, iTopXY, iLeftTopXY, iRightTopXY;
+
+  pMb->uiSliceIdc = uiSliceIdc;
+  iLeftXY = kiMbXY - 1;
+  iTopXY = kiMbXY - kiMbWidth;
+  iLeftTopXY = iTopXY - 1;
+  iRightTopXY = iTopXY + 1;
+
+  bLeft = (kiMbX > 0) && (uiSliceIdc == WelsMbToSliceIdc (pCurDq, iLeftXY));
+  bTop = (kiMbY > 0) && (uiSliceIdc == WelsMbToSliceIdc (pCurDq, iTopXY));
+  bLeftTop = (kiMbX > 0) && (kiMbY > 0) && (uiSliceIdc == WelsMbToSliceIdc (pCurDq, iLeftTopXY));
+  bRightTop = (kiMbX < (kiMbWidth - 1)) && (kiMbY > 0) && (uiSliceIdc == WelsMbToSliceIdc (pCurDq, iRightTopXY));
+
+  if (bLeft) {
+    uiNeighborAvailFlag |= LEFT_MB_POS;
+  }
+  if (bTop) {
+    uiNeighborAvailFlag |= TOP_MB_POS;
+  }
+  if (bLeftTop) {
+    uiNeighborAvailFlag |= TOPLEFT_MB_POS;
+  }
+  if (bRightTop) {
+    uiNeighborAvailFlag |= TOPRIGHT_MB_POS;
+  }
+  pMb->uiNeighborAvail = (uint8_t)uiNeighborAvailFlag;
+}
+
+/* count MB types if enabled FRAME_INFO_OUTPUT*/
+#if defined(MB_TYPES_CHECK)
+void WelsCountMbType (int32_t (*iMbCount)[18], const EWelsSliceType keSt, const SMB* kpMb) {
+  if (NULL == iMbCount)
+    return;
+
+  switch (kpMb->uiMbType) {
+  case MB_TYPE_INTRA4x4:
+    ++ iMbCount[keSt][Intra4x4];
+    break;
+  case MB_TYPE_INTRA16x16:
+    ++ iMbCount[keSt][Intra16x16];
+    break;
+  case MB_TYPE_SKIP:
+    ++ iMbCount[keSt][PSkip];
+    break;
+  case MB_TYPE_16x16:
+    ++ iMbCount[keSt][Inter16x16];
+    break;
+  case MB_TYPE_16x8:
+    ++ iMbCount[keSt][Inter16x8];
+    break;
+  case MB_TYPE_8x16:
+    ++ iMbCount[keSt][Inter8x16];
+    break;
+  case MB_TYPE_8x8:
+    ++ iMbCount[keSt][Inter8x8];
+    break;
+  case MB_TYPE_INTRA_BL:
+    ++ iMbCount[keSt][7];
+    break;
+  default:
+    break;
+  }
+}
+#endif//MB_TYPES_CHECK
+
+/*!
+* \brief    write reference picture list on reordering syntax in Slice header
+*/
+void WriteReferenceReorder (SBitStringAux* pBs, SSliceHeader* sSliceHeader) {
+  SRefPicListReorderSyntax* pRefOrdering    = &sSliceHeader->sRefReordering;
+  uint8_t eSliceType                        = sSliceHeader->eSliceType % 5;
+  int16_t n = 0;
+
+  if (I_SLICE != eSliceType && SI_SLICE != eSliceType) { // !I && !SI
+    BsWriteOneBit (pBs, true);
+//    {
+    uint16_t uiReorderingOfPicNumsIdc;
+    do {
+      uiReorderingOfPicNumsIdc = pRefOrdering->SReorderingSyntax[n].uiReorderingOfPicNumsIdc;
+      BsWriteUE (pBs, uiReorderingOfPicNumsIdc);
+      if (0 == uiReorderingOfPicNumsIdc || 1 == uiReorderingOfPicNumsIdc)
+        BsWriteUE (pBs, pRefOrdering->SReorderingSyntax[n].uiAbsDiffPicNumMinus1);
+      else if (2 == uiReorderingOfPicNumsIdc)
+        BsWriteUE (pBs, pRefOrdering->SReorderingSyntax[n].iLongTermPicNum);
+
+      n ++;
+    } while (3 != uiReorderingOfPicNumsIdc);
+//    }
+  }
+}
+
+/*!
+* \brief    write reference picture marking syntax in pSlice header
+*/
+void WriteRefPicMarking (SBitStringAux* pBs, SSliceHeader* pSliceHeader, SNalUnitHeaderExt* pNalHdrExt) {
+  SRefPicMarking* sRefMarking = &pSliceHeader->sRefMarking;
+  int16_t n = 0;
+
+  if (pNalHdrExt->bIdrFlag) {
+    BsWriteOneBit (pBs, sRefMarking->bNoOutputOfPriorPicsFlag);
+    BsWriteOneBit (pBs, sRefMarking->bLongTermRefFlag);
+  } else {
+    BsWriteOneBit (pBs, sRefMarking->bAdaptiveRefPicMarkingModeFlag);
+
+    if (sRefMarking->bAdaptiveRefPicMarkingModeFlag) {
+      int32_t iMmcoType;
+      do {
+        iMmcoType = sRefMarking->SMmcoRef[n].iMmcoType;
+        BsWriteUE (pBs, iMmcoType);
+        if (1 == iMmcoType || 3 == iMmcoType)
+          BsWriteUE (pBs, sRefMarking->SMmcoRef[n].iDiffOfPicNum - 1);
+
+        if (2 == iMmcoType)
+          BsWriteUE (pBs, sRefMarking->SMmcoRef[n].iLongTermPicNum);
+
+        if (3 == iMmcoType || 6 == iMmcoType)
+          BsWriteUE (pBs, sRefMarking->SMmcoRef[n].iLongTermFrameIdx);
+
+        if (4 == iMmcoType)
+          BsWriteUE (pBs, sRefMarking->SMmcoRef[n].iMaxLongTermFrameIdx + 1);
+
+        n ++;
+      } while (0 != iMmcoType);
+    }
+
+  }
+}
+
+void WelsSliceHeaderWrite (sWelsEncCtx* pCtx, SBitStringAux* pBs, SDqLayer* pCurLayer, SSlice* pSlice,
+                           IWelsParametersetStrategy* pParametersetStrategy) {
+  SWelsSPS* pSps = pCurLayer->sLayerInfo.pSpsP;
+  SWelsPPS* pPps = pCurLayer->sLayerInfo.pPpsP;
+  SSliceHeader* pSliceHeader      = &pSlice->sSliceHeaderExt.sSliceHeader;
+  SNalUnitHeaderExt* pNalHead   = &pCurLayer->sLayerInfo.sNalHeaderExt;
+
+  BsWriteUE (pBs, pSliceHeader->iFirstMbInSlice);
+  BsWriteUE (pBs, pSliceHeader->eSliceType);    /* same type things */
+
+  BsWriteUE (pBs, pSliceHeader->pPps->iPpsId + pParametersetStrategy->GetPpsIdOffset (pSliceHeader->pPps->iPpsId));
+
+  BsWriteBits (pBs, pSps->uiLog2MaxFrameNum, pSliceHeader->iFrameNum);
+
+  if (pNalHead->bIdrFlag) { /* NAL IDR */
+    BsWriteUE (pBs, pSliceHeader->uiIdrPicId);
+  }
+
+  BsWriteBits (pBs, pSps->iLog2MaxPocLsb, pSliceHeader->iPicOrderCntLsb);
+
+  if (P_SLICE == pSliceHeader->eSliceType) {
+    BsWriteOneBit (pBs, pSliceHeader->bNumRefIdxActiveOverrideFlag);
+    if (pSliceHeader->bNumRefIdxActiveOverrideFlag) {
+      BsWriteUE (pBs, WELS_CLIP3 (pSliceHeader->uiNumRefIdxL0Active - 1, 0, MAX_REF_PIC_COUNT));
+    }
+  }
+
+  if (!pNalHead->bIdrFlag)
+    WriteReferenceReorder (pBs, pSliceHeader);
+
+  if (pNalHead->sNalUnitHeader.uiNalRefIdc) {
+    WriteRefPicMarking (pBs, pSliceHeader, pNalHead);
+  }
+
+  if (pPps->bEntropyCodingModeFlag && pSliceHeader->eSliceType  != I_SLICE) {
+    BsWriteUE (pBs, pSlice->iCabacInitIdc);
+  }
+  BsWriteSE (pBs, pSliceHeader->iSliceQpDelta);       /* pSlice qp delta */
+
+  if (pPps->bDeblockingFilterControlPresentFlag) {
+    switch (pSliceHeader->uiDisableDeblockingFilterIdc) {
+    case 0:
+    case 3:
+    case 4:
+    case 6:
+      BsWriteUE (pBs, 0);
+      break;
+    case 1:
+      BsWriteUE (pBs, 1);
+      break;
+    case 2:
+    case 5:
+      BsWriteUE (pBs, 2);
+      break;
+    default:
+      WelsLog (&pCtx->sLogCtx, WELS_LOG_ERROR, "Invalid uiDisableDeblockingFilterIdc %d",
+               pSliceHeader->uiDisableDeblockingFilterIdc);
+      break;
+    }
+    if (1 != pSliceHeader->uiDisableDeblockingFilterIdc) {
+      BsWriteSE (pBs, pSliceHeader->iSliceAlphaC0Offset >> 1);
+      BsWriteSE (pBs, pSliceHeader->iSliceBetaOffset >> 1);
+    }
+  }
+}
+
+void WelsSliceHeaderExtWrite (sWelsEncCtx* pCtx, SBitStringAux* pBs, SDqLayer* pCurLayer, SSlice* pSlice,
+                              IWelsParametersetStrategy* pParametersetStrategy) {
+  SWelsSPS* pSps           = pCurLayer->sLayerInfo.pSpsP;
+  SWelsPPS* pPps           = pCurLayer->sLayerInfo.pPpsP;
+  SSubsetSps* pSubSps = pCurLayer->sLayerInfo.pSubsetSpsP;
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+  SSliceHeader* pSliceHeader      = &pSliceHeadExt->sSliceHeader;
+  SNalUnitHeaderExt* pNalHead   = &pCurLayer->sLayerInfo.sNalHeaderExt;
+
+  BsWriteUE (pBs, pSliceHeader->iFirstMbInSlice);
+  BsWriteUE (pBs, pSliceHeader->eSliceType);    /* same type things */
+
+  BsWriteUE (pBs, pSliceHeader->pPps->iPpsId +
+             pParametersetStrategy->GetPpsIdOffset (pSliceHeader->pPps->iPpsId));
+
+  BsWriteBits (pBs, pSps->uiLog2MaxFrameNum, pSliceHeader->iFrameNum);
+
+  if (pNalHead->bIdrFlag) { /* NAL IDR */
+    BsWriteUE (pBs, pSliceHeader->uiIdrPicId);
+  }
+
+  BsWriteBits (pBs, pSps->iLog2MaxPocLsb, pSliceHeader->iPicOrderCntLsb);
+//  {
+  if (P_SLICE == pSliceHeader->eSliceType) {
+    BsWriteOneBit (pBs, pSliceHeader->bNumRefIdxActiveOverrideFlag);
+    if (pSliceHeader->bNumRefIdxActiveOverrideFlag) {
+      BsWriteUE (pBs, WELS_CLIP3 (pSliceHeader->uiNumRefIdxL0Active - 1, 0, MAX_REF_PIC_COUNT));
+    }
+  }
+
+  if (!pNalHead->bIdrFlag)
+    WriteReferenceReorder (pBs, pSliceHeader);
+
+  if (pNalHead->sNalUnitHeader.uiNalRefIdc) {
+    WriteRefPicMarking (pBs, pSliceHeader, pNalHead);
+
+    if (!pSubSps->sSpsSvcExt.bSliceHeaderRestrictionFlag) {
+      BsWriteOneBit (pBs, pSliceHeadExt->bStoreRefBasePicFlag);
+    }
+  }
+//  }
+
+
+  if (pPps->bEntropyCodingModeFlag && pSliceHeader->eSliceType  != I_SLICE) {
+    BsWriteUE (pBs, pSlice->iCabacInitIdc);
+  }
+
+  BsWriteSE (pBs, pSliceHeader->iSliceQpDelta);       /* pSlice qp delta */
+
+  if (pPps->bDeblockingFilterControlPresentFlag) {
+    BsWriteUE (pBs, pSliceHeader->uiDisableDeblockingFilterIdc);
+    if (1 != pSliceHeader->uiDisableDeblockingFilterIdc) {
+      BsWriteSE (pBs, pSliceHeader->iSliceAlphaC0Offset >> 1);
+      BsWriteSE (pBs, pSliceHeader->iSliceBetaOffset >> 1);
+    }
+  }
+
+#if !defined(DISABLE_FMO_FEATURE)
+  if (pPps->uiNumSliceGroups > 1  &&
+      pPps->uiSliceGroupMapType >= 3 &&
+      pPps->uiSliceGroupMapType <= 5) {
+    int32_t iNumBits;
+    if (pPps->uiSliceGroupChangeRate) {
+      iNumBits = WELS_CEILLOG2 (1 + pPps->uiPicSizeInMapUnits / pPps->uiSliceGroupChangeRate);
+      BsWriteBits (pBs, iNumBits, pSliceHeader->iSliceGroupChangeCycle);
+    }
+  }
+#endif//!DISABLE_FMO_FEATURE
+
+  if (false) {
+    BsWriteOneBit (pBs, pSliceHeadExt->bSliceSkipFlag);
+    if (pSliceHeadExt->bSliceSkipFlag) {
+      BsWriteUE (pBs, pSliceHeadExt->uiNumMbsInSlice - 1);
+    } else {
+      BsWriteOneBit (pBs, pSliceHeadExt->bAdaptiveBaseModeFlag);
+      if (!pSliceHeadExt->bAdaptiveBaseModeFlag) {
+        BsWriteOneBit (pBs, pSliceHeadExt->bDefaultBaseModeFlag);
+      }
+
+      if (!pSliceHeadExt->bDefaultBaseModeFlag) {
+        BsWriteOneBit (pBs, 0);
+        BsWriteOneBit (pBs, 0);
+      }
+
+      BsWriteOneBit (pBs, pSliceHeadExt->bAdaptiveResidualPredFlag);
+      if (!pSliceHeadExt->bAdaptiveResidualPredFlag) {
+        BsWriteOneBit (pBs, 0);
+      }
+    }
+    if (1 == pSubSps->sSpsSvcExt.bAdaptiveTcoeffLevelPredFlag) {
+      BsWriteOneBit (pBs, pSliceHeadExt->bTcoeffLevelPredFlag);
+    }
+
+  }
+
+  if (!pSubSps->sSpsSvcExt.bSliceHeaderRestrictionFlag) {
+    BsWriteBits (pBs, 4, 0);
+    BsWriteBits (pBs, 4, 15);
+  }
+}
+
+//only BaseLayer inter MB and SpatialLayer (uiQualityId = 0) inter MB calling this pFunc.
+//only for inter part
+void WelsInterMbEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+
+  WelsDctMb (pMbCache->pCoeffLevel,  pMbCache->SPicData.pEncMb[0], pEncCtx->pCurDqLayer->iEncStride[0],
+             pMbCache->pMemPredLuma, pEncCtx->pFuncList->pfDctFourT4);
+  WelsEncInterY (pEncCtx->pFuncList, pCurMb, pMbCache);
+}
+
+
+//only BaseLayer inter MB and SpatialLayer (uiQualityId = 0) inter MB calling this pFunc.
+//only for I SSlice
+void WelsIMbChromaEncode (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache) {
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  const int32_t kiEncStride     = pCurLayer->iEncStride[1];
+  const int32_t kiCsStride      = pCurLayer->iCsStride[1];
+  int16_t* pCurRS               = pMbCache->pCoeffLevel;
+  uint8_t* pBestPred            = pMbCache->pBestPredIntraChroma;
+  uint8_t* pCsCb                = pMbCache->SPicData.pCsMb[1];
+  uint8_t* pCsCr                = pMbCache->SPicData.pCsMb[2];
+
+  //cb
+  pFunc->pfDctFourT4 (pCurRS,    pMbCache->SPicData.pEncMb[1], kiEncStride, pBestPred,    8);
+  WelsEncRecUV (pFunc, pCurMb, pMbCache, pCurRS,    1);
+  pFunc->pfIDctFourT4 (pCsCb, kiCsStride, pBestPred,    8, pCurRS);
+
+  //cr
+  pFunc->pfDctFourT4 (pCurRS + 64, pMbCache->SPicData.pEncMb[2], kiEncStride, pBestPred + 64, 8);
+  WelsEncRecUV (pFunc, pCurMb, pMbCache, pCurRS + 64, 2);
+  pFunc->pfIDctFourT4 (pCsCr, kiCsStride, pBestPred + 64, 8, pCurRS + 64);
+}
+
+
+//only BaseLayer inter MB and SpatialLayer (uiQualityId = 0) inter MB calling this pFunc.
+//for P SSlice (intra part + inter part)
+void WelsPMbChromaEncode (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  const int32_t kiEncStride     = pCurLayer->iEncStride[1];
+  SMbCache* pMbCache            = &pSlice->sMbCacheInfo;
+  int16_t* pCurRS               = pMbCache->pCoeffLevel + 256;
+  uint8_t* pBestPred            = pMbCache->pMemPredChroma;
+
+  pFunc->pfDctFourT4 (pCurRS,       pMbCache->SPicData.pEncMb[1],   kiEncStride,    pBestPred,      8);
+  pFunc->pfDctFourT4 (pCurRS + 64,  pMbCache->SPicData.pEncMb[2],   kiEncStride,    pBestPred + 64, 8);
+
+  WelsEncRecUV (pFunc, pCurMb, pMbCache, pCurRS, 1);
+  WelsEncRecUV (pFunc, pCurMb, pMbCache, pCurRS + 64, 2);
+}
+
+void OutputPMbWithoutConstructCsRsNoCopy (sWelsEncCtx* pCtx, SDqLayer* pDq, SSlice* pSlice, SMB* pMb) {
+  if ((IS_INTER (pMb->uiMbType) && !IS_SKIP (pMb->uiMbType))
+      || IS_I_BL (pMb->uiMbType)) { //intra have been reconstructed, NO COPY from CS to pDecPic--
+    SMbCache* pMbCache                  = &pSlice->sMbCacheInfo;
+    uint8_t* pDecY                      = pMbCache->SPicData.pDecMb[0];
+    uint8_t* pDecU                      = pMbCache->SPicData.pDecMb[1];
+    uint8_t* pDecV                      = pMbCache->SPicData.pDecMb[2];
+    int16_t* pScaledTcoeff              = pMbCache->pCoeffLevel;
+    const int32_t kiDecStrideLuma       = pDq->pDecPic->iLineSize[0];
+    const int32_t kiDecStrideChroma     = pDq->pDecPic->iLineSize[1];
+    PIDctFunc pfIdctFour4x4             = pCtx->pFuncList->pfIDctFourT4;
+
+    WelsIDctT4RecOnMb (pDecY, kiDecStrideLuma, pDecY, kiDecStrideLuma, pScaledTcoeff,  pfIdctFour4x4);
+    pfIdctFour4x4 (pDecU, kiDecStrideChroma, pDecU, kiDecStrideChroma, pScaledTcoeff + 256);
+    pfIdctFour4x4 (pDecV, kiDecStrideChroma, pDecV, kiDecStrideChroma, pScaledTcoeff + 320);
+  }
+}
+
+void UpdateQpForOverflow (SMB* pCurMb, uint8_t kuiChromaQpIndexOffset) {
+  pCurMb->uiLumaQp += DELTA_QP;
+  pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];
+}
+// for intra non-dynamic pSlice
+//encapsulate two kinds of reconstruction:
+//first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction)
+//second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
+int32_t WelsISliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  SMbCache* pMbCache            = &pSlice->sMbCacheInfo;
+  SSliceHeaderExt* pSliceHdExt  = &pSlice->sSliceHeaderExt;
+  SMB* pMbList                  = pCurLayer->sMbDataP;
+  SMB* pCurMb                   = NULL;
+  const int32_t kiSliceFirstMbXY = pSliceHdExt->sSliceHeader.iFirstMbInSlice;
+  int32_t iNextMbIdx            = kiSliceFirstMbXY;
+  const int32_t kiTotalNumMb    = pCurLayer->iMbWidth * pCurLayer->iMbHeight;
+  int32_t iCurMbIdx             = 0, iNumMbCoded = 0;
+  const int32_t kiSliceIdx      = pSlice->iSliceIdx;
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+
+  SWelsMD sMd;
+  int32_t iEncReturn = ENC_RETURN_SUCCESS;
+  SDynamicSlicingStack sDss;
+  if (pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+    WelsInitSliceCabac (pEncCtx, pSlice);
+    sDss.pRestoreBuffer = NULL;
+    sDss.iStartPos = sDss.iCurrentPos = 0;
+  }
+  for (; ;) {
+    if (!pEncCtx->pSvcParam->iEntropyCodingModeFlag)
+      pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, 0);
+    iCurMbIdx = iNextMbIdx;
+    pCurMb = &pMbList[ iCurMbIdx ];
+
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInit (pEncCtx, pCurMb, pSlice);
+    WelsMdIntraInit (pEncCtx, pCurMb, pMbCache, kiSliceFirstMbXY);
+
+TRY_REENCODING:
+    sMd.iLambda = g_kiQpCostTable[pCurMb->uiLumaQp];
+    WelsMdIntraMb (pEncCtx, &sMd, pCurMb, pMbCache);
+    UpdateNonZeroCountCache (pCurMb, pMbCache);
+
+
+    iEncReturn = pEncCtx->pFuncList->pfWelsSpatialWriteMbSyn (pEncCtx, pSlice, pCurMb);
+    if (!pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+      if ((iEncReturn == ENC_RETURN_VLCOVERFLOWFOUND) && (pCurMb->uiLumaQp < 50)) {
+        pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+        UpdateQpForOverflow (pCurMb, kuiChromaQpIndexOffset);
+        goto TRY_REENCODING;
+      }
+    }
+    if (ENC_RETURN_SUCCESS != iEncReturn)
+      return iEncReturn;
+
+    pCurMb->uiSliceIdc = kiSliceIdx;
+
+#if defined(MB_TYPES_CHECK)
+    WelsCountMbType (pEncCtx->sPerInfo.iMbCount, I_SLICE, pCurMb);
+#endif//MB_TYPES_CHECK
+
+    pEncCtx->pFuncList->pfMdBackgroundInfoUpdate (pCurLayer, pCurMb, pMbCache->bCollocatedPredFlag, I_SLICE);
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInfoUpdate (pEncCtx, pCurMb, sMd.iCostLuma, pSlice);
+
+    ++iNumMbCoded;
+    iNextMbIdx = WelsGetNextMbOfSlice (pCurLayer, iCurMbIdx);
+    if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbCoded >= kiTotalNumMb) {
+      break;
+    }
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+// Only for intra dynamic slicing
+int32_t WelsISliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice) { //pMd + encoding
+  SBitStringAux* pBs            = pSlice->pSliceBsa;
+  SDqLayer* pCurLayer           = pEncCtx->pCurDqLayer;
+  SSliceCtx* pSliceCtx          = &pCurLayer->sSliceEncCtx;
+  SMbCache* pMbCache            = &pSlice->sMbCacheInfo;
+  SSliceHeaderExt* pSliceHdExt  = &pSlice->sSliceHeaderExt;
+  SMB* pMbList                  = pCurLayer->sMbDataP;
+  SMB* pCurMb                   = NULL;
+  const int32_t kiSliceFirstMbXY = pSliceHdExt->sSliceHeader.iFirstMbInSlice;
+  int32_t iNextMbIdx            = kiSliceFirstMbXY;
+  const int32_t kiTotalNumMb    = pCurLayer->iMbWidth * pCurLayer->iMbHeight;
+  int32_t iCurMbIdx             = 0, iNumMbCoded = 0;
+  const int32_t kiSliceIdx      = pSlice->iSliceIdx;
+  const int32_t kiPartitionId   = (kiSliceIdx % pEncCtx->iActiveThreadsNum);
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+  int32_t iEncReturn = ENC_RETURN_SUCCESS;
+
+  SWelsMD sMd;
+  SDynamicSlicingStack sDss;
+  if (pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+    WelsInitSliceCabac (pEncCtx, pSlice);
+    sDss.pRestoreBuffer = pEncCtx->pDynamicBsBuffer[kiPartitionId];
+    sDss.iStartPos = sDss.iCurrentPos = 0;
+  } else {
+    sDss.iStartPos = BsGetBitsPos (pBs);
+  }
+  for (; ;) {
+    iCurMbIdx = iNextMbIdx;
+    pCurMb = &pMbList[ iCurMbIdx ];
+
+    pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, 0);
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInit (pEncCtx, pCurMb, pSlice);
+    // if already reaches the largest number of slices, set QPs to the upper bound
+    if (pSlice->bDynamicSlicingSliceSizeCtrlFlag) {
+      pCurMb->uiLumaQp = pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId].iMaxQp;
+      pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];
+    }
+    WelsMdIntraInit (pEncCtx, pCurMb, pMbCache, kiSliceFirstMbXY);
+
+TRY_REENCODING:
+    sMd.iLambda = g_kiQpCostTable[pCurMb->uiLumaQp];
+    WelsMdIntraMb (pEncCtx, &sMd, pCurMb, pMbCache);
+    UpdateNonZeroCountCache (pCurMb, pMbCache);
+
+    iEncReturn = pEncCtx->pFuncList->pfWelsSpatialWriteMbSyn (pEncCtx, pSlice, pCurMb);
+    if (iEncReturn == ENC_RETURN_VLCOVERFLOWFOUND && (pCurMb->uiLumaQp < 50)) {
+      pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+      UpdateQpForOverflow (pCurMb, kuiChromaQpIndexOffset);
+      goto TRY_REENCODING;
+    }
+    if (ENC_RETURN_SUCCESS != iEncReturn)
+      return iEncReturn;
+
+    sDss.iCurrentPos = pEncCtx->pFuncList->pfGetBsPosition (pSlice);
+
+    if (DynSlcJudgeSliceBoundaryStepBack (pEncCtx, pSlice, pSliceCtx, pCurMb, &sDss)) { //islice
+      pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+      pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx -
+          1; // update LastCodedMbIdxOfPartition, need to -1 due to stepping back
+      ++ pCurLayer->NumSliceCodedOfPartition[kiPartitionId];
+
+      break;
+    }
+
+
+    pCurMb->uiSliceIdc = kiSliceIdx;
+
+#if defined(MB_TYPES_CHECK)
+    WelsCountMbType (pEncCtx->sPerInfo.iMbCount, I_SLICE, pCurMb);
+#endif//MB_TYPES_CHECK
+
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInfoUpdate (pEncCtx, pCurMb, sMd.iCostLuma, pSlice);
+
+    ++iNumMbCoded;
+
+    iNextMbIdx = WelsGetNextMbOfSlice (pCurLayer, iCurMbIdx);
+    //whether all of MB in current pSlice encoded or not
+    if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbCoded >= kiTotalNumMb) {
+      pSlice->iCountMbNumInSlice = iCurMbIdx - pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId];
+      pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx;
+      ++ pCurLayer->NumSliceCodedOfPartition[kiPartitionId];
+
+      break;
+    }
+  }
+  return iEncReturn;
+}
+
+//encapsulate two kinds of reconstruction:
+// first. store base or highest Dependency Layer with only one quality (without CS RS reconstruction)
+// second. lower than highest Dependency Layer, and for every Dependency Layer with one quality layer(single layer)
+int32_t WelsPSliceMdEnc (sWelsEncCtx* pEncCtx, SSlice* pSlice,  const bool kbIsHighestDlayerFlag) { //pMd + encoding
+  const SSliceHeaderExt*    kpShExt             = &pSlice->sSliceHeaderExt;
+  const SSliceHeader*       kpSh                = &kpShExt->sSliceHeader;
+  const int32_t             kiSliceFirstMbXY    = kpSh->iFirstMbInSlice;
+  SWelsMD sMd;
+
+  sMd.uiRef         = kpSh->uiRefIndex;
+  sMd.bMdUsingSad   = (pEncCtx->pSvcParam->iComplexityMode == LOW_COMPLEXITY);
+  if (!pEncCtx->pCurDqLayer->bBaseLayerAvailableFlag || !kbIsHighestDlayerFlag)
+    memset (&sMd.sMe, 0, sizeof (sMd.sMe));
+
+  //pMb loop
+  return WelsMdInterMbLoop (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY);
+}
+
+int32_t WelsPSliceMdEncDynamic (sWelsEncCtx* pEncCtx, SSlice* pSlice, const bool kbIsHighestDlayerFlag) {
+  const SSliceHeaderExt*    kpShExt             = &pSlice->sSliceHeaderExt;
+  const SSliceHeader*       kpSh                = &kpShExt->sSliceHeader;
+  const int32_t             kiSliceFirstMbXY    = kpSh->iFirstMbInSlice;
+  SWelsMD sMd;
+
+  sMd.uiRef         = kpSh->uiRefIndex;
+  sMd.bMdUsingSad   = (pEncCtx->pSvcParam->iComplexityMode == LOW_COMPLEXITY);
+  if (!pEncCtx->pCurDqLayer->bBaseLayerAvailableFlag || !kbIsHighestDlayerFlag)
+    memset (&sMd.sMe, 0, sizeof (sMd.sMe));
+
+  //mb loop
+  return WelsMdInterMbLoopOverDynamicSlice (pEncCtx, pSlice, &sMd, kiSliceFirstMbXY);
+}
+
+int32_t WelsCodePSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
+  //pSlice-level init should be outside and before this function
+  SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
+
+  const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+  const bool kbHighestSpatial = pEncCtx->pSvcParam->iSpatialLayerNum ==
+                                (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
+
+  //MD switch
+  if (kbBaseAvail && kbHighestSpatial) {
+    //initial pMd pointer
+    pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
+  } else {
+    //initial pMd pointer
+    pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
+  }
+  return WelsPSliceMdEnc (pEncCtx, pSlice, kbHighestSpatial);
+}
+
+int32_t WelsCodePOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
+  //pSlice-level init should be outside and before this function
+  SDqLayer* pCurLayer = pEncCtx->pCurDqLayer;
+
+  const bool kbBaseAvail = pCurLayer->bBaseLayerAvailableFlag;
+  const bool kbHighestSpatial = pEncCtx->pSvcParam->iSpatialLayerNum ==
+                                (pCurLayer->sLayerInfo.sNalHeaderExt.uiDependencyId + 1);
+
+  //MD switch
+  if (kbBaseAvail && kbHighestSpatial) {
+    //initial pMd pointer
+    pEncCtx->pFuncList->pfInterMd = WelsMdInterMbEnhancelayer;
+  } else {
+    //initial pMd pointer
+    pEncCtx->pFuncList->pfInterMd = WelsMdInterMb;
+  }
+  return WelsPSliceMdEncDynamic (pEncCtx, pSlice, kbHighestSpatial);
+}
+
+// 1st index: 0: for P pSlice; 1: for I pSlice;
+// 2nd index: 0: for non-dynamic pSlice; 1: for dynamic I pSlice;
+static const PWelsCodingSliceFunc g_pWelsSliceCoding[2][2] = {
+  { WelsCodePSlice, WelsCodePOverDynamicSlice }, // P SSlice
+  { WelsISliceMdEnc, WelsISliceMdEncDynamic }    // I SSlice
+};
+static const PWelsSliceHeaderWriteFunc g_pWelsWriteSliceHeader[2] = {  // 0: for base; 1: for ext;
+  WelsSliceHeaderWrite,
+  WelsSliceHeaderExtWrite
+};
+
+//Allocate slice's MB cache buffer
+int32_t AllocMbCacheAligned (SMbCache* pMbCache, CMemoryAlign* pMa) {
+  pMbCache->pMemPredMb = (uint8_t*)pMa->WelsMallocz (2 * 256 * sizeof (uint8_t), "pMbCache->pMemPredMb");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pMemPredMb));
+
+  pMbCache->pCoeffLevel = (int16_t*)pMa->WelsMallocz (MB_COEFF_LIST_SIZE * sizeof (int16_t), "pMbCache->pCoeffLevel");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pCoeffLevel));
+  pMbCache->pSkipMb = (uint8_t*)pMa->WelsMallocz (384 * sizeof (uint8_t), "pMbCache->pSkipMb");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pSkipMb));
+  pMbCache->pMemPredBlk4 = (uint8_t*)pMa->WelsMallocz (2 * 16 * sizeof (uint8_t), "pMbCache->pMemPredBlk4");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pMemPredBlk4));
+  pMbCache->pBufferInterPredMe = (uint8_t*)pMa->WelsMallocz (4 * 640 * sizeof (uint8_t), "pMbCache->pBufferInterPredMe");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pBufferInterPredMe));
+  pMbCache->pPrevIntra4x4PredModeFlag = (bool*)pMa->WelsMallocz (16 * sizeof (bool),
+                                        "pMbCache->pPrevIntra4x4PredModeFlag");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pPrevIntra4x4PredModeFlag));
+  pMbCache->pRemIntra4x4PredModeFlag = (int8_t*)pMa->WelsMallocz (16 * sizeof (int8_t),
+                                       "pMbCache->pRemIntra4x4PredModeFlag");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pRemIntra4x4PredModeFlag));
+  pMbCache->pDct = (SDCTCoeff*)pMa->WelsMallocz (sizeof (SDCTCoeff), "pMbCache->pDct");
+  WELS_VERIFY_RETURN_IF (1, (NULL == pMbCache->pDct));
+
+  return 0;
+}
+
+//  Free slice's MB cache buffer
+void FreeMbCache (SMbCache* pMbCache, CMemoryAlign* pMa) {
+  if (NULL != pMbCache->pCoeffLevel) {
+    pMa->WelsFree (pMbCache->pCoeffLevel, "pMbCache->pCoeffLevel");
+    pMbCache->pCoeffLevel = NULL;
+  }
+  if (NULL != pMbCache->pMemPredMb) {
+    pMa->WelsFree (pMbCache->pMemPredMb, "pMbCache->pMemPredMb");
+    pMbCache->pMemPredMb = NULL;
+  }
+  if (NULL != pMbCache->pSkipMb) {
+    pMa->WelsFree (pMbCache->pSkipMb, "pMbCache->pSkipMb");
+    pMbCache->pSkipMb = NULL;
+  }
+  if (NULL != pMbCache->pMemPredBlk4) {
+    pMa->WelsFree (pMbCache->pMemPredBlk4, "pMbCache->pMemPredBlk4");
+    pMbCache->pMemPredBlk4 = NULL;
+  }
+  if (NULL != pMbCache->pBufferInterPredMe) {
+    pMa->WelsFree (pMbCache->pBufferInterPredMe, "pMbCache->pBufferInterPredMe");
+    pMbCache->pBufferInterPredMe = NULL;
+  }
+  if (NULL != pMbCache->pPrevIntra4x4PredModeFlag) {
+    pMa->WelsFree (pMbCache->pPrevIntra4x4PredModeFlag, "pMbCache->pPrevIntra4x4PredModeFlag");
+    pMbCache->pPrevIntra4x4PredModeFlag = NULL;
+  }
+  if (NULL != pMbCache->pRemIntra4x4PredModeFlag) {
+    pMa->WelsFree (pMbCache->pRemIntra4x4PredModeFlag, "pMbCache->pRemIntra4x4PredModeFlag");
+    pMbCache->pRemIntra4x4PredModeFlag = NULL;
+  }
+  if (NULL != pMbCache->pDct) {
+    pMa->WelsFree (pMbCache->pDct, "pMbCache->pDct");
+    pMbCache->pDct = NULL;
+  }
+}
+
+//Initialize slice's boundary info)
+int32_t InitSliceBoundaryInfo (SDqLayer* pCurLayer,
+                               SSliceArgument* pSliceArgument,
+                               const int32_t kiSliceNumInFrame) {
+  const int32_t* kpSlicesAssignList   = (int32_t*) & (pSliceArgument->uiSliceMbNum[0]);
+  const int32_t kiMBWidth             = pCurLayer->iMbWidth;
+  const int32_t kiMBHeight            = pCurLayer->iMbHeight;
+  const int32_t kiCountNumMbInFrame   = kiMBWidth * kiMBHeight;
+  int32_t iSliceIdx                   = 0;
+  int32_t iFirstMBInSlice             = 0;
+  int32_t iMbNumInSlice               = 0;
+
+  for (; iSliceIdx < kiSliceNumInFrame; iSliceIdx++) {
+    if (SM_SINGLE_SLICE == pSliceArgument->uiSliceMode) {
+      iFirstMBInSlice = 0;
+      iMbNumInSlice   = kiCountNumMbInFrame;
+
+    } else if ((SM_RASTER_SLICE == pSliceArgument->uiSliceMode) && (0 == pSliceArgument->uiSliceMbNum[0])) {
+      iFirstMBInSlice = iSliceIdx * kiMBWidth;
+      iMbNumInSlice   = kiMBWidth;
+    } else if (SM_RASTER_SLICE  == pSliceArgument->uiSliceMode ||
+               SM_FIXEDSLCNUM_SLICE == pSliceArgument->uiSliceMode) {
+      int32_t iMbIdx  = 0;
+      for (int i = 0; i < iSliceIdx; i++) {
+        iMbIdx += kpSlicesAssignList[i];
+      }
+
+      if (iMbIdx >= kiCountNumMbInFrame) {
+        return ENC_RETURN_UNEXPECTED;
+      }
+
+      iFirstMBInSlice = iMbIdx;
+      iMbNumInSlice   = kpSlicesAssignList[iSliceIdx];
+
+    } else if (SM_SIZELIMITED_SLICE == pSliceArgument->uiSliceMode) {
+      iFirstMBInSlice  = 0;
+      iMbNumInSlice    = kiCountNumMbInFrame;
+
+    } else { // any else uiSliceMode?
+      assert (0);
+    }
+
+    pCurLayer->pCountMbNumInSlice[iSliceIdx] = iMbNumInSlice;
+    pCurLayer->pFirstMbIdxOfSlice[iSliceIdx] = iFirstMBInSlice;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t SetSliceBoundaryInfo (SDqLayer* pCurLayer, SSlice* pSlice, const int32_t kiSliceIdx) {
+  if (NULL == pCurLayer || NULL == pSlice  ||
+      NULL == pCurLayer->pFirstMbIdxOfSlice ||
+      NULL == pCurLayer->pCountMbNumInSlice) {
+
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = pCurLayer->pFirstMbIdxOfSlice[kiSliceIdx];
+  pSlice->iCountMbNumInSlice  = pCurLayer->pCountMbNumInSlice[kiSliceIdx];
+
+  return ENC_RETURN_SUCCESS;
+}
+
+//Allocate slice's MB info buffer
+int32_t AllocateSliceMBBuffer (SSlice* pSlice, CMemoryAlign* pMa) {
+  if (AllocMbCacheAligned (&pSlice->sMbCacheInfo, pMa)) {
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+// Initialize slice bs buffer info
+int32_t InitSliceBsBuffer (SSlice* pSlice,
+                           SBitStringAux* pBsWrite,
+                           bool bIndependenceBsBuffer,
+                           const int32_t iMaxSliceBufferSize,
+                           CMemoryAlign* pMa) {
+  pSlice->sSliceBs.uiSize  = iMaxSliceBufferSize;
+  pSlice->sSliceBs.uiBsPos = 0;
+
+  if (bIndependenceBsBuffer) {
+    pSlice->pSliceBsa      = &pSlice->sSliceBs.sBsWrite;
+    pSlice->sSliceBs.pBs   = (uint8_t*)pMa->WelsMallocz (iMaxSliceBufferSize, "sSliceBs.pBs");
+    if (NULL == pSlice->sSliceBs.pBs) {
+      return ENC_RETURN_MEMALLOCERR;
+    }
+  } else {
+    pSlice->pSliceBsa      = pBsWrite;
+    pSlice->sSliceBs.pBs   = NULL;
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+//free slice bs buffer
+void FreeSliceBuffer (SSlice*& pSliceList, const int32_t kiMaxSliceNum, CMemoryAlign* pMa, const char* kpTag) {
+  if (NULL != pSliceList) {
+    int32_t iSliceIdx = 0;
+    while (iSliceIdx < kiMaxSliceNum) {
+      SSlice* pSlice = &pSliceList[iSliceIdx];
+      FreeMbCache (&pSlice->sMbCacheInfo, pMa);
+
+      //slice bs buffer
+      if (NULL != pSlice->sSliceBs.pBs) {
+        pMa->WelsFree (pSlice->sSliceBs.pBs, "sSliceBs.pBs");
+        pSlice->sSliceBs.pBs = NULL;
+      }
+      ++ iSliceIdx;
+    }
+    pMa->WelsFree (pSliceList, kpTag);
+    pSliceList = NULL;
+  }
+}
+
+int32_t InitSliceList (SSlice*& pSliceList,
+                       SBitStringAux* pBsWrite,
+                       const int32_t kiMaxSliceNum,
+                       const int32_t kiMaxSliceBufferSize,
+                       const bool bIndependenceBsBuffer,
+                       CMemoryAlign* pMa) {
+  int32_t iSliceIdx               = 0;
+  int32_t iRet                    = 0;
+
+  if (kiMaxSliceBufferSize <= 0) {
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  while (iSliceIdx < kiMaxSliceNum) {
+    SSlice* pSlice = pSliceList + iSliceIdx;
+    if (NULL == pSlice) {
+      return ENC_RETURN_MEMALLOCERR;
+    }
+
+    pSlice->iSliceIdx          = iSliceIdx;
+    pSlice->uiBufferIdx        = 0;
+    pSlice->iCountMbNumInSlice = 0;
+    pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = 0;
+
+    iRet = InitSliceBsBuffer (pSlice,
+                              pBsWrite,
+                              bIndependenceBsBuffer,
+                              kiMaxSliceBufferSize,
+                              pMa);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      return iRet;
+    }
+
+    iRet = AllocateSliceMBBuffer (pSlice, pMa);
+
+    if (ENC_RETURN_SUCCESS != iRet) {
+      return iRet;
+    }
+    ++ iSliceIdx;
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t InitAllSlicesInThread (sWelsEncCtx* pCtx) {
+  SDqLayer* pCurDqLayer = pCtx->pCurDqLayer;
+  int32_t iSliceIdx     = 0;
+  int32_t iSlcBuffIdx   = 0;
+
+  for (; iSliceIdx < pCurDqLayer->iMaxSliceNum; iSliceIdx++) {
+    if (NULL == pCurDqLayer->ppSliceInLayer[iSliceIdx]) {
+      return ENC_RETURN_UNEXPECTED;
+    }
+
+    pCurDqLayer->ppSliceInLayer[iSliceIdx]->iSliceIdx = -1;
+  }
+
+  for (; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    pCurDqLayer->sSliceBufferInfo[iSlcBuffIdx].iCodedSliceNum = 0;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t InitOneSliceInThread (sWelsEncCtx* pCtx,
+                              SSlice*& pSlice,
+                              const int32_t kiSlcBuffIdx,
+                              const int32_t kiDlayerIdx,
+                              const int32_t kiSliceIdx) {
+
+  if (pCtx->pCurDqLayer->bThreadSlcBufferFlag) {
+    const int32_t kiCodedNumInThread = pCtx->pCurDqLayer->sSliceBufferInfo[kiSlcBuffIdx].iCodedSliceNum;
+    assert (kiCodedNumInThread <= pCtx->pCurDqLayer->sSliceBufferInfo[kiSlcBuffIdx].iMaxSliceNum - 1);
+    pSlice = &pCtx->pCurDqLayer->sSliceBufferInfo [kiSlcBuffIdx].pSliceBuffer[kiCodedNumInThread];
+  } else {
+    pSlice = &pCtx->pCurDqLayer->sSliceBufferInfo [0].pSliceBuffer[kiSliceIdx];
+  }
+  pSlice->iSliceIdx   = kiSliceIdx;
+  pSlice->uiBufferIdx = kiSlcBuffIdx;
+
+  // Initialize slice bs buffer info
+  pSlice->sSliceBs.uiBsPos   = 0;
+  pSlice->sSliceBs.iNalIndex = 0;
+  pSlice->sSliceBs.pBsBuffer = pCtx->pSliceThreading->pThreadBsBuffer[kiSlcBuffIdx];
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t InitSliceThreadInfo (sWelsEncCtx* pCtx,
+                             SDqLayer* pDqLayer,
+                             const int32_t kiDlayerIndex,
+                             CMemoryAlign* pMa) {
+  int32_t iThreadNum      = pCtx->pSvcParam->iMultipleThreadIdc;
+  int32_t iMaxSliceNum    = 0;
+  int32_t iSlcBufferNum   = 0;
+  int32_t iIdx            = 0;
+  int32_t iRet            = 0;
+
+  assert (iThreadNum > 0);
+
+  //for fixed slice num case, no need to reallocate, so one slice buffer for all thread
+  if (pDqLayer->bThreadSlcBufferFlag) {
+    iMaxSliceNum  = pDqLayer->iMaxSliceNum / iThreadNum + 1;
+    iSlcBufferNum = iThreadNum;
+  } else {
+    iMaxSliceNum  = pDqLayer->iMaxSliceNum;
+    iSlcBufferNum = 1;
+  }
+
+  while (iIdx < iSlcBufferNum) {
+    pDqLayer->sSliceBufferInfo[iIdx].iMaxSliceNum   = iMaxSliceNum;
+    pDqLayer->sSliceBufferInfo[iIdx].iCodedSliceNum = 0;
+    pDqLayer->sSliceBufferInfo[iIdx].pSliceBuffer   = (SSlice*)pMa->WelsMallocz (sizeof (SSlice) * iMaxSliceNum,
+        "pSliceBuffer");
+    if (NULL == pDqLayer->sSliceBufferInfo[iIdx].pSliceBuffer) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::InitSliceThreadInfo: pSliceThreadInfo->pSliceBuffer[iIdx] is NULL");
+      return ENC_RETURN_MEMALLOCERR;
+    }
+    iRet = InitSliceList (pDqLayer->sSliceBufferInfo[iIdx].pSliceBuffer,
+                          &pCtx->pOut->sBsWrite,
+                          iMaxSliceNum,
+                          pCtx->iSliceBufferSize[kiDlayerIndex],
+                          pDqLayer->bSliceBsBufferFlag,
+                          pMa);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      return iRet;
+    }
+    iIdx++;
+  }
+
+  for (; iIdx < MAX_THREADS_NUM; iIdx++) {
+    pDqLayer->sSliceBufferInfo[iIdx].iMaxSliceNum   = 0;
+    pDqLayer->sSliceBufferInfo[iIdx].iCodedSliceNum = 0;
+    pDqLayer->sSliceBufferInfo[iIdx].pSliceBuffer   = NULL;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t InitSliceInLayer (sWelsEncCtx* pCtx,
+                          SDqLayer* pDqLayer,
+                          const int32_t kiDlayerIndex,
+                          CMemoryAlign* pMa)  {
+  int32_t iRet         = 0;
+  int32_t iSliceIdx    = 0;
+  int32_t iSlcBuffIdx  = 0;
+  int32_t iStartIdx    = 0;
+  int32_t iMaxSliceNum = pDqLayer->iMaxSliceNum;
+  SSliceArgument* pSliceArgument  = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIndex].sSliceArgument;
+
+  //SM_SINGLE_SLICE mode using single-thread bs writer pOut->sBsWrite
+  //even though multi-thread is on for other layers
+  pDqLayer->bSliceBsBufferFlag = (pCtx->pSvcParam->iMultipleThreadIdc > 1 &&
+                                  SM_SINGLE_SLICE != pSliceArgument->uiSliceMode) ? true : false;
+
+  pDqLayer->bThreadSlcBufferFlag = (pCtx->pSvcParam->iMultipleThreadIdc > 1 &&
+                                    SM_SIZELIMITED_SLICE == pSliceArgument->uiSliceMode) ? true : false;
+
+  iRet = InitSliceThreadInfo (pCtx,
+                              pDqLayer,
+                              kiDlayerIndex,
+                              pMa);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  pDqLayer->iMaxSliceNum = 0;
+  for (iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    pDqLayer->iMaxSliceNum += pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+  }
+
+  pDqLayer->ppSliceInLayer = (SSlice**)pMa->WelsMallocz (sizeof (SSlice*) * pDqLayer->iMaxSliceNum, "ppSliceInLayer");
+  if (NULL ==  pDqLayer->ppSliceInLayer) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::InitSliceInLayer() pDqLayer->ppSliceInLayer is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  pDqLayer->pFirstMbIdxOfSlice = (int32_t*)pMa->WelsMallocz (sizeof (int32_t*) * pDqLayer->iMaxSliceNum,
+                                 "pFirstMbIdxOfSlice");
+  if (NULL ==  pDqLayer->pFirstMbIdxOfSlice) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::InitSliceInLayer() pDqLayer->pFirstMbIdxOfSlice is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  pDqLayer->pCountMbNumInSlice = (int32_t*)pMa->WelsMallocz (sizeof (int32_t*) * pDqLayer->iMaxSliceNum,
+                                 "pCountMbNumInSlice");
+  if (NULL ==  pDqLayer->pCountMbNumInSlice) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::InitSliceInLayer() pDqLayer->pCountMbNumInSlice is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  iRet = InitSliceBoundaryInfo (pDqLayer, pSliceArgument, iMaxSliceNum);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  iStartIdx = 0;
+  for (iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    for (iSliceIdx = 0; iSliceIdx < pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum; iSliceIdx++) {
+      pDqLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pDqLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer + iSliceIdx;
+    }
+
+    iStartIdx += pDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+void InitSliceHeadWithBase (SSlice* pSlice, SSlice* pBaseSlice) {
+  if (NULL == pSlice || NULL == pBaseSlice) {
+    return;
+  }
+
+  SSliceHeaderExt* pBaseSHExt = &pBaseSlice->sSliceHeaderExt;
+  SSliceHeaderExt* pSHExt     = &pSlice->sSliceHeaderExt;
+
+  pSlice->bSliceHeaderExtFlag = pBaseSlice->bSliceHeaderExtFlag;
+  pSHExt->sSliceHeader.iPpsId = pBaseSHExt->sSliceHeader.iPpsId;
+  pSHExt->sSliceHeader.pPps   = pBaseSHExt->sSliceHeader.pPps;
+  pSHExt->sSliceHeader.iSpsId = pBaseSHExt->sSliceHeader.iSpsId;
+  pSHExt->sSliceHeader.pSps   = pBaseSHExt->sSliceHeader.pSps;
+}
+
+void InitSliceRefInfoWithBase (SSlice* pSlice, SSlice* pBaseSlice, const uint8_t kuiRefCount) {
+  if (NULL == pSlice || NULL == pBaseSlice) {
+    return;
+  }
+
+  SSliceHeaderExt* pBaseSHExt  = &pBaseSlice->sSliceHeaderExt;
+  SSliceHeaderExt* pSHExt      = &pSlice->sSliceHeaderExt;
+
+  pSHExt->sSliceHeader.uiRefCount = kuiRefCount;
+  memcpy (&pSHExt->sSliceHeader.sRefMarking, &pBaseSHExt->sSliceHeader.sRefMarking, sizeof (SRefPicMarking));
+  memcpy (&pSHExt->sSliceHeader.sRefReordering, &pBaseSHExt->sSliceHeader.sRefReordering,
+          sizeof (SRefPicListReorderSyntax));
+
+}
+
+static inline int32_t InitSliceRC (SSlice* pSlice, const int32_t kiGlobalQp) {
+
+  if (NULL == pSlice || kiGlobalQp < 0)
+    return ENC_RETURN_INVALIDINPUT;
+
+  pSlice->sSlicingOverRc.iComplexityIndexSlice = 0;
+  pSlice->sSlicingOverRc.iCalculatedQpSlice    = kiGlobalQp;
+  pSlice->sSlicingOverRc.iTotalQpSlice         = 0;
+  pSlice->sSlicingOverRc.iTotalMbSlice         = 0;
+  pSlice->sSlicingOverRc.iTargetBitsSlice      = 0;
+  pSlice->sSlicingOverRc.iFrameBitsSlice       = 0;
+  pSlice->sSlicingOverRc.iGomBitsSlice         = 0;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t ReallocateSliceList (sWelsEncCtx* pCtx,
+                             SSliceArgument* pSliceArgument,
+                             SSlice*& pSliceList,
+                             const int32_t kiMaxSliceNumOld,
+                             const int32_t kiMaxSliceNumNew) {
+  CMemoryAlign* pMA           = pCtx->pMemAlign;
+  SSlice* pBaseSlice          = NULL;
+  SSlice* pNewSliceList       = NULL;
+  SSlice* pSlice              = NULL;
+  int32_t iSliceIdx           = 0;
+  int32_t iRet                = 0;
+  const int32_t kiCurDid      = pCtx->uiDependencyId;
+  int32_t iMaxSliceBufferSize = (pCtx)->iSliceBufferSize[kiCurDid];
+
+  if (NULL == pSliceList || NULL == pSliceArgument) {
+    return ENC_RETURN_INVALIDINPUT;
+  }
+
+  bool bIndependenceBsBuffer  = (pCtx->pSvcParam->iMultipleThreadIdc > 1 &&
+                                 SM_SINGLE_SLICE != pSliceArgument->uiSliceMode) ? true : false;
+
+  pNewSliceList = (SSlice*)pMA->WelsMallocz (sizeof (SSlice) * kiMaxSliceNumNew, "pSliceBuffer");
+  if (NULL == pNewSliceList) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::ReallocateSliceList: pNewSliceList is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  memcpy (pNewSliceList, pSliceList, sizeof (SSlice) * kiMaxSliceNumOld);
+
+  //update Bs writer
+  for (iSliceIdx = 0; iSliceIdx < kiMaxSliceNumOld; iSliceIdx++) {
+    pSlice = pNewSliceList + iSliceIdx;
+    if (NULL == pSlice) {
+      FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "pSliceBuffer");
+      return ENC_RETURN_MEMALLOCERR;
+    }
+
+    if (bIndependenceBsBuffer) {
+      pSlice->pSliceBsa  = &pSlice->sSliceBs.sBsWrite;
+    }
+  }
+
+  pBaseSlice = &pSliceList[0];
+  if (NULL == pBaseSlice) {
+    FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "ReallocateSliceList()::InitSliceBsBuffer()");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+
+  for (iSliceIdx = kiMaxSliceNumOld; iSliceIdx < kiMaxSliceNumNew; iSliceIdx++) {
+    pSlice = pNewSliceList + iSliceIdx;
+    if (NULL == pSlice) {
+      FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "pSliceBuffer");
+      return ENC_RETURN_MEMALLOCERR;
+    }
+
+    pSlice->iSliceIdx = -1;
+    pSlice->uiBufferIdx = 0;
+    pSlice->iCountMbNumInSlice = 0;
+    pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = 0;
+
+    iRet = InitSliceBsBuffer (pSlice,
+                              & pCtx->pOut->sBsWrite,
+                              bIndependenceBsBuffer,
+                              iMaxSliceBufferSize,
+                              pMA);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "pSliceBuffer");
+      return iRet;
+    }
+
+    iRet = AllocateSliceMBBuffer (pSlice, pMA);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "pSliceBuffer");
+      return iRet;
+    }
+
+    InitSliceHeadWithBase (pSlice, pBaseSlice);
+    InitSliceRefInfoWithBase (pSlice, pBaseSlice, pCtx->iNumRef0);
+
+    iRet = InitSliceRC (pSlice, pCtx->iGlobalQp);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      FreeSliceBuffer (pNewSliceList, kiMaxSliceNumNew, pMA, "pSliceBuffer");
+      return iRet;
+    }
+  }
+
+  pMA->WelsFree (pSliceList, "pSliceBuffer");
+  pSliceList = pNewSliceList;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t CalculateNewSliceNum (sWelsEncCtx* pCtx,
+                              SSlice* pLastCodedSlice,
+                              const int32_t iMaxSliceNumOld,
+                              int32_t& iMaxSliceNumNew) {
+  if (NULL == pCtx || NULL == pLastCodedSlice || 0 == iMaxSliceNumOld) {
+    return ENC_RETURN_INVALIDINPUT;
+  }
+
+  if (1 == pCtx->iActiveThreadsNum) {
+    iMaxSliceNumNew = iMaxSliceNumOld * SLICE_NUM_EXPAND_COEF;
+    return ENC_RETURN_SUCCESS;
+  }
+
+  int32_t iPartitionID     = pLastCodedSlice->iSliceIdx % pCtx->iActiveThreadsNum;
+  int32_t iMBNumInPatition = pCtx->pCurDqLayer->EndMbIdxOfPartition[iPartitionID]
+                             - pCtx->pCurDqLayer->FirstMbIdxOfPartition[iPartitionID] + 1;
+  int32_t iLeftMBNum       = pCtx->pCurDqLayer->EndMbIdxOfPartition[iPartitionID]
+                             - pCtx->pCurDqLayer->LastCodedMbIdxOfPartition[iPartitionID] + 1;
+  int32_t iIncreaseSlicNum = (iLeftMBNum * INT_MULTIPLY / iMBNumInPatition) * iMaxSliceNumOld;
+
+  iIncreaseSlicNum  = (0 == (iIncreaseSlicNum / INT_MULTIPLY)) ? 1 : (iIncreaseSlicNum / INT_MULTIPLY);
+  iIncreaseSlicNum  = (iIncreaseSlicNum < iMaxSliceNumOld / 2) ? (iMaxSliceNumOld / 2) : iIncreaseSlicNum;
+  iMaxSliceNumNew   = iMaxSliceNumOld + iIncreaseSlicNum;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t ReallocateSliceInThread (sWelsEncCtx* pCtx,
+                                 SDqLayer* pDqLayer,
+                                 const int32_t kiDlayerIdx,
+                                 const int32_t KiSlcBuffIdx) {
+  int32_t iMaxSliceNum    = pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].iMaxSliceNum;
+  int32_t iCodedSliceNum  = pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].iCodedSliceNum;
+  int32_t iMaxSliceNumNew = 0;
+  int32_t iRet            = 0;
+  SSlice* pLastCodedSlice = &pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].pSliceBuffer [iCodedSliceNum - 1];
+  SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiDlayerIdx].sSliceArgument;
+
+  iRet = CalculateNewSliceNum (pCtx,
+                               pLastCodedSlice,
+                               iMaxSliceNum,
+                               iMaxSliceNumNew);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  iRet = ReallocateSliceList (pCtx,
+                              pSliceArgument,
+                              pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].pSliceBuffer,
+                              iMaxSliceNum,
+                              iMaxSliceNumNew);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  pDqLayer->sSliceBufferInfo[KiSlcBuffIdx].iMaxSliceNum = iMaxSliceNumNew;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t ExtendLayerBuffer (sWelsEncCtx* pCtx,
+                           const int32_t kiMaxSliceNumOld,
+                           const int32_t kiMaxSliceNumNew) {
+  CMemoryAlign* pMA            = pCtx->pMemAlign;
+  SDqLayer* pCurLayer          = pCtx->pCurDqLayer;
+  SSlice** ppSlice             = NULL;
+  int32_t* pFirstMbIdxOfSlice  = NULL;
+  int32_t* pCountMbNumInSlice  = NULL;
+
+  // update for ppsliceInlayer
+  ppSlice = (SSlice**)pMA->WelsMallocz (sizeof (SSlice*) * kiMaxSliceNumNew, "ppSliceInLayer");
+  if (NULL == ppSlice) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::ExtendLayerBuffer: ppSlice is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  pMA->WelsFree (pCurLayer->ppSliceInLayer, "ppSliceInLayer");
+  pCurLayer->ppSliceInLayer = ppSlice;
+
+  // update for pFirstMbIdxInSlice
+  pFirstMbIdxOfSlice = (int32_t*)pMA->WelsMallocz (sizeof (int32_t*) * kiMaxSliceNumNew, "pFirstMbIdxOfSlice");
+  if (NULL == pFirstMbIdxOfSlice) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::ExtendLayerBuffer: pFirstMbIdxOfSlice is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  memset (pFirstMbIdxOfSlice, 0, sizeof (int32_t) * kiMaxSliceNumNew);
+  memcpy (pFirstMbIdxOfSlice, pCurLayer->pFirstMbIdxOfSlice, sizeof (int32_t) * kiMaxSliceNumOld);
+  pMA->WelsFree (pCurLayer->pFirstMbIdxOfSlice, "pFirstMbIdxOfSlice");
+  pCurLayer->pFirstMbIdxOfSlice = pFirstMbIdxOfSlice;
+
+  // update for pCountMbNumInSlice
+  pCountMbNumInSlice = (int32_t*)pMA->WelsMallocz (sizeof (int32_t*) * kiMaxSliceNumNew, "pCountMbNumInSlice");
+  if (NULL == pCountMbNumInSlice) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::ExtendLayerBuffer: pCountMbNumInSlice is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  memset (pCountMbNumInSlice, 0, sizeof (int32_t) * kiMaxSliceNumNew);
+  memcpy (pCountMbNumInSlice, pCurLayer->pCountMbNumInSlice, sizeof (int32_t) * kiMaxSliceNumOld);
+  pMA->WelsFree (pCurLayer->pCountMbNumInSlice, "pCountMbNumInSlice");
+  pCurLayer->pCountMbNumInSlice = pCountMbNumInSlice;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t ReallocSliceBuffer (sWelsEncCtx* pCtx) {
+
+  SDqLayer* pCurLayer      = pCtx->pCurDqLayer;
+  int32_t iMaxSliceNumOld  = pCurLayer->sSliceBufferInfo[0].iMaxSliceNum;
+  int32_t iMaxSliceNumNew  = 0;
+  int32_t iRet             = 0;
+  int32_t iSliceIdx        = 0;
+  int32_t iSlcBuffIdx      = 0;
+  int32_t iStartIdx        = 0;
+  const int32_t kiCurDid   = pCtx->uiDependencyId;
+  SSlice* pLastCodedSlice        = pCurLayer->sSliceBufferInfo[0].pSliceBuffer + (iMaxSliceNumOld - 1);
+  SSliceArgument* pSliceArgument = & pCtx->pSvcParam->sSpatialLayers[kiCurDid].sSliceArgument;
+  iRet = CalculateNewSliceNum (pCtx,
+                               pLastCodedSlice,
+                               iMaxSliceNumOld,
+                               iMaxSliceNumNew);
+
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  iRet = ReallocateSliceList (pCtx,
+                              pSliceArgument,
+                              pCurLayer->sSliceBufferInfo[0].pSliceBuffer,
+                              iMaxSliceNumOld,
+                              iMaxSliceNumNew);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  pCurLayer->sSliceBufferInfo[0].iMaxSliceNum = iMaxSliceNumNew;
+
+  iMaxSliceNumNew = 0;
+  for (iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    iMaxSliceNumNew += pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+  }
+
+  iRet = ExtendLayerBuffer (pCtx, pCurLayer->iMaxSliceNum, iMaxSliceNumNew);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    return iRet;
+  }
+
+  for (iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    for (iSliceIdx = 0; iSliceIdx < pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum; iSliceIdx++) {
+      pCurLayer->ppSliceInLayer[iStartIdx + iSliceIdx] = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer + iSliceIdx;
+    }
+    iStartIdx += pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+  }
+
+  pCurLayer->iMaxSliceNum = iMaxSliceNumNew;
+
+  return ENC_RETURN_SUCCESS;
+}
+
+static inline int32_t CheckAllSliceBuffer (SDqLayer* pCurLayer, const int32_t kiCodedSliceNum) {
+  int32_t iSliceIdx = 0;
+  for (; iSliceIdx < kiCodedSliceNum ; iSliceIdx ++) {
+    if (NULL == pCurLayer->ppSliceInLayer[iSliceIdx]) {
+      return ENC_RETURN_UNEXPECTED;
+    }
+
+    if (iSliceIdx != pCurLayer->ppSliceInLayer[iSliceIdx]->iSliceIdx) {
+      return ENC_RETURN_UNEXPECTED;
+    }
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t ReOrderSliceInLayer (sWelsEncCtx* pCtx,
+                             const SliceModeEnum kuiSliceMode,
+                             const int32_t kiThreadNum) {
+  SDqLayer* pCurLayer       = pCtx->pCurDqLayer;
+  SSlice* pSliceBuffer      = NULL;
+  int32_t iSlcBuffIdx       = 0;
+  int32_t iPartitionIdx     = 0;
+  int32_t iPartitionID      = 0;
+  int32_t iSliceIdx         = 0;
+  int32_t iSliceNumInThread = 0;
+  int32_t iEncodeSliceNum   = 0;
+  int32_t iActualSliceIdx   = 0;
+  int32_t iNonUsedBufferNum = 0;
+  int32_t iUsedSliceNum     = 0;
+
+  int32_t iPartitionNum     = 0;
+  int32_t aiPartitionOffset[MAX_THREADS_NUM] = {0};
+
+  //for non-dynamic slice mode, iPartitionNum = 1, iPartitionOffset = 0
+  iPartitionNum = (SM_SIZELIMITED_SLICE == kuiSliceMode) ? kiThreadNum : 1;
+  for (iPartitionIdx = 0; iPartitionIdx < iPartitionNum; iPartitionIdx++) {
+    aiPartitionOffset[iPartitionIdx] = iEncodeSliceNum;
+    if (SM_SIZELIMITED_SLICE == kuiSliceMode) {
+      iEncodeSliceNum  += pCurLayer->NumSliceCodedOfPartition[iPartitionIdx];
+    } else {
+      iEncodeSliceNum = pCurLayer->sSliceEncCtx.iSliceNumInFrame;
+    }
+  }
+
+  if (iEncodeSliceNum != pCurLayer->sSliceEncCtx.iSliceNumInFrame) {
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  //before encode all slices in layer, slices' index are init with -1
+  //pSliceBuffer->iSliceIdx will be set to actual slice index when encode one slice
+  for (iSlcBuffIdx = 0; iSlcBuffIdx < kiThreadNum; iSlcBuffIdx++) {
+    iSliceNumInThread = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+
+    for (iSliceIdx = 0; iSliceIdx < iSliceNumInThread; iSliceIdx++) {
+      pSliceBuffer = pCurLayer->sSliceBufferInfo[iSlcBuffIdx].pSliceBuffer + iSliceIdx;
+      if (NULL == pSliceBuffer) {
+        return ENC_RETURN_UNEXPECTED;
+      }
+
+      if (-1 != pSliceBuffer->iSliceIdx) {
+        iPartitionID    = pSliceBuffer->iSliceIdx % iPartitionNum;
+        iActualSliceIdx = aiPartitionOffset[iPartitionID] + pSliceBuffer->iSliceIdx / iPartitionNum;
+        pSliceBuffer->iSliceIdx                    = iActualSliceIdx;
+        pCurLayer->ppSliceInLayer[iActualSliceIdx] = pSliceBuffer;
+        iUsedSliceNum ++;
+      } else {
+        pCurLayer->ppSliceInLayer[iEncodeSliceNum + iNonUsedBufferNum] = pSliceBuffer;
+        iNonUsedBufferNum ++;
+      }
+    }
+  }
+
+  if (iUsedSliceNum != iEncodeSliceNum ||
+      pCurLayer->iMaxSliceNum != (iNonUsedBufferNum + iUsedSliceNum)) {
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  if (ENC_RETURN_SUCCESS != CheckAllSliceBuffer (pCurLayer, iEncodeSliceNum)) {
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t GetCurLayerNalCount (const SDqLayer* pCurDq, const int32_t kiCodedSliceNum) {
+  int32_t iTotalNalCount  = 0;
+  int32_t iSliceIdx       = 0;
+  SWelsSliceBs* pSliceBs  = NULL;
+  for (; iSliceIdx < kiCodedSliceNum; iSliceIdx++) {
+    pSliceBs  = &pCurDq->ppSliceInLayer[iSliceIdx]->sSliceBs;
+    if (pSliceBs != NULL && pSliceBs->uiBsPos > 0) {
+      iTotalNalCount += pSliceBs->iNalIndex;
+    }
+  }
+
+  return iTotalNalCount;
+}
+
+int32_t GetTotalCodedNalCount (SFrameBSInfo* pFbi) {
+  int32_t iTotalCodedNalCount = 0;
+  for (int32_t iNalIdx = 0; iNalIdx < MAX_LAYER_NUM_OF_FRAME; iNalIdx++) {
+    iTotalCodedNalCount += pFbi->sLayerInfo[iNalIdx].iNalCount;
+  }
+
+  return iTotalCodedNalCount;
+}
+
+int32_t FrameBsRealloc (sWelsEncCtx* pCtx,
+                        SFrameBSInfo* pFrameBsInfo,
+                        SLayerBSInfo* pLayerBsInfo,
+                        const int32_t kiMaxSliceNumOld) {
+  CMemoryAlign* pMA  = pCtx->pMemAlign;
+  int32_t iCountNals = pCtx->pOut->iCountNals;
+  iCountNals += kiMaxSliceNumOld * (pCtx->pSvcParam->iSpatialLayerNum + pCtx->bNeedPrefixNalFlag);
+
+  SWelsNalRaw* pNalList = (SWelsNalRaw*)pMA->WelsMallocz (iCountNals * sizeof (SWelsNalRaw), "pOut->sNalList");
+  if (NULL == pNalList) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::FrameBsRealloc: pNalList is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  memcpy (pNalList, pCtx->pOut->sNalList, sizeof (SWelsNalRaw) * pCtx->pOut->iCountNals);
+  pMA->WelsFree (pCtx->pOut->sNalList, "pOut->sNalList");
+  pCtx->pOut->sNalList = pNalList;
+
+  int32_t* pNalLen = (int32_t*)pMA->WelsMallocz (iCountNals * sizeof (int32_t), "pOut->pNalLen");
+  if (NULL == pNalLen) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "CWelsH264SVCEncoder::FrameBsRealloc: pNalLen is NULL");
+    return ENC_RETURN_MEMALLOCERR;
+  }
+  memcpy (pNalLen, pCtx->pOut->pNalLen, sizeof (int32_t) * pCtx->pOut->iCountNals);
+  pMA->WelsFree (pCtx->pOut->pNalLen, "pOut->pNalLen");
+  pCtx->pOut->pNalLen = pNalLen;
+
+  pCtx->pOut->iCountNals = iCountNals;
+  SLayerBSInfo* pLBI1, *pLBI2;
+  pLBI1 = &pFrameBsInfo->sLayerInfo[0];
+  pLBI1->pNalLengthInByte = pCtx->pOut->pNalLen;
+  while (pLBI1 != pLayerBsInfo) {
+    pLBI2 = pLBI1;
+    ++ pLBI1;
+    pLBI1->pNalLengthInByte = pLBI2->pNalLengthInByte + pLBI2->iNalCount;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t SliceLayerInfoUpdate (sWelsEncCtx* pCtx,
+                              SFrameBSInfo* pFrameBsInfo,
+                              SLayerBSInfo* pLayerBsInfo,
+                              const SliceModeEnum kuiSliceMode) {
+  int32_t iMaxSliceNum   = 0;
+  int32_t iCodedSliceNum = 0;
+  int32_t iCodedNalCount = 0;
+  int32_t iRet           = 0;
+
+  for (int32_t iSlcBuffIdx = 0; iSlcBuffIdx < pCtx->iActiveThreadsNum; iSlcBuffIdx++) {
+    iMaxSliceNum += pCtx->pCurDqLayer->sSliceBufferInfo[iSlcBuffIdx].iMaxSliceNum;
+  }
+
+  //reallocate ppSliceInLayer if total encoded slice num exceed max slice num
+  if (iMaxSliceNum > pCtx->pCurDqLayer->iMaxSliceNum) {
+    iRet = ExtendLayerBuffer (pCtx, pCtx->pCurDqLayer->iMaxSliceNum, iMaxSliceNum);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      return iRet;
+    }
+    pCtx->pCurDqLayer->iMaxSliceNum = iMaxSliceNum;
+  }
+
+  //update ppSliceInLayer based on pSliceBuffer, reordering based on slice index
+  iRet = ReOrderSliceInLayer (pCtx, kuiSliceMode, pCtx->iActiveThreadsNum);
+  if (ENC_RETURN_SUCCESS != iRet) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::SliceLayerInfoUpdate: ReOrderSliceInLayer failed");
+    return iRet;
+  }
+
+  //Extend NalList buffer if exceed
+  iCodedSliceNum          = GetCurrentSliceNum (pCtx->pCurDqLayer);
+  pLayerBsInfo->iNalCount = GetCurLayerNalCount (pCtx->pCurDqLayer, iCodedSliceNum);
+  iCodedNalCount          = GetTotalCodedNalCount (pFrameBsInfo);
+
+  if (iCodedNalCount > pCtx->pOut->iCountNals) {
+    iRet = FrameBsRealloc (pCtx, pFrameBsInfo, pLayerBsInfo, pCtx->pCurDqLayer->iMaxSliceNum);
+    if (ENC_RETURN_SUCCESS != iRet) {
+      return iRet;
+    }
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t WelsCodeOneSlice (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, const int32_t kiNalType) {
+  SDqLayer* pCurLayer              = pEncCtx->pCurDqLayer;
+  SWelsSvcRc* pWelsSvcRc           = &pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId];
+  SNalUnitHeaderExt* pNalHeadExt   = &pCurLayer->sLayerInfo.sNalHeaderExt;
+  SBitStringAux* pBs               = pCurSlice->pSliceBsa;
+  const int32_t kiDynamicSliceFlag =
+    (pEncCtx->pSvcParam->sSpatialLayers[pEncCtx->uiDependencyId].sSliceArgument.uiSliceMode
+     == SM_SIZELIMITED_SLICE);
+  if (I_SLICE == pEncCtx->eSliceType) {
+    pNalHeadExt->bIdrFlag = 1;
+    pCurSlice->sScaleShift = 0;
+  } else {
+    const uint32_t kuiTemporalId = pNalHeadExt->uiTemporalId;
+    pCurSlice->sScaleShift = kuiTemporalId ? (kuiTemporalId - pEncCtx->pRefPic->uiTemporalId) : 0;
+  }
+
+  WelsSliceHeaderExtInit (pEncCtx, pCurLayer, pCurSlice);
+
+  //RomRC init slice by slice
+  if (pWelsSvcRc->bGomRC) {
+    GomRCInitForOneSlice (pCurSlice, pWelsSvcRc->iBitsPerMb);
+  }
+
+  g_pWelsWriteSliceHeader[pCurSlice->bSliceHeaderExtFlag] (pEncCtx, pBs, pCurLayer, pCurSlice,
+      pEncCtx->pFuncList->pParametersetStrategy);
+
+  pCurSlice->uiLastMbQp = pCurLayer->sLayerInfo.pPpsP->iPicInitQp + pCurSlice->sSliceHeaderExt.sSliceHeader.iSliceQpDelta;
+
+  int32_t iEncReturn = g_pWelsSliceCoding[pNalHeadExt->bIdrFlag][kiDynamicSliceFlag] (pEncCtx, pCurSlice);
+  if (ENC_RETURN_SUCCESS != iEncReturn)
+    return iEncReturn;
+
+  WelsWriteSliceEndSyn (pCurSlice, pEncCtx->pSvcParam->iEntropyCodingModeFlag != 0);
+
+  return ENC_RETURN_SUCCESS;
+}
+
+//pFunc: UpdateMbNeighbourInfoForNextSlice()
+void UpdateMbNeighbourInfoForNextSlice (SDqLayer* pCurDq,
+                                        SMB* pMbList,
+                                        const int32_t kiFirstMbIdxOfNextSlice,
+                                        const int32_t kiLastMbIdxInPartition) {
+  SSliceCtx* pSliceCtx          = &pCurDq->sSliceEncCtx;
+  const int32_t kiMbWidth       = pSliceCtx->iMbWidth;
+  int32_t iIdx                  = kiFirstMbIdxOfNextSlice;
+  int32_t iNextSliceFirstMbIdxRowStart = ((kiFirstMbIdxOfNextSlice % kiMbWidth) ? 1 : 0);
+  int32_t iCountMbUpdate        = kiMbWidth +
+                                  iNextSliceFirstMbIdxRowStart; //need to update MB(iMbXY+1) to MB(iMbXY+1+row) in common case
+  const int32_t kiEndMbNeedUpdate       = kiFirstMbIdxOfNextSlice + iCountMbUpdate;
+  SMB* pMb = &pMbList[iIdx];
+
+  do {
+    UpdateMbNeighbor (pCurDq, pMb, kiMbWidth, WelsMbToSliceIdc (pCurDq, pMb->iMbXY));
+    ++ pMb;
+    ++ iIdx;
+  } while ((iIdx < kiEndMbNeedUpdate) &&
+           (iIdx <= kiLastMbIdxInPartition));
+}
+
+void AddSliceBoundary (sWelsEncCtx* pEncCtx, SSlice* pCurSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+                       int32_t iFirstMbIdxOfNextSlice, const int32_t kiLastMbIdxInPartition) {
+  SDqLayer*     pCurLayer       = pEncCtx->pCurDqLayer;
+  SSlice*       pSliceBuffer    = pCurLayer->sSliceBufferInfo[pCurSlice->uiBufferIdx].pSliceBuffer;
+  int32_t       iCodedSliceNum  = pCurLayer->sSliceBufferInfo[pCurSlice->uiBufferIdx].iCodedSliceNum;
+  int32_t       iCurMbIdx       = pCurMb->iMbXY;
+  uint16_t      iCurSliceIdc    = pSliceCtx->pOverallMbMap[ iCurMbIdx ];
+  const int32_t kiSliceIdxStep  = pEncCtx->iActiveThreadsNum;
+  uint16_t      iNextSliceIdc   = iCurSliceIdc + kiSliceIdxStep;
+  SSlice*       pNextSlice      = NULL;
+
+  SMB* pMbList = pCurLayer->sMbDataP;
+
+  //update cur pSlice info
+  pCurSlice->sSliceHeaderExt.uiNumMbsInSlice = 1 + iCurMbIdx - pCurSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;
+
+  //pNextSlice pointer/initialization
+  if (pEncCtx->iActiveThreadsNum > 1) {
+    pNextSlice = &pSliceBuffer[ iCodedSliceNum + 1 ];
+  } else {
+    pNextSlice = &pSliceBuffer[ iNextSliceIdc ];
+  }
+
+#if _DEBUG
+  assert (NULL != pNextSlice);
+#endif
+
+  //init next pSlice info
+  pNextSlice->bSliceHeaderExtFlag =
+    (NAL_UNIT_CODED_SLICE_EXT == pCurLayer->sLayerInfo.sNalHeaderExt.sNalUnitHeader.eNalUnitType);
+  memcpy (&pNextSlice->sSliceHeaderExt, &pCurSlice->sSliceHeaderExt,
+          sizeof (SSliceHeaderExt)); // confirmed_safe_unsafe_usage
+  pNextSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice = iFirstMbIdxOfNextSlice;
+  WelsSetMemMultiplebytes_c (pSliceCtx->pOverallMbMap + iFirstMbIdxOfNextSlice, iNextSliceIdc,
+                             (kiLastMbIdxInPartition - iFirstMbIdxOfNextSlice + 1), sizeof (uint16_t));
+
+  //DYNAMIC_SLICING_ONE_THREAD: update pMbList slice_neighbor_info
+  UpdateMbNeighbourInfoForNextSlice (pCurLayer, pMbList, iFirstMbIdxOfNextSlice, kiLastMbIdxInPartition);
+}
+
+bool DynSlcJudgeSliceBoundaryStepBack (void* pCtx, void* pSlice, SSliceCtx* pSliceCtx, SMB* pCurMb,
+                                       SDynamicSlicingStack* pDss) {
+  sWelsEncCtx* pEncCtx = (sWelsEncCtx*)pCtx;
+  SSlice* pCurSlice     = (SSlice*)pSlice;
+  int32_t iCurMbIdx     = pCurMb->iMbXY;
+  uint32_t uiLen        = 0;
+  int32_t iPosBitOffset = 0;
+  const int32_t  kiActiveThreadsNum    = pEncCtx->iActiveThreadsNum;
+  const int32_t  kiPartitaionId        = pCurSlice->iSliceIdx % kiActiveThreadsNum;
+  const int32_t  kiEndMbIdxOfPartition = pEncCtx->pCurDqLayer->EndMbIdxOfPartition[kiPartitaionId];
+  const bool kbCurMbNotFirstMbOfCurSlice  = ((iCurMbIdx > 0) && (pSliceCtx->pOverallMbMap[iCurMbIdx] ==
+      pSliceCtx->pOverallMbMap[iCurMbIdx - 1]));
+  const bool    kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiEndMbIdxOfPartition;
+
+  if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag)
+    return false;
+
+  iPosBitOffset = (pDss->iCurrentPos - pDss->iStartPos);
+#if _DEBUG
+  assert (iPosBitOffset >= 0);
+#endif
+  uiLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));
+
+  if ((kbCurMbNotFirstMbOfCurSlice
+       && JUMPPACKETSIZE_JUDGE (uiLen, iCurMbIdx, pSliceCtx->uiSliceSizeConstraint)) /*jump_avoiding_pack_exceed*/
+      && kbCurMbNotLastMbOfCurPartition) { //decide to add new pSlice
+
+    WelsLog (&pEncCtx->sLogCtx, WELS_LOG_DETAIL,
+             "DynSlcJudgeSliceBoundaryStepBack: AddSliceBoundary: iCurMbIdx=%d, uiLen=%d, iSliceIdx=%d", iCurMbIdx, uiLen,
+             pCurSlice->iSliceIdx);
+
+    if (pEncCtx->pSvcParam->iMultipleThreadIdc > 1) {
+      WelsMutexLock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
+      //lock the acessing to this variable: pSliceCtx->iSliceNumInFrame
+    }
+    //tmp choice to avoid complex memory operation, 100520, to be modify
+    //TODO: pSliceCtx->iSliceNumInFrame should match max slice num limitation in given profile based on standard
+    //      current change is tmp solution which equal to origin design,
+    //      as iMaxSliceNum is always equal to iMaxSliceNumConstraint in origin design
+    //      and will also extend when reallocated,
+    //  tmp change is:  iMaxSliceNumConstraint is alway set to be MAXSLICENUM, will not change even reallocate
+    AddSliceBoundary (pEncCtx, pCurSlice, pSliceCtx, pCurMb, iCurMbIdx, kiEndMbIdxOfPartition);
+    ++ pSliceCtx->iSliceNumInFrame;
+
+    if (pEncCtx->pSvcParam->iMultipleThreadIdc > 1) {
+      WelsMutexUnlock (&pEncCtx->pSliceThreading->mutexSliceNumUpdate);
+    }
+
+    return true;
+  }
+
+  return false;
+}
+
+///////////////
+//  pMb loop
+///////////////
+inline void WelsInitInterMDStruc (const SMB* pCurMb, uint16_t* pMvdCostTable, const int32_t kiMvdInterTableStride,
+                                  SWelsMD* pMd) {
+  pMd->iLambda = g_kiQpCostTable[pCurMb->uiLumaQp];
+  pMd->pMvdCost = &pMvdCostTable[pCurMb->uiLumaQp * kiMvdInterTableStride];
+  pMd-> iMbPixX = (pCurMb->iMbX << 4);
+  pMd-> iMbPixY = (pCurMb->iMbY << 4);
+  memset (&pMd->iBlock8x8StaticIdc[0], 0, sizeof (pMd->iBlock8x8StaticIdc));
+}
+// for inter non-dynamic pSlice
+int32_t WelsMdInterMbLoop (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pWelsMd, const int32_t kiSliceFirstMbXY) {
+  SWelsMD* pMd          = (SWelsMD*)pWelsMd;
+  SBitStringAux* pBs    = pSlice->pSliceBsa;
+  SDqLayer* pCurLayer   = pEncCtx->pCurDqLayer;
+  SMbCache* pMbCache    = &pSlice->sMbCacheInfo;
+  SMB* pMbList          = pCurLayer->sMbDataP;
+  SMB* pCurMb           = NULL;
+  int32_t iNumMbCoded   = 0;
+  int32_t iNextMbIdx    = kiSliceFirstMbXY;
+  int32_t iCurMbIdx     = -1;
+  const int32_t kiTotalNumMb = pCurLayer->iMbWidth * pCurLayer->iMbHeight;
+  const int32_t kiMvdInterTableStride = pEncCtx->iMvdCostTableStride;
+  uint16_t* pMvdCostTable = &pEncCtx->pMvdCostTable[pEncCtx->iMvdCostTableSize];
+  const int32_t kiSliceIdx = pSlice->iSliceIdx;
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+  int32_t iEncReturn = ENC_RETURN_SUCCESS;
+  SDynamicSlicingStack sDss;
+  if (pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+    WelsInitSliceCabac (pEncCtx, pSlice);
+    sDss.pRestoreBuffer = NULL;
+    sDss.iStartPos = sDss.iCurrentPos = 0;
+  }
+  pSlice->iMbSkipRun = 0;
+  for (;;) {
+    if (!pEncCtx->pSvcParam->iEntropyCodingModeFlag)
+      pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, pSlice->iMbSkipRun);
+    //point to current pMb
+    iCurMbIdx = iNextMbIdx;
+    pCurMb = &pMbList[ iCurMbIdx ];
+
+
+    //step(1): set QP for the current MB
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInit (pEncCtx, pCurMb, pSlice);
+
+    //step (2). save some vale for future use, initial pWelsMd
+    WelsMdIntraInit (pEncCtx, pCurMb, pMbCache, kiSliceFirstMbXY);
+    WelsMdInterInit (pEncCtx, pSlice, pCurMb, kiSliceFirstMbXY);
+
+TRY_REENCODING:
+    WelsInitInterMDStruc (pCurMb, pMvdCostTable, kiMvdInterTableStride, pMd);
+    pEncCtx->pFuncList->pfInterMd (pEncCtx, pMd, pSlice, pCurMb, pMbCache);
+    //mb_qp
+
+    //step (4): save from the MD process from future use
+    WelsMdInterSaveSadAndRefMbType ((pCurLayer->pDecPic->uiRefMbType), pMbCache, pCurMb, pMd);
+
+    pEncCtx->pFuncList->pfMdBackgroundInfoUpdate (pCurLayer, pCurMb, pMbCache->bCollocatedPredFlag,
+        pEncCtx->pRefPic->iPictureType);
+
+    //step (5): update cache
+    UpdateNonZeroCountCache (pCurMb, pMbCache);
+
+    //step (6): begin to write bit stream; if the pSlice size is controlled, the writing may be skipped
+
+    iEncReturn = pEncCtx->pFuncList->pfWelsSpatialWriteMbSyn (pEncCtx, pSlice, pCurMb);
+    if (!pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+      if (iEncReturn == ENC_RETURN_VLCOVERFLOWFOUND && (pCurMb->uiLumaQp < 50)) {
+        pSlice->iMbSkipRun = pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+        UpdateQpForOverflow (pCurMb, kuiChromaQpIndexOffset);
+        goto TRY_REENCODING;
+      }
+    }
+    if (ENC_RETURN_SUCCESS != iEncReturn)
+      return iEncReturn;
+
+
+    //step (7): reconstruct current MB
+    pCurMb->uiSliceIdc = kiSliceIdx;
+    OutputPMbWithoutConstructCsRsNoCopy (pEncCtx, pCurLayer, pSlice, pCurMb);
+
+#if defined(MB_TYPES_CHECK)
+    WelsCountMbType (pEncCtx->sPerInfo.iMbCount, P_SLICE, pCurMb);
+#endif//MB_TYPES_CHECK
+
+    //step (8): update status and other parameters
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInfoUpdate (pEncCtx, pCurMb, pMd->iCostLuma, pSlice);
+
+    /*judge if all pMb in cur pSlice has been encoded*/
+    ++ iNumMbCoded;
+    iNextMbIdx = WelsGetNextMbOfSlice (pCurLayer, iCurMbIdx);
+    //whether all of MB in current pSlice encoded or not
+    if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbCoded >= kiTotalNumMb) {
+      break;
+    }
+  }
+
+  if (pSlice->iMbSkipRun) {
+    BsWriteUE (pBs, pSlice->iMbSkipRun);
+  }
+
+  return iEncReturn;
+}
+
+// Only for inter dynamic slicing
+int32_t WelsMdInterMbLoopOverDynamicSlice (sWelsEncCtx* pEncCtx, SSlice* pSlice, void* pWelsMd,
+    const int32_t kiSliceFirstMbXY) {
+  SWelsMD* pMd          = (SWelsMD*)pWelsMd;
+  SBitStringAux* pBs    = pSlice->pSliceBsa;
+  SDqLayer* pCurLayer   = pEncCtx->pCurDqLayer;
+  SSliceCtx* pSliceCtx  = &pCurLayer->sSliceEncCtx;
+  SMbCache* pMbCache    = &pSlice->sMbCacheInfo;
+  SMB* pMbList          = pCurLayer->sMbDataP;
+  SMB* pCurMb           = NULL;
+  int32_t iNumMbCoded   = 0;
+  const int32_t kiTotalNumMb = pCurLayer->iMbWidth * pCurLayer->iMbHeight;
+  int32_t iNextMbIdx = kiSliceFirstMbXY;
+  int32_t iCurMbIdx = -1;
+  const int32_t kiMvdInterTableStride = pEncCtx->iMvdCostTableStride;
+  uint16_t* pMvdCostTable = &pEncCtx->pMvdCostTable[pEncCtx->iMvdCostTableSize];
+  const int32_t kiSliceIdx = pSlice->iSliceIdx;
+  const int32_t kiPartitionId = (kiSliceIdx % pEncCtx->iActiveThreadsNum);
+  const uint8_t kuiChromaQpIndexOffset = pCurLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+  int32_t iEncReturn = ENC_RETURN_SUCCESS;
+
+  SDynamicSlicingStack sDss;
+  if (pEncCtx->pSvcParam->iEntropyCodingModeFlag) {
+    WelsInitSliceCabac (pEncCtx, pSlice);
+    sDss.iStartPos = sDss.iCurrentPos = 0;
+    sDss.pRestoreBuffer = pEncCtx->pDynamicBsBuffer[kiPartitionId];
+  } else {
+    sDss.iStartPos = BsGetBitsPos (pBs);
+  }
+  pSlice->iMbSkipRun = 0;
+  for (;;) {
+    //DYNAMIC_SLICING_ONE_THREAD - MultiD
+    //stack pBs pointer
+    pEncCtx->pFuncList->pfStashMBStatus (&sDss, pSlice, pSlice->iMbSkipRun);
+
+    //point to current pMb
+    iCurMbIdx = iNextMbIdx;
+    pCurMb = &pMbList[ iCurMbIdx ];
+
+    //step(1): set QP for the current MB
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInit (pEncCtx, pCurMb, pSlice);
+    // if already reaches the largest number of slices, set QPs to the upper bound
+    if (pSlice->bDynamicSlicingSliceSizeCtrlFlag) {
+      //a clearer logic may be:
+      //if there is no need from size control from the pSlice size, the QP will be decided by RC; else it will be set to the max QP
+      //    however, there are some parameter updating in the rc_mb_init() function, so it cannot be skipped?
+      pCurMb->uiLumaQp = pEncCtx->pWelsSvcRc[pEncCtx->uiDependencyId].iMaxQp;
+      pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];
+    }
+
+    //step (2). save some vale for future use, initial pWelsMd
+    WelsMdIntraInit (pEncCtx, pCurMb, pMbCache, kiSliceFirstMbXY);
+    WelsMdInterInit (pEncCtx, pSlice, pCurMb, kiSliceFirstMbXY);
+
+TRY_REENCODING:
+    WelsInitInterMDStruc (pCurMb, pMvdCostTable, kiMvdInterTableStride, pMd);
+    pEncCtx->pFuncList->pfInterMd (pEncCtx, pMd, pSlice, pCurMb, pMbCache);
+    //mb_qp
+
+    //step (4): save from the MD process from future use
+    WelsMdInterSaveSadAndRefMbType ((pCurLayer->pDecPic->uiRefMbType), pMbCache, pCurMb, pMd);
+
+    pEncCtx->pFuncList->pfMdBackgroundInfoUpdate (pCurLayer, pCurMb, pMbCache->bCollocatedPredFlag,
+        pEncCtx->pRefPic->iPictureType);
+
+    //step (5): update cache
+    UpdateNonZeroCountCache (pCurMb, pMbCache);
+
+    //step (6): begin to write bit stream; if the pSlice size is controlled, the writing may be skipped
+
+
+
+    iEncReturn = pEncCtx->pFuncList->pfWelsSpatialWriteMbSyn (pEncCtx, pSlice, pCurMb);
+    if (iEncReturn == ENC_RETURN_VLCOVERFLOWFOUND  && (pCurMb->uiLumaQp < 50)) {
+      pSlice->iMbSkipRun = pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+      UpdateQpForOverflow (pCurMb, kuiChromaQpIndexOffset);
+      goto TRY_REENCODING;
+    }
+    if (ENC_RETURN_SUCCESS != iEncReturn)
+      return iEncReturn;
+
+
+    //DYNAMIC_SLICING_ONE_THREAD - MultiD
+    sDss.iCurrentPos = pEncCtx->pFuncList->pfGetBsPosition (pSlice);
+    if (DynSlcJudgeSliceBoundaryStepBack (pEncCtx, pSlice, pSliceCtx, pCurMb, &sDss)) {
+      pSlice->iMbSkipRun = pEncCtx->pFuncList->pfStashPopMBStatus (&sDss, pSlice);
+      pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx -
+          1; // update LastCodedMbIdxOfPartition, need to -1 due to stepping back
+      ++ pCurLayer->NumSliceCodedOfPartition[kiPartitionId];
+
+      break;
+    }
+
+    //step (7): reconstruct current MB
+    pCurMb->uiSliceIdc = kiSliceIdx;
+    OutputPMbWithoutConstructCsRsNoCopy (pEncCtx, pCurLayer, pSlice, pCurMb);
+
+#if defined(MB_TYPES_CHECK)
+    WelsCountMbType (pEncCtx->sPerInfo.iMbCount, P_SLICE, pCurMb);
+#endif//MB_TYPES_CHECK
+
+    //step (8): update status and other parameters
+    pEncCtx->pFuncList->pfRc.pfWelsRcMbInfoUpdate (pEncCtx, pCurMb, pMd->iCostLuma, pSlice);
+
+    /*judge if all pMb in cur pSlice has been encoded*/
+    ++ iNumMbCoded;
+    iNextMbIdx = WelsGetNextMbOfSlice (pCurLayer, iCurMbIdx);
+    //whether all of MB in current pSlice encoded or not
+    if (iNextMbIdx == -1 || iNextMbIdx >= kiTotalNumMb || iNumMbCoded >= kiTotalNumMb) {
+      pCurLayer->LastCodedMbIdxOfPartition[kiPartitionId] = iCurMbIdx;
+      ++ pCurLayer->NumSliceCodedOfPartition[kiPartitionId];
+
+      break;
+    }
+  }
+
+  if (pSlice->iMbSkipRun) {
+    BsWriteUE (pBs, pSlice->iMbSkipRun);
+  }
+
+  return iEncReturn;
+}
+
+}//namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_mode_decision.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_mode_decision.cpp
new file mode 100644
index 0000000000..5b4793561c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_mode_decision.cpp
@@ -0,0 +1,686 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_mode_decision.c
+ *
+ * \brief Algorithmetic MD for:
+ * - multi-spatial Enhancement Layer MD;
+ * - Scrolling PSkip Decision for screen content
+ *
+ * \date    2009.7.29
+ *
+
+ **************************************************************************************
+ */
+#include "mv_pred.h"
+#include "ls_defines.h"
+#include "svc_base_layer_md.h"
+#include "svc_mode_decision.h"
+
+namespace WelsEnc {
+
+//////////////
+// MD for enhancement layers
+//////////////
+void WelsMdSpatialelInterMbIlfmdNoilp (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice,
+                                       SMB* pCurMb, const Mb_Type kuiRefMbType) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+
+  const uint32_t kuiNeighborAvail = pCurMb->uiNeighborAvail;
+  const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
+  const  SMB* kpTopMb = pCurMb - kiMbWidth;
+  const bool kbMbLeftAvailPskip = ((kuiNeighborAvail & LEFT_MB_POS) ? IS_SKIP ((pCurMb - 1)->uiMbType) : false);
+  const bool kbMbTopAvailPskip  = ((kuiNeighborAvail & TOP_MB_POS) ? IS_SKIP (kpTopMb->uiMbType) : false);
+  const bool kbMbTopLeftAvailPskip  = ((kuiNeighborAvail & TOPLEFT_MB_POS) ? IS_SKIP ((kpTopMb - 1)->uiMbType) : false);
+  const bool kbMbTopRightAvailPskip = ((kuiNeighborAvail & TOPRIGHT_MB_POS) ? IS_SKIP ((kpTopMb + 1)->uiMbType) : false);
+
+  bool bTrySkip  = kbMbLeftAvailPskip | kbMbTopAvailPskip | kbMbTopLeftAvailPskip | kbMbTopRightAvailPskip;
+  bool bKeepSkip = kbMbLeftAvailPskip & kbMbTopAvailPskip & kbMbTopRightAvailPskip;
+  bool bSkip = false;
+
+  if (pEncCtx->pFuncList->pfInterMdBackgroundDecision (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, &bKeepSkip)) {
+    return;
+  }
+
+  //step 1: try SKIP
+  bSkip = WelsMdInterJudgePskip (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, bTrySkip);
+
+  if (bSkip && bKeepSkip) {
+    WelsMdInterDecidedPskip (pEncCtx,  pSlice,  pCurMb, pMbCache);
+    return;
+  }
+
+  if (! IS_SVC_INTRA (kuiRefMbType)) {
+    if (!bSkip) {
+      PredictSad (pMbCache->sMvComponents.iRefIndexCache, pMbCache->iSadCost, 0, &pWelsMd->iSadPredMb);
+
+      //step 2: P_16x16
+      pWelsMd->iCostLuma = WelsMdP16x16 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice, pCurMb);
+      pCurMb->uiMbType = MB_TYPE_16x16;
+    }
+
+    WelsMdInterSecondaryModesEnc (pEncCtx, pWelsMd, pSlice, pCurMb, pMbCache, bSkip);
+  } else { //BLMODE == SVC_INTRA
+    //initial prediction memory for I_16x16
+    const int32_t kiCostI16x16 = WelsMdI16x16 (pEncCtx->pFuncList, pEncCtx->pCurDqLayer, pMbCache, pWelsMd->iLambda);
+    if (bSkip && (pWelsMd->iCostLuma <= kiCostI16x16)) {
+      WelsMdInterDecidedPskip (pEncCtx,  pSlice,  pCurMb, pMbCache);
+    } else {
+      pWelsMd->iCostLuma = kiCostI16x16;
+      pCurMb->uiMbType = MB_TYPE_INTRA16x16;
+
+      WelsMdIntraSecondaryModesEnc (pEncCtx, pWelsMd, pCurMb, pMbCache);
+    }
+  }
+}
+
+
+
+void WelsMdInterMbEnhancelayer (sWelsEncCtx* pEncCtx, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache) {
+  SDqLayer* pCurLayer                   = pEncCtx->pCurDqLayer;
+  SWelsMD* pWelsMd                      = (SWelsMD*)pMd;
+  const SMB* kpInterLayerRefMb          = GetRefMb (pCurLayer, pCurMb);
+  const Mb_Type kuiInterLayerRefMbType  = kpInterLayerRefMb->uiMbType;
+
+  SetMvBaseEnhancelayer (pWelsMd, pCurMb,
+                         kpInterLayerRefMb); // initial sMvBase here only when pRef mb type is inter, if not sMvBase will be not used!
+  //step (3): do the MD process
+  WelsMdSpatialelInterMbIlfmdNoilp (pEncCtx, pWelsMd, pSlice, pCurMb, kuiInterLayerRefMbType); //MD process
+}
+
+
+// do initiation for noILP (needed by ILFMD)
+SMB* GetRefMb (SDqLayer* pCurLayer, SMB* pCurMb) {
+  const SDqLayer*  kpRefLayer = pCurLayer->pRefLayer;
+  const int32_t  kiRefMbIdx = (pCurMb->iMbY >> 1) * kpRefLayer->iMbWidth + (pCurMb->iMbX >>
+                              1); //because current lower layer is half size on both vertical and horizontal
+  return (&kpRefLayer->sMbDataP[kiRefMbIdx]);
+}
+
+void SetMvBaseEnhancelayer (SWelsMD* pMd, SMB* pCurMb, const SMB* kpRefMb) {
+  const Mb_Type kuiRefMbType = kpRefMb->uiMbType;
+
+  if (! IS_SVC_INTRA (kuiRefMbType)) {
+    SMVUnitXY sMv;
+    int32_t iRefMbPartIdx = ((pCurMb->iMbY & 0x01) << 1) + (pCurMb->iMbX & 0x01); //may be need modified
+    int32_t iScan4RefPartIdx = g_kuiMbCountScan4Idx[ (iRefMbPartIdx << 2)];
+    sMv.iMvX = kpRefMb->sMv[iScan4RefPartIdx].iMvX * (1 << 1);
+    sMv.iMvY = kpRefMb->sMv[iScan4RefPartIdx].iMvY * (1 << 1);
+
+    pMd->sMe.sMe16x16.sMvBase = sMv;
+
+    pMd->sMe.sMe8x8[0].sMvBase =
+      pMd->sMe.sMe8x8[1].sMvBase =
+        pMd->sMe.sMe8x8[2].sMvBase =
+          pMd->sMe.sMe8x8[3].sMvBase = sMv;
+
+    pMd->sMe.sMe16x8[0].sMvBase =
+      pMd->sMe.sMe16x8[1].sMvBase =
+        pMd->sMe.sMe8x16[0].sMvBase =
+          pMd->sMe.sMe8x16[1].sMvBase = sMv;
+  }
+}
+
+
+
+//////////////
+// MD for Background decision
+//////////////
+//////
+//  try the BGD Pskip
+//////
+inline int32_t GetChromaCost (PSampleSadSatdCostFunc* pCalculateFunc,
+                              uint8_t* pSrcChroma, int32_t iSrcStride, uint8_t* pRefChroma, int32_t iRefStride) {
+  return pCalculateFunc[BLOCK_8x8] (pSrcChroma, iSrcStride, pRefChroma, iRefStride);
+}
+inline bool IsCostLessEqualSkipCost (int32_t iCurCost, const int32_t iPredPskipSad, const int32_t iRefMbType,
+                                     const SPicture* pRef, const int32_t iMbXy,  const int32_t iSmallestInvisibleTh) {
+  return ((iPredPskipSad > iSmallestInvisibleTh && iCurCost >= iPredPskipSad)  ||
+          (pRef->iPictureType == P_SLICE     &&
+           iRefMbType == MB_TYPE_SKIP    &&
+           pRef->pMbSkipSad[iMbXy] > iSmallestInvisibleTh &&
+           iCurCost >= (pRef->pMbSkipSad[iMbXy])));
+}
+bool CheckChromaCost (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMbCache* pMbCache, const int32_t iCurMbXy) {
+#define KNOWN_CHROMA_TOO_LARGE 640
+#define SMALLEST_INVISIBLE 128 //2*64, 2 in pixel maybe the smallest not visible for luma
+
+  PSampleSadSatdCostFunc* pSad = pEncCtx->pFuncList->sSampleDealingFuncs.pfSampleSad;
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+
+  uint8_t* pCbEnc = pMbCache->SPicData.pEncMb[1];
+  uint8_t* pCrEnc = pMbCache->SPicData.pEncMb[2];
+  uint8_t* pCbRef = pMbCache->SPicData.pRefMb[1];
+  uint8_t* pCrRef = pMbCache->SPicData.pRefMb[2];
+
+  const int32_t iCbEncStride         = pCurDqLayer->iEncStride[1];
+  const int32_t iCrEncStride         = pCurDqLayer->iEncStride[2];
+  const int32_t iChromaRefStride     = pCurDqLayer->pRefPic->iLineSize[1];
+
+  const int32_t iCbSad = GetChromaCost (pSad, pCbEnc, iCbEncStride, pCbRef, iChromaRefStride);
+  const int32_t iCrSad = GetChromaCost (pSad, pCrEnc, iCrEncStride, pCrRef, iChromaRefStride);
+
+  //01/17/13
+  //the in-question error area is
+  //from: (yellow) Y=212, V=023, U=145
+  //to:     (grey)    Y=213, V=136, U=124
+  //visible difference can be seen on the U plane
+  //so the allowing chroma difference should be at least no larger than
+  //20*8*8 = 1280 for U or V
+  //one local test case show that "either one >640" will become a too strict criteria, which will appear when QP is large(36) and maybe no much harm for visual
+  //another local test case show that "either one >960" will be a moderate criteria, an area is changed from light green to light pink, but without careful observation it won't be obvious, but people will feel the unclean area (and note that, the color visible criteria is also related to the luma of them!)
+  //another case show that color changed from black to very dark red can be visible even under the threshold 960, the color difference is about 13*64=832 (U123V145->U129V132)
+  //TODO:
+  //OPTI-ABLE: the visible color criteria may be related to luma (very bright or very dark), or related to the ratio of U/V rather than the absolute value
+  const bool bChromaTooLarge = (iCbSad > KNOWN_CHROMA_TOO_LARGE || iCrSad > KNOWN_CHROMA_TOO_LARGE);
+
+  const int32_t iChromaSad = iCbSad + iCrSad;
+  PredictSadSkip (pMbCache->sMvComponents.iRefIndexCache, pMbCache->bMbTypeSkip, pMbCache->iSadCostSkip, 0,
+                  & (pWelsMd->iSadPredSkip));
+  const bool bChromaCostCannotSkip = IsCostLessEqualSkipCost (iChromaSad, pWelsMd->iSadPredSkip, pMbCache->uiRefMbType,
+                                     pCurDqLayer->pRefPic, iCurMbXy, SMALLEST_INVISIBLE);
+
+  return (!bChromaCostCannotSkip && !bChromaTooLarge);
+}
+
+//01/17/2013. USE the NEW BGD Pskip with COLOR CHECK for screen content and camera because of color artifact seen in test
+bool WelsMdInterJudgeBGDPskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                               bool* bKeepSkip) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+
+  const int32_t kiRefMbQp = pCurDqLayer->pRefPic->pRefMbQp[pCurMb->iMbXY];
+  const int32_t kiCurMbQp = pCurMb->uiLumaQp;// unsigned -> signed
+  int8_t* pVaaBgMbFlag    = pEncCtx->pVaa->pVaaBackgroundMbFlag + pCurMb->iMbXY;
+
+  const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
+
+  *bKeepSkip = (*bKeepSkip) &&
+               ((!pVaaBgMbFlag[-1]) &&
+                (!pVaaBgMbFlag[-kiMbWidth]) &&
+                (!pVaaBgMbFlag[-kiMbWidth + 1]));
+
+  if (
+    *pVaaBgMbFlag
+    && !IS_INTRA (pMbCache->uiRefMbType)
+    && (kiRefMbQp - kiCurMbQp <= DELTA_QP_BGD_THD || kiRefMbQp <= 26)
+  ) {
+    //01/16/13
+    //the current BGD method uses luma SAD in first step judging of Background blocks
+    //and uses chroma edges to confirm the Background blocks
+    //HOWEVER, there is such case in SCC,
+    //that the luma of two collocated blocks (block in reference frame and in current frame) is very similar
+    //but the chroma are very different, at the same time the chroma are plain and without edge
+    //IN SUCH A CASE,
+    //it will be not proper to just use Pskip
+    //TODO: consider reusing this result of ChromaCheck when SCDSkip needs this as well
+
+    if (CheckChromaCost (pEncCtx, pWelsMd, pMbCache, pCurMb->iMbXY)) {
+      SMVUnitXY sVaaPredSkipMv = { 0 };
+      PredSkipMv (pMbCache, &sVaaPredSkipMv);
+      WelsMdBackgroundMbEnc (pEncCtx, pWelsMd, pCurMb, pMbCache, pSlice, (LD32 (&sVaaPredSkipMv) == 0));
+      return true;
+    }
+  }
+
+  return false;
+}
+
+bool WelsMdInterJudgeBGDPskipFalse (sWelsEncCtx* pCtx, SWelsMD* pMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                                    bool* bKeepSkip) {
+  return false;
+}
+
+
+
+//////
+//  update BGD related info
+//////
+void WelsMdUpdateBGDInfo (SDqLayer* pCurLayer,  SMB* pCurMb, const bool bCollocatedPredFlag,
+                          const int32_t iRefPictureType) {
+  uint8_t* pTargetRefMbQpList = (pCurLayer->pDecPic->pRefMbQp);
+  const int32_t kiMbXY = pCurMb->iMbXY;
+
+  if (pCurMb->uiCbp || I_SLICE == iRefPictureType || 0 == bCollocatedPredFlag) {
+    pTargetRefMbQpList[kiMbXY] = pCurMb->uiLumaQp;
+  } else { //unchange, do not need to evaluation?
+    uint8_t* pRefPicRefMbQpList = (pCurLayer->pRefPic->pRefMbQp);
+    pTargetRefMbQpList[kiMbXY] = pRefPicRefMbQpList[kiMbXY];
+  }
+
+  if (pCurMb->uiMbType == MB_TYPE_BACKGROUND) {
+    pCurMb->uiMbType = MB_TYPE_SKIP;
+  }
+}
+
+void WelsMdUpdateBGDInfoNULL (SDqLayer* pCurLayer, SMB* pCurMb, const bool bCollocatedPredFlag,
+                              const int32_t iRefPictureType) {
+  WelsMdUpdateBGDInfo (pCurLayer, pCurMb, bCollocatedPredFlag, iRefPictureType);
+}
+
+
+//////////////
+// MD for screen contents
+//////////////
+inline bool IsMbStatic (int32_t* pBlockType, EStaticBlockIdc eType) {
+  return (pBlockType != NULL &&
+          eType == pBlockType[0] &&
+          eType == pBlockType[1] &&
+          eType == pBlockType[2] &&
+          eType == pBlockType[3]);
+}
+inline bool IsMbCollocatedStatic (int32_t* pBlockType) {
+  return IsMbStatic (pBlockType, COLLOCATED_STATIC);
+}
+
+inline bool IsMbScrolledStatic (int32_t* pBlockType) {
+  return IsMbStatic (pBlockType, SCROLLED_STATIC);
+}
+
+inline int32_t CalUVSadCost (SWelsFuncPtrList* pFunc, uint8_t* pEncOri, int32_t iStrideUV, uint8_t* pRefOri,
+                             int32_t iRefLineSize) {
+  return pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_8x8] (pEncOri, iStrideUV, pRefOri, iRefLineSize);
+}
+
+inline bool CheckBorder (int32_t iMbX, int32_t iMbY, int32_t iScrollMvX, int32_t iScrollMvY, int32_t iMbWidth,
+                         int32_t iMbHeight) {
+  return ((iMbX << 4) + iScrollMvX < 0 ||
+          (iMbX << 4) + iScrollMvX > (iMbWidth - 1) << 4 ||
+          (iMbY << 4) + iScrollMvY < 0 ||
+          (iMbY << 4) + iScrollMvY > (iMbHeight - 1) << 4
+         ); //border check for safety
+}
+
+
+bool JudgeStaticSkip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, SWelsMD* pWelsMd) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  const int32_t kiMbX = pCurMb->iMbX;
+  const int32_t kiMbY = pCurMb->iMbY;
+
+  bool bTryStaticSkip = IsMbCollocatedStatic (pWelsMd->iBlock8x8StaticIdc);
+  if (bTryStaticSkip) {
+    int32_t iStrideUV, iOffsetUV;
+    SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+    SPicture* pRefOri = pCurDqLayer->pRefOri[0];
+    if (pRefOri != NULL) {
+      iStrideUV = pCurDqLayer->iEncStride[1];
+      iOffsetUV = (kiMbX + kiMbY * iStrideUV) << 3;
+
+      int32_t iSadCostCb = CalUVSadCost (pFunc, pMbCache->SPicData.pEncMb[1], iStrideUV, pRefOri->pData[1] + iOffsetUV,
+                                         pRefOri->iLineSize[1]);
+      if (iSadCostCb == 0) {
+        int32_t iSadCostCr = CalUVSadCost (pFunc, pMbCache->SPicData.pEncMb[2], iStrideUV, pRefOri->pData[2] + iOffsetUV,
+                                           pRefOri->iLineSize[1]);
+        bTryStaticSkip = (0 == iSadCostCr);
+      } else bTryStaticSkip = false;
+    } else {
+      bTryStaticSkip = false;
+    }
+  }
+  return bTryStaticSkip;
+}
+
+bool JudgeScrollSkip (sWelsEncCtx* pEncCtx, SMB* pCurMb, SMbCache* pMbCache, SWelsMD* pWelsMd) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  const int32_t kiMbX = pCurMb->iMbX;
+  const int32_t kiMbY = pCurMb->iMbY;
+  const int32_t kiMbWidth = pCurDqLayer->iMbWidth;
+  const int32_t kiMbHeight = pCurDqLayer->iMbHeight;
+  // const int32_t block_width = mb_width << 1;
+  SVAAFrameInfoExt_t* pVaaExt = static_cast<SVAAFrameInfoExt_t*> (pEncCtx->pVaa);
+
+  bool bTryScrollSkip = false;
+
+  if (pVaaExt->sScrollDetectInfo.bScrollDetectFlag)
+    bTryScrollSkip = IsMbScrolledStatic (pWelsMd->iBlock8x8StaticIdc);
+  else return 0;
+
+  if (bTryScrollSkip) {
+    int32_t iStrideUV, iOffsetUV;
+    SWelsFuncPtrList* pFunc = pEncCtx->pFuncList;
+    SPicture* pRefOri = pCurDqLayer->pRefOri[0];
+    if (pRefOri != NULL) {
+      int32_t iScrollMvX = pVaaExt->sScrollDetectInfo.iScrollMvX;
+      int32_t iScrollMvY = pVaaExt->sScrollDetectInfo.iScrollMvY;
+      if (CheckBorder (kiMbX, kiMbY, iScrollMvX, iScrollMvY, kiMbWidth, kiMbHeight)) {
+        bTryScrollSkip =  false;
+      } else {
+        iStrideUV = pCurDqLayer->iEncStride[1];
+        iOffsetUV = (kiMbX << 3) + (iScrollMvX >> 1) + ((kiMbY << 3) + (iScrollMvY >> 1)) * iStrideUV;
+
+        int32_t iSadCostCb = CalUVSadCost (pFunc, pMbCache->SPicData.pEncMb[1], iStrideUV, pRefOri->pData[1] + iOffsetUV,
+                                           pRefOri->iLineSize[1]);
+        if (iSadCostCb == 0) {
+          int32_t iSadCostCr = CalUVSadCost (pFunc, pMbCache->SPicData.pEncMb[2], iStrideUV, pRefOri->pData[2] + iOffsetUV,
+                                             pRefOri->iLineSize[1]);
+          bTryScrollSkip = (0 == iSadCostCr);
+        } else bTryScrollSkip = false;
+      }
+    }
+  }
+  return bTryScrollSkip;
+}
+
+void SvcMdSCDMbEnc (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SMB* pCurMb, SMbCache* pMbCache, SSlice* pSlice,
+                    bool bQpSimilarFlag,
+                    bool bMbSkipFlag, SMVUnitXY sCurMbMv[], ESkipModes eSkipMode) {
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+  SWelsFuncPtrList* pFunc       = pEncCtx->pFuncList;
+  SMVUnitXY sMvp = { 0};
+  ST16 (&sMvp.iMvX, sCurMbMv[eSkipMode].iMvX);
+  ST16 (&sMvp.iMvY, sCurMbMv[eSkipMode].iMvY);
+  uint8_t* pRefLuma             = pMbCache->SPicData.pRefMb[0];
+  uint8_t* pRefCb               = pMbCache->SPicData.pRefMb[1];
+  uint8_t* pRefCr               = pMbCache->SPicData.pRefMb[2];
+  int32_t iLineSizeY            = pCurDqLayer->pRefPic->iLineSize[0];
+  int32_t iLineSizeUV           = pCurDqLayer->pRefPic->iLineSize[1];
+  uint8_t* pDstLuma             = pMbCache->pSkipMb;
+  uint8_t* pDstCb               = pMbCache->pSkipMb + 256;
+  uint8_t* pDstCr               = pMbCache->pSkipMb + 256 + 64;
+
+  const int32_t iOffsetY  = (sCurMbMv[eSkipMode].iMvX >> 2) + (sCurMbMv[eSkipMode].iMvY >> 2) * iLineSizeY;
+  const int32_t iOffsetUV = (sCurMbMv[eSkipMode].iMvX >> 3) + (sCurMbMv[eSkipMode].iMvY >> 3) * iLineSizeUV;
+
+  if (!bQpSimilarFlag || !bMbSkipFlag) {
+    pDstLuma = pMbCache->pMemPredLuma;
+    pDstCb   = pMbCache->pMemPredChroma;
+    pDstCr   = pMbCache->pMemPredChroma + 64;
+  }
+  //MC
+  pFunc->sMcFuncs.pMcLumaFunc (pRefLuma + iOffsetY, iLineSizeY, pDstLuma, 16, 0, 0, 16, 16);
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCb + iOffsetUV, iLineSizeUV, pDstCb, 8, sMvp.iMvX, sMvp.iMvY, 8, 8);
+  pFunc->sMcFuncs.pMcChromaFunc (pRefCr + iOffsetUV, iLineSizeUV, pDstCr, 8, sMvp.iMvX, sMvp.iMvY, 8, 8);
+
+  pCurMb->uiCbp = 0;
+  pWelsMd->iCostLuma = 0;
+  pCurMb->pSadCost[0] = pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                        pCurDqLayer->iEncStride[0], pRefLuma + iOffsetY, iLineSizeY);
+
+  pWelsMd->iCostSkipMb = pCurMb->pSadCost[0];
+
+  ST16 (& (pCurMb->sP16x16Mv.iMvX), sCurMbMv[eSkipMode].iMvX);
+  ST16 (& (pCurMb->sP16x16Mv.iMvY), sCurMbMv[eSkipMode].iMvY);
+
+  ST16 (& (pCurDqLayer->pDecPic->sMvList[pCurMb->iMbXY].iMvX), sCurMbMv[eSkipMode].iMvX);
+  ST16 (& (pCurDqLayer->pDecPic->sMvList[pCurMb->iMbXY].iMvY), sCurMbMv[eSkipMode].iMvY);
+
+  if (bQpSimilarFlag && bMbSkipFlag) {
+    //update motion info to current MB
+    ST32 (pCurMb->pRefIndex, 0);
+    pFunc->pfUpdateMbMv (pCurMb->sMv, sMvp);
+    pCurMb->uiMbType = MB_TYPE_SKIP;
+    WelsRecPskip (pCurDqLayer, pEncCtx->pFuncList, pCurMb, pMbCache);
+    WelsMdInterUpdatePskip (pCurDqLayer, pSlice, pCurMb, pMbCache);
+    return;
+  }
+
+  pCurMb->uiMbType = MB_TYPE_16x16;
+
+  pWelsMd->sMe.sMe16x16.sMv.iMvX = sCurMbMv[eSkipMode].iMvX;
+  pWelsMd->sMe.sMe16x16.sMv.iMvY = sCurMbMv[eSkipMode].iMvY;
+  PredMv (&pMbCache->sMvComponents, 0, 4, 0, &pWelsMd->sMe.sMe16x16.sMvp);
+  pMbCache->sMbMvp[0] = pWelsMd->sMe.sMe16x16.sMvp;
+
+  UpdateP16x16MotionInfo (pMbCache, pCurMb, 0, &pWelsMd->sMe.sMe16x16.sMv);
+
+  if (pWelsMd->bMdUsingSad)
+    pWelsMd->iCostLuma = pCurMb->pSadCost[0];
+  else
+    pWelsMd->iCostLuma = pFunc->sSampleDealingFuncs.pfSampleSad[BLOCK_16x16] (pMbCache->SPicData.pEncMb[0],
+                         pCurDqLayer->iEncStride[0], pRefLuma, iLineSizeY);
+
+  WelsInterMbEncode (pEncCtx, pSlice, pCurMb);
+  WelsPMbChromaEncode (pEncCtx, pSlice, pCurMb);
+
+  pFunc->pfCopy16x16Aligned (pMbCache->SPicData.pCsMb[0], pCurDqLayer->iCsStride[0], pMbCache->pMemPredLuma, 16);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[1], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma, 8);
+  pFunc->pfCopy8x8Aligned (pMbCache->SPicData.pCsMb[2], pCurDqLayer->iCsStride[1], pMbCache->pMemPredChroma + 64, 8);
+}
+
+bool MdInterSCDPskipProcess (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb, SMbCache* pMbCache,
+                             ESkipModes eSkipMode) {
+  SVAAFrameInfoExt_t* pVaaExt   = static_cast<SVAAFrameInfoExt_t*> (pEncCtx->pVaa);
+  SDqLayer* pCurDqLayer         = pEncCtx->pCurDqLayer;
+
+  const int32_t kiRefMbQp = pCurDqLayer->pRefPic->pRefMbQp[pCurMb->iMbXY];
+  const int32_t kiCurMbQp = pCurMb->uiLumaQp;// unsigned -> signed
+
+  pJudgeSkipFun pJudeSkip[2] = {JudgeStaticSkip, JudgeScrollSkip};
+  bool bSkipFlag = pJudeSkip[eSkipMode] (pEncCtx, pCurMb, pMbCache, pWelsMd);
+
+  if (bSkipFlag) {
+    bool bQpSimilarFlag = (kiRefMbQp - kiCurMbQp <= DELTA_QP_SCD_THD || kiRefMbQp <= 26);
+    SMVUnitXY sVaaPredSkipMv = {0, 0}, sCurMbMv[2] = {{0, 0}, {0, 0}};
+    PredSkipMv (pMbCache, &sVaaPredSkipMv);
+
+    if (eSkipMode == SCROLLED) {
+      sCurMbMv[1].iMvX = static_cast<int16_t> (pVaaExt->sScrollDetectInfo.iScrollMvX << 2);
+      sCurMbMv[1].iMvY = static_cast<int16_t> (pVaaExt->sScrollDetectInfo.iScrollMvY << 2);
+    }
+
+    bool bMbSkipFlag = (LD32 (&sVaaPredSkipMv) ==  LD32 (&sCurMbMv[eSkipMode])) ;
+    SvcMdSCDMbEnc (pEncCtx, pWelsMd, pCurMb, pMbCache, pSlice, bQpSimilarFlag, bMbSkipFlag, sCurMbMv, eSkipMode);
+
+    return true;
+  }
+
+  return false;
+}
+
+void SetBlockStaticIdcToMd (void* pVaa, SWelsMD* pWelsMd, SMB* pCurMb, SDqLayer* pDqLayer) {
+  SVAAFrameInfoExt_t* pVaaExt = static_cast<SVAAFrameInfoExt_t*> (pVaa);
+
+  const int32_t kiMbX = pCurMb->iMbX;
+  const int32_t kiMbY = pCurMb->iMbY;
+  const int32_t kiMbWidth = pDqLayer->iMbWidth;
+  const int32_t kiWidth = kiMbWidth << 1;
+
+  const int32_t kiBlockIndexUp = (kiMbY << 1) * kiWidth + (kiMbX << 1);
+  const int32_t kiBlockIndexLow = ((kiMbY << 1) + 1) * kiWidth + (kiMbX << 1);
+
+  //fill_blockstaticidc with pVaaExt->pVaaBestBlockStaticIdc
+  pWelsMd->iBlock8x8StaticIdc[0] = pVaaExt->pVaaBestBlockStaticIdc[kiBlockIndexUp];
+  pWelsMd->iBlock8x8StaticIdc[1] = pVaaExt->pVaaBestBlockStaticIdc[kiBlockIndexUp + 1];
+  pWelsMd->iBlock8x8StaticIdc[2] = pVaaExt->pVaaBestBlockStaticIdc[kiBlockIndexLow];
+  pWelsMd->iBlock8x8StaticIdc[3] = pVaaExt->pVaaBestBlockStaticIdc[kiBlockIndexLow + 1];
+
+}
+
+///////////////////////
+// Scene Change Detection (SCD) PSkip Decision for screen content
+////////////////////////
+bool WelsMdInterJudgeSCDPskip (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb, SMbCache* pMbCache) {
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+
+  SetBlockStaticIdcToMd (pEncCtx->pVaa, pWelsMd, pCurMb, pCurDqLayer);
+
+  //try static Pskip;
+  if (MdInterSCDPskipProcess (pEncCtx, pWelsMd, slice, pCurMb, pMbCache, STATIC)) {
+    return true;
+  }
+
+  //try scrolled Pskip
+  if (MdInterSCDPskipProcess (pEncCtx, pWelsMd, slice, pCurMb, pMbCache, SCROLLED)) {
+    return true;
+  }
+
+  return false;
+}
+bool WelsMdInterJudgeSCDPskipFalse (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* slice, SMB* pCurMb,
+                                    SMbCache* pMbCache) {
+  return false;
+}
+
+
+void WelsInitSCDPskipFunc (SWelsFuncPtrList* pFuncList, const bool bScrollingDetection) {
+  if (bScrollingDetection) {
+    pFuncList->pfSCDPSkipDecision = WelsMdInterJudgeSCDPskip;
+  } else {
+    pFuncList->pfSCDPSkipDecision = WelsMdInterJudgeSCDPskipFalse;
+  }
+}
+
+///////////////////////
+// SubP16x16 Mode Decision for screen content
+////////////////////////
+//
+//func pointer of inter MD for sub16x16 INTER MD for screen content coding
+//
+static inline void MergeSub16Me (const SWelsME& sSrcMe0, const SWelsME& sSrcMe1, SWelsME* pTarMe) {
+  memcpy (pTarMe, &sSrcMe0, sizeof (sSrcMe0)); // confirmed_safe_unsafe_usage
+
+  pTarMe->uiSadCost = sSrcMe0.uiSadCost + sSrcMe1.uiSadCost;//not precise cost since MVD cost is not the same
+  pTarMe->uiSatdCost = sSrcMe0.uiSatdCost + sSrcMe1.uiSatdCost;//not precise cost since MVD cost is not the same
+}
+static inline bool IsSameMv (const SMVUnitXY& sMv0, const SMVUnitXY& sMv1) {
+  return ((sMv0.iMvX == sMv1.iMvX) && (sMv0.iMvY == sMv1.iMvY));
+}
+bool TryModeMerge (SMbCache* pMbCache, SWelsMD* pWelsMd, SMB* pCurMb) {
+  SWelsME* pMe8x8 = & (pWelsMd->sMe.sMe8x8[0]);
+  const bool bSameMv16x8_0 = IsSameMv (pMe8x8[0].sMv, pMe8x8[1].sMv);
+  const bool bSameMv16x8_1 = IsSameMv (pMe8x8[2].sMv, pMe8x8[3].sMv);
+
+  const bool bSameMv8x16_0 = IsSameMv (pMe8x8[0].sMv, pMe8x8[2].sMv);
+  const bool bSameMv8x16_1 = IsSameMv (pMe8x8[1].sMv, pMe8x8[3].sMv);
+  //need to consider iRefIdx when multi ref is available
+  const bool bSameRefIdx16x8_0 = true; //pMe8x8[0].iRefIdx == pMe8x8[1].iRefIdx;
+  const bool bSameRefIdx16x8_1 = true; //pMe8x8[2].iRefIdx == pMe8x8[3].iRefIdx;
+  const bool bSameRefIdx8x16_0 = true; //pMe8x8[0].iRefIdx == pMe8x8[2].iRefIdx;
+  const bool bSameRefIdx8x16_1 = true; //pMe8x8[1].iRefIdx == pMe8x8[3].iRefIdx;
+  const int32_t iSameMv = ((bSameMv16x8_0 && bSameRefIdx16x8_0  && bSameMv16x8_1 && bSameRefIdx16x8_1) << 1) |
+                          (bSameMv8x16_0 && bSameRefIdx8x16_0 && bSameMv8x16_1 && bSameRefIdx8x16_1);
+
+  //TODO: did not consider the MVD cost here, may consider later
+  switch (iSameMv) {
+  case 3:
+    //MERGE_16x16
+    //from test results of multiple sequences show that using the following 0x0F to merge 16x16
+    //for some seq there is BR saving some loss
+    //on the whole the BR will increase little bit
+    //to save complexity we decided not to merge 16x16 at present (10/12/2012)
+    //TODO: agjusted order, consider re-test later
+    break;
+  case 2:
+    pCurMb->uiMbType = MB_TYPE_16x8;
+    MergeSub16Me (pMe8x8[0], pMe8x8[1], & (pWelsMd->sMe.sMe16x8[0]));
+    MergeSub16Me (pMe8x8[2], pMe8x8[3], & (pWelsMd->sMe.sMe16x8[1]));
+    PredInter16x8Mv (pMbCache, 0, 0, & (pWelsMd->sMe.sMe16x8[0].sMvp));
+    PredInter16x8Mv (pMbCache, 8, 0, & (pWelsMd->sMe.sMe16x8[1].sMvp));
+    break;
+  case 1:
+    pCurMb->uiMbType = MB_TYPE_8x16;
+    MergeSub16Me (pMe8x8[0], pMe8x8[2], & (pWelsMd->sMe.sMe8x16[0]));
+    MergeSub16Me (pMe8x8[1], pMe8x8[3], & (pWelsMd->sMe.sMe8x16[1]));
+    PredInter8x16Mv (pMbCache, 0, 0, & (pWelsMd->sMe.sMe8x16[0].sMvp));
+    PredInter8x16Mv (pMbCache, 4, 0, & (pWelsMd->sMe.sMe8x16[1].sMvp));
+    break;
+  default:
+    break;
+  }
+  return (MB_TYPE_8x8 != pCurMb->uiMbType);
+}
+
+
+void WelsMdInterFinePartitionVaaOnScreen (sWelsEncCtx* pEncCtx, SWelsMD* pWelsMd, SSlice* pSlice, SMB* pCurMb,
+    int32_t iBestCost) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  SDqLayer* pCurDqLayer = pEncCtx->pCurDqLayer;
+  int32_t iCostP8x8;
+  uint8_t uiMbSign = pEncCtx->pFuncList->pfGetMbSignFromInterVaa (&pEncCtx->pVaa->sVaaCalcInfo.pSad8x8[pCurMb->iMbXY][0]);
+
+  if (MBVAASIGN_FLAT == uiMbSign) {
+    return;
+  }
+
+  iCostP8x8 = WelsMdP8x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice);
+  if (iCostP8x8 < iBestCost) {
+    iBestCost = iCostP8x8;
+    pCurMb->uiMbType = MB_TYPE_8x8;
+    memset (pCurMb->uiSubMbType, SUB_MB_TYPE_8x8, 4);
+#if 0 //Disable for sub8x8 modes for now
+    iBestCost = 0;
+    //reset neighbor info for sub8x8
+    pMbCache->sMvComponents.iRefIndexCache [9] = pMbCache->sMvComponents.iRefIndexCache [21] = REF_NOT_AVAIL;
+    for (int32_t i8x8Idx = 0; i8x8Idx < 4; ++i8x8Idx) {
+      int32_t iCurCostSub8x8, iBestCostSub8x8 = pWelsMd->sMe.sMe8x8[i8x8Idx].uiSatdCost;
+      //4x4
+      iCurCostSub8x8 = WelsMdP4x4 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice, i8x8Idx);
+      if (iCurCostSub8x8 < iBestCostSub8x8) {
+        pCurMb->uiSubMbType[i8x8Idx] = SUB_MB_TYPE_4x4;
+        iBestCostSub8x8 = iCurCostSub8x8;
+      }
+      //8x4
+      iCurCostSub8x8 = WelsMdP8x4 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice, i8x8Idx);
+      if (iCurCostSub8x8 < iBestCostSub8x8) {
+        pCurMb->uiSubMbType[i8x8Idx] = SUB_MB_TYPE_8x4;
+        iBestCostSub8x8 = iCurCostSub8x8;
+      }
+      //4x8
+      iCurCostSub8x8 = WelsMdP4x8 (pEncCtx->pFuncList, pCurDqLayer, pWelsMd, pSlice, i8x8Idx);
+      if (iCurCostSub8x8 < iBestCostSub8x8) {
+        pCurMb->uiSubMbType[i8x8Idx] = SUB_MB_TYPE_4x8;
+        iBestCostSub8x8 = iCurCostSub8x8;
+      }
+      iBestCost += iBestCostSub8x8;
+    }
+    if ((pCurMb->uiSubMbType[0] == SUB_MB_TYPE_8x8) && (pCurMb->uiSubMbType[1] == SUB_MB_TYPE_8x8)
+        && (pCurMb->uiSubMbType[2] == SUB_MB_TYPE_8x8) && (pCurMb->uiSubMbType[3] == SUB_MB_TYPE_8x8)) //all 8x8
+#endif
+      TryModeMerge (pMbCache, pWelsMd, pCurMb);
+  }
+  pWelsMd->iCostLuma = iBestCost;
+}
+
+
+
+
+
+//
+// SetScrollingMvToMd
+//
+void SetScrollingMvToMd (SVAAFrameInfo* pVaa, SWelsMD* pWelsMd) {
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pVaa);
+
+  SMVUnitXY          sTempMv;
+  sTempMv.iMvX = pVaaExt->sScrollDetectInfo.iScrollMvX;
+  sTempMv.iMvY = pVaaExt->sScrollDetectInfo.iScrollMvY;
+
+  (pWelsMd->sMe.sMe16x16).sDirectionalMv =
+    (pWelsMd->sMe.sMe8x8[0]).sDirectionalMv =
+      (pWelsMd->sMe.sMe8x8[1]).sDirectionalMv =
+        (pWelsMd->sMe.sMe8x8[2]).sDirectionalMv =
+          (pWelsMd->sMe.sMe8x8[3]).sDirectionalMv = sTempMv;
+}
+
+void SetScrollingMvToMdNull (SVAAFrameInfo* pVaa, SWelsMD* pWelsMd) {
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_motion_estimate.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_motion_estimate.cpp
new file mode 100644
index 0000000000..9e6b1b217d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_motion_estimate.cpp
@@ -0,0 +1,1089 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file  svc motion estimate.c
+ *
+ * \brief  Interfaces introduced in svc mb motion estimation
+ *
+ * \date  08/11/2009 Created
+ *
+ *************************************************************************************
+ */
+
+#include "cpu_core.h"
+#include "ls_defines.h"
+#include "svc_motion_estimate.h"
+#include "wels_transpose_matrix.h"
+
+namespace WelsEnc {
+
+const int32_t QStepx16ByQp[52] = {  /* save QStep<<4 for int32_t */
+  10,  11,  13,  14,  16,  18,  /* 0~5   */
+  20,  22,  26,  28,  32,  36,  /* 6~11  */
+  40,  44,  52,  56,  64,  72,  /* 12~17 */
+  80,  88,  104, 112, 128, 144, /* 18~23 */
+  160, 176, 208, 224, 256, 288, /* 24~29 */
+  320, 352, 416, 448, 512, 576, /* 30~35 */
+  640, 704, 832, 896, 1024, 1152, /* 36~41 */
+  1280, 1408, 1664, 1792, 2048, 2304, /* 42~47 */
+  2560, 2816, 3328, 3584     /* 48~51 */
+};
+
+static inline void UpdateMeResults (const SMVUnitXY ksBestMv, const uint32_t kiBestSadCost, uint8_t* pRef,
+                                    SWelsME* pMe) {
+  pMe->sMv = ksBestMv;
+  pMe->pRefMb = pRef;
+  pMe->uiSadCost = kiBestSadCost;
+}
+static inline void MeEndIntepelSearch (SWelsME* pMe) {
+  /* -> qpel mv */
+  pMe->sMv.iMvX *= (1 << 2);
+  pMe->sMv.iMvY *= (1 << 2);
+  pMe->uiSatdCost = pMe->uiSadCost;
+}
+
+void WelsInitMeFunc (SWelsFuncPtrList* pFuncList, uint32_t uiCpuFlag, bool bScreenContent) {
+  pFuncList->pfUpdateFMESwitch = UpdateFMESwitchNull;
+
+  if (!bScreenContent) {
+    pFuncList->pfCheckDirectionalMv = CheckDirectionalMvFalse;
+    pFuncList->pfCalculateBlockFeatureOfFrame[0] =
+      pFuncList->pfCalculateBlockFeatureOfFrame[1] = NULL;
+    pFuncList->pfCalculateSingleBlockFeature[0] =
+      pFuncList->pfCalculateSingleBlockFeature[1] = NULL;
+
+  } else {
+    pFuncList->pfCheckDirectionalMv = CheckDirectionalMv;
+
+    //for cross serarch
+    pFuncList->pfVerticalFullSearch = LineFullSearch_c;
+    pFuncList->pfHorizontalFullSearch = LineFullSearch_c;
+
+#if defined (X86_ASM)
+    if (uiCpuFlag & WELS_CPU_SSE41) {
+      pFuncList->pfSampleSadHor8[0] = SampleSad8x8Hor8_sse41;
+      pFuncList->pfSampleSadHor8[1] = SampleSad16x16Hor8_sse41;
+      pFuncList->pfVerticalFullSearch = VerticalFullSearchUsingSSE41;
+      pFuncList->pfHorizontalFullSearch = HorizontalFullSearchUsingSSE41;
+    }
+#endif
+
+    //for feature search
+    pFuncList->pfInitializeHashforFeature = InitializeHashforFeature_c;
+    pFuncList->pfFillQpelLocationByFeatureValue = FillQpelLocationByFeatureValue_c;
+    pFuncList->pfCalculateBlockFeatureOfFrame[0] = SumOf8x8BlockOfFrame_c;
+    pFuncList->pfCalculateBlockFeatureOfFrame[1] = SumOf16x16BlockOfFrame_c;
+    //TODO: it is possible to differentiate width that is times of 8, so as to accelerate the speed when width is times of 8?
+    pFuncList->pfCalculateSingleBlockFeature[0] = SumOf8x8SingleBlock_c;
+    pFuncList->pfCalculateSingleBlockFeature[1] = SumOf16x16SingleBlock_c;
+#if defined (X86_ASM)
+    if (uiCpuFlag & WELS_CPU_SSE2) {
+      //for feature search
+      pFuncList->pfInitializeHashforFeature = InitializeHashforFeature_sse2;
+      pFuncList->pfFillQpelLocationByFeatureValue = FillQpelLocationByFeatureValue_sse2;
+      pFuncList->pfCalculateBlockFeatureOfFrame[0] = SumOf8x8BlockOfFrame_sse2;
+      pFuncList->pfCalculateBlockFeatureOfFrame[1] = SumOf16x16BlockOfFrame_sse2;
+      //TODO: it is possible to differentiate width that is times of 8, so as to accelerate the speed when width is times of 8?
+      pFuncList->pfCalculateSingleBlockFeature[0] = SumOf8x8SingleBlock_sse2;
+      pFuncList->pfCalculateSingleBlockFeature[1] = SumOf16x16SingleBlock_sse2;
+    }
+    if (uiCpuFlag & WELS_CPU_SSE41) {
+      //for feature search
+      pFuncList->pfCalculateBlockFeatureOfFrame[0] = SumOf8x8BlockOfFrame_sse4;
+      pFuncList->pfCalculateBlockFeatureOfFrame[1] = SumOf16x16BlockOfFrame_sse4;
+    }
+#endif
+
+#if defined (HAVE_NEON)
+    if (uiCpuFlag & WELS_CPU_NEON) {
+      //for feature search
+      pFuncList->pfInitializeHashforFeature = InitializeHashforFeature_neon;
+      pFuncList->pfFillQpelLocationByFeatureValue = FillQpelLocationByFeatureValue_neon;
+      pFuncList->pfCalculateBlockFeatureOfFrame[0] = SumOf8x8BlockOfFrame_neon;
+      pFuncList->pfCalculateBlockFeatureOfFrame[1] = SumOf16x16BlockOfFrame_neon;
+      //TODO: it is possible to differentiate width that is times of 8, so as to accelerate the speed when width is times of 8?
+      pFuncList->pfCalculateSingleBlockFeature[0] = SumOf8x8SingleBlock_neon;
+      pFuncList->pfCalculateSingleBlockFeature[1] = SumOf16x16SingleBlock_neon;
+    }
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+    if (uiCpuFlag & WELS_CPU_NEON) {
+      //for feature search
+      pFuncList->pfInitializeHashforFeature = InitializeHashforFeature_AArch64_neon;
+      pFuncList->pfFillQpelLocationByFeatureValue = FillQpelLocationByFeatureValue_AArch64_neon;
+      pFuncList->pfCalculateBlockFeatureOfFrame[0] = SumOf8x8BlockOfFrame_AArch64_neon;
+      pFuncList->pfCalculateBlockFeatureOfFrame[1] = SumOf16x16BlockOfFrame_AArch64_neon;
+      //TODO: it is possible to differentiate width that is times of 8, so as to accelerate the speed when width is times of 8?
+      pFuncList->pfCalculateSingleBlockFeature[0] = SumOf8x8SingleBlock_AArch64_neon;
+      pFuncList->pfCalculateSingleBlockFeature[1] = SumOf16x16SingleBlock_AArch64_neon;
+    }
+#endif
+  }
+}
+
+/*!
+ * \brief  BL mb motion estimate search
+ *
+ * \param  enc      Wels encoder context
+ * \param  pMe          Wels me information
+ *
+ * \return  NONE
+ */
+
+void WelsMotionEstimateSearch (SWelsFuncPtrList* pFuncList, SDqLayer* pCurDqLayer, SWelsME* pMe, SSlice* pSlice) {
+  const int32_t kiStrideEnc = pCurDqLayer->iEncStride[0];
+  const int32_t kiStrideRef = pCurDqLayer->pRefPic->iLineSize[0];
+
+  //  Step 1: Initial point prediction
+  if (!WelsMotionEstimateInitialPoint (pFuncList, pMe, pSlice, kiStrideEnc, kiStrideRef)) {
+    pFuncList->pfSearchMethod[pMe->uiBlockSize] (pFuncList, pMe, pSlice, kiStrideEnc, kiStrideRef);
+    MeEndIntepelSearch (pMe);
+  }
+
+  pFuncList->pfCalculateSatd (pFuncList->sSampleDealingFuncs.pfSampleSatd[pMe->uiBlockSize], pMe, kiStrideEnc,
+                              kiStrideRef);
+}
+
+void WelsMotionEstimateSearchStatic (SWelsFuncPtrList* pFuncList, SDqLayer* pCurDqLayer, SWelsME* pMe,
+                                     SSlice* pLpslice) {
+  const int32_t kiStrideEnc = pCurDqLayer->iEncStride[0];
+  const int32_t kiStrideRef = pCurDqLayer->pRefPic->iLineSize[0];
+
+  pMe->sMv.iMvX = pMe->sMv.iMvY = 0;
+  pMe->uiSadCost =
+    pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize] (pMe->pEncMb, kiStrideEnc, pMe->pRefMb, kiStrideRef) ;
+  pMe->uiSadCost += COST_MVD (pMe->pMvdCost, - pMe->sMvp.iMvX, - pMe->sMvp.iMvY);
+  MeEndIntepelSearch (pMe);
+  pFuncList->pfCalculateSatd (pFuncList->sSampleDealingFuncs.pfSampleSatd[pMe->uiBlockSize], pMe, kiStrideEnc,
+                              kiStrideRef);
+}
+
+void WelsMotionEstimateSearchScrolled (SWelsFuncPtrList* pFuncList, SDqLayer* pCurDqLayer, SWelsME* pMe,
+                                       SSlice* pSlice) {
+  const int32_t kiStrideEnc = pCurDqLayer->iEncStride[0];
+  const int32_t kiStrideRef = pCurDqLayer->pRefPic->iLineSize[0];
+
+  pMe->sMv = pMe->sDirectionalMv;
+  pMe->pRefMb = pMe->pColoRefMb + pMe->sMv.iMvY * kiStrideRef + pMe->sMv.iMvX;
+  pMe->uiSadCost =
+    pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize] (pMe->pEncMb, kiStrideEnc, pMe->pRefMb, kiStrideRef)
+    + COST_MVD (pMe->pMvdCost, (pMe->sMv.iMvX * (1 << 2)) - pMe->sMvp.iMvX, (pMe->sMv.iMvY * (1 << 2)) - pMe->sMvp.iMvY);
+  MeEndIntepelSearch (pMe);
+  pFuncList->pfCalculateSatd (pFuncList->sSampleDealingFuncs.pfSampleSatd[pMe->uiBlockSize], pMe, kiStrideEnc,
+                              kiStrideRef);
+}
+/*!
+ * \brief  EL mb motion estimate initial point testing
+ *
+ * \param  pix_pFuncList  SSampleDealingFunc
+ * \param  pMe          Wels me information
+ * \param  mv_range  search range in motion estimate
+ * \param  point      the best match point in motion estimation
+ *
+ * \return  NONE
+ */
+bool WelsMotionEstimateInitialPoint (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice, int32_t iStrideEnc,
+                                     int32_t iStrideRef) {
+  PSampleSadSatdCostFunc pSad    = pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize];
+  const uint16_t* kpMvdCost  = pMe->pMvdCost;
+  uint8_t* const kpEncMb    = pMe->pEncMb;
+  int16_t iMvc0, iMvc1;
+  int32_t iSadCost;
+  int32_t iBestSadCost;
+  uint8_t* pRefMb;
+  uint8_t* pFref2;
+  uint32_t i;
+  const uint32_t kuiMvcNum    = pSlice->uiMvcNum;
+  const SMVUnitXY* kpMvcList  = &pSlice->sMvc[0];
+  const SMVUnitXY ksMvStartMin    = pSlice->sMvStartMin;
+  const SMVUnitXY ksMvStartMax    = pSlice->sMvStartMax;
+  const SMVUnitXY ksMvp    = pMe->sMvp;
+  SMVUnitXY sMv;
+
+  //  Step 1: Initial point prediction
+  // init with sMvp
+  sMv.iMvX  = WELS_CLIP3 ((2 + ksMvp.iMvX) >> 2, ksMvStartMin.iMvX, ksMvStartMax.iMvX);
+  sMv.iMvY  = WELS_CLIP3 ((2 + ksMvp.iMvY) >> 2, ksMvStartMin.iMvY, ksMvStartMax.iMvY);
+
+  pRefMb = &pMe->pRefMb[sMv.iMvY * iStrideRef + sMv.iMvX];
+
+  iBestSadCost = pSad (kpEncMb, iStrideEnc, pRefMb, iStrideRef);
+  iBestSadCost += COST_MVD (kpMvdCost, ((sMv.iMvX) * (1 << 2)) - ksMvp.iMvX, ((sMv.iMvY) * (1 << 2)) - ksMvp.iMvY);
+
+  for (i = 0; i < kuiMvcNum; i++) {
+    //clipping here is essential since some pOut-of-range MVC may happen here (i.e., refer to baseMV)
+    iMvc0 = WELS_CLIP3 ((2 + kpMvcList[i].iMvX) >> 2, ksMvStartMin.iMvX, ksMvStartMax.iMvX);
+    iMvc1 = WELS_CLIP3 ((2 + kpMvcList[i].iMvY) >> 2, ksMvStartMin.iMvY, ksMvStartMax.iMvY);
+
+    if (((iMvc0 - sMv.iMvX) || (iMvc1 - sMv.iMvY))) {
+      pFref2 = &pMe->pRefMb[iMvc1 * iStrideRef + iMvc0];
+
+      iSadCost = pSad (kpEncMb, iStrideEnc, pFref2, iStrideRef) +
+                 COST_MVD (kpMvdCost, (iMvc0 * (1 << 2)) - ksMvp.iMvX, (iMvc1 * (1 << 2)) - ksMvp.iMvY);
+
+      if (iSadCost < iBestSadCost) {
+        sMv.iMvX = iMvc0;
+        sMv.iMvY = iMvc1;
+        pRefMb = pFref2;
+        iBestSadCost = iSadCost;
+      }
+    }
+  }
+
+  if (pFuncList->pfCheckDirectionalMv
+      (pSad, pMe, ksMvStartMin, ksMvStartMax, iStrideEnc, iStrideRef, iSadCost)) {
+    sMv = pMe->sDirectionalMv;
+    pRefMb =  &pMe->pColoRefMb[sMv.iMvY * iStrideRef + sMv.iMvX];
+    iBestSadCost = iSadCost;
+  }
+
+  UpdateMeResults (sMv, iBestSadCost, pRefMb, pMe);
+  if (iBestSadCost < static_cast<int32_t> (pMe->uSadPredISatd.uiSadPred)) {
+    //Initial point early Stop
+    MeEndIntepelSearch (pMe);
+    return true;
+  }
+  return false;
+}
+
+void CalculateSatdCost (PSampleSadSatdCostFunc pSatd, SWelsME* pMe,
+                        const int32_t kiEncStride, const int32_t kiRefStride) {
+  pMe->uSadPredISatd.uiSatd = pSatd (pMe->pEncMb, kiEncStride, pMe->pRefMb, kiRefStride);
+  pMe->uiSatdCost = pMe->uSadPredISatd.uiSatd + COST_MVD (pMe->pMvdCost, pMe->sMv.iMvX - pMe->sMvp.iMvX,
+                    pMe->sMv.iMvY - pMe->sMvp.iMvY);
+}
+void NotCalculateSatdCost (PSampleSadSatdCostFunc pSatd, SWelsME* pMe,
+                           const int32_t kiEncStride, const int32_t kiRefStride) {
+}
+
+
+/////////////////////////
+// Diamond Search Basics
+/////////////////////////
+bool WelsMeSadCostSelect (int32_t* iSadCost, const uint16_t* kpMvdCost, int32_t* pBestCost, const int32_t kiDx,
+                          const int32_t kiDy, int32_t* pIx, int32_t* pIy) {
+  int32_t iTempSadCost[4];
+  int32_t iInputSadCost = *pBestCost;
+  iTempSadCost[0] = iSadCost[0] + COST_MVD (kpMvdCost, kiDx, kiDy - 4);
+  iTempSadCost[1] = iSadCost[1] + COST_MVD (kpMvdCost, kiDx, kiDy + 4);
+  iTempSadCost[2] = iSadCost[2] + COST_MVD (kpMvdCost, kiDx - 4, kiDy);
+  iTempSadCost[3] = iSadCost[3] + COST_MVD (kpMvdCost, kiDx + 4, kiDy);
+
+  if (iTempSadCost[0] < *pBestCost) {
+    *pBestCost = iTempSadCost[0];
+    *pIx = 0;
+    *pIy = 1;
+  }
+
+  if (iTempSadCost[1] < *pBestCost) {
+    *pBestCost = iTempSadCost[1];
+    *pIx = 0;
+    *pIy = -1;
+  }
+
+  if (iTempSadCost[2] < *pBestCost) {
+    *pBestCost = iTempSadCost[2];
+    *pIx = 1;
+    *pIy = 0;
+  }
+
+  if (iTempSadCost[3] < *pBestCost) {
+    *pBestCost = iTempSadCost[3];
+    *pIx = -1;
+    *pIy = 0;
+  }
+  return (*pBestCost == iInputSadCost);
+}
+
+void WelsDiamondSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                        const int32_t kiStrideEnc,  const int32_t kiStrideRef) {
+  PSample4SadCostFunc      pSad          =  pFuncList->sSampleDealingFuncs.pfSample4Sad[pMe->uiBlockSize];
+
+  uint8_t* pFref = pMe->pRefMb;
+  uint8_t* const kpEncMb = pMe->pEncMb;
+  const uint16_t* kpMvdCost = pMe->pMvdCost;
+
+  const SMVUnitXY ksMvStartMin    = pSlice->sMvStartMin;
+  const SMVUnitXY ksMvStartMax    = pSlice->sMvStartMax;
+
+  int32_t iMvDx = ((pMe->sMv.iMvX) * (1 << 2)) - pMe->sMvp.iMvX;
+  int32_t iMvDy = ((pMe->sMv.iMvY) * (1 << 2)) - pMe->sMvp.iMvY;
+
+  uint8_t* pRefMb = pFref;
+  int32_t iBestCost = (pMe->uiSadCost);
+
+  int32_t iTimeThreshold = ITERATIVE_TIMES;
+  ENFORCE_STACK_ALIGN_1D (int32_t, iSadCosts, 4, 16)
+
+  while (iTimeThreshold--) {
+    pMe->sMv.iMvX = (iMvDx + pMe->sMvp.iMvX) >> 2;
+    pMe->sMv.iMvY = (iMvDy + pMe->sMvp.iMvY) >> 2;
+    if (!CheckMvInRange (pMe->sMv, ksMvStartMin, ksMvStartMax))
+      continue;
+    pSad (kpEncMb, kiStrideEnc, pRefMb, kiStrideRef, &iSadCosts[0]);
+
+    int32_t iX, iY;
+
+    const bool kbIsBestCostWorse = WelsMeSadCostSelect (iSadCosts, kpMvdCost, &iBestCost, iMvDx, iMvDy, &iX, &iY);
+    if (kbIsBestCostWorse)
+      break;
+
+    iMvDx -= (iX * (1 << 2)) ;
+    iMvDy -= (iY * (1 << 2)) ;
+
+    pRefMb -= (iX + iY * kiStrideRef);
+
+  }
+
+  /* integer-pel mv */
+  pMe->sMv.iMvX = (iMvDx + pMe->sMvp.iMvX) >> 2;
+  pMe->sMv.iMvY = (iMvDy + pMe->sMvp.iMvY) >> 2;
+  pMe->uiSatdCost = pMe->uiSadCost = (iBestCost);
+  pMe->pRefMb = pRefMb;
+}
+
+/////////////////////////
+// DirectionalMv Basics
+/////////////////////////
+bool CheckDirectionalMv (PSampleSadSatdCostFunc pSad, SWelsME* pMe,
+                         const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv, const int32_t kiEncStride, const int32_t kiRefStride,
+                         int32_t& iBestSadCost) {
+  const int16_t kiMvX = pMe->sDirectionalMv.iMvX;
+  const int16_t kiMvY = pMe->sDirectionalMv.iMvY;
+
+  //Check MV from scrolling detection
+  if ((BLOCK_16x16 != pMe->uiBlockSize) //scrolled_MV with P16x16 is checked SKIP checking function
+      && (kiMvX | kiMvY)   //(0,0) checked in ordinary initial point checking
+      && CheckMvInRange (pMe->sDirectionalMv, ksMinMv, ksMaxMv)) {
+    uint8_t* pRef = &pMe->pColoRefMb[kiMvY * kiRefStride + kiMvX];
+    uint32_t uiCurrentSadCost = pSad (pMe->pEncMb, kiEncStride,  pRef, kiRefStride) +
+                                COST_MVD (pMe->pMvdCost, (kiMvX * (1 << 2)) - pMe->sMvp.iMvX, (kiMvY * (1 << 2)) - pMe->sMvp.iMvY);
+    if (uiCurrentSadCost < pMe->uiSadCost) {
+      iBestSadCost = uiCurrentSadCost;
+      return true;
+    }
+  }
+  return false;
+}
+
+bool CheckDirectionalMvFalse (PSampleSadSatdCostFunc pSad, SWelsME* vpMe,
+                              const SMVUnitXY ksMinMv, const SMVUnitXY ksMaxMv, const int32_t kiEncStride, const int32_t kiRefStride,
+                              int32_t& iBestSadCost) {
+  return false;
+}
+
+/////////////////////////
+// Cross Search Basics
+/////////////////////////
+#if defined (X86_ASM)
+void CalcMvdCostx8_c (uint16_t* pMvdCost, const int32_t kiStartMv, uint16_t* pMvdTable, const uint16_t kiFixedCost) {
+  uint16_t* pBaseCost  = pMvdCost;
+  const int32_t kiOffset = (kiStartMv * (1 << 2));
+  uint16_t* pMvd  = pMvdTable + kiOffset;
+  for (int32_t i = 0; i < 8; ++ i) {
+    pBaseCost[i] = ((*pMvd) + kiFixedCost);
+    pMvd += 4;
+  }
+}
+void VerticalFullSearchUsingSSE41 (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                                   uint16_t* pMvdTable,
+                                   const int32_t kiEncStride, const int32_t kiRefStride,
+                                   const int16_t kiMinMv, const int16_t kiMaxMv,
+                                   const bool bVerticalSearch) {
+  uint8_t*  kpEncMb = pMe->pEncMb;
+  const int32_t kiCurMeBlockPix = pMe->iCurMeBlockPixY;
+  uint8_t* pRef         = &pMe->pColoRefMb[kiMinMv * kiRefStride];
+
+  const int32_t kiCurMeBlockPixY = pMe->iCurMeBlockPixY;
+
+  int32_t iMinPos = kiCurMeBlockPixY + kiMinMv;
+  int32_t iMaxPos = kiCurMeBlockPixY + kiMaxMv;
+  int32_t iFixedMvd = * (pMvdTable - pMe->sMvp.iMvX);
+  uint16_t* pMvdCost  = & (pMvdTable[ (kiMinMv * (1 << 2)) - pMe->sMvp.iMvY]);
+  int16_t iStartMv = 0;
+
+
+  const int32_t kIsBlock16x16 = pMe->uiBlockSize == BLOCK_16x16;
+  const int32_t kiEdgeBlocks = kIsBlock16x16 ? 16 : 8;
+  PSampleSadHor8Func pSampleSadHor8 = pFuncList->pfSampleSadHor8[kIsBlock16x16];
+  PSampleSadSatdCostFunc pSad = pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize];
+  PTransposeMatrixBlockFunc TransposeMatrixBlock = kIsBlock16x16 ? TransposeMatrixBlock16x16_sse2 :
+      TransposeMatrixBlock8x8_mmx;
+  PTransposeMatrixBlocksFunc TransposeMatrixBlocks = kIsBlock16x16 ? TransposeMatrixBlocksx16_sse2 :
+      TransposeMatrixBlocksx8_mmx;
+
+  const int32_t kiDiff   = iMaxPos - iMinPos;
+  const int32_t kiRowNum  = WELS_ALIGN ((kiDiff - kiEdgeBlocks + 1), kiEdgeBlocks);
+  const int32_t kiBlocksNum  = kIsBlock16x16 ? (kiRowNum >> 4) : (kiRowNum >> 3);
+  int32_t iCountLoop8  = (kiRowNum - kiEdgeBlocks) >> 3;
+  const int32_t kiRemainingVectors  = kiDiff - (iCountLoop8 << 3);
+  const int32_t kiMatrixStride  = MAX_VERTICAL_MV_RANGE;
+  ENFORCE_STACK_ALIGN_2D (uint8_t, uiMatrixRef, 16, kiMatrixStride, 16);  // transpose matrix result for ref
+  ENFORCE_STACK_ALIGN_2D (uint8_t, uiMatrixEnc, 16, 16, 16);     // transpose matrix result for enc
+  assert (kiRowNum <= kiMatrixStride); // make sure effective memory
+
+  TransposeMatrixBlock (&uiMatrixEnc[0][0], 16, kpEncMb, kiEncStride);
+  TransposeMatrixBlocks (&uiMatrixRef[0][0], kiMatrixStride, pRef, kiRefStride, kiBlocksNum);
+  ENFORCE_STACK_ALIGN_1D (uint16_t, uiBaseCost, 8, 16);
+  int32_t iTargetPos   = iMinPos;
+  int16_t iBestPos    = pMe->sMv.iMvX;
+  uint32_t uiBestCost   = pMe->uiSadCost;
+  uint32_t uiCostMin;
+  int32_t iIndexMinPos;
+  kpEncMb = &uiMatrixEnc[0][0];
+  pRef = &uiMatrixRef[0][0];
+
+  while (iCountLoop8 > 0) {
+    CalcMvdCostx8_c (uiBaseCost, iStartMv, pMvdCost, iFixedMvd);
+    uiCostMin = pSampleSadHor8 (kpEncMb, 16, pRef, kiMatrixStride, uiBaseCost, &iIndexMinPos);
+    if (uiCostMin < uiBestCost) {
+      uiBestCost = uiCostMin;
+      iBestPos  = iTargetPos + iIndexMinPos;
+    }
+    iTargetPos += 8;
+    pRef += 8;
+    iStartMv += 8;
+    -- iCountLoop8;
+  }
+  if (kiRemainingVectors > 0) {
+    kpEncMb = pMe->pEncMb;
+    pRef = &pMe->pColoRefMb[ (iTargetPos - kiCurMeBlockPix) * kiRefStride];
+    while (iTargetPos < iMaxPos) {
+      const uint16_t uiMvdCost = pMvdCost[iStartMv * (1 << 2)];
+      uint32_t uiSadCost = pSad (kpEncMb, kiEncStride, pRef, kiRefStride) + (iFixedMvd + uiMvdCost);
+      if (uiSadCost < uiBestCost) {
+        uiBestCost = uiSadCost;
+        iBestPos = iTargetPos;
+      }
+      iStartMv++;
+      pRef += kiRefStride;
+      ++iTargetPos;
+    }
+  }
+  if (uiBestCost < pMe->uiSadCost) {
+    SMVUnitXY sBestMv;
+    sBestMv.iMvX = 0;
+    sBestMv.iMvY = iBestPos - kiCurMeBlockPix;
+    UpdateMeResults (sBestMv, uiBestCost, &pMe->pColoRefMb[sBestMv.iMvY * kiRefStride], pMe);
+  }
+}
+
+void HorizontalFullSearchUsingSSE41 (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                                     uint16_t* pMvdTable,
+                                     const int32_t kiEncStride, const int32_t kiRefStride,
+                                     const int16_t kiMinMv, const int16_t kiMaxMv,
+                                     const bool bVerticalSearch) {
+  uint8_t* kpEncMb = pMe->pEncMb;
+
+  const int32_t iCurMeBlockPixX = pMe->iCurMeBlockPixX;
+  int32_t iMinPos = iCurMeBlockPixX + kiMinMv;
+  int32_t iMaxPos = iCurMeBlockPixX + kiMaxMv;
+  int32_t iFixedMvd = * (pMvdTable - pMe->sMvp.iMvY);
+  uint16_t* pMvdCost  = & (pMvdTable[ (kiMinMv * (1 << 2)) - pMe->sMvp.iMvX]);
+  int16_t iStartMv = 0;
+  uint8_t* pRef         = &pMe->pColoRefMb[kiMinMv];
+  const int32_t kIsBlock16x16 = pMe->uiBlockSize == BLOCK_16x16;
+  PSampleSadHor8Func pSampleSadHor8 = pFuncList->pfSampleSadHor8[kIsBlock16x16];
+  PSampleSadSatdCostFunc pSad = pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize];
+  ENFORCE_STACK_ALIGN_1D (uint16_t, uiBaseCost, 8, 16);
+  const int32_t kiNumVector = iMaxPos - iMinPos;
+  int32_t iCountLoop8 = kiNumVector >> 3;
+  const int32_t kiRemainingLoop8 = kiNumVector & 7;
+  int32_t iTargetPos   = iMinPos;
+  int16_t iBestPos    = pMe->sMv.iMvX;
+  uint32_t uiBestCost   = pMe->uiSadCost;
+  uint32_t uiCostMin;
+  int32_t iIndexMinPos;
+
+  while (iCountLoop8 > 0) {
+    CalcMvdCostx8_c (uiBaseCost, iStartMv, pMvdCost, iFixedMvd);
+    uiCostMin = pSampleSadHor8 (kpEncMb, kiEncStride, pRef, kiRefStride, uiBaseCost, &iIndexMinPos);
+    if (uiCostMin < uiBestCost) {
+      uiBestCost = uiCostMin;
+      iBestPos  = iTargetPos + iIndexMinPos;
+    }
+    iTargetPos += 8;
+    pRef += 8;
+    iStartMv += 8;
+    -- iCountLoop8;
+  }
+  if (kiRemainingLoop8 > 0) {
+    while (iTargetPos < iMaxPos) {
+      const uint16_t uiMvdCost = pMvdCost[iStartMv * (1 << 2)];
+      uint32_t uiSadCost = pSad (kpEncMb, kiEncStride, pRef, kiRefStride) + (iFixedMvd + uiMvdCost);
+      if (uiSadCost < uiBestCost) {
+        uiBestCost = uiSadCost;
+        iBestPos = iTargetPos;
+      }
+      iStartMv++;
+      ++pRef;
+      ++iTargetPos;
+    }
+  }
+  if (uiBestCost < pMe->uiSadCost) {
+    SMVUnitXY sBestMv;
+    sBestMv.iMvX = iBestPos - iCurMeBlockPixX;
+    sBestMv.iMvY = 0;
+    UpdateMeResults (sBestMv, uiBestCost, &pMe->pColoRefMb[sBestMv.iMvX], pMe);
+  }
+}
+#endif
+void LineFullSearch_c (SWelsFuncPtrList* pFuncList, SWelsME* pMe,
+                       uint16_t* pMvdTable,
+                       const int32_t kiEncStride, const int32_t kiRefStride,
+                       const int16_t iMinMv, const int16_t iMaxMv,
+                       const bool bVerticalSearch) {
+  PSampleSadSatdCostFunc pSad = pFuncList->sSampleDealingFuncs.pfSampleSad[pMe->uiBlockSize];
+  const int32_t kiCurMeBlockPixX = pMe->iCurMeBlockPixX;
+  const int32_t kiCurMeBlockPixY = pMe->iCurMeBlockPixY;
+  int32_t iMinPos, iMaxPos;
+  int32_t iFixedMvd;
+  int32_t iCurMeBlockPix;
+  int32_t iStride;
+  uint16_t* pMvdCost;
+
+  if (bVerticalSearch) {
+    iMinPos = kiCurMeBlockPixY + iMinMv;
+    iMaxPos = kiCurMeBlockPixY + iMaxMv;
+    iFixedMvd = * (pMvdTable - pMe->sMvp.iMvX);
+    iCurMeBlockPix = pMe->iCurMeBlockPixY;
+    iStride = kiRefStride;
+    pMvdCost  = & (pMvdTable[ (iMinMv * (1 << 2)) - pMe->sMvp.iMvY]);
+  } else {
+    iMinPos = kiCurMeBlockPixX + iMinMv;
+    iMaxPos = kiCurMeBlockPixX + iMaxMv;
+    iFixedMvd = * (pMvdTable - pMe->sMvp.iMvY);
+    iCurMeBlockPix = pMe->iCurMeBlockPixX;
+    iStride = 1;
+    pMvdCost  = & (pMvdTable[ (iMinMv * (1 << 2)) - pMe->sMvp.iMvX]);
+  }
+  uint8_t* pRef            = &pMe->pColoRefMb[ iMinMv * iStride];
+  uint32_t uiBestCost    = 0xFFFFFFFF;
+  int32_t iBestPos       = 0;
+
+  for (int32_t iTargetPos = iMinPos; iTargetPos < iMaxPos; ++ iTargetPos) {
+    uint8_t* const kpEncMb  = pMe->pEncMb;
+    uint32_t uiSadCost = pSad (kpEncMb, kiEncStride, pRef, kiRefStride) + (iFixedMvd + *pMvdCost);
+    if (uiSadCost < uiBestCost) {
+      uiBestCost  = uiSadCost;
+      iBestPos  = iTargetPos;
+    }
+    pRef += iStride;
+    pMvdCost += 4;
+  }
+
+  if (uiBestCost < pMe->uiSadCost) {
+    SMVUnitXY sBestMv;
+    sBestMv.iMvX = bVerticalSearch ? 0 : (iBestPos - iCurMeBlockPix);
+    sBestMv.iMvY = bVerticalSearch ? (iBestPos - iCurMeBlockPix) : 0;
+    UpdateMeResults (sBestMv, uiBestCost, &pMe->pColoRefMb[sBestMv.iMvY * kiRefStride + sBestMv.iMvX], pMe);
+  }
+}
+
+void WelsMotionCrossSearch (SWelsFuncPtrList* pFuncList, SWelsME* pMe, SSlice* pSlice,
+                            const int32_t kiEncStride,  const int32_t kiRefStride) {
+  PLineFullSearchFunc pfVerticalFullSearchFunc = pFuncList->pfVerticalFullSearch;
+  PLineFullSearchFunc pfHorizontalFullSearchFunc = pFuncList->pfHorizontalFullSearch;
+
+  //vertical search
+  pfVerticalFullSearchFunc (pFuncList, pMe,
+                            pMe->pMvdCost,
+                            kiEncStride, kiRefStride,
+                            pSlice->sMvStartMin.iMvY,
+                            pSlice->sMvStartMax.iMvY, true);
+
+  //horizontal search
+  if (pMe->uiSadCost >= pMe->uiSadCostThreshold) {
+    pfHorizontalFullSearchFunc (pFuncList, pMe,
+                                pMe->pMvdCost,
+                                kiEncStride, kiRefStride,
+                                pSlice->sMvStartMin.iMvX,
+                                pSlice->sMvStartMax.iMvX,
+                                false);
+  }
+}
+
+
+/////////////////////////
+// Feature Search Basics
+/////////////////////////
+//memory related
+int32_t RequestFeatureSearchPreparation (CMemoryAlign* pMa, const int32_t kiFrameWidth,  const int32_t kiFrameHeight,
+    const int32_t iNeedFeatureStorage,
+    SFeatureSearchPreparation* pFeatureSearchPreparation) {
+  const int32_t kiFeatureStrategyIndex = iNeedFeatureStorage >> 16;
+  const bool bFme8x8 = ((iNeedFeatureStorage & 0x0000FF & ME_FME) == ME_FME);
+  const int32_t kiMarginSize = bFme8x8 ? 8 : 16;
+  const int32_t kiFrameSize = (kiFrameWidth - kiMarginSize) * (kiFrameHeight - kiMarginSize);
+  int32_t iListOfFeatureOfBlock;
+
+  if (0 == kiFeatureStrategyIndex) {
+    iListOfFeatureOfBlock = sizeof (uint16_t) * kiFrameSize;
+  } else {
+    iListOfFeatureOfBlock = sizeof (uint16_t) * kiFrameSize +
+                            (kiFrameWidth - kiMarginSize) * sizeof (uint32_t) + kiFrameWidth * 8 * sizeof (uint8_t);
+  }
+  pFeatureSearchPreparation->pFeatureOfBlock =
+    (uint16_t*)pMa->WelsMallocz (iListOfFeatureOfBlock, "pFeatureOfBlock");
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == (pFeatureSearchPreparation->pFeatureOfBlock))
+
+  pFeatureSearchPreparation->uiFeatureStrategyIndex = kiFeatureStrategyIndex;
+  pFeatureSearchPreparation->bFMESwitchFlag = true;
+  pFeatureSearchPreparation->uiFMEGoodFrameCount = FMESWITCH_DEFAULT_GOODFRAME_NUM;
+  pFeatureSearchPreparation->iHighFreMbCount = 0;
+
+  return ENC_RETURN_SUCCESS;
+}
+int32_t ReleaseFeatureSearchPreparation (CMemoryAlign* pMa, uint16_t*& pFeatureOfBlock) {
+  if (pMa && pFeatureOfBlock) {
+    pMa->WelsFree (pFeatureOfBlock, "pFeatureOfBlock");
+    pFeatureOfBlock = NULL;
+    return ENC_RETURN_SUCCESS;
+  }
+  return ENC_RETURN_UNEXPECTED;
+}
+
+int32_t RequestScreenBlockFeatureStorage (CMemoryAlign* pMa, const int32_t kiFrameWidth,  const int32_t kiFrameHeight,
+    const int32_t iNeedFeatureStorage,
+    SScreenBlockFeatureStorage* pScreenBlockFeatureStorage) {
+
+  const int32_t kiFeatureStrategyIndex = iNeedFeatureStorage >> 16;
+  const int32_t kiMe8x8FME = iNeedFeatureStorage & 0x0000FF & ME_FME;
+  const int32_t kiMe16x16FME = ((iNeedFeatureStorage & 0x00FF00) >> 8) & ME_FME;
+  if ((kiMe8x8FME == ME_FME) && (kiMe16x16FME == ME_FME)) {
+    return ENC_RETURN_UNSUPPORTED_PARA;
+    //the following memory allocation cannot support when FME at both size
+  }
+
+  const bool bIsBlock8x8 = (kiMe8x8FME == ME_FME);
+  const int32_t kiMarginSize = bIsBlock8x8 ? 8 : 16;
+  const int32_t kiFrameSize = (kiFrameWidth - kiMarginSize) * (kiFrameHeight - kiMarginSize);
+  const int32_t kiListSize  = (0 == kiFeatureStrategyIndex) ? (bIsBlock8x8 ? LIST_SIZE_SUM_8x8 : LIST_SIZE_SUM_16x16) :
+                              256;
+
+  pScreenBlockFeatureStorage->pTimesOfFeatureValue = (uint32_t*)pMa->WelsMallocz (kiListSize * sizeof (uint32_t),
+      "pScreenBlockFeatureStorage->pTimesOfFeatureValue");
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pScreenBlockFeatureStorage->pTimesOfFeatureValue)
+
+  pScreenBlockFeatureStorage->pLocationOfFeature = (uint16_t**)pMa->WelsMallocz (kiListSize * sizeof (uint16_t*),
+      "pScreenBlockFeatureStorage->pLocationOfFeature");
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pScreenBlockFeatureStorage->pLocationOfFeature)
+
+  pScreenBlockFeatureStorage->pLocationPointer = (uint16_t*)pMa->WelsMallocz (2 * kiFrameSize * sizeof (uint16_t),
+      "pScreenBlockFeatureStorage->pLocationPointer");
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pScreenBlockFeatureStorage->pLocationPointer)
+  //  uint16_t* pFeatureValuePointerList[WELS_MAX (LIST_SIZE_SUM_16x16, LIST_SIZE_MSE_16x16)] = {0};
+  pScreenBlockFeatureStorage->pFeatureValuePointerList = (uint16_t**)pMa->WelsMallocz (WELS_MAX (LIST_SIZE_SUM_16x16,
+      LIST_SIZE_MSE_16x16) * sizeof (uint16_t*),
+      "pScreenBlockFeatureStorage->pFeatureValuePointerList");
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pScreenBlockFeatureStorage->pFeatureValuePointerList)
+
+  pScreenBlockFeatureStorage->pFeatureOfBlockPointer = NULL;
+  pScreenBlockFeatureStorage->iIs16x16 = !bIsBlock8x8;
+  pScreenBlockFeatureStorage->uiFeatureStrategyIndex = kiFeatureStrategyIndex;
+  pScreenBlockFeatureStorage->iActualListSize = kiListSize;
+  WelsSetMemMultiplebytes_c (pScreenBlockFeatureStorage->uiSadCostThreshold, UINT_MAX, BLOCK_SIZE_ALL, sizeof (uint32_t));
+  pScreenBlockFeatureStorage->bRefBlockFeatureCalculated = false;
+
+  return ENC_RETURN_SUCCESS;
+}
+int32_t ReleaseScreenBlockFeatureStorage (CMemoryAlign* pMa, SScreenBlockFeatureStorage* pScreenBlockFeatureStorage) {
+  if (pMa && pScreenBlockFeatureStorage) {
+    if (pScreenBlockFeatureStorage->pTimesOfFeatureValue) {
+      pMa->WelsFree (pScreenBlockFeatureStorage->pTimesOfFeatureValue, "pScreenBlockFeatureStorage->pTimesOfFeatureValue");
+      pScreenBlockFeatureStorage->pTimesOfFeatureValue = NULL;
+    }
+
+    if (pScreenBlockFeatureStorage->pLocationOfFeature) {
+      pMa->WelsFree (pScreenBlockFeatureStorage->pLocationOfFeature, "pScreenBlockFeatureStorage->pLocationOfFeature");
+      pScreenBlockFeatureStorage->pLocationOfFeature = NULL;
+    }
+
+    if (pScreenBlockFeatureStorage->pLocationPointer) {
+      pMa->WelsFree (pScreenBlockFeatureStorage->pLocationPointer, "pScreenBlockFeatureStorage->pLocationPointer");
+      pScreenBlockFeatureStorage->pLocationPointer = NULL;
+    }
+
+    if (pScreenBlockFeatureStorage->pFeatureValuePointerList) {
+      pMa->WelsFree (pScreenBlockFeatureStorage->pFeatureValuePointerList,
+                     "pScreenBlockFeatureStorage->pFeatureValuePointerList");
+      pScreenBlockFeatureStorage->pFeatureValuePointerList = NULL;
+    }
+
+    return ENC_RETURN_SUCCESS;
+  }
+  return ENC_RETURN_UNEXPECTED;
+}
+
+//preprocess related
+int32_t SumOf8x8SingleBlock_c (uint8_t* pRef, const int32_t kiRefStride) {
+  int32_t iSum = 0, i;
+  for (i = 0; i < 8; i++) {
+    iSum +=  pRef[0]    + pRef[1]  + pRef[2]  + pRef[3];
+    iSum +=  pRef[4]    + pRef[5]  + pRef[6]  + pRef[7];
+    pRef += kiRefStride;
+  }
+  return iSum;
+}
+int32_t SumOf16x16SingleBlock_c (uint8_t* pRef, const int32_t kiRefStride) {
+  int32_t iSum = 0, i;
+  for (i = 0; i < 16; i++) {
+    iSum +=  pRef[0]    + pRef[1]  + pRef[2]  + pRef[3];
+    iSum +=  pRef[4]    + pRef[5]  + pRef[6]  + pRef[7];
+    iSum    +=  pRef[8]    + pRef[9]  + pRef[10]  + pRef[11];
+    iSum    +=  pRef[12]  + pRef[13]  + pRef[14]  + pRef[15];
+    pRef += kiRefStride;
+  }
+  return iSum;
+}
+
+void SumOf8x8BlockOfFrame_c (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                             const int32_t kiRefStride,
+                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]) {
+  int32_t x, y;
+  uint8_t* pRef;
+  uint16_t* pBuffer;
+  int32_t iSum;
+  for (y = 0; y < kiHeight; y++) {
+    pRef = pRefPicture  + kiRefStride * y;
+    pBuffer  = pFeatureOfBlock + kiWidth * y;
+    for (x = 0; x < kiWidth; x++) {
+      iSum = SumOf8x8SingleBlock_c (pRef + x, kiRefStride);
+
+      pBuffer[x] = iSum;
+      pTimesOfFeatureValue[iSum]++;
+    }
+  }
+}
+
+void SumOf16x16BlockOfFrame_c (uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight,
+                               const int32_t kiRefStride,
+                               uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]) {
+  //TODO: this is similar to SumOf8x8BlockOfFrame_c expect the calling of single block func, refactor-able?
+  int32_t x, y;
+  uint8_t* pRef;
+  uint16_t* pBuffer;
+  int32_t iSum;
+  for (y = 0; y < kiHeight; y++) {
+    pRef = pRefPicture  + kiRefStride * y;
+    pBuffer  = pFeatureOfBlock + kiWidth * y;
+    for (x = 0; x < kiWidth; x++) {
+      iSum = SumOf16x16SingleBlock_c (pRef + x, kiRefStride);
+
+      pBuffer[x] = iSum;
+      pTimesOfFeatureValue[iSum]++;
+    }
+  }
+}
+
+void InitializeHashforFeature_c (uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+                                 uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList) {
+  //assign location pointer
+  uint16_t* pBufPos  = pBuf;
+  for (int32_t i = 0 ; i < kiListSize; ++i) {
+    pLocationOfFeature[i] =
+      pFeatureValuePointerList[i] = pBufPos;
+    pBufPos      += (pTimesOfFeatureValue[i] << 1);
+  }
+}
+void FillQpelLocationByFeatureValue_c (uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight,
+                                       uint16_t** pFeatureValuePointerList) {
+  //assign each pixel's position
+  uint16_t* pSrcPointer  =  pFeatureOfBlock;
+  int32_t iQpelY = 0;
+  for (int32_t y = 0; y < kiHeight; y++) {
+    for (int32_t x = 0; x < kiWidth; x++) {
+      uint16_t uiFeature = pSrcPointer[x];
+      pFeatureValuePointerList[uiFeature][0] = x << 2;
+      pFeatureValuePointerList[uiFeature][1] = iQpelY;
+      pFeatureValuePointerList[uiFeature] += 2;
+    }
+    iQpelY += 4;
+    pSrcPointer += kiWidth;
+  }
+}
+
+bool CalculateFeatureOfBlock (SWelsFuncPtrList* pFunc, SPicture* pRef,
+                              SScreenBlockFeatureStorage* pScreenBlockFeatureStorage) {
+  uint16_t* pFeatureOfBlock = pScreenBlockFeatureStorage->pFeatureOfBlockPointer;
+  uint32_t* pTimesOfFeatureValue = pScreenBlockFeatureStorage->pTimesOfFeatureValue;
+  uint16_t** pLocationOfFeature  = pScreenBlockFeatureStorage->pLocationOfFeature;
+  uint16_t* pBuf = pScreenBlockFeatureStorage->pLocationPointer;
+
+  if (NULL == pFeatureOfBlock || NULL == pTimesOfFeatureValue || NULL == pLocationOfFeature || NULL == pBuf
+      || NULL == pRef->pData[0]) {
+    return false;
+  }
+
+  uint8_t* pRefData = pRef->pData[0];
+  const int32_t iRefStride = pRef->iLineSize[0];
+  int32_t iIs16x16 = pScreenBlockFeatureStorage->iIs16x16;
+  const int32_t iEdgeDiscard = (iIs16x16 ? 16 : 8); //this is to save complexity of padding on pRef
+  const int32_t iWidth = pRef->iWidthInPixel - iEdgeDiscard;
+  const int32_t kiHeight = pRef->iHeightInPixel - iEdgeDiscard;
+  const int32_t kiActualListSize = pScreenBlockFeatureStorage->iActualListSize;
+
+  memset (pTimesOfFeatureValue, 0, sizeof (int32_t)*kiActualListSize);
+  (pFunc->pfCalculateBlockFeatureOfFrame[iIs16x16]) (pRefData, iWidth, kiHeight, iRefStride, pFeatureOfBlock,
+      pTimesOfFeatureValue);
+
+  //assign pLocationOfFeature pointer
+  pFunc->pfInitializeHashforFeature (pTimesOfFeatureValue, pBuf, kiActualListSize,
+                                     pLocationOfFeature, pScreenBlockFeatureStorage->pFeatureValuePointerList);
+
+  //assign each pixel's pLocationOfFeature
+  pFunc->pfFillQpelLocationByFeatureValue (pFeatureOfBlock, iWidth, kiHeight,
+      pScreenBlockFeatureStorage->pFeatureValuePointerList);
+  return true;
+}
+
+void PerformFMEPreprocess (SWelsFuncPtrList* pFunc, SPicture* pRef, uint16_t* pFeatureOfBlock,
+                           SScreenBlockFeatureStorage* pScreenBlockFeatureStorage) {
+  pScreenBlockFeatureStorage->pFeatureOfBlockPointer = pFeatureOfBlock;
+  pScreenBlockFeatureStorage->bRefBlockFeatureCalculated = CalculateFeatureOfBlock (pFunc, pRef,
+      pScreenBlockFeatureStorage);
+
+  if (pScreenBlockFeatureStorage->bRefBlockFeatureCalculated) {
+    uint32_t uiRefPictureAvgQstepx16 = QStepx16ByQp[WelsMedian (0, pRef->iFrameAverageQp, 51)];
+    uint32_t uiSadCostThreshold16x16 = ((30 * (uiRefPictureAvgQstepx16 + 160)) >> 3);
+    pScreenBlockFeatureStorage->uiSadCostThreshold[BLOCK_16x16] = uiSadCostThreshold16x16;
+    pScreenBlockFeatureStorage->uiSadCostThreshold[BLOCK_8x8] = (uiSadCostThreshold16x16 >> 2);
+    pScreenBlockFeatureStorage->uiSadCostThreshold[BLOCK_16x8]
+      = pScreenBlockFeatureStorage->uiSadCostThreshold[BLOCK_8x16]
+        = pScreenBlockFeatureStorage->uiSadCostThreshold[BLOCK_4x4] = UINT_MAX;
+  }
+}
+
+//search related
+bool SetFeatureSearchIn (SWelsFuncPtrList* pFunc,  const SWelsME& sMe,
+                         const SSlice* pSlice, SScreenBlockFeatureStorage* pRefFeatureStorage,
+                         const int32_t kiEncStride, const int32_t kiRefStride,
+                         SFeatureSearchIn* pFeatureSearchIn) {
+  pFeatureSearchIn->pSad = pFunc->sSampleDealingFuncs.pfSampleSad[sMe.uiBlockSize];
+  pFeatureSearchIn->iFeatureOfCurrent = pFunc->pfCalculateSingleBlockFeature[BLOCK_16x16 == sMe.uiBlockSize] (sMe.pEncMb,
+                                        kiEncStride);
+
+  pFeatureSearchIn->pEnc       = sMe.pEncMb;
+  pFeatureSearchIn->pColoRef = sMe.pColoRefMb;
+  pFeatureSearchIn->iEncStride = kiEncStride;
+  pFeatureSearchIn->iRefStride = kiRefStride;
+  pFeatureSearchIn->uiSadCostThresh = sMe.uiSadCostThreshold;
+
+  pFeatureSearchIn->iCurPixX = sMe.iCurMeBlockPixX;
+  pFeatureSearchIn->iCurPixXQpel = (pFeatureSearchIn->iCurPixX << 2);
+  pFeatureSearchIn->iCurPixY = sMe.iCurMeBlockPixY;
+  pFeatureSearchIn->iCurPixYQpel = (pFeatureSearchIn->iCurPixY << 2);
+
+  pFeatureSearchIn->pTimesOfFeature = pRefFeatureStorage->pTimesOfFeatureValue;
+  pFeatureSearchIn->pQpelLocationOfFeature = pRefFeatureStorage->pLocationOfFeature;
+  pFeatureSearchIn->pMvdCostX = sMe.pMvdCost - pFeatureSearchIn->iCurPixXQpel - sMe.sMvp.iMvX;
+  pFeatureSearchIn->pMvdCostY = sMe.pMvdCost - pFeatureSearchIn->iCurPixYQpel - sMe.sMvp.iMvY;
+
+  pFeatureSearchIn->iMinQpelX = pFeatureSearchIn->iCurPixXQpel + ((pSlice->sMvStartMin.iMvX) * (1 << 2));
+  pFeatureSearchIn->iMinQpelY = pFeatureSearchIn->iCurPixYQpel + ((pSlice->sMvStartMin.iMvY) * (1 << 2));
+  pFeatureSearchIn->iMaxQpelX = pFeatureSearchIn->iCurPixXQpel + ((pSlice->sMvStartMax.iMvX) * (1 << 2));
+  pFeatureSearchIn->iMaxQpelY = pFeatureSearchIn->iCurPixYQpel + ((pSlice->sMvStartMax.iMvY) * (1 << 2));
+
+  if (NULL == pFeatureSearchIn->pSad || NULL == pFeatureSearchIn->pTimesOfFeature
+      || NULL == pFeatureSearchIn->pQpelLocationOfFeature) {
+    return false;
+  }
+  return true;
+}
+void SaveFeatureSearchOut (const SMVUnitXY sBestMv, const uint32_t uiBestSadCost, uint8_t* pRef,
+                           SFeatureSearchOut* pFeatureSearchOut) {
+  pFeatureSearchOut->sBestMv = sBestMv;
+  pFeatureSearchOut->uiBestSadCost = uiBestSadCost;
+  pFeatureSearchOut->pBestRef = pRef;
+}
+
+bool FeatureSearchOne (SFeatureSearchIn& sFeatureSearchIn, const int32_t iFeatureDifference,
+                       const uint32_t kuiExpectedSearchTimes,
+                       SFeatureSearchOut* pFeatureSearchOut) {
+  const int32_t iFeatureOfRef = (sFeatureSearchIn.iFeatureOfCurrent + iFeatureDifference);
+  if (iFeatureOfRef < 0 || iFeatureOfRef >= LIST_SIZE)
+    return true;
+
+  PSampleSadSatdCostFunc pSad = sFeatureSearchIn.pSad;
+  uint8_t* pEnc =  sFeatureSearchIn.pEnc;
+  uint8_t* pColoRef = sFeatureSearchIn.pColoRef;
+  const int32_t iEncStride =  sFeatureSearchIn.iEncStride;
+  const int32_t iRefStride =  sFeatureSearchIn.iRefStride;
+  const uint16_t uiSadCostThresh = sFeatureSearchIn.uiSadCostThresh;
+
+  const int32_t iCurPixX = sFeatureSearchIn.iCurPixX;
+  const int32_t iCurPixY = sFeatureSearchIn.iCurPixY;
+  const int32_t iCurPixXQpel = sFeatureSearchIn.iCurPixXQpel;
+  const int32_t iCurPixYQpel = sFeatureSearchIn.iCurPixYQpel;
+
+  const int32_t iMinQpelX =  sFeatureSearchIn.iMinQpelX;
+  const int32_t iMinQpelY =  sFeatureSearchIn.iMinQpelY;
+  const int32_t iMaxQpelX =  sFeatureSearchIn.iMaxQpelX;
+  const int32_t iMaxQpelY =  sFeatureSearchIn.iMaxQpelY;
+
+  const int32_t iSearchTimes = WELS_MIN (sFeatureSearchIn.pTimesOfFeature[iFeatureOfRef], kuiExpectedSearchTimes);
+  const int32_t iSearchTimesx2 = (iSearchTimes << 1);
+  const uint16_t* pQpelPosition = sFeatureSearchIn.pQpelLocationOfFeature[iFeatureOfRef];
+
+  SMVUnitXY sBestMv;
+  uint32_t uiBestCost, uiTmpCost;
+  uint8_t* pBestRef, *pCurRef;
+  int32_t iQpelX, iQpelY;
+  int32_t iIntepelX, iIntepelY;
+  int32_t i;
+
+  sBestMv.iMvX = pFeatureSearchOut->sBestMv.iMvX;
+  sBestMv.iMvY = pFeatureSearchOut->sBestMv.iMvY;
+  uiBestCost = pFeatureSearchOut->uiBestSadCost;
+  pBestRef = pFeatureSearchOut->pBestRef;
+
+  for (i = 0; i < iSearchTimesx2; i += 2) {
+    iQpelX = pQpelPosition[i];
+    iQpelY = pQpelPosition[i + 1];
+
+    if ((iQpelX > iMaxQpelX) || (iQpelX < iMinQpelX)
+        || (iQpelY > iMaxQpelY) || (iQpelY < iMinQpelY)
+        || (iQpelX == iCurPixXQpel) || (iQpelY == iCurPixYQpel))
+      continue;
+
+    uiTmpCost = sFeatureSearchIn.pMvdCostX[ iQpelX ] + sFeatureSearchIn.pMvdCostY[ iQpelY ];
+    if (uiTmpCost + iFeatureDifference >= uiBestCost)
+      continue;
+
+    iIntepelX = (iQpelX >> 2) - iCurPixX;
+    iIntepelY = (iQpelY >> 2) - iCurPixY;
+    pCurRef = &pColoRef[iIntepelX + iIntepelY * iRefStride];
+    uiTmpCost += pSad (pEnc, iEncStride, pCurRef, iRefStride);
+    if (uiTmpCost < uiBestCost) {
+      sBestMv.iMvX = iIntepelX;
+      sBestMv.iMvY = iIntepelY;
+      uiBestCost = uiTmpCost;
+      pBestRef = pCurRef;
+
+      if (uiBestCost < uiSadCostThresh)
+        break;
+    }
+  }
+  SaveFeatureSearchOut (sBestMv, uiBestCost, pBestRef, pFeatureSearchOut);
+  return (i < iSearchTimesx2);
+}
+
+
+void MotionEstimateFeatureFullSearch (SFeatureSearchIn& sFeatureSearchIn,
+                                      const uint32_t kuiMaxSearchPoint,
+                                      SWelsME* pMe) {
+  SFeatureSearchOut sFeatureSearchOut = { { 0 } };//TODO: this can be refactored and removed
+  sFeatureSearchOut.uiBestSadCost = pMe->uiSadCost;
+  sFeatureSearchOut.sBestMv = pMe->sMv;
+  sFeatureSearchOut.pBestRef = pMe->pRefMb;
+
+  int32_t iFeatureDifference = 0;//TODO: change it according to computational-complexity setting when needed
+  FeatureSearchOne (sFeatureSearchIn, iFeatureDifference, kuiMaxSearchPoint, &sFeatureSearchOut);
+  if (sFeatureSearchOut.uiBestSadCost < pMe->uiSadCost) {  //TODO: this may be refactored and removed
+    UpdateMeResults (sFeatureSearchOut.sBestMv,
+                     sFeatureSearchOut.uiBestSadCost, sFeatureSearchOut.pBestRef,
+                     pMe);
+  }
+}
+
+//switch related
+static uint32_t CountFMECostDown (const SDqLayer* pCurLayer) {
+  uint32_t uiCostDownSum      = 0;
+  const int32_t kiSliceCount  = GetCurrentSliceNum (pCurLayer);
+  if (kiSliceCount >= 1) {
+    int32_t iSliceIndex  = 0;
+    SSlice* pSlice    = pCurLayer->ppSliceInLayer[iSliceIndex];
+    while (iSliceIndex < kiSliceCount) {
+      pSlice        = pCurLayer->ppSliceInLayer[iSliceIndex];
+      uiCostDownSum += pSlice->uiSliceFMECostDown;
+      ++ iSliceIndex;
+    }
+  }
+  return uiCostDownSum;
+}
+#define FMESWITCH_MBAVERCOSTSAVING_THRESHOLD (2) //empirically set.
+#define FMESWITCH_GOODFRAMECOUNT_MAX (5) //empirically set.
+static void UpdateFMEGoodFrameCount (const uint32_t iAvMBNormalizedRDcostDown, uint8_t& uiFMEGoodFrameCount) {
+  //this strategy may be changed, here the number is derived from empirical-numbers
+  // uiFMEGoodFrameCount lies in [0,FMESWITCH_GOODFRAMECOUNT_MAX]
+  if (iAvMBNormalizedRDcostDown > FMESWITCH_MBAVERCOSTSAVING_THRESHOLD) {
+    if (uiFMEGoodFrameCount < FMESWITCH_GOODFRAMECOUNT_MAX)
+      ++ uiFMEGoodFrameCount;
+  } else {
+    if (uiFMEGoodFrameCount > 0)
+      -- uiFMEGoodFrameCount;
+  }
+}
+void UpdateFMESwitch (SDqLayer* pCurLayer) {
+  const uint32_t iFMECost = CountFMECostDown (pCurLayer);
+  const uint32_t iAvMBNormalizedRDcostDown  = iFMECost / (pCurLayer->iMbWidth * pCurLayer->iMbHeight);
+  UpdateFMEGoodFrameCount (iAvMBNormalizedRDcostDown, pCurLayer->pFeatureSearchPreparation->uiFMEGoodFrameCount);
+}
+void UpdateFMESwitchNull (SDqLayer* pCurLayer) {
+}
+/////////////////////////
+// Search function options
+/////////////////////////
+void WelsDiamondCrossSearch (SWelsFuncPtrList* pFunc, SWelsME* pMe, SSlice* pSlice, const int32_t kiEncStride,
+                             const int32_t kiRefStride) {
+  //  Step 1: diamond search
+  WelsDiamondSearch (pFunc, pMe, pSlice, kiEncStride, kiRefStride);
+
+  //  Step 2: CROSS search
+  pMe->uiSadCostThreshold = pMe->pRefFeatureStorage->uiSadCostThreshold[pMe->uiBlockSize];
+  if (pMe->uiSadCost >= pMe->uiSadCostThreshold) {
+    WelsMotionCrossSearch (pFunc, pMe, pSlice, kiEncStride, kiRefStride);
+  }
+}
+void WelsDiamondCrossFeatureSearch (SWelsFuncPtrList* pFunc, SWelsME* pMe, SSlice* pSlice, const int32_t kiEncStride,
+                                    const int32_t kiRefStride) {
+  //  Step 1: diamond search + cross
+  WelsDiamondCrossSearch (pFunc, pMe, pSlice, kiEncStride, kiRefStride);
+
+  // Step 2: FeatureSearch
+  if (pMe->uiSadCost >= pMe->uiSadCostThreshold) {
+    pSlice->uiSliceFMECostDown += pMe->uiSadCost;
+
+    uint32_t uiMaxSearchPoint = INT_MAX;//TODO: change it according to computational-complexity setting
+    SFeatureSearchIn sFeatureSearchIn = {0};
+    if (SetFeatureSearchIn (pFunc, *pMe, pSlice, pMe->pRefFeatureStorage,
+                            kiEncStride, kiRefStride,
+                            &sFeatureSearchIn)) {
+      MotionEstimateFeatureFullSearch (sFeatureSearchIn, uiMaxSearchPoint, pMe);
+    }
+    pSlice->uiSliceFMECostDown -= pMe->uiSadCost;
+  }
+}
+
+
+} // namespace WelsEnc
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cabac.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cabac.cpp
new file mode 100644
index 0000000000..03ea61e647
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cabac.cpp
@@ -0,0 +1,739 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_set_mb_syn_cabac.cpp
+ *
+ * \brief   wrtie cabac syntax
+ *
+ * \date    9/28/2014 Created
+ *
+ *************************************************************************************
+ */
+#include "svc_set_mb_syn.h"
+#include "set_mb_syn_cabac.h"
+#include "svc_enc_golomb.h"
+
+using namespace WelsEnc;
+
+namespace {
+
+static const uint16_t uiSignificantCoeffFlagOffset[5] = {0, 15, 29, 44, 47};
+static const uint16_t uiLastCoeffFlagOffset[5] = {0, 15, 29, 44, 47};
+static const uint16_t uiCoeffAbsLevelMinus1Offset[5] = {0, 10, 20, 30, 39};
+static const uint16_t uiCodecBlockFlagOffset[5] = {0, 4, 8, 12, 16};
+
+
+static void WelsCabacMbType (SCabacCtx* pCabacCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iMbWidth,
+                             EWelsSliceType eSliceType) {
+
+  if (eSliceType == I_SLICE) {
+    uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+    SMB* pLeftMb = pCurMb - 1 ;
+    SMB* pTopMb = pCurMb - iMbWidth;
+    int32_t iCtx = 3;
+    if ((uiNeighborAvail & LEFT_MB_POS) && !IS_INTRA4x4 (pLeftMb->uiMbType))
+      iCtx++;
+    if ((uiNeighborAvail & TOP_MB_POS) && !IS_INTRA4x4 (pTopMb->uiMbType))  //TOP MB
+      iCtx++;
+
+    if (pCurMb->uiMbType == MB_TYPE_INTRA4x4) {
+      WelsCabacEncodeDecision (pCabacCtx, iCtx, 0);
+    } else {
+      int32_t iCbpChroma = pCurMb->uiCbp >> 4;
+      int32_t iCbpLuma   = pCurMb->uiCbp & 15;
+      int32_t iPredMode = g_kiMapModeI16x16[pMbCache->uiLumaI16x16Mode];
+
+      WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+      WelsCabacEncodeTerminate (pCabacCtx, 0);
+      if (iCbpLuma)
+        WelsCabacEncodeDecision (pCabacCtx, 6, 1);
+      else
+        WelsCabacEncodeDecision (pCabacCtx, 6, 0);
+
+      if (iCbpChroma == 0)
+        WelsCabacEncodeDecision (pCabacCtx, 7, 0);
+      else {
+        WelsCabacEncodeDecision (pCabacCtx, 7, 1);
+        WelsCabacEncodeDecision (pCabacCtx, 8, iCbpChroma >> 1);
+      }
+      WelsCabacEncodeDecision (pCabacCtx, 9, iPredMode >> 1);
+      WelsCabacEncodeDecision (pCabacCtx, 10, iPredMode & 1);
+    }
+  } else if (eSliceType == P_SLICE) {
+    uint32_t uiMbType = pCurMb->uiMbType;
+    if (uiMbType == MB_TYPE_16x16) {
+      WelsCabacEncodeDecision (pCabacCtx, 14, 0);
+      WelsCabacEncodeDecision (pCabacCtx, 15, 0);
+      WelsCabacEncodeDecision (pCabacCtx, 16, 0);
+    } else if ((uiMbType == MB_TYPE_16x8) || (uiMbType == MB_TYPE_8x16)) {
+
+      WelsCabacEncodeDecision (pCabacCtx, 14, 0);
+      WelsCabacEncodeDecision (pCabacCtx, 15, 1);
+      WelsCabacEncodeDecision (pCabacCtx, 17, pCurMb->uiMbType == MB_TYPE_16x8);
+
+    } else if ((uiMbType  == MB_TYPE_8x8) || (uiMbType  == MB_TYPE_8x8_REF0)) {
+      WelsCabacEncodeDecision (pCabacCtx, 14, 0);
+      WelsCabacEncodeDecision (pCabacCtx, 15, 0);
+      WelsCabacEncodeDecision (pCabacCtx, 16, 1);
+    } else if (pCurMb->uiMbType == MB_TYPE_INTRA4x4) {
+      WelsCabacEncodeDecision (pCabacCtx, 14, 1);
+      WelsCabacEncodeDecision (pCabacCtx, 17, 0);
+    } else {
+
+      int32_t iCbpChroma = pCurMb->uiCbp >> 4;
+      int32_t iCbpLuma   = pCurMb->uiCbp & 15;
+      int32_t iPredMode = g_kiMapModeI16x16[pMbCache->uiLumaI16x16Mode];
+      //prefix
+      WelsCabacEncodeDecision (pCabacCtx, 14, 1);
+
+      //suffix
+      WelsCabacEncodeDecision (pCabacCtx, 17, 1);
+      WelsCabacEncodeTerminate (pCabacCtx, 0);
+      if (iCbpLuma)
+        WelsCabacEncodeDecision (pCabacCtx, 18, 1);
+      else
+        WelsCabacEncodeDecision (pCabacCtx, 18, 0);
+      if (iCbpChroma == 0)
+        WelsCabacEncodeDecision (pCabacCtx, 19, 0);
+      else {
+        WelsCabacEncodeDecision (pCabacCtx, 19, 1);
+        WelsCabacEncodeDecision (pCabacCtx, 19, iCbpChroma >> 1);
+      }
+      WelsCabacEncodeDecision (pCabacCtx, 20, iPredMode >> 1);
+      WelsCabacEncodeDecision (pCabacCtx, 20, iPredMode & 1);
+
+    }
+  }
+
+}
+void WelsCabacMbIntra4x4PredMode (SCabacCtx* pCabacCtx, SMbCache* pMbCache) {
+
+  for (int32_t iMode = 0; iMode < 16; iMode++) {
+
+    bool bPredFlag = pMbCache->pPrevIntra4x4PredModeFlag[iMode];
+    int8_t iRemMode  = pMbCache->pRemIntra4x4PredModeFlag[iMode];
+
+    if (bPredFlag)
+      WelsCabacEncodeDecision (pCabacCtx, 68, 1);
+    else {
+      WelsCabacEncodeDecision (pCabacCtx, 68, 0);
+
+      WelsCabacEncodeDecision (pCabacCtx, 69, iRemMode & 0x01);
+      WelsCabacEncodeDecision (pCabacCtx, 69, (iRemMode >> 1) & 0x01);
+      WelsCabacEncodeDecision (pCabacCtx, 69, (iRemMode >> 2));
+    }
+  }
+}
+
+void WelsCabacMbIntraChromaPredMode (SCabacCtx* pCabacCtx, SMB* pCurMb, SMbCache* pMbCache, int32_t iMbWidth) {
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  SMB* pLeftMb = pCurMb - 1 ;
+  SMB* pTopMb = pCurMb - iMbWidth;
+
+  int32_t iPredMode = g_kiMapModeIntraChroma[pMbCache->uiChmaI8x8Mode];
+  int32_t iCtx = 64;
+  if ((uiNeighborAvail & LEFT_MB_POS) && g_kiMapModeIntraChroma[pLeftMb->uiChromPredMode] != 0)
+    iCtx++;
+  if ((uiNeighborAvail & TOP_MB_POS) && g_kiMapModeIntraChroma[pTopMb->uiChromPredMode] != 0)
+    iCtx++;
+
+  if (iPredMode == 0) {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 0);
+  } else if (iPredMode == 1) {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 67, 0);
+  } else if (iPredMode == 2) {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 67, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 67, 0);
+  } else {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 67, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 67, 1);
+  }
+}
+
+void WelsCabacMbCbp (SMB* pCurMb, int32_t iMbWidth, SCabacCtx* pCabacCtx) {
+  int32_t iCbpBlockLuma[4] = { (pCurMb->uiCbp) & 1, (pCurMb->uiCbp >> 1) & 1, (pCurMb->uiCbp >> 2) & 1, (pCurMb->uiCbp >> 3) & 1};
+  int32_t iCbpChroma = pCurMb->uiCbp >> 4;
+  int32_t iCbpBlockLeft[4] = {0, 0, 0, 0};
+  int32_t iCbpBlockTop[4] = {0, 0, 0, 0};
+  int32_t iCbpLeftChroma  = 0;
+  int32_t iCbpTopChroma = 0;
+  int32_t iCbp = 0;
+  int32_t iCtx = 0;
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  if (uiNeighborAvail & LEFT_MB_POS) {
+    iCbp = (pCurMb - 1)->uiCbp;
+    iCbpBlockLeft[0] = ! (iCbp & 1);
+    iCbpBlockLeft[1] = ! ((iCbp >> 1) & 1);
+    iCbpBlockLeft[2] = ! ((iCbp >> 2) & 1);
+    iCbpBlockLeft[3] = ! ((iCbp >> 3) & 1);
+    iCbpLeftChroma = iCbp >> 4;
+    if (iCbpLeftChroma)
+      iCtx += 1;
+  }
+  if (uiNeighborAvail & TOP_MB_POS) {
+    iCbp = (pCurMb - iMbWidth)->uiCbp;
+    iCbpBlockTop[0] = ! (iCbp & 1);
+    iCbpBlockTop[1] = ! ((iCbp >> 1) & 1);
+    iCbpBlockTop[2] = ! ((iCbp >> 2) & 1);
+    iCbpBlockTop[3] = ! ((iCbp >> 3) & 1);
+    iCbpTopChroma = iCbp >> 4;
+    if (iCbpTopChroma)
+      iCtx += 2;
+  }
+  WelsCabacEncodeDecision (pCabacCtx, 73 + iCbpBlockLeft[1] + iCbpBlockTop[2] * 2, iCbpBlockLuma[0]);
+  WelsCabacEncodeDecision (pCabacCtx, 73 + !iCbpBlockLuma[0] + iCbpBlockTop[3] * 2, iCbpBlockLuma[1]);
+  WelsCabacEncodeDecision (pCabacCtx, 73 + iCbpBlockLeft[3] + (!iCbpBlockLuma[0]) * 2 , iCbpBlockLuma[2]);
+  WelsCabacEncodeDecision (pCabacCtx, 73 + !iCbpBlockLuma[2] + (!iCbpBlockLuma[1]) * 2, iCbpBlockLuma[3]);
+
+
+  //chroma
+  if (iCbpChroma) {
+    WelsCabacEncodeDecision (pCabacCtx, 77 + iCtx, 1);
+    WelsCabacEncodeDecision (pCabacCtx, 81 + (iCbpLeftChroma >> 1) + ((iCbpTopChroma >> 1) * 2), iCbpChroma > 1);
+  } else {
+    WelsCabacEncodeDecision (pCabacCtx, 77 + iCtx, 0);
+  }
+}
+
+void WelsCabacMbDeltaQp (SMB* pCurMb, SCabacCtx* pCabacCtx, bool bFirstMbInSlice) {
+  SMB* pPrevMb = NULL;
+  int32_t iCtx = 0;
+
+  if (!bFirstMbInSlice) {
+    pPrevMb = pCurMb - 1;
+    pCurMb->iLumaDQp = pCurMb->uiLumaQp - pPrevMb->uiLumaQp;
+
+    if (IS_SKIP (pPrevMb->uiMbType) || ((pPrevMb->uiMbType != MB_TYPE_INTRA16x16) && (!pPrevMb->uiCbp))
+        || (!pPrevMb->iLumaDQp))
+      iCtx = 0;
+    else
+      iCtx = 1;
+  }
+
+  if (pCurMb->iLumaDQp) {
+    int32_t iValue = pCurMb->iLumaDQp < 0 ? (-2 * pCurMb->iLumaDQp) : (2 * pCurMb->iLumaDQp - 1);
+    WelsCabacEncodeDecision (pCabacCtx, 60 + iCtx, 1);
+    if (iValue == 1) {
+      WelsCabacEncodeDecision (pCabacCtx, 60 + 2, 0);
+    } else {
+      WelsCabacEncodeDecision (pCabacCtx, 60 + 2, 1);
+      iValue--;
+      while ((--iValue) > 0)
+        WelsCabacEncodeDecision (pCabacCtx, 60 + 3, 1);
+      WelsCabacEncodeDecision (pCabacCtx, 60 + 3, 0);
+    }
+  } else {
+    WelsCabacEncodeDecision (pCabacCtx, 60 + iCtx, 0);
+  }
+}
+
+void WelsMbSkipCabac (SCabacCtx* pCabacCtx, SMB* pCurMb, int32_t iMbWidth, EWelsSliceType eSliceType,
+                      int16_t bSkipFlag) {
+  int32_t iCtx = (eSliceType == P_SLICE) ? 11 : 24;
+  uint32_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  if (uiNeighborAvail & LEFT_MB_POS) { //LEFT MB
+    if (!IS_SKIP ((pCurMb - 1)->uiMbType))
+      iCtx++;
+  }
+  if (uiNeighborAvail & TOP_MB_POS) { //TOP MB
+    if (!IS_SKIP ((pCurMb - iMbWidth)->uiMbType))
+      iCtx++;
+  }
+  WelsCabacEncodeDecision (pCabacCtx, iCtx, bSkipFlag);
+
+  if (bSkipFlag) {
+    for (int  i = 0; i < 16; i++) {
+      pCurMb->sMvd[i].iMvX = 0;
+      pCurMb->sMvd[i].iMvY = 0;
+    }
+    pCurMb->uiCbp = pCurMb->iCbpDc  = 0;
+  }
+}
+
+void WelsCabacMbRef (SCabacCtx* pCabacCtx, SMB* pCurMb, SMbCache* pMbCache, int16_t iIdx) {
+  SMVComponentUnit* pMvComp = &pMbCache->sMvComponents;
+  const int16_t iRefIdxA = pMvComp->iRefIndexCache[iIdx + 6];
+  const int16_t iRefIdxB = pMvComp->iRefIndexCache[iIdx + 1];
+  int16_t iRefIdx  = pMvComp->iRefIndexCache[iIdx + 7];
+  int16_t iCtx  = 0;
+
+  if ((iRefIdxA > 0) && (!pMbCache->bMbTypeSkip[3]))
+    iCtx++;
+  if ((iRefIdxB > 0) && (!pMbCache->bMbTypeSkip[1]))
+    iCtx += 2;
+
+  while (iRefIdx > 0) {
+    WelsCabacEncodeDecision (pCabacCtx, 54 + iCtx, 1);
+    iCtx = (iCtx >> 2) + 4;
+    iRefIdx--;
+  }
+  WelsCabacEncodeDecision (pCabacCtx, 54 + iCtx, 0);
+}
+
+inline void WelsCabacMbMvdLx (SCabacCtx* pCabacCtx, int32_t sMvd, int32_t iCtx, int32_t iPredMvd) {
+  const int32_t iAbsMvd = WELS_ABS (sMvd);
+  int32_t iCtxInc = 0;
+  int32_t iPrefix = WELS_MIN (iAbsMvd, 9);
+  int32_t i = 0;
+
+  if (iPredMvd > 32)
+    iCtxInc += 2;
+  else if (iPredMvd > 2)
+    iCtxInc += 1;
+
+  if (iPrefix) {
+    if (iPrefix < 9) {
+      WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 1);
+      iCtxInc = 3;
+      for (i = 0; i < iPrefix - 1; i++) {
+        WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 1);
+        if (i < 3)
+          iCtxInc++;
+      }
+      WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 0);
+      WelsCabacEncodeBypassOne (pCabacCtx, sMvd < 0);
+    } else {
+      WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 1);
+      iCtxInc = 3;
+      for (i = 0; i < (9 - 1); i++) {
+        WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 1);
+        if (i < 3)
+          iCtxInc++;
+      }
+      WelsCabacEncodeUeBypass (pCabacCtx, 3, iAbsMvd - 9);
+      WelsCabacEncodeBypassOne (pCabacCtx, sMvd < 0);
+    }
+  } else {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx + iCtxInc, 0);
+  }
+}
+SMVUnitXY WelsCabacMbMvd (SCabacCtx* pCabacCtx, SMB* pCurMb, uint32_t iMbWidth,
+                          SMVUnitXY sCurMv, SMVUnitXY sPredMv, int16_t i4x4ScanIdx) {
+  uint32_t iAbsMvd0, iAbsMvd1;
+  uint8_t uiNeighborAvail = pCurMb->uiNeighborAvail;
+  SMVUnitXY sMvd;
+  SMVUnitXY sMvdLeft;
+  SMVUnitXY sMvdTop;
+
+  sMvdLeft.iMvX = sMvdLeft.iMvY = sMvdTop.iMvX = sMvdTop.iMvY = 0;
+  sMvd.sDeltaMv (sCurMv, sPredMv);
+  if ((i4x4ScanIdx < 4) && (uiNeighborAvail & TOP_MB_POS)) { //top row blocks
+    sMvdTop.sAssignMv ((pCurMb - iMbWidth)->sMvd[i4x4ScanIdx + 12]);
+  } else if (i4x4ScanIdx >= 4) {
+    sMvdTop.sAssignMv (pCurMb->sMvd[i4x4ScanIdx - 4]);
+  }
+  if ((! (i4x4ScanIdx & 0x03)) && (uiNeighborAvail & LEFT_MB_POS)) { //left column blocks
+    sMvdLeft.sAssignMv ((pCurMb - 1)->sMvd[i4x4ScanIdx + 3]);
+  } else if (i4x4ScanIdx & 0x03) {
+    sMvdLeft.sAssignMv (pCurMb->sMvd[i4x4ScanIdx - 1]);
+  }
+
+  iAbsMvd0 = WELS_ABS (sMvdLeft.iMvX) + WELS_ABS (sMvdTop.iMvX);
+  iAbsMvd1 = WELS_ABS (sMvdLeft.iMvY) + WELS_ABS (sMvdTop.iMvY);
+
+  WelsCabacMbMvdLx (pCabacCtx, sMvd.iMvX, 40, iAbsMvd0);
+  WelsCabacMbMvdLx (pCabacCtx, sMvd.iMvY, 47, iAbsMvd1);
+  return sMvd;
+}
+static void WelsCabacSubMbType (SCabacCtx* pCabacCtx, SMB* pCurMb) {
+  for (int32_t i8x8Idx = 0; i8x8Idx < 4; ++i8x8Idx) {
+    uint32_t uiSubMbType = pCurMb->uiSubMbType[i8x8Idx];
+    if (SUB_MB_TYPE_8x8 == uiSubMbType) {
+      WelsCabacEncodeDecision (pCabacCtx, 21, 1);
+      continue;
+    }
+    WelsCabacEncodeDecision (pCabacCtx, 21, 0);
+    if (SUB_MB_TYPE_8x4 == uiSubMbType) {
+      WelsCabacEncodeDecision (pCabacCtx, 22, 0);
+    } else {
+      WelsCabacEncodeDecision (pCabacCtx, 22, 1);
+      WelsCabacEncodeDecision (pCabacCtx, 23, SUB_MB_TYPE_4x8 == uiSubMbType);
+    }
+  } //for
+}
+
+static void WelsCabacSubMbMvd (SCabacCtx* pCabacCtx, SMB* pCurMb, SMbCache* pMbCache, const int kiMbWidth) {
+  SMVUnitXY sMvd;
+  int32_t i8x8Idx, i4x4ScanIdx;
+  for (i8x8Idx = 0; i8x8Idx < 4; ++i8x8Idx) {
+    uint32_t uiSubMbType = pCurMb->uiSubMbType[i8x8Idx];
+    if (SUB_MB_TYPE_8x8 == uiSubMbType) {
+      i4x4ScanIdx = g_kuiMbCountScan4Idx[i8x8Idx << 2];
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, kiMbWidth, pCurMb->sMv[i4x4ScanIdx], pMbCache->sMbMvp[i4x4ScanIdx],
+                             i4x4ScanIdx);
+      pCurMb->sMvd[    i4x4ScanIdx].sAssignMv (sMvd);
+      pCurMb->sMvd[1 + i4x4ScanIdx].sAssignMv (sMvd);
+      pCurMb->sMvd[4 + i4x4ScanIdx].sAssignMv (sMvd);
+      pCurMb->sMvd[5 + i4x4ScanIdx].sAssignMv (sMvd);
+    } else if (SUB_MB_TYPE_4x4 == uiSubMbType) {
+      for (int32_t i4x4Idx = 0; i4x4Idx < 4; ++i4x4Idx) {
+        i4x4ScanIdx = g_kuiMbCountScan4Idx[ (i8x8Idx << 2) + i4x4Idx];
+        sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, kiMbWidth, pCurMb->sMv[i4x4ScanIdx], pMbCache->sMbMvp[i4x4ScanIdx],
+                               i4x4ScanIdx);
+        pCurMb->sMvd[i4x4ScanIdx].sAssignMv (sMvd);
+      }
+    } else if (SUB_MB_TYPE_8x4 == uiSubMbType) {
+      for (int32_t i8x4Idx = 0; i8x4Idx < 2; ++i8x4Idx) {
+        i4x4ScanIdx = g_kuiMbCountScan4Idx[ (i8x8Idx << 2) + (i8x4Idx << 1)];
+        sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, kiMbWidth, pCurMb->sMv[i4x4ScanIdx], pMbCache->sMbMvp[i4x4ScanIdx],
+                               i4x4ScanIdx);
+        pCurMb->sMvd[    i4x4ScanIdx].sAssignMv (sMvd);
+        pCurMb->sMvd[1 + i4x4ScanIdx].sAssignMv (sMvd);
+      }
+    } else if (SUB_MB_TYPE_4x8 == uiSubMbType) {
+      for (int32_t i4x8Idx = 0; i4x8Idx < 2; ++i4x8Idx) {
+        i4x4ScanIdx = g_kuiMbCountScan4Idx[ (i8x8Idx << 2) + i4x8Idx];
+        sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, kiMbWidth, pCurMb->sMv[i4x4ScanIdx], pMbCache->sMbMvp[i4x4ScanIdx],
+                               i4x4ScanIdx);
+        pCurMb->sMvd[    i4x4ScanIdx].sAssignMv (sMvd);
+        pCurMb->sMvd[4 + i4x4ScanIdx].sAssignMv (sMvd);
+      }
+    }
+  }
+}
+
+int16_t WelsGetMbCtxCabac (SMbCache* pMbCache, SMB* pCurMb, uint32_t iMbWidth, ECtxBlockCat eCtxBlockCat,
+                           int16_t iIdx) {
+  int16_t iNzA = -1, iNzB = -1;
+  int8_t* pNonZeroCoeffCount = pMbCache->iNonZeroCoeffCount;
+  int32_t bIntra = IS_INTRA (pCurMb->uiMbType);
+  int32_t iCtxInc = 0;
+  switch (eCtxBlockCat) {
+  case LUMA_AC:
+  case CHROMA_AC:
+  case LUMA_4x4:
+    iNzA = pNonZeroCoeffCount[iIdx - 1];
+    iNzB = pNonZeroCoeffCount[iIdx - 8];
+    break;
+  case LUMA_DC:
+  case CHROMA_DC:
+    if (pCurMb->uiNeighborAvail & LEFT_MB_POS)
+      iNzA = (pCurMb - 1)->iCbpDc & (1 << iIdx);
+    if (pCurMb->uiNeighborAvail & TOP_MB_POS)
+      iNzB = (pCurMb - iMbWidth)->iCbpDc & (1 << iIdx);
+    break;
+  default:
+    break;
+  }
+  if (((iNzA == -1) && bIntra) || (iNzA > 0))
+    iCtxInc += 1;
+  if (((iNzB == -1) && bIntra) || (iNzB > 0))
+    iCtxInc += 2;
+  return 85 + uiCodecBlockFlagOffset[eCtxBlockCat] + iCtxInc;
+}
+
+void  WelsWriteBlockResidualCabac (SMbCache* pMbCache, SMB* pCurMb, uint32_t iMbWidth, SCabacCtx* pCabacCtx,
+                                   ECtxBlockCat eCtxBlockCat, int16_t  iIdx, int16_t iNonZeroCount, int16_t* pBlock, int16_t iEndIdx) {
+  int32_t iCtx = WelsGetMbCtxCabac (pMbCache, pCurMb, iMbWidth, eCtxBlockCat, iIdx);
+  if (iNonZeroCount) {
+    int16_t iLevel[16];
+    const int32_t iCtxSig = 105 + uiSignificantCoeffFlagOffset[eCtxBlockCat];
+    const int32_t iCtxLast = 166 + uiLastCoeffFlagOffset[eCtxBlockCat];
+    const int32_t iCtxLevel = 227 + uiCoeffAbsLevelMinus1Offset[eCtxBlockCat];
+    int32_t iNonZeroIdx = 0;
+    int32_t i = 0;
+
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+    while (1) {
+      if (pBlock[i]) {
+        iLevel[iNonZeroIdx] = pBlock[i];
+
+        iNonZeroIdx++;
+        WelsCabacEncodeDecision (pCabacCtx, iCtxSig + i, 1);
+        if (iNonZeroIdx != iNonZeroCount)
+          WelsCabacEncodeDecision (pCabacCtx, iCtxLast + i, 0);
+        else {
+          WelsCabacEncodeDecision (pCabacCtx, iCtxLast + i, 1);
+          break;
+        }
+      } else
+        WelsCabacEncodeDecision (pCabacCtx, iCtxSig + i, 0);
+      i++;
+      if (i == iEndIdx) {
+        iLevel[iNonZeroIdx] = pBlock[i];
+        iNonZeroIdx++;
+        break;
+      }
+    }
+
+    int32_t iNumAbsLevelGt1 = 0;
+    int32_t iCtx1 = iCtxLevel + 1;
+
+    do {
+      int32_t iPrefix = 0;
+      iNonZeroIdx--;
+      iPrefix = WELS_ABS (iLevel[iNonZeroIdx]) - 1;
+      if (iPrefix) {
+        iPrefix = WELS_MIN (iPrefix, 14);
+        iCtx = WELS_MIN (iCtxLevel + 4, iCtx1);
+        WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+        iNumAbsLevelGt1++;
+        iCtx = iCtxLevel + 4 + WELS_MIN (5 - (eCtxBlockCat == CHROMA_DC), iNumAbsLevelGt1);
+        for (i = 1; i < iPrefix; i++)
+          WelsCabacEncodeDecision (pCabacCtx, iCtx, 1);
+        if (WELS_ABS (iLevel[iNonZeroIdx]) < 15)
+          WelsCabacEncodeDecision (pCabacCtx, iCtx, 0);
+        else
+          WelsCabacEncodeUeBypass (pCabacCtx, 0, WELS_ABS (iLevel[iNonZeroIdx]) - 15);
+        iCtx1 = iCtxLevel;
+      } else {
+        iCtx = WELS_MIN (iCtxLevel + 4, iCtx1);
+        WelsCabacEncodeDecision (pCabacCtx, iCtx, 0);
+        iCtx1 += iNumAbsLevelGt1 == 0;
+      }
+      WelsCabacEncodeBypassOne (pCabacCtx, iLevel[iNonZeroIdx] < 0);
+    } while (iNonZeroIdx > 0);
+
+  } else {
+    WelsCabacEncodeDecision (pCabacCtx, iCtx, 0);
+  }
+
+
+}
+int32_t WelsCalNonZeroCount2x2Block (int16_t* pBlock) {
+  return (pBlock[0] != 0)
+         + (pBlock[1] != 0)
+         + (pBlock[2] != 0)
+         + (pBlock[3] != 0);
+}
+int32_t WelsWriteMbResidualCabac (SWelsFuncPtrList* pFuncList, SSlice* pSlice, SMbCache* sMbCacheInfo, SMB* pCurMb,
+                                  SCabacCtx* pCabacCtx,
+                                  int16_t iMbWidth, uint32_t uiChromaQpIndexOffset) {
+
+  const uint16_t uiMbType = pCurMb->uiMbType;
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  int16_t i = 0;
+  int8_t* pNonZeroCoeffCount = pMbCache->iNonZeroCoeffCount;
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+  const int32_t iSliceFirstMbXY = pSliceHeadExt->sSliceHeader.iFirstMbInSlice;
+
+
+  pCurMb->iCbpDc = 0;
+  pCurMb->iLumaDQp = 0;
+
+  if ((pCurMb->uiCbp > 0) || (uiMbType == MB_TYPE_INTRA16x16)) {
+    int32_t iCbpChroma = pCurMb->uiCbp >> 4;
+    int32_t iCbpLuma   = pCurMb->uiCbp & 15;
+
+    pCurMb->iLumaDQp = pCurMb->uiLumaQp - pSlice->uiLastMbQp;
+    WelsCabacMbDeltaQp (pCurMb, pCabacCtx, (pCurMb->iMbXY == iSliceFirstMbXY));
+    pSlice->uiLastMbQp = pCurMb->uiLumaQp;
+
+    if (uiMbType == MB_TYPE_INTRA16x16) {
+      //Luma DC
+      int iNonZeroCount = pFuncList->pfGetNoneZeroCount (pMbCache->pDct->iLumaI16x16Dc);
+      WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, LUMA_DC, 0, iNonZeroCount,
+                                   pMbCache->pDct->iLumaI16x16Dc, 15);
+      if (iNonZeroCount)
+        pCurMb->iCbpDc |= 1;
+      //Luma AC
+
+      if (iCbpLuma) {
+        for (i = 0; i < 16; i++) {
+          int32_t iIdx = g_kuiCache48CountScan4Idx[i];
+          WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, LUMA_AC, iIdx,
+                                       pNonZeroCoeffCount[iIdx], pMbCache->pDct->iLumaBlock[i], 14);
+        }
+      }
+    } else {
+      //Luma AC
+      for (i = 0; i < 16; i++) {
+        if (iCbpLuma & (1 << (i >> 2))) {
+          int32_t iIdx = g_kuiCache48CountScan4Idx[i];
+          WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, LUMA_4x4, iIdx,
+                                       pNonZeroCoeffCount[iIdx], pMbCache->pDct->iLumaBlock[i], 15);
+        }
+
+      }
+    }
+
+    if (iCbpChroma) {
+      int32_t iNonZeroCount = 0;
+      //chroma DC
+      iNonZeroCount = WelsCalNonZeroCount2x2Block (pMbCache->pDct->iChromaDc[0]);
+      if (iNonZeroCount)
+        pCurMb->iCbpDc |= 0x2;
+      WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, CHROMA_DC, 1, iNonZeroCount,
+                                   pMbCache->pDct->iChromaDc[0], 3);
+
+      iNonZeroCount = WelsCalNonZeroCount2x2Block (pMbCache->pDct->iChromaDc[1]);
+      if (iNonZeroCount)
+        pCurMb->iCbpDc |= 0x4;
+      WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, CHROMA_DC, 2, iNonZeroCount,
+                                   pMbCache->pDct->iChromaDc[1], 3);
+      if (iCbpChroma & 0x02) {
+        const uint8_t* g_kuiCache48CountScan4Idx_16base = &g_kuiCache48CountScan4Idx[16];
+        //Cb AC
+        for (i = 0; i < 4; i++) {
+          int32_t iIdx = g_kuiCache48CountScan4Idx_16base[i];
+          WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, CHROMA_AC, iIdx,
+                                       pNonZeroCoeffCount[iIdx], pMbCache->pDct->iChromaBlock[i], 14);
+
+        }
+
+        //Cr AC
+
+        for (i = 0; i < 4; i++) {
+          int32_t iIdx = 24 + g_kuiCache48CountScan4Idx_16base[i];
+          WelsWriteBlockResidualCabac (pMbCache, pCurMb, iMbWidth, pCabacCtx, CHROMA_AC, iIdx,
+                                       pNonZeroCoeffCount[iIdx], pMbCache->pDct->iChromaBlock[4 + i], 14);
+        }
+      }
+    }
+  } else {
+    pCurMb->iLumaDQp = 0;
+    pCurMb->uiLumaQp = pSlice->uiLastMbQp;
+    pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + uiChromaQpIndexOffset)];
+  }
+  return 0;
+}
+
+} // anon ns.
+
+namespace WelsEnc {
+
+void WelsInitSliceCabac (sWelsEncCtx* pEncCtx, SSlice* pSlice) {
+  /* alignment needed */
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  BsAlign (pBs);
+
+  /* init cabac */
+  WelsCabacContextInit (pEncCtx, &pSlice->sCabacCtx, pSlice->iCabacInitIdc);
+  WelsCabacEncodeInit (&pSlice->sCabacCtx, pBs->pCurBuf, pBs->pEndBuf);
+}
+
+int32_t WelsSpatialWriteMbSynCabac (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SCabacCtx* pCabacCtx = &pSlice->sCabacCtx;
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  const uint16_t uiMbType = pCurMb->uiMbType;
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+  uint32_t uiNumRefIdxL0Active = pSliceHeadExt->sSliceHeader.uiNumRefIdxL0Active - 1;
+  const int32_t iSliceFirstMbXY = pSliceHeadExt->sSliceHeader.iFirstMbInSlice;
+  int16_t i = 0;
+  int16_t iMbWidth = pEncCtx->pCurDqLayer->iMbWidth;
+  uint32_t uiChromaQpIndexOffset = pEncCtx->pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+  SMVUnitXY sMvd;
+  int32_t iRet = 0;
+  if (pCurMb->iMbXY > iSliceFirstMbXY)
+    WelsCabacEncodeTerminate (&pSlice->sCabacCtx, 0);
+
+  if (IS_SKIP (pCurMb->uiMbType)) {
+    pCurMb->uiLumaQp = pSlice->uiLastMbQp;
+    pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + uiChromaQpIndexOffset)];
+    WelsMbSkipCabac (&pSlice->sCabacCtx, pCurMb, iMbWidth, pEncCtx->eSliceType, 1);
+
+  } else {
+    //skip flag
+    if (pEncCtx->eSliceType != I_SLICE)
+      WelsMbSkipCabac (&pSlice->sCabacCtx, pCurMb, iMbWidth, pEncCtx->eSliceType, 0);
+
+    //write mb type
+    WelsCabacMbType (pCabacCtx, pCurMb, pMbCache, iMbWidth, pEncCtx->eSliceType);
+
+    if (IS_INTRA (uiMbType)) {
+      if (uiMbType == MB_TYPE_INTRA4x4) {
+        WelsCabacMbIntra4x4PredMode (pCabacCtx, pMbCache);
+      }
+      WelsCabacMbIntraChromaPredMode (pCabacCtx, pCurMb, pMbCache, iMbWidth);
+      sMvd.iMvX = sMvd.iMvY = 0;
+      for (i = 0; i < 16; ++i) {
+        pCurMb->sMvd[i].sAssignMv (sMvd);
+      }
+
+    } else if (uiMbType == MB_TYPE_16x16) {
+
+      if (uiNumRefIdxL0Active > 0) {
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 0);
+      }
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, iMbWidth, pCurMb->sMv[0], pMbCache->sMbMvp[0], 0);
+
+      for (i = 0; i < 16; ++i) {
+        pCurMb->sMvd[i].sAssignMv (sMvd);
+      }
+
+    } else if (uiMbType == MB_TYPE_16x8) {
+      if (uiNumRefIdxL0Active > 0) {
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 0);
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 12);
+      }
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, iMbWidth , pCurMb->sMv[0], pMbCache->sMbMvp[0], 0);
+      for (i = 0; i < 8; ++i) {
+        pCurMb->sMvd[i].sAssignMv (sMvd);
+      }
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, iMbWidth, pCurMb->sMv[8], pMbCache->sMbMvp[1], 8);
+      for (i = 8; i < 16; ++i) {
+        pCurMb->sMvd[i].sAssignMv (sMvd);
+      }
+    } else  if (uiMbType == MB_TYPE_8x16) {
+      if (uiNumRefIdxL0Active > 0) {
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 0);
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 2);
+      }
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, iMbWidth, pCurMb->sMv[0], pMbCache->sMbMvp[0], 0);
+      for (i = 0; i < 16; i += 4) {
+        pCurMb->sMvd[i    ].sAssignMv (sMvd);
+        pCurMb->sMvd[i + 1].sAssignMv (sMvd);
+      }
+      sMvd = WelsCabacMbMvd (pCabacCtx, pCurMb, iMbWidth,  pCurMb->sMv[2], pMbCache->sMbMvp[1], 2);
+      for (i = 0; i < 16; i += 4) {
+        pCurMb->sMvd[i + 2].sAssignMv (sMvd);
+        pCurMb->sMvd[i + 3].sAssignMv (sMvd);
+      }
+    } else if ((uiMbType == MB_TYPE_8x8) || (uiMbType == MB_TYPE_8x8_REF0)) {
+      //write sub_mb_type
+      WelsCabacSubMbType (pCabacCtx, pCurMb);
+
+      if (uiNumRefIdxL0Active > 0) {
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 0);
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 2);
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 12);
+        WelsCabacMbRef (pCabacCtx, pCurMb, pMbCache, 14);
+      }
+      //write sub8x8 mvd
+      WelsCabacSubMbMvd (pCabacCtx, pCurMb, pMbCache, iMbWidth);
+    }
+    if (uiMbType != MB_TYPE_INTRA16x16) {
+      WelsCabacMbCbp (pCurMb, iMbWidth, pCabacCtx);
+    }
+    iRet = WelsWriteMbResidualCabac (pEncCtx->pFuncList, pSlice, pMbCache, pCurMb, pCabacCtx, iMbWidth,
+                                     uiChromaQpIndexOffset);
+  }
+  if (!IS_INTRA (pCurMb->uiMbType))
+    pCurMb->uiChromPredMode = 0;
+
+  return iRet;
+}
+
+
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
new file mode 100644
index 0000000000..05944fcdf9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/svc_set_mb_syn_cavlc.cpp
@@ -0,0 +1,422 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    svc_set_mb_syn_cavlc.h
+ *
+ * \brief   Seting all syntax elements of mb and decoding residual with cavlc
+ *
+ * \date    2009.8.12 Created
+ *
+ *************************************************************************************
+ */
+
+#include "vlc_encoder.h"
+#include "ls_defines.h"
+#include "svc_set_mb_syn.h"
+
+namespace WelsEnc {
+const uint32_t g_kuiIntra4x4CbpMap[48] = {
+  3, 29, 30, 17, 31, 18, 37,  8, 32, 38, 19,  9, 20, 10, 11, 2, //15
+  16, 33, 34, 21, 35, 22, 39,  4, 36, 40, 23,  5, 24,  6,  7, 1, //31
+  41, 42, 43, 25, 44, 26, 46, 12, 45, 47, 27, 13, 28, 14, 15, 0  //47
+};
+
+const uint32_t g_kuiInterCbpMap[48] = {
+  0,  2,  3,  7,  4,  8, 17, 13,  5, 18,  9, 14, 10, 15, 16, 11, //15
+  1, 32, 33, 36, 34, 37, 44, 40, 35, 45, 38, 41, 39, 42, 43, 19, //31
+  6, 24, 25, 20, 26, 21, 46, 28, 27, 47, 22, 29, 23, 30, 31, 12 //47
+};
+
+//============================Enhance Layer CAVLC Writing===========================
+void WelsSpatialWriteMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+  int32_t iNumRefIdxl0ActiveMinus1 = pSliceHeadExt->sSliceHeader.uiNumRefIdxL0Active - 1;
+
+  Mb_Type uiMbType = pCurMb->uiMbType;
+  int32_t iCbpChroma = pCurMb->uiCbp >> 4;
+  int32_t iCbpLuma   = pCurMb->uiCbp & 15;
+  int32_t i = 0;
+
+  SMVUnitXY sMvd[2];
+  bool* pPredFlag;
+  int8_t* pRemMode;
+
+  int32_t iMbOffset = 0;
+
+  switch (pSliceHeadExt->sSliceHeader.eSliceType) {
+  case I_SLICE:
+    iMbOffset = 0;
+    break;
+  case P_SLICE:
+    iMbOffset = 5;
+    break;
+  default:
+    return;
+  }
+
+  switch (uiMbType) {
+  case MB_TYPE_INTRA4x4:
+    /* mb type */
+    BsWriteUE (pBs, iMbOffset + 0);
+
+    /* prediction: luma */
+    pPredFlag = &pMbCache->pPrevIntra4x4PredModeFlag[0];
+    pRemMode  = &pMbCache->pRemIntra4x4PredModeFlag[0];
+    do {
+      BsWriteOneBit (pBs, *pPredFlag);   /* b_prev_intra4x4_pred_mode */
+
+      if (!*pPredFlag) {
+        BsWriteBits (pBs, 3, *pRemMode);
+      }
+
+      pPredFlag++;
+      pRemMode++;
+      ++ i;
+    } while (i < 16);
+
+    /* prediction: chroma */
+    BsWriteUE (pBs, g_kiMapModeIntraChroma[pMbCache->uiChmaI8x8Mode]);
+
+    break;
+
+  case MB_TYPE_INTRA16x16:
+    /* mb type */
+    BsWriteUE (pBs, 1 + iMbOffset + g_kiMapModeI16x16[pMbCache->uiLumaI16x16Mode] + (iCbpChroma << 2) +
+               (iCbpLuma == 0 ? 0 : 12));
+
+    /* prediction: chroma */
+    BsWriteUE (pBs, g_kiMapModeIntraChroma[pMbCache->uiChmaI8x8Mode]);
+
+    break;
+
+  case MB_TYPE_16x16:
+    BsWriteUE (pBs, 0); //uiMbType
+    sMvd[0].sDeltaMv (pCurMb->sMv[0], pMbCache->sMbMvp[0]);
+
+    if (iNumRefIdxl0ActiveMinus1 > 0) {
+      BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[0]);
+    }
+
+    BsWriteSE (pBs, sMvd[0].iMvX);
+    BsWriteSE (pBs, sMvd[0].iMvY);
+
+    break;
+
+  case MB_TYPE_16x8:
+    BsWriteUE (pBs, 1); //uiMbType
+
+    sMvd[0].sDeltaMv (pCurMb->sMv[0], pMbCache->sMbMvp[0]);
+    sMvd[1].sDeltaMv (pCurMb->sMv[8], pMbCache->sMbMvp[1]);
+
+    if (iNumRefIdxl0ActiveMinus1 > 0) {
+      BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[0]);
+      BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[2]);
+    }
+    BsWriteSE (pBs, sMvd[0].iMvX); //block0
+    BsWriteSE (pBs, sMvd[0].iMvY);
+    BsWriteSE (pBs, sMvd[1].iMvX); //block1
+    BsWriteSE (pBs, sMvd[1].iMvY);
+
+    break;
+
+  case MB_TYPE_8x16:
+    BsWriteUE (pBs, 2); //uiMbType
+
+    sMvd[0].sDeltaMv (pCurMb->sMv[0], pMbCache->sMbMvp[0]);
+    sMvd[1].sDeltaMv (pCurMb->sMv[2], pMbCache->sMbMvp[1]);
+
+    if (iNumRefIdxl0ActiveMinus1 > 0) {
+      BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[0]);
+      BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[1]);
+    }
+    BsWriteSE (pBs, sMvd[0].iMvX); //block0
+    BsWriteSE (pBs, sMvd[0].iMvY);
+    BsWriteSE (pBs, sMvd[1].iMvX); //block1
+    BsWriteSE (pBs, sMvd[1].iMvY);
+
+    break;
+  }
+}
+
+void WelsSpatialWriteSubMbPred (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  SSliceHeaderExt* pSliceHeadExt = &pSlice->sSliceHeaderExt;
+
+  int32_t iNumRefIdxl0ActiveMinus1 = pSliceHeadExt->sSliceHeader.uiNumRefIdxL0Active - 1;
+  int32_t i;
+
+  bool bSubRef0 = false;
+  const uint8_t* kpScan4 = & (g_kuiMbCountScan4Idx[0]);
+
+  /* mb type */
+  if (LD32 (pCurMb->pRefIndex) == 0) {
+    BsWriteUE (pBs, 4);
+    bSubRef0 = false;
+  } else {
+    BsWriteUE (pBs, 3);
+    bSubRef0 = true;
+  }
+
+  //step 1: sub_mb_type
+  for (i = 0; i < 4; i++) {
+    switch (pCurMb->uiSubMbType[i]) {
+    case SUB_MB_TYPE_8x8:
+      BsWriteUE (pBs, 0);
+      break;
+    case SUB_MB_TYPE_8x4:
+      BsWriteUE (pBs, 1);
+      break;
+    case SUB_MB_TYPE_4x8:
+      BsWriteUE (pBs, 2);
+      break;
+    case SUB_MB_TYPE_4x4:
+      BsWriteUE (pBs, 3);
+      break;
+    default: //should not enter
+      break;
+    }
+  }
+
+  //step 2: get and write uiRefIndex and sMvd
+  if (iNumRefIdxl0ActiveMinus1 > 0 && bSubRef0) {
+    BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[0]);
+    BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[1]);
+    BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[2]);
+    BsWriteTE (pBs, iNumRefIdxl0ActiveMinus1, pCurMb->pRefIndex[3]);
+  }
+  //write sMvd
+  for (i = 0; i < 4; i++) {
+    uint32_t uiSubMbType = pCurMb->uiSubMbType[i];
+    if (SUB_MB_TYPE_8x8 == uiSubMbType) {
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvX - pMbCache->sMbMvp[*kpScan4].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvY - pMbCache->sMbMvp[*kpScan4].iMvY);
+    } else if (SUB_MB_TYPE_4x4 == uiSubMbType) {
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvX - pMbCache->sMbMvp[*kpScan4].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvY - pMbCache->sMbMvp[*kpScan4].iMvY);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 1)].iMvX - pMbCache->sMbMvp[* (kpScan4 + 1)].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 1)].iMvY - pMbCache->sMbMvp[* (kpScan4 + 1)].iMvY);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 2)].iMvX - pMbCache->sMbMvp[* (kpScan4 + 2)].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 2)].iMvY - pMbCache->sMbMvp[* (kpScan4 + 2)].iMvY);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 3)].iMvX - pMbCache->sMbMvp[* (kpScan4 + 3)].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 3)].iMvY - pMbCache->sMbMvp[* (kpScan4 + 3)].iMvY);
+    } else if (SUB_MB_TYPE_8x4 == uiSubMbType) {
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvX - pMbCache->sMbMvp[*kpScan4].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvY - pMbCache->sMbMvp[*kpScan4].iMvY);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 2)].iMvX - pMbCache->sMbMvp[* (kpScan4 + 2)].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 2)].iMvY - pMbCache->sMbMvp[* (kpScan4 + 2)].iMvY);
+    } else if (SUB_MB_TYPE_4x8 == uiSubMbType) {
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvX - pMbCache->sMbMvp[*kpScan4].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[*kpScan4].iMvY - pMbCache->sMbMvp[*kpScan4].iMvY);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 1)].iMvX - pMbCache->sMbMvp[* (kpScan4 + 1)].iMvX);
+      BsWriteSE (pBs, pCurMb->sMv[* (kpScan4 + 1)].iMvY - pMbCache->sMbMvp[* (kpScan4 + 1)].iMvY);
+    }
+    kpScan4 += 4;
+  }
+}
+
+int32_t CheckBitstreamBuffer (const uint32_t kuiSliceIdx, sWelsEncCtx* pEncCtx, SBitStringAux* pBs) {
+  const intX_t iLeftLength = pBs->pEndBuf - pBs->pCurBuf - 1;
+  assert (iLeftLength > 0);
+
+  if (iLeftLength < MAX_MACROBLOCK_SIZE_IN_BYTE_x2) {
+    return ENC_RETURN_VLCOVERFLOWFOUND;//ENC_RETURN_MEMALLOCERR;
+    //TODO: call the realloc&copy instead
+  }
+  return ENC_RETURN_SUCCESS;
+}
+
+//============================Base Layer CAVLC Writing===============================
+int32_t WelsSpatialWriteMbSyn (sWelsEncCtx* pEncCtx, SSlice* pSlice, SMB* pCurMb) {
+  SBitStringAux* pBs = pSlice->pSliceBsa;
+  SMbCache* pMbCache = &pSlice->sMbCacheInfo;
+  const uint8_t kuiChromaQpIndexOffset = pEncCtx->pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset;
+
+  if (IS_SKIP (pCurMb->uiMbType)) {
+    pCurMb->uiLumaQp = pSlice->uiLastMbQp;
+    pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp + kuiChromaQpIndexOffset)];
+
+    pSlice->iMbSkipRun++;
+    return ENC_RETURN_SUCCESS;
+  } else {
+    if (pEncCtx->eSliceType != I_SLICE) {
+      BsWriteUE (pBs, pSlice->iMbSkipRun);
+      pSlice->iMbSkipRun = 0;
+    }
+    /* Step 1: write mb type and pred */
+    if (IS_Inter_8x8 (pCurMb->uiMbType)) {
+      WelsSpatialWriteSubMbPred (pEncCtx, pSlice, pCurMb);
+    } else {
+      WelsSpatialWriteMbPred (pEncCtx, pSlice, pCurMb);
+    }
+
+    /* Step 2: write coded block patern */
+    if (IS_INTRA4x4 (pCurMb->uiMbType)) {
+      BsWriteUE (pBs, g_kuiIntra4x4CbpMap[pCurMb->uiCbp]);
+    } else if (!IS_INTRA16x16 (pCurMb->uiMbType)) {
+      BsWriteUE (pBs, g_kuiInterCbpMap[pCurMb->uiCbp]);
+    }
+
+    /* Step 3: write QP and residual */
+    if (pCurMb->uiCbp > 0 || IS_INTRA16x16 (pCurMb->uiMbType)) {
+      const int32_t kiDeltaQp = pCurMb->uiLumaQp - pSlice->uiLastMbQp;
+      pSlice->uiLastMbQp = pCurMb->uiLumaQp;
+
+      BsWriteSE (pBs, kiDeltaQp);
+      if (WelsWriteMbResidual (pEncCtx->pFuncList, pMbCache, pCurMb, pBs))
+        return ENC_RETURN_VLCOVERFLOWFOUND;
+    } else {
+      pCurMb->uiLumaQp = pSlice->uiLastMbQp;
+      pCurMb->uiChromaQp = g_kuiChromaQpTable[CLIP3_QP_0_51 (pCurMb->uiLumaQp +
+                                              pEncCtx->pCurDqLayer->sLayerInfo.pPpsP->uiChromaQpIndexOffset)];
+    }
+
+    /* Step 4: Check the left buffer */
+    return CheckBitstreamBuffer (pSlice->iSliceIdx, pEncCtx, pBs);
+  }
+}
+
+int32_t WelsWriteMbResidual (SWelsFuncPtrList* pFuncList, SMbCache* sMbCacheInfo, SMB* pCurMb, SBitStringAux* pBs) {
+  int32_t i;
+  Mb_Type uiMbType              = pCurMb->uiMbType;
+  const int32_t kiCbpChroma     = pCurMb->uiCbp >> 4;
+  const int32_t kiCbpLuma       = pCurMb->uiCbp & 0x0F;
+  int8_t* pNonZeroCoeffCount    = sMbCacheInfo->iNonZeroCoeffCount;
+  int16_t* pBlock;
+  int8_t iA, iB, iC;
+
+  if (IS_INTRA16x16 (uiMbType)) {
+    /* DC luma */
+    iA = pNonZeroCoeffCount[8];
+    iB = pNonZeroCoeffCount[ 1];
+    WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+    if (WriteBlockResidualCavlc (pFuncList, sMbCacheInfo->pDct->iLumaI16x16Dc, 15, 1, LUMA_4x4, iC, pBs))
+      return ENC_RETURN_VLCOVERFLOWFOUND;
+
+    /* AC Luma */
+    if (kiCbpLuma) {
+      pBlock = sMbCacheInfo->pDct->iLumaBlock[0];
+
+      for (i = 0; i < 16; i++) {
+        int32_t iIdx = g_kuiCache48CountScan4Idx[i];
+        iA = pNonZeroCoeffCount[iIdx - 1];
+        iB = pNonZeroCoeffCount[iIdx - 8];
+        WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+        if (WriteBlockResidualCavlc (pFuncList, pBlock, 14, pNonZeroCoeffCount[iIdx] > 0, LUMA_AC, iC, pBs))
+          return ENC_RETURN_VLCOVERFLOWFOUND;
+        pBlock += 16;
+      }
+    }
+  } else {
+    /* Luma DC AC */
+    if (kiCbpLuma) {
+      pBlock = sMbCacheInfo->pDct->iLumaBlock[0];
+
+      for (i = 0; i < 16; i += 4) {
+        if (kiCbpLuma & (1 << (i >> 2))) {
+          int32_t iIdx = g_kuiCache48CountScan4Idx[i];
+          const int8_t kiA = pNonZeroCoeffCount[iIdx];
+          const int8_t kiB = pNonZeroCoeffCount[iIdx + 1];
+          const int8_t kiC = pNonZeroCoeffCount[iIdx + 8];
+          const int8_t kiD = pNonZeroCoeffCount[iIdx + 9];
+          iA = pNonZeroCoeffCount[iIdx - 1];
+          iB = pNonZeroCoeffCount[iIdx - 8];
+          WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+          if (WriteBlockResidualCavlc (pFuncList, pBlock, 15, kiA > 0, LUMA_4x4, iC, pBs))
+            return ENC_RETURN_VLCOVERFLOWFOUND;
+
+          iA = kiA;
+          iB = pNonZeroCoeffCount[iIdx - 7];
+          WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+          if (WriteBlockResidualCavlc (pFuncList, pBlock + 16, 15, kiB > 0, LUMA_4x4, iC, pBs))
+            return ENC_RETURN_VLCOVERFLOWFOUND;
+
+          iA = pNonZeroCoeffCount[iIdx + 7];
+          iB = kiA;
+          WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+          if (WriteBlockResidualCavlc (pFuncList, pBlock + 32, 15, kiC > 0, LUMA_4x4, iC, pBs))
+            return ENC_RETURN_VLCOVERFLOWFOUND;
+
+          iA = kiC;
+          iB = kiB;
+          WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+          if (WriteBlockResidualCavlc (pFuncList, pBlock + 48, 15, kiD > 0, LUMA_4x4, iC, pBs))
+            return ENC_RETURN_VLCOVERFLOWFOUND;
+        }
+        pBlock += 64;
+      }
+    }
+  }
+
+  if (kiCbpChroma) {
+    /* Chroma DC residual present */
+    pBlock = sMbCacheInfo->pDct->iChromaDc[0]; // Cb
+    if (WriteBlockResidualCavlc (pFuncList, pBlock, 3, 1, CHROMA_DC, CHROMA_DC_NC_OFFSET, pBs))
+      return ENC_RETURN_VLCOVERFLOWFOUND;
+
+    pBlock += 4; // Cr
+    if (WriteBlockResidualCavlc (pFuncList, pBlock, 3, 1, CHROMA_DC, CHROMA_DC_NC_OFFSET, pBs))
+      return ENC_RETURN_VLCOVERFLOWFOUND;
+
+    /* Chroma AC residual present */
+    if (kiCbpChroma & 0x02) {
+      const uint8_t* kCache48CountScan4Idx16base = &g_kuiCache48CountScan4Idx[16];
+      pBlock = sMbCacheInfo->pDct->iChromaBlock[0]; // Cb
+
+      for (i = 0; i < 4; i++) {
+        int32_t iIdx = kCache48CountScan4Idx16base[i];
+        iA = pNonZeroCoeffCount[iIdx - 1];
+        iB = pNonZeroCoeffCount[iIdx - 8];
+        WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+        if (WriteBlockResidualCavlc (pFuncList, pBlock, 14, pNonZeroCoeffCount[iIdx] > 0, CHROMA_AC, iC, pBs))
+          return ENC_RETURN_VLCOVERFLOWFOUND;
+        pBlock += 16;
+      }
+
+      pBlock = sMbCacheInfo->pDct->iChromaBlock[4]; // Cr
+
+      for (i = 0; i < 4; i++) {
+        int32_t iIdx = 24 + kCache48CountScan4Idx16base[i];
+        iA = pNonZeroCoeffCount[iIdx - 1];
+        iB = pNonZeroCoeffCount[iIdx - 8];
+        WELS_NON_ZERO_COUNT_AVERAGE (iC, iA, iB);
+        if (WriteBlockResidualCavlc (pFuncList, pBlock, 14, pNonZeroCoeffCount[iIdx] > 0, CHROMA_AC, iC, pBs))
+          return ENC_RETURN_VLCOVERFLOWFOUND;
+        pBlock += 16;
+      }
+    }
+  }
+  return 0;
+}
+
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_preprocess.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_preprocess.cpp
new file mode 100644
index 0000000000..6ac79169af
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_preprocess.cpp
@@ -0,0 +1,1458 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "wels_preprocess.h"
+#include "picture_handle.h"
+#include "encoder_context.h"
+#include "utils.h"
+#include "encoder.h"
+
+namespace {
+
+void ClearEndOfLinePadding (uint8_t* pData, int32_t iStride, int32_t iWidth, int32_t iHeight) {
+  if (iWidth < iStride) {
+    for (int32_t i = 0; i < iHeight; ++i)
+      memset (pData + i * iStride + iWidth, 0, iStride - iWidth);
+  }
+}
+
+} // anon ns.
+
+namespace WelsEnc {
+
+
+
+//***** entry API declaration ************************************************************************//
+
+int32_t WelsInitScaledPic (SWelsSvcCodingParam* pParam,  Scaled_Picture*  pScaledPic, CMemoryAlign* pMemoryAlign);
+bool  JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPic);
+void    FreeScaledPic (Scaled_Picture*  pScaledPic, CMemoryAlign* pMemoryAlign);
+void  WelsMoveMemory_c (uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV,  int32_t iDstStrideY, int32_t iDstStrideUV,
+                        uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iSrcStrideY, int32_t iSrcStrideUV, int32_t iWidth,
+                        int32_t iHeight);
+
+//******* table definition ***********************************************************************//
+const uint8_t g_kuiRefTemporalIdx[MAX_TEMPORAL_LEVEL][MAX_GOP_SIZE] = {
+  {  0, }, // 0
+  {  0,  0, }, // 1
+  {  0,  0,  0,  1, }, // 2
+  {  0,  0,  0,  2,  0,  1,  1,  2, }, // 3
+};
+
+const int32_t g_kiPixMapSizeInBits = sizeof (uint8_t) * 8;
+
+
+inline  void   WelsUpdateSpatialIdxMap (sWelsEncCtx* pEncCtx, const int32_t iPos, SPicture* const pPic,
+                                        const int32_t iDidx) {
+  pEncCtx->sSpatialIndexMap[iPos].pSrc = pPic;
+  pEncCtx->sSpatialIndexMap[iPos].iDid = iDidx;
+}
+
+
+/***************************************************************************
+*
+*   implement of the interface
+*
+***************************************************************************/
+
+
+
+CWelsPreProcess* CWelsPreProcess::CreatePreProcess (sWelsEncCtx* pEncCtx) {
+
+  CWelsPreProcess* pPreProcess = NULL;
+  switch (pEncCtx->pSvcParam->iUsageType) {
+  case SCREEN_CONTENT_REAL_TIME:
+    pPreProcess = WELS_NEW_OP (CWelsPreProcessScreen (pEncCtx),
+                               CWelsPreProcessScreen);
+    break;
+  default:
+    pPreProcess = WELS_NEW_OP (CWelsPreProcessVideo (pEncCtx),
+                               CWelsPreProcessVideo);
+    break;
+
+  }
+  WELS_VERIFY_RETURN_IF (NULL, NULL == pPreProcess)
+  return pPreProcess;
+}
+
+
+CWelsPreProcess::CWelsPreProcess (sWelsEncCtx* pEncCtx) {
+  m_pInterfaceVp = NULL;
+  m_bInitDone = false;
+  m_pEncCtx = pEncCtx;
+  memset (&m_sScaledPicture, 0, sizeof (m_sScaledPicture));
+  memset (m_pSpatialPic, 0, sizeof (m_pSpatialPic));
+  memset (m_uiSpatialLayersInTemporal, 0, sizeof (m_uiSpatialLayersInTemporal));
+  memset (m_uiSpatialPicNum, 0, sizeof (m_uiSpatialPicNum));
+}
+
+CWelsPreProcess::~CWelsPreProcess() {
+  FreeScaledPic (&m_sScaledPicture,  m_pEncCtx->pMemAlign);
+  WelsPreprocessDestroy();
+}
+
+int32_t CWelsPreProcess::WelsPreprocessCreate() {
+  if (m_pInterfaceVp == NULL) {
+    WelsCreateVpInterface ((void**) &m_pInterfaceVp, WELSVP_INTERFACE_VERION);
+    if (!m_pInterfaceVp)
+      goto exit;
+  } else
+    goto exit;
+
+  return 0;
+
+exit:
+  WelsPreprocessDestroy();
+  return 1;
+}
+
+int32_t CWelsPreProcess::WelsPreprocessDestroy() {
+  WelsDestroyVpInterface (m_pInterfaceVp, WELSVP_INTERFACE_VERION);
+  m_pInterfaceVp = NULL;
+
+  return 0;
+}
+
+int32_t CWelsPreProcess::WelsPreprocessReset (sWelsEncCtx* pCtx, int32_t iWidth, int32_t iHeight) {
+  int32_t iRet = -1;
+  SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
+  //init source width and height
+  pSvcParam->SUsedPicRect.iLeft = 0;
+  pSvcParam->SUsedPicRect.iTop  = 0;
+  pSvcParam->SUsedPicRect.iWidth =  iWidth;
+  pSvcParam->SUsedPicRect.iHeight = iHeight;
+  if ((iWidth < 16) || ((iHeight < 16))) {
+    WelsLog (& (pCtx->sLogCtx), WELS_LOG_ERROR, "Don't support width(%d) or height(%d) which is less than 16 ", iWidth,
+             iHeight);
+    return iRet;
+  }
+  if (pCtx) {
+    FreeScaledPic (&m_sScaledPicture, pCtx->pMemAlign);
+    iRet = InitLastSpatialPictures (pCtx);
+    iRet = WelsInitScaledPic (pCtx->pSvcParam, &m_sScaledPicture, pCtx->pMemAlign);
+  }
+
+  return iRet;
+}
+
+int32_t CWelsPreProcess::AllocSpatialPictures (sWelsEncCtx* pCtx, SWelsSvcCodingParam* pParam) {
+  CMemoryAlign* pMa             = pCtx->pMemAlign;
+  const int32_t kiDlayerCount   = pParam->iSpatialLayerNum;
+  int32_t iDlayerIndex          = 0;
+
+  // spatial pictures
+  iDlayerIndex = 0;
+  do {
+    const int32_t kiPicWidth = pParam->sSpatialLayers[iDlayerIndex].iVideoWidth;
+    const int32_t kiPicHeight   = pParam->sSpatialLayers[iDlayerIndex].iVideoHeight;
+    const uint8_t kuiLayerInTemporal = 2 + WELS_MAX (pParam->sDependencyLayers[iDlayerIndex].iHighestTemporalId, 1);
+    const uint8_t kuiRefNumInTemporal = kuiLayerInTemporal + pParam->iLTRRefNum;
+    uint8_t i = 0;
+
+    m_uiSpatialPicNum[iDlayerIndex] = kuiRefNumInTemporal;
+    do {
+      SPicture* pPic = AllocPicture (pMa, kiPicWidth, kiPicHeight, false, 0);
+      WELS_VERIFY_RETURN_IF (1, (NULL == pPic))
+      m_pSpatialPic[iDlayerIndex][i] = pPic;
+      ++ i;
+    } while (i < kuiRefNumInTemporal);
+
+    if (pParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
+      m_uiSpatialLayersInTemporal[iDlayerIndex] = 1;
+    else
+      m_uiSpatialLayersInTemporal[iDlayerIndex] = kuiLayerInTemporal;
+
+    ++ iDlayerIndex;
+  } while (iDlayerIndex < kiDlayerCount);
+
+  return 0;
+}
+
+void CWelsPreProcess::FreeSpatialPictures (sWelsEncCtx* pCtx) {
+  CMemoryAlign* pMa = pCtx->pMemAlign;
+  int32_t j = 0;
+  while (j < pCtx->pSvcParam->iSpatialLayerNum) {
+    uint8_t i = 0;
+    uint8_t uiRefNumInTemporal = m_uiSpatialPicNum[j];
+
+    while (i < uiRefNumInTemporal) {
+      if (NULL != m_pSpatialPic[j][i]) {
+        FreePicture (pMa, &m_pSpatialPic[j][i]);
+      }
+      ++ i;
+    }
+    m_uiSpatialLayersInTemporal[j] = 0;
+    ++ j;
+  }
+}
+
+int32_t CWelsPreProcess::BuildSpatialPicList (sWelsEncCtx* pCtx, const SSourcePicture* kpSrcPic) {
+  SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
+  int32_t iSpatialNum = 0;
+  int32_t iWidth = ((kpSrcPic->iPicWidth >> 1) << 1);
+  int32_t iHeight = ((kpSrcPic->iPicHeight >> 1) << 1);
+
+  if (!m_bInitDone) {
+    if (WelsPreprocessCreate() != 0)
+      return -1;
+
+    if (WelsPreprocessReset (pCtx, iWidth, iHeight) != 0)
+      return -1;
+
+    m_iAvaliableRefInSpatialPicList = pSvcParam->iNumRefFrame;
+
+    m_bInitDone = true;
+  } else {
+    if ((iWidth != pSvcParam->SUsedPicRect.iWidth) || (iHeight != pSvcParam->SUsedPicRect.iHeight)) {
+      if (WelsPreprocessReset (pCtx, iWidth, iHeight) != 0)
+        return -1;
+    }
+  }
+
+  if (m_pInterfaceVp == NULL)
+    return -1;
+
+  pCtx->pVaa->bSceneChangeFlag = pCtx->pVaa->bIdrPeriodFlag = false;
+
+  iSpatialNum = SingleLayerPreprocess (pCtx, kpSrcPic, &m_sScaledPicture);
+
+  return iSpatialNum;
+}
+
+SPicture* CWelsPreProcess::GetBestRefPic (EUsageType iUsageType, bool bSceneLtr, EWelsSliceType eSliceType,
+    int32_t kiDidx, int32_t iRefTemporalIdx) {
+  assert (iUsageType == SCREEN_CONTENT_REAL_TIME);
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (m_pEncCtx->pVaa);
+  SRefInfoParam* BestRefCandidateParam = (bSceneLtr) ? (& (pVaaExt->sVaaLtrBestRefCandidate[0])) :
+                                         (& (pVaaExt->sVaaStrBestRefCandidate[0]));
+  return m_pSpatialPic[0][BestRefCandidateParam->iSrcListIdx];
+
+}
+SPicture* CWelsPreProcess::GetBestRefPic (const int32_t kiDidx, const int32_t iRefTemporalIdx) {
+
+  return m_pSpatialPic[kiDidx][iRefTemporalIdx];
+}
+
+int32_t CWelsPreProcess::AnalyzeSpatialPic (sWelsEncCtx* pCtx, const int32_t kiDidx) {
+  SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
+  bool bNeededMbAq = (pSvcParam->bEnableAdaptiveQuant && (pCtx->eSliceType == P_SLICE));
+  bool bCalculateBGD = (pCtx->eSliceType == P_SLICE && pSvcParam->bEnableBackgroundDetection);
+  SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[kiDidx];
+  int32_t iCurTemporalIdx  = m_uiSpatialLayersInTemporal[kiDidx] - 1;
+
+  int32_t iRefTemporalIdx = (int32_t)g_kuiRefTemporalIdx[pSvcParam->iDecompStages][pParamInternal->iCodingIndex &
+                            (pSvcParam->uiGopSize - 1)];
+  if (pCtx->uiTemporalId == 0 && pCtx->pLtr[pCtx->uiDependencyId].bReceivedT0LostFlag)
+    iRefTemporalIdx = m_uiSpatialLayersInTemporal[kiDidx] + pCtx->pVaa->uiValidLongTermPicIdx;
+
+  SPicture* pCurPic = m_pSpatialPic[kiDidx][iCurTemporalIdx];
+  bool bCalculateVar = (pSvcParam->iRCMode >= RC_BITRATE_MODE && pCtx->eSliceType == I_SLICE);
+
+  if (pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SPicture* pRefPic = GetBestRefPic (pSvcParam->iUsageType, pCtx->bCurFrameMarkedAsSceneLtr, pCtx->eSliceType, kiDidx,
+                                       iRefTemporalIdx);
+
+    VaaCalculation (pCtx->pVaa, pCurPic, pRefPic, false, bCalculateVar, bCalculateBGD);
+
+    if (pSvcParam->bEnableBackgroundDetection) {
+      BackgroundDetection (pCtx->pVaa, pCurPic, pRefPic, bCalculateBGD && pRefPic->iPictureType != I_SLICE);
+    }
+    if (bNeededMbAq) {
+      AdaptiveQuantCalculation (pCtx->pVaa, pCurPic, pRefPic);
+    }
+  } else {
+    SPicture* pRefPic = GetBestRefPic (kiDidx, iRefTemporalIdx);
+    SPicture* pLastPic = m_pLastSpatialPicture[kiDidx][0];
+    bool bCalculateSQDiff = ((pLastPic->pData[0] == pRefPic->pData[0]) && bNeededMbAq);
+
+    VaaCalculation (pCtx->pVaa, pCurPic, pRefPic, bCalculateSQDiff, bCalculateVar, bCalculateBGD);
+
+    if (pSvcParam->bEnableBackgroundDetection) {
+      BackgroundDetection (pCtx->pVaa, pCurPic, pRefPic, bCalculateBGD && pRefPic->iPictureType != I_SLICE);
+    }
+
+    if (bNeededMbAq) {
+      AdaptiveQuantCalculation (pCtx->pVaa, m_pLastSpatialPicture[kiDidx][1], m_pLastSpatialPicture[kiDidx][0]);
+    }
+  }
+  return 0;
+}
+
+int32_t CWelsPreProcess::GetCurPicPosition (const int32_t kiDidx) {
+  return (m_uiSpatialLayersInTemporal[kiDidx] - 1);
+}
+
+int32_t CWelsPreProcess::UpdateSpatialPictures (sWelsEncCtx* pCtx, SWelsSvcCodingParam* pParam,
+    const int8_t iCurTid, const int32_t kiDidx) {
+  if (pCtx->pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME)
+    return 0;
+
+  WelsExchangeSpatialPictures (&m_pLastSpatialPicture[kiDidx][1], &m_pLastSpatialPicture[kiDidx][0]);
+
+  const int32_t kiCurPos = GetCurPicPosition (kiDidx);
+  if (iCurTid < kiCurPos || pParam->iDecompStages == 0) {
+    if ((iCurTid >= MAX_TEMPORAL_LEVEL) || (kiCurPos > MAX_TEMPORAL_LEVEL)) {
+      InitLastSpatialPictures (pCtx);
+      return 1;
+    }
+    if (pCtx->bRefOfCurTidIsLtr[kiDidx][iCurTid]) {
+      const int32_t kiAvailableLtrPos = m_uiSpatialLayersInTemporal[kiDidx] + pCtx->pVaa->uiMarkLongTermPicIdx;
+      WelsExchangeSpatialPictures (&m_pSpatialPic[kiDidx][kiAvailableLtrPos],
+                                   &m_pSpatialPic[kiDidx][iCurTid]);
+      pCtx->bRefOfCurTidIsLtr[kiDidx][iCurTid] = false;
+    }
+    WelsExchangeSpatialPictures (&m_pSpatialPic[kiDidx][kiCurPos],
+                                 &m_pSpatialPic[kiDidx][iCurTid]);
+
+
+  }
+  return 0;
+}
+
+
+/*
+ *   SingleLayerPreprocess: down sampling if applicable
+ *  @return: exact number of spatial layers need to encoder indeed
+ */
+int32_t CWelsPreProcess::SingleLayerPreprocess (sWelsEncCtx* pCtx, const SSourcePicture* kpSrc,
+    Scaled_Picture* pScaledPicture) {
+  SWelsSvcCodingParam* pSvcParam    = pCtx->pSvcParam;
+  int8_t  iDependencyId             = pSvcParam->iSpatialLayerNum - 1;
+
+  SPicture* pSrcPic                 = NULL; // large
+  SPicture* pDstPic                 = NULL; // small
+  SSpatialLayerConfig* pDlayerParam = NULL;
+  SSpatialLayerInternal* pDlayerParamInternal = NULL;
+  int32_t iSpatialNum               = 0;
+  int32_t iSrcWidth                 = 0;
+  int32_t iSrcHeight                = 0;
+  int32_t iTargetWidth              = 0;
+  int32_t iTargetHeight             = 0;
+  int32_t iTemporalId = 0;
+  int32_t iClosestDid =  iDependencyId;
+  pDlayerParamInternal = &pSvcParam->sDependencyLayers[iDependencyId];
+  pDlayerParam = &pSvcParam->sSpatialLayers[iDependencyId];
+  iTargetWidth   = pDlayerParam->iVideoWidth;
+  iTargetHeight  = pDlayerParam->iVideoHeight;
+
+  iSrcWidth   = pSvcParam->SUsedPicRect.iWidth;
+  iSrcHeight  = pSvcParam->SUsedPicRect.iHeight;
+  if (pSvcParam->uiIntraPeriod) {
+    pCtx->pVaa->bIdrPeriodFlag = (1 + pDlayerParamInternal->iFrameIndex >= (int32_t)pSvcParam->uiIntraPeriod) ? true :
+                                 false;
+    if (pCtx->pVaa->bIdrPeriodFlag) {
+      WelsLog (& (pCtx->sLogCtx), WELS_LOG_DEBUG,
+           "pSvcParam->uiIntraPeriod=%d, pCtx->pVaa->bIdrPeriodFlag=%d",
+             pSvcParam->uiIntraPeriod,
+             pCtx->pVaa->bIdrPeriodFlag);
+    }
+  }
+
+  pSrcPic = pScaledPicture->pScaledInputPicture ? pScaledPicture->pScaledInputPicture : GetCurrentOrigFrame (
+              iDependencyId);
+
+  WelsMoveMemoryWrapper (pSvcParam, pSrcPic, kpSrc, iSrcWidth, iSrcHeight);
+
+  if (pSvcParam->bEnableDenoise)
+    BilateralDenoising (pSrcPic, iSrcWidth, iSrcHeight);
+
+  // different scaling in between input picture and dst highest spatial picture.
+  int32_t iShrinkWidth  = iSrcWidth;
+  int32_t iShrinkHeight = iSrcHeight;
+  pDstPic = pSrcPic;
+  if (pScaledPicture->pScaledInputPicture) {
+    // for highest downsampling
+    pDstPic = GetCurrentOrigFrame (iDependencyId);
+    iShrinkWidth = pScaledPicture->iScaledWidth[iDependencyId];
+    iShrinkHeight = pScaledPicture->iScaledHeight[iDependencyId];
+  }
+  DownsamplePadding (pSrcPic, pDstPic, iSrcWidth, iSrcHeight, iShrinkWidth, iShrinkHeight, iTargetWidth, iTargetHeight,
+                     false);
+
+  if (pSvcParam->bEnableSceneChangeDetect && !pCtx->pVaa->bIdrPeriodFlag) {
+    if (pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+      pCtx->pVaa->eSceneChangeIdc = (pDlayerParamInternal->bEncCurFrmAsIdrFlag ? LARGE_CHANGED_SCENE :
+                                     DetectSceneChange (pDstPic));
+      pCtx->pVaa->bSceneChangeFlag = (LARGE_CHANGED_SCENE == pCtx->pVaa->eSceneChangeIdc);
+    } else {
+      if ((!pDlayerParamInternal->bEncCurFrmAsIdrFlag)
+          && ! (pDlayerParamInternal->iCodingIndex & (pSvcParam->uiGopSize - 1))) {
+        SPicture* pRefPic = pCtx->pLtr[iDependencyId].bReceivedT0LostFlag ?
+                            m_pSpatialPic[iDependencyId][m_uiSpatialLayersInTemporal[iDependencyId] +
+                                pCtx->pVaa->uiValidLongTermPicIdx] : m_pLastSpatialPicture[iDependencyId][0];
+        //pCtx->pVaa->eSceneChangeIdc = DetectSceneChange (pDstPic, pRefPic);
+        pCtx->pVaa->bSceneChangeFlag = GetSceneChangeFlag (DetectSceneChange (pDstPic, pRefPic));
+      }
+    }
+  }
+
+  for (int32_t i = 0; i < pSvcParam->iSpatialLayerNum; i++) {
+    pDlayerParamInternal = &pSvcParam->sDependencyLayers[i];
+    iTemporalId    = pDlayerParamInternal->uiCodingIdx2TemporalId[pDlayerParamInternal->iCodingIndex &
+                     (pSvcParam->uiGopSize - 1)];
+    if (iTemporalId != INVALID_TEMPORAL_ID) {
+      ++ iSpatialNum;
+    }
+  }
+  pDlayerParamInternal = &pSvcParam->sDependencyLayers[iDependencyId];
+  iTemporalId    = pDlayerParamInternal->uiCodingIdx2TemporalId[pDlayerParamInternal->iCodingIndex &
+                   (pSvcParam->uiGopSize - 1)];
+  int iActualSpatialNum = iSpatialNum - 1;
+  if (iTemporalId != INVALID_TEMPORAL_ID) {
+    WelsUpdateSpatialIdxMap (pCtx, iActualSpatialNum, pDstPic, iDependencyId);
+    -- iActualSpatialNum;
+  }
+
+  m_pLastSpatialPicture[iDependencyId][1] = GetCurrentOrigFrame (iDependencyId);
+  -- iDependencyId;
+
+
+  // generate other spacial layer
+  // pSrc is
+  //    -- padded input pic, if downsample should be applied to generate highest layer, [if] block above
+  //    -- highest layer, if no downsampling, [else] block above
+  if (pSvcParam->iSpatialLayerNum > 1) {
+    while (iDependencyId >= 0) {
+      pDlayerParamInternal = &pSvcParam->sDependencyLayers[iDependencyId];
+      pDlayerParam = &pSvcParam->sSpatialLayers[iDependencyId];
+      SPicture* pSrcPic  = m_pLastSpatialPicture[iClosestDid][1]; // large
+      iTargetWidth  = pDlayerParam->iVideoWidth;
+      iTargetHeight = pDlayerParam->iVideoHeight;
+      iTemporalId = pDlayerParamInternal->uiCodingIdx2TemporalId[pDlayerParamInternal->iCodingIndex &
+                    (pSvcParam->uiGopSize - 1)];
+
+      // down sampling performed
+      int32_t iSrcWidth                 = pScaledPicture->iScaledWidth[iClosestDid];
+      int32_t iSrcHeight                = pScaledPicture->iScaledHeight[iClosestDid];
+      pDstPic = GetCurrentOrigFrame (iDependencyId); // small
+      iShrinkWidth = pScaledPicture->iScaledWidth[iDependencyId];
+      iShrinkHeight = pScaledPicture->iScaledHeight[iDependencyId];
+      DownsamplePadding (pSrcPic, pDstPic, iSrcWidth, iSrcHeight, iShrinkWidth, iShrinkHeight, iTargetWidth, iTargetHeight,
+                         true);
+
+      if ((iTemporalId != INVALID_TEMPORAL_ID)) {
+        WelsUpdateSpatialIdxMap (pCtx, iActualSpatialNum, pDstPic, iDependencyId);
+        iActualSpatialNum--;
+      }
+
+      m_pLastSpatialPicture[iDependencyId][1] = pDstPic;
+
+      iClosestDid = iDependencyId;
+      -- iDependencyId;
+
+    }
+  }
+  return iSpatialNum;
+
+}
+
+
+/*!
+ * \brief   Whether input picture need be scaled?
+ */
+bool JudgeNeedOfScaling (SWelsSvcCodingParam* pParam, Scaled_Picture* pScaledPicture) {
+  const int32_t kiInputPicWidth  = pParam->SUsedPicRect.iWidth;
+  const int32_t kiInputPicHeight = pParam->SUsedPicRect.iHeight;
+  const int32_t kiDstPicWidth    = pParam->sDependencyLayers[pParam->iSpatialLayerNum - 1].iActualWidth;
+  const int32_t kiDstPicHeight   = pParam->sDependencyLayers[pParam->iSpatialLayerNum - 1].iActualHeight;
+  bool bNeedDownsampling = true;
+
+  int32_t iSpatialIdx = pParam->iSpatialLayerNum - 1;
+
+  if (kiDstPicWidth >= kiInputPicWidth && kiDstPicHeight >= kiInputPicHeight) {
+    bNeedDownsampling = false;
+  }
+
+  for (; iSpatialIdx >= 0; iSpatialIdx --) {
+    SSpatialLayerInternal* pCurLayer = &pParam->sDependencyLayers[iSpatialIdx];
+    int32_t iCurDstWidth             = pCurLayer->iActualWidth;
+    int32_t iCurDstHeight            = pCurLayer->iActualHeight;
+    int32_t iInputWidthXDstHeight    = kiInputPicWidth * iCurDstHeight;
+    int32_t iInputHeightXDstWidth    = kiInputPicHeight * iCurDstWidth;
+
+    if (iInputWidthXDstHeight > iInputHeightXDstWidth) {
+      pScaledPicture->iScaledWidth[iSpatialIdx] = WELS_MAX (iCurDstWidth, 4);
+      pScaledPicture->iScaledHeight[iSpatialIdx] = WELS_MAX (iInputHeightXDstWidth / kiInputPicWidth, 4);
+    } else {
+      pScaledPicture->iScaledWidth[iSpatialIdx] = WELS_MAX (iInputWidthXDstHeight / kiInputPicHeight, 4);
+      pScaledPicture->iScaledHeight[iSpatialIdx] = WELS_MAX (iCurDstHeight, 4);
+    }
+  }
+
+  return bNeedDownsampling;
+}
+
+int32_t  WelsInitScaledPic (SWelsSvcCodingParam* pParam,  Scaled_Picture*  pScaledPicture, CMemoryAlign* pMemoryAlign) {
+  bool bInputPicNeedScaling = JudgeNeedOfScaling (pParam, pScaledPicture);
+  if (bInputPicNeedScaling) {
+    pScaledPicture->pScaledInputPicture = AllocPicture (pMemoryAlign, pParam->SUsedPicRect.iWidth,
+                                          pParam->SUsedPicRect.iHeight, false, 0);
+    if (pScaledPicture->pScaledInputPicture == NULL)
+      return -1;
+
+    // Avoid valgrind false positives.
+    //
+    // X86 SIMD downsampling routines may, for convenience, read slightly beyond
+    // the input data and into the alignment padding area beyond each line. This
+    // causes valgrind to warn about uninitialized values even if these values
+    // only affect lanes of a SIMD vector that are effectively never used.
+    //
+    // Avoid these false positives by zero-initializing the padding area beyond
+    // each line of the source buffer used for downsampling.
+    SPicture* pPic = pScaledPicture->pScaledInputPicture;
+    ClearEndOfLinePadding (pPic->pData[0], pPic->iLineSize[0], pPic->iWidthInPixel, pPic->iHeightInPixel);
+    ClearEndOfLinePadding (pPic->pData[1], pPic->iLineSize[1], pPic->iWidthInPixel >> 1, pPic->iHeightInPixel >> 1);
+    ClearEndOfLinePadding (pPic->pData[2], pPic->iLineSize[2], pPic->iWidthInPixel >> 1, pPic->iHeightInPixel >> 1);
+  }
+  return 0;
+}
+
+void  FreeScaledPic (Scaled_Picture*  pScaledPicture, CMemoryAlign* pMemoryAlign) {
+  if (pScaledPicture->pScaledInputPicture) {
+    FreePicture (pMemoryAlign, &pScaledPicture->pScaledInputPicture);
+    pScaledPicture->pScaledInputPicture = NULL;
+  }
+}
+
+int32_t CWelsPreProcess::InitLastSpatialPictures (sWelsEncCtx* pCtx) {
+  SWelsSvcCodingParam* pParam   = pCtx->pSvcParam;
+  const int32_t kiDlayerCount   = pParam->iSpatialLayerNum;
+  int32_t iDlayerIndex          = 0;
+  if (pParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    for (; iDlayerIndex < MAX_DEPENDENCY_LAYER; iDlayerIndex++) {
+      m_pLastSpatialPicture[iDlayerIndex][0] = m_pLastSpatialPicture[iDlayerIndex][1] = NULL;
+    }
+  } else {
+    for (; iDlayerIndex < kiDlayerCount; iDlayerIndex++) {
+      const int32_t kiLayerInTemporal = m_uiSpatialLayersInTemporal[iDlayerIndex];
+      m_pLastSpatialPicture[iDlayerIndex][0] = m_pSpatialPic[iDlayerIndex][kiLayerInTemporal - 2];
+      m_pLastSpatialPicture[iDlayerIndex][1] = NULL;
+    }
+    for (; iDlayerIndex < MAX_DEPENDENCY_LAYER; iDlayerIndex++) {
+      m_pLastSpatialPicture[iDlayerIndex][0] = m_pLastSpatialPicture[iDlayerIndex][1] = NULL;
+    }
+  }
+  return 0;
+}
+//*********************************************************************************************************/
+
+int32_t CWelsPreProcess::ColorspaceConvert (SWelsSvcCodingParam* pSvcParam, SPicture* pDstPic,
+    const SSourcePicture* kpSrc, const int32_t kiWidth, const int32_t kiHeight) {
+  return 1;
+  //not support yet
+}
+
+void CWelsPreProcess::BilateralDenoising (SPicture* pSrc, const int32_t kiWidth, const int32_t kiHeight) {
+  int32_t iMethodIdx = METHOD_DENOISE;
+  SPixMap sSrcPixMap;
+  memset (&sSrcPixMap, 0, sizeof (sSrcPixMap));
+  sSrcPixMap.pPixel[0] = pSrc->pData[0];
+  sSrcPixMap.pPixel[1] = pSrc->pData[1];
+  sSrcPixMap.pPixel[2] = pSrc->pData[2];
+  sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+  sSrcPixMap.sRect.iRectWidth = kiWidth;
+  sSrcPixMap.sRect.iRectHeight = kiHeight;
+  sSrcPixMap.iStride[0] = pSrc->iLineSize[0];
+  sSrcPixMap.iStride[1] = pSrc->iLineSize[1];
+  sSrcPixMap.iStride[2] = pSrc->iLineSize[2];
+  sSrcPixMap.eFormat = VIDEO_FORMAT_I420;
+
+  m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, NULL);
+}
+
+ESceneChangeIdc CWelsPreProcessVideo::DetectSceneChange (SPicture* pCurPicture, SPicture* pRefPicture) {
+  int32_t iMethodIdx = METHOD_SCENE_CHANGE_DETECTION_VIDEO;
+  SSceneChangeResult sSceneChangeDetectResult = { SIMILAR_SCENE };
+  SPixMap sSrcPixMap;
+  SPixMap sRefPixMap;
+  memset (&sSrcPixMap, 0, sizeof (sSrcPixMap));
+  memset (&sRefPixMap, 0, sizeof (sRefPixMap));
+  sSrcPixMap.pPixel[0] = pCurPicture->pData[0];
+  sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+  sSrcPixMap.iStride[0] = pCurPicture->iLineSize[0];
+  sSrcPixMap.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+  sSrcPixMap.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+  sSrcPixMap.eFormat = VIDEO_FORMAT_I420;
+
+  sRefPixMap.pPixel[0] = pRefPicture->pData[0];
+  sRefPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+  sRefPixMap.iStride[0] = pRefPicture->iLineSize[0];
+  sRefPixMap.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+  sRefPixMap.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+  sRefPixMap.eFormat = VIDEO_FORMAT_I420;
+
+  int32_t iRet = m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, &sRefPixMap);
+  if (iRet == 0) {
+    m_pInterfaceVp->Get (iMethodIdx, (void*)&sSceneChangeDetectResult);
+    //bSceneChangeFlag = (sSceneChangeDetectResult.eSceneChangeIdc == LARGE_CHANGED_SCENE) ? true : false;
+  }
+  return sSceneChangeDetectResult.eSceneChangeIdc;
+}
+
+SPicture* CWelsPreProcessVideo::GetCurrentOrigFrame (int32_t iDIdx) {
+  return m_pSpatialPic[iDIdx][GetCurPicPosition (iDIdx)];
+}
+
+int32_t CWelsPreProcess::DownsamplePadding (SPicture* pSrc, SPicture* pDstPic,  int32_t iSrcWidth, int32_t iSrcHeight,
+    int32_t iShrinkWidth, int32_t iShrinkHeight, int32_t iTargetWidth, int32_t iTargetHeight, bool bForceCopy) {
+  int32_t iRet = 0;
+  SPixMap sSrcPixMap;
+  SPixMap sDstPicMap;
+  memset (&sSrcPixMap, 0, sizeof (sSrcPixMap));
+  memset (&sDstPicMap, 0, sizeof (sDstPicMap));
+  sSrcPixMap.pPixel[0]   = pSrc->pData[0];
+  sSrcPixMap.pPixel[1]   = pSrc->pData[1];
+  sSrcPixMap.pPixel[2]   = pSrc->pData[2];
+  sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+  sSrcPixMap.sRect.iRectWidth  = iSrcWidth;
+  sSrcPixMap.sRect.iRectHeight = iSrcHeight;
+  sSrcPixMap.iStride[0]  = pSrc->iLineSize[0];
+  sSrcPixMap.iStride[1]  = pSrc->iLineSize[1];
+  sSrcPixMap.iStride[2]  = pSrc->iLineSize[2];
+  sSrcPixMap.eFormat     = VIDEO_FORMAT_I420;
+
+  if (iSrcWidth != iShrinkWidth || iSrcHeight != iShrinkHeight || bForceCopy) {
+    int32_t iMethodIdx = METHOD_DOWNSAMPLE;
+    sDstPicMap.pPixel[0]   = pDstPic->pData[0];
+    sDstPicMap.pPixel[1]   = pDstPic->pData[1];
+    sDstPicMap.pPixel[2]   = pDstPic->pData[2];
+    sDstPicMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sDstPicMap.sRect.iRectWidth  = iShrinkWidth;
+    sDstPicMap.sRect.iRectHeight = iShrinkHeight;
+    sDstPicMap.iStride[0]  = pDstPic->iLineSize[0];
+    sDstPicMap.iStride[1]  = pDstPic->iLineSize[1];
+    sDstPicMap.iStride[2]  = pDstPic->iLineSize[2];
+    sDstPicMap.eFormat     = VIDEO_FORMAT_I420;
+
+    if (iSrcWidth != iShrinkWidth || iSrcHeight != iShrinkHeight) {
+      iRet = m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, &sDstPicMap);
+    } else {
+      WelsMoveMemory_c (pDstPic->pData[0], pDstPic->pData[1], pDstPic->pData[2], pDstPic->iLineSize[0], pDstPic->iLineSize[1],
+                        pSrc->pData[0], pSrc->pData[1], pSrc->pData[2], pSrc->iLineSize[0], pSrc->iLineSize[1],
+                        iSrcWidth, iSrcHeight);
+    }
+  } else {
+    memcpy (&sDstPicMap, &sSrcPixMap, sizeof (sDstPicMap)); // confirmed_safe_unsafe_usage
+  }
+
+  // get rid of odd line
+  iShrinkWidth -= (iShrinkWidth & 1);
+  iShrinkHeight -= (iShrinkHeight & 1);
+  Padding ((uint8_t*)sDstPicMap.pPixel[0], (uint8_t*)sDstPicMap.pPixel[1], (uint8_t*)sDstPicMap.pPixel[2],
+           sDstPicMap.iStride[0], sDstPicMap.iStride[1], iShrinkWidth, iTargetWidth, iShrinkHeight, iTargetHeight);
+
+  return iRet;
+}
+
+//*********************************************************************************************************/
+void CWelsPreProcess::VaaCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
+                                      bool bCalculateSQDiff, bool bCalculateVar, bool bCalculateBGD) {
+  pVaaInfo->sVaaCalcInfo.pCurY = pCurPicture->pData[0];
+  pVaaInfo->sVaaCalcInfo.pRefY = pRefPicture->pData[0];
+  {
+    int32_t iMethodIdx = METHOD_VAA_STATISTICS;
+    SPixMap sCurPixMap;
+    SPixMap sRefPixMap;
+    memset (&sCurPixMap, 0, sizeof (sCurPixMap));
+    memset (&sRefPixMap, 0, sizeof (sRefPixMap));
+    SVAACalcParam calc_param = {0};
+
+    sCurPixMap.pPixel[0] = pCurPicture->pData[0];
+    sCurPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sCurPixMap.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+    sCurPixMap.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+    sCurPixMap.iStride[0] = pCurPicture->iLineSize[0];
+    sCurPixMap.eFormat = VIDEO_FORMAT_I420;
+
+    sRefPixMap.pPixel[0] = pRefPicture->pData[0];
+    sRefPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sRefPixMap.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+    sRefPixMap.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+    sRefPixMap.iStride[0] = pRefPicture->iLineSize[0];
+    sRefPixMap.eFormat = VIDEO_FORMAT_I420;
+
+    calc_param.iCalcVar = bCalculateVar;
+    calc_param.iCalcBgd = bCalculateBGD;
+    calc_param.iCalcSsd = bCalculateSQDiff;
+    calc_param.pCalcResult = &pVaaInfo->sVaaCalcInfo;
+
+    m_pInterfaceVp->Set (iMethodIdx, &calc_param);
+    m_pInterfaceVp->Process (iMethodIdx, &sCurPixMap, &sRefPixMap);
+  }
+}
+
+void CWelsPreProcess::BackgroundDetection (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture,
+    bool bDetectFlag) {
+  if (bDetectFlag) {
+    pVaaInfo->iPicWidth     = pCurPicture->iWidthInPixel;
+    pVaaInfo->iPicHeight    = pCurPicture->iHeightInPixel;
+
+    pVaaInfo->iPicStride    = pCurPicture->iLineSize[0];
+    pVaaInfo->iPicStrideUV  = pCurPicture->iLineSize[1];
+    pVaaInfo->pCurY         = pCurPicture->pData[0];
+    pVaaInfo->pRefY         = pRefPicture->pData[0];
+    pVaaInfo->pCurU         = pCurPicture->pData[1];
+    pVaaInfo->pRefU         = pRefPicture->pData[1];
+    pVaaInfo->pCurV         = pCurPicture->pData[2];
+    pVaaInfo->pRefV         = pRefPicture->pData[2];
+
+    int32_t iMethodIdx = METHOD_BACKGROUND_DETECTION;
+    SPixMap sSrcPixMap;
+    SPixMap sRefPixMap;
+    memset (&sSrcPixMap, 0, sizeof (sSrcPixMap));
+    memset (&sRefPixMap, 0, sizeof (sRefPixMap));
+    SBGDInterface BGDParam = {0};
+
+    sSrcPixMap.pPixel[0] = pCurPicture->pData[0];
+    sSrcPixMap.pPixel[1] = pCurPicture->pData[1];
+    sSrcPixMap.pPixel[2] = pCurPicture->pData[2];
+    sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sSrcPixMap.iStride[0] = pCurPicture->iLineSize[0];
+    sSrcPixMap.iStride[1] = pCurPicture->iLineSize[1];
+    sSrcPixMap.iStride[2] = pCurPicture->iLineSize[2];
+    sSrcPixMap.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+    sSrcPixMap.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+    sSrcPixMap.eFormat = VIDEO_FORMAT_I420;
+
+    sRefPixMap.pPixel[0] = pRefPicture->pData[0];
+    sRefPixMap.pPixel[1] = pRefPicture->pData[1];
+    sRefPixMap.pPixel[2] = pRefPicture->pData[2];
+    sRefPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sRefPixMap.iStride[0] = pRefPicture->iLineSize[0];
+    sRefPixMap.iStride[1] = pRefPicture->iLineSize[1];
+    sRefPixMap.iStride[2] = pRefPicture->iLineSize[2];
+    sRefPixMap.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+    sRefPixMap.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+    sRefPixMap.eFormat = VIDEO_FORMAT_I420;
+
+    BGDParam.pBackgroundMbFlag = pVaaInfo->pVaaBackgroundMbFlag;
+    BGDParam.pCalcRes = & (pVaaInfo->sVaaCalcInfo);
+    m_pInterfaceVp->Set (iMethodIdx, (void*)&BGDParam);
+    m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, &sRefPixMap);
+  } else {
+    int32_t iPicWidthInMb  = (pCurPicture->iWidthInPixel  + 15) >> 4;
+    int32_t iPicHeightInMb = (pCurPicture->iHeightInPixel + 15) >> 4;
+    memset (pVaaInfo->pVaaBackgroundMbFlag, 0, iPicWidthInMb * iPicHeightInMb);
+  }
+}
+
+void CWelsPreProcess::AdaptiveQuantCalculation (SVAAFrameInfo* pVaaInfo, SPicture* pCurPicture, SPicture* pRefPicture) {
+  pVaaInfo->sAdaptiveQuantParam.pCalcResult = & (pVaaInfo->sVaaCalcInfo);
+  pVaaInfo->sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp = 0;
+
+  {
+    int32_t iMethodIdx = METHOD_ADAPTIVE_QUANT;
+    SPixMap pSrc;
+    SPixMap pRef;
+    memset (&pSrc, 0, sizeof (pSrc));
+    memset (&pRef, 0, sizeof (pRef));
+    int32_t iRet = 0;
+
+    pSrc.pPixel[0] = pCurPicture->pData[0];
+    pSrc.iSizeInBits = g_kiPixMapSizeInBits;
+    pSrc.iStride[0] = pCurPicture->iLineSize[0];
+    pSrc.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+    pSrc.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+    pSrc.eFormat = VIDEO_FORMAT_I420;
+
+    pRef.pPixel[0] = pRefPicture->pData[0];
+    pRef.iSizeInBits = g_kiPixMapSizeInBits;
+    pRef.iStride[0] = pRefPicture->iLineSize[0];
+    pRef.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+    pRef.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+    pRef.eFormat = VIDEO_FORMAT_I420;
+
+    iRet = m_pInterfaceVp->Set (iMethodIdx, (void*) & (pVaaInfo->sAdaptiveQuantParam));
+    iRet = m_pInterfaceVp->Process (iMethodIdx, &pSrc, &pRef);
+    if (iRet == 0)
+      m_pInterfaceVp->Get (iMethodIdx, (void*) & (pVaaInfo->sAdaptiveQuantParam));
+  }
+}
+
+void CWelsPreProcess::SetRefMbType (sWelsEncCtx* pCtx, uint32_t** pRefMbTypeArray, int32_t iRefPicType) {
+  const uint8_t uiTid       = pCtx->uiTemporalId;
+  const uint8_t uiDid       = pCtx->uiDependencyId;
+  SRefList* pRefPicLlist    = pCtx->ppRefPicListExt[uiDid];
+  SLTRState* pLtr           = &pCtx->pLtr[uiDid];
+  uint8_t i = 0;
+
+  if (pCtx->pSvcParam->bEnableLongTermReference && pLtr->bReceivedT0LostFlag && uiTid == 0) {
+    for (i = 0; i < pRefPicLlist->uiLongRefCount; i++) {
+      SPicture* pRef = pRefPicLlist->pLongRefList[i];
+      if (pRef != NULL && pRef->uiRecieveConfirmed == 1/*RECIEVE_SUCCESS*/) {
+        *pRefMbTypeArray = pRef->uiRefMbType;
+        break;
+      }
+    }
+  } else {
+    for (i = 0; i < pRefPicLlist->uiShortRefCount; i++) {
+      SPicture* pRef = pRefPicLlist->pShortRefList[i];
+      if (pRef != NULL && pRef->bUsedAsRef && pRef->iFramePoc >= 0 && pRef->uiTemporalId <= uiTid) {
+        *pRefMbTypeArray = pRef->uiRefMbType;
+        break;
+      }
+    }
+  }
+}
+
+
+void CWelsPreProcess::AnalyzePictureComplexity (sWelsEncCtx* pCtx, SPicture* pCurPicture, SPicture* pRefPicture,
+    const int32_t kiDependencyId, const bool bCalculateBGD) {
+  SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
+  int32_t iComplexityAnalysisMode = 0;
+
+  if (pSvcParam->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+    SComplexityAnalysisScreenParam* sComplexityAnalysisParam = &pVaaExt->sComplexityScreenParam;
+    SWelsSvcRc* pWelsSvcRc = &pCtx->pWelsSvcRc[kiDependencyId];
+
+    if (pCtx->eSliceType == P_SLICE)
+      iComplexityAnalysisMode = GOM_SAD;
+    else if (pCtx->eSliceType == I_SLICE)
+      iComplexityAnalysisMode = GOM_VAR;
+    else
+      return;
+
+    memset (pWelsSvcRc->pGomForegroundBlockNum, 0, pWelsSvcRc->iGomSize * sizeof (int32_t));
+    memset (pWelsSvcRc->pCurrentFrameGomSad, 0, pWelsSvcRc->iGomSize * sizeof (int32_t));
+
+    sComplexityAnalysisParam->iFrameComplexity = 0;
+    sComplexityAnalysisParam->pGomComplexity = pWelsSvcRc->pCurrentFrameGomSad;
+    sComplexityAnalysisParam->iGomNumInFrame = pWelsSvcRc->iGomSize;
+    sComplexityAnalysisParam->iIdrFlag = (pCtx->eSliceType == I_SLICE);
+    sComplexityAnalysisParam->iMbRowInGom = GOM_H_SCC;
+    sComplexityAnalysisParam->sScrollResult.bScrollDetectFlag = false;
+    sComplexityAnalysisParam->sScrollResult.iScrollMvX = 0;
+    sComplexityAnalysisParam->sScrollResult.iScrollMvY = 0;
+
+    const int32_t iMethodIdx = METHOD_COMPLEXITY_ANALYSIS_SCREEN;
+    SPixMap sSrcPixMap;
+    SPixMap sRefPixMap;
+    memset (&sSrcPixMap, 0, sizeof (SPixMap));
+    memset (&sRefPixMap, 0, sizeof (SPixMap));
+    int32_t iRet = 0;
+
+    sSrcPixMap.pPixel[0] = pCurPicture->pData[0];
+    sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+    sSrcPixMap.iStride[0] = pCurPicture->iLineSize[0];
+    sSrcPixMap.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+    sSrcPixMap.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+    sSrcPixMap.eFormat = VIDEO_FORMAT_I420;
+
+    if (pRefPicture != NULL) {
+      sRefPixMap.pPixel[0] = pRefPicture->pData[0];
+      sRefPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+      sRefPixMap.iStride[0] = pRefPicture->iLineSize[0];
+      sRefPixMap.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+      sRefPixMap.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+      sRefPixMap.eFormat = VIDEO_FORMAT_I420;
+    }
+
+    iRet = m_pInterfaceVp->Set (iMethodIdx, (void*)sComplexityAnalysisParam);
+    iRet = m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, &sRefPixMap);
+    if (iRet == 0)
+      m_pInterfaceVp->Get (iMethodIdx, (void*)sComplexityAnalysisParam);
+
+  } else {
+    SVAAFrameInfo* pVaaInfo = pCtx->pVaa;
+    SComplexityAnalysisParam* sComplexityAnalysisParam = & (pVaaInfo->sComplexityAnalysisParam);
+    SWelsSvcRc* SWelsSvcRc = &pCtx->pWelsSvcRc[kiDependencyId];
+
+    if (pSvcParam->iRCMode == RC_QUALITY_MODE && pCtx->eSliceType == P_SLICE) {
+      iComplexityAnalysisMode = FRAME_SAD;
+    } else if (((pSvcParam->iRCMode == RC_BITRATE_MODE) || (pSvcParam->iRCMode == RC_TIMESTAMP_MODE))
+               && pCtx->eSliceType == P_SLICE) {
+      iComplexityAnalysisMode = GOM_SAD;
+    } else if (((pSvcParam->iRCMode == RC_BITRATE_MODE) || (pSvcParam->iRCMode == RC_TIMESTAMP_MODE))
+               && pCtx->eSliceType == I_SLICE) {
+      iComplexityAnalysisMode = GOM_VAR;
+    } else {
+      return;
+    }
+
+    sComplexityAnalysisParam->iComplexityAnalysisMode = iComplexityAnalysisMode;
+    sComplexityAnalysisParam->pCalcResult = & (pVaaInfo->sVaaCalcInfo);
+    sComplexityAnalysisParam->pBackgroundMbFlag = pVaaInfo->pVaaBackgroundMbFlag;
+    if (pRefPicture)
+      SetRefMbType (pCtx, & (sComplexityAnalysisParam->uiRefMbType), pRefPicture->iPictureType);
+    sComplexityAnalysisParam->iCalcBgd = bCalculateBGD;
+    sComplexityAnalysisParam->iFrameComplexity = 0;
+
+    memset (SWelsSvcRc->pGomForegroundBlockNum, 0, SWelsSvcRc->iGomSize * sizeof (int32_t));
+    if (iComplexityAnalysisMode != FRAME_SAD)
+      memset (SWelsSvcRc->pCurrentFrameGomSad, 0, SWelsSvcRc->iGomSize * sizeof (int32_t));
+
+    sComplexityAnalysisParam->pGomComplexity = SWelsSvcRc->pCurrentFrameGomSad;
+    sComplexityAnalysisParam->pGomForegroundBlockNum = SWelsSvcRc->pGomForegroundBlockNum;
+    sComplexityAnalysisParam->iMbNumInGom = SWelsSvcRc->iNumberMbGom;
+
+    {
+      int32_t iMethodIdx = METHOD_COMPLEXITY_ANALYSIS;
+      SPixMap sSrcPixMap;
+      SPixMap sRefPixMap;
+      memset (&sSrcPixMap, 0, sizeof (SPixMap));
+      memset (&sRefPixMap, 0, sizeof (SPixMap));
+      int32_t iRet = 0;
+
+      sSrcPixMap.pPixel[0] = pCurPicture->pData[0];
+      sSrcPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+      sSrcPixMap.iStride[0] = pCurPicture->iLineSize[0];
+      sSrcPixMap.sRect.iRectWidth = pCurPicture->iWidthInPixel;
+      sSrcPixMap.sRect.iRectHeight = pCurPicture->iHeightInPixel;
+      sSrcPixMap.eFormat = VIDEO_FORMAT_I420;
+
+      if (pRefPicture) {
+        sRefPixMap.pPixel[0] = pRefPicture->pData[0];
+        sRefPixMap.iSizeInBits = g_kiPixMapSizeInBits;
+        sRefPixMap.iStride[0] = pRefPicture->iLineSize[0];
+        sRefPixMap.sRect.iRectWidth = pRefPicture->iWidthInPixel;
+        sRefPixMap.sRect.iRectHeight = pRefPicture->iHeightInPixel;
+      }
+      sRefPixMap.eFormat = VIDEO_FORMAT_I420;
+
+      iRet = m_pInterfaceVp->Set (iMethodIdx, (void*)sComplexityAnalysisParam);
+      iRet = m_pInterfaceVp->Process (iMethodIdx, &sSrcPixMap, &sRefPixMap);
+      if (iRet == 0)
+        m_pInterfaceVp->Get (iMethodIdx, (void*)sComplexityAnalysisParam);
+    }
+  }
+}
+
+
+void CWelsPreProcess::InitPixMap (const SPicture* pPicture, SPixMap* pPixMap) {
+  pPixMap->pPixel[0] = pPicture->pData[0];
+  pPixMap->pPixel[1] = pPicture->pData[1];
+  pPixMap->pPixel[2] = pPicture->pData[2];
+  pPixMap->iSizeInBits = sizeof (uint8_t);
+  pPixMap->iStride[0] = pPicture->iLineSize[0];
+  pPixMap->iStride[1] = pPicture->iLineSize[1];
+  pPixMap->sRect.iRectWidth = pPicture->iWidthInPixel;
+  pPixMap->sRect.iRectHeight = pPicture->iHeightInPixel;
+
+  pPixMap->eFormat = VIDEO_FORMAT_I420;
+}
+
+SPicture** CWelsPreProcessScreen::GetReferenceSrcPicList (int32_t iTargetDid) {
+  return (&m_pSpatialPic[iTargetDid][1]);
+}
+
+void CWelsPreProcessScreen::GetAvailableRefListLosslessScreenRefSelection (SPicture** pRefPicList, uint8_t iCurTid,
+    const int32_t iClosestLtrFrameNum,
+    SRefInfoParam* pAvailableRefParam, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum) {
+  const int32_t iSourcePicNum = m_iAvaliableRefInSpatialPicList;
+  if (0 >= iSourcePicNum) {
+    iAvailableRefNum = 0;
+    iAvailableSceneRefNum = 0;
+    return ;
+  }
+  const bool bCurFrameMarkedAsSceneLtr = m_pEncCtx->bCurFrameMarkedAsSceneLtr;
+  SPicture* pRefPic = NULL;
+  uint8_t uiRefTid = 0;
+  bool bRefRealLtr = false;
+
+  iAvailableRefNum = 1; //zero is left for the closest frame
+  iAvailableSceneRefNum = 0;
+
+  //the saving order will be depend on pSrcPicList
+  //TODO: use a frame_idx to find the closer ref in time distance, and correctly sort the ref list
+  for (int32_t i = iSourcePicNum - 1; i >= 0; --i) {
+    pRefPic = pRefPicList[i];
+    if (NULL == pRefPic || !pRefPic->bUsedAsRef || !pRefPic->bIsLongRef || (bCurFrameMarkedAsSceneLtr
+        && (!pRefPic->bIsSceneLTR))) {
+      continue;
+    }
+    uiRefTid = pRefPic->uiTemporalId;
+    bRefRealLtr = pRefPic->bIsSceneLTR;
+
+    if (bRefRealLtr || (0 == iCurTid && 0 == uiRefTid) || (uiRefTid < iCurTid)) {
+      int32_t idx = (pRefPic->iLongTermPicNum == iClosestLtrFrameNum) ? (0) : (iAvailableRefNum++);
+      pAvailableRefParam[idx].pRefPicture = pRefPic;
+      pAvailableRefParam[idx].iSrcListIdx = i + 1; //in SrcList, the idx 0 is reserved for CurPic
+      iAvailableSceneRefNum += bRefRealLtr;
+    }
+  }
+
+  if (pAvailableRefParam[0].pRefPicture == NULL) {
+    for (int32_t i = 1; i < iAvailableRefNum ; ++i) {
+      pAvailableRefParam[i - 1].pRefPicture = pAvailableRefParam[i].pRefPicture;
+      pAvailableRefParam[i - 1].iSrcListIdx = pAvailableRefParam[i].iSrcListIdx;
+    }
+
+    pAvailableRefParam[iAvailableRefNum - 1].pRefPicture = NULL;
+    pAvailableRefParam[iAvailableRefNum - 1].iSrcListIdx = 0;
+    --iAvailableRefNum;
+  }
+}
+
+
+void CWelsPreProcessScreen::GetAvailableRefList (SPicture** pSrcPicList, uint8_t iCurTid,
+    const int32_t iClosestLtrFrameNum,
+    SRefInfoParam* pAvailableRefList, int32_t& iAvailableRefNum, int32_t& iAvailableSceneRefNum) {
+  const int32_t iSourcePicNum = m_iAvaliableRefInSpatialPicList;
+  if (0 >= iSourcePicNum) {
+    iAvailableRefNum = 0;
+    iAvailableSceneRefNum = 0;
+    return ;
+  }
+  SPicture* pRefPic = NULL;
+  uint8_t uiRefTid = 0;
+  iAvailableRefNum = 0;
+  iAvailableSceneRefNum = 0;
+
+  //the saving order will be depend on pSrcPicList
+  //TODO: use a frame_idx to find the closer ref in time distance, and correctly sort the ref list
+  for (int32_t i = iSourcePicNum - 1; i >= 0; --i) {
+    pRefPic = pSrcPicList[i];
+    if (NULL == pRefPic || !pRefPic->bUsedAsRef) {
+      continue;
+    }
+    uiRefTid = pRefPic->uiTemporalId;
+
+    if (uiRefTid <= iCurTid) {
+      pAvailableRefList[iAvailableRefNum].pRefPicture = pRefPic;
+      pAvailableRefList[iAvailableRefNum].iSrcListIdx = i + 1; //in SrcList, the idx 0 is reserved for CurPic
+      iAvailableRefNum ++;
+    }
+  }
+}
+
+
+void CWelsPreProcessScreen::InitRefJudgement (SRefJudgement* pRefJudgement) {
+  pRefJudgement->iMinFrameComplexity = INT_MAX;
+  pRefJudgement->iMinFrameComplexity08 = INT_MAX;
+  pRefJudgement->iMinFrameComplexity11 = INT_MAX;
+
+  pRefJudgement->iMinFrameNumGap = INT_MAX;
+  pRefJudgement->iMinFrameQp = INT_MAX;
+}
+bool CWelsPreProcessScreen::JudgeBestRef (SPicture* pRefPic, const SRefJudgement& sRefJudgement,
+    const int64_t iFrameComplexity, const bool bIsClosestLtrFrame) {
+  return (bIsClosestLtrFrame ? (iFrameComplexity < sRefJudgement.iMinFrameComplexity11) :
+          ((iFrameComplexity < sRefJudgement.iMinFrameComplexity08) || ((iFrameComplexity <= sRefJudgement.iMinFrameComplexity11)
+              && (pRefPic->iFrameAverageQp < sRefJudgement.iMinFrameQp))));
+}
+
+void CWelsPreProcessScreen::SaveBestRefToJudgement (const int32_t iRefPictureAvQP, const int64_t iComplexity,
+    SRefJudgement* pRefJudgement) {
+  pRefJudgement->iMinFrameQp = iRefPictureAvQP;
+  pRefJudgement->iMinFrameComplexity =  iComplexity;
+  pRefJudgement->iMinFrameComplexity08 = static_cast<int32_t> (iComplexity * 0.8);
+  pRefJudgement->iMinFrameComplexity11 = static_cast<int32_t> (iComplexity * 1.1);
+}
+void CWelsPreProcessScreen::SaveBestRefToLocal (SRefInfoParam* pRefPicInfo,
+    const SSceneChangeResult& sSceneChangeResult,
+    SRefInfoParam* pRefSaved) {
+  memcpy (pRefSaved, pRefPicInfo, sizeof (SRefInfoParam));
+  pRefSaved->pBestBlockStaticIdc = sSceneChangeResult.pStaticBlockIdc;
+}
+
+void CWelsPreProcessScreen::SaveBestRefToVaa (SRefInfoParam& sRefSaved, SRefInfoParam* pVaaBestRef) {
+  (*pVaaBestRef) = sRefSaved;
+}
+
+SPicture* CWelsPreProcessScreen::GetCurrentOrigFrame (int32_t iDIdx) {
+  return m_pSpatialPic[iDIdx][0];
+}
+
+ESceneChangeIdc CWelsPreProcessScreen::DetectSceneChange (SPicture* pCurPicture, SPicture* pRef) {
+  sWelsEncCtx* pCtx = m_pEncCtx;
+#define STATIC_SCENE_MOTION_RATIO 0.01f
+  SWelsSvcCodingParam* pSvcParam = pCtx->pSvcParam;
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (pCtx->pVaa);
+  SSpatialLayerInternal* pParamInternal = &pSvcParam->sDependencyLayers[0];
+  if (NULL == pCtx || NULL == pVaaExt || NULL == pCurPicture) {
+    return LARGE_CHANGED_SCENE;
+  }
+
+  const int32_t iTargetDid = pSvcParam->iSpatialLayerNum - 1;
+  if (0 != iTargetDid) {
+    return LARGE_CHANGED_SCENE;
+  }
+
+  ESceneChangeIdc iVaaFrameSceneChangeIdc = LARGE_CHANGED_SCENE;
+  SPicture** pRefPicList = GetReferenceSrcPicList (iTargetDid);
+  if (NULL == pRefPicList) {
+    return LARGE_CHANGED_SCENE;
+  }
+
+  SRefInfoParam sAvailableRefParam[MAX_REF_PIC_COUNT] = { { 0 } };
+  int32_t iAvailableRefNum = 0;
+  int32_t iAvailableSceneRefNum = 0;
+
+  int32_t iSceneChangeMethodIdx = METHOD_SCENE_CHANGE_DETECTION_SCREEN;
+  SSceneChangeResult sSceneChangeResult = {SIMILAR_SCENE, 0, 0, NULL};
+
+  SPixMap sSrcMap = { { 0 } };
+  SPixMap sRefMap = { { 0 } };
+  SRefJudgement sLtrJudgement;
+  SRefJudgement sSceneLtrJudgement;
+  SRefInfoParam sLtrSaved = {0};
+  SRefInfoParam sSceneLtrSaved = {0};
+
+  int32_t iNumOfLargeChange = 0, iNumOfMediumChangeToLtr = 0;
+
+  bool bIsClosestLtrFrame = false;
+  int32_t ret = 1, iScdIdx = 0;
+
+  SPicture* pRefPic = NULL;
+  SRefInfoParam* pRefPicInfo = NULL;
+  uint8_t*  pCurBlockStaticPointer = NULL;
+  SLogContext* pLogCtx = & (pCtx->sLogCtx);
+  const int32_t iNegligibleMotionBlocks = (static_cast<int32_t> ((pCurPicture->iWidthInPixel >> 3) *
+                                          (pCurPicture->iHeightInPixel >> 3) * STATIC_SCENE_MOTION_RATIO));
+  const uint8_t iCurTid = GetTemporalLevel (&pSvcParam->sDependencyLayers[m_pEncCtx->sSpatialIndexMap[0].iDid],
+                          pParamInternal->iCodingIndex, pSvcParam->uiGopSize);
+  if (iCurTid == INVALID_TEMPORAL_ID) {
+    return LARGE_CHANGED_SCENE;
+  }
+  const int32_t iClosestLtrFrameNum = pCtx->pLtr[iTargetDid].iLastLtrIdx[iCurTid];
+  if (pSvcParam->bEnableLongTermReference) {
+    GetAvailableRefListLosslessScreenRefSelection (pRefPicList, iCurTid, iClosestLtrFrameNum, &sAvailableRefParam[0],
+        iAvailableRefNum,
+        iAvailableSceneRefNum);
+  } else {
+    GetAvailableRefList (pRefPicList, iCurTid, iClosestLtrFrameNum, &sAvailableRefParam[0], iAvailableRefNum,
+                         iAvailableSceneRefNum);
+  }
+  //after this build, pAvailableRefList[idx].iSrcListIdx is the idx of the ref in h->spatial_pic
+  if (0 == iAvailableRefNum) {
+    WelsLog (pLogCtx, WELS_LOG_ERROR, "SceneChangeDetect() iAvailableRefNum=0 but not I.");
+    return LARGE_CHANGED_SCENE;
+  }
+
+  InitPixMap (pCurPicture, &sSrcMap);
+  InitRefJudgement (&sLtrJudgement);
+  InitRefJudgement (&sSceneLtrJudgement);
+
+  for (iScdIdx = 0; iScdIdx < iAvailableRefNum; iScdIdx ++) {
+    pCurBlockStaticPointer = pVaaExt->pVaaBlockStaticIdc[iScdIdx];
+    sSceneChangeResult.eSceneChangeIdc = SIMILAR_SCENE;
+    sSceneChangeResult.pStaticBlockIdc = pCurBlockStaticPointer;
+    sSceneChangeResult.sScrollResult.bScrollDetectFlag = false;
+
+    pRefPicInfo = & (sAvailableRefParam[iScdIdx]);
+    assert (NULL != pRefPicInfo);
+    pRefPic = pRefPicInfo->pRefPicture;
+    InitPixMap (pRefPic, &sRefMap);
+
+    bIsClosestLtrFrame = (pRefPic->iLongTermPicNum == iClosestLtrFrameNum);
+    if (0 == iScdIdx) {
+      int32_t ret = 1;
+      SScrollDetectionParam* pScrollDetectInfo = & (pVaaExt->sScrollDetectInfo);
+      memset (pScrollDetectInfo, 0, sizeof (SScrollDetectionParam));
+
+      int32_t iMethodIdx = METHOD_SCROLL_DETECTION;
+
+      m_pInterfaceVp->Set (iMethodIdx, (void*) (pScrollDetectInfo));
+      ret = m_pInterfaceVp->Process (iMethodIdx, &sSrcMap, &sRefMap);
+
+      if (ret == 0) {
+        m_pInterfaceVp->Get (iMethodIdx, (void*) (pScrollDetectInfo));
+      }
+      sSceneChangeResult.sScrollResult = pVaaExt->sScrollDetectInfo;
+    }
+
+    m_pInterfaceVp->Set (iSceneChangeMethodIdx, (void*) (&sSceneChangeResult));
+    ret = m_pInterfaceVp->Process (iSceneChangeMethodIdx, &sSrcMap, &sRefMap);
+
+    if (ret == 0) {
+      m_pInterfaceVp->Get (iSceneChangeMethodIdx, (void*)&sSceneChangeResult);
+
+      const int64_t iFrameComplexity = sSceneChangeResult.iFrameComplexity;
+      const int32_t iSceneDetectIdc = sSceneChangeResult.eSceneChangeIdc;
+      const int32_t iMotionBlockNum = sSceneChangeResult.iMotionBlockNum;
+
+      const bool bCurRefIsSceneLtr = pRefPic->bIsSceneLTR;
+      const int32_t iRefPicAvQP = pRefPic->iFrameAverageQp;
+
+      //for scene change detection
+      iNumOfLargeChange += (static_cast<int32_t> (LARGE_CHANGED_SCENE == iSceneDetectIdc));
+      iNumOfMediumChangeToLtr += (static_cast<int32_t> ((bCurRefIsSceneLtr) && (iSceneDetectIdc != SIMILAR_SCENE)));
+
+      //for reference selection
+      //this judge can only be saved when iAvailableRefNum==1, which is very limit
+      //when LTR is OFF, it can still judge from all available STR
+      if (JudgeBestRef (pRefPic, sLtrJudgement, iFrameComplexity, bIsClosestLtrFrame)) {
+        SaveBestRefToJudgement (iRefPicAvQP, iFrameComplexity, &sLtrJudgement);
+        SaveBestRefToLocal (pRefPicInfo, sSceneChangeResult, &sLtrSaved);
+      }
+      if (bCurRefIsSceneLtr && JudgeBestRef (pRefPic, sSceneLtrJudgement, iFrameComplexity, bIsClosestLtrFrame)) {
+        SaveBestRefToJudgement (iRefPicAvQP, iFrameComplexity, &sSceneLtrJudgement);
+        SaveBestRefToLocal (pRefPicInfo, sSceneChangeResult, &sSceneLtrSaved);
+      }
+
+      if (iMotionBlockNum <= iNegligibleMotionBlocks) {
+        break;
+      }
+    }
+  }
+
+  if (iNumOfLargeChange == iAvailableRefNum) {
+    iVaaFrameSceneChangeIdc = LARGE_CHANGED_SCENE;
+  } else if ((iNumOfMediumChangeToLtr == iAvailableSceneRefNum) && (0 != iAvailableSceneRefNum)) {
+    iVaaFrameSceneChangeIdc = MEDIUM_CHANGED_SCENE;
+  } else {
+    iVaaFrameSceneChangeIdc = SIMILAR_SCENE;
+  }
+
+  WelsLog (pLogCtx, WELS_LOG_DEBUG, "iVaaFrameSceneChangeIdc = %d,codingIdx = %d", iVaaFrameSceneChangeIdc,
+           pParamInternal->iCodingIndex);
+
+  SaveBestRefToVaa (sLtrSaved, & (pVaaExt->sVaaStrBestRefCandidate[0]));
+  pVaaExt->iVaaBestRefFrameNum = sLtrSaved.pRefPicture->iFrameNum;
+  pVaaExt->pVaaBestBlockStaticIdc = sLtrSaved.pBestBlockStaticIdc;
+
+  if (0 < iAvailableSceneRefNum) {
+    SaveBestRefToVaa (sSceneLtrSaved, & (pVaaExt->sVaaLtrBestRefCandidate[0]));
+  }
+
+  pVaaExt->iNumOfAvailableRef = 1;
+  return static_cast<ESceneChangeIdc> (iVaaFrameSceneChangeIdc);
+}
+
+int32_t CWelsPreProcess::GetRefFrameInfo (int32_t iRefIdx, bool bCurrentFrameIsSceneLtr, SPicture*& pRefOri) {
+  const int32_t iTargetDid = m_pEncCtx->pSvcParam->iSpatialLayerNum - 1;
+  SVAAFrameInfoExt* pVaaExt = static_cast<SVAAFrameInfoExt*> (m_pEncCtx->pVaa);
+  SRefInfoParam* pBestRefCandidateParam = (bCurrentFrameIsSceneLtr) ? (& (pVaaExt->sVaaLtrBestRefCandidate[iRefIdx])) :
+                                          (& (pVaaExt->sVaaStrBestRefCandidate[iRefIdx]));
+  pRefOri = m_pSpatialPic[iTargetDid][pBestRefCandidateParam->iSrcListIdx];
+  return (m_pSpatialPic[iTargetDid][pBestRefCandidateParam->iSrcListIdx]->iLongTermPicNum);
+}
+void  CWelsPreProcess::Padding (uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iStrideY, int32_t iStrideUV,
+                                int32_t iActualWidth, int32_t iPaddingWidth, int32_t iActualHeight, int32_t iPaddingHeight) {
+  int32_t i;
+
+  if (iPaddingHeight > iActualHeight) {
+    for (i = iActualHeight; i < iPaddingHeight; i++) {
+      memset (pSrcY + i * iStrideY, 0, iActualWidth);
+
+      if (! (i & 1)) {
+        memset (pSrcU + i / 2 * iStrideUV, 0x80, iActualWidth / 2);
+        memset (pSrcV + i / 2 * iStrideUV, 0x80, iActualWidth / 2);
+      }
+    }
+  }
+
+  if (iPaddingWidth > iActualWidth) {
+    for (i = 0; i < iPaddingHeight; i++) {
+      memset (pSrcY + i * iStrideY + iActualWidth, 0, iPaddingWidth - iActualWidth);
+      if (! (i & 1)) {
+        memset (pSrcU + i / 2 * iStrideUV + iActualWidth / 2, 0x80, (iPaddingWidth - iActualWidth) / 2);
+        memset (pSrcV + i / 2 * iStrideUV + iActualWidth / 2, 0x80, (iPaddingWidth - iActualWidth) / 2);
+      }
+    }
+  }
+}
+
+
+int32_t CWelsPreProcess::UpdateBlockIdcForScreen (uint8_t*  pCurBlockStaticPointer, const SPicture* kpRefPic,
+    const SPicture* kpSrcPic) {
+  int32_t iSceneChangeMethodIdx = METHOD_SCENE_CHANGE_DETECTION_SCREEN;
+  SSceneChangeResult sSceneChangeResult = {SIMILAR_SCENE, 0, 0, NULL};
+  sSceneChangeResult.pStaticBlockIdc = pCurBlockStaticPointer;
+  sSceneChangeResult.sScrollResult.bScrollDetectFlag = false;
+
+  SPixMap sSrcMap = { { 0 } };
+  SPixMap sRefMap = { { 0 } };
+  InitPixMap (kpSrcPic, &sSrcMap);
+  InitPixMap (kpRefPic, &sRefMap);
+
+  m_pInterfaceVp->Set (iSceneChangeMethodIdx, (void*) (&sSceneChangeResult));
+  int32_t iRet = m_pInterfaceVp->Process (iSceneChangeMethodIdx, &sSrcMap, &sRefMap);
+  if (iRet == 0) {
+    m_pInterfaceVp->Get (iSceneChangeMethodIdx, (void*)&sSceneChangeResult);
+    return 0;
+  }
+  return iRet;
+}
+
+/*!
+* \brief    exchange two picture pData planes
+* \param    ppPic1      picture pointer to picture 1
+* \param    ppPic2      picture pointer to picture 2
+* \return   none
+*/
+void CWelsPreProcess::WelsExchangeSpatialPictures (SPicture** ppPic1, SPicture** ppPic2) {
+  SPicture* tmp = *ppPic1;
+
+  assert (*ppPic1 != *ppPic2);
+
+  *ppPic1 = *ppPic2;
+  *ppPic2 = tmp;
+}
+
+void CWelsPreProcess::UpdateSrcListLosslessScreenRefSelectionWithLtr (SPicture* pCurPicture, const int32_t kiCurDid,
+    const int32_t kuiMarkLongTermPicIdx, SPicture** pLongRefList) {
+  SPicture** pLongRefSrcList = &m_pSpatialPic[kiCurDid][0];
+  for (int32_t i = 0; i < MAX_REF_PIC_COUNT; ++i) {
+    if (NULL == pLongRefSrcList[i + 1] || (NULL != pLongRefList[i] && pLongRefList[i]->bUsedAsRef
+                                           && pLongRefList[i]->bIsLongRef)) {
+      continue;
+    } else {
+      pLongRefSrcList[i + 1]->SetUnref();
+    }
+  }
+  WelsExchangeSpatialPictures (&m_pSpatialPic[kiCurDid][0],
+                               &m_pSpatialPic[kiCurDid][1 + kuiMarkLongTermPicIdx]);
+  m_iAvaliableRefInSpatialPicList = MAX_REF_PIC_COUNT;
+  (GetCurrentOrigFrame (kiCurDid))->SetUnref();
+}
+void CWelsPreProcess::UpdateSrcList (SPicture* pCurPicture, const int32_t kiCurDid, SPicture** pShortRefList,
+                                     const uint32_t kuiShortRefCount) {
+  SPicture** pRefSrcList = &m_pSpatialPic[kiCurDid][0];
+
+  //pRefSrcList[0] is for current frame
+  if (pCurPicture->bUsedAsRef || pCurPicture->bIsLongRef) {
+    if (pCurPicture->iPictureType == P_SLICE && pCurPicture->uiTemporalId != 0) {
+      for (int iRefIdx = kuiShortRefCount - 1; iRefIdx >= 0; --iRefIdx) {
+        WelsExchangeSpatialPictures (&pRefSrcList[iRefIdx + 1],
+                                     &pRefSrcList[iRefIdx]);
+      }
+      m_iAvaliableRefInSpatialPicList = kuiShortRefCount;
+    } else {
+      WelsExchangeSpatialPictures (&pRefSrcList[0], &pRefSrcList[1]);
+      for (int32_t i = MAX_SHORT_REF_COUNT - 1; i > 0  ; --i) {
+        if (pRefSrcList[i + 1] != NULL) {
+          pRefSrcList[i + 1]->SetUnref();
+        }
+      }
+      m_iAvaliableRefInSpatialPicList = 1;
+    }
+  }
+  (GetCurrentOrigFrame (kiCurDid))->SetUnref();
+}
+
+//TODO: may opti later
+//TODO: not use this func?
+void* WelsMemcpy (void* dst, const void* kpSrc, uint32_t uiSize) {
+  return ::memcpy (dst, kpSrc, uiSize);
+}
+void* WelsMemset (void* p, int32_t val, uint32_t uiSize) {
+  return ::memset (p, val, uiSize);
+}
+
+//i420_to_i420_c
+void  WelsMoveMemory_c (uint8_t* pDstY, uint8_t* pDstU, uint8_t* pDstV,  int32_t iDstStrideY, int32_t iDstStrideUV,
+                        uint8_t* pSrcY, uint8_t* pSrcU, uint8_t* pSrcV, int32_t iSrcStrideY, int32_t iSrcStrideUV, int32_t iWidth,
+                        int32_t iHeight) {
+  int32_t   iWidth2 = iWidth >> 1;
+  int32_t   iHeight2 = iHeight >> 1;
+  int32_t   j;
+
+  for (j = iHeight; j; j--) {
+    WelsMemcpy (pDstY, pSrcY, iWidth);
+    pDstY += iDstStrideY;
+    pSrcY += iSrcStrideY;
+  }
+
+  for (j = iHeight2; j; j--) {
+    WelsMemcpy (pDstU, pSrcU, iWidth2);
+    WelsMemcpy (pDstV, pSrcV, iWidth2);
+    pDstU += iDstStrideUV;
+    pDstV += iDstStrideUV;
+    pSrcU += iSrcStrideUV;
+    pSrcV += iSrcStrideUV;
+  }
+}
+
+void  CWelsPreProcess::WelsMoveMemoryWrapper (SWelsSvcCodingParam* pSvcParam, SPicture* pDstPic,
+    const SSourcePicture* kpSrc,
+    const int32_t kiTargetWidth, const int32_t kiTargetHeight) {
+  if (VIDEO_FORMAT_I420 != (kpSrc->iColorFormat & (~VIDEO_FORMAT_VFlip)))
+    return;
+
+  int32_t  iSrcWidth       = kpSrc->iPicWidth;
+  int32_t  iSrcHeight      = kpSrc->iPicHeight;
+
+  if (iSrcHeight > kiTargetHeight) iSrcHeight = kiTargetHeight;
+  if (iSrcWidth > kiTargetWidth)   iSrcWidth  = kiTargetWidth;
+
+  // copy from fr26 to fix the odd uiSize failed issue
+  if (iSrcWidth & 0x1)  -- iSrcWidth;
+  if (iSrcHeight & 0x1) -- iSrcHeight;
+
+  const int32_t kiSrcTopOffsetY = pSvcParam->SUsedPicRect.iTop;
+  const int32_t kiSrcTopOffsetUV = (kiSrcTopOffsetY >> 1);
+  const int32_t kiSrcLeftOffsetY = pSvcParam->SUsedPicRect.iLeft;
+  const int32_t kiSrcLeftOffsetUV = (kiSrcLeftOffsetY >> 1);
+  int32_t  iSrcOffset[3]       = {0, 0, 0};
+  iSrcOffset[0] = kpSrc->iStride[0] * kiSrcTopOffsetY + kiSrcLeftOffsetY;
+  iSrcOffset[1] = kpSrc->iStride[1] * kiSrcTopOffsetUV + kiSrcLeftOffsetUV ;
+  iSrcOffset[2] = kpSrc->iStride[2] * kiSrcTopOffsetUV + kiSrcLeftOffsetUV;
+
+  uint8_t* pSrcY = kpSrc->pData[0] + iSrcOffset[0];
+  uint8_t* pSrcU = kpSrc->pData[1] + iSrcOffset[1];
+  uint8_t* pSrcV = kpSrc->pData[2] + iSrcOffset[2];
+  const int32_t kiSrcStrideY = kpSrc->iStride[0];
+  const int32_t kiSrcStrideUV = kpSrc->iStride[1];
+
+  uint8_t* pDstY = pDstPic->pData[0];
+  uint8_t* pDstU = pDstPic->pData[1];
+  uint8_t* pDstV = pDstPic->pData[2];
+  const int32_t kiDstStrideY = pDstPic->iLineSize[0];
+  const int32_t kiDstStrideUV = pDstPic->iLineSize[1];
+
+  if (pSrcY) {
+    if (iSrcWidth <= 0 || iSrcHeight <= 0 || (iSrcWidth * iSrcHeight > (MAX_MBS_PER_FRAME << 8)))
+      return;
+    if (kiSrcTopOffsetY >= iSrcHeight || kiSrcLeftOffsetY >= iSrcWidth || iSrcWidth > kiSrcStrideY)
+      return;
+  }
+  if (pDstY) {
+    if (kiTargetWidth <= 0 || kiTargetHeight <= 0 || (kiTargetWidth * kiTargetHeight > (MAX_MBS_PER_FRAME << 8)))
+      return;
+    if (kiTargetWidth > kiDstStrideY)
+      return;
+  }
+
+  if (pSrcY == NULL || pSrcU == NULL || pSrcV == NULL || pDstY == NULL || pDstU == NULL || pDstV == NULL
+      || (iSrcWidth & 1) || (iSrcHeight & 1)) {
+  } else {
+    //i420_to_i420_c
+    WelsMoveMemory_c (pDstY,  pDstU,  pDstV,  kiDstStrideY, kiDstStrideUV,
+                      pSrcY,  pSrcU,  pSrcV, kiSrcStrideY, kiSrcStrideUV, iSrcWidth, iSrcHeight);
+
+    //in VP Process
+    if (kiTargetWidth > iSrcWidth || kiTargetHeight > iSrcHeight) {
+      Padding (pDstY, pDstU, pDstV, kiDstStrideY, kiDstStrideUV, iSrcWidth, kiTargetWidth, iSrcHeight, kiTargetHeight);
+    }
+  }
+
+}
+
+bool CWelsPreProcess::GetSceneChangeFlag (ESceneChangeIdc eSceneChangeIdc) {
+  return ((eSceneChangeIdc == LARGE_CHANGED_SCENE) ? true : false);
+}
+
+
+//*********************************************************************************************************/
+} // namespace WelsEnc
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_base.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_base.cpp
new file mode 100644
index 0000000000..3cc7bd2b30
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_base.cpp
@@ -0,0 +1,52 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_base.cpp
+ *
+ * \brief   function for base task
+ *
+ * \date    5/09/2012 Created
+ *
+ *************************************************************************************
+ */
+#include "wels_task_base.h"
+
+namespace WelsEnc {
+
+
+CWelsBaseTask::~CWelsBaseTask() {
+}
+
+
+}
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_encoder.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_encoder.cpp
new file mode 100644
index 0000000000..9b062df3b6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_encoder.cpp
@@ -0,0 +1,341 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_encoder.h
+ *
+ * \brief   interface for encoder tasks
+ *
+ * \date    07/06/2015 Created
+ *
+ *************************************************************************************
+ */
+
+#include <string.h>
+#include <assert.h>
+
+#include "typedefs.h"
+#include "utils.h"
+#include "measure_time.h"
+#include "WelsTask.h"
+
+#include "wels_task_base.h"
+#include "wels_task_encoder.h"
+
+#include "svc_enc_golomb.h"
+#include "svc_encode_slice.h"
+#include "slice_multi_threading.h"
+
+namespace WelsEnc {
+
+CWelsSliceEncodingTask::CWelsSliceEncodingTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx,
+    const int32_t iSliceIdx) : CWelsBaseTask (pSink), m_eTaskResult (ENC_RETURN_SUCCESS) {
+  m_pCtx = pCtx;
+  m_iSliceIdx = iSliceIdx;
+}
+
+CWelsSliceEncodingTask::~CWelsSliceEncodingTask() {
+}
+
+WelsErrorType CWelsSliceEncodingTask::Execute() {
+  //fprintf(stdout, "OpenH264Enc_CWelsSliceEncodingTask_Execute, %x, sink=%x\n", this, m_pSink);
+
+  m_eTaskResult = InitTask();
+  WELS_VERIFY_RETURN_IFNEQ (m_eTaskResult, ENC_RETURN_SUCCESS)
+
+  m_eTaskResult = ExecuteTask();
+
+  FinishTask();
+
+  //fprintf(stdout, "OpenH264Enc_CWelsSliceEncodingTask_Execute Ends\n");
+  return m_eTaskResult;
+}
+
+WelsErrorType CWelsSliceEncodingTask::SetBoundary (int32_t iStartIdx,  int32_t iEndIdx) {
+  m_iStartMbIdx = iStartIdx;
+  m_iEndMbIdx = iEndIdx;
+  return ENC_RETURN_SUCCESS;
+}
+
+int32_t CWelsSliceEncodingTask::QueryEmptyThread (bool* pThreadBsBufferUsage) {
+  for (int32_t k = 0; k < MAX_THREADS_NUM; k++) {
+    if (pThreadBsBufferUsage[k] == false) {
+      pThreadBsBufferUsage[k] = true;
+      return k;
+    }
+  }
+  return -1;
+}
+
+WelsErrorType CWelsSliceEncodingTask::InitTask() {
+  m_eNalType          = m_pCtx->eNalType;
+  m_eNalRefIdc        = m_pCtx->eNalPriority;
+  m_bNeedPrefix       = m_pCtx->bNeedPrefixNalFlag;
+
+  WelsMutexLock (&m_pCtx->pSliceThreading->mutexThreadBsBufferUsage);
+  m_iThreadIdx = QueryEmptyThread (m_pCtx->pSliceThreading->bThreadBsBufferUsage);
+  WelsMutexUnlock (&m_pCtx->pSliceThreading->mutexThreadBsBufferUsage);
+
+  WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
+           "[MT] CWelsSliceEncodingTask()InitTask for m_iSliceIdx %d, lock thread %d",
+           m_iSliceIdx, m_iThreadIdx);
+  if (m_iThreadIdx < 0) {
+    WelsLog (&m_pCtx->sLogCtx, WELS_LOG_WARNING,
+             "[MT] CWelsSliceEncodingTask InitTask(), Cannot find available thread for m_iSliceIdx = %d", m_iSliceIdx);
+    return ENC_RETURN_UNEXPECTED;
+  }
+
+  int32_t iReturn = InitOneSliceInThread (m_pCtx, m_pSlice, m_iThreadIdx, m_pCtx->uiDependencyId, m_iSliceIdx);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+  m_pSliceBs = &m_pSlice->sSliceBs;
+
+  iReturn   = SetSliceBoundaryInfo (m_pCtx->pCurDqLayer, m_pSlice, m_iSliceIdx);
+  WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+
+  SetOneSliceBsBufferUnderMultithread (m_pCtx, m_iThreadIdx, m_pSlice);
+
+  assert ((void*) (&m_pSliceBs->sBsWrite) == (void*)m_pSlice->pSliceBsa);
+  InitBits (&m_pSliceBs->sBsWrite, m_pSliceBs->pBsBuffer, m_pSliceBs->uiSize);
+  //printf ("CWelsSliceEncodingTask_InitTask slice %d\n", m_iSliceIdx);
+
+  return ENC_RETURN_SUCCESS;
+}
+
+void CWelsSliceEncodingTask::FinishTask() {
+  WelsMutexLock (&m_pCtx->pSliceThreading->mutexThreadBsBufferUsage);
+  m_pCtx->pSliceThreading->bThreadBsBufferUsage[m_iThreadIdx] = false;
+  WelsMutexUnlock (&m_pCtx->pSliceThreading->mutexThreadBsBufferUsage);
+
+  WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
+           "[MT] CWelsSliceEncodingTask()FinishTask for m_iSliceIdx %d, unlock thread %d",
+           m_iSliceIdx, m_iThreadIdx);
+
+  //sync multi-threading error
+  WelsMutexLock (&m_pCtx->mutexEncoderError);
+  if (ENC_RETURN_SUCCESS != m_eTaskResult) {
+    m_pCtx->iEncoderError |= m_eTaskResult;
+  }
+  WelsMutexUnlock (&m_pCtx->mutexEncoderError);
+}
+
+WelsErrorType CWelsSliceEncodingTask::ExecuteTask() {
+
+#if MT_DEBUG_BS_WR
+  m_pSliceBs->bSliceCodedFlag = false;
+#endif//MT_DEBUG_BS_WR
+  SSpatialLayerInternal* pParamInternal = &m_pCtx->pSvcParam->sDependencyLayers[m_pCtx->uiDependencyId];
+  if (m_bNeedPrefix) {
+    if (m_eNalRefIdc != NRI_PRI_LOWEST) {
+      WelsLoadNalForSlice (m_pSliceBs, NAL_UNIT_PREFIX, m_eNalRefIdc);
+      WelsWriteSVCPrefixNal (&m_pSliceBs->sBsWrite, m_eNalRefIdc, (NAL_UNIT_CODED_SLICE_IDR == m_eNalType));
+      WelsUnloadNalForSlice (m_pSliceBs);
+    } else { // No Prefix NAL Unit RBSP syntax here, but need add NAL Unit Header extension
+      WelsLoadNalForSlice (m_pSliceBs, NAL_UNIT_PREFIX, m_eNalRefIdc);
+      // No need write any syntax of prefix NAL Unit RBSP here
+      WelsUnloadNalForSlice (m_pSliceBs);
+    }
+  }
+
+  WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);
+  assert (m_iSliceIdx == (int) m_pSlice->iSliceIdx);
+  int32_t iReturn = WelsCodeOneSlice (m_pCtx, m_pSlice, m_eNalType);
+  if (ENC_RETURN_SUCCESS != iReturn) {
+    return iReturn;
+  }
+  WelsUnloadNalForSlice (m_pSliceBs);
+
+  m_iSliceSize = 0;
+  iReturn      = WriteSliceBs (m_pCtx, m_pSliceBs, m_iSliceIdx, m_iSliceSize);
+  if (ENC_RETURN_SUCCESS != iReturn) {
+    WelsLog (&m_pCtx->sLogCtx, WELS_LOG_WARNING,
+             "[MT] CWelsSliceEncodingTask ExecuteTask(), WriteSliceBs not successful: coding_idx %d, um_iSliceIdx %d",
+             pParamInternal->iCodingIndex,
+             m_iSliceIdx);
+    return iReturn;
+  }
+
+  m_pCtx->pFuncList->pfDeblocking.pfDeblockingFilterSlice (m_pCtx->pCurDqLayer, m_pCtx->pFuncList, m_pSlice);
+
+  WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DETAIL,
+           "@pSlice=%-6d sliceType:%c idc:%d size:%-6d",  m_iSliceIdx,
+           (m_pCtx->eSliceType == P_SLICE ? 'P' : 'I'),
+           m_eNalRefIdc,
+           m_iSliceSize);
+
+#if MT_DEBUG_BS_WR
+  m_pSliceBs->bSliceCodedFlag = true;
+#endif//MT_DEBUG_BS_WR
+
+  return ENC_RETURN_SUCCESS;
+}
+
+
+// CWelsLoadBalancingSlicingEncodingTask
+WelsErrorType CWelsLoadBalancingSlicingEncodingTask::InitTask() {
+  WelsErrorType iReturn = CWelsSliceEncodingTask::InitTask();
+  if (ENC_RETURN_SUCCESS != iReturn) {
+    return iReturn;
+  }
+
+  m_iSliceStart = WelsTime();
+  WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
+           "[MT] CWelsLoadBalancingSlicingEncodingTask()InitTask for m_iSliceIdx %d at time=%" PRId64,
+           m_iSliceIdx, m_iSliceStart);
+
+  return ENC_RETURN_SUCCESS;
+}
+
+void CWelsLoadBalancingSlicingEncodingTask::FinishTask() {
+  CWelsSliceEncodingTask::FinishTask();
+  SSpatialLayerInternal* pParamInternal = &m_pCtx->pSvcParam->sDependencyLayers[m_pCtx->uiDependencyId];
+  m_pSlice->uiSliceConsumeTime = (uint32_t) (WelsTime() - m_iSliceStart);
+  WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
+           "[MT] CWelsLoadBalancingSlicingEncodingTask()FinishTask, coding_idx %d, um_iSliceIdx %d, uiSliceConsumeTime %d, m_iSliceSize %d, iFirstMbInSlice %d, count_num_mb_in_slice %d at time=%"
+           PRId64,
+           pParamInternal->iCodingIndex,
+           m_iSliceIdx,
+           m_pSlice->uiSliceConsumeTime,
+           m_iSliceSize,
+           m_pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice,
+           m_pSlice->iCountMbNumInSlice,
+           (m_pSlice->uiSliceConsumeTime + m_iSliceStart));
+}
+
+//CWelsConstrainedSizeSlicingEncodingTask
+WelsErrorType CWelsConstrainedSizeSlicingEncodingTask::ExecuteTask() {
+
+  SDqLayer* pCurDq                        = m_pCtx->pCurDqLayer;
+  const int32_t kiSliceIdxStep            = m_pCtx->iActiveThreadsNum;
+  SSpatialLayerInternal* pParamInternal   = &m_pCtx->pSvcParam->sDependencyLayers[m_pCtx->uiDependencyId];
+  const int32_t kiPartitionId             = m_iSliceIdx % kiSliceIdxStep;
+  const int32_t kiFirstMbInPartition      = pCurDq->FirstMbIdxOfPartition[kiPartitionId];
+  const int32_t kiEndMbIdxInPartition     = pCurDq->EndMbIdxOfPartition[kiPartitionId];
+  const int32_t kiCodedSliceNumByThread   = pCurDq->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum;
+  m_pSlice                                = &pCurDq->sSliceBufferInfo[m_iThreadIdx].pSliceBuffer[kiCodedSliceNumByThread];
+  m_pSlice->sSliceHeaderExt.sSliceHeader.iFirstMbInSlice  = kiFirstMbInPartition;
+  int32_t iReturn      = 0;
+  bool bNeedReallocate = false;
+
+  int32_t iDiffMbIdx = kiEndMbIdxInPartition - kiFirstMbInPartition;
+  if (0 == iDiffMbIdx) {
+    m_pSlice->iSliceIdx = -1;
+    return ENC_RETURN_SUCCESS;
+  }
+
+  int32_t iAnyMbLeftInPartition = iDiffMbIdx + 1;
+  int32_t iLocalSliceIdx = m_iSliceIdx;
+  while (iAnyMbLeftInPartition > 0) {
+    bNeedReallocate = (pCurDq->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum
+                       >=  pCurDq->sSliceBufferInfo[m_iThreadIdx].iMaxSliceNum - 1) ? true : false;
+    if (bNeedReallocate) {
+      WelsMutexLock (&m_pCtx->pSliceThreading->mutexThreadSlcBuffReallocate);
+      //for memory statistic variable
+      iReturn = ReallocateSliceInThread (m_pCtx, pCurDq, m_pCtx->uiDependencyId, m_iThreadIdx);
+      WelsMutexUnlock (&m_pCtx->pSliceThreading->mutexThreadSlcBuffReallocate);
+      if (ENC_RETURN_SUCCESS != iReturn) {
+        return iReturn;
+      }
+    }
+
+    iReturn = InitOneSliceInThread (m_pCtx, m_pSlice, m_iThreadIdx, m_pCtx->uiDependencyId, iLocalSliceIdx);
+    WELS_VERIFY_RETURN_IFNEQ (iReturn, ENC_RETURN_SUCCESS)
+    m_pSliceBs = &m_pSlice->sSliceBs;
+    InitBits (&m_pSliceBs->sBsWrite, m_pSliceBs->pBsBuffer, m_pSliceBs->uiSize);
+
+    if (m_bNeedPrefix) {
+      if (m_eNalRefIdc != NRI_PRI_LOWEST) {
+        WelsLoadNalForSlice (m_pSliceBs, NAL_UNIT_PREFIX, m_eNalRefIdc);
+        WelsWriteSVCPrefixNal (&m_pSliceBs->sBsWrite, m_eNalRefIdc, (NAL_UNIT_CODED_SLICE_IDR == m_eNalType));
+        WelsUnloadNalForSlice (m_pSliceBs);
+      } else { // No Prefix NAL Unit RBSP syntax here, but need add NAL Unit Header extension
+        WelsLoadNalForSlice (m_pSliceBs, NAL_UNIT_PREFIX, m_eNalRefIdc);
+        // No need write any syntax of prefix NAL Unit RBSP here
+        WelsUnloadNalForSlice (m_pSliceBs);
+      }
+    }
+
+    WelsLoadNalForSlice (m_pSliceBs, m_eNalType, m_eNalRefIdc);
+
+    assert (iLocalSliceIdx == (int) m_pSlice->iSliceIdx);
+    int32_t iReturn = WelsCodeOneSlice (m_pCtx, m_pSlice, m_eNalType);
+    if (ENC_RETURN_SUCCESS != iReturn) {
+      return iReturn;
+    }
+    WelsUnloadNalForSlice (m_pSliceBs);
+
+    iReturn    = WriteSliceBs (m_pCtx, m_pSliceBs, iLocalSliceIdx, m_iSliceSize);
+    if (ENC_RETURN_SUCCESS != iReturn) {
+      WelsLog (&m_pCtx->sLogCtx, WELS_LOG_WARNING,
+               "[MT] CWelsConstrainedSizeSlicingEncodingTask ExecuteTask(), WriteSliceBs not successful: coding_idx %d, uiLocalSliceIdx %d, BufferSize %d, m_iSliceSize %d, iPayloadSize %d",
+               pParamInternal->iCodingIndex,
+               iLocalSliceIdx, m_pSliceBs->uiSize, m_iSliceSize, m_pSliceBs->sNalList[0].iPayloadSize);
+      return iReturn;
+    }
+    m_pCtx->pFuncList->pfDeblocking.pfDeblockingFilterSlice (pCurDq, m_pCtx->pFuncList, m_pSlice);
+
+    WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DETAIL,
+             "@pSlice=%-6d sliceType:%c idc:%d size:%-6d\n",
+             iLocalSliceIdx,
+             (m_pCtx->eSliceType == P_SLICE ? 'P' : 'I'),
+             m_eNalRefIdc,
+             m_iSliceSize
+            );
+
+    WelsLog (&m_pCtx->sLogCtx, WELS_LOG_DEBUG,
+             "[MT] CWelsConstrainedSizeSlicingEncodingTask(), coding_idx %d, iPartitionId %d, m_iThreadIdx %d, iLocalSliceIdx %d, m_iSliceSize %d, ParamValidationExt(), invalid uiMaxNalSizeiEndMbInPartition %d, pCurDq->LastCodedMbIdxOfPartition[%d] %d\n",
+             pParamInternal->iCodingIndex, kiPartitionId, m_iThreadIdx, iLocalSliceIdx, m_iSliceSize,
+             kiEndMbIdxInPartition, kiPartitionId, pCurDq->LastCodedMbIdxOfPartition[kiPartitionId]);
+
+    iAnyMbLeftInPartition = kiEndMbIdxInPartition - pCurDq->LastCodedMbIdxOfPartition[kiPartitionId];
+    iLocalSliceIdx += kiSliceIdxStep;
+    m_pCtx->pCurDqLayer->sSliceBufferInfo[m_iThreadIdx].iCodedSliceNum ++;
+  }
+
+  return ENC_RETURN_SUCCESS;
+}
+
+
+CWelsUpdateMbMapTask::CWelsUpdateMbMapTask (WelsCommon::IWelsTaskSink* pSink, sWelsEncCtx* pCtx,
+    const int32_t iSliceIdx): CWelsBaseTask (pSink) {
+  m_pCtx = pCtx;
+  m_iSliceIdx = iSliceIdx;
+}
+
+CWelsUpdateMbMapTask::~CWelsUpdateMbMapTask() {
+}
+
+WelsErrorType CWelsUpdateMbMapTask::Execute() {
+  UpdateMbListNeighborParallel (m_pCtx->pCurDqLayer, m_pCtx->pCurDqLayer->sMbDataP, m_iSliceIdx);
+  return ENC_RETURN_SUCCESS;
+}
+
+}
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_management.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_management.cpp
new file mode 100644
index 0000000000..0aa00dbc2f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/src/wels_task_management.cpp
@@ -0,0 +1,277 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2015, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    wels_task_management.cpp
+ *
+ * \brief   function for task management
+ *
+ * \date    5/14/2012 Created
+ *
+ *************************************************************************************
+ */
+#include <string.h>
+#include <assert.h>
+
+#include "typedefs.h"
+#include "utils.h"
+#include "WelsLock.h"
+#include "memory_align.h"
+
+#include "wels_common_basis.h"
+#include "encoder_context.h"
+#include "wels_task_base.h"
+#include "wels_task_encoder.h"
+#include "wels_task_management.h"
+
+namespace WelsEnc {
+
+
+
+IWelsTaskManage*   IWelsTaskManage::CreateTaskManage (sWelsEncCtx* pCtx, const int32_t iSpatialLayer,
+    const bool bNeedLock) {
+  if (NULL == pCtx) {
+    return NULL;
+  }
+
+  IWelsTaskManage* pTaskManage;
+  pTaskManage = WELS_NEW_OP (CWelsTaskManageBase(), CWelsTaskManageBase);
+  WELS_VERIFY_RETURN_IF (NULL, NULL == pTaskManage)
+
+  if (ENC_RETURN_SUCCESS != pTaskManage->Init (pCtx)) {
+    pTaskManage->Uninit();
+    WELS_DELETE_OP (pTaskManage);
+  }
+  return pTaskManage;
+}
+
+
+CWelsTaskManageBase::CWelsTaskManageBase()
+  : m_pEncCtx (NULL),
+    m_pThreadPool (NULL),
+    m_iWaitTaskNum (0) {
+
+  for (int32_t iDid = 0; iDid < MAX_DEPENDENCY_LAYER; iDid++) {
+    m_iTaskNum[iDid] = 0;
+    m_cEncodingTaskList[iDid] = new TASKLIST_TYPE();
+    m_cPreEncodingTaskList[iDid] = new TASKLIST_TYPE();
+  }
+
+  WelsEventOpen (&m_hTaskEvent);
+  WelsMutexInit (&m_hEventMutex);
+}
+
+CWelsTaskManageBase::~CWelsTaskManageBase() {
+  //fprintf(stdout, "~CWelsTaskManageBase\n");
+  Uninit();
+}
+
+WelsErrorType CWelsTaskManageBase::Init (sWelsEncCtx* pEncCtx) {
+  m_pEncCtx = pEncCtx;
+  m_iThreadNum = m_pEncCtx->pSvcParam->iMultipleThreadIdc;
+
+  int32_t iReturn = ENC_RETURN_SUCCESS;
+  //fprintf(stdout, "m_pThreadPool = &(CWelsThreadPool::GetInstance, this=%x\n", this);
+  iReturn = CWelsThreadPool::SetThreadNum (m_iThreadNum);
+  m_pThreadPool = (CWelsThreadPool::AddReference());
+  if ((iReturn != ENC_RETURN_SUCCESS) && pEncCtx) {
+    WelsLog (& (pEncCtx->sLogCtx), WELS_LOG_WARNING, "Set Thread Num to %d did not succeed, current thread num in use: %d",
+             m_iThreadNum, m_pThreadPool->GetThreadNum());
+  }
+  WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == m_pThreadPool)
+  //fprintf(stdout, "m_pThreadPool = &(CWelsThreadPool::GetInstance3\n");
+
+  iReturn = ENC_RETURN_SUCCESS;
+  for (int32_t iDid = 0; iDid < MAX_DEPENDENCY_LAYER; iDid++) {
+    m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_ENCODING][iDid] = m_cEncodingTaskList[iDid];
+    m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_UPDATEMBMAP][iDid] = m_cPreEncodingTaskList[iDid];
+    iReturn |= CreateTasks (pEncCtx, iDid);
+  }
+
+  //fprintf(stdout, "CWelsTaskManageBase Init m_iThreadNum %d m_iCurrentTaskNum %d pEncCtx->iMaxSliceCount %d\n", m_iThreadNum, m_iCurrentTaskNum, pEncCtx->iMaxSliceCount);
+  return iReturn;
+}
+
+void   CWelsTaskManageBase::Uninit() {
+  DestroyTasks();
+  //fprintf(stdout, "m_pThreadPool = m_pThreadPool->RemoveInstance\n");
+  if (m_pThreadPool)
+    m_pThreadPool->RemoveInstance();
+  //WELS_DELETE_OP (m_pThreadPool);
+
+  //fprintf(stdout, "m_pThreadPool = m_pThreadPool->RemoveInstance2\n");
+
+  for (int32_t iDid = 0; iDid < MAX_DEPENDENCY_LAYER; iDid++) {
+    WELS_DELETE_OP (m_cEncodingTaskList[iDid]);
+    WELS_DELETE_OP (m_cPreEncodingTaskList[iDid]);
+  }
+  WelsEventClose (&m_hTaskEvent);
+  WelsMutexDestroy (&m_hEventMutex);
+}
+
+WelsErrorType CWelsTaskManageBase::CreateTasks (sWelsEncCtx* pEncCtx, const int32_t kiCurDid) {
+  CWelsBaseTask* pTask = NULL;
+  int32_t kiTaskCount;
+  uint32_t uiSliceMode = pEncCtx->pSvcParam->sSpatialLayers[kiCurDid].sSliceArgument.uiSliceMode;
+
+  if (uiSliceMode != SM_SIZELIMITED_SLICE) {
+    kiTaskCount = m_iTaskNum[kiCurDid] = pEncCtx->pSvcParam->sSpatialLayers[kiCurDid].sSliceArgument.uiSliceNum;
+  } else {
+    kiTaskCount = m_iTaskNum[kiCurDid] = pEncCtx->iActiveThreadsNum;
+  }
+
+  for (int idx = 0; idx < kiTaskCount; idx++) {
+    pTask = WELS_NEW_OP (CWelsUpdateMbMapTask (this, pEncCtx, idx), CWelsUpdateMbMapTask);
+    WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pTask)
+    WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, true != m_cPreEncodingTaskList[kiCurDid]->push_back (pTask));
+  }
+
+  for (int idx = 0; idx < kiTaskCount; idx++) {
+    if (uiSliceMode == SM_SIZELIMITED_SLICE) {
+      pTask = WELS_NEW_OP (CWelsConstrainedSizeSlicingEncodingTask (this, pEncCtx, idx),
+                           CWelsConstrainedSizeSlicingEncodingTask);
+    } else {
+      if (pEncCtx->pSvcParam->bUseLoadBalancing) {
+        pTask = WELS_NEW_OP (CWelsLoadBalancingSlicingEncodingTask (this, pEncCtx, idx), CWelsLoadBalancingSlicingEncodingTask);
+      } else {
+        pTask = WELS_NEW_OP (CWelsSliceEncodingTask (this, pEncCtx, idx), CWelsSliceEncodingTask);
+      }
+    }
+    WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, NULL == pTask)
+    WELS_VERIFY_RETURN_IF (ENC_RETURN_MEMALLOCERR, true != m_cEncodingTaskList[kiCurDid]->push_back (pTask));
+  }
+
+  //fprintf(stdout, "CWelsTaskManageBase CreateTasks m_iThreadNum %d kiTaskCount=%d\n", m_iThreadNum, kiTaskCount);
+  return ENC_RETURN_SUCCESS;
+}
+
+void CWelsTaskManageBase::DestroyTaskList (TASKLIST_TYPE* pTargetTaskList) {
+  //fprintf(stdout, "CWelsTaskManageBase: pTargetTaskList size=%d m_iTotalTaskNum=%d\n", static_cast<int32_t> (pTargetTaskList->size()), m_iTotalTaskNum);
+  while (NULL != pTargetTaskList->begin()) {
+    CWelsBaseTask* pTask = pTargetTaskList->begin();
+    WELS_DELETE_OP (pTask);
+    pTargetTaskList->pop_front();
+  }
+  pTargetTaskList = NULL;
+}
+
+void CWelsTaskManageBase::DestroyTasks() {
+  for (int32_t iDid = 0; iDid < MAX_DEPENDENCY_LAYER; iDid++)  {
+    if (m_iTaskNum[iDid] > 0) {
+      DestroyTaskList (m_cEncodingTaskList[iDid]);
+      DestroyTaskList (m_cPreEncodingTaskList[iDid]);
+      m_iTaskNum[iDid] = 0;
+      m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_ENCODING][iDid] = NULL;
+    }
+  }
+  //fprintf(stdout, "[MT] CWelsTaskManageBase() DestroyTasks, cleaned %d tasks\n", m_iTotalTaskNum);
+}
+
+void  CWelsTaskManageBase::OnTaskMinusOne() {
+  //fprintf(stdout, "OnTaskMinusOne event %x m_iWaitTaskNum=%d\n", &m_hEventMutex, m_iWaitTaskNum);
+  WelsCommon::CWelsAutoLock cAutoLock (m_cWaitTaskNumLock);
+  WelsEventSignal (&m_hTaskEvent, &m_hEventMutex, &m_iWaitTaskNum);
+  /*WelsMutexLock(&m_hEventMutex);
+  m_iWaitTaskNum --;
+  WelsMutexUnlock(&m_hEventMutex);
+
+  if (m_iWaitTaskNum <= 0) {
+    WelsEventSignal (&m_hTaskEvent);
+    fprintf(stdout, "OnTaskMinusOne WelsEventSignal m_iWaitTaskNum=%d\n", m_iWaitTaskNum);
+  }*/
+  //fprintf(stdout, "OnTaskMinusOne m_iWaitTaskNum=%d\n", m_iWaitTaskNum);
+}
+
+WelsErrorType  CWelsTaskManageBase::OnTaskCancelled() {
+  OnTaskMinusOne();
+  return ENC_RETURN_SUCCESS;
+}
+
+WelsErrorType  CWelsTaskManageBase::OnTaskExecuted() {
+  OnTaskMinusOne();
+  return ENC_RETURN_SUCCESS;
+}
+
+WelsErrorType  CWelsTaskManageBase::ExecuteTaskList (TASKLIST_TYPE** pTaskList) {
+  m_iWaitTaskNum = m_iTaskNum[m_iCurDid];
+  TASKLIST_TYPE* pTargetTaskList = (pTaskList[m_iCurDid]);
+  //fprintf(stdout, "ExecuteTaskList m_iWaitTaskNum=%d\n", m_iWaitTaskNum);
+  if (0 == m_iWaitTaskNum) {
+    return ENC_RETURN_SUCCESS;
+  }
+
+  int32_t iCurrentTaskCount = m_iWaitTaskNum; //if directly use m_iWaitTaskNum in the loop make cause sync problem
+  int32_t iIdx = 0;
+  while (iIdx < iCurrentTaskCount) {
+    m_pThreadPool->QueueTask (pTargetTaskList->getNode (iIdx));
+    iIdx ++;
+  }
+
+  WelsEventWait (&m_hTaskEvent, &m_hEventMutex, m_iWaitTaskNum);
+
+  return ENC_RETURN_SUCCESS;
+}
+
+void CWelsTaskManageBase::InitFrame (const int32_t kiCurDid) {
+  m_iCurDid = kiCurDid;
+  if (m_pEncCtx->pCurDqLayer->bNeedAdjustingSlicing) {
+    ExecuteTaskList (m_pcAllTaskList[CWelsBaseTask::WELS_ENC_TASK_UPDATEMBMAP]);
+  }
+}
+
+WelsErrorType  CWelsTaskManageBase::ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType) {
+  return ExecuteTaskList (m_pcAllTaskList[iTaskType]);
+}
+
+int32_t  CWelsTaskManageBase::GetThreadPoolThreadNum() {
+  return m_pThreadPool->GetThreadNum();
+}
+
+// CWelsTaskManageOne is for test
+WelsErrorType CWelsTaskManageOne::Init (sWelsEncCtx* pEncCtx) {
+  m_pEncCtx = pEncCtx;
+
+  return CreateTasks (pEncCtx, pEncCtx->iMaxSliceCount);
+}
+
+WelsErrorType  CWelsTaskManageOne::ExecuteTasks (const CWelsBaseTask::ETaskType iTaskType) {
+  while (NULL != m_cEncodingTaskList[0]->begin()) {
+    (m_cEncodingTaskList[0]->begin())->Execute();
+    m_cEncodingTaskList[0]->pop_front();
+  }
+  return ENC_RETURN_SUCCESS;
+}
+// CWelsTaskManageOne is for test
+
+}
+
+
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/coeff.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/coeff.asm
new file mode 100644
index 0000000000..9297aba88c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/coeff.asm
@@ -0,0 +1,695 @@
+;*!
+;* \copy
+;*     Copyright (c)  2010-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  memzero.asm
+;*
+;*  Abstract
+;*     cavlc
+;*
+;*  History
+;*      09/08/2010 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+align 16
+
+wels_shufb_rev:
+    db 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0
+
+; 4-bit table giving number of preceding zeros for each set bit as well as the
+; eventual next bit. For the case where all 4 bits are set, this requires 5
+; zeros. The 5th zero can either be read from beyond the final table entry or
+; implied via zero-initializing the location being read into.
+wels_cavlc_param_cal_run_lut:
+    db 4, 0, 0, 0
+    db 0, 3, 0, 0
+    db 1, 2, 0, 0
+    db 0, 0, 2, 0
+    db 2, 1, 0, 0
+    db 0, 1, 1, 0
+    db 1, 0, 1, 0
+    db 0, 0, 0, 1
+    db 3, 0, 0, 0
+    db 0, 2, 0, 0
+    db 1, 1, 0, 0
+    db 0, 0, 1, 0
+    db 2, 0, 0, 0
+    db 0, 1, 0, 0
+    db 1, 0, 0, 0
+    db 0, 0, 0, 0
+;   db 0
+; 4-bit table giving pshufb vectors for compacting 4-word vectors by removing
+; the words that match zero bits and concatenating in reverse order.
+wels_cavlc_param_cal_shufb_lut:
+    db 0, 0, 0, 0, 0, 0, 0, 0
+    db 6, 7, 0, 0, 0, 0, 0, 0
+    db 4, 5, 0, 0, 0, 0, 0, 0
+    db 6, 7, 4, 5, 0, 0, 0, 0
+    db 2, 3, 0, 0, 0, 0, 0, 0
+    db 6, 7, 2, 3, 0, 0, 0, 0
+    db 4, 5, 2, 3, 0, 0, 0, 0
+    db 6, 7, 4, 5, 2, 3, 0, 0
+    db 0, 1, 0, 0, 0, 0, 0, 0
+    db 6, 7, 0, 1, 0, 0, 0, 0
+    db 4, 5, 0, 1, 0, 0, 0, 0
+    db 6, 7, 4, 5, 0, 1, 0, 0
+    db 2, 3, 0, 1, 0, 0, 0, 0
+    db 6, 7, 2, 3, 0, 1, 0, 0
+    db 4, 5, 2, 3, 0, 1, 0, 0
+    db 6, 7, 4, 5, 2, 3, 0, 1
+
+
+%ifdef X86_32
+
+align 16
+sse2_b8 db 8, 8, 8, 8, 8, 8, 8, 8
+
+ALIGN  16
+sse2_b_1 db -1, -1, -1, -1, -1, -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, -1
+
+align 16
+byte_1pos_table:
+    db 0,0,0,0,0,0,0,0, ;0
+    db 0,0,0,0,0,0,0,1, ;1
+    db 1,0,0,0,0,0,0,1, ;2
+    db 1,0,0,0,0,0,0,2, ;3
+    db 2,0,0,0,0,0,0,1, ;4
+    db 2,0,0,0,0,0,0,2, ;5
+    db 2,1,0,0,0,0,0,2, ;6
+    db 2,1,0,0,0,0,0,3, ;7
+    db 3,0,0,0,0,0,0,1, ;8
+    db 3,0,0,0,0,0,0,2, ;9
+    db 3,1,0,0,0,0,0,2, ;10
+    db 3,1,0,0,0,0,0,3, ;11
+    db 3,2,0,0,0,0,0,2, ;12
+    db 3,2,0,0,0,0,0,3, ;13
+    db 3,2,1,0,0,0,0,3, ;14
+    db 3,2,1,0,0,0,0,4, ;15
+    db 4,0,0,0,0,0,0,1, ;16
+    db 4,0,0,0,0,0,0,2, ;17
+    db 4,1,0,0,0,0,0,2, ;18
+    db 4,1,0,0,0,0,0,3, ;19
+    db 4,2,0,0,0,0,0,2, ;20
+    db 4,2,0,0,0,0,0,3, ;21
+    db 4,2,1,0,0,0,0,3, ;22
+    db 4,2,1,0,0,0,0,4, ;23
+    db 4,3,0,0,0,0,0,2, ;24
+    db 4,3,0,0,0,0,0,3, ;25
+    db 4,3,1,0,0,0,0,3, ;26
+    db 4,3,1,0,0,0,0,4, ;27
+    db 4,3,2,0,0,0,0,3, ;28
+    db 4,3,2,0,0,0,0,4, ;29
+    db 4,3,2,1,0,0,0,4, ;30
+    db 4,3,2,1,0,0,0,5, ;31
+    db 5,0,0,0,0,0,0,1, ;32
+    db 5,0,0,0,0,0,0,2, ;33
+    db 5,1,0,0,0,0,0,2, ;34
+    db 5,1,0,0,0,0,0,3, ;35
+    db 5,2,0,0,0,0,0,2, ;36
+    db 5,2,0,0,0,0,0,3, ;37
+    db 5,2,1,0,0,0,0,3, ;38
+    db 5,2,1,0,0,0,0,4, ;39
+    db 5,3,0,0,0,0,0,2, ;40
+    db 5,3,0,0,0,0,0,3, ;41
+    db 5,3,1,0,0,0,0,3, ;42
+    db 5,3,1,0,0,0,0,4, ;43
+    db 5,3,2,0,0,0,0,3, ;44
+    db 5,3,2,0,0,0,0,4, ;45
+    db 5,3,2,1,0,0,0,4, ;46
+    db 5,3,2,1,0,0,0,5, ;47
+    db 5,4,0,0,0,0,0,2, ;48
+    db 5,4,0,0,0,0,0,3, ;49
+    db 5,4,1,0,0,0,0,3, ;50
+    db 5,4,1,0,0,0,0,4, ;51
+    db 5,4,2,0,0,0,0,3, ;52
+    db 5,4,2,0,0,0,0,4, ;53
+    db 5,4,2,1,0,0,0,4, ;54
+    db 5,4,2,1,0,0,0,5, ;55
+    db 5,4,3,0,0,0,0,3, ;56
+    db 5,4,3,0,0,0,0,4, ;57
+    db 5,4,3,1,0,0,0,4, ;58
+    db 5,4,3,1,0,0,0,5, ;59
+    db 5,4,3,2,0,0,0,4, ;60
+    db 5,4,3,2,0,0,0,5, ;61
+    db 5,4,3,2,1,0,0,5, ;62
+    db 5,4,3,2,1,0,0,6, ;63
+    db 6,0,0,0,0,0,0,1, ;64
+    db 6,0,0,0,0,0,0,2, ;65
+    db 6,1,0,0,0,0,0,2, ;66
+    db 6,1,0,0,0,0,0,3, ;67
+    db 6,2,0,0,0,0,0,2, ;68
+    db 6,2,0,0,0,0,0,3, ;69
+    db 6,2,1,0,0,0,0,3, ;70
+    db 6,2,1,0,0,0,0,4, ;71
+    db 6,3,0,0,0,0,0,2, ;72
+    db 6,3,0,0,0,0,0,3, ;73
+    db 6,3,1,0,0,0,0,3, ;74
+    db 6,3,1,0,0,0,0,4, ;75
+    db 6,3,2,0,0,0,0,3, ;76
+    db 6,3,2,0,0,0,0,4, ;77
+    db 6,3,2,1,0,0,0,4, ;78
+    db 6,3,2,1,0,0,0,5, ;79
+    db 6,4,0,0,0,0,0,2, ;80
+    db 6,4,0,0,0,0,0,3, ;81
+    db 6,4,1,0,0,0,0,3, ;82
+    db 6,4,1,0,0,0,0,4, ;83
+    db 6,4,2,0,0,0,0,3, ;84
+    db 6,4,2,0,0,0,0,4, ;85
+    db 6,4,2,1,0,0,0,4, ;86
+    db 6,4,2,1,0,0,0,5, ;87
+    db 6,4,3,0,0,0,0,3, ;88
+    db 6,4,3,0,0,0,0,4, ;89
+    db 6,4,3,1,0,0,0,4, ;90
+    db 6,4,3,1,0,0,0,5, ;91
+    db 6,4,3,2,0,0,0,4, ;92
+    db 6,4,3,2,0,0,0,5, ;93
+    db 6,4,3,2,1,0,0,5, ;94
+    db 6,4,3,2,1,0,0,6, ;95
+    db 6,5,0,0,0,0,0,2, ;96
+    db 6,5,0,0,0,0,0,3, ;97
+    db 6,5,1,0,0,0,0,3, ;98
+    db 6,5,1,0,0,0,0,4, ;99
+    db 6,5,2,0,0,0,0,3, ;100
+    db 6,5,2,0,0,0,0,4, ;101
+    db 6,5,2,1,0,0,0,4, ;102
+    db 6,5,2,1,0,0,0,5, ;103
+    db 6,5,3,0,0,0,0,3, ;104
+    db 6,5,3,0,0,0,0,4, ;105
+    db 6,5,3,1,0,0,0,4, ;106
+    db 6,5,3,1,0,0,0,5, ;107
+    db 6,5,3,2,0,0,0,4, ;108
+    db 6,5,3,2,0,0,0,5, ;109
+    db 6,5,3,2,1,0,0,5, ;110
+    db 6,5,3,2,1,0,0,6, ;111
+    db 6,5,4,0,0,0,0,3, ;112
+    db 6,5,4,0,0,0,0,4, ;113
+    db 6,5,4,1,0,0,0,4, ;114
+    db 6,5,4,1,0,0,0,5, ;115
+    db 6,5,4,2,0,0,0,4, ;116
+    db 6,5,4,2,0,0,0,5, ;117
+    db 6,5,4,2,1,0,0,5, ;118
+    db 6,5,4,2,1,0,0,6, ;119
+    db 6,5,4,3,0,0,0,4, ;120
+    db 6,5,4,3,0,0,0,5, ;121
+    db 6,5,4,3,1,0,0,5, ;122
+    db 6,5,4,3,1,0,0,6, ;123
+    db 6,5,4,3,2,0,0,5, ;124
+    db 6,5,4,3,2,0,0,6, ;125
+    db 6,5,4,3,2,1,0,6, ;126
+    db 6,5,4,3,2,1,0,7, ;127
+    db 7,0,0,0,0,0,0,1, ;128
+    db 7,0,0,0,0,0,0,2, ;129
+    db 7,1,0,0,0,0,0,2, ;130
+    db 7,1,0,0,0,0,0,3, ;131
+    db 7,2,0,0,0,0,0,2, ;132
+    db 7,2,0,0,0,0,0,3, ;133
+    db 7,2,1,0,0,0,0,3, ;134
+    db 7,2,1,0,0,0,0,4, ;135
+    db 7,3,0,0,0,0,0,2, ;136
+    db 7,3,0,0,0,0,0,3, ;137
+    db 7,3,1,0,0,0,0,3, ;138
+    db 7,3,1,0,0,0,0,4, ;139
+    db 7,3,2,0,0,0,0,3, ;140
+    db 7,3,2,0,0,0,0,4, ;141
+    db 7,3,2,1,0,0,0,4, ;142
+    db 7,3,2,1,0,0,0,5, ;143
+    db 7,4,0,0,0,0,0,2, ;144
+    db 7,4,0,0,0,0,0,3, ;145
+    db 7,4,1,0,0,0,0,3, ;146
+    db 7,4,1,0,0,0,0,4, ;147
+    db 7,4,2,0,0,0,0,3, ;148
+    db 7,4,2,0,0,0,0,4, ;149
+    db 7,4,2,1,0,0,0,4, ;150
+    db 7,4,2,1,0,0,0,5, ;151
+    db 7,4,3,0,0,0,0,3, ;152
+    db 7,4,3,0,0,0,0,4, ;153
+    db 7,4,3,1,0,0,0,4, ;154
+    db 7,4,3,1,0,0,0,5, ;155
+    db 7,4,3,2,0,0,0,4, ;156
+    db 7,4,3,2,0,0,0,5, ;157
+    db 7,4,3,2,1,0,0,5, ;158
+    db 7,4,3,2,1,0,0,6, ;159
+    db 7,5,0,0,0,0,0,2, ;160
+    db 7,5,0,0,0,0,0,3, ;161
+    db 7,5,1,0,0,0,0,3, ;162
+    db 7,5,1,0,0,0,0,4, ;163
+    db 7,5,2,0,0,0,0,3, ;164
+    db 7,5,2,0,0,0,0,4, ;165
+    db 7,5,2,1,0,0,0,4, ;166
+    db 7,5,2,1,0,0,0,5, ;167
+    db 7,5,3,0,0,0,0,3, ;168
+    db 7,5,3,0,0,0,0,4, ;169
+    db 7,5,3,1,0,0,0,4, ;170
+    db 7,5,3,1,0,0,0,5, ;171
+    db 7,5,3,2,0,0,0,4, ;172
+    db 7,5,3,2,0,0,0,5, ;173
+    db 7,5,3,2,1,0,0,5, ;174
+    db 7,5,3,2,1,0,0,6, ;175
+    db 7,5,4,0,0,0,0,3, ;176
+    db 7,5,4,0,0,0,0,4, ;177
+    db 7,5,4,1,0,0,0,4, ;178
+    db 7,5,4,1,0,0,0,5, ;179
+    db 7,5,4,2,0,0,0,4, ;180
+    db 7,5,4,2,0,0,0,5, ;181
+    db 7,5,4,2,1,0,0,5, ;182
+    db 7,5,4,2,1,0,0,6, ;183
+    db 7,5,4,3,0,0,0,4, ;184
+    db 7,5,4,3,0,0,0,5, ;185
+    db 7,5,4,3,1,0,0,5, ;186
+    db 7,5,4,3,1,0,0,6, ;187
+    db 7,5,4,3,2,0,0,5, ;188
+    db 7,5,4,3,2,0,0,6, ;189
+    db 7,5,4,3,2,1,0,6, ;190
+    db 7,5,4,3,2,1,0,7, ;191
+    db 7,6,0,0,0,0,0,2, ;192
+    db 7,6,0,0,0,0,0,3, ;193
+    db 7,6,1,0,0,0,0,3, ;194
+    db 7,6,1,0,0,0,0,4, ;195
+    db 7,6,2,0,0,0,0,3, ;196
+    db 7,6,2,0,0,0,0,4, ;197
+    db 7,6,2,1,0,0,0,4, ;198
+    db 7,6,2,1,0,0,0,5, ;199
+    db 7,6,3,0,0,0,0,3, ;200
+    db 7,6,3,0,0,0,0,4, ;201
+    db 7,6,3,1,0,0,0,4, ;202
+    db 7,6,3,1,0,0,0,5, ;203
+    db 7,6,3,2,0,0,0,4, ;204
+    db 7,6,3,2,0,0,0,5, ;205
+    db 7,6,3,2,1,0,0,5, ;206
+    db 7,6,3,2,1,0,0,6, ;207
+    db 7,6,4,0,0,0,0,3, ;208
+    db 7,6,4,0,0,0,0,4, ;209
+    db 7,6,4,1,0,0,0,4, ;210
+    db 7,6,4,1,0,0,0,5, ;211
+    db 7,6,4,2,0,0,0,4, ;212
+    db 7,6,4,2,0,0,0,5, ;213
+    db 7,6,4,2,1,0,0,5, ;214
+    db 7,6,4,2,1,0,0,6, ;215
+    db 7,6,4,3,0,0,0,4, ;216
+    db 7,6,4,3,0,0,0,5, ;217
+    db 7,6,4,3,1,0,0,5, ;218
+    db 7,6,4,3,1,0,0,6, ;219
+    db 7,6,4,3,2,0,0,5, ;220
+    db 7,6,4,3,2,0,0,6, ;221
+    db 7,6,4,3,2,1,0,6, ;222
+    db 7,6,4,3,2,1,0,7, ;223
+    db 7,6,5,0,0,0,0,3, ;224
+    db 7,6,5,0,0,0,0,4, ;225
+    db 7,6,5,1,0,0,0,4, ;226
+    db 7,6,5,1,0,0,0,5, ;227
+    db 7,6,5,2,0,0,0,4, ;228
+    db 7,6,5,2,0,0,0,5, ;229
+    db 7,6,5,2,1,0,0,5, ;230
+    db 7,6,5,2,1,0,0,6, ;231
+    db 7,6,5,3,0,0,0,4, ;232
+    db 7,6,5,3,0,0,0,5, ;233
+    db 7,6,5,3,1,0,0,5, ;234
+    db 7,6,5,3,1,0,0,6, ;235
+    db 7,6,5,3,2,0,0,5, ;236
+    db 7,6,5,3,2,0,0,6, ;237
+    db 7,6,5,3,2,1,0,6, ;238
+    db 7,6,5,3,2,1,0,7, ;239
+    db 7,6,5,4,0,0,0,4, ;240
+    db 7,6,5,4,0,0,0,5, ;241
+    db 7,6,5,4,1,0,0,5, ;242
+    db 7,6,5,4,1,0,0,6, ;243
+    db 7,6,5,4,2,0,0,5, ;244
+    db 7,6,5,4,2,0,0,6, ;245
+    db 7,6,5,4,2,1,0,6, ;246
+    db 7,6,5,4,2,1,0,7, ;247
+    db 7,6,5,4,3,0,0,5, ;248
+    db 7,6,5,4,3,0,0,6, ;249
+    db 7,6,5,4,3,1,0,6, ;250
+    db 7,6,5,4,3,1,0,7, ;251
+    db 7,6,5,4,3,2,0,6, ;252
+    db 7,6,5,4,3,2,0,7, ;253
+    db 7,6,5,4,3,2,1,7, ;254
+    db 7,6,5,4,3,2,1,8, ;255
+
+%endif ; X86_32
+
+;***********************************************************************
+; Code
+;***********************************************************************
+SECTION .text
+
+
+%ifdef X86_32
+
+;***********************************************************************
+;int32_t CavlcParamCal_sse2(int16_t*coffLevel, uint8_t* run, int16_t *Level, int32_t* total_coeffs , int32_t endIdx);
+;***********************************************************************
+WELS_EXTERN CavlcParamCal_sse2
+    push ebx
+    push edi
+    push esi
+    %assign push_num 3
+    INIT_X86_32_PIC ebp
+
+    mov         eax,    arg1    ;coffLevel
+    mov         edi,    arg3    ;Level
+    mov         ebx,    arg5    ;endIdx
+    cmp         ebx,    3
+    jne         .Level16
+    pxor        xmm1,   xmm1
+    movq        xmm0,   [eax]   ; removed QWORD
+    jmp         .Cal_begin
+.Level16:
+    movdqa      xmm0,   [eax]
+    movdqa      xmm1,   [eax+16]
+.Cal_begin:
+    movdqa      xmm2,   xmm0
+    packsswb    xmm0,   xmm1
+    movdqa      xmm4,   xmm0
+    pxor        xmm3,   xmm3
+    pcmpgtb     xmm0,   xmm3
+    pcmpgtb     xmm3,   xmm4
+    por         xmm0,   xmm3
+    pmovmskb    edx,    xmm0
+    cmp         edx,    0
+    je near   .return
+    movdqa      xmm6,   [pic(sse2_b_1)]
+    pcmpeqw     xmm7,   xmm7    ;generate -1
+    mov         ebx,    0xff
+    ;pinsrw     xmm6,   ebx,    3
+
+    mov       bl,   dh
+
+    lea       ebx,  [pic(byte_1pos_table+8*ebx)]
+    movq      xmm0, [ebx]
+    pextrw    ecx,  xmm0, 3
+    shr       ecx,  8
+    mov       dh,   cl
+
+.loopHighFind0:
+    cmp       ecx,   0
+    je        .loopHighFind0End
+    ;mov       esi, [ebx]
+    ;and       esi, 0xff
+    movzx     esi, byte [ebx]
+    add       esi, 8
+    mov       esi, [eax+2*esi]
+    mov       [edi], si
+    add       edi,   2
+    ;add       ebx,   1
+    inc       ebx
+    dec       ecx
+    jmp       .loopHighFind0
+.loopHighFind0End:
+    mov       cl,   dh
+    cmp       cl,   8
+    pand      xmm0, xmm6
+    jne       .LowByteFind0
+    sub       edi,   2
+    mov       esi,   [eax+16]
+    mov       [edi], esi
+    add       edi,   2
+.LowByteFind0:
+    and       edx,  0xff
+    lea       ebx,  [pic(byte_1pos_table+8*edx)]
+    movq      xmm1, [ebx]
+    pextrw    esi,  xmm1, 3
+    or        esi,  0xff
+    or        ecx,  0xff00
+    and       ecx,  esi
+    shr       esi,  8
+    pand      xmm1, xmm6
+.loopLowFind0:
+    cmp       esi, 0
+    je        .loopLowFind0End
+    ;mov       edx, [ebx]
+    ;and       edx, 0xff
+    movzx     edx,  byte [ebx]
+    mov       edx, [eax+2*edx]
+    mov       [edi], dx
+    add       edi,   2
+    ;add       ebx,   1
+    inc       ebx
+    dec       esi
+    jmp       .loopLowFind0
+.loopLowFind0End:
+    cmp       ch,  8
+    jne       .getLevelEnd
+    sub       edi, 2
+    mov       edx, [eax]
+    mov       [edi], dx
+.getLevelEnd:
+    mov      edx, arg4  ;total_coeffs
+    ;mov      ebx,   ecx
+    ;and      ebx,   0xff
+    movzx    ebx,   byte cl
+    add      cl,    ch
+    mov      [edx], cl
+;getRun
+    movq     xmm5, [pic(sse2_b8)]
+    paddb    xmm0, xmm5
+    pxor     xmm2, xmm2
+    pxor     xmm3, xmm3
+    mov      eax,  8
+    sub      eax,  ebx
+    shl      eax,  3
+    shl      ebx,  3
+    pinsrw   xmm2, ebx, 0
+    pinsrw   xmm3, eax, 0
+    psllq    xmm0, xmm3
+    psrlq    xmm0, xmm3
+    movdqa   xmm4, xmm1
+    psllq    xmm1, xmm2
+    psrlq    xmm4, xmm3
+    punpcklqdq xmm1, xmm4
+    por      xmm0,  xmm1
+
+    pextrw   eax,   xmm0, 0
+    and      eax,   0xff
+    inc      eax
+    sub      al,    cl
+    movdqa   xmm1,  xmm0
+    paddb    xmm1,  xmm7
+    psrldq   xmm0,  1
+    psubb    xmm1,  xmm0
+    mov      ecx,   arg2 ;run
+    movdqa   [ecx], xmm1
+;getRunEnd
+.return:
+    DEINIT_X86_32_PIC
+    pop esi
+    pop edi
+    pop ebx
+    ret
+%endif ;%ifdef X86_32
+
+;***********************************************************************
+;int32_t CavlcParamCal_sse42(int16_t*coffLevel, uint8_t* run, int16_t *Level, int32_t* total_coeffs , int32_t endIdx);
+;***********************************************************************
+
+WELS_EXTERN CavlcParamCal_sse42
+%define i_endidxd      dword arg5d
+
+%ifdef X86_32
+    push            r3
+    push            r4
+    push            r5
+    push            r6
+    %assign push_num 4
+%ifdef X86_32_PICASM
+    %define p_total_coeffs r1
+%else
+    %define p_total_coeffs r0
+%endif
+    %define r_tmp r1
+    %define r_tmpd r1d
+    %define r_tmpb r1b
+    %define p_level r2
+    %define p_coeff_level r3
+    %define p_run r6
+    %define r_mask  r5
+    %define r_maskd r5d
+    %define p_shufb_lut pic(wels_cavlc_param_cal_shufb_lut)
+    %define p_run_lut   pic(wels_cavlc_param_cal_run_lut)
+    mov             p_coeff_level, arg1
+    mov             p_run, arg2
+    mov             p_level, arg3
+    mov             p_total_coeffs, arg4
+%elifdef WIN64
+    push            rbx
+    %assign push_num 1
+    %define p_coeff_level r0
+    %define p_run r1
+    %define p_level r2
+    %define p_total_coeffs r3
+    %define r_mask  rbx
+    %define r_maskd ebx
+    %define p_shufb_lut r5
+    %define p_run_lut (p_shufb_lut + (wels_cavlc_param_cal_run_lut - wels_cavlc_param_cal_shufb_lut))
+    lea             p_shufb_lut, [wels_cavlc_param_cal_shufb_lut]
+    ; Free up rcx/ecx because only cl is accepted as shift amount operand.
+    mov             r6, r0
+    %undef p_coeff_level
+    %define p_coeff_level r6
+    %define r_tmp r0
+    %define r_tmpd r0d
+    %define r_tmpb r0b
+%else
+    %assign push_num 0
+    %define p_coeff_level r0
+    %define p_run r1
+    %define p_level r2
+    %define p_total_coeffs r3
+    %define r_mask  rax
+    %define r_maskd eax
+    %define p_shufb_lut r5
+    %define i_total_zeros r6
+    %define p_run_lut (p_shufb_lut + (wels_cavlc_param_cal_run_lut - wels_cavlc_param_cal_shufb_lut))
+    lea             p_shufb_lut, [wels_cavlc_param_cal_shufb_lut]
+%endif
+    INIT_X86_32_PIC_NOPRESERVE r0
+
+    ; Acquire a bitmask indicating which words are non-zero.
+    ; Assume p_coeff_level is 16-byte-aligned and at least 32 bytes if endIdx > 3.
+    ; Otherwise, assume 8 bytes available. Assume that input beyond endIdx is zero.
+    ; Assumptions are taken from previous implementations.
+    pxor            xmm1, xmm1
+    cmp             i_endidxd, 3
+    jg              .load16
+    movq            xmm0, [p_coeff_level]
+    packsswb        xmm0, xmm1
+    jmp             .load_done
+.load16:
+    movdqa          xmm0, [p_coeff_level]
+    packsswb        xmm0, [p_coeff_level + 16]
+.load_done:
+    movdqa          [p_run], xmm1                           ; Zero-initialize because we may read back implied zeros.
+    pcmpeqb         xmm0, xmm1
+    pshufb          xmm0, [pic(wels_shufb_rev)]
+    pmovmskb        r_maskd, xmm0
+    xor             r_maskd, 0FFFFh
+%undef i_endidxd
+%define r_tmp2  r4
+%define r_tmp2d r4d
+    popcnt          r_tmp2d, r_maskd
+    mov             [p_total_coeffs], r_tmp2d
+    ; Recycle p_total_coeffs.
+%ifidni p_total_coeffs, rcx
+    %define r_tmp rcx
+    %define r_tmpd ecx
+    %define r_tmpb cl
+%else
+    %xdefine i_total_zeros p_total_coeffs
+%endif
+%undef p_total_coeffs
+%ifdef X86_32_PICASM
+    push            r_tmp2
+    %undef i_total_zeros
+    %define i_total_zeros dword [esp]
+%else
+    mov             i_total_zeros, r_tmp2
+%endif
+    jz              .done
+    bsf             r_tmpd, r_maskd                         ; Find first set bit.
+    lea             r_tmp2, [r_tmp2 + r_tmp - 16]
+    neg             r_tmp2
+    mov             i_total_zeros, r_tmp2
+    ; Skip trailing zeros.
+    ; Restrict to multiples of 4 to retain alignment and avoid out-of-bound stores.
+    and             r_tmpd, -4
+    shr             r_maskd, r_tmpb
+    add             r_tmpd, r_tmpd
+    sub             p_coeff_level, r_tmp
+    ; Handle first quadruple containing a non-zero value.
+    mov             r_tmp, r_mask
+    and             r_tmpd, 0Fh
+    movq            xmm0, [p_coeff_level + 24]
+    movq            xmm1, [p_shufb_lut + 8 * r_tmp]
+    pshufb          xmm0, xmm1
+    mov             r_tmp2d, [p_run_lut + 4 * r_tmp]
+    shr             r_tmp2d, 8                              ; Skip initial zero run.
+    movlps          [p_level], xmm0                         ; Store levels for the first quadruple.
+    mov             [p_run], r_tmp2d                        ; Store accompanying zero runs thus far.
+    shr             r_maskd, 4
+    jz              .done
+.loop:
+    ; Increment pointers.
+    popcnt          r_tmpd, r_tmpd                          ; Number of non-zero values handled.
+    lea             p_level, [p_level + 2 * r_tmp]
+    add             p_run, r_tmp
+    ; Handle next quadruple.
+    mov             r_tmp, r_mask
+    and             r_tmpd, 0Fh
+    movq            xmm0, [p_coeff_level + 16]
+    sub             p_coeff_level, 8
+    movq            xmm1, [p_shufb_lut + 8 * r_tmp]
+    pshufb          xmm0, xmm1
+    movzx           r_tmp2d, byte [p_run - 1]
+    add             r_tmp2d, [p_run_lut + 4 * r_tmp]        ; Add to previous run and get eventual new runs.
+    movlps          [p_level], xmm0                         ; Store levels (potentially none).
+    mov             [p_run - 1], r_tmp2d                    ; Update previous run and store eventual new runs.
+    shr             r_maskd, 4
+    jnz             .loop
+.done:
+%ifnidni retrq, i_total_zeros
+  %ifdef X86_32_PICASM
+    pop             retrq
+  %else
+    mov             retrq, i_total_zeros
+  %endif
+%endif
+    DEINIT_X86_32_PIC
+%ifdef X86_32
+    pop             r6
+    pop             r5
+    pop             r4
+    pop             r3
+%elifdef WIN64
+    pop             rbx
+%endif
+    ret
+%undef p_coeff_level
+%undef p_run
+%undef p_level
+%undef i_total_zeros
+%undef r_mask
+%undef r_maskd
+%undef r_tmp
+%undef r_tmpd
+%undef r_tmpb
+%undef r_tmp2
+%undef r_tmp2d
+%undef p_shufb_lut
+%undef p_run_lut
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/dct.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/dct.asm
new file mode 100644
index 0000000000..68291e2244
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/dct.asm
@@ -0,0 +1,108 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        ?Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        ?Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  dct.asm
+;*
+;*  History
+;*      8/4/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+SECTION .text
+
+;***********************************************************************
+; SSE2 functions
+;***********************************************************************
+
+%macro SSE2_SumSubD 3
+    movdqa  %3, %2
+    paddd   %2, %1
+    psubd   %1, %3
+%endmacro
+
+%macro SSE2_SumSubDiv2D 4
+    paddd   %1, %2
+    paddd   %1, %3
+    psrad   %1,  1
+    movdqa  %4, %1
+    psubd   %4, %2
+%endmacro
+%macro SSE2_Load4Col    5
+    movsx       r2,     WORD[%5]
+    movd        %1,         r2d
+    movsx       r2,     WORD[%5 + 0x20]
+    movd        %2,         r2d
+    punpckldq   %1,         %2
+    movsx       r2,     WORD[%5 + 0x80]
+    movd        %3,         r2d
+    movsx       r2,     WORD[%5 + 0xa0]
+    movd        %4,         r2d
+    punpckldq   %3,         %4
+    punpcklqdq  %1,         %3
+%endmacro
+
+;***********************************************************************
+;void WelsHadamardT4Dc_sse2( int16_t *luma_dc, int16_t *pDct)
+;***********************************************************************
+WELS_EXTERN WelsHadamardT4Dc_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 8
+    SSE2_Load4Col       xmm1, xmm5, xmm6, xmm0, r1
+    SSE2_Load4Col       xmm2, xmm5, xmm6, xmm0, r1 + 0x40
+    SSE2_Load4Col       xmm3, xmm5, xmm6, xmm0, r1 + 0x100
+    SSE2_Load4Col       xmm4, xmm5, xmm6, xmm0, r1 + 0x140
+
+    SSE2_SumSubD        xmm1, xmm2, xmm7
+    SSE2_SumSubD        xmm3, xmm4, xmm7
+    SSE2_SumSubD        xmm2, xmm4, xmm7
+    SSE2_SumSubD        xmm1, xmm3, xmm7
+
+    SSE2_Trans4x4D      xmm4, xmm2, xmm1, xmm3, xmm5    ; pOut: xmm4,xmm3,xmm5,xmm1
+
+    SSE2_SumSubD        xmm4, xmm3, xmm7
+    SSE2_SumSubD        xmm5, xmm1, xmm7
+
+    WELS_DD1 xmm6
+    SSE2_SumSubDiv2D    xmm3, xmm1, xmm6, xmm0          ; pOut: xmm3 = (xmm3+xmm1+1)/2, xmm0 = (xmm3-xmm1+1)/2
+    SSE2_SumSubDiv2D    xmm4, xmm5, xmm6, xmm1          ; pOut: xmm4 = (xmm4+xmm5+1)/2, xmm1 = (xmm4-xmm5+1)/2
+    SSE2_Trans4x4D      xmm3, xmm0, xmm1, xmm4, xmm2    ; pOut: xmm3,xmm4,xmm2,xmm1
+
+    packssdw    xmm3,   xmm4
+    packssdw    xmm2,   xmm1
+    movdqa  [r0+ 0],   xmm3
+    movdqa  [r0+16],   xmm2
+
+    POP_XMM
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/intra_pred.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/intra_pred.asm
new file mode 100644
index 0000000000..edb2cd318a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/intra_pred.asm
@@ -0,0 +1,1129 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  intra_pred.asm
+;*
+;*  Abstract
+;*      sse2 function for intra predict operations
+;*
+;*  History
+;*      18/09/2009 Created
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Local Data (Read Only)
+;***********************************************************************
+
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+align 16
+sse2_plane_inc_minus dw -7, -6, -5, -4, -3, -2, -1, 0
+align 16
+sse2_plane_inc dw 1, 2, 3, 4, 5, 6, 7, 8
+align 16
+sse2_plane_dec dw 8, 7, 6, 5, 4, 3, 2, 1
+
+; for chroma plane mode
+sse2_plane_inc_c dw 1, 2, 3, 4
+sse2_plane_dec_c dw 4, 3, 2, 1
+align 16
+sse2_plane_mul_b_c dw -3, -2, -1, 0, 1, 2, 3, 4
+
+align 16
+mmx_01bytes:        times 16    db 1
+
+align 16
+mmx_0x02: dw 0x02, 0x00, 0x00, 0x00
+
+
+;***********************************************************************
+; macros
+;***********************************************************************
+;dB 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+;%1 will keep the last result
+%macro SSE_DB_1_2REG 2
+    pxor %1, %1
+    pcmpeqw %2, %2
+    psubb %1, %2
+%endmacro
+
+;xmm0, xmm1, xmm2, eax, ecx
+;lower 64 bits of xmm0 save the result
+%macro SSE2_PRED_H_4X4_TWO_LINE 5
+    movd        %1, [%4-1]
+    movdqa      %3, %1
+    punpcklbw   %1, %3
+    movdqa      %3, %1
+    punpcklbw   %1, %3
+
+    ;add            %4, %5
+    movd        %2, [%4+%5-1]
+    movdqa      %3, %2
+    punpcklbw   %2, %3
+    movdqa      %3, %2
+    punpcklbw   %2, %3
+    punpckldq   %1, %2
+%endmacro
+
+%macro SUMW_HORIZON1 2
+    movdqa      %2, %1
+    psrldq      %2, 8
+    paddusw     %1, %2
+    movdqa      %2, %1
+    psrldq      %2, 4
+    paddusw     %1, %2
+    movdqa      %2, %1
+    psrldq      %2, 2
+    paddusw     %1, %2
+%endmacro
+
+%macro LOAD_COLUMN 6
+    movd    %1, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %1,   %2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %3,   %2
+    punpcklwd %1,   %3
+    lea     %5, [%5+2*%6]
+    movd    %4, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %4,   %2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    lea     %5, [%5+2*%6]
+    punpcklbw %3,   %2
+    punpcklwd %4,   %3
+    punpckhdq %1,   %4
+%endmacro
+
+%macro SUMW_HORIZON 3
+    movhlps     %2, %1          ; x2 = xx xx xx xx d7 d6 d5 d4
+    paddw       %1, %2          ; x1 = xx xx xx xx d37 d26 d15 d04
+    punpcklwd   %1, %3          ; x1 =  d37  d26 d15 d04
+    movhlps     %2, %1          ; x2 = xxxx xxxx d37 d26
+    paddd       %1, %2          ; x1 = xxxx xxxx d1357 d0246
+    pshuflw     %2, %1, 0x4e    ; x2 = xxxx xxxx d0246 d1357
+    paddd       %1, %2          ; x1 = xxxx xxxx xxxx  d01234567
+%endmacro
+
+
+%macro COPY_16_TIMES 2
+    movdqa      %2, [%1-16]
+    psrldq      %2, 15
+    pmuludq     %2, [pic(mmx_01bytes)]
+    pshufd      %2, %2, 0
+%endmacro
+
+%macro COPY_16_TIMESS 3
+    movdqa      %2, [%1+%3-16]
+    psrldq      %2, 15
+    pmuludq     %2, [pic(mmx_01bytes)]
+    pshufd      %2, %2, 0
+%endmacro
+
+%macro LOAD_COLUMN_C 6
+    movd    %1, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %1,%2
+    lea     %5, [%5+2*%6]
+    movd    %3, [%5]
+    movd    %2, [%5+%6]
+    punpcklbw %3,   %2
+    punpckhwd %1,   %3
+    lea     %5, [%5+2*%6]
+%endmacro
+
+%macro LOAD_2_LEFT_AND_ADD 0
+    lea         r1, [r1+2*r2]
+    movzx       r4, byte [r1-0x01]
+    add         r3, r4
+    movzx       r4, byte [r1+r2-0x01]
+    add         r3, r4
+%endmacro
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+;***********************************************************************
+;   void WelsI4x4LumaPredH_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;
+;   pred must align to 16
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredH_sse2
+    push r3
+    %assign push_num 1
+    INIT_X86_32_PIC r4
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    movzx       r3, byte [r1-1]
+    movd        xmm0,   r3d
+    pmuludq     xmm0,   [pic(mmx_01bytes)]
+
+    movzx       r3, byte [r1+r2-1]
+    movd        xmm1,   r3d
+    pmuludq     xmm1,   [pic(mmx_01bytes)]
+
+    unpcklps    xmm0,   xmm1
+
+    lea         r1, [r1+r2*2]
+    movzx       r3, byte [r1-1]
+    movd        xmm2,   r3d
+    pmuludq     xmm2,   [pic(mmx_01bytes)]
+
+    movzx       r3, byte [r1+r2-1]
+    movd        xmm3,   r3d
+    pmuludq     xmm3,   [pic(mmx_01bytes)]
+
+    unpcklps    xmm2,   xmm3
+    unpcklpd    xmm0,   xmm2
+
+    movdqa      [r0],   xmm0
+    DEINIT_X86_32_PIC
+    pop r3
+    ret
+
+;***********************************************************************
+; void WelsI16x16LumaPredPlane_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride);
+;***********************************************************************
+WELS_EXTERN WelsI16x16LumaPredPlane_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_3_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    sub     r1, 1
+    sub     r1, r2
+
+    ;for H
+    pxor    xmm7,   xmm7
+    movq    xmm0,   [r1]
+    movdqa  xmm5,   [pic(sse2_plane_dec)]
+    punpcklbw xmm0, xmm7
+    pmullw  xmm0,   xmm5
+    movq    xmm1,   [r1 + 9]
+    movdqa  xmm6,   [pic(sse2_plane_inc)]
+    punpcklbw xmm1, xmm7
+    pmullw  xmm1,   xmm6
+    psubw   xmm1,   xmm0
+
+    SUMW_HORIZON    xmm1,xmm0,xmm2
+    movd    r3d,    xmm1        ; H += (i + 1) * (top[8 + i] - top[6 - i]);
+    movsx   r3, r3w
+    imul    r3, 5
+    add     r3, 32
+    sar     r3, 6           ; b = (5 * H + 32) >> 6;
+    SSE2_Copy8Times xmm1, r3d   ; xmm1 = b,b,b,b,b,b,b,b
+
+    movzx   r4, BYTE [r1+16]
+    sub r1, 3
+    LOAD_COLUMN     xmm0, xmm2, xmm3, xmm4, r1, r2
+
+    add     r1, 3
+    movzx   r3, BYTE [r1+8*r2]
+    add     r4, r3
+    shl     r4, 4           ;   a = (left[15*stride] + top[15]) << 4;
+
+    sub r1, 3
+    add     r1, r2
+    LOAD_COLUMN     xmm7, xmm2, xmm3, xmm4, r1, r2
+    pxor    xmm4,   xmm4
+    punpckhbw xmm0, xmm4
+    pmullw  xmm0,   xmm5
+    punpckhbw xmm7, xmm4
+    pmullw  xmm7,   xmm6
+    psubw   xmm7,   xmm0
+
+    SUMW_HORIZON   xmm7,xmm0,xmm2
+    movd    r3d,   xmm7         ; V
+    movsx   r3, r3w
+    imul    r3, 5
+    add     r3, 32
+    sar     r3, 6               ; c = (5 * V + 32) >> 6;
+    SSE2_Copy8Times xmm4, r3d       ; xmm4 = c,c,c,c,c,c,c,c
+
+    add     r4, 16
+    imul    r3, -7
+    add     r3, r4              ; s = a + 16 + (-7)*c
+    SSE2_Copy8Times xmm0, r3d       ; xmm0 = s,s,s,s,s,s,s,s
+
+    xor     r3, r3
+    movdqa  xmm5,   [pic(sse2_plane_inc_minus)]
+
+get_i16x16_luma_pred_plane_sse2_1:
+    movdqa  xmm2,   xmm1
+    pmullw  xmm2,   xmm5
+    paddw   xmm2,   xmm0
+    psraw   xmm2,   5
+    movdqa  xmm3,   xmm1
+    pmullw  xmm3,   xmm6
+    paddw   xmm3,   xmm0
+    psraw   xmm3,   5
+    packuswb xmm2,  xmm3
+    movdqa  [r0],   xmm2
+    paddw   xmm0,   xmm4
+    add     r0, 16
+    inc     r3
+    cmp     r3, 16
+    jnz get_i16x16_luma_pred_plane_sse2_1
+    POP_XMM
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    ret
+
+;***********************************************************************
+; void WelsIChromaPredPlane_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride);
+;***********************************************************************
+WELS_EXTERN WelsIChromaPredPlane_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_3_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2, r2d
+    sub     r1, 1
+    sub     r1, r2
+
+    pxor    mm7,    mm7
+    movq    mm0,    [r1]
+    movq    mm5,    [pic(sse2_plane_dec_c)]
+    punpcklbw mm0,  mm7
+    pmullw  mm0,    mm5
+    movq    mm1,    [r1 + 5]
+    movq    mm6,    [pic(sse2_plane_inc_c)]
+    punpcklbw mm1,  mm7
+    pmullw  mm1,    mm6
+    psubw   mm1,    mm0
+
+    movq2dq xmm1,   mm1
+    pxor    xmm2,   xmm2
+    SUMW_HORIZON    xmm1,xmm0,xmm2
+    movd    r3d,    xmm1
+    movsx   r3, r3w
+    imul    r3, 17
+    add     r3, 16
+    sar     r3, 5           ; b = (17 * H + 16) >> 5;
+    SSE2_Copy8Times xmm1, r3d   ; mm1 = b,b,b,b,b,b,b,b
+
+    movzx   r3, BYTE [r1+8]
+    sub r1, 3
+    LOAD_COLUMN_C   mm0, mm2, mm3, mm4, r1, r2
+
+    add     r1, 3
+    movzx   r4, BYTE [r1+4*r2]
+    add     r4, r3
+    shl     r4, 4           ; a = (left[7*stride] + top[7]) << 4;
+
+    sub r1, 3
+    add     r1, r2
+    LOAD_COLUMN_C   mm7, mm2, mm3, mm4, r1, r2
+    pxor    mm4,    mm4
+    punpckhbw mm0,  mm4
+    pmullw  mm0,    mm5
+    punpckhbw mm7,  mm4
+    pmullw  mm7,    mm6
+    psubw   mm7,    mm0
+
+    movq2dq xmm7,   mm7
+    pxor    xmm2,   xmm2
+    SUMW_HORIZON    xmm7,xmm0,xmm2
+    movd    r3d,    xmm7            ; V
+    movsx   r3, r3w
+    imul    r3, 17
+    add     r3, 16
+    sar     r3, 5               ; c = (17 * V + 16) >> 5;
+    SSE2_Copy8Times xmm4, r3d   ; mm4 = c,c,c,c,c,c,c,c
+
+    add     r4, 16
+    imul    r3, -3
+    add     r3, r4      ; s = a + 16 + (-3)*c
+    SSE2_Copy8Times xmm0, r3d   ; xmm0 = s,s,s,s,s,s,s,s
+
+    xor     r3, r3
+    movdqa  xmm5,   [pic(sse2_plane_mul_b_c)]
+
+get_i_chroma_pred_plane_sse2_1:
+    movdqa  xmm2,   xmm1
+    pmullw  xmm2,   xmm5
+    paddw   xmm2,   xmm0
+    psraw   xmm2,   5
+    packuswb xmm2,  xmm2
+    movq    [r0],   xmm2
+    paddw   xmm0,   xmm4
+    add     r0, 8
+    inc     r3
+    cmp     r3, 8
+    jnz get_i_chroma_pred_plane_sse2_1
+    POP_XMM
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   0 |1 |2 |3 |4 |
+;   6 |7 |8 |9 |10|
+;   11|12|13|14|15|
+;   16|17|18|19|20|
+;   21|22|23|24|25|
+;   7 is the start pixel of current 4x4 block
+;   pred[7] = ([6]+[0]*2+[1]+2)/4
+;
+;   void WelsI4x4LumaPredDDR_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredDDR_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    movq        mm1,[r1+r2-8]       ;get value of 11,decreasing 8 is trying to improve the performance of movq mm1[8] = 11
+    movq        mm2,[r1-8]          ;get value of 6 mm2[8] = 6
+    sub     r1, r2          ;mov eax to above line of current block(postion of 1)
+    punpckhbw   mm2,[r1-8]          ;mm2[8](high 8th byte of mm2) = [0](value of 0), mm2[7]= [6]
+    movd        mm3,[r1]            ;get value 1, mm3[1] = [1],mm3[2]=[2],mm3[3]=[3]
+    punpckhwd   mm1,mm2             ;mm1[8]=[0],mm1[7]=[6],mm1[6]=[11]
+    psllq       mm3,18h             ;mm3[5]=[1]
+    psrlq       mm1,28h             ;mm1[3]=[0],mm1[2]=[6],mm1[1]=[11]
+    por         mm3,mm1             ;mm3[6]=[3],mm3[5]=[2],mm3[4]=[1],mm3[3]=[0],mm3[2]=[6],mm3[1]=[11]
+    movq        mm1,mm3             ;mm1[6]=[3],mm1[5]=[2],mm1[4]=[1],mm1[3]=[0],mm1[2]=[6],mm1[1]=[11]
+    lea         r1,[r1+r2*2-8h]     ;set eax point to 12
+    movq        mm4,[r1+r2]     ;get value of 16, mm4[8]=[16]
+    psllq       mm3,8               ;mm3[7]=[3],mm3[6]=[2],mm3[5]=[1],mm3[4]=[0],mm3[3]=[6],mm3[2]=[11],mm3[1]=0
+    psrlq       mm4,38h             ;mm4[1]=[16]
+    por         mm3,mm4             ;mm3[7]=[3],mm3[6]=[2],mm3[5]=[1],mm3[4]=[0],mm3[3]=[6],mm3[2]=[11],mm3[1]=[16]
+    movq        mm2,mm3             ;mm2[7]=[3],mm2[6]=[2],mm2[5]=[1],mm2[4]=[0],mm2[3]=[6],mm2[2]=[11],mm2[1]=[16]
+    movq        mm4,[r1+r2*2]       ;mm4[8]=[21]
+    psllq       mm3,8               ;mm3[8]=[3],mm3[7]=[2],mm3[6]=[1],mm3[5]=[0],mm3[4]=[6],mm3[3]=[11],mm3[2]=[16],mm3[1]=0
+    psrlq       mm4,38h             ;mm4[1]=[21]
+    por         mm3,mm4             ;mm3[8]=[3],mm3[7]=[2],mm3[6]=[1],mm3[5]=[0],mm3[4]=[6],mm3[3]=[11],mm3[2]=[16],mm3[1]=[21]
+    movq        mm4,mm3             ;mm4[8]=[3],mm4[7]=[2],mm4[6]=[1],mm4[5]=[0],mm4[4]=[6],mm4[3]=[11],mm4[2]=[16],mm4[1]=[21]
+    pavgb       mm3,mm1             ;mm3=([11]+[21]+1)/2
+    pxor        mm1,mm4             ;find odd value in the lowest bit of each byte
+    pand        mm1,[pic(mmx_01bytes)]   ;set the odd bit
+    psubusb     mm3,mm1             ;decrease 1 from odd bytes
+    pavgb       mm2,mm3             ;mm2=(([11]+[21]+1)/2+1+[16])/2
+
+    movd        [r0+12],mm2
+    psrlq       mm2,8
+    movd        [r0+8],mm2
+    psrlq       mm2,8
+    movd        [r0+4],mm2
+    psrlq       mm2,8
+    movd        [r0],mm2
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   0 |1 |2 |3 |4 |
+;   5 |6 |7 |8 |9 |
+;   10|11|12|13|14|
+;   15|16|17|18|19|
+;   20|21|22|23|24|
+;   6 is the start pixel of current 4x4 block
+;   pred[6] = ([1]+[2]+[3]+[4]+[5]+[10]+[15]+[20]+4)/8
+;
+;   void WelsI4x4LumaPredDc_sse2(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredDc_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    movzx       r4, byte [r1-1h]
+    sub         r1, r2
+    movd        xmm0,   [r1]
+    pxor        xmm1,   xmm1
+    psadbw      xmm0,   xmm1
+    xor r3, r3
+    movd        r3d,    xmm0
+    add         r3, r4
+    movzx       r4, byte [r1+r2*2-1h]
+    add         r3, r4
+
+    lea         r1, [r1+r2*2-1]
+    movzx       r4, byte [r1+r2]
+    add         r3, r4
+
+    movzx       r4, byte [r1+r2*2]
+    add         r3, r4
+    add         r3, 4
+    sar         r3, 3
+    imul        r3, 0x01010101
+
+    movd        xmm0,   r3d
+    pshufd      xmm0,   xmm0,   0
+    movdqa      [r0],   xmm0
+    pop r4
+    pop r3
+    ret
+
+;***********************************************************************
+;   void WelsIChromaPredH_mmx(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;   copy 8 pixel of 8 line from left
+;***********************************************************************
+%macro MMX_PRED_H_8X8_ONE_LINE 4
+    movq        %1,     [%3-8]
+    psrlq       %1,     38h
+
+    ;pmuludq        %1,     [mmx_01bytes]       ;extend to 4 bytes
+    pmullw      %1,     [pic(mmx_01bytes)]
+    pshufw      %1,     %1, 0
+    movq        [%4],   %1
+%endmacro
+
+%macro MMX_PRED_H_8X8_ONE_LINEE 4
+    movq        %1,     [%3+r2-8]
+    psrlq       %1,     38h
+
+    ;pmuludq        %1,     [mmx_01bytes]       ;extend to 4 bytes
+    pmullw      %1,     [pic(mmx_01bytes)]
+    pshufw      %1,     %1, 0
+    movq        [%4],   %1
+%endmacro
+
+WELS_EXTERN WelsIChromaPredH_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    movq        mm0,    [r1-8]
+    psrlq       mm0,    38h
+
+    ;pmuludq        mm0,    [mmx_01bytes]       ;extend to 4 bytes
+    pmullw      mm0,        [pic(mmx_01bytes)]
+    pshufw      mm0,    mm0,    0
+    movq        [r0],   mm0
+
+    MMX_PRED_H_8X8_ONE_LINEE    mm0, mm1, r1,r0+8
+
+    lea         r1,[r1+r2*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r1,r0+16
+
+    MMX_PRED_H_8X8_ONE_LINEE    mm0, mm1, r1,r0+24
+
+    lea         r1,[r1+r2*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r1,r0+32
+
+    MMX_PRED_H_8X8_ONE_LINEE    mm0, mm1, r1,r0+40
+
+    lea         r1,[r1+r2*2]
+    MMX_PRED_H_8X8_ONE_LINE mm0, mm1, r1,r0+48
+
+    MMX_PRED_H_8X8_ONE_LINEE    mm0, mm1, r1,r0+56
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   void WelsI4x4LumaPredV_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;   copy pixels from top 4 pixels
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredV_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movd        xmm0,   [r1]
+    pshufd      xmm0,   xmm0,   0
+    movdqa      [r0],   xmm0
+    ret
+
+;***********************************************************************
+;   void WelsIChromaPredV_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;   copy 8 pixels from top 8 pixels
+;***********************************************************************
+WELS_EXTERN WelsIChromaPredV_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub     r1,     r2
+    movq        xmm0,       [r1]
+    movdqa      xmm1,       xmm0
+    punpcklqdq  xmm0,       xmm1
+    movdqa      [r0],       xmm0
+    movdqa      [r0+16],    xmm0
+    movdqa      [r0+32],    xmm0
+    movdqa      [r0+48],    xmm0
+    ret
+
+;***********************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |a |b |
+;   |g |h |e |f |
+;   |i |j |g |h |
+
+;   a = (1 + lt + l0)>>1
+;   e = (1 + l0 + l1)>>1
+;   g = (1 + l1 + l2)>>1
+;   i = (1 + l2 + l3)>>1
+
+;   d = (2 + t0 + (t1<<1) + t2)>>2
+;   c = (2 + lt + (t0<<1) + t1)>>2
+;   b = (2 + l0 + (lt<<1) + t0)>>2
+
+;   f = (2 + l1 + (l0<<1) + lt)>>2
+;   h = (2 + l2 + (l1<<1) + l0)>>2
+;   j = (2 + l3 + (l2<<1) + l1)>>2
+;   [b a f e h g j i] + [d c b a] --> mov to memory
+;
+;   void WelsI4x4LumaPredHD_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredHD_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movd        mm0, [r1-1]            ; mm0 = [xx xx xx xx t2 t1 t0 lt]
+    psllq       mm0, 20h                ; mm0 = [t2 t1 t0 lt xx xx xx xx]
+
+    movd        mm1, [r1+2*r2-4]
+    punpcklbw   mm1, [r1+r2-4]        ; mm1[7] = l0, mm1[6] = l1
+    lea         r1, [r1+2*r2]
+    movd        mm2, [r1+2*r2-4]
+    punpcklbw   mm2, [r1+r2-4]        ; mm2[7] = l2, mm2[6] = l3
+    punpckhwd   mm2, mm1                ; mm2 = [l0 l1 l2 l3 xx xx xx xx]
+    psrlq       mm2, 20h
+    pxor        mm0, mm2                ; mm0 = [t2 t1 t0 lt l0 l1 l2 l3]
+
+    movq        mm1, mm0
+    psrlq       mm1, 10h                ; mm1 = [xx xx t2 t1 t0 lt l0 l1]
+    movq        mm2, mm0
+    psrlq       mm2, 8h                 ; mm2 = [xx t2 t1 t0 lt l0 l1 l2]
+    movq        mm3, mm2
+    movq        mm4, mm1
+    pavgb       mm1, mm0
+
+    pxor        mm4, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm4, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm1, mm4                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm1                ; mm2 = [xx xx d  c  b  f  h  j]
+
+    movq        mm4, mm0
+    pavgb       mm3, mm4                ; mm3 = [xx xx xx xx a  e  g  i]
+    punpcklbw   mm3, mm2                ; mm3 = [b  a  f  e  h  g  j  i]
+
+    psrlq       mm2, 20h
+    psllq       mm2, 30h                ; mm2 = [d  c  0  0  0  0  0  0]
+    movq        mm4, mm3
+    psrlq       mm4, 10h                ; mm4 = [0  0  b  a  f  e  h  j]
+    pxor        mm2, mm4                ; mm2 = [d  c  b  a  xx xx xx xx]
+    psrlq       mm2, 20h                ; mm2 = [xx xx xx xx  d  c  b  a]
+
+    movd        [r0], mm2
+    movd        [r0+12], mm3
+    psrlq       mm3, 10h
+    movd        [r0+8], mm3
+    psrlq       mm3, 10h
+    movd        [r0+4], mm3
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |c |d |e |f |
+;   |e |f |g |g |
+;   |g |g |g |g |
+
+;   a = (1 + l0 + l1)>>1
+;   c = (1 + l1 + l2)>>1
+;   e = (1 + l2 + l3)>>1
+;   g = l3
+
+;   b = (2 + l0 + (l1<<1) + l2)>>2
+;   d = (2 + l1 + (l2<<1) + l3)>>2
+;   f = (2 + l2 + (l3<<1) + l3)>>2
+
+;   [g g f e d c b a] + [g g g g] --> mov to memory
+;
+;   void WelsI4x4LumaPredHU_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredHU_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    movd        mm0, [r1-4]            ; mm0[3] = l0
+    punpcklbw   mm0, [r1+r2-4]        ; mm0[7] = l1, mm0[6] = l0
+    lea         r1, [r1+2*r2]
+    movd        mm2, [r1-4]            ; mm2[3] = l2
+    movd        mm4, [r1+r2-4]        ; mm4[3] = l3
+    punpcklbw   mm2, mm4
+    punpckhwd   mm0, mm2                ; mm0 = [l3 l2 l1 l0 xx xx xx xx]
+
+    psrlq       mm4, 18h
+    psllq       mm4, 38h                ; mm4 = [l3 xx xx xx xx xx xx xx]
+    psrlq       mm0, 8h
+    pxor        mm0, mm4                ; mm0 = [l3 l3 l2 l1 l0 xx xx xx]
+
+    movq        mm1, mm0
+    psllq       mm1, 8h                 ; mm1 = [l3 l2 l1 l0 xx xx xx xx]
+    movq        mm3, mm1                ; mm3 = [l3 l2 l1 l0 xx xx xx xx]
+    pavgb       mm1, mm0                ; mm1 = [g  e  c  a  xx xx xx xx]
+
+    movq        mm2, mm0
+    psllq       mm2, 10h                ; mm2 = [l2 l1 l0 xx xx xx xx xx]
+    movq        mm5, mm2
+    pavgb       mm2, mm0
+
+    pxor        mm5, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm5, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm5                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm3                ; mm2 = [f  d  b  xx xx xx xx xx]
+
+    psrlq       mm2, 8h
+    pxor        mm2, mm4                ; mm2 = [g  f  d  b  xx xx xx xx]
+
+    punpckhbw   mm1, mm2                ; mm1 = [g  g  f  e  d  c  b  a]
+    punpckhbw   mm4, mm4                ; mm4 = [g  g  xx xx xx xx xx xx]
+    punpckhbw   mm4, mm4                ; mm4 = [g  g  g  g  xx xx xx xx]
+
+    psrlq       mm4, 20h
+    movd        [r0+12], mm4
+
+    movd        [r0], mm1
+    psrlq       mm1, 10h
+    movd        [r0+4], mm1
+    psrlq       mm1, 10h
+    movd        [r0+8], mm1
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+
+;***********************************************************************
+;   lt|t0|t1|t2|t3|
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   l3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |g |h |
+;   |i |a |b |c |
+;   |j |e |f |g |
+
+;   a = (1 + lt + t0)>>1
+;   b = (1 + t0 + t1)>>1
+;   c = (1 + t1 + t2)>>1
+;   d = (1 + t2 + t3)>>1
+
+;   e = (2 + l0 + (lt<<1) + t0)>>2
+;   f = (2 + lt + (t0<<1) + t1)>>2
+;   g = (2 + t0 + (t1<<1) + t2)>>2
+
+;   h = (2 + t1 + (t2<<1) + t3)>>2
+;   i = (2 + lt + (l0<<1) + l1)>>2
+;   j = (2 + l0 + (l1<<1) + l2)>>2
+;
+;   void WelsI4x4LumaPredVR_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredVR_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movq        mm0, [r1-1]            ; mm0 = [xx xx xx t3 t2 t1 t0 lt]
+    psllq       mm0, 18h                ; mm0 = [t3 t2 t1 t0 lt xx xx xx]
+
+    movd        mm1, [r1+2*r2-4]
+    punpcklbw   mm1, [r1+r2-4]        ; mm1[7] = l0, mm1[6] = l1
+    lea         r1, [r1+2*r2]
+    movq        mm2, [r1+r2-8]        ; mm2[7] = l2
+    punpckhwd   mm2, mm1                ; mm2 = [l0 l1 l2 xx xx xx xx xx]
+    psrlq       mm2, 28h
+    pxor        mm0, mm2                ; mm0 = [t3 t2 t1 t0 lt l0 l1 l2]
+
+    movq        mm1, mm0
+    psllq       mm1, 8h                 ; mm1 = [t2 t1 t0 lt l0 l1 l2 xx]
+    pavgb       mm1, mm0                ; mm1 = [d  c  b  a  xx xx xx xx]
+
+    movq        mm2, mm0
+    psllq       mm2, 10h                ; mm2 = [t1 t0 lt l0 l1 l2 xx xx]
+    movq        mm3, mm2
+    pavgb       mm2, mm0
+
+    pxor        mm3, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm3, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm3                ; decrease 1 from odd bytes
+
+    movq        mm3, mm0
+    psllq       mm3, 8h                 ; mm3 = [t2 t1 t0 lt l0 l1 l2 xx]
+    pavgb       mm3, mm2                ; mm3 = [h  g  f  e  i  j  xx xx]
+    movq        mm2, mm3
+
+    psrlq       mm1, 20h                ; mm1 = [xx xx xx xx d  c  b  a]
+    movd        [r0], mm1
+
+    psrlq       mm2, 20h                ; mm2 = [xx xx xx xx h  g  f  e]
+    movd        [r0+4], mm2
+
+    movq        mm4, mm3
+    psllq       mm4, 20h
+    psrlq       mm4, 38h                ; mm4 = [xx xx xx xx xx xx xx i]
+
+    movq        mm5, mm3
+    psllq       mm5, 28h
+    psrlq       mm5, 38h                ; mm5 = [xx xx xx xx xx xx xx j]
+
+    psllq       mm1, 8h
+    pxor        mm4, mm1                ; mm4 = [xx xx xx xx c  b  a  i]
+    movd        [r0+8], mm4
+
+    psllq       mm2, 8h
+    pxor        mm5, mm2                ; mm5 = [xx xx xx xx g  f  e  j]
+    movd        [r0+12], mm5
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   lt|t0|t1|t2|t3|t4|t5|t6|t7
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   lt,t0,t1,t2,t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |b |c |d |e |
+;   |c |d |e |f |
+;   |d |e |f |g |
+
+;   a = (2 + t0 + t2 + (t1<<1))>>2
+;   b = (2 + t1 + t3 + (t2<<1))>>2
+;   c = (2 + t2 + t4 + (t3<<1))>>2
+;   d = (2 + t3 + t5 + (t4<<1))>>2
+
+;   e = (2 + t4 + t6 + (t5<<1))>>2
+;   f = (2 + t5 + t7 + (t6<<1))>>2
+;   g = (2 + t6 + t7 + (t7<<1))>>2
+
+;   [g f e d c b a] --> mov to memory
+;
+;   void WelsI4x4LumaPredDDL_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredDDL_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movq        mm0, [r1]              ; mm0 = [t7 t6 t5 t4 t3 t2 t1 t0]
+    movq        mm1, mm0
+    movq        mm2, mm0
+
+    movq        mm3, mm0
+    psrlq       mm3, 38h
+    psllq       mm3, 38h                ; mm3 = [t7 xx xx xx xx xx xx xx]
+
+    psllq       mm1, 8h                 ; mm1 = [t6 t5 t4 t3 t2 t1 t0 xx]
+    psrlq       mm2, 8h
+    pxor        mm2, mm3                ; mm2 = [t7 t7 t6 t5 t4 t3 t2 t1]
+
+    movq        mm3, mm1
+    pavgb       mm1, mm2
+    pxor        mm3, mm2                ; find odd value in the lowest bit of each byte
+    pand        mm3, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm1, mm3                ; decrease 1 from odd bytes
+
+    pavgb       mm0, mm1                ; mm0 = [g f e d c b a xx]
+
+    psrlq       mm0, 8h
+    movd        [r0], mm0
+    psrlq       mm0, 8h
+    movd        [r0+4], mm0
+    psrlq       mm0, 8h
+    movd        [r0+8], mm0
+    psrlq       mm0, 8h
+    movd        [r0+12], mm0
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+
+;***********************************************************************
+;   lt|t0|t1|t2|t3|t4|t5|t6|t7
+;   l0|
+;   l1|
+;   l2|
+;   l3|
+;   lt,t0,t1,t2,t3 will never been used
+;   destination:
+;   |a |b |c |d |
+;   |e |f |g |h |
+;   |b |c |d |i |
+;   |f |g |h |j |
+
+;   a = (1 + t0 + t1)>>1
+;   b = (1 + t1 + t2)>>1
+;   c = (1 + t2 + t3)>>1
+;   d = (1 + t3 + t4)>>1
+;   i = (1 + t4 + t5)>>1
+
+;   e = (2 + t0 + (t1<<1) + t2)>>2
+;   f = (2 + t1 + (t2<<1) + t3)>>2
+;   g = (2 + t2 + (t3<<1) + t4)>>2
+;   h = (2 + t3 + (t4<<1) + t5)>>2
+;   j = (2 + t4 + (t5<<1) + t6)>>2
+
+;   [i d c b a] + [j h g f e] --> mov to memory
+;
+;   void WelsI4x4LumaPredVL_mmx(uint8_t *pred,uint8_t *pRef,int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI4x4LumaPredVL_mmx
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movq        mm0, [r1]              ; mm0 = [t7 t6 t5 t4 t3 t2 t1 t0]
+    movq        mm1, mm0
+    movq        mm2, mm0
+
+    psrlq       mm1, 8h                 ; mm1 = [xx t7 t6 t5 t4 t3 t2 t1]
+    psrlq       mm2, 10h                ; mm2 = [xx xx t7 t6 t5 t4 t3 t2]
+
+    movq        mm3, mm1
+    pavgb       mm3, mm0                ; mm3 = [xx xx xx i  d  c  b  a]
+
+    movq        mm4, mm2
+    pavgb       mm2, mm0
+    pxor        mm4, mm0                ; find odd value in the lowest bit of each byte
+    pand        mm4, [pic(mmx_01bytes)] ; set the odd bit
+    psubusb     mm2, mm4                ; decrease 1 from odd bytes
+
+    pavgb       mm2, mm1                ; mm2 = [xx xx xx j  h  g  f  e]
+
+    movd        [r0], mm3
+    psrlq       mm3, 8h
+    movd        [r0+8], mm3
+
+    movd        [r0+4], mm2
+    psrlq       mm2, 8h
+    movd        [r0+12], mm2
+    DEINIT_X86_32_PIC
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;
+;   void WelsIChromaPredDc_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsIChromaPredDc_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movq        mm0, [r1]
+
+    movzx       r3, byte [r1+r2-0x01] ; l1
+    lea             r1, [r1+2*r2]
+    movzx       r4, byte [r1-0x01]     ; l2
+    add     r3, r4
+    movzx       r4, byte [r1+r2-0x01] ; l3
+    add     r3, r4
+    lea             r1, [r1+2*r2]
+    movzx       r4, byte [r1-0x01]     ; l4
+    add     r3, r4
+    movd            mm1, r3d                 ; mm1 = l1+l2+l3+l4
+
+    movzx       r3, byte [r1+r2-0x01] ; l5
+    lea             r1, [r1+2*r2]
+    movzx       r4, byte [r1-0x01]     ; l6
+    add     r3, r4
+    movzx       r4, byte [r1+r2-0x01] ; l7
+    add     r3, r4
+    lea             r1, [r1+2*r2]
+    movzx       r4, byte [r1-0x01]     ; l8
+    add     r3, r4
+    movd            mm2, r3d                 ; mm2 = l5+l6+l7+l8
+
+    movq        mm3, mm0
+    psrlq       mm0, 0x20
+    psllq       mm3, 0x20
+    psrlq       mm3, 0x20
+    pxor        mm4, mm4
+    psadbw      mm0, mm4
+    psadbw      mm3, mm4                 ; sum1 = mm3+mm1, sum2 = mm0, sum3 = mm2
+
+    paddq       mm3, mm1
+    movq        mm1, mm2
+    paddq       mm1, mm0;                ; sum1 = mm3, sum2 = mm0, sum3 = mm2, sum4 = mm1
+
+    movq        mm4, [pic(mmx_0x02)]
+
+    paddq       mm0, mm4
+    psrlq       mm0, 0x02
+
+    paddq       mm2, mm4
+    psrlq       mm2, 0x02
+
+    paddq       mm3, mm4
+    paddq       mm3, mm4
+    psrlq       mm3, 0x03
+
+    paddq       mm1, mm4
+    paddq       mm1, mm4
+    psrlq       mm1, 0x03
+
+    pmuludq     mm0, [pic(mmx_01bytes)]
+    pmuludq     mm3, [pic(mmx_01bytes)]
+    psllq       mm0, 0x20
+    pxor        mm0, mm3                 ; mm0 = m_up
+
+    pmuludq     mm2, [pic(mmx_01bytes)]
+    pmuludq     mm1, [pic(mmx_01bytes)]
+    psllq       mm1, 0x20
+    pxor        mm1, mm2                 ; mm2 = m_down
+
+    movq        [r0], mm0
+    movq        [r0+0x08], mm0
+    movq        [r0+0x10], mm0
+    movq        [r0+0x18], mm0
+
+    movq        [r0+0x20], mm1
+    movq        [r0+0x28], mm1
+    movq        [r0+0x30], mm1
+    movq        [r0+0x38], mm1
+
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    WELSEMMS
+    ret
+
+
+
+;***********************************************************************
+;
+;   void WelsI16x16LumaPredDc_sse2(uint8_t *pred, uint8_t *pRef, int32_t stride)
+;***********************************************************************
+WELS_EXTERN WelsI16x16LumaPredDc_sse2
+    push r3
+    push r4
+    %assign push_num 2
+    INIT_X86_32_PIC r5
+    LOAD_3_PARA
+    SIGN_EXTENSION r2, r2d
+    sub         r1, r2
+    movdqa      xmm0, [r1]             ; read one row
+    pxor        xmm1, xmm1
+    psadbw      xmm0, xmm1
+    movdqa      xmm1, xmm0
+    psrldq      xmm1, 0x08
+    pslldq      xmm0, 0x08
+    psrldq      xmm0, 0x08
+    paddw       xmm0, xmm1
+
+    movzx       r3, byte [r1+r2-0x01]
+    movzx       r4, byte [r1+2*r2-0x01]
+    add     r3, r4
+    lea         r1, [r1+r2]
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    LOAD_2_LEFT_AND_ADD
+    add         r3, 0x10
+    movd        xmm1, r3d
+    paddw       xmm0, xmm1
+    psrld       xmm0, 0x05
+    pmuludq     xmm0, [pic(mmx_01bytes)]
+    pshufd      xmm0, xmm0, 0
+
+    movdqa      [r0], xmm0
+    movdqa      [r0+0x10], xmm0
+    movdqa      [r0+0x20], xmm0
+    movdqa      [r0+0x30], xmm0
+    movdqa      [r0+0x40], xmm0
+    movdqa      [r0+0x50], xmm0
+    movdqa      [r0+0x60], xmm0
+    movdqa      [r0+0x70], xmm0
+    movdqa      [r0+0x80], xmm0
+    movdqa      [r0+0x90], xmm0
+    movdqa      [r0+0xa0], xmm0
+    movdqa      [r0+0xb0], xmm0
+    movdqa      [r0+0xc0], xmm0
+    movdqa      [r0+0xd0], xmm0
+    movdqa      [r0+0xe0], xmm0
+    movdqa      [r0+0xf0], xmm0
+
+    DEINIT_X86_32_PIC
+    pop r4
+    pop r3
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/matrix_transpose.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/matrix_transpose.asm
new file mode 100644
index 0000000000..98fe000b96
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/matrix_transpose.asm
@@ -0,0 +1,395 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        ?Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        ?Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+;in:  m0, m1, m2, m3, m4, m5, m6, m7
+;out: m0, m3, m5, m2, m7, m1, m6, m4
+%macro TRANSPOSE_8x8B_MMX 10
+    MMX_XSwap bw,  %1, %2, %8
+    MMX_XSwap bw,  %3, %4, %2
+    MMX_XSwap bw,  %5, %6, %4
+    movq    %6, %9
+    movq    %10, %4
+    MMX_XSwap bw,  %7, %6, %4
+
+    MMX_XSwap wd,  %1, %3, %6
+    MMX_XSwap wd,  %8, %2, %3
+    MMX_XSwap wd,  %5, %7, %2
+    movq    %7, %10
+    movq    %10, %3
+    MMX_XSwap wd,  %7, %4, %3
+
+    MMX_XSwap dq,  %1, %5, %4
+    MMX_XSwap dq,  %6, %2, %5
+    MMX_XSwap dq,  %8, %7, %2
+    movq    %7, %10
+    movq    %10, %5
+    MMX_XSwap dq,  %7, %3, %5
+
+    movq    %3, %10
+%endmacro
+
+;in: m0, m3, m5, m2, m7, m1, m6, m4
+%macro TRANSPOSE8x8_WRITE_MMX 2 ; dst, dst_stride
+    movq [%1], mm0          ; result of line 1, x8 bytes
+    movq [%1+%2], mm3       ; result of line 2
+    lea %1, [%1+2*%2]
+    movq [%1], mm5          ; result of line 3
+    movq [%1+%2], mm2       ; result of line 4
+    lea %1, [%1+2*%2]
+    movq [%1], mm7          ; result of line 5
+    movq [%1+%2], mm1       ; result of line 6
+    lea %1, [%1+2*%2]
+    movq [%1], mm6          ; result of line 7
+    movq [%1+%2], mm4       ; result of line 8
+%endmacro
+
+;in: m0, m3, m5, m2, m7, m1, m6, m4
+%macro TRANSPOSE8x8_WRITE_ALT_MMX 3 ; dst, dst_stride, reg32
+    movq [%1], mm0          ; result of line 1, x8 bytes
+    movq [%1+%2], mm3       ; result of line 2
+    lea %3, [%1+2*%2]
+    movq [%3], mm5          ; result of line 3
+    movq [%3+%2], mm2       ; result of line 4
+    lea %3, [%3+2*%2]
+    movq [%3], mm7          ; result of line 5
+    movq [%3+%2], mm1       ; result of line 6
+    lea %3, [%3+2*%2]
+    movq [%3], mm6          ; result of line 7
+    movq [%3+%2], mm4       ; result of line 8
+%endmacro   ; end of TRANSPOSE8x8_WRITE_ALT_MMX
+
+; for transpose 16x8
+
+;in:  m0, m1, m2, m3, m4, m5, m6, m7
+;out: m4, m2, m3, m7, m5, m1, m6, m0
+%macro TRANSPOSE_8x16B_SSE2     10
+    SSE2_XSawp bw,  %1, %2, %8
+    SSE2_XSawp bw,  %3, %4, %2
+    SSE2_XSawp bw,  %5, %6, %4
+    movdqa  %6, %9
+    movdqa  %10, %4
+    SSE2_XSawp bw,  %7, %6, %4
+
+    SSE2_XSawp wd,  %1, %3, %6
+    SSE2_XSawp wd,  %8, %2, %3
+    SSE2_XSawp wd,  %5, %7, %2
+    movdqa  %7, %10
+    movdqa  %10, %3
+    SSE2_XSawp wd,  %7, %4, %3
+
+    SSE2_XSawp dq,  %1, %5, %4
+    SSE2_XSawp dq,  %6, %2, %5
+    SSE2_XSawp dq,  %8, %7, %2
+    movdqa  %7, %10
+    movdqa  %10, %5
+    SSE2_XSawp dq,  %7, %3, %5
+
+    SSE2_XSawp qdq,  %1, %8, %3
+    SSE2_XSawp qdq,  %4, %2, %8
+    SSE2_XSawp qdq,  %6, %7, %2
+    movdqa  %7, %10
+    movdqa  %10, %1
+    SSE2_XSawp qdq,  %7, %5, %1
+    movdqa  %5, %10
+%endmacro   ; end of TRANSPOSE_8x16B_SSE2
+
+
+%macro TRANSPOSE8x16_WRITE_SSE2 2   ; dst, dst_stride
+    movq [%1], xmm4         ; result of line 1, x8 bytes
+    movq [%1+%2], xmm2      ; result of line 2
+    lea %1, [%1+2*%2]
+    movq [%1], xmm3         ; result of line 3
+    movq [%1+%2], xmm7      ; result of line 4
+
+    lea %1, [%1+2*%2]
+    movq [%1], xmm5         ; result of line 5
+    movq [%1+%2], xmm1      ; result of line 6
+    lea %1, [%1+2*%2]
+    movq [%1], xmm6         ; result of line 7
+    movq [%1+%2], xmm0      ; result of line 8
+
+    lea %1, [%1+2*%2]
+    movhpd [%1], xmm4       ; result of line 9
+    movhpd [%1+%2], xmm2    ; result of line 10
+    lea %1, [%1+2*%2]
+    movhpd [%1], xmm3       ; result of line 11
+    movhpd [%1+%2], xmm7    ; result of line 12
+
+    lea %1, [%1+2*%2]
+    movhpd [%1], xmm5       ; result of line 13
+    movhpd [%1+%2], xmm1    ; result of line 14
+    lea %1, [%1+2*%2]
+    movhpd [%1], xmm6       ; result of line 15
+    movhpd [%1+%2], xmm0    ; result of line 16
+%endmacro   ; end of TRANSPOSE_WRITE_RESULT_SSE2
+
+%macro TRANSPOSE8x16_WRITE_ALT_SSE2 3   ; dst, dst_stride, reg32
+    movq [%1], xmm4         ; result of line 1, x8 bytes
+    movq [%1+%2], xmm2      ; result of line 2
+    lea %3, [%1+2*%2]
+    movq [%3], xmm3         ; result of line 3
+    movq [%3+%2], xmm7      ; result of line 4
+
+    lea %3, [%3+2*%2]
+    movq [%3], xmm5         ; result of line 5
+    movq [%3+%2], xmm1      ; result of line 6
+    lea %3, [%3+2*%2]
+    movq [%3], xmm6         ; result of line 7
+    movq [%3+%2], xmm0      ; result of line 8
+
+    lea %3, [%3+2*%2]
+    movhpd [%3], xmm4       ; result of line 9
+    movhpd [%3+%2], xmm2    ; result of line 10
+    lea %3, [%3+2*%2]
+    movhpd [%3], xmm3       ; result of line 11
+    movhpd [%3+%2], xmm7    ; result of line 12
+
+    lea %3, [%3+2*%2]
+    movhpd [%3], xmm5       ; result of line 13
+    movhpd [%3+%2], xmm1    ; result of line 14
+    lea %3, [%3+2*%2]
+    movhpd [%3], xmm6       ; result of line 15
+    movhpd [%3+%2], xmm0    ; result of line 16
+%endmacro   ; end of TRANSPOSE8x16_WRITE_ALT_SSE2
+
+
+SECTION .text
+
+WELS_EXTERN TransposeMatrixBlock16x16_sse2
+; void TransposeMatrixBlock16x16_sse2( void *dst/*16x16*/, const int32_t dst_stride, void *src/*16x16*/, const int32_t src_stride );
+    push r4
+    push r5
+    %assign push_num 2
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+
+    mov r4, r7
+    and r4, 0Fh
+    sub r7, 10h
+    sub r7, r4
+    lea r5, [r3+r3*2]
+    ; top 8x16 block
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    movdqa xmm2, [r2+r3*2]
+    movdqa xmm3, [r2+r5]
+    lea r2, [r2+r3*4]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    movdqa xmm6, [r2+r3*2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m4, m2, m3, m7, m5, m1, m6, m0
+    TRANSPOSE_8x16B_SSE2    xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2+r5], [r7]
+
+    TRANSPOSE8x16_WRITE_SSE2        r0, r1
+
+    ; bottom 8x16 block
+    lea r2, [r2+r3*4]
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    movdqa xmm2, [r2+r3*2]
+    movdqa xmm3, [r2+r5]
+    lea r2, [r2+r3*4]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    movdqa xmm6, [r2+r3*2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m4, m2, m3, m7, m5, m1, m6, m0
+    TRANSPOSE_8x16B_SSE2    xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2+r5], [r7]
+
+    mov r5, r1
+    sal r5, 4
+    sub r0, r5
+    lea r0, [r0+r1*2+8]
+    TRANSPOSE8x16_WRITE_SSE2        r0, r1
+
+    add r7, r4
+    add r7, 10h
+    POP_XMM
+    LOAD_4_PARA_POP
+    pop r5
+    pop r4
+    ret
+
+WELS_EXTERN TransposeMatrixBlocksx16_sse2
+; void TransposeMatrixBlocksx16_sse2( void *dst/*W16x16*/, const int32_t dst_stride, void *src/*16xW16*/, const int32_t src_stride, const int32_t num_blocks );
+    push r5
+    push r6
+    %assign push_num 2
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    mov r5, r7
+    and r5, 0Fh
+    sub r7, 10h
+    sub r7, r5
+TRANSPOSE_LOOP_SSE2:
+    ; explictly loading next loop data
+    lea r6, [r2+r3*8]
+    push r4
+%rep 8
+    mov r4, [r6]
+    mov r4, [r6+r3]
+    lea r6, [r6+r3*2]
+%endrep
+    pop r4
+    ; top 8x16 block
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm2, [r2]
+    movdqa xmm3, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm6, [r2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m4, m2, m3, m7, m5, m1, m6, m0
+    TRANSPOSE_8x16B_SSE2    xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2+r3], [r7]
+    TRANSPOSE8x16_WRITE_ALT_SSE2        r0, r1, r6
+    lea r2, [r2+r3*2]
+
+    ; bottom 8x16 block
+    movdqa xmm0, [r2]
+    movdqa xmm1, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm2, [r2]
+    movdqa xmm3, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm4, [r2]
+    movdqa xmm5, [r2+r3]
+    lea r2, [r2+r3*2]
+    movdqa xmm6, [r2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m4, m2, m3, m7, m5, m1, m6, m0
+    TRANSPOSE_8x16B_SSE2    xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, [r2+r3], [r7]
+    TRANSPOSE8x16_WRITE_ALT_SSE2        r0+8, r1, r6
+    lea r2, [r2+r3*2]
+    lea r0, [r0+16]
+    dec r4
+    jg near TRANSPOSE_LOOP_SSE2
+
+    add r7, r5
+    add r7, 10h
+    POP_XMM
+    LOAD_5_PARA_POP
+    pop r6
+    pop r5
+    ret
+
+WELS_EXTERN TransposeMatrixBlock8x8_mmx
+; void TransposeMatrixBlock8x8_mmx( void *dst/*8x8*/, const int32_t dst_stride, void *src/*8x8*/, const int32_t src_stride );
+    %assign push_num 0
+    LOAD_4_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    sub r7, 8
+
+    movq mm0, [r2]
+    movq mm1, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm2, [r2]
+    movq mm3, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm4, [r2]
+    movq mm5, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm6, [r2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m0, m3, m5, m2, m7, m1, m6, m4
+    TRANSPOSE_8x8B_MMX mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, [r2+r3], [r7]
+
+    TRANSPOSE8x8_WRITE_MMX r0, r1
+
+    emms
+    add r7, 8
+    LOAD_4_PARA_POP
+    ret
+
+WELS_EXTERN TransposeMatrixBlocksx8_mmx
+; void TransposeMatrixBlocksx8_mmx( void *dst/*8xW8*/, const int32_t dst_stride, void *src/*W8x8*/, const int32_t src_stride, const int32_t num_blocks );
+    push r5
+    push r6
+    %assign push_num 2
+    LOAD_5_PARA
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r4, r4d
+    sub r7, 8
+
+    lea r5, [r2+r3*8]
+
+TRANSPOSE_BLOCKS_X8_LOOP_MMX:
+    ; explictly loading next loop data
+%rep 4
+    mov r6, [r5]
+    mov r6, [r5+r3]
+    lea r5, [r5+r3*2]
+%endrep
+    movq mm0, [r2]
+    movq mm1, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm2, [r2]
+    movq mm3, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm4, [r2]
+    movq mm5, [r2+r3]
+    lea r2, [r2+2*r3]
+    movq mm6, [r2]
+
+    ;in:  m0, m1, m2, m3, m4, m5, m6, m7
+    ;out: m0, m3, m5, m2, m7, m1, m6, m4
+    TRANSPOSE_8x8B_MMX mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, [r2+r3], [r7]
+
+    TRANSPOSE8x8_WRITE_ALT_MMX r0, r1, r6
+    lea r0, [r0+8]
+    lea r2, [r2+2*r3]
+    dec r4
+    jg near TRANSPOSE_BLOCKS_X8_LOOP_MMX
+
+    emms
+    add r7, 8
+    LOAD_5_PARA_POP
+    pop r6
+    pop r5
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/memzero.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/memzero.asm
new file mode 100644
index 0000000000..a95c6497be
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/memzero.asm
@@ -0,0 +1,132 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  memzero.asm
+;*
+;*  Abstract
+;*
+;*
+;*  History
+;*      9/16/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+;***********************************************************************
+;void WelsPrefetchZero_mmx(int8_t const*_A);
+;***********************************************************************
+WELS_EXTERN WelsPrefetchZero_mmx
+    %assign  push_num 0
+    LOAD_1_PARA
+    prefetchnta [r0]
+    ret
+
+
+;***********************************************************************
+;   void WelsSetMemZeroAligned64_sse2(void *dst, int32_t size)
+;***********************************************************************
+WELS_EXTERN WelsSetMemZeroAligned64_sse2
+
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    neg     r1
+
+    pxor    xmm0,       xmm0
+.memzeroa64_sse2_loops:
+    movdqa  [r0],       xmm0
+    movdqa  [r0+16],    xmm0
+    movdqa  [r0+32],    xmm0
+    movdqa  [r0+48],    xmm0
+    add     r0, 0x40
+
+    add r1, 0x40
+    jnz near .memzeroa64_sse2_loops
+
+    ret
+
+;***********************************************************************
+;   void WelsSetMemZeroSize64_mmx(void *dst, int32_t size)
+;***********************************************************************
+WELS_EXTERN WelsSetMemZeroSize64_mmx
+
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    neg     r1
+
+    pxor    mm0,        mm0
+.memzero64_mmx_loops:
+    movq    [r0],       mm0
+    movq    [r0+8], mm0
+    movq    [r0+16],    mm0
+    movq    [r0+24],    mm0
+    movq    [r0+32],    mm0
+    movq    [r0+40],    mm0
+    movq    [r0+48],    mm0
+    movq    [r0+56],    mm0
+    add     r0,     0x40
+
+    add r1, 0x40
+    jnz near .memzero64_mmx_loops
+
+    WELSEMMS
+    ret
+
+;***********************************************************************
+;   void WelsSetMemZeroSize8_mmx(void *dst, int32_t size)
+;***********************************************************************
+WELS_EXTERN WelsSetMemZeroSize8_mmx
+
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION r1, r1d
+    neg     r1
+    pxor    mm0,        mm0
+
+.memzero8_mmx_loops:
+    movq    [r0],       mm0
+    add     r0,     0x08
+
+    add     r1,     0x08
+    jnz near .memzero8_mmx_loops
+
+    WELSEMMS
+    ret
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/quant.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/quant.asm
new file mode 100644
index 0000000000..21b56b5398
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/quant.asm
@@ -0,0 +1,507 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  quant.asm
+;*
+;*  Abstract
+;*      sse2 quantize inter-block
+;*
+;*  History
+;*      7/6/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+
+SECTION .text
+;************************************************
+;NEW_QUANT
+;************************************************
+
+%macro SSE2_Quant8  5
+    MOVDQ   %1, %5
+    pxor    %2, %2
+    pcmpgtw %2, %1
+    pxor    %1, %2
+    psubw   %1, %2
+    paddusw %1, %3
+    pmulhuw %1, %4
+    pxor    %1, %2
+    psubw   %1, %2
+    MOVDQ   %5, %1
+%endmacro
+
+%macro SSE2_QuantMax8  6
+    MOVDQ   %1, %5
+    pxor    %2, %2
+    pcmpgtw %2, %1
+    pxor    %1, %2
+    psubw   %1, %2
+    paddusw %1, %3
+    pmulhuw %1, %4
+    pmaxsw  %6, %1
+    pxor    %1, %2
+    psubw   %1, %2
+    MOVDQ   %5, %1
+%endmacro
+
+%define pDct                esp + 4
+%define ff                  esp + 8
+%define mf                  esp + 12
+%define max                 esp + 16
+;***********************************************************************
+;   void WelsQuant4x4_sse2(int16_t *pDct, int16_t* ff,  int16_t *mf);
+;***********************************************************************
+WELS_EXTERN WelsQuant4x4_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    movdqa  xmm2, [r1]
+    movdqa  xmm3, [r2]
+
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x10]
+
+    ret
+
+;***********************************************************************
+;void WelsQuant4x4Dc_sse2(int16_t *pDct, const int16_t ff, int16_t mf);
+;***********************************************************************
+WELS_EXTERN WelsQuant4x4Dc_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    SIGN_EXTENSIONW r1, r1w
+    SIGN_EXTENSIONW r2, r2w
+    SSE2_Copy8Times xmm3, r2d
+
+    SSE2_Copy8Times xmm2, r1d
+
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x10]
+
+    ret
+
+;***********************************************************************
+;   void WelsQuantFour4x4_sse2(int16_t *pDct, int16_t* ff,  int16_t *mf);
+;***********************************************************************
+WELS_EXTERN WelsQuantFour4x4_sse2
+    %assign push_num 0
+    LOAD_3_PARA
+    MOVDQ   xmm2, [r1]
+    MOVDQ   xmm3, [r2]
+
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x10]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x20]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x30]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x40]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x50]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x60]
+    SSE2_Quant8 xmm0, xmm1, xmm2, xmm3, [r0 + 0x70]
+
+    ret
+
+;***********************************************************************
+;   void WelsQuantFour4x4Max_sse2(int16_t *pDct, int32_t* f,  int16_t *mf, int16_t *max);
+;***********************************************************************
+WELS_EXTERN WelsQuantFour4x4Max_sse2
+    %assign push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    MOVDQ   xmm2, [r1]
+    MOVDQ   xmm3, [r2]
+
+    pxor    xmm4, xmm4
+    pxor    xmm5, xmm5
+    pxor    xmm6, xmm6
+    pxor    xmm7, xmm7
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0   ], xmm4
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x10], xmm4
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x20], xmm5
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x30], xmm5
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x40], xmm6
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x50], xmm6
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x60], xmm7
+    SSE2_QuantMax8  xmm0, xmm1, xmm2, xmm3, [r0 + 0x70], xmm7
+
+    SSE2_TransTwo4x4W xmm4, xmm5, xmm6, xmm7, xmm0
+    pmaxsw  xmm0,  xmm4
+    pmaxsw  xmm0,  xmm5
+    pmaxsw  xmm0,  xmm7
+    movdqa  xmm1,  xmm0
+    punpckhqdq  xmm0, xmm1
+    pmaxsw  xmm0, xmm1
+
+    movq    [r3], xmm0
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+
+%macro MMX_Copy4Times 2
+    movd        %1, %2
+    punpcklwd   %1, %1
+    punpckldq   %1, %1
+%endmacro
+
+SECTION .text
+
+%macro MMX_Quant4  4
+    pxor    %2, %2
+    pcmpgtw %2, %1
+    pxor    %1, %2
+    psubw   %1, %2
+    paddusw %1, %3
+    pmulhuw %1, %4
+    pxor    %1, %2
+    psubw   %1, %2
+%endmacro
+
+;***********************************************************************
+;int32_t WelsHadamardQuant2x2_mmx(int16_t *rs, const int16_t ff, int16_t mf, int16_t * pDct, int16_t * block);
+;***********************************************************************
+WELS_EXTERN WelsHadamardQuant2x2_mmx
+    %assign push_num 0
+    LOAD_5_PARA
+    SIGN_EXTENSIONW r1, r1w
+    SIGN_EXTENSIONW r2, r2w
+    movd        mm0,            [r0]
+    movd        mm1,            [r0 + 0x20]
+    punpcklwd   mm0,            mm1
+    movd        mm3,            [r0 + 0x40]
+    movd        mm1,            [r0 + 0x60]
+    punpcklwd   mm3,            mm1
+
+    ;hdm_2x2,   mm0 = dct0 dct1, mm3 = dct2 dct3
+    movq        mm5,            mm3
+    paddw       mm3,            mm0
+    psubw       mm0,            mm5
+    punpcklwd   mm3,            mm0
+    movq        mm1,            mm3
+    psrlq       mm1,            32
+    movq        mm5,            mm1
+    paddw       mm1,            mm3
+    psubw       mm3,            mm5
+    punpcklwd   mm1,            mm3
+
+    ;quant_2x2_dc
+    MMX_Copy4Times  mm3,        r2d
+    MMX_Copy4Times  mm2,        r1d
+    MMX_Quant4      mm1,    mm0,    mm2,    mm3
+
+    ; store dct_2x2
+    movq        [r3],           mm1
+    movq        [r4],           mm1
+
+    ; pNonZeroCount of dct_2x2
+    pcmpeqb     mm2,            mm2     ; mm2 = FF
+    pxor        mm3,            mm3
+    packsswb    mm1,            mm3
+    pcmpeqb     mm1,            mm3     ; set FF if equal, 0 if not equal
+    psubsb      mm1,            mm2     ; set 0 if equal, 1 if not equal
+    psadbw      mm1,            mm3     ;
+    mov         r1w,                0
+    mov         [r0],           r1w
+    mov         [r0 + 0x20],    r1w
+    mov         [r0 + 0x40],    r1w
+    mov         [r0 + 0x60],    r1w
+
+
+    movd        retrd,      mm1
+
+    WELSEMMS
+    LOAD_5_PARA_POP
+    ret
+
+;***********************************************************************
+;int32_t WelsHadamardQuant2x2Skip_mmx(int16_t *pDct, int16_t ff,  int16_t mf);
+;***********************************************************************
+WELS_EXTERN WelsHadamardQuant2x2Skip_mmx
+    %assign push_num 0
+    LOAD_3_PARA
+    SIGN_EXTENSIONW r1, r1w
+    SIGN_EXTENSIONW r2, r2w
+    movd        mm0,            [r0]
+    movd        mm1,            [r0 + 0x20]
+    punpcklwd   mm0,            mm1
+    movd        mm3,            [r0 + 0x40]
+    movd        mm1,            [r0 + 0x60]
+    punpcklwd   mm3,            mm1
+
+    ;hdm_2x2,   mm0 = dct0 dct1, mm3 = dct2 dct3
+    movq        mm5,            mm3
+    paddw       mm3,            mm0
+    psubw       mm0,            mm5
+    punpcklwd   mm3,            mm0
+    movq        mm1,            mm3
+    psrlq       mm1,            32
+    movq        mm5,            mm1
+    paddw       mm1,            mm3
+    psubw       mm3,            mm5
+    punpcklwd   mm1,            mm3
+
+    ;quant_2x2_dc
+    MMX_Copy4Times  mm3,        r2d
+    MMX_Copy4Times  mm2,        r1d
+    MMX_Quant4      mm1,    mm0,    mm2,    mm3
+
+    ; pNonZeroCount of dct_2x2
+    pcmpeqb     mm2,            mm2     ; mm2 = FF
+    pxor        mm3,            mm3
+    packsswb    mm1,            mm3
+    pcmpeqb     mm1,            mm3     ; set FF if equal, 0 if not equal
+    psubsb      mm1,            mm2     ; set 0 if equal, 1 if not equal
+    psadbw      mm1,            mm3     ;
+    movd        retrd,          mm1
+
+    WELSEMMS
+    ret
+
+
+%macro SSE2_DeQuant8 3
+    MOVDQ  %2, %1
+    pmullw %2, %3
+    MOVDQ  %1, %2
+%endmacro
+
+
+;***********************************************************************
+; void WelsDequant4x4_sse2(int16_t *pDct, const uint16_t* mf);
+;***********************************************************************
+WELS_EXTERN WelsDequant4x4_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+
+    movdqa  xmm1, [r1]
+    SSE2_DeQuant8 [r0   ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0 + 0x10],  xmm0, xmm1
+
+    ret
+
+;***********************************************************************
+;void WelsDequantFour4x4_sse2(int16_t *pDct, const uint16_t* mf);
+;***********************************************************************
+
+WELS_EXTERN WelsDequantFour4x4_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+
+    movdqa  xmm1, [r1]
+    SSE2_DeQuant8 [r0   ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x10  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x20  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x30  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x40  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x50  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x60  ],  xmm0, xmm1
+    SSE2_DeQuant8 [r0+0x70  ],  xmm0, xmm1
+
+    ret
+
+;***********************************************************************
+;void WelsDequantIHadamard4x4_sse2(int16_t *rs, const uint16_t mf);
+;***********************************************************************
+WELS_EXTERN WelsDequantIHadamard4x4_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    %ifndef X86_32
+    movzx r1, r1w
+    %endif
+
+    ; WelsDequantLumaDc4x4
+    SSE2_Copy8Times xmm1,       r1d
+    ;psrlw      xmm1,       2       ; for the (>>2) in ihdm
+    MOVDQ       xmm0,       [r0]
+    MOVDQ       xmm2,       [r0+0x10]
+    pmullw      xmm0,       xmm1
+    pmullw      xmm2,       xmm1
+
+    ; ihdm_4x4
+    movdqa      xmm1,       xmm0
+    psrldq      xmm1,       8
+    movdqa      xmm3,       xmm2
+    psrldq      xmm3,       8
+
+    SSE2_SumSub     xmm0, xmm3, xmm5                    ; xmm0 = xmm0 - xmm3, xmm3 = xmm0 + xmm3
+    SSE2_SumSub     xmm1, xmm2, xmm5                    ; xmm1 = xmm1 - xmm2, xmm2 = xmm1 + xmm2
+    SSE2_SumSub     xmm3, xmm2, xmm5                    ; xmm3 = xmm3 - xmm2, xmm2 = xmm3 + xmm2
+    SSE2_SumSub     xmm0, xmm1, xmm5                    ; xmm0 = xmm0 - xmm1, xmm1 = xmm0 + xmm1
+
+    SSE2_TransTwo4x4W   xmm2, xmm1, xmm3, xmm0, xmm4
+    SSE2_SumSub     xmm2, xmm4, xmm5
+    SSE2_SumSub     xmm1, xmm0, xmm5
+    SSE2_SumSub     xmm4, xmm0, xmm5
+    SSE2_SumSub     xmm2, xmm1, xmm5
+    SSE2_TransTwo4x4W   xmm0, xmm1, xmm4, xmm2, xmm3
+
+    punpcklqdq  xmm0,       xmm1
+    MOVDQ       [r0],       xmm0
+
+    punpcklqdq  xmm2,       xmm3
+    MOVDQ       [r0+16],    xmm2
+    ret
+
+
+%ifdef HAVE_AVX2
+; data=%1 abs_out=%2 ff=%3 mf=%4 7FFFh=%5
+%macro AVX2_Quant 5
+    vpabsw          %2, %1
+    vpor            %1, %1, %5  ; ensure non-zero before vpsignw
+    vpaddusw        %2, %2, %3
+    vpmulhuw        %2, %2, %4
+    vpsignw         %1, %2, %1
+%endmacro
+
+
+;***********************************************************************
+;   void WelsQuant4x4_avx2(int16_t *pDct, int16_t* ff, int16_t *mf);
+;***********************************************************************
+
+WELS_EXTERN WelsQuant4x4_avx2
+    %assign push_num 0
+    LOAD_3_PARA
+    PUSH_XMM 5
+    vbroadcasti128  ymm0, [r1]
+    vbroadcasti128  ymm1, [r2]
+    WELS_DW32767_VEX ymm2
+    vmovdqu         ymm3, [r0]
+    AVX2_Quant      ymm3, ymm4, ymm0, ymm1, ymm2
+    vmovdqu         [r0], ymm3
+    vzeroupper
+    POP_XMM
+    ret
+
+
+;***********************************************************************
+;void WelsQuant4x4Dc_avx2(int16_t *pDct, int16_t ff, int16_t mf);
+;***********************************************************************
+
+WELS_EXTERN WelsQuant4x4Dc_avx2
+    %assign push_num 0
+    LOAD_1_PARA
+    PUSH_XMM 5
+%ifidni r1, arg2
+    vmovd           xmm0, arg2d
+    vpbroadcastw    ymm0, xmm0
+%else
+    vpbroadcastw    ymm0, arg2
+%endif
+%ifidni r2, arg3
+    vmovd           xmm1, arg3d
+    vpbroadcastw    ymm1, xmm1
+%else
+    vpbroadcastw    ymm1, arg3
+%endif
+    WELS_DW32767_VEX ymm2
+    vmovdqu         ymm3, [r0]
+    AVX2_Quant      ymm3, ymm4, ymm0, ymm1, ymm2
+    vmovdqu         [r0], ymm3
+    vzeroupper
+    POP_XMM
+    ret
+
+
+;***********************************************************************
+;   void WelsQuantFour4x4_avx2(int16_t *pDct, int16_t* ff, int16_t *mf);
+;***********************************************************************
+
+WELS_EXTERN WelsQuantFour4x4_avx2
+    %assign push_num 0
+    LOAD_3_PARA
+    PUSH_XMM 6
+    vbroadcasti128  ymm0, [r1]
+    vbroadcasti128  ymm1, [r2]
+    WELS_DW32767_VEX ymm4
+    vmovdqu         ymm3, [r0 + 0x00]
+    vmovdqu         ymm5, [r0 + 0x20]
+    AVX2_Quant      ymm3, ymm2, ymm0, ymm1, ymm4
+    vmovdqu         [r0 + 0x00], ymm3
+    AVX2_Quant      ymm5, ymm2, ymm0, ymm1, ymm4
+    vmovdqu         [r0 + 0x20], ymm5
+    vmovdqu         ymm3, [r0 + 0x40]
+    vmovdqu         ymm5, [r0 + 0x60]
+    AVX2_Quant      ymm3, ymm2, ymm0, ymm1, ymm4
+    vmovdqu         [r0 + 0x40], ymm3
+    AVX2_Quant      ymm5, ymm2, ymm0, ymm1, ymm4
+    vmovdqu         [r0 + 0x60], ymm5
+    vzeroupper
+    POP_XMM
+    ret
+
+
+;***********************************************************************
+;   void WelsQuantFour4x4Max_avx2(int16_t *pDct, int32_t* ff, int16_t *mf, int16_t *max);
+;***********************************************************************
+
+WELS_EXTERN WelsQuantFour4x4Max_avx2
+    %assign push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 7
+    vbroadcasti128  ymm0, [r1]
+    vbroadcasti128  ymm1, [r2]
+    WELS_DW32767_VEX ymm6
+    vmovdqu         ymm4, [r0 + 0x00]
+    vmovdqu         ymm5, [r0 + 0x20]
+    AVX2_Quant      ymm4, ymm2, ymm0, ymm1, ymm6
+    vmovdqu         [r0 + 0x00], ymm4
+    AVX2_Quant      ymm5, ymm3, ymm0, ymm1, ymm6
+    vmovdqu         [r0 + 0x20], ymm5
+    vperm2i128      ymm4, ymm2, ymm3, 00100000b
+    vperm2i128      ymm3, ymm2, ymm3, 00110001b
+    vpmaxsw         ymm2, ymm4, ymm3
+    vmovdqu         ymm4, [r0 + 0x40]
+    vmovdqu         ymm5, [r0 + 0x60]
+    AVX2_Quant      ymm4, ymm3, ymm0, ymm1, ymm6
+    vmovdqu         [r0 + 0x40], ymm4
+    AVX2_Quant      ymm5, ymm4, ymm0, ymm1, ymm6
+    vmovdqu         [r0 + 0x60], ymm5
+    vperm2i128      ymm5, ymm3, ymm4, 00100000b
+    vperm2i128      ymm4, ymm3, ymm4, 00110001b
+    vpmaxsw         ymm3, ymm5, ymm4
+    vpxor           ymm2, ymm2, ymm6  ; flip bits so as to enable use of vphminposuw to find max value.
+    vpxor           ymm3, ymm3, ymm6  ; flip bits so as to enable use of vphminposuw to find max value.
+    vextracti128    xmm4, ymm2, 1
+    vextracti128    xmm5, ymm3, 1
+    vphminposuw     xmm2, xmm2
+    vphminposuw     xmm3, xmm3
+    vphminposuw     xmm4, xmm4
+    vphminposuw     xmm5, xmm5
+    vpunpcklwd      xmm2, xmm2, xmm4
+    vpunpcklwd      xmm3, xmm3, xmm5
+    vpunpckldq      xmm2, xmm2, xmm3
+    vpxor           xmm2, xmm2, xmm6  ; restore non-flipped values.
+    vmovq           [r3], xmm2        ; store max values.
+    vzeroupper
+    POP_XMM
+    LOAD_4_PARA_POP
+    ret
+%endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/sample_sc.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/sample_sc.asm
new file mode 100644
index 0000000000..103fed7171
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/sample_sc.asm
@@ -0,0 +1,1829 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Local Data (Read Only)
+;***********************************************************************
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+ALIGN 16
+mv_x_inc_x4     dw  0x10, 0x10, 0x10, 0x10
+mv_y_inc_x4     dw  0x04, 0x04, 0x04, 0x04
+mx_x_offset_x4  dw  0x00, 0x04, 0x08, 0x0C
+
+SECTION .text
+%ifdef X86_32
+;**********************************************************************************************************************
+;void SumOf8x8BlockOfFrame_sse2(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;*********************************************************************************************************************
+WELS_EXTERN SumOf8x8BlockOfFrame_sse2
+%define     pushsize        16
+%define     localsize       4
+%define     ref             esp + pushsize + localsize + 4
+%define     sum_ref         esp + pushsize + localsize + 20
+%define     times_of_sum    esp + pushsize + localsize + 24
+%define     width           esp + pushsize + localsize + 8
+%define     height          esp + pushsize + localsize + 12
+%define     linesize        esp + pushsize + localsize + 16
+%define     tmp_width       esp + 0
+    push    ebx
+    push    ebp
+    push    esi
+    push    edi
+    sub     esp,    localsize
+
+    pxor    xmm0,   xmm0
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     edx,    [times_of_sum]
+    mov     ebx,    [linesize]
+    mov     eax,    [width]
+    lea     ecx,    [ebx+ebx*2] ; 3*linesize
+
+    mov     [tmp_width],    eax
+    lea     ebp,    [esi+ebx*4]
+FIRST_ROW:
+    movq    xmm1,   [esi]
+    movq    xmm2,   [esi+ebx]
+    movq    xmm3,   [esi+ebx*2]
+    movq    xmm4,   [esi+ecx]
+
+    shufps  xmm1,   xmm2,   01000100b
+    shufps  xmm3,   xmm4,   01000100b
+    psadbw  xmm1,   xmm0
+    psadbw  xmm3,   xmm0
+    paddd   xmm1,   xmm3
+
+    movq    xmm2,   [ebp]
+    movq    xmm3,   [ebp+ebx]
+    movq    xmm4,   [ebp+ebx*2]
+    movq    xmm5,   [ebp+ecx]
+
+    shufps  xmm2,   xmm3,   01000100b
+    shufps  xmm4,   xmm5,   01000100b
+    psadbw  xmm2,   xmm0
+    psadbw  xmm4,   xmm0
+    paddd   xmm2,   xmm4
+
+    paddd   xmm1,   xmm2
+    pshufd  xmm2,   xmm1,   00001110b
+    paddd   xmm1,   xmm2
+    movd    eax,    xmm1
+    mov     [edi],  ax
+    inc     dword [edx+eax*4]
+
+    inc     esi
+    inc     ebp
+    add     edi,    2
+
+    dec     dword [tmp_width]
+    jg      FIRST_ROW
+
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     ebp,    [width]
+    dec     dword [height]
+HEIGHT_LOOP:
+    mov     [tmp_width],    ebp
+WIDTH_LOOP:
+    movq    xmm1,   [esi+ebx*8]
+    movq    xmm2,   [esi]
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psubd   xmm1,   xmm2
+    movd    eax,    xmm1
+    mov     cx,     [edi]
+    add     eax,    ecx
+
+    mov     [edi+ebp*2],    ax
+    inc     dword [edx+eax*4]
+
+    inc     esi
+    add     edi,    2
+
+    dec     dword [tmp_width]
+    jg      WIDTH_LOOP
+
+    add     esi,    ebx
+    sub     esi,    ebp
+
+    dec     dword [height]
+    jg      HEIGHT_LOOP
+
+    add     esp,    localsize
+    pop     edi
+    pop     esi
+    pop     ebp
+    pop     ebx
+%undef      pushsize
+%undef      localsize
+%undef      ref
+%undef      sum_ref
+%undef      times_of_sum
+%undef      width
+%undef      height
+%undef      linesize
+%undef      tmp_width
+    ret
+
+
+%macro COUNT_SUM 3
+%define xmm_reg %1
+%define tmp_reg %2
+    movd    tmp_reg,    xmm_reg
+    inc     dword [edx+tmp_reg*4]
+%if %3 == 1
+    psrldq  xmm_reg,    4
+%endif
+%endmacro
+
+
+;-----------------------------------------------------------------------------
+; requires:  width % 8 == 0 && height > 1
+;-----------------------------------------------------------------------------
+;void SumOf8x8BlockOfFrame_sse4(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;-----------------------------------------------------------------------------
+; read extra (16 - (width % 8) ) mod 16 bytes of every line
+; write extra (16 - (width % 8)*2 ) mod 16 bytes in the end of sum_ref
+WELS_EXTERN SumOf8x8BlockOfFrame_sse4
+%define     pushsize        16
+%define     localsize       4
+%define     ref             esp + pushsize + localsize + 4
+%define     sum_ref         esp + pushsize + localsize + 20
+%define     times_of_sum    esp + pushsize + localsize + 24
+%define     width           esp + pushsize + localsize + 8
+%define     height          esp + pushsize + localsize + 12
+%define     linesize        esp + pushsize + localsize + 16
+%define     tmp_width       esp + 0
+    push    ebx
+    push    ebp
+    push    esi
+    push    edi
+    sub     esp,    localsize
+
+    pxor    xmm0,   xmm0
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     edx,    [times_of_sum]
+    mov     ebx,    [linesize]
+    mov     eax,    [width]
+    lea     ecx,    [ebx+ebx*2] ; 3*linesize
+
+    mov     [tmp_width],    eax
+    lea     ebp,    [esi+ebx*4]
+FIRST_ROW_SSE4:
+    movdqu  xmm1,   [esi]
+    movdqu  xmm3,   [esi+ebx]
+    movdqu  xmm5,   [esi+ebx*2]
+    movdqu  xmm7,   [esi+ecx]
+
+    movdqa  xmm2,   xmm1
+    mpsadbw xmm1,   xmm0,   000b
+    mpsadbw xmm2,   xmm0,   100b
+    paddw   xmm1,   xmm2            ; 8 sums of line1
+
+    movdqa  xmm4,   xmm3
+    mpsadbw xmm3,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm3,   xmm4            ; 8 sums of line2
+
+    movdqa  xmm2,   xmm5
+    mpsadbw xmm5,   xmm0,   000b
+    mpsadbw xmm2,   xmm0,   100b
+    paddw   xmm5,   xmm2            ; 8 sums of line3
+
+    movdqa  xmm4,   xmm7
+    mpsadbw xmm7,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm7,   xmm4            ; 8 sums of line4
+
+    paddw   xmm1,   xmm3
+    paddw   xmm5,   xmm7
+    paddw   xmm1,   xmm5            ; sum the upper 4 lines first
+
+    movdqu  xmm2,   [ebp]
+    movdqu  xmm3,   [ebp+ebx]
+    movdqu  xmm4,   [ebp+ebx*2]
+    movdqu  xmm5,   [ebp+ecx]
+
+    movdqa  xmm6,   xmm2
+    mpsadbw xmm2,   xmm0,   000b
+    mpsadbw xmm6,   xmm0,   100b
+    paddw   xmm2,   xmm6
+
+    movdqa  xmm7,   xmm3
+    mpsadbw xmm3,   xmm0,   000b
+    mpsadbw xmm7,   xmm0,   100b
+    paddw   xmm3,   xmm7
+
+    movdqa  xmm6,   xmm4
+    mpsadbw xmm4,   xmm0,   000b
+    mpsadbw xmm6,   xmm0,   100b
+    paddw   xmm4,   xmm6
+
+    movdqa  xmm7,   xmm5
+    mpsadbw xmm5,   xmm0,   000b
+    mpsadbw xmm7,   xmm0,   100b
+    paddw   xmm5,   xmm7
+
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm1,   xmm2
+    paddw   xmm1,   xmm4            ; sum of lines 1- 8
+
+    movdqu  [edi],  xmm1
+
+    movdqa  xmm2,   xmm1
+    punpcklwd   xmm1,   xmm0
+    punpckhwd   xmm2,   xmm0
+
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    0
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    0
+
+    lea     esi,    [esi+8]
+    lea     ebp,    [ebp+8]
+    lea     edi,    [edi+16]        ; element size is 2
+
+    sub     dword [tmp_width], 8
+    jg      near FIRST_ROW_SSE4
+
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     ebp,    [width]
+    dec     dword [height]
+HEIGHT_LOOP_SSE4:
+    mov     ecx,    ebp
+WIDTH_LOOP_SSE4:
+    movdqu  xmm1,   [esi+ebx*8]
+    movdqu  xmm2,   [esi]
+    movdqu  xmm7,   [edi]
+
+    movdqa  xmm3,   xmm1
+    mpsadbw xmm1,   xmm0,   000b
+    mpsadbw xmm3,   xmm0,   100b
+    paddw   xmm1,   xmm3
+
+    movdqa  xmm4,   xmm2
+    mpsadbw xmm2,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm2,   xmm4
+
+    paddw   xmm7,   xmm1
+    psubw   xmm7,   xmm2
+    movdqu  [edi+ebp*2], xmm7
+
+    movdqa  xmm6,   xmm7
+    punpcklwd   xmm7,   xmm0
+    punpckhwd   xmm6,   xmm0
+
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    0
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    0
+
+    lea     esi,    [esi+8]
+    lea     edi,    [edi+16]
+
+    sub     ecx,    8
+    jg      near WIDTH_LOOP_SSE4
+
+    lea     esi,    [esi+ebx]
+    sub     esi,    ebp
+
+    dec     dword [height]
+    jg      near HEIGHT_LOOP_SSE4
+
+    add     esp,    localsize
+    pop     edi
+    pop     esi
+    pop     ebp
+    pop     ebx
+%undef      pushsize
+%undef      localsize
+%undef      ref
+%undef      sum_ref
+%undef      times_of_sum
+%undef      width
+%undef      height
+%undef      linesize
+%undef      tmp_width
+    ret
+
+
+;****************************************************************************************************************************************************
+;void SumOf16x16BlockOfFrame_sse2(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;****************************************************************************************************************************************************
+WELS_EXTERN SumOf16x16BlockOfFrame_sse2
+%define     pushsize        16
+%define     localsize       4
+%define     ref             esp + pushsize + localsize + 4
+%define     sum_ref         esp + pushsize + localsize + 20
+%define     times_of_sum    esp + pushsize + localsize + 24
+%define     width           esp + pushsize + localsize + 8
+%define     height          esp + pushsize + localsize + 12
+%define     linesize        esp + pushsize + localsize + 16
+%define     tmp_width       esp
+    push    ebx
+    push    ebp
+    push    esi
+    push    edi
+    sub     esp,    localsize
+
+    pxor    xmm0,   xmm0
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     edx,    [times_of_sum]
+    mov     ebx,    [linesize]
+    mov     eax,    [width]
+
+    lea     ecx,    [ebx+ebx*2]
+    mov     [tmp_width],    eax
+FIRST_ROW_X16H:
+    movdqu  xmm1,   [esi]
+    movdqu  xmm2,   [esi+ebx]
+    movdqu  xmm3,   [esi+ebx*2]
+    movdqu  xmm4,   [esi+ecx]
+
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    paddw   xmm1,   xmm2
+    paddw   xmm3,   xmm4
+    paddw   xmm1,   xmm3
+
+    lea     ebp,    [esi+ebx*4]
+    movdqu  xmm2,   [ebp]
+    movdqu  xmm3,   [ebp+ebx]
+    movdqu  xmm4,   [ebp+ebx*2]
+    movdqu  xmm5,   [ebp+ecx]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+
+    lea     ebp,    [ebp+ebx*4]
+    movdqu  xmm2,   [ebp]
+    movdqu  xmm3,   [ebp+ebx]
+    movdqu  xmm4,   [ebp+ebx*2]
+    movdqu  xmm5,   [ebp+ecx]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+
+    lea     ebp,    [ebp+ebx*4]
+    movdqu  xmm2,   [ebp]
+    movdqu  xmm3,   [ebp+ebx]
+    movdqu  xmm4,   [ebp+ebx*2]
+    movdqu  xmm5,   [ebp+ecx]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+    movdqa  xmm2,   xmm1
+    punpckhwd xmm2, xmm0
+    paddw xmm1, xmm2
+    movd    eax,    xmm1
+    mov     [edi],  ax
+    inc     dword [edx+eax*4]
+
+    inc     esi
+    lea     edi,    [edi+2]
+
+    dec     dword [tmp_width]
+    jg      near FIRST_ROW_X16H
+
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     ebp,    [width]
+    dec     dword [height]
+
+    mov     ecx,    ebx
+    sal     ecx,    4       ; succeeded 16th line
+HEIGHT_LOOP_X16:
+    mov     [tmp_width],    ebp
+WIDTH_LOOP_X16:
+    movdqu  xmm1,   [esi+ecx]
+    movdqu  xmm2,   [esi]
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psubw   xmm1,   xmm2
+    movdqa  xmm2,   xmm1
+    punpckhwd xmm2, xmm0
+    paddw   xmm1,   xmm2
+    movd    eax,    xmm1
+    add     ax, word [edi]
+    mov     [edi+ebp*2],    ax
+    inc     dword [edx+eax*4]
+
+    inc     esi
+    add     edi,    2
+
+    dec     dword [tmp_width]
+    jg      near WIDTH_LOOP_X16
+
+    add     esi,    ebx
+    sub     esi,    ebp
+
+    dec     dword [height]
+    jg      near HEIGHT_LOOP_X16
+
+    add     esp,    localsize
+    pop     edi
+    pop     esi
+    pop     ebp
+    pop     ebx
+%undef      pushsize
+%undef      localsize
+%undef      ref
+%undef      sum_ref
+%undef      times_of_sum
+%undef      width
+%undef      height
+%undef      linesize
+%undef      tmp_width
+    ret
+
+; requires:  width % 16 == 0 && height > 1
+;-----------------------------------------------------------------------------------------------------------------------------
+;void SumOf16x16BlockOfFrame_sse4(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;-----------------------------------------------------------------------------------------------------------------------------
+; try 8 mv via offset
+%macro SUM_LINE_X16_SSE41  5    ; ref, dst0, dst1, tmp0, tmp1
+    movdqu  %2, [%1]
+    movdqu  %3, [%1+8h]
+    movdqa  %4, %2
+    movdqa  %5, %3
+
+    mpsadbw %2, xmm0,   0   ; 000 B
+    mpsadbw %4, xmm0,   5   ; 101 B
+    mpsadbw %3, xmm0,   2   ; 010 B
+    mpsadbw %5, xmm0,   7   ; 111 B
+    paddw   %2, %4
+    paddw   %3, %5
+    paddw   %2, %3  ; accumulate cost
+%endmacro   ; end of SAD_16x16_LINE_SSE41
+
+WELS_EXTERN SumOf16x16BlockOfFrame_sse4
+%define     pushsize        16
+%define     localsize       4
+%define     ref             esp + pushsize + localsize + 4
+%define     sum_ref         esp + pushsize + localsize + 20
+%define     times_of_sum    esp + pushsize + localsize + 24
+%define     width           esp + pushsize + localsize + 8
+%define     height          esp + pushsize + localsize + 12
+%define     linesize        esp + pushsize + localsize + 16
+%define     tmp_width       esp
+    push    ebx
+    push    ebp
+    push    esi
+    push    edi
+    sub     esp,    localsize
+
+    pxor    xmm0,   xmm0
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     edx,    [times_of_sum]
+    mov     ebx,    [linesize]
+    mov     eax,    [width]
+
+    lea     ecx,    [ebx+ebx*2]
+    mov     [tmp_width],    eax
+FIRST_ROW_X16_SSE4:
+    SUM_LINE_X16_SSE41  esi,        xmm1, xmm2, xmm3, xmm4
+    SUM_LINE_X16_SSE41  esi+ebx,    xmm2, xmm3, xmm4, xmm5
+    SUM_LINE_X16_SSE41  esi+ebx*2,  xmm3, xmm4, xmm5, xmm6
+    SUM_LINE_X16_SSE41  esi+ecx,    xmm4, xmm5, xmm6, xmm7
+    paddw   xmm1, xmm2
+    paddw   xmm3, xmm4
+    paddw   xmm1, xmm3
+
+    lea     ebp,    [esi+ebx*4]
+    SUM_LINE_X16_SSE41  ebp,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx*2,  xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ecx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    lea     ebp,    [ebp+ebx*4]
+    SUM_LINE_X16_SSE41  ebp,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx*2,  xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ecx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    lea     ebp,    [ebp+ebx*4]
+    SUM_LINE_X16_SSE41  ebp,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ebx*2,  xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  ebp+ecx,    xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    movdqa  [edi],  xmm1
+    movdqa  xmm2,   xmm1
+    punpcklwd   xmm1,   xmm0
+    punpckhwd   xmm2,   xmm0
+
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    1
+    COUNT_SUM   xmm1,   eax,    0
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    1
+    COUNT_SUM   xmm2,   eax,    0
+
+    lea     esi,    [esi+8]
+    lea     edi,    [edi+16]    ; element size is 2
+
+    sub     dword [tmp_width], 8
+    jg      near FIRST_ROW_X16_SSE4
+
+    mov     esi,    [ref]
+    mov     edi,    [sum_ref]
+    mov     ebp,    [width]
+    dec     dword [height]
+
+    mov     ecx,    ebx
+    sal     ecx,    4       ; succeeded 16th line
+
+HEIGHT_LOOP_X16_SSE4:
+    mov     [tmp_width],    ebp
+WIDTH_LOOP_X16_SSE4:
+    movdqa  xmm7,   [edi]
+    SUM_LINE_X16_SSE41  esi+ecx, xmm1, xmm2, xmm3, xmm4
+    SUM_LINE_X16_SSE41  esi, xmm2, xmm3, xmm4, xmm5
+
+    paddw   xmm7,   xmm1
+    psubw   xmm7,   xmm2
+    movdqa  [edi+ebp*2], xmm7
+
+    movdqa  xmm6,   xmm7
+    punpcklwd   xmm7,   xmm0
+    punpckhwd   xmm6,   xmm0
+
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    1
+    COUNT_SUM   xmm7,   eax,    0
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    1
+    COUNT_SUM   xmm6,   eax,    0
+
+    lea     esi,    [esi+8]
+    lea     edi,    [edi+16]
+
+    sub     dword [tmp_width], 8
+    jg      near WIDTH_LOOP_X16_SSE4
+
+    add     esi,    ebx
+    sub     esi,    ebp
+
+    dec     dword [height]
+    jg      near HEIGHT_LOOP_X16_SSE4
+
+    add     esp,    localsize
+    pop     edi
+    pop     esi
+    pop     ebp
+    pop     ebx
+%undef      pushsize
+%undef      localsize
+%undef      ref
+%undef      sum_ref
+%undef      times_of_sum
+%undef      width
+%undef      height
+%undef      linesize
+%undef      tmp_width
+    ret
+
+
+;-----------------------------------------------------------------------------------------------------------------------------
+; void FillQpelLocationByFeatureValue_sse2(uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight, uint16_t** pFeatureValuePointerList)
+;-----------------------------------------------------------------------------------------------------------------------------
+WELS_EXTERN FillQpelLocationByFeatureValue_sse2
+    push    esi
+    push    edi
+    push    ebx
+    push    ebp
+
+    %define _ps         16              ; push size
+    %define _ls         4               ; local size
+    %define sum_ref     esp+_ps+_ls+4
+    %define pos_list    esp+_ps+_ls+16
+    %define width       esp+_ps+_ls+8
+    %define height      esp+_ps+_ls+12
+    %define i_height    esp
+    sub     esp,    _ls
+
+    mov     esi,    [sum_ref]
+    mov     edi,    [pos_list]
+    mov     ebp,    [width]
+    mov     ebx,    [height]
+    mov     [i_height], ebx
+
+    %assign push_num 5
+    INIT_X86_32_PIC_NOPRESERVE ecx
+    movq    xmm7,   [pic(mv_x_inc_x4)]     ; x_qpel inc
+    movq    xmm6,   [pic(mv_y_inc_x4)]     ; y_qpel inc
+    movq    xmm5,   [pic(mx_x_offset_x4)]  ; x_qpel vector
+    DEINIT_X86_32_PIC
+    pxor    xmm4,   xmm4
+    pxor    xmm3,   xmm3                ; y_qpel vector
+HASH_HEIGHT_LOOP_SSE2:
+    movdqa  xmm2,   xmm5    ; x_qpel vector
+    mov     ecx,    ebp
+HASH_WIDTH_LOOP_SSE2:
+    movq    xmm0,   [esi]           ; load x8 sum
+    punpcklwd   xmm0,   xmm4
+    movdqa      xmm1,   xmm2
+    punpcklwd   xmm1,   xmm3
+%rep    3
+    movd    edx,    xmm0
+    lea     ebx,    [edi+edx*4]
+    mov     eax,    [ebx]
+    movd    [eax],  xmm1
+    mov     edx,    [eax+4] ; explictly load eax+4 due cache miss from vtune observation
+    lea     eax,    [eax+4]
+    mov     [ebx],  eax
+    psrldq  xmm1,   4
+    psrldq  xmm0,   4
+%endrep
+    movd    edx,    xmm0
+    lea     ebx,    [edi+edx*4]
+    mov     eax,    [ebx]
+    movd    [eax],  xmm1
+    mov     edx,    [eax+4] ; explictly load eax+4 due cache miss from vtune observation
+    lea     eax,    [eax+4]
+    mov     [ebx],  eax
+
+    paddw   xmm2,   xmm7
+    lea     esi,    [esi+8]
+    sub     ecx,    4
+    jnz near HASH_WIDTH_LOOP_SSE2
+    paddw   xmm3,   xmm6
+    dec dword [i_height]
+    jnz near HASH_HEIGHT_LOOP_SSE2
+
+    add     esp,    _ls
+    %undef  _ps
+    %undef  _ls
+    %undef  sum_ref
+    %undef  pos_list
+    %undef  width
+    %undef  height
+    %undef  i_height
+    pop     ebp
+    pop     ebx
+    pop     edi
+    pop     esi
+    ret
+
+;---------------------------------------------------------------------------------------------------------------------------------------------------
+; void InitializeHashforFeature_sse2( uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+;                        uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList )
+;---------------------------------------------------------------------------------------------------------------------------------------------------
+WELS_EXTERN InitializeHashforFeature_sse2
+    push    ebx
+    push    esi
+    push    edi
+    push    ebp
+    %define _ps 16  ; push size
+    mov     edi,    [esp+_ps+16]    ; pPositionOfSum
+    mov     ebp,    [esp+_ps+20]    ; sum_idx_list
+    mov     esi,    [esp+_ps+4]     ; pTimesOfSum
+    mov     ebx,    [esp+_ps+8]     ; pBuf
+    mov     edx,    [esp+_ps+12]    ; list_sz
+    sar     edx,    2
+    mov     ecx,    0
+    pxor    xmm7,   xmm7
+hash_assign_loop_x4_sse2:
+    movdqa  xmm0,   [esi+ecx]
+    pslld   xmm0,   2
+
+    movdqa  xmm1,   xmm0
+    pcmpeqd xmm1,   xmm7
+    movmskps    eax,    xmm1
+    cmp eax, 0x0f
+    je  near hash_assign_with_copy_sse2
+
+%assign x   0
+%rep 4
+    lea     eax,    [edi+ecx+x]
+    mov     [eax],  ebx
+    lea     eax,    [ebp+ecx+x]
+    mov     [eax],  ebx
+    movd    eax,    xmm0
+    add     ebx,    eax
+    psrldq  xmm0,   4
+%assign x   x+4
+%endrep
+    jmp near assign_next_sse2
+
+hash_assign_with_copy_sse2:
+    movd    xmm1,   ebx
+    pshufd  xmm2,   xmm1,   0
+    movdqa  [edi+ecx], xmm2
+    movdqa  [ebp+ecx], xmm2
+
+assign_next_sse2:
+    add     ecx,    16
+    dec     edx
+    jnz     near hash_assign_loop_x4_sse2
+
+    mov     edx,    [esp+_ps+12]    ; list_sz
+    and     edx,    3
+    jz      near hash_assign_no_rem_sse2
+hash_assign_loop_x4_rem_sse2:
+    lea     eax,    [edi+ecx]
+    mov     [eax],  ebx
+    lea     eax,    [ebp+ecx]
+    mov     [eax],  ebx
+    mov     eax,    [esi+ecx]
+    sal     eax,    2
+    add     ebx,    eax
+    add     ecx,    4
+    dec     edx
+    jnz     near hash_assign_loop_x4_rem_sse2
+
+hash_assign_no_rem_sse2:
+    %undef  _ps
+    pop     ebp
+    pop     edi
+    pop     esi
+    pop     ebx
+    ret
+%else
+
+;**********************************************************************************************************************
+;void SumOf8x8BlockOfFrame_sse2(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;*********************************************************************************************************************
+WELS_EXTERN SumOf8x8BlockOfFrame_sse2
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 6
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    push r12
+    push r13
+    push r0
+    push r2
+    push r4
+
+    pxor    xmm0,   xmm0
+    lea     r6, [r3+r3*2]
+
+    mov     r12,    r1              ;r12:tmp_width
+    lea     r13,    [r0+r3*4]       ;rbp:r13
+FIRST_ROW:
+    movq    xmm1,   [r0]
+    movq    xmm2,   [r0+r3]
+    movq    xmm3,   [r0+r3*2]
+    movq    xmm4,   [r0+r6]
+
+    shufps  xmm1,   xmm2,   01000100b
+    shufps  xmm3,   xmm4,   01000100b
+    psadbw  xmm1,   xmm0
+    psadbw  xmm3,   xmm0
+    paddd   xmm1,   xmm3
+
+    movq    xmm2,   [r13]
+    movq    xmm3,   [r13+r3]
+    movq    xmm4,   [r13+r3*2]
+    movq    xmm5,   [r13+r6]
+
+    shufps  xmm2,   xmm3,   01000100b
+    shufps  xmm4,   xmm5,   01000100b
+    psadbw  xmm2,   xmm0
+    psadbw  xmm4,   xmm0
+    paddd   xmm2,   xmm4
+
+    paddd   xmm1,   xmm2
+    pshufd  xmm2,   xmm1,   00001110b
+    paddd   xmm1,   xmm2
+    movd    r2d,    xmm1
+    mov     [r4],   r2w
+    inc     dword [r5+r2*4]
+
+    inc     r0
+    inc     r13
+    add     r4, 2
+
+    dec     r12
+    jg      FIRST_ROW
+
+    pop r4
+    pop r2
+    pop r0
+    mov r13, r2
+    dec r13
+HEIGHT_LOOP:
+    mov     r12,    r1
+WIDTH_LOOP:
+    movq    xmm1,   [r0+r3*8]
+    movq    xmm2,   [r0]
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psubd   xmm1,   xmm2
+    movd    r2d,    xmm1
+    mov     r6w,    [r4]
+    add     r2d,    r6d
+    mov     [r4+r1*2],  r2w
+    inc     dword [r5+r2*4]
+
+    inc     r0
+    add     r4, 2
+
+    dec     r12
+    jg      WIDTH_LOOP
+
+    add     r0, r3
+    sub     r0, r1
+
+
+    dec     r13
+    jg      HEIGHT_LOOP
+
+    pop     r13
+    pop     r12
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+
+%macro COUNT_SUM 4
+%define xmm_reg %1
+%define tmp_dreg %2
+%define tmp_qreg %3
+    movd    tmp_dreg,   xmm_reg
+    inc     dword [r5+tmp_qreg*4]
+%if %4 == 1
+    psrldq  xmm_reg,    4
+%endif
+%endmacro
+
+
+;-----------------------------------------------------------------------------
+; requires:  width % 8 == 0 && height > 1
+;-----------------------------------------------------------------------------
+;void SumOf8x8BlockOfFrame_sse4(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;-----------------------------------------------------------------------------
+; read extra (16 - (width % 8) ) mod 16 bytes of every line
+; write extra (16 - (width % 8)*2 ) mod 16 bytes in the end of sum_ref
+WELS_EXTERN SumOf8x8BlockOfFrame_sse4
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    push r12
+    push r13
+    push r0
+    push r2
+    push r4
+
+    pxor    xmm0,   xmm0
+    lea     r6, [r3+r3*2]
+
+    mov     r12,    r1              ;r12:tmp_width
+    lea     r13,    [r0+r3*4]       ;rbp:r13
+FIRST_ROW_SSE4:
+    movdqu  xmm1,   [r0]
+    movdqu  xmm3,   [r0+r3]
+    movdqu  xmm5,   [r0+r3*2]
+    movdqu  xmm7,   [r0+r6]
+
+    movdqa  xmm2,   xmm1
+    mpsadbw xmm1,   xmm0,   000b
+    mpsadbw xmm2,   xmm0,   100b
+    paddw   xmm1,   xmm2            ; 8 sums of line1
+
+    movdqa  xmm4,   xmm3
+    mpsadbw xmm3,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm3,   xmm4            ; 8 sums of line2
+
+    movdqa  xmm2,   xmm5
+    mpsadbw xmm5,   xmm0,   000b
+    mpsadbw xmm2,   xmm0,   100b
+    paddw   xmm5,   xmm2            ; 8 sums of line3
+
+    movdqa  xmm4,   xmm7
+    mpsadbw xmm7,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm7,   xmm4            ; 8 sums of line4
+
+    paddw   xmm1,   xmm3
+    paddw   xmm5,   xmm7
+    paddw   xmm1,   xmm5            ; sum the upper 4 lines first
+
+    movdqu  xmm2,   [r13]
+    movdqu  xmm3,   [r13+r3]
+    movdqu  xmm4,   [r13+r3*2]
+    movdqu  xmm5,   [r13+r6]
+
+    movdqa  xmm6,   xmm2
+    mpsadbw xmm2,   xmm0,   000b
+    mpsadbw xmm6,   xmm0,   100b
+    paddw   xmm2,   xmm6
+
+    movdqa  xmm7,   xmm3
+    mpsadbw xmm3,   xmm0,   000b
+    mpsadbw xmm7,   xmm0,   100b
+    paddw   xmm3,   xmm7
+
+    movdqa  xmm6,   xmm4
+    mpsadbw xmm4,   xmm0,   000b
+    mpsadbw xmm6,   xmm0,   100b
+    paddw   xmm4,   xmm6
+
+    movdqa  xmm7,   xmm5
+    mpsadbw xmm5,   xmm0,   000b
+    mpsadbw xmm7,   xmm0,   100b
+    paddw   xmm5,   xmm7
+
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm1,   xmm2
+    paddw   xmm1,   xmm4            ; sum of lines 1- 8
+
+    movdqu  [r4],   xmm1
+
+    movdqa  xmm2,   xmm1
+    punpcklwd   xmm1,   xmm0
+    punpckhwd   xmm2,   xmm0
+
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 0
+    COUNT_SUM   xmm2,   r2d, r2 ,1
+    COUNT_SUM   xmm2,   r2d, r2 ,1
+    COUNT_SUM   xmm2,   r2d, r2 ,1
+    COUNT_SUM   xmm2,   r2d, r2 ,0
+
+    lea     r0,     [r0+8]
+    lea     r13,    [r13+8]
+    lea     r4,     [r4+16]     ; element size is 2
+
+    sub     r12, 8
+    jg      near FIRST_ROW_SSE4
+
+    pop r4
+    pop r2
+    pop r0
+    mov r13, r2
+    dec r13
+HEIGHT_LOOP_SSE4:
+    mov     r12,    r1
+WIDTH_LOOP_SSE4:
+    movdqu  xmm1,   [r0+r3*8]
+    movdqu  xmm2,   [r0]
+    movdqu  xmm7,   [r4]
+
+    movdqa  xmm3,   xmm1
+    mpsadbw xmm1,   xmm0,   000b
+    mpsadbw xmm3,   xmm0,   100b
+    paddw   xmm1,   xmm3
+
+    movdqa  xmm4,   xmm2
+    mpsadbw xmm2,   xmm0,   000b
+    mpsadbw xmm4,   xmm0,   100b
+    paddw   xmm2,   xmm4
+
+    paddw   xmm7,   xmm1
+    psubw   xmm7,   xmm2
+    movdqu  [r4+r1*2], xmm7
+
+    movdqa  xmm6,   xmm7
+    punpcklwd   xmm7,   xmm0
+    punpckhwd   xmm6,   xmm0
+
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 0
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 0
+
+    lea     r0, [r0+8]
+    lea     r4, [r4+16]
+
+    sub     r12,    8
+    jg      near WIDTH_LOOP_SSE4
+
+    lea     r0, [r0+r3]
+    sub     r0, r1
+
+    dec     r13
+    jg      near HEIGHT_LOOP_SSE4
+
+    pop     r13
+    pop     r12
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+
+;****************************************************************************************************************************************************
+;void SumOf16x16BlockOfFrame_sse2(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;****************************************************************************************************************************************************
+WELS_EXTERN SumOf16x16BlockOfFrame_sse2
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 6
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    push r12
+    push r13
+    push r0
+    push r2
+    push r4
+
+    pxor    xmm0,   xmm0
+    lea     r6, [r3+r3*2]
+
+    mov     r12,    r1              ;r12:tmp_width
+FIRST_ROW_X16H:
+    movdqu  xmm1,   [r0]
+    movdqu  xmm2,   [r0+r3]
+    movdqu  xmm3,   [r0+r3*2]
+    movdqu  xmm4,   [r0+r6]
+
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    paddw   xmm1,   xmm2
+    paddw   xmm3,   xmm4
+    paddw   xmm1,   xmm3
+
+    lea     r13,    [r0+r3*4]       ;ebp:r13
+    movdqu  xmm2,   [r13]
+    movdqu  xmm3,   [r13+r3]
+    movdqu  xmm4,   [r13+r3*2]
+    movdqu  xmm5,   [r13+r6]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+
+    lea     r13,    [r13+r3*4]
+    movdqu  xmm2,   [r13]
+    movdqu  xmm3,   [r13+r3]
+    movdqu  xmm4,   [r13+r3*2]
+    movdqu  xmm5,   [r13+r6]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+
+    lea     r13,    [r13+r3*4]
+    movdqu  xmm2,   [r13]
+    movdqu  xmm3,   [r13+r3]
+    movdqu  xmm4,   [r13+r3*2]
+    movdqu  xmm5,   [r13+r6]
+
+    psadbw  xmm2,   xmm0
+    psadbw  xmm3,   xmm0
+    psadbw  xmm4,   xmm0
+    psadbw  xmm5,   xmm0
+    paddw   xmm2,   xmm3
+    paddw   xmm4,   xmm5
+    paddw   xmm2,   xmm4
+
+    paddw   xmm1,   xmm2
+    movdqa  xmm2,   xmm1
+    punpckhwd xmm2, xmm0
+    paddw xmm1, xmm2
+    movd    r2d,    xmm1
+    mov     [r4],   r2w
+    inc     dword [r5+r2*4]
+
+    inc     r0
+    lea     r4, [r4+2]
+
+    dec     r12
+    jg      near FIRST_ROW_X16H
+
+    pop r4
+    pop r2
+    pop r0
+    mov r13, r2
+    dec r13
+    mov     r6, r3
+    sal     r6, 4       ; succeeded 16th line
+HEIGHT_LOOP_X16:
+    mov     r12,    r1
+WIDTH_LOOP_X16:
+    movdqu  xmm1,   [r0+r6]
+    movdqu  xmm2,   [r0]
+    psadbw  xmm1,   xmm0
+    psadbw  xmm2,   xmm0
+    psubw   xmm1,   xmm2
+    movdqa  xmm2,   xmm1
+    punpckhwd xmm2, xmm0
+    paddw   xmm1,   xmm2
+    movd    r2d,    xmm1
+    add     r2w,    word [r4]
+    mov     [r4+r1*2],  r2w
+    inc     dword [r5+r2*4]
+
+    inc     r0
+    add     r4, 2
+
+    dec     r12
+    jg      near WIDTH_LOOP_X16
+
+    add     r0, r3
+    sub     r0, r1
+
+    dec     r13
+    jg      near HEIGHT_LOOP_X16
+
+    pop     r13
+    pop     r12
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+; requires:  width % 16 == 0 && height > 1
+;-----------------------------------------------------------------------------------------------------------------------------
+;void SumOf16x16BlockOfFrame_sse4(uint8_t* pRefPicture, const int32_t kiWidth, const int32_t kiHeight, const int32_t kiRefStride,
+;                             uint16_t* pFeatureOfBlock, uint32_t pTimesOfFeatureValue[]);
+;-----------------------------------------------------------------------------------------------------------------------------
+; try 8 mv via offset
+%macro SUM_LINE_X16_SSE41  5    ; ref, dst0, dst1, tmp0, tmp1
+    movdqu  %2, [%1]
+    movdqu  %3, [%1+8h]
+    movdqa  %4, %2
+    movdqa  %5, %3
+
+    mpsadbw %2, xmm0,   0   ; 000 B
+    mpsadbw %4, xmm0,   5   ; 101 B
+    mpsadbw %3, xmm0,   2   ; 010 B
+    mpsadbw %5, xmm0,   7   ; 111 B
+    paddw   %2, %4
+    paddw   %3, %5
+    paddw   %2, %3  ; accumulate cost
+%endmacro   ; end of SAD_16x16_LINE_SSE41
+
+WELS_EXTERN SumOf16x16BlockOfFrame_sse4
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    push r12
+    push r13
+    push r0
+    push r2
+    push r4
+
+    pxor    xmm0,   xmm0
+    lea     r6, [r3+r3*2]
+
+    mov     r12,    r1              ;r12:tmp_width
+FIRST_ROW_X16_SSE4:
+    SUM_LINE_X16_SSE41  r0,     xmm1, xmm2, xmm3, xmm4
+    SUM_LINE_X16_SSE41  r0+r3,  xmm2, xmm3, xmm4, xmm5
+    SUM_LINE_X16_SSE41  r0+r3*2,xmm3, xmm4, xmm5, xmm6
+    SUM_LINE_X16_SSE41  r0+r6,  xmm4, xmm5, xmm6, xmm7
+    paddw   xmm1, xmm2
+    paddw   xmm3, xmm4
+    paddw   xmm1, xmm3
+
+    lea     r13,    [r0+r3*4]
+    SUM_LINE_X16_SSE41  r13,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3*2,   xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r6,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    lea     r13,    [r13+r3*4]
+    SUM_LINE_X16_SSE41  r13,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3*2,   xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r6,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    lea     r13,    [r13+r3*4]
+    SUM_LINE_X16_SSE41  r13,        xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r3*2,   xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+    SUM_LINE_X16_SSE41  r13+r6,     xmm2, xmm3, xmm4, xmm5
+    paddw   xmm1, xmm2
+
+    movdqa  [r4],   xmm1
+    movdqa  xmm2,   xmm1
+    punpcklwd   xmm1,   xmm0
+    punpckhwd   xmm2,   xmm0
+
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 1
+    COUNT_SUM   xmm1,   r2d, r2, 0
+    COUNT_SUM   xmm2,   r2d, r2, 1
+    COUNT_SUM   xmm2,   r2d, r2, 1
+    COUNT_SUM   xmm2,   r2d, r2, 1
+    COUNT_SUM   xmm2,   r2d, r2, 0
+
+    lea     r0, [r0+8]
+    lea     r4, [r4+16] ; element size is 2
+
+    sub     r12, 8
+    jg      near FIRST_ROW_X16_SSE4
+
+    pop r4
+    pop r2
+    pop r0
+    mov r13, r2
+    dec r13
+    mov     r6, r3
+    sal     r6, 4       ; succeeded 16th line
+
+HEIGHT_LOOP_X16_SSE4:
+    mov     r12,    r1
+WIDTH_LOOP_X16_SSE4:
+    movdqa  xmm7,   [r4]
+    SUM_LINE_X16_SSE41  r0+r6, xmm1, xmm2, xmm3, xmm4
+    SUM_LINE_X16_SSE41  r0, xmm2, xmm3, xmm4, xmm5
+
+    paddw   xmm7,   xmm1
+    psubw   xmm7,   xmm2
+    movdqa  [r4+r1*2], xmm7
+
+    movdqa  xmm6,   xmm7
+    punpcklwd   xmm7,   xmm0
+    punpckhwd   xmm6,   xmm0
+
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 1
+    COUNT_SUM   xmm7,   r2d, r2, 0
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 1
+    COUNT_SUM   xmm6,   r2d, r2, 0
+
+    lea     r0, [r0+8]
+    lea     r4, [r4+16]
+
+    sub     r12, 8
+    jg      near WIDTH_LOOP_X16_SSE4
+
+    add     r0, r3
+    sub     r0, r1
+
+    dec     r13
+    jg      near HEIGHT_LOOP_X16_SSE4
+
+    pop     r13
+    pop     r12
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+;-----------------------------------------------------------------------------------------------------------------------------
+; void FillQpelLocationByFeatureValue_sse2(uint16_t* pFeatureOfBlock, const int32_t kiWidth, const int32_t kiHeight, uint16_t** pFeatureValuePointerList)
+;-----------------------------------------------------------------------------------------------------------------------------
+WELS_EXTERN FillQpelLocationByFeatureValue_sse2
+    %assign  push_num 0
+    LOAD_4_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    push r12
+    push r13
+    mov     r12,    r2
+
+    movq    xmm7,   [mv_x_inc_x4]       ; x_qpel inc
+    movq    xmm6,   [mv_y_inc_x4]       ; y_qpel inc
+    movq    xmm5,   [mx_x_offset_x4]    ; x_qpel vector
+    pxor    xmm4,   xmm4
+    pxor    xmm3,   xmm3                ; y_qpel vector
+HASH_HEIGHT_LOOP_SSE2:
+    movdqa  xmm2,   xmm5    ; x_qpel vector
+    mov     r4, r1
+HASH_WIDTH_LOOP_SSE2:
+    movq    xmm0,   [r0]            ; load x8 sum
+    punpcklwd   xmm0,   xmm4
+    movdqa      xmm1,   xmm2
+    punpcklwd   xmm1,   xmm3
+%rep    3
+    movd    r2d,    xmm0        ;edx:r3
+    lea     r5,     [r3+r2*8]   ;ebx:r5
+    mov     r6,     [r5]        ;eax:r6
+    movd    [r6],   xmm1
+    mov     r13,    [r6+4]  ; explictly load eax+4 due cache miss from vtune observation
+    lea     r6,     [r6+4]
+    mov     [r5],   r6
+    psrldq  xmm1,   4
+    psrldq  xmm0,   4
+%endrep
+    movd    r2d,    xmm0
+    lea     r5,     [r3+r2*8]   ;ebx:r5
+    mov     r6,     [r5]        ;eax:r6
+    movd    [r6],   xmm1
+    mov     r13,    [r6+4]  ; explictly load eax+4 due cache miss from vtune observation
+    lea     r6,     [r6+4]
+    mov     [r5],   r6
+
+    paddw   xmm2,   xmm7
+    lea     r0,     [r0+8]
+    sub     r4,     4
+    jnz near HASH_WIDTH_LOOP_SSE2
+    paddw   xmm3,   xmm6
+    dec r12
+    jnz near HASH_HEIGHT_LOOP_SSE2
+
+    pop     r13
+    pop     r12
+    POP_XMM
+    ret
+
+;---------------------------------------------------------------------------------------------------------------------------------------------------
+; void InitializeHashforFeature_sse2( uint32_t* pTimesOfFeatureValue, uint16_t* pBuf, const int32_t kiListSize,
+;                                 uint16_t** pLocationOfFeature, uint16_t** pFeatureValuePointerList);
+;uint16_t** pPositionOfSum, uint16_t** sum_idx_list, uint32_t* pTimesOfSum, uint16_t* pBuf, const int32_t list_sz )
+;---------------------------------------------------------------------------------------------------------------------------------------------------
+WELS_EXTERN InitializeHashforFeature_sse2
+    %assign  push_num 0
+    LOAD_5_PARA
+    SIGN_EXTENSION  r2, r2d
+    push r12
+    push r13
+    mov     r12,    r2
+    sar     r2,     2
+    mov     r5,     0       ;r5:ecx
+    xor     r6,     r6
+    pxor    xmm3,   xmm3
+hash_assign_loop_x4_sse2:
+    movdqa  xmm0,   [r0+r5]
+    pslld   xmm0,   2
+
+    movdqa  xmm1,   xmm0
+    pcmpeqd xmm1,   xmm3
+    movmskps    r6, xmm1
+    cmp     r6,     0x0f
+    jz  near hash_assign_with_copy_sse2
+
+%assign x   0
+%rep 4
+    lea     r13,    [r3+r5*2+x]
+    mov     [r13],  r1
+    lea     r13,    [r4+r5*2+x]
+    mov     [r13],  r1
+    movd    r6d,    xmm0
+    add     r1,     r6
+    psrldq  xmm0,   4
+%assign x   x+8
+%endrep
+    jmp near assign_next_sse2
+
+hash_assign_with_copy_sse2:
+    movq    xmm1,   r1
+    pshufd  xmm2,   xmm1,   01000100b
+    movdqa  [r3+r5*2], xmm2
+    movdqa  [r4+r5*2], xmm2
+    movdqa  [r3+r5*2+16], xmm2
+    movdqa  [r4+r5*2+16], xmm2
+
+assign_next_sse2:
+    add     r5, 16
+    dec     r2
+    jnz     near hash_assign_loop_x4_sse2
+
+    and     r12,    3
+    jz      near hash_assign_no_rem_sse2
+hash_assign_loop_x4_rem_sse2:
+    lea     r13,    [r3+r5*2]
+    mov     [r13],  r1
+    lea     r13,    [r4+r5*2]
+    mov     [r13],  r1
+    mov     r6d,    [r0+r5]
+    sal     r6,     2
+    add     r1,     r6
+    add     r5,     4
+    dec     r12
+    jnz     near hash_assign_loop_x4_rem_sse2
+
+hash_assign_no_rem_sse2:
+    pop     r13
+    pop     r12
+    ret
+
+%endif
+
+;**********************************************************************************************************************************
+;   int32_t SumOf8x8SingleBlock_sse2(uint8_t* ref0, int32_t linesize)
+;**********************************************************************************************************************************
+WELS_EXTERN SumOf8x8SingleBlock_sse2
+    %assign  push_num 0
+    LOAD_2_PARA
+    SIGN_EXTENSION  r1, r1d
+
+    pxor xmm0, xmm0
+    movq xmm1, [r0]
+    movhps xmm1, [r0+r1]
+    lea r0, [r0+2*r1]
+    movq xmm2, [r0]
+    movhps xmm2, [r0+r1]
+    lea r0, [r0+2*r1]
+    movq xmm3, [r0]
+    movhps xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movq xmm4, [r0]
+    movhps xmm4, [r0+r1]
+
+    psadbw xmm1, xmm0
+    psadbw xmm2, xmm0
+    psadbw xmm3, xmm0
+    psadbw xmm4, xmm0
+    paddw xmm1, xmm2
+    paddw xmm3, xmm4
+    paddw xmm1, xmm3
+
+    movdqa xmm2, xmm1
+    punpckhwd xmm2, xmm0
+    paddw xmm1, xmm2
+
+    movd retrd, xmm1
+    ret
+
+;**********************************************************************************************************************************
+;   int32_t SumOf16x16SingleBlock_sse2(uint8_t* ref0, int32_t linesize)
+;**********************************************************************************************************************************
+WELS_EXTERN SumOf16x16SingleBlock_sse2
+    %assign  push_num 0
+    LOAD_2_PARA
+    PUSH_XMM 6
+    SIGN_EXTENSION  r1, r1d
+
+    pxor xmm0, xmm0
+    movdqa xmm1, [r0]
+    movdqa xmm2, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm3, [r0]
+    movdqa xmm4, [r0+r1]
+    psadbw xmm1, xmm0
+    psadbw xmm2, xmm0
+    psadbw xmm3, xmm0
+    psadbw xmm4, xmm0
+    paddw xmm1, xmm2
+    paddw xmm3, xmm4
+    paddw xmm1, xmm3
+
+    lea r0, [r0+2*r1]
+    movdqa xmm2, [r0]
+    movdqa xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm4, [r0]
+    movdqa xmm5, [r0+r1]
+    psadbw xmm2, xmm0
+    psadbw xmm3, xmm0
+    psadbw xmm4, xmm0
+    psadbw xmm5, xmm0
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    paddw xmm2, xmm4
+
+    paddw xmm1, xmm2
+
+    lea r0, [r0+2*r1]
+    movdqa xmm2, [r0]
+    movdqa xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm4, [r0]
+    movdqa xmm5, [r0+r1]
+    psadbw xmm2, xmm0
+    psadbw xmm3, xmm0
+    psadbw xmm4, xmm0
+    psadbw xmm5, xmm0
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    paddw xmm2, xmm4
+
+    paddw xmm1, xmm2
+
+    lea r0, [r0+2*r1]
+    movdqa xmm2, [r0]
+    movdqa xmm3, [r0+r1]
+    lea r0, [r0+2*r1]
+    movdqa xmm4, [r0]
+    movdqa xmm5, [r0+r1]
+    psadbw xmm2, xmm0
+    psadbw xmm3, xmm0
+    psadbw xmm4, xmm0
+    psadbw xmm5, xmm0
+    paddw xmm2, xmm3
+    paddw xmm4, xmm5
+    paddw xmm2, xmm4
+
+    paddw xmm1, xmm2
+
+    movdqa xmm2, xmm1
+    punpckhwd xmm2, xmm0
+    paddw xmm1, xmm2
+
+    movd retrd, xmm1
+    POP_XMM
+    ret
+
+;**********************************************************************************************************************************
+;
+;   uint32_t SampleSad16x16Hor8_sse41( uint8_t *src, int32_t stride_src, uint8_t *ref, int32_t stride_ref, uint16 base_cost[8], int32_t *index_min_cost )
+;
+;   \note:
+;       src need align with 16 bytes, ref is optional
+;   \return value:
+;       return minimal SAD cost, according index carried by index_min_cost
+;**********************************************************************************************************************************
+; try 8 mv via offset
+; xmm7 store sad costs
+%macro SAD_16x16_LINE_SSE41  4  ; src, ref, stride_src, stride_ref
+    movdqa      xmm0, [%1]
+    movdqu      xmm1, [%2]
+    movdqu      xmm2, [%2+8h]
+    movdqa      xmm3, xmm1
+    movdqa      xmm4, xmm2
+
+    mpsadbw     xmm1, xmm0, 0   ; 000 B
+    paddw       xmm7, xmm1      ; accumulate cost
+
+    mpsadbw     xmm3, xmm0, 5   ; 101 B
+    paddw       xmm7, xmm3      ; accumulate cost
+
+    mpsadbw     xmm2, xmm0, 2   ; 010 B
+    paddw       xmm7, xmm2      ; accumulate cost
+
+    mpsadbw     xmm4, xmm0, 7   ; 111 B
+    paddw       xmm7, xmm4      ; accumulate cost
+
+    add         %1, %3
+    add         %2, %4
+%endmacro   ; end of SAD_16x16_LINE_SSE41
+%macro SAD_16x16_LINE_SSE41E  4 ; src, ref, stride_src, stride_ref
+    movdqa      xmm0, [%1]
+    movdqu      xmm1, [%2]
+    movdqu      xmm2, [%2+8h]
+    movdqa      xmm3, xmm1
+    movdqa      xmm4, xmm2
+
+    mpsadbw     xmm1, xmm0, 0   ; 000 B
+    paddw       xmm7, xmm1      ; accumulate cost
+
+    mpsadbw     xmm3, xmm0, 5   ; 101 B
+    paddw       xmm7, xmm3      ; accumulate cost
+
+    mpsadbw     xmm2, xmm0, 2   ; 010 B
+    paddw       xmm7, xmm2      ; accumulate cost
+
+    mpsadbw     xmm4, xmm0, 7   ; 111 B
+    paddw       xmm7, xmm4      ; accumulate cost
+%endmacro   ; end of SAD_16x16_LINE_SSE41E
+
+WELS_EXTERN SampleSad16x16Hor8_sse41
+    ;push ebx
+    ;push esi
+    ;mov eax, [esp+12]  ;   src
+    ;mov ecx, [esp+16]  ;   stride_src
+    ;mov ebx, [esp+20]  ;   ref
+    ;mov edx, [esp+24]  ;   stride_ref
+    ;mov esi, [esp+28]  ;   base_cost
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    pxor    xmm7,   xmm7
+
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41    r0, r2, r1, r3
+    SAD_16x16_LINE_SSE41E   r0, r2, r1, r3
+
+    pxor    xmm0,   xmm0
+    movdqa  xmm6,   xmm7
+    punpcklwd   xmm6,   xmm0
+    punpckhwd   xmm7,   xmm0
+
+    movdqa  xmm5,   [r4]
+    movdqa  xmm4,   xmm5
+    punpcklwd   xmm4,   xmm0
+    punpckhwd   xmm5,   xmm0
+
+    paddd   xmm4,   xmm6
+    paddd   xmm5,   xmm7
+    movdqa  xmm3,   xmm4
+    pminud  xmm3,   xmm5
+    pshufd  xmm2,   xmm3,   01001110B
+    pminud  xmm2,   xmm3
+    pshufd  xmm3,   xmm2,   10110001B
+    pminud  xmm2,   xmm3
+    movd    retrd,  xmm2
+    pcmpeqd xmm4,   xmm2
+    movmskps    r2d, xmm4
+    bsf     r1d,    r2d
+    jnz near WRITE_INDEX
+
+    pcmpeqd xmm5,   xmm2
+    movmskps    r2d, xmm5
+    bsf     r1d,    r2d
+    add     r1d,    4
+
+WRITE_INDEX:
+    mov     [r5],   r1d
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
+
+;**********************************************************************************************************************************
+;
+;   uint32_t SampleSad8x8Hor8_sse41( uint8_t *src, int32_t stride_src, uint8_t *ref, int32_t stride_ref, uint16_t base_cost[8], int32_t *index_min_cost )
+;
+;   \note:
+;       src and ref is optional to align with 16 due inter 8x8
+;   \return value:
+;       return minimal SAD cost, according index carried by index_min_cost
+;
+;**********************************************************************************************************************************
+; try 8 mv via offset
+; xmm7 store sad costs
+%macro SAD_8x8_LINE_SSE41  4    ; src, ref, stride_src, stride_ref
+    movdqu      xmm0, [%1]
+    movdqu      xmm1, [%2]
+    movdqa      xmm2, xmm1
+
+    mpsadbw     xmm1, xmm0, 0   ; 000 B
+    paddw       xmm7, xmm1      ; accumulate cost
+
+    mpsadbw     xmm2, xmm0, 5   ; 101 B
+    paddw       xmm7, xmm2      ; accumulate cost
+
+    add         %1, %3
+    add         %2, %4
+%endmacro   ; end of SAD_8x8_LINE_SSE41
+%macro SAD_8x8_LINE_SSE41E  4   ; src, ref, stride_src, stride_ref
+    movdqu      xmm0, [%1]
+    movdqu      xmm1, [%2]
+    movdqa      xmm2, xmm1
+
+    mpsadbw     xmm1, xmm0, 0   ; 000 B
+    paddw       xmm7, xmm1      ; accumulate cost
+
+    mpsadbw     xmm2, xmm0, 5   ; 101 B
+    paddw       xmm7, xmm2      ; accumulate cost
+%endmacro   ; end of SAD_8x8_LINE_SSE41E
+
+WELS_EXTERN SampleSad8x8Hor8_sse41
+    %assign  push_num 0
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r3, r3d
+    movdqa xmm7, [r4]   ;   load base cost list
+
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41  r0, r2, r1, r3
+    SAD_8x8_LINE_SSE41E r0, r2, r1, r3
+
+    phminposuw  xmm0, xmm7  ; horizon search the minimal sad cost and its index
+    movd    retrd, xmm0 ; for return: DEST[15:0] <- MIN, DEST[31:16] <- INDEX
+    mov     r1d, retrd
+    and     retrd, 0xFFFF
+    sar     r1d, 16
+    mov     [r5], r1d
+
+    POP_XMM
+    LOAD_6_PARA_POP
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/score.asm b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/score.asm
new file mode 100644
index 0000000000..7c98a78258
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/core/x86/score.asm
@@ -0,0 +1,363 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  score.asm
+;*
+;*  Abstract
+;*      scan/score/count of sse2
+;*
+;*  History
+;*      8/21/2009 Created
+;*
+;*
+;*************************************************************************/
+
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Macros
+;***********************************************************************
+
+;***********************************************************************
+; Local Data (Read Only)
+;***********************************************************************
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+;align 16
+;se2_2 dw 2, 2, 2, 2, 2, 2, 2, 2
+align 16
+sse2_1: dw 1, 1, 1, 1, 1, 1, 1, 1
+align 16
+sse2_b1: db 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+i_ds_table: db 3, 2, 2, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+align 16
+sse2_plane_inc_minus: dw -7, -6, -5, -4, -3, -2, -1, 0
+align 16
+sse2_plane_inc: dw 1, 2, 3, 4, 5, 6, 7, 8
+align 16
+sse2_plane_dec: dw 8, 7, 6, 5, 4, 3, 2, 1
+align 16
+pb_scanacdc_maska:db 0,1,2,3,8,9,14,15,10,11,4,5,6,7,12,13
+align 16
+pb_scanacdc_maskb:db 2,3,8,9,10,11,4,5,0,1,6,7,12,13,14,15
+align 16
+pb_scandc_maska:db 2,3,8,9,14,15,10,11,4,5,6,7,12,13,0,1
+align 16
+pb_scandc_maskb:db 8,9,10,11,4,5,0,1,6,7,12,13,14,15,128,128
+
+align 16
+nozero_count_table:
+db  0,1,1,2,1,2,2,3,1,2
+db  2,3,2,3,3,4,1,2,2,3
+db  2,3,3,4,2,3,3,4,3,4
+db  4,5,1,2,2,3,2,3,3,4
+db  2,3,3,4,3,4,4,5,2,3
+db  3,4,3,4,4,5,3,4,4,5
+db  4,5,5,6,1,2,2,3,2,3
+db  3,4,2,3,3,4,3,4,4,5
+db  2,3,3,4,3,4,4,5,3,4
+db  4,5,4,5,5,6,2,3,3,4
+db  3,4,4,5,3,4,4,5,4,5
+db  5,6,3,4,4,5,4,5,5,6
+db  4,5,5,6,5,6,6,7,1,2
+db  2,3,2,3,3,4,2,3,3,4
+db  3,4,4,5,2,3,3,4,3,4
+db  4,5,3,4,4,5,4,5,5,6
+db  2,3,3,4,3,4,4,5,3,4
+db  4,5,4,5,5,6,3,4,4,5
+db  4,5,5,6,4,5,5,6,5,6
+db  6,7,2,3,3,4,3,4,4,5
+db  3,4,4,5,4,5,5,6,3,4
+db  4,5,4,5,5,6,4,5,5,6
+db  5,6,6,7,3,4,4,5,4,5
+db  5,6,4,5,5,6,5,6,6,7
+db  4,5,5,6,5,6,6,7,5,6
+db  6,7,6,7,7,8
+
+align 16
+high_mask_table:
+    db  0, 0, 0, 3, 0, 2, 3, 6, 0, 2
+    db  2, 5, 3, 5, 6, 9, 0, 1, 2, 5
+    db  2, 4, 5, 8, 3, 5, 5, 8, 6, 8
+    db  9,12, 0, 1, 1, 4, 2, 4, 5, 8
+    db  2, 4, 4, 7, 5, 7, 8,11, 3, 4
+    db  5, 8, 5, 7, 8,11, 6, 8, 8,11
+    db  9,11,12,15, 0, 1, 1, 4, 1, 3
+    db  4, 7, 2, 4, 4, 7, 5, 7, 8,11
+    db  2, 3, 4, 7, 4, 6, 7,10, 5, 7
+    db  7,10, 8,10,11,14, 3, 4, 4, 7
+    db  5, 7, 8,11, 5, 7, 7,10, 8,10
+    db 11,14, 6, 7, 8,11, 8,10,11,14
+    db  9,11,11,14,12,14,15,18, 0, 0
+    db  1, 4, 1, 3, 4, 7, 1, 3, 3, 6
+    db  4, 6, 7,10, 2, 3, 4, 7, 4, 6
+    db  7,10, 5, 7, 7,10, 8,10,11,14
+    db  2, 3, 3, 6, 4, 6, 7,10, 4, 6
+    db  6, 9, 7, 9,10,13, 5, 6, 7,10
+    db  7, 9,10,13, 8,10,10,13,11,13
+    db 14,17, 3, 4, 4, 7, 4, 6, 7,10
+    db  5, 7, 7,10, 8,10,11,14, 5, 6
+    db  7,10, 7, 9,10,13, 8,10,10,13
+    db 11,13,14,17, 6, 7, 7,10, 8,10
+    db 11,14, 8,10,10,13,11,13,14,17
+    db  9,10,11,14,11,13,14,17,12,14
+    db 14,17,15,17,18,21
+
+align 16
+low_mask_table:
+    db  0, 3, 2, 6, 2, 5, 5, 9, 1, 5
+    db  4, 8, 5, 8, 8,12, 1, 4, 4, 8
+    db  4, 7, 7,11, 4, 8, 7,11, 8,11
+    db 11,15, 1, 4, 3, 7, 4, 7, 7,11
+    db  3, 7, 6,10, 7,10,10,14, 4, 7
+    db  7,11, 7,10,10,14, 7,11,10,14
+    db 11,14,14,18, 0, 4, 3, 7, 3, 6
+    db  6,10, 3, 7, 6,10, 7,10,10,14
+    db  3, 6, 6,10, 6, 9, 9,13, 6,10
+    db  9,13,10,13,13,17, 4, 7, 6,10
+    db  7,10,10,14, 6,10, 9,13,10,13
+    db 13,17, 7,10,10,14,10,13,13,17
+    db 10,14,13,17,14,17,17,21, 0, 3
+    db  3, 7, 3, 6, 6,10, 2, 6, 5, 9
+    db  6, 9, 9,13, 3, 6, 6,10, 6, 9
+    db  9,13, 6,10, 9,13,10,13,13,17
+    db  3, 6, 5, 9, 6, 9, 9,13, 5, 9
+    db  8,12, 9,12,12,16, 6, 9, 9,13
+    db  9,12,12,16, 9,13,12,16,13,16
+    db 16,20, 3, 7, 6,10, 6, 9, 9,13
+    db  6,10, 9,13,10,13,13,17, 6, 9
+    db  9,13, 9,12,12,16, 9,13,12,16
+    db 13,16,16,20, 7,10, 9,13,10,13
+    db 13,17, 9,13,12,16,13,16,16,20
+    db 10,13,13,17,13,16,16,20,13,17
+    db 16,20,17,20,20,24
+
+
+SECTION .text
+
+;***********************************************************************
+;void WelsScan4x4DcAc_sse2( int16_t level[16], int16_t *pDct )
+;***********************************************************************
+WELS_EXTERN WelsScan4x4DcAc_sse2
+    %ifdef X86_32
+    push r3
+    %assign push_num 1
+    %else
+    %assign push_num 0
+    %endif
+    LOAD_2_PARA
+    movdqa     xmm0, [r1]           ; 7 6 5 4 3 2 1 0
+    movdqa     xmm1, [r1+16]        ; f e d c b a 9 8
+    pextrw     r2d, xmm0, 7         ; ecx = 7
+    pextrw     r3d, xmm1, 2         ; edx = a
+    pextrw     r1d, xmm0, 5         ; eax = 5
+    pinsrw     xmm1, r2d, 2         ; f e d c b 7 9 8
+    pinsrw     xmm0, r1d, 7         ; 5 6 5 4 3 2 1 0
+    pextrw     r2d, xmm1, 0         ; ecx = 8
+    pinsrw     xmm0, r2d, 5         ; 5 6 8 4 3 2 1 0
+    pinsrw     xmm1, r3d, 0         ; f e d c b 7 9 a
+    pshufd     xmm2, xmm0, 0xd8     ; 5 6 3 2 8 4 1 0
+    pshufd     xmm3, xmm1, 0xd8     ; f e b 7 d c 9 a
+    pshufhw    xmm0, xmm2, 0x93     ; 6 3 2 5 8 4 1 0
+    pshuflw    xmm1, xmm3, 0x39     ; f e b 7 a d c 9
+    movdqa     [r0],xmm0
+    movdqa     [r0+16], xmm1
+    %ifdef X86_32
+    pop r3
+    %endif
+    ret
+
+;***********************************************************************
+;void WelsScan4x4DcAc_ssse3( int16_t level[16], int16_t *pDct )
+;***********************************************************************
+WELS_EXTERN WelsScan4x4DcAc_ssse3
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_2_PARA
+    movdqa     xmm0, [r1]
+    movdqa     xmm1, [r1+16]
+    pextrw      r2d,  xmm0, 7           ; ecx = [7]
+    pextrw      r1d,  xmm1, 0           ; eax = [8]
+    pinsrw      xmm0, r1d, 7            ; xmm0[7]   =   [8]
+    pinsrw      xmm1, r2d, 0            ; xmm1[0]   =   [7]
+    pshufb      xmm1, [pic(pb_scanacdc_maskb)]
+    pshufb      xmm0, [pic(pb_scanacdc_maska)]
+
+    movdqa     [r0],xmm0
+    movdqa     [r0+16], xmm1
+    DEINIT_X86_32_PIC
+    ret
+;***********************************************************************
+;void WelsScan4x4Ac_sse2( int16_t* zig_value, int16_t* pDct )
+;***********************************************************************
+WELS_EXTERN WelsScan4x4Ac_sse2
+    %assign push_num 0
+    LOAD_2_PARA
+    movdqa     xmm0, [r1]
+    movdqa     xmm1, [r1+16]
+    movdqa     xmm2, xmm0
+    punpcklqdq xmm0, xmm1
+    punpckhqdq xmm2, xmm1
+
+    movdqa     xmm3, xmm0
+    punpckldq  xmm0, xmm2
+    punpckhdq  xmm3, xmm2
+    pextrw     r1d , xmm0, 3
+    pextrw     r2d , xmm0, 7
+    pinsrw     xmm0, r1d,  7
+    pextrw     r1d,  xmm3, 4
+    pinsrw     xmm3, r2d,  4
+    pextrw     r2d,  xmm3, 0
+    pinsrw     xmm3, r1d,  0
+    pinsrw     xmm0, r2d,  3
+
+    pshufhw    xmm1, xmm0, 0x93
+    pshuflw    xmm2, xmm3, 0x39
+
+    movdqa     xmm3, xmm2
+    psrldq     xmm1, 2
+    pslldq     xmm3, 14
+    por        xmm1, xmm3
+    psrldq     xmm2, 2
+    movdqa     [r0],xmm1
+    movdqa     [r0+16], xmm2
+    ret
+
+
+;***********************************************************************
+;void int32_t WelsCalculateSingleCtr4x4_sse2( int16_t *pDct );
+;***********************************************************************
+WELS_EXTERN WelsCalculateSingleCtr4x4_sse2
+    %ifdef X86_32
+    push r3
+    %assign push_num 1
+    %else
+    %assign push_num 0
+    %endif
+    INIT_X86_32_PIC r4
+    LOAD_1_PARA
+    movdqa    xmm0, [r0]
+    movdqa    xmm1, [r0+16]
+
+    packsswb  xmm0, xmm1
+    ; below is the register map: r0 - eax, r1 - ebx, r2 - ecx, r3 - edx
+    xor r3, r3
+    pxor      xmm3, xmm3
+    pcmpeqb   xmm0, xmm3
+    pmovmskb  r3d,  xmm0
+
+    xor       r3,  0xffff
+
+    xor       r0,  r0
+    mov       r2,  7
+    mov       r1,  8
+.loop_low8_find1:
+    bt        r3,  r2
+    jc        .loop_high8_find1
+    dec       r2
+    jnz      .loop_low8_find1
+.loop_high8_find1:
+    bt        r3, r1
+    jc        .find1end
+    inc       r1
+    cmp       r1,16
+    jb        .loop_high8_find1
+.find1end:
+    sub       r1, r2
+    sub       r1, 1
+    lea   r2,  [pic(i_ds_table)]
+    add       r0b,  [r2+r1]
+    mov       r1, r3
+    and       r3, 0xff
+    shr       r1, 8
+    and       r1, 0xff
+    lea   r2 , [pic(low_mask_table)]
+    add       r0b,  [r2 +r3]
+    lea   r2, [pic(high_mask_table)]
+    add       r0b,  [r2+r1]
+    DEINIT_X86_32_PIC
+    %ifdef X86_32
+    pop r3
+    %else
+    mov retrd, r0d
+    %endif
+    ret
+
+
+;***********************************************************************
+; int32_t WelsGetNoneZeroCount_sse2(int16_t* level);
+;***********************************************************************
+WELS_EXTERN WelsGetNoneZeroCount_sse2
+    %assign push_num 0
+    INIT_X86_32_PIC r3
+    LOAD_1_PARA
+    movdqa    xmm0, [r0]
+    movdqa    xmm1, [r0+16]
+    pxor      xmm2, xmm2
+    pcmpeqw   xmm0, xmm2
+    pcmpeqw   xmm1, xmm2
+    packsswb  xmm1, xmm0
+    xor r1, r1
+    pmovmskb  r1d,  xmm1
+    xor       r1d,  0xffff
+    mov       r2,  r1
+    and       r1,  0xff
+    shr       r2,  8
+;   and       ecx,  0xff    ; we do not need this due to high 16bits equal to 0 yet
+;   xor       retr,  retr
+    ;add       al,  [nozero_count_table+r2]
+    lea       r0 , [pic(nozero_count_table)]
+    movzx     r2, byte [r0+r2]
+    movzx     r1,   byte [r0+r1]
+    mov   retrq, r2
+    add   retrq, r1
+    ;add       al,  [nozero_count_table+r1]
+    DEINIT_X86_32_PIC
+    ret
+
+;***********************************************************************
+; int32_t WelsGetNoneZeroCount_sse42(int16_t* level);
+;***********************************************************************
+WELS_EXTERN WelsGetNoneZeroCount_sse42
+    %assign push_num 0
+    LOAD_1_PARA
+    movdqa          xmm0, [r0]
+    packsswb        xmm0, [r0 + 16]
+    pxor            xmm1, xmm1
+    pcmpeqb         xmm0, xmm1
+    pmovmskb        retrd, xmm0
+    xor             retrd, 0FFFFh
+    popcnt          retrd, retrd
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/meson.build b/third-party/openh264/third_party/openh264/src/codec/encoder/meson.build
new file mode 100644
index 0000000000..5651ef2c0a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/meson.build
@@ -0,0 +1,83 @@
+cpp_sources = [
+  'core/src/au_set.cpp',
+  'core/src/deblocking.cpp',
+  'core/src/decode_mb_aux.cpp',
+  'core/src/encode_mb_aux.cpp',
+  'core/src/encoder.cpp',
+  'core/src/encoder_data_tables.cpp',
+  'core/src/encoder_ext.cpp',
+  'core/src/get_intra_predictor.cpp',
+  'core/src/md.cpp',
+  'core/src/mv_pred.cpp',
+  'core/src/nal_encap.cpp',
+  'core/src/paraset_strategy.cpp',
+  'core/src/picture_handle.cpp',
+  'core/src/ratectl.cpp',
+  'core/src/ref_list_mgr_svc.cpp',
+  'core/src/sample.cpp',
+  'core/src/set_mb_syn_cabac.cpp',
+  'core/src/set_mb_syn_cavlc.cpp',
+  'core/src/slice_multi_threading.cpp',
+  'core/src/svc_base_layer_md.cpp',
+  'core/src/svc_enc_slice_segment.cpp',
+  'core/src/svc_encode_mb.cpp',
+  'core/src/svc_encode_slice.cpp',
+  'core/src/svc_mode_decision.cpp',
+  'core/src/svc_motion_estimate.cpp',
+  'core/src/svc_set_mb_syn_cabac.cpp',
+  'core/src/svc_set_mb_syn_cavlc.cpp',
+  'core/src/wels_preprocess.cpp',
+  'core/src/wels_task_base.cpp',
+  'core/src/wels_task_encoder.cpp',
+  'core/src/wels_task_management.cpp',
+  'plus/src/welsEncoderExt.cpp',
+]
+
+objs_asm = []
+if cpu_family in ['x86', 'x86_64']
+  asm_sources = [
+    'core/x86/coeff.asm',
+    'core/x86/dct.asm',
+    'core/x86/intra_pred.asm',
+    'core/x86/matrix_transpose.asm',
+    'core/x86/memzero.asm',
+    'core/x86/quant.asm',
+    'core/x86/sample_sc.asm',
+    'core/x86/score.asm',
+  ]
+  objs_asm = asm_gen.process(asm_sources)
+elif cpu_family == 'arm'
+  asm_sources = [
+    'core/arm/intra_pred_neon.S',
+    'core/arm/intra_pred_sad_3_opt_neon.S',
+    'core/arm/memory_neon.S',
+    'core/arm/pixel_neon.S',
+    'core/arm/reconstruct_neon.S',
+    'core/arm/svc_motion_estimation.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+elif cpu_family == 'aarch64'
+  asm_sources = [
+    'core/arm64/intra_pred_aarch64_neon.S',
+    'core/arm64/intra_pred_sad_3_opt_aarch64_neon.S',
+    'core/arm64/memory_aarch64_neon.S',
+    'core/arm64/pixel_aarch64_neon.S',
+    'core/arm64/reconstruct_aarch64_neon.S',
+    'core/arm64/svc_motion_estimation_aarch64_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+else
+  error('Unsupported cpu family @0@'.format(cpu_family))
+endif
+
+libencoder = static_library('encoder', cpp_sources, objs_asm,
+  include_directories: [inc, processing_inc, encoder_inc, casm_inc],
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/plus/inc/welsEncoderExt.h b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/inc/welsEncoderExt.h
new file mode 100644
index 0000000000..b281f8ff69
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/inc/welsEncoderExt.h
@@ -0,0 +1,129 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ *
+ *  Abstract
+ *      Cisco OpenH264 encoder extension utilization interface for T26
+ *
+ *  History
+ *      4/24/2009 Created
+ *
+ *
+ *************************************************************************/
+#if !defined(WELS_PLUS_WELSENCODEREXT_H)
+#define WELS_PLUS_WELSENCODEREXT_H
+
+#include "codec_api.h"
+#include "codec_def.h"
+#include "codec_app_def.h"
+#include "welsCodecTrace.h"
+#include "encoder_context.h"
+#include "param_svc.h"
+#include "extern.h"
+#include "cpu.h"
+
+//#define OUTPUT_BIT_STREAM
+//#define DUMP_SRC_PICTURE
+//#define REC_FRAME_COUNT
+
+class ISVCEncoder;
+namespace WelsEnc {
+class CWelsH264SVCEncoder : public ISVCEncoder {
+ public:
+  CWelsH264SVCEncoder();
+  virtual ~CWelsH264SVCEncoder();
+
+  /* Interfaces override from ISVCEncoder */
+  /*
+   * return: CM_RETURN: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI Initialize (const SEncParamBase* argv);
+  virtual int EXTAPI InitializeExt (const SEncParamExt* argv);
+
+  virtual int EXTAPI GetDefaultParams (SEncParamExt* argv);
+
+  virtual int EXTAPI Uninitialize();
+
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
+  virtual int        EncodeFrameInternal (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo);
+
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI EncodeParameterSets (SFrameBSInfo* pBsInfo);
+  /*
+   * return: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI ForceIntraFrame (bool bIDR,int32_t iLayerId = -1);
+
+  /************************************************************************
+   * InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
+   ************************************************************************/
+  /*
+   * return: CM_RETURN: 0 - success; otherwise - failed;
+   */
+  virtual int EXTAPI SetOption (ENCODER_OPTION opt_id, void* option);
+  virtual int EXTAPI GetOption (ENCODER_OPTION opt_id, void* option);
+
+ private:
+  int InitializeInternal (SWelsSvcCodingParam* argv);
+  void TraceParamInfo(SEncParamExt *pParam);
+  void LogStatistics (const int64_t kiCurrentFrameTs,int32_t iMaxDid);
+  void UpdateStatistics(SFrameBSInfo* pBsInfo, const int64_t kiCurrentFrameMs);
+
+  sWelsEncCtx*      m_pEncContext;
+
+  welsCodecTrace*   m_pWelsTrace;
+  int32_t           m_iMaxPicWidth;
+  int32_t           m_iMaxPicHeight;
+
+  int32_t           m_iCspInternal;
+  bool              m_bInitialFlag;
+
+#ifdef OUTPUT_BIT_STREAM
+  FILE*             m_pFileBs;
+  FILE*             m_pFileBsSize;
+  bool              m_bSwitch;
+  int32_t           m_iSwitchTimes;
+#endif//OUTPUT_BIT_STREAM
+
+#ifdef REC_FRAME_COUNT
+  int32_t           m_uiCountFrameNum;
+#endif//REC_FRAME_COUNT
+
+  void    InitEncoder (void);
+  void    DumpSrcPicture (const SSourcePicture*  pSrcPic, const int iUsageType);
+};
+}
+#endif // !defined(WELS_PLUS_WELSENCODEREXT_H)
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/DllEntry.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/DllEntry.cpp
new file mode 100644
index 0000000000..1376a1b6ec
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/DllEntry.cpp
@@ -0,0 +1,43 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <windows.h>
+
+/////////////////////////////////////////////////////////////////////////////
+// DLL Entry Point
+
+BOOL WINAPI DllEntryPoint (HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) {
+  if (DLL_PROCESS_ATTACH == dwReason) {
+    DisableThreadLibraryCalls (hInstance);
+  }
+  return TRUE;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/welsEncoderExt.cpp b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/welsEncoderExt.cpp
new file mode 100644
index 0000000000..52a124a250
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -0,0 +1,1395 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <assert.h>
+#include "welsEncoderExt.h"
+#include "welsCodecTrace.h"
+#include "typedefs.h"
+#include "wels_const.h"
+#include "utils.h"
+#include "macros.h"
+#include "version.h"
+#include "crt_util_safe_x.h" // Safe CRT routines like util for cross platforms
+#include "ref_list_mgr_svc.h"
+#include "codec_ver.h"
+
+#include <time.h>
+#include <measure_time.h>
+#if defined(_WIN32) /*&& defined(_DEBUG)*/
+
+#include <windows.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <sys/types.h>
+#else
+#include <sys/time.h>
+#endif
+
+namespace WelsEnc {
+
+/*
+ *  CWelsH264SVCEncoder class implementation
+ */
+CWelsH264SVCEncoder::CWelsH264SVCEncoder()
+  : m_pEncContext (NULL),
+    m_pWelsTrace (NULL),
+    m_iMaxPicWidth (0),
+    m_iMaxPicHeight (0),
+    m_iCspInternal (0),
+    m_bInitialFlag (false) {
+#ifdef REC_FRAME_COUNT
+  int32_t m_uiCountFrameNum = 0;
+#endif//REC_FRAME_COUNT
+
+#ifdef OUTPUT_BIT_STREAM
+  char strStreamFileName[1024] = { 0 };  //for .264
+  int32_t iBufferUsed = 0;
+  int32_t iBufferLeft = 1023;
+  int32_t iCurUsed;
+
+  char strLenFileName[1024] = { 0 }; //for .len
+  int32_t iBufferUsedSize = 0;
+  int32_t iBufferLeftSize = 1023;
+  int32_t iCurUsedSize;
+#endif//OUTPUT_BIT_STREAM
+
+#ifdef OUTPUT_BIT_STREAM
+  SWelsTime tTime;
+
+  WelsGetTimeOfDay (&tTime);
+
+  iCurUsed      = WelsSnprintf (strStreamFileName, iBufferLeft, "enc_bs_0x%p_", (void*)this);
+  iCurUsedSize  = WelsSnprintf (strLenFileName, iBufferLeftSize, "enc_size_0x%p_", (void*)this);
+
+
+  iBufferUsed += iCurUsed;
+  iBufferLeft -= iCurUsed;
+  if (iBufferLeft > 0) {
+    iCurUsed = WelsStrftime (&strStreamFileName[iBufferUsed], iBufferLeft, "%y%m%d%H%M%S", &tTime);
+    iBufferUsed += iCurUsed;
+    iBufferLeft -= iCurUsed;
+  }
+
+  iBufferUsedSize += iCurUsedSize;
+  iBufferLeftSize -= iCurUsedSize;
+  if (iBufferLeftSize > 0) {
+    iCurUsedSize = WelsStrftime (&strLenFileName[iBufferUsedSize], iBufferLeftSize, "%y%m%d%H%M%S", &tTime);
+    iBufferUsedSize += iCurUsedSize;
+    iBufferLeftSize -= iCurUsedSize;
+  }
+
+  if (iBufferLeft > 0) {
+    iCurUsed = WelsSnprintf (&strStreamFileName[iBufferUsed], iBufferLeft, ".%03.3u.264",
+                             WelsGetMillisecond (&tTime));
+    iBufferUsed += iCurUsed;
+    iBufferLeft -= iCurUsed;
+  }
+
+  if (iBufferLeftSize > 0) {
+    iCurUsedSize = WelsSnprintf (&strLenFileName[iBufferUsedSize], iBufferLeftSize, ".%03.3u.len",
+                                 WelsGetMillisecond (&tTime));
+    iBufferUsedSize += iCurUsedSize;
+    iBufferLeftSize -= iCurUsedSize;
+  }
+
+  m_pFileBs     = WelsFopen (strStreamFileName, "wb");
+  m_pFileBsSize = WelsFopen (strLenFileName, "wb");
+
+  m_bSwitch      = false;
+  m_iSwitchTimes = 0;
+#endif//OUTPUT_BIT_STREAM
+
+  InitEncoder();
+}
+
+CWelsH264SVCEncoder::~CWelsH264SVCEncoder() {
+  if (m_pWelsTrace) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::~CWelsH264SVCEncoder()");
+  }
+
+#ifdef REC_FRAME_COUNT
+  m_uiCountFrameNum = 0;
+#endif//REC_FRAME_COUNT
+
+#ifdef OUTPUT_BIT_STREAM
+  if (m_pFileBs) {
+    WelsFclose (m_pFileBs);
+    m_pFileBs = NULL;
+  }
+  if (m_pFileBsSize) {
+    WelsFclose (m_pFileBsSize);
+    m_pFileBsSize = NULL;
+  }
+  m_bSwitch = false;
+  m_iSwitchTimes = 0;
+#endif//OUTPUT_BIT_STREAM
+
+  Uninitialize();
+
+  if (m_pWelsTrace) {
+    delete m_pWelsTrace;
+    m_pWelsTrace = NULL;
+  }
+}
+
+void CWelsH264SVCEncoder::InitEncoder (void) {
+
+  m_pWelsTrace = new welsCodecTrace();
+  if (m_pWelsTrace == NULL) {
+    return;
+  }
+  m_pWelsTrace->SetCodecInstance (this);
+}
+
+/* Interfaces override from ISVCEncoder */
+
+int CWelsH264SVCEncoder::GetDefaultParams (SEncParamExt* argv) {
+  SWelsSvcCodingParam::FillDefault (*argv);
+  return cmResultSuccess;
+}
+
+/*
+ *  SVC Encoder Initialization
+ */
+int CWelsH264SVCEncoder::Initialize (const SEncParamBase* argv) {
+  if (m_pWelsTrace == NULL) {
+    return cmMallocMemeError;
+  }
+
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s",
+           VERSION_NUMBER);
+
+  if (NULL == argv) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid argv= 0x%p",
+             argv);
+    return cmInitParaError;
+  }
+
+  SWelsSvcCodingParam sConfig;
+  // Convert SEncParamBase into WelsSVCParamConfig here..
+  if (sConfig.ParamBaseTranscode (*argv)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), parameter_translation failed.");
+    TraceParamInfo (&sConfig);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  return InitializeInternal (&sConfig);
+}
+
+int CWelsH264SVCEncoder::InitializeExt (const SEncParamExt* argv) {
+  if (m_pWelsTrace == NULL) {
+    return cmMallocMemeError;
+  }
+
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::InitEncoder(), openh264 codec version = %s",
+           VERSION_NUMBER);
+
+  if (NULL == argv) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::InitializeExt(), invalid argv= 0x%p",
+             argv);
+    return cmInitParaError;
+  }
+
+  SWelsSvcCodingParam sConfig;
+  // Convert SEncParamExt into WelsSVCParamConfig here..
+  if (sConfig.ParamTranscode (*argv)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::InitializeExt(), parameter_translation failed.");
+    TraceParamInfo (&sConfig);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  return InitializeInternal (&sConfig);
+}
+
+int CWelsH264SVCEncoder::InitializeInternal (SWelsSvcCodingParam* pCfg) {
+  if (NULL == pCfg) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), invalid argv= 0x%p.",
+             pCfg);
+    return cmInitParaError;
+  }
+
+  if (m_bInitialFlag) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+             "CWelsH264SVCEncoder::Initialize(), reinitialize, m_bInitialFlag= %d.",
+             m_bInitialFlag);
+    Uninitialize();
+  }
+  // Check valid parameters
+  const int32_t iNumOfLayers = pCfg->iSpatialLayerNum;
+  if (iNumOfLayers < 1 || iNumOfLayers > MAX_DEPENDENCY_LAYER) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid iSpatialLayerNum= %d, valid at range of [1, %d].", iNumOfLayers,
+             MAX_DEPENDENCY_LAYER);
+    Uninitialize();
+    return cmInitParaError;
+  }
+  if (pCfg->iTemporalLayerNum < 1)
+    pCfg->iTemporalLayerNum = 1;
+  if (pCfg->iTemporalLayerNum > MAX_TEMPORAL_LEVEL) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid iTemporalLayerNum= %d, valid at range of [1, %d].",
+             pCfg->iTemporalLayerNum, MAX_TEMPORAL_LEVEL);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  // assert( cfg.uiGopSize >= 1 && ( cfg.uiIntraPeriod && (cfg.uiIntraPeriod % cfg.uiGopSize) == 0) );
+
+  if (pCfg->uiGopSize < 1 || pCfg->uiGopSize > MAX_GOP_SIZE) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid uiGopSize= %d, valid at range of [1, %d].", pCfg->uiGopSize,
+             MAX_GOP_SIZE);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  if (!WELS_POWER2_IF (pCfg->uiGopSize)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid uiGopSize= %d, valid at range of [1, %d] and yield to power of 2.",
+             pCfg->uiGopSize, MAX_GOP_SIZE);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  if (pCfg->uiIntraPeriod && pCfg->uiIntraPeriod < pCfg->uiGopSize) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid uiIntraPeriod= %d, valid in case it equals to 0 for unlimited intra period or exceeds specified uiGopSize= %d.",
+             pCfg->uiIntraPeriod, pCfg->uiGopSize);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  if ((pCfg->uiIntraPeriod && (pCfg->uiIntraPeriod & (pCfg->uiGopSize - 1)) != 0)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+             "CWelsH264SVCEncoder::Initialize(), invalid uiIntraPeriod= %d, valid in case it equals to 0 for unlimited intra period or exceeds specified uiGopSize= %d also multiple of it.",
+             pCfg->uiIntraPeriod, pCfg->uiGopSize);
+    Uninitialize();
+    return cmInitParaError;
+  }
+  if (pCfg->iUsageType == SCREEN_CONTENT_REAL_TIME) {
+    if (pCfg->bEnableLongTermReference) {
+      pCfg->iLTRRefNum = LONG_TERM_REF_NUM_SCREEN;
+      if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT)
+        pCfg->iNumRefFrame = WELS_MAX (1, WELS_LOG2 (pCfg->uiGopSize)) + pCfg->iLTRRefNum;
+    } else {
+      pCfg->iLTRRefNum = 0;
+      if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT)
+        pCfg->iNumRefFrame = WELS_MAX (1, pCfg->uiGopSize >> 1);
+    }
+  } else {
+    pCfg->iLTRRefNum = pCfg->bEnableLongTermReference ? LONG_TERM_REF_NUM : 0;
+    if (pCfg->iNumRefFrame == AUTO_REF_PIC_COUNT) {
+      pCfg->iNumRefFrame = ((pCfg->uiGopSize >> 1) > 1) ? ((pCfg->uiGopSize >> 1) + pCfg->iLTRRefNum) :
+                           (MIN_REF_PIC_COUNT + pCfg->iLTRRefNum);
+      pCfg->iNumRefFrame = WELS_CLIP3 (pCfg->iNumRefFrame, MIN_REF_PIC_COUNT, MAX_REFERENCE_PICTURE_COUNT_NUM_CAMERA);
+    }
+  }
+
+  if (pCfg->iLtrMarkPeriod == 0) {
+    pCfg->iLtrMarkPeriod = 30;
+  }
+
+  const int32_t kiDecStages = WELS_LOG2 (pCfg->uiGopSize);
+  pCfg->iTemporalLayerNum        = (int8_t) (1 + kiDecStages);
+  pCfg->iLoopFilterAlphaC0Offset = WELS_CLIP3 (pCfg->iLoopFilterAlphaC0Offset, -6, 6);
+  pCfg->iLoopFilterBetaOffset    = WELS_CLIP3 (pCfg->iLoopFilterBetaOffset, -6, 6);
+
+  // decide property list size between INIT_TYPE_PARAMETER_BASED/INIT_TYPE_CONFIG_BASED
+  m_iMaxPicWidth  = pCfg->iPicWidth;
+  m_iMaxPicHeight = pCfg->iPicHeight;
+
+  TraceParamInfo (pCfg);
+  if (WelsInitEncoderExt (&m_pEncContext, pCfg, &m_pWelsTrace->m_sLogCtx, NULL)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), WelsInitEncoderExt failed.");
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG,
+             "Problematic Input Base Param: iUsageType=%d, Resolution=%dx%d, FR=%f, TLayerNum=%d, DLayerNum=%d",
+             pCfg->iUsageType, pCfg->iPicWidth, pCfg->iPicHeight, pCfg->fMaxFrameRate, pCfg->iTemporalLayerNum,
+             pCfg->iSpatialLayerNum);
+    Uninitialize();
+    return cmInitParaError;
+  }
+
+  m_bInitialFlag  = true;
+
+  return cmResultSuccess;
+}
+
+/*
+ *  SVC Encoder Uninitialization
+ */
+int32_t CWelsH264SVCEncoder::Uninitialize() {
+  if (!m_bInitialFlag) {
+    return 0;
+  }
+
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "CWelsH264SVCEncoder::Uninitialize(), openh264 codec version = %s.",
+           VERSION_NUMBER);
+
+  if (NULL != m_pEncContext) {
+    WelsUninitEncoderExt (&m_pEncContext);
+    m_pEncContext = NULL;
+  }
+
+  m_bInitialFlag = false;
+
+  return 0;
+}
+
+
+/*
+ *  SVC core encoding
+ */
+int CWelsH264SVCEncoder::EncodeFrame (const SSourcePicture* kpSrcPic, SFrameBSInfo* pBsInfo) {
+  if (! (kpSrcPic && m_bInitialFlag && pBsInfo)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), cmInitParaError.");
+    return cmInitParaError;
+  }
+  if (kpSrcPic->iColorFormat != videoFormatI420) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), wrong iColorFormat %d",
+             kpSrcPic->iColorFormat);
+    return cmInitParaError;
+  }
+
+  const int32_t kiEncoderReturn = EncodeFrameInternal (kpSrcPic, pBsInfo);
+
+  if (kiEncoderReturn != cmResultSuccess) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "CWelsH264SVCEncoder::EncodeFrame(), kiEncoderReturn %d",
+             kiEncoderReturn);
+    return kiEncoderReturn;
+  }
+
+#ifdef REC_FRAME_COUNT
+  ++ m_uiCountFrameNum;
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+           "CWelsH264SVCEncoder::EncodeFrame(), m_uiCountFrameNum= %d,", m_uiCountFrameNum);
+#endif//REC_FRAME_COUNT
+
+  return kiEncoderReturn;
+}
+
+
+int CWelsH264SVCEncoder ::EncodeFrameInternal (const SSourcePicture*  pSrcPic, SFrameBSInfo* pBsInfo) {
+
+  if ((pSrcPic->iPicWidth < 16) || ((pSrcPic->iPicHeight < 16))) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "Don't support width(%d) or height(%d) which is less than 16!",
+             pSrcPic->iPicWidth, pSrcPic->iPicHeight);
+    return cmUnsupportedData;
+  }
+
+  const int64_t kiBeforeFrameUs = WelsTime();
+  const int32_t kiEncoderReturn = WelsEncoderEncodeExt (m_pEncContext, pBsInfo, pSrcPic);
+  const int64_t kiCurrentFrameMs = (WelsTime() - kiBeforeFrameUs) / 1000;
+  if ((kiEncoderReturn == ENC_RETURN_MEMALLOCERR) || (kiEncoderReturn == ENC_RETURN_MEMOVERFLOWFOUND)
+      || (kiEncoderReturn == ENC_RETURN_VLCOVERFLOWFOUND)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG, "CWelsH264SVCEncoder::EncodeFrame() not succeed, err=%d",
+             kiEncoderReturn);
+    WelsUninitEncoderExt (&m_pEncContext);
+    return cmMallocMemeError;
+  } else if ((kiEncoderReturn != ENC_RETURN_SUCCESS) && (kiEncoderReturn == ENC_RETURN_CORRECTED)) {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR, "unexpected return(%d) from EncodeFrameInternal()!",
+             kiEncoderReturn);
+    return cmUnknownReason;
+  }
+
+  UpdateStatistics (pBsInfo, kiCurrentFrameMs);
+
+  ///////////////////for test
+#ifdef OUTPUT_BIT_STREAM
+  if (pBsInfo->eFrameType != videoFrameTypeInvalid && pBsInfo->eFrameType != videoFrameTypeSkip) {
+    SLayerBSInfo* pLayer = NULL;
+    int32_t i = 0, j = 0, iCurLayerBits = 0, total_bits = 0;
+
+    if (m_bSwitch) {
+      if (m_pFileBs) {
+        WelsFclose (m_pFileBs);
+        m_pFileBs = NULL;
+      }
+      if (m_pFileBsSize) {
+        WelsFclose (m_pFileBsSize);
+        m_pFileBsSize = NULL;
+      }
+      char strStreamFileName[128] = {0};
+      WelsSnprintf (strStreamFileName, 128, "adj%d_w%d.264", m_iSwitchTimes,
+                    m_pEncContext->pSvcParam->iPicWidth);
+      m_pFileBs = WelsFopen (strStreamFileName, "wb");
+      WelsSnprintf (strStreamFileName, 128, "adj%d_w%d_size.iLen", m_iSwitchTimes,
+                    m_pEncContext->pSvcParam->iPicWidth);
+      m_pFileBsSize = WelsFopen (strStreamFileName, "wb");
+
+
+      m_bSwitch = false;
+    }
+
+    for (i = 0; i < pBsInfo->iLayerNum; i++) {
+      pLayer = &pBsInfo->sLayerInfo[i];
+
+      iCurLayerBits = 0;
+      for (j = 0; j < pLayer->iNalCount; j++) {
+        iCurLayerBits += pLayer->pNalLengthInByte[j];
+      }
+      total_bits += iCurLayerBits;
+      if (m_pFileBs != NULL)
+        WelsFwrite (pLayer->pBsBuf, 1, iCurLayerBits, m_pFileBs);
+    }
+
+    if (m_pFileBsSize != NULL)
+      WelsFwrite (&total_bits, sizeof (int32_t), 1, m_pFileBsSize);
+  }
+#endif //OUTPUT_BIT_STREAM
+#ifdef DUMP_SRC_PICTURE
+  DumpSrcPicture (pSrcPic, m_pEncContext->pSvcParam->iUsageType);
+#endif // DUMP_SRC_PICTURE
+
+  return cmResultSuccess;
+
+}
+
+int CWelsH264SVCEncoder::EncodeParameterSets (SFrameBSInfo* pBsInfo) {
+  return WelsEncoderEncodeParameterSets (m_pEncContext, pBsInfo);
+}
+
+/*
+ *  Force key frame
+ */
+int CWelsH264SVCEncoder::ForceIntraFrame (bool bIDR, int iLayerId) {
+  if (bIDR) {
+    if (! (m_pEncContext && m_bInitialFlag)) {
+      return 1;
+    }
+
+    ForceCodingIDR (m_pEncContext, iLayerId);
+  } else {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::ForceIntraFrame(),nothing to do as bIDR set to false");
+  }
+
+  return 0;
+}
+void CWelsH264SVCEncoder::TraceParamInfo (SEncParamExt* pParam) {
+  WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+           "iUsageType = %d,iPicWidth= %d;iPicHeight= %d;iTargetBitrate= %d;iMaxBitrate= %d;iRCMode= %d;iPaddingFlag= %d;iTemporalLayerNum= %d;iSpatialLayerNum= %d;fFrameRate= %.6ff;uiIntraPeriod= %d;"
+           "eSpsPpsIdStrategy = %d;bPrefixNalAddingCtrl = %d;bSimulcastAVC=%d;bEnableDenoise= %d;bEnableBackgroundDetection= %d;bEnableSceneChangeDetect = %d;bEnableAdaptiveQuant= %d;bEnableFrameSkip= %d;bEnableLongTermReference= %d;iLtrMarkPeriod= %d, bIsLosslessLink=%d;"
+           "iComplexityMode = %d;iNumRefFrame = %d;iEntropyCodingModeFlag = %d;uiMaxNalSize = %d;iLTRRefNum = %d;iMultipleThreadIdc = %d;iLoopFilterDisableIdc = %d (offset(alpha/beta): %d,%d;iComplexityMode = %d,iMaxQp = %d;iMinQp = %d)",
+           pParam->iUsageType,
+           pParam->iPicWidth,
+           pParam->iPicHeight,
+           pParam->iTargetBitrate,
+           pParam->iMaxBitrate,
+           pParam->iRCMode,
+           pParam->iPaddingFlag,
+           pParam->iTemporalLayerNum,
+           pParam->iSpatialLayerNum,
+           pParam->fMaxFrameRate,
+           pParam->uiIntraPeriod,
+           pParam->eSpsPpsIdStrategy,
+           pParam->bPrefixNalAddingCtrl,
+           pParam->bSimulcastAVC,
+           pParam->bEnableDenoise,
+           pParam->bEnableBackgroundDetection,
+           pParam->bEnableSceneChangeDetect,
+           pParam->bEnableAdaptiveQuant,
+           pParam->bEnableFrameSkip,
+           pParam->bEnableLongTermReference,
+           pParam->iLtrMarkPeriod,
+           pParam->bIsLosslessLink,
+           pParam->iComplexityMode,
+           pParam->iNumRefFrame,
+           pParam->iEntropyCodingModeFlag,
+           pParam->uiMaxNalSize,
+           pParam->iLTRRefNum,
+           pParam->iMultipleThreadIdc,
+           pParam->iLoopFilterDisableIdc,
+           pParam->iLoopFilterAlphaC0Offset,
+           pParam->iLoopFilterBetaOffset,
+           pParam->iComplexityMode,
+           pParam->iMaxQp,
+           pParam->iMinQp
+          );
+  int32_t i = 0;
+  int32_t iSpatialLayers = (pParam->iSpatialLayerNum < MAX_SPATIAL_LAYER_NUM) ? (pParam->iSpatialLayerNum) :
+                           MAX_SPATIAL_LAYER_NUM;
+  while (i < iSpatialLayers) {
+    SSpatialLayerConfig* pSpatialCfg = &pParam->sSpatialLayers[i];
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "sSpatialLayers[%d]: .iVideoWidth= %d; .iVideoHeight= %d; .fFrameRate= %.6ff; .iSpatialBitrate= %d; .iMaxSpatialBitrate= %d; .sSliceArgument.uiSliceMode= %d; .sSliceArgument.iSliceNum= %d; .sSliceArgument.uiSliceSizeConstraint= %d;"
+             "uiProfileIdc = %d;uiLevelIdc = %d;iDLayerQp = %d",
+             i, pSpatialCfg->iVideoWidth,
+             pSpatialCfg->iVideoHeight,
+             pSpatialCfg->fFrameRate,
+             pSpatialCfg->iSpatialBitrate,
+             pSpatialCfg->iMaxSpatialBitrate,
+             pSpatialCfg->sSliceArgument.uiSliceMode,
+             pSpatialCfg->sSliceArgument.uiSliceNum,
+             pSpatialCfg->sSliceArgument.uiSliceSizeConstraint,
+             pSpatialCfg->uiProfileIdc,
+             pSpatialCfg->uiLevelIdc,
+             pSpatialCfg->iDLayerQp
+            );
+    ++ i;
+  }
+}
+
+void CWelsH264SVCEncoder::LogStatistics (const int64_t kiCurrentFrameTs, int32_t iMaxDid) {
+  for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) {
+    SEncoderStatistics* pStatistics = & (m_pEncContext->sEncoderStatistics[iDid]);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "EncoderStatistics: SpatialId = %d,%dx%d, SpeedInMs: %f, fAverageFrameRate=%f, "
+             "LastFrameRate=%f, LatestBitRate=%d, LastFrameQP=%d, uiInputFrameCount=%d, uiSkippedFrameCount=%d, "
+             "uiResolutionChangeTimes=%d, uIDRReqNum=%d, uIDRSentNum=%d, uLTRSentNum=NA, iTotalEncodedBytes=%lu at Ts = %" PRId64,
+             iDid, pStatistics->uiWidth, pStatistics->uiHeight,
+             pStatistics->fAverageFrameSpeedInMs, pStatistics->fAverageFrameRate,
+             pStatistics->fLatestFrameRate, pStatistics->uiBitRate, pStatistics->uiAverageFrameQP,
+             pStatistics->uiInputFrameCount, pStatistics->uiSkippedFrameCount,
+             pStatistics->uiResolutionChangeTimes, pStatistics->uiIDRReqNum, pStatistics->uiIDRSentNum,
+             pStatistics->iTotalEncodedBytes, kiCurrentFrameTs);
+  }
+}
+
+void CWelsH264SVCEncoder::UpdateStatistics (SFrameBSInfo* pBsInfo,
+    const int64_t kiCurrentFrameMs) {
+
+  const int64_t kiCurrentFrameTs = m_pEncContext->uiLastTimestamp = pBsInfo->uiTimeStamp;
+  const int64_t kiTimeDiff = kiCurrentFrameTs - m_pEncContext->iLastStatisticsLogTs;
+
+  int32_t iMaxDid = m_pEncContext->pSvcParam->iSpatialLayerNum - 1;
+  SLayerBSInfo*  pLayerInfo = &pBsInfo->sLayerInfo[0];
+  uint32_t iMaxInputFrame = 0;
+  float iMaxFrameRate = 0;
+  for (int32_t iDid = 0; iDid <= iMaxDid; iDid++) {
+    EVideoFrameType eFrameType = videoFrameTypeSkip;
+    int32_t kiCurrentFrameSize = 0;
+    for (int32_t iLayerNum = 0; iLayerNum < pBsInfo->iLayerNum; iLayerNum++) {
+      pLayerInfo = &pBsInfo->sLayerInfo[iLayerNum];
+      if ((pLayerInfo->uiLayerType == VIDEO_CODING_LAYER) && (pLayerInfo->uiSpatialId == iDid)) {
+        eFrameType = pLayerInfo->eFrameType;
+        for (int32_t iNalIdx = 0; iNalIdx < pLayerInfo->iNalCount; iNalIdx++) {
+          kiCurrentFrameSize += pLayerInfo->pNalLengthInByte[iNalIdx];
+        }
+      }
+    }
+    SEncoderStatistics* pStatistics = & (m_pEncContext->sEncoderStatistics[iDid]);
+    SSpatialLayerInternal* pSpatialLayerInternalParam = & (m_pEncContext->pSvcParam->sDependencyLayers[iDid]);
+
+    if ((0 != pStatistics->uiWidth && 0 != pStatistics->uiHeight)
+        && (pStatistics->uiWidth != (unsigned int) pSpatialLayerInternalParam->iActualWidth
+            || pStatistics->uiHeight != (unsigned int) pSpatialLayerInternalParam->iActualHeight)) {
+      pStatistics->uiResolutionChangeTimes ++;
+    }
+    pStatistics->uiWidth = pSpatialLayerInternalParam->iActualWidth;
+    pStatistics->uiHeight = pSpatialLayerInternalParam->iActualHeight;
+
+    const bool kbCurrentFrameSkipped = (videoFrameTypeSkip == eFrameType);
+    pStatistics->uiInputFrameCount ++;
+    pStatistics->uiSkippedFrameCount += (kbCurrentFrameSkipped ? 1 : 0);
+    iMaxInputFrame = WELS_MAX (pStatistics->uiInputFrameCount, iMaxInputFrame);
+    int32_t iProcessedFrameCount = pStatistics->uiInputFrameCount - pStatistics->uiSkippedFrameCount;
+    if (!kbCurrentFrameSkipped && iProcessedFrameCount != 0) {
+      pStatistics->fAverageFrameSpeedInMs += (kiCurrentFrameMs - pStatistics->fAverageFrameSpeedInMs) / iProcessedFrameCount;
+    }
+    // rate control related
+    if (0 != m_pEncContext->uiStartTimestamp) {
+      if (kiCurrentFrameTs > m_pEncContext->uiStartTimestamp + 800) {
+        pStatistics->fAverageFrameRate = (static_cast<float> (pStatistics->uiInputFrameCount) * 1000 /
+                                          (kiCurrentFrameTs - m_pEncContext->uiStartTimestamp));
+      }
+    } else {
+      m_pEncContext->uiStartTimestamp = kiCurrentFrameTs;
+    }
+    iMaxFrameRate = WELS_MAX (iMaxFrameRate, pStatistics->fAverageFrameRate);
+    //pStatistics->fLatestFrameRate = m_pEncContext->pWelsSvcRc->fLatestFrameRate; //TODO: finish the calculation in RC
+    //pStatistics->uiBitRate = m_pEncContext->pWelsSvcRc->iActualBitRate; //TODO: finish the calculation in RC
+    pStatistics->uiAverageFrameQP = m_pEncContext->pWelsSvcRc[iDid].iAverageFrameQp;
+
+    if (videoFrameTypeIDR == eFrameType || videoFrameTypeI == eFrameType) {
+      pStatistics->uiIDRSentNum ++;
+    }
+    if (m_pEncContext->pLtr->bLTRMarkingFlag) {
+      pStatistics->uiLTRSentNum ++;
+    }
+
+    pStatistics->iTotalEncodedBytes += kiCurrentFrameSize;
+
+    const int32_t kiDeltaFrames = static_cast<int32_t> (pStatistics->uiInputFrameCount -
+                                  pStatistics->iLastStatisticsFrameCount);
+    if (kiDeltaFrames > (m_pEncContext->pSvcParam->fMaxFrameRate * 2)) {
+      if (kiTimeDiff >= m_pEncContext->iStatisticsLogInterval) {
+        float fTimeDiffSec = kiTimeDiff / 1000.0f;
+        pStatistics->fLatestFrameRate = static_cast<float> ((pStatistics->uiInputFrameCount -
+                                        pStatistics->iLastStatisticsFrameCount) / fTimeDiffSec);
+        pStatistics->uiBitRate = static_cast<unsigned int> ((pStatistics->iTotalEncodedBytes) * 8  / fTimeDiffSec);
+
+        if (WELS_ABS (pStatistics->fLatestFrameRate - m_pEncContext->pSvcParam->fMaxFrameRate) > 30) {
+          WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+                   "Actual input fLatestFrameRate = %f is quite different from framerate in setting %f, please check setting or timestamp unit (ms), cur_Ts = %"
+                   PRId64 " start_Ts = %" PRId64,
+                   pStatistics->fLatestFrameRate, m_pEncContext->pSvcParam->fMaxFrameRate, kiCurrentFrameTs,
+                   static_cast<int64_t> (m_pEncContext->iLastStatisticsLogTs));
+        }
+
+        if (m_pEncContext->pSvcParam->iRCMode == RC_QUALITY_MODE || m_pEncContext->pSvcParam->iRCMode == RC_BITRATE_MODE) {
+          if ((pStatistics->fLatestFrameRate > 0)
+              && WELS_ABS (m_pEncContext->pSvcParam->fMaxFrameRate - pStatistics->fLatestFrameRate) > 5) {
+            WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+                     "Actual input framerate %f is different from framerate in setting %f, suggest to use other rate control modes",
+                     pStatistics->fLatestFrameRate, m_pEncContext->pSvcParam->fMaxFrameRate);
+          }
+        }
+        // update variables
+        pStatistics->iLastStatisticsBytes = pStatistics->iTotalEncodedBytes;
+        pStatistics->iLastStatisticsFrameCount = pStatistics->uiInputFrameCount;
+        m_pEncContext->iLastStatisticsLogTs = kiCurrentFrameTs;
+        LogStatistics (kiCurrentFrameTs, iMaxDid);
+        pStatistics->iTotalEncodedBytes = 0;
+        //TODO: the following statistics will be calculated and added later
+        //pStatistics->uiLTRSentNum
+
+      }
+    }
+  }
+
+}
+
+/************************************************************************
+* InDataFormat, IDRInterval, SVC Encode Param, Frame Rate, Bitrate,..
+************************************************************************/
+int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) {
+  if (NULL == pOption) {
+    return cmInitParaError;
+  }
+
+  if ((NULL == m_pEncContext || false == m_bInitialFlag) && eOptionId != ENCODER_OPTION_TRACE_LEVEL
+      && eOptionId != ENCODER_OPTION_TRACE_CALLBACK && eOptionId != ENCODER_OPTION_TRACE_CALLBACK_CONTEXT) {
+    return cmInitExpected;
+  }
+
+  switch (eOptionId) {
+  case ENCODER_OPTION_INTER_SPATIAL_PRED: { // Inter spatial layer prediction flag
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.");
+  }
+  break;
+  case ENCODER_OPTION_DATAFORMAT: { // Input color space
+    int32_t iValue = * ((int32_t*)pOption);
+    int32_t iColorspace = iValue;
+    if (iColorspace == 0) {
+      return cmInitParaError;
+    }
+
+    m_iCspInternal = iColorspace;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal = 0x%x", m_iCspInternal);
+  }
+  break;
+  case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
+    int32_t iValue = * ((int32_t*)pOption);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL iValue = %d", iValue);
+    if (iValue <= -1) {
+      iValue = 0;
+    }
+    if (iValue == (int32_t)m_pEncContext->pSvcParam->uiIntraPeriod) {
+      return cmResultSuccess;
+    }
+    m_pEncContext->pSvcParam->uiIntraPeriod = (uint32_t)iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IDR_INTERVAL uiIntraPeriod updated to %d",
+             m_pEncContext->pSvcParam->uiIntraPeriod);
+  }
+  break;
+  case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter
+    SEncParamBase sEncodingParam;
+    SWelsSvcCodingParam sConfig;
+    int32_t iTargetWidth = 0;
+    int32_t iTargetHeight = 0;
+
+    memcpy (&sEncodingParam, pOption, sizeof (SEncParamBase)); // confirmed_safe_unsafe_usage
+#ifdef OUTPUT_BIT_STREAM
+    if ((sEncodingParam.iPicWidth  != m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum
+         - 1].iActualWidth) ||
+        (sEncodingParam.iPicHeight != m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum -
+                                                       1].iActualHeight)) {
+      ++m_iSwitchTimes;
+      m_bSwitch = true;
+    }
+#endif//OUTPUT_BIT_STREAM
+    if (sConfig.ParamBaseTranscode (sEncodingParam)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, ParamTranscode failed!");
+      return cmInitParaError;
+    }
+    /* New configuration available here */
+    iTargetWidth        = sConfig.iPicWidth;
+    iTargetHeight       = sConfig.iPicHeight;
+    if (m_iMaxPicWidth != iTargetWidth
+        || m_iMaxPicHeight != iTargetHeight) {
+      m_iMaxPicWidth    = iTargetWidth;
+      m_iMaxPicHeight   = iTargetHeight;
+    }
+    if (sConfig.DetermineTemporalSettings()) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, DetermineTemporalSettings failed!");
+      return cmInitParaError;
+    }
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE iUsageType = %d,iPicWidth= %d;iPicHeight= %d;iTargetBitrate= %d;fMaxFrameRate=  %.6ff;iRCMode= %d",
+             sEncodingParam.iUsageType,
+             sEncodingParam.iPicWidth,
+             sEncodingParam.iPicHeight,
+             sEncodingParam.iTargetBitrate,
+             sEncodingParam.fMaxFrameRate,
+             sEncodingParam.iRCMode);
+    if (WelsEncoderParamAdjust (&m_pEncContext, &sConfig)) {
+      return cmInitParaError;
+    }
+
+    //LogStatistics
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE, LogStatisticsBeforeNewEncoding");
+    LogStatistics (m_pEncContext->iLastStatisticsLogTs, 0);
+  }
+  break;
+
+  case ENCODER_OPTION_SVC_ENCODE_PARAM_EXT: { // SVC Encoding Parameter
+    SEncParamExt sEncodingParam;
+    SWelsSvcCodingParam sConfig;
+    int32_t iTargetWidth = 0;
+    int32_t iTargetHeight = 0;
+
+    memcpy (&sEncodingParam, pOption, sizeof (SEncParamExt)); // confirmed_safe_unsafe_usage
+    TraceParamInfo (&sEncodingParam);
+#ifdef OUTPUT_BIT_STREAM
+    if ((sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth !=
+         m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iActualWidth) ||
+        (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoHeight !=
+         m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iActualHeight)) {
+      ++ m_iSwitchTimes;
+      m_bSwitch = true;
+    }
+#endif//OUTPUT_BIT_STREAM
+    if (sEncodingParam.iSpatialLayerNum < 1
+        || sEncodingParam.iSpatialLayerNum > MAX_SPATIAL_LAYER_NUM) { // verify number of spatial layer
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, iSpatialLayerNum(%d) failed!",
+               sEncodingParam.iSpatialLayerNum);
+      return cmInitParaError;
+    }
+
+    if (sConfig.ParamTranscode (sEncodingParam)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, ParamTranscode failed!");
+      return cmInitParaError;
+    }
+    if (sConfig.iSpatialLayerNum < 1) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, iSpatialLayerNum(%d) failed!",
+               sConfig.iSpatialLayerNum);
+      return cmInitParaError;
+    }
+    if (sConfig.DetermineTemporalSettings()) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, DetermineTemporalSettings failed!");
+      return cmInitParaError;
+    }
+
+    /* New configuration available here */
+    iTargetWidth        = sConfig.iPicWidth;
+    iTargetHeight       = sConfig.iPicHeight;
+    if (m_iMaxPicWidth != iTargetWidth
+        || m_iMaxPicHeight != iTargetHeight) {
+      m_iMaxPicWidth    = iTargetWidth;
+      m_iMaxPicHeight   = iTargetHeight;
+    }
+    /* Check every field whether there is new request for memory block changed or else, Oct. 24, 2008 */
+    if (WelsEncoderParamAdjust (&m_pEncContext, &sConfig)) {
+      return cmInitParaError;
+    }
+
+    //LogStatistics
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT, LogStatisticsBeforeNewEncoding");
+    LogStatistics (m_pEncContext->iLastStatisticsLogTs, sEncodingParam.iSpatialLayerNum - 1);
+  }
+  break;
+  case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
+    float iValue = * ((float*)pOption);
+    if (iValue <= 0) {
+      return cmInitParaError;
+    }
+    //adjust to valid range
+    m_pEncContext->pSvcParam->fMaxFrameRate = WELS_CLIP3 (iValue, MIN_FRAME_RATE, MAX_FRAME_RATE);
+    WelsEncoderApplyFrameRate (m_pEncContext->pSvcParam);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_FRAME_RATE,m_pEncContext->pSvcParam->fMaxFrameRate= %f",
+             m_pEncContext->pSvcParam->fMaxFrameRate);
+  }
+  break;
+  case ENCODER_OPTION_BITRATE: { // Target bit-rate
+    SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
+    int32_t iBitrate = pInfo->iBitrate;
+    if (iBitrate <= 0) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iBitrate = %d",
+               iBitrate);
+      return cmInitParaError;
+    }
+    iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);
+    switch (pInfo->iLayer) {
+    case SPATIAL_LAYER_ALL:
+      m_pEncContext->pSvcParam->iTargetBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_0:
+      m_pEncContext->pSvcParam->sSpatialLayers[0].iSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_1:
+      m_pEncContext->pSvcParam->sSpatialLayers[1].iSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_2:
+      m_pEncContext->pSvcParam->sSpatialLayers[2].iSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_3:
+      m_pEncContext->pSvcParam->sSpatialLayers[3].iSpatialBitrate = iBitrate;
+      break;
+    default:
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iLayer = %d",
+               pInfo->iLayer);
+      return cmInitParaError;
+      break;
+    }
+    //adjust to valid range
+    if (WelsEncoderApplyBitRate (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pInfo->iLayer)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE layerId= %d,iSpatialBitrate = %d", pInfo->iLayer, iBitrate);
+      return cmInitParaError;
+    } else {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE layerId= %d,iSpatialBitrate = %d", pInfo->iLayer, iBitrate);
+
+    }
+
+  }
+  break;
+  case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
+    SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
+    int32_t iBitrate = pInfo->iBitrate;
+    if (iBitrate <= 0) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iBitrate = %d",
+               iBitrate);
+      return cmInitParaError;
+    }
+    iBitrate = WELS_CLIP3 (iBitrate, MIN_BIT_RATE, MAX_BIT_RATE);
+    switch (pInfo->iLayer) {
+    case SPATIAL_LAYER_ALL:
+      m_pEncContext->pSvcParam->iMaxBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_0:
+      m_pEncContext->pSvcParam->sSpatialLayers[0].iMaxSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_1:
+      m_pEncContext->pSvcParam->sSpatialLayers[1].iMaxSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_2:
+      m_pEncContext->pSvcParam->sSpatialLayers[2].iMaxSpatialBitrate = iBitrate;
+      break;
+    case SPATIAL_LAYER_3:
+      m_pEncContext->pSvcParam->sSpatialLayers[3].iMaxSpatialBitrate = iBitrate;
+      break;
+    default:
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_MAX_BITRATE,iLayer = %d",
+               pInfo->iLayer);
+      return cmInitParaError;
+      break;
+    }
+    //adjust to valid range
+    if (WelsEncoderApplyBitRate (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pInfo->iLayer)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE layerId= %d,iMaxSpatialBitrate = %d", pInfo->iLayer, iBitrate);
+      return cmInitParaError;
+    } else {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE layerId= %d,iMaxSpatialBitrate = %d", pInfo->iLayer, iBitrate);
+
+    }
+  }
+  break;
+  case ENCODER_OPTION_RC_MODE: { // 0:quality mode;1:bit-rate mode;2:bitrate limited mode
+    int32_t iValue = * ((int32_t*)pOption);
+    m_pEncContext->pSvcParam->iRCMode = (RC_MODES) iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_MODE iRCMode= %d (Note: not suggest changing RC-mode in middle of encoding)",
+             iValue);
+    WelsRcInitFuncPointers (m_pEncContext, m_pEncContext->pSvcParam->iRCMode);
+  }
+  break;
+  case ENCODER_OPTION_RC_FRAME_SKIP: { // 0:FRAME-SKIP disabled;1:FRAME-SKIP enabled
+    bool bValue = * ((bool*)pOption);
+    if (m_pEncContext->pSvcParam->iRCMode != RC_OFF_MODE) {
+      m_pEncContext->pSvcParam->bEnableFrameSkip = bValue;
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_FRAME_SKIP, frame-skip setting(%d)",
+               bValue);
+    } else {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_RC_FRAME_SKIP, rc off, frame-skip setting(%d) un-useful",
+               bValue);
+    }
+  }
+  break;
+  case ENCODER_PADDING_PADDING: { // 0:disable padding;1:padding
+    int32_t iValue = * ((int32_t*)pOption);
+    m_pEncContext->pSvcParam->iPaddingFlag = iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_PADDING_PADDING iPaddingFlag= %d ",
+             iValue);
+  }
+  break;
+  case ENCODER_LTR_RECOVERY_REQUEST: {
+    SLTRRecoverRequest* pLTR_Recover_Request = (SLTRRecoverRequest*) (pOption);
+    FilterLTRRecoveryRequest (m_pEncContext, pLTR_Recover_Request);
+  }
+  break;
+  case ENCODER_LTR_MARKING_FEEDBACK: {
+    SLTRMarkingFeedback* fb = (SLTRMarkingFeedback*) (pOption);
+    FilterLTRMarkingFeedback (m_pEncContext, fb);
+  }
+  break;
+  case ENCODER_LTR_MARKING_PERIOD: {
+    uint32_t iValue = * ((uint32_t*) (pOption));
+    m_pEncContext->pSvcParam->iLtrMarkPeriod = iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_LTR_MARKING_PERIOD iLtrMarkPeriod= %d ",
+             iValue);
+  }
+  break;
+  case ENCODER_OPTION_LTR: {
+    SLTRConfig* pLTRValue = ((SLTRConfig*) (pOption));
+    if (WelsEncoderApplyLTR (&m_pWelsTrace->m_sLogCtx, &m_pEncContext, pLTRValue)) {
+      return cmInitParaError;
+    }
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_LTR,expected bEnableLongTermReference = %d,expeced iLTRRefNum = %d,actual bEnableLongTermReference = %d,actual iLTRRefNum = %d",
+             pLTRValue->bEnableLongTermReference, pLTRValue->iLTRRefNum, m_pEncContext->pSvcParam->bEnableLongTermReference,
+             m_pEncContext->pSvcParam->iLTRRefNum);
+  }
+  break;
+  case ENCODER_OPTION_ENABLE_SSEI: {
+    bool iValue = * ((bool*)pOption);
+    m_pEncContext->pSvcParam->bEnableSSEI = iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             " CWelsH264SVCEncoder::SetOption enable SSEI = %d -- this is not supported yet",
+             m_pEncContext->pSvcParam->bEnableSSEI);
+  }
+  break;
+  case ENCODER_OPTION_ENABLE_PREFIX_NAL_ADDING: {
+    bool iValue = * ((bool*)pOption);
+    m_pEncContext->pSvcParam->bPrefixNalAddingCtrl = iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption bPrefixNalAddingCtrl = %d ",
+             m_pEncContext->pSvcParam->bPrefixNalAddingCtrl);
+  }
+  break;
+  case ENCODER_OPTION_SPS_PPS_ID_STRATEGY: {
+    int32_t iValue = * (static_cast<int32_t*> (pOption));
+    EParameterSetStrategy eNewStrategy = CONSTANT_ID;
+    switch (iValue) {
+    case 0:
+      eNewStrategy = CONSTANT_ID;
+      break;
+    case 0x01:
+      eNewStrategy = INCREASING_ID;
+      break;
+    case 0x02:
+      eNewStrategy = SPS_LISTING;
+      break;
+    case 0x03:
+      eNewStrategy = SPS_LISTING_AND_PPS_INCREASING;
+      break;
+    case 0x06:
+      eNewStrategy = SPS_PPS_LISTING;
+      break;
+    default:
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               " CWelsH264SVCEncoder::SetOption eSpsPpsIdStrategy(%d) not in valid range, unchanged! existing=%d",
+               iValue, m_pEncContext->pSvcParam->eSpsPpsIdStrategy);
+      break;
+    }
+
+    if (((eNewStrategy & SPS_LISTING) || (m_pEncContext->pSvcParam->eSpsPpsIdStrategy & SPS_LISTING))
+        && m_pEncContext->pSvcParam->eSpsPpsIdStrategy != eNewStrategy) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               " CWelsH264SVCEncoder::SetOption eSpsPpsIdStrategy changing in the middle of call is NOT allowed for eSpsPpsIdStrategy>INCREASING_ID: existing setting is %d and the new one is %d",
+               m_pEncContext->pSvcParam->eSpsPpsIdStrategy, iValue);
+      return cmInitParaError;
+    }
+    SWelsSvcCodingParam sConfig;
+    memcpy (&sConfig, m_pEncContext->pSvcParam, sizeof (SWelsSvcCodingParam));
+    sConfig.eSpsPpsIdStrategy = eNewStrategy;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, " CWelsH264SVCEncoder::SetOption eSpsPpsIdStrategy = %d ",
+             sConfig.eSpsPpsIdStrategy);
+
+    if (WelsEncoderParamAdjust (&m_pEncContext, &sConfig)) {
+      return cmInitParaError;
+    }
+  }
+  break;
+  case ENCODER_OPTION_CURRENT_PATH: {
+    if (m_pEncContext->pSvcParam != NULL) {
+      char* path = static_cast<char*> (pOption);
+      m_pEncContext->pSvcParam->pCurPath = path;
+    }
+  }
+  break;
+  case ENCODER_OPTION_DUMP_FILE: {
+#ifdef ENABLE_FRAME_DUMP
+    if (m_pEncContext->pSvcParam != NULL) {
+      SDumpLayer* pDump = (static_cast<SDumpLayer*> (pOption));
+      WelsStrncpy (m_pEncContext->pSvcParam->sDependencyLayers[pDump->iLayer].sRecFileName,
+                   sizeof (m_pEncContext->pSvcParam->sDependencyLayers[pDump->iLayer].sRecFileName), pDump->pFileName);
+    }
+#endif
+  }
+  break;
+  case ENCODER_OPTION_TRACE_LEVEL: {
+    if (m_pWelsTrace) {
+      uint32_t level = * ((uint32_t*)pOption);
+      m_pWelsTrace->SetTraceLevel (level);
+    }
+  }
+  break;
+  case ENCODER_OPTION_TRACE_CALLBACK: {
+    if (m_pWelsTrace) {
+      WelsTraceCallback callback = * ((WelsTraceCallback*)pOption);
+      m_pWelsTrace->SetTraceCallback (callback);
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_TRACE_CALLBACK callback = %p.",
+               callback);
+    }
+  }
+  break;
+  case ENCODER_OPTION_TRACE_CALLBACK_CONTEXT: {
+    if (m_pWelsTrace) {
+      void* ctx = * ((void**)pOption);
+      m_pWelsTrace->SetTraceCallbackContext (ctx);
+    }
+  }
+  break;
+  case ENCODER_OPTION_PROFILE: {
+    SProfileInfo* pProfileInfo = (static_cast<SProfileInfo*> (pOption));
+    if ((pProfileInfo->iLayer < SPATIAL_LAYER_0) || (pProfileInfo->iLayer > SPATIAL_LAYER_3)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,iLayer = %d(rang0-3)", pProfileInfo->iLayer);
+      return cmInitParaError;
+    }
+    CheckProfileSetting (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pProfileInfo->iLayer,
+                         pProfileInfo->uiProfileIdc);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,layerId = %d,expected profile = %d,actual profile = %d",
+             pProfileInfo->iLayer, pProfileInfo->uiProfileIdc,
+             m_pEncContext->pSvcParam->sSpatialLayers[pProfileInfo->iLayer].uiProfileIdc);
+  }
+  break;
+  case ENCODER_OPTION_LEVEL: {
+    SLevelInfo* pLevelInfo = (static_cast<SLevelInfo*> (pOption));
+    if ((pLevelInfo->iLayer < SPATIAL_LAYER_0) || (pLevelInfo->iLayer > SPATIAL_LAYER_3)) {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_ERROR,
+               "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_PROFILE,iLayer = %d(rang0-3)", pLevelInfo->iLayer);
+      return cmInitParaError;
+    }
+    CheckLevelSetting (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, pLevelInfo->iLayer, pLevelInfo->uiLevelIdc);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_LEVEL,layerId = %d,expected level = %d,actual level = %d",
+             pLevelInfo->iLayer, pLevelInfo->uiLevelIdc, m_pEncContext->pSvcParam->sSpatialLayers[pLevelInfo->iLayer].uiLevelIdc);
+  }
+  break;
+  case ENCODER_OPTION_NUMBER_REF: {
+    int32_t iValue = * ((int32_t*)pOption);
+    CheckReferenceNumSetting (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam, iValue);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_NUMBER_REF,expected refNum = %d,actual refnum = %d", iValue,
+             m_pEncContext->pSvcParam->iNumRefFrame);
+  }
+  break;
+  case ENCODER_OPTION_DELIVERY_STATUS: {
+    SDeliveryStatus* pValue = (static_cast<SDeliveryStatus*> (pOption));
+    m_pEncContext->bDeliveryFlag = pValue->bDeliveryFlag;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_DEBUG,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_DELIVERY_STATUS,bDeliveryFlag = %d", pValue->bDeliveryFlag);
+  }
+  break;
+  case ENCODER_OPTION_COMPLEXITY: {
+    int32_t iValue = * (static_cast<int32_t*> (pOption));
+    m_pEncContext->pSvcParam->iComplexityMode = (ECOMPLEXITY_MODE)iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_COMPLEXITY,iComplexityMode = %d", iValue);
+  }
+  break;
+  case ENCODER_OPTION_GET_STATISTICS: {
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_WARNING,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_GET_STATISTICS: this option is get-only!");
+  }
+  break;
+  case ENCODER_OPTION_STATISTICS_LOG_INTERVAL: {
+    int32_t iValue = * (static_cast<int32_t*> (pOption));
+    m_pEncContext->iStatisticsLogInterval = iValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_STATISTICS_LOG_INTERVAL,iStatisticsLogInterval = %d", iValue);
+  }
+  break;
+  case ENCODER_OPTION_IS_LOSSLESS_LINK: {
+    bool bValue = * (static_cast<bool*> (pOption));
+    m_pEncContext->pSvcParam->bIsLosslessLink = bValue;
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_IS_LOSSLESS_LINK,bIsLosslessLink = %d", bValue);
+  }
+  break;
+  case ENCODER_OPTION_BITS_VARY_PERCENTAGE: {
+    int32_t iValue = * (static_cast<int32_t*> (pOption));
+    m_pEncContext->pSvcParam->iBitsVaryPercentage = WELS_CLIP3 (iValue, 0, 100);
+    WelsEncoderApplyBitVaryRang (&m_pWelsTrace->m_sLogCtx, m_pEncContext->pSvcParam,
+                                 m_pEncContext->pSvcParam->iBitsVaryPercentage);
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITS_VARY_PERCENTAGE,iBitsVaryPercentage = %d", iValue);
+  }
+  break;
+
+  default:
+    return cmInitParaError;
+  }
+
+  return 0;
+}
+
+int CWelsH264SVCEncoder::GetOption (ENCODER_OPTION eOptionId, void* pOption) {
+  if (NULL == pOption) {
+    return cmInitParaError;
+  }
+  if (NULL == m_pEncContext || false == m_bInitialFlag) {
+    return cmInitExpected;
+  }
+
+  switch (eOptionId) {
+  case ENCODER_OPTION_INTER_SPATIAL_PRED: { // Inter spatial layer prediction flag
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "ENCODER_OPTION_INTER_SPATIAL_PRED, this feature not supported at present.");
+  }
+  break;
+  case ENCODER_OPTION_DATAFORMAT: { // Input color space
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_DATAFORMAT, m_iCspInternal= 0x%x", m_iCspInternal);
+    * ((int32_t*)pOption) = m_iCspInternal;
+  }
+  break;
+  case ENCODER_OPTION_IDR_INTERVAL: { // IDR Interval
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_IDR_INTERVAL, uiIntraPeriod= %d",
+             m_pEncContext->pSvcParam->uiIntraPeriod);
+    * ((int32_t*)pOption) = m_pEncContext->pSvcParam->uiIntraPeriod;
+  }
+  break;
+  case ENCODER_OPTION_SVC_ENCODE_PARAM_EXT: { // SVC Encoding Parameter
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_EXT");
+    memcpy (pOption, m_pEncContext->pSvcParam, sizeof (SEncParamExt)); // confirmed_safe_unsafe_usage
+  }
+  break;
+  case ENCODER_OPTION_SVC_ENCODE_PARAM_BASE: { // SVC Encoding Parameter
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_SVC_ENCODE_PARAM_BASE");
+    m_pEncContext->pSvcParam->GetBaseParams ((SEncParamBase*) pOption);
+  }
+  break;
+
+  case ENCODER_OPTION_FRAME_RATE: { // Maximal input frame rate
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_FRAME_RATE, fMaxFrameRate = %.6ff",
+             m_pEncContext->pSvcParam->fMaxFrameRate);
+    * ((float*)pOption) = m_pEncContext->pSvcParam->fMaxFrameRate;
+  }
+  break;
+  case ENCODER_OPTION_BITRATE: { // Target bit-rate
+
+    SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
+    if ((pInfo->iLayer != SPATIAL_LAYER_ALL) && (pInfo->iLayer != SPATIAL_LAYER_0) && (pInfo->iLayer != SPATIAL_LAYER_1)
+        && (pInfo->iLayer != SPATIAL_LAYER_2) && (pInfo->iLayer != SPATIAL_LAYER_3))
+      return cmInitParaError;
+    if (pInfo->iLayer == SPATIAL_LAYER_ALL) {
+      pInfo->iBitrate = m_pEncContext->pSvcParam->iTargetBitrate;
+    } else {
+      pInfo->iBitrate = m_pEncContext->pSvcParam->sSpatialLayers[pInfo->iLayer].iSpatialBitrate;
+    }
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_BITRATE, layerId =%d,iBitrate = %d",
+             pInfo->iLayer, pInfo->iBitrate);
+  }
+  break;
+  case ENCODER_OPTION_MAX_BITRATE: { // Target bit-rate
+    SBitrateInfo* pInfo = (static_cast<SBitrateInfo*> (pOption));
+    if ((pInfo->iLayer != SPATIAL_LAYER_ALL) && (pInfo->iLayer != SPATIAL_LAYER_0) && (pInfo->iLayer != SPATIAL_LAYER_1)
+        && (pInfo->iLayer != SPATIAL_LAYER_2) && (pInfo->iLayer != SPATIAL_LAYER_3))
+      return cmInitParaError;
+    if (pInfo->iLayer == SPATIAL_LAYER_ALL) {
+      pInfo->iBitrate = m_pEncContext->pSvcParam->iMaxBitrate;
+    } else {
+      pInfo->iBitrate = m_pEncContext->pSvcParam->sSpatialLayers[pInfo->iLayer].iMaxSpatialBitrate;
+    }
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO,
+             "CWelsH264SVCEncoder::GetOption():ENCODER_OPTION_MAX_BITRATE,, layerId =%d,iBitrate = %d",
+             pInfo->iLayer, pInfo->iBitrate);
+  }
+  break;
+  case ENCODER_OPTION_GET_STATISTICS: {
+    SEncoderStatistics* pStatistics = (static_cast<SEncoderStatistics*> (pOption));
+    SEncoderStatistics* pEncStatistics = &m_pEncContext->sEncoderStatistics[m_pEncContext->pSvcParam->iSpatialLayerNum - 1];
+    pStatistics->uiWidth = pEncStatistics->uiWidth;
+    pStatistics->uiHeight = pEncStatistics->uiHeight;
+    pStatistics->fAverageFrameSpeedInMs = pEncStatistics->fAverageFrameSpeedInMs;
+
+    // rate control related
+    pStatistics->fAverageFrameRate = pEncStatistics->fAverageFrameRate;
+    pStatistics->fLatestFrameRate = pEncStatistics->fLatestFrameRate;
+    pStatistics->uiBitRate = pEncStatistics->uiBitRate;
+
+    pStatistics->uiInputFrameCount = pEncStatistics->uiInputFrameCount;
+    pStatistics->uiSkippedFrameCount = pEncStatistics->uiSkippedFrameCount;
+
+    pStatistics->uiResolutionChangeTimes = pEncStatistics->uiResolutionChangeTimes;
+    pStatistics->uiIDRReqNum = pEncStatistics->uiIDRReqNum;
+    pStatistics->uiIDRSentNum = pEncStatistics->uiIDRSentNum;
+    pStatistics->uiLTRSentNum = pEncStatistics->uiLTRSentNum;
+  }
+  break;
+  case ENCODER_OPTION_STATISTICS_LOG_INTERVAL: {
+    * ((int32_t*)pOption) = m_pEncContext->iStatisticsLogInterval;
+  }
+  break;
+  case ENCODER_OPTION_COMPLEXITY: {
+    * ((int32_t*)pOption) =  m_pEncContext->pSvcParam->iComplexityMode;
+  }
+  break;
+  default:
+    return cmInitParaError;
+  }
+
+  return 0;
+}
+
+void CWelsH264SVCEncoder::DumpSrcPicture (const SSourcePicture*  pSrcPic, const int iUsageType) {
+#ifdef DUMP_SRC_PICTURE
+  FILE* pFile = NULL;
+  char strFileName[256] = {0};
+  const int32_t iDataLength = m_iMaxPicWidth * m_iMaxPicHeight;
+
+  WelsSnprintf (strFileName, sizeof (strFileName), "pic_in_%dx%d.yuv", m_iMaxPicWidth,
+                m_iMaxPicHeight);// confirmed_safe_unsafe_usage
+
+  switch (pSrcPic->iColorFormat) {
+  case videoFormatI420:
+  case videoFormatYV12:
+    pFile = WelsFopen (strFileName, "ab+");
+
+    if (NULL != pFile) {
+      fwrite (pSrcPic->pData[0], sizeof (uint8_t), pSrcPic->iStride[0]*m_iMaxPicHeight, pFile);
+      fwrite (pSrcPic->pData[1], sizeof (uint8_t), pSrcPic->iStride[1] * (m_iMaxPicHeight >> 1), pFile);
+      fwrite (pSrcPic->pData[2], sizeof (uint8_t), pSrcPic->iStride[2] * (m_iMaxPicHeight >> 1), pFile);
+      fflush (pFile);
+      fclose (pFile);
+    } else {
+      WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "DumpSrcPicture, strFileName %s open failed!", strFileName);
+    }
+    break;
+  case videoFormatRGB:
+    WelsStrcat (strFileName, 256, ".rgb"); // confirmed_safe_unsafe_usage
+    pFile = WelsFopen (strFileName, "ab+");
+    if (NULL != pFile) {
+      fwrite (pSrcPic->pData[0], sizeof (uint8_t), iDataLength * 3, pFile);
+      fflush (pFile);
+      fclose (pFile);
+    }
+  case videoFormatBGR:
+    WelsStrcat (strFileName, 256, ".bgr"); // confirmed_safe_unsafe_usage
+    pFile = WelsFopen (strFileName, "ab+");
+    if (NULL != pFile) {
+      fwrite (pSrcPic->pData[0], sizeof (uint8_t), iDataLength * 3, pFile);
+      fflush (pFile);
+      fclose (pFile);
+    }
+    break;
+  case videoFormatYUY2:
+    WelsStrcat (strFileName, 256, ".yuy2"); // confirmed_safe_unsafe_usage
+    pFile = WelsFopen (strFileName, "ab+");
+    if (NULL != pFile) {
+      fwrite (pSrcPic->pData[0], sizeof (uint8_t), (CALC_BI_STRIDE (m_iMaxPicWidth,  16)) * m_iMaxPicHeight, pFile);
+      fflush (pFile);
+      fclose (pFile);
+    }
+    break;
+  default:
+    WelsLog (&m_pWelsTrace->m_sLogCtx, WELS_LOG_INFO, "Exclusive case, m_iCspInternal= 0x%x", m_iCspInternal);
+    break;
+  }
+#endif//DUMP_SRC_PICTURE
+  return;
+}
+}
+
+using namespace WelsEnc;
+
+int32_t WelsCreateSVCEncoder (ISVCEncoder** ppEncoder) {
+  if ((*ppEncoder = new CWelsH264SVCEncoder()) != NULL) {
+    return 0;
+  }
+
+  return 1;
+}
+
+void WelsDestroySVCEncoder (ISVCEncoder* pEncoder) {
+  CWelsH264SVCEncoder* pSVCEncoder = (CWelsH264SVCEncoder*)pEncoder;
+
+  if (pSVCEncoder) {
+    delete pSVCEncoder;
+    pSVCEncoder = NULL;
+  }
+}
+
+OpenH264Version WelsGetCodecVersion() {
+  return g_stCodecVersion;
+}
+
+void WelsGetCodecVersionEx (OpenH264Version* pVersion) {
+  *pVersion = g_stCodecVersion;
+}
+//////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/wels_enc_export.def b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/wels_enc_export.def
new file mode 100644
index 0000000000..e44d1d7e36
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/plus/src/wels_enc_export.def
@@ -0,0 +1,5 @@
+EXPORTS
+    WelsCreateSVCEncoder
+    WelsDestroySVCEncoder
+    WelsGetCodecVersion
+    WelsGetCodecVersionEx
diff --git a/third-party/openh264/third_party/openh264/src/codec/encoder/targets.mk b/third-party/openh264/third_party/openh264/src/codec/encoder/targets.mk
new file mode 100644
index 0000000000..4fb2e690ea
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/encoder/targets.mk
@@ -0,0 +1,125 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+ENCODER_SRCDIR=codec/encoder
+ENCODER_CPP_SRCS=\
+	$(ENCODER_SRCDIR)/core/src/au_set.cpp\
+	$(ENCODER_SRCDIR)/core/src/deblocking.cpp\
+	$(ENCODER_SRCDIR)/core/src/decode_mb_aux.cpp\
+	$(ENCODER_SRCDIR)/core/src/encode_mb_aux.cpp\
+	$(ENCODER_SRCDIR)/core/src/encoder.cpp\
+	$(ENCODER_SRCDIR)/core/src/encoder_data_tables.cpp\
+	$(ENCODER_SRCDIR)/core/src/encoder_ext.cpp\
+	$(ENCODER_SRCDIR)/core/src/get_intra_predictor.cpp\
+	$(ENCODER_SRCDIR)/core/src/md.cpp\
+	$(ENCODER_SRCDIR)/core/src/mv_pred.cpp\
+	$(ENCODER_SRCDIR)/core/src/nal_encap.cpp\
+	$(ENCODER_SRCDIR)/core/src/paraset_strategy.cpp\
+	$(ENCODER_SRCDIR)/core/src/picture_handle.cpp\
+	$(ENCODER_SRCDIR)/core/src/ratectl.cpp\
+	$(ENCODER_SRCDIR)/core/src/ref_list_mgr_svc.cpp\
+	$(ENCODER_SRCDIR)/core/src/sample.cpp\
+	$(ENCODER_SRCDIR)/core/src/set_mb_syn_cabac.cpp\
+	$(ENCODER_SRCDIR)/core/src/set_mb_syn_cavlc.cpp\
+	$(ENCODER_SRCDIR)/core/src/slice_multi_threading.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_base_layer_md.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_enc_slice_segment.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_encode_mb.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_encode_slice.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_mode_decision.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_motion_estimate.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_set_mb_syn_cabac.cpp\
+	$(ENCODER_SRCDIR)/core/src/svc_set_mb_syn_cavlc.cpp\
+	$(ENCODER_SRCDIR)/core/src/wels_preprocess.cpp\
+	$(ENCODER_SRCDIR)/core/src/wels_task_base.cpp\
+	$(ENCODER_SRCDIR)/core/src/wels_task_encoder.cpp\
+	$(ENCODER_SRCDIR)/core/src/wels_task_management.cpp\
+	$(ENCODER_SRCDIR)/plus/src/welsEncoderExt.cpp\
+
+ENCODER_OBJS += $(ENCODER_CPP_SRCS:.cpp=.$(OBJ))
+
+ENCODER_ASM_SRCS=\
+	$(ENCODER_SRCDIR)/core/x86/coeff.asm\
+	$(ENCODER_SRCDIR)/core/x86/dct.asm\
+	$(ENCODER_SRCDIR)/core/x86/intra_pred.asm\
+	$(ENCODER_SRCDIR)/core/x86/matrix_transpose.asm\
+	$(ENCODER_SRCDIR)/core/x86/memzero.asm\
+	$(ENCODER_SRCDIR)/core/x86/quant.asm\
+	$(ENCODER_SRCDIR)/core/x86/sample_sc.asm\
+	$(ENCODER_SRCDIR)/core/x86/score.asm\
+
+ENCODER_OBJSASM += $(ENCODER_ASM_SRCS:.asm=.$(OBJ))
+ifeq ($(ASM_ARCH), x86)
+ENCODER_OBJS += $(ENCODER_OBJSASM)
+endif
+OBJS += $(ENCODER_OBJSASM)
+
+ENCODER_ASM_ARM_SRCS=\
+	$(ENCODER_SRCDIR)/core/arm/intra_pred_neon.S\
+	$(ENCODER_SRCDIR)/core/arm/intra_pred_sad_3_opt_neon.S\
+	$(ENCODER_SRCDIR)/core/arm/memory_neon.S\
+	$(ENCODER_SRCDIR)/core/arm/pixel_neon.S\
+	$(ENCODER_SRCDIR)/core/arm/reconstruct_neon.S\
+	$(ENCODER_SRCDIR)/core/arm/svc_motion_estimation.S\
+
+ENCODER_OBJSARM += $(ENCODER_ASM_ARM_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm)
+ENCODER_OBJS += $(ENCODER_OBJSARM)
+endif
+OBJS += $(ENCODER_OBJSARM)
+
+ENCODER_ASM_ARM64_SRCS=\
+	$(ENCODER_SRCDIR)/core/arm64/intra_pred_aarch64_neon.S\
+	$(ENCODER_SRCDIR)/core/arm64/intra_pred_sad_3_opt_aarch64_neon.S\
+	$(ENCODER_SRCDIR)/core/arm64/memory_aarch64_neon.S\
+	$(ENCODER_SRCDIR)/core/arm64/pixel_aarch64_neon.S\
+	$(ENCODER_SRCDIR)/core/arm64/reconstruct_aarch64_neon.S\
+	$(ENCODER_SRCDIR)/core/arm64/svc_motion_estimation_aarch64_neon.S\
+
+ENCODER_OBJSARM64 += $(ENCODER_ASM_ARM64_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm64)
+ENCODER_OBJS += $(ENCODER_OBJSARM64)
+endif
+OBJS += $(ENCODER_OBJSARM64)
+
+ENCODER_ASM_MIPS_MMI_SRCS=\
+	$(ENCODER_SRCDIR)/core/mips/dct_mmi.c\
+	$(ENCODER_SRCDIR)/core/mips/quant_mmi.c\
+	$(ENCODER_SRCDIR)/core/mips/score_mmi.c\
+
+ENCODER_OBJSMIPS_MMI += $(ENCODER_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))
+
+ENCODER_ASM_MIPS_MSA_SRCS=\
+
+ENCODER_OBJSMIPS_MSA += $(ENCODER_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))
+ifeq ($(ASM_ARCH), mips)
+ifeq ($(ENABLE_MMI), Yes)
+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MMI)
+endif
+ifeq ($(ENABLE_MSA), Yes)
+ENCODER_OBJS += $(ENCODER_OBJSMIPS_MSA)
+endif
+endif
+OBJS += $(ENCODER_OBJSMIPS_MMI)
+OBJS += $(ENCODER_OBJSMIPS_MSA)
+
+OBJS += $(ENCODER_OBJS)
+
+$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c $(CXX_O) $<
+
+$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.c
+	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c $(CXX_O) $<
+
+$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.asm
+	$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(ENCODER_ASMFLAGS) $(ENCODER_ASM_INCLUDES) -o $@ $<
+
+$(ENCODER_SRCDIR)/%.$(OBJ): $(ENCODER_SRCDIR)/%.S
+	$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(ENCODER_CFLAGS) $(ENCODER_INCLUDES) -c -o $@ $<
+
+$(LIBPREFIX)encoder.$(LIBSUFFIX): $(ENCODER_OBJS)
+	$(QUIET)rm -f $@
+	$(QUIET_AR)$(AR) $(AR_OPTS) $+
+
+libraries: $(LIBPREFIX)encoder.$(LIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)encoder.$(LIBSUFFIX)
diff --git a/third-party/openh264/third_party/openh264/src/codec/meson.build b/third-party/openh264/third_party/openh264/src/codec/meson.build
new file mode 100644
index 0000000000..7a427f498d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/meson.build
@@ -0,0 +1,9 @@
+subdir('common')
+subdir('decoder')
+subdir('encoder')
+subdir('processing')
+if not ['android', 'ios'].contains(system)
+  # also disabled in the Makefile for these platforms
+  subdir('console')
+endif
+subdir('api')
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/.gitignore b/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/.gitignore
new file mode 100644
index 0000000000..6fb0c745fa
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/.gitignore
@@ -0,0 +1,8 @@
+# Files generated by Visual Studio 2008
+*.user
+
+Win32
+x64
+
+# Files generated by upgrading the project files
+*.vcxproj*
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/WelsVP.vcproj b/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/WelsVP.vcproj
new file mode 100644
index 0000000000..e0ffc997eb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/build/win32/WelsVP.vcproj
@@ -0,0 +1,836 @@
+<?xml version="1.0" encoding="gb2312"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="WelsVP"
+	ProjectGUID="{E8DFAFA1-8DAC-4127-8D27-FBD5819EE562}"
+	RootNamespace="WelsVP"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+		<DefaultToolFile
+			FileName="masm.rules"
+		/>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\welsvp.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="../../src/common/WelsVP.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
+				PreprocessorDefinitions="_DEBUG;_USRDLL;X86_ASM"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\welsvp.dll"
+				LinkIncremental="2"
+				ModuleDefinitionFile="../../src/common/WelsVP.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\welsvp.dll"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				EnableUAC="false"
+				ModuleDefinitionFile="../../src/common/WelsVP.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory=".\..\..\..\..\bin\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+				CommandLine=""
+			/>
+			<Tool
+				Name="MASM"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				InlineFunctionExpansion="2"
+				FavorSizeOrSpeed="1"
+				AdditionalIncludeDirectories="../../../common/inc;../../interface;../../src/common"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;X86_ASM"
+				StringPooling="true"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="$(OutDir)\welsvp.dll"
+				LinkIncremental="1"
+				GenerateManifest="false"
+				EnableUAC="false"
+				ModuleDefinitionFile="../../src/common/WelsVP.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+				CommandLine=""
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\common\src\cpu.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\intra_pred_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\memory.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\sad_common.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\WelsFrameWork.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\WelsFrameWorkEx.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\src\WelsThreadLib.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Interface"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\interface\IWelsVP.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\resource.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\..\src\common\WelsVP.def"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\WelsVP.rc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			>
+			<File
+				RelativePath="..\..\src\common\common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\cpu.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\intra_pred_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\memory.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\sad_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\typedef.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\util.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\common\WelsFrameWork.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\common\inc\WelsThreadLib.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ASM"
+			>
+			<File
+				RelativePath="..\..\..\common\x86\cpuid.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\x86\denoisefilter.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\x86\downsample_bilinear.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\intra_pred_com.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\common\x86\satd_sad.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\src\x86\vaa.asm"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win32 -DPREFIX -DX86_32 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="nasm -I$(InputDir) -I$(InputDir)/../../../common/x86/ -f win64 -DWIN64 -o $(IntDir)\$(InputName).obj $(InputPath)&#x0D;&#x0A;"
+						Outputs="$(IntDir)\$(InputName).obj"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="SceneChangeDetection"
+			>
+			<File
+				RelativePath="..\..\src\scenechangedetection\SceneChangeDetection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scenechangedetection\SceneChangeDetection.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Denoise"
+			>
+			<File
+				RelativePath="..\..\src\denoise\denoise.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\denoise\denoise.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\denoise\denoise_filter.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="VAACalc"
+			>
+			<File
+				RelativePath="..\..\src\vaacalc\vaacalcfuncs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\vaacalc\vaacalculation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\vaacalc\vaacalculation.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="BackgroundDetection"
+			>
+			<File
+				RelativePath="..\..\src\backgrounddetection\BackgroundDetection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\backgrounddetection\BackgroundDetection.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="AdaptiveQuantization"
+			>
+			<File
+				RelativePath="..\..\src\adaptivequantization\AdaptiveQuantization.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\adaptivequantization\AdaptiveQuantization.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Downsample"
+			>
+			<File
+				RelativePath="..\..\src\downsample\downsample.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\downsample\downsample.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\downsample\downsamplefuncs.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ComplexityAnalysis"
+			>
+			<File
+				RelativePath="..\..\src\complexityanalysis\ComplexityAnalysis.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\complexityanalysis\ComplexityAnalysis.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ImageRotate"
+			>
+			<File
+				RelativePath="..\..\src\imagerotate\imagerotate.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\imagerotate\imagerotate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\imagerotate\imagerotatefuncs.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="ScrollDetection"
+			>
+			<File
+				RelativePath="..\..\src\scrolldetection\ScrollDetection.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scrolldetection\ScrollDetection.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scrolldetection\ScrollDetectionFuncs.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\scrolldetection\ScrollDetectionFuncs.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/interface/IWelsVP.h b/third-party/openh264/third_party/openh264/src/codec/processing/interface/IWelsVP.h
new file mode 100644
index 0000000000..8a787941b9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/interface/IWelsVP.h
@@ -0,0 +1,310 @@
+/*!
+ * \copy
+ *     Copyright (c)  2004-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file        :  IWelsVP.h
+ *
+ * \brief       :  Interface of wels video processor class
+ *
+ * \date        :  2011/01/04
+ *
+ * \description :  1. should support both C/C++ style interface
+ *                 2. should concern with the feature extension requirement
+ *                 3. should care the usage of "char"==>
+ *                     1) value char  : signed char/unsigned char
+ *                     2) string char : char
+ *
+ *************************************************************************************
+ */
+
+#ifndef IWELSVP_H_
+#define IWELSVP_H_
+
+#define WELSVP_MAJOR_VERSION   1
+#define WELSVP_MINOR_VERSION   1
+#define WELSVP_VERSION         ((WELSVP_MAJOR_VERSION << 8) + WELSVP_MINOR_VERSION)
+
+typedef enum {
+  RET_SUCCESS          =  0,
+  RET_FAILED           = -1,
+  RET_INVALIDPARAM     = -2,
+  RET_OUTOFMEMORY      = -3,
+  RET_NOTSUPPORTED     = -4,
+  RET_UNEXPECTED       = -5,
+  RET_NEEDREINIT       = -6
+} EResult;
+
+typedef enum {
+  VIDEO_FORMAT_NULL       = 0,   /* invalid format   */
+  /*rgb color formats*/
+  VIDEO_FORMAT_RGB        = 1,   /* rgb 24bits       */
+  VIDEO_FORMAT_RGBA       = 2,   /* rgba             */
+  VIDEO_FORMAT_RGB555     = 3,   /* rgb555           */
+  VIDEO_FORMAT_RGB565     = 4,   /* rgb565           */
+  VIDEO_FORMAT_BGR        = 5,   /* bgr 24bits       */
+  VIDEO_FORMAT_BGRA       = 6,   /* bgr 32bits       */
+  VIDEO_FORMAT_ABGR       = 7,   /* abgr             */
+  VIDEO_FORMAT_ARGB       = 8,   /* argb             */
+
+  /*yuv color formats*/
+  VIDEO_FORMAT_YUY2       = 20,   /* yuy2             */
+  VIDEO_FORMAT_YVYU       = 21,   /* yvyu             */
+  VIDEO_FORMAT_UYVY       = 22,   /* uyvy             */
+  VIDEO_FORMAT_I420       = 23,   /* yuv 4:2:0 planar */
+  VIDEO_FORMAT_YV12       = 24,   /* yuv 4:2:0 planar */
+  VIDEO_FORMAT_INTERNAL   = 25,   /* Only Used for SVC decoder testbed */
+  VIDEO_FORMAT_NV12       = 26,   /* y planar + uv packed */
+  VIDEO_FORMAT_I422       = 27,   /* yuv 4:2:2 planar */
+  VIDEO_FORMAT_I444       = 28,   /* yuv 4:4:4 planar */
+  VIDEO_FORMAT_YUYV       = 20,   /* yuv 4:2:2 packed */
+
+  VIDEO_FORMAT_RGB24      = 1,
+  VIDEO_FORMAT_RGB32      = 2,
+  VIDEO_FORMAT_RGB24_INV  = 5,
+  VIDEO_FORMAT_RGB32_INV  = 6,
+  VIDEO_FORMAT_RGB555_INV = 7,
+  VIDEO_FORMAT_RGB565_INV = 8,
+  VIDEO_FORMAT_YUV2       = 21,
+  VIDEO_FORMAT_420        = 23,
+
+  VIDEO_FORMAT_VFlip      = 0x80000000
+} EVideoFormat;
+
+typedef enum {
+  BUFFER_HOSTMEM  = 0,
+  BUFFER_SURFACE
+} EPixMapBufferProperty;
+
+typedef struct {
+  int iRectTop;
+  int iRectLeft;
+  int iRectWidth;
+  int iRectHeight;
+} SRect;
+
+typedef struct {
+  void*        pPixel[3];
+  int          iSizeInBits;
+  int          iStride[3];
+  SRect        sRect;
+  EVideoFormat eFormat;
+  EPixMapBufferProperty eProperty;//not use? to remove? but how about the size of SPixMap?
+} SPixMap;
+
+typedef enum {
+  METHOD_NULL              = 0,
+  METHOD_COLORSPACE_CONVERT    ,//not support yet
+  METHOD_DENOISE              ,
+  METHOD_SCENE_CHANGE_DETECTION_VIDEO ,
+  METHOD_SCENE_CHANGE_DETECTION_SCREEN ,
+  METHOD_DOWNSAMPLE            ,
+  METHOD_VAA_STATISTICS        ,
+  METHOD_BACKGROUND_DETECTION  ,
+  METHOD_ADAPTIVE_QUANT ,
+  METHOD_COMPLEXITY_ANALYSIS   ,
+  METHOD_COMPLEXITY_ANALYSIS_SCREEN,
+  METHOD_IMAGE_ROTATE          ,
+  METHOD_SCROLL_DETECTION,
+  METHOD_MASK
+} EMethods;
+
+//-----------------------------------------------------------------//
+//  Algorithm parameters define
+//-----------------------------------------------------------------//
+
+typedef enum {
+  SIMILAR_SCENE,   //similar scene
+  MEDIUM_CHANGED_SCENE,   //medium changed scene
+  LARGE_CHANGED_SCENE     //large changed scene
+} ESceneChangeIdc;
+
+typedef enum {
+  NO_STATIC,  // motion block
+  COLLOCATED_STATIC, // collocated static block
+  SCROLLED_STATIC,  // scrolled static block
+  BLOCK_STATIC_IDC_ALL
+} EStaticBlockIdc;
+
+typedef struct {
+  SRect sMaskRect;
+  bool bMaskInfoAvailable;
+  int iScrollMvX;
+  int iScrollMvY;
+  bool bScrollDetectFlag; // 0:false ; 1:ltr; 2: scene change
+} SScrollDetectionParam;
+
+typedef struct {
+  ESceneChangeIdc eSceneChangeIdc; // SIMILAR_SCENE, MEDIUM_CHANGED_SCENE, LARGE_CHANGED_SCENE
+  int             iMotionBlockNum; // Number of motion blocks
+  long long       iFrameComplexity; // frame complexity
+  unsigned char* pStaticBlockIdc;   // static block idc
+  SScrollDetectionParam sScrollResult; //results from scroll detection
+} SSceneChangeResult;
+
+typedef struct {
+  unsigned char* pCurY;             // Y data of current frame
+  unsigned char* pRefY;             // Y data of pRef frame for diff calc
+  int (*pSad8x8)[4];                // sad of 8x8, every 4 in the same 16x16 get together
+  int* pSsd16x16;                   // sum of square difference of 16x16
+  int* pSum16x16;                   // sum of 16x16
+  int* pSumOfSquare16x16;           // sum of square of 16x16
+  int   (*pSumOfDiff8x8)[4];
+  unsigned char (*pMad8x8)[4];
+  int iFrameSad;                    // sad of frame
+} SVAACalcResult;
+
+typedef struct {
+  int iCalcVar;
+  int iCalcBgd;
+  int iCalcSsd;
+  int iReserved;
+  SVAACalcResult*  pCalcResult;
+} SVAACalcParam;
+
+typedef struct {
+  signed char*     pBackgroundMbFlag;
+  SVAACalcResult*  pCalcRes;
+} SBGDInterface;
+
+typedef enum {
+  AQ_QUALITY_MODE,   //Quality mode
+  AQ_BITRATE_MODE    //Bitrate mode
+} EAQModes;
+
+typedef struct {
+  unsigned short    uiMotionIndex;
+  unsigned short    uiTextureIndex;
+} SMotionTextureUnit;
+
+typedef struct {
+  int                  iAdaptiveQuantMode; // 0:quality mode, 1:bitrates mode
+  SVAACalcResult*      pCalcResult;
+  SMotionTextureUnit*  pMotionTextureUnit;
+
+  signed char*      pMotionTextureIndexToDeltaQp;
+  int               iAverMotionTextureIndexToDeltaQp; // *AQ_STEP_INT_MULTIPLY
+} SAdaptiveQuantizationParam;
+
+typedef enum {
+  FRAME_SAD     =  0,
+  GOM_SAD       = -1,
+  GOM_VAR       = -2
+} EComplexityAnalysisMode;
+
+typedef struct {
+  int  iComplexityAnalysisMode;
+  int  iCalcBgd;
+  int  iMbNumInGom;
+  long long  iFrameComplexity;
+  int*  pGomComplexity;
+  int*  pGomForegroundBlockNum;
+  signed char*  pBackgroundMbFlag;
+  unsigned int* uiRefMbType;
+  SVAACalcResult*  pCalcResult;
+} SComplexityAnalysisParam;
+
+typedef struct {
+  int  iMbRowInGom;
+  int*  pGomComplexity;
+  int  iGomNumInFrame;
+  long long  iFrameComplexity; //255*255(MaxMbSAD)*36864(MaxFS) make the highest bit of 32-bit integer 1
+  int  iIdrFlag;
+  SScrollDetectionParam sScrollResult;
+} SComplexityAnalysisScreenParam;
+/////////////////////////////////////////////////////////////////////////////////////////////
+
+typedef struct {
+  void*    pCtx;
+  EResult (*Init) (void* pCtx, int iType, void* pCfg);
+  EResult (*Uninit) (void* pCtx, int iType);
+  EResult (*Flush) (void* pCtx, int iType);
+  EResult (*Process) (void* pCtx, int iType, SPixMap* pSrc, SPixMap* dst);
+  EResult (*Get) (void* pCtx, int iType, void* pParam);
+  EResult (*Set) (void* pCtx, int iType, void* pParam);
+  EResult (*SpecialFeature) (void* pCtx, int iType, void* pIn, void* pOut);
+} IWelsVPc;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)  /* C++ style interface */
+
+class IWelsVP {
+ public:
+  virtual ~IWelsVP() {}
+
+ public:
+  virtual EResult Init (int iType, void* pCfg) = 0;
+  virtual EResult Uninit (int iType) = 0;
+  virtual EResult Flush (int iType) = 0;
+  virtual EResult Process (int iType, SPixMap* pSrc, SPixMap* dst) = 0;
+  virtual EResult Get (int iType, void* pParam) = 0;
+  virtual EResult Set (int iType, void* pParam) = 0;
+  virtual EResult SpecialFeature (int iType, void* pIn, void* pOut) = 0;
+};
+
+/* Recommend to invoke the interface via the micro for convenient */
+#define IWelsVPFunc_Init(p, a, b)                  (p)->Init(a, b)
+#define IWelsVPFunc_Uninit(p, a)                   (p)->Uninit(a)
+#define IWelsVPFunc_Flush(p, a)                    (p)->Flush(a)
+#define IWelsVPFunc_Process(p, a, b, c)            (p)->Process(a, b, c)
+#define IWelsVPFunc_Get(p, a, b)                   (p)->Get(a, b)
+#define IWelsVPFunc_Set(p, a, b)                   (p)->Set(a, b)
+#define IWelsVPFunc_SpecialFeature(p, a, b, c)     (p)->SpecialFeature(a, b, c)
+
+/* C++ interface version */
+#define WELSVP_INTERFACE_VERION                    (0x8000 + (WELSVP_VERSION & 0x7fff))
+#define WELSVP_EXTERNC_BEGIN                       extern "C" {
+#define WELSVP_EXTERNC_END                         }
+
+#else    /* C style interface */
+
+/* Recommend to invoke the interface via the micro for convenient */
+#define IWelsVPFunc_Init(p, a, b)                  (p)->Init(p->h, a, b)
+#define IWelsVPFunc_Uninit(p, a)                   (p)->Uninit(p->h, a)
+#define IWelsVPFunc_Flush(p, a)                    (p)->Flush(p->h, a)
+#define IWelsVPFunc_Process(p, a, b, c)            (p)->Process(p->h, a, b, c)
+#define IWelsVPFunc_Get(p, a, b)                   (p)->Get(p->h, a, b)
+#define IWelsVPFunc_Set(p, a, b)                   (p)->Set(p->h, a, b)
+#define IWelsVPFunc_SpecialFeature(p, a, b, c)     (p)->SpecialFeature(p->h, a, b, c)
+
+/* C interface version */
+#define WELSVP_INTERFACE_VERION                    (0x0001 + (WELSVP_VERSION & 0x7fff))
+#define WELSVP_EXTERNC_BEGIN
+#define WELSVP_EXTERNC_END
+
+#endif
+
+WELSVP_EXTERNC_BEGIN
+EResult WelsCreateVpInterface (void** ppCtx, int iVersion /*= WELSVP_INTERFACE_VERION*/);
+EResult WelsDestroyVpInterface (void* pCtx , int iVersion /*= WELSVP_INTERFACE_VERION*/);
+WELSVP_EXTERNC_END
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+#endif // IWELSVP_H_
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/meson.build b/third-party/openh264/third_party/openh264/src/codec/processing/meson.build
new file mode 100644
index 0000000000..dde3f33f43
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/meson.build
@@ -0,0 +1,59 @@
+cpp_sources = [
+  'src/adaptivequantization/AdaptiveQuantization.cpp',
+  'src/backgrounddetection/BackgroundDetection.cpp',
+  'src/common/memory.cpp',
+  'src/common/WelsFrameWork.cpp',
+  'src/common/WelsFrameWorkEx.cpp',
+  'src/complexityanalysis/ComplexityAnalysis.cpp',
+  'src/denoise/denoise.cpp',
+  'src/denoise/denoise_filter.cpp',
+  'src/downsample/downsample.cpp',
+  'src/downsample/downsamplefuncs.cpp',
+  'src/imagerotate/imagerotate.cpp',
+  'src/imagerotate/imagerotatefuncs.cpp',
+  'src/scenechangedetection/SceneChangeDetection.cpp',
+  'src/scrolldetection/ScrollDetection.cpp',
+  'src/scrolldetection/ScrollDetectionFuncs.cpp',
+  'src/vaacalc/vaacalcfuncs.cpp',
+  'src/vaacalc/vaacalculation.cpp',
+]
+
+objs_asm = []
+if cpu_family in ['x86', 'x86_64']
+  asm_sources = [
+    'src/x86/denoisefilter.asm',
+    'src/x86/downsample_bilinear.asm',
+    'src/x86/vaa.asm',
+  ]
+  objs_asm = asm_gen.process(asm_sources)
+elif cpu_family == 'arm'
+  asm_sources = [
+    'src/arm/adaptive_quantization.S',
+    'src/arm/down_sample_neon.S',
+    'src/arm/pixel_sad_neon.S',
+    'src/arm/vaa_calc_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+elif cpu_family == 'aarch64'
+  asm_sources = [
+	'src/arm64/adaptive_quantization_aarch64_neon.S',
+	'src/arm64/down_sample_aarch64_neon.S',
+	'src/arm64/pixel_sad_aarch64_neon.S',
+	'src/arm64/vaa_calc_aarch64_neon.S',
+  ]
+  if use_asm_gen
+    objs_asm = asm_gen.process(asm_sources)
+  else
+    cpp_sources += asm_sources
+  endif
+else
+  error('Unsupported cpu family @0@'.format(cpu_family))
+endif
+
+libprocessing = static_library('processing', cpp_sources, objs_asm,
+  include_directories: [inc, processing_inc, casm_inc],
+  dependencies: deps)
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp
new file mode 100644
index 0000000000..7deefa6181
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.cpp
@@ -0,0 +1,270 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#include "AdaptiveQuantization.h"
+#include "macros.h"
+WELSVP_NAMESPACE_BEGIN
+
+
+
+#define AVERAGE_TIME_MOTION                   (3000) //0.3046875 // 1/4 + 1/16 - 1/128 ~ 0.3 *AQ_TIME_INT_MULTIPLY
+#define AVERAGE_TIME_TEXTURE_QUALITYMODE  (10000) //0.5 // 1/2 *AQ_TIME_INT_MULTIPLY
+#define AVERAGE_TIME_TEXTURE_BITRATEMODE  (8750) //0.5 // 1/2 *AQ_TIME_INT_MULTIPLY
+#define MODEL_ALPHA                           (9910) //1.5 //1.1102 *AQ_TIME_INT_MULTIPLY
+#define MODEL_TIME                            (58185) //9.0 //5.9842 *AQ_TIME_INT_MULTIPLY
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CAdaptiveQuantization::CAdaptiveQuantization (int32_t iCpuFlag) {
+  m_CPUFlag = iCpuFlag;
+  m_eMethod   = METHOD_ADAPTIVE_QUANT;
+  m_pfVar   = NULL;
+  WelsMemset (&m_sAdaptiveQuantParam, 0, sizeof (m_sAdaptiveQuantParam));
+  WelsInitVarFunc (m_pfVar, m_CPUFlag);
+}
+
+CAdaptiveQuantization::~CAdaptiveQuantization() {
+}
+
+EResult CAdaptiveQuantization::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  EResult eReturn = RET_INVALIDPARAM;
+
+  int32_t iWidth     = pSrcPixMap->sRect.iRectWidth;
+  int32_t iHeight    = pSrcPixMap->sRect.iRectHeight;
+  int32_t iMbWidth  = iWidth  >> 4;
+  int32_t iMbHeight = iHeight >> 4;
+  int32_t iMbTotalNum    = iMbWidth * iMbHeight;
+
+  SMotionTextureUnit* pMotionTexture = NULL;
+  SVAACalcResult*     pVaaCalcResults = NULL;
+  int32_t   iMotionTextureIndexToDeltaQp = 0;
+  int32_t iAverMotionTextureIndexToDeltaQp = 0;  // double to uint32
+  int64_t iAverageMotionIndex = 0;      // double to float
+  int64_t iAverageTextureIndex = 0;
+
+  int64_t iQStep = 0;
+  int64_t iLumaMotionDeltaQp = 0;
+  int64_t iLumaTextureDeltaQp = 0;
+
+  uint8_t* pRefFrameY = NULL, *pCurFrameY = NULL;
+  int32_t iRefStride = 0, iCurStride = 0;
+
+  uint8_t* pRefFrameTmp = NULL, *pCurFrameTmp = NULL;
+  int32_t i = 0, j = 0;
+
+  pRefFrameY = (uint8_t*)pRefPixMap->pPixel[0];
+  pCurFrameY = (uint8_t*)pSrcPixMap->pPixel[0];
+
+  iRefStride  = pRefPixMap->iStride[0];
+  iCurStride  = pSrcPixMap->iStride[0];
+
+  /////////////////////////////////////// motion //////////////////////////////////
+  //  motion MB residual variance
+  iAverageMotionIndex = 0;
+  iAverageTextureIndex = 0;
+  pMotionTexture = m_sAdaptiveQuantParam.pMotionTextureUnit;
+  pVaaCalcResults = m_sAdaptiveQuantParam.pCalcResult;
+
+  if (pVaaCalcResults->pRefY == pRefFrameY && pVaaCalcResults->pCurY == pCurFrameY) {
+    int32_t iMbIndex = 0;
+    int32_t iSumDiff, iSQDiff, uiSum, iSQSum;
+    for (j = 0; j < iMbHeight; j ++) {
+      pRefFrameTmp  = pRefFrameY;
+      pCurFrameTmp  = pCurFrameY;
+      for (i = 0; i < iMbWidth; i++) {
+        iSumDiff =  pVaaCalcResults->pSad8x8[iMbIndex][0];
+        iSumDiff += pVaaCalcResults->pSad8x8[iMbIndex][1];
+        iSumDiff += pVaaCalcResults->pSad8x8[iMbIndex][2];
+        iSumDiff += pVaaCalcResults->pSad8x8[iMbIndex][3];
+
+        iSQDiff = pVaaCalcResults->pSsd16x16[iMbIndex];
+        uiSum = pVaaCalcResults->pSum16x16[iMbIndex];
+        iSQSum = pVaaCalcResults->pSumOfSquare16x16[iMbIndex];
+
+        iSumDiff = iSumDiff >> 8;
+        pMotionTexture->uiMotionIndex = (iSQDiff >> 8) - (iSumDiff * iSumDiff);
+
+        uiSum = uiSum >> 8;
+        pMotionTexture->uiTextureIndex = (iSQSum >> 8) - (uiSum * uiSum);
+
+        iAverageMotionIndex += pMotionTexture->uiMotionIndex;
+        iAverageTextureIndex += pMotionTexture->uiTextureIndex;
+        pMotionTexture++;
+        ++iMbIndex;
+        pRefFrameTmp += MB_WIDTH_LUMA;
+        pCurFrameTmp += MB_WIDTH_LUMA;
+      }
+      pRefFrameY += (iRefStride) << 4;
+      pCurFrameY += (iCurStride) << 4;
+    }
+  } else {
+    for (j = 0; j < iMbHeight; j ++) {
+      pRefFrameTmp  = pRefFrameY;
+      pCurFrameTmp  = pCurFrameY;
+      for (i = 0; i < iMbWidth; i++) {
+        m_pfVar (pRefFrameTmp, iRefStride, pCurFrameTmp, iCurStride, pMotionTexture);
+        iAverageMotionIndex += pMotionTexture->uiMotionIndex;
+        iAverageTextureIndex += pMotionTexture->uiTextureIndex;
+        pMotionTexture++;
+        pRefFrameTmp += MB_WIDTH_LUMA;
+        pCurFrameTmp += MB_WIDTH_LUMA;
+
+      }
+      pRefFrameY += (iRefStride) << 4;
+      pCurFrameY += (iCurStride) << 4;
+    }
+  }
+  iAverageMotionIndex = WELS_DIV_ROUND64 (iAverageMotionIndex * AQ_INT_MULTIPLY, iMbTotalNum);
+  iAverageTextureIndex = WELS_DIV_ROUND64 (iAverageTextureIndex * AQ_INT_MULTIPLY, iMbTotalNum);
+  if ((iAverageMotionIndex <= AQ_PESN) && (iAverageMotionIndex >= -AQ_PESN)) {
+    iAverageMotionIndex = AQ_INT_MULTIPLY;
+  }
+  if ((iAverageTextureIndex <= AQ_PESN) && (iAverageTextureIndex >= -AQ_PESN)) {
+    iAverageTextureIndex = AQ_INT_MULTIPLY;
+  }
+  //  motion mb residual map to QP
+  //  texture mb original map to QP
+  iAverMotionTextureIndexToDeltaQp = 0;
+  iAverageMotionIndex = WELS_DIV_ROUND64 (AVERAGE_TIME_MOTION * iAverageMotionIndex, AQ_TIME_INT_MULTIPLY);
+
+  if (m_sAdaptiveQuantParam.iAdaptiveQuantMode == AQ_QUALITY_MODE) {
+    iAverageTextureIndex = WELS_DIV_ROUND64 (AVERAGE_TIME_TEXTURE_QUALITYMODE * iAverageTextureIndex, AQ_TIME_INT_MULTIPLY);
+  } else {
+    iAverageTextureIndex = WELS_DIV_ROUND64 (AVERAGE_TIME_TEXTURE_BITRATEMODE * iAverageTextureIndex, AQ_TIME_INT_MULTIPLY);
+  }
+
+  int64_t iAQ_EPSN = - ((int64_t)AQ_PESN * AQ_TIME_INT_MULTIPLY * AQ_QSTEP_INT_MULTIPLY / AQ_INT_MULTIPLY);
+  pMotionTexture = m_sAdaptiveQuantParam.pMotionTextureUnit;
+  for (j = 0; j < iMbHeight; j ++) {
+    for (i = 0; i < iMbWidth; i++) {
+      int64_t a = WELS_DIV_ROUND64 ((int64_t) (pMotionTexture->uiTextureIndex) * AQ_INT_MULTIPLY * AQ_TIME_INT_MULTIPLY,
+                                    iAverageTextureIndex);
+      iQStep = WELS_DIV_ROUND64 ((a - AQ_TIME_INT_MULTIPLY) * AQ_QSTEP_INT_MULTIPLY, (a + MODEL_ALPHA));
+      iLumaTextureDeltaQp = MODEL_TIME * iQStep;// range +- 6
+
+      iMotionTextureIndexToDeltaQp = ((int32_t) (iLumaTextureDeltaQp / (AQ_TIME_INT_MULTIPLY)));
+
+      a = WELS_DIV_ROUND64 (((int64_t)pMotionTexture->uiMotionIndex) * AQ_INT_MULTIPLY * AQ_TIME_INT_MULTIPLY,
+                            iAverageMotionIndex);
+      iQStep = WELS_DIV_ROUND64 ((a - AQ_TIME_INT_MULTIPLY) * AQ_QSTEP_INT_MULTIPLY, (a + MODEL_ALPHA));
+      iLumaMotionDeltaQp = MODEL_TIME * iQStep;// range +- 6
+
+      if ((m_sAdaptiveQuantParam.iAdaptiveQuantMode == AQ_QUALITY_MODE && iLumaMotionDeltaQp < iAQ_EPSN)
+          || (m_sAdaptiveQuantParam.iAdaptiveQuantMode == AQ_BITRATE_MODE)) {
+        iMotionTextureIndexToDeltaQp += ((int32_t) (iLumaMotionDeltaQp / (AQ_TIME_INT_MULTIPLY)));
+      }
+
+      m_sAdaptiveQuantParam.pMotionTextureIndexToDeltaQp[j * iMbWidth + i] = (int8_t) (iMotionTextureIndexToDeltaQp /
+          AQ_QSTEP_INT_MULTIPLY);
+      iAverMotionTextureIndexToDeltaQp += iMotionTextureIndexToDeltaQp;
+      pMotionTexture++;
+    }
+  }
+
+  m_sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp = iAverMotionTextureIndexToDeltaQp / iMbTotalNum;
+
+  eReturn = RET_SUCCESS;
+
+  return eReturn;
+}
+
+
+
+EResult CAdaptiveQuantization::Set (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  m_sAdaptiveQuantParam = * (SAdaptiveQuantizationParam*)pParam;
+
+  return RET_SUCCESS;
+}
+
+EResult CAdaptiveQuantization::Get (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  SAdaptiveQuantizationParam* sAdaptiveQuantParam = (SAdaptiveQuantizationParam*)pParam;
+
+  sAdaptiveQuantParam->iAverMotionTextureIndexToDeltaQp = m_sAdaptiveQuantParam.iAverMotionTextureIndexToDeltaQp;
+
+  return RET_SUCCESS;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+
+void CAdaptiveQuantization::WelsInitVarFunc (PVarFunc& pfVar,  int32_t iCpuFlag) {
+  pfVar = SampleVariance16x16_c;
+
+#ifdef X86_ASM
+  if (iCpuFlag & WELS_CPU_SSE2) {
+    pfVar = SampleVariance16x16_sse2;
+  }
+#endif
+#ifdef HAVE_NEON
+  if (iCpuFlag & WELS_CPU_NEON) {
+    pfVar = SampleVariance16x16_neon;
+  }
+#endif
+#ifdef HAVE_NEON_AARCH64
+  if (iCpuFlag & WELS_CPU_NEON) {
+    pfVar = SampleVariance16x16_AArch64_neon;
+  }
+#endif
+}
+
+void SampleVariance16x16_c (uint8_t* pRefY, int32_t iRefStride, uint8_t* pSrcY, int32_t iSrcStride,
+                            SMotionTextureUnit* pMotionTexture) {
+  uint32_t uiCurSquare = 0,  uiSquare = 0;
+  uint16_t uiCurSum = 0,  uiSum = 0;
+
+  for (int32_t y = 0; y < MB_WIDTH_LUMA; y++) {
+    for (int32_t x = 0; x < MB_WIDTH_LUMA; x++) {
+      uint32_t uiDiff = WELS_ABS (pRefY[x] - pSrcY[x]);
+      uiSum += uiDiff;
+      uiSquare += uiDiff * uiDiff;
+
+      uiCurSum += pSrcY[x];
+      uiCurSquare += pSrcY[x] * pSrcY[x];
+    }
+    pRefY += iRefStride;
+    pSrcY += iSrcStride;
+  }
+
+  uiSum = uiSum >> 8;
+  pMotionTexture->uiMotionIndex = (uiSquare >> 8) - (uiSum * uiSum);
+
+  uiCurSum = uiCurSum >> 8;
+  pMotionTexture->uiTextureIndex = (uiCurSquare >> 8) - (uiCurSum * uiCurSum);
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.h
new file mode 100644
index 0000000000..4d04a09c2e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/adaptivequantization/AdaptiveQuantization.h
@@ -0,0 +1,97 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file         :  AdaptiveQuantization.h
+ *
+ * \brief        :  adaptive quantization class of wels video processor class
+ *
+ * \date         :  2011/03/21
+ *
+ * \description  :  1. rewrite the package code of scene change detection class
+ *
+ */
+
+#ifndef WELSVP_ADAPTIVEQUANTIZATION_H
+#define WELSVP_ADAPTIVEQUANTIZATION_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+#include "cpu.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef void (VarFunc) (uint8_t* pRefY, int32_t iRefStrideY, uint8_t* pSrc, int32_t iSrcStrideY,
+                        SMotionTextureUnit* pMotionTexture);
+
+typedef VarFunc*   PVarFunc;
+
+VarFunc      SampleVariance16x16_c;
+
+#ifdef X86_ASM
+WELSVP_EXTERN_C_BEGIN
+VarFunc      SampleVariance16x16_sse2;
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON
+WELSVP_EXTERN_C_BEGIN
+VarFunc      SampleVariance16x16_neon;
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+WELSVP_EXTERN_C_BEGIN
+VarFunc      SampleVariance16x16_AArch64_neon;
+WELSVP_EXTERN_C_END
+#endif
+
+class CAdaptiveQuantization : public IStrategy {
+ public:
+  CAdaptiveQuantization (int32_t iCpuFlag);
+  ~CAdaptiveQuantization();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pRef);
+  EResult Set (int32_t iType, void* pParam);
+  EResult Get (int32_t iType, void* pParam);
+
+ private:
+  void WelsInitVarFunc (PVarFunc& pfVar, int32_t iCpuFlag);
+
+ private:
+  PVarFunc                      m_pfVar;
+  int32_t                       m_CPUFlag;
+  SAdaptiveQuantizationParam    m_sAdaptiveQuantParam;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/adaptive_quantization.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/adaptive_quantization.S
new file mode 100644
index 0000000000..da5b9075f9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/adaptive_quantization.S
@@ -0,0 +1,110 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro SQR_ADD_16BYTES arg0, arg1, arg2
+    vmull.u8 q3, \arg0, \arg0
+    vmull.u8 q8, \arg1, \arg1
+    vpadal.u16 \arg2, q3
+    vpadal.u16 \arg2, q8
+.endm
+
+
+WELS_ASM_FUNC_BEGIN SampleVariance16x16_neon
+    stmdb sp!, {r4}
+
+    vld1.8   {q15}, [r0], r1 //save the ref data (16bytes)
+    vld1.8   {q14}, [r2], r3 //save the src data (16bytes)
+
+
+    vabd.u8  q13, q14, q15
+    vmull.u8 q12, d27, d27
+    vmull.u8 q11, d26, d26
+    vaddl.u16 q12, d24, d25
+    vpadal.u16 q12, q11     //sqr
+
+    vaddl.u8 q13, d26, d27 //sum
+
+    vaddl.u8 q10, d28, d29 //sum_cur
+
+    vmull.u8 q9,  d29, d29
+    vmull.u8 q8,  d28, d28
+    vaddl.u16 q9, d18, d19       //sqr_cur
+    vpadal.u16 q9, q8
+
+    mov r4, #15
+pixel_var_16x16_loop0:
+
+    vld1.8 {q0}, [r0], r1 //save the ref data (16bytes)
+    vld1.8 {q1}, [r2], r3 //save the src data (16bytes)
+
+    vabd.u8 q2, q0, q1
+
+    //q10 save sum_cur
+    vpadal.u8 q10, q1
+
+    //q12 save sqr
+    SQR_ADD_16BYTES d4, d5, q12
+
+    //q13 save sum
+    vpadal.u8 q13, q2
+
+    subs r4, #1
+
+    //q9 save sqr_cur
+    SQR_ADD_16BYTES d2, d3, q9
+
+    bne pixel_var_16x16_loop0
+
+    vadd.u16 d0, d26, d27 //sum
+    vadd.u16 d1, d20, d21 //sum_cur
+    vpaddl.u16 q0, q0
+    vadd.u32 d2, d24, d25 //sqr
+    vadd.u32 d3, d18, d19 //sqr_cur
+    vpadd.u32 d0, d0, d1
+    vpadd.u32 d1, d2, d3
+
+    ldr       r4, [sp, #4]
+
+    vshr.u32  q0, q0, #8
+    vmul.u32  d0, d0
+    vsub.u32  d0, d1, d0
+    vmovl.u32 q0, d0
+    vst2.16  {d0[0], d1[0]}, [r4]
+
+    ldmia sp!, {r4}
+
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/down_sample_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/down_sample_neon.S
new file mode 100644
index 0000000000..53a66a8c94
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/down_sample_neon.S
@@ -0,0 +1,443 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+WELS_ASM_FUNC_BEGIN DyadicBilinearDownsampler_neon
+    stmdb   sp!, {r4-r8, lr}
+
+    //Get   the width   and height
+    ldr  r4, [sp,   #24]    //src_width
+    ldr  r5, [sp,   #28]    //src_height
+
+    //Initialize the register
+    mov r6, r2
+    mov r8, r0
+    mov lr, #0
+    lsr r5, #1
+
+    //Save the tailer   for the unasigned   size
+    mla  r7, r1, r5, r0
+    vld1.32 {q15}, [r7]
+
+    add r7, r2, r3
+    //processing a colume   data
+comp_ds_bilinear_loop0:
+
+    vld1.8 {q0,q1}, [r2]!
+    vld1.8 {q2,q3}, [r7]!
+    vuzp.8 q0, q1
+    vuzp.8 q2, q3
+    vrhadd.u8 q0, q0, q1
+    vrhadd.u8 q2, q2, q3
+    vrhadd.u8 q0, q0, q2
+    vst1.32 {q0},   [r0]!
+    add lr, #32
+
+    cmp lr, r4
+    movcs   lr, #0
+    addcs   r6, r6, r3, lsl #1
+    movcs   r2, r6
+    addcs   r7, r2, r3
+    addcs   r8, r1
+    movcs   r0, r8
+    subscs r5, #1
+    bne comp_ds_bilinear_loop0
+
+    //restore   the tailer for the unasigned size
+    vst1.32 {q15}, [r0]
+
+    ldmia   sp!, {r4-r8,lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN comp_ds_bilinear_w_x8_neon
+    stmdb   sp!, {r4-r7, lr}
+
+    //Get   the width   and height
+    ldr  r4, [sp,   #20]    //src_width
+    ldr  r5, [sp,   #24]    //src_height
+
+    //Get   the difference
+    sub lr, r3, r4
+    sub r1, r1, r4, lsr #1
+
+    lsr r5, #1
+
+    //processing a colume   data
+comp_ds_bilinear_w_x8_loop0:
+
+    lsr r6, r4, #3
+    add r7, r2, r3
+    //processing a line data
+comp_ds_bilinear_w_x8_loop1:
+
+    vld1.8 {d0}, [r2]!
+    vld1.8 {d1}, [r7]!
+    vpaddl.u8   q0, q0
+    vrshr.u16   q0, #1
+    vrhadd.u16 d0, d1
+
+    vmovn.u16   d0, q0
+    vst1.32 {d0[0]}, [r0]!
+    subs r6, #1
+    bne comp_ds_bilinear_w_x8_loop1
+
+    add r2, r7, lr
+    add r0, r1
+    subs r5, #1
+    bne comp_ds_bilinear_w_x8_loop0
+
+    ldmia   sp!, {r4-r7,lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN comp_ds_bilinear_w_x16_neon
+    stmdb   sp!, {r4-r7, lr}
+
+    //Get   the width   and height
+    ldr  r4, [sp,   #20]    //src_width
+    ldr  r5, [sp,   #24]    //src_height
+
+    //Get   the difference
+    sub lr, r3, r4
+    sub r1, r1, r4, lsr #1
+
+    lsr r5, #1
+
+    //processing a colume   data
+comp_ds_bilinear_w_x16_loop0:
+
+    lsr r6, r4, #4
+    add r7, r2, r3
+    //processing a line data
+comp_ds_bilinear_w_x16_loop1:
+
+    vld1.8 {q0}, [r2]!
+    vld1.8 {q1}, [r7]!
+    vpaddl.u8   q0, q0
+    vpaddl.u8   q1, q1
+    vrshr.u16   q0, #1
+    vrshr.u16   q1, #1
+    vrhadd.u16 q0, q1
+
+    vmovn.u16   d0, q0
+    vst1.32 {d0},   [r0]!
+    subs r6, #1
+    bne comp_ds_bilinear_w_x16_loop1
+
+    add r2, r7, lr
+    add r0, r1
+    subs r5, #1
+    bne comp_ds_bilinear_w_x16_loop0
+
+    ldmia   sp!, {r4-r7,lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN DyadicBilinearDownsamplerWidthx32_neon
+    stmdb   sp!, {r4-r7, lr}
+
+    //Get   the width   and height
+    ldr  r4, [sp,   #20]    //src_width
+    ldr  r5, [sp,   #24]    //src_height
+
+    //Get   the difference
+    sub lr, r3, r4
+    sub r1, r1, r4, lsr #1
+
+    lsr r5, #1
+
+    //processing a colume   data
+comp_ds_bilinear_w_x32_loop0:
+
+    lsr r6, r4, #5
+    add r7, r2, r3
+    //processing a line data
+comp_ds_bilinear_w_x32_loop1:
+
+    vld1.8 {q0,q1}, [r2]!
+    vld1.8 {q2,q3}, [r7]!
+    vuzp.8 q0, q1
+    vuzp.8 q2, q3
+    vrhadd.u8 q0, q0, q1
+    vrhadd.u8 q2, q2, q3
+    vrhadd.u8 q0, q0, q2
+    vst1.32 {q0},   [r0]!
+    subs r6, #1
+    bne comp_ds_bilinear_w_x32_loop1
+
+    add r2, r7, lr
+    add r0, r1
+    subs r5, #1
+    bne comp_ds_bilinear_w_x32_loop0
+
+    ldmia   sp!, {r4-r7,lr}
+WELS_ASM_FUNC_END
+
+
+WELS_ASM_FUNC_BEGIN GeneralBilinearAccurateDownsampler_neon
+    stmdb sp!, {r4-r12, lr}
+
+    //Get the data from stack
+    ldr r4, [sp, #40] //the addr of src
+    ldr r5, [sp, #44] //the value of src_stride
+    ldr r6, [sp, #48] //the value of scaleX
+    ldr r7, [sp, #52] //the value of scaleY
+
+    mov     r10, #32768
+    sub     r10, #1
+    and     r8, r6, r10         // r8 uinc(scaleX mod 32767)
+    mov     r11, #-1
+    mul     r11, r8         // r11 -uinc
+
+    vdup.s16 d2, r8
+    vdup.s16 d0, r11
+    vzip.s16 d0, d2         // uinc -uinc uinc -uinc
+
+    and     r9, r7, r10         // r9 vinc(scaleY mod 32767)
+    mov     r11, #-1
+    mul     r11, r9         // r11 -vinc
+
+    vdup.s16 d2, r9
+    vdup.s16 d3, r11
+    vext.8   d5, d3, d2, #4     // vinc vinc -vinc -vinc
+
+    mov      r11, #0x40000000
+    mov      r12, #0x4000
+    sub      r12, #1
+    add      r11, r12
+    vdup.s32 d1, r11;           //init u  16384 16383 16384 16383
+
+    mov      r11, #16384
+    vdup.s16 d16, r11
+    sub      r11, #1
+    vdup.s16 d17, r11
+    vext.8   d7, d17, d16, #4       //init v  16384 16384 16383 16383
+
+    veor    q14,     q14
+    sub     r1,     r2          // stride - width
+    mov     r8,     #16384      // yInverse
+    sub     r3,     #1
+
+_HEIGHT:
+    ldr     r4, [sp, #40]           //the addr of src
+    mov     r11,    r8
+    lsr     r11,    #15
+    mul     r11,    r5
+    add     r11,    r4                  // get current row address
+    mov     r12,    r11
+    add     r12,    r5
+
+    mov     r9,     #16384              // xInverse
+    sub     r10, r2, #1
+    vmov.s16 d6, d1
+
+_WIDTH:
+    mov     lr,     r9
+    lsr     lr,     #15
+    add     r4,     r11,lr
+    vld2.8  {d28[0],d29[0]},    [r4]        //q14: 0000000b0000000a;
+    add     r4,     r12,lr
+    vld2.8  {d28[4],d29[4]},    [r4]        //q14: 000d000b000c000a;
+    vzip.32     d28, d29                    //q14: 000d000c000b000a;
+
+    vmull.u16   q13, d6, d7         //q13: init u  *  init  v
+    vmull.u32   q12, d26,d28
+    vmlal.u32   q12, d27,d29
+    vqadd.u64   d24, d24,d25
+    vrshr.u64   d24, #30
+
+    vst1.8  {d24[0]},   [r0]!
+    add     r9, r6
+    vadd.u16    d6, d0              // inc u
+    vshl.u16    d6, #1
+    vshr.u16    d6, #1
+    subs    r10, #1
+    bne     _WIDTH
+
+WIDTH_END:
+    lsr     r9,     #15
+    add     r4,r11,r9
+    vld1.8  {d24[0]},   [r4]
+    vst1.8  {d24[0]},   [r0]
+    add     r0,     #1
+    add     r8,     r7
+    add     r0,     r1
+    vadd.s16    d7, d5              // inc v
+    vshl.u16    d7, #1
+    vshr.u16    d7, #1
+    subs    r3,     #1
+    bne     _HEIGHT
+
+LAST_ROW:
+    ldr     r4, [sp, #40]           //the addr of src
+    lsr     r8, #15
+    mul     r8, r5
+    add     r4, r8                  // get current row address
+    mov     r9,     #16384
+
+_LAST_ROW_WIDTH:
+    mov     r11,    r9
+    lsr     r11,    #15
+
+    add     r3,     r4,r11
+    vld1.8  {d0[0]},    [r3]
+    vst1.8  {d0[0]},    [r0]
+    add     r0,     #1
+    add     r9,     r6
+    subs    r2,     #1
+    bne     _LAST_ROW_WIDTH
+
+    ldmia sp!, {r4-r12, lr}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN DyadicBilinearOneThirdDownsampler_neon
+    stmdb sp!, {r4-r8, lr}
+
+    //Get the width and height
+    ldr  r4, [sp, #24]  //src_width
+    ldr  r5, [sp, #28]  //src_height
+
+    //Initialize the register
+    mov r6, r2
+    mov r8, r0
+    mov lr, #0
+
+    //Save the tailer for the un-aligned size
+    mla  r7, r1, r5, r0
+    vld1.32 {q15}, [r7]
+
+    add r7, r2, r3
+    //processing a colume data
+comp_ds_bilinear_onethird_loop0:
+
+    vld3.8 {d0, d1, d2}, [r2]!
+    vld3.8 {d3, d4, d5}, [r2]!
+    vld3.8 {d16, d17, d18}, [r7]!
+    vld3.8 {d19, d20, d21}, [r7]!
+
+    vaddl.u8 q11, d0, d1
+    vaddl.u8 q12, d3, d4
+    vaddl.u8 q13, d16, d17
+    vaddl.u8 q14, d19, d20
+    vrshr.u16 q11, #1
+    vrshr.u16 q12, #1
+    vrshr.u16 q13, #1
+    vrshr.u16 q14, #1
+
+    vrhadd.u16 q11, q13
+    vrhadd.u16 q12, q14
+
+    vmovn.u16 d0, q11
+    vmovn.u16 d1, q12
+    vst1.8 {q0}, [r0]!
+
+    add lr, #48
+    cmp lr, r4
+    movcs lr, #0
+    addcs r6, r6, r3, lsl #1
+    addcs r6, r6, r3
+    movcs r2, r6
+    addcs r7, r2, r3
+    addcs r8, r1
+    movcs r0, r8
+    subscs r5, #1
+    bne comp_ds_bilinear_onethird_loop0
+
+    //restore the tailer for the un-aligned size
+    vst1.32 {q15}, [r0]
+
+    ldmia sp!, {r4-r8,lr}
+WELS_ASM_FUNC_END
+
+WELS_ASM_FUNC_BEGIN DyadicBilinearQuarterDownsampler_neon
+    stmdb sp!, {r4-r8, lr}
+
+    //Get the width and height
+    ldr  r4, [sp, #24]  //src_width
+    ldr  r5, [sp, #28]  //src_height
+
+    //Initialize the register
+    mov r6, r2
+    mov r8, r0
+    mov lr, #0
+    lsr r5, #2
+
+    //Save the tailer for the un-aligned size
+    mla  r7, r1, r5, r0
+    vld1.32 {q15}, [r7]
+
+    add r7, r2, r3
+    //processing a colume data
+comp_ds_bilinear_quarter_loop0:
+
+    vld2.16 {q0, q1}, [r2]!
+    vld2.16 {q2, q3}, [r2]!
+    vld2.16 {q8, q9}, [r7]!
+    vld2.16 {q10, q11}, [r7]!
+
+    vpaddl.u8 q0, q0
+    vpaddl.u8 q2, q2
+    vpaddl.u8 q8, q8
+    vpaddl.u8 q10, q10
+    vrshr.u16 q0, #1
+    vrshr.u16 q2, #1
+    vrshr.u16 q8, #1
+    vrshr.u16 q10, #1
+
+    vrhadd.u16 q0, q8
+    vrhadd.u16 q2, q10
+    vmovn.u16 d0, q0
+    vmovn.u16 d1, q2
+    vst1.8 {q0}, [r0]!
+
+    add lr, #64
+    cmp lr, r4
+    movcs lr, #0
+    addcs r6, r6, r3, lsl #2
+    movcs r2, r6
+    addcs r7, r2, r3
+    addcs r8, r1
+    movcs r0, r8
+    subscs r5, #1
+    bne comp_ds_bilinear_quarter_loop0
+
+    //restore the tailer for the un-aligned size
+    vst1.32 {q15}, [r0]
+
+    ldmia sp!, {r4-r8,lr}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/pixel_sad_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/pixel_sad_neon.S
new file mode 100644
index 0000000000..b1fc4fa37a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/pixel_sad_neon.S
@@ -0,0 +1,67 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+
+WELS_ASM_FUNC_BEGIN WelsProcessingSampleSad8x8_neon
+    stmdb sp!, {lr}
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1
+    vld1.8 {d1}, [r2], r3
+
+    //Do the SAD for 8 bytes
+    vabdl.u8  q1, d0, d1
+
+    mov lr, #7
+pixel_sad_8x8_loop0:
+
+    //Loading a horizontal line data (8 bytes)
+    vld1.8 {d0}, [r0], r1
+    vld1.8 {d1}, [r2], r3
+
+    subs lr, #1
+
+    //Do the SAD for 8 bytes
+    vabal.u8  q1, d0, d1
+    bne pixel_sad_8x8_loop0
+
+    vadd.u16   d2, d3
+    vpaddl.u16 d2, d2
+    vpaddl.u32 d2, d2
+    vmov.u32   r0, d2[0]//TBO...
+
+    ldmia sp!, {lr}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/vaa_calc_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/vaa_calc_neon.S
new file mode 100644
index 0000000000..af32a75e76
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm/vaa_calc_neon.S
@@ -0,0 +1,755 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON
+#include "arm_arch_common_macro.S"
+
+.macro ABS_SUB_SUM_16BYTES arg0, arg1, arg2, arg3, arg4
+    vld1.32 {q15}, [\arg0], \arg2
+    vld1.32 {q14}, [\arg1], \arg2
+    vabal.u8 \arg3, d30, d28
+    vabal.u8 \arg4, d31, d29
+.endm
+
+.macro ABS_SUB_SUM_8x16BYTES arg0, arg1, arg2, arg3, arg4
+    vld1.32 {q15}, [\arg0], \arg2
+    vld1.32 {q14}, [\arg1], \arg2
+    vabdl.u8 \arg3, d30, d28
+    vabdl.u8 \arg4, d31, d29
+
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+    ABS_SUB_SUM_16BYTES \arg0, \arg1, \arg2, \arg3, \arg4
+.endm
+
+.macro SAD_8X16BITS arg0, arg1, arg2
+    vadd.u16 d31, \arg0, \arg1
+    vpaddl.u16 d31, d31
+    vpaddl.u32 \arg2, d31
+.endm
+
+
+WELS_ASM_FUNC_BEGIN VAACalcSad_neon
+
+    stmdb sp!, {r4-r8}
+
+    ldr r4, [sp, #20] //load pic_stride
+    ldr r5, [sp, #28] //load psad8x8
+
+    //Initial the Q8 register for save the "psadframe"
+    vmov.s64 q8, #0
+
+    //Get the jump distance to use on loop codes
+    lsl r8, r4, #4
+    sub r7, r8, #16 //R7 keep the 16*pic_stride-16
+    sub r8, r2      //R8 keep the 16*pic_stride-pic_width
+
+vaa_calc_sad_loop0:
+
+    //R6 keep the pic_width
+    mov r6, r2
+
+vaa_calc_sad_loop1:
+
+    //Process the 16x16 bytes
+    ABS_SUB_SUM_8x16BYTES r0, r1, r4, q0, q1
+    ABS_SUB_SUM_8x16BYTES r0, r1, r4, q2, q3
+
+    //Do the SAD
+    SAD_8X16BITS d0, d1, d0
+    SAD_8X16BITS d2, d3, d1
+    SAD_8X16BITS d4, d5, d2
+    SAD_8X16BITS d6, d7, d3
+
+    //Write to "psad8x8" buffer
+    vst4.32 {d0[0],d1[0],d2[0],d3[0]}, [r5]!
+
+
+    //Adjust the input address
+    sub r0, r7
+    sub r1, r7
+
+    subs r6, #16
+
+    //Save to calculate "psadframe"
+    vadd.u32 q0, q1
+    vadd.u32 q8, q0
+
+    bne vaa_calc_sad_loop1
+
+    //Adjust the input address
+    add r0, r8
+    add r1, r8
+
+    subs r3, #16
+    bne vaa_calc_sad_loop0
+
+    ldr r6, [sp, #24] //load psadframe
+    vadd.u32 d16, d17
+    vst1.32 {d16[0]}, [r6]
+
+    ldmia sp!, {r4-r8}
+
+WELS_ASM_FUNC_END
+
+
+.macro SAD_SD_MAD_16BYTES arg0, arg1, arg2, arg3, arg4, arg5, arg6
+    vld1.32 {q0}, [\arg0], \arg2
+    vld1.32 {q1}, [\arg1], \arg2
+
+    vpadal.u8 \arg3, q0
+    vpadal.u8 \arg4, q1
+
+    vabd.u8 q0, q0, q1
+    vmax.u8 \arg5, q0
+    vpadal.u8 \arg6, q0
+.endm
+
+.macro SAD_SD_MAD_8x16BYTES arg0, arg1, arg2, arg3, arg4, arg5
+    vld1.32 {q0}, [\arg0], \arg2
+    vld1.32 {q1}, [\arg1], \arg2
+
+    vpaddl.u8 q2, q0
+    vpaddl.u8 q3, q1
+
+    vabd.u8 \arg3, q0, q1
+    vpaddl.u8 \arg4, \arg3       //abs_diff
+
+
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+    SAD_SD_MAD_16BYTES \arg0,\arg1,\arg2,q2,q3,\arg3,\arg4
+
+    vsub.u16 \arg5, q2, q3
+.endm
+
+.macro SAD_SD_MAD_CALC arg0, arg1, arg2, arg3, arg4
+    vpmax.u8 d0, \arg0, \arg1 //8bytes
+    vpmax.u8 d0, d0, d0 //4bytes
+    vpmax.u8 \arg2, d0, d0 //2bytes
+
+    vpaddl.u16 \arg3, \arg3
+    vpaddl.u32 \arg3, \arg3
+    vpaddl.s16 \arg4, \arg4
+    vpaddl.s32 \arg4, \arg4
+.endm
+
+WELS_ASM_FUNC_BEGIN VAACalcSadBgd_neon
+
+    stmdb sp!, {r4-r10}
+
+    ldr r4, [sp, #28] //load pic_stride
+    ldr r5, [sp, #36] //load psad8x8
+    ldr r6, [sp, #40] //load psd8x8
+    ldr r7, [sp, #44] //load pmad8x8
+
+    //Initial the Q4 register for save the "psadframe"
+    vmov.s64 q15, #0
+
+    //Get the jump distance to use on loop codes
+    lsl r10, r4, #4
+    sub r9, r10, #16 //R9 keep the 16*pic_stride-16
+    sub r10, r2      //R10 keep the 16*pic_stride-pic_width
+
+vaa_calc_sad_bgd_loop0:
+
+    //R6 keep the pic_width
+    mov r8, r2
+
+vaa_calc_sad_bgd_loop1:
+
+    //Process the 16x16 bytes        pmad psad psd
+    SAD_SD_MAD_8x16BYTES r0, r1, r4, q13, q11, q9
+    SAD_SD_MAD_8x16BYTES r0, r1, r4, q14, q12, q10
+
+    SAD_SD_MAD_CALC d26, d27, d16, q11, q9
+    SAD_SD_MAD_CALC d28, d29, d17, q12, q10
+
+    //Write to "psad8x8" buffer
+    vst4.32 {d22[0],d23[0],d24[0],d25[0]}, [r5]!
+    //Adjust the input address
+    sub r0, r9
+    sub r1, r9
+    //Write to "psd8x8" buffer
+    vst4.32 {d18[0],d19[0],d20[0],d21[0]}, [r6]!
+    subs r8, #16
+    //Write to "pmad8x8" buffer
+    vst2.16 {d16[0],d17[0]}, [r7]!
+    //Save to calculate "psadframe"
+    vadd.u32 q11, q12
+    vadd.u32 q15, q11
+
+    bne vaa_calc_sad_bgd_loop1
+
+    //Adjust the input address
+    add r0, r10
+    add r1, r10
+
+    subs r3, #16
+    bne vaa_calc_sad_bgd_loop0
+
+    ldr r8, [sp, #32] //load psadframe
+    vadd.u32 d30, d31
+    vst1.32 {d30[0]}, [r8]
+    ldmia sp!, {r4-r10}
+
+WELS_ASM_FUNC_END
+
+
+.macro SSD_MUL_SUM_16BYTES_RESET arg0, arg1, arg2, arg3
+    vmull.u8   \arg3, \arg0, \arg0
+    vpaddl.u16 \arg2, \arg3
+
+    vmull.u8   \arg3, \arg1, \arg1
+    vpadal.u16 \arg2, \arg3
+.endm
+
+.macro SSD_MUL_SUM_16BYTES arg0, arg1, arg2, arg3
+    vmull.u8   \arg3, \arg0, \arg0
+    vpadal.u16 \arg2, \arg3
+
+    vmull.u8   \arg3, \arg1, \arg1
+    vpadal.u16 \arg2, \arg3
+.endm
+
+.macro SAD_SSD_BGD_16 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+
+    vpadal.u8 q3, q0    //add cur_row together
+    vpadal.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vmax.u8 q5, q2                              //l_mad for 16 bytes reset for every 8x16
+
+    vpadal.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    SSD_MUL_SUM_16BYTES d4,d5, q8, q11          //q8 for l_sqiff    reset for every 16x16
+
+    vld1.8 {q1}, [\arg1], \arg2 //load ref_row
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+//the last row of a 16x16 block
+.macro SAD_SSD_BGD_16_end arg0, arg1, arg2
+    vld1.8 {q0}, [\arg0], \arg1 //load cur_row
+
+    vpadal.u8 q3, q0    //add cur_row together
+    vpadal.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vmax.u8 q5, q2                              //l_mad for 16 bytes reset for every 8x16
+
+    vpadal.u8 \arg2, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    SSD_MUL_SUM_16BYTES d4,d5, q8, q11          //q8 for l_sqiff    reset for every 16x16
+
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+//for the begin of a 8x16 block, use some instructions to reset the register
+.macro SAD_SSD_BGD_16_RESET_8x8 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+
+    vpaddl.u8 q3, q0    //add cur_row together
+    vpaddl.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vmov q5,q2         //calculate max and avoid reset to zero, l_mad for 16 bytes reset for every 8x16
+
+    vpaddl.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+
+    SSD_MUL_SUM_16BYTES d4,d5, q8, q11          //q8 for l_sqiff    reset for every 16x16
+
+    vld1.8 {q1}, [\arg1], \arg2 //load ref_row
+
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+//for the begin of a 16x16 block, use some instructions to reset the register
+.macro SAD_SSD_BGD_16_RESET_16x16 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+    vld1.8 {q1}, [\arg1], \arg2 //load ref_row
+
+    vpaddl.u8 q3, q0    //add cur_row together
+    vpaddl.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vmov q5,q2         //calculate max and avoid reset to zero, l_mad for 16 bytes reset for every 8x16
+
+    vpaddl.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    SSD_MUL_SUM_16BYTES_RESET d4,d5,q8, q11         //q8 for l_sqiff    reset for every 16x16
+
+    vld1.8 {q1}, [\arg1], \arg2 //load ref_row
+
+    vpaddl.u8 q9, q0                                //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES_RESET d0,d1,q10,q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+//for each 8x16 block
+.macro SAD_SSD_BGD_CALC_8x16 arg0, arg1, arg2
+
+    vpmax.u8 d10, d10, d11 //4 numbers
+    vpmax.u8 d10, d10, d10 //2 numbers
+    vpmax.u8 d10, d10, d10 //1 number1
+
+    vmov \arg0, d10         //d26 d27 keeps the l_mad
+
+    //p_sd8x8
+    vpaddl.u16 q3, q3
+    vpaddl.u16 q4, q4
+
+    vsub.i32 \arg1, q3, q4
+    vpaddl.u32 \arg1, \arg1
+
+    //psad8x8
+    vpaddl.u16 \arg2, \arg2
+    vpaddl.u32 \arg2, \arg2
+
+    //psadframe
+    vadd.i32 q12, \arg2
+.endm
+
+.macro SAD_SSD_BGD_16x16 arg0, arg1, arg2
+    //for one 8x16
+    SAD_SSD_BGD_16_RESET_16x16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q6
+
+    SAD_SSD_BGD_CALC_8x16 d26, q14, q6
+
+    //for another 8x16
+    SAD_SSD_BGD_16_RESET_8x8 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_BGD_16_end \arg0, \arg2, q7
+
+    SAD_SSD_BGD_CALC_8x16 d27, q15, q7
+.endm
+
+.macro SSD_SAD_SD_MAD_PADDL arg0, arg1, arg2
+    vpaddl.s16 \arg0, \arg0
+    vpaddl.s32 \arg0, \arg0
+    vadd.i32 \arg1, \arg1, \arg2
+.endm
+
+
+WELS_ASM_FUNC_BEGIN VAACalcSadSsdBgd_neon
+    stmdb sp!, {r0-r12, r14}
+    vpush {q4-q7}
+
+    ldr r4, [sp, #120] //r4 keeps the pic_stride
+
+    sub r5, r4, #1
+    lsl r5, r5, #4 //r5 keeps the little step
+
+    lsl r6, r4, #4
+    sub r6, r2, r6  //r6 keeps the big step
+
+
+    ldr r8, [sp, #128]//psad8x8
+    ldr r9, [sp, #132]//psum16x16
+    ldr r10, [sp, #136]//psqsum16x16
+    ldr r11, [sp, #140]//psqdiff16x16
+    ldr r12, [sp, #144]//p_sd8x8
+    ldr r14, [sp, #148]//p_mad8x8
+
+    vmov.i8 q12, #0
+
+vaa_calc_sad_ssd_bgd_height_loop:
+
+    mov r7, r2
+vaa_calc_sad_ssd_bgd_width_loop:
+
+    //l_sd q14&q15, l_mad q13, l_sad q6 & q7, l_sqdiff  q8, l_sum q9, l_sqsum q10
+    SAD_SSD_BGD_16x16 r0,r1,r4
+
+    //psad8x8
+    vst4.32 {d12[0], d13[0], d14[0], d15[0]}, [r8]!
+
+    sub r0, r0, r5 //jump to next 16x16
+    sub r1, r1, r5 //jump to next 16x16
+
+    //p_sd8x8
+    vst4.32 {d28[0], d29[0],d30[0], d31[0]}, [r12]!
+
+    //p_mad8x8
+    vst2.16 {d26[0], d27[0]}, [r14]!
+
+    //psqdiff16x16
+    vpaddl.s32 q8, q8
+    vadd.i32 d16, d16, d17
+
+    vst1.32 {d16[0]}, [r11]! //psqdiff16x16
+
+    //psum16x16
+    SSD_SAD_SD_MAD_PADDL q9, d18, d19
+    vst1.32 {d18[0]}, [r9]! //psum16x16
+
+    //psqsum16x16
+    vpaddl.s32 q10, q10
+    vadd.i32 d20, d20, d21
+    vst1.32 {d20[0]}, [r10]! //psqsum16x16
+
+    subs r7, #16
+
+    bne vaa_calc_sad_ssd_bgd_width_loop
+
+    sub r0, r0, r6      //jump to next 16 x width
+    sub r1, r1, r6      //jump to next 16 x width
+
+    subs r3, #16
+bne vaa_calc_sad_ssd_bgd_height_loop
+
+    //psadframe
+    ldr r7, [sp, #124]//psadframe
+
+    vadd.i32 d24, d24, d25
+    vst1.32 {d24[0]}, [r7]
+
+    vpop {q4-q7}
+    ldmia sp!, {r0-r12, r14}
+
+WELS_ASM_FUNC_END
+
+
+.macro SAD_VAR_16 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+
+    vpadal.u8 q3, q0    //add cur_row together
+    vpadal.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vpadal.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    vld1.8 {q1}, [\arg1], \arg2
+
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+.macro SAD_VAR_16_END arg0, arg1, arg2
+    vld1.8 {q0}, [\arg0], \arg1 //load cur_row
+
+    vpadal.u8 q3, q0    //add cur_row together
+    vpadal.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vpadal.u8 \arg2, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+
+.macro SAD_VAR_16_RESET_16x16 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+    vld1.8 {q1}, [\arg1], \arg2
+
+    vpaddl.u8 q3, q0    //add cur_row together
+    vpaddl.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vpaddl.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    vld1.8 {q1}, [\arg1], \arg2
+
+    vpaddl.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES_RESET d0,d1, q10, q11
+.endm
+
+.macro SAD_VAR_16_RESET_8x8 arg0, arg1, arg2, arg3
+    vld1.8 {q0}, [\arg0], \arg2 //load cur_row
+
+    vpaddl.u8 q3, q0    //add cur_row together
+    vpaddl.u8 q4, q1    //add ref_row together
+
+    vabd.u8 q2, q0, q1  //abs_diff
+
+    vpaddl.u8 \arg3, q2                         //l_sad for 16 bytes reset for every 8x16
+
+    vld1.8 {q1}, [\arg1], \arg2
+
+    vpadal.u8 q9, q0                            //q9 for l_sum      reset for every 16x16
+
+    SSD_MUL_SUM_16BYTES d0,d1, q10, q11         //q10 for lsqsum    reset for every 16x16
+.endm
+
+.macro SAD_VAR_16x16 arg0, arg1, arg2
+    //for one 8x16
+    SAD_VAR_16_RESET_16x16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+    SAD_VAR_16 \arg0, \arg1, \arg2, q6
+
+    vpaddl.u16 q6, q6
+    vpaddl.u32 q6, q6
+    vadd.i32 q12, q6
+
+    //for another 8x16
+    SAD_VAR_16_RESET_8x8 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16 \arg0, \arg1, \arg2, q7
+    SAD_VAR_16_END \arg0, \arg2, q7
+
+    vpaddl.u16 q7, q7
+    vpaddl.u32 q7, q7
+
+    vadd.i32 q12, q7
+.endm
+
+
+WELS_ASM_FUNC_BEGIN VAACalcSadVar_neon
+    stmdb sp!, {r4-r11}
+    vpush {q4}
+    vpush {q6-q7}
+
+    ldr r4, [sp, #80] //r4 keeps the pic_stride
+
+    sub r5, r4, #1
+    lsl r5, r5, #4 //r5 keeps the little step
+
+    lsl r6, r4, #4
+    sub r6, r2, r6  //r6 keeps the big step
+
+    ldr r7,     [sp, #84]   //psadframe
+    ldr r8,     [sp, #88]   //psad8x8
+    ldr r9,     [sp, #92]   //psum16x16
+    ldr r10,    [sp, #96]   //psqsum16x16
+
+    vmov.i8 q12, #0
+vaa_calc_sad_var_height_loop:
+
+    mov r11, r2
+vaa_calc_sad_var_width_loop:
+
+
+    SAD_VAR_16x16 r0,r1,r4
+    //psad8x8
+    vst4.32 {d12[0], d13[0], d14[0], d15[0]}, [r8]!
+
+    sub r0, r0, r5 //jump to next 16x16
+    sub r1, r1, r5 //jump to next 16x16
+
+    //psum16x16
+    SSD_SAD_SD_MAD_PADDL q9, d18, d19
+    vst1.32 {d18[0]}, [r9]! //psum16x16
+
+    //psqsum16x16
+    vpaddl.s32 q10, q10
+    subs r11, #16
+    vadd.i32 d20, d20, d21
+    vst1.32 {d20[0]}, [r10]! //psqsum16x16
+
+    bne vaa_calc_sad_var_width_loop
+
+    sub r0, r0, r6      //jump to next 16 x width
+    sub r1, r1, r6      //jump to next 16 x width
+
+    subs r3, #16
+bne vaa_calc_sad_var_height_loop
+
+    vadd.i32 d24, d24, d25
+    vst1.32 {d24[0]}, [r7]
+
+    vpop {q6-q7}
+    vpop {q4}
+    ldmia sp!, {r4-r11}
+WELS_ASM_FUNC_END
+
+
+.macro SAD_SSD_16 arg0, arg1, arg2, arg3
+    SAD_VAR_16 \arg0, \arg1, \arg2, \arg3
+
+    SSD_MUL_SUM_16BYTES d4,d5,q8, q11
+.endm
+
+.macro SAD_SSD_16_END arg0, arg1, arg2
+    SAD_VAR_16_END \arg0, \arg1, \arg2
+
+    SSD_MUL_SUM_16BYTES d4,d5,q8, q11           //q8 for l_sqiff    reset for every 16x16
+.endm
+
+.macro SAD_SSD_16_RESET_16x16 arg0, arg1, arg2, arg3
+    SAD_VAR_16_RESET_16x16 \arg0, \arg1, \arg2, \arg3
+
+    SSD_MUL_SUM_16BYTES_RESET d4,d5,q8, q11         //q8 for l_sqiff    reset for every 16x16
+.endm
+
+.macro SAD_SSD_16_RESET_8x8 arg0, arg1, arg2, arg3
+    SAD_VAR_16_RESET_8x8 \arg0, \arg1, \arg2, \arg3
+
+    SSD_MUL_SUM_16BYTES d4,d5,q8, q11           //q8 for l_sqiff    reset for every 16x16
+.endm
+
+.macro SAD_SSD_16x16 arg0, arg1, arg2
+    //for one 8x16
+    SAD_SSD_16_RESET_16x16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+    SAD_SSD_16 \arg0, \arg1, \arg2, q6
+
+    vpaddl.u16 q6, q6
+    vpaddl.u32 q6, q6
+    vadd.i32 q12, q6
+
+    //for another 8x16
+    SAD_SSD_16_RESET_8x8 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16 \arg0, \arg1, \arg2, q7
+    SAD_SSD_16_END \arg0, \arg2, q7
+
+    vpaddl.u16 q7, q7
+    vpaddl.u32 q7, q7
+
+    vadd.i32 q12, q7
+.endm
+
+
+WELS_ASM_FUNC_BEGIN VAACalcSadSsd_neon
+    stmdb sp!, {r4-r12}
+    vpush {q4}
+    vpush {q6-q7}
+
+    ldr r4, [sp, #84] //r4 keeps the pic_stride
+
+    sub r5, r4, #1
+    lsl r5, r5, #4 //r5 keeps the little step
+
+    lsl r6, r4, #4
+    sub r6, r2, r6  //r6 keeps the big step
+
+    ldr r7,     [sp, #88]   //psadframe
+    ldr r8,     [sp, #92]   //psad8x8
+    ldr r9,     [sp, #96]   //psum16x16
+    ldr r10,    [sp, #100]  //psqsum16x16
+    ldr r11,    [sp, #104]  //psqdiff16x16
+
+    vmov.i8 q12, #0
+vaa_calc_sad_ssd_height_loop:
+
+    mov r12, r2
+vaa_calc_sad_ssd_width_loop:
+
+
+    SAD_SSD_16x16 r0,r1,r4
+    //psad8x8
+    vst4.32 {d12[0], d13[0], d14[0], d15[0]}, [r8]!
+
+    sub r0, r0, r5 //jump to next 16x16
+    sub r1, r1, r5 //jump to next 16x16
+
+    //psum16x16
+    vpaddl.s16 q9, q9
+    vpaddl.s32 q9, q9
+    vadd.i32 d18, d18, d19
+    vst1.32 {d18[0]}, [r9]! //psum16x16
+
+    //psqsum16x16
+    vpaddl.s32 q10, q10
+    vadd.i32 d20, d20, d21
+    vst1.32 {d20[0]}, [r10]! //psqsum16x16
+
+    //psqdiff16x16
+    vpaddl.s32 q8, q8
+    vadd.i32 d16, d16, d17
+    subs r12, #16
+    vst1.32 {d16[0]}, [r11]! //psqdiff16x16
+
+    bne vaa_calc_sad_ssd_width_loop
+
+    sub r0, r0, r6      //jump to next 16 x width
+    sub r1, r1, r6      //jump to next 16 x width
+
+    subs r3, #16
+    bne vaa_calc_sad_ssd_height_loop
+
+    vadd.i32 d24, d24, d25
+    vst1.32 {d24[0]}, [r7]
+
+    vpop {q6-q7}
+    vpop {q4}
+    ldmia sp!, {r4-r12}
+WELS_ASM_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
new file mode 100644
index 0000000000..82981adb37
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/adaptive_quantization_aarch64_neon.S
@@ -0,0 +1,89 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+WELS_ASM_AARCH64_FUNC_BEGIN SampleVariance16x16_AArch64_neon
+    SIGN_EXTENSION x1, w1
+    SIGN_EXTENSION x3, w3
+    ld1   {v1.16b}, [x0], x1 //save the ref data (16bytes)
+    ld1   {v0.16b}, [x2], x3 //save the src data (16bytes)
+    uabd  v2.16b, v0.16b, v1.16b
+    umull  v3.8h, v2.8b, v2.8b
+    umull2 v4.8h, v2.16b, v2.16b
+    uaddlp v4.4s, v4.8h
+    uadalp v4.4s, v3.8h //sqr
+    uaddlp v2.8h, v2.16b //sum
+
+    uaddlp v1.8h, v0.16b //sum_cur
+
+    umull  v3.8h, v0.8b, v0.8b
+    umull2 v5.8h, v0.16b, v0.16b
+    uaddlp v3.4s, v3.8h
+    uadalp v3.4s, v5.8h //sqr_cur
+.rept 15
+    ld1   {v5.16b}, [x0], x1 //save the ref data (16bytes)
+    ld1   {v0.16b}, [x2], x3 //save the src data (16bytes)
+
+    uabd  v6.16b, v0.16b, v5.16b
+
+    //v1 save sum_cur
+    uadalp v1.8h, v0.16b
+
+    //v4 save sqr
+    umull  v5.8h, v6.8b, v6.8b
+    umull2 v7.8h, v6.16b, v6.16b
+    uadalp v4.4s, v5.8h //sqr
+    uadalp v4.4s, v7.8h //sqr
+
+    //v2 save sum
+    uadalp v2.8h, v6.16b
+
+    //v3 save sqr_cur
+    umull  v5.8h, v0.8b, v0.8b
+    umull2 v7.8h, v0.16b, v0.16b
+    uadalp v3.4s, v5.8h //sqr_cur
+    uadalp v3.4s, v7.8h //sqr_cur
+.endr
+    uaddlv s2, v2.8h //sum
+    uaddlv s1, v1.8h //sum_cur
+    ins    v2.s[1], v1.s[0] // sum, sum_cur
+    shrn   v2.4h, v2.4s, #8 // sum, sum_cur>>8
+    mul    v2.4h, v2.4h, v2.4h//// sum*sum, sum_cur*sum_cur
+    uaddlv d4, v4.4s //sqr
+    uaddlv d3, v3.4s //sqr_cur
+    ins    v4.s[1], v3.s[0] // sqr, sqr_cur
+    shrn   v4.4h, v4.4s, #8 // sqr, sqr_cur>>8
+    sub    v4.4h, v4.4h, v2.4h
+    st1  {v4.s}[0], [x4]
+WELS_ASM_AARCH64_FUNC_END
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/down_sample_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/down_sample_aarch64_neon.S
new file mode 100644
index 0000000000..b14f055565
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/down_sample_aarch64_neon.S
@@ -0,0 +1,334 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearDownsampler_AArch64_neon
+
+    //Initialize the register
+    mov x6, x2
+    mov x8, x0
+    mov w9, #0
+    lsr w5, w5, #1
+
+    //Save the tailer   for the unasigned   size
+    smaddl  x7, w1, w5, x0
+    ld1 {v4.16b}, [x7]
+
+    add x7, x2, w3, sxtw
+    //processing a colume   data
+comp_ds_bilinear_loop0:
+
+    ld1     {v0.16b, v1.16b}, [x2], #32
+    ld1     {v2.16b, v3.16b}, [x7], #32
+    uzp1    v4.16b, v0.16b, v1.16b
+    uzp2    v5.16b, v0.16b, v1.16b
+    uzp1    v6.16b, v2.16b, v3.16b
+    uzp2    v7.16b, v2.16b, v3.16b
+    urhadd  v0.16b, v4.16b, v5.16b
+    urhadd  v1.16b, v6.16b, v7.16b
+    urhadd  v2.16b, v0.16b, v1.16b
+    st1     {v2.16b}, [x0], #16
+    add     w9, w9, #32
+
+    cmp     w9, w4
+    b.cc    comp_ds_bilinear_loop0
+
+    mov     w9, #0
+    add     x6, x6, w3, sxtw #1
+    mov     x2, x6
+    add     x7, x2, w3, sxtw
+    add     x8, x8, w1, sxtw
+    mov     x0, x8
+    sub     w5, w5, #1
+
+    cbnz    w5, comp_ds_bilinear_loop0
+
+    //restore   the tailer for the unasigned size
+    st1     {v4.16b}, [x0]
+
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearDownsamplerWidthx32_AArch64_neon
+    sub     w9, w3, w4
+    sub     w1, w1, w4, lsr #1
+    lsr     w5, w5, #1
+
+    //processing a colume   data
+comp_ds_bilinear_w_x32_loop0:
+
+    lsr     w6, w4, #5
+    add     x7, x2, w3, sxtw
+    //processing a line data
+comp_ds_bilinear_w_x32_loop1:
+
+    ld1     {v0.16b, v1.16b}, [x2], #32
+    ld1     {v2.16b, v3.16b}, [x7], #32
+    uzp1    v4.16b, v0.16b, v1.16b
+    uzp2    v5.16b, v0.16b, v1.16b
+    uzp1    v6.16b, v2.16b, v3.16b
+    uzp2    v7.16b, v2.16b, v3.16b
+    urhadd  v0.16b, v4.16b, v5.16b
+    urhadd  v1.16b, v6.16b, v7.16b
+    urhadd  v2.16b, v0.16b, v1.16b
+    st1     {v2.16b}, [x0], #16
+
+    sub     w6, w6, #1
+    cbnz    w6, comp_ds_bilinear_w_x32_loop1
+
+    add     x2, x7, w9, sxtw
+    add     x0, x0, w1, sxtw
+    sub     w5, w5, #1
+    cbnz    w5, comp_ds_bilinear_w_x32_loop0
+WELS_ASM_AARCH64_FUNC_END
+
+WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearOneThirdDownsampler_AArch64_neon
+
+    //Initialize the register
+    mov x6, x2
+    mov x8, x0
+    mov w9, #0
+
+    //Save the tailer   for the unasigned   size
+    smaddl  x7, w1, w5, x0
+    ld1 {v16.16b}, [x7]
+
+    add x7, x2, w3, sxtw
+    //processing a colume   data
+comp_ds_bilinear_onethird_loop0:
+
+    ld3     {v0.16b, v1.16b, v2.16b}, [x2], #48
+    ld3     {v4.16b, v5.16b, v6.16b}, [x7], #48
+
+    uaddl   v2.8h, v0.8b, v1.8b
+    uaddl2  v3.8h, v0.16b, v1.16b
+    uaddl   v6.8h, v4.8b, v5.8b
+    uaddl2  v7.8h, v4.16b, v5.16b
+    urshr   v2.8h, v2.8h, #1
+    urshr   v3.8h, v3.8h, #1
+    urshr   v6.8h, v6.8h, #1
+    urshr   v7.8h, v7.8h, #1
+
+    urhadd  v0.8h, v2.8h, v6.8h
+    urhadd  v1.8h, v3.8h, v7.8h
+    xtn     v0.8b, v0.8h
+    xtn     v1.8b, v1.8h
+    st1     {v0.8b,v1.8b}, [x0], #16
+
+    add     w9, w9, #48
+
+    cmp     w9, w4
+    b.cc    comp_ds_bilinear_onethird_loop0
+
+    mov     w9, #0
+    add     x6, x6, w3, sxtw #1
+    add     x6, x6, w3, sxtw
+    mov     x2, x6
+    add     x7, x2, w3, sxtw
+    add     x8, x8, w1, sxtw
+    mov     x0, x8
+    sub     w5, w5, #1
+
+    cbnz    w5, comp_ds_bilinear_onethird_loop0
+
+    //restore   the tailer for the unasigned size
+    st1     {v16.16b}, [x0]
+WELS_ASM_AARCH64_FUNC_END
+//void DyadicBilinearQuarterDownsampler_AArch64_neon(uint8_t* pDst, const int32_t kiDstStride,
+//uint8_t* pSrc, const int32_t kiSrcStride,
+//const int32_t kiSrcWidth, const int32_t kiHeight);
+
+WELS_ASM_AARCH64_FUNC_BEGIN DyadicBilinearQuarterDownsampler_AArch64_neon
+    //Initialize the register
+    mov x6, x2
+    mov x8, x0
+    mov w9, #0
+    lsr w5, w5, #2
+
+    //Save the tailer   for the unasigned   size
+    smaddl  x7, w1, w5, x0
+    ld1 {v16.16b}, [x7]
+
+    add x7, x2, w3, sxtw
+    //processing a colume   data
+comp_ds_bilinear_quarter_loop0:
+
+    ld2     {v0.8h, v1.8h}, [x2], #32
+    ld2     {v2.8h, v3.8h}, [x2], #32
+    ld2     {v4.8h, v5.8h}, [x7], #32
+    ld2     {v6.8h, v7.8h}, [x7], #32
+
+    uaddlp  v0.8h, v0.16b
+    uaddlp  v1.8h, v2.16b
+    uaddlp  v4.8h, v4.16b
+    uaddlp  v5.8h, v6.16b
+    urshr   v0.8h, v0.8h, #1
+    urshr   v1.8h, v1.8h, #1
+    urshr   v4.8h, v4.8h, #1
+    urshr   v5.8h, v5.8h, #1
+
+    urhadd  v0.8h, v0.8h, v4.8h
+    urhadd  v1.8h, v1.8h, v5.8h
+    xtn     v0.8b, v0.8h
+    xtn     v1.8b, v1.8h
+    st1     {v0.8b,v1.8b}, [x0], #16
+
+    add     w9, w9, #64
+
+    cmp     w9, w4
+    b.cc    comp_ds_bilinear_quarter_loop0
+
+    mov     w9, #0
+    add     x6, x6, w3, sxtw #2
+    mov     x2, x6
+    add     x7, x2, w3, sxtw
+    add     x8, x8, w1, sxtw
+    mov     x0, x8
+    sub     w5, w5, #1
+
+    cbnz    w5, comp_ds_bilinear_quarter_loop0
+
+    //restore   the tailer for the unasigned size
+    st1     {v16.16b}, [x0]
+WELS_ASM_AARCH64_FUNC_END
+
+//void GeneralBilinearAccurateDownsampler_AArch64_neon (uint8_t* pDst, const int32_t kiDstStride,
+//    const int32_t kiDstWidth, const int32_t kiDstHeight,
+//   uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX, const uint32_t kuiScaleY);
+WELS_ASM_AARCH64_FUNC_BEGIN GeneralBilinearAccurateDownsampler_AArch64_neon
+    mov     w10, #32767
+    and     w8, w6, w10
+    mov     w11, #-1
+    mul     w12, w11, w8
+
+    dup     v2.4h, w8
+    dup     v0.4h, w12
+    zip1    v0.4h, v0.4h, v2.4h     // uinc -uinc uinc -uinc
+
+    and     w9, w7, w10
+    mul     w12, w11, w9
+
+    dup     v2.4h, w9
+    dup     v5.4h, w12
+    ins     v5.s[1], v2.s[0]        // vinc vinc -vinc -vinc
+
+    mov     w11, #0x40000000
+    mov     w12, #0x3FFF
+    add     w11, w11, w12
+    dup     v1.2s, w11              //init u  16384 16383 16384 16383
+
+    mov     w8, #16384
+    dup     v7.4h, w8
+    sub     w11, w8, #1
+    dup     v2.4h, w11
+    ins     v7.s[0], v2.s[0]        //init v  16384 16384 16383 16383
+
+    eor     v26.16b, v26.16b, v26.16b
+    eor     v27.16b, v27.16b, v27.16b
+    SIGN_EXTENSION x1, w1
+    SIGN_EXTENSION x2, w2
+    SIGN_EXTENSION x3, w3
+    SIGN_EXTENSION x5, w5
+    SIGN_EXTENSION x6, w6
+    SIGN_EXTENSION x7, w7
+
+    sub     x1, x1, x2
+    sub     x3, x3, #1
+
+_HEIGHT:
+    lsr     w11, w8, #15
+    mul     w11, w11, w5
+    add     x15, x4, w11, sxtw
+    add     x12, x15, w5, sxtw
+
+    mov     x9, #16384
+    sub     x10, x2, #1
+    orr     v6.8b, v1.8b, v1.8b
+
+_WIDTH:
+    lsr     x13, x9, #15
+    add     x14, x15, x13
+    ld2     {v26.b, v27.b}[0], [x14]  //q14: 0000000b0000000a;
+    add     x14, x12, x13
+    ld2     {v26.b, v27.b}[4], [x14]  //q14: 000d000b000c000a;
+    zip1    v28.2s, v26.2s, v27.2s
+    zip2    v29.2s, v26.2s, v27.2s
+
+    umull   v20.4s, v6.4h, v7.4h
+    umull   v21.2d, v28.2s, v20.2s
+    ins     v20.d[0], v20.d[1]
+    umlal   v21.2d, v29.2s, v20.2s
+
+    addp    d21, v21.2d
+    urshr   d21, d21, #30
+
+    st1     {v21.b}[0], [x0], #1
+    add     x9, x9, x6
+    add     v6.4h, v6.4h, v0.4h
+    shl     v6.4h, v6.4h, #1
+    ushr    v6.4h, v6.4h, #1
+    sub     x10, x10, #1
+    cbnz    x10, _WIDTH
+
+WIDTH_END:
+    lsr     x9, x9, #15
+    add     x14, x15, x9
+    ld1     {v21.b}[0], [x14]
+    st1     {v21.b}[0], [x0], #1
+    add     w8, w8, w7
+    add     x0, x0, x1
+    add     v7.4h, v7.4h, v5.4h
+    shl     v7.4h, v7.4h, #1
+    ushr    v7.4h, v7.4h, #1
+    sub     x3, x3, #1
+    cbnz    x3, _HEIGHT
+
+LAST_ROW:
+    lsr     w8, w8, #15
+    mul     w8, w8, w5
+    add     x4, x4, w8, sxtw
+    mov     x9, #16384
+
+_LAST_ROW_WIDTH:
+    mov     x11, x9
+    lsr     x11, x11, #15
+    add     x3, x4, x11
+    ld1     {v21.b}[0], [x3]
+    st1     {v21.b}[0], [x0], #1
+    add     x9, x9, x6
+    sub     x2, x2, #1
+    cbnz    x2, _LAST_ROW_WIDTH
+
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/pixel_sad_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
new file mode 100644
index 0000000000..9d09ed777a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/pixel_sad_aarch64_neon.S
@@ -0,0 +1,51 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+//int32_t WelsProcessingSampleSad8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+WELS_ASM_AARCH64_FUNC_BEGIN WelsProcessingSampleSad8x8_AArch64_neon
+    SIGN_EXTENSION x1, w1
+    SIGN_EXTENSION x3, w3
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabdl   v2.8h, v0.8b, v1.8b
+.rept 7
+    ld1     {v0.8b}, [x0], x1
+    ld1     {v1.8b}, [x2], x3
+    uabal   v2.8h, v0.8b, v1.8b
+.endr
+    saddlv  s2, v2.8h
+    fmov    w0, s2
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/vaa_calc_aarch64_neon.S b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
new file mode 100644
index 0000000000..a7be46a49e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/arm64/vaa_calc_aarch64_neon.S
@@ -0,0 +1,549 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifdef HAVE_NEON_AARCH64
+#include "arm_arch64_common_macro.S"
+
+.macro ABS_SUB_SUM_16BYTES arg0, arg1
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabal   \arg0, v0.8b, v1.8b
+    uabal2  \arg1, v0.16b,v1.16b
+.endm
+
+.macro ABS_SUB_SUM_8x16BYTES arg0, arg1
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabdl   \arg0, v0.8b, v1.8b
+    uabdl2  \arg1, v0.16b,v1.16b
+
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+    ABS_SUB_SUM_16BYTES \arg0, \arg1
+.endm
+
+/*
+ * void vaa_calc_sad_neon(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
+ *                      int32_t *psadframe, int32_t *psad8x8)
+ */
+WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSad_AArch64_neon
+    eor     v31.16b, v31.16b, v31.16b
+
+    SIGN_EXTENSION x4, w4
+    lsl     x9, x4, #4
+    sub     x10, x9, #16    //x10 keep the 16*pic_stride-16
+    sub     x9, x9, x2      //x9 keep the 16*pic_stride-pic_width
+vaa_calc_sad_loop0:
+    mov     w11, w2
+vaa_calc_sad_loop1:
+    ABS_SUB_SUM_8x16BYTES v2.8h, v3.8h
+    ABS_SUB_SUM_8x16BYTES v4.8h, v5.8h
+
+    uaddlv  s2, v2.8h
+    uaddlv  s3, v3.8h
+    uaddlv  s4, v4.8h
+    uaddlv  s5, v5.8h
+
+    st4     {v2.s, v3.s, v4.s, v5.s}[0], [x6], #16
+    sub     x0, x0, x10
+    sub     x1, x1, x10
+    sub     w11, w11, #16
+    add     v6.2s, v2.2s, v3.2s
+    add     v7.2s, v4.2s, v5.2s
+    add     v6.2s, v6.2s, v7.2s
+    add     v31.2s, v31.2s, v6.2s
+    cbnz    w11, vaa_calc_sad_loop1
+
+    add     x0, x0, x9
+    add     x1, x1, x9
+    sub     w3, w3, #16
+    cbnz    w3, vaa_calc_sad_loop0
+
+    str     s31, [x5]
+
+WELS_ASM_AARCH64_FUNC_END
+
+.macro SAD_SD_MAD_8x16BYTES
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v31.16b, v0.16b, v1.16b
+    uaddlp  v2.8h, v31.16b
+    uaddlp  v4.8h, v0.16b
+    uaddlp  v5.8h, v1.16b
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v30.16b, v0.16b, v1.16b
+    umax    v31.16b, v31.16b,v30.16b
+    uadalp  v2.8h, v30.16b
+    uadalp  v4.8h, v0.16b
+    uadalp  v5.8h, v1.16b
+.endr
+.endm
+/*
+ * void vaa_calc_sad_bgd_neon(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
+ *                             int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+ */
+WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSadBgd_AArch64_neon
+    ldr     x15, [sp, #0]
+    eor     v28.16b, v28.16b, v28.16b
+
+    SIGN_EXTENSION x4, w4
+    lsl     x9, x4, #4
+    sub     x10, x9, #16    //x10 keep the 16*pic_stride-16
+    sub     x9, x9, x2      //x9 keep the 16*pic_stride-pic_width
+vaa_calc_sad_bgd_loop0:
+    mov     w11, w2
+vaa_calc_sad_bgd_loop1:
+    SAD_SD_MAD_8x16BYTES
+    umaxv   b24, v31.8b
+    ins     v31.d[0], v31.d[1]
+    umaxv   b25, v31.8b
+    uaddlv  s20, v2.4h
+    ins     v2.d[0], v2.d[1]
+    uaddlv  s21, v2.4h
+    usubl   v6.4s, v4.4h, v5.4h
+    usubl2  v7.4s, v4.8h, v5.8h
+    addv    s16, v6.4s
+    addv    s17, v7.4s
+
+    SAD_SD_MAD_8x16BYTES
+    umaxv   b26, v31.8b
+    ins     v31.d[0], v31.d[1]
+    umaxv   b27, v31.8b
+    uaddlv  s22, v2.4h
+    ins     v2.d[0], v2.d[1]
+    uaddlv  s23, v2.4h
+    usubl   v6.4s, v4.4h, v5.4h
+    usubl2  v7.4s, v4.8h, v5.8h
+    addv    s18, v6.4s
+    addv    s19, v7.4s
+    st4     {v20.s, v21.s, v22.s, v23.s}[0], [x6], #16
+
+    sub     x0, x0, x10
+    sub     x1, x1, x10
+    st4     {v16.s, v17.s, v18.s, v19.s}[0], [x7], #16
+    sub     w11, w11, #16
+    st4     {v24.b, v25.b, v26.b, v27.b}[0], [x15], #4
+    add     v29.2s, v20.2s, v21.2s
+    add     v30.2s, v22.2s, v23.2s
+    add     v29.2s, v29.2s, v30.2s
+    add     v28.2s, v28.2s, v29.2s
+    cbnz    w11, vaa_calc_sad_bgd_loop1
+
+    add     x0, x0, x9
+    add     x1, x1, x9
+    sub     w3, w3, #16
+    cbnz    w3, vaa_calc_sad_bgd_loop0
+    str     s28, [x5]
+
+WELS_ASM_AARCH64_FUNC_END
+
+.macro SAD_SSD_BGD_8x16BYTES_1
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v31.16b, v0.16b, v1.16b
+    umull   v30.8h, v31.8b, v31.8b
+    uaddlp  v29.4s, v30.8h
+    umull2  v30.8h, v31.16b, v31.16b
+    uadalp  v29.4s, v30.8h      //  p_sqdiff
+
+    uaddlp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uaddlp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+
+    uaddlp  v2.8h, v31.16b      //  p_sad
+    uaddlp  v4.8h, v0.16b
+    uaddlp  v5.8h, v1.16b
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    umax    v31.16b, v31.16b,v3.16b     //p_mad
+    umull   v30.8h, v3.8b, v3.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v3.16b, v3.16b
+    uadalp  v29.4s, v30.8h              //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+
+    uadalp  v2.8h, v3.16b              //p_sad
+    uadalp  v4.8h, v0.16b
+    uadalp  v5.8h, v1.16b               //p_sd
+.endr
+.endm
+
+.macro SAD_SSD_BGD_8x16BYTES_2
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v26.16b, v0.16b, v1.16b
+    umull   v30.8h, v26.8b, v26.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v26.16b, v26.16b
+    uadalp  v29.4s, v30.8h      //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+
+    uaddlp  v16.8h,v26.16b      //  p_sad
+    uaddlp  v6.8h, v0.16b
+    uaddlp  v7.8h, v1.16b
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    umax    v26.16b, v26.16b,v3.16b     //p_mad
+    umull   v30.8h, v3.8b, v3.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v3.16b, v3.16b
+    uadalp  v29.4s, v30.8h              //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+
+    uadalp  v16.8h, v3.16b              //p_sad
+    uadalp  v6.8h, v0.16b
+    uadalp  v7.8h, v1.16b               //p_sd
+.endr
+.endm
+
+/*
+ * void vaa_calc_sad_ssd_bgd_c(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
+ *        int32_t *psadframe,int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16, int32_t *psqdiff16x16, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+ */
+WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSadSsdBgd_AArch64_neon
+    ldr     x12, [sp, #0]   //psqsum16x16
+    ldr     x13, [sp, #8]   //psqdiff16x16
+    ldr     x14, [sp, #16]  //p_sd8x8
+    ldr     x15, [sp, #24]  //p_mad8x8
+    eor     v17.16b, v17.16b, v17.16b
+
+    SIGN_EXTENSION x4, w4
+    lsl     x9, x4, #4
+    sub     x10, x9, #16    //x10 keep the 16*pic_stride-16
+    sub     x9, x9, x2      //x9 keep the 16*pic_stride-pic_width
+
+vaa_calc_sad_ssd_bgd_height_loop:
+    mov     w11, w2
+vaa_calc_sad_ssd_bgd_width_loop:
+    SAD_SSD_BGD_8x16BYTES_1     //psad:v2, v16, psum:v28, psqsum:v27, psqdiff:v29, psd:v4, v5, v6, v7, pmad:v31, v26
+    SAD_SSD_BGD_8x16BYTES_2
+
+    umaxv   b22, v31.8b
+    ins     v31.d[0], v31.d[1]
+    umaxv   b23, v31.8b
+    umaxv   b24, v26.8b
+    ins     v26.d[0], v26.d[1]
+    umaxv   b25, v26.8b
+    st4     {v22.b, v23.b, v24.b, v25.b}[0], [x15], #4
+
+    usubl   v20.4s, v4.4h, v5.4h
+    usubl2  v21.4s, v4.8h, v5.8h
+    addv    s20, v20.4s
+    addv    s21, v21.4s
+    usubl   v22.4s, v6.4h, v7.4h
+    usubl2  v23.4s, v6.8h, v7.8h
+    addv    s22, v22.4s
+    addv    s23, v23.4s
+    st4     {v20.s, v21.s, v22.s, v23.s}[0], [x14], #16
+
+    uaddlv  s20, v2.4h
+    ins     v2.d[0], v2.d[1]
+    uaddlv  s21, v2.4h
+    uaddlv  s22, v16.4h
+    ins     v16.d[0], v16.d[1]
+    uaddlv  s23, v16.4h
+    st4     {v20.s, v21.s, v22.s, v23.s}[0], [x6], #16
+
+    uaddlv  s28, v28.8h
+    str     s28, [x7], #4
+    addv    s27, v27.4s
+    str     s27, [x12], #4
+    addv    s29, v29.4s
+    str     s29, [x13], #4
+
+    sub     x0, x0, x10
+    sub     x1, x1, x10
+    sub     w11, w11, #16
+    add     v29.2s, v20.2s, v21.2s
+    add     v30.2s, v22.2s, v23.2s
+    add     v29.2s, v29.2s, v30.2s
+    add     v17.2s, v17.2s, v29.2s
+    cbnz    w11, vaa_calc_sad_ssd_bgd_width_loop
+
+    add     x0, x0, x9
+    add     x1, x1, x9
+    sub     w3, w3, #16
+    cbnz    w3, vaa_calc_sad_ssd_bgd_height_loop
+    str     s17, [x5]
+WELS_ASM_AARCH64_FUNC_END
+
+
+.macro SAD_SSD_8x16BYTES_1
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v31.16b, v0.16b, v1.16b
+    umull   v30.8h, v31.8b, v31.8b
+    uaddlp  v29.4s, v30.8h
+    umull2  v30.8h, v31.16b, v31.16b
+    uadalp  v29.4s, v30.8h      //  p_sqdiff
+
+    uaddlp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uaddlp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+
+    uaddlp  v2.8h, v31.16b      //  p_sad
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    umull   v30.8h, v3.8b, v3.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v3.16b, v3.16b
+    uadalp  v29.4s, v30.8h              //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+
+    uadalp  v2.8h, v3.16b              //p_sad
+.endr
+.endm
+
+.macro SAD_SSD_8x16BYTES_2
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v26.16b, v0.16b, v1.16b
+    umull   v30.8h, v26.8b, v26.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v26.16b, v26.16b
+    uadalp  v29.4s, v30.8h      //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+
+    uaddlp  v16.8h,v26.16b      //  p_sad
+    uaddlp  v6.8h, v0.16b
+    uaddlp  v7.8h, v1.16b
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    umull   v30.8h, v3.8b, v3.8b
+    uadalp  v29.4s, v30.8h
+    umull2  v30.8h, v3.16b, v3.16b
+    uadalp  v29.4s, v30.8h              //  p_sqdiff
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+
+    uadalp  v16.8h, v3.16b              //p_sad
+.endr
+.endm
+/*
+ * void vaa_calc_sad_ssd_c(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
+ *        int32_t *psadframe,int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16, int32_t *psqdiff16x16)
+ */
+WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSadSsd_AArch64_neon
+    ldr     x12, [sp, #0]   //psqsum16x16
+    ldr     x13, [sp, #8]   //psqdiff16x16
+    eor     v17.16b, v17.16b, v17.16b
+
+    SIGN_EXTENSION x4, w4
+    lsl     x9, x4, #4
+    sub     x10, x9, #16    //x10 keep the 16*pic_stride-16
+    sub     x9, x9, x2      //x9 keep the 16*pic_stride-pic_width
+
+vaa_calc_sad_ssd_height_loop:
+    mov     w11, w2
+vaa_calc_sad_ssd_width_loop:
+    SAD_SSD_8x16BYTES_1     //psad:v2, v16, psum:v28, psqsum:v27, psqdiff:v29
+    SAD_SSD_8x16BYTES_2
+
+    uaddlv  s20, v2.4h
+    ins     v2.d[0], v2.d[1]
+    uaddlv  s21, v2.4h
+    uaddlv  s22, v16.4h
+    ins     v16.d[0], v16.d[1]
+    uaddlv  s23, v16.4h
+    st4     {v20.s, v21.s, v22.s, v23.s}[0], [x6], #16
+
+    uaddlv  s28, v28.8h
+    str     s28, [x7], #4
+    addv    s27, v27.4s
+    str     s27, [x12], #4
+    addv    s29, v29.4s
+    str     s29, [x13], #4
+
+    sub     x0, x0, x10
+    sub     x1, x1, x10
+    sub     w11, w11, #16
+    add     v29.2s, v20.2s, v21.2s
+    add     v30.2s, v22.2s, v23.2s
+    add     v29.2s, v29.2s, v30.2s
+    add     v17.2s, v17.2s, v29.2s
+    cbnz    w11, vaa_calc_sad_ssd_width_loop
+
+    add     x0, x0, x9
+    add     x1, x1, x9
+    sub     w3, w3, #16
+    cbnz    w3, vaa_calc_sad_ssd_height_loop
+    str     s17, [x5]
+WELS_ASM_AARCH64_FUNC_END
+
+
+.macro SAD_VAR_8x16BYTES_1
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v31.16b, v0.16b, v1.16b
+    uaddlp  v2.8h, v31.16b      //  p_sad
+
+    uaddlp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uaddlp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    uadalp  v2.8h, v3.16b              //p_sad
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+.endr
+.endm
+.macro SAD_VAR_8x16BYTES_2
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v26.16b, v0.16b, v1.16b
+    uaddlp  v16.8h,v26.16b      //  p_sad
+
+    uadalp  v28.8h, v0.16b      //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h      //  p_sqsum
+.rept 7
+    ld1     {v0.16b}, [x0], x4
+    ld1     {v1.16b}, [x1], x4
+    uabd    v3.16b, v0.16b, v1.16b
+    uadalp  v16.8h, v3.16b              //p_sad
+
+    uadalp  v28.8h, v0.16b              //  p_sum
+    umull   v30.8h, v0.8b, v0.8b
+    uadalp  v27.4s, v30.8h
+    umull2  v30.8h, v0.16b, v0.16b
+    uadalp  v27.4s, v30.8h              //  p_sqsum
+.endr
+.endm
+
+/*
+ * void vaa_calc_sad_var_c(uint8_t *cur_data, uint8_t *ref_data, int32_t pic_width, int32_t pic_height, int32_t pic_stride,
+ *        int32_t *psadframe,int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16)
+ */
+WELS_ASM_AARCH64_FUNC_BEGIN VAACalcSadVar_AArch64_neon
+    ldr     x12, [sp, #0]   //psqsum16x16
+    eor     v17.16b, v17.16b, v17.16b
+
+    SIGN_EXTENSION x4, w4
+    lsl     x9, x4, #4
+    sub     x10, x9, #16    //x10 keep the 16*pic_stride-16
+    sub     x9, x9, x2      //x9 keep the 16*pic_stride-pic_width
+
+vaa_calc_sad_var_height_loop:
+    mov     w11, w2
+vaa_calc_sad_var_width_loop:
+    SAD_VAR_8x16BYTES_1     //psad:v2, v16, psum:v28, psqsum:v27
+    SAD_VAR_8x16BYTES_2
+
+    uaddlv  s20, v2.4h
+    ins     v2.d[0], v2.d[1]
+    uaddlv  s21, v2.4h
+    uaddlv  s22, v16.4h
+    ins     v16.d[0], v16.d[1]
+    uaddlv  s23, v16.4h
+    st4     {v20.s, v21.s, v22.s, v23.s}[0], [x6], #16
+
+    uaddlv  s28, v28.8h
+    str     s28, [x7], #4
+    addv    s27, v27.4s
+    str     s27, [x12], #4
+
+    sub     x0, x0, x10
+    sub     x1, x1, x10
+    sub     w11, w11, #16
+    add     v29.2s, v20.2s, v21.2s
+    add     v30.2s, v22.2s, v23.2s
+    add     v29.2s, v29.2s, v30.2s
+    add     v17.2s, v17.2s, v29.2s
+
+    cbnz    w11, vaa_calc_sad_var_width_loop
+
+    add     x0, x0, x9
+    add     x1, x1, x9
+    sub     w3, w3, #16
+    cbnz    w3, vaa_calc_sad_var_height_loop
+    str     s17, [x5]
+WELS_ASM_AARCH64_FUNC_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
new file mode 100644
index 0000000000..1e66a62918
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.cpp
@@ -0,0 +1,383 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "BackgroundDetection.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+#define LOG2_BGD_OU_SIZE    (4)
+#define LOG2_BGD_OU_SIZE_UV (LOG2_BGD_OU_SIZE-1)
+#define BGD_OU_SIZE         (1<<LOG2_BGD_OU_SIZE)
+#define BGD_OU_SIZE_UV      (BGD_OU_SIZE>>1)
+#define BGD_THD_SAD         (2*BGD_OU_SIZE*BGD_OU_SIZE)
+#define BGD_THD_ASD_UV      (4*BGD_OU_SIZE_UV)
+#define LOG2_MB_SIZE        (4)
+#define OU_SIZE_IN_MB       (BGD_OU_SIZE >> 4)
+#define Q_FACTOR            (8)
+#define BGD_DELTA_QP_THD    (3)
+
+#define OU_LEFT         (0x01)
+#define OU_RIGHT        (0x02)
+#define OU_TOP          (0x04)
+#define OU_BOTTOM       (0x08)
+
+CBackgroundDetection::CBackgroundDetection (int32_t iCpuFlag) {
+  m_eMethod = METHOD_BACKGROUND_DETECTION;
+  WelsMemset (&m_BgdParam, 0, sizeof (m_BgdParam));
+  m_iLargestFrameSize = 0;
+}
+
+CBackgroundDetection::~CBackgroundDetection() {
+  WelsFree (m_BgdParam.pOU_array);
+}
+
+EResult CBackgroundDetection::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  EResult eReturn = RET_INVALIDPARAM;
+
+  if (pSrcPixMap == NULL || pRefPixMap == NULL)
+    return eReturn;
+
+  m_BgdParam.pCur[0] = (uint8_t*)pSrcPixMap->pPixel[0];
+  m_BgdParam.pCur[1] = (uint8_t*)pSrcPixMap->pPixel[1];
+  m_BgdParam.pCur[2] = (uint8_t*)pSrcPixMap->pPixel[2];
+  m_BgdParam.pRef[0] = (uint8_t*)pRefPixMap->pPixel[0];
+  m_BgdParam.pRef[1] = (uint8_t*)pRefPixMap->pPixel[1];
+  m_BgdParam.pRef[2] = (uint8_t*)pRefPixMap->pPixel[2];
+  m_BgdParam.iBgdWidth = pSrcPixMap->sRect.iRectWidth;
+  m_BgdParam.iBgdHeight = pSrcPixMap->sRect.iRectHeight;
+  m_BgdParam.iStride[0] = pSrcPixMap->iStride[0];
+  m_BgdParam.iStride[1] = pSrcPixMap->iStride[1];
+  m_BgdParam.iStride[2] = pSrcPixMap->iStride[2];
+
+  int32_t iCurFrameSize = m_BgdParam.iBgdWidth * m_BgdParam.iBgdHeight;
+  if (m_BgdParam.pOU_array == NULL || iCurFrameSize > m_iLargestFrameSize) {
+    WelsFree (m_BgdParam.pOU_array);
+    m_BgdParam.pOU_array = AllocateOUArrayMemory (m_BgdParam.iBgdWidth, m_BgdParam.iBgdHeight);
+    m_iLargestFrameSize = iCurFrameSize;
+  }
+
+  if (m_BgdParam.pOU_array == NULL)
+    return eReturn;
+
+  BackgroundDetection (&m_BgdParam);
+
+  return RET_SUCCESS;
+}
+
+EResult CBackgroundDetection::Set (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  SBGDInterface* pInterface = (SBGDInterface*)pParam;
+
+  m_BgdParam.pBackgroundMbFlag = (int8_t*)pInterface->pBackgroundMbFlag;
+  m_BgdParam.pCalcRes = pInterface->pCalcRes;
+
+  return RET_SUCCESS;
+}
+
+inline SBackgroundOU* CBackgroundDetection::AllocateOUArrayMemory (int32_t iWidth, int32_t iHeight) {
+  int32_t       iMaxOUWidth     = (BGD_OU_SIZE - 1 + iWidth) >> LOG2_BGD_OU_SIZE;
+  int32_t       iMaxOUHeight    = (BGD_OU_SIZE - 1 + iHeight) >> LOG2_BGD_OU_SIZE;
+  return (SBackgroundOU*)WelsMalloc (iMaxOUWidth * iMaxOUHeight * sizeof (SBackgroundOU));
+}
+
+void CBackgroundDetection::GetOUParameters (SVAACalcResult* sVaaCalcInfo, int32_t iMbIndex, int32_t iMbWidth,
+    SBackgroundOU* pBgdOU) {
+  int32_t       iSubSD[4];
+  uint8_t       iSubMAD[4];
+  int32_t       iSubSAD[4];
+
+  uint8_t (*pMad8x8)[4];
+  int32_t (*pSad8x8)[4];
+  int32_t (*pSd8x8)[4];
+
+  pSad8x8 = sVaaCalcInfo->pSad8x8;
+  pMad8x8 = sVaaCalcInfo->pMad8x8;
+  pSd8x8  = sVaaCalcInfo->pSumOfDiff8x8;
+
+  iSubSAD[0] = pSad8x8[iMbIndex][0];
+  iSubSAD[1] = pSad8x8[iMbIndex][1];
+  iSubSAD[2] = pSad8x8[iMbIndex][2];
+  iSubSAD[3] = pSad8x8[iMbIndex][3];
+
+  iSubSD[0] = pSd8x8[iMbIndex][0];
+  iSubSD[1] = pSd8x8[iMbIndex][1];
+  iSubSD[2] = pSd8x8[iMbIndex][2];
+  iSubSD[3] = pSd8x8[iMbIndex][3];
+
+  iSubMAD[0] = pMad8x8[iMbIndex][0];
+  iSubMAD[1] = pMad8x8[iMbIndex][1];
+  iSubMAD[2] = pMad8x8[iMbIndex][2];
+  iSubMAD[3] = pMad8x8[iMbIndex][3];
+
+  pBgdOU->iSD   = iSubSD[0] + iSubSD[1] + iSubSD[2] + iSubSD[3];
+  pBgdOU->iSAD  = iSubSAD[0] + iSubSAD[1] + iSubSAD[2] + iSubSAD[3];
+  pBgdOU->iSD   = WELS_ABS (pBgdOU->iSD);
+
+  // get the max absolute difference (MAD) of OU and min value of the MAD of sub-blocks of OU
+  pBgdOU->iMAD = WELS_MAX (WELS_MAX (iSubMAD[0], iSubMAD[1]), WELS_MAX (iSubMAD[2], iSubMAD[3]));
+  pBgdOU->iMinSubMad = WELS_MIN (WELS_MIN (iSubMAD[0], iSubMAD[1]), WELS_MIN (iSubMAD[2], iSubMAD[3]));
+
+  // get difference between the max and min SD of the SDs of sub-blocks of OU
+  pBgdOU->iMaxDiffSubSd = WELS_MAX (WELS_MAX (iSubSD[0], iSubSD[1]), WELS_MAX (iSubSD[2], iSubSD[3])) -
+                          WELS_MIN (WELS_MIN (iSubSD[0], iSubSD[1]), WELS_MIN (iSubSD[2], iSubSD[3]));
+}
+
+void CBackgroundDetection::ForegroundBackgroundDivision (vBGDParam* pBgdParam) {
+  int32_t iPicWidthInOU         = pBgdParam->iBgdWidth  >> LOG2_BGD_OU_SIZE;
+  int32_t iPicHeightInOU        = pBgdParam->iBgdHeight >> LOG2_BGD_OU_SIZE;
+  int32_t iPicWidthInMb         = (15 + pBgdParam->iBgdWidth) >> 4;
+
+  SBackgroundOU* pBackgroundOU = pBgdParam->pOU_array;
+
+  for (int32_t j = 0; j < iPicHeightInOU; j ++) {
+    for (int32_t i = 0; i < iPicWidthInOU; i++) {
+      GetOUParameters (pBgdParam->pCalcRes, (j * iPicWidthInMb + i) << (LOG2_BGD_OU_SIZE - LOG2_MB_SIZE), iPicWidthInMb,
+                       pBackgroundOU);
+
+      pBackgroundOU->iBackgroundFlag = 0;
+      if (pBackgroundOU->iMAD > 63) {
+        pBackgroundOU++;
+        continue;
+      }
+      if ((pBackgroundOU->iMaxDiffSubSd <= pBackgroundOU->iSAD >> 3
+           || pBackgroundOU->iMaxDiffSubSd <= (BGD_OU_SIZE * Q_FACTOR))
+          && pBackgroundOU->iSAD < (BGD_THD_SAD << 1)) { //BGD_OU_SIZE*BGD_OU_SIZE>>2
+        if (pBackgroundOU->iSAD <= BGD_OU_SIZE * Q_FACTOR) {
+          pBackgroundOU->iBackgroundFlag = 1;
+        } else {
+          pBackgroundOU->iBackgroundFlag = pBackgroundOU->iSAD < BGD_THD_SAD ?
+                                           (pBackgroundOU->iSD < (pBackgroundOU->iSAD * 3) >> 2) :
+                                           (pBackgroundOU->iSD << 1 < pBackgroundOU->iSAD);
+        }
+      }
+      pBackgroundOU++;
+    }
+  }
+}
+inline int32_t CBackgroundDetection::CalculateAsdChromaEdge (uint8_t* pOriRef, uint8_t* pOriCur, int32_t iStride) {
+  int32_t ASD = 0;
+  int32_t idx;
+  for (idx = 0; idx < BGD_OU_SIZE_UV; idx++) {
+    ASD += *pOriCur - *pOriRef;
+    pOriRef += iStride;
+    pOriCur += iStride;
+  }
+  return WELS_ABS (ASD);
+}
+
+inline bool CBackgroundDetection::ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+    SBackgroundOU* pOUNeighbours[]) {
+  SBackgroundOU* pOU_L = pOUNeighbours[0];
+  SBackgroundOU* pOU_R = pOUNeighbours[1];
+  SBackgroundOU* pOU_U = pOUNeighbours[2];
+  SBackgroundOU* pOU_D = pOUNeighbours[3];
+
+  if (pBackgroundOU->iMAD > pBackgroundOU->iMinSubMad << 1) {
+    int32_t iMaxNbrForegroundMad;
+    int32_t iMaxNbrBackgroundMad;
+    int32_t aBackgroundMad[4];
+    int32_t aForegroundMad[4];
+
+    aForegroundMad[0] = (pOU_L->iBackgroundFlag - 1) & pOU_L->iMAD;
+    aForegroundMad[1] = (pOU_R->iBackgroundFlag - 1) & pOU_R->iMAD;
+    aForegroundMad[2] = (pOU_U->iBackgroundFlag - 1) & pOU_U->iMAD;
+    aForegroundMad[3] = (pOU_D->iBackgroundFlag - 1) & pOU_D->iMAD;
+    iMaxNbrForegroundMad = WELS_MAX (WELS_MAX (aForegroundMad[0], aForegroundMad[1]), WELS_MAX (aForegroundMad[2],
+                                     aForegroundMad[3]));
+
+    aBackgroundMad[0] = ((!pOU_L->iBackgroundFlag) - 1) & pOU_L->iMAD;
+    aBackgroundMad[1] = ((!pOU_R->iBackgroundFlag) - 1) & pOU_R->iMAD;
+    aBackgroundMad[2] = ((!pOU_U->iBackgroundFlag) - 1) & pOU_U->iMAD;
+    aBackgroundMad[3] = ((!pOU_D->iBackgroundFlag) - 1) & pOU_D->iMAD;
+    iMaxNbrBackgroundMad = WELS_MAX (WELS_MAX (aBackgroundMad[0], aBackgroundMad[1]), WELS_MAX (aBackgroundMad[2],
+                                     aBackgroundMad[3]));
+
+    return ((iMaxNbrForegroundMad > pBackgroundOU->iMinSubMad << 2) || (pBackgroundOU->iMAD > iMaxNbrBackgroundMad << 1
+            && pBackgroundOU->iMAD <= (iMaxNbrForegroundMad * 3) >> 1));
+  }
+  return 0;
+}
+
+inline bool CBackgroundDetection::ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags,
+    int32_t iStartSamplePos, int32_t iPicStrideUV, vBGDParam* pBgdParam) {
+  static const int8_t kaOUPos[4]        = {OU_LEFT, OU_RIGHT, OU_TOP, OU_BOTTOM};
+  int32_t       aEdgeOffset[4]          = {0, BGD_OU_SIZE_UV - 1, 0, iPicStrideUV* (BGD_OU_SIZE_UV - 1)};
+  int32_t       iStride[4]              = {iPicStrideUV, iPicStrideUV, 1, 1};
+
+  // V component first, high probability because V stands for red color and human skin colors have more weight on this component
+  for (int32_t i = 0; i < 4; i++) {
+    if (iNeighbourForegroundFlags & kaOUPos[i]) {
+      uint8_t* pRefC = pBgdParam->pRef[2] + iStartSamplePos + aEdgeOffset[i];
+      uint8_t* pCurC = pBgdParam->pCur[2] + iStartSamplePos + aEdgeOffset[i];
+      if (CalculateAsdChromaEdge (pRefC, pCurC, iStride[i]) > BGD_THD_ASD_UV) {
+        return 1;
+      }
+    }
+  }
+  // U component, which stands for blue color, low probability
+  for (int32_t i = 0; i < 4; i++) {
+    if (iNeighbourForegroundFlags & kaOUPos[i]) {
+      uint8_t* pRefC = pBgdParam->pRef[1] + iStartSamplePos + aEdgeOffset[i];
+      uint8_t* pCurC = pBgdParam->pCur[1] + iStartSamplePos + aEdgeOffset[i];
+      if (CalculateAsdChromaEdge (pRefC, pCurC, iStride[i]) > BGD_THD_ASD_UV) {
+        return 1;
+      }
+    }
+  }
+
+  return 0;
+}
+
+inline void CBackgroundDetection::ForegroundDilation (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[],
+    vBGDParam* pBgdParam, int32_t iChromaSampleStartPos) {
+  int32_t iPicStrideUV = pBgdParam->iStride[1];
+  int32_t iSumNeighBackgroundFlags = pOUNeighbours[0]->iBackgroundFlag + pOUNeighbours[1]->iBackgroundFlag +
+                                      pOUNeighbours[2]->iBackgroundFlag + pOUNeighbours[3]->iBackgroundFlag;
+
+  if (pBackgroundOU->iSAD > BGD_OU_SIZE * Q_FACTOR) {
+    switch (iSumNeighBackgroundFlags) {
+    case 0:
+    case 1:
+      pBackgroundOU->iBackgroundFlag = 0;
+      break;
+    case 2:
+    case 3:
+      pBackgroundOU->iBackgroundFlag = !ForegroundDilation23Luma (pBackgroundOU, pOUNeighbours);
+
+      // chroma component check
+      if (pBackgroundOU->iBackgroundFlag == 1) {
+        int8_t iNeighbourForegroundFlags = (!pOUNeighbours[0]->iBackgroundFlag) | ((!pOUNeighbours[1]->iBackgroundFlag) << 1)
+                                            | ((!pOUNeighbours[2]->iBackgroundFlag) << 2) | ((!pOUNeighbours[3]->iBackgroundFlag) << 3);
+        pBackgroundOU->iBackgroundFlag = !ForegroundDilation23Chroma (iNeighbourForegroundFlags, iChromaSampleStartPos,
+                                         iPicStrideUV, pBgdParam);
+      }
+      break;
+    default:
+      break;
+    }
+  }
+}
+inline void CBackgroundDetection::BackgroundErosion (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[]) {
+  if (pBackgroundOU->iMaxDiffSubSd <= (BGD_OU_SIZE * Q_FACTOR)) { //BGD_OU_SIZE*BGD_OU_SIZE>>2
+    int32_t iSumNeighBackgroundFlags = pOUNeighbours[0]->iBackgroundFlag + pOUNeighbours[1]->iBackgroundFlag +
+                                       pOUNeighbours[2]->iBackgroundFlag + pOUNeighbours[3]->iBackgroundFlag;
+    int32_t sumNbrBGsad = (pOUNeighbours[0]->iSAD & (-pOUNeighbours[0]->iBackgroundFlag)) + (pOUNeighbours[2]->iSAD &
+                          (-pOUNeighbours[2]->iBackgroundFlag))
+                          + (pOUNeighbours[1]->iSAD & (-pOUNeighbours[1]->iBackgroundFlag)) + (pOUNeighbours[3]->iSAD &
+                              (-pOUNeighbours[3]->iBackgroundFlag));
+    if (pBackgroundOU->iSAD * iSumNeighBackgroundFlags <= (3 * sumNbrBGsad) >> 1) {
+      if (iSumNeighBackgroundFlags == 4) {
+        pBackgroundOU->iBackgroundFlag = 1;
+      } else {
+        if ((pOUNeighbours[0]->iBackgroundFlag & pOUNeighbours[1]->iBackgroundFlag)
+            || (pOUNeighbours[2]->iBackgroundFlag & pOUNeighbours[3]->iBackgroundFlag)) {
+          pBackgroundOU->iBackgroundFlag = !ForegroundDilation23Luma (pBackgroundOU, pOUNeighbours);
+        }
+      }
+    }
+  }
+}
+
+inline void CBackgroundDetection::SetBackgroundMbFlag (int8_t* pBackgroundMbFlag, int32_t iPicWidthInMb,
+    int32_t iBackgroundMbFlag) {
+  *pBackgroundMbFlag = iBackgroundMbFlag;
+}
+
+inline void CBackgroundDetection::UpperOUForegroundCheck (SBackgroundOU* pCurOU, int8_t* pBackgroundMbFlag,
+    int32_t iPicWidthInOU, int32_t iPicWidthInMb) {
+  if (pCurOU->iSAD > BGD_OU_SIZE * Q_FACTOR) {
+    SBackgroundOU* pOU_L = pCurOU - 1;
+    SBackgroundOU* pOU_R = pCurOU + 1;
+    SBackgroundOU* pOU_U = pCurOU - iPicWidthInOU;
+    SBackgroundOU* pOU_D = pCurOU + iPicWidthInOU;
+    if (pOU_L->iBackgroundFlag + pOU_R->iBackgroundFlag + pOU_U->iBackgroundFlag + pOU_D->iBackgroundFlag <= 1) {
+      SetBackgroundMbFlag (pBackgroundMbFlag, iPicWidthInMb, 0);
+      pCurOU->iBackgroundFlag = 0;
+    }
+  }
+}
+
+void CBackgroundDetection::ForegroundDilationAndBackgroundErosion (vBGDParam* pBgdParam) {
+  int32_t iPicStrideUV          = pBgdParam->iStride[1];
+  int32_t iPicWidthInOU         = pBgdParam->iBgdWidth  >> LOG2_BGD_OU_SIZE;
+  int32_t iPicHeightInOU        = pBgdParam->iBgdHeight >> LOG2_BGD_OU_SIZE;
+  int32_t iOUStrideUV           = iPicStrideUV << (LOG2_BGD_OU_SIZE - 1);
+  int32_t iPicWidthInMb         = (15 + pBgdParam->iBgdWidth) >> 4;
+
+  SBackgroundOU* pBackgroundOU = pBgdParam->pOU_array;
+  int8_t*        pVaaBackgroundMbFlag = (int8_t*)pBgdParam->pBackgroundMbFlag;
+  SBackgroundOU* pOUNeighbours[4];//0: left; 1: right; 2: top; 3: bottom
+
+  pOUNeighbours[2]      = pBackgroundOU;//top OU
+  for (int32_t j = 0; j < iPicHeightInOU; j ++) {
+    int8_t* pRowSkipFlag = pVaaBackgroundMbFlag;
+    pOUNeighbours[0]    = pBackgroundOU;//left OU
+    pOUNeighbours[3]    = pBackgroundOU + (iPicWidthInOU & ((j == iPicHeightInOU - 1) - 1)); //bottom OU
+    for (int32_t i = 0; i < iPicWidthInOU; i++) {
+      pOUNeighbours[1] = pBackgroundOU + (i < iPicWidthInOU - 1); //right OU
+
+      if (pBackgroundOU->iBackgroundFlag)
+        ForegroundDilation (pBackgroundOU, pOUNeighbours, pBgdParam, j * iOUStrideUV + (i << LOG2_BGD_OU_SIZE_UV));
+      else
+        BackgroundErosion (pBackgroundOU, pOUNeighbours);
+
+      // check the up OU
+      if (j > 1 && i > 0 && i < iPicWidthInOU - 1 && pOUNeighbours[2]->iBackgroundFlag == 1) {
+        UpperOUForegroundCheck (pOUNeighbours[2], pRowSkipFlag - OU_SIZE_IN_MB * iPicWidthInMb, iPicWidthInOU, iPicWidthInMb);
+      }
+
+      SetBackgroundMbFlag (pRowSkipFlag, iPicWidthInMb, pBackgroundOU->iBackgroundFlag);
+
+      // preparation for the next OU
+      pRowSkipFlag += OU_SIZE_IN_MB;
+      pOUNeighbours[0] = pBackgroundOU;
+      pOUNeighbours[2]++;
+      pOUNeighbours[3]++;
+      pBackgroundOU++;
+    }
+    pOUNeighbours[2]      = pBackgroundOU - iPicWidthInOU;
+    pVaaBackgroundMbFlag += OU_SIZE_IN_MB * iPicWidthInMb;
+  }
+}
+
+void CBackgroundDetection::BackgroundDetection (vBGDParam* pBgdParam) {
+  // 1st step: foreground/background coarse division
+  ForegroundBackgroundDivision (pBgdParam);
+
+  // 2nd step: foreground dilation and background erosion
+  ForegroundDilationAndBackgroundErosion (pBgdParam);
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.h
new file mode 100644
index 0000000000..80d916ddc5
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/backgrounddetection/BackgroundDetection.h
@@ -0,0 +1,105 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  BackgroundDetection.h
+ *
+ * \brief       :  background detection class of wels video processor class
+ *
+ * \date        :  2011/03/17
+ *
+ * \description :  1. rewrite the package code of background detection class
+ *
+ */
+
+#ifndef WELSVP_BACKGROUNDDETECTION_H
+#define WELSVP_BACKGROUNDDETECTION_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef struct {
+  int32_t       iBackgroundFlag;
+  int32_t       iSAD;
+  int32_t       iSD;
+  int32_t       iMAD;
+  int32_t       iMinSubMad;
+  int32_t       iMaxDiffSubSd;
+} SBackgroundOU;
+
+class CBackgroundDetection : public IStrategy {
+ public:
+  CBackgroundDetection (int32_t iCpuFlag);
+  ~CBackgroundDetection();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pRef);
+  EResult Set (int32_t iType, void* pParam);
+
+ private:
+  struct vBGDParam {
+    uint8_t*   pCur[3];
+    uint8_t*   pRef[3];
+    int32_t    iBgdWidth;
+    int32_t    iBgdHeight;
+    int32_t    iStride[3];
+    SBackgroundOU*   pOU_array;
+    int8_t*    pBackgroundMbFlag;
+    SVAACalcResult*  pCalcRes;
+  } m_BgdParam;
+
+  int32_t     m_iLargestFrameSize;
+
+ private:
+  inline SBackgroundOU* AllocateOUArrayMemory (int32_t iWidth, int32_t iHeight);
+  inline int32_t  CalculateAsdChromaEdge (uint8_t* pOriRef, uint8_t* pOriCur, int32_t iStride);
+  inline bool   ForegroundDilation23Luma (SBackgroundOU* pBackgroundOU,
+                                          SBackgroundOU* pOUNeighbours[]); //Foreground_Dilation_2_3_Luma
+  inline bool   ForegroundDilation23Chroma (int8_t iNeighbourForegroundFlags, int32_t iStartSamplePos,
+      int32_t iPicStrideUV, vBGDParam* pBgdParam);//Foreground_Dilation_2_3_Chroma
+  inline void     ForegroundDilation (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[], vBGDParam* pBgdParam,
+                                      int32_t iChromaSampleStartPos);
+  inline void     BackgroundErosion (SBackgroundOU* pBackgroundOU, SBackgroundOU* pOUNeighbours[]);
+  inline void     SetBackgroundMbFlag (int8_t* pBackgroundMbFlag, int32_t iPicWidthInMb, int32_t iBackgroundMbFlag);
+  inline void     UpperOUForegroundCheck (SBackgroundOU* pCurOU, int8_t* pBackgroundMbFlag, int32_t iPicWidthInOU,
+                                          int32_t iPicWidthInMb);
+
+  void    GetOUParameters (SVAACalcResult* sVaaCalcInfo, int32_t iMbIndex, int32_t iMbWidth,
+                           SBackgroundOU* pBackgroundOU);
+  void    ForegroundBackgroundDivision (vBGDParam* pBgdParam);
+  void    ForegroundDilationAndBackgroundErosion (vBGDParam* pBgdParam);
+  void    BackgroundDetection (vBGDParam* pBgdParam);
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.cpp
new file mode 100644
index 0000000000..79e196b795
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.cpp
@@ -0,0 +1,302 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "WelsFrameWork.h"
+#include "../denoise/denoise.h"
+#include "../downsample/downsample.h"
+#include "../scrolldetection/ScrollDetection.h"
+#include "../scenechangedetection/SceneChangeDetection.h"
+#include "../vaacalc/vaacalculation.h"
+#include "../backgrounddetection/BackgroundDetection.h"
+#include "../adaptivequantization/AdaptiveQuantization.h"
+#include "../complexityanalysis/ComplexityAnalysis.h"
+#include "../imagerotate/imagerotate.h"
+#include "util.h"
+
+/* interface API implement */
+
+EResult WelsCreateVpInterface (void** ppCtx, int iVersion) {
+  if (iVersion & 0x8000)
+    return WelsVP::CreateSpecificVpInterface ((IWelsVP**)ppCtx);
+  else if (iVersion & 0x7fff)
+    return WelsVP::CreateSpecificVpInterface ((IWelsVPc**)ppCtx);
+  else
+    return RET_INVALIDPARAM;
+}
+
+EResult WelsDestroyVpInterface (void* pCtx, int iVersion) {
+  if (iVersion & 0x8000)
+    return WelsVP::DestroySpecificVpInterface ((IWelsVP*)pCtx);
+  else if (iVersion & 0x7fff)
+    return WelsVP::DestroySpecificVpInterface ((IWelsVPc*)pCtx);
+  else
+    return RET_INVALIDPARAM;
+}
+
+WELSVP_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////
+
+EResult CreateSpecificVpInterface (IWelsVP** ppCtx) {
+  EResult  eReturn = RET_FAILED;
+
+  CVpFrameWork* pFr = new CVpFrameWork (1, eReturn);
+  if (pFr) {
+    *ppCtx  = (IWelsVP*)pFr;
+    eReturn = RET_SUCCESS;
+  }
+
+  return eReturn;
+}
+
+EResult DestroySpecificVpInterface (IWelsVP* pCtx) {
+  delete pCtx;
+
+  return RET_SUCCESS;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+CVpFrameWork::CVpFrameWork (uint32_t uiThreadsNum, EResult& eReturn) {
+  int32_t iCoreNum = 1;
+  uint32_t uiCPUFlag = WelsCPUFeatureDetect (&iCoreNum);
+
+  for (int32_t i = 0; i < MAX_STRATEGY_NUM; i++) {
+    m_pStgChain[i] = CreateStrategy (WelsStaticCast (EMethods, i + 1), uiCPUFlag);
+  }
+
+  WelsMutexInit (&m_mutes);
+
+  eReturn = RET_SUCCESS;
+}
+
+CVpFrameWork::~CVpFrameWork() {
+  for (int32_t i = 0; i < MAX_STRATEGY_NUM; i++) {
+    if (m_pStgChain[i]) {
+      Uninit (m_pStgChain[i]->m_eMethod);
+      delete m_pStgChain[i];
+    }
+  }
+
+  WelsMutexDestroy (&m_mutes);
+}
+
+EResult CVpFrameWork::Init (int32_t iType, void* pCfg) {
+  EResult eReturn   = RET_SUCCESS;
+  int32_t iCurIdx    = WelsStaticCast (int32_t, WelsVpGetValidMethod (iType)) - 1;
+
+  Uninit (iType);
+
+  WelsMutexLock (&m_mutes);
+
+  IStrategy* pStrategy = m_pStgChain[iCurIdx];
+  if (pStrategy)
+    eReturn = pStrategy->Init (0, pCfg);
+
+  WelsMutexUnlock (&m_mutes);
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::Uninit (int32_t iType) {
+  EResult eReturn        = RET_SUCCESS;
+  int32_t iCurIdx    = WelsStaticCast (int32_t, WelsVpGetValidMethod (iType)) - 1;
+
+  WelsMutexLock (&m_mutes);
+
+  IStrategy* pStrategy = m_pStgChain[iCurIdx];
+  if (pStrategy)
+    eReturn = pStrategy->Uninit (0);
+
+  WelsMutexUnlock (&m_mutes);
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::Flush (int32_t iType) {
+  EResult eReturn        = RET_SUCCESS;
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pDstPixMap) {
+  EResult eReturn        = RET_NOTSUPPORTED;
+  EMethods eMethod    = WelsVpGetValidMethod (iType);
+  int32_t iCurIdx    = WelsStaticCast (int32_t, eMethod) - 1;
+  SPixMap sSrcPic;
+  SPixMap sDstPic;
+  memset (&sSrcPic, 0, sizeof (sSrcPic)); // confirmed_safe_unsafe_usage
+  memset (&sDstPic, 0, sizeof (sDstPic)); // confirmed_safe_unsafe_usage
+
+  if (pSrcPixMap) sSrcPic = *pSrcPixMap;
+  if (pDstPixMap) sDstPic = *pDstPixMap;
+  if (!CheckValid (eMethod, sSrcPic, sDstPic))
+    return RET_INVALIDPARAM;
+
+  WelsMutexLock (&m_mutes);
+
+  IStrategy* pStrategy = m_pStgChain[iCurIdx];
+  if (pStrategy)
+    eReturn = pStrategy->Process (0, &sSrcPic, &sDstPic);
+
+  WelsMutexUnlock (&m_mutes);
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::Get (int32_t iType, void* pParam) {
+  EResult eReturn        = RET_SUCCESS;
+  int32_t iCurIdx    = WelsStaticCast (int32_t, WelsVpGetValidMethod (iType)) - 1;
+
+  if (!pParam)
+    return RET_INVALIDPARAM;
+
+  WelsMutexLock (&m_mutes);
+
+  IStrategy* pStrategy = m_pStgChain[iCurIdx];
+  if (pStrategy)
+    eReturn = pStrategy->Get (0, pParam);
+
+  WelsMutexUnlock (&m_mutes);
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::Set (int32_t iType, void* pParam) {
+  EResult eReturn        = RET_SUCCESS;
+  int32_t iCurIdx    = WelsStaticCast (int32_t, WelsVpGetValidMethod (iType)) - 1;
+
+  if (!pParam)
+    return RET_INVALIDPARAM;
+
+  WelsMutexLock (&m_mutes);
+
+  IStrategy* pStrategy = m_pStgChain[iCurIdx];
+  if (pStrategy)
+    eReturn = pStrategy->Set (0, pParam);
+
+  WelsMutexUnlock (&m_mutes);
+
+  return eReturn;
+}
+
+EResult CVpFrameWork::SpecialFeature (int32_t iType, void* pIn, void* pOut) {
+  EResult eReturn        = RET_SUCCESS;
+
+  return eReturn;
+}
+
+bool  CVpFrameWork::CheckValid (EMethods eMethod, SPixMap& pSrcPixMap, SPixMap& pDstPixMap) {
+  bool eReturn = false;
+
+  if (eMethod == METHOD_NULL)
+    goto exit;
+
+  if (eMethod != METHOD_COLORSPACE_CONVERT) {
+    if (pSrcPixMap.pPixel[0]) {
+      if (pSrcPixMap.eFormat != VIDEO_FORMAT_I420 && pSrcPixMap.eFormat != VIDEO_FORMAT_YV12)
+        goto exit;
+    }
+    if (pSrcPixMap.pPixel[0] && pDstPixMap.pPixel[0]) {
+      if (pDstPixMap.eFormat != pSrcPixMap.eFormat)
+        goto exit;
+    }
+  }
+
+  if (pSrcPixMap.pPixel[0]) {
+    if (pSrcPixMap.sRect.iRectWidth <= 0 || pSrcPixMap.sRect.iRectHeight <= 0
+        || pSrcPixMap.sRect.iRectWidth * pSrcPixMap.sRect.iRectHeight > (MAX_MBS_PER_FRAME << 8))
+      goto exit;
+    if (pSrcPixMap.sRect.iRectTop >= pSrcPixMap.sRect.iRectHeight
+        || pSrcPixMap.sRect.iRectLeft >= pSrcPixMap.sRect.iRectWidth || pSrcPixMap.sRect.iRectWidth > pSrcPixMap.iStride[0])
+      goto exit;
+  }
+  if (pDstPixMap.pPixel[0]) {
+    if (pDstPixMap.sRect.iRectWidth <= 0 || pDstPixMap.sRect.iRectHeight <= 0
+        || pDstPixMap.sRect.iRectWidth * pDstPixMap.sRect.iRectHeight > (MAX_MBS_PER_FRAME << 8))
+      goto exit;
+    if (pDstPixMap.sRect.iRectTop >= pDstPixMap.sRect.iRectHeight
+        || pDstPixMap.sRect.iRectLeft >= pDstPixMap.sRect.iRectWidth || pDstPixMap.sRect.iRectWidth > pDstPixMap.iStride[0])
+      goto exit;
+  }
+  eReturn = true;
+
+exit:
+  return eReturn;
+}
+
+IStrategy* CVpFrameWork::CreateStrategy (EMethods m_eMethod, int32_t iCpuFlag) {
+  IStrategy* pStrategy = NULL;
+
+  switch (m_eMethod) {
+  case METHOD_COLORSPACE_CONVERT:
+    //not support yet
+    break;
+  case METHOD_DENOISE:
+    pStrategy = WelsDynamicCast (IStrategy*, new CDenoiser (iCpuFlag));
+    break;
+  case METHOD_SCROLL_DETECTION:
+    pStrategy = WelsDynamicCast (IStrategy*, new CScrollDetection (iCpuFlag));
+    break;
+  case METHOD_SCENE_CHANGE_DETECTION_VIDEO:
+  case METHOD_SCENE_CHANGE_DETECTION_SCREEN:
+    pStrategy = BuildSceneChangeDetection (m_eMethod, iCpuFlag);
+    break;
+  case METHOD_DOWNSAMPLE:
+    pStrategy = WelsDynamicCast (IStrategy*, new CDownsampling (iCpuFlag));
+    break;
+  case METHOD_VAA_STATISTICS:
+    pStrategy = WelsDynamicCast (IStrategy*, new CVAACalculation (iCpuFlag));
+    break;
+  case METHOD_BACKGROUND_DETECTION:
+    pStrategy = WelsDynamicCast (IStrategy*, new CBackgroundDetection (iCpuFlag));
+    break;
+  case METHOD_ADAPTIVE_QUANT:
+    pStrategy = WelsDynamicCast (IStrategy*, new CAdaptiveQuantization (iCpuFlag));
+    break;
+  case METHOD_COMPLEXITY_ANALYSIS:
+    pStrategy = WelsDynamicCast (IStrategy*, new CComplexityAnalysis (iCpuFlag));
+    break;
+  case METHOD_COMPLEXITY_ANALYSIS_SCREEN:
+    pStrategy = WelsDynamicCast (IStrategy*, new CComplexityAnalysisScreen (iCpuFlag));
+    break;
+  case METHOD_IMAGE_ROTATE:
+    pStrategy = WelsDynamicCast (IStrategy*, new CImageRotating (iCpuFlag));
+    break;
+  default:
+    break;
+  }
+
+  return pStrategy;
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.h
new file mode 100644
index 0000000000..6b1636530f
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWork.h
@@ -0,0 +1,130 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  WelsFrameWork.h
+ *
+ * \brief       :  framework of wels video processor class
+ *
+ * \date        :  2011/01/04
+ *
+ * \description :
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_WELSFRAMEWORK_H
+#define WELSVP_WELSFRAMEWORK_H
+
+#include "IWelsVP.h"
+#include "util.h"
+#include "WelsThreadLib.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+EResult CreateSpecificVpInterface (IWelsVP** ppCtx);
+EResult DestroySpecificVpInterface (IWelsVP* pCtx);
+
+EResult CreateSpecificVpInterface (IWelsVPc** ppCtx);
+EResult DestroySpecificVpInterface (IWelsVPc* pCtx);
+
+#define MAX_STRATEGY_NUM (METHOD_MASK - 1)
+
+class IStrategy : public IWelsVP {
+ public:
+  IStrategy() {
+    m_eMethod  = METHOD_NULL;
+    m_eFormat  = VIDEO_FORMAT_I420;
+    m_iIndex   = 0;
+    m_bInit    = false;
+  }
+
+  virtual ~IStrategy() {}
+
+ public:
+  virtual EResult Init (int32_t iType, void* pCfg)  {
+    return RET_SUCCESS;
+  }
+  virtual EResult Uninit (int32_t iType)              {
+    return RET_SUCCESS;
+  }
+  virtual EResult Flush (int32_t iType)               {
+    return RET_SUCCESS;
+  }
+  virtual EResult Get (int32_t iType, void* pParam) {
+    return RET_SUCCESS;
+  }
+  virtual EResult Set (int32_t iType, void* pParam) {
+    return RET_SUCCESS;
+  }
+  virtual EResult SpecialFeature (int32_t iType, void* pIn, void* pOut) {
+    return RET_SUCCESS;
+  }
+  virtual EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pDst) = 0;
+
+ public:
+  EMethods       m_eMethod;
+  EVideoFormat m_eFormat;
+  int32_t           m_iIndex;
+  bool            m_bInit;
+};
+
+class CVpFrameWork : public IWelsVP {
+ public:
+  CVpFrameWork (uint32_t uiThreadsNum, EResult& ret);
+  ~CVpFrameWork();
+
+ public:
+  EResult Init (int32_t iType, void* pCfg);
+
+  EResult Uninit (int32_t iType);
+
+  EResult Flush (int32_t iType);
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pDst);
+
+  EResult Get (int32_t iType, void* pParam);
+
+  EResult Set (int32_t iType, void* pParam);
+
+  EResult SpecialFeature (int32_t iType, void* pIn, void* pOut);
+
+ private:
+  bool  CheckValid (EMethods eMethod, SPixMap& sSrc, SPixMap& sDst);
+  IStrategy* CreateStrategy (EMethods eMethod, int32_t iCpuFlag);
+
+ private:
+  IStrategy* m_pStgChain[MAX_STRATEGY_NUM];
+
+  WELS_MUTEX m_mutes;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWorkEx.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWorkEx.cpp
new file mode 100644
index 0000000000..1681a1453c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsFrameWorkEx.cpp
@@ -0,0 +1,96 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "WelsFrameWork.h"
+
+///////////////////////////////////////////////////////////////////////
+
+WELSVP_NAMESPACE_BEGIN
+
+EResult Init (void* pCtx, int32_t iType, void* pCfg) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Init (iType, pCfg) : RET_INVALIDPARAM;
+}
+EResult Uninit (void* pCtx, int32_t iType) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Uninit (iType) : RET_INVALIDPARAM;
+}
+EResult Flush (void* pCtx, int32_t iType) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Flush (iType) : RET_INVALIDPARAM;
+}
+EResult Process (void* pCtx, int32_t iType, SPixMap* pSrc, SPixMap* dst) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Process (iType, pSrc, dst) : RET_INVALIDPARAM;
+}
+EResult Get (void* pCtx, int32_t iType, void* pParam) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Get (iType, pParam) : RET_INVALIDPARAM;
+}
+EResult Set (void* pCtx, int32_t iType, void* pParam) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->Set (iType, pParam) : RET_INVALIDPARAM;
+}
+EResult SpecialFeature (void* pCtx, int32_t iType, void* pIn, void* pOut) {
+  return pCtx ? WelsStaticCast (IWelsVP*, pCtx)->SpecialFeature (iType, pIn, pOut) : RET_INVALIDPARAM;
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+EResult CreateSpecificVpInterface (IWelsVPc** pCtx) {
+  EResult  ret     = RET_FAILED;
+  IWelsVP* pWelsVP = NULL;
+
+  ret = CreateSpecificVpInterface (&pWelsVP);
+  if (ret == RET_SUCCESS) {
+    IWelsVPc* pVPc = new IWelsVPc;
+    if (pVPc) {
+      pVPc->Init    = Init;
+      pVPc->Uninit  = Uninit;
+      pVPc->Flush   = Flush;
+      pVPc->Process = Process;
+      pVPc->Get     = Get;
+      pVPc->Set     = Set;
+      pVPc->SpecialFeature = SpecialFeature;
+      pVPc->pCtx       = WelsStaticCast (void*, pWelsVP);
+      *pCtx            = pVPc;
+    } else
+      ret = RET_OUTOFMEMORY;
+  }
+
+  return ret;
+}
+
+EResult DestroySpecificVpInterface (IWelsVPc* pCtx) {
+  if (pCtx) {
+    DestroySpecificVpInterface (WelsStaticCast (IWelsVP*, pCtx->pCtx));
+    delete pCtx;
+  }
+
+  return RET_SUCCESS;
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.def b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.def
new file mode 100644
index 0000000000..eebc91ee37
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.def
@@ -0,0 +1,36 @@
+;*!
+;* \copy
+;*     Copyright (c)  2011-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+
+LIBRARY         welsvp.dll
+EXPORTS
+                WelsCreateVpInterface
+                WelsDestroyVpInterface
\ No newline at end of file
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.rc b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.rc
new file mode 100644
index 0000000000..0f7542297d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/WelsVP.rc
@@ -0,0 +1,115 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "windows.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Chinese (P.R.C.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
+#ifdef _WIN32
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+    "#include ""windows.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // Chinese (P.R.C.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,0,0,0
+ PRODUCTVERSION 0,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "Cisco OpenH264  video preprocessing"
+            VALUE "CompanyName", "Cisco Systems"
+            VALUE "FileDescription", "Cisco OpenH264  video preprocessing"
+            VALUE "FileVersion", "0, 0, 0, 0"
+            VALUE "InternalName", "welsvp.dll"
+            VALUE "LegalCopyright", "� 2011-2015 Cisco and/or its affiliates. All rights reserved."
+            VALUE "OriginalFilename", "welsvp.dll"
+            VALUE "ProductName", "Cisco OpenH264 video preprocessing"
+            VALUE "ProductVersion", "0, 0, 0, 0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/common.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/common.h
new file mode 100644
index 0000000000..386248a2c0
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/common.h
@@ -0,0 +1,84 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file         :  SceneChangeDetectionCommon.h
+ *
+ * \brief        :  scene change detection class of wels video processor class
+ *
+ * \date         :  2011/03/14
+ *
+ * \description  :  1. rewrite the package code of scene change detection class
+ *
+ */
+
+#ifndef WELSVP_COMMON_H
+#define WELSVP_COMMON_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+#include "sad_common.h"
+#include "intra_pred_common.h"
+
+
+
+typedef void (GetIntraPred) (uint8_t* pPred, uint8_t* pRef, const int32_t kiStride);
+
+typedef GetIntraPred*  GetIntraPredPtr;
+
+GetIntraPred     WelsI16x16LumaPredV_c;
+GetIntraPred     WelsI16x16LumaPredH_c;
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef  int32_t (SadFunc) (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY, int32_t iRefStrideY);
+
+typedef SadFunc*   SadFuncPtr;
+
+typedef int32_t (Sad16x16Func) (uint8_t* pSrcY, int32_t iSrcStrideY, uint8_t* pRefY, int32_t iRefStrideY);
+typedef Sad16x16Func*      PSad16x16Func;
+
+
+#ifdef HAVE_NEON
+WELSVP_EXTERN_C_BEGIN
+int32_t WelsProcessingSampleSad8x8_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+WELSVP_EXTERN_C_BEGIN
+int32_t WelsProcessingSampleSad8x8_AArch64_neon (uint8_t*, int32_t, uint8_t*, int32_t);
+WELSVP_EXTERN_C_END
+#endif
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.cpp
new file mode 100644
index 0000000000..65ef5876ff
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.cpp
@@ -0,0 +1,117 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "memory.h"
+
+WELSVP_NAMESPACE_BEGIN
+/////////////////////////////////////////////////////////////////////////////////
+
+void* WelsMalloc (const uint32_t kuiSize, char* pTag) {
+  const int32_t kiSizeVoidPointer       = sizeof (void**);
+  const int32_t kiSizeInt32             = sizeof (int32_t);
+  const int32_t kiAlignedBytes          = ALIGNBYTES - 1;
+
+  uint8_t* pBuf         = (uint8_t*) ::malloc (kuiSize + kiAlignedBytes + kiSizeVoidPointer + kiSizeInt32);
+  uint8_t* pAlignedBuf = NULL;
+
+  if (NULL == pBuf)
+    return NULL;
+
+  // to fill zero values
+  WelsMemset (pBuf, 0, kuiSize + kiAlignedBytes + kiSizeVoidPointer + kiSizeInt32);
+
+  pAlignedBuf = pBuf + kiAlignedBytes + kiSizeVoidPointer + kiSizeInt32;
+  pAlignedBuf -= WelsCastFromPointer (pAlignedBuf) & kiAlignedBytes;
+  * ((void**) (pAlignedBuf - kiSizeVoidPointer)) = pBuf;
+  * ((int32_t*) (pAlignedBuf - (kiSizeVoidPointer + kiSizeInt32))) = kuiSize;
+
+  return (pAlignedBuf);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void WelsFree (void* pPointer, char* pTag) {
+  if (pPointer) {
+    ::free (* (((void**) pPointer) - 1));
+  }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void* InternalReallocate (void* pPointer, const uint32_t kuiSize, char* pTag) {
+  uint32_t iOldSize = 0;
+  uint8_t* pNew = NULL;
+  if (pPointer != NULL)
+    iOldSize = * ((int32_t*) ((uint8_t*) pPointer - sizeof (void**) - sizeof (int32_t)));
+  else
+    return WelsMalloc (kuiSize, pTag);
+
+  pNew = (uint8_t*)WelsMalloc (kuiSize, pTag);
+  if (0 == pNew) {
+    if (iOldSize > 0 && kuiSize > 0 && iOldSize >= kuiSize)
+      return (pPointer);
+    return 0;
+  } else if (iOldSize > 0 && kuiSize > 0)
+    memcpy (pNew, pPointer, (iOldSize < kuiSize) ? iOldSize : kuiSize);
+  else
+    return 0;
+
+  WelsFree (pPointer, pTag);
+  return (pNew);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+void* WelsRealloc (void* pPointer, uint32_t* pRealSize, const uint32_t kuiSize, char* pTag) {
+  const uint32_t kuiOldSize = *pRealSize;
+  uint32_t kuiNewSize = 0;
+  void* pLocalPointer = NULL;
+  if (kuiOldSize >= kuiSize) // large enough of original block, so do nothing
+    return (pPointer);
+
+  // new request
+  kuiNewSize = kuiSize + 15;
+  kuiNewSize -= (kuiNewSize & 15);
+  kuiNewSize += 32;
+
+  pLocalPointer = InternalReallocate (pPointer, kuiNewSize, pTag);
+  if (NULL != pLocalPointer) {
+    *pRealSize = kuiNewSize;
+    return (pLocalPointer);
+  } else {
+    return NULL;
+  }
+
+  return NULL; // something wrong
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.h
new file mode 100644
index 0000000000..7448e1f2f1
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/memory.h
@@ -0,0 +1,110 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  memory.h
+ *
+ * \brief       :  memory definition for wels video processor class
+ *
+ * \date        :  2011/02/22
+ *
+ * \description :
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_MEMORY_H
+#define WELSVP_MEMORY_H
+
+#include "util.h"
+#include "typedef.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+inline void* WelsMemset (void* pPointer, int32_t iValue, uint32_t uiSize) {
+  return ::memset (pPointer, iValue, uiSize);
+}
+
+inline void* WelsMemcpy (void* pDst, const void* kpSrc, uint32_t uiSize) {
+  return ::memcpy (pDst, kpSrc, uiSize);
+}
+
+inline int32_t WelsMemcmp (const void* kpBuf1, const void* kpBuf2, uint32_t uiSize) {
+  return ::memcmp (kpBuf1, kpBuf2, uiSize);
+}
+
+/*!
+*************************************************************************************
+* \brief    malloc with zero filled utilization in Wels
+*
+* \param    i_size  uiSize of memory block required
+*
+* \return   allocated memory pointer exactly, failed in case of NULL return
+*
+* \note N/A
+*************************************************************************************
+*/
+void* WelsMalloc (const uint32_t kuiSize, char* pTag = NULL);
+
+/*!
+*************************************************************************************
+* \brief    free utilization in Wels
+*
+* \param    p   data pointer to be free.
+*           i.e, uint8_t *p = actual data to be free, argv = &p.
+*
+* \return   NONE
+*
+* \note N/A
+*************************************************************************************
+*/
+void WelsFree (void* pPointer, char* pTag = NULL);
+
+/*!
+*************************************************************************************
+* \brief    reallocation in Wels. Do nothing and continue using old block
+*       in case the block is large enough currently
+*
+* \param    p       memory block required in old time
+* \param    i_size  new uiSize of memory block requested
+* \param    sz_real pointer to the old uiSize of memory block
+*
+* \return   reallocated memory pointer exactly, failed in case of NULL return
+*
+* \note N/A
+*************************************************************************************
+*/
+void* WelsRealloc (void*  pPointer, uint32_t* pRealSize, const uint32_t kuiSize, char* pTag = NULL);
+
+//////////////////////////////////////////////////////////////////////////////////////
+WELSVP_NAMESPACE_END
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/resource.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/resource.h
new file mode 100644
index 0000000000..d0125dc7aa
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/resource.h
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by WelsVP.rc
+//
+
+// Next default values for new objects
+//
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1000
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/typedef.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/typedef.h
new file mode 100644
index 0000000000..c8420d3342
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/typedef.h
@@ -0,0 +1,56 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  typedef.h
+ *
+ * \brief       :  basic type definition
+ *
+ * \date        :  2011/01/04
+ *
+ * \description :  1. Define basic type with platform-independent;
+ *                 2. Define specific namespace to avoid name pollution;
+ *                 3. C++ ONLY;
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_TYPEDEF_H
+#define WELSVP_TYPEDEF_H
+
+#define WELSVP_EXTERN_C_BEGIN       extern "C" {
+#define WELSVP_EXTERN_C_END         }
+
+#define WELSVP_NAMESPACE_BEGIN      namespace WelsVP {
+#define WELSVP_NAMESPACE_END        }
+
+// Get the stdint type definitions from typedefs.h in the common lib
+#include "typedefs.h"
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/common/util.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/util.h
new file mode 100644
index 0000000000..5ebaabb809
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/common/util.h
@@ -0,0 +1,105 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  util.h
+ *
+ * \brief       :  utils for wels video processor class
+ *
+ * \date        :  2011/01/04
+ *
+ * \description :
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_UTIL_H
+#define WELSVP_UTIL_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#include "typedef.h"
+#include "memory.h"
+#include "IWelsVP.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+#define MAX_MBS_PER_FRAME 36864 //in accordance with max level support in Rec
+
+#define MB_WIDTH_LUMA  (16)
+#define PESN               (1e-6)       // desired float precision
+#define AQ_INT_MULTIPLY                   10000000
+#define AQ_TIME_INT_MULTIPLY                   10000
+#define AQ_QSTEP_INT_MULTIPLY                   100
+#define AQ_PESN 10 // (1e-6)*AQ_INT_MULTIPLY
+
+#define MB_TYPE_INTRA4x4                0x00000001
+#define MB_TYPE_INTRA16x16              0x00000002
+#define MB_TYPE_INTRA_PCM               0x00000004
+#define MB_TYPE_INTRA                     (MB_TYPE_INTRA4x4 | MB_TYPE_INTRA16x16 | MB_TYPE_INTRA_PCM)
+#define IS_INTRA(type) ((type)&MB_TYPE_INTRA)
+
+#define WELS_MAX(x, y) ((x) > (y) ? (x) : (y))
+#define WELS_MIN(x, y) ((x) < (y) ? (x) : (y))
+
+#ifndef WELS_SIGN
+#define WELS_SIGN(a) ((int32_t)(a) >> 31)
+#endif
+
+#ifndef WELS_ABS
+#define WELS_ABS(a) ((WELS_SIGN(a) ^ (int32_t)(a)) - WELS_SIGN(a))
+#endif
+
+#define WELS_CLAMP(x, minv, maxv)  WELS_MIN(WELS_MAX(x, minv), maxv)
+
+#define ALIGNBYTES         (16)       /* Worst case is requiring alignment to an 16 byte boundary */
+
+#define WelsCastFromPointer(p)      (reinterpret_cast<intptr_t>(p))
+#define WelsStaticCast(type, p)  (static_cast<type>(p))
+#define WelsDynamicCast(type, p) (dynamic_cast<type>(p))
+
+#define GET_METHOD(x)  ((x) & 0xff)          // mask method as the lowest 8bits
+#define GET_SPECIAL(x) (((x) >> 8) & 0xff)   // mask special flag as 8bits
+
+inline EMethods WelsVpGetValidMethod (int32_t a) {
+  int32_t iMethod = GET_METHOD (a);
+  return WelsStaticCast (EMethods, WELS_CLAMP (iMethod, METHOD_NULL + 1, METHOD_MASK - 1));
+}
+
+
+
+WELSVP_NAMESPACE_END
+
+#endif
+
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp
new file mode 100644
index 0000000000..428a08edf2
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.cpp
@@ -0,0 +1,489 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "ComplexityAnalysis.h"
+#include "cpu.h"
+#include "macros.h"
+#include "intra_pred_common.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CComplexityAnalysis::CComplexityAnalysis (int32_t iCpuFlag) {
+  m_eMethod   = METHOD_COMPLEXITY_ANALYSIS;
+  m_pfGomSad   = NULL;
+  WelsMemset (&m_sComplexityAnalysisParam, 0, sizeof (m_sComplexityAnalysisParam));
+}
+
+CComplexityAnalysis::~CComplexityAnalysis() {
+}
+
+EResult CComplexityAnalysis::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  EResult eReturn = RET_SUCCESS;
+
+  switch (m_sComplexityAnalysisParam.iComplexityAnalysisMode) {
+  case FRAME_SAD:
+    AnalyzeFrameComplexityViaSad (pSrcPixMap, pRefPixMap);
+    break;
+  case GOM_SAD:
+    AnalyzeGomComplexityViaSad (pSrcPixMap, pRefPixMap);
+    break;
+  case GOM_VAR:
+    AnalyzeGomComplexityViaVar (pSrcPixMap, pRefPixMap);
+    break;
+  default:
+    eReturn = RET_INVALIDPARAM;
+    break;
+  }
+
+  return eReturn;
+}
+
+
+EResult CComplexityAnalysis::Set (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  m_sComplexityAnalysisParam = * (SComplexityAnalysisParam*)pParam;
+
+  return RET_SUCCESS;
+}
+
+EResult CComplexityAnalysis::Get (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  SComplexityAnalysisParam* sComplexityAnalysisParam = (SComplexityAnalysisParam*)pParam;
+
+  sComplexityAnalysisParam->iFrameComplexity = m_sComplexityAnalysisParam.iFrameComplexity;
+
+  return RET_SUCCESS;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////
+void CComplexityAnalysis::AnalyzeFrameComplexityViaSad (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  SVAACalcResult*     pVaaCalcResults = NULL;
+  pVaaCalcResults = m_sComplexityAnalysisParam.pCalcResult;
+
+  m_sComplexityAnalysisParam.iFrameComplexity = pVaaCalcResults->iFrameSad;
+
+  if (m_sComplexityAnalysisParam.iCalcBgd) { //BGD control
+    m_sComplexityAnalysisParam.iFrameComplexity = GetFrameSadExcludeBackground (pSrcPixMap, pRefPixMap);
+  }
+}
+
+int32_t CComplexityAnalysis::GetFrameSadExcludeBackground (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  int32_t iWidth     = pSrcPixMap->sRect.iRectWidth;
+  int32_t iHeight    = pSrcPixMap->sRect.iRectHeight;
+  int32_t iMbWidth  = iWidth  >> 4;
+  int32_t iMbHeight = iHeight >> 4;
+  int32_t iMbNum    = iMbWidth * iMbHeight;
+
+  int32_t iMbNumInGom = m_sComplexityAnalysisParam.iMbNumInGom;
+  int32_t iGomMbNum = (iMbNum + iMbNumInGom - 1) / iMbNumInGom;
+  int32_t iGomMbStartIndex = 0, iGomMbEndIndex = 0;
+
+  uint8_t* pBackgroundMbFlag = (uint8_t*)m_sComplexityAnalysisParam.pBackgroundMbFlag;
+  uint32_t* uiRefMbType = (uint32_t*)m_sComplexityAnalysisParam.uiRefMbType;
+  SVAACalcResult* pVaaCalcResults = m_sComplexityAnalysisParam.pCalcResult;
+  int32_t*  pGomForegroundBlockNum = m_sComplexityAnalysisParam.pGomForegroundBlockNum;
+
+  uint32_t uiFrameSad = 0;
+  for (int32_t j = 0; j < iGomMbNum; j ++) {
+    iGomMbStartIndex = j * iMbNumInGom;
+    iGomMbEndIndex = WELS_MIN ((j + 1) * iMbNumInGom, iMbNum);
+
+    for (int32_t i = iGomMbStartIndex; i < iGomMbEndIndex; i ++) {
+      if (pBackgroundMbFlag[i] == 0 || IS_INTRA (uiRefMbType[i])) {
+        pGomForegroundBlockNum[j]++;
+        uiFrameSad += pVaaCalcResults->pSad8x8[i][0];
+        uiFrameSad += pVaaCalcResults->pSad8x8[i][1];
+        uiFrameSad += pVaaCalcResults->pSad8x8[i][2];
+        uiFrameSad += pVaaCalcResults->pSad8x8[i][3];
+      }
+    }
+  }
+
+  return (uiFrameSad);
+}
+
+
+void InitGomSadFunc (PGOMSadFunc& pfGomSad, uint8_t iCalcBgd) {
+  pfGomSad = GomSampleSad;
+
+  if (iCalcBgd) {
+    pfGomSad = GomSampleSadExceptBackground;
+  }
+}
+
+void GomSampleSad (uint32_t* pGomSad, int32_t* pGomForegroundBlockNum, int32_t* pSad8x8, uint8_t pBackgroundMbFlag) {
+  (*pGomForegroundBlockNum) ++;
+  *pGomSad += pSad8x8[0];
+  *pGomSad += pSad8x8[1];
+  *pGomSad += pSad8x8[2];
+  *pGomSad += pSad8x8[3];
+}
+
+void GomSampleSadExceptBackground (uint32_t* pGomSad, int32_t* pGomForegroundBlockNum, int32_t* pSad8x8,
+                                   uint8_t pBackgroundMbFlag) {
+  if (pBackgroundMbFlag == 0) {
+    (*pGomForegroundBlockNum) ++;
+    *pGomSad += pSad8x8[0];
+    *pGomSad += pSad8x8[1];
+    *pGomSad += pSad8x8[2];
+    *pGomSad += pSad8x8[3];
+  }
+}
+
+void CComplexityAnalysis::AnalyzeGomComplexityViaSad (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  int32_t iWidth     = pSrcPixMap->sRect.iRectWidth;
+  int32_t iHeight    = pSrcPixMap->sRect.iRectHeight;
+  int32_t iMbWidth  = iWidth  >> 4;
+  int32_t iMbHeight = iHeight >> 4;
+  int32_t iMbNum    = iMbWidth * iMbHeight;
+
+  int32_t iMbNumInGom = m_sComplexityAnalysisParam.iMbNumInGom;
+  int32_t iGomMbNum = (iMbNum + iMbNumInGom - 1) / iMbNumInGom;
+
+  int32_t iGomMbStartIndex = 0, iGomMbEndIndex = 0, iGomMbRowNum = 0;
+  int32_t iMbStartIndex = 0, iMbEndIndex = 0;
+
+  uint8_t* pBackgroundMbFlag = (uint8_t*)m_sComplexityAnalysisParam.pBackgroundMbFlag;
+  uint32_t* uiRefMbType = (uint32_t*)m_sComplexityAnalysisParam.uiRefMbType;
+  SVAACalcResult* pVaaCalcResults = m_sComplexityAnalysisParam.pCalcResult;
+  int32_t*  pGomForegroundBlockNum = (int32_t*)m_sComplexityAnalysisParam.pGomForegroundBlockNum;
+  int32_t*  pGomComplexity = (int32_t*)m_sComplexityAnalysisParam.pGomComplexity;
+
+  uint32_t uiGomSad = 0, uiFrameSad = 0;
+  InitGomSadFunc (m_pfGomSad, m_sComplexityAnalysisParam.iCalcBgd);
+
+  for (int32_t j = 0; j < iGomMbNum; j ++) {
+    uiGomSad = 0;
+
+    iGomMbStartIndex = j * iMbNumInGom;
+    iGomMbEndIndex = WELS_MIN ((j + 1) * iMbNumInGom, iMbNum);
+    iGomMbRowNum = (iGomMbEndIndex + iMbWidth - 1) / iMbWidth  - iGomMbStartIndex / iMbWidth;
+
+    iMbStartIndex = iGomMbStartIndex;
+    iMbEndIndex = WELS_MIN ((iMbStartIndex / iMbWidth + 1) * iMbWidth, iGomMbEndIndex);
+
+    do {
+      for (int32_t i = iMbStartIndex; i < iMbEndIndex; i ++) {
+        m_pfGomSad (&uiGomSad, pGomForegroundBlockNum + j, pVaaCalcResults->pSad8x8[i], pBackgroundMbFlag[i]
+                    && !IS_INTRA (uiRefMbType[i]));
+      }
+
+      iMbStartIndex = iMbEndIndex;
+      iMbEndIndex = WELS_MIN (iMbEndIndex + iMbWidth , iGomMbEndIndex);
+
+    } while (--iGomMbRowNum);
+    pGomComplexity[j] = uiGomSad;
+    uiFrameSad += pGomComplexity[j];
+  }
+  m_sComplexityAnalysisParam.iFrameComplexity = uiFrameSad;
+}
+
+
+void CComplexityAnalysis::AnalyzeGomComplexityViaVar (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  int32_t iWidth     = pSrcPixMap->sRect.iRectWidth;
+  int32_t iHeight    = pSrcPixMap->sRect.iRectHeight;
+  int32_t iMbWidth  = iWidth  >> 4;
+  int32_t iMbHeight = iHeight >> 4;
+  int32_t iMbNum    = iMbWidth * iMbHeight;
+
+  int32_t iMbNumInGom = m_sComplexityAnalysisParam.iMbNumInGom;
+  int32_t iGomMbNum = (iMbNum + iMbNumInGom - 1) / iMbNumInGom;
+  int32_t iGomSampleNum = 0;
+
+  int32_t iGomMbStartIndex = 0, iGomMbEndIndex = 0, iGomMbRowNum = 0;
+  int32_t iMbStartIndex = 0, iMbEndIndex = 0;
+
+  SVAACalcResult* pVaaCalcResults = m_sComplexityAnalysisParam.pCalcResult;
+  int32_t*  pGomComplexity = (int32_t*)m_sComplexityAnalysisParam.pGomComplexity;
+  uint32_t  uiFrameSad = 0;
+
+  uint32_t uiSampleSum = 0, uiSquareSum = 0;
+
+  for (int32_t j = 0; j < iGomMbNum; j ++) {
+    uiSampleSum = 0;
+    uiSquareSum = 0;
+
+    iGomMbStartIndex = j * iMbNumInGom;
+    iGomMbEndIndex = WELS_MIN ((j + 1) * iMbNumInGom, iMbNum);
+    iGomMbRowNum = (iGomMbEndIndex + iMbWidth - 1) / iMbWidth  - iGomMbStartIndex / iMbWidth;
+
+    iMbStartIndex = iGomMbStartIndex;
+    iMbEndIndex = WELS_MIN ((iMbStartIndex / iMbWidth + 1) * iMbWidth, iGomMbEndIndex);
+
+    iGomSampleNum = (iMbEndIndex - iMbStartIndex) * MB_WIDTH_LUMA * MB_WIDTH_LUMA;
+
+    do {
+      for (int32_t i = iMbStartIndex; i < iMbEndIndex; i ++) {
+        uiSampleSum += pVaaCalcResults->pSum16x16[i];
+        uiSquareSum += pVaaCalcResults->pSumOfSquare16x16[i];
+      }
+
+      iMbStartIndex = iMbEndIndex;
+      iMbEndIndex = WELS_MIN (iMbEndIndex + iMbWidth, iGomMbEndIndex);
+
+    } while (--iGomMbRowNum);
+
+    pGomComplexity[j] = uiSquareSum - (uiSampleSum * uiSampleSum / iGomSampleNum);
+    uiFrameSad += pGomComplexity[j];
+  }
+  m_sComplexityAnalysisParam.iFrameComplexity = uiFrameSad;
+}
+
+
+CComplexityAnalysisScreen::CComplexityAnalysisScreen (int32_t iCpuFlag) {
+  m_eMethod   = METHOD_COMPLEXITY_ANALYSIS_SCREEN;
+  WelsMemset (&m_ComplexityAnalysisParam, 0, sizeof (m_ComplexityAnalysisParam));
+
+  m_pSadFunc = WelsSampleSad16x16_c;
+  m_pIntraFunc[0] = WelsI16x16LumaPredV_c;
+  m_pIntraFunc[1] = WelsI16x16LumaPredH_c;
+#ifdef X86_ASM
+  if (iCpuFlag & WELS_CPU_SSE2) {
+    m_pSadFunc = WelsSampleSad16x16_sse2;
+    m_pIntraFunc[0] = WelsI16x16LumaPredV_sse2;
+    m_pIntraFunc[1] = WelsI16x16LumaPredH_sse2;
+
+  }
+#endif
+
+#if defined (HAVE_NEON)
+  if (iCpuFlag & WELS_CPU_NEON) {
+    m_pSadFunc = WelsSampleSad16x16_neon;
+    m_pIntraFunc[0] = WelsI16x16LumaPredV_neon;
+    m_pIntraFunc[1] = WelsI16x16LumaPredH_neon;
+
+  }
+#endif
+
+#if defined (HAVE_NEON_AARCH64)
+  if (iCpuFlag & WELS_CPU_NEON) {
+    m_pSadFunc = WelsSampleSad16x16_AArch64_neon;
+    m_pIntraFunc[0] =  WelsI16x16LumaPredV_AArch64_neon;
+    m_pIntraFunc[1] = WelsI16x16LumaPredH_AArch64_neon;
+  }
+#endif
+
+}
+
+CComplexityAnalysisScreen::~CComplexityAnalysisScreen() {
+}
+
+EResult CComplexityAnalysisScreen::Process (int32_t nType, SPixMap* pSrc, SPixMap* pRef) {
+  bool bScrollFlag = m_ComplexityAnalysisParam.sScrollResult.bScrollDetectFlag;
+  int32_t iIdrFlag    = m_ComplexityAnalysisParam.iIdrFlag;
+  int32_t iScrollMvX = m_ComplexityAnalysisParam.sScrollResult.iScrollMvX;
+  int32_t iScrollMvY = m_ComplexityAnalysisParam.sScrollResult.iScrollMvY;
+
+  if (m_ComplexityAnalysisParam.iMbRowInGom <= 0)
+    return RET_INVALIDPARAM;
+  if (!iIdrFlag && pRef == NULL)
+    return RET_INVALIDPARAM;
+
+  if (iIdrFlag || pRef == NULL) {
+    GomComplexityAnalysisIntra (pSrc);
+  } else if (!bScrollFlag || ((iScrollMvX == 0) && (iScrollMvY == 0))) {
+    GomComplexityAnalysisInter (pSrc, pRef, 0);
+  } else {
+    GomComplexityAnalysisInter (pSrc, pRef, 1);
+  }
+
+  return RET_SUCCESS;
+}
+
+
+EResult CComplexityAnalysisScreen::Set (int32_t nType, void* pParam) {
+  if (pParam == NULL)
+    return RET_INVALIDPARAM;
+
+  m_ComplexityAnalysisParam = * (SComplexityAnalysisScreenParam*)pParam;
+
+  return RET_SUCCESS;
+}
+
+EResult CComplexityAnalysisScreen::Get (int32_t nType, void* pParam) {
+  if (pParam == NULL)
+    return RET_INVALIDPARAM;
+
+  * (SComplexityAnalysisScreenParam*)pParam = m_ComplexityAnalysisParam;
+
+  return RET_SUCCESS;
+}
+
+void CComplexityAnalysisScreen::GomComplexityAnalysisIntra (SPixMap* pSrc) {
+  int32_t iWidth                  = pSrc->sRect.iRectWidth;
+  int32_t iHeight                 = pSrc->sRect.iRectHeight;
+  int32_t iBlockWidth             = iWidth  >> 4;
+  int32_t iBlockHeight            = iHeight >> 4;
+
+  int32_t iBlockSadH, iBlockSadV, iGomSad = 0;
+  int32_t iIdx = 0;
+
+  uint8_t* pPtrY = NULL;
+  int32_t iStrideY = 0;
+  int32_t iRowStrideY = 0;
+
+  uint8_t* pTmpCur = NULL;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, iMemPredMb, 256, 16)
+
+  pPtrY = (uint8_t*)pSrc->pPixel[0];
+
+  iStrideY  = pSrc->iStride[0];
+  iRowStrideY = iStrideY << 4;
+
+  m_ComplexityAnalysisParam.iFrameComplexity = 0;
+
+  for (int32_t j = 0; j < iBlockHeight; j ++) {
+    pTmpCur = pPtrY;
+
+    for (int32_t i = 0; i < iBlockWidth; i++) {
+      iBlockSadH = iBlockSadV = 0x7fffffff; // INT_MAX
+      if (j > 0) {
+        m_pIntraFunc[0] (iMemPredMb, pTmpCur, iStrideY);
+        iBlockSadH = m_pSadFunc (pTmpCur, iStrideY, iMemPredMb, 16);
+      }
+      if (i > 0) {
+        m_pIntraFunc[1] (iMemPredMb, pTmpCur, iStrideY);
+        iBlockSadV = m_pSadFunc (pTmpCur, iStrideY, iMemPredMb, 16);
+      }
+      if (i || j)
+        iGomSad += WELS_MIN (iBlockSadH, iBlockSadV);
+
+      pTmpCur += 16;
+
+      if (i == iBlockWidth - 1 && ((j + 1) % m_ComplexityAnalysisParam.iMbRowInGom == 0 || j == iBlockHeight - 1)) {
+        m_ComplexityAnalysisParam.pGomComplexity[iIdx] = iGomSad;
+        m_ComplexityAnalysisParam.iFrameComplexity += iGomSad;
+        iIdx++;
+        iGomSad = 0;
+      }
+    }
+
+    pPtrY += iRowStrideY;
+  }
+  m_ComplexityAnalysisParam.iGomNumInFrame = iIdx;
+}
+
+
+void CComplexityAnalysisScreen::GomComplexityAnalysisInter (SPixMap* pSrc, SPixMap* pRef, bool bScrollFlag) {
+  int32_t iWidth                  = pSrc->sRect.iRectWidth;
+  int32_t iHeight                 = pSrc->sRect.iRectHeight;
+  int32_t iBlockWidth             = iWidth  >> 4;
+  int32_t iBlockHeight            = iHeight >> 4;
+
+  int32_t iInterSad, iScrollSad, iBlockSadH, iBlockSadV, iGomSad = 0;
+  int32_t iIdx = 0;
+
+  int32_t iScrollMvX = m_ComplexityAnalysisParam.sScrollResult.iScrollMvX;
+  int32_t iScrollMvY = m_ComplexityAnalysisParam.sScrollResult.iScrollMvY;
+
+  uint8_t* pPtrX = NULL, *pPtrY = NULL;
+  int32_t iStrideX = 0, iStrideY = 0;
+  int32_t iRowStrideX = 0, iRowStrideY = 0;
+
+  uint8_t* pTmpRef = NULL, *pTmpCur = NULL, *pTmpRefScroll = NULL;
+
+  ENFORCE_STACK_ALIGN_1D (uint8_t, iMemPredMb, 256, 16)
+
+  pPtrX = (uint8_t*)pRef->pPixel[0];
+  pPtrY = (uint8_t*)pSrc->pPixel[0];
+
+  iStrideX  = pRef->iStride[0];
+  iStrideY  = pSrc->iStride[0];
+
+  iRowStrideX  = pRef->iStride[0] << 4;
+  iRowStrideY  = pSrc->iStride[0] << 4;
+
+  m_ComplexityAnalysisParam.iFrameComplexity = 0;
+
+  for (int32_t j = 0; j < iBlockHeight; j ++) {
+    pTmpRef  = pPtrX;
+    pTmpCur  = pPtrY;
+
+    for (int32_t i = 0; i < iBlockWidth; i++) {
+      int32_t iBlockPointX = i << 4;
+      int32_t iBlockPointY = j << 4;
+
+      iInterSad = m_pSadFunc (pTmpCur, iStrideY, pTmpRef, iStrideX);
+      if (bScrollFlag) {
+        if ((iInterSad != 0) &&
+            (iBlockPointX + iScrollMvX >= 0) && (iBlockPointX + iScrollMvX <= iWidth - 8) &&
+            (iBlockPointY + iScrollMvY >= 0) && (iBlockPointY + iScrollMvY <= iHeight - 8)) {
+          pTmpRefScroll = pTmpRef - iScrollMvY * iStrideX + iScrollMvX;
+          iScrollSad = m_pSadFunc (pTmpCur, iStrideY, pTmpRefScroll, iStrideX);
+
+          if (iScrollSad < iInterSad) {
+            iInterSad = iScrollSad;
+          }
+        }
+
+      }
+
+      iBlockSadH = iBlockSadV = 0x7fffffff; // INT_MAX
+
+      if (j > 0) {
+        m_pIntraFunc[0] (iMemPredMb, pTmpCur, iStrideY);
+        iBlockSadH = m_pSadFunc (pTmpCur, iStrideY, iMemPredMb, 16);
+      }
+      if (i > 0) {
+        m_pIntraFunc[1] (iMemPredMb, pTmpCur, iStrideY);
+        iBlockSadV = m_pSadFunc (pTmpCur, iStrideY, iMemPredMb, 16);
+      }
+
+      iGomSad += WELS_MIN (WELS_MIN (iBlockSadH, iBlockSadV), iInterSad);
+
+      if (i == iBlockWidth - 1 && ((j + 1) % m_ComplexityAnalysisParam.iMbRowInGom == 0 || j == iBlockHeight - 1)) {
+        m_ComplexityAnalysisParam.pGomComplexity[iIdx] = iGomSad;
+        m_ComplexityAnalysisParam.iFrameComplexity += iGomSad;
+        iIdx++;
+        iGomSad = 0;
+      }
+
+      pTmpRef += 16;
+      pTmpCur += 16;
+    }
+    pPtrX += iRowStrideX;
+    pPtrY += iRowStrideY;
+  }
+  m_ComplexityAnalysisParam.iGomNumInFrame = iIdx;
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.h
new file mode 100644
index 0000000000..31f06d751e
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/complexityanalysis/ComplexityAnalysis.h
@@ -0,0 +1,107 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+* \file         :  ComplexityAnalysis.h
+*
+* \brief        :  complexity analysis class of wels video processor class
+*
+* \date         :  2011/03/28
+*
+* \description  :  1. rewrite the package code of complexity analysis class
+*
+*************************************************************************************
+*/
+
+#ifndef WELSVP_COMPLEXITYANALYSIS_H
+#define WELSVP_COMPLEXITYANALYSIS_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+#include "common.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef  void (GOMSadFunc) (uint32_t* pGomSad, int32_t* pGomForegroundBlockNum, int32_t* pSad8x8,
+                            uint8_t pBackgroundMbFlag);
+
+typedef GOMSadFunc*   PGOMSadFunc;
+
+GOMSadFunc      GomSampleSad;
+GOMSadFunc      GomSampleSadExceptBackground;
+
+class CComplexityAnalysis : public IStrategy {
+ public:
+  CComplexityAnalysis (int32_t iCpuFlag);
+  ~CComplexityAnalysis();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pRef);
+  EResult Set (int32_t iType, void* pParam);
+  EResult Get (int32_t iType, void* pParam);
+
+ private:
+  void AnalyzeFrameComplexityViaSad (SPixMap* pSrc, SPixMap* pRef);
+  int32_t GetFrameSadExcludeBackground (SPixMap* pSrc, SPixMap* pRef);
+
+  void AnalyzeGomComplexityViaSad (SPixMap* pSrc, SPixMap* pRef);
+  void AnalyzeGomComplexityViaVar (SPixMap* pSrc, SPixMap* pRef);
+
+ private:
+  PGOMSadFunc m_pfGomSad;
+  SComplexityAnalysisParam m_sComplexityAnalysisParam;
+};
+
+
+//for screen content
+
+class CComplexityAnalysisScreen : public IStrategy {
+ public:
+  CComplexityAnalysisScreen (int32_t cpu_flag);
+  ~CComplexityAnalysisScreen();
+
+  EResult Process (int32_t nType, SPixMap* src, SPixMap* ref);
+  EResult Set (int32_t nType, void* pParam);
+  EResult Get (int32_t nType, void* pParam);
+
+ private:
+  void GomComplexityAnalysisIntra (SPixMap* pSrc);
+  void GomComplexityAnalysisInter (SPixMap* pSrc, SPixMap* pRef, bool bScrollFlag);
+
+ private:
+  PSad16x16Func m_pSadFunc;
+  GetIntraPredPtr m_pIntraFunc[2];
+  SComplexityAnalysisScreenParam m_ComplexityAnalysisParam;
+};
+
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.cpp
new file mode 100644
index 0000000000..4ce1cb2493
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.cpp
@@ -0,0 +1,124 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "denoise.h"
+#include "cpu.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+#define CALC_BI_STRIDE(iWidth, iBitcount)  ((((iWidth) * (iBitcount) + 31) & ~31) >> 3)
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CDenoiser::CDenoiser (int32_t iCpuFlag) {
+  m_CPUFlag = iCpuFlag;
+  m_eMethod   = METHOD_DENOISE;
+  WelsMemset (&m_pfDenoise, 0, sizeof (m_pfDenoise));
+
+  m_uiSpaceRadius = DENOISE_GRAY_RADIUS;
+  m_fSigmaGrey  = DENOISE_GRAY_SIGMA;
+  m_uiType      = DENOISE_ALL_COMPONENT;
+  InitDenoiseFunc (m_pfDenoise, m_CPUFlag);
+}
+
+CDenoiser::~CDenoiser() {
+}
+
+void CDenoiser::InitDenoiseFunc (SDenoiseFuncs& denoiser,  int32_t iCpuFlag) {
+  denoiser.pfBilateralLumaFilter8 = BilateralLumaFilter8_c;
+  denoiser.pfWaverageChromaFilter8 = WaverageChromaFilter8_c;
+#if defined(X86_ASM)
+  if (iCpuFlag & WELS_CPU_SSE2) {
+    denoiser.pfBilateralLumaFilter8 = BilateralLumaFilter8_sse2;
+    denoiser.pfWaverageChromaFilter8 = WaverageChromaFilter8_sse2;
+  }
+#endif
+}
+
+EResult CDenoiser::Process (int32_t iType, SPixMap* pSrc, SPixMap* dst) {
+  uint8_t* pSrcY = (uint8_t*)pSrc->pPixel[0];
+  uint8_t* pSrcU = (uint8_t*)pSrc->pPixel[1];
+  uint8_t* pSrcV = (uint8_t*)pSrc->pPixel[2];
+  if (pSrcY == NULL || pSrcU == NULL || pSrcV == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  int32_t iWidthY = pSrc->sRect.iRectWidth;
+  int32_t iHeightY = pSrc->sRect.iRectHeight;
+  int32_t iWidthUV = iWidthY >> 1;
+  int32_t iHeightUV = iHeightY >> 1;
+
+  if (m_uiType & DENOISE_Y_COMPONENT)
+    BilateralDenoiseLuma (pSrcY, iWidthY, iHeightY, pSrc->iStride[0]);
+
+  if (m_uiType & DENOISE_U_COMPONENT)
+    WaverageDenoiseChroma (pSrcU, iWidthUV, iHeightUV, pSrc->iStride[1]);
+
+  if (m_uiType & DENOISE_V_COMPONENT)
+    WaverageDenoiseChroma (pSrcV, iWidthUV, iHeightUV, pSrc->iStride[2]);
+
+  return RET_SUCCESS;
+}
+
+void CDenoiser::BilateralDenoiseLuma (uint8_t* pSrcY, int32_t iWidth, int32_t iHeight, int32_t iStride) {
+  int32_t w;
+
+  pSrcY = pSrcY + m_uiSpaceRadius * iStride;
+  for (int32_t h = m_uiSpaceRadius; h < iHeight - m_uiSpaceRadius; h++) {
+    for (w = m_uiSpaceRadius; w < iWidth - m_uiSpaceRadius - TAIL_OF_LINE8; w += 8) {
+      m_pfDenoise.pfBilateralLumaFilter8 (pSrcY + w, iStride);
+    }
+    for (; w < iWidth - m_uiSpaceRadius; w++) {
+      Gauss3x3Filter (pSrcY + w, iStride);
+    }
+    pSrcY += iStride;
+  }
+}
+
+void CDenoiser::WaverageDenoiseChroma (uint8_t* pSrcUV, int32_t iWidth, int32_t iHeight, int32_t iStride) {
+  int32_t w;
+
+  pSrcUV = pSrcUV + UV_WINDOWS_RADIUS * iStride;
+  for (int32_t h = UV_WINDOWS_RADIUS; h < iHeight - UV_WINDOWS_RADIUS; h++) {
+    for (w = UV_WINDOWS_RADIUS; w < iWidth - UV_WINDOWS_RADIUS - TAIL_OF_LINE8; w += 8) {
+      m_pfDenoise.pfWaverageChromaFilter8 (pSrcUV + w, iStride);
+    }
+
+    for (; w < iWidth - UV_WINDOWS_RADIUS; w++) {
+      Gauss3x3Filter (pSrcUV + w, iStride);
+    }
+    pSrcUV += iStride;
+  }
+}
+
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.h
new file mode 100644
index 0000000000..13d2840283
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise.h
@@ -0,0 +1,109 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  denoise.h
+ *
+ * \brief       :  denoise class of wels video processor class
+ *
+ * \date        :  2011/03/15
+ *
+ * \description :  1. rewrite the package code of denoise class
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_DENOISE_H
+#define WELSVP_DENOISE_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+
+
+#define DENOISE_GRAY_RADIUS (1)
+#define DENOISE_GRAY_SIGMA  (2)
+
+#define UV_WINDOWS_RADIUS   (2)
+#define TAIL_OF_LINE8       (7)
+
+#define DENOISE_Y_COMPONENT (1)
+#define DENOISE_U_COMPONENT (2)
+#define DENOISE_V_COMPONENT (4)
+#define DENOISE_ALL_COMPONENT (7)
+
+
+WELSVP_NAMESPACE_BEGIN
+
+void Gauss3x3Filter (uint8_t* pixels, int32_t stride);
+
+typedef void (DenoiseFilterFunc) (uint8_t* pixels, int32_t stride);
+
+typedef DenoiseFilterFunc* DenoiseFilterFuncPtr;
+
+DenoiseFilterFunc     BilateralLumaFilter8_c;
+DenoiseFilterFunc     WaverageChromaFilter8_c;
+
+#ifdef X86_ASM
+WELSVP_EXTERN_C_BEGIN
+DenoiseFilterFunc     BilateralLumaFilter8_sse2 ;
+DenoiseFilterFunc     WaverageChromaFilter8_sse2 ;
+WELSVP_EXTERN_C_END
+#endif
+
+typedef  struct TagDenoiseFuncs {
+  DenoiseFilterFuncPtr pfBilateralLumaFilter8;//on 8 samples
+  DenoiseFilterFuncPtr pfWaverageChromaFilter8;//on 8 samples
+} SDenoiseFuncs;
+
+class CDenoiser : public IStrategy {
+ public:
+  CDenoiser (int32_t iCpuFlag);
+  ~CDenoiser();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* dst);
+
+ private:
+  void InitDenoiseFunc (SDenoiseFuncs& pf, int32_t cpu);
+  void BilateralDenoiseLuma (uint8_t* p_y_data, int32_t width, int32_t height, int32_t stride);
+  void WaverageDenoiseChroma (uint8_t* pSrcUV, int32_t width, int32_t height, int32_t stride);
+
+ private:
+  float          m_fSigmaGrey;                  //sigma for grey scale similarity, suggestion 2.5-3
+  uint16_t       m_uiSpaceRadius;               //filter windows radius: 1-3x3, 2-5x5,3-7x7. Larger size, slower speed
+  uint16_t       m_uiType;                      //do denoising on which component 1-Y, 2-U, 4-V; 7-YUV, 3-YU, 5-YV, 6-UV
+
+  SDenoiseFuncs m_pfDenoise;
+  int32_t      m_CPUFlag;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise_filter.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise_filter.cpp
new file mode 100644
index 0000000000..533c0402f9
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/denoise/denoise_filter.cpp
@@ -0,0 +1,126 @@
+/*!
+ * \copy
+ *     Copyright (c)  2010-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file    svc_preprocess.h
+ *
+ * \brief   svc denoising
+ *
+ * \date    4/1/2010 Created
+ *
+ */
+
+#include "denoise.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+void BilateralLumaFilter8_c (uint8_t* pSample, int32_t iStride) {
+  int32_t nSum = 0, nTotWeight = 0;
+  int32_t iCenterSample = *pSample;
+  uint8_t* pCurLine = pSample - iStride - DENOISE_GRAY_RADIUS;
+  int32_t x, y;
+  int32_t iCurSample, iCurWeight, iGreyDiff;
+  uint8_t aSample[8];
+
+  for (int32_t i = 0; i < 8; i++) {
+    nSum = 0;
+    nTotWeight = 0;
+    iCenterSample = *pSample;
+    pCurLine = pSample - iStride - DENOISE_GRAY_RADIUS;
+    for (y = 0; y < 3; y++) {
+      for (x = 0; x < 3; x++) {
+        if (x == 1 && y == 1) continue; // except center point
+        iCurSample = pCurLine[x];
+        iCurWeight = WELS_ABS (iCurSample - iCenterSample);
+        iGreyDiff = 32 - iCurWeight;
+        if (iGreyDiff < 0) continue;
+        else iCurWeight = (iGreyDiff * iGreyDiff) >> 5;
+        nSum += iCurSample * iCurWeight;
+        nTotWeight +=  iCurWeight;
+      }
+      pCurLine += iStride;
+    }
+    nTotWeight = 256 - nTotWeight;
+    nSum += iCenterSample * nTotWeight;
+    aSample[i] = nSum >> 8;
+    pSample++;
+  }
+  WelsMemcpy (pSample - 8, aSample, 8);
+}
+
+
+/***************************************************************************
+5x5 filter:
+1   1   2   1   1
+1   2   4   2   1
+2   4   20  4   2
+1   2   4   2   1
+1   1   2   1   1
+***************************************************************************/
+#define SUM_LINE1(pSample)       (pSample[0]     +(pSample[1])    +(pSample[2]<<1)  + pSample[3]     + pSample[4])
+#define SUM_LINE2(pSample)       (pSample[0]     +(pSample[1]<<1) +(pSample[2]<<2)  +(pSample[3]<<1) + pSample[4])
+#define SUM_LINE3(pSample)      ((pSample[0]<<1) +(pSample[1]<<2) +(pSample[2]*20)  +(pSample[3]<<2) +(pSample[4]<<1))
+void WaverageChromaFilter8_c (uint8_t* pSample, int32_t iStride) {
+  int32_t sum;
+  uint8_t* pStartPixels = pSample - UV_WINDOWS_RADIUS * iStride - UV_WINDOWS_RADIUS;
+  uint8_t* pCurLine1 = pStartPixels;
+  uint8_t* pCurLine2 = pCurLine1 + iStride;
+  uint8_t* pCurLine3 = pCurLine2 + iStride;
+  uint8_t* pCurLine4 = pCurLine3 + iStride;
+  uint8_t* pCurLine5 = pCurLine4 + iStride;
+  uint8_t aSample[8];
+
+  for (int32_t i = 0; i < 8; i++) {
+    sum = SUM_LINE1 ((pCurLine1 + i)) + SUM_LINE2 ((pCurLine2 + i)) + SUM_LINE3 ((pCurLine3 + i))
+          + SUM_LINE2 ((pCurLine4 + i)) + SUM_LINE1 ((pCurLine5 + i));
+    aSample[i] = (sum >> 6);
+    pSample++;
+  }
+  WelsMemcpy (pSample - 8, aSample, 8);
+}
+
+/***************************************************************************
+edge of y/uv use a 3x3 Gauss filter, radius = 1:
+1   2   1
+2   4   2
+1   2   1
+***************************************************************************/
+void Gauss3x3Filter (uint8_t* pSrc, int32_t iStride) {
+  int32_t nSum = 0;
+  uint8_t* pCurLine1 = pSrc - iStride - 1;
+  uint8_t* pCurLine2 = pCurLine1 + iStride;
+  uint8_t* pCurLine3 = pCurLine2 + iStride;
+
+  nSum =  pCurLine1[0]       + (pCurLine1[1] << 1) +  pCurLine1[2]       +
+         (pCurLine2[0] << 1) + (pCurLine2[1] << 2) + (pCurLine2[2] << 1) +
+          pCurLine3[0]       + (pCurLine3[1] << 1) +  pCurLine3[2];
+  *pSrc = nSum >> 4;
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.cpp
new file mode 100644
index 0000000000..1fb197eb02
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.cpp
@@ -0,0 +1,294 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "downsample.h"
+#include "cpu.h"
+#include <assert.h>
+
+WELSVP_NAMESPACE_BEGIN
+#define MAX_SAMPLE_WIDTH 1920
+#define MAX_SAMPLE_HEIGHT 1088
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CDownsampling::CDownsampling (int32_t iCpuFlag) {
+  m_iCPUFlag = iCpuFlag;
+  m_eMethod   = METHOD_DOWNSAMPLE;
+  WelsMemset (&m_pfDownsample, 0, sizeof (m_pfDownsample));
+  InitDownsampleFuncs (m_pfDownsample, m_iCPUFlag);
+  WelsMemset(m_pSampleBuffer,0,sizeof(m_pSampleBuffer));
+  m_bNoSampleBuffer = AllocateSampleBuffer();
+}
+
+CDownsampling::~CDownsampling() {
+  FreeSampleBuffer();
+}
+bool CDownsampling::AllocateSampleBuffer() {
+  for (int32_t i = 0; i < 2; i++) {
+    m_pSampleBuffer[i][0] = (uint8_t*)WelsMalloc (MAX_SAMPLE_WIDTH * MAX_SAMPLE_HEIGHT);
+    if (!m_pSampleBuffer[i][0])
+      goto FREE_RET;
+    m_pSampleBuffer[i][1] = (uint8_t*)WelsMalloc (MAX_SAMPLE_WIDTH * MAX_SAMPLE_HEIGHT / 4);
+    if (!m_pSampleBuffer[i][1])
+      goto FREE_RET;
+    m_pSampleBuffer[i][2] = (uint8_t*)WelsMalloc (MAX_SAMPLE_WIDTH * MAX_SAMPLE_HEIGHT / 4);
+    if (!m_pSampleBuffer[i][2])
+      goto FREE_RET;
+  }
+  return false;
+FREE_RET:
+  FreeSampleBuffer();
+  return true;
+
+}
+void CDownsampling::FreeSampleBuffer() {
+  for (int32_t i = 0; i < 2; i++) {
+    WelsFree (m_pSampleBuffer[i][0]);
+    m_pSampleBuffer[i][0] = NULL;
+    WelsFree (m_pSampleBuffer[i][1]);
+    m_pSampleBuffer[i][1] = NULL;
+    WelsFree (m_pSampleBuffer[i][2]);
+    m_pSampleBuffer[i][2] = NULL;
+  }
+}
+
+void CDownsampling::InitDownsampleFuncs (SDownsampleFuncs& sDownsampleFunc,  int32_t iCpuFlag) {
+  sDownsampleFunc.pfHalfAverageWidthx32 = DyadicBilinearDownsampler_c;
+  sDownsampleFunc.pfHalfAverageWidthx16 = DyadicBilinearDownsampler_c;
+  sDownsampleFunc.pfOneThirdDownsampler = DyadicBilinearOneThirdDownsampler_c;
+  sDownsampleFunc.pfQuarterDownsampler  = DyadicBilinearQuarterDownsampler_c;
+  sDownsampleFunc.pfGeneralRatioChroma  = GeneralBilinearAccurateDownsampler_c;
+  sDownsampleFunc.pfGeneralRatioLuma    = GeneralBilinearFastDownsampler_c;
+#if defined(X86_ASM)
+  if (iCpuFlag & WELS_CPU_SSE) {
+    sDownsampleFunc.pfHalfAverageWidthx32 = DyadicBilinearDownsamplerWidthx32_sse;
+    sDownsampleFunc.pfHalfAverageWidthx16 = DyadicBilinearDownsamplerWidthx16_sse;
+    sDownsampleFunc.pfQuarterDownsampler = DyadicBilinearQuarterDownsampler_sse;
+  }
+  if (iCpuFlag & WELS_CPU_SSE2) {
+    sDownsampleFunc.pfGeneralRatioChroma = GeneralBilinearAccurateDownsamplerWrap_sse2;
+    sDownsampleFunc.pfGeneralRatioLuma   = GeneralBilinearFastDownsamplerWrap_sse2;
+  }
+  if (iCpuFlag & WELS_CPU_SSSE3) {
+    sDownsampleFunc.pfHalfAverageWidthx32 = DyadicBilinearDownsamplerWidthx32_ssse3;
+    sDownsampleFunc.pfHalfAverageWidthx16 = DyadicBilinearDownsamplerWidthx16_ssse3;
+    sDownsampleFunc.pfOneThirdDownsampler = DyadicBilinearOneThirdDownsampler_ssse3;
+    sDownsampleFunc.pfQuarterDownsampler  = DyadicBilinearQuarterDownsampler_ssse3;
+    sDownsampleFunc.pfGeneralRatioLuma    = GeneralBilinearFastDownsamplerWrap_ssse3;
+  }
+  if (iCpuFlag & WELS_CPU_SSE41) {
+    sDownsampleFunc.pfOneThirdDownsampler = DyadicBilinearOneThirdDownsampler_sse4;
+    sDownsampleFunc.pfQuarterDownsampler  = DyadicBilinearQuarterDownsampler_sse4;
+    sDownsampleFunc.pfGeneralRatioChroma  = GeneralBilinearAccurateDownsamplerWrap_sse41;
+  }
+#ifdef HAVE_AVX2
+  if (iCpuFlag & WELS_CPU_AVX2) {
+    sDownsampleFunc.pfGeneralRatioChroma = GeneralBilinearAccurateDownsamplerWrap_avx2;
+    sDownsampleFunc.pfGeneralRatioLuma   = GeneralBilinearFastDownsamplerWrap_avx2;
+  }
+#endif
+#endif//X86_ASM
+
+#if defined(HAVE_NEON)
+  if (iCpuFlag & WELS_CPU_NEON) {
+    sDownsampleFunc.pfHalfAverageWidthx32 = DyadicBilinearDownsamplerWidthx32_neon;
+    sDownsampleFunc.pfHalfAverageWidthx16 = DyadicBilinearDownsampler_neon;
+    sDownsampleFunc.pfOneThirdDownsampler = DyadicBilinearOneThirdDownsampler_neon;
+    sDownsampleFunc.pfQuarterDownsampler  = DyadicBilinearQuarterDownsampler_neon;
+    sDownsampleFunc.pfGeneralRatioChroma = GeneralBilinearAccurateDownsamplerWrap_neon;
+    sDownsampleFunc.pfGeneralRatioLuma   = GeneralBilinearAccurateDownsamplerWrap_neon;
+  }
+#endif
+
+#if defined(HAVE_NEON_AARCH64)
+  if (iCpuFlag & WELS_CPU_NEON) {
+    sDownsampleFunc.pfHalfAverageWidthx32 = DyadicBilinearDownsamplerWidthx32_AArch64_neon;
+    sDownsampleFunc.pfHalfAverageWidthx16 = DyadicBilinearDownsampler_AArch64_neon;
+    sDownsampleFunc.pfOneThirdDownsampler = DyadicBilinearOneThirdDownsampler_AArch64_neon;
+    sDownsampleFunc.pfQuarterDownsampler  = DyadicBilinearQuarterDownsampler_AArch64_neon;
+    sDownsampleFunc.pfGeneralRatioChroma = GeneralBilinearAccurateDownsamplerWrap_AArch64_neon;
+    sDownsampleFunc.pfGeneralRatioLuma   = GeneralBilinearAccurateDownsamplerWrap_AArch64_neon;
+  }
+#endif
+}
+
+EResult CDownsampling::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pDstPixMap) {
+  int32_t iSrcWidthY = pSrcPixMap->sRect.iRectWidth;
+  int32_t iSrcHeightY = pSrcPixMap->sRect.iRectHeight;
+  int32_t iDstWidthY = pDstPixMap->sRect.iRectWidth;
+  int32_t iDstHeightY = pDstPixMap->sRect.iRectHeight;
+
+  int32_t iSrcWidthUV = iSrcWidthY >> 1;
+  int32_t iSrcHeightUV = iSrcHeightY >> 1;
+  int32_t iDstWidthUV = iDstWidthY >> 1;
+  int32_t iDstHeightUV = iDstHeightY >> 1;
+
+  if (iSrcWidthY <= iDstWidthY || iSrcHeightY <= iDstHeightY) {
+    return RET_INVALIDPARAM;
+  }
+  if ((iSrcWidthY >> 1) > MAX_SAMPLE_WIDTH || (iSrcHeightY >> 1) > MAX_SAMPLE_HEIGHT || m_bNoSampleBuffer) {
+    if ((iSrcWidthY >> 1) == iDstWidthY && (iSrcHeightY >> 1) == iDstHeightY) {
+      // use half average functions
+      DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0],
+          (uint8_t*)pSrcPixMap->pPixel[0], pSrcPixMap->iStride[0], iSrcWidthY, iSrcHeightY);
+      DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1],
+          (uint8_t*)pSrcPixMap->pPixel[1], pSrcPixMap->iStride[1], iSrcWidthUV, iSrcHeightUV);
+      DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2],
+          (uint8_t*)pSrcPixMap->pPixel[2], pSrcPixMap->iStride[2], iSrcWidthUV, iSrcHeightUV);
+    } else if ((iSrcWidthY >> 2) == iDstWidthY && (iSrcHeightY >> 2) == iDstHeightY) {
+
+      m_pfDownsample.pfQuarterDownsampler ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0],
+                                           (uint8_t*)pSrcPixMap->pPixel[0], pSrcPixMap->iStride[0], iSrcWidthY, iSrcHeightY);
+
+      m_pfDownsample.pfQuarterDownsampler ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1],
+                                           (uint8_t*)pSrcPixMap->pPixel[1], pSrcPixMap->iStride[1], iSrcWidthUV, iSrcHeightUV);
+
+      m_pfDownsample.pfQuarterDownsampler ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2],
+                                           (uint8_t*)pSrcPixMap->pPixel[2], pSrcPixMap->iStride[2], iSrcWidthUV, iSrcHeightUV);
+
+    } else if ((iSrcWidthY / 3) == iDstWidthY && (iSrcHeightY / 3) == iDstHeightY) {
+
+      m_pfDownsample.pfOneThirdDownsampler ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0],
+                                            (uint8_t*)pSrcPixMap->pPixel[0], pSrcPixMap->iStride[0], iSrcWidthY, iDstHeightY);
+
+      m_pfDownsample.pfOneThirdDownsampler ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1],
+                                            (uint8_t*)pSrcPixMap->pPixel[1], pSrcPixMap->iStride[1], iSrcWidthUV, iDstHeightUV);
+
+      m_pfDownsample.pfOneThirdDownsampler ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2],
+                                            (uint8_t*)pSrcPixMap->pPixel[2], pSrcPixMap->iStride[2], iSrcWidthUV, iDstHeightUV);
+
+    } else {
+      m_pfDownsample.pfGeneralRatioLuma ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0], iDstWidthY, iDstHeightY,
+                                         (uint8_t*)pSrcPixMap->pPixel[0], pSrcPixMap->iStride[0], iSrcWidthY, iSrcHeightY);
+
+      m_pfDownsample.pfGeneralRatioChroma ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1], iDstWidthUV, iDstHeightUV,
+                                           (uint8_t*)pSrcPixMap->pPixel[1], pSrcPixMap->iStride[1], iSrcWidthUV, iSrcHeightUV);
+
+      m_pfDownsample.pfGeneralRatioChroma ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2], iDstWidthUV, iDstHeightUV,
+                                           (uint8_t*)pSrcPixMap->pPixel[2], pSrcPixMap->iStride[2], iSrcWidthUV, iSrcHeightUV);
+    }
+  } else {
+
+    int32_t iIdx = 0;
+    int32_t iHalfSrcWidth = iSrcWidthY >> 1;
+    int32_t iHalfSrcHeight = iSrcHeightY >> 1;
+    uint8_t* pSrcY = (uint8_t*)pSrcPixMap->pPixel[0];
+    uint8_t* pSrcU = (uint8_t*)pSrcPixMap->pPixel[1];
+    uint8_t* pSrcV = (uint8_t*)pSrcPixMap->pPixel[2];
+    int32_t iSrcStrideY = pSrcPixMap->iStride[0];
+    int32_t iSrcStrideU = pSrcPixMap->iStride[1];
+    int32_t iSrcStrideV = pSrcPixMap->iStride[2];
+
+    int32_t iDstStrideY = pDstPixMap->iStride[0];
+    int32_t iDstStrideU = pDstPixMap->iStride[1];
+    int32_t iDstStrideV = pDstPixMap->iStride[2];
+
+    uint8_t* pDstY = (uint8_t*)m_pSampleBuffer[iIdx][0];
+    uint8_t* pDstU = (uint8_t*)m_pSampleBuffer[iIdx][1];
+    uint8_t* pDstV = (uint8_t*)m_pSampleBuffer[iIdx][2];
+    iIdx++;
+    do {
+      if ((iHalfSrcWidth == iDstWidthY) && (iHalfSrcHeight == iDstHeightY)) { //end
+        // use half average functions
+        DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0],
+            (uint8_t*)pSrcY, iSrcStrideY, iSrcWidthY, iSrcHeightY);
+        DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1],
+            (uint8_t*)pSrcU, iSrcStrideU, iSrcWidthUV, iSrcHeightUV);
+        DownsampleHalfAverage ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2],
+            (uint8_t*)pSrcV, iSrcStrideV, iSrcWidthUV, iSrcHeightUV);
+        break;
+      } else if ((iHalfSrcWidth > iDstWidthY) && (iHalfSrcHeight > iDstHeightY)){
+        // use half average functions
+        iDstStrideY = WELS_ALIGN (iHalfSrcWidth, 32);
+        iDstStrideU = WELS_ALIGN (iHalfSrcWidth >> 1, 32);
+        iDstStrideV = WELS_ALIGN (iHalfSrcWidth >> 1, 32);
+        DownsampleHalfAverage ((uint8_t*)pDstY, iDstStrideY,
+            (uint8_t*)pSrcY, iSrcStrideY, iSrcWidthY, iSrcHeightY);
+        DownsampleHalfAverage ((uint8_t*)pDstU, iDstStrideU,
+            (uint8_t*)pSrcU, iSrcStrideU, iSrcWidthUV, iSrcHeightUV);
+        DownsampleHalfAverage ((uint8_t*)pDstV, iDstStrideV,
+            (uint8_t*)pSrcV, iSrcStrideV, iSrcWidthUV, iSrcHeightUV);
+
+        pSrcY = (uint8_t*)pDstY;
+        pSrcU = (uint8_t*)pDstU;
+        pSrcV = (uint8_t*)pDstV;
+
+
+        iSrcWidthY = iHalfSrcWidth;
+        iSrcWidthUV = iHalfSrcWidth >> 1;
+        iSrcHeightY = iHalfSrcHeight;
+        iSrcHeightUV = iHalfSrcHeight >> 1;
+
+        iSrcStrideY = iDstStrideY;
+        iSrcStrideU = iDstStrideU;
+        iSrcStrideV = iDstStrideV;
+
+        iHalfSrcWidth >>= 1;
+        iHalfSrcHeight >>= 1;
+
+        iIdx = iIdx % 2;
+        pDstY = (uint8_t*)m_pSampleBuffer[iIdx][0];
+        pDstU = (uint8_t*)m_pSampleBuffer[iIdx][1];
+        pDstV = (uint8_t*)m_pSampleBuffer[iIdx][2];
+        iIdx++;
+      } else {
+        m_pfDownsample.pfGeneralRatioLuma ((uint8_t*)pDstPixMap->pPixel[0], pDstPixMap->iStride[0], iDstWidthY, iDstHeightY,
+                                           (uint8_t*)pSrcY, iSrcStrideY, iSrcWidthY, iSrcHeightY);
+
+        m_pfDownsample.pfGeneralRatioChroma ((uint8_t*)pDstPixMap->pPixel[1], pDstPixMap->iStride[1], iDstWidthUV, iDstHeightUV,
+                                             (uint8_t*)pSrcU, iSrcStrideU,  iSrcWidthUV, iSrcHeightUV);
+
+        m_pfDownsample.pfGeneralRatioChroma ((uint8_t*)pDstPixMap->pPixel[2], pDstPixMap->iStride[2], iDstWidthUV, iDstHeightUV,
+                                             (uint8_t*)pSrcV, iSrcStrideV, iSrcWidthUV, iSrcHeightUV);
+        break;
+      }
+    } while (true);
+  }
+  return RET_SUCCESS;
+}
+
+void CDownsampling::DownsampleHalfAverage (uint8_t* pDst, int32_t iDstStride,
+        uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcWidth, int32_t iSrcHeight) {
+  if ((iSrcStride & 31) == 0) {
+    assert ((iDstStride & 15) == 0);
+    m_pfDownsample.pfHalfAverageWidthx32 (pDst, iDstStride,
+        pSrc, iSrcStride, WELS_ALIGN (iSrcWidth & ~1, 32), iSrcHeight);
+  } else {
+    assert ((iSrcStride & 15) == 0);
+    assert ((iDstStride &  7) == 0);
+    m_pfDownsample.pfHalfAverageWidthx16 (pDst, iDstStride,
+        pSrc, iSrcStride, WELS_ALIGN (iSrcWidth & ~1, 16), iSrcHeight);
+  }
+}
+
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.h
new file mode 100644
index 0000000000..ca5c4bd49c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsample.h
@@ -0,0 +1,201 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  downsample.h
+ *
+ * \brief       :  downsample class of wels video processor class
+ *
+ * \date        :  2011/03/33
+ *
+ * \description :  1. rewrite the package code of downsample class
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_DOWNSAMPLE_H
+#define WELSVP_DOWNSAMPLE_H
+
+#include "util.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+#include "macros.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+
+typedef void (HalveDownsampleFunc) (uint8_t* pDst, const int32_t kiDstStride,
+                                    uint8_t* pSrc, const int32_t kiSrcStride,
+                                    const int32_t kiSrcWidth, const int32_t kiSrcHeight);
+
+typedef void (SpecificDownsampleFunc) (uint8_t* pDst, const int32_t kiDstStride,
+                                       uint8_t* pSrc, const int32_t kiSrcStride,
+                                       const int32_t kiSrcWidth, const int32_t kiHeight);
+
+typedef void (GeneralDownsampleFunc) (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+                                      const int32_t kiDstHeight,
+                                      uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight);
+
+typedef HalveDownsampleFunc*    PHalveDownsampleFunc;
+typedef SpecificDownsampleFunc* PSpecificDownsampleFunc;
+typedef GeneralDownsampleFunc*  PGeneralDownsampleFunc;
+
+HalveDownsampleFunc     DyadicBilinearDownsampler_c;
+GeneralDownsampleFunc GeneralBilinearFastDownsampler_c;
+GeneralDownsampleFunc GeneralBilinearAccurateDownsampler_c;
+SpecificDownsampleFunc  DyadicBilinearOneThirdDownsampler_c;
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_c;
+
+typedef struct {
+  PHalveDownsampleFunc          pfHalfAverageWidthx32;
+  PHalveDownsampleFunc          pfHalfAverageWidthx16;
+  PSpecificDownsampleFunc       pfOneThirdDownsampler;
+  PSpecificDownsampleFunc       pfQuarterDownsampler;
+  PGeneralDownsampleFunc        pfGeneralRatioLuma;
+  PGeneralDownsampleFunc        pfGeneralRatioChroma;
+} SDownsampleFuncs;
+
+
+#ifdef X86_ASM
+WELSVP_EXTERN_C_BEGIN
+// used for scr width is multipler of 8 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx8_sse;
+// iSrcWidth= x16 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx16_sse;
+// iSrcWidth= x32 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx32_sse;
+// used for scr width is multipler of 16 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx16_ssse3;
+// iSrcWidth= x32 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx32_ssse3;
+
+GeneralDownsampleFunc GeneralBilinearFastDownsamplerWrap_sse2;
+GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_sse2;
+GeneralDownsampleFunc GeneralBilinearFastDownsamplerWrap_ssse3;
+GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_sse41;
+#ifdef HAVE_AVX2
+GeneralDownsampleFunc GeneralBilinearFastDownsamplerWrap_avx2;
+GeneralDownsampleFunc GeneralBilinearAccurateDownsamplerWrap_avx2;
+#endif
+
+SpecificDownsampleFunc  DyadicBilinearOneThirdDownsampler_ssse3;
+SpecificDownsampleFunc  DyadicBilinearOneThirdDownsampler_sse4;
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_sse;
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_ssse3;
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_sse4;
+
+void GeneralBilinearFastDownsampler_sse2 (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+    const int32_t kiDstHeight, uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX,
+    const uint32_t kuiScaleY);
+void GeneralBilinearAccurateDownsampler_sse2 (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+    const int32_t kiDstHeight, uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX,
+    const uint32_t kuiScaleY);
+void GeneralBilinearFastDownsampler_ssse3 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+    uint32_t uiScaleY);
+void GeneralBilinearAccurateDownsampler_sse41 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+    uint32_t uiScaleY);
+#ifdef HAVE_AVX2
+void GeneralBilinearFastDownsampler_avx2 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+    uint32_t uiScaleY);
+void GeneralBilinearAccurateDownsampler_avx2 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+    uint32_t uiScaleY);
+#endif
+
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON
+WELSVP_EXTERN_C_BEGIN
+// iSrcWidth no limitation
+HalveDownsampleFunc     DyadicBilinearDownsampler_neon;
+// iSrcWidth = x32 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx32_neon;
+
+GeneralDownsampleFunc   GeneralBilinearAccurateDownsamplerWrap_neon;
+
+SpecificDownsampleFunc  DyadicBilinearOneThirdDownsampler_neon;
+
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_neon;
+
+void GeneralBilinearAccurateDownsampler_neon (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+    const int32_t kiDstHeight,
+    uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX, const uint32_t kuiScaleY);
+
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+WELSVP_EXTERN_C_BEGIN
+// iSrcWidth no limitation
+HalveDownsampleFunc     DyadicBilinearDownsampler_AArch64_neon;
+// iSrcWidth = x32 pixels
+HalveDownsampleFunc     DyadicBilinearDownsamplerWidthx32_AArch64_neon;
+
+GeneralDownsampleFunc   GeneralBilinearAccurateDownsamplerWrap_AArch64_neon;
+
+SpecificDownsampleFunc  DyadicBilinearOneThirdDownsampler_AArch64_neon;
+
+SpecificDownsampleFunc  DyadicBilinearQuarterDownsampler_AArch64_neon;
+
+void GeneralBilinearAccurateDownsampler_AArch64_neon (uint8_t* pDst, const int32_t kiDstStride,
+    const int32_t kiDstWidth, const int32_t kiDstHeight,
+    uint8_t* pSrc, const int32_t kiSrcStride, const uint32_t kuiScaleX, const uint32_t kuiScaleY);
+
+WELSVP_EXTERN_C_END
+#endif
+
+
+class CDownsampling : public IStrategy {
+ public:
+  CDownsampling (int32_t iCpuFlag);
+  ~CDownsampling();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pDst);
+
+ private:
+  void InitDownsampleFuncs (SDownsampleFuncs& sDownsampleFunc, int32_t iCpuFlag);
+
+  void DownsampleHalfAverage (uint8_t* pDst, int32_t iDstStride,
+      uint8_t* pSrc, int32_t iSrcStride, int32_t iSrcWidth, int32_t iSrcHeight);
+  bool AllocateSampleBuffer();
+  void FreeSampleBuffer();
+ private:
+  SDownsampleFuncs m_pfDownsample;
+  int32_t  m_iCPUFlag;
+  uint8_t  *m_pSampleBuffer[2][3];
+  bool     m_bNoSampleBuffer;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsamplefuncs.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsamplefuncs.cpp
new file mode 100644
index 0000000000..ed5e7572bb
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/downsample/downsamplefuncs.cpp
@@ -0,0 +1,300 @@
+/*!
+ * \copy
+ *     Copyright (c)  2008-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  downsample_yuv.c
+ *
+ *  Abstract
+ *      Implementation for source yuv data downsampling used before spatial encoding.
+ *
+ *  History
+ *      10/24/2008 Created
+ *
+ *****************************************************************************/
+
+#include "downsample.h"
+
+
+WELSVP_NAMESPACE_BEGIN
+
+
+void DyadicBilinearDownsampler_c (uint8_t* pDst, const int32_t kiDstStride,
+                                  uint8_t* pSrc, const int32_t kiSrcStride,
+                                  const int32_t kiSrcWidth, const int32_t kiSrcHeight)
+
+{
+  uint8_t* pDstLine     = pDst;
+  uint8_t* pSrcLine     = pSrc;
+  const int32_t kiSrcStridex2   = kiSrcStride << 1;
+  const int32_t kiDstWidth      = kiSrcWidth  >> 1;
+  const int32_t kiDstHeight     = kiSrcHeight >> 1;
+
+  for (int32_t j = 0; j < kiDstHeight; j ++) {
+    for (int32_t i = 0; i < kiDstWidth; i ++) {
+      const int32_t kiSrcX = i << 1;
+      const int32_t kiTempRow1 = (pSrcLine[kiSrcX] + pSrcLine[kiSrcX + 1] + 1) >> 1;
+      const int32_t kiTempRow2 = (pSrcLine[kiSrcX + kiSrcStride] + pSrcLine[kiSrcX + kiSrcStride + 1] + 1) >> 1;
+
+      pDstLine[i] = (uint8_t) ((kiTempRow1 + kiTempRow2 + 1) >> 1);
+    }
+    pDstLine    += kiDstStride;
+    pSrcLine    += kiSrcStridex2;
+  }
+}
+
+void DyadicBilinearQuarterDownsampler_c (uint8_t* pDst, const int32_t kiDstStride,
+    uint8_t* pSrc, const int32_t kiSrcStride,
+    const int32_t kiSrcWidth, const int32_t kiSrcHeight)
+
+{
+  uint8_t* pDstLine     = pDst;
+  uint8_t* pSrcLine     = pSrc;
+  const int32_t kiSrcStridex4   = kiSrcStride << 2;
+  const int32_t kiDstWidth      = kiSrcWidth  >> 2;
+  const int32_t kiDstHeight     = kiSrcHeight >> 2;
+
+  for (int32_t j = 0; j < kiDstHeight; j ++) {
+    for (int32_t i = 0; i < kiDstWidth; i ++) {
+      const int32_t kiSrcX = i << 2;
+      const int32_t kiTempRow1 = (pSrcLine[kiSrcX] + pSrcLine[kiSrcX + 1] + 1) >> 1;
+      const int32_t kiTempRow2 = (pSrcLine[kiSrcX + kiSrcStride] + pSrcLine[kiSrcX + kiSrcStride + 1] + 1) >> 1;
+
+      pDstLine[i] = (uint8_t) ((kiTempRow1 + kiTempRow2 + 1) >> 1);
+    }
+    pDstLine    += kiDstStride;
+    pSrcLine    += kiSrcStridex4;
+  }
+}
+
+void DyadicBilinearOneThirdDownsampler_c (uint8_t* pDst, const int32_t kiDstStride,
+    uint8_t* pSrc, const int32_t kiSrcStride,
+    const int32_t kiSrcWidth, const int32_t kiDstHeight)
+
+{
+  uint8_t* pDstLine     = pDst;
+  uint8_t* pSrcLine     = pSrc;
+  const int32_t kiSrcStridex3   = kiSrcStride * 3;
+  const int32_t kiDstWidth      = kiSrcWidth / 3;
+
+  for (int32_t j = 0; j < kiDstHeight; j ++) {
+    for (int32_t i = 0; i < kiDstWidth; i ++) {
+      const int32_t kiSrcX = i * 3;
+      const int32_t kiTempRow1 = (pSrcLine[kiSrcX] + pSrcLine[kiSrcX + 1] + 1) >> 1;
+      const int32_t kiTempRow2 = (pSrcLine[kiSrcX + kiSrcStride] + pSrcLine[kiSrcX + kiSrcStride + 1] + 1) >> 1;
+
+      pDstLine[i] = (uint8_t) ((kiTempRow1 + kiTempRow2 + 1) >> 1);
+    }
+    pDstLine    += kiDstStride;
+    pSrcLine    += kiSrcStridex3;
+  }
+}
+
+void GeneralBilinearFastDownsampler_c (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+                                       const int32_t kiDstHeight,
+                                       uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {
+  const uint32_t kuiScaleBitWidth = 16, kuiScaleBitHeight = 15;
+  const uint32_t kuiScaleWidth = (1 << kuiScaleBitWidth), kuiScaleHeight = (1 << kuiScaleBitHeight);
+  int32_t fScalex = WELS_ROUND ((float)kiSrcWidth / (float)kiDstWidth * kuiScaleWidth);
+  int32_t fScaley = WELS_ROUND ((float)kiSrcHeight / (float)kiDstHeight * kuiScaleHeight);
+  uint32_t x;
+  int32_t iYInverse, iXInverse;
+
+  uint8_t* pByDst = pDst;
+  uint8_t* pByLineDst = pDst;
+
+  iYInverse = 1 << (kuiScaleBitHeight - 1);
+  for (int32_t i = 0; i < kiDstHeight - 1; i++) {
+    int32_t iYy = iYInverse >> kuiScaleBitHeight;
+    int32_t fv = iYInverse & (kuiScaleHeight - 1);
+
+    uint8_t* pBySrc = pSrc + iYy * kiSrcStride;
+
+    pByDst = pByLineDst;
+    iXInverse = 1 << (kuiScaleBitWidth - 1);
+    for (int32_t j = 0; j < kiDstWidth - 1; j++) {
+      int32_t iXx = iXInverse >> kuiScaleBitWidth;
+      int32_t iFu = iXInverse & (kuiScaleWidth - 1);
+
+      uint8_t* pByCurrent = pBySrc + iXx;
+      uint8_t a, b, c, d;
+
+      a = *pByCurrent;
+      b = * (pByCurrent + 1);
+      c = * (pByCurrent + kiSrcStride);
+      d = * (pByCurrent + kiSrcStride + 1);
+
+      x  = (((uint32_t) (kuiScaleWidth - 1 - iFu)) * (kuiScaleHeight - 1 - fv) >> kuiScaleBitWidth) * a;
+      x += (((uint32_t) (iFu)) * (kuiScaleHeight - 1 - fv) >> kuiScaleBitWidth) * b;
+      x += (((uint32_t) (kuiScaleWidth - 1 - iFu)) * (fv) >> kuiScaleBitWidth) * c;
+      x += (((uint32_t) (iFu)) * (fv) >> kuiScaleBitWidth) * d;
+      x >>= (kuiScaleBitHeight - 1);
+      x += 1;
+      x >>= 1;
+      //x = (((__int64)(SCALE_BIG - 1 - iFu))*(SCALE_BIG - 1 - fv)*a + ((__int64)iFu)*(SCALE_BIG - 1 -fv)*b + ((__int64)(SCALE_BIG - 1 -iFu))*fv*c +
+      // ((__int64)iFu)*fv*d + (1 << (2*SCALE_BIT_BIG-1)) ) >> (2*SCALE_BIT_BIG);
+      x = WELS_CLAMP (x, 0, 255);
+      *pByDst++ = (uint8_t)x;
+
+      iXInverse += fScalex;
+    }
+    *pByDst = * (pBySrc + (iXInverse >> kuiScaleBitWidth));
+    pByLineDst += kiDstStride;
+    iYInverse += fScaley;
+  }
+
+  // last row special
+  {
+    int32_t iYy = iYInverse >> kuiScaleBitHeight;
+    uint8_t* pBySrc = pSrc + iYy * kiSrcStride;
+
+    pByDst = pByLineDst;
+    iXInverse = 1 << (kuiScaleBitWidth - 1);
+    for (int32_t j = 0; j < kiDstWidth; j++) {
+      int32_t iXx = iXInverse >> kuiScaleBitWidth;
+      *pByDst++ = * (pBySrc + iXx);
+
+      iXInverse += fScalex;
+    }
+  }
+}
+
+void GeneralBilinearAccurateDownsampler_c (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+    const int32_t kiDstHeight,
+    uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) {
+  const int32_t kiScaleBit = 15;
+  const int32_t kiScale = (1 << kiScaleBit);
+  int32_t iScalex = WELS_ROUND ((float)kiSrcWidth / (float)kiDstWidth * kiScale);
+  int32_t iScaley = WELS_ROUND ((float)kiSrcHeight / (float)kiDstHeight * kiScale);
+  int64_t x;
+  int32_t iYInverse, iXInverse;
+
+  uint8_t* pByDst = pDst;
+  uint8_t* pByLineDst = pDst;
+
+  iYInverse = 1 << (kiScaleBit - 1);
+  for (int32_t i = 0; i < kiDstHeight - 1; i++) {
+    int32_t iYy = iYInverse >> kiScaleBit;
+    int32_t iFv = iYInverse & (kiScale - 1);
+
+    uint8_t* pBySrc = pSrc + iYy * kiSrcStride;
+
+    pByDst = pByLineDst;
+    iXInverse = 1 << (kiScaleBit - 1);
+    for (int32_t j = 0; j < kiDstWidth - 1; j++) {
+      int32_t iXx = iXInverse >> kiScaleBit;
+      int32_t iFu = iXInverse & (kiScale - 1);
+
+      uint8_t* pByCurrent = pBySrc + iXx;
+      uint8_t a, b, c, d;
+
+      a = *pByCurrent;
+      b = * (pByCurrent + 1);
+      c = * (pByCurrent + kiSrcStride);
+      d = * (pByCurrent + kiSrcStride + 1);
+
+      x = (((int64_t) (kiScale - 1 - iFu)) * (kiScale - 1 - iFv) * a + ((int64_t)iFu) * (kiScale - 1 - iFv) * b + ((int64_t) (
+             kiScale - 1 - iFu)) * iFv * c +
+           ((int64_t)iFu) * iFv * d + (int64_t) (1 << (2 * kiScaleBit - 1))) >> (2 * kiScaleBit);
+      x = WELS_CLAMP (x, 0, 255);
+      *pByDst++ = (uint8_t)x;
+
+      iXInverse += iScalex;
+    }
+    *pByDst = * (pBySrc + (iXInverse >> kiScaleBit));
+    pByLineDst += kiDstStride;
+    iYInverse += iScaley;
+  }
+
+  // last row special
+  {
+    int32_t iYy = iYInverse >> kiScaleBit;
+    uint8_t* pBySrc = pSrc + iYy * kiSrcStride;
+
+    pByDst = pByLineDst;
+    iXInverse = 1 << (kiScaleBit - 1);
+    for (int32_t j = 0; j < kiDstWidth; j++) {
+      int32_t iXx = iXInverse >> kiScaleBit;
+      *pByDst++ = * (pBySrc + iXx);
+
+      iXInverse += iScalex;
+    }
+  }
+}
+
+#if defined(X86_ASM) || defined(HAVE_NEON) || defined(HAVE_NEON_AARCH64)
+static void GeneralBilinearDownsamplerWrap (uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth,
+    const int32_t kiDstHeight,
+    uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight,
+    const int32_t kiScaleBitWidth, const int32_t kiScaleBitHeight,
+    void (*func) (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth, int32_t iDstHeight,
+                  uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX, uint32_t uiScaleY)) {
+  const uint32_t kuiScaleWidth = (1 << kiScaleBitWidth), kuiScaleHeight = (1 << kiScaleBitHeight);
+
+  uint32_t uiScalex = WELS_ROUND ((float)kiSrcWidth / (float)kiDstWidth * kuiScaleWidth);
+  uint32_t uiScaley = WELS_ROUND ((float)kiSrcHeight / (float)kiDstHeight * kuiScaleHeight);
+
+  func (pDst, kiDstStride, kiDstWidth, kiDstHeight, pSrc, kiSrcStride, uiScalex, uiScaley);
+}
+
+#define DEFINE_GENERAL_BILINEAR_FAST_DOWNSAMPLER_WRAP(suffix) \
+  void GeneralBilinearFastDownsamplerWrap_ ## suffix ( \
+      uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, const int32_t kiDstHeight, \
+      uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) { \
+    GeneralBilinearDownsamplerWrap (pDst, kiDstStride, kiDstWidth, kiDstHeight, \
+        pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, 16, 15, GeneralBilinearFastDownsampler_ ## suffix); \
+  }
+
+#define DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP(suffix) \
+  void GeneralBilinearAccurateDownsamplerWrap_ ## suffix ( \
+      uint8_t* pDst, const int32_t kiDstStride, const int32_t kiDstWidth, const int32_t kiDstHeight, \
+      uint8_t* pSrc, const int32_t kiSrcStride, const int32_t kiSrcWidth, const int32_t kiSrcHeight) { \
+    GeneralBilinearDownsamplerWrap (pDst, kiDstStride, kiDstWidth, kiDstHeight, \
+        pSrc, kiSrcStride, kiSrcWidth, kiSrcHeight, 15, 15, GeneralBilinearAccurateDownsampler_ ## suffix); \
+  }
+#endif
+
+#ifdef X86_ASM
+DEFINE_GENERAL_BILINEAR_FAST_DOWNSAMPLER_WRAP (sse2)
+DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP (sse2)
+DEFINE_GENERAL_BILINEAR_FAST_DOWNSAMPLER_WRAP (ssse3)
+DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP (sse41)
+#ifdef HAVE_AVX2
+DEFINE_GENERAL_BILINEAR_FAST_DOWNSAMPLER_WRAP (avx2)
+DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP (avx2)
+#endif
+#endif //X86_ASM
+
+#ifdef HAVE_NEON
+DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP (neon)
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+DEFINE_GENERAL_BILINEAR_ACCURATE_DOWNSAMPLER_WRAP (AArch64_neon)
+#endif
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.cpp
new file mode 100644
index 0000000000..610a3c8a9d
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.cpp
@@ -0,0 +1,92 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "imagerotate.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CImageRotating::CImageRotating (int32_t iCpuFlag) {
+  m_iCPUFlag = iCpuFlag;
+  m_eMethod   = METHOD_IMAGE_ROTATE;
+  WelsMemset (&m_pfRotateImage, 0, sizeof (m_pfRotateImage));
+  InitImageRotateFuncs (m_pfRotateImage, m_iCPUFlag);
+}
+
+CImageRotating::~CImageRotating() {
+}
+
+void CImageRotating::InitImageRotateFuncs (SImageRotateFuncs& sImageRotateFuncs, int32_t iCpuFlag) {
+  sImageRotateFuncs.pfImageRotate90D = ImageRotate90D_c;
+  sImageRotateFuncs.pfImageRotate180D = ImageRotate180D_c;
+  sImageRotateFuncs.pfImageRotate270D = ImageRotate270D_c;
+}
+EResult CImageRotating::ProcessImageRotate (int32_t iType, uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth,
+    uint32_t iHeight, uint8_t* pDst) {
+  if (iType == 90) {
+    m_pfRotateImage.pfImageRotate90D (pSrc, uiBytesPerPixel, iWidth, iHeight, pDst);
+  } else if (iType == 180) {
+    m_pfRotateImage.pfImageRotate180D (pSrc, uiBytesPerPixel, iWidth, iHeight, pDst);
+  } else if (iType == 270) {
+    m_pfRotateImage.pfImageRotate270D (pSrc, uiBytesPerPixel, iWidth, iHeight, pDst);
+  } else {
+    return RET_NOTSUPPORTED;
+  }
+  return RET_SUCCESS;
+}
+
+EResult CImageRotating::Process (int32_t iType, SPixMap* pSrc, SPixMap* pDst) {
+  EResult eReturn = RET_INVALIDPARAM;
+
+  if ((pSrc->eFormat == VIDEO_FORMAT_RGBA) ||
+      (pSrc->eFormat == VIDEO_FORMAT_BGRA) ||
+      (pSrc->eFormat == VIDEO_FORMAT_ABGR) ||
+      (pSrc->eFormat == VIDEO_FORMAT_ARGB)) {
+    eReturn = ProcessImageRotate (iType, (uint8_t*)pSrc->pPixel[0], pSrc->iSizeInBits * 8, pSrc->sRect.iRectWidth,
+                                  pSrc->sRect.iRectHeight, (uint8_t*)pDst->pPixel[0]);
+  } else if (pSrc->eFormat == VIDEO_FORMAT_I420) {
+    ProcessImageRotate (iType, (uint8_t*)pSrc->pPixel[0], pSrc->iSizeInBits * 8, pSrc->sRect.iRectWidth,
+                        pSrc->sRect.iRectHeight, (uint8_t*)pDst->pPixel[0]);
+    ProcessImageRotate (iType, (uint8_t*)pSrc->pPixel[1], pSrc->iSizeInBits * 8, (pSrc->sRect.iRectWidth >> 1),
+                        (pSrc->sRect.iRectHeight >> 1), (uint8_t*)pDst->pPixel[1]);
+    eReturn = ProcessImageRotate (iType, (uint8_t*)pSrc->pPixel[2], pSrc->iSizeInBits * 8, (pSrc->sRect.iRectWidth >> 1),
+                                  (pSrc->sRect.iRectHeight >> 1), (uint8_t*)pDst->pPixel[2]);
+  } else {
+    eReturn = RET_NOTSUPPORTED;
+  }
+
+  return eReturn;
+}
+
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.h
new file mode 100644
index 0000000000..98619b6059
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotate.h
@@ -0,0 +1,85 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  downsample.h
+ *
+ * \brief       :  image rotate class of wels video processor class
+ *
+ * \date        :  2011/04/06
+ *
+ * \description :
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_IMAGEROTATE_H
+#define WELSVP_IMAGEROTATE_H
+
+#include "util.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef void (ImageRotateFunc) (uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth, uint32_t iHeight,
+                                uint8_t* pDst);
+
+typedef ImageRotateFunc* ImageRotateFuncPtr;
+
+ImageRotateFunc   ImageRotate90D_c;
+ImageRotateFunc   ImageRotate180D_c;
+ImageRotateFunc   ImageRotate270D_c;
+
+typedef struct {
+  ImageRotateFuncPtr    pfImageRotate90D;
+  ImageRotateFuncPtr    pfImageRotate180D;
+  ImageRotateFuncPtr    pfImageRotate270D;
+} SImageRotateFuncs;
+
+class CImageRotating : public IStrategy {
+ public:
+  CImageRotating (int32_t iCpuFlag);
+  ~CImageRotating();
+
+  EResult Process (int32_t iType, SPixMap* pSrc, SPixMap* pDst);
+
+ private:
+  void InitImageRotateFuncs (SImageRotateFuncs& pf, int32_t iCpuFlag);
+  EResult ProcessImageRotate (int32_t iType, uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth, uint32_t iHeight,
+                              uint8_t* pDst);
+
+ private:
+  SImageRotateFuncs m_pfRotateImage;
+  int32_t          m_iCPUFlag;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotatefuncs.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotatefuncs.cpp
new file mode 100644
index 0000000000..e4a72fdfed
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/imagerotate/imagerotatefuncs.cpp
@@ -0,0 +1,65 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  image_rotate.c
+ *
+ *  Created on 11-2-21.
+ *
+ */
+
+#include "imagerotate.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+void ImageRotate90D_c (uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth, uint32_t iHeight, uint8_t* pDst) {
+  for (uint32_t j = 0; j < iHeight; j++) {
+    for (uint32_t i = 0; i < iWidth; i++) {
+      for (uint32_t n = 0; n < uiBytesPerPixel; n++)
+        pDst[ (i * iHeight + iHeight - 1 - j)*uiBytesPerPixel + n] = pSrc[ (iWidth * j + i) * uiBytesPerPixel + n];
+    }
+  }
+}
+void ImageRotate180D_c (uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth, uint32_t iHeight, uint8_t* pDst) {
+  for (uint32_t j = 0; j < iHeight; j++) {
+    for (uint32_t i = 0; i < iWidth; i++) {
+      for (uint32_t n = 0; n < uiBytesPerPixel; n++)
+        pDst[ ((iHeight - 1 - j)*iWidth + iWidth - 1 - i)*uiBytesPerPixel + n] = pSrc[ (iWidth * j + i) * uiBytesPerPixel + n];
+    }
+  }
+}
+void ImageRotate270D_c (uint8_t* pSrc, uint32_t uiBytesPerPixel, uint32_t iWidth, uint32_t iHeight, uint8_t* pDst) {
+  for (uint32_t j = 0; j < iWidth; j++) {
+    for (uint32_t i = 0; i < iHeight; i++) {
+      for (uint32_t n = 0; n < uiBytesPerPixel; n++)
+        pDst[ ((iWidth - 1 - j)*iHeight + i)*uiBytesPerPixel + n] = pSrc[ (iWidth * i + j) * uiBytesPerPixel + n];
+    }
+  }
+}
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/mips/vaa_mmi.c b/third-party/openh264/third_party/openh264/src/codec/processing/src/mips/vaa_mmi.c
new file mode 100644
index 0000000000..b40303ac80
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/mips/vaa_mmi.c
@@ -0,0 +1,892 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2018, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * \file    vaa_mmi.c
+ *
+ * \brief   Loongson optimization
+ *
+ * \date    23/07/2018 Created
+ *
+ *************************************************************************************
+ */
+#include <stdint.h>
+#include "asmdefs_mmi.h"
+
+//f4 is 0x1, f6 is 0x8
+#define WELS_MAX_REG_MMI(f0, f2, f4, f6) \
+  "punpckhwd  $f4, "#f0", "#f0"    \n\t" \
+  "punpckhwd  $f6, "#f2", "#f2"    \n\t" \
+  "pmaxub     "#f0", "#f0", $f4    \n\t" \
+  "pmaxub     "#f2", "#f2", $f6    \n\t" \
+  "pshufh     $f4, "#f0", "#f4"    \n\t" \
+  "pshufh     $f6, "#f2", "#f4"    \n\t" \
+  "pmaxub     "#f0", "#f0", $f4    \n\t" \
+  "pmaxub     "#f2", "#f2", $f6    \n\t" \
+  "dsrl       $f4, "#f0", "#f6"    \n\t" \
+  "dsrl       $f6, "#f2", "#f6"    \n\t" \
+  "pmaxub     "#f0", "#f0", $f4    \n\t" \
+  "pmaxub     "#f2", "#f2", $f6    \n\t"
+
+#define WELS_SAD_SD_MAD_16x1_MMI(f0, f2, f4, f6, f8, f10, f12, f14, r0, r1, r2) \
+  "gslqc1     $f6, $f4, 0x0("#r0")                \n\t" \
+  "gslqc1     $f10, $f8, 0x0("#r1")               \n\t" \
+  "pasubub    $f12, $f4, $f0                      \n\t" \
+  "pasubub    $f14, $f6, $f2                      \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      "#f4", "#f4", $f12                  \n\t" \
+  "paddw      "#f6", "#f6", $f14                  \n\t" \
+  "pasubub    $f12, $f8, $f0                      \n\t" \
+  "pasubub    $f14, $f10, $f2                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      "#f8", "#f8", $f12                  \n\t" \
+  "paddw      "#f10", "#f10", $f14                \n\t" \
+  "pasubub    $f12, $f4, $f8                      \n\t" \
+  "pasubub    $f14, $f6, $f10                     \n\t" \
+  "pmaxub     "#f12", "#f12", $f12                \n\t" \
+  "pmaxub     "#f14", "#f14", $f14                \n\t" \
+  "pasubub    $f12, $f12, $f0                     \n\t" \
+  "pasubub    $f14, $f14, $f2                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      "#f0", "#f0", $f12                  \n\t" \
+  "paddw      "#f2", "#f2", $f14                  \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r2"                 \n\t" \
+  PTR_ADDU   ""#r1", "#r1", "#r2"                 \n\t"
+
+#define WELS_SAD_16x2_MMI(f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, r1, r2, r3) \
+  "gslqc1     "#f1",  "#f2",  0x00("#r1")         \n\t" \
+  "gslqc1     "#f3",  "#f4",  0x00("#r2")         \n\t" \
+  PTR_ADDU    ""#r1", "#r1",  "#r3"               \n\t" \
+  "gslqc1     "#f5",  "#f6",  0x00("#r1")         \n\t" \
+  PTR_ADDU    ""#r2", "#r2",  "#r3"               \n\t" \
+  "gslqc1     "#f7",  "#f8",  0x00("#r2")         \n\t" \
+  "pasubub    "#f1",  "#f1",  "#f3"               \n\t" \
+  "pasubub    "#f2",  "#f2",  "#f4"               \n\t" \
+  "biadd      "#f1",  "#f1"                       \n\t" \
+  "biadd      "#f2",  "#f2"                       \n\t" \
+  "pasubub    "#f5",  "#f5",  "#f7"               \n\t" \
+  "pasubub    "#f6",  "#f6",  "#f8"               \n\t" \
+  "biadd      "#f5",  "#f5"                       \n\t" \
+  "biadd      "#f6",  "#f6"                       \n\t" \
+  "paddw      "#f9",  "#f9",  "#f1"               \n\t" \
+  "paddw      "#f9",  "#f9",  "#f5"               \n\t" \
+  "paddw      "#f10", "#f10", "#f2"               \n\t" \
+  "paddw      "#f10", "#f10", "#f6"               \n\t" \
+  PTR_ADDU    ""#r1", "#r1",  "#r3"               \n\t" \
+  PTR_ADDU    ""#r2", "#r2",  "#r3"               \n\t"
+
+#define WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI(r0, r1, r2) \
+  "gslqc1     $f6, $f4, 0x0("#r0")                \n\t" \
+  "gslqc1     $f10, $f8, 0x0("#r1")               \n\t" \
+  "pasubub    $f12, $f4, $f8                      \n\t" \
+  "pasubub    $f14, $f6, $f10                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      $f28, $f28, $f12                    \n\t" \
+  "paddw      $f30, $f30, $f14                    \n\t" \
+  "pasubub    $f12, $f4, $f8                      \n\t" \
+  "pasubub    $f14, $f6, $f10                     \n\t" \
+  "pasubub    $f8, $f4, $f0                       \n\t" \
+  "pasubub    $f10, $f6, $f2                      \n\t" \
+  "biadd      $f8, $f8                            \n\t" \
+  "biadd      $f10, $f10                          \n\t" \
+  "paddw      $f24, $f24, $f8                     \n\t" \
+  "paddw      $f26, $f26, $f10                    \n\t" \
+  "punpcklbh  $f8, $f6, $f2                       \n\t" \
+  "punpckhbh  $f10, $f6, $f2                      \n\t" \
+  "punpckhbh  $f6, $f4, $f0                       \n\t" \
+  "punpcklbh  $f4, $f4, $f0                       \n\t" \
+  "pmaddhw    $f4, $f4, $f4                       \n\t" \
+  "pmaddhw    $f6, $f6, $f6                       \n\t" \
+  "pmaddhw    $f8, $f8, $f8                       \n\t" \
+  "pmaddhw    $f10, $f10, $f10                    \n\t" \
+  "paddw      $f20, $f20, $f4                     \n\t" \
+  "paddw      $f22, $f22, $f6                     \n\t" \
+  "paddw      $f20, $f20, $f8                     \n\t" \
+  "paddw      $f22, $f22, $f10                    \n\t" \
+  "punpcklbh  $f4, $f12, $f0                      \n\t" \
+  "punpckhbh  $f6, $f12, $f0                      \n\t" \
+	"punpcklbh  $f12, $f14, $f2                     \n\t" \
+	"punpckhbh  $f14, $f14, $f2                     \n\t" \
+  "pmaddhw    $f4, $f4, $f4                       \n\t" \
+  "pmaddhw    $f6, $f6, $f6                       \n\t" \
+  "pmaddhw    $f12, $f12, $f12                    \n\t" \
+  "pmaddhw    $f14, $f14, $f14                    \n\t" \
+  "paddw      $f16, $f16, $f4                     \n\t" \
+  "paddw      $f18, $f18, $f6                     \n\t" \
+  "paddw      $f16, $f16, $f12                    \n\t" \
+  "paddw      $f18, $f18, $f14                    \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r2"                 \n\t" \
+  PTR_ADDU   ""#r1", "#r1", "#r2"                 \n\t"
+
+#define WELS_SAD_BGD_SQDIFF_16x1_MMI(f0, f2, f4, f6, f8, f10, f12, f14, r0, r1, r2) \
+  "gslqc1     $f6, $f4, 0x0("#r0")                \n\t" \
+  "punpcklbh  $f8, $f4, $f0                       \n\t" \
+  "punpckhbh  $f10, $f4, $f0                      \n\t" \
+  "punpcklbh  $f12, $f6, $f2                      \n\t" \
+  "punpckhbh  $f14, $f6, $f2                      \n\t" \
+  "pmaddhw    $f8, $f8, $f8                       \n\t" \
+  "pmaddhw    $f10, $f10, $f10                    \n\t" \
+  "pmaddhw    $f12, $f12, $f12                    \n\t" \
+  "pmaddhw    $f14, $f14, $f14                    \n\t" \
+  "paddw      $f8, $f8, $f12                      \n\t" \
+  "paddw      $f10, $f10, $f14                    \n\t" \
+  "punpckhwd  $f12, $f0, $f8                      \n\t" \
+  "punpckhwd  $f14, $f0, $f10                     \n\t" \
+  "punpcklwd  $f8, $f0, $f8                       \n\t" \
+  "punpcklwd  $f10, $f0, $f10                     \n\t" \
+  "paddw      $f8, $f8, $f12                      \n\t" \
+  "paddw      $f10, $f10, $f14                    \n\t" \
+  "paddw      "#f0", "#f0", $f8                   \n\t" \
+  "paddw      "#f2", "#f2", $f10                  \n\t" \
+  "gslqc1     $f10, $f8, 0x0("#r1")               \n\t" \
+  "pasubub    $f12, $f4, $f0                      \n\t" \
+  "pasubub    $f14, $f6, $f2                      \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      "#f4", "#f4", $f12                  \n\t" \
+  "paddw      "#f6", "#f6", $f14                  \n\t" \
+  "pasubub    $f12, $f8, $f0                      \n\t" \
+  "pasubub    $f14, $f10, $f2                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "punpcklwd  $f14, $f14, $f14                    \n\t" \
+  "punpckhwd  $f14, $f12, $f14                    \n\t" \
+  "punpcklwd  $f12, $f0, $f12                     \n\t" \
+  "paddw      "#f4", "#f4", $f12                  \n\t" \
+  "paddw      "#f6", "#f6", $f14                  \n\t" \
+  "pasubub    $f12, $f4, $f8                      \n\t" \
+  "pasubub    $f14, $f6, $f10                     \n\t" \
+  "pmaxub     "#f8", "#f8", $f12                  \n\t" \
+  "pmaxub     "#f10", "#f10", $f14                \n\t" \
+  "paddw      $f4, $f0, $f12                      \n\t" \
+  "paddw      $f6, $f0, $f14                      \n\t" \
+  "pasubub    $f12, $f12, $f0                     \n\t" \
+  "pasubub    $f14, $f14, $f2                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      "#f0", "#f0", $f12                  \n\t" \
+  "paddw      "#f2", "#f2", $f14                  \n\t" \
+  "paddw      $f12, $f0, $f4                      \n\t" \
+  "paddw      $f14, $f0, $f6                      \n\t" \
+  "punpcklbh  $f4, $f12, $f0                      \n\t" \
+  "punpckhbh  $f6, $f12, $f0                      \n\t" \
+  "punpcklbh  $f12, $f14, $f2                     \n\t" \
+  "punpckhbh  $f14, $f14, $f2                     \n\t" \
+  "pmaddhw    $f4, $f4, $f4                       \n\t" \
+  "pmaddhw    $f6, $f6, $f6                       \n\t" \
+  "pmaddhw    $f12, $f12, $f12                    \n\t" \
+  "pmaddhw    $f14, $f14, $f14                    \n\t" \
+  "paddw      "#f12", "#f12", $f4                 \n\t" \
+  "paddw      "#f14", "#f14", $f6                 \n\t" \
+  "paddw      "#f12", "#f12", $f12                \n\t" \
+  "paddw      "#f14", "#f14", $f14                \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r2"                 \n\t" \
+  PTR_ADDU   ""#r1", "#r1", "#r2"                 \n\t"
+
+#define WELS_SAD_SUM_SQSUM_16x1_MMI(r0, r1, r2) \
+  "gslqc1     $f6, $f4, 0x0("#r0")                \n\t" \
+  "gslqc1     $f10, $f8, 0x0("#r1")               \n\t" \
+  "pasubub    $f12, $f4, $f8                      \n\t" \
+  "pasubub    $f14, $f6, $f10                     \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      $f24, $f24, $f12                    \n\t" \
+  "paddw      $f26, $f26, $f14                    \n\t" \
+  "pasubub    $f12, $f4, $f0                      \n\t" \
+  "pasubub    $f14, $f6, $f2                      \n\t" \
+  "biadd      $f12, $f12                          \n\t" \
+  "biadd      $f14, $f14                          \n\t" \
+  "paddw      $f20, $f20, $f12                    \n\t" \
+  "paddw      $f22, $f22, $f14                    \n\t" \
+  "punpcklbh  $f8, $f6, $f2                       \n\t" \
+  "punpckhbh  $f10, $f6, $f2                      \n\t" \
+  "punpckhbh  $f6, $f4, $f0                       \n\t" \
+  "punpcklbh  $f4, $f4, $f0                       \n\t" \
+  "pmaddhw    $f4, $f4, $f4                       \n\t" \
+  "pmaddhw    $f6, $f6, $f6                       \n\t" \
+  "pmaddhw    $f8, $f8, $f8                       \n\t" \
+  "pmaddhw    $f10, $f10, $f10                    \n\t" \
+  "paddw      $f16, $f16, $f4                     \n\t" \
+  "paddw      $f18, $f18, $f6                     \n\t" \
+  "paddw      $f16, $f16, $f8                     \n\t" \
+  "paddw      $f18, $f18, $f10                    \n\t" \
+  PTR_ADDU   ""#r0", "#r0", "#r2"                 \n\t" \
+  PTR_ADDU   ""#r1", "#r1", "#r2"                 \n\t"
+
+void VAACalcSad_mmi(const uint8_t* pCurData, const uint8_t* pRefData,
+                    int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
+                    int32_t* pFrameSad, int32_t* pSad8x8) {
+  double ftmp[13];
+  uint64_t tmp[2];
+  mips_reg addr[3];
+
+  __asm__ volatile (
+    ".set       arch=loongson3a                                     \n\t"
+    PTR_SRL    "%[iPicWidth],   %[iPicWidth],   0x04                \n\t"
+    PTR_SRL    "%[iPicHeight],  %[iPicHeight],  0x04                \n\t"
+    "move       %[addr2],       %[iPicStride]                       \n\t"
+    PTR_SLL    "%[iPicStride],  %[iPicStride],  0x04                \n\t"
+    "xor        %[ftmp0],       %[ftmp0],       %[ftmp0]            \n\t"
+    "xor        %[ftmp11],      %[ftmp11],      %[ftmp11]           \n\t"
+    "xor        %[ftmp12],      %[ftmp12],      %[ftmp12]           \n\t"
+    "1:                                                             \n\t"
+    "move       %[addr0],       %[pCurData]                         \n\t"
+    "move       %[addr1],       %[pRefData]                         \n\t"
+    "move       %[tmp0],        %[iPicWidth]                        \n\t"
+    "2:                                                             \n\t"
+    "xor        %[ftmp9],       %[ftmp9],       %[ftmp9]            \n\t"
+    "xor        %[ftmp10],      %[ftmp10],      %[ftmp10]           \n\t"
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    "paddw      %[ftmp11],      %[ftmp11],      %[ftmp9]            \n\t"
+    "paddw      %[ftmp12],      %[ftmp12],      %[ftmp10]           \n\t"
+    "swc1       %[ftmp10],      0x00(%[pSad8x8])                    \n\t"
+    "swc1       %[ftmp9],       0x04(%[pSad8x8])                    \n\t"
+
+    "xor        %[ftmp9],       %[ftmp9],       %[ftmp9]            \n\t"
+    "xor        %[ftmp10],      %[ftmp10],      %[ftmp10]           \n\t"
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    WELS_SAD_16x2_MMI(%[ftmp1], %[ftmp2], %[ftmp3], %[ftmp4], %[ftmp5],
+                      %[ftmp6], %[ftmp7], %[ftmp8], %[ftmp9], %[ftmp10],
+                      %[addr0], %[addr1], %[addr2])
+    "paddw      %[ftmp11],      %[ftmp11],      %[ftmp9]            \n\t"
+    "paddw      %[ftmp12],      %[ftmp12],      %[ftmp10]           \n\t"
+    "swc1       %[ftmp10],      0x08(%[pSad8x8])                    \n\t"
+    "swc1       %[ftmp9],       0x0c(%[pSad8x8])                    \n\t"
+
+    PTR_ADDU   "%[pSad8x8],     %[pSad8x8],     0x10                \n\t"
+    PTR_SUBU   "%[addr0],       %[addr0],       %[iPicStride]       \n\t"
+    PTR_SUBU   "%[addr1],       %[addr1],       %[iPicStride]       \n\t"
+    PTR_ADDI   "%[tmp0],        %[tmp0],        -0x01               \n\t"
+    PTR_ADDU   "%[addr0],       %[addr0],       0x10                \n\t"
+    PTR_ADDU   "%[addr1],       %[addr1],       0x10                \n\t"
+    "bnez       %[tmp0],        2b                                  \n\t"
+
+    PTR_ADDI   "%[iPicHeight],  %[iPicHeight],  -0x01               \n\t"
+    PTR_ADDU   "%[pCurData],    %[pCurData],    %[iPicStride]       \n\t"
+    PTR_ADDU   "%[pRefData],    %[pRefData],    %[iPicStride]       \n\t"
+    "bnez       %[iPicHeight],  1b                                  \n\t"
+
+    "paddw      %[ftmp11],      %[ftmp11],      %[ftmp12]           \n\t"
+    "swc1       %[ftmp11],      0x00(%[pFrameSad])                  \n\t"
+    : [ftmp0]"=&f"(ftmp[0]),            [ftmp1]"=&f"(ftmp[1]),
+      [ftmp2]"=&f"(ftmp[2]),            [ftmp3]"=&f"(ftmp[3]),
+      [ftmp4]"=&f"(ftmp[4]),            [ftmp5]"=&f"(ftmp[5]),
+      [ftmp6]"=&f"(ftmp[6]),            [ftmp7]"=&f"(ftmp[7]),
+      [ftmp8]"=&f"(ftmp[8]),            [ftmp9]"=&f"(ftmp[9]),
+      [ftmp10]"=&f"(ftmp[10]),          [ftmp11]"=&f"(ftmp[11]),
+      [ftmp12]"=&f"(ftmp[12]),          [tmp0]"=&r"(tmp[0]),
+      [addr0]"=&r"(addr[0]),            [addr1]"=&r"(addr[1]),
+      [pCurData]"+&r"(pCurData),        [pRefData]"+&r"(pRefData),
+      [iPicHeight]"+&r"(iPicHeight),    [iPicWidth]"+&r"(iPicWidth),
+      [pSad8x8]"+&r"(pSad8x8),          [iPicStride]"+&r"(iPicStride),
+      [addr2]"=&r"(addr[2])
+    : [pFrameSad]"r"(pFrameSad)
+    : "memory"
+  );
+}
+
+void VAACalcSadBgd_mmi(const uint8_t *cur_data, const uint8_t *ref_data,
+                       int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
+                       int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8,
+                       uint8_t *p_mad8x8) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $15, %[cur_data]                          \n\t"
+    "dsrl       %[iPicWidth], %[iPicWidth], 0x4           \n\t"
+    "dsrl       %[iPicHeight], %[iPicHeight], 0x4         \n\t"
+    "dsll       $13, %[iPicStride], 0x4                   \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "xor        $f2, $f2, $f2                             \n\t"
+    "xor        $14, $14, $14                             \n\t"
+    "1:                                                   \n\t"
+    "move       $9, %[iPicWidth]                          \n\t"
+    "move       $10, $15                                  \n\t"
+    "move       $11, %[ref_data]                          \n\t"
+    "2:                                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+
+    "dli        $8, 0x1                                   \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "dli        $8, 0x8                                   \n\t"
+    "dmtc1      $8, $f10                                  \n\t"
+    WELS_MAX_REG_MMI($f16, $f18, $f8, $f10)
+
+    "dmfc1      $8, $f16                                  \n\t"
+    "sb         $8, 0x0(%[p_mad8x8])                      \n\t"
+    "dmfc1      $8, $f18                                  \n\t"
+    "sb         $8, 0x1(%[p_mad8x8])                      \n\t"
+    PTR_ADDIU  "%[p_mad8x8], %[p_mad8x8], 0x2             \n\t"
+
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    "punpcklwd  $f30, $f30, $f30                          \n\t"
+    "punpcklwd  $f26, $f26, $f26                          \n\t"
+    "punpcklwd  $f22, $f22, $f22                          \n\t"
+
+    "punpckhwd  $f30, $f28, $f30                          \n\t"
+    "punpckhwd  $f26, $f24, $f26                          \n\t"
+    "punpckhwd  $f22, $f20, $f22                          \n\t"
+
+    "punpcklwd  $f28, $f16, $f28                          \n\t"
+    "punpcklwd  $f24, $f16, $f24                          \n\t"
+    "punpcklwd  $f20, $f16, $f20                          \n\t"
+
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+    WELS_SAD_SD_MAD_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16, $f18,
+                             $15, %[ref_data], %[iPicStride])
+
+    "dli        $8, 0x1                                   \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "dli        $8, 0x8                                   \n\t"
+    "dmtc1      $8, $f10                                  \n\t"
+    WELS_MAX_REG_MMI($f16, $f18, $f8, $f10)
+
+    "dmfc1      $8, $f16                                  \n\t"
+    "sb         $8, 0x0(%[p_mad8x8])                      \n\t"
+    "dmfc1      $8, $f18                                  \n\t"
+    "sb         $8, 0x1(%[p_mad8x8])                      \n\t"
+    "punpckhwd  $f4, $f28, $f30                           \n\t"
+    PTR_ADDIU  "%[p_mad8x8], %[p_mad8x8], 0x2             \n\t"
+
+    "punpcklwd  $f6, $f28, $f30                           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[psad8x8])                 \n\t"
+    PTR_ADDIU  "%[psad8x8], %[psad8x8], 0x10              \n\t"
+
+    "paddw      $f6, $f6, $f30                            \n\t"
+    "paddw      $f4, $f4, $f28                            \n\t"
+    "punpckhwd  $f8, $f6, $f6                             \n\t"
+    "paddw      $f4, $f4, $f8                             \n\t"
+    "dmtc1      $14, $f6                                  \n\t"
+    "paddw      $f6, $f6, $f4                             \n\t"
+    "dmfc1      $14, $f6                                  \n\t"
+
+    "psubw      $f24, $f24, $f20                          \n\t"
+    "psubw      $f26, $f26, $f22                          \n\t"
+    "punpckhwd  $f4, $f24, $f26                           \n\t"
+    "punpcklwd  $f6, $f24, $f26                           \n\t"
+    "gssqc1     $f6, $f4, 0x0(%[p_sd8x8])                 \n\t"
+    PTR_ADDIU  "%[p_sd8x8], %[p_sd8x8], 0x10              \n\t"
+
+    PTR_SUBU   "$15, $15, $13                             \n\t"
+    PTR_SUBU   "%[ref_data], %[ref_data], $13             \n\t"
+    PTR_ADDIU  "$15, $15, 0x10                            \n\t"
+    PTR_ADDIU  "%[ref_data], %[ref_data], 0x10            \n\t"
+
+    PTR_ADDIU  "%[iPicWidth], %[iPicWidth], -0x1          \n\t"
+    "bnez       %[iPicWidth], 2b                          \n\t"
+    "move       %[iPicWidth], $9                          \n\t"
+    "move       $15, $10                                  \n\t"
+    "move       %[ref_data], $11                          \n\t"
+    PTR_ADDU   "$15, $15, $13                             \n\t"
+    PTR_ADDU   "%[ref_data], %[ref_data], $13             \n\t"
+
+    PTR_ADDIU  "%[iPicHeight], %[iPicHeight], -0x1        \n\t"
+    "bnez       %[iPicHeight], 1b                         \n\t"
+
+    "swl        $14, 0x3(%[psadframe])                    \n\t"
+    "swr        $14, 0x0(%[psadframe])                    \n\t"
+    : [ref_data]"+&r"((unsigned char *)ref_data), [iPicWidth]"+&r"((int)iPicWidth),
+      [iPicHeight]"+&r"((int)iPicHeight), [psad8x8]"+&r"((int *)psad8x8),
+      [p_sd8x8]"+&r"((int *)p_sd8x8), [p_mad8x8]"+&r"((unsigned char *)p_mad8x8)
+    : [cur_data]"r"((unsigned char *)cur_data), [iPicStride]"r"((int)iPicStride),
+      [psadframe]"r"((int *)psadframe)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void VAACalcSadSsd_mmi(const uint8_t *cur_data, const uint8_t *ref_data,
+                       int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
+                       int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16,
+                       int32_t *psqsum16x16, int32_t *psqdiff16x16) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $15, %[cur_data]                          \n\t"
+    "dsrl       %[iPicWidth], %[iPicWidth], 0x4           \n\t"
+    "dsrl       %[iPicHeight], %[iPicHeight], 0x4         \n\t"
+    "dsll       $13, %[iPicStride], 0x4                   \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "xor        $f2, $f2, $f2                             \n\t"
+    "xor        $12, $12, $12                             \n\t"
+    "xor        $14, $14, $14                             \n\t"
+    "1:                                                   \n\t"
+    "move       $9, %[iPicWidth]                          \n\t"
+    "move       $10, $15                                  \n\t"
+    "move       $11, %[ref_data]                          \n\t"
+    "2:                                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    "dmfc1      $8, $f28                                  \n\t"
+    "sw         $8, 0x0(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f30                                  \n\t"
+    "sw         $8, 0x4(%[psad8x8])                       \n\t"
+    "paddw      $f4, $f28, $f30                           \n\t"
+    "dmfc1      $12, $f4                                  \n\t"
+	  PTR_ADDU   "$14, $14, $12                             \n\t"
+
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_MMI($15, %[ref_data], %[iPicStride])
+    "dmfc1      $8, $f28                                  \n\t"
+    "sw         $8, 0x8(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f30                                  \n\t"
+    "paddw      $f4, $f28, $f30                           \n\t"
+    "sw         $8, 0xc(%[psad8x8])                       \n\t"
+    "dmfc1      $12, $f4                                  \n\t"
+	  PTR_ADDU   "$14, $14, $12                             \n\t"
+    PTR_ADDIU  "%[psad8x8],   %[psad8x8],   0x10          \n\t"
+
+    "paddw      $f24, $f24, $f26                          \n\t"
+    "dmfc1      $8, $f24                                  \n\t"
+    "sw         $8, 0x0(%[psum16x16])                     \n\t"
+    PTR_ADDIU  "%[psum16x16], %[psum16x16], 0x4           \n\t"
+    "paddw      $f24, $f20, $f22                          \n\t"
+	  "punpcklwd  $f20, $f24, $f24                          \n\t"
+	  "punpckhwd  $f22, $f24, $f24                          \n\t"
+    "paddw      $f20, $f20, $f22                          \n\t"
+    "dmfc1      $8, $f20                                  \n\t"
+    "sw         $8, 0x0(%[psqsum16x16])                   \n\t"
+    PTR_ADDIU  "%[psqsum16x16], %[psqsum16x16], 0x4       \n\t"
+
+    "paddw      $f20, $f16, $f18                          \n\t"
+	  "punpcklwd  $f16, $f20, $f20                          \n\t"
+	  "punpckhwd  $f18, $f20, $f20                          \n\t"
+    "paddw      $f16, $f16, $f18                          \n\t"
+    "dmfc1      $8, $f16                                  \n\t"
+    "sw         $8, 0x0(%[psqdiff16x16])                  \n\t"
+    PTR_ADDIU  "%[psqdiff16x16], %[psqdiff16x16], 0x4     \n\t"
+
+    PTR_SUBU   "$15, $15, $13                             \n\t"
+    PTR_SUBU   "%[ref_data], %[ref_data], $13             \n\t"
+    PTR_ADDIU  "$15, $15, 0x10                            \n\t"
+    PTR_ADDIU  "%[ref_data], %[ref_data], 0x10            \n\t"
+
+    PTR_ADDIU  "%[iPicWidth], %[iPicWidth], -0x1          \n\t"
+    "bnez       %[iPicWidth], 2b                          \n\t"
+    "nop                                                  \n\t"
+    "move       %[iPicWidth], $9                          \n\t"
+    "move       $15, $10                                  \n\t"
+    "move       %[ref_data], $11                          \n\t"
+    PTR_ADDU   "$15, $15, $13                             \n\t"
+    PTR_ADDU   "%[ref_data], %[ref_data], $13             \n\t"
+
+    PTR_ADDIU  "%[iPicHeight], %[iPicHeight], -0x1        \n\t"
+    "bnez       %[iPicHeight], 1b                         \n\t"
+    "nop                                                  \n\t"
+
+    "sw         $14, 0x0(%[psadframe])                    \n\t"
+    : [ref_data]"+&r"((unsigned char *)ref_data), [iPicWidth]"+&r"((int)iPicWidth),
+      [iPicHeight]"+&r"((int)iPicHeight), [psum16x16]"+&r"((int *)psum16x16),
+      [psqsum16x16]"+&r"((int *)psqsum16x16), [psqdiff16x16]"+&r"((int *)psqdiff16x16)
+    : [cur_data]"r"((unsigned char *)cur_data), [iPicStride]"r"((int)iPicStride),
+      [psadframe]"r"((int *)psadframe), [psad8x8]"r"((int *)psad8x8)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void VAACalcSadSsdBgd_mmi(const uint8_t *cur_data, const uint8_t *ref_data,
+                          int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
+                          int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16,
+                          int32_t *psqsum16x16, int32_t *psqdiff16x16, int32_t *p_sd8x8,
+                          uint8_t *p_mad8x8) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $15, %[cur_data]                          \n\t"
+    "dsrl       %[iPicWidth], %[iPicWidth], 0x4           \n\t"
+    "dsrl       %[iPicHeight], %[iPicHeight], 0x4         \n\t"
+    "dsll       $13, %[iPicStride], 0x4                   \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "xor        $f2, $f2, $f2                             \n\t"
+    "xor        $12, $12, $12                             \n\t"
+    "xor        $14, $14, $14                             \n\t"
+    "1:                                                   \n\t"
+    "move       $9, %[iPicWidth]                          \n\t"
+    "move       $10, $15                                  \n\t"
+    "move       $11, %[ref_data]                          \n\t"
+    "2:                                                   \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+
+    "dmfc1      $8, $f28                                  \n\t"
+    "sw         $8, 0x0(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f30                                  \n\t"
+    "sw         $8, 0x4(%[psad8x8])                       \n\t"
+    PTR_ADDIU  "%[psad8x8], %[psad8x8], 0x8               \n\t"
+
+    "paddw      $f4, $f28, $f30                           \n\t"
+    "dmfc1      $12, $f4                                  \n\t"
+    PTR_ADDU   "$14, $14,  $12                            \n\t"
+
+    "paddw      $f4, $f24, $f26                           \n\t"
+    "dmfc1      $8, $f4                                   \n\t"
+    "sw         $8, 0x0(%[psum16x16])                     \n\t"
+
+    "punpckhwd  $f4, $f24, $f26                           \n\t"
+    "punpcklwd  $f6, $f24, $f26                           \n\t"
+    "psubw      $f6, $f6, $f4                             \n\t"
+    "dmfc1      $8, $f6                                   \n\t"
+    PTR_S      "$8, 0x0(%[p_sd8x8])                       \n\t"
+    PTR_ADDIU  "%[p_sd8x8], %[p_sd8x8], 0x8               \n\t"
+
+    "dli        $8, 0x1                                   \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "dli        $8, 0x8                                   \n\t"
+    "dmtc1      $8, $f10                                  \n\t"
+    WELS_MAX_REG_MMI($f20, $f22, $f8, $f10)
+
+    "dmfc1      $8, $f20                                  \n\t"
+    "sb         $8, 0x0(%[p_mad8x8])                      \n\t"
+    "dmfc1      $8, $f22                                  \n\t"
+    "sb         $8, 0x1(%[p_mad8x8])                      \n\t"
+    PTR_ADDIU  "%[p_mad8x8], %[p_mad8x8], 0x2             \n\t"
+
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "punpckhwd  $f28, $f20, $f28                          \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "punpckhwd  $f30, $f20, $f30                          \n\t"
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+    WELS_SAD_BGD_SQDIFF_16x1_MMI($f28, $f30, $f24, $f26, $f20, $f22, $f16,
+                                 $f18, $15, %[ref_data], %[iPicStride])
+
+    "dmfc1      $8, $f28                                  \n\t"
+    "sw         $8, 0x0(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f30                                  \n\t"
+    "sw         $8, 0x4(%[psad8x8])                       \n\t"
+    PTR_ADDIU  "%[psad8x8], %[psad8x8], 0x8               \n\t"
+
+    "paddw      $f4, $f28, $f30                           \n\t"
+    "dmfc1      $12, $f4                                  \n\t"
+    PTR_ADDU   "$14, $14, $12                             \n\t"
+
+    "paddw      $f4, $f24, $f26                           \n\t"
+    "dmfc1      $8, $f4                                   \n\t"
+    "lw         $12, 0x0(%[psum16x16])                    \n\t"
+    PTR_ADDU   "$8, $8, $12                               \n\t"
+    "sw         $8, 0x0(%[psum16x16])                     \n\t"
+    "xor        $f8, $f8, $f8                             \n\t"
+    PTR_ADDIU  "%[psum16x16], %[psum16x16], 0x4           \n\t"
+
+    "punpckhwd  $f30, $f30, $f8                           \n\t"
+    "punpckhwd  $f28, $f28, $f8                           \n\t"
+    "paddw      $f8, $f28, $f30                           \n\t"
+    "dmfc1      $8, $f8                                   \n\t"
+    "sw         $8, 0x0(%[psqsum16x16])                   \n\t"
+    PTR_ADDIU  "%[psqsum16x16], %[psqsum16x16], 0x4       \n\t"
+
+    "punpckhwd  $f4, $f24, $f26                           \n\t"
+    "punpcklwd  $f6, $f24, $f26                           \n\t"
+    "psubw      $f6, $f6, $f4                             \n\t"
+    "dmfc1      $8, $f6                                   \n\t"
+    PTR_S      "$8, 0x0(%[p_sd8x8])                       \n\t"
+    PTR_ADDIU  "%[p_sd8x8], %[p_sd8x8], 0x8               \n\t"
+
+    "dli        $8, 0x1                                   \n\t"
+    "dmtc1      $8, $f8                                   \n\t"
+    "dli        $8, 0x8                                   \n\t"
+    "dmtc1      $8, $f10                                  \n\t"
+    WELS_MAX_REG_MMI($f20, $f22, $f8, $f10)
+
+    "dmfc1      $8, $f20                                  \n\t"
+    "sb         $8, 0x0(%[p_mad8x8])                      \n\t"
+    "dmfc1      $8, $f22                                  \n\t"
+    "sb         $8, 0x1(%[p_mad8x8])                      \n\t"
+    PTR_ADDIU  "%[p_mad8x8], %[p_mad8x8], 0x2             \n\t"
+
+    "paddw      $f20, $f16, $f18                          \n\t"
+	  "punpcklwd  $f16, $f20, $f20                          \n\t"
+	  "punpckhwd  $f18, $f20, $f20                          \n\t"
+    "paddw      $f16, $f16, $f18                          \n\t"
+    "dmfc1      $8, $f16                                  \n\t"
+    "sw         $8, 0x0(%[psqdiff16x16])                  \n\t"
+    PTR_ADDIU  "%[psqdiff16x16], %[psqdiff16x16], 0x4     \n\t"
+
+    PTR_SUBU   "$15, $15, $13                             \n\t"
+    PTR_SUBU   "%[ref_data], %[ref_data], $13             \n\t"
+    PTR_ADDIU  "$15, $15, 0x10                            \n\t"
+    PTR_ADDIU  "%[ref_data], %[ref_data], 0x10            \n\t"
+
+    PTR_ADDIU  "%[iPicWidth], %[iPicWidth], -0x1          \n\t"
+    "bnez       %[iPicWidth], 2b                          \n\t"
+    "nop                                                  \n\t"
+    "move       %[iPicWidth], $9                          \n\t"
+    "move       $15, $10                                  \n\t"
+    "move       %[ref_data], $11                          \n\t"
+    PTR_ADDU   "$15, $15, $13                             \n\t"
+    PTR_ADDU   "%[ref_data], %[ref_data], $13             \n\t"
+
+    PTR_ADDIU  "%[iPicHeight], %[iPicHeight], -0x1        \n\t"
+    "bnez       %[iPicHeight], 1b                         \n\t"
+    "nop                                                  \n\t"
+
+    "sw         $14, 0x0(%[psadframe])                    \n\t"
+    : [ref_data]"+&r"((unsigned char *)ref_data), [iPicWidth]"+&r"((int)iPicWidth),
+      [iPicHeight]"+&r"((int)iPicHeight), [psad8x8]"+&r"((int *)psad8x8),
+      [psum16x16]"+&r"((int *)psum16x16), [psqsum16x16]"+&r"((int *)psqsum16x16),
+	    [psqdiff16x16]"+&r"((int *)psqdiff16x16), [p_sd8x8]"+&r"((int *)p_sd8x8),
+      [p_mad8x8]"+&r"((unsigned char *)p_mad8x8)
+    : [cur_data]"r"((unsigned char *)cur_data), [iPicStride]"r"((int)iPicStride),
+      [psadframe]"r"((int *)psadframe)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
+
+void VAACalcSadVar_mmi(const uint8_t *cur_data, const uint8_t *ref_data,
+                       int32_t iPicWidth, int32_t iPicHeight, int32_t iPicStride,
+                       int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16,
+                       int32_t *psqsum16x16) {
+  BACKUP_REG;
+  __asm__ volatile (
+    ".set       arch=loongson3a                           \n\t"
+    "move       $15, %[cur_data]                          \n\t"
+    "dsrl       %[iPicWidth], %[iPicWidth], 0x4           \n\t"
+    "dsrl       %[iPicHeight], %[iPicHeight], 0x4         \n\t"
+    "dsll       $13, %[iPicStride], 0x4                   \n\t"
+    "xor        $f0, $f0, $f0                             \n\t"
+    "xor        $f2, $f2, $f2                             \n\t"
+    "xor        $f28, $f28, $f28                          \n\t"
+    "xor        $f30, $f30, $f30                          \n\t"
+    "xor        $14, $14, $14                             \n\t"
+    "1:                                                   \n\t"
+    "move       $9, %[iPicWidth]                          \n\t"
+    "move       $10, $15                                  \n\t"
+    "move       $11, %[ref_data]                          \n\t"
+    "2:                                                   \n\t"
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    "xor        $f20, $f20, $f20                          \n\t"
+    "xor        $f22, $f22, $f22                          \n\t"
+    "xor        $f16, $f16, $f16                          \n\t"
+    "xor        $f18, $f18, $f18                          \n\t"
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    "paddw      $f28, $f24, $f28                          \n\t"
+    "paddw      $f30, $f26, $f30                          \n\t"
+    "dmfc1      $8, $f24                                  \n\t"
+    "sw         $8, 0x0(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f26                                  \n\t"
+    "sw         $8, 0x4(%[psad8x8])                       \n\t"
+
+    "xor        $f24, $f24, $f24                          \n\t"
+    "xor        $f26, $f26, $f26                          \n\t"
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    WELS_SAD_SUM_SQSUM_16x1_MMI($15, %[ref_data], %[iPicStride])
+    "paddw      $f28, $f24, $f28                          \n\t"
+    "paddw      $f30, $f26, $f30                          \n\t"
+    "dmfc1      $8, $f24                                  \n\t"
+    "sw         $8, 0x8(%[psad8x8])                       \n\t"
+    "dmfc1      $8, $f26                                  \n\t"
+    "sw         $8, 0xc(%[psad8x8])                       \n\t"
+    PTR_ADDIU  "%[psad8x8],   %[psad8x8],   0x10          \n\t"
+
+    "paddw      $f20, $f20, $f22                          \n\t"
+    "dmfc1      $8, $f20                                  \n\t"
+    "sw         $8, 0x0(%[psum16x16])                     \n\t"
+    PTR_ADDIU  "%[psum16x16], %[psum16x16], 0x4           \n\t"
+
+    "paddw      $f20, $f16, $f18                          \n\t"
+	  "punpcklwd  $f16, $f20, $f20                          \n\t"
+	  "punpckhwd  $f18, $f20, $f20                          \n\t"
+    "paddw      $f16, $f16, $f18                          \n\t"
+    "dmfc1      $8, $f16                                  \n\t"
+    "sw         $8, 0x0(%[psqsum16x16])                   \n\t"
+    PTR_ADDIU  "%[psqsum16x16], %[psqsum16x16], 0x4       \n\t"
+
+    PTR_SUBU   "$15, $15, $13                             \n\t"
+    PTR_SUBU   "%[ref_data], %[ref_data], $13             \n\t"
+    PTR_ADDIU  "$15, $15, 0x10                            \n\t"
+    PTR_ADDIU  "%[ref_data], %[ref_data], 0x10            \n\t"
+
+    PTR_ADDIU  "%[iPicWidth], %[iPicWidth], -0x1          \n\t"
+    "bnez       %[iPicWidth], 2b                          \n\t"
+    "nop                                                  \n\t"
+    "move       %[iPicWidth], $9                          \n\t"
+    "move       $15, $10                                  \n\t"
+    "move       %[ref_data], $11                          \n\t"
+    PTR_ADDU   "$15, $15, $13                             \n\t"
+    PTR_ADDU   "%[ref_data], %[ref_data], $13             \n\t"
+
+    PTR_ADDIU  "%[iPicHeight], %[iPicHeight], -0x1        \n\t"
+    "bnez       %[iPicHeight], 1b                         \n\t"
+    "nop                                                  \n\t"
+
+    "paddw      $f28, $f28, $f30                          \n\t"
+    "dmfc1      $8, $f28                                  \n\t"
+    "sw         $8, 0x0(%[psadframe])                     \n\t"
+    : [ref_data]"+&r"((unsigned char *)ref_data), [iPicWidth]"+&r"((int)iPicWidth),
+      [iPicHeight]"+&r"((int)iPicHeight), [psum16x16]"+&r"((int *)psum16x16),
+      [psqsum16x16]"+&r"((int *)psqsum16x16)
+    : [cur_data]"r"((unsigned char *)cur_data), [iPicStride]"r"((int)iPicStride),
+      [psadframe]"r"((int *)psadframe), [psad8x8]"r"((int *)psad8x8)
+    : "memory", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$f0", "$f2",
+      "$f4", "$f6", "$f8", "$f10", "$f12", "$f14", "$f16", "$f18", "$f20", "$f22",
+      "$f24", "$f26", "$f28", "$f30"
+  );
+  RECOVER_REG;
+}
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
new file mode 100644
index 0000000000..59d19eb581
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
@@ -0,0 +1,53 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "SceneChangeDetection.h"
+#include "cpu.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+IStrategy* BuildSceneChangeDetection (EMethods eMethod, int32_t iCpuFlag) {
+  switch (eMethod) {
+  case METHOD_SCENE_CHANGE_DETECTION_VIDEO:
+    return new CSceneChangeDetection<CSceneChangeDetectorVideo> (eMethod, iCpuFlag);
+    break;
+  case METHOD_SCENE_CHANGE_DETECTION_SCREEN:
+    return new CSceneChangeDetection<CSceneChangeDetectorScreen> (eMethod, iCpuFlag);
+    break;
+  default:
+    // not support yet
+    return NULL;
+  }
+}
+
+WELSVP_NAMESPACE_END
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.h
new file mode 100644
index 0000000000..78c225ee79
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scenechangedetection/SceneChangeDetection.h
@@ -0,0 +1,270 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file         :  SceneChangeDetection.h
+ *
+ * \brief        :  scene change detection class of wels video processor class
+ *
+ * \date         :  2011/03/14
+ *
+ * \description  :  1. rewrite the package code of scene change detection class
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_SCENECHANGEDETECTION_H
+#define WELSVP_SCENECHANGEDETECTION_H
+
+#include "util.h"
+#include "memory.h"
+#include "cpu.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+#include "common.h"
+
+#define HIGH_MOTION_BLOCK_THRESHOLD 320
+#define SCENE_CHANGE_MOTION_RATIO_LARGE_VIDEO   0.85f
+#define SCENE_CHANGE_MOTION_RATIO_MEDIUM  0.50f
+#define SCENE_CHANGE_MOTION_RATIO_LARGE_SCREEN    0.80f
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef struct {
+  int32_t iWidth;
+  int32_t iHeight;
+  int32_t iBlock8x8Width;
+  int32_t iBlock8x8Height;
+  uint8_t* pRefY;
+  uint8_t* pCurY;
+  int32_t iRefStride;
+  int32_t iCurStride;
+  uint8_t* pStaticBlockIdc;
+} SLocalParam;
+
+class CSceneChangeDetectorVideo {
+ public:
+  CSceneChangeDetectorVideo (SSceneChangeResult& sParam, int32_t iCpuFlag) : m_sParam (sParam) {
+    m_pfSad = WelsSampleSad8x8_c;
+#ifdef X86_ASM
+    if (iCpuFlag & WELS_CPU_SSE2) {
+      m_pfSad = WelsSampleSad8x8_sse21;
+    }
+#endif
+#ifdef HAVE_NEON
+    if (iCpuFlag & WELS_CPU_NEON) {
+      m_pfSad = WelsProcessingSampleSad8x8_neon;
+    }
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+    if (iCpuFlag & WELS_CPU_NEON) {
+      m_pfSad = WelsProcessingSampleSad8x8_AArch64_neon;
+    }
+#endif
+
+#ifdef HAVE_MMI
+    if (iCpuFlag & WELS_CPU_MMI) {
+      m_pfSad = WelsSampleSad8x8_mmi;
+    }
+#endif
+
+    m_fSceneChangeMotionRatioLarge = SCENE_CHANGE_MOTION_RATIO_LARGE_VIDEO;
+    m_fSceneChangeMotionRatioMedium = SCENE_CHANGE_MOTION_RATIO_MEDIUM;
+  }
+  virtual ~CSceneChangeDetectorVideo() {
+  }
+  void operator() (SLocalParam& sLocalParam) {
+    int32_t iRefRowStride = 0, iCurRowStride = 0;
+    uint8_t* pRefY = sLocalParam.pRefY;
+    uint8_t* pCurY = sLocalParam.pCurY;
+    uint8_t* pRefTmp = NULL, *pCurTmp = NULL;
+
+    iRefRowStride  = sLocalParam.iRefStride << 3;
+    iCurRowStride  = sLocalParam.iCurStride << 3;
+
+    for (int32_t j = 0; j < sLocalParam.iBlock8x8Height; j++) {
+      pRefTmp = pRefY;
+      pCurTmp = pCurY;
+      for (int32_t i = 0; i < sLocalParam.iBlock8x8Width; i++) {
+        int32_t iSad = m_pfSad (pCurTmp, sLocalParam.iCurStride, pRefTmp, sLocalParam.iRefStride);
+        m_sParam.iMotionBlockNum += iSad > HIGH_MOTION_BLOCK_THRESHOLD;
+        pRefTmp += 8;
+        pCurTmp += 8;
+      }
+      pRefY += iRefRowStride;
+      pCurY += iCurRowStride;
+    }
+  }
+  float  GetSceneChangeMotionRatioLarge() const {
+    return m_fSceneChangeMotionRatioLarge;
+  }
+  float  GetSceneChangeMotionRatioMedium() const {
+    return m_fSceneChangeMotionRatioMedium;
+  }
+ protected:
+  SadFuncPtr m_pfSad;
+  SSceneChangeResult& m_sParam;
+  float    m_fSceneChangeMotionRatioLarge;
+  float    m_fSceneChangeMotionRatioMedium;
+};
+
+class CSceneChangeDetectorScreen : public CSceneChangeDetectorVideo {
+ public:
+  CSceneChangeDetectorScreen (SSceneChangeResult& sParam, int32_t iCpuFlag) : CSceneChangeDetectorVideo (sParam,
+        iCpuFlag) {
+    m_fSceneChangeMotionRatioLarge = SCENE_CHANGE_MOTION_RATIO_LARGE_SCREEN;
+    m_fSceneChangeMotionRatioMedium = SCENE_CHANGE_MOTION_RATIO_MEDIUM;
+  }
+  virtual ~CSceneChangeDetectorScreen() {
+  }
+  void operator() (SLocalParam& sLocalParam) {
+    bool bScrollDetectFlag = m_sParam.sScrollResult.bScrollDetectFlag;
+    int32_t iScrollMvX = m_sParam.sScrollResult.iScrollMvX;
+    int32_t iScrollMvY = m_sParam.sScrollResult.iScrollMvY;
+
+    int32_t iRefRowStride = 0, iCurRowStride = 0;
+    uint8_t* pRefY = sLocalParam.pRefY;
+    uint8_t* pCurY = sLocalParam.pCurY;
+    uint8_t* pRefTmp = NULL, *pCurTmp = NULL;
+    int32_t iWidth = sLocalParam.iWidth;
+    int32_t iHeight = sLocalParam.iHeight;
+
+    iRefRowStride  = sLocalParam.iRefStride << 3;
+    iCurRowStride  = sLocalParam.iCurStride << 3;
+
+    for (int32_t j = 0; j < sLocalParam.iBlock8x8Height; j++) {
+      pRefTmp = pRefY;
+      pCurTmp = pCurY;
+      for (int32_t i = 0; i < sLocalParam.iBlock8x8Width; i++) {
+        int32_t iBlockPointX = i << 3;
+        int32_t iBlockPointY = j << 3;
+        uint8_t uiBlockIdcTmp = NO_STATIC;
+        int32_t iSad = m_pfSad (pCurTmp, sLocalParam.iCurStride, pRefTmp, sLocalParam.iRefStride);
+        if (iSad == 0) {
+          uiBlockIdcTmp = COLLOCATED_STATIC;
+        } else if (bScrollDetectFlag && (!iScrollMvX || !iScrollMvY) && (iBlockPointX + iScrollMvX >= 0)
+                   && (iBlockPointX + iScrollMvX <= iWidth - 8) &&
+                   (iBlockPointY + iScrollMvY >= 0) && (iBlockPointY + iScrollMvY <= iHeight - 8)) {
+          uint8_t* pRefTmpScroll = pRefTmp + iScrollMvY * sLocalParam.iRefStride + iScrollMvX;
+          int32_t iSadScroll = m_pfSad (pCurTmp, sLocalParam.iCurStride, pRefTmpScroll, sLocalParam.iRefStride);
+
+          if (iSadScroll == 0) {
+            uiBlockIdcTmp = SCROLLED_STATIC;
+          } else {
+            m_sParam.iFrameComplexity += iSad;
+            m_sParam.iMotionBlockNum += iSad > HIGH_MOTION_BLOCK_THRESHOLD;
+          }
+        } else {
+          m_sParam.iFrameComplexity += iSad;
+          m_sParam.iMotionBlockNum += iSad > HIGH_MOTION_BLOCK_THRESHOLD;
+        }
+        * (sLocalParam.pStaticBlockIdc) ++ = uiBlockIdcTmp;
+        pRefTmp += 8;
+        pCurTmp += 8;
+      }
+      pRefY += iRefRowStride;
+      pCurY += iCurRowStride;
+    }
+  }
+};
+
+template<typename T>
+class CSceneChangeDetection : public IStrategy {
+ public:
+  CSceneChangeDetection (EMethods eMethod, int32_t iCpuFlag): m_cDetector (m_sSceneChangeParam, iCpuFlag) {
+    m_eMethod   = eMethod;
+    WelsMemset (&m_sSceneChangeParam, 0, sizeof (m_sSceneChangeParam));
+  }
+
+  ~CSceneChangeDetection() {
+  }
+
+  EResult Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+    EResult eReturn = RET_INVALIDPARAM;
+
+    m_sLocalParam.iWidth = pSrcPixMap->sRect.iRectWidth;
+    m_sLocalParam.iHeight = pSrcPixMap->sRect.iRectHeight;
+    m_sLocalParam.iBlock8x8Width = m_sLocalParam.iWidth >> 3;
+    m_sLocalParam.iBlock8x8Height = m_sLocalParam.iHeight >> 3;
+    m_sLocalParam.pRefY = (uint8_t*)pRefPixMap->pPixel[0];
+    m_sLocalParam.pCurY = (uint8_t*)pSrcPixMap->pPixel[0];
+    m_sLocalParam.iRefStride = pRefPixMap->iStride[0];
+    m_sLocalParam.iCurStride = pSrcPixMap->iStride[0];
+    m_sLocalParam.pStaticBlockIdc = m_sSceneChangeParam.pStaticBlockIdc;
+
+    int32_t iBlock8x8Num = m_sLocalParam.iBlock8x8Width * m_sLocalParam.iBlock8x8Height;
+    int32_t iSceneChangeThresholdLarge = WelsStaticCast (int32_t,
+                                         m_cDetector.GetSceneChangeMotionRatioLarge() * iBlock8x8Num + 0.5f + PESN);
+    int32_t iSceneChangeThresholdMedium = WelsStaticCast (int32_t,
+                                          m_cDetector.GetSceneChangeMotionRatioMedium() * iBlock8x8Num + 0.5f + PESN);
+
+    m_sSceneChangeParam.iMotionBlockNum = 0;
+    m_sSceneChangeParam.iFrameComplexity = 0;
+    m_sSceneChangeParam.eSceneChangeIdc = SIMILAR_SCENE;
+
+    m_cDetector (m_sLocalParam);
+
+    if (m_sSceneChangeParam.iMotionBlockNum >= iSceneChangeThresholdLarge) {
+      m_sSceneChangeParam.eSceneChangeIdc = LARGE_CHANGED_SCENE;
+    } else if (m_sSceneChangeParam.iMotionBlockNum >= iSceneChangeThresholdMedium) {
+      m_sSceneChangeParam.eSceneChangeIdc = MEDIUM_CHANGED_SCENE;
+    }
+
+    eReturn = RET_SUCCESS;
+
+    return eReturn;
+  }
+
+  EResult Get (int32_t iType, void* pParam) {
+    if (pParam == NULL) {
+      return RET_INVALIDPARAM;
+    }
+    * (SSceneChangeResult*)pParam = m_sSceneChangeParam;
+    return RET_SUCCESS;
+  }
+
+  EResult Set (int32_t iType, void* pParam) {
+    if (pParam == NULL) {
+      return RET_INVALIDPARAM;
+    }
+    m_sSceneChangeParam = * (SSceneChangeResult*)pParam;
+    return RET_SUCCESS;
+  }
+ private:
+  SSceneChangeResult m_sSceneChangeParam;
+  SLocalParam m_sLocalParam;
+  T          m_cDetector;
+};
+
+IStrategy* BuildSceneChangeDetection (EMethods eMethod, int32_t iCpuFlag);
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.cpp
new file mode 100644
index 0000000000..d067e8e646
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.cpp
@@ -0,0 +1,115 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#include "ScrollDetection.h"
+#include "ScrollDetectionFuncs.h"
+#include "cpu.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+EResult CScrollDetection::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  if (pRefPixMap->pPixel[0] == NULL || pSrcPixMap->pPixel[0] == NULL ||
+      pRefPixMap->sRect.iRectWidth != pSrcPixMap->sRect.iRectWidth
+      || pRefPixMap->sRect.iRectHeight != pSrcPixMap->sRect.iRectHeight) {
+    return RET_INVALIDPARAM;
+  }
+
+  if (!m_sScrollDetectionParam.bMaskInfoAvailable)
+    ScrollDetectionWithoutMask (pSrcPixMap, pRefPixMap);
+  else
+    ScrollDetectionWithMask (pSrcPixMap, pRefPixMap);
+
+  return RET_SUCCESS;
+}
+
+EResult CScrollDetection::Set (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+  m_sScrollDetectionParam = * ((SScrollDetectionParam*)pParam);
+  return RET_SUCCESS;
+}
+
+EResult CScrollDetection::Get (int32_t iType, void* pParam) {
+  if (pParam == NULL) {
+    return RET_INVALIDPARAM;
+  }
+  * ((SScrollDetectionParam*)pParam) = m_sScrollDetectionParam;
+  return RET_SUCCESS;
+}
+
+void CScrollDetection::ScrollDetectionWithMask (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  int32_t iStartX, iStartY, iWidth, iHeight;
+
+  iStartX = m_sScrollDetectionParam.sMaskRect.iRectLeft;
+  iStartY = m_sScrollDetectionParam.sMaskRect.iRectTop;
+  iWidth = m_sScrollDetectionParam.sMaskRect.iRectWidth;
+  iHeight = m_sScrollDetectionParam.sMaskRect.iRectHeight;
+
+  iWidth /= 2;
+  iStartX += iWidth / 2;
+
+  m_sScrollDetectionParam.iScrollMvX = 0;
+  m_sScrollDetectionParam.iScrollMvY = 0;
+  m_sScrollDetectionParam.bScrollDetectFlag = false;
+
+  if (iStartX >= 0 && iWidth > MINIMUM_DETECT_WIDTH && iHeight > 2 * CHECK_OFFSET) {
+    ScrollDetectionCore (pSrcPixMap, pRefPixMap, iWidth, iHeight, iStartX, iStartY, m_sScrollDetectionParam);
+  }
+}
+
+void CScrollDetection::ScrollDetectionWithoutMask (SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  int32_t iStartX, iStartY, iWidth, iHeight;
+
+  const int32_t kiPicBorderWidth = pSrcPixMap->sRect.iRectHeight >> 4;
+  const int32_t kiRegionWidth = (int) (pSrcPixMap->sRect.iRectWidth - (kiPicBorderWidth << 1)) / 3;
+  const int32_t kiRegionHeight = (pSrcPixMap->sRect.iRectHeight * 7) >> 3;
+  const int32_t kiHieghtStride = (int) pSrcPixMap->sRect.iRectHeight * 5 / 24;
+
+  for (int32_t i = 0; i < REGION_NUMBER; i++) {
+    iStartX = kiPicBorderWidth + (i % 3) * kiRegionWidth;
+    iStartY = -pSrcPixMap->sRect.iRectHeight * 7 / 48 + (int) (i / 3) * (kiHieghtStride);
+    iWidth = kiRegionWidth;
+    iHeight = kiRegionHeight;
+
+    iWidth /= 2;
+    iStartX += iWidth / 2;
+
+    ScrollDetectionCore (pSrcPixMap, pRefPixMap, iWidth, iHeight, iStartX, iStartY, m_sScrollDetectionParam);
+
+    if (m_sScrollDetectionParam.bScrollDetectFlag && m_sScrollDetectionParam.iScrollMvY)
+      break;
+  }
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.h
new file mode 100644
index 0000000000..758b149ad7
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetection.h
@@ -0,0 +1,68 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file         :  ScrollDectection.h
+ *
+ * \brief        :  scroll detection class of wels video processor class
+ *
+ * \date         :  2011/04/26
+ *
+ * \description  :  rewrite the package code of scroll detection class
+ *
+ *************************************************************************************
+ */
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+class CScrollDetection : public IStrategy {
+ public:
+  CScrollDetection (int32_t iCpuFlag) {
+    m_eMethod = METHOD_SCROLL_DETECTION;
+    WelsMemset (&m_sScrollDetectionParam, 0, sizeof (m_sScrollDetectionParam));
+  }
+  ~CScrollDetection() {
+  }
+  EResult Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap);
+  EResult Set (int32_t iType, void* pParam);
+  EResult Get (int32_t iType, void* pParam);
+
+ private:
+  void ScrollDetectionWithMask (SPixMap* pSrcPixMap, SPixMap* pRefPixMap);
+  void ScrollDetectionWithoutMask (SPixMap* pSrcPixMap, SPixMap* pRefPixMap);
+ private:
+  SScrollDetectionParam m_sScrollDetectionParam;
+};
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.cpp
new file mode 100644
index 0000000000..e7c9d2cedf
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.cpp
@@ -0,0 +1,200 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "ScrollDetection.h"
+#include "ScrollDetectionFuncs.h"
+#include "ls_defines.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+int32_t CheckLine (uint8_t* pData, int32_t iWidth) {
+  int32_t iQualified = 0;
+  int32_t iColorMap[8] = {0};
+  int32_t iChangedTimes = 0;
+  int32_t iColorCounts = 0;
+
+  RECORD_COLOR (pData[0], iColorMap);
+
+  for (int32_t i = 1; i < iWidth; i++) {
+    RECORD_COLOR (pData[i], iColorMap);
+    iChangedTimes += (pData[i] != pData[i - 1]);
+  }
+  for (int32_t i = 0; i < 8; i++)
+    for (int32_t j = 0; j < 32; j++)
+      iColorCounts += ((iColorMap[i] >> j) & 1);
+
+  switch (iColorCounts) {
+  case 1:
+    iQualified = 0;
+    break;
+  case 2:
+  case 3:
+    iQualified = (iChangedTimes > 3);
+    break;
+  default:
+    iQualified = 1;
+    break;
+  }
+  return iQualified;
+}
+
+int32_t SelectTestLine (uint8_t* pY, int32_t iWidth, int32_t iHeight, int32_t iPicHeight,
+                        int32_t iStride, int32_t iOffsetX, int32_t iOffsetY) {
+  const int32_t kiHalfHeight    = iHeight >> 1;
+  const int32_t kiMidPos        = iOffsetY + kiHalfHeight;
+  int32_t TestPos               = kiMidPos;
+  int32_t iOffsetAbs;
+  uint8_t* pTmp;
+
+  for (iOffsetAbs = 0; iOffsetAbs < kiHalfHeight; iOffsetAbs++) {
+    TestPos = kiMidPos + iOffsetAbs;
+    if (TestPos < iPicHeight) {
+      pTmp = pY + TestPos * iStride + iOffsetX;
+      if (CheckLine (pTmp, iWidth)) break;
+    }
+    TestPos = kiMidPos - iOffsetAbs;
+    if (TestPos >= 0) {
+      pTmp = pY + TestPos * iStride + iOffsetX;
+      if (CheckLine (pTmp, iWidth)) break;
+    }
+  }
+  if (iOffsetAbs == kiHalfHeight)
+    TestPos = -1;
+  return TestPos;
+}
+
+/*
+ * compare pixel line between previous and current one
+ * return: 0 for totally equal, otherwise 1
+ */
+int32_t CompareLine (uint8_t* pYSrc, uint8_t* pYRef, const int32_t kiWidth) {
+  int32_t iCmp = 1;
+
+  if (LD32 (pYSrc) != LD32 (pYRef)) return 1;
+  if (LD32 (pYSrc + 4) != LD32 (pYRef + 4)) return 1;
+  if (LD32 (pYSrc + 8) != LD32 (pYRef + 8)) return 1;
+  if (kiWidth > 12)
+    iCmp = WelsMemcmp (pYSrc + 12, pYRef + 12, kiWidth - 12);
+  return iCmp;
+}
+
+void ScrollDetectionCore (SPixMap* pSrcPixMap, SPixMap* pRefPixMap, int32_t iWidth, int32_t iHeight,
+                          int32_t iOffsetX, int32_t iOffsetY, SScrollDetectionParam& sScrollDetectionParam) {
+  bool bScrollDetected = 0;
+  uint8_t* pYLine;
+  uint8_t* pYTmp;
+  int32_t iTestPos, iSearchPos = 0, iOffsetAbs, iMaxAbs;
+  int32_t iPicHeight = pRefPixMap->sRect.iRectHeight;
+  int32_t iMinHeight = WELS_MAX (iOffsetY, 0);
+  int32_t iMaxHeight = WELS_MIN (iOffsetY + iHeight - 1, iPicHeight - 1) ; //offset_y + height - 1;//
+  uint8_t* pYRef, *pYSrc;
+  int32_t iYStride;
+
+  pYRef = (uint8_t*)pRefPixMap->pPixel[0];
+  pYSrc = (uint8_t*)pSrcPixMap->pPixel[0];
+  iYStride = pRefPixMap->iStride[0];
+
+  iTestPos = SelectTestLine (pYSrc, iWidth, iHeight, iPicHeight, iYStride, iOffsetX, iOffsetY);
+
+  if (iTestPos == -1) {
+    sScrollDetectionParam.bScrollDetectFlag = 0;
+    return;
+  }
+  pYLine = pYSrc + iYStride * iTestPos + iOffsetX;
+  iMaxAbs = WELS_MIN (WELS_MAX (iTestPos - iMinHeight - 1, iMaxHeight - iTestPos), MAX_SCROLL_MV_Y);
+  iSearchPos = iTestPos;
+  for (iOffsetAbs = 0; iOffsetAbs <= iMaxAbs; iOffsetAbs++) {
+    iSearchPos = iTestPos + iOffsetAbs;
+    if (iSearchPos <= iMaxHeight) {
+      pYTmp = pYRef + iSearchPos * iYStride + iOffsetX;
+      if (!CompareLine (pYLine, pYTmp, iWidth)) {
+        uint8_t* pYUpper, *pYLineUpper;
+        int32_t iCheckedLines;
+        int32_t iLowOffset = WELS_MIN (iMaxHeight - iSearchPos, CHECK_OFFSET);
+        int32_t i;
+
+        iCheckedLines = WELS_MIN (iTestPos - iMinHeight + iLowOffset, 2 * CHECK_OFFSET);
+        pYUpper = pYTmp - (iCheckedLines - iLowOffset) * iYStride;
+        pYLineUpper = pYLine - (iCheckedLines - iLowOffset) * iYStride;
+
+        for (i = 0; i < iCheckedLines; i ++) {
+          if (CompareLine (pYLineUpper, pYUpper, iWidth)) {
+            break;
+          }
+          pYUpper += iYStride;
+          pYLineUpper += iYStride;
+        }
+        if (i == iCheckedLines) {
+          bScrollDetected = 1;
+          break;
+        }
+      }
+    }
+
+    iSearchPos = iTestPos - iOffsetAbs - 1;
+    if (iSearchPos >= iMinHeight) {
+      pYTmp = pYRef + iSearchPos * iYStride + iOffsetX;
+      if (!CompareLine (pYLine, pYTmp, iWidth)) {
+        uint8_t* pYUpper, *pYLineUpper;
+        int32_t iCheckedLines;
+        int32_t iUpOffset = WELS_MIN (iSearchPos - iMinHeight, CHECK_OFFSET);
+        int32_t i;
+
+        pYUpper = pYTmp - iUpOffset * iYStride;
+        pYLineUpper = pYLine - iUpOffset * iYStride;
+        iCheckedLines = WELS_MIN (iMaxHeight - iTestPos + iUpOffset, 2 * CHECK_OFFSET);
+
+        for (i = 0; i < iCheckedLines; i ++) {
+          if (CompareLine (pYLineUpper, pYUpper, iWidth)) {
+            break;
+          }
+          pYUpper += iYStride;
+          pYLineUpper += iYStride;
+        }
+        if (i == iCheckedLines) {
+          bScrollDetected = 1;
+          break;
+        }
+      }
+    }
+  }
+
+  if (!bScrollDetected) {
+    sScrollDetectionParam.bScrollDetectFlag = 0;
+  } else {
+    sScrollDetectionParam.bScrollDetectFlag = 1;
+    sScrollDetectionParam.iScrollMvY = iSearchPos - iTestPos; // pre_pos - cur_pos, change to mv
+    sScrollDetectionParam.iScrollMvX = 0;
+  }
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.h
new file mode 100644
index 0000000000..27d7dfc905
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/scrolldetection/ScrollDetectionFuncs.h
@@ -0,0 +1,61 @@
+/*!
+ * \copy
+ *     Copyright (c)  2009-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file         :  ScrollDetectionFuncs.h
+ *
+ * \brief        :  scroll detection class of wels video processor class
+ *
+ * \date         :  2011/04/26
+ *
+ * \description  :  rewrite the package code of scroll detection class
+ *
+ *************************************************************************************
+ */
+
+WELSVP_NAMESPACE_BEGIN
+
+#define MINIMUM_DETECT_WIDTH 50  // no less than 16
+#define CHECK_OFFSET 25
+#define MAX_SCROLL_MV_Y 511
+#define REGION_NUMBER 9
+#define RECORD_COLOR(a, x)      \
+{                               \
+  int32_t _t = (uint8_t)(a);    \
+  x[_t>>5] |= (1 << (_t&31));   \
+}
+
+int32_t CheckLine (uint8_t* pData, int32_t iWidth);
+int32_t SelectTestLine (uint8_t* pY, int32_t iWidth, int32_t iHeight, int32_t iPicHeight,
+                        int32_t iStride, int32_t iOffsetX, int32_t iOffsetY);
+int32_t CompareLine (uint8_t* pYSrc, uint8_t* pYRef, const int32_t kiWidth);
+void ScrollDetectionCore (SPixMap* pSrcPixMap, SPixMap* pRefPixMap, int32_t iWidth, int32_t iHeight,
+                          int32_t iOffsetX, int32_t iOffsetY, SScrollDetectionParam& sScrollDetectionParam);
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalcfuncs.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalcfuncs.cpp
new file mode 100644
index 0000000000..4aabda2736
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalcfuncs.cpp
@@ -0,0 +1,598 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "util.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+void VAACalcSadSsd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                      int32_t iPicStride,
+                      int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16, int32_t* psqdiff16x16) {
+  const uint8_t* tmp_ref = pRefData;
+  const uint8_t* tmp_cur = pCurData;
+  int32_t iMbWidth = (iPicWidth >> 4);
+  int32_t mb_height = (iPicHeight >> 4);
+  int32_t mb_index = 0;
+  int32_t pic_stride_x8 = iPicStride << 3;
+  int32_t step = (iPicStride << 4) - iPicWidth;
+
+  *pFrameSad = 0;
+  for (int32_t i = 0; i < mb_height; i ++) {
+    for (int32_t j = 0; j < iMbWidth; j ++) {
+      int32_t k, l;
+      int32_t l_sad, l_sqdiff, l_sum, l_sqsum;
+      const uint8_t* tmp_cur_row;
+      const uint8_t* tmp_ref_row;
+
+      pSum16x16[mb_index] = 0;
+      psqsum16x16[mb_index] = 0;
+      psqdiff16x16[mb_index] = 0;
+
+      l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur;
+      tmp_ref_row = tmp_ref;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sqdiff += diff * diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 0] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+
+      l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + 8;
+      tmp_ref_row = tmp_ref + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sqdiff += diff * diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 1] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+
+      l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8;
+      tmp_ref_row = tmp_ref + pic_stride_x8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sqdiff += diff * diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 2] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+
+      l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8 + 8;
+      tmp_ref_row = tmp_ref + pic_stride_x8 + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sqdiff += diff * diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 3] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+
+
+      tmp_ref += 16;
+      tmp_cur += 16;
+      ++mb_index;
+    }
+    tmp_ref += step;
+    tmp_cur += step;
+  }
+}
+void VAACalcSadVar_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                      int32_t iPicStride,
+                      int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16) {
+  const uint8_t* tmp_ref = pRefData;
+  const uint8_t* tmp_cur = pCurData;
+  int32_t iMbWidth = (iPicWidth >> 4);
+  int32_t mb_height = (iPicHeight >> 4);
+  int32_t mb_index = 0;
+  int32_t pic_stride_x8 = iPicStride << 3;
+  int32_t step = (iPicStride << 4) - iPicWidth;
+
+  *pFrameSad = 0;
+  for (int32_t i = 0; i < mb_height; i ++) {
+    for (int32_t j = 0; j < iMbWidth; j ++) {
+      int32_t k, l;
+      int32_t l_sad, l_sum, l_sqsum;
+      const uint8_t* tmp_cur_row;
+      const uint8_t* tmp_ref_row;
+
+      pSum16x16[mb_index] = 0;
+      psqsum16x16[mb_index] = 0;
+
+      l_sad =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur;
+      tmp_ref_row = tmp_ref;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 0] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+
+      l_sad =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + 8;
+      tmp_ref_row = tmp_ref + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 1] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+
+      l_sad =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8;
+      tmp_ref_row = tmp_ref + pic_stride_x8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 2] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+
+      l_sad =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8 + 8;
+      tmp_ref_row = tmp_ref + pic_stride_x8 + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 3] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+
+
+      tmp_ref += 16;
+      tmp_cur += 16;
+      ++mb_index;
+    }
+    tmp_ref += step;
+    tmp_cur += step;
+  }
+}
+
+
+void VAACalcSad_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                   int32_t iPicStride,
+                   int32_t* pFrameSad, int32_t* pSad8x8) {
+  const uint8_t* tmp_ref = pRefData;
+  const uint8_t* tmp_cur = pCurData;
+  int32_t iMbWidth = (iPicWidth >> 4);
+  int32_t mb_height = (iPicHeight >> 4);
+  int32_t mb_index = 0;
+  int32_t pic_stride_x8 = iPicStride << 3;
+  int32_t step = (iPicStride << 4) - iPicWidth;
+
+  *pFrameSad = 0;
+  for (int32_t i = 0; i < mb_height; i ++) {
+    for (int32_t j = 0; j < iMbWidth; j ++) {
+      int32_t k, l;
+      int32_t l_sad;
+      const uint8_t* tmp_cur_row;
+      const uint8_t* tmp_ref_row;
+
+      l_sad =  0;
+      tmp_cur_row = tmp_cur;
+      tmp_ref_row = tmp_ref;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 0] = l_sad;
+
+      l_sad =  0;
+      tmp_cur_row = tmp_cur + 8;
+      tmp_ref_row = tmp_ref + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 1] = l_sad;
+
+      l_sad =  0;
+      tmp_cur_row = tmp_cur + pic_stride_x8;
+      tmp_ref_row = tmp_ref + pic_stride_x8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 2] = l_sad;
+
+      l_sad =  0;
+      tmp_cur_row = tmp_cur + pic_stride_x8 + 8;
+      tmp_ref_row = tmp_ref + pic_stride_x8 + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = WELS_ABS (tmp_cur_row[l] - tmp_ref_row[l]);
+          l_sad += diff;
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 3] = l_sad;
+
+      tmp_ref += 16;
+      tmp_cur += 16;
+      ++mb_index;
+    }
+    tmp_ref += step;
+    tmp_cur += step;
+  }
+}
+
+void VAACalcSadSsdBgd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                         int32_t iPicStride,
+                         int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* psqsum16x16, int32_t* psqdiff16x16, int32_t* pSd8x8,
+                         uint8_t* pMad8x8)
+
+{
+  const uint8_t* tmp_ref = pRefData;
+  const uint8_t* tmp_cur = pCurData;
+  int32_t iMbWidth = (iPicWidth >> 4);
+  int32_t mb_height = (iPicHeight >> 4);
+  int32_t mb_index = 0;
+  int32_t pic_stride_x8 = iPicStride << 3;
+  int32_t step = (iPicStride << 4) - iPicWidth;
+
+  *pFrameSad = 0;
+  for (int32_t i = 0; i < mb_height; i ++) {
+    for (int32_t j = 0; j < iMbWidth; j ++) {
+      int32_t k, l;
+      int32_t l_sad, l_sqdiff, l_sum, l_sqsum, l_sd, l_mad;
+      const uint8_t* tmp_cur_row;
+      const uint8_t* tmp_ref_row;
+
+      pSum16x16[mb_index] = 0;
+      psqsum16x16[mb_index] = 0;
+      psqdiff16x16[mb_index] = 0;
+
+      l_sd = l_mad = l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur;
+      tmp_ref_row = tmp_ref;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+
+          l_sd += diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+          l_sad += abs_diff;
+          l_sqdiff += abs_diff * abs_diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 0] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+      pSd8x8[ (mb_index << 2) + 0] = l_sd;
+      pMad8x8[ (mb_index << 2) + 0] = l_mad;
+
+
+      l_sd = l_mad = l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + 8;
+      tmp_ref_row = tmp_ref + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+
+          l_sd += diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+          l_sad += abs_diff;
+          l_sqdiff += abs_diff * abs_diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 1] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+      pSd8x8[ (mb_index << 2) + 1] = l_sd;
+      pMad8x8[ (mb_index << 2) + 1] = l_mad;
+
+      l_sd = l_mad = l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8;
+      tmp_ref_row = tmp_ref + pic_stride_x8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+
+          l_sd += diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+          l_sad += abs_diff;
+          l_sqdiff += abs_diff * abs_diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 2] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+      pSd8x8[ (mb_index << 2) + 2] = l_sd;
+      pMad8x8[ (mb_index << 2) + 2] = l_mad;
+
+      l_sd = l_mad = l_sad =  l_sqdiff =  l_sum =  l_sqsum = 0;
+      tmp_cur_row = tmp_cur + pic_stride_x8 + 8;
+      tmp_ref_row = tmp_ref + pic_stride_x8 + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+
+          l_sd += diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+          l_sad += abs_diff;
+          l_sqdiff += abs_diff * abs_diff;
+          l_sum += tmp_cur_row[l];
+          l_sqsum += tmp_cur_row[l] * tmp_cur_row[l];
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 3] = l_sad;
+      pSum16x16[mb_index] += l_sum;
+      psqsum16x16[mb_index] += l_sqsum;
+      psqdiff16x16[mb_index] += l_sqdiff;
+      pSd8x8[ (mb_index << 2) + 3] = l_sd;
+      pMad8x8[ (mb_index << 2) + 3] = l_mad;
+
+      tmp_ref += 16;
+      tmp_cur += 16;
+      ++mb_index;
+    }
+    tmp_ref += step;
+    tmp_cur += step;
+  }
+}
+
+void VAACalcSadBgd_c (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                      int32_t iPicStride,
+                      int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSd8x8, uint8_t* pMad8x8) {
+  const uint8_t* tmp_ref = pRefData;
+  const uint8_t* tmp_cur = pCurData;
+  int32_t iMbWidth = (iPicWidth >> 4);
+  int32_t mb_height = (iPicHeight >> 4);
+  int32_t mb_index = 0;
+  int32_t pic_stride_x8 = iPicStride << 3;
+  int32_t step = (iPicStride << 4) - iPicWidth;
+
+  *pFrameSad = 0;
+  for (int32_t i = 0; i < mb_height; i ++) {
+    for (int32_t j = 0; j < iMbWidth; j ++) {
+      int32_t k, l;
+      int32_t l_sad, l_sd, l_mad;
+      const uint8_t* tmp_cur_row;
+      const uint8_t* tmp_ref_row;
+
+      l_mad = l_sd = l_sad =  0;
+      tmp_cur_row = tmp_cur;
+      tmp_ref_row = tmp_ref;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+          l_sd += diff;
+          l_sad += abs_diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 0] = l_sad;
+      pSd8x8[ (mb_index << 2) + 0] = l_sd;
+      pMad8x8[ (mb_index << 2) + 0] = l_mad;
+
+      l_mad = l_sd = l_sad =  0;
+      tmp_cur_row = tmp_cur + 8;
+      tmp_ref_row = tmp_ref + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+          l_sd += diff;
+          l_sad += abs_diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 1] = l_sad;
+      pSd8x8[ (mb_index << 2) + 1] = l_sd;
+      pMad8x8[ (mb_index << 2) + 1] = l_mad;
+
+      l_mad = l_sd = l_sad =  0;
+      tmp_cur_row = tmp_cur + pic_stride_x8;
+      tmp_ref_row = tmp_ref + pic_stride_x8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+          l_sd += diff;
+          l_sad += abs_diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 2] = l_sad;
+      pSd8x8[ (mb_index << 2) + 2] = l_sd;
+      pMad8x8[ (mb_index << 2) + 2] = l_mad;
+
+      l_mad = l_sd = l_sad =  0;
+      tmp_cur_row = tmp_cur + pic_stride_x8 + 8;
+      tmp_ref_row = tmp_ref + pic_stride_x8 + 8;
+      for (k = 0; k < 8; k ++) {
+        for (l = 0; l < 8; l ++) {
+          int32_t diff = tmp_cur_row[l] - tmp_ref_row[l];
+          int32_t abs_diff = WELS_ABS (diff);
+          l_sd += diff;
+          l_sad += abs_diff;
+          if (abs_diff > l_mad) {
+            l_mad = abs_diff;
+          }
+        }
+        tmp_cur_row += iPicStride;
+        tmp_ref_row += iPicStride;
+      }
+      *pFrameSad += l_sad;
+      pSad8x8[ (mb_index << 2) + 3] = l_sad;
+      pSd8x8[ (mb_index << 2) + 3] = l_sd;
+      pMad8x8[ (mb_index << 2) + 3] = l_mad;
+
+      tmp_ref += 16;
+      tmp_cur += 16;
+      ++mb_index;
+    }
+    tmp_ref += step;
+    tmp_cur += step;
+  }
+}
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.cpp b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.cpp
new file mode 100644
index 0000000000..bc91200872
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.cpp
@@ -0,0 +1,161 @@
+/*!
+ * \copy
+ *     Copyright (c)  2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "vaacalculation.h"
+#include "cpu.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+CVAACalculation::CVAACalculation (int32_t iCpuFlag) {
+  m_iCPUFlag = iCpuFlag;
+  m_eMethod   = METHOD_VAA_STATISTICS;
+
+  WelsMemset (&m_sCalcParam, 0, sizeof (m_sCalcParam));
+  WelsMemset (&m_sVaaFuncs, 0, sizeof (m_sVaaFuncs));
+  InitVaaFuncs (m_sVaaFuncs, m_iCPUFlag);
+}
+
+CVAACalculation::~CVAACalculation() {
+}
+
+void CVAACalculation::InitVaaFuncs (SVaaFuncs& sVaaFuncs, int32_t iCpuFlag) {
+  sVaaFuncs.pfVAACalcSad         = VAACalcSad_c;
+  sVaaFuncs.pfVAACalcSadBgd      = VAACalcSadBgd_c;
+  sVaaFuncs.pfVAACalcSadSsd      = VAACalcSadSsd_c;
+  sVaaFuncs.pfVAACalcSadSsdBgd   = VAACalcSadSsdBgd_c;
+  sVaaFuncs.pfVAACalcSadVar      = VAACalcSadVar_c;
+#ifdef X86_ASM
+  if ((iCpuFlag & WELS_CPU_SSE2) == WELS_CPU_SSE2) {
+    sVaaFuncs.pfVAACalcSad       = VAACalcSad_sse2;
+    sVaaFuncs.pfVAACalcSadBgd    = VAACalcSadBgd_sse2;
+    sVaaFuncs.pfVAACalcSadSsd    = VAACalcSadSsd_sse2;
+    sVaaFuncs.pfVAACalcSadSsdBgd = VAACalcSadSsdBgd_sse2;
+    sVaaFuncs.pfVAACalcSadVar    = VAACalcSadVar_sse2;
+  }
+#ifdef HAVE_AVX2
+  if (iCpuFlag & WELS_CPU_AVX2) {
+    sVaaFuncs.pfVAACalcSad       = VAACalcSad_avx2;
+    sVaaFuncs.pfVAACalcSadBgd    = VAACalcSadBgd_avx2;
+    sVaaFuncs.pfVAACalcSadSsd    = VAACalcSadSsd_avx2;
+    sVaaFuncs.pfVAACalcSadSsdBgd = VAACalcSadSsdBgd_avx2;
+    sVaaFuncs.pfVAACalcSadVar    = VAACalcSadVar_avx2;
+  }
+#endif
+#endif//X86_ASM
+#ifdef HAVE_NEON
+  if ((iCpuFlag & WELS_CPU_NEON) == WELS_CPU_NEON) {
+    sVaaFuncs.pfVAACalcSad       = VAACalcSad_neon;
+    sVaaFuncs.pfVAACalcSadBgd    = VAACalcSadBgd_neon;
+    sVaaFuncs.pfVAACalcSadSsd    = VAACalcSadSsd_neon;
+    sVaaFuncs.pfVAACalcSadSsdBgd = VAACalcSadSsdBgd_neon;
+    sVaaFuncs.pfVAACalcSadVar    = VAACalcSadVar_neon;
+  }
+#endif//HAVE_NEON
+
+#ifdef HAVE_NEON_AARCH64
+  if ((iCpuFlag & WELS_CPU_NEON) == WELS_CPU_NEON) {
+    sVaaFuncs.pfVAACalcSad       = VAACalcSad_AArch64_neon;
+    sVaaFuncs.pfVAACalcSadBgd    = VAACalcSadBgd_AArch64_neon;
+    sVaaFuncs.pfVAACalcSadSsd    = VAACalcSadSsd_AArch64_neon;
+    sVaaFuncs.pfVAACalcSadSsdBgd = VAACalcSadSsdBgd_AArch64_neon;
+    sVaaFuncs.pfVAACalcSadVar    = VAACalcSadVar_AArch64_neon;
+  }
+#endif//HAVE_NEON_AARCH64
+
+#ifdef HAVE_MMI
+  if ((iCpuFlag & WELS_CPU_MMI) == WELS_CPU_MMI) {
+    sVaaFuncs.pfVAACalcSad       = VAACalcSad_mmi;
+    sVaaFuncs.pfVAACalcSadBgd    = VAACalcSadBgd_mmi;
+    sVaaFuncs.pfVAACalcSadSsd    = VAACalcSadSsd_mmi;
+    sVaaFuncs.pfVAACalcSadSsdBgd = VAACalcSadSsdBgd_mmi;
+    sVaaFuncs.pfVAACalcSadVar    = VAACalcSadVar_mmi;
+  }
+#endif//HAVE_MMI
+}
+
+EResult CVAACalculation::Process (int32_t iType, SPixMap* pSrcPixMap, SPixMap* pRefPixMap) {
+  uint8_t* pCurData     = (uint8_t*)pSrcPixMap->pPixel[0];
+  uint8_t* pRefData     = (uint8_t*)pRefPixMap->pPixel[0];
+  int32_t iPicWidth     = pSrcPixMap->sRect.iRectWidth;
+  int32_t iPicHeight    = pSrcPixMap->sRect.iRectHeight;
+  int32_t iPicStride    = pSrcPixMap->iStride[0];
+
+  SVAACalcResult* pResult = m_sCalcParam.pCalcResult;
+
+  if (pCurData == NULL || pRefData == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  pResult->pCurY = pCurData;
+  pResult->pRefY = pRefData;
+  if (m_sCalcParam.iCalcBgd) {
+    if (m_sCalcParam.iCalcSsd) {
+      m_sVaaFuncs.pfVAACalcSadSsdBgd (pCurData, pRefData, iPicWidth, iPicHeight, iPicStride, &pResult->iFrameSad,
+                                      (int32_t*)pResult->pSad8x8, pResult->pSum16x16, pResult->pSumOfSquare16x16, pResult->pSsd16x16,
+                                      (int32_t*)pResult->pSumOfDiff8x8, (uint8_t*)pResult->pMad8x8);
+    } else {
+      m_sVaaFuncs.pfVAACalcSadBgd (pCurData, pRefData, iPicWidth, iPicHeight, iPicStride, &pResult->iFrameSad,
+                                   (int32_t*) (pResult->pSad8x8), (int32_t*) (pResult->pSumOfDiff8x8), (uint8_t*)pResult->pMad8x8);
+    }
+  } else {
+    if (m_sCalcParam.iCalcSsd) {
+      m_sVaaFuncs.pfVAACalcSadSsd (pCurData, pRefData, iPicWidth, iPicHeight, iPicStride, &pResult->iFrameSad,
+                                   (int32_t*)pResult->pSad8x8, pResult->pSum16x16, pResult->pSumOfSquare16x16, pResult->pSsd16x16);
+    } else {
+      if (m_sCalcParam.iCalcVar) {
+        m_sVaaFuncs.pfVAACalcSadVar (pCurData, pRefData, iPicWidth, iPicHeight, iPicStride, &pResult->iFrameSad,
+                                     (int32_t*)pResult->pSad8x8, pResult->pSum16x16, pResult->pSumOfSquare16x16);
+      } else {
+        m_sVaaFuncs.pfVAACalcSad (pCurData, pRefData, iPicWidth, iPicHeight, iPicStride, &pResult->iFrameSad,
+                                  (int32_t*)pResult->pSad8x8);
+      }
+    }
+  }
+
+  return RET_SUCCESS;
+}
+
+EResult CVAACalculation::Set (int32_t iType, void* pParam) {
+  if (pParam == NULL || ((SVAACalcParam*)pParam)->pCalcResult == NULL) {
+    return RET_INVALIDPARAM;
+  }
+
+  m_sCalcParam = * (SVAACalcParam*)pParam;
+
+  return RET_SUCCESS;
+}
+
+
+WELSVP_NAMESPACE_END
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.h b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.h
new file mode 100644
index 0000000000..876204d20c
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/vaacalc/vaacalculation.h
@@ -0,0 +1,164 @@
+/*!
+ * \copy
+ *     Copyright (c)  2011-2013, Cisco Systems
+ *     All rights reserved.
+ *
+ *     Redistribution and use in source and binary forms, with or without
+ *     modification, are permitted provided that the following conditions
+ *     are met:
+ *
+ *        * Redistributions of source code must retain the above copyright
+ *          notice, this list of conditions and the following disclaimer.
+ *
+ *        * Redistributions in binary form must reproduce the above copyright
+ *          notice, this list of conditions and the following disclaimer in
+ *          the documentation and/or other materials provided with the
+ *          distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ *     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ *     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ *     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ *     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ *     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ *     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ *     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *     POSSIBILITY OF SUCH DAMAGE.
+ *
+ * \file        :  vaacalculation.h
+ *
+ * \brief       :  pVaa calculation class of wels video processor class
+ *
+ * \date        :  2011/03/18
+ *
+ * \description :  1. rewrite the package code of pVaa calculation class
+ *
+ *************************************************************************************
+ */
+
+#ifndef WELSVP_VAACALCULATION_H
+#define WELSVP_VAACALCULATION_H
+
+#include "util.h"
+#include "memory.h"
+#include "WelsFrameWork.h"
+#include "IWelsVP.h"
+
+WELSVP_NAMESPACE_BEGIN
+
+typedef void (VAACalcSadBgdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth,
+                                  int32_t iPicHeight,
+                                  int32_t iPicStride,
+                                  int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSd8x8, uint8_t* pMad8x8);
+
+typedef void (VAACalcSadSsdBgdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth,
+                                     int32_t iPicHeight,
+                                     int32_t iPicStride,
+                                     int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16,
+                                     int32_t* pSsd16x16, int32_t* pSd8x8, uint8_t* pMad8x8);
+
+typedef void (VAACalcSadFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth, int32_t iPicHeight,
+                               int32_t iPicStride,
+                               int32_t* pFrameSad, int32_t* pSad8x8);
+
+typedef void (VAACalcSadVarFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth,
+                                  int32_t iPicHeight,
+                                  int32_t iPicStride,
+                                  int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16);
+
+typedef void (VAACalcSadSsdFunc) (const uint8_t* pCurData, const uint8_t* pRefData, int32_t iPicWidth,
+                                  int32_t iPicHeight,
+                                  int32_t iPicStride,
+                                  int32_t* pFrameSad, int32_t* pSad8x8, int32_t* pSum16x16, int32_t* pSumSquare16x16, int32_t* pSsd16x16);
+
+
+typedef VAACalcSadBgdFunc*       PVAACalcSadBgdFunc;
+typedef VAACalcSadSsdBgdFunc*    PVAACalcSadSsdBgdFunc;
+typedef VAACalcSadFunc*          PVAACalcSadFunc;
+typedef VAACalcSadVarFunc*       PVAACalcSadVarFunc;
+typedef VAACalcSadSsdFunc*       PVAACalcSadSsdFunc;
+
+typedef  struct TagVaaFuncs {
+  PVAACalcSadBgdFunc    pfVAACalcSadBgd;
+  PVAACalcSadSsdBgdFunc pfVAACalcSadSsdBgd;
+  PVAACalcSadFunc       pfVAACalcSad;
+  PVAACalcSadVarFunc    pfVAACalcSadVar;
+  PVAACalcSadSsdFunc    pfVAACalcSadSsd;
+} SVaaFuncs;
+
+
+VAACalcSadBgdFunc       VAACalcSadBgd_c;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_c;
+VAACalcSadFunc          VAACalcSad_c;
+VAACalcSadVarFunc       VAACalcSadVar_c;
+VAACalcSadSsdFunc       VAACalcSadSsd_c;
+
+
+#ifdef X86_ASM
+WELSVP_EXTERN_C_BEGIN
+VAACalcSadBgdFunc       VAACalcSadBgd_sse2;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_sse2;
+VAACalcSadFunc          VAACalcSad_sse2;
+VAACalcSadVarFunc       VAACalcSadVar_sse2;
+VAACalcSadSsdFunc       VAACalcSadSsd_sse2;
+VAACalcSadBgdFunc       VAACalcSadBgd_avx2;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_avx2;
+VAACalcSadFunc          VAACalcSad_avx2;
+VAACalcSadVarFunc       VAACalcSadVar_avx2;
+VAACalcSadSsdFunc       VAACalcSadSsd_avx2;
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON
+WELSVP_EXTERN_C_BEGIN
+VAACalcSadBgdFunc       VAACalcSadBgd_neon;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_neon;
+VAACalcSadFunc          VAACalcSad_neon;
+VAACalcSadVarFunc       VAACalcSadVar_neon;
+VAACalcSadSsdFunc       VAACalcSadSsd_neon;
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_NEON_AARCH64
+WELSVP_EXTERN_C_BEGIN
+VAACalcSadBgdFunc       VAACalcSadBgd_AArch64_neon;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_AArch64_neon;
+VAACalcSadFunc          VAACalcSad_AArch64_neon;
+VAACalcSadVarFunc       VAACalcSadVar_AArch64_neon;
+VAACalcSadSsdFunc       VAACalcSadSsd_AArch64_neon;
+WELSVP_EXTERN_C_END
+#endif
+
+#ifdef HAVE_MMI
+WELSVP_EXTERN_C_BEGIN
+VAACalcSadBgdFunc       VAACalcSadBgd_mmi;
+VAACalcSadSsdBgdFunc    VAACalcSadSsdBgd_mmi;
+VAACalcSadFunc          VAACalcSad_mmi;
+VAACalcSadVarFunc       VAACalcSadVar_mmi;
+VAACalcSadSsdFunc       VAACalcSadSsd_mmi;
+WELSVP_EXTERN_C_END
+#endif
+
+class CVAACalculation : public IStrategy {
+ public:
+  CVAACalculation (int32_t iCpuFlag);
+  ~CVAACalculation();
+
+  EResult Process (int32_t iType, SPixMap* pCurPixMap, SPixMap* pRefPixMap);
+  EResult Set (int32_t iType, void* pParam);
+
+ private:
+  void InitVaaFuncs (SVaaFuncs& sVaaFunc, int32_t iCpuFlag);
+
+ private:
+  SVaaFuncs      m_sVaaFuncs;
+  int32_t       m_iCPUFlag;
+  SVAACalcParam m_sCalcParam;
+};
+
+WELSVP_NAMESPACE_END
+
+#endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/denoisefilter.asm b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/denoisefilter.asm
new file mode 100644
index 0000000000..7d75e72c3a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/denoisefilter.asm
@@ -0,0 +1,284 @@
+;*!
+;* \copy
+;*     Copyright (c)  2010-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  predenoise.asm
+;*
+;*  Abstract
+;*      denoise for SVC2.1
+;*  History
+;*      4/13/2010 Created
+;*      7/30/2010 Modified
+;*
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+;***********************************************************************
+; Constant
+;***********************************************************************
+%ifdef X86_32_PICASM
+SECTION .text align=16
+%else
+SECTION .rodata align=16
+%endif
+
+sse2_32 times 8 dw 32
+sse2_20 times 8 dw 20
+
+
+
+;***********************************************************************
+; Code
+;***********************************************************************
+SECTION .text
+
+%macro WEIGHT_LINE  9
+    movq        %2, %9
+    punpcklbw   %2, %7
+    movdqa      %8, %2
+
+    movdqa      %1, %6
+    psubusb     %1, %8
+    psubusb     %8, %6
+    por         %8, %1      ; ABS(curPixel - centerPixel);
+
+    movdqa      %1, %3
+    psubusb     %1, %8
+
+    pmullw      %1, %1
+    psrlw       %1, 5
+    pmullw      %2, %1
+    paddusw     %4, %1
+    paddusw     %5, %2
+%endmacro
+
+%macro WEIGHT_LINE1_UV  4
+    movdqa      %2, %1
+    punpcklbw   %2, %4
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 1
+    punpcklbw   %2, %4
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 2
+    punpcklbw   %2, %4
+    psllw       %2, 1
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 3
+    punpcklbw   %2, %4
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 4
+    punpcklbw   %2, %4
+    paddw       %3, %2
+%endmacro
+
+%macro WEIGHT_LINE2_UV  4
+    movdqa      %2, %1
+    punpcklbw   %2, %4
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 1
+    punpcklbw   %2, %4
+    psllw       %2, 1
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 2
+    punpcklbw   %2, %4
+    psllw       %2, 2
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 3
+    punpcklbw   %2, %4
+    psllw       %2, 1
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 4
+    punpcklbw   %2, %4
+    paddw       %3, %2
+%endmacro
+
+%macro WEIGHT_LINE3_UV  4
+    movdqa      %2, %1
+    punpcklbw   %2, %4
+    psllw       %2, 1
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 1
+    punpcklbw   %2, %4
+    psllw       %2, 2
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 2
+    punpcklbw   %2, %4
+    pmullw      %2, [pic(sse2_20)]
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 3
+    punpcklbw   %2, %4
+    psllw       %2, 2
+    paddw       %3, %2
+
+    movdqa      %2, %1
+    psrldq      %2, 4
+    punpcklbw   %2, %4
+    psllw       %2, 1
+    paddw       %3, %2
+%endmacro
+
+;***********************************************************************
+;  BilateralLumaFilter8_sse2(uint8_t *pixels, int stride);
+;***********************************************************************
+;   1   2   3
+;   4   0   5
+;   6   7   8
+;   0:  the center point
+
+WELS_EXTERN BilateralLumaFilter8_sse2
+
+    push r3
+    %assign push_num 1
+    LOAD_2_PARA
+    PUSH_XMM 8
+
+    pxor        xmm7,   xmm7
+
+    mov         r3,     r0
+
+    movq        xmm6,   [r0]
+    punpcklbw   xmm6,   xmm7
+%ifdef X86_32_PICASM
+    pcmpeqw     xmm3,   xmm3
+    psrlw       xmm3,   15
+    psllw       xmm3,   5
+%else
+    movdqa      xmm3,   [sse2_32]
+%endif
+    pxor        xmm4,   xmm4        ; nTotWeight
+    pxor        xmm5,   xmm5        ; nSum
+
+    dec         r0
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0]           ; pixel 4
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0 + 2]       ; pixel 5
+
+    sub         r0, r1
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0]           ; pixel 1
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0 + 1]       ; pixel 2
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0 + 2]       ; pixel 3
+
+    lea         r0, [r0 + r1 * 2]
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0]           ; pixel 6
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0 + 1]       ; pixel 7
+    WEIGHT_LINE xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm0,  [r0 + 2]       ; pixel 8
+
+    pcmpeqw     xmm0,   xmm0
+    psrlw       xmm0,   15
+    psllw       xmm0,   8
+    psubusw     xmm0,   xmm4
+    pmullw      xmm0,   xmm6
+    paddusw     xmm5,   xmm0
+    psrlw       xmm5,   8
+    packuswb    xmm5,   xmm5
+    movq        [r3],   xmm5
+
+
+    POP_XMM
+    pop r3
+    %assign push_num 0
+
+    ret
+
+;***********************************************************************
+; void      WaverageChromaFilter8_sse2(uint8_t *pixels, int stride);
+;***********************************************************************
+;5x5 filter:
+;1  1   2   1   1
+;1  2   4   2   1
+;2  4   20  4   2
+;1  2   4   2   1
+;1  1   2   1   1
+
+WELS_EXTERN WaverageChromaFilter8_sse2
+
+    push r3
+
+    %assign push_num 1
+
+    INIT_X86_32_PIC r4
+    LOAD_2_PARA
+
+    mov     r3, r1
+    add     r3, r3
+    sub     r0, r3          ; pixels - 2 * stride
+    sub     r0, 2
+
+    pxor    xmm0,   xmm0
+    pxor    xmm3,   xmm3
+
+    movdqu      xmm1,   [r0]
+    WEIGHT_LINE1_UV xmm1,   xmm2,   xmm3,   xmm0
+
+    movdqu      xmm1,   [r0 + r1]
+    WEIGHT_LINE2_UV xmm1,   xmm2,   xmm3,   xmm0
+
+    add     r0, r3
+    movdqu      xmm1,   [r0]
+    WEIGHT_LINE3_UV xmm1,   xmm2,   xmm3,   xmm0
+
+    movdqu      xmm1,   [r0 + r1]
+    WEIGHT_LINE2_UV xmm1,   xmm2,   xmm3,   xmm0
+
+    movdqu      xmm1,   [r0 + r1 * 2]
+    WEIGHT_LINE1_UV xmm1,   xmm2,   xmm3,   xmm0
+
+    psrlw       xmm3,       6
+    packuswb    xmm3,       xmm3
+    movq        [r0 + 2],       xmm3
+
+
+    DEINIT_X86_32_PIC
+    pop r3
+
+    %assign push_num 0
+    ret
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/downsample_bilinear.asm b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/downsample_bilinear.asm
new file mode 100644
index 0000000000..ece7883ec6
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/downsample_bilinear.asm
@@ -0,0 +1,4686 @@
+;*!
+;* \copy
+;*     Copyright (c)  2009-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*  upsampling.asm
+;*
+;*  Abstract
+;*      SIMD for pixel domain down sampling
+;*
+;*  History
+;*      10/22/2009  Created
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+%ifdef __NASM_VER__
+    %use smartalign
+%endif
+
+;***********************************************************************
+; Macros and other preprocessor constants
+;***********************************************************************
+
+
+;***********************************************************************
+; Some constants
+;***********************************************************************
+
+;***********************************************************************
+; Local Data (Read Only)
+;***********************************************************************
+
+%ifdef X86_32_PICASM
+SECTION .text align=32
+%else
+SECTION .rodata align=32
+%endif
+
+;***********************************************************************
+; Various memory constants (trigonometric values or rounding values)
+;***********************************************************************
+
+ALIGN 32
+%ifndef X86_32_PICASM
+db80h_256:
+    times 32 db 80h
+shufb_0000000088888888:
+    times 8 db 0
+    times 8 db 8
+shufb_000044448888CCCC:
+    times 4 db 0
+    times 4 db 4
+    times 4 db 8
+    times 4 db 12
+%endif
+shufb_mask_low:
+    db 00h, 80h, 02h, 80h, 04h, 80h, 06h, 80h, 08h, 80h, 0ah, 80h, 0ch, 80h, 0eh, 80h
+shufb_mask_high:
+    db 01h, 80h, 03h, 80h, 05h, 80h, 07h, 80h, 09h, 80h, 0bh, 80h, 0dh, 80h, 0fh, 80h
+add_extra_half:
+    dd 16384,0,0,0
+
+shufb_mask_quarter:
+db 00h, 04h, 08h, 0ch, 80h, 80h, 80h, 80h, 01h, 05h, 09h, 0dh, 80h, 80h, 80h, 80h
+
+shufb_mask_onethird_low_1:
+db 00h, 03h, 06h, 09h, 0ch, 0fh, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h
+shufb_mask_onethird_low_2:
+db 80h, 80h, 80h, 80h, 80h, 80h, 02h, 05h, 08h, 0bh, 0eh, 80h, 80h, 80h, 80h, 80h
+shufb_mask_onethird_low_3:
+db 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 01h, 04h, 07h, 0ah, 0dh
+
+shufb_mask_onethird_high_1:
+db 01h, 04h, 07h, 0ah, 0dh, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h
+shufb_mask_onethird_high_2:
+db 80h, 80h, 80h, 80h, 80h, 00h, 03h, 06h, 09h, 0ch, 0fh, 80h, 80h, 80h, 80h, 80h
+shufb_mask_onethird_high_3:
+db 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 80h, 02h, 05h, 08h, 0bh, 0eh
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+;***********************************************************************
+;   void DyadicBilinearDownsamplerWidthx32_sse( unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearDownsamplerWidthx32_sse
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $01            ; iSrcHeight >> 1
+
+.yloops1:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+    sar r4, $01            ; iSrcWidth >> 1
+    mov r6, r4        ; iDstWidth restored at ebx
+    sar r4, $04            ; (iSrcWidth >> 1) / 16     ; loop count = num_of_mb
+    neg r6             ; - (iSrcWidth >> 1)
+    ; each loop = source bandwidth: 32 bytes
+.xloops1:
+    ; 1st part horizonal loop: x16 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  mm0: d D c C b B a A    mm1: h H g G f F e E
+    ;2nd Line Src:  mm2: l L k K j J i I    mm3: p P o O n N m M
+    ;=> target:
+    ;: H G F E D C B A, P O N M L K J I
+    ;: h g f e d c b a, p o n m l k j i
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movq mm0, [r2]         ; 1st pSrc line
+    movq mm1, [r2+8]       ; 1st pSrc line + 8
+    movq mm2, [r2+r3]     ; 2nd pSrc line
+    movq mm3, [r2+r3+8]   ; 2nd pSrc line + 8
+
+    ; to handle mm0, mm1, mm2, mm3
+    pshufw mm4, mm0, 0d8h   ; d D b B c C a A ; 11011000 B
+    pshufw mm5, mm4, 04eh   ; c C a A d D b B ; 01001110 B
+    punpcklbw mm4, mm5      ; d c D C b a B A
+    pshufw mm4, mm4, 0d8h   ; d c b a D C B A ; 11011000 B: mm4
+
+    pshufw mm5, mm1, 0d8h   ; h H f F g G e E ; 11011000 B
+    pshufw mm6, mm5, 04eh   ; g G e E h H f F ; 01001110 B
+    punpcklbw mm5, mm6      ; h g H G f e F E
+    pshufw mm5, mm5, 0d8h   ; h g f e H G F E ; 11011000 B: mm5
+
+    pshufw mm6, mm2, 0d8h   ; l L j J k K i I ; 11011000 B
+    pshufw mm7, mm6, 04eh   ; k K i I l L j J ; 01001110 B
+    punpcklbw mm6, mm7      ; l k L K j i J I
+    pshufw mm6, mm6, 0d8h   ; l k j i L K J I ; 11011000 B: mm6
+
+    pshufw mm7, mm3, 0d8h   ; p P n N o O m M ; 11011000 B
+    pshufw mm0, mm7, 04eh   ; o O m M p P n N ; 01001110 B
+    punpcklbw mm7, mm0      ; p o P O n m N M
+    pshufw mm7, mm7, 0d8h   ; p o n m P O N M ; 11011000 B: mm7
+
+    ; to handle mm4, mm5, mm6, mm7
+    movq mm0, mm4       ;
+    punpckldq mm0, mm5  ; H G F E D C B A
+    punpckhdq mm4, mm5  ; h g f e d c b a
+
+    movq mm1, mm6
+    punpckldq mm1, mm7  ; P O N M L K J I
+    punpckhdq mm6, mm7  ; p o n m l k j i
+
+    ; avg within MB horizon width (16 x 2 lines)
+    pavgb mm0, mm4      ; (A+a+1)>>1, .., (H+h+1)>>1, temp_row1
+    pavgb mm1, mm6      ; (I+i+1)>>1, .., (P+p+1)>>1, temp_row2
+    pavgb mm0, mm1      ; (temp_row1+temp_row2+1)>>1, pending here and wait another horizonal part done then write memory once
+
+    ; 2nd part horizonal loop: x16 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  mm0: d D c C b B a A    mm1: h H g G f F e E
+    ;2nd Line Src:  mm2: l L k K j J i I    mm3: p P o O n N m M
+    ;=> target:
+    ;: H G F E D C B A, P O N M L K J I
+    ;: h g f e d c b a, p o n m l k j i
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movq mm1, [r2+16]      ; 1st pSrc line + 16
+    movq mm2, [r2+24]      ; 1st pSrc line + 24
+    movq mm3, [r2+r3+16]  ; 2nd pSrc line + 16
+    movq mm4, [r2+r3+24]  ; 2nd pSrc line + 24
+
+    ; to handle mm1, mm2, mm3, mm4
+    pshufw mm5, mm1, 0d8h   ; d D b B c C a A ; 11011000 B
+    pshufw mm6, mm5, 04eh   ; c C a A d D b B ; 01001110 B
+    punpcklbw mm5, mm6      ; d c D C b a B A
+    pshufw mm5, mm5, 0d8h   ; d c b a D C B A ; 11011000 B: mm5
+
+    pshufw mm6, mm2, 0d8h   ; h H f F g G e E ; 11011000 B
+    pshufw mm7, mm6, 04eh   ; g G e E h H f F ; 01001110 B
+    punpcklbw mm6, mm7      ; h g H G f e F E
+    pshufw mm6, mm6, 0d8h   ; h g f e H G F E ; 11011000 B: mm6
+
+    pshufw mm7, mm3, 0d8h   ; l L j J k K i I ; 11011000 B
+    pshufw mm1, mm7, 04eh   ; k K i I l L j J ; 01001110 B
+    punpcklbw mm7, mm1      ; l k L K j i J I
+    pshufw mm7, mm7, 0d8h   ; l k j i L K J I ; 11011000 B: mm7
+
+    pshufw mm1, mm4, 0d8h   ; p P n N o O m M ; 11011000 B
+    pshufw mm2, mm1, 04eh   ; o O m M p P n N ; 01001110 B
+    punpcklbw mm1, mm2      ; p o P O n m N M
+    pshufw mm1, mm1, 0d8h   ; p o n m P O N M ; 11011000 B: mm1
+
+    ; to handle mm5, mm6, mm7, mm1
+    movq mm2, mm5
+    punpckldq mm2, mm6  ; H G F E D C B A
+    punpckhdq mm5, mm6  ; h g f e d c b a
+
+    movq mm3, mm7
+    punpckldq mm3, mm1  ; P O N M L K J I
+    punpckhdq mm7, mm1  ; p o n m l k j i
+
+    ; avg within MB horizon width (16 x 2 lines)
+    pavgb mm2, mm5      ; (A+a+1)>>1, .., (H+h+1)>>1, temp_row1
+    pavgb mm3, mm7      ; (I+i+1)>>1, .., (P+p+1)>>1, temp_row2
+    pavgb mm2, mm3      ; (temp_row1+temp_row2+1)>>1, done in another 2nd horizonal part
+
+    movq [r0  ], mm0
+    movq [r0+8], mm2
+
+    ; next SMB
+    lea r2, [r2+32]
+    lea r0, [r0+16]
+
+    dec r4
+    jg near .xloops1
+
+    ; next line
+    lea r2, [r2+2*r3]    ; next end of lines
+    lea r2, [r2+2*r6]    ; reset to base 0 [- 2 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops1
+
+    WELSEMMS
+%ifndef X86_32
+    pop r12
+%endif
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+;***********************************************************************
+;   void DyadicBilinearDownsamplerWidthx16_sse( unsigned char* pDst, const int iDstStride,
+;                     unsigned char* pSrc, const int iSrcStride,
+;                     const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearDownsamplerWidthx16_sse
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $01            ; iSrcHeight >> 1
+
+.yloops2:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+    sar r4, $01            ; iSrcWidth >> 1
+    mov r6, r4        ; iDstWidth restored at ebx
+    sar r4, $03            ; (iSrcWidth >> 1) / 8     ; loop count = num_of_mb
+    neg r6             ; - (iSrcWidth >> 1)
+    ; each loop = source bandwidth: 16 bytes
+.xloops2:
+    ; 1st part horizonal loop: x16 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  mm0: d D c C b B a A    mm1: h H g G f F e E
+    ;2nd Line Src:  mm2: l L k K j J i I    mm3: p P o O n N m M
+    ;=> target:
+    ;: H G F E D C B A, P O N M L K J I
+    ;: h g f e d c b a, p o n m l k j i
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movq mm0, [r2]         ; 1st pSrc line
+    movq mm1, [r2+8]       ; 1st pSrc line + 8
+    movq mm2, [r2+r3]     ; 2nd pSrc line
+    movq mm3, [r2+r3+8]   ; 2nd pSrc line + 8
+
+    ; to handle mm0, mm1, mm2, mm3
+    pshufw mm4, mm0, 0d8h   ; d D b B c C a A ; 11011000 B
+    pshufw mm5, mm4, 04eh   ; c C a A d D b B ; 01001110 B
+    punpcklbw mm4, mm5      ; d c D C b a B A
+    pshufw mm4, mm4, 0d8h   ; d c b a D C B A ; 11011000 B: mm4
+
+    pshufw mm5, mm1, 0d8h   ; h H f F g G e E ; 11011000 B
+    pshufw mm6, mm5, 04eh   ; g G e E h H f F ; 01001110 B
+    punpcklbw mm5, mm6      ; h g H G f e F E
+    pshufw mm5, mm5, 0d8h   ; h g f e H G F E ; 11011000 B: mm5
+
+    pshufw mm6, mm2, 0d8h   ; l L j J k K i I ; 11011000 B
+    pshufw mm7, mm6, 04eh   ; k K i I l L j J ; 01001110 B
+    punpcklbw mm6, mm7      ; l k L K j i J I
+    pshufw mm6, mm6, 0d8h   ; l k j i L K J I ; 11011000 B: mm6
+
+    pshufw mm7, mm3, 0d8h   ; p P n N o O m M ; 11011000 B
+    pshufw mm0, mm7, 04eh   ; o O m M p P n N ; 01001110 B
+    punpcklbw mm7, mm0      ; p o P O n m N M
+    pshufw mm7, mm7, 0d8h   ; p o n m P O N M ; 11011000 B: mm7
+
+    ; to handle mm4, mm5, mm6, mm7
+    movq mm0, mm4       ;
+    punpckldq mm0, mm5  ; H G F E D C B A
+    punpckhdq mm4, mm5  ; h g f e d c b a
+
+    movq mm1, mm6
+    punpckldq mm1, mm7  ; P O N M L K J I
+    punpckhdq mm6, mm7  ; p o n m l k j i
+
+    ; avg within MB horizon width (16 x 2 lines)
+    pavgb mm0, mm4      ; (A+a+1)>>1, .., (H+h+1)>>1, temp_row1
+    pavgb mm1, mm6      ; (I+i+1)>>1, .., (P+p+1)>>1, temp_row2
+    pavgb mm0, mm1      ; (temp_row1+temp_row2+1)>>1, pending here and wait another horizonal part done then write memory once
+
+    movq [r0  ], mm0
+
+    ; next SMB
+    lea r2, [r2+16]
+    lea r0, [r0+8]
+
+    dec r4
+    jg near .xloops2
+
+    ; next line
+    lea r2, [r2+2*r3]    ; next end of lines
+    lea r2, [r2+2*r6]    ; reset to base 0 [- 2 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops2
+
+    WELSEMMS
+%ifndef X86_32
+    pop r12
+%endif
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+;***********************************************************************
+;   void DyadicBilinearDownsamplerWidthx8_sse( unsigned char* pDst, const int iDstStride,
+;                     unsigned char* pSrc, const int iSrcStride,
+;                     const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearDownsamplerWidthx8_sse
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $01            ; iSrcHeight >> 1
+
+.yloops3:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+    sar r4, $01            ; iSrcWidth >> 1
+    mov r6, r4        ; iDstWidth restored at ebx
+    sar r4, $02            ; (iSrcWidth >> 1) / 4     ; loop count = num_of_mb
+    neg r6             ; - (iSrcWidth >> 1)
+    ; each loop = source bandwidth: 8 bytes
+.xloops3:
+    ; 1st part horizonal loop: x8 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  mm0: d D c C b B a A
+    ;2nd Line Src:  mm1: h H g G f F e E
+    ;=> target:
+    ;: H G F E D C B A
+    ;: h g f e d c b a
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movq mm0, [r2]         ; 1st pSrc line
+    movq mm1, [r2+r3]     ; 2nd pSrc line
+
+    ; to handle mm0, mm1, mm2, mm3
+    pshufw mm2, mm0, 0d8h   ; d D b B c C a A ; 11011000 B
+    pshufw mm3, mm2, 04eh   ; c C a A d D b B ; 01001110 B
+    punpcklbw mm2, mm3      ; d c D C b a B A
+    pshufw mm2, mm2, 0d8h   ; d c b a D C B A ; 11011000 B: mm4
+
+    pshufw mm4, mm1, 0d8h   ; h H f F g G e E ; 11011000 B
+    pshufw mm5, mm4, 04eh   ; g G e E h H f F ; 01001110 B
+    punpcklbw mm4, mm5      ; h g H G f e F E
+    pshufw mm4, mm4, 0d8h   ; h g f e H G F E ; 11011000 B: mm5
+
+    ; to handle mm2, mm4
+    movq mm0, mm2       ;
+    punpckldq mm0, mm4  ; H G F E D C B A
+    punpckhdq mm2, mm4  ; h g f e d c b a
+
+    ; avg within MB horizon width (16 x 2 lines)
+    pavgb mm0, mm2      ; (H+h+1)>>1, .., (A+a+1)>>1, temp_row1, 2
+    pshufw mm1, mm0, 04eh   ; 01001110 B
+    pavgb mm0, mm1      ; (temp_row1+temp_row2+1)>>1, pending here and wait another horizonal part done then write memory once
+
+    movd [r0], mm0
+
+    ; next unit
+    lea r2, [r2+8]
+    lea r0, [r0+4]
+
+    dec r4
+    jg near .xloops3
+
+    ; next line
+    lea r2, [r2+2*r3]    ; next end of lines
+    lea r2, [r2+2*r6]    ; reset to base 0 [- 2 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops3
+
+    WELSEMMS
+%ifndef X86_32
+    pop r12
+%endif
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+
+
+;***********************************************************************
+;   void DyadicBilinearDownsamplerWidthx32_ssse3(   unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearDownsamplerWidthx32_ssse3
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 4
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $01            ; iSrcHeight >> 1
+
+    WELS_DB1 xmm3
+    WELS_Zero xmm2
+    sar r4, $01            ; iSrcWidth >> 1
+    add r0, r4             ; pDst += iSrcWidth >> 1
+
+.yloops4:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+    sar r4, $01            ; iSrcWidth >> 1
+    neg r4                 ; -(iSrcWidth >> 1)
+    mov r6, r4
+    align 16
+    ; each loop = source bandwidth: 32 bytes
+.xloops4:
+    movdqa xmm0, [r2+r3]
+    movdqa xmm1, [r2+r3+16]
+    pavgb  xmm0, [r2]          ; avg vertical pixels 0-15
+    pavgb  xmm1, [r2+16]       ; avg vertical pixels 16-31
+    add r2, 32                 ; pSrc += 32
+    pmaddubsw xmm0, xmm3       ; pairwise horizontal sum neighboring pixels 0-15
+    pmaddubsw xmm1, xmm3       ; pairwise horizontal sum neighboring pixels 16-31
+    pavgw xmm0, xmm2           ; (sum + 1) >> 1
+    pavgw xmm1, xmm2           ; (sum + 1) >> 1
+    packuswb xmm0, xmm1        ; pack words to bytes
+    movdqa [r0+r4], xmm0       ; store results
+    add r4, 16
+    jl .xloops4
+
+    ; next line
+    lea r2, [r2+2*r3]    ; next end of lines
+    lea r2, [r2+2*r6]    ; reset to base 0 [- 2 * iDstWidth]
+    lea r0, [r0+r1]
+
+    sub r5, 1
+    jg .yloops4
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+;***********************************************************************
+;   void DyadicBilinearDownsamplerWidthx16_ssse3( unsigned char* pDst, const int iDstStride,
+;                     unsigned char* pSrc, const int iSrcStride,
+;                     const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearDownsamplerWidthx16_ssse3
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 4
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $01            ; iSrcHeight >> 1
+    WELS_DB1 xmm3
+    WELS_Zero xmm2
+    add r2, r4             ; pSrc += iSrcWidth
+    sar r4, $01            ; iSrcWidth >> 1
+    add r0, r4             ; pDst += iSrcWidth >> 1
+
+.yloops5:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+    sar r4, $01            ; iSrcWidth >> 1
+    neg r4                 ; -(iSrcWidth >> 1)
+    lea r6, [r2+r3]        ; pSrc + iSrcStride
+    align 16
+    ; each loop = source bandwidth: 16 bytes
+.xloops5:
+    movdqa xmm0, [r2+2*r4]
+    pavgb  xmm0, [r6+2*r4]     ; avg vertical pixels
+    pmaddubsw xmm0, xmm3       ; pairwise horizontal sum neighboring pixels
+    pavgw xmm0, xmm2           ; (sum + 1) >> 1
+    packuswb xmm0, xmm0        ; pack words to bytes
+    movlps [r0+r4], xmm0       ; store results
+    add r4, 8
+    jl .xloops5
+
+    ; next line
+    lea r2, [r2+2*r3]    ; next end of lines
+    lea r0, [r0+r1]
+
+    sub r5, 1
+    jg .yloops5
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+
+%ifdef X86_32
+;**************************************************************************************************************
+;int GeneralBilinearAccurateDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;                           unsigned char* pSrc, const int iSrcStride,
+;                           unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearAccurateDownsampler_sse2
+    push    ebp
+    push    esi
+    push    edi
+    push    ebx
+%define     pushsize    16
+%define     localsize   16
+%define     pDstData        esp + pushsize + localsize + 4
+%define     dwDstStride     esp + pushsize + localsize + 8
+%define     dwDstWidth      esp + pushsize + localsize + 12
+%define     dwDstHeight     esp + pushsize + localsize + 16
+%define     pSrcData        esp + pushsize + localsize + 20
+%define     dwSrcStride     esp + pushsize + localsize + 24
+%define     uiScaleX            esp + pushsize + localsize + 28
+%define     uiScaleY            esp + pushsize + localsize + 32
+%define     tmpHeight       esp + 0
+%define     yInverse        esp + 4
+%define     xInverse        esp + 8
+%define     dstStep         esp + 12
+    sub     esp,            localsize
+
+    pxor    xmm0,   xmm0
+    mov     eax,    [uiScaleX]
+    and     eax,    32767
+    mov     ebx,    eax
+    neg     ebx
+    and     ebx,    32767
+    movd    xmm1,       eax                     ; uinc(uiScaleX mod 32767)
+    movd    xmm2,       ebx                     ; -uinc
+    psllq   xmm1,       32
+    por     xmm1,       xmm2                    ; 0 0  uinc  -uinc   (dword)
+    pshufd  xmm7,       xmm1,   01000100b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     eax,    [uiScaleY]
+    and     eax,    32767
+    mov     ebx,    eax
+    neg     ebx
+    and     ebx,    32767
+    movd    xmm6,       eax                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       ebx                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 0 vinc -vinc (dword)
+    pshufd  xmm6,       xmm6,   01010000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     edx,        40003fffh
+    movd    xmm5,       edx
+    punpcklwd   xmm5,   xmm0                    ; 16384 16383
+    pshufd  xmm5,       xmm5,   01000100b       ; xmm5: 16384 16383 16384 16383
+
+
+DOWNSAMPLE:
+
+    mov     eax,            [dwDstHeight]
+    mov     edi,            [pDstData]
+    mov     edx,            [dwDstStride]
+    mov     ecx,            [dwDstWidth]
+    sub     edx,            ecx
+    mov     [dstStep],  edx             ; stride - width
+    dec     eax
+    mov     [tmpHeight],    eax
+    mov     eax,            16384
+    mov     [yInverse],     eax
+
+    pshufd  xmm4,       xmm5,   01010000b   ; initial v to 16384 16384 16383 16383
+
+HEIGHT:
+    mov     eax,    [yInverse]
+    mov     esi,    [pSrcData]
+    shr     eax,    15
+    mul     dword [dwSrcStride]
+    add     esi,    eax                 ; get current row address
+    mov     ebp,    esi
+    add     ebp,    [dwSrcStride]
+
+    mov     eax,        16384
+    mov     [xInverse],     eax
+    mov     ecx,            [dwDstWidth]
+    dec     ecx
+
+    movdqa  xmm3,       xmm5            ; initial u to 16384 16383 16384 16383
+
+WIDTH:
+    mov     eax,        [xInverse]
+    shr     eax,        15
+
+    movd    xmm1,       [esi+eax]       ; xxxxxxba
+    movd    xmm2,       [ebp+eax]       ; xxxxxxdc
+    pxor    xmm0,       xmm0
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+    punpcklwd   xmm1,   xmm0            ; 000d000c000b000a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmaddwd xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    movdqa  xmm0,   xmm2
+    pmuludq xmm2,   xmm1
+    psrlq   xmm0,   32
+    psrlq   xmm1,   32
+    pmuludq xmm0,   xmm1
+    paddq   xmm2,   xmm0
+    pshufd  xmm1,   xmm2,   00001110b
+    paddq   xmm2,   xmm1
+    psrlq   xmm2,   29
+
+    movd    eax,    xmm2
+    inc     eax
+    shr     eax,    1
+    mov     [edi],  al
+    inc     edi
+
+    mov     eax,        [uiScaleX]
+    add     [xInverse], eax
+
+    paddw   xmm3,       xmm7            ; inc u
+    psllw   xmm3,       1
+    psrlw   xmm3,       1
+
+    loop    WIDTH
+
+WIDTH_END:
+    mov     eax,        [xInverse]
+    shr     eax,        15
+    mov     cl,         [esi+eax]
+    mov     [edi],      cl
+    inc     edi
+
+    mov     eax,        [uiScaleY]
+    add     [yInverse], eax
+    add     edi,        [dstStep]
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     dword [tmpHeight]
+    jg      HEIGHT
+
+
+LAST_ROW:
+    mov     eax,    [yInverse]
+    mov     esi,    [pSrcData]
+    shr     eax,    15
+    mul     dword [dwSrcStride]
+    add     esi,    eax                 ; get current row address
+
+    mov     eax,        16384
+    mov     [xInverse],     eax
+    mov     ecx,            [dwDstWidth]
+
+LAST_ROW_WIDTH:
+    mov     eax,        [xInverse]
+    shr     eax,        15
+
+    mov     al,         [esi+eax]
+    mov     [edi],  al
+    inc     edi
+
+    mov     eax,        [uiScaleX]
+    add     [xInverse], eax
+
+    loop    LAST_ROW_WIDTH
+
+LAST_ROW_END:
+
+    add     esp,            localsize
+    pop     ebx
+    pop     edi
+    pop     esi
+    pop     ebp
+%undef      pushsize
+%undef      localsize
+%undef      pSrcData
+%undef      dwSrcWidth
+%undef      dwSrcHeight
+%undef      dwSrcStride
+%undef      pDstData
+%undef      dwDstWidth
+%undef      dwDstHeight
+%undef      dwDstStride
+%undef      uiScaleX
+%undef      uiScaleY
+%undef      tmpHeight
+%undef      yInverse
+%undef      xInverse
+%undef      dstStep
+    ret
+
+
+
+
+;**************************************************************************************************************
+;int GeneralBilinearFastDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;               unsigned char* pSrc, const int iSrcStride,
+;               unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearFastDownsampler_sse2
+    push    ebp
+    push    esi
+    push    edi
+    push    ebx
+%define     pushsize    16
+%define     localsize   16
+%define     pDstData        esp + pushsize + localsize + 4
+%define     dwDstStride     esp + pushsize + localsize + 8
+%define     dwDstWidth      esp + pushsize + localsize + 12
+%define     dwDstHeight     esp + pushsize + localsize + 16
+%define     pSrcData        esp + pushsize + localsize + 20
+%define     dwSrcStride     esp + pushsize + localsize + 24
+%define     uiScaleX            esp + pushsize + localsize + 28
+%define     uiScaleY            esp + pushsize + localsize + 32
+%define     tmpHeight       esp + 0
+%define     yInverse        esp + 4
+%define     xInverse        esp + 8
+%define     dstStep         esp + 12
+    sub     esp,            localsize
+
+    pxor    xmm0,   xmm0
+    mov     edx,    65535
+    mov     eax,    [uiScaleX]
+    and     eax,    edx
+    mov     ebx,    eax
+    neg     ebx
+    and     ebx,    65535
+    movd    xmm1,       eax                     ; uinc(uiScaleX mod 65536)
+    movd    xmm2,       ebx                     ; -uinc
+    psllq   xmm1,       32
+    por     xmm1,       xmm2                    ; 0 uinc 0 -uinc
+    pshuflw xmm7,       xmm1,   10001000b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     eax,    [uiScaleY]
+    and     eax,    32767
+    mov     ebx,    eax
+    neg     ebx
+    and     ebx,    32767
+    movd    xmm6,       eax                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       ebx                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 vinc 0 -vinc
+    pshuflw xmm6,       xmm6,   10100000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     edx,        80007fffh               ; 32768 32767
+    movd    xmm5,       edx
+    pshuflw xmm5,       xmm5,       01000100b   ; 32768 32767 32768 32767
+    mov     ebx,        16384
+
+
+FAST_DOWNSAMPLE:
+
+    mov     eax,            [dwDstHeight]
+    mov     edi,            [pDstData]
+    mov     edx,            [dwDstStride]
+    mov     ecx,            [dwDstWidth]
+    sub     edx,            ecx
+    mov     [dstStep],  edx             ; stride - width
+    dec     eax
+    mov     [tmpHeight],    eax
+    mov     eax,        16384
+    mov     [yInverse],     eax
+
+    pshuflw xmm4,       xmm5,   01010000b
+    psrlw   xmm4,       1               ; initial v to 16384 16384 16383 16383
+
+FAST_HEIGHT:
+    mov     eax,    [yInverse]
+    mov     esi,    [pSrcData]
+    shr     eax,    15
+    mul     dword [dwSrcStride]
+    add     esi,    eax                 ; get current row address
+    mov     ebp,    esi
+    add     ebp,    [dwSrcStride]
+
+    mov     eax,        32768
+    mov     [xInverse],     eax
+    mov     ecx,            [dwDstWidth]
+    dec     ecx
+
+    movdqa  xmm3,       xmm5            ; initial u to 32768 32767 32768 32767
+
+FAST_WIDTH:
+    mov     eax,        [xInverse]
+    shr     eax,        16
+
+    movd    xmm1,       [esi+eax]       ; xxxxxxba
+    movd    xmm2,       [ebp+eax]       ; xxxxxxdc
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmulhuw xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    pmaddwd     xmm2,   xmm1
+    pshufd  xmm1,   xmm2,   00000001b
+    paddd   xmm2,   xmm1
+    movd    xmm1,   ebx
+    paddd   xmm2,   xmm1
+    psrld   xmm2,   15
+
+    packuswb    xmm2,   xmm0
+    movd    eax,    xmm2
+    mov     [edi],  al
+    inc     edi
+
+    mov     eax,        [uiScaleX]
+    add     [xInverse], eax
+
+    paddw   xmm3,       xmm7            ; inc u
+
+    loop    FAST_WIDTH
+
+FAST_WIDTH_END:
+    mov     eax,        [xInverse]
+    shr     eax,        16
+    mov     cl,         [esi+eax]
+    mov     [edi],      cl
+    inc     edi
+
+    mov     eax,        [uiScaleY]
+    add     [yInverse], eax
+    add     edi,        [dstStep]
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     dword [tmpHeight]
+    jg      FAST_HEIGHT
+
+
+FAST_LAST_ROW:
+    mov     eax,    [yInverse]
+    mov     esi,    [pSrcData]
+    shr     eax,    15
+    mul     dword [dwSrcStride]
+    add     esi,    eax                 ; get current row address
+
+    mov     eax,        32768
+    mov     [xInverse],     eax
+    mov     ecx,            [dwDstWidth]
+
+FAST_LAST_ROW_WIDTH:
+    mov     eax,        [xInverse]
+    shr     eax,        16
+
+    mov     al,         [esi+eax]
+    mov     [edi],  al
+    inc     edi
+
+    mov     eax,        [uiScaleX]
+    add     [xInverse], eax
+
+    loop    FAST_LAST_ROW_WIDTH
+
+FAST_LAST_ROW_END:
+
+    add     esp,            localsize
+    pop     ebx
+    pop     edi
+    pop     esi
+    pop     ebp
+%undef      pushsize
+%undef      localsize
+%undef      pSrcData
+%undef      dwSrcWidth
+%undef      dwSrcHeight
+%undef      dwSrcStride
+%undef      pDstData
+%undef      dwDstStride
+%undef      uiScaleX
+%undef      uiScaleY
+%undef      tmpHeight
+%undef      yInverse
+%undef      xInverse
+%undef      dstStep
+    ret
+
+%elifdef  WIN64
+
+;**************************************************************************************************************
+;int GeneralBilinearAccurateDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;                           unsigned char* pSrc, const int iSrcStride,
+;                           unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearAccurateDownsampler_sse2
+    push    r12
+    push    r13
+    push    r14
+    push    r15
+    push    rsi
+    push    rdi
+    push    rbx
+    push    rbp
+    %assign push_num 8
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+    SIGN_EXTENSION r6, r6d
+
+    pxor    xmm0,   xmm0
+    mov     r12d,   r6d
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm1,   r12d                     ; uinc(uiScaleX mod 32767)
+    movd    xmm2,   r13d                     ; -uinc
+    psllq   xmm1,   32
+    por     xmm1,   xmm2                    ; 0 0  uinc  -uinc   (dword)
+    pshufd  xmm7,   xmm1,   01000100b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     r12,    arg8
+    SIGN_EXTENSION r12, r12d
+    mov     rbp,    r12
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm6,       r12d                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       r13d                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 0 vinc -vinc (dword)
+    pshufd  xmm6,       xmm6,   01010000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     r12d,        40003fffh
+    movd    xmm5,       r12d
+    punpcklwd   xmm5,   xmm0                    ; 16384 16383
+    pshufd  xmm5,       xmm5,   01000100b       ; xmm5: 16384 16383 16384 16383
+
+DOWNSAMPLE:
+    sub     r1, r2                   ; stride - width
+    dec     r3
+    mov     r14,16384
+    pshufd  xmm4,       xmm5,   01010000b   ; initial v to 16384 16384 16383 16383
+
+HEIGHT:
+    ;mov     r12, r4
+    mov     r12, r14
+    shr     r12,    15
+    imul    r12,    r5
+    add     r12,    r4                 ; get current row address
+    mov     r13,    r12
+    add     r13,    r5
+
+    mov     r15, 16384
+    mov     rsi, r2
+    dec     rsi
+    movdqa  xmm3,       xmm5            ; initial u to 16384 16383 16384 16383
+
+WIDTH:
+    mov     rdi,        r15
+    shr     rdi,        15
+
+    movd    xmm1,       [r12+rdi]       ; xxxxxxba
+    movd    xmm2,       [r13+rdi]       ; xxxxxxdc
+    pxor    xmm0,       xmm0
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+    punpcklwd   xmm1,   xmm0            ; 000d000c000b000a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmaddwd xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    movdqa  xmm0,   xmm2
+    pmuludq xmm2,   xmm1
+    psrlq   xmm0,   32
+    psrlq   xmm1,   32
+    pmuludq xmm0,   xmm1
+    paddq   xmm2,   xmm0
+    pshufd  xmm1,   xmm2,   00001110b
+    paddq   xmm2,   xmm1
+    psrlq   xmm2,   29
+
+    movd    ebx,    xmm2
+    inc     ebx
+    shr     ebx,    1
+    mov     [r0],   bl
+    inc     r0
+
+    add      r15, r6
+    paddw   xmm3,       xmm7            ; inc u
+    psllw   xmm3,       1
+    psrlw   xmm3,       1
+
+    dec     rsi
+    jg      WIDTH
+
+WIDTH_END:
+    shr     r15, 15
+    mov     bl,  [r12+r15]
+    mov     [r0],bl
+    inc     r0
+    add     r14, rbp
+    add     r0,  r1
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     r3
+    jg      HEIGHT
+
+LAST_ROW:
+    shr     r14, 15
+    imul    r14, r5
+    add     r4, r14
+    mov     r15, 16384
+
+LAST_ROW_WIDTH:
+    mov     rdi, r15
+    shr     rdi, 15
+    mov     bl,  [r4+rdi]
+    mov     [r0],bl
+    inc     r0
+
+    add     r15, r6
+    dec     r2
+    jg    LAST_ROW_WIDTH
+
+LAST_ROW_END:
+
+    POP_XMM
+    pop     rbp
+    pop     rbx
+    pop     rdi
+    pop     rsi
+    pop     r15
+    pop     r14
+    pop     r13
+    pop     r12
+    ret
+
+;**************************************************************************************************************
+;int GeneralBilinearFastDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;               unsigned char* pSrc, const int iSrcStride,
+;               unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearFastDownsampler_sse2
+    push    r12
+    push    r13
+    push    r14
+    push    r15
+    push    rsi
+    push    rdi
+    push    rbx
+    push    rbp
+    %assign push_num 8
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+    SIGN_EXTENSION r6, r6d
+
+    pxor    xmm0,   xmm0
+    mov     r12d,   r6d
+    and     r12d,   65535
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   65535
+    movd    xmm1,   r12d                     ; uinc(uiScaleX mod 65536)
+    movd    xmm2,   r13d                     ; -uinc
+    psllq   xmm1,   32
+    por     xmm1,   xmm2                    ; 0 uinc 0 -uinc
+    pshuflw xmm7,   xmm1,   10001000b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     r12,    arg8
+    SIGN_EXTENSION r12, r12d
+    mov     rbp,    r12
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm6,       r12d                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       r13d                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 vinc 0 -vinc
+    pshuflw xmm6,       xmm6,   10100000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     r12d,       80007fffh               ; 32768 32767
+    movd    xmm5,       r12d
+    pshuflw xmm5,       xmm5,       01000100b   ; 32768 32767 32768 32767
+
+FAST_DOWNSAMPLE:
+    sub     r1, r2                   ; stride - width
+    dec     r3
+    mov     r14,16384
+
+    pshuflw xmm4,       xmm5,   01010000b
+    psrlw   xmm4,       1               ; initial v to 16384 16384 16383 16383
+
+FAST_HEIGHT:
+    mov     r12, r14
+    shr     r12,    15
+    imul    r12,    r5
+    add     r12,    r4                 ; get current row address
+    mov     r13,    r12
+    add     r13,    r5
+
+    mov     r15, 32768
+    mov     rsi, r2
+    dec     rsi
+
+    movdqa  xmm3,       xmm5            ; initial u to 32768 32767 32768 32767
+
+FAST_WIDTH:
+    mov     rdi,        r15
+    shr     rdi,        16
+
+    movd    xmm1,       [r12+rdi]       ; xxxxxxba
+    movd    xmm2,       [r13+rdi]       ; xxxxxxdc
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmulhuw xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    pmaddwd     xmm2,   xmm1
+    pshufd  xmm1,   xmm2,   00000001b
+    paddd   xmm2,   xmm1
+    movdqa  xmm1,   [add_extra_half]
+    paddd   xmm2,   xmm1
+    psrld   xmm2,   15
+
+    packuswb    xmm2,   xmm0
+    movd    ebx,    xmm2
+    mov     [r0],  bl
+    inc     r0
+
+    add     r15, r6
+
+    paddw   xmm3,       xmm7            ; inc u
+    dec     rsi
+    jg      FAST_WIDTH
+
+FAST_WIDTH_END:
+    shr     r15, 16
+    mov     bl,  [r12+r15]
+    mov     [r0],bl
+    inc     r0
+    add     r14, rbp
+    add     r0,  r1
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     r3
+    jg      FAST_HEIGHT
+
+
+FAST_LAST_ROW:
+    shr     r14, 15
+    imul    r14, r5
+    add     r4, r14
+    mov     r15, 32768
+
+FAST_LAST_ROW_WIDTH:
+    mov     rdi, r15
+    shr     rdi, 16
+    mov     bl,  [r4+rdi]
+    mov     [r0],bl
+    inc     r0
+
+    add     r15, r6
+    dec     r2
+    jg      FAST_LAST_ROW_WIDTH
+
+FAST_LAST_ROW_END:
+
+    POP_XMM
+    pop     rbp
+    pop     rbx
+    pop     rdi
+    pop     rsi
+    pop     r15
+    pop     r14
+    pop     r13
+    pop     r12
+    ret
+
+%elifdef  UNIX64
+
+;**************************************************************************************************************
+;int GeneralBilinearAccurateDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;                           unsigned char* pSrc, const int iSrcStride,
+;                           unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearAccurateDownsampler_sse2
+    push    r12
+    push    r13
+    push    r14
+    push    r15
+    push    rbx
+    push    rbp
+    %assign push_num 6
+    LOAD_7_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+    SIGN_EXTENSION r6, r6d
+
+    pxor    xmm0,   xmm0
+    mov     r12d,   r6d
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm1,   r12d                     ; uinc(uiScaleX mod 32767)
+    movd    xmm2,   r13d                     ; -uinc
+    psllq   xmm1,   32
+    por     xmm1,   xmm2                    ; 0 0  uinc  -uinc   (dword)
+    pshufd  xmm7,   xmm1,   01000100b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     r12,    arg8
+    SIGN_EXTENSION r12, r12d
+    mov     rbp,    r12
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm6,       r12d                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       r13d                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 0 vinc -vinc (dword)
+    pshufd  xmm6,       xmm6,   01010000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     r12d,        40003fffh
+    movd    xmm5,       r12d
+    punpcklwd   xmm5,   xmm0                    ; 16384 16383
+    pshufd  xmm5,       xmm5,   01000100b       ; xmm5: 16384 16383 16384 16383
+
+DOWNSAMPLE:
+    sub     r1, r2                   ; stride - width
+    dec     r3
+    mov     r14,16384
+    pshufd  xmm4,       xmm5,   01010000b   ; initial v to 16384 16384 16383 16383
+
+HEIGHT:
+    ;mov     r12, r4
+    mov     r12, r14
+    shr     r12,    15
+    imul    r12,    r5
+    add     r12,    r4                 ; get current row address
+    mov     r13,    r12
+    add     r13,    r5
+
+    mov     r15, 16384
+    mov     rax, r2
+    dec     rax
+    movdqa  xmm3,       xmm5            ; initial u to 16384 16383 16384 16383
+
+WIDTH:
+    mov     r11,        r15
+    shr     r11,        15
+
+    movd    xmm1,       [r12+r11]       ; xxxxxxba
+    movd    xmm2,       [r13+r11]       ; xxxxxxdc
+    pxor    xmm0,       xmm0
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+    punpcklwd   xmm1,   xmm0            ; 000d000c000b000a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmaddwd xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    movdqa  xmm0,   xmm2
+    pmuludq xmm2,   xmm1
+    psrlq   xmm0,   32
+    psrlq   xmm1,   32
+    pmuludq xmm0,   xmm1
+    paddq   xmm2,   xmm0
+    pshufd  xmm1,   xmm2,   00001110b
+    paddq   xmm2,   xmm1
+    psrlq   xmm2,   29
+
+    movd    ebx,    xmm2
+    inc     ebx
+    shr     ebx,    1
+    mov     [r0],   bl
+    inc     r0
+
+    add      r15, r6
+    paddw   xmm3,       xmm7            ; inc u
+    psllw   xmm3,       1
+    psrlw   xmm3,       1
+
+    dec     rax
+    jg      WIDTH
+
+WIDTH_END:
+    shr     r15, 15
+    mov     bl,  [r12+r15]
+    mov     [r0],bl
+    inc     r0
+    add     r14, rbp
+    add     r0,  r1
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     r3
+    jg      HEIGHT
+
+LAST_ROW:
+    shr     r14, 15
+    imul    r14, r5
+    add     r4, r14
+    mov     r15, 16384
+
+LAST_ROW_WIDTH:
+    mov     r11, r15
+    shr     r11, 15
+    mov     bl,  [r4+r11]
+    mov     [r0],bl
+    inc     r0
+
+    add     r15, r6
+    dec     r2
+    jg    LAST_ROW_WIDTH
+
+LAST_ROW_END:
+
+    pop     rbp
+    pop     rbx
+    pop     r15
+    pop     r14
+    pop     r13
+    pop     r12
+    ret
+
+;**************************************************************************************************************
+;int GeneralBilinearFastDownsampler_sse2(   unsigned char* pDst, const int iDstStride, const int iDstWidth, const int iDstHeight,
+;               unsigned char* pSrc, const int iSrcStride,
+;               unsigned int uiScaleX, unsigned int uiScaleY );
+;{
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearFastDownsampler_sse2
+    push    r12
+    push    r13
+    push    r14
+    push    r15
+    push    rbx
+    push    rbp
+    %assign push_num 6
+    LOAD_7_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r5, r5d
+    SIGN_EXTENSION r6, r6d
+
+    pxor    xmm0,   xmm0
+    mov     r12d,   r6d
+    and     r12d,   65535
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   65535
+    movd    xmm1,   r12d                     ; uinc(uiScaleX mod 65536)
+    movd    xmm2,   r13d                     ; -uinc
+    psllq   xmm1,   32
+    por     xmm1,   xmm2                    ; 0 uinc 0 -uinc
+    pshuflw xmm7,   xmm1,   10001000b       ; xmm7: uinc -uinc uinc -uinc
+
+    mov     r12,    arg8
+    SIGN_EXTENSION r12, r12d
+    mov     rbp,    r12
+    and     r12d,   32767
+    mov     r13d,   r12d
+    neg     r13d
+    and     r13d,   32767
+    movd    xmm6,       r12d                     ; vinc(uiScaleY mod 32767)
+    movd    xmm2,       r13d                     ; -vinc
+    psllq   xmm6,       32
+    por     xmm6,       xmm2                    ; 0 vinc 0 -vinc
+    pshuflw xmm6,       xmm6,   10100000b       ; xmm6: vinc vinc -vinc -vinc
+
+    mov     r12d,       80007fffh               ; 32768 32767
+    movd    xmm5,       r12d
+    pshuflw xmm5,       xmm5,       01000100b   ; 32768 32767 32768 32767
+
+FAST_DOWNSAMPLE:
+    sub     r1, r2                   ; stride - width
+    dec     r3
+    mov     r14,16384
+
+    pshuflw xmm4,       xmm5,   01010000b
+    psrlw   xmm4,       1               ; initial v to 16384 16384 16383 16383
+
+FAST_HEIGHT:
+    mov     r12, r14
+    shr     r12,    15
+    imul    r12,    r5
+    add     r12,    r4                 ; get current row address
+    mov     r13,    r12
+    add     r13,    r5
+
+    mov     r15, 32768
+    mov     rax, r2
+    dec     rax
+
+    movdqa  xmm3,       xmm5            ; initial u to 32768 32767 32768 32767
+
+FAST_WIDTH:
+    mov     r11,        r15
+    shr     r11,        16
+
+    movd    xmm1,       [r12+r11]       ; xxxxxxba
+    movd    xmm2,       [r13+r11]       ; xxxxxxdc
+    punpcklwd   xmm1,   xmm2            ; xxxxdcba
+    punpcklbw   xmm1,   xmm0            ; 0d0c0b0a
+
+    movdqa  xmm2,   xmm4    ; xmm2:  vv(1-v)(1-v)  tmpv
+    pmulhuw xmm2,   xmm3    ; mul u(1-u)u(1-u) on xmm2
+    pmaddwd     xmm2,   xmm1
+    pshufd  xmm1,   xmm2,   00000001b
+    paddd   xmm2,   xmm1
+    movdqa  xmm1,   [add_extra_half]
+    paddd   xmm2,   xmm1
+    psrld   xmm2,   15
+
+    packuswb    xmm2,   xmm0
+    movd    ebx,    xmm2
+    mov     [r0],  bl
+    inc     r0
+
+    add     r15, r6
+
+    paddw   xmm3,       xmm7            ; inc u
+    dec     rax
+    jg      FAST_WIDTH
+
+FAST_WIDTH_END:
+    shr     r15, 16
+    mov     bl,  [r12+r15]
+    mov     [r0],bl
+    inc     r0
+    add     r14, rbp
+    add     r0,  r1
+
+    paddw   xmm4,   xmm6                ; inc v
+    psllw   xmm4,   1
+    psrlw   xmm4,   1
+
+    dec     r3
+    jg      FAST_HEIGHT
+
+
+FAST_LAST_ROW:
+    shr     r14, 15
+    imul    r14, r5
+    add     r4, r14
+    mov     r15, 32768
+
+FAST_LAST_ROW_WIDTH:
+    mov     r11, r15
+    shr     r11, 16
+    mov     bl,  [r4+r11]
+    mov     [r0],bl
+    inc     r0
+
+    add     r15, r6
+    dec     r2
+    jg      FAST_LAST_ROW_WIDTH
+
+FAST_LAST_ROW_END:
+
+    pop     rbp
+    pop     rbx
+    pop     r15
+    pop     r14
+    pop     r13
+    pop     r12
+    ret
+%endif
+
+;***********************************************************************
+;   void DyadicBilinearOneThirdDownsampler_ssse3(    unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearOneThirdDownsampler_ssse3
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+%ifdef X86_32_PICASM
+    %define i_height dword arg6
+%else
+    %define i_height r5
+%endif
+    INIT_X86_32_PIC_NOPRESERVE r5
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+
+    mov r6, r1             ;Save the tailer for the unasigned size
+    imul r6, i_height
+    add r6, r0
+    movdqa xmm7, [r6]
+
+.yloops_onethird_sse3:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+
+    mov r6, r0        ;save base address
+    ; each loop = source bandwidth: 48 bytes
+.xloops_onethird_sse3:
+    ; 1st part horizonal loop: x48 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  xmm0: F * e E * d D * c C * b B * a A
+    ;               xmm2: k K * j J * i I * h H * g G * f
+    ;               xmm2: * p P * o O * n N * m M * l L *
+    ;
+    ;2nd Line Src:  xmm2: F' *  e' E' *  d' D' *  c' C' *  b' B' *  a' A'
+    ;               xmm1: k' K' *  j' J' *  i' I' *  h' H' *  g' G' *  f'
+    ;               xmm1: *  p' P' *  o' O' *  n' N' *  m' M' *  l' L' *
+    ;=> target:
+    ;: P O N M L K J I H G F E D C B A
+    ;: p o n m l k j i h g f e d c b a
+    ;: P' ..                          A'
+    ;: p' ..                          a'
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;1st line
+    movdqa xmm0, [r2]                         ;F * e E * d D * c C * b B * a A
+    movdqa xmm1, xmm0
+    movdqa xmm5, [pic(shufb_mask_onethird_low_1)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_1)]
+    pshufb xmm0, xmm5                           ;0 0 0 0 0 0 0 0 0 0 F E D C B A -> xmm0
+    pshufb xmm1, xmm6                           ;0 0 0 0 0 0 0 0 0 0 0 e d c b a -> xmm1
+
+    movdqa xmm2, [r2+16]                      ;k K * j J * i I * h H * g G * f
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_2)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_2)]
+    pshufb xmm2, xmm5                           ;0 0 0 0 0 K J I H G 0 0 0 0 0 0 -> xmm2
+    pshufb xmm3, xmm6                           ;0 0 0 0 0 k j i h g f 0 0 0 0 0 -> xmm3
+
+    paddusb xmm0, xmm2                          ;0 0 0 0 0 K J I H G F E D C B A -> xmm0
+    paddusb xmm1, xmm3                          ;0 0 0 0 0 k j i h g f e d c b a -> xmm1
+
+    movdqa xmm2, [r2+32]                      ;* p P * o O * n N * m M * l L *
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_3)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_3)]
+    pshufb xmm2, xmm5                           ;P O N M L 0 0 0 0 0 0 0 0 0 0 0 -> xmm2
+    pshufb xmm3, xmm6                           ;p o n m l 0 0 0 0 0 0 0 0 0 0 0 -> xmm3
+
+    paddusb xmm0, xmm2                          ;P O N M L K J I H G F E D C B A -> xmm0
+    paddusb xmm1, xmm3                          ;p o n m l k j i h g f e d c b a -> xmm1
+    pavgb xmm0, xmm1                            ;1st line average                -> xmm0
+
+    ;2nd line
+    movdqa xmm2, [r2+r3]                      ;F' *  e' E' *  d' D' *  c' C' *  b' B' *  a' A'
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_1)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_1)]
+    pshufb xmm2, xmm5                           ;0 0 0 0 0 0 0 0 0 0 F' E' D' C' B' A' -> xmm2
+    pshufb xmm3, xmm6                           ;0 0 0 0 0 0 0 0 0 0 0  e' d' c' b' a' -> xmm3
+
+    movdqa xmm1, [r2+r3+16]                   ;k' K' *  j' J' *  i' I' *  h' H' *  g' G' *  f'
+    movdqa xmm4, xmm1
+    movdqa xmm5, [pic(shufb_mask_onethird_low_2)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_2)]
+    pshufb xmm1, xmm5                           ;0 0 0 0 0 K' J' I' H' G' 0  0 0 0 0 0 -> xmm1
+    pshufb xmm4, xmm6                           ;0 0 0 0 0 k' j' i' h' g' f' 0 0 0 0 0 -> xmm4
+
+    paddusb xmm2, xmm1                          ;0 0 0 0 0 K' J' I' H' G' F' E' D' C' B' A' -> xmm2
+    paddusb xmm3, xmm4                          ;0 0 0 0 0 k' j' i' h' g' f' e' d' c' b' a' -> xmm3
+
+    movdqa xmm1, [r2+r3+32]                   ; *  p' P' *  o' O' *  n' N' *  m' M' *  l' L' *
+    movdqa xmm4, xmm1
+    movdqa xmm5, [pic(shufb_mask_onethird_low_3)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_3)]
+    pshufb xmm1, xmm5                           ;P' O' N' M' L' 0 0 0 0 0 0 0 0 0 0 0 -> xmm1
+    pshufb xmm4, xmm6                           ;p' o' n' m' l' 0 0 0 0 0 0 0 0 0 0 0 -> xmm4
+
+    paddusb xmm2, xmm1                          ;P' O' N' M' L' K' J' I' H' G' F' E' D' C' B' A' -> xmm2
+    paddusb xmm3, xmm4                          ;p' o' n' m' l' k' j' i' h' g' f' e' d' c' b' a' -> xmm3
+    pavgb xmm2, xmm3                            ;2nd line average                                -> xmm2
+
+    pavgb xmm0, xmm2                            ; bytes-average(1st line , 2nd line )
+
+    ; write pDst
+    movdqa [r0], xmm0                           ;write result in dst
+
+    ; next SMB
+    lea r2, [r2+48]                             ;current src address
+    lea r0, [r0+16]                             ;current dst address
+
+    sub r4, 48                                  ;xloops counter
+    cmp r4, 0
+    jg near .xloops_onethird_sse3
+
+    sub r6, r0                                  ;offset = base address - current address
+    lea r2, [r2+2*r3]                           ;
+    lea r2, [r2+r3]                             ;
+    lea r2, [r2+2*r6]                           ;current line + 3 lines
+    lea r2, [r2+r6]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]                             ;current dst lien + 1 line
+
+    dec i_height
+    jg near .yloops_onethird_sse3
+
+    movdqa [r0], xmm7                           ;restore the tailer for the unasigned size
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+%undef i_height
+
+;***********************************************************************
+;   void DyadicBilinearOneThirdDownsampler_sse4(    unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearOneThirdDownsampler_sse4
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+%ifdef X86_32_PICASM
+    %define i_height dword arg6
+%else
+    %define i_height r5
+%endif
+    INIT_X86_32_PIC_NOPRESERVE r5
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+
+    mov r6, r1             ;Save the tailer for the unasigned size
+    imul r6, i_height
+    add r6, r0
+    movdqa xmm7, [r6]
+
+.yloops_onethird_sse4:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+
+    mov r6, r0        ;save base address
+    ; each loop = source bandwidth: 48 bytes
+.xloops_onethird_sse4:
+    ; 1st part horizonal loop: x48 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  xmm0: F * e E * d D * c C * b B * a A
+    ;               xmm2: k K * j J * i I * h H * g G * f
+    ;               xmm2: * p P * o O * n N * m M * l L *
+    ;
+    ;2nd Line Src:  xmm2: F' *  e' E' *  d' D' *  c' C' *  b' B' *  a' A'
+    ;               xmm1: k' K' *  j' J' *  i' I' *  h' H' *  g' G' *  f'
+    ;               xmm1: *  p' P' *  o' O' *  n' N' *  m' M' *  l' L' *
+    ;=> target:
+    ;: P O N M L K J I H G F E D C B A
+    ;: p o n m l k j i h g f e d c b a
+    ;: P' ..                          A'
+    ;: p' ..                          a'
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    ;1st line
+    movntdqa xmm0, [r2]                         ;F * e E * d D * c C * b B * a A
+    movdqa xmm1, xmm0
+    movdqa xmm5, [pic(shufb_mask_onethird_low_1)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_1)]
+    pshufb xmm0, xmm5                           ;0 0 0 0 0 0 0 0 0 0 F E D C B A -> xmm0
+    pshufb xmm1, xmm6                           ;0 0 0 0 0 0 0 0 0 0 0 e d c b a -> xmm1
+
+    movntdqa xmm2, [r2+16]                      ;k K * j J * i I * h H * g G * f
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_2)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_2)]
+    pshufb xmm2, xmm5                           ;0 0 0 0 0 K J I H G 0 0 0 0 0 0 -> xmm2
+    pshufb xmm3, xmm6                           ;0 0 0 0 0 k j i h g f 0 0 0 0 0 -> xmm3
+
+    paddusb xmm0, xmm2                          ;0 0 0 0 0 K J I H G F E D C B A -> xmm0
+    paddusb xmm1, xmm3                          ;0 0 0 0 0 k j i h g f e d c b a -> xmm1
+
+    movntdqa xmm2, [r2+32]                      ;* p P * o O * n N * m M * l L *
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_3)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_3)]
+    pshufb xmm2, xmm5                           ;P O N M L 0 0 0 0 0 0 0 0 0 0 0 -> xmm2
+    pshufb xmm3, xmm6                           ;p o n m l 0 0 0 0 0 0 0 0 0 0 0 -> xmm3
+
+    paddusb xmm0, xmm2                          ;P O N M L K J I H G F E D C B A -> xmm0
+    paddusb xmm1, xmm3                          ;p o n m l k j i h g f e d c b a -> xmm1
+    pavgb xmm0, xmm1                            ;1st line average                -> xmm0
+
+    ;2nd line
+    movntdqa xmm2, [r2+r3]                      ;F' *  e' E' *  d' D' *  c' C' *  b' B' *  a' A'
+    movdqa xmm3, xmm2
+    movdqa xmm5, [pic(shufb_mask_onethird_low_1)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_1)]
+    pshufb xmm2, xmm5                           ;0 0 0 0 0 0 0 0 0 0 F' E' D' C' B' A' -> xmm2
+    pshufb xmm3, xmm6                           ;0 0 0 0 0 0 0 0 0 0 0  e' d' c' b' a' -> xmm3
+
+    movntdqa xmm1, [r2+r3+16]                   ;k' K' *  j' J' *  i' I' *  h' H' *  g' G' *  f'
+    movdqa xmm4, xmm1
+    movdqa xmm5, [pic(shufb_mask_onethird_low_2)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_2)]
+    pshufb xmm1, xmm5                           ;0 0 0 0 0 K' J' I' H' G' 0  0 0 0 0 0 -> xmm1
+    pshufb xmm4, xmm6                           ;0 0 0 0 0 k' j' i' h' g' f' 0 0 0 0 0 -> xmm4
+
+    paddusb xmm2, xmm1                          ;0 0 0 0 0 K' J' I' H' G' F' E' D' C' B' A' -> xmm2
+    paddusb xmm3, xmm4                          ;0 0 0 0 0 k' j' i' h' g' f' e' d' c' b' a' -> xmm3
+
+    movntdqa xmm1, [r2+r3+32]                   ; *  p' P' *  o' O' *  n' N' *  m' M' *  l' L' *
+    movdqa xmm4, xmm1
+    movdqa xmm5, [pic(shufb_mask_onethird_low_3)]
+    movdqa xmm6, [pic(shufb_mask_onethird_high_3)]
+    pshufb xmm1, xmm5                           ;P' O' N' M' L' 0 0 0 0 0 0 0 0 0 0 0 -> xmm1
+    pshufb xmm4, xmm6                           ;p' o' n' m' l' 0 0 0 0 0 0 0 0 0 0 0 -> xmm4
+
+    paddusb xmm2, xmm1                          ;P' O' N' M' L' K' J' I' H' G' F' E' D' C' B' A' -> xmm2
+    paddusb xmm3, xmm4                          ;p' o' n' m' l' k' j' i' h' g' f' e' d' c' b' a' -> xmm3
+    pavgb xmm2, xmm3                            ;2nd line average                                -> xmm2
+
+    pavgb xmm0, xmm2                            ; bytes-average(1st line , 2nd line )
+
+    ; write pDst
+    movdqa [r0], xmm0                           ;write result in dst
+
+    ; next SMB
+    lea r2, [r2+48]                             ;current src address
+    lea r0, [r0+16]                             ;current dst address
+
+    sub r4, 48                                  ;xloops counter
+    cmp r4, 0
+    jg near .xloops_onethird_sse4
+
+    sub r6, r0                                  ;offset = base address - current address
+    lea r2, [r2+2*r3]                           ;
+    lea r2, [r2+r3]                             ;
+    lea r2, [r2+2*r6]                           ;current line + 3 lines
+    lea r2, [r2+r6]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]                             ;current dst lien + 1 line
+
+    dec i_height
+    jg near .yloops_onethird_sse4
+
+    movdqa [r0], xmm7                           ;restore the tailer for the unasigned size
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    DEINIT_X86_32_PIC
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+%undef i_height
+
+;***********************************************************************
+;   void DyadicBilinearQuarterDownsampler_sse( unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearQuarterDownsampler_sse
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $02            ; iSrcHeight >> 2
+
+    mov r6, r1             ;Save the tailer for the unasigned size
+    imul r6, r5
+    add r6, r0
+    movq xmm7, [r6]
+
+.yloops_quarter_sse:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+
+    mov r6, r0        ;save base address
+    ; each loop = source bandwidth: 32 bytes
+.xloops_quarter_sse:
+    ; 1st part horizonal loop: x16 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  mm0: d D c C b B a A    mm1: h H g G f F e E
+    ;2nd Line Src:  mm2: l L k K j J i I    mm3: p P o O n N m M
+    ;
+    ;=> target:
+    ;: G E C A,
+    ;:
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movq mm0, [r2]         ; 1st pSrc line
+    movq mm1, [r2+8]       ; 1st pSrc line + 8
+    movq mm2, [r2+r3]     ; 2nd pSrc line
+    movq mm3, [r2+r3+8]   ; 2nd pSrc line + 8
+
+    pshufw mm0, mm0, 0d8h    ; x X x X c C a A
+    pshufw mm1, mm1, 0d8h    ; x X x X g G e E
+    pshufw mm2, mm2, 0d8h    ; x X x X k K i I
+    pshufw mm3, mm3, 0d8h    ; x X x X o O m M
+
+    punpckldq mm0, mm1       ; g G e E c C a A
+    punpckldq mm2, mm3       ; o O m M k K i I
+
+    ; to handle mm0,mm2
+    pshufw mm4, mm0, 0d8h       ;g G c C e E a A
+    pshufw mm5, mm4, 04eh       ;e E a A g G c C
+    punpcklbw mm4, mm5          ;g e G E c a C A  -> mm4
+    pshufw mm4, mm4, 0d8h       ;g e c a G E C A  -> mm4
+
+    pshufw mm5, mm2, 0d8h       ;o O k K m M i I
+    pshufw mm6, mm5, 04eh       ;m M i I o O k K
+    punpcklbw mm5, mm6          ;o m O M k i K I
+    pshufw mm5, mm5, 0d8h       ;o m k i O M K I  -> mm5
+
+    ; to handle mm4, mm5
+    movq mm0, mm4
+    punpckldq mm0, mm6          ;x x x x G E C A
+    punpckhdq mm4, mm6          ;x x x x g e c a
+
+    movq mm1, mm5
+    punpckldq mm1, mm6          ;x x x x O M K I
+    punpckhdq mm5, mm6          ;x x x x o m k i
+
+    ; avg within MB horizon width (8 x 2 lines)
+    pavgb mm0, mm4      ; (A+a+1)>>1, .., (H+h+1)>>1, temp_row1
+    pavgb mm1, mm5      ; (I+i+1)>>1, .., (P+p+1)>>1, temp_row2
+    pavgb mm0, mm1      ; (temp_row1+temp_row2+1)>>1, pending here and wait another horizonal part done then write memory once
+
+    ; 2nd part horizonal loop: x16 bytes
+    movq mm1, [r2+16]      ; 1st pSrc line + 16
+    movq mm2, [r2+24]      ; 1st pSrc line + 24
+    movq mm3, [r2+r3+16]  ; 2nd pSrc line + 16
+    movq mm4, [r2+r3+24]  ; 2nd pSrc line + 24
+
+    pshufw mm1, mm1, 0d8h
+    pshufw mm2, mm2, 0d8h
+    pshufw mm3, mm3, 0d8h
+    pshufw mm4, mm4, 0d8h
+
+    punpckldq mm1, mm2
+    punpckldq mm3, mm4
+
+    ; to handle mm1, mm3
+    pshufw mm4, mm1, 0d8h
+    pshufw mm5, mm4, 04eh
+    punpcklbw mm4, mm5
+    pshufw mm4, mm4, 0d8h
+
+    pshufw mm5, mm3, 0d8h
+    pshufw mm6, mm5, 04eh
+    punpcklbw mm5, mm6
+    pshufw mm5, mm5, 0d8h
+
+    ; to handle mm4, mm5
+    movq mm2, mm4
+    punpckldq mm2, mm6
+    punpckhdq mm4, mm6
+
+    movq mm3, mm5
+    punpckldq mm3, mm6
+    punpckhdq mm5, mm6
+
+    ; avg within MB horizon width (8 x 2 lines)
+    pavgb mm2, mm4      ; (A+a+1)>>1, .., (H+h+1)>>1, temp_row1
+    pavgb mm3, mm5      ; (I+i+1)>>1, .., (P+p+1)>>1, temp_row2
+    pavgb mm2, mm3      ; (temp_row1+temp_row2+1)>>1, done in another 2nd horizonal part
+
+    movd [r0  ], mm0
+    movd [r0+4], mm2
+
+    ; next SMB
+    lea r2, [r2+32]
+    lea r0, [r0+8]
+
+    sub r4, 32
+    cmp r4, 0
+    jg near .xloops_quarter_sse
+
+    sub  r6, r0
+    ; next line
+    lea r2, [r2+4*r3]    ; next 4 end of lines
+    lea r2, [r2+4*r6]    ; reset to base 0 [- 4 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops_quarter_sse
+
+    movq [r0], xmm7      ;restored the tailer for the unasigned size
+
+    WELSEMMS
+%ifndef X86_32
+    pop r12
+%endif
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+;***********************************************************************
+;   void DyadicBilinearQuarterDownsampler_ssse3(   unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearQuarterDownsampler_ssse3
+    ;push ebx
+    ;push edx
+    ;push esi
+    ;push edi
+    ;push ebp
+
+    ;mov edi, [esp+24]   ; pDst
+    ;mov edx, [esp+28]   ; iDstStride
+    ;mov esi, [esp+32]   ; pSrc
+    ;mov ecx, [esp+36]   ; iSrcStride
+    ;mov ebp, [esp+44]   ; iSrcHeight
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $02            ; iSrcHeight >> 2
+
+    mov r6, r1             ;Save the tailer for the unasigned size
+    imul r6, r5
+    add r6, r0
+    movq xmm7, [r6]
+
+    INIT_X86_32_PIC_NOPRESERVE r4
+    movdqa xmm6, [pic(shufb_mask_quarter)]
+    DEINIT_X86_32_PIC
+
+.yloops_quarter_sse3:
+    ;mov eax, [esp+40]   ; iSrcWidth
+    ;sar eax, $02            ; iSrcWidth >> 2
+    ;mov ebx, eax        ; iDstWidth restored at ebx
+    ;sar eax, $04            ; (iSrcWidth >> 2) / 16     ; loop count = num_of_mb
+    ;neg ebx             ; - (iSrcWidth >> 2)
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+
+    mov r6, r0
+    ; each loop = source bandwidth: 32 bytes
+.xloops_quarter_sse3:
+    ; 1st part horizonal loop: x32 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  xmm0: h H g G f F e E d D c C b B a A
+    ;               xmm1: p P o O n N m M l L k K j J i I
+    ;2nd Line Src:  xmm2: h H g G f F e E d D c C b B a A
+    ;               xmm3: p P o O n N m M l L k K j J i I
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movdqa xmm0, [r2]          ; 1st_src_line
+    movdqa xmm1, [r2+16]       ; 1st_src_line + 16
+    movdqa xmm2, [r2+r3]       ; 2nd_src_line
+    movdqa xmm3, [r2+r3+16]    ; 2nd_src_line + 16
+
+    pshufb xmm0, xmm6           ;1st line: 0 0 0 0 g e c a 0 0 0 0 G E C A
+    pshufb xmm1, xmm6           ;1st line: 0 0 0 0 o m k i 0 0 0 0 O M K I
+    pshufb xmm2, xmm6           ;2nd line: 0 0 0 0 g e c a 0 0 0 0 G E C A
+    pshufb xmm3, xmm6           ;2nd line: 0 0 0 0 o m k i 0 0 0 0 O M K I
+
+    movdqa xmm4, xmm0
+    movdqa xmm5, xmm2
+    punpckldq xmm0, xmm1        ;1st line: 0 0 0 0 0 0 0 0 O M K I G E C A -> xmm0
+    punpckhdq xmm4, xmm1        ;1st line: 0 0 0 0 0 0 0 0 o m k i g e c a -> xmm4
+    punpckldq xmm2, xmm3        ;2nd line: 0 0 0 0 0 0 0 0 O M K I G E C A -> xmm2
+    punpckhdq xmm5, xmm3        ;2nd line: 0 0 0 0 0 0 0 0 o m k i g e c a -> xmm5
+
+    pavgb xmm0, xmm4
+    pavgb xmm2, xmm5
+    pavgb xmm0, xmm2            ;average
+
+    ; write pDst
+    movq [r0], xmm0
+
+    ; next SMB
+    lea r2, [r2+32]
+    lea r0, [r0+8]
+
+    sub r4, 32
+    cmp r4, 0
+    jg near .xloops_quarter_sse3
+
+    sub r6, r0
+    ; next line
+    lea r2, [r2+4*r3]    ; next end of lines
+    lea r2, [r2+4*r6]    ; reset to base 0 [- 4 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops_quarter_sse3
+
+    movq [r0], xmm7      ;restored the tailer for the unasigned size
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+;***********************************************************************
+;   void DyadicBilinearQuarterDownsampler_sse4(    unsigned char* pDst, const int iDstStride,
+;                   unsigned char* pSrc, const int iSrcStride,
+;                   const int iSrcWidth, const int iSrcHeight );
+;***********************************************************************
+WELS_EXTERN DyadicBilinearQuarterDownsampler_sse4
+%ifdef X86_32
+    push r6
+    %assign push_num 1
+%else
+    %assign push_num 0
+%endif
+    LOAD_6_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1, r1d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    SIGN_EXTENSION r5, r5d
+
+%ifndef X86_32
+    push r12
+    mov r12, r4
+%endif
+    sar r5, $02            ; iSrcHeight >> 2
+
+    mov r6, r1             ;Save the tailer for the unasigned size
+    imul r6, r5
+    add r6, r0
+    movq xmm7, [r6]
+
+    INIT_X86_32_PIC_NOPRESERVE r4
+    movdqa xmm6, [pic(shufb_mask_quarter)]    ;mask
+    DEINIT_X86_32_PIC
+
+.yloops_quarter_sse4:
+%ifdef X86_32
+    mov r4, arg5
+%else
+    mov r4, r12
+%endif
+
+    mov r6, r0
+    ; each loop = source bandwidth: 32 bytes
+.xloops_quarter_sse4:
+    ; 1st part horizonal loop: x16 bytes
+    ;               mem  hi<-       ->lo
+    ;1st Line Src:  xmm0: h H g G f F e E d D c C b B a A
+    ;               xmm1: p P o O n N m M l L k K j J i I
+    ;2nd Line Src:  xmm2: h H g G f F e E d D c C b B a A
+    ;               xmm3: p P o O n N m M l L k K j J i I
+
+    ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+    movntdqa xmm0, [r2]            ; 1st_src_line
+    movntdqa xmm1, [r2+16]         ; 1st_src_line + 16
+    movntdqa xmm2, [r2+r3]         ; 2nd_src_line
+    movntdqa xmm3, [r2+r3+16]      ; 2nd_src_line + 16
+
+    pshufb xmm0, xmm6               ;1st line: 0 0 0 0 g e c a 0 0 0 0 G E C A
+    pshufb xmm1, xmm6               ;1st line: 0 0 0 0 o m k i 0 0 0 0 O M K I
+    pshufb xmm2, xmm6               ;2nd line: 0 0 0 0 g e c a 0 0 0 0 G E C A
+    pshufb xmm3, xmm6               ;2nd line: 0 0 0 0 o m k i 0 0 0 0 O M K I
+
+    movdqa xmm4, xmm0
+    movdqa xmm5, xmm2
+    punpckldq xmm0, xmm1            ;1st line: 0 0 0 0 0 0 0 0 O M K I G E C A -> xmm0
+    punpckhdq xmm4, xmm1            ;1st line: 0 0 0 0 0 0 0 0 o m k i g e c a -> xmm4
+    punpckldq xmm2, xmm3            ;2nd line: 0 0 0 0 0 0 0 0 O M K I G E C A -> xmm2
+    punpckhdq xmm5, xmm3            ;2nd line: 0 0 0 0 0 0 0 0 o m k i g e c a -> xmm5
+
+    pavgb xmm0, xmm4
+    pavgb xmm2, xmm5
+    pavgb xmm0, xmm2                ;average
+
+    ; write pDst
+    movq [r0], xmm0
+
+    ; next SMB
+    lea r2, [r2+32]
+    lea r0, [r0+8]
+
+    sub r4, 32
+    cmp r4, 0
+    jg near .xloops_quarter_sse4
+
+    sub r6, r0
+    lea r2, [r2+4*r3]    ; next end of lines
+    lea r2, [r2+4*r6]    ; reset to base 0 [- 2 * iDstWidth]
+    lea r0, [r0+r1]
+    lea r0, [r0+r6]      ; reset to base 0 [- iDstWidth]
+
+    dec r5
+    jg near .yloops_quarter_sse4
+
+    movq [r0], xmm7      ;restore the tailer for the unasigned size
+
+%ifndef X86_32
+    pop r12
+%endif
+
+    POP_XMM
+    LOAD_6_PARA_POP
+%ifdef X86_32
+    pop r6
+%endif
+    ret
+
+; xpos_int=%1 xpos_frac=%2 inc_int+1=%3 inc_frac=%4 tmp=%5
+%macro SSE2_BilinearIncXposuw 5
+    movdqa          %5, %2
+    paddw           %2, %4
+    paddusw         %5, %4
+    pcmpeqw         %5, %2
+    paddb           %1, %3
+    paddb           %1, %5  ; subtract 1 if no carry
+%endmacro
+
+; outl=%1 outh=%2 in=%3
+%macro SSE2_UnpckXFracuw 3
+    pcmpeqw         %1, %1
+    pxor            %1, %3
+    movdqa          %2, %1
+    punpcklwd       %1, %3
+    punpckhwd       %2, %3
+%endmacro
+
+; [in:xfrac out:xyfrac0]=%1 [out:xyfrac1]=%2 yfrac0=%3 yfrac1=%4
+%macro SSE2_BilinearFastCalcXYFrac 4
+    movdqa          %2, %1
+    pmulhuw         %1, %3
+    pmulhuw         %2, %4
+%endmacro
+
+; [in:dwordsl out:bytes] dwordsh=%2 zero=%3
+%macro SSE2_BilinearFastPackDwordsToBytes 3
+    psrld           %1, 14
+    psrld           %2, 14
+    packssdw        %1, %2
+    pavgw           %1, %3
+    packuswb        %1, %1
+%endmacro
+
+%macro SSSE3_BilinearFastDownsample2xOrLess_8px 0
+    movdqa          xmm_tmp0, xmm_xpos_int
+    pshufb          xmm_tmp0, xmm_0
+    psubb           xmm_xpos_int, xmm_tmp0
+    SSE2_UnpckXFracuw xmm_tmp0, xmm_tmp1, xmm_xpos_frac
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 8 * i_scalex]
+    shr             r_tmp0, 16
+    lddqu           xmm_tmp4, [p_src_row0 + r_tmp0]
+    pshufb          xmm_tmp4, xmm_xpos_int
+    movdqa          xmm_tmp5, xmm_tmp4
+    punpcklbw       xmm_tmp4, xmm_0
+    punpckhbw       xmm_tmp5, xmm_0
+    SSE2_BilinearFastCalcXYFrac xmm_tmp0, xmm_tmp2, xmm_yfrac0, xmm_yfrac1
+    SSE2_BilinearFastCalcXYFrac xmm_tmp1, xmm_tmp3, xmm_yfrac0, xmm_yfrac1
+    pmaddwd         xmm_tmp0, xmm_tmp4
+    pmaddwd         xmm_tmp1, xmm_tmp5
+    lddqu           xmm_tmp4, [p_src_row1 + r_tmp0]
+    pshufb          xmm_tmp4, xmm_xpos_int
+    movdqa          xmm_tmp5, xmm_tmp4
+    punpcklbw       xmm_tmp4, xmm_0
+    punpckhbw       xmm_tmp5, xmm_0
+    pmaddwd         xmm_tmp2, xmm_tmp4
+    pmaddwd         xmm_tmp3, xmm_tmp5
+    paddd           xmm_tmp0, xmm_tmp2
+    paddd           xmm_tmp1, xmm_tmp3
+    SSE2_BilinearFastPackDwordsToBytes xmm_tmp0, xmm_tmp1, xmm_0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    SSE2_BilinearIncXposuw xmm_xpos_int, xmm_xpos_frac, xmm_xpos_int_inc, xmm_xpos_frac_inc, xmm_tmp0
+%endmacro
+
+%macro SSSE3_BilinearFastDownsample4xOrLess_8px 0
+    movdqa          xmm_tmp0, xmm_xpos_int
+    pshufb          xmm_tmp0, xmm_shufb_0000000088888888
+    psubb           xmm_xpos_int, xmm_tmp0
+    SSE2_UnpckXFracuw xmm_tmp0, xmm_tmp1, xmm_xpos_frac
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    lddqu           xmm_tmp3, [p_src_row0 + r_tmp0]
+    lddqu           xmm_tmp4, [p_src_row1 + r_tmp0]
+    movdqa          xmm_tmp2, xmm_xpos_int
+    punpcklbw       xmm_tmp2, xmm_db80h
+    pshufb          xmm_tmp3, xmm_tmp2
+    pshufb          xmm_tmp4, xmm_tmp2
+    SSE2_BilinearFastCalcXYFrac xmm_tmp0, xmm_tmp2, xmm_yfrac0, xmm_yfrac1
+    pmaddwd         xmm_tmp0, xmm_tmp3
+    pmaddwd         xmm_tmp2, xmm_tmp4
+    paddd           xmm_tmp0, xmm_tmp2
+    lea             r_tmp0, [i_xpos + 4 * i_scalex]
+    lea             i_xpos, [i_xpos + 8 * i_scalex]
+    shr             r_tmp0, 16
+    lddqu           xmm_tmp3, [p_src_row0 + r_tmp0]
+    lddqu           xmm_tmp4, [p_src_row1 + r_tmp0]
+    movdqa          xmm_tmp2, xmm_xpos_int
+    punpckhbw       xmm_tmp2, xmm_db80h
+    pshufb          xmm_tmp3, xmm_tmp2
+    pshufb          xmm_tmp4, xmm_tmp2
+    SSE2_BilinearFastCalcXYFrac xmm_tmp1, xmm_tmp2, xmm_yfrac0, xmm_yfrac1
+    pmaddwd         xmm_tmp1, xmm_tmp3
+    pmaddwd         xmm_tmp2, xmm_tmp4
+    paddd           xmm_tmp1, xmm_tmp2
+    SSE2_BilinearFastPackDwordsToBytes xmm_tmp0, xmm_tmp1, xmm_0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    SSE2_BilinearIncXposuw xmm_xpos_int, xmm_xpos_frac, xmm_xpos_int_inc, xmm_xpos_frac_inc, xmm_tmp0
+%endmacro
+
+%macro SSE2_GeneralBilinearFastDownsample_8px 0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movd            xmm_tmp3, [p_src_row0 + r_tmp0]
+    movd            xmm_tmp4, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 1
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 2
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 3
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 3
+    punpcklbw       xmm_tmp3, xmm_0
+    punpcklbw       xmm_tmp4, xmm_0
+    movdqa          xmm_tmp0, xmm_xfrac0
+    SSE2_BilinearFastCalcXYFrac xmm_tmp0, xmm_tmp2, xmm_yfrac0, xmm_yfrac1
+    pmaddwd         xmm_tmp0, xmm_tmp3
+    pmaddwd         xmm_tmp2, xmm_tmp4
+    paddd           xmm_tmp0, xmm_tmp2
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movd            xmm_tmp3, [p_src_row0 + r_tmp0]
+    movd            xmm_tmp4, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 1
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 2
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp3, [p_src_row0 + r_tmp0], 3
+    pinsrw          xmm_tmp4, [p_src_row1 + r_tmp0], 3
+    punpcklbw       xmm_tmp3, xmm_0
+    punpcklbw       xmm_tmp4, xmm_0
+    movdqa          xmm_tmp1, xmm_xfrac1
+    SSE2_BilinearFastCalcXYFrac xmm_tmp1, xmm_tmp2, xmm_yfrac0, xmm_yfrac1
+    pmaddwd         xmm_tmp1, xmm_tmp3
+    pmaddwd         xmm_tmp2, xmm_tmp4
+    paddd           xmm_tmp1, xmm_tmp2
+    SSE2_BilinearFastPackDwordsToBytes xmm_tmp0, xmm_tmp1, xmm_0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    paddw           xmm_xfrac0, xmm_xfrac_inc
+    paddw           xmm_xfrac1, xmm_xfrac_inc
+%endmacro
+
+; xpos_int=%1 xpos_frac=%2 inc_int=%3 inc_frac=%4 7FFFh=%5 tmp=%6
+%macro SSE2_BilinearIncXposw 6
+    pxor            %6, %6
+    paddw           %2, %4
+    pcmpgtw         %6, %2
+    paddb           %1, %3
+    psubb           %1, %6  ; add carry
+    pand            %2, %5
+%endmacro
+
+; outl=%1 outh=%2 in=%3 7FFFh=%4
+%macro SSE2_UnpckXFracw 4
+    movdqa          %1, %3
+    pxor            %1, %4
+    movdqa          %2, %1
+    punpcklwd       %1, %3
+    punpckhwd       %2, %3
+%endmacro
+
+; res>>29=%1 data0=%2 data1=%3 frac0=%4 frac1=%5 tmp=%6
+%macro SSE41_LinearAccurateInterpolateVerticalDwords 6
+    pshufd          %1, %2, 10110001b
+    pshufd          %6, %3, 10110001b
+    pmuludq         %1, %4
+    pmuludq         %6, %5
+    paddq           %1, %6
+    pmuludq         %2, %4
+    pmuludq         %3, %5
+    paddq           %2, %3
+    psllq           %1,  3
+    psrlq           %2, 29
+    blendps         %1, %2, 0101b
+%endmacro
+
+%macro SSE41_BilinearAccurateDownsample2xOrLess_8px 0
+    movdqa          xmm_tmp0, xmm_xpos_int
+    pshufb          xmm_tmp0, xmm_0
+    psubb           xmm_xpos_int, xmm_tmp0
+    SSE2_UnpckXFracw xmm_tmp0, xmm_tmp1, xmm_xpos_frac, xmm_7fff
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 8 * i_scalex]
+    shr             r_tmp0, 16
+    lddqu           xmm_tmp4, [p_src_row0 + r_tmp0]
+    pshufb          xmm_tmp4, xmm_xpos_int
+    movdqa          xmm_tmp5, xmm_tmp4
+    punpcklbw       xmm_tmp4, xmm_0
+    punpckhbw       xmm_tmp5, xmm_0
+    pmaddwd         xmm_tmp4, xmm_tmp0
+    pmaddwd         xmm_tmp5, xmm_tmp1
+    lddqu           xmm_tmp2, [p_src_row1 + r_tmp0]
+    pshufb          xmm_tmp2, xmm_xpos_int
+    movdqa          xmm_tmp3, xmm_tmp2
+    punpcklbw       xmm_tmp2, xmm_0
+    punpckhbw       xmm_tmp3, xmm_0
+    pmaddwd         xmm_tmp2, xmm_tmp0
+    pmaddwd         xmm_tmp3, xmm_tmp1
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp0, xmm_tmp4, xmm_tmp2, xmm_yfrac0, xmm_yfrac1, xmm_tmp1
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp1, xmm_tmp5, xmm_tmp3, xmm_yfrac0, xmm_yfrac1, xmm_tmp2
+    packssdw        xmm_tmp0, xmm_tmp1
+    pavgw           xmm_tmp0, xmm_0
+    packuswb        xmm_tmp0, xmm_tmp0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    SSE2_BilinearIncXposw xmm_xpos_int, xmm_xpos_frac, xmm_xpos_int_inc, xmm_xpos_frac_inc, xmm_7fff, xmm_tmp0
+%endmacro
+
+%macro SSE41_BilinearAccurateDownsample4xOrLess_8px 0
+    movdqa          xmm_tmp0, xmm_xpos_int
+    pshufb          xmm_tmp0, xmm_shufb_0000000088888888
+    psubb           xmm_xpos_int, xmm_tmp0
+    SSE2_UnpckXFracw xmm_tmp0, xmm_tmp1, xmm_xpos_frac, xmm_7fff
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movdqa          xmm_tmp3, xmm_xpos_int
+    punpcklbw       xmm_tmp3, xmm_db80h
+    lddqu           xmm_tmp4, [p_src_row0 + r_tmp0]
+    lddqu           xmm_tmp2, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex]
+    lea             i_xpos, [i_xpos + 8 * i_scalex]
+    shr             r_tmp0, 16
+    pshufb          xmm_tmp4, xmm_tmp3
+    pshufb          xmm_tmp2, xmm_tmp3
+    pmaddwd         xmm_tmp4, xmm_tmp0
+    pmaddwd         xmm_tmp2, xmm_tmp0
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp0, xmm_tmp4, xmm_tmp2, xmm_yfrac0, xmm_yfrac1, xmm_tmp3
+    movdqa          xmm_tmp2, xmm_xpos_int
+    punpckhbw       xmm_tmp2, xmm_db80h
+    lddqu           xmm_tmp4, [p_src_row0 + r_tmp0]
+    lddqu           xmm_tmp3, [p_src_row1 + r_tmp0]
+    pshufb          xmm_tmp4, xmm_tmp2
+    pshufb          xmm_tmp3, xmm_tmp2
+    pmaddwd         xmm_tmp4, xmm_tmp1
+    pmaddwd         xmm_tmp3, xmm_tmp1
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp1, xmm_tmp4, xmm_tmp3, xmm_yfrac0, xmm_yfrac1, xmm_tmp2
+    packssdw        xmm_tmp0, xmm_tmp1
+    pavgw           xmm_tmp0, xmm_0
+    packuswb        xmm_tmp0, xmm_tmp0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    SSE2_BilinearIncXposw xmm_xpos_int, xmm_xpos_frac, xmm_xpos_int_inc, xmm_xpos_frac_inc, xmm_7fff, xmm_tmp0
+%endmacro
+
+%macro SSE41_GeneralBilinearAccurateDownsample_8px 0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movd            xmm_tmp4, [p_src_row0 + r_tmp0]
+    movd            xmm_tmp2, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 1
+    pinsrw          xmm_tmp2, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 2
+    pinsrw          xmm_tmp2, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 3
+    pinsrw          xmm_tmp2, [p_src_row1 + r_tmp0], 3
+    punpcklbw       xmm_tmp4, xmm_0
+    punpcklbw       xmm_tmp2, xmm_0
+    pmaddwd         xmm_tmp4, xmm_xfrac0
+    pmaddwd         xmm_tmp2, xmm_xfrac0
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp0, xmm_tmp4, xmm_tmp2, xmm_yfrac0, xmm_yfrac1, xmm_tmp3
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movd            xmm_tmp4, [p_src_row0 + r_tmp0]
+    movd            xmm_tmp3, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 1
+    pinsrw          xmm_tmp3, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 2
+    pinsrw          xmm_tmp3, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    pinsrw          xmm_tmp4, [p_src_row0 + r_tmp0], 3
+    pinsrw          xmm_tmp3, [p_src_row1 + r_tmp0], 3
+    punpcklbw       xmm_tmp4, xmm_0
+    punpcklbw       xmm_tmp3, xmm_0
+    pmaddwd         xmm_tmp4, xmm_xfrac1
+    pmaddwd         xmm_tmp3, xmm_xfrac1
+    SSE41_LinearAccurateInterpolateVerticalDwords xmm_tmp1, xmm_tmp4, xmm_tmp3, xmm_yfrac0, xmm_yfrac1, xmm_tmp2
+    packssdw        xmm_tmp0, xmm_tmp1
+    pavgw           xmm_tmp0, xmm_0
+    packuswb        xmm_tmp0, xmm_tmp0
+    movlps          [p_dst], xmm_tmp0
+    add             p_dst, 8
+    paddw           xmm_xfrac0, xmm_xfrac_inc
+    paddw           xmm_xfrac1, xmm_xfrac_inc
+    pand            xmm_xfrac0, xmm_7fff
+    pand            xmm_xfrac1, xmm_7fff
+%endmacro
+
+; downsample_8px_macro=%1 b_fast=%2
+%macro SSE2_GeneralBilinearDownsampler_loop 2
+%%height:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             p_src_row1, p_src_row0
+    add             p_src_row1, i_src_stride
+    movd            xmm_tmp1, i_yposd
+%if %2
+    pshuflw         xmm_tmp1, xmm_tmp1, 0
+    psllw           xmm_tmp1, 1
+    psrlw           xmm_tmp1, 1
+%else
+    pslld           xmm_tmp1, 17
+    psrld           xmm_tmp1, 17
+%endif
+%ifdef X86_32
+    pshufd          xmm_tmp1, xmm_tmp1, 0
+    pcmpeqw         xmm_tmp0, xmm_tmp0
+%if %2
+    psrlw           xmm_tmp0, 1
+%else
+    psrld           xmm_tmp0, 17
+%endif
+    pxor            xmm_tmp0, xmm_tmp1
+    movdqa          xmm_yfrac0, xmm_tmp0
+    movdqa          xmm_yfrac1, xmm_tmp1
+%else
+    pshufd          xmm_yfrac1, xmm_tmp1, 0
+    pcmpeqw         xmm_yfrac0, xmm_yfrac0
+%if %2
+    psrlw           xmm_yfrac0, 1
+%else
+    psrld           xmm_yfrac0, 17
+%endif
+    pxor            xmm_yfrac0, xmm_yfrac1
+%endif
+
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+    sub             i_width_cnt, 1
+
+%ifdef xmm_xpos_int
+    movdqa          xmm_xpos_int, xmm_xpos_int_begin
+    movdqa          xmm_xpos_frac, xmm_xpos_frac_begin
+%else
+    movdqa          xmm_xfrac0, xmm_xfrac0_begin
+    movdqa          xmm_xfrac1, xmm_xfrac1_begin
+%endif
+
+%%width:
+    %1
+    sub             i_width_cnt, 8
+    jg              %%width
+
+    lea             p_dst, [p_dst + i_width_cnt + 1]
+    imul            i_width_cnt, i_scalex
+    add             i_xpos, i_width_cnt
+    shr             i_xpos, 16
+    movzx           r_tmp0, byte [p_src_row0 + i_xpos]
+    mov             [p_dst - 1], r_tmp0b
+%ifdef X86_32
+    mov             r_tmp0, i_scaleyd
+    add             i_yposd, r_tmp0
+%else
+    add             i_yposd, i_scaleyd
+%endif
+    add             p_dst, i_dst_stride_less_width
+    sub             i_dst_height, 1
+    jg              %%height
+%endmacro
+
+;**************************************************************************************************************
+;void GeneralBilinearFastDownsampler_ssse3 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+;    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+;    uint32_t uiScaleY);
+;
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearFastDownsampler_ssse3
+    %assign push_num 0
+%ifndef X86_32
+    push            r12
+    push            r13
+    push            rbx
+    push            rbp
+    %assign push_num 4
+%ifdef WIN64
+    push            rdi
+    push            rsi
+    %assign push_num push_num + 2
+%endif
+%endif
+    LOAD_7_PARA
+    PUSH_XMM 16
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    ZERO_EXTENSION  r6d
+    sub             r1, r2                                            ; dst_stride - dst_width
+%ifdef X86_32
+    movd            xmm0, arg8
+    movd            xmm1, esp
+    and             esp, -16
+%ifdef X86_32_PICASM
+    sub             esp, 8 * 4 + 9 * 16
+%else
+    sub             esp, 8 * 4 + 7 * 16
+%endif
+    movd            [esp], xmm1
+    %define p_dst                   r0
+    %define i_dst_stride_less_width [esp + 1 * 4]
+    %define i_dst_width             [esp + 2 * 4]
+    %define i_dst_height            dword [esp + 3 * 4]
+    %define p_src                   [esp + 4 * 4]
+    %define i_src_stride            [esp + 5 * 4]
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               [esp + 6 * 4]
+    %define i_xpos                  r2
+    %define i_ypos                  dword [esp + 7 * 4]
+    %define i_yposd                 dword [esp + 7 * 4]
+    %define p_src_row0              r3
+    %define p_src_row1              r4
+    %define i_width_cnt             r5
+    %define r_tmp0                  r1
+    %define r_tmp0b                 r1b
+    %define xmm_xpos_frac           xmm1
+    %define xmm_xpos_frac_inc       [esp + 8 * 4]
+    %define xmm_xpos_int            xmm3
+    %define xmm_xpos_int_inc        [esp + 8 * 4 + 1 * 16]
+    %define xmm_yfrac0              [esp + 8 * 4 + 2 * 16]
+    %define xmm_yfrac1              [esp + 8 * 4 + 3 * 16]
+    %define xmm_tmp0                xmm7
+    %define xmm_tmp1                xmm0
+    %define xmm_tmp2                xmm2
+    %define xmm_tmp3                xmm4
+    %define xmm_tmp4                xmm5
+    %define xmm_tmp5                xmm6
+    %define xmm_0                   [esp + 8 * 4 + 4 * 16]
+    %define xmm_xpos_int_begin      [esp + 8 * 4 + 5 * 16]
+    %define xmm_xpos_frac_begin     [esp + 8 * 4 + 6 * 16]
+%ifdef X86_32_PICASM
+    %define xmm_db80h                  [esp + 8 * 4 + 7 * 16]
+    %define xmm_shufb_0000000088888888 [esp + 8 * 4 + 8 * 16]
+    pxor            xmm_tmp4, xmm_tmp4
+    pcmpeqb         xmm_tmp5, xmm_tmp5
+    psubb           xmm_tmp4, xmm_tmp5
+    movdqa          xmm_tmp3, xmm_tmp4
+    psllw           xmm_tmp3, 3
+    pslldq          xmm_tmp3, 8
+    movdqa          xmm_shufb_0000000088888888, xmm_tmp3
+    psllw           xmm_tmp4, 7
+    movdqa          xmm_db80h, xmm_tmp4
+%else
+    %define xmm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+%endif
+    mov             i_dst_stride_less_width, r1
+    mov             i_dst_width, r2
+    mov             i_dst_height, r3
+    mov             p_src, r4
+    mov             i_src_stride, r5
+    movd            i_scaleyd, xmm0
+    pxor            xmm_tmp0, xmm_tmp0
+    movdqa          xmm_0, xmm_tmp0
+%else
+    %define p_dst                   r0
+    %define i_dst_stride_less_width r1
+    %define i_dst_width             r2
+    %define i_dst_height            r3
+    %define p_src                   r4
+    %define i_src_stride            r5
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               dword arg8d
+    %define i_xpos                  r12
+    %define i_ypos                  r13
+    %define i_yposd                 r13d
+    %define p_src_row0              rbp
+%ifdef WIN64
+    %define p_src_row1              rsi
+    %define i_width_cnt             rdi
+%else
+    %define p_src_row1              r11
+    %define i_width_cnt             rax
+%endif
+    %define r_tmp0                  rbx
+    %define r_tmp0b                 bl
+    %define xmm_0                   xmm0
+    %define xmm_xpos_frac           xmm1
+    %define xmm_xpos_frac_inc       xmm8
+    %define xmm_xpos_int            xmm3
+    %define xmm_xpos_int_inc        xmm10
+    %define xmm_yfrac0              xmm11
+    %define xmm_yfrac1              xmm12
+    %define xmm_tmp0                xmm7
+    %define xmm_tmp1                xmm2
+    %define xmm_tmp2                xmm9
+    %define xmm_tmp3                xmm4
+    %define xmm_tmp4                xmm5
+    %define xmm_tmp5                xmm6
+    %define xmm_xpos_int_begin      xmm14
+    %define xmm_xpos_frac_begin     xmm15
+    %define xmm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    pxor            xmm_0, xmm_0
+%endif
+
+    sub             i_dst_height, 1
+    je              .final_row
+    jl              .done
+
+    mov             i_ypos, 1 << 14
+    movd            xmm_xpos_frac, i_scalexd
+    pshufd          xmm_xpos_frac, xmm_xpos_frac, 0
+    movdqa          xmm_tmp0, xmm_xpos_frac
+    pslld           xmm_tmp0, 2
+    pslldq          xmm_xpos_frac, 4
+    paddd           xmm_tmp0, xmm_xpos_frac
+    movdqa          xmm_tmp1, xmm_xpos_frac
+    pslldq          xmm_tmp1, 4
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    pslldq          xmm_tmp1, 4
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    pcmpeqw         xmm_tmp1, xmm_tmp1
+    psrld           xmm_tmp1, 31
+    pslld           xmm_tmp1, 15
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    movdqa          xmm_xpos_int, xmm_xpos_frac
+    movdqa          xmm_tmp1, xmm_tmp0
+    psrld           xmm_xpos_int, 16
+    psrld           xmm_tmp1, 16
+    packssdw        xmm_xpos_int, xmm_tmp1
+    packuswb        xmm_xpos_int, xmm_xpos_int
+    movdqa          xmm_tmp1, xmm_xpos_int
+    pcmpeqw         xmm_tmp2, xmm_tmp2
+    psubb           xmm_tmp1, xmm_tmp2
+    punpcklbw       xmm_xpos_int, xmm_tmp1
+    pslld           xmm_xpos_frac, 16
+    pslld           xmm_tmp0, 16
+    psrad           xmm_xpos_frac, 16
+    psrad           xmm_tmp0, 16
+    packssdw        xmm_xpos_frac, xmm_tmp0
+    movd            xmm_tmp0, i_scalexd
+    pslld           xmm_tmp0, 3
+    movdqa          xmm_tmp1, xmm_tmp0
+    punpcklwd       xmm_tmp0, xmm_tmp0
+    pshufd          xmm_tmp0, xmm_tmp0, 0
+    movdqa          xmm_xpos_frac_inc, xmm_tmp0
+    psrld           xmm_tmp1, 16
+    psubw           xmm_tmp1, xmm_tmp2
+    pxor            xmm_tmp2, xmm_tmp2
+    pshufb          xmm_tmp1, xmm_tmp2
+    movdqa          xmm_xpos_int_inc, xmm_tmp1
+    movdqa          xmm_xpos_int_begin, xmm_xpos_int
+    movdqa          xmm_xpos_frac_begin, xmm_xpos_frac
+
+    cmp             i_scalex, 4 << 16
+    ja              .scalex_above4
+    cmp             i_scalex, 2 << 16
+    ja              .scalex_above2_beloweq4
+    SSE2_GeneralBilinearDownsampler_loop SSSE3_BilinearFastDownsample2xOrLess_8px, 1
+    jmp             .final_row
+%ifdef X86_32
+    %undef xmm_yfrac0
+    %xdefine xmm_yfrac0 xmm_tmp5
+    %undef xmm_tmp5
+%endif
+.scalex_above2_beloweq4:
+    SSE2_GeneralBilinearDownsampler_loop SSSE3_BilinearFastDownsample4xOrLess_8px, 1
+    jmp             .final_row
+.scalex_above4:
+%xdefine xmm_xfrac0 xmm_xpos_frac
+%xdefine xmm_xfrac1 xmm_xpos_int
+%xdefine xmm_xfrac0_begin xmm_xpos_int_begin
+%xdefine xmm_xfrac1_begin xmm_xpos_frac_begin
+%xdefine xmm_xfrac_inc xmm_xpos_frac_inc
+%undef xmm_xpos_int
+%undef xmm_xpos_frac
+%undef xmm_xpos_int_begin
+%undef xmm_xpos_frac_begin
+%undef xmm_xpos_int_inc
+%undef xmm_xpos_frac_inc
+    SSE2_UnpckXFracuw xmm_tmp0, xmm_xfrac1, xmm_xfrac0
+    movdqa          xmm_xfrac0, xmm_tmp0
+    movdqa          xmm_xfrac0_begin, xmm_xfrac0
+    movdqa          xmm_xfrac1_begin, xmm_xfrac1
+    pcmpeqw         xmm_tmp0, xmm_tmp0
+    pmullw          xmm_tmp0, xmm_xfrac_inc
+    punpcklwd       xmm_tmp0, xmm_xfrac_inc
+    movdqa          xmm_xfrac_inc, xmm_tmp0
+    SSE2_GeneralBilinearDownsampler_loop SSE2_GeneralBilinearFastDownsample_8px, 1
+
+.final_row:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+
+.final_row_width:
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movzx           r_tmp0, byte [p_src_row0 + r_tmp0]
+    mov             [p_dst], r_tmp0b
+    add             p_dst, 1
+    add             i_xpos, i_scalex
+    sub             i_width_cnt, 1
+    jg              .final_row_width
+
+.done:
+%ifdef X86_32
+    mov             esp, [esp]
+%endif
+    POP_XMM
+    LOAD_7_PARA_POP
+%ifndef X86_32
+%ifdef WIN64
+    pop             rsi
+    pop             rdi
+%endif
+    pop             rbp
+    pop             rbx
+    pop             r13
+    pop             r12
+%endif
+    ret
+%undef p_dst
+%undef i_dst_stride_less_width
+%undef i_dst_width
+%undef i_dst_height
+%undef p_src
+%undef i_src_stride
+%undef i_scalex
+%undef i_scalexd
+%undef i_scaleyd
+%undef i_xpos
+%undef i_ypos
+%undef i_yposd
+%undef p_src_row0
+%undef p_src_row1
+%undef i_width_cnt
+%undef r_tmp0
+%undef r_tmp0b
+%undef xmm_0
+%undef xmm_xpos_frac
+%undef xmm_xpos_frac_inc
+%undef xmm_xpos_int
+%undef xmm_xpos_int_inc
+%undef xmm_yfrac0
+%undef xmm_yfrac1
+%undef xmm_tmp0
+%undef xmm_tmp1
+%undef xmm_tmp2
+%undef xmm_tmp3
+%undef xmm_tmp4
+%undef xmm_tmp5
+%undef xmm_xpos_int_begin
+%undef xmm_xpos_frac_begin
+%undef xmm_xfrac0
+%undef xmm_xfrac1
+%undef xmm_xfrac0_begin
+%undef xmm_xfrac1_begin
+%undef xmm_xfrac_inc
+%undef xmm_db80h
+%undef xmm_shufb_0000000088888888
+
+;**************************************************************************************************************
+;void GeneralBilinearAccurateDownsampler_sse41 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+;    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+;    uint32_t uiScaleY);
+;
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearAccurateDownsampler_sse41
+    %assign push_num 0
+%ifndef X86_32
+    push            r12
+    push            r13
+    push            rbx
+    push            rbp
+    %assign push_num 4
+%ifdef WIN64
+    push            rdi
+    push            rsi
+    %assign push_num push_num + 2
+%endif
+%endif
+    LOAD_7_PARA
+    PUSH_XMM 16
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    ZERO_EXTENSION  r6d
+    sub             r1, r2                                            ; dst_stride - dst_width
+    add             r6, r6                                            ; 2 * scalex
+%ifdef X86_32
+    movd            xmm0, arg8
+    movd            xmm1, esp
+    and             esp, -16
+%ifdef X86_32_PICASM
+    sub             esp, 8 * 4 + 10 * 16
+%else
+    sub             esp, 8 * 4 + 8 * 16
+%endif
+    movd            [esp], xmm1
+    %define p_dst                   r0
+    %define i_dst_stride_less_width [esp + 1 * 4]
+    %define i_dst_width             [esp + 2 * 4]
+    %define i_dst_height            dword [esp + 3 * 4]
+    %define p_src                   [esp + 4 * 4]
+    %define i_src_stride            [esp + 5 * 4]
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               [esp + 6 * 4]
+    %define i_xpos                  r2
+    %define i_ypos                  dword [esp + 7 * 4]
+    %define i_yposd                 dword [esp + 7 * 4]
+    %define p_src_row0              r3
+    %define p_src_row1              r4
+    %define i_width_cnt             r5
+    %define r_tmp0                  r1
+    %define r_tmp0b                 r1b
+    %define xmm_xpos_frac           xmm1
+    %define xmm_xpos_frac_inc       [esp + 8 * 4]
+    %define xmm_xpos_int            xmm3
+    %define xmm_xpos_int_inc        [esp + 8 * 4 + 1 * 16]
+    %define xmm_yfrac0              [esp + 8 * 4 + 2 * 16]
+    %define xmm_yfrac1              [esp + 8 * 4 + 3 * 16]
+    %define xmm_tmp0                xmm7
+    %define xmm_tmp1                xmm0
+    %define xmm_tmp2                xmm2
+    %define xmm_tmp3                xmm4
+    %define xmm_tmp4                xmm5
+    %define xmm_tmp5                xmm6
+    %define xmm_0                   [esp + 8 * 4 + 4 * 16]
+    %define xmm_7fff                [esp + 8 * 4 + 5 * 16]
+    %define xmm_xpos_int_begin      [esp + 8 * 4 + 6 * 16]
+    %define xmm_xpos_frac_begin     [esp + 8 * 4 + 7 * 16]
+%ifdef X86_32_PICASM
+    %define xmm_db80h                  [esp + 8 * 4 + 8 * 16]
+    %define xmm_shufb_0000000088888888 [esp + 8 * 4 + 9 * 16]
+    pxor            xmm_tmp4, xmm_tmp4
+    pcmpeqb         xmm_tmp5, xmm_tmp5
+    psubb           xmm_tmp4, xmm_tmp5
+    movdqa          xmm_tmp3, xmm_tmp4
+    psllw           xmm_tmp3, 3
+    pslldq          xmm_tmp3, 8
+    movdqa          xmm_shufb_0000000088888888, xmm_tmp3
+    psllw           xmm_tmp4, 7
+    movdqa          xmm_db80h, xmm_tmp4
+%else
+    %define xmm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+%endif
+    mov             i_dst_stride_less_width, r1
+    mov             i_dst_width, r2
+    mov             i_dst_height, r3
+    mov             p_src, r4
+    mov             i_src_stride, r5
+    movd            i_scaleyd, xmm0
+    pxor            xmm_tmp5, xmm_tmp5
+    movdqa          xmm_0, xmm_tmp5
+    pcmpeqw         xmm_tmp5, xmm_tmp5
+    psrlw           xmm_tmp5, 1
+    movdqa          xmm_7fff, xmm_tmp5
+%else
+    %define p_dst                   r0
+    %define i_dst_stride_less_width r1
+    %define i_dst_width             r2
+    %define i_dst_height            r3
+    %define p_src                   r4
+    %define i_src_stride            r5
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               dword arg8d
+    %define i_xpos                  r12
+    %define i_ypos                  r13
+    %define i_yposd                 r13d
+    %define p_src_row0              rbp
+%ifdef WIN64
+    %define p_src_row1              rsi
+    %define i_width_cnt             rdi
+%else
+    %define p_src_row1              r11
+    %define i_width_cnt             rax
+%endif
+    %define r_tmp0                  rbx
+    %define r_tmp0b                 bl
+    %define xmm_0                   xmm0
+    %define xmm_xpos_frac           xmm1
+    %define xmm_xpos_frac_inc       xmm8
+    %define xmm_xpos_int            xmm3
+    %define xmm_xpos_int_inc        xmm10
+    %define xmm_yfrac0              xmm11
+    %define xmm_yfrac1              xmm12
+    %define xmm_tmp0                xmm7
+    %define xmm_tmp1                xmm2
+    %define xmm_tmp2                xmm9
+    %define xmm_tmp3                xmm4
+    %define xmm_tmp4                xmm5
+    %define xmm_tmp5                xmm6
+    %define xmm_7fff                xmm13
+    %define xmm_xpos_int_begin      xmm14
+    %define xmm_xpos_frac_begin     xmm15
+    %define xmm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    pxor            xmm_0, xmm_0
+    pcmpeqw         xmm_7fff, xmm_7fff
+    psrlw           xmm_7fff, 1
+%endif
+
+    sub             i_dst_height, 1
+    je              .final_row
+    jl              .done
+
+    mov             i_ypos, 1 << 14
+    movd            xmm_xpos_frac, i_scalexd
+    pshufd          xmm_xpos_frac, xmm_xpos_frac, 0
+    movdqa          xmm_tmp0, xmm_xpos_frac
+    pslld           xmm_tmp0, 2
+    pslldq          xmm_xpos_frac, 4
+    paddd           xmm_tmp0, xmm_xpos_frac
+    movdqa          xmm_tmp1, xmm_xpos_frac
+    pslldq          xmm_tmp1, 4
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    pslldq          xmm_tmp1, 4
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    pcmpeqw         xmm_tmp1, xmm_tmp1
+    psrld           xmm_tmp1, 31
+    pslld           xmm_tmp1, 15
+    paddd           xmm_xpos_frac, xmm_tmp1
+    paddd           xmm_tmp0, xmm_tmp1
+    movdqa          xmm_xpos_int, xmm_xpos_frac
+    movdqa          xmm_tmp1, xmm_tmp0
+    psrld           xmm_xpos_int, 16
+    psrld           xmm_tmp1, 16
+    packssdw        xmm_xpos_int, xmm_tmp1
+    packuswb        xmm_xpos_int, xmm_xpos_int
+    movdqa          xmm_tmp1, xmm_xpos_int
+    pcmpeqw         xmm_tmp2, xmm_tmp2
+    psubb           xmm_tmp1, xmm_tmp2
+    punpcklbw       xmm_xpos_int, xmm_tmp1
+    pslld           xmm_xpos_frac, 16
+    pslld           xmm_tmp0, 16
+    psrad           xmm_xpos_frac, 16
+    psrad           xmm_tmp0, 16
+    packssdw        xmm_xpos_frac, xmm_tmp0
+    psrlw           xmm_xpos_frac, 1
+    movd            xmm_tmp0, i_scalexd
+    pslld           xmm_tmp0, 3
+    movdqa          xmm_tmp1, xmm_tmp0
+    punpcklwd       xmm_tmp0, xmm_tmp0
+    pshufd          xmm_tmp0, xmm_tmp0, 0
+    psrlw           xmm_tmp0, 1
+    movdqa          xmm_xpos_frac_inc, xmm_tmp0
+    psrld           xmm_tmp1, 16
+    pxor            xmm_tmp2, xmm_tmp2
+    pshufb          xmm_tmp1, xmm_tmp2
+    movdqa          xmm_xpos_int_inc, xmm_tmp1
+    movdqa          xmm_xpos_int_begin, xmm_xpos_int
+    movdqa          xmm_xpos_frac_begin, xmm_xpos_frac
+
+    cmp             i_scalex, 4 << 16
+    ja              .scalex_above4
+    cmp             i_scalex, 2 << 16
+    ja              .scalex_above2_beloweq4
+    SSE2_GeneralBilinearDownsampler_loop SSE41_BilinearAccurateDownsample2xOrLess_8px, 0
+    jmp             .final_row
+%ifdef X86_32
+    %undef xmm_yfrac0
+    %xdefine xmm_yfrac0 xmm_tmp5
+    %undef xmm_tmp5
+%endif
+.scalex_above2_beloweq4:
+    SSE2_GeneralBilinearDownsampler_loop SSE41_BilinearAccurateDownsample4xOrLess_8px, 0
+    jmp             .final_row
+.scalex_above4:
+%xdefine xmm_xfrac0 xmm_xpos_frac
+%xdefine xmm_xfrac1 xmm_xpos_int
+%xdefine xmm_xfrac0_begin xmm_xpos_int_begin
+%xdefine xmm_xfrac1_begin xmm_xpos_frac_begin
+%xdefine xmm_xfrac_inc xmm_xpos_frac_inc
+%undef xmm_xpos_int
+%undef xmm_xpos_frac
+%undef xmm_xpos_int_begin
+%undef xmm_xpos_frac_begin
+%undef xmm_xpos_int_inc
+%undef xmm_xpos_frac_inc
+    SSE2_UnpckXFracw xmm_tmp0, xmm_xfrac1, xmm_xfrac0, xmm_7fff
+    movdqa          xmm_xfrac0, xmm_tmp0
+    movdqa          xmm_xfrac0_begin, xmm_xfrac0
+    movdqa          xmm_xfrac1_begin, xmm_xfrac1
+    pcmpeqw         xmm_tmp0, xmm_tmp0
+    pmullw          xmm_tmp0, xmm_xfrac_inc
+    punpcklwd       xmm_tmp0, xmm_xfrac_inc
+    movdqa          xmm_xfrac_inc, xmm_tmp0
+    SSE2_GeneralBilinearDownsampler_loop SSE41_GeneralBilinearAccurateDownsample_8px, 0
+
+.final_row:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+
+.final_row_width:
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movzx           r_tmp0, byte [p_src_row0 + r_tmp0]
+    mov             [p_dst], r_tmp0b
+    add             p_dst, 1
+    add             i_xpos, i_scalex
+    sub             i_width_cnt, 1
+    jg              .final_row_width
+
+.done:
+%ifdef X86_32
+    mov             esp, [esp]
+%endif
+    POP_XMM
+    LOAD_7_PARA_POP
+%ifndef X86_32
+%ifdef WIN64
+    pop             rsi
+    pop             rdi
+%endif
+    pop             rbp
+    pop             rbx
+    pop             r13
+    pop             r12
+%endif
+    ret
+%undef p_dst
+%undef i_dst_stride_less_width
+%undef i_dst_width
+%undef i_dst_height
+%undef p_src
+%undef i_src_stride
+%undef i_scalex
+%undef i_scalexd
+%undef i_scaleyd
+%undef i_xpos
+%undef i_ypos
+%undef i_yposd
+%undef p_src_row0
+%undef p_src_row1
+%undef i_width_cnt
+%undef r_tmp0
+%undef r_tmp0b
+%undef xmm_0
+%undef xmm_xpos_frac
+%undef xmm_xpos_frac_inc
+%undef xmm_xpos_int
+%undef xmm_xpos_int_inc
+%undef xmm_yfrac0
+%undef xmm_yfrac1
+%undef xmm_tmp0
+%undef xmm_tmp1
+%undef xmm_tmp2
+%undef xmm_tmp3
+%undef xmm_tmp4
+%undef xmm_tmp5
+%undef xmm_7fff
+%undef xmm_xpos_int_begin
+%undef xmm_xpos_frac_begin
+%undef xmm_xfrac0
+%undef xmm_xfrac1
+%undef xmm_xfrac0_begin
+%undef xmm_xfrac1_begin
+%undef xmm_xfrac_inc
+%undef xmm_db80h
+%undef xmm_shufb_0000000088888888
+
+%ifdef HAVE_AVX2
+; xpos_int=%1 xpos_frac=%2 inc_int+1=%3 inc_frac=%4 tmp=%5
+%macro AVX2_BilinearIncXposuw 5
+    vpaddusw        %5, %2, %4
+    vpaddw          %2, %2, %4
+    vpcmpeqw        %5, %5, %2
+    vpaddb          %1, %1, %3
+    vpaddb          %1, %1, %5  ; subtract 1 if no carry
+%endmacro
+
+; outl=%1 outh=%2 in=%3 FFFFh/7FFFh=%4
+%macro AVX2_UnpckXFrac 4
+    vpxor           %1, %3, %4
+    vpunpckhwd      %2, %1, %3
+    vpunpcklwd      %1, %1, %3
+%endmacro
+
+; out0=%1 out1=%2 xfrac=%3 yfrac0=%4 yfrac1=%5
+%macro AVX2_BilinearFastCalcXYFrac 5
+    vpmulhuw        %2, %3, %5
+    vpmulhuw        %1, %3, %4
+%endmacro
+
+; [in:dwordsl out:bytes] dwordsh=%2 zero=%3
+%macro AVX2_BilinearFastPackDwordsToBytes 3
+    vpsrld          %1, %1, 14
+    vpsrld          %2, %2, 14
+    vpackssdw       %1, %1, %2
+    vpavgw          %1, %1, %3
+    vpackuswb       %1, %1, %1
+%endmacro
+
+%macro AVX2_BilinearFastDownsample2xOrLess_16px 0
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_ffff
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    lea             i_xpos, [i_xpos + 8 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_xpos_int
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_xpos_int
+    AVX2_BilinearFastCalcXYFrac ymm_tmp0, ymm_tmp2, ymm_tmp0, ymm_yfrac0, ymm_yfrac1
+    vpunpcklbw      ymm_tmp3, ymm_tmp4, ymm_0
+    vpmaddwd        ymm_tmp0, ymm_tmp0, ymm_tmp3
+    vpunpcklbw      ymm_tmp3, ymm_tmp5, ymm_0
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpaddd          ymm_tmp0, ymm_tmp0, ymm_tmp2
+    AVX2_BilinearFastCalcXYFrac ymm_tmp1, ymm_tmp3, ymm_tmp1, ymm_yfrac0, ymm_yfrac1
+    vpunpckhbw      ymm_tmp2, ymm_tmp4, ymm_0
+    vpmaddwd        ymm_tmp1, ymm_tmp1, ymm_tmp2
+    vpunpckhbw      ymm_tmp2, ymm_tmp5, ymm_0
+    vpmaddwd        ymm_tmp3, ymm_tmp3, ymm_tmp2
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp3
+    AVX2_BilinearFastPackDwordsToBytes ymm_tmp0, ymm_tmp1, ymm_0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposuw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_tmp0
+%endmacro
+
+%macro AVX2_BilinearFastDownsample4xOrLess_16px 0
+    vbroadcasti128  ymm_tmp0, xmm_shufb_0000000088888888
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_tmp0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_ffff
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp3, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp3, ymm_tmp3, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex2]
+    lea             i_xpos, [r_tmp0 + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vpunpcklbw      ymm_tmp2, ymm_xpos_int, ymm_ffff
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp2
+    vpshufb         ymm_tmp3, ymm_tmp3, ymm_tmp2
+    AVX2_BilinearFastCalcXYFrac ymm_tmp0, ymm_tmp2, ymm_tmp0, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp0, ymm_tmp0, ymm_tmp4
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpaddd          ymm_tmp0, ymm_tmp0, ymm_tmp2
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp3, [p_src_row1 + r_tmp0]
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 2 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp3, ymm_tmp3, [p_src_row1 + r_tmp0], 1
+    vpunpckhbw      ymm_tmp2, ymm_xpos_int, ymm_ffff
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp2
+    vpshufb         ymm_tmp3, ymm_tmp3, ymm_tmp2
+    AVX2_BilinearFastCalcXYFrac ymm_tmp1, ymm_tmp2, ymm_tmp1, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp1, ymm_tmp1, ymm_tmp4
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp2
+    AVX2_BilinearFastPackDwordsToBytes ymm_tmp0, ymm_tmp1, ymm_0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposuw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_tmp0
+%endmacro
+
+%macro AVX2_BilinearFastDownsample8xOrLess_16px 0
+    vbroadcasti128  ymm_tmp0, xmm_shufb_000044448888CCCC
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_tmp0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp0, ymm_tmp0, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp1, ymm_tmp1, [p_src_row1 + r_tmp0], 1
+    vpunpcklbw      ymm_tmp3, ymm_xpos_int, ymm_ffff
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp3
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_tmp3
+    vpshufb         ymm_tmp0, ymm_tmp0, ymm_tmp3
+    vpshufb         ymm_tmp1, ymm_tmp1, ymm_tmp3
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 11001100b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp1, 11001100b
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_ffff
+    AVX2_BilinearFastCalcXYFrac ymm_tmp0, ymm_tmp2, ymm_tmp0, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp0, ymm_tmp0, ymm_tmp4
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp5
+    vpaddd          ymm_tmp0, ymm_tmp0, ymm_tmp2
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp2, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp3, [p_src_row1 + r_tmp0]
+    mov             r_tmp0, i_xpos
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp2, ymm_tmp2, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp3, ymm_tmp3, [p_src_row1 + r_tmp0], 1
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_xpos_int
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_xpos_int
+    vpshufb         ymm_tmp2, ymm_tmp2, ymm_xpos_int
+    vpshufb         ymm_tmp3, ymm_tmp3, ymm_xpos_int
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp2, 10001000b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp3, 10001000b
+    vpunpckhbw      ymm_tmp4, ymm_tmp4, ymm_0
+    vpunpckhbw      ymm_tmp5, ymm_tmp5, ymm_0
+    AVX2_BilinearFastCalcXYFrac ymm_tmp1, ymm_tmp3, ymm_tmp1, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp1, ymm_tmp1, ymm_tmp4
+    vpmaddwd        ymm_tmp3, ymm_tmp3, ymm_tmp5
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp3
+    AVX2_BilinearFastPackDwordsToBytes ymm_tmp0, ymm_tmp1, ymm_0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposuw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_tmp0
+%endmacro
+
+%macro AVX2_GeneralBilinearFastDownsample_16px 0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp4, [p_src_row0 + r_tmp0]
+    vpbroadcastd    ymm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpunpcklwd      ymm_tmp4, ymm_tmp4, ymm_tmp0
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpunpcklwd      ymm_tmp5, ymm_tmp5, ymm_tmp0
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 00100010b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp0, 00100010b
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0 - 2]
+    vpblendw        ymm_tmp4, ymm_tmp4, ymm_tmp0, 1000b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0 - 2]
+    vpblendw        ymm_tmp5, ymm_tmp5, ymm_tmp0, 1000b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp2, [p_src_row0 + r_tmp0]
+    vpbroadcastd    ymm_tmp3, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpunpcklwd      ymm_tmp2, ymm_tmp2, ymm_tmp0
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpunpcklwd      ymm_tmp3, ymm_tmp3, ymm_tmp0
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp0, 00100010b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpblendd        ymm_tmp3, ymm_tmp3, ymm_tmp0, 00100010b
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0 - 2]
+    vpblendw        ymm_tmp2, ymm_tmp2, ymm_tmp0, 1000b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0 - 2]
+    vpblendw        ymm_tmp3, ymm_tmp3, ymm_tmp0, 1000b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovd           xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovd           xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 1
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 2
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 3
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 3
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 00001111b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp1, 00001111b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovd           xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovd           xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 1
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 2
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 3
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 3
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp0, 00001111b
+    vpblendd        ymm_tmp3, ymm_tmp3, ymm_tmp1, 00001111b
+    vpunpcklbw      ymm_tmp4, ymm_tmp4, ymm_0
+    vpunpcklbw      ymm_tmp5, ymm_tmp5, ymm_0
+    AVX2_BilinearFastCalcXYFrac ymm_tmp0, ymm_tmp1, ymm_xfrac0, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp0, ymm_tmp0, ymm_tmp4
+    vpmaddwd        ymm_tmp1, ymm_tmp1, ymm_tmp5
+    vpaddd          ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vpunpcklbw      ymm_tmp4, ymm_tmp2, ymm_0
+    vpunpcklbw      ymm_tmp5, ymm_tmp3, ymm_0
+    AVX2_BilinearFastCalcXYFrac ymm_tmp1, ymm_tmp2, ymm_xfrac1, ymm_yfrac0, ymm_yfrac1
+    vpmaddwd        ymm_tmp1, ymm_tmp1, ymm_tmp4
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp5
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp2
+    AVX2_BilinearFastPackDwordsToBytes ymm_tmp0, ymm_tmp1, ymm_0
+    vpermq          ymm_tmp0, ymm_tmp0, 0010b
+    vmovdqu         [p_dst], xmm_tmp0
+    add             p_dst, 16
+    vpaddw          ymm_xfrac0, ymm_xfrac0, ymm_xfrac_inc
+    vpaddw          ymm_xfrac1, ymm_xfrac1, ymm_xfrac_inc
+%endmacro
+
+; xpos_int=%1 xpos_frac=%2 inc_int=%3 inc_frac=%4 7FFFh=%5 tmp=%6,%7
+%macro AVX2_BilinearIncXposw 7
+    vpaddb          %1, %1, %3
+    vpaddw          %6, %2, %4
+    vpcmpgtw        %7, %2, %6
+    vpsubb          %1, %1, %7  ; add carry
+    vpand           %2, %6, %5
+%endmacro
+
+; res>>29=%1 data0=%2 data1=%3 frac0=%4 frac1=%5 tmp=%6
+%macro AVX2_LinearAccurateInterpolateVerticalDwords 6
+    vpshufd         %1, %2, 10110001b
+    vpshufd         %6, %3, 10110001b
+    vpmuludq        %1, %1, %4
+    vpmuludq        %6, %6, %5
+    vpaddq          %1, %1, %6
+    vpmuludq        %2, %2, %4
+    vpmuludq        %3, %3, %5
+    vpaddq          %2, %2, %3
+    vpsllq          %1, %1,  3
+    vpsrlq          %2, %2, 29
+    vpblendd        %1, %1, %2, 01010101b
+%endmacro
+
+%macro AVX2_BilinearAccurateDownsample2xOrLess_16px 0
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_7fff
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    lea             i_xpos, [i_xpos + 8 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_xpos_int
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_xpos_int
+    vpunpcklbw      ymm_tmp2, ymm_tmp4, ymm_0
+    vpunpcklbw      ymm_tmp3, ymm_tmp5, ymm_0
+    vpunpckhbw      ymm_tmp4, ymm_tmp4, ymm_0
+    vpunpckhbw      ymm_tmp5, ymm_tmp5, ymm_0
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp0
+    vpmaddwd        ymm_tmp3, ymm_tmp3, ymm_tmp0
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_tmp1
+    vpmaddwd        ymm_tmp5, ymm_tmp5, ymm_tmp1
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp0, ymm_tmp2, ymm_tmp3, ymm_yfrac0, ymm_yfrac1, ymm_tmp1
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp1, ymm_tmp4, ymm_tmp5, ymm_yfrac0, ymm_yfrac1, ymm_tmp2
+    vpackssdw       ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vpavgw          ymm_tmp0, ymm_tmp0, ymm_0
+    vpackuswb       ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_7fff, ymm_tmp0, ymm_tmp1
+%endmacro
+
+%macro AVX2_BilinearAccurateDownsample4xOrLess_16px 0
+    vbroadcasti128  ymm_tmp0, xmm_shufb_0000000088888888
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_tmp0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_7fff
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp2, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp2, ymm_tmp2, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex2]
+    lea             i_xpos, [r_tmp0 + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vpunpcklbw      ymm_tmp3, ymm_xpos_int, ymm_db80h
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp3
+    vpshufb         ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_tmp0
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp0
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp0, ymm_tmp4, ymm_tmp2, ymm_yfrac0, ymm_yfrac1, ymm_tmp3
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp2, [p_src_row1 + r_tmp0]
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 2 * i_scalex2]
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp2, ymm_tmp2, [p_src_row1 + r_tmp0], 1
+    vpunpckhbw      ymm_tmp3, ymm_xpos_int, ymm_db80h
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp3
+    vpshufb         ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_tmp1
+    vpmaddwd        ymm_tmp2, ymm_tmp2, ymm_tmp1
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp1, ymm_tmp4, ymm_tmp2, ymm_yfrac0, ymm_yfrac1, ymm_tmp3
+    vpackssdw       ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vpavgw          ymm_tmp0, ymm_tmp0, ymm_0
+    vpackuswb       ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_7fff, ymm_tmp0, ymm_tmp1
+%endmacro
+
+%macro AVX2_BilinearAccurateDownsample8xOrLess_16px 0
+    vbroadcasti128  ymm_tmp0, xmm_shufb_000044448888CCCC
+    vpshufb         ymm_tmp0, ymm_xpos_int, ymm_tmp0
+    vpsubb          ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp0, ymm_tmp0, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp1, ymm_tmp1, [p_src_row1 + r_tmp0], 1
+    vpunpcklbw      ymm_tmp3, ymm_xpos_int, ymm_db80h
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_tmp3
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_tmp3
+    vpshufb         ymm_tmp0, ymm_tmp0, ymm_tmp3
+    vpshufb         ymm_tmp1, ymm_tmp1, ymm_tmp3
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 11001100b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp1, 11001100b
+    AVX2_UnpckXFrac ymm_tmp0, ymm_tmp1, ymm_xpos_frac, ymm_7fff
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_tmp0
+    vpmaddwd        ymm_tmp5, ymm_tmp5, ymm_tmp0
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp0, ymm_tmp4, ymm_tmp5, ymm_yfrac0, ymm_yfrac1, ymm_tmp3
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp4, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 4 * i_scalex2]
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp4, ymm_tmp4, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp5, ymm_tmp5, [p_src_row1 + r_tmp0], 1
+    mov             r_tmp0, i_xpos
+    lea             i_xpos, [i_xpos + 4 * i_scalex2]
+    shr             r_tmp0, 16
+    vmovdqu         xmm_tmp2, [p_src_row0 + r_tmp0]
+    vmovdqu         xmm_tmp3, [p_src_row1 + r_tmp0]
+    mov             r_tmp0, i_xpos
+    add             i_xpos, i_scalex2
+    shr             r_tmp0, 16
+    vinserti128     ymm_tmp2, ymm_tmp2, [p_src_row0 + r_tmp0], 1
+    vinserti128     ymm_tmp3, ymm_tmp3, [p_src_row1 + r_tmp0], 1
+    vpshufb         ymm_tmp4, ymm_tmp4, ymm_xpos_int
+    vpshufb         ymm_tmp5, ymm_tmp5, ymm_xpos_int
+    vpshufb         ymm_tmp2, ymm_tmp2, ymm_xpos_int
+    vpshufb         ymm_tmp3, ymm_tmp3, ymm_xpos_int
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp2, 10001000b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp3, 10001000b
+    vpunpckhbw      ymm_tmp4, ymm_tmp4, ymm_0
+    vpunpckhbw      ymm_tmp5, ymm_tmp5, ymm_0
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_tmp1
+    vpmaddwd        ymm_tmp5, ymm_tmp5, ymm_tmp1
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp1, ymm_tmp4, ymm_tmp5, ymm_yfrac0, ymm_yfrac1, ymm_tmp3
+    vpackssdw       ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vpavgw          ymm_tmp0, ymm_tmp0, ymm_0
+    vpackuswb       ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vmovlps         [p_dst], xmm_tmp0
+    vextracti128    [p_dst + 8], ymm_tmp0, 1
+    add             p_dst, 16
+    AVX2_BilinearIncXposw ymm_xpos_int, ymm_xpos_frac, ymm_xpos_int_inc, ymm_xpos_frac_inc, ymm_7fff, ymm_tmp0, ymm_tmp1
+%endmacro
+
+%macro AVX2_GeneralBilinearAccurateDownsample_16px 0
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp4, [p_src_row0 + r_tmp0]
+    vpbroadcastd    ymm_tmp5, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpunpcklwd      ymm_tmp4, ymm_tmp4, ymm_tmp0
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpunpcklwd      ymm_tmp5, ymm_tmp5, ymm_tmp0
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 00100010b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp0, 00100010b
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0 - 2]
+    vpblendw        ymm_tmp4, ymm_tmp4, ymm_tmp0, 1000b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0 - 2]
+    vpblendw        ymm_tmp5, ymm_tmp5, ymm_tmp0, 1000b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp2, [p_src_row0 + r_tmp0]
+    vpbroadcastd    ymm_tmp3, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + 1 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpunpcklwd      ymm_tmp2, ymm_tmp2, ymm_tmp0
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpunpcklwd      ymm_tmp3, ymm_tmp3, ymm_tmp0
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0]
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp0, 00100010b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0]
+    vpblendd        ymm_tmp3, ymm_tmp3, ymm_tmp0, 00100010b
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpbroadcastd    ymm_tmp0, [p_src_row0 + r_tmp0 - 2]
+    vpblendw        ymm_tmp2, ymm_tmp2, ymm_tmp0, 1000b
+    vpbroadcastd    ymm_tmp0, [p_src_row1 + r_tmp0 - 2]
+    vpblendw        ymm_tmp3, ymm_tmp3, ymm_tmp0, 1000b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovd           xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovd           xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 1
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 2
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 3
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 3
+    vpblendd        ymm_tmp4, ymm_tmp4, ymm_tmp0, 00001111b
+    vpblendd        ymm_tmp5, ymm_tmp5, ymm_tmp1, 00001111b
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    vmovd           xmm_tmp0, [p_src_row0 + r_tmp0]
+    vmovd           xmm_tmp1, [p_src_row1 + r_tmp0]
+    lea             r_tmp0, [i_xpos + i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 1
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 1
+    lea             r_tmp0, [i_xpos + 2 * i_scalex]
+    lea             i_xpos, [i_xpos + 4 * i_scalex]
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 2
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 2
+    mov             r_tmp0, i_xpos
+    sub             r_tmp0, i_scalex
+    shr             r_tmp0, 16
+    vpinsrw         xmm_tmp0, [p_src_row0 + r_tmp0], 3
+    vpinsrw         xmm_tmp1, [p_src_row1 + r_tmp0], 3
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp0, 00001111b
+    vpblendd        ymm_tmp3, ymm_tmp3, ymm_tmp1, 00001111b
+    vpunpcklbw      ymm_tmp4, ymm_tmp4, ymm_0
+    vpunpcklbw      ymm_tmp5, ymm_tmp5, ymm_0
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_xfrac0
+    vpmaddwd        ymm_tmp5, ymm_tmp5, ymm_xfrac0
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp0, ymm_tmp4, ymm_tmp5, ymm_yfrac0, ymm_yfrac1, ymm_tmp1
+    vpunpcklbw      ymm_tmp4, ymm_tmp2, ymm_0
+    vpunpcklbw      ymm_tmp5, ymm_tmp3, ymm_0
+    vpmaddwd        ymm_tmp4, ymm_tmp4, ymm_xfrac1
+    vpmaddwd        ymm_tmp5, ymm_tmp5, ymm_xfrac1
+    AVX2_LinearAccurateInterpolateVerticalDwords ymm_tmp1, ymm_tmp4, ymm_tmp5, ymm_yfrac0, ymm_yfrac1, ymm_tmp2
+    vpackssdw       ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vpavgw          ymm_tmp0, ymm_tmp0, ymm_0
+    vpackuswb       ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vextracti128    [p_dst], ymm_tmp0, 1
+    vmovlps         [p_dst + 8], xmm_tmp0
+    add             p_dst, 16
+    vpaddw          ymm_xfrac0, ymm_xfrac0, ymm_xfrac_inc
+    vpaddw          ymm_xfrac1, ymm_xfrac1, ymm_xfrac_inc
+    vpand           ymm_xfrac0, ymm_xfrac0, ymm_7fff
+    vpand           ymm_xfrac1, ymm_xfrac1, ymm_7fff
+%endmacro
+
+; downsample_16px_macro=%1 b_fast=%2
+%macro AVX2_GeneralBilinearDownsampler_loop 2
+%%height:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             p_src_row1, p_src_row0
+    add             p_src_row1, i_src_stride
+%ifdef X86_32
+%if %2
+    vpbroadcastw    ymm_tmp1, i_ypos
+    vpsllw          ymm_tmp1, ymm_tmp1, 1
+    vpsrlw          ymm_tmp1, ymm_tmp1, 1
+    vpcmpeqw        ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vpsrlw          ymm_tmp0, ymm_tmp0, 1
+%else
+    vpbroadcastd    ymm_tmp1, i_ypos
+    vpslld          ymm_tmp1, ymm_tmp1, 17
+    vpsrld          ymm_tmp1, ymm_tmp1, 17
+    vpcmpeqw        ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vpsrld          ymm_tmp0, ymm_tmp0, 17
+%endif
+    vpxor           ymm_tmp0, ymm_tmp0, ymm_tmp1
+    vmovdqa         ymm_yfrac0, ymm_tmp0
+    vmovdqa         ymm_yfrac1, ymm_tmp1
+%else
+    vmovd           xmm_tmp0, i_yposd
+    vpbroadcastw    ymm_yfrac1, xmm_tmp0
+%if %2
+    vpsllw          ymm_yfrac1, ymm_yfrac1, 1
+    vpsrlw          ymm_yfrac1, ymm_yfrac1, 1
+    vpcmpeqw        ymm_yfrac0, ymm_yfrac0, ymm_yfrac0
+    vpsrlw          ymm_yfrac0, ymm_yfrac0, 1
+%else
+    vpslld          ymm_yfrac1, ymm_yfrac1, 17
+    vpsrld          ymm_yfrac1, ymm_yfrac1, 17
+    vpcmpeqw        ymm_yfrac0, ymm_yfrac0, ymm_yfrac0
+    vpsrld          ymm_yfrac0, ymm_yfrac0, 17
+%endif
+    vpxor           ymm_yfrac0, ymm_yfrac0, ymm_yfrac1
+%endif
+
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+    sub             i_width_cnt, 1
+
+%ifdef ymm_xpos_int
+    vmovdqa         ymm_xpos_int, ymm_xpos_int_begin
+    vmovdqa         ymm_xpos_frac, ymm_xpos_frac_begin
+%else
+    vmovdqa         ymm_xfrac0, ymm_xfrac0_begin
+    vmovdqa         ymm_xfrac1, ymm_xfrac1_begin
+%endif
+
+%%width:
+    %1
+    sub             i_width_cnt, 16
+    jg              %%width
+
+    lea             p_dst, [p_dst + i_width_cnt + 1]
+%ifdef i_scalex2
+    mov             r_tmp0, i_scalex2
+    shr             r_tmp0, 1
+    imul            i_width_cnt, r_tmp0
+%else
+    imul            i_width_cnt, i_scalex
+%endif
+    add             i_xpos, i_width_cnt
+    shr             i_xpos, 16
+    movzx           r_tmp0, byte [p_src_row0 + i_xpos]
+    mov             [p_dst - 1], r_tmp0b
+%ifdef X86_32
+    mov             r_tmp0, i_scaleyd
+    add             i_yposd, r_tmp0
+%else
+    add             i_yposd, i_scaleyd
+%endif
+    add             p_dst, i_dst_stride_less_width
+    sub             i_dst_height, 1
+    jg              %%height
+%endmacro
+
+;**************************************************************************************************************
+;void GeneralBilinearFastDownsampler_avx2 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+;    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+;    uint32_t uiScaleY);
+;
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearFastDownsampler_avx2
+    %assign push_num 0
+%ifndef X86_32
+    push            r12
+    push            r13
+    push            rbx
+    push            rbp
+    %assign push_num 4
+%ifdef WIN64
+    push            rdi
+    push            rsi
+    %assign push_num push_num + 2
+%endif
+%endif
+    LOAD_7_PARA
+    PUSH_XMM 16
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    ZERO_EXTENSION  r6d
+    sub             r1, r2                                            ; dst_stride - dst_width
+%ifdef X86_32
+    vmovd           xmm0, arg8
+    vmovd           xmm1, esp
+    and             esp, -32
+%ifdef X86_32_PICASM
+    sub             esp, 8 * 4 + 9 * 32
+%else
+    sub             esp, 8 * 4 + 8 * 32
+%endif
+    vmovd           [esp], xmm1
+    %define p_dst                   r0
+    %define i_dst_stride_less_width [esp + 1 * 4]
+    %define i_dst_width             [esp + 2 * 4]
+    %define i_dst_height            dword [esp + 3 * 4]
+    %define p_src                   [esp + 4 * 4]
+    %define i_src_stride            [esp + 5 * 4]
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               [esp + 6 * 4]
+    %define i_xpos                  r2
+    %define i_ypos                  [esp + 7 * 4]
+    %define i_yposd                 dword [esp + 7 * 4]
+    %define p_src_row0              r3
+    %define p_src_row1              r4
+    %define i_width_cnt             r5
+    %define r_tmp0                  r1
+    %define r_tmp0b                 r1b
+    %define ymm_xpos_frac           ymm1
+    %define ymm_xpos_frac_inc       [esp + 8 * 4]
+    %define ymm_xpos_int            ymm3
+    %define ymm_xpos_int_inc        [esp + 8 * 4 + 1 * 32]
+    %define ymm_yfrac0              [esp + 8 * 4 + 2 * 32]
+    %define ymm_yfrac1              [esp + 8 * 4 + 3 * 32]
+    %define xmm_tmp0                xmm7
+    %define ymm_tmp0                ymm7
+    %define xmm_tmp1                xmm0
+    %define ymm_tmp1                ymm0
+    %define xmm_tmp2                xmm2
+    %define ymm_tmp2                ymm2
+    %define xmm_tmp3                xmm4
+    %define ymm_tmp3                ymm4
+    %define xmm_tmp4                xmm5
+    %define ymm_tmp4                ymm5
+    %define xmm_tmp5                xmm6
+    %define ymm_tmp5                ymm6
+    %define ymm_0                   [esp + 8 * 4 + 4 * 32]
+    %define ymm_ffff                [esp + 8 * 4 + 5 * 32]
+    %define ymm_xpos_int_begin      [esp + 8 * 4 + 6 * 32]
+    %define ymm_xpos_frac_begin     [esp + 8 * 4 + 7 * 32]
+%ifdef X86_32_PICASM
+    %define xmm_shufb_0000000088888888 [esp + 8 * 4 + 8 * 32]
+    %define xmm_shufb_000044448888CCCC [esp + 8 * 4 + 8 * 32 + 16]
+    vpxor           ymm_tmp4, ymm_tmp4, ymm_tmp4
+    vpcmpeqb        ymm_tmp5, ymm_tmp5, ymm_tmp5
+    vpsubb          ymm_tmp4, ymm_tmp4, ymm_tmp5
+    vpsllw          ymm_tmp3, ymm_tmp4, 3
+    vpslldq         ymm_tmp3, ymm_tmp3, 8
+    vmovdqa         xmm_shufb_0000000088888888, xmm_tmp3
+    vpsllq          ymm_tmp5, ymm_tmp4, 34
+    vpaddb          ymm_tmp5, ymm_tmp5, ymm_tmp3
+    vmovdqa         xmm_shufb_000044448888CCCC, xmm_tmp5
+%else
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    %define xmm_shufb_000044448888CCCC [shufb_000044448888CCCC]
+%endif
+    mov             i_dst_stride_less_width, r1
+    mov             i_dst_width, r2
+    mov             i_dst_height, r3
+    mov             p_src, r4
+    mov             i_src_stride, r5
+    vmovd           i_scaleyd, xmm0
+    vpxor           xmm0, xmm0, xmm0
+    vmovdqa         ymm_0, ymm0
+    vpcmpeqw        ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vmovdqa         ymm_ffff, ymm_tmp0
+%else
+    %define p_dst                   r0
+    %define i_dst_stride_less_width r1
+    %define i_dst_width             r2
+    %define i_dst_height            r3
+    %define p_src                   r4
+    %define i_src_stride            r5
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               dword arg8d
+    %define i_xpos                  r12
+    %define i_ypos                  r13
+    %define i_yposd                 r13d
+    %define p_src_row0              rbp
+%ifdef WIN64
+    %define p_src_row1              rsi
+    %define i_width_cnt             rdi
+%else
+    %define p_src_row1              r11
+    %define i_width_cnt             rax
+%endif
+    %define r_tmp0                  rbx
+    %define r_tmp0b                 bl
+    %define ymm_0                   ymm0
+    %define ymm_xpos_frac           ymm1
+    %define ymm_xpos_frac_inc       ymm2
+    %define ymm_xpos_int            ymm3
+    %define ymm_xpos_int_inc        ymm4
+    %define ymm_yfrac0              ymm5
+    %define ymm_yfrac1              ymm6
+    %define xmm_tmp0                xmm7
+    %define ymm_tmp0                ymm7
+    %define xmm_tmp1                xmm8
+    %define ymm_tmp1                ymm8
+    %define xmm_tmp2                xmm9
+    %define ymm_tmp2                ymm9
+    %define xmm_tmp3                xmm10
+    %define ymm_tmp3                ymm10
+    %define xmm_tmp4                xmm11
+    %define ymm_tmp4                ymm11
+    %define xmm_tmp5                xmm12
+    %define ymm_tmp5                ymm12
+    %define ymm_ffff                ymm13
+    %define ymm_xpos_int_begin      ymm14
+    %define ymm_xpos_frac_begin     ymm15
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    %define xmm_shufb_000044448888CCCC [shufb_000044448888CCCC]
+    vpxor           ymm_0, ymm_0, ymm_0
+    vpcmpeqw        ymm_ffff, ymm_ffff, ymm_ffff
+%endif
+
+    sub             i_dst_height, 1
+    je              .final_row
+    jl              .done
+
+    mov             i_yposd, 1 << 14
+    vmovd           xmm_tmp0, i_scalexd
+    vpbroadcastd    ymm_tmp0, xmm_tmp0
+    vpslld          ymm_tmp1, ymm_tmp0, 2
+    vpslld          ymm_tmp2, ymm_tmp0, 3
+    vpaddd          ymm_tmp3, ymm_tmp1, ymm_tmp2
+    vpxor           ymm_tmp4, ymm_tmp4, ymm_tmp4
+    vpblendd        ymm_tmp1, ymm_tmp4, ymm_tmp1, 11110000b
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp3, 11110000b
+    vpaddd          ymm_tmp3, ymm_tmp0, ymm_tmp0
+    vpblendd        ymm_tmp3, ymm_tmp4, ymm_tmp3, 11001100b
+    vpblendd        ymm_tmp0, ymm_tmp4, ymm_tmp0, 10101010b
+    vpaddd          ymm_tmp0, ymm_tmp3, ymm_tmp0
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp0
+    vpaddd          ymm_tmp2, ymm_tmp2, ymm_tmp0
+    vpcmpeqw        ymm_tmp3, ymm_tmp3, ymm_tmp3
+    vpsrld          ymm_tmp3, ymm_tmp3, 31
+    vpslld          ymm_tmp3, ymm_tmp3, 15
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp3
+    vpaddd          ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpsrld          ymm_xpos_int, ymm_tmp1, 16
+    vpsrld          ymm_tmp0, ymm_tmp2, 16
+    vpackssdw       ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    vpermq          ymm_xpos_int, ymm_xpos_int, 11011000b
+    vpackuswb       ymm_xpos_int, ymm_xpos_int, ymm_xpos_int
+    vpcmpeqw        ymm_tmp3, ymm_tmp3, ymm_tmp3
+    vpsubb          ymm_tmp0, ymm_xpos_int, ymm_tmp3
+    vpunpcklbw      ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    vpslld          ymm_tmp1, ymm_tmp1, 16
+    vpsrld          ymm_tmp1, ymm_tmp1, 16
+    vpslld          ymm_tmp2, ymm_tmp2, 16
+    vpsrld          ymm_tmp2, ymm_tmp2, 16
+    vpackusdw       ymm_xpos_frac, ymm_tmp1, ymm_tmp2
+    vpermq          ymm_xpos_frac, ymm_xpos_frac, 11011000b
+    vmovd           xmm_tmp0, i_scalexd
+    vpslld          xmm_tmp0, xmm_tmp0, 4
+    vpbroadcastw    ymm_tmp1, xmm_tmp0
+    vmovdqa         ymm_xpos_frac_inc, ymm_tmp1
+    vpsrld          xmm_tmp0, xmm_tmp0, 16
+    vpsubw          ymm_tmp0, ymm_tmp0, ymm_tmp3
+    vpbroadcastb    ymm_tmp0, xmm_tmp0
+    vmovdqa         ymm_xpos_int_inc, ymm_tmp0
+    vmovdqa         ymm_xpos_int_begin, ymm_xpos_int
+    vmovdqa         ymm_xpos_frac_begin, ymm_xpos_frac
+
+    cmp             i_scalex, 4 << 16
+    ja              .scalex_above4
+    cmp             i_scalex, 2 << 16
+    ja              .scalex_above2_beloweq4
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearFastDownsample2xOrLess_16px, 1
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above2_beloweq4:
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearFastDownsample4xOrLess_16px, 1
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above4:
+    cmp             i_scalex, 8 << 16
+    ja              .scalex_above8
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearFastDownsample8xOrLess_16px, 1
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above8:
+%xdefine ymm_xfrac0 ymm_xpos_frac
+%xdefine ymm_xfrac1 ymm_xpos_int
+%xdefine ymm_xfrac0_begin ymm_xpos_int_begin
+%xdefine ymm_xfrac1_begin ymm_xpos_frac_begin
+%xdefine ymm_xfrac_inc ymm_xpos_frac_inc
+%undef ymm_xpos_int
+%undef ymm_xpos_frac
+%undef ymm_xpos_int_begin
+%undef ymm_xpos_frac_begin
+%undef ymm_xpos_int_inc
+%undef ymm_xpos_frac_inc
+    AVX2_UnpckXFrac ymm_tmp0, ymm_xfrac1, ymm_xfrac0, ymm_ffff
+    vpermq          ymm_xfrac0, ymm_tmp0,   01001110b
+    vpermq          ymm_xfrac1, ymm_xfrac1, 01001110b
+    vmovdqa         ymm_xfrac0_begin, ymm_xfrac0
+    vmovdqa         ymm_xfrac1_begin, ymm_xfrac1
+    vpcmpeqw        ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vpmullw         ymm_tmp0, ymm_tmp0, ymm_xfrac_inc
+    vpunpcklwd      ymm_tmp0, ymm_tmp0, ymm_xfrac_inc
+    vmovdqa         ymm_xfrac_inc, ymm_tmp0
+    AVX2_GeneralBilinearDownsampler_loop AVX2_GeneralBilinearFastDownsample_16px, 1
+
+.final_row:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+
+.final_row_width:
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movzx           r_tmp0, byte [p_src_row0 + r_tmp0]
+    mov             [p_dst], r_tmp0b
+    add             p_dst, 1
+    add             i_xpos, i_scalex
+    sub             i_width_cnt, 1
+    jg              .final_row_width
+
+.done:
+    vzeroupper
+%ifdef X86_32
+    mov             esp, [esp]
+%endif
+    POP_XMM
+    LOAD_7_PARA_POP
+%ifndef X86_32
+%ifdef WIN64
+    pop             rsi
+    pop             rdi
+%endif
+    pop             rbp
+    pop             rbx
+    pop             r13
+    pop             r12
+%endif
+    ret
+%undef p_dst
+%undef i_dst_stride_less_width
+%undef i_dst_width
+%undef i_dst_height
+%undef p_src
+%undef i_src_stride
+%undef i_scalex
+%undef i_scalexd
+%undef i_scaleyd
+%undef i_xpos
+%undef i_ypos
+%undef i_yposd
+%undef p_src_row0
+%undef p_src_row1
+%undef i_width_cnt
+%undef r_tmp0
+%undef r_tmp0b
+%undef ymm_xpos_frac
+%undef ymm_xpos_frac_inc
+%undef ymm_xpos_int
+%undef ymm_xpos_int_inc
+%undef ymm_yfrac0
+%undef ymm_yfrac1
+%undef xmm_tmp0
+%undef ymm_tmp0
+%undef xmm_tmp1
+%undef ymm_tmp1
+%undef xmm_tmp2
+%undef ymm_tmp2
+%undef xmm_tmp3
+%undef ymm_tmp3
+%undef xmm_tmp4
+%undef ymm_tmp4
+%undef xmm_tmp5
+%undef ymm_tmp5
+%undef ymm_ffff
+%undef ymm_0
+%undef ymm_xpos_int_begin
+%undef ymm_xpos_frac_begin
+%undef ymm_xfrac0
+%undef ymm_xfrac1
+%undef ymm_xfrac0_begin
+%undef ymm_xfrac1_begin
+%undef ymm_xfrac_inc
+%undef xmm_shufb_0000000088888888
+%undef xmm_shufb_000044448888CCCC
+
+;**************************************************************************************************************
+;void GeneralBilinearAccurateDownsampler_avx2 (uint8_t* pDst, int32_t iDstStride, int32_t iDstWidth,
+;    int32_t iDstHeight, uint8_t* pSrc, int32_t iSrcStride, uint32_t uiScaleX,
+;    uint32_t uiScaleY);
+;
+;**************************************************************************************************************
+
+WELS_EXTERN GeneralBilinearAccurateDownsampler_avx2
+    %assign push_num 0
+%ifndef X86_32
+    push            r12
+    push            r13
+    push            rbx
+    push            rbp
+    %assign push_num 4
+%ifdef WIN64
+    push            rdi
+    push            rsi
+    %assign push_num push_num + 2
+%endif
+%endif
+    LOAD_7_PARA
+    PUSH_XMM 16
+    SIGN_EXTENSION  r1, r1d
+    SIGN_EXTENSION  r2, r2d
+    SIGN_EXTENSION  r3, r3d
+    SIGN_EXTENSION  r5, r5d
+    ZERO_EXTENSION  r6d
+    sub             r1, r2                                            ; dst_stride - dst_width
+    add             r6, r6                                            ; 2 * scalex
+%ifdef X86_32
+    vmovd           xmm0, arg8
+    vmovd           xmm1, esp
+    and             esp, -32
+%ifdef X86_32_PICASM
+    sub             esp, 8 * 4 + 10 * 32
+%else
+    sub             esp, 8 * 4 + 8 * 32
+%endif
+    vmovd           [esp], xmm1
+    %define p_dst                   r0
+    %define i_dst_stride_less_width [esp + 1 * 4]
+    %define i_dst_width             [esp + 2 * 4]
+    %define i_dst_height            dword [esp + 3 * 4]
+    %define p_src                   [esp + 4 * 4]
+    %define i_src_stride            [esp + 5 * 4]
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               [esp + 6 * 4]
+    %define i_xpos                  r2
+    %define i_ypos                  [esp + 7 * 4]
+    %define i_yposd                 dword [esp + 7 * 4]
+    %define p_src_row0              r3
+    %define p_src_row1              r4
+    %define i_width_cnt             r5
+    %define r_tmp0                  r1
+    %define r_tmp0b                 r1b
+    %define ymm_xpos_frac           ymm1
+    %define ymm_xpos_frac_inc       [esp + 8 * 4]
+    %define ymm_xpos_int            ymm3
+    %define ymm_xpos_int_inc        [esp + 8 * 4 + 1 * 32]
+    %define ymm_yfrac0              [esp + 8 * 4 + 2 * 32]
+    %define ymm_yfrac1              [esp + 8 * 4 + 3 * 32]
+    %define xmm_tmp0                xmm7
+    %define ymm_tmp0                ymm7
+    %define xmm_tmp1                xmm0
+    %define ymm_tmp1                ymm0
+    %define xmm_tmp2                xmm2
+    %define ymm_tmp2                ymm2
+    %define xmm_tmp3                xmm4
+    %define ymm_tmp3                ymm4
+    %define xmm_tmp4                xmm5
+    %define ymm_tmp4                ymm5
+    %define xmm_tmp5                xmm6
+    %define ymm_tmp5                ymm6
+    %define ymm_0                   [esp + 8 * 4 + 4 * 32]
+    %define ymm_7fff                [esp + 8 * 4 + 5 * 32]
+    %define ymm_xpos_int_begin      [esp + 8 * 4 + 6 * 32]
+    %define ymm_xpos_frac_begin     [esp + 8 * 4 + 7 * 32]
+%ifdef X86_32_PICASM
+    %define ymm_db80h                  [esp + 8 * 4 + 8 * 32]
+    %define xmm_shufb_0000000088888888 [esp + 8 * 4 + 9 * 32]
+    %define xmm_shufb_000044448888CCCC [esp + 8 * 4 + 9 * 32 + 16]
+    vpxor           ymm_tmp4, ymm_tmp4, ymm_tmp4
+    vpcmpeqb        ymm_tmp5, ymm_tmp5, ymm_tmp5
+    vpsubb          ymm_tmp4, ymm_tmp4, ymm_tmp5
+    vpsllw          ymm_tmp3, ymm_tmp4, 3
+    vpslldq         ymm_tmp3, ymm_tmp3, 8
+    vmovdqa         xmm_shufb_0000000088888888, xmm_tmp3
+    vpsllq          ymm_tmp5, ymm_tmp4, 34
+    vpaddb          ymm_tmp5, ymm_tmp5, ymm_tmp3
+    vmovdqa         xmm_shufb_000044448888CCCC, xmm_tmp5
+    vpsllw          ymm_tmp4, ymm_tmp4, 7
+    vmovdqa         ymm_db80h, ymm_tmp4
+%else
+    %define ymm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    %define xmm_shufb_000044448888CCCC [shufb_000044448888CCCC]
+%endif
+    mov             i_dst_stride_less_width, r1
+    mov             i_dst_width, r2
+    mov             i_dst_height, r3
+    mov             p_src, r4
+    mov             i_src_stride, r5
+    vmovd           i_scaleyd, xmm0
+    vpxor           xmm0, xmm0, xmm0
+    vmovdqa         ymm_0, ymm0
+    vpcmpeqw        ymm0, ymm0, ymm0
+    vpsrlw          ymm0, ymm0, 1
+    vmovdqa         ymm_7fff, ymm0
+%else
+    %define p_dst                   r0
+    %define i_dst_stride_less_width r1
+    %define i_dst_width             r2
+    %define i_dst_height            r3
+    %define p_src                   r4
+    %define i_src_stride            r5
+    %define i_scalex                r6
+    %define i_scalexd               r6d
+    %define i_scaleyd               dword arg8d
+    %define i_xpos                  r12
+    %define i_ypos                  r13
+    %define i_yposd                 r13d
+    %define p_src_row0              rbp
+%ifdef WIN64
+    %define p_src_row1              rsi
+    %define i_width_cnt             rdi
+%else
+    %define p_src_row1              r11
+    %define i_width_cnt             rax
+%endif
+    %define r_tmp0                  rbx
+    %define r_tmp0b                 bl
+    %define ymm_0                   ymm0
+    %define ymm_xpos_frac           ymm1
+    %define ymm_xpos_int            ymm3
+    %define ymm_xpos_frac_inc       ymm2
+    %define ymm_xpos_int_inc        ymm4
+    %define ymm_yfrac0              ymm5
+    %define ymm_yfrac1              ymm6
+    %define xmm_tmp0                xmm7
+    %define ymm_tmp0                ymm7
+    %define xmm_tmp1                xmm8
+    %define ymm_tmp1                ymm8
+    %define xmm_tmp2                xmm9
+    %define ymm_tmp2                ymm9
+    %define xmm_tmp3                xmm10
+    %define ymm_tmp3                ymm10
+    %define xmm_tmp4                xmm11
+    %define ymm_tmp4                ymm11
+    %define xmm_tmp5                xmm12
+    %define ymm_tmp5                ymm12
+    %define ymm_7fff                ymm13
+    %define ymm_xpos_int_begin      ymm14
+    %define ymm_xpos_frac_begin     ymm15
+    %define ymm_db80h               [db80h_256]
+    %define xmm_shufb_0000000088888888 [shufb_0000000088888888]
+    %define xmm_shufb_000044448888CCCC [shufb_000044448888CCCC]
+    vpxor           ymm_0, ymm_0, ymm_0
+    vpcmpeqw        ymm_7fff, ymm_7fff, ymm_7fff
+    vpsrlw          ymm_7fff, ymm_7fff, 1
+%endif
+
+    sub             i_dst_height, 1
+    je              .final_row
+    jl              .done
+
+    mov             i_yposd, 1 << 14
+    vmovd           xmm_tmp0, i_scalexd
+    vpbroadcastd    ymm_tmp0, xmm_tmp0
+    vpslld          ymm_tmp1, ymm_tmp0, 2
+    vpslld          ymm_tmp2, ymm_tmp0, 3
+    vpaddd          ymm_tmp3, ymm_tmp1, ymm_tmp2
+    vpxor           ymm_tmp4, ymm_tmp4, ymm_tmp4
+    vpblendd        ymm_tmp1, ymm_tmp4, ymm_tmp1, 11110000b
+    vpblendd        ymm_tmp2, ymm_tmp2, ymm_tmp3, 11110000b
+    vpaddd          ymm_tmp3, ymm_tmp0, ymm_tmp0
+    vpblendd        ymm_tmp3, ymm_tmp4, ymm_tmp3, 11001100b
+    vpblendd        ymm_tmp0, ymm_tmp4, ymm_tmp0, 10101010b
+    vpaddd          ymm_tmp0, ymm_tmp3, ymm_tmp0
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp0
+    vpaddd          ymm_tmp2, ymm_tmp2, ymm_tmp0
+    vpcmpeqw        ymm_tmp3, ymm_tmp3, ymm_tmp3
+    vpsrld          ymm_tmp3, ymm_tmp3, 31
+    vpslld          ymm_tmp3, ymm_tmp3, 15
+    vpaddd          ymm_tmp1, ymm_tmp1, ymm_tmp3
+    vpaddd          ymm_tmp2, ymm_tmp2, ymm_tmp3
+    vpsrld          ymm_xpos_int, ymm_tmp1, 16
+    vpsrld          ymm_tmp0, ymm_tmp2, 16
+    vpackssdw       ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    vpermq          ymm_xpos_int, ymm_xpos_int, 11011000b
+    vpackuswb       ymm_xpos_int, ymm_xpos_int, ymm_xpos_int
+    vpcmpeqw        ymm_tmp3, ymm_tmp3, ymm_tmp3
+    vpsubb          ymm_tmp0, ymm_xpos_int, ymm_tmp3
+    vpunpcklbw      ymm_xpos_int, ymm_xpos_int, ymm_tmp0
+    vpslld          ymm_tmp1, ymm_tmp1, 16
+    vpsrld          ymm_tmp1, ymm_tmp1, 16
+    vpslld          ymm_tmp2, ymm_tmp2, 16
+    vpsrld          ymm_tmp2, ymm_tmp2, 16
+    vpackusdw       ymm_xpos_frac, ymm_tmp1, ymm_tmp2
+    vpermq          ymm_xpos_frac, ymm_xpos_frac, 11011000b
+    vpsrlw          ymm_xpos_frac, ymm_xpos_frac, 1
+    vmovd           xmm_tmp0, i_scalexd
+    vpslld          xmm_tmp0, xmm_tmp0, 4
+    vpbroadcastw    ymm_tmp1, xmm_tmp0
+    vpsrlw          ymm_tmp1, ymm_tmp1, 1
+    vmovdqa         ymm_xpos_frac_inc, ymm_tmp1
+    vpsrld          xmm_tmp0, xmm_tmp0, 16
+    vpsubw          ymm_tmp0, ymm_tmp0, ymm_tmp3
+    vpbroadcastb    ymm_tmp0, xmm_tmp0
+    vmovdqa         ymm_xpos_int_inc, ymm_tmp0
+    vmovdqa         ymm_xpos_int_begin, ymm_xpos_int
+    vmovdqa         ymm_xpos_frac_begin, ymm_xpos_frac
+
+    cmp             i_scalex, 4 << 16
+    ja              .scalex_above4
+    cmp             i_scalex, 2 << 16
+    ja              .scalex_above2_beloweq4
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearAccurateDownsample2xOrLess_16px, 0
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above2_beloweq4:
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearAccurateDownsample4xOrLess_16px, 0
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above4:
+    cmp             i_scalex, 8 << 16
+    ja              .scalex_above8
+    add             i_scalex, i_scalex
+%xdefine i_scalex2 i_scalex
+%undef i_scalex
+    AVX2_GeneralBilinearDownsampler_loop AVX2_BilinearAccurateDownsample8xOrLess_16px, 0
+    shr             i_scalex2, 1
+%xdefine i_scalex i_scalex2
+%undef i_scalex2
+    jmp             .final_row
+.scalex_above8:
+%xdefine ymm_xfrac0 ymm_xpos_frac
+%xdefine ymm_xfrac1 ymm_xpos_int
+%xdefine ymm_xfrac0_begin ymm_xpos_int_begin
+%xdefine ymm_xfrac1_begin ymm_xpos_frac_begin
+%xdefine ymm_xfrac_inc ymm_xpos_frac_inc
+%undef ymm_xpos_int
+%undef ymm_xpos_frac
+%undef ymm_xpos_int_begin
+%undef ymm_xpos_frac_begin
+%undef ymm_xpos_int_inc
+%undef ymm_xpos_frac_inc
+    AVX2_UnpckXFrac ymm_tmp0, ymm_xfrac1, ymm_xfrac0, ymm_7fff
+    vpermq          ymm_xfrac0, ymm_tmp0,   01001110b
+    vpermq          ymm_xfrac1, ymm_xfrac1, 01001110b
+    vmovdqa         ymm_xfrac0_begin, ymm_xfrac0
+    vmovdqa         ymm_xfrac1_begin, ymm_xfrac1
+    vpcmpeqw        ymm_tmp0, ymm_tmp0, ymm_tmp0
+    vpmullw         ymm_tmp0, ymm_tmp0, ymm_xfrac_inc
+    vpunpcklwd      ymm_tmp0, ymm_tmp0, ymm_xfrac_inc
+    vmovdqa         ymm_xfrac_inc, ymm_tmp0
+    AVX2_GeneralBilinearDownsampler_loop AVX2_GeneralBilinearAccurateDownsample_16px, 0
+
+.final_row:
+    mov             p_src_row0, i_ypos
+    shr             p_src_row0, 15
+    imul            p_src_row0, i_src_stride
+    add             p_src_row0, p_src
+    mov             i_xpos, 1 << 15
+    mov             i_width_cnt, i_dst_width
+
+.final_row_width:
+    mov             r_tmp0, i_xpos
+    shr             r_tmp0, 16
+    movzx           r_tmp0, byte [p_src_row0 + r_tmp0]
+    mov             [p_dst], r_tmp0b
+    add             p_dst, 1
+    add             i_xpos, i_scalex
+    sub             i_width_cnt, 1
+    jg              .final_row_width
+
+.done:
+    vzeroupper
+%ifdef X86_32
+    mov             esp, [esp]
+%endif
+    POP_XMM
+    LOAD_7_PARA_POP
+%ifndef X86_32
+%ifdef WIN64
+    pop             rsi
+    pop             rdi
+%endif
+    pop             rbp
+    pop             rbx
+    pop             r13
+    pop             r12
+%endif
+    ret
+%undef p_dst
+%undef i_dst_stride_less_width
+%undef i_dst_width
+%undef i_dst_height
+%undef p_src
+%undef i_src_stride
+%undef i_scalex
+%undef i_scalexd
+%undef i_scaleyd
+%undef i_xpos
+%undef i_ypos
+%undef i_yposd
+%undef p_src_row0
+%undef p_src_row1
+%undef i_width_cnt
+%undef r_tmp0
+%undef r_tmp0b
+%undef ymm_xpos_frac
+%undef ymm_xpos_frac_inc
+%undef ymm_xpos_int
+%undef ymm_xpos_int_inc
+%undef ymm_yfrac0
+%undef ymm_yfrac1
+%undef xmm_tmp0
+%undef ymm_tmp0
+%undef xmm_tmp1
+%undef ymm_tmp1
+%undef xmm_tmp2
+%undef ymm_tmp2
+%undef xmm_tmp3
+%undef ymm_tmp3
+%undef xmm_tmp4
+%undef ymm_tmp4
+%undef xmm_tmp5
+%undef ymm_tmp5
+%undef ymm_0
+%undef ymm_7fff
+%undef ymm_xpos_int_begin
+%undef ymm_xpos_frac_begin
+%undef ymm_xfrac0
+%undef ymm_xfrac1
+%undef ymm_xfrac0_begin
+%undef ymm_xfrac1_begin
+%undef ymm_xfrac_inc
+%undef ymm_db80h
+%undef xmm_shufb_0000000088888888
+%undef xmm_shufb_000044448888CCCC
+
+%endif
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/vaa.asm b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/vaa.asm
new file mode 100644
index 0000000000..9b728576b4
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/src/x86/vaa.asm
@@ -0,0 +1,3563 @@
+;*!
+;* \copy
+;*     Copyright (c)  2010-2013, Cisco Systems
+;*     All rights reserved.
+;*
+;*     Redistribution and use in source and binary forms, with or without
+;*     modification, are permitted provided that the following conditions
+;*     are met:
+;*
+;*        * Redistributions of source code must retain the above copyright
+;*          notice, this list of conditions and the following disclaimer.
+;*
+;*        * Redistributions in binary form must reproduce the above copyright
+;*          notice, this list of conditions and the following disclaimer in
+;*          the documentation and/or other materials provided with the
+;*          distribution.
+;*
+;*     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+;*     "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+;*     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+;*     FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+;*     COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+;*     INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+;*     BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+;*     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+;*     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+;*     LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+;*     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+;*     POSSIBILITY OF SUCH DAMAGE.
+;*
+;*
+;*      vaa.asm
+;*
+;*      Abstract
+;*      sse2 for pVaa routines
+;*
+;*  History
+;*      04/14/2010      Created
+;*              06/07/2010      Added AnalysisVaaInfoIntra_sse2(ssse3)
+;*              06/10/2010      Tune rc_sad_frame_sse2 and got about 40% improvement
+;*              08/11/2010      Added abs_difference_mbrow_sse2 & sum_sqrsum_mbrow_sse2
+;*
+;*************************************************************************/
+%include "asm_inc.asm"
+
+
+;***********************************************************************
+; Macros and other preprocessor constants
+;***********************************************************************
+%macro SUM_SQR_SSE2     3       ; dst, pSrc, zero
+    movdqa %1, %2
+    punpcklbw %1, %3
+    punpckhbw %2, %3
+    pmaddwd %1, %1
+    pmaddwd %2, %2
+    paddd %1, %2
+    pshufd %2, %1, 04Eh   ; 01001110 B
+    paddd %1, %2
+    pshufd %2, %1, 0B1h   ; 10110001 B
+    paddd %1, %2
+%endmacro       ; END OF SUM_SQR_SSE2
+
+%macro WELS_SAD_16x2_SSE2  3 ;esi :%1 edi:%2 ebx:%3
+    movdqa        xmm1,   [%1]
+    movdqa        xmm2,   [%2]
+    movdqa        xmm3,   [%1+%3]
+    movdqa        xmm4,   [%2+%3]
+    psadbw        xmm1,   xmm2
+    psadbw        xmm3,   xmm4
+    paddd xmm6,   xmm1
+    paddd xmm6,   xmm3
+    lea           %1,     [%1+%3*2]
+    lea           %2,     [%2+%3*2]
+%endmacro
+
+; by comparing it outperforms than phaddw(SSSE3) sets
+%macro SUM_WORD_8x2_SSE2        2       ; dst(pSrc), tmp
+    ; @sum_8x2 begin
+    pshufd %2, %1, 04Eh   ; 01001110 B
+    paddw %1, %2
+    pshuflw %2, %1, 04Eh  ; 01001110 B
+    paddw %1, %2
+    pshuflw %2, %1, 0B1h  ; 10110001 B
+    paddw %1, %2
+    ; end of @sum_8x2
+%endmacro       ; END of SUM_WORD_8x2_SSE2
+
+%macro WELS_SAD_SUM_SQSUM_16x1_SSE2 3 ;esi:%1,edi:%2,ebx:%3
+    movdqa        xmm1,   [%1]
+    movdqa        xmm2,   [%2]
+    movdqa        xmm3,   xmm1
+    psadbw        xmm3,   xmm2
+    paddd         xmm6,   xmm3
+
+    movdqa        xmm3,   xmm1
+    psadbw        xmm3,   xmm0
+    paddd         xmm5,   xmm3
+
+    movdqa        xmm2,   xmm1
+    punpcklbw     xmm1,   xmm0
+    punpckhbw     xmm2,   xmm0
+    pmaddwd               xmm1,   xmm1
+    pmaddwd               xmm2,   xmm2
+    paddd         xmm4,   xmm1
+    paddd         xmm4,   xmm2
+
+    add           %1,     %3
+    add           %2,     %3
+%endmacro
+
+%macro WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 3 ;esi:%1 edi:%2 ebx:%3
+    movdqa        xmm1,   [%1]
+    movdqa        xmm2,   [%2]
+    movdqa        xmm3,   xmm1
+    psadbw        xmm3,   xmm2
+    paddd         xmm7,   xmm3    ; sad
+
+    movdqa        xmm3,   xmm1
+    pmaxub        xmm3,   xmm2
+    pminub        xmm2,   xmm1
+    psubb xmm3,   xmm2    ; diff
+
+    movdqa        xmm2,   xmm1
+    psadbw        xmm2,   xmm0
+    paddd xmm6,   xmm2    ; sum
+
+    movdqa                xmm2,   xmm1
+    punpcklbw     xmm1,   xmm0
+    punpckhbw     xmm2,   xmm0
+    pmaddwd               xmm1,   xmm1
+    pmaddwd               xmm2,   xmm2
+    paddd         xmm5,   xmm1
+    paddd         xmm5,   xmm2    ; sqsum
+
+    movdqa                xmm1,   xmm3
+    punpcklbw     xmm1,   xmm0
+    punpckhbw     xmm3,   xmm0
+    pmaddwd               xmm1,   xmm1
+    pmaddwd               xmm3,   xmm3
+    paddd         xmm4,   xmm1
+    paddd         xmm4,   xmm3    ; sqdiff
+
+    add           %1,     %3
+    add           %2,     %3
+%endmacro
+
+%macro WELS_SAD_SD_MAD_16x1_SSE2       7 ;esi:%5 edi:%6 ebx:%7
+%define sad_reg                 %1
+%define sum_cur_reg             %2
+%define sum_ref_reg             %3
+%define mad_reg                 %4
+    movdqa        xmm1,           [%5]
+    movdqa        xmm2,           [%6]
+    movdqa        xmm3,           xmm1
+    psadbw        xmm3,           xmm0
+    paddd         sum_cur_reg,    xmm3    ; sum_cur
+    movdqa        xmm3,           xmm2
+    psadbw        xmm3,           xmm0
+    paddd sum_ref_reg,                    xmm3    ; sum_ref
+
+    movdqa        xmm3,           xmm1
+    pmaxub        xmm3,           xmm2
+    pminub        xmm2,           xmm1
+    psubb xmm3,           xmm2    ; abs diff
+    pmaxub        mad_reg,        xmm3    ; max abs diff
+
+    psadbw        xmm3,           xmm0
+    paddd sad_reg,        xmm3    ; sad
+
+    add                   %5,             %7
+    add                   %6,             %7
+%endmacro
+
+
+%macro WELS_MAX_REG_SSE2       1       ; xmm1, xmm2, xmm3 can be used
+%define max_reg  %1
+    movdqa        xmm1,           max_reg
+    psrldq        xmm1,           4
+    pmaxub        max_reg,        xmm1
+    movdqa        xmm1,           max_reg
+    psrldq        xmm1,           2
+    pmaxub        max_reg,        xmm1
+    movdqa        xmm1,           max_reg
+    psrldq        xmm1,           1
+    pmaxub        max_reg,        xmm1
+%endmacro
+
+%macro WELS_SAD_BGD_SQDIFF_16x1_SSE2   7 ;esi:%5 edi:%6 ebx:%7
+%define sad_reg         %1
+%define sum_reg         %2
+%define mad_reg         %3
+%define sqdiff_reg      %4
+    movdqa                xmm1,           [%5]
+    movdqa                xmm2,           xmm1
+    movdqa                xmm3,           xmm1
+    punpcklbw     xmm2,           xmm0
+    punpckhbw     xmm3,           xmm0
+    pmaddwd               xmm2,           xmm2
+    pmaddwd               xmm3,           xmm3
+    paddd         xmm2,           xmm3
+    movdqa                xmm3,           xmm2
+    psllq         xmm2,           32
+    psrlq         xmm3,           32
+    psllq         xmm3,           32
+    paddd         xmm2,           xmm3
+    paddd         sad_reg,        xmm2            ; sqsum
+
+    movdqa        xmm2,           [%6]
+    movdqa        xmm3,           xmm1
+    psadbw        xmm3,           xmm0
+    paddd sum_reg,                        xmm3    ; sum_cur
+    movdqa        xmm3,           xmm2
+    psadbw        xmm3,           xmm0
+    pslldq        xmm3,           4
+    paddd sum_reg,                        xmm3    ; sum_ref
+
+    movdqa        xmm3,           xmm1
+    pmaxub        xmm3,           xmm2
+    pminub        xmm2,           xmm1
+    psubb xmm3,           xmm2    ; abs diff
+    pmaxub        mad_reg,        xmm3    ; max abs diff
+
+    movdqa        xmm1,           xmm3
+    psadbw        xmm3,           xmm0
+    paddd sad_reg,        xmm3    ; sad
+
+    movdqa                xmm3,   xmm1
+    punpcklbw     xmm1,   xmm0
+    punpckhbw     xmm3,   xmm0
+    pmaddwd               xmm1,   xmm1
+    pmaddwd               xmm3,   xmm3
+    paddd         sqdiff_reg,     xmm1
+    paddd         sqdiff_reg,     xmm3    ; sqdiff
+
+    add           %5,     %7
+    add           %6,     %7
+%endmacro
+
+
+;***********************************************************************
+; Code
+;***********************************************************************
+
+SECTION .text
+
+%ifdef X86_32
+
+;***********************************************************************
+;   void SampleVariance16x16_sse2(      uint8_t * y_ref, int32_t y_ref_stride, uint8_t * y_src, int32_t y_src_stride,SMotionTextureUnit* pMotionTexture );
+;***********************************************************************
+WELS_EXTERN SampleVariance16x16_sse2
+    push esi
+    push edi
+    push ebx
+
+    sub esp, 16
+    %define SUM                   [esp]
+    %define SUM_CUR               [esp+4]
+    %define SQR                   [esp+8]
+    %define SQR_CUR               [esp+12]
+    %define PUSH_SIZE     28      ; 12 + 16
+
+    mov edi, [esp+PUSH_SIZE+4]    ; y_ref
+    mov edx, [esp+PUSH_SIZE+8]    ; y_ref_stride
+    mov esi, [esp+PUSH_SIZE+12]   ; y_src
+    mov eax, [esp+PUSH_SIZE+16]   ; y_src_stride
+    mov ecx, 010h                         ; height = 16
+
+    pxor xmm7, xmm7
+    movdqu SUM, xmm7
+
+.hloops:
+    movdqa xmm0, [edi]            ; y_ref
+    movdqa xmm1, [esi]            ; y_src
+    movdqa xmm2, xmm0             ; store first for future process
+    movdqa xmm3, xmm1
+    ; sum += diff;
+    movdqa xmm4, xmm0
+    psadbw xmm4, xmm1             ; 2 parts, [0,..,15], [64,..,79]
+    ; to be continued for sum
+    pshufd xmm5, xmm4, 0C6h       ; 11000110 B
+    paddw xmm4, xmm5
+    movd ebx, xmm4
+    add SUM, ebx
+
+    ; sqr += diff * diff;
+    pmaxub xmm0, xmm1
+    pminub xmm1, xmm2
+    psubb xmm0, xmm1                              ; diff
+    SUM_SQR_SSE2 xmm1, xmm0, xmm7 ; dst, pSrc, zero
+    movd ebx, xmm1
+    add SQR, ebx
+
+    ; sum_cur += y_src[x];
+    movdqa xmm0, xmm3             ; cur_orig
+    movdqa xmm1, xmm0
+    punpcklbw xmm0, xmm7
+    punpckhbw xmm1, xmm7
+    paddw xmm0, xmm1              ; 8x2
+    SUM_WORD_8x2_SSE2 xmm0, xmm1
+    movd ebx, xmm0
+    and ebx, 0ffffh
+    add SUM_CUR, ebx
+
+    ; sqr_cur += y_src[x] * y_src[x];
+    SUM_SQR_SSE2 xmm0, xmm3, xmm7 ; dst, pSrc, zero
+    movd ebx, xmm0
+    add SQR_CUR, ebx
+
+    lea edi, [edi+edx]
+    lea esi, [esi+eax]
+    dec ecx
+    jnz near .hloops
+
+    mov ebx, 0
+    mov bx, word SUM
+    sar ebx, 8
+    imul ebx, ebx
+    mov ecx, SQR
+    sar ecx, 8
+    sub ecx, ebx
+    mov edi, [esp+PUSH_SIZE+20]   ; pMotionTexture
+    mov [edi], cx                         ; to store uiMotionIndex
+    mov ebx, 0
+    mov bx, word SUM_CUR
+    sar ebx, 8
+    imul ebx, ebx
+    mov ecx, SQR_CUR
+    sar ecx, 8
+    sub ecx, ebx
+    mov [edi+2], cx                               ; to store uiTextureIndex
+
+    %undef SUM
+    %undef SUM_CUR
+    %undef SQR
+    %undef SQR_CUR
+    %undef PUSH_SIZE
+
+    add esp, 16
+    pop ebx
+    pop edi
+    pop esi
+
+    ret
+
+
+
+;*************************************************************************************************************
+;void VAACalcSad_sse2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;                                                               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSad_sse2
+%define         cur_data                        esp + pushsize + 4
+%define         ref_data                        esp + pushsize + 8
+%define         iPicWidth                       esp + pushsize + 12
+%define         iPicHeight                      esp + pushsize + 16
+%define         iPicStride                      esp + pushsize + 20
+%define         psadframe                       esp + pushsize + 24
+%define         psad8x8                         esp + pushsize + 28
+%define         pushsize        12
+    push  esi
+    push  edi
+    push  ebx
+    mov           esi,    [cur_data]
+    mov           edi,    [ref_data]
+    mov           ebx,    [iPicStride]
+    mov           edx,    [psad8x8]
+    mov           eax,    ebx
+
+    shr           dword [iPicWidth],      4                                       ; iPicWidth/16
+    shr           dword [iPicHeight],     4                                       ; iPicHeight/16
+    shl           eax,    4                                                               ; iPicStride*16
+    pxor  xmm0,   xmm0
+    pxor  xmm7,   xmm7            ; iFrameSad
+height_loop:
+    mov           ecx,    dword [iPicWidth]
+    push  esi
+    push  edi
+width_loop:
+    pxor  xmm6,   xmm6            ;
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    paddd xmm7,           xmm6
+    movd  [edx],          xmm6
+    psrldq        xmm6,           8
+    movd  [edx+4],        xmm6
+
+    pxor  xmm6,   xmm6
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    WELS_SAD_16x2_SSE2 esi,edi,ebx
+    paddd xmm7,           xmm6
+    movd  [edx+8],        xmm6
+    psrldq        xmm6,           8
+    movd  [edx+12],       xmm6
+
+    add           edx,    16
+    sub           esi,    eax
+    sub           edi,    eax
+    add           esi,    16
+    add           edi,    16
+
+    dec           ecx
+    jnz           width_loop
+
+    pop           edi
+    pop           esi
+    add           esi,    eax
+    add           edi,    eax
+
+    dec   dword [iPicHeight]
+    jnz           height_loop
+
+    mov           edx,    [psadframe]
+    movdqa        xmm5,   xmm7
+    psrldq        xmm7,   8
+    paddd xmm7,   xmm5
+    movd  [edx],  xmm7
+
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          pushsize
+    pop           ebx
+    pop           edi
+    pop           esi
+    ret
+
+%else  ;64-bit
+
+;***********************************************************************
+;   void SampleVariance16x16_sse2(      uint8_t * y_ref, int32_t y_ref_stride, uint8_t * y_src, int32_t y_src_stride,SMotionTextureUnit* pMotionTexture );
+;***********************************************************************
+WELS_EXTERN SampleVariance16x16_sse2
+    %define SUM                   r10;[esp]
+    %define SUM_CUR               r11;[esp+4]
+    %define SQR                   r13;[esp+8]
+    %define SQR_CUR               r15;[esp+12]
+
+    push r12
+    push r13
+    push r14
+    push r15
+    %assign push_num 4
+    LOAD_5_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r1,r1d
+    SIGN_EXTENSION r3,r3d
+
+    mov r12,010h
+    pxor xmm7, xmm7
+    movq SUM, xmm7
+    movq SUM_CUR,xmm7
+    movq SQR,xmm7
+    movq SQR_CUR,xmm7
+
+.hloops:
+    mov r14,0
+    movdqa xmm0, [r0]             ; y_ref
+    movdqa xmm1, [r2]             ; y_src
+    movdqa xmm2, xmm0             ; store first for future process
+    movdqa xmm3, xmm1
+    ; sum += diff;
+    movdqa xmm4, xmm0
+    psadbw xmm4, xmm1             ; 2 parts, [0,..,15], [64,..,79]
+    ; to be continued for sum
+    pshufd xmm5, xmm4, 0C6h       ; 11000110 B
+    paddw xmm4, xmm5
+    movd r14d, xmm4
+    add SUM, r14
+
+    ; sqr += diff * diff;
+    pmaxub xmm0, xmm1
+    pminub xmm1, xmm2
+    psubb xmm0, xmm1                              ; diff
+    SUM_SQR_SSE2 xmm1, xmm0, xmm7 ; dst, pSrc, zero
+    movd r14d, xmm1
+    add SQR, r14
+
+    ; sum_cur += y_src[x];
+    movdqa xmm0, xmm3             ; cur_orig
+    movdqa xmm1, xmm0
+    punpcklbw xmm0, xmm7
+    punpckhbw xmm1, xmm7
+    paddw xmm0, xmm1              ; 8x2
+    SUM_WORD_8x2_SSE2 xmm0, xmm1
+    movd r14d, xmm0
+    and r14, 0ffffh
+    add SUM_CUR, r14
+
+    ; sqr_cur += y_src[x] * y_src[x];
+    SUM_SQR_SSE2 xmm0, xmm3, xmm7 ; dst, pSrc, zero
+    movd r14d, xmm0
+    add SQR_CUR, r14
+
+    lea r0, [r0+r1]
+    lea r2, [r2+r3]
+    dec r12
+    jnz near .hloops
+
+    mov r0, SUM
+    sar r0, 8
+    imul r0, r0
+    mov r1, SQR
+    sar r1, 8
+    sub r1, r0
+    mov [r4], r1w                         ; to store uiMotionIndex
+    mov r0, SUM_CUR
+    sar r0, 8
+    imul r0, r0
+    mov r1, SQR_CUR
+    sar r1, 8
+    sub r1, r0
+    mov [r4+2], r1w                               ; to store uiTextureIndex
+
+    POP_XMM
+    LOAD_5_PARA_POP
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+
+
+    %assign push_num 0
+
+    ret
+
+
+;*************************************************************************************************************
+;void VAACalcSad_sse2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;                                                               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSad_sse2
+%define         cur_data                        r0
+%define         ref_data                        r1
+%define         iPicWidth                       r2
+%define         iPicHeight              r3
+%define         iPicStride              r4
+%define         psadframe                       r5
+%define         psad8x8                         r6
+
+    push r12
+    push r13
+    %assign push_num 2
+    LOAD_7_PARA
+    PUSH_XMM 8
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+    SIGN_EXTENSION r4,r4d
+
+    mov   r12,r4
+    shr           r2,     4                                       ; iPicWidth/16
+    shr           r3,     4                                       ; iPicHeight/16
+
+    shl           r12,    4                                                               ; iPicStride*16
+    pxor  xmm0,   xmm0
+    pxor  xmm7,   xmm7            ; iFrameSad
+height_loop:
+    mov           r13,    r2
+    push  r0
+    push  r1
+width_loop:
+    pxor  xmm6,   xmm6
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    paddd xmm7,           xmm6
+    movd  [r6],           xmm6
+    psrldq        xmm6,           8
+    movd  [r6+4], xmm6
+
+    pxor  xmm6,   xmm6
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    WELS_SAD_16x2_SSE2 r0,r1,r4
+    paddd xmm7,           xmm6
+    movd  [r6+8], xmm6
+    psrldq        xmm6,           8
+    movd  [r6+12],        xmm6
+
+    add           r6,     16
+    sub           r0,     r12
+    sub           r1,     r12
+    add           r0,     16
+    add           r1,     16
+
+    dec           r13
+    jnz           width_loop
+
+    pop           r1
+    pop           r0
+    add           r0,     r12
+    add           r1,     r12
+
+    dec   r3
+    jnz           height_loop
+
+    ;mov          r13,    [psadframe]
+    movdqa        xmm5,   xmm7
+    psrldq        xmm7,   8
+    paddd xmm7,   xmm5
+    movd  [psadframe],    xmm7
+
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          pushsize
+    POP_XMM
+    LOAD_7_PARA_POP
+    pop r13
+    pop r12
+    %assign push_num 0
+    ret
+
+%endif
+
+
+%ifdef X86_32
+;*************************************************************************************************************
+;void VAACalcSadVar_sse2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadVar_sse2
+%define         localsize               8
+%define         cur_data                        esp + pushsize + localsize + 4
+%define         ref_data                        esp + pushsize + localsize + 8
+%define         iPicWidth                       esp + pushsize + localsize + 12
+%define         iPicHeight                      esp + pushsize + localsize + 16
+%define         iPicStride                      esp + pushsize + localsize + 20
+%define         psadframe                       esp + pushsize + localsize + 24
+%define         psad8x8                         esp + pushsize + localsize + 28
+%define         psum16x16                       esp + pushsize + localsize + 32
+%define         psqsum16x16                     esp + pushsize + localsize + 36
+%define         tmp_esi                         esp + 0
+%define         tmp_edi                         esp + 4
+%define         pushsize                16
+    push  ebp
+    push  esi
+    push  edi
+    push  ebx
+    sub           esp,    localsize
+    mov           esi,    [cur_data]
+    mov           edi,    [ref_data]
+    mov           ebx,    [iPicStride]
+    mov           edx,    [psad8x8]
+    mov           eax,    ebx
+
+    shr           dword [iPicWidth],      4                                       ; iPicWidth/16
+    shr           dword [iPicHeight],     4                                       ; iPicHeight/16
+    shl           eax,    4                                                       ; iPicStride*16
+    pxor  xmm0,   xmm0
+    pxor  xmm7,   xmm7            ; iFrameSad
+var_height_loop:
+    mov           ecx,    dword [iPicWidth]
+    mov           [tmp_esi],      esi
+    mov           [tmp_edi],      edi
+var_width_loop:
+    pxor  xmm6,   xmm6            ; hiQuad_loQuad pSad8x8
+    pxor  xmm5,   xmm5            ; pSum16x16
+    pxor  xmm4,   xmm4            ; sqsum_16x16
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    paddd xmm7,           xmm6
+    movd  [edx],          xmm6
+    psrldq        xmm6,           8
+    movd  [edx+4],        xmm6
+
+    pxor  xmm6,   xmm6
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 esi,edi,ebx
+    paddd xmm7,           xmm6
+    movd  [edx+8],        xmm6
+    psrldq        xmm6,           8
+    movd  [edx+12],       xmm6
+
+    mov           ebp,    [psum16x16]
+    movdqa        xmm1,   xmm5
+    psrldq        xmm1,   8
+    paddd xmm5,   xmm1
+    movd  [ebp],  xmm5
+    add           dword [psum16x16], 4
+
+    movdqa        xmm5,   xmm4
+    psrldq        xmm5,   8
+    paddd xmm4,   xmm5
+    movdqa        xmm3,   xmm4
+    psrldq        xmm3,   4
+    paddd xmm4,   xmm3
+
+    mov           ebp,    [psqsum16x16]
+    movd  [ebp],  xmm4
+    add           dword [psqsum16x16], 4
+
+    add           edx,    16
+    sub           esi,    eax
+    sub           edi,    eax
+    add           esi,    16
+    add           edi,    16
+
+    dec           ecx
+    jnz           var_width_loop
+
+    mov           esi,    [tmp_esi]
+    mov           edi,    [tmp_edi]
+    add           esi,    eax
+    add           edi,    eax
+
+    dec   dword [iPicHeight]
+    jnz           var_height_loop
+
+    mov           edx,    [psadframe]
+    movdqa        xmm5,   xmm7
+    psrldq        xmm7,   8
+    paddd xmm7,   xmm5
+    movd  [edx],  xmm7
+
+    add           esp,    localsize
+    pop           ebx
+    pop           edi
+    pop           esi
+    pop           ebp
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+
+%else  ;64-bit
+
+;*************************************************************************************************************
+;void VAACalcSadVar_sse2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadVar_sse2
+%define         cur_data                        arg1 ;r0
+%define         ref_data                        arg2 ;r1
+%define         iPicWidth                       arg3 ;r2
+%define         iPicHeight                  arg4 ;r3
+%define         iPicStride                  arg5
+%define         psadframe                       arg6
+%define         psad8x8                         arg7
+%define         psum16x16                       arg8
+%define         psqsum16x16                 arg9
+
+    push r12
+    push r13
+    push r14
+    push r15
+    %assign push_num 4
+    PUSH_XMM 8
+
+%ifdef WIN64
+    mov r4, arg5  ;iPicStride
+    mov r5, arg6  ;psad8x8
+%endif
+    mov r14,arg7
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+    SIGN_EXTENSION r4,r4d
+
+    mov   r13,r4
+    shr   r2,4
+    shr   r3,4
+
+    shl   r13,4   ; iPicStride*16
+    pxor  xmm0,   xmm0
+    pxor  xmm7,   xmm7            ; iFrameSad
+var_height_loop:
+    push    r2
+    %assign push_num push_num+1
+    mov           r11,    r0
+    mov           r12,    r1
+var_width_loop:
+    pxor  xmm6,   xmm6            ; hiQuad_loQuad pSad8x8
+    pxor  xmm5,   xmm5            ; pSum16x16
+    pxor  xmm4,   xmm4            ; sqsum_16x16
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    paddd xmm7,           xmm6
+    movd  [r14],          xmm6
+    psrldq        xmm6,           8
+    movd  [r14+4],        xmm6
+
+    pxor  xmm6,   xmm6
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_16x1_SSE2 r0,r1,r4
+    paddd   xmm7,           xmm6
+    movd    [r14+8],        xmm6
+    psrldq  xmm6,           8
+    movd    [r14+12],       xmm6
+
+    mov             r15,    psum16x16
+    movdqa  xmm1,   xmm5
+    psrldq  xmm1,   8
+    paddd   xmm5,   xmm1
+    movd    [r15],  xmm5
+    add             dword psum16x16, 4
+
+    movdqa  xmm5,   xmm4
+    psrldq  xmm5,   8
+    paddd   xmm4,   xmm5
+    movdqa  xmm3,   xmm4
+    psrldq  xmm3,   4
+    paddd   xmm4,   xmm3
+
+    mov             r15,    psqsum16x16
+    movd    [r15],  xmm4
+    add             dword psqsum16x16, 4
+
+    add             r14,16
+    sub             r0,     r13
+    sub             r1,     r13
+    add             r0,     16
+    add             r1,     16
+
+    dec             r2
+    jnz             var_width_loop
+
+    pop     r2
+    %assign push_num push_num-1
+    mov             r0,     r11
+    mov             r1,     r12
+    add             r0,     r13
+    add             r1,     r13
+    dec     r3
+    jnz             var_height_loop
+
+    mov             r15,    psadframe
+    movdqa  xmm5,   xmm7
+    psrldq  xmm7,   8
+    paddd   xmm7,   xmm5
+    movd    [r15],  xmm7
+
+    POP_XMM
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+%assign push_num 0
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+
+%endif
+
+%ifdef X86_32
+
+;*************************************************************************************************************
+;void VAACalcSadSsd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;       int32_t iPicStride,int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16, int32_t *psqdiff16x16)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadSsd_sse2
+%define         localsize               12
+%define         cur_data                        esp + pushsize + localsize + 4
+%define         ref_data                        esp + pushsize + localsize + 8
+%define         iPicWidth                       esp + pushsize + localsize + 12
+%define         iPicHeight                      esp + pushsize + localsize + 16
+%define         iPicStride                      esp + pushsize + localsize + 20
+%define         psadframe                       esp + pushsize + localsize + 24
+%define         psad8x8                         esp + pushsize + localsize + 28
+%define         psum16x16                       esp + pushsize + localsize + 32
+%define         psqsum16x16                     esp + pushsize + localsize + 36
+%define         psqdiff16x16            esp + pushsize + localsize + 40
+%define         tmp_esi                         esp + 0
+%define         tmp_edi                         esp + 4
+%define         tmp_sadframe            esp + 8
+%define         pushsize                16
+    push    ebp
+    push    esi
+    push    edi
+    push    ebx
+    sub             esp,    localsize
+
+    mov             ecx,    [iPicWidth]
+    mov             ecx,    [iPicHeight]
+    mov             esi,    [cur_data]
+    mov             edi,    [ref_data]
+    mov             ebx,    [iPicStride]
+    mov             edx,    [psad8x8]
+    mov             eax,    ebx
+
+    shr             dword [iPicWidth],      4                                       ; iPicWidth/16
+    shr             dword [iPicHeight],     4                                       ; iPicHeight/16
+    shl             eax,    4                                                       ; iPicStride*16
+    mov             ecx,    [iPicWidth]
+    mov             ecx,    [iPicHeight]
+    pxor    xmm0,   xmm0
+    movd    [tmp_sadframe], xmm0
+sqdiff_height_loop:
+    mov             ecx,    dword [iPicWidth]
+    mov             [tmp_esi],      esi
+    mov             [tmp_edi],      edi
+sqdiff_width_loop:
+    pxor    xmm7,   xmm7            ; hiQuad_loQuad pSad8x8
+    pxor    xmm6,   xmm6            ; pSum16x16
+    pxor    xmm5,   xmm5            ; sqsum_16x16  four dword
+    pxor    xmm4,   xmm4            ; sqdiff_16x16  four Dword
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    movdqa  xmm1,           xmm7
+    movd    [edx],          xmm7
+    psrldq  xmm7,           8
+    paddd   xmm1,           xmm7
+    movd    [edx+4],        xmm7
+    movd    ebp,            xmm1
+    add             [tmp_sadframe], ebp
+
+    pxor    xmm7,   xmm7
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 esi,edi,ebx
+    movdqa  xmm1,           xmm7
+    movd    [edx+8],        xmm7
+    psrldq  xmm7,           8
+    paddd   xmm1,           xmm7
+    movd    [edx+12],       xmm7
+    movd    ebp,            xmm1
+    add             [tmp_sadframe], ebp
+
+    mov             ebp,    [psum16x16]
+    movdqa  xmm1,   xmm6
+    psrldq  xmm1,   8
+    paddd   xmm6,   xmm1
+    movd    [ebp],  xmm6
+    add             dword [psum16x16], 4
+
+    mov             ebp,    [psqsum16x16]
+    pshufd  xmm6,   xmm5,   14 ;00001110
+    paddd   xmm6,   xmm5
+    pshufd  xmm5,   xmm6,   1  ;00000001
+    paddd   xmm5,   xmm6
+    movd    [ebp],  xmm5
+    add             dword [psqsum16x16], 4
+
+    mov             ebp,    [psqdiff16x16]
+    pshufd  xmm5,   xmm4,   14      ; 00001110
+    paddd   xmm5,   xmm4
+    pshufd  xmm4,   xmm5,   1       ; 00000001
+    paddd   xmm4,   xmm5
+    movd    [ebp],  xmm4
+    add             dword   [psqdiff16x16], 4
+
+    add             edx,    16
+    sub             esi,    eax
+    sub             edi,    eax
+    add             esi,    16
+    add             edi,    16
+
+    dec             ecx
+    jnz             sqdiff_width_loop
+
+    mov             esi,    [tmp_esi]
+    mov             edi,    [tmp_edi]
+    add             esi,    eax
+    add             edi,    eax
+
+    dec     dword [iPicHeight]
+    jnz             sqdiff_height_loop
+
+    mov             ebx,    [tmp_sadframe]
+    mov             eax,    [psadframe]
+    mov             [eax],  ebx
+
+    add             esp,    localsize
+    pop             ebx
+    pop             edi
+    pop             esi
+    pop             ebp
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          psqdiff16x16
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          tmp_sadframe
+%undef          pushsize
+%undef          localsize
+    ret
+
+%else
+
+
+;*************************************************************************************************************
+;void VAACalcSadSsd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;       int32_t iPicStride,int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16, int32_t *psqdiff16x16)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadSsd_sse2
+%define         localsize               12
+%define         cur_data                        arg1;r0
+%define         ref_data                        arg2;r1
+%define         iPicWidth                       arg3;r2
+%define         iPicHeight                      arg4;r3
+%define         iPicStride                      arg5;
+%define         psadframe                       arg6;
+%define         psad8x8                         arg7;
+%define         psum16x16                       arg8;
+%define         psqsum16x16                     arg9;
+%define         psqdiff16x16                    arg10
+
+    push r12
+    push r13
+    push r14
+    push r15
+    %assign push_num 4
+    PUSH_XMM 10
+
+%ifdef WIN64
+    mov r4,arg5
+%endif
+    mov r14,arg7
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+    SIGN_EXTENSION r4,r4d
+
+    mov        r13,r4
+    shr     r2,4   ; iPicWidth/16
+    shr     r3,4   ; iPicHeight/16
+    shl     r13,4   ; iPicStride*16
+    pxor    xmm0,   xmm0
+    pxor  xmm8, xmm8  ;framesad
+    pxor  xmm9, xmm9
+sqdiff_height_loop:
+    ;mov            ecx,    dword [iPicWidth]
+    ;mov      r14,r2
+    push r2
+    %assign push_num push_num +1
+    mov             r10,    r0
+    mov             r11,    r1
+sqdiff_width_loop:
+    pxor    xmm7,   xmm7            ; hiQuad_loQuad pSad8x8
+    pxor    xmm6,   xmm6            ; pSum16x16
+    pxor    xmm5,   xmm5            ; sqsum_16x16  four dword
+    pxor    xmm4,   xmm4            ; sqdiff_16x16  four Dword
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    movdqa  xmm1,           xmm7
+    movd    [r14],          xmm7
+    psrldq  xmm7,           8
+    paddd   xmm1,           xmm7
+    movd    [r14+4],        xmm7
+    movd    r15d,           xmm1
+    movd  xmm9, r15d
+    paddd xmm8,xmm9
+
+
+    pxor    xmm7,   xmm7
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    WELS_SAD_SUM_SQSUM_SQDIFF_16x1_SSE2 r0,r1,r4
+    movdqa  xmm1,           xmm7
+    movd    [r14+8],        xmm7
+    psrldq  xmm7,           8
+    paddd   xmm1,           xmm7
+    movd    [r14+12],       xmm7
+    movd    r15d,           xmm1
+    movd  xmm9, r15d
+    paddd xmm8,xmm9
+
+    mov             r15,    psum16x16
+    movdqa  xmm1,   xmm6
+    psrldq  xmm1,   8
+    paddd   xmm6,   xmm1
+    movd    [r15],  xmm6
+    add             dword psum16x16, 4
+
+    mov             r15,    psqsum16x16
+    pshufd  xmm6,   xmm5,   14 ;00001110
+    paddd   xmm6,   xmm5
+    pshufd  xmm5,   xmm6,   1  ;00000001
+    paddd   xmm5,   xmm6
+    movd    [r15],  xmm5
+    add             dword psqsum16x16, 4
+
+    mov             r15,    psqdiff16x16
+    pshufd  xmm5,   xmm4,   14      ; 00001110
+    paddd   xmm5,   xmm4
+    pshufd  xmm4,   xmm5,   1       ; 00000001
+    paddd   xmm4,   xmm5
+    movd    [r15],  xmm4
+    add             dword   psqdiff16x16,   4
+
+    add             r14,16
+    sub             r0,     r13
+    sub             r1,     r13
+    add             r0,     16
+    add             r1,     16
+
+    dec             r2
+    jnz             sqdiff_width_loop
+
+    pop r2
+    %assign push_num push_num -1
+
+    mov             r0,     r10
+    mov             r1,     r11
+    add             r0,     r13
+    add             r1,     r13
+
+    dec     r3
+    jnz             sqdiff_height_loop
+
+    mov             r13,    psadframe
+    movd    [r13],  xmm8
+
+    POP_XMM
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+    %assign push_num 0
+
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          psqdiff16x16
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          tmp_sadframe
+%undef          pushsize
+%undef          localsize
+    ret
+
+
+
+%endif
+
+%ifdef X86_32
+;*************************************************************************************************************
+;void VAACalcSadBgd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadBgd_sse2
+%define         localsize               12
+%define         cur_data                        esp + pushsize + localsize + 4
+%define         ref_data                        esp + pushsize + localsize + 8
+%define         iPicWidth                       esp + pushsize + localsize + 12
+%define         iPicHeight                      esp + pushsize + localsize + 16
+%define         iPicStride                      esp + pushsize + localsize + 20
+%define         psadframe                       esp + pushsize + localsize + 24
+%define         psad8x8                         esp + pushsize + localsize + 28
+%define         p_sd8x8                         esp + pushsize + localsize + 32
+%define         p_mad8x8                        esp + pushsize + localsize + 36
+%define         tmp_esi                         esp + 0
+%define         tmp_edi                         esp + 4
+%define         tmp_ecx                         esp + 8
+%define         pushsize                16
+    push    ebp
+    push    esi
+    push    edi
+    push    ebx
+    sub             esp,    localsize
+    mov             esi,    [cur_data]
+    mov             edi,    [ref_data]
+    mov             ebx,    [iPicStride]
+    mov             eax,    ebx
+
+    shr             dword [iPicWidth],      4                                       ; iPicWidth/16
+    shr             dword [iPicHeight],     4                                       ; iPicHeight/16
+    shl             eax,    4                                                       ; iPicStride*16
+    xor             ebp,    ebp
+    pxor    xmm0,   xmm0
+bgd_height_loop:
+    mov             ecx,    dword [iPicWidth]
+    mov             [tmp_esi],      esi
+    mov             [tmp_edi],      edi
+bgd_width_loop:
+    pxor    xmm7,   xmm7            ; pSad8x8
+    pxor    xmm6,   xmm6            ; sum_cur_8x8
+    pxor    xmm5,   xmm5            ; sum_ref_8x8
+    pxor    xmm4,   xmm4            ; pMad8x8
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+
+
+    mov                     edx,            [p_mad8x8]
+    WELS_MAX_REG_SSE2       xmm4
+
+    ;movdqa         xmm1,   xmm4
+    ;punpcklbw      xmm1,   xmm0
+    ;punpcklwd      xmm1,   xmm0
+    ;movd           [edx],  xmm1
+    ;punpckhbw      xmm4,   xmm0
+    ;punpcklwd      xmm4,   xmm0
+    ;movd           [edx+4],        xmm4
+    ;add                    edx,            8
+    ;mov                    [p_mad8x8],     edx
+    mov                     [tmp_ecx],      ecx
+    movhlps         xmm1,   xmm4
+    movd            ecx,    xmm4
+    mov                     [edx],  cl
+    movd            ecx,    xmm1
+    mov                     [edx+1],cl
+    add                     edx,    2
+    mov                     [p_mad8x8],     edx
+
+
+    pslldq          xmm7,   4
+    pslldq          xmm6,   4
+    pslldq          xmm5,   4
+
+
+    pxor    xmm4,   xmm4            ; pMad8x8
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,esi ,edi, ebx
+
+    mov                     edx,            [p_mad8x8]
+    WELS_MAX_REG_SSE2       xmm4
+
+    ;movdqa         xmm1,   xmm4
+    ;punpcklbw      xmm1,   xmm0
+    ;punpcklwd      xmm1,   xmm0
+    ;movd           [edx],  xmm1
+    ;punpckhbw      xmm4,   xmm0
+    ;punpcklwd      xmm4,   xmm0
+    ;movd           [edx+4],        xmm4
+    ;add                    edx,            8
+    ;mov                    [p_mad8x8],     edx
+    movhlps         xmm1,   xmm4
+    movd            ecx,    xmm4
+    mov                     [edx],  cl
+    movd            ecx,    xmm1
+    mov                     [edx+1],cl
+    add                     edx,    2
+    mov                     [p_mad8x8],     edx
+
+    ; data in xmm7, xmm6, xmm5:  D1 D3 D0 D2
+
+    mov             edx,    [psad8x8]
+    pshufd  xmm1,   xmm7,   10001101b               ; D3 D2 D1 D0
+    movdqa  [edx],  xmm1
+    add             edx,    16
+    mov             [psad8x8],      edx                                     ; sad8x8
+
+    paddd   xmm1,   xmm7                                    ; D1+3 D3+2 D0+1 D2+0
+    pshufd  xmm2,   xmm1,   00000011b
+    paddd   xmm1,   xmm2
+    movd    edx,    xmm1
+    add             ebp,    edx                                             ; sad frame
+
+    mov             edx,    [p_sd8x8]
+    psubd   xmm6,   xmm5
+    pshufd  xmm1,   xmm6,   10001101b
+    movdqa  [edx],  xmm1
+    add             edx,    16
+    mov             [p_sd8x8],      edx
+
+
+    add             edx,    16
+    sub             esi,    eax
+    sub             edi,    eax
+    add             esi,    16
+    add             edi,    16
+
+    mov             ecx,    [tmp_ecx]
+    dec             ecx
+    jnz             bgd_width_loop
+
+    mov             esi,    [tmp_esi]
+    mov             edi,    [tmp_edi]
+    add             esi,    eax
+    add             edi,    eax
+
+    dec             dword [iPicHeight]
+    jnz             bgd_height_loop
+
+    mov             edx,    [psadframe]
+    mov             [edx],  ebp
+
+    add             esp,    localsize
+    pop             ebx
+    pop             edi
+    pop             esi
+    pop             ebp
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          p_sd8x8
+%undef          p_mad8x8
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+
+
+
+;*************************************************************************************************************
+;void VAACalcSadSsdBgd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16,
+;                       int32_t *psqdiff16x16, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadSsdBgd_sse2
+%define         localsize               16
+%define         cur_data                        esp + pushsize + localsize + 4
+%define         ref_data                        esp + pushsize + localsize + 8
+%define         iPicWidth                       esp + pushsize + localsize + 12
+%define         iPicHeight                      esp + pushsize + localsize + 16
+%define         iPicStride                      esp + pushsize + localsize + 20
+%define         psadframe                       esp + pushsize + localsize + 24
+%define         psad8x8                         esp + pushsize + localsize + 28
+%define         psum16x16                       esp + pushsize + localsize + 32
+%define         psqsum16x16                     esp + pushsize + localsize + 36
+%define         psqdiff16x16            esp + pushsize + localsize + 40
+%define         p_sd8x8                         esp + pushsize + localsize + 44
+%define         p_mad8x8                        esp + pushsize + localsize + 48
+%define         tmp_esi                         esp + 0
+%define         tmp_edi                         esp + 4
+%define         tmp_sadframe            esp + 8
+%define         tmp_ecx                         esp + 12
+%define         pushsize                16
+    push    ebp
+    push    esi
+    push    edi
+    push    ebx
+    sub             esp,    localsize
+    mov             esi,    [cur_data]
+    mov             edi,    [ref_data]
+    mov             ebx,    [iPicStride]
+    mov             eax,    ebx
+
+    shr             dword [iPicWidth],      4                                       ; iPicWidth/16
+    shr             dword [iPicHeight],     4                                       ; iPicHeight/16
+    shl             eax,    4                                                       ; iPicStride*16
+    pxor    xmm0,   xmm0
+    movd    [tmp_sadframe], xmm0
+sqdiff_bgd_height_loop:
+    mov             ecx,    dword [iPicWidth]
+    mov             [tmp_esi],      esi
+    mov             [tmp_edi],      edi
+sqdiff_bgd_width_loop:
+    pxor    xmm7,   xmm7            ; pSad8x8 interleaves sqsum16x16:  sqsum1 sad1 sqsum0 sad0
+    pxor    xmm6,   xmm6            ; sum_8x8 interleaves cur and pRef in Dword,  Sref1 Scur1 Sref0 Scur0
+    pxor    xmm5,   xmm5            ; pMad8x8
+    pxor    xmm4,   xmm4            ; sqdiff_16x16  four Dword
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+
+    mov             edx,            [psad8x8]
+    movdqa  xmm2,           xmm7
+    pshufd  xmm1,           xmm2,           00001110b
+    movd    [edx],          xmm2
+    movd    [edx+4],        xmm1
+    add             edx,            8
+    mov             [psad8x8],      edx                     ; sad8x8
+
+    paddd   xmm1,                           xmm2
+    movd    edx,                            xmm1
+    add             [tmp_sadframe],         edx                     ; iFrameSad
+
+    mov             edx,            [psum16x16]
+    movdqa  xmm1,           xmm6
+    pshufd  xmm2,           xmm1,           00001110b
+    paddd   xmm1,           xmm2
+    movd    [edx],          xmm1                            ; sum
+
+    mov             edx,            [p_sd8x8]
+    pshufd  xmm1,           xmm6,           11110101b                       ; Sref1 Sref1 Sref0 Sref0
+    psubd   xmm6,           xmm1            ; 00 diff1 00 diff0
+    pshufd  xmm1,           xmm6,           00001000b                       ;  xx xx diff1 diff0
+    movq    [edx],          xmm1
+    add             edx,            8
+    mov             [p_sd8x8],      edx
+
+    mov                     edx,            [p_mad8x8]
+    WELS_MAX_REG_SSE2       xmm5
+    ;movdqa         xmm1,   xmm5
+    ;punpcklbw      xmm1,   xmm0
+    ;punpcklwd      xmm1,   xmm0
+    ;movd           [edx],  xmm1
+    ;punpckhbw      xmm5,   xmm0
+    ;punpcklwd      xmm5,   xmm0
+    ;movd           [edx+4],        xmm5
+    ;add                    edx,            8
+    ;mov                    [p_mad8x8],     edx
+    mov                     [tmp_ecx],      ecx
+    movhlps         xmm1,   xmm5
+    movd            ecx,    xmm5
+    mov                     [edx],  cl
+    movd            ecx,    xmm1
+    mov                     [edx+1],cl
+    add                     edx,    2
+    mov                     [p_mad8x8],     edx
+
+    psrlq   xmm7,   32
+    psllq   xmm7,   32                      ; clear sad
+    pxor    xmm6,   xmm6            ; sum_8x8 interleaves cur and pRef in Dword,  Sref1 Scur1 Sref0 Scur0
+    pxor    xmm5,   xmm5            ; pMad8x8
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, esi , edi , ebx
+
+    mov             edx,            [psad8x8]
+    movdqa  xmm2,           xmm7
+    pshufd  xmm1,           xmm2,           00001110b
+    movd    [edx],          xmm2
+    movd    [edx+4],        xmm1
+    add             edx,            8
+    mov             [psad8x8],      edx                     ; sad8x8
+
+    paddd   xmm1,                           xmm2
+    movd    edx,                            xmm1
+    add             [tmp_sadframe],         edx                     ; iFrameSad
+
+    mov             edx,                    [psum16x16]
+    movdqa  xmm1,                   xmm6
+    pshufd  xmm2,                   xmm1,           00001110b
+    paddd   xmm1,                   xmm2
+    movd    ebp,                    xmm1                            ; sum
+    add             [edx],                  ebp
+    add             edx,                    4
+    mov             [psum16x16],    edx
+
+    mov             edx,                    [psqsum16x16]
+    psrlq   xmm7,                   32
+    pshufd  xmm2,                   xmm7,           00001110b
+    paddd   xmm2,                   xmm7
+    movd    [edx],                  xmm2                            ; sqsum
+    add             edx,                    4
+    mov             [psqsum16x16],  edx
+
+    mov             edx,            [p_sd8x8]
+    pshufd  xmm1,           xmm6,           11110101b                       ; Sref1 Sref1 Sref0 Sref0
+    psubd   xmm6,           xmm1            ; 00 diff1 00 diff0
+    pshufd  xmm1,           xmm6,           00001000b                       ;  xx xx diff1 diff0
+    movq    [edx],          xmm1
+    add             edx,            8
+    mov             [p_sd8x8],      edx
+
+    mov             edx,            [p_mad8x8]
+    WELS_MAX_REG_SSE2       xmm5
+    ;movdqa         xmm1,   xmm5
+    ;punpcklbw      xmm1,   xmm0
+    ;punpcklwd      xmm1,   xmm0
+    ;movd           [edx],  xmm1
+    ;punpckhbw      xmm5,   xmm0
+    ;punpcklwd      xmm5,   xmm0
+    ;movd           [edx+4],        xmm5
+    ;add                    edx,            8
+    ;mov                    [p_mad8x8],     edx
+    movhlps         xmm1,   xmm5
+    movd            ecx,    xmm5
+    mov                     [edx],  cl
+    movd            ecx,    xmm1
+    mov                     [edx+1],cl
+    add                     edx,    2
+    mov                     [p_mad8x8],     edx
+
+    mov             edx,            [psqdiff16x16]
+    pshufd  xmm1,           xmm4,           00001110b
+    paddd   xmm4,           xmm1
+    pshufd  xmm1,           xmm4,           00000001b
+    paddd   xmm4,           xmm1
+    movd    [edx],          xmm4
+    add             edx,            4
+    mov             [psqdiff16x16], edx
+
+    add             edx,    16
+    sub             esi,    eax
+    sub             edi,    eax
+    add             esi,    16
+    add             edi,    16
+
+    mov             ecx,    [tmp_ecx]
+    dec             ecx
+    jnz             sqdiff_bgd_width_loop
+
+    mov             esi,    [tmp_esi]
+    mov             edi,    [tmp_edi]
+    add             esi,    eax
+    add             edi,    eax
+
+    dec     dword [iPicHeight]
+    jnz             sqdiff_bgd_height_loop
+
+    mov             edx,    [psadframe]
+    mov             ebp,    [tmp_sadframe]
+    mov             [edx],  ebp
+
+    add             esp,    localsize
+    pop             ebx
+    pop             edi
+    pop             esi
+    pop             ebp
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          psqdiff16x16
+%undef          p_sd8x8
+%undef          p_mad8x8
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+%else
+
+;*************************************************************************************************************
+;void VAACalcSadBgd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadBgd_sse2
+%define         cur_data                        arg1;
+%define         ref_data                        arg2;
+%define         iPicWidth                       arg3;
+%define         iPicHeight                      arg4;
+%define         iPicStride                      arg5;
+%define         psadframe                       arg6;
+%define         psad8x8                         arg7;
+%define         p_sd8x8                         arg8;
+%define         p_mad8x8                        arg9;
+
+    push r12
+    push r13
+    push r14
+    push r15
+%assign push_num 4
+    PUSH_XMM 10
+%ifdef WIN64
+    mov r4,arg5
+    ;  mov r5,arg6
+%endif
+    mov r14,arg7
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+    SIGN_EXTENSION r4,r4d
+
+
+    mov     r13,r4
+    mov     r15,r0
+    shr     r2,4
+    shr     r3,4
+    shl     r13,4
+    pxor    xmm0,   xmm0
+    pxor    xmm8,   xmm8
+    pxor    xmm9,   xmm9
+bgd_height_loop:
+    ;mov            ecx,    dword [iPicWidth]
+    push r2
+    %assign push_num push_num+1
+    mov             r10,    r15
+    mov             r11,    r1
+bgd_width_loop:
+    pxor    xmm7,   xmm7            ; pSad8x8
+    pxor    xmm6,   xmm6            ; sum_cur_8x8
+    pxor    xmm5,   xmm5            ; sum_ref_8x8
+    pxor    xmm4,   xmm4            ; pMad8x8
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+
+
+    mov                     r14,            p_mad8x8
+    WELS_MAX_REG_SSE2       xmm4
+
+    ;mov                    [tmp_ecx],      ecx
+    movhlps         xmm1,   xmm4
+    movd            r0d,    xmm4
+
+
+    mov                     [r14],  r0b
+    movd            r0d,    xmm1
+    mov                     [r14+1],r0b
+    add                     r14,    2
+    ;mov                     p_mad8x8,       r14
+
+
+    pslldq          xmm7,   4
+    pslldq          xmm6,   4
+    pslldq          xmm5,   4
+
+
+    pxor    xmm4,   xmm4            ; pMad8x8
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+    WELS_SAD_SD_MAD_16x1_SSE2       xmm7,   xmm6,   xmm5,   xmm4 ,r15 ,r1, r4
+
+    ;mov                     r14,            [p_mad8x8]
+    WELS_MAX_REG_SSE2       xmm4
+
+    movhlps         xmm1,   xmm4
+    movd            r0d,    xmm4
+    mov                     [r14],  r0b
+    movd            r0d,    xmm1
+    mov                     [r14+1],r0b
+    add                     r14,    2
+    mov                     p_mad8x8,       r14
+
+    ; data in xmm7, xmm6, xmm5:  D1 D3 D0 D2
+
+    mov             r14,    psad8x8
+    pshufd  xmm1,   xmm7,   10001101b               ; D3 D2 D1 D0
+    movdqa  [r14],  xmm1
+    add             r14,    16
+    mov             psad8x8,        r14                                     ; sad8x8
+
+    paddd   xmm1,   xmm7                                    ; D1+3 D3+2 D0+1 D2+0
+    pshufd  xmm2,   xmm1,   00000011b
+    paddd   xmm1,   xmm2
+    movd    r14d,   xmm1
+    movd    xmm9, r14d
+    paddd   xmm8,   xmm9                                            ; sad frame
+
+    mov             r14,    p_sd8x8
+    psubd   xmm6,   xmm5
+    pshufd  xmm1,   xmm6,   10001101b
+    movdqa  [r14],  xmm1
+    add             r14,    16
+    mov             p_sd8x8,        r14
+
+
+    ;add            edx,    16
+    sub             r15,    r13
+    sub             r1,     r13
+    add             r15,    16
+    add             r1,     16
+
+
+    dec             r2
+    jnz             bgd_width_loop
+    pop     r2
+%assign push_num push_num-1
+    mov             r15,    r10
+    mov             r1,     r11
+    add             r15,    r13
+    add             r1,     r13
+
+    dec             r3
+    jnz             bgd_height_loop
+
+    mov             r13,    psadframe
+    movd    [r13],  xmm8
+
+    POP_XMM
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+%assign push_num 0
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          p_sd8x8
+%undef          p_mad8x8
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+
+
+
+;*************************************************************************************************************
+;void VAACalcSadSsdBgd_sse2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16,
+;                       int32_t *psqdiff16x16, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+
+WELS_EXTERN VAACalcSadSsdBgd_sse2
+%define         cur_data                        arg1;
+%define         ref_data                        arg2;
+%define         iPicWidth                       arg3;
+%define         iPicHeight                      arg4;
+%define         iPicStride                      arg5;
+%define         psadframe                       arg6;
+%define         psad8x8                         arg7;
+%define         psum16x16                       arg8;
+%define         psqsum16x16                     arg9;
+%define         psqdiff16x16                    arg10;
+%define         p_sd8x8                         arg11
+%define         p_mad8x8                        arg12
+
+    push r12
+    push r13
+    push r14
+    push r15
+%assign push_num 4
+    PUSH_XMM 10
+%ifdef WIN64
+    mov r4,arg5
+    ;mov r5,arg6
+%endif
+    SIGN_EXTENSION r2,r2d
+    SIGN_EXTENSION r3,r3d
+    SIGN_EXTENSION r4,r4d
+
+    mov     r13,r4
+    shr             r2,     4                                       ; iPicWidth/16
+    shr             r3,     4                                       ; iPicHeight/16
+    shl             r13,    4                                                       ; iPicStride*16
+    pxor    xmm0,   xmm0
+    pxor    xmm8,   xmm8
+    pxor    xmm9,   xmm9
+
+
+sqdiff_bgd_height_loop:
+    mov             r10,    r0
+    mov             r11,    r1
+    push r2
+%assign push_num push_num+1
+sqdiff_bgd_width_loop:
+
+    pxor    xmm7,   xmm7            ; pSad8x8 interleaves sqsum16x16:  sqsum1 sad1 sqsum0 sad0
+    pxor    xmm6,   xmm6            ; sum_8x8 interleaves cur and pRef in Dword,  Sref1 Scur1 Sref0 Scur0
+    pxor    xmm5,   xmm5            ; pMad8x8
+    pxor    xmm4,   xmm4            ; sqdiff_16x16  four Dword
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+
+    mov             r14,            psad8x8
+    movdqa  xmm2,           xmm7
+    pshufd  xmm1,           xmm2,           00001110b
+    movd    [r14],          xmm2
+    movd    [r14+4],        xmm1
+    add             r14,            8
+    mov             psad8x8,        r14                     ; sad8x8
+
+    paddd   xmm1,                           xmm2
+    movd    r14d,                           xmm1
+    movd    xmm9,r14d
+    paddd           xmm8,           xmm9                    ; iFrameSad
+
+    mov             r14,            psum16x16
+    movdqa  xmm1,           xmm6
+    pshufd  xmm2,           xmm1,           00001110b
+    paddd   xmm1,           xmm2
+    movd    [r14],          xmm1                            ; sum
+
+    mov             r14,            p_sd8x8
+    pshufd  xmm1,           xmm6,           11110101b                       ; Sref1 Sref1 Sref0 Sref0
+    psubd   xmm6,           xmm1            ; 00 diff1 00 diff0
+    pshufd  xmm1,           xmm6,           00001000b                       ;  xx xx diff1 diff0
+    movq    [r14],          xmm1
+    add             r14,            8
+    mov             p_sd8x8,        r14
+
+    mov                     r14,            p_mad8x8
+    WELS_MAX_REG_SSE2       xmm5
+
+    movhlps         xmm1,   xmm5
+    push r0
+    movd            r0d,    xmm5
+    mov                     [r14],  r0b
+    movd            r0d,    xmm1
+    mov                     [r14+1],r0b
+    pop r0
+    add                     r14,    2
+    mov                     p_mad8x8,       r14
+
+    psrlq   xmm7,   32
+    psllq   xmm7,   32                      ; clear sad
+    pxor    xmm6,   xmm6            ; sum_8x8 interleaves cur and pRef in Dword,  Sref1 Scur1 Sref0 Scur0
+    pxor    xmm5,   xmm5            ; pMad8x8
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+    WELS_SAD_BGD_SQDIFF_16x1_SSE2   xmm7,   xmm6,   xmm5,   xmm4, r0 , r1 , r4
+
+    mov             r14,            psad8x8
+    movdqa  xmm2,           xmm7
+    pshufd  xmm1,           xmm2,           00001110b
+    movd    [r14],          xmm2
+    movd    [r14+4],        xmm1
+    add             r14,            8
+    mov             psad8x8,        r14                     ; sad8x8
+
+    paddd   xmm1,                           xmm2
+    movd    r14d,                           xmm1
+    movd    xmm9, r14d
+    paddd   xmm8,           xmm9            ; iFrameSad
+
+    mov             r14,                    psum16x16
+    movdqa  xmm1,                   xmm6
+    pshufd  xmm2,                   xmm1,           00001110b
+    paddd   xmm1,                   xmm2
+    movd    r15d,                   xmm1                            ; sum
+    add             [r14],                  r15d
+    add             r14,                    4
+    mov             psum16x16,      r14
+
+    mov             r14,                    psqsum16x16
+    psrlq   xmm7,                   32
+    pshufd  xmm2,                   xmm7,           00001110b
+    paddd   xmm2,                   xmm7
+    movd    [r14],                  xmm2                            ; sqsum
+    add             r14,                    4
+    mov             psqsum16x16,    r14
+
+    mov             r14,            p_sd8x8
+    pshufd  xmm1,           xmm6,           11110101b                       ; Sref1 Sref1 Sref0 Sref0
+    psubd   xmm6,           xmm1            ; 00 diff1 00 diff0
+    pshufd  xmm1,           xmm6,           00001000b                       ;  xx xx diff1 diff0
+    movq    [r14],          xmm1
+    add             r14,            8
+    mov             p_sd8x8,        r14
+
+    mov             r14,            p_mad8x8
+    WELS_MAX_REG_SSE2       xmm5
+
+
+    movhlps         xmm1,   xmm5
+    push r0
+    movd            r0d,    xmm5
+    mov                     [r14],  r0b
+    movd            r0d,    xmm1
+    mov                     [r14+1],r0b
+    pop r0
+    add                     r14,    2
+    mov                     p_mad8x8,       r14
+
+    mov             r14,            psqdiff16x16
+    pshufd  xmm1,           xmm4,           00001110b
+    paddd   xmm4,           xmm1
+    pshufd  xmm1,           xmm4,           00000001b
+    paddd   xmm4,           xmm1
+    movd    [r14],          xmm4
+    add             r14,            4
+    mov             psqdiff16x16,   r14
+
+    add             r14,    16
+    sub             r0,     r13
+    sub             r1,     r13
+    add             r0,     16
+    add             r1,     16
+
+    dec             r2
+    jnz             sqdiff_bgd_width_loop
+    pop r2
+    %assign push_num push_num-1
+    mov             r0,     r10
+    mov             r1,     r11
+    add             r0,     r13
+    add             r1,     r13
+
+    dec     r3
+    jnz             sqdiff_bgd_height_loop
+
+    mov             r14,    psadframe
+    movd    [r14],  xmm8
+
+    POP_XMM
+    pop r15
+    pop r14
+    pop r13
+    pop r12
+%assign push_num 0
+%undef          cur_data
+%undef          ref_data
+%undef          iPicWidth
+%undef          iPicHeight
+%undef          iPicStride
+%undef          psadframe
+%undef          psad8x8
+%undef          psum16x16
+%undef          psqsum16x16
+%undef          psqdiff16x16
+%undef          p_sd8x8
+%undef          p_mad8x8
+%undef          tmp_esi
+%undef          tmp_edi
+%undef          pushsize
+%undef          localsize
+    ret
+%endif
+
+%ifdef X86_32
+%define ptrword dword
+%else
+%define ptrword qword
+%endif
+
+%define xmm_width 16
+%define ymm_width 32
+
+%macro PUSHM 1-*
+    %rep %0
+        push           %1
+        %rotate 1
+    %endrep
+    %assign push_num push_num + %0
+%endmacro
+
+%macro POPM 1-*
+    %rep %0
+        %rotate -1
+        pop            %1
+    %endrep
+    %assign push_num push_num - %0
+%endmacro
+
+%ifdef X86_32
+%define stack_alloc_min 4
+%else
+%define stack_alloc_min 8
+%endif
+
+; Allocate aligned stack space.
+; address_out=%1 size=%2 alignment=%3
+%macro STACK_ALLOC 3
+%if (%3) & ((%3) - 1)
+    %error non-power-of-2 alignment requested.
+%endif
+%if (%3) > 0
+    %assign stack_alloc_align ((%3) + stack_alloc_min - 1) / stack_alloc_min
+%else
+    %assign stack_alloc_align 1
+%endif
+    %assign stack_alloc_num ((%2) + stack_alloc_min - 1) / stack_alloc_min + stack_alloc_align - 1
+    %assign push_num push_num + stack_alloc_num
+    sub            r7, stack_alloc_min * stack_alloc_num
+%if stack_alloc_align == 1
+    mov            %1, r7
+%else
+    lea            %1, [r7 + stack_alloc_min * (stack_alloc_align - 1)]
+    and            %1, -(stack_alloc_min * stack_alloc_align)
+%endif
+%endmacro
+
+; Deallocate stack space allocated with STACK_ALLOC.
+%macro STACK_DEALLOC 0
+    add            r7, stack_alloc_min * stack_alloc_num
+    %assign push_num push_num - stack_alloc_num
+%endmacro
+
+%ifdef HAVE_AVX2
+; Max unsigned byte per quadword
+; out=%1 in=%2 tmp=%3
+%macro AVX2_Maxubq 3
+    vpsrlq         %3, %2, 32
+    vpmaxub        %1, %2, %3
+    vpsrlq         %3, %1, 16
+    vpmaxub        %1, %1, %3
+    vpsrlq         %3, %1,  8
+    vpmaxub        %1, %1, %3
+%endmacro
+
+; Max unsigned byte per quadword. 2 register input.
+; Results interleaved as least significant byte of even/odd doublewords.
+; out=%1 in_a=%2 in_b=%3 tmp=%4
+%macro AVX2_Maxubq2 4
+    vpblendd       %4, %2, %3, 10101010b
+    vpshufd        %4, %4, 10110001b
+    vpblendd       %1, %2, %3, 01010101b
+    vpmaxub        %1, %4, %1
+    vpsrld         %4, %1, 16
+    vpmaxub        %1, %1, %4
+    vpsrld         %4, %1,  8
+    vpmaxub        %1, %1, %4
+%endmacro
+
+; res=%1 src=%2 zero=%3 tmp=%4 add_to_res=%5
+%macro AVX2_Sqsumbdw 5
+    vpunpcklbw     %4, %2, %3
+%if %5
+    vpmaddwd       %4, %4, %4
+    vpaddd         %1, %1, %4
+%else
+    vpmaddwd       %1, %4, %4
+%endif
+    vpunpckhbw     %4, %2, %3
+    vpmaddwd       %4, %4, %4
+    vpaddd         %1, %1, %4
+%endmacro
+
+; res=%1 src=%2 zero=%3 tmp=%4 add_to_res=%5
+%macro AVX2_Sumbdw 5
+%if %5
+    vpsadbw        %4, %2, %3
+    vpaddd         %1, %1, %4
+%else
+    vpsadbw        %1, %2, %3
+%endif
+%endmacro
+
+; res=%1 a=%2 b=%3 a=%4 tmp=%5
+%macro AVX2_AbsDiffub 5
+    vpsubusb       %5, %2, %3
+    vpsubusb       %1, %3, %4
+    vpor           %1, %5, %1
+%endmacro
+
+; sad=%1 cur_data=%2 ref_data=%3 tmp=%4 accumulate_results=%5
+%macro AVX2_Sadbdw 5
+%if %5
+    vpsadbw        %4, %2, %3
+    vpaddd         %1, %1, %4
+%else
+    vpsadbw        %1, %2, %3
+%endif
+%endmacro
+
+; sad=%1 sum_cur=%2 sqsum_cur=%3 cur_data=%4 ref_data=%5 zero=%6 tmp=%7 accumulate_results=%8
+%macro AVX2_SadSumSqsumbdw 8
+    AVX2_Sadbdw    %1, %4, %5, %7, %8
+    AVX2_Sumbdw    %2, %4, %6, %7, %8
+    AVX2_Sqsumbdw  %3, %4, %6, %7, %8
+%endmacro
+
+; sad=%1 pCur=%2 pRef=%3 tmp=%4 accumulate_results=%5
+%macro AVX2_Sad 5
+    vmovdqu        %4, [%2]
+    AVX2_Sadbdw    %1, %4, [%3], %4, %5
+%endmacro
+
+; sad=%1 sum_cur=%2 sqsum_cur=%3 pCur=%4 pRef=%5 zero=%6 tmp=%7,%8 accumulate_results=%9
+%macro AVX2_SadSumSqsum 9
+    vmovdqu        %7, [%4]
+    AVX2_SadSumSqsumbdw %1, %2, %3, %7, [%5], %6, %8, %9
+%endmacro
+
+; sad=%1 sum_cur=%2 sqsum_cur=%3 sqdiff=%4 pCur=%5 pRef=%6 zero=%7 tmp=%8,%9,%10 accumulate_results=%11
+%macro AVX2_SadSumSqsumSqdiff 11
+    vmovdqu        %8,  [%5]
+    vmovdqu        %9,  [%6]
+    AVX2_SadSumSqsumbdw %1, %2, %3, %8, %9, %7, %10, %11
+    AVX2_AbsDiffub %9,  %8,  %9,  %8,  %10
+    AVX2_Sqsumbdw  %4,  %9,  %7,  %10, %11
+%endmacro
+
+; sad=%1 sum_cur=%2 sum_ref=%3 mad=%4 pCur=%5 pRef=%6 zero=%7 tmp=%8,%9,%10 accumulate_results=%11
+%macro AVX2_SadSdMad 11
+    vmovdqu        %8,  [%5]
+    vmovdqu        %9,  [%6]
+    AVX2_Sumbdw    %2,  %8,  %7,  %10, %11
+    AVX2_Sumbdw    %3,  %9,  %7,  %10, %11
+    AVX2_Sadbdw    %1,  %8,  %9,  %10, %11
+%if %11
+    AVX2_AbsDiffub %9,  %8,  %9,  %8, %10
+    vpmaxub        %4,  %4,  %9
+%else
+    AVX2_AbsDiffub %4,  %8,  %9,  %8, %10
+%endif
+%endmacro
+
+; sad=%1 sum_cur=%2 sum_ref=%3 mad=%4 sqdiff=%5 sqsum_cur=%6 pCur=%7 pRef=%8 zero=%9 tmp=%10,%11,%12 accumulate_results=%13
+%macro AVX2_SadBgdSqdiff 13
+%ifidn %12, 0
+    vmovdqu        %10, [%7]
+    AVX2_Sumbdw    %2,  %10, %9,  %11, %13
+    AVX2_Sqsumbdw  %6,  %10, %9,  %11, %13
+    vmovdqu        %11, [%8]
+    AVX2_Sadbdw    %1,  %10, %11, %10, %13
+    AVX2_Sumbdw    %3,  %11, %9,  %10, %13
+    vmovdqu        %10, [%7]
+%if %13
+    AVX2_AbsDiffub %11, %10, %11, [%7], %10
+    vpmaxub        %4,  %4,  %11
+    AVX2_Sqsumbdw  %5,  %11, %9,  %10, %13
+%else
+    AVX2_AbsDiffub %4,  %10, %11, [%7], %10
+    AVX2_Sqsumbdw  %5,  %4,  %9,  %10, %13
+%endif
+%else
+    vmovdqu        %10, [%7]
+    vmovdqu        %11, [%8]
+    AVX2_Sadbdw    %1,  %10, %11, %12, %13
+    AVX2_Sumbdw    %2,  %10, %9,  %12, %13
+    AVX2_Sumbdw    %3,  %11, %9,  %12, %13
+    AVX2_Sqsumbdw  %6,  %10, %9,  %12, %13
+%if %13
+    AVX2_AbsDiffub %11, %10, %11, %10, %12
+    vpmaxub        %4,  %4,  %11
+    AVX2_Sqsumbdw  %5,  %11, %9,  %10, %13
+%else
+    AVX2_AbsDiffub %4,  %10, %11, %10, %12
+    AVX2_Sqsumbdw  %5,  %4,  %9,  %10, %13
+%endif
+%endif
+%endmacro
+
+; p_dst=%1 mmreg_prefix=%2 data=%3 tmp=%4 second_blocks=%5
+%macro AVX2_Store8x8Accdw 5
+    vpshufd        %2%4, %2%3, 1000b
+%ifidni %2, x
+    vmovlps        [%1 + 8 * %5], x%4
+%elif %5 == 0
+    vmovdqu        [%1], %2%4
+%else
+    vmovlps        [%1 +  8], x%4
+    vextracti128   x%4, %2%4, 1
+    vmovlps        [%1 + 24], x%4
+%endif
+%endmacro
+
+; p_dst=%1 mmreg_prefix=%2 data=%3 tmp=%4 second_blocks=%5
+%macro AVX2_Store8x8Accb 5
+    vpunpckhqdq    %2%4, %2%3, %2%3
+    vpunpcklbw     %2%4, %2%3, %2%4
+%if %5 == 0
+    vmovd          [%1 + 0], x%4
+%ifidni %2, y
+    vextracti128   x%4, %2%4, 1
+    vmovd          [%1 + 4], x%4
+%endif
+%else
+    vpextrw        [%1 + 2], x%4, 0
+%ifidni %2, y
+    vextracti128   x%4, %2%4, 1
+    vpextrw        [%1 + 6], x%4, 0
+%endif
+%endif
+%endmacro
+
+; p_dst=%1 data=%2 tmp=%3,%4 second_blocks=%5
+%macro AVX2_Store2x8x8Accb 5
+    vpunpckhqdq    y%3, y%2, y%2
+    vpunpcklbw     y%3, y%2, y%3
+    vextracti128   x%4, y%3, 1
+    vpsllq         x%4, x%4, 32
+    vpblendd       x%4, x%3, x%4, 1010b
+%if %5
+    vpslld         x%4, x%4, 16
+    vpblendw       x%4, x%4, [%1], 01010101b
+%endif
+    vmovdqu        [%1], x%4
+%endmacro
+
+; p_dst=%1 mmreg_prefix=%2 data=%3 tmp=%4 add_to_dst=%5
+%macro AVX2_Store16x16Accdw 5
+%ifidni %2, x
+%if %5
+    vmovd          x%4, [%1 + 0]
+    vpaddd         x%3, x%4, x%3
+%endif
+    vmovd          [%1 + 0], x%3
+%elif %5 == 0
+    vmovd          [%1 + 0], x%3
+    vextracti128   x%3, %2%3, 1
+    vmovd          [%1 + 4], x%3
+%else
+    vextracti128   x%4, %2%3, 1
+    vpunpckldq     x%4, x%3, x%4
+    vmovq          x%3, [%1 + 0]
+    vpaddd         x%3, x%3, x%4
+    vmovlps        [%1 + 0], x%3
+%endif
+%endmacro
+
+; p_dst1=%1 p_dst2=%2 i_dst_offset=%3 gpr_tmp=%4 mmreg_prefix=%5 data=%6 mm_tmp=%7 add_to_dst=%8
+%macro AVX2_Store2x16x16Accdw 8
+%ifidni %5, x
+    mov            %4, %1
+%if %8 == 0
+    vmovd          [%4 + %3], x%6
+    mov            %4, %2
+    vpextrd        [%4 + %3], x%6, 2
+%else
+    vmovd          x%7, [%4 + %3]
+    vpaddd         x%7, x%7, x%6
+    vmovd          [%4 + %3], x%7
+    mov            %4, %2
+    vpbroadcastd   x%7, [%4 + %3]
+    vpaddd         x%7, x%7, x%6
+    vpextrd        [%4 + %3], x%7, 2
+%endif
+%else
+    vextracti128   x%7, %5%6, 1
+    vpblendd       x%6, x%6, x%7, 1010b
+    mov            %4, %1
+%if %8 == 0
+    vmovlps        [%4 + %3], x%6
+    mov            %4, %2
+    vmovhps        [%4 + %3], x%6
+%else
+    vmovq          x%7, [%4 + %3]
+    vpaddd         x%7, x%7, x%6
+    vmovlps        [%4 + %3], x%7
+    mov            %4, %2
+    vpbroadcastq   x%7, [%4 + %3]
+    vpaddd         x%7, x%7, x%6
+    vmovhps        [%4 + %3], x%7
+%endif
+%endif
+%endmacro
+
+
+; x/y-mm_prefix=%1 mm_clobber=%2,%3,%4,%5,%6 b_second_blocks=%7
+%macro AVX2_CalcSad_8Lines 7
+%define mm_tmp0    %2
+%define mm_sad     %3
+%define mm_sad2    %4
+%define mm_sad3    %5
+%define mm_sad4    %6
+%define b_second_blocks %7
+%ifdef i_stride5
+    %define i_stride5_ i_stride5
+%else
+    lea            r_tmp, [5 * i_stride]
+    %define i_stride5_ r_tmp
+%endif
+    ; Use multiple accumulators to shorten dependency chains and enable more parallelism.
+    AVX2_Sad       %1 %+ mm_sad,  p_cur,                  p_ref,                  %1 %+ mm_tmp0, 0
+    AVX2_Sad       %1 %+ mm_sad2, p_cur + 1 * i_stride,   p_ref + 1 * i_stride,   %1 %+ mm_tmp0, 0
+    AVX2_Sad       %1 %+ mm_sad3, p_cur + 2 * i_stride,   p_ref + 2 * i_stride,   %1 %+ mm_tmp0, 0
+    AVX2_Sad       %1 %+ mm_sad4, p_cur + 1 * i_stride3,  p_ref + 1 * i_stride3,  %1 %+ mm_tmp0, 0
+    AVX2_Sad       %1 %+ mm_sad,  p_cur + 4 * i_stride,   p_ref + 4 * i_stride,   %1 %+ mm_tmp0, 1
+    AVX2_Sad       %1 %+ mm_sad2, p_cur + 1 * i_stride5_, p_ref + 1 * i_stride5_, %1 %+ mm_tmp0, 1
+%ifdef i_stride7
+    %define i_stride7_ i_stride7
+%else
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+    %define i_stride7_ r_tmp
+%endif
+    AVX2_Sad       %1 %+ mm_sad3, p_cur + 2 * i_stride3,  p_ref + 2 * i_stride3,  %1 %+ mm_tmp0, 1
+    AVX2_Sad       %1 %+ mm_sad4, p_cur + 1 * i_stride7_, p_ref + 1 * i_stride7_, %1 %+ mm_tmp0, 1
+%undef i_stride5_
+%undef i_stride7_
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    add            p_cur, %1 %+ mm_width
+    add            p_ref, %1 %+ mm_width
+    ; Collapse accumulators.
+    vpaddd         %1 %+ mm_sad,  %1 %+ mm_sad,  %1 %+ mm_sad2
+    vpaddd         %1 %+ mm_sad3, %1 %+ mm_sad3, %1 %+ mm_sad4
+    vpaddd         %1 %+ mm_sad,  %1 %+ mm_sad,  %1 %+ mm_sad3
+    AVX2_Store8x8Accdw p_sad8x8 + xcnt_unit * i_xcnt, %1, mm_sad, mm_tmp0, b_second_blocks
+    vpaddd         y %+ mm_sadframe, y %+ mm_sadframe, y %+ mm_sad
+%undef mm_tmp0
+%undef mm_sad
+%undef mm_sad2
+%undef mm_sad3
+%undef mm_sad4
+%undef b_second_blocks
+%endmacro
+
+;*************************************************************************************************************
+;void VAACalcSad_avx2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;                                                               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8)
+;*************************************************************************************************************
+
+WELS_EXTERN VAACalcSad_avx2
+%define          p_sadframe                    ptrword arg6
+%define          p_sad8x8                      ptrword arg7
+%ifdef X86_32
+%define          saveregs                      r5, r6
+%else
+%define          saveregs                      rbx, rbp, r12
+%endif
+
+%assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    PUSHM          saveregs
+
+%define mm_zero mm0
+%define mm_sadframe mm6
+    vpxor          x %+ mm_zero, x %+ mm_zero, x %+ mm_zero
+    vmovdqa        y %+ mm_sadframe, y %+ mm_zero
+
+    and            r2, -16                     ; iPicWidth &= -16
+    jle            .done                       ; bail if iPicWidth < 16
+    sar            r3, 4                       ; iPicHeight / 16
+    jle            .done                       ; bail if iPicHeight < 16
+    shr            r2, 2                       ; iPicWidth / 4
+
+%define p_cur     r0
+%define p_ref     r1
+%define i_xcnt    r2
+%define i_ycnt    ptrword arg4
+%define i_stride  r4
+%define xcnt_unit 4
+%ifdef X86_32
+    mov            i_ycnt, r3
+    mov            r5, p_sad8x8
+    %define i_stride3 r3
+    %undef  p_sad8x8
+    %define p_sad8x8  r5
+    %define r_tmp     r6
+    lea            i_stride3, [3 * i_stride]
+%else
+    mov            rbp, p_sad8x8
+    %define i_stride3 rbx
+    %define i_stride5 r12
+    %define i_stride7 r6
+    %undef  p_sad8x8
+    %define p_sad8x8  rbp
+    lea            i_stride3, [3 * i_stride]
+    lea            i_stride5, [5 * i_stride]
+    lea            i_stride7, [i_stride + 2 * i_stride3]
+%endif
+
+    ; offset pointer so as to compensate for the i_xcnt offset below.
+    sub            p_sad8x8, 4 * 16 / xcnt_unit
+
+    push           i_xcnt
+%assign push_num push_num + 1
+%define i_xcnt_load ptrword [r7]
+
+.height_loop:
+    ; use end-of-line pointers so as to enable use of a negative counter as index.
+    lea            p_sad8x8, [p_sad8x8 + xcnt_unit * i_xcnt]
+    ; use a negative loop counter so as to enable counting toward zero and indexing with the same counter.
+    neg            i_xcnt
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_upper8_remaining16
+.width_loop_upper8:
+    AVX2_CalcSad_8Lines y, mm1, mm2, mm3, mm4, mm5, 0
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_upper8
+    jg             .width_loop_upper8_end
+.width_loop_upper8_remaining16:
+    AVX2_CalcSad_8Lines x, mm1, mm2, mm3, mm4, mm5, 0
+.width_loop_upper8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    xor            i_xcnt, i_xcnt
+    sub            i_xcnt, i_xcnt_load
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_lower8_remaining16
+.width_loop_lower8:
+    AVX2_CalcSad_8Lines y, mm1, mm2, mm3, mm4, mm5, 1
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_lower8
+    jg             .width_loop_lower8_end
+.width_loop_lower8_remaining16:
+    AVX2_CalcSad_8Lines x, mm1, mm2, mm3, mm4, mm5, 1
+.width_loop_lower8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    xor            i_xcnt, i_xcnt
+    sub            i_xcnt, i_xcnt_load
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    neg            i_xcnt
+    sub            i_ycnt, 1
+    jnz            .height_loop
+
+    pop            i_xcnt
+%assign push_num push_num - 1
+%undef i_xcnt_load
+
+.done:
+    mov            r6, p_sadframe
+    vextracti128   xmm2, y %+ mm_sadframe, 1
+    vpaddd         xmm2, x %+ mm_sadframe, xmm2
+    vpunpckhqdq    xmm1, xmm2, xmm2
+    vpaddd         xmm2, xmm2, xmm1
+    vmovd          [r6], xmm2
+    vzeroupper
+
+    POPM           saveregs
+    POP_XMM
+    LOAD_5_PARA_POP
+%undef           p_cur
+%undef           p_ref
+%undef           i_xcnt
+%undef           i_ycnt
+%undef           i_stride
+%undef           r_tmp
+%undef           xcnt_unit
+%undef           i_stride3
+%undef           i_stride5
+%undef           i_stride7
+%undef           mm_sadframe
+%undef           mm_zero
+%undef           saveregs
+%undef           p_sadframe
+%undef           p_sad8x8
+    ret
+
+
+; x/y-mm_prefix=%1 mm_clobber=%2,%3,%4,%5,%6 b_second_blocks=%7
+%macro AVX2_CalcSadVar_8Lines 7
+%define mm_tmp0    %2
+%define mm_tmp1    %3
+%define mm_sad     %4
+%define mm_sum     %5
+%define mm_sqsum   %6
+%define b_second_blocks %7
+    ; Unroll for better performance on Haswell.
+    ; Avoid unrolling for the 16 px case so as to reduce the code footprint.
+%ifidni %1, y
+    lea            r_tmp, [5 * i_stride]
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur,                 p_ref,                 %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 0
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + 1 * i_stride,  p_ref + 1 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + 2 * i_stride,  p_ref + 2 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + 1 * i_stride3, p_ref + 1 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + 4 * i_stride,  p_ref + 4 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + 2 * i_stride3, p_ref + 2 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    add            p_cur, %1 %+ mm_width
+    add            p_ref, %1 %+ mm_width
+%else
+    vpxor          x %+ mm_sad, x %+ mm_sad, x %+ mm_sad
+    vpxor          x %+ mm_sum, x %+ mm_sum, x %+ mm_sum
+    vpxor          x %+ mm_sqsum, x %+ mm_sqsum, x %+ mm_sqsum
+    lea            r_tmp, [8 * i_stride]
+    add            p_cur, r_tmp
+    add            p_ref, r_tmp
+    neg            r_tmp
+%%loop:
+    AVX2_SadSumSqsum %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, p_cur + r_tmp, p_ref + r_tmp, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, 1
+    add            r_tmp, i_stride
+    jl             %%loop
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    lea            r_tmp, [8 * i_stride - %1 %+ mm_width]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+%endif
+    AVX2_Store8x8Accdw p_sad8x8 + 4 * i_xcnt, %1, mm_sad, mm_tmp1, b_second_blocks
+    vpaddd         y %+ mm_sadframe, y %+ mm_sadframe, y %+ mm_sad
+    vpunpcklqdq    %1 %+ mm_tmp0, %1 %+ mm_sum, %1 %+ mm_sqsum
+    vpunpckhqdq    %1 %+ mm_tmp1, %1 %+ mm_sum, %1 %+ mm_sqsum
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0, %1 %+ mm_tmp1
+    vpshufd        %1 %+ mm_tmp1, %1 %+ mm_tmp0, 10110001b
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0, %1 %+ mm_tmp1
+    AVX2_Store2x16x16Accdw p_sum16x16, p_sqsum16x16, i_xcnt, r_tmp, %1, mm_tmp0, mm_tmp1, b_second_blocks
+%undef mm_tmp0
+%undef mm_tmp1
+%undef mm_sad
+%undef mm_sum
+%undef mm_sqsum
+%undef b_second_blocks
+%endmacro
+
+;*************************************************************************************************************
+;void VAACalcSadVar_avx2( const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight
+;               int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16)
+;*************************************************************************************************************
+
+WELS_EXTERN VAACalcSadVar_avx2
+%define          p_sadframe                    ptrword arg6
+%define          p_sad8x8                      ptrword arg7
+%define          p_sum16x16                    ptrword arg8
+%define          p_sqsum16x16                  ptrword arg9
+%ifdef X86_32
+%define          saveregs                      r5, r6
+%else
+%define          saveregs                      rbx, rbp, r12, r13
+%endif
+
+%assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 7
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    PUSHM          saveregs
+
+%define mm_zero mm0
+%define mm_sadframe mm6
+    vpxor          x %+ mm_zero, x %+ mm_zero, x %+ mm_zero
+    vmovdqa        y %+ mm_sadframe, y %+ mm_zero
+
+    and            r2, -16                     ; iPicWidth &= -16
+    jle            .done                       ; bail if iPicWidth < 16
+    sar            r3, 4                       ; iPicHeight / 16
+    jle            .done                       ; bail if iPicHeight < 16
+    shr            r2, 2                       ; iPicWidth / 4
+
+%define p_cur     r0
+%define p_ref     r1
+%define i_xcnt    r2
+%define i_ycnt    ptrword arg4
+%define i_stride  r4
+%define r_tmp     r6
+%define xcnt_unit 4
+%ifdef X86_32
+    mov            i_ycnt, r3
+    mov            r3, p_sad8x8
+    %undef  p_sad8x8
+    %define p_sad8x8 r3
+    %define i_stride3 r5
+%else
+    mov            rbp, p_sad8x8
+    mov            r12, p_sum16x16
+    mov            r13, p_sqsum16x16
+    %undef  p_sad8x8
+    %undef  p_sum16x16
+    %undef  p_sqsum16x16
+    %define p_sad8x8 rbp
+    %define p_sum16x16 r12
+    %define p_sqsum16x16 r13
+    %define i_stride3 rbx
+%endif
+    lea            i_stride3, [3 * i_stride]
+
+    ; offset pointers so as to compensate for the i_xcnt offset below.
+    sub            p_sad8x8,      4 * 16 / xcnt_unit
+    sub            p_sum16x16,    1 * 16 / xcnt_unit
+    sub            p_sqsum16x16,  1 * 16 / xcnt_unit
+
+    ; use a negative loop counter so as to enable counting toward zero and indexing with the same counter.
+    neg            i_xcnt
+
+.height_loop:
+    push           i_xcnt
+%assign push_num push_num + 1
+%define i_xcnt_load ptrword [r7]
+    ; use end-of-line pointers so as to enable use of a negative counter as index.
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_sad8x8, r_tmp
+    sub            p_sum16x16, i_xcnt
+    sub            p_sqsum16x16, i_xcnt
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_upper8_remaining16
+.width_loop_upper8:
+    AVX2_CalcSadVar_8Lines y, mm1, mm2, mm3, mm4, mm5, 0
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_upper8
+    jg             .width_loop_upper8_end
+.width_loop_upper8_remaining16:
+    AVX2_CalcSadVar_8Lines x, mm1, mm2, mm3, mm4, mm5, 0
+.width_loop_upper8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    mov            i_xcnt, i_xcnt_load
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_lower8_remaining16
+.width_loop_lower8:
+    AVX2_CalcSadVar_8Lines y, mm1, mm2, mm3, mm4, mm5, 1
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_lower8
+    jg             .width_loop_lower8_end
+.width_loop_lower8_remaining16:
+    AVX2_CalcSadVar_8Lines x, mm1, mm2, mm3, mm4, mm5, 1
+.width_loop_lower8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+%undef i_xcnt_load
+    pop            i_xcnt
+    %assign push_num push_num - 1
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    sub            i_ycnt, 1
+    jnz            .height_loop
+
+.done:
+    mov            r_tmp, p_sadframe
+    vextracti128   xmm2, y %+ mm_sadframe, 1
+    vpaddd         xmm2, x %+ mm_sadframe, xmm2
+    vpunpckhqdq    xmm1, xmm2, xmm2
+    vpaddd         xmm2, xmm2, xmm1
+    vmovd          [r_tmp], xmm2
+    vzeroupper
+
+    POPM           saveregs
+    POP_XMM
+    LOAD_5_PARA_POP
+%undef           p_cur
+%undef           p_ref
+%undef           i_xcnt
+%undef           i_ycnt
+%undef           i_stride
+%undef           i_stride3
+%undef           r_tmp
+%undef           xcnt_unit
+%undef           mm_sadframe
+%undef           mm_zero
+%undef           saveregs
+%undef           p_sadframe
+%undef           p_sad8x8
+%undef           p_sum16x16
+%undef           p_sqsum16x16
+    ret
+
+
+; x/y-mm_prefix=%1 mm_clobber=%2,%3,%4,%5,%6,%7,%8 b_second_blocks=%9
+%macro AVX2_CalcSadSsd_8Lines 9
+%define mm_tmp0    %2
+%define mm_tmp1    %3
+%define mm_tmp2    %4
+%define mm_sad     %5
+%define mm_sum     %6
+%define mm_sqsum   %7
+%define mm_sqdiff  %8
+%define b_second_blocks %9
+    ; Unroll for better performance on Haswell.
+    ; Avoid unrolling for the 16 px case so as to reduce the code footprint.
+%ifidni %1, y
+%ifdef i_stride5
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+    %define i_stride5_ i_stride5
+%else
+    lea            r_tmp, [5 * i_stride]
+    %define i_stride5_ r_tmp
+%endif
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur,                  p_ref,                  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 0
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 1 * i_stride,   p_ref + 1 * i_stride,   %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 2 * i_stride,   p_ref + 2 * i_stride,   %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 1 * i_stride3,  p_ref + 1 * i_stride3,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 4 * i_stride,   p_ref + 4 * i_stride,   %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 1 * i_stride5_, p_ref + 1 * i_stride5_, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+%ifndef i_stride5
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+%endif
+%undef i_stride5_
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + 2 * i_stride3,  p_ref + 2 * i_stride3,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + r_tmp,          p_ref + r_tmp,          %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    add            p_cur, %1 %+ mm_width
+    add            p_ref, %1 %+ mm_width
+%else
+    vpxor          x %+ mm_sad, x %+ mm_sad, x %+ mm_sad
+    vpxor          x %+ mm_sum, x %+ mm_sum, x %+ mm_sum
+    vpxor          x %+ mm_sqsum, x %+ mm_sqsum, x %+ mm_sqsum
+    vpxor          x %+ mm_sqdiff, x %+ mm_sqdiff, x %+ mm_sqdiff
+    lea            r_tmp, [8 * i_stride]
+    add            p_cur, r_tmp
+    add            p_ref, r_tmp
+    neg            r_tmp
+%%loop:
+    AVX2_SadSumSqsumSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sqsum, %1 %+ mm_sqdiff, p_cur + r_tmp, p_ref + r_tmp, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    add            r_tmp, i_stride
+    jl             %%loop
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    lea            r_tmp, [8 * i_stride - %1 %+ mm_width]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+%endif
+    mov            r_tmp, p_sad8x8
+    AVX2_Store8x8Accdw r_tmp + 4 * i_xcnt, %1, mm_sad, mm_tmp1, b_second_blocks
+%ifdef X86_32
+    vpaddd         y %+ mm_tmp1, y %+ mm_sad, sadframe_acc
+    vmovdqa        sadframe_acc, y %+ mm_tmp1
+%else
+    vpaddd         sadframe_acc, sadframe_acc, y %+ mm_sad
+%endif
+    mov            r_tmp, i_xcnt
+    add            r_tmp, p_sum16x16
+    vpunpckhqdq    %1 %+ mm_tmp1, %1 %+ mm_sum, %1 %+ mm_sum
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_sum, %1 %+ mm_tmp1
+    AVX2_Store16x16Accdw r_tmp, %1, mm_tmp0, mm_tmp1, b_second_blocks
+    vpunpcklqdq    %1 %+ mm_tmp0, %1 %+ mm_sqsum, %1 %+ mm_sqdiff
+    vpunpckhqdq    %1 %+ mm_tmp1, %1 %+ mm_sqsum, %1 %+ mm_sqdiff
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0, %1 %+ mm_tmp1
+    vpshufd        %1 %+ mm_tmp1, %1 %+ mm_tmp0, 10110001b
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0, %1 %+ mm_tmp1
+    AVX2_Store2x16x16Accdw p_sqsum16x16, p_sqdiff16x16, i_xcnt, r_tmp, %1, mm_tmp0, mm_tmp1, b_second_blocks
+%undef mm_tmp0
+%undef mm_tmp1
+%undef mm_tmp2
+%undef mm_sad
+%undef mm_sum
+%undef mm_sqsum
+%undef mm_sqdiff
+%undef b_second_blocks
+%endmacro
+
+;*************************************************************************************************************
+;void VAACalcSadSsd_avx2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;       int32_t iPicStride,int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16, int32_t *psqdiff16x16)
+;*************************************************************************************************************
+
+WELS_EXTERN VAACalcSadSsd_avx2
+%define          p_sadframe                    ptrword arg6
+%define          p_sad8x8                      ptrword arg7
+%define          p_sum16x16                    ptrword arg8
+%define          p_sqsum16x16                  ptrword arg9
+%define          p_sqdiff16x16                 ptrword arg10
+%ifdef X86_32
+%define          saveregs                      r5, r6
+%else
+%define          saveregs                      rbx, rbp, r12, r13, r14, r15
+%endif
+
+%assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 9
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    PUSHM          saveregs
+
+%define mm_zero mm0
+    vpxor          x %+ mm_zero, x %+ mm_zero, x %+ mm_zero
+
+%ifdef X86_32
+    STACK_ALLOC    r5, ymm_width, ymm_width
+    %define sadframe_acc_addr r5
+    %define sadframe_acc [sadframe_acc_addr]
+%else
+    %define sadframe_acc ymm8
+    %define xsadframe_acc xmm8
+%endif
+    vmovdqa        sadframe_acc, y %+ mm_zero
+
+    and            r2, -16                     ; iPicWidth &= -16
+    jle            .done                       ; bail if iPicWidth < 16
+    sar            r3, 4                       ; iPicHeight / 16
+    jle            .done                       ; bail if iPicHeight < 16
+    shr            r2, 2                       ; iPicWidth / 4
+
+%define p_cur     r0
+%define p_ref     r1
+%define i_xcnt    r2
+%define i_ycnt    ptrword arg4
+%define i_stride  r4
+%define r_tmp     r6
+%define xcnt_unit 4
+%ifdef X86_32
+    mov            i_ycnt, r3
+    %define i_stride3 r3
+%else
+    mov            r12, p_sad8x8
+    mov            r13, p_sum16x16
+    mov            r14, p_sqsum16x16
+    mov            r15, p_sqdiff16x16
+    %undef  p_sad8x8
+    %undef  p_sum16x16
+    %undef  p_sqsum16x16
+    %undef  p_sqdiff16x16
+    %define p_sad8x8 r12
+    %define p_sum16x16 r13
+    %define p_sqsum16x16 r14
+    %define p_sqdiff16x16 r15
+    %define i_stride3 rbx
+    %define i_stride5 rbp
+    lea            i_stride5, [5 * i_stride]
+%endif
+    lea            i_stride3, [3 * i_stride]
+
+    ; offset pointers so as to compensate for i_xcnt offset below.
+    sub            p_sad8x8,      4 * 16 / xcnt_unit
+    sub            p_sum16x16,    1 * 16 / xcnt_unit
+    sub            p_sqsum16x16,  1 * 16 / xcnt_unit
+    sub            p_sqdiff16x16, 1 * 16 / xcnt_unit
+
+    ; use a negative loop counter so as to enable counting toward zero and indexing with the same counter.
+    neg            i_xcnt
+
+.height_loop:
+    push           i_xcnt
+%assign push_num push_num + 1
+%define i_xcnt_load ptrword [r7]
+    ; use end-of-line pointers so as to enable use of a negative counter as index.
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_sad8x8, r_tmp
+    sub            p_sum16x16, i_xcnt
+    sub            p_sqsum16x16, i_xcnt
+    sub            p_sqdiff16x16, i_xcnt
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_upper8_remaining16
+.width_loop_upper8:
+    AVX2_CalcSadSsd_8Lines y, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 0
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_upper8
+    jg             .width_loop_upper8_end
+.width_loop_upper8_remaining16:
+    AVX2_CalcSadSsd_8Lines x, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 0
+.width_loop_upper8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    mov            i_xcnt, i_xcnt_load
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    add            i_xcnt, 16 / xcnt_unit
+    jz             .width_loop_lower8_remaining16
+.width_loop_lower8:
+    AVX2_CalcSadSsd_8Lines y, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 1
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_lower8
+    jg             .width_loop_lower8_end
+.width_loop_lower8_remaining16:
+    AVX2_CalcSadSsd_8Lines x, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 1
+.width_loop_lower8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+%undef i_xcnt_load
+    pop            i_xcnt
+    %assign push_num push_num - 1
+    lea            p_cur, [p_cur + xcnt_unit * i_xcnt]
+    lea            p_ref, [p_ref + xcnt_unit * i_xcnt]
+    sub            i_ycnt, 1
+    jnz            .height_loop
+
+.done:
+    mov            r_tmp, p_sadframe
+%ifdef X86_32
+    vmovdqa        xmm2, sadframe_acc
+    vpaddd         xmm2, xmm2, [sadframe_acc_addr + xmm_width]
+%else
+    vextracti128   xmm2, sadframe_acc, 1
+    vpaddd         xmm2, xsadframe_acc, xmm2
+%endif
+    vpunpckhqdq    xmm1, xmm2, xmm2
+    vpaddd         xmm2, xmm2, xmm1
+    vmovd          [r_tmp], xmm2
+    vzeroupper
+%ifdef X86_32
+    STACK_DEALLOC
+%endif
+    POPM           saveregs
+    POP_XMM
+    LOAD_5_PARA_POP
+%undef           p_cur
+%undef           p_ref
+%undef           i_xcnt
+%undef           i_ycnt
+%undef           i_stride
+%undef           i_stride3
+%undef           i_stride5
+%undef           r_tmp
+%undef           xcnt_unit
+%undef           sadframe_acc
+%undef           sadframe_acc_addr
+%undef           xsadframe_acc
+%undef           mm_zero
+%undef           saveregs
+%undef           p_sadframe
+%undef           p_sad8x8
+%undef           p_sum16x16
+%undef           p_sqsum16x16
+%undef           p_sqdiff16x16
+    ret
+
+
+; x/y-mm_prefix=%1 mm_clobber=%2,%3,%4,%5,%6,%7,%8 b_second_blocks=%9
+%macro AVX2_CalcSadBgd_8Lines 9
+%define mm_tmp0    %2
+%define mm_tmp1    %3
+%define mm_tmp2    %8
+%define mm_mad     %4
+%define mm_sumcur  %5
+%define mm_sumref  %6
+%define mm_sad     %7
+%define b_second_blocks %9
+    ; Unroll for better performance on Haswell.
+    ; Avoid unrolling for the 16 px case so as to reduce the code footprint.
+%ifidni %1, y
+    lea            r_tmp, [5 * i_stride]
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur,                 p_ref,                 %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 0
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + 1 * i_stride,  p_ref + 1 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + 2 * i_stride,  p_ref + 2 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + 1 * i_stride3, p_ref + 1 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + 4 * i_stride,  p_ref + 4 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + 2 * i_stride3, p_ref + 2 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    add            p_cur, %1 %+ mm_width
+    add            p_ref, %1 %+ mm_width
+%else
+    vpxor          x %+ mm_sad, x %+ mm_sad, x %+ mm_sad
+    vpxor          x %+ mm_sumcur, x %+ mm_sumcur, x %+ mm_sumcur
+    vpxor          x %+ mm_sumref, x %+ mm_sumref, x %+ mm_sumref
+    vpxor          x %+ mm_mad, x %+ mm_mad, x %+ mm_mad
+    lea            r_tmp, [8 * i_stride]
+    add            p_cur, r_tmp
+    add            p_ref, r_tmp
+    neg            r_tmp
+%%loop:
+    AVX2_SadSdMad  %1 %+ mm_sad, %1 %+ mm_sumcur, %1 %+ mm_sumref, %1 %+ mm_mad, p_cur + r_tmp, p_ref + r_tmp, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, %1 %+ mm_tmp2, 1
+    add            r_tmp, i_stride
+    jl             %%loop
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    lea            r_tmp, [8 * i_stride - %1 %+ mm_width]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+%endif
+    mov            r_tmp, p_sad8x8
+    AVX2_Store8x8Accdw r_tmp + 4 * i_xcnt, %1, mm_sad, mm_tmp1, b_second_blocks
+%ifdef X86_32
+    vpaddd         y %+ mm_tmp1, y %+ mm_sad, sadframe_acc
+    vmovdqa        sadframe_acc, y %+ mm_tmp1
+%else
+    vpaddd         sadframe_acc, sadframe_acc, y %+ mm_sad
+%endif
+    mov            r_tmp, p_sd8x8
+    vpsubd         %1 %+ mm_tmp0, %1 %+ mm_sumcur, %1 %+ mm_sumref
+    AVX2_Store8x8Accdw r_tmp + 4 * i_xcnt, %1, mm_tmp0, mm_tmp1, b_second_blocks
+    ; Coalesce store and horizontal reduction of MAD accumulator for even and
+    ; odd iterations so as to enable more parallelism.
+%ifidni %1, y
+    test           i_xcnt, 32 / xcnt_unit
+    jz             %%preserve_mad
+    mov            r_tmp, p_mad8x8
+    AVX2_Maxubq2   y %+ mm_mad, y %+ mm_mad, prev_mad, y %+ mm_tmp0
+    AVX2_Store2x8x8Accb r_tmp + i_xcnt - 8, mm_mad, mm_tmp0, mm_tmp1, b_second_blocks
+%%preserve_mad:
+    vmovdqa        prev_mad, y %+ mm_mad
+%else
+    mov            r_tmp, p_mad8x8
+    AVX2_Maxubq    %1 %+ mm_mad, %1 %+ mm_mad, %1 %+ mm_tmp0
+    AVX2_Store8x8Accb r_tmp + i_xcnt, %1, mm_mad, mm_tmp0, b_second_blocks
+%endif
+%undef mm_tmp0
+%undef mm_tmp1
+%undef mm_tmp2
+%undef mm_mad
+%undef mm_sumcur
+%undef mm_sumref
+%undef mm_sad
+%undef b_second_blocks
+%endmacro
+
+; Store remaining MAD accumulator for width & 32 cases.
+; width/xcnt_unit=%1 mm_tmp=%2,%3 b_second_blocks=%4
+%macro AVX2_StoreRemainingSingleMad 4
+    test           %1, 32 / xcnt_unit
+    jz             %%skip
+    mov            r_tmp, p_mad8x8
+    vmovdqa        y%2, prev_mad
+    AVX2_Maxubq    y%2, y%2, y%3
+    AVX2_Store8x8Accb r_tmp + i_xcnt - 8, y, %2, %3, %4
+%%skip:
+%endmacro
+
+;*************************************************************************************************************
+;void VAACalcSadBgd_avx2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                        int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+WELS_EXTERN VAACalcSadBgd_avx2
+%define          p_sadframe                    arg6
+%define          p_sad8x8                      arg7
+%define          p_sd8x8                       arg8
+%define          p_mad8x8                      arg9
+%ifdef X86_32
+%define          saveregs                      r5, r6
+%else
+%define          saveregs                      rbx, rbp, r12, r13
+%endif
+
+%assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 10
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    PUSHM          saveregs
+
+%define mm_zero mm0
+    vpxor          x %+ mm_zero, x %+ mm_zero, x %+ mm_zero
+
+%ifdef X86_32
+    STACK_ALLOC    r5, 2 * ymm_width, ymm_width
+    %define sadframe_acc_addr r5
+    %define sadframe_acc [sadframe_acc_addr]
+    %define prev_mad [r5 + ymm_width]
+%else
+    %define sadframe_acc ymm8
+    %define xsadframe_acc xmm8
+    %define prev_mad ymm9
+%endif
+    vmovdqa        sadframe_acc, y %+ mm_zero
+
+    and            r2, -16                     ; iPicWidth &= -16
+    jle            .done                       ; bail if iPicWidth < 16
+    sar            r3, 4                       ; iPicHeight / 16
+    jle            .done                       ; bail if iPicHeight < 16
+    shr            r2, 2                       ; iPicWidth / 4
+
+%define p_cur     r0
+%define p_ref     r1
+%define i_xcnt    r2
+%define i_ycnt    ptrword arg4
+%define i_stride  r4
+%define r_tmp     r6
+%define xcnt_unit 4
+%ifdef X86_32
+    mov            i_ycnt, r3
+    %define i_stride3 r3
+%else
+    mov            rbp, p_sad8x8
+    mov            r12, p_sd8x8
+    mov            r13, p_mad8x8
+    %undef  p_sad8x8
+    %undef  p_sd8x8
+    %undef  p_mad8x8
+    %define p_sad8x8 rbp
+    %define p_sd8x8 r12
+    %define p_mad8x8 r13
+    %define i_stride3 rbx
+%endif
+    lea            i_stride3, [3 * i_stride]
+
+    ; offset pointers to compensate for the i_xcnt offset below.
+    mov            r_tmp, i_xcnt
+    and            r_tmp, 64 / xcnt_unit - 1
+    sub            p_mad8x8, r_tmp
+    shl            r_tmp, 2
+    sub            p_sad8x8, r_tmp
+    sub            p_sd8x8, r_tmp
+
+.height_loop:
+    push           i_xcnt
+%assign push_num push_num + 1
+%define i_xcnt_load ptrword [r7]
+    ; use end-of-line pointers so as to enable use of a negative counter as index.
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    add            p_sad8x8, r_tmp
+    add            p_sd8x8, r_tmp
+    add            p_mad8x8, i_xcnt
+    and            i_xcnt, -(64 / xcnt_unit)
+    jz             .width_loop_upper8_64x_end
+    ; use a negative loop counter to enable counting toward zero and indexing with the same counter.
+    neg            i_xcnt
+.width_loop_upper8:
+    AVX2_CalcSadBgd_8Lines y, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 0
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_upper8
+    jg             .width_loop_upper8_32x_end
+.width_loop_upper8_64x_end:
+    test           i_xcnt_load, 32 / xcnt_unit
+    jnz            .width_loop_upper8
+.width_loop_upper8_32x_end:
+    AVX2_StoreRemainingSingleMad i_xcnt_load, mm1, mm2, 0
+    test           i_xcnt_load, 16 / xcnt_unit
+    jz             .width_loop_upper8_end
+    ; remaining 16.
+    AVX2_CalcSadBgd_8Lines x, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 0
+.width_loop_upper8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    mov            i_xcnt, i_xcnt_load
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+    and            i_xcnt, -(64 / xcnt_unit)
+    jz             .width_loop_lower8_64x_end
+    neg            i_xcnt
+.width_loop_lower8:
+    AVX2_CalcSadBgd_8Lines y, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 1
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_lower8
+    jg             .width_loop_lower8_32x_end
+.width_loop_lower8_64x_end:
+    test           i_xcnt_load, 32 / xcnt_unit
+    jnz            .width_loop_lower8
+.width_loop_lower8_32x_end:
+    AVX2_StoreRemainingSingleMad i_xcnt_load, mm1, mm2, 1
+    test           i_xcnt_load, 16 / xcnt_unit
+    jz             .width_loop_lower8_end
+    ; remaining 16.
+    AVX2_CalcSadBgd_8Lines x, mm1, mm2, mm3, mm4, mm5, mm6, mm7, 1
+.width_loop_lower8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    pop            i_xcnt
+%undef i_xcnt_load
+    %assign push_num push_num - 1
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+    sub            i_ycnt, 1
+    jnz            .height_loop
+
+.done:
+    mov            r_tmp, p_sadframe
+%ifdef X86_32
+    vmovdqa        xmm2, sadframe_acc
+    vpaddd         xmm2, xmm2, [sadframe_acc_addr + xmm_width]
+%else
+    vextracti128   xmm2, sadframe_acc, 1
+    vpaddd         xmm2, xsadframe_acc, xmm2
+%endif
+    vpunpckhqdq    xmm1, xmm2, xmm2
+    vpaddd         xmm2, xmm2, xmm1
+    vmovd          [r_tmp], xmm2
+    vzeroupper
+%ifdef X86_32
+    STACK_DEALLOC
+%endif
+    POPM           saveregs
+    POP_XMM
+    LOAD_5_PARA_POP
+%undef           p_cur
+%undef           p_ref
+%undef           i_xcnt
+%undef           i_ycnt
+%undef           i_stride
+%undef           i_stride3
+%undef           r_tmp
+%undef           xcnt_unit
+%undef           sadframe_acc
+%undef           sadframe_acc_addr
+%undef           xsadframe_acc
+%undef           prev_mad
+%undef           mm_zero
+%undef           saveregs
+%undef           p_sadframe
+%undef           p_sad8x8
+%undef           p_sd8x8
+%undef           p_mad8x8
+    ret
+
+
+; x/y-mm_prefix=%1 mm_clobber=%2,%3,%4,%5,%6,%7,%8,%9,%10 b_second_blocks=%11
+%macro AVX2_CalcSadSsdBgd_8Lines 11
+%define mm_tmp0    %2
+%define mm_tmp1    %3
+%define mm_sad     %4
+%define mm_sum     %5
+%define mm_sumref  %6
+%define mm_mad     %7
+%define mm_sqsum   %8
+%define mm_sqdiff  %9
+%ifidn %10, 0
+%define tmp2       0
+%else
+%define tmp2       %1 %+ %10
+%endif
+%define b_second_blocks %11
+    ; Unroll for better performance on Haswell.
+    ; Avoid unrolling for the 16 px case so as to reduce the code footprint.
+%ifidni %1, y
+    lea            r_tmp, [5 * i_stride]
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur,                 p_ref,                 %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 0
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + 1 * i_stride,  p_ref + 1 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + 2 * i_stride,  p_ref + 2 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + 1 * i_stride3, p_ref + 1 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + 4 * i_stride,  p_ref + 4 * i_stride,  %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    lea            r_tmp, [i_stride + 2 * i_stride3]
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + 2 * i_stride3, p_ref + 2 * i_stride3, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + r_tmp,         p_ref + r_tmp,         %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    add            p_cur, %1 %+ mm_width
+    add            p_ref, %1 %+ mm_width
+%else
+    vpxor          x %+ mm_sad, x %+ mm_sad, x %+ mm_sad
+    vpxor          x %+ mm_sum, x %+ mm_sum, x %+ mm_sum
+    vpxor          x %+ mm_sumref, x %+ mm_sumref, x %+ mm_sumref
+    vpxor          x %+ mm_mad, x %+ mm_mad, x %+ mm_mad
+    vpxor          x %+ mm_sqsum, x %+ mm_sqsum, x %+ mm_sqsum
+    vpxor          x %+ mm_sqdiff, x %+ mm_sqdiff, x %+ mm_sqdiff
+    lea            r_tmp, [8 * i_stride]
+    add            p_cur, r_tmp
+    add            p_ref, r_tmp
+    neg            r_tmp
+%%loop:
+    AVX2_SadBgdSqdiff %1 %+ mm_sad, %1 %+ mm_sum, %1 %+ mm_sumref, %1 %+ mm_mad, %1 %+ mm_sqdiff, %1 %+ mm_sqsum, p_cur + r_tmp, p_ref + r_tmp, %1 %+ mm_zero, %1 %+ mm_tmp0, %1 %+ mm_tmp1, tmp2, 1
+    add            r_tmp, i_stride
+    jl             %%loop
+    ; Increment addresses for the next iteration. Doing this early is beneficial on Haswell.
+    lea            r_tmp, [8 * i_stride - %1 %+ mm_width]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+%endif
+    mov            r_tmp, p_sad8x8
+    AVX2_Store8x8Accdw r_tmp + 4 * i_xcnt, %1, mm_sad, mm_tmp1, b_second_blocks
+%ifdef X86_32
+    vpaddd         y %+ mm_tmp1, y %+ mm_sad, sadframe_acc
+    vmovdqa        sadframe_acc, y %+ mm_tmp1
+%else
+    vpaddd         sadframe_acc, sadframe_acc, y %+ mm_sad
+%endif
+    mov            r_tmp, i_xcnt
+    add            r_tmp, p_sum16x16
+    vpunpckhqdq    %1 %+ mm_tmp1, %1 %+ mm_sum, %1 %+ mm_sum
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_sum, %1 %+ mm_tmp1
+    AVX2_Store16x16Accdw r_tmp, %1, mm_tmp0, mm_tmp1, b_second_blocks
+    mov            r_tmp, p_sd8x8
+    vpsubd         %1 %+ mm_sum,  %1 %+ mm_sum, %1 %+ mm_sumref
+    AVX2_Store8x8Accdw r_tmp + 4 * i_xcnt, %1, mm_sum, mm_tmp0, b_second_blocks
+    ; Coalesce store and horizontal reduction of MAD accumulator for even and
+    ; odd iterations so as to enable more parallelism.
+%ifidni %1, y
+    test           i_xcnt, 32 / xcnt_unit
+    jz             %%preserve_mad
+    mov            r_tmp, p_mad8x8
+    AVX2_Maxubq2   y %+ mm_mad, y %+ mm_mad, prev_mad, y %+ mm_tmp0
+    AVX2_Store2x8x8Accb r_tmp + i_xcnt - 8, mm_mad, mm_tmp0, mm_tmp1, b_second_blocks
+%%preserve_mad:
+    vmovdqa        prev_mad, y %+ mm_mad
+%else
+    mov            r_tmp, p_mad8x8
+    AVX2_Maxubq    %1 %+ mm_mad, %1 %+ mm_mad, %1 %+ mm_tmp0
+    AVX2_Store8x8Accb r_tmp + i_xcnt, %1, mm_mad, mm_tmp0, b_second_blocks
+%endif
+    vpunpcklqdq    %1 %+ mm_tmp0, %1 %+ mm_sqsum, %1 %+ mm_sqdiff
+    vpunpckhqdq    %1 %+ mm_tmp1, %1 %+ mm_sqsum, %1 %+ mm_sqdiff
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0,  %1 %+ mm_tmp1
+    vpshufd        %1 %+ mm_tmp1, %1 %+ mm_tmp0,  10110001b
+    vpaddd         %1 %+ mm_tmp0, %1 %+ mm_tmp0,  %1 %+ mm_tmp1
+    AVX2_Store2x16x16Accdw p_sqsum16x16, p_sqdiff16x16, i_xcnt, r_tmp, %1, mm_tmp0, mm_tmp1, b_second_blocks
+%undef mm_tmp0
+%undef mm_tmp1
+%undef mm_sqsum
+%undef mm_sqdiff
+%undef mm_mad
+%undef mm_sum
+%undef mm_sumref
+%undef mm_sad
+%undef tmp2
+%undef b_second_blocks
+%endmacro
+
+;*************************************************************************************************************
+;void VAACalcSadSsdBgd_avx2(const uint8_t *cur_data, const uint8_t *ref_data, int32_t iPicWidth, int32_t iPicHeight,
+;                int32_t iPicStride, int32_t *psadframe, int32_t *psad8x8, int32_t *psum16x16, int32_t *psqsum16x16,
+;                       int32_t *psqdiff16x16, int32_t *p_sd8x8, uint8_t *p_mad8x8)
+;*************************************************************************************************************
+
+WELS_EXTERN VAACalcSadSsdBgd_avx2
+%define         p_sadframe                      arg6
+%define         p_sad8x8                        arg7
+%define         p_sum16x16                      arg8
+%define         p_sqsum16x16                    arg9
+%define         p_sqdiff16x16                   arg10
+%define         p_sd8x8                         arg11
+%define         p_mad8x8                        arg12
+%ifdef X86_32
+%define         saveregs                        r5, r6
+%else
+%define         saveregs                        rbx, rbp, r12, r13, r14, r15
+%endif
+
+%assign push_num 0
+    LOAD_5_PARA
+    PUSH_XMM 12
+    SIGN_EXTENSION r2, r2d
+    SIGN_EXTENSION r3, r3d
+    SIGN_EXTENSION r4, r4d
+    PUSHM          saveregs
+
+%ifdef X86_32
+    STACK_ALLOC    r5, 3 * ymm_width, ymm_width
+    %define mm8 0
+    %define sadframe_acc_addr r5
+    %define sadframe_acc [sadframe_acc_addr]
+    %define prev_mad [r5 + ymm_width]
+    %define ymm_zero [r5 + 2 * ymm_width]
+    %define xmm_zero ymm_zero
+    vpxor          xmm0, xmm0, xmm0
+    vmovdqa        sadframe_acc, ymm0
+    vmovdqa        ymm_zero, ymm0
+%else
+    %define sadframe_acc ymm9
+    %define xsadframe_acc xmm9
+    %define prev_mad ymm10
+    %define ymm_zero ymm11
+    %define xmm_zero xmm11
+    vpxor          xmm_zero, xmm_zero, xmm_zero
+    vpxor          xsadframe_acc, xsadframe_acc, xsadframe_acc
+%endif
+
+    and            r2, -16                     ; iPicWidth &= -16
+    jle            .done                       ; bail if iPicWidth < 16
+    sar            r3, 4                       ; iPicHeight / 16
+    jle            .done                       ; bail if iPicHeight < 16
+    shr            r2, 2                       ; iPicWidth / 4
+
+%define p_cur     r0
+%define p_ref     r1
+%define i_xcnt    r2
+%define i_ycnt    ptrword arg4
+%define i_stride  r4
+%define r_tmp     r6
+%define xcnt_unit 4
+%ifdef X86_32
+    mov            i_ycnt, r3
+    %define i_stride3 r3
+%else
+    mov            rbp, p_sad8x8
+    mov            r12, p_sum16x16
+    mov            r13, p_sqsum16x16
+    mov            r14, p_sqdiff16x16
+    mov            r15, p_sd8x8
+    %undef p_sad8x8
+    %undef p_sum16x16
+    %undef p_sqsum16x16
+    %undef p_sqdiff16x16
+    %undef p_sd8x8
+    %define p_sad8x8 rbp
+    %define p_sum16x16 r12
+    %define p_sqsum16x16 r13
+    %define p_sqdiff16x16 r14
+    %define p_sd8x8 r15
+    %define i_stride3 rbx
+%endif
+    lea            i_stride3, [3 * i_stride]
+
+    ; offset pointers so as to compensate for the i_xcnt offset below.
+    mov            r_tmp, i_xcnt
+    and            r_tmp, 64 / xcnt_unit - 1
+    sub            p_sum16x16, r_tmp
+    sub            p_sqsum16x16, r_tmp
+    sub            p_sqdiff16x16, r_tmp
+    sub            p_mad8x8, r_tmp
+    shl            r_tmp, 2
+    sub            p_sad8x8, r_tmp
+    sub            p_sd8x8, r_tmp
+
+.height_loop:
+    push           i_xcnt
+%assign push_num push_num + 1
+%define i_xcnt_load ptrword [r7]
+    ; use end-of-line pointers so as to enable use of a negative counter as index.
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    add            p_sad8x8, r_tmp
+    add            p_sum16x16, i_xcnt
+    add            p_sqsum16x16, i_xcnt
+    add            p_sqdiff16x16, i_xcnt
+    add            p_sd8x8, r_tmp
+    add            p_mad8x8, i_xcnt
+    and            i_xcnt, -(64 / xcnt_unit)
+    jz             .width_loop_upper8_64x_end
+    ; use a negative loop counter to enable counting toward zero and indexing with the same counter.
+    neg            i_xcnt
+.width_loop_upper8:
+    AVX2_CalcSadSsdBgd_8Lines y, mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, mm8, 0
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_upper8
+    jg             .width_loop_upper8_32x_end
+.width_loop_upper8_64x_end:
+    test           i_xcnt_load, 32 / xcnt_unit
+    jnz            .width_loop_upper8
+.width_loop_upper8_32x_end:
+    AVX2_StoreRemainingSingleMad i_xcnt_load, mm1, mm2, 0
+    test           i_xcnt_load, 16 / xcnt_unit
+    jz             .width_loop_upper8_end
+    ; remaining 16.
+    AVX2_CalcSadSsdBgd_8Lines x, mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, mm8, 0
+.width_loop_upper8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    mov            i_xcnt, i_xcnt_load
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+    and            i_xcnt, -(64 / xcnt_unit)
+    jz             .width_loop_lower8_64x_end
+    neg            i_xcnt
+.width_loop_lower8:
+    AVX2_CalcSadSsdBgd_8Lines y, mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, mm8, 1
+    add            i_xcnt, 32 / xcnt_unit
+    jl             .width_loop_lower8
+    jg             .width_loop_lower8_32x_end
+.width_loop_lower8_64x_end:
+    test           i_xcnt_load, 32 / xcnt_unit
+    jnz            .width_loop_lower8
+.width_loop_lower8_32x_end:
+    AVX2_StoreRemainingSingleMad i_xcnt_load, mm1, mm2, 1
+    test           i_xcnt_load, 16 / xcnt_unit
+    jz             .width_loop_lower8_end
+    ; remaining 16.
+    AVX2_CalcSadSsdBgd_8Lines x, mm0, mm1, mm2, mm3, mm4, mm5, mm6, mm7, mm8, 1
+.width_loop_lower8_end:
+    lea            p_cur, [p_cur + 8 * i_stride]
+    lea            p_ref, [p_ref + 8 * i_stride]
+    pop            i_xcnt
+%undef i_xcnt_load
+    %assign push_num push_num - 1
+    lea            r_tmp, [xcnt_unit * i_xcnt]
+    sub            p_cur, r_tmp
+    sub            p_ref, r_tmp
+    sub            i_ycnt, 1
+    jnz            .height_loop
+
+.done:
+    mov            r_tmp, p_sadframe
+%ifdef X86_32
+    vmovdqa        xmm2, sadframe_acc
+    vpaddd         xmm2, xmm2, [sadframe_acc_addr + xmm_width]
+%else
+    vextracti128   xmm2, sadframe_acc, 1
+    vpaddd         xmm2, xsadframe_acc, xmm2
+%endif
+    vpunpckhqdq    xmm1, xmm2, xmm2
+    vpaddd         xmm2, xmm2, xmm1
+    vmovd          [r_tmp], xmm2
+    vzeroupper
+%ifdef X86_32
+    STACK_DEALLOC
+%endif
+    POPM           saveregs
+    POP_XMM
+    LOAD_5_PARA_POP
+%undef           p_cur
+%undef           p_ref
+%undef           i_xcnt
+%undef           i_ycnt
+%undef           i_stride
+%undef           i_stride3
+%undef           r_tmp
+%undef           xcnt_unit
+%undef           mm8
+%undef           sadframe_acc
+%undef           sadframe_acc_addr
+%undef           xsadframe_acc
+%undef           prev_mad
+%undef           ymm_zero
+%undef           xmm_zero
+%undef           saveregs
+%undef           p_sadframe
+%undef           p_sad8x8
+%undef           p_sum16x16
+%undef           p_sqsum16x16
+%undef           p_sqdiff16x16
+%undef           p_sd8x8
+%undef           p_mad8x8
+    ret
+
+%endif
+
diff --git a/third-party/openh264/third_party/openh264/src/codec/processing/targets.mk b/third-party/openh264/third_party/openh264/src/codec/processing/targets.mk
new file mode 100644
index 0000000000..0f8873335a
--- /dev/null
+++ b/third-party/openh264/third_party/openh264/src/codec/processing/targets.mk
@@ -0,0 +1,99 @@
+# This file is autogenerated, do not edit it directly, edit build/mktargets.py
+# instead. To regenerate files, run build/mktargets.sh.
+
+PROCESSING_SRCDIR=codec/processing
+PROCESSING_CPP_SRCS=\
+	$(PROCESSING_SRCDIR)/src/adaptivequantization/AdaptiveQuantization.cpp\
+	$(PROCESSING_SRCDIR)/src/backgrounddetection/BackgroundDetection.cpp\
+	$(PROCESSING_SRCDIR)/src/common/memory.cpp\
+	$(PROCESSING_SRCDIR)/src/common/WelsFrameWork.cpp\
+	$(PROCESSING_SRCDIR)/src/common/WelsFrameWorkEx.cpp\
+	$(PROCESSING_SRCDIR)/src/complexityanalysis/ComplexityAnalysis.cpp\
+	$(PROCESSING_SRCDIR)/src/denoise/denoise.cpp\
+	$(PROCESSING_SRCDIR)/src/denoise/denoise_filter.cpp\
+	$(PROCESSING_SRCDIR)/src/downsample/downsample.cpp\
+	$(PROCESSING_SRCDIR)/src/downsample/downsamplefuncs.cpp\
+	$(PROCESSING_SRCDIR)/src/imagerotate/imagerotate.cpp\
+	$(PROCESSING_SRCDIR)/src/imagerotate/imagerotatefuncs.cpp\
+	$(PROCESSING_SRCDIR)/src/scenechangedetection/SceneChangeDetection.cpp\
+	$(PROCESSING_SRCDIR)/src/scrolldetection/ScrollDetection.cpp\
+	$(PROCESSING_SRCDIR)/src/scrolldetection/ScrollDetectionFuncs.cpp\
+	$(PROCESSING_SRCDIR)/src/vaacalc/vaacalcfuncs.cpp\
+	$(PROCESSING_SRCDIR)/src/vaacalc/vaacalculation.cpp\
+
+PROCESSING_OBJS += $(PROCESSING_CPP_SRCS:.cpp=.$(OBJ))
+
+PROCESSING_ASM_SRCS=\
+	$(PROCESSING_SRCDIR)/src/x86/denoisefilter.asm\
+	$(PROCESSING_SRCDIR)/src/x86/downsample_bilinear.asm\
+	$(PROCESSING_SRCDIR)/src/x86/vaa.asm\
+
+PROCESSING_OBJSASM += $(PROCESSING_ASM_SRCS:.asm=.$(OBJ))
+ifeq ($(ASM_ARCH), x86)
+PROCESSING_OBJS += $(PROCESSING_OBJSASM)
+endif
+OBJS += $(PROCESSING_OBJSASM)
+
+PROCESSING_ASM_ARM_SRCS=\
+	$(PROCESSING_SRCDIR)/src/arm/adaptive_quantization.S\
+	$(PROCESSING_SRCDIR)/src/arm/down_sample_neon.S\
+	$(PROCESSING_SRCDIR)/src/arm/pixel_sad_neon.S\
+	$(PROCESSING_SRCDIR)/src/arm/vaa_calc_neon.S\
+
+PROCESSING_OBJSARM += $(PROCESSING_ASM_ARM_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm)
+PROCESSING_OBJS += $(PROCESSING_OBJSARM)
+endif
+OBJS += $(PROCESSING_OBJSARM)
+
+PROCESSING_ASM_ARM64_SRCS=\
+	$(PROCESSING_SRCDIR)/src/arm64/adaptive_quantization_aarch64_neon.S\
+	$(PROCESSING_SRCDIR)/src/arm64/down_sample_aarch64_neon.S\
+	$(PROCESSING_SRCDIR)/src/arm64/pixel_sad_aarch64_neon.S\
+	$(PROCESSING_SRCDIR)/src/arm64/vaa_calc_aarch64_neon.S\
+
+PROCESSING_OBJSARM64 += $(PROCESSING_ASM_ARM64_SRCS:.S=.$(OBJ))
+ifeq ($(ASM_ARCH), arm64)
+PROCESSING_OBJS += $(PROCESSING_OBJSARM64)
+endif
+OBJS += $(PROCESSING_OBJSARM64)
+
+PROCESSING_ASM_MIPS_MMI_SRCS=\
+	$(PROCESSING_SRCDIR)/src/mips/vaa_mmi.c\
+
+PROCESSING_OBJSMIPS_MMI += $(PROCESSING_ASM_MIPS_MMI_SRCS:.c=.$(OBJ))
+
+PROCESSING_ASM_MIPS_MSA_SRCS=\
+
+PROCESSING_OBJSMIPS_MSA += $(PROCESSING_ASM_MIPS_MSA_SRCS:.c=.$(OBJ))
+ifeq ($(ASM_ARCH), mips)
+ifeq ($(ENABLE_MMI), Yes)
+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MMI)
+endif
+ifeq ($(ENABLE_MSA), Yes)
+PROCESSING_OBJS += $(PROCESSING_OBJSMIPS_MSA)
+endif
+endif
+OBJS += $(PROCESSING_OBJSMIPS_MMI)
+OBJS += $(PROCESSING_OBJSMIPS_MSA)
+
+OBJS += $(PROCESSING_OBJS)
+
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.cpp
+	$(QUIET_CXX)$(CXX) $(CFLAGS) $(CXXFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<
+
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.c
+	$(QUIET_CC)$(CC) $(CFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c $(CXX_O) $<
+
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.asm
+	$(QUIET_ASM)$(ASM) $(ASMFLAGS) $(ASM_INCLUDES) $(PROCESSING_ASMFLAGS) $(PROCESSING_ASM_INCLUDES) -o $@ $<
+
+$(PROCESSING_SRCDIR)/%.$(OBJ): $(PROCESSING_SRCDIR)/%.S
+	$(QUIET_CCAS)$(CCAS) $(CCASFLAGS) $(ASMFLAGS) $(INCLUDES) $(PROCESSING_CFLAGS) $(PROCESSING_INCLUDES) -c -o $@ $<
+
+$(LIBPREFIX)processing.$(LIBSUFFIX): $(PROCESSING_OBJS)
+	$(QUIET)rm -f $@
+	$(QUIET_AR)$(AR) $(AR_OPTS) $+
+
+libraries: $(LIBPREFIX)processing.$(LIBSUFFIX)
+LIBRARIES += $(LIBPREFIX)processing.$(LIBSUFFIX)
diff --git a/third-party/rnnoise/BUILD b/third-party/rnnoise/BUILD
new file mode 100644
index 0000000000..e1066c862b
--- /dev/null
+++ b/third-party/rnnoise/BUILD
@@ -0,0 +1,50 @@
+
+replace_symbol_list = [
+    "_celt_autocorr",
+    "celt_fir",
+    "celt_iir",
+    "_celt_lpc",
+    "celt_pitch_xcorr",
+    "compute_band_corr",
+    "compute_band_energy",
+    "compute_dense",
+    "compute_gru",
+    "compute_rnn",
+    "interp_band_gain",
+    "opus_fft_alloc",
+    "opus_fft_alloc_arch_c",
+    "opus_fft_alloc_twiddles",
+    "opus_fft_c",
+    "opus_fft_free",
+    "opus_fft_free_arch_c",
+    "opus_fft_impl",
+    "opus_ifft_c",
+    "pitch_downsample",
+    "pitch_filter",
+    "pitch_search",
+    "remove_doubling",
+]
+ 
+objc_library(
+    name = "rnnoise",
+    enable_modules = True,
+    module_name = "rnnoise",
+    srcs = glob([
+        "Sources/*.c",
+        "Sources/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+      "PublicHeaders",
+    ],
+    copts = [
+        "-D{name}=rnnoise_{name}".format(name = name) for name in replace_symbol_list
+    ] + [
+        "-Os",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/third-party/rnnoise/PublicHeaders/rnnoise.h b/third-party/rnnoise/PublicHeaders/rnnoise.h
new file mode 100644
index 0000000000..c4215d96d5
--- /dev/null
+++ b/third-party/rnnoise/PublicHeaders/rnnoise.h
@@ -0,0 +1,114 @@
+/* Copyright (c) 2018 Gregor Richards
+ * Copyright (c) 2017 Mozilla */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef RNNOISE_H
+#define RNNOISE_H 1
+
+#include <stdio.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef RNNOISE_EXPORT
+# if defined(WIN32)
+#  if defined(RNNOISE_BUILD) && defined(DLL_EXPORT)
+#   define RNNOISE_EXPORT __declspec(dllexport)
+#  else
+#   define RNNOISE_EXPORT
+#  endif
+# elif defined(__GNUC__) && defined(RNNOISE_BUILD)
+#  define RNNOISE_EXPORT __attribute__ ((visibility ("default")))
+# else
+#  define RNNOISE_EXPORT
+# endif
+#endif
+
+typedef struct DenoiseState DenoiseState;
+typedef struct RNNModel RNNModel;
+
+/**
+ * Return the size of DenoiseState
+ */
+RNNOISE_EXPORT int rnnoise_get_size();
+
+/**
+ * Return the number of samples processed by rnnoise_process_frame at a time
+ */
+RNNOISE_EXPORT int rnnoise_get_frame_size();
+
+/**
+ * Initializes a pre-allocated DenoiseState
+ *
+ * If model is NULL the default model is used.
+ *
+ * See: rnnoise_create() and rnnoise_model_from_file()
+ */
+RNNOISE_EXPORT int rnnoise_init(DenoiseState *st, RNNModel *model);
+
+/**
+ * Allocate and initialize a DenoiseState
+ *
+ * If model is NULL the default model is used.
+ *
+ * The returned pointer MUST be freed with rnnoise_destroy().
+ */
+RNNOISE_EXPORT DenoiseState *rnnoise_create(RNNModel *model);
+
+/**
+ * Free a DenoiseState produced by rnnoise_create.
+ *
+ * The optional custom model must be freed by rnnoise_model_free() after.
+ */
+RNNOISE_EXPORT void rnnoise_destroy(DenoiseState *st);
+
+/**
+ * Denoise a frame of samples
+ *
+ * in and out must be at least rnnoise_get_frame_size() large.
+ */
+RNNOISE_EXPORT float rnnoise_process_frame(DenoiseState *st, float *out, const float *in);
+
+/**
+ * Load a model from a file
+ *
+ * It must be deallocated with rnnoise_model_free()
+ */
+RNNOISE_EXPORT RNNModel *rnnoise_model_from_file(FILE *f);
+
+/**
+ * Free a custom model
+ *
+ * It must be called after all the DenoiseStates referring to it are freed.
+ */
+RNNOISE_EXPORT void rnnoise_model_free(RNNModel *model);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/third-party/rnnoise/Sources/_kiss_fft_guts.h b/third-party/rnnoise/Sources/_kiss_fft_guts.h
new file mode 100644
index 0000000000..17392b3e90
--- /dev/null
+++ b/third-party/rnnoise/Sources/_kiss_fft_guts.h
@@ -0,0 +1,182 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.*/
+
+#ifndef KISS_FFT_GUTS_H
+#define KISS_FFT_GUTS_H
+
+#define MIN(a,b) ((a)<(b) ? (a):(b))
+#define MAX(a,b) ((a)>(b) ? (a):(b))
+
+/* kiss_fft.h
+   defines kiss_fft_scalar as either short or a float type
+   and defines
+   typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
+#include "kiss_fft.h"
+
+/*
+  Explanation of macros dealing with complex math:
+
+   C_MUL(m,a,b)         : m = a*b
+   C_FIXDIV( c , div )  : if a fixed point impl., c /= div. noop otherwise
+   C_SUB( res, a,b)     : res = a - b
+   C_SUBFROM( res , a)  : res -= a
+   C_ADDTO( res , a)    : res += a
+ * */
+#ifdef FIXED_POINT
+#include "arch.h"
+
+
+#define SAMP_MAX 2147483647
+#define TWID_MAX 32767
+#define TRIG_UPSCALE 1
+
+#define SAMP_MIN -SAMP_MAX
+
+
+#   define S_MUL(a,b) MULT16_32_Q15(b, a)
+
+#   define C_MUL(m,a,b) \
+      do{ (m).r = SUB32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
+          (m).i = ADD32_ovflw(S_MUL((a).r,(b).i) , S_MUL((a).i,(b).r)); }while(0)
+
+#   define C_MULC(m,a,b) \
+      do{ (m).r = ADD32_ovflw(S_MUL((a).r,(b).r) , S_MUL((a).i,(b).i)); \
+          (m).i = SUB32_ovflw(S_MUL((a).i,(b).r) , S_MUL((a).r,(b).i)); }while(0)
+
+#   define C_MULBYSCALAR( c, s ) \
+      do{ (c).r =  S_MUL( (c).r , s ) ;\
+          (c).i =  S_MUL( (c).i , s ) ; }while(0)
+
+#   define DIVSCALAR(x,k) \
+        (x) = S_MUL(  x, (TWID_MAX-((k)>>1))/(k)+1 )
+
+#   define C_FIXDIV(c,div) \
+        do {    DIVSCALAR( (c).r , div);  \
+                DIVSCALAR( (c).i  , div); }while (0)
+
+#define  C_ADD( res, a,b)\
+    do {(res).r=ADD32_ovflw((a).r,(b).r);  (res).i=ADD32_ovflw((a).i,(b).i); \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do {(res).r=SUB32_ovflw((a).r,(b).r);  (res).i=SUB32_ovflw((a).i,(b).i); \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do {(res).r = ADD32_ovflw((res).r, (a).r);  (res).i = ADD32_ovflw((res).i,(a).i);\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {(res).r = ADD32_ovflw((res).r,(a).r);  (res).i = SUB32_ovflw((res).i,(a).i); \
+    }while(0)
+
+#if defined(OPUS_ARM_INLINE_ASM)
+#include "arm/kiss_fft_armv4.h"
+#endif
+
+#if defined(OPUS_ARM_INLINE_EDSP)
+#include "arm/kiss_fft_armv5e.h"
+#endif
+#if defined(MIPSr1_ASM)
+#include "mips/kiss_fft_mipsr1.h"
+#endif
+
+#else  /* not FIXED_POINT*/
+
+#   define S_MUL(a,b) ( (a)*(b) )
+#define C_MUL(m,a,b) \
+    do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
+        (m).i = (a).r*(b).i + (a).i*(b).r; }while(0)
+#define C_MULC(m,a,b) \
+    do{ (m).r = (a).r*(b).r + (a).i*(b).i;\
+        (m).i = (a).i*(b).r - (a).r*(b).i; }while(0)
+
+#define C_MUL4(m,a,b) C_MUL(m,a,b)
+
+#   define C_FIXDIV(c,div) /* NOOP */
+#   define C_MULBYSCALAR( c, s ) \
+    do{ (c).r *= (s);\
+        (c).i *= (s); }while(0)
+#endif
+
+#ifndef CHECK_OVERFLOW_OP
+#  define CHECK_OVERFLOW_OP(a,op,b) /* noop */
+#endif
+
+#ifndef C_ADD
+#define  C_ADD( res, a,b)\
+    do { \
+            CHECK_OVERFLOW_OP((a).r,+,(b).r)\
+            CHECK_OVERFLOW_OP((a).i,+,(b).i)\
+            (res).r=(a).r+(b).r;  (res).i=(a).i+(b).i; \
+    }while(0)
+#define  C_SUB( res, a,b)\
+    do { \
+            CHECK_OVERFLOW_OP((a).r,-,(b).r)\
+            CHECK_OVERFLOW_OP((a).i,-,(b).i)\
+            (res).r=(a).r-(b).r;  (res).i=(a).i-(b).i; \
+    }while(0)
+#define C_ADDTO( res , a)\
+    do { \
+            CHECK_OVERFLOW_OP((res).r,+,(a).r)\
+            CHECK_OVERFLOW_OP((res).i,+,(a).i)\
+            (res).r += (a).r;  (res).i += (a).i;\
+    }while(0)
+
+#define C_SUBFROM( res , a)\
+    do {\
+            CHECK_OVERFLOW_OP((res).r,-,(a).r)\
+            CHECK_OVERFLOW_OP((res).i,-,(a).i)\
+            (res).r -= (a).r;  (res).i -= (a).i; \
+    }while(0)
+#endif /* C_ADD defined */
+
+#ifdef FIXED_POINT
+/*#  define KISS_FFT_COS(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * cos (phase))))
+#  define KISS_FFT_SIN(phase)  TRIG_UPSCALE*floor(MIN(32767,MAX(-32767,.5+32768 * sin (phase))))*/
+#  define KISS_FFT_COS(phase)  floor(.5+TWID_MAX*cos (phase))
+#  define KISS_FFT_SIN(phase)  floor(.5+TWID_MAX*sin (phase))
+#  define HALF_OF(x) ((x)>>1)
+#elif defined(USE_SIMD)
+#  define KISS_FFT_COS(phase) _mm_set1_ps( cos(phase) )
+#  define KISS_FFT_SIN(phase) _mm_set1_ps( sin(phase) )
+#  define HALF_OF(x) ((x)*_mm_set1_ps(.5f))
+#else
+#  define KISS_FFT_COS(phase) (kiss_fft_scalar) cos(phase)
+#  define KISS_FFT_SIN(phase) (kiss_fft_scalar) sin(phase)
+#  define HALF_OF(x) ((x)*.5f)
+#endif
+
+#define  kf_cexp(x,phase) \
+        do{ \
+                (x)->r = KISS_FFT_COS(phase);\
+                (x)->i = KISS_FFT_SIN(phase);\
+        }while(0)
+
+#define  kf_cexp2(x,phase) \
+   do{ \
+      (x)->r = TRIG_UPSCALE*celt_cos_norm((phase));\
+      (x)->i = TRIG_UPSCALE*celt_cos_norm((phase)-32768);\
+}while(0)
+
+#endif /* KISS_FFT_GUTS_H */
diff --git a/third-party/rnnoise/Sources/arch.h b/third-party/rnnoise/Sources/arch.h
new file mode 100644
index 0000000000..52de62334b
--- /dev/null
+++ b/third-party/rnnoise/Sources/arch.h
@@ -0,0 +1,261 @@
+/* Copyright (c) 2003-2008 Jean-Marc Valin
+   Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file arch.h
+   @brief Various architecture definitions for CELT
+*/
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef ARCH_H
+#define ARCH_H
+
+#include "opus_types.h"
+#include "common.h"
+
+# if !defined(__GNUC_PREREQ)
+#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
+#   define __GNUC_PREREQ(_maj,_min) \
+ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
+#  else
+#   define __GNUC_PREREQ(_maj,_min) 0
+#  endif
+# endif
+
+#define CELT_SIG_SCALE 32768.f
+
+#define celt_fatal(str) _celt_fatal(str, __FILE__, __LINE__);
+#ifdef ENABLE_ASSERTIONS
+#include <stdio.h>
+#include <stdlib.h>
+#ifdef __GNUC__
+__attribute__((noreturn))
+#endif
+static OPUS_INLINE void _celt_fatal(const char *str, const char *file, int line)
+{
+   fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str);
+   abort();
+}
+#define celt_assert(cond) {if (!(cond)) {celt_fatal("assertion failed: " #cond);}}
+#define celt_assert2(cond, message) {if (!(cond)) {celt_fatal("assertion failed: " #cond "\n" message);}}
+#else
+#define celt_assert(cond)
+#define celt_assert2(cond, message)
+#endif
+
+#define IMUL32(a,b) ((a)*(b))
+
+#define MIN16(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 16-bit value.   */
+#define MAX16(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 16-bit value.   */
+#define MIN32(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum 32-bit value.   */
+#define MAX32(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum 32-bit value.   */
+#define IMIN(a,b) ((a) < (b) ? (a) : (b))   /**< Minimum int value.   */
+#define IMAX(a,b) ((a) > (b) ? (a) : (b))   /**< Maximum int value.   */
+#define UADD32(a,b) ((a)+(b))
+#define USUB32(a,b) ((a)-(b))
+
+/* Set this if opus_int64 is a native type of the CPU. */
+/* Assume that all LP64 architectures have fast 64-bit types; also x86_64
+   (which can be ILP32 for x32) and Win64 (which is LLP64). */
+#if defined(__x86_64__) || defined(__LP64__) || defined(_WIN64)
+#define OPUS_FAST_INT64 1
+#else
+#define OPUS_FAST_INT64 0
+#endif
+
+#define PRINT_MIPS(file)
+
+#ifdef FIXED_POINT
+
+typedef opus_int16 opus_val16;
+typedef opus_int32 opus_val32;
+typedef opus_int64 opus_val64;
+
+typedef opus_val32 celt_sig;
+typedef opus_val16 celt_norm;
+typedef opus_val32 celt_ener;
+
+#define Q15ONE 32767
+
+#define SIG_SHIFT 12
+/* Safe saturation value for 32-bit signals. Should be less than
+   2^31*(1-0.85) to avoid blowing up on DC at deemphasis.*/
+#define SIG_SAT (300000000)
+
+#define NORM_SCALING 16384
+
+#define DB_SHIFT 10
+
+#define EPSILON 1
+#define VERY_SMALL 0
+#define VERY_LARGE16 ((opus_val16)32767)
+#define Q15_ONE ((opus_val16)32767)
+
+#define SCALEIN(a)      (a)
+#define SCALEOUT(a)     (a)
+
+#define ABS16(x) ((x) < 0 ? (-(x)) : (x))
+#define ABS32(x) ((x) < 0 ? (-(x)) : (x))
+
+static OPUS_INLINE opus_int16 SAT16(opus_int32 x) {
+   return x > 32767 ? 32767 : x < -32768 ? -32768 : (opus_int16)x;
+}
+
+#ifdef FIXED_DEBUG
+#include "fixed_debug.h"
+#else
+
+#include "fixed_generic.h"
+
+#ifdef OPUS_ARM_PRESUME_AARCH64_NEON_INTR
+#include "arm/fixed_arm64.h"
+#elif OPUS_ARM_INLINE_EDSP
+#include "arm/fixed_armv5e.h"
+#elif defined (OPUS_ARM_INLINE_ASM)
+#include "arm/fixed_armv4.h"
+#elif defined (BFIN_ASM)
+#include "fixed_bfin.h"
+#elif defined (TI_C5X_ASM)
+#include "fixed_c5x.h"
+#elif defined (TI_C6X_ASM)
+#include "fixed_c6x.h"
+#endif
+
+#endif
+
+#else /* FIXED_POINT */
+
+typedef float opus_val16;
+typedef float opus_val32;
+typedef float opus_val64;
+
+typedef float celt_sig;
+typedef float celt_norm;
+typedef float celt_ener;
+
+#ifdef FLOAT_APPROX
+/* This code should reliably detect NaN/inf even when -ffast-math is used.
+   Assumes IEEE 754 format. */
+static OPUS_INLINE int celt_isnan(float x)
+{
+   union {float f; opus_uint32 i;} in;
+   in.f = x;
+   return ((in.i>>23)&0xFF)==0xFF && (in.i&0x007FFFFF)!=0;
+}
+#else
+#ifdef __FAST_MATH__
+#error Cannot build libopus with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
+#endif
+#define celt_isnan(x) ((x)!=(x))
+#endif
+
+#define Q15ONE 1.0f
+
+#define NORM_SCALING 1.f
+
+#define EPSILON 1e-15f
+#define VERY_SMALL 1e-30f
+#define VERY_LARGE16 1e15f
+#define Q15_ONE ((opus_val16)1.f)
+
+/* This appears to be the same speed as C99's fabsf() but it's more portable. */
+#define ABS16(x) ((float)fabs(x))
+#define ABS32(x) ((float)fabs(x))
+
+#define QCONST16(x,bits) (x)
+#define QCONST32(x,bits) (x)
+
+#define NEG16(x) (-(x))
+#define NEG32(x) (-(x))
+#define NEG32_ovflw(x) (-(x))
+#define EXTRACT16(x) (x)
+#define EXTEND32(x) (x)
+#define SHR16(a,shift) (a)
+#define SHL16(a,shift) (a)
+#define SHR32(a,shift) (a)
+#define SHL32(a,shift) (a)
+#define PSHR32(a,shift) (a)
+#define VSHR32(a,shift) (a)
+
+#define PSHR(a,shift)   (a)
+#define SHR(a,shift)    (a)
+#define SHL(a,shift)    (a)
+#define SATURATE(x,a)   (x)
+#define SATURATE16(x)   (x)
+
+#define ROUND16(a,shift)  (a)
+#define SROUND16(a,shift) (a)
+#define HALF16(x)       (.5f*(x))
+#define HALF32(x)       (.5f*(x))
+
+#define ADD16(a,b) ((a)+(b))
+#define SUB16(a,b) ((a)-(b))
+#define ADD32(a,b) ((a)+(b))
+#define SUB32(a,b) ((a)-(b))
+#define ADD32_ovflw(a,b) ((a)+(b))
+#define SUB32_ovflw(a,b) ((a)-(b))
+#define MULT16_16_16(a,b)     ((a)*(b))
+#define MULT16_16(a,b)     ((opus_val32)(a)*(opus_val32)(b))
+#define MAC16_16(c,a,b)     ((c)+(opus_val32)(a)*(opus_val32)(b))
+
+#define MULT16_32_Q15(a,b)     ((a)*(b))
+#define MULT16_32_Q16(a,b)     ((a)*(b))
+
+#define MULT32_32_Q31(a,b)     ((a)*(b))
+
+#define MAC16_32_Q15(c,a,b)     ((c)+(a)*(b))
+#define MAC16_32_Q16(c,a,b)     ((c)+(a)*(b))
+
+#define MULT16_16_Q11_32(a,b)     ((a)*(b))
+#define MULT16_16_Q11(a,b)     ((a)*(b))
+#define MULT16_16_Q13(a,b)     ((a)*(b))
+#define MULT16_16_Q14(a,b)     ((a)*(b))
+#define MULT16_16_Q15(a,b)     ((a)*(b))
+#define MULT16_16_P15(a,b)     ((a)*(b))
+#define MULT16_16_P13(a,b)     ((a)*(b))
+#define MULT16_16_P14(a,b)     ((a)*(b))
+#define MULT16_32_P16(a,b)     ((a)*(b))
+
+#define DIV32_16(a,b)     (((opus_val32)(a))/(opus_val16)(b))
+#define DIV32(a,b)     (((opus_val32)(a))/(opus_val32)(b))
+
+#define SCALEIN(a)      ((a)*CELT_SIG_SCALE)
+#define SCALEOUT(a)     ((a)*(1/CELT_SIG_SCALE))
+
+#define SIG2WORD16(x) (x)
+
+#endif /* !FIXED_POINT */
+
+#ifndef GLOBAL_STACK_SIZE
+#ifdef FIXED_POINT
+#define GLOBAL_STACK_SIZE 120000
+#else
+#define GLOBAL_STACK_SIZE 120000
+#endif
+#endif
+
+#endif /* ARCH_H */
diff --git a/third-party/rnnoise/Sources/celt_lpc.c b/third-party/rnnoise/Sources/celt_lpc.c
new file mode 100644
index 0000000000..521351e9de
--- /dev/null
+++ b/third-party/rnnoise/Sources/celt_lpc.c
@@ -0,0 +1,279 @@
+/* Copyright (c) 2009-2010 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "celt_lpc.h"
+#include "arch.h"
+#include "common.h"
+#include "pitch.h"
+
+void _celt_lpc(
+      opus_val16       *_lpc, /* out: [0...p-1] LPC coefficients      */
+const opus_val32 *ac,  /* in:  [0...p] autocorrelation values  */
+int          p
+)
+{
+   int i, j;
+   opus_val32 r;
+   opus_val32 error = ac[0];
+#ifdef FIXED_POINT
+   opus_val32 lpc[LPC_ORDER];
+#else
+   float *lpc = _lpc;
+#endif
+
+   RNN_CLEAR(lpc, p);
+   if (ac[0] != 0)
+   {
+      for (i = 0; i < p; i++) {
+         /* Sum up this iteration's reflection coefficient */
+         opus_val32 rr = 0;
+         for (j = 0; j < i; j++)
+            rr += MULT32_32_Q31(lpc[j],ac[i - j]);
+         rr += SHR32(ac[i + 1],3);
+         r = -SHL32(rr,3)/error;
+         /*  Update LPC coefficients and total error */
+         lpc[i] = SHR32(r,3);
+         for (j = 0; j < (i+1)>>1; j++)
+         {
+            opus_val32 tmp1, tmp2;
+            tmp1 = lpc[j];
+            tmp2 = lpc[i-1-j];
+            lpc[j]     = tmp1 + MULT32_32_Q31(r,tmp2);
+            lpc[i-1-j] = tmp2 + MULT32_32_Q31(r,tmp1);
+         }
+
+         error = error - MULT32_32_Q31(MULT32_32_Q31(r,r),error);
+         /* Bail out once we get 30 dB gain */
+#ifdef FIXED_POINT
+         if (error<SHR32(ac[0],10))
+            break;
+#else
+         if (error<.001f*ac[0])
+            break;
+#endif
+      }
+   }
+#ifdef FIXED_POINT
+   for (i=0;i<p;i++)
+      _lpc[i] = ROUND16(lpc[i],16);
+#endif
+}
+
+
+void celt_fir(
+         const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         int ord)
+{
+   int i,j;
+   opus_val16 rnum[ord];
+   for(i=0;i<ord;i++)
+      rnum[i] = num[ord-i-1];
+   for (i=0;i<N-3;i+=4)
+   {
+      opus_val32 sum[4];
+      sum[0] = SHL32(EXTEND32(x[i  ]), SIG_SHIFT);
+      sum[1] = SHL32(EXTEND32(x[i+1]), SIG_SHIFT);
+      sum[2] = SHL32(EXTEND32(x[i+2]), SIG_SHIFT);
+      sum[3] = SHL32(EXTEND32(x[i+3]), SIG_SHIFT);
+      xcorr_kernel(rnum, x+i-ord, sum, ord);
+      y[i  ] = ROUND16(sum[0], SIG_SHIFT);
+      y[i+1] = ROUND16(sum[1], SIG_SHIFT);
+      y[i+2] = ROUND16(sum[2], SIG_SHIFT);
+      y[i+3] = ROUND16(sum[3], SIG_SHIFT);
+   }
+   for (;i<N;i++)
+   {
+      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      for (j=0;j<ord;j++)
+         sum = MAC16_16(sum,rnum[j],x[i+j-ord]);
+      y[i] = ROUND16(sum, SIG_SHIFT);
+   }
+}
+
+void celt_iir(const opus_val32 *_x,
+         const opus_val16 *den,
+         opus_val32 *_y,
+         int N,
+         int ord,
+         opus_val16 *mem)
+{
+#ifdef SMALL_FOOTPRINT
+   int i,j;
+   for (i=0;i<N;i++)
+   {
+      opus_val32 sum = _x[i];
+      for (j=0;j<ord;j++)
+      {
+         sum -= MULT16_16(den[j],mem[j]);
+      }
+      for (j=ord-1;j>=1;j--)
+      {
+         mem[j]=mem[j-1];
+      }
+      mem[0] = SROUND16(sum, SIG_SHIFT);
+      _y[i] = sum;
+   }
+#else
+   int i,j;
+   celt_assert((ord&3)==0);
+   opus_val16 rden[ord];
+   opus_val16 y[N+ord];
+   for(i=0;i<ord;i++)
+      rden[i] = den[ord-i-1];
+   for(i=0;i<ord;i++)
+      y[i] = -mem[ord-i-1];
+   for(;i<N+ord;i++)
+      y[i]=0;
+   for (i=0;i<N-3;i+=4)
+   {
+      /* Unroll by 4 as if it were an FIR filter */
+      opus_val32 sum[4];
+      sum[0]=_x[i];
+      sum[1]=_x[i+1];
+      sum[2]=_x[i+2];
+      sum[3]=_x[i+3];
+      xcorr_kernel(rden, y+i, sum, ord);
+
+      /* Patch up the result to compensate for the fact that this is an IIR */
+      y[i+ord  ] = -SROUND16(sum[0],SIG_SHIFT);
+      _y[i  ] = sum[0];
+      sum[1] = MAC16_16(sum[1], y[i+ord  ], den[0]);
+      y[i+ord+1] = -SROUND16(sum[1],SIG_SHIFT);
+      _y[i+1] = sum[1];
+      sum[2] = MAC16_16(sum[2], y[i+ord+1], den[0]);
+      sum[2] = MAC16_16(sum[2], y[i+ord  ], den[1]);
+      y[i+ord+2] = -SROUND16(sum[2],SIG_SHIFT);
+      _y[i+2] = sum[2];
+
+      sum[3] = MAC16_16(sum[3], y[i+ord+2], den[0]);
+      sum[3] = MAC16_16(sum[3], y[i+ord+1], den[1]);
+      sum[3] = MAC16_16(sum[3], y[i+ord  ], den[2]);
+      y[i+ord+3] = -SROUND16(sum[3],SIG_SHIFT);
+      _y[i+3] = sum[3];
+   }
+   for (;i<N;i++)
+   {
+      opus_val32 sum = _x[i];
+      for (j=0;j<ord;j++)
+         sum -= MULT16_16(rden[j],y[i+j]);
+      y[i+ord] = SROUND16(sum,SIG_SHIFT);
+      _y[i] = sum;
+   }
+   for(i=0;i<ord;i++)
+      mem[i] = _y[N-i-1];
+#endif
+}
+
+int _celt_autocorr(
+                   const opus_val16 *x,   /*  in: [0...n-1] samples x   */
+                   opus_val32       *ac,  /* out: [0...lag-1] ac values */
+                   const opus_val16       *window,
+                   int          overlap,
+                   int          lag,
+                   int          n)
+{
+   opus_val32 d;
+   int i, k;
+   int fastN=n-lag;
+   int shift;
+   const opus_val16 *xptr;
+   opus_val16 xx[n];
+   celt_assert(n>0);
+   celt_assert(overlap>=0);
+   if (overlap == 0)
+   {
+      xptr = x;
+   } else {
+      for (i=0;i<n;i++)
+         xx[i] = x[i];
+      for (i=0;i<overlap;i++)
+      {
+         xx[i] = MULT16_16_Q15(x[i],window[i]);
+         xx[n-i-1] = MULT16_16_Q15(x[n-i-1],window[i]);
+      }
+      xptr = xx;
+   }
+   shift=0;
+#ifdef FIXED_POINT
+   {
+      opus_val32 ac0;
+      ac0 = 1+(n<<7);
+      if (n&1) ac0 += SHR32(MULT16_16(xptr[0],xptr[0]),9);
+      for(i=(n&1);i<n;i+=2)
+      {
+         ac0 += SHR32(MULT16_16(xptr[i],xptr[i]),9);
+         ac0 += SHR32(MULT16_16(xptr[i+1],xptr[i+1]),9);
+      }
+
+      shift = celt_ilog2(ac0)-30+10;
+      shift = (shift)/2;
+      if (shift>0)
+      {
+         for(i=0;i<n;i++)
+            xx[i] = PSHR32(xptr[i], shift);
+         xptr = xx;
+      } else
+         shift = 0;
+   }
+#endif
+   celt_pitch_xcorr(xptr, xptr, ac, fastN, lag+1);
+   for (k=0;k<=lag;k++)
+   {
+      for (i = k+fastN, d = 0; i < n; i++)
+         d = MAC16_16(d, xptr[i], xptr[i-k]);
+      ac[k] += d;
+   }
+#ifdef FIXED_POINT
+   shift = 2*shift;
+   if (shift<=0)
+      ac[0] += SHL32((opus_int32)1, -shift);
+   if (ac[0] < 268435456)
+   {
+      int shift2 = 29 - EC_ILOG(ac[0]);
+      for (i=0;i<=lag;i++)
+         ac[i] = SHL32(ac[i], shift2);
+      shift -= shift2;
+   } else if (ac[0] >= 536870912)
+   {
+      int shift2=1;
+      if (ac[0] >= 1073741824)
+         shift2++;
+      for (i=0;i<=lag;i++)
+         ac[i] = SHR32(ac[i], shift2);
+      shift += shift2;
+   }
+#endif
+
+   return shift;
+}
diff --git a/third-party/rnnoise/Sources/celt_lpc.h b/third-party/rnnoise/Sources/celt_lpc.h
new file mode 100644
index 0000000000..34e0ff9935
--- /dev/null
+++ b/third-party/rnnoise/Sources/celt_lpc.h
@@ -0,0 +1,59 @@
+/* Copyright (c) 2009-2010 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef PLC_H
+#define PLC_H
+
+#include "arch.h"
+#include "common.h"
+
+#if defined(OPUS_X86_MAY_HAVE_SSE4_1)
+#include "x86/celt_lpc_sse.h"
+#endif
+
+#define LPC_ORDER 24
+
+void _celt_lpc(opus_val16 *_lpc, const opus_val32 *ac, int p);
+
+void celt_fir(
+         const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         int ord);
+
+void celt_iir(const opus_val32 *x,
+         const opus_val16 *den,
+         opus_val32 *y,
+         int N,
+         int ord,
+         opus_val16 *mem);
+
+int _celt_autocorr(const opus_val16 *x, opus_val32 *ac,
+         const opus_val16 *window, int overlap, int lag, int n);
+
+#endif /* PLC_H */
diff --git a/third-party/rnnoise/Sources/common.h b/third-party/rnnoise/Sources/common.h
new file mode 100644
index 0000000000..5005bfffcb
--- /dev/null
+++ b/third-party/rnnoise/Sources/common.h
@@ -0,0 +1,48 @@
+
+
+#ifndef COMMON_H
+#define COMMON_H
+
+#include "stdlib.h"
+#include "string.h"
+
+#define RNN_INLINE inline
+#define OPUS_INLINE inline
+
+
+/** RNNoise wrapper for malloc(). To do your own dynamic allocation, all you need t
+o do is replace this function and rnnoise_free */
+#ifndef OVERRIDE_RNNOISE_ALLOC
+static RNN_INLINE void *rnnoise_alloc (size_t size)
+{
+   return malloc(size);
+}
+#endif
+
+/** RNNoise wrapper for free(). To do your own dynamic allocation, all you need to do is replace this function and rnnoise_alloc */
+#ifndef OVERRIDE_RNNOISE_FREE
+static RNN_INLINE void rnnoise_free (void *ptr)
+{
+   free(ptr);
+}
+#endif
+
+/** Copy n elements from src to dst. The 0* term provides compile-time type checking  */
+#ifndef OVERRIDE_RNN_COPY
+#define RNN_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#endif
+
+/** Copy n elements from src to dst, allowing overlapping regions. The 0* term
+    provides compile-time type checking */
+#ifndef OVERRIDE_RNN_MOVE
+#define RNN_MOVE(dst, src, n) (memmove((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
+#endif
+
+/** Set n elements of dst to zero */
+#ifndef OVERRIDE_RNN_CLEAR
+#define RNN_CLEAR(dst, n) (memset((dst), 0, (n)*sizeof(*(dst))))
+#endif
+
+
+
+#endif
diff --git a/third-party/rnnoise/Sources/compile.sh b/third-party/rnnoise/Sources/compile.sh
new file mode 100755
index 0000000000..4b2ea5387e
--- /dev/null
+++ b/third-party/rnnoise/Sources/compile.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gcc -DTRAINING=1 -Wall -W -O3 -g -I../include denoise.c kiss_fft.c pitch.c celt_lpc.c rnn.c rnn_data.c -o denoise_training -lm
diff --git a/third-party/rnnoise/Sources/denoise.c b/third-party/rnnoise/Sources/denoise.c
new file mode 100644
index 0000000000..5a628440dc
--- /dev/null
+++ b/third-party/rnnoise/Sources/denoise.c
@@ -0,0 +1,646 @@
+/* Copyright (c) 2018 Gregor Richards
+ * Copyright (c) 2017 Mozilla */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include "kiss_fft.h"
+#include "common.h"
+#include <math.h>
+#include "rnnoise.h"
+#include "pitch.h"
+#include "arch.h"
+#include "rnn.h"
+#include "rnn_data.h"
+
+#define FRAME_SIZE_SHIFT 2
+#define FRAME_SIZE (120<<FRAME_SIZE_SHIFT)
+#define WINDOW_SIZE (2*FRAME_SIZE)
+#define FREQ_SIZE (FRAME_SIZE + 1)
+
+#define PITCH_MIN_PERIOD 60
+#define PITCH_MAX_PERIOD 768
+#define PITCH_FRAME_SIZE 960
+#define PITCH_BUF_SIZE (PITCH_MAX_PERIOD+PITCH_FRAME_SIZE)
+
+#define SQUARE(x) ((x)*(x))
+
+#define NB_BANDS 22
+
+#define CEPS_MEM 8
+#define NB_DELTA_CEPS 6
+
+#define NB_FEATURES (NB_BANDS+3*NB_DELTA_CEPS+2)
+
+
+#ifndef TRAINING
+#define TRAINING 0
+#endif
+
+
+/* The built-in model, used if no file is given as input */
+extern const struct RNNModel rnnoise_model_orig;
+
+
+static const opus_int16 eband5ms[] = {
+/*0  200 400 600 800  1k 1.2 1.4 1.6  2k 2.4 2.8 3.2  4k 4.8 5.6 6.8  8k 9.6 12k 15.6 20k*/
+  0,  1,  2,  3,  4,  5,  6,  7,  8, 10, 12, 14, 16, 20, 24, 28, 34, 40, 48, 60, 78, 100
+};
+
+
+typedef struct {
+  int init;
+  kiss_fft_state *kfft;
+  float half_window[FRAME_SIZE];
+  float dct_table[NB_BANDS*NB_BANDS];
+} CommonState;
+
+struct DenoiseState {
+  float analysis_mem[FRAME_SIZE];
+  float cepstral_mem[CEPS_MEM][NB_BANDS];
+  int memid;
+  float synthesis_mem[FRAME_SIZE];
+  float pitch_buf[PITCH_BUF_SIZE];
+  float pitch_enh_buf[PITCH_BUF_SIZE];
+  float last_gain;
+  int last_period;
+  float mem_hp_x[2];
+  float lastg[NB_BANDS];
+  RNNState rnn;
+};
+
+void compute_band_energy(float *bandE, const kiss_fft_cpx *X) {
+  int i;
+  float sum[NB_BANDS] = {0};
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float tmp;
+      float frac = (float)j/band_size;
+      tmp = SQUARE(X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r);
+      tmp += SQUARE(X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i);
+      sum[i] += (1-frac)*tmp;
+      sum[i+1] += frac*tmp;
+    }
+  }
+  sum[0] *= 2;
+  sum[NB_BANDS-1] *= 2;
+  for (i=0;i<NB_BANDS;i++)
+  {
+    bandE[i] = sum[i];
+  }
+}
+
+void compute_band_corr(float *bandE, const kiss_fft_cpx *X, const kiss_fft_cpx *P) {
+  int i;
+  float sum[NB_BANDS] = {0};
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float tmp;
+      float frac = (float)j/band_size;
+      tmp = X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r * P[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].r;
+      tmp += X[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i * P[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j].i;
+      sum[i] += (1-frac)*tmp;
+      sum[i+1] += frac*tmp;
+    }
+  }
+  sum[0] *= 2;
+  sum[NB_BANDS-1] *= 2;
+  for (i=0;i<NB_BANDS;i++)
+  {
+    bandE[i] = sum[i];
+  }
+}
+
+void interp_band_gain(float *g, const float *bandE) {
+  int i;
+  memset(g, 0, FREQ_SIZE);
+  for (i=0;i<NB_BANDS-1;i++)
+  {
+    int j;
+    int band_size;
+    band_size = (eband5ms[i+1]-eband5ms[i])<<FRAME_SIZE_SHIFT;
+    for (j=0;j<band_size;j++) {
+      float frac = (float)j/band_size;
+      g[(eband5ms[i]<<FRAME_SIZE_SHIFT) + j] = (1-frac)*bandE[i] + frac*bandE[i+1];
+    }
+  }
+}
+
+
+CommonState common;
+
+static void check_init() {
+  int i;
+  if (common.init) return;
+  common.kfft = opus_fft_alloc_twiddles(2*FRAME_SIZE, NULL, NULL, NULL, 0);
+  for (i=0;i<FRAME_SIZE;i++)
+    common.half_window[i] = sin(.5*M_PI*sin(.5*M_PI*(i+.5)/FRAME_SIZE) * sin(.5*M_PI*(i+.5)/FRAME_SIZE));
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    for (j=0;j<NB_BANDS;j++) {
+      common.dct_table[i*NB_BANDS + j] = cos((i+.5)*j*M_PI/NB_BANDS);
+      if (j==0) common.dct_table[i*NB_BANDS + j] *= sqrt(.5);
+    }
+  }
+  common.init = 1;
+}
+
+static void dct(float *out, const float *in) {
+  int i;
+  check_init();
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    float sum = 0;
+    for (j=0;j<NB_BANDS;j++) {
+      sum += in[j] * common.dct_table[j*NB_BANDS + i];
+    }
+    out[i] = sum*sqrt(2./22);
+  }
+}
+
+#if 0
+static void idct(float *out, const float *in) {
+  int i;
+  check_init();
+  for (i=0;i<NB_BANDS;i++) {
+    int j;
+    float sum = 0;
+    for (j=0;j<NB_BANDS;j++) {
+      sum += in[j] * common.dct_table[i*NB_BANDS + j];
+    }
+    out[i] = sum*sqrt(2./22);
+  }
+}
+#endif
+
+static void forward_transform(kiss_fft_cpx *out, const float *in) {
+  int i;
+  kiss_fft_cpx x[WINDOW_SIZE];
+  kiss_fft_cpx y[WINDOW_SIZE];
+  check_init();
+  for (i=0;i<WINDOW_SIZE;i++) {
+    x[i].r = in[i];
+    x[i].i = 0;
+  }
+  opus_fft(common.kfft, x, y, 0);
+  for (i=0;i<FREQ_SIZE;i++) {
+    out[i] = y[i];
+  }
+}
+
+static void inverse_transform(float *out, const kiss_fft_cpx *in) {
+  int i;
+  kiss_fft_cpx x[WINDOW_SIZE];
+  kiss_fft_cpx y[WINDOW_SIZE];
+  check_init();
+  for (i=0;i<FREQ_SIZE;i++) {
+    x[i] = in[i];
+  }
+  for (;i<WINDOW_SIZE;i++) {
+    x[i].r = x[WINDOW_SIZE - i].r;
+    x[i].i = -x[WINDOW_SIZE - i].i;
+  }
+  opus_fft(common.kfft, x, y, 0);
+  /* output in reverse order for IFFT. */
+  out[0] = WINDOW_SIZE*y[0].r;
+  for (i=1;i<WINDOW_SIZE;i++) {
+    out[i] = WINDOW_SIZE*y[WINDOW_SIZE - i].r;
+  }
+}
+
+static void apply_window(float *x) {
+  int i;
+  check_init();
+  for (i=0;i<FRAME_SIZE;i++) {
+    x[i] *= common.half_window[i];
+    x[WINDOW_SIZE - 1 - i] *= common.half_window[i];
+  }
+}
+
+int rnnoise_get_size() {
+  return sizeof(DenoiseState);
+}
+
+int rnnoise_get_frame_size() {
+  return FRAME_SIZE;
+}
+
+int rnnoise_init(DenoiseState *st, RNNModel *model) {
+  memset(st, 0, sizeof(*st));
+  if (model)
+    st->rnn.model = model;
+  else
+    st->rnn.model = &rnnoise_model_orig;
+  st->rnn.vad_gru_state = calloc(sizeof(float), st->rnn.model->vad_gru_size);
+  st->rnn.noise_gru_state = calloc(sizeof(float), st->rnn.model->noise_gru_size);
+  st->rnn.denoise_gru_state = calloc(sizeof(float), st->rnn.model->denoise_gru_size);
+  return 0;
+}
+
+DenoiseState *rnnoise_create(RNNModel *model) {
+  DenoiseState *st;
+  st = malloc(rnnoise_get_size());
+  rnnoise_init(st, model);
+  return st;
+}
+
+void rnnoise_destroy(DenoiseState *st) {
+  free(st->rnn.vad_gru_state);
+  free(st->rnn.noise_gru_state);
+  free(st->rnn.denoise_gru_state);
+  free(st);
+}
+
+#if TRAINING
+int lowpass = FREQ_SIZE;
+int band_lp = NB_BANDS;
+#endif
+
+static void frame_analysis(DenoiseState *st, kiss_fft_cpx *X, float *Ex, const float *in) {
+  int i;
+  float x[WINDOW_SIZE];
+  RNN_COPY(x, st->analysis_mem, FRAME_SIZE);
+  for (i=0;i<FRAME_SIZE;i++) x[FRAME_SIZE + i] = in[i];
+  RNN_COPY(st->analysis_mem, in, FRAME_SIZE);
+  apply_window(x);
+  forward_transform(X, x);
+#if TRAINING
+  for (i=lowpass;i<FREQ_SIZE;i++)
+    X[i].r = X[i].i = 0;
+#endif
+  compute_band_energy(Ex, X);
+}
+
+static int compute_frame_features(DenoiseState *st, kiss_fft_cpx *X, kiss_fft_cpx *P,
+                                  float *Ex, float *Ep, float *Exp, float *features, const float *in) {
+  int i;
+  float E = 0;
+  float *ceps_0, *ceps_1, *ceps_2;
+  float spec_variability = 0;
+  float Ly[NB_BANDS];
+  float p[WINDOW_SIZE];
+  float pitch_buf[PITCH_BUF_SIZE>>1];
+  int pitch_index;
+  float gain;
+  float *(pre[1]);
+  float tmp[NB_BANDS];
+  float follow, logMax;
+  frame_analysis(st, X, Ex, in);
+  RNN_MOVE(st->pitch_buf, &st->pitch_buf[FRAME_SIZE], PITCH_BUF_SIZE-FRAME_SIZE);
+  RNN_COPY(&st->pitch_buf[PITCH_BUF_SIZE-FRAME_SIZE], in, FRAME_SIZE);
+  pre[0] = &st->pitch_buf[0];
+  pitch_downsample(pre, pitch_buf, PITCH_BUF_SIZE, 1);
+  pitch_search(pitch_buf+(PITCH_MAX_PERIOD>>1), pitch_buf, PITCH_FRAME_SIZE,
+               PITCH_MAX_PERIOD-3*PITCH_MIN_PERIOD, &pitch_index);
+  pitch_index = PITCH_MAX_PERIOD-pitch_index;
+
+  gain = remove_doubling(pitch_buf, PITCH_MAX_PERIOD, PITCH_MIN_PERIOD,
+          PITCH_FRAME_SIZE, &pitch_index, st->last_period, st->last_gain);
+  st->last_period = pitch_index;
+  st->last_gain = gain;
+  for (i=0;i<WINDOW_SIZE;i++)
+    p[i] = st->pitch_buf[PITCH_BUF_SIZE-WINDOW_SIZE-pitch_index+i];
+  apply_window(p);
+  forward_transform(P, p);
+  compute_band_energy(Ep, P);
+  compute_band_corr(Exp, X, P);
+  for (i=0;i<NB_BANDS;i++) Exp[i] = Exp[i]/sqrt(.001+Ex[i]*Ep[i]);
+  dct(tmp, Exp);
+  for (i=0;i<NB_DELTA_CEPS;i++) features[NB_BANDS+2*NB_DELTA_CEPS+i] = tmp[i];
+  features[NB_BANDS+2*NB_DELTA_CEPS] -= 1.3;
+  features[NB_BANDS+2*NB_DELTA_CEPS+1] -= 0.9;
+  features[NB_BANDS+3*NB_DELTA_CEPS] = .01*(pitch_index-300);
+  logMax = -2;
+  follow = -2;
+  for (i=0;i<NB_BANDS;i++) {
+    Ly[i] = log10(1e-2+Ex[i]);
+    Ly[i] = MAX16(logMax-7, MAX16(follow-1.5, Ly[i]));
+    logMax = MAX16(logMax, Ly[i]);
+    follow = MAX16(follow-1.5, Ly[i]);
+    E += Ex[i];
+  }
+  if (!TRAINING && E < 0.04) {
+    /* If there's no audio, avoid messing up the state. */
+    RNN_CLEAR(features, NB_FEATURES);
+    return 1;
+  }
+  dct(features, Ly);
+  features[0] -= 12;
+  features[1] -= 4;
+  ceps_0 = st->cepstral_mem[st->memid];
+  ceps_1 = (st->memid < 1) ? st->cepstral_mem[CEPS_MEM+st->memid-1] : st->cepstral_mem[st->memid-1];
+  ceps_2 = (st->memid < 2) ? st->cepstral_mem[CEPS_MEM+st->memid-2] : st->cepstral_mem[st->memid-2];
+  for (i=0;i<NB_BANDS;i++) ceps_0[i] = features[i];
+  st->memid++;
+  for (i=0;i<NB_DELTA_CEPS;i++) {
+    features[i] = ceps_0[i] + ceps_1[i] + ceps_2[i];
+    features[NB_BANDS+i] = ceps_0[i] - ceps_2[i];
+    features[NB_BANDS+NB_DELTA_CEPS+i] =  ceps_0[i] - 2*ceps_1[i] + ceps_2[i];
+  }
+  /* Spectral variability features. */
+  if (st->memid == CEPS_MEM) st->memid = 0;
+  for (i=0;i<CEPS_MEM;i++)
+  {
+    int j;
+    float mindist = 1e15f;
+    for (j=0;j<CEPS_MEM;j++)
+    {
+      int k;
+      float dist=0;
+      for (k=0;k<NB_BANDS;k++)
+      {
+        float tmp;
+        tmp = st->cepstral_mem[i][k] - st->cepstral_mem[j][k];
+        dist += tmp*tmp;
+      }
+      if (j!=i)
+        mindist = MIN32(mindist, dist);
+    }
+    spec_variability += mindist;
+  }
+  features[NB_BANDS+3*NB_DELTA_CEPS+1] = spec_variability/CEPS_MEM-2.1;
+  return TRAINING && E < 0.1;
+}
+
+static void frame_synthesis(DenoiseState *st, float *out, const kiss_fft_cpx *y) {
+  float x[WINDOW_SIZE];
+  int i;
+  inverse_transform(x, y);
+  apply_window(x);
+  for (i=0;i<FRAME_SIZE;i++) out[i] = x[i] + st->synthesis_mem[i];
+  RNN_COPY(st->synthesis_mem, &x[FRAME_SIZE], FRAME_SIZE);
+}
+
+static void biquad(float *y, float mem[2], const float *x, const float *b, const float *a, int N) {
+  int i;
+  for (i=0;i<N;i++) {
+    float xi, yi;
+    xi = x[i];
+    yi = x[i] + mem[0];
+    mem[0] = mem[1] + (b[0]*(double)xi - a[0]*(double)yi);
+    mem[1] = (b[1]*(double)xi - a[1]*(double)yi);
+    y[i] = yi;
+  }
+}
+
+void pitch_filter(kiss_fft_cpx *X, const kiss_fft_cpx *P, const float *Ex, const float *Ep,
+                  const float *Exp, const float *g) {
+  int i;
+  float r[NB_BANDS];
+  float rf[FREQ_SIZE] = {0};
+  for (i=0;i<NB_BANDS;i++) {
+#if 0
+    if (Exp[i]>g[i]) r[i] = 1;
+    else r[i] = Exp[i]*(1-g[i])/(.001 + g[i]*(1-Exp[i]));
+    r[i] = MIN16(1, MAX16(0, r[i]));
+#else
+    if (Exp[i]>g[i]) r[i] = 1;
+    else r[i] = SQUARE(Exp[i])*(1-SQUARE(g[i]))/(.001 + SQUARE(g[i])*(1-SQUARE(Exp[i])));
+    r[i] = sqrt(MIN16(1, MAX16(0, r[i])));
+#endif
+    r[i] *= sqrt(Ex[i]/(1e-8+Ep[i]));
+  }
+  interp_band_gain(rf, r);
+  for (i=0;i<FREQ_SIZE;i++) {
+    X[i].r += rf[i]*P[i].r;
+    X[i].i += rf[i]*P[i].i;
+  }
+  float newE[NB_BANDS];
+  compute_band_energy(newE, X);
+  float norm[NB_BANDS];
+  float normf[FREQ_SIZE]={0};
+  for (i=0;i<NB_BANDS;i++) {
+    norm[i] = sqrt(Ex[i]/(1e-8+newE[i]));
+  }
+  interp_band_gain(normf, norm);
+  for (i=0;i<FREQ_SIZE;i++) {
+    X[i].r *= normf[i];
+    X[i].i *= normf[i];
+  }
+}
+
+float rnnoise_process_frame(DenoiseState *st, float *out, const float *in) {
+  int i;
+  kiss_fft_cpx X[FREQ_SIZE];
+  kiss_fft_cpx P[WINDOW_SIZE];
+  float x[FRAME_SIZE];
+  float Ex[NB_BANDS], Ep[NB_BANDS];
+  float Exp[NB_BANDS];
+  float features[NB_FEATURES];
+  float g[NB_BANDS];
+  float gf[FREQ_SIZE]={1};
+  float vad_prob = 0;
+  int silence;
+  static const float a_hp[2] = {-1.99599, 0.99600};
+  static const float b_hp[2] = {-2, 1};
+  biquad(x, st->mem_hp_x, in, b_hp, a_hp, FRAME_SIZE);
+  silence = compute_frame_features(st, X, P, Ex, Ep, Exp, features, x);
+
+  if (!silence) {
+    compute_rnn(&st->rnn, g, &vad_prob, features);
+    pitch_filter(X, P, Ex, Ep, Exp, g);
+    for (i=0;i<NB_BANDS;i++) {
+      float alpha = .6f;
+      g[i] = MAX16(g[i], alpha*st->lastg[i]);
+      st->lastg[i] = g[i];
+    }
+    interp_band_gain(gf, g);
+#if 1
+    for (i=0;i<FREQ_SIZE;i++) {
+      X[i].r *= gf[i];
+      X[i].i *= gf[i];
+    }
+#endif
+  }
+
+  frame_synthesis(st, out, X);
+  return vad_prob;
+}
+
+#if TRAINING
+
+static float uni_rand() {
+  return rand()/(double)RAND_MAX-.5;
+}
+
+static void rand_resp(float *a, float *b) {
+  a[0] = .75*uni_rand();
+  a[1] = .75*uni_rand();
+  b[0] = .75*uni_rand();
+  b[1] = .75*uni_rand();
+}
+
+int main(int argc, char **argv) {
+  int i;
+  int count=0;
+  static const float a_hp[2] = {-1.99599, 0.99600};
+  static const float b_hp[2] = {-2, 1};
+  float a_noise[2] = {0};
+  float b_noise[2] = {0};
+  float a_sig[2] = {0};
+  float b_sig[2] = {0};
+  float mem_hp_x[2]={0};
+  float mem_hp_n[2]={0};
+  float mem_resp_x[2]={0};
+  float mem_resp_n[2]={0};
+  float x[FRAME_SIZE];
+  float n[FRAME_SIZE];
+  float xn[FRAME_SIZE];
+  int vad_cnt=0;
+  int gain_change_count=0;
+  float speech_gain = 1, noise_gain = 1;
+  FILE *f1, *f2;
+  int maxCount;
+  DenoiseState *st;
+  DenoiseState *noise_state;
+  DenoiseState *noisy;
+  st = rnnoise_create(NULL);
+  noise_state = rnnoise_create(NULL);
+  noisy = rnnoise_create(NULL);
+  if (argc!=4) {
+    fprintf(stderr, "usage: %s <speech> <noise> <count>\n", argv[0]);
+    return 1;
+  }
+  f1 = fopen(argv[1], "r");
+  f2 = fopen(argv[2], "r");
+  maxCount = atoi(argv[3]);
+  for(i=0;i<150;i++) {
+    short tmp[FRAME_SIZE];
+    fread(tmp, sizeof(short), FRAME_SIZE, f2);
+  }
+  while (1) {
+    kiss_fft_cpx X[FREQ_SIZE], Y[FREQ_SIZE], N[FREQ_SIZE], P[WINDOW_SIZE];
+    float Ex[NB_BANDS], Ey[NB_BANDS], En[NB_BANDS], Ep[NB_BANDS];
+    float Exp[NB_BANDS];
+    float Ln[NB_BANDS];
+    float features[NB_FEATURES];
+    float g[NB_BANDS];
+    short tmp[FRAME_SIZE];
+    float vad=0;
+    float E=0;
+    if (count==maxCount) break;
+    if ((count%1000)==0) fprintf(stderr, "%d\r", count);
+    if (++gain_change_count > 2821) {
+      speech_gain = pow(10., (-40+(rand()%60))/20.);
+      noise_gain = pow(10., (-30+(rand()%50))/20.);
+      if (rand()%10==0) noise_gain = 0;
+      noise_gain *= speech_gain;
+      if (rand()%10==0) speech_gain = 0;
+      gain_change_count = 0;
+      rand_resp(a_noise, b_noise);
+      rand_resp(a_sig, b_sig);
+      lowpass = FREQ_SIZE * 3000./24000. * pow(50., rand()/(double)RAND_MAX);
+      for (i=0;i<NB_BANDS;i++) {
+        if (eband5ms[i]<<FRAME_SIZE_SHIFT > lowpass) {
+          band_lp = i;
+          break;
+        }
+      }
+    }
+    if (speech_gain != 0) {
+      fread(tmp, sizeof(short), FRAME_SIZE, f1);
+      if (feof(f1)) {
+        rewind(f1);
+        fread(tmp, sizeof(short), FRAME_SIZE, f1);
+      }
+      for (i=0;i<FRAME_SIZE;i++) x[i] = speech_gain*tmp[i];
+      for (i=0;i<FRAME_SIZE;i++) E += tmp[i]*(float)tmp[i];
+    } else {
+      for (i=0;i<FRAME_SIZE;i++) x[i] = 0;
+      E = 0;
+    }
+    if (noise_gain!=0) {
+      fread(tmp, sizeof(short), FRAME_SIZE, f2);
+      if (feof(f2)) {
+        rewind(f2);
+        fread(tmp, sizeof(short), FRAME_SIZE, f2);
+      }
+      for (i=0;i<FRAME_SIZE;i++) n[i] = noise_gain*tmp[i];
+    } else {
+      for (i=0;i<FRAME_SIZE;i++) n[i] = 0;
+    }
+    biquad(x, mem_hp_x, x, b_hp, a_hp, FRAME_SIZE);
+    biquad(x, mem_resp_x, x, b_sig, a_sig, FRAME_SIZE);
+    biquad(n, mem_hp_n, n, b_hp, a_hp, FRAME_SIZE);
+    biquad(n, mem_resp_n, n, b_noise, a_noise, FRAME_SIZE);
+    for (i=0;i<FRAME_SIZE;i++) xn[i] = x[i] + n[i];
+    if (E > 1e9f) {
+      vad_cnt=0;
+    } else if (E > 1e8f) {
+      vad_cnt -= 5;
+    } else if (E > 1e7f) {
+      vad_cnt++;
+    } else {
+      vad_cnt+=2;
+    }
+    if (vad_cnt < 0) vad_cnt = 0;
+    if (vad_cnt > 15) vad_cnt = 15;
+
+    if (vad_cnt >= 10) vad = 0;
+    else if (vad_cnt > 0) vad = 0.5f;
+    else vad = 1.f;
+
+    frame_analysis(st, Y, Ey, x);
+    frame_analysis(noise_state, N, En, n);
+    for (i=0;i<NB_BANDS;i++) Ln[i] = log10(1e-2+En[i]);
+    int silence = compute_frame_features(noisy, X, P, Ex, Ep, Exp, features, xn);
+    pitch_filter(X, P, Ex, Ep, Exp, g);
+    //printf("%f %d\n", noisy->last_gain, noisy->last_period);
+    for (i=0;i<NB_BANDS;i++) {
+      g[i] = sqrt((Ey[i]+1e-3)/(Ex[i]+1e-3));
+      if (g[i] > 1) g[i] = 1;
+      if (silence || i > band_lp) g[i] = -1;
+      if (Ey[i] < 5e-2 && Ex[i] < 5e-2) g[i] = -1;
+      if (vad==0 && noise_gain==0) g[i] = -1;
+    }
+    count++;
+#if 1
+    fwrite(features, sizeof(float), NB_FEATURES, stdout);
+    fwrite(g, sizeof(float), NB_BANDS, stdout);
+    fwrite(Ln, sizeof(float), NB_BANDS, stdout);
+    fwrite(&vad, sizeof(float), 1, stdout);
+#endif
+  }
+  fprintf(stderr, "matrix size: %d x %d\n", count, NB_FEATURES + 2*NB_BANDS + 1);
+  fclose(f1);
+  fclose(f2);
+  return 0;
+}
+
+#endif
diff --git a/third-party/rnnoise/Sources/kiss_fft.c b/third-party/rnnoise/Sources/kiss_fft.c
new file mode 100644
index 0000000000..d6b9f26d0c
--- /dev/null
+++ b/third-party/rnnoise/Sources/kiss_fft.c
@@ -0,0 +1,601 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+  Lots of modifications by Jean-Marc Valin
+  Copyright (c) 2005-2007, Xiph.Org Foundation
+  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.*/
+
+/* This code is originally from Mark Borgerding's KISS-FFT but has been
+   heavily modified to better suit Opus */
+
+#ifndef SKIP_CONFIG_H
+#  ifdef HAVE_CONFIG_H
+#    include "config.h"
+#  endif
+#endif
+
+#include "_kiss_fft_guts.h"
+#define CUSTOM_MODES
+
+/* The guts header contains all the multiplication and addition macros that are defined for
+   complex numbers.  It also declares the kf_ internal functions.
+*/
+
+static void kf_bfly2(
+                     kiss_fft_cpx * Fout,
+                     int m,
+                     int N
+                    )
+{
+   kiss_fft_cpx * Fout2;
+   int i;
+   (void)m;
+#ifdef CUSTOM_MODES
+   if (m==1)
+   {
+      celt_assert(m==1);
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx t;
+         Fout2 = Fout + 1;
+         t = *Fout2;
+         C_SUB( *Fout2 ,  *Fout , t );
+         C_ADDTO( *Fout ,  t );
+         Fout += 2;
+      }
+   } else
+#endif
+   {
+      opus_val16 tw;
+      tw = QCONST16(0.7071067812f, 15);
+      /* We know that m==4 here because the radix-2 is just after a radix-4 */
+      celt_assert(m==4);
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx t;
+         Fout2 = Fout + 4;
+         t = Fout2[0];
+         C_SUB( Fout2[0] ,  Fout[0] , t );
+         C_ADDTO( Fout[0] ,  t );
+
+         t.r = S_MUL(ADD32_ovflw(Fout2[1].r, Fout2[1].i), tw);
+         t.i = S_MUL(SUB32_ovflw(Fout2[1].i, Fout2[1].r), tw);
+         C_SUB( Fout2[1] ,  Fout[1] , t );
+         C_ADDTO( Fout[1] ,  t );
+
+         t.r = Fout2[2].i;
+         t.i = -Fout2[2].r;
+         C_SUB( Fout2[2] ,  Fout[2] , t );
+         C_ADDTO( Fout[2] ,  t );
+
+         t.r = S_MUL(SUB32_ovflw(Fout2[3].i, Fout2[3].r), tw);
+         t.i = S_MUL(NEG32_ovflw(ADD32_ovflw(Fout2[3].i, Fout2[3].r)), tw);
+         C_SUB( Fout2[3] ,  Fout[3] , t );
+         C_ADDTO( Fout[3] ,  t );
+         Fout += 8;
+      }
+   }
+}
+
+static void kf_bfly4(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   int i;
+
+   if (m==1)
+   {
+      /* Degenerate case where all the twiddles are 1. */
+      for (i=0;i<N;i++)
+      {
+         kiss_fft_cpx scratch0, scratch1;
+
+         C_SUB( scratch0 , *Fout, Fout[2] );
+         C_ADDTO(*Fout, Fout[2]);
+         C_ADD( scratch1 , Fout[1] , Fout[3] );
+         C_SUB( Fout[2], *Fout, scratch1 );
+         C_ADDTO( *Fout , scratch1 );
+         C_SUB( scratch1 , Fout[1] , Fout[3] );
+
+         Fout[1].r = ADD32_ovflw(scratch0.r, scratch1.i);
+         Fout[1].i = SUB32_ovflw(scratch0.i, scratch1.r);
+         Fout[3].r = SUB32_ovflw(scratch0.r, scratch1.i);
+         Fout[3].i = ADD32_ovflw(scratch0.i, scratch1.r);
+         Fout+=4;
+      }
+   } else {
+      int j;
+      kiss_fft_cpx scratch[6];
+      const kiss_twiddle_cpx *tw1,*tw2,*tw3;
+      const int m2=2*m;
+      const int m3=3*m;
+      kiss_fft_cpx * Fout_beg = Fout;
+      for (i=0;i<N;i++)
+      {
+         Fout = Fout_beg + i*mm;
+         tw3 = tw2 = tw1 = st->twiddles;
+         /* m is guaranteed to be a multiple of 4. */
+         for (j=0;j<m;j++)
+         {
+            C_MUL(scratch[0],Fout[m] , *tw1 );
+            C_MUL(scratch[1],Fout[m2] , *tw2 );
+            C_MUL(scratch[2],Fout[m3] , *tw3 );
+
+            C_SUB( scratch[5] , *Fout, scratch[1] );
+            C_ADDTO(*Fout, scratch[1]);
+            C_ADD( scratch[3] , scratch[0] , scratch[2] );
+            C_SUB( scratch[4] , scratch[0] , scratch[2] );
+            C_SUB( Fout[m2], *Fout, scratch[3] );
+            tw1 += fstride;
+            tw2 += fstride*2;
+            tw3 += fstride*3;
+            C_ADDTO( *Fout , scratch[3] );
+
+            Fout[m].r = ADD32_ovflw(scratch[5].r, scratch[4].i);
+            Fout[m].i = SUB32_ovflw(scratch[5].i, scratch[4].r);
+            Fout[m3].r = SUB32_ovflw(scratch[5].r, scratch[4].i);
+            Fout[m3].i = ADD32_ovflw(scratch[5].i, scratch[4].r);
+            ++Fout;
+         }
+      }
+   }
+}
+
+
+#ifndef RADIX_TWO_ONLY
+
+static void kf_bfly3(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   int i;
+   size_t k;
+   const size_t m2 = 2*m;
+   const kiss_twiddle_cpx *tw1,*tw2;
+   kiss_fft_cpx scratch[5];
+   kiss_twiddle_cpx epi3;
+
+   kiss_fft_cpx * Fout_beg = Fout;
+#ifdef FIXED_POINT
+   /*epi3.r = -16384;*/ /* Unused */
+   epi3.i = -28378;
+#else
+   epi3 = st->twiddles[fstride*m];
+#endif
+   for (i=0;i<N;i++)
+   {
+      Fout = Fout_beg + i*mm;
+      tw1=tw2=st->twiddles;
+      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+      k=m;
+      do {
+
+         C_MUL(scratch[1],Fout[m] , *tw1);
+         C_MUL(scratch[2],Fout[m2] , *tw2);
+
+         C_ADD(scratch[3],scratch[1],scratch[2]);
+         C_SUB(scratch[0],scratch[1],scratch[2]);
+         tw1 += fstride;
+         tw2 += fstride*2;
+
+         Fout[m].r = SUB32_ovflw(Fout->r, HALF_OF(scratch[3].r));
+         Fout[m].i = SUB32_ovflw(Fout->i, HALF_OF(scratch[3].i));
+
+         C_MULBYSCALAR( scratch[0] , epi3.i );
+
+         C_ADDTO(*Fout,scratch[3]);
+
+         Fout[m2].r = ADD32_ovflw(Fout[m].r, scratch[0].i);
+         Fout[m2].i = SUB32_ovflw(Fout[m].i, scratch[0].r);
+
+         Fout[m].r = SUB32_ovflw(Fout[m].r, scratch[0].i);
+         Fout[m].i = ADD32_ovflw(Fout[m].i, scratch[0].r);
+
+         ++Fout;
+      } while(--k);
+   }
+}
+
+
+#ifndef OVERRIDE_kf_bfly5
+static void kf_bfly5(
+                     kiss_fft_cpx * Fout,
+                     const size_t fstride,
+                     const kiss_fft_state *st,
+                     int m,
+                     int N,
+                     int mm
+                    )
+{
+   kiss_fft_cpx *Fout0,*Fout1,*Fout2,*Fout3,*Fout4;
+   int i, u;
+   kiss_fft_cpx scratch[13];
+   const kiss_twiddle_cpx *tw;
+   kiss_twiddle_cpx ya,yb;
+   kiss_fft_cpx * Fout_beg = Fout;
+
+#ifdef FIXED_POINT
+   ya.r = 10126;
+   ya.i = -31164;
+   yb.r = -26510;
+   yb.i = -19261;
+#else
+   ya = st->twiddles[fstride*m];
+   yb = st->twiddles[fstride*2*m];
+#endif
+   tw=st->twiddles;
+
+   for (i=0;i<N;i++)
+   {
+      Fout = Fout_beg + i*mm;
+      Fout0=Fout;
+      Fout1=Fout0+m;
+      Fout2=Fout0+2*m;
+      Fout3=Fout0+3*m;
+      Fout4=Fout0+4*m;
+
+      /* For non-custom modes, m is guaranteed to be a multiple of 4. */
+      for ( u=0; u<m; ++u ) {
+         scratch[0] = *Fout0;
+
+         C_MUL(scratch[1] ,*Fout1, tw[u*fstride]);
+         C_MUL(scratch[2] ,*Fout2, tw[2*u*fstride]);
+         C_MUL(scratch[3] ,*Fout3, tw[3*u*fstride]);
+         C_MUL(scratch[4] ,*Fout4, tw[4*u*fstride]);
+
+         C_ADD( scratch[7],scratch[1],scratch[4]);
+         C_SUB( scratch[10],scratch[1],scratch[4]);
+         C_ADD( scratch[8],scratch[2],scratch[3]);
+         C_SUB( scratch[9],scratch[2],scratch[3]);
+
+         Fout0->r = ADD32_ovflw(Fout0->r, ADD32_ovflw(scratch[7].r, scratch[8].r));
+         Fout0->i = ADD32_ovflw(Fout0->i, ADD32_ovflw(scratch[7].i, scratch[8].i));
+
+         scratch[5].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,ya.r), S_MUL(scratch[8].r,yb.r)));
+         scratch[5].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,ya.r), S_MUL(scratch[8].i,yb.r)));
+
+         scratch[6].r =  ADD32_ovflw(S_MUL(scratch[10].i,ya.i), S_MUL(scratch[9].i,yb.i));
+         scratch[6].i = NEG32_ovflw(ADD32_ovflw(S_MUL(scratch[10].r,ya.i), S_MUL(scratch[9].r,yb.i)));
+
+         C_SUB(*Fout1,scratch[5],scratch[6]);
+         C_ADD(*Fout4,scratch[5],scratch[6]);
+
+         scratch[11].r = ADD32_ovflw(scratch[0].r, ADD32_ovflw(S_MUL(scratch[7].r,yb.r), S_MUL(scratch[8].r,ya.r)));
+         scratch[11].i = ADD32_ovflw(scratch[0].i, ADD32_ovflw(S_MUL(scratch[7].i,yb.r), S_MUL(scratch[8].i,ya.r)));
+         scratch[12].r = SUB32_ovflw(S_MUL(scratch[9].i,ya.i), S_MUL(scratch[10].i,yb.i));
+         scratch[12].i = SUB32_ovflw(S_MUL(scratch[10].r,yb.i), S_MUL(scratch[9].r,ya.i));
+
+         C_ADD(*Fout2,scratch[11],scratch[12]);
+         C_SUB(*Fout3,scratch[11],scratch[12]);
+
+         ++Fout0;++Fout1;++Fout2;++Fout3;++Fout4;
+      }
+   }
+}
+#endif /* OVERRIDE_kf_bfly5 */
+
+
+#endif
+
+
+#ifdef CUSTOM_MODES
+
+static
+void compute_bitrev_table(
+         int Fout,
+         opus_int16 *f,
+         const size_t fstride,
+         int in_stride,
+         opus_int16 * factors,
+         const kiss_fft_state *st
+            )
+{
+   const int p=*factors++; /* the radix  */
+   const int m=*factors++; /* stage's fft length/p */
+
+    /*printf ("fft %d %d %d %d %d %d\n", p*m, m, p, s2, fstride*in_stride, N);*/
+   if (m==1)
+   {
+      int j;
+      for (j=0;j<p;j++)
+      {
+         *f = Fout+j;
+         f += fstride*in_stride;
+      }
+   } else {
+      int j;
+      for (j=0;j<p;j++)
+      {
+         compute_bitrev_table( Fout , f, fstride*p, in_stride, factors,st);
+         f += fstride*in_stride;
+         Fout += m;
+      }
+   }
+}
+
+/*  facbuf is populated by p1,m1,p2,m2, ...
+    where
+    p[i] * m[i] = m[i-1]
+    m0 = n                  */
+static
+int kf_factor(int n,opus_int16 * facbuf)
+{
+    int p=4;
+    int i;
+    int stages=0;
+    int nbak = n;
+
+    /*factor out powers of 4, powers of 2, then any remaining primes */
+    do {
+        while (n % p) {
+            switch (p) {
+                case 4: p = 2; break;
+                case 2: p = 3; break;
+                default: p += 2; break;
+            }
+            if (p>32000 || (opus_int32)p*(opus_int32)p > n)
+                p = n;          /* no more factors, skip to end */
+        }
+        n /= p;
+#ifdef RADIX_TWO_ONLY
+        if (p!=2 && p != 4)
+#else
+        if (p>5)
+#endif
+        {
+           return 0;
+        }
+        facbuf[2*stages] = p;
+        if (p==2 && stages > 1)
+        {
+           facbuf[2*stages] = 4;
+           facbuf[2] = 2;
+        }
+        stages++;
+    } while (n > 1);
+    n = nbak;
+    /* Reverse the order to get the radix 4 at the end, so we can use the
+       fast degenerate case. It turns out that reversing the order also
+       improves the noise behaviour. */
+    for (i=0;i<stages/2;i++)
+    {
+       int tmp;
+       tmp = facbuf[2*i];
+       facbuf[2*i] = facbuf[2*(stages-i-1)];
+       facbuf[2*(stages-i-1)] = tmp;
+    }
+    for (i=0;i<stages;i++)
+    {
+        n /= facbuf[2*i];
+        facbuf[2*i+1] = n;
+    }
+    return 1;
+}
+
+static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
+{
+   int i;
+#ifdef FIXED_POINT
+   for (i=0;i<nfft;++i) {
+      opus_val32 phase = -i;
+      kf_cexp2(twiddles+i, DIV32(SHL32(phase,17),nfft));
+   }
+#else
+   for (i=0;i<nfft;++i) {
+      const double pi=3.14159265358979323846264338327;
+      double phase = ( -2*pi /nfft ) * i;
+      kf_cexp(twiddles+i, phase );
+   }
+#endif
+}
+
+int opus_fft_alloc_arch_c(kiss_fft_state *st) {
+   (void)st;
+   return 0;
+}
+
+/*
+ *
+ * Allocates all necessary storage space for the fft and ifft.
+ * The return value is a contiguous block of memory.  As such,
+ * It can be freed with free().
+ * */
+kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem,
+                                        const kiss_fft_state *base, int arch)
+{
+    kiss_fft_state *st=NULL;
+    size_t memneeded = sizeof(struct kiss_fft_state); /* twiddle factors*/
+
+    if ( lenmem==NULL ) {
+        st = ( kiss_fft_state*)KISS_FFT_MALLOC( memneeded );
+    }else{
+        if (mem != NULL && *lenmem >= memneeded)
+            st = (kiss_fft_state*)mem;
+        *lenmem = memneeded;
+    }
+    if (st) {
+        opus_int16 *bitrev;
+        kiss_twiddle_cpx *twiddles;
+
+        st->nfft=nfft;
+#ifdef FIXED_POINT
+        st->scale_shift = celt_ilog2(st->nfft);
+        if (st->nfft == 1<<st->scale_shift)
+           st->scale = Q15ONE;
+        else
+           st->scale = (1073741824+st->nfft/2)/st->nfft>>(15-st->scale_shift);
+#else
+        st->scale = 1.f/nfft;
+#endif
+        if (base != NULL)
+        {
+           st->twiddles = base->twiddles;
+           st->shift = 0;
+           while (st->shift < 32 && nfft<<st->shift != base->nfft)
+              st->shift++;
+           if (st->shift>=32)
+              goto fail;
+        } else {
+           st->twiddles = twiddles = (kiss_twiddle_cpx*)KISS_FFT_MALLOC(sizeof(kiss_twiddle_cpx)*nfft);
+           compute_twiddles(twiddles, nfft);
+           st->shift = -1;
+        }
+        if (!kf_factor(nfft,st->factors))
+        {
+           goto fail;
+        }
+
+        /* bitrev */
+        st->bitrev = bitrev = (opus_int16*)KISS_FFT_MALLOC(sizeof(opus_int16)*nfft);
+        if (st->bitrev==NULL)
+            goto fail;
+        compute_bitrev_table(0, bitrev, 1,1, st->factors,st);
+
+        /* Initialize architecture specific fft parameters */
+        if (opus_fft_alloc_arch(st, arch))
+            goto fail;
+    }
+    return st;
+fail:
+    opus_fft_free(st, arch);
+    return NULL;
+}
+
+kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch)
+{
+   return opus_fft_alloc_twiddles(nfft, mem, lenmem, NULL, arch);
+}
+
+void opus_fft_free_arch_c(kiss_fft_state *st) {
+   (void)st;
+}
+
+void opus_fft_free(const kiss_fft_state *cfg, int arch)
+{
+   if (cfg)
+   {
+      opus_fft_free_arch((kiss_fft_state *)cfg, arch);
+      opus_free((opus_int16*)cfg->bitrev);
+      if (cfg->shift < 0)
+         opus_free((kiss_twiddle_cpx*)cfg->twiddles);
+      opus_free((kiss_fft_state*)cfg);
+   }
+}
+
+#endif /* CUSTOM_MODES */
+
+void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout)
+{
+    int m2, m;
+    int p;
+    int L;
+    int fstride[MAXFACTORS];
+    int i;
+    int shift;
+
+    /* st->shift can be -1 */
+    shift = st->shift>0 ? st->shift : 0;
+
+    fstride[0] = 1;
+    L=0;
+    do {
+       p = st->factors[2*L];
+       m = st->factors[2*L+1];
+       fstride[L+1] = fstride[L]*p;
+       L++;
+    } while(m!=1);
+    m = st->factors[2*L-1];
+    for (i=L-1;i>=0;i--)
+    {
+       if (i!=0)
+          m2 = st->factors[2*i-1];
+       else
+          m2 = 1;
+       switch (st->factors[2*i])
+       {
+       case 2:
+          kf_bfly2(fout, m, fstride[i]);
+          break;
+       case 4:
+          kf_bfly4(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+ #ifndef RADIX_TWO_ONLY
+       case 3:
+          kf_bfly3(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+       case 5:
+          kf_bfly5(fout,fstride[i]<<shift,st,m, fstride[i], m2);
+          break;
+ #endif
+       }
+       m = m2;
+    }
+}
+
+void opus_fft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+   int i;
+   opus_val16 scale;
+#ifdef FIXED_POINT
+   /* Allows us to scale with MULT16_32_Q16(), which is faster than
+      MULT16_32_Q15() on ARM. */
+   int scale_shift = st->scale_shift-1;
+#endif
+   scale = st->scale;
+
+   celt_assert2 (fin != fout, "In-place FFT not supported");
+   /* Bit-reverse the input */
+   for (i=0;i<st->nfft;i++)
+   {
+      kiss_fft_cpx x = fin[i];
+      fout[st->bitrev[i]].r = SHR32(MULT16_32_Q16(scale, x.r), scale_shift);
+      fout[st->bitrev[i]].i = SHR32(MULT16_32_Q16(scale, x.i), scale_shift);
+   }
+   opus_fft_impl(st, fout);
+}
+
+
+void opus_ifft_c(const kiss_fft_state *st,const kiss_fft_cpx *fin,kiss_fft_cpx *fout)
+{
+   int i;
+   celt_assert2 (fin != fout, "In-place FFT not supported");
+   /* Bit-reverse the input */
+   for (i=0;i<st->nfft;i++)
+      fout[st->bitrev[i]] = fin[i];
+   for (i=0;i<st->nfft;i++)
+      fout[i].i = -fout[i].i;
+   opus_fft_impl(st, fout);
+   for (i=0;i<st->nfft;i++)
+      fout[i].i = -fout[i].i;
+}
diff --git a/third-party/rnnoise/Sources/kiss_fft.h b/third-party/rnnoise/Sources/kiss_fft.h
new file mode 100644
index 0000000000..b2fe9a4776
--- /dev/null
+++ b/third-party/rnnoise/Sources/kiss_fft.h
@@ -0,0 +1,203 @@
+/*Copyright (c) 2003-2004, Mark Borgerding
+  Lots of modifications by Jean-Marc Valin
+  Copyright (c) 2005-2007, Xiph.Org Foundation
+  Copyright (c) 2008,      Xiph.Org Foundation, CSIRO
+
+  All rights reserved.
+
+  Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright notice,
+       this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+  POSSIBILITY OF SUCH DAMAGE.*/
+
+#ifndef KISS_FFT_H
+#define KISS_FFT_H
+
+#include <stdlib.h>
+#include <math.h>
+#include "arch.h"
+
+#include <stdlib.h>
+#define opus_alloc(x) malloc(x)
+#define opus_free(x) free(x)
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef USE_SIMD
+# include <xmmintrin.h>
+# define kiss_fft_scalar __m128
+#define KISS_FFT_MALLOC(nbytes) memalign(16,nbytes)
+#else
+#define KISS_FFT_MALLOC opus_alloc
+#endif
+
+#ifdef FIXED_POINT
+#include "arch.h"
+
+#  define kiss_fft_scalar opus_int32
+#  define kiss_twiddle_scalar opus_int16
+
+
+#else
+# ifndef kiss_fft_scalar
+/*  default is float */
+#   define kiss_fft_scalar float
+#   define kiss_twiddle_scalar float
+#   define KF_SUFFIX _celt_single
+# endif
+#endif
+
+typedef struct {
+    kiss_fft_scalar r;
+    kiss_fft_scalar i;
+}kiss_fft_cpx;
+
+typedef struct {
+   kiss_twiddle_scalar r;
+   kiss_twiddle_scalar i;
+}kiss_twiddle_cpx;
+
+#define MAXFACTORS 8
+/* e.g. an fft of length 128 has 4 factors
+ as far as kissfft is concerned
+ 4*4*4*2
+ */
+
+typedef struct arch_fft_state{
+   int is_supported;
+   void *priv;
+} arch_fft_state;
+
+typedef struct kiss_fft_state{
+    int nfft;
+    opus_val16 scale;
+#ifdef FIXED_POINT
+    int scale_shift;
+#endif
+    int shift;
+    opus_int16 factors[2*MAXFACTORS];
+    const opus_int16 *bitrev;
+    const kiss_twiddle_cpx *twiddles;
+    arch_fft_state *arch_fft;
+} kiss_fft_state;
+
+#if defined(HAVE_ARM_NE10)
+#include "arm/fft_arm.h"
+#endif
+
+/*typedef struct kiss_fft_state* kiss_fft_cfg;*/
+
+/**
+ *  opus_fft_alloc
+ *
+ *  Initialize a FFT (or IFFT) algorithm's cfg/state buffer.
+ *
+ *  typical usage:      kiss_fft_cfg mycfg=opus_fft_alloc(1024,0,NULL,NULL);
+ *
+ *  The return value from fft_alloc is a cfg buffer used internally
+ *  by the fft routine or NULL.
+ *
+ *  If lenmem is NULL, then opus_fft_alloc will allocate a cfg buffer using malloc.
+ *  The returned value should be free()d when done to avoid memory leaks.
+ *
+ *  The state can be placed in a user supplied buffer 'mem':
+ *  If lenmem is not NULL and mem is not NULL and *lenmem is large enough,
+ *      then the function places the cfg in mem and the size used in *lenmem
+ *      and returns mem.
+ *
+ *  If lenmem is not NULL and ( mem is NULL or *lenmem is not large enough),
+ *      then the function returns NULL and places the minimum cfg
+ *      buffer size in *lenmem.
+ * */
+
+kiss_fft_state *opus_fft_alloc_twiddles(int nfft,void * mem,size_t * lenmem, const kiss_fft_state *base, int arch);
+
+kiss_fft_state *opus_fft_alloc(int nfft,void * mem,size_t * lenmem, int arch);
+
+/**
+ * opus_fft(cfg,in_out_buf)
+ *
+ * Perform an FFT on a complex input buffer.
+ * for a forward FFT,
+ * fin should be  f[0] , f[1] , ... ,f[nfft-1]
+ * fout will be   F[0] , F[1] , ... ,F[nfft-1]
+ * Note that each element is complex and can be accessed like
+    f[k].r and f[k].i
+ * */
+void opus_fft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+void opus_ifft_c(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *fout);
+
+void opus_fft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+void opus_ifft_impl(const kiss_fft_state *st,kiss_fft_cpx *fout);
+
+void opus_fft_free(const kiss_fft_state *cfg, int arch);
+
+
+void opus_fft_free_arch_c(kiss_fft_state *st);
+int opus_fft_alloc_arch_c(kiss_fft_state *st);
+
+#if !defined(OVERRIDE_OPUS_FFT)
+/* Is run-time CPU detection enabled on this platform? */
+#if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10))
+
+extern int (*const OPUS_FFT_ALLOC_ARCH_IMPL[OPUS_ARCHMASK+1])(
+ kiss_fft_state *st);
+
+#define opus_fft_alloc_arch(_st, arch) \
+         ((*OPUS_FFT_ALLOC_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+
+extern void (*const OPUS_FFT_FREE_ARCH_IMPL[OPUS_ARCHMASK+1])(
+ kiss_fft_state *st);
+#define opus_fft_free_arch(_st, arch) \
+         ((*OPUS_FFT_FREE_ARCH_IMPL[(arch)&OPUS_ARCHMASK])(_st))
+
+extern void (*const OPUS_FFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+ const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
+#define opus_fft(_cfg, _fin, _fout, arch) \
+   ((*OPUS_FFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+
+extern void (*const OPUS_IFFT[OPUS_ARCHMASK+1])(const kiss_fft_state *cfg,
+ const kiss_fft_cpx *fin, kiss_fft_cpx *fout);
+#define opus_ifft(_cfg, _fin, _fout, arch) \
+   ((*OPUS_IFFT[(arch)&OPUS_ARCHMASK])(_cfg, _fin, _fout))
+
+#else /* else for if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+
+#define opus_fft_alloc_arch(_st, arch) \
+         ((void)(arch), opus_fft_alloc_arch_c(_st))
+
+#define opus_fft_free_arch(_st, arch) \
+         ((void)(arch), opus_fft_free_arch_c(_st))
+
+#define opus_fft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), opus_fft_c(_cfg, _fin, _fout))
+
+#define opus_ifft(_cfg, _fin, _fout, arch) \
+         ((void)(arch), opus_ifft_c(_cfg, _fin, _fout))
+
+#endif /* end if defined(OPUS_HAVE_RTCD) && (defined(HAVE_ARM_NE10)) */
+#endif /* end if !defined(OVERRIDE_OPUS_FFT) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/third-party/rnnoise/Sources/opus_types.h b/third-party/rnnoise/Sources/opus_types.h
new file mode 100644
index 0000000000..7180826665
--- /dev/null
+++ b/third-party/rnnoise/Sources/opus_types.h
@@ -0,0 +1,159 @@
+/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
+/* Modified by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* opus_types.h based on ogg_types.h from libogg */
+
+/**
+   @file opus_types.h
+   @brief Opus reference implementation types
+*/
+#ifndef OPUS_TYPES_H
+#define OPUS_TYPES_H
+
+/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+#include <stdint.h>
+
+   typedef int16_t opus_int16;
+   typedef uint16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef uint32_t opus_uint32;
+#elif defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t opus_int32;
+     typedef _G_uint32_t opus_uint32;
+     typedef _G_int16 opus_int16;
+     typedef _G_uint16 opus_uint16;
+#  elif defined(__MINGW32__)
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+#  elif defined(__MWERKS__)
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 opus_int32;
+     typedef unsigned __int32 opus_uint32;
+     typedef __int16 opus_int16;
+     typedef unsigned __int16 opus_uint16;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 opus_int16;
+   typedef UInt16 opus_uint16;
+   typedef SInt32 opus_int32;
+   typedef UInt32 opus_uint32;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t opus_int16;
+   typedef u_int16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16 opus_int16;
+   typedef u_int16 opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int opus_int32;
+   typedef unsigned opus_uint32;
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef signed int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef long opus_int32;
+   typedef unsigned long opus_uint32;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#else
+
+   /* Give up, take a reasonable guess */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#endif
+
+#define opus_int         int                     /* used for counters etc; at least 16 bits */
+#define opus_int64       long long
+#define opus_int8        signed char
+
+#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
+#define opus_uint64      unsigned long long
+#define opus_uint8       unsigned char
+
+#endif  /* OPUS_TYPES_H */
diff --git a/third-party/rnnoise/Sources/pitch.c b/third-party/rnnoise/Sources/pitch.c
new file mode 100644
index 0000000000..bd101a6cc1
--- /dev/null
+++ b/third-party/rnnoise/Sources/pitch.c
@@ -0,0 +1,526 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file pitch.c
+   @brief Pitch analysis
+ */
+
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "pitch.h"
+#include "common.h"
+//#include "modes.h"
+//#include "stack_alloc.h"
+//#include "mathops.h"
+#include "celt_lpc.h"
+#include "math.h"
+
+static void find_best_pitch(opus_val32 *xcorr, opus_val16 *y, int len,
+                            int max_pitch, int *best_pitch
+#ifdef FIXED_POINT
+                            , int yshift, opus_val32 maxcorr
+#endif
+                            )
+{
+   int i, j;
+   opus_val32 Syy=1;
+   opus_val16 best_num[2];
+   opus_val32 best_den[2];
+#ifdef FIXED_POINT
+   int xshift;
+
+   xshift = celt_ilog2(maxcorr)-14;
+#endif
+
+   best_num[0] = -1;
+   best_num[1] = -1;
+   best_den[0] = 0;
+   best_den[1] = 0;
+   best_pitch[0] = 0;
+   best_pitch[1] = 1;
+   for (j=0;j<len;j++)
+      Syy = ADD32(Syy, SHR32(MULT16_16(y[j],y[j]), yshift));
+   for (i=0;i<max_pitch;i++)
+   {
+      if (xcorr[i]>0)
+      {
+         opus_val16 num;
+         opus_val32 xcorr16;
+         xcorr16 = EXTRACT16(VSHR32(xcorr[i], xshift));
+#ifndef FIXED_POINT
+         /* Considering the range of xcorr16, this should avoid both underflows
+            and overflows (inf) when squaring xcorr16 */
+         xcorr16 *= 1e-12f;
+#endif
+         num = MULT16_16_Q15(xcorr16,xcorr16);
+         if (MULT16_32_Q15(num,best_den[1]) > MULT16_32_Q15(best_num[1],Syy))
+         {
+            if (MULT16_32_Q15(num,best_den[0]) > MULT16_32_Q15(best_num[0],Syy))
+            {
+               best_num[1] = best_num[0];
+               best_den[1] = best_den[0];
+               best_pitch[1] = best_pitch[0];
+               best_num[0] = num;
+               best_den[0] = Syy;
+               best_pitch[0] = i;
+            } else {
+               best_num[1] = num;
+               best_den[1] = Syy;
+               best_pitch[1] = i;
+            }
+         }
+      }
+      Syy += SHR32(MULT16_16(y[i+len],y[i+len]),yshift) - SHR32(MULT16_16(y[i],y[i]),yshift);
+      Syy = MAX32(1, Syy);
+   }
+}
+
+static void celt_fir5(const opus_val16 *x,
+         const opus_val16 *num,
+         opus_val16 *y,
+         int N,
+         opus_val16 *mem)
+{
+   int i;
+   opus_val16 num0, num1, num2, num3, num4;
+   opus_val32 mem0, mem1, mem2, mem3, mem4;
+   num0=num[0];
+   num1=num[1];
+   num2=num[2];
+   num3=num[3];
+   num4=num[4];
+   mem0=mem[0];
+   mem1=mem[1];
+   mem2=mem[2];
+   mem3=mem[3];
+   mem4=mem[4];
+   for (i=0;i<N;i++)
+   {
+      opus_val32 sum = SHL32(EXTEND32(x[i]), SIG_SHIFT);
+      sum = MAC16_16(sum,num0,mem0);
+      sum = MAC16_16(sum,num1,mem1);
+      sum = MAC16_16(sum,num2,mem2);
+      sum = MAC16_16(sum,num3,mem3);
+      sum = MAC16_16(sum,num4,mem4);
+      mem4 = mem3;
+      mem3 = mem2;
+      mem2 = mem1;
+      mem1 = mem0;
+      mem0 = x[i];
+      y[i] = ROUND16(sum, SIG_SHIFT);
+   }
+   mem[0]=mem0;
+   mem[1]=mem1;
+   mem[2]=mem2;
+   mem[3]=mem3;
+   mem[4]=mem4;
+}
+
+
+void pitch_downsample(celt_sig *x[], opus_val16 *x_lp,
+      int len, int C)
+{
+   int i;
+   opus_val32 ac[5];
+   opus_val16 tmp=Q15ONE;
+   opus_val16 lpc[4], mem[5]={0,0,0,0,0};
+   opus_val16 lpc2[5];
+   opus_val16 c1 = QCONST16(.8f,15);
+#ifdef FIXED_POINT
+   int shift;
+   opus_val32 maxabs = celt_maxabs32(x[0], len);
+   if (C==2)
+   {
+      opus_val32 maxabs_1 = celt_maxabs32(x[1], len);
+      maxabs = MAX32(maxabs, maxabs_1);
+   }
+   if (maxabs<1)
+      maxabs=1;
+   shift = celt_ilog2(maxabs)-10;
+   if (shift<0)
+      shift=0;
+   if (C==2)
+      shift++;
+#endif
+   for (i=1;i<len>>1;i++)
+      x_lp[i] = SHR32(HALF32(HALF32(x[0][(2*i-1)]+x[0][(2*i+1)])+x[0][2*i]), shift);
+   x_lp[0] = SHR32(HALF32(HALF32(x[0][1])+x[0][0]), shift);
+   if (C==2)
+   {
+      for (i=1;i<len>>1;i++)
+         x_lp[i] += SHR32(HALF32(HALF32(x[1][(2*i-1)]+x[1][(2*i+1)])+x[1][2*i]), shift);
+      x_lp[0] += SHR32(HALF32(HALF32(x[1][1])+x[1][0]), shift);
+   }
+
+   _celt_autocorr(x_lp, ac, NULL, 0,
+                  4, len>>1);
+
+   /* Noise floor -40 dB */
+#ifdef FIXED_POINT
+   ac[0] += SHR32(ac[0],13);
+#else
+   ac[0] *= 1.0001f;
+#endif
+   /* Lag windowing */
+   for (i=1;i<=4;i++)
+   {
+      /*ac[i] *= exp(-.5*(2*M_PI*.002*i)*(2*M_PI*.002*i));*/
+#ifdef FIXED_POINT
+      ac[i] -= MULT16_32_Q15(2*i*i, ac[i]);
+#else
+      ac[i] -= ac[i]*(.008f*i)*(.008f*i);
+#endif
+   }
+
+   _celt_lpc(lpc, ac, 4);
+   for (i=0;i<4;i++)
+   {
+      tmp = MULT16_16_Q15(QCONST16(.9f,15), tmp);
+      lpc[i] = MULT16_16_Q15(lpc[i], tmp);
+   }
+   /* Add a zero */
+   lpc2[0] = lpc[0] + QCONST16(.8f,SIG_SHIFT);
+   lpc2[1] = lpc[1] + MULT16_16_Q15(c1,lpc[0]);
+   lpc2[2] = lpc[2] + MULT16_16_Q15(c1,lpc[1]);
+   lpc2[3] = lpc[3] + MULT16_16_Q15(c1,lpc[2]);
+   lpc2[4] = MULT16_16_Q15(c1,lpc[3]);
+   celt_fir5(x_lp, lpc2, x_lp, len>>1, mem);
+}
+
+void celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
+      opus_val32 *xcorr, int len, int max_pitch)
+{
+
+#if 0 /* This is a simple version of the pitch correlation that should work
+         well on DSPs like Blackfin and TI C5x/C6x */
+   int i, j;
+#ifdef FIXED_POINT
+   opus_val32 maxcorr=1;
+#endif
+   for (i=0;i<max_pitch;i++)
+   {
+      opus_val32 sum = 0;
+      for (j=0;j<len;j++)
+         sum = MAC16_16(sum, _x[j], _y[i+j]);
+      xcorr[i] = sum;
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+#ifdef FIXED_POINT
+   return maxcorr;
+#endif
+
+#else /* Unrolled version of the pitch correlation -- runs faster on x86 and ARM */
+   int i;
+   /*The EDSP version requires that max_pitch is at least 1, and that _x is
+      32-bit aligned.
+     Since it's hard to put asserts in assembly, put them here.*/
+#ifdef FIXED_POINT
+   opus_val32 maxcorr=1;
+#endif
+   celt_assert(max_pitch>0);
+   celt_assert((((unsigned char *)_x-(unsigned char *)NULL)&3)==0);
+   for (i=0;i<max_pitch-3;i+=4)
+   {
+      opus_val32 sum[4]={0,0,0,0};
+      xcorr_kernel(_x, _y+i, sum, len);
+      xcorr[i]=sum[0];
+      xcorr[i+1]=sum[1];
+      xcorr[i+2]=sum[2];
+      xcorr[i+3]=sum[3];
+#ifdef FIXED_POINT
+      sum[0] = MAX32(sum[0], sum[1]);
+      sum[2] = MAX32(sum[2], sum[3]);
+      sum[0] = MAX32(sum[0], sum[2]);
+      maxcorr = MAX32(maxcorr, sum[0]);
+#endif
+   }
+   /* In case max_pitch isn't a multiple of 4, do non-unrolled version. */
+   for (;i<max_pitch;i++)
+   {
+      opus_val32 sum;
+      sum = celt_inner_prod(_x, _y+i, len);
+      xcorr[i] = sum;
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+#ifdef FIXED_POINT
+   return maxcorr;
+#endif
+#endif
+}
+
+void pitch_search(const opus_val16 *x_lp, opus_val16 *y,
+                  int len, int max_pitch, int *pitch)
+{
+   int i, j;
+   int lag;
+   int best_pitch[2]={0,0};
+#ifdef FIXED_POINT
+   opus_val32 maxcorr;
+   opus_val32 xmax, ymax;
+   int shift=0;
+#endif
+   int offset;
+
+   celt_assert(len>0);
+   celt_assert(max_pitch>0);
+   lag = len+max_pitch;
+
+   opus_val16 x_lp4[len>>2];
+   opus_val16 y_lp4[lag>>2];
+   opus_val32 xcorr[max_pitch>>1];
+
+   /* Downsample by 2 again */
+   for (j=0;j<len>>2;j++)
+      x_lp4[j] = x_lp[2*j];
+   for (j=0;j<lag>>2;j++)
+      y_lp4[j] = y[2*j];
+
+#ifdef FIXED_POINT
+   xmax = celt_maxabs16(x_lp4, len>>2);
+   ymax = celt_maxabs16(y_lp4, lag>>2);
+   shift = celt_ilog2(MAX32(1, MAX32(xmax, ymax)))-11;
+   if (shift>0)
+   {
+      for (j=0;j<len>>2;j++)
+         x_lp4[j] = SHR16(x_lp4[j], shift);
+      for (j=0;j<lag>>2;j++)
+         y_lp4[j] = SHR16(y_lp4[j], shift);
+      /* Use double the shift for a MAC */
+      shift *= 2;
+   } else {
+      shift = 0;
+   }
+#endif
+
+   /* Coarse search with 4x decimation */
+
+#ifdef FIXED_POINT
+   maxcorr =
+#endif
+   celt_pitch_xcorr(x_lp4, y_lp4, xcorr, len>>2, max_pitch>>2);
+
+   find_best_pitch(xcorr, y_lp4, len>>2, max_pitch>>2, best_pitch
+#ifdef FIXED_POINT
+                   , 0, maxcorr
+#endif
+                   );
+
+   /* Finer search with 2x decimation */
+#ifdef FIXED_POINT
+   maxcorr=1;
+#endif
+   for (i=0;i<max_pitch>>1;i++)
+   {
+      opus_val32 sum;
+      xcorr[i] = 0;
+      if (abs(i-2*best_pitch[0])>2 && abs(i-2*best_pitch[1])>2)
+         continue;
+#ifdef FIXED_POINT
+      sum = 0;
+      for (j=0;j<len>>1;j++)
+         sum += SHR32(MULT16_16(x_lp[j],y[i+j]), shift);
+#else
+      sum = celt_inner_prod(x_lp, y+i, len>>1);
+#endif
+      xcorr[i] = MAX32(-1, sum);
+#ifdef FIXED_POINT
+      maxcorr = MAX32(maxcorr, sum);
+#endif
+   }
+   find_best_pitch(xcorr, y, len>>1, max_pitch>>1, best_pitch
+#ifdef FIXED_POINT
+                   , shift+1, maxcorr
+#endif
+                   );
+
+   /* Refine by pseudo-interpolation */
+   if (best_pitch[0]>0 && best_pitch[0]<(max_pitch>>1)-1)
+   {
+      opus_val32 a, b, c;
+      a = xcorr[best_pitch[0]-1];
+      b = xcorr[best_pitch[0]];
+      c = xcorr[best_pitch[0]+1];
+      if ((c-a) > MULT16_32_Q15(QCONST16(.7f,15),b-a))
+         offset = 1;
+      else if ((a-c) > MULT16_32_Q15(QCONST16(.7f,15),b-c))
+         offset = -1;
+      else
+         offset = 0;
+   } else {
+      offset = 0;
+   }
+   *pitch = 2*best_pitch[0]-offset;
+}
+
+#ifdef FIXED_POINT
+static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+{
+   opus_val32 x2y2;
+   int sx, sy, shift;
+   opus_val32 g;
+   opus_val16 den;
+   if (xy == 0 || xx == 0 || yy == 0)
+      return 0;
+   sx = celt_ilog2(xx)-14;
+   sy = celt_ilog2(yy)-14;
+   shift = sx + sy;
+   x2y2 = SHR32(MULT16_16(VSHR32(xx, sx), VSHR32(yy, sy)), 14);
+   if (shift & 1) {
+      if (x2y2 < 32768)
+      {
+         x2y2 <<= 1;
+         shift--;
+      } else {
+         x2y2 >>= 1;
+         shift++;
+      }
+   }
+   den = celt_rsqrt_norm(x2y2);
+   g = MULT16_32_Q15(den, xy);
+   g = VSHR32(g, (shift>>1)-1);
+   return EXTRACT16(MIN32(g, Q15ONE));
+}
+#else
+static opus_val16 compute_pitch_gain(opus_val32 xy, opus_val32 xx, opus_val32 yy)
+{
+   return xy/sqrt(1+xx*yy);
+}
+#endif
+
+static const int second_check[16] = {0, 0, 3, 2, 3, 2, 5, 2, 3, 2, 3, 2, 5, 2, 3, 2};
+opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0_, int prev_period, opus_val16 prev_gain)
+{
+   int k, i, T, T0;
+   opus_val16 g, g0;
+   opus_val16 pg;
+   opus_val32 xy,xx,yy,xy2;
+   opus_val32 xcorr[3];
+   opus_val32 best_xy, best_yy;
+   int offset;
+   int minperiod0;
+
+   minperiod0 = minperiod;
+   maxperiod /= 2;
+   minperiod /= 2;
+   *T0_ /= 2;
+   prev_period /= 2;
+   N /= 2;
+   x += maxperiod;
+   if (*T0_>=maxperiod)
+      *T0_=maxperiod-1;
+
+   T = T0 = *T0_;
+   opus_val32 yy_lookup[maxperiod+1];
+   dual_inner_prod(x, x, x-T0, N, &xx, &xy);
+   yy_lookup[0] = xx;
+   yy=xx;
+   for (i=1;i<=maxperiod;i++)
+   {
+      yy = yy+MULT16_16(x[-i],x[-i])-MULT16_16(x[N-i],x[N-i]);
+      yy_lookup[i] = MAX32(0, yy);
+   }
+   yy = yy_lookup[T0];
+   best_xy = xy;
+   best_yy = yy;
+   g = g0 = compute_pitch_gain(xy, xx, yy);
+   /* Look for any pitch at T/k */
+   for (k=2;k<=15;k++)
+   {
+      int T1, T1b;
+      opus_val16 g1;
+      opus_val16 cont=0;
+      opus_val16 thresh;
+      T1 = (2*T0+k)/(2*k);
+      if (T1 < minperiod)
+         break;
+      /* Look for another strong correlation at T1b */
+      if (k==2)
+      {
+         if (T1+T0>maxperiod)
+            T1b = T0;
+         else
+            T1b = T0+T1;
+      } else
+      {
+         T1b = (2*second_check[k]*T0+k)/(2*k);
+      }
+      dual_inner_prod(x, &x[-T1], &x[-T1b], N, &xy, &xy2);
+      xy = HALF32(xy + xy2);
+      yy = HALF32(yy_lookup[T1] + yy_lookup[T1b]);
+      g1 = compute_pitch_gain(xy, xx, yy);
+      if (abs(T1-prev_period)<=1)
+         cont = prev_gain;
+      else if (abs(T1-prev_period)<=2 && 5*k*k < T0)
+         cont = HALF16(prev_gain);
+      else
+         cont = 0;
+      thresh = MAX16(QCONST16(.3f,15), MULT16_16_Q15(QCONST16(.7f,15),g0)-cont);
+      /* Bias against very high pitch (very short period) to avoid false-positives
+         due to short-term correlation */
+      if (T1<3*minperiod)
+         thresh = MAX16(QCONST16(.4f,15), MULT16_16_Q15(QCONST16(.85f,15),g0)-cont);
+      else if (T1<2*minperiod)
+         thresh = MAX16(QCONST16(.5f,15), MULT16_16_Q15(QCONST16(.9f,15),g0)-cont);
+      if (g1 > thresh)
+      {
+         best_xy = xy;
+         best_yy = yy;
+         T = T1;
+         g = g1;
+      }
+   }
+   best_xy = MAX32(0, best_xy);
+   if (best_yy <= best_xy)
+      pg = Q15ONE;
+   else
+      pg = best_xy/(best_yy+1);
+
+   for (k=0;k<3;k++)
+      xcorr[k] = celt_inner_prod(x, x-(T+k-1), N);
+   if ((xcorr[2]-xcorr[0]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[0]))
+      offset = 1;
+   else if ((xcorr[0]-xcorr[2]) > MULT16_32_Q15(QCONST16(.7f,15),xcorr[1]-xcorr[2]))
+      offset = -1;
+   else
+      offset = 0;
+   if (pg > g)
+      pg = g;
+   *T0_ = 2*T+offset;
+
+   if (*T0_<minperiod0)
+      *T0_=minperiod0;
+   return pg;
+}
diff --git a/third-party/rnnoise/Sources/pitch.h b/third-party/rnnoise/Sources/pitch.h
new file mode 100644
index 0000000000..9bd31b49ee
--- /dev/null
+++ b/third-party/rnnoise/Sources/pitch.h
@@ -0,0 +1,149 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/**
+   @file pitch.h
+   @brief Pitch analysis
+ */
+
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef PITCH_H
+#define PITCH_H
+
+//#include "modes.h"
+//#include "cpu_support.h"
+#include "arch.h"
+
+void pitch_downsample(celt_sig *x[], opus_val16 *x_lp,
+      int len, int C);
+
+void pitch_search(const opus_val16 *x_lp, opus_val16 *y,
+                  int len, int max_pitch, int *pitch);
+
+opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
+      int N, int *T0, int prev_period, opus_val16 prev_gain);
+
+
+/* OPT: This is the kernel you really want to optimize. It gets used a lot
+   by the prefilter and by the PLC. */
+static OPUS_INLINE void xcorr_kernel(const opus_val16 * x, const opus_val16 * y, opus_val32 sum[4], int len)
+{
+   int j;
+   opus_val16 y_0, y_1, y_2, y_3;
+   celt_assert(len>=3);
+   y_3=0; /* gcc doesn't realize that y_3 can't be used uninitialized */
+   y_0=*y++;
+   y_1=*y++;
+   y_2=*y++;
+   for (j=0;j<len-3;j+=4)
+   {
+      opus_val16 tmp;
+      tmp = *x++;
+      y_3=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_0);
+      sum[1] = MAC16_16(sum[1],tmp,y_1);
+      sum[2] = MAC16_16(sum[2],tmp,y_2);
+      sum[3] = MAC16_16(sum[3],tmp,y_3);
+      tmp=*x++;
+      y_0=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_1);
+      sum[1] = MAC16_16(sum[1],tmp,y_2);
+      sum[2] = MAC16_16(sum[2],tmp,y_3);
+      sum[3] = MAC16_16(sum[3],tmp,y_0);
+      tmp=*x++;
+      y_1=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_2);
+      sum[1] = MAC16_16(sum[1],tmp,y_3);
+      sum[2] = MAC16_16(sum[2],tmp,y_0);
+      sum[3] = MAC16_16(sum[3],tmp,y_1);
+      tmp=*x++;
+      y_2=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_3);
+      sum[1] = MAC16_16(sum[1],tmp,y_0);
+      sum[2] = MAC16_16(sum[2],tmp,y_1);
+      sum[3] = MAC16_16(sum[3],tmp,y_2);
+   }
+   if (j++<len)
+   {
+      opus_val16 tmp = *x++;
+      y_3=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_0);
+      sum[1] = MAC16_16(sum[1],tmp,y_1);
+      sum[2] = MAC16_16(sum[2],tmp,y_2);
+      sum[3] = MAC16_16(sum[3],tmp,y_3);
+   }
+   if (j++<len)
+   {
+      opus_val16 tmp=*x++;
+      y_0=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_1);
+      sum[1] = MAC16_16(sum[1],tmp,y_2);
+      sum[2] = MAC16_16(sum[2],tmp,y_3);
+      sum[3] = MAC16_16(sum[3],tmp,y_0);
+   }
+   if (j<len)
+   {
+      opus_val16 tmp=*x++;
+      y_1=*y++;
+      sum[0] = MAC16_16(sum[0],tmp,y_2);
+      sum[1] = MAC16_16(sum[1],tmp,y_3);
+      sum[2] = MAC16_16(sum[2],tmp,y_0);
+      sum[3] = MAC16_16(sum[3],tmp,y_1);
+   }
+}
+
+static OPUS_INLINE void dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02,
+      int N, opus_val32 *xy1, opus_val32 *xy2)
+{
+   int i;
+   opus_val32 xy01=0;
+   opus_val32 xy02=0;
+   for (i=0;i<N;i++)
+   {
+      xy01 = MAC16_16(xy01, x[i], y01[i]);
+      xy02 = MAC16_16(xy02, x[i], y02[i]);
+   }
+   *xy1 = xy01;
+   *xy2 = xy02;
+}
+
+/*We make sure a C version is always available for cases where the overhead of
+  vectorization and passing around an arch flag aren't worth it.*/
+static OPUS_INLINE opus_val32 celt_inner_prod(const opus_val16 *x,
+      const opus_val16 *y, int N)
+{
+   int i;
+   opus_val32 xy=0;
+   for (i=0;i<N;i++)
+      xy = MAC16_16(xy, x[i], y[i]);
+   return xy;
+}
+
+void celt_pitch_xcorr(const opus_val16 *_x, const opus_val16 *_y,
+      opus_val32 *xcorr, int len, int max_pitch);
+
+#endif
diff --git a/third-party/rnnoise/Sources/rnn.c b/third-party/rnnoise/Sources/rnn.c
new file mode 100644
index 0000000000..c54958ebf5
--- /dev/null
+++ b/third-party/rnnoise/Sources/rnn.c
@@ -0,0 +1,178 @@
+/* Copyright (c) 2008-2011 Octasic Inc.
+                 2012-2017 Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <math.h>
+#include "opus_types.h"
+#include "common.h"
+#include "arch.h"
+#include "tansig_table.h"
+#include "rnn.h"
+#include "rnn_data.h"
+#include <stdio.h>
+
+static OPUS_INLINE float tansig_approx(float x)
+{
+    int i;
+    float y, dy;
+    float sign=1;
+    /* Tests are reversed to catch NaNs */
+    if (!(x<8))
+        return 1;
+    if (!(x>-8))
+        return -1;
+#ifndef FIXED_POINT
+    /* Another check in case of -ffast-math */
+    if (celt_isnan(x))
+       return 0;
+#endif
+    if (x<0)
+    {
+       x=-x;
+       sign=-1;
+    }
+    i = (int)floor(.5f+25*x);
+    x -= .04f*i;
+    y = tansig_table[i];
+    dy = 1-y*y;
+    y = y + x*dy*(1 - y*x);
+    return sign*y;
+}
+
+static OPUS_INLINE float sigmoid_approx(float x)
+{
+   return .5 + .5*tansig_approx(.5*x);
+}
+
+static OPUS_INLINE float relu(float x)
+{
+   return x < 0 ? 0 : x;
+}
+
+void compute_dense(const DenseLayer *layer, float *output, const float *input)
+{
+   int i, j;
+   int N, M;
+   int stride;
+   M = layer->nb_inputs;
+   N = layer->nb_neurons;
+   stride = N;
+   for (i=0;i<N;i++)
+   {
+      /* Compute update gate. */
+      float sum = layer->bias[i];
+      for (j=0;j<M;j++)
+         sum += layer->input_weights[j*stride + i]*input[j];
+      output[i] = WEIGHTS_SCALE*sum;
+   }
+   if (layer->activation == ACTIVATION_SIGMOID) {
+      for (i=0;i<N;i++)
+         output[i] = sigmoid_approx(output[i]);
+   } else if (layer->activation == ACTIVATION_TANH) {
+      for (i=0;i<N;i++)
+         output[i] = tansig_approx(output[i]);
+   } else if (layer->activation == ACTIVATION_RELU) {
+      for (i=0;i<N;i++)
+         output[i] = relu(output[i]);
+   } else {
+     *(int*)0=0;
+   }
+}
+
+void compute_gru(const GRULayer *gru, float *state, const float *input)
+{
+   int i, j;
+   int N, M;
+   int stride;
+   float z[MAX_NEURONS];
+   float r[MAX_NEURONS];
+   float h[MAX_NEURONS];
+   M = gru->nb_inputs;
+   N = gru->nb_neurons;
+   stride = 3*N;
+   for (i=0;i<N;i++)
+   {
+      /* Compute update gate. */
+      float sum = gru->bias[i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[j*stride + i]*state[j];
+      z[i] = sigmoid_approx(WEIGHTS_SCALE*sum);
+   }
+   for (i=0;i<N;i++)
+   {
+      /* Compute reset gate. */
+      float sum = gru->bias[N + i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[N + j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[N + j*stride + i]*state[j];
+      r[i] = sigmoid_approx(WEIGHTS_SCALE*sum);
+   }
+   for (i=0;i<N;i++)
+   {
+      /* Compute output. */
+      float sum = gru->bias[2*N + i];
+      for (j=0;j<M;j++)
+         sum += gru->input_weights[2*N + j*stride + i]*input[j];
+      for (j=0;j<N;j++)
+         sum += gru->recurrent_weights[2*N + j*stride + i]*state[j]*r[j];
+      if (gru->activation == ACTIVATION_SIGMOID) sum = sigmoid_approx(WEIGHTS_SCALE*sum);
+      else if (gru->activation == ACTIVATION_TANH) sum = tansig_approx(WEIGHTS_SCALE*sum);
+      else if (gru->activation == ACTIVATION_RELU) sum = relu(WEIGHTS_SCALE*sum);
+      else *(int*)0=0;
+      h[i] = z[i]*state[i] + (1-z[i])*sum;
+   }
+   for (i=0;i<N;i++)
+      state[i] = h[i];
+}
+
+#define INPUT_SIZE 42
+
+void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input) {
+  int i;
+  float dense_out[MAX_NEURONS];
+  float noise_input[MAX_NEURONS*3];
+  float denoise_input[MAX_NEURONS*3];
+  compute_dense(rnn->model->input_dense, dense_out, input);
+  compute_gru(rnn->model->vad_gru, rnn->vad_gru_state, dense_out);
+  compute_dense(rnn->model->vad_output, vad, rnn->vad_gru_state);
+  for (i=0;i<rnn->model->input_dense_size;i++) noise_input[i] = dense_out[i];
+  for (i=0;i<rnn->model->vad_gru_size;i++) noise_input[i+rnn->model->input_dense_size] = rnn->vad_gru_state[i];
+  for (i=0;i<INPUT_SIZE;i++) noise_input[i+rnn->model->input_dense_size+rnn->model->vad_gru_size] = input[i];
+  compute_gru(rnn->model->noise_gru, rnn->noise_gru_state, noise_input);
+
+  for (i=0;i<rnn->model->vad_gru_size;i++) denoise_input[i] = rnn->vad_gru_state[i];
+  for (i=0;i<rnn->model->noise_gru_size;i++) denoise_input[i+rnn->model->vad_gru_size] = rnn->noise_gru_state[i];
+  for (i=0;i<INPUT_SIZE;i++) denoise_input[i+rnn->model->vad_gru_size+rnn->model->noise_gru_size] = input[i];
+  compute_gru(rnn->model->denoise_gru, rnn->denoise_gru_state, denoise_input);
+  compute_dense(rnn->model->denoise_output, gains, rnn->denoise_gru_state);
+}
diff --git a/third-party/rnnoise/Sources/rnn.h b/third-party/rnnoise/Sources/rnn.h
new file mode 100644
index 0000000000..31b962fc6e
--- /dev/null
+++ b/third-party/rnnoise/Sources/rnn.h
@@ -0,0 +1,69 @@
+/* Copyright (c) 2017 Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef RNN_H_
+#define RNN_H_
+
+#include "rnnoise.h"
+
+#include "opus_types.h"
+
+#define WEIGHTS_SCALE (1.f/256)
+
+#define MAX_NEURONS 128
+
+#define ACTIVATION_TANH    0
+#define ACTIVATION_SIGMOID 1
+#define ACTIVATION_RELU    2
+
+typedef signed char rnn_weight;
+
+typedef struct {
+  const rnn_weight *bias;
+  const rnn_weight *input_weights;
+  int nb_inputs;
+  int nb_neurons;
+  int activation;
+} DenseLayer;
+
+typedef struct {
+  const rnn_weight *bias;
+  const rnn_weight *input_weights;
+  const rnn_weight *recurrent_weights;
+  int nb_inputs;
+  int nb_neurons;
+  int activation;
+} GRULayer;
+
+typedef struct RNNState RNNState;
+
+void compute_dense(const DenseLayer *layer, float *output, const float *input);
+
+void compute_gru(const GRULayer *gru, float *state, const float *input);
+
+void compute_rnn(RNNState *rnn, float *gains, float *vad, const float *input);
+
+#endif /* RNN_H_ */
diff --git a/third-party/rnnoise/Sources/rnn_data.c b/third-party/rnnoise/Sources/rnn_data.c
new file mode 100644
index 0000000000..22c53165e4
--- /dev/null
+++ b/third-party/rnnoise/Sources/rnn_data.c
@@ -0,0 +1,11051 @@
+/*This file is automatically generated from a Keras model*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "rnn.h"
+#include "rnn_data.h"
+
+static const rnn_weight input_dense_weights[1008] = {
+   -10, 0, -3, 1, -8, -6, 3, -13,
+   1, 0, -3, -7, -5, -3, 6, -1,
+   -6, 0, -6, -4, -1, -2, 1, 1,
+   -7, 2, 21, 10, -5, -20, 24, 23,
+   37, 8, -2, 33, -6, 22, 13, -2,
+   50, 8, 13, 1, -15, 30, -10, 30,
+   0, 3, 5, 27, 1, 4, -3, 41,
+   56, 35, -2, 49, -13, 11, 13, -2,
+   -47, 5, -16, -60, -15, 77, -17, 26,
+   -3, 14, -21, 19, -5, -19, -13, 0,
+   10, 14, 9, 31, -13, -41, -10, 4,
+   22, 18, -48, -6, -10, 62, -3, -18,
+   -14, 12, 26, -28, 3, 14, 25, -13,
+   -19, 6, 5, 36, -3, -65, -12, 0,
+   31, -7, -9, 101, -4, 26, 16, 17,
+   -12, -12, 14, -36, -3, 5, -15, 21,
+   2, 30, -3, 38, -4, 1, -6, 7,
+   -7, 14, 38, -22, -30, -3, -7, 3,
+   -39, -70, -126, 25, 34, 94, -67, -22,
+   -33, 83, -47, -118, 4, 70, 33, 25,
+   62, -128, -76, -118, -113, 49, -12, -100,
+   -18, -114, -33, 43, 32, 61, 40, -9,
+   -106, 2, 36, -100, -40, -5, 20, -75,
+   61, -51, -9, 126, -27, -52, 5, -24,
+   -21, -126, -114, -12, 15, 106, -2, 73,
+   -125, 50, 13, -120, 35, 35, 4, -61,
+   29, -124, 6, -53, -69, -125, 64, -89,
+   36, -107, -103, -7, 27, 121, 69, 77,
+   -35, 35, 95, -125, -49, 97, -45, -43,
+   -23, 23, -28, -65, -118, 2, 8, -126,
+   27, -97, 92, 5, 55, 82, 17, -57,
+   -115, 37, 8, -106, -46, 41, -2, 21,
+   -44, 8, -73, -58, -39, 34, 89, -95,
+   95, -117, 120, -58, 31, 123, 1, -32,
+   -109, -110, 60, -120, -43, -74, 5, 91,
+   26, 21, 114, 82, -83, -126, 123, 22,
+   -16, -67, 25, -83, 46, 48, -34, -121,
+   -124, -63, -35, -9, 31, 82, 123, 6,
+   -3, 117, 93, -2, -13, -36, 124, -112,
+   -6, -102, -5, -33, -15, 44, -69, -127,
+   -23, -40, -34, -85, 68, 83, -1, 40,
+   8, 84, 118, -58, -55, -102, 123, -55,
+   -14, -123, 44, -63, -14, 21, 35, 16,
+   24, -126, -13, -114, 35, 20, -36, 61,
+   -9, 97, 34, 19, -32, -109, 76, -104,
+   99, -119, 45, -125, -51, -28, -8, -69,
+   -8, 125, -45, -93, 113, 103, -41, -82,
+   52, 7, 126, 0, -40, 104, 55, -58,
+   17, -124, -93, -58, 8, -45, 1, 56,
+   -123, 108, -47, -23, 115, 127, 17, -68,
+   -13, 116, -82, -44, 45, 67, -120, -101,
+   -15, -125, 120, -113, 17, -48, -73, 126,
+   -64, -86, -118, -19, 112, -1, -66, -27,
+   -62, 121, -86, -58, 50, 89, -38, -75,
+   95, -111, 12, -113, 2, -68, 2, -94,
+   -121, 91, -5, 0, 79, 43, -7, -18,
+   79, 35, -38, 47, 1, -45, 83, -50,
+   102, 32, 55, -96, 15, -122, -69, 45,
+   -27, 91, -62, -30, 46, -95, 22, -72,
+   -97, -1, 14, -122, 28, 127, 61, -126,
+   121, 9, 68, -120, 49, -60, 90, 3,
+   43, 68, 54, 34, -10, 28, 21, -24,
+   -54, 22, -113, -12, 82, -2, -17, -9,
+   127, 8, 116, -92, 0, -70, -33, 123,
+   66, 116, -74, -4, 74, -72, -22, -47,
+   1, -83, -60, -124, 1, 122, -57, -43,
+   49, 40, -126, -128, -8, -29, 28, -24,
+   -123, -121, -70, -93, -37, -126, 11, -125,
+   -37, 11, -31, -51, -124, 116, -128, 8,
+   -25, 109, 75, -12, 7, 8, 10, 117,
+   124, -128, -128, 29, -26, 101, 21, -128,
+   87, 8, -39, 23, -128, 127, -127, 74,
+   -55, 74, 112, 127, 4, 55, 44, -92,
+   123, 34, -93, 47, -21, -92, 17, 49,
+   -121, 92, 7, -126, -125, 124, -74, 3,
+   -59, 18, -91, 3, -9, 9, 56, 116,
+   7, -29, 33, 87, -21, -128, -13, 57,
+   74, 9, -29, -61, -97, -21, -95, -12,
+   -114, 16, 82, 125, -7, 10, -24, 9,
+   77, -128, -102, -25, 3, -126, 10, 13,
+   -18, 51, 26, 127, -79, 35, 51, 12,
+   -50, -24, 1, -7, 22, 81, 65, 120,
+   -30, -38, 85, 122, -4, -106, -11, 27,
+   53, 41, 8, -104, -66, -38, -124, 10,
+   12, 76, 117, -109, 9, 11, 2, -18,
+   3, 113, -16, -79, -39, -123, -20, -128,
+   2, 13, -33, -58, 10, 84, -104, 13,
+   64, 109, 1, 54, -12, 28, 24, 63,
+   -126, 118, -82, 46, -12, -15, 14, -43,
+   60, 22, -32, -19, -46, 91, -107, 24,
+   -94, 26, -47, 125, 6, 58, -15, -75,
+   -26, -38, -35, 103, -16, -17, -13, 63,
+   -2, 45, -45, -73, -23, 70, -87, 51,
+   -17, 53, 76, 14, -18, -31, -14, 103,
+   8, 21, -28, -33, -20, -47, 6, 39,
+   40, -30, 7, -76, 55, 31, -20, -21,
+   -59, 1, 25, -11, 17, 5, -13, -39,
+   0, -76, 50, -33, -29, -50, -16, -11,
+   -12, -1, -46, 40, -10, 65, -19, 21,
+   -41, -32, -83, -19, -4, 49, -60, 118,
+   -24, -46, 9, 102, -20, 8, -19, 25,
+   31, -3, -37, 0, 25, 7, 29, 2,
+   -39, 127, -64, -20, 64, 115, -30, 36,
+   100, 35, 122, 127, 127, -127, 127, -127,
+   19, 127, -89, -79, -32, 39, -127, 125,
+   -80, 126, -127, 26, 8, 98, -8, -57,
+   -90, -50, 126, 61, 127, -126, 40, -106,
+   -68, 104, -125, -119, 11, 10, -127, 66,
+   -56, -12, -126, -104, 27, 75, 38, -124,
+   -126, -125, 84, -123, -45, -114, -128, 127,
+   103, -101, -124, 127, -11, -23, -123, 92,
+   -123, 24, 126, 41, -2, -39, -27, -94,
+   40, -112, -48, 127, 58, 14, 38, -75,
+   -64, 73, 117, 100, -119, -11, 6, 32,
+   -126, -14, 35, 121, -10, 54, -60, 89,
+   -3, 69, -25, -20, 43, -86, -34, 24,
+   27, 7, -81, -99, -23, -16, -26, 13,
+   35, -97, 80, -29, -13, -121, -12, -65,
+   -94, 70, -89, -126, -95, 88, 33, 96,
+   29, -90, 69, 114, -78, 65, 90, -47,
+   -47, 89, 1, -12, 3, 8, 30, 5,
+   2, -30, -1, 6, -7, 10, -4, 46,
+   -27, -40, 22, -6, -17, 45, 24, -9,
+   23, -14, -63, -26, -12, -57, 27, 25,
+   55, -76, -47, 21, 34, 33, 26, 17,
+   14, 6, 9, 26, 25, -25, -25, -18
+};
+
+static const rnn_weight input_dense_bias[24] = {
+   38, -6, 127, 127, 127, -43, -127, 78,
+   127, 5, 127, 123, 127, 127, -128, -76,
+   -126, 28, 127, 125, -30, 127, -89, -20
+};
+
+static const DenseLayer input_dense = {
+   input_dense_bias,
+   input_dense_weights,
+   42, 24, ACTIVATION_TANH
+};
+
+static const rnn_weight vad_gru_weights[1728] = {
+   -124, 23, -123, -33, -95, -4, 8, -84,
+   4, 101, -119, 116, -4, 123, 103, -51,
+   29, -124, -114, -49, 31, 9, 75, -128,
+   0, -49, 37, -50, 46, -21, -63, -104,
+   54, 82, 33, 21, 70, 127, -9, -79,
+   -39, -23, -127, 107, 122, -96, -46, -18,
+   -39, 13, -28, -48, 14, 56, -52, 49,
+   -1, -121, 25, -18, -36, -52, -57, -30,
+   54, -124, -26, -47, 10, 39, 12, 2,
+   9, -127, -128, 102, 21, 11, -64, -71,
+   89, -113, -111, 54, 31, 94, 121, -40,
+   30, 40, -109, 73, -9, 108, -92, 2,
+   -127, 116, 127, 127, -122, 95, 127, -37,
+   -127, 28, 89, 10, 24, -104, -62, -67,
+   -14, 38, 14, -71, 22, -41, 20, -50,
+   39, 63, 86, 127, -18, 79, 4, -51,
+   2, 33, 117, -113, -78, 56, -91, 37,
+   34, -45, -44, -22, 21, -16, 56, 30,
+   -84, -79, 38, -74, 127, 9, -25, 2,
+   82, 61, 25, -26, 26, 11, 117, -65,
+   12, -58, 42, -62, -93, 11, 11, 124,
+   -123, 80, -125, 11, -90, 42, 94, 4,
+   -109, -1, 85, -52, 45, -26, -27, 77,
+   -5, 30, 90, 0, 95, -7, 53, 29,
+   -82, 22, -9, 74, 2, -12, -73, 114,
+   97, -64, 122, -77, 43, 91, 86, 126,
+   106, 72, 90, -43, 46, 96, -51, 21,
+   22, 68, 22, 41, 79, 75, -46, -105,
+   23, -116, 127, -123, 102, 57, 85, 10,
+   -29, 34, 125, 126, 124, 81, -15, 54,
+   96, -128, 39, -124, 103, 74, 126, 127,
+   -50, -71, -122, -64, 93, -75, 71, 105,
+   122, 123, 126, 122, -127, 33, -63, -74,
+   124, -71, 33, 41, -56, 19, 6, 65,
+   41, 90, -116, -3, -46, 75, -13, 98,
+   -74, -42, 74, -95, -96, 81, 24, 32,
+   -19, -123, 74, 55, 109, 115, 0, 32,
+   33, 12, -20, 9, 127, 127, -61, 79,
+   -48, -54, -49, 101, -9, 27, -106, 74,
+   119, 77, 87, -126, -24, 127, 124, 31,
+   34, 127, 40, 3, -90, 127, 23, 57,
+   -53, 127, -69, -88, -33, 127, 19, -46,
+   -9, -125, 13, -126, -113, 127, -41, 46,
+   106, -62, 3, -10, 111, 49, -34, -24,
+   -20, -112, 11, 101, -50, -34, 50, 65,
+   -64, -106, 70, -48, 60, 9, -122, -45,
+   15, -112, -26, -4, 1, 39, 23, 58,
+   -45, -80, 127, 82, 58, 30, -94, -119,
+   51, -89, 95, -107, 30, 127, 125, 58,
+   -52, -42, -38, -20, -122, 115, 39, -26,
+   5, 73, 13, -39, 43, -23, -20, -125,
+   23, 35, 53, -61, -66, 72, -20, 33,
+   8, 35, 4, 7, 18, 19, 16, -45,
+   -50, -71, 31, -29, -41, -27, 10, 14,
+   27, 9, -23, 98, 6, -94, 92, 127,
+   -114, 59, -26, -100, -62, -127, -17, -85,
+   -60, 126, -42, -6, 33, -120, -26, -126,
+   -127, -35, -114, -31, 25, -126, -100, -126,
+   -64, -46, -31, 30, 25, -74, -111, -97,
+   -81, -104, -114, -19, -9, -116, -69, 22,
+   30, 59, 8, -51, 16, -97, 18, -4,
+   -89, 80, -50, 3, 36, -67, 56, 69,
+   -26, 107, -10, 58, -28, -4, -57, -72,
+   -111, 0, -75, -119, 14, -75, -49, -66,
+   -49, 8, -121, 22, -54, 121, 30, 54,
+   -26, -126, -123, 56, 5, 48, 21, -127,
+   -11, 23, 25, -82, 6, -25, 119, 78,
+   4, -104, 27, 61, -48, 37, -13, -52,
+   50, -50, 44, -1, -22, -43, -59, -78,
+   -67, -32, -26, 9, -3, 40, 16, 19,
+   3, -9, 20, -6, -37, 28, 39, 17,
+   -19, -10, 1, 6, -59, 74, 47, 3,
+   -119, 0, -128, -107, -25, -22, -69, -23,
+   -111, -42, -93, -120, 90, -85, -54, -118,
+   76, -79, 124, 101, -77, -75, -17, -71,
+   -114, 68, 55, 79, -1, -123, -20, 127,
+   -65, -123, -128, -87, 123, 9, -115, -14,
+   7, -4, 127, -79, -115, 125, -28, 89,
+   -83, 49, 89, 119, -69, -5, 12, -49,
+   60, 57, -24, -99, -110, 76, -83, 125,
+   73, 81, 11, 8, -45, 1, 83, 13,
+   -70, -2, 97, 112, -97, 53, -9, -94,
+   124, 44, -49, -24, 52, 76, -110, -70,
+   -114, -12, 72, -4, -114, 43, -43, 81,
+   102, -84, -27, 62, -40, 52, 58, 124,
+   -35, -51, -123, -43, 56, -75, -34, -35,
+   -106, 93, -43, 14, -16, 46, 62, -97,
+   21, 30, -53, 21, -11, -33, -20, -95,
+   4, -126, 12, 45, 20, 108, 85, 11,
+   20, -40, 99, 4, -25, -18, -23, -12,
+   -126, -55, -20, -44, -51, 91, -127, 127,
+   -44, 7, 127, 78, 38, 125, -6, -94,
+   -103, 73, 126, -126, 18, 59, -46, 106,
+   76, 116, -31, 75, -4, 92, 102, 32,
+   -31, 73, 42, -21, -28, 57, 127, -8,
+   -107, 115, 124, -94, -4, -128, 29, -57,
+   70, -82, 50, -13, -44, 38, 67, -93,
+   6, -39, -46, 56, 68, 27, 61, 26,
+   18, -72, 127, 22, 18, -31, 127, 61,
+   -65, -38, 1, -67, -1, 8, -73, 46,
+   -116, -94, 58, -49, 71, -40, -63, -82,
+   -20, -60, 93, 76, 69, -106, 34, -31,
+   4, -25, 107, -18, 45, 4, -61, 126,
+   54, -126, -125, 41, 19, 44, 32, -98,
+   125, -24, 125, -96, -125, 15, 87, -4,
+   -90, 18, -40, 28, -69, 67, 22, 41,
+   39, 7, -48, -44, 12, 69, -13, 2,
+   44, -38, 111, -7, -126, -22, -9, 74,
+   -128, -36, -7, -123, -15, -79, -91, -37,
+   -127, -122, 104, 30, 7, 98, -37, 111,
+   -116, -47, 127, -45, 118, -111, -123, -120,
+   -77, -64, -125, 124, 77, 111, 77, 18,
+   -113, 117, -9, 67, -77, 126, 49, -20,
+   -124, 39, 41, -124, -34, 114, -87, -126,
+   98, -20, 59, -17, -24, 125, 107, 54,
+   35, 33, -44, 12, -29, 125, -71, -28,
+   -63, -114, 28, -17, 121, -36, 127, 89,
+   -122, -49, -18, -48, 17, 24, 19, -64,
+   -128, 13, 86, 45, 13, -49, 55, 84,
+   48, 80, -39, 99, -127, 70, -33, 30,
+   50, 126, -65, -117, -13, -20, -24, 127,
+   115, -72, -104, 63, 126, -42, 57, 17,
+   46, 21, 119, 110, -100, -60, -112, 62,
+   -33, 28, 26, -22, -60, -33, -54, 78,
+   25, 32, -114, 86, 44, 26, 43, 76,
+   121, 19, 97, -2, -3, -73, -68, 6,
+   -116, 6, -43, -97, 46, -128, -120, -31,
+   -119, -29, 16, 16, -126, -128, -126, -46,
+   -9, -3, 92, -31, -76, -126, -3, -107,
+   -12, -23, -69, 5, 51, 27, -42, 23,
+   -70, -128, -29, 22, 29, -126, -55, 50,
+   -71, -3, 127, 44, -27, -70, -63, -66,
+   -70, 104, 86, 115, 29, -92, 41, -90,
+   44, -11, -28, 20, -11, -63, -16, 43,
+   31, 17, -73, -31, -1, -17, -11, -39,
+   56, 18, 124, 72, -14, 28, 69, -121,
+   -125, 34, 127, 63, 86, -80, -126, -125,
+   -124, -47, 124, 77, 124, -19, 23, -7,
+   -50, 96, -128, -93, 102, -53, -36, -87,
+   119, -125, 92, -126, 118, 102, 72, -2,
+   125, 10, 97, 124, -125, 125, 71, -20,
+   -47, -116, -121, -4, -9, -32, 79, -124,
+   -36, 33, -128, -74, 125, 23, 127, -29,
+   -115, -32, 124, -89, 32, -107, 43, -17,
+   24, 24, 18, 29, -13, -15, -36, 62,
+   -91, 4, -41, 95, 28, -23, 6, 46,
+   84, 66, 77, 68, -70, -1, -23, -6,
+   65, 70, -21, 9, 77, -12, 2, -118,
+   4, 9, -108, 84, 52, 2, 52, 13,
+   -10, 58, -110, 18, 66, -95, -23, 70,
+   31, -3, 56, 56, -3, -7, 1, -27,
+   -48, -61, 41, -4, 10, -62, 32, -7,
+   -24, 9, -48, -60, -4, 79, -20, -38,
+   -76, 68, -49, -97, 0, -15, 5, -100,
+   -49, -95, -99, -115, -9, -40, 10, 104,
+   13, 56, 127, -27, -109, -94, -118, -102,
+   -44, -85, 52, 127, -4, 14, 62, 121,
+   -122, -26, -79, -42, -34, 1, 25, -38,
+   -79, -58, -31, -31, -90, -30, -123, 32,
+   -56, 125, 66, 124, -1, 3, 91, -103,
+   -7, 23, 78, -18, 9, 69, -69, 76,
+   -38, -33, -2, -98, 18, 106, 84, 55,
+   87, -47, 35, -124, 64, 41, -14, 46,
+   25, -2, 120, -21, 82, 19, -79, -37,
+   -3, -8, -16, 21, 19, -5, -28, -112,
+   39, -6, -30, 53, -69, 53, 46, 127,
+   123, 78, 20, 28, -7, 73, 72, 17,
+   -40, 41, 111, 57, 32, -95, 29, 28,
+   -39, -65, 54, -20, -63, 29, -67, 3,
+   44, -57, -47, 11, 61, -22, -44, 61,
+   48, -100, 20, 125, 96, -24, -16, 3,
+   -69, -126, 74, -125, 9, 45, -67, -123,
+   -59, -72, 118, 69, 45, 50, -57, 67,
+   13, -66, -106, 47, 62, 22, -1, -22,
+   -25, -40, -125, 3, 125, 32, 102, -56,
+   -25, -75, -30, 122, 60, -13, 36, -73,
+   7, -84, 124, 40, -118, 17, -87, -118,
+   -8, 3, -27, 111, -40, 40, -51, 127,
+   125, -45, -30, -54, 46, 80, -1, -30,
+   101, -17, 18, 26, 54, 7, -12, 1,
+   -127, 123, -122, -27, -75, 64, 10, 25,
+   -15, -44, 127, -127, 5, -84, -81, -7,
+   19, -26, 126, 15, 116, -126, 14, -76,
+   44, 62, -110, -124, 125, -29, -87, -3,
+   -69, 82, 90, 57, -123, 123, 100, -19,
+   -51, -32, 69, 37, -57, -128, -124, -72,
+   -13, 51, -7, -45, -73, 5, 99, -26,
+   -117, -96, -109, 4, -31, -12, 0, 31,
+   -42, -27, 12, -81, 118, 39, 83, 14,
+   41, -126, 107, -82, 94, -116, -122, -47,
+   -109, -84, -128, -35, -56, 66, 8, -65,
+   19, 42, -46, -72, -109, 41, 43, -127,
+   -113, 58, 127, 42, -75, -1, 65, 117,
+   -55, -113, -123, 124, 43, -96, -115, -19,
+   68, 15, 94, 3, 75, 0, 34, 9,
+   42, 110, -48, 92, -76, 99, -17, 27,
+   32, 13, 125, 50, -17, 56, 4, 53,
+   34, -8, 99, 80, -126, -21, -65, -11,
+   -46, 44, -81, -3, -121, 123, 66, -81,
+   -84, 119, 127, 84, 105, 45, -66, -42,
+   -23, 32, -25, 12, 111, 127, 88, 125,
+   30, 24, -127, -9, -54, 127, -116, -119,
+   88, 70, 94, -120, 35, -93, 15, 22,
+   -21, 25, -110, -123, -45, 8, -109, 125,
+   -122, -86, -126, 8, -14, -120, -45, -45,
+   69, -125, -122, 6, 81, 86, 125, 95,
+   54, 77, 54, -123, 126, -85, -117, 56,
+   11, 0, -61, -91, -12, -2, -113, -3,
+   -15, -122, -63, -91, 10, 84, -111, 125,
+   93, 21, 62, -78, -116, 13, -57, 28,
+   -124, 126, 110, 12, 15, 95, 15, -19,
+   -125, -97, 52, -7, 101, 9, 20, -125,
+   -26, -56, 72, 77, 12, -126, 22, -29,
+   47, 62, 95, 112, 69, 32, 97, -83,
+   -8, -5, 67, -63, -123, 79, 59, 0,
+   -6, -17, 4, -111, -52, 27, 65, 0
+};
+
+static const rnn_weight vad_gru_recurrent_weights[1728] = {
+   65, 83, 35, 56, 24, -34, -28, -2,
+   125, 19, 42, -9, 124, -53, 24, -87,
+   11, 35, -81, -35, -125, -31, 123, -21,
+   33, -91, 113, -93, 45, -6, 53, 38,
+   -92, 8, -27, 87, 4, 43, 43, 10,
+   -128, -128, -46, 127, -38, -45, 25, -87,
+   19, 5, 52, -96, -23, -29, 121, -126,
+   -24, -20, -2, 69, -50, 6, 71, -81,
+   -125, 90, -94, 1, -38, 36, 89, 17,
+   -60, 71, -48, 18, -15, 44, -18, 59,
+   11, 114, -51, 32, 110, 1, 4, 109,
+   -24, 127, 27, 60, 88, 24, 45, -59,
+   75, -36, 8, 57, -32, -25, 13, 126,
+   -89, -61, -76, 127, 18, -62, -68, 23,
+   -113, 5, 126, 43, -88, 26, -78, 18,
+   75, 21, 9, -74, 20, 41, 126, -118,
+   -15, 9, 116, 126, -127, 34, -6, 126,
+   -128, -53, -54, -55, -121, 70, 127, -12,
+   -68, 82, -25, 104, -126, 126, -21, -26,
+   124, -75, -127, -120, 13, 61, -64, -108,
+   -63, -65, -44, -35, -61, -39, 109, -74,
+   113, -3, 108, -30, 125, 120, 39, 125,
+   -128, -95, -99, 111, 9, 25, 114, -75,
+   -92, -54, -12, -32, -38, 10, 31, 10,
+   63, 51, 40, -99, 74, 4, 50, -128,
+   -36, -35, -11, -28, -126, -7, 66, -58,
+   -126, -22, -83, -61, -127, 49, 126, -8,
+   7, 62, 36, -11, -32, -44, 63, 116,
+   41, 65, -127, 126, 63, -30, -96, 74,
+   -92, 127, 38, -18, -128, 68, -5, 101,
+   -4, 85, 58, 79, 0, -58, 8, 119,
+   -70, -1, -79, -68, 114, -28, -90, -6,
+   -112, 2, 127, -8, 10, 55, -59, -126,
+   127, 125, 80, 72, 35, -54, 95, -124,
+   -124, 79, 23, -46, -61, -127, -100, 99,
+   -77, 8, -87, 5, -2, 49, 85, 7,
+   -71, 82, 53, -41, 22, -22, -93, -103,
+   6, 52, -56, 14, -8, -111, 85, 16,
+   54, 32, -118, -24, 61, -53, 96, -70,
+   -5, -17, -67, -84, -7, -82, -107, -96,
+   21, -83, -58, 50, 12, -126, -1, -28,
+   34, -126, 115, 17, 91, 1, -127, 72,
+   11, 126, -81, 6, 96, -8, 77, 15,
+   -6, 63, -27, 20, -123, -109, 85, -79,
+   -17, 126, -92, 2, -61, 20, 14, 17,
+   121, 123, 30, 57, 120, 127, 57, 42,
+   117, 98, 67, 39, -20, -70, 100, 7,
+   125, 122, 40, 16, -79, 125, 83, 41,
+   -106, -57, 24, 55, 27, -66, -111, -44,
+   -7, -43, -66, 121, 42, -128, -45, 35,
+   15, -127, 34, -35, -34, -40, -18, -6,
+   63, 111, 31, 116, 127, 19, 24, -71,
+   -39, 34, 11, 19, -40, 27, 12, 106,
+   -10, 56, -82, -106, -2, -50, -52, 114,
+   -126, -34, -43, -68, 10, 76, 57, -118,
+   -128, 37, -104, 76, 125, 3, -76, 127,
+   -29, 84, -94, -15, 55, 125, 79, 127,
+   -57, -125, 104, -68, 126, 126, -77, 51,
+   45, 33, -109, 115, -11, 1, 95, -121,
+   -5, -9, -126, -114, 39, 68, -126, -107,
+   -51, -42, 24, -8, 51, -27, -43, 66,
+   -45, 62, -98, -109, 69, 67, 0, -125,
+   -128, 49, 31, 126, -122, 2, -55, -67,
+   -126, -70, -128, -125, -77, 25, 16, -8,
+   -102, 11, -75, 82, 38, -5, 5, 19,
+   34, 47, -127, -93, 21, 24, -97, -18,
+   31, 39, 34, -20, 22, 123, 7, -77,
+   -81, -46, -9, 1, 23, 39, -127, -43,
+   -8, -50, 10, -21, 59, -9, -4, -13,
+   -27, 44, 127, 52, -47, 70, -43, 52,
+   101, -49, 27, 45, 49, 33, -125, 55,
+   114, 20, -1, 76, -24, -96, 105, 24,
+   126, 75, -21, -105, 13, -42, 40, 126,
+   -30, -39, -95, 125, -63, 11, 6, 125,
+   125, -14, 5, 42, -61, -4, 49, 88,
+   6, -107, -28, 19, -29, 47, 126, 6,
+   -46, -89, -18, 91, -20, -6, 118, -21,
+   -22, 39, 115, 11, -42, 54, 73, -55,
+   -77, 62, -27, -59, -99, -12, -127, -40,
+   56, -3, -124, -91, 71, -111, 6, -19,
+   82, -24, -35, 102, -42, 7, -126, -126,
+   -125, 18, 98, -52, 127, 105, -52, 40,
+   -83, 126, -122, 109, 5, 127, 48, 6,
+   5, -125, 100, -16, 29, 85, -89, 8,
+   4, 41, 62, -127, 62, 122, 85, 122,
+   -107, 8, -125, 93, -127, 127, 102, 19,
+   19, -66, 41, -42, 114, 127, -48, -117,
+   -29, -6, -73, -102, -3, -19, 0, 88,
+   42, 87, -117, -20, 2, 122, 28, 63,
+   71, 66, 120, 93, 124, -43, 49, 103,
+   31, 90, -91, -22, -126, 26, -24, -21,
+   51, -126, 87, -103, -69, -10, -66, -23,
+   20, 97, 36, 25, -127, 30, -20, -63,
+   30, 51, -116, 23, 40, -39, 36, -83,
+   -77, -25, -50, 110, 14, 13, -109, 125,
+   -65, -55, -87, 124, -126, -32, -72, -108,
+   127, 127, -125, -124, 61, 121, 102, -128,
+   -127, 16, 100, 127, -124, -68, 72, -93,
+   -128, 43, -93, -19, -125, -97, -113, -33,
+   83, 127, -44, 127, -75, 127, 16, 44,
+   50, -122, 23, 118, 46, 19, 26, -128,
+   10, 4, 99, -14, -82, -13, 30, 125,
+   57, 65, 60, -71, 35, 98, 28, 7,
+   1, 43, 89, 70, 75, 121, -59, 82,
+   -126, -53, -16, -116, -65, 52, -52, 0,
+   80, 35, 45, -61, 46, 8, 107, 27,
+   -26, -118, 90, 57, -10, 7, -15, 0,
+   -39, -4, 12, 29, -1, 116, 84, 79,
+   119, 125, -59, 28, -6, -25, -43, 2,
+   90, 79, 67, 103, -82, 2, -6, 125,
+   19, 73, 0, -105, 112, -17, 104, 107,
+   124, 106, 19, 56, -44, 55, -112, 6,
+   -39, -83, 126, -93, -98, 57, -120, -23,
+   -38, 2, -31, -48, 106, 127, 127, 69,
+   16, 110, 71, 104, 62, -12, -22, 42,
+   -37, -94, 34, -1, -32, -12, -124, -47,
+   -13, 60, -75, -66, 58, -127, -2, 64,
+   76, -106, 73, -49, -31, 127, 126, 31,
+   16, 127, -110, 107, -16, -53, 20, 69,
+   -14, -125, 59, -44, 15, 120, 125, 125,
+   43, 6, 19, -58, 127, 127, 43, 16,
+   82, 97, -127, 127, -93, -41, 88, 0,
+   77, -15, 116, 16, -124, -31, -3, 95,
+   -40, -126, -54, -126, -83, -8, -59, 6,
+   67, -29, 4, 124, -10, 112, -28, -8,
+   85, -21, 45, 84, 6, -8, 11, 72,
+   32, 84, -62, 77, 2, -36, 75, 31,
+   -50, 116, 126, 119, -88, -55, -14, -37,
+   126, 40, -108, -6, -6, 57, 64, -28,
+   -76, 30, -117, -93, 31, -92, -44, -64,
+   94, 58, 65, 114, 41, 47, 71, 42,
+   -26, 99, -126, 57, -5, 74, -19, -113,
+   -1, 67, -21, 126, 1, -3, 33, 60,
+   -82, 37, -48, 89, 114, -38, 127, -114,
+   35, 58, -5, 21, -46, 121, -123, -43,
+   127, 115, 123, 122, -101, 126, 127, 81,
+   52, 89, -127, 102, 42, 117, -9, -2,
+   125, 127, 110, 96, 120, 66, 70, 124,
+   55, 84, -38, -58, 119, -127, -16, -79,
+   123, 18, -127, -50, -38, 120, -85, 1,
+   7, -56, 108, -77, -2, 21, 37, 1,
+   13, -105, -69, 28, -87, 33, -104, -51,
+   126, 41, 3, -121, 28, 71, 58, 86,
+   -8, 127, 94, -55, 125, 40, -19, 127,
+   -33, -87, -23, 7, -111, -68, 9, 84,
+   -119, 55, -82, 78, -37, -20, -9, -23,
+   53, -13, 15, -46, 116, 126, -127, 56,
+   -126, 125, -7, -1, 45, 26, 125, 121,
+   29, 47, -86, 30, 10, 76, -125, -7,
+   23, 92, -12, -39, -18, 92, -97, -8,
+   -85, -41, 49, -50, 123, -37, -126, -30,
+   14, 79, -49, -65, 9, -36, -38, -96,
+   85, -24, -13, 37, -25, -5, -64, -127,
+   55, -60, -18, -61, -63, 127, 56, 67,
+   15, 124, 72, 120, 127, 40, -10, 114,
+   24, -23, 46, 78, -53, 125, 86, 124,
+   86, 0, 38, 93, 21, 127, 123, 75,
+   -72, 13, 48, 33, 83, -51, 15, -32,
+   -49, -33, 120, 64, 7, 9, 65, 60,
+   21, -21, -61, -53, -113, 84, -97, 101,
+   37, -114, -27, 41, 73, 126, -10, 59,
+   61, -15, 70, -13, 82, -4, 69, 56,
+   94, -91, -50, 92, -74, -48, 53, -7,
+   -107, 127, 28, 30, -26, -21, -61, 77,
+   82, 64, -91, -125, 122, -104, 127, 123,
+   122, 123, 76, -126, 127, -6, -80, 7,
+   40, -66, -65, 54, -2, 23, 96, -64,
+   74, 2, -53, -12, -123, 39, 60, -20,
+   16, -17, -97, 23, -4, -53, -122, 32,
+   -16, -54, -95, 43, 71, -1, -67, -33,
+   41, 18, 72, 28, -83, 31, -100, -91,
+   -27, 10, -128, -106, 2, 76, -13, 42,
+   34, 112, -19, 44, 40, -9, -11, 65,
+   92, -43, -125, 2, 47, -32, 25, 122,
+   -29, 12, 101, -8, -126, -23, 43, 7,
+   125, -20, -124, 82, -2, 13, -73, -106,
+   115, 31, 116, -23, -44, -71, 84, 3,
+   47, 91, 127, 127, -15, 95, 7, 93,
+   5, 113, -50, 54, 11, 13, -127, 17,
+   72, 43, -23, 5, -70, 20, 15, -27,
+   99, 69, -109, -122, -94, 16, 127, 0,
+   116, 104, 45, 108, -34, 87, 72, -14,
+   118, 46, 42, 109, -26, 95, 93, 127,
+   60, 127, -93, -54, -122, 34, -105, 56,
+   55, 103, 125, -71, -50, 95, -72, 127,
+   107, 21, 73, 126, 61, 127, 127, 24,
+   -62, 90, 73, 90, -46, -78, -124, 72,
+   123, -42, 50, -107, 17, -32, -62, -89,
+   124, 1, 80, -2, 117, 119, -65, -127,
+   -95, -121, -52, 103, 66, 75, -3, -62,
+   -127, 127, -74, 124, 79, 49, 40, 105,
+   -67, -71, -70, 43, 127, 119, -4, 66,
+   43, 23, 91, -126, 15, 63, -119, 112,
+   103, 15, -99, 31, -127, 69, 116, -46,
+   -67, 2, -126, -29, 30, 30, -69, -98,
+   -47, -87, -70, -127, 23, -73, 30, -7,
+   94, -52, -65, 98, -45, 97, 53, 23,
+   -9, -22, -52, -47, 6, -1, -85, -15,
+   -61, -14, 68, 110, -10, -121, -25, -35,
+   -15, -94, -123, 27, 75, 48, -66, -56,
+   -44, 93, 109, 67, -36, 24, 70, -126,
+   8, -127, 126, 52, 11, -32, 120, -13,
+   -26, -28, -125, 127, 106, -50, 124, 36,
+   -126, -12, 0, -23, 76, -71, -126, -12,
+   -17, -82, 12, 124, 57, 33, 4, 77,
+   -46, 71, -34, 72, 125, -128, 124, -24,
+   -128, 75, -120, 69, -45, 55, 33, 127,
+   -33, 4, -105, -41, -59, -91, 123, 44,
+   -127, 127, -67, 52, 25, -125, -65, 100,
+   -25, 123, 6, 11, -123, -92, -33, 126,
+   -17, -4, 29, 33, 127, 96, 3, 87,
+   -48, -18, -70, 123, 58, -127, -3, -52,
+   -1, -36, -41, 127, 51, -52, -27, 46,
+   -83, 57, 9, 126, 127, 94, 79, -37,
+   -127, -40, 67, 52, 82, -66, 122, -13,
+   -73, 127, -8, -80, 46, -48, 4, -54
+};
+
+static const rnn_weight vad_gru_bias[72] = {
+   124, 125, -57, -126, 53, 123, 127, -75,
+   68, 102, -2, 116, 124, 127, 124, 125,
+   126, 123, -16, 48, 125, 126, 78, 85,
+   11, 126, -30, -30, -64, -3, -105, -29,
+   -17, 69, 63, 2, -32, -10, -62, 113,
+   -52, 112, -109, 112, 7, -40, 73, 53,
+   62, 6, -2, 0, 0, 100, -16, 26,
+   -24, 56, 26, -10, -33, 41, 70, 109,
+   -29, 127, 34, -66, 49, 53, 27, 62
+};
+
+static const GRULayer vad_gru = {
+   vad_gru_bias,
+   vad_gru_weights,
+   vad_gru_recurrent_weights,
+   24, 24, ACTIVATION_RELU
+};
+
+static const rnn_weight noise_gru_weights[12960] = {
+   -10, -8, 5, -72, 7, 55, -38, 3,
+   10, 4, 21, 60, 73, 0, -3, 34,
+   49, -36, 17, 8, 18, 41, -51, -42,
+   34, -8, 126, 15, 112, 74, -60, -60,
+   53, -17, 65, 6, 74, -1, 26, 80,
+   -46, -99, -47, 40, 29, -21, 85, -75,
+   27, -117, 46, -22, -76, 56, 16, -67,
+   -49, -63, -35, -10, -20, 10, 68, 7,
+   -1, 37, 58, -53, 6, -79, -20, 12,
+   6, 91, -63, 67, 58, -13, -23, -74,
+   -50, -77, -53, -22, -56, 123, -33, 28,
+   74, -85, -9, -57, -32, 38, 21, 122,
+   40, 23, -30, -81, -68, -29, -14, -98,
+   -1, -62, -32, 19, 102, 26, 28, -23,
+   104, 28, -43, -20, -41, 28, 80, -22,
+   -88, 6, -26, 14, 34, -46, 57, -33,
+   -105, -16, 3, -17, -55, -1, -47, -122,
+   11, 16, 62, 78, -1, -64, 71, 57,
+   -5, 45, 65, -93, 31, 30, -25, 21,
+   23, 32, -1, -75, -10, 75, -90, 21,
+   7, -110, -77, -39, 18, -39, 54, -97,
+   12, 52, -97, 17, 73, 120, -81, -114,
+   67, 82, 29, -71, -47, 69, -64, 17,
+   -105, -24, -70, -32, -2, -112, -31, -48,
+   1, 22, 92, -21, -89, -65, 16, 49,
+   3, 15, 80, -21, -1, 37, -4, -25,
+   12, -80, -43, 56, -7, 36, -20, 18,
+   -12, 39, 66, 74, -100, 117, 76, -82,
+   -93, 63, 56, 36, 5, 41, -57, 31,
+   -47, -14, 52, -22, -56, 29, -123, -104,
+   41, -113, 124, -106, -36, 41, -86, -40,
+   44, 28, -6, 114, -32, -17, -26, -77,
+   -69, 42, -33, 61, 28, 82, -18, 71,
+   -53, -63, 122, -38, -49, -108, -32, 126,
+   126, 45, 43, -56, 61, 9, -20, -53,
+   122, 98, -3, 3, 24, -3, 80, -42,
+   -20, 57, -34, 108, -26, 48, 116, -14,
+   53, 5, -45, 21, -55, 114, -49, -29,
+   -44, -5, -70, 98, 63, -115, -66, 53,
+   -55, -19, 83, -12, 7, 47, 42, 15,
+   -36, 44, 75, -85, 105, -84, -17, -127,
+   15, -67, -105, 23, 36, -1, -16, -116,
+   21, 58, 69, -57, -104, -81, -49, 91,
+   26, -72, 33, -31, -37, -79, 5, 9,
+   123, -61, 11, 67, -14, -29, 41, -53,
+   37, -59, -20, -24, 95, 125, -66, -26,
+   17, 28, -43, -8, -100, 80, -6, 0,
+   37, -123, -54, -92, 28, 56, 127, 48,
+   11, -58, 99, -90, 63, -4, 6, 10,
+   37, -38, -15, 31, 5, -39, 25, -17,
+   24, -23, -64, -68, 41, 65, 28, -113,
+   -115, -27, -51, 50, 9, -101, 73, -41,
+   -104, 88, -71, 3, -87, 119, -73, 20,
+   -35, 0, -30, 34, -31, -9, -4, 23,
+   -19, 35, -16, 111, 66, -52, -107, 101,
+   54, -2, -3, 109, -40, -2, 119, 74,
+   -26, -116, -105, -90, 25, -111, -43, -92,
+   -3, -104, 102, 11, 19, -83, 14, -62,
+   38, 57, 50, -10, 36, -95, 124, 32,
+   -34, -123, -7, -109, 124, -119, -67, -116,
+   -31, 114, -65, -34, -126, 8, 8, 5,
+   53, -28, 53, 84, -9, -14, 92, -70,
+   74, 116, -4, 121, -49, 108, 0, 126,
+   123, -1, -25, 24, 56, -121, 20, -47,
+   -41, -11, -22, -32, -40, -41, -66, 29,
+   -128, -30, -28, 31, -39, 30, 57, -96,
+   63, -121, 71, 1, -29, -20, 72, 114,
+   12, -43, 23, -75, 24, -4, -123, 17,
+   18, -68, -23, 51, -30, 39, -125, -48,
+   13, -119, -75, -74, 51, 125, -10, 29,
+   -103, 6, -28, 22, -45, 19, 17, 19,
+   33, -3, -18, -30, -12, -25, -128, 61,
+   94, 47, -56, 59, -62, 66, -28, 18,
+   -115, 12, -3, -80, 60, -62, 55, -16,
+   68, 23, -6, 109, 11, 0, -7, -96,
+   -11, 21, 44, -75, -8, -10, -10, 69,
+   14, 14, -41, 26, 67, 37, -30, 44,
+   11, -16, 3, 66, 1, -18, 21, 96,
+   -29, -100, 27, -8, -98, 21, -2, 58,
+   -45, -15, 93, 37, -66, -48, -7, -5,
+   39, -57, 17, -81, 42, 0, -40, 123,
+   3, 118, -14, 56, -113, -68, -127, 74,
+   -78, 46, 97, -61, -42, 68, -32, 16,
+   -10, -82, -6, 1, 98, -48, 20, 32,
+   -102, -35, 45, -5, -91, 26, 37, 18,
+   59, -88, -29, 17, 43, 33, 14, 6,
+   -37, -37, 5, -7, -37, -13, 72, -6,
+   -128, -43, 17, 32, 45, -26, 4, -85,
+   -59, 8, 5, -27, 51, 55, 42, -79,
+   -13, -51, 49, 70, -26, -21, 9, 27,
+   21, -26, -76, 28, 1, 89, -76, 23,
+   -4, 10, 31, -13, -22, 3, 41, 24,
+   18, 25, -55, 10, -23, 4, -72, -18,
+   -91, -50, 1, -55, 12, -26, -43, 11,
+   -14, 27, -82, -73, 36, 27, -20, 62,
+   53, 100, 75, -12, -37, -77, -127, 32,
+   -21, -24, 34, -26, -39, -5, -66, 94,
+   -97, 19, 16, 61, 59, 65, 37, -64,
+   26, -34, 63, 74, 7, 38, -2, -27,
+   82, -73, -10, 37, -43, 1, 23, 24,
+   25, -5, 13, 6, -76, 78, 46, 44,
+   -107, 14, 7, -22, 28, -125, 47, -48,
+   28, -16, 15, 1, -16, 21, 15, 51,
+   37, -17, 2, 39, -23, -28, 10, -51,
+   -48, -1, 6, 88, 38, 22, -40, 37,
+   -22, -23, 67, -4, -3, -6, 9, 108,
+   -32, 31, 77, 28, -101, -23, -10, -38,
+   -13, 12, -34, 55, 24, -4, 48, 29,
+   -72, -83, 41, -31, -49, -68, 5, -3,
+   124, -19, 44, -94, -4, -8, -31, 9,
+   -21, 58, -60, 24, 13, -9, 97, 53,
+   93, -51, 105, 55, 36, -32, 6, -51,
+   -99, 19, 39, -63, -64, 29, 22, 5,
+   -24, -74, 72, -6, 35, 37, -25, 65,
+   74, 29, 30, 65, 91, 30, -42, 15,
+   42, -64, -87, -68, 53, -78, -33, 21,
+   -60, 33, 7, 6, 10, 68, 55, -47,
+   51, -56, 79, -29, -1, -66, -29, 50,
+   66, -12, -67, 69, -53, -90, -31, -123,
+   49, 7, 10, -6, 55, -61, -14, -6,
+   59, -2, -41, 21, 10, -21, -24, -23,
+   -34, 30, -49, -41, -27, 36, -56, 46,
+   7, 18, -23, 78, -49, 1, -37, 43,
+   77, -21, -19, 18, 14, 35, 92, 39,
+   -39, 44, -58, -1, 4, -63, 27, 79,
+   -14, -7, -41, -34, -24, -25, 13, -14,
+   -30, 5, -62, 13, -52, 53, 40, -18,
+   -29, 52, -20, 11, 20, 23, -47, 51,
+   30, -91, -46, 39, 4, 53, -18, 2,
+   -28, -12, 62, -29, -57, -13, -20, 60,
+   -15, 3, 49, -26, 0, -30, -18, 97,
+   11, 52, 43, 87, 107, -94, -30, 63,
+   -4, -62, 48, 2, 22, 7, -11, -79,
+   -41, 18, -28, 9, 30, -58, 80, -64,
+   45, 2, 28, -49, -25, -34, 25, 87,
+   108, -8, -42, -34, 61, -14, -13, 62,
+   -98, -5, 23, 15, -2, -1, -6, -52,
+   40, -33, 61, -38, 76, -115, -23, 22,
+   17, 25, 63, -37, -32, 26, -19, -8,
+   54, 6, -39, -28, 25, 40, -29, 33,
+   10, -50, 20, 25, 6, -22, 69, -24,
+   -115, 2, -13, -28, 28, -8, 109, -18,
+   -64, 96, 6, 7, 31, -10, 7, -34,
+   24, -10, 50, 23, -59, -55, 45, 37,
+   -98, 27, -17, -47, 63, 57, 13, 35,
+   4, -85, -65, 52, -54, -19, -40, 4,
+   -68, -61, -85, 98, -81, 44, 25, -17,
+   44, -33, -31, -44, 21, -6, -29, -32,
+   -2, 50, -31, -16, 46, 50, -54, -18,
+   70, -88, -44, 26, -51, -34, 21, 48,
+   -16, -15, 5, -28, -37, 25, -52, 25,
+   37, -60, 19, -18, -49, 72, -120, -1,
+   65, -61, -28, 25, -114, 89, -61, 126,
+   -48, -64, 69, 37, 46, 9, 18, -117,
+   -35, 64, -75, 28, 127, 33, -63, 22,
+   -15, -28, -9, -41, 27, 68, -4, 54,
+   4, -89, -8, -10, 83, 73, -11, -90,
+   -8, 14, -92, -38, 11, -22, -36, 33,
+   -37, -38, -126, -74, -5, -12, -8, -4,
+   -28, -47, -30, -30, -6, 43, -5, 56,
+   3, -16, -83, -73, -51, 23, -99, -10,
+   -2, 57, -18, -17, -53, 3, -21, 35,
+   25, -116, -20, -33, 89, -44, 49, 102,
+   -74, -57, -65, -127, -33, 59, 60, 20,
+   -60, -1, -18, 10, -30, 106, 3, -24,
+   -15, 93, 45, -22, 7, 55, 9, -27,
+   -82, 3, 19, 9, 4, -14, -43, -36,
+   -19, 97, 85, 31, 42, -35, -19, -12,
+   -1, 68, -53, 46, -127, -93, 16, -63,
+   -58, -126, 55, 6, -52, 97, -41, 59,
+   49, -9, 10, 54, -42, 5, -11, -25,
+   -1, 35, 72, 52, 28, -6, -54, 30,
+   -28, 18, 38, -17, 57, -8, -44, -20,
+   42, -20, 94, -46, -2, -81, 110, 27,
+   -66, 5, 63, 36, -51, -55, -27, 71,
+   125, -5, -12, -57, 65, -98, 36, -12,
+   17, -8, -13, -8, -17, -52, -109, 15,
+   -31, 31, 9, -23, -22, -11, 10, 55,
+   -11, -52, -69, 52, 10, -23, 47, -35,
+   -4, -65, 15, 33, 53, -14, -104, 26,
+   -26, -29, -8, 97, -2, 58, -127, -4,
+   -106, 35, 53, -2, -71, 2, 79, 54,
+   39, -74, -121, 124, 41, 25, -33, 4,
+   28, -18, -9, -43, 59, -11, 31, -19,
+   -122, 86, 25, 54, -40, -18, 49, -25,
+   -28, 118, 65, -102, 111, -39, -7, -89,
+   -38, -17, 79, 0, -50, 72, 51, 22,
+   24, 36, 59, 1, 66, -119, -84, -8,
+   102, 44, 15, 56, 26, -74, -29, 28,
+   13, -75, 32, 78, -38, -45, -80, -90,
+   13, 3, 34, -76, -122, 120, -82, -34,
+   6, -32, -100, -89, 14, -14, 73, 24,
+   -41, 53, 30, -80, -63, 51, -17, 33,
+   47, -17, 14, -17, 32, 74, -52, 2,
+   14, -67, -16, -18, -57, 18, -14, 44,
+   -73, 45, 107, 38, 69, -24, -12, 114,
+   -15, 91, 10, -26, -51, 78, 63, -78,
+   -5, -120, 14, 32, -6, -25, -49, 67,
+   20, -66, 7, 65, 46, -41, -32, 62,
+   41, -50, -87, -34, 64, 70, 23, -36,
+   44, -51, -127, -22, -102, 33, -58, -23,
+   105, -29, -33, 47, 9, -44, 35, -36,
+   -21, 126, -90, -34, 105, -6, 18, -35,
+   3, -14, 65, 114, -2, -25, -27, -72,
+   -63, 61, -109, -13, -113, 8, -45, 22,
+   105, 6, 45, -47, 65, 16, 79, 28,
+   -21, 82, 37, -15, -64, -34, -114, 29,
+   67, 43, 78, 52, 34, -84, -54, -48,
+   -65, 63, -8, 18, -16, 10, 3, 71,
+   -101, 119, -24, 88, -26, 33, -38, -80,
+   14, -123, 24, -33, -20, 52, -1, -40,
+   49, -13, 8, -39, 23, -5, -11, -23,
+   -10, -17, -25, 43, 29, -13, -34, -19,
+   -35, -18, -21, 51, -21, -3, -19, 12,
+   -2, 50, 48, 22, -56, 39, -5, -38,
+   -60, -11, 36, 33, 13, -53, -9, 94,
+   8, -62, 55, -11, 101, 22, 2, -8,
+   -127, 98, -25, -37, -73, 71, -16, 45,
+   67, 8, -17, -90, -91, 23, -120, -39,
+   -9, 28, -128, 8, -52, -107, -27, 68,
+   33, -31, 29, 124, -26, 30, -10, -31,
+   33, 47, 9, -65, -46, 13, -90, 126,
+   99, -37, -81, 1, -61, 15, -4, 4,
+   -9, -34, -33, -33, -28, -49, 14, -93,
+   87, -80, 59, -56, -50, -45, 45, -65,
+   -97, 6, -121, 6, -113, 19, 56, -21,
+   4, 12, 87, 5, -112, 126, 69, 27,
+   -70, 82, 31, -27, -123, -16, 21, 32,
+   -5, 83, -95, -7, -1, 93, -9, 15,
+   124, 21, 21, -7, -45, -16, -66, 5,
+   -34, -118, -16, -32, -34, -44, 2, 124,
+   -78, 8, 90, -27, 127, 44, -28, 114,
+   -30, 114, -8, 27, -56, 18, 59, -24,
+   -62, 16, -25, -31, 71, 17, 3, 12,
+   92, -4, -78, 37, 127, 85, -3, -17,
+   80, 32, -2, 84, -71, -31, 62, -26,
+   47, -81, -51, -95, 66, -52, -57, -31,
+   -10, 54, 116, 88, -3, -122, -93, 7,
+   37, -70, -28, -91, 39, 12, -94, 41,
+   44, 70, -55, 69, 20, 56, -34, 1,
+   9, -34, -37, -4, -2, 23, 68, -44,
+   2, -46, -5, -72, -104, -94, -56, -30,
+   -59, 56, 14, 108, 36, 115, -96, 29,
+   -114, 105, -64, 5, 65, -82, 25, -10,
+   117, 58, 20, -19, 122, 33, -37, 35,
+   -19, -120, 6, -10, 78, -34, 126, -116,
+   -37, 59, -30, 55, 47, 51, -42, 11,
+   -2, -26, 29, 25, 51, -5, -34, 89,
+   -29, 76, -51, -44, 9, -17, 46, -42,
+   5, -52, -24, -14, 6, 127, 127, -9,
+   -5, -81, -2, 65, -67, 72, 99, 14,
+   -13, -6, -7, -36, -54, -6, -4, 30,
+   -29, -27, -28, -56, 83, -1, 29, -24,
+   -48, -23, -20, 11, -2, -4, -31, 39,
+   -45, 0, -18, -73, -29, 48, 51, -20,
+   61, 24, -62, 75, -32, -18, -44, -38,
+   44, 26, 38, -56, 14, -34, -48, -7,
+   19, -55, 20, -95, 45, 16, 13, 93,
+   -13, 21, -72, 23, 124, -33, -52, 51,
+   5, 8, -25, -10, -77, 102, -25, -1,
+   -14, 14, 4, 16, -28, 98, 18, -43,
+   -26, 12, -30, -86, -68, 81, 9, -50,
+   80, -56, -11, 37, 24, -11, 28, 1,
+   55, 36, 34, 23, -87, -58, 10, 31,
+   -11, 19, -48, 48, 95, -12, 33, -46,
+   100, 52, 32, -49, -24, -27, 46, -6,
+   -31, 21, 39, 33, 63, -65, -35, 79,
+   127, 11, 34, -13, -124, 10, -54, 24,
+   3, 24, 11, 16, -19, -45, 36, 52,
+   -32, 90, -33, -68, -51, 33, -16, 34,
+   65, 98, -8, 125, 60, -83, -21, 6,
+   111, 87, -46, -59, 44, -7, 89, 124,
+   28, 32, 30, 68, 106, -37, -1, -2,
+   -97, -57, -92, -37, 56, -75, 22, -31,
+   100, -44, -10, 12, -2, 95, 36, 3,
+   74, 35, 127, 51, -41, 72, 27, 59,
+   -105, 103, -2, -32, -116, 23, 43, 6,
+   48, -20, 110, 66, -42, -28, -41, -10,
+   33, 117, 14, 89, -18, -36, 54, 39,
+   88, -72, -27, 109, 27, -13, -119, 54,
+   -18, -14, 85, -12, 64, 6, 44, -15,
+   -66, -46, -18, 90, 109, 98, 119, -28,
+   11, 46, 29, 115, -20, -106, -27, 97,
+   -45, -82, 43, -103, 122, -14, -122, 24,
+   10, -128, 14, 10, 72, 40, -71, -10,
+   -21, -99, -103, 2, -120, 50, 0, 35,
+   -100, 46, 77, 88, -28, -1, 26, -46,
+   -3, -22, -37, -11, -82, -82, -128, -21,
+   -16, -4, -9, -69, -5, 40, 0, -63,
+   33, 19, -14, 83, 54, 24, 66, -8,
+   24, -122, -44, -32, 86, 38, -3, 6,
+   48, 32, 62, 34, 3, -42, 28, -11,
+   -23, -23, 21, 12, -2, 36, 4, -20,
+   -1, 64, -20, 11, 73, 23, -7, -50,
+   42, 7, 99, 40, -19, 39, 26, 65,
+   117, 7, -16, -6, 79, 70, -48, -12,
+   47, 19, 7, -54, -7, -43, 39, 50,
+   23, 53, -48, -97, 28, 6, 83, -25,
+   42, 38, 19, 32, -59, 22, -60, -94,
+   -45, -45, 83, -3, -69, 75, 34, 61,
+   66, 30, 19, -14, -32, -4, 13, -38,
+   8, -36, 31, -48, -56, -49, -24, 72,
+   -73, 60, 17, -40, 6, 125, 27, -18,
+   41, 28, 44, 29, -32, 45, -33, -6,
+   -41, 123, 5, -31, 89, 92, 20, -66,
+   73, -39, -51, 0, -31, 21, 69, 99,
+   -50, -3, -13, -10, -5, 72, 14, -13,
+   -57, 20, -33, 107, -84, 5, -57, -37,
+   -10, -46, -80, -108, 3, 49, -36, -28,
+   -44, 34, -125, 41, 48, -3, -33, 2,
+   12, 27, -56, -41, 18, -42, -25, 81,
+   -67, -86, -29, -7, 94, -89, 30, 84,
+   73, -21, 40, 29, -27, -19, -35, 68,
+   64, -4, -100, -102, -94, -19, -18, -30,
+   -36, 26, -2, 33, -93, 56, 67, 103,
+   -73, -101, -45, 18, 11, 18, -33, 43,
+   34, 37, -71, 27, -38, -13, -26, -13,
+   -16, 113, 33, 84, -26, -55, -17, -13,
+   15, 32, -8, -37, 32, -5, 113, -10,
+   126, 53, 23, -24, -52, -11, -55, -9,
+   -37, -33, 40, 65, 3, -95, -65, 78,
+   -13, -75, -22, 9, 93, 68, 46, 127,
+   16, 87, -47, 59, -36, -5, -3, 37,
+   16, 66, 19, -69, 42, -15, -18, 76,
+   96, 91, -7, 24, -29, 47, -20, 56,
+   45, -54, 50, -70, -52, 54, 41, 20,
+   63, 71, -63, 40, 1, 80, 20, -39,
+   6, -35, 71, -40, 7, -28, 63, -7,
+   -49, -12, 1, -16, 73, 9, 50, -46,
+   -10, 73, -81, 94, -13, 6, -1, 31,
+   -19, 15, 41, 3, -17, 0, -85, -93,
+   -86, -10, -37, 47, -6, -62, 30, 35,
+   20, 99, 37, 63, -17, -42, -28, -96,
+   2, -22, 3, 15, 28, 11, -115, 48,
+   -34, 6, -30, -78, -85, 38, 25, -32,
+   -29, -97, 2, 14, 26, 47, 99, 119,
+   71, 8, -60, 42, -55, 30, 53, 1,
+   31, -103, -20, -11, 0, 87, 37, -5,
+   89, 15, -32, -12, 55, 60, 3, -32,
+   -124, -2, -88, 53, -51, 55, -4, -53,
+   -46, 94, 18, 57, -72, 14, -41, 11,
+   14, -29, -3, -4, -9, 34, 18, -10,
+   -72, -14, -82, -90, -31, 11, -120, -48,
+   44, 3, -6, 79, -15, 8, -16, -89,
+   20, -125, -72, 69, 19, 118, -54, -2,
+   -10, 50, -28, -3, 17, -22, 104, 17,
+   101, -61, -9, -117, 5, -24, -105, -117,
+   -115, 28, -120, 36, -62, -77, 50, 67,
+   79, -41, -9, 4, 2, 15, 114, -12,
+   -16, 15, -49, 50, -122, -46, 30, 39,
+   56, 49, 14, -28, -71, -125, 36, 115,
+   -46, 47, -45, -16, 69, 113, -7, -119,
+   -43, -16, 17, -11, 102, 120, -34, 64,
+   -5, -53, 14, 0, -124, 120, 14, -26,
+   42, 74, 55, -12, 103, -37, 27, -54,
+   13, -54, -9, 39, 6, 6, -28, 43,
+   54, 21, 46, -90, -58, 122, -21, -81,
+   -13, -39, 50, 106, -2, 49, 9, -16,
+   24, 15, -73, 110, 1, 104, 52, -104,
+   2, -35, -17, 8, -58, 60, 26, 68,
+   -123, 6, 44, 70, -40, -4, -95, -21,
+   -110, 51, 80, -19, -97, -5, -50, -100,
+   -23, -30, 46, -66, -18, -38, -48, 38,
+   -9, -26, -71, 21, 25, 14, 16, 53,
+   14, -56, 20, 79, -87, 50, -7, -28,
+   52, 4, 11, -17, -26, 39, 2, 25,
+   6, 13, 11, 18, -56, -36, 46, -115,
+   32, -80, -44, -7, -32, -13, 74, -61,
+   9, -89, 14, 80, 20, -61, 109, -21,
+   -66, -34, -126, -6, 12, 22, -14, 55,
+   -28, -47, -59, -12, 2, -38, 73, -42,
+   91, -87, 37, -4, 29, 33, 122, 43,
+   85, 41, -50, 11, 29, 60, -4, 31,
+   -18, 8, -27, -75, 76, -13, 35, 18,
+   -49, -34, -33, 6, 51, 51, -41, 53,
+   47, 21, 62, -52, 30, 5, 16, 78,
+   -22, 28, -21, 31, -16, 21, -2, 62,
+   -94, -30, -83, -92, 122, -41, -113, -27,
+   -51, -123, 4, -116, 4, -68, -14, 3,
+   -21, -5, 29, -31, -15, -4, -27, -24,
+   10, -121, -119, -30, -37, -74, -32, -63,
+   -46, -69, -72, -44, 90, 84, 21, -16,
+   79, -16, -32, -111, 10, -25, 97, 57,
+   -59, -69, -83, -36, -24, -90, 14, 76,
+   -23, -16, 2, 26, 26, -50, 23, 120,
+   44, 32, -12, -29, -11, -45, 8, 41,
+   -28, 107, -32, -40, -92, -8, -76, -52,
+   76, 79, 93, 16, 86, 46, -14, 53,
+   -65, 53, 92, 63, 44, -30, 7, 5,
+   -4, 20, 22, 14, 8, 9, -58, -99,
+   -30, -119, 46, 2, -23, 34, 51, -63,
+   45, -84, -8, 36, -59, -2, -98, -6,
+   29, 121, -26, -1, -20, 39, 25, -66,
+   -56, 8, -40, -7, 25, -79, 90, 72,
+   -55, -12, -20, -123, -39, -25, -65, -12,
+   47, 30, 33, 55, 18, 19, -22, 35,
+   86, 65, 11, 119, -32, -47, -107, 80,
+   -50, -43, 44, -1, -14, 49, 17, 33,
+   13, 84, 64, 125, 97, 17, 20, 20,
+   -62, -7, -13, -16, -8, 18, -36, -89,
+   -13, 98, 21, 108, -35, 51, 44, -127,
+   -31, 40, -83, 50, -122, 16, -82, -105,
+   -58, 65, 76, -31, 61, 40, 28, -92,
+   43, -59, 63, -33, -33, 24, -37, -22,
+   7, 51, 54, 29, 12, 40, 68, -44,
+   79, 52, -3, 10, -62, 35, -26, 70,
+   40, 61, 83, -73, 97, 16, 33, 49,
+   0, -83, -15, -101, 67, -26, 108, 113,
+   3, 93, -15, 83, 27, -67, 71, 119,
+   -48, -31, -28, 4, 4, -15, -46, 13,
+   -17, -70, 78, 49, 36, 21, -72, -45,
+   -1, -31, -52, 1, 61, -17, -18, -71,
+   69, -65, -11, 104, -25, 52, 7, -70,
+   -14, -8, -16, -13, 72, 37, -91, -80,
+   31, 7, -33, -59, -12, -20, 26, 48,
+   69, -16, -87, -13, -11, -14, -14, 58,
+   -2, -3, -119, -17, 31, -17, -23, 75,
+   62, 43, -97, -42, -23, -9, -5, -11,
+   -43, 21, 37, -37, 6, -3, 14, 8,
+   18, -98, 37, -14, -50, -36, 31, 123,
+   7, 19, 95, 17, 22, 15, -7, 59,
+   62, 18, -93, 10, 23, 42, -26, -23,
+   -32, -28, 10, 42, 19, 38, 8, 31,
+   -109, -5, 81, -25, -40, 35, -96, -117,
+   -12, -4, -15, 13, 84, -70, -4, -93,
+   24, 28, -66, -45, -70, -118, -33, 116,
+   -6, 7, -54, 2, 11, 85, 34, -4,
+   67, 67, -96, -13, 3, 11, 50, 62,
+   -61, -28, 7, -17, 11, 22, -61, 62,
+   45, 42, 50, -26, -43, 114, 69, 121,
+   53, 127, 15, -3, 50, 30, 70, 26,
+   25, -15, 35, -72, -48, -11, 15, 29,
+   42, -40, 12, -38, -3, 16, -81, 65,
+   53, 84, -48, -66, 11, 23, -22, 77,
+   21, 115, -87, -35, -50, -89, -121, 67,
+   18, 8, 40, 66, -3, 11, -24, -100,
+   70, 35, 16, 16, -31, -62, 71, 64,
+   74, -124, -15, -26, -17, -26, -55, 71,
+   -22, 20, -35, 24, -48, 40, 56, 27,
+   -35, -14, -8, -34, 113, 41, 58, -8,
+   -2, -114, -38, -73, -28, -57, 70, 3,
+   -22, 64, 31, 29, -46, -43, 88, 11,
+   -67, -6, 71, -27, -24, -38, -24, -80,
+   -21, 36, -32, -84, 37, 55, -22, 24,
+   -54, 11, -94, -28, 8, -30, -46, 39,
+   25, 0, 6, 93, 34, 8, 3, 26,
+   -76, -69, 4, -71, 57, -65, -90, -40,
+   -43, -56, -16, -53, -11, -11, 7, 45,
+   -16, 7, 11, 39, -38, -9, -81, -86,
+   -50, -16, -39, -18, -11, -10, -69, -44,
+   -58, -49, 58, -63, 2, 64, 5, -81,
+   -36, 42, 56, 24, 11, 2, 36, 92,
+   78, 33, -2, -98, -55, 46, 14, 14,
+   42, -14, -12, -6, -41, -69, 88, -122,
+   36, 34, 12, -15, 18, -98, 58, -28,
+   44, 4, -107, 85, 46, 27, 8, 58,
+   66, -70, -8, 21, -110, -9, 89, -83,
+   55, 59, -110, 51, 44, 11, 16, 108,
+   43, -33, -18, -34, 2, -3, 28, -50,
+   53, 14, 44, 6, -19, 23, 41, 75,
+   72, -18, 12, -51, 34, -86, 28, 30,
+   -103, 74, 4, -43, 49, 10, -31, -10,
+   -17, -65, -82, -92, -17, 25, 1, -9,
+   30, 81, 15, 9, 72, 52, 27, 19,
+   61, 14, -64, 62, 5, -1, -16, -21,
+   -25, -59, 28, -7, 28, -35, -28, -17,
+   -16, -46, -25, -25, -79, -33, -112, 21,
+   41, 13, -6, 53, 7, 17, -54, -39,
+   -91, -94, 70, -128, -66, 28, -7, -93,
+   -120, 54, -47, 35, -111, -58, 54, -5,
+   -48, 11, -18, -104, -70, -78, 54, -7,
+   17, -8, -96, 72, -119, -125, 28, -107,
+   14, 16, -38, -48, 63, -21, 74, -45,
+   -65, -94, 118, 39, -100, 39, -41, 13,
+   19, -122, -55, 10, 23, 33, 20, -68,
+   24, -41, -113, 12, 95, 26, 0, -17,
+   -42, -66, -11, -107, -86, 76, 29, 49,
+   -108, 112, -28, 124, -55, -96, -23, 34,
+   91, -30, 61, -94, 102, -18, 19, -77,
+   -60, 13, -125, -28, 7, -34, -91, 22,
+   -12, -50, 17, -8, 2, 7, -18, -62,
+   51, -37, -55, 19, 35, -30, 8, 46,
+   -42, -56, -128, 61, -35, -16, -81, -8,
+   -30, -59, -22, -111, 6, -45, -76, 29,
+   16, -72, -34, -28, 22, -5, -116, 3,
+   18, -9, -56, -48, 18, 56, -97, -21,
+   -121, -116, -6, -24, -62, -26, -21, -69,
+   -52, -48, -22, 23, 72, -35, 68, 39,
+   47, 37, -18, 0, -76, 26, 114, -10,
+   25, 5, -12, 70, 17, -105, -25, -112,
+   5, 24, -8, 7, -38, -119, -21, 34,
+   125, -125, -2, 5, -6, 81, 40, 60,
+   54, -104, 22, -42, -2, 120, -33, 16,
+   38, -30, -23, -83, -60, -1, 86, 92,
+   -59, -10, -6, -11, -68, -96, -53, -3,
+   -9, -17, -17, 109, 34, -15, -121, -40,
+   5, 89, -38, -26, 38, -47, -80, -40,
+   -116, -34, -30, -76, -35, -39, -118, 27,
+   0, -67, 76, 0, -5, -2, 72, -15,
+   -1, -94, -75, -62, 37, -6, -91, 59,
+   -15, -8, -124, -25, -46, 17, -22, 28,
+   5, -50, 21, 63, -7, 12, 67, 33,
+   16, -35, -73, -120, -30, -14, -113, -77,
+   45, 84, -16, -50, -21, 44, -97, 6,
+   -61, -40, 29, -104, 28, 4, -17, 50,
+   14, 44, 13, -61, -34, -28, -8, 105,
+   67, 0, 31, -113, -121, -65, -21, 24,
+   57, 12, -16, 9, -5, -1, 38, -61,
+   -30, 60, -7, -55, 7, 32, 39, -33,
+   12, 30, -60, 13, -75, 3, 55, -40,
+   -16, 20, -86, 68, 24, -57, 72, 24,
+   -8, 62, -126, -42, 54, 122, 125, 64,
+   25, -38, -45, -78, -33, -109, 57, 15,
+   -79, -1, 73, 7, -20, -42, -67, -13,
+   -24, -69, 38, -38, -22, -115, 70, 15,
+   -104, 67, -35, -114, 27, 31, -80, -5,
+   27, -8, -11, -58, 39, -29, 1, -18,
+   -4, 23, -12, 46, 33, 32, 21, -14,
+   8, -13, 43, -8, 25, -37, 55, -30,
+   -37, -39, -2, -117, -12, -14, -3, -10,
+   30, -27, 9, 7, -32, -25, -101, -115,
+   -40, -8, -5, -38, 34, 44, 45, -62,
+   45, -25, 100, -29, 52, 24, -32, 66,
+   31, 112, 72, 12, 121, -57, 21, 125,
+   55, 36, -33, 22, 2, 52, 40, 25,
+   -1, 26, 6, -23, -18, -16, 11, 25,
+   17, -62, 6, -60, -25, 65, 50, 114,
+   62, -44, -19, 43, 70, 76, 40, -8,
+   47, -31, -64, 17, -34, 42, 8, 20,
+   -19, -7, -59, 54, 26, -31, 120, 18,
+   -55, -3, 4, -2, 58, -113, 10, -41,
+   -6, -13, 2, 9, 28, -20, -34, 74,
+   -44, 45, 49, 1, -9, 72, -13, -65,
+   -50, 17, 22, 32, -10, 87, -21, -43,
+   -21, -24, 5, -83, 20, 29, -54, 14,
+   -20, -48, 94, 125, -17, 16, -15, 24,
+   15, 17, 26, -34, 52, -4, 18, -59,
+   -1, 4, 14, 62, 17, -54, -41, 29,
+   -77, -15, 31, 29, 13, 5, 27, -35,
+   33, 8, 48, -21, 30, -5, -22, -67,
+   -118, 18, 0, 69, 26, 2, -120, 65,
+   27, -28, 57, 41, 48, 7, -52, 14,
+   6, -11, 54, -17, -40, -28, 82, -14,
+   -27, -12, 2, 16, 30, -113, 13, -48,
+   -37, 61, 72, 2, 8, -30, -30, 39,
+   -78, -96, 42, -80, -16, 45, -28, 57,
+   24, -123, -47, -7, 32, -25, 6, -76,
+   50, 97, -89, -40, -49, 89, 70, 114,
+   -29, -14, -43, -127, 83, -100, -79, -16,
+   -19, 78, -27, 46, -30, -65, 37, 46,
+   34, -12, -41, -29, -17, -68, 53, 99,
+   59, 51, 69, -11, 32, -5, -53, 33,
+   -14, 4, 55, -68, 23, 26, -63, -123,
+   -31, -39, -67, 58, -6, 23, -3, 25,
+   41, 12, -31, -11, -55, -63, -90, 8,
+   -11, 27, -31, -127, 15, 29, 28, -74,
+   -46, 44, -1, -122, -46, -44, -113, 40,
+   11, 23, -44, 4, 6, -26, -118, 30,
+   -70, 42, 19, -29, 45, -76, 34, 11,
+   -94, 1, 125, -26, 11, 35, 39, 48,
+   -20, -83, 48, -36, -23, -53, 11, -53,
+   -38, 57, -34, 33, -59, -2, 51, 121,
+   -3, -29, 30, -48, 51, 20, 36, 2,
+   -22, -12, 42, -7, -8, -52, 20, -66,
+   61, -64, -53, -21, -83, 9, -20, -39,
+   61, 6, -75, -13, -12, 42, 90, 48,
+   -17, 47, -3, -97, 4, -87, -7, -39,
+   -19, -14, -64, 70, 27, 86, 30, -23,
+   -23, 110, -21, -81, -38, 63, 20, 44,
+   10, -1, -106, -26, -122, -45, -25, -61,
+   -7, -45, 3, -3, -8, 4, 1, -38,
+   -14, -41, -31, -10, 2, 0, -54, -37,
+   96, 25, -52, 4, -2, 25, -2, 16,
+   21, -15, 39, -29, 58, -77, 62, 39,
+   -53, -66, -14, -78, 31, 47, 5, -43,
+   12, 38, 45, 33, -33, 53, 31, -14,
+   18, -28, 40, 36, -32, 68, -77, 78,
+   -31, 10, 124, 23, 26, 61, -46, 80,
+   17, -17, -11, -64, -27, 72, -54, 55,
+   -1, -8, -102, 33, 9, 38, 39, 122,
+   -36, -21, 51, -27, -16, -12, 35, -7,
+   -13, 0, -117, 49, 0, -53, 4, -91,
+   -61, 5, -30, -102, -43, 17, 13, -48,
+   44, -40, 27, 84, -19, -13, 72, 101,
+   10, 12, -16, 15, -37, 18, -37, 1,
+   22, -79, -55, -42, 6, 123, -8, -31,
+   -19, 35, -31, -74, -35, 30, -21, 30,
+   -76, -8, -57, 11, -9, 29, -46, 29,
+   -30, -15, -1, -43, 13, -9, -3, -72,
+   -3, 36, -62, -91, -5, 32, 7, 10,
+   0, -46, -44, -8, 23, 39, -3, 15,
+   13, 19, -107, 7, -45, 11, 30, -72,
+   -23, -25, -93, -116, 19, -1, -36, -25,
+   -4, -59, 18, -22, -88, 0, -20, 12,
+   82, 10, 44, 89, 64, 100, -39, 101,
+   60, 70, 93, 108, 121, 120, -20, 31,
+   20, 66, 123, -11, -118, 4, 82, 32,
+   -19, 24, 4, 6, 28, -9, 57, 76,
+   -15, 79, 86, 123, 79, -94, 23, 73,
+   90, -54, -43, 4, 12, 12, 121, -49,
+   3, -45, -6, 33, -10, 74, -30, -56,
+   35, 54, -92, 29, 10, 82, 84, 95,
+   112, 36, -54, -120, -83, 78, -1, 36,
+   54, 57, 3, 26, -48, 1, -46, -3,
+   -22, 48, 45, -38, -51, -19, 33, -14,
+   -88, 61, -39, 17, -4, -56, -100, 19,
+   -40, -72, 7, -33, -6, 21, -64, -122,
+   -40, 14, -119, -102, -69, 14, -19, -8,
+   60, 23, -128, -37, -28, -40, -2, 13,
+   -4, -22, -15, 15, -2, -35, 42, -118,
+   -4, -77, -1, -127, -35, -19, -68, -58,
+   -72, -4, 8, -1, -15, -4, -125, 6,
+   -108, -9, 56, -121, -6, 13, 0, 1,
+   -118, 119, -13, 42, -52, -72, -72, 52,
+   -61, -18, -37, 63, -112, 23, 31, -119,
+   34, 61, 46, 127, -68, -120, 19, -21,
+   -12, 41, 25, -112, 21, 92, 83, 78,
+   -63, -20, -61, 8, -24, 27, -19, 76,
+   31, -4, -22, 2, 8, 88, 122, -27,
+   -72, -30, -52, -42, 25, -44, -67, 33,
+   -65, 28, -64, -36, -127, -5, 119, 23,
+   -112, -8, 84, 51, 77, -32, 93, 21,
+   -3, 9, 10, -23, -109, 40, -99, -9,
+   -10, 32, -21, -1, 1, -31, -54, 47,
+   -49, -5, -83, -61, 4, 1, -2, 7,
+   45, -85, -78, -9, 122, -24, 26, 57,
+   -10, 18, -14, -4, 3, -97, -7, -17,
+   -4, -24, 0, -69, 40, 67, -63, 20,
+   51, 6, -36, 21, 53, -57, -41, -103,
+   -34, 29, -88, 2, 49, 56, 31, -37,
+   -26, -8, -22, 28, 18, -44, 0, -54,
+   61, 52, -97, 56, 7, 90, -17, 97,
+   1, -116, -86, -80, -64, -18, -26, -47,
+   105, -111, -16, 49, 23, 116, 127, 1,
+   -11, 8, -2, -31, -51, 59, 21, 78,
+   90, 61, -4, -8, -82, 117, -34, 102,
+   8, -63, 96, -41, 25, 35, -15, -18,
+   -13, 79, -33, -34, -75, -103, -82, -41,
+   37, -56, 13, 54, -84, -56, 88, 7,
+   -66, -74, -3, -23, -118, -19, -34, 7,
+   -44, -8, 26, -37, -9, 52, -58, 27,
+   54, -128, -15, -5, -126, 27, 61, 50,
+   -15, 72, -37, -35, 17, -125, -16, 27,
+   -34, -41, 9, -77, -1, 23, -91, -66,
+   38, -38, 41, -90, 67, -18, 16, 58,
+   23, -22, -11, 25, -10, 13, -71, 90,
+   -13, 34, -41, 26, -124, 40, -42, -15,
+   -29, 33, -8, -41, -84, -17, 78, -73,
+   120, -31, 69, 77, 54, 96, 7, -25,
+   98, 48, 120, 78, 65, 59, 59, 124,
+   69, 41, 33, -93, 32, 51, 44, -3,
+   -127, -90, -25, -26, 37, 27, -14, 119,
+   -46, 84, 4, -27, -3, -53, -12, 49,
+   86, 44, -15, 69, 15, -95, -18, 99,
+   27, -17, 1, -35, -11, 27, 15, -30,
+   -78, -3, 41, 7, 127, -1, 102, 24,
+   45, 39, -37, -50, 11, 0, -16, 5,
+   23, -18, 63, 89, 63, 34, 47, -126,
+   -8, 77, 21, -121, -51, -9, 29, 42,
+   43, 60, -107, 24, -35, 40, -36, 42,
+   -35, -62, -23, -19, 43, 2, -52, 12,
+   -70, 17, -122, -23, -54, 45, 19, 31,
+   40, -60, -9, 8, -38, 3, -62, -38,
+   15, 29, -15, 45, 18, -42, 66, 17,
+   48, -124, 39, -53, -52, 36, -16, -10,
+   18, 90, -29, 2, 26, 15, -11, -22,
+   65, 18, 53, 89, -88, 122, -86, 82,
+   -63, -16, 111, 40, 55, 61, 22, 126,
+   17, -45, -58, 23, -30, 61, -98, 48,
+   -35, -72, -7, -52, 25, -89, 80, -98,
+   15, -85, 78, 13, 6, -11, 52, -2,
+   29, -3, -3, 7, -37, 88, 61, -98,
+   8, -35, 10, -73, 11, 63, 27, -38,
+   30, -46, 2, 45, 20, 7, 45, 74,
+   67, 78, 27, -28, 33, 53, -119, -42,
+   32, 56, 34, -67, 49, 3, -36, 11,
+   -62, 122, 6, -47, -3, -17, -40, 35,
+   -48, 98, -67, -31, -35, 11, -64, 42,
+   -18, -34, 33, -48, 26, -28, -6, -68,
+   33, 2, -70, -78, -27, 45, -20, 6,
+   13, -43, -35, -23, 4, 25, -49, 18,
+   8, 1, -15, -26, -41, 13, -16, -28,
+   -8, -24, 23, -87, -22, 6, -26, 33,
+   -16, -35, 19, -5, -27, -7, -74, 5,
+   -81, 26, 15, 119, -15, 35, -111, -64,
+   -70, -53, 34, -9, -30, -14, 20, -51,
+   57, 15, -13, 57, -74, -7, -39, -36,
+   -3, -30, 13, -32, 8, -20, 47, -61,
+   -63, -53, 33, 15, 32, 24, 81, -39,
+   -42, -43, 46, 29, 26, 6, -30, -6,
+   42, 11, 23, -31, -22, 18, 18, -53,
+   28, 30, -18, -49, 53, -57, -13, 27,
+   31, -1, -7, -21, -6, -100, 49, -69,
+   120, -53, 10, 59, 14, -24, -27, 80,
+   -63, -28, -26, -9, -13, -65, 8, -28,
+   -13, 1, 66, -4, -20, -5, 25, -41,
+   -18, 37, -16, -17, 9, -52, -32, 92,
+   -26, -8, 9, -42, 26, 2, -15, 81,
+   -13, -20, -7, -14, 75, -36, 44, 10,
+   6, 21, -38, -74, 15, 12, 58, -34,
+   -22, 69, -41, -19, -60, 42, -57, -12,
+   9, 19, 10, -18, 3, -42, -23, 32,
+   9, 83, 38, 76, -111, 76, -98, 88,
+   -114, -63, 0, -19, 41, 37, -33, 36,
+   -7, 8, 53, 74, 51, 12, -16, 6,
+   -15, -127, -5, 87, -51, 27, 72, 12,
+   -104, -7, 53, 124, -21, -103, 122, 14,
+   56, -21, 52, -64, -23, 88, 122, -82,
+   0, 13, -54, -52, 31, 93, 122, -49,
+   15, -71, 84, 41, -53, -124, -43, 88,
+   70, 42, -5, 120, 77, -23, -94, -57,
+   51, -79, 58, 0, 8, -21, -61, -19,
+   -37, 126, -11, -53, 20, -10, -68, 79,
+   -124, -30, -59, -25, -8, -29, -125, 26,
+   -36, -28, -64, -8, -5, 100, 70, -20,
+   7, -126, -54, 4, -1, 45, -18, 73,
+   -19, -123, -64, 11, 20, 22, 1, 1,
+   3, -12, -41, 91, -69, -75, 16, 46,
+   -29, -66, -31, -79, -85, -10, 41, -10,
+   -83, -121, -10, -17, -90, 6, -128, -51,
+   76, 40, -19, 81, -123, 104, -17, 88,
+   19, 30, 92, 58, 29, 95, 14, 84,
+   109, 12, 20, -96, -16, -20, -45, -120,
+   -13, -98, -126, 66, -104, 6, 106, 91,
+   -1, 59, -50, 5, -24, -66, 32, 69,
+   68, 29, 23, -24, 63, -17, 55, -57,
+   5, 20, 66, -9, -25, 74, -16, -115,
+   71, -6, 4, 63, 34, -45, 30, 58,
+   37, 26, -22, -26, -32, 6, 9, 83,
+   -30, -8, -2, 75, 43, 71, -62, -104,
+   44, 35, -75, -85, 21, -51, -1, 74,
+   -97, 26, -67, 28, -34, -75, -62, -4,
+   -55, -34, -24, 12, 16, -20, -4, -54,
+   -62, -7, 20, -126, -1, 24, 4, 10,
+   32, -44, -76, -13, -49, -28, 6, -6,
+   34, 1, 17, 84, -22, -2, -40, 30,
+   -34, -35, -91, -57, 30, 20, -15, 14,
+   -27, 25, 24, 5, 13, 7, -112, -3,
+   -30, 38, -33, 3, 25, 111, -20, -48,
+   -23, 58, 5, -30, 29, 122, -72, 45,
+   110, -16, 47, -21, -16, 0, 34, 13,
+   40, -19, -14, 36, 9, 24, -6, -59,
+   39, 121, 123, -29, 25, 38, 52, 53,
+   31, -107, -89, 12, -29, -9, 59, -3,
+   -13, 41, 67, 0, 64, 46, -23, 17,
+   -52, 4, 34, -41, -47, 54, -19, 125,
+   -13, -17, -56, -6, -1, 4, -28, -59,
+   72, 23, 39, 78, -114, 31, 5, -35,
+   -39, 80, -30, 19, -117, -45, -74, 53,
+   -26, 120, 22, -99, -24, 49, -60, -37,
+   -15, 24, -29, -1, -2, -19, 4, 34,
+   -8, -47, -15, 1, -78, 68, -33, 18,
+   -11, -14, -6, -29, 10, -57, 2, -22,
+   37, 1, 52, -118, -22, -81, 25, 4,
+   35, -25, 16, -22, -97, -12, -73, 26,
+   13, 11, -36, -48, -63, -24, -16, -31,
+   19, -67, -11, 127, -13, 9, -31, 110,
+   83, -107, 25, 33, 63, 122, -30, 18,
+   -61, -128, -49, -92, 10, -103, -37, 1,
+   -21, -91, 80, 61, 41, -84, -24, 112,
+   -15, -38, 2, -3, 7, 22, 68, -67,
+   44, -15, -75, -13, -71, 7, 52, -118,
+   -88, 27, -34, -69, 30, 4, 88, -91,
+   4, -5, 13, -14, -32, 9, 47, 93,
+   -27, 98, -5, 40, -65, 38, -21, 35,
+   62, -40, 10, 14, 4, 13, 17, -50,
+   -23, 12, -90, -13, 35, 63, 23, 35,
+   -128, 3, -103, 14, -53, -72, -31, 13,
+   -42, -63, 17, -58, 6, 25, -24, -116,
+   -48, -20, -41, -39, 80, -47, -54, -27,
+   38, -50, -116, -38, -76, 18, -39, -38,
+   12, 15, -75, 12, -62, 10, 33, -23,
+   -21, -38, -95, -118, -71, -11, -25, 4,
+   -52, -118, -2, -11, -117, -38, -119, 12,
+   -24, -53, 43, 8, 64, 21, -37, 53,
+   27, -54, 40, -83, 55, 90, -16, 48,
+   39, -35, 102, -15, -63, 94, -6, 45,
+   -23, -64, -123, 43, -29, 7, -23, 118,
+   -58, -46, 23, -73, 37, -53, -8, 7,
+   -9, -24, -33, -48, 31, 26, 28, 52,
+   -48, 43, 33, -22, 56, 77, -26, -85,
+   -66, 42, 0, -49, 12, -18, 26, 56,
+   -13, 13, -14, 7, -29, -4, -89, 40,
+   25, 45, -15, 35, -7, 42, -7, -59,
+   -10, 30, -92, -29, 3, -60, 1, 12,
+   -6, 64, 0, 57, -99, 24, -46, 13,
+   1, 56, -21, -11, 0, -41, -15, -28,
+   -36, 14, 17, -42, -57, 49, -9, -11,
+   -23, 16, -103, 18, -28, 1, 13, -86,
+   4, -7, -22, -6, 5, -11, 41, -32,
+   55, -45, 1, -125, -39, -20, -12, 0,
+   -20, 66, -17, -17, 3, 33, 24, 3,
+   55, -100, -103, 49, -127, 59, 74, -10,
+   -93, -60, 45, -27, -23, 13, 107, 38,
+   -75, -31, 70, -10, 12, -104, -68, -6,
+   31, 82, 17, 74, 56, 113, 72, 42,
+   -52, -4, 75, 40, -117, -16, 15, 42,
+   19, 6, 33, -41, 92, 60, -13, 28,
+   -12, -17, -11, -90, -118, 35, 21, -63,
+   -32, -48, -50, 22, -25, -20, 41, 28,
+   22, 24, 8, -7, 14, 30, -20, 5,
+   59, -28, -21, 2, -41, 65, 56, -47,
+   -94, -5, 19, -82, -60, -16, -22, -73,
+   16, 65, -35, 49, -34, 26, -20, 51,
+   -28, -2, -34, 81, 8, -53, 2, 50,
+   -43, 0, -48, -78, -5, -7, -37, 26,
+   98, -22, 7, -10, 37, 0, -23, 118,
+   -14, -33, -11, 23, 3, -64, 3, 41,
+   102, -56, -101, 34, 1, 82, -22, -66,
+   -1, 7, 58, 3, -27, -57, -7, -7,
+   -72, 0, 84, 17, 14, 126, -87, 35,
+   -3, 70, 126, -43, 50, 90, 52, 10,
+   102, -35, 23, -40, -91, 15, 26, 6,
+   102, -42, 16, -84, -9, -40, 63, 13,
+   27, -14, 98, 120, 59, -123, 21, 48,
+   121, -61, 32, 49, -23, 13, 45, 45,
+   58, -76, -14, -35, -6, 65, 32, -57,
+   99, 14, -81, 34, 34, 46, 70, 9,
+   31, -23, -48, -14, 14, -9, -62, -48,
+   -18, 103, -45, 9, -8, 29, 46, -17,
+   45, 41, -58, -53, 1, -35, 31, -80,
+   -26, 30, 88, -39, -76, 40, -9, 24,
+   10, -26, 31, -48, -17, 16, -10, -126,
+   -57, -22, -127, -20, -50, 62, 12, 65,
+   43, -23, -63, 6, -64, 23, -38, -11,
+   -91, -43, -6, 5, -21, 40, 49, -120,
+   -58, 7, 20, -13, 44, -27, 61, -7,
+   -21, -83, 44, -28, 9, -77, -45, -15,
+   -97, -80, -25, -29, 89, -43, -51, -7,
+   -3, -40, 89, -67, 118, 3, -38, 5,
+   4, 12, 6, 79, -28, -6, 27, -17,
+   -23, 74, 33, 29, 22, -97, -64, -119,
+   33, 10, -115, 124, 33, 59, -41, 49,
+   34, -77, 3, -31, -15, 67, 31, 47,
+   89, -66, 33, -40, 33, -5, -46, -44,
+   -25, 109, -93, 50, -119, 26, 122, 85,
+   10, -1, -29, -124, 61, 21, -67, -41,
+   -47, -55, -27, 123, -30, 20, -88, 78,
+   -49, -4, -88, -17, -10, -7, 86, -48,
+   -30, 82, 46, 42, 45, -23, -112, -32,
+   1, -35, 0, -70, 49, 5, -65, -128,
+   36, 86, 14, 127, 9, -24, -16, 6,
+   -42, 36, -127, -91, 24, -112, -48, 32,
+   -48, 17, 50, -123, -4, 68, -35, 10,
+   105, 5, -2, -126, -34, 57, -123, 14,
+   25, -27, 1, -85, 3, -28, -123, -51,
+   8, 15, -60, 9, 28, -71, -67, 88,
+   24, 65, 123, -28, 20, 65, 79, -45,
+   118, 63, -88, 83, -98, 91, 11, -31,
+   118, -109, 36, 53, -68, 11, 22, -76,
+   -38, -14, -85, 116, 109, -28, -34, 47,
+   41, -9, -27, -27, 4, 17, 2, 73,
+   86, -68, 56, 13, 40, -24, -23, -4,
+   -45, 80, -84, 28, 8, -32, 116, 87,
+   -19, -7, 10, 42, -43, 104, 34, 13,
+   39, 37, 13, 80, -1, -20, 51, 27,
+   -30, 79, -45, -5, 10, 25, 91, 24,
+   -43, 22, 99, 100, 32, 8, 60, 100,
+   48, -10, 5, 15, 15, 26, 6, -51,
+   40, 19, 45, 127, -11, -46, 31, -26,
+   -50, 54, -9, 21, 4, -126, -37, -16,
+   -66, 23, 17, -28, -10, 55, -31, 23,
+   37, 22, 13, -10, 86, -17, 6, 51,
+   16, 44, -5, -31, 42, 4, -73, -44,
+   14, -5, -2, 1, 14, 7, 37, 11,
+   1, 13, 11, 5, 4, -37, 10, 19,
+   5, 3, -15, 15, -26, 17, -5, -1,
+   30, 32, 8, -7, -5, -12, -12, 11,
+   6, -26, -19, -9, 8, 7, -10, 19,
+   11, -3, 13, 14, 6, 7, -13, -5,
+   39, -17, -6, 33, -8, -16, 31, -35,
+   1, -32, -62, 16, 11, -6, 37, -5,
+   -16, -10, -47, -10, 12, -9, 26, 4,
+   49, 1, -18, 26, 10, -5, -23, 17,
+   -21, -35, -70, 58, 22, 5, -62, 17,
+   -9, -15, 25, 7, 9, 14, 3, 17,
+   0, -9, 9, 8, -5, 22, 4, -1,
+   7, -7, 32, 24, 10, -39, 3, -27,
+   33, 3, 4, -3, -1, -9, -3, -1,
+   -27, -2, 4, -3, 4, 0, 1, 5,
+   -11, 11, 15, 10, 6, 0, -8, -13,
+   3, -1, 12, 9, 7, -6, 5, -15,
+   44, 18, -14, -17, -16, -15, -26, 25,
+   -7, 3, 9, 15, 0, -11, 10, 7,
+   2, -14, -43, 8, 45, 18, 1, -5,
+   1, 18, -12, 1, -25, -18, 1, -63,
+   4, 32, 8, -52, 15, -54, -27, 12,
+   -27, -35, -53, 18, -10, -14, 34, 4,
+   -23, -10, 51, 54, 5, 20, -19, 62,
+   -66, -38, 27, -18, 10, 43, 40, 67,
+   -9, -29, -34, 54, 1, 18, -17, 61,
+   26, 5, 113, 22, 1, 6, 63, -29,
+   47, 118, -41, -12, -4, 7, -41, -27,
+   -3, 14, 1, -20, 38, -15, 10, 12,
+   -35, -38, -33, -9, 10, -56, -38, -9,
+   -9, -55, 26, 26, -15, 5, 12, -43,
+   30, 8, -68, -11, 14, -33, -2, 23,
+   8, -8, 27, 3, 22, -15, -23, 14,
+   22, -44, 12, -52, 36, 1, 3, -40,
+   -55, 16, -40, 7, 27, 27, -45, 22,
+   -17, 26, -23, -26, -2, 30, -15, 19,
+   4, -1, 30, -24, -3, -36, -33, 13,
+   13, -21, -1, 28, 21, 32, 19, -7,
+   -13, 16, -9, -23, -33, -66, -13, -44,
+   15, -18, 14, 9, -23, -68, -7, 55,
+   -12, -98, -32, -4, -6, -13, 11, 33,
+   -30, -5, -27, -40, 52, 106, -40, -13,
+   19, -35, -17, -40, -24, 9, -90, 54,
+   -1, -58, 15, 101, 18, -15, -105, 90,
+   39, 23, -7, 70, 8, -24, -89, 19,
+   -21, -8, 18, -74, 112, -86, -14, 47,
+   -81, 43, -50, 2, 13, -9, -38, 23,
+   -12, -64, -10, 13, 23, 29, 106, -25,
+   -22, -115, -43, -5, -2, 5, 7, 7,
+   33, 8, -60, 10, -48, -47, 6, 50,
+   43, -3, 15, -17, 36, 1, -17, -14,
+   7, -22, -24, -110, 21, 3, 64, 99,
+   -31, 3, -10, -21, -7, 20, -61, -22,
+   -50, 31, 35, 0, 4, -8, -35, -26,
+   13, 56, 32, -12, -10, -7, -45, -5,
+   15, -17, 78, -11, 51, 15, -26, -16,
+   -40, -20, 31, 0, 12, -52, 25, -33,
+   22, -26, -12, 81, -17, -19, -12, 3,
+   60, -76, 11, -5, 24, 9, 34, 2,
+   54, 12, -68, -18, 10, -33, 50, -2,
+   -52, -43, 10, -18, -6, -20, 69, -4,
+   15, -59, -21, 5, -18, -45, 32, 21,
+   87, 19, -24, -85, 26, -56, 64, 27,
+   -14, -35, 13, -18, 45, -33, -77, -36,
+   -123, 55, 13, 61, -15, 6, -41, -21,
+   86, -19, 72, -10, -12, -27, -114, -25,
+   -8, -31, 8, -4, 17, -27, 31, -5,
+   -1, -10, 52, 55, -70, -55, 23, 52,
+   45, 32, -57, -30, 6, -20, -1, 20,
+   -48, -10, 47, -21, 13, -27, 50, -25,
+   46, -20, 7, 12, -3, -39, -36, 22,
+   -42, 24, 27, -12, -13, 3, -28, -52,
+   14, 48, -13, 30, -6, -4, -37, 13,
+   -12, 28, -9, 48, -30, -25, 0, -6,
+   49, -9, 39, 10, 66, -32, -43, 85,
+   5, -4, -9, 76, 16, 46, -18, -122,
+   -59, 48, -35, -26, 20, 13, -23, -41,
+   -26, 51, 120, -54, -38, -53, -1, 126,
+   3, 8, 84, -49, -40, 33, 88, 113,
+   22, -54, 0, 44, 10, -76, 80, -75,
+   66, -58, 10, 109, -24, -17, 49, 11,
+   -32, 1, 15, 55, 103, 56, 10, 48,
+   -28, 83, 6, 28, 19, 5, -46, 23,
+   89, 74, 32, 4, -24, 23, 0, 26,
+   11, 38, 42, -6, -2, -8, 5, -8,
+   -7, -9, -1, 40, 15, -59, 8, 43,
+   -36, 24, -75, 43, -37, 0, -43, -27,
+   -15, -78, -11, 17, 9, -12, -41, -36,
+   -87, 7, -36, 1, 15, -29, 27, -60,
+   106, 77, 4, 39, 20, -5, 123, -45,
+   -2, -28, 8, 6, -32, 20, -8, 3,
+   -27, 13, 0, -75, 6, -52, 8, -2,
+   105, 89, 6, 22, 29, -18, 20, -60,
+   39, 61, 39, 14, 2, 26, 15, -21,
+   14, 95, 57, -7, 29, -43, 10, -70,
+   -23, 112, -14, -24, -41, 2, -25, -121,
+   30, 111, -19, 23, 24, 48, 21, 85,
+   -3, -31, 6, 16, -3, -59, -120, 44,
+   33, -11, 7, -126, -128, 5, 10, 19,
+   73, -36, 24, -16, -18, 57, -103, -126,
+   -16, 67, 39, -40, 120, 61, 2, -44,
+   -1, 45, -14, 56, 12, 30, 46, -6,
+   13, -8, 30, 25, -54, -6, -8, -7,
+   -38, -23, -16, 16, 56, -19, -13, 36,
+   -70, 9, -22, -8, -67, -3, 16, 6,
+   -22, 87, -6, 23, 0, 3, -49, 71,
+   21, 41, 55, 14, -25, 8, -8, -8,
+   127, 62, -75, -25, -2, 4, -46, 49,
+   -123, -58, -92, -127, -23, 22, -125, -32,
+   34, 125, 13, 93, 53, -47, 122, -80,
+   50, 119, 1, 40, -127, -118, 33, 124,
+   22, -93, 9, -38, 49, 58, -52, -117,
+   41, 120, -120, 44, -74, -7, 9, -26,
+   -107, 7, 21, 13, 72, -7, 116, 45,
+   -82, 3, 60, 104, -127, -81, -122, -69,
+   -105, -28, -6, -16, -12, 97, -113, 119,
+   -48, 127, 124, 124, -126, -6, 78, -72,
+   72, 38, 127, 34, 116, 33, 34, 127,
+   45, -17, 28, 127, 65, -124, -29, 23,
+   -128, 50, -18, 110, 76, -70, -125, -20,
+   -65, -49, -44, 20, 20, -12, 93, -31,
+   -105, -120, 71, 113, 51, -125, -56, -46,
+   -70, 60, 68, -54, -126, 84, -121, -39,
+   -66, -125, 120, -13, 124, -24, 67, -8,
+   120, -14, -93, -52, -78, 11, -27, -52,
+   65, -128, 11, 17, 6, -5, 32, 120,
+   -121, 0, 45, -3, 93, 104, 108, -41,
+   -7, 46, 19, -10, 93, -27, -91, -112,
+   -128, -125, 45, 21, -125, 1, 64, 38,
+   -127, 97, -5, -37, 94, 52, 24, 122,
+   -125, 23, 98, 63, -37, 85, -40, -63,
+   -1, 93, 127, -8, 60, -56, 94, -16,
+   127, -96, 17, 58, -6, 110, 71, 66,
+   -4, -95, 12, 81, 105, 19, 83, -84,
+   125, -66, -46, -25, -58, -76, -125, 39,
+   127, -57, -75, -56, -64, 56, -123, 45,
+   -53, -83, -7, -111, 44, -126, 34, 97,
+   -65, 104, -67, 114, 11, 127, -122, 120,
+   -64, -8, 6, -106, 24, -55, 104, -4,
+   -52, -38, 21, 126, -119, -95, -8, -127,
+   122, -23, 126, -60, -54, 42, 36, 120,
+   -128, -46, -127, 55, -40, -38, 70, -8,
+   -125, -127, -124, -128, -14, -56, 115, 60,
+   60, -123, -37, -128, 48, 104, 125, -88,
+   -67, 38, 23, 23, 106, -83, 121, -30,
+   -44, 126, 17, -42, -23, 127, -1, -73,
+   -76, -124, 104, -5, -58, 86, -112, 23,
+   -57, -100, -2, 26, 21, 88, 75, -127,
+   71, 124, -27, 94, 25, 120, -125, -120,
+   -113, 126, -127, 31, 127, 18, -124, 74,
+   -125, 15, 23, 43, 103, 123, 74, -47,
+   96, -102, -14, 127, -20, 124, -82, -121,
+   106, -112, 5, 44, 99, -17, 122, 69,
+   -46, 74, 29, -56, -127, -53, 51, 93,
+   79, -85, 87, -126, -100, -29, 116, -121,
+   127, 126, -21, 119, 3, -77, 17, 120,
+   52, 127, 106, -4, -112, -30, 124, -34,
+   2, -103, 125, 127, -68, -109, -36, 3,
+   68, -119, 127, 118, 126, -99, -89, 38,
+   -53, -121, 67, 95, -44, -39, 82, 127,
+   75, -127, 91, -12, -67, -91, 37, 4,
+   40, -122, 65, -84, -8, 30, 46, -1,
+   55, -55, 106, 12, -61, 47, -11, -102,
+   54, 96, 18, -4, 75, -93, 76, 73,
+   119, -24, 108, -9, 124, -127, 116, -43,
+   110, 48, 15, -32, 33, -95, 23, -9,
+   78, 113, 123, 127, -104, 40, -29, -57,
+   74, -114, 121, -41, -113, 127, 6, 123,
+   83, 81, -39, -27, -30, -120, 58, 14,
+   16, 2, 6, 13, -41, 120, -112, 11,
+   121, 124, 58, -126, 77, 32, -124, -32,
+   -13, 39, -92, 36, -33, -46, -13, 125,
+   20, -127, 108, -109, -97, -57, 26, -108,
+   82, 78, -127, -84, 32, 31, -96, -124,
+   60, 96, -121, -107, -113, -14, 113, 15,
+   69, -53, 11, 91, -44, -33, 56, -75,
+   -127, -122, 114, -27, 34, 36, 120, 122,
+   -70, -16, -35, -122, -119, 4, 127, -86,
+   -18, -113, -74, 87, -83, -123, 65, -1,
+   -14, -119, 32, -20, -122, 31, -18, 23,
+   119, 120, 112, -107, 29, 24, -123, 22,
+   67, 127, 106, -128, 79, 17, 73, -53,
+   -27, 58, -10, -7, 127, -51, -119, 15,
+   -74, -113, -45, -36, 44, -120, 105, -80,
+   98, 103, -102, -22, -108, 7, -122, 70,
+   89, -127, 58, -33, -8, 91, -1, -4,
+   -62, 127, 65, 74, -124, -111, -67, 89,
+   12, -122, -25, 45, 117, -73, 23, 51,
+   15, 88, 25, 116, 77, 95, 121, -5,
+   103, 80, 108, 127, 100, 8, -113, -112,
+   119, -106, 127, -114, -82, 125, 81, -127,
+   -121, 127, -124, -8, -126, 58, 127, -126,
+   119, 25, 26, -68, -83, 77, 70, 51,
+   -64, -30, 127, 127, -126, -124, 127, -128,
+   -119, -1, 122, 112, 13, 94, 46, -22,
+   80, -26, 102, -122, -35, 37, -11, -108,
+   -128, -95, -111, 125, -123, -79, 116, 8,
+   90, 97, 26, -34, 109, 120, 61, 69,
+   -5, 4, 119, 11, -61, 91, -3, 38,
+   19, 127, -87, 125, 125, 33, 127, 46,
+   39, 4, 36, 121, 127, -124, -27, -25,
+   -79, 39, 105, -71, 30, -14, 78, -123,
+   119, 80, 106, 125, -59, 125, -106, 24,
+   30, -68, -116, -56, -78, -13, 103, 10,
+   120, -29, 82, 119, -107, -32, 17, -41,
+   123, -126, 54, 121, 54, 127, 10, 119,
+   126, -120, 40, 115, 121, 85, -13, -11,
+   103, 33, 60, 72, -21, 50, -66, 127,
+   -69, 33, -118, -128, 29, -12, 123, 125,
+   45, 127, -121, -74, -72, 80, -82, -55,
+   120, 0, -65, -39, -124, 63, 126, -20,
+   124, -21, 109, 127, -119, -125, 98, -125,
+   -36, -94, 58, -34, -123, 108, -24, -61,
+   42, -10, -63, -14, -76, -3, 22, -109,
+   -1, -126, 58, 119, 9, -83, 124, 75,
+   -17, -33, 58, 40, 114, -126, -31, 120,
+   64, 20, -21, -37, -33, -19, -51, 42,
+   1, 127, 39, 62, 125, -86, 62, 22,
+   -12, -22, 2, -48, -28, -117, -60, -3,
+   -60, 101, -29, 25, 83, 41, 75, -83,
+   65, -88, 10, 104, 22, 93, -11, -86,
+   -67, 98, -18, 44, 126, -100, -123, 49,
+   126, -80, -44, -39, -14, 108, -122, -126,
+   84, 102, 77, 112, -61, 125, 121, 35,
+   102, -124, -9, 119, -119, 45, 19, 114,
+   127, 61, -7, -57, -103, -104, 88, -30,
+   -125, 123, 123, -121, 125, -5, 127, -49,
+   28, 127, -69, 87, 5, 73, 127, 126,
+   -12, -9, 46, -4, -122, 42, -54, 18,
+   -17, 85, 39, 127, -117, -127, 0, -91,
+   24, -6, -103, -39, -126, 127, -7, -19,
+   95, 79, -36, 118, 95, -65, -89, 117,
+   76, -47, -124, -53, 5, -53, -15, 71,
+   124, -56, 35, 48, -54, 104, -76, 43,
+   65, -121, -70, -48, 40, 18, -128, -8,
+   42, 124, 33, -5, 102, -124, -128, 120,
+   -128, 51, -99, -88, -128, -121, -70, 92,
+   78, 112, 110, 122, 117, -107, 97, 111,
+   65, -52, -23, -116, -5, -113, 11, -38,
+   -37, 127, 119, 23, 124, -43, 79, 124,
+   125, -122, 67, -104, -127, -53, -24, -112,
+   120, 92, 69, -93, -6, -118, 110, 111,
+   -128, 15, -46, -118, -121, -35, 107, 115,
+   116, 67, 117, -30, -96, 126, -20, 127,
+   -127, 108, 22, 123, -46, 63, 112, 121,
+   8, 124, -125, -90, 14, 4, -5, 127,
+   -119, 99, -63, 1, -107, -103, -86, -28,
+   42, 103, 67, 32, -48, -95, 78, -77,
+   -91, -46, -128, -84, 14, 125, 8, -73,
+   -124, 11, 66, 111, -125, -4, -37, -125,
+   -83, -29, -47, 71, 122, -42, 34, -31,
+   103, 103, 21, 22, -103, -102, -83, -120,
+   127, -15, -80, 125, -92, -34, -123, 21,
+   80, -71, 111, -65, 119, -119, -109, 109,
+   -26, -100, 10, 16, -127, -79, -121, 4,
+   70, 19, 19, 39, -35, -25, 33, -118,
+   1, 113, 93, -63, 52, 30, -22, 39,
+   117, -7, 48, 50, 93, 9, -8, 45,
+   36, -125, -8, -121, 39, -76, -92, -19,
+   95, 101, 19, 59, -72, -106, 82, 121,
+   -74, -123, -66, 121, -24, -69, 116, -28,
+   6, -17, -69, -38, -90, 76, 33, -127,
+   -67, 127, 31, 122, -113, 106, 123, -120,
+   83, 117, -41, 83, -48, 29, 123, 42,
+   -5, -84, -103, 106, -116, -9, -124, 117,
+   17, 120, -121, -15, 73, -91, 120, -127,
+   -70, 126, -128, 99, 127, 117, 124, -13,
+   -118, -27, -82, -52, -31, 39, -104, -125,
+   102, 14, -120, -94, 60, -39, -58, 9,
+   51, 120, -111, -103, 126, 54, -112, -124,
+   126, -10, 108, -39, 54, 51, -116, 61,
+   126, -72, 69, -60, 125, -17, 4, 46,
+   43, 127, 26, -51, 9, -104, 125, 37,
+   95, 45, -67, -65, 62, 122, -66, -22,
+   -89, -28, -99, -117, -81, -31, -51, 127,
+   88, -121, 8, 62, -4, -45, 16, -68,
+   9, -3, -73, -71, 29, -42, 69, -46,
+   115, 123, -14, -118, 51, -3, 79, -91,
+   -74, 91, -7, -119, 127, -95, -30, -49,
+   62, -16, 62, 69, 58, 72, 5, 40,
+   -121, -66, -4, 117, -121, 101, 53, 97,
+   -118, -111, -127, 115, 122, 40, -3, -44,
+   -5, -13, 5, 121, 49, 40, -124, -59,
+   126, 6, -30, -98, -116, -2, 65, 29,
+   -126, -121, -123, 15, 127, 119, -120, -51,
+   -71, 127, 7, 1, -112, 33, 106, -20,
+   -114, 59, -105, -81, -11, 28, 96, 4,
+   -92, 27, 32, -125, -60, -107, 69, -106,
+   23, 100, -53, -105, 13, -68, -126, 109,
+   22, -127, 27, -127, 26, -127, -122, 127,
+   -88, 66, 2, -105, -3, -113, -126, -40,
+   74, 44, -9, 107, 41, -74, 77, -74,
+   77, 127, 106, 53, 108, -71, -105, 122,
+   99, -114, -123, 24, -127, -62, -20, 125,
+   -12, 38, -43, -108, -33, -125, 103, -9,
+   -67, 127, -3, -113, -128, 71, 120, 57,
+   -127, -117, -122, 127, 124, 15, -54, 122,
+   -24, -24, -58, -25, 50, 76, -56, -119,
+   64, -88, -36, 125, 8, -117, 126, -60,
+   -116, -127, 105, 69, 10, -127, -112, -31,
+   -89, -58, 71, 31, -62, -2, -127, 8,
+   -74, 124, -84, -87, -119, -103, 41, -128,
+   -66, 127, -93, 55, 127, 19, 127, -97,
+   -22, -54, -124, -78, 32, 70, 26, -1,
+   124, 101, -127, -125, -82, 80, 98, 1,
+   -40, 30, -66, 33, -15, 85, 125, 74,
+   75, -73, 11, 126, 127, -34, -44, -47,
+   117, -124, 118, -126, -68, -126, -111, 116,
+   27, 92, 101, 45, 15, -113, 44, 47,
+   122, -128, 45, -81, -90, 116, -117, 127,
+   10, -7, -2, 2, 79, 46, -70, 72,
+   35, -35, -125, -44, 34, -83, 9, -26,
+   92, -121, -73, -105, -116, -6, 113, 43,
+   47, -86, -1, -21, 78, -120, -31, 124,
+   118, 127, -78, -113, 79, -47, 124, 120,
+   -79, -31, 66, -4, -117, 125, 65, 127,
+   14, -69, 84, 126, 89, 82, 86, 114,
+   -65, 15, -68, 57, -10, 123, -110, -108,
+   -113, 93, 86, 83, -26, -118, -86, -87,
+   -41, -126, -14, -127, 127, 55, 126, -85,
+   -87, -62, -126, 59, 127, 89, -72, -123,
+   -44, -63, 5, -34, 107, 37, 127, -102,
+   -50, 39, -126, -85, 118, 122, 82, -125,
+   -124, 106, -128, 52, 26, -128, 40, 11,
+   105, 91, 23, -4, 88, 14, -44, -5,
+   111, -122, -27, -125, -81, -69, -25, 87,
+   23, 125, -64, -31, 50, -120, -124, -123,
+   -109, 118, 32, 103, -6, -54, -76, 76,
+   -97, -3, 126, -47, 122, -22, -52, -125,
+   -6, -75, -79, -38, 79, -49, 77, -104,
+   -77, -35, -104, -128, -81, 36, 124, -59,
+   -36, 74, -6, 39, -60, -31, 81, 123,
+   -84, -123, -10, 124, -69, -53, -125, -126,
+   5, -20, 28, -68, 33, 118, -62, -122,
+   78, -63, -3, 126, 22, 28, 127, 100,
+   111, 14, -28, -77, 89, 124, 27, 56,
+   -118, 126, 123, -35, -112, -7, 38, -122,
+   -61, -70, 124, -64, 127, -22, 84, -57,
+   -24, 17, -76, 24, 44, 115, 107, 118,
+   -39, 89, 35, 126, 121, 23, 50, -25,
+   116, 63, -107, -122, 67, 114, 126, 108,
+   -27, 38, -60, -44, -127, 7, -88, -46,
+   52, 119, -96, -84, 93, 43, -94, 39,
+   44, -98, 84, -69, -33, -116, -122, 81,
+   -22, 63, 104, -62, 126, -127, 78, -117,
+   109, 111, 108, -40, -52, 45, -118, -22,
+   -50, -125, 7, -51, 125, -33, -106, 17,
+   119, -122, -98, -18, 3, 16, 5, 101,
+   8, 50, -1, 102, -108, 85, 65, 95,
+   4, 116, 2, -67, 21, -47, 50, -67,
+   -31, 58, 28, -23, -32, -13, 59, -23,
+   -80, -21, -13, -45, -91, -2, -24, -123,
+   30, -92, 51, 127, -73, -10, 118, 127,
+   -12, -123, -57, -116, 46, 113, -128, -118,
+   33, -32, 87, -110, 121, -102, 125, -124,
+   -60, -50, 20, -110, -56, 0, 61, -107,
+   -75, -126, -46, 118, -14, 58, -125, 8,
+   13, 31, 73, -115, -120, 47, 122, -85,
+   -17, 31, 6, -65, 70, 106, 123, -108,
+   40, -71, -20, -89, -74, -88, -32, -12,
+   24, -45, 73, 127, -39, -43, 110, 36,
+   76, -1, 113, 83, 95, 15, 53, 8,
+   -9, -126, -33, -102, -51, 69, -128, -14,
+   -98, 15, 119, -79, -15, -57, 126, -55,
+   -82, -95, 37, 99, 73, 121, -1, -40,
+   120, -127, -24, -22, -15, 22, -24, 28,
+   -117, -3, -26, 18, -54, 122, 73, 127,
+   116, -114, -40, -123, -66, 9, 4, 35,
+   78, 57, 52, 51, -2, 85, -10, -9,
+   -20, -22, -69, 106, -11, 36, 19, 48,
+   127, 7, 70, -121, 16, -19, 114, -17,
+   -117, -126, -3, -60, 26, 72, -123, -126,
+   33, 26, -128, -118, -84, -86, 121, -84,
+   80, -87, -56, -106, -79, -127, -3, -44,
+   7, 17, 36, 103, -1, -31, 127, -106,
+   -20, -78, -45, -91, 120, 77, 114, -122,
+   -48, 16, -102, 6, 56, 26, 127, 105,
+   -103, -117, 31, -124, 1, 19, 31, -13,
+   -82, -118, 123, 88, -24, 26, 107, -98,
+   -46, -13, 24, -2, -6, 81, -25, 55,
+   10, -38, -75, -60, -73, -52, 87, -41,
+   -88, -127, -123, -113, -25, -120, -67, 40,
+   -58, 29, -87, 117, 88, 40, -50, -117,
+   124, -95, -12, -25, 100, -28, 0, 11,
+   13, 62, -30, 26, -74, 127, 78, 127,
+   -103, -128, 3, 31, 112, -35, -32, 121,
+   126, 69, -2, 4, 86, 123, 100, -127,
+   -83, -11, -34, 75, -75, 52, 9, 118,
+   127, 5, -12, -93, -108, 17, -9, -21,
+   -62, -101, -10, 122, -24, 39, -100, -121,
+   -118, -58, 0, -55, 97, 120, 120, 26,
+   -22, -75, -22, 57, -89, 107, 117, -32,
+   75, -100, 49, 17, -20, 96, -64, 72,
+   28, 125, 38, -127, -69, 108, 33, -100,
+   36, 39, 3, 82, -50, -1, 127, -86,
+   74, 44, -64, -124, -83, 13, 18, -39,
+   40, -20, 92, -70, -16, -15, -17, -61,
+   91, 51, 114, 1, -21, -29, 123, 20,
+   -20, 5, -19, 7, -1, 86, 121, 12,
+   77, 23, 17, -83, 16, -34, 28, -2,
+   -76, -27, -52, -33, 64, -83, 122, -2,
+   64, -128, -9, 122, 127, -42, -37, 97,
+   2, 118, 38, -32, 49, 46, 60, 52,
+   -128, 0, 72, -2, 114, -109, -8, -37,
+   48, 65, -21, 127, 66, -48, -128, 123,
+   -26, 39, 8, 63, 2, -122, 35, 99,
+   56, -89, -1, -37, 3, 2, -126, 52,
+   4, 17, 46, -104, -126, -105, -46, -125,
+   -2, 27, 35, 45, -119, 42, 115, -18,
+   34, 56, 104, 2, 61, 52, 124, -34,
+   -73, 110, 19, 9, -15, -74, -6, -56,
+   86, -96, 17, -127, 28, -126, 3, 29,
+   -127, 76, 37, 125, 7, -7, 127, 52,
+   94, 23, 123, -115, 120, 41, 91, -88,
+   87, -50, -49, 88, 51, 1, -7, -20,
+   77, -39, -92, -47, -49, 33, -67, -33,
+   25, 29, 44, 14, -37, 118, -126, -63,
+   125, -6, 19, -124, -9, 104, -121, -94,
+   47, -101, -5, 90, 86, 64, -126, 29,
+   126, -128, 59, -105, 63, 1, 34, 62,
+   -43, 101, -109, -112, -22, 39, 86, 48,
+   -84, -126, -110, -43, -51, 68, 7, -99,
+   -81, 109, -43, -127, 2, 118, 123, -127,
+   -31, 21, 55, 36, 113, 19, -48, 123,
+   60, -1, -123, -108, 20, 32, -128, -13,
+   -11, -123, 72, -115, 126, 47, 61, -126,
+   89, 118, -20, 14, -127, -19, 102, 20,
+   11, 98, -71, -87, 24, -3, 127, 13,
+   92, -127, 83, -69, 9, -118, -38, -53,
+   19, 14, 27, -125, -9, 110, 115, 7,
+   126, 112, -124, 119, -43, -8, 127, 29,
+   -9, -29, -32, -110, 64, -108, 0, -92,
+   127, -12, -19, 31, -18, 2, 79, -52,
+   32, 79, -79, -83, 27, -35, -89, -124,
+   -125, 67, 23, 82, -37, -125, 127, -92,
+   -1, 5, 14, -117, 52, 42, 57, 94,
+   -87, -123, -60, -11, -7, -47, -122, -20,
+   -8, 123, -118, -13, -128, -95, -127, 74,
+   -104, -69, -125, 35, -30, 87, -64, -11,
+   124, -69, -93, 125, -119, 123, 106, -121,
+   -22, -68, 81, 124, -22, -96, -126, 69,
+   35, 29, -125, -85, 106, -59, -60, -61,
+   -121, 88, 87, -67, -112, -65, 127, 73,
+   -47, -122, -42, 127, 113, -121, 23, 26,
+   -12, 109, 76, 19, -21, -30, -11, -31,
+   12, -66, -17, 118, -83, -109, -128, -53,
+   -49, -128, 96, -2, 76, 102, -6, -19,
+   -126, 30, 61, -96, 51, 54, -8, 75,
+   117, 111, 87, -126, 104, -123, -42, -82,
+   -112, 58, 39, 127, -123, 68, -107, -128,
+   13, -81, 76, -108, 28, -49, -52, -67,
+   16, -19, -23, 31, -127, 84, -15, 21,
+   3, -70, -119, 26, 91, -122, -122, 89,
+   -117, 24, -78, 41, -17, -65, -114, -49,
+   7, -113, 78, 48, 117, 53, -110, -28,
+   -49, -60, -128, -44, -67, 125, 16, -26,
+   -119, 72, -41, -83, 120, 51, 114, -56,
+   127, -20, -15, -45, 61, -62, 119, -43,
+   118, -126, -32, -38, -112, -108, 121, 15,
+   -84, -90, 87, 83, 43, -41, 85, -128,
+   -3, 103, -122, 124, 18, -52, -58, -128,
+   109, -122, -49, -21, -110, 105, 2, -19,
+   -4, 111, -16, 74, -73, -27, -126, -44,
+   125, -126, -1, 49, -59, -66, -53, 116,
+   123, 126, -105, 119, 127, 127, 40, 43,
+   -44, -63, 18, -111, 124, -91, 18, 10,
+   -83, 4, -17, 1, 78, 121, -79, 9,
+   -128, 5, 112, 3, 13, -104, 55, -54,
+   3, 58, 27, 41, -45, -46, -26, -38,
+   -59, 122, -41, -34, 63, -40, 8, -4,
+   -12, 4, -75, 2, 83, -25, 25, 109,
+   46, 30, -9, 75, -45, -57, -58, -118,
+   74, 89, -124, -6, 25, -82, -107, -58,
+   -30, 117, 116, -19, 123, -30, -23, 51,
+   -11, -13, 8, 50, -121, -11, 46, -78,
+   120, -127, -6, 33, 53, 52, 126, -72,
+   109, -113, -118, -16, -82, -71, 2, -43,
+   -122, 55, -33, 49, -26, -118, 24, 113,
+   -24, 28, 77, -118, 12, 90, 95, 25,
+   127, 29, 101, 116, -9, -87, -78, 120,
+   120, 114, -122, 79, -94, -89, 61, -39,
+   5, -127, -14, 29, -127, -74, 76, 9,
+   -94, 73, -125, -62, -28, 47, 86, -83,
+   -124, -68, -11, -68, -31, 98, -79, -123,
+   122, 62, -103, -16, -48, 49, -79, -106,
+   65, 118, 56, 73, 53, -11, -112, -97,
+   -73, -39, 5, -69, 111, -45, 13, -3,
+   65, 4, -4, -88, 121, 11, 45, -19,
+   87, 84, -67, -114, 73, -83, -19, 30,
+   35, -79, 55, 77, -81, 63, -71, 2,
+   -83, 44, 127, 61, -75, 9, -125, 65,
+   -128, -23, -110, 43, -11, -19, -36, -102,
+   -77, 122, 63, 95, 105, -18, 11, 36,
+   125, -71, -59, -8, 16, 95, -61, -102,
+   -125, -69, 29, -16, -52, -27, 55, 102,
+   -24, -105, 52, -10, -123, -39, 81, -128,
+   -11, 91, 40, 11, 123, 27, 26, -28,
+   -97, -122, -121, 27, 49, 24, 112, -34,
+   -71, 125, 115, 75, 73, -65, 68, 53,
+   -99, -37, -86, 59, 73, -115, -128, 37,
+   -66, -66, -76, 115, -128, 20, -56, 3,
+   36, 91, -85, -121, 120, 24, -17, 108,
+   38, -82, 87, -39, 92, -10, 58, -20,
+   -30, 46, 66, -10, -95, -16, -57, -108,
+   68, -14, -57, -113, -55, -7, -91, 53,
+   112, 22, 24, 26, 102, -29, 76, 41,
+   13, 27, 17, 86, -33, 126, 103, 50,
+   -11, -49, -118, -103, 26, 116, 47, -56,
+   -88, -40, -24, -56, -2, 87, 105, -99,
+   104, -54, 14, 25, 118, -125, 11, 28,
+   -76, -70, -32, -71, 97, 15, -22, -35,
+   -100, -21, 24, -25, 17, -31, 80, -65,
+   50, 37, 115, 84, 53, 5, -33, -33,
+   -99, 25, -11, 20, 86, -96, 44, 86,
+   126, -111, 66, 21, 0, 63, -123, 93,
+   -15, 36, 127, -76, -123, -72, -111, -127,
+   -62, 1, -85, 1, -32, 61, 50, 57,
+   27, 87, -34, -30, -2, 28, 111, -59,
+   -18, 16, 3, 82, 4, -128, 126, -76,
+   -21, -122, -21, -93, -28, 42, -52, 1,
+   -16, 37, 67, 17, -91, 29, 121, 6,
+   118, -43, -54, -125, 87, 4, -25, 50,
+   124, 57, 43, 22, -51, 21, -49, 21,
+   12, 71, 122, 45, -66, -58, -54, 44,
+   41, 52, -6, 84, -56, 127, -122, 57,
+   75, -42, 127, -11, -42, 31, -124, 54,
+   21, 5, -23, 108, 123, -64, 23, 45,
+   100, -28, -86, -50, -32, -27, 116, 99,
+   58, 35, -64, 71, 32, -51, 63, 0,
+   46, -89, -69, 40, -12, 27, 71, -24,
+   -76, 91, -40, -88, 119, 47, 126, -122,
+   -81, -81, 7, 10, 50, 113, 2, 58,
+   26, -55, -98, -59, -50, -59, -110, -125,
+   16, -59, -41, -16, 103, 48, 83, -26,
+   54, -119, 11, -36, 126, -16, 35, 38,
+   -96, 118, 0, -43, -30, -26, 21, -28,
+   32, -75, -17, 29, -7, -127, -16, -23,
+   3, 18, 75, -42, 97, 117, 26, 126,
+   118, 62, -126, 17, -112, -70, 119, -47,
+   60, -42, -49, -33, 69, -43, 79, 7,
+   80, 116, -45, 113, -45, -74, 72, 21,
+   63, 19, -116, -15, -110, -67, -121, -2,
+   -42, 101, 79, -36, 15, -50, 81, 127,
+   -51, 120, -47, 38, 22, -75, 126, -39,
+   -38, -123, -13, 31, 16, 62, -119, -76,
+   35, -7, 17, -11, -122, -6, 65, 93,
+   36, 104, -100, 73, -9, 95, 92, -80,
+   75, 34, -65, 18, -112, 20, 0, -27,
+   -2, -127, 54, 25, -45, -61, -126, -53,
+   -15, -29, -7, -1, -41, -126, 21, -124,
+   -75, 86, -43, 62, 75, 55, 122, 54,
+   -8, -124, -109, 108, 71, 20, -26, 28,
+   -29, 11, 125, -51, 90, -11, 29, 67,
+   -124, -80, 51, 8, 72, 46, -120, -75,
+   -44, -52, 34, 2, -19, 127, 113, -34,
+   -97, 85, -32, -58, -5, 35, 125, 80,
+   -17, 40, -34, -30, -50, 6, -63, -40,
+   102, -12, -17, -2, -80, 120, 66, 121,
+   -40, 87, -13, -38, 36, -36, 1, -6,
+   72, 61, -1, 82, -102, -37, -32, 4,
+   -6, 66, -73, 126, -6, -4, -42, -27,
+   24, 118, 5, 10, -32, -20, -36, -23,
+   -74, 5, 85, 67, -45, -115, -101, 115,
+   85, -75, -61, 29, -17, -89, 104, 91,
+   -46, 102, -68, 56, -112, -67, -75, -114,
+   45, 111, -35, -51, -125, -87, -20, 59,
+   -120, -15, -22, 1, -96, -95, 15, 119,
+   -14, -111, 18, -6, -42, -88, 42, -2,
+   22, 112, 89, 97, 40, 98, 117, -123,
+   -4, -27, 61, -96, -83, 10, -1, -1,
+   31, 51, 1, 9, -93, 47, -38, 88,
+   -75, -79, -28, 13, -16, -31, -94, 36,
+   63, 120, -72, -127, 4, 78, 21, 34,
+   -30, 43, 23, -123, -124, 17, -71, 38,
+   -103, 3, -15, 17, 124, 84, -88, -21,
+   73, 37, 50, 44, 107, 34, 81, 33,
+   -55, 2, 8, 33, -15, 10, -119, 33,
+   10, -10, 44, 74, -70, -67, 90, 7,
+   -67, 28, -123, 33, -27, 63, 2, 123,
+   87, 5, -76, 53, -128, -55, 120, -115,
+   111, -43, 16, 14, 98, -2, -24, 46,
+   -4, -123, 34, -50, 113, 27, 38, 117,
+   106, 46, 10, 2, -2, 72, -123, 3,
+   14, 28, 3, -124, -51, -40, 73, -117,
+   32, 86, 22, -32, -76, -119, 83, -96,
+   -94, -51, -51, -87, 53, 94, -87, -2,
+   -22, 36, -127, -34, 77, 127, 121, 57,
+   39, -71, 98, 13, 13, -43, 3, -34,
+   71, 124, 117, 48, 74, 10, 20, -2,
+   -105, -71, 10, 62, -74, 4, 74, -17,
+   -40, -50, -116, 29, 27, 47, 68, 7,
+   -60, 67, -58, -119, 53, -25, -79, -102,
+   70, 27, 5, -14, -74, 51, -12, -13,
+   1, 17, -22, -87, -12, 0, -50, 19,
+   -114, -33, -56, -99, 45, -27, -6, 47,
+   21, 21, -91, 35, 87, -32, 8, -126,
+   -2, -51, -122, 93, -63, -118, 4, -36,
+   40, -46, 56, -79, 126, 30, -4, 81,
+   11, 12, 106, -1, -89, -90, -45, 46,
+   -118, 12, -81, 75, -99, 20, -120, 78,
+   5, 93, 79, 9, 101, -47, -78, -104,
+   -62, 123, -13, 108, 101, -55, 27, -4,
+   -127, -35, 63, 79, -98, 36, 15, 62,
+   -9, -23, 45, -17, -37, -5, 49, -120,
+   -89, -10, 123, -38, 125, -103, 119, -104,
+   11, 8, 72, 39, -39, 110, -20, 19,
+   -38, 91, -104, 103, -47, -24, 25, -14,
+   -59, -29, -23, 82, -8, 7, -106, -11,
+   5, -15, -30, 87, 27, 102, -95, 52,
+   66, -48, -124, -58, -126, -30, 127, 63,
+   -121, -16, -42, -125, 77, -4, -107, -19,
+   -29, 22, 5, -56, 29, -88, 10, 26,
+   -127, 36, -17, 67, -26, 93, -16, -31,
+   7, -30, -17, -24, -56, 33, 10, -125,
+   120, 119, -128, -77, -68, -9, -33, -60,
+   7, 1, -88, 40, -6, -67, 43, 14,
+   -128, -26, 39, -26, -80, -120, 7, 125,
+   69, -86, 47, 5, 119, 76, 38, 52,
+   6, 62, -31, 15, 71, -25, -61, -75,
+   88, 109, -4, -93, -126, 56, -99, 103,
+   16, 93, 93, -11, -127, 106, 5, -126,
+   19, 56, 68, 59, -41, 9, 17, 29,
+   0, 112, -74, -51, -127, -119, -110, -122,
+   -9, -64, -86, -50, 61, 40, 33, -105,
+   127, -6, -28, -9, 26, -20, -81, 50,
+   -111, -118, -25, -49, -109, -35, -96, 127,
+   -51, -120, 127, 22, -125, 43, 29, 127,
+   1, 66, 19, 4, 15, 86, 42, -71,
+   -26, 125, 80, 48, -100, 125, -13, 126,
+   33, -14, 33, -16, -68, -33, -4, 75,
+   -127, 20, -12, -10, -3, 25, -43, -30,
+   14, 12, -33, 44, 51, 46, 63, -116,
+   76, 93, -128, -35, 13, 9, -39, -97,
+   33, 55, -39, 24, -33, 52, 84, -65,
+   120, 11, 103, -32, 101, 127, 23, 3,
+   20, 31, 53, 39, -38, 41, -19, 94,
+   -41, 67, -33, 15, 9, 24, -77, -26,
+   93, -71, -8, 46, -26, 51, -21, -127,
+   42, -12, 126, 48, -121, 48, 39, -123,
+   -5, -4, 45, 60, -122, -55, 13, -43,
+   -9, 100, -7, -122, 32, -63, -71, -85,
+   58, -59, -60, -70, 93, 68, 85, -77,
+   126, 43, -5, 63, -103, -69, -49, 59,
+   -51, -120, -53, -75, -98, -21, -20, 127,
+   -43, -35, 127, 27, 57, 83, -8, 127,
+   -50, 119, 126, -65, -14, -95, -22, 33,
+   -17, -39, -39, 12, 122, -118, 17, -26,
+   -94, 47, -30, 111, 26, 14, -79, 105,
+   127, 31, -51, -96, -75, 21, 67, 25,
+   22, 79, -98, 41, 110, 59, 127, 127,
+   -18, 3, 97, 124, 36, -8, 9, -99,
+   23, 1, 66, 39, -44, 116, 123, -5,
+   124, 84, -6, -55, -50, 121, 47, -117,
+   -80, 85, -113, 22, -126, 101, -81, 119,
+   6, 39, 1, 81, -30, -50, -120, -9,
+   42, -126, 1, 23, 111, -33, 14, -128,
+   -4, -57, 26, -45, 126, -115, 8, 14,
+   84, -11, 19, -3, -123, -127, 80, -37,
+   -100, 13, -57, -121, 122, 45, -59, 36,
+   50, 3, 39, -15, 7, -12, -15, 96,
+   -128, -7, 47, -47, -19, 71, 31, 26,
+   63, -67, -112, -36, 45, 14, 65, -103,
+   4, 59, -127, 37, 127, -47, -35, 44,
+   9, 115, 120, -127, 96, -125, -33, 114,
+   66, -120, -1, 15, -128, -126, 28, -125,
+   16, 8, 56, 83, 109, 116, -59, 111,
+   40, -4, -60, -15, -10, 101, 41, -100,
+   -3, -39, 91, 34, 26, -78, -4, 126,
+   -18, -11, 112, -108, 40, 11, 44, -50,
+   62, -67, 37, 80, 22, 11, 101, 21,
+   -115, -69, -32, 59, -125, -126, 107, 120,
+   -24, 119, -127, -48, -3, 6, -70, 65,
+   -114, -3, -5, 120, -23, -80, 72, 68,
+   63, 48, -7, -112, -109, 5, -34, 116,
+   -73, 126, -15, -87, 22, -7, -39, -12,
+   74, 14, 4, -113, 44, 33, 82, 32,
+   -113, -107, -20, 102, -111, 1, -122, 63,
+   -115, -45, -61, -53, -85, -16, -9, -23,
+   -24, -5, -38, -76, 37, 59, 4, 79,
+   23, 70, -113, 36, -42, -41, -68, -59,
+   9, -100, -105, 117, 127, -127, 45, -128,
+   9, 26, -115, -80, 99, 72, -74, 17,
+   8, 8, 60, 31, -128, 126, -122, 107,
+   7, -28, 28, -109, -32, -44, -81, 16,
+   -128, 13, -126, -39, 18, -69, -84, -22,
+   -113, -31, 48, 49, 0, -65, -109, 82,
+   57, -95, 12, 13, -43, 19, 36, 95,
+   -113, 40, 95, 116, -11, 61, 55, -61,
+   127, 67, 127, -46, 126, 31, 116, -30,
+   -67, 113, 90, -23, 54, -55, 13, -45,
+   127, 63, -22, 120, -13, -22, 58, 91,
+   52, 45, 13, 83, 40, 87, -25, 125,
+   91, 74, 50, -124, 86, 66, 5, 127,
+   -19, 116, 6, -12, 4, 42, 92, -40,
+   -100, -21, 123, 27, -45, 4, -97, -22,
+   -113, -4, -27, 18, 49, 78, 107, 6,
+   126, 127, 8, -47, -124, -110, -8, 17,
+   67, 51, 5, 13, -11, -76, 15, -124,
+   37, 58, -71, 25, -112, 45, 35, -128,
+   44, 127, 34, 39, 15, -17, 49, -3,
+   -24, -27, -49, 12, 127, 111, -78, -63,
+   30, 29, 29, -25, 73, -66, 94, 17,
+   6, 75, -82, 118, -96, 55, -47, -53,
+   16, 21, 115, 15, -10, 64, 7, 42,
+   73, -33, -38, 6, -88, 94, 31, 51,
+   -99, -27, 0, 123, -124, 81, 51, -54,
+   -112, 115, 42, -124, -60, 99, 23, 101,
+   62, -52, 20, 6, -43, 4, 9, 0,
+   44, 51, 8, -59, -11, 110, -6, 100,
+   29, 127, 0, 92, 127, 13, -38, 65,
+   23, 76, -1, -127, -69, -14, 59, -33,
+   -57, 11, 0, 83, -38, 52, 110, -36,
+   -35, -112, 99, -16, -113, 125, -50, -114,
+   63, -62, -6, 39, -9, 110, 0, -100,
+   -29, 123, 121, 7, 82, -51, -32, 51,
+   -34, 84, -76, -82, 90, -105, 111, 24,
+   17, -16, -41, -116, -123, 1, 48, -127,
+   55, 66, -16, -84, 74, -37, -91, 27,
+   83, 47, 49, 92, -80, 32, 72, 65,
+   29, 16, -7, 8, -106, -3, 15, -69,
+   -48, -27, 45, 8, -51, 58, 35, -10,
+   -15, 0, 15, 4, 50, -64, 6, -16,
+   -35, 59, -2, 14, 1, 7, 4, -74,
+   7, 124, 38, -46, 70, 0, -73, -35,
+   -5, -4, 0, 54, 7, -4, 10, 93,
+   -8, 42, -93, -38, -46, 1, 29, 50,
+   78, 75, 63, -73, 14, -26, 6, 58,
+   -81, 7, -3, 86, 69, 5, -6, 14,
+   48, -41, 124, 0, 43, 65, 24, 54,
+   -79, 32, 46, 17, -13, -57, -35, -10,
+   -19, 40, -78, -47, -4, 30, -86, -61,
+   0, 15, -15, 13, 127, 5, -22, 61,
+   68, -33, 8, -16, -34, 10, 33, 5,
+   -48, 14, 49, 126, -27, 20, 96, 26,
+   8, 24, -4, 57, 54, 45, -11, -126,
+   126, -13, -51, -32, 4, -65, 74, -77,
+   -35, -3, -7, -69, 10, 13, 0, -49,
+   -123, -56, -9, -61, 6, 18, -1, 12,
+   -67, 23, 5, -30, 7, 37, -34, 12,
+   -40, 3, -25, 32, -60, -66, 97, -27,
+   32, 20, -95, -3, 8, -76, -15, 61,
+   8, 19, 9, 18, -20, -13, 105, -13,
+   47, -11, 19, 10, -47, 1, 125, 77,
+   90, 34, -76, 49, 64, -28, -67, 2,
+   -32, -24, -1, -25, -120, 1, -68, 55,
+   81, -85, -11, -12, -29, -110, 2, -44,
+   41, -12, -16, 7, -1, -118, 76, -76,
+   -17, -43, -8, 101, 86, -123, 70, 45,
+   -13, -39, 114, -72, 101, -5, -8, -5,
+   -54, -49, -92, -26, -117, 19, 14, -116,
+   37, 8, 15, -15, 30, -22, -16, 23,
+   -83, 5, 57, 14, -19, -9, 51, -1,
+   -20, -26, -3, -8, 3, -14, -51, 11,
+   -56, 30, -5, -108, -10, -115, -89, -38,
+   -70, -4, -15, -30, 35, 48, -119, -63
+};
+
+static const rnn_weight noise_gru_recurrent_weights[6912] = {
+   20, -47, 122, 31, 41, -36, 18, -22,
+   0, 87, -28, -26, -68, 8, -54, 104,
+   112, 19, 31, -118, -31, -31, 9, 17,
+   11, 5, -53, -24, -17, 24, -35, 16,
+   53, -26, 6, 24, 48, 11, 17, -34,
+   17, -15, -51, -32, -44, -11, 10, 63,
+   25, -92, -52, -30, 26, -57, 44, -18,
+   20, 49, -40, 74, 96, -43, 99, 90,
+   -15, 40, 11, -119, -125, 42, 58, -127,
+   -27, 9, -64, -64, -87, -31, -53, -39,
+   -1, -11, 53, -6, -124, -6, -81, -67,
+   46, 23, 11, -124, -48, 100, -62, -6,
+   -17, -124, 10, 81, 39, 35, -125, -52,
+   4, 41, -43, 12, -48, 13, 27, 41,
+   25, -20, 4, -71, -59, -30, 43, 46,
+   22, 34, 50, -78, -117, -26, 67, 22,
+   -27, -86, 48, -51, -52, 32, 48, 1,
+   -11, 63, -38, 62, -13, 17, 32, -6,
+   11, -15, -65, -45, 69, -9, -33, -13,
+   -114, -30, 55, -29, -33, 3, -59, 44,
+   72, -52, 22, 65, 14, 5, -20, 19,
+   12, 81, -2, 100, -6, 125, -41, 124,
+   -2, 24, 107, 21, -38, 66, 46, -20,
+   -11, 8, 51, -59, 8, 50, -78, -26,
+   98, -21, 120, -30, 34, -49, 72, -22,
+   -74, 69, -86, -11, 23, -126, 10, 12,
+   -35, -36, 20, 21, -24, 39, 44, -110,
+   -54, 33, 1, 10, -83, 36, -37, 7,
+   -57, 0, -73, -23, 15, -10, -14, 12,
+   52, -80, -21, -40, 0, -47, 24, 8,
+   58, -41, -48, 14, 27, -83, -11, 62,
+   5, 101, 35, -75, 89, -101, 44, 50,
+   -77, -115, 1, 50, 25, -113, -64, -6,
+   -14, 30, -80, -91, -48, -126, -51, -93,
+   -103, -1, -49, 73, 25, -39, 51, 70,
+   -39, -53, 41, -60, -70, -72, -6, -19,
+   63, 75, 120, 79, 1, -57, 8, -3,
+   18, 5, -56, 31, -13, 73, 83, 77,
+   4, -122, 122, -127, -17, 63, -119, -30,
+   -74, -109, -106, 44, -12, 106, -15, -31,
+   -19, 17, 87, 15, -79, 81, 32, 35,
+   60, 127, 0, -53, -60, 30, -93, -31,
+   -19, 36, -19, -21, -46, 44, 16, 88,
+   -98, 61, 65, 25, 119, -70, 127, 52,
+   12, -1, -6, -72, 15, 99, -117, 22,
+   3, 99, -63, -54, -56, -1, -32, -2,
+   -120, 53, 66, -8, 112, 43, 2, -57,
+   -27, -92, 39, 100, 5, -20, -66, -7,
+   33, -81, -127, -80, 27, -112, -76, -53,
+   122, 12, 33, -88, -25, 47, -112, 10,
+   -38, 117, 29, -125, -65, 30, 60, -124,
+   -61, 14, 108, 7, -30, -50, -38, 44,
+   16, -35, 39, -2, 125, 83, -1, -24,
+   -27, 106, -76, 58, 122, 24, 15, -86,
+   -101, -82, 121, 6, -4, 33, 0, -40,
+   -80, 22, -24, -124, -39, 120, -53, -1,
+   63, 12, 48, -54, 83, -109, 40, 7,
+   26, -51, -74, 38, -12, 0, 33, -66,
+   50, -118, -25, -109, 18, 59, 124, 50,
+   10, -42, 12, 68, -85, -59, 46, 34,
+   5, -1, -2, -41, 53, 3, -8, -62,
+   -8, 33, -95, -24, 52, 30, -16, 98,
+   -13, -54, -54, 39, -30, 9, -78, -13,
+   -21, -39, -20, -21, 36, 24, 1, 63,
+   28, -72, 63, -15, -127, -19, 16, 56,
+   4, 22, -71, 9, -13, 18, -42, 5,
+   -10, -14, -71, -37, -47, -48, -68, 64,
+   56, 23, -90, 15, -67, -38, -1, 10,
+   -34, -119, 55, -61, -25, 24, 29, -47,
+   -53, -28, 32, 23, 51, 45, -17, 111,
+   12, -16, -63, -25, -50, 31, -18, -45,
+   2, -15, -79, -11, 78, -102, -46, 31,
+   -47, 69, 8, 63, -123, 107, -74, -78,
+   45, 55, 20, -64, 30, 95, 44, 6,
+   13, 28, -37, -70, -21, -84, 16, 6,
+   5, -53, 8, -9, -11, 24, 41, -39,
+   -84, -40, 24, -126, -41, -3, 13, -84,
+   59, -62, -43, 11, -15, 14, -46, -125,
+   -72, -38, -48, 22, -38, 84, 39, -29,
+   -97, 31, 8, -46, 22, -68, -60, 8,
+   -47, -123, -18, -102, -43, 34, -79, 30,
+   -74, -94, 64, -57, -1, 98, -9, 97,
+   -119, 45, 19, -24, -26, -99, -55, 24,
+   46, 7, -6, -126, -80, 15, 1, -20,
+   -72, -68, -23, -79, -74, 65, 8, 26,
+   118, 13, -82, -38, 20, -9, 104, 41,
+   42, 126, -15, -54, -65, -97, 59, 50,
+   12, 76, -47, 92, -126, -39, 2, 46,
+   27, 101, -87, -7, -26, -25, -2, 22,
+   12, 57, -99, -16, 54, 126, 80, -17,
+   54, 21, -21, 83, -54, 62, -11, 35,
+   -37, 80, -2, 20, 6, 39, -20, -74,
+   33, -53, 56, -21, -48, 37, 37, 0,
+   -40, 13, 44, 107, -47, -21, 19, -23,
+   -116, 104, 72, -43, 59, 37, 53, 70,
+   -59, 26, -14, 41, 13, 17, 32, 123,
+   -73, 62, 101, -47, -60, 15, -44, 7,
+   -114, -40, -39, -79, 84, 18, 114, 70,
+   103, 55, -24, -8, -80, 71, -50, 55,
+   54, 46, 25, -59, 15, 19, 122, -104,
+   121, -5, 45, -22, 118, 88, -2, 123,
+   -13, 21, -33, -70, -54, -86, -29, -85,
+   -40, -38, -20, -71, 8, -97, -23, -48,
+   -4, -9, 25, -122, -52, -119, -5, 3,
+   39, -28, -113, -65, -44, 5, 13, -14,
+   83, 9, 50, 27, -24, -13, -14, -37,
+   106, -31, 58, -26, 37, 1, -78, -128,
+   -12, -39, -127, 20, -53, 54, -61, 71,
+   16, 41, 54, -92, 57, 88, 48, -51,
+   -7, 18, 24, -12, 83, 29, 63, -20,
+   -88, 11, -17, -79, -84, -51, 53, -2,
+   -21, -64, -28, 98, -14, 7, 127, -122,
+   -22, -25, 6, 4, 121, 124, 111, 38,
+   -33, -17, -106, -2, -10, 12, -35, 67,
+   -2, 8, -15, -17, 48, 66, -5, -10,
+   -33, -2, -37, 73, -110, 124, -27, -14,
+   -7, 46, 6, -14, -37, -32, -32, -33,
+   39, 33, -21, -111, 1, 21, -126, -99,
+   -81, 31, -32, 58, 32, -104, 23, 61,
+   -48, 20, -5, -51, 57, -126, -10, 110,
+   -6, -32, -35, 65, 42, -95, -74, -72,
+   6, 45, -81, 34, -61, -128, 46, 22,
+   5, -30, -59, 116, -95, -31, -14, 16,
+   18, -39, 52, -36, -35, -1, -107, 59,
+   34, -24, 35, 28, 52, -65, -49, -66,
+   -1, 59, -87, 45, 42, 124, -47, -59,
+   -68, -85, 52, -18, -119, 19, 25, -126,
+   -118, -26, -9, 82, -111, 20, -72, -86,
+   6, -36, 18, -45, 100, 3, -86, -17,
+   125, -121, -50, 25, 37, 123, 20, 52,
+   -118, 53, 19, -31, -86, 123, 63, -110,
+   -12, -28, 64, -39, 75, 96, -95, 58,
+   45, 43, 97, -71, -25, -38, -8, -33,
+   -85, -56, -44, 41, 82, -77, 71, -35,
+   29, -36, -16, 21, -84, -7, -37, -82,
+   60, 21, 26, -39, -23, 87, -2, 46,
+   -27, 45, -38, -25, -67, 45, -48, -3,
+   11, -82, -15, -34, -35, 87, -94, -17,
+   47, -33, 41, -17, -36, 30, 41, -18,
+   81, 33, 25, -80, 65, -6, 65, -35,
+   -18, -105, 33, 57, 5, -12, 25, 120,
+   6, -69, 90, -41, 45, -59, -82, 80,
+   41, -11, 6, 38, 105, 51, 58, -73,
+   20, 19, -4, 40, -28, -124, 116, -33,
+   -15, 23, 124, 68, 28, 6, -25, -29,
+   18, 80, -35, -4, -25, 10, -118, -20,
+   9, 94, -111, -76, 43, -19, 15, 97,
+   -19, -21, 63, 92, 72, -67, -23, -66,
+   -49, -14, 6, -47, 17, -101, 21, -29,
+   89, -72, -86, 112, -92, 38, -71, 114,
+   -53, 47, -102, 6, -59, 64, -16, -116,
+   -22, 6, -43, 19, 9, 9, -37, -68,
+   86, -6, -84, -40, 10, -14, 80, -10,
+   -49, 76, 31, 47, 123, 90, -49, 35,
+   9, 64, 71, -29, -40, -107, 60, -33,
+   -23, 25, 63, -116, -16, -118, 82, -125,
+   -7, 26, -70, 77, 37, 124, 29, 80,
+   69, 88, -5, -56, -77, 68, -77, 61,
+   20, -72, -27, -120, -58, -70, -10, -126,
+   -49, -66, -44, 127, -28, 83, 63, 65,
+   -90, -29, -121, -1, -30, 85, -41, -91,
+   40, -43, 68, 85, 85, -75, -43, 122,
+   -24, -103, -82, 20, -113, -22, -36, -72,
+   29, -39, 28, -24, -16, 11, 27, 28,
+   -1, -61, 15, -126, 1, -31, -43, -26,
+   24, -27, -42, 28, -80, -34, 15, -44,
+   -42, 31, 23, -40, 30, -2, -54, -6,
+   -48, -114, 36, -71, 13, 57, -127, 94,
+   1, -28, 116, -62, -3, -29, -23, -75,
+   -110, 49, 42, 127, 19, -121, -92, 56,
+   -58, -28, -41, -19, -5, 38, 106, 120,
+   40, 2, 86, -58, -49, -20, 102, -56,
+   -86, -7, 1, -85, 10, 34, -11, -63,
+   -1, 85, -106, 31, -48, -64, 12, -14,
+   -111, -82, -28, -11, -26, -52, -43, -33,
+   -20, -57, -91, 27, -64, 54, -55, -32,
+   27, 97, 11, 13, -8, -120, -35, 35,
+   6, -117, 25, 104, 7, -1, -8, 0,
+   31, -29, -10, -20, -33, -23, -1, -6,
+   -107, 60, -62, 70, -28, -96, 48, 17,
+   -103, -64, 30, 42, 18, 66, 0, -69,
+   -16, 77, -21, -4, 35, 45, -70, 70,
+   36, 27, 97, -27, 57, 23, -23, 91,
+   118, -12, 24, 21, -54, 1, 40, -17,
+   -109, 39, 33, -22, -44, 46, 20, -15,
+   -42, 29, -10, -64, -16, 35, -95, -83,
+   40, -34, -63, 54, -12, 2, 104, -5,
+   -103, -79, -94, 126, -7, 18, -17, 116,
+   -15, 76, -48, 19, -5, 76, 58, 53,
+   1, 20, 22, -13, -63, 11, -15, -117,
+   -39, 43, -21, -5, 18, 16, -7, -72,
+   34, -103, 86, -76, -114, 26, 39, -4,
+   3, 45, -37, -55, -34, 56, -113, 14,
+   -56, 21, 83, -115, 52, -41, 71, -51,
+   -125, -95, 11, 93, -48, 5, -41, -128,
+   11, 22, -20, -103, 1, 17, -69, -28,
+   -32, 25, 119, 52, -92, -92, -19, 57,
+   77, -51, 59, -57, -8, -90, -17, -44,
+   -94, -43, -90, 5, 18, -27, -72, 42,
+   -18, -29, 32, -30, 19, -7, -27, -102,
+   -82, -20, -7, -127, -26, 60, 1, -37,
+   -124, -92, -47, -8, 8, -55, -25, -88,
+   -18, 98, -5, -35, -44, 15, 121, -38,
+   -13, 9, -88, -126, 68, -126, 62, -49,
+   -44, -56, -71, 3, 65, -27, -46, -103,
+   -78, 29, -65, -23, 100, 75, 47, 8,
+   57, -43, -47, 69, 112, -85, 51, -56,
+   36, -101, 13, -36, 73, 26, 31, -8,
+   53, 52, -38, 29, 81, -26, 116, -18,
+   35, -49, 2, -6, -4, 52, 94, 59,
+   -120, 68, -59, 6, -3, -54, -22, 18,
+   1, -126, -127, -34, 19, 105, -26, -16,
+   113, -43, -31, -7, -60, -4, 72, 39,
+   17, 38, 118, 31, 5, 19, -70, -14,
+   -93, -8, -107, -56, -59, 56, -127, 41,
+   -63, -30, -71, -27, -4, 13, -15, -66,
+   -50, 33, 38, 34, -47, 2, -50, 71,
+   -49, 18, -39, -18, 46, -3, 50, -18,
+   -32, -67, -25, 58, -14, -7, 23, -3,
+   -24, 7, 8, 118, -20, -55, -24, -30,
+   -16, -9, 73, 63, -74, 42, 112, -35,
+   -27, 38, 59, 13, 72, 2, 109, -11,
+   -75, 30, 28, -20, -74, 16, 103, -83,
+   -6, -115, -44, -11, -33, -120, 66, -58,
+   22, -12, 15, -32, -26, 1, 30, 35,
+   76, 62, -121, 9, -32, 12, 75, -77,
+   80, 25, -18, -78, -123, -61, 23, 36,
+   -127, -65, 15, 29, 100, -23, 2, 15,
+   21, 52, -120, -14, 12, -38, -39, 100,
+   13, -3, 22, -125, -115, -44, -65, 85,
+   -44, 35, -27, -44, 9, 77, 2, 4,
+   5, 35, -31, -126, -112, -91, 32, -24,
+   6, -73, -41, 41, -23, 42, -127, 41,
+   -51, -8, -55, -52, -32, -6, -52, 55,
+   -16, 26, 110, -63, 70, 127, 38, 80,
+   17, 87, 44, -51, 34, 127, -16, 117,
+   126, 22, -24, -123, -6, -76, 12, -4,
+   -3, 47, -31, 28, 30, 12, -24, 84,
+   110, -105, 64, 44, 84, 27, -13, 54,
+   104, -20, 60, -60, -10, 45, 120, -55,
+   -6, -91, 35, 10, 2, 38, -30, -125,
+   -100, -23, -126, 47, -16, -17, 20, -73,
+   6, 31, -28, -121, -53, 79, -100, -4,
+   69, 0, -20, 125, 35, 16, -44, -20,
+   -5, 44, -113, -11, -6, 57, 33, -3,
+   -21, 50, 101, -9, 42, 72, -10, 21,
+   95, 39, 8, 72, 42, -43, -24, 30,
+   33, -27, -17, 79, 52, -127, 3, 39,
+   1, -66, -43, 85, 11, -56, -20, 14,
+   -7, -30, -8, -10, -34, 48, -109, -12,
+   -99, -58, 123, -82, 35, -102, 7, -83,
+   -104, 29, 99, -91, 13, 15, -64, -111,
+   -17, -24, -98, -97, 86, 0, 12, 123,
+   -113, 61, -13, 3, 31, 4, -92, -115,
+   126, 7, 6, 74, -68, 46, 19, -85,
+   -94, -20, -20, -117, 59, -51, -59, 20,
+   18, 3, 6, 21, 1, 94, -78, 112,
+   -12, -46, -30, 67, -16, -83, 6, 42,
+   -118, 49, -82, -21, -4, 15, -12, -67,
+   20, -71, -69, 57, -10, -51, -46, 99,
+   -5, -9, -40, 59, -61, -11, -59, -69,
+   2, -55, -32, -48, -4, -6, -33, -110,
+   94, 43, -19, -18, 31, -126, -5, -19,
+   -80, -20, -20, -28, -56, -70, 45, -46,
+   43, 77, 6, 77, -90, 26, -37, 35,
+   -39, -48, 28, 9, -56, -42, -31, -46,
+   -31, 13, -65, 77, 34, -41, 9, 17,
+   20, 24, 51, -44, 11, -21, -44, -78,
+   -96, -23, -22, 6, 18, -126, -110, -33,
+   8, -32, 17, -123, -43, -7, -53, 17,
+   46, -53, 26, -15, 70, 19, -51, 67,
+   25, 117, 56, 7, -6, 74, 57, 101,
+   122, 41, -32, -44, -21, 54, 32, 22,
+   119, 120, 72, 68, -24, 29, 48, -6,
+   2, -14, 5, -35, -77, 4, -72, 53,
+   46, -31, 57, 25, 9, 69, -21, -7,
+   70, -41, 43, 63, 10, -53, -68, -31,
+   20, -19, -90, 48, -22, -54, 33, 64,
+   20, -79, -13, -17, 45, -41, 103, -16,
+   25, 6, -35, -24, 28, 9, -29, 76,
+   4, 40, 47, 23, 24, -51, 92, -17,
+   49, -23, 107, -13, 65, 72, 34, -19,
+   -20, -60, -45, -55, -2, 19, -58, -49,
+   7, 20, 78, 120, -69, 28, 45, -119,
+   -15, 13, 20, -45, 25, -108, -20, 12,
+   -54, -17, 32, -17, -13, -3, -3, 17,
+   -25, -48, 95, 8, 36, -66, -4, -26,
+   -17, 12, 39, 57, 53, -17, -33, -46,
+   -18, -61, 19, 64, -72, -12, -69, -31,
+   -31, 66, 65, -62, -10, 120, 4, 46,
+   122, -36, 75, -47, -5, -82, 49, -3,
+   -123, -125, -37, 127, 33, 111, 58, -68,
+   -36, 87, 51, 22, -49, -1, 115, -10,
+   -40, 37, -56, -90, 11, 34, 77, -5,
+   -37, 61, 123, -11, 17, 46, 64, -86,
+   -96, -5, -18, -84, 116, -126, 127, 55,
+   58, 27, -68, 42, 47, -63, -108, -103,
+   -33, -1, 77, 0, -9, 33, 126, -106,
+   -14, 127, 8, 2, -42, 37, 41, -23,
+   17, 11, 4, -65, -42, 0, -47, -36,
+   -11, 34, -83, -25, 52, -125, -25, 0,
+   7, 24, -83, -56, -21, 112, -60, 25,
+   -124, -114, -67, -14, -55, -28, -34, -9,
+   119, 8, -47, 52, -6, 20, 23, 9,
+   -104, -27, -46, -42, -32, 55, 118, 49,
+   -35, -41, -19, -103, 1, 63, -47, 9,
+   1, 0, 124, 72, 1, 8, 47, 118,
+   29, -39, -20, 26, -38, -17, 13, 68,
+   -52, -37, -30, 105, 7, -5, 27, 24,
+   71, 15, -48, 80, -9, -9, 66, 19,
+   19, -31, -74, 115, -4, 21, 78, -19,
+   2, 17, -51, 28, -109, 58, 78, -10,
+   -3, 119, -44, -12, -41, -57, 67, 38,
+   49, -113, -43, -101, 59, 104, -26, 116,
+   -23, -47, -33, 57, 17, -99, -123, -3,
+   -55, 9, 94, -50, 30, -48, -128, -63,
+   3, -61, 61, -31, -40, -31, 4, -54,
+   -123, 37, 70, 14, -13, -32, -115, 61,
+   21, -93, -34, -7, -32, 26, -20, -110,
+   73, -15, -123, -69, 41, 13, 106, 10,
+   -39, 69, -102, -80, 18, 51, -81, 86,
+   30, 39, 48, -78, 106, 14, 30, -27,
+   65, 62, -20, -113, -30, 47, 22, -101,
+   -24, 119, -15, -40, -95, 76, -112, -5,
+   38, -123, 77, -22, -84, 63, 17, 3,
+   -113, 50, -6, -60, 5, 16, 29, 21,
+   -1, -25, -16, -2, 58, -50, -58, -43,
+   -28, -85, -71, -45, 66, 46, 127, 37,
+   -63, -9, -60, 56, 22, 48, -47, 23,
+   28, 21, 27, -32, 7, -71, -82, -7,
+   -11, -27, -24, -2, -45, 67, 32, 21,
+   86, 62, -51, 39, -41, 2, -41, -31,
+   -15, 50, -50, 54, -8, -21, 39, 51,
+   -32, -24, -22, -27, 5, -8, 16, -2,
+   -17, 17, -43, -35, -32, 29, -21, -58,
+   27, 49, -2, -63, -109, 40, 26, -55,
+   63, 87, -37, 76, -88, -23, 42, 59,
+   24, -32, -47, 18, -16, -30, 71, 39,
+   -13, -10, -83, -2, 24, -12, -36, -44,
+   -79, 66, 17, -21, -27, 48, -4, -7,
+   101, 16, -13, 17, 20, 29, 70, -46,
+   19, -30, 25, 20, 8, 32, 86, -76,
+   -17, -59, 102, -29, 10, 38, -104, 6,
+   -86, 8, -39, 4, -2, -28, 8, -27,
+   8, -1, 36, -82, 17, -53, 44, 72,
+   43, -83, 16, 70, 42, -61, 12, -74,
+   -70, -10, -23, -43, 33, 29, 12, -3,
+   -18, -81, -26, -48, 10, 27, -37, 96,
+   -27, 24, 67, -36, -28, -6, -10, -26,
+   15, -41, 7, 110, 25, -101, -75, 62,
+   -54, -64, -11, -38, -126, -24, -93, 101,
+   0, 13, 20, 35, 41, -122, 91, 62,
+   -45, -12, 13, -36, 40, -43, -104, -29,
+   61, -117, -70, -121, 17, -21, -3, -127,
+   107, -22, 62, 47, -3, -36, -18, 69,
+   -67, -33, -19, -89, -13, -7, -4, -49,
+   -20, -112, -13, 35, -126, 38, -27, -114,
+   12, -54, 19, -108, -61, -79, 5, -65,
+   71, -121, -115, -64, -2, -52, 35, 22,
+   -46, -8, -82, 41, -113, -126, -6, -19,
+   43, -51, 35, -11, 84, -44, -100, 23,
+   67, -11, -20, 81, 52, 22, 21, 124,
+   12, -23, 4, -27, -128, 111, 25, 35,
+   48, 28, 9, 28, -24, 84, 56, 10,
+   71, -22, -22, 78, 16, 92, 117, -22,
+   33, 29, -10, -98, -35, 45, 1, 5,
+   24, -46, -69, 13, 21, 28, 4, -27,
+   -117, 44, -29, 116, 26, -21, -38, 111,
+   43, 14, 6, -7, -79, 82, -57, 4,
+   -127, 0, 86, 113, 2, 7, 42, -72,
+   -31, 11, -6, -97, 22, 113, 10, -31,
+   -30, -57, -35, 21, -21, 47, -3, -42,
+   -36, 74, -102, -24, -59, -58, -50, -67,
+   -113, 25, -128, 4, -108, 16, 113, 82,
+   32, -128, -17, 65, -121, -92, 81, 0,
+   28, 27, -8, -93, -31, -41, -22, -20,
+   -78, -111, 44, -105, -67, -117, -123, -72,
+   -76, -90, 9, 29, -48, -66, 4, -82,
+   -51, 16, -28, 11, -54, 4, 22, 10,
+   -91, -64, 6, 119, -63, -6, 24, 124,
+   75, -54, 70, 67, 38, -31, -48, 68,
+   71, -38, -7, 7, 34, 91, 53, 53,
+   -33, 10, 90, 3, -37, 55, 58, 38,
+   -17, 54, 19, -45, 63, 69, -9, 82,
+   9, -5, -33, -13, -35, -17, 4, -64,
+   -126, 102, -116, -3, 17, -42, 19, -50,
+   62, 41, -21, -103, 38, 36, 14, -9,
+   -10, -46, -35, -2, 43, 56, -112, -109,
+   70, -17, -35, -42, 34, -20, 94, -8,
+   -1, -29, -30, -47, 71, -29, 56, -12,
+   6, -76, 53, 1, 8, 55, -24, 63,
+   15, 61, -113, -27, -57, 71, -42, 47,
+   74, -72, -12, 13, -39, -75, -112, -46,
+   40, 24, 82, 32, 48, -20, 40, 14,
+   61, -11, -117, -37, -7, -67, -123, -21,
+   20, -36, -31, -7, 28, -95, 39, -5,
+   -98, -39, 10, 40, -67, -5, -47, 12,
+   -23, 31, -2, -4, -9, -70, 29, 45,
+   -37, 49, 15, -122, -47, 34, 9, 62,
+   -7, -42, -127, -72, -22, -55, -64, -24,
+   2, -12, 86, -77, -36, -6, 56, 55,
+   46, 117, 105, -72, 27, 1, 97, 81,
+   -24, -83, -94, 6, -16, 68, 9, -57,
+   12, 108, 11, 13, -89, 25, 59, -38,
+   49, -18, 16, -53, -2, -1, -5, 50,
+   17, 89, -9, -50, 27, -34, 62, -7,
+   4, -49, -6, -3, 12, -12, -118, -9,
+   26, -32, 29, 76, 37, -112, -26, -76,
+   -38, -22, -34, 125, 59, 1, -53, 40,
+   21, -4, -27, -83, -19, 47, -123, -123,
+   30, 111, 3, 27, -1, 127, -47, -97,
+   38, 87, -101, 1, 15, 79, -2, 44,
+   -18, -40, -17, 18, -49, -26, -125, -120,
+   16, -55, -37, -25, -86, -87, -23, 8,
+   29, 3, -14, 9, -9, 34, 10, 69,
+   4, -32, -20, 68, 10, 21, 15, -58,
+   16, -45, 81, 81, 104, -20, 45, 6,
+   45, 41, 55, 12, 18, 1, 11, -84,
+   -48, 88, 2, 50, 30, 11, 17, 5,
+   -23, 70, 121, 24, -31, 97, 36, 102,
+   -95, 88, 5, -43, 123, 92, -20, -43,
+   -28, 22, 127, -42, -47, -37, 86, 56,
+   -60, 94, -13, -108, 21, -82, 25, -76,
+   36, 21, 54, 123, -70, 39, 3, 9,
+   73, -9, 31, -35, -55, -128, 14, 36,
+   15, 32, -63, -80, 64, -76, -72, -58,
+   -115, -124, 127, 33, 17, 23, -65, 111,
+   18, 60, -34, -120, 80, 19, -125, 49,
+   -20, 53, -66, 31, 22, 35, -125, -86,
+   -42, -73, 37, -87, 22, 113, 70, -39,
+   1, -57, -44, -85, -12, 103, -49, -72,
+   79, -26, 89, -46, -67, 51, -11, 125,
+   -121, -87, 32, -90, 21, -42, -3, 77,
+   -6, 33, 38, -7, -27, 31, -28, 51,
+   18, 49, 55, 6, 22, 6, -29, 71,
+   -123, -10, -46, 64, 30, -52, 124, 33,
+   -1, -48, 27, 105, -74, -104, 38, -45,
+   102, -8, -28, 20, 19, 28, 8, -50,
+   -44, 43, 123, -23, 121, -28, 88, 3,
+   57, -31, 13, 17, 52, 27, 8, 53,
+   -25, -28, -34, 18, -68, 63, -21, -32,
+   11, 53, 66, -38, -79, 59, 5, -65,
+   50, -23, 61, -52, 64, -120, -20, 12,
+   -77, -9, -67, -95, 16, -127, -111, -74,
+   124, 126, 78, 45, -29, -3, -70, -68,
+   43, -27, 32, -127, -69, -16, -33, -127,
+   -125, -43, 13, 81, 67, -10, -41, -7,
+   -38, -26, -1, 64, -66, 106, 127, -15,
+   -28, 14, 117, 28, 41, -81, 46, -58,
+   -121, 48, -86, -39, 8, -36, -128, -3,
+   -78, 35, 45, 24, -7, -25, -3, 115,
+   -21, 15, 14, -30, -40, -30, -55, 39,
+   79, -29, 126, 69, -97, 18, -31, -11,
+   58, -60, 14, 99, 11, 54, 43, 30,
+   -50, -53, 4, 125, 26, 108, 32, 36,
+   -17, 9, -68, -104, 27, 7, 84, -73,
+   8, -58, 4, 35, 85, 76, 125, 31,
+   32, 42, 15, -65, 63, 89, 31, 44,
+   7, 24, -22, -117, -4, -84, -32, -2,
+   78, -53, -74, 108, -96, -26, 26, 27,
+   8, -62, 9, 61, -20, 32, -37, -39,
+   20, -5, -88, 38, -22, -47, -79, 30,
+   -35, -12, 13, -35, -79, 34, 10, -117,
+   34, -14, 106, 12, 11, -24, 59, 28,
+   25, -21, 10, -73, 9, 9, -18, -31,
+   -52, -70, -45, -5, -20, -22, 89, -21,
+   41, 39, 58, -16, -2, -128, 23, 9,
+   61, 22, 25, -43, -126, -27, -20, 14,
+   -57, -32, 126, -5, 25, -44, 32, 51,
+   108, 62, -3, 12, -16, -39, -35, 37,
+   41, -64, 37, 58, -63, 100, -29, 66,
+   31, 14, -3, -12, 98, -58, 9, -5,
+   -22, 35, -1, 2, 78, 46, 45, -33,
+   35, -62, 78, -54, -40, 17, 60, 99,
+   -43, 42, 47, 24, -42, -80, -72, -81,
+   14, -48, -41, -40, 83, 36, 24, 55,
+   48, 124, -39, -75, -57, 96, 28, -107,
+   -64, 88, 18, 4, -18, -47, 53, 35,
+   -61, 60, 21, -23, -15, -112, -55, -39,
+   -75, -17, -122, 78, 51, 15, 51, -126,
+   79, -100, 94, 35, -33, 42, 45, -26,
+   41, -20, -76, -2, 11, -82, -12, 60,
+   -44, -9, -40, 3, -93, -116, -125, 1,
+   -60, 34, -28, 43, -3, 18, 33, 29,
+   -117, 87, 19, -88, -92, -92, -64, 37,
+   -125, 68, -123, -113, 29, 39, 5, -8,
+   6, 100, 127, -7, 8, 62, -9, -10,
+   -48, 96, 104, 121, 122, 21, 46, 116,
+   124, -77, 0, -124, 120, -10, -72, 0,
+   -5, 100, -44, 124, 12, 52, 26, -46,
+   -18, 126, 8, -30, -124, 4, 94, 12,
+   10, -39, 126, -73, 109, 22, -72, -82,
+   32, -33, -56, 37, -58, -50, -24, -6,
+   114, -62, 33, -124, 44, 27, 111, -2,
+   50, -12, 35, 12, 126, 12, 21, 94,
+   25, 22, -8, 51, 74, 46, -102, 24,
+   -57, 0, -54, -51, -27, 116, 113, -25,
+   0, 9, -29, 16, 47, -69, 41, -63,
+   -66, -36, 21, -74, -40, 41, 65, 62,
+   8, -86, 59, 35, 90, 24, -9, -31,
+   -23, 25, 14, 50, -113, -48, 59, -9,
+   -48, 7, -37, -124, -25, 15, 18, 77,
+   -66, 35, -1, -15, -84, -29, 6, -9,
+   25, -26, -108, 53, 5, -13, 26, -124,
+   -47, -39, 21, -5, 21, -64, -43, 74,
+   51, -34, 42, 60, -30, 23, -32, -6,
+   -53, 58, 41, -92, 30, -67, -22, -16,
+   -30, -10, -43, 96, 22, 64, 121, 18,
+   -105, -61, 8, 69, -90, 80, 65, -118,
+   9, -16, 20, 54, 6, -68, 66, 31,
+   29, -101, 81, -79, 37, 68, 5, -123,
+   115, -9, -33, -94, 7, -42, 113, 39,
+   -3, 110, -74, -13, 37, -75, -62, -13,
+   119, 2, 0, -120, -114, 62, -53, 28,
+   -99, -58, -7, -63, -120, 85, -79, 4,
+   -28, 61, -126, -65, 62, -94, -60, 20,
+   125, -112, -124, -56, 31, 127, -59, -66,
+   -125, 62, -92, 25, 39, -128, -24, 24,
+   -34, 50, 2, -30, 127, -91, -43, 65,
+   127, -8, -21, 12, 99, 7, 120, -126,
+   -35, -5, 109, -117, -32, 10, 114, -11,
+   -18, -83, 66, -76, 87, 35, -12, -90,
+   17, -25, 123, 14, 20, -5, -62, 23,
+   -35, 125, 36, -5, 28, 64, -113, 5,
+   -11, -27, -123, 14, -48, -13, 26, 19,
+   -20, -4, -19, 33, 0, -81, 41, -47,
+   -30, 16, -67, -52, 39, 68, -7, 85,
+   6, -10, -6, 17, 59, 18, -48, 113,
+   73, 85, 60, -3, 94, -43, 21, 9,
+   15, -74, -40, -52, 45, -104, -34, 3,
+   26, 20, -36, 17, -121, 21, 44, 66,
+   -67, 5, 4, 63, 8, -23, -45, 12,
+   52, 4, 53, 8, -116, -64, -42, 68,
+   -124, 39, -25, -22, -2, -17, -31, -77,
+   43, 32, -55, -127, -40, -6, 44, 66,
+   27, -21, 60, -110, 16, -71, 65, 103,
+   -25, 50, 47, -49, 18, -35, 18, 21,
+   -29, -19, 38, 4, -47, -4, -66, -21,
+   -41, 43, -22, 50, -78, -62, 106, 71,
+   -66, 31, -38, -17, 45, -65, 92, 0,
+   -23, 13, 90, 48, -42, 103, -42, 18,
+   11, 50, -20, 19, -76, 74, 70, 43,
+   106, -119, 18, -40, 34, 24, 20, -17,
+   -83, -64, -10, 27, -6, 62, 127, -88,
+   -43, 49, 124, -23, -95, -17, 3, 75,
+   65, -45, -14, 88, 48, 30, -53, -35,
+   29, -87, 11, 66, -2, 109, -28, -29,
+   -71, 96, 28, 24, 38, 23, 63, -55,
+   57, -42, -18, -55, -42, 23, -40, 16,
+   18, 33, 10, 29, -24, 36, -79, -81,
+   -13, 38, 24, 10, 126, 46, -9, 7,
+   34, 59, -1, -52, -8, -28, -23, -95,
+   55, -128, -32, 17, 120, -89, 40, -62,
+   -63, 17, -97, -77, -46, 41, -121, -5,
+   45, -70, -50, -92, 94, 71, -121, -15,
+   127, -77, 6, 125, -34, -48, -21, -128,
+   127, -39, -47, -109, 36, 127, 76, -55,
+   -83, -30, -124, -128, 52, 23, -123, 127,
+   -21, -91, -9, 28, 36, -67, -51, 27,
+   33, -38, 4, -74, -123, 10, -120, -25,
+   -30, 54, -9, 123, -118, -14, -77, 30,
+   70, 8, -18, 106, -7, -55, -39, -75,
+   -59, -47, 25, 48, -6, 7, 83, -47,
+   25, -127, -33, -114, 33, 30, -3, 49,
+   105, -41, 72, 75, -91, 0, -36, -64,
+   -18, 16, -36, -99, 116, -85, 61, -70,
+   -14, -126, -39, 122, -81, 91, -42, -108,
+   -116, -41, 46, 119, -1, 15, -19, -47,
+   -19, 17, -73, -20, 3, -66, 40, -122,
+   81, -5, -61, 23, 45, -79, -25, -79,
+   66, -2, 6, -36, -47, 95, -9, -34,
+   -24, 3, 94, -11, 127, 75, 38, -6,
+   -45, 12, 25, -28, -124, 111, 108, -78,
+   -7, -87, -45, -3, 26, -66, 91, -87,
+   72, 64, -88, -78, -41, 29, -86, -59,
+   -1, -55, -35, 13, 124, 15, 40, -43,
+   29, 59, -112, -38, -10, -77, -9, 18,
+   20, -47, 39, 43, -34, -47, -17, 34,
+   1, 70, 90, 47, -63, -15, -4, 28,
+   102, 48, -78, 24, 58, -12, -33, 8,
+   16, 17, -52, 18, -4, 81, -28, -28,
+   28, 56, -40, -43, 9, -52, 5, -54,
+   -26, 15, 40, 6, 18, 29, -25, -35,
+   -87, -21, 17, -25, -5, 6, 65, 34,
+   59, 33, -38, -17, 6, -18, 42, -42,
+   -61, 45, -46, 63, -80, 16, -56, -118,
+   27, 44, -8, -74, -24, 7, -49, -47,
+   -87, 16, -64, -22, -16, 127, 24, -39,
+   -44, 42, -125, -75, -16, 52, -40, -39,
+   40, -48, -5, 16, 10, -59, 25, -13,
+   19, -23, -96, 43, 71, 51, -21, -24,
+   -22, -10, 66, -91, 23, 74, -119, 93,
+   -42, 5, 33, -95, 53, -121, -68, 35,
+   -63, 33, -50, -48, -65, -8, 21, -3,
+   -1, -87, 88, 82, -51, 33, -32, -26,
+   -72, 15, 61, 2, 55, 122, -32, 48,
+   15, -71, -3, -41, -11, -22, 19, 6,
+   -27, -85, -11, 1, 25, -52, 94, -104,
+   52, 42, -49, 49, 118, 79, 78, -46,
+   22, -7, 11, 63, 24, 5, 3, -2,
+   -37, 118, -4, 7, -50, 1, -27, 50,
+   39, -33, -20, -116, -67, 4, -13, 99,
+   58, 16, 38, 47, 65, 86, 68, -62,
+   62, 8, 9, -81, 10, -26, -87, -18,
+   89, 42, 51, -19, -71, 126, -87, -64,
+   -69, -80, -3, -13, -20, 33, -4, 89,
+   -6, -16, -45, 93, 29, -7, 58, 78,
+   45, 23, 32, -67, 5, -25, 59, -47,
+   33, 60, -23, 41, 12, -13, 26, -18,
+   15, -64, -30, -122, -31, 66, 120, -86,
+   98, -120, 66, -22, 6, -37, 39, 90,
+   -124, -75, -124, 16, -59, -42, 96, -4,
+   -51, -34, -10, 36, 8, 127, -60, -80,
+   44, 46, -31, -3, -20, 116, 45, 50,
+   5, -6, 78, -25, -27, 40, 49, -24,
+   68, 1, 25, -42, 0, -93, 94, -37,
+   8, 31, 27, -24, 22, 8, 15, -33,
+   33, 18, 75, -113, 75, -14, -63, 28,
+   -4, -63, 3, 45, -5, -6, -38, -66,
+   -4, 58, -4, 125, 89, 56, -21, -119,
+   54, -26, -35, 43, -51, -51, 74, -9,
+   -57, -30, -30, -126, -122, -42, 90, 5,
+   -74, 37, 49, -3, -69, 33, 20, -2,
+   70, -84, 0, -51, -74, -26, 100, 10,
+   -89, 3, -92, -119, 31, 50, 20, 24,
+   51, 23, 114, -120, -46, 70, -7, -11,
+   -11, -16, 36, 3, -122, 20, 46, -52,
+   -23, -35, 3, -53, -37, -35, -36, 28,
+   38, -69, -90, -4, -43, -58, 30, 13,
+   -70, 5, -44, -17, -59, -26, -48, -74,
+   29, -127, -23, -34, -31, 29, 14, -50,
+   -93, -20, -53, -35, -59, -42, 1, -44,
+   16, -126, 16, -125, 22, -22, -98, -8,
+   71, -57, -76, 13, 61, 125, 48, 52,
+   -110, -90, 37, -75, -41, 0, -36, 32,
+   33, -2, 28, -70, 59, 93, -116, 13,
+   79, -18, 83, -43, -12, 0, 4, -74,
+   -121, 0, -63, 42, 52, -65, 96, 7,
+   18, 11, -24, 100, 29, 23, 45, 24,
+   6, -33, 17, -75, -66, 59, -8, 42,
+   -8, 8, -36, -35, 3, 22, -26, -19,
+   -23, 17, -62, 44, -32, 120, -5, 26,
+   -14, 11, -54, -40, 43, -47, -62, 8,
+   11, 18, -5, -44, 9, 15, 41, -13,
+   -42, -58, 45, 32, 8, -28, 52, 29,
+   18, -14, 31, -18, 63, -19, -103, 60,
+   4, 75, -36, -86, -90, 68, 7, 17,
+   -24, -44, -16, 11, -62, -31, 71, -78,
+   15, -51, 1, -46, 71, 124, -2, 9,
+   -20, -9, 39, 5, 71, -12, 0, 54,
+   68, 41, 33, -19, 103, 1, -66, 20,
+   41, -56, -80, 7, -35, -85, 23, -37,
+   9, 62, 56, 63, -23, 25, 127, 26,
+   1, -76, 124, -23, 44, -55, 87, -58,
+   -47, -18, -15, -8, -24, -50, 54, -68,
+   -63, -12, 25, -14, -25, -49, -16, 109,
+   -55, 9, -49, -2, -73, -33, -101, 28,
+   -53, -10, 21, -42, 11, -53, -31, -125,
+   57, 24, 85, -11, -76, -39, -40, 34,
+   -30, -34, -127, -4, 55, 96, -3, -44,
+   -32, -24, 115, -9, -92, -63, 6, 71,
+   -23, -74, -16, -86, 84, -127, -116, -109,
+   108, 18, 91, -96, -76, 65, -55, -5,
+   29, -26, 23, 40, 9, -127, 40, -103,
+   69, -127, -10, -16, 99, -34, 53, -5,
+   -108, -40, -81, -42, 63, 61, 23, 123,
+   -72, 7, 55, 114, 24, 73, -15, 17,
+   37, -43, 48, -105, 77, -12, 33, 29,
+   -36, -1, 41, -35, -81, 81, -41, -80,
+   -29, -43, 115, 19, 50, 40, 32, 32,
+   -82, 87, 28, -5, -22, -77, 56, -12,
+   28, 26, 5, 49, 37, 25, -29, -35,
+   -13, -82, -57, -74, 36, 104, 62, -78,
+   -82, 46, -3, -57, -18, -57, -9, 61,
+   14, -12, -41, -84, 125, 124, 24, -80,
+   -44, -21, 21, 82, -48, 123, -72, -23,
+   -93, 38, 10, -103, 55, -126, 31, 29,
+   -48, 127, 26, -51, -74, -54, 4, 35,
+   -125, -40, -30, 37, 58, 31, 11, 10,
+   2, -24, -75, -18, 29, 35, 10, 37,
+   -3, -106, -56, -70, -11, 14, -59, -125,
+   27, -49, -18, 12, -59, -63, -74, -1,
+   -66, -13, -121, -73, -4, 5, -121, -70,
+   6, -128, -23, -20, -25, -65, 14, -23,
+   112, 67, 109, 41, -15, 71, 3, -9,
+   -21, 121, -119, 63, 93, 34, 35, 65,
+   126, -39, -46, -118, 105, -103, -25, -29,
+   76, 51, -77, 122, 95, 65, 77, 67,
+   11, -4, -119, -52, -39, 48, 6, -28,
+   68, -42, 113, 9, 23, -18, -7, -14,
+   23, -12, -9, 5, 6, -93, 43, -32,
+   7, 20, -65, 55, 18, -128, 53, -7,
+   -5, 21, -2, 13, 43, -5, 13, -126,
+   92, -60, 32, -84, -116, 62, 70, 115,
+   -21, -38, -116, 0, 39, -10, -10, -29,
+   -101, -40, -9, -29, 43, -16, -1, -4,
+   29, -42, -52, 13, 44, -126, -91, 39,
+   64, -52, -60, -52, 66, 15, -7, -35,
+   -105, -55, 63, -24, -76, 89, -18, 38,
+   -73, 57, 6, 67, -80, 64, -48, -42,
+   19, -74, -128, 36, 4, 20, -125, 15,
+   51, 13, -19, -29, -78, -60, 56, -9,
+   63, -23, -37, -57, -12, 7, 33, -115,
+   -30, 62, -32, 93, -19, 73, 20, 15,
+   -2, -48, -19, -128, -54, 126, -103, -39,
+   -27, -65, -24, 63, 7, -40, 27, -26,
+   71, -110, 116, 36, 20, 7, 2, 40,
+   45, -41, -62, -78, 28, -54, -59, -1,
+   -19, -75, 50, 32, 107, 20, -5, -104,
+   105, -39, -38, 72, 70, -121, -4, 99,
+   -23, 16, -47, 14, 89, 34, -65, -16,
+   -46, 18, 52, -65, -51, 11, -108, -37,
+   -57, -25, 27, 19, -36, -100, 97, -112,
+   -24, -118, -31, -39, 122, -61, -52, 95,
+   42, -53, -27, -71, -79, 3, -62, -126,
+   -115, -30, 65, -48, -98, -110, 77, 13,
+   55, 26, -4, 2, -73, -36, 50, 20,
+   -86, -70, 22, -35, 118, -119, 7, 62,
+   -124, -7, -107, -95, -119, -60, -47, -94,
+   14, 105, -70, 104, 16, 75, 114, -128,
+   -95, -113, 17, 7, -127, 24, 28, -53,
+   -76, -57, -118, -19, -59, -14, -64, -22,
+   -27, 0, -10, -103, 13, -116, -59, -1,
+   66, -123, -107, -5, -48, 4, -61, -86,
+   -50, 5, 51, -81, -108, -59, 19, 54,
+   -103, -17, -35, -127, -81, 59, -122, 0,
+   36, -24, 117, -29, 31, -9, 13, 15,
+   80, 81, 36, 123, 90, 77, 21, -49,
+   8, -12, -34, 65, -71, 35, -3, 15,
+   -54, -58, -41, -45, 10, 54, 102, 77,
+   23, 28, -39, -43, -47, -49, -87, -35,
+   24, -2, 21, 33, -22, 26, 19, 80,
+   -26, -32, -101, 34, 31, -6, -57, 20,
+   73, 78, -107, 36, -49, 2, 23, -17,
+   109, 5, 15, -34, 41, -23, 61, -5,
+   -56, -102, 88, -16, 49, -52, -57, 59,
+   90, -8, -125, 30, 72, 75, -46, -75,
+   -126, 97, -28, 118, -62, -47, 113, -29,
+   -48, -29, 101, 23, -7, -42, 18, 36,
+   0, 11, -29, 31, -53, -5, -18, -80,
+   46, -18, 29, 5, 17, 0, -19, 65,
+   -6, -1, 21, 11, -35, -40, 26, -68,
+   -29, -43, -4, -24, 29, 85, -25, -77,
+   -10, -27, 3, -34, 56, 74, -118, 13,
+   14, 101, -48, 22, -41, 59, 22, 21,
+   -20, -127, -73, -7, 70, -48, 13, -95,
+   31, -14, -63, 22, -71, -93, -74, -38,
+   -120, -28, -33, -45, -14, -48, -18, 81,
+   24, -60, -29, 0, -16, -7, 47, -84,
+   -72, 58, 14, -37, 71, 20, 41, -42,
+   -6, -105, -8, -2, -25, -16, 23, -50,
+   16, 33, 52, 22, 42, -4, -5, 54,
+   15, -22, -105, -18, -8, -25, -112, 26,
+   -32, -46, -70, 86, -41, 105, 46, -30,
+   -38, 1, -24, -20, -24, 3, -13, -44,
+   19, -79, 23, -60, 21, -54, -120, -21,
+   -3, 60, 4, -29, -2, 17, -2, -10,
+   -20, 12, -71, -108, 47, 4, 26, 20,
+   -11, -28, 0, -27, 2, -50, 7, 9,
+   -42, -59, -52, 65, 9, 77, -67, -21,
+   5, 44, -30, -33, -87, 8, 109, 120,
+   -80, -27, -74, 4, 40, 22, -17, 91,
+   13, -31, 80, 0, 34, 24, -29, -74,
+   -120, 71, -96, 85, 125, 117, 59, -53,
+   -75, -42, -21, -19, 9, 29, 47, -124,
+   97, -7, 54, 29, 9, 67, 56, 13,
+   -16, 33, -10, -11, 100, 26, -65, -10,
+   2, 80, -43, -1, -98, -37, -1, 63,
+   29, 41, -92, -5, 48, 36, -2, 48,
+   2, -23, 7, -2, 19, -121, 95, -85,
+   -2, -126, 47, 44, 4, -49, 53, 27,
+   -80, 48, -51, 127, 13, 84, -39, 2,
+   40, 29, 45, 53, 14, -21, 27, -38,
+   -79, -63, -28, -20, 7, -117, 62, 1,
+   58, -68, -6, 22, -5, 9, -16, -23,
+   55, -43, 25, -31, -85, 39, -5, 65,
+   1, 16, 11, 2, -27, 31, 65, 88,
+   -15, 16, -127, 58, 45, -45, -20, 45,
+   -22, -61, 62, -62, -74, -107, -62, 96,
+   37, 57, 23, -83, 3, 11, -69, 31,
+   -13, -67, 14, -93, 35, 61, -62, -31,
+   -61, 9, 25, -53, 127, 117, -4, 67,
+   59, -65, -38, -11, 46, -75, -20, -48,
+   -9, 55, 18, -39, 30, -55, 114, -45,
+   47, 15, -32, -27, -84, 12, -42, 85,
+   0, 4, -56, -48, -43, -24, 24, 26,
+   -85, -10, -90, 28, -9, 77, -111, -51,
+   -79, -41, 26, 16, 46, -65, -69, -106,
+   121, 68, 19, 16, -62, -25, -62, 115,
+   116, 20, -94, 61, 45, 78, 53, 55,
+   28, -42, 20, 7, -109, -34, 55, -124,
+   -39, 125, 40, 25, -28, 82, -60, -101,
+   -13, 25, -71, -34, 27, 71, 16, -7,
+   -33, -37, -1, 12, -1, 9, -52, -12,
+   25, 25, -34, -41, -37, 32, -18, -31,
+   -124, -85, -101, 0, -37, -122, 49, -21,
+   85, -68, 5, 36, -20, -13, -12, 43,
+   -26, -57, 30, -12, -46, -90, -83, -120,
+   -3, -26, -59, 16, 47, -83, 32, -44,
+   -14, 35, -94, 69, -61, 108, -20, -17,
+   54, 36, -49, 53, -50, 48, -4, 9,
+   38, -70, 56, -23, 80, -48, 56, 37,
+   -55, 20, 41, -9, -97, -55, 81, 18,
+   -42, -6, -110, 97, -86, -91, 21, 9,
+   -14, -10, -14, 92, -39, 45, -37, 62,
+   -43, 34, 114, -14, 24, -25, 126, -92,
+   -8, 6, 0, -59, 34, 26, 18, -3,
+   -53, 24, -36, -125, -75, -21, -36, -37,
+   75, -124, -50, -48, -117, -29, 38, -10,
+   117, -84, 82, -126, -4, -123, 9, 27,
+   -91, -81, -21, -126, 50, -29, 47, 51,
+   44, 51, -17, 125, -39, -56, 49, 44,
+   127, -14, 101, -46, -3, -21, -52, -2,
+   4, -35, 65, 25, 33, -47, 89, -36,
+   34, 72, 70, 43, -72, -38, 90, 54,
+   121, 13, 63, -18, 45, -41, 95, 23,
+   -4, 82, 14, 37, -10, 86, 47, 46,
+   -13, 15, -35, -123, -58, -7, 102, -79,
+   40, 13, -6, -42, 75, -127, -109, 20,
+   61, 20, -74, -113, -28, 96, -97, -67,
+   -41, -28, 118, 15, -10, 41, 26, 17,
+   -84, 34, 125, 7, 61, -126, -104, -124,
+   125, -109, -1, 50, -44, 40, 62, -118,
+   86, -50, -45, -58, 9, -126, -94, 26,
+   -45, -28, -77, 11, -54, -38, 70, -74,
+   -49, 39, -127, -21, -98, 39, 113, -109,
+   -123, -69, 47, -73, -111, -59, 1, 3,
+   -43, 25, 115, 102, 5, -83, -72, 122,
+   84, -126, -42, -51, -13, 17, 19, -106,
+   -56, 38, -40, -75, -20, 56, -7, 32,
+   58, 57, 39, -118, -23, -123, -82, 66,
+   -40, -115, -84, 29, 120, 28, 6, 12,
+   -66, 15, 58, -77, -26, -71, 80, 120,
+   38, -13, 92, -113, 23, 61, -122, -39,
+   -5, -114, -30, -11, 0, 43, 19, -122,
+   111, 73, 0, -51, 49, -36, -25, 101,
+   -41, -45, -33, -91, -52, 52, 65, 37,
+   -78, 93, 78, -73, 9, -9, 9, -79,
+   -35, 25, 16, -29, -36, 9, -16, -40,
+   33, 118, 7, 36, -19, 43, -46, -123,
+   -49, 18, -95, 101, 29, -35, -17, -7,
+   60, 20, -75, -25, -35, -17, -117, -106,
+   -30, -98, -40, 68, 35, -15, 14, -101,
+   -36, -83, 2, 20, 53, 126, 8, 74,
+   63, -57, -20, -13, 33, -9, -90, -75,
+   -2, -105, 86, 37, -48, 14, -40, -20,
+   5, -127, -12, -30, -53, -14, 39, 93,
+   -24, 0, -20, 66, 42, 7, -39, 68,
+   80, 25, 81, 4, 28, -22, -41, 56,
+   51, -39, 2, 28, 45, -3, 62, 92,
+   19, 73, 43, 45, 61, -53, 102, -35,
+   -34, 47, -85, -29, -12, 46, -31, -89,
+   47, -25, 120, -8, 30, 63, -27, 56,
+   -67, -10, 71, 30, -21, 88, 86, -72,
+   23, 16, -46, 126, 116, 45, -53, 15,
+   90, 20, 10, -47, -35, 61, 28, -68,
+   121, 108, -24, -8, -97, -13, -124, -27,
+   -21, -104, -22, -61, -118, -124, -41, -3,
+   -86, -31, -15, 71, -1, -42, -2, 45,
+   40, -33, -115, -38, -33, -36, -4, 34,
+   74, 98, -8, 107, -49, 11, 121, -29,
+   -49, -15, -37, 43, -80, -31, 19, 15,
+   18, -71, 78, -108, -87, 34, -4, -30,
+   -98, 124, -115, -18, -116, 35, 10, -125
+};
+
+static const rnn_weight noise_gru_bias[144] = {
+   51, 32, 88, 60, -64, 92, 5, -36,
+   -49, 95, 102, -20, -1, 14, 8, 21,
+   -36, -68, 62, 46, 10, -60, -103, -16,
+   -30, -42, -43, 35, -4, 23, 97, 46,
+   -29, -16, 71, 52, -20, -23, 91, 16,
+   69, -13, -23, 73, -17, 13, 30, 23,
+   1, -27, 53, -24, -71, 45, 42, -49,
+   28, -16, -20, 61, 40, -104, 54, -5,
+   31, 10, -51, -37, -6, -85, 9, 51,
+   16, 2, -26, 56, -39, -5, -27, -13,
+   -49, 30, 4, -64, -41, 45, -23, 14,
+   -19, -10, -55, -61, -35, 46, -31, -12,
+   -93, -28, 11, -6, -46, -12, 1, 15,
+   -37, -107, -50, 3, 54, -26, -86, 14,
+   66, -54, -38, -70, -1, 69, 46, -12,
+   -128, -55, 0, 17, 48, -64, -24, 9,
+   -67, -107, -101, -43, -4, 80, -52, -90,
+   -23, -64, 31, 86, -50, 2, -38, 7
+};
+
+static const GRULayer noise_gru = {
+   noise_gru_bias,
+   noise_gru_weights,
+   noise_gru_recurrent_weights,
+   90, 48, ACTIVATION_RELU
+};
+
+static const rnn_weight denoise_gru_weights[32832] = {
+   -53, 26, -20, 28, -57, -30, -79, 58,
+   -68, 103, 70, 4, 92, 14, -71, -3,
+   26, 54, -9, -86, -8, 49, -60, 121,
+   -98, -4, 103, -38, -89, 28, 85, 30,
+   33, -45, 42, 53, -37, -116, 72, -44,
+   24, 1, 17, -26, -7, 9, 5, -71,
+   -97, -86, -118, -59, -27, -51, 26, 14,
+   -89, -63, 76, -16, -5, 11, 86, 121,
+   67, 5, -20, -44, -43, -7, 18, 25,
+   -41, 14, 11, 24, -5, -58, 15, 10,
+   89, 41, -100, 42, 41, 89, -89, 30,
+   -16, -35, -29, -119, -45, -1, -104, 24,
+   9, 46, 21, 122, -5, -29, -64, 19,
+   72, -60, 79, -52, -15, -37, 15, 38,
+   -13, -9, 28, 56, -12, 121, 23, -104,
+   -81, -7, -94, 17, 124, 49, 108, -41,
+   118, -33, -106, 42, -27, 50, 57, -24,
+   26, -107, 15, -103, -23, -13, -7, 23,
+   -40, -113, 14, -36, -59, 25, 44, 54,
+   37, 40, -10, 59, 29, -16, -49, 18,
+   4, -27, 15, 15, 37, 29, 50, -61,
+   28, -16, -96, 48, -102, -97, 12, -31,
+   43, 54, 9, -58, -42, 18, 10, 115,
+   -16, -29, -14, -66, -38, 69, -65, 50,
+   7, 6, 11, 8, -53, -1, 25, 32,
+   77, -5, -42, 58, -43, -63, -86, -36,
+   18, 21, -49, 38, 72, 22, -25, 22,
+   -16, -95, 77, 16, 55, -8, 31, -39,
+   -117, 3, -38, -24, 27, 24, 25, -29,
+   21, -44, -13, -61, 6, 5, 19, -20,
+   -11, 89, 40, -113, -86, 65, -84, -21,
+   20, 10, 15, 28, -56, -14, -17, 50,
+   90, -15, 29, -27, -54, -40, -32, -58,
+   -59, 4, -17, 58, 3, -85, -9, 64,
+   -38, -5, 104, -21, -30, -4, 79, -44,
+   -55, 8, 44, 10, -58, 31, 7, 25,
+   -49, -2, -30, -29, -118, 49, 68, 17,
+   -34, 0, 46, -109, 28, -14, -47, 88,
+   13, -55, 24, 62, 44, -16, -54, -67,
+   40, 69, 3, -46, 1, -43, 127, -30,
+   -78, 25, 106, 16, -30, 104, -12, 20,
+   -58, 35, -71, -79, 18, 7, -12, -28,
+   -49, 17, 98, -64, 25, 84, 32, 33,
+   -36, 13, -31, 29, -9, -97, -78, 4,
+   16, 26, 86, 28, -29, 5, 23, -5,
+   -112, 83, -27, 9, -47, 43, 12, -7,
+   -11, 27, 92, -9, -14, -9, 69, 68,
+   32, -25, 20, -70, 40, -20, -32, 36,
+   -94, 19, 5, 101, 11, -47, 44, 65,
+   -40, -56, -21, -43, 72, 7, 36, 14,
+   1, -27, -18, -10, 18, 14, 58, -4,
+   12, 3, -60, -6, 68, -9, -42, 10,
+   40, -17, -17, 13, -16, 86, -62, -20,
+   -22, 24, 75, 61, -5, -32, -75, 0,
+   -41, -65, -19, -37, 21, -51, -54, -79,
+   3, 34, 10, 75, 91, -59, 25, 21,
+   -5, 26, -71, 9, 27, 28, 49, -17,
+   -12, -44, -28, -51, -8, -18, -4, -12,
+   -45, -50, 32, 26, 65, -54, 29, 16,
+   -80, 16, 38, -94, -27, 33, 3, 51,
+   17, 26, -10, -35, 18, 57, -6, 7,
+   -9, -35, 22, 10, -9, 5, -18, 7,
+   -3, 15, -82, -12, -18, 51, 6, 21,
+   -29, 58, 14, -16, 6, 29, -35, 59,
+   10, 32, 54, -11, 25, -27, -13, 33,
+   -19, 11, -83, 61, 37, 42, 20, 21,
+   13, 57, 40, -1, 8, 6, -8, 22,
+   57, -18, -1, -7, 29, -40, -17, 50,
+   8, -4, -4, 32, 26, 35, -60, -35,
+   -36, -17, -66, -63, 2, -124, 8, 26,
+   17, 31, -84, -12, 15, 49, 6, 39,
+   33, 28, 20, -48, 42, 8, -5, -6,
+   26, -33, 12, 42, 91, 25, 5, -91,
+   -27, 23, 6, -63, -119, -99, -38, -32,
+   -97, -31, 15, -28, -18, -59, -24, -7,
+   -2, -7, -119, -34, -121, -121, 26, 74,
+   -85, -7, -22, -26, -43, 2, -32, 34,
+   51, -82, -92, 14, 80, 19, -2, -39,
+   -81, -22, 48, -39, -21, -46, -49, -19,
+   -68, -111, 80, -45, -49, -86, 23, -2,
+   -55, -9, 2, 1, -55, -32, -32, 18,
+   -104, 88, 1, 25, -48, -100, 9, -89,
+   9, -8, 70, 43, -122, 90, 45, -60,
+   -48, -22, -47, -100, 48, 22, 6, 26,
+   -16, 18, -37, 5, -102, -6, 3, -55,
+   -87, -117, -33, -106, -63, -21, 10, 74,
+   16, -19, -14, -60, 15, -38, 90, -58,
+   -14, -2, -58, -45, 50, 30, -72, -26,
+   94, -108, -79, -4, 53, 63, -80, 45,
+   20, 35, 73, -9, -5, -83, 46, -6,
+   -68, 0, 0, -127, -17, -69, 25, -91,
+   -75, 3, -62, -31, -47, 16, 35, -39,
+   20, -22, -63, -17, -3, -72, 48, 15,
+   74, -33, -86, -63, -67, -44, -15, -32,
+   -42, -34, 37, 9, 18, -41, 19, -8,
+   27, 41, -81, -120, -113, 7, 83, -16,
+   17, -17, 22, -28, -73, -54, 1, 11,
+   3, 33, 33, 16, 6, -20, -64, 11,
+   2, -14, -69, -36, -42, -13, -115, -16,
+   -27, 9, 26, 7, -58, 6, -55, 52,
+   23, -20, 74, -61, -13, -31, -63, 68,
+   -7, -20, 64, 0, 17, -10, 24, 15,
+   47, 16, -23, -1, 9, -4, -69, 14,
+   -6, -7, 3, 9, -20, -29, -41, 64,
+   23, -21, -1, 41, 48, -46, 11, -22,
+   -2, -7, -54, -86, -44, -44, 8, 31,
+   -47, -25, 33, 95, -35, -125, -8, -3,
+   52, 19, 9, -27, 62, 32, -11, -7,
+   -60, -13, 110, -28, 118, -11, 45, 5,
+   -2, 22, 22, -61, 6, -72, -42, -12,
+   0, -17, 13, -91, -29, -50, -54, -126,
+   -60, 119, 25, 24, 51, -32, -15, 77,
+   14, 34, -33, -53, -53, 56, -72, -27,
+   57, -11, -61, 32, 3, -18, -54, 19,
+   70, 34, 17, -68, -65, -2, 48, 18,
+   10, -72, 88, -15, -63, -38, 2, -20,
+   -4, 42, -88, 96, 60, 79, 6, 77,
+   127, 9, 22, 21, -26, -55, -33, -69,
+   39, -62, 33, 5, -29, -40, 29, -51,
+   7, 18, 37, -14, 88, -25, 52, -6,
+   17, -104, -10, -68, -42, -116, 83, 81,
+   -74, -9, -127, -55, -79, 26, -59, 37,
+   -27, 20, 36, -46, -67, 51, 10, -19,
+   101, -28, 53, -62, 10, -6, -15, -13,
+   5, 9, -61, -123, -33, 30, -39, -48,
+   11, -126, 59, 21, -3, -121, 27, 46,
+   13, -59, -3, -122, 37, -120, 9, -43,
+   -33, 24, -33, -42, 9, -34, 68, 16,
+   6, -1, -49, -105, -9, -13, 41, -46,
+   78, 7, -55, -38, 82, -26, 9, 24,
+   43, -18, -91, -56, -34, 30, 28, 16,
+   4, -2, -120, -42, -125, -16, 45, -29,
+   42, -25, -1, -43, -12, 4, 39, 16,
+   -17, -12, 10, -37, -5, 8, 16, -12,
+   -14, -18, 19, 0, -30, -24, -101, 2,
+   -30, -6, -6, 3, -40, 0, 13, 52,
+   -31, 27, -56, 63, 35, 32, -64, 29,
+   34, -41, 47, -24, 13, 52, -26, 29,
+   -2, -30, 25, -44, 36, 93, -54, 3,
+   -3, -17, 15, 5, 72, -61, 48, -5,
+   63, -34, -26, -48, 2, -28, 69, -10,
+   42, 50, -89, -123, 12, -8, -10, 50,
+   -8, -30, -50, -40, 13, -26, -41, -8,
+   -23, -9, 61, -117, 29, 50, -20, 20,
+   31, 45, -82, 59, 12, -96, 8, 8,
+   -49, 28, -33, 14, -31, 9, -44, -60,
+   49, 98, -4, -19, 16, 3, 75, 31,
+   -55, -75, 114, -12, -113, 3, -116, 80,
+   -12, 19, 9, 74, -28, -109, 9, 21,
+   27, -15, 12, -37, 23, 81, 103, -19,
+   -40, -113, -42, -121, -104, 36, -29, -70,
+   -38, -75, 73, 16, 0, 30, -10, -82,
+   -35, 82, 112, -19, 43, 41, -65, 29,
+   -65, 7, -82, -14, -36, -32, -19, 76,
+   9, 71, -61, 79, 71, 8, -82, -31,
+   35, -33, 41, -46, 17, 23, 28, 33,
+   86, -21, 66, 65, 68, -55, 37, -50,
+   -92, -17, -8, -39, -90, -47, 81, -7,
+   57, -71, -2, 0, -18, -17, -18, -117,
+   -47, 60, -3, 19, -115, -17, -37, -64,
+   -7, -37, -36, -100, 2, 122, -68, 7,
+   -29, -46, -4, -67, 63, 44, -9, 40,
+   -94, -123, -6, -126, 2, -84, 31, -46,
+   -23, 51, -37, 31, -27, -64, -60, -16,
+   -125, -38, 29, -80, 5, 54, 10, 96,
+   46, -1, -34, 6, -37, -69, 17, -32,
+   31, 49, -31, -42, -120, -54, -6, -7,
+   43, -50, -15, 66, -124, 4, 21, 10,
+   -8, 31, 11, -35, -8, 81, 26, 9,
+   -14, -44, -87, -66, 9, -82, -45, -39,
+   -3, -17, -21, 61, 17, -4, -4, 15,
+   40, -23, 1, -44, -30, -24, -51, -56,
+   -21, 19, -45, -24, -22, 37, -50, -3,
+   -6, -17, -19, -54, -65, -51, -17, 15,
+   40, 19, -26, -61, -26, 0, 8, -17,
+   -26, 8, -5, 3, 22, -16, 7, -54,
+   -25, -15, 18, 47, -31, 6, -34, -22,
+   -25, -16, 31, -8, 49, -38, -33, 30,
+   -39, 21, 4, -26, -36, -48, -28, 24,
+   0, 32, 38, -21, 97, -10, 45, 10,
+   -31, -32, -39, -57, -52, 6, 11, 5,
+   7, -13, 25, 0, 54, 14, -32, -4,
+   59, 17, -30, -10, 23, 21, 29, 8,
+   -48, 39, 56, 18, -18, 10, 26, -16,
+   90, 8, 19, -55, -36, 49, -28, 39,
+   -28, -127, 123, 11, 8, 83, 4, 26,
+   -67, 21, 31, -43, -33, 25, -32, 92,
+   44, 9, 19, 108, 39, 53, -15, 94,
+   13, 28, 36, 38, 28, -6, -13, 14,
+   -99, -17, -17, 2, -15, -3, 10, 19,
+   56, -15, 124, 21, 39, -23, 3, 61,
+   59, -29, 48, -2, -1, 51, -11, 41,
+   -42, 76, -108, -50, -15, -43, 37, -38,
+   61, -47, -42, -62, 3, -6, -66, 18,
+   -48, -25, 19, 66, 1, 78, -26, -127,
+   26, 0, 10, 21, -25, -12, 3, 11,
+   126, -126, 1, 3, 17, 123, -9, -29,
+   96, 125, -2, 32, 21, 24, 52, 8,
+   42, -53, 42, -12, -18, 23, -11, -125,
+   43, 47, 40, -68, 3, -5, -14, -43,
+   -49, 23, -34, 35, 35, -33, 58, -126,
+   26, 42, 34, 8, -39, 20, 72, -2,
+   -61, -26, 32, 1, 31, 36, -107, 19,
+   -6, -128, -41, -65, 15, 21, 36, 6,
+   74, 27, 29, 6, -71, 46, -30, 37,
+   33, 43, 105, 31, -26, -59, -19, 20,
+   37, 30, -71, -9, 92, 1, -21, -11,
+   50, 81, 22, 62, 61, 23, -64, 77,
+   -22, -31, -2, 1, 17, 9, -7, 31,
+   20, 17, -12, 36, 42, 0, 71, 7,
+   -52, -101, 1, 2, 7, 45, 38, -103,
+   -24, 32, 4, 61, 60, 36, -33, 40,
+   60, 79, 15, -85, 74, -71, 26, -11,
+   46, 8, 40, 53, 26, 62, 19, -5,
+   39, 68, -57, -59, 67, 18, -20, -1,
+   -45, 9, 41, -33, -5, 46, 12, 14,
+   3, -10, -12, 42, -18, 118, 65, -32,
+   -2, -12, 112, -36, 18, -43, 38, 6,
+   -41, -22, 20, -31, -5, -25, -31, -54,
+   -35, -10, -5, -8, -44, -124, -122, 37,
+   -113, -24, -29, -18, -7, -69, 63, 3,
+   33, 50, -47, 114, 6, -15, 37, -38,
+   21, 23, -37, -44, -24, 48, 104, 47,
+   -8, -80, 37, -28, 76, 4, 3, 36,
+   19, 16, -45, -59, -17, 16, 5, -18,
+   -36, -26, -125, -24, 12, 29, -34, -6,
+   -76, 31, 50, -33, -38, 12, -14, -63,
+   24, 29, 116, 5, 26, 23, 31, -8,
+   91, 17, 0, 2, 125, -90, 33, 8,
+   -67, -99, -41, -64, -73, -15, -23, 7,
+   7, 10, -97, -127, -14, -77, -127, -40,
+   -45, -23, -12, 14, -3, -7, 12, 0,
+   -2, -80, -38, 22, -100, -60, -121, -11,
+   -1, 119, -2, 40, -20, -125, 63, 10,
+   -32, -110, -15, -103, -7, -7, 87, -32,
+   -7, -35, -33, -33, -54, -1, -12, -43,
+   15, 6, 12, 48, -1, -14, -100, -20,
+   95, 31, 41, -50, 18, -36, -9, 16,
+   -10, -6, -28, -17, -55, -79, -9, -3,
+   46, 29, -31, 44, -84, -23, -37, -40,
+   18, -8, 21, -33, 30, -44, -14, -13,
+   -7, -4, -116, -19, 45, -60, 2, 26,
+   13, -4, -4, -6, -15, 20, -122, 26,
+   -38, -46, 4, -101, -124, -12, 0, 46,
+   5, -20, -10, 35, -49, -46, -42, 19,
+   6, -21, -127, 108, -4, -7, -20, -25,
+   15, 67, -38, 12, 27, -28, 21, -19,
+   -11, 18, 5, -3, -23, 17, 32, -10,
+   -25, 19, -90, 27, -6, 9, -24, 19,
+   -123, -17, 50, -85, -16, -98, -8, -9,
+   27, 1, -24, -37, -27, -28, 5, -26,
+   26, -12, 1, 14, -16, -2, -12, 31,
+   0, -36, -9, 19, 13, -1, 9, 9,
+   -16, -51, -15, -34, -61, -3, -15, -30,
+   -17, 2, -8, 30, -39, -27, 23, 46,
+   17, -9, -29, 56, -91, -91, -58, 23,
+   -15, 19, -6, -30, -10, -31, -34, -14,
+   -41, -30, -78, 12, 16, 51, -7, -38,
+   0, -19, -16, -54, 4, 3, -1, -16,
+   17, 3, 7, -20, -14, -38, 30, -23,
+   27, 12, 84, 60, 19, -16, -55, -15,
+   5, 32, 33, 1, -15, -3, -35, -121,
+   52, 75, 31, 30, 0, -20, -26, 32,
+   38, -14, 33, 81, -17, -4, -16, -84,
+   -37, -29, 7, -14, 5, -30, -52, 27,
+   29, -119, -48, 0, -101, -28, -11, -69,
+   -56, -34, 48, 85, 22, 35, -18, -90,
+   53, 10, 8, 13, -60, 52, -54, 10,
+   99, -95, 32, -60, 0, 124, -19, -1,
+   4, 65, -48, -2, -18, -28, 0, -58,
+   43, -63, 40, -73, 0, 32, -26, -36,
+   -25, 16, -37, 7, -70, -50, 41, 0,
+   -18, 10, 21, -10, 24, 35, -35, -38,
+   48, 16, 26, -33, 94, 3, 27, -22,
+   -17, 69, 19, 21, -57, 78, -5, 8,
+   17, 5, 3, -39, -4, 19, -26, 14,
+   7, -1, 2, -31, -22, -8, -2, -9,
+   -48, -51, 71, 10, 20, 21, -1, 11,
+   26, 13, 1, -20, 60, 18, -38, -9,
+   -30, 30, -20, -30, 45, -39, 21, -6,
+   18, -16, 5, 42, -41, 58, 41, 9,
+   7, 38, 11, 41, 21, 35, -53, -49,
+   -43, -3, -30, 38, 1, -5, -34, -52,
+   -10, 22, -11, -20, 22, 13, -54, 20,
+   -19, 19, -24, -38, 24, -6, 67, 92,
+   -6, 46, 60, -25, 5, -68, 0, -36,
+   6, 14, -33, -40, -33, 38, -26, 1,
+   20, -23, -54, -13, 4, 25, -30, -7,
+   -51, 14, -37, -53, -11, -7, 5, 10,
+   7, 0, -29, 8, -27, 1, -14, -37,
+   60, -7, -41, -29, -31, -13, 22, -13,
+   52, 8, 65, 48, -10, -74, 5, -4,
+   31, 30, -25, -9, -13, 24, -12, -22,
+   64, 13, 18, 28, -22, 46, -8, 39,
+   -48, -14, -17, -6, -40, 16, -5, -29,
+   -2, -46, -47, -25, -19, 52, -1, -22,
+   21, -66, -5, 29, -3, -28, 17, 21,
+   18, 11, 67, -26, 31, -8, -1, 36,
+   46, -9, 14, 39, 18, 9, 23, 38,
+   56, -25, 46, 70, -22, -11, -19, 7,
+   -11, 49, -4, -25, -55, -43, -28, 66,
+   79, 16, 2, 17, -19, 20, -20, -2,
+   -26, 41, 27, 19, -11, 67, 33, -49,
+   69, 16, 0, -5, 3, 47, -2, -48,
+   56, -77, -22, -3, 21, 84, 67, -17,
+   10, 21, 19, 23, -4, 7, -45, 40,
+   -21, -64, 19, -23, -15, 68, -9, 7,
+   -3, 38, 14, 12, -73, -6, -28, 36,
+   15, 20, 15, 28, 40, 42, 100, 47,
+   37, -43, -31, -80, 39, 12, 20, -14,
+   19, 17, -117, 24, -36, 16, 34, 31,
+   -22, -48, 4, 4, 27, 33, 39, 38,
+   -12, 34, 13, 37, -9, 40, -23, -11,
+   75, -6, -14, -30, -61, 20, 20, -38,
+   -16, -6, 34, -14, -2, 4, 11, 9,
+   -1, -17, -24, -112, 59, 20, 25, -17,
+   -10, 9, -18, 11, -7, 16, -3, 17,
+   2, 66, 38, 12, 9, 3, -17, -10,
+   35, 22, -38, -23, 40, 19, -51, -32,
+   18, 17, 2, 21, 10, 16, -16, 0,
+   13, 6, -8, 28, 47, -6, -25, 43,
+   17, -4, -13, -94, -1, 18, 24, -1,
+   14, 15, 3, 1, 41, 36, 1, -16,
+   -10, -50, 27, -50, 18, 16, -6, 6,
+   -14, 38, -49, 73, 9, 57, 31, -41,
+   58, -45, -11, 20, 15, -61, 27, 4,
+   -3, 8, 56, -101, 29, 21, 27, 8,
+   73, 31, -16, -87, -17, -87, 4, -22,
+   -45, 59, 3, 7, 12, 13, 0, 17,
+   23, 94, -50, 3, -29, 55, -124, -10,
+   -32, 41, -38, 25, 2, 18, 34, 31,
+   34, 15, -82, 61, -13, 32, -17, 20,
+   -5, -19, 24, 14, 53, 38, 72, 41,
+   -47, 24, 43, 7, 82, -7, -7, 38,
+   -1, -28, 13, -7, 8, -7, 16, -26,
+   9, 12, 17, -48, -23, 33, 64, -8,
+   0, 71, -37, 67, -85, 20, 19, 25,
+   18, 15, -6, -34, 97, 17, 8, 30,
+   11, -23, -12, 41, 6, 62, 21, 4,
+   18, -31, 71, -70, 9, 2, -32, 21,
+   -11, 44, 47, -11, -34, -5, 3, -5,
+   11, 33, 59, 6, 6, 12, 49, 6,
+   43, 33, 3, -26, 34, 53, -11, -29,
+   -1, -10, 39, 82, 116, -25, -38, 28,
+   -18, 26, -59, -47, 21, 6, -31, 44,
+   -81, -72, 38, -104, 39, 98, 4, -68,
+   -4, -36, -49, -19, -18, -52, 37, 5,
+   -56, -44, 21, -5, 69, 42, 10, -26,
+   -45, 28, -6, -22, -37, 39, 44, 5,
+   -29, 54, -1, 90, -81, 118, -54, 20,
+   28, 7, 77, 0, 34, -2, -25, 60,
+   -64, 8, -49, -31, -46, -26, -18, 12,
+   4, 22, 5, 42, -6, 6, 59, 34,
+   11, 10, -62, 14, 4, -11, -15, -47,
+   -1, -15, -34, 38, 26, -33, -18, -12,
+   2, 6, 9, -15, 43, 13, 35, 25,
+   -53, 9, 10, 47, -27, 85, -25, 12,
+   -12, 5, 12, -125, 12, -89, -4, 55,
+   20, 17, 48, 22, -45, -7, 5, 65,
+   22, 13, 2, 22, 38, 12, 35, -17,
+   32, -40, -49, -10, -100, -97, 13, 17,
+   -29, -24, 32, -77, -4, -81, -83, 49,
+   -99, 41, -34, -58, -10, -69, -2, 33,
+   -120, -81, -36, -31, -78, -27, 83, 15,
+   -49, -51, -19, 83, 29, -63, 25, -15,
+   -84, 21, 30, -88, 45, -11, -44, -73,
+   -86, 22, 11, -126, 66, -41, 16, -5,
+   -59, 37, 62, -29, -5, -128, 116, 102,
+   -44, -30, -43, -73, -121, 86, -39, -14,
+   -127, -7, 63, -24, 12, -47, 4, 24,
+   -58, 31, -33, -34, -98, 90, 119, -56,
+   4, -16, -42, -35, 48, -24, -85, 12,
+   73, -48, 52, -22, -109, -26, -29, 31,
+   105, -5, -39, -60, -81, 24, -114, 46,
+   -51, 56, -5, -96, 58, 97, -26, 0,
+   84, 51, -85, -39, -20, -10, -11, -6,
+   -55, -47, -65, -50, -63, 77, -54, 3,
+   41, -127, 44, -63, 61, 17, -44, 29,
+   -22, 1, 2, -83, 36, -43, -7, -30,
+   -19, -37, 28, 7, -63, -73, 81, 51,
+   -37, -13, 18, -123, -7, 33, 75, 43,
+   85, 40, -56, 10, 91, -45, 7, -60,
+   14, -26, -13, -118, -33, 38, -27, 63,
+   7, 36, -30, -52, -115, 113, -42, 39,
+   3, 3, 26, 53, -109, -103, -23, 1,
+   121, 36, 60, -62, -124, 39, -60, -16,
+   -22, -12, -86, -13, 27, -9, -3, -22,
+   60, 9, -16, 100, 51, -33, -34, -57,
+   -9, -29, -1, -29, -42, 2, -19, -11,
+   -1, -8, 93, -46, -43, -42, 9, 9,
+   15, -23, -11, 14, -20, -73, -59, 17,
+   7, -26, -57, -6, 54, -43, -70, 82,
+   -12, -1, -99, 25, 4, -24, 5, 34,
+   39, 17, -89, 10, 32, -93, 18, -9,
+   -20, 8, 41, -37, -25, -19, 8, 28,
+   -72, 60, 66, -80, -52, -4, -19, 14,
+   -25, -16, -49, 15, -91, 84, 34, 47,
+   -123, 44, 18, 20, -77, 0, 9, -66,
+   20, -28, 13, -99, 24, 48, -1, 32,
+   -42, 33, 47, 20, 85, 71, 57, -27,
+   -53, -73, 60, 119, -81, -51, 4, 38,
+   38, -1, 5, 25, 38, 36, 92, 125,
+   122, 29, -89, -109, 65, 53, -17, 39,
+   121, -19, 71, -3, -97, 29, 55, 102,
+   8, -53, 101, 40, 78, -56, -77, 29,
+   81, 60, 117, -4, -45, -3, 100, 87,
+   -122, -12, -80, 100, -116, -18, 33, 121,
+   112, 21, 35, 5, 47, -51, 10, 46,
+   -95, -42, -28, 78, -39, -32, -114, -3,
+   -53, -104, -94, -1, -50, 27, -38, 20,
+   -30, -59, 111, -63, 21, -18, -31, 11,
+   17, 46, 21, 30, -22, 59, 13, 62,
+   -17, 42, -75, -42, 23, 30, 33, -39,
+   -49, -110, -46, 56, 21, 23, 24, -80,
+   -16, -69, 11, 80, -42, -27, -44, -46,
+   16, -24, -7, 35, 61, 43, 16, 24,
+   9, 43, 28, -88, 53, 26, -80, -128,
+   73, -34, -44, 10, 38, -114, 80, 2,
+   72, -1, 56, -52, 79, 9, -40, -103,
+   -35, 2, -40, 0, 49, -54, 110, 8,
+   3, -8, 17, -38, 38, -52, 45, -4,
+   -22, -82, 28, 79, 18, -56, -45, -13,
+   -57, -7, 14, -16, 8, -10, 44, -58,
+   22, 120, -30, 10, 22, -14, -104, 58,
+   7, 28, -30, 15, 7, -19, 39, 90,
+   51, 39, -128, 46, -34, -55, -37, -65,
+   -2, 29, 79, 63, 39, -38, -63, -30,
+   14, 4, 30, 74, 62, 17, -21, 40,
+   107, -62, 18, -85, 60, 2, -12, -67,
+   36, -65, -67, 23, 25, 14, -22, 12,
+   68, 10, 59, 28, 53, -16, 34, -116,
+   -15, 12, 66, 76, 111, -33, -58, -7,
+   21, -11, -50, 94, -55, -49, -102, 9,
+   -3, 17, -5, 83, 22, 29, 73, -17,
+   22, 1, -37, -90, 17, 14, -22, -39,
+   46, 13, 2, 77, 36, -25, 66, 17,
+   17, 25, 11, 9, 25, 15, 51, -24,
+   2, -53, -9, 24, 26, 14, -18, -2,
+   15, -34, 35, -15, 59, -36, -10, -7,
+   -26, -123, -10, -10, 69, -33, 5, 22,
+   3, 40, 0, 89, 29, 28, -37, -32,
+   23, -14, -25, -11, -22, 18, 36, 62,
+   21, -61, 26, 15, -68, 73, 59, -34,
+   1, 21, 17, 124, -16, 40, 7, -31,
+   -43, 80, -5, -14, -3, 27, -42, -70,
+   -31, -54, -25, 46, 112, -35, 35, -32,
+   -73, -33, 69, -13, 40, -2, 7, -17,
+   60, -3, -32, 41, 25, 108, 7, -41,
+   55, -76, -27, -4, -7, -19, 33, -2,
+   30, 17, -3, 43, 21, 9, 33, -36,
+   15, -29, 46, -36, -15, 81, 27, -14,
+   9, 10, 42, -6, -22, -49, 43, 5,
+   12, 10, 115, -13, 63, 43, 37, 50,
+   5, 7, -60, -7, 15, 0, 7, -48,
+   -8, 51, -61, -11, -12, 110, 83, -17,
+   6, -5, 19, 35, 41, -16, -5, -74,
+   -8, -22, -30, 17, -28, -19, 39, -15,
+   6, -32, -44, -26, -38, -54, -22, -7,
+   -55, 4, -33, -11, -3, 8, 14, -4,
+   -8, 21, 6, -77, 27, 13, -5, -5,
+   43, 55, 19, 3, -18, 10, -17, -6,
+   39, 20, -5, -28, 25, -33, 16, 7,
+   10, -43, -3, -7, 38, -26, 14, 18,
+   26, 27, -17, -28, -16, -24, -13, 6,
+   4, 12, -4, 20, -13, -2, -23, 79,
+   -6, -3, -8, -14, -47, 41, -18, 27,
+   27, -3, -49, -21, -1, -32, 25, 15,
+   -32, -25, -1, -121, -24, -11, 23, -7,
+   -12, 15, -48, 20, -14, 2, -27, -26,
+   24, -16, 65, -17, 26, 72, -33, 9,
+   -63, -63, -8, -63, -68, -22, 40, 6,
+   68, 24, 20, -44, 45, -15, -27, 4,
+   8, -37, 2, -1, 16, 16, -17, -2,
+   16, 93, -19, 89, -2, 65, 27, -6,
+   21, 44, 122, 45, 3, -2, 24, 44,
+   42, -30, 6, -18, 27, -21, -8, 24,
+   -14, 54, 6, 21, 56, 13, 55, 25,
+   32, 41, 62, -100, -37, 14, 15, 50,
+   -23, -22, 119, 10, 18, 61, 39, 45,
+   48, 110, 23, 73, -31, -19, -16, 5,
+   72, 41, -23, -47, 38, -14, 8, 53,
+   -7, 8, 41, -5, 65, 39, -12, 31,
+   34, -10, -15, 4, 21, -42, -39, -23,
+   112, -35, 93, -28, -11, -37, 40, 49,
+   54, -29, -39, 93, -11, 32, 48, -1,
+   -5, 93, 80, 0, 1, -37, 5, -17,
+   20, 16, 11, 13, 19, -10, -41, -29,
+   -19, 10, 44, -48, 62, 4, -37, -13,
+   -6, -28, 28, -42, 22, -14, -37, -18,
+   2, 19, 3, -50, -12, -16, -6, -7,
+   45, -43, -34, -88, -29, -95, 11, 33,
+   -31, -10, -53, -13, -7, -19, 30, -24,
+   10, 17, -5, 6, -22, 36, 45, -1,
+   -46, 10, 19, 8, 5, -65, 4, 27,
+   3, 11, -37, -45, 15, -3, -39, 24,
+   7, 35, 14, -35, -8, -14, -18, 49,
+   7, -37, -4, -14, 10, -2, -9, 4,
+   35, -6, -19, 17, 12, 23, 39, 22,
+   24, -63, -25, 1, 21, 38, 24, 7,
+   13, 6, 10, -9, 29, -19, 8, 45,
+   14, -21, 12, -22, -26, 2, 20, 60,
+   29, 67, -115, 8, -2, -32, 8, 42,
+   -13, -10, 5, 19, 0, -34, 2, 6,
+   42, 5, 33, -63, 13, 27, -19, 23,
+   23, 16, -38, -11, 21, 116, 3, -53,
+   -96, -88, 119, 56, -82, 4, -14, 4,
+   21, -3, -17, 103, 5, 38, 37, -33,
+   73, -1, -12, 7, -53, -19, -12, -41,
+   32, 18, -26, 65, -24, -113, 91, -35,
+   23, 47, -41, 51, -40, -48, 93, 22,
+   -51, 13, 51, -49, -37, -14, 19, 37,
+   22, -48, -55, 15, 72, -12, 30, -20,
+   51, -15, 56, 69, 30, -39, -37, 79,
+   101, 10, 3, 18, 40, 21, 3, -14,
+   -26, 4, 30, -18, -2, -20, -24, -19,
+   53, 43, 34, -26, 44, 13, -24, -56,
+   122, 13, -1, 96, -58, -40, -24, 10,
+   -85, -127, 26, -57, 35, -5, -4, 0,
+   -75, -33, 19, 66, 26, -38, -89, -40,
+   -7, 8, -25, 85, -48, 17, 44, -21,
+   54, -59, 37, -39, 57, 101, 64, 12,
+   39, 35, -7, -91, -22, -21, 125, -20,
+   55, -105, -26, -22, -17, 48, 124, -38,
+   -17, 15, -14, 41, -42, -25, -35, -9,
+   -34, -50, -19, 62, 15, -8, -16, 58,
+   58, 103, -38, 2, -51, -53, 45, -37,
+   32, 30, -33, 51, 82, -51, 1, 4,
+   65, -19, -12, 45, -71, -8, 40, -19,
+   -6, -14, 15, 29, -5, 25, 3, 3,
+   -39, -18, -42, 21, 32, 17, -10, 21,
+   32, 32, -7, -27, 13, -35, 68, 18,
+   -3, -37, 36, -67, -13, 5, -18, -15,
+   34, 6, -54, -25, 65, 55, -9, -1,
+   8, 22, -69, 26, 16, 42, 9, -23,
+   -3, -102, -46, -33, -19, -13, 49, -29,
+   23, -9, 12, 13, 15, 30, -12, 30,
+   -4, -5, -1, 12, 27, -40, -19, -42,
+   29, 18, -2, 29, 29, -73, -6, -31,
+   -1, 23, -10, -31, 40, 14, -4, 0,
+   -80, 5, -66, -9, -7, -13, 81, -8,
+   59, 48, -56, 7, 22, 71, -13, 24,
+   27, -28, 31, -69, 40, 52, 37, 73,
+   33, -38, -76, -31, 26, 23, 29, 13,
+   91, -88, 95, -14, 3, 31, 85, -22,
+   25, 59, -82, 31, -93, -2, 67, -9,
+   -19, -6, -119, 23, -15, 70, -7, 31,
+   -23, 98, 33, -6, -20, 33, -31, -27,
+   47, -107, -76, -51, -8, -108, 4, 1,
+   -50, -35, 62, 9, -8, 122, 28, 12,
+   45, 56, 49, -3, 14, -80, 34, 64,
+   -11, 40, 24, 49, -34, -32, 22, -17,
+   20, -28, 7, 43, -24, 1, -71, -21,
+   12, 45, -8, -34, 5, 6, -57, 93,
+   21, 40, 42, 19, -6, 51, 23, 12,
+   -106, 13, 25, -9, 21, 26, 75, -58,
+   95, 21, 15, -48, -11, 63, 61, 19,
+   37, -80, -1, 82, 46, 78, 47, -65,
+   -7, 9, 34, 50, 2, 25, 25, 17,
+   63, -58, -14, -8, 32, 17, -47, 19,
+   0, 22, -50, 10, -55, 8, -19, 27,
+   -22, -9, -9, 3, -66, 47, 111, 91,
+   -54, -21, -41, 24, -9, -4, 87, 11,
+   -22, 75, -59, 8, -14, 39, 71, -31,
+   -9, -5, -113, -58, 36, -6, 15, 10,
+   -38, 2, -39, 23, 12, 58, 24, -15,
+   -50, 3, 9, 24, -3, 8, 22, 7,
+   -16, 22, 33, -7, -26, -29, 23, 44,
+   3, 47, -60, -97, 33, -17, 36, 57,
+   50, 21, -2, -15, 66, 82, 61, 22,
+   16, 5, 110, 20, 35, 13, 2, -27,
+   18, -82, -40, 46, 23, -6, 4, 40,
+   45, 3, -34, 19, 46, -10, 47, 22,
+   -5, 3, 15, 29, 9, 30, -43, 9,
+   -73, 20, -16, -11, 7, 43, 44, -1,
+   49, -12, -27, -16, 79, 24, 24, 37,
+   -10, 41, 31, -93, 46, 20, 18, 33,
+   19, -103, 36, 41, 54, -10, 50, -5,
+   74, -17, -43, -14, -48, -60, 54, 3,
+   -25, 28, 41, -53, -30, 19, 36, 15,
+   -1, 8, -36, -37, 28, 35, 13, -33,
+   9, 26, 1, 4, -22, -35, -19, 48,
+   -8, 15, -23, -44, 35, -70, -34, -37,
+   -35, -15, -19, 15, 17, -31, -58, 69,
+   11, -29, -55, 21, -39, 1, 17, 0,
+   46, 69, 25, 60, 26, -46, 49, -99,
+   -71, 49, -2, -24, -25, -37, -1, -95,
+   44, -15, -49, 49, -3, 31, 36, 4,
+   67, -16, -17, -45, -21, 5, 7, -5,
+   -10, 37, -28, 71, 1, -53, -10, -1,
+   20, -18, -39, 8, -29, 9, -31, -10,
+   -4, -15, 17, 19, 46, -83, 57, -71,
+   97, 119, 1, -45, 6, 79, 40, 7,
+   44, -126, -19, -40, 23, 74, 54, -3,
+   14, 62, 74, -32, -19, 34, -5, -106,
+   12, -13, 46, -32, 40, 96, -8, -40,
+   -35, 20, -7, 55, -18, -41, -28, 1,
+   -36, -42, -71, -20, 1, 19, -72, -52,
+   -18, 0, 3, -73, 8, 18, 7, -18,
+   54, 21, -12, 13, -14, -62, 4, -38,
+   52, -30, -40, -6, 48, 29, 30, 25,
+   44, -48, -6, -24, 23, -42, -3, -20,
+   -50, -5, -31, -13, -14, 32, -11, 16,
+   46, 10, -81, -30, 3, -22, 24, 0,
+   28, 54, 25, -78, 60, 22, -12, 4,
+   -4, -47, -1, 4, -19, 33, 60, 27,
+   17, 16, -14, -88, 27, -87, 20, -31,
+   -3, -30, -12, 6, 6, 77, 13, -10,
+   7, -7, -5, -62, 22, 6, 39, 26,
+   25, 30, -3, -7, 11, 6, -65, -26,
+   -44, 30, 94, -68, 21, 48, 19, -14,
+   32, 32, -6, 36, -7, 17, -42, -2,
+   -2, 13, 18, 71, 1, 8, -9, 23,
+   -20, 16, 54, -47, 73, 38, 17, -11,
+   -83, 91, -11, 14, 79, 93, -65, 114,
+   -10, 21, 13, 8, -20, -23, -14, 45,
+   48, 23, 1, 2, -15, -18, 39, 56,
+   4, 63, 13, 21, 86, -33, 30, 12,
+   -31, 92, -88, 50, -4, 14, 7, 48,
+   23, 70, 123, -5, 42, 2, 16, -19,
+   127, -16, 95, -26, -72, 53, 37, 5,
+   46, -52, 42, 17, 30, -12, 65, 28,
+   22, -13, 125, -9, -7, -26, 17, -9,
+   -64, -84, 16, 8, 105, -30, 9, -58,
+   53, 126, 29, 39, 19, 47, 40, 14,
+   -22, -3, 19, -53, -105, -22, 11, -15,
+   34, -64, -46, -18, -2, -26, -45, -22,
+   -43, 1, -8, 15, -28, 64, 48, 59,
+   18, -4, -8, 31, -45, 53, -109, -10,
+   -3, -19, -3, 18, -20, -48, 34, 77,
+   -19, 117, -9, -43, 93, -30, -113, 11,
+   -15, -19, -6, 17, 24, -48, 74, -29,
+   67, -15, 45, -38, -9, 30, -18, 22,
+   60, 8, 72, 10, -1, -2, -32, -52,
+   47, -17, -35, -3, -2, -18, 36, 50,
+   18, -1, -19, -115, 8, 7, 28, 45,
+   -41, -25, -70, -6, -59, -68, -13, -76,
+   31, 22, 31, 7, 31, 12, 47, -19,
+   -28, -58, 21, -37, -23, -35, 59, -35,
+   -32, -25, -12, 2, -12, 23, 9, 39,
+   -30, -30, -1, -37, 2, -19, 35, 18,
+   18, 27, -50, 24, -38, -20, 3, -11,
+   13, -3, -30, 67, 8, 63, 7, -10,
+   2, 3, 75, -7, 31, -2, -10, -10,
+   15, -11, 48, -37, -4, 13, 25, -12,
+   72, -45, -37, -7, -49, 15, -36, 17,
+   -6, 1, -52, -3, -23, 29, 49, 18,
+   62, 0, 25, 27, -13, -4, 9, 6,
+   10, 40, 10, 46, 83, 68, 15, 9,
+   67, 71, -122, -15, 73, 44, -125, -44,
+   11, 12, -28, -56, 15, 3, 6, -7,
+   50, 35, -2, 125, -60, 60, 76, 55,
+   103, -42, 50, 19, -10, -104, -11, -1,
+   -1, -35, 3, -34, 27, 23, 24, -45,
+   -2, 19, -17, 56, -53, 52, 18, -53,
+   -121, 0, -10, -65, -47, 22, 81, -58,
+   33, 5, -84, -9, -10, -35, -40, 47,
+   -24, -73, 15, 49, -48, -127, -26, 11,
+   118, -75, -16, -69, -32, -74, -46, 127,
+   111, -6, 26, 25, 53, -10, -32, 33,
+   -3, 30, 54, 84, -14, -32, -73, -76,
+   77, 88, -9, -15, -6, -102, -59, 39,
+   13, 54, -64, 10, 67, 62, 7, -18,
+   -21, 73, 13, 53, -27, 34, 11, -81,
+   122, -21, 65, -27, 1, 104, 22, -96,
+   68, -111, 25, 4, -2, 66, 106, -21,
+   8, 49, 19, 10, 10, 5, -6, 45,
+   32, -116, -15, -68, 38, -1, -3, 13,
+   -22, 18, -20, -10, -119, -20, -4, 64,
+   -23, 56, 17, -28, -12, 16, 4, 45,
+   67, -76, -6, -60, 8, -59, -10, -65,
+   -29, 47, -68, -38, -76, -59, -16, 90,
+   -10, 1, -2, 72, -21, -20, -36, 50,
+   -23, 4, -9, -14, -14, 30, 5, 6,
+   -99, -49, -19, 16, 21, -2, 65, -15,
+   -39, -5, 25, 4, 17, -28, -8, -4,
+   -46, 31, 42, -17, -8, -29, -14, 45,
+   38, -32, -28, 24, 40, 28, -5, -22,
+   -32, 56, -6, 11, 5, 48, 5, -57,
+   -4, 11, -12, 32, 12, 23, 0, -10,
+   2, 10, -1, -17, 56, -25, 34, 12,
+   -37, 12, -4, -38, 9, -93, 36, 28,
+   32, 83, 48, -48, -21, 3, -18, -69,
+   45, 0, 36, 9, -37, 29, -6, -16,
+   36, -10, -29, 16, -39, -12, 23, -14,
+   2, -27, 77, -39, -77, -57, 23, 40,
+   32, 19, -13, 0, -18, 39, 33, 26,
+   -4, 6, 59, -121, -7, 24, 2, -53,
+   61, 4, 6, -4, -6, -38, 5, -12,
+   55, -9, -8, 2, -13, -14, -31, -18,
+   25, -46, 81, 26, 21, -25, -47, 37,
+   25, 8, -36, 19, -7, -42, 8, -19,
+   -13, 17, 45, -3, -12, -7, 5, 11,
+   -31, 49, 10, 34, 2, 64, -17, 75,
+   -61, 24, -1, 5, 22, 21, 24, -46,
+   -35, -15, 16, 14, 46, -12, -15, -60,
+   6, -14, -15, 48, -7, 22, -13, 33,
+   8, -25, -15, 0, 10, 33, 9, -36,
+   71, -115, 3, -29, -35, -73, -46, -68,
+   -17, -38, -24, -11, 31, -12, -3, -52,
+   52, -36, -6, -54, -18, -14, 13, -54,
+   13, -6, -4, 25, -22, 49, 9, 1,
+   18, 15, -4, -16, 10, -15, -32, 15,
+   -2, -67, 55, -63, -4, 48, -44, -14,
+   -43, -6, -4, -5, -32, 1, 11, 23,
+   -20, 36, 40, -28, 22, 22, -40, 2,
+   -4, 11, -14, -7, -25, -17, 9, 41,
+   -16, 10, 5, 10, -9, 9, 57, 25,
+   0, 1, -20, 8, 13, 127, -24, 17,
+   9, -24, -2, -6, -40, -2, -5, 4,
+   -49, -34, -25, -5, -2, 25, -99, 11,
+   -10, -13, -16, 8, -6, 0, -23, 21,
+   -42, 12, -22, -55, 18, -9, -13, -17,
+   -20, -10, 13, 23, 19, 10, 14, 5,
+   3, 17, -7, -4, 9, 126, 6, -29,
+   12, -19, -29, -38, 8, 4, 5, 22,
+   19, -20, 0, 98, -1, 12, -17, 12,
+   0, -15, 38, -25, -11, -17, -46, 48,
+   3, -19, 22, -89, 13, -37, 20, -26,
+   -2, 8, 23, -13, -3, -7, 28, 21,
+   -16, -3, -10, 12, -6, -22, 27, -14,
+   49, -16, 0, 54, 48, 67, -34, -37,
+   -56, 78, -24, 55, -23, -10, 30, -33,
+   92, 16, -61, -1, -30, -24, 38, -66,
+   79, 69, 16, 27, 19, 12, 48, 31,
+   40, -47, -106, -118, -51, 96, 30, -12,
+   -48, -15, 74, 117, 106, 24, 18, -39,
+   1, 38, 86, -28, 2, 17, 126, 22,
+   17, -121, -65, -9, -17, 47, 61, -7,
+   74, -107, 71, 68, 71, 95, 83, 127,
+   122, 53, -8, -2, -88, -49, -95, -23,
+   -36, 92, 58, -33, 41, -26, -61, 43,
+   -104, 63, 41, 41, -36, -55, -40, 36,
+   -26, 35, -19, -27, 5, 64, 27, -40,
+   46, 19, -57, 48, -19, 33, 127, -86,
+   28, 4, 83, 82, -15, 111, -30, 47,
+   -49, 34, 121, 30, -82, 24, 111, 73,
+   44, -13, 39, 79, 90, 77, 17, 13,
+   -92, 126, -32, 50, 123, 32, -66, 55,
+   21, 13, 24, 106, 71, -79, -19, 83,
+   25, 79, 27, 68, 33, 49, -42, -50,
+   126, 20, 8, 15, -25, -72, 10, 126,
+   40, -56, 23, -6, 121, 38, 33, 104,
+   -50, 38, -3, 123, 26, 31, 127, -67,
+   30, -123, -62, 27, -7, 28, -20, -39,
+   -28, 36, -43, 44, 41, 61, 38, -17,
+   -17, 4, 73, 49, -19, 87, 109, 92,
+   49, 60, 66, 38, -9, -32, 16, -13,
+   57, 21, -6, -53, -39, -84, 126, 79,
+   21, -46, -37, 56, 52, 102, 62, 36,
+   26, 83, 74, 77, 7, -124, -57, -22,
+   -6, -115, 18, 46, 122, 14, 7, 0,
+   45, 29, 1, 57, 8, -14, 58, -17,
+   49, 24, -66, 28, -15, -8, 82, -71,
+   13, 10, 91, -46, -24, -36, 18, -9,
+   59, -19, 10, -60, -27, -24, 28, 3,
+   127, 48, -2, -57, 77, -3, -7, -11,
+   -31, 31, -31, 78, 12, -127, -17, 15,
+   22, 51, -61, -59, -38, 87, 10, -23,
+   21, 10, 58, -58, -37, -14, -52, -4,
+   -48, -1, 10, 0, -44, -56, -46, -15,
+   -71, 16, 23, -2, 53, 11, -46, 2,
+   -52, 59, -104, 24, -26, 112, 45, -55,
+   -103, 17, -46, 0, 43, -51, 18, 16,
+   -30, 14, 4, 50, 14, -23, 44, -40,
+   -19, 64, -34, -8, -12, -27, -29, 88,
+   -73, -34, 7, -32, -27, 68, -44, -2,
+   -13, -15, 53, -13, -120, 18, -1, 56,
+   37, 96, 126, 17, 60, 15, -35, 74,
+   -13, -17, -32, 37, -28, -63, 68, 6,
+   10, -29, 89, 57, 20, 14, -118, 67,
+   -10, 71, 14, 73, 7, -37, -75, -27,
+   -69, -50, 48, 5, 34, -51, -4, -66,
+   23, -18, 7, -17, -19, 115, -82, -22,
+   42, 92, -52, 17, 9, 104, 118, -16,
+   58, 5, -24, 33, -41, -90, -97, 4,
+   80, -16, -37, 14, -9, -13, 38, -1,
+   -23, -25, 5, 13, -12, 18, -4, 35,
+   -68, 0, 2, -30, -21, 40, 36, 28,
+   -4, -6, -87, 90, 44, -6, -122, -36,
+   16, -104, 47, 60, -32, -61, 14, -107,
+   -4, 48, -3, -60, -11, 65, 37, 16,
+   -36, -5, 57, 1, -34, 1, -108, 14,
+   17, 54, -4, 33, 24, -25, -47, 3,
+   12, -46, 16, 5, 3, 27, 21, 54,
+   -35, 34, -1, -30, 4, -36, -13, -8,
+   4, -14, -91, 88, 0, -28, 19, 28,
+   7, 47, -45, 53, -2, -22, 15, 32,
+   24, 2, 7, 3, -34, -42, 39, -7,
+   1, 18, 5, 63, -34, -30, 2, 64,
+   -26, 16, -54, -96, -18, -91, -32, 20,
+   -58, 21, 49, 14, 96, -14, -8, 46,
+   26, 20, -61, -13, -8, 23, -9, -16,
+   44, 1, 23, -71, -3, 56, 43, -5,
+   -17, -29, 55, 74, -8, -82, 14, -1,
+   96, 12, -3, 16, -34, -4, 34, 3,
+   10, 79, 109, -32, -85, -120, -114, -69,
+   30, -10, -60, -67, 4, -22, -81, 45,
+   35, -54, 27, 29, 33, 127, -86, 42,
+   -7, -1, 29, -80, -38, 13, -3, -21,
+   12, -8, 48, -11, 4, 56, 4, 22,
+   -26, 41, -122, 28, 59, -49, 44, 125,
+   2, 8, -116, -3, -57, 14, 11, 42,
+   -45, -59, 1, -47, 16, -72, -101, -27,
+   22, -24, -24, 11, -14, 8, -36, 22,
+   45, 3, 33, 60, 66, -58, 5, 2,
+   10, -63, -122, -67, 26, -10, -24, 9,
+   -7, 23, -74, 10, -25, 43, -111, 40,
+   -69, 18, 9, -27, 0, -86, -6, 37,
+   -48, -42, 19, 16, -42, 23, -96, 46,
+   14, 115, 29, -11, -4, -119, 87, 25,
+   -13, 19, -1, 22, 22, -90, 19, 27,
+   23, -52, -10, 26, 31, 11, 20, -51,
+   68, -25, -15, 11, 3, -33, -65, -109,
+   94, -18, -64, 17, 61, -41, -22, 26,
+   -18, 23, -66, 9, -125, 7, 29, 2,
+   -48, -58, -36, -72, -127, -82, 30, -40,
+   28, 46, 14, 72, -9, -43, 9, 56,
+   51, 38, -53, 11, 45, -53, -1, 22,
+   -6, -29, 17, -37, 39, 11, -93, -68,
+   -10, -54, 13, -36, -38, 3, -46, -5,
+   -57, -16, -12, 19, -19, -59, -76, 15,
+   38, -81, -123, 13, 12, 89, 64, 41,
+   -12, -3, 27, -21, -11, 113, -27, -40,
+   26, 4, -3, 13, -35, 14, -33, 8,
+   29, -7, -17, 0, 38, 16, 69, -24,
+   41, 30, 24, -63, 15, -84, 1, 23,
+   52, 12, 37, -21, -35, 13, -31, -24,
+   35, 38, 75, 1, -42, 13, 23, 1,
+   10, -15, 66, -14, 47, -60, 11, 14,
+   47, -11, 77, 68, -47, 123, 47, 26,
+   -12, 18, 35, -65, 10, 21, 24, 12,
+   43, 2, -9, -42, 37, -55, -65, -11,
+   -23, 32, 2, 37, 26, -28, -22, -10,
+   62, -46, 43, -18, 56, 18, 19, -6,
+   -33, 69, -29, -37, 64, 23, -71, -3,
+   -50, -18, 79, 10, 29, 7, 67, 38,
+   -2, 91, -98, -22, -23, 31, 126, -4,
+   -2, 70, 76, -14, 36, -23, 22, 6,
+   -51, -46, -12, -56, -22, 70, -13, -19,
+   30, -36, 17, 13, -20, -17, -5, 11,
+   72, 18, 18, 76, -14, -60, 3, -29,
+   -23, -6, -37, -48, -31, -48, -17, -5,
+   -67, -71, -2, 88, -42, 52, 43, -11,
+   2, -60, 21, 42, -24, -24, 48, -20,
+   31, 12, 27, 25, 30, -123, -90, -19,
+   89, 112, -50, -51, 18, 64, 109, 8,
+   124, -74, 41, 53, 77, -96, -102, -25,
+   92, -70, 49, -48, 26, 16, 29, 27,
+   -35, -35, -8, 12, 37, -56, -38, -85,
+   87, 74, -46, 8, -22, 108, 7, 70,
+   -38, -4, -3, 93, -27, -13, -68, -27,
+   89, -48, 12, 38, -116, -30, 62, -48,
+   46, 30, 15, -47, 50, -21, -3, 88,
+   48, 81, 7, 35, 49, -90, -86, -33,
+   -17, -27, -4, -84, 53, 58, 51, -54,
+   14, 15, 32, -4, 98, 45, -99, 27,
+   -15, 79, -32, -28, -6, -39, 1, 6,
+   3, -34, -128, -66, -13, -16, 125, 41,
+   -50, -35, -31, -19, 12, 81, -52, -56,
+   7, 28, 6, 79, -50, 48, -57, 16,
+   65, -30, 27, -18, 56, -29, 27, 21,
+   -5, 46, -40, 43, 38, 95, -28, 0,
+   8, 53, -23, 71, 96, 11, -33, 6,
+   -16, 35, -4, -45, -53, 11, -49, 7,
+   -44, -21, 97, -23, 103, 37, -2, -11,
+   -9, -11, -57, 36, -8, -44, 125, 3,
+   78, 76, 42, 10, 79, 25, 75, 27,
+   34, -87, 20, -43, 17, -20, -57, 80,
+   40, 7, 111, -66, 4, 33, -19, 92,
+   25, -64, 51, 64, 28, -13, 66, 25,
+   31, 21, 21, -35, 81, 51, 127, -6,
+   3, 60, 52, -25, -17, 17, 42, -3,
+   -30, 55, -22, -41, 127, 28, -54, -119,
+   92, 77, -9, -47, -7, 35, 0, -40,
+   15, -25, 71, 104, 34, 36, 60, 38,
+   -16, -3, 6, 106, 42, 89, -16, 16,
+   -31, -8, 94, -3, 20, -26, 12, -68,
+   42, 45, -58, -59, 30, -64, 45, 122,
+   75, 22, 69, -42, -60, -114, -33, -99,
+   -99, 9, 14, 13, 99, -1, 65, 5,
+   -29, -121, 73, -3, 15, 40, 19, 37,
+   -31, 85, -43, -35, -34, 24, 80, -29,
+   -25, -23, 41, -24, 62, -6, -124, -24,
+   12, 7, -9, 103, 88, 18, -126, 123,
+   -70, -28, 12, -114, 6, -71, -13, -80,
+   31, -69, 56, 13, 109, -75, 3, 24,
+   -85, -58, 18, -91, -27, -48, 2, -67,
+   39, 70, -19, 82, -30, 37, -34, -2,
+   43, 77, 48, 22, 23, 39, -47, 65,
+   -36, -24, 4, -50, 9, 16, -89, 15,
+   11, 11, -107, -71, -54, 10, -52, 17,
+   -29, -19, -50, 10, -27, 80, 35, 35,
+   -67, 5, -5, -35, 40, -48, -24, -7,
+   -44, 1, -16, -52, -118, -20, -1, 24,
+   34, -105, -60, -50, -54, -17, 18, 79,
+   26, -11, -23, -63, -28, 10, 69, -124,
+   -45, 8, 7, 13, -96, -24, 35, 37,
+   24, 24, -73, -3, 44, 85, -3, 7,
+   -81, 12, -3, -30, -1, -18, -35, -36,
+   -67, 28, -39, -61, 1, -36, -27, 24,
+   29, 28, 3, -32, 40, -32, -46, 45,
+   58, -62, -104, 31, 45, -12, 87, 12,
+   7, -63, -17, 29, 102, 8, 57, 22,
+   9, 8, -11, 45, 125, 106, -65, -28,
+   93, 0, 53, -31, 49, -20, 6, 61,
+   39, -19, 43, -52, 6, 3, 91, 29,
+   -69, 11, -23, 32, -9, 31, 29, -47,
+   26, -66, 8, -44, 59, -6, -18, 34,
+   5, -33, -46, 59, -34, -23, -48, -19,
+   105, -30, -14, 31, 121, 88, 1, -1,
+   27, 70, 93, 31, -56, 20, 27, -75,
+   -35, -18, 18, 71, 24, 40, -3, -15,
+   -13, -10, -65, -13, -22, 41, 33, 3,
+   74, 25, 32, 49, 110, -5, 90, -23,
+   22, -64, -35, -15, 22, 77, 17, 1,
+   -51, 50, 107, 70, 26, 66, -78, -106,
+   40, -110, -60, 26, 41, -32, 54, -10,
+   32, -41, 30, -1, -25, 6, 69, 117,
+   6, 1, -8, -16, 8, -12, 49, -72,
+   22, -16, -34, 24, 0, -50, 57, 80,
+   -1, 55, 58, -122, 63, -63, 97, 60,
+   26, -43, -22, -29, 99, -30, 30, 53,
+   49, -49, 8, -21, -44, 127, -9, 38,
+   -58, 26, 38, 46, 48, 56, 58, 56,
+   -36, -25, -12, -45, -82, 7, -13, -48,
+   -116, -52, 7, 11, 37, 40, 95, 1,
+   -7, 14, 44, -33, -46, -19, -8, 52,
+   61, -37, -22, 9, 44, -11, -21, -35,
+   20, -53, 106, -45, -8, 11, 70, 49,
+   34, 91, -60, -25, -21, 14, 40, -65,
+   -12, -7, 6, 9, -9, -75, -40, 41,
+   53, 9, -31, -31, 48, -18, 11, -3,
+   30, 6, 40, -45, -35, 38, 72, 64,
+   -117, -32, 38, -53, 10, 1, -7, -10,
+   29, -36, 22, 6, -8, 33, 20, 44,
+   -89, 74, -66, 5, 60, 21, 26, 29,
+   31, -61, 11, 24, 29, -36, 33, -16,
+   -27, -40, 39, -75, 12, -25, 12, 46,
+   -2, 0, 3, 86, 14, 13, -26, 73,
+   10, 5, -16, 31, 35, -9, 96, -56,
+   22, 15, 51, 18, -60, -25, -34, -5,
+   19, -13, 20, 74, 70, 16, -120, 10,
+   103, -27, -92, -46, 25, 39, -49, 17,
+   40, -56, -25, -68, -81, -40, 126, 51,
+   -9, 4, 30, 5, -68, -33, 53, 60,
+   8, 34, -36, -14, 52, 30, 114, -25,
+   -65, 38, -53, 45, 38, 59, 12, 113,
+   9, -29, -9, -10, -81, 13, -56, 75,
+   19, 46, 21, -14, -49, 31, -100, -24,
+   -34, 38, 100, -60, -30, -9, -46, -104,
+   -21, -3, 12, 31, 65, 97, -14, 7,
+   27, 30, -83, 40, -74, -9, -62, -7,
+   112, -59, -49, -24, 23, 113, 96, 40,
+   -35, -42, 38, 69, 73, 42, 41, 18,
+   -3, 95, 96, 77, -32, -20, -90, 105,
+   40, 82, -1, 108, 58, 73, 118, -15,
+   -4, 26, -4, -16, 68, -50, -59, 10,
+   32, -58, 31, 44, 4, -50, 31, -19,
+   91, 43, 11, 40, -32, 119, 75, 86,
+   113, 0, -108, -14, 121, -104, 17, 126,
+   -38, 2, 52, 56, -20, 51, -16, -35,
+   -18, 26, -26, 13, -65, 25, -105, 67,
+   50, 18, 20, 13, -22, 24, -9, 27,
+   -9, 8, 3, 81, 40, 73, -26, -33,
+   -7, 22, 6, -7, -11, 19, 14, -47,
+   96, -16, 52, 60, 17, -71, 56, -50,
+   12, 7, 6, 31, -59, 1, 23, 17,
+   -49, -17, 21, -9, 30, 31, 35, -1,
+   -18, 7, 29, 15, 65, -68, -9, 89,
+   -8, -30, 44, 74, -4, 46, 28, -69,
+   62, 27, -22, -57, 28, -20, 11, -3,
+   5, -65, 28, 7, -26, -13, 20, 20,
+   32, 71, 115, -47, -11, 36, -65, 5,
+   -50, 52, 16, 22, 77, -9, -8, -16,
+   56, 30, 17, 50, -35, -69, 19, 71,
+   60, -55, 2, 55, -47, 3, -13, -109,
+   28, -3, -5, -38, 0, 34, 110, 38,
+   15, 46, 18, -1, 34, 32, 32, -1,
+   53, -3, 75, 65, -14, 63, 61, 0,
+   4, -78, 18, 21, 5, 47, 19, 26,
+   -65, -59, 84, 45, 2, -126, -38, 24,
+   56, 15, 47, -13, 45, -69, 7, 122,
+   -42, 34, 84, -8, 6, 21, 6, -11,
+   26, -47, 117, 3, 23, 10, 34, 29,
+   -48, 123, -11, 53, -47, 46, -8, 45,
+   4, -16, 14, -28, -30, -16, -67, 59,
+   10, 34, 15, 63, 1, -28, -11, -24,
+   8, 27, 54, -4, -110, 80, 57, 31,
+   7, 104, -35, 60, -10, -12, 41, 66,
+   -122, -18, 9, 52, 41, 42, -47, -28,
+   -32, 68, 8, -56, 13, 28, 115, 42,
+   31, 0, -55, 24, 39, -47, 9, -41,
+   -14, 41, 34, 53, 71, 0, -5, 53,
+   -55, 14, 17, 23, -59, -22, 52, 96,
+   -40, 72, -7, -7, -24, 5, 48, 33,
+   29, 18, -106, 36, 30, -53, -29, 88,
+   -21, 77, -5, -22, 29, 7, 21, 0,
+   27, 19, 63, 8, 37, 32, -45, 16,
+   -25, 45, -16, -2, 61, -13, -31, -8,
+   -19, 65, -14, -69, 29, -25, -83, -53,
+   35, -60, -23, 4, 52, -10, 29, 9,
+   -5, -80, -30, 3, -22, 8, -40, -28,
+   15, 66, 23, 64, 7, 41, 11, -24,
+   -97, -21, -16, 79, 7, -4, -29, -20,
+   -42, -33, -35, -66, -18, -76, -18, 22,
+   -59, -20, -59, 0, -72, -77, 6, -60,
+   28, 18, 19, -51, 96, -34, 8, 22,
+   2, -98, 38, 29, 21, 3, -15, -26,
+   31, 0, -7, -9, 26, -8, -128, 118,
+   -75, 33, -69, -8, 121, 26, 46, 37,
+   101, -19, 7, -82, -39, 34, -65, -14,
+   40, 20, 127, -126, 29, -44, -44, 29,
+   23, 2, 80, -14, 126, -31, -22, -21,
+   -12, 15, -16, 80, -18, 49, 41, -8,
+   -43, -121, -67, 59, 123, -24, -27, -28,
+   36, -103, 18, 36, 0, -64, 10, 69,
+   -11, -74, -99, 102, -64, 35, 6, 16,
+   122, -19, -6, 3, -21, 73, 5, 10,
+   121, 18, 87, -16, -28, 79, 4, 96,
+   39, -1, -21, -40, 110, 24, -42, -56,
+   109, -10, -57, -41, -76, -53, -126, 27,
+   63, -47, 51, -40, 17, 83, 79, 3,
+   31, 13, 13, 26, -86, 37, -96, 77,
+   31, 47, 127, 22, -5, -18, -48, 30,
+   19, 25, 106, 117, -66, -49, 124, -90,
+   -4, -90, 7, -1, -64, 30, -91, 32,
+   1, 103, 40, 96, -26, -47, 21, 8,
+   -23, -12, -29, 25, 36, -28, -115, -27,
+   80, 13, 65, 3, -2, 124, 86, 25,
+   108, -77, -57, 16, 19, 5, 26, -39,
+   126, 27, 14, 30, 5, -6, 47, 16,
+   4, 1, 3, 24, 44, -58, -27, -128,
+   -13, -25, 0, -13, -9, 18, -14, -19,
+   22, 92, -31, 14, -14, -20, 37, -27,
+   -37, -11, 36, 3, -27, 11, 4, 16,
+   -50, -2, -74, -2, 61, -5, 75, -5,
+   6, 31, -40, -6, 127, -63, 31, -7,
+   -4, -41, -50, -125, -33, -42, -3, -99,
+   14, 0, -12, 22, -22, 15, -14, 29,
+   9, 0, -4, 30, 31, -5, -17, -24,
+   13, -56, -6, -36, 37, -6, 53, 29,
+   -2, -3, 5, -34, -121, -68, -38, -33,
+   53, -23, 9, -12, 12, -10, 11, -69,
+   -4, -51, 16, 84, -71, 15, -38, 4,
+   -26, 31, -40, 11, -64, 13, -26, -7,
+   -14, -20, 27, 2, 31, 67, 30, 108,
+   28, 66, -14, -5, -9, -11, 9, -38,
+   35, 83, -49, -13, 81, 32, 40, -22,
+   -20, 91, 1, -24, -26, 53, 69, -66,
+   -48, 50, 12, -39, 11, 55, 13, -22,
+   -17, 67, -28, 21, 103, -45, 65, 11,
+   -18, -20, 28, 0, -5, -12, -15, 31,
+   -54, 14, 82, -99, -38, -46, -22, -81,
+   -20, -62, 65, -47, -21, -32, 14, -50,
+   73, 11, 14, 5, 38, -14, 53, 27,
+   -14, 39, -18, 63, -47, 61, -12, 12,
+   58, 0, 15, -47, -51, -50, 3, -10,
+   52, 20, 28, 23, -19, 4, -58, -3,
+   13, 97, -44, 10, -98, 31, -38, 4,
+   50, 72, 21, 24, 127, 33, 48, 64,
+   48, -100, 7, 46, 1, 105, 11, 59,
+   -16, -46, 86, -11, 23, 12, -42, -50,
+   -81, 21, 108, 91, -125, 19, 55, -21,
+   117, -75, -24, 9, -58, 39, 10, -12,
+   26, 126, -77, 31, -3, 127, -13, 76,
+   64, 40, -10, 10, -29, -56, 40, 7,
+   68, 4, 12, 119, 99, 36, 31, -20,
+   -117, 127, -122, -33, 97, 22, 43, 0,
+   -7, 4, 35, -16, -16, 16, -4, -15,
+   -50, -24, 85, -4, -59, 23, 11, -76,
+   21, 57, -19, 6, -32, -7, -58, 39,
+   -46, 14, -27, 6, -76, -5, 65, 24,
+   -30, -57, -22, 45, 23, -3, -11, -122,
+   -29, -38, -16, -10, 23, 25, -45, 12,
+   7, -69, 25, 19, 24, 2, 7, 9,
+   -40, 37, 26, 45, -92, 16, 22, 53,
+   22, -24, 15, 53, 35, -107, 56, 19,
+   20, 17, 1, -50, -31, 0, 18, 13,
+   -1, 11, 23, 71, -5, 21, 34, -63,
+   50, 77, 24, 29, 9, 77, -20, 66,
+   -3, 15, 24, 81, 83, 25, -5, 42,
+   -121, 126, 34, -84, 44, 16, 112, 38,
+   22, 24, -78, 102, 40, 14, -18, 95,
+   70, -15, 32, 28, 31, 82, 58, -1,
+   26, 30, 59, 16, 5, -41, -15, -45,
+   -29, -15, 71, -9, 17, -11, -6, 31,
+   30, 89, 48, -34, 95, -5, -72, -14,
+   108, -34, 41, -24, -45, -79, 117, 0,
+   25, 14, 68, -24, 23, -15, -23, -61,
+   -3, -21, 24, 55, 7, 46, 19, 17,
+   66, -75, 10, 95, 14, 18, 6, -54,
+   23, 90, 113, 34, 44, 57, 12, 66,
+   -9, 116, 9, 32, -88, -105, -123, -31,
+   -17, -7, -50, 16, 83, -57, 70, -110,
+   -127, -38, 55, 5, -108, -35, 49, 52,
+   -4, -19, 20, -41, -101, 89, -127, -121,
+   -6, 14, 61, -91, -47, 27, 62, 39,
+   -71, -64, -112, -21, 27, 8, -70, 17,
+   14, 5, -37, 10, -2, 61, -77, -23,
+   -40, -39, -67, 18, -124, -33, -40, 68,
+   11, 4, 118, -14, 24, -56, 67, 33,
+   52, -11, -13, -16, 122, -115, -34, 46,
+   -50, 43, 59, 78, 19, 120, 6, 41,
+   -50, 37, -28, 28, 103, -128, 24, -44,
+   -3, -14, 3, -10, 62, -51, 36, 2,
+   73, -93, -59, -26, 30, 17, 90, -21,
+   -31, -17, 23, 22, 39, 20, 17, -9,
+   -96, 57, -6, -60, -50, -18, -56, 19,
+   8, -76, 8, -21, -32, 14, -38, 1,
+   20, -90, 55, -54, 7, 35, 19, -28,
+   -33, -86, 54, 72, 29, -19, -32, -33,
+   97, 16, 11, -15, 23, 18, -56, 29,
+   -17, -9, 46, 30, 46, -122, 106, -21,
+   48, -63, 32, 16, -61, -55, 22, -21,
+   121, 29, -15, 30, -25, 39, -21, 62,
+   -25, -11, -34, 62, 42, 6, 26, -29,
+   80, -57, 7, 29, 17, 71, 2, 37,
+   -45, -111, 27, 47, 112, 7, 77, -22,
+   -29, -73, 39, 106, 37, 45, 65, 43,
+   26, -119, 33, -28, 16, 123, -52, -61,
+   64, 2, 34, -39, -3, 6, 18, 35,
+   4, 24, 2, -3, 53, -17, 19, 14,
+   -4, -30, -14, 72, -6, -50, -94, -23,
+   30, -115, 77, 17, 69, -20, 5, 13,
+   -13, -83, 25, 3, -23, 15, -128, 46,
+   112, 13, 41, -4, 125, 47, 23, -39,
+   -13, 123, 43, -18, 5, 6, 3, -32,
+   114, -11, -69, -23, 43, 13, 5, 106,
+   -8, -8, 22, 8, -22, 61, -27, 51,
+   28, -2, -75, 13, 61, -8, 71, 56,
+   -28, -15, -29, -53, 83, -33, -13, -26,
+   -76, 98, 75, 97, -11, 101, -126, 124,
+   29, -105, -36, 83, 6, 57, 45, 98,
+   -55, 9, 14, -45, 124, 42, 88, 62,
+   87, 43, 18, 8, -6, 28, 99, 26,
+   127, 27, 2, -20, -47, -41, -39, -52,
+   35, -18, -37, 41, -1, -4, 9, 29,
+   48, 46, -14, 42, 34, -38, 1, 87,
+   13, -22, 61, 123, 4, 26, -16, 32,
+   125, 19, 43, 28, -32, 114, 4, -87,
+   -61, -99, 22, -10, -8, -27, -7, 5,
+   -24, 6, 4, 23, 10, 23, -33, -31,
+   82, -48, -25, -74, 68, -9, 35, -16,
+   30, 10, 24, 71, 50, -127, -50, 21,
+   114, -31, -56, 2, 48, 39, 39, -14,
+   33, -9, 34, -13, -35, 49, 59, -27,
+   15, 61, 28, 17, 15, -14, -5, 38,
+   7, -8, 2, -62, -7, 1, -32, 22,
+   -30, 17, 6, -12, 42, 8, 24, 61,
+   -101, 1, 13, 48, -16, 27, -10, -9,
+   -5, -7, 75, 21, -39, -33, 25, -49,
+   -30, 17, 11, 75, 7, -11, 20, 3,
+   -49, 52, -25, 72, 52, -11, 57, -6,
+   21, 99, 32, -81, 37, -59, -65, 18,
+   -24, 119, -37, -69, 57, -20, -1, 78,
+   -32, -15, 6, 33, 108, 81, -120, 38,
+   -47, -82, -4, 62, 29, -11, -53, 9,
+   -23, -10, -78, 63, -12, 38, -37, 21,
+   64, 3, -17, -117, 24, 3, -24, -75,
+   -34, 34, -5, 26, 9, 15, 41, 51,
+   -8, 52, 25, -42, -101, 100, 57, 9,
+   -98, 127, -86, 36, -63, -92, 50, 43,
+   -7, -16, 30, 66, 56, 54, 33, 29,
+   -49, 8, -1, -8, -16, 73, -14, -72,
+   26, -34, 44, 43, -117, 12, -43, -121,
+   -70, -28, -5, -23, -68, 23, 123, -11,
+   70, -14, -64, -82, 99, 79, -113, -45,
+   118, -12, -35, -79, 94, -43, -125, -45,
+   121, -126, -45, 4, -18, -47, 11, 25,
+   -73, -51, 104, -19, 46, -116, 117, -32,
+   -11, 106, -14, -112, 52, -73, -127, 82,
+   14, -22, -2, 35, -65, -108, -88, -4,
+   8, -33, 28, -128, -23, 0, -20, 0,
+   97, -45, -31, -27, 126, -65, -31, 23,
+   -25, -53, -92, 65, -123, 62, 127, 4,
+   83, 40, 35, -14, -11, -32, -71, 6,
+   6, 51, 22, 30, -23, -46, -38, -11,
+   -24, 41, -31, -22, -123, 36, -57, -46,
+   -22, -10, -4, -21, 30, -12, -124, -27,
+   21, 38, -25, 8, -38, 73, 24, 27,
+   -2, 21, -7, -10, 19, 28, -78, 17,
+   -10, -8, 34, -60, 103, 27, -18, -36,
+   48, 24, -51, -34, -52, -11, -61, 102,
+   5, -1, -37, -70, -66, -19, 48, -90,
+   -18, -23, 70, 17, -100, 87, 55, -19,
+   -23, 73, -11, -65, -39, -83, -16, -10,
+   -68, 46, -92, -126, -66, -121, -94, -92,
+   47, 2, -39, -95, -43, 42, 2, -50,
+   8, 38, 81, -84, -1, 36, 0, 16,
+   -54, -61, 83, 51, -31, -50, -19, 0,
+   1, -64, 22, -3, -12, 5, 10, 58,
+   38, 71, 47, -23, -3, -4, -112, 35,
+   -44, -39, -44, -7, -121, 13, 33, -28,
+   41, 26, 60, 86, -87, 37, 11, 25,
+   42, -15, -25, -49, 27, 27, 58, -62,
+   91, 48, 59, 15, -11, 118, -55, 22,
+   -5, -1, -1, 68, -16, 86, -95, -95,
+   46, -9, -40, -18, 20, 5, 48, 44,
+   17, 10, 13, 1, 19, -17, 12, -66,
+   -44, -48, 33, 23, -50, -16, 59, -11,
+   -48, 2, -6, -5, -43, 33, 44, -12,
+   23, -63, 46, -23, -51, 3, 126, -54,
+   -50, 85, 15, -6, -3, 42, -58, 61,
+   -55, 75, 94, 26, -97, 71, -107, -80,
+   13, 61, -37, 30, 5, -36, 63, 9,
+   -68, -18, -32, 39, -58, 21, -21, -30,
+   -46, -127, 42, 34, 6, -84, 31, 39,
+   -10, 36, -58, 38, 10, 10, -4, 29,
+   -128, -28, 65, 29, 10, -78, 116, 19,
+   67, -122, 31, -43, -27, 68, 9, 35,
+   -90, -8, 7, -49, 56, -29, 25, -21,
+   31, 0, 28, -44, -51, 61, 30, -5,
+   57, 83, 2, 1, 54, 74, 27, -3,
+   20, -35, 6, 17, -17, 27, 65, 35,
+   -7, 67, -46, 19, -34, 23, 26, 34,
+   -26, 18, -22, -4, -113, -48, -10, -12,
+   -32, 1, 0, 15, 33, -11, 24, 35,
+   -18, 35, -85, 41, 52, -18, 29, 26,
+   -37, -25, 4, 34, 5, 1, -16, 4,
+   13, -12, -2, -66, 29, -29, 70, -15,
+   -48, 14, -6, -32, 36, -9, 25, -12,
+   25, -127, 27, -26, -54, -55, 13, 78,
+   26, -26, -15, -21, -4, -50, -17, 10,
+   -18, -11, -42, -19, -8, 12, 0, 24,
+   27, 64, 42, 83, 34, -23, 16, 7,
+   -123, 21, -16, -53, -5, 14, -24, 50,
+   -22, -20, 36, -9, 35, 9, 64, -16,
+   -6, -41, 99, 67, 26, 21, -59, 4,
+   -13, 48, 67, 38, 67, 127, 38, 14,
+   -5, 43, 3, 1, -3, 13, 62, 24,
+   -5, -49, 39, 74, 61, -44, -39, 70,
+   112, 6, 62, 52, 49, 17, 0, 80,
+   -21, 11, -19, -34, -2, 4, 38, 31,
+   -9, -3, 109, 51, -14, 121, 66, 15,
+   -12, 34, -33, -2, 0, 10, 27, 63,
+   -6, 37, -55, -36, 22, 15, 30, 68,
+   37, -65, -17, 79, -8, 32, -50, 4,
+   83, 36, -57, 18, -21, -48, 39, 98,
+   35, 27, -10, 24, 36, -13, 41, 22,
+   -15, 44, -98, 62, 32, -1, 116, 62,
+   -35, -78, -13, 34, -37, 123, -31, -26,
+   -2, 10, 52, -77, -35, 78, -67, 63,
+   -5, -60, -13, 71, -10, 22, 118, 42,
+   126, 59, -21, 30, 2, 9, 8, 14,
+   -31, 38, -70, 57, -36, 109, 9, -13,
+   -33, 88, -9, 70, 8, -44, -20, 73,
+   -2, -13, -19, 118, -27, 2, -16, 58,
+   -82, 39, -59, 36, -7, 4, 60, 23,
+   38, -6, 37, -3, 29, -32, 1, -34,
+   44, 45, -10, -29, -10, 9, -39, -58,
+   -25, -26, 37, 44, 71, 60, -1, -18,
+   45, -76, -12, -24, -5, 2, 15, 5,
+   10, -72, -38, 31, -58, -27, 4, -10,
+   6, -4, -110, 11, -34, 31, 36, 2,
+   32, -14, 19, -4, 13, 17, -8, 5,
+   -1, -18, 15, 16, 47, 56, 48, -6,
+   -53, -8, 66, 27, -57, 45, 51, -24,
+   35, -33, -29, 74, 16, 14, 22, 15,
+   -72, -26, 101, -27, -14, -22, 14, -79,
+   -9, 34, 81, -114, 33, 9, -24, -31,
+   31, 13, -79, -61, -40, 82, -115, 45,
+   -107, 57, -37, -66, 12, -25, 4, 7,
+   -24, 4, 27, 6, -64, 6, 89, -84,
+   -121, 75, 40, -36, 13, -57, 48, -59,
+   -128, -62, 7, -15, 26, 75, 16, -59,
+   27, -20, 16, 6, 13, 2, -84, 15,
+   -40, -70, -8, 56, 107, -1, 12, 15,
+   -1, 25, 58, -12, 53, -110, -67, -38,
+   -67, -46, -42, 16, -54, -103, -109, -5,
+   -70, -67, -56, -67, 80, -13, -53, 55,
+   15, 83, -124, -44, 0, -17, -44, -60,
+   -32, 8, -23, -17, -54, 36, -49, -9,
+   -65, 16, -39, 88, 43, 50, -8, 3,
+   -25, -57, 30, 37, 34, -60, 74, 57,
+   -27, -30, -104, -67, 46, -46, -12, -120,
+   52, 36, -117, -45, 35, 45, 62, -66,
+   58, -52, 54, 14, 28, -24, -86, -35,
+   49, 17, 91, 75, 39, 125, -24, -7,
+   -109, 70, -24, -88, 25, -59, 127, 55,
+   -81, -16, 17, 14, -41, 7, 69, -9,
+   15, 25, 46, 87, 13, -42, 20, 12,
+   -38, -14, 109, 16, -66, 107, 91, 30,
+   83, 4, 15, -41, 36, -38, -106, 75,
+   -120, 18, 92, 58, -123, 9, -42, 95,
+   4, -2, 26, 24, 1, -4, 22, -14,
+   -11, 3, -122, -53, -76, -53, -8, 1,
+   -100, -6, 26, 3, 1, -35, 105, 25,
+   11, -43, -105, -27, -35, -54, 56, -16,
+   8, 8, 14, 33, -13, 33, 39, 24,
+   8, 26, 27, 30, 19, -13, 13, 7,
+   67, 67, -20, -40, -50, -17, 22, -18,
+   18, -1, -2, 22, 35, -33, 5, 3,
+   -56, 9, -51, 6, 15, -74, 86, -11,
+   5, -11, -3, 95, 8, -44, 29, 1,
+   -26, -54, 101, -84, 33, 45, -34, 78,
+   61, 36, -20, 44, 10, 74, -84, 5,
+   13, -26, 35, 80, -43, 126, -75, 4,
+   23, -64, 54, -42, -20, 68, 87, 44,
+   -63, -39, 4, -99, -27, 14, 58, -17,
+   91, -10, -39, 82, -13, -47, -44, -22,
+   34, -17, 23, -128, -53, -2, 12, -8,
+   -5, -29, -19, 64, -42, 13, 28, -42,
+   28, 67, -65, 63, -47, -9, 37, -66,
+   -2, 56, 51, -3, 40, -22, 47, -2,
+   -24, -12, 25, -68, 89, -27, 18, 121,
+   59, -27, -46, -11, 6, -61, -15, -46,
+   2, 15, 16, -34, -17, -18, -3, 27,
+   55, 40, 31, 22, -19, 2, -72, -14,
+   89, 94, -24, 24, -96, -119, -65, -13,
+   40, -69, -62, 10, -49, -60, -52, 27,
+   -75, 8, 42, 57, 48, -15, -70, -117,
+   82, 71, 83, 34, 87, 22, 2, 22,
+   2, -114, 33, -46, -32, 99, 10, 4,
+   -44, 92, 67, 23, 42, -127, 33, -35,
+   -11, -25, 54, -15, -31, 26, -115, 18,
+   -6, -112, 3, 39, -63, -66, 0, -51,
+   -39, 26, 1, 37, 7, -25, 20, 5,
+   38, -21, -2, -9, 108, -77, 16, 12,
+   24, -5, 14, 88, 59, 1, 8, -5,
+   -20, 36, -124, -50, -23, 38, -67, 0,
+   -10, 4, 1, -42, 0, -64, 1, -10,
+   7, -32, -80, -17, -13, -113, 107, -54,
+   71, -24, -38, 11, 21, 24, -122, -6,
+   -31, -67, 56, -68, -12, -23, 0, 2,
+   37, -114, -1, -19, -1, -72, -91, -16,
+   32, -4, -22, 118, -17, 41, 45, 32,
+   -14, -27, -45, 6, 18, -62, 21, 33,
+   30, 14, 5, 39, 17, -10, 25, 12,
+   -15, -2, -4, 17, -9, -2, 38, -66,
+   -50, -18, 18, 41, -21, -24, 7, -18,
+   -15, -20, 61, 18, -1, 10, -24, -67,
+   -16, -17, 2, -21, -25, 21, 7, 24,
+   -8, 25, 47, -46, 122, -11, -48, 20,
+   -39, -60, -30, 53, -64, 14, 59, -82,
+   -10, -10, 37, -11, -1, 26, 1, 2,
+   41, -58, 87, -18, 20, 5, -36, 59,
+   -52, -18, 56, 80, 49, -115, -16, -2,
+   26, 20, 22, 28, -6, 24, -69, -6,
+   6, 8, 7, -8, 105, 49, -13, 46,
+   -86, 46, 31, 70, 10, -25, 51, 27,
+   -14, 12, -14, 5, 28, 8, 95, 56,
+   -4, 43, -18, 7, 3, 70, -5, -9,
+   -105, 21, -97, 2, -28, 67, 27, 18,
+   109, -52, 88, 32, 49, -1, 18, 25,
+   -35, 61, -47, 13, -124, -52, 71, 8,
+   -31, -6, -31, -32, 60, 62, -38, -9,
+   -83, -107, 126, -22, -16, -47, -78, -55,
+   30, 16, -24, -27, -45, 74, -58, 50,
+   6, 15, -7, 91, -127, -2, -8, -55,
+   81, 103, 14, 27, -16, 26, 125, -13,
+   98, -80, 68, -4, 35, 126, -59, -103,
+   58, -31, 92, -2, 16, 42, -5, -58,
+   45, -48, 64, -106, -14, -62, -30, 36,
+   10, 9, 50, -5, -6, 33, -39, -10,
+   -16, -71, 83, 38, -10, -70, -77, 42,
+   35, -128, 64, 37, 49, 60, -9, 33,
+   -33, -37, -23, 7, 8, -30, 19, 35,
+   -17, 16, 17, 6, -36, -22, -82, 54,
+   3, 6, 35, 12, 57, 0, 12, -32,
+   58, 108, 7, 49, -8, -38, -79, 30,
+   -1, 7, 15, 32, -20, 16, 68, 16,
+   22, -41, 33, -25, 13, -42, 49, 14,
+   2, 60, 41, 8, -25, -21, 46, -43,
+   -26, -9, -15, -10, 36, -19, 0, 36,
+   -12, 17, -7, 13, 16, -49, 79, 59,
+   -8, 10, 59, -12, 15, -125, -18, -8,
+   7, 6, 10, 39, -37, -64, 29, 0,
+   -50, -6, -24, 15, -32, -28, 27, -12,
+   -44, 84, -30, -10, -51, 5, -59, 77,
+   -26, 3, 3, 9, -39, 39, 100, -33,
+   -80, -7, -36, -83, -30, 19, -21, 59,
+   44, 86, -29, -4, -112, 28, 8, 97,
+   -24, -37, 13, 110, -2, 16, 72, -7,
+   9, 22, 10, 37, 32, -20, 66, 7,
+   -72, -127, -5, -11, 50, 22, 1, 5,
+   74, -74, -118, -36, 123, -8, 14, 29,
+   21, -71, 54, -94, 11, -27, 45, 95,
+   -126, 70, -39, -60, 52, -36, 73, 23,
+   48, 12, 36, 63, 33, 68, 88, -24,
+   -65, -4, -2, -20, -9, 48, -63, -121,
+   -66, 40, -128, -22, -13, 11, -105, 20,
+   -30, -127, 26, -21, -92, -108, 60, -14,
+   56, -117, -113, -123, -46, 57, 111, 124,
+   82, 58, 25, 5, -57, -42, 116, 9,
+   -24, 16, -17, 86, -116, 68, 10, -35,
+   124, 66, 53, -51, -65, -10, -14, -12,
+   26, 5, -51, -15, 12, 25, -3, -33,
+   -54, -20, -116, -10, -25, 117, -1, -24,
+   80, 55, 4, 112, -8, -67, 0, 41,
+   12, -31, 102, 36, -3, -69, 96, 18,
+   126, 116, 27, 16, 114, -28, -82, 113,
+   -57, -119, 123, 63, 126, 33, -1, 29,
+   -17, -28, -13, -4, 85, 39, -5, -53,
+   -53, -63, 5, 29, -76, 27, -23, 3,
+   -70, -31, -46, -48, -15, -93, -13, 50,
+   -1, -6, 0, 26, -34, -22, 3, -112,
+   39, 48, -12, 73, 18, 38, 17, -18,
+   -15, 35, -10, -72, -19, 13, -72, -21,
+   19, -58, -17, 70, 4, -32, -4, 35,
+   86, 11, -6, 14, 38, 4, 99, 29,
+   117, -7, -57, 11, 44, 2, 12, -37,
+   30, 117, 36, 5, 93, -56, 27, -4,
+   -104, -83, -76, -26, 70, -63, 108, 37,
+   57, 62, -23, 26, -9, 11, -12, 6,
+   22, -28, 24, 11, 63, 12, 28, 15,
+   78, -3, 85, -2, -29, 37, -41, -30,
+   -37, 39, -19, -39, 50, -5, 15, 39,
+   12, 3, -34, 17, 35, 5, -13, 10,
+   -45, 12, 109, 5, 71, -28, -11, 22,
+   3, 63, 11, -11, 40, -13, 53, 32,
+   -7, 41, 1, -14, 27, -1, -25, 54,
+   16, -64, 14, 92, 67, 94, -10, 52,
+   56, 84, 0, 28, 59, 39, -68, 6,
+   -31, 73, -87, -40, 1, 23, 31, -35,
+   -21, 34, -50, 82, -13, 62, 24, 84,
+   44, -11, 29, 56, -11, -14, 10, 18,
+   12, -85, -127, -3, -65, 4, 52, -27,
+   11, -89, 1, -64, -78, -24, -44, -12,
+   -20, -51, 13, 97, -77, 50, 63, -74,
+   -47, 31, 1, -8, 4, 23, -74, -126,
+   13, 62, 57, -25, -30, -125, -105, 13,
+   127, 90, 24, 3, 24, 22, -3, 3,
+   122, -59, -50, 18, -48, -20, -26, -37,
+   122, 109, 124, -29, -23, -114, -4, -120,
+   -2, 7, -70, 55, -73, 12, -80, -124,
+   -11, 33, 83, -14, 31, 2, 126, 78,
+   -101, 48, -104, 18, 53, -1, -28, 54,
+   87, -126, 40, 30, -85, -7, 86, -95,
+   86, 23, -70, 17, 10, -49, 2, 94,
+   -20, 123, -35, -22, 28, -31, -35, -13,
+   41, 38, -45, -58, 50, 8, 6, -96,
+   49, 9, -2, -70, 55, 66, -55, 38,
+   -86, 81, -72, -17, -11, -72, 18, 27,
+   17, 49, -84, -44, -7, 16, 82, 27,
+   -89, -18, 23, -28, 24, 36, -8, -92,
+   -24, 34, -20, 127, -23, 19, -6, 3,
+   28, 111, 14, -19, 7, 35, 10, 27,
+   27, 2, 95, 29, 66, -56, -55, 24,
+   -38, 127, -59, 4, 56, -20, -69, 14,
+   -12, 17, -37, -23, -43, 31, -35, -35,
+   -56, 29, -9, -11, 123, 24, 19, -23,
+   -52, -3, 7, -39, 25, 23, 34, 95,
+   -16, 35, -9, 39, -55, -25, -43, 47,
+   108, -3, -3, 61, 56, -9, 54, 54,
+   -8, 51, -20, 62, -92, -39, 40, -8,
+   34, 29, -41, 52, 18, 14, 21, -30,
+   39, 64, 81, -32, 71, 41, 28, -8,
+   -42, -75, 20, -14, 12, -32, 66, 34,
+   -30, -68, 31, -104, -37, 31, 86, 42,
+   14, 12, 3, -20, 15, -7, 29, -26,
+   -45, -32, -12, 9, 48, -25, 41, -70,
+   21, -3, 26, 3, 28, 41, 31, -6,
+   60, 76, 126, 5, -14, -32, -42, -36,
+   -3, -3, 4, 18, 3, -6, 51, 45,
+   -60, 104, -41, -8, 64, 7, 10, 125,
+   61, 6, -3, 43, 5, 9, -126, 83,
+   13, -126, 24, 51, 33, 118, -28, -25,
+   -127, -13, -20, 96, -27, 15, -124, 21,
+   -75, 86, -11, -9, -9, 40, -17, 111,
+   -52, -94, -126, 26, -3, 72, 7, 116,
+   55, 30, -2, -119, 127, 126, 32, 9,
+   -77, -1, -50, 24, 21, -55, -125, 6,
+   99, 13, -12, -3, -53, 26, 106, 113,
+   125, 125, -51, -12, -3, 2, -46, 69,
+   -35, -1, 57, 46, 65, 19, 43, -39,
+   -44, -24, 26, -4, 0, 26, 28, 64,
+   -22, 5, 32, 36, 1, 16, 3, 69,
+   18, -52, -20, -36, -56, -22, -19, 21,
+   75, -70, 56, 15, 23, -4, -50, 85,
+   48, -46, 43, 64, 53, -4, -46, 19,
+   35, -23, 18, 27, 13, -35, -4, 127,
+   -50, 7, 52, -41, 3, 31, 29, -9,
+   -19, -94, -22, -30, 58, 74, -53, -22,
+   -21, 0, -43, -6, -58, -3, 115, 10,
+   93, -71, 46, 10, -38, -19, 49, -60,
+   6, -30, 60, -22, 62, 24, 23, 63,
+   -22, 5, 57, -8, 64, 106, 28, -80,
+   112, -50, 57, -122, -128, 47, -12, -51,
+   -10, 4, 1, -124, -11, -87, 30, -36,
+   -10, -36, -21, -19, -125, -76, 53, 104,
+   -125, 32, 33, -64, 64, 6, -14, 15,
+   94, 12, -69, 2, 8, 0, -51, 28,
+   34, -124, -21, -49, -70, -71, 54, -56,
+   -2, 45, 70, -3, 127, 87, 101, -10,
+   -28, 100, 116, 19, -14, 43, 19, 100,
+   -113, -44, 52, -8, -90, -7, 15, 36,
+   39, 5, -79, -27, 8, -40, 24, 93,
+   -39, -3, 40, 56, 57, -33, 3, 48,
+   81, -41, 7, 111, 44, -62, 51, -126,
+   -51, -111, 40, -35, -122, -49, 70, 75,
+   84, 29, -72, -40, -119, -3, 14, 61,
+   127, 14, -38, -23, -26, -127, -116, -122,
+   -121, -96, -5, 40, 40, -12, -112, -1,
+   118, -102, 16, 26, -18, -34, -25, -95,
+   -40, 19, 47, -128, -18, -115, -23, -48,
+   -44, -99, -41, 30, -111, 4, -7, -16,
+   -52, -45, -16, -88, -115, 50, 59, -41,
+   -105, -121, 108, -42, 77, -109, -116, -51,
+   -60, -25, 2, 59, 55, 78, 104, -70,
+   23, 85, -123, 52, -2, 2, 26, -75,
+   -14, 50, 14, 21, 3, 85, -9, -38,
+   28, -72, 60, -116, 25, 37, -28, 41,
+   69, 19, -80, -53, 12, 32, -87, -5,
+   -48, 9, 80, 81, -79, -74, 37, 116,
+   -45, 41, -28, 19, -40, -103, -117, 51,
+   -44, 41, -80, 79, -61, 69, 10, -41,
+   15, 83, -35, -58, 65, -21, 32, 127,
+   62, 1, -1, -56, -15, 13, 37, -50,
+   11, 8, 25, 11, -90, 16, -12, -37,
+   -116, 77, -22, -62, 3, 45, -12, 34,
+   -43, 27, -50, 41, 31, -66, 36, -13,
+   -9, 3, 104, -11, 42, -25, -34, 17,
+   37, 30, 22, 1, 19, 26, -9, 27,
+   -106, -41, 97, 37, -16, 53, -10, -48,
+   -10, -17, 52, 18, 62, 38, -24, 48,
+   -8, 34, 96, -57, 27, 23, -18, 56,
+   105, -38, 63, -36, 51, 53, 82, 79,
+   -22, 64, -12, 28, 37, 50, 91, 59,
+   5, 12, 39, -19, 73, 38, 63, 26,
+   57, 35, -33, 124, 63, 49, 68, -6,
+   34, 63, 49, -43, 42, -39, 5, -34,
+   68, 65, 61, 52, 24, 36, 46, 63,
+   45, 92, 22, 22, -46, 24, 11, 73,
+   -30, 127, 15, 47, 38, 28, 43, -9,
+   -11, -42, 0, -9, -14, 56, -103, 9,
+   27, 15, -22, 65, -28, -18, 6, -43,
+   23, -25, 31, 54, -23, -41, -29, 27,
+   -9, -10, 29, 25, 116, 46, -84, 58,
+   19, -37, -6, 29, -20, -30, -8, 10,
+   -59, -20, -26, -27, 97, 64, 117, -7,
+   -61, 15, -14, 47, -61, -37, 36, 82,
+   18, 61, 17, 23, 30, -40, -65, -76,
+   0, -72, 59, 43, 49, -7, 20, 22,
+   101, 46, 31, 14, 72, -41, 24, -26,
+   7, -71, 14, 66, -6, -35, -23, 15,
+   32, 27, -34, 2, -12, -26, 44, -64,
+   33, 47, 23, 41, -7, -8, 17, 7,
+   -59, 44, -16, -18, -37, 4, -91, -4,
+   -38, 9, -31, 22, 57, -17, 68, 1,
+   24, -23, 43, -11, -18, 2, -72, 3,
+   11, 29, 48, 39, -34, -22, -36, -4,
+   13, -35, 43, 41, -57, -125, 97, -41,
+   -10, -57, -32, 10, 15, -10, -41, -62,
+   -17, 20, 33, -95, 17, 30, 6, -46,
+   -22, -24, 51, 89, -50, -78, -17, -24,
+   34, -124, 51, -35, 58, -6, 14, -27,
+   -51, -11, 6, -9, -32, -22, -16, -69,
+   -41, 7, -50, -61, 45, -47, 39, 17,
+   -12, -7, -12, -25, -11, -7, -30, -9,
+   57, -125, 20, 14, -66, 73, -17, 18,
+   -57, -20, 28, 58, 124, -31, -18, 14,
+   11, 38, -104, 65, -95, 125, -81, 24,
+   26, -31, 25, 40, 127, 17, -27, 62,
+   -13, -38, 120, 22, -29, 54, 56, -99,
+   16, -33, 32, -39, -5, -1, 31, 17,
+   10, -26, -52, -64, 9, 24, 38, -9,
+   28, 99, 30, 56, -18, 39, -85, -70,
+   55, 16, 118, 20, 4, -97, -18, -3,
+   6, -34, 69, 14, 107, -4, -30, -38,
+   24, 26, -114, 54, -36, -21, 33, -40,
+   -43, 29, -19, 20, -9, 114, 30, 6,
+   -65, -1, 75, 10, 12, -21, 41, -5,
+   113, -39, -12, -105, -43, 78, 74, 18,
+   -53, -28, 9, -25, -2, 23, -9, 84,
+   -26, -5, -21, -44, -49, 46, 63, -1,
+   2, 90, 72, -63, -44, 59, 18, 64,
+   13, 49, -21, -21, 64, 106, 30, -26,
+   73, -18, -83, -24, -77, -6, -47, 27,
+   -34, 8, 47, 4, -76, -117, -28, -22,
+   -32, 70, 94, -20, 35, -22, -12, 10,
+   -28, 72, -66, 103, 100, 46, 20, -42,
+   50, 21, -16, -35, 49, 104, 56, 111,
+   -48, -31, -1, -17, 20, -23, -12, 12,
+   -36, 32, -2, 9, 14, 77, 14, 17,
+   -11, -38, -88, -54, 30, -15, -37, -15,
+   27, 21, 29, -68, 14, -91, -6, 10,
+   13, -82, 11, 19, 124, 38, 80, -5,
+   6, -15, 7, 22, -4, 32, 20, -55,
+   24, 90, 5, -15, 18, -70, 25, -16,
+   52, 2, -15, -39, -17, 14, 47, -4,
+   41, 3, 45, 20, -26, -32, -66, -37,
+   -98, 65, -17, 24, 45, 22, -34, -36,
+   -68, -13, -24, 18, -29, -125, -1, 25,
+   13, -68, -82, 20, -85, -101, 13, 19,
+   4, 37, 28, -23, 47, 14, -50, 43,
+   -46, 52, -12, 82, 31, 77, 101, -28,
+   42, 27, 81, -117, -19, 14, 2, -69,
+   27, 23, -27, 127, 59, 101, 90, -4,
+   40, 26, 3, 64, -23, -53, 31, 42,
+   51, 8, -109, 35, -41, 25, 30, 42,
+   43, -54, -22, 38, -72, 11, 3, 38,
+   31, -69, -17, -1, -85, 15, -24, 17,
+   29, -1, -13, 11, 44, 33, 115, -36,
+   -11, -39, 112, 27, 20, -11, 9, -5,
+   -40, -21, 14, -31, -9, 28, -24, 22,
+   21, 19, -27, 19, 49, 9, 7, -79,
+   79, -81, -6, 48, -75, 72, -72, -62,
+   19, 4, 38, 18, -17, 54, 107, 60,
+   18, 14, -37, -9, 28, 52, 12, -33,
+   6, 50, 127, 42, -67, 46, 37, 43,
+   -18, 20, 74, 17, -10, 56, -30, 66,
+   27, 36, 27, -24, -34, 55, 12, -32,
+   -26, -46, 63, 21, -66, -14, 98, 16,
+   -3, 12, 29, 28, 17, 58, -5, -2,
+   23, 8, -10, 0, -23, 29, 28, -79,
+   -10, -21, 32, -15, -29, 47, 5, 31,
+   -49, -44, 21, 58, 81, -92, 48, -13,
+   119, 52, -6, 19, 11, -26, 13, -57,
+   23, -16, 30, 34, 35, -10, -28, 4,
+   -9, -6, -10, -47, -35, 7, -33, 28,
+   -28, -3, -3, -3, 19, 11, 30, -7,
+   -27, -14, 0, -90, 8, -62, -44, -13,
+   -5, -2, -27, 1, 34, 67, 13, -37,
+   -15, 32, 33, 15, 22, -113, 28, 18,
+   -6, -27, 31, 46, 10, -24, 60, -2,
+   -114, -7, 8, 8, 39, 14, 124, 55,
+   -6, -30, 10, -35, -5, -18, -1, -11,
+   -7, -11, -16, -51, 49, -30, 64, 3,
+   -10, -38, 2, -3, -2, 27, 22, 15,
+   46, 41, 0, 6, 4, 54, 8, -5,
+   2, 7, -10, 108, -43, 11, -30, 15,
+   -47, 51, 26, -21, 71, 22, -33, -54,
+   -29, 120, 11, 106, 1, 10, 55, 53,
+   38, 11, 19, 42, 45, 5, 20, -39,
+   44, 120, -68, 51, 127, 24, 66, -28,
+   60, 8, 10, 32, 17, -8, 35, -6,
+   -3, 57, -32, -8, -51, 8, 24, -63,
+   47, 28, 15, 18, -8, -70, 81, 10,
+   -125, 13, -86, 62, 37, -27, 28, 127,
+   -8, 18, 56, 6, -108, 22, -36, 10,
+   14, -10, -45, 19, 72, -27, -53, -12,
+   42, 6, 7, -2, 127, 1, -41, 13,
+   3, -81, -25, 1, -11, 45, -107, 62,
+   18, 54, 22, 4, 35, 34, -32, -120,
+   -106, 18, 38, 100, 11, 29, -56, 116,
+   -37, -23, 122, -1, -78, 31, 23, -4,
+   -2, 42, -28, -57, 97, -63, 12, 56,
+   -4, -127, -14, -45, 44, -65, 103, -52,
+   -67, 7, -11, 23, -38, -32, -3, -4,
+   -24, -38, 31, -20, 20, 42, -17, 79,
+   34, 29, 60, -71, 71, 49, 101, 35,
+   22, 19, -60, 40, 11, 25, -34, -102,
+   8, 62, -3, 17, -9, -57, 47, -26,
+   -44, -29, -43, 89, 121, 19, 49, 71,
+   6, -61, 15, 100, -124, -20, 0, 37,
+   -21, -56, 21, 59, 26, 15, -40, -34,
+   53, 11, 60, 15, 63, -3, -13, 16,
+   -34, 57, -13, 61, -15, 38, -3, 33,
+   7, 36, -1, 72, -59, 18, -90, -6,
+   78, 67, 14, 20, 34, 37, -12, -47,
+   -34, -123, 19, 53, -61, -4, -38, -37,
+   6, 4, 32, -46, -13, -18, 0, 27,
+   -73, 27, -11, -47, 63, 24, 66, -124,
+   -64, -5, 34, 6, 25, 44, 0, -42,
+   -26, 39, 95, -25, -45, 87, 10, -33,
+   -30, -18, -71, -3, 6, 31, -6, 10,
+   -21, -60, 39, 64, 24, -11, 102, -20,
+   127, -70, -119, -69, 103, -17, 42, 6,
+   -81, 43, 26, -12, -33, -72, 51, 55,
+   17, -57, -3, -12, -24, -22, -60, -18,
+   -57, -22, 22, 32, 101, 40, -47, 47,
+   -1, -38, -15, -56, 58, 57, -36, -7,
+   51, -6, -12, -66, 33, 73, 19, 26,
+   -6, 77, 74, -46, -50, -16, 125, 47,
+   -30, 41, 115, -91, -11, -4, -47, 127,
+   -121, 112, -83, 25, 22, -32, 31, 6,
+   -78, -84, -44, -15, -25, -1, 3, -50,
+   -46, -5, -28, 64, -74, 94, 8, 16,
+   28, 30, 41, -11, -17, -4, 57, -69,
+   -2, -32, -15, 12, 96, -96, -15, 61,
+   -38, -5, -20, -37, 61, -63, -50, -60,
+   34, 44, 53, 37, 47, 18, 22, -24,
+   -19, -54, -8, -7, -60, 56, 2, -41,
+   -22, 70, 33, 83, -46, -71, 35, 124,
+   22, -38, -43, -70, 7, -62, -22, -51,
+   15, -46, -6, -25, -34, -54, 51, -22,
+   -29, -13, 117, -53, 20, -9, 23, 27,
+   -13, 127, 68, 11, 41, -31, 18, -50,
+   -53, 29, -109, -2, -18, 13, -43, -125,
+   23, 15, -6, -25, -19, -95, 4, -106,
+   25, -24, -14, 21, -20, 28, 2, 38,
+   -92, -86, 47, 22, 108, 29, 118, -17,
+   22, 3, 61, 4, -3, 28, -125, 10,
+   81, -6, -19, 22, 22, 75, 16, 20,
+   -26, -14, 46, 89, 99, 29, 43, 20,
+   29, 87, -57, 108, 16, 39, 42, -39,
+   16, 69, -65, -11, 6, 12, -19, -6,
+   -60, 11, -32, -21, -41, -23, -128, 50,
+   -11, 24, -44, 17, 7, -1, -20, -91,
+   33, 47, 10, -6, 17, 57, 42, -30,
+   -41, 12, -50, -4, 22, -16, -31, -21,
+   10, -69, 20, -29, -51, -32, -6, -15,
+   -50, -1, 13, 9, 38, 33, 68, -12,
+   58, 115, 18, -68, 12, -127, -37, -8,
+   39, -4, -70, 15, 31, -3, -17, 58,
+   -56, -19, 25, 3, -22, -92, 63, -4,
+   122, -56, -9, 55, 39, -80, -90, 40,
+   7, -6, 59, 26, 38, 0, -46, -60,
+   43, 34, -127, -71, 32, -17, 29, -80,
+   -33, -11, -16, -7, 19, -5, 52, 25,
+   -16, 13, 108, -13, 53, -28, 11, 106,
+   99, 35, -113, -103, 9, 4, -6, -67,
+   37, -22, 1, -13, -9, -34, -9, -7,
+   -20, -12, 5, 84, 64, -35, -8, 48,
+   31, -20, 22, 61, 95, -55, 17, 32,
+   -4, -57, -120, 5, 30, -31, 85, -27,
+   22, -8, 101, -121, 32, 33, -117, -48,
+   -15, 18, 38, -13, -57, 30, 79, -127,
+   -50, -108, -56, -126, -121, 6, 36, -12,
+   -9, 2, 66, 85, 21, -48, -6, 14,
+   44, 18, 97, -127, -20, -128, -85, 31,
+   45, -54, 25, 22, -105, -127, 43, -10,
+   -37, -28, 32, -126, -13, -14, 73, 90,
+   127, -28, -13, -73, 97, -49, -52, -17,
+   -44, -9, -9, 11, -124, 0, -59, -69,
+   -18, -27, 19, -25, -120, 56, -32, 23,
+   18, 41, -6, -2, -57, -76, -9, -13,
+   70, -86, -92, 6, 39, -109, 28, -14,
+   70, 37, 37, 53, 42, 90, 24, -15,
+   -120, -14, -11, -10, 8, 22, -17, -61,
+   -9, -19, 96, -128, -68, 93, 77, 6,
+   36, 30, -128, 39, 1, -6, 8, 0,
+   4, -83, -124, -86, 6, -103, -58, 43,
+   19, -2, -39, -109, -111, -41, -107, 37,
+   1, 30, -46, -28, -23, 61, 49, -38,
+   31, -35, -96, -126, -38, 54, -24, 28,
+   19, 66, -126, -79, -119, 37, 7, -14,
+   24, -27, -59, -113, 55, -56, -15, 24,
+   -7, 5, 14, -92, -52, -43, 91, -23,
+   2, 93, -16, -93, -66, -34, -11, 46,
+   -48, 3, -75, 47, 8, -17, -40, -87,
+   113, 121, -117, 19, 16, 74, 106, 29,
+   -8, -1, 54, 8, 24, 33, 59, 64,
+   38, 68, -89, 72, -26, 9, -14, 20,
+   -34, -85, 33, 33, 48, 17, 120, -11,
+   16, 19, 80, 37, -18, 11, 8, 8,
+   5, -41, -76, 7, 31, -42, -14, -6,
+   -50, 114, 34, 45, -48, 66, 47, -8,
+   53, 53, -66, 15, -59, 2, 24, -49,
+   -17, 14, -22, -62, 73, 20, 5, -55,
+   57, 83, 91, 59, -49, 22, 64, -44,
+   -4, -60, -114, -88, -62, -23, 34, -29,
+   110, 123, 117, -49, 1, 124, -67, 123,
+   -52, -45, 0, -27, 13, -76, -44, 11,
+   -14, 16, -9, -92, 33, -72, -125, -1,
+   -41, -122, 13, -56, -29, -44, -121, 27,
+   -127, 9, 63, 47, -47, 23, -11, -2,
+   -119, -39, -32, -61, -36, -11, -32, -27,
+   98, 61, -122, -84, -23, 106, 114, 42,
+   11, -29, -9, -74, 124, 15, -11, 29,
+   67, -9, 12, 31, 68, 23, 13, -60,
+   -46, 40, -37, -41, -113, 70, 37, 7,
+   8, 92, 34, 46, -21, 0, 13, 63,
+   -50, -57, 8, -22, 13, 35, -52, -35,
+   -11, 24, -30, -47, -1, 56, -35, -11,
+   -123, -26, 93, 4, -28, -28, -56, 56,
+   -55, 26, 14, -41, -7, -14, -19, 35,
+   16, 21, -5, -19, -10, -26, -70, -5,
+   26, -5, 62, -15, -15, -97, 49, 56,
+   63, -30, 2, -103, 15, 22, -6, -30,
+   18, -55, 46, 16, -16, 41, 78, -18,
+   -53, 21, -11, -73, 27, -4, -19, 27,
+   -21, 37, 12, 50, 5, 0, 13, -26,
+   -60, -39, -61, -24, 75, 36, -26, -28,
+   26, 18, 10, 25, -47, -4, 35, 7,
+   21, -3, -51, 28, 16, -23, -44, 15,
+   -35, 89, -36, -81, 73, -7, 22, -34,
+   6, 24, -17, 72, 90, 92, -35, 43,
+   -14, 20, -26, 104, 78, -22, 39, 29,
+   38, -29, 15, -24, 55, -23, -18, 10,
+   51, -12, 84, 22, -10, 10, 127, -27,
+   127, 17, 6, -6, 54, 0, 117, 49,
+   8, -13, 114, -15, -28, 4, 8, -28,
+   -60, 125, -46, -60, -15, 10, 43, -23,
+   -121, -27, 20, 50, 25, 72, 61, -98,
+   35, -21, 39, -7, 81, 27, 10, -23,
+   41, -123, 97, -76, 65, 10, 125, -120,
+   -86, -73, -4, 73, 109, -126, 50, 94,
+   -47, -74, -8, -83, -50, 1, 16, 46,
+   -34, -62, 24, -25, -13, -58, -117, -108,
+   -28, -8, 63, -10, 56, 25, -65, 41,
+   53, -46, -47, -109, 98, 7, 72, -7,
+   -38, 47, -76, -126, 42, 124, -10, 65,
+   -52, -62, -25, -108, -101, 14, 3, 75,
+   -9, 4, 86, -124, -126, 72, 35, -2,
+   21, 26, -66, 43, 30, -123, -28, 46,
+   3, 29, -49, -96, -79, 40, -43, -98,
+   60, 27, -125, 72, 1, 63, -49, -3,
+   22, -49, 23, 27, -32, -20, -21, 52,
+   -20, -49, -11, 0, 24, -4, 20, -67,
+   12, -23, 6, 17, 1, -10, -27, 5,
+   -15, 3, -35, -5, 12, -14, -33, -20,
+   35, -68, -27, -66, -58, -14, 52, 40,
+   -5, 38, 96, 32, 11, -47, 27, 0,
+   44, -30, -70, -23, -33, -46, -58, 66,
+   -19, -14, 1, -24, 25, 12, -99, 30,
+   28, -14, 36, 19, 27, 10, 51, -47,
+   -118, 11, -44, 16, 30, 14, -16, -12,
+   -52, 1, 4, 4, 9, 27, -26, 47,
+   15, 7, -26, 11, 37, -30, 7, -22,
+   -13, -87, -56, 118, -31, 12, -61, -65,
+   22, 127, -69, -111, 115, -57, 86, 121,
+   66, 108, 61, -64, 52, -25, 33, 45,
+   -101, 123, -19, 20, -5, -34, 61, 62,
+   -14, 63, 55, 18, -31, -89, -60, 68,
+   63, -31, -46, 44, -44, 23, -125, -23,
+   -122, 103, 44, -102, -5, 124, -90, -71,
+   12, -5, 77, 40, -47, 54, 52, 47,
+   9, -53, -77, 33, -30, 23, 49, 39,
+   -126, -34, 2, -33, -123, 30, 48, -69,
+   11, -87, -109, -60, 27, 30, -26, -26,
+   -8, 56, 8, 0, 25, -1, 106, 1,
+   -35, -98, 79, 20, -37, 0, -79, 64,
+   -2, -99, -123, -65, 28, -31, -63, 48,
+   40, 68, 55, -32, -117, -2, -75, -67,
+   3, 111, -36, 7, -53, -63, 125, -73,
+   121, -74, -11, -63, -74, 54, -20, 21,
+   -91, 118, 30, 16, -33, -128, 69, -3,
+   -64, 19, -15, -100, -14, -127, -84, -86,
+   26, -37, -14, 13, -20, -46, 31, 34,
+   43, -4, 70, -128, -60, 19, -19, -75,
+   48, -79, 84, -34, 127, 14, -119, 82,
+   82, -63, 88, -28, -127, 59, -35, -127,
+   48, 11, -116, -126, -3, -110, 24, -78,
+   -4, 46, -25, -76, -29, 53, 10, 47,
+   16, 46, 5, 34, -18, -45, -30, -2,
+   88, 68, -4, -40, -21, 24, -112, -115,
+   -13, 5, -47, 21, -32, 109, -120, -51,
+   -8, -47, 127, 66, 28, 4, -76, -22,
+   -10, -4, -44, 5, -77, -12, 12, 35,
+   115, -92, -39, -123, 8, -106, 17, 124,
+   21, 9, 57, 42, -11, 49, 36, -115,
+   104, 18, -17, -20, -63, 47, 29, 19,
+   22, 82, -73, -128, -66, -102, 18, 20,
+   -74, 58, -22, -115, -121, -121, -66, -74,
+   4, -25, -34, 67, 42, -3, 0, -68,
+   50, 16, 47, 74, 30, 125, -49, -14,
+   105, -32, 97, -30, -67, -20, 10, 15,
+   4, 2, -18, -62, -43, 15, 8, -61,
+   -4, -33, 7, -46, 71, 46, -5, 66,
+   -24, -1, 86, -99, 27, 78, 41, 15,
+   14, 5, 100, 58, -50, -32, -35, -32,
+   89, 32, -93, -7, 69, 18, -43, 36,
+   97, -29, 68, 41, 77, -25, 65, 67,
+   89, 20, 25, 28, -35, -16, -10, 125,
+   101, 126, -53, 39, -112, 120, -23, 8,
+   -10, 9, -38, 43, 4, 127, 43, 51,
+   86, 5, -79, 38, -14, 36, 9, 29,
+   46, -9, 7, 34, -31, -89, 28, 18,
+   50, 84, -67, -12, -12, 23, -91, -95,
+   -28, -82, 44, -40, 10, 1, -10, 0,
+   12, 46, -5, -40, -76, 11, -27, -42,
+   -22, -5, -71, -39, -89, 96, -56, -89,
+   21, 73, 72, 1, 15, -122, 73, 13,
+   -31, -16, -57, -27, -10, -27, -51, -71,
+   -18, -48, 0, -5, -37, -6, 81, -7,
+   19, -25, 13, -28, 24, -82, 90, -73,
+   -66, 38, -11, 17, 19, 65, -30, 80,
+   -23, -68, 65, 16, 18, 66, -17, -58,
+   -52, -71, 14, -1, -2, 39, -2, 55,
+   10, 21, 10, 3, -110, -53, -10, 39,
+   36, 84, -45, 41, 28, -10, 22, 35,
+   8, 23, 32, -40, 37, 34, 39, 15,
+   7, 22, 70, 35, 18, -40, 5, -8,
+   33, 31, -36, 8, -6, -24, 25, -23,
+   6, 12, -79, -16, -21, 126, 54, 7,
+   4, 66, 18, -22, -4, 35, 40, -40,
+   68, 41, 13, 43, -8, -7, -34, 39,
+   21, 24, 6, 32, 16, 5, -38, -126,
+   -36, 26, 61, 61, -1, 78, -35, -19,
+   -44, 30, 12, -40, 12, -3, -13, -12,
+   48, 32, 32, 42, -4, -18, -26, 22,
+   11, -108, 88, 82, -39, 65, 39, 35,
+   -16, -95, 29, 63, 104, -17, -18, 12,
+   33, -81, 1, 103, 16, -39, 31, 6,
+   44, -102, 97, 10, 48, -38, 124, 34,
+   10, 23, -66, -35, -102, 19, 81, 87,
+   34, -27, 44, -14, -44, 1, -25, 27,
+   125, 10, -110, -27, 5, 2, 10, -60,
+   -28, 15, -75, -13, 52, 29, -17, -47,
+   10, -15, 98, 43, 1, -25, 37, -110,
+   76, -20, 24, 20, 24, 45, -50, -35,
+   -10, 80, -17, -62, 47, 17, -31, 16,
+   2, 77, 94, -108, -43, -12, 44, -124,
+   -31, -15, -78, -84, -114, 97, -47, 91,
+   33, 23, -104, -24, 127, 28, 61, -109,
+   -53, 68, -26, -108, -12, -88, 75, -10,
+   87, 99, 28, 32, -125, -48, 121, -70,
+   56, -61, 37, -90, 123, 87, -43, 3,
+   -14, 96, -6, -4, 91, 35, 11, 66,
+   -38, -108, -21, -7, -5, 96, -34, -52,
+   69, 28, 33, 82, 22, 36, 19, 6,
+   10, 47, 86, -122, -11, -13, -66, 41,
+   -24, 22, 89, 66, 24, -24, -11, -25,
+   -28, -67, 113, -110, -128, -109, -69, 102,
+   114, -8, 19, -51, -12, 120, -78, 41,
+   9, 125, -118, -11, -7, 60, 0, -68,
+   28, 124, -14, 50, 24, -37, 56, -21,
+   6, 26, 53, 0, 19, 19, -30, -60,
+   -53, 52, -26, -6, -19, -48, 37, 20,
+   -17, -9, -22, 69, 31, -27, -10, 7,
+   25, -65, -52, 39, -40, -80, 29, -32,
+   -78, -4, 13, -26, 22, -45, 94, -24,
+   1, -12, 17, 73, 116, -34, 69, -39,
+   -7, 7, -57, -45, 38, -70, 62, 7,
+   -12, 55, -35, 66, 48, -21, 48, -5,
+   98, -114, 81, 14, -127, 25, -17, 78,
+   -53, 124, 12, 65, -23, 15, -42, 79,
+   7, 0, 45, -20, 62, -20, 25, 35,
+   -34, -34, -104, 70, 74, 79, -26, -16,
+   -114, 31, 79, -23, -18, 15, 119, -110,
+   -54, -83, -7, -8, 57, -50, 3, 12,
+   48, -6, 23, -111, 9, -54, 19, -4,
+   14, 19, -26, 37, 84, 36, -12, -16,
+   39, -95, -65, -20, -23, -15, -7, -24,
+   -3, 0, 75, -23, 13, 6, 119, 5,
+   65, 9, -90, -112, -22, 30, 54, 26,
+   -58, 39, 116, -37, -22, -54, 44, -1,
+   40, -31, 6, 41, -35, 48, 79, -86,
+   26, -8, -12, -10, -4, 77, 59, 2,
+   58, -84, 14, -85, -7, -11, -22, 5,
+   3, -110, -53, -127, -23, -3, 93, 11,
+   19, 19, 13, -126, 29, 14, -28, 42,
+   -33, -50, 35, 94, 3, -56, -88, -115,
+   -9, -127, -74, -83, 34, 26, -21, -6,
+   -5, -73, -10, -25, 68, -77, 35, -5,
+   -114, 58, -64, 21, 2, -7, -111, 26,
+   1, -80, -35, -116, -124, -40, 87, 58,
+   -30, 18, 121, -125, -25, -20, 64, -3,
+   3, -44, -24, 59, 125, 10, 29, 26,
+   33, -7, -43, -42, 88, 44, 26, -84,
+   1, 5, -65, -50, -31, 100, -27, 37,
+   28, -14, 6, -61, -14, -106, -6, 16,
+   86, -124, -9, -91, -33, -27, -122, -28,
+   -8, -32, -99, -75, -1, 22, -69, -33,
+   -1, -45, -24, 38, -44, 45, -51, -127,
+   -5, -4, 111, -119, 3, -106, -84, -1,
+   30, -6, 16, -11, 18, -28, 18, -11,
+   -20, 48, -65, -29, -63, -104, 16, 60,
+   -18, 6, 6, -63, 6, 28, 16, -28,
+   14, -5, -25, 2, 3, 68, 80, -18,
+   101, -51, -126, 56, 61, -22, 37, 1,
+   106, 4, -14, 18, -12, 13, 77, 13,
+   -47, 36, -31, 10, 12, -15, 5, -7,
+   -7, -17, 7, -46, 5, -21, 81, -19,
+   -31, -103, 63, -27, -32, 3, 120, 65,
+   -21, 35, -12, -34, -26, -1, -33, 26,
+   -5, 35, -41, -13, -27, -78, 19, -5,
+   15, -43, 9, 22, -12, -64, -39, -16,
+   -49, 106, -13, 13, -6, -18, 0, -38,
+   12, 5, -44, -26, 116, -63, 76, 41,
+   19, -47, 1, -5, 39, 1, 110, -11,
+   59, -31, -33, 13, -31, -31, -43, -51,
+   48, -3, -76, -49, 10, 94, 11, -18,
+   -1, -31, -94, 14, -17, 35, 3, 55,
+   8, 46, -23, 31, -4, 31, -15, -41,
+   -50, 19, 47, -35, 80, -89, 27, -36,
+   -12, -32, 49, -64, -68, 62, -75, 11,
+   15, 9, -29, 3, 30, -36, 8, -57,
+   -40, 50, 19, 59, 39, -23, -60, 4,
+   2, -4, 3, -28, -2, 125, 10, 5,
+   -21, -77, 42, 71, 20, -18, 17, -8,
+   -24, 20, -17, 73, -30, -34, -71, -68,
+   40, 1, -1, 30, 47, -16, 84, -16,
+   16, 99, -13, -1, 4, 127, -37, 15,
+   15, 27, 35, 1, -23, 8, -10, -5,
+   48, 22, 9, 120, 110, -56, 6, -52,
+   67, 110, -32, 47, 21, -42, 39, -34,
+   -2, 0, 8, 32, -11, 1, -8, 29,
+   -34, 44, 50, 1, -8, -44, -32, 61,
+   40, 24, -17, -4, -21, 10, 22, 28,
+   51, 31, -34, -56, 22, 0, -9, -17,
+   -5, -48, 2, 34, -3, 37, -23, -8,
+   -6, 6, -105, -21, 14, 3, -53, 10,
+   -12, -47, 51, -15, 17, -45, 20, 25,
+   -19, 17, 10, 6, -59, 5, 35, 25,
+   39, 10, 59, 63, 5, -22, 59, 96,
+   22, 43, 33, -13, 10, -37, -20, 14,
+   -41, 9, 25, 40, 39, 32, -27, -45,
+   -43, 8, 28, -25, 19, 12, 22, 31,
+   -76, -46, -30, 32, -5, -103, -11, 0,
+   -19, 109, -115, -38, 31, -54, 76, -48,
+   9, 81, 38, -80, 8, -56, -44, 117,
+   -123, -69, -85, 3, -47, -42, 87, 40,
+   64, 124, -84, -128, -105, -41, -122, -38,
+   18, -21, -90, -64, 19, -34, -78, -125,
+   -51, -20, -7, -51, -126, 9, 13, -29,
+   -114, 61, 126, 13, -54, 83, 21, 5,
+   30, -27, -113, -83, -54, -65, -66, 17,
+   -15, -86, -127, -36, 20, 19, 17, -58,
+   37, -13, -24, -22, -125, 81, 12, -11,
+   84, -80, -127, -38, -73, 43, -37, -30,
+   53, -114, 56, -2, -52, -40, 8, -12,
+   17, -77, -89, 46, -13, 17, -95, -73,
+   -27, -32, 31, -115, -66, 24, 27, -3,
+   0, 27, 71, -72, -36, 37, -10, -73,
+   15, -35, 14, 7, 60, -17, -63, -11,
+   0, -103, 23, -94, 82, 20, 71, 7,
+   -38, -51, 18, 5, 99, -47, -114, 7,
+   -38, -58, 18, 31, -33, 13, 8, 62,
+   -21, 109, 47, -126, -10, 71, -12, -7,
+   11, -2, -5, -2, 121, 94, -53, -9,
+   -25, -20, 30, -7, -127, 67, -84, -118,
+   22, 34, -32, -106, -90, -91, -29, -75,
+   -21, 85, 0, -61, 2, -58, 16, 14,
+   68, 99, 5, 50, -12, -11, -5, -15,
+   -37, 10, 20, -29, 25, 20, 43, 24,
+   93, -18, 5, -12, -20, -13, -21, -78,
+   -68, -5, 82, -43, 13, -49, -26, -11,
+   -12, -40, 40, -12, -53, -21, -23, 41,
+   94, -41, -42, -96, -32, -62, 11, 116,
+   -9, 18, 24, -64, -97, 8, 71, -117,
+   37, 40, 34, 5, -48, 49, -7, -59,
+   -16, 36, -58, 54, -38, -37, -68, -2,
+   -33, 23, 9, -53, -126, -91, -87, -49,
+   -126, 42, 29, 52, 69, 35, 54, -11,
+   55, -5, 40, 6, 62, 2, 28, 20,
+   28, 0, 16, -53, -48, -7, 57, 11,
+   -17, 2, -89, 1, 42, -77, 31, 10,
+   47, 97, -52, -45, 37, 70, -37, -85,
+   -37, -11, 6, 68, 127, 2, -17, 28,
+   6, 35, -9, 27, 34, -25, 17, -45,
+   46, -32, 98, 55, -18, 25, -8, 1,
+   7, -24, 2, 64, -6, -48, -49, 57,
+   -37, -64, -4, 1, -81, 58, -44, 44,
+   -40, -27, -52, 69, 8, -8, 7, 7,
+   -62, -25, -1, -69, 117, 16, 15, 39,
+   -22, -5, 12, 6, 126, -6, 0, 16,
+   24, -60, -28, -3, -8, 66, 53, 15,
+   72, 23, 71, -45, -105, 2, 26, -111,
+   -82, -69, -9, -83, -5, -22, -120, 118,
+   94, -15, 125, -40, -81, -35, -6, 16,
+   -51, 119, 28, 40, -127, 18, 8, 42,
+   22, -125, 36, -30, -58, -62, 48, -1,
+   -96, 57, 86, -28, 4, -26, 87, 14,
+   -41, -39, -45, 11, 41, 55, 86, 33,
+   30, 74, -18, -24, 23, 5, 30, -25,
+   38, 34, -60, -75, 3, 84, 18, -29,
+   -96, 9, -12, -6, 1, -21, -4, 62,
+   33, 21, -18, 71, 65, 9, -46, -19,
+   31, -24, 5, 57, 47, -1, 32, -27,
+   22, 16, 51, 38, -54, -61, 26, -17,
+   -10, -1, 20, -44, -27, 15, 16, -22,
+   -36, 26, 18, 6, -3, -34, -57, 32,
+   -11, 40, -51, 11, 89, 51, -10, 25,
+   18, -117, 61, 54, 35, -61, 21, -39,
+   -3, 23, 65, 55, -8, -21, 44, -61,
+   -41, 6, 3, -5, 4, -7, 0, 89,
+   9, -10, -65, 64, -12, 23, -34, 11,
+   -29, -92, 7, -90, 50, -92, 53, -37,
+   -31, -6, 59, -15, 4, 18, -29, 70,
+   -55, 53, 13, -8, -121, -7, -33, 10,
+   28, 8, -17, -26, 14, -23, -71, -7,
+   -51, 86, -4, -12, -21, -3, 33, 19,
+   19, -39, 12, -69, 51, 24, -96, 8,
+   107, -17, -41, 105, 11, 16, -17, -71,
+   4, 65, 0, 29, 87, -24, 89, 90,
+   73, -20, 18, -9, 48, -55, -22, -1,
+   -43, -26, 47, 1, 79, 13, 68, 18,
+   -11, 90, -3, -11, -19, 20, 107, -1,
+   -8, -45, 4, 31, -5, 9, 41, 9,
+   71, 42, 79, -1, 6, -20, 13, 2,
+   5, -8, -10, -11, -25, -35, -19, 15,
+   26, -10, 47, -14, -37, 5, 10, -21,
+   -21, 98, -4, 62, -14, -30, -12, 25,
+   35, 39, -79, 25, -61, -21, -4, -79,
+   -20, 36, -98, 82, 3, -2, 36, -2,
+   -23, -1, -39, -20, -84, 49, 104, 10,
+   -32, -35, -20, 19, 51, -16, 10, 24,
+   -87, 90, -25, 0, 9, 25, 32, 37,
+   40, -51, -16, 24, -4, 4, -39, 49,
+   54, 48, -3, 44, -38, 12, 98, 28,
+   -40, -79, 41, 41, 17, 123, 34, 25,
+   27, -49, -48, -29, 51, 16, 19, -39,
+   57, 87, -18, 30, -22, -98, -45, 56,
+   18, 30, -6, -39, -64, 57, -109, 36,
+   15, 37, 0, 42, -15, -75, -13, 5,
+   42, -54, -18, -118, -28, -101, -5, -78,
+   -9, 43, 66, -24, 8, -22, -20, -47,
+   12, 42, 30, 23, 6, -19, -9, 15,
+   44, 58, 31, -44, -21, -25, -69, 26,
+   3, 57, 0, -4, 12, 29, 39, 18,
+   14, -2, -81, 8, -26, -66, -2, -3,
+   14, 3, -19, -27, 65, 17, -29, -20,
+   -24, 40, 35, -89, -8, 24, 57, 37,
+   31, -54, 16, -40, 13, 106, -18, -14,
+   -36, -18, 17, 88, 44, -7, -21, 18,
+   28, 35, 16, -3, -18, -9, 16, -1,
+   36, 16, -31, 37, 49, -48, -33, 32,
+   -12, 12, 25, -121, 92, 6, -1, 19,
+   22, 18, -7, -15, 28, -7, -79, 69,
+   35, -62, 113, -28, 52, -39, -24, 27,
+   -11, 14, 33, 21, 40, 20, -4, 4,
+   4, -29, 74, 49, -5, 8, -3, -48,
+   25, 23, -34, 64, 11, -15, -29, 38,
+   12, 86, -27, -18, -36, -46, 15, 42,
+   40, 12, -38, 51, -4, 30, -17, -37,
+   -63, -16, 35, 9, 26, 40, 60, -19,
+   19, 6, -9, 31, -13, 9, 5, -22,
+   -32, 93, -54, -43, 65, 31, 37, -60,
+   -6, 10, 11, 127, 32, 42, -58, -88,
+   32, -19, 109, 29, -27, -50, -51, 63,
+   40, -52, 6, -20, -10, 23, -17, 78,
+   -3, -27, 59, 31, 26, 26, 21, 31,
+   -72, -38, 80, -29, 9, 51, -76, -114,
+   -38, -19, 59, -54, 27, 43, 0, -8,
+   -60, 11, -1, 19, 18, -70, -78, 117,
+   -47, -65, 15, 56, 31, 4, 52, 38,
+   -14, -36, 67, 16, -20, 12, -88, 35,
+   18, -127, 15, 44, 125, -24, 56, 19,
+   20, -1, 47, -124, -1, -31, 83, 1,
+   -15, -125, 23, 70, 53, -61, 67, 36,
+   -16, 24, 31, 42, -25, 35, -25, -53,
+   22, 49, -19, -12, -67, 23, -72, 20,
+   -24, -118, 1, -9, -16, 8, 68, 10,
+   -5, -10, 35, -48, -66, -11, 87, 55,
+   3, -28, -53, -11, -3, -13, 3, 117,
+   12, 15, -51, 5, -69, -48, 31, 10,
+   14, 12, 1, 25, 113, -74, -28, -36,
+   37, 14, 14, 2, 1, -15, -31, 19,
+   21, 22, 20, -19, -10, 81, -44, 30,
+   9, -122, 30, 24, -24, 28, 4, 31,
+   -4, -29, 87, -18, 25, -21, 3, -56,
+   58, 39, 89, 34, 33, 10, -29, 29,
+   123, -88, -6, 19, 10, -42, -25, 47,
+   -47, -120, 89, 17, 73, -33, 31, -118,
+   -12, -10, -47, 6, 74, 116, 23, 94,
+   22, 69, 113, -4, 111, 68, 15, 56,
+   65, 51, 98, 31, -14, 119, -3, 26,
+   62, -9, -88, -21, 77, 62, 0, 86,
+   92, -17, 101, -30, 38, 53, -72, -38,
+   52, -42, -15, 35, -6, -7, 70, -25,
+   67, -42, 52, -83, 44, 2, -56, 60,
+   105, 116, -48, -29, 126, 76, -85, 42,
+   122, 118, 67, -4, -5, 5, 5, -37,
+   -29, 20, -34, 31, 117, 27, 75, 88,
+   38, -32, -80, 26, -29, 113, -60, 6,
+   64, 45, -49, -24, 16, -18, 119, -102,
+   5, -26, -25, 7, 26, 106, -75, 21,
+   -56, 74, 105, 89, 77, 109, -41, 114,
+   62, -6, -2, 125, 10, 87, 46, 71,
+   -48, 22, -27, -15, 75, 127, -55, 36,
+   25, 6, 67, -28, -9, 20, -4, 80,
+   14, 79, -10, 37, 49, 11, -31, -22,
+   54, -109, 8, 20, 36, -29, 15, 73,
+   102, -56, 19, -10, 49, 33, 72, 15,
+   -12, -57, 25, 120, -54, -86, 36, 60,
+   46, -71, 51, 15, -16, 14, -87, 10,
+   -41, -50, -19, 29, 2, 22, -8, 41,
+   -47, -5, -5, 30, -71, 51, 14, -39,
+   48, -1, 69, 36, -45, -57, -20, 53,
+   23, -15, 44, -19, -38, -75, 90, -2,
+   49, -9, -22, -2, -8, 22, 37, -50,
+   95, 57, 34, 77, -35, -81, 46, -34,
+   25, -4, -12, 29, 71, -32, -66, 0,
+   48, -39, 22, -30, 10, -53, -11, 16,
+   -32, 26, -13, -42, 18, -8, 76, -44,
+   -51, -66, 6, -30, 25, 0, -2, -77,
+   -26, -8, 42, 41, 28, -23, -46, -16,
+   -63, 37, -57, 7, 50, 7, 30, -22,
+   -34, 4, -35, 70, 19, -22, 43, 33,
+   20, 58, 4, -62, -8, 38, -25, 74,
+   -43, 10, -57, 121, 88, 6, -18, -16,
+   13, 1, 49, 73, -34, -17, -52, 32,
+   -59, -1, 19, -14, -38, -72, -23, -39,
+   -25, -54, -97, -13, 64, -31, -33, -33,
+   -7, -58, -15, 24, 34, -32, -34, -35,
+   -50, -89, 10, 1, -12, -7, 120, 28,
+   -41, -8, 81, -35, 65, 4, 45, -10,
+   -56, -11, -26, 13, 23, 45, -63, -65,
+   6, 40, -18, -10, 7, 2, -67, 5,
+   31, -34, -32, -9, 55, -4, 28, 75,
+   20, -56, -15, -21, -123, 88, -24, -16,
+   6, -21, 7, 14, 15, -112, -38, 35,
+   -42, -33, 30, 122, -58, -7, -23, -10,
+   10, 27, -32, 8, -112, 3, -67, 11,
+   27, 21, 0, -41, -5, 51, -51, -2,
+   -29, -55, 23, 8, 87, 9, 71, 25,
+   -53, -65, 84, 19, 52, -21, 22, 124,
+   -49, -3, -117, -34, -82, 45, -2, -3,
+   -50, 51, -20, 11, -6, 88, -3, -16,
+   25, -4, 14, -88, -83, -3, 43, 69,
+   4, -43, 2, -73, -26, -74, -57, -33,
+   -104, 14, -25, -90, -126, 9, 97, -48,
+   15, 29, 11, 18, 43, 2, 14, -39,
+   -75, -28, 12, 10, -9, -6, -43, -64,
+   -9, -26, 47, 36, 58, 10, 45, 23,
+   -21, -22, -30, 38, 5, -2, -56, 52,
+   16, 19, 55, 33, 2, -26, 7, -46,
+   24, 27, 46, 16, -2, -85, -61, -12,
+   17, 33, -33, 26, 12, -44, 30, -38,
+   20, -13, 13, 42, -61, -30, 25, 30,
+   41, -16, 1, 12, 5, -7, 68, 22,
+   1, -53, 40, -42, -16, 36, -63, 20,
+   57, 4, 12, -49, -56, -17, -65, 58,
+   -56, 92, -28, 2, 30, 11, -53, 8,
+   8, 28, -53, -60, 51, 62, -110, 32,
+   -85, -9, -92, -47, 73, 70, 47, -28,
+   102, -31, 14, -14, -10, 57, 2, 26,
+   109, -17, 46, 71, 13, -60, 12, -21,
+   3, 13, 25, -24, 1, 19, 52, -27,
+   2, 67, -56, 102, -5, 38, -23, 19,
+   -29, -114, -63, 27, 26, -14, 9, -14,
+   15, 2, -18, 53, -8, 10, 66, 15,
+   -60, -118, -55, 28, -54, -95, -2, 39,
+   88, -1, 57, 60, -11, 63, 25, -11,
+   110, 32, 47, 3, -42, 15, 74, -36,
+   0, 8, -49, 6, 71, 39, 13, -104,
+   25, 110, -39, -66, 37, -30, -89, 51,
+   -86, -21, 67, 8, 2, 88, -18, -69,
+   -76, 10, 75, 32, -112, -61, 50, 49,
+   19, 27, 119, 41, -81, 31, -124, 51,
+   39, -49, 87, -10, 3, 31, 123, -47,
+   -41, -34, 18, 31, 33, -24, -62, -59,
+   -37, 107, -3, 37, 39, -32, -77, 4,
+   -47, 6, -55, -4, 45, 38, -50, 8,
+   -9, -23, 77, -59, -13, -7, 80, 10,
+   127, -45, -121, -8, 88, 22, 12, 33,
+   75, 17, -69, 13, -31, 37, 47, -2,
+   27, -7, -39, 35, 22, -83, 0, 61,
+   12, 9, 0, 28, 13, -3, 11, -13,
+   -16, 83, -11, -23, -80, -9, 59, -24,
+   -2, 32, 20, 37, -51, -12, -41, 30,
+   -57, 34, -102, -91, 118, 3, 29, 25,
+   33, -34, -50, -1, -120, 10, 2, 19,
+   12, -44, -23, -57, 27, -61, -11, 60,
+   -4, 116, -25, 39, -9, -29, -103, 33,
+   -23, 13, 10, -17, -6, 21, 52, -15,
+   -22, 19, -31, 48, 64, -69, 23, 2,
+   19, 87, -43, -78, -84, -33, 19, 33,
+   71, 28, 43, -37, -51, 70, 9, -4,
+   10, 27, 56, -16, 28, 19, 10, 10,
+   8, 46, 12, 81, -16, 120, 1, -12,
+   -15, -7, 34, -55, -57, 93, 101, 67,
+   -68, -3, 64, 54, 14, 29, -40, 15,
+   -35, 24, -83, -68, 119, -66, 50, -67,
+   0, -48, 62, 15, 117, 26, 41, -12,
+   29, 49, 65, -59, 44, -79, 63, -65,
+   19, -78, 30, 36, 33, 63, 14, 127,
+   5, 22, 13, -6, -45, -66, -2, 4,
+   -3, 2, -34, -41, 50, -31, -22, 50,
+   -45, 67, -19, -47, -14, 123, -12, 36,
+   23, 11, -110, 46, 12, 92, -4, 86,
+   88, -23, 51, 34, 21, 50, -87, 35,
+   87, -3, 15, -37, 24, -23, -15, 1,
+   109, -43, 70, -109, -43, -23, 110, -113,
+   -114, 29, -61, 68, 31, -16, -13, 10,
+   -59, 1, 77, -56, 13, -8, 50, 30,
+   27, -58, -100, 6, -30, 1, 11, -7,
+   78, 8, 37, 44, 21, -61, 59, -33,
+   -11, -75, -44, 17, 17, 13, -9, 4,
+   -31, 70, 71, -88, 57, 26, 40, -39,
+   46, 41, -40, 45, 5, 11, -59, 31,
+   27, 35, 53, 70, -31, 14, -30, 16,
+   117, -24, 51, 16, 45, 127, -38, -48,
+   9, -32, 51, -18, 17, -70, -23, 5,
+   -11, -65, -8, -22, 32, -67, 22, -3,
+   0, 112, 23, 5, 61, 9, -10, 22,
+   32, -10, 34, -27, 17, 0, 37, 37,
+   110, 20, 41, 85, 4, 61, -9, 24,
+   -39, 46, 41, 35, -9, -59, 44, -2,
+   9, 19, 82, -66, 23, 80, 6, 40,
+   15, -31, 55, 59, -51, 107, 16, -24,
+   2, 37, -4, 71, 38, 16, 53, 23,
+   32, 8, -24, 20, -13, 40, -122, -26,
+   2, -5, 50, 105, 48, 47, -29, 22,
+   40, 38, 19, -33, 54, -65, 3, 16,
+   31, 85, 63, -58, 35, 33, 11, -3,
+   -51, -50, 31, -4, 38, 55, 63, 15,
+   38, -82, -4, -3, 53, -5, 98, 15,
+   -20, -61, -2, 69, 81, -30, 15, 1,
+   17, -78, -88, 58, 65, -87, 44, -80,
+   31, -10, -19, 5, -104, 27, 8, -71,
+   -7, -63, 38, 58, -29, 2, -25, 16,
+   -14, -5, 5, -26, -48, 7, 22, 15,
+   -50, -73, 24, -6, -88, -6, 53, -49,
+   3, 0, -7, 18, 13, -1, -112, 15,
+   -85, 28, 31, 53, -20, -57, -10, -28,
+   1, -12, -34, -14, 45, -13, -13, 74,
+   -36, 5, -73, 28, 10, -18, 2, 3,
+   -37, -57, 63, -75, -59, 33, -7, 53,
+   48, -7, 114, -29, -38, -4, 12, -121,
+   -53, -36, 42, 38, -6, 105, 58, 57,
+   -32, -14, -50, 87, -84, 31, -56, -35,
+   68, 21, 6, 79, 49, 2, -8, 9,
+   -42, -14, -125, 16, -45, 48, 125, 15,
+   -9, -19, 49, 64, -30, 11, -67, -38,
+   -125, -57, -19, 66, -8, 13, -52, -72,
+   0, -4, -52, 109, 92, 15, -61, 51,
+   36, -41, 26, 60, -59, 4, 17, 72,
+   -2, 48, 29, -11, -15, -7, -2, -23,
+   -9, 16, 2, 14, -18, -1, 92, -111,
+   -2, -9, 14, -17, -21, 23, 30, -4,
+   51, 53, -38, -20, 3, 47, -76, -10,
+   14, -105, -94, -8, -5, 16, -1, 41,
+   24, 38, -10, 31, -109, -16, -4, 39,
+   -46, -33, -20, -14, -39, -49, -13, -7,
+   0, 31, 19, 7, -9, -12, 17, 26,
+   16, -120, 6, 25, 39, 45, 24, -29,
+   -34, -20, 16, -64, -14, 2, -48, 53,
+   15, -17, 5, 30, 14, 127, 8, -49,
+   62, -89, 42, 66, 16, -14, 0, 30,
+   -12, 10, -49, 36, 36, -47, -35, -8,
+   39, 54, -24, 15, 57, -63, 12, -5,
+   -46, 1, 96, -119, 14, 4, -48, 17,
+   -123, 81, 1, 113, 89, 20, -39, -13,
+   34, -39, 52, 11, 35, -23, 34, -25,
+   -4, -9, 10, 23, 30, 27, 20, -30,
+   -1, -29, 24, -27, -37, -10, -15, -57,
+   -31, 22, -32, 75, 45, -35, 42, 3,
+   -32, 76, 21, -38, 14, -52, -9, 5,
+   -62, 35, -23, -33, -64, 42, 57, 45,
+   18, 10, 58, 50, -1, 11, -79, -14,
+   59, -61, 14, 58, 26, -21, 62, -44,
+   20, 15, 2, 77, 42, -14, 20, 108,
+   27, 7, 3, 48, 62, 0, 15, -33,
+   -13, -49, 29, 66, -66, 56, -127, -1,
+   10, -14, -64, 32, 1, 0, -34, 73,
+   82, 67, 85, -93, 29, -26, 9, -74,
+   -50, 20, -29, 40, -24, 70, -105, 51,
+   -18, -23, -40, 2, 39, 105, -33, -82,
+   -18, 127, 72, 6, 42, 59, -80, 1,
+   -22, -4, 36, 52, 117, -96, 123, -14,
+   -84, 33, -58, -18, -24, 41, 17, -15,
+   -70, -30, 42, -5, 21, -69, -83, 107,
+   96, 122, 70, 60, -109, -68, 21, 51,
+   90, 93, -34, -5, -13, -13, 77, 76,
+   70, 85, -56, 50, 5, -124, 0, 13,
+   -40, 57, 7, -23, -21, 20, -25, -87,
+   23, -53, -19, -41, -27, -3, 37, 65,
+   -33, -30, 42, -75, 15, 15, 76, 25,
+   37, 28, -60, -54, -99, 35, -53, -19,
+   4, -69, -46, 5, 25, -33, -31, 49,
+   16, -58, -23, -6, 53, -14, 68, 47,
+   -35, -4, -13, 3, 81, -16, -64, -37,
+   5, -4, 4, 33, -55, 29, 31, 44,
+   5, 13, 77, -24, -31, -56, 15, 41,
+   80, -35, -3, 24, -101, 30, 17, 63,
+   64, 16, -17, -20, -6, 11, 4, 1,
+   -35, -79, -3, 42, 46, -26, -29, -11,
+   -85, -62, 58, 8, 6, -61, 6, -123,
+   11, 0, -89, -121, -55, -123, -24, 5,
+   -81, 6, 123, 32, -62, -82, 2, -89,
+   -74, -48, -109, -6, 42, 20, -121, 34,
+   -117, -3, 42, -71, 82, 70, -88, 20,
+   -3, 9, -69, 11, 56, -23, -66, -49,
+   9, -121, -127, -124, 2, 10, 17, -60,
+   49, 30, 74, -40, 45, -87, 68, -7,
+   74, -26, -25, 0, -119, 14, -5, -16,
+   -103, 77, -31, 16, 43, 5, 53, -58,
+   35, 50, 72, -38, -121, 48, 70, -29,
+   33, -30, 36, 36, -61, 28, -18, 37,
+   104, -126, 44, -122, -120, -12, -13, -122,
+   -33, -86, -122, -86, -69, -30, -20, 70,
+   -60, 47, -52, -87, -51, 20, 125, -34,
+   106, 28, -71, -34, 64, -66, -36, -97,
+   -81, -127, 34, -93, 42, 115, -23, 2,
+   32, 66, 100, -32, 70, -44, 16, 52,
+   4, 24, -60, -126, 9, -122, -126, -118,
+   -96, 2, -4, -50, -30, -117, -67, 34,
+   -57, -1, 12, -70, -82, 17, 53, -39,
+   11, -88, -3, 35, 127, -77, -33, -21,
+   75, -30, -47, 80, 35, -35, 95, -118,
+   22, -12, 11, -7, -124, 127, -67, 64,
+   -37, -47, 14, -21, -20, -10, 11, 20,
+   18, 11, 24, -62, 18, -56, -24, 14,
+   -9, 9, -126, -56, -39, -3, -47, -35,
+   12, -23, -8, 10, 120, -21, 63, -36,
+   -44, 72, 69, -101, -2, -16, -102, 9,
+   9, 5, -100, -51, 116, -90, 42, 17,
+   43, 50, -64, -78, -82, -12, -107, 124,
+   50, -24, -14, -47, 11, -57, 43, 125,
+   -49, 3, 38, -4, -46, 46, 32, 20,
+   -65, -27, -83, -6, -5, -36, -2, 2,
+   -16, 23, -31, 3, -73, 57, -75, -94,
+   -24, 5, -13, 15, 9, -12, -5, 8,
+   5, 18, -37, 104, -50, 24, -81, 91,
+   33, -76, 10, 29, 45, 19, -25, -86,
+   -15, -81, -19, 62, 20, 41, 34, -11,
+   -37, 45, 88, -126, 77, 77, -63, -4,
+   -12, 28, 39, 63, 53, 12, 51, -51,
+   -13, -56, -117, 17, -27, 23, -66, 41,
+   -29, 77, 65, 62, 105, -51, -67, 24,
+   92, -118, 60, -6, -14, -23, -57, -35,
+   -11, -45, 19, 120, -42, -85, -51, 20,
+   120, 26, -24, -71, 92, -49, -11, 17,
+   34, 24, 64, -23, 27, 29, -29, 6,
+   39, -61, 7, 47, 9, -10, -10, -100,
+   67, 70, -64, 99, 57, 67, 17, -20,
+   58, 28, 15, -43, 57, 14, -97, 7,
+   89, 18, 24, -99, 9, 10, -27, 46,
+   -48, -124, -81, -41, 19, -32, -75, 4,
+   80, 58, 83, 59, 65, -26, -11, 42,
+   17, -64, -69, 1, -106, 28, -38, 54,
+   22, 7, -10, -10, -1, -46, 109, 27,
+   13, 6, -43, 5, 10, 17, 7, 65,
+   39, -80, 33, 93, -53, -107, -36, -3,
+   0, -61, 87, 69, -121, -83, 26, 33,
+   -62, 73, -77, 26, 125, -29, 31, 108,
+   -120, 40, -22, 104, 10, 117, -88, -10,
+   -29, 12, -4, 20, -39, -81, 51, -68,
+   41, 70, 9, 3, 63, 35, -14, 15,
+   -51, -44, 1, -41, 42, -18, 90, 0,
+   6, 28, -41, 19, -36, -49, -34, 75,
+   19, -8, 18, -2, -9, 46, 22, -22,
+   47, -8, 35, 22, 0, -19, -6, 1,
+   1, 39, 8, 64, -26, -42, 16, -15,
+   -16, -6, 8, 3, 39, -6, -1, 31,
+   -20, -51, 46, 32, 17, -50, -38, 64,
+   -18, -69, -3, 8, -24, -15, 30, 59,
+   31, -12, 9, 27, 56, 7, -32, 10,
+   7, -20, 11, -62, 13, -4, -37, 6,
+   -36, -63, 29, -10, 9, -4, -35, -16,
+   -36, 18, -18, -23, -57, -16, -38, 19,
+   21, 72, -45, -73, 16, -19, -7, -17,
+   70, -45, 13, 46, -29, -12, -3, -2,
+   -54, 122, -5, 91, -119, 4, -23, 39,
+   -1, -53, 19, -5, -76, 19, 22, -5,
+   -44, 32, 51, 45, -14, 30, -51, 18,
+   106, -18, -33, 43, -15, 9, 38, -22,
+   23, -104, 80, 19, 64, -11, 6, 10,
+   -70, 71, 97, 40, -49, 14, 31, 35,
+   -126, -5, -8, 15, 47, -20, -13, -4,
+   21, 14, 46, 18, -77, 34, 17, 0,
+   27, 32, -33, -5, -5, 4, 118, -15,
+   9, -10, 60, -16, -15, -48, -6, -86,
+   92, -25, -8, -24, 6, -4, -28, -17,
+   40, 116, -42, 21, -26, -15, 22, -14,
+   42, -12, 20, -37, 49, 53, -30, 11,
+   76, 65, -104, 50, -45, -26, 10, -127,
+   -9, -40, 10, -14, -53, 8, 56, -48,
+   26, 14, -7, 19, 55, 5, 28, -30,
+   -3, -44, 30, 68, 43, -16, -14, -4,
+   26, -74, 71, -35, 49, -56, -1, 7,
+   -30, 62, -95, 33, -9, -37, 74, 36,
+   49, -18, -16, 10, 54, -11, -13, -45,
+   2, 25, 8, -12, 20, 91, 8, 16,
+   8, -39, 20, -3, -17, 43, -8, 19,
+   3, -25, -3, 16, -1, 26, 39, -15,
+   6, 25, -43, -17, -65, 46, -39, 61,
+   21, -21, 29, 65, -56, 0, 93, 15,
+   17, 1, -40, 43, 11, 36, 35, 31,
+   -20, -66, -28, -6, -6, 89, -35, -41,
+   121, 17, -4, 71, 76, 19, -54, 18,
+   21, 10, 6, -44, -34, -14, 25, 4,
+   50, -92, -53, -61, -4, -38, -15, -5,
+   -37, -8, -28, -77, -11, -105, -64, -8,
+   53, -44, 5, 8, 30, 25, 8, 30,
+   -26, 68, -62, 52, -7, 66, -101, -3,
+   -1, -24, -49, -56, -105, -121, 47, 31,
+   58, 2, 19, 40, -14, -22, -1, -24,
+   -14, -51, 59, -19, -21, -47, -84, 15,
+   9, -30, -84, -120, -114, -52, 120, -47,
+   2, 81, 0, 19, -32, 16, -3, 4,
+   25, 56, -127, 3, 49, 21, 9, -28,
+   -50, -32, -5, 18, 45, 26, -47, -21,
+   12, -25, 21, -46, 6, -72, 6, -23,
+   -58, -5, -75, -52, -45, 19, 2, 52,
+   -7, -43, 26, 58, 24, 1, -34, -21,
+   -29, 89, 91, -5, -57, -38, 15, -21,
+   -41, -10, -16, 91, 52, 106, -58, 36,
+   -19, -20, 124, -37, 17, 5, 83, -102,
+   18, 25, 66, -48, 28, 27, -77, -32,
+   24, -31, 31, 0, 79, 25, -56, 28,
+   51, -80, 29, -33, -92, 33, -3, -58,
+   -59, 26, -126, 93, -63, 118, -50, 10,
+   -28, 59, 21, 27, 3, -109, 53, 78,
+   1, 46, 8, 19, -123, -56, 124, 39,
+   15, 59, 57, -18, 0, -72, 73, -36,
+   -6, -24, 6, -1, -54, -26, 5, 35,
+   72, -52, -31, -31, 22, -11, 30, 58,
+   -62, -62, 77, -49, 63, 10, 60, -59,
+   8, -15, -21, -91, 2, 37, 24, -57,
+   53, 36, -40, 2, -43, -127, -17, 23,
+   -29, 24, -7, -19, 24, 27, 3, -50,
+   -22, -13, -39, 76, -44, 100, -36, 6,
+   1, 2, 30, -38, -73, 60, -76, -7,
+   -18, 32, -107, 87, -94, -45, -18, -2,
+   -8, -21, -41, 45, 104, -4, 52, -8,
+   10, -18, -7, 9, -61, 10, -22, -102,
+   25, -34, -7, 46, -40, -14, -18, 19,
+   -35, -15, -28, 76, 15, -109, 45, -3,
+   35, 27, -27, -67, -40, -88, -123, 69,
+   -57, 2, -39, 26, -5, -47, 7, -23,
+   13, -29, 24, 70, 37, 14, 26, -67,
+   14, -6, 38, 39, 62, 13, 37, -27,
+   -14, 63, 120, -34, 113, -3, -41, -54,
+   41, -40, 17, -43, 85, -66, 30, -52,
+   55, 12, -15, -10, 12, 73, -32, 64,
+   80, -18, 18, 48, 26, 3, 88, 13,
+   9, -64, 15, -19, 30, 52, 117, -1,
+   50, 12, -7, 40, 23, 31, 110, -5,
+   -46, 51, 46, -116, 25, 88, 14, -24,
+   21, 79, 18, -58, -78, -29, 11, -37,
+   -86, -31, -40, -28, -17, 40, 23, 64,
+   17, 5, 15, 50, 26, -28, 13, 66,
+   57, 11, 51, -81, -26, -72, 39, -16,
+   -120, -51, -100, -85, 24, -76, -14, 72,
+   -42, -30, -103, 1, -75, 49, -38, -82,
+   32, 53, 113, -33, -40, -6, 24, 47,
+   0, -51, 118, -4, 16, 77, -35, -36,
+   -6, 4, -16, 124, -91, -65, -31, 35,
+   -12, 0, -36, -96, 0, 17, -108, -9,
+   -47, 10, 8, 58, -2, 11, 7, -1,
+   -17, -8, 8, -77, -10, 16, 111, 13,
+   10, -32, 47, -8, 62, 69, -35, -4,
+   39, 34, -92, -8, 45, 37, -7, -75,
+   -1, 45, -38, 71, -90, 37, 31, -43,
+   17, -33, 1, -17, -71, 35, 16, 86,
+   -113, -23, 0, -80, 5, -28, 14, 10,
+   33, 47, -6, -36, 19, -16, -52, 33,
+   -35, -12, 25, -21, -7, 63, 2, 32,
+   -17, 13, -6, 12, 14, -49, -43, 66,
+   5, 19, -103, 34, 27, -8, -20, 1,
+   10, -47, 35, -26, -11, -18, -61, 21,
+   -25, 9, 11, -16, -20, 8, 13, -19,
+   -14, 27, 5, 15, -16, 9, 59, 0,
+   52, 28, -66, -115, 68, 17, -17, 21,
+   -21, 11, -28, -20, 4, 26, 15, -9,
+   -25, -6, 17, 5, -19, -13, -11, -3,
+   34, -1, 29, -74, 115, 33, 20, -12,
+   49, 54, 127, -55, 9, -9, -87, -113,
+   120, 8, -25, 19, 63, 21, -44, -31,
+   17, 111, 93, 16, 10, -99, -125, 98,
+   -12, -58, -40, 14, -47, 92, -40, -6,
+   -38, -24, 30, 78, -22, 109, 76, -10,
+   66, 29, -15, -33, -18, 3, 63, 11,
+   47, 96, 49, 0, 74, 72, -43, 6,
+   24, -26, 80, -56, 66, -23, -109, 55,
+   -27, 52, 27, -59, -99, 58, -17, -34,
+   -7, -35, -89, 66, 15, 18, 36, 32,
+   0, -101, -40, 35, 121, 14, 37, 106,
+   -90, -62, -37, -73, -45, -18, -12, -48,
+   -21, -81, 113, -49, 33, -75, 74, -55,
+   -73, -85, -51, -116, 53, 16, -67, -5,
+   -49, 85, 23, 111, 19, 119, -107, -8,
+   29, -2, 50, -117, 83, 34, -42, -38,
+   7, -3, -46, 94, 95, 127, -45, 71,
+   37, 65, -2, 4, -1, -34, 118, 35,
+   0, 81, -56, -73, -6, 22, 89, -28,
+   7, -94, 40, 73, 37, 60, 33, 125,
+   57, 127, -37, 46, 67, 19, 89, 86,
+   -31, -11, -70, 126, 0, 2, 4, -45,
+   35, 39, 46, 78, 46, 93, 85, 89,
+   74, -72, -21, -11, -31, 93, 16, -38,
+   -2, -55, 49, -25, -21, -11, 21, 16,
+   -63, 19, 27, 25, 3, 70, -23, 52,
+   18, 15, -101, -47, -66, 99, -126, 101,
+   -37, 0, 46, 74, -10, 33, 29, 6,
+   60, 16, -41, 115, 17, -11, 14, 43,
+   -22, -11, 78, -69, 14, 69, 4, -98,
+   -73, 22, 5, 52, 17, -64, 65, 49,
+   -1, 21, -121, -39, 61, 20, 23, 36,
+   108, 57, 19, -36, 62, 38, -29, -8,
+   28, 87, -38, -86, -46, -86, -86, 9,
+   4, 39, 13, -20, 40, -15, -43, 4,
+   9, 24, -16, 4, 68, 41, -6, 74,
+   -78, -43, 27, -68, -7, -9, -54, -2,
+   -7, -49, -94, 100, 2, 0, 1, 15,
+   -53, 25, 117, 1, 125, -22, -2, -21,
+   -19, 73, 19, 75, -112, 30, 68, -13,
+   -55, -26, -12, 54, 26, 50, 67, 12,
+   44, 123, 8, 42, -14, -22, -70, 2,
+   58, -68, -24, -9, -20, 2, 30, -13,
+   -21, -21, 11, 98, 0, -63, 37, -22,
+   29, -1, 23, 50, 28, 74, -15, 23,
+   -48, 18, -5, -28, 54, -14, -15, -3,
+   -23, 13, 10, 63, -3, 11, 32, -21,
+   39, 80, -106, 41, 1, -55, -25, 53,
+   -17, -57, 54, -39, 21, -40, 8, 44,
+   112, 9, 88, 52, -24, -2, 7, 3,
+   -11, -13, -32, -6, 75, -14, 75, 21,
+   -66, 16, 14, 18, 12, 34, 94, -45,
+   30, 6, -36, 94, -125, -26, -23, -117,
+   -93, -3, 0, -1, -33, -33, 34, -91,
+   -76, 31, -16, 62, 47, -9, -27, 19,
+   23, 41, 9, 66, -3, -118, 83, 20,
+   118, 5, -22, 37, -91, 31, 3, 23,
+   5, 15, 11, 120, 89, 84, 7, 75,
+   -123, 15, 7, 28, 17, -101, -23, -9,
+   -5, 15, -2, 72, 21, 10, 19, -29,
+   60, 13, 20, 46, -27, 54, 7, 24,
+   -61, -25, 25, -17, -19, -14, -30, 21,
+   -37, 61, -63, 41, -48, -15, -20, 15,
+   44, 28, -13, -60, -55, 15, 18, -2,
+   57, 16, 102, -17, 1, 3, 23, 28,
+   -20, -104, 66, 99, -31, 44, -25, -59,
+   54, 15, 4, 66, 44, 13, -88, -3,
+   -4, -18, 21, -43, 12, -123, -14, 37,
+   -28, -11, -9, 73, -5, -62, -12, 25,
+   17, -25, 65, 22, -4, 2, -8, 9,
+   9, -7, 41, -62, 10, 34, -4, -6,
+   6, -6, 0, -10, 4, -9, -5, 9,
+   8, 2, 16, 4, -9, -9, -2, -28,
+   -6, 2, 32, 1, 2, 1, 10, -3,
+   -25, -4, 12, -18, 4, 5, -6, -4,
+   -10, 0, 20, -2, 18, -3, -16, 9,
+   1, -4, 15, -7, 13, 5, 1, 6,
+   -10, -1, -8, -5, -10, -3, -12, 18,
+   -3, 2, 3, 12, 7, 16, -5, 11,
+   7, 25, -7, 25, 14, 7, -14, 1,
+   -20, 11, -30, -18, 6, 4, 1, 2,
+   0, 8, 0, 4, -16, 9, -2, 20,
+   14, -7, -2, -8, 4, -3, -7, 5,
+   -12, -24, -41, -4, -4, 0, 22, -4,
+   6, 34, 7, 44, -6, -23, -14, -9,
+   8, -32, -47, 19, -26, 3, 20, -37,
+   -14, -16, -9, -46, -9, -6, 7, -27,
+   13, -28, -10, -10, -71, 21, -41, -6,
+   49, 41, -9, -16, 6, 12, 32, -1,
+   36, -9, -14, -22, 4, -19, -4, -13,
+   24, 24, 41, -8, -8, -19, -2, -38,
+   -6, -20, -12, 21, -21, -26, -90, -22,
+   8, 18, 67, 45, -12, -47, 33, 14,
+   -31, 7, 14, -4, 11, -5, -25, 8,
+   19, -49, -12, -19, -20, -1, 21, -26,
+   19, 3, -13, -3, -12, -6, -7, 22,
+   8, 17, -1, 0, 6, -3, -7, 1,
+   10, 5, 48, -13, 17, 2, -5, -26,
+   1, 11, 6, 11, 15, 11, -18, 6,
+   -21, 9, -13, -9, -2, -9, 9, 0,
+   -5, 23, 33, -14, -2, 1, 26, 7,
+   -17, -4, -8, -3, -2, 20, -5, -36,
+   4, 7, -9, 29, 2, -1, -6, 6,
+   13, 27, 6, -7, 1, -11, 20, 5,
+   10, 2, 5, 10, 17, 10, -28, 3,
+   -14, 27, -7, -12, 12, -6, -22, 3,
+   -5, 11, -21, 1, -17, 1, -14, -9,
+   3, -19, 18, -39, -16, -12, 29, 14,
+   12, 18, 8, 40, 34, -15, -33, 19,
+   3, -5, 9, -7, -26, -2, -38, 27,
+   -21, 28, -39, -40, -13, -53, -2, 5,
+   -42, 27, 10, -13, 11, 3, -2, -17,
+   -36, -5, -21, -13, -3, -6, -46, 25,
+   13, 2, 7, -17, 66, -16, 18, 15,
+   7, -15, 22, 16, -2, 45, 3, 0,
+   32, -5, 22, 37, 8, -1, -39, 14,
+   -21, 25, -67, 16, 0, 9, 7, -3,
+   4, -1, 9, 6, -29, -2, 14, -2,
+   1, -9, -9, -28, 3, 7, 14, 16,
+   -25, -18, 32, 42, -39, -32, -42, -60,
+   -9, 20, 4, -20, -61, 4, -37, -5,
+   17, -16, -25, 67, -35, 17, 33, 27,
+   90, 9, 17, -55, 112, -7, -33, -4,
+   17, 50, 13, -7, -81, -12, 9, 85,
+   22, -20, -2, 32, 10, -9, -4, -6,
+   3, -3, 10, -12, -24, -62, -10, 40,
+   6, 1, 13, -7, 2, -110, 24, 31,
+   -15, 42, -54, 69, 45, 88, 13, -5,
+   7, -25, 28, -49, -3, -59, 53, 34,
+   59, 80, -23, 58, 75, -4, 6, -14,
+   -27, 91, -16, -22, -5, -29, 12, -50,
+   26, 27, 5, -8, -1, -4, -22, -30,
+   -39, 18, 32, -45, -18, -12, 45, -33,
+   -14, -38, 36, -14, -21, 18, -20, -11,
+   -44, 6, -29, -32, -2, -5, 0, 47,
+   -40, -18, -49, 5, -2, -19, 0, -2,
+   -17, 37, -16, -10, 39, 17, -34, 14,
+   -18, -16, 12, 12, 20, -1, -27, -27,
+   36, 15, -6, 22, -28, 10, -17, 13,
+   46, 13, 28, 6, 32, -62, 33, 23,
+   16, 3, 16, -35, -5, -22, -13, 22,
+   10, 43, -18, 2, 46, -14, -35, -39,
+   31, -31, -19, 25, 15, 45, -23, 11,
+   24, -8, 32, -6, 6, 4, -4, -5,
+   -27, 40, -29, 19, 36, 4, 91, -20,
+   4, -19, 16, 47, -45, 20, -21, 2,
+   46, 26, 8, -56, -28, -74, -10, 9,
+   -52, -6, -42, -17, 0, 21, 11, -26,
+   -25, -36, -3, -5, -25, -1, -52, 23,
+   22, -29, -7, -3, -55, -31, 43, -13,
+   -13, -53, -23, 3, 28, 34, 14, 2,
+   18, -31, -5, 41, -15, 34, -14, 30,
+   -62, 15, -45, -81, -22, 5, 10, 9,
+   -1, 13, 30, -12, -45, -1, 1, -39,
+   -1, 4, -9, -39, 2, 17, 28, -15,
+   -11, -54, 83, 4, -5, -23, -45, -54,
+   -1, -48, 30, -29, -2, 45, 48, 60,
+   13, 10, -26, 5, -13, -8, 41, 23,
+   66, 15, -43, -8, -103, -5, 61, 16,
+   5, -31, 58, -38, -51, -10, 35, -112,
+   -25, 56, 28, 9, 8, 12, 1, -43,
+   26, 1, 36, 12, 84, -88, -63, 100,
+   -42, -4, -109, 10, -49, -88, -11, 27,
+   -28, -77, -53, 51, 45, -106, 13, 23,
+   59, -31, 79, 44, 12, -80, 6, 66,
+   -10, -35, 37, -8, 60, 39, -6, -45,
+   -12, -53, 59, -15, 27, -28, -1, -69,
+   23, 29, 19, -53, 36, -37, 0, -28,
+   -32, -31, 43, -31, -33, -20, 0, 44,
+   -61, -77, 19, -37, -32, 10, 3, -14,
+   49, -16, 10, -24, 11, -53, 2, 55,
+   -7, 26, -38, 18, -3, 2, 36, 61,
+   -18, 43, -28, -23, 66, 3, 11, 25,
+   4, 6, -16, 11, 33, -44, -24, 4,
+   -17, 11, 1, -5, -18, 33, -17, 8,
+   52, 5, 23, 19, 18, -19, -6, -2,
+   -21, 18, -5, 25, -3, -33, 45, 30,
+   -4, -17, 10, -1, 69, -77, -21, -60,
+   64, -2, -44, 9, 17, -29, -14, -18,
+   35, 7, -8, 42, -5, 23, -20, -12,
+   -19, -19, -20, 10, -22, 45, 33, -40,
+   -17, 25, -16, 44, 12, -4, 9, -75,
+   8, -35, -66, -2, -36, -22, -49, -9,
+   13, 16, -30, -19, -10, -8, 21, -12,
+   -24, -33, 47, 5, -14, 17, 25, 18,
+   -42, 6, -15, -3, 21, -21, 25, -25,
+   -22, 14, -5, 12, 46, 47, 13, 25,
+   18, 7, -8, 12, -30, -24, 0, 60,
+   -81, -4, 30, 103, -63, -18, -11, 5,
+   11, 7, 66, -13, -39, 8, -2, 12,
+   -2, -11, 1, 36, -37, -9, 18, -46,
+   12, -22, 3, 14, -43, -74, 15, 51,
+   52, -7, -46, -9, 10, -76, -40, 12,
+   -111, -20, 11, -85, -5, -69, 6, -102,
+   -15, -34, 50, 25, 121, -17, 118, -16,
+   -72, -33, -3, -10, 0, 14, -52, 35,
+   10, 62, -60, -49, -29, 4, 1, -17,
+   29, 3, 12, -48, -99, 7, 38, -36,
+   0, -13, -51, -43, -77, 10, -7, -4,
+   -6, 103, -58, 72, -19, 58, -43, -30,
+   44, 54, 42, 68, 3, -65, -64, 74,
+   -21, -72, -57, 67, 70, 63, -97, -24,
+   64, -11, 32, -3, -14, 5, 2, -74,
+   31, 3, 2, -36, -50, -19, 14, 94,
+   28, -11, 5, 32, 12, 15, -17, 18,
+   -23, 62, -3, -41, 34, -29, -7, -54,
+   26, -25, 33, 23, -9, 32, -8, 18,
+   3, -12, 40, -31, 10, 17, -22, -86,
+   -18, 34, 65, 8, -11, 13, 0, 11,
+   14, -22, 6, 17, -22, -14, 35, 3,
+   29, 15, 16, -24, -22, 51, 7, -42,
+   63, 11, 18, -7, 7, -38, -20, -30,
+   13, 81, 64, -94, 30, 45, 95, 9,
+   -5, -35, 6, 56, 25, -93, 22, -28,
+   8, 17, -48, -90, 12, -41, 5, -38,
+   -4, 13, -48, 11, -6, 9, -52, -10,
+   59, -33, -2, -60, -8, -24, 33, 45,
+   -31, 4, 34, -9, -8, -36, -22, -37,
+   -62, -31, -13, -108, -16, 76, 17, -23,
+   25, 25, -28, -3, -23, -15, 14, 20,
+   16, -3, -35, 9, 29, 2, 7, 17,
+   -52, 12, -32, 8, 17, -10, -41, -28,
+   -28, 56, 18, -39, 12, 64, 11, 2,
+   12, -22, 37, 5, 6, -10, 6, 42,
+   6, 3, -40, -122, -19, -5, -12, -14,
+   37, -9, 13, -16, -54, -12, -26, 5,
+   31, 0, -2, 100, -15, -12, 21, -22,
+   -13, -3, -45, -118, 39, 14, -90, 73,
+   -52, 10, 6, -116, -6, -60, 32, -39,
+   -35, 42, -12, -76, -16, -105, -9, -54,
+   71, 92, -121, -24, -123, 16, -26, -62,
+   -65, 0, 32, -24, 12, 24, -5, 59,
+   15, 21, 4, 5, 3, -4, -5, 36,
+   0, -20, 64, 3, 27, 16, 8, 14,
+   -2, 47, 33, -73, -24, 65, 46, 63,
+   5, -46, 49, 14, 3, -45, 44, 39,
+   -50, -45, 11, 0, 31, -87, -52, 12,
+   61, 92, -78, -41, -44, 42, -67, -9,
+   36, 94, -5, 71, 23, -7, -11, -52,
+   -5, -45, -11, 28, 57, 17, -7, -36,
+   -52, 3, -27, -12, -6, -62, 29, -71,
+   8, 27, -31, 21, -38, -58, 3, -12,
+   -69, 8, -54, 91, 22, 90, -11, -126,
+   23, -9, 67, -44, -3, -30, 22, 47,
+   21, 1, 38, 21, -85, 1, 26, 2,
+   46, 8, 3, 22, -1, -39, -28, 26,
+   -3, 16, 26, -35, -22, 34, -17, -26,
+   88, 30, 3, -19, -8, 9, -48, 0,
+   16, 4, -72, 67, -24, 57, 56, 23,
+   31, -7, 28, -23, -40, -14, 32, 7,
+   -1, -40, -9, -60, -2, 62, -16, -14,
+   -36, 28, -52, 0, 10, -1, 11, -2,
+   -31, -89, -3, -55, 1, -29, -83, -16,
+   -5, -39, -15, -41, -48, -20, -35, 49,
+   -31, -10, -2, 9, 15, 21, 62, -19,
+   -1, -42, -21, 34, -31, -1, -3, -18,
+   45, 17, -55, -10, -20, 6, -31, 21,
+   6, -14, -20, 7, -101, -5, -45, -1,
+   16, -21, -6, -12, 21, 73, -9, -17,
+   4, -2, 15, 9, 23, 7, 10, 20,
+   6, -11, 36, 30, 14, 22, 6, -5,
+   15, -31, -55, 13, -15, 7, -14, 38,
+   15, 22, -8, 36, 12, 6, -5, 56,
+   13, -31, -24, -16, 46, 25, 30, 6,
+   40, 0, -8, 100, 9, 43, 26, -86,
+   -47, 54, -119, -18, 36, 49, -38, 53,
+   27, -6, 122, -25, 125, -18, -108, -111,
+   91, -10, 87, 10, -120, -28, 21, -126,
+   -12, 42, -3, -76, -2, 58, -32, 75,
+   -13, -59, 22, -50, 89, -16, 23, 16,
+   1, 7, 89, -10, -19, 12, 54, -25,
+   -6, 124, 71, -13, 10, -7, -49, 9,
+   -10, -69, 76, -118, 33, -44, 41, -3,
+   -6, -46, -59, -126, 8, -76, -79, -34,
+   7, -93, -2, -25, -25, -50, 16, -66,
+   -41, -77, -14, 16, -83, 22, -12, -68,
+   7, 44, -2, -45, 22, 20, 45, 15,
+   21, -47, -71, 69, 25, -9, -5, 45,
+   127, 14, 21, -32, -18, -30, -3, -75,
+   22, -22, 19, -49, -3, -43, 4, 6,
+   2, 17, 36, 23, -77, 14, -36, -25,
+   34, -12, 37, 7, 83, -56, -14, 6,
+   -3, 2, 12, -40, -61, 48, 10, 96,
+   95, -19, 0, -15, 17, -66, -30, -28,
+   63, -81, 15, -126, -18, 36, -47, 7,
+   45, 17, -43, 13, -36, 35, 22, -9,
+   -44, 77, 0, 22, 4, -2, -17, 25,
+   -45, 82, -101, -5, -40, -5, 15, 32,
+   -23, -45, -51, 1, -57, -11, 120, -7,
+   91, 9, -24, -42, 37, 100, 80, 20,
+   -5, -125, 88, 11, -124, 42, -35, -127,
+   120, -123, 41, 125, -124, 21, -76, 81,
+   29, -11, 61, 15, -120, -115, -17, 79,
+   111, 74, 20, 63, 127, -42, 28, -26,
+   -30, -116, -71, -73, 98, 110, -114, 3,
+   -48, 2, 4, -64, -40, 36, -14, 18,
+   61, -16, -36, 12, 27, -11, -32, 124,
+   -34, 65, -51, -43, 53, 45, -44, -6,
+   13, 33, -25, -15, -119, -51, -26, 124,
+   118, 16, 18, -121, -33, -58, -79, 26,
+   18, -77, -12, -95, -79, -38, 23, 32,
+   83, 125, 17, 77, -32, 127, 104, -56,
+   -18, -9, -80, 17, -125, -127, 123, -61,
+   38, -1, -78, 22, 10, -21, 3, 126,
+   -125, 123, 49, -47, -126, 89, -113, 127,
+   89, -29, 15, -62, -128, 44, -5, 120,
+   123, 120, -15, 105, -126, 111, 25, -127,
+   -122, -127, 115, -65, 122, 24, -2, 38,
+   -88, 20, 20, 70, -7, -77, 50, 25,
+   73, 117, 20, 114, 93, -52, -125, 118,
+   -43, 127, 5, -8, 36, 22, 122, 42,
+   -128, -120, -123, -52, 127, -124, -125, 96,
+   1, -35, -76, 62, 60, 46, -102, -5,
+   70, 66, 13, 127, 2, 126, 77, 88,
+   -63, -91, 103, -7, -110, -128, -45, -127,
+   100, 109, 18, -51, 61, -18, 47, -127,
+   57, 13, 46, 23, 127, 127, 127, -52,
+   -66, -24, -68, -1, -126, -15, 10, -2,
+   33, -61, -127, 119, -75, 127, -34, 126,
+   127, -61, -1, 60, -9, -42, 22, -123,
+   19, -41, 50, 27, -46, -3, -75, -12,
+   -75, -55, -90, -99, 14, -2, 90, 47,
+   -35, -108, -78, 34, -27, -77, -21, 38,
+   32, 34, -115, 84, -62, -14, 33, 18,
+   30, -122, -3, -3, 10, 99, -7, 4,
+   51, 92, 9, 69, 23, 125, -60, -19,
+   25, -26, 3, -62, 92, 116, 20, -11,
+   86, -34, 105, 25, -98, 17, 45, -54,
+   -70, 58, -114, 38, 5, -51, -36, 56,
+   121, -55, 21, 68, -127, 76, -35, 28,
+   28, 49, -113, -30, 112, 125, 82, -12,
+   -68, 55, 17, 64, 14, 53, -25, 124,
+   -44, 84, -70, -60, 80, 35, -66, 88,
+   -25, 77, 107, -63, 125, 48, -101, 127,
+   -7, -50, 13, -12, -124, -109, -53, -87,
+   66, 81, -51, -79, 76, 8, -8, 106,
+   -26, -85, -113, 88, 99, -40, 84, 62,
+   106, -125, -124, 3, 75, 127, -22, 2,
+   76, -47, -128, 46, 127, -71, -40, -127,
+   -117, 9, -22, -92, -60, 72, 35, -128,
+   -74, 77, -117, -95, 123, 49, 127, -9,
+   8, -125, -58, -67, 127, 126, -128, -20,
+   126, 115, 122, 110, -127, 116, 0, -118,
+   -102, -126, -34, 56, -125, -87, 81, 19,
+   -95, 42, -4, -101, 80, -10, -62, -21,
+   -55, 127, 77, -128, -126, 127, -127, 109,
+   -95, -128, -80, -126, 81, 70, 122, 69,
+   -70, 101, -24, -22, -4, -43, -126, 77,
+   -51, -54, -122, 123, 41, -5, -50, -63,
+   4, -12, -103, -126, 115, 127, -88, -32,
+   -79, -125, -83, 95, 61, 56, 48, 127,
+   121, 60, 75, -3, 35, 22, 64, 126,
+   127, 83, 121, 46, -72, 117, -127, -83,
+   -128, 34, 31, 49, 121, 46, -53, -51,
+   6, 27, -124, -4, -119, 72, -119, -126,
+   57, -83, -61, 31, 83, -76, -119, -96,
+   -55, 101, -62, -128, 3, -36, -42, -61,
+   57, -124, 59, 25, 2, -116, 127, 95,
+   36, 127, -84, 80, -34, 35, 21, 49,
+   9, -12, -17, -39, -91, -24, 30, 40,
+   -26, 79, 30, -57, 23, 78, 114, 55,
+   -66, -34, 42, 64, -40, 105, 36, 127,
+   -43, -122, 35, -60, -73, 83, -44, -15,
+   102, -126, 35, 37, -122, -50, -44, -5,
+   -76, 10, 6, -89, 16, -70, 24, 79,
+   -41, -98, 100, 72, 108, 7, -71, 27,
+   25, -12, -128, -9, 127, 103, 50, -60,
+   -82, -39, 77, -46, 32, -1, 85, 124,
+   -9, 2, 43, 28, 122, 0, 1, 59,
+   13, 38, 120, 7, 113, 15, -10, 101,
+   79, 88, 121, -126, -126, -76, -41, -122,
+   -13, 79, -126, 102, 73, 126, -56, 99,
+   -58, 32, 127, 17, 12, -99, -120, -127,
+   101, 96, 79, -104, 126, -50, 115, 43,
+   -105, -50, 127, 71, -126, 73, 16, -29,
+   -94, 103, -126, -96, -113, -63, 87, 127,
+   -124, 94, -67, -123, 124, 19, 22, 76,
+   19, -111, 15, 87, -128, 123, -19, 88,
+   53, 120, 127, -116, -117, 108, 100, -99,
+   -127, 127, 119, 12, 103, 51, -121, 21,
+   -90, -126, 85, 98, 13, 27, -42, -102,
+   123, 26, 127, -91, 118, 121, 126, 123,
+   -117, 121, -41, -124, 82, 127, 118, 126,
+   -124, 100, 64, -62, 127, 88, -22, -89,
+   8, -63, -114, -125, 35, -42, 55, 68,
+   19, 37, 23, -127, -123, -126, -6, 121,
+   56, 73, -64, 121, 9, 88, -25, -115,
+   125, -42, 126, -91, 84, 18, 115, -79,
+   126, -17, -24, -83, -128, 42, 54, -75,
+   -104, 123, -108, 60, 50, 18, -121, 34,
+   -84, 97, -128, 27, -125, 70, -43, 20,
+   73, 19, -80, 115, 79, 16, -87, -107,
+   -17, 2, 103, 71, -17, 126, -55, -108,
+   -33, -115, 121, -5, -33, -4, 30, 125,
+   72, -64, -12, 124, -8, -38, 127, -63,
+   -48, -40, 101, -67, 123, -19, -55, 6,
+   -23, -29, 79, 62, -46, 69, -119, -44,
+   13, -33, 114, -126, 3, -106, 103, 126,
+   -17, -6, 27, -46, 125, -29, -76, -6,
+   54, -89, 10, 119, -125, 52, 123, -19,
+   -44, -9, 47, -35, -101, -59, 59, 81,
+   -64, -43, 22, 13, 38, 22, -42, 24,
+   45, 52, -89, -117, -17, 87, -94, -37,
+   -119, 13, -30, -59, -127, 68, -2, 48,
+   -125, -27, 97, 17, 67, 63, -19, 32,
+   10, -54, -39, -1, 32, -26, 27, 16,
+   25, 84, -34, -37, -117, -64, -103, -77,
+   -126, 90, -102, 55, 84, 20, 91, -32,
+   15, -7, 126, 41, 82, 40, 100, 30,
+   125, -39, 13, -67, 57, -126, 121, 105,
+   113, 45, -128, 31, 127, 124, -79, -49,
+   39, 21, -123, 65, -29, 46, 53, -105,
+   -36, -16, -61, -124, -92, -114, 123, 7,
+   -32, -126, -28, -53, -102, 18, -124, -62,
+   -102, 13, 127, -128, 127, 80, 49, -16,
+   -105, -128, 49, -34, 74, -127, -53, -61,
+   -111, -96, 67, 25, 16, -22, -23, -123,
+   -125, -59, 53, 111, 104, -127, 123, 38,
+   15, 68, -3, -125, -74, -119, 43, 124,
+   -128, 127, 89, 27, -20, 30, 127, -63,
+   3, 17, -13, 125, -39, 106, 32, -32,
+   75, -42, 17, 127, 102, -128, -70, 126,
+   46, -10, 82, 99, -86, -44, 96, 51,
+   81, 34, 88, -105, 58, -40, 46, 126,
+   -20, 78, 80, 16, -40, 116, -70, -69,
+   -8, -25, 45, 87, 3, 30, -40, -8,
+   11, 127, -127, -13, 75, 125, 38, -110,
+   63, 21, 15, -42, 55, -115, -72, -117,
+   121, -120, 0, -119, -17, -125, 34, -128,
+   35, -1, 31, -92, 69, 62, 16, 17,
+   -120, -37, -50, -17, -2, -1, 84, -33,
+   -58, -67, 125, 38, 127, 11, -128, -99,
+   86, 40, -104, 34, -14, -39, -29, 39,
+   126, 21, -85, -105, 122, -127, -72, 114,
+   -62, -25, -91, 122, 16, -80, -14, 20,
+   127, -108, -22, -13, -125, -1, -80, -48,
+   37, -16, 11, 114, 30, -9, -3, 12,
+   -70, 31, 31, 22, -94, 120, -57, 3,
+   -75, 120, -115, 33, -101, 67, -81, 67,
+   -114, -11, -116, -57, -81, -109, -109, -123,
+   -125, -27, 36, 1, -2, -127, -9, -14,
+   -37, -125, -104, 14, -49, 14, 49, 8,
+   94, -43, -17, 95, -126, 2, -110, 113,
+   -127, 118, 30, 3, -13, 15, 13, 30,
+   -52, 105, 75, 31, 123, -91, 122, -7,
+   116, -52, 70, 126, -127, -128, 78, 116,
+   -64, 108, 82, -51, -127, 64, -120, 127,
+   -111, -64, 90, 112, -29, -76, 5, 126,
+   3, -11, 64, 94, -117, -32, -4, 54,
+   -20, -121, -85, 115, 115, 126, 15, 80,
+   44, -27, 8, 126, 125, 119, -92, 39,
+   -122, 111, -52, -20, -111, -64, 1, 90,
+   -63, 85, -71, 1, 123, 85, 57, -124,
+   -14, 112, -73, -104, -90, 127, 127, -76,
+   -55, 21, 85, 125, 103, 55, 120, 126,
+   -127, 109, 116, -125, 25, 53, 127, 96,
+   -47, 50, -102, 43, -3, 127, 126, -4,
+   117, -4, 7, 124, -121, -48, 59, -6,
+   125, -98, -83, -123, -113, 17, -123, 82,
+   113, -122, 125, 60, 92, 14, 22, -127,
+   33, 18, 1, -21, -82, 105, 38, -75,
+   98, 107, -89, 2, 123, -83, -55, 91,
+   -64, 127, -69, 91, 126, 74, 33, -85,
+   112, 5, -35, 29, -69, -36, 35, 126,
+   34, 126, 121, 124, -61, 103, -123, -128,
+   15, 78, -124, -56, 109, 52, 52, -56,
+   -83, -28, 107, -128, 23, -79, 126, 126,
+   -4, -46, 38, -115, -109, 119, 16, 87,
+   11, -76, 54, 118, 13, 45, -55, 18,
+   94, -69, 14, 127, -120, -126, -98, 87,
+   100, -42, -44, 42, 18, 121, -128, -47,
+   -51, 3, -87, -28, -115, -46, 104, 89,
+   -88, 83, -112, 49, -17, -13, 43, 30,
+   9, -76, -111, 55, -41, 21, -4, -53,
+   -119, -16, -128, -9, -10, 46, -7, -50,
+   -124, -100, -27, -44, -26, -56, 23, 7,
+   -128, -2, -65, 45, 80, -107, -102, -14,
+   -8, -57, -120, -19, -58, -15, -43, 50,
+   -32, -13, 8, 108, -127, -66, -54, 123,
+   -127, 127, -85, 110, -108, 118, 6, -42,
+   -116, 108, 95, -23, 94, -2, -45, -126,
+   -34, -124, 43, -124, -73, -122, 127, 90,
+   64, 49, 126, 43, 127, -126, 122, 127,
+   33, -67, -128, 100, -125, -9, 92, -128,
+   -123, -21, -65, 125, -93, -125, 124, -119,
+   64, 6, -116, 4, -127, -86, 125, -128,
+   80, -89, -127, 127, -29, 125, -13, -71,
+   -86, -128, -124, 126, -53, -37, -117, -4,
+   -47, 126, 21, -98, 125, -45, 52, -124,
+   42, -22, -128, 120, 124, 126, 11, 127,
+   56, 99, 31, 121, 127, -122, 125, 116,
+   -117, 43, -65, -27, 124, 57, 126, -96,
+   3, -42, -67, 28, 30, -102, -45, -56,
+   4, -42, 69, -127, 43, 61, -79, -127,
+   -6, -13, -96, -5, 49, 37, -57, -100,
+   126, 36, 61, 22, 55, -114, -58, 116,
+   91, 30, 78, -48, 103, 16, -42, -58,
+   108, -17, -21, 126, -120, -127, 77, -19,
+   71, 126, -10, 49, 36, -44, -23, -110,
+   -34, -112, -26, -118, 48, -65, 23, 125,
+   24, 124, 84, -127, -69, 54, -124, -126,
+   82, -2, -118, 14, -2, 31, 122, 33,
+   124, -57, 44, -128, 22, -51, 111, 126,
+   20, -121, -30, 108, 115, -58, -62, -106,
+   -116, 61, -25, 127, -120, -82, 29, -117,
+   -103, 90, -62, 125, 63, 52, -41, 12,
+   75, 12, -100, 73, 41, 69, 4, 95,
+   -87, 74, -72, -65, -85, -36, -29, -60,
+   24, 65, 123, -34, 31, 88, -53, 15,
+   11, 34, 46, 4, -101, -97, -37, -85,
+   -14, 19, -16, -101, 76, 38, 8, -11,
+   -127, -103, -103, 118, 48, -27, -69, -78,
+   -77, -125, 29, 24, 10, 30, 32, -111,
+   -35, 23, -41, -96, 41, -22, 14, -44,
+   123, 12, -116, 100, -121, -22, -116, -36,
+   -123, 118, 73, -45, -81, 37, 113, -28,
+   77, 30, -21, 108, 124, 41, 57, 108,
+   67, 31, 13, -125, -51, 75, 2, 97,
+   -9, 59, 58, 67, -128, 100, -124, 126,
+   126, 56, -22, 53, -18, -73, -125, 123,
+   -124, -23, -1, 6, 68, -29, 117, -125,
+   45, -120, -37, 117, 126, -6, 121, 121,
+   -24, -124, 6, 52, -121, 108, -76, 0,
+   -89, 124, -125, 107, -128, 92, -42, 127,
+   -127, -81, 64, -33, 127, 82, 91, -127,
+   -121, -43, -35, -127, -124, 127, 90, -49,
+   -122, -100, -18, 125, 41, 60, 118, 127,
+   59, -77, -105, -119, 18, 102, -70, 71,
+   -65, -37, 54, -127, 39, 107, 124, 55,
+   79, -30, 72, -128, -104, 110, -52, -127,
+   64, 26, 64, 90, -124, -42, -123, -66,
+   -34, 19, -13, 126, 34, 55, 39, -100,
+   62, -24, -69, 95, 42, -32, 37, -114,
+   120, 117, 6, 126, 124, -16, 120, -34,
+   -122, 126, 49, 125, -14, -72, 116, -125,
+   33, -128, -111, 122, -102, 121, 18, 123,
+   -83, 124, -78, 31, 95, 55, -96, -127,
+   -123, -3, -125, -1, -47, 121, 8, -47,
+   -127, -23, 124, -124, 39, -128, 127, 127,
+   2, -69, 1, 24, -40, -45, 30, -51,
+   -66, -13, 8, 43, -2, -35, -85, 127,
+   -1, -41, 117, 125, 79, 91, -56, -106,
+   -66, -89, -49, -22, -28, 95, -128, 9,
+   -128, -106, 40, -43, -128, 77, 20, 85,
+   -38, 78, 31, 18, -94, 57, 8, 127,
+   119, -33, -38, 5, -18, -77, 115, -60,
+   -43, 46, 122, -43, -22, 19, 11, -34,
+   -127, -56, 27, 88, 110, 49, 71, 127,
+   76, 57, 127, 40, -62, 22, 43, -123,
+   -109, 46, -105, -97, 124, -20, -8, -88,
+   -109, -47, 30, 55, -127, 47, -42, 11,
+   -43, 121, 21, 48, -126, -78, -29, 53,
+   21, -18, -128, 39, 51, -76, 113, 20,
+   127, -23, 40, 115, -27, 123, 94, -71,
+   -69, 39, -26, 8, 127, -42, 107, 126,
+   11, 42, -87, -39, -77, 73, -35, -121,
+   -77, -64, -72, 121, -109, -47, -64, 58,
+   -87, 70, -36, 122, -51, -42, 48, -53,
+   -36, -121, -22, 124, 115, 47, -78, 74,
+   -108, -128, -90, 52, -70, -120, 29, -61,
+   49, 112, -20, -51, 69, 27, 34, -127,
+   125, -124, -81, 53, -127, 114, 127, 6,
+   -89, 124, -16, 34, 116, -58, 17, 124,
+   80, -77, -128, 122, 76, 19, -127, -55,
+   59, -2, 7, 109, 22, -8, 76, 26,
+   -51, -97, -77, -30, 36, 127, -123, -125,
+   114, 39, -15, 127, -40, 127, 91, -88,
+   3, 13, 109, -29, 123, 32, -123, 51,
+   127, -120, 1, 57, 96, -128, 25, -107,
+   76, 127, 114, 122, 3, -17, -2, 13,
+   -45, 126, 52, -37, 127, -37, -17, 7,
+   33, -121, -120, -51, -51, -55, -122, 43,
+   -127, 87, -124, -124, 79, -121, 16, -125,
+   -75, 9, -106, -47, -127, 127, -107, -8,
+   127, -66, 123, -122, -13, 76, 127, -94,
+   116, -126, -23, 117, 49, -93, 14, -71,
+   43, -121, 47, 94, -123, 127, 18, 63,
+   -94, 112, 122, 38, 34, 4, 119, -121,
+   9, 4, -125, 92, -122, -100, 123, -6,
+   -65, 80, 77, -116, -124, 41, -119, 37,
+   61, -15, 119, 116, -15, 46, -40, 103,
+   47, 62, 122, -37, -17, -17, 43, -4,
+   -29, -30, -87, -9, 116, -60, 10, 25,
+   -125, 74, -124, 55, -8, -105, 37, -122,
+   68, -128, -126, -21, -104, -117, 36, -120,
+   -21, -126, 9, -31, 9, -20, 52, -18,
+   67, -69, -124, -31, -126, 121, -46, 18,
+   -86, 89, 87, -75, -72, -68, 127, 23,
+   -50, 70, 89, 76, 104, 46, 111, 19,
+   47, -26, 28, 125, -66, -78, 48, 96,
+   -7, 64, 108, 65, -125, -9, -122, 126,
+   118, -78, 69, 127, 22, -36, 93, 127,
+   87, -26, -70, 48, 31, -42, 3, 115,
+   87, -120, -43, 121, 53, 8, -127, 124,
+   -117, -125, 20, 78, 48, 127, -126, -73,
+   -80, 124, 97, 127, -126, -29, 123, 123,
+   -61, -20, 86, 18, 120, 112, -3, -128,
+   17, -125, 57, -128, -122, 79, -10, -125,
+   121, -16, 50, -39, 125, 33, 17, 124,
+   108, -121, -81, -49, -122, 105, -123, 71,
+   -72, 97, 87, -125, 127, -121, -15, -31,
+   72, 75, 82, 126, -122, 108, -71, -60,
+   87, 2, 127, 12, -92, 53, -127, 119,
+   -76, -12, -128, 0, 118, 3, 127, 56,
+   93, -120, 14, 24, -1, -122, -5, -80,
+   67, 126, -62, 27, 124, 123, 7, -34,
+   -79, 127, 102, 122, 113, -40, 67, -3,
+   126, -109, -38, 87, -68, 1, 22, 124,
+   -126, 121, 125, -35, 31, 120, -74, -128,
+   -59, 79, 116, -54, -124, 127, -55, -120,
+   -123, 35, 116, 98, -35, -127, 105, -127,
+   62, 73, -10, 53, -19, 116, -116, 83,
+   10, -119, 123, 83, 127, 62, 118, -122,
+   -45, 40, 11, -31, -57, -52, -14, -119,
+   -29, 105, 62, -127, 120, -112, -29, -51,
+   -94, -33, 33, 86, -49, 80, -6, 72,
+   -110, 93, 2, -34, 107, 113, 127, 121,
+   50, -70, -127, -64, 31, 13, 96, -31,
+   -25, 45, 126, -17, -9, 57, 80, -3,
+   -104, 35, 106, 33, -46, -124, 83, -89,
+   -76, -73, 58, -37, -46, 59, 79, -125,
+   -67, -36, -62, 50, -19, -95, -52, -112,
+   56, 26, 110, -89, -92, -75, -100, 46,
+   16, 31, 3, -127, -118, -47, -126, -8,
+   -28, 54, 125, 30, -126, 13, -33, 99,
+   -38, -119, -107, 9, 117, -127, 93, 61,
+   65, -72, -118, 15, 119, 80, 66, 127,
+   -100, 126, 127, 28, 98, -77, -35, -19,
+   -54, 6, 35, 124, -127, 127, 56, -80,
+   -68, -49, -1, 126, 62, -50, 51, 53,
+   -22, -75, -72, -22, 70, -62, -67, 48,
+   86, -125, 14, 126, 14, -76, -11, -76,
+   -97, 127, 44, -87, -120, -21, -63, -125,
+   -2, -106, 51, 39, 70, 94, 55, -124,
+   27, 15, -123, -47, 88, -128, -113, 81,
+   61, -127, -105, -124, 15, -84, -8, -90,
+   -48, -25, -8, 77, -62, -127, 86, 19,
+   26, -118, -46, -26, 109, 10, -19, 127,
+   -68, 127, -88, 69, -121, 27, -102, -15,
+   3, 26, 19, -55, -14, -5, 58, 11,
+   15, -114, -121, 114, 126, -117, 56, -37,
+   31, 123, 19, 127, 116, -65, -118, -122,
+   -24, 127, 26, -67, 127, -128, -24, 12,
+   127, -33, 13, -51, -13, 127, -114, -34,
+   -126, 127, -87, -119, -123, -59, 11, -123,
+   -24, 49, 123, 122, -80, 127, -69, -44,
+   127, -70, 51, 124, 117, -124, -48, -128,
+   118, -60, -67, 124, 116, -31, 39, -94,
+   -21, -78, -18, 4, -128, 6, 77, 69,
+   108, 126, 82, -127, -23, -118, 56, -125,
+   -127, 24, -121, 29, 53, -117, 123, 38,
+   -25, -12, 55, 62, -67, 87, 44, -51,
+   70, 17, 109, 44, -69, 125, 104, 125,
+   62, 59, 114, 25, -124, -30, 124, 32,
+   41, 6, 126, -55, 1, -41, 58, 1,
+   -108, 26, -31, 32, 58, 85, 123, 41,
+   68, -15, 85, -80, -127, -103, 44, -113,
+   125, 5, 10, -36, 117, -77, 112, -111,
+   78, 51, 74, -112, 47, 95, -113, 121,
+   16, -48, 127, 17, 7, -125, 126, 25,
+   -113, 103, -126, 126, 119, 61, 31, 4,
+   -43, -119, 27, 125, 88, 48, -125, 84,
+   -57, 32, 21, 15, -127, -127, -126, 127,
+   110, -28, 90, 88, -49, 71, -51, 120,
+   82, -43, -75, 96, 125, 19, -4, 125,
+   -61, -33, -35, -85, 122, -24, -111, 124,
+   -110, -126, -44, 111, 59, 27, -126, -49,
+   52, 102, -95, -120, -127, 121, 50, 50,
+   93, -4, -20, -56, 127, -35, 28, -128,
+   112, -59, 127, -127, -123, 104, 100, -128,
+   111, -71, -6, -114, -71, 72, 120, 127,
+   127, -117, -17, -19, -122, 39, -66, 124,
+   -99, -18, 33, -89, 124, -107, 29, -103,
+   126, -7, 53, 124, -117, 122, 15, 124,
+   125, 42, 125, -53, 64, 7, -33, 127,
+   -126, 106, 69, -18, 78, -48, 57, -124,
+   -86, -127, -116, -85, -74, -66, -119, -24,
+   15, 22, 9, -82, -5, 52, -2, 8,
+   -105, 127, 21, -47, 53, -128, 107, -12,
+   97, -30, -37, 121, -68, 127, 74, -2,
+   -58, 126, -124, 68, 105, -53, -126, -60,
+   -48, 51, 127, -116, -124, 127, 17, -124,
+   -123, 41, 127, 127, 3, -127, -101, -121,
+   83, -111, 111, 125, -126, 62, -5, 49,
+   94, -87, -51, 62, 117, 126, 124, -95,
+   5, 93, 122, -124, -117, 74, -53, -118,
+   -27, -46, 127, 12, 112, -68, -93, -109,
+   108, -119, 52, -7, -71, 97, -123, 121,
+   38, 68, 85, 2, -87, 123, -124, 126,
+   69, -26, -57, 14, 127, -46, 89, 25,
+   -115, -27, 56, 124, -34, -14, 2, 73,
+   -128, 4, 118, -94, 117, -77, 124, 76,
+   -34, 3, 16, -42, -77, 45, 11, -116,
+   -32, 101, 24, 127, 92, -92, 126, -98,
+   -124, 111, 36, -113, -127, 98, -10, -10,
+   124, -93, -12, -116, 103, -126, -115, -47,
+   -126, 113, 34, 66, -55, -13, 95, 119,
+   -49, -43, 74, 127, 121, 124, -117, 25,
+   75, 117, -123, -9, 123, -118, 127, 126,
+   -86, -46, 99, 102, -126, 54, 126, 125,
+   91, 21, -86, 103, -127, -121, -35, 127,
+   -127, 65, -37, 123, -117, -56, 44, 58,
+   -123, 91, 13, 124, -8, -44, -123, -101,
+   127, -125, -85, -1, -63, -9, -111, -100,
+   -19, 118, -20, -94, -127, 7, -123, -128,
+   -18, -124, 108, 125, 109, -49, -76, -77,
+   11, -28, -126, -85, 126, 108, 116, 118,
+   79, -72, -39, 23, -60, -87, -29, -102,
+   79, 81, -14, 124, -64, -120, 109, 61,
+   -122, -77, 102, 127, -16, 119, -113, 103,
+   119, 118, -72, -82, -31, 127, 121, -49,
+   -13, 123, 124, -42, 124, 2, -74, 94,
+   12, -125, 44, -74, 17, -127, 103, -14,
+   11, 58, 17, -13, 62, 86, -127, 79,
+   -122, 121, -23, -87, 91, -128, -123, 100,
+   127, -85, -62, -127, -23, 121, -13, -69,
+   55, 94, 123, -119, 116, 111, -17, -35,
+   -77, -5, 126, 28, -31, 126, -42, -54,
+   127, 49, 86, 127, 60, 25, -128, -116,
+   62, -110, 113, 118, -26, 0, 69, -75,
+   116, -31, -115, -2, -112, -127, -61, -5,
+   -122, 44, -119, 117, 87, 26, -50, -115,
+   -122, 70, -110, -94, 65, -23, 125, 33,
+   -125, 103, 91, 123, 109, 123, -17, -13,
+   126, 46, 17, -102, -33, 125, 117, 120,
+   97, -82, 109, 14, 24, -24, 63, 16,
+   62, -3, 61, 42, 71, -38, -73, 72,
+   -127, 70, -68, -67, -36, -7, 90, -125,
+   124, -122, -117, -24, -78, 0, 113, -19,
+   -60, 52, 68, -7, -126, 10, 79, -22,
+   57, 22, 100, 126, -15, 66, -113, -85,
+   122, -128, -12, -58, 127, -125, 64, 105,
+   45, 107, 117, 88, 29, 62, 122, 106,
+   -83, -121, 7, 44, -97, -125, -127, 72,
+   2, 28, 118, 9, -124, 79, -57, 99,
+   38, 127, 43, 90, 26, -34, -59, -125,
+   118, 43, 24, 55, 127, 96, 49, 1,
+   -116, 106, -5, -90, 115, -48, -53, 127,
+   -39, 18, 125, -54, -124, 116, 18, -58,
+   -91, 68, 102, -8, -22, 110, -86, 88,
+   90, 121, -46, 19, -45, 113, -34, -119,
+   -68, 5, 3, 18, 106, 20, -127, -119,
+   127, -91, -45, 24, 119, -61, -69, 81,
+   56, -77, 104, -58, -107, -100, -46, 15,
+   45, 62, 108, 71, 6, 114, 11, 8,
+   -31, 9, 126, 127, 125, -86, -42, 15,
+   125, 81, 127, 89, -90, -53, -112, 12,
+   -34, 81, 79, 0, 127, -1, -124, 16,
+   1, -32, 127, -32, -92, -125, -77, 3,
+   85, 110, -18, -15, 51, 54, -83, -19,
+   -93, 65, -22, -3, -98, -128, -29, -84,
+   121, -125, -29, 27, 46, 119, 37, 125,
+   -96, 49, 119, 85, -40, 1, 92, -96,
+   34, 18, 15, 44, 58, 127, -27, 20,
+   10, 124, 44, -13, -108, 17, -128, 61,
+   37, 11, 73, 61, -28, 27, -96, 67,
+   29, 99, 53, -51, 125, 119, -59, -12,
+   -60, 30, 67, 121, -43, 64, 103, -11,
+   -20, 31, -81, 55, 66, -127, -39, -19,
+   -13, -122, 98, 69, 32, 46, -127, 111,
+   -36, 113, -72, 70, -65, 56, -125, 94,
+   47, -82, -117, -111, -58, -128, 32, -10,
+   51, 13, 99, 31, -27, -36, -52, 24,
+   33, -97, -98, -31, -86, -125, 122, -52,
+   -86, -107, 50, 57, -82, -124, 16, -93,
+   -108, 84, -52, -10, -92, -85, 83, 3,
+   -110, 127, 116, 76, -43, -42, -103, -111,
+   121, -120, 8, 37, 50, -122, -115, 34,
+   -22, -84, 127, 9, -19, 36, -126, -34,
+   -39, -118, -15, -112, -3, -80, -69, 77,
+   23, -73, -112, 44, 100, 51, 99, 38,
+   -112, -5, -69, -56, -120, 123, 113, 72,
+   84, -64, -51, -123, -90, -59, 3, -105,
+   -110, -3, 47, 117, -20, 123, 112, -7,
+   -120, -52, 85, 24, -36, -128, -51, -27,
+   -5, -90, -6, 103, -54, -89, -40, -116,
+   -42, 125, 111, -22, -126, 7, -93, -127,
+   -119, -67, -94, 127, 123, -118, -108, 27,
+   15, 1, -17, 23, 127, 45, -125, 124,
+   50, -68, 58, 47, 127, -125, 14, 56,
+   -51, -30, 36, 126, -113, 105, 119, -25,
+   -32, -43, 115, 44, -104, -57, -23, -33,
+   19, 22, -20, 26, 22, -95, -29, 9,
+   -32, 7, 107, 35, -47, -29, 2, -21,
+   55, -126, -90, -128, 3, -125, 127, -33,
+   74, 54, 121, 60, -77, 126, 65, -21,
+   18, 4, -70, -126, 48, -127, -20, -9,
+   30, -125, -125, 88, 58, 121, -69, -63,
+   -31, 125, -14, -125, -46, 26, 28, 20,
+   -115, -72, -120, 27, 127, 125, -71, 25,
+   123, -28, 122, -126, 61, -29, -124, 62,
+   101, -93, 47, -2, -120, -59, -97, 46,
+   -69, 127, 6, 74, -125, 83, -87, -123,
+   -30, 20, -74, 55, 71, -83, -123, 125,
+   36, 3, 4, 112, 64, -120, -18, 126,
+   37, -91, 63, 52, 32, 81, -71, -76,
+   50, -12, 17, 120, -105, 23, -106, 78,
+   -96, 60, 75, 57, -50, -11, -40, -65,
+   -111, 11, 25, 87, -97, -31, 35, -34,
+   -56, -8, 3, -122, -9, -39, 123, -127,
+   -127, -29, -124, 63, 84, 102, 44, 11,
+   80, -56, 41, -102, -13, 125, -95, -55,
+   50, 51, 5, 112, 100, -48, -17, -53,
+   0, -112, 14, -30, 61, -7, 32, 38,
+   89, -125, 122, 40, 35, 100, -1, -37,
+   -13, -73, -25, -37, -89, 126, -121, 18,
+   79, 76, 115, 21, -7, -54, -50, 124,
+   118, 100, -118, 92, -4, -117, 90, -107,
+   104, 40, 81, 16, 119, 93, 61, 126,
+   -127, -40, 25, -36, 16, 66, -5, -27,
+   -101, 57, 95, 114, 79, 13, -41, 5,
+   -12, -38, 13, 71, -55, -57, -76, 127,
+   16, 73, -31, 33, 75, -76, 25, -125,
+   3, -5, -61, -35, 119, -22, -114, 50,
+   -50, -59, 87, 69, 118, 70, 8, 126,
+   11, -30, 126, 18, -125, -39, 16, 37,
+   60, -120, 119, -20, 7, 26, 99, 12,
+   -38, -1, 103, 119, -22, -6, 24, -110,
+   111, 24, 110, -125, 24, -1, -85, -9,
+   42, -51, 113, 123, 6, -111, -37, 19,
+   1, -124, 127, -127, -32, -128, -104, 13,
+   89, -4, 92, -92, -114, 0, 120, -62,
+   2, -13, -36, -33, 127, -128, 51, -19,
+   52, -126, -54, 119, 51, 77, 123, 127,
+   40, 86, 77, 38, -15, -69, 28, 8,
+   13, -2, -127, -96, 121, 29, -1, 55,
+   67, 75, 127, -127, -41, -27, -108, 68,
+   18, -11, 40, 8, 127, 25, -52, 2,
+   -110, 18, 115, -70, 8, 117, -87, 22,
+   36, -16, -110, -14, 66, -54, -49, -57,
+   -7, -99, 42, -27, 28, 39, -64, 35,
+   18, 12, 109, -111, 77, 22, -120, 56,
+   -4, 75, -39, -102, -47, 18, -115, 121,
+   -22, -81, 54, -81, 13, -11, -125, -28,
+   112, 17, -74, 118, -5, -31, -6, 11,
+   -116, 28, -69, 10, 84, -121, -62, 46,
+   -127, 4, -33, -28, -9, 54, -25, 29,
+   -11, 105, -113, -124, 45, 17, -91, 74,
+   -107, -40, -89, 49, -43, -51, -70, -43,
+   69, -31, -34, -49, 48, 47, -119, -48,
+   -125, -50, 121, -15, 10, 5, 127, 117,
+   -19, -128, 30, -103, 81, -22, -28, 61,
+   4, -62, -11, 4, 24, -97, 47, 38,
+   -42, -59, -125, -49, 83, -15, -119, 102,
+   29, 89, 53, 116, -109, -95, 73, 16,
+   -17, -54, 3, 127, 63, 10, -61, -111,
+   104, -15, 41, 62, -43, -32, 74, 72,
+   -93, 125, 127, 122, 116, -115, -14, -91,
+   -63, 51, 14, 11, 121, 104, -33, -8,
+   -103, 31, -44, 81, -31, -79, -49, -29,
+   -39, -3, -87, 20, 37, -94, 26, 62,
+   20, 16, 49, -6, -43, 103, 37, 7,
+   -17, -122, -15, 10, -111, 13, 99, 14,
+   -95, 8, 69, 69, -64, -25, -8, -96,
+   113, 112, -15, -99, -127, -12, -31, -113,
+   16, 111, -12, 24, 116, -6, 10, 96,
+   -34, -63, 49, -14, 2, -126, 9, -20,
+   -10, 108, 2, 123, 127, -69, 40, 90,
+   -54, 12, -50, 125, 87, -106, 31, -127,
+   -36, -88, -26, -116, 70, -125, 15, -72,
+   104, 120, 74, -88, 105, 13, -20, -12,
+   -124, -40, -87, 6, 108, -125, -87, -1,
+   23, -39, -76, -87, -60, 62, -108, 28,
+   -31, 31, 9, 24, 79, 15, 17, 78,
+   4, -47, -12, -39, -14, 71, -17, 70,
+   69, 58, 30, 42, 60, 32, -16, -26,
+   71, 13, 101, 3, -99, 44, 98, 28,
+   -24, 14, -24, 125, -59, -29, 122, 16,
+   -35, 53, -36, -38, -4, 84, 2, 61,
+   -3, 115, 59, -85, 49, 73, 16, 85,
+   97, -92, -1, 41, 18, 6, 30, 9,
+   37, -26, 115, 9, 110, -22, -50, 45,
+   -127, -50, 4, -9, 54, 63, -55, -18,
+   -125, -12, 20, -4, -99, -8, -23, -42,
+   19, -9, -42, 3, -61, -11, 26, -10,
+   2, 43, -33, 44, 3, 105, 124, 26,
+   -21, 48, 21, 117, -63, -118, -126, -44,
+   -42, -122, -75, 127, -42, 25, 122, -75,
+   -122, 28, 18, -27, -127, 19, 15, -122,
+   27, 80, -13, -18, 25, 89, -16, -52,
+   127, 126, -89, 96, 45, 117, 82, 81,
+   103, -33, 84, -124, 69, -51, -113, 5,
+   80, 123, 125, 98, 61, -86, 59, -46,
+   -44, -29, -62, 124, -125, -118, -13, -10,
+   -13, 81, 103, 107, -24, -45, 82, 26,
+   -27, -34, -81, -41, -41, 10, -18, 40,
+   -128, -125, 44, 25, -80, -1, 3, -85,
+   63, 37, -6, 94, 47, -80, -12, -3,
+   -21, -17, 125, -28, 48, 19, -35, 46,
+   -12, 37, 3, -10, -51, 28, -70, -62,
+   22, 66, 34, 58, -70, 67, -106, 91,
+   -94, -12, 83, 111, 8, 114, -17, 8,
+   9, -20, 1, 113, 99, 69, 19, 35,
+   -26, -128, -54, -10, -41, 96, 71, -93,
+   12, 44, 3, 22, -21, -5, -18, 126,
+   42, 48, 85, 12, -54, 2, 25, -52,
+   93, -128, -26, 78, 123, -25, 27, 8,
+   -118, 50, -3, 75, 40, 35, -11, 107,
+   -13, -93, -13, -24, -24, 72, -85, 10,
+   -61, 51, 116, -100, 21, 67, 118, 36,
+   -71, 37, -20, 46, 16, 54, 126, -93,
+   -15, -5, 33, -114, -11, -5, -88, -11,
+   -24, 54, 82, -66, -44, -128, 82, 87,
+   -122, -51, -60, 123, -29, 33, -125, -13,
+   -59, -8, -22, -4, 37, 24, 28, 123,
+   93, 86, -66, -12, 44, 124, -106, 51,
+   104, 19, 49, 82, 77, 11, -109, 58,
+   -5, 19, -73, -56, 127, -74, -12, 120,
+   -118, 1, 121, 116, 20, 70, -15, 53,
+   84, -47, -27, -18, -123, -17, -3, -23,
+   5, 28, 68, 120, -65, -33, 111, 122,
+   -113, -45, -19, 18, -119, -90, -126, -33,
+   45, 36, 18, -35, -121, -10, -102, 37,
+   127, 112, -95, 44, -126, 59, 102, -81,
+   114, 85, 3, -50, 81, -52, -54, -32,
+   -13, 39, 66, 41, -88, 120, -123, 125,
+   87, 23, 67, -53, -43, -25, -125, 63,
+   41, -105, 35, -39, -108, -123, -34, -41,
+   10, 88, -7, -31, -127, -113, 31, -59,
+   -92, 62, -127, 96, 109, 127, -11, -27,
+   115, -71, -40, 45, 123, -40, 38, 60,
+   124, 17, -60, 95, 117, -23, -9, 64,
+   100, 126, -40, -56, -7, 126, 24, -125,
+   51, 37, 26, -115, 76, -51, -91, -29,
+   -75, -116, 72, -87, -71, 80, 63, -95,
+   -1, -24, -57, -32, 25, 105, 14, 20,
+   60, 74, -128, 126, -29, 92, 43, 127,
+   -75, 126, 116, 127, -10, 116, -126, -25,
+   -37, 26, 58, -92, 27, 67, -43, 56,
+   -78, -32, 76, 71, 73, 48, 76, -92,
+   -126, 55, 24, 55, -104, -18, -58, 24,
+   109, 30, -128, 115, 66, 7, 31, -85,
+   116, 85, 106, -53, 39, -33, 61, 10,
+   100, 79, -13, -5, 126, 25, -21, -98,
+   -74, -41, 7, 12, -8, -85, -121, 65,
+   -4, 11, -9, -89, -30, 5, -39, 49,
+   -44, 90, 100, -83, 42, 120, -24, 53,
+   122, -114, 2, -83, 38, 17, -31, -43,
+   -38, -56, -67, 26, -49, -48, -121, -41,
+   -125, -1, -3, 59, -77, 9, 76, -55,
+   -53, -11, 1, -38, 51, -112, -76, 101,
+   -24, -9, 3, 24, -48, 67, 26, -52,
+   47, 7, -24, 44, 82, 13, -47, 50,
+   3, -97, 39, 56, -18, 49, -69, 126,
+   -14, -3, 82, 6, -75, -18, 4, 14,
+   127, 57, 76, 23, -53, -7, 34, -45,
+   -100, -94, -97, 12, -32, 20, 51, -53,
+   -17, -77, 69, 103, -124, -112, -95, -122,
+   -18, -116, 35, -110, 79, 109, 38, 56,
+   -124, -13, -87, -86, -43, 54, 108, -108,
+   -6, -11, -68, -11, -124, 8, 122, -7,
+   86, -111, 117, -127, 65, 107, 63, -126,
+   -127, 126, 30, 42, 6, 53, 123, 32,
+   126, -71, 20, 32, 125, -125, 96, 126,
+   -106, -48, -125, 80, -127, -106, -105, 69,
+   -98, -126, -119, -20, 80, -128, -73, 55,
+   119, -127, 92, -12, -77, -12, -38, 35,
+   -117, 44, 3, 37, 126, 119, 28, 61,
+   -72, -127, 24, -24, 120, 123, 3, -127,
+   78, 61, 40, -128, -28, 71, 14, -47,
+   81, -111, -57, -127, -40, -40, -121, 36,
+   -116, -127, 4, -79, -20, 81, 62, -107,
+   24, 16, 105, -8, -38, -85, 127, 90,
+   13, -106, -15, 74, -68, -56, 4, 47,
+   -89, 28, 89, -68, 9, 40, -25, 32,
+   -33, -119, -21, 25, -74, 68, 112, 19,
+   -77, 30, -5, 108, -118, 27, 120, -127,
+   100, 0, 41, 67, 14, 43, 100, -107,
+   77, 127, 70, 48, -106, 52, 17, 40,
+   90, -11, -68, 34, 111, 77, -35, -56,
+   43, -126, -49, -31, 6, 5, -117, -74,
+   12, 49, -63, -68, -36, -97, -117, -123,
+   85, 112, -38, 124, -126, -110, 104, -106,
+   80, 125, 86, 60, 52, 32, -20, -15,
+   -102, -5, 23, -9, -31, -126, 121, 41,
+   -88, -97, 33, -20, -65, -10, 112, 45,
+   -85, 58, 114, -32, 25, -2, 35, 59,
+   -99, -22, -40, -71, 0, -58, 85, -58,
+   18, -55, 60, 0, 88, 9, -14, -56,
+   18, -34, -91, -18, -34, -14, 7, 122,
+   -121, -126, -35, 95, -40, 105, 6, -2,
+   -46, 115, -125, 52, -117, 17, 2, 9,
+   25, 52, 18, -112, -84, -71, 62, -97,
+   22, -80, 9, -22, -75, -104, 127, 76,
+   6, -127, -120, -104, 17, -86, -54, 98,
+   -127, -111, 57, -126, 68, -122, 13, -98,
+   -49, -125, -1, -118, 121, -37, 35, -111,
+   -122, -113, -125, -51, -90, 78, -124, 127,
+   1, 58, 17, -123, -51, -81, -122, 34,
+   -32, -66, 14, -113, -126, -124, 127, -126,
+   -15, 92, -95, -121, -100, 20, -3, 89,
+   -9, 127, -48, 15, 2, 126, -55, -10,
+   -20, 125, -109, -32, 68, -119, -15, 17,
+   -46, -10, -100, 13, 127, 120, 48, -121,
+   126, 46, 71, -76, -75, -89, -34, -122,
+   65, -21, 43, 11, 102, -128, 44, 127,
+   126, -120, -19, 81, 127, -1, -125, 31,
+   -36, 127, 43, -60, 66, -99, -127, -50,
+   -56, -80, 119, -22, -2, -84, -125, -17,
+   -65, 126, -63, 105, 51, 86, 46, -123,
+   -13, 106, -54, 117, -9, 119, -13, 30,
+   83, -121, 126, 17, 63, 7, -22, 60,
+   7, 26, 18, -23, -39, 8, -63, 43,
+   124, -39, 40, -27, 18, -42, -31, -90,
+   -51, -113, -51, -16, -62, -33, 96, 39,
+   -76, -78, 110, -49, 51, 11, -10, -72,
+   31, -110, -73, 2, 24, 66, -125, -49,
+   -45, 39, -128, -12, -117, -28, -23, 75,
+   1, -122, -13, -63, 104, -44, 14, 3,
+   -78, -25, -6, 104, -81, 123, -66, -96,
+   -47, 70, 127, -107, -124, -66, -102, -94,
+   127, -121, 32, 89, 53, -21, -128, 8,
+   24, 56, 36, -59, -70, -73, -43, 45,
+   -127, 73, -117, -35, -53, 34, -128, 2,
+   83, 127, 1, -45, -14, 6, -44, 6,
+   -34, 117, 127, -34, 64, 6, -43, -61,
+   -80, 0, 15, -29, 11, 22, -23, 38,
+   -124, -30, 108, -78, 25, -54, -57, 48,
+   -40, -108, -97, -94, -117, -47, 18, -96,
+   1, -120, -69, -84, 10, 126, -128, 112,
+   -14, -18, 14, -34, -119, 28, -105, -100,
+   113, 49, 30, -47, -70, -123, -4, -125,
+   15, -115, -128, -3, -110, 126, -42, -126,
+   -11, 21, -63, -123, 127, 121, 108, -80,
+   -45, 86, 60, 64, 115, 115, -91, 25,
+   18, -121, -117, 62, 47, 9, -125, 67,
+   4, 88, 106, -127, -125, 123, 69, 125,
+   -81, -126, 119, -88, 3, -128, 8, 66,
+   -42, -127, -17, -15, 4, 17, -97, 22,
+   127, 98, -114, -19, -67, -17, -90, 78,
+   -35, 114, -21, 110, 119, 122, 64, -90,
+   -8, -70, -94, -59, -49, 127, 0, -54,
+   55, -21, -113, -33, -127, 70, -100, -24,
+   10, 41, -76, -64, -52, -126, -46, -20,
+   19, 49, -126, -33, -127, 127, 125, -110,
+   -4, -56, -70, 45, 3, 18, -122, 91,
+   11, 102, -39, -53, -126, 111, 71, 33,
+   116, -105, -106, 12, -7, 30, 37, 47,
+   -92, 42, 9, -121, -45, 23, 87, -20,
+   125, 117, -13, -126, 56, -16, 28, -90,
+   -35, 77, 58, -10, 63, -67, -24, 45,
+   -29, 8, -31, 119, 0, -13, 100, 122,
+   -33, -50, -34, -18, -19, -58, -124, -22,
+   35, 29, -128, -89, 8, -86, -4, 0,
+   44, -114, -47, -32, -62, -35, -123, 19,
+   -72, -84, -60, 7, 110, -19, 45, 70,
+   -9, 120, -125, 9, -74, -97, 71, 17,
+   3, -40, 1, -103, -94, -33, 127, -31,
+   -12, 10, 0, -4, -20, -75, 28, 84,
+   -57, -15, 43, 17, 29, 40, 60, -9,
+   118, 58, 27, -89, 42, 75, -106, 122,
+   31, -114, -114, 43, -35, -90, 95, 116,
+   -106, 6, -22, 100, 37, -72, 11, -6,
+   87, -88, -126, -119, -31, 44, 29, 59,
+   50, -60, 32, 75, -115, -18, 28, 126,
+   -62, -126, 14, -21, -34, 126, 122, -74,
+   -36, -38, 106, -119, 116, 92, 58, -81,
+   -121, -78, -127, 6, 127, -70, -97, 112,
+   63, -105, -11, -40, 127, -23, -127, -127,
+   26, -34, 75, -124, -28, -115, 78, 28,
+   -30, -124, -41, 15, 120, 127, 81, 72,
+   -35, -114, -38, -93, 72, 71, 82, 57,
+   12, -8, 73, -126, -127, -39, 101, -95,
+   -92, 126, 54, -30, 11, 26, 34, 74,
+   39, -127, -22, -123, 113, 23, 23, -14,
+   -123, -73, -35, -128, 100, -122, -80, 32,
+   23, -118, -40, -53, 48, 18, 21, -42,
+   -104, -22, -127, -19, 55, -57, 64, -89,
+   24, 11, -1, -12, 99, 10, -52, 41,
+   37, -123, 62, 123, -4, -57, -51, 127,
+   -45, 121, 124, -39, -113, 10, 7, -111,
+   53, 55, 112, -124, 51, -85, 30, 7,
+   6, -4, -50, 21, -124, 110, -126, -6,
+   2, -71, 115, 13, 0, -64, -43, 8,
+   8, 7, 4, -49, 82, 10, -2, 125,
+   124, -58, 68, 29, 9, 37, 78, -86,
+   60, -34, 85, -106, -52, 19, 4, 86,
+   118, 46, 113, 20, -103, 113, -75, -57,
+   -54, -65, 86, -16, 12, 68, -90, 84,
+   -37, -31, 23, -37, 25, 26, -54, 32,
+   -27, -121, -26, -67, 124, -24, 20, 124,
+   -75, 74, -28, 14, -29, -19, 33, -36,
+   87, -2, 5, 6, -121, -17, -1, 106,
+   -20, -19, -17, 97, 15, -25, -53, -9,
+   -60, -34, 61, 35, 11, 84, 11, 0,
+   30, 127, 17, -43, 41, 93, -12, 75,
+   -71, -54, 47, 11, -47, -57, 40, 8,
+   -36, -36, 127, -120, 17, 57, -15, 38,
+   -101, 55, -72, -43, 32, -73, -12, -22,
+   -126, -20, -95, -17, -53, 23, 3, -53,
+   -9, 27, 122, -5, -25, -40, 18, -32,
+   -5, -20, 11, -64, 61, 68, 127, 20,
+   -41, 35, -22, 26, 127, -102, -55, -57,
+   51, -21, -45, 34, 47, 0, 85, -3,
+   -10, 42, 43, 11, -34, -10, -4, -67,
+   -89, 92, 25, -62, 7, 20, -117, -41,
+   103, 70, 34, 45, 38, 53, 26, 64,
+   39, 51, 27, -70, 42, -36, -14, 35,
+   -6, 121, -25, -23, -105, -44, 127, -64,
+   23, -10, -53, 70, -63, -23, 5, -15,
+   28, 85, -51, 101, -71, -41, 53, -52,
+   -26, 19, -46, -64, 25, -21, 16, -13,
+   -63, -68, 26, 52, -61, 116, 24, -88,
+   15, -20, 7, -3, 1, 97, -16, -16,
+   -100, -103, 4, -8, 88, -89, 24, 51,
+   -12, -6, 30, -32, -69, 20, 82, 18,
+   -8, -41, -56, -67, -111, 92, -77, 70,
+   -30, 5, -3, 11, 26, 10, -115, -30,
+   -17, 26, -30, 41, 84, -27, -1, -11,
+   -8, -125, -21, 12, -35, 124, -13, -48,
+   -13, 16, 9, 4, -75, 24, 11, 37,
+   -42, -11, 26, 22, 29, 54, -9, -94,
+   107, 112, 57, 18, 84, 97, 26, 0,
+   -121, 6, 28, -1, -55, 54, 9, 46,
+   68, -21, 55, -1, 6, -47, -28, 9,
+   -24, -28, 61, -45, -102, 114, 43, 45,
+   -37, 11, 6, -15, -102, -70, 49, -125,
+   -8, -16, -53, -24, 68, -6, 21, -13,
+   10, -28, 120, -54, 2, -77, 27, -62,
+   -112, -104, -14, -59, 45, 35, -117, 7,
+   34, -28, -63, 26, 59, -14, -43, 22,
+   36, -86, 18, -16, -12, -58, 15, 51,
+   56, -73, 24, -13, 67, -15, 125, -13,
+   12, 8, -56, 44, 62, -77, -10, 76,
+   -122, 87, -27, 21, 19, -39, 10, -2,
+   44, 12, 113, 31, -11, 37, 16, -19,
+   56, -53, 9, -43, -25, -13, 45, 34,
+   -45, -35, -10, 35, -118, -33, -126, 1,
+   122, -37, -21, -15, -128, -125, -29, 24,
+   -123, 21, -47, -36, -66, 35, -20, -9,
+   39, -50, -122, -2, -18, -12, -59, -24,
+   14, -87, 109, -46, -67, 51, -125, 66,
+   72, -13, 57, -112, -116, -42, -110, 68,
+   2, 43, -76, 34, -61, -114, -60, -81,
+   -33, 1, 33, 37, -36, -10, 35, 24,
+   -19, -17, -40, -32, 52, -28, -48, -13,
+   -89, -91, -66, -35, 126, -27, 1, -50,
+   74, -60, -17, 16, 75, 44, 28, 105,
+   103, -4, -9, -43, -76, 6, -10, -124,
+   39, -27, 19, -47, 25, 126, -44, -4,
+   -116, 22, -32, -49, -106, -95, 111, 15,
+   -10, 4, -121, -20, 84, 76, 70, 18,
+   -57, -23, -92, 69, 1, 70, 78, 13,
+   -21, 114, 58, -20, 23, 50, -28, -16,
+   -6, 118, -67, 127, -22, -79, -37, -31,
+   -40, 108, 42, 11, 79, -41, 59, -23,
+   -115, 11, 14, 38, 86, 3, -25, -3,
+   -102, 3, -113, -43, 38, -54, 30, -90,
+   120, -72, 9, -87, 49, 90, 49, -20,
+   14, 11, 15, 33, 115, 125, -12, -68,
+   -59, 21, 6, 27, 21, -127, -77, 20,
+   -45, -1, -46, -77, 57, 105, -77, 2,
+   29, 78, -35, -104, -75, 96, -50, 52,
+   22, -21, 38, -73, -14, -3, -49, 23,
+   -65, -13, -112, 95, 125, -120, -123, 96,
+   -74, 108, -5, -20, 17, -19, 67, -17,
+   -54, -47, 81, -7, -32, -10, 25, 7,
+   -5, 111, -128, -36, 51, -55, -1, -18,
+   3, -20, 20, -32, 31, -37, -24, -31,
+   -70, -95, -17, -1, 40, 73, 33, 10,
+   88, 45, 71, -24, 27, -47, -13, -78,
+   121, 63, -127, 26, -21, 104, -3, 31,
+   4, -21, 26, -38, -37, 42, -10, -3,
+   119, -15, 11, -119, -128, -128, 0, -11,
+   54, -109, 37, -96, -107, 55, 37, -17,
+   -97, 11, -88, 70, -29, -31, 6, -52,
+   -73, 17, 120, 69, -17, 12, 107, -10,
+   -23, 16, 117, 122, -47, 4, 61, -86,
+   -47, 27, -100, 50, 114, -92, 95, 43,
+   47, -31, -34, 107, 99, -127, 53, -11,
+   -26, 57, -16, 57, -97, 0, -113, 59,
+   6, -10, -99, -2, 60, -63, 5, 8,
+   -43, -15, 9, 39, 126, 28, -4, -74,
+   27, 34, 19, -71, 83, 78, 57, 37,
+   -98, -72, 33, -26, -103, 82, 29, -71,
+   20, -4, 1, -49, -127, -85, 24, -37,
+   28, 30, -39, -24, -15, 40, -6, -61,
+   -46, -39, -108, -26, -21, 17, 63, -61,
+   77, -29, 41, -20, 52, -49, 117, 2,
+   -35, 9, 127, -66, 7, 22, -10, -42,
+   -69, 14, 59, -106, 12, -87, 6, 2,
+   -13, -123, -94, 32, -116, -76, 35, 17,
+   -76, 21, -7, 53, -18, -13, 13, -110,
+   -30, -21, 109, 73, -24, 75, 4, -34,
+   46, 127, 78, 40, -84, -15, -66, -7,
+   96, -14, -58, -47, -12, 71, -4, -6,
+   -87, 28, 76, 0, 7, 84, -58, -34,
+   -45, 30, -84, 9, -125, -43, -25, -34,
+   -40, 127, 80, 72, 114, 107, 16, 60,
+   87, 12, 127, -29, -12, 84, 126, -86,
+   92, 127, 91, 86, -123, -91, 126, -45,
+   43, -103, -21, 60, 14, -15, 25, 50,
+   14, 19, 92, 25, 5, 6, -26, 50,
+   -18, -37, 120, -81, 46, 3, 31, -6,
+   -66, -107, -13, 73, -31, -94, -54, 7,
+   -58, -20, -16, 77, -30, -40, 127, -61,
+   69, -21, -66, -24, 48, -55, 9, -25,
+   -31, 44, 127, -17, -54, 71, -20, -28,
+   -42, 5, 6, 23, 33, 19, 4, -21,
+   74, -106, 32, -98, -119, -89, 102, 46,
+   -29, -50, -95, -115, 127, -34, 32, 10,
+   17, -23, -12, -69, 35, -7, -1, -76,
+   64, 37, -114, 59, 83, 34, -22, -61,
+   3, -31, -100, -120, -88, 22, -128, 127,
+   -11, 10, -100, -107, -122, -6, -49, 8,
+   -38, -28, -45, -83, -31, -20, -39, -1,
+   -63, 124, -22, -31, -33, -6, 23, 5,
+   -3, 38, -123, 73, -23, 104, 25, -27,
+   79, 115, -48, -44, -125, 25, -1, -67,
+   20, 117, -35, 112, 86, 15, 23, -111,
+   122, 21, 9, -7, -128, -2, 0, -125,
+   31, 42, 11, 37, 122, -119, 29, 51,
+   -31, 51, 46, 30, 127, -110, 29, 49,
+   -3, 30, -75, -21, -42, -29, -127, -49,
+   -43, 123, 102, -16, -106, -28, -127, -83,
+   -74, 24, -9, 126, 3, 36, 107, 67,
+   11, -18, 54, 77, 18, -28, -15, 15,
+   45, 69, 80, -47, 112, 82, -104, 2,
+   -24, 20, -10, -79, -39, 1, -27, 30,
+   13, -1, -77, -10, -3, -106, -6, 13,
+   -32, 123, -16, 27, 1, 90, -64, 12,
+   -96, -33, -61, 65, 53, 102, -41, -44,
+   51, -47, 65, -23, -9, 61, -81, -9,
+   -21, 61, -58, -48, 122, 58, -54, 6,
+   20, -112, -35, -104, 10, 122, 100, -69,
+   -51, 57, 52, -29, 90, 74, -115, 18,
+   35, -127, 124, 62, -9, -5, -82, 13,
+   8, -63, -42, 3, 15, -23, 23, 41,
+   -51, 87, 123, -36, 11, -34, -74, 38,
+   -5, 36, -52, -74, -4, -2, -122, 19,
+   -66, -11, 10, 50, 75, 4, -25, -1,
+   -12, 57, 108, 84, -38, 29, 123, 62,
+   -18, 39, -120, 14, 13, 78, -1, 2,
+   -82, 7, -93, -78, 5, 75, 48, 44,
+   -60, -33, -5, -48, -20, 39, 28, -86,
+   -25, -69, -28, -102, -103, 121, -120, 18,
+   108, 65, -62, -40, -128, 0, -49, 31,
+   37, 29, 88, 33, -96, -59, 23, -45,
+   59, -105, 84, -63, 11, -41, -13, -27,
+   -54, 83, 64, 117, 14, 5, 76, -112,
+   16, 94, -61, 28, 101, -56, -9, 2,
+   89, 23, -78, 58, -49, -22, 60, 18,
+   34, 19, 62, -93, -27, -47, 76, 4,
+   -33, -35, -12, -23, 87, -43, -2, 21,
+   26, -49, -68, 22, 18, -60, -43, -31,
+   32, -28, -93, -11, 11, 26, -45, 7,
+   -40, 6, -76, 86, -30, -79, -77, -34,
+   1, 47, -34, -83, -124, 57, -35, -17,
+   18, -1, -36, -18, -123, -119, 29, -2,
+   -4, 37, 34, -67, 84, -80, 49, 7,
+   89, -123, -127, 43, -55, 46, 66, 100,
+   -6, -31, -122, 81, -34, -71, -58, -15,
+   -15, -24, -18, 80, -24, -68, 28, -12,
+   71, -76, -32, 2, 12, -120, -24, -20,
+   -96, 15, 3, -88, 51, 0, 37, 37,
+   106, 73, -17, -23, 97, 39, 36, -1,
+   -88, -45, 87, -78, 75, -119, 4, 5,
+   -1, 11, 23, -18, -33, 114, -36, 90,
+   27, 91, 10, -15, 16, -90, -52, 16,
+   59, 41, -38, 19, -127, -91, -45, 26,
+   55, -61, 37, 45, -19, -10, -65, 127,
+   9, -44, -84, -79, -16, 69, 43, 1,
+   -63, 118, -123, -1, 121, 12, 53, -90,
+   15, -42, -19, -33, -62, 32, -24, -57,
+   36, 66, 77, 13, -37, 17, 97, 59,
+   -61, -126, -19, 35, 83, 91, 21, -18,
+   39, 78, 58, 55, -29, -44, -38, 20,
+   29, -26, -127, -84, 0, -7, 127, 70,
+   22, 24, -56, 58, 36, 44, 73, -33,
+   121, -85, 115, -106, -93, 82, 64, 26,
+   -16, -59, -24, 4, 24, 33, 36, 20,
+   -8, -45, -22, -75, 35, -15, 40, -21,
+   56, 80, -77, 36, 108, 90, 84, 6,
+   13, -67, -29, 56, 89, -24, 71, 17,
+   64, 6, -75, -10, 72, 28, -54, -70,
+   31, -39, -30, -110, 72, -21, 48, 86,
+   15, -127, 26, 65, 8, 30, 15, -17,
+   -89, -85, 112, 20, 21, 8, 30, 74,
+   -68, 40, -30, -64, 22, -14, 5, -10,
+   38, -1, 109, 73, -46, 107, -58, 5,
+   -67, -123, 0, 111, 124, 3, -68, 11,
+   -126, 50, 49, -53, 104, 20, 36, 116,
+   0, 15, -16, 18, 84, 47, -72, -84,
+   -26, 1, -74, -20, 122, -40, 47, -29,
+   96, 63, 20, -36, 101, 31, -46, 21,
+   31, -50, 5, 84, -42, 11, -117, 37,
+   -63, 86, 91, 112, -10, -12, -16, -41,
+   62, 16, -95, 25, -48, 30, 117, 0,
+   -1, -5, -57, 101, -6, -59, -52, -8,
+   -34, 83, -6, 51, 9, -95, 98, 18,
+   -74, 8, 1, 34, -13, 22, -58, -128,
+   36, -40, 5, -26, -49, -89, -14, -40,
+   -93, -92, 82, 25, -26, -60, 68, 6,
+   49, 18, 33, 18, -10, 15, 22, -7,
+   -63, -58, -52, 16, 35, 55, -32, 27,
+   12, -24, -19, 74, -21, -34, -124, -19,
+   -3, 112, -41, -117, -94, -91, -46, -116,
+   -108, -42, 59, -46, -61, -109, -66, 37,
+   -67, -47, -91, -74, 3, -23, -4, 30,
+   95, 75, -76, -122, -123, -9, -82, -68,
+   32, -48, 124, -81, -125, -90, -99, -127,
+   -102, 69, -12, 85, -60, -43, -126, -79,
+   -112, 59, 24, 54, -126, 127, -82, -18,
+   39, -126, 9, -53, -124, -19, 17, -49,
+   -86, 24, 1, 12, -80, 75, -35, 48,
+   2, 11, -26, 68, -119, 50, -9, -46,
+   17, 39, -95, -25, -60, -8, -60, 9,
+   121, 125, 2, -83, -99, 50, -47, -38,
+   -123, -42, -124, 50, -125, -40, -14, 102,
+   125, -88, -42, -127, -6, -27, -98, 58,
+   41, -21, -9, -39, -31, -78, -66, 115,
+   112, 8, -25, -105, 2, -84, 10, -13,
+   -67, 3, 105, 108, -28, 84, 37, -92,
+   -2, 116, 24, 68, -97, -127, 16, -125,
+   -73, 23, 105, 44, 127, -21, -67, -40,
+   -42, -88, 48, -32, -26, -105, 6, 36,
+   -56, 27, 18, -3, -97, 54, -30, -113,
+   0, -127, -23, -88, -123, 19, 36, -56,
+   -61, 4, 41, -61, 57, -128, -38, -68,
+   -3, 125, -10, 11, 4, -7, -10, 85,
+   38, 126, 5, 57, -124, -99, -94, -18,
+   -72, 79, -30, -97, -124, 123, -43, 46,
+   -33, -6, -88, 12, -6, 30, -76, -6,
+   27, -26, 47, -67, 126, -58, -23, -16,
+   -47, 15, -71, -97, 2, -127, -62, -124,
+   82, -60, 5, 13, -56, -50, -13, 75,
+   43, 12, -1, -127, -4, 30, 67, -38,
+   -77, 75, 10, 32, -127, -59, -24, 33,
+   4, 0, -108, 11, -89, 0, -86, 60,
+   1, -18, -127, 0, -122, -54, -48, 20,
+   -90, 102, 121, -86, 127, -25, 79, -13,
+   2, -54, -29, 66, 0, 15, -94, 24,
+   -33, 114, -12, 127, 66, -7, -11, 69,
+   -37, 38, 20, -58, 2, -71, -25, 69,
+   -119, -63, 60, -63, 41, -43, 24, -10,
+   82, 5, -29, -26, -125, -52, -45, -21,
+   54, 3, -4, 8, 39, -75, -83, -127,
+   -67, 16, -77, 72, -12, -10, 104, 14,
+   -127, 46, 22, 5, -4, 127, -34, 15,
+   72, 126, -8, -83, -10, 6, -57, -44,
+   -109, 35, 11, 2, 35, 9, -24, -29,
+   -12, -7, -114, -40, -127, 120, -48, 10,
+   48, -33, -39, -124, -119, 113, -63, 22,
+   123, 126, 33, 61, -11, -13, 95, 6,
+   87, -56, -122, 7, 127, -63, 37, -95,
+   125, 68, -30, -92, 28, -13, -105, 91,
+   -20, 21, 87, -58, 17, -20, 34, 113,
+   126, -26, -61, -127, 54, -11, -61, 11,
+   -29, -53, 71, 24, 60, 26, 76, 43,
+   15, 117, 12, -57, 25, -126, 12, -47,
+   -55, -2, 19, -43, 105, 115, -14, 12,
+   -58, -56, 47, -16, 56, 68, -7, 6,
+   -75, 57, -51, -4, 17, 21, 56, -30,
+   -2, -120, 20, -39, -127, -1, -1, 53,
+   -50, 29, 50, -27, -69, -128, -78, 37,
+   -85, 125, 5, 11, 66, -36, 22, -1,
+   124, 10, -50, -88, 116, -67, -3, -12,
+   24, -20, -22, -59, 89, 112, -19, 24,
+   -31, -46, 125, -7, -126, -6, 23, 24,
+   8, -26, 62, -88, 126, -77, -34, 7,
+   -39, 61, -4, -30, 3, -128, 12, -124,
+   -13, -83, -1, -24, 102, -6, -25, 91,
+   125, -3, 16, -125, -69, 34, 42, -43,
+   -29, -32, 59, -34, 13, -4, 10, 92,
+   74, -39, -79, -27, -7, 39, -51, 123,
+   -6, 20, -28, 75, -126, -46, -42, 30,
+   0, -29, 10, -4, 112, -19, 46, -10,
+   -48, -19, -20, 43, 65, 13, 16, 16,
+   84, 75, -39, 127, 125, 93, 105, 0,
+   75, 124, -31, -114, -48, -13, -12, 98,
+   126, -104, 66, 25, -9, -110, -95, -94,
+   -20, -118, 70, 121, -128, -118, 78, -29,
+   -34, 2, -9, 40, 107, 20, -81, -126,
+   -38, -42, -112, -55, 65, 123, 118, 56,
+   -46, 19, 17, 18, 127, 93, -47, 66,
+   121, 114, 8, -128, 123, 92, -37, -45,
+   25, -79, 19, 46, 32, -70, 11, -41,
+   94, -35, -79, 12, -49, 63, 46, 115,
+   -44, 26, -7, -122, -61, 74, 105, -22,
+   76, -70, 86, 120, 70, -84, -31, 53,
+   83, 65, -115, -72, 125, -90, 108, -105,
+   -128, 101, 74, 122, -66, -108, -126, -17,
+   -38, 17, 4, -15, 121, 115, -38, -43,
+   -120, 13, -117, -100, 100, 113, -122, -12,
+   45, -127, 60, -124, 68, -27, 48, 110,
+   85, 15, 111, 10, 58, -82, 102, 59,
+   42, 95, -111, -125, -126, 69, 120, 126,
+   -40, 50, -80, -103, 60, 112, 69, -19,
+   26, 41, -24, -6, 58, -115, -35, 94,
+   86, -62, 110, -22, -127, -14, -76, 121,
+   0, 4, -16, -3, -87, 1, 65, -34,
+   -26, 124, 37, 59, 40, -106, -13, -16,
+   104, -126, -5, -76, 126, -3, 77, 40,
+   120, -28, -39, 116, 120, 48, 90, -22,
+   -127, 96, 5, -88, -128, -95, 20, -19,
+   -50, 29, 25, -60, 127, -3, -80, -76,
+   6, -60, -43, -127, -59, 51, 9, -50,
+   -9, -110, -56, 61, 0, -17, 49, -34,
+   50, 8, 24, -126, -125, 35, 56, 109,
+   83, -18, 55, -122, 122, 119, 79, -115,
+   116, -8, 65, 59, 51, 127, -27, 119,
+   36, 27, 106, 122, -127, -21, 39, 96,
+   -88, 91, -31, 116, 56, -97, 27, 14,
+   -63, 99, 51, 117, -126, -98, -50, -16,
+   120, 3, 45, -125, -98, -31, 65, -116,
+   -66, -76, -82, -54, -110, 5, -127, 23,
+   16, -73, -127, -41, 22, 69, 39, 106,
+   97, -35, 124, 52, -128, -31, 14, 37,
+   -12, -85, -2, -79, 16, -61, -127, 8,
+   39, 57, 38, 111, -67, 77, -127, -21,
+   -46, -46, -102, -57, 74, 87, 53, 26,
+   48, -123, -71, -78, 31, 78, -82, 100,
+   61, 38, 79, 94, -39, 127, 1, -20,
+   -33, -22, 59, 37, 73, 42, -53, -77,
+   14, -23, -96, 53, -46, -61, -117, -22,
+   68, -111, 17, -62, -8, 53, -34, -78,
+   -126, 49, -9, 69, -127, -32, 24, 111,
+   -125, -124, 19, 125, 34, -6, -122, -13,
+   39, -5, -123, -21, -52, -8, -83, -15,
+   -126, 65, -41, -66, 114, -37, 85, 18,
+   -71, 69, 45, -19, 64, -2, 31, 125,
+   -45, 4, 114, 101, -82, 67, 19, -5,
+   25, 122, -117, 67, -122, 29, -20, -13,
+   -124, 12, -87, -125, -16, -33, 32, 30,
+   -22, 0, 24, 34, -52, -122, -35, 127,
+   -92, -21, -95, 12, -85, 50, 29, -36,
+   27, 19, -103, 117, 38, 64, 124, -63,
+   7, 50, -1, 24, -79, -44, -40, 113,
+   -125, -107, -85, 124, -124, 121, -90, 14,
+   22, 124, 71, 48, -121, -38, 22, -11,
+   -53, 4, -128, 52, 48, 18, -21, -123,
+   -123, -15, 32, 14, 127, -13, 33, 67,
+   -28, -32, -77, -127, 46, -14, -101, -63,
+   -47, 41, 3, -58, -118, -102, 62, 32,
+   -38, 4, 5, -25, -27, 58, -40, 60,
+   -44, 109, -120, -32, -56, 10, 105, -112,
+   -25, 43, -50, 9, -64, -52, -126, 73,
+   -37, -15, -71, -32, -85, 81, -48, 10,
+   16, 45, 17, -74, 95, -48, 78, -27,
+   67, 28, -4, -6, -13, -99, 8, 36,
+   69, 13, -54, 60, 54, 78, -28, 127,
+   -18, 47, -10, -88, -4, 13, -26, -23,
+   -98, -124, 92, 29, 43, 127, -19, 78,
+   9, 22, -21, 17, -126, -16, -30, 6,
+   31, -128, 22, 100, -21, -46, -126, -98,
+   92, -2, 38, -82, -51, -25, 92, 75,
+   -48, -51, -20, 88, -113, 80, -68, 45,
+   68, 127, 32, -74, -89, 120, -93, 49,
+   115, 51, 9, 8, 8, 19, 3, -34,
+   -73, -45, -72, -83, 51, -44, 62, -126,
+   -36, 2, -16, 82, -127, 118, -21, -19,
+   -49, 33, 8, 18, 33, -8, 39, -57,
+   -82, 14, 30, -39, 121, 5, 36, -23,
+   -103, -124, -124, -20, 38, 69, -104, 54,
+   30, -34, 92, -23, 51, 27, 59, -54,
+   -16, 20, 67, -60, 85, -46, 8, 27,
+   25, -62, -110, 31, -111, -49, -95, 116,
+   -40, -29, 25, -36, 56, -10, -12, 88,
+   -34, -43, -76, 3, 10, 90, -111, -103,
+   -31, -38, 19, -100, -115, 124, -75, 18,
+   -37, 44, -38, -21, -7, -13, 56, 75,
+   -120, 25, -128, -127, -38, 10, 41, 26,
+   -25, -43, 103, 117, -50, -44, 118, 7,
+   47, -69, -2, 46, -53, 122, 28, -92,
+   23, -14, -19, -16, 26, 54, -102, -94,
+   -95, -83, -104, -31, 43, -127, -85, 18,
+   72, 126, 121, -100, -118, 100, 7, 55,
+   8, 28, -53, 22, 127, -104, 124, 99,
+   11, -52, -32, -2, -57, 45, -80, -96,
+   -26, 32, -10, 72, 121, 127, -49, 40,
+   12, 1, 9, -75, -55, -30, 126, -84,
+   2, -70, 59, 93, -117, 64, 86, -33,
+   -8, -74, 64, -4, -49, 42, -59, 89,
+   7, -48, -19, -15, 43, -66, -81, 3,
+   -35, -123, 45, -64, 84, 4, -23, 39,
+   -79, -1, 17, 58, 11, -4, -57, -50,
+   -5, -100, 76, 127, 100, -48, 43, -96,
+   35, 12, -101, -96, -26, 7, -71, -72,
+   -7, -61, -105, 127, -4, -103, -15, 88,
+   46, 27, -16, 41, -125, -75, -22, -58,
+   -27, 11, -58, -5, -74, -125, -42, -13,
+   -77, -20, -80, 3, 19, -65, 61, -89,
+   -47, -56, -35, -80, 124, 86, -5, -49,
+   72, -117, -34, -54, 68, 67, -87, 54,
+   9, 1, 9, -21, -30, 32, -38, -2,
+   51, 21, -118, -25, 107, 30, -32, 60,
+   5, -48, 127, 28, -113, -65, -23, -1,
+   -69, -75, -65, -25, 17, -115, -19, 40,
+   49, 120, 42, 11, -48, 32, 66, -26,
+   75, -50, -75, 13, -29, 67, -126, -27,
+   25, 24, -126, -2, -59, -61, -89, -124,
+   78, -26, 76, -126, 36, 28, -3, -16,
+   -29, -81, 13, -123, 67, 52, 23, 37,
+   -73, -96, 40, -95, -112, 63, -55, 117,
+   63, 118, 34, -74, -119, -77, -23, -14,
+   -113, 111, 28, -80, 37, 103, 5, -25,
+   -79, 73, -76, -84, 45, 57, -67, 6,
+   8, -51, -67, -127, -58, -127, -33, 0,
+   -105, -24, -77, 48, -29, 125, 118, 77,
+   -112, -128, 41, 68, 126, -30, -34, 13,
+   115, 109, -9, -34, -44, 121, -11, 100,
+   -12, 43, -88, 51, -41, 37, -110, 43,
+   127, 36, -42, -58, -108, -119, 36, -107,
+   20, 23, 111, -4, 126, -9, 125, -69,
+   -42, 32, -33, 106, -7, 127, 6, -126,
+   29, 57, -29, -100, -91, 126, -4, 74,
+   33, -5, 5, 94, -20, 66, 34, 68,
+   37, 39, 82, -59, 69, 124, 75, -123,
+   86, -70, 91, -70, 17, 107, 93, 60,
+   -21, 51, 74, 21, -39, -90, -96, 13,
+   17, 121, -111, -30, 72, 28, 73, -13,
+   0, 12, -18, -7, 9, 32, 16, -21,
+   -87, 46, 37, 8, -7, 47, 8, 24,
+   0, -3, 36, -35, -20, 12, 36, -4,
+   -61, -5, 6, -77, -52, -4, 74, -23,
+   -4, -18, -25, -6, 127, 39, 44, -28,
+   13, 37, -22, 9, 24, -9, -36, 121,
+   7, 15, -10, -3, 2, 20, 15, 32,
+   -4, -71, -12, 57, 107, 21, 11, -9,
+   50, 2, 44, -6, 17, -5, -44, 13,
+   81, -6, 37, 7, 3, 56, 10, 2,
+   -20, 44, -36, 7, -6, -31, 17, -5,
+   -11, 20, 2, 61, 115, 0, 11, 3,
+   -8, -23, 3, -70, 4, -65, 11, 9,
+   52, -19, -51, -16, -3, -34, -32, -49,
+   -61, -12, 0, 49, 23, -52, 119, -12,
+   32, 68, 8, -5, 12, 32, -14, -18,
+   37, -11, 45, 6, -68, 9, 35, 15,
+   10, 89, 114, 38, 53, 26, -1, -51,
+   -24, -85, 25, -50, -10, 20, -16, -22,
+   -6, 127, 21, -7, -127, 12, 9, -18,
+   -42, 6, -58, 27, 1, 24, 18, 16,
+   -14, -2, -52, 63, -95, 10, -13, 127,
+   -35, -22, 6, 112, 64, 10, -16, -20,
+   -39, 1, 0, -19, -101, 5, -1, 110,
+   2, 44, 7, 4, -49, -17, 17, -8,
+   37, -61, -7, -6, -16, -99, 73, 2,
+   -16, 22, -2, 18, 15, 4, -27, 24,
+   11, -47, -3, 15, 127, 21, -7, 15,
+   15, -20, 3, 26, 127, 38, -38, 0,
+   6, 37, -10, 7, 23, 1, 36, -128,
+   -10, 13, 29, 16, 17, 39, -27, 8,
+   98, 5, 14, -75, -126, 12, -10, 30,
+   -31, 19, -36, -55, 0, 28, 83, 86,
+   11, 6, 15, 41, 13, 38, 9, 12,
+   15, 14, -21, 13, 116, 14, 0, 9,
+   10, 99, -53, -14, -128, 8, 19, -5,
+   5, -30, 2, 60, 36, 75, -69, 6,
+   53, 28, 44, 27, -33, -30, 36, 7,
+   -59, 11, 80, -71, 44, -39, -42, -25,
+   -38, 13, -123, -28, -24, 23, -58, 33,
+   4, -29, 16, 67, 19, 126, -7, 9,
+   -32, -7, -34, 51, 5, -5, -16, -3,
+   -41, 5, 23, -7, 26, -11, 126, -12,
+   37, 60, -2, 14, 11, 0, 42, 43,
+   11, -51, -50, -28, -15, -3, 21, 16,
+   -119, 55, 21, 71, -9, -17, 13, -60,
+   112, 36, 55, 2, 5, 0, -7, 1,
+   47, 4, 18, 44, -36, 51, 0, -41,
+   -47, -66, -9, 39, -19, 54, 11, 4,
+   -71, -35, -33, -17, -40, -92, 125, 31,
+   -28, -7, 25, -19, -89, 14, -94, 61,
+   124, -29, 8, -123, -8, -65, -30, 38,
+   2, -23, 23, -80, 5, -43, 21, -19,
+   -13, -17, 20, -23, 24, -126, 26, 8,
+   -27, 12, -111, -6, 42, 20, -126, -33,
+   -22, -81, -1, 42, 8, -59, 42, 96,
+   -11, -10, -44, -41, 6, 39, -3, 6,
+   -43, -30, -38, -8, 121, -41, 17, -13,
+   101, 7, -98, 1, 26, 35, 27, 15,
+   -56, -10, 4, -23, 12, 80, -25, 8,
+   8, -14, 1, 33, -17, -4, -18, -7,
+   -44, -80, -63, -50, 16, -125, 75, -17,
+   8, 16, -53, 5, -30, -6, -83, -16,
+   -22, -78, 13, -7, -89, 5, -6, -10,
+   11, 39, 8, -72, -28, -126, -32, -7,
+   -19, -1, -8, 38, 6, -34, 5, -1,
+   -12, 48, -71, -5, -11, -126, -33, -17,
+   -3, -17, 1, -83, 7, 8, 60, 27,
+   -1, 14, -69, -11, 27, -5, 73, 3,
+   -27, 64, -28, 2, 3, 22, 0, -12,
+   -41, 3, -25, 16, 9, 25, -27, 21,
+   22, 11, 0, 1, -1, 16, 6, -9
+};
+
+static const rnn_weight denoise_gru_recurrent_weights[27648] = {
+   -76, -99, -23, -18, 12, -119, -3, -53,
+   6, 9, -8, -124, 91, -33, 50, 0,
+   -52, 95, 19, 54, 43, 29, -17, -122,
+   -83, -29, -107, -57, -8, -4, -27, 118,
+   -96, 4, 81, -5, 44, -90, -103, 39,
+   -29, -25, -56, -13, 71, -13, -103, -1,
+   -15, -5, -100, -89, -14, 4, -16, 36,
+   -10, -44, 59, -44, -103, -109, 50, 37,
+   24, -48, -121, -9, -101, 30, 29, -5,
+   -69, 89, 56, -41, 39, -52, -4, -111,
+   -39, 16, -54, 31, -49, 34, -1, 12,
+   -20, -45, -121, -40, -28, -3, -13, -38,
+   23, -83, -13, -6, 97, 44, 13, 30,
+   -38, 2, -25, -82, 46, 38, -25, 31,
+   -106, 9, 20, -113, 27, 17, 12, -91,
+   34, -7, 10, -44, 3, -2, -66, -3,
+   -93, -70, -32, -58, -24, 20, -49, -31,
+   6, 87, -30, -89, 10, 23, -60, -16,
+   -113, 22, -1, -4, 60, -45, -41, 1,
+   17, -9, 39, -38, -36, -22, 47, 38,
+   -39, 10, -89, -27, 10, 45, 35, 2,
+   62, 5, 42, 14, 28, -27, 13, 10,
+   -22, -23, -67, 41, -10, 12, -55, -57,
+   -76, -35, -108, 12, -26, 0, -42, 104,
+   -48, -64, 4, -3, 34, -126, -19, -11,
+   36, 55, -54, -55, -123, -44, -45, 36,
+   -61, 18, 2, -127, 52, -30, -119, 33,
+   -8, -45, -26, -102, -91, 36, 49, 45,
+   51, -4, 5, -105, 56, -128, -83, 11,
+   -16, 16, -126, -108, -71, 9, -9, 36,
+   -6, -63, -100, -56, -10, -51, -34, -13,
+   15, -17, -28, 61, -65, -72, 32, -80,
+   38, -13, 75, 56, -15, 81, 50, 21,
+   -127, 12, -86, 45, -41, 57, 23, 11,
+   -28, -71, -119, -22, -62, 79, -96, 32,
+   -61, 20, 9, -117, -52, 33, -82, 82,
+   -16, -100, -47, -128, 39, -105, -15, 10,
+   -5, 90, -124, 19, -28, -66, -76, -13,
+   -40, 31, -20, -5, -24, 41, 14, 121,
+   -56, 56, 43, -123, -44, -24, 28, 73,
+   -37, -17, -19, -65, 45, 52, 63, -1,
+   30, 16, 51, -7, 45, -13, -70, 16,
+   -1, -4, -22, -116, -37, 37, -124, -10,
+   28, 12, -109, 2, 16, -30, 13, 28,
+   -24, 32, -26, -53, 72, 10, 40, 42,
+   -73, 36, 25, -51, 19, 27, 34, -6,
+   66, 36, -4, 38, -87, -33, 36, -41,
+   15, 3, -32, -72, 73, 35, -32, -124,
+   117, -36, 0, -22, -114, 76, 5, -125,
+   7, 1, -50, -104, 1, -74, 11, 8,
+   -28, -8, 13, -115, -50, 3, 89, 75,
+   22, 44, -99, -61, 97, 41, -123, -53,
+   91, 85, 108, -12, 11, -23, 13, 0,
+   -12, 102, -18, -74, -44, 54, -17, 16,
+   0, 53, 21, -19, 34, -11, 80, 25,
+   -58, 62, -55, 78, -29, 20, 35, 29,
+   -51, 42, 65, -86, -60, -25, 94, 14,
+   52, -18, 58, -54, 84, -115, -17, 18,
+   -64, -9, 27, -94, -5, -3, -46, 5,
+   11, 6, -125, -64, -54, 21, 59, -50,
+   49, 38, 47, -39, 60, 3, -11, 16,
+   71, -56, -7, 55, 51, -27, -51, -29,
+   7, -6, -63, 89, -16, 36, -76, -35,
+   -102, -93, 11, -84, -5, -25, -59, -6,
+   -19, -8, -23, -121, -60, -126, -71, 8,
+   -17, -128, -95, 15, 13, 64, 37, 16,
+   23, -78, 36, -111, -8, 69, -53, 62,
+   -37, 7, 9, -25, -63, -66, -25, -53,
+   -36, -7, -47, -40, -50, -42, -81, 127,
+   70, -22, -107, -115, 11, 95, -54, 12,
+   1, 15, 62, -14, -127, 47, 72, -43,
+   -2, -4, 127, 11, 22, 20, 11, -10,
+   4, 26, 71, -3, 85, -42, -9, -10,
+   -35, 27, 34, 35, 35, 0, -23, 27,
+   43, 0, 68, -13, 34, -21, 1, 70,
+   -34, 22, 16, 17, -11, -27, 0, -65,
+   41, -40, -28, -27, 18, 3, 1, 37,
+   -36, 16, 44, -17, 61, -32, 50, 3,
+   11, 1, -18, 24, -38, 19, 21, -8,
+   3, 50, 28, -14, -55, 6, 0, -23,
+   12, -17, 32, -18, 20, 22, -15, -2,
+   -17, -23, 48, -14, -9, -41, -4, -10,
+   20, -11, 23, -10, 40, -3, -4, -38,
+   4, -18, 8, 61, -7, 23, -31, -24,
+   -7, 45, -81, 12, -49, -19, -7, 38,
+   52, -26, 25, -54, -5, 23, 17, -14,
+   -32, 46, 1, 18, -24, 2, -94, 21,
+   34, -24, 36, -7, -11, 35, -62, 19,
+   15, -47, 45, 5, 30, 26, -23, -38,
+   -48, 6, 77, 50, 9, 25, 11, -29,
+   -7, 13, 12, 14, 40, 33, 21, 62,
+   -6, -27, 38, -45, -1, 87, 11, -27,
+   -20, 43, -68, -28, 27, 25, 3, -13,
+   53, -38, 4, 44, -41, -72, -7, -39,
+   41, -25, -35, 86, -59, 41, 127, -56,
+   34, -38, -25, 22, 0, -22, -24, -1,
+   -65, 19, -23, 25, -20, 79, -68, -87,
+   -123, -123, -28, -76, -114, -10, 1, -95,
+   -126, -128, 10, -68, -103, -11, -122, 127,
+   -119, -43, -28, -55, 69, -76, 60, 106,
+   122, -118, -40, -50, -11, -25, -30, -18,
+   39, -22, -80, -77, 121, -23, -88, -23,
+   -20, 80, 35, 71, -75, -114, -128, 127,
+   23, 11, 38, -52, -41, 7, -127, 29,
+   37, -74, -59, -47, 126, -16, -92, 10,
+   -92, 4, -59, 2, -127, -87, 126, 24,
+   122, -79, 97, 98, 1, 41, -61, -124,
+   71, -25, 37, -48, 32, 85, 34, 56,
+   -21, -31, 0, 85, -11, -10, 41, 14,
+   -41, 7, -17, 97, -79, 84, -98, -34,
+   17, -1, -60, 15, 39, -37, -35, 16,
+   26, -15, -37, 49, -20, -25, -56, -13,
+   5, 16, 6, 77, 67, 123, 96, 5,
+   29, -17, 46, -10, -23, 57, -79, 29,
+   -28, -17, 52, 86, -30, 6, 14, 51,
+   125, 17, -23, 90, 47, -8, -19, -42,
+   -19, 118, 27, 20, 38, 36, 12, 122,
+   42, 4, -14, -5, 1, 36, -6, 29,
+   -53, 15, 8, 21, 32, 31, -35, -2,
+   -56, -18, 12, 74, 48, 5, -4, 33,
+   60, -92, -21, 44, 92, -62, -2, 35,
+   4, 48, 69, -45, 73, -35, 3, 28,
+   81, -48, 18, -34, 29, 123, -32, 29,
+   6, 9, -118, 4, 30, -1, -24, 65,
+   3, 34, 40, 20, -13, -53, -50, 31,
+   9, -86, -87, -36, -57, -27, -35, -30,
+   -123, 18, 8, -107, -6, 5, 48, 21,
+   -54, -1, 60, 61, 26, -1, 12, -11,
+   41, -26, 110, 29, 27, 8, 48, 43,
+   -12, 123, -33, -8, -91, 122, 9, 120,
+   -18, 71, -23, 63, -34, -20, 30, 46,
+   -45, -24, 24, 57, -20, -15, -123, 3,
+   5, 59, 13, -87, 45, -15, -28, 38,
+   -3, 29, -23, -6, 31, 69, 33, -4,
+   -64, -31, -48, -1, -4, 23, 53, -4,
+   1, 96, 29, -44, -123, -19, 3, 32,
+   80, -28, 6, -57, 2, -67, -18, -50,
+   16, -125, -87, -25, -51, -127, -23, 5,
+   0, 62, 90, 67, -41, -11, 41, -64,
+   -67, 15, -3, 78, -86, -11, 30, -10,
+   -57, 23, -41, 23, 4, -103, -57, -119,
+   -94, -94, 69, -19, 48, 23, -32, -20,
+   -58, -17, 60, 113, 69, 57, -27, 24,
+   -25, -2, 23, 3, 8, -37, -35, -9,
+   5, -23, -38, -19, 26, 6, -49, 3,
+   95, 45, 0, 15, -102, 3, -46, -1,
+   -19, -2, 2, -86, 14, -3, 45, -20,
+   22, 23, -75, 93, 38, 54, -44, 107,
+   -87, 80, 19, 20, -54, 73, 4, 50,
+   14, -5, 32, 7, 32, 7, -46, 10,
+   -21, 8, -40, -45, 55, 33, 17, 31,
+   44, -10, 88, -11, -14, 29, 32, 54,
+   116, 33, -53, 107, -88, -34, 47, 124,
+   18, 14, -1, 5, 1, -39, 21, -15,
+   58, -27, -70, 100, -37, -25, 4, -56,
+   69, -22, 23, 3, -53, 20, -10, -48,
+   22, -95, -14, 39, -43, -70, 35, -6,
+   8, -95, -86, 9, 22, -59, 121, -127,
+   -1, 62, -18, 14, -13, 56, 76, -80,
+   -62, 10, 74, -56, 16, -11, 34, -52,
+   50, -7, 40, -61, 38, -38, 31, -51,
+   16, 23, -17, 25, 42, -51, 101, -19,
+   8, -19, -4, -46, -115, 3, 126, 41,
+   2, -1, -66, -26, -110, -49, -72, -39,
+   20, 92, -23, 60, -34, 80, -23, 32,
+   -4, 56, 59, -82, 81, 127, 61, -17,
+   44, -49, 33, -38, -119, 68, 74, -38,
+   87, -15, -21, -21, -70, -7, -8, -46,
+   -7, -107, 42, 20, -108, -37, -5, 7,
+   -123, 30, -125, -17, -48, 79, 26, -103,
+   -42, -18, 4, 48, -21, 14, 34, 12,
+   27, 37, 74, 57, -124, -5, -4, 5,
+   55, -36, 44, 64, 3, -48, -37, 51,
+   -45, 95, -59, -32, 5, 28, -80, 24,
+   18, -86, -6, -83, 5, -8, -16, 4,
+   -113, -23, 9, -24, -86, 8, -30, 16,
+   72, 12, 41, -55, -18, 101, -5, -17,
+   -108, -15, 62, -36, 29, 5, -16, 64,
+   -8, -10, -42, 22, -128, -37, 43, 82,
+   -42, -93, -20, -29, 46, 29, -41, 4,
+   18, -12, -51, 53, -43, 1, -61, 7,
+   21, 7, -94, -11, 99, 89, 84, -14,
+   14, -59, 56, 46, 22, -11, -35, 4,
+   40, -68, -32, 100, -8, 48, 1, 17,
+   1, 20, -4, 98, 3, 0, -21, 15,
+   39, 27, 66, -8, -37, 3, -8, -17,
+   -39, -53, -10, 9, 28, 82, -10, 33,
+   -36, -14, -47, 25, -8, -24, 8, 14,
+   10, -31, -44, -31, -53, 77, -18, -76,
+   35, -3, 124, -4, 92, 92, 34, 90,
+   125, 10, 63, 38, -16, 41, -4, 3,
+   27, 93, 62, 23, -48, 6, -36, -42,
+   -3, -3, -50, 2, 64, -36, -79, 122,
+   79, 22, 32, 19, 22, 34, -24, 5,
+   -11, 23, 38, -65, -15, -3, 61, -7,
+   -6, -41, -37, 15, -5, 1, 52, 11,
+   -42, -54, -7, 18, -34, 65, 113, -3,
+   -29, 61, 5, -36, -12, 106, 10, -95,
+   57, 124, 95, 32, -25, -26, 4, 13,
+   43, -22, -38, -26, 17, -46, -4, -122,
+   -39, 40, 79, 45, -48, -35, -74, 60,
+   -34, 50, 69, -68, -10, 94, -67, -80,
+   80, 55, 46, -61, 2, 14, 77, 8,
+   21, 4, 68, 53, 108, -3, -30, -18,
+   -102, -127, -12, 8, 77, -86, 27, -127,
+   -26, 100, -8, -77, -128, -47, -51, 2,
+   -111, -11, 13, -23, 44, -123, -2, 28,
+   21, -71, -124, 9, 28, -18, 66, 53,
+   64, 83, -31, 28, -8, 36, -21, 9,
+   8, -46, -23, -101, 12, -73, -49, -38,
+   52, 106, -82, 57, 41, -17, 59, 20,
+   -74, -7, 10, 28, 3, -15, 0, -92,
+   -9, -29, -64, 106, 36, -106, 4, -46,
+   -114, -59, -104, -71, -128, -68, -41, -4,
+   56, -115, 51, -34, 29, -21, -24, 14,
+   -59, -113, -57, 4, -6, 78, 24, -4,
+   23, 23, -12, -4, -24, -17, -79, 23,
+   -16, 17, -31, 6, 29, 26, 14, -50,
+   37, 27, -13, 22, 15, 1, 0, 72,
+   -62, 58, -6, -38, 18, 90, -2, 14,
+   65, 41, 48, 59, 53, 12, 55, 9,
+   14, 38, 34, -35, 19, 25, 55, 31,
+   -22, 22, 81, 48, 14, -15, -49, 19,
+   67, -54, 20, 13, 8, 3, 7, 32,
+   6, -6, -11, 19, 66, 40, 35, 19,
+   12, 29, -45, -61, 54, 105, 56, -20,
+   7, 46, 5, 4, 60, 10, 37, -19,
+   -37, 66, 44, 15, 19, 35, -21, 29,
+   55, 16, 61, 85, -26, -3, -93, -30,
+   9, -36, 2, -42, -67, -32, -23, -2,
+   15, 79, 27, -17, -4, -126, -29, 18,
+   -3, -40, -118, -28, 10, 42, 64, -30,
+   -9, 101, 4, 6, -20, -53, -10, 18,
+   -14, -62, -29, 8, -38, -3, 9, -21,
+   -26, 63, 31, -5, 20, -28, 33, -25,
+   -46, 6, 65, -6, 94, -13, 9, -8,
+   15, -21, 114, 12, -8, -42, -116, 5,
+   -22, -2, 1, -27, -18, 8, 4, -70,
+   14, 65, -22, -9, -23, -1, 56, 15,
+   -55, 20, 20, 44, -14, -70, -27, 33,
+   24, -12, 45, 78, 69, 50, -48, 91,
+   100, -29, 43, 19, 126, 57, -46, 16,
+   77, 70, -65, -18, 101, -27, -22, -53,
+   73, 39, 126, 96, -125, -20, -124, 19,
+   15, -99, 72, 36, -11, 108, 91, -123,
+   -6, -49, -68, 61, -54, 107, 9, -35,
+   63, 126, 33, -4, 23, 61, 127, -10,
+   -126, -1, -20, 29, 43, 20, -68, 56,
+   -40, 43, -90, 72, -37, 38, -48, 57,
+   -58, 48, -8, -57, 76, 36, 28, -34,
+   -110, -15, -116, 103, -30, 29, 14, 126,
+   -121, 127, -23, 49, -33, -125, 30, -13,
+   0, -3, -25, -93, 42, 36, -24, -19,
+   87, 8, -101, 54, -30, 27, -8, 69,
+   25, 33, 65, -17, 49, -1, 37, -92,
+   9, 46, -15, -40, -4, 3, -52, -13,
+   -11, -19, 3, -42, 1, -31, 55, 45,
+   8, 31, 16, -29, -15, -25, -7, 6,
+   7, -62, -35, 103, 33, 13, 67, 26,
+   -6, -53, -18, -36, 3, 32, 112, 0,
+   40, 12, -67, -27, -57, 37, 24, 8,
+   88, 70, -17, 48, 82, 37, 1, -1,
+   77, 5, -27, -17, 15, 8, 27, -85,
+   33, 0, 43, 37, 3, 19, 3, -47,
+   60, -55, 50, -23, 12, -12, 61, -86,
+   79, -37, -69, 38, 19, 10, -53, -26,
+   -6, 103, -5, 18, -29, 74, 11, 97,
+   -48, -36, 46, -45, -72, -65, -122, -39,
+   -101, 85, 31, -4, 6, 25, -45, -4,
+   -3, -107, 7, -120, 71, 19, 64, 43,
+   -87, 30, -31, 14, 7, 21, 83, 74,
+   -7, 30, -94, 66, 63, -85, 92, 8,
+   22, -24, -4, 31, -91, 39, 13, 37,
+   65, 60, -62, 92, -44, -8, 74, -7,
+   -63, 54, -24, -90, -34, 17, 84, -41,
+   -97, 13, 28, 14, -33, 1, -26, -25,
+   -9, -48, -2, -54, -104, 4, -5, 38,
+   -120, -48, -35, 124, 38, -57, -63, -8,
+   37, 91, -40, 7, 17, -58, 67, -56,
+   5, -86, 22, -17, -53, 6, 114, 37,
+   -24, -96, -17, -69, -44, -58, -123, -18,
+   -47, -123, -108, 2, -89, -38, -15, -34,
+   14, -31, -2, -99, 34, 28, 124, 92,
+   -16, -28, -22, -60, -22, -2, 126, -122,
+   31, -20, 32, 42, -128, -41, 61, 30,
+   -23, 79, -84, -36, -26, 87, 15, -2,
+   -125, -24, -22, 39, -108, 16, -26, -31,
+   -62, -22, 83, -123, 69, -108, 0, -12,
+   -19, -6, -13, -70, -83, -30, 36, -32,
+   3, 95, -111, -18, 6, -91, 34, 56,
+   -61, -92, -54, 23, -60, 17, -64, -54,
+   4, 39, -123, 24, -53, -46, 14, 65,
+   -100, 0, -54, 21, -4, -119, 72, -35,
+   95, -56, 14, 24, -68, -40, -49, 21,
+   -16, -91, -123, -75, -39, 25, 0, 38,
+   80, -32, 29, 25, -99, 0, -10, -28,
+   38, 34, 0, -3, -29, -74, -93, -1,
+   0, -26, 33, -65, -56, 28, -76, -22,
+   -68, 1, -22, 71, -21, -12, -59, -11,
+   66, 12, 0, -82, 17, 27, -66, -56,
+   -34, -11, -37, 75, 100, 78, 2, 12,
+   -29, 40, -92, -11, 52, -4, 5, 38,
+   25, 44, -63, 40, -4, -19, -38, -38,
+   44, 44, 11, -12, 84, 47, -127, -32,
+   2, -57, -102, -23, -51, -12, 26, -59,
+   17, -5, -97, 98, -117, -36, -65, -35,
+   -1, -1, 1, -93, -40, -39, 96, -120,
+   -2, -26, -25, 66, -33, -76, -67, -12,
+   -44, -8, 22, -58, -2, 4, -110, -21,
+   -6, 30, -30, -113, -57, 83, 38, 5,
+   -28, 14, -93, -35, -107, 6, 59, 17,
+   107, 74, -20, -19, 22, -93, -43, 49,
+   -6, 17, 21, -108, 12, -39, 33, -127,
+   -43, 14, -22, -18, 15, -74, 41, -6,
+   -20, 35, 4, 99, 10, -16, -58, -14,
+   -50, -20, -13, -30, -26, -82, 60, -28,
+   26, -110, -34, -51, 28, -128, -57, -20,
+   -47, 97, -54, 104, -127, 50, 63, 20,
+   -44, -126, -35, 13, -5, 5, 83, 34,
+   -45, -12, 27, 0, -33, -55, 29, -94,
+   70, -44, -97, -9, 25, 55, 48, 57,
+   -4, -27, -84, -93, -44, -36, -9, 49,
+   66, 39, 20, -11, -82, -66, 113, -18,
+   -15, -3, 98, -8, -26, 9, -83, -9,
+   41, 61, 84, -22, 65, -57, 34, 7,
+   61, -53, 97, 6, 20, 28, -21, -105,
+   -60, -63, 23, 41, -77, -54, -1, -18,
+   3, 51, -78, -96, 53, 83, -21, -39,
+   21, -104, -69, -12, -36, 76, 20, -77,
+   59, -37, 40, -31, -107, 29, 3, 5,
+   -18, -37, -16, -41, 10, 56, 51, -40,
+   -73, 25, 27, -80, -12, 73, 6, -34,
+   16, -64, -62, 28, 86, 39, 4, 78,
+   21, 8, 28, 55, -124, -107, -105, -24,
+   55, 6, 68, -23, -43, 60, -116, 1,
+   -37, -38, 88, 46, -45, -53, -44, 49,
+   -58, -40, -117, -63, 55, 62, 24, 53,
+   9, -20, 127, 83, 62, -12, -2, 3,
+   126, -26, -29, -110, 32, 33, 51, 43,
+   35, -8, 90, -3, -37, -120, -11, 100,
+   17, 0, 76, -21, 116, -24, 6, -116,
+   -87, 125, -3, -57, -13, 125, 13, -116,
+   13, 43, -86, 32, -45, -14, 70, 41,
+   -121, -18, -7, -51, 9, 57, 0, -6,
+   -41, -4, -14, -40, -51, 124, 47, 13,
+   -126, 124, -41, 5, 34, 7, 2, -34,
+   -16, 9, -39, -107, -49, 41, -52, -23,
+   -38, 39, -9, 92, -115, 45, -128, 35,
+   -95, -24, -20, -40, 5, 0, 7, -107,
+   37, 0, -63, 49, 38, 35, 40, -33,
+   -115, 55, -19, -77, -36, -88, 116, 74,
+   10, 73, 38, 12, -76, -127, -48, 79,
+   84, -57, 46, 78, 37, 102, 18, -95,
+   -61, 17, 26, -113, -12, 43, -1, 68,
+   -25, 67, -21, 69, -17, -14, -27, -21,
+   -52, -7, -70, 5, -29, -110, -105, 35,
+   -65, -25, -56, -1, 85, 18, -54, -81,
+   -91, -71, 24, 25, -26, -68, -64, 9,
+   91, -107, 26, 34, 17, 21, 116, 81,
+   67, 25, -122, -43, 70, 46, -22, 101,
+   -12, -42, 13, 10, 13, -38, 3, -3,
+   7, -81, -36, -23, 48, 76, 22, 22,
+   -123, 4, 31, 37, 2, -2, 25, 40,
+   47, -41, -66, -23, -53, -33, -127, 20,
+   -4, 18, 57, 38, -33, -19, 42, 40,
+   16, 94, 38, 0, 32, -36, -40, 29,
+   -5, -57, -7, 8, -1, 40, 40, 48,
+   12, -26, 7, -24, 5, -61, -21, -50,
+   46, 13, -63, -91, 1, 12, -76, -42,
+   -88, 26, 62, -35, -28, -51, -12, 8,
+   -9, -102, 38, 23, 11, 32, -9, -43,
+   -15, 30, 20, -9, 21, 63, -6, -61,
+   -81, -25, -63, 37, 85, -30, 36, -4,
+   -63, 64, -43, -15, -65, 75, 19, 51,
+   36, 4, -50, -9, -31, 35, 35, 36,
+   27, 27, 3, -41, -68, -118, 11, 88,
+   -38, -48, -49, 10, -42, 16, 63, 12,
+   -30, 3, -15, -6, -111, 15, 19, 13,
+   70, 34, -9, 37, 14, -26, 91, 51,
+   43, 5, 2, 5, 86, -31, -55, -86,
+   -51, 20, -1, 56, -34, -41, -7, -88,
+   -3, -24, 54, -27, 40, -40, -23, -72,
+   -51, -104, -27, 38, -29, -57, -2, 4,
+   -79, -1, 48, -36, 2, -62, 24, 20,
+   -34, -119, -29, 2, 64, 73, 22, -100,
+   -72, 7, 3, -3, -25, 68, -71, 26,
+   -18, 8, -46, -6, -2, -66, 50, 25,
+   44, 29, 3, -2, 18, -67, 21, 12,
+   15, -4, -65, 126, -34, 68, 66, 36,
+   9, -32, -22, -5, 19, 27, 35, 47,
+   -2, -70, -50, 60, 2, 12, -26, -18,
+   -107, 9, -11, -16, 24, -9, -16, -49,
+   -43, 9, 23, 6, -4, -26, -114, -125,
+   -72, -41, 42, 64, 32, -1, -3, -73,
+   -88, -37, 0, 63, 80, -46, -9, 86,
+   -6, -86, -17, 20, -1, -17, 2, -8,
+   -75, 22, -47, 26, -50, 65, -41, -13,
+   105, -75, 2, -47, 13, -2, 26, -10,
+   -11, -82, 50, -24, -7, 16, -66, -32,
+   52, 25, 24, 59, -11, -12, -90, 67,
+   -4, 1, 3, 33, -22, 77, -12, -90,
+   11, 28, 57, 17, 49, -31, -44, 68,
+   4, -54, 5, -2, 66, 73, -96, -50,
+   -7, -7, -5, 99, 32, 58, 66, -60,
+   0, -116, 53, 6, 116, -41, -62, -51,
+   -6, -24, -7, -113, -66, 21, 3, -39,
+   10, -62, 74, -5, 57, -56, -9, -26,
+   13, 114, 0, 80, 83, -29, -3, 80,
+   35, 55, 41, 94, -72, 8, -44, 77,
+   48, 21, -27, -11, 9, -5, -80, 32,
+   -20, 59, 26, -71, 90, 37, -51, 127,
+   -4, -51, -120, 38, -25, -43, -124, 46,
+   -75, 40, 9, -7, 36, -58, 22, 42,
+   -39, -123, -15, -20, -49, -76, -45, -127,
+   -82, 32, 56, 77, 41, -86, 108, -9,
+   12, -75, 119, -57, -6, -77, -17, -63,
+   11, -116, -20, 14, -55, -9, -8, 109,
+   -22, -30, 22, -71, -18, 19, 68, 119,
+   36, 34, -6, 2, -6, 29, 122, 50,
+   -128, 87, 22, 68, -3, 75, 6, -53,
+   -39, -54, 24, -43, 0, -9, -26, -42,
+   -28, -73, 50, -70, 40, 93, -102, 65,
+   -27, 53, 45, -17, 44, -15, 60, 69,
+   0, 38, -6, -49, 27, 25, -88, 15,
+   22, 13, -40, 55, -19, 26, 48, -52,
+   14, -6, -5, 14, -53, -61, 69, -44,
+   -71, 59, 66, 87, 117, -33, 15, 99,
+   -50, 7, -37, 98, 51, 62, 55, -39,
+   -36, -61, -103, 8, -52, 50, -27, -110,
+   12, 15, 87, -44, -22, -23, -56, -4,
+   -17, 18, 58, -73, -128, 17, 39, 87,
+   5, -69, -20, -47, 64, 13, -8, -27,
+   -26, -10, 2, 9, 64, 25, 26, -32,
+   -53, -22, -18, 35, -63, 7, 119, 43,
+   28, 100, 2, -54, 110, 5, 4, -5,
+   98, -32, 29, -17, 83, -95, -116, 73,
+   -47, -76, 13, -89, -12, -35, -62, 77,
+   36, 52, 116, 117, 61, -19, -33, -7,
+   31, -41, 16, -8, -51, 9, 13, 36,
+   63, 43, -22, 19, -36, 6, -40, 29,
+   -4, 26, 42, -69, -66, 77, -73, 110,
+   -104, 46, 47, -40, -11, -41, 73, -39,
+   59, -29, 18, -12, -6, 9, 47, 13,
+   7, -24, -45, -109, 40, 26, 26, -2,
+   42, -93, 46, 92, -1, -85, 69, -4,
+   115, -72, -11, -47, 1, -25, 9, 7,
+   -49, 34, 24, 30, -48, 116, 3, -12,
+   -126, -21, 36, 17, -38, -13, -73, 2,
+   -84, -64, 127, -45, -50, -79, -81, -35,
+   14, 49, 91, -122, -52, -73, -42, 17,
+   -34, -12, -102, -33, -28, 45, 27, 47,
+   -9, -28, -4, -53, -49, 15, -3, -68,
+   9, 25, 60, -69, 0, 126, -55, -9,
+   -52, -94, -90, -13, -27, 109, 16, -6,
+   20, -69, 46, 43, -119, 29, 78, -54,
+   55, 67, -40, -49, -84, 25, 27, -16,
+   -84, -94, 15, 127, -125, 56, -24, 29,
+   -93, -33, -80, -82, 45, -5, -49, -29,
+   46, 21, 18, 27, 52, 9, -111, 8,
+   -81, -125, 109, -9, -91, 72, -18, -9,
+   3, -97, 12, -119, -99, -69, 57, -25,
+   -25, -106, -43, 34, -36, 114, -14, -23,
+   2, 46, 69, -9, -103, 87, 127, 74,
+   14, -5, 0, 14, -16, 73, 93, -30,
+   -2, 10, -123, 26, 74, 116, 22, 51,
+   -94, 108, -38, -38, -81, -38, 1, -46,
+   -86, -12, 60, -53, 64, 1, 63, -125,
+   -125, -20, 106, 88, 20, -127, 60, -10,
+   85, 19, -11, 45, 33, 2, 6, 66,
+   -76, 86, 47, 63, 91, 119, 56, 114,
+   86, -6, -13, 21, -40, 20, 21, 8,
+   -27, 44, 59, 36, -13, 99, 118, -47,
+   26, -94, 52, -76, -62, -76, 9, -25,
+   94, -27, 123, 34, 119, -35, 8, -16,
+   8, -44, -54, 24, -8, 31, 36, 31,
+   101, -42, -4, 18, -18, -4, 31, 49,
+   -8, -17, -28, 10, -20, -104, -55, -39,
+   75, -63, -10, -1, 33, 102, 69, 43,
+   49, 53, -42, 42, 24, 75, 3, -55,
+   -24, -20, -65, 78, 63, -1, -33, -31,
+   -40, -36, -42, -49, -1, 48, -70, 63,
+   51, -3, 70, 45, -33, 32, 62, -11,
+   -94, -94, -11, 33, -27, 101, -70, -4,
+   32, -48, 15, 44, -33, 16, -3, 124,
+   4, 64, 14, 73, -119, -72, 71, -39,
+   15, -33, -32, 54, -53, -32, 9, 45,
+   -56, 111, 11, 42, 35, 75, 8, 34,
+   -29, 24, -12, 45, 59, 45, -52, 35,
+   126, 90, 8, 9, 16, -31, 99, -72,
+   80, -100, 2, 20, 21, -36, 42, -22,
+   -38, 44, -20, -13, -8, 19, 25, 31,
+   -22, -89, 105, -52, 64, -19, -2, -98,
+   38, -23, -13, 22, -18, 4, 29, 24,
+   34, 56, 66, -5, -82, -80, 5, 57,
+   57, 0, -25, 44, -7, -73, -45, 33,
+   93, 41, 36, -18, 3, -76, -41, -59,
+   -14, 65, 28, 9, -55, 22, 75, 27,
+   56, 104, 16, 35, 39, -50, -13, -90,
+   -59, -35, 85, 42, 13, 46, 38, -35,
+   -84, -13, -30, 54, -16, -11, 12, 19,
+   -21, -11, -25, -17, 40, -115, 64, -120,
+   -68, 19, 79, 35, 2, 17, 4, -6,
+   29, 26, -68, -65, 73, -48, -64, -64,
+   -58, 3, 1, -15, 4, -7, -11, 7,
+   -8, 11, -52, 4, 51, 28, 8, 18,
+   8, 16, 6, 14, -60, 88, 65, 51,
+   30, 6, -33, 47, -26, 9, 59, 7,
+   -6, 13, 91, 97, -104, -19, -105, -44,
+   90, 21, -55, 45, 5, 40, 10, 73,
+   9, 33, -109, 57, -14, -1, 51, -51,
+   19, -4, 64, 19, -45, -80, -18, -77,
+   38, -32, -66, -40, 18, -7, -7, -38,
+   -47, 11, -59, -31, -59, 6, 86, 5,
+   5, -82, -30, 15, 30, 44, 35, 45,
+   52, -21, 61, -75, 61, -58, -7, 92,
+   -57, -17, 88, 0, 20, -9, -49, 15,
+   32, 57, 54, -116, -59, -57, -47, -6,
+   -33, -2, 71, -121, 113, 48, -15, 41,
+   -6, 67, -19, 37, 25, 22, 28, -11,
+   112, 20, -25, -19, 79, -45, -14, 48,
+   -51, -105, 123, 23, -39, 127, -2, 23,
+   -46, 68, 45, -46, -53, 54, 102, 28,
+   63, 14, 40, -26, 25, 43, 33, -55,
+   48, 5, -67, 55, -17, 60, -87, -4,
+   -92, 23, 122, -9, -58, -85, 49, -34,
+   43, -37, -25, -14, -54, -86, 53, -68,
+   5, 84, -19, -117, -84, 38, 70, 95,
+   -76, -86, 36, 54, 42, 50, 40, 83,
+   -9, 16, -25, -85, 48, 122, -30, 5,
+   47, -124, 57, -63, 44, -28, -122, -113,
+   27, -12, -119, 38, -69, 44, -39, -29,
+   -17, -126, 12, -4, -29, -23, 90, 0,
+   41, -103, 21, -48, 8, 90, -15, -60,
+   -43, 90, -51, 63, -15, 70, -17, 0,
+   4, 19, -81, -100, 42, -54, -18, 76,
+   -39, -43, -29, 29, 25, 9, -16, -34,
+   -23, 27, 51, -78, -91, 40, 91, 0,
+   102, -36, -126, -52, 22, 73, 44, -41,
+   -35, -34, 110, 14, -55, -3, 29, 16,
+   -33, 106, -39, 39, -61, -42, -1, -49,
+   -7, -1, 28, 18, 7, -19, 40, -13,
+   6, -52, 3, 2, 19, -19, 119, -100,
+   -51, 73, -50, -89, 8, -30, 6, 33,
+   28, -24, -1, 47, 23, -35, 46, -4,
+   -6, -33, 78, 40, -28, -10, -1, 39,
+   14, 25, 52, -1, 11, -39, 59, -22,
+   -2, 61, 24, 40, 111, 30, -4, 61,
+   -92, -95, 4, 66, 37, 19, 3, -3,
+   107, 1, 5, -10, 11, 21, 12, 63,
+   -13, 71, -93, -41, -3, 82, 31, -1,
+   2, -31, 1, 55, -36, 35, 17, 7,
+   111, -8, -31, -2, -70, -15, 19, 41,
+   -58, 10, 6, 15, -55, -55, -58, 26,
+   12, 54, 35, 3, 19, 35, 124, -54,
+   19, -68, -114, -2, 27, 37, -37, 34,
+   -58, -3, -95, 51, -31, -1, -49, 26,
+   -62, -7, 12, 7, 101, 16, -17, 126,
+   -9, -27, -24, 95, -22, -40, 29, -15,
+   24, 15, 25, 30, -43, -4, 25, 12,
+   33, 29, 21, 6, -72, -9, 21, 65,
+   -54, 65, -48, -22, 45, -36, 6, 5,
+   0, -20, 14, 25, -6, -6, 14, -31,
+   21, -22, -7, 58, 5, 53, 50, -16,
+   53, 73, 8, 22, -4, 15, 29, 67,
+   -119, -9, -28, -14, 74, 54, 58, -17,
+   69, 29, 66, 96, -70, -108, -128, 16,
+   -35, 54, 2, -69, 94, -7, 19, 2,
+   -66, -3, -126, 44, 59, 43, -5, -34,
+   16, -2, -13, -126, 14, 109, 37, 9,
+   32, -26, -86, -39, -71, -34, 4, 9,
+   -4, -16, -31, 80, 106, 21, 23, 29,
+   -37, -37, 8, 75, 59, 10, -41, -32,
+   30, -17, -44, -11, -28, 34, -35, 24,
+   -18, -9, -111, -53, -78, -127, -19, 24,
+   -21, 16, -110, 32, -94, -4, -17, -46,
+   -1, -122, -53, -21, 11, -96, -3, -21,
+   7, 2, -32, 46, 90, 35, -33, -19,
+   74, 43, 34, 30, 37, 63, 28, 23,
+   -83, 8, 27, -18, 20, -13, -44, -8,
+   21, 29, 47, 7, 24, -13, -119, 27,
+   -54, 9, 14, 26, 32, 102, 89, 25,
+   20, -5, 2, 33, -12, 22, 46, -45,
+   52, -25, 97, -65, 79, 79, 32, 18,
+   28, -78, -6, 88, 32, -29, 81, 31,
+   -13, -38, 27, -44, -35, 19, 14, 30,
+   51, -27, -11, -16, -12, 45, 51, -37,
+   -3, 11, 39, -3, -36, 23, 47, -9,
+   -21, 22, 84, 55, 56, 47, -12, -8,
+   -97, 83, 61, -119, 44, 27, 7, -43,
+   -21, 88, 7, -30, -52, -9, 125, 31,
+   -81, 56, -5, -71, -30, -52, -2, -24,
+   -7, 39, 52, 101, -124, -3, 20, -41,
+   -83, 65, 23, -42, 8, -38, -60, -14,
+   -21, 33, -30, -18, 123, -25, 68, -120,
+   -66, -3, -89, 3, -22, 22, -42, 75,
+   -34, -33, 78, -28, -40, -5, 24, 28,
+   -49, 29, 2, -59, 2, 8, 5, -71,
+   33, -83, -110, 24, 99, 33, -70, -41,
+   56, -7, -29, -46, -106, 20, -19, -42,
+   24, 18, -35, 18, -67, 119, -15, -34,
+   56, -40, -26, -50, 61, 98, 30, -53,
+   44, 123, 55, 42, -99, -15, -21, 41,
+   -94, 25, 56, -125, 51, -126, -45, 27,
+   -83, 20, -19, 67, 10, -103, -34, 11,
+   4, 42, -117, -15, -38, -59, 66, -54,
+   -63, -1, -49, 36, -31, -57, -28, 14,
+   46, 69, -24, 38, -54, 79, -31, -32,
+   -73, 3, -19, 122, 61, -20, -65, 107,
+   -7, -57, -125, 65, 8, -55, -32, -10,
+   -30, -90, -104, -119, -12, 18, -34, 2,
+   -28, -99, 67, -117, -113, -9, 6, 58,
+   -62, 126, 35, -40, -16, 98, 21, -2,
+   -5, 14, 24, 43, 48, 44, -9, 47,
+   58, 61, 17, 20, -30, 19, 103, -121,
+   21, -15, 45, 73, 25, 25, 28, 35,
+   30, 27, 2, 68, 24, 23, 114, 55,
+   -85, -10, -44, 38, 80, -27, -12, -24,
+   -28, -22, 88, -10, -35, 23, 18, 16,
+   86, 14, 53, 33, -86, 0, 35, -21,
+   22, 40, 33, 50, 13, 22, 15, -44,
+   16, -5, 50, 50, 23, 57, 18, 9,
+   29, -53, 64, -10, 7, -26, 13, 1,
+   -33, -29, -54, -32, 70, 40, -38, 27,
+   25, -24, -7, 28, 9, 46, 30, 43,
+   19, 26, 25, 37, -18, -1, -36, 45,
+   -50, -43, 35, 17, -9, -10, 4, -88,
+   -43, 40, 39, 30, 31, 77, -8, 95,
+   -70, 40, 96, 45, -41, 16, -126, 15,
+   -29, -12, -19, -21, 17, 53, 22, -24,
+   -62, 6, 33, 17, -28, -16, 114, -51,
+   9, -45, 37, 30, 111, -28, 10, 0,
+   -30, -27, -5, 84, -75, -47, -2, 78,
+   -58, 0, 33, -14, 91, -124, -1, 32,
+   0, -61, 1, -56, -4, -15, 42, -38,
+   12, -7, 10, -26, -6, 40, 3, -57,
+   -77, 38, 79, 47, -14, 48, 15, -10,
+   -23, 25, 23, -41, 29, -5, 10, -127,
+   -61, -58, 25, -51, -37, 29, -5, 36,
+   -82, -95, -40, -9, 35, 42, 65, 24,
+   -9, -46, 3, -58, -11, -70, -48, -26,
+   28, -21, -53, 18, 10, -13, 75, 22,
+   54, 41, -29, -55, 50, -5, 28, 15,
+   15, -59, -22, -46, -35, -51, -33, -11,
+   -66, -23, 9, 2, 11, 20, 7, 55,
+   -52, -15, -28, -54, 5, -120, -63, -39,
+   14, -49, -18, -61, -87, 19, 20, 36,
+   113, -9, -28, -29, -64, 7, -13, -50,
+   -8, 18, 34, -29, -33, -25, -9, -2,
+   -39, 49, 14, -16, 37, 44, 67, -3,
+   -93, 57, -26, 14, 24, 77, 5, 38,
+   10, -10, -8, 38, -21, 20, -9, 71,
+   2, -3, -32, -34, 2, -125, -51, 3,
+   17, 26, -104, -98, -51, 30, 17, -5,
+   -19, -21, -21, -41, -93, 8, -52, -25,
+   54, -1, -12, 19, -2, 35, 56, -39,
+   49, 56, -52, -14, -58, 37, 50, -66,
+   -27, 18, 35, -80, 22, 12, -6, -77,
+   30, -22, -18, 37, -29, 19, 18, 15,
+   -34, -45, -1, -5, 58, 52, 9, -9,
+   -105, -115, 91, 45, -3, 20, 27, 2,
+   54, 116, 109, 84, -52, 9, 33, 7,
+   13, 13, -47, 14, 30, -3, 111, 11,
+   51, 98, -44, -112, 93, -41, -45, 122,
+   73, -9, -28, -48, -9, -61, -91, 18,
+   67, 91, -54, -52, -86, -124, 65, -50,
+   -56, 20, -42, 4, -75, 56, 90, -81,
+   -104, 42, 16, 102, 35, 107, 73, 51,
+   9, -50, -100, 24, 64, 38, -17, 120,
+   -16, 27, 114, -107, 85, 74, -50, -13,
+   -80, 3, -14, 6, 67, -23, -123, 49,
+   49, 22, -85, -69, -110, 126, 58, -15,
+   80, -16, 91, 51, 45, 55, -23, 96,
+   -90, -5, 20, -9, 69, 49, 6, -15,
+   124, 36, 38, 36, 29, -91, 56, 51,
+   26, 4, -120, 3, -42, -23, -12, 13,
+   5, 5, -69, -33, 12, -81, -2, -4,
+   59, 78, 100, -8, -109, 28, 5, -121,
+   -1, 35, 2, -13, -9, -67, -120, 6,
+   29, -111, -58, 45, -33, -30, 12, 123,
+   16, -43, 2, -24, 45, 19, -90, -12,
+   -36, -88, 0, 15, 18, -4, 35, 39,
+   -60, 34, -8, -35, 15, -120, 10, -22,
+   81, -100, -21, -37, 0, -19, 34, -87,
+   6, 54, -18, 41, 43, -4, 11, 25,
+   49, -19, 24, -20, 31, -97, 4, 13,
+   74, 90, -59, 27, -11, -19, -5, 53,
+   43, 20, -5, -84, 34, 13, 34, -47,
+   -56, -30, -64, 32, 37, 52, 28, 60,
+   19, 38, 72, -40, 16, 10, -36, -5,
+   -30, 50, 24, -13, 36, 25, 43, -39,
+   -23, -22, -24, 47, 95, 40, 40, 2,
+   11, -66, -7, 48, -24, -26, 27, -7,
+   25, -8, -31, 89, 25, -12, 40, -7,
+   22, 45, 56, -21, 4, -16, 70, 48,
+   13, 28, 3, 0, -27, -1, 30, -3,
+   31, 8, -1, 18, 8, 50, 15, -10,
+   76, 112, 27, -55, 41, 38, -23, 18,
+   -65, -74, -27, 9, 17, 21, 78, 60,
+   17, 29, -63, -49, -53, -102, 8, 52,
+   112, -7, -52, 37, 27, -39, -15, -5,
+   5, -14, 33, 109, 65, 64, 68, -1,
+   -18, -79, 74, -10, 50, 37, 20, -113,
+   -40, 84, -50, 2, -24, 122, 42, 60,
+   -16, -41, 44, 54, 15, -52, 29, 17,
+   4, -59, 85, -10, -11, 28, 29, 33,
+   -49, -72, -101, -45, 65, -21, -8, -25,
+   3, -36, 24, -59, 12, -1, -52, -31,
+   -59, 33, -17, -30, 53, 113, -116, 70,
+   20, 0, -20, 27, -119, -53, 19, -20,
+   -85, -92, -20, -32, 14, -120, 22, 22,
+   126, -47, -18, 50, -38, 81, -126, -62,
+   -86, -105, 26, 29, -44, 125, -54, -127,
+   -120, -21, -126, -54, 16, -112, 36, -3,
+   75, 123, 8, -54, 38, 59, -16, -23,
+   11, -127, -26, -64, -121, 56, -94, -5,
+   7, 13, -10, -18, 58, 25, -6, 29,
+   21, 42, 70, -33, -35, 36, 43, 48,
+   109, -9, -120, -123, -38, 36, -121, -34,
+   -112, 66, 16, -125, -78, 127, -128, -51,
+   -27, -102, -119, 118, -18, 127, -12, -24,
+   7, -16, 10, -66, -36, 9, -36, 9,
+   41, 67, 18, 82, 14, -15, -67, 67,
+   2, 5, -84, -16, -37, -10, -51, -27,
+   74, 41, -114, 0, 67, 0, 100, -22,
+   20, 8, -42, -15, -36, 11, -12, -85,
+   34, -24, 13, 18, -43, -18, 27, 38,
+   -28, 5, 49, -2, 36, -17, 101, -76,
+   27, -20, 58, -25, -27, 0, -17, -18,
+   23, -64, 24, 35, -21, -106, 24, 2,
+   -21, -63, -14, -19, -7, 19, -63, 10,
+   29, -35, 6, 10, 13, -10, -15, 1,
+   -8, 14, 16, -7, -7, 19, 25, -14,
+   -56, -32, 53, -10, -48, -28, -127, 7,
+   -49, -75, 3, 25, -7, 7, -49, -114,
+   2, 31, 19, 56, -56, 24, 103, 64,
+   51, -77, -66, -20, -28, 82, -85, 11,
+   -54, 49, -8, -10, 23, -101, -4, 103,
+   -70, -40, -4, 91, -45, -42, -73, 1,
+   -58, 1, -10, 7, 9, -52, 17, -30,
+   1, 6, -125, 12, -16, -70, 49, 126,
+   -8, -56, -26, 63, 127, -127, -70, 32,
+   -50, -88, -15, -19, 38, -32, -11, 25,
+   91, 124, -55, 77, 52, -22, -21, -66,
+   -66, 125, -41, 2, 33, -79, -42, 6,
+   -47, 44, 18, 32, 30, 15, 26, -8,
+   -97, 8, 49, -29, 51, 95, 90, -69,
+   -54, 2, -70, 17, -66, -41, -16, 116,
+   -14, 74, 8, 4, 51, -28, -125, 17,
+   74, -30, -44, 39, 30, -68, -6, 27,
+   68, -1, -46, 44, 39, -102, -69, -79,
+   81, -25, 62, 89, 5, 20, -43, -1,
+   46, 11, 29, -10, -57, 13, -21, -12,
+   37, -35, -3, 21, 78, -122, -90, -48,
+   -2, -16, 24, 45, -120, 4, 30, 15,
+   115, -80, 38, 95, -60, 80, 61, -29,
+   13, 58, 82, 29, 81, 3, 28, 31,
+   -14, -47, 40, -45, -6, -56, 17, 30,
+   -52, -21, -122, -102, 22, -17, -62, 12,
+   -7, -12, 94, -38, 11, -88, -44, -16,
+   37, -43, 31, -36, 31, -10, -89, 126,
+   -123, -2, 19, -81, 23, -78, -13, 25,
+   -5, -34, 2, -30, 24, -5, -33, 6,
+   44, 10, -9, 8, 6, 47, -8, 32,
+   9, 8, -4, 24, -17, 53, 89, 17,
+   40, -20, -57, -112, 31, 6, 55, -21,
+   -112, 111, -124, -26, -47, -16, 76, -8,
+   -21, -59, -38, -17, -10, 20, 73, -48,
+   50, 2, -33, -79, -40, 82, -2, 3,
+   101, -40, 14, 42, -94, 34, -55, -126,
+   -9, 12, 35, -112, 58, -30, -30, 4,
+   55, 37, -36, -126, -14, -68, 77, -37,
+   99, 2, -23, 11, -31, -120, 22, -101,
+   -51, 52, -17, -37, 1, -12, 15, 20,
+   45, 58, -37, -86, -13, 42, 53, 76,
+   -48, -1, -45, -60, 17, 42, -81, 1,
+   18, 48, -61, 127, 23, -23, -8, 27,
+   41, 6, 36, -125, -61, -64, 33, 1,
+   63, -44, 22, -63, 40, -118, -83, -3,
+   31, -83, -94, -105, -43, 84, -6, -69,
+   41, 25, -66, -13, 3, 91, 31, 72,
+   -25, 52, 73, -126, -8, -116, 72, 14,
+   -34, 12, -111, -26, 4, -102, 67, -28,
+   47, 5, -52, 114, -11, 55, -120, -93,
+   -105, -46, -24, -47, -16, 0, 15, -13,
+   -101, 64, 127, -96, -67, -128, -125, -29,
+   -30, -17, -56, 3, -33, 14, 4, 22,
+   56, -46, -60, -121, -21, 35, -16, 115,
+   6, 0, 11, -12, 19, -4, -4, -122,
+   46, 33, 40, -40, 42, 67, -39, -32,
+   -51, 67, -127, 54, 13, 23, 58, -3,
+   -88, -2, 61, 72, -69, 7, 123, -52,
+   10, 10, 17, 22, -17, 6, 21, -55,
+   -3, -23, -12, -47, 2, 66, 12, -7,
+   25, 78, -55, -29, -23, -36, -12, -58,
+   -115, -13, 13, -52, -17, 5, 30, -20,
+   69, 26, -45, -33, 19, 12, -16, 21,
+   -21, -37, 5, -18, -54, -43, -1, 49,
+   1, 34, 23, -24, 57, -86, -9, 48,
+   12, -95, -59, -47, -36, 6, 81, 28,
+   -2, 11, -4, -4, 27, 13, -21, 34,
+   60, -31, 11, -25, -5, 18, -32, 125,
+   51, 65, -68, 11, 22, 115, 56, -66,
+   24, 41, -90, -17, 20, -35, 81, 7,
+   58, 71, -24, 61, 17, 16, 22, -37,
+   61, 124, 88, 18, 11, -64, -73, -22,
+   58, -92, -96, 106, 18, -41, 88, 83,
+   122, 105, -77, -21, -97, -128, 13, 41,
+   -11, -70, 55, -12, 5, 35, -41, -80,
+   -33, 52, 10, -75, 0, -41, -35, -51,
+   -51, 18, 31, 25, 92, -107, 35, 28,
+   117, -2, 26, -127, -14, -48, -53, 9,
+   -123, -25, -62, 90, 14, -5, 43, 1,
+   25, 64, 90, -23, -35, -75, 25, -42,
+   18, -73, 2, 34, -65, 29, 28, 33,
+   -32, -37, 6, -7, -90, -83, 2, 29,
+   15, -47, -51, 47, 21, -8, -9, -43,
+   53, -23, 45, 19, 23, -57, -39, 14,
+   56, -114, -64, -2, 13, -64, -34, 61,
+   -8, 24, 26, -1, 6, 14, -126, 0,
+   -6, 21, -43, -18, -29, 21, 46, -26,
+   -3, -25, -23, 18, 60, -48, 47, -11,
+   -69, 74, -34, -41, 4, 18, 16, 41,
+   32, -128, -42, -59, 48, -17, -81, -40,
+   -56, 19, -3, -19, -53, -4, -36, 52,
+   93, 40, 123, -25, 26, -93, -122, -127,
+   38, 10, 37, 25, 18, -29, -24, 22,
+   3, 41, -15, 90, -64, -53, -23, -64,
+   -77, 91, -54, 80, -21, -41, 17, 19,
+   16, 7, -3, -19, -61, 31, -43, -57,
+   -29, -45, 44, 40, 30, 57, 43, -23,
+   -28, -53, 4, -38, -26, -87, -8, -11,
+   28, 42, -54, 75, 1, -42, 58, 3,
+   24, -26, -27, 37, 15, 96, 52, -20,
+   -5, 46, 52, -11, -30, -14, 22, 2,
+   -11, 3, 28, 38, 61, 23, 99, -27,
+   -20, -1, 21, 16, 31, 24, 16, -29,
+   -22, -21, -2, -76, 19, -81, -124, -47,
+   -4, 30, 18, -22, -74, 46, -43, 31,
+   33, -18, -54, -8, 43, 41, -19, 36,
+   -22, 41, 72, 87, 36, -24, -11, 2,
+   8, 98, -30, -37, 47, -21, 12, -30,
+   -128, -71, 91, -72, -39, -15, 100, -20,
+   98, 20, -29, -46, -36, -46, 40, -12,
+   -7, 45, -48, -10, -39, -8, -45, 9,
+   57, -49, -10, -21, -21, -49, -17, -18,
+   -28, -31, 90, -10, -63, 17, -33, -40,
+   -71, 34, 22, -9, -31, 121, 4, -1,
+   -83, -18, 25, 5, 18, -19, 20, 49,
+   9, 16, 27, 14, 23, 18, 53, 28,
+   -99, -42, 17, -43, -114, 3, -12, -13,
+   -10, -7, -37, -27, -7, 26, -14, 19,
+   -6, 25, 13, 17, 19, 63, -67, 47,
+   -39, -126, 12, 32, 17, 12, 9, -50,
+   -126, -90, -28, -70, 9, 102, -59, -19,
+   20, -58, -126, -13, -76, 1, -4, 69,
+   -42, -49, -18, -124, -59, -68, 32, -31,
+   18, 127, 24, 123, -18, 30, -25, -7,
+   13, -127, -71, -19, -43, -110, -11, -111,
+   53, 33, 77, 119, 74, -70, -127, 83,
+   68, -15, -2, -29, -48, -10, -38, 16,
+   -5, -32, -98, 25, -64, -51, -124, -126,
+   -126, -54, 62, -116, -28, -76, 2, -123,
+   -27, -52, 127, 102, -76, 99, 70, -64,
+   -3, -114, 124, -56, -29, -26, 1, 11,
+   55, 101, -38, 50, 111, 10, -43, 48,
+   -72, 20, -78, 23, 46, -25, -23, 44,
+   -30, -27, 31, -17, 55, 27, -75, 59,
+   81, -38, 25, -44, 111, 57, 19, 12,
+   84, 7, -15, -56, 42, 49, 15, 38,
+   -9, -56, 38, 92, 81, 17, 92, 32,
+   25, -39, 8, 40, 2, 34, -41, 26,
+   35, 64, 57, 47, -32, -120, 46, -5,
+   -51, -114, 82, 61, 55, 31, -59, 120,
+   106, 115, -3, 6, 16, 54, -12, 43,
+   12, 21, 3, -12, -35, 15, 41, 67,
+   67, -15, 48, 65, 57, -23, 3, -37,
+   -46, -72, 18, -69, 97, 12, -91, 13,
+   16, -61, 8, 12, -107, 26, 15, -61,
+   3, 42, -51, 39, 40, 69, 29, 6,
+   -4, 42, 16, 16, 94, 40, -9, 72,
+   40, -2, -2, 34, -18, 26, -20, 80,
+   8, 120, 30, 65, 98, -42, 83, 23,
+   -47, -30, -14, -25, -18, 22, -118, 90,
+   49, 2, 15, 41, 22, 11, -30, -27,
+   58, 30, 50, -66, 13, 100, -57, 5,
+   58, 26, -8, 94, 17, -61, 56, -72,
+   28, -113, -52, -24, -18, 28, 55, 0,
+   9, -109, -102, -1, 19, 67, -15, 61,
+   -20, -108, -1, -32, -89, -9, 35, -80,
+   -19, 66, 90, 76, -97, 34, -20, 51,
+   -69, 18, 42, -19, 76, -21, -1, 71,
+   -51, 72, -29, 40, -60, -8, 72, 16,
+   21, 36, 22, 55, 31, -17, 75, 70,
+   24, -10, 28, 1, -15, 22, 51, -17,
+   -31, 54, 75, 84, 51, 99, 55, 4,
+   26, 5, 6, 51, -1, -36, 53, 27,
+   -72, -63, -38, 17, 102, 114, -35, -61,
+   50, 66, 125, -14, -36, 25, -32, -17,
+   17, -9, -70, -83, 41, -36, -40, 8,
+   87, -60, 15, -75, -58, -54, -24, -4,
+   4, -109, 36, 46, 73, -66, -6, -34,
+   12, -30, 74, -55, -23, 70, 25, -1,
+   -52, 72, 35, 109, 27, -28, -37, 44,
+   39, -66, -125, 18, -49, -9, -5, 53,
+   -15, 42, 49, 80, -90, -60, 108, -46,
+   -13, 16, 37, 4, 55, 7, -47, -28,
+   -79, 38, 25, 57, -20, -9, 53, -74,
+   68, -22, 29, 20, 51, -114, -1, -23,
+   88, 16, 71, 30, 54, 82, -12, -21,
+   -34, 16, 35, -25, 54, -94, 36, -87,
+   0, -62, 29, -50, -22, -41, -108, -54,
+   28, 24, 122, 6, 74, 91, -35, 18,
+   -35, -3, -38, -62, 32, 112, 50, -53,
+   -73, 25, 58, -27, -69, -45, 44, -3,
+   -50, 63, -19, 47, -50, 44, -11, 10,
+   77, -1, -17, -24, -97, -98, 22, 33,
+   -34, 14, 10, -72, 123, -62, -47, 75,
+   -34, 9, -43, 61, -71, 42, -103, -38,
+   47, -114, 0, 16, -52, -24, 62, 27,
+   -29, -63, -13, 51, 126, -31, 19, 8,
+   -67, 11, -111, 126, -17, -15, 51, 127,
+   -18, 8, 20, 5, -24, -38, 19, -39,
+   -5, 94, 15, -21, 4, -64, -58, 71,
+   -92, 30, 43, -23, 3, 17, 58, 27,
+   38, -37, -22, -12, 40, 62, 33, 9,
+   5, 33, -34, 15, -35, 36, 118, 10,
+   17, 42, 45, 57, 19, 32, 55, 58,
+   79, -126, 16, -99, -28, 10, -22, 16,
+   45, 55, -1, 125, -38, -7, 40, 56,
+   4, -76, 41, -50, -20, -40, 59, -45,
+   -24, -60, 62, 97, 47, 65, 2, -57,
+   -4, -41, -7, 67, -4, -16, 41, -54,
+   15, -42, -4, 94, 20, -101, -63, -126,
+   56, -36, -5, 47, -11, -33, -24, 35,
+   64, 28, -24, 104, 44, 22, -19, 40,
+   -8, -49, -54, 80, 62, 43, -29, -8,
+   -7, -20, 3, 32, -59, 53, -4, 10,
+   -82, -122, -126, -98, -60, -33, 124, 126,
+   12, 68, 10, 1, 127, -12, -12, -46,
+   54, -127, -86, -41, 26, -35, -125, -14,
+   3, 56, -50, -123, -14, 59, -47, 109,
+   -12, -18, 115, 55, 32, 22, 108, 22,
+   -47, 18, -128, -50, 94, -4, 2, -17,
+   -25, -49, 37, 11, -30, -10, 70, 29,
+   -8, -81, 16, 56, -63, 0, 45, 40,
+   -2, 124, 15, -5, 22, -89, -9, 39,
+   -52, -1, -5, 70, -67, 15, 14, -27,
+   26, -18, -34, -22, 11, 1, -1, 6,
+   -65, -104, 30, -32, -18, -125, 72, -63,
+   70, 26, -82, -103, 7, -44, -26, 26,
+   115, 11, -1, -22, 10, 75, 42, 7,
+   -35, -105, 52, -9, -41, -1, -125, 22,
+   49, 8, 44, -128, -68, 47, -112, -121,
+   27, 108, 64, -118, 4, -68, -7, 42,
+   24, 64, -121, 47, -29, 120, -44, 124,
+   -29, 38, 21, -5, -7, -21, -8, 85,
+   4, 38, 16, 27, -32, 100, -3, -11,
+   -25, -18, -111, 40, 32, 46, -4, 28,
+   -70, 102, -23, 50, 13, -25, 41, -29,
+   -22, 25, 12, -50, -108, 36, -38, -3,
+   -12, -35, 21, 108, -103, -127, -11, 0,
+   -125, -39, -126, -122, 22, -123, 55, -123,
+   26, -89, 50, 14, -127, -21, 117, 26,
+   -69, -127, 95, 1, -81, -41, 51, -27,
+   10, -59, -18, -128, -50, -91, -123, -69,
+   21, -14, -63, -119, 75, 24, -73, 7,
+   52, -39, -100, -33, -127, -25, 19, 23,
+   56, 7, 2, -12, -26, -2, 27, -45,
+   24, 13, -32, 64, 40, -34, 47, -35,
+   -89, 76, -71, 70, -34, 30, 22, 9,
+   -124, 13, -105, -33, -31, 42, 9, -68,
+   110, -38, 54, -72, 21, -126, -27, 16,
+   19, -22, 1, -31, -63, 28, 3, -58,
+   37, -9, 10, -75, -6, 97, -54, 113,
+   -40, -37, 90, 63, 27, 52, -58, 61,
+   23, 118, -3, 23, 35, -14, -66, -60,
+   5, -38, 37, -94, -17, 47, 115, 36,
+   -87, -46, -29, 0, 4, 72, -9, -73,
+   -50, -10, 14, 31, -10, 20, -44, -89,
+   -12, 63, 63, 36, -50, -71, 59, 109,
+   -62, 48, 30, -19, -53, -95, -3, 60,
+   -48, 76, -12, 24, 98, -20, -99, 23,
+   58, 7, -7, -7, -9, -50, -13, 18,
+   80, -118, 22, -16, -48, -17, -36, 33,
+   -24, 47, 56, -114, -25, -120, -110, -73,
+   91, -41, -16, -46, -21, -73, 14, 113,
+   -24, -40, 63, 33, 17, 120, -53, -22,
+   127, 58, 25, 11, -16, -7, 17, 127,
+   -73, -95, 28, -18, 51, 121, 0, 42,
+   6, 17, -16, -18, -18, 114, 27, 61,
+   -29, -51, -15, 1, -71, 37, 25, 99,
+   85, -36, 8, 11, -88, -15, -114, 72,
+   23, -59, 50, 85, -55, -32, -16, 70,
+   84, -29, 50, 56, -5, -19, 62, 56,
+   11, 51, 43, -31, 5, 92, 1, 9,
+   -76, 18, -89, 3, 6, 44, 45, 40,
+   -1, -33, 35, 21, -25, 35, -11, 50,
+   -50, -61, 28, -108, -6, -62, 111, -13,
+   44, -66, -31, -9, -22, 18, -46, 8,
+   -14, -43, -5, -95, 77, 80, 31, 23,
+   32, -48, -3, -29, -9, -41, -25, -80,
+   -34, 55, 1, -11, -10, 22, -69, 6,
+   -19, 83, -49, -28, 20, -4, 52, -8,
+   -31, -18, -6, 48, -22, 53, -16, -24,
+   -56, -59, -32, -34, -11, -50, 49, 31,
+   55, -29, -53, 35, 6, -16, 1, -19,
+   -6, -12, -25, 21, 41, -1, -2, -38,
+   -43, -83, 18, -2, -18, -27, 54, 47,
+   24, -33, -50, 4, -6, -3, -23, -16,
+   34, 4, 34, 29, -72, 89, 58, 91,
+   25, -5, 35, -98, 33, 0, -14, -52,
+   96, -38, -81, -24, 36, 68, 0, -42,
+   8, -20, -14, 10, 115, 17, 6, 37,
+   0, -52, 64, -10, -28, 26, 89, 10,
+   16, 68, -7, 12, 26, 21, 73, -51,
+   -53, -65, 1, -30, -6, -17, 3, 1,
+   11, 7, 82, 39, -37, -59, 59, 3,
+   111, 13, 14, -19, -68, 44, 11, 11,
+   22, 120, 13, 18, -32, -17, 1, 18,
+   51, 53, 31, -15, -49, -16, -74, -39,
+   -52, 55, -68, -28, 116, 12, 25, 37,
+   60, 64, 54, 56, -60, 79, 51, -46,
+   62, -17, 2, 38, -46, 99, 123, 28,
+   114, 46, 87, 1, -61, 64, 67, 21,
+   0, -38, -19, 29, -61, 1, 50, 16,
+   -8, 51, 48, 89, 49, 47, 96, -13,
+   -29, 73, 27, 126, -12, 0, -23, -22,
+   18, -42, -39, -28, 23, 118, -26, -62,
+   63, -44, -27, 92, 32, -16, 42, 90,
+   -22, -63, -41, 19, -46, 98, -61, -70,
+   46, 0, -65, 37, -16, 54, 1, -3,
+   72, -56, -108, 7, 27, -38, -125, -41,
+   10, -6, -60, 127, -32, -71, 68, 10,
+   -35, 64, 44, 48, -21, -41, -37, 23,
+   -59, 40, 38, -22, 26, 18, -20, 73,
+   -114, -24, -53, -39, -27, -11, -98, -21,
+   5, 71, -115, 11, -37, -107, -60, -5,
+   72, -84, -62, -28, -5, -121, -86, -2,
+   -51, 53, 127, 124, -39, 44, -44, -125,
+   79, 29, 42, -6, -39, -29, 19, -26,
+   10, -72, 49, 13, 41, -51, -97, 0,
+   -93, 52, -84, -32, -66, 12, -35, 20,
+   3, 22, 69, 20, 97, -43, 41, 8,
+   -36, -26, 118, 26, 10, 35, -52, -2,
+   22, 8, -13, -43, 2, -44, -1, -18,
+   5, 61, -118, -103, -55, 5, 13, 10,
+   5, 4, 106, 2, -22, 30, -13, -117,
+   -121, -38, 29, 24, 14, -14, -62, 33,
+   -13, -18, -8, -69, -6, -113, -91, 1,
+   -36, -32, -17, -36, 40, -10, -34, 10,
+   -74, -27, -33, -33, 12, 18, 4, -1,
+   -1, -33, 34, 8, 26, -41, 120, 60,
+   -41, -5, 11, -41, 37, 10, -7, 31,
+   31, 26, -55, 25, -1, -12, 53, 43,
+   29, -8, -48, 29, -94, 39, 41, -45,
+   91, 15, 3, 29, 12, 69, 13, -68,
+   65, -12, 54, 55, -18, -11, -40, -18,
+   -36, 76, -11, -79, -11, -16, 38, -42,
+   86, -14, 37, -6, -8, 57, 2, -28,
+   11, -47, -89, -34, -47, -73, -121, -19,
+   -73, 69, -6, 35, -5, 114, 82, -39,
+   14, 5, -67, 12, -21, -17, -96, 14,
+   -20, -12, 2, 81, 12, -1, -126, 65,
+   -16, -36, -2, 4, -35, 2, -6, 49,
+   1, -42, 69, -11, -47, -25, 25, 9,
+   103, -50, -54, -8, 6, -56, -8, 21,
+   6, 7, -104, -18, -106, 51, 127, -85,
+   50, -6, -27, 20, 91, 22, 4, 39,
+   25, 43, -5, -20, -32, -95, -3, 40,
+   -104, -11, -55, -128, -46, -71, 37, -101,
+   77, -6, -44, 49, 26, -63, -105, -54,
+   60, -58, -13, -37, 39, 43, 72, 42,
+   22, 65, -60, -75, -59, -116, -106, -3,
+   25, 45, -109, -84, -123, -28, 35, -24,
+   0, -114, -82, -109, -114, 3, 14, 117,
+   55, -17, 19, 32, 68, 45, 8, -128,
+   75, -46, 82, 80, -85, -15, 106, -44,
+   92, -31, -106, 93, -33, 80, 37, 3,
+   -92, 15, -18, 40, -107, 28, -48, -87,
+   -127, 37, 47, -64, 14, 36, 20, 10,
+   25, 66, 18, -69, 92, 59, 17, -128,
+   -48, -39, 120, -14, -63, -31, -48, 8,
+   -9, 60, -21, -19, -2, -2, 37, -84,
+   98, 80, -120, 82, 21, -126, -14, 8,
+   -54, 3, -6, 52, 8, -16, 23, -3,
+   9, 61, -124, -9, 31, 14, -31, -2,
+   -30, -3, 2, 2, 0, 111, -42, 5,
+   -21, -43, 52, 36, 17, 39, 79, -30,
+   53, 15, 5, -97, -29, 10, -7, 1,
+   -91, 78, 35, 34, 14, 38, -9, -16,
+   -96, 15, -125, 7, -22, 32, 17, -101,
+   16, 15, 23, -30, -62, -15, 6, 27,
+   4, 55, 38, -37, 29, -70, 33, -101,
+   -59, -103, -50, -34, -50, -62, 53, -26,
+   127, 1, -1, -10, -6, -13, 7, -13,
+   95, -111, 55, 12, 6, -3, -108, -59,
+   27, -64, 36, -122, 125, 27, -75, 12,
+   1, -59, 84, -105, 109, -94, -76, 20,
+   23, 11, -36, -36, 43, -43, -123, 15,
+   -100, 65, 20, 16, -42, 25, 69, 28,
+   37, 22, 112, -78, 23, 17, -10, 34,
+   -63, -11, -127, -46, 39, 39, 12, -47,
+   -69, -67, -53, -60, 8, 15, 45, -83,
+   6, -30, -114, 9, -78, -43, -47, 69,
+   15, -72, 68, 44, -53, 20, -120, 58,
+   -4, 42, -11, -16, -125, 9, -65, -9,
+   -4, -84, 105, -12, -92, -105, -21, -33,
+   -121, -68, -8, 1, -39, -119, 38, -1,
+   -2, -127, 3, -104, -43, 127, -4, -35,
+   -125, 117, 106, -67, 49, 69, 15, -102,
+   80, 8, -84, -84, -96, -94, -27, -32,
+   4, -3, -16, 98, -25, 17, -24, 51,
+   11, 37, 23, -85, -61, -41, 62, 28,
+   -127, -124, -101, -27, 98, -71, 56, 1,
+   -92, 28, 7, 13, -11, 34, 23, -125,
+   56, 111, -124, -44, -15, -47, 5, -7,
+   2, 45, 1, 26, -54, 26, 11, 0,
+   5, -11, 22, 35, -41, 5, 41, -78,
+   24, 18, -5, -30, 49, 22, -1, -19,
+   39, -26, 1, -16, 8, -8, 3, 17,
+   75, -1, -50, 30, -49, 3, 24, 35,
+   38, 1, 3, -9, 10, -45, 42, -6,
+   -26, -35, 71, 75, 0, 17, 5, 11,
+   57, -90, -100, 0, 50, -1, 26, 32,
+   11, -20, 121, -41, -9, 22, 5, -2,
+   -40, 22, 4, -71, -14, 3, 10, 6,
+   -5, 0, 29, -22, 86, -3, 4, 8,
+   13, 8, -3, -58, -30, -19, -15, 18,
+   6, 16, -19, -87, 26, -11, -46, 64,
+   40, 6, 108, -16, 49, 67, -45, 15,
+   51, -6, 75, 87, -39, -92, 27, -14,
+   7, -32, -128, -15, 39, -4, 50, 0,
+   -26, 25, 62, -24, 67, -57, 27, 64,
+   -25, 29, -35, 69, 6, -56, -70, -1,
+   7, -69, -32, 45, 52, 31, 20, 27,
+   -29, 26, -72, -95, 38, 125, -8, 67,
+   -33, -126, 7, -13, 86, -111, -9, 23,
+   -52, 8, 16, 59, -26, -9, -19, 40,
+   -10, 87, 21, 17, -60, 126, 120, -22,
+   35, 22, -14, -24, -33, 2, -96, 97,
+   -126, -118, 17, 9, 41, 70, 14, -50,
+   11, -20, -37, -7, 76, 16, -52, 21,
+   -34, 34, 13, -13, -81, -126, 82, 65,
+   -14, 22, -23, -82, 61, -124, 34, -78,
+   76, 56, -128, 41, 36, -48, 45, -40,
+   33, 1, -102, -45, 0, -126, -58, -62,
+   -2, 60, 6, 108, -17, -37, -76, 13,
+   8, 24, -6, -9, 69, 62, 26, -11,
+   -9, 15, -30, -6, -48, -121, -98, -60,
+   -125, 26, 52, 18, -64, 108, -20, -126,
+   58, -123, 48, 70, -117, 75, 46, -62,
+   9, -34, -21, 39, -15, -91, 37, 1,
+   -32, 18, -10, 44, -11, 15, 39, -32,
+   -55, -55, 92, -52, 37, -6, -9, -45,
+   -89, -30, 14, -29, 11, -69, -35, -62,
+   21, 55, -1, 85, 21, 50, -20, 5,
+   9, -81, 22, 80, 33, 38, 35, 29,
+   -22, 39, 83, -54, -5, 5, 14, -25,
+   3, -20, 29, 20, -14, 7, 20, 7,
+   11, -32, -52, -15, -8, 8, 36, -8,
+   21, -9, -34, -116, -14, 32, -23, 38,
+   30, 5, 27, -5, -78, 67, -4, -53,
+   -75, 9, 53, -12, 8, -3, 15, -4,
+   -10, -4, 21, 52, -16, -13, -36, -20,
+   -67, 113, -57, -27, 46, -5, -9, -27,
+   -123, -71, 71, 38, -30, 113, 31, 24,
+   58, 8, 43, -77, -13, -81, -40, 55,
+   29, 9, 13, 30, 4, -29, 24, 10,
+   -124, -10, 1, -25, -77, -30, 25, -12,
+   -29, 5, 47, -36, -39, -41, -39, -19,
+   -44, 0, 72, 34, -10, 9, 58, 45,
+   24, -45, -75, -17, -9, 74, -20, -35,
+   28, -68, 5, -82, -22, 12, -63, 35,
+   -6, 23, 37, -9, -46, -19, -22, 32,
+   13, 7, 1, 14, -29, 65, 35, 4,
+   66, -23, 33, 42, -28, 111, -18, 19,
+   -26, -79, -3, -68, -89, 126, -56, 0,
+   -83, 19, 95, 24, 52, -66, 10, 98,
+   -18, 51, -31, -13, 8, -126, -5, -48,
+   91, -37, 127, -11, 105, -119, 18, 72,
+   60, -128, -117, -102, 36, 91, 17, 24,
+   4, 116, 11, 103, -15, -43, 22, -12,
+   -82, 74, -128, -49, -18, 54, -86, -2,
+   10, -2, 18, 50, -1, 66, 99, 118,
+   19, 46, -126, -90, 38, -126, -93, -24,
+   8, -2, 23, 2, -39, 5, 3, -13,
+   16, -80, -127, -37, -87, 29, 12, -54,
+   21, 0, 0, -122, -14, -38, 71, 45,
+   21, 16, -24, -72, -35, 18, -37, -20,
+   17, -30, -97, 50, 36, 127, -44, -19,
+   4, -40, 2, -25, -3, 25, -27, 55,
+   5, 28, -68, 39, 58, -61, -50, 22,
+   56, -68, -45, 75, -1, -8, 62, -59,
+   36, -5, -113, 71, -42, 29, 32, 4,
+   -73, -23, 55, 66, 37, -40, -25, -53,
+   18, -7, -78, -70, -22, 39, 48, -43,
+   77, -6, 35, 17, 23, -45, -22, 61,
+   15, 42, 35, -42, 0, -125, -65, -20,
+   31, 20, 74, -12, -37, -46, -33, 28,
+   31, -64, -13, 25, 69, 15, -23, -55,
+   93, 1, -20, 55, 81, 52, 18, 3,
+   -79, -22, 88, -29, 114, -6, -40, 12,
+   34, 19, 104, 45, 4, -43, 22, -10,
+   61, -82, 25, 35, 29, -30, 7, 107,
+   -72, 2, -52, 21, -28, -5, 127, 8,
+   -27, -96, -95, -14, -127, 12, 47, 32,
+   -116, 14, -48, 35, -34, 114, 100, -14,
+   -73, -36, 11, 50, -23, 11, -38, 12,
+   20, -20, -125, 67, -45, -28, 4, 88,
+   -5, 58, 10, -52, 21, 17, 41, -37,
+   66, -82, 21, 39, 0, -43, -9, -55,
+   42, -16, -81, -31, 11, -20, -17, 119,
+   -29, -68, 16, -125, 32, 107, -92, -126,
+   25, -35, -26, -51, -53, -79, 58, -19,
+   -127, -36, 3, -20, -55, -74, 47, 36,
+   -103, -52, -110, 62, 12, -123, 78, -43,
+   -127, 30, 36, 34, -110, 34, -39, -89,
+   -126, -29, -29, -60, -34, 39, -19, 4,
+   22, -70, -98, -52, -67, -77, 5, 33,
+   9, -23, -14, 28, 25, 9, -80, -99,
+   17, -26, -101, 47, -24, 24, -36, 53,
+   -126, -23, -84, -28, -105, 10, -60, -60,
+   -56, -87, -74, 26, -41, 60, -67, -10,
+   96, -89, -89, 42, -29, -3, 47, 4,
+   30, -4, -26, -70, -20, 70, -27, 44,
+   -74, -8, 54, 35, 115, 12, -21, -13,
+   10, -41, -70, 39, 86, 54, -40, 22,
+   42, 13, 6, 24, 13, -1, -58, -37,
+   -53, -3, -25, -23, 5, -30, 31, -28,
+   -103, -1, 13, -54, -70, 4, 2, 4,
+   10, 20, 32, 2, -38, -84, -3, 37,
+   23, 54, 5, 16, 12, -14, -10, -3,
+   -26, 2, -36, 83, 8, 33, -10, -5,
+   48, -32, -32, -36, 16, 9, -42, 38,
+   60, 36, -81, -52, 56, -88, -55, 21,
+   -26, 24, -26, 127, -59, -60, -12, 23,
+   -26, -2, -100, -58, -33, 17, -2, -71,
+   -40, -124, 102, -10, 72, -119, 121, 104,
+   -47, -35, -24, 113, -122, -23, 82, -101,
+   -60, 69, 27, -4, 110, 32, 16, -104,
+   44, 10, -89, 25, 30, 44, -1, 78,
+   82, -1, 29, 25, -58, 44, 70, 70,
+   9, -31, -30, -8, -17, 60, -102, -35,
+   4, 43, 85, 84, -6, -80, 5, -71,
+   -45, 22, -63, 52, -116, -37, 90, 93,
+   -58, 2, -2, 1, 20, -31, 35, -55,
+   31, -20, -70, -26, 59, -32, -24, 76,
+   -108, 27, -19, -6, 30, 68, -1, 4,
+   79, 45, -43, 45, -13, -47, -14, -66,
+   -41, 85, -39, -24, -17, -50, 22, 2,
+   51, 27, -28, 62, 12, 50, -107, -62,
+   2, -17, -9, -63, 34, -30, 35, -10,
+   -123, -24, -49, -12, 57, -45, -46, -63,
+   -29, 37, -103, 49, -80, -31, 31, 46,
+   -53, 6, 65, 10, -38, -44, -71, -4,
+   -23, 10, -61, -48, -46, -33, 17, -23,
+   77, 39, 25, 0, 58, 50, -1, 25,
+   44, 66, 42, -4, -6, -12, -36, 50,
+   1, 113, -5, -23, -54, -4, -5, -10,
+   3, 25, -4, -98, -37, 49, -33, -21,
+   -40, -18, -68, 93, -29, -3, -9, -1,
+   48, 22, -65, -12, 40, 2, 29, 2,
+   36, -119, -9, 4, -27, -40, -1, -17,
+   15, -44, -7, 2, 59, -23, -33, 10,
+   54, -17, -26, 111, -5, 46, 73, 50,
+   -5, -91, 45, 27, -105, -13, 37, -55,
+   -68, 25, -23, -7, 5, 80, -28, 4,
+   127, -59, -102, 18, -9, -29, 8, 32,
+   56, -123, 5, 19, -98, 52, -126, 36,
+   35, 26, -17, -78, -97, 71, 5, -38,
+   92, -31, -42, 39, 9, 81, 4, 33,
+   3, -49, -25, -1, 0, 106, -75, -85,
+   14, -127, -67, -41, 46, 32, 10, -3,
+   -40, 86, 73, 73, 20, 99, 42, 41,
+   30, 77, -1, -3, 57, 19, -13, -19,
+   43, 81, 41, -13, -16, -95, 17, 35,
+   -4, -30, -98, -59, -2, 103, 74, -103,
+   2, -13, -1, -2, 84, -3, 126, 15,
+   -103, 18, -30, -35, 20, -21, 72, -40,
+   46, -15, -10, -6, 11, -19, 17, -25,
+   110, 85, 48, -22, 2, -64, 42, -69,
+   6, -10, -37, 12, -50, 5, 31, 1,
+   61, 74, 60, -50, -29, 65, -67, -35,
+   -41, -128, 106, -4, 92, -21, -57, -44,
+   -127, -84, -57, 49, -32, -12, 56, -86,
+   17, 50, 47, 57, -20, 42, 11, 32,
+   26, 43, -12, 59, 27, -84, 62, 6,
+   7, 16, -5, -44, 36, -75, 9, 25,
+   17, 89, -7, -54, 1, -54, 12, 34,
+   -7, -4, -71, 18, 38, -26, -19, 13,
+   3, -10, 56, 48, 9, 100, 47, 34,
+   123, 98, 44, 84, -9, -16, -10, -17,
+   -20, 5, 50, 111, -28, -64, -20, -127,
+   -69, -3, 64, -27, -37, -79, -15, -84,
+   -81, -16, 55, -78, 98, -97, -20, 86,
+   -15, -79, 57, 24, 31, 29, 26, 33,
+   -21, -52, 31, -46, 73, -47, -17, -44,
+   102, 84, -63, -59, -69, 123, 39, 80,
+   -83, -37, 37, -116, -37, -2, -54, -101,
+   93, -21, 36, -19, -8, 93, -115, 69,
+   -18, -37, 13, 49, 99, 10, 2, -31,
+   -109, -127, 50, 49, -43, -20, -56, -43,
+   18, -10, -127, -52, 45, 82, 3, 11,
+   -82, -22, -90, 70, -55, 99, 82, -41,
+   39, 6, -104, -14, -104, -9, 34, 127,
+   -15, 7, 99, 0, -58, 1, -21, -9,
+   -17, -34, -28, -15, -41, -10, 16, 12,
+   46, -13, 10, -11, -15, 45, -73, 16,
+   -37, 114, -50, -79, 110, 81, 14, -17,
+   -1, -128, -124, -35, 77, 72, 61, 124,
+   41, 29, -40, 57, -3, -24, 115, -62,
+   -53, 35, -9, 15, 109, 71, 18, 22,
+   39, -128, -49, -127, 19, 116, 74, -10,
+   -36, 123, 102, 19, 108, 23, 4, 95,
+   126, 101, -16, -10, 13, -90, -95, -18,
+   61, 0, 79, -115, 18, 57, -5, 114,
+   -123, 35, 124, -126, 46, -18, 21, 98,
+   -117, 3, -123, -56, 119, 45, -61, 31,
+   34, -26, -51, 15, 34, -24, 61, -18,
+   -57, 3, -75, -116, 22, -117, -18, -3,
+   -22, -30, -33, 27, 33, 125, 24, -33,
+   35, -77, -92, -33, 25, -127, 32, 36,
+   -69, 34, -6, 54, -16, 34, -13, 64,
+   -126, -128, -8, -86, -8, -63, 70, 22,
+   11, -37, 37, -99, 40, 127, 68, -23,
+   -28, 126, -67, -43, 52, 39, 94, 13,
+   -62, 24, -110, -95, -11, -39, -67, 48,
+   -111, -12, 34, -66, 126, 35, -26, -59,
+   -127, 31, 73, 30, -128, 30, -126, -128,
+   -113, 28, -126, -127, -1, -2, -57, 23,
+   -53, -5, -56, -41, -76, 122, 8, 45,
+   76, -120, -86, 37, -123, 20, 0, 35,
+   -77, 63, -102, -63, -17, -51, 7, -116,
+   -7, -10, -79, -119, -29, 23, -18, 70,
+   -89, -33, -40, 14, -16, -102, -17, -77,
+   33, -11, 49, 58, -15, -61, 40, -49,
+   -36, -47, 18, -23, -81, 123, -15, -14,
+   -83, -32, 113, -1, 1, -85, -20, -85,
+   4, -66, -118, -31, -90, 79, -74, 7,
+   -45, -45, -54, 113, 59, -25, -23, 55,
+   23, -115, 18, -80, -111, -61, 15, -93,
+   -68, -59, 125, -50, -10, -40, 39, -113,
+   21, -92, -126, 79, -23, 34, 37, -16,
+   -6, 28, 31, 12, -96, 9, 34, -45,
+   -32, 114, -36, -5, 118, -49, -22, 119,
+   -5, 51, -37, 3, 17, 14, -52, -92,
+   41, 88, 2, -80, 98, -52, 46, 31,
+   52, -6, -40, 33, -25, 55, -16, 50,
+   -119, -41, 77, -91, 43, -70, 26, -4,
+   -2, 35, -68, 57, 10, -97, -21, -54,
+   18, 117, 121, 13, -40, 104, -10, 50,
+   48, 13, -5, 37, -23, -31, 13, -37,
+   11, 74, 43, -13, 35, -36, 23, 106,
+   -54, 40, -68, -58, -9, 52, 10, -58,
+   27, 90, 7, 43, -58, -4, 93, 1,
+   -89, -64, -42, -17, 20, -48, -126, 122,
+   71, -116, 8, 123, 52, 37, -17, -46,
+   0, 57, -11, 113, -93, 50, -61, 41,
+   -1, 33, 22, 73, 35, -43, 48, 98,
+   -55, 33, -10, -43, 37, -47, -3, 14,
+   -32, -126, -23, 25, 0, -41, 30, 40,
+   81, 102, 84, 15, 43, 28, -6, -68,
+   -10, 62, 83, 0, 13, -25, 35, 30,
+   39, 19, -8, 29, -12, -126, -21, 64,
+   3, 107, 29, -124, 19, 6, -114, -126,
+   -42, 23, -90, -67, 65, -127, 27, -70,
+   42, 5, 125, -3, 28, -72, 27, 14,
+   -72, -41, -80, 42, 0, -11, 28, -3,
+   -37, 39, 43, -47, 57, 41, -54, 23,
+   53, 100, 9, -31, -17, 42, 126, 32,
+   109, -3, 16, -57, -13, 36, -58, 63,
+   -30, 37, 38, 20, 55, 6, 14, -16,
+   24, 38, 23, -8, -13, 73, 127, -3,
+   21, 93, 36, 33, 12, 44, 36, -33,
+   -8, 29, -51, -26, -24, -7, 44, 66,
+   20, -9, 86, 33, 20, -56, 2, 48,
+   12, -83, 23, 72, 14, 39, 57, -78,
+   28, -23, -10, -8, 20, 31, 8, -70,
+   47, -16, -64, 1, 4, 42, -13, -1,
+   -45, 81, 64, 58, 48, -12, 45, -20,
+   -7, 32, -3, -75, 102, -18, -32, 66,
+   -16, -48, 21, 10, 52, 11, -70, 31,
+   -88, -46, -45, -37, 55, 111, 23, 44,
+   6, 40, 36, 40, -10, 127, -20, 6,
+   -42, -45, 6, 68, -4, 40, 37, 19,
+   -36, -61, 30, 26, 18, -57, -7, 5,
+   -121, 20, -15, -90, 23, 30, 11, -1,
+   26, -23, -8, 24, 15, -80, -96, 15,
+   29, 90, -51, 4, -42, 33, 13, 25,
+   48, -33, 96, -19, -45, 25, 17, -68,
+   16, -80, -1, -6, 30, -11, -23, 8,
+   -110, -39, 22, -32, 87, 76, -34, 62,
+   -62, -82, -20, 127, -28, -49, 54, -2,
+   -96, 30, 13, 53, -71, 5, -45, 52,
+   -6, 5, -19, -17, 12, 0, 74, 51,
+   71, 83, -11, 11, 88, -35, 10, -7,
+   8, 42, 13, -49, -29, 0, -75, 8,
+   10, 88, -12, 21, 23, -82, -17, 19,
+   -5, -62, 127, 93, 19, 26, 89, -15,
+   18, 12, 41, 24, 12, -22, 92, -21,
+   -7, -58, -9, -45, 38, -72, -15, -125,
+   -96, 9, 67, -7, -15, -17, -28, 30,
+   6, -7, 99, -47, 29, -31, 24, -14,
+   -107, 15, 12, 57, 26, 3, -57, 19,
+   1, 3, -16, 27, 12, 5, 52, 31,
+   16, -124, -2, 24, -26, -18, -76, -115,
+   3, 97, 30, -20, 127, 32, -6, 29,
+   -37, -59, -40, -20, 29, 49, 11, 20,
+   37, 33, 29, 7, 11, -12, -16, -84,
+   -49, 4, 38, -5, -9, -9, 50, 6,
+   2, -25, 103, 21, 73, 55, 15, -13,
+   58, -9, -4, 50, 7, 1, -8, -6,
+   19, 18, 12, 10, 10, -26, -3, -5,
+   62, 56, 21, -7, 41, -32, 0, 11,
+   -32, -14, 48, -1, 26, -19, 24, 46,
+   -8, 0, 26, 58, -5, -26, -27, 4,
+   36, 59, -25, 3, 4, -28, 26, 63,
+   51, 48, -61, -121, -19, -45, 49, 1,
+   -1, 58, 5, 38, 47, 28, 14, -2,
+   20, -11, -33, -13, 42, -29, -53, 38,
+   -44, 107, -9, 60, -10, -78, -15, 78,
+   21, -71, -36, 58, -27, 15, -4, -41,
+   -50, -85, -61, -62, -105, 59, 39, 29,
+   -27, -16, 68, -26, 26, -4, -48, 58,
+   -15, -13, -2, 48, -33, -47, 34, 1,
+   4, -36, -13, 32, -3, 63, 14, 15,
+   107, -31, -37, -25, 49, 112, -29, 22,
+   20, 89, -12, 5, -1, 91, -54, 44,
+   32, -42, -14, 43, 113, -61, -46, 126,
+   -99, 63, -16, -75, 119, 57, 42, -124,
+   99, 91, 57, 31, -81, 16, -57, -32,
+   -79, -6, 123, -36, -47, 109, -125, 1,
+   -72, 21, -50, 82, -4, -2, -36, -127,
+   -28, 8, -105, 51, 67, 34, 50, 9,
+   -25, -125, 54, 12, 28, 104, -15, -22,
+   29, 3, -14, 35, 9, 26, -25, -72,
+   -26, 98, 16, 23, 16, -8, 20, -112,
+   74, 98, -18, -56, 85, 127, -51, 1,
+   -84, 38, -31, -86, -45, 46, 5, -54,
+   -54, -114, 47, -43, 20, 121, 21, -18,
+   -11, 95, 23, -27, -25, 39, 8, -10,
+   17, 28, 61, 6, -56, 58, 4, -37,
+   35, 23, 51, -19, 5, 19, -1, -1,
+   14, 33, 15, 37, -11, 19, 35, 45,
+   13, -14, 46, 19, -42, 55, 28, 51,
+   30, 54, 120, 17, 66, 42, 66, -12,
+   -9, -13, 44, 38, 5, -7, 27, 75,
+   78, 35, 31, 78, 49, -4, -14, 40,
+   33, 41, 1, -68, 23, 53, -12, 11,
+   13, 28, 29, -43, -41, 42, -25, -12,
+   38, 18, -4, 7, 38, 29, 44, 31,
+   -26, 61, 37, 49, -19, -6, -17, -12,
+   49, 56, 33, 80, 43, 42, 29, 62,
+   4, -53, 34, -57, 30, 13, -55, -28,
+   19, -6, 43, -43, 19, 48, -16, 29,
+   -25, 64, 30, 51, -62, -18, -16, 15,
+   -30, 8, -14, 60, 20, -12, 49, -32,
+   -28, -42, 3, 17, -55, 11, 26, -51,
+   -25, -38, 47, 48, -29, 33, 9, -20,
+   -6, -12, -54, 111, 4, 31, 77, -5,
+   -2, -50, 46, -5, -18, -30, 28, 33,
+   11, 48, 22, -3, 3, -34, -41, -4,
+   -27, -16, -41, -10, -21, 34, 9, 46,
+   23, 46, 25, -28, 28, 32, -16, 47,
+   127, 36, -8, -21, 57, 20, 35, 80,
+   7, 18, 83, 16, 59, -56, 3, -23,
+   111, 40, -24, 23, 62, 101, 29, -122,
+   26, 74, 36, -27, 8, 79, -94, 47,
+   -121, 12, -63, -4, -2, -76, 8, -18,
+   -45, -3, -112, 66, -71, -7, 19, 21,
+   -108, -120, -10, -27, -43, 76, 67, -127,
+   -35, 12, -2, 61, 103, -34, -3, -6,
+   24, 80, 44, 5, -13, -52, -4, -14,
+   70, 38, -46, 65, 79, -62, -93, -5,
+   -101, 95, -20, -52, 55, 11, -126, 11,
+   -38, 23, 16, -47, 7, 66, -65, 2,
+   -16, -26, 21, 43, 27, 42, -41, -50,
+   9, -126, -21, -67, 34, 51, 47, 77,
+   -3, 0, 30, 19, 17, 3, 50, 1,
+   120, 20, -12, 90, 56, 1, -21, 24,
+   -15, 97, -2, -19, -35, -1, 45, 12,
+   -41, 34, 8, 12, -23, 43, 121, -33,
+   62, 39, -119, -26, 36, 44, 14, 26,
+   5, 8, -64, 16, -10, -43, -45, -22,
+   5, -16, -21, 40, 13, -16, 31, 109,
+   -31, -38, 121, 4, -59, 85, 14, -57,
+   20, 3, -51, 45, -40, 33, 13, -11,
+   -9, 27, 55, 43, 10, 6, 14, -37,
+   -31, 127, 22, -7, 34, 11, -102, -60,
+   29, -58, 21, 14, 99, -16, -101, 17,
+   -64, 36, -6, -62, 22, -37, -49, 30,
+   74, 88, 95, -33, 45, 20, 52, 55,
+   -98, -49, 19, 56, 9, 124, 93, 0,
+   -14, -66, 34, 20, -63, -40, -12, 59,
+   -7, -51, -9, 68, 4, 124, -37, -78,
+   32, -9, -4, 69, 21, -19, -27, -33,
+   -58, 60, -39, -32, -112, -5, -35, 124,
+   -18, 47, -99, -57, 15, -85, 49, -98,
+   104, -86, -104, -57, -17, 9, 21, -9,
+   -85, 65, -127, 75, 113, 71, -5, 127,
+   -53, -60, 14, -120, 35, -2, 20, -38,
+   -82, -50, -67, -8, -54, -52, -7, -8,
+   -10, 14, 11, 112, -5, -40, 37, 21,
+   -90, -39, -67, -127, -25, -27, 80, -14,
+   -39, 16, 61, -18, 38, 41, 93, -4,
+   -5, -80, -35, -47, -6, -12, 23, -37,
+   108, -8, -126, -125, 12, -54, -26, 40,
+   -52, -72, -26, 47, -35, -98, -15, -68,
+   -51, -21, 21, 40, -89, 121, -116, -5,
+   -23, -1, -123, -125, 21, -34, 2, -47,
+   -18, -49, -123, -19, -94, -21, 37, 13,
+   43, -79, 81, -2, -21, -11, 104, -16,
+   -37, -29, -46, -3, 64, -38, -120, -10,
+   25, 15, -17, 1, 110, -5, -24, -42,
+   -23, 43, -17, -93, -122, -3, -35, 0,
+   11, -84, 24, -49, 78, 0, -22, -49,
+   -54, 83, -8, 8, -13, 64, 46, 27,
+   -99, 89, -27, 69, 1, -53, -83, 5,
+   19, -91, 42, -97, 92, 62, 51, -79,
+   7, 13, 34, -37, 57, 16, -53, -55,
+   4, -26, -11, -29, -39, -60, 69, -25,
+   -8, 19, 4, -6, -123, 73, 26, -61,
+   21, -90, 8, 7, -123, -20, 12, 29,
+   53, -121, 83, -39, -24, -46, 15, 24,
+   31, 2, -89, -64, -3, 85, -8, 127,
+   7, 14, -25, -3, -64, 104, 84, 74,
+   -38, 39, 25, 119, 67, 15, -71, 28,
+   113, 65, -27, -25, -19, -11, 19, 76,
+   -3, -88, -75, -34, -110, -64, 19, 69,
+   -76, 102, -8, -68, -12, -43, -31, -9,
+   120, -36, 46, 96, -73, 89, 83, 98,
+   50, -81, 68, 34, 39, 68, -17, -19,
+   47, 111, 15, -58, 96, 1, 18, 2,
+   -73, 82, -59, 5, 47, -112, 9, -43,
+   4, 18, -47, 82, -93, 88, -48, 58,
+   -62, -57, 67, -41, 87, -29, 65, 69,
+   63, 54, 5, -75, -4, 38, 57, 24,
+   -48, -8, 13, -18, 38, 126, -128, -66,
+   43, -4, -103, -21, 47, 59, 19, 70,
+   26, 1, -9, 10, -60, 18, -120, 21,
+   -8, -36, 15, 120, -111, -5, 58, 2,
+   -33, -119, -77, -105, -7, 118, -116, -3,
+   18, 73, -35, 2, 17, 1, 56, 16,
+   -26, -26, 17, 27, 52, 0, -12, -5,
+   41, -19, 36, 68, -7, -7, 70, -127,
+   -49, -19, 44, -88, 22, -118, -52, 48,
+   63, 66, -97, 54, 46, 43, -47, 59,
+   -62, -91, -58, -39, 95, 35, 19, -15,
+   42, -31, -41, 31, -17, 36, -114, 34,
+   -105, 71, -4, -40, -40, 11, 47, 5,
+   -9, 101, 80, 36, -9, 8, 47, 23,
+   -19, 31, 22, 69, 39, -14, 124, -37,
+   23, 60, 69, 11, -3, 57, 28, 59,
+   1, -3, 125, 17, 65, 23, -24, 0,
+   33, 64, 34, 30, 33, 42, 29, 31,
+   71, 64, -16, 58, 40, -61, -46, 29,
+   2, -38, 11, 14, 68, -2, 21, -26,
+   25, 5, -19, -22, 92, 38, 51, 22,
+   127, -32, 99, 77, 42, 34, 75, -58,
+   46, -3, 2, 13, 66, 27, -22, 37,
+   13, 20, -29, 47, -56, 68, -78, 14,
+   43, -36, -9, 44, 39, -20, 18, -53,
+   18, -11, 9, 16, 33, 19, -23, -9,
+   40, 55, 52, 23, 21, -4, -31, -18,
+   22, 4, -12, 95, 2, -10, 63, -17,
+   -12, -15, 82, -23, 1, 16, -22, 88,
+   -34, -17, 4, 49, 9, 41, 62, -9,
+   -6, 32, -64, 35, -14, -11, -31, 19,
+   50, 41, 91, -2, -62, -16, -5, -23,
+   -10, 11, 66, -56, -2, -59, -1, 74,
+   11, 110, -15, -25, 90, 69, -18, 68,
+   -38, -7, 10, -14, 114, 1, -15, -57,
+   52, 118, 45, -61, -65, 116, -100, 11,
+   -73, -116, 81, 11, 24, -33, 1, -39,
+   -88, -48, 11, 70, 7, 59, -50, 13,
+   12, 30, -96, -65, 44, 60, 12, 23,
+   -50, 118, -28, 41, 59, -10, 47, -5,
+   -54, 97, -27, -102, 33, 31, -56, -4,
+   -8, -83, 45, -29, -19, 122, -15, -39,
+   89, 11, 3, -67, -21, -18, 71, -2,
+   -49, 49, 97, -69, -68, -8, -79, 63,
+   -27, 115, 1, -116, -40, -119, 19, 37,
+   -30, 86, -17, -85, 53, -40, -23, -78,
+   -58, -88, 99, 119, 47, 22, -30, 42,
+   25, 40, -62, 11, 34, -29, -32, -27,
+   26, 16, -15, -72, -5, 1, -81, 20,
+   -17, 13, 120, -30, 124, -29, 41, -72,
+   19, 34, -92, 63, 44, 76, 12, -33,
+   50, -2, 77, -1, 41, -1, 17, 41,
+   73, 40, -8, -22, 95, 46, 71, -1,
+   -80, 41, -44, 10, 4, 37, -43, 70,
+   43, -123, -36, 42, 39, -8, 13, -17,
+   3, 76, 29, 22, 9, 29, 28, 22,
+   -44, 14, -44, 4, 26, 55, 38, 23,
+   -38, -44, -8, 59, 14, 37, 43, 48,
+   49, -20, -3, 38, 12, 46, 5, -12,
+   -25, -21, -25, -71, 64, 55, 124, 18,
+   57, 28, 48, -118, -15, 41, 43, 45,
+   18, -76, -24, 11, -8, -72, -20, 41,
+   -45, 97, -35, -68, -1, 104, -95, -39,
+   9, -77, -23, -8, -9, 24, -13, -22,
+   86, -3, 55, -125, -10, -65, 44, 49,
+   49, 19, -122, -6, 41, 54, 80, -16,
+   -76, 48, 111, -125, -21, 98, -6, -21,
+   31, -16, 0, -33, -119, 42, 64, 12,
+   6, 56, -8, 55, 44, 66, 27, -20,
+   -73, -37, 31, -16, -24, 11, 126, 24,
+   26, -61, 13, -24, 69, -4, -33, 0,
+   14, 11, 60, -15, -125, -68, -56, 60,
+   -10, -126, -26, -124, 73, -54, 40, -70,
+   17, 57, -28, -37, -28, 20, -72, 27,
+   -13, -119, 6, -123, 23, 106, -18, 65,
+   28, 61, -126, -59, -16, -57, -35, -125,
+   3, 3, -122, -127, -36, 51, -3, -15,
+   42, -87, -71, -117, -117, 99, -120, -11,
+   -6, 0, -12, 48, -58, 15, -128, -59,
+   -19, 43, 2, 49, 49, -18, -75, 22,
+   105, 19, -73, 117, -20, 10, -4, 13,
+   -99, 25, -125, -79, -89, 51, -27, -28,
+   0, 40, 3, -55, 6, 31, -27, 39,
+   -3, -12, -14, -11, 28, -55, -57, 33,
+   54, -126, -74, 27, -8, 96, 17, -70,
+   -21, -35, -44, -7, -14, 19, 57, 33,
+   9, -46, 16, 18, -14, 43, -43, 0,
+   11, 16, -3, 0, -28, 80, 54, -3,
+   -12, 12, -13, -15, -26, 102, 4, -2,
+   16, -21, 31, 16, 3, 4, -4, -5,
+   37, 37, -61, 41, 27, -4, 1, -30,
+   13, -41, -14, 16, -2, -7, 31, 127,
+   -10, 31, 105, 19, 35, 100, -14, -30,
+   -3, 27, 82, 89, -71, 61, 9, -18,
+   26, 49, 78, 33, -22, 1, -47, -24,
+   -117, -54, -55, 6, -59, 116, -48, 41,
+   38, 3, 114, -65, 0, 21, 16, -16,
+   -13, -33, 7, 15, 12, 44, 69, 35,
+   11, -32, -59, -87, 71, 59, -20, 26,
+   -35, -3, 1, -25, 56, 56, 127, -15,
+   -15, 96, -4, 66, -47, -76, 57, -48,
+   84, 8, 42, 78, -10, 126, -40, -34,
+   -14, 33, 22, -23, 48, 8, -10, 3,
+   -32, 13, 61, 21, -2, 0, -62, -26,
+   -96, 61, -59, -93, -72, 119, 34, -58,
+   -18, 35, -18, -68, -13, -38, -49, -28,
+   -79, -30, 33, 78, 80, 69, 46, 50,
+   -8, 21, -69, -77, -41, 105, 7, -122,
+   42, 24, 69, 39, -69, 118, -125, 25,
+   -124, 12, -18, -59, -7, -31, 62, 8,
+   0, -2, -15, 0, -46, -99, 9, 86,
+   9, 33, 35, -42, 3, 121, 125, -50,
+   -76, 113, -85, 21, 8, -68, 73, -18,
+   -17, -30, -128, 8, -119, -33, 31, 28,
+   -11, -5, -9, 9, -31, -24, 42, -79,
+   25, 5, 30, 121, -1, -22, -95, 88,
+   -89, -29, -100, -104, -100, 94, -75, 31,
+   75, -65, -125, -91, 48, -125, -27, 20,
+   105, -126, -95, -49, -29, 14, -6, -35,
+   -36, -22, -25, 16, 53, 5, 52, 32,
+   -24, 80, 16, 83, 31, 42, -120, 17,
+   34, -56, -2, 32, -99, -40, -17, -27,
+   122, 87, -70, 38, -28, -116, 0, 17,
+   -41, 40, -82, 31, -27, -2, 39, -68,
+   17, 24, 81, 40, -47, -9, -22, 8,
+   30, 37, 30, -26, -20, 17, 41, -27,
+   64, -20, 31, 27, -38, 37, -13, -36,
+   -57, -32, -32, -31, -31, -63, -12, -23,
+   -26, -19, 13, -55, -23, 79, -17, 5,
+   30, -5, 22, -27, 34, 14, 4, -14,
+   -109, -1, -10, 21, -8, 19, 33, 44,
+   1, -2, 39, 16, 77, -22, 0, -8,
+   37, -30, -28, -125, 0, -48, -14, -117,
+   -71, -60, -55, 40, 27, 14, 98, 47,
+   120, -75, 93, 7, 5, -2, -18, 60,
+   -52, 66, -73, 11, 8, -75, -26, 38,
+   -15, -106, 91, 76, -94, -39, -87, -15,
+   -38, -13, 55, -26, -123, -68, 39, -60,
+   8, -18, -5, -7, -5, -37, 65, 55,
+   47, 115, -20, 48, 40, -34, 27, -23,
+   -65, 4, -79, -126, 36, 93, 43, 5,
+   84, 14, -49, 52, 65, -80, -50, -29,
+   -31, 56, -37, -56, -66, -51, 30, -43,
+   -24, 41, 3, 110, 56, 29, 40, -9,
+   23, 40, 6, -16, 5, -77, 73, 2,
+   -30, 6, 0, -42, 32, -1, -3, 82,
+   -106, 6, -47, -41, -58, -38, 85, 3,
+   12, -79, -18, -1, 48, -19, 9, 88,
+   4, 35, -66, 61, 72, -7, -42, -30,
+   -29, 21, 113, 28, 93, -4, 71, -116,
+   6, 4, 23, -51, 26, -3, 3, 26,
+   16, -28, 27, 1, 69, -50, -35, -19,
+   -47, -41, 12, -99, -72, 78, 19, 20,
+   110, 46, -65, -36, -9, -10, -18, 39,
+   -27, 43, 15, 15, 97, 57, -23, 11,
+   38, -24, -88, 18, -41, 71, 42, -34,
+   21, 94, 53, -19, -25, -23, -82, 61,
+   -61, -17, -1, -127, -19, -2, 53, -75,
+   44, -118, -45, -12, 80, -120, 36, -95,
+   -55, 46, -16, -29, -32, 46, -98, 30,
+   -52, 10, -44, 38, -29, -14, -63, -7,
+   21, 39, -66, 72, -17, -39, -17, 9,
+   -23, -40, 36, -51, 42, -87, 29, -42,
+   -122, -9, 44, -47, -39, -34, -76, 58,
+   -99, -7, 8, -18, -8, -44, -42, -11,
+   -71, -29, 59, 4, -82, -13, 25, 52,
+   31, 5, -22, -3, 67, -43, -68, -44,
+   29, -20, -63, 61, -55, 98, -31, 42,
+   -102, -8, 30, -88, -5, -24, -127, -110,
+   -38, -29, 81, -71, 33, 9, -27, -20,
+   67, -108, 55, -27, -94, 11, -60, -16,
+   33, -6, 24, 127, -94, -86, -85, 16,
+   4, -40, -70, 20, -43, -20, 48, -25,
+   49, -126, 78, -62, -22, 87, 36, 31,
+   33, -125, 39, 81, -117, -60, 2, -19,
+   -48, 18, 24, -27, 12, -22, -14, -14,
+   -70, -2, -42, -109, -1, 56, 9, -110,
+   103, 35, -17, -31, -60, 72, -49, 45,
+   70, 43, 37, 107, 124, 70, -13, 78,
+   -48, -47, -38, 82, 23, 127, -29, -22,
+   9, 30, -112, -9, 86, -69, 52, -77,
+   36, 67, 3, 113, -32, -53, -23, 18,
+   -122, -53, 7, 27, 22, 1, -71, -51,
+   87, 62, -56, 43, -116, -126, -27, 16,
+   53, 46, -62, -13, 36, 94, -27, 29,
+   6, 58, -14, 103, -21, -24, -48, -54,
+   2, 94, -3, 57, -124, -104, -9, 106,
+   38, -69, -13, -43, 35, -65, -83, -89,
+   -126, 35, -4, -45, -28, -47, -65, -82,
+   75, -36, 61, -81, 85, -112, 119, 59,
+   -7, -11, -63, 50, 23, -1, 59, 0,
+   4, -56, -68, -40, 8, 15, -20, 21,
+   58, 3, -85, -64, -2, -26, 28, 32,
+   -53, -27, 70, 9, 87, -1, -15, -121,
+   -34, -69, 10, 56, -10, 61, -58, 105,
+   25, -59, 28, -50, -32, 33, -14, 42,
+   -24, 9, -14, 10, -3, -28, 13, 56,
+   -59, 10, -68, 14, 37, 57, -20, -9,
+   -17, -80, 24, 20, -18, -1, 122, -8,
+   5, -72, -57, -118, 2, 14, 30, -27,
+   -127, 38, 39, -79, 18, -37, 93, 46,
+   27, 22, -9, 1, -9, 33, 45, -46,
+   43, -45, -43, 15, -7, 21, 2, -59,
+   34, 9, 41, -42, -28, 24, -12, -12,
+   5, -16, 6, -58, -51, 37, 49, 25,
+   -51, -5, 31, -124, -32, -39, -48, 6,
+   34, -86, -63, -9, 34, -4, -32, -27,
+   22, 6, -3, 94, -44, 1, 42, 3,
+   -34, -39, 127, -32, 53, 72, 20, -42,
+   -75, 27, -21, -9, -25, 17, -61, 62,
+   -77, 2, -8, -94, -26, -42, 40, -69,
+   0, 17, 56, -115, 1, -6, 12, 14,
+   23, 10, 12, -56, 107, -29, -28, -33,
+   -45, -64, -105, -22, -19, 59, -10, -69,
+   45, 4, -58, 32, -12, 22, -59, 35,
+   -22, 70, 19, 49, -17, -78, 4, 21,
+   50, -49, 28, 18, 32, 72, 60, 5,
+   47, 46, 30, 11, 73, 1, -57, -6,
+   87, -97, 32, -23, 55, 26, -35, 9,
+   37, 105, 10, 18, -118, 99, 125, 54,
+   45, 109, -26, 26, -39, -56, 7, -19,
+   -38, 35, -128, 47, 17, 0, 97, -69,
+   -63, 27, 23, -19, -79, 73, -46, 3,
+   -22, 19, -41, 123, -44, 109, 33, 34,
+   -2, 45, -126, -43, -14, -13, -5, 40,
+   26, -4, -127, -124, -19, -82, -111, 109,
+   76, -43, -30, -94, 77, -82, 0, -1,
+   -7, 9, -36, -60, -19, 42, 28, -10,
+   -90, 20, 83, -4, -60, -120, -8, -37,
+   -18, -37, -84, -85, -46, -37, 22, -36,
+   15, 71, -23, 14, -125, -2, -41, -9,
+   -40, 39, -43, -126, -6, -10, -94, -2,
+   10, -113, 15, -79, -7, -51, 25, -30,
+   -40, -28, -121, -25, -45, -70, -11, -51,
+   -128, 46, 81, -92, -89, -9, -54, -18,
+   -16, -96, -84, 37, -77, -66, 21, -38,
+   -54, -3, -33, -33, -111, -100, -11, 3,
+   -6, 20, -128, -3, -54, -41, -21, 54,
+   -53, -128, -127, 28, -55, -107, -10, 41,
+   112, 35, -25, 11, -43, 93, -61, 38,
+   -54, -52, -104, -1, 5, -60, -122, -101,
+   -22, -19, 104, -57, 7, -54, -84, -33,
+   78, 34, -2, 15, -122, -14, -60, 114,
+   -75, -31, -42, -86, -67, -66, 38, -26,
+   -5, -124, -15, -3, -52, -127, -13, -50,
+   -108, 64, 37, -19, -51, -67, -16, 32,
+   -128, 31, -46, -48, -66, 7, -31, -61,
+   -5, -53, -113, 47, -45, 0, 102, -18,
+   -46, -101, 16, -37, -11, 29, 14, 15,
+   -20, 23, -24, -30, 43, 3, -28, 16,
+   -21, 18, -42, 2, -16, -69, -75, -75,
+   27, 19, -20, 52, 37, -121, -22, 17,
+   12, 45, -84, -50, 12, -126, -15, 19,
+   -24, -60, -23, -61, -67, 6, 122, -116,
+   82, -35, 24, -30, -87, 26, -26, -17,
+   -42, 5, -25, -118, -17, -67, -60, 39,
+   15, -100, 30, -121, -39, -67, -13, 33,
+   20, -36, -10, -9, -94, -107, -22, 21,
+   -126, -34, -11, -83, -82, -46, -119, -35,
+   -86, 4, -123, 44, 23, -42, -84, -56,
+   4, -53, -6, 39, -12, -50, -18, 37,
+   42, 45, -123, -32, -6, -33, -39, -4,
+   -97, -68, 9, 74, -53, -125, -83, -2,
+   -22, 57, -21, -90, -69, -9, -76, 43,
+   -15, -1, -18, -20, 2, 18, 5, -93,
+   -31, 76, 5, -1, 5, 44, 14, -5,
+   6, -48, 48, -2, 38, -59, -36, 77,
+   -50, -32, -11, 46, 33, 69, 62, -63,
+   20, 110, 15, -42, 10, -4, 78, 8,
+   -24, -59, 33, 65, 34, 48, -22, 26,
+   122, 51, -7, 10, -58, -2, 18, -27,
+   7, -126, -84, -4, -40, 48, -124, -127,
+   -6, 46, 55, -13, -83, 84, 31, 2,
+   34, -1, -19, -65, 38, 41, 29, 11,
+   -121, -55, 74, 20, 19, -2, 14, 35,
+   -15, -80, -33, -46, 36, 13, -49, 40,
+   -71, -41, 65, -107, 32, 17, 3, 8,
+   45, -50, 24, 4, 2, 55, -43, 13,
+   -12, -20, 15, 9, 16, -26, -25, 126,
+   -9, 126, 31, 27, -20, -125, -41, -46,
+   -7, -39, -60, -31, -108, 8, -47, -12,
+   -89, 67, -8, 57, 7, -10, 95, -7,
+   -109, 29, 47, 93, 79, 44, 15, -45,
+   50, -41, -13, 7, -56, 43, 48, -54,
+   60, -10, -29, -47, 0, 82, 22, -84,
+   2, -8, -39, 31, 4, -27, 12, 24,
+   -91, -8, 39, 3, -23, 5, -122, -74,
+   64, -9, -42, -53, 27, -94, 18, 18,
+   -3, 73, 68, 18, 6, 98, -18, -2,
+   -78, 8, -45, 14, 54, 15, 58, 40,
+   33, -31, 6, -10, 7, -6, 0, 41,
+   37, 121, -29, 36, 14, -56, 63, 9,
+   15, -122, -7, -67, -4, -115, 0, -41,
+   19, 37, -13, 17, 11, -13, 10, -29,
+   -77, 18, -9, -10, -79, -3, -8, -40,
+   -25, -22, -9, 0, 27, -105, -23, -65,
+   7, -35, 29, -13, -29, -34, -71, 55,
+   37, -3, 24, 69, 7, 32, -24, 18,
+   -60, -20, 39, 101, 9, 28, -78, -68,
+   -88, 22, -19, 28, -87, -6, -33, 44,
+   1, 37, -69, 8, 18, 48, -15, -41,
+   -110, 23, 43, -32, 5, -75, 10, -16,
+   28, -31, -17, 68, 17, -38, 4, 47,
+   1, -4, 33, 35, 83, 50, 38, 11,
+   40, 51, 1, -20, -9, -35, 76, 34,
+   -4, -24, -27, -10, 6, 60, -44, 14,
+   104, 43, 19, -23, -16, -127, 21, 13,
+   -11, -27, 30, -42, -6, 70, 27, -52,
+   41, -13, 52, -22, 30, 29, -28, -85,
+   -55, -72, 125, -49, 6, -12, 23, -4,
+   -44, 32, 49, 68, 4, 13, -35, -61,
+   -6, 51, -124, 27, 82, 31, 28, 121,
+   -120, 26, -33, -42, -44, 107, 88, -16,
+   -98, 30, 25, -19, 6, -42, -77, -8,
+   35, -13, 35, -23, -70, -71, -35, -45,
+   -54, 127, -103, -46, -74, -110, 32, 33,
+   10, -38, -13, -29, -23, 56, 18, 59,
+   -110, 18, 11, -7, 41, 2, 126, 10,
+   6, -20, -7, -46, -55, -4, 22, -6,
+   35, -6, -79, -72, -11, 4, -8, 126,
+   -3, -18, 71, 21, -7, 2, -107, -123,
+   -22, -45, -68, 37, -45, 87, 48, -32,
+   -12, -54, 82, 76, -44, 26, -36, 48,
+   -127, -126, 65, -10, -28, -18, -49, -127,
+   -57, -75, -82, -57, -91, -17, 12, 18,
+   6, -1, 0, 38, 25, -121, 77, 38,
+   -109, 24, -119, -17, -22, 10, -10, -1,
+   -72, -44, -26, 49, -58, 48, 14, 9,
+   -30, -44, -26, -48, -30, -36, 84, -87,
+   54, 11, -42, -120, 56, -102, 17, 33,
+   65, -1, 27, -41, 11, 2, 30, -44,
+   12, -2, 86, -39, -59, -115, -46, -60,
+   -9, 75, -10, 4, -117, 62, -34, -126,
+   -33, -47, 54, 15, -127, 45, 3, -17,
+   -21, -55, -51, -104, -41, -20, 59, 21,
+   11, 25, 38, 74, 40, -23, 8, 23,
+   31, -75, -3, 56, 26, -38, 104, -11,
+   -8, 100, -5, -35, 39, -1, 67, -62,
+   47, 48, -8, 101, 39, 45, -20, -1,
+   -22, 39, -3, -17, -7, -17, 19, 10,
+   26, 4, -8, -5, 69, 4, 2, -3,
+   13, 45, 19, -8, 90, 12, 39, 10,
+   18, 1, -30, 15, 53, 19, -40, -20,
+   -4, 29, -7, 9, 14, 5, 16, 49,
+   -61, -31, -64, -36, -8, -8, 25, 21,
+   -26, 7, 0, 4, 2, 21, 2, -60,
+   42, 5, -48, 79, 8, 29, 34, -26,
+   -79, 22, -43, 69, 78, -72, 30, -41,
+   -103, -15, -35, -52, 8, 29, 110, -51,
+   -32, 1, 40, 33, -46, 22, 48, 24,
+   24, 58, -107, 6, -72, 39, 35, 8,
+   -28, 67, 28, 79, 118, 3, -45, 121,
+   0, 18, -40, 93, -61, -28, -33, 43,
+   19, 83, 45, -9, -123, 82, 39, -3,
+   -39, 16, -17, 25, -27, 25, -49, 71,
+   45, -59, 8, -44, 12, -84, 4, -3,
+   56, -97, -17, -84, 88, 61, 1, -22,
+   116, 35, -31, -13, 26, 120, 10, 51,
+   -17, 38, 48, -24, -21, 124, -8, 43,
+   -33, 29, -34, 32, 27, 31, 64, -127,
+   64, 4, 12, -50, -128, -33, -26, 45,
+   -124, -127, 3, 0, 4, -17, 0, 56,
+   -13, 86, -128, -46, -126, 52, 55, 54,
+   13, -10, -27, -52, 31, 6, 51, 121,
+   50, 9, -102, -32, -87, 8, 61, -4,
+   -19, 2, 24, 11, 74, -27, -114, -3,
+   58, -1, 40, -112, 70, -24, -71, 29,
+   -24, -75, 55, 1, 64, -1, -18, 39,
+   7, -78, -22, -111, -122, 108, 22, 37,
+   -13, 13, 17, -17, -113, 32, -9, 23,
+   71, -93, 11, 110, 74, 72, -26, -6,
+   50, 48, -51, -73, 120, 30, -8, 28,
+   41, 82, 34, 63, 9, 51, 123, 57,
+   16, -105, 29, 38, 18, -39, 47, 31,
+   0, -56, 39, -36, -24, 62, 87, 39,
+   -25, -38, -67, 84, 6, 48, 107, 26,
+   -49, -94, 52, -16, -17, -4, 1, 68,
+   -19, 90, -7, 53, -19, 10, -16, -38,
+   -9, -55, 12, -31, 44, 19, 70, 28,
+   28, -32, -11, 31, -3, -58, -3, 50,
+   46, 28, 37, 6, 31, 5, -27, 54,
+   26, 33, -43, 46, 126, 44, 80, 12,
+   8, 73, 20, -62, 86, 42, -10, -15,
+   25, -83, -25, -119, -54, 16, -35, -21,
+   -40, 35, 37, 5, 7, -8, -36, -20,
+   43, 38, 61, -124, 65, 33, -30, 107,
+   58, -26, -41, -14, -43, 29, 116, -40,
+   -55, 76, -83, 59, 36, -116, -1, -106,
+   -57, 121, 26, -67, -32, 77, -9, 35,
+   -111, 47, 36, -41, 80, -64, 11, 121,
+   -80, -4, -116, -71, -47, 56, -15, 27,
+   24, -74, 11, 86, -20, 66, -93, 18,
+   -35, 21, -14, -4, -37, 8, 19, 64,
+   -81, -57, -33, 126, 32, -32, -12, -22,
+   63, 43, -24, -36, -49, 29, -105, -115,
+   -73, -124, -43, 77, -99, 120, 4, 42,
+   -77, 46, 55, 61, 45, 108, -120, 34,
+   -49, -18, -61, -46, 8, -121, -79, 18,
+   91, 45, 29, -61, -20, -118, 41, -20,
+   105, -5, 46, -12, -4, 14, 8, 43,
+   1, -38, 56, 88, -22, -94, 109, -71,
+   13, -27, 16, 70, 74, -123, 60, 44,
+   -25, 18, -24, -85, 39, 72, 21, 22,
+   -35, 4, -18, 28, -1, -42, -53, 18,
+   32, -5, 45, -21, 35, 123, 63, 7,
+   45, -128, 1, -16, -86, 26, 25, -14,
+   20, 33, 112, 38, -3, -49, 67, -1,
+   -20, -74, 6, -46, -23, -23, -114, 31,
+   -77, -15, -24, -67, 74, 42, -61, 22,
+   25, -99, 50, 71, 6, -42, 58, 54,
+   -19, 17, -3, 60, 9, 56, 116, 32,
+   82, -28, -10, 15, -43, 25, 52, -105,
+   57, 4, -41, 2, -84, 43, 36, 15,
+   2, -60, -48, -34, -49, 2, -71, 66,
+   54, 33, 3, 60, -22, 18, 32, 30,
+   -8, 52, -64, -21, -16, -23, -13, 17,
+   -51, 0, 5, -58, 23, 5, -56, -5,
+   72, -27, 83, 18, 42, -24, 20, 10,
+   -30, -17, 49, -23, 51, -54, -7, 11,
+   20, 89, 21, 9, -83, -22, -121, -36,
+   95, 29, 42, -71, -38, 6, 60, -79,
+   -119, 35, 8, 35, 14, 110, 68, 35,
+   -62, -26, 14, 52, -51, -41, -3, -35,
+   35, -34, 64, -81, 74, 10, -7, -45,
+   33, 19, -55, -26, -71, -8, 19, -67,
+   -4, 49, -36, 25, -33, -40, -39, -10,
+   -25, 4, -30, 100, 8, 33, 8, 9,
+   22, 5, -39, 61, 10, 79, 89, 42,
+   -27, -9, -15, -64, 24, 80, 26, -9,
+   19, -11, -68, 43, -51, -14, 39, -16,
+   54, -11, -121, 48, 64, -95, -31, -46,
+   7, -43, -19, -61, -111, 79, -34, -126,
+   31, 5, 60, 51, -108, 42, -44, -43,
+   -31, -81, 29, 24, -55, 11, -21, 0,
+   50, 1, -66, -31, -40, 6, -35, -31,
+   -13, 41, -7, 74, -45, -123, 44, -25,
+   -78, -24, 40, 49, -3, -38, -25, 3,
+   -36, -93, 50, 53, 58, 81, -21, -24,
+   -47, 7, -15, -47, -13, 29, 124, -10,
+   13, -41, -82, 8, -51, -20, 13, -48,
+   57, 38, 26, 15, -78, -23, -46, -3,
+   -18, -16, -53, 6, 26, -43, 20, 12,
+   6, -1, -56, 40, 81, -62, 37, -30,
+   29, -10, 28, -44, -37, 11, -48, -7,
+   -29, -90, 23, -25, -35, 6, 49, -10,
+   -2, -30, 6, -79, -124, -13, 56, 44,
+   -8, -80, 66, -28, -56, -11, -41, -74,
+   14, -4, -33, 43, 0, -30, -40, -37,
+   10, 7, 30, -24, -13, 22, -33, 36,
+   -18, 64, -9, -25, -59, -72, -15, -31,
+   21, 56, -6, -102, 0, 46, -35, -3,
+   -23, 39, -15, 117, 54, -10, 48, 19,
+   -42, -31, -26, 11, -2, -35, -94, -30,
+   41, 26, 41, -23, -62, -47, -88, 51,
+   -16, 13, 0, 56, -21, -57, -26, -17,
+   64, -5, -128, -24, -51, 53, 32, -76,
+   39, -81, 87, -116, -32, -24, 63, 76,
+   -44, -128, 46, 69, -128, 12, 24, -128,
+   5, 88, -16, 76, 117, -6, 5, 26,
+   -27, -36, -40, -73, 2, 4, -69, 39,
+   127, 53, 93, -124, 16, 46, 19, 27,
+   82, 102, -58, -96, -1, 123, 64, 13,
+   121, 116, 127, -77, 6, -70, 19, -127,
+   -101, -23, -125, 126, -126, -17, 65, -65,
+   13, 124, 64, 35, -95, 0, 127, 42,
+   -18, -37, -64, -47, 85, -126, -122, 40,
+   7, -67, -12, 6, 1, 105, 86, 20,
+   22, -16, -36, -22, -13, 1, -14, 39,
+   70, 16, -40, -29, 16, 42, 8, -47,
+   11, -50, 1, 1, -33, 5, -31, -91,
+   -19, 21, -42, -65, 0, -10, 56, 12,
+   -48, -19, -4, -12, 3, -9, 16, -15,
+   -64, 5, -73, 9, 9, -4, 23, 14,
+   -46, 21, -8, -43, -32, 43, -6, -2,
+   15, 4, -19, 26, 11, -15, 28, -13,
+   18, 56, 34, 42, -18, 25, -32, -11,
+   45, -37, 1, 43, 38, 4, -42, -15,
+   -40, 8, -19, 19, -42, -31, -20, 34,
+   -16, -50, 3, 18, -18, 17, -6, -15,
+   -21, 5, 4, 91, 80, 8, -6, -33,
+   -13, -82, -1, 42, 22, 6, 25, -16,
+   7, 16, 22, 14, 12, 18, 57, -6,
+   92, 13, 50, -54, 18, 58, 8, -18,
+   14, 62, 16, 126, 16, 18, 57, 7,
+   39, 104, -84, -4, -8, 29, -35, 13,
+   24, 13, 75, 16, -32, 23, 5, 21,
+   -41, -94, -68, 31, 32, 0, -37, -5,
+   -12, 6, -44, -20, 27, 19, 48, -4,
+   -37, 23, 127, 24, 39, 97, 12, -1,
+   6, -13, 31, 7, 27, 8, 15, 44,
+   17, 97, 106, -68, -59, 20, -17, -13,
+   10, 9, 8, 89, 29, 47, 47, 39,
+   79, -18, 55, -5, 101, -2, 9, 105,
+   21, 87, -55, 26, 35, 49, 123, -13,
+   87, 10, -79, -40, -70, -50, 34, 6,
+   29, -17, 71, -18, 9, 111, 2, -21,
+   -4, 127, -24, -52, -2, 104, -15, -27,
+   126, -78, 41, 59, 52, 72, -23, -12,
+   -7, 52, -11, 17, -19, 79, -37, -23,
+   -8, -23, -13, -75, -40, -57, -125, 60,
+   -65, 24, -66, -72, -34, 79, 7, -29,
+   -24, -100, -62, -62, -54, 40, -55, 42,
+   81, -51, 55, 21, 33, 93, 9, 85,
+   -24, 37, 20, 21, -5, 72, 9, 60,
+   -22, 15, 9, 80, 68, 10, -61, 57,
+   67, 127, -11, 22, 108, 103, -42, 43,
+   -19, 97, 11, 33, 124, -61, 24, 23,
+   -35, 122, -72, -45, -90, -48, 15, -48,
+   -20, 48, 12, -4, 90, -3, 0, 13,
+   -33, 64, 86, 19, 74, 119, 120, -128,
+   -126, 37, 28, -7, 15, 72, -26, 62,
+   35, 8, -79, 4, -42, 9, -5, -37,
+   -39, 72, -99, 10, 25, -1, -88, 66,
+   39, 28, -73, -123, 37, -12, 29, 44,
+   7, 75, -11, -98, 27, 61, -11, -10,
+   -52, 74, 18, -62, -14, 66, -6, -2,
+   -53, 13, 48, 13, 4, 4, -9, 16,
+   -47, -16, 32, -49, 6, -51, -15, 55,
+   48, 64, 32, 41, -12, -72, 69, 7,
+   17, 26, 45, 53, -110, 16, 11, 20,
+   -75, 48, 77, 1, -31, 1, 74, -66,
+   -8, 73, 44, 19, -40, 41, 27, 62,
+   60, 93, 20, 12, 0, -39, -27, -1,
+   7, -13, -1, -15, 84, -47, 21, 62,
+   -18, 25, 19, 6, 64, 97, -3, 9,
+   12, 101, -14, 46, 30, 22, -9, 22,
+   13, -6, -17, -26, -63, 21, 105, 49,
+   -25, -26, -43, -22, 26, 17, 54, 101,
+   -25, 44, -4, 40, -5, 50, 37, -21,
+   62, 53, 19, 38, -60, -84, 13, 40,
+   15, 59, 105, 33, -14, 19, -17, 69,
+   -7, 13, -45, -20, -16, -16, 68, -17,
+   32, 12, 2, 40, -35, -23, 29, 9,
+   -25, -38, 51, -62, 13, -84, -3, -48,
+   -76, -76, -65, -24, 16, -21, 14, 2,
+   56, 18, -47, 49, -17, 31, 46, 18,
+   78, 44, 55, -72, 1, 34, -15, -46,
+   -8, 6, -39, -24, 3, 121, 1, -11,
+   -41, -61, 57, -33, 4, 3, -43, -47,
+   -1, 97, -14, -14, -5, -13, -40, -15,
+   31, 1, 22, -7, -83, -19, 15, -35,
+   -13, -2, 60, -31, 32, -20, -69, -50,
+   27, 69, -64, -48, 51, 40, -96, -63,
+   -88, -24, 3, 12, 127, -111, 75, 54,
+   -44, 14, -19, -59, 8, -16, 19, -128,
+   -27, -76, -25, -2, -73, 125, 27, -127,
+   12, -15, -55, 40, -126, -1, -81, 50,
+   126, 100, 29, -6, 43, 32, 19, -2,
+   52, -27, 28, -108, 53, -24, 0, 42,
+   -15, 20, -53, -51, 27, -108, -88, 49,
+   -6, 34, 0, -54, -48, 49, -53, 13,
+   57, -64, 8, -19, 48, 8, -2, 13,
+   44, 13, -8, 26, 62, -23, 35, -6,
+   -11, -16, 29, 94, 95, 22, 25, -42,
+   57, 41, 24, 43, 87, 49, 19, -18,
+   113, -11, 52, 102, 119, 31, 100, 47,
+   6, 16, 36, -11, 21, -23, 59, 8,
+   59, -14, 38, 82, 12, 58, -31, 39,
+   86, -52, -12, 51, -7, -65, 29, -44,
+   -39, 12, 39, -49, 13, -41, 23, -9,
+   24, 13, 43, -48, 37, 75, 9, 88,
+   -22, 22, -99, 24, 42, -20, 8, -31,
+   -17, 8, 48, -29, 64, -9, -32, -2,
+   -30, 11, 26, 124, -64, 25, 7, -5,
+   -11, 58, 73, -93, 64, 24, -43, -60,
+   -13, 8, 0, -16, -5, -83, -103, 108,
+   27, -20, -20, 32, -49, -2, -25, 126,
+   -18, 19, 126, 3, 25, -27, 90, -24,
+   -38, -38, 48, 55, 24, -28, 0, -22,
+   -31, -8, 98, 36, -12, -7, 7, 16,
+   -16, -88, -10, 102, 79, 117, -25, -40,
+   -11, 26, -8, 19, 25, 35, 73, 47,
+   33, 14, 82, -20, -42, 22, -74, -25,
+   90, 16, -45, -66, 81, -65, -66, 34,
+   -17, 22, -13, 102, 39, -3, -51, 32,
+   -35, 4, -9, 53, -17, -92, 35, 41,
+   66, 125, 35, -68, 13, -34, -22, 22,
+   2, 13, -59, 26, 41, 12, -76, -78,
+   4, 78, -6, -30, 1, 46, -22, 29,
+   -53, -44, -128, -83, 7, -128, -87, 45,
+   66, 21, -74, -13, -125, 2, -9, 0,
+   -63, -67, 37, 32, -28, 1, 74, -109,
+   9, 25, -51, 31, 98, -32, 10, -22,
+   -82, 30, 102, 41, -64, -43, 85, 40,
+   -13, -125, -98, -5, 4, -66, -69, 6,
+   -86, 125, 45, -81, -57, 76, -127, 91,
+   -57, 2, -22, -65, -36, 127, -54, -12,
+   -11, 6, -29, 20, 37, -13, -58, 32,
+   -55, -5, -67, -51, 1, 0, -77, -43,
+   31, -43, 12, -61, 24, 53, 27, 6,
+   19, 25, -29, -4, -11, -97, -64, -43,
+   17, 19, -96, 13, 35, -48, -43, -34,
+   75, 6, -30, -6, -29, 26, -18, -47,
+   -1, 42, -2, -29, -6, 40, -2, -95,
+   -22, -95, 7, 67, 12, -35, 25, -15,
+   -21, -72, -44, -89, -25, -97, 107, 4,
+   52, 11, 121, 0, 75, 9, -18, 23,
+   -27, -50, -15, 5, 45, -31, -18, -55,
+   -30, 40, 27, 2, 94, -14, -24, 26,
+   29, 86, 127, 16, -64, -38, 16, 110,
+   7, 22, -47, 64, 87, -11, 65, 92,
+   -43, 89, 15, -68, 113, 68, -79, 80,
+   55, -57, 48, 12, -61, 2, -71, 22,
+   28, -25, 35, 8, 124, -66, 30, -112,
+   -127, 74, -7, 52, -88, -15, -4, -45,
+   -40, 124, 13, 61, 60, 29, -124, -73,
+   -99, -85, -125, 79, 21, 124, -35, 123,
+   11, 28, 73, -62, 62, 44, 76, -1,
+   -58, -25, -58, -40, 99, -57, -126, 6,
+   -63, -124, -90, -105, -55, 84, -49, -17,
+   36, 66, 39, 19, 83, -34, -107, 27,
+   -17, 20, 90, 11, 17, 50, 7, -47,
+   35, -17, 24, 57, 29, -27, -77, 11,
+   -74, -49, -9, -39, 4, -25, 32, 117,
+   -8, 37, 52, -104, -13, -87, 0, -32,
+   126, -10, 59, 15, -44, 26, 46, 8,
+   -4, 25, -85, 24, 15, 20, -27, -6,
+   51, -8, 12, 50, -6, -23, 52, 109,
+   -47, 13, 69, -112, -54, 36, -15, 32,
+   -23, -106, -40, 19, 40, -49, -81, 23,
+   -28, -3, -61, -47, -62, -52, 90, -25,
+   69, -122, 5, 119, -13, 9, 38, 17,
+   -5, 34, -18, -34, 23, -27, 65, 59,
+   -3, 16, 9, -16, 1, 72, -9, 36,
+   -43, -8, 36, 27, 20, 35, 81, 4,
+   57, -25, 43, 0, 14, 31, -25, -32,
+   -9, 35, 55, 18, -78, 25, 80, 31,
+   11, 15, 37, 0, -74, -10, 49, 44,
+   1, 8, 120, -14, -2, 29, 122, 33,
+   96, 23, -95, 39, 67, 8, -18, 73,
+   9, -50, -105, 80, -23, 88, -23, 6,
+   108, -15, -8, 36, 12, 27, 34, -22,
+   46, 28, -10, 61, -60, 0, 20, -31,
+   -8, 32, -33, 87, 121, 35, 17, 45,
+   -19, 21, 61, 90, -33, 57, 38, 36,
+   -32, 119, -30, 25, 66, 14, -13, 28,
+   15, -34, 57, -56, -16, 27, 89, -63,
+   0, 3, -23, -37, -11, 43, 5, -65,
+   -15, 58, -15, 25, 1, -70, 21, -43,
+   -25, -52, -28, -52, 17, 2, 30, 5,
+   -36, 76, 63, 37, 79, 88, -4, -25,
+   79, -77, 16, -20, -6, 48, 52, -47,
+   66, 68, 4, -11, 10, -54, -60, -68,
+   -99, -16, 56, -67, 26, -70, 42, -13,
+   32, 57, 86, 40, 44, -8, -28, 30,
+   73, -29, -36, -22, 2, 4, 16, -52,
+   87, -29, 44, 26, 25, -21, 19, -64,
+   -127, -11, 12, 47, 86, 97, -6, -34,
+   2, 69, 0, 8, 29, -7, -117, 17,
+   -73, -19, 33, -86, 24, -124, 123, 94,
+   46, -103, -59, -5, 40, -114, 3, 68,
+   109, -2, -95, -33, -10, 8, 43, -10,
+   -19, 78, -66, 10, 58, -114, -54, 65,
+   28, 67, -10, 63, 40, 18, 7, -26,
+   32, -8, 3, 3, -35, 43, 15, -78,
+   -127, -2, -118, 47, 62, -124, -16, -57,
+   -111, -123, 3, -45, -108, -122, 83, -103,
+   114, -124, -35, 35, -62, 55, -9, 87,
+   127, -74, 56, -28, -41, 40, 6, 5,
+   -80, -6, 4, -4, -5, 57, -36, 17,
+   22, 47, -15, 22, 28, 37, 115, 36,
+   65, 21, -10, 0, 20, 18, 77, -51,
+   -30, 7, 52, 13, -61, 13, -30, 15,
+   28, 8, -63, 15, -2, 13, -11, -2,
+   -27, -68, 110, -43, -7, 81, 83, 24,
+   30, 33, -31, -28, -39, 15, 39, -46,
+   -2, 13, -21, 6, -17, -51, -22, -33,
+   -51, 54, 9, -54, 16, 35, 39, 44,
+   -84, 12, 45, -21, -37, -46, -18, -53,
+   8, 21, 1, 11, 14, -71, -20, -5,
+   -19, -9, -23, -16, 7, -3, -8, -16,
+   -30, 43, 20, 43, 19, 17, -25, 11,
+   -18, -24, 3, -31, -31, 82, -92, -69,
+   51, 3, -57, -82, 12, -86, -19, -10,
+   27, 23, -11, 3, -6, -34, -33, -29,
+   -56, 13, 52, 36, -62, -34, -4, 17,
+   -45, 2, 71, -48, -26, 17, -45, 25,
+   -43, -18, 38, -23, 33, -11, 38, 28,
+   15, -83, -7, -11, -46, -53, 46, -13,
+   31, -36, -79, 57, -54, -70, -11, -42,
+   -30, -35, 35, -11, -12, 18, -16, 111,
+   -23, 22, 64, 28, 48, -31, 48, -18,
+   -7, 11, -34, 1, -46, 31, -6, 71,
+   -108, -121, -31, -57, -28, 61, 25, 32,
+   -32, -126, 5, -13, 52, 117, -56, 17,
+   53, 9, -125, 48, 21, -42, -34, -16,
+   70, -48, 5, -2, -15, 78, -29, -121,
+   57, -28, 47, 19, -4, 45, 95, 13,
+   30, 31, -26, 54, -49, -65, 45, -97,
+   65, 98, -38, -30, -49, -36, 15, 34,
+   -94, -6, -57, -105, 73, 5, -49, 1,
+   -71, 22, -86, -124, -23, -53, -48, 4,
+   30, -1, 124, 29, 30, 68, 20, -128,
+   26, 12, -95, -8, -128, 75, 60, 6,
+   -23, 5, 17, -12, -45, -72, 7, -18,
+   -19, 48, -21, -46, 79, 31, -127, 36,
+   -69, -75, -5, 102, 40, -29, 1, -21,
+   18, 1, 60, -99, -102, 21, 24, -42,
+   43, -1, 46, 16, 84, -53, -45, 33,
+   -12, -3, 30, -1, -26, 0, 21, -48,
+   -4, -6, 16, -41, 22, 9, -25, 6,
+   -8, 15, 8, 6, 49, -18, 20, 10,
+   33, 62, 32, 15, 37, -16, 44, 5,
+   6, -47, 12, -16, 2, 50, 72, 94,
+   -4, 38, -103, -17, 73, 50, 25, 7,
+   -1, -15, -39, 0, 19, 24, 19, -49,
+   44, 3, 5, 85, -22, 33, 2, -16,
+   18, 53, -61, -2, 4, 6, -22, 66,
+   -39, 5, -30, -73, 45, -62, 121, -60,
+   113, -65, 26, 34, -44, 57, -23, 42,
+   -39, 31, 30, -79, 5, 31, 20, 22,
+   -24, 42, -59, 120, 108, -28, -8, -11,
+   5, -3, 63, 64, -91, -2, -71, -21,
+   10, -70, 58, -43, -16, -12, 73, 11,
+   -50, 15, -19, 41, -12, -9, -123, 35,
+   19, -19, -40, 34, -19, -43, -109, 24,
+   25, 1, 127, -7, -17, -91, 13, 3,
+   125, 2, -105, -53, 11, -28, 15, 66,
+   20, -10, 42, -45, 6, 20, -7, 38,
+   -8, 43, -49, -46, 15, 60, 9, -124,
+   75, -31, -14, -70, -119, 38, 9, -44,
+   -126, -92, -96, -17, -128, 1, -110, 40,
+   104, -23, -126, -61, 3, -78, 1, 75,
+   14, 41, -14, -43, 41, -80, -34, 52,
+   -128, -13, -106, 53, 77, 82, -61, 34,
+   32, -117, -29, -20, -44, 55, -78, 56,
+   3, -16, -9, 119, 41, 27, -71, 0,
+   7, -26, -41, -117, 73, -84, -122, 34,
+   51, 89, 11, -48, -74, -14, 21, 22,
+   -90, -96, -4, -86, 124, 19, 14, 101,
+   80, 10, -31, -32, 13, -32, 37, -21,
+   36, -52, 27, 15, 38, 16, 32, -33,
+   -55, -28, -1, 123, -10, -54, 27, 46,
+   -7, 127, 39, -1, 40, 3, 40, -12,
+   -22, -30, -5, -30, -62, -64, -34, 123,
+   -61, 39, 42, -31, 24, 49, -21, 77,
+   -20, 45, 49, 85, 127, 79, -3, -23,
+   -28, 77, 55, -31, 70, 4, 16, 59,
+   49, -36, 127, 85, -13, -27, -67, 67,
+   25, 8, 32, -3, -25, 104, 36, 44,
+   38, 48, -8, 22, -65, 71, 49, -10,
+   3, 6, 77, 49, 21, 6, 103, -17,
+   -11, 40, -25, -2, 89, 54, 37, -68,
+   -53, 68, -7, 58, -120, 56, 0, 66,
+   -49, -70, -53, -59, -9, 14, -101, -38,
+   46, -103, 1, -12, 30, -57, -17, -7,
+   10, -39, -50, 0, -65, 68, -109, -82,
+   -38, -36, 47, 99, -36, 2, 30, 34,
+   68, -39, 88, 6, 15, -20, 29, -40,
+   -11, 2, 62, -50, -34, -36, 70, 127,
+   -53, 55, 96, 38, 40, -46, -18, 65,
+   73, 56, 32, -48, -79, 17, -23, 105,
+   -82, -84, 71, 31, 15, -61, 40, 65,
+   8, 106, -47, 25, 5, 13, 12, 80,
+   102, 40, -45, -37, -89, -49, -14, -67,
+   89, 103, 66, -56, -26, 92, 33, 58,
+   -52, -78, 30, -47, 21, -116, -57, 17,
+   -44, -32, -104, -57, -46, 4, -127, 37,
+   -34, -42, -102, -72, 6, 126, -21, -94,
+   42, -18, -62, -77, -21, -14, -79, -34,
+   10, 2, -3, 27, 22, 9, -38, 5,
+   68, -73, 86, 20, 44, -34, -26, 88,
+   10, -12, 63, 32, -89, 39, -7, -56,
+   -6, -7, 6, -81, 43, -127, 37, 65,
+   -89, 22, -74, -57, -3, -13, 86, -4,
+   83, -38, -85, 18, 26, 12, 4, -128,
+   43, -1, 25, -41, 26, 75, 53, 18,
+   0, 13, -8, 35, 43, 0, -17, 3,
+   -77, 75, 47, 119, -31, 9, 34, 26,
+   39, 64, 65, 47, 60, 4, 65, 14,
+   -101, 10, -25, 102, 116, 76, 104, 33,
+   98, 28, 16, 23, 21, 60, -15, 53,
+   112, -3, -42, -19, 27, 12, 106, 16,
+   -33, -4, 101, 48, -9, 42, -19, 22,
+   48, 48, 65, 43, -42, -127, -79, 28,
+   -30, -9, -28, -26, -34, 54, 5, -47,
+   24, -41, 105, -27, 8, 85, 10, 52,
+   -9, 22, 18, 25, 99, 59, 22, -86,
+   -53, 20, 24, -77, 63, -6, 6, 41,
+   122, 60, -37, -2, 17, -21, 107, 15,
+   -62, 7, 87, -12, -1, -68, 65, -71,
+   -47, -100, 33, 120, 17, 6, -25, 116,
+   0, 39, 27, 19, 0, 47, 83, 37,
+   -12, 2, 83, 89, -70, -81, -21, 28,
+   16, 25, -36, 48, -21, -15, -6, -84,
+   -22, -44, 53, 44, 58, -27, 34, 118,
+   -3, -106, 85, 71, -1, 111, -44, -29,
+   127, 9, 81, -103, 11, 31, -125, -10,
+   53, 19, 111, 30, -34, -84, -43, 2,
+   36, -2, 122, 61, -96, 126, -34, 125,
+   18, -41, -35, 6, 51, 38, -16, 39,
+   33, 49, 42, 38, 11, 30, 46, 9,
+   -54, -17, 30, 8, 4, 16, 95, 23,
+   28, 100, -29, -22, -29, 41, -2, 93,
+   55, -58, 40, 6, -84, 1, 20, -46,
+   -3, -26, -33, 51, -101, 51, -15, -20,
+   54, -78, -90, 31, 47, -89, -49, 1,
+   -29, 1, 24, -11, -30, 16, -6, -15,
+   17, -57, 43, -33, 80, -93, -3, 31,
+   -124, 21, -66, -94, -6, 104, 72, 27,
+   -40, -85, -99, -57, 9, 7, -31, 1,
+   17, 24, 13, 29, -76, 88, 27, 50,
+   12, 56, 75, 102, -55, 20, 77, 25,
+   -7, -3, -21, 84, 1, -102, 56, -5,
+   14, 24, 29, -82, -17, -80, -44, 80,
+   -19, 53, 23, 23, 72, -9, -14, 35,
+   -72, -10, -74, -27, -13, -53, -51, 37,
+   -34, 62, 63, -42, 18, -95, -118, 25,
+   -23, -14, -33, -22, 63, 20, -22, 15,
+   18, -33, -124, -110, -36, 7, -20, 115,
+   -23, -8, -33, 53, -2, 49, -15, 18,
+   95, 12, -18, 103, 42, 7, 15, 17,
+   -1, 26, -34, -6, -13, 26, 27, 19,
+   -67, -9, 122, 32, -34, 18, 8, 37,
+   98, -7, -20, -54, -33, 59, -27, -44,
+   25, -15, 6, -108, 2, -9, 46, -20,
+   47, -17, -76, -10, -88, 11, -21, 40,
+   26, 13, 57, 72, -56, -31, 121, -127,
+   -24, 60, 24, -23, -13, 61, -43, -25,
+   14, -65, -36, -13, -2, 120, -12, -46,
+   88, 127, 20, -21, 3, -24, 43, 38,
+   102, -28, 101, -116, 16, -20, -22, -66,
+   19, 89, 93, 123, 23, -111, -6, -45,
+   -69, -46, -42, 21, 54, -73, 73, -13,
+   -21, 88, 51, -19, -18, 78, -12, 8,
+   -4, 50, -82, 1, -35, -86, -31, -25,
+   -55, -3, -63, -17, 11, 32, -69, -29,
+   22, 6, 37, -46, -6, -62, -50, 74,
+   -87, 43, -41, -84, 55, -43, 7, 12,
+   52, 29, 25, 58, -19, -1, 34, 5,
+   -106, -62, 50, -77, 28, -11, 2, -16,
+   -52, 3, -50, -2, -20, -90, 13, -92,
+   36, 11, -21, -78, -19, 24, -20, -12,
+   28, 9, -19, -6, -123, 35, 61, -47,
+   -34, -3, 12, 31, 17, 17, 101, -35,
+   47, 16, 45, 48, 0, 15, 16, -11,
+   2, 40, -34, -92, 42, -78, -25, 0,
+   -42, 35, -126, -126, -6, -83, -128, -48,
+   -105, -29, -10, -74, 11, 27, 26, 42,
+   1, 12, -24, -14, 0, 110, 29, -16,
+   -29, 59, -92, -35, -91, -26, 0, 11,
+   -1, 42, 54, 2, 15, 23, 42, -23,
+   -54, -29, 1, -120, 31, -16, -51, 71,
+   -32, -72, 51, 31, 40, -6, -13, 14,
+   37, -8, -71, -20, 76, -17, 41, 28,
+   -23, -119, 1, 107, 5, 43, -13, 117,
+   -41, 8, -26, -14, 33, -18, 57, 60,
+   7, 5, -11, -39, -32, -2, 15, 41,
+   98, 111, -44, 46, 44, 20, 88, 18,
+   62, 17, 107, 16, 5, -4, 40, 15,
+   -19, 9, 58, -77, -40, 119, -54, -35,
+   45, 75, 12, -45, -32, -3, 72, -41,
+   -21, 6, -5, 2, 106, -40, 41, 62,
+   57, 8, 24, -60, -44, -61, 104, -48,
+   -34, -58, 62, -20, 6, -60, 40, -29,
+   117, 76, -56, 22, 15, -1, 112, -1,
+   23, 42, 57, -53, 75, 26, -11, 35,
+   78, 85, 0, 19, 17, 3, -29, 20,
+   28, -54, 6, 5, -11, 45, 34, 37,
+   -13, 2, 15, 13, 9, -28, 32, 8,
+   27, -1, -63, 42, -33, -2, -19, 4,
+   -127, -15, -52, 38, -5, 35, -26, 44,
+   13, 1, -39, 73, 17, 24, 33, 103,
+   -56, -41, -1, -28, -40, -81, 21, 10,
+   -2, -79, -88, -42, -3, -44, -63, 81,
+   16, -42, -71, 37, -14, -27, -127, -6,
+   -108, -94, 19, -71, -80, -12, 65, -9,
+   -7, 92, 8, -125, -36, 2, 47, 0,
+   19, 8, -65, -58, -60, -1, 17, 33,
+   46, 78, -103, -127, 63, -3, -65, 16,
+   13, -10, 16, 0, 27, -8, -104, 2,
+   -17, -44, -24, 41, 37, -4, -124, -4,
+   18, -109, -125, 41, -7, 11, 29, 17,
+   -42, 24, -120, -70, -123, -26, -25, 14,
+   66, -12, -38, -106, -29, 45, 5, -6,
+   -11, 31, 6, 13, -85, 44, -15, -2,
+   -3, -39, -4, 4, 8, 78, 51, -47,
+   19, 3, -63, 22, -34, 28, -13, 22,
+   15, 23, 5, 1, -87, -122, -66, -14,
+   -10, -1, 19, 40, -40, 2, 24, 13,
+   -23, -27, -125, -3, -12, 9, 18, -4,
+   -12, 8, -8, 66, -2, -13, -27, 20,
+   -38, 33, -24, -20, -11, -6, 11, -9,
+   -3, -30, -1, -16, 23, -60, -19, 16,
+   -33, 21, -34, 9, -2, -33, -43, 21,
+   -39, 1, 54, -24, -24, -22, -30, -1,
+   -9, -27, -8, 14, 40, -5, 10, 4,
+   -30, -6, -21, 34, -34, 52, -12, -6,
+   -47, -95, -34, 43, 6, 31, 32, -38,
+   -23, -27, 42, -22, -118, 19, 34, 23,
+   5, -50, 22, 25, -19, -40, -17, -2,
+   26, -15, -69, -126, 10, 33, 23, -7,
+   13, -9, 26, -42, -62, -74, -9, 8,
+   -47, 38, -82, 38, -4, 11, 57, -10,
+   -12, -66, -25, -10, 24, 4, 16, 1,
+   41, -18, -96, 18, -11, -13, 103, 11,
+   17, -3, -76, 19, -81, 110, 18, -46,
+   -51, -53, 19, 3, -36, -31, -13, -32,
+   -44, -37, -70, 43, -128, -11, 35, 2,
+   -58, -33, 20, -62, -105, 11, -70, -77,
+   44, 125, -15, -25, 18, -60, 69, -96,
+   -125, -4, 95, -69, 13, -30, -43, -53,
+   -61, -6, -8, 60, 5, -75, -125, 5,
+   -12, 45, -101, 111, 11, -98, -17, 39,
+   -85, -7, -46, -56, -37, -97, -45, -37,
+   -16, 80, 64, 110, -74, -30, -34, -24,
+   -95, 2, 4, 56, -71, 39, -39, -14,
+   -46, -22, -124, -115, 8, 19, 69, -11,
+   -70, -68, 120, 95, -100, 112, -103, -70,
+   -35, -128, -97, -71, 29, -72, -123, -48,
+   10, -36, -51, -8, -8, -26, -15, -26,
+   -5, 34, 6, 38, 13, 67, -14, -35,
+   28, 21, 127, 6, -28, 41, 20, 8,
+   -48, -33, 1, 28, 9, 15, 48, -48,
+   88, 91, -19, 54, -22, -80, 35, -37,
+   -2, 7, -44, 18, -67, 36, 50, 21,
+   -60, 26, 26, 34, -29, 8, 28, 2,
+   -10, 19, 26, 43, 36, 0, 116, -24,
+   12, 13, 1, -33, -7, 0, -4, -13,
+   3, 8, 4, 32, 23, -72, -70, 42,
+   54, -16, -21, -48, -38, 22, -46, 22,
+   -40, -1, -64, 0, 40, -27, -26, 9,
+   12, 35, 59, -48, 46, -18, -25, 13,
+   -66, -14, -55, 57, 24, -67, -15, -15,
+   -38, -84, -11, 1, -45, 19, -60, -49,
+   24, 38, 22, 53, -52, 20, -1, 53,
+   82, 19, 43, 13, -32, -56, -51, 56,
+   16, -36, -33, -53, 7, -22, -20, -14,
+   -34, 11, 24, 22, -21, -127, -51, 15,
+   47, -20, -49, 22, -56, 40, -44, -20,
+   -2, -65, 9, -2, -27, 22, -1, -12,
+   -9, -17, -55, 89, -76, -16, -10, 37,
+   -35, 0, 4, 16, 52, -10, 23, 39,
+   -25, 9, 51, 79, -6, 21, -18, 10,
+   64, -37, -33, -48, 24, 78, 15, 17,
+   -34, 81, -35, -82, 32, 110, 59, -126,
+   -25, -124, 11, -55, 20, 63, 100, -10,
+   -123, -69, -6, 5, -74, 26, -14, 16,
+   -12, -13, -115, -76, -70, -124, -19, -81,
+   40, -96, -66, 62, -32, -79, 28, 59,
+   12, 31, -53, 119, 74, 26, -17, 44,
+   81, 100, -19, -25, 41, -11, -103, 48,
+   41, -8, -26, 4, -112, 53, 31, 28,
+   50, -73, -9, -127, 1, -84, -109, -35,
+   -80, 9, -38, 42, -105, 89, 32, 94,
+   68, -73, -8, 53, -32, -2, -8, -127,
+   101, -2, 43, 110, -13, 43, 27, -4,
+   -55, -12, 81, 52, 114, 30, 66, -67,
+   107, 88, 44, -63, -14, -92, -27, -58,
+   -16, 82, 98, -26, -9, 0, -108, -82,
+   -11, 23, 26, -22, -2, -82, 93, 89,
+   -67, -31, 5, 34, 36, 32, -49, -53,
+   -81, 86, 43, 34, 11, 59, -46, 4,
+   -60, 14, 12, 30, 34, 14, 29, 10,
+   -34, -105, 32, 122, 7, 63, 24, 43,
+   55, 34, 61, -26, 70, 9, 8, -3,
+   -40, 28, -42, -35, -3, 53, 35, -9,
+   -49, -26, 39, 61, -48, 64, 81, 18,
+   78, 27, -3, 0, -66, 108, 40, 28,
+   -45, 57, -17, 44, -56, -12, 18, -93,
+   -43, -7, 32, -38, 55, -17, 121, 71,
+   -27, 39, 36, -13, 26, -27, -13, 52,
+   30, 3, -26, 11, 21, 52, -7, 127,
+   -5, -84, 62, 47, -93, 89, -90, -8,
+   -18, 40, 21, -86, -10, -47, 28, -48,
+   69, -76, -66, 55, 28, -87, -11, -53,
+   38, -29, 13, 103, -79, -126, -39, 82,
+   -87, -6, 18, -54, 65, -24, 61, 0,
+   -60, 34, 43, -5, -15, 36, 25, 26,
+   60, 18, -28, -16, -9, 60, 36, 13,
+   34, 57, -43, 7, 82, 53, -7, -24,
+   33, 63, 49, -79, 110, 34, -11, 94,
+   -80, -43, 102, 22, 3, 30, 78, -60,
+   127, -126, -48, -15, -20, 63, -98, 27,
+   -60, 5, -7, 9, -39, 55, 20, 43,
+   32, -57, 34, 41, 20, -2, 53, -6,
+   2, 26, -105, -41, 21, -14, -84, -9,
+   57, 14, -63, 36, -62, 8, -45, 92,
+   -56, -1, 23, -17, -45, 42, -30, -14,
+   60, 17, -5, 87, -42, -18, 73, 5,
+   12, 6, 11, -2, -7, 13, -19, 40,
+   16, 87, 12, -76, 48, -18, -37, -105,
+   86, 4, -43, 20, 35, -53, -25, 49,
+   -31, -5, 71, 57, -127, 51, -49, -10,
+   -30, -41, -9, 15, 16, 40, 17, 13,
+   0, -3, 1, 43, -76, 5, 98, 20,
+   -4, 26, 53, 19, -65, 40, 47, -58,
+   79, 15, -19, 80, -28, 117, 50, -28,
+   11, -32, 28, -27, -72, -13, 9, 22,
+   -53, 13, 8, -29, -37, -34, 46, -68,
+   -18, -126, -89, -87, -36, -19, -2, -45,
+   16, -3, 1, 17, 4, 3, -72, -62,
+   51, -48, 3, -87, -23, 13, -117, 17,
+   24, -76, -42, -18, -128, 25, -95, -45,
+   -17, -48, -112, 106, 12, -97, -23, -18,
+   45, -42, 25, 65, -67, 84, -67, -110,
+   -7, 64, -8, -75, 83, 10, 49, 121,
+   -82, 125, 52, 82, -49, 20, 79, -3,
+   86, 60, 14, 35, 33, -46, -39, 85,
+   53, -17, 4, 59, 12, 111, -14, -29,
+   -23, 57, -24, -37, -125, 86, -58, 82,
+   77, 30, 67, 1, 113, 77, 49, 72,
+   -35, -90, 3, 106, 5, -85, -21, -87,
+   -76, -40, 32, 4, -76, 1, 13, -70,
+   -23, 4, -29, -12, -28, -18, -75, 22,
+   -100, -77, 17, 87, -56, -25, -13, 13,
+   -20, -37, -39, -75, -56, -1, 44, -25,
+   24, -12, -27, -35, -59, -122, -15, -42,
+   53, 0, -38, -28, -8, 75, 13, -78,
+   36, -110, 30, 19, -50, -14, -127, -22,
+   -69, 34, -25, -12, -6, -7, 49, -15,
+   -36, -19, 54, -55, -22, -117, -103, -36,
+   -26, 37, -41, -112, -17, -28, 15, -11,
+   6, -58, 3, -39, -74, -58, -60, -22,
+   25, 0, -24, -99, -22, 28, -58, -71,
+   35, 29, -9, 16, -20, -34, -45, 31,
+   77, -94, -70, 19, -11, 112, -26, -11,
+   -39, -19, -58, 57, -41, 41, -93, -35,
+   39, 22, -38, 80, -33, -91, 13, -7,
+   5, 11, 23, 0, -43, 127, 27, -38,
+   18, 12, 127, 11, 13, -88, 18, 47,
+   -19, -17, 15, -125, -34, -14, 32, 15,
+   59, 126, -36, 39, 16, -124, -85, 14,
+   5, -5, 32, 50, 114, 54, -82, -26,
+   -30, 31, 32, 54, 3, 4, -1, 24,
+   27, 0, 100, 89, -4, -16, 18, 0,
+   22, -35, 35, 10, -6, -79, 6, 17,
+   26, 0, 13, 42, 1, -21, 49, -67,
+   -110, -7, -25, -8, -30, 57, 17, 5,
+   50, -7, 62, 14, 49, 9, 3, -1,
+   8, 41, -11, 16, -23, -23, 31, -12,
+   44, -127, 27, -35, 6, -126, -55, 0,
+   -4, -14, -126, -123, 26, -86, 11, 40,
+   -4, 82, -105, -44, 23, 38, -119, 23,
+   8, -95, -48, 6, 81, 14, 113, -32,
+   -5, -48, 105, -59, -30, 55, -126, -24,
+   -30, 11, 0, -24, 50, -87, 14, -21,
+   -55, -90, -27, -126, 10, 2, -7, -10,
+   -24, 14, -19, 10, -14, 12, 3, 14,
+   20, 29, -50, -10, -28, 6, -67, -107,
+   35, 63, 84, 56, 37, -109, 36, -2,
+   77, -34, -48, 87, 7, 21, 66, -18,
+   112, 49, -59, -5, -99, 27, 33, -16,
+   18, -35, 36, -39, -124, -36, -56, -64,
+   -50, 8, 88, -102, 38, 57, -68, 35,
+   127, -45, -6, -36, -17, -2, -111, -22,
+   -124, -38, 44, -28, -75, -43, 58, -21,
+   -29, -110, 46, -107, -83, 121, 46, -14,
+   -50, -83, -73, 120, 7, -41, 0, 13,
+   31, 2, 43, -63, 39, -68, -110, 41,
+   -88, 10, -17, -23, 57, 79, -43, -15,
+   45, 33, -73, -56, -63, -32, 83, -32,
+   -16, -45, 55, 59, 19, 80, 3, -11,
+   -110, -29, 115, 85, -29, 125, 3, -25,
+   -9, -68, 126, -43, -19, 16, -28, 60,
+   18, -3, 28, -21, 77, 8, 45, 72,
+   -29, 32, -1, -27, 112, 4, 69, 30,
+   -26, 55, 44, 13, 35, 40, -41, 5,
+   -74, 38, -71, 30, 74, 11, 54, -25,
+   -34, 54, 87, 34, 8, 20, -2, 13,
+   2, 10, 46, 40, 95, 33, 2, 6,
+   -55, -36, 9, 49, 40, -52, -21, 108,
+   10, 32, 14, -13, 40, 6, 114, 63,
+   16, 62, -31, 57, -18, 6, 6, 72,
+   9, 4, 38, 25, 49, -21, 66, -7,
+   11, -12, -23, 81, -48, 51, 125, -14,
+   80, 9, -19, 39, 49, 92, 9, -13,
+   64, 43, 56, 98, 0, 7, -67, 15,
+   118, 63, -48, -46, -73, -19, -4, 88,
+   -7, 3, 1, -8, 82, 29, 35, -31,
+   30, 30, -23, -9, 57, -51, 71, 33,
+   -37, 76, 11, -69, 42, 117, -27, -34,
+   -15, -13, -56, -90, -50, 82, 104, 98,
+   -33, 10, 37, -69, 2, 7, 23, 10,
+   99, -66, -12, -54, -54, 8, -36, 4,
+   -33, -30, 9, -72, 26, -53, 35, -42,
+   27, 18, -36, 41, -35, -22, -14, -6,
+   22, -69, -111, -10, -12, 55, 47, -54,
+   -72, -21, 28, 13, 29, -43, 33, -62,
+   -6, -20, 29, -17, 31, -92, -9, 36,
+   -28, -49, -25, -121, -91, 27, -31, -17,
+   45, -80, -37, -16, -34, 17, 28, -48,
+   68, -51, 30, -23, 8, 17, -16, 23,
+   -25, -9, 114, -21, -18, -122, -81, -17,
+   -28, -42, -86, -107, -79, -60, 7, -35,
+   15, 44, 4, 38, -124, -37, -84, 31,
+   -8, -23, 10, -76, 8, 44, -123, -50,
+   45, -47, 59, 34, -1, -9, 24, -65,
+   41, -73, 9, 94, 5, 53, 20, -9,
+   28, 7, -16, 68, -24, 6, -5, -35,
+   -38, 43, -100, 29, 13, 35, 41, -59,
+   -7, 28, -24, 38, 94, -85, -85, 97,
+   -125, 78, 46, 90, 70, -77, 47, -12,
+   2, -97, 24, 88, -18, 14, 32, 97,
+   65, -22, 27, 63, 25, 11, -13, 52,
+   43, 65, 32, -9, 63, -13, -93, -61,
+   -33, 30, 66, -5, 100, 12, 21, -7,
+   -62, -41, 8, -26, 31, 36, 54, 6,
+   52, 106, -82, 38, 27, 26, 26, 26,
+   54, 19, 43, 6, 29, 125, 93, -49,
+   -6, 127, 33, -10, 26, 90, 75, 0,
+   106, -40, 3, 43, 52, 52, 48, -58,
+   34, 0, 58, 38, 44, 57, 31, 91,
+   -1, 80, -72, -45, -39, 25, -75, -52,
+   12, 30, 47, 2, -15, -36, 67, 89,
+   36, 21, -22, 25, 18, 16, -25, 7,
+   90, 10, 17, 18, -60, -9, 37, 84,
+   59, 2, 16, -27, -77, -1, 43, -31,
+   23, -46, -34, 127, 117, 127, 82, 27,
+   18, -7, 46, -71, 87, 35, 46, -85,
+   -60, -2, 11, -72, 32, -56, -105, -77,
+   51, 53, -46, 21, -42, 17, -12, -69,
+   19, 7, 58, -43, -104, -68, 5, -3,
+   -29, 27, -126, 88, 0, 127, -118, 52,
+   57, -10, -33, 41, 12, -28, 5, -5,
+   -57, 23, 21, -18, 34, -48, 28, -125,
+   120, -59, 25, 108, 71, -33, 80, 38,
+   -46, -12, 46, 6, -68, -44, 116, 106,
+   20, 93, -127, -56, 124, -105, -96, 122,
+   34, -57, -27, -67, 29, -124, -90, 120,
+   -88, 29, -118, 8, 33, -90, -64, 6,
+   43, -45, 14, 127, -47, 40, -26, -79,
+   -81, -3, 2, -51, -4, 12, 23, 66,
+   37, -118, -7, 7, 100, 13, 8, 85,
+   -85, -92, -123, -111, -124, -2, 15, 45,
+   -57, -58, 10, 82, -24, 46, 30, 127,
+   80, 41, -9, -64, 33, -7, -4, 10,
+   -21, 44, 15, -22, 26, 59, 31, 28,
+   -20, 18, 81, -50, 0, -69, 43, -18,
+   -23, -85, -28, 86, -62, 35, 20, 106,
+   -10, -74, 97, -17, -68, -40, -24, -78,
+   4, -116, -56, -86, 78, 34, -94, 49,
+   5, -97, -94, 62, 23, -13, -83, 53,
+   10, -12, 54, -27, -8, -16, 49, -38,
+   20, -43, 107, 9, -64, 22, 18, -53,
+   10, -7, -57, 33, 3, -127, 59, 7,
+   7, -57, 49, 14, 7, 29, -22, -82,
+   86, -63, -1, -10, 0, 29, -25, -72,
+   -69, -51, -124, 20, 49, -32, 35, 11,
+   4, 29, -109, -44, -67, 51, -45, 120,
+   7, -51, 96, 11, -1, 12, 45, -40,
+   -50, -46, 8, 49, -9, 10, -37, 69,
+   50, -45, 22, -12, -38, -19, 38, -13,
+   7, 82, -112, -16, -31, -69, 72, 0,
+   -58, 31, -8, 110, 20, -118, 77, -27,
+   -61, 40, -18, -32, -55, 33, -39, 25,
+   -49, 16, 0, -9, 9, 7, 48, 63,
+   99, 41, -2, -30, -32, 35, -34, 5,
+   -71, -45, -50, 10, -13, -58, -24, -31,
+   48, 13, 17, 44, 3, -7, 44, 63,
+   120, -55, 99, 2, 68, 9, -5, -122,
+   61, 29, 27, 3, 37, -56, -3, -43,
+   -11, 53, 10, 54, -66, 54, 34, 39,
+   2, 29, -80, 55, 13, 29, -55, -6,
+   124, 2, -39, 29, -126, -44, 25, -46,
+   39, 88, -55, 126, 10, 97, 83, 48,
+   25, -111, -41, 70, 4, -88, 33, -34,
+   -29, 28, 103, 101, -50, 13, 79, 13,
+   -64, -10, 6, -37, 4, 37, -11, -10,
+   -6, -11, -32, 56, 45, -18, -10, -87,
+   -100, -22, -38, -79, 23, -118, 14, 27,
+   -22, 14, 32, -34, 16, -78, -66, 4,
+   16, -62, -20, -18, -23, 57, -4, 10,
+   62, -39, 37, 71, -1, -77, 4, -128,
+   -69, -70, -117, 104, 52, 21, -21, -16,
+   6, 17, 5, 2, 64, 72, 16, -92,
+   -73, -109, 23, 2, -38, 9, -111, -10,
+   4, -82, 18, 100, 29, 47, -19, 100,
+   -94, 21, 106, 68, -3, -112, 58, 13,
+   47, 55, -119, 7, -11, 102, -61, -30,
+   85, -34, -73, 48, -116, -31, 49, 17,
+   -1, -37, -30, 68, -120, -66, -96, 126,
+   65, 69, 104, -19, -88, -73, 30, 89,
+   -75, 0, 29, 103, -81, -56, -68, -58,
+   26, 8, 8, 40, -8, -3, -33, 38,
+   -15, -13, 125, 13, 24, -25, -17, 25,
+   -6, -43, 6, -14, -47, -73, -67, -83,
+   25, 19, 32, -97, -15, 15, -4, 126,
+   -46, -6, 42, 32, 48, 13, -55, -6,
+   -33, 12, -81, -56, 85, 100, -48, 39,
+   -25, -98, -2, 47, 108, 87, 121, 32,
+   -114, -34, -13, 12, 97, -47, 1, -10,
+   13, -115, -23, -30, -15, -85, 15, 23,
+   -15, 82, -16, -8, 4, -31, 9, 102,
+   105, 2, -33, -10, -63, -89, 51, 75,
+   -12, 0, 28, 100, -78, 95, 47, -90,
+   74, 113, -19, 54, -58, -21, 20, 116,
+   29, -17, 55, -62, 46, 27, 13, 37,
+   -4, -123, -118, -68, 33, -52, -1, -108,
+   62, -46, 0, 21, 13, -35, 77, 23,
+   -12, -51, 50, -33, 113, -65, -104, 18,
+   -26, -49, -58, -3, -29, -19, -59, -45,
+   -45, -3, -61, -12, 120, -39, 54, -10,
+   74, -61, -57, -13, -43, 18, -6, 6,
+   -34, -18, 28, -54, 16, 36, 65, -57,
+   -3, -22, 71, -40, -13, -110, -9, -52,
+   35, -85, -19, 10, -5, 1, 3, -34,
+   -122, -36, -28, 26, 2, 45, 36, -76,
+   -105, 123, -77, 3, 26, 83, -16, 17,
+   7, 16, 37, -46, -67, -40, 33, -52,
+   -14, -11, -11, -53, -63, 28, -6, 35,
+   53, 62, 71, 47, 70, 19, 4, 23,
+   -70, -65, -33, -37, -19, -38, -125, 108,
+   35, -36, 8, -28, 17, 4, -73, 19,
+   4, 5, -52, 5, 44, -25, 14, 13,
+   27, -127, -69, -94, -62, -22, -26, 86,
+   -37, -25, 51, 29, 7, 15, 47, 105,
+   49, -12, -44, 3, -108, 23, 60, -11,
+   -95, 20, 37, -15, -68, -44, 127, 17,
+   -19, -55, 44, 26, -14, 22, 36, -84,
+   23, 10, -46, 68, -9, 121, -7, -12,
+   29, -11, 61, 2, -14, 28, -30, -102,
+   23, -105, 0, -35, 18, 8, 15, -4,
+   11, 33, -26, -89, 11, -14, -5, -112,
+   -8, -28, -43, 34, -10, -35, -30, -37,
+   -57, 14, 25, 45, -77, 28, 4, -50,
+   -4, 87, -24, -97, 14, -36, 53, 31,
+   18, -37, 16, -51, 11, 41, -87, -53,
+   -98, 1, 37, -30, -53, -29, 33, -4,
+   -40, -67, -13, -52, -56, 8, 60, 35,
+   -25, 44, 2, -6, -1, -31, -27, -41,
+   -26, 8, -43, -2, -3, 1, 24, -31,
+   -6, 9, -126, 2, -48, -33, 48, 6,
+   3, 32, 29, -50, 28, -31, -17, 27,
+   41, -122, -90, -41, 9, 86, -22, -89,
+   20, -61, -33, -21, 62, 41, -86, 3,
+   -42, 14, 25, 48, -125, 9, 25, -2,
+   9, -66, -11, -98, 2, -65, -4, -14,
+   6, -2, -66, -83, 38, -22, -13, -21,
+   -8, 41, -125, -24, -43, -100, 72, -52,
+   -43, -4, -1, -54, -59, 11, 96, -20,
+   48, 20, 60, 13, -15, 57, -30, 11,
+   -50, 121, -116, -31, 19, -32, -4, 9,
+   -111, 12, -84, -106, -54, -59, -67, -24,
+   10, 22, -25, -12, 16, -123, 15, 7,
+   -8, 14, -21, -45, 63, 47, 3, -14,
+   6, 100, 86, 40, 39, -23, -9, -127,
+   24, 20, 15, 41, 69, 13, 2, -36,
+   25, -18, 11, 23, 27, 51, -74, 8,
+   -69, 12, 61, 74, -14, 34, -7, 14,
+   1, -5, 2, -28, 46, 63, 56, 6,
+   -42, 34, 81, 18, -70, 6, 20, -26,
+   108, 11, -31, -1, -46, -29, -38, 22,
+   -9, -33, 43, -67, 71, -20, 30, -114,
+   62, -1, 97, -40, 23, -99, 5, 11,
+   -38, -55, 70, 9, -48, 9, 54, 23,
+   -24, -48, -120, 67, 27, -49, -55, -11,
+   88, -36, -4, -10, 80, 14, -65, -2,
+   -72, -46, -91, 99, -23, -78, -39, -84,
+   -11, -104, 27, -73, -12, 26, -1, -103,
+   -10, 2, 69, 43, 105, 19, -82, -45,
+   33, -26, 41, -38, 119, 16, -62, -34,
+   10, -10, 20, 38, 87, -67, -26, 91,
+   30, 113, -11, -28, -48, -93, -120, 43,
+   -88, 71, -80, 7, -21, -1, 17, 50,
+   -26, 55, 125, -35, -40, 0, -44, -15,
+   33, 5, -83, 7, 64, -49, 19, 56,
+   32, -25, -27, -15, -5, -16, -19, 66,
+   9, 114, -126, 12, -47, 15, 43, 18,
+   28, 52, 34, -50, 11, -11, -29, -43,
+   -14, -84, -39, -25, -75, -101, 111, 21,
+   33, -44, 90, 14, -36, 31, 29, -31,
+   -17, 22, 17, 48, -93, 30, 42, 30,
+   -86, -79, -12, -98, 49, 68, -53, -69,
+   53, 124, -29, 65, -89, -35, -1, 37,
+   -5, -111, -38, -76, -28, 6, 24, 47,
+   -61, 19, 12, 23, -49, -18, -77, 18,
+   33, 11, -17, -35, -16, 78, -32, 48,
+   62, -69, -78, -18, 72, -122, -29, 3,
+   11, 6, -17, 3, -74, 51, -10, 29,
+   21, 46, -31, 49, -1, 22, -69, 8,
+   -2, -74, -29, 29, 25, -29, 13, 20,
+   37, 9, 1, 16, 10, -20, -13, -13,
+   -24, 37, -11, 42, 35, 36, -12, 24,
+   -33, 43, 65, 64, 25, 23, 9, 27,
+   -124, 1, 92, 16, -4, 23, -5, 17,
+   5, 42, 32, 12, 53, -3, 41, 1,
+   37, 32, -11, 23, 37, 80, 21, 127,
+   29, -12, -102, 127, -21, 9, -9, 33,
+   41, 16, -4, 33, 57, 29, -55, -60,
+   11, -33, -25, -26, 35, -2, 116, -6,
+   -52, -31, -3, 14, -63, 13, 73, 76,
+   25, 5, 29, 8, 17, 50, -27, 88,
+   -96, -68, -67, 5, -56, 28, 25, -88,
+   -11, -19, 35, -78, 27, 11, -37, -21,
+   2, -11, -43, 78, -93, 34, 27, 5,
+   -21, 34, -48, -11, 86, 4, 20, -18,
+   -6, 39, 15, 14, 40, 36, -40, 46,
+   127, 12, 3, 1, -14, 33, 40, -3,
+   16, -58, 71, -38, -1, -103, -22, -16,
+   35, 10, 127, 59, -38, -67, -29, -126,
+   58, -11, -4, 14, -85, 22, 75, 10,
+   4, 19, 78, 32, -31, -33, 127, 7,
+   4, 48, -20, 13, 94, 45, -10, -9,
+   7, -55, -6, -43, 23, -58, 76, -1,
+   4, 21, 7, 65, -20, 70, -7, 4,
+   38, 104, 22, -44, 7, -8, 12, 9,
+   65, 31, -6, -1, 29, 36, -126, -45,
+   -25, 32, 45, 3, 7, -28, 4, 29,
+   -80, -34, -64, -3, 0, -63, -65, -11,
+   -6, 38, -119, 53, 17, -24, 19, 4,
+   -53, 85, 27, 26, 45, -51, 5, -126,
+   17, 32, 22, -52, 2, 7, 22, 60,
+   74, 74, 38, 53, 13, 4, 44, 32,
+   49, -46, 95, 70, 68, -50, -128, -10,
+   -79, 125, 26, 37, 24, -51, -12, 52,
+   27, 13, -16, -4, -2, 16, 2, 33,
+   10, -12, -5, 25, -40, 5, -31, 31,
+   2, 60, -93, -23, -118, 34, 3, 18,
+   12, 11, -38, -7, -35, 6, 18, -37,
+   -99, -68, 5, -103, -117, -108, -114, 43,
+   -115, -72, 46, 2, 50, 4, 37, 8,
+   -51, 10, -68, -29, 18, -63, -80, 34,
+   36, -49, -110, -28, 3, -40, -125, -9,
+   74, 10, 20, -25, 37, 74, -29, -25,
+   66, -34, -48, -27, -35, 0, 30, -26,
+   -121, 6, -123, 14, 11, -49, -13, -102,
+   18, -23, -98, -1, -8, 67, 52, 8,
+   -27, 33, -57, 7, -126, -13, -47, 12,
+   22, -109, -68, -34, -94, -122, 20, -63,
+   -18, 8, -124, -61, -32, -40, 117, -12,
+   -7, -36, 16, 89, -24, 71, -46, -122,
+   12, -101, -38, -70, -57, -39, -116, -60,
+   -125, -35, 37, -114, -14, -127, -77, 2,
+   -50, 115, 9, -79, -22, -74, -13, 103,
+   -79, 18, 11, -123, -26, -4, -1, 8,
+   -63, 124, 36, -32, 41, -99, -17, -18,
+   -124, 7, 122, -127, -23, 20, 41, -19,
+   106, -41, 7, -125, -21, -126, -24, -26,
+   -8, 26, -126, 125, -34, 33, 111, 46,
+   50, -20, -79, 6, -127, 97, -13, 52,
+   -32, -43, 2, 18, 17, -126, 35, 8,
+   67, -123, -127, -103, 3, -71, -32, 29,
+   6, 22, -110, -68, -6, -9, -44, 58,
+   -121, -127, -13, -50, -54, 22, -25, -78,
+   -7, 39, 104, -108, -94, -127, -36, 7,
+   5, 3, -124, -17, 18, 42, 1, -22,
+   19, 55, -99, -125, 38, -19, -38, 17,
+   5, -23, 7, 87, -125, -127, 7, 7,
+   -121, 16, -60, -9, 7, 33, 18, 30,
+   -62, 19, -125, -112, -2, -14, -25, 60,
+   1, -30, -124, -22, -65, -125, 64, 79,
+   -19, 9, -26, -127, -56, -84, 122, 63,
+   -2, -16, 26, 6, 35, -33, -21, -84,
+   -44, 72, -55, 52, -34, 66, 32, 17,
+   -37, -7, -41, 113, 1, -20, -58, -59,
+   68, 29, -125, -56, 42, -92, 3, -6,
+   19, -24, -11, 61, 39, 48, 30, -3,
+   -51, 15, 2, 11, -17, 3, 52, -7,
+   51, -11, 62, 30, 21, 71, 68, -27,
+   19, -32, -11, 40, -1, 11, 13, -10,
+   65, -39, 119, -114, 43, 19, -74, 62,
+   -45, -54, 37, -28, -120, 26, 63, 26,
+   58, 9, 20, -5, -12, 14, -5, 126,
+   16, 72, 40, -44, 52, -24, -7, 46,
+   -114, 101, 0, 15, 37, -112, 37, -46,
+   -76, 6, 70, -25, -24, 75, -43, -29,
+   76, -63, 93, 33, -24, 2, 2, 72,
+   -5, 57, 73, -31, -36, -103, 34, 10,
+   -25, 36, 20, -10, -36, 6, -83, -3,
+   13, -18, -73, 66, 46, -31, -51, -41,
+   -32, -17, 45, 41, -14, 30, -121, 10,
+   -39, -66, 15, 10, -77, -2, 43, 11,
+   28, 3, -77, 52, -26, 47, -75, 73,
+   -4, -110, -111, -20, -66, 27, -8, 17,
+   -3, 66, 22, 54, 21, 0, 68, -126,
+   85, -27, 82, 11, -25, 2, -109, -60,
+   -11, 35, 12, 3, 77, -43, -3, -68,
+   -30, -53, 21, -21, -75, -8, -54, -11,
+   -53, -16, -88, -7, -19, 14, 52, 12,
+   27, 18, -103, -128, 7, 1, -33, -7,
+   15, 32, -1, 90, 8, 41, 106, 18,
+   2, -11, -41, -93, 10, -18, -48, -12,
+   54, 10, -4, 21, 72, -18, -125, 10,
+   54, 0, -5, -66, -17, 57, -126, -4,
+   29, 19, -5, 80, -34, 13, -125, 78,
+   -81, -125, 76, 26, 3, 25, 22, 3,
+   -5, -18, 46, 39, 84, -18, 38, -110,
+   58, -128, 72, 39, 12, 5, 16, -47,
+   23, -58, -40, 13, 59, -32, 24, 3,
+   7, 83, -9, -67, -1, -2, 9, 16,
+   -55, 69, 50, 26, 20, -47, 3, 83,
+   -77, -21, -17, -7, 30, -27, 14, 71,
+   -8, 47, 99, -66, -12, -93, -59, 20,
+   -43, -24, -93, -19, 64, 4, -58, 5,
+   -42, 21, -122, -41, 19, 2, -33, 126,
+   -15, 3, 88, 3, 77, 48, 61, -8,
+   78, 7, -47, 37, -63, 57, 36, -31,
+   -9, 26, -46, 17, 55, 10, 47, -46,
+   6, -106, -123, 5, -97, 63, 40, 36,
+   23, 2, -15, 17, -65, 51, 12, -18,
+   29, -22, -6, 46, 10, -50, 29, -67,
+   58, 82, -20, -95, 15, -41, 57, 29,
+   0, 7, 29, 27, -90, -49, 49, 29,
+   1, 38, -13, 3, -32, -32, -46, 32,
+   -38, 9, 41, -7, -55, 87, 93, -18,
+   55, 11, -21, -104, -5, 45, 7, 62,
+   7, 35, 11, -30, -33, -10, -30, -13,
+   14, -9, 72, 127, -37, -16, 32, -57,
+   -37, -12, 5, 58, -66, 0, 59, 18,
+   116, 31, -53, -28, -8, -5, -74, 67,
+   39, -62, -77, 48, 25, -12, -5, -8,
+   -6, -36, 8, -53, -63, -22, -18, -5,
+   -36, 25, 26, -89, -106, -84, -40, -45,
+   -77, 47, -97, -64, -30, -51, -23, -75,
+   9, -31, 6, 33, -32, 31, -126, 13,
+   25, 4, -102, 40, 45, 47, 24, 71,
+   -55, 126, -125, -27, 9, -127, -93, 29,
+   -23, 20, 24, -123, -58, -20, -10, 5,
+   2, -67, -14, -23, -88, 113, 16, -81,
+   20, -14, 38, 124, -11, -9, 127, -127,
+   32, -36, 38, 93, 9, 14, 16, 28,
+   28, 97, -28, -58, -14, 88, -128, 0,
+   -121, 23, -2, -125, 0, 28, -127, -42,
+   -87, -12, -33, -21, -30, 125, 7, -30,
+   -53, 46, -56, -121, 34, -27, -64, -73,
+   5, 70, 8, -18, 7, -17, -89, -47,
+   -75, -30, -9, 7, -10, -55, 50, -63,
+   78, -71, 45, -1, 15, -11, -35, -10,
+   -55, -35, -41, 28, -75, 127, 119, -9,
+   -84, -74, 47, -23, -10, -40, 29, -59,
+   -20, 124, -124, -118, 9, 1, -22, -21,
+   127, -35, -55, 110, -113, 79, -4, 41,
+   4, 25, 22, 56, -69, 14, -31, -108,
+   -21, 5, 14, -82, 6, -1, 21, -92,
+   -52, -48, 19, 37, -75, -3, 63, 55,
+   -28, -51, 8, -54, 55, 15, 46, 50,
+   35, -3, -9, -27, 2, -1, 66, 56,
+   18, -16, 12, -19, 61, -5, -26, -37,
+   63, 58, 59, -62, -11, -127, 6, 7,
+   40, 114, 18, 7, 1, -123, 17, -20,
+   -76, 113, 122, 6, -56, -88, 34, 5,
+   -21, -101, -71, 77, -41, -106, 67, 31,
+   -128, 7, 11, -126, 31, -58, 69, 16,
+   -123, 44, -17, 61, 0, -8, -11, 28,
+   28, -37, -94, 28, -10, 48, -34, -93,
+   -11, 14, 7, -92, -78, -45, 22, 67,
+   14, 113, 5, 23, 40, 27, 31, 57,
+   -82, -1, -44, -29, 24, -31, -70, -87,
+   -100, 79, -122, -73, -46, 37, -68, -128,
+   65, -128, -126, 14, 85, -46, -61, 20,
+   -16, 48, 35, 30, 52, -15, -12, -83,
+   -89, -97, -60, -8, -36, -65, -56, -112,
+   -128, 113, -56, 22, -57, -84, 14, -5,
+   -26, 6, 2, 47, -1, 72, 19, 47,
+   31, 3, 0, -116, 24, 20, 64, 46,
+   28, 33, 126, -58, -9, -16, 61, -127,
+   17, -125, -80, -34, 57, -74, 21, 73,
+   -37, -2, -32, 13, -34, 31, -28, -121,
+   25, -84, 48, -120, -107, 39, 87, 32,
+   -104, -105, -119, 81, 23, -112, -90, 102,
+   -11, -50, -15, 14, 55, 20, -31, -16,
+   6, -11, 39, -8, -4, -29, -31, 56,
+   47, 26, -7, 7, -25, -4, 13, -43,
+   -42, -27, -13, -26, 47, -11, -18, 3,
+   -2, 10, 10, -39, 12, 70, 108, 88,
+   -10, -45, -69, 23, 79, -30, 12, 24,
+   29, 80, -32, -85, -21, 10, -20, 39,
+   74, -39, -54, -43, -18, -37, 14, 59,
+   55, 44, 44, 30, 30, 86, -96, 33,
+   -7, 2, -73, 35, -12, -36, 13, -29,
+   28, 31, 19, 75, 42, 79, -12, -30,
+   124, 11, -41, 31, 0, 9, -47, 74,
+   25, 16, 19, -16, 63, 21, -77, -25,
+   -43, 60, 36, 13, 38, 53, 22, -45,
+   53, 39, 15, 9, -43, -88, 42, -67,
+   -2, 34, -62, 16, 26, -4, 9, -57,
+   54, 17, 10, 3, 60, 23, 15, 72,
+   37, 0, 2, 12, 74, -91, -40, 8,
+   5, 69, -37, 0, 18, 21, 33, 33,
+   77, 20, 31, 52, -9, -33, -13, -46,
+   17, -26, 33, 22, 10, -49, -27, 8,
+   19, 17, -54, 27, 7, -29, 5, 25,
+   -19, 98, 11, 37, -112, 125, 63, 17,
+   -37, -10, -75, 31, 6, -24, -22, 2,
+   49, 11, 39, -87, 53, -65, 0, -25,
+   -93, -29, -32, -33, 2, 32, -34, 13,
+   51, -9, -46, 27, -53, 7, 16, -40,
+   8, -121, -58, -58, -12, 91, 8, -15,
+   -18, 51, 4, 23, 36, -125, -24, -10,
+   -55, 13, -36, -18, 40, 56, 26, 24,
+   -8, -64, -106, -73, 20, 23, 17, -23,
+   110, -12, -30, -62, -1, 21, 34, -62,
+   5, 66, -26, -78, -7, -3, -7, -39,
+   6, -43, 59, 68, 60, -10, -78, -53,
+   -57, 60, -83, -112, 25, 16, 12, -6,
+   7, 13, -29, 107, -19, 44, -5, 46,
+   -124, 67, -80, -30, 49, -1, 5, 20,
+   19, 34, -3, 2, -18, -19, 123, 14,
+   -67, -19, 44, -10, 24, -106, 2, 26,
+   6, 67, -16, -56, -89, -128, 96, 14,
+   38, -19, -81, 52, 32, 0, 60, -12,
+   60, -5, 89, -23, -30, 2, -39, -7,
+   -63, 73, 17, -40, 63, 22, -24, -18,
+   37, 8, 33, 7, -30, -123, -19, -1,
+   -2, 38, 55, -86, -44, -7, 28, -19,
+   1, -19, 36, 6, 48, -11, 4, 81,
+   -36, 80, -37, -12, -79, -19, 15, 8,
+   -8, -14, 59, 30, -42, 5, 14, -92,
+   -118, -25, -43, 20, 9, 34, -21, 93,
+   -32, -45, 58, -121, -49, 126, -1, 52,
+   -53, 15, -19, 27, -68, -23, 45, -9,
+   39, 57, 5, -117, -34, 10, 7, -61,
+   -18, 10, -44, 21, -77, -76, 103, -25,
+   -43, -36, 86, 44, 47, 27, 23, 0,
+   -77, -46, -12, 63, -111, -17, -16, 34,
+   -46, -17, 14, 98, 15, 126, -95, -45,
+   0, -67, -78, -5, -24, -9, 2, -11,
+   -6, -96, 73, -55, -19, -32, -7, -69,
+   0, 23, -24, 58, -19, -6, 101, -22,
+   24, -21, 57, -51, 100, -7, -4, -11,
+   -128, -13, 28, 28, 18, -56, 36, -7,
+   -89, -63, -8, 34, 52, -14, 23, 5,
+   -85, -10, 47, 50, 8, -126, 78, 43,
+   -9, 36, 1, 27, 8, -114, -3, -72,
+   -31, 34, 12, 54, -30, 20, 101, 1,
+   78, -121, 34, -64, 14, -106, -42, -33,
+   36, -5, 15, 40, -25, 56, -21, -42,
+   -53, 29, 25, -51, -108, 33, -8, -41,
+   51, -60, -60, 8, -45, -92, 0, -127,
+   -39, -53, -7, 17, -90, -15, -34, -126,
+   81, -127, 49, 1, 96, 8, 59, 7,
+   -58, -125, 121, 63, 49, 7, 42, 9,
+   23, -11, -45, -125, 17, -32, 1, -22,
+   -5, 78, 18, -40, -45, 19, -3, 85,
+   62, 24, -39, 4, 24, 22, -7, 2,
+   117, -81, -15, -31, -38, 50, 5, -41,
+   40, 21, 29, -56, -62, 8, 6, 32,
+   -6, -19, 71, -10, -12, 28, 25, 10,
+   -92, 23, -8, -76, 26, 33, 86, -23,
+   -22, -56, -108, 15, 68, 123, -12, 59,
+   124, 46, 40, 124, 24, 35, 17, -29,
+   29, 77, 2, 35, -48, -23, 3, -43,
+   102, 69, 47, 0, -93, 44, 13, -15,
+   -8, 10, -29, 28, -60, -12, 48, -26,
+   47, 22, 55, -80, -64, -29, -11, -25,
+   -41, 68, -52, -10, -42, 46, -53, 46,
+   27, -38, 90, -100, -34, -80, -30, -124,
+   8, -8, 2, -6, 41, -64, 19, -37,
+   5, -52, -55, -18, -5, -39, -96, -29,
+   5, 125, 2, 28, 16, 117, -14, 80,
+   -69, -61, -55, -117, 99, -32, -39, 41,
+   35, 9, -83, 87, -86, -125, -36, 28,
+   -126, 8, -77, 127, 12, -21, 65, -78,
+   -11, 24, -45, -24, -94, 71, -50, 33,
+   -25, -3, -40, -39, 12, -92, -122, 37,
+   120, -6, 52, -48, 12, -12, 65, -127,
+   78, -14, 15, -88, 38, -15, -34, 8,
+   31, -125, -18, -93, 30, -43, 3, 78,
+   18, 25, -29, -47, 25, 39, 7, -121,
+   -13, -118, 24, -59, -17, 3, -6, 36,
+   -37, -7, 20, -51, 54, -74, -19, -6,
+   -51, 17, -125, 30, 15, -4, 88, 69,
+   5, 15, -58, -114, 54, 30, -73, 8,
+   9, -32, -44, 14, -3, -27, -20, 11,
+   10, 122, 85, 32, -48, 12, 40, 34,
+   13, -21, 99, 11, 70, -77, 5, 82,
+   -37, 54, -89, -45, -126, -61, 12, -63,
+   8, 35, -7, 10, -51, 24, -25, -12,
+   10, -7, -35, 44, 84, -47, -80, 14,
+   93, 6, 11, 51, 60, 48, 30, 7,
+   -71, 6, 10, 0, -10, -5, -52, -3,
+   -48, 30, 30, 18, 70, -17, 43, 44,
+   -126, 33, 120, 53, 47, -18, 22, 52,
+   -35, 93, 47, -27, 85, 0, -17, 0,
+   -13, 53, -2, 28, 65, 17, 23, 121,
+   -5, 45, 50, 44, -4, 34, 7, 32,
+   76, 12, 35, 46, 30, 50, -35, 46,
+   -42, 28, 8, -36, -32, 2, 41, -40,
+   1, 0, -4, 14, -41, 74, 88, 33,
+   17, 71, 40, -20, -17, 32, -27, -41,
+   -48, 6, -56, 80, 42, -31, 33, 44,
+   -1, -98, -23, -61, -15, -4, 67, -36,
+   67, -37, -66, 50, -126, -18, 24, -128,
+   -55, -30, -12, -10, -9, -48, 45, -118,
+   -11, -29, -19, 57, -9, 32, -23, 18,
+   126, 65, -11, 4, 2, 17, 14, 18,
+   22, 23, 31, 9, -15, -74, 34, -27,
+   -20, 44, 125, -28, -19, -107, 11, -88,
+   -14, -39, -8, 11, -74, -37, 22, 15,
+   -50, 34, 14, 12, -24, -3, 107, 43,
+   -8, -17, -42, 69, 31, 31, -30, 14,
+   17, -65, 100, -34, -4, -28, 28, -69,
+   90, 14, -18, -23, 27, -4, -27, 26,
+   -76, -64, 9, -78, -36, -4, -101, -3,
+   47, 13, -122, 32, 7, -64, 30, -69,
+   -50, -98, -12, -59, -26, 14, 26, -40,
+   -126, 42, -51, 33, -26, -46, -32, -34,
+   17, -12, -89, -9, 32, -25, 15, 24,
+   -3, -4, -18, -39, -24, 16, -43, -41,
+   -52, 40, 2, -40, -14, -64, -3, 0,
+   18, 125, 42, 14, -35, 19, -101, -24,
+   15, 12, -12, 1, 7, -41, 9, 26,
+   -14, 118, 19, -36, 32, -18, -43, -11,
+   22, 11, 26, -1, 2, -12, -39, -54,
+   -5, 15, 32, -29, 55, -22, -78, -27,
+   -44, -120, 1, -5, -67, 12, -13, -46,
+   -81, -14, 64, -16, -70, -24, -23, 55,
+   -3, 31, -31, 12, 26, 33, 12, 16,
+   46, 71, -27, 64, 6, 24, 45, -69,
+   -33, 27, 41, 16, -34, 23, 7, -11,
+   1, -12, 126, 51, -18, 15, -75, 10,
+   -66, 1, -7, -13, -42, -25, -37, -3,
+   16, -22, 63, 54, 37, -67, -42, 37,
+   -81, -37, -9, -73, -39, -127, -15, 27,
+   127, -37, 40, -12, 2, -10, 5, -69,
+   -16, 38, 24, 97, 116, -33, -17, 10,
+   -58, 4, -67, 90, -45, 13, -126, 43,
+   22, -22, 49, -65, -46, -54, 2, -39,
+   -62, -32, -15, -42, -105, -28, 68, 43,
+   9, -23, -26, -113, -104, -46, -67, -18,
+   3, 51, 8, -50, -2, -33, -15, -22,
+   54, 7, -63, -19, -128, 47, -93, 13,
+   -13, 36, -98, 49, 20, -13, -9, 11,
+   -44, -35, -106, -37, -38, -32, -47, 42,
+   24, -45, -115, 79, 25, -5, 16, 36,
+   -87, -45, 73, -4, -53, -66, -11, 15,
+   0, 52, -55, -44, 37, -3, 23, -35,
+   13, -50, 22, 9, -5, -75, -46, 23,
+   -20, 34, 17, 35, 30, -5, 9, -106,
+   2, -39, 46, 1, 0, 30, -51, -16,
+   -125, -83, -4, -3, -127, -10, 90, 46,
+   -19, 33, -48, -14, 62, -54, -104, 0,
+   7, -13, -5, 7, 14, -70, 27, 27,
+   -4, 1, -84, -45, 30, -6, -71, 14,
+   31, -110, 44, 37, 35, 31, -56, -122,
+   -60, 6, -1, -28, -89, 24, 30, 13,
+   -2, -28, -108, -40, -12, -126, -126, 24,
+   -94, 49, 46, -20, -89, -123, 62, 23,
+   -125, -67, -20, 19, 38, 37, 54, 59,
+   92, -127, 107, -62, 90, -9, 24, 8,
+   -8, -40, -32, -33, -23, -78, 0, -76,
+   28, -27, 12, 24, -110, -34, 105, 38,
+   3, 36, -51, -28, -8, 38, 15, -3,
+   117, 45, -44, 45, 104, 94, 11, -53,
+   64, 41, 7, -7, -8, -39, -44, 89,
+   69, 29, -54, -55, -16, 15, -54, -5,
+   -14, 12, -67, 12, 20, -47, -12, 42,
+   -35, 38, 25, 11, 21, -11, -21, -20,
+   -1, 6, -51, 9, -48, -53, 40, -41,
+   -113, -42, 57, 22, 39, 61, -43, -2,
+   47, -29, -101, -58, 16, 21, 1, -29,
+   -8, 21, -24, 4, -20, 23, -30, 0,
+   18, 125, 20, 63, 25, 21, 127, -21,
+   -20, -55, -14, -98, 81, 3, 37, 58,
+   -33, -36, -5, -13, -124, -43, 127, -11,
+   -15, -48, 122, -111, -11, -15, 28, -42,
+   33, -127, 100, -72, -13, 127, -54, -3,
+   79, 2, -42, 38, 16, 8, -62, -19,
+   36, 19, 39, 78, -7, 121, -66, 11,
+   -36, 47, 83, -69, -23, 34, -79, -62,
+   39, -56, 73, -40, -87, 89, -96, 68,
+   101, -65, 25, -32, 26, -8, -25, -61,
+   -82, -9, -89, -28, -66, 126, 73, -15,
+   -31, 36, 40, -38, -9, 9, 35, 16,
+   16, -44, 38, -73, -14, -5, -26, 92,
+   -114, 63, 32, 22, 79, -30, -11, 77,
+   109, 66, 95, 27, -22, 14, -97, -22,
+   -51, 15, 41, -81, -10, 0, -44, 12,
+   58, -44, 23, -32, 5, 106, 10, -3,
+   -43, -13, -118, 57, -51, -88, 21, -12,
+   17, -81, 4, -20, 31, 18, -24, -2,
+   -121, 20, -5, 66, 20, 62, 4, -45,
+   14, 61, -36, -27, -26, -14, 20, 123,
+   35, -9, -31, -96, 11, -55, -60, -52,
+   -117, 32, -127, -45, -36, -10, 12, 87,
+   -101, -38, -30, -106, -50, -33, -5, 1,
+   -9, -7, 0, -32, 15, -12, -10, -25,
+   110, 5, -19, 1, -57, 83, 93, 8,
+   19, -3, 29, 5, 49, 26, 7, -7,
+   40, -12, -24, 63, 30, 11, -49, 2,
+   24, -7, 21, -34, 31, 12, 25, 39,
+   9, 46, 39, 21, 11, -28, 20, -5,
+   8, 10, 6, -28, 56, 8, -2, -7,
+   -3, 11, 3, -5, -5, -9, -41, 15,
+   18, -24, 9, 10, 0, -16, 30, -32,
+   23, 17, 117, 43, -52, 1, 12, 11,
+   9, -10, 0, 11, -5, -20, 3, -33,
+   0, 19, 101, 69, 34, 0, 29, 11,
+   -4, 126, 31, -95, -12, -27, -80, -38,
+   -85, -96, -7, 68, -126, 16, 84, -8,
+   -47, 33, -35, 54, -23, -12, 57, -40,
+   -23, 43, 71, 40, 49, -40, 37, 15,
+   -6, -46, -60, 25, -34, 49, -3, 29,
+   10, 38, -7, 21, 94, -6, 11, -16,
+   71, 3, -13, 32, -6, 93, -103, 56,
+   49, -7, -2, -22, 18, -36, 8, 49,
+   0, 21, -48, -3, 55, 94, -85, -24,
+   -26, -22, -81, -44, 51, 6, 3, -24,
+   86, 83, -14, 68, -40, -19, 41, 2,
+   51, 37, -100, 59, 98, 61, 6, 37,
+   -59, -13, 10, 126, 49, 29, -18, -123,
+   -128, -46, 46, -125, -126, -1, 88, -101,
+   -50, 70, 11, 41, -127, -16, -79, 81,
+   -38, 5, -125, -8, 47, 51, 66, -82,
+   47, 91, 28, 57, -15, 86, -94, -43,
+   -47, 32, -8, -63, 82, 19, -73, -25,
+   47, 55, 46, 45, -93, -82, -123, 36,
+   -12, 16, 14, -106, 25, 26, -36, -57,
+   -15, -10, -67, 123, 93, -33, 58, -5,
+   -80, 53, -94, -53, -22, 58, -11, -1,
+   67, -36, 125, 40, 11, 62, 79, -123,
+   33, -121, 2, -114, 6, 50, -17, 26,
+   -35, 19, -6, -85, 28, -1, -21, 17,
+   45, 125, 71, -29, -59, 16, 41, -63,
+   13, 7, 65, -36, -52, -51, 68, -44,
+   30, 24, -3, -4, -46, 63, 19, 58,
+   -78, 34, 8, 94, 69, -29, -51, -1,
+   28, -99, 39, 19, -14, -4, -92, 38,
+   -5, -21, 104, 13, 13, -81, -29, 29,
+   -54, -83, 91, -16, -2, 15, 0, -5,
+   33, 9, 35, 4, 13, 21, -113, 0,
+   -21, 25, -26, -89, 96, 34, -7, 27,
+   -12, -27, 16, -33, 7, -6, -1, 24,
+   43, 33, 9, 45, 87, 25, 54, 40,
+   -53, -122, -42, 55, 98, 23, 83, -5,
+   5, 73, -65, -110, 29, 12, -127, -3,
+   63, -64, 0, 14, 16, 36, 38, -44,
+   37, -84, -74, -7, -5, -41, -95, -119,
+   14, 66, -18, 120, -17, -40, -58, 2,
+   44, -26, 86, -11, 40, 59, 52, -20,
+   24, 11, -18, -68, -9, -126, -7, 62,
+   120, 79, 31, 69, -20, -53, 42, 86,
+   32, -52, 12, 32, 64, 74, -39, -66,
+   67, -4, 35, -51, -50, 50, 8, 69,
+   -112, 104, 51, 53, 15, 1, 55, 88,
+   34, -100, -21, -25, -117, -91, -4, -125,
+   -1, 1, 48, -29, -13, -20, 7, 29,
+   -61, -24, 26, 9, 73, -23, -128, -61,
+   -79, -17, -21, 17, -7, -23, -70, -18,
+   97, -30, 15, -28, 56, -41, -126, 21,
+   27, 122, -13, 41, -86, -109, 12, 35,
+   46, -57, 2, -47, 1, 7, 63, -53,
+   98, 51, -50, -7, -10, -37, 8, 6,
+   -110, 15, 42, 24, -34, 117, -4, 50,
+   14, 17, -37, 58, -46, 6, 115, -31,
+   -113, -40, 104, -47, -5, 118, 19, 30,
+   -78, -22, -126, 27, -3, 54, -63, -65,
+   21, -7, -45, -39, -10, -35, 2, -3,
+   53, 5, -119, -26, -66, -6, -46, 43,
+   -66, -2, -20, -27, -10, 27, -34, 29,
+   -21, -7, -103, 4, -26, -5, 17, 52,
+   -128, -28, -13, -1, 52, -38, 67, -24,
+   -41, -121, 65, 32, 84, -24, -112, 13,
+   106, -105, -9, -66, -18, -28, -52, 78,
+   -58, -33, 2, -18, 17, -33, -21, -30,
+   93, -28, -116, 80, -84, -51, -21, -1,
+   -15, -4, 24, -34, 50, -44, -54, 61,
+   -79, -41, 15, -48, -125, -29, -84, 93,
+   17, 1, -123, 106, -123, -17, 84, 0,
+   126, -34, -30, -81, 61, -96, 13, 71,
+   -40, -122, -19, 22, -89, -25, -119, 57,
+   -5, -98, 112, -71, 95, -94, -59, 74,
+   103, -12, 39, -61, -8, -125, 15, 7,
+   -69, -17, -119, -11, 69, -81, -17, 124,
+   43, 33, -127, -103, -88, 81, 56, -10,
+   1, -98, -97, -73, -71, -42, 17, 73,
+   -33, -123, -46, -80, 9, 91, 126, -127,
+   -21, -115, -110, 93, -126, -24, -53, -119,
+   -103, -117, -9, -28, 39, -11, -59, -103,
+   0, 53, 1, 59, 27, -86, -88, 95,
+   24, 51, 114, -6, 81, 107, 70, -80,
+   -95, -34, -24, 20, 18, 7, 31, -121,
+   72, -64, 101, 5, -28, -94, -121, 14,
+   19, 45, 23, -86, -34, -19, 5, -61,
+   73, -82, -11, 28, 10, 23, -46, 26,
+   108, 16, 5, -16, 32, -32, -81, 76,
+   -18, -19, -44, 13, -53, -97, 37, 36,
+   21, -62, 9, 9, 82, -65, -92, -61,
+   -128, 73, 33, -12, -126, -41, -3, 6,
+   63, -97, -127, -91, 31, -18, -3, 91,
+   -65, 27, 21, 57, -43, -40, 99, -62,
+   22, -6, -51, 127, 82, -14, -114, -31,
+   39, 39, -88, -17, -24, -10, -22, -113,
+   -36, 3, -67, -76, 47, 50, 85, -22,
+   22, 10, 60, -2, 34, 0, -25, 22,
+   -52, 48, 79, 48, -3, 17, -27, -6,
+   6, -17, 125, -12, 65, 1, -12, 35,
+   30, 91, 14, 88, -13, 26, 36, -17,
+   20, 9, -23, 37, 112, 25, 31, 56,
+   -7, 118, -78, 11, -13, 84, 41, 1,
+   46, 114, 123, 35, 40, 39, 18, 12,
+   116, -13, -13, -7, 64, -128, -22, 15,
+   -27, 11, 53, -13, -31, 13, 51, 74,
+   -21, -26, 81, -56, -4, 5, 24, -41,
+   20, 22, 18, -8, 70, 4, -14, -2,
+   17, 17, 71, -30, -128, 20, 20, 3,
+   40, -5, -35, 123, -23, 28, 21, -6,
+   -34, -5, 41, -33, -18, 3, -5, -44,
+   -46, 37, 37, 0, 14, 39, -69, 50,
+   18, -31, 39, 43, -51, 5, 6, 19,
+   -21, 40, -9, -5, 41, 3, 76, 4,
+   10, -41, -49, -43, -47, -66, -74, 53,
+   -77, 109, 51, 62, -19, 1, 33, 31,
+   -18, -107, -39, -72, 20, 21, -32, -35,
+   42, -8, -2, 10, -2, 1, 31, 9,
+   69, 24, 55, -60, 11, -14, -11, -69,
+   -63, 0, 107, 10, -61, 77, 57, 34,
+   38, 21, -55, -29, -126, 18, -54, -94,
+   -61, -41, 0, 20, 45, -21, -2, -52,
+   -47, 71, 12, 11, -11, 33, 117, 14,
+   -64, -4, -112, -21, 27, -46, 16, 25,
+   41, 36, -35, 45, -2, -24, -35, 10,
+   -4, 24, 18, 57, -126, 17, 21, -13,
+   31, -125, -1, -3, -8, -70, 22, -124,
+   1, -50, 75, 87, 60, 83, 27, -42,
+   21, 9, -3, -45, -40, -24, 8, -6,
+   -11, -3, -126, -15, -8, -75, -80, -124,
+   -70, 40, 48, 19, 29, -2, 25, -121,
+   -23, 4, -12, 90, 49, -40, 20, -13,
+   3, -123, 10, -59, -21, -25, -60, -10,
+   56, -5, 8, 24, 18, 4, 15, 33,
+   77, 4, 1, 8, -126, 23, 27, 34,
+   3, 51, 66, -14, 50, 51, 108, -40,
+   -2, -39, 10, 46, 60, 28, 5, 72,
+   11, -64, -82, 31, -52, -3, -29, 32,
+   63, -24, 44, 35, 8, -8, 25, -25,
+   6, 58, 41, 55, -24, -33, -7, -8,
+   -16, -36, -59, 6, 56, -68, 32, 16,
+   -14, 26, -19, 26, -41, -77, 41, 0,
+   -20, -21, 15, -49, -27, 7, 34, 41,
+   17, 14, 20, 62, 95, 40, -4, 65,
+   28, -11, -28, 27, -43, 85, -12, 2,
+   -11, -13, -5, 38, 4, -87, 126, 44,
+   -12, 3, 30, -89, 124, 24, -16, 35,
+   -30, -39, 0, -116, 122, 33, -8, -31,
+   80, -29, -12, -55, -17, 18, 58, 15,
+   34, -123, 19, 4, -51, 48, 7, -127,
+   -89, 127, 39, -86, -19, 46, 127, -52,
+   68, 3, -7, 9, -126, -13, -49, -45,
+   8, -20, -126, 42, -72, 127, -15, -2,
+   42, -33, 53, -34, 10, -128, 13, -78,
+   -60, -65, 52, -35, 36, 39, -30, 55,
+   -64, -81, 32, 41, 38, -17, -53, -65,
+   95, -115, 22, -52, 10, 64, -60, -9,
+   -45, -21, 24, -22, -25, -31, 64, 127,
+   -47, -33, 10, 98, 62, 30, 17, 19,
+   -46, 36, -67, -74, 75, -19, 56, 2,
+   11, 28, 127, -57, -52, -110, -44, -20,
+   106, -30, 49, 52, -1, 43, 38, -32,
+   41, -13, -2, -38, -12, -3, -17, -36,
+   42, -6, -22, -17, -74, -30, 95, 18,
+   23, 14, 17, -21, 34, 72, 24, 2,
+   -37, -49, -36, -34, 3, -126, -65, -37,
+   -24, -56, 14, 75, 28, 0, 41, -80,
+   -13, -90, -33, 39, 31, -14, -1, 15,
+   19, 63, -9, 45, 3, -122, 48, -35,
+   -38, 25, 22, 18, -27, 4, 1, -11,
+   -43, -101, -24, -2, 13, 64, 42, -45,
+   -20, -1, -6, 29, 0, 10, -5, 14,
+   98, -1, -18, 9, 44, -19, -24, -36,
+   -12, -42, -31, -28, 125, -21, -17, -12,
+   -12, 25, -21, 8, -6, 30, 39, -13,
+   -24, 25, 36, 48, -12, 31, 53, -23,
+   -57, -27, -53, -5, -18, 12, 1, -13,
+   -28, 8, -48, -64, 25, -12, -27, 66,
+   -28, 2, 12, -12, -8, -88, -16, -48,
+   -61, 12, 77, 41, -50, 7, -18, 12,
+   1, 2, 25, 80, 6, -63, -50, 29,
+   127, 37, -30, -102, 35, 39, -7, -26,
+   -27, -81, -4, -1, -7, -48, -28, 29,
+   37, 19, 49, -23, 19, -2, 15, -20,
+   -7, -1, 45, 33, -54, -2, 26, 23,
+   26, -101, -45, -32, 39, -24, -18, -9,
+   -7, 34, 75, 5, 15, 39, 19, 7,
+   34, 53, -13, -10, 11, 38, -29, -27,
+   -1, -104, -55, -10, 27, -9, -2, 6,
+   -14, 13, 29, -28, -21, 13, -1, 38,
+   -25, 32, -31, -50, 52, -34, -19, -39,
+   12, -29, -110, 10, -74, 47, 60, -6,
+   -2, 22, 4, -42, -55, 41, -66, 88,
+   -15, 123, 26, -7, 20, 20, 28, 35,
+   69, 5, -64, -21, 36, 26, 78, 122,
+   -6, 54, -44, 51, -7, 118, 60, 109,
+   12, -29, 36, 27, -50, 50, -37, 10,
+   56, -126, 107, 56, -8, 81, -101, 29,
+   21, -25, 15, 68, 81, -98, -28, -46,
+   -61, 12, 87, 96, 2, 4, 57, -123,
+   25, 12, 41, -5, -32, 78, 123, 28,
+   59, 58, -85, 16, -13, 60, -115, -23,
+   50, 127, -83, 39, 94, -50, -96, -97,
+   -17, 91, -28, 11, -127, -63, -25, -92,
+   -106, 89, 78, -11, -27, -22, 8, 13,
+   26, 53, 25, 19, 93, 49, -21, -10,
+   0, 37, 59, -6, -34, -22, 13, 80,
+   35, 0, 30, 89, 64, -17, -25, 16,
+   73, -32, -47, 92, 31, -32, 82, 3,
+   44, -22, 3, 44, 1, 1, 10, 22,
+   13, 9, -18, 20, -2, -15, 41, -1,
+   33, 18, 22, 51, 6, -16, -41, 17,
+   -5, -43, 78, 25, 45, 66, -15, 0,
+   14, 3, 51, -36, 24, -13, -7, -15,
+   -4, -11, 28, 29, 11, -20, -3, 54,
+   14, -9, -127, 8, 12, 61, 9, 28,
+   55, 0, 9, 13, -61, 28, 40, 39,
+   -49, -32, -20, 9, -16, 59, -15, -21,
+   5, -39, 28, -33, -26, 51, 4, -10,
+   -19, 27, -31, -4, -34, 74, 3, 16,
+   104, 2, 121, 23, -27, -1, 6, -32,
+   -15, -28, -32, -14, 65, 100, -2, 5,
+   -4, -8, 55, 67, 10, 6, 10, -9,
+   -39, -78, 42, 35, 9, 24, -24, 50,
+   -7, 44, -37, 4, 0, 14, 45, -29,
+   33, 21, 54, -3, 20, 46, 20, -34,
+   33, -71, -32, 8, -24, 8, -29, -19,
+   -7, 116, -27, 52, -9, 26, 121, 54,
+   -86, -5, -66, 44, -40, 56, -21, -38,
+   -24, -42, 2, -20, -11, 23, -8, -7,
+   -101, -44, 15, 38, 60, -15, -3, -4,
+   50, -12, -91, 10, -49, 7, 31, 30,
+   -61, -55, 20, -100, 17, 13, -57, 32,
+   88, -62, 56, -23, -9, -8, 3, 26,
+   4, 2, 9, 70, 11, 36, -30, -126,
+   -55, 71, 28, 47, 94, 44, -8, 20,
+   -3, 6, 18, 56, 124, 78, 1, 19,
+   -57, -19, -121, 42, 54, -51, -12, -39,
+   -44, -16, -80, -77, 31, 16, -13, -76,
+   29, -2, 1, -47, -4, 59, 79, -10,
+   22, -35, 69, -50, 7, -17, 64, -58
+};
+
+static const rnn_weight denoise_gru_bias[288] = {
+   -41, -76, -24, -96, 25, 117, -55, 54,
+   -73, -28, 53, -79, 20, -8, -87, 28,
+   44, 38, -66, -19, -45, 25, 119, 78,
+   54, -92, 31, 13, -3, -13, -28, -67,
+   3, 31, 54, -48, -16, -97, -12, 2,
+   -117, -48, -24, 56, 18, 115, -59, 126,
+   -30, 6, 16, -126, -11, -6, 15, -67,
+   33, -113, 59, -12, 126, -3, 61, 58,
+   -71, -4, 42, 41, -48, 11, -33, 50,
+   43, 4, 0, 15, -46, -16, 23, -18,
+   8, -30, 13, 66, 77, -6, 34, 103,
+   40, 50, 39, 72, -10, 22, -16, 24,
+   1, 127, -9, -48, -55, -27, 36, -16,
+   90, 4, 12, -17, 59, 23, -34, 20,
+   -84, 19, 41, 121, 116, 111, -10, -127,
+   41, 44, 4, 34, -1, 20, -11, 2,
+   127, -127, 44, 16, 21, 126, 66, 125,
+   126, 78, 25, 45, 72, 3, 123, 40,
+   105, -62, 25, -105, 44, 33, 13, -51,
+   119, 126, 126, 53, 0, -88, -32, -27,
+   -33, -18, 11, 1, 27, -62, -6, -57,
+   71, 46, 21, -7, -6, -55, 127, 30,
+   -41, -6, -21, -21, -38, 87, -16, 34,
+   44, -126, -112, -30, 61, -17, 115, 1,
+   -39, 19, -43, 76, -64, 48, -13, 11,
+   73, 71, 93, 104, 23, 10, 63, 34,
+   -7, 126, 57, 3, 127, 15, -71, -126,
+   -25, 125, 7, 7, 39, -18, -27, 126,
+   95, -127, -95, 36, -4, 125, 37, 72,
+   127, -29, 69, 84, 99, 39, 127, 40,
+   -127, -92, 0, 127, -14, 70, 39, -98,
+   25, 127, -54, 48, 47, 19, -21, 93,
+   61, 127, 3, -62, 127, -75, 24, -3,
+   -18, 102, 40, -6, -14, -36, -41, 46,
+   89, -17, 29, -55, 7, -10, -59, 22,
+   -21, 25, 18, -58, 25, 126, -84, 127
+};
+
+static const GRULayer denoise_gru = {
+   denoise_gru_bias,
+   denoise_gru_weights,
+   denoise_gru_recurrent_weights,
+   114, 96, ACTIVATION_RELU
+};
+
+static const rnn_weight denoise_output_weights[2112] = {
+   24, 90, 127, 108, 73, 38, 24, 13,
+   4, 16, 41, 51, 46, 35, 24, 14,
+   19, 23, 27, 23, 11, 10, 14, -1,
+   20, 67, 122, 95, 44, 11, 4, 5,
+   8, 15, 19, 17, 11, 5, 1, -2,
+   -1, 5, 5, 1, 28, 2, -25, -16,
+   -83, -45, 4, 36, 29, 24, 20, 12,
+   -1, -2, 4, 13, 17, 18, 21, 22,
+   20, 11, -11, -26, -15, -21, -18, -15,
+   -22, -22, -18, -22, -25, -20, -24, -25,
+   -19, -21, -22, -16, -18, -24, -22, -7,
+   6, 26, 25, 7, 12, 17, 11, 4,
+   11, 11, 1, 1, 6, 14, 19, 11,
+   13, 29, 37, 14, -16, -45, -3, -8,
+   -17, -22, -19, -11, -19, -21, -22, -24,
+   -25, -20, -19, -14, -7, -5, -3, -1,
+   0, 1, 14, 13, 10, -12, 27, 5,
+   -33, 11, 51, 26, -23, -22, -11, -8,
+   -4, -8, -21, -32, -41, -45, -43, -39,
+   -34, -16, -3, 2, -7, -10, -16, -12,
+   -12, -8, -4, 1, 24, 53, 81, 98,
+   99, 80, 60, 54, 49, 38, 16, 5,
+   0, 15, 5, 14, 11, 12, 3, 7,
+   16, 19, 17, 10, 6, 1, -11, -11,
+   -18, -26, -31, -26, -17, -14, -2, -15,
+   -23, -27, -28, -31, -25, -29, -36, -37,
+   -26, -22, -17, -15, -18, -17, -14, -14,
+   -9, -9, 1, 4, 1, -6, -29, -23,
+   -21, -14, -24, -24, -20, -21, -16, -13,
+   -14, -15, -12, -16, -13, -10, -10, -7,
+   4, 18, -8, -11, -24, -12, -6, -10,
+   -14, -21, -21, -20, -15, -22, -53, -65,
+   -58, -43, -27, -31, -38, -45, -48, 0,
+   -5, -8, -4, 2, 10, 12, 12, 6,
+   12, 21, 25, 22, 23, 23, 26, 38,
+   44, 41, 38, 36, 24, 18, -21, -31,
+   -28, -37, -20, -5, -4, -15, -14, -16,
+   -21, -21, -9, -10, -8, 0, -5, 4,
+   20, 14, 15, 47, 26, 26, 25, 5,
+   3, 8, 17, 17, 10, 14, 14, 4,
+   0, 5, 6, 12, 12, 11, 14, 28,
+   47, 62, 8, 8, -7, 2, 2, 2,
+   -5, -4, 2, 2, -4, -5, -11, -22,
+   -34, -46, -53, -55, -45, -39, -35, -43,
+   -15, -7, 24, 40, 50, 55, 62, 63,
+   60, 58, 50, 48, 46, 47, 45, 40,
+   30, 20, 12, 7, 3, 4, -9, 2,
+   -13, -9, -13, -15, -20, -17, -19, -32,
+   -45, -54, -65, -67, -63, -62, -48, -24,
+   -11, 5, 11, -38, -5, -7, -8, -12,
+   -17, -15, -11, -7, -8, -12, -10, -11,
+   -14, -13, -14, -17, -7, 12, 24, 15,
+   -11, -79, -1, 14, -8, 26, 14, 13,
+   13, 6, -16, -16, 10, 28, 16, 5,
+   -1, -1, 5, 9, 7, 6, 8, 14,
+   -10, -7, -2, -1, -9, -18, -20, -18,
+   -13, -11, -14, -20, -29, -37, -46, -46,
+   -48, -54, -56, -72, -83, 11, 0, 11,
+   37, 45, 52, 80, 118, 96, 33, -10,
+   -13, -10, 4, 7, -6, -3, 5, 3,
+   -2, -9, -9, -7, -4, -3, 12, 13,
+   17, 24, 20, 16, 10, 11, 15, 17,
+   11, 3, 1, -1, -6, -9, -5, -14,
+   -21, -16, 8, 1, -10, 5, -3, -51,
+   -14, -10, -28, -27, -21, -14, -4, -3,
+   -6, 1, 5, 4, 5, 13, 11, -1,
+   -3, 5, 11, 30, 37, 34, 31, 27,
+   24, 24, 29, 34, 28, 25, 29, 27,
+   29, 30, 36, 38, 38, 8, -17, -18,
+   -41, -58, -45, -39, -51, -52, -40, -47,
+   -60, -52, -38, -25, -27, -36, -43, -33,
+   -19, -3, 1, -3, 3, 1, 6, 14,
+   12, 9, 6, 3, 8, 13, 10, 8,
+   15, 31, 46, 69, 82, 81, 76, 67,
+   42, 15, 14, 28, 21, 36, 42, 27,
+   28, 26, 20, 11, 7, 4, 7, 6,
+   7, 20, 26, 17, 12, 1, -13, -22,
+   -16, -23, -16, -9, -11, -10, -12, -10,
+   -5, -6, -8, -6, -3, -2, 9, 10,
+   7, 7, 9, 22, 34, 25, -5, -8,
+   -3, 2, -14, -7, -2, 1, 7, 33,
+   56, 59, 58, 42, 2, -11, -10, -11,
+   -10, -12, -10, -4, 9, 14, 21, 11,
+   9, 6, 7, 8, 13, 16, 18, 22,
+   26, 30, 30, 30, 26, 18, 9, 5,
+   2, 3, -18, -29, -57, -45, -39, -45,
+   -35, -19, -7, -6, -2, -4, -11, -13,
+   -1, 0, -6, -22, -47, -50, -18, 12,
+   -13, -19, -45, -41, -43, -38, -34, -31,
+   -31, -21, -13, -10, -13, -13, -9, -8,
+   -9, -9, -6, -4, -4, 2, -9, -18,
+   -6, 2, 0, 5, 8, 5, 5, 7,
+   8, 7, 6, 2, -5, -6, -2, 3,
+   3, -8, -14, -1, 45, 35, 41, 21,
+   32, 31, 20, 17, 22, 20, 19, 16,
+   10, 4, 11, 15, 6, 4, 13, 4,
+   -7, -18, 7, -26, -11, 9, -12, -28,
+   -34, -16, -2, -8, -20, -20, -27, -10,
+   2, 4, 9, 1, -4, 4, 9, -1,
+   84, 95, 23, 17, 19, 21, 17, 25,
+   32, 23, 8, 2, 5, 9, 13, 17,
+   16, 16, 16, 18, 23, 24, -27, -32,
+   -10, -21, -8, -1, -10, -10, -5, -1,
+   2, 1, 3, 0, -9, -11, -10, 0,
+   10, 9, 18, 28, 12, 18, 15, 11,
+   2, 1, -4, 4, 8, 7, 8, 7,
+   3, 4, 3, 11, 14, 4, -5, -2,
+   3, -29, -4, -2, -7, 0, -4, -7,
+   -16, -7, 5, 2, 0, 0, -3, 2,
+   5, 1, -3, -18, -63, -113, -128, -117,
+   -23, -13, -2, -21, -21, -29, -54, -37,
+   -2, -2, -17, -29, -35, -29, -19, -16,
+   -14, -16, -19, -16, -15, -21, 28, 19,
+   29, 20, 30, 19, 13, 12, 11, 14,
+   17, 20, 28, 29, 25, 24, 24, 32,
+   31, 34, 60, 97, -37, -41, -57, -61,
+   -54, -50, -54, -57, -49, -49, -47, -45,
+   -45, -50, -56, -59, -54, -49, -52, -60,
+   -51, -40, -16, -16, 0, -9, -16, -11,
+   -5, -6, -10, -17, -27, -35, -29, -31,
+   -40, -42, -44, -38, -31, -25, -23, -6,
+   -5, -2, -17, -38, -24, -16, -19, -12,
+   12, 38, 47, 37, 24, 6, -15, -9,
+   13, 37, 61, 56, 11, -7, 27, 18,
+   -10, -14, -14, -14, -19, -18, -13, -12,
+   -12, -13, -15, -11, -5, -6, -8, -8,
+   -7, -4, -1, -8, -4, 0, -9, 2,
+   2, 6, -4, -7, -4, -6, -7, -12,
+   -15, -17, -10, -8, -15, -21, -25, -31,
+   -72, -127, -128, 20, 42, 17, 8, -4,
+   1, 6, 3, -18, -28, -2, 1, 5,
+   28, 8, -3, 8, 16, 24, 15, 0,
+   -9, 19, 12, 16, 43, 69, 55, 41,
+   35, 22, 14, 8, 3, 8, 16, 20,
+   26, 33, 34, 30, 19, 15, -10, -12,
+   -10, -10, -7, -11, -3, -4, -8, -7,
+   -2, 1, 0, -3, -7, -8, -8, -6,
+   -1, -2, -4, -4, -76, -91, -66, -74,
+   -76, -41, -48, -47, -44, -41, -39, -36,
+   -42, -48, -37, -37, -39, -41, -47, -58,
+   -68, -70, -78, -79, -69, -70, -70, -67,
+   -72, -72, -72, -68, -63, -60, -58, -58,
+   -55, -53, -49, -43, -43, -37, -34, -16,
+   -6, -3, -1, -11, -7, -4, -3, -3,
+   -2, 2, 1, -6, -7, -11, -11, -3,
+   -17, -41, -58, -44, -36, -43, 6, -15,
+   -19, -19, -21, -17, 0, 16, 16, 13,
+   12, -5, 0, -4, -27, -27, -12, -3,
+   0, -2, -7, -15, 7, 0, -8, -6,
+   -2, 8, 4, 0, -5, -7, -11, -13,
+   -13, -11, -7, -9, -9, -6, -10, -5,
+   6, 0, 37, 34, 32, 43, 40, 35,
+   34, 36, 40, 38, 35, 38, 37, 40,
+   44, 37, 31, 30, 25, 38, 44, 23,
+   18, 10, 8, 8, 3, 5, 4, 2,
+   3, 6, 6, 5, 7, 6, -3, -8,
+   -8, -13, -14, -24, -17, 9, -110, 22,
+   -17, -65, -43, -35, 5, 5, -19, -29,
+   -27, -18, -11, -6, -4, -6, -10, -9,
+   -4, 1, 3, 2, 36, -40, -99, -102,
+   20, 27, 7, -16, -27, -30, -23, -15,
+   -6, 1, 3, -2, -8, -10, -9, 4,
+   8, -10, -44, -30, -9, -2, -5, -15,
+   -9, -3, 1, -2, -18, -17, -21, -26,
+   -25, -34, -38, -44, -46, -46, -38, -87,
+   43, 32, 14, 5, 8, 12, 10, 4,
+   -12, -14, -4, 2, -1, -7, -6, 2,
+   3, -3, -2, -1, 4, 14, -89, -105,
+   -6, -8, 0, 1, -3, -7, -8, -4,
+   8, 15, 9, 3, -1, -5, -6, -4,
+   -2, 1, 5, 9, -4, -6, -1, -1,
+   -6, -1, -5, -3, 0, -3, -4, -2,
+   -4, -5, -5, -10, -9, -5, -8, -14,
+   -20, -44, -20, -5, 1, 20, 22, -17,
+   -35, -38, -33, -23, -2, 8, 10, 7,
+   -2, -40, -59, -50, -30, -8, -17, -32,
+   -125, -75, -53, -13, -1, -9, -12, -12,
+   -9, -7, -3, -1, -4, -9, -11, -13,
+   -8, -10, -14, -6, -6, -24, 46, -1,
+   8, -6, 4, 0, 34, 19, -20, -27,
+   -23, -19, -6, 3, 15, 33, 37, 29,
+   22, 11, 3, -6, 1, 0, 12, 7,
+   3, -4, 3, 3, 7, 12, 6, -1,
+   -2, -5, -4, -6, -7, -4, -3, -1,
+   3, 8, -7, 1, 9, 5, -1, -3,
+   -7, -3, 3, 6, 10, 7, 1, 0,
+   2, 0, 1, -3, -5, 2, 2, -9,
+   5, -2, -25, -17, -17, -14, -14, -13,
+   -24, -38, -48, -48, -43, -31, -24, -17,
+   -13, -12, -12, -12, -5, 7, 21, 21,
+   -5, 4, 10, -3, 2, 7, 8, 8,
+   6, 6, 3, -3, -11, -15, -13, -12,
+   -20, -26, -28, -41, 30, 17, 18, 26,
+   24, 22, 22, 32, 40, 39, 34, 32,
+   27, 34, 36, 26, 20, 18, 23, 35,
+   41, 27, -10, -7, 1, 7, 8, 0,
+   6, 14, 15, 11, 6, 7, 7, 6,
+   10, 11, 11, 14, 14, 17, 33, 71,
+   17, 10, -6, -1, 12, 14, 7, 7,
+   18, 15, 2, -7, -6, 0, 5, 7,
+   2, -3, -5, -6, -1, 4, -11, 6,
+   5, 3, 10, 13, 9, 5, 14, 19,
+   9, -4, -17, -18, -9, 1, 3, 5,
+   17, 38, 53, 31, -34, -26, -28, -22,
+   -17, -24, -23, -21, -26, -21, -21, -25,
+   -20, -17, -13, -19, -16, -23, -31, -23,
+   -9, -20, 21, 26, 16, 13, 20, 11,
+   15, 19, 19, 18, 24, 26, 29, 27,
+   29, 25, 25, 15, 28, 38, 44, 59,
+   14, 18, 31, 37, 42, 40, 43, 45,
+   49, 54, 54, 56, 53, 50, 43, 37,
+   30, 26, 23, 20, 14, 10, 9, 11,
+   16, 5, 15, 12, 14, 15, 13, 12,
+   14, 17, 17, 16, 16, 16, 15, 6,
+   4, 2, -14, 2, 0, -2, -7, 18,
+   26, 20, 22, 29, 29, 14, 9, 17,
+   21, 12, 2, 5, 9, 14, 10, 5,
+   2, 5, 86, 127, 127, 68, 29, -3,
+   -3, 15, 23, 28, 31, 21, 5, -3,
+   -7, -5, -2, -1, -6, -17, -18, -14,
+   3, -2, -24, -29, -32, -33, -40, -46,
+   -45, -45, -45, -44, -42, -39, -35, -29,
+   -28, -29, -28, -23, -7, 9, 24, 37,
+   62, 62, 67, 64, 59, 76, 105, 95,
+   61, 41, 28, 23, 23, 18, 14, 19,
+   22, 22, 14, 11, -51, -39, -20, -13,
+   -13, -6, -5, -7, -9, -14, -15, -18,
+   -25, -26, -30, -35, -35, -44, -44, -51,
+   -71, -105, -16, -4, -18, 2, 28, 7,
+   -3, 7, 13, 3, -3, 2, 9, 14,
+   14, 5, -8, -14, -4, 17, 47, 98,
+   -23, -41, -55, -45, -41, -38, -34, -32,
+   -31, -29, -25, -22, -19, -17, -14, -13,
+   -13, -13, -14, -13, -4, 0, 14, 26,
+   11, 2, 4, -7, -8, -15, -22, -28,
+   -26, -9, 6, 14, 11, -3, -4, -1,
+   3, 31, 65, 45, 4, -1, 37, 31,
+   2, -7, -21, -29, -20, 5, 10, -10,
+   -13, -13, -8, 1, 4, -4, -12, -31,
+   -15, 39, -3, -6, -12, -16, -24, -27,
+   -31, -28, -30, -38, -45, -45, -48, -50,
+   -50, -46, -43, -41, -38, -39, -34, -34,
+   15, 16, 3, 2, 10, 12, -4, -2,
+   15, 26, 25, 21, 27, 35, 44, 43,
+   28, 21, 43, 42, 17, 40, 9, 7,
+   10, 12, 10, 5, 1, 5, 11, 11,
+   9, 10, 16, 19, 22, 34, 44, 51,
+   48, 48, 48, 60, -43, -29, -12, -2,
+   -9, -24, -19, -13, -12, -14, -15, -13,
+   -17, -18, -19, -19, -17, -20, -23, -34,
+   -39, -44, -6, -31, -32, -25, 52, 106,
+   110, 19, -4, -14, -13, -5, -2, -8,
+   2, 6, 5, 11, 15, 20, 38, 61,
+   -40, -19, -2, -5, -2, -4, -1, -6,
+   -8, -6, -8, -4, -5, -4, 3, 0,
+   -2, -4, -5, -3, -14, -24, -16, -24,
+   -22, 2, -2, -29, -33, -27, -23, -25,
+   -24, -16, -18, -17, 5, 38, 47, 41,
+   37, 27, 13, 0, 67, 78, 39, -26,
+   -7, -10, -15, -6, 3, -3, -5, -3,
+   -2, 0, 3, 1, -3, -4, -3, -1,
+   1, 0, -2, -15, 24, -12, -48, 24,
+   -26, -82, -69, -40, -15, -16, -9, -1,
+   7, 12, 18, 20, 26, 33, 27, 30
+};
+
+static const rnn_weight denoise_output_bias[22] = {
+   -82, -66, -125, -95, -127, -127, -127, -127,
+   -127, -94, -113, -127, -80, -65, -109, -127,
+   -126, -105, -53, -49, -18, -9
+};
+
+static const DenseLayer denoise_output = {
+   denoise_output_bias,
+   denoise_output_weights,
+   96, 22, ACTIVATION_SIGMOID
+};
+
+static const rnn_weight vad_output_weights[24] = {
+   127, 127, 127, 127, 127, 20, 127, -126,
+   -126, -54, 14, 125, -126, -126, 127, -125,
+   -126, 127, -127, -127, -57, -30, 127, 80
+};
+
+static const rnn_weight vad_output_bias[1] = {
+   -50
+};
+
+static const DenseLayer vad_output = {
+   vad_output_bias,
+   vad_output_weights,
+   24, 1, ACTIVATION_SIGMOID
+};
+
+const struct RNNModel rnnoise_model_orig = {
+    24,
+    &input_dense,
+
+    24,
+    &vad_gru,
+
+    48,
+    &noise_gru,
+
+    96,
+    &denoise_gru,
+
+    22,
+    &denoise_output,
+
+    1,
+    &vad_output
+};
diff --git a/third-party/rnnoise/Sources/rnn_data.h b/third-party/rnnoise/Sources/rnn_data.h
new file mode 100644
index 0000000000..f2186fe076
--- /dev/null
+++ b/third-party/rnnoise/Sources/rnn_data.h
@@ -0,0 +1,34 @@
+#ifndef RNN_DATA_H
+#define RNN_DATA_H
+
+#include "rnn.h"
+
+struct RNNModel {
+  int input_dense_size;
+  const DenseLayer *input_dense;
+
+  int vad_gru_size;
+  const GRULayer *vad_gru;
+
+  int noise_gru_size;
+  const GRULayer *noise_gru;
+
+  int denoise_gru_size;
+  const GRULayer *denoise_gru;
+
+  int denoise_output_size;
+  const DenseLayer *denoise_output;
+
+  int vad_output_size;
+  const DenseLayer *vad_output;
+};
+
+struct RNNState {
+  const RNNModel *model;
+  float *vad_gru_state;
+  float *noise_gru_state;
+  float *denoise_gru_state;
+};
+
+
+#endif
diff --git a/third-party/rnnoise/Sources/rnn_reader.c b/third-party/rnnoise/Sources/rnn_reader.c
new file mode 100644
index 0000000000..2a031db118
--- /dev/null
+++ b/third-party/rnnoise/Sources/rnn_reader.c
@@ -0,0 +1,168 @@
+/* Copyright (c) 2018 Gregor Richards */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#include "rnn.h"
+#include "rnn_data.h"
+#include "rnnoise.h"
+
+/* Although these values are the same as in rnn.h, we make them separate to
+ * avoid accidentally burning internal values into a file format */
+#define F_ACTIVATION_TANH       0
+#define F_ACTIVATION_SIGMOID    1
+#define F_ACTIVATION_RELU       2
+
+RNNModel *rnnoise_model_from_file(FILE *f)
+{
+    int i, in;
+
+    if (fscanf(f, "rnnoise-nu model file version %d\n", &in) != 1 || in != 1)
+        return NULL;
+
+    RNNModel *ret = calloc(1, sizeof(RNNModel));
+    if (!ret)
+        return NULL;
+
+#define ALLOC_LAYER(type, name) \
+    type *name; \
+    name = calloc(1, sizeof(type)); \
+    if (!name) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    ret->name = name
+
+    ALLOC_LAYER(DenseLayer, input_dense);
+    ALLOC_LAYER(GRULayer, vad_gru);
+    ALLOC_LAYER(GRULayer, noise_gru);
+    ALLOC_LAYER(GRULayer, denoise_gru);
+    ALLOC_LAYER(DenseLayer, denoise_output);
+    ALLOC_LAYER(DenseLayer, vad_output);
+
+#define INPUT_VAL(name) do { \
+    if (fscanf(f, "%d", &in) != 1 || in < 0 || in > 128) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    name = in; \
+    } while (0)
+
+#define INPUT_ACTIVATION(name) do { \
+    int activation; \
+    INPUT_VAL(activation); \
+    switch (activation) { \
+        case F_ACTIVATION_SIGMOID: \
+            name = ACTIVATION_SIGMOID; \
+            break; \
+        case F_ACTIVATION_RELU: \
+            name = ACTIVATION_RELU; \
+            break; \
+        default: \
+            name = ACTIVATION_TANH; \
+    } \
+    } while (0)
+
+#define INPUT_ARRAY(name, len) do { \
+    rnn_weight *values = malloc((len) * sizeof(rnn_weight)); \
+    if (!values) { \
+        rnnoise_model_free(ret); \
+        return NULL; \
+    } \
+    name = values; \
+    for (i = 0; i < (len); i++) { \
+        if (fscanf(f, "%d", &in) != 1) { \
+            rnnoise_model_free(ret); \
+            return NULL; \
+        } \
+        values[i] = in; \
+    } \
+    } while (0)
+
+#define INPUT_DENSE(name) do { \
+    INPUT_VAL(name->nb_inputs); \
+    INPUT_VAL(name->nb_neurons); \
+    ret->name ## _size = name->nb_neurons; \
+    INPUT_ACTIVATION(name->activation); \
+    INPUT_ARRAY(name->input_weights, name->nb_inputs * name->nb_neurons); \
+    INPUT_ARRAY(name->bias, name->nb_neurons); \
+    } while (0)
+
+#define INPUT_GRU(name) do { \
+    INPUT_VAL(name->nb_inputs); \
+    INPUT_VAL(name->nb_neurons); \
+    ret->name ## _size = name->nb_neurons; \
+    INPUT_ACTIVATION(name->activation); \
+    INPUT_ARRAY(name->input_weights, name->nb_inputs * name->nb_neurons * 3); \
+    INPUT_ARRAY(name->recurrent_weights, name->nb_neurons * name->nb_neurons * 3); \
+    INPUT_ARRAY(name->bias, name->nb_neurons * 3); \
+    } while (0)
+
+    INPUT_DENSE(input_dense);
+    INPUT_GRU(vad_gru);
+    INPUT_GRU(noise_gru);
+    INPUT_GRU(denoise_gru);
+    INPUT_DENSE(denoise_output);
+    INPUT_DENSE(vad_output);
+
+    return ret;
+}
+
+void rnnoise_model_free(RNNModel *model)
+{
+#define FREE_MAYBE(ptr) do { if (ptr) free(ptr); } while (0)
+#define FREE_DENSE(name) do { \
+    if (model->name) { \
+        free((void *) model->name->input_weights); \
+        free((void *) model->name->bias); \
+        free((void *) model->name); \
+    } \
+    } while (0)
+#define FREE_GRU(name) do { \
+    if (model->name) { \
+        free((void *) model->name->input_weights); \
+        free((void *) model->name->recurrent_weights); \
+        free((void *) model->name->bias); \
+        free((void *) model->name); \
+    } \
+    } while (0)
+
+    if (!model)
+        return;
+    FREE_DENSE(input_dense);
+    FREE_GRU(vad_gru);
+    FREE_GRU(noise_gru);
+    FREE_GRU(denoise_gru);
+    FREE_DENSE(denoise_output);
+    FREE_DENSE(vad_output);
+    free(model);
+}
diff --git a/third-party/rnnoise/Sources/tansig_table.h b/third-party/rnnoise/Sources/tansig_table.h
new file mode 100644
index 0000000000..c76f844a72
--- /dev/null
+++ b/third-party/rnnoise/Sources/tansig_table.h
@@ -0,0 +1,45 @@
+/* This file is auto-generated by gen_tables */
+
+static const float tansig_table[201] = {
+0.000000f, 0.039979f, 0.079830f, 0.119427f, 0.158649f,
+0.197375f, 0.235496f, 0.272905f, 0.309507f, 0.345214f,
+0.379949f, 0.413644f, 0.446244f, 0.477700f, 0.507977f,
+0.537050f, 0.564900f, 0.591519f, 0.616909f, 0.641077f,
+0.664037f, 0.685809f, 0.706419f, 0.725897f, 0.744277f,
+0.761594f, 0.777888f, 0.793199f, 0.807569f, 0.821040f,
+0.833655f, 0.845456f, 0.856485f, 0.866784f, 0.876393f,
+0.885352f, 0.893698f, 0.901468f, 0.908698f, 0.915420f,
+0.921669f, 0.927473f, 0.932862f, 0.937863f, 0.942503f,
+0.946806f, 0.950795f, 0.954492f, 0.957917f, 0.961090f,
+0.964028f, 0.966747f, 0.969265f, 0.971594f, 0.973749f,
+0.975743f, 0.977587f, 0.979293f, 0.980869f, 0.982327f,
+0.983675f, 0.984921f, 0.986072f, 0.987136f, 0.988119f,
+0.989027f, 0.989867f, 0.990642f, 0.991359f, 0.992020f,
+0.992631f, 0.993196f, 0.993718f, 0.994199f, 0.994644f,
+0.995055f, 0.995434f, 0.995784f, 0.996108f, 0.996407f,
+0.996682f, 0.996937f, 0.997172f, 0.997389f, 0.997590f,
+0.997775f, 0.997946f, 0.998104f, 0.998249f, 0.998384f,
+0.998508f, 0.998623f, 0.998728f, 0.998826f, 0.998916f,
+0.999000f, 0.999076f, 0.999147f, 0.999213f, 0.999273f,
+0.999329f, 0.999381f, 0.999428f, 0.999472f, 0.999513f,
+0.999550f, 0.999585f, 0.999617f, 0.999646f, 0.999673f,
+0.999699f, 0.999722f, 0.999743f, 0.999763f, 0.999781f,
+0.999798f, 0.999813f, 0.999828f, 0.999841f, 0.999853f,
+0.999865f, 0.999875f, 0.999885f, 0.999893f, 0.999902f,
+0.999909f, 0.999916f, 0.999923f, 0.999929f, 0.999934f,
+0.999939f, 0.999944f, 0.999948f, 0.999952f, 0.999956f,
+0.999959f, 0.999962f, 0.999965f, 0.999968f, 0.999970f,
+0.999973f, 0.999975f, 0.999977f, 0.999978f, 0.999980f,
+0.999982f, 0.999983f, 0.999984f, 0.999986f, 0.999987f,
+0.999988f, 0.999989f, 0.999990f, 0.999990f, 0.999991f,
+0.999992f, 0.999992f, 0.999993f, 0.999994f, 0.999994f,
+0.999994f, 0.999995f, 0.999995f, 0.999996f, 0.999996f,
+0.999996f, 0.999997f, 0.999997f, 0.999997f, 0.999997f,
+0.999997f, 0.999998f, 0.999998f, 0.999998f, 0.999998f,
+0.999998f, 0.999998f, 0.999999f, 0.999999f, 0.999999f,
+0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+0.999999f, 0.999999f, 0.999999f, 0.999999f, 0.999999f,
+1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+1.000000f, 1.000000f, 1.000000f, 1.000000f, 1.000000f,
+1.000000f,
+};
diff --git a/third-party/webrtc/BUILD b/third-party/webrtc/BUILD
index 21d6eca221..8da4664043 100644
--- a/third-party/webrtc/BUILD
+++ b/third-party/webrtc/BUILD
@@ -1,6 +1,19 @@
 
 webrtc_source_dir = "webrtc"
 
+config_setting(
+    name = "debug_build",
+    values = {
+        "compilation_mode": "dbg",
+    },
+)
+
+optimization_flags = select({
+    ":debug_build": ["-O2", "-DNDEBUG"],
+    #":debug_build": [],
+    "//conditions:default": ["-DNDEBUG"],
+})
+
 rnnoise_sources = [ "dependencies/third_party/rnnoise/src/" + x for x in [
     "rnn_vad_weights.cc",
     "rnn_vad_weights.h",
@@ -47,7 +60,6 @@ absl_sources = [ "dependencies/third_party/abseil-cpp/" + x for x in [
     "absl/debugging/internal/examine_stack.cc",
     "absl/debugging/internal/stack_consumption.cc",
     "absl/debugging/internal/vdso_support.cc",
-    "absl/debugging/leak_check.cc",
     "absl/debugging/leak_check_disable.cc",
     "absl/debugging/stacktrace.cc",
     "absl/debugging/symbolize.cc",
@@ -111,7 +123,6 @@ absl_sources = [ "dependencies/third_party/abseil-cpp/" + x for x in [
     "absl/synchronization/internal/graphcycles.cc",
     "absl/synchronization/internal/per_thread_sem.cc",
     "absl/synchronization/internal/waiter.cc",
-    "absl/synchronization/mutex.cc",
     "absl/synchronization/notification.cc",
     "absl/time/civil_time.cc",
     "absl/time/clock.cc",
@@ -159,7 +170,6 @@ absl_sources = [ "dependencies/third_party/abseil-cpp/" + x for x in [
     "absl/time/civil_time.h",
     "absl/synchronization/blocking_counter.h",
     "absl/synchronization/barrier.h",
-    "absl/synchronization/mutex.h",
     "absl/base/internal/low_level_alloc.h",
     "absl/strings/str_replace.h",
     "absl/strings/substitute.h",
@@ -197,7 +207,6 @@ absl_sources = [ "dependencies/third_party/abseil-cpp/" + x for x in [
     "absl/flags/internal/usage.h",
     "absl/flags/internal/registry.h",
     "absl/debugging/internal/vdso_support.h",
-    "absl/debugging/leak_check.h",
     "absl/debugging/stacktrace.h",
     "absl/flags/flag.h",
     "absl/debugging/internal/elf_mem_image.h",
@@ -339,8 +348,6 @@ webrtc_sources = [
     "rtc_base/task_queue.h",
     "rtc_base/system/file_wrapper.h",
     "rtc_base/task_utils/repeating_task.h",
-    "rtc_base/task_queue_stdlib.h",
-    "rtc_base/synchronization/sequence_checker.h",
     "rtc_base/synchronization/yield_policy.h",
     "rtc_base/string_utils.h",
     "rtc_base/strings/audio_format_to_string.h",
@@ -352,7 +359,6 @@ webrtc_sources = [
     "rtc_base/ssl_identity.h",
     "rtc_base/ssl_certificate.h",
     "rtc_base/socket.h",
-    "rtc_base/signal_thread.h",
     "rtc_base/rtc_certificate.h",
     "rtc_base/rate_tracker.h",
     "rtc_base/rate_statistics.h",
@@ -421,7 +427,7 @@ webrtc_sources = [
     "rtc_base/third_party/sigslot/sigslot.h",
     "rtc_base/timestamp_aligner.h",
     "rtc_base/ssl_stream_adapter.h",
-    "rtc_base/task_queue_libevent.h",
+    "rtc_base/task_queue_gcd.h",
     "rtc_base/string_encode.h",
     "rtc_base/ssl_fingerprint.h",
     "rtc_base/rtc_certificate_generator.h",
@@ -533,14 +539,12 @@ webrtc_sources = [
     "rtc_base/string_utils.cc",
     "rtc_base/strings/audio_format_to_string.cc",
     "rtc_base/strings/string_builder.cc",
-    "rtc_base/synchronization/sequence_checker.cc",
     "rtc_base/synchronization/yield_policy.cc",
     "rtc_base/synchronization/yield.h",
     "rtc_base/synchronization/yield.cc",
     "rtc_base/system/file_wrapper.cc",
     "rtc_base/task_queue.cc",
-    "rtc_base/task_queue_libevent.cc",
-    "rtc_base/task_queue_stdlib.cc",
+    "rtc_base/task_queue_gcd.cc",
     "rtc_base/task_utils/repeating_task.cc",
     "rtc_base/third_party/base64/base64.cc",
     "rtc_base/third_party/sigslot/sigslot.cc",
@@ -617,7 +621,7 @@ webrtc_sources = [
     "api/rtp_transceiver_interface.cc",
     "api/sctp_transport_interface.cc",
     "api/stats_types.cc",
-    "api/task_queue/default_task_queue_factory_libevent.cc",
+    "api/task_queue/default_task_queue_factory_gcd.cc",
     "api/task_queue/task_queue_base.cc",
     "api/transport/bitrate_settings.cc",
     "api/transport/field_trial_based_config.cc",
@@ -643,7 +647,6 @@ webrtc_sources = [
     "api/video/video_frame_buffer.cc",
     "api/video/video_source_interface.cc",
     "api/video/video_stream_decoder_create.cc",
-    "api/video/video_stream_encoder_create.cc",
     "api/video/video_timing.cc",
     "api/video_codecs/builtin_video_decoder_factory.cc",
     "api/video_codecs/builtin_video_encoder_factory.cc",
@@ -667,7 +670,6 @@ webrtc_sources = [
     "pc/audio_track.cc",
     "pc/channel.cc",
     "pc/channel_manager.cc",
-    "pc/composite_rtp_transport.cc",
     "pc/data_channel_controller.cc",
     "pc/dtls_srtp_transport.h",
     "pc/dtls_srtp_transport.cc",
@@ -736,7 +738,6 @@ webrtc_sources = [
     "media/base/vp9_profile.cc",
     "media/base/adapted_video_track_source.h",
     "media/engine/adm_helpers.cc",
-    "media/engine/constants.cc",
     "media/engine/encoder_simulcast_proxy.cc",
     "media/engine/internal_decoder_factory.cc",
     "media/engine/internal_encoder_factory.cc",
@@ -1051,7 +1052,6 @@ webrtc_sources = [
     "modules/audio_processing/agc2/adaptive_agc.cc",
     "modules/audio_processing/agc2/adaptive_digital_gain_applier.cc",
     "modules/audio_processing/agc2/adaptive_mode_level_estimator.cc",
-    "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.cc",
     "modules/audio_processing/agc2/agc2_testing_common.cc",
     "modules/audio_processing/agc2/biquad_filter.cc",
     "modules/audio_processing/agc2/compute_interpolated_gain_curve.cc",
@@ -1266,7 +1266,9 @@ webrtc_sources = [
     "modules/video_coding/codecs/h264/h264.cc",
     "modules/video_coding/codecs/h264/h264_color_space.cc",
     "modules/video_coding/codecs/h264/h264_decoder_impl.cc",
+    "modules/video_coding/codecs/h264/h264_decoder_impl.h",
     "modules/video_coding/codecs/h264/h264_encoder_impl.cc",
+    "modules/video_coding/codecs/h264/h264_encoder_impl.h",
     "modules/video_coding/codecs/multiplex/augmented_video_frame_buffer.cc",
     "modules/video_coding/codecs/multiplex/multiplex_decoder_adapter.cc",
     "modules/video_coding/codecs/multiplex/multiplex_encoded_image_packer.cc",
@@ -1492,7 +1494,6 @@ webrtc_sources = [
     "logging/rtc_event_log/fake_rtc_event_log.cc",
     "logging/rtc_event_log/fake_rtc_event_log_factory.cc",
     "logging/rtc_event_log/ice_logger.cc",
-    "logging/rtc_event_log/rtc_event_log_impl.cc",
     "logging/rtc_event_log/rtc_stream_config.cc",
     "video/adaptation/encode_usage_resource.cc",
     "video/adaptation/overuse_frame_detector.cc",
@@ -1556,7 +1557,6 @@ webrtc_sources = [
     "rtc_base/checks.h",
     "rtc_base/thread.h",
     "rtc_base/constructor_magic.h",
-    "rtc_base/deprecation.h",
     "api/rtp_packet_infos.h",
     "api/task_queue/task_queue_base.h",
     "rtc_base/thread_annotations.h",
@@ -1651,7 +1651,6 @@ webrtc_sources = [
     "api/video/video_rotation.h",
     "api/video/video_source_interface.h",
     "api/video/video_stream_decoder_create.h",
-    "api/video/video_stream_encoder_create.h",
     "api/video/video_timing.h",
     "api/video_codecs/builtin_video_decoder_factory.h",
     "api/video_codecs/builtin_video_encoder_factory.h",
@@ -1790,7 +1789,6 @@ webrtc_sources = [
     "media/base/video_source_base.h",
     "media/base/vp9_profile.h",
     "media/engine/adm_helpers.h",
-    "media/engine/constants.h",
     "media/engine/encoder_simulcast_proxy.h",
     "media/engine/internal_decoder_factory.h",
     "media/engine/internal_encoder_factory.h",
@@ -1997,7 +1995,6 @@ webrtc_sources = [
     "modules/audio_processing/agc2/adaptive_agc.h",
     "modules/audio_processing/agc2/adaptive_digital_gain_applier.h",
     "modules/audio_processing/agc2/adaptive_mode_level_estimator.h",
-    "modules/audio_processing/agc2/adaptive_mode_level_estimator_agc.h",
     "modules/audio_processing/agc2/agc2_common.h",
     "modules/audio_processing/agc2/agc2_testing_common.h",
     "modules/audio_processing/agc2/biquad_filter.h",
@@ -2321,7 +2318,6 @@ webrtc_sources = [
     "pc/audio_track.h",
     "pc/channel.h",
     "pc/channel_manager.h",
-    "pc/composite_rtp_transport.h",
     "pc/data_channel_controller.h",
     "pc/dtls_transport.h",
     "pc/dtmf_sender.h",
@@ -2433,7 +2429,6 @@ webrtc_sources = [
     "p2p/base/ice_controller_factory_interface.h",
     "rtc_base/async_invoker_inl.h",
     "rtc_base/buffer.h",
-    "rtc_base/callback.h",
     "rtc_base/compile_assert_c.h",
     "rtc_base/dscp.h",
     "rtc_base/gtest_prod_util.h",
@@ -2447,7 +2442,6 @@ webrtc_sources = [
     "rtc_base/sanitizer.h",
     "rtc_base/system/rtc_export_template.h",
     "rtc_base/system/unused.h",
-    "rtc_base/thread_checker.h",
     "rtc_base/time_utils.h",
     "rtc_base/units/unit_base.h",
     "video/adaptation/encode_usage_resource.h",
@@ -2538,7 +2532,6 @@ webrtc_sources = [
     "modules/utility/include/process_thread.h",
     "modules/video_coding/codecs/vp9/include/vp9_globals.h",
     "pc/rtp_transport_internal.h",
-    "rtc_base/bind.h",
     "rtc_base/mdns_responder_interface.h",
     "rtc_base/message_buffer_reader.h",
     "rtc_base/numerics/running_statistics.h",
@@ -2681,7 +2674,6 @@ webrtc_sources = [
     "p2p/base/udp_port.h",
     "pc/peer_connection_internal.h",
     "pc/used_ids.h",
-    "rtc_base/keep_ref_until_done.h",
     "rtc_base/numerics/divide_round.h",
     "rtc_base/system/thread_registry.h",
     "rtc_base/one_time_event.h",
@@ -2729,21 +2721,22 @@ webrtc_sources = [
     "modules/rtp_rtcp/source/rtp_rtcp_interface.h",
     "rtc_base/boringssl_identity.h",
     "rtc_base/boringssl_identity.cc",
-    "rtc_base/deprecated/recursive_critical_section.h",
-    "rtc_base/deprecated/recursive_critical_section.cc",
     "rtc_base/network_monitor_factory.h",
     "rtc_base/network_monitor_factory.cc",
     "rtc_base/openssl_key_pair.h",
     "rtc_base/openssl_key_pair.cc",
     "rtc_base/synchronization/mutex.h",
     "rtc_base/synchronization/mutex.cc",
+    "rtc_base/synchronization/mutex_critical_section.h",
+    "rtc_base/synchronization/mutex_pthread.h",
+    "rtc_base/deprecated/recursive_critical_section.h",
+    "rtc_base/deprecated/recursive_critical_section.cc",
     "rtc_base/task_utils/pending_task_safety_flag.h",
     "rtc_base/task_utils/pending_task_safety_flag.cc",
     "api/video/video_frame_metadata.h",
     "api/video/video_frame_metadata.cc",
     "modules/rtp_rtcp/source/rtp_rtcp_impl2.h",
     "modules/rtp_rtcp/source/rtp_rtcp_impl2.cc",
-    "rtc_base/synchronization/mutex_pthread.h",
     "api/set_local_description_observer_interface.h",
     "common_video/frame_counts.h",
     "rtc_base/system/no_unique_address.h",
@@ -2771,24 +2764,8 @@ webrtc_sources = [
     "modules/video_coding/svc/svc_rate_allocator.cc",
     "modules/video_coding/svc/scalability_structure_full_svc.cc",
     "modules/video_coding/svc/scalability_structure_key_svc.cc",
-    "modules/video_coding/svc/scalability_structure_l1t3.h",
-    "modules/video_coding/svc/scalability_structure_l1t3.cc",
-    "modules/video_coding/svc/scalability_structure_l2t1.h",
-    "modules/video_coding/svc/scalability_structure_l2t1.cc",
-    "modules/video_coding/svc/scalability_structure_l1t2.h",
-    "modules/video_coding/svc/scalability_structure_l1t2.cc",
-    "modules/video_coding/svc/scalability_structure_l3t3.h",
-    "modules/video_coding/svc/scalability_structure_l3t3.cc",
-    "modules/video_coding/svc/scalability_structure_l3t1.h",
-    "modules/video_coding/svc/scalability_structure_l3t1.cc",
-    "modules/video_coding/svc/scalability_structure_l2t2.h",
-    "modules/video_coding/svc/scalability_structure_l2t2.cc",
     "modules/video_coding/svc/scalability_structure_l2t2_key_shift.h",
     "modules/video_coding/svc/scalability_structure_l2t2_key_shift.cc",
-    "modules/video_coding/svc/scalability_structure_s2t1.h",
-    "modules/video_coding/svc/scalability_structure_s2t1.cc",
-    "modules/video_coding/svc/scalability_structure_l2t1h.h",
-    "modules/video_coding/svc/scalability_structure_l2t1h.cc",
     "pc/connection_context.h",
     "pc/connection_context.cc",
     "pc/data_channel_utils.h",
@@ -2816,7 +2793,6 @@ webrtc_sources = [
     "pc/stats_collector_interface.h",
     "rtc_base/callback_list.h",
     "rtc_base/callback_list.cc",
-    "rtc_base/deprecated/signal_thread.h",
     "call/adaptation/broadcast_resource_listener.h",
     "call/adaptation/broadcast_resource_listener.cc",
     "call/adaptation/video_stream_input_state.h",
@@ -2885,6 +2861,36 @@ webrtc_sources = [
     "video/video_stream_decoder2.cc",
     "modules/video_coding/nack_module2.h",
     "modules/video_coding/nack_module2.cc",
+    "api/sequence_checker.h",
+    "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_common.h",
+    "common_audio/third_party/ooura/fft_size_128/ooura_fft_tables_neon_sse2.h",
+    "modules/rtp_rtcp/source/packet_sequencer.h",
+    "modules/rtp_rtcp/source/packet_sequencer.cc",
+    "modules/video_coding/svc/scalability_structure_full_svc.h",
+    "modules/video_coding/svc/scalability_structure_key_svc.h",
+    "rtc_base/async_resolver.h",
+    "rtc_base/async_resolver.cc",
+    "rtc_base/experiments/encoder_info_settings.h",
+    "rtc_base/experiments/encoder_info_settings.cc",
+    "rtc_base/system_time.h",
+    "rtc_base/system_time.cc",
+    "rtc_base/synchronization/sequence_checker_internal.h",
+    "rtc_base/synchronization/sequence_checker_internal.cc",
+    "rtc_base/internal/default_socket_server.h",
+    "rtc_base/internal/default_socket_server.cc",
+    "modules/video_coding/svc/scalability_structure_simulcast.h",
+    "modules/video_coding/svc/scalability_structure_simulcast.cc",
+    "api/async_dns_resolver.h",
+    "modules/video_coding/utility/qp_parser.h",
+    "modules/video_coding/utility/qp_parser.cc",
+    "modules/audio_processing/agc2/saturation_protector_buffer.h",
+    "modules/audio_processing/agc2/saturation_protector_buffer.cc",
+    "modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster.h",
+    "modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster.cc",
+    "modules/audio_processing/capture_levels_adjuster/audio_samples_scaler.h",
+    "modules/audio_processing/capture_levels_adjuster/audio_samples_scaler.cc",
+    "rtc_base/system/gcd_helpers.h",
+    "rtc_base/system/gcd_helpers.m",
 ]
 
 ios_objc_sources = [
@@ -3154,6 +3160,7 @@ ios_sources = [
     "objc/components/network/RTCNetworkMonitor.h",
     "objc/components/network/RTCNetworkMonitor+Private.h",
     "objc/components/network/RTCNetworkMonitor.mm",
+    "objc/native/src/network_monitor_observer.h",
 ]
 
 common_arm_specific_sources = [webrtc_source_dir + "/" + path for path in [
@@ -3212,18 +3219,34 @@ common_flags = [
     "-DWEBRTC_POSIX",
     "-DHAVE_WEBRTC_VIDEO",
     "-DRTC_ENABLE_VP9",
+    "-DWEBRTC_USE_H264",
     "-DHAVE_SCTP",
+    "-Ithird-party/openh264",
+    "-DWEBRTC_NS_FLOAT",
+    "-DRTC_DISABLE_TRACE_EVENTS",
+    "-DWEBRTC_OPUS_SUPPORT_120MS_PTIME=1",
+    "-DWEBRTC_APM_DEBUG_DUMP=0",
+    "-DBWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0",
+    "-DABSL_ALLOCATOR_NOTHROW=1",
+    "-DDYNAMIC_ANNOTATIONS_ENABLED=0",
+    "-DNS_BLOCK_ASSERTIONS=1",
+    "-DWEBRTC_ENABLE_PROTOBUF=0",
+    "-DWEBRTC_ENABLE_AVX2",
+    "-DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
 ]
 
 arm_specific_flags = [
     "-DWEBRTC_ARCH_ARM",
     "-DWEBRTC_ARCH_ARM_V7",
     "-DWEBRTC_HAS_NEON",
+    "-DLIBYUV_NEON",
 ]
 
 arm64_specific_flags = [
     "-DWEBRTC_ARCH_ARM64",
     "-DWEBRTC_HAS_NEON",
+    "-mfpu=neon",
+    "-DLIBYUV_NEON",
 ]
 
 x86_64_specific_flags = [
@@ -3331,7 +3354,8 @@ cc_library(
         "-D__Userspace_os_Darwin",
         "-DPACKAGE_VERSION=''",
         "-DHAVE_SCTP",
-    ] + arch_specific_cflags,
+        "-DNON_WINDOWS_DEFINE",
+    ] + arch_specific_cflags + optimization_flags,
     visibility = ["//visibility:public"],
 )
 
@@ -3409,7 +3433,7 @@ cc_library(
         "-DHAVE_UNISTD_H",
         "-DPACKAGE_STRING='\"\"'",
         "-DHAVE_SCTP",
-    ] + arch_specific_cflags,
+    ] + arch_specific_cflags + optimization_flags,
     deps = [
         "//third-party/boringssl:crypto",
         "//third-party/boringssl:ssl",
@@ -3417,49 +3441,6 @@ cc_library(
     visibility = ["//visibility:public"],
 )
 
-cc_library(
-    name = "libevent",
-    srcs = [ "dependencies/base/third_party/libevent/" + path for path in [
-        "buffer.c",
-        "evbuffer.c",
-        "evdns.c",
-        "evdns.h",
-        "event-config.h",
-        "event-internal.h",
-        "event.c",
-        "event.h",
-        "event_tagging.c",
-        "evhttp.h",
-        "evrpc-internal.h",
-        "evrpc.c",
-        "evrpc.h",
-        "evsignal.h",
-        "evutil.c",
-        "evutil.h",
-        "http-internal.h",
-        "http.c",
-        "log.c",
-        "log.h",
-        "min_heap.h",
-        "poll.c",
-        "select.c",
-        "signal.c",
-        "strlcpy-internal.h",
-        "strlcpy.c",
-        "kqueue.c",
-        "mac/config.h",
-        "mac/event-config.h",
-    ]],
-    copts = [
-        "-DHAVE_CONFIG_H",
-        "-Ithird-party/webrtc/dependencies/base/third_party/libevent/mac",
-        "-Ithird-party/webrtc/dependencies/base/third_party/libevent",
-        "-Ithird-party/webrtc/dependencies",
-        "-Ithird-party/webrtc/" + webrtc_source_dir,
-    ] + arch_specific_cflags,
-    visibility = ["//visibility:public"],
-)
-
 cc_library(
     name = "libyuv",
     srcs = [ "dependencies/third_party/libyuv/" + path for path in [
@@ -3534,7 +3515,7 @@ cc_library(
     copts = [
         "-ffp-contract=fast",
         "-Ithird-party/webrtc/dependencies/third_party/libyuv/include",
-    ] + arch_specific_cflags,
+    ] + arch_specific_cflags + optimization_flags,
     visibility = ["//visibility:public"],
 )
 
@@ -3578,19 +3559,35 @@ objc_library(
         "-D__Userspace_os_Darwin",
         "-DPACKAGE_VERSION='\"\"'",
         "-DHAVE_SCTP",
-    ] + arch_specific_cflags,
+        "-DNO_MAIN_THREAD_WRAPPING",
+        "-DRTC_DISABLE_TRACE_EVENTS",
+        "-DRTC_DISABLE_METRICS",
+    ] + arch_specific_cflags + optimization_flags,
     deps = [
         "//third-party/boringssl:crypto",
         "//third-party/boringssl:ssl",
         "//third-party/opus:opus",
         ":usrsctp",
         ":libsrtp",
-        ":libevent",
         ":libyuv",
         "//third-party/libvpx:vpx",
+        "//submodules/ffmpeg:ffmpeg",
+        "//third-party/openh264:openh264",
+    ],
+    sdk_frameworks = [
+        "AVFoundation",
+        "AudioToolbox",
+        "VideoToolbox",
+        "UIKit",
+        "CoreMedia",
+        "CoreVideo",
+        "OpenGLES",
+        "CoreGraphics",
+        "QuartzCore",
     ],
     weak_sdk_frameworks = [
         "Network",
+        "Metal",
     ],
     visibility = ["//visibility:public"],
 )
diff --git a/third-party/webrtc/webrtc b/third-party/webrtc/webrtc
index 1829cfe837..469686eb88 160000
--- a/third-party/webrtc/webrtc
+++ b/third-party/webrtc/webrtc
@@ -1 +1 @@
-Subproject commit 1829cfe8371d479f254d9783ebe66fc562d30dba
+Subproject commit 469686eb88520ff4c37cab24b55ad496cbc0b5d4
diff --git a/versions.json b/versions.json
index 2367d98151..c2ec49706b 100644
--- a/versions.json
+++ b/versions.json
@@ -1,5 +1,5 @@
 {
-    "app": "7.6",
+    "app": "7.9",
     "bazel": "4.0.0",
     "xcode": "12.4"
 }